wine-commits January 2016

wine-commits@winehq.org

2 participants
627 discussions

Huw Davies : shell32: Set the stream and storage attributes where needed.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 77c313b8d6cdfaab94758f96b9a59e3107184d3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=77c313b8d6cdfaab94758f96b… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 28 15:32:50 2016 +0000 shell32: Set the stream and storage attributes where needed. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_unixfs.c | 5 ++++- dlls/shell32/tests/shlfolder.c | 13 +++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 2782157..be1ba81 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1154,7 +1154,10 @@ static HRESULT WINAPI ShellFolder2_GetAttributesOf(IShellFolder2* iface, UINT ci HeapFree( GetProcessHeap(), 0, dos_name ); } if (_ILIsFolder(apidl[i])) - *attrs |= SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR; + *attrs |= SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR | + SFGAO_STORAGEANCESTOR | SFGAO_STORAGE; + else + *attrs |= SFGAO_STREAM; } } diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 72aaa02..da903b0 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -388,6 +388,14 @@ static void test_EnumObjects(IShellFolder *iFolder) SFGAO_CAPABILITYMASK | SFGAO_FILESYSTEM, SFGAO_CAPABILITYMASK | SFGAO_FILESYSTEM, }; + static const ULONG full_attrs[5] = + { + SFGAO_CAPABILITYMASK | SFGAO_STORAGE | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR, + SFGAO_CAPABILITYMASK | SFGAO_STORAGE | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR, + SFGAO_CAPABILITYMASK | SFGAO_STREAM | SFGAO_FILESYSTEM, + SFGAO_CAPABILITYMASK | SFGAO_STREAM | SFGAO_FILESYSTEM, + SFGAO_CAPABILITYMASK | SFGAO_STREAM | SFGAO_FILESYSTEM, + }; hr = IShellFolder_EnumObjects(iFolder, NULL, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS | SHCONTF_INCLUDEHIDDEN, &iEnumList); ok(hr == S_OK, "EnumObjects failed %08x\n", hr); @@ -440,6 +448,11 @@ static void test_EnumObjects(IShellFolder *iFolder) ok(flags == attrs[i] || flags == (attrs[i] & ~SFGAO_FILESYSANCESTOR), /* Win9x, NT4 */ "GetAttributesOf[%i] got %08x, expected %08x\n", i, flags, attrs[i]); + + flags = ~0u; + hr = IShellFolder_GetAttributesOf(iFolder, 1, (LPCITEMIDLIST*)(idlArr + i), &flags); + ok(hr == S_OK, "GetAttributesOf returns %08x\n", hr); + ok((flags & ~SFGAO_HASSUBFOLDER) == full_attrs[i], "%d: got %08x expected %08x\n", i, flags, full_attrs[i]); } for (i=0;i<5;i++)

1 0

Huw Davies : shell32: The attributes is not an array, so don' t label it as such.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: a77c0ebc806f38b618ae9efc07b10c660f42548e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77c0ebc806f38b618ae9efc0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 28 15:32:49 2016 +0000 shell32: The attributes is not an array, so don't label it as such. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_unixfs.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 85383e8..2782157 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -1123,24 +1123,24 @@ static HRESULT WINAPI ShellFolder2_CreateViewObject(IShellFolder2* iface, HWND h } static HRESULT WINAPI ShellFolder2_GetAttributesOf(IShellFolder2* iface, UINT cidl, - LPCITEMIDLIST* apidl, SFGAOF* rgfInOut) + LPCITEMIDLIST* apidl, SFGAOF* attrs) { UnixFolder *This = impl_from_IShellFolder2(iface); HRESULT hr = S_OK; - TRACE("(%p)->(%u %p %p)\n", This, cidl, apidl, rgfInOut); + TRACE("(%p)->(%u %p %p)\n", This, cidl, apidl, attrs); - if (!rgfInOut || (cidl && !apidl)) + if (!attrs || (cidl && !apidl)) return E_INVALIDARG; if (cidl == 0) { - *rgfInOut &= This->m_dwAttributes; + *attrs &= This->m_dwAttributes; } else { char szAbsolutePath[FILENAME_MAX], *pszRelativePath; UINT i; - *rgfInOut = SFGAO_CANCOPY|SFGAO_CANMOVE|SFGAO_CANLINK|SFGAO_CANRENAME|SFGAO_CANDELETE| - SFGAO_HASPROPSHEET|SFGAO_DROPTARGET|SFGAO_FILESYSTEM; + *attrs = SFGAO_CANCOPY | SFGAO_CANMOVE | SFGAO_CANLINK | SFGAO_CANRENAME | SFGAO_CANDELETE | + SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | SFGAO_FILESYSTEM; lstrcpyA(szAbsolutePath, This->m_pszPath); pszRelativePath = szAbsolutePath + lstrlenA(szAbsolutePath); for (i=0; i<cidl; i++) { @@ -1149,12 +1149,12 @@ static HRESULT WINAPI ShellFolder2_GetAttributesOf(IShellFolder2* iface, UINT ci if (!UNIXFS_filename_from_shitemid(apidl[i], pszRelativePath)) return E_INVALIDARG; if (!(dos_name = wine_get_dos_file_name( szAbsolutePath ))) - *rgfInOut &= ~SFGAO_FILESYSTEM; + *attrs &= ~SFGAO_FILESYSTEM; else HeapFree( GetProcessHeap(), 0, dos_name ); } if (_ILIsFolder(apidl[i])) - *rgfInOut |= SFGAO_FOLDER|SFGAO_HASSUBFOLDER|SFGAO_FILESYSANCESTOR; + *attrs |= SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_FILESYSANCESTOR; } }

1 0

Francois Gouget : shell32/tests: Add server-side DDE checks.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 805b5e36a99ee1c54c9e4a7e92429974b347a4b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=805b5e36a99ee1c54c9e4a7e9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 29 00:19:53 2016 +0100 shell32/tests: Add server-side DDE checks. Should something go wrong a failed ok() call will leave a clearer trace in the log than an assert. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 22fa6e8..fc27ed6 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -212,12 +212,7 @@ static void doChild(int argc, char** argv) char *filename, buffer[MAX_PATH]; HANDLE hFile, map; int i; - int rc; - HSZ hszApplication; UINT_PTR timer; - HANDLE dde_ready; - MSG msg; - char *shared_block; filename=argv[2]; hFile=CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); @@ -252,19 +247,28 @@ static void doChild(int argc, char** argv) map = OpenFileMappingA(FILE_MAP_READ, FALSE, "winetest_shlexec_dde_map"); if (map != NULL) { - shared_block = MapViewOfFile(map, FILE_MAP_READ, 0, 0, 4096); + HANDLE dde_ready; + char *shared_block = MapViewOfFile(map, FILE_MAP_READ, 0, 0, 4096); CloseHandle(map); if (shared_block[0] != '\0' || shared_block[1] != '\0') { + HDDEDATA hdde; + HSZ hszApplication; + MSG msg; + UINT rc; + post_quit_on_execute = TRUE; ddeInst = 0; rc = DdeInitializeA(&ddeInst, ddeCb, CBF_SKIP_ALLNOTIFICATIONS | CBF_FAIL_ADVISES | CBF_FAIL_POKES | CBF_FAIL_REQUESTS, 0); - ok(rc == DMLERR_NO_ERROR, "got %d\n", rc); + ok(rc == DMLERR_NO_ERROR, "DdeInitializeA() returned %d\n", rc); hszApplication = DdeCreateStringHandleA(ddeInst, shared_block, CP_WINANSI); - hszTopic = DdeCreateStringHandleA(ddeInst, shared_block + strlen(shared_block) + 1, CP_WINANSI); - assert(hszApplication && hszTopic); - assert(DdeNameService(ddeInst, hszApplication, 0, DNS_REGISTER | DNS_FILTEROFF)); + ok(hszApplication != NULL, "DdeCreateStringHandleA(%s) = NULL\n", shared_block); + shared_block += strlen(shared_block) + 1; + hszTopic = DdeCreateStringHandleA(ddeInst, shared_block, CP_WINANSI); + ok(hszTopic != NULL, "DdeCreateStringHandleA(%s) = NULL\n", shared_block); + hdde = DdeNameService(ddeInst, hszApplication, 0, DNS_REGISTER | DNS_FILTEROFF); + ok(hdde != NULL, "DdeNameService() failed le=%u\n", GetLastError()); timer = SetTimer(NULL, 0, 2500, childTimeout); @@ -273,14 +277,19 @@ static void doChild(int argc, char** argv) CloseHandle(dde_ready); while (GetMessageA(&msg, NULL, 0, 0)) + { + if (winetest_debug > 2) + trace("msg %d lParam=%ld wParam=%lu\n", msg.message, msg.lParam, msg.wParam); DispatchMessageA(&msg); + } Sleep(500); KillTimer(NULL, timer); - assert(DdeNameService(ddeInst, hszApplication, 0, DNS_UNREGISTER)); - assert(DdeFreeStringHandle(ddeInst, hszTopic)); - assert(DdeFreeStringHandle(ddeInst, hszApplication)); - assert(DdeUninitialize(ddeInst)); + hdde = DdeNameService(ddeInst, hszApplication, 0, DNS_UNREGISTER); + ok(hdde != NULL, "DdeNameService() failed le=%u\n", GetLastError()); + ok(DdeFreeStringHandle(ddeInst, hszTopic), "DdeFreeStringHandle(topic)\n"); + ok(DdeFreeStringHandle(ddeInst, hszApplication), "DdeFreeStringHandle(application)\n"); + ok(DdeUninitialize(ddeInst), "DdeUninitialize() failed\n"); } else {

1 0

Francois Gouget : shell32/tests: Test environment variable inheritance with ShellExecute().
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 446ade3b3cb51a849d22dc6f8dd1d5db859cd44d URL: http://source.winehq.org/git/wine.git/?a=commit;h=446ade3b3cb51a849d22dc6f8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 29 00:19:50 2016 +0100 shell32/tests: Test environment variable inheritance with ShellExecute(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index ae91493..22fa6e8 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -209,7 +209,7 @@ static void CALLBACK childTimeout(HWND wnd, UINT msg, UINT_PTR timer, DWORD time static void doChild(int argc, char** argv) { - char *filename, longpath[MAX_PATH] = ""; + char *filename, buffer[MAX_PATH]; HANDLE hFile, map; int i; int rc; @@ -239,8 +239,15 @@ static void doChild(int argc, char** argv) trace("argvA%d='%s'\n", i, argv[i]); childPrintf(hFile, "argvA%d=%s\r\n", i, encodeA(argv[i])); } - GetModuleFileNameA(GetModuleHandleA(NULL), longpath, MAX_PATH); - childPrintf(hFile, "longPath=%s\r\n", encodeA(longpath)); + GetModuleFileNameA(GetModuleHandleA(NULL), buffer, sizeof(buffer)); + childPrintf(hFile, "longPath=%s\r\n", encodeA(buffer)); + + /* Check environment variable inheritance */ + *buffer = '\0'; + SetLastError(0); + GetEnvironmentVariableA("ShlexecVar", buffer, sizeof(buffer)); + childPrintf(hFile, "ShlexecVarLE=%d\r\n", GetLastError()); + childPrintf(hFile, "ShlexecVar=%s\r\n", encodeA(buffer)); map = OpenFileMappingA(FILE_MAP_READ, FALSE, "winetest_shlexec_dde_map"); if (map != NULL) @@ -314,6 +321,11 @@ static void dump_child_(const char* file, int line) trace_(file, line)("%s='%s'\n", key, str); } + c=GetPrivateProfileIntA("Child", "ShlexecVarLE", -1, child_file); + trace_(file, line)("ShlexecVarLE=%d\n", c); + str=getChildString("Child", "ShlexecVar"); + trace_(file, line)("ShlexecVar='%s'\n", str); + c=GetPrivateProfileIntA("Child", "Failures", -1, child_file); trace_(file, line)("Failures=%d\n", c); } @@ -527,10 +539,13 @@ static INT_PTR shell_execute_(const char* file, int line, LPCSTR verb, LPCSTR fi WritePrivateProfileStringA(NULL, NULL, NULL, child_file); if (GetFileAttributesA(child_file) != INVALID_FILE_ATTRIBUTES) { - int c = GetPrivateProfileIntA("Child", "Failures", -1, child_file); + int c; + dump_child_(file, line); + c = GetPrivateProfileIntA("Child", "Failures", -1, child_file); if (c > 0) winetest_add_failures(c); - dump_child_(file, line); + okChildInt_(file, line, "ShlexecVarLE", 0); + okChildString_(file, line, "ShlexecVar", "Present", "Present"); } if(!verb) @@ -637,10 +652,13 @@ static INT_PTR shell_execute_ex_(const char* file, int line, WritePrivateProfileStringA(NULL, NULL, NULL, child_file); if (GetFileAttributesA(child_file) != INVALID_FILE_ATTRIBUTES) { - int c = GetPrivateProfileIntA("Child", "Failures", -1, child_file); + int c; + dump_child_(file, line); + c = GetPrivateProfileIntA("Child", "Failures", -1, child_file); if (c > 0) winetest_add_failures(c); - dump_child_(file, line); + okChildInt_(file, line, "ShlexecVarLE", 0); + okChildString_(file, line, "ShlexecVar", "Present", "Present"); } return rc; @@ -2736,6 +2754,9 @@ static void init_test(void) create_test_verb(".shlexec", "QuotedLowerL", 0, "QuotedLowerL \"%l\""); create_test_verb(".shlexec", "UpperL", 0, "UpperL %L"); create_test_verb(".shlexec", "QuotedUpperL", 0, "QuotedUpperL \"%L\""); + + /* Set an environment variable to see if it is inherited */ + SetEnvironmentVariableA("ShlexecVar", "Present"); } static void cleanup_test(void)

1 0

Francois Gouget : shell32/tests: Check for failures in the child process.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: bdfaa8c807693ff033f2b8f4581ffc2d1ed38303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdfaa8c807693ff033f2b8f45… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 29 00:19:46 2016 +0100 shell32/tests: Check for failures in the child process. Return the number of failures through both the child result file and the process exit code. Also rename the child result file section to 'Child' since it no longer only contains 'Arguments'. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 0630815..ae91493 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -225,7 +225,7 @@ static void doChild(int argc, char** argv) return; /* Arguments */ - childPrintf(hFile, "[Arguments]\r\n"); + childPrintf(hFile, "[Child]\r\n"); if (winetest_debug > 2) { trace("cmdlineA='%s'\n", GetCommandLineA()); @@ -287,6 +287,7 @@ static void doChild(int argc, char** argv) childPrintf(hFile, "ddeExec=%s\r\n", encodeA(ddeExec)); } + childPrintf(hFile, "Failures=%d\r\n", winetest_get_failures()); CloseHandle(hFile); init_event(filename); @@ -302,16 +303,19 @@ static void dump_child_(const char* file, int line) char* str; int i, c; - str=getChildString("Arguments", "cmdlineA"); + str=getChildString("Child", "cmdlineA"); trace_(file, line)("cmdlineA='%s'\n", str); - c=GetPrivateProfileIntA("Arguments", "argcA", -1, child_file); + c=GetPrivateProfileIntA("Child", "argcA", -1, child_file); trace_(file, line)("argcA=%d\n",c); for (i=0;i<c;i++) { sprintf(key, "argvA%d", i); - str=getChildString("Arguments", key); + str=getChildString("Child", key); trace_(file, line)("%s='%s'\n", key, str); } + + c=GetPrivateProfileIntA("Child", "Failures", -1, child_file); + trace_(file, line)("Failures=%d\n", c); } } @@ -355,7 +359,7 @@ void reset_association_description(void) static void okChildString_(const char* file, int line, const char* key, const char* expected, const char* bad) { char* result; - result=getChildString("Arguments", key); + result=getChildString("Child", key); if (!result) { okShell_(file, line)(FALSE, "%s expected '%s', but key not found or empty\n", key, expected); @@ -408,7 +412,7 @@ static int StrCmpPath(const char* s1, const char* s2) static void okChildPath_(const char* file, int line, const char* key, const char* expected) { char* result; - result=getChildString("Arguments", key); + result=getChildString("Child", key); if (!result) { okShell_(file,line)(FALSE, "%s expected '%s', but key not found or empty\n", key, expected); @@ -422,7 +426,7 @@ static void okChildPath_(const char* file, int line, const char* key, const char static void okChildInt_(const char* file, int line, const char* key, int expected) { INT result; - result=GetPrivateProfileIntA("Arguments", key, expected, child_file); + result=GetPrivateProfileIntA("Child", key, expected, child_file); okShell_(file,line)(result == expected, "%s expected %d, but got %d\n", key, expected, result); } @@ -431,7 +435,7 @@ static void okChildInt_(const char* file, int line, const char* key, int expecte static void okChildIntBroken_(const char* file, int line, const char* key, int expected) { INT result; - result=GetPrivateProfileIntA("Arguments", key, expected, child_file); + result=GetPrivateProfileIntA("Child", key, expected, child_file); okShell_(file,line)(result == expected || broken(result != expected), "%s expected %d, but got %d\n", key, expected, result); } @@ -521,8 +525,13 @@ static INT_PTR shell_execute_(const char* file, int line, LPCSTR verb, LPCSTR fi * functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, child_file); - if (rc > 32) + if (GetFileAttributesA(child_file) != INVALID_FILE_ATTRIBUTES) + { + int c = GetPrivateProfileIntA("Child", "Failures", -1, child_file); + if (c > 0) + winetest_add_failures(c); dump_child_(file, line); + } if(!verb) { @@ -626,8 +635,13 @@ static INT_PTR shell_execute_ex_(const char* file, int line, * functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, child_file); - if (rc > 32) + if (GetFileAttributesA(child_file) != INVALID_FILE_ATTRIBUTES) + { + int c = GetPrivateProfileIntA("Child", "Failures", -1, child_file); + if (c > 0) + winetest_add_failures(c); dump_child_(file, line); + } return rc; } @@ -1551,7 +1565,7 @@ static void test_argify(void) else todo_wine okChildInt("argcA", 4 + count - 1); - cmd = getChildString("Arguments", "cmdlineA"); + cmd = getChildString("Child", "cmdlineA"); /* Our commands are such that the verb immediately precedes the * part we are interested in. */ @@ -2810,7 +2824,8 @@ START_TEST(shlexec) if (myARGC >= 3) { doChild(myARGC, myARGV); - exit(0); + /* Skip the tests/failures trace for child processes */ + ExitProcess(winetest_get_failures()); } init_test();

1 0

Francois Gouget : shell32/tests: Check the child process exit code and close the process handle.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 30230fae5f74bf0f2233f4b6eb9b09f086a21bc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30230fae5f74bf0f2233f4b6e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 29 00:19:42 2016 +0100 shell32/tests: Check the child process exit code and close the process handle. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index a950cde..0630815 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -26,8 +26,6 @@ * - ShellExecute("foo.shlexec") with no path should work if foo.shlexec is * in the PATH * - test associations that use %l, %L or "%1" instead of %1 - * - we may want to test ShellExecuteEx() instead of ShellExecute() - * and then we could also check its return value * - ShellExecuteEx() also calls SetLastError() with meaningful values which * we could check */ @@ -597,13 +595,20 @@ static INT_PTR shell_execute_ex_(const char* file, int line, if (rc > 32) { - int wait_rc; + DWORD wait_rc, rc; if (sei.hProcess!=NULL) { wait_rc=WaitForSingleObject(sei.hProcess, 5000); okShell_(file, line)(wait_rc==WAIT_OBJECT_0, "WaitForSingleObject(hProcess) returned %d\n", wait_rc); + wait_rc = GetExitCodeProcess(sei.hProcess, &rc); + okShell_(file, line)(wait_rc, "GetExitCodeProcess() failed le=%u\n", GetLastError()); + if (!_todo_wait) + okShell_(file, line)(rc == 0, "child returned %u\n", rc); + else todo_wine + okShell_(file, line)(rc == 0, "child returned %u\n", rc); + CloseHandle(sei.hProcess); } wait_rc=WaitForSingleObject(hEvent, 5000); if (!_todo_wait)

1 0

Francois Gouget : shell32/tests: Declare childPrintf() as a printf-style function.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 3a9b09aa7d2ea75bf37dca92347a4d4d2ba369ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a9b09aa7d2ea75bf37dca923… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 29 00:19:39 2016 +0100 shell32/tests: Declare childPrintf() as a printf-style function. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 0b687d0..a950cde 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -117,7 +117,7 @@ static char* decodeA(const char* str) return ptr; } -static void childPrintf(HANDLE h, const char* fmt, ...) +static void WINETEST_PRINTF_ATTR(2,3) childPrintf(HANDLE h, const char* fmt, ...) { va_list valist; char buffer[1024];

1 0

Francois Gouget : shell32/tests: Reorder the functions to avoid forward declarations.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 38ad0ee01de636219ee755771c04cbc860024a1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=38ad0ee01de636219ee755771… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 29 00:19:34 2016 +0100 shell32/tests: Reorder the functions to avoid forward declarations. This also groups the helpers in a more logical fashion. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 999 ++++++++++++++++++++++--------------------- 1 file changed, 508 insertions(+), 491 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38ad0ee01de636219ee75…

1 0

Francois Gouget : shell32/tests: Add traces to the WaitForInputIdle() hooking process.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 759bd96ac227042024481e9634a3d575c18aee01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=759bd96ac227042024481e963… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 29 00:14:38 2016 +0100 shell32/tests: Add traces to the WaitForInputIdle() hooking process. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 7844722..af4563e 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2254,6 +2254,8 @@ static dde_tests_t dde_tests[] = static DWORD WINAPI hooked_WaitForInputIdle(HANDLE process, DWORD timeout) { + if (winetest_debug > 1) + trace("WaitForInputIdle() waiting for dde event\n"); return WaitForSingleObject(dde_ready_event, timeout); } @@ -2272,6 +2274,7 @@ static void hook_WaitForInputIdle(DWORD (WINAPI *new_func)(HANDLE, DWORD)) PIMAGE_NT_HEADERS nt_headers; DWORD import_directory_rva; PIMAGE_IMPORT_DESCRIPTOR import_descriptor; + int hook_count = 0; base = (char *) GetModuleHandleA("shell32.dll"); nt_headers = (PIMAGE_NT_HEADERS)(base + ((PIMAGE_DOS_HEADER) base)->e_lfanew); @@ -2309,6 +2312,9 @@ static void hook_WaitForInputIdle(DWORD (WINAPI *new_func)(HANDLE, DWORD)) VirtualProtect(&iat_entry->u1.Function, sizeof(ULONG_PTR), PAGE_READWRITE, &old_prot); iat_entry->u1.Function = (ULONG_PTR) new_func; VirtualProtect(&iat_entry->u1.Function, sizeof(ULONG_PTR), old_prot, &old_prot); + if (winetest_debug > 1) + trace("Hooked %s.WaitForInputIdle\n", import_module_name); + hook_count++; break; } } @@ -2320,6 +2326,7 @@ static void hook_WaitForInputIdle(DWORD (WINAPI *new_func)(HANDLE, DWORD)) import_descriptor++; } + ok(hook_count, "Could not hook WaitForInputIdle()\n"); } static void test_dde(void)

1 0

Nikolay Sivov : dwrite: Set isNewline cluster flag.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: feca77fb0ce1dd05927127a050c1636a270b9ea7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feca77fb0ce1dd05927127a05… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 28 23:27:21 2016 +0300 dwrite: Set isNewline cluster flag. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 6 ++++++ dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/layout.c | 2 +- dlls/dwrite/tests/layout.c | 27 ++++++++++++++------------- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 2eb495e..4b21f11 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -326,6 +326,12 @@ static inline void set_break_condition(UINT32 pos, enum BreakConditionLocation l } } +BOOL lb_is_newline_char(WCHAR ch) +{ + short c = get_table_entry(wine_linebreak_table, ch); + return c == b_LF || c == b_NL || c == b_CR || c == b_BK; +} + static HRESULT analyze_linebreaks(const WCHAR *text, UINT32 count, DWRITE_LINE_BREAKPOINT *breakpoints) { struct linebreaking_state state; diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index f79763c..79b34a5 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -139,6 +139,7 @@ extern BOOL is_face_type_supported(DWRITE_FONT_FACE_TYPE) DECLSPEC_HIDDEN; extern HRESULT get_family_names_from_stream(IDWriteFontFileStream*,UINT32,DWRITE_FONT_FACE_TYPE,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT create_colorglyphenum(FLOAT,FLOAT,const DWRITE_GLYPH_RUN*,const DWRITE_GLYPH_RUN_DESCRIPTION*,DWRITE_MEASURING_MODE, const DWRITE_MATRIX*,UINT32,IDWriteColorGlyphRunEnumerator**) DECLSPEC_HIDDEN; +extern BOOL lb_is_newline_char(WCHAR) DECLSPEC_HIDDEN; /* Opentype font table functions */ struct dwrite_font_props { diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 0c3846d..b34ee4c 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -613,7 +613,7 @@ static inline void init_cluster_metrics(const struct dwrite_textlayout *layout, if (metrics->length == 1) { DWRITE_LINE_BREAKPOINT bp = get_effective_breakpoint(layout, position); metrics->isWhitespace = bp.isWhitespace; - metrics->isNewline = FALSE /* FIXME */; + metrics->isNewline = metrics->canWrapLineAfter && lb_is_newline_char(layout->str[position]); metrics->isSoftHyphen = bp.isSoftHyphen; } else { diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index a7423f8..a8203f9 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1700,13 +1700,13 @@ static void test_GetClusterMetrics(void) /* SP - SPACE */ 0x20 }; static const WCHAR str5W[] = {'a','\r','b','\n','c','\n','\r','d','\r','\n','e',0xb,'f',0xc, - 'g',0x0085,'h',0x2028,'i',0x2029,0xad,0}; + 'g',0x0085,'h',0x2028,'i',0x2029,0xad,0xa,0}; static const WCHAR str3W[] = {0x2066,')',')',0x661,'(',0x627,')',0}; static const WCHAR str2W[] = {0x202a,0x202c,'a',0}; static const WCHAR strW[] = {'a','b','c','d',0}; static const WCHAR str4W[] = {'a',' ',0}; DWRITE_INLINE_OBJECT_METRICS inline_metrics; - DWRITE_CLUSTER_METRICS metrics[21]; + DWRITE_CLUSTER_METRICS metrics[22]; IDWriteTextLayout1 *layout1; IDWriteInlineObject *trimm; IDWriteTextFormat *format; @@ -1997,9 +1997,8 @@ todo_wine memset(metrics, 0, sizeof(metrics)); hr = IDWriteTextLayout_GetClusterMetrics(layout, metrics, sizeof(metrics)/sizeof(metrics[0]), &count); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(count == 21, "got %u\n", count); + ok(count == 22, "got %u\n", count); -todo_wine { ok(metrics[1].isNewline == 1, "got %d\n", metrics[1].isNewline); ok(metrics[3].isNewline == 1, "got %d\n", metrics[3].isNewline); ok(metrics[5].isNewline == 1, "got %d\n", metrics[5].isNewline); @@ -2010,7 +2009,8 @@ todo_wine { ok(metrics[15].isNewline == 1, "got %d\n", metrics[15].isNewline); ok(metrics[17].isNewline == 1, "got %d\n", metrics[17].isNewline); ok(metrics[19].isNewline == 1, "got %d\n", metrics[19].isNewline); -} + ok(metrics[21].isNewline == 1, "got %d\n", metrics[21].isNewline); + ok(metrics[0].isNewline == 0, "got %d\n", metrics[0].isNewline); ok(metrics[2].isNewline == 0, "got %d\n", metrics[2].isNewline); ok(metrics[4].isNewline == 0, "got %d\n", metrics[4].isNewline); @@ -2021,12 +2021,16 @@ todo_wine { ok(metrics[14].isNewline == 0, "got %d\n", metrics[14].isNewline); ok(metrics[16].isNewline == 0, "got %d\n", metrics[16].isNewline); ok(metrics[18].isNewline == 0, "got %d\n", metrics[18].isNewline); + ok(metrics[20].isNewline == 0, "got %d\n", metrics[20].isNewline); for (i = 0; i < count; i++) { ok(metrics[i].length == 1, "%d: got %d\n", i, metrics[i].length); - ok(metrics[i].isSoftHyphen == (i == count - 1), "%d: got %d\n", i, metrics[i].isSoftHyphen); + ok(metrics[i].isSoftHyphen == (i == count - 2), "%d: got %d\n", i, metrics[i].isSoftHyphen); if (metrics[i].isNewline) { - ok(metrics[i].width == 0.0f, "%u: got width %f\n", i, metrics[i].width); + if (i == 17 || i == 19) + todo_wine ok(metrics[i].width == 0.0f, "%u: got width %f\n", i, metrics[i].width); + else + ok(metrics[i].width == 0.0f, "%u: got width %f\n", i, metrics[i].width); ok(metrics[i].canWrapLineAfter == 1, "%u: got %d\n", i, metrics[i].canWrapLineAfter); } } @@ -3341,12 +3345,11 @@ static void test_GetLineMetrics(void) count = 2; hr = IDWriteTextLayout_GetLineMetrics(layout, metrics, 2, &count); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine { ok(count == 2, "got %u\n", count); /* baseline is relative to a line, and is not accumulated */ ok(metrics[0].baseline == metrics[1].baseline, "got %.2f, %.2f\n", metrics[0].baseline, metrics[1].baseline); -} + IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format); @@ -3364,20 +3367,19 @@ todo_wine { todo_wine ok(count == 6, "got %u\n", count); -todo_wine { ok(metrics[0].length == 2, "got %u\n", metrics[0].length); ok(metrics[1].length == 2, "got %u\n", metrics[1].length); ok(metrics[2].length == 2, "got %u\n", metrics[2].length); ok(metrics[3].length == 1, "got %u\n", metrics[3].length); ok(metrics[4].length == 3, "got %u\n", metrics[4].length); +todo_wine ok(metrics[5].length == 0, "got %u\n", metrics[5].length); -} -todo_wine { ok(metrics[0].newlineLength == 1, "got %u\n", metrics[0].newlineLength); ok(metrics[1].newlineLength == 1, "got %u\n", metrics[1].newlineLength); ok(metrics[2].newlineLength == 1, "got %u\n", metrics[2].newlineLength); ok(metrics[3].newlineLength == 1, "got %u\n", metrics[3].newlineLength); +todo_wine { ok(metrics[4].newlineLength == 2, "got %u\n", metrics[4].newlineLength); ok(metrics[5].newlineLength == 0, "got %u\n", metrics[5].newlineLength); } @@ -4008,7 +4010,6 @@ static void test_SetWordWrapping(void) count = 0; hr = IDWriteTextLayout_GetLineMetrics(layout, NULL, 0, &count); ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); -todo_wine ok(count == 2, "got %u\n", count); hr = IDWriteTextLayout_SetWordWrapping(layout, DWRITE_WORD_WRAPPING_WRAP);

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 January 2016