October 2008 - Wine-commits

Henri Verbeet : wined3d: The container is always non-NULL if GetContainer() succeeds.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: master Commit: 231e2c60b5d0c145438ac6c5a3806d590dab85f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=231e2c60b5d0c145438ac6c5a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 16 11:52:54 2008 +0200 wined3d: The container is always non-NULL if GetContainer() succeeds. --- dlls/wined3d/context.c | 4 +-- dlls/wined3d/device.c | 3 +- dlls/wined3d/surface.c | 62 +++++++++++++++++++++---------------------- dlls/wined3d/surface_gdi.c | 12 ++++---- 4 files changed, 38 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=231e2c60b5d0c145438ac…

1 0

Henri Verbeet : wined3d: Remove a redundant local variable in apply_draw_buffer().
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: master Commit: bd5abfb1e40b889866df86698232c6ad2bd067eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd5abfb1e40b889866df86698… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 16 11:52:54 2008 +0200 wined3d: Remove a redundant local variable in apply_draw_buffer(). --- dlls/wined3d/context.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 43b8533..bf77f12 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1409,11 +1409,9 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf static void apply_draw_buffer(IWineD3DDeviceImpl *This, IWineD3DSurface *target, BOOL blit) { - HRESULT hr; IWineD3DSwapChain *swapchain; - hr = IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain); - if (SUCCEEDED(hr)) + if (SUCCEEDED(IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain))) { IWineD3DSwapChain_Release((IUnknown *)swapchain); glDrawBuffer(surface_get_gl_buffer(target, swapchain));

1 0

Aric Stewart : user32: Update DrawText tests to cover behavior differences on win98.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: master Commit: e0edc233afa8a64ff94cd47150c0e566b156b08d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0edc233afa8a64ff94cd4715… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 14 07:29:28 2008 -0500 user32: Update DrawText tests to cover behavior differences on win98. --- dlls/user32/tests/text.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index e1ce938..f3849cc 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -674,13 +674,13 @@ static void test_DrawState(void) SetLastError(0xdeadbeef); ret = DrawState(hdc, GetStockObject(DKGRAY_BRUSH), NULL, 0, strlen(text), 0, 0, 10, 10, DST_TEXT); - ok(!ret, "DrawState succeeded\n"); + ok(!ret || broken(ret) /* win98 */, "DrawState succeeded\n"); ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); SetLastError(0xdeadbeef); ret = DrawState(hdc, GetStockObject(DKGRAY_BRUSH), NULL, 0, 0, 0, 0, 10, 10, DST_TEXT); - ok(!ret, "DrawState succeeded\n"); + ok(!ret || broken(ret) /* win98 */, "DrawState succeeded\n"); ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); ReleaseDC(hwnd, hdc);

1 0

Aric Stewart : kernel32/tests: Add a test for CreateProcess with an AppName set.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: master Commit: 6ec0e71e173c44938c3e818122edd2c83e3b4098 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ec0e71e173c44938c3e81812… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 15 09:30:21 2008 -0500 kernel32/tests: Add a test for CreateProcess with an AppName set. --- dlls/kernel32/tests/process.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index f7ca2f8..7f716d6 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -731,6 +731,7 @@ static void test_Startup(void) static void test_CommandLine(void) { char buffer[MAX_PATH], fullpath[MAX_PATH], *lpFilePart, *p; + char buffer2[MAX_PATH]; PROCESS_INFORMATION info; STARTUPINFOA startup; DWORD len; @@ -830,7 +831,29 @@ static void test_CommandLine(void) okChildString("Arguments", "argvA0", buffer); release_memory(); assert(DeleteFileA(resfile) != 0); - + + /* Using AppName */ + get_file_name(resfile); + len = GetFullPathNameA(selfname, MAX_PATH, fullpath, &lpFilePart); + assert ( lpFilePart != 0); + *(lpFilePart -1 ) = 0; + p = strrchr(fullpath, '\\'); + assert (p); + /* Use exename to avoid buffer containing things like 'C:' */ + sprintf(buffer, "..%s/%s", p, exename); + sprintf(buffer2, "dummy tests/process.c %s \"a\\\"b\\\\\" c\\\" d", resfile); + SetLastError(0xdeadbeef); + ret = CreateProcessA(buffer, buffer2, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); + ok(ret, "CreateProcess (%s) failed : %d\n", buffer, GetLastError()); + /* wait for child to terminate */ + ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); + /* child process has changed result file, so let profile functions know about it */ + WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + sprintf(buffer, "tests/process.c %s", resfile); + okChildString("Arguments", "argvA0", "dummy"); + okChildString("Arguments", "CommandLineA", buffer2); + release_memory(); + assert(DeleteFileA(resfile) != 0); } static void test_Directory(void)

1 0

Aric Stewart : kernel32/tests: Add test for GetCommandLineW.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: master Commit: 0738505173bbbcc2761442c5312246b0a8bac1fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0738505173bbbcc2761442c53… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 15 09:30:28 2008 -0500 kernel32/tests: Add test for GetCommandLineW. --- dlls/kernel32/tests/process.c | 42 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 7f716d6..40b8caf 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -128,7 +128,6 @@ static char* decodeA(const char* str) return ptr; } -#if 0 /* This will be needed to decode Unicode strings saved by the child process * when we test Unicode functions. */ @@ -149,7 +148,6 @@ static WCHAR* decodeW(const char* str) ptr[len] = '\0'; return ptr; } -#endif /****************************************************************** * init @@ -411,6 +409,18 @@ static char* getChildString(const char* sect, const char* key) return ret; } +static WCHAR* getChildStringW(const char* sect, const char* key) +{ + char buf[1024+4*MAX_LISTED_ENV_VAR]; + WCHAR* ret; + + GetPrivateProfileStringA(sect, key, "-", buf, sizeof(buf), resfile); + if (buf[0] == '\0' || (buf[0] == '-' && buf[1] == '\0')) return NULL; + assert(!(strlen(buf) & 1)); + ret = decodeW(buf); + return ret; +} + /* FIXME: this may be moved to the wtmain.c file, because it may be needed by * others... (windows uses stricmp while Un*x uses strcasecmp...) */ @@ -446,8 +456,35 @@ static void ok_child_string( int line, const char *sect, const char *key, sect, key, expect ? expect : "(null)", result ); } +static void ok_child_stringWA( int line, const char *sect, const char *key, + const char *expect, int sensitive ) +{ + WCHAR* expectW; + CHAR* resultA; + DWORD len; + WCHAR* result = getChildStringW( sect, key ); + + len = MultiByteToWideChar( CP_ACP, 0, expect, -1, NULL, 0); + expectW = HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); + MultiByteToWideChar( CP_ACP, 0, expect, -1, expectW, len); + + len = WideCharToMultiByte( CP_ACP, 0, result, -1, NULL, 0, NULL, NULL); + resultA = HeapAlloc(GetProcessHeap(),0,len*sizeof(CHAR)); + WideCharToMultiByte( CP_ACP, 0, result, -1, resultA, len, NULL, NULL); + + if (sensitive) + ok_(__FILE__, line)( lstrcmpW(result, expectW) == 0, "%s:%s expected '%s', got '%s'\n", + sect, key, expect ? expect : "(null)", resultA ); + else + ok_(__FILE__, line)( lstrcmpiW(result, expectW) == 0, "%s:%s expected '%s', got '%s'\n", + sect, key, expect ? expect : "(null)", resultA ); + HeapFree(GetProcessHeap(),0,expectW); + HeapFree(GetProcessHeap(),0,resultA); +} + #define okChildString(sect, key, expect) ok_child_string(__LINE__, (sect), (key), (expect), 1 ) #define okChildIString(sect, key, expect) ok_child_string(__LINE__, (sect), (key), (expect), 0 ) +#define okChildStringWA(sect, key, expect) ok_child_stringWA(__LINE__, (sect), (key), (expect), 1 ) /* using !expect ensures that the test will fail if the sect/key isn't present * in result file @@ -852,6 +889,7 @@ static void test_CommandLine(void) sprintf(buffer, "tests/process.c %s", resfile); okChildString("Arguments", "argvA0", "dummy"); okChildString("Arguments", "CommandLineA", buffer2); + okChildStringWA("Arguments", "CommandLineW", buffer2); release_memory(); assert(DeleteFileA(resfile) != 0); }

1 0

Michael Stefaniuc : dinput: Remove superfluous backslashes at end of lines.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: master Commit: bb2d8577c3d68ddaa6a9571e0c18ebf0005a68e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb2d8577c3d68ddaa6a9571e0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 15 23:16:48 2008 +0200 dinput: Remove superfluous backslashes at end of lines. --- dlls/dinput/keyboard.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index b851b95..46d82fc 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -53,13 +53,13 @@ struct SysKeyboardImpl static BYTE map_dik_code(DWORD scanCode, DWORD vkCode) { static const BYTE asciiCodes[] = - {/*32*/ DIK_SPACE,0,0,0,0,0,0,DIK_APOSTROPHE, \ - /*40*/ 0,0,0,0,DIK_COMMA,DIK_MINUS,DIK_PERIOD,DIK_SLASH, \ - /*48*/ DIK_0,DIK_1,DIK_2,DIK_3,DIK_4,DIK_5,DIK_6,DIK_7, \ - /*56*/ DIK_8,DIK_9,DIK_COLON,DIK_SEMICOLON,0,DIK_EQUALS,0,0, \ - /*64*/ DIK_AT,DIK_A,DIK_B,DIK_C,DIK_D,DIK_E,DIK_F,DIK_G, \ - /*72*/ DIK_H,DIK_I,DIK_J,DIK_K,DIK_L,DIK_M,DIK_N,DIK_O, \ - /*80*/ DIK_P,DIK_Q,DIK_R,DIK_S,DIK_T,DIK_U,DIK_V,DIK_W, \ + {/*32*/ DIK_SPACE,0,0,0,0,0,0,DIK_APOSTROPHE, + /*40*/ 0,0,0,0,DIK_COMMA,DIK_MINUS,DIK_PERIOD,DIK_SLASH, + /*48*/ DIK_0,DIK_1,DIK_2,DIK_3,DIK_4,DIK_5,DIK_6,DIK_7, + /*56*/ DIK_8,DIK_9,DIK_COLON,DIK_SEMICOLON,0,DIK_EQUALS,0,0, + /*64*/ DIK_AT,DIK_A,DIK_B,DIK_C,DIK_D,DIK_E,DIK_F,DIK_G, + /*72*/ DIK_H,DIK_I,DIK_J,DIK_K,DIK_L,DIK_M,DIK_N,DIK_O, + /*80*/ DIK_P,DIK_Q,DIK_R,DIK_S,DIK_T,DIK_U,DIK_V,DIK_W, /*88*/ DIK_X,DIK_Y,DIK_Z,DIK_LBRACKET,0,DIK_RBRACKET,DIK_CIRCUMFLEX,DIK_UNDERLINE} /*95*/ ; BYTE out_code = 0;

1 0

Michael Stefaniuc : advapi32/tests: Remove superfluous casts of void pointers to other pointer types.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: master Commit: 1988e6ea88046ca9b71f8cb0b7b20385bbd52f34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1988e6ea88046ca9b71f8cb0b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 15 23:17:24 2008 +0200 advapi32/tests: Remove superfluous casts of void pointers to other pointer types. --- dlls/advapi32/tests/security.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 99dbce8..45c8fd5 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1962,7 +1962,7 @@ static void test_impersonation_level(void) ret = GetTokenInformation(Token, TokenUser, NULL, 0, &Size); error = GetLastError(); ok(!ret && error == ERROR_INSUFFICIENT_BUFFER, "GetTokenInformation(TokenUser) should have failed with ERROR_INSUFFICIENT_BUFFER instead of %d\n", error); - User = (TOKEN_USER *)HeapAlloc(GetProcessHeap(), 0, Size); + User = HeapAlloc(GetProcessHeap(), 0, Size); ret = GetTokenInformation(Token, TokenUser, User, Size, &Size); ok(ret, "GetTokenInformation(TokenUser) failed with error %d\n", GetLastError()); HeapFree(GetProcessHeap(), 0, User); @@ -1971,11 +1971,11 @@ static void test_impersonation_level(void) ret = GetTokenInformation(Token, TokenPrivileges, NULL, 0, &Size); error = GetLastError(); ok(!ret && error == ERROR_INSUFFICIENT_BUFFER, "GetTokenInformation(TokenPrivileges) should have failed with ERROR_INSUFFICIENT_BUFFER instead of %d\n", error); - Privileges = (TOKEN_PRIVILEGES *)HeapAlloc(GetProcessHeap(), 0, Size); + Privileges = HeapAlloc(GetProcessHeap(), 0, Size); ret = GetTokenInformation(Token, TokenPrivileges, Privileges, Size, &Size); ok(ret, "GetTokenInformation(TokenPrivileges) failed with error %d\n", GetLastError()); - PrivilegeSet = (PRIVILEGE_SET *)HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(PRIVILEGE_SET, Privilege[Privileges->PrivilegeCount])); + PrivilegeSet = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(PRIVILEGE_SET, Privilege[Privileges->PrivilegeCount])); PrivilegeSet->PrivilegeCount = Privileges->PrivilegeCount; memcpy(PrivilegeSet->Privilege, Privileges->Privileges, PrivilegeSet->PrivilegeCount * sizeof(PrivilegeSet->Privilege[0])); PrivilegeSet->Control = PRIVILEGE_SET_ALL_NECESSARY;

1 0

Michael Stefaniuc : riched20: Remove superfluous backslashes at end of lines.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: master Commit: b9f3e3626d8dcca6d27bc6b4533bbae403fb916d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9f3e3626d8dcca6d27bc6b45… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 15 23:17:08 2008 +0200 riched20: Remove superfluous backslashes at end of lines. --- dlls/riched20/tests/editor.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index e035b63..08b913b 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -4578,26 +4578,26 @@ static void test_EM_STREAMIN(void) const char * streamText0b = "{\\rtf1 TestSomeText\\par\\par}"; const char * streamText1 = - "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang12298{\\fonttbl{\\f0\\fswiss\\fprq2\\fcharset0 System;}}\r\n" \ - "\\viewkind4\\uc1\\pard\\f0\\fs17 TestSomeText\\par\r\n" \ + "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang12298{\\fonttbl{\\f0\\fswiss\\fprq2\\fcharset0 System;}}\r\n" + "\\viewkind4\\uc1\\pard\\f0\\fs17 TestSomeText\\par\r\n" "}\r\n"; /* In richedit 2.0 mode, this should NOT be accepted, unlike 1.0 */ const char * streamText2 = - "{{\\colortbl;\\red0\\green255\\blue102;\\red255\\green255\\blue255;" \ - "\\red170\\green255\\blue255;\\red255\\green238\\blue0;\\red51\\green255" \ - "\\blue221;\\red238\\green238\\blue238;}\\tx0 \\tx424 \\tx848 \\tx1272 " \ - "\\tx1696 \\tx2120 \\tx2544 \\tx2968 \\tx3392 \\tx3816 \\tx4240 \\tx4664 " \ - "\\tx5088 \\tx5512 \\tx5936 \\tx6360 \\tx6784 \\tx7208 \\tx7632 \\tx8056 " \ - "\\tx8480 \\tx8904 \\tx9328 \\tx9752 \\tx10176 \\tx10600 \\tx11024 " \ + "{{\\colortbl;\\red0\\green255\\blue102;\\red255\\green255\\blue255;" + "\\red170\\green255\\blue255;\\red255\\green238\\blue0;\\red51\\green255" + "\\blue221;\\red238\\green238\\blue238;}\\tx0 \\tx424 \\tx848 \\tx1272 " + "\\tx1696 \\tx2120 \\tx2544 \\tx2968 \\tx3392 \\tx3816 \\tx4240 \\tx4664 " + "\\tx5088 \\tx5512 \\tx5936 \\tx6360 \\tx6784 \\tx7208 \\tx7632 \\tx8056 " + "\\tx8480 \\tx8904 \\tx9328 \\tx9752 \\tx10176 \\tx10600 \\tx11024 " "\\tx11448 \\tx11872 \\tx12296 \\tx12720 \\tx13144 \\cf2 RichEdit1\\line }"; const char * streamText3 = "RichEdit1"; struct StringWithLength cookieForStream4; const char * streamText4 = - "This text just needs to be long enough to cause run to be split onto "\ - "two separate lines and make sure the null terminating character is "\ + "This text just needs to be long enough to cause run to be split onto " + "two separate lines and make sure the null terminating character is " "handled properly.\0"; int length4 = strlen(streamText4) + 1; cookieForStream4.buffer = (char *)streamText4;

1 0

Michael Stefaniuc : mlang/tests: Remove superfluous backslashes at end of lines.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: master Commit: a25649b829d1650d95059eadfdf210be2f4f85b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a25649b829d1650d95059eadf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 15 23:17:01 2008 +0200 mlang/tests: Remove superfluous backslashes at end of lines. --- dlls/mlang/tests/mlang.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index f42836d..0cec2c7 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1180,21 +1180,21 @@ static void test_JapaneseConversion(void) static CHAR jis_jp[9][27] = { {20,0x31,0x20,0x1b,0x24,0x42,0x24,0x22,0x24,0x24,0x24,0x26,0x24,0x28, 0x24,0x2a,0x1b,0x28,0x42,0x0d,0x0a}, - {20,0x31,0x20,0x1b,0x24,0x42,0x25,0x22,0x25,0x24,0x25,0x26,0x25,0x28,\ + {20,0x31,0x20,0x1b,0x24,0x42,0x25,0x22,0x25,0x24,0x25,0x26,0x25,0x28, 0x25,0x2a,0x1b,0x28,0x42,0x0d,0x0a}, - {20,0x31,0x20,0x1b,0x24,0x42,0x25,0x22,0x25,0x24,0x25,0x26,0x25,0x28,\ + {20,0x31,0x20,0x1b,0x24,0x42,0x25,0x22,0x25,0x24,0x25,0x26,0x25,0x28, 0x25,0x2a,0x1b,0x28,0x42,0x0d,0x0a}, - {20,0x31,0x20,0x1b,0x24,0x42,0x24,0x21,0x24,0x23,0x24,0x25,0x24,0x27,\ + {20,0x31,0x20,0x1b,0x24,0x42,0x24,0x21,0x24,0x23,0x24,0x25,0x24,0x27, 0x24,0x29,0x1b,0x28,0x42,0x0d,0x0a}, - {20,0x31,0x20,0x1b,0x24,0x42,0x25,0x21,0x25,0x23,0x25,0x25,0x25,0x27,\ + {20,0x31,0x20,0x1b,0x24,0x42,0x25,0x21,0x25,0x23,0x25,0x25,0x25,0x27, 0x25,0x29,0x1b,0x28,0x42,0x0d,0x0a}, - {20,0x31,0x20,0x1b,0x24,0x42,0x25,0x21,0x25,0x23,0x25,0x25,0x25,0x27,\ + {20,0x31,0x20,0x1b,0x24,0x42,0x25,0x21,0x25,0x23,0x25,0x25,0x25,0x27, 0x25,0x29,0x1b,0x28,0x42,0x0d,0x0a}, - {20,0x31,0x20,0x1b,0x24,0x42,0x21,0x56,0x46,0x7c,0x4b,0x5c,0x38,0x6c,\ + {20,0x31,0x20,0x1b,0x24,0x42,0x21,0x56,0x46,0x7c,0x4b,0x5c,0x38,0x6c, 0x21,0x57,0x1b,0x28,0x42,0x0d,0x0a}, - {16,0x31,0x20,0x1b,0x24,0x42,0x21,0x7e,0x21,0x7e,0x22,0x29,0x1b,0x28,\ + {16,0x31,0x20,0x1b,0x24,0x42,0x21,0x7e,0x21,0x7e,0x22,0x29,0x1b,0x28, 0x42,0x0d,0x0a}, - {26,0x31,0x20,0x1b,0x24,0x42,0x22,0x28,0x21,0x5a,0x1b,0x28,0x42,0x74,\ + {26,0x31,0x20,0x1b,0x24,0x42,0x22,0x28,0x21,0x5a,0x1b,0x28,0x42,0x74, 0x65,0x73,0x74,0x1b,0x24,0x42,0x21,0x5b,0x1b,0x28,0x42,0x0d,0x0a} }; static CHAR sjis_jp[9][15] = {

1 0

Michael Stefaniuc : riched32: Remove superfluous backslashes at end of lines.
by Alexandre Julliard 16 Oct '08

16 Oct '08

Module: wine Branch: master Commit: 8ca3e38770e4b976f285bfe757a9d05787fcf73c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca3e38770e4b976f285bfe75… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 15 23:17:17 2008 +0200 riched32: Remove superfluous backslashes at end of lines. --- dlls/riched32/tests/editor.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 63a63f1..1d07b8d 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -184,18 +184,18 @@ static void test_EM_STREAMIN(void) const char * streamText0b = "{\\rtf1 TestSomeText\\par\\par}"; const char * streamText1 = - "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang12298{\\fonttbl{\\f0\\fswiss\\fprq2\\fcharset0 System;}}\r\n" \ - "\\viewkind4\\uc1\\pard\\f0\\fs17 TestSomeText\\par\r\n" \ + "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang12298{\\fonttbl{\\f0\\fswiss\\fprq2\\fcharset0 System;}}\r\n" + "\\viewkind4\\uc1\\pard\\f0\\fs17 TestSomeText\\par\r\n" "}\r\n"; /* This should be accepted in richedit 1.0 emulation. See bug #8326 */ const char * streamText2 = - "{{\\colortbl;\\red0\\green255\\blue102;\\red255\\green255\\blue255;" \ - "\\red170\\green255\\blue255;\\red255\\green238\\blue0;\\red51\\green255" \ - "\\blue221;\\red238\\green238\\blue238;}\\tx0 \\tx424 \\tx848 \\tx1272 " \ - "\\tx1696 \\tx2120 \\tx2544 \\tx2968 \\tx3392 \\tx3816 \\tx4240 \\tx4664 " \ - "\\tx5088 \\tx5512 \\tx5936 \\tx6360 \\tx6784 \\tx7208 \\tx7632 \\tx8056 " \ - "\\tx8480 \\tx8904 \\tx9328 \\tx9752 \\tx10176 \\tx10600 \\tx11024 " \ + "{{\\colortbl;\\red0\\green255\\blue102;\\red255\\green255\\blue255;" + "\\red170\\green255\\blue255;\\red255\\green238\\blue0;\\red51\\green255" + "\\blue221;\\red238\\green238\\blue238;}\\tx0 \\tx424 \\tx848 \\tx1272 " + "\\tx1696 \\tx2120 \\tx2544 \\tx2968 \\tx3392 \\tx3816 \\tx4240 \\tx4664 " + "\\tx5088 \\tx5512 \\tx5936 \\tx6360 \\tx6784 \\tx7208 \\tx7632 \\tx8056 " + "\\tx8480 \\tx8904 \\tx9328 \\tx9752 \\tx10176 \\tx10600 \\tx11024 " "\\tx11448 \\tx11872 \\tx12296 \\tx12720 \\tx13144 \\cf2 RichEdit1\\line }"; const char * streamText3 = "RichEdit1";

1 0