March 2010 - Wine-commits - list.winehq.org

Henri Verbeet : gdi32: GetObject() should return the DIB' s absolute height in dsBmih.biHeight.
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: 9ab004d56af62ed34c041fa3eff80eca8637b8ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ab004d56af62ed34c041fa3e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 1 12:39:56 2010 +0100 gdi32: GetObject() should return the DIB's absolute height in dsBmih.biHeight. --- dlls/gdi32/bitmap.c | 4 +++- dlls/gdi32/tests/bitmap.c | 16 ++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 609cc9c..dfb8916 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -678,7 +678,9 @@ static INT BITMAP_GetObject( HGDIOBJ handle, INT count, LPVOID buffer ) { if (count >= sizeof(DIBSECTION)) { - memcpy( buffer, bmp->dib, sizeof(DIBSECTION) ); + DIBSECTION *dib = buffer; + *dib = *bmp->dib; + dib->dsBmih.biHeight = abs( dib->dsBmih.biHeight ); ret = sizeof(DIBSECTION); } else /* if (count >= sizeof(BITMAP)) */ diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index ecdf2ac..23762c0 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -301,7 +301,7 @@ static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER ok(bm.bmType == 0, "wrong bm.bmType %d\n", bm.bmType); ok(bm.bmWidth == bmih->biWidth, "wrong bm.bmWidth %d\n", bm.bmWidth); - ok(bm.bmHeight == bmih->biHeight, "wrong bm.bmHeight %d\n", bm.bmHeight); + ok(bm.bmHeight == abs(bmih->biHeight), "wrong bm.bmHeight %d\n", bm.bmHeight); dib_width_bytes = DIB_GetWidthBytes(bm.bmWidth, bm.bmBitsPixel); bm_width_bytes = BITMAP_GetWidthBytes(bm.bmWidth, bm.bmBitsPixel); if (bm.bmWidthBytes != dib_width_bytes) /* Win2k bug */ @@ -332,7 +332,7 @@ static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER ret = GetObject(hbm, sizeof(*bma) * 2, bma); ok(ret == sizeof(*bma) || broken(ret == sizeof(*bma) * 2 /* Win9x */), "wrong size %d\n", ret); ok(bm.bmWidth == bmih->biWidth, "wrong bm.bmWidth %d\n", bm.bmWidth); - ok(bm.bmHeight == bmih->biHeight, "wrong bm.bmHeight %d\n", bm.bmHeight); + ok(bm.bmHeight == abs(bmih->biHeight), "wrong bm.bmHeight %d\n", bm.bmHeight); ok(bm.bmBits == bits, "wrong bm.bmBits %p != %p\n", bm.bmBits, bits); ret = GetObject(hbm, sizeof(bm) / 2, &bm); @@ -364,7 +364,7 @@ static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER ok(ds.dsBmih.biSize == bmih->biSize, "%u != %u\n", ds.dsBmih.biSize, bmih->biSize); ok(ds.dsBmih.biWidth == bmih->biWidth, "%d != %d\n", ds.dsBmih.biWidth, bmih->biWidth); - ok(ds.dsBmih.biHeight == bmih->biHeight, "%d != %d\n", ds.dsBmih.biHeight, bmih->biHeight); + ok(ds.dsBmih.biHeight == abs(bmih->biHeight), "%d != %d\n", ds.dsBmih.biHeight, abs(bmih->biHeight)); ok(ds.dsBmih.biPlanes == bmih->biPlanes, "%u != %u\n", ds.dsBmih.biPlanes, bmih->biPlanes); ok(ds.dsBmih.biBitCount == bmih->biBitCount, "%u != %u\n", ds.dsBmih.biBitCount, bmih->biBitCount); ok(ds.dsBmih.biCompression == bmih->biCompression, "%u != %u\n", ds.dsBmih.biCompression, bmih->biCompression); @@ -376,7 +376,7 @@ static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER ret = GetObject(hbm, sizeof(ds) - 4, &ds); ok(ret == sizeof(ds.dsBm) || broken(ret == (sizeof(ds) - 4) /* Win9x */), "wrong size %d\n", ret); ok(ds.dsBm.bmWidth == bmih->biWidth, "%d != %d\n", ds.dsBmih.biWidth, bmih->biWidth); - ok(ds.dsBm.bmHeight == bmih->biHeight, "%d != %d\n", ds.dsBmih.biHeight, bmih->biHeight); + ok(ds.dsBm.bmHeight == abs(bmih->biHeight), "%d != %d\n", ds.dsBmih.biHeight, abs(bmih->biHeight)); ok(ds.dsBm.bmBits == bits, "%p != %p\n", ds.dsBm.bmBits, bits); ret = GetObject(hbm, 0, &ds); @@ -525,6 +525,14 @@ static void test_dibsections(void) test_dib_info(hdib, bits, &pbmi->bmiHeader); DeleteObject(hdib); + /* Test a top-down DIB. */ + pbmi->bmiHeader.biHeight = -100; + hdib = CreateDIBSection(hdc, pbmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok(hdib != NULL, "CreateDIBSection error %d\n", GetLastError()); + test_dib_info(hdib, bits, &pbmi->bmiHeader); + DeleteObject(hdib); + + pbmi->bmiHeader.biHeight = 100; pbmi->bmiHeader.biBitCount = 8; pbmi->bmiHeader.biCompression = BI_RLE8; SetLastError(0xdeadbeef);

1 0

Henri Verbeet : winex11.drv: GetObject() already returns a DIB' s absolute height.
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: 724026dc5fd1e143a7e3812a3e4dcdeb39404b80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=724026dc5fd1e143a7e3812a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 1 12:39:57 2010 +0100 winex11.drv: GetObject() already returns a DIB's absolute height. --- dlls/winex11.drv/xrender.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 0ff434f..27e495b 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1953,10 +1953,10 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid /* If the source is a 1x1 bitmap, tiling is equivalent to stretching, but tiling is much faster. Therefore, we do no stretching in this case. */ - repeat_src = dib.dsBmih.biWidth == 1 && abs(dib.dsBmih.biHeight) == 1; + repeat_src = dib.dsBmih.biWidth == 1 && dib.dsBmih.biHeight == 1; if (xSrc < 0 || ySrc < 0 || widthSrc < 0 || heightSrc < 0 || xSrc + widthSrc > dib.dsBmih.biWidth - || ySrc + heightSrc > abs(dib.dsBmih.biHeight)) + || ySrc + heightSrc > dib.dsBmih.biHeight) { WARN("Invalid src coords: (%d,%d), size %dx%d\n", xSrc, ySrc, widthSrc, heightSrc); SetLastError(ERROR_INVALID_PARAMETER);

1 0

Henri Verbeet : uxtheme: GetObject() already returns a DIB' s absolute height.
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: d8c13bc5dbf1fbeb81d27ec2167a83ccd07e0bbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c13bc5dbf1fbeb81d27ec21… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 1 12:39:58 2010 +0100 uxtheme: GetObject() already returns a DIB's absolute height. --- dlls/uxtheme/msstyles.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 896a294..0adb70d 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -1093,7 +1093,7 @@ static BOOL prepare_alpha (HBITMAP bmp, BOOL* hasAlpha) *hasAlpha = TRUE; p = dib.dsBm.bmBits; - n = abs(dib.dsBmih.biHeight) * dib.dsBmih.biWidth; + n = dib.dsBmih.biHeight * dib.dsBmih.biWidth; /* AlphaBlend() wants premultiplied alpha, so do that now */ while (n-- > 0) {

1 0

Alexandre Julliard : kernel32: Moved creation of the DynData registry keys to wineboot.
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: 61812d17f825c80b1b5adee82a499f0e9071c80e URL: http://source.winehq.org/git/wine.git/?a=commit;h=61812d17f825c80b1b5adee82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 1 14:01:28 2010 +0100 kernel32: Moved creation of the DynData registry keys to wineboot. --- dlls/kernel32/oldconfig.c | 36 ------------------------------------ programs/wineboot/wineboot.c | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 36 deletions(-) diff --git a/dlls/kernel32/oldconfig.c b/dlls/kernel32/oldconfig.c index 26064f4..0e8cff1 100644 --- a/dlls/kernel32/oldconfig.c +++ b/dlls/kernel32/oldconfig.c @@ -55,39 +55,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(reg); - -/* registry initialisation, allocates some default keys. */ -static ULONG allocate_default_keys(void) -{ - static const WCHAR StatDataW[] = {'D','y','n','D','a','t','a','\\', - 'P','e','r','f','S','t','a','t','s','\\', - 'S','t','a','t','D','a','t','a',0}; - static const WCHAR ConfigManagerW[] = {'D','y','n','D','a','t','a','\\', - 'C','o','n','f','i','g',' ','M','a','n','a','g','e','r','\\', - 'E','n','u','m',0}; - HANDLE hkey; - ULONG dispos; - OBJECT_ATTRIBUTES attr; - UNICODE_STRING nameW; - - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = &nameW; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - - RtlInitUnicodeString( &nameW, StatDataW ); - if (!NtCreateKey( &hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, &dispos )) NtClose( hkey ); - if (dispos == REG_OPENED_EXISTING_KEY) - return dispos; /* someone else already loaded the registry */ - - RtlInitUnicodeString( &nameW, ConfigManagerW ); - if (!NtCreateKey( &hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL )) NtClose( hkey ); - - return dispos; -} - /****************************************************************** * create_scsi_entry * @@ -459,9 +426,6 @@ static void create_hardware_branch(void) */ void convert_old_config(void) { - if (allocate_default_keys() == REG_OPENED_EXISTING_KEY) - return; /* someone else already loaded the registry */ - /* create some hardware keys (FIXME: should not be done here) */ create_hardware_branch(); } diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 7c4b14b..8748a6a 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -233,6 +233,22 @@ static void create_hardware_registry_keys(void) RegCloseKey( system_key ); } + +/* create the DynData registry keys */ +static void create_dynamic_registry_keys(void) +{ + static const WCHAR StatDataW[] = {'P','e','r','f','S','t','a','t','s','\\', + 'S','t','a','t','D','a','t','a',0}; + static const WCHAR ConfigManagerW[] = {'C','o','n','f','i','g',' ','M','a','n','a','g','e','r','\\', + 'E','n','u','m',0}; + HKEY key; + + if (!RegCreateKeyExW( HKEY_DYN_DATA, StatDataW, 0, NULL, 0, KEY_WRITE, NULL, &key, NULL )) + RegCloseKey( key ); + if (!RegCreateKeyExW( HKEY_DYN_DATA, ConfigManagerW, 0, NULL, 0, KEY_WRITE, NULL, &key, NULL )) + RegCloseKey( key ); +} + /* create the platform-specific environment registry keys */ static void create_environment_registry_keys( void ) { @@ -1049,6 +1065,7 @@ int main( int argc, char *argv[] ) ResetEvent( event ); /* in case this is a restart */ create_hardware_registry_keys(); + create_dynamic_registry_keys(); create_environment_registry_keys(); wininit(); pendingRename();

1 0

Alexandre Julliard : kernel32: Create the hardware registry keys one at a time, and bail out if the main key already exists.
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: 6d4cf67a56dee87180d447eae3562d35798ba75c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d4cf67a56dee87180d447eae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 1 14:02:16 2010 +0100 kernel32: Create the hardware registry keys one at a time, and bail out if the main key already exists. --- dlls/kernel32/oldconfig.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/oldconfig.c b/dlls/kernel32/oldconfig.c index 0e8cff1..c77e7b2 100644 --- a/dlls/kernel32/oldconfig.c +++ b/dlls/kernel32/oldconfig.c @@ -90,6 +90,25 @@ static void create_scsi_entry( PSCSI_ADDRESS scsi_addr, LPCSTR lpDriver, UINT uD attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; + if (!RtlCreateUnicodeStringFromAsciiz( &nameW, "Machine\\HARDWARE" ) || + NtCreateKey( &scsiKey, KEY_ALL_ACCESS, &attr, 0, NULL, REG_OPTION_VOLATILE, &disp )) + { + ERR("Cannot create HARDWARE registry key\n" ); + return; + } + NtClose( scsiKey ); + RtlFreeUnicodeString( &nameW ); + if (disp == REG_OPENED_EXISTING_KEY) return; + + if (!RtlCreateUnicodeStringFromAsciiz( &nameW, "Machine\\HARDWARE\\DEVICEMAP" ) || + NtCreateKey( &scsiKey, KEY_ALL_ACCESS, &attr, 0, NULL, REG_OPTION_VOLATILE, &disp )) + { + ERR("Cannot create DEVICEMAP registry key\n" ); + return; + } + NtClose( scsiKey ); + RtlFreeUnicodeString( &nameW ); + /* Ensure there is Scsi key */ if (!RtlCreateUnicodeStringFromAsciiz( &nameW, "Machine\\HARDWARE\\DEVICEMAP\\Scsi" ) || NtCreateKey( &scsiKey, KEY_ALL_ACCESS, &attr, 0,

1 0

Alexandre Julliard : kernel32: Create the Control Panel\International key one element at a time.
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: f5248ef7c8f709db88a52490fb344dc669193142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5248ef7c8f709db88a52490f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 1 14:04:33 2010 +0100 kernel32: Create the Control Panel\International key one element at a time. --- dlls/kernel32/locale.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 6f965e3..277f55c 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -614,11 +614,11 @@ static BOOL is_genitive_name_supported( LCTYPE lctype ) */ static inline HANDLE create_registry_key(void) { - static const WCHAR intlW[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\', - 'I','n','t','e','r','n','a','t','i','o','n','a','l',0}; + static const WCHAR cplW[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l',0}; + static const WCHAR intlW[] = {'I','n','t','e','r','n','a','t','i','o','n','a','l',0}; OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; - HANDLE hkey; + HANDLE cpl_key, hkey = 0; if (RtlOpenCurrentUser( KEY_ALL_ACCESS, &hkey ) != STATUS_SUCCESS) return 0; @@ -628,9 +628,15 @@ static inline HANDLE create_registry_key(void) attr.Attributes = 0; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &nameW, intlW ); + RtlInitUnicodeString( &nameW, cplW ); - if (NtCreateKey( &hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ) != STATUS_SUCCESS) hkey = 0; + if (!NtCreateKey( &cpl_key, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL )) + { + NtClose( attr.RootDirectory ); + attr.RootDirectory = cpl_key; + RtlInitUnicodeString( &nameW, intlW ); + if (NtCreateKey( &hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL )) hkey = 0; + } NtClose( attr.RootDirectory ); return hkey; }

1 0

Alexandre Julliard : kernel32: Create the Nls\CodePage key one element at a time.
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: ea3f48ff112175ae2a9e2367098ee2d182a9eb2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea3f48ff112175ae2a9e23670… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 1 14:06:08 2010 +0100 kernel32: Create the Nls\CodePage key one element at a time. --- dlls/kernel32/locale.c | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 277f55c..7a141b2 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -74,12 +74,6 @@ static const WCHAR szLocaleKeyName[] = { 'C','o','n','t','r','o','l','\\','N','l','s','\\','L','o','c','a','l','e',0 }; -static const WCHAR szCodepageKeyName[] = { - 'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\','N','l','s','\\','C','o','d','e','p','a','g','e',0 -}; - static const WCHAR szLangGroupsKeyName[] = { 'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', @@ -774,11 +768,26 @@ void LOCALE_InitRegistry(void) if (locale_update_registry( hkey, lc_ctypeW, lcid_LC_CTYPE, NULL, 0 )) { + static const WCHAR codepageW[] = + {'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\','N','l','s','\\','C','o','d','e','p','a','g','e',0}; + OBJECT_ATTRIBUTES attr; HANDLE nls_key; + DWORD len = 14; - RtlInitUnicodeString( &nameW, szCodepageKeyName ); + RtlInitUnicodeString( &nameW, codepageW ); InitializeObjectAttributes( &attr, &nameW, 0, 0, NULL ); + while (codepageW[len]) + { + nameW.Length = len * sizeof(WCHAR); + if (NtCreateKey( &nls_key, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL )) break; + NtClose( nls_key ); + len++; + while (codepageW[len] && codepageW[len] != '\\') len++; + } + nameW.Length = len * sizeof(WCHAR); if (!NtCreateKey( &nls_key, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL )) { for (i = 0; i < sizeof(update_cp_values)/sizeof(update_cp_values[0]); i++)

1 0

Christian Costa : d3dxof: Use proper macro for AddRef.
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: feaf2904bf1f3525f44484ead29ffff840885239 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feaf2904bf1f3525f44484ead… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 1 09:36:37 2010 +0100 d3dxof: Use proper macro for AddRef. --- dlls/d3dxof/d3dxof.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index d385e0d..88a9e52 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -97,7 +97,7 @@ static HRESULT WINAPI IDirectXFileImpl_QueryInterface(IDirectXFile* iface, REFII if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectXFile)) { - IClassFactory_AddRef(iface); + IUnknown_AddRef(iface); *ppvObject = This; return S_OK; } @@ -482,7 +482,7 @@ static HRESULT WINAPI IDirectXFileBinaryImpl_QueryInterface(IDirectXFileBinary* || IsEqualGUID(riid, &IID_IDirectXFileObject) || IsEqualGUID(riid, &IID_IDirectXFileBinary)) { - IClassFactory_AddRef(iface); + IUnknown_AddRef(iface); *ppvObject = This; return S_OK; } @@ -610,7 +610,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_QueryInterface(IDirectXFileData* ifac || IsEqualGUID(riid, &IID_IDirectXFileObject) || IsEqualGUID(riid, &IID_IDirectXFileData)) { - IClassFactory_AddRef(iface); + IUnknown_AddRef(iface); *ppvObject = This; return S_OK; } @@ -853,7 +853,7 @@ static HRESULT WINAPI IDirectXFileDataReferenceImpl_QueryInterface(IDirectXFileD || IsEqualGUID(riid, &IID_IDirectXFileObject) || IsEqualGUID(riid, &IID_IDirectXFileDataReference)) { - IClassFactory_AddRef(iface); + IUnknown_AddRef(iface); *ppvObject = This; return S_OK; } @@ -985,7 +985,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_QueryInterface(IDirectXFileEnum if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectXFileEnumObject)) { - IClassFactory_AddRef(iface); + IUnknown_AddRef(iface); *ppvObject = This; return S_OK; } @@ -1195,7 +1195,7 @@ static HRESULT WINAPI IDirectXFileSaveObjectImpl_QueryInterface(IDirectXFileSave if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectXFileSaveObject)) { - IClassFactory_AddRef(iface); + IUnknown_AddRef(iface); *ppvObject = This; return S_OK; }

1 0

Christian Costa : ddraw/tests: Fix typos.
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: 2e48bdd14410c0422dc485d61a0c4178b6759404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e48bdd14410c0422dc485d61… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 1 09:38:32 2010 +0100 ddraw/tests: Fix typos. --- dlls/ddraw/tests/d3d.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index e922f5d..6d58c67 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3184,8 +3184,8 @@ static void SetRenderTargetTest(void) ok(vp.dwY == 10, "vp.dwY is %u, expected 10\n", vp.dwY); ok(vp.dwWidth == 246, "vp.dwWidth is %u, expected 246\n", vp.dwWidth); ok(vp.dwHeight == 246, "vp.dwHeight is %u, expected 246\n", vp.dwHeight); - ok(vp.dvMinZ == 0.25, "vp.dvMinZ is %f, expected 0.1\n", vp.dvMinZ); - ok(vp.dvMaxZ == 0.75, "vp.dvMaxZ is %f, expected 0.9\n", vp.dvMaxZ); + ok(vp.dvMinZ == 0.25, "vp.dvMinZ is %f, expected 0.25\n", vp.dvMinZ); + ok(vp.dvMaxZ == 0.75, "vp.dvMaxZ is %f, expected 0.75\n", vp.dvMaxZ); memset(&vp, 0, sizeof(vp)); vp.dwX = 0;

1 0

Christian Costa : d3drm: Use proper macro for AddRef.
by Alexandre Julliard 01 Mar '10

01 Mar '10

Module: wine Branch: master Commit: edb9fad0a828c351fa81d1b87b6fb75de1afe750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edb9fad0a828c351fa81d1b87… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Mar 1 09:38:58 2010 +0100 d3drm: Use proper macro for AddRef. --- dlls/d3drm/d3drm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 72eb864..a14226c 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -68,7 +68,7 @@ static HRESULT WINAPI IDirect3DRMImpl_QueryInterface(IDirect3DRM* iface, REFIID if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DRM)) { - IClassFactory_AddRef(iface); + IUnknown_AddRef(iface); *ppvObject = This; return S_OK; }

1 0