April 2012 - Wine-commits - list.winehq.org

Henri Verbeet : d3dx9: Also print the format as FOURCC in get_format_info() .
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: f89d5d05039873c12d900cfb2a779ac95afe3414 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f89d5d05039873c12d900cfb2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 4 20:37:22 2012 +0200 d3dx9: Also print the format as FOURCC in get_format_info(). --- dlls/d3dx9_36/util.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 0ed315c..62ff996 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -166,8 +166,8 @@ const PixelFormatDesc *get_format_info(D3DFORMAT format) { unsigned int i = 0; while(formats[i].format != format && formats[i].format != D3DFMT_UNKNOWN) i++; - if(formats[i].format == D3DFMT_UNKNOWN) - FIXME("Unknown format %#x\n", format); + if (formats[i].format == D3DFMT_UNKNOWN) + FIXME("Unknown format %#x (as FOURCC %s).\n", format, debugstr_an((const char *)&format, 4)); return &formats[i]; }

1 0

Henri Verbeet : ddrawex: Don' t return a pointer to the implementation in IDirectDrawFactoryImpl_QueryInterface ().
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: d8d89887d1c5356a2bfdd7cfe72ed439e8b624f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8d89887d1c5356a2bfdd7cfe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 4 20:37:23 2012 +0200 ddrawex: Don't return a pointer to the implementation in IDirectDrawFactoryImpl_QueryInterface(). --- dlls/ddrawex/main.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ddrawex/main.c b/dlls/ddrawex/main.c index 46c5716..568a5c6 100644 --- a/dlls/ddrawex/main.c +++ b/dlls/ddrawex/main.c @@ -168,19 +168,19 @@ static inline IDirectDrawFactoryImpl *impl_from_IDirectDrawFactory(IDirectDrawFa static HRESULT WINAPI IDirectDrawFactoryImpl_QueryInterface(IDirectDrawFactory *iface, REFIID riid, void **obj) { - IDirectDrawFactoryImpl *This = impl_from_IDirectDrawFactory(iface); - - TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), obj); + TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(riid), obj); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectDrawFactory)) { IDirectDrawFactory_AddRef(iface); - *obj = This; + *obj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),obj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *obj = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : ddrawex: Don' t return a pointer to the implementation in IDirectDrawClassFactoryImpl_QueryInterface ().
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 13f483a2a24c95e21601c03ad05c8c0e4c482cdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=13f483a2a24c95e21601c03ad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 4 20:37:24 2012 +0200 ddrawex: Don't return a pointer to the implementation in IDirectDrawClassFactoryImpl_QueryInterface(). --- dlls/ddrawex/main.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ddrawex/main.c b/dlls/ddrawex/main.c index 568a5c6..d1c0fda 100644 --- a/dlls/ddrawex/main.c +++ b/dlls/ddrawex/main.c @@ -58,19 +58,19 @@ static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) static HRESULT WINAPI IDirectDrawClassFactoryImpl_QueryInterface(IClassFactory *iface, REFIID riid, void **obj) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - - TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), obj); + TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(riid), obj); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { IClassFactory_AddRef(iface); - *obj = This; + *obj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),obj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *obj = NULL; return E_NOINTERFACE; }

1 0

Eric Pouech : winedbg: Fix set instruction when sizeof(int) <> sizeof register.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 88949b2c59f5613ff1a3964e7ce538474578d6c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88949b2c59f5613ff1a3964e7… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Apr 4 22:30:38 2012 +0200 winedbg: Fix set instruction when sizeof(int) <> sizeof register. --- programs/winedbg/be_arm.c | 8 ++++++++ programs/winedbg/be_cpu.h | 2 ++ programs/winedbg/be_i386.c | 8 ++++++++ programs/winedbg/be_ppc.c | 8 ++++++++ programs/winedbg/be_sparc.c | 8 ++++++++ programs/winedbg/be_x86_64.c | 8 ++++++++ programs/winedbg/dbg.y | 2 +- programs/winedbg/debugger.h | 3 ++- programs/winedbg/memory.c | 4 ++-- programs/winedbg/types.c | 37 +++++++++++++++++++++++++++++-------- 10 files changed, 76 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=88949b2c59f5613ff1a39…

1 0

Daniel Jelinski : comctl32/tests: Added tests for treeview TVM_HITTEST message.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: cd8609597a9822e7fe2c6870fbfcabfea7bef58e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd8609597a9822e7fe2c6870f… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Mon Apr 2 22:30:04 2012 +0200 comctl32/tests: Added tests for treeview TVM_HITTEST message. --- dlls/comctl32/tests/treeview.c | 42 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 61a3ce6..2246c79 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1788,6 +1788,47 @@ static void test_TVM_GETNEXTITEM(void) DestroyWindow(hTree); } +static void test_TVM_HITTEST(void) +{ + HWND hTree; + LRESULT ret; + RECT rc; + TVHITTESTINFO ht; + + hTree = create_treeview_control(0); + fill_tree(hTree); + + *(HTREEITEM*)&rc = hRoot; + ret = SendMessage(hTree, TVM_GETITEMRECT, TRUE, (LPARAM)&rc); + expect(TRUE, (BOOL)ret); + + ht.pt.x = rc.left-1; + ht.pt.y = rc.top; + + ret = SendMessage(hTree, TVM_HITTEST, 0, (LPARAM)&ht); + ok((HTREEITEM)ret == hRoot, "got %p, expected %p\n", (HTREEITEM)ret, hRoot); + ok(ht.hItem == hRoot, "got %p, expected %p\n", ht.hItem, hRoot); + ok(ht.flags == TVHT_ONITEMBUTTON, "got %d, expected %d\n", ht.flags, TVHT_ONITEMBUTTON); + + ret = SendMessageA(hTree, TVM_EXPAND, TVE_EXPAND, (LPARAM)hRoot); + expect(TRUE, (BOOL)ret); + + *(HTREEITEM*)&rc = hChild; + ret = SendMessage(hTree, TVM_GETITEMRECT, TRUE, (LPARAM)&rc); + expect(TRUE, (BOOL)ret); + + ht.pt.x = rc.left-1; + ht.pt.y = rc.top; + + ret = SendMessage(hTree, TVM_HITTEST, 0, (LPARAM)&ht); + ok((HTREEITEM)ret == hChild, "got %p, expected %p\n", (HTREEITEM)ret, hChild); + ok(ht.hItem == hChild, "got %p, expected %p\n", ht.hItem, hChild); + /* Wine returns item button here, but this item has no button */ + todo_wine ok(ht.flags == TVHT_ONITEMINDENT, "got %d, expected %d\n", ht.flags, TVHT_ONITEMINDENT); + + DestroyWindow(hTree); +} + START_TEST(treeview) { HMODULE hComctl32; @@ -1859,6 +1900,7 @@ START_TEST(treeview) test_htreeitem_layout(); test_TVS_CHECKBOXES(); test_TVM_GETNEXTITEM(); + test_TVM_HITTEST(); if (!load_v6_module(&ctx_cookie, &hCtx)) {

1 0

Hans Leidekker : kernel32/tests: Add tests for GetModuleHandleEx.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 7133c000cdedc0ab7d02970e5009ed99127a4e46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7133c000cdedc0ab7d02970e5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 5 11:15:28 2012 +0200 kernel32/tests: Add tests for GetModuleHandleEx. --- dlls/kernel32/tests/module.c | 185 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 184 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index e86b63b..70940f5 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -23,8 +23,9 @@ static DWORD (WINAPI *pGetDllDirectoryA)(DWORD,LPSTR); static DWORD (WINAPI *pGetDllDirectoryW)(DWORD,LPWSTR); - static BOOL (WINAPI *pSetDllDirectoryA)(LPCSTR); +static BOOL (WINAPI *pGetModuleHandleExA)(DWORD,LPCSTR,HMODULE*); +static BOOL (WINAPI *pGetModuleHandleExW)(DWORD,LPCWSTR,HMODULE*); static BOOL is_unicode_enabled = TRUE; @@ -495,9 +496,190 @@ static void init_pointers(void) MAKEFUNC(GetDllDirectoryA); MAKEFUNC(GetDllDirectoryW); MAKEFUNC(SetDllDirectoryA); + MAKEFUNC(GetModuleHandleExA); + MAKEFUNC(GetModuleHandleExW); #undef MAKEFUNC } +static void testGetModuleHandleEx(void) +{ + static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2',0}; + static const WCHAR nosuchmodW[] = {'n','o','s','u','c','h','m','o','d',0}; + BOOL ret; + DWORD error; + HMODULE mod, mod_kernel32; + + if (!pGetModuleHandleExA || !pGetModuleHandleExW) + { + win_skip( "GetModuleHandleEx not available\n" ); + return; + } + + SetLastError( 0xdeadbeef ); + ret = pGetModuleHandleExA( 0, NULL, NULL ); + error = GetLastError(); + todo_wine ok( !ret, "unexpected success\n" ); + todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError( 0xdeadbeef ); + ret = pGetModuleHandleExA( 0, "kernel32", NULL ); + error = GetLastError(); + todo_wine ok( !ret, "unexpected success\n" ); + todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = pGetModuleHandleExA( 0, "kernel32", &mod ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( mod != (HMODULE)0xdeadbeef, "got %p\n", mod ); + FreeLibrary( mod ); + + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = pGetModuleHandleExA( 0, "nosuchmod", &mod ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); + todo_wine ok( mod == NULL, "got %p\n", mod ); + + SetLastError( 0xdeadbeef ); + ret = pGetModuleHandleExW( 0, NULL, NULL ); + error = GetLastError(); + todo_wine ok( !ret, "unexpected success\n" ); + todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError( 0xdeadbeef ); + ret = pGetModuleHandleExW( 0, kernel32W, NULL ); + error = GetLastError(); + todo_wine ok( !ret, "unexpected success\n" ); + todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = pGetModuleHandleExW( 0, kernel32W, &mod ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( mod != (HMODULE)0xdeadbeef, "got %p\n", mod ); + FreeLibrary( mod ); + + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = pGetModuleHandleExW( 0, nosuchmodW, &mod ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); + todo_wine ok( mod == NULL, "got %p\n", mod ); + + SetLastError( 0xdeadbeef ); + ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, NULL, NULL ); + error = GetLastError(); + todo_wine ok( !ret, "unexpected success\n" ); + todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError( 0xdeadbeef ); + ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, "kernel32", NULL ); + error = GetLastError(); + todo_wine ok( !ret, "unexpected success\n" ); + todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, "kernel32", &mod ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( mod != (HMODULE)0xdeadbeef, "got %p\n", mod ); + + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, "nosuchmod", &mod ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); + todo_wine ok( mod == NULL, "got %p\n", mod ); + + SetLastError( 0xdeadbeef ); + ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, NULL, NULL ); + error = GetLastError(); + todo_wine ok( !ret, "unexpected success\n" ); + todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError( 0xdeadbeef ); + ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, kernel32W, NULL ); + error = GetLastError(); + todo_wine ok( !ret, "unexpected success\n" ); + todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, kernel32W, &mod ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( mod != (HMODULE)0xdeadbeef, "got %p\n", mod ); + + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, nosuchmodW, &mod ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); + todo_wine ok( mod == NULL, "got %p\n", mod ); + + mod_kernel32 = LoadLibraryA( "kernel32" ); + + SetLastError( 0xdeadbeef ); + ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, NULL, NULL ); + error = GetLastError(); + todo_wine ok( !ret, "unexpected success\n" ); + todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError( 0xdeadbeef ); + ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCSTR)mod_kernel32, NULL ); + error = GetLastError(); + todo_wine ok( !ret, "unexpected success\n" ); + todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCSTR)mod_kernel32, &mod ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( mod == mod_kernel32, "got %p\n", mod ); + FreeLibrary( mod ); + + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCSTR)0xbeefdead, &mod ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); + ok( mod == NULL, "got %p\n", mod ); + + SetLastError( 0xdeadbeef ); + ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, NULL, NULL ); + error = GetLastError(); + todo_wine ok( !ret, "unexpected success\n" ); + todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError( 0xdeadbeef ); + ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)mod_kernel32, NULL ); + error = GetLastError(); + todo_wine ok( !ret, "unexpected success\n" ); + todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)mod_kernel32, &mod ); + ok( ret, "unexpected failure %u\n", GetLastError() ); + ok( mod == mod_kernel32, "got %p\n", mod ); + FreeLibrary( mod ); + + SetLastError( 0xdeadbeef ); + mod = (HMODULE)0xdeadbeef; + ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)0xbeefdead, &mod ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); + ok( mod == NULL, "got %p\n", mod ); + + FreeLibrary( mod_kernel32 ); +} + START_TEST(module) { WCHAR filenameW[MAX_PATH]; @@ -525,4 +707,5 @@ START_TEST(module) testLoadLibraryA_Wrong(); testGetProcAddress_Wrong(); testLoadLibraryEx(); + testGetModuleHandleEx(); }

1 0

Hans Leidekker : kernel32: Return failure from GetModuleHandleEx if the module handle pointer is NULL .
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: e8a95bf68379a5245a9e26c9a291e25dac212644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8a95bf68379a5245a9e26c9a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 5 11:15:50 2012 +0200 kernel32: Return failure from GetModuleHandleEx if the module handle pointer is NULL. --- dlls/kernel32/module.c | 8 ++++++- dlls/kernel32/tests/module.c | 48 +++++++++++++++++++++--------------------- 2 files changed, 31 insertions(+), 25 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 7d4d93b..739392f 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -508,6 +508,12 @@ BOOL WINAPI GetModuleHandleExW( DWORD flags, LPCWSTR name, HMODULE *module ) HMODULE ret; ULONG magic; + if (!module) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + /* if we are messing with the refcount, grab the loader lock */ if ((flags & GET_MODULE_HANDLE_EX_FLAG_PIN) || !(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) @@ -542,7 +548,7 @@ BOOL WINAPI GetModuleHandleExW( DWORD flags, LPCWSTR name, HMODULE *module ) !(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) LdrUnlockLoaderLock( 0, magic ); - if (module) *module = ret; + *module = ret; return (status == STATUS_SUCCESS); } diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 70940f5..30da85f 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -518,14 +518,14 @@ static void testGetModuleHandleEx(void) SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExA( 0, NULL, NULL ); error = GetLastError(); - todo_wine ok( !ret, "unexpected success\n" ); - todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExA( 0, "kernel32", NULL ); error = GetLastError(); - todo_wine ok( !ret, "unexpected success\n" ); - todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); mod = (HMODULE)0xdeadbeef; @@ -545,14 +545,14 @@ static void testGetModuleHandleEx(void) SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExW( 0, NULL, NULL ); error = GetLastError(); - todo_wine ok( !ret, "unexpected success\n" ); - todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExW( 0, kernel32W, NULL ); error = GetLastError(); - todo_wine ok( !ret, "unexpected success\n" ); - todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); mod = (HMODULE)0xdeadbeef; @@ -572,14 +572,14 @@ static void testGetModuleHandleEx(void) SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, NULL, NULL ); error = GetLastError(); - todo_wine ok( !ret, "unexpected success\n" ); - todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, "kernel32", NULL ); error = GetLastError(); - todo_wine ok( !ret, "unexpected success\n" ); - todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); mod = (HMODULE)0xdeadbeef; @@ -598,14 +598,14 @@ static void testGetModuleHandleEx(void) SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, NULL, NULL ); error = GetLastError(); - todo_wine ok( !ret, "unexpected success\n" ); - todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, kernel32W, NULL ); error = GetLastError(); - todo_wine ok( !ret, "unexpected success\n" ); - todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); mod = (HMODULE)0xdeadbeef; @@ -626,14 +626,14 @@ static void testGetModuleHandleEx(void) SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, NULL, NULL ); error = GetLastError(); - todo_wine ok( !ret, "unexpected success\n" ); - todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCSTR)mod_kernel32, NULL ); error = GetLastError(); - todo_wine ok( !ret, "unexpected success\n" ); - todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); mod = (HMODULE)0xdeadbeef; @@ -653,14 +653,14 @@ static void testGetModuleHandleEx(void) SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, NULL, NULL ); error = GetLastError(); - todo_wine ok( !ret, "unexpected success\n" ); - todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)mod_kernel32, NULL ); error = GetLastError(); - todo_wine ok( !ret, "unexpected success\n" ); - todo_wine ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); SetLastError( 0xdeadbeef ); mod = (HMODULE)0xdeadbeef;

1 0

Hans Leidekker : kernel32: Clear the module handle on failure in GetModuleHandleEx.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: f96c7278e72a28f96ddb535de8746f4a9780fc9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f96c7278e72a28f96ddb535de… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 5 11:16:08 2012 +0200 kernel32: Clear the module handle on failure in GetModuleHandleEx. --- dlls/kernel32/module.c | 4 +++- dlls/kernel32/tests/module.c | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 739392f..d4978cf 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -548,7 +548,9 @@ BOOL WINAPI GetModuleHandleExW( DWORD flags, LPCWSTR name, HMODULE *module ) !(flags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) LdrUnlockLoaderLock( 0, magic ); - *module = ret; + if (status == STATUS_SUCCESS) *module = ret; + else *module = NULL; + return (status == STATUS_SUCCESS); } diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 30da85f..f88c8cb 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -540,7 +540,7 @@ static void testGetModuleHandleEx(void) error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); - todo_wine ok( mod == NULL, "got %p\n", mod ); + ok( mod == NULL, "got %p\n", mod ); SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExW( 0, NULL, NULL ); @@ -567,7 +567,7 @@ static void testGetModuleHandleEx(void) error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); - todo_wine ok( mod == NULL, "got %p\n", mod ); + ok( mod == NULL, "got %p\n", mod ); SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, NULL, NULL ); @@ -593,7 +593,7 @@ static void testGetModuleHandleEx(void) error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); - todo_wine ok( mod == NULL, "got %p\n", mod ); + ok( mod == NULL, "got %p\n", mod ); SetLastError( 0xdeadbeef ); ret = pGetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, NULL, NULL ); @@ -619,7 +619,7 @@ static void testGetModuleHandleEx(void) error = GetLastError(); ok( !ret, "unexpected success\n" ); ok( error == ERROR_MOD_NOT_FOUND, "got %u\n", error ); - todo_wine ok( mod == NULL, "got %p\n", mod ); + ok( mod == NULL, "got %p\n", mod ); mod_kernel32 = LoadLibraryA( "kernel32" );

1 0

Hans Leidekker : kernel32: GetModuleHandleEx already clears the module handle on failure.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 31ffa5477336ca06fc24e9ef83eff396c6a718f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31ffa5477336ca06fc24e9ef8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 5 11:16:37 2012 +0200 kernel32: GetModuleHandleEx already clears the module handle on failure. --- dlls/kernel32/module.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index d4978cf..6b91a4c 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -570,7 +570,7 @@ HMODULE WINAPI DECLSPEC_HOTPATCH GetModuleHandleA(LPCSTR module) { HMODULE ret; - if (!GetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, module, &ret )) ret = 0; + GetModuleHandleExA( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, module, &ret ); return ret; } @@ -583,7 +583,7 @@ HMODULE WINAPI GetModuleHandleW(LPCWSTR module) { HMODULE ret; - if (!GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, module, &ret )) ret = 0; + GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, module, &ret ); return ret; }

1 0

Igor Paliychuk : po: Update Ukrainian translation.
by Alexandre Julliard 05 Apr '12

05 Apr '12

Module: wine Branch: master Commit: 9c1591ee54ad074edfd96c2480593284cefd344b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c1591ee54ad074edfd96c248… Author: Igor Paliychuk <mansonigor(a)gmail.com> Date: Wed Apr 4 18:44:07 2012 +0300 po: Update Ukrainian translation. --- po/uk.po | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/po/uk.po b/po/uk.po index 06b12bc..6acf133 100644 --- a/po/uk.po +++ b/po/uk.po @@ -9842,12 +9842,12 @@ msgstr "Ви впевнені?" #: cmd.rc:307 xcopy.rc:40 msgctxt "Yes key" msgid "Y" -msgstr "" +msgstr "Т" #: cmd.rc:308 xcopy.rc:41 msgctxt "No key" msgid "N" -msgstr "" +msgstr "Н" #: cmd.rc:309 msgid "File association missing for extension %1\n" @@ -9916,7 +9916,7 @@ msgstr "Не можу викликати мітку пакету за межам #: cmd.rc:327 xcopy.rc:42 msgctxt "All key" msgid "A" -msgstr "" +msgstr "В" #: cmd.rc:328 msgid "Delete %1?" @@ -9984,11 +9984,11 @@ msgstr "Том в приводі %1!c! не має мітки.\n" #: cmd.rc:343 msgid " (Yes|No)" -msgstr "" +msgstr " (Так|Ні)" #: cmd.rc:344 msgid " (Yes|No|All)" -msgstr "" +msgstr " (Так|Ні|Всі)" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" @@ -13973,15 +13973,15 @@ msgid "" "(F - File, D - Directory)\n" msgstr "" "'%1' є файлом чи директорією?\n" -"(F - Файл, D - Директорія)\n" +"(Ф - Файл, Д - Директорія)\n" #: xcopy.rc:35 msgid "%1? (Yes|No)\n" -msgstr "" +msgstr "%1? (Так|Ні)\n" #: xcopy.rc:36 msgid "Overwrite %1? (Yes|No|All)\n" -msgstr "Переписати %1? (Yes|No|All)\n" +msgstr "Переписати %1? (Так|Ні|Всі)\n" #: xcopy.rc:37 msgid "Copying of '%1' to '%2' failed with r/c %3!d!\n" @@ -13994,12 +13994,12 @@ msgstr "Помилка читання '%1'\n" #: xcopy.rc:43 msgctxt "File key" msgid "F" -msgstr "" +msgstr "Ф" #: xcopy.rc:44 msgctxt "Directory key" msgid "D" -msgstr "" +msgstr "Д" #: xcopy.rc:77 msgid ""

1 0