February 2010 - Wine-commits

Piotr Caban : oleaut32: Update TypeInfo flags when object inherits IDispatch.
by Alexandre Julliard 25 Feb '10

25 Feb '10

Module: wine Branch: master Commit: ccdafdb9c3da7ba19e543e2efd589e7f28dd99c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccdafdb9c3da7ba19e543e2ef… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 25 15:08:11 2010 +0100 oleaut32: Update TypeInfo flags when object inherits IDispatch. --- dlls/oleaut32/tests/typelib.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/oleaut32/typelib2.c | 20 +++++++++++++++++--- 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 40423f3..5aee88d 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -973,6 +973,7 @@ static void test_CreateTypeLib(void) { static OLECHAR typelibW[] = {'t','y','p','e','l','i','b',0}; static OLECHAR interface1W[] = {'i','n','t','e','r','f','a','c','e','1',0}; static OLECHAR interface2W[] = {'i','n','t','e','r','f','a','c','e','2',0}; + static OLECHAR dualW[] = {'d','u','a','l',0}; static OLECHAR coclassW[] = {'c','o','c','l','a','s','s',0}; static WCHAR defaultW[] = {'d','e','f','a','u','l','t',0x3213,0}; static OLECHAR func1W[] = {'f','u','n','c','1',0}; @@ -987,7 +988,7 @@ static void test_CreateTypeLib(void) { ICreateTypeLib2 *createtl; ICreateTypeInfo *createti; ITypeLib *tl, *stdole; - ITypeInfo *interface1, *interface2, *unknown, *ti; + ITypeInfo *interface1, *interface2, *unknown, *dispatch, *ti; FUNCDESC funcdesc; ELEMDESC elemdesc[5]; PARAMDESCEX paramdescex; @@ -1008,6 +1009,9 @@ static void test_CreateTypeLib(void) { hres = ITypeLib_GetTypeInfoOfGuid(stdole, &IID_IUnknown, &unknown); ok(hres == S_OK, "got %08x\n", hres); + hres = ITypeLib_GetTypeInfoOfGuid(stdole, &IID_IDispatch, &dispatch); + ok(hres == S_OK, "got %08x\n", hres); + GetTempFileNameA(".", "tlb", 0, filename); MultiByteToWideChar(CP_ACP, 0, filename, -1, filenameW, MAX_PATH); @@ -1309,6 +1313,37 @@ static void test_CreateTypeLib(void) { ICreateTypeInfo_Release(createti); + hres = ICreateTypeLib_CreateTypeInfo(createtl, dualW, TKIND_INTERFACE, &createti); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ICreateTypeInfo_AddRefTypeInfo(createti, dispatch, &hreftype); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ICreateTypeInfo_AddImplType(createti, 0, hreftype); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ICreateTypeInfo_QueryInterface(createti, &IID_ITypeInfo, (void**)&ti); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ITypeInfo_GetTypeAttr(ti, &typeattr); + ok(hres == S_OK, "got %08x\n", hres); + ok(typeattr->cbSizeInstance == 4, "cbSizeInstance = %d\n", typeattr->cbSizeInstance); + ok(typeattr->typekind == 3, "typekind = %d\n", typeattr->typekind); + ok(typeattr->cFuncs == 0, "cFuncs = %d\n", typeattr->cFuncs); + ok(typeattr->cVars == 0, "cVars = %d\n", typeattr->cVars); + ok(typeattr->cImplTypes == 1, "cImplTypes = %d\n", typeattr->cImplTypes); + ok(typeattr->cbSizeVft == 28, "cbSizeVft = %d\n", typeattr->cbSizeVft); + ok(typeattr->cbAlignment == 4, "cbAlignment = %d\n", typeattr->cbAlignment); + ok(typeattr->wTypeFlags == TYPEFLAG_FDISPATCHABLE, "wTypeFlags = %d\n", typeattr->wTypeFlags); + ok(typeattr->wMajorVerNum == 0, "wMajorVerNum = %d\n", typeattr->wMajorVerNum); + ok(typeattr->wMinorVerNum == 0, "wMinorVerNum = %d\n", typeattr->wMinorVerNum); + + ITypeInfo_ReleaseTypeAttr(ti, typeattr); + + ITypeInfo_Release(ti); + + ICreateTypeInfo_Release(createti); + hres = ITypeInfo_GetTypeAttr(interface1, &typeattr); ok(hres == S_OK, "got %08x\n", hres); ok(typeattr->cbSizeInstance == 4, "cbSizeInstance = %d\n", typeattr->cbSizeInstance); @@ -1348,6 +1383,7 @@ static void test_CreateTypeLib(void) { ITypeInfo_Release(interface2); ITypeInfo_Release(interface1); + ITypeInfo_Release(dispatch); ITypeInfo_Release(unknown); ITypeLib_Release(tl); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index ca4bda7..de84e4a 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -170,6 +170,9 @@ typedef struct tagICreateTypeLib2Impl char *typelib_segment_data[MSFT_SEG_MAX]; int typelib_segment_block_length[MSFT_SEG_MAX]; + int typelib_guids; /* Number of defined typelib guids */ + int typeinfo_guids; /* Number of defined typeinfo guids */ + INT typelib_typeinfo_offsets[0x200]; /* Hope that's enough. */ INT *typelib_namehash_segment; @@ -1547,7 +1550,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo( WCHAR name[MAX_PATH], *p; TLIBATTR *tlibattr; TYPEATTR *typeattr; - MSFT_GuidEntry guid; + MSFT_GuidEntry guid, *check_guid; MSFT_ImpInfo impinfo; int guid_offset, import_offset; DWORD len; @@ -1559,7 +1562,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo( return hres; guid.guid = tlibattr->guid; - guid.hreftype = 2; + guid.hreftype = This->typelib->typelib_guids*12+2; guid.next_hash = -1; guid_offset = ctl2_alloc_guid(This->typelib, &guid); @@ -1568,6 +1571,10 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo( return E_OUTOFMEMORY; } + check_guid = (MSFT_GuidEntry*)&This->typelib->typelib_segment_data[MSFT_SEG_GUID][guid_offset]; + if(check_guid->hreftype == guid.hreftype) + This->typelib->typelib_guids++; + /* Get import file name */ /* Check HKEY_CLASSES_ROOT\TypeLib\{GUID}\{Ver}\0\win32 */ len = MAX_PATH; @@ -1599,7 +1606,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo( return hres; guid.guid = typeattr->guid; - guid.hreftype = 1; + guid.hreftype = This->typelib->typeinfo_guids*12+1; guid.next_hash = -1; ITypeInfo_ReleaseTypeAttr(pTInfo, typeattr); @@ -1607,6 +1614,10 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo( if(guid_offset == -1) return E_OUTOFMEMORY; + check_guid = (MSFT_GuidEntry*)&This->typelib->typelib_segment_data[MSFT_SEG_GUID][guid_offset]; + if(check_guid->hreftype == guid.hreftype) + This->typelib->typeinfo_guids++; + /* Allocate importinfo */ impinfo.flags = ((This->typeinfo->typekind&0xf)<<24) | MSFT_IMPINFO_OFFSET_IS_GUID; impinfo.oImpFile = import_offset; @@ -2316,6 +2327,9 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut( if(FAILED(hres)) return hres; + if(!memcmp(&typeattr->guid, &IID_IDispatch, sizeof(IDispatch))) + This->typeinfo->flags |= TYPEFLAG_FDISPATCHABLE; + This->typeinfo->datatype2 += (typeattr->cFuncs<<16) + 1; ITypeInfo_ReleaseTypeAttr(cur, typeattr);

1 0

Hans Leidekker : msi: Implement the RemoveRegistryValues standard action.
by Alexandre Julliard 25 Feb '10

25 Feb '10

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

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

25 Feb '10

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

André Hentschel : oleaut32/tests: Add some tests.
by Alexandre Julliard 25 Feb '10

25 Feb '10

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

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

25 Feb '10

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 25 Feb '10

25 Feb '10

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

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

24 Feb '10

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

Dmitry Timoshkov : user32: DeleteDC() should allow to delete a DC returned by GetDC().
by Alexandre Julliard 24 Feb '10

24 Feb '10

Module: wine Branch: master Commit: d6cfc3223ef8861830237fe415667a5ba73231d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6cfc3223ef8861830237fe41… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Feb 24 22:44:41 2010 +0800 user32: DeleteDC() should allow to delete a DC returned by GetDC(). --- dlls/gdi32/dc.c | 2 +- dlls/gdi32/tests/dc.c | 152 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/user32/painting.c | 3 +- 3 files changed, 154 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 2aeeec2..577c151 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -819,7 +819,7 @@ BOOL WINAPI DeleteDC( HDC hdc ) if (dc->hookProc && !dc->hookProc( hdc, DCHC_DELETEDC, dc->dwHookData, 0 )) { release_dc_ptr( dc ); - return FALSE; + return TRUE; } while (dc->saveLevel) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 1efde38..43c2480 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -69,7 +69,7 @@ static void test_savedc_2(void) assert(hrgn != 0); hdc = GetDC(hwnd); - ok(hdc != NULL, "CreateDC rets %p\n", hdc); + ok(hdc != NULL, "GetDC failed\n"); ret = GetClipBox(hdc, &rc_clip); ok(ret == SIMPLEREGION, "GetClipBox returned %d instead of SIMPLEREGION\n", ret); @@ -328,6 +328,155 @@ static void test_DC_bitmap(void) ReleaseDC( 0, hdc ); } +static void test_DeleteDC(void) +{ + HWND hwnd; + HDC hdc, hdc_test; + WNDCLASSEX cls; + int ret; + + /* window DC */ + hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP|WS_VISIBLE, 0,0,100,100, + 0, 0, 0, NULL); + ok(hwnd != 0, "CreateWindowExA failed\n"); + + hdc = GetDC(hwnd); + ok(hdc != 0, "GetDC failed\n"); + ret = GetObjectType(hdc); + ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); + ret = DeleteDC(hdc); + ok(ret, "DeleteDC failed\n"); + ret = GetObjectType(hdc); + ok(!ret, "GetObjectType should fail for a deleted DC\n"); + + hdc = GetWindowDC(hwnd); + ok(hdc != 0, "GetDC failed\n"); + ret = GetObjectType(hdc); + ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); + ret = DeleteDC(hdc); + ok(ret, "DeleteDC failed\n"); + ret = GetObjectType(hdc); + ok(!ret, "GetObjectType should fail for a deleted DC\n"); + + DestroyWindow(hwnd); + + /* desktop window DC */ + hwnd = GetDesktopWindow(); + ok(hwnd != 0, "GetDesktopWindow failed\n"); + + hdc = GetDC(hwnd); + ok(hdc != 0, "GetDC failed\n"); + ret = GetObjectType(hdc); + ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); + ret = DeleteDC(hdc); + ok(ret, "DeleteDC failed\n"); + ret = GetObjectType(hdc); + ok(!ret, "GetObjectType should fail for a deleted DC\n"); + + hdc = GetWindowDC(hwnd); + ok(hdc != 0, "GetDC failed\n"); + ret = GetObjectType(hdc); + ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); + ret = DeleteDC(hdc); + ok(ret, "DeleteDC failed\n"); + ret = GetObjectType(hdc); + ok(!ret, "GetObjectType should fail for a deleted DC\n"); + + /* CS_CLASSDC */ + memset(&cls, 0, sizeof(cls)); + cls.cbSize = sizeof(cls); + cls.style = CS_CLASSDC; + cls.hInstance = GetModuleHandle(0); + cls.lpszClassName = "Wine class DC"; + cls.lpfnWndProc = DefWindowProcA; + ret = RegisterClassExA(&cls); + ok(ret, "RegisterClassExA failed\n"); + + hwnd = CreateWindowExA(0, "Wine class DC", NULL, WS_POPUP|WS_VISIBLE, 0,0,100,100, + 0, 0, 0, NULL); + ok(hwnd != 0, "CreateWindowExA failed\n"); + + hdc = GetDC(hwnd); + ok(hdc != 0, "GetDC failed\n"); + ret = GetObjectType(hdc); + ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); + ret = DeleteDC(hdc); + ok(ret, "DeleteDC failed\n"); + ret = GetObjectType(hdc); + ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); + ret = ReleaseDC(hwnd, hdc); + ok(ret, "ReleaseDC failed\n"); + ret = GetObjectType(hdc); + ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); + + hdc_test = hdc; + + hdc = GetWindowDC(hwnd); + ok(hdc != 0, "GetDC failed\n"); + ret = GetObjectType(hdc); + ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); + ret = DeleteDC(hdc); + ok(ret, "DeleteDC failed\n"); + ret = GetObjectType(hdc); + ok(!ret, "GetObjectType should fail for a deleted DC\n"); + + DestroyWindow(hwnd); + + ret = GetObjectType(hdc_test); + ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); + + ret = UnregisterClassA("Wine class DC", GetModuleHandle(NULL)); + ok(ret, "UnregisterClassA failed\n"); + + ret = GetObjectType(hdc_test); +todo_wine + ok(!ret, "GetObjectType should fail for a deleted DC\n"); + + /* CS_OWNDC */ + memset(&cls, 0, sizeof(cls)); + cls.cbSize = sizeof(cls); + cls.style = CS_OWNDC; + cls.hInstance = GetModuleHandle(0); + cls.lpszClassName = "Wine own DC"; + cls.lpfnWndProc = DefWindowProcA; + ret = RegisterClassExA(&cls); + ok(ret, "RegisterClassExA failed\n"); + + hwnd = CreateWindowExA(0, "Wine own DC", NULL, WS_POPUP|WS_VISIBLE, 0,0,100,100, + 0, 0, 0, NULL); + ok(hwnd != 0, "CreateWindowExA failed\n"); + + hdc = GetDC(hwnd); + ok(hdc != 0, "GetDC failed\n"); + ret = GetObjectType(hdc); + ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); + ret = DeleteDC(hdc); + ok(ret, "DeleteDC failed\n"); + ret = GetObjectType(hdc); + ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); + ret = ReleaseDC(hwnd, hdc); + ok(ret, "ReleaseDC failed\n"); + ret = GetObjectType(hdc); + ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); + + hdc = GetWindowDC(hwnd); + ok(hdc != 0, "GetDC failed\n"); + ret = GetObjectType(hdc); + ok(ret == OBJ_DC, "expected OBJ_DC, got %d\n", ret); + ret = DeleteDC(hdc); + ok(ret, "DeleteDC failed\n"); + ret = GetObjectType(hdc); + ok(!ret, "GetObjectType should fail for a deleted DC\n"); + + DestroyWindow(hwnd); + + ret = GetObjectType(hdc_test); + ok(!ret, "GetObjectType should fail for a deleted DC\n"); + + ret = UnregisterClassA("Wine own DC", GetModuleHandle(NULL)); + ok(ret, "UnregisterClassA failed\n"); +} + START_TEST(dc) { test_savedc(); @@ -335,4 +484,5 @@ START_TEST(dc) test_GdiConvertToDevmodeW(); test_CreateCompatibleDC(); test_DC_bitmap(); + test_DeleteDC(); } diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index cde642c..732c889 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -296,6 +296,7 @@ static struct dce *get_window_dce( HWND hwnd ) { win->dce = dce; dce->hwnd = hwnd; + dce->count++; list_add_tail( &dce_list, &dce->entry ); } WIN_ReleasePtr( win ); @@ -495,7 +496,7 @@ static BOOL CALLBACK dc_hook( HDC hDC, WORD code, DWORD_PTR data, LPARAM lParam * (between GetDC and ReleaseDC) */ USER_Lock(); - if (dce->count) + if (dce->count > 1) { WARN("Application trying to delete a busy DC %p\n", dce->hdc); retv = FALSE;

1 0

Alexandre Julliard : shell32/tests: Don' t use the return value of the ok macro.
by Alexandre Julliard 24 Feb '10

24 Feb '10

Module: wine Branch: master Commit: d279227538a32130c437ba8523f7c928e1b1d109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d279227538a32130c437ba852… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 16:03:15 2010 +0100 shell32/tests: Don't use the return value of the ok macro. --- dlls/shell32/tests/shlexec.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index c673f0a..5d5db34 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -672,28 +672,28 @@ static int StrCmpPath(const char* s1, const char* s2) return 0; } -static int _okChildString(const char* file, int line, const char* key, const char* expected) +static void _okChildString(const char* file, int line, const char* key, const char* expected) { char* result; result=getChildString("Arguments", key); - return ok_(file, line)(lstrcmpiA(result, expected) == 0, - "%s expected '%s', got '%s'\n", key, expected, result); + ok_(file, line)(lstrcmpiA(result, expected) == 0, + "%s expected '%s', got '%s'\n", key, expected, result); } -static int _okChildPath(const char* file, int line, const char* key, const char* expected) +static void _okChildPath(const char* file, int line, const char* key, const char* expected) { char* result; result=getChildString("Arguments", key); - return ok_(file, line)(StrCmpPath(result, expected) == 0, - "%s expected '%s', got '%s'\n", key, expected, result); + ok_(file, line)(StrCmpPath(result, expected) == 0, + "%s expected '%s', got '%s'\n", key, expected, result); } -static int _okChildInt(const char* file, int line, const char* key, int expected) +static void _okChildInt(const char* file, int line, const char* key, int expected) { INT result; result=GetPrivateProfileIntA("Arguments", key, expected, child_file); - return ok_(file, line)(result == expected, - "%s expected %d, but got %d\n", key, expected, result); + ok_(file, line)(result == expected, + "%s expected %d, but got %d\n", key, expected, result); } #define okChildString(key, expected) _okChildString(__FILE__, __LINE__, (key), (expected))

1 0

Alexandre Julliard : shell32/tests: Fix broken check of the ok() macro return value.
by Alexandre Julliard 24 Feb '10

24 Feb '10

Module: wine Branch: master Commit: d5a54642f478a530cf7672332c423233d11f157f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5a54642f478a530cf7672332… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 16:04:05 2010 +0100 shell32/tests: Fix broken check of the ok() macro return value. Spotted by Yann Droneaud. --- dlls/shell32/tests/autocomplete.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 042e238..569625f 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -126,9 +126,8 @@ START_TEST(autocomplete) return; createMainWnd(); - - 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; ac = test_init(); if (!ac)

1 0