April 2010 - Wine-commits - list.winehq.org

Andrew Nguyen : kernel32: Improve flag error handling in FormatMessageA/W.
by Alexandre Julliard 28 Apr '10

28 Apr '10

Module: wine Branch: master Commit: f50198f6620504e55653a9caaf7773beceb1fc06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f50198f6620504e55653a9caa… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Apr 28 04:20:25 2010 -0500 kernel32: Improve flag error handling in FormatMessageA/W. --- dlls/kernel32/format_msg.c | 36 +++++--- dlls/kernel32/tests/format_msg.c | 181 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 206 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f50198f6620504e55653a…

1 0

Andrew Nguyen : kernel32: Correct output buffer behavior with empty input strings for FormatMessageA /W.
by Alexandre Julliard 28 Apr '10

28 Apr '10

Module: wine Branch: master Commit: 2193b9e887b109a7134d3318406be665a45471af URL: http://source.winehq.org/git/wine.git/?a=commit;h=2193b9e887b109a7134d33184… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Apr 28 04:20:32 2010 -0500 kernel32: Correct output buffer behavior with empty input strings for FormatMessageA/W. --- dlls/kernel32/format_msg.c | 48 +++++++++++++++++-------- dlls/kernel32/tests/format_msg.c | 71 ++++++++++++++++++++++++++++++++++++- 2 files changed, 101 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index feed8a1..185c459 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -446,22 +446,30 @@ DWORD WINAPI FormatMessageA( goto failure; TRACE("-- %s\n", debugstr_w(target)); - destlength = WideCharToMultiByte(CP_ACP, 0, target, -1, NULL, 0, NULL, NULL); - if (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) { - LPSTR buf = LocalAlloc(LMEM_ZEROINIT, max(nSize, destlength)); - WideCharToMultiByte(CP_ACP, 0, target, -1, buf, destlength, NULL, NULL); - *((LPSTR*)lpBuffer) = buf; - } else { - if (nSize < destlength) + + /* Only try writing to an output buffer if there are processed characters + * in the temporary output buffer. */ + if (*target) + { + destlength = WideCharToMultiByte(CP_ACP, 0, target, -1, NULL, 0, NULL, NULL); + if (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - goto failure; + LPSTR buf = LocalAlloc(LMEM_ZEROINIT, max(nSize, destlength)); + WideCharToMultiByte(CP_ACP, 0, target, -1, buf, destlength, NULL, NULL); + *((LPSTR*)lpBuffer) = buf; } - - WideCharToMultiByte(CP_ACP, 0, target, -1, lpBuffer, destlength, NULL, NULL); + else + { + if (nSize < destlength) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + goto failure; + } + WideCharToMultiByte(CP_ACP, 0, target, -1, lpBuffer, destlength, NULL, NULL); + } + ret = destlength - 1; /* null terminator */ } - ret = destlength - 1; /* null terminator */ failure: HeapFree(GetProcessHeap(),0,target); HeapFree(GetProcessHeap(),0,from); @@ -542,10 +550,18 @@ DWORD WINAPI FormatMessageW( talloced = strlenW(target)+1; TRACE("-- %s\n",debugstr_w(target)); - if (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) { - /* nSize is the MINIMUM size */ - *((LPVOID*)lpBuffer) = LocalAlloc(LMEM_ZEROINIT, max(nSize, talloced)*sizeof(WCHAR)); - strcpyW(*(LPWSTR*)lpBuffer, target); + + /* Only allocate a buffer if there are processed characters in the + * temporary output buffer. If a caller supplies the buffer, then + * a null terminator will be written to it. */ + if (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) + { + if (*target) + { + /* nSize is the MINIMUM size */ + *((LPVOID*)lpBuffer) = LocalAlloc(LMEM_ZEROINIT, max(nSize, talloced)*sizeof(WCHAR)); + strcpyW(*(LPWSTR*)lpBuffer, target); + } } else { diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index e1f5b3e..9021c09 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -53,6 +53,7 @@ static DWORD __cdecl doitW(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id static void test_message_from_string_wide(void) { static const WCHAR test[] = {'t','e','s','t',0}; + static const WCHAR empty[] = {0}; static const WCHAR te[] = {'t','e',0}; static const WCHAR st[] = {'s','t',0}; static const WCHAR t[] = {'t',0}; @@ -144,6 +145,25 @@ static void test_message_from_string_wide(void) ok(!lstrcmpW(test, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4, "failed: r=%d\n", r); + /* null string, crashes on Windows */ + if (0) + { + SetLastError(0xdeadbeef); + memcpy(out, init_buf, sizeof(init_buf)); + r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, NULL, 0, + 0, out, sizeof(out)/sizeof(WCHAR), NULL); + } + + /* empty string */ + SetLastError(0xdeadbeef); + memcpy(out, init_buf, sizeof(init_buf)); + r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, empty, 0, + 0, out, sizeof(out)/sizeof(WCHAR), NULL); + error = GetLastError(); + ok(!lstrcmpW(empty, out), "failed out=%s\n", wine_dbgstr_w(out)); + ok(r==0, "succeeded: r=%d\n", r); + ok(error==0xdeadbeef, "last error %u\n", error); + /* format placeholder with no specifier */ SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); @@ -420,6 +440,27 @@ static void test_message_from_string(void) ok(!strcmp("test", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); + /* null string, crashes on Windows */ + if (0) + { + SetLastError(0xdeadbeef); + memcpy(out, init_buf, sizeof(init_buf)); + r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, NULL, 0, + 0, out, sizeof(out)/sizeof(CHAR), NULL); + } + + /* empty string */ + SetLastError(0xdeadbeef); + memcpy(out, init_buf, sizeof(init_buf)); + r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, "", 0, + 0, out, sizeof(out)/sizeof(CHAR), NULL); + ok(!memcmp(out, init_buf, sizeof(init_buf)) || + broken(!strcmp("", out)), /* Win9x */ + "Expected the buffer to be untouched\n"); + ok(r==0, "succeeded: r=%d\n", r); + ok(GetLastError()==0xdeadbeef, + "last error %u\n", GetLastError()); + /* format placeholder with no specifier */ SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); @@ -898,6 +939,15 @@ static void test_message_allocate_buffer(void) * in any case be safe for FormatMessageA to allocate in the manner that * MSDN suggests. */ + SetLastError(0xdeadbeef); + buf = (char *)0xdeadbeef; + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, + "", 0, 0, (char *)&buf, 0, NULL); + ok(ret == 0, "Expected FormatMessageA to return 0, got %u\n", ret); + ok(buf == NULL, "Expected output buffer pointer to be NULL\n"); + ok(GetLastError() == 0xdeadbeef, + "Expected last error to be untouched, got %u\n", GetLastError()); + buf = (char *)0xdeadbeef; ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, "test", 0, 0, (char *)&buf, 0, NULL); @@ -966,6 +1016,7 @@ static void test_message_allocate_buffer(void) static void test_message_allocate_buffer_wide(void) { + static const WCHAR empty[] = {0}; static const WCHAR test[] = {'t','e','s','t',0}; DWORD ret; @@ -979,13 +1030,29 @@ static void test_message_allocate_buffer_wide(void) return; } - /* While MSDN suggests that FormatMessageA allocates a buffer whose size is + /* While MSDN suggests that FormatMessageW allocates a buffer whose size is * the larger of the output string and the requested buffer size, the tests * will not try to determine the actual size of the buffer allocated, as * the return value of LocalSize cannot be trusted for the purpose, and it should - * in any case be safe for FormatMessageA to allocate in the manner that + * in any case be safe for FormatMessageW to allocate in the manner that * MSDN suggests. */ + if (0) /* crashes on Windows */ + { + buf = (WCHAR *)0xdeadbeef; + ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, + NULL, 0, 0, (WCHAR *)&buf, 0, NULL); + } + + SetLastError(0xdeadbeef); + buf = (WCHAR *)0xdeadbeef; + ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, + empty, 0, 0, (WCHAR *)&buf, 0, NULL); + ok(ret == 0, "Expected FormatMessageW to return 0, got %u\n", ret); + ok(buf == NULL, "Expected output buffer pointer to be NULL\n"); + ok(GetLastError() == 0xdeadbeef, + "Expected last error to be untouched, got %u\n", GetLastError()); + buf = (WCHAR *)0xdeadbeef; ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, test, 0, 0, (WCHAR *)&buf, 0, NULL);

1 0

Andrew Nguyen : kernel32: Handle some escape sequences with FORMAT_MESSAGE_IGNORE_INSERTS in FormatMessageA /W.
by Alexandre Julliard 28 Apr '10

28 Apr '10

Module: wine Branch: master Commit: 5505ae978b08ed5facd6bf953c646ab51de6d356 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5505ae978b08ed5facd6bf953… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Apr 28 04:20:35 2010 -0500 kernel32: Handle some escape sequences with FORMAT_MESSAGE_IGNORE_INSERTS in FormatMessageA/W. --- dlls/kernel32/format_msg.c | 37 +++++++++++- dlls/kernel32/tests/format_msg.c | 124 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 159 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index 185c459..a66cb9b 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -286,8 +286,41 @@ static LPWSTR format_message( BOOL unicode_caller, DWORD dwFlags, LPCWSTR fmtstr f = fmtstr; if (dwFlags & FORMAT_MESSAGE_IGNORE_INSERTS) { - while (*f && !eos) - ADD_TO_T(*f++); + while (*f && !eos) { + if (*f=='%') { + f++; + switch (*f) + { + case '0': + eos = TRUE; + f++; + break; + case 'n': + ADD_TO_T('\r'); + ADD_TO_T('\n'); + f++; + break; + case 'r': + ADD_TO_T('\r'); + f++; + break; + case 't': + ADD_TO_T('\t'); + f++; + break; + case '\0': + SetLastError(ERROR_INVALID_PARAMETER); + HeapFree(GetProcessHeap(), 0, target); + return NULL; + default: + ADD_TO_T('%'); + ADD_TO_T(*f++); + break; + } + } + else + ADD_TO_T(*f++); + } } else { while (*f && !eos) { diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 9021c09..1bf1188 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -730,6 +730,128 @@ static void test_message_from_string(void) ok(r==2,"failed: r=%d\n",r); } +static void test_message_ignore_inserts(void) +{ + static const char init_buf[] = {'x', 'x', 'x', 'x', 'x'}; + + DWORD ret; + CHAR out[256]; + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, "test", 0, 0, out, + sizeof(out)/sizeof(CHAR), NULL); + ok(ret == 4, "Expected FormatMessageA to return 4, got %d\n", ret); + ok(!strcmp("test", out), "Expected output string \"test\", got %s\n", out); + + /* The %0 escape sequence is handled. */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, "test%0", 0, 0, out, + sizeof(out)/sizeof(CHAR), NULL); + ok(ret == 4, "Expected FormatMessageA to return 4, got %d\n", ret); + ok(!strcmp("test", out), "Expected output string \"test\", got %s\n", out); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, "test%0test", 0, 0, out, + sizeof(out)/sizeof(CHAR), NULL); + ok(ret == 4, "Expected FormatMessageA to return 4, got %d\n", ret); + ok(!strcmp("test", out), "Expected output string \"test\", got %s\n", out); + + /* While FormatMessageA returns 0 in this case, no last error code is set. */ + SetLastError(0xdeadbeef); + memcpy(out, init_buf, sizeof(init_buf)); + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, "%0test", 0, 0, out, + sizeof(out)/sizeof(CHAR), NULL); + ok(ret == 0, "Expected FormatMessageA to return 0, got %d\n", ret); + ok(!memcmp(out, init_buf, sizeof(init_buf)) || + broken(!strcmp("", out)), /* Win9x */ + "Expected the output buffer to be untouched\n"); + ok(GetLastError() == 0xdeadbeef, "Expected GetLastError() to return 0xdeadbeef, got %u\n", GetLastError()); + + /* Insert sequences are ignored. */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, "test%1%2!*.*s!%99", 0, 0, out, + sizeof(out)/sizeof(CHAR), NULL); + ok(ret == 17, "Expected FormatMessageA to return 17, got %d\n", ret); + ok(!strcmp("test%1%2!*.*s!%99", out), "Expected output string \"test%%1%%2!*.*s!%%99\", got %s\n", out); + + /* Only the "%n", "%r", and "%t" escape sequences are processed. */ + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, "%%% %.%!", 0, 0, out, + sizeof(out)/sizeof(CHAR), NULL); + ok(ret == 8 || + broken(ret == 7) /* Win9x */, + "Expected FormatMessageA to return 8, got %d\n", ret); + ok(!strcmp("%%% %.%!", out) || + broken(!strcmp("%%% %.!", out)) /* Win9x */, + "Expected output string \"%%%%%% %%.%%!\", got %s\n", out); + + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, "%n%r%t", 0, 0, out, + sizeof(out)/sizeof(CHAR), NULL); + ok(ret == 4, "Expected FormatMessageA to return 4, got %d\n", ret); + ok(!strcmp("\r\n\r\t", out), "Expected output string \"\\r\\n\\r\\t\", got %s\n", out); +} + +static void test_message_ignore_inserts_wide(void) +{ + static const WCHAR test[] = {'t','e','s','t',0}; + static const WCHAR empty[] = {0}; + static const WCHAR fmt_t0[] = {'t','e','s','t','%','0',0}; + static const WCHAR fmt_t0t[] = {'t','e','s','t','%','0','t','e','s','t',0}; + static const WCHAR fmt_0t[] = {'%','0','t','e','s','t',0}; + static const WCHAR fmt_t12oos99[] = {'t','e','s','t','%','1','%','2','!','*','.','*','s','!','%','9','9',0}; + static const WCHAR fmt_pctspacedot[] = {'%','%','%',' ','%','.','%','!',0}; + static const WCHAR fmt_nrt[] = {'%','n','%','r','%','t',0}; + + static const WCHAR s_nrt[] = {'\r','\n','\r','\t',0}; + + DWORD ret; + WCHAR out[256]; + + SetLastError(0xdeadbeef); + ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, NULL, 0, 0, NULL, 0, NULL); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("FormatMessageW is not implemented\n"); + return; + } + + ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, test, 0, 0, out, + sizeof(out)/sizeof(WCHAR), NULL); + ok(ret == 4, "Expected FormatMessageW to return 4, got %d\n", ret); + ok(!lstrcmpW(test, out), "Expected output string \"test\", got %s\n", wine_dbgstr_w(out)); + + /* The %0 escape sequence is handled. */ + ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, fmt_t0, 0, 0, out, + sizeof(out)/sizeof(WCHAR), NULL); + ok(ret == 4, "Expected FormatMessageW to return 4, got %d\n", ret); + ok(!lstrcmpW(test, out), "Expected output string \"test\", got %s\n", wine_dbgstr_w(out)); + + ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, fmt_t0t, 0, 0, out, + sizeof(out)/sizeof(WCHAR), NULL); + ok(ret == 4, "Expected FormatMessageW to return 4, got %d\n", ret); + ok(!lstrcmpW(test, out), "Expected output string \"test\", got %s\n", wine_dbgstr_w(out)); + + /* While FormatMessageA returns 0 in this case, no last error code is set. */ + SetLastError(0xdeadbeef); + ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, fmt_0t, 0, 0, out, + sizeof(out)/sizeof(WCHAR), NULL); + ok(ret == 0, "Expected FormatMessageW to return 0, got %d\n", ret); + ok(!lstrcmpW(empty, out), "Expected the output buffer to be the empty string, got %s\n", wine_dbgstr_w(out)); + ok(GetLastError() == 0xdeadbeef, "Expected GetLastError() to return 0xdeadbeef, got %u\n", GetLastError()); + + /* Insert sequences are ignored. */ + ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, fmt_t12oos99, 0, 0, out, + sizeof(out)/sizeof(WCHAR), NULL); + ok(ret == 17, "Expected FormatMessageW to return 17, got %d\n", ret); + ok(!lstrcmpW(fmt_t12oos99, out), "Expected output string \"test%%1%%2!*.*s!%%99\", got %s\n", wine_dbgstr_w(out)); + + /* Only the "%n", "%r", and "%t" escape sequences are processed. */ + ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, fmt_pctspacedot, 0, 0, out, + sizeof(out)/sizeof(WCHAR), NULL); + ok(ret == 8, "Expected FormatMessageW to return 8, got %d\n", ret); + ok(!lstrcmpW(fmt_pctspacedot, out), "Expected output string \"%%%%%% %%.%%!\", got %s\n", wine_dbgstr_w(out)); + + ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, fmt_nrt, 0, 0, out, + sizeof(out)/sizeof(WCHAR), NULL); + ok(ret == 4, "Expected FormatMessageW to return 4, got %d\n", ret); + ok(!lstrcmpW(s_nrt, out), "Expected output string \"\\r\\n\\r\\t\", got %s\n", wine_dbgstr_w(out)); +} + static void test_message_insufficient_buffer(void) { static const char init_buf[] = {'x', 'x', 'x', 'x', 'x'}; @@ -1362,6 +1484,8 @@ START_TEST(format_msg) { test_message_from_string(); test_message_from_string_wide(); + test_message_ignore_inserts(); + test_message_ignore_inserts_wide(); test_message_insufficient_buffer(); test_message_insufficient_buffer_wide(); test_message_null_buffer();

1 0

Andrew Nguyen : kernel32/tests: Centralize the FormatMessageW skip detection.
by Alexandre Julliard 28 Apr '10

28 Apr '10

Module: wine Branch: master Commit: e724f6aa28be9590f61749f017350975253a4790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e724f6aa28be9590f61749f01… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Apr 28 04:20:39 2010 -0500 kernel32/tests: Centralize the FormatMessageW skip detection. --- dlls/kernel32/tests/format_msg.c | 71 ++++++++----------------------------- 1 files changed, 16 insertions(+), 55 deletions(-) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 1bf1188..24dfd3b 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -130,15 +130,6 @@ static void test_message_from_string_wide(void) WCHAR out[0x100] = {0}; DWORD r, error; - SetLastError(0xdeadbeef); - r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, NULL, 0, 0, NULL, 0, NULL); - error = GetLastError(); - if (!r && error == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("FormatMessageW is not implemented\n"); - return; - } - /* the basics */ r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, test, 0, 0, out, sizeof(out)/sizeof(WCHAR), NULL); @@ -802,14 +793,6 @@ static void test_message_ignore_inserts_wide(void) DWORD ret; WCHAR out[256]; - SetLastError(0xdeadbeef); - ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, NULL, 0, 0, NULL, 0, NULL); - if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("FormatMessageW is not implemented\n"); - return; - } - ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, test, 0, 0, out, sizeof(out)/sizeof(WCHAR), NULL); ok(ret == 4, "Expected FormatMessageW to return 4, got %d\n", ret); @@ -902,14 +885,6 @@ static void test_message_insufficient_buffer_wide(void) WCHAR out[5]; SetLastError(0xdeadbeef); - ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, NULL, 0, 0, NULL, 0, NULL); - if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("FormatMessageW is not implemented\n"); - return; - } - - SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, test, 0, 0, out, 0, NULL); ok(ret == 0, "Expected FormatMessageA to return 0, got %u\n", ret); @@ -1006,15 +981,6 @@ static void test_message_null_buffer_wide(void) SetLastError(0xdeadbeef); ret = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, 0, 0, NULL, 0, NULL); error = GetLastError(); - if (!ret && error == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("FormatMessageW is not implemented\n"); - return; - } - - SetLastError(0xdeadbeef); - ret = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, 0, 0, NULL, 0, NULL); - error = GetLastError(); ok(!ret, "FormatMessageW returned %u\n", ret); ok(error == ERROR_INVALID_PARAMETER, "last error %u\n", error); @@ -1144,14 +1110,6 @@ static void test_message_allocate_buffer_wide(void) DWORD ret; WCHAR *buf; - SetLastError(0xdeadbeef); - ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, NULL, 0, 0, NULL, 0, NULL); - if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("FormatMessageW is not implemented\n"); - return; - } - /* While MSDN suggests that FormatMessageW allocates a buffer whose size is * the larger of the output string and the requested buffer size, the tests * will not try to determine the actual size of the buffer allocated, as @@ -1397,14 +1355,6 @@ static void test_message_invalid_flags_wide(void) WCHAR *ptr; SetLastError(0xdeadbeef); - ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, NULL, 0, 0, NULL, 0, NULL); - if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("FormatMessageW is not implemented\n"); - return; - } - - SetLastError(0xdeadbeef); memcpy(out, init_buf, sizeof(init_buf)); ret = FormatMessageW(0, test, 0, 0, out, sizeof(out)/sizeof(WCHAR), NULL); ok(ret == 0, "Expected FormatMessageW to return 0, got %u\n", ret); @@ -1482,17 +1432,28 @@ static void test_message_invalid_flags_wide(void) START_TEST(format_msg) { + DWORD ret; + test_message_from_string(); - test_message_from_string_wide(); test_message_ignore_inserts(); - test_message_ignore_inserts_wide(); test_message_insufficient_buffer(); - test_message_insufficient_buffer_wide(); test_message_null_buffer(); - test_message_null_buffer_wide(); test_message_allocate_buffer(); - test_message_allocate_buffer_wide(); test_message_from_hmodule(); test_message_invalid_flags(); + + SetLastError(0xdeadbeef); + ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, NULL, 0, 0, NULL, 0, NULL); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("FormatMessageW is not implemented\n"); + return; + } + + test_message_from_string_wide(); + test_message_ignore_inserts_wide(); + test_message_insufficient_buffer_wide(); + test_message_null_buffer_wide(); + test_message_allocate_buffer_wide(); test_message_invalid_flags_wide(); }

1 0

Andrew Nguyen : kernel32: Remove a superfluous function call in the format_insert helper.
by Alexandre Julliard 28 Apr '10

28 Apr '10

Module: wine Branch: master Commit: 1d18b890a6f7eefcdc978285e1cc0b57275afb85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d18b890a6f7eefcdc978285e… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Apr 28 04:20:41 2010 -0500 kernel32: Remove a superfluous function call in the format_insert helper. --- dlls/kernel32/format_msg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index a66cb9b..d610573 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -144,7 +144,7 @@ static LPCWSTR format_insert( BOOL unicode_caller, int insert, LPCWSTR format, } else { - char *str = (char *)get_arg( insert, flags, args ); + char *str = (char *)arg; DWORD length = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); *result = HeapAlloc( GetProcessHeap(), 0, length * sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, str, -1, *result, length );

1 0

Andrew Nguyen : kernel32: Process CRLF escape sequences in normal insert sequence processing path in FormatMessageA /W.
by Alexandre Julliard 28 Apr '10

28 Apr '10

Module: wine Branch: master Commit: 722fd58446b67e57fe1082667c46f008e4edf783 URL: http://source.winehq.org/git/wine.git/?a=commit;h=722fd58446b67e57fe1082667… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Apr 28 04:20:44 2010 -0500 kernel32: Process CRLF escape sequences in normal insert sequence processing path in FormatMessageA/W. --- dlls/kernel32/format_msg.c | 8 ++++++++ dlls/kernel32/tests/format_msg.c | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index d610573..c93514f 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -360,6 +360,14 @@ static LPWSTR format_message( BOOL unicode_caller, DWORD dwFlags, LPCWSTR fmtstr ADD_TO_T('\n'); f++; break; + case 'r': + ADD_TO_T('\r'); + f++; + break; + case 't': + ADD_TO_T('\t'); + f++; + break; case '0': eos = TRUE; f++; diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 24dfd3b..397665c 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -84,6 +84,7 @@ static void test_message_from_string_wide(void) static const WCHAR fmt_t0t[] = {'t','e','s','t','%','0','t','e','s','t',0}; static const WCHAR fmt_yah[] = {'y','a','h','%','!','%','0',' ',' ',' ',0}; static const WCHAR fmt_space[] = {'%',' ','%',' ',' ',' ',0}; + static const WCHAR fmt_nrt[] = {'%','n','%','r','%','t',0}; static const WCHAR fmt_hi_lf[] = {'h','i','\n',0}; static const WCHAR fmt_hi_crlf[] = {'h','i','\r','\n',0}; static const WCHAR fmt_cr[] = {'\r',0}; @@ -108,6 +109,7 @@ static void test_message_from_string_wide(void) static const WCHAR s_2dot147[] = {' ','.','.',' ',' ','4','2','7',0}; static const WCHAR s_yah[] = {'y','a','h','!',0}; static const WCHAR s_space[] = {' ',' ',' ',' ',0}; + static const WCHAR s_nrt[] = {'\r','\n','\r','\t',0}; static const WCHAR s_hi_crlf[] = {'h','i','\r','\n',0}; static const WCHAR s_crlf[] = {'\r','\n',0}; static const WCHAR s_crlfcrlf[] = {'\r','\n','\r','\n',0}; @@ -327,6 +329,12 @@ static void test_message_from_string_wide(void) ok(!lstrcmpW(s_space, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4,"failed: r=%d\n", r); + /* %n yields \r\n, %r yields \r, %t yields \t */ + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_nrt, 0, + 0, out, sizeof(out)/sizeof(WCHAR)); + ok(!lstrcmpW(s_nrt, out), "failed out=%s\n", wine_dbgstr_w(out)); + ok(r==4,"failed: r=%d\n", r); + /* line feed */ r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_hi_lf, 0, 0, out, sizeof(out)/sizeof(WCHAR)); @@ -624,6 +632,12 @@ static void test_message_from_string(void) ok(!strcmp(" ", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); + /* %n yields \r\n, %r yields \r, %t yields \t */ + r = doit(FORMAT_MESSAGE_FROM_STRING, "%n%r%t", 0, + 0, out, sizeof(out)/sizeof(CHAR)); + ok(!strcmp("\r\n\r\t", out),"failed out=[%s]\n",out); + ok(r==4,"failed: r=%d\n",r); + /* line feed */ r = doit(FORMAT_MESSAGE_FROM_STRING, "hi\n", 0, 0, out, sizeof(out)/sizeof(CHAR));

1 0

Andrew Nguyen : kernel32: Merge the insertion and non-insertion codepaths in the format_message helper together to share common functionality .
by Alexandre Julliard 28 Apr '10

28 Apr '10

Module: wine Branch: master Commit: 57636255efd1b5bf5f18b2053227dc48898ba5dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=57636255efd1b5bf5f18b2053… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Apr 28 04:20:48 2010 -0500 kernel32: Merge the insertion and non-insertion codepaths in the format_message helper together to share common functionality. --- dlls/kernel32/format_msg.c | 162 +++++++++++++++----------------------- dlls/kernel32/tests/format_msg.c | 106 +++++++++++++++++++++++++ 2 files changed, 169 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=57636255efd1b5bf5f18b…

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_init_sysmem().
by Alexandre Julliard 28 Apr '10

28 Apr '10

Module: wine Branch: master Commit: 23a377f02b82a39605cc0735130b315a4c3b7bf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23a377f02b82a39605cc07351… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 28 00:08:48 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_init_sysmem(). --- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 25 +++++++++++++------------ dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 062fb20..a2b2c3e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6234,7 +6234,7 @@ static HRESULT updateSurfaceDesc(IWineD3DSurfaceImpl *surface, const WINED3DPRES /* Put all surfaces into sysmem - the drawable might disappear if the backbuffer was rendered * to a FBO */ - if(!surface_init_sysmem((IWineD3DSurface *) surface)) + if (!surface_init_sysmem(surface)) { return E_OUTOFMEMORY; } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fcdfec8..d3fe566 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1141,27 +1141,26 @@ static void surface_remove_pbo(IWineD3DSurfaceImpl *This, const struct wined3d_g This->Flags &= ~SFLAG_PBO; } -BOOL surface_init_sysmem(IWineD3DSurface *iface) +BOOL surface_init_sysmem(IWineD3DSurfaceImpl *surface) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; - - if(!This->resource.allocatedMemory) + if (!surface->resource.allocatedMemory) { - This->resource.heapMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->resource.size + RESOURCE_ALIGNMENT); - if(!This->resource.heapMemory) + surface->resource.heapMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + surface->resource.size + RESOURCE_ALIGNMENT); + if (!surface->resource.heapMemory) { ERR("Out of memory\n"); return FALSE; } - This->resource.allocatedMemory = - (BYTE *)(((ULONG_PTR) This->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); + surface->resource.allocatedMemory = + (BYTE *)(((ULONG_PTR)surface->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); } else { - memset(This->resource.allocatedMemory, 0, This->resource.size); + memset(surface->resource.allocatedMemory, 0, surface->resource.size); } - IWineD3DSurface_ModifyLocation(iface, SFLAG_INSYSMEM, TRUE); + IWineD3DSurface_ModifyLocation((IWineD3DSurface *)surface, SFLAG_INSYSMEM, TRUE); return TRUE; } @@ -1186,8 +1185,10 @@ static void WINAPI IWineD3DSurfaceImpl_UnLoad(IWineD3DSurface *iface) { * or the depth stencil into an FBO the texture or render buffer will be removed * and all flags get lost */ - surface_init_sysmem(iface); - } else { + surface_init_sysmem(This); + } + else + { /* Load the surface into system memory */ IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL); IWineD3DSurface_ModifyLocation(iface, SFLAG_INDRAWABLE, FALSE); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 70ecb22..3e54ad8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1873,7 +1873,7 @@ typedef struct IWineD3DBaseTextureClass } IWineD3DBaseTextureClass; void surface_internal_preload(IWineD3DSurfaceImpl *surface, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN; -BOOL surface_init_sysmem(IWineD3DSurface *iface) DECLSPEC_HIDDEN; +BOOL surface_init_sysmem(IWineD3DSurfaceImpl *surface) DECLSPEC_HIDDEN; BOOL surface_is_offscreen(IWineD3DSurfaceImpl *iface) DECLSPEC_HIDDEN; void surface_prepare_texture(IWineD3DSurfaceImpl *surface, const struct wined3d_gl_info *gl_info, BOOL srgb) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_release_client_storage ().
by Alexandre Julliard 28 Apr '10

28 Apr '10

Module: wine Branch: master Commit: 0d86323778d7e456f64cbacedb3b2098b0ba8da3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d86323778d7e456f64cbaced… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 28 00:08:49 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_release_client_storage(). --- dlls/wined3d/surface.c | 39 ++++++++++++++++++--------------------- 1 files changed, 18 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d3fe566..2e2a925 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1993,35 +1993,34 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { return WINED3D_OK; } -static void surface_release_client_storage(IWineD3DSurface *iface) +static void surface_release_client_storage(IWineD3DSurfaceImpl *surface) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; struct wined3d_context *context; - context = context_acquire(This->resource.device, NULL, CTXUSAGE_RESOURCELOAD); + context = context_acquire(surface->resource.device, NULL, CTXUSAGE_RESOURCELOAD); ENTER_GL(); glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE); - if(This->texture_name) + if (surface->texture_name) { - surface_bind_and_dirtify(This, FALSE); - glTexImage2D(This->texture_target, This->texture_level, - GL_RGB, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL); + surface_bind_and_dirtify(surface, FALSE); + glTexImage2D(surface->texture_target, surface->texture_level, + GL_RGB, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL); } - if(This->texture_name_srgb) + if (surface->texture_name_srgb) { - surface_bind_and_dirtify(This, TRUE); - glTexImage2D(This->texture_target, This->texture_level, - GL_RGB, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL); + surface_bind_and_dirtify(surface, TRUE); + glTexImage2D(surface->texture_target, surface->texture_level, + GL_RGB, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL); } glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE); LEAVE_GL(); context_release(context); - IWineD3DSurface_ModifyLocation(iface, SFLAG_INSRGBTEX, FALSE); - IWineD3DSurface_ModifyLocation(iface, SFLAG_INTEXTURE, FALSE); - surface_force_reload(This); + IWineD3DSurface_ModifyLocation((IWineD3DSurface *)surface, SFLAG_INSRGBTEX, FALSE); + IWineD3DSurface_ModifyLocation((IWineD3DSurface *)surface, SFLAG_INTEXTURE, FALSE); + surface_force_reload(surface); } static HRESULT WINAPI IWineD3DSurfaceImpl_GetDC(IWineD3DSurface *iface, HDC *pHDC) @@ -2052,7 +2051,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_GetDC(IWineD3DSurface *iface, HDC *pHD if(!This->hDC) { if(This->Flags & SFLAG_CLIENT) { IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL); - surface_release_client_storage(iface); + surface_release_client_storage(This); } hr = IWineD3DBaseSurfaceImpl_CreateDIBSection(iface); if(FAILED(hr)) return WINED3DERR_INVALIDCALL; @@ -2828,9 +2827,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *M IWineD3DSurface_ModifyLocation(iface, SFLAG_INSYSMEM, TRUE); /* For client textures opengl has to be notified */ - if(This->Flags & SFLAG_CLIENT) { - surface_release_client_storage(iface); - } + if (This->Flags & SFLAG_CLIENT) + surface_release_client_storage(This); /* Now free the old memory if any */ HeapFree(GetProcessHeap(), 0, release); @@ -2841,9 +2839,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *M if(This->resource.heapMemory != NULL) ERR("User pointer surface has heap memory allocated\n"); This->Flags &= ~SFLAG_USERPTR; - if(This->Flags & SFLAG_CLIENT) { - surface_release_client_storage(iface); - } + if (This->Flags & SFLAG_CLIENT) + surface_release_client_storage(This); } return WINED3D_OK; }

1 0

Henri Verbeet : wined3d: Introduce device_get_draw_rect() to calculate the effective viewport.
by Alexandre Julliard 28 Apr '10

28 Apr '10

Module: wine Branch: master Commit: 772fe683fa9021959430e48b84d7c908974268cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=772fe683fa9021959430e48b8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 28 00:08:50 2010 +0200 wined3d: Introduce device_get_draw_rect() to calculate the effective viewport. --- dlls/wined3d/device.c | 108 +++++++++++++++++++++++++----------------------- 1 files changed, 56 insertions(+), 52 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a2b2c3e..8e9e225 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -563,6 +563,19 @@ void device_context_remove(IWineD3DDeviceImpl *device, struct wined3d_context *c device->contexts = new_array; } +static void device_get_draw_rect(IWineD3DDeviceImpl *device, RECT *rect) +{ + IWineD3DStateBlockImpl *stateblock = device->stateBlock; + WINED3DVIEWPORT *vp = &stateblock->viewport; + + SetRect(rect, vp->X, vp->Y, vp->X + vp->Width, vp->Y + vp->Height); + + if (stateblock->renderState[WINED3DRS_SCISSORTESTENABLE]) + { + IntersectRect(rect, rect, &stateblock->scissorRect); + } +} + void device_switch_onscreen_ds(IWineD3DDeviceImpl *device, struct wined3d_context *context, IWineD3DSurfaceImpl *depth_stencil) { @@ -4341,19 +4354,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Present(IWineD3DDevice *iface, return WINED3D_OK; } -static BOOL is_full_clear(IWineD3DSurfaceImpl *target, const WINED3DVIEWPORT *viewport, - const RECT *scissor_rect, const WINED3DRECT *clear_rect) +static BOOL is_full_clear(IWineD3DSurfaceImpl *target, const RECT *draw_rect, const WINED3DRECT *clear_rect) { - /* partial viewport*/ - if (viewport->X != 0 || viewport->Y != 0 - || viewport->Width < target->currentDesc.Width - || viewport->Height < target->currentDesc.Height) - return FALSE; - - /* partial scissor rect */ - if (scissor_rect && (scissor_rect->left > 0 || scissor_rect->top > 0 - || scissor_rect->right < target->currentDesc.Width - || scissor_rect->bottom < target->currentDesc.Height)) + /* partial draw rect */ + if (draw_rect->left || draw_rect->top + || draw_rect->right < target->currentDesc.Width + || draw_rect->bottom < target->currentDesc.Height) return FALSE; /* partial clear rect */ @@ -4369,17 +4375,15 @@ static BOOL is_full_clear(IWineD3DSurfaceImpl *target, const WINED3DVIEWPORT *vi HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *target, DWORD Count, const WINED3DRECT *pRects, DWORD Flags, WINED3DCOLOR Color, float Z, DWORD Stencil) { - IWineD3DStateBlockImpl *stateblock = This->stateBlock; - const RECT *scissor_rect = stateblock->renderState[WINED3DRS_SCISSORTESTENABLE] ? &stateblock->scissorRect : NULL; const WINED3DRECT *clear_rect = (Count > 0 && pRects) ? pRects : NULL; IWineD3DSurfaceImpl *depth_stencil = This->depth_stencil; - const WINED3DVIEWPORT *vp = &stateblock->viewport; GLbitfield glMask = 0; unsigned int i; - WINED3DRECT curRect; - RECT vp_rect; UINT drawable_width, drawable_height; struct wined3d_context *context; + RECT draw_rect; + + device_get_draw_rect(This, &draw_rect); /* When we're clearing parts of the drawable, make sure that the target surface is well up to date in the * drawable. After the clear we'll mark the drawable up to date, so we have to make sure that this is true @@ -4392,7 +4396,7 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac */ if (Flags & WINED3DCLEAR_TARGET && !(target->Flags & SFLAG_INDRAWABLE)) { - if (!is_full_clear(target, vp, scissor_rect, clear_rect)) + if (!is_full_clear(target, &draw_rect, clear_rect)) IWineD3DSurface_LoadLocation((IWineD3DSurface *)target, SFLAG_INDRAWABLE, NULL); } @@ -4453,7 +4457,7 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac if (location == SFLAG_DS_ONSCREEN && depth_stencil != This->onscreen_depth_stencil) device_switch_onscreen_ds(This, context, depth_stencil); - if (!(depth_stencil->Flags & location) && !is_full_clear(depth_stencil, vp, scissor_rect, clear_rect)) + if (!(depth_stencil->Flags & location) && !is_full_clear(depth_stencil, &draw_rect, clear_rect)) surface_load_ds_location(depth_stencil, context, location); surface_modify_ds_location(depth_stencil, location); @@ -4478,54 +4482,54 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac glMask = glMask | GL_COLOR_BUFFER_BIT; } - vp_rect.left = vp->X; - vp_rect.top = vp->Y; - vp_rect.right = vp->X + vp->Width; - vp_rect.bottom = vp->Y + vp->Height; - if (!(Count > 0 && pRects)) { - if(This->stateBlock->renderState[WINED3DRS_SCISSORTESTENABLE]) { - IntersectRect(&vp_rect, &vp_rect, &This->stateBlock->scissorRect); - } + if (!clear_rect) + { if (context->render_offscreen) { - glScissor(vp_rect.left, vp_rect.top, - vp_rect.right - vp_rect.left, vp_rect.bottom - vp_rect.top); - } else { - glScissor(vp_rect.left, drawable_height - vp_rect.bottom, - vp_rect.right - vp_rect.left, vp_rect.bottom - vp_rect.top); + glScissor(draw_rect.left, draw_rect.top, + draw_rect.right - draw_rect.left, draw_rect.bottom - draw_rect.top); + } + else + { + glScissor(draw_rect.left, drawable_height - draw_rect.bottom, + draw_rect.right - draw_rect.left, draw_rect.bottom - draw_rect.top); } checkGLcall("glScissor"); glClear(glMask); checkGLcall("glClear"); - } else { - /* Now process each rect in turn */ - for (i = 0; i < Count; i++) { + } + else + { + RECT current_rect; + + /* Now process each rect in turn. */ + for (i = 0; i < Count; ++i) + { /* Note gl uses lower left, width/height */ - IntersectRect((RECT *)&curRect, &vp_rect, (const RECT *)&pRects[i]); - if(This->stateBlock->renderState[WINED3DRS_SCISSORTESTENABLE]) { - IntersectRect((RECT *) &curRect, (RECT *) &curRect, &This->stateBlock->scissorRect); - } - TRACE("(%p) Rect=(%d,%d)->(%d,%d) glRect=(%d,%d), len=%d, hei=%d\n", This, - pRects[i].x1, pRects[i].y1, pRects[i].x2, pRects[i].y2, - curRect.x1, (target->currentDesc.Height - curRect.y2), - curRect.x2 - curRect.x1, curRect.y2 - curRect.y1); + IntersectRect(&current_rect, &draw_rect, (const RECT *)&clear_rect[i]); + + TRACE("clear_rect[%u] %s, current_rect %s.\n", i, + wine_dbgstr_rect((const RECT *)&clear_rect[i]), + wine_dbgstr_rect(&current_rect)); /* Tests show that rectangles where x1 > x2 or y1 > y2 are ignored silently. * The rectangle is not cleared, no error is returned, but further rectanlges are - * still cleared if they are valid - */ - if(curRect.x1 > curRect.x2 || curRect.y1 > curRect.y2) { - TRACE("Rectangle with negative dimensions, ignoring\n"); + * still cleared if they are valid. */ + if (current_rect.left > current_rect.right || current_rect.top > current_rect.bottom) + { + TRACE("Rectangle with negative dimensions, ignoring.\n"); continue; } if (context->render_offscreen) { - glScissor(curRect.x1, curRect.y1, - curRect.x2 - curRect.x1, curRect.y2 - curRect.y1); - } else { - glScissor(curRect.x1, drawable_height - curRect.y2, - curRect.x2 - curRect.x1, curRect.y2 - curRect.y1); + glScissor(current_rect.left, current_rect.top, + current_rect.right - current_rect.left, current_rect.bottom - current_rect.top); + } + else + { + glScissor(current_rect.left, drawable_height - current_rect.bottom, + current_rect.right - current_rect.left, current_rect.bottom - current_rect.top); } checkGLcall("glScissor");

1 0