May 2013 - Wine-Commits - list.winehq.org

Christian Costa : d3dx9_36: Report D3DFMT_P8 for image with indexed colors in D3DGetImageInfoFromFileInMemory .
by Alexandre Julliard May 14, 2013

May 14, 2013

Module: wine Branch: master Commit: aa1d24f09bd78ebfc5c15438f3de1602b5dd6f85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa1d24f09bd78ebfc5c15438f… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun May 12 23:57:50 2013 +0200 d3dx9_36: Report D3DFMT_P8 for image with indexed colors in D3DGetImageInfoFromFileInMemory. --- dlls/d3dx9_36/surface.c | 6 +++--- dlls/d3dx9_36/tests/surface.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 81bdd78..82ead60 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -37,9 +37,9 @@ static const struct const GUID *wic_guid; D3DFORMAT d3dformat; } wic_pixel_formats[] = { - { &GUID_WICPixelFormat8bppIndexed, D3DFMT_L8 }, - { &GUID_WICPixelFormat1bppIndexed, D3DFMT_L8 }, - { &GUID_WICPixelFormat4bppIndexed, D3DFMT_L8 }, + { &GUID_WICPixelFormat8bppIndexed, D3DFMT_P8 }, + { &GUID_WICPixelFormat1bppIndexed, D3DFMT_P8 }, + { &GUID_WICPixelFormat4bppIndexed, D3DFMT_P8 }, { &GUID_WICPixelFormat16bppBGR555, D3DFMT_X1R5G5B5 }, { &GUID_WICPixelFormat16bppBGR565, D3DFMT_R5G6B5 }, { &GUID_WICPixelFormat24bppBGR, D3DFMT_R8G8B8 }, diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 15707f7..94242d1 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -481,17 +481,17 @@ static void test_D3DXGetImageInfo(void) hr = D3DXGetImageInfoFromFileInMemory(bmp_1bpp, sizeof(bmp_1bpp), &info); ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); ok(info.Depth == 1, "Got depth %u, expected 1\n", info.Depth); - todo_wine ok(info.Format == D3DFMT_P8, "Got format %u, expected %u\n", info.Format, D3DFMT_P8); + ok(info.Format == D3DFMT_P8, "Got format %u, expected %u\n", info.Format, D3DFMT_P8); hr = D3DXGetImageInfoFromFileInMemory(bmp_2bpp, sizeof(bmp_2bpp), &info); ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); hr = D3DXGetImageInfoFromFileInMemory(bmp_4bpp, sizeof(bmp_4bpp), &info); ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); ok(info.Depth == 1, "Got depth %u, expected 1\n", info.Depth); - todo_wine ok(info.Format == D3DFMT_P8, "Got format %u, expected %u\n", info.Format, D3DFMT_P8); + ok(info.Format == D3DFMT_P8, "Got format %u, expected %u\n", info.Format, D3DFMT_P8); hr = D3DXGetImageInfoFromFileInMemory(bmp_8bpp, sizeof(bmp_8bpp), &info); ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); ok(info.Depth == 1, "Got depth %u, expected 1\n", info.Depth); - todo_wine ok(info.Format == D3DFMT_P8, "Got format %u, expected %u\n", info.Format, D3DFMT_P8); + ok(info.Format == D3DFMT_P8, "Got format %u, expected %u\n", info.Format, D3DFMT_P8); /* test DDS support */ hr = D3DXGetImageInfoFromFileInMemory(dds_24bit, sizeof(dds_24bit), &info); @@ -646,7 +646,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) /* D3DXLoadSurfaceFromFile */ if(testbitmap_ok) { hr = D3DXLoadSurfaceFromFileA(surf, NULL, NULL, "testbitmap.bmp", NULL, D3DX_DEFAULT, 0, NULL); - ok(hr == D3D_OK, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3D_OK); + todo_wine ok(hr == D3D_OK, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3D_OK); hr = D3DXLoadSurfaceFromFileA(NULL, NULL, NULL, "testbitmap.bmp", NULL, D3DX_DEFAULT, 0, NULL); ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); @@ -683,7 +683,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) /* D3DXLoadSurfaceFromFileInMemory */ hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, bmp_1bpp, sizeof(bmp_1bpp), NULL, D3DX_DEFAULT, 0, NULL); - ok(hr == D3D_OK, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); + todo_wine ok(hr == D3D_OK, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, noimage, sizeof(noimage), NULL, D3DX_DEFAULT, 0, NULL); ok(hr == D3DXERR_INVALIDDATA, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA);

1 0

Maarten Lankhorst : devenum: Set FriendlyName and wave*ID for devices.
by Alexandre Julliard May 14, 2013

May 14, 2013

Module: wine Branch: master Commit: 604172dd986a6ff1da89cd6682ef9b8ceac639d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=604172dd986a6ff1da89cd668… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri May 10 10:07:09 2013 +0200 devenum: Set FriendlyName and wave*ID for devices. --- dlls/devenum/createdevenum.c | 54 +++++++++++++++++++++++++++++++++++------- dlls/devenum/mediacatenum.c | 1 + 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 625ff62..b7e288b 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -52,6 +52,9 @@ static const WCHAR wszAllowedZero[] = {'A','l','l','o','w','e','d','Z','e','r',' static const WCHAR wszDirection[] = {'D','i','r','e','c','t','i','o','n',0}; static const WCHAR wszIsRendered[] = {'I','s','R','e','n','d','e','r','e','d',0}; static const WCHAR wszTypes[] = {'T','y','p','e','s',0}; +static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; +static const WCHAR wszWaveInID[] = {'W','a','v','e','I','n','I','D',0}; +static const WCHAR wszWaveOutID[] = {'W','a','v','e','O','u','t','I','D',0}; static ULONG WINAPI DEVENUM_ICreateDevEnum_AddRef(ICreateDevEnum * iface); static HRESULT DEVENUM_CreateSpecialCategories(void); @@ -629,6 +632,7 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) WAVEINCAPSW wicaps; MIDIOUTCAPSW mocaps; REGPINTYPES * pTypes; + IPropertyBag * pPropBag = NULL; numDevs = waveOutGetNumDevs(); @@ -666,10 +670,24 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) wocaps.szPname, &rf2); - /* FIXME: do additional stuff with IMoniker here, depending on what RegisterFilter does */ - if (pMoniker) { + VARIANT var; + + V_VT(&var) = VT_I4; + V_UNION(&var, ulVal) = i; + res = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID)&pPropBag); + if (SUCCEEDED(res)) + res = IPropertyBag_Write(pPropBag, wszWaveOutID, &var); + else + pPropBag = NULL; + + V_VT(&var) = VT_LPWSTR; + V_UNION(&var, bstrVal) = wocaps.szPname; + if (SUCCEEDED(res)) + res = IPropertyBag_Write(pPropBag, wszFriendlyName, &var); + if (pPropBag) + IPropertyBag_Release(pPropBag); IMoniker_Release(pMoniker); pMoniker = NULL; } @@ -725,7 +743,7 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) rfp2.lpMediaType = pTypes; - res = IFilterMapper2_RegisterFilter(pMapper, + res = IFilterMapper2_RegisterFilter(pMapper, &CLSID_AudioRecord, wicaps.szPname, &pMoniker, @@ -733,10 +751,27 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) wicaps.szPname, &rf2); - /* FIXME: do additional stuff with IMoniker here, depending on what RegisterFilter does */ - if (pMoniker) - IMoniker_Release(pMoniker); + if (pMoniker) { + VARIANT var; + + V_VT(&var) = VT_I4; + V_UNION(&var, ulVal) = i; + res = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID)&pPropBag); + if (SUCCEEDED(res)) + res = IPropertyBag_Write(pPropBag, wszWaveInID, &var); + else + pPropBag = NULL; + + V_VT(&var) = VT_LPWSTR; + V_UNION(&var, bstrVal) = wicaps.szPname; + if (SUCCEEDED(res)) + res = IPropertyBag_Write(pPropBag, wszFriendlyName, &var); + + if (pPropBag) + IPropertyBag_Release(pPropBag); + IMoniker_Release(pMoniker); + } CoTaskMemFree(pTypes); } @@ -803,7 +838,6 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) szDeviceVersion, sizeof(szDeviceVersion)/sizeof(WCHAR))) { IMoniker * pMoniker = NULL; - IPropertyBag * pPropBag = NULL; WCHAR dprintf[] = { 'v','i','d','e','o','%','d',0 }; snprintfW(szDevicePath, sizeof(szDevicePath)/sizeof(WCHAR), dprintf, i); /* The above code prevents 1 device with a different ID overwriting another */ @@ -834,8 +868,10 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) V_VT(&var) = VT_I4; V_UNION(&var, ulVal) = i; res = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID)&pPropBag); - if (SUCCEEDED(res)) - res = IPropertyBag_Write(pPropBag, wszVfwIndex, &var); + if (SUCCEEDED(res)) { + res = IPropertyBag_Write(pPropBag, wszVfwIndex, &var); + IPropertyBag_Release(pPropBag); + } IMoniker_Release(pMoniker); } diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 24d236d..60ba110 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -232,6 +232,7 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_Write( switch (V_VT(pVar)) { case VT_BSTR: + case VT_LPWSTR: TRACE("writing %s\n", debugstr_w(V_UNION(pVar, bstrVal))); lpData = V_UNION(pVar, bstrVal); dwType = REG_SZ;

1 0

Sergey Guralnik : explorer: Use comma as argument delimiter.
by Alexandre Julliard May 14, 2013

May 14, 2013

Module: wine Branch: master Commit: 4b9d81b4b52f311e0175a02fdbc83b0922311736 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b9d81b4b52f311e0175a02fd… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Tue May 14 15:11:28 2013 +0300 explorer: Use comma as argument delimiter. --- programs/explorer/explorer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index aa7303d..1df781c 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -643,7 +643,7 @@ static int copy_path_string(LPWSTR target, LPWSTR source) } else { - while (*source && !isspaceW(*source)) target[i++] = *source++; + while (*source && *source != ',') target[i++] = *source++; target[i] = 0; } return i;

1 0

Hans Leidekker : wbemprox: Add stub implementations of IWbemServices:: ExecNotificationQueryAsync and IWbemServices::CancelAsyncCall.
by Alexandre Julliard May 14, 2013

May 14, 2013

Module: wine Branch: master Commit: 0083d4b092892404a09d6154fe02b86e915c167a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0083d4b092892404a09d6154f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 14 14:01:50 2013 +0200 wbemprox: Add stub implementations of IWbemServices::ExecNotificationQueryAsync and IWbemServices::CancelAsyncCall. --- dlls/wbemprox/services.c | 13 +++++-- dlls/wbemprox/tests/query.c | 72 +++++++++++++++++++++++++++++++++++++++++++ include/wbemcli.idl | 18 +++++++++++ 3 files changed, 99 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index bf202be..fc964ac 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -221,8 +221,10 @@ static HRESULT WINAPI wbem_services_CancelAsyncCall( IWbemServices *iface, IWbemObjectSink *pSink ) { - FIXME("\n"); - return WBEM_E_FAILED; + FIXME("%p, %p\n", iface, pSink); + + IWbemObjectSink_Release( pSink ); + return S_OK; } static HRESULT WINAPI wbem_services_QueryObjectSink( @@ -562,8 +564,11 @@ static HRESULT WINAPI wbem_services_ExecNotificationQueryAsync( IWbemContext *pCtx, IWbemObjectSink *pResponseHandler ) { - FIXME("\n"); - return WBEM_E_FAILED; + FIXME("%p, %s, %s, 0x%08x, %p, %p\n", iface, debugstr_w(strQueryLanguage), debugstr_w(strQuery), + lFlags, pCtx, pResponseHandler); + + IWbemObjectSink_AddRef( pResponseHandler ); + return S_OK; } static HRESULT WINAPI wbem_services_ExecMethod( diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index dd3424f..933f315 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -516,6 +516,77 @@ static void test_StdRegProv( IWbemServices *services ) SysFreeString( class ); } +static HRESULT WINAPI sink_QueryInterface( + IWbemObjectSink *iface, REFIID riid, void **ppv ) +{ + *ppv = NULL; + if (IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IWbemObjectSink, riid )) + { + *ppv = iface; + IWbemObjectSink_AddRef( iface ); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG sink_refs; + +static ULONG WINAPI sink_AddRef( + IWbemObjectSink *iface ) +{ + return ++sink_refs; +} + +static ULONG WINAPI sink_Release( + IWbemObjectSink *iface ) +{ + return --sink_refs; +} + +static HRESULT WINAPI sink_Indicate( + IWbemObjectSink *iface, LONG count, IWbemClassObject **objects ) +{ + trace("%d, %p\n", count, objects); + return S_OK; +} + +static HRESULT WINAPI sink_SetStatus( + IWbemObjectSink *iface, LONG flags, HRESULT hresult, BSTR str_param, IWbemClassObject *obj_param ) +{ + trace("%08x, %08x, %s, %p\n", flags, hresult, wine_dbgstr_w(str_param), obj_param); + return S_OK; +} + +static IWbemObjectSinkVtbl sink_vtbl = +{ + sink_QueryInterface, + sink_AddRef, + sink_Release, + sink_Indicate, + sink_SetStatus +}; + +static IWbemObjectSink sink = { &sink_vtbl }; + +static void test_notification_query_async( IWbemServices *services ) +{ + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'D','e','v','i','c','e','C','h','a','n','g','e','E','v','e','n','t',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + HRESULT hr; + + hr = IWbemServices_ExecNotificationQueryAsync( services, wql, query, 0, NULL, &sink ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND), "got %08x\n", hr ); + ok( sink_refs, "got %u\n", sink_refs ); + + hr = IWbemServices_CancelAsyncCall( services, &sink ); + ok( hr == S_OK, "got %08x\n", hr ); + + SysFreeString( wql ); + SysFreeString( query ); +} + START_TEST(query) { static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; @@ -545,6 +616,7 @@ START_TEST(query) test_Win32_Process( services ); test_Win32_Service( services ); test_StdRegProv( services ); + test_notification_query_async( services ); SysFreeString( path ); IWbemServices_Release( services ); diff --git a/include/wbemcli.idl b/include/wbemcli.idl index af5e5bc..0390e1e 100644 --- a/include/wbemcli.idl +++ b/include/wbemcli.idl @@ -290,6 +290,24 @@ interface IWbemStatusCodeText : IUnknown [out] BSTR *MessageText); }; +[ + object, + restricted, + uuid(7c857801-7381-11cf-884d-00aa004b2e24) +] +interface IWbemObjectSink : IUnknown +{ + HRESULT Indicate( + [in] long lObjectCount, + [in, size_is(lObjectCount)] IWbemClassObject **apObjArray); + + HRESULT SetStatus( + [in] long lFlags, + [in] HRESULT hResult, + [in] BSTR strParam, + [in] IWbemClassObject *pObjParam); +}; + typedef [v1_enum] enum tag_WBEM_GENERIC_FLAG_TYPE { WBEM_FLAG_RETURN_WBEM_COMPLETE = 0,

1 0

Ken Thomases : winemac: Fix disabling of resizable windows.
by Alexandre Julliard May 14, 2013

May 14, 2013

Module: wine Branch: master Commit: 1ac1cd69addcfd65ea78a114625488e486929f56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ac1cd69addcfd65ea78a1146… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue May 14 03:35:03 2013 -0500 winemac: Fix disabling of resizable windows. --- dlls/winemac.drv/cocoa_window.h | 1 - dlls/winemac.drv/cocoa_window.m | 52 ++++++++++++++++++++++++++++++++------ 2 files changed, 43 insertions(+), 10 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 2d95e1a..21bcf44 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -26,7 +26,6 @@ @interface WineWindow : NSPanel <NSWindowDelegate> { - NSUInteger normalStyleMask; BOOL disabled; BOOL noActivate; BOOL floating; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index ae69479..8ebda3b 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -460,7 +460,6 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) defer:YES] autorelease]; if (!window) return nil; - window->normalStyleMask = [window styleMask]; /* Standardize windows to eliminate differences between titled and borderless windows and between NSWindow and NSPanel. */ @@ -515,22 +514,37 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void) adjustFeaturesForState { - NSUInteger style = normalStyleMask; - - if (self.disabled) - style &= ~NSResizableWindowMask; - if (style != [self styleMask]) - [self setStyleMask:style]; + NSUInteger style = [self styleMask]; if (style & NSClosableWindowMask) [[self standardWindowButton:NSWindowCloseButton] setEnabled:!self.disabled]; if (style & NSMiniaturizableWindowMask) [[self standardWindowButton:NSWindowMiniaturizeButton] setEnabled:!self.disabled]; + if (style & NSResizableWindowMask) + [[self standardWindowButton:NSWindowZoomButton] setEnabled:!self.disabled]; } - (void) setWindowFeatures:(const struct macdrv_window_features*)wf { - normalStyleMask = style_mask_for_features(wf); + NSUInteger currentStyle = [self styleMask]; + NSUInteger newStyle = style_mask_for_features(wf); + + if (newStyle != currentStyle) + { + BOOL showingButtons = (currentStyle & (NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask)) != 0; + BOOL shouldShowButtons = (newStyle & (NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask)) != 0; + if (shouldShowButtons != showingButtons && !((newStyle ^ currentStyle) & NSClosableWindowMask)) + { + // -setStyleMask: is buggy on 10.7+ with respect to NSResizableWindowMask. + // If transitioning from NSTitledWindowMask | NSResizableWindowMask to + // just NSTitledWindowMask, the window buttons should disappear rather + // than just being disabled. But they don't. Similarly in reverse. + // The workaround is to also toggle NSClosableWindowMask at the same time. + [self setStyleMask:newStyle ^ NSClosableWindowMask]; + } + [self setStyleMask:newStyle]; + } + [self adjustFeaturesForState]; [self setHasShadow:wf->shadow]; } @@ -791,6 +805,18 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) { disabled = newValue; [self adjustFeaturesForState]; + + if (disabled) + { + NSSize size = [self frame].size; + [self setMinSize:size]; + [self setMaxSize:size]; + } + else + { + [self setMaxSize:NSMakeSize(FLT_MAX, FLT_MAX)]; + [self setMinSize:NSZeroSize]; + } } } @@ -1165,8 +1191,16 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void)windowDidResize:(NSNotification *)notification { macdrv_event* event; - NSRect frame = [self contentRectForFrameRect:[self frame]]; + NSRect frame = [self frame]; + + if (self.disabled) + { + NSSize size = frame.size; + [self setMinSize:size]; + [self setMaxSize:size]; + } + frame = [self contentRectForFrameRect:frame]; [[WineApplicationController sharedController] flipRect:&frame]; /* Coalesce events by discarding any previous ones still in the queue. */

1 0

Dmitry Timoshkov : kernel32: Add a test for holding process heap lock before calling ExitProcess.
by Alexandre Julliard May 14, 2013

May 14, 2013

Module: wine Branch: master Commit: 462ad39949d3c9378607ba3ea78f38e07d42de0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=462ad39949d3c9378607ba3ea… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 13 16:45:45 2013 +0900 kernel32: Add a test for holding process heap lock before calling ExitProcess. --- dlls/kernel32/tests/loader.c | 70 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 66 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index ac171bd..d481f08 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1060,12 +1060,12 @@ nt4_is_broken: #define MAX_COUNT 10 static HANDLE attached_thread[MAX_COUNT]; static DWORD attached_thread_count; -HANDLE stop_event, event, mutex, semaphore, loader_lock_event, peb_lock_event, ack_event; -static int test_dll_phase, inside_loader_lock, inside_peb_lock; +HANDLE stop_event, event, mutex, semaphore, loader_lock_event, peb_lock_event, heap_lock_event, ack_event; +static int test_dll_phase, inside_loader_lock, inside_peb_lock, inside_heap_lock; static DWORD WINAPI mutex_thread_proc(void *param) { - HANDLE wait_list[3]; + HANDLE wait_list[4]; DWORD ret; ret = WaitForSingleObject(mutex, 0); @@ -1076,11 +1076,12 @@ static DWORD WINAPI mutex_thread_proc(void *param) wait_list[0] = stop_event; wait_list[1] = loader_lock_event; wait_list[2] = peb_lock_event; + wait_list[3] = heap_lock_event; while (1) { trace("%04u: mutex_thread_proc: still alive\n", GetCurrentThreadId()); - ret = WaitForMultipleObjects(3, wait_list, FALSE, 50); + ret = WaitForMultipleObjects(sizeof(wait_list)/sizeof(wait_list[0]), wait_list, FALSE, 50); if (ret == WAIT_OBJECT_0) break; else if (ret == WAIT_OBJECT_0 + 1) { @@ -1098,6 +1099,13 @@ static DWORD WINAPI mutex_thread_proc(void *param) inside_peb_lock++; SetEvent(ack_event); } + else if (ret == WAIT_OBJECT_0 + 3) + { + trace("%04u: mutex_thread_proc: Entering heap lock\n", GetCurrentThreadId()); + HeapLock(GetProcessHeap()); + inside_heap_lock++; + SetEvent(ack_event); + } } trace("%04u: mutex_thread_proc: exiting\n", GetCurrentThreadId()); @@ -1169,6 +1177,18 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) break; } + /* The process should already deadlock at this point */ + if (test_dll_phase == 6) + { + /* In reality, code below never gets executed, probably some other + * code tries to access process heap and deadlocks earlier, even XP + * doesn't call the DLL entry point on process detach either. + */ + HeapLock(GetProcessHeap()); + ok(0, "dll_entry_point: process should already deadlock\n"); + break; + } + if (test_dll_phase == 0 || test_dll_phase == 1 || test_dll_phase == 3) ok(param != NULL, "dll: param %p\n", param); else @@ -1444,6 +1464,10 @@ static void child_process(const char *dll_name, DWORD target_offset) ok(peb_lock_event != 0, "CreateEvent error %d\n", GetLastError()); SetLastError(0xdeadbeef); + heap_lock_event = CreateEvent(NULL, FALSE, FALSE, NULL); + ok(heap_lock_event != 0, "CreateEvent error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); ack_event = CreateEvent(NULL, FALSE, FALSE, NULL); ok(ack_event != 0, "CreateEvent error %d\n", GetLastError()); @@ -1644,6 +1668,20 @@ static void child_process(const char *dll_name, DWORD target_offset) ok(0, "ExitProcess should not return\n"); break; + case 6: + trace("setting heap_lock_event\n"); + SetEvent(heap_lock_event); + WaitForSingleObject(ack_event, 1000); + ok(inside_heap_lock != 0, "inside_heap_lock is not set\n"); + + *child_failures = winetest_get_failures(); + + /* calling ExitProcess should cause a deadlock */ + trace("call ExitProcess(1)\n"); + ExitProcess(1); + ok(0, "ExitProcess should not return\n"); + break; + default: assert(0); break; @@ -1923,6 +1961,30 @@ static void test_ExitProcess(void) else win_skip("RtlAcquirePebLock/RtlReleasePebLock are not available on this platform\n"); + /* phase 6 */ + *child_failures = -1; + sprintf(cmdline, "\"%s\" loader %s %u 6", argv[0], dll_name, target_offset); + ret = CreateProcess(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); + ret = WaitForSingleObject(pi.hProcess, 5000); + ok(ret == WAIT_TIMEOUT || broken(ret == WAIT_OBJECT_0) /* XP */, "child process should fail to terminate\n"); + if (ret != WAIT_OBJECT_0) + { + trace("terminating child process\n"); + TerminateProcess(pi.hProcess, 201); + } + ret = WaitForSingleObject(pi.hProcess, 1000); + ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); + GetExitCodeProcess(pi.hProcess, &ret); + ok(ret == 201 || broken(ret == 1) /* XP */, "expected exit code 201, got %u\n", ret); + if (*child_failures) + { + trace("%d failures in child process\n", *child_failures); + winetest_add_failures(*child_failures); + } + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + /* test remote process termination */ SetLastError(0xdeadbeef); ret = CreateProcess(argv[0], NULL, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi);

1 0

Alexandre Julliard : riched32: Don' t bother to unregister classes at process exit.
by Alexandre Julliard May 14, 2013

May 14, 2013

Module: wine Branch: master Commit: 0091c0ae964908f1e0227ecbcf01a7c43284136d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0091c0ae964908f1e0227ecbc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 11:20:49 2013 +0200 riched32: Don't bother to unregister classes at process exit. --- dlls/riched32/richedit.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/riched32/richedit.c b/dlls/riched32/richedit.c index 7513273..44ce843 100644 --- a/dlls/riched32/richedit.c +++ b/dlls/riched32/richedit.c @@ -40,16 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); extern LRESULT WINAPI RichEdit10ANSIWndProc(HWND, UINT, WPARAM, LPARAM); -/* Unregisters the window class. */ -static BOOL RICHED32_Unregister(void) -{ - TRACE("\n"); - - UnregisterClassA(RICHEDIT_CLASS10A, NULL); - return TRUE; -} - - /* Registers the window class. */ static BOOL RICHED32_Register(void) { @@ -80,7 +70,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return RICHED32_Register(); case DLL_PROCESS_DETACH: - return RICHED32_Unregister(); + if (lpvReserved) break; + UnregisterClassA(RICHEDIT_CLASS10A, NULL); + break; } return TRUE; }

1 0

Alexandre Julliard : imm32: Don' t bother to unregister classes at process exit.
by Alexandre Julliard May 14, 2013

May 14, 2013

Module: wine Branch: master Commit: 0243fd5aa3bbf7d279d7d41996ae6cbe194159f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0243fd5aa3bbf7d279d7d4199… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 11:26:39 2013 +0200 imm32: Don't bother to unregister classes at process exit. --- dlls/imm32/imm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index fbb683f..62f4b71 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -386,6 +386,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) IMM_FreeThreadData(); break; case DLL_PROCESS_DETACH: + if (lpReserved) break; IMM_FreeThreadData(); IMM_FreeAllImmHkl(); TlsFree(tlsIndex);

1 0

Alexandre Julliard : ddraw: Don' t bother to unregister classes at process exit.
by Alexandre Julliard May 14, 2013

May 14, 2013

Module: wine Branch: master Commit: 0ad26e27f38d7dc68f3a91275e35ca767acf4a6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ad26e27f38d7dc68f3a91275… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 11:29:47 2013 +0200 ddraw: Don't bother to unregister classes at process exit. --- dlls/ddraw/main.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index e4c1ac1..aaa4032 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -848,13 +848,12 @@ static inline DWORD get_config_key(HKEY defkey, HKEY appkey, const char* name, c * app didn't release them properly(Gothic 2, Diablo 2, Moto racer, ...) * ***********************************************************************/ -BOOL WINAPI -DllMain(HINSTANCE hInstDLL, - DWORD Reason, - LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID reserved) { - TRACE("(%p,%x,%p)\n", hInstDLL, Reason, lpv); - if (Reason == DLL_PROCESS_ATTACH) + TRACE("(%p,%x,%p)\n", hInstDLL, reason, reserved); + switch (reason) + { + case DLL_PROCESS_ATTACH: { static HMODULE ddraw_self; char buffer[MAX_PATH+10]; @@ -968,9 +967,10 @@ DllMain(HINSTANCE hInstDLL, instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL); + break; } - else if (Reason == DLL_PROCESS_DETACH) - { + + case DLL_PROCESS_DETACH: if(!list_empty(&global_ddraw_list)) { struct list *entry, *entry2; @@ -1034,7 +1034,7 @@ DllMain(HINSTANCE hInstDLL, } } - /* Unregister the window class. */ + if (reserved) break; UnregisterClassA(DDRAW_WINDOW_CLASS_NAME, hInstDLL); }

1 0

Nikolay Sivov : comctl32: Allocate edit data with control info.
by Alexandre Julliard May 14, 2013

May 14, 2013

Module: wine Branch: master Commit: 97caa729b6a883d5ef4f73812f7e0ae207a24810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97caa729b6a883d5ef4f73812… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 14 09:56:46 2013 +0400 comctl32: Allocate edit data with control info. --- dlls/comctl32/comboex.c | 53 +++++++++++++++++----------------------------- 1 files changed, 20 insertions(+), 33 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index d92da3d..0f3ed4a 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -75,7 +75,7 @@ typedef struct INT nb_items; /* Number of items */ BOOL unicode; /* TRUE if this window is Unicode */ BOOL NtfUnicode; /* TRUE if parent wants notify in Unicode */ - CBE_ITEMDATA *edit; /* item data for edit item */ + CBE_ITEMDATA edit; /* item data for edit item */ CBE_ITEMDATA *items; /* Array of items */ } COMBOEX_INFO; @@ -273,9 +273,9 @@ static void COMBOEX_NotifyDragBegin(const COMBOEX_INFO *infoPtr, LPCWSTR wstr) static void COMBOEX_FreeText (CBE_ITEMDATA *item) { if (is_textW(item->pszText)) Free(item->pszText); - item->pszText = 0; + item->pszText = NULL; Free(item->pszTemp); - item->pszTemp = 0; + item->pszTemp = NULL; } @@ -455,15 +455,15 @@ static void COMBOEX_SetEditText (const COMBOEX_INFO *infoPtr, CBE_ITEMDATA *item } -static CBE_ITEMDATA * COMBOEX_FindItem(const COMBOEX_INFO *infoPtr, INT_PTR index) +static CBE_ITEMDATA *COMBOEX_FindItem(COMBOEX_INFO *infoPtr, INT_PTR index) { CBE_ITEMDATA *item; INT i; if ((index >= infoPtr->nb_items) || (index < -1)) - return 0; + return NULL; if (index == -1) - return infoPtr->edit; + return &infoPtr->edit; item = infoPtr->items; i = infoPtr->nb_items - 1; @@ -481,7 +481,7 @@ static CBE_ITEMDATA * COMBOEX_FindItem(const COMBOEX_INFO *infoPtr, INT_PTR inde /* *** CBEM_xxx message support *** */ -static UINT COMBOEX_GetListboxText(const COMBOEX_INFO *infoPtr, INT_PTR n, LPWSTR buf) +static UINT COMBOEX_GetListboxText(COMBOEX_INFO *infoPtr, INT_PTR n, LPWSTR buf) { CBE_ITEMDATA *item; LPCWSTR str; @@ -519,7 +519,7 @@ static UINT COMBOEX_GetListboxText(const COMBOEX_INFO *infoPtr, INT_PTR n, LPWST } -static INT COMBOEX_DeleteItem (const COMBOEX_INFO *infoPtr, INT_PTR index) +static INT COMBOEX_DeleteItem (COMBOEX_INFO *infoPtr, INT_PTR index) { TRACE("(index=%ld)\n", index); @@ -534,7 +534,7 @@ static INT COMBOEX_DeleteItem (const COMBOEX_INFO *infoPtr, INT_PTR index) } -static BOOL COMBOEX_GetItemW (const COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit) +static BOOL COMBOEX_GetItemW (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit) { INT_PTR index = cit->iItem; CBE_ITEMDATA *item; @@ -555,7 +555,7 @@ static BOOL COMBOEX_GetItemW (const COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit) } -static BOOL COMBOEX_GetItemA (const COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA *cit) +static BOOL COMBOEX_GetItemA (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA *cit) { COMBOBOXEXITEMW tmpcit; @@ -754,7 +754,7 @@ static HIMAGELIST COMBOEX_SetImageList (COMBOEX_INFO *infoPtr, HIMAGELIST himl) return himlTemp; } -static BOOL COMBOEX_SetItemW (const COMBOEX_INFO *infoPtr, const COMBOBOXEXITEMW *cit) +static BOOL COMBOEX_SetItemW (COMBOEX_INFO *infoPtr, const COMBOBOXEXITEMW *cit) { INT_PTR index = cit->iItem; CBE_ITEMDATA *item; @@ -805,7 +805,7 @@ static BOOL COMBOEX_SetItemW (const COMBOEX_INFO *infoPtr, const COMBOBOXEXITEMW return TRUE; } -static BOOL COMBOEX_SetItemA (const COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA const *cit) +static BOOL COMBOEX_SetItemA (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA const *cit) { COMBOBOXEXITEMW citW; LPWSTR wstr = NULL; @@ -863,7 +863,7 @@ COMBOEX_FindStringExact (const COMBOEX_INFO *infoPtr, INT start, LPCWSTR str) } -static DWORD_PTR COMBOEX_GetItemData (const COMBOEX_INFO *infoPtr, INT_PTR index) +static DWORD_PTR COMBOEX_GetItemData (COMBOEX_INFO *infoPtr, INT_PTR index) { CBE_ITEMDATA const *item1; CBE_ITEMDATA const *item2; @@ -903,7 +903,7 @@ static INT COMBOEX_SetCursel (COMBOEX_INFO *infoPtr, INT_PTR index) } -static DWORD_PTR COMBOEX_SetItemData (const COMBOEX_INFO *infoPtr, INT_PTR index, DWORD_PTR data) +static DWORD_PTR COMBOEX_SetItemData (COMBOEX_INFO *infoPtr, INT_PTR index, DWORD_PTR data) { CBE_ITEMDATA *item1; CBE_ITEMDATA const *item2; @@ -1090,16 +1090,6 @@ static LRESULT COMBOEX_Create (HWND hwnd, CREATESTRUCTA const *cs) COMBOEX_AdjustEditPos (infoPtr); - /* - * Create an item structure to represent the data in the - * EDIT control. It is allocated zero-filled. - */ - infoPtr->edit = Alloc (sizeof (CBE_ITEMDATA)); - if (!infoPtr->edit) { - COMBOEX_Destroy(infoPtr); - return -1; - } - return 0; } @@ -1316,10 +1306,10 @@ static BOOL COMBOEX_WM_DeleteItem (COMBOEX_INFO *infoPtr, DELETEITEMSTRUCT const } -static LRESULT COMBOEX_DrawItem (const COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT const *dis) +static LRESULT COMBOEX_DrawItem (COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT const *dis) { static const WCHAR nil[] = { 0 }; - CBE_ITEMDATA *item = 0; + CBE_ITEMDATA *item = NULL; SIZE txtsize; RECT rect; LPCWSTR str = nil; @@ -1378,7 +1368,7 @@ static LRESULT COMBOEX_DrawItem (const COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT con /* If draw item is -1 (edit control) setup the item pointer */ if (dis->itemID == 0xffffffff) { - item = infoPtr->edit; + item = &infoPtr->edit; if (infoPtr->hwndEdit) { /* free previous text of edit item */ @@ -1576,10 +1566,7 @@ static LRESULT COMBOEX_Destroy (COMBOEX_INFO *infoPtr) if (infoPtr->hwndEdit) RemoveWindowSubclass(infoPtr->hwndEdit, COMBOEX_EditWndProc, EDIT_SUBCLASSID); - COMBOEX_FreeText (infoPtr->edit); - Free (infoPtr->edit); - infoPtr->edit = 0; - + COMBOEX_FreeText (&infoPtr->edit); COMBOEX_ResetContent (infoPtr); if (infoPtr->defaultFont) @@ -1850,7 +1837,7 @@ COMBOEX_EditWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, edit_text)) { /* abort the change, restore previous */ TRACE("Notify requested abort of change\n"); - COMBOEX_SetEditText (infoPtr, infoPtr->edit); + COMBOEX_SetEditText (infoPtr, &infoPtr->edit); RedrawWindow (infoPtr->hwndCombo, 0, 0, RDW_ERASE | RDW_INVALIDATE); return 0; @@ -2084,7 +2071,7 @@ COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, GetWindowTextW (infoPtr->hwndEdit, edit_text, 260); if (selected == -1) { - lastwrk = infoPtr->edit->pszText; + lastwrk = infoPtr->edit.pszText; } else { CBE_ITEMDATA *item = COMBOEX_FindItem (infoPtr, selected);

1 0