January 2011 - Wine-Commits

Michael Stefaniuc : ddrawex: COM cleanup for the IDirectDrawFactory iface.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 0b9cfcfcc956d21320889ac0369498c22c09c7db URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b9cfcfcc956d21320889ac03… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 23 21:02:50 2011 +0100 ddrawex: COM cleanup for the IDirectDrawFactory iface. --- dlls/ddrawex/ddrawex_private.h | 9 --------- dlls/ddrawex/main.c | 37 ++++++++++++++++++++++++------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/ddrawex/ddrawex_private.h b/dlls/ddrawex/ddrawex_private.h index 079b26c..34608c6 100644 --- a/dlls/ddrawex/ddrawex_private.h +++ b/dlls/ddrawex/ddrawex_private.h @@ -44,15 +44,6 @@ DECLARE_INTERFACE_(IDirectDrawFactory, IUnknown) #endif -/****************************************************************************** - * DirectDrawFactory implementation - ******************************************************************************/ -typedef struct -{ - const IDirectDrawFactoryVtbl *lpVtbl; - LONG ref; -} IDirectDrawFactoryImpl; - HRESULT WINAPI IDirectDrawFactoryImpl_CreateDirectDraw(IDirectDrawFactory* iface, GUID * pGUID, HWND hWnd, DWORD dwCoopLevelFlags, DWORD dwReserved, IUnknown *pUnkOuter, IDirectDraw **ppDirectDraw); diff --git a/dlls/ddrawex/main.c b/dlls/ddrawex/main.c index b5923e2..7b32323 100644 --- a/dlls/ddrawex/main.c +++ b/dlls/ddrawex/main.c @@ -150,16 +150,28 @@ static const IClassFactoryVtbl IClassFactory_Vtbl = }; +/****************************************************************************** + * DirectDrawFactory implementation + ******************************************************************************/ +typedef struct +{ + IDirectDrawFactory IDirectDrawFactory_iface; + LONG ref; +} IDirectDrawFactoryImpl; + +static inline IDirectDrawFactoryImpl *impl_from_IDirectDrawFactory(IDirectDrawFactory *iface) +{ + return CONTAINING_RECORD(iface, IDirectDrawFactoryImpl, IDirectDrawFactory_iface); +} + /******************************************************************************* * IDirectDrawFactory::QueryInterface * *******************************************************************************/ -static HRESULT WINAPI -IDirectDrawFactoryImpl_QueryInterface(IDirectDrawFactory *iface, - REFIID riid, - void **obj) +static HRESULT WINAPI IDirectDrawFactoryImpl_QueryInterface(IDirectDrawFactory *iface, REFIID riid, + void **obj) { - IDirectDrawFactoryImpl *This = (IDirectDrawFactoryImpl*) iface; + IDirectDrawFactoryImpl *This = impl_from_IDirectDrawFactory(iface); TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), obj); @@ -179,10 +191,9 @@ IDirectDrawFactoryImpl_QueryInterface(IDirectDrawFactory *iface, * IDirectDrawFactory::AddRef * *******************************************************************************/ -static ULONG WINAPI -IDirectDrawFactoryImpl_AddRef(IDirectDrawFactory *iface) +static ULONG WINAPI IDirectDrawFactoryImpl_AddRef(IDirectDrawFactory *iface) { - IDirectDrawFactoryImpl *This = (IDirectDrawFactoryImpl*) iface; + IDirectDrawFactoryImpl *This = impl_from_IDirectDrawFactory(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p)->() incrementing from %d.\n", This, ref - 1); @@ -194,11 +205,11 @@ IDirectDrawFactoryImpl_AddRef(IDirectDrawFactory *iface) * IDirectDrawFactory::Release * *******************************************************************************/ -static ULONG WINAPI -IDirectDrawFactoryImpl_Release(IDirectDrawFactory *iface) +static ULONG WINAPI IDirectDrawFactoryImpl_Release(IDirectDrawFactory *iface) { - IDirectDrawFactoryImpl *This = (IDirectDrawFactoryImpl*) iface; + IDirectDrawFactoryImpl *This = impl_from_IDirectDrawFactory(iface); ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p)->() decrementing from %d.\n", This, ref+1); if (ref == 0) @@ -255,9 +266,9 @@ CreateDirectDrawFactory(IUnknown* UnkOuter, REFIID iid, void **obj) return E_OUTOFMEMORY; } - This->lpVtbl = &IDirectDrawFactory_Vtbl; + This->IDirectDrawFactory_iface.lpVtbl = &IDirectDrawFactory_Vtbl; - hr = IDirectDrawFactory_QueryInterface((IDirectDrawFactory *)This, iid, obj); + hr = IDirectDrawFactory_QueryInterface(&This->IDirectDrawFactory_iface, iid, obj); if (FAILED(hr)) HeapFree(GetProcessHeap(), 0, This);

1 0

Alexander Morozov : shell32/tests: Add tests for IShellDispatch::NameSpace.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 38f85c37cc66e8f62e8397694c08f6e779988bb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38f85c37cc66e8f62e8397694… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Fri Jan 21 18:28:40 2011 +0300 shell32/tests: Add tests for IShellDispatch::NameSpace. --- dlls/shell32/tests/Makefile.in | 3 +- dlls/shell32/tests/shelldispatch.c | 208 ++++++++++++++++++++++++++++++++++++ 2 files changed, 210 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/Makefile.in b/dlls/shell32/tests/Makefile.in index d6a942c..53f33b1 100644 --- a/dlls/shell32/tests/Makefile.in +++ b/dlls/shell32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = shell32.dll -IMPORTS = shell32 ole32 oleaut32 user32 advapi32 +IMPORTS = shell32 ole32 oleaut32 shlwapi user32 advapi32 C_SRCS = \ appbar.c \ @@ -8,6 +8,7 @@ C_SRCS = \ ebrowser.c \ generated.c \ progman_dde.c \ + shelldispatch.c \ shelllink.c \ shellole.c \ shellpath.c \ diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c new file mode 100644 index 0000000..9375d40 --- /dev/null +++ b/dlls/shell32/tests/shelldispatch.c @@ -0,0 +1,208 @@ +/* + * Unit tests for IShellDispatch + * + * Copyright 2010 Alexander Morozov for Etersoft + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "shldisp.h" +#include "shlobj.h" +#include "shlwapi.h" +#include "wine/test.h" + +static HRESULT (WINAPI *pSHGetFolderPathW)(HWND, int, HANDLE, DWORD, LPWSTR); +static HRESULT (WINAPI *pSHGetNameFromIDList)(PCIDLIST_ABSOLUTE,SIGDN,PWSTR*); +static HRESULT (WINAPI *pSHGetSpecialFolderLocation)(HWND, int, LPITEMIDLIST *); + +static void init_function_pointers(void) +{ + HMODULE hmod; + + hmod = GetModuleHandleA("shell32.dll"); + pSHGetFolderPathW = (void*)GetProcAddress(hmod, "SHGetFolderPathW"); + pSHGetNameFromIDList = (void*)GetProcAddress(hmod, "SHGetNameFromIDList"); + pSHGetSpecialFolderLocation = (void*)GetProcAddress(hmod, + "SHGetSpecialFolderLocation"); +} + +static void test_namespace(void) +{ + static const WCHAR winetestW[] = {'w','i','n','e','t','e','s','t',0}; + static const WCHAR backslashW[] = {'\\',0}; + + static WCHAR tempW[MAX_PATH], curW[MAX_PATH]; + HRESULT r; + IShellDispatch *sd; + Folder *folder; + VARIANT var; + BSTR title; + int len; + + r = CoCreateInstance(&CLSID_Shell, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellDispatch, (LPVOID*)&sd); + if (r == REGDB_E_CLASSNOTREG) /* NT4 */ + { + win_skip("skipping IShellDispatch tests\n"); + return; + } + ok(SUCCEEDED(r), "CoCreateInstance failed: %08x\n", r); + if (FAILED(r)) + return; + + VariantInit(&var); + folder = (void*)0xdeadbeef; + r = IShellDispatch_NameSpace(sd, var, &folder); + todo_wine + ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); + ok(folder == NULL, "expected NULL, got %p\n", folder); + + V_VT(&var) = VT_I4; + V_I4(&var) = -1; + r = IShellDispatch_NameSpace(sd, var, &folder); + todo_wine + ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); + + V_VT(&var) = VT_I4; + V_I4(&var) = ssfPROGRAMFILES; + r = IShellDispatch_NameSpace(sd, var, &folder); + todo_wine + ok(r == S_OK, "IShellDispatch::NameSpace failed: %08x\n", r); + if (r == S_OK) + { + r = Folder_get_Title(folder, &title); + todo_wine + ok(r == S_OK, "Folder::get_Title failed: %08x\n", r); + if (r == S_OK) + { + /* On Win2000-2003 title is equal to program files directory name in + HKLM\Software\Microsoft\Windows\CurrentVersion\ProgramFilesDir. + On newer Windows it seems constant and is not changed + if the program files directory name is changed */ + if (pSHGetSpecialFolderLocation && pSHGetNameFromIDList) + { + LPITEMIDLIST pidl; + PWSTR name; + + r = pSHGetSpecialFolderLocation(NULL, CSIDL_PROGRAM_FILES, &pidl); + ok(r == S_OK, "SHGetSpecialFolderLocation failed: %08x\n", r); + r = pSHGetNameFromIDList(pidl, SIGDN_NORMALDISPLAY, &name); + ok(r == S_OK, "SHGetNameFromIDList failed: %08x\n", r); + todo_wine + ok(!lstrcmpW(title, name), "expected %s, got %s\n", + wine_dbgstr_w(name), wine_dbgstr_w(title)); + CoTaskMemFree(name); + CoTaskMemFree(pidl); + } + else if (pSHGetFolderPathW) + { + static WCHAR path[MAX_PATH]; + WCHAR *p; + + r = pSHGetFolderPathW(NULL, CSIDL_PROGRAM_FILES, NULL, + SHGFP_TYPE_CURRENT, path); + ok(r == S_OK, "SHGetFolderPath failed: %08x\n", r); + p = PathFindFileNameW(path); + ok(!lstrcmpW(title, p), "expected %s, got %s\n", + wine_dbgstr_w(p), wine_dbgstr_w(title)); + } + else skip("skipping Folder::get_Title test\n"); + SysFreeString(title); + } + Folder_Release(folder); + } + + GetTempPathW(MAX_PATH, tempW); + GetCurrentDirectoryW(MAX_PATH, curW); + SetCurrentDirectoryW(tempW); + CreateDirectoryW(winetestW, NULL); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(winetestW); + r = IShellDispatch_NameSpace(sd, var, &folder); + todo_wine + ok(r == S_FALSE, "expected S_FALSE, got %08x\n", r); + SysFreeString(V_BSTR(&var)); + + GetFullPathNameW(winetestW, MAX_PATH, tempW, NULL); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(tempW); + r = IShellDispatch_NameSpace(sd, var, &folder); + todo_wine + ok(r == S_OK, "IShellDispatch::NameSpace failed: %08x\n", r); + if (r == S_OK) + { + r = Folder_get_Title(folder, &title); + todo_wine + ok(r == S_OK, "Folder::get_Title failed: %08x\n", r); + if (r == S_OK) + { + todo_wine + ok(!lstrcmpW(title, winetestW), "bad title: %s\n", + wine_dbgstr_w(title)); + SysFreeString(title); + } + Folder_Release(folder); + } + SysFreeString(V_BSTR(&var)); + + len = lstrlenW(tempW); + if (len < MAX_PATH - 1) + { + lstrcatW(tempW, backslashW); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(tempW); + r = IShellDispatch_NameSpace(sd, var, &folder); + todo_wine + ok(r == S_OK, "IShellDispatch::NameSpace failed: %08x\n", r); + if (r == S_OK) + { + r = Folder_get_Title(folder, &title); + todo_wine + ok(r == S_OK, "Folder::get_Title failed: %08x\n", r); + if (r == S_OK) + { + todo_wine + ok(!lstrcmpW(title, winetestW), "bad title: %s\n", + wine_dbgstr_w(title)); + SysFreeString(title); + } + Folder_Release(folder); + } + SysFreeString(V_BSTR(&var)); + } + + RemoveDirectoryW(winetestW); + SetCurrentDirectoryW(curW); + IShellDispatch_Release(sd); +} + +START_TEST(shelldispatch) +{ + HRESULT r; + + r = CoInitialize(NULL); + ok(SUCCEEDED(r), "CoInitialize failed: %08x\n", r); + if (FAILED(r)) + return; + + init_function_pointers(); + test_namespace(); + + CoUninitialize(); +}

1 0

Michael Stefaniuc : ddrawex: COM cleanup for the IClassFactory iface.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 3799ad3482754e56b625dcc923de4a94e54ab859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3799ad3482754e56b625dcc92… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 23 21:01:44 2011 +0100 ddrawex: COM cleanup for the IClassFactory iface. --- dlls/ddrawex/ddrawex_private.h | 10 ------- dlls/ddrawex/main.c | 52 +++++++++++++++++++++++---------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/ddrawex/ddrawex_private.h b/dlls/ddrawex/ddrawex_private.h index 3e7a0e2..079b26c 100644 --- a/dlls/ddrawex/ddrawex_private.h +++ b/dlls/ddrawex/ddrawex_private.h @@ -43,16 +43,6 @@ DECLARE_INTERFACE_(IDirectDrawFactory, IUnknown) #define IDirectDrawFactory_DirectDrawEnumerate(p,a,b) (p)->lpVtbl->_DirectDrawEnumerate(p,a,b) #endif -/****************************************************************************** - * DirectDraw ClassFactory implementation - incomplete - ******************************************************************************/ -typedef struct -{ - const IClassFactoryVtbl *lpVtbl; - LONG ref; - HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, REFIID iid, LPVOID *ppObj); -} IClassFactoryImpl; - /****************************************************************************** * DirectDrawFactory implementation diff --git a/dlls/ddrawex/main.c b/dlls/ddrawex/main.c index c93d8eb..b5923e2 100644 --- a/dlls/ddrawex/main.c +++ b/dlls/ddrawex/main.c @@ -39,16 +39,29 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddrawex); static HINSTANCE instance; +/****************************************************************************** + * DirectDraw ClassFactory implementation + ******************************************************************************/ +typedef struct +{ + IClassFactory IClassFactory_iface; + LONG ref; + HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, REFIID iid, LPVOID *ppObj); +} IClassFactoryImpl; + +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + /******************************************************************************* * IDirectDrawClassFactory::QueryInterface * *******************************************************************************/ -static HRESULT WINAPI -IDirectDrawClassFactoryImpl_QueryInterface(IClassFactory *iface, - REFIID riid, - void **obj) +static HRESULT WINAPI IDirectDrawClassFactoryImpl_QueryInterface(IClassFactory *iface, REFIID riid, + void **obj) { - IClassFactoryImpl *This = (IClassFactoryImpl*) iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), obj); @@ -68,10 +81,9 @@ IDirectDrawClassFactoryImpl_QueryInterface(IClassFactory *iface, * IDirectDrawClassFactory::AddRef * *******************************************************************************/ -static ULONG WINAPI -IDirectDrawClassFactoryImpl_AddRef(IClassFactory *iface) +static ULONG WINAPI IDirectDrawClassFactoryImpl_AddRef(IClassFactory *iface) { - IClassFactoryImpl *This = (IClassFactoryImpl*) iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p)->() incrementing from %d.\n", This, ref - 1); @@ -83,11 +95,11 @@ IDirectDrawClassFactoryImpl_AddRef(IClassFactory *iface) * IDirectDrawClassFactory::Release * *******************************************************************************/ -static ULONG WINAPI -IDirectDrawClassFactoryImpl_Release(IClassFactory *iface) +static ULONG WINAPI IDirectDrawClassFactoryImpl_Release(IClassFactory *iface) { - IClassFactoryImpl *This = (IClassFactoryImpl*) iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p)->() decrementing from %d.\n", This, ref+1); if (ref == 0) @@ -101,13 +113,10 @@ IDirectDrawClassFactoryImpl_Release(IClassFactory *iface) * IDirectDrawClassFactory::CreateInstance * *******************************************************************************/ -static HRESULT WINAPI -IDirectDrawClassFactoryImpl_CreateInstance(IClassFactory *iface, - IUnknown *UnkOuter, - REFIID riid, - void **obj) +static HRESULT WINAPI IDirectDrawClassFactoryImpl_CreateInstance(IClassFactory *iface, + IUnknown *UnkOuter, REFIID riid, void **obj) { - IClassFactoryImpl *This = (IClassFactoryImpl*) iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); TRACE("(%p)->(%p,%s,%p)\n",This,UnkOuter,debugstr_guid(riid),obj); @@ -118,11 +127,12 @@ IDirectDrawClassFactoryImpl_CreateInstance(IClassFactory *iface, * IDirectDrawClassFactory::LockServer * *******************************************************************************/ -static HRESULT WINAPI -IDirectDrawClassFactoryImpl_LockServer(IClassFactory *iface,BOOL dolock) +static HRESULT WINAPI IDirectDrawClassFactoryImpl_LockServer(IClassFactory *iface,BOOL dolock) { - IClassFactoryImpl *This = (IClassFactoryImpl*) iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); + FIXME("(%p)->(%d),stub!\n",This,dolock); + return S_OK; } @@ -287,7 +297,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) factory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*factory)); if (factory == NULL) return E_OUTOFMEMORY; - factory->lpVtbl = &IClassFactory_Vtbl; + factory->IClassFactory_iface.lpVtbl = &IClassFactory_Vtbl; factory->ref = 1; factory->pfnCreateInstance = CreateDirectDrawFactory;

1 0

Nikolay Sivov : urlmon/tests: Fix a leak in test (Valgrind).
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 5b1d46174888df708e1708bd363177c51474dc59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b1d46174888df708e1708bd3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 23 16:18:58 2011 +0300 urlmon/tests: Fix a leak in test (Valgrind). --- dlls/urlmon/tests/misc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 0dacd12..cd3372c 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1183,6 +1183,7 @@ static void test_CopyStgMedium(void) ok(dst.u.lpszFileName && dst.u.lpszFileName != fileW, "lpszFileName=%p\n", dst.u.lpszFileName); ok(!lstrcmpW(dst.u.lpszFileName, fileW), "wrong file name\n"); ok(!dst.pUnkForRelease, "pUnkForRelease=%p, expected NULL\n", dst.pUnkForRelease); + ReleaseStgMedium(&dst); hres = pCopyStgMedium(&src, NULL); ok(hres == E_POINTER, "CopyStgMedium failed: %08x, expected E_POINTER\n", hres);

1 0

Nikolay Sivov : msxml3: Fix invalid read before allocated block (Valgrind).
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 952f0a6af43f9252d696953a99e37a4b5ba4a1fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=952f0a6af43f9252d696953a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 23 14:13:01 2011 +0300 msxml3: Fix invalid read before allocated block (Valgrind). --- dlls/msxml3/node.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index b2e5b16..08df8bd 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -534,8 +534,8 @@ static inline xmlChar* trim_whitespace(xmlChar* str) while (*ret && isspace(*ret)) ++ret; len = xmlStrlen(ret); - while (isspace(ret[len-1])) - --len; + if (len) + while (isspace(ret[len-1])) --len; ret = xmlStrndup(ret, len); xmlFree(str);

1 0

Detlef Riekenberg : kernel32: Don' t mask when printing unsupported flags in load_library.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 27d31c76527d9880915feaa2ea25824ec47943d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27d31c76527d9880915feaa2e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jan 23 17:46:29 2011 +0100 kernel32: Don't mask when printing unsupported flags in load_library. --- dlls/kernel32/module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index f544e24..d94850f 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -856,7 +856,7 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) LOAD_LIBRARY_REQUIRE_SIGNED_TARGET; if( flags & unsupported_flags) - FIXME("unsupported flag(s) used (flags: 0x%08x)\n", flags & ~unsupported_flags); + FIXME("unsupported flag(s) used (flags: 0x%08x)\n", flags); load_path = MODULE_get_dll_load_path( flags & LOAD_WITH_ALTERED_SEARCH_PATH ? libname->Buffer : NULL );

1 0

Greg Geldorp : gdi32/tests: Fix font tests on Arabic machines.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 566d455b29e8e43b5f5329899d4191df049f47ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=566d455b29e8e43b5f5329899… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Sun Jan 23 17:42:29 2011 +0100 gdi32/tests: Fix font tests on Arabic machines. --- dlls/gdi32/tests/font.c | 48 ++++++++++++++++++++++++++++++---------------- 1 files changed, 31 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index eda7056..fa9df33 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -670,6 +670,7 @@ static void test_bitmap_font_metrics(void) int weight, height, ascent, descent, int_leading, ext_leading; int ave_char_width, max_char_width, dpi; DWORD ansi_bitfield; + WORD skip_lang_id; } fd[] = { { "MS Sans Serif", FW_NORMAL, 13, 11, 2, 2, 0, 5, 11, 96, FS_LATIN1 | FS_LATIN2 | FS_CYRILLIC }, @@ -741,19 +742,23 @@ static void test_bitmap_font_metrics(void) { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 1, 2, 96, FS_LATIN1 }, { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 1, 8, 96, FS_LATIN2 | FS_CYRILLIC }, { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 2, 4, 96, FS_JISJAPAN }, - { "Small Fonts", FW_NORMAL, 5, 4, 1, 1, 0, 3, 4, 96, FS_LATIN1 }, + { "Small Fonts", FW_NORMAL, 5, 4, 1, 1, 0, 3, 4, 96, FS_LATIN1, LANG_ARABIC }, { "Small Fonts", FW_NORMAL, 5, 4, 1, 1, 0, 2, 8, 96, FS_LATIN2 | FS_CYRILLIC }, { "Small Fonts", FW_NORMAL, 5, 4, 1, 0, 0, 3, 6, 96, FS_JISJAPAN }, - { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 13, 96, FS_LATIN1 }, + { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 13, 96, FS_LATIN1, LANG_ARABIC }, { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 8, 96, FS_LATIN2 | FS_CYRILLIC }, + { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 8, 96, FS_ARABIC }, { "Small Fonts", FW_NORMAL, 6, 5, 1, 0, 0, 4, 8, 96, FS_JISJAPAN }, - { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 7, 96, FS_LATIN1 }, + { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 7, 96, FS_LATIN1, LANG_ARABIC }, { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 8, 96, FS_LATIN2 | FS_CYRILLIC }, + { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 8, 96, FS_ARABIC }, { "Small Fonts", FW_NORMAL, 8, 7, 1, 0, 0, 5, 10, 96, FS_JISJAPAN }, - { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 4, 8, 96, FS_LATIN1 | FS_LATIN2 }, + { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 4, 8, 96, FS_LATIN1 | FS_LATIN2, LANG_ARABIC }, { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 5, 8, 96, FS_CYRILLIC }, + { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 4, 9, 96, FS_ARABIC }, { "Small Fonts", FW_NORMAL, 10, 8, 2, 0, 0, 6, 12, 96, FS_JISJAPAN }, - { "Small Fonts", FW_NORMAL, 11, 9, 2, 2, 0, 5, 9, 96, FS_LATIN1 | FS_LATIN2 | FS_CYRILLIC }, + { "Small Fonts", FW_NORMAL, 11, 9, 2, 2, 0, 5, 9, 96, FS_LATIN1 | FS_LATIN2 | FS_CYRILLIC, LANG_ARABIC }, + { "Small Fonts", FW_NORMAL, 11, 9, 2, 2, 0, 4, 10, 96, FS_ARABIC }, { "Small Fonts", FW_NORMAL, 11, 9, 2, 0, 0, 7, 14, 96, FS_JISJAPAN }, { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 1, 2, 120, FS_LATIN1 | FS_JISJAPAN }, @@ -783,6 +788,9 @@ static void test_bitmap_font_metrics(void) HFONT hfont, old_hfont; TEXTMETRIC tm; INT ret, i; + WORD system_lang_id; + + system_lang_id = PRIMARYLANGID(GetSystemDefaultLangID()); hdc = CreateCompatibleDC(0); assert(hdc); @@ -818,18 +826,24 @@ static void test_bitmap_font_metrics(void) if(fd[i].dpi == tm.tmDigitizedAspectX) { trace("found font %s, height %d charset %x dpi %d\n", lf.lfFaceName, lf.lfHeight, lf.lfCharSet, fd[i].dpi); - ok(tm.tmWeight == fd[i].weight, "%s(%d): tm.tmWeight %d != %d\n", fd[i].face_name, fd[i].height, tm.tmWeight, fd[i].weight); - ok(tm.tmHeight == fd[i].height, "%s(%d): tm.tmHeight %d != %d\n", fd[i].face_name, fd[i].height, tm.tmHeight, fd[i].height); - ok(tm.tmAscent == fd[i].ascent, "%s(%d): tm.tmAscent %d != %d\n", fd[i].face_name, fd[i].height, tm.tmAscent, fd[i].ascent); - ok(tm.tmDescent == fd[i].descent, "%s(%d): tm.tmDescent %d != %d\n", fd[i].face_name, fd[i].height, tm.tmDescent, fd[i].descent); - ok(tm.tmInternalLeading == fd[i].int_leading, "%s(%d): tm.tmInternalLeading %d != %d\n", fd[i].face_name, fd[i].height, tm.tmInternalLeading, fd[i].int_leading); - ok(tm.tmExternalLeading == fd[i].ext_leading, "%s(%d): tm.tmExternalLeading %d != %d\n", fd[i].face_name, fd[i].height, tm.tmExternalLeading, fd[i].ext_leading); - ok(tm.tmAveCharWidth == fd[i].ave_char_width, "%s(%d): tm.tmAveCharWidth %d != %d\n", fd[i].face_name, fd[i].height, tm.tmAveCharWidth, fd[i].ave_char_width); - - /* Don't run the max char width test on System/ANSI_CHARSET. We have extra characters in our font - that make the max width bigger */ - if(strcmp(lf.lfFaceName, "System") || lf.lfCharSet != ANSI_CHARSET) - ok(tm.tmMaxCharWidth == fd[i].max_char_width, "%s(%d): tm.tmMaxCharWidth %d != %d\n", fd[i].face_name, fd[i].height, tm.tmMaxCharWidth, fd[i].max_char_width); + if (fd[i].skip_lang_id == 0 || system_lang_id != fd[i].skip_lang_id) + { + ok(tm.tmWeight == fd[i].weight, "%s(%d): tm.tmWeight %d != %d\n", fd[i].face_name, fd[i].height, tm.tmWeight, fd[i].weight); + ok(tm.tmHeight == fd[i].height, "%s(%d): tm.tmHeight %d != %d\n", fd[i].face_name, fd[i].height, tm.tmHeight, fd[i].height); + ok(tm.tmAscent == fd[i].ascent, "%s(%d): tm.tmAscent %d != %d\n", fd[i].face_name, fd[i].height, tm.tmAscent, fd[i].ascent); + ok(tm.tmDescent == fd[i].descent, "%s(%d): tm.tmDescent %d != %d\n", fd[i].face_name, fd[i].height, tm.tmDescent, fd[i].descent); + ok(tm.tmInternalLeading == fd[i].int_leading, "%s(%d): tm.tmInternalLeading %d != %d\n", fd[i].face_name, fd[i].height, tm.tmInternalLeading, fd[i].int_leading); + ok(tm.tmExternalLeading == fd[i].ext_leading, "%s(%d): tm.tmExternalLeading %d != %d\n", fd[i].face_name, fd[i].height, tm.tmExternalLeading, fd[i].ext_leading); + ok(tm.tmAveCharWidth == fd[i].ave_char_width, "%s(%d): tm.tmAveCharWidth %d != %d\n", fd[i].face_name, fd[i].height, tm.tmAveCharWidth, fd[i].ave_char_width); + + /* Don't run the max char width test on System/ANSI_CHARSET. We have extra characters in our font + that make the max width bigger */ + if(strcmp(lf.lfFaceName, "System") || lf.lfCharSet != ANSI_CHARSET) + ok(tm.tmMaxCharWidth == fd[i].max_char_width, "%s(%d): tm.tmMaxCharWidth %d != %d\n", fd[i].face_name, fd[i].height, tm.tmMaxCharWidth, fd[i].max_char_width); + } + else + skip("Skipping font metrics test for system langid 0x%x\n", + system_lang_id); } SelectObject(hdc, old_hfont); DeleteObject(hfont);

1 0

Nikolay Sivov : msxml3: Fix interface leak (Valgrind).
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 3ba78cf101a8b85991c9dd38c3d2919e61970b35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ba78cf101a8b85991c9dd38c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 23 14:56:28 2011 +0300 msxml3: Fix interface leak (Valgrind). --- dlls/msxml3/cdata.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index d0984c1..1e7ca1f 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -828,6 +828,7 @@ static HRESULT WINAPI domcdata_splitText( { IXMLDOMCDATASection_deleteData(iface, 0, offset); hr = IXMLDOMNode_appendChild(parent, (IXMLDOMNode*)*txtNode, NULL); + IXMLDOMNode_Release(parent); } } SysFreeString(data);

1 0

Kusanagi Kouichi : kernel32: Include term.h conditionally.
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: 8e1755aa49ff509982f5fdfbf2c011ac7fa9ca41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e1755aa49ff509982f5fdfbf… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Sun Jan 23 12:14:49 2011 +0900 kernel32: Include term.h conditionally. --- dlls/kernel32/term.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/term.c b/dlls/kernel32/term.c index 850b792..2dce31b 100644 --- a/dlls/kernel32/term.c +++ b/dlls/kernel32/term.c @@ -31,7 +31,9 @@ #undef KEY_EVENT #undef MOUSE_MOVED +#if defined(HAVE_CURSES_H) || defined(HAVE_NCURSES_H) #include <term.h> +#endif #include <windef.h> #include <winbase.h>

1 0

Nikolay Sivov : shell32: Fix a parent PIDL leak (Valgrind).
by Alexandre Julliard Jan. 24, 2011

Jan. 24, 2011

Module: wine Branch: master Commit: b907b7d6bfdc19e0b1ea4aced4e182a486823100 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b907b7d6bfdc19e0b1ea4aced… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 22 03:07:40 2011 +0300 shell32: Fix a parent PIDL leak (Valgrind). --- dlls/shell32/brsfolder.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 705bdfa..9b0d20b 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -229,6 +229,7 @@ static void InitializeTreeView( browse_info *info ) if (FAILED(hr)) { WARN("SHGetDesktopFolder failed! hr = %08x\n", hr); ILFree(pidlChild); + ILFree(pidlParent); return; } hr = IShellFolder_BindToObject(lpsfDesktop, pidlParent, 0, &IID_IShellFolder, (LPVOID*)&lpsfParent); @@ -238,6 +239,7 @@ static void InitializeTreeView( browse_info *info ) if (FAILED(hr)) { WARN("Could not bind to parent shell folder! hr = %08x\n", hr); ILFree(pidlChild); + ILFree(pidlParent); return; } @@ -252,6 +254,7 @@ static void InitializeTreeView( browse_info *info ) WARN("Could not bind to root shell folder! hr = %08x\n", hr); IShellFolder_Release(lpsfParent); ILFree(pidlChild); + ILFree(pidlParent); return; } @@ -262,6 +265,7 @@ static void InitializeTreeView( browse_info *info ) IShellFolder_Release(lpsfParent); IShellFolder_Release(lpsfRoot); ILFree(pidlChild); + ILFree(pidlParent); return; } @@ -271,6 +275,7 @@ static void InitializeTreeView( browse_info *info ) SendMessageW( info->hwndTreeView, TVM_EXPAND, TVE_EXPAND, (LPARAM)item ); ILFree(pidlChild); + ILFree(pidlParent); IShellFolder_Release(lpsfRoot); IShellFolder_Release(lpsfParent); }

1 0