December 2009 - Wine-commits

Paul Vriens : kernel32/tests: Only set the size ourselves if we are on W2K.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 763694a646af16a38804d635dba24851b0530342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=763694a646af16a38804d635d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Dec 14 19:43:17 2009 +0100 kernel32/tests: Only set the size ourselves if we are on W2K. --- dlls/kernel32/tests/environ.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index b352667..19d11b5 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -395,7 +395,11 @@ static void test_GetComputerNameExA(void) ok(error == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", error); /* size is not set in win2k */ - size = MAX_COMP_NAME; + if (size == 0) + { + win_skip("Win2k doesn't set the size\n"); + size = MAX_COMP_NAME; + } name = HeapAlloc(GetProcessHeap(), 0, size * sizeof(name[0])); ok(name != NULL, "HeapAlloc failed with error %d\n", GetLastError()); ret = pGetComputerNameExA(ComputerNameDnsDomain, name, &size); @@ -410,7 +414,8 @@ static void test_GetComputerNameExA(void) ok(error == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", error); /* size is not set in win2k */ - size = MAX_COMP_NAME; + if (size == 0) + size = MAX_COMP_NAME; name = HeapAlloc(GetProcessHeap(), 0, size * sizeof(name[0])); ok(name != NULL, "HeapAlloc failed with error %d\n", GetLastError()); ret = pGetComputerNameExA(ComputerNameDnsFullyQualified, name, &size); @@ -425,7 +430,8 @@ static void test_GetComputerNameExA(void) ok(error == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", error); /* size is not set in win2k */ - size = MAX_COMP_NAME; + if (size == 0) + size = MAX_COMP_NAME; name = HeapAlloc(GetProcessHeap(), 0, size * sizeof(name[0])); ok(name != NULL, "HeapAlloc failed with error %d\n", GetLastError()); ret = pGetComputerNameExA(ComputerNameDnsHostname, name, &size); @@ -440,7 +446,8 @@ static void test_GetComputerNameExA(void) ok(error == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", error); /* size is not set in win2k */ - size = MAX_COMP_NAME; + if (size == 0) + size = MAX_COMP_NAME; name = HeapAlloc(GetProcessHeap(), 0, size * sizeof(name[0])); ok(name != NULL, "HeapAlloc failed with error %d\n", GetLastError()); ret = pGetComputerNameExA(ComputerNameNetBIOS, name, &size);

1 0

Aric Stewart : shlwapi: Implement SHPropertyBag_ReadLONG.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 0a59c65e74038698eb84cbc8f855cf91888e4c7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a59c65e74038698eb84cbc8f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Dec 14 12:53:45 2009 -0600 shlwapi: Implement SHPropertyBag_ReadLONG. --- dlls/shlwapi/ordinal.c | 32 ++++++++++++ dlls/shlwapi/shlwapi.spec | 2 +- dlls/shlwapi/tests/ordinal.c | 115 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 148 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 223e4a8..3098af4 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4752,3 +4752,35 @@ HRESULT WINAPI IUnknown_QueryServiceForWebBrowserApp(IUnknown* lpUnknown, FIXME("%p %s %p semi-STUB\n", lpUnknown, debugstr_guid(riid), lppOut); return IUnknown_QueryService(lpUnknown,&IID_IWebBrowserApp,riid,lppOut); } + +/************************************************************************** + * SHPropertyBag_ReadLONG (SHLWAPI.496) + * + * This function asks a property bag to read a named property as a LONG. + * + * PARAMS + * ppb: a IPropertyBag interface + * pszPropName: Unicode string that names the property + * pValue: address to receive the property value as a 32-bit signed integer + * + * RETURNS + * 0 for Success + */ +BOOL WINAPI SHPropertyBag_ReadLONG(IPropertyBag *ppb, LPCWSTR pszPropName, LPLONG pValue) +{ + VARIANT var; + HRESULT hr; + TRACE("%p %s %p\n", ppb,debugstr_w(pszPropName),pValue); + if (!pszPropName || !ppb || !pValue) + return E_INVALIDARG; + V_VT(&var) = VT_I4; + hr = IPropertyBag_Read(ppb, pszPropName, &var, NULL); + if (SUCCEEDED(hr)) + { + if (V_VT(&var) == VT_I4) + *pValue = V_I4(&var); + else + hr = DISP_E_BADVARTYPE; + } + return hr; +} diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 3a962eb..165a50c 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -493,7 +493,7 @@ 493 stub -noname SHPropertyBag_ReadType 494 stub -noname SHPropertyBag_ReadStr 495 stub -noname SHPropertyBag_WriteStr -496 stub -noname SHPropertyBag_ReadLONG +496 stdcall -noname SHPropertyBag_ReadLONG(ptr wstr ptr) 497 stub -noname SHPropertyBag_WriteLONG 498 stub -noname SHPropertyBag_ReadBOOLOld 499 stub -noname SHPropertyBag_WriteBOOL diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 8f95797..ac1a223 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -41,6 +41,7 @@ static HRESULT(WINAPIV *pSHPackDispParams)(DISPPARAMS*,VARIANTARG*,UINT,...); static HRESULT(WINAPI *pIConnectionPoint_SimpleInvoke)(IConnectionPoint*,DISPID,DISPPARAMS*); static HRESULT(WINAPI *pIConnectionPoint_InvokeWithCancel)(IConnectionPoint*,DISPID,DISPPARAMS*,DWORD,DWORD); static HRESULT(WINAPI *pConnectToConnectionPoint)(IUnknown*,REFIID,BOOL,IUnknown*, LPDWORD,IConnectionPoint **); +static HRESULT(WINAPI *pSHPropertyBag_ReadLONG)(IPropertyBag *,LPCWSTR,LPLONG); static void test_GetAcceptLanguagesA(void) { HRESULT retval; @@ -1205,6 +1206,118 @@ static void test_IConnectionPoint(void) ok(ref == 0, "leftover IDispatch reference %i\n",ref); } +typedef struct _propbag +{ + const IPropertyBagVtbl *vtbl; + LONG refCount; + +} PropBag; + + +static HRESULT WINAPI Prop_QueryInterface( + IPropertyBag* This, + REFIID riid, + void **ppvObject) +{ + trace("\n"); + *ppvObject = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IPropertyBag)) + { + *ppvObject = This; + } + + if (*ppvObject) + { + IUnknown_AddRef(This); + return S_OK; + } + + trace("no interface\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI Prop_AddRef( + IPropertyBag* This) +{ + PropBag *iface = (PropBag*)This; + return InterlockedIncrement(&iface->refCount); +} + +static ULONG WINAPI Prop_Release( + IPropertyBag* This) +{ + PropBag *iface = (PropBag*)This; + ULONG ret; + + ret = InterlockedDecrement(&iface->refCount); + if (ret == 0) + HeapFree(GetProcessHeap(),0,This); + return ret; +} + +static HRESULT WINAPI Prop_Read( + IPropertyBag* This, + LPCOLESTR pszPropName, + VARIANT *pVar, + IErrorLog *pErrorLog) +{ + V_VT(pVar) = VT_BLOB|VT_BYREF; + V_BYREF(pVar) = (LPVOID)0xdeadcafe; + return S_OK; +} + +static HRESULT WINAPI Prop_Write( + IPropertyBag* This, + LPCOLESTR pszPropName, + VARIANT *pVar) +{ + return S_OK; +} + + +static const IPropertyBagVtbl prop_vtbl = { + Prop_QueryInterface, + Prop_AddRef, + Prop_Release, + + Prop_Read, + Prop_Write +}; + +static void test_SHPropertyBag_ReadLONG(void) +{ + PropBag *pb; + HRESULT rc; + LONG out; + static const WCHAR szName1[] = {'n','a','m','e','1',0}; + + if (!pSHPropertyBag_ReadLONG) + { + win_skip("SHPropertyBag_ReadLONG not present\n"); + return; + } + + pb = HeapAlloc(GetProcessHeap(),0,sizeof(PropBag)); + pb->refCount = 1; + pb->vtbl = &prop_vtbl; + + out = 0xfeedface; + rc = pSHPropertyBag_ReadLONG(NULL, szName1, &out); + ok(rc == E_INVALIDARG || broken(rc == 0), "incorrect return %x\n",rc); + ok(out == 0xfeedface, "value should not have changed\n"); + rc = pSHPropertyBag_ReadLONG((IPropertyBag*)pb, NULL, &out); + ok(rc == E_INVALIDARG || broken(rc == 0) || broken(rc == 1), "incorrect return %x\n",rc); + ok(out == 0xfeedface, "value should not have changed\n"); + rc = pSHPropertyBag_ReadLONG((IPropertyBag*)pb, szName1, NULL); + ok(rc == E_INVALIDARG || broken(rc == 0) || broken(rc == 1), "incorrect return %x\n",rc); + ok(out == 0xfeedface, "value should not have changed\n"); + rc = pSHPropertyBag_ReadLONG((IPropertyBag*)pb, szName1, &out); + ok(rc == DISP_E_BADVARTYPE || broken(rc == 0) || broken(rc == 1), "incorrect return %x\n",rc); + ok(out == 0xfeedface || broken(out == 0xfeedfa00), "value should not have changed %x\n",out); + IUnknown_Release((IUnknown*)pb); +} + START_TEST(ordinal) { hShlwapi = GetModuleHandleA("shlwapi.dll"); @@ -1219,6 +1332,7 @@ START_TEST(ordinal) pIConnectionPoint_SimpleInvoke=(void*)GetProcAddress(hShlwapi,(char*)284); pIConnectionPoint_InvokeWithCancel=(void*)GetProcAddress(hShlwapi,(char*)283); pConnectToConnectionPoint=(void*)GetProcAddress(hShlwapi,(char*)168); + pSHPropertyBag_ReadLONG=(void*)GetProcAddress(hShlwapi,(char*)496); test_GetAcceptLanguagesA(); test_SHSearchMapInt(); @@ -1227,4 +1341,5 @@ START_TEST(ordinal) test_GetShellSecurityDescriptor(); test_SHPackDispParams(); test_IConnectionPoint(); + test_SHPropertyBag_ReadLONG(); }

1 0

Henri Verbeet : wined3d: Send window messages through the swapchain before sending them to the application .
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 0e270bbd226c34bd2831673c1c546f8db76b0487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e270bbd226c34bd2831673c1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 14 20:49:52 2009 +0100 wined3d: Send window messages through the swapchain before sending them to the application. --- dlls/wined3d/swapchain.c | 24 ++++++++- dlls/wined3d/swapchain_gdi.c | 2 + dlls/wined3d/wined3d_main.c | 122 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 11 +++- 4 files changed, 155 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c960ace..705a002 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -90,8 +90,10 @@ static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface) mode.Format = This->orig_fmt; IWineD3DDevice_SetDisplayMode((IWineD3DDevice *)This->device, 0, &mode); } - HeapFree(GetProcessHeap(), 0, This->context); + wined3d_unregister_window(This->win_handle); + + HeapFree(GetProcessHeap(), 0, This->context); HeapFree(GetProcessHeap(), 0, This); } @@ -676,6 +678,12 @@ HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface window = present_parameters->hDeviceWindow ? present_parameters->hDeviceWindow : device->createParms.hFocusWindow; + if (!wined3d_register_window(window, swapchain)) + { + ERR("Failed to register window %p.\n", window); + return E_FAIL; + } + swapchain->device = device; swapchain->parent = parent; swapchain->ref = 1; @@ -907,6 +915,8 @@ err: if (swapchain->frontBuffer) IWineD3DSurface_Release(swapchain->frontBuffer); + wined3d_unregister_window(window); + return hr; } @@ -951,3 +961,15 @@ void get_drawable_size_swapchain(struct wined3d_context *context, UINT *width, U *width = surface->currentDesc.Width; *height = surface->currentDesc.Height; } + +LRESULT swapchain_process_message(IWineD3DSwapChainImpl *swapchain, HWND window, + UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) +{ + if (message == WM_DESTROY) + { + TRACE("unregister window %p.\n", window); + wined3d_unregister_window(window); + } + + return CallWindowProcW(proc, window, message, wparam, lparam); +} diff --git a/dlls/wined3d/swapchain_gdi.c b/dlls/wined3d/swapchain_gdi.c index c437b41..ed42f55 100644 --- a/dlls/wined3d/swapchain_gdi.c +++ b/dlls/wined3d/swapchain_gdi.c @@ -70,6 +70,8 @@ static void WINAPI IWineGDISwapChainImpl_Destroy(IWineD3DSwapChain *iface) IWineD3DDevice_SetDisplayMode((IWineD3DDevice *)This->device, 0, &mode); } + wined3d_unregister_window(This->win_handle); + HeapFree(GetProcessHeap(), 0, This->context); HeapFree(GetProcessHeap(), 0, This); } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 5f19c26..d84ad2f 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -29,6 +29,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); +struct wined3d_wndproc +{ + HWND window; + WNDPROC proc; + IWineD3DSwapChainImpl *swapchain; +}; + +struct wined3d_wndproc_table +{ + struct wined3d_wndproc *entries; + unsigned int count; + unsigned int size; +}; + +static struct wined3d_wndproc_table wndproc_table; + int num_lock = 0; void (*CDECL wine_tsx11_lock_ptr)(void) = NULL; void (*CDECL wine_tsx11_unlock_ptr)(void) = NULL; @@ -325,6 +341,7 @@ static BOOL wined3d_init(HINSTANCE hInstDLL) static BOOL wined3d_destroy(HINSTANCE hInstDLL) { DWORD wined3d_context_tls_idx = context_get_tls_idx(); + unsigned int i; if (!TlsFree(wined3d_context_tls_idx)) { @@ -332,6 +349,13 @@ static BOOL wined3d_destroy(HINSTANCE hInstDLL) ERR("Failed to free context TLS index, err %#x.\n", err); } + for (i = 0; i < wndproc_table.count; ++i) + { + struct wined3d_wndproc *entry = &wndproc_table.entries[i]; + SetWindowLongPtrW(entry->window, GWLP_WNDPROC, (LONG_PTR)entry->proc); + } + HeapFree(GetProcessHeap(), 0, wndproc_table.entries); + HeapFree(GetProcessHeap(), 0, wined3d_settings.logo); UnregisterClassA(WINED3D_OPENGL_WINDOW_CLASS_NAME, hInstDLL); @@ -348,6 +372,104 @@ void WINAPI wined3d_mutex_unlock(void) LeaveCriticalSection(&wined3d_cs); } +static struct wined3d_wndproc *wined3d_find_wndproc(HWND window) +{ + unsigned int i; + + for (i = 0; i < wndproc_table.count; ++i) + { + if (wndproc_table.entries[i].window == window) + { + return &wndproc_table.entries[i]; + } + } + + return NULL; +} + +static LRESULT CALLBACK wined3d_wndproc(HWND window, UINT message, WPARAM wparam, LPARAM lparam) +{ + IWineD3DSwapChainImpl *swapchain; + struct wined3d_wndproc *entry; + WNDPROC proc; + + wined3d_mutex_lock(); + entry = wined3d_find_wndproc(window); + + if (!entry) + { + wined3d_mutex_unlock(); + ERR("Window %p is not registered with wined3d.\n", window); + return DefWindowProcW(window, message, wparam, lparam); + } + + swapchain = entry->swapchain; + proc = entry->proc; + wined3d_mutex_unlock(); + + return swapchain_process_message(swapchain, window, message, wparam, lparam, proc); +} + +BOOL wined3d_register_window(HWND window, IWineD3DSwapChainImpl *swapchain) +{ + struct wined3d_wndproc *entry; + + wined3d_mutex_lock(); + + if (wndproc_table.size == wndproc_table.count) + { + unsigned int new_size = max(1, wndproc_table.size * 2); + struct wined3d_wndproc *new_entries; + + if (!wndproc_table.entries) new_entries = HeapAlloc(GetProcessHeap(), 0, new_size * sizeof(*new_entries)); + else new_entries = HeapReAlloc(GetProcessHeap(), 0, wndproc_table.entries, new_size * sizeof(*new_entries)); + + if (!new_entries) + { + wined3d_mutex_unlock(); + ERR("Failed to grow table.\n"); + return FALSE; + } + + wndproc_table.entries = new_entries; + wndproc_table.size = new_size; + } + + entry = &wndproc_table.entries[wndproc_table.count++]; + entry->window = window; + entry->proc = (WNDPROC)SetWindowLongPtrW(window, GWLP_WNDPROC, (LONG_PTR)wined3d_wndproc); + entry->swapchain = swapchain; + + wined3d_mutex_unlock(); + + return TRUE; +} + +void wined3d_unregister_window(HWND window) +{ + unsigned int i; + + wined3d_mutex_lock(); + for (i = 0; i < wndproc_table.count; ++i) + { + if (wndproc_table.entries[i].window == window) + { + struct wined3d_wndproc *entry = &wndproc_table.entries[i]; + struct wined3d_wndproc *last = &wndproc_table.entries[--wndproc_table.count]; + + if (GetWindowLongPtrW(window, GWLP_WNDPROC) == (LONG_PTR)wined3d_wndproc) + SetWindowLongPtrW(window, GWLP_WNDPROC, (LONG_PTR)entry->proc); + if (entry != last) *entry = *last; + wined3d_mutex_unlock(); + + return; + } + } + wined3d_mutex_unlock(); + + ERR("Window %p is not registered with wined3d.\n", window); +} + /* At process attach */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e0b4ab1..cd4cf6f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -816,6 +816,7 @@ typedef struct IWineD3DStateBlockImpl IWineD3DStateBlockImpl; typedef struct IWineD3DSurfaceImpl IWineD3DSurfaceImpl; typedef struct IWineD3DPaletteImpl IWineD3DPaletteImpl; typedef struct IWineD3DDeviceImpl IWineD3DDeviceImpl; +typedef struct IWineD3DSwapChainImpl IWineD3DSwapChainImpl; /* Global variables */ extern const float identity[16] DECLSPEC_HIDDEN; @@ -1439,6 +1440,8 @@ typedef struct IWineD3DImpl extern const IWineD3DVtbl IWineD3D_Vtbl DECLSPEC_HIDDEN; +BOOL wined3d_register_window(HWND window, struct IWineD3DSwapChainImpl *swapchain) DECLSPEC_HIDDEN; +void wined3d_unregister_window(HWND window) DECLSPEC_HIDDEN; BOOL InitAdapters(IWineD3DImpl *This) DECLSPEC_HIDDEN; /* A helper function that dumps a resource list */ @@ -2397,7 +2400,7 @@ extern const IWineD3DRendertargetViewVtbl wined3d_rendertarget_view_vtbl DECLSPE * IWineD3DSwapChainImpl implementation structure (extends IUnknown) */ -typedef struct IWineD3DSwapChainImpl +struct IWineD3DSwapChainImpl { /*IUnknown part*/ const IWineD3DSwapChainVtbl *lpVtbl; @@ -2422,7 +2425,7 @@ typedef struct IWineD3DSwapChainImpl unsigned int num_contexts; HWND win_handle; -} IWineD3DSwapChainImpl; +}; const IWineD3DSwapChainVtbl IWineGDISwapChain_Vtbl DECLSPEC_HIDDEN; void x11_copy_to_screen(IWineD3DSwapChainImpl *This, const RECT *rc) DECLSPEC_HIDDEN; @@ -2452,8 +2455,10 @@ HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetGammaRamp(IWineD3DSwapChain *iface, struct wined3d_context *swapchain_create_context_for_thread(IWineD3DSwapChain *iface) DECLSPEC_HIDDEN; HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface_type, IWineD3DDeviceImpl *device, WINED3DPRESENT_PARAMETERS *present_parameters, IUnknown *parent) DECLSPEC_HIDDEN; -void swapchain_setup_fullscreen_window(IWineD3DSwapChainImpl *swapchain, UINT w, UINT h) DECLSPEC_HIDDEN; +LRESULT swapchain_process_message(IWineD3DSwapChainImpl *device, HWND window, + UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN; void swapchain_restore_fullscreen_window(IWineD3DSwapChainImpl *swapchain) DECLSPEC_HIDDEN; +void swapchain_setup_fullscreen_window(IWineD3DSwapChainImpl *swapchain, UINT w, UINT h) DECLSPEC_HIDDEN; #define DEFAULT_REFRESH_RATE 0

1 0

Henri Verbeet : wined3d: Filter window messages generated by switching to fullscreen and back.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: c24e48d937cfd0000a22af555a920ea7fab71d7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c24e48d937cfd0000a22af555… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 14 20:49:53 2009 +0100 wined3d: Filter window messages generated by switching to fullscreen and back. --- dlls/wined3d/swapchain.c | 22 ++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 705a002..91791de 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -580,6 +580,7 @@ void swapchain_setup_fullscreen_window(IWineD3DSwapChainImpl *swapchain, UINT w, { IWineD3DDeviceImpl *device = swapchain->device; HWND window = swapchain->win_handle; + BOOL filter_messages; LONG style, exstyle; TRACE("Setting up window %p for fullscreen mode.\n", window); @@ -599,15 +600,21 @@ void swapchain_setup_fullscreen_window(IWineD3DSwapChainImpl *swapchain, UINT w, TRACE("Old style was %08x, %08x, setting to %08x, %08x.\n", device->style, device->exStyle, style, exstyle); + filter_messages = swapchain->filter_messages; + swapchain->filter_messages = TRUE; + SetWindowLongW(window, GWL_STYLE, style); SetWindowLongW(window, GWL_EXSTYLE, exstyle); SetWindowPos(window, HWND_TOP, 0, 0, w, h, SWP_FRAMECHANGED | SWP_SHOWWINDOW); + + swapchain->filter_messages = filter_messages; } void swapchain_restore_fullscreen_window(IWineD3DSwapChainImpl *swapchain) { IWineD3DDeviceImpl *device = swapchain->device; HWND window = swapchain->win_handle; + BOOL filter_messages; LONG style, exstyle; if (!device->style && !device->exStyle) return; @@ -618,6 +625,9 @@ void swapchain_restore_fullscreen_window(IWineD3DSwapChainImpl *swapchain) style = GetWindowLongW(window, GWL_STYLE); exstyle = GetWindowLongW(window, GWL_EXSTYLE); + filter_messages = swapchain->filter_messages; + swapchain->filter_messages = TRUE; + /* Only restore the style if the application didn't modify it during the * fullscreen phase. Some applications change it before calling Reset() * when switching between windowed and fullscreen modes (HL2), some @@ -627,12 +637,13 @@ void swapchain_restore_fullscreen_window(IWineD3DSwapChainImpl *swapchain) SetWindowLongW(window, GWL_STYLE, device->style); SetWindowLongW(window, GWL_EXSTYLE, device->exStyle); } + SetWindowPos(window, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER); + + swapchain->filter_messages = filter_messages; /* Delete the old values. */ device->style = 0; device->exStyle = 0; - - SetWindowPos(window, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER); } @@ -965,6 +976,13 @@ void get_drawable_size_swapchain(struct wined3d_context *context, UINT *width, U LRESULT swapchain_process_message(IWineD3DSwapChainImpl *swapchain, HWND window, UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) { + if (swapchain->filter_messages) + { + TRACE("Filtering message: window %p, message %#x, wparam %#lx, lparam %#lx.\n", + window, message, wparam, lparam); + return DefWindowProcW(window, message, wparam, lparam); + } + if (message == WM_DESTROY) { TRACE("unregister window %p.\n", window); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cd4cf6f..1834c77 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2417,6 +2417,7 @@ struct IWineD3DSwapChainImpl WINED3DFORMAT orig_fmt; WINED3DGAMMARAMP orig_gamma; BOOL render_to_fbo; + BOOL filter_messages; long prev_time, frames; /* Performance tracking */ unsigned int vSyncCounter;

1 0

Henri Verbeet : d3d9: Add a test to show D3D replaces the window proc.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: bd46ccc38e3abe3b6efaa1731112e724e5a50f55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd46ccc38e3abe3b6efaa1731… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 14 20:49:54 2009 +0100 d3d9: Add a test to show D3D replaces the window proc. --- dlls/d3d9/tests/device.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 110 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index d54ff24..32f40aa 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -32,6 +32,33 @@ static int get_refcount(IUnknown *object) return IUnknown_Release( object ); } +static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND window) +{ + D3DPRESENT_PARAMETERS present_parameters = {0}; + IDirect3DDevice9 *device; + + present_parameters.Windowed = FALSE; + present_parameters.hDeviceWindow = window; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.BackBufferWidth = 640; + present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + + if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device))) return device; + + present_parameters.AutoDepthStencilFormat = D3DFMT_D16; + if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device))) return device; + + if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device))) return device; + + return NULL; +} + #define CHECK_CALL(r,c,d,rc) \ if (SUCCEEDED(r)) {\ int tmp1 = get_refcount( (IUnknown *)d ); \ @@ -2379,6 +2406,88 @@ fail: if (hwnd2) DestroyWindow(hwnd2); } +static BOOL filter_messages; + +static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) +{ + if (filter_messages) + { + ok(message == WM_DISPLAYCHANGE, "Received unexpected message %#x.\n", message); + } + + return DefWindowProcA(hwnd, message, wparam, lparam); +} + +static void test_wndproc(void) +{ + IDirect3DDevice9 *device; + WNDCLASSA wc = {0}; + IDirect3D9 *d3d9; + LONG_PTR proc; + HWND window; + ULONG ref; + + if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D9 object, skipping tests.\n"); + return; + } + + wc.lpfnWndProc = test_proc; + wc.lpszClassName = "d3d9_test_wndproc_wc"; + ok(RegisterClassA(&wc), "Failed to register window class.\n"); + + window = CreateWindowA("d3d9_test_wndproc_wc", "d3d9_test", + WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, 640, 480, 0, 0, 0, 0); + filter_messages = TRUE; + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + device = create_device(d3d9, window); + if (!device) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + ref = IDirect3DDevice9_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + device = create_device(d3d9, window); + if (!device) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + proc = SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR)DefWindowProcA); + ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + ref = IDirect3DDevice9_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)DefWindowProcA, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)DefWindowProcA, proc); + +done: + filter_messages = FALSE; + IDirect3D9_Release(d3d9); + DestroyWindow(window); + UnregisterClassA("d3d9_test_wndproc_wc", GetModuleHandleA(NULL)); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -2418,5 +2527,6 @@ START_TEST(device) test_lights(); test_set_stream_source(); test_scissor_size(); + test_wndproc(); } }

1 0

Henri Verbeet : d3d8: Add a test to show D3D replaces the window proc.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: b796573d68ed0e35e7c44ff5a030d41dbb3da901 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b796573d68ed0e35e7c44ff5a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 14 20:49:55 2009 +0100 d3d8: Add a test to show D3D replaces the window proc. --- dlls/d3d8/tests/device.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 110 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 5e1f523..f3e7f5f 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -46,6 +46,33 @@ static int get_refcount(IUnknown *object) return IUnknown_Release( object ); } +static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND window) +{ + D3DPRESENT_PARAMETERS present_parameters = {0}; + IDirect3DDevice8 *device; + + present_parameters.Windowed = FALSE; + present_parameters.hDeviceWindow = window; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.BackBufferWidth = 640; + present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + + if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device))) return device; + + present_parameters.AutoDepthStencilFormat = D3DFMT_D16; + if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device))) return device; + + if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device))) return device; + + return NULL; +} + #define CHECK_CALL(r,c,d,rc) \ if (SUCCEEDED(r)) {\ int tmp1 = get_refcount( (IUnknown *)d ); \ @@ -1460,6 +1487,88 @@ cleanup: if (d3d8) IDirect3D8_Release(d3d8); } +static BOOL filter_messages; + +static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) +{ + if (filter_messages) + { + ok(message == WM_DISPLAYCHANGE, "Received unexpected message %#x.\n", message); + } + + return DefWindowProcA(hwnd, message, wparam, lparam); +} + +static void test_wndproc(void) +{ + IDirect3DDevice8 *device; + WNDCLASSA wc = {0}; + IDirect3D8 *d3d8; + LONG_PTR proc; + HWND window; + ULONG ref; + + if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D8 object, skipping tests.\n"); + return; + } + + wc.lpfnWndProc = test_proc; + wc.lpszClassName = "d3d8_test_wndproc_wc"; + ok(RegisterClassA(&wc), "Failed to register window class.\n"); + + window = CreateWindowA("d3d8_test_wndproc_wc", "d3d8_test", + WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, 640, 480, 0, 0, 0, 0); + filter_messages = TRUE; + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + device = create_device(d3d8, window); + if (!device) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + ref = IDirect3DDevice8_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + device = create_device(d3d8, window); + if (!device) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + proc = SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR)DefWindowProcA); + ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + ref = IDirect3DDevice8_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)DefWindowProcA, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)DefWindowProcA, proc); + +done: + filter_messages = FALSE; + IDirect3D8_Release(d3d8); + DestroyWindow(window); + UnregisterClassA("d3d8_test_wndproc_wc", GetModuleHandleA(NULL)); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -1495,5 +1604,6 @@ START_TEST(device) test_lights(); test_render_zero_triangles(); test_depth_stencil_reset(); + test_wndproc(); } }

1 0

Henri Verbeet : wined3d: Use surface_is_offscreen() in context_apply_draw_buffer().
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 2f56ef09e60943dddc74b0e117def4347f8c2a21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f56ef09e60943dddc74b0e11… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 14 20:49:56 2009 +0100 wined3d: Use surface_is_offscreen() in context_apply_draw_buffer(). --- dlls/wined3d/context.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0debd2e..62eb0ac 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2054,15 +2054,13 @@ static void context_apply_draw_buffer(struct wined3d_context *context, BOOL blit { const struct wined3d_gl_info *gl_info = context->gl_info; IWineD3DSurface *rt = context->current_rt; - IWineD3DSwapChain *swapchain; IWineD3DDeviceImpl *device; device = ((IWineD3DSurfaceImpl *)rt)->resource.device; - if (SUCCEEDED(IWineD3DSurface_GetContainer(rt, &IID_IWineD3DSwapChain, (void **)&swapchain))) + if (!surface_is_offscreen(rt)) { - IWineD3DSwapChain_Release((IUnknown *)swapchain); ENTER_GL(); - glDrawBuffer(surface_get_gl_buffer(rt, swapchain)); + glDrawBuffer(surface_get_gl_buffer(rt, (IWineD3DSwapChain *)((IWineD3DSurfaceImpl *)rt)->container)); checkGLcall("glDrawBuffers()"); LEAVE_GL(); }

1 0

Juan Lang : winhttp: Return error directly from netconn_verify_cert.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 1308c4287f9013b430301377eff533bd732e6ff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1308c4287f9013b430301377e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 14 12:29:41 2009 -0800 winhttp: Return error directly from netconn_verify_cert. --- dlls/winhttp/net.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index df6b9d9..588b11b 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -251,15 +251,15 @@ static PCCERT_CONTEXT X509_to_cert_context(X509 *cert) return ret; } -static BOOL netconn_verify_cert( PCCERT_CONTEXT cert, HCERTSTORE store, - WCHAR *server ) +static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, HCERTSTORE store, + WCHAR *server ) { BOOL ret; CERT_CHAIN_PARA chainPara = { sizeof(chainPara), { 0 } }; PCCERT_CHAIN_CONTEXT chain; char oid_server_auth[] = szOID_PKIX_KP_SERVER_AUTH; char *server_auth[] = { oid_server_auth }; - DWORD err; + DWORD err = ERROR_SUCCESS; TRACE("verifying %s\n", debugstr_w( server )); chainPara.RequestedUsage.Usage.cUsageIdentifier = 1; @@ -286,8 +286,6 @@ static BOOL netconn_verify_cert( PCCERT_CONTEXT cert, HCERTSTORE store, err = ERROR_WINHTTP_SECURE_CERT_WRONG_USAGE; else err = ERROR_WINHTTP_SECURE_INVALID_CERT; - set_last_error( err ); - ret = FALSE; } else { @@ -313,14 +311,14 @@ static BOOL netconn_verify_cert( PCCERT_CONTEXT cert, HCERTSTORE store, err = ERROR_WINHTTP_SECURE_CERT_CN_INVALID; else err = ERROR_WINHTTP_SECURE_INVALID_CERT; - set_last_error( err ); - ret = FALSE; } } CertFreeCertificateChain( chain ); } - TRACE("returning %d\n", ret); - return ret; + else + err = ERROR_WINHTTP_SECURE_CHANNEL_ERROR; + TRACE("returning %08x\n", err); + return err; } static int netconn_secure_verify( int preverify_ok, X509_STORE_CTX *ctx ) @@ -361,7 +359,15 @@ static int netconn_secure_verify( int preverify_ok, X509_STORE_CTX *ctx ) } if (!endCert) ret = FALSE; if (ret) - ret = netconn_verify_cert( endCert, store, server ); + { + DWORD err = netconn_verify_cert( endCert, store, server ); + + if (err) + { + set_last_error( err ); + ret = FALSE; + } + } CertFreeCertificateContext( endCert ); CertCloseStore( store, 0 ); }

1 0

Juan Lang : winhttp: Set error and fail if a secure connections certificate couldn' t be verified.
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 888d1a23230f8bbbb35fdc7fcca401da189ec4b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=888d1a23230f8bbbb35fdc7fc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 14 12:45:42 2009 -0800 winhttp: Set error and fail if a secure connections certificate couldn't be verified. --- dlls/winhttp/net.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 588b11b..3faa41c 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -94,6 +94,7 @@ static void *libcrypto_handle; static SSL_METHOD *method; static SSL_CTX *ctx; static int hostname_idx; +static int error_idx; #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -364,7 +365,7 @@ static int netconn_secure_verify( int preverify_ok, X509_STORE_CTX *ctx ) if (err) { - set_last_error( err ); + pSSL_set_ex_data( ssl, error_idx, (void *)err ); ret = FALSE; } } @@ -476,6 +477,14 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LeaveCriticalSection( &init_ssl_cs ); return FALSE; } + error_idx = pSSL_get_ex_new_index( 0, (void *)"error index", NULL, NULL, NULL ); + if (error_idx == -1) + { + ERR("SSL_get_ex_new_index failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); + set_last_error( ERROR_OUTOFMEMORY ); + LeaveCriticalSection( &init_ssl_cs ); + return FALSE; + } pSSL_CTX_set_verify( ctx, SSL_VERIFY_PEER, netconn_secure_verify ); pCRYPTO_set_id_callback(ssl_thread_id); @@ -610,8 +619,6 @@ BOOL netconn_connect( netconn_t *conn, const struct sockaddr *sockaddr, unsigned BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname ) { #ifdef SONAME_LIBSSL - long res; - if (!(conn->ssl_conn = pSSL_new( ctx ))) { ERR("SSL_new failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); @@ -632,15 +639,14 @@ BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname ) } if (pSSL_connect( conn->ssl_conn ) <= 0) { - ERR("SSL_connect failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); - set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR ); + DWORD err; + + err = (DWORD)pSSL_get_ex_data( conn->ssl_conn, error_idx ); + if (!err) err = ERROR_WINHTTP_SECURE_CHANNEL_ERROR; + ERR("couldn't verify server certificate (%d)\n", err); + set_last_error( err ); goto fail; } - if ((res = pSSL_get_verify_result( conn->ssl_conn )) != X509_V_OK) - { - /* FIXME: we should set an error and return, but we only print an error at the moment */ - ERR("couldn't verify server certificate (%ld)\n", res); - } TRACE("established SSL connection\n"); conn->secure = TRUE; return TRUE;

1 0

Michael Stefaniuc : winex11: Fix missing unlock & free on an error path ( Smatch).
by Alexandre Julliard 15 Dec '09

15 Dec '09

Module: wine Branch: master Commit: 32d0ef391164f9bea2eef14e3c85afd8b89acfdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=32d0ef391164f9bea2eef14e3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 15 00:27:27 2009 +0100 winex11: Fix missing unlock & free on an error path (Smatch). --- dlls/winex11.drv/xrender.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 2eb1d1e..1f5e512 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2030,17 +2030,19 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid dst_pict = get_xrender_picture(devDst); wine_tsx11_lock(); - image = XCreateImage(gdi_display, visual, 32, ZPixmap, 0, - (char*) data, widthSrc, heightSrc, 32, widthSrc * 4); - src_format = get_xrender_format(WXR_FORMAT_A8R8G8B8); TRACE("src_format %p\n", src_format); if(!src_format) { WARN("Unable to find a picture format supporting alpha, make sure X is running at 24-bit\n"); + wine_tsx11_unlock(); + HeapFree(GetProcessHeap(), 0, data); return FALSE; } + image = XCreateImage(gdi_display, visual, 32, ZPixmap, 0, + (char*) data, widthSrc, heightSrc, 32, widthSrc * 4); + TRACE("src_drawable = %08lx\n", devSrc->drawable); xpm = XCreatePixmap(gdi_display, root_window,

1 0