December 2006 - Wine-commits

Francois Gouget : shell32: Fix FindExecutableW() to not check if lpResult after using it. It' s supposed to cause a segfault anyway.
by Alexandre Julliard 14 Dec '06

14 Dec '06

Module: wine Branch: master Commit: df9715b1b0980cfb513153ec2ad8df598aa7d913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df9715b1b0980cfb513153ec2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 13 18:07:42 2006 +0100 shell32: Fix FindExecutableW() to not check if lpResult after using it. It's supposed to cause a segfault anyway. Use SE_ERR_FNF rather than a numeric literal. --- dlls/shell32/shlexec.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 2950ad8..f49382a 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1013,13 +1013,8 @@ HINSTANCE WINAPI FindExecutableW(LPCWSTR (lpFile != NULL ? debugstr_w(lpFile) : "-"), (lpDirectory != NULL ? debugstr_w(lpDirectory) : "-")); lpResult[0] = '\0'; /* Start off with an empty return string */ - - /* trap NULL parameters on entry */ - if ((lpFile == NULL) || (lpResult == NULL)) - { - /* FIXME - should throw a warning, perhaps! */ - return (HINSTANCE)2; /* File not found. Close enough, I guess. */ - } + if (lpFile == NULL) + return (HINSTANCE)SE_ERR_FNF; if (lpDirectory) {

1 0

Andrew Talbot : rpcrt4/tests: Cast-qual warnings fix.
by Alexandre Julliard 14 Dec '06

14 Dec '06

Module: wine Branch: master Commit: 82a042d0df854bdedf1605b7e42d9bdb58f43622 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82a042d0df854bdedf1605b7e… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Dec 13 20:50:37 2006 +0000 rpcrt4/tests: Cast-qual warnings fix. --- dlls/rpcrt4/tests/cstub.c | 2 +- dlls/rpcrt4/tests/ndr_marshall.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 9cac380..ceed0d0 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -605,7 +605,7 @@ static void test_CreateStub(IPSFactoryBu IUnknown *obj = (IUnknown*)&vtbl; IRpcStubBuffer *pstub = create_stub(ppsf, &IID_if1, obj, S_OK); CStdStubBuffer *cstd_stub = (CStdStubBuffer*)pstub; - CInterfaceStubHeader *header = ((CInterfaceStubHeader *)cstd_stub->lpVtbl) - 1; + const CInterfaceStubHeader *header = ((const CInterfaceStubHeader *)cstd_stub->lpVtbl) - 1; ok(IsEqualIID(header->piid, &IID_if1), "header iid differs\n"); ok(cstd_stub->RefCount == 1, "ref count %d\n", cstd_stub->RefCount); diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 3ed9a32..667e86e 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -224,7 +224,7 @@ todo_wine { static int deref_cmp(const void *s1, const void *s2, size_t num) { - return memcmp(*(void**)s1, *(void**)s2, num); + return memcmp(*(const void *const *)s1, *(const void *const *)s2, num); }

1 0

Francois Gouget : shell32/tests: Add FindExecutable() tests.
by Alexandre Julliard 14 Dec '06

14 Dec '06

Module: wine Branch: master Commit: 65b81bebaa5c9ff3fd97746fbf7c09fe927e9522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65b81bebaa5c9ff3fd97746fb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 13 18:06:21 2006 +0100 shell32/tests: Add FindExecutable() tests. --- dlls/shell32/tests/shlexec.c | 163 +++++++++++++++++++++++++++++++++++------ 1 files changed, 139 insertions(+), 24 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index add8648..cb05217 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -230,7 +230,7 @@ static void delete_test_association(cons } static void create_test_verb(const char* extension, const char* verb, - const char* cmdtail) + int rawcmd, const char* cmdtail) { HKEY hkey_shell, hkey_verb, hkey_cmd; char shell[MAX_PATH]; @@ -248,12 +248,19 @@ static void create_test_verb(const char* NULL, &hkey_cmd, NULL); assert(rc==ERROR_SUCCESS); - cmd=malloc(strlen(argv0)+10+strlen(child_file)+2+strlen(cmdtail)+1); - sprintf(cmd,"%s shlexec \"%s\" %s", argv0, child_file, cmdtail); - rc=RegSetValueEx(hkey_cmd, NULL, 0, REG_SZ, (LPBYTE) cmd, strlen(cmd)+1); - assert(rc==ERROR_SUCCESS); + if (rawcmd) + { + rc=RegSetValueEx(hkey_cmd, NULL, 0, REG_SZ, (LPBYTE)cmdtail, strlen(cmdtail)+1); + } + else + { + cmd=malloc(strlen(argv0)+10+strlen(child_file)+2+strlen(cmdtail)+1); + sprintf(cmd,"%s shlexec \"%s\" %s", argv0, child_file, cmdtail); + rc=RegSetValueEx(hkey_cmd, NULL, 0, REG_SZ, (LPBYTE)cmd, strlen(cmd)+1); + assert(rc==ERROR_SUCCESS); + free(cmd); + } - free(cmd); CloseHandle(hkey_shell); CloseHandle(hkey_verb); CloseHandle(hkey_cmd); @@ -470,6 +477,9 @@ static const char* testfiles[]= "%s\\test file.shlexec.noassoc", "%s\\test_shortcut_shlexec.lnk", "%s\\test_shortcut_exe.lnk", + "%s\\test file.shl", + "%s\\test file.shlfoo", + "%s\\test file.sfe", NULL }; @@ -484,28 +494,28 @@ typedef struct static filename_tests_t filename_tests[]= { /* Test bad / nonexistent filenames */ - {NULL, "%s\\nonexistent.shlexec", 0x1, ERROR_FILE_NOT_FOUND}, - {NULL, "%s\\nonexistent.noassoc", 0x1, ERROR_FILE_NOT_FOUND}, + {NULL, "%s\\nonexistent.shlexec", 0x11, SE_ERR_FNF}, + {NULL, "%s\\nonexistent.noassoc", 0x11, SE_ERR_FNF}, /* Standard tests */ - {NULL, "%s\\test file.shlexec", 0x0, 33}, - {NULL, "%s\\test file.shlexec.", 0x0, 33}, - {NULL, "%s\\%%nasty%% $file.shlexec", 0x0, 33}, - {NULL, "%s/test file.shlexec", 0x0, 33}, + {NULL, "%s\\test file.shlexec", 0x20, 33}, + {NULL, "%s\\test file.shlexec.", 0x20, 33}, + {NULL, "%s\\%%nasty%% $file.shlexec", 0x20, 33}, + {NULL, "%s/test file.shlexec", 0x20, 33}, /* Test filenames with no association */ - {NULL, "%s\\test file.noassoc", 0x0, SE_ERR_NOASSOC}, + {NULL, "%s\\test file.noassoc", 0x0, SE_ERR_NOASSOC}, /* Test double extensions */ - {NULL, "%s\\test file.noassoc.shlexec", 0x0, 33}, + {NULL, "%s\\test file.noassoc.shlexec", 0x20, 33}, {NULL, "%s\\test file.shlexec.noassoc", 0x0, SE_ERR_NOASSOC}, /* Test alternate verbs */ - {"LowerL", "%s\\nonexistent.shlexec", 0x1, ERROR_FILE_NOT_FOUND}, - {"LowerL", "%s\\test file.noassoc", 0x0, SE_ERR_NOASSOC}, + {"LowerL", "%s\\nonexistent.shlexec", 0x11, SE_ERR_FNF}, + {"LowerL", "%s\\test file.noassoc", 0x0, SE_ERR_NOASSOC}, - {"QuotedLowerL", "%s\\test file.shlexec", 0x0, 33}, - {"QuotedUpperL", "%s\\test file.shlexec", 0x0, 33}, + {"QuotedLowerL", "%s\\test file.shlexec", 0x20, 33}, + {"QuotedUpperL", "%s\\test file.shlexec", 0x20, 33}, {NULL, NULL, 0} }; @@ -673,6 +683,110 @@ static void test_filename(void) } } +static void test_find_executable(void) +{ + char filename[MAX_PATH]; + char command[MAX_PATH]; + const filename_tests_t* test; + int rc; + + create_test_association(".sfe"); + create_test_verb(".sfe", "Open", 1, "%1"); + + /* Don't test FindExecutable(..., NULL), it always crashes */ + + strcpy(command, "your word"); + rc=(int)FindExecutableA(NULL, NULL, command); + ok(rc == SE_ERR_FNF || rc > 32, "FindExecutable(NULL) returned %d\n", rc); + ok(strcmp(command, "your word") != 0, "FindExecutable(NULL) returned command=[%s]\n", command); + + strcpy(command, "your word"); + rc=(int)FindExecutableA(tmpdir, NULL, command); + todo_wine ok(rc == SE_ERR_FNF || rc > 32, "FindExecutable(NULL) returned %d\n", rc); + ok(strcmp(command, "your word") != 0, "FindExecutable(NULL) returned command=[%s]\n", command); + + sprintf(filename, "%s\\test file.sfe", tmpdir); + rc=(int)FindExecutableA(filename, NULL, command); + ok(rc > 32, "FindExecutable(%s) returned %d\n", filename, rc); + /* Depending on the platform, command could be '%1' or 'test file.sfe' */ + + rc=(int)FindExecutableA("test file.sfe", tmpdir, command); + ok(rc > 32, "FindExecutable(%s) returned %d\n", filename, rc); + + rc=(int)FindExecutableA("test file.sfe", NULL, command); + todo_wine ok(rc == SE_ERR_FNF, "FindExecutable(%s) returned %d\n", filename, rc); + + delete_test_association(".sfe"); + + create_test_association(".shl"); + create_test_verb(".shl", "Open", 0, "Open"); + + sprintf(filename, "%s\\test file.shl", tmpdir); + rc=(int)FindExecutableA(filename, NULL, command); + ok(rc > 32, "FindExecutable(%s) returned %d\n", filename, rc); + + sprintf(filename, "%s\\test file.shlfoo", tmpdir); + rc=(int)FindExecutableA(filename, NULL, command); + + delete_test_association(".shl"); + + if (rc > 32) + { + /* On Windows XP and 2003 FindExecutable() is completely broken. + * Probably what it does is convert the filename to 8.3 format, + * which as a side effect converts the '.shlfoo' extension to '.shl', + * and then tries to find an association for '.shl'. This means it + * will normally fail on most extensions with more than 3 characters, + * like '.mpeg', etc. + * Also it means we cannot do any other test. + */ + trace("FindExecutable() is broken -> skipping 4+ character extension tests\n"); + return; + } + + test=filename_tests; + while (test->basename) + { + sprintf(filename, test->basename, tmpdir); + if (strchr(filename, '/')) + { + char* c; + c=filename; + while (*c) + { + if (*c=='\\') + *c='/'; + c++; + } + } + rc=(int)FindExecutableA(filename, NULL, command); + if (rc > 32) + rc=33; + if ((test->todo & 0x10)==0) + { + ok(rc==test->rc, "FindExecutable(%s) failed: rc=%d\n", filename, rc); + } + else todo_wine + { + ok(rc==test->rc, "FindExecutable(%s) failed: rc=%d\n", filename, rc); + } + if (rc > 32) + { + if ((test->todo & 0x20)==0) + { + ok(strcmp(command, argv0) == 0, "FindExecutable(%s) returned command='%s' instead of '%s'\n", + filename, command, argv0); + } + else todo_wine + { + ok(strcmp(command, argv0) == 0, "FindExecutable(%s) returned command='%s' instead of '%s'\n", + filename, command, argv0); + } + } + test++; + } +} + static filename_tests_t lnk_tests[]= { @@ -939,12 +1053,12 @@ static void init_test(void) /* Create a basic association suitable for most tests */ create_test_association(".shlexec"); - create_test_verb(".shlexec", "Open", "Open \"%1\""); - create_test_verb(".shlexec", "NoQuotes", "NoQuotes %1"); - create_test_verb(".shlexec", "LowerL", "LowerL %l"); - create_test_verb(".shlexec", "QuotedLowerL", "QuotedLowerL \"%l\""); - create_test_verb(".shlexec", "UpperL", "UpperL %L"); - create_test_verb(".shlexec", "QuotedUpperL", "QuotedUpperL \"%L\""); + create_test_verb(".shlexec", "Open", 0, "Open \"%1\""); + create_test_verb(".shlexec", "NoQuotes", 0, "NoQuotes %1"); + create_test_verb(".shlexec", "LowerL", 0, "LowerL %l"); + create_test_verb(".shlexec", "QuotedLowerL", 0, "QuotedLowerL \"%l\""); + create_test_verb(".shlexec", "UpperL", 0, "UpperL %L"); + create_test_verb(".shlexec", "QuotedUpperL", 0, "QuotedUpperL \"%L\""); } static void cleanup_test(void) @@ -983,6 +1097,7 @@ START_TEST(shlexec) init_test(); test_filename(); + test_find_executable(); test_lnks(); test_exes(); test_exes_long();

1 0

Francois Gouget : shell32: Fix FindExecutable() to return the executable path, not the whole command.
by Alexandre Julliard 14 Dec '06

14 Dec '06

Module: wine Branch: master Commit: 71e5f3c116ac4a299a7fa181386f6a9997e2438e URL: http://source.winehq.org/git/wine.git/?a=commit;h=71e5f3c116ac4a299a7fa1813… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 13 18:06:45 2006 +0100 shell32: Fix FindExecutable() to return the executable path, not the whole command. --- dlls/shell32/shlexec.c | 10 ++++++++++ dlls/shell32/tests/shlexec.c | 14 +++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 940ce40..0d29395 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -707,6 +707,16 @@ UINT SHELL_FindExecutable(LPCWSTR lpPath } *p = '\0'; } + else + { + /* Truncate on first space, like Windows: + * http://support.microsoft.com/?scid=kb%3Ben-us%3B140724 + */ + WCHAR *p = lpResult; + while (*p != ' ' && *p != '\0') + p++; + *p='\0'; + } } } else /* Check win.ini */ diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index cb05217..4375a9a 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -498,24 +498,24 @@ static filename_tests_t filename_tests[] {NULL, "%s\\nonexistent.noassoc", 0x11, SE_ERR_FNF}, /* Standard tests */ - {NULL, "%s\\test file.shlexec", 0x20, 33}, - {NULL, "%s\\test file.shlexec.", 0x20, 33}, - {NULL, "%s\\%%nasty%% $file.shlexec", 0x20, 33}, - {NULL, "%s/test file.shlexec", 0x20, 33}, + {NULL, "%s\\test file.shlexec", 0x0, 33}, + {NULL, "%s\\test file.shlexec.", 0x0, 33}, + {NULL, "%s\\%%nasty%% $file.shlexec", 0x0, 33}, + {NULL, "%s/test file.shlexec", 0x0, 33}, /* Test filenames with no association */ {NULL, "%s\\test file.noassoc", 0x0, SE_ERR_NOASSOC}, /* Test double extensions */ - {NULL, "%s\\test file.noassoc.shlexec", 0x20, 33}, + {NULL, "%s\\test file.noassoc.shlexec", 0x0, 33}, {NULL, "%s\\test file.shlexec.noassoc", 0x0, SE_ERR_NOASSOC}, /* Test alternate verbs */ {"LowerL", "%s\\nonexistent.shlexec", 0x11, SE_ERR_FNF}, {"LowerL", "%s\\test file.noassoc", 0x0, SE_ERR_NOASSOC}, - {"QuotedLowerL", "%s\\test file.shlexec", 0x20, 33}, - {"QuotedUpperL", "%s\\test file.shlexec", 0x20, 33}, + {"QuotedLowerL", "%s\\test file.shlexec", 0x0, 33}, + {"QuotedUpperL", "%s\\test file.shlexec", 0x0, 33}, {NULL, NULL, 0} };

1 0

Francois Gouget : shell32: Add some documentation for FindExecutableW().
by Alexandre Julliard 14 Dec '06

14 Dec '06

Module: wine Branch: master Commit: 2538fa319a9247d12bfeb46ed6bb21f1deabe451 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2538fa319a9247d12bfeb46ed… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 13 18:07:21 2006 +0100 shell32: Add some documentation for FindExecutableW(). --- dlls/shell32/shlexec.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 0d29395..2950ad8 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -981,6 +981,28 @@ HINSTANCE WINAPI FindExecutableA(LPCSTR /************************************************************************* * FindExecutableW [SHELL32.@] + * + * This function returns the executable associated with the specified file + * for the default verb. + * + * PARAMS + * lpFile [I] The file to find the association for. This must refer to + * an existing file otherwise FindExecutable fails and returns + * SE_ERR_FNF. + * lpResult [O] Points to a buffer into which the executable path is + * copied. This parameter must not be NULL otherwise + * FindExecutable() segfaults. The buffer must be of size at + * least MAX_PATH characters. + * + * RETURNS + * A value greater than 32 on success, less than or equal to 32 otherwise. + * See the SE_ERR_* constants. + * + * NOTES + * On Windows XP and 2003, FindExecutable() seems to first convert the + * filename into 8.3 format, thus taking into account only the first three + * characters of the extension, and expects to find an association for those. + * However other Windows versions behave sanely. */ HINSTANCE WINAPI FindExecutableW(LPCWSTR lpFile, LPCWSTR lpDirectory, LPWSTR lpResult) {

1 0

Francois Gouget : msvcrt: The tests link with msvcrt(d).dll now, so use GetModuleHandle() rather than LoadLibrary().
by Alexandre Julliard 14 Dec '06

14 Dec '06

Module: wine Branch: master Commit: f0dd63cbb4445c11b504b94a65d30bcc9801f602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0dd63cbb4445c11b504b94a6… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 13 17:52:55 2006 +0100 msvcrt: The tests link with msvcrt(d).dll now, so use GetModuleHandle() rather than LoadLibrary(). --- dlls/msvcrt/tests/cpp.c | 4 +++- dlls/msvcrt/tests/string.c | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index a411212..b9acbb1 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -184,7 +184,9 @@ static void* do_call_func2(void *func, v static void InitFunctionPtrs(void) { - hMsvcrt = LoadLibraryA("msvcrt.dll"); + hMsvcrt = GetModuleHandleA("msvcrt.dll"); + if (!hMsvcrt) + hMsvcrt = GetModuleHandleA("msvcrtd.dll"); ok(hMsvcrt != 0, "LoadLibraryA failed\n"); if (hMsvcrt) { diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index a86f91e..cd4ca02 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -111,8 +111,12 @@ START_TEST(string) { void *mem; static const char xilstring[]="c:/xilinx"; - int nLen=strlen(xilstring); - HMODULE hMsvcrt = LoadLibraryA("msvcrt.dll"); + int nLen; + HMODULE hMsvcrt; + + hMsvcrt = GetModuleHandleA("msvcrt.dll"); + if (!hMsvcrt) + hMsvcrt = GetModuleHandleA("msvcrtd.dll"); ok(hMsvcrt != 0, "LoadLibraryA failed\n"); SET(pmemcpy,"memcpy"); SET(pmemcmp,"memcmp"); @@ -122,6 +126,7 @@ START_TEST(string) mem = malloc(100); ok(mem != NULL, "memory not allocated for size 0\n"); strcpy((char*)mem,xilstring); + nLen=strlen(xilstring); pmemcpy((char*)mem+5, mem,nLen+1); ok(pmemcmp((char*)mem+5,xilstring, nLen) == 0, "Got result %s\n",(char*)mem+5);

1 0

Francois Gouget : ole32: Fix named/nameless union compilation error.
by Alexandre Julliard 14 Dec '06

14 Dec '06

Module: wine Branch: master Commit: 5e10172b30917e82c2a02ff2acf5d007e2e8c688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e10172b30917e82c2a02ff2a… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 13 17:53:37 2006 +0100 ole32: Fix named/nameless union compilation error. --- dlls/ole32/tests/ole2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 9d37e0f..7c24103 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1162,7 +1162,7 @@ static void test_data_cache(void) fmtetc.cfFormat = CF_METAFILEPICT; stgmedium.tymed = TYMED_MFPICT; - stgmedium.hMetaFilePict = OleMetafilePictFromIconAndLabel( + U(stgmedium).hMetaFilePict = OleMetafilePictFromIconAndLabel( LoadIcon(NULL, MAKEINTRESOURCE(IDI_APPLICATION)), wszPath, wszPath, 0); stgmedium.pUnkForRelease = NULL;

1 0

Francois Gouget : shell32/tests: MSDN says ShellExecute() == 32 indicates an error. So fix the tests.
by Alexandre Julliard 14 Dec '06

14 Dec '06

Module: wine Branch: master Commit: 2fa16067f6e185539e9a804ac7288738e2e6149c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fa16067f6e185539e9a804ac… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 13 18:05:45 2006 +0100 shell32/tests: MSDN says ShellExecute() == 32 indicates an error. So fix the tests. --- dlls/shell32/tests/shlexec.c | 86 +++++++++++++++++++++--------------------- 1 files changed, 43 insertions(+), 43 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index bed6fd8..add8648 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -109,7 +109,7 @@ static int shell_execute(LPCSTR operatio rc=(int)ShellExecute(NULL, operation, file, parameters, directory, SW_SHOWNORMAL); - if (rc>=32) + if (rc > 32) { int wait_rc; wait_rc=WaitForSingleObject(hEvent, 5000); @@ -119,7 +119,7 @@ static int shell_execute(LPCSTR operatio * functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, child_file); - if (rc>=32) + if (rc > 32) dump_child(); return rc; @@ -164,10 +164,10 @@ static int shell_execute_ex(DWORD mask, SetLastError(0xcafebabe); success=ShellExecuteEx(&sei); rc=(int)sei.hInstApp; - ok((success && rc >= 32) || (!success && rc < 32), + ok((success && rc > 32) || (!success && rc <= 32), "%s rc=%d and hInstApp=%d is not allowed\n", shell_call, success, rc); - if (rc>=32) + if (rc > 32) { int wait_rc; if (sei.hProcess!=NULL) @@ -182,7 +182,7 @@ static int shell_execute_ex(DWORD mask, * functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, child_file); - if (rc>=32) + if (rc > 32) dump_child(); return rc; @@ -477,47 +477,47 @@ typedef struct { const char* verb; const char* basename; - int rc; int todo; + int rc; } filename_tests_t; static filename_tests_t filename_tests[]= { /* Test bad / nonexistent filenames */ - {NULL, "%s\\nonexistent.shlexec", ERROR_FILE_NOT_FOUND, 0x1}, - {NULL, "%s\\nonexistent.noassoc", ERROR_FILE_NOT_FOUND, 0x1}, + {NULL, "%s\\nonexistent.shlexec", 0x1, ERROR_FILE_NOT_FOUND}, + {NULL, "%s\\nonexistent.noassoc", 0x1, ERROR_FILE_NOT_FOUND}, /* Standard tests */ - {NULL, "%s\\test file.shlexec", 0, 0x0}, - {NULL, "%s\\test file.shlexec.", 0, 0x0}, - {NULL, "%s\\%%nasty%% $file.shlexec", 0, 0x0}, - {NULL, "%s/test file.shlexec", 0, 0x0}, + {NULL, "%s\\test file.shlexec", 0x0, 33}, + {NULL, "%s\\test file.shlexec.", 0x0, 33}, + {NULL, "%s\\%%nasty%% $file.shlexec", 0x0, 33}, + {NULL, "%s/test file.shlexec", 0x0, 33}, /* Test filenames with no association */ - {NULL, "%s\\test file.noassoc", SE_ERR_NOASSOC, 0x0}, + {NULL, "%s\\test file.noassoc", 0x0, SE_ERR_NOASSOC}, /* Test double extensions */ - {NULL, "%s\\test file.noassoc.shlexec", 0, 0}, - {NULL, "%s\\test file.shlexec.noassoc", SE_ERR_NOASSOC, 0x0}, + {NULL, "%s\\test file.noassoc.shlexec", 0x0, 33}, + {NULL, "%s\\test file.shlexec.noassoc", 0x0, SE_ERR_NOASSOC}, /* Test alternate verbs */ - {"LowerL", "%s\\nonexistent.shlexec", ERROR_FILE_NOT_FOUND, 0x1}, - {"LowerL", "%s\\test file.noassoc", SE_ERR_NOASSOC, 0x0}, + {"LowerL", "%s\\nonexistent.shlexec", 0x1, ERROR_FILE_NOT_FOUND}, + {"LowerL", "%s\\test file.noassoc", 0x0, SE_ERR_NOASSOC}, - {"QuotedLowerL", "%s\\test file.shlexec", 0, 0x0}, - {"QuotedUpperL", "%s\\test file.shlexec", 0, 0x0}, + {"QuotedLowerL", "%s\\test file.shlexec", 0x0, 33}, + {"QuotedUpperL", "%s\\test file.shlexec", 0x0, 33}, - {NULL, NULL, 0, 0} + {NULL, NULL, 0} }; static filename_tests_t noquotes_tests[]= { /* Test unquoted '%1' thingies */ - {"NoQuotes", "%s\\test file.shlexec", 0, 0xa}, - {"LowerL", "%s\\test file.shlexec", 0, 0x0}, - {"UpperL", "%s\\test file.shlexec", 0, 0x0}, + {"NoQuotes", "%s\\test file.shlexec", 0xa, 33}, + {"LowerL", "%s\\test file.shlexec", 0xa, 33}, + {"UpperL", "%s\\test file.shlexec", 0xa, 33}, - {NULL, NULL, 0, 0} + {NULL, NULL, 0} }; static void test_filename(void) @@ -542,8 +542,8 @@ static void test_filename(void) } } rc=shell_execute(test->verb, filename, NULL, NULL); - if (rc>=32) - rc=0; + if (rc > 32) + rc=33; if ((test->todo & 0x1)==0) { ok(rc==test->rc, "%s failed: rc=%d err=%d\n", shell_call, @@ -554,7 +554,7 @@ static void test_filename(void) ok(rc==test->rc, "%s failed: rc=%d err=%d\n", shell_call, rc, GetLastError()); } - if (rc==0) + if (rc == 33) { const char* verb; if ((test->todo & 0x2)==0) @@ -591,8 +591,8 @@ static void test_filename(void) { sprintf(filename, test->basename, tmpdir); rc=shell_execute(test->verb, filename, NULL, NULL); - if (rc>=32) - rc=0; + if (rc > 32) + rc=33; if ((test->todo & 0x1)==0) { ok(rc==test->rc, "%s failed: rc=%d err=%d\n", shell_call, @@ -664,7 +664,7 @@ static void test_filename(void) */ sprintf(filename, "\"%s\\test file.shlexec\"", tmpdir); rc=shell_execute(NULL, filename, NULL, NULL); - ok(rc>=32, "%s failed: rc=%d err=%d\n", shell_call, rc, + ok(rc > 32, "%s failed: rc=%d err=%d\n", shell_call, rc, GetLastError()); okChildInt("argcA", 5); okChildString("argvA3", "Open"); @@ -677,17 +677,17 @@ static void test_filename(void) static filename_tests_t lnk_tests[]= { /* Pass bad / nonexistent filenames as a parameter */ - {NULL, "%s\\nonexistent.shlexec", 0, 0xa}, - {NULL, "%s\\nonexistent.noassoc", 0, 0xa}, + {NULL, "%s\\nonexistent.shlexec", 0xa, 33}, + {NULL, "%s\\nonexistent.noassoc", 0xa, 33}, /* Pass regular paths as a parameter */ - {NULL, "%s\\test file.shlexec", 0, 0xa}, - {NULL, "%s/%%nasty%% $file.shlexec", 0, 0xa}, + {NULL, "%s\\test file.shlexec", 0xa, 33}, + {NULL, "%s/%%nasty%% $file.shlexec", 0xa, 33}, /* Pass filenames with no association as a parameter */ - {NULL, "%s\\test file.noassoc", 0, 0xa}, + {NULL, "%s\\test file.noassoc", 0xa, 33}, - {NULL, NULL, 0, 0} + {NULL, NULL, 0} }; static void test_lnks(void) @@ -699,7 +699,7 @@ static void test_lnks(void) sprintf(filename, "%s\\test_shortcut_shlexec.lnk", tmpdir); rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL); - ok(rc>=32, "%s failed: rc=%d err=%d\n", shell_call, rc, + ok(rc > 32, "%s failed: rc=%d err=%d\n", shell_call, rc, GetLastError()); okChildInt("argcA", 5); okChildString("argvA3", "Open"); @@ -708,7 +708,7 @@ static void test_lnks(void) sprintf(filename, "%s\\test_shortcut_exe.lnk", tmpdir); rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL); - ok(rc>=32, "%s failed: rc=%d err=%d\n", shell_call, rc, + ok(rc > 32, "%s failed: rc=%d err=%d\n", shell_call, rc, GetLastError()); okChildInt("argcA", 4); okChildString("argvA3", "Lnk"); @@ -728,7 +728,7 @@ static void test_lnks(void) c++; } rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, NULL, NULL); - ok(rc>=32, "%s failed: rc=%d err=%d\n", shell_call, rc, + ok(rc > 32, "%s failed: rc=%d err=%d\n", shell_call, rc, GetLastError()); okChildInt("argcA", 4); okChildString("argvA3", "Lnk"); @@ -743,8 +743,8 @@ static void test_lnks(void) strcat(params,"\""); rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, filename, params, NULL); - if (rc>=32) - rc=0; + if (rc > 32) + rc=33; if ((test->todo & 0x1)==0) { ok(rc==test->rc, "%s failed: rc=%d err=%d\n", shell_call, @@ -799,7 +799,7 @@ static void test_exes(void) /* We need NOZONECHECKS on Win2003 to block a dialog */ rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, argv0, params, NULL); - ok(rc>=32, "%s returned %d\n", shell_call, rc); + ok(rc > 32, "%s returned %d\n", shell_call, rc); okChildInt("argcA", 4); okChildString("argvA3", "Exec"); @@ -830,7 +830,7 @@ static void test_exes_long(void) /* We need NOZONECHECKS on Win2003 to block a dialog */ rc=shell_execute_ex(SEE_MASK_NOZONECHECKS, NULL, argv0, params, NULL); - ok(rc>=32, "%s returned %d\n", shell_call, rc); + ok(rc > 32, "%s returned %d\n", shell_call, rc); okChildInt("argcA", 4); okChildString("argvA3", longparam);

1 0

Vitaliy Margolen : winex11.drv: Update cached cursor position after calling hook.
by Alexandre Julliard 13 Dec '06

13 Dec '06

Module: wine Branch: master Commit: ff721806ca94e6824cc87488d222f230c0381595 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff721806ca94e6824cc87488d… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Dec 12 15:58:37 2006 -0700 winex11.drv: Update cached cursor position after calling hook. --- dlls/winex11.drv/mouse.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index e2c7dd0..a9a4a8d 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -71,6 +71,8 @@ static const UINT button_up_flags[NB_BUT POINT cursor_pos; +BOOL X11DRV_SetCursorPos( INT x, INT y ); + /*********************************************************************** * get_coords * @@ -231,9 +233,6 @@ void X11DRV_send_mouse_input( HWND hwnd, if (cursor_pos.x == x && cursor_pos.y == y) flags &= ~MOUSEEVENTF_MOVE; wine_tsx11_unlock(); } - wine_tsx11_lock(); - cursor_pos = pt; - wine_tsx11_unlock(); } else if (flags & MOUSEEVENTF_MOVE) { @@ -262,7 +261,6 @@ void X11DRV_send_mouse_input( HWND hwnd, else if (pt.x >= screen_width) pt.x = screen_width - 1; if (pt.y < 0) pt.y = 0; else if (pt.y >= screen_height) pt.y = screen_height - 1; - cursor_pos = pt; wine_tsx11_unlock(); } else @@ -279,10 +277,12 @@ void X11DRV_send_mouse_input( HWND hwnd, if ((injected_flags & LLMHF_INJECTED) && ((flags & MOUSEEVENTF_ABSOLUTE) || x || y)) /* we have to actually move the cursor */ { - TRACE( "warping to (%d,%d)\n", pt.x, pt.y ); + X11DRV_SetCursorPos( pt.x, pt.y ); + } + else + { wine_tsx11_lock(); - XWarpPointer( thread_display(), root_window, root_window, 0, 0, 0, 0, - pt.x - virtual_screen_rect.left, pt.y - virtual_screen_rect.top ); + cursor_pos = pt; wine_tsx11_unlock(); } }

1 0

Jacek Caban : mshtml: Added test of CompareUrl.
by Alexandre Julliard 13 Dec '06

13 Dec '06

Module: wine Branch: master Commit: 139d2b813dbd30b96a172cd831f388dc65759bf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=139d2b813dbd30b96a172cd83… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 12 21:52:46 2006 +0100 mshtml: Added test of CompareUrl. --- dlls/mshtml/protocol.c | 25 +++++++++---------------- dlls/mshtml/tests/protocol.c | 12 ++++++++++++ 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index a560ae7..376d1f0 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -102,6 +102,13 @@ static HRESULT WINAPI InternetProtocolIn return INET_E_USE_DEFAULT_PROTOCOLHANDLER; } +static HRESULT WINAPI InternetProtocolInfo_CompareUrl(IInternetProtocolInfo *iface, LPCWSTR pwzUrl1, + LPCWSTR pwzUrl2, DWORD dwCompareFlags) +{ + TRACE("%p)->(%s %s %08x)\n", iface, debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags); + return E_NOTIMPL; +} + #undef PROTOCOLINFO_THIS #define CLASSFACTORY_THIS(iface) DEFINE_THIS(ProtocolFactory, ClassFactory, iface) @@ -438,13 +445,6 @@ static HRESULT WINAPI AboutProtocolInfo_ return INET_E_DEFAULT_ACTION; } -static HRESULT WINAPI AboutProtocolInfo_CompareUrl(IInternetProtocolInfo *iface, LPCWSTR pwzUrl1, - LPCWSTR pwzUrl2, DWORD dwCompareFlags) -{ - FIXME("%p)->(%s %s %08x)\n", iface, debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags); - return E_NOTIMPL; -} - static HRESULT WINAPI AboutProtocolInfo_QueryInfo(IInternetProtocolInfo *iface, LPCWSTR pwzUrl, QUERYOPTION QueryOption, DWORD dwQueryFlags, LPVOID pBuffer, DWORD cbBuffer, DWORD* pcbBuf, DWORD dwReserved) @@ -460,7 +460,7 @@ static const IInternetProtocolInfoVtbl A InternetProtocolInfo_Release, AboutProtocolInfo_ParseUrl, InternetProtocolInfo_CombineUrl, - AboutProtocolInfo_CompareUrl, + InternetProtocolInfo_CompareUrl, AboutProtocolInfo_QueryInfo }; @@ -839,13 +839,6 @@ static HRESULT WINAPI ResProtocolInfo_Pa return INET_E_DEFAULT_ACTION; } -static HRESULT WINAPI ResProtocolInfo_CompareUrl(IInternetProtocolInfo *iface, LPCWSTR pwzUrl1, - LPCWSTR pwzUrl2, DWORD dwCompareFlags) -{ - FIXME("%p)->(%s %s %08x)\n", iface, debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags); - return E_NOTIMPL; -} - static HRESULT WINAPI ResProtocolInfo_QueryInfo(IInternetProtocolInfo *iface, LPCWSTR pwzUrl, QUERYOPTION QueryOption, DWORD dwQueryFlags, LPVOID pBuffer, DWORD cbBuffer, DWORD* pcbBuf, DWORD dwReserved) @@ -861,7 +854,7 @@ static const IInternetProtocolInfoVtbl R InternetProtocolInfo_Release, ResProtocolInfo_ParseUrl, InternetProtocolInfo_CombineUrl, - ResProtocolInfo_CompareUrl, + InternetProtocolInfo_CompareUrl, ResProtocolInfo_QueryInfo }; diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index f4edef4..2cb50d2 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -354,6 +354,12 @@ static void test_res_protocol(void) ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08x\n", hres); ok(size == 0xdeadbeef, "size=%d\n", size); + hres = IInternetProtocolInfo_CompareUrl(protocol_info, blank_url, blank_url, 0); + ok(hres == E_NOTIMPL, "CompareUrl failed: %08x\n", hres); + + hres = IInternetProtocolInfo_CompareUrl(protocol_info, NULL, NULL, 0xdeadbeef); + ok(hres == E_NOTIMPL, "CompareUrl failed: %08x\n", hres); + IInternetProtocolInfo_Release(protocol_info); } @@ -538,6 +544,12 @@ static void test_about_protocol(void) ok(hres == INET_E_USE_DEFAULT_PROTOCOLHANDLER, "CombineUrl failed: %08x\n", hres); ok(size == 0xdeadbeef, "size=%d\n", size); + hres = IInternetProtocolInfo_CompareUrl(protocol_info, blank_url, blank_url, 0); + ok(hres == E_NOTIMPL, "CompareUrl failed: %08x\n", hres); + + hres = IInternetProtocolInfo_CompareUrl(protocol_info, NULL, NULL, 0xdeadbeef); + ok(hres == E_NOTIMPL, "CompareUrl failed: %08x\n", hres); + IInternetProtocolInfo_Release(protocol_info); }

1 0