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

Andrew Eikum : oleaut32: Use the new typelib creation implementation.
by Alexandre Julliard June 6, 2013

June 6, 2013

Module: wine Branch: master Commit: 40966b3615c6d9b4c63e71ec049e3f801d8a7c5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=40966b3615c6d9b4c63e71ec0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 5 14:25:07 2013 -0500 oleaut32: Use the new typelib creation implementation. --- dlls/oleaut32/Makefile.in | 1 - dlls/oleaut32/typelib.c | 59 + dlls/oleaut32/typelib2.c | 5342 --------------------------------------------- 3 files changed, 59 insertions(+), 5343 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40966b3615c6d9b4c63e7…

1 0

Daniel Jelinski : mscoree: Extract a helper function for getting file name from assembly.
by Alexandre Julliard June 5, 2013

June 5, 2013

Module: wine Branch: master Commit: 0eaa3ec9fb1609f0a0b0bb703b47e65071d4d49e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eaa3ec9fb1609f0a0b0bb703… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Tue Jun 4 21:10:27 2013 +0200 mscoree: Extract a helper function for getting file name from assembly. --- dlls/mscoree/metahost.c | 74 ++++++++++++++++++++++------------------ dlls/mscoree/mscoree_private.h | 2 + 2 files changed, 43 insertions(+), 33 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index fe529fd..eabdcf5 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -1210,31 +1210,15 @@ HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj) return ICLRMetaHost_QueryInterface(&GlobalCLRMetaHost.ICLRMetaHost_iface, riid, ppobj); } -static MonoAssembly* mono_assembly_search_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data) +HRESULT get_file_from_strongname(WCHAR* stringnameW, WCHAR* assemblies_path, int path_length) { - loaded_mono *mono = user_data; HRESULT hr=S_OK; - MonoAssembly *result=NULL; - char *stringname=NULL; - LPWSTR stringnameW; - int stringnameW_size; IAssemblyCache *asmcache; ASSEMBLY_INFO info; - WCHAR path[MAX_PATH]; - char *pathA; - MonoImageOpenStatus stat; static WCHAR fusiondll[] = {'f','u','s','i','o','n',0}; HMODULE hfusion=NULL; static HRESULT (WINAPI *pCreateAssemblyCache)(IAssemblyCache**,DWORD); - stringname = mono->mono_stringify_assembly_name(aname); - - TRACE("%s\n", debugstr_a(stringname)); - - if (!stringname) return NULL; - - /* FIXME: We should search the given paths before the GAC. */ - if (!pCreateAssemblyCache) { hr = LoadLibraryShim(fusiondll, NULL, NULL, &hfusion); @@ -1252,28 +1236,52 @@ static MonoAssembly* mono_assembly_search_hook_fn(MonoAssemblyName *aname, char if (SUCCEEDED(hr)) { - stringnameW_size = MultiByteToWideChar(CP_UTF8, 0, stringname, -1, NULL, 0); + info.cbAssemblyInfo = sizeof(info); + info.pszCurrentAssemblyPathBuf = assemblies_path; + info.cchBuf = path_length; + assemblies_path[0] = 0; - stringnameW = HeapAlloc(GetProcessHeap(), 0, stringnameW_size * sizeof(WCHAR)); - if (stringnameW) - MultiByteToWideChar(CP_UTF8, 0, stringname, -1, stringnameW, stringnameW_size); - else - hr = E_OUTOFMEMORY; + hr = IAssemblyCache_QueryAssemblyInfo(asmcache, 0, stringnameW, &info); - if (SUCCEEDED(hr)) - { - info.cbAssemblyInfo = sizeof(info); - info.pszCurrentAssemblyPathBuf = path; - info.cchBuf = MAX_PATH; - path[0] = 0; + IAssemblyCache_Release(asmcache); + } - hr = IAssemblyCache_QueryAssemblyInfo(asmcache, 0, stringnameW, &info); - } + return hr; +} - HeapFree(GetProcessHeap(), 0, stringnameW); +static MonoAssembly* mono_assembly_search_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data) +{ + loaded_mono *mono = user_data; + HRESULT hr; + MonoAssembly *result=NULL; + char *stringname=NULL; + LPWSTR stringnameW; + int stringnameW_size; + WCHAR path[MAX_PATH]; + char *pathA; + MonoImageOpenStatus stat; - IAssemblyCache_Release(asmcache); + stringname = mono->mono_stringify_assembly_name(aname); + + TRACE("%s\n", debugstr_a(stringname)); + + if (!stringname) return NULL; + + /* FIXME: We should search the given paths before the GAC. */ + + stringnameW_size = MultiByteToWideChar(CP_UTF8, 0, stringname, -1, NULL, 0); + + stringnameW = HeapAlloc(GetProcessHeap(), 0, stringnameW_size * sizeof(WCHAR)); + if (stringnameW) + { + MultiByteToWideChar(CP_UTF8, 0, stringname, -1, stringnameW, stringnameW_size); + + hr = get_file_from_strongname(stringnameW, path, MAX_PATH); + + HeapFree(GetProcessHeap(), 0, stringnameW); } + else + hr = E_OUTOFMEMORY; if (SUCCEEDED(hr)) { diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 4677921..b66669c 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -204,6 +204,8 @@ extern HRESULT CorDebug_Create(ICLRRuntimeHost *runtimehost, IUnknown** ppUnk) D extern HRESULT create_monodata(REFIID riid, LPVOID *ppObj) DECLSPEC_HIDDEN; +extern HRESULT get_file_from_strongname(WCHAR* stringnameW, WCHAR* assemblies_path, int path_length) DECLSPEC_HIDDEN; + extern void runtimehost_init(void); extern void runtimehost_uninit(void);

1 0

Daniel Jelinski : mscoree: Search for COM classes by assembly name if CodeBase not found.
by Alexandre Julliard June 5, 2013

June 5, 2013

Module: wine Branch: master Commit: 1319515173f5c0ea303a8087904ad72d8698c99f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1319515173f5c0ea303a80879… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Tue Jun 4 21:14:56 2013 +0200 mscoree: Search for COM classes by assembly name if CodeBase not found. --- dlls/mscoree/corruntimehost.c | 45 +++++++++++++++++++++++++++++++---------- 1 files changed, 34 insertions(+), 11 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index b4ee38b..76b7d65 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1235,6 +1235,7 @@ HRESULT RuntimeHost_Destroy(RuntimeHost *This) HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) { + static const WCHAR wszAssembly[] = {'A','s','s','e','m','b','l','y',0}; static const WCHAR wszCodebase[] = {'C','o','d','e','B','a','s','e',0}; static const WCHAR wszClass[] = {'C','l','a','s','s',0}; static const WCHAR wszFileSlash[] = {'f','i','l','e',':','/','/','/',0}; @@ -1246,11 +1247,12 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) ICLRRuntimeInfo *info = NULL; RuntimeHost *host; HRESULT hr; - HKEY key; + HKEY key, subkey; LONG res; int offset = 0; + DWORD numKeys, keyLength; WCHAR codebase[MAX_PATH + 8]; - WCHAR classname[350]; + WCHAR classname[350], subkeyName[256]; WCHAR filename[MAX_PATH]; DWORD dwBufLen = 350; @@ -1277,19 +1279,40 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) dwBufLen = MAX_PATH + 8; res = RegGetValueW( key, NULL, wszCodebase, RRF_RT_REG_SZ, NULL, codebase, &dwBufLen); - if(res != ERROR_SUCCESS) + if(res == ERROR_SUCCESS) + { + /* Strip file:/// */ + if(strncmpW(codebase, wszFileSlash, strlenW(wszFileSlash)) == 0) + offset = strlenW(wszFileSlash); + + strcpyW(filename, codebase + offset); + } + else { - WARN("CodeBase value cannot be found.\n"); hr = CLASS_E_CLASSNOTAVAILABLE; - goto cleanup; + WARN("CodeBase value cannot be found, trying Assembly.\n"); + /* get the last subkey of InprocServer32 */ + res = RegQueryInfoKeyW(key, 0, 0, 0, &numKeys, 0, 0, 0, 0, 0, 0, 0); + if (res != ERROR_SUCCESS || numKeys == 0) + goto cleanup; + numKeys--; + keyLength = sizeof(subkeyName) / sizeof(WCHAR); + res = RegEnumKeyExW(key, numKeys, subkeyName, &keyLength, 0, 0, 0, 0); + if (res != ERROR_SUCCESS) + goto cleanup; + res = RegOpenKeyExW(key, subkeyName, 0, KEY_READ, &subkey); + if (res != ERROR_SUCCESS) + goto cleanup; + dwBufLen = MAX_PATH + 8; + res = RegGetValueW(subkey, NULL, wszAssembly, RRF_RT_REG_SZ, NULL, codebase, &dwBufLen); + RegCloseKey(subkey); + if (res != ERROR_SUCCESS) + goto cleanup; + hr = get_file_from_strongname(codebase, filename, MAX_PATH); + if (!SUCCEEDED(hr)) + goto cleanup; } - /* Strip file:/// */ - if(strncmpW(codebase, wszFileSlash, strlenW(wszFileSlash)) == 0) - offset = strlenW(wszFileSlash); - - strcpyW(filename, codebase + offset); - TRACE("codebase (%s)\n", debugstr_w(filename)); *ppObj = NULL;

1 0

Qian Hong : explorer: Create non-existent folders when initializing launchers.
by Alexandre Julliard June 5, 2013

June 5, 2013

Module: wine Branch: master Commit: c8d1d4aadc842a7911d1d3ab142d4cc4e32ff106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8d1d4aadc842a7911d1d3ab1… Author: Qian Hong <qhong(a)codeweavers.com> Date: Sun Jun 2 03:20:03 2013 +0800 explorer: Create non-existent folders when initializing launchers. --- programs/explorer/desktop.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index e426c1a..c975e23 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -444,13 +444,13 @@ static void initialize_launchers( HWND hwnd ) desktop_width = GetSystemMetrics( SM_CXSCREEN ); launchers_per_row = desktop_width / launcher_size; - hr = SHGetKnownFolderPath( &FOLDERID_Desktop, 0, NULL, &desktop_folder ); + hr = SHGetKnownFolderPath( &FOLDERID_Desktop, KF_FLAG_CREATE, NULL, &desktop_folder ); if (FAILED( hr )) { WINE_ERR("Could not get user desktop folder\n"); return; } - hr = SHGetKnownFolderPath( &FOLDERID_PublicDesktop, 0, NULL, &desktop_folder_public ); + hr = SHGetKnownFolderPath( &FOLDERID_PublicDesktop, KF_FLAG_CREATE, NULL, &desktop_folder_public ); if (FAILED( hr )) { WINE_ERR("Could not get public desktop folder\n");

1 0

Piotr Caban : kernet32: Added DuplicateHandle tests with DUPLICATE_CLOSE_SOURCE flag.
by Alexandre Julliard June 5, 2013

June 5, 2013

Module: wine Branch: master Commit: c9dbef3d96b39e4e09aa20b1813d491e4f0238f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9dbef3d96b39e4e09aa20b18… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 5 11:33:29 2013 +0200 kernet32: Added DuplicateHandle tests with DUPLICATE_CLOSE_SOURCE flag. --- dlls/kernel32/tests/process.c | 98 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 98 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 9d3e983..1fef8ac 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1963,6 +1963,103 @@ static void test_TerminateProcess(void) CloseHandle(pi.hThread); } +static void test_DuplicateHandle(void) +{ + char path[MAX_PATH], file_name[MAX_PATH]; + HANDLE f, fmin, out; + DWORD info; + BOOL r; + + r = DuplicateHandle(GetCurrentProcess(), GetCurrentProcess(), + GetCurrentProcess(), &out, 0, FALSE, + DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE); + ok(r, "DuplicateHandle error %u\n", GetLastError()); + r = GetHandleInformation(out, &info); + ok(r, "GetHandleInformation error %u\n", GetLastError()); + ok(info == 0, "info = %x\n", info); + ok(out != GetCurrentProcess(), "out = GetCurrentProcess()\n"); + CloseHandle(out); + + r = DuplicateHandle(GetCurrentProcess(), GetCurrentProcess(), + GetCurrentProcess(), &out, 0, TRUE, + DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE); + ok(r, "DuplicateHandle error %u\n", GetLastError()); + r = GetHandleInformation(out, &info); + ok(r, "GetHandleInformation error %u\n", GetLastError()); + ok(info == HANDLE_FLAG_INHERIT, "info = %x\n", info); + ok(out != GetCurrentProcess(), "out = GetCurrentProcess()\n"); + CloseHandle(out); + + GetTempPath(MAX_PATH, path); + GetTempFileName(path, "wt", 0, file_name); + f = CreateFile(file_name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + if (f == INVALID_HANDLE_VALUE) + { + ok(0, "could not create %s\n", file_name); + return; + } + + r = DuplicateHandle(GetCurrentProcess(), f, GetCurrentProcess(), &out, + 0, FALSE, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE); + ok(r, "DuplicateHandle error %u\n", GetLastError()); + ok(f == out, "f != out\n"); + r = GetHandleInformation(out, &info); + ok(r, "GetHandleInformation error %u\n", GetLastError()); + ok(info == 0, "info = %x\n", info); + + r = DuplicateHandle(GetCurrentProcess(), f, GetCurrentProcess(), &out, + 0, TRUE, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE); + ok(r, "DuplicateHandle error %u\n", GetLastError()); + ok(f == out, "f != out\n"); + r = GetHandleInformation(out, &info); + ok(r, "GetHandleInformation error %u\n", GetLastError()); + ok(info == HANDLE_FLAG_INHERIT, "info = %x\n", info); + + r = SetHandleInformation(f, HANDLE_FLAG_PROTECT_FROM_CLOSE, HANDLE_FLAG_PROTECT_FROM_CLOSE); + ok(r, "SetHandleInformation error %u\n", GetLastError()); + r = DuplicateHandle(GetCurrentProcess(), f, GetCurrentProcess(), &out, + 0, TRUE, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE); + ok(r, "DuplicateHandle error %u\n", GetLastError()); + ok(f != out, "f == out\n"); + r = GetHandleInformation(out, &info); + ok(r, "GetHandleInformation error %u\n", GetLastError()); + ok(info == HANDLE_FLAG_INHERIT, "info = %x\n", info); + r = SetHandleInformation(f, HANDLE_FLAG_PROTECT_FROM_CLOSE, 0); + ok(r, "SetHandleInformation error %u\n", GetLastError()); + + /* Test if DuplicateHandle allocates first free handle */ + if (f > out) + { + fmin = out; + } + else + { + fmin = f; + f = out; + } + CloseHandle(fmin); + r = DuplicateHandle(GetCurrentProcess(), f, GetCurrentProcess(), &out, + 0, TRUE, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE); + ok(r, "DuplicateHandle error %u\n", GetLastError()); + ok(f == out, "f != out\n"); + CloseHandle(out); + DeleteFile(file_name); + + f = CreateFile("CONIN$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + if (!is_console(f)) + { + skip("DuplicateHandle on console handle"); + CloseHandle(f); + return; + } + + r = DuplicateHandle(GetCurrentProcess(), f, GetCurrentProcess(), &out, + 0, FALSE, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE); + ok(r, "DuplicateHandle error %u\n", GetLastError()); + todo_wine ok(f != out, "f == out\n"); + CloseHandle(out); +} + START_TEST(process) { int b = init(); @@ -1991,6 +2088,7 @@ START_TEST(process) test_Handles(); test_SystemInfo(); test_RegistryQuota(); + test_DuplicateHandle(); /* things that can be tested: * lookup: check the way program to be executed is searched * handles: check the handle inheritance stuff (+sec options)

1 0

Andrew Eikum : oleaut32: Don't fall back on typelib name for docstring.
by Alexandre Julliard June 5, 2013

June 5, 2013

Module: wine Branch: master Commit: cee0a726ed05b194ed4bf18e0b7a96bf4da1a018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cee0a726ed05b194ed4bf18e0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 5 07:56:23 2013 -0500 oleaut32: Don't fall back on typelib name for docstring. --- dlls/oleaut32/typelib.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index bb3be43..af36a3b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4838,11 +4838,6 @@ static HRESULT WINAPI ITypeLib2_fnGetDocumentation( if(!(*pBstrDocString = SysAllocString(TLB_get_bstr(This->DocString)))) goto memerr2; } - else if (This->Name) - { - if(!(*pBstrDocString = SysAllocString(TLB_get_bstr(This->Name)))) - goto memerr2; - } else *pBstrDocString = NULL; }

1 0

Gurmail Bassi : dinput: Use a properly initialized format in SetProperty.
by Alexandre Julliard June 5, 2013

June 5, 2013

Module: wine Branch: master Commit: c34b7b13134e2479d3e25e8f8995ff5a8abd2983 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c34b7b13134e2479d3e25e8f8… Author: Gurmail Bassi <Gurmail.Bassi(a)mottmac.com> Date: Tue Jun 4 21:38:38 2013 +0100 dinput: Use a properly initialized format in SetProperty. --- dlls/dinput/joystick.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index b929c05..ce267e6 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -301,7 +301,7 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF remap_props.lMin = pr->lMin; remap_props.lMax = pr->lMax; - switch (This->base.data_format.offsets[i]) { + switch (This->base.data_format.wine_df->rgodf[i].dwOfs) { case DIJOFS_X : This->js.lX = joystick_map_axis(&remap_props, This->js.lX); break; case DIJOFS_Y : This->js.lY = joystick_map_axis(&remap_props, This->js.lY); break; case DIJOFS_Z : This->js.lZ = joystick_map_axis(&remap_props, This->js.lZ); break;

1 0

Sergey Guralnik : user32/tests: Test MDI child order changing caused by WM_MDINEXT.
by Alexandre Julliard June 5, 2013

June 5, 2013

Module: wine Branch: master Commit: fe2f877678a52e65b0c51a2aaa3ffc319f869330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe2f877678a52e65b0c51a2aa… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Wed Jun 5 09:12:03 2013 +0300 user32/tests: Test MDI child order changing caused by WM_MDINEXT. --- dlls/user32/tests/win.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 74 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 20d8d9f..a9467ce 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1507,6 +1507,69 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id) DestroyWindow(mdi_child); } +static void test_MDI_child_stack(HWND mdi_client) +{ + HWND child_1, child_2, child_3, child_4; + HWND stack[4]; + MDICREATESTRUCTA cs; + + cs.szClass = "MDI_child_Class_1"; + cs.szTitle = "MDI child"; + cs.hOwner = GetModuleHandleA(0); + cs.x = CW_USEDEFAULT; + cs.y = CW_USEDEFAULT; + cs.cx = CW_USEDEFAULT; + cs.cy = CW_USEDEFAULT; + cs.style = 0; + cs.lParam = (LPARAM)mdi_lParam_test_message; + + assert(child_1 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs)); + assert(child_2 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs)); + assert(child_3 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs)); + assert(child_4 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs)); + + stack[0] = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + stack[1] = GetWindow(stack[0], GW_HWNDNEXT); + stack[2] = GetWindow(stack[1], GW_HWNDNEXT); + stack[3] = GetWindow(stack[2], GW_HWNDNEXT); + trace("Initial MDI child stack: %p->%p->%p->%p\n", stack[0], stack[1], stack[2], stack[3]); + ok(stack[0] == child_4 && stack[1] == child_3 && + stack[2] == child_2 && stack[3] == child_1, + "Unexpected initial order, should be: %p->%p->%p->%p\n", + child_4, child_3, child_2, child_1); + + trace("Activate child next to %p\n", child_3); + SendMessage(mdi_client, WM_MDINEXT, (WPARAM)child_3, 0); + + stack[0] = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + stack[1] = GetWindow(stack[0], GW_HWNDNEXT); + stack[2] = GetWindow(stack[1], GW_HWNDNEXT); + stack[3] = GetWindow(stack[2], GW_HWNDNEXT); +todo_wine + ok(stack[0] == child_2 && stack[1] == child_4 && + stack[2] == child_1 && stack[3] == child_3, + "Broken MDI child stack:\nexpected: %p->%p->%p->%p, but got: %p->%p->%p->%p\n", + child_2, child_4, child_1, child_3, stack[0], stack[1], stack[2], stack[3]); + + trace("Activate child previous to %p\n", child_1); + SendMessage(mdi_client, WM_MDINEXT, (WPARAM)child_1, 1); + + stack[0] = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + stack[1] = GetWindow(stack[0], GW_HWNDNEXT); + stack[2] = GetWindow(stack[1], GW_HWNDNEXT); + stack[3] = GetWindow(stack[2], GW_HWNDNEXT); +todo_wine + ok(stack[0] == child_4 && stack[1] == child_2 && + stack[2] == child_1 && stack[3] == child_3, + "Broken MDI child stack:\nexpected: %p->%p->%p->%p, but got: %p->%p->%p->%p\n", + child_4, child_2, child_1, child_3, stack[0], stack[1], stack[2], stack[3]); + + DestroyWindow(child_1); + DestroyWindow(child_2); + DestroyWindow(child_3); + DestroyWindow(child_4); +} + /********************************************************************** * MDI_ChildGetMinMaxInfo (copied from windows/mdi.c) * @@ -1788,6 +1851,17 @@ static LRESULT WINAPI mdi_main_wnd_procA(HWND hwnd, UINT msg, WPARAM wparam, LPA assert(mdi_client); test_MDI_create(hwnd, mdi_client, client_cs.idFirstChild); DestroyWindow(mdi_client); + + /* Test child window stack management */ + mdi_client = CreateWindowExA(0, "mdiclient", + NULL, + WS_CHILD, + 0, 0, rc.right, rc.bottom, + hwnd, 0, GetModuleHandle(0), + &client_cs); + assert(mdi_client); + test_MDI_child_stack(mdi_client); + DestroyWindow(mdi_client); break; }

1 0

Jason Edmeades : cmd: Fix 'for' expansion of wildcards when no args are supplied.
by Alexandre Julliard June 5, 2013

June 5, 2013

Module: wine Branch: master Commit: a5b1172e90de94234b2799d26ccc36a752bdd7eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5b1172e90de94234b2799d26… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Jun 4 00:29:51 2013 +0100 cmd: Fix 'for' expansion of wildcards when no args are supplied. --- programs/cmd/builtins.c | 8 ++++++-- programs/cmd/tests/test_builtins.cmd | 17 ++++++++++++++++- programs/cmd/tests/test_builtins.cmd.exp | 12 ++++++++++++ 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index c2ccdc8..aa1e7d4 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2237,6 +2237,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { if (!useNumbers && !doFileset) { WCHAR fullitem[MAX_PATH]; + int prefixlen = 0; /* Now build the item to use / search for in the specified directory, as it is fully qualified in the /R case */ @@ -2245,11 +2246,12 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { strcatW(fullitem, slashW); strcatW(fullitem, item); } else { + WCHAR *prefix = strrchrW(item, '\\'); + if (prefix) prefixlen = (prefix - item) + 1; strcpyW(fullitem, item); } if (strpbrkW (fullitem, wildcards)) { - hff = FindFirstFileW(fullitem, &fd); if (hff != INVALID_HANDLE_VALUE) { do { @@ -2270,7 +2272,9 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { strcatW(fullitem, slashW); strcatW(fullitem, fd.cFileName); } else { - strcpyW(fullitem, fd.cFileName); + if (prefixlen) lstrcpynW(fullitem, item, prefixlen + 1); + fullitem[prefixlen] = 0x00; + strcatW(fullitem, fd.cFileName); } doExecuted = TRUE; diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 48a8362..78f7cdc 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1017,7 +1017,22 @@ for /R %%i in (baz* fred* jim) do call temp.bat %%i call :ValidateExpected echo for /R passed -cd .. & rd /s/Q foobar +echo --- Complex wildcards unix and windows slash +cd .. +echo Windows slashs, valid path +for %%f in (foobar\baz\bazbaz) do echo ASIS: %%f +for %%f in (foobar\baz\*) do echo WC : %%f +echo Windows slashs, invalid path +for %%f in (foobar\jim\bazbaz) do echo ASIS: %%f +for %%f in (foobar\jim\*) do echo WC : %%f +echo Unix slashs, valid path +for %%f in (foobar/baz/bazbaz) do echo ASIS: %%f +for %%f in (foobar/baz/*) do echo WC : %%f +echo Unix slashs, invalid path +for %%f in (foobar/jim/bazbaz) do echo ASIS: %%f +for %%f in (foobar/jim/*) do echo WC : %%f +echo Done +rd /s/Q foobar echo --- for /L rem Some cases loop forever writing 0s, like e.g. (1,0,1), (1,a,3) or (a,b,c); those can't be tested here for /L %%i in (1,2,0) do echo %%i diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 77e4178..7380185 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -691,6 +691,18 @@ Mixed enumeration from provided root With duplicates enumeration Strip missing wildcards, keep unwildcarded names for /R passed +--- Complex wildcards unix and windows slash +Windows slashs, valid path +ASIS: foobar\baz\bazbaz +WC : foobar\baz\bazbaz +Windows slashs, invalid path +ASIS: foobar\jim\bazbaz +Unix slashs, valid path +ASIS: foobar/baz/bazbaz +WC : bazbaz +Unix slashs, invalid path +ASIS: foobar/jim/bazbaz +Done --- for /L 1 3

1 0

Aric Stewart : gdi32: Turn off tategaki if the unicode code point is outside of the rotated ranges .
by Alexandre Julliard June 5, 2013

June 5, 2013

Module: wine Branch: master Commit: ceb81eee206918e95ce13ab823fa3c57d86078fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceb81eee206918e95ce13ab82… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 4 09:05:50 2013 -0500 gdi32: Turn off tategaki if the unicode code point is outside of the rotated ranges. --- dlls/gdi32/freetype.c | 74 +++++++++++++++++++++++++++++++++++++++++------ dlls/gdi32/tests/font.c | 2 +- 2 files changed, 66 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index bf4e4c3..f884307 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -537,7 +537,7 @@ static const WCHAR font_mutex_nameW[] = {'_','_','W','I','N','E','_','F','O','N' static const WCHAR szDefaultFallbackLink[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}; static BOOL use_default_fallback = FALSE; -static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, FT_UInt *glyph); +static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, FT_UInt *glyph, BOOL *vert); static BOOL get_outline_text_metrics(GdiFont *font); static BOOL get_bitmap_text_metrics(GdiFont *font); static BOOL get_text_metrics(GdiFont *font, LPTEXTMETRICW ptm); @@ -585,7 +585,6 @@ static const WCHAR internal_system_link[] = {'S','o','f','t','w','a','r','e','\\ /* These are all structures needed for the GSUB table */ #define GSUB_TAG MS_MAKE_TAG('G', 'S', 'U', 'B') -#define TATEGAKI_LOWER_BOUND 0x02F1 typedef struct { DWORD version; @@ -5903,6 +5902,55 @@ static inline BYTE get_max_level( UINT format ) return 255; } +static const struct { WCHAR lower; WCHAR upper;} unrotate_ranges[] = + { + {0x0000, 0x10FF}, + /* Hangul Jamo */ + {0x1200, 0x17FF}, + /* Mongolian */ + {0x18B0, 0x1FFF}, + /* General Punctuation */ + {0x2070, 0x209F}, + /* Currency Symbols */ + /* Combining Diacritical Marks for Symbols */ + /* Letterlike Symbols */ + {0x2150, 0x245F}, + /* Enclosed Alphanumerics */ + {0x2500, 0x259F}, + /* Geometric Shapes */ + /* Miscellaneous Symbols */ + /* Dingbats */ + /* Miscellaneous Mathematical Symbols-A */ + /* Supplemental Arrows-A */ + {0x2800, 0x2E7F}, + /* East Asian scripts and symbols */ + {0xA000, 0xABFF}, + /* Hangul Syllables */ + /* Hangul Jamo Extended-B */ + {0xD800, 0xF8FF}, + /* CJK Compatibility Ideographs */ + {0xFB00, 0xFE0F}, + /* Vertical Forms */ + /* Combining Half Marks */ + /* CJK Compatibility Forms */ + {0xFE50, 0xFEFF}, + /* Halfwidth and Fullwidth Forms */ + {0xFFEF, 0xFFFF}, + }; + +static BOOL check_unicode_tategaki(WCHAR uchar) +{ + int i; + for (i = 0 ;; i++) + { + if (uchar < unrotate_ranges[i].lower) + return TRUE; + + if (uchar >= unrotate_ranges[i].lower && uchar <= unrotate_ranges[i].upper) + return FALSE; + } +} + static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, @@ -5943,10 +5991,17 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, glyph_index = glyph; original_index = glyph; format &= ~GGO_GLYPH_INDEX; + /* TODO: Window also turns off tategaki for glyphs passed in by index + if their unicode code points fall outside of the range that is + rotated. */ } else { - get_glyph_index_linked(incoming_font, glyph, &font, &glyph_index); + BOOL vert; + get_glyph_index_linked(incoming_font, glyph, &font, &glyph_index, &vert); ft_face = font->ft_face; original_index = glyph_index; + /* We know what unicode ranges get rotated */ + if (!vert && tategaki) + tategaki = check_unicode_tategaki(glyph); } if(format & GGO_UNHINTED) { @@ -5954,10 +6009,6 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, format &= ~GGO_UNHINTED; } - /* tategaki never appears to happen to lower glyph index */ - if (glyph_index < TATEGAKI_LOWER_BOUND ) - tategaki = FALSE; - if(original_index >= font->gmsize * GM_BLOCK_SIZE) { font->gmsize = (original_index / GM_BLOCK_SIZE + 1); font->gm = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, font->gm, @@ -7348,9 +7399,9 @@ static BOOL load_child_font(GdiFont *font, CHILD_FONT *child) return TRUE; } -static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, FT_UInt *glyph) +static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, FT_UInt *glyph, BOOL* vert) { - FT_UInt g; + FT_UInt g,o; CHILD_FONT *child_font; if(font->base_font) @@ -7360,7 +7411,9 @@ static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, if((*glyph = get_glyph_index(font, c))) { + o = *glyph; *glyph = get_GSUB_vert_glyph(font, *glyph); + *vert = (o != *glyph); return TRUE; } @@ -7373,15 +7426,18 @@ static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, if(!child_font->font->ft_face) continue; g = get_glyph_index(child_font->font, c); + o = g; g = get_GSUB_vert_glyph(child_font->font, g); if(g) { *glyph = g; *linked_font = child_font->font; + *vert = (o != g); return TRUE; } } *glyph = get_default_char_index(font); + *vert = FALSE; return FALSE; } diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index b57a630..087d572 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4831,7 +4831,7 @@ static void test_vertical_font(void) check_vertical_font("@WineTestVertical", &installed, &selected, &gm, &vgi); ok(installed, "@WineTestVertical is not installed\n"); ok(selected, "@WineTestVertical is not selected\n"); - todo_wine ok(gm.gmBlackBoxX > gm.gmBlackBoxY, + ok(gm.gmBlackBoxX > gm.gmBlackBoxY, "gmBlackBoxX(%u) should be less than gmBlackBoxY(%u) if vertical\n", gm.gmBlackBoxX, gm.gmBlackBoxY);

1 0