June 2009 - Wine-commits - list.winehq.org

Paul Chitescu : avifil32: Romanian translation.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: 508270b5332ea19b745185db556b3c10647424d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=508270b5332ea19b745185db5… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Jun 24 15:08:18 2009 +0300 avifil32: Romanian translation. --- dlls/avifil32/avifile_Ro.rc | 57 +++++++++++++++++++++++++++++++++++++++++++ dlls/avifil32/rsrc.rc | 1 + 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/avifil32/avifile_Ro.rc b/dlls/avifil32/avifile_Ro.rc new file mode 100644 index 0000000..d46e3ea --- /dev/null +++ b/dlls/avifil32/avifile_Ro.rc @@ -0,0 +1,57 @@ +/* + * avifil32.dll (Romanian resources) + * + * Copyright 2009 Paul Chitescu + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Opțiuni de compresie" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Alegeți un flux:",-1,2,5,154,10 + COMBOBOX IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP + PUSHBUTTON "&Opțiuni...",IDC_OPTIONS,170,17,50,14 + AUTOCHECKBOX "Ȋ&ntrețese fiecare",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP + EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL + LTEXT "cadre",-1,129,43,36,9 + LTEXT "Formatul curent:",-1,3,56,73,9 + LTEXT "This space for rent",IDC_FORMATTEXT,75,56,90,26 + DEFPUSHBUTTON "OK",IDOK,170,42,50,14 + PUSHBUTTON "Renunță",IDCANCEL,170,61,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_WAVESTREAMFORMAT "Forma de undă: %s" + IDS_WAVEFILETYPE "Formă de undă" + IDS_ALLMULTIMEDIA "Toate fișierele multimedia" + IDS_ALLFILES "Toate fișierele (*.*)(a)*.*" + IDS_VIDEO "video" + IDS_AUDIO "audio" + IDS_AVISTREAMFORMAT "%s %s #%d" + IDS_AVIFILETYPE "Tratare implicită Wine pentru AVI" + IDS_UNCOMPRESSED "necomprimat" +} + +#pragma code_page(default) diff --git a/dlls/avifil32/rsrc.rc b/dlls/avifil32/rsrc.rc index 5eda656..e4363a7 100644 --- a/dlls/avifil32/rsrc.rc +++ b/dlls/avifil32/rsrc.rc @@ -53,6 +53,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "avifile_No.rc" #include "avifile_Pl.rc" #include "avifile_Pt.rc" +#include "avifile_Ro.rc" #include "avifile_Ru.rc" #include "avifile_Si.rc" #include "avifile_Sv.rc"

1 0

Anders Jonsson : crypt32: Add CryptRegisterOIDInfo stub.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: d9972cb4b409cedfd9cb049630f75f79d046eb34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9972cb4b409cedfd9cb04963… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Sat Jun 20 10:08:46 2009 +0200 crypt32: Add CryptRegisterOIDInfo stub. --- dlls/crypt32/crypt32.spec | 2 +- dlls/crypt32/oid.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index f271b62..534bee7 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -163,7 +163,7 @@ @ stdcall CryptQueryObject(long ptr long long long ptr ptr ptr ptr ptr ptr) @ stdcall CryptRegisterDefaultOIDFunction(long str long wstr) @ stdcall CryptRegisterOIDFunction(long str str wstr str) -@ stub CryptRegisterOIDInfo +@ stdcall CryptRegisterOIDInfo(ptr long) @ stdcall CryptSIPAddProvider(ptr) @ stdcall CryptSIPCreateIndirectData(ptr ptr ptr) @ stdcall CryptSIPGetSignedDataMsg(ptr ptr long ptr ptr) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 927481f..f0ea8ea 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -665,6 +665,16 @@ error_close_key: } /*********************************************************************** + * CryptRegisterOIDInfo (CRYPT32.@) + */ +BOOL WINAPI CryptRegisterOIDInfo(PCCRYPT_OID_INFO pInfo, DWORD dwFlags) +{ + FIXME("(%p, %x): stub\n", pInfo, dwFlags ); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * CryptUnregisterOIDFunction (CRYPT32.@) */ BOOL WINAPI CryptUnregisterOIDFunction(DWORD dwEncodingType, LPCSTR pszFuncName,

1 0

André Hentschel : appwiz: Add function for installer button.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: ee9baf28d2391a7607468d52d6abed1abeb4dcb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee9baf28d2391a7607468d52d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 21 17:05:41 2009 +0200 appwiz: Add function for installer button. --- dlls/appwiz.cpl/De.rc | 1 + dlls/appwiz.cpl/En.rc | 1 + dlls/appwiz.cpl/Makefile.in | 2 +- dlls/appwiz.cpl/appwiz.c | 50 +++++++++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/res.h | 1 + 5 files changed, 54 insertions(+), 1 deletions(-) diff --git a/dlls/appwiz.cpl/De.rc b/dlls/appwiz.cpl/De.rc index b85d43e..47263f3 100644 --- a/dlls/appwiz.cpl/De.rc +++ b/dlls/appwiz.cpl/De.rc @@ -35,6 +35,7 @@ STRINGTABLE IDS_COLUMN_NAME, "Name" IDS_COLUMN_PUBLISHER, "Herausgeber" IDS_COLUMN_VERSION, "Version" + IDS_INSTALL_FILTER, "Setup-Programme\0*instal*.exe;*setup*.exe;*.msi\0Programme (*.exe)\0*.exe\0Alle Dateien (*.*)\0*.*\0\0" } IDD_MAIN DIALOG 0, 0, 320, 220 diff --git a/dlls/appwiz.cpl/En.rc b/dlls/appwiz.cpl/En.rc index d0b4de3..3463b2e 100644 --- a/dlls/appwiz.cpl/En.rc +++ b/dlls/appwiz.cpl/En.rc @@ -33,6 +33,7 @@ STRINGTABLE IDS_COLUMN_NAME, "Name" IDS_COLUMN_PUBLISHER, "Publisher" IDS_COLUMN_VERSION, "Version" + IDS_INSTALL_FILTER, "Installation Programs\0*instal*.exe;*setup*.exe;*.msi\0Programs (*.exe)\0*.exe\0All Files (*.*)\0*.*\0\0" } IDD_MAIN DIALOG 0, 0, 320, 220 diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in index 141715d..8fc65f1 100644 --- a/dlls/appwiz.cpl/Makefile.in +++ b/dlls/appwiz.cpl/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = appwiz.cpl -IMPORTS = kernel32 comctl32 advapi32 shell32 user32 +IMPORTS = kernel32 comctl32 advapi32 shell32 user32 comdlg32 C_SRCS = \ appwiz.c diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 892c635..daf3e82 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -41,6 +41,7 @@ #include <winreg.h> #include <shellapi.h> #include <commctrl.h> +#include <commdlg.h> #include <cpl.h> #include "res.h" @@ -71,6 +72,8 @@ typedef struct APPINFO { static struct APPINFO *AppInfo = NULL; static HINSTANCE hInst; +static const WCHAR openW[] = {'o','p','e','n',0}; + /* names of registry keys */ static const WCHAR BackSlashW[] = { '\\', 0 }; static const WCHAR DisplayNameW[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; @@ -372,6 +375,49 @@ static void UpdateButtons(HWND hWnd) } /****************************************************************************** + * Name : InstallProgram + * Description: Search for potential Installer and execute it. + * Parameters : hWnd - Handle of the dialog box + */ +static void InstallProgram(HWND hWnd) +{ + OPENFILENAMEW ofn; + WCHAR titleW[MAX_STRING_LEN]; + WCHAR FilterBufferW[MAX_STRING_LEN]; + WCHAR FileNameBufferW[MAX_PATH]; + + LoadStringW(hInst, IDS_CPL_TITLE, titleW, sizeof(titleW)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_INSTALL_FILTER, FilterBufferW, sizeof(FilterBufferW)/sizeof(WCHAR)); + + memset(&ofn, 0, sizeof(OPENFILENAMEW)); + ofn.lStructSize = sizeof(OPENFILENAMEW); + ofn.hwndOwner = hWnd; + ofn.hInstance = hInst; + ofn.lpstrFilter = FilterBufferW; + ofn.nFilterIndex = 0; + ofn.lpstrFile = FileNameBufferW; + ofn.nMaxFile = MAX_PATH; + ofn.lpstrFileTitle = NULL; + ofn.nMaxFileTitle = 0; + ofn.lpstrTitle = titleW; + ofn.Flags = OFN_HIDEREADONLY | OFN_ENABLESIZING; + FileNameBufferW[0] = 0; + + if (GetOpenFileNameW(&ofn)) + { + SHELLEXECUTEINFOW sei; + memset(&sei, 0, sizeof(sei)); + sei.cbSize = sizeof(sei); + sei.lpVerb = openW; + sei.nShow = SW_SHOWDEFAULT; + sei.fMask = SEE_MASK_NO_CONSOLE; + sei.lpFile = ofn.lpstrFile; + + ShellExecuteExW(&sei); + } +} + +/****************************************************************************** * Name : UninstallProgram * Description: Executes the specified program's installer. * Parameters : id - the internal ID of the installer to remove @@ -737,6 +783,10 @@ static BOOL CALLBACK MainDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPar case WM_COMMAND: switch (LOWORD(wParam)) { + case IDC_INSTALL: + InstallProgram(hWnd); + break; + case IDC_ADDREMOVE: selitem = SendDlgItemMessageW(hWnd, IDL_PROGRAMS, LVM_GETNEXTITEM, -1, LVNI_FOCUSED|LVNI_SELECTED); diff --git a/dlls/appwiz.cpl/res.h b/dlls/appwiz.cpl/res.h index 34129c4..5efcee2 100644 --- a/dlls/appwiz.cpl/res.h +++ b/dlls/appwiz.cpl/res.h @@ -53,3 +53,4 @@ #define IDS_COLUMN_NAME 6 #define IDS_COLUMN_PUBLISHER 7 #define IDS_COLUMN_VERSION 8 +#define IDS_INSTALL_FILTER 9

1 0

Tony Wasserka : d3dx9: Implement ID3DXFont_GetDevice.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: e36028b4df36d3984dc70a97f93ccd95e8b19c3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e36028b4df36d3984dc70a97f… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Fri Jun 5 13:15:44 2009 +0200 d3dx9: Implement ID3DXFont_GetDevice. --- dlls/d3dx9_36/d3dx9_36_private.h | 1 + dlls/d3dx9_36/font.c | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index a2b0698..5891794 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -41,6 +41,7 @@ typedef struct ID3DXFontImpl LONG ref; /* ID3DXFont fields */ + IDirect3DDevice9 *device; } ID3DXFontImpl; diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index e5e6569..e7f770c 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -55,6 +55,7 @@ static ULONG WINAPI ID3DXFontImpl_Release(LPD3DXFONT iface) TRACE("(%p): ReleaseRef to %d\n", This, ref); if(ref==0) { + IDirect3DDevice9_Release(This->device); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -63,7 +64,12 @@ static ULONG WINAPI ID3DXFontImpl_Release(LPD3DXFONT iface) static HRESULT WINAPI ID3DXFontImpl_GetDevice(LPD3DXFONT iface, LPDIRECT3DDEVICE9 *device) { ID3DXFontImpl *This=(ID3DXFontImpl*)iface; - FIXME("(%p): stub\n", This); + TRACE("(%p)\n", This); + + if( !device ) return D3DERR_INVALIDCALL; + *device = This->device; + IDirect3DDevice9_AddRef(This->device); + return D3D_OK; } @@ -282,7 +288,9 @@ HRESULT WINAPI D3DXCreateFontIndirectW(LPDIRECT3DDEVICE9 device, CONST D3DXFONT_ } object->lpVtbl=&D3DXFont_Vtbl; object->ref=1; + object->device=device; + IDirect3DDevice9_AddRef(device); *font=(LPD3DXFONT)object; return D3D_OK;

1 0

Tony Wasserka : d3dx9: Implement ID3DXFont_GetDesc.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: 05843d47707a8224a1f8470337cb24173d1eee29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05843d47707a8224a1f847033… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Fri Jun 5 13:26:11 2009 +0200 d3dx9: Implement ID3DXFont_GetDesc. --- dlls/d3dx9_36/d3dx9_36_private.h | 1 + dlls/d3dx9_36/font.c | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 5891794..5d3d329 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -42,6 +42,7 @@ typedef struct ID3DXFontImpl /* ID3DXFont fields */ IDirect3DDevice9 *device; + D3DXFONT_DESCW desc; } ID3DXFontImpl; diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index e7f770c..1de0634 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -76,14 +76,23 @@ static HRESULT WINAPI ID3DXFontImpl_GetDevice(LPD3DXFONT iface, LPDIRECT3DDEVICE static HRESULT WINAPI ID3DXFontImpl_GetDescA(LPD3DXFONT iface, D3DXFONT_DESCA *desc) { ID3DXFontImpl *This=(ID3DXFontImpl*)iface; - FIXME("(%p): stub\n", This); + TRACE("(%p)\n", This); + + if( !desc ) return D3DERR_INVALIDCALL; + memcpy(desc, &This->desc, FIELD_OFFSET(D3DXFONT_DESCA, FaceName)); + WideCharToMultiByte(CP_ACP, 0, This->desc.FaceName, -1, desc->FaceName, sizeof(desc->FaceName) / sizeof(CHAR), NULL, NULL); + return D3D_OK; } static HRESULT WINAPI ID3DXFontImpl_GetDescW(LPD3DXFONT iface, D3DXFONT_DESCW *desc) { ID3DXFontImpl *This=(ID3DXFontImpl*)iface; - FIXME("(%p): stub\n", This); + TRACE("(%p)\n", This); + + if( !desc ) return D3DERR_INVALIDCALL; + *desc = This->desc; + return D3D_OK; } @@ -289,6 +298,7 @@ HRESULT WINAPI D3DXCreateFontIndirectW(LPDIRECT3DDEVICE9 device, CONST D3DXFONT_ object->lpVtbl=&D3DXFont_Vtbl; object->ref=1; object->device=device; + object->desc=*desc; IDirect3DDevice9_AddRef(device); *font=(LPD3DXFONT)object;

1 0

Tony Wasserka : d3dx9: Implement ID3DXFont_GetDC.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: 9733856f90ac01807b59f5ba6eb185e6164ce8a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9733856f90ac01807b59f5ba6… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Fri Jun 5 13:45:12 2009 +0200 d3dx9: Implement ID3DXFont_GetDC. --- dlls/d3dx9_36/Makefile.in | 2 +- dlls/d3dx9_36/d3dx9_36_private.h | 2 ++ dlls/d3dx9_36/font.c | 11 +++++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index c094071..f5fa278 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = d3dx9_36.dll IMPORTLIB = d3dx9 -IMPORTS = d3d9 d3dx8 kernel32 +IMPORTS = d3d9 d3dx8 gdi32 kernel32 C_SRCS = \ d3dx9_36_main.c \ diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 5d3d329..4d73e76 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -43,6 +43,8 @@ typedef struct ID3DXFontImpl /* ID3DXFont fields */ IDirect3DDevice9 *device; D3DXFONT_DESCW desc; + + HDC hdc; } ID3DXFontImpl; diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 1de0634..034ae93 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -55,6 +55,7 @@ static ULONG WINAPI ID3DXFontImpl_Release(LPD3DXFONT iface) TRACE("(%p): ReleaseRef to %d\n", This, ref); if(ref==0) { + DeleteDC(This->hdc); IDirect3DDevice9_Release(This->device); HeapFree(GetProcessHeap(), 0, This); } @@ -113,8 +114,8 @@ static BOOL WINAPI ID3DXFontImpl_GetTextMetricsW(LPD3DXFONT iface, TEXTMETRICW * static HDC WINAPI ID3DXFontImpl_GetDC(LPD3DXFONT iface) { ID3DXFontImpl *This=(ID3DXFontImpl*)iface; - FIXME("(%p): stub\n", This); - return NULL; + TRACE("(%p)\n", This); + return This->hdc; } static HRESULT WINAPI ID3DXFontImpl_GetGlyphData(LPD3DXFONT iface, UINT glyph, LPDIRECT3DTEXTURE9 *texture, RECT *blackbox, POINT *cellinc) @@ -300,6 +301,12 @@ HRESULT WINAPI D3DXCreateFontIndirectW(LPDIRECT3DDEVICE9 device, CONST D3DXFONT_ object->device=device; object->desc=*desc; + object->hdc = CreateCompatibleDC(NULL); + if( !object->hdc ) { + HeapFree(GetProcessHeap(), 0, object); + return D3DXERR_INVALIDDATA; + } + IDirect3DDevice9_AddRef(device); *font=(LPD3DXFONT)object;

1 0

Tony Wasserka : d3dx9: Implement ID3DXFont_GetTextMetrics.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: 5dd637134513d009d02af5b33e986685d1016066 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dd637134513d009d02af5b33… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Fri Jun 5 13:57:23 2009 +0200 d3dx9: Implement ID3DXFont_GetTextMetrics. --- dlls/d3dx9_36/d3dx9_36_private.h | 1 + dlls/d3dx9_36/font.c | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 4d73e76..cf3e176 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -45,6 +45,7 @@ typedef struct ID3DXFontImpl D3DXFONT_DESCW desc; HDC hdc; + HFONT hfont; } ID3DXFontImpl; diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 034ae93..98b4fe9 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -55,6 +55,7 @@ static ULONG WINAPI ID3DXFontImpl_Release(LPD3DXFONT iface) TRACE("(%p): ReleaseRef to %d\n", This, ref); if(ref==0) { + DeleteObject(This->hfont); DeleteDC(This->hdc); IDirect3DDevice9_Release(This->device); HeapFree(GetProcessHeap(), 0, This); @@ -100,15 +101,15 @@ static HRESULT WINAPI ID3DXFontImpl_GetDescW(LPD3DXFONT iface, D3DXFONT_DESCW *d static BOOL WINAPI ID3DXFontImpl_GetTextMetricsA(LPD3DXFONT iface, TEXTMETRICA *metrics) { ID3DXFontImpl *This=(ID3DXFontImpl*)iface; - FIXME("(%p): stub\n", This); - return FALSE; + TRACE("(%p)\n", This); + return GetTextMetricsA(This->hdc, metrics); } static BOOL WINAPI ID3DXFontImpl_GetTextMetricsW(LPD3DXFONT iface, TEXTMETRICW *metrics) { ID3DXFontImpl *This=(ID3DXFontImpl*)iface; - FIXME("(%p): stub\n", This); - return FALSE; + TRACE("(%p)\n", This); + return GetTextMetricsW(This->hdc, metrics); } static HDC WINAPI ID3DXFontImpl_GetDC(LPD3DXFONT iface) @@ -307,6 +308,15 @@ HRESULT WINAPI D3DXCreateFontIndirectW(LPDIRECT3DDEVICE9 device, CONST D3DXFONT_ return D3DXERR_INVALIDDATA; } + object->hfont = CreateFontW(desc->Height, desc->Width, 0, 0, desc->Weight, desc->Italic, FALSE, FALSE, desc->CharSet, + desc->OutputPrecision, CLIP_DEFAULT_PRECIS, desc->Quality, desc->PitchAndFamily, desc->FaceName); + if( !object->hfont ) { + DeleteDC(object->hdc); + HeapFree(GetProcessHeap(), 0, object); + return D3DXERR_INVALIDDATA; + } + SelectObject(object->hdc, object->hfont); + IDirect3DDevice9_AddRef(device); *font=(LPD3DXFONT)object;

1 0

Tony Wasserka : d3dx9: Add tests for basic ID3DXFont functions.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: 0ac20c4bd3b4bb1a751059d34e84542ca81f56d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ac20c4bd3b4bb1a751059d34… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Fri Jun 5 15:14:21 2009 +0200 d3dx9: Add tests for basic ID3DXFont functions. --- dlls/d3dx9_36/tests/Makefile.in | 2 +- dlls/d3dx9_36/tests/core.c | 146 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 147 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0ac20c4bd3b4bb1a75105…

1 0

Nikolay Sivov : comctl32/listview: Initialize string pointers on notification conversion routine.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: 2551ea05681ba89acc011f52efddd361a25d3d76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2551ea05681ba89acc011f52e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jun 24 00:20:11 2009 +0400 comctl32/listview: Initialize string pointers on notification conversion routine. --- dlls/comctl32/listview.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index b84600a..7099227 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -759,6 +759,7 @@ static LRESULT notify_forward_header(const LISTVIEW_INFO *infoPtr, const NMHEADE /* convert item text */ if (lpnmh->pitem->mask & HDI_TEXT) { + hditema.pszText = NULL; Str_SetPtrWtoA(&hditema.pszText, lpnmh->pitem->pszText); text = hditema.pszText; } @@ -768,6 +769,7 @@ static LRESULT notify_forward_header(const LISTVIEW_INFO *infoPtr, const NMHEADE { hditema.pvFilter = &textfilter; textfilter = *(HD_TEXTFILTERA*)(lpnmh->pitem->pvFilter); + textfilter.pszText = NULL; Str_SetPtrWtoA(&textfilter.pszText, ((HD_TEXTFILTERW*)lpnmh->pitem->pvFilter)->pszText); filter = textfilter.pszText; }

1 0

Henri Verbeet : wined3d: Add some missing GL locking documentation to arb_program_shader.c.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: 4caf43ddb767658f66b6528f9ae1ee2d7c6b4eb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4caf43ddb767658f66b6528f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 24 10:54:15 2009 +0200 wined3d: Add some missing GL locking documentation to arb_program_shader.c. --- dlls/wined3d/arb_program_shader.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7094824..0d4002b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -354,6 +354,7 @@ static void shader_arb_load_np2fixup_constants( /* not implemented */ } +/* GL locking is done by the caller. */ static inline void shader_arb_ps_local_constants(IWineD3DDeviceImpl* deviceImpl) { IWineD3DStateBlockImpl* stateBlock = deviceImpl->stateBlock; @@ -417,6 +418,7 @@ static inline void shader_arb_ps_local_constants(IWineD3DDeviceImpl* deviceImpl) checkGLcall("Load ps int consts\n"); } +/* GL locking is done by the caller. */ static inline void shader_arb_vs_local_constants(IWineD3DDeviceImpl* deviceImpl) { IWineD3DStateBlockImpl* stateBlock;

1 0