wine-commits May 2014

wine-commits@winehq.org

2 participants
404 discussions

Piotr Caban : oleacc: Add Client_get_accDescription implementation.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: 1eb9d7e703930ae99ec920a5ce58eb774563eed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eb9d7e703930ae99ec920a5c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:37 2014 +0200 oleacc: Add Client_get_accDescription implementation. --- dlls/oleacc/client.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index e16d3f8..48c8d1c 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -183,8 +183,13 @@ static HRESULT WINAPI Client_get_accDescription(IAccessible *iface, VARIANT varID, BSTR *pszDescription) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszDescription); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszDescription); + + *pszDescription = NULL; + if(convert_child_id(&varID) != CHILDID_SELF) + return E_INVALIDARG; + return S_FALSE; } static HRESULT WINAPI Client_get_accRole(IAccessible *iface, VARIANT varID, VARIANT *pvarRole)

1 0

Piotr Caban : oleacc: Add Client_get_accValue implementation.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: 5224f093713e2231dcb77a8050bea8bc9aec2485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5224f093713e2231dcb77a805… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:31 2014 +0200 oleacc: Add Client_get_accValue implementation. --- dlls/oleacc/client.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 30673d3..e16d3f8 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -170,8 +170,13 @@ static HRESULT WINAPI Client_get_accName(IAccessible *iface, VARIANT varID, BSTR static HRESULT WINAPI Client_get_accValue(IAccessible *iface, VARIANT varID, BSTR *pszValue) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszValue); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszValue); + + *pszValue = NULL; + if(convert_child_id(&varID) != CHILDID_SELF) + return E_INVALIDARG; + return S_FALSE; } static HRESULT WINAPI Client_get_accDescription(IAccessible *iface,

1 0

Piotr Caban : oleacc: Add Client_get_accName implementation.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: a5f78530ddf45b7773a11af92117993abfb9c8f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5f78530ddf45b7773a11af92… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:24 2014 +0200 oleacc: Add Client_get_accName implementation. --- dlls/oleacc/Makefile.in | 2 +- dlls/oleacc/client.c | 25 +++++++++++++++++++++++-- dlls/oleacc/main.c | 11 +++++++++++ dlls/oleacc/oleacc_private.h | 1 + 4 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in index d33f867..778791e 100644 --- a/dlls/oleacc/Makefile.in +++ b/dlls/oleacc/Makefile.in @@ -1,6 +1,6 @@ MODULE = oleacc.dll IMPORTLIB = oleacc -IMPORTS = ole32 user32 uuid +IMPORTS = uuid oleaut32 ole32 user32 C_SRCS = \ client.c \ diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 5e5ee6f..30673d3 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -142,8 +142,29 @@ static HRESULT WINAPI Client_get_accChild(IAccessible *iface, static HRESULT WINAPI Client_get_accName(IAccessible *iface, VARIANT varID, BSTR *pszName) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszName); - return E_NOTIMPL; + WCHAR name[1024]; + UINT i, len; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszName); + + *pszName = NULL; + if(convert_child_id(&varID) != CHILDID_SELF || !IsWindow(This->hwnd)) + return E_INVALIDARG; + + len = SendMessageW(This->hwnd, WM_GETTEXT, sizeof(name)/sizeof(WCHAR), (LPARAM)name); + if(!len) + return S_FALSE; + + for(i=0; i<len; i++) { + if(name[i] == '&') { + len--; + memmove(name+i, name+i+1, (len-i)*sizeof(WCHAR)); + break; + } + } + + *pszName = SysAllocStringLen(name, len); + return *pszName ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI Client_get_accValue(IAccessible *iface, VARIANT varID, BSTR *pszValue) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 63dfe99..2777a38 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -70,6 +70,17 @@ const char *debugstr_variant(const VARIANT *v) } } +int convert_child_id(VARIANT *v) +{ + switch(V_VT(v)) { + case VT_I4: + return V_I4(v); + default: + FIXME("unhandled child ID variant type: %d\n", V_VT(v)); + return -1; + } +} + HRESULT WINAPI CreateStdAccessibleObject( HWND hwnd, LONG idObject, REFIID riidInterface, void** ppvObject ) { diff --git a/dlls/oleacc/oleacc_private.h b/dlls/oleacc/oleacc_private.h index dbb0f8c..ebbab4c 100644 --- a/dlls/oleacc/oleacc_private.h +++ b/dlls/oleacc/oleacc_private.h @@ -21,6 +21,7 @@ HRESULT create_client_object(HWND, const IID*, void**) DECLSPEC_HIDDEN; const char *debugstr_variant(const VARIANT*) DECLSPEC_HIDDEN; +int convert_child_id(VARIANT *v) DECLSPEC_HIDDEN; static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) {

1 0

Piotr Caban : oleacc: Add Client_get_accChildCount implementation.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: 99d0590b012f7890f0d314a6ebf479dc0c2ed016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99d0590b012f7890f0d314a6e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:17 2014 +0200 oleacc: Add Client_get_accChildCount implementation. --- dlls/oleacc/client.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index e7ff812..5e5ee6f 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -120,8 +120,15 @@ static HRESULT WINAPI Client_get_accParent(IAccessible *iface, IDispatch **ppdis static HRESULT WINAPI Client_get_accChildCount(IAccessible *iface, LONG *pcountChildren) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%p)\n", This, pcountChildren); - return E_NOTIMPL; + HWND cur; + + TRACE("(%p)->(%p)\n", This, pcountChildren); + + *pcountChildren = 0; + for(cur = GetWindow(This->hwnd, GW_CHILD); cur; cur = GetWindow(cur, GW_HWNDNEXT)) + (*pcountChildren)++; + + return S_OK; } static HRESULT WINAPI Client_get_accChild(IAccessible *iface,

1 0

Piotr Caban : oleacc: Add default client accessible object stub.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: da8005c75ecabac85731dd2dd47e80dcf99ed189 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da8005c75ecabac85731dd2dd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:13:54 2014 +0200 oleacc: Add default client accessible object stub. --- dlls/oleacc/Makefile.in | 3 +- dlls/oleacc/client.c | 319 ++++++++++++++++++++++++++++++++++++++++++ dlls/oleacc/main.c | 53 ++++++- dlls/oleacc/oleacc_private.h | 33 +++++ 4 files changed, 403 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da8005c75ecabac85731d…

1 0

Alexandre Julliard : comctl32/imagelist: Correctly resize the alpha flags when clearing the image list.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: 1dd04884d754427723377a2fed5b58e5ebb6d3b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dd04884d754427723377a2fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 1 17:19:54 2014 +0200 comctl32/imagelist: Correctly resize the alpha flags when clearing the image list. --- dlls/comctl32/imagelist.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index eedf7c5..dfdb46a 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2376,6 +2376,12 @@ ImageList_Remove (HIMAGELIST himl, INT i) for (nCount = 0; nCount < MAX_OVERLAYIMAGE; nCount++) himl->nOvlIdx[nCount] = -1; + if (himl->has_alpha) + { + HeapFree( GetProcessHeap(), 0, himl->has_alpha ); + himl->has_alpha = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, himl->cMaxImage ); + } + hbmNewImage = ImageList_CreateImage(himl->hdcImage, himl, himl->cMaxImage); SelectObject (himl->hdcImage, hbmNewImage); DeleteObject (himl->hbmImage);

1 0

Piotr Caban : oleaut32: Handle VariantCopy errors in VariantChangeTypeEx.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: d1469144e9a5e300223703cb69d32e6e6c25b28b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1469144e9a5e300223703cb6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 12:14:27 2014 +0200 oleaut32: Handle VariantCopy errors in VariantChangeTypeEx. --- dlls/oleaut32/tests/vartype.c | 7 +++++++ dlls/oleaut32/variant.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index ea5065f..b873d82 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -6269,6 +6269,13 @@ static void test_ChangeType_keep_dst(void) hres = VariantChangeTypeEx(&v2, &v1, 0, 0, VT_INT); ok(hres == DISP_E_TYPEMISMATCH, "VariantChangeTypeEx returns %08x\n", hres); ok(V_VT(&v2) == VT_INT && V_INT(&v2) == 4, "VariantChangeTypeEx changed dst variant\n"); + V_VT(&v2) = 0xff; /* incorrect variant type */ + hres = VariantChangeTypeEx(&v2, &v1, 0, 0, VT_INT); + ok(hres == DISP_E_TYPEMISMATCH, "VariantChangeTypeEx returns %08x\n", hres); + ok(V_VT(&v2) == 0xff, "VariantChangeTypeEx changed dst variant\n"); + hres = VariantChangeTypeEx(&v2, &v1, 0, 0, VT_BSTR); + ok(hres == DISP_E_BADVARTYPE, "VariantChangeTypeEx returns %08x\n", hres); + ok(V_VT(&v2) == 0xff, "VariantChangeTypeEx changed dst variant\n"); SysFreeString(bstr); } diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 053903e..c3bd225 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1042,7 +1042,7 @@ HRESULT WINAPI VariantChangeTypeEx(VARIANTARG* pvargDest, VARIANTARG* pvargSrc, if (SUCCEEDED(res)) { V_VT(&vTmp) = vt; - VariantCopy(pvargDest, &vTmp); + res = VariantCopy(pvargDest, &vTmp); } VariantClear(&vTmp); VariantClear(&vSrcDeref);

1 0

Huw Davies : ole32/tests: Fix win8 test failures.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: dcfd901c83a8ac413bf913ada38211d2e60183c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcfd901c83a8ac413bf913ada… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 1 11:12:56 2014 +0100 ole32/tests: Fix win8 test failures. --- dlls/ole32/tests/hglobalstream.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index b509fb5..cf9fedf 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -261,14 +261,17 @@ static void test_streamonhglobal(IStream *pStream) ok(ull.u.LowPart == 0x80000008, "should have set LowPart to 0x80000008 instead of %08x\n", ull.u.LowPart); ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); - /* IStream_Seek -- seek wraps position/size on integer overflow */ + /* IStream_Seek -- seek wraps position/size on integer overflow, but not on win8 */ ull.u.HighPart = 0xCAFECAFE; ull.u.LowPart = 0xCAFECAFE; ll.u.HighPart = 0; ll.u.LowPart = 0x7FFFFFFF; hr = IStream_Seek(pStream, ll, STREAM_SEEK_CUR, &ull); - ok_ole_success(hr, "IStream_Seek"); - ok(ull.u.LowPart == 0x00000007, "should have set LowPart to 0x00000007 instead of %08x\n", ull.u.LowPart); + ok(hr == S_OK || hr == STG_E_SEEKERROR /* win8 */, "IStream_Seek"); + if (SUCCEEDED(hr)) + ok(ull.u.LowPart == 0x00000007, "should have set LowPart to 0x00000007 instead of %08x\n", ull.u.LowPart); + else + ok(ull.u.LowPart == 0x80000008, "should have set LowPart to 0x80000008 instead of %08x\n", ull.u.LowPart); ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); hr = IStream_Commit(pStream, STGC_DEFAULT);

1 0

Thomas Faber : qmgr: Register WINE_REGISTRY resource in DllRegisterServer instead of a nonexistent inf file.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: 8365eb8753db51ab078080afe423301885644a9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8365eb8753db51ab078080afe… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu May 1 13:48:00 2014 +0200 qmgr: Register WINE_REGISTRY resource in DllRegisterServer instead of a nonexistent inf file. --- dlls/qmgr/qmgr_main.c | 77 ++----------------------------------------------- 1 file changed, 3 insertions(+), 74 deletions(-) diff --git a/dlls/qmgr/qmgr_main.c b/dlls/qmgr/qmgr_main.c index 051c3a5..97c206a 100644 --- a/dlls/qmgr/qmgr_main.c +++ b/dlls/qmgr/qmgr_main.c @@ -28,6 +28,7 @@ #include "winreg.h" #include "advpub.h" #include "olectl.h" +#include "rpcproxy.h" #include "winsvc.h" #include "bits.h" @@ -41,9 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); /* Handle to the base address of this DLL */ static HINSTANCE hInst; -/* Other GUIDs used by this module */ -DEFINE_GUID(CLSID_BackgroundCopyQMgr, 0x69AD4AEE, 0x51BE, 0x439b, 0xA9,0x2C, 0x86,0xAE,0x49,0x0E,0x8B,0x30); - /* Entry point for DLL */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -62,81 +60,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } -static HRESULT init_register_strtable(STRTABLEA *strtable) -{ -#define CLSID_EXPANSION_ENTRY(id) { "CLSID_" #id, &CLSID_ ## id } - static const struct { - const char *name; - const CLSID *clsid; - } expns[] = { - CLSID_EXPANSION_ENTRY(BackgroundCopyQMgr), - CLSID_EXPANSION_ENTRY(BackgroundCopyManager) - }; -#undef CLSID_EXPANSION_ENTRY - static STRENTRYA pse[sizeof expns / sizeof expns[0]]; - DWORD i; - - strtable->cEntries = sizeof pse / sizeof pse[0]; - strtable->pse = pse; - for (i = 0; i < strtable->cEntries; i++) { - static const char dummy_sample[] = "{12345678-1234-1234-1234-123456789012}"; - const CLSID *clsid = expns[i].clsid; - pse[i].pszName = qmgr_strdup(expns[i].name); - pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, sizeof dummy_sample); - if (!pse[i].pszName || !pse[i].pszValue) - return E_OUTOFMEMORY; - sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - clsid->Data1, clsid->Data2, clsid->Data3, clsid->Data4[0], - clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], clsid->Data4[4], - clsid->Data4[5], clsid->Data4[6], clsid->Data4[7]); - } - - return S_OK; -} - -static void cleanup_register_strtable(STRTABLEA *strtable) -{ - DWORD i; - for (i = 0; i < strtable->cEntries; i++) { - HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszName); - HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszValue); - if (!strtable->pse[i].pszName || !strtable->pse[i].pszValue) - return; - } -} - -/* Use an INF file to register or unregister the DLL */ -static HRESULT register_server(BOOL do_register) -{ - HRESULT hr; - STRTABLEA strtable; - HMODULE hAdvpack; - HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); - static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; - - TRACE("(%x)\n", do_register); - - hAdvpack = LoadLibraryW(wszAdvpack); - pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall"); - - hr = init_register_strtable(&strtable); - if (SUCCEEDED(hr)) - hr = pRegInstall(hInst, do_register ? "RegisterDll" : "UnregisterDll", - &strtable); - cleanup_register_strtable(&strtable); - - if (FAILED(hr)) - ERR("RegInstall failed: %08x\n", hr); - - return hr; -} - HRESULT WINAPI DllRegisterServer(void) { - return register_server(TRUE); + return __wine_register_resources(hInst); } HRESULT WINAPI DllUnregisterServer(void) { - return register_server(FALSE); + return __wine_unregister_resources(hInst); }

1 0

Alexandre Julliard : user32: Don' t bother returning a value from the SetWindowRgn driver entry point.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: 6a0f3df68cb22ca341a0ca2dd642d426c74e5cf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a0f3df68cb22ca341a0ca2dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 1 12:31:14 2014 +0200 user32: Don't bother returning a value from the SetWindowRgn driver entry point. --- dlls/user32/driver.c | 7 +++---- dlls/user32/user_private.h | 2 +- dlls/winemac.drv/window.c | 4 +--- dlls/winex11.drv/window.c | 3 +-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 672f194..e0bc38c 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -457,9 +457,8 @@ static void CDECL nulldrv_SetParent( HWND hwnd, HWND parent, HWND old_parent ) { } -static int CDECL nulldrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) +static void CDECL nulldrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) { - return 1; } static void CDECL nulldrv_SetWindowIcon( HWND hwnd, UINT type, HICON icon ) @@ -757,9 +756,9 @@ static void CDECL loaderdrv_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, load_driver()->pSetLayeredWindowAttributes( hwnd, key, alpha, flags ); } -static int CDECL loaderdrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) +static void CDECL loaderdrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) { - return load_driver()->pSetWindowRgn( hwnd, hrgn, redraw ); + load_driver()->pSetWindowRgn( hwnd, hrgn, redraw ); } static BOOL CDECL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index f2345e8..2bb869a 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -105,7 +105,7 @@ typedef struct tagUSER_DRIVER { void (CDECL *pSetFocus)(HWND); void (CDECL *pSetLayeredWindowAttributes)(HWND,COLORREF,BYTE,DWORD); void (CDECL *pSetParent)(HWND,HWND,HWND); - int (CDECL *pSetWindowRgn)(HWND,HRGN,BOOL); + void (CDECL *pSetWindowRgn)(HWND,HRGN,BOOL); void (CDECL *pSetWindowIcon)(HWND,UINT,HICON); void (CDECL *pSetWindowStyle)(HWND,INT,STYLESTRUCT*); void (CDECL *pSetWindowText)(HWND,LPCWSTR); diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 6ef227c..e61a517 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1374,7 +1374,7 @@ void CDECL macdrv_SetParent(HWND hwnd, HWND parent, HWND old_parent) * * Assign specified region to window (for non-rectangular windows) */ -int CDECL macdrv_SetWindowRgn(HWND hwnd, HRGN hrgn, BOOL redraw) +void CDECL macdrv_SetWindowRgn(HWND hwnd, HRGN hrgn, BOOL redraw) { struct macdrv_win_data *data; @@ -1393,8 +1393,6 @@ int CDECL macdrv_SetWindowRgn(HWND hwnd, HRGN hrgn, BOOL redraw) if (procid != GetCurrentProcessId()) SendMessageW(hwnd, WM_MACDRV_SET_WIN_REGION, 0, 0); } - - return TRUE; } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index d98b9f6..77cf304 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2435,7 +2435,7 @@ done: * * Assign specified region to window (for non-rectangular windows) */ -int CDECL X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) +void CDECL X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) { struct x11drv_win_data *data; @@ -2448,7 +2448,6 @@ int CDECL X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) { SendMessageW( hwnd, WM_X11DRV_SET_WIN_REGION, 0, 0 ); } - return TRUE; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2014