February 2010 - Wine-Commits

Hans Leidekker : msi: Implement the RemoveRegistryValues standard action.
by Alexandre Julliard Feb. 25, 2010

Feb. 25, 2010

Module: wine Branch: master Commit: 342f866044562a722fe8923fce1b4a8531af9a16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=342f866044562a722fe8923fc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 25 15:17:11 2010 +0100 msi: Implement the RemoveRegistryValues standard action. --- dlls/msi/action.c | 306 ++++++++++++++++++++++++++++++++++++++++++---------- dlls/msi/msipriv.h | 4 + 2 files changed, 254 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=342f866044562a722fe89…

1 0

Vincent Povirk : gdiplus: Free the attached HBITMAP when destroying Bitmap objects.
by Alexandre Julliard Feb. 25, 2010

Feb. 25, 2010

Module: wine Branch: master Commit: f62560f76c532dcbcee158434c3649ad08342bf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f62560f76c532dcbcee158434… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 24 17:01:39 2010 -0600 gdiplus: Free the attached HBITMAP when destroying Bitmap objects. --- dlls/gdiplus/image.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 1d48a0b..bd480c2 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1837,6 +1837,7 @@ GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) { GdipFree(((GpBitmap*)image)->bitmapbits); DeleteDC(((GpBitmap*)image)->hdc); + DeleteObject(((GpBitmap*)image)->hbitmap); } GdipFree(image->palette_entries); GdipFree(image);

1 0

André Hentschel : oleaut32/tests: Add some tests.
by Alexandre Julliard Feb. 25, 2010

Feb. 25, 2010

Module: wine Branch: master Commit: da519c603bb01bad24b8084dd0698721a7f5ed35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da519c603bb01bad24b8084dd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 24 19:09:22 2010 +0100 oleaut32/tests: Add some tests. --- dlls/oleaut32/tests/varformat.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index d0975ed..1c476a0 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -389,6 +389,8 @@ static void test_VarFormat(void) VARFMT(VT_R8,V_R8,0.0995,"#.##",S_OK,".1"); VARFMT(VT_R8,V_R8,8.0995,"#.##",S_OK,"8.1"); VARFMT(VT_R8,V_R8,0.0994,"#.##",S_OK,".1"); + VARFMT(VT_R8,V_R8,1.00,"#,##0.00",S_OK,"1.00"); + todo_wine VARFMT(VT_R8,V_R8,0.0995,"#.###",S_OK,".1"); /* 'out' is not cleared */

1 0

Charles Davis : include: Don' t accidentally redefine a member in struct _IRP (LLVM/Clang).
by Alexandre Julliard Feb. 25, 2010

Feb. 25, 2010

Module: wine Branch: master Commit: 5415b62fc2c65d736d4b723b326de8708ddf79b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5415b62fc2c65d736d4b723b3… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Wed Feb 24 09:50:03 2010 -0700 include: Don't accidentally redefine a member in struct _IRP (LLVM/Clang). --- dlls/mountmgr.sys/device.c | 2 +- dlls/mountmgr.sys/mountmgr.c | 2 +- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++------ include/ddk/wdm.h | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index d17f878..bf2bcee 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -858,7 +858,7 @@ NTSTATUS query_dos_device( int letter, enum device_type *type, char **device, ch /* handler for ioctls on the harddisk device */ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) { - IO_STACK_LOCATION *irpsp = irp->Tail.Overlay.s.u.CurrentStackLocation; + IO_STACK_LOCATION *irpsp = irp->Tail.Overlay.s.u2.CurrentStackLocation; struct disk_device *dev = device->DeviceExtension; TRACE( "ioctl %x insize %u outsize %u\n", diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 7056ef4..c92e4a4 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -351,7 +351,7 @@ done: /* handler for ioctls on the mount manager device */ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) { - IO_STACK_LOCATION *irpsp = irp->Tail.Overlay.s.u.CurrentStackLocation; + IO_STACK_LOCATION *irpsp = irp->Tail.Overlay.s.u2.CurrentStackLocation; TRACE( "ioctl %x insize %u outsize %u\n", irpsp->Parameters.DeviceIoControl.IoControlCode, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index fcb7bea..0131d24 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -144,7 +144,7 @@ static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff, irp.AssociatedIrp.SystemBuffer = in_buff; irp.UserBuffer = out_buff; irp.MdlAddress = &mdl; - irp.Tail.Overlay.s.u.CurrentStackLocation = &irpsp; + irp.Tail.Overlay.s.u2.CurrentStackLocation = &irpsp; irp.UserIosb = NULL; irpsp.MajorFunction = IRP_MJ_DEVICE_CONTROL; @@ -294,7 +294,7 @@ void WINAPI IoInitializeIrp( IRP *irp, USHORT size, CCHAR stack_size ) InitializeListHead( &irp->ThreadListEntry ); irp->StackCount = stack_size; irp->CurrentLocation = stack_size + 1; - irp->Tail.Overlay.s.u.CurrentStackLocation = + irp->Tail.Overlay.s.u2.CurrentStackLocation = (PIO_STACK_LOCATION)(irp + 1) + stack_size; } @@ -434,7 +434,7 @@ PIRP WINAPI IoBuildDeviceIoControlRequest( ULONG IoControlCode, instance->irp = irp; list_add_tail( &Irps, &instance->entry ); - irpsp = irp->Tail.Overlay.s.u.CurrentStackLocation - 1; + irpsp = irp->Tail.Overlay.s.u2.CurrentStackLocation - 1; irpsp->MajorFunction = InternalDeviceIoControl ? IRP_MJ_INTERNAL_DEVICE_CONTROL : IRP_MJ_DEVICE_CONTROL; irpsp->Parameters.DeviceIoControl.IoControlCode = IoControlCode; @@ -647,7 +647,7 @@ NTSTATUS WINAPI IofCallDriver( DEVICE_OBJECT *device, IRP *irp ) TRACE( "%p %p\n", device, irp ); --irp->CurrentLocation; - irpsp = --irp->Tail.Overlay.s.u.CurrentStackLocation; + irpsp = --irp->Tail.Overlay.s.u2.CurrentStackLocation; dispatch = device->DriverObject->MajorFunction[irpsp->MajorFunction]; status = dispatch( device, irp ); @@ -744,7 +744,7 @@ void WINAPI IofCompleteRequest( IRP *irp, UCHAR priority_boost ) status = irp->IoStatus.u.Status; while (irp->CurrentLocation <= irp->StackCount) { - irpsp = irp->Tail.Overlay.s.u.CurrentStackLocation; + irpsp = irp->Tail.Overlay.s.u2.CurrentStackLocation; routine = irpsp->CompletionRoutine; call_flag = 0; /* FIXME: add SL_INVOKE_ON_CANCEL support */ @@ -756,7 +756,7 @@ void WINAPI IofCompleteRequest( IRP *irp, UCHAR priority_boost ) call_flag = 1; } ++irp->CurrentLocation; - ++irp->Tail.Overlay.s.u.CurrentStackLocation; + ++irp->Tail.Overlay.s.u2.CurrentStackLocation; if (call_flag) { TRACE( "calling %p( %p, %p, %p )\n", routine, diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index a382294..72c6e85 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -423,7 +423,7 @@ typedef struct _IRP { struct { PVOID DriverContext[4]; } DUMMYSTRUCTNAME; - } DUMMYUNIONNAME; + } DUMMYUNIONNAME1; PETHREAD Thread; PCHAR AuxiliaryBuffer; struct { @@ -431,7 +431,7 @@ typedef struct _IRP { union { struct _IO_STACK_LOCATION *CurrentStackLocation; ULONG PacketType; - } DUMMYUNIONNAME; + } DUMMYUNIONNAME2; } DUMMYSTRUCTNAME; struct _FILE_OBJECT *OriginalFileObject; } Overlay;

1 0

Jacek Caban : atl: Don' t add CLSID_ATLRegistrar replacement in do_register_dll_server.
by Alexandre Julliard Feb. 25, 2010

Feb. 25, 2010

Module: wine Branch: master Commit: 75967cd9ffc20557d2166ace97d4b547b1ed7815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75967cd9ffc20557d2166ace9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 24 21:57:26 2010 +0100 atl: Don't add CLSID_ATLRegistrar replacement in do_register_dll_server. --- dlls/atl/registrar.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index b2efda9..691b005 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -758,14 +758,11 @@ static HRESULT do_register_dll_server(IRegistrar *pRegistrar, LPCOLESTR wszDll, LPCOLESTR wszId, BOOL do_register, const struct _ATL_REGMAP_ENTRY* pMapEntries) { - WCHAR buf[MAX_PATH]; HRESULT hres; const struct _ATL_REGMAP_ENTRY *pMapEntry; static const WCHAR wszModule[] = {'M','O','D','U','L','E',0}; static const WCHAR wszRegistry[] = {'R','E','G','I','S','T','R','Y',0}; - static const WCHAR wszCLSID_ATLRegistrar[] = - {'C','L','S','I','D','_','A','T','L','R','e','g','i','s','t','r','a','r',0}; if (!pRegistrar) Registrar_create(NULL, &IID_IRegistrar, (void**)&pRegistrar); @@ -775,9 +772,6 @@ static HRESULT do_register_dll_server(IRegistrar *pRegistrar, LPCOLESTR wszDll, for (pMapEntry = pMapEntries; pMapEntry && pMapEntry->szKey; pMapEntry++) IRegistrar_AddReplacement(pRegistrar, pMapEntry->szKey, pMapEntry->szData); - StringFromGUID2(&CLSID_ATLRegistrar, buf, sizeof(buf)/sizeof(buf[0])); - IRegistrar_AddReplacement(pRegistrar, wszCLSID_ATLRegistrar, buf); - if(do_register) hres = IRegistrar_ResourceRegisterSz(pRegistrar, wszDll, wszId, wszRegistry); else @@ -789,8 +783,15 @@ static HRESULT do_register_dll_server(IRegistrar *pRegistrar, LPCOLESTR wszDll, static HRESULT do_register_server(BOOL do_register) { - static const WCHAR wszDll[] = {'a','t','l','.','d','l','l',0}; - return do_register_dll_server(NULL, wszDll, MAKEINTRESOURCEW(101), do_register, NULL); + static const WCHAR CLSID_ATLRegistrarW[] = + {'C','L','S','I','D','_','A','T','L','R','e','g','i','s','t','r','a','r',0}; + static const WCHAR atl_dllW[] = {'a','t','l','.','d','l','l',0}; + + WCHAR clsid_str[40]; + const struct _ATL_REGMAP_ENTRY reg_map[] = {{CLSID_ATLRegistrarW, clsid_str}, {NULL,NULL}}; + + StringFromGUID2(&CLSID_ATLRegistrar, clsid_str, sizeof(clsid_str)/sizeof(WCHAR)); + return do_register_dll_server(NULL, atl_dllW, MAKEINTRESOURCEW(101), do_register, reg_map); } /***********************************************************************

1 0

Jacek Caban : atl: Properly release registrar in do_register_dll_server.
by Alexandre Julliard Feb. 25, 2010

Feb. 25, 2010

Module: wine Branch: master Commit: f6b43416385a66b9603aa246487710d28badb6b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b43416385a66b9603aa2464… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 24 21:57:48 2010 +0100 atl: Properly release registrar in do_register_dll_server. --- dlls/atl/registrar.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 691b005..70c1384 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -758,26 +758,30 @@ static HRESULT do_register_dll_server(IRegistrar *pRegistrar, LPCOLESTR wszDll, LPCOLESTR wszId, BOOL do_register, const struct _ATL_REGMAP_ENTRY* pMapEntries) { + IRegistrar *registrar; HRESULT hres; const struct _ATL_REGMAP_ENTRY *pMapEntry; static const WCHAR wszModule[] = {'M','O','D','U','L','E',0}; static const WCHAR wszRegistry[] = {'R','E','G','I','S','T','R','Y',0}; - if (!pRegistrar) - Registrar_create(NULL, &IID_IRegistrar, (void**)&pRegistrar); + if (pRegistrar) + registrar = pRegistrar; + else + Registrar_create(NULL, &IID_IRegistrar, (void**)&registrar); - IRegistrar_AddReplacement(pRegistrar, wszModule, wszDll); + IRegistrar_AddReplacement(registrar, wszModule, wszDll); for (pMapEntry = pMapEntries; pMapEntry && pMapEntry->szKey; pMapEntry++) - IRegistrar_AddReplacement(pRegistrar, pMapEntry->szKey, pMapEntry->szData); + IRegistrar_AddReplacement(registrar, pMapEntry->szKey, pMapEntry->szData); if(do_register) - hres = IRegistrar_ResourceRegisterSz(pRegistrar, wszDll, wszId, wszRegistry); + hres = IRegistrar_ResourceRegisterSz(registrar, wszDll, wszId, wszRegistry); else - hres = IRegistrar_ResourceUnregisterSz(pRegistrar, wszDll, wszId, wszRegistry); + hres = IRegistrar_ResourceUnregisterSz(registrar, wszDll, wszId, wszRegistry); - IRegistrar_Release(pRegistrar); + if(registrar != pRegistrar) + IRegistrar_Release(registrar); return hres; }

1 0

Alexandre Julliard : user32/tests: Fix broken check of the ok() macro return value.
by Alexandre Julliard Feb. 24, 2010

Feb. 24, 2010

Module: wine Branch: master Commit: c888a2eb227ad4a0c731b77188830969ba21bbb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c888a2eb227ad4a0c731b7718… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 16:04:11 2010 +0100 user32/tests: Fix broken check of the ok() macro return value. Spotted by Yann Droneaud. --- dlls/user32/tests/scroll.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 03725b9..0695639 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -411,8 +411,8 @@ START_TEST ( scroll ) WS_OVERLAPPEDWINDOW|WS_VSCROLL|WS_HSCROLL, CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0 ); - if ( !ok( hMainWnd != NULL, "Failed to create parent window. Tests aborted.\n" ) ) - return; + ok(hMainWnd != NULL, "Failed to create parent window. Tests aborted.\n"); + if (!hMainWnd) return; assert( hScroll );

1 0

Alexandre Julliard : kernel32/tests: Fix broken usage of the ok() macro return value.
by Alexandre Julliard Feb. 24, 2010

Feb. 24, 2010

Module: wine Branch: master Commit: fbbac38e4ed9fd95d5ab3d0422bcc55ee2d39498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbbac38e4ed9fd95d5ab3d042… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 16:47:48 2010 +0100 kernel32/tests: Fix broken usage of the ok() macro return value. Spotted by Yann Droneaud. --- dlls/kernel32/tests/file.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 3493ff3..b6f066e 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1602,12 +1602,12 @@ static void test_LockFile(void) /* zero-byte lock */ ok( LockFile( handle, 100, 0, 0, 0 ), "LockFile 100,0 failed\n" ); - limited_LockFile || ok( !LockFile( handle, 98, 0, 4, 0 ), "LockFile 98,4 succeeded\n" ); + if (!limited_LockFile) ok( !LockFile( handle, 98, 0, 4, 0 ), "LockFile 98,4 succeeded\n" ); ok( LockFile( handle, 90, 0, 10, 0 ), "LockFile 90,10 failed\n" ); - limited_LockFile || ok( !LockFile( handle, 100, 0, 10, 0 ), "LockFile 100,10 failed\n" ); + if (!limited_LockFile) ok( !LockFile( handle, 100, 0, 10, 0 ), "LockFile 100,10 failed\n" ); ok( UnlockFile( handle, 90, 0, 10, 0 ), "UnlockFile 90,10 failed\n" ); - !ok( UnlockFile( handle, 100, 0, 10, 0 ), "UnlockFile 100,10 failed\n" ); + ok( !UnlockFile( handle, 100, 0, 10, 0 ), "UnlockFile 100,10 succeeded\n" ); ok( UnlockFile( handle, 100, 0, 0, 0 ), "UnlockFile 100,0 failed\n" );

1 0

Alexandre Julliard : tests: The ok() macro shouldn't return a value.
by Alexandre Julliard Feb. 24, 2010

Feb. 24, 2010

Module: wine Branch: master Commit: 69ee0ad151b4ae14fa017d3f5a284af587d7de01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69ee0ad151b4ae14fa017d3f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 16:48:07 2010 +0100 tests: The ok() macro shouldn't return a value. --- include/wine/test.h | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 5d371c5..e6a7711 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -88,21 +88,21 @@ extern void winetest_vskip( const char *msg, va_list ap ); #ifdef __GNUC__ -extern int winetest_ok( int condition, const char *msg, ... ) __attribute__((format (printf,2,3) )); +extern void winetest_ok( int condition, const char *msg, ... ) __attribute__((format (printf,2,3) )); extern void winetest_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); extern void winetest_win_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); extern void winetest_trace( const char *msg, ... ) __attribute__((format (printf,1,2))); #else /* __GNUC__ */ -extern int winetest_ok( int condition, const char *msg, ... ); +extern void winetest_ok( int condition, const char *msg, ... ); extern void winetest_skip( const char *msg, ... ); extern void winetest_win_skip( const char *msg, ... ); extern void winetest_trace( const char *msg, ... ); #endif /* __GNUC__ */ -#define ok_(file, line) (winetest_set_location(file, line), 0) ? 0 : winetest_ok +#define ok_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ok #define skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_skip #define win_skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_win_skip #define trace_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_trace @@ -330,15 +330,13 @@ int winetest_vok( int condition, const char *msg, va_list args ) } } -int winetest_ok( int condition, const char *msg, ... ) +void winetest_ok( int condition, const char *msg, ... ) { va_list valist; - int rc; va_start(valist, msg); - rc=winetest_vok(condition, msg, valist); + winetest_vok(condition, msg, valist); va_end(valist); - return rc; } void winetest_trace( const char *msg, ... )

1 0

Nikolay Sivov : user32: Use whole window rectangle for UpdateLayeredWindow.
by Alexandre Julliard Feb. 24, 2010

Feb. 24, 2010

Module: wine Branch: master Commit: e7c909a1bedfc45a04f2b8eb4109334f3edd300c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7c909a1bedfc45a04f2b8eb4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 24 17:30:48 2010 +0300 user32: Use whole window rectangle for UpdateLayeredWindow. --- dlls/user32/win.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 8ed49d8..3a61fc1 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3398,14 +3398,15 @@ BOOL WINAPI UpdateLayeredWindowIndirect( HWND hwnd, const UPDATELAYEREDWINDOWINF if (info->hdcSrc) { - HDC hdc = GetDCEx( hwnd, 0, DCX_CACHE ); + HDC hdc = GetWindowDC( hwnd ); if (hdc) { int x = 0, y = 0; RECT rect; - GetClientRect( hwnd, &rect ); + GetWindowRect( hwnd, &rect ); + OffsetRect( &rect, -rect.left, -rect.top); if (info->pptSrc) { x = info->pptSrc->x;

1 0