September 2008 - Wine-Commits

Alexander Nicolaysen Sørnes : regedit: Fix some fprintf arguments.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 4f332e610e2ed2d97f125901c3d0179fe7ed6a8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f332e610e2ed2d97f125901c… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Sep 21 23:26:32 2008 +0200 regedit: Fix some fprintf arguments. --- programs/regedit/regproc.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index ce26319..bdbdba9 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -576,8 +576,10 @@ static void processRegEntry(WCHAR* stdInput, BOOL isUnicode) delete_registry_key(stdInput + 1); } else if ( openKeyW(stdInput) != ERROR_SUCCESS ) { + char* stdInputA = GetMultiByteString(stdInput); fprintf(stderr,"%s: setValue failed to open key %s\n", - getAppName(), stdInput); + getAppName(), stdInputA); + HeapFree(GetProcessHeap(), 0, stdInputA); } } else if( currentKeyHandle && (( stdInput[0] == '@') || /* reading a default @=data pair */ @@ -1063,11 +1065,17 @@ static void export_hkey(FILE *file, HKEY key, } default: + { + char* key_nameA = GetMultiByteString(*reg_key_name_buf); + char* value_nameA = GetMultiByteString(*val_name_buf); fprintf(stderr,"%s: warning - unsupported registry format '%d', " "treat as binary\n", getAppName(), value_type); - fprintf(stderr,"key name: \"%s\"\n", *reg_key_name_buf); - fprintf(stderr,"value name:\"%s\"\n\n", *val_name_buf); + fprintf(stderr,"key name: \"%s\"\n", key_nameA); + fprintf(stderr,"value name:\"%s\"\n\n", value_nameA); + HeapFree(GetProcessHeap(), 0, key_nameA); + HeapFree(GetProcessHeap(), 0, value_nameA); + } /* falls through */ case REG_MULTI_SZ: /* falls through */

1 0

Alexander Nicolaysen Sørnes : regedit: Fix char escaping for registry export.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 1e0a77622b8b3cfe1c98624feb23f3ef67e915b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e0a77622b8b3cfe1c98624fe… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Sep 21 23:20:42 2008 +0200 regedit: Fix char escaping for registry export. --- programs/regedit/regproc.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 3ee7370..ce26319 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -885,7 +885,7 @@ static void REGPROC_export_string(WCHAR **line_buf, DWORD *line_buf_size, DWORD DWORD i; DWORD extra = 0; - REGPROC_resize_char_buffer(line_buf, line_buf_size, len + 10); + REGPROC_resize_char_buffer(line_buf, line_buf_size, len + *line_size + 10); /* escaping characters */ for (i = 0; i < len; i++) { @@ -895,37 +895,36 @@ static void REGPROC_export_string(WCHAR **line_buf, DWORD *line_buf_size, DWORD { const WCHAR escape[] = {'\\','\\'}; + REGPROC_resize_char_buffer(line_buf, line_buf_size, len + *line_size + extra + 1); + memcpy(*line_buf + *line_size + i + extra - 1, escape, 2 * sizeof(WCHAR)); extra++; - REGPROC_resize_char_buffer(line_buf, line_buf_size, len + extra); - memcpy(*line_buf + *line_size - 1, escape, 2 * sizeof(WCHAR)); break; } - case '\"': + case '"': { const WCHAR escape[] = {'\\','"'}; + REGPROC_resize_char_buffer(line_buf, line_buf_size, len + *line_size + extra + 1); + memcpy(*line_buf + *line_size + i + extra - 1, escape, 2 * sizeof(WCHAR)); extra++; - REGPROC_resize_char_buffer(line_buf, line_buf_size, len + extra); - memcpy(*line_buf + *line_size - 1, escape, 2 * sizeof(WCHAR)); break; } case '\n': { - const WCHAR escape[] = {'\\','\n'}; + const WCHAR escape[] = {'\\','n'}; + REGPROC_resize_char_buffer(line_buf, line_buf_size, len + *line_size + extra + 1); + memcpy(*line_buf + *line_size + i + extra - 1, escape, 2 * sizeof(WCHAR)); extra++; - REGPROC_resize_char_buffer(line_buf, line_buf_size, len + extra); - memcpy(*line_buf + *line_size - 1, escape, 2 * sizeof(WCHAR)); break; } default: - memcpy(*line_buf + *line_size - 1, &c, sizeof(WCHAR)); + memcpy(*line_buf + *line_size + i + extra - 1, &c, sizeof(WCHAR)); break; } - *line_size += 1; } + *line_size += len + extra; *(*line_buf + *line_size - 1) = 0; - *line_size += extra; } /******************************************************************************

1 0

Paul Vriens : imm32/tests: Skip tests when IME support is not implemented.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: e46e095c22cc869eb7973af3947e125cde9da72e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e46e095c22cc869eb7973af39… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Sep 20 10:41:01 2008 +0200 imm32/tests: Skip tests when IME support is not implemented. --- dlls/imm32/tests/imm32.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index d0ced5f..7208092 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -135,6 +135,7 @@ static HWND hwnd; static int init(void) { WNDCLASSEX wc; + HIMC imc; wc.cbSize = sizeof(WNDCLASSEX); wc.style = 0; @@ -158,6 +159,14 @@ static int init(void) { if (!hwnd) return 0; + imc = ImmGetContext(hwnd); + if (!imc) + { + skip("IME support not implemented\n"); + return 0; + } + ImmReleaseContext(hwnd, imc); + ShowWindow(hwnd, SW_SHOWNORMAL); UpdateWindow(hwnd);

1 0

Paul Vriens : ntdll/tests: Show that we are skipping tests.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: e9f5fbc4196c63c4bd3cab457ffc5342a230c108 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9f5fbc4196c63c4bd3cab457… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Sep 21 20:21:58 2008 +0200 ntdll/tests: Show that we are skipping tests. --- dlls/ntdll/tests/path.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index bf1271a..e1b1767 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -314,6 +314,12 @@ static void test_RtlGetFullPathName_U(void) START_TEST(path) { HMODULE mod = GetModuleHandleA("ntdll.dll"); + if (!mod) + { + win_skip("Not running on NT, skipping tests\n"); + return; + } + pRtlMultiByteToUnicodeN = (void *)GetProcAddress(mod,"RtlMultiByteToUnicodeN"); pRtlUnicodeToMultiByteN = (void *)GetProcAddress(mod,"RtlUnicodeToMultiByteN"); pRtlDetermineDosPathNameType_U = (void *)GetProcAddress(mod,"RtlDetermineDosPathNameType_U");

1 0

Paul Vriens : ntdll/tests: Show that we are skipping tests.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 1010768d8e12ca71c5ce5b680294cb4a79fa02de URL: http://source.winehq.org/git/wine.git/?a=commit;h=1010768d8e12ca71c5ce5b680… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Sep 21 20:17:16 2008 +0200 ntdll/tests: Show that we are skipping tests. --- dlls/ntdll/tests/env.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index aab9368..92f654e 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -275,6 +275,11 @@ static void testExpand(void) START_TEST(env) { HMODULE mod = GetModuleHandleA("ntdll.dll"); + if (!mod) + { + win_skip("Not running on NT, skipping tests\n"); + return; + } pRtlMultiByteToUnicodeN = (void *)GetProcAddress(mod,"RtlMultiByteToUnicodeN"); pRtlCreateEnvironment = (void*)GetProcAddress(mod, "RtlCreateEnvironment");

1 0

Paul Vriens : ntdll/tests: Use skip and add a FreeLibrary.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: f812d30486ea53377a7c233e7a90f922903fa8fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f812d30486ea53377a7c233e7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Sep 21 20:11:40 2008 +0200 ntdll/tests: Use skip and add a FreeLibrary. --- dlls/ntdll/tests/atom.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/atom.c b/dlls/ntdll/tests/atom.c index 87ea222..bc5fe2a 100644 --- a/dlls/ntdll/tests/atom.c +++ b/dlls/ntdll/tests/atom.c @@ -476,4 +476,8 @@ START_TEST(atom) test_NtRefPinAtom(); test_Global(); } + else + win_skip("Needed atom functions are not available\n"); + + FreeLibrary(hntdll); }

1 0

Paul Vriens : userenv/tests: Don't crash on NT4.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: a3974485499081410c0b951f25d85b41d4cb536e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3974485499081410c0b951f2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Sep 21 20:59:46 2008 +0200 userenv/tests: Don't crash on NT4. --- dlls/userenv/tests/userenv.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index d277f36..df2774b 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -189,14 +189,22 @@ static void test_create_env(void) r = SetEnvironmentVariableA("WINE_XYZZY", "ZZYZX"); expect(TRUE, r); - r = CreateEnvironmentBlock(NULL, NULL, FALSE); - expect(FALSE, r); + if (0) + { + /* Crashes on NT4 */ + r = CreateEnvironmentBlock(NULL, NULL, FALSE); + expect(FALSE, r); + } r = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY|TOKEN_DUPLICATE, &htok); expect(TRUE, r); - r = CreateEnvironmentBlock(NULL, htok, FALSE); - expect(FALSE, r); + if (0) + { + /* Crashes on NT4 */ + r = CreateEnvironmentBlock(NULL, htok, FALSE); + expect(FALSE, r); + } r = CreateEnvironmentBlock((LPVOID) &env1, NULL, FALSE); expect(TRUE, r);

1 0

Paul Vriens : dsound/tests: Fix failure on Win9x and NT4.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 8ccfe80c0ba19c385f34a6ebfb074b38e407cdb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ccfe80c0ba19c385f34a6ebf… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Sep 21 18:59:34 2008 +0200 dsound/tests: Fix failure on Win9x and NT4. --- dlls/dsound/tests/dsound.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 256f086..10a3fa8 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1068,8 +1068,15 @@ START_TEST(dsound) hDsound = LoadLibrary("dsound.dll"); if (hDsound) { + BOOL ret; + ok( FreeLibrary(hDsound), "FreeLibrary(1) returned %d\n", GetLastError()); - ok( FreeLibrary(hDsound), "FreeLibrary(2) returned %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = FreeLibrary(hDsound); + ok( ret || + broken(!ret && GetLastError() == ERROR_MOD_NOT_FOUND) || /* NT4 */ + broken(!ret && GetLastError() == ERROR_INVALID_HANDLE), /* Win9x */ + "FreeLibrary(2) returned %d\n", GetLastError()); ok(!FreeLibrary(hDsound), "DirectSound DLL still loaded\n"); }

1 0

Paul Vriens : ddraw/tests: Fix a test on a Win98 box.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: a12509532cf87a92fd8028a2505975106ed43517 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a12509532cf87a92fd8028a25… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Sep 21 13:08:13 2008 +0200 ddraw/tests: Fix a test on a Win98 box. --- dlls/ddraw/tests/ddrawmodes.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 95e8657..dcde97d 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -284,8 +284,13 @@ static void testcooperativelevels_normal(void) /* Try creating a double buffered primary in normal mode */ rc = IDirectDraw_CreateSurface(lpDD, &surfacedesc, &surface, NULL); - ok(rc == DDERR_NOEXCLUSIVEMODE, "IDirectDraw_CreateSurface returned %08x\n", rc); - ok(surface == NULL, "Returned surface pointer is %p\n", surface); + if (rc == DDERR_UNSUPPORTEDMODE) + skip("Unsupported mode\n"); + else + { + ok(rc == DDERR_NOEXCLUSIVEMODE, "IDirectDraw_CreateSurface returned %08x\n", rc); + ok(surface == NULL, "Returned surface pointer is %p\n", surface); + } if(surface && surface != (IDirectDrawSurface *)0xdeadbeef) IDirectDrawSurface_Release(surface); /* Set the focus window */

1 0

Paul Vriens : kernel32/tests: Add extra tests for SetCurrentDirectory.
by Alexandre Julliard Sept. 22, 2008

Sept. 22, 2008

Module: wine Branch: master Commit: 1c5043e73d65ec198d3da918e1e9d23ffa29b6f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c5043e73d65ec198d3da918e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Sep 21 12:41:36 2008 +0200 kernel32/tests: Add extra tests for SetCurrentDirectory. --- dlls/kernel32/tests/path.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index d158df1..e8e6c1e 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -465,6 +465,14 @@ static void test_CurrentDirectoryA(CHAR *origdir, CHAR *newdir) /* starting with a '.' */ sprintf(tmpstr,".\\%s",LONGDIR); test_setdir(newdir,tmpstr,tmpstr1,1,"check 9"); +/* change to root without a trailing backslash. The function call succeeds + but the directory is not changed. +*/ + strcpy(tmpstr,"C:"); + test_setdir(newdir,tmpstr,newdir,1,"check 10"); +/* works however with a trailing backslash */ + strcpy(tmpstr,"C:\\"); + test_setdir(newdir,tmpstr,NULL,1,"check 11"); } /* Cleanup the mess we made while executing these tests */

1 0