January 2011 - Wine-commits

Andrew Nguyen : kernel32: Fail with an invalid output parameter in GetNumberOfConsoleInputEvents.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 3501b0a580185bf2c6f649efe35500fc3648e80a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3501b0a580185bf2c6f649efe… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Jan 3 21:27:40 2011 -0600 kernel32: Fail with an invalid output parameter in GetNumberOfConsoleInputEvents. --- dlls/kernel32/console.c | 8 +++++- dlls/kernel32/tests/console.c | 54 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 97eae17..a442657 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -992,7 +992,13 @@ BOOL WINAPI GetNumberOfConsoleInputEvents( HANDLE handle, LPDWORD nrofevents ) req->flush = FALSE; if ((ret = !wine_server_call_err( req ))) { - if (nrofevents) *nrofevents = reply->read; + if (nrofevents) + *nrofevents = reply->read; + else + { + SetLastError(ERROR_INVALID_ACCESS); + ret = FALSE; + } } } SERVER_END_REQ; diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index da446a1..a1388ed 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1168,6 +1168,59 @@ static void test_GetSetStdHandle(void) ok(error == 0xdeadbeef, "wrong GetLastError() %d\n", error); } +static void test_GetNumberOfConsoleInputEvents(HANDLE input_handle) +{ + DWORD count; + BOOL ret; + int i; + + const struct + { + HANDLE handle; + LPDWORD nrofevents; + DWORD last_error; + } invalid_table[] = + { + {NULL, NULL, ERROR_INVALID_HANDLE}, + {NULL, &count, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, NULL, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, &count, ERROR_INVALID_HANDLE}, + }; + + for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++) + { + SetLastError(0xdeadbeef); + if (invalid_table[i].nrofevents) count = 0xdeadbeef; + ret = GetNumberOfConsoleInputEvents(invalid_table[i].handle, + invalid_table[i].nrofevents); + ok(!ret, "[%d] Expected GetNumberOfConsoleInputEvents to return FALSE, got %d\n", i, ret); + if (invalid_table[i].nrofevents) + { + ok(count == 0xdeadbeef, + "[%d] Expected output count to be unmodified, got %u\n", i, count); + } + ok(GetLastError() == invalid_table[i].last_error, + "[%d] Expected last error to be %u, got %u\n", + i, invalid_table[i].last_error, GetLastError()); + } + + /* Test crashes on Windows 7. */ + if (0) + { + SetLastError(0xdeadbeef); + ret = GetNumberOfConsoleInputEvents(input_handle, NULL); + ok(!ret, "Expected GetNumberOfConsoleInputEvents to return FALSE, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_ACCESS, + "Expected last error to be ERROR_INVALID_ACCESS, got %u\n", + GetLastError()); + } + + count = 0xdeadbeef; + ret = GetNumberOfConsoleInputEvents(input_handle, &count); + ok(ret == TRUE, "Expected GetNumberOfConsoleInputEvents to return TRUE, got %d\n", ret); + ok(count != 0xdeadbeef, "Expected output count to initialized\n"); +} + START_TEST(console) { HANDLE hConIn, hConOut; @@ -1221,4 +1274,5 @@ START_TEST(console) test_OpenConsoleW(); test_VerifyConsoleIoHandle(hConOut); test_GetSetStdHandle(); + test_GetNumberOfConsoleInputEvents(hConIn); }

1 0

Andrew Nguyen : kernel32: Improve parameter validation for WriteConsoleInputW.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 0272da5afacad1278731482599317c95b33b53a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0272da5afacad127873148259… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Jan 3 21:25:16 2011 -0600 kernel32: Improve parameter validation for WriteConsoleInputW. --- dlls/kernel32/console.c | 18 +++++++- dlls/kernel32/tests/console.c | 91 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index a442657..ab0fbe2 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -504,20 +504,32 @@ BOOL WINAPI WriteConsoleInputA( HANDLE handle, const INPUT_RECORD *buffer, BOOL WINAPI WriteConsoleInputW( HANDLE handle, const INPUT_RECORD *buffer, DWORD count, LPDWORD written ) { + DWORD events_written = 0; BOOL ret; TRACE("(%p,%p,%d,%p)\n", handle, buffer, count, written); - if (written) *written = 0; + if (count > 0 && !buffer) + { + SetLastError(ERROR_INVALID_ACCESS); + return FALSE; + } + SERVER_START_REQ( write_console_input ) { req->handle = console_handle_unmap(handle); wine_server_add_data( req, buffer, count * sizeof(INPUT_RECORD) ); - if ((ret = !wine_server_call_err( req )) && written) - *written = reply->written; + if ((ret = !wine_server_call_err( req ))) + events_written = reply->written; } SERVER_END_REQ; + if (written) *written = events_written; + else + { + SetLastError(ERROR_INVALID_ACCESS); + ret = FALSE; + } return ret; } diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index a1388ed..c3323e1 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1221,6 +1221,96 @@ static void test_GetNumberOfConsoleInputEvents(HANDLE input_handle) ok(count != 0xdeadbeef, "Expected output count to initialized\n"); } +static void test_WriteConsoleInputW(HANDLE input_handle) +{ + INPUT_RECORD event, temp; + MOUSE_EVENT_RECORD mouse_event = { {0, 0}, 0, 0, MOUSE_MOVED }; + DWORD count; + BOOL ret; + int i; + + const struct + { + HANDLE handle; + const INPUT_RECORD *buffer; + DWORD count; + LPDWORD written; + DWORD expected_count; + DWORD last_error; + int win7_crash; + } invalid_table[] = + { + {NULL, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 0, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {NULL, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {NULL, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, &event, 0, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, &event, 1, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 0, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {INVALID_HANDLE_VALUE, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {INVALID_HANDLE_VALUE, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, &event, 0, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, &event, 1, &count, 0, ERROR_INVALID_HANDLE}, + {input_handle, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {input_handle, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {input_handle, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {input_handle, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {input_handle, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + }; + + event.EventType = MOUSE_EVENT; + event.Event.MouseEvent = mouse_event; + + for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++) + { + if (invalid_table[i].win7_crash) + continue; + + SetLastError(0xdeadbeef); + if (invalid_table[i].written) count = 0xdeadbeef; + ret = WriteConsoleInputW(invalid_table[i].handle, + invalid_table[i].buffer, + invalid_table[i].count, + invalid_table[i].written); + ok(!ret, "[%d] Expected WriteConsoleInputW to return FALSE, got %d\n", i, ret); + if (invalid_table[i].written) + { + ok(count == invalid_table[i].expected_count, + "[%d] Expected output count to be %u, got %u\n", + i, invalid_table[i].expected_count, count); + } + ok(GetLastError() == invalid_table[i].last_error, + "[%d] Expected last error to be %u, got %u\n", + i, invalid_table[i].last_error, GetLastError()); + } + + count = 0xdeadbeef; + ret = WriteConsoleInputW(input_handle, NULL, 0, &count); + ok(ret == TRUE, "Expected WriteConsoleInputW to return TRUE, got %d\n", ret); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + count = 0xdeadbeef; + ret = WriteConsoleInputW(input_handle, &event, 0, &count); + ok(ret == TRUE, "Expected WriteConsoleInputW to return TRUE, got %d\n", ret); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + count = 0xdeadbeef; + ret = WriteConsoleInputW(input_handle, &event, 1, &count); + ok(ret == TRUE, "Expected WriteConsoleInputW to return TRUE, got %d\n", ret); + ok(count == 1, "Expected count to be 1, got %u\n", count); + + /* Discard the queued input event by reading it. */ + count = 0xdeadbeef; + ret = ReadConsoleInputW(input_handle, &temp, 1, &count); + ok(ret == TRUE, "Expected ReadConsoleInputW to return TRUE, got %d\n", ret); + ok(count == 1, "Expected count to be 1, got %u\n", count); +} + START_TEST(console) { HANDLE hConIn, hConOut; @@ -1275,4 +1365,5 @@ START_TEST(console) test_VerifyConsoleIoHandle(hConOut); test_GetSetStdHandle(); test_GetNumberOfConsoleInputEvents(hConIn); + test_WriteConsoleInputW(hConIn); }

1 0

Andrew Nguyen : kernel32: Improve parameter validation for WriteConsoleInputA.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 9febdf3f582a3bf443391633bf14297c09d4e088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9febdf3f582a3bf443391633b… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Jan 3 21:25:21 2011 -0600 kernel32: Improve parameter validation for WriteConsoleInputA. --- dlls/kernel32/console.c | 23 +++++++++-- dlls/kernel32/tests/console.c | 91 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index ab0fbe2..571d0cc 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -486,12 +486,27 @@ HANDLE WINAPI GetConsoleInputWaitHandle(void) BOOL WINAPI WriteConsoleInputA( HANDLE handle, const INPUT_RECORD *buffer, DWORD count, LPDWORD written ) { - INPUT_RECORD *recW; + INPUT_RECORD *recW = NULL; BOOL ret; - if (!(recW = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*recW) ))) return FALSE; - memcpy( recW, buffer, count*sizeof(*recW) ); - input_records_AtoW( recW, count ); + if (count > 0) + { + if (!buffer) + { + SetLastError( ERROR_INVALID_ACCESS ); + return FALSE; + } + + if (!(recW = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*recW) ))) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + + memcpy( recW, buffer, count * sizeof(*recW) ); + input_records_AtoW( recW, count ); + } + ret = WriteConsoleInputW( handle, recW, count, written ); HeapFree( GetProcessHeap(), 0, recW ); return ret; diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index c3323e1..2f3ed6e 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1221,6 +1221,96 @@ static void test_GetNumberOfConsoleInputEvents(HANDLE input_handle) ok(count != 0xdeadbeef, "Expected output count to initialized\n"); } +static void test_WriteConsoleInputA(HANDLE input_handle) +{ + INPUT_RECORD event, temp; + MOUSE_EVENT_RECORD mouse_event = { {0, 0}, 0, 0, MOUSE_MOVED }; + DWORD count; + BOOL ret; + int i; + + const struct + { + HANDLE handle; + const INPUT_RECORD *buffer; + DWORD count; + LPDWORD written; + DWORD expected_count; + DWORD last_error; + int win7_crash; + } invalid_table[] = + { + {NULL, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 0, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {NULL, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {NULL, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, &event, 0, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, &event, 1, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 0, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {INVALID_HANDLE_VALUE, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {INVALID_HANDLE_VALUE, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, &event, 0, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, &event, 1, &count, 0, ERROR_INVALID_HANDLE}, + {input_handle, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {input_handle, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {input_handle, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {input_handle, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {input_handle, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + }; + + event.EventType = MOUSE_EVENT; + event.Event.MouseEvent = mouse_event; + + for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++) + { + if (invalid_table[i].win7_crash) + continue; + + SetLastError(0xdeadbeef); + if (invalid_table[i].written) count = 0xdeadbeef; + ret = WriteConsoleInputA(invalid_table[i].handle, + invalid_table[i].buffer, + invalid_table[i].count, + invalid_table[i].written); + ok(!ret, "[%d] Expected WriteConsoleInputA to return FALSE, got %d\n", i, ret); + if (invalid_table[i].written) + { + ok(count == invalid_table[i].expected_count, + "[%d] Expected output count to be %u, got %u\n", + i, invalid_table[i].expected_count, count); + } + ok(GetLastError() == invalid_table[i].last_error, + "[%d] Expected last error to be %u, got %u\n", + i, invalid_table[i].last_error, GetLastError()); + } + + count = 0xdeadbeef; + ret = WriteConsoleInputA(input_handle, NULL, 0, &count); + ok(ret == TRUE, "Expected WriteConsoleInputA to return TRUE, got %d\n", ret); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + count = 0xdeadbeef; + ret = WriteConsoleInputA(input_handle, &event, 0, &count); + ok(ret == TRUE, "Expected WriteConsoleInputA to return TRUE, got %d\n", ret); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + count = 0xdeadbeef; + ret = WriteConsoleInputA(input_handle, &event, 1, &count); + ok(ret == TRUE, "Expected WriteConsoleInputA to return TRUE, got %d\n", ret); + ok(count == 1, "Expected count to be 1, got %u\n", count); + + /* Discard the queued input event by reading it. */ + count = 0xdeadbeef; + ret = ReadConsoleInputA(input_handle, &temp, 1, &count); + ok(ret == TRUE, "Expected ReadConsoleInputA to return TRUE, got %d\n", ret); + ok(count == 1, "Expected count to be 1, got %u\n", count); +} + static void test_WriteConsoleInputW(HANDLE input_handle) { INPUT_RECORD event, temp; @@ -1365,5 +1455,6 @@ START_TEST(console) test_VerifyConsoleIoHandle(hConOut); test_GetSetStdHandle(); test_GetNumberOfConsoleInputEvents(hConIn); + test_WriteConsoleInputA(hConIn); test_WriteConsoleInputW(hConIn); }

1 0

Andrew Nguyen : kernel32: Improve parameter validation for WriteConsoleOutputCharacterW.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 2281c29b46da8a68334dbbce05bf73ec5ddc16bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2281c29b46da8a68334dbbce0… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Jan 3 21:25:26 2011 -0600 kernel32: Improve parameter validation for WriteConsoleOutputCharacterW. --- dlls/kernel32/console.c | 12 ++++- dlls/kernel32/tests/console.c | 85 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 571d0cc..41ac019 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1729,6 +1729,14 @@ BOOL WINAPI WriteConsoleOutputCharacterW( HANDLE hConsoleOutput, LPCWSTR str, DW TRACE("(%p,%s,%d,%dx%d,%p)\n", hConsoleOutput, debugstr_wn(str, length), length, coord.X, coord.Y, lpNumCharsWritten); + if ((length > 0 && !str) || !lpNumCharsWritten) + { + SetLastError(ERROR_INVALID_ACCESS); + return FALSE; + } + + *lpNumCharsWritten = 0; + SERVER_START_REQ( write_console_output ) { req->handle = console_handle_unmap(hConsoleOutput); @@ -1738,9 +1746,7 @@ BOOL WINAPI WriteConsoleOutputCharacterW( HANDLE hConsoleOutput, LPCWSTR str, DW req->wrap = TRUE; wine_server_add_data( req, str, length * sizeof(WCHAR) ); if ((ret = !wine_server_call_err( req ))) - { - if (lpNumCharsWritten) *lpNumCharsWritten = reply->written; - } + *lpNumCharsWritten = reply->written; } SERVER_END_REQ; return ret; diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 2f3ed6e..c4d51ab 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1401,6 +1401,90 @@ static void test_WriteConsoleInputW(HANDLE input_handle) ok(count == 1, "Expected count to be 1, got %u\n", count); } +static void test_WriteConsoleOutputCharacterW(HANDLE output_handle) +{ + static const WCHAR outputW[] = {'a',0}; + + COORD origin = {0, 0}; + DWORD count; + BOOL ret; + int i; + + const struct + { + HANDLE hConsoleOutput; + LPCWSTR str; + DWORD length; + COORD coord; + LPDWORD lpNumCharsWritten; + DWORD expected_count; + DWORD last_error; + int win7_crash; + } invalid_table[] = + { + {NULL, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 1, origin, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, outputW, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, outputW, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, outputW, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, outputW, 1, origin, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 1, origin, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, outputW, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, outputW, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, outputW, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, outputW, 1, origin, &count, 0, ERROR_INVALID_HANDLE}, + {output_handle, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, NULL, 1, origin, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, outputW, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, outputW, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + }; + + for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++) + { + if (invalid_table[i].win7_crash) + continue; + + SetLastError(0xdeadbeef); + if (invalid_table[i].lpNumCharsWritten) count = 0xdeadbeef; + ret = WriteConsoleOutputCharacterW(invalid_table[i].hConsoleOutput, + invalid_table[i].str, + invalid_table[i].length, + invalid_table[i].coord, + invalid_table[i].lpNumCharsWritten); + ok(!ret, "[%d] Expected WriteConsoleOutputCharacterW to return FALSE, got %d\n", i, ret); + if (invalid_table[i].lpNumCharsWritten) + { + ok(count == invalid_table[i].expected_count, + "[%d] Expected count to be %u, got %u\n", + i, invalid_table[i].expected_count, count); + } + ok(GetLastError() == invalid_table[i].last_error, + "[%d] Expected last error to be %u, got %u\n", + i, invalid_table[i].last_error, GetLastError()); + } + + count = 0xdeadbeef; + ret = WriteConsoleOutputCharacterW(output_handle, NULL, 0, origin, &count); + ok(ret == TRUE, "Expected WriteConsoleOutputCharacterW to return TRUE, got %d\n", ret); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + count = 0xdeadbeef; + ret = WriteConsoleOutputCharacterW(output_handle, outputW, 0, origin, &count); + ok(ret == TRUE, "Expected WriteConsoleOutputCharacterW to return TRUE, got %d\n", ret); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + count = 0xdeadbeef; + ret = WriteConsoleOutputCharacterW(output_handle, outputW, 1, origin, &count); + ok(ret == TRUE, "Expected WriteConsoleOutputCharacterW to return TRUE, got %d\n", ret); + ok(count == 1, "Expected count to be 1, got %u\n", count); +} + START_TEST(console) { HANDLE hConIn, hConOut; @@ -1457,4 +1541,5 @@ START_TEST(console) test_GetNumberOfConsoleInputEvents(hConIn); test_WriteConsoleInputA(hConIn); test_WriteConsoleInputW(hConIn); + test_WriteConsoleOutputCharacterW(hConOut); }

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLStyle4 iface.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 40bf2f0ece6aa92c592c837609ecec4073681f66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40bf2f0ece6aa92c592c83760… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 4 02:05:27 2011 +0100 mshtml: COM cleanup for the IHTMLStyle4 iface. --- dlls/mshtml/htmlstyle.c | 2 +- dlls/mshtml/htmlstyle.h | 4 +--- dlls/mshtml/htmlstyle3.c | 29 ++++++++++++++++------------- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index ac82efe..7ca763f 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -579,7 +579,7 @@ static HRESULT WINAPI HTMLStyle_QueryInterface(IHTMLStyle *iface, REFIID riid, v *ppv = &This->IHTMLStyle3_iface; }else if(IsEqualGUID(&IID_IHTMLStyle4, riid)) { TRACE("(%p)->(IID_IHTMLStyle4 %p)\n", This, ppv); - *ppv = HTMLSTYLE4(This); + *ppv = &This->IHTMLStyle4_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; } diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index ba20d28..044718b 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -21,15 +21,13 @@ struct HTMLStyle { IHTMLStyle IHTMLStyle_iface; IHTMLStyle2 IHTMLStyle2_iface; IHTMLStyle3 IHTMLStyle3_iface; - const IHTMLStyle4Vtbl *lpHTMLStyle4Vtbl; + IHTMLStyle4 IHTMLStyle4_iface; LONG ref; nsIDOMCSSStyleDeclaration *nsstyle; }; -#define HTMLSTYLE4(x) ((IHTMLStyle4*) &(x)->lpHTMLStyle4Vtbl) - /* NOTE: Make sure to keep in sync with style_tbl in htmlstyle.c */ typedef enum { STYLEID_BACKGROUND, diff --git a/dlls/mshtml/htmlstyle3.c b/dlls/mshtml/htmlstyle3.c index 3d8906e..a946cb0 100644 --- a/dlls/mshtml/htmlstyle3.c +++ b/dlls/mshtml/htmlstyle3.c @@ -355,39 +355,42 @@ static const IHTMLStyle3Vtbl HTMLStyle3Vtbl = { /* * IHTMLStyle4 Interface */ -#define HTMLSTYLE4_THIS(iface) DEFINE_THIS(HTMLStyle, HTMLStyle4, iface) +static inline HTMLStyle *impl_from_IHTMLStyle4(IHTMLStyle4 *iface) +{ + return CONTAINING_RECORD(iface, HTMLStyle, IHTMLStyle4_iface); +} static HRESULT WINAPI HTMLStyle4_QueryInterface(IHTMLStyle4 *iface, REFIID riid, void **ppv) { - HTMLStyle *This = HTMLSTYLE4_THIS(iface); + HTMLStyle *This = impl_from_IHTMLStyle4(iface); return IHTMLStyle_QueryInterface(&This->IHTMLStyle_iface, riid, ppv); } static ULONG WINAPI HTMLStyle4_AddRef(IHTMLStyle4 *iface) { - HTMLStyle *This = HTMLSTYLE4_THIS(iface); + HTMLStyle *This = impl_from_IHTMLStyle4(iface); return IHTMLStyle_AddRef(&This->IHTMLStyle_iface); } static ULONG WINAPI HTMLStyle4_Release(IHTMLStyle4 *iface) { - HTMLStyle *This = HTMLSTYLE4_THIS(iface); + HTMLStyle *This = impl_from_IHTMLStyle4(iface); return IHTMLStyle_Release(&This->IHTMLStyle_iface); } static HRESULT WINAPI HTMLStyle4_GetTypeInfoCount(IHTMLStyle4 *iface, UINT *pctinfo) { - HTMLStyle *This = HTMLSTYLE4_THIS(iface); + HTMLStyle *This = impl_from_IHTMLStyle4(iface); return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI HTMLStyle4_GetTypeInfo(IHTMLStyle4 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLStyle *This = HTMLSTYLE4_THIS(iface); + HTMLStyle *This = impl_from_IHTMLStyle4(iface); return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); } @@ -395,7 +398,7 @@ static HRESULT WINAPI HTMLStyle4_GetIDsOfNames(IHTMLStyle4 *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLStyle *This = HTMLSTYLE4_THIS(iface); + HTMLStyle *This = impl_from_IHTMLStyle4(iface); return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, lcid, rgDispId); } @@ -404,28 +407,28 @@ static HRESULT WINAPI HTMLStyle4_Invoke(IHTMLStyle4 *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLStyle *This = HTMLSTYLE4_THIS(iface); + HTMLStyle *This = impl_from_IHTMLStyle4(iface); return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLStyle4_put_textOverflow(IHTMLStyle4 *iface, BSTR v) { - HTMLStyle *This = HTMLSTYLE4_THIS(iface); + HTMLStyle *This = impl_from_IHTMLStyle4(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLStyle4_get_textOverflow(IHTMLStyle4 *iface, BSTR *p) { - HTMLStyle *This = HTMLSTYLE4_THIS(iface); + HTMLStyle *This = impl_from_IHTMLStyle4(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLStyle4_put_minHeight(IHTMLStyle4 *iface, VARIANT v) { - HTMLStyle *This = HTMLSTYLE4_THIS(iface); + HTMLStyle *This = impl_from_IHTMLStyle4(iface); TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); @@ -434,7 +437,7 @@ static HRESULT WINAPI HTMLStyle4_put_minHeight(IHTMLStyle4 *iface, VARIANT v) static HRESULT WINAPI HTMLStyle4_get_minHeight(IHTMLStyle4 *iface, VARIANT *p) { - HTMLStyle *This = HTMLSTYLE4_THIS(iface); + HTMLStyle *This = impl_from_IHTMLStyle4(iface); TRACE("(%p)->(%p)\n", This, p); @@ -458,5 +461,5 @@ static const IHTMLStyle4Vtbl HTMLStyle4Vtbl = { void HTMLStyle3_Init(HTMLStyle *This) { This->IHTMLStyle3_iface.lpVtbl = &HTMLStyle3Vtbl; - This->lpHTMLStyle4Vtbl = &HTMLStyle4Vtbl; + This->IHTMLStyle4_iface.lpVtbl = &HTMLStyle4Vtbl; }

1 0

Michael Stefaniuc : ole32: COM cleanup for the IEnumSTATSTG iface.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 4ff5c0209817d7d39040771b23fa781f97aeb0b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ff5c0209817d7d39040771b2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 4 01:58:16 2011 +0100 ole32: COM cleanup for the IEnumSTATSTG iface. --- dlls/ole32/storage32.c | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 8cf3f02..fa9c06f 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -296,8 +296,7 @@ extern const IPropertySetStorageVtbl IPropertySetStorage_Vtbl; */ struct IEnumSTATSTGImpl { - const IEnumSTATSTGVtbl *lpVtbl; /* Needs to be the first item in the struct - * since we want to cast this in an IEnumSTATSTG pointer */ + IEnumSTATSTG IEnumSTATSTG_iface; LONG ref; /* Reference count */ StorageBaseImpl* parentStorage; /* Reference to the parent storage */ @@ -306,6 +305,11 @@ struct IEnumSTATSTGImpl WCHAR name[DIRENTRY_NAME_MAX_LEN]; /* The most recent name visited */ }; +static inline IEnumSTATSTGImpl *impl_from_IEnumSTATSTG(IEnumSTATSTG *iface) +{ + return CONTAINING_RECORD(iface, IEnumSTATSTGImpl, IEnumSTATSTG_iface); +} + static IEnumSTATSTGImpl* IEnumSTATSTGImpl_Construct(StorageBaseImpl* This, DirRef storageDirEntry); static void IEnumSTATSTGImpl_Destroy(IEnumSTATSTGImpl* This); @@ -711,7 +715,7 @@ static HRESULT WINAPI StorageBaseImpl_EnumElements( if (newEnum!=0) { - *ppenum = (IEnumSTATSTG*)newEnum; + *ppenum = &newEnum->IEnumSTATSTG_iface; IEnumSTATSTG_AddRef(*ppenum); @@ -5292,7 +5296,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_QueryInterface( REFIID riid, void** ppvObject) { - IEnumSTATSTGImpl* const This=(IEnumSTATSTGImpl*)iface; + IEnumSTATSTGImpl* const This = impl_from_IEnumSTATSTG(iface); if (ppvObject==0) return E_INVALIDARG; @@ -5303,7 +5307,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_QueryInterface( IsEqualGUID(&IID_IEnumSTATSTG, riid)) { *ppvObject = This; - IEnumSTATSTG_AddRef((IEnumSTATSTG*)This); + IEnumSTATSTG_AddRef(&This->IEnumSTATSTG_iface); return S_OK; } @@ -5313,14 +5317,14 @@ static HRESULT WINAPI IEnumSTATSTGImpl_QueryInterface( static ULONG WINAPI IEnumSTATSTGImpl_AddRef( IEnumSTATSTG* iface) { - IEnumSTATSTGImpl* const This=(IEnumSTATSTGImpl*)iface; + IEnumSTATSTGImpl* const This = impl_from_IEnumSTATSTG(iface); return InterlockedIncrement(&This->ref); } static ULONG WINAPI IEnumSTATSTGImpl_Release( IEnumSTATSTG* iface) { - IEnumSTATSTGImpl* const This=(IEnumSTATSTGImpl*)iface; + IEnumSTATSTGImpl* const This = impl_from_IEnumSTATSTG(iface); ULONG newRef; @@ -5385,7 +5389,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Next( STATSTG* rgelt, ULONG* pceltFetched) { - IEnumSTATSTGImpl* const This=(IEnumSTATSTGImpl*)iface; + IEnumSTATSTGImpl* const This = impl_from_IEnumSTATSTG(iface); DirEntry currentEntry; STATSTG* currentReturnStruct = rgelt; @@ -5452,9 +5456,9 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Skip( IEnumSTATSTG* iface, ULONG celt) { - IEnumSTATSTGImpl* const This=(IEnumSTATSTGImpl*)iface; + IEnumSTATSTGImpl* const This = impl_from_IEnumSTATSTG(iface); - ULONG objectFetched = 0; + ULONG objectFetched = 0; DirRef currentSearchNode; HRESULT hr=S_OK; @@ -5480,7 +5484,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Skip( static HRESULT WINAPI IEnumSTATSTGImpl_Reset( IEnumSTATSTG* iface) { - IEnumSTATSTGImpl* const This=(IEnumSTATSTGImpl*)iface; + IEnumSTATSTGImpl* const This = impl_from_IEnumSTATSTG(iface); if (This->parentStorage->reverted) return STG_E_REVERTED; @@ -5494,7 +5498,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Clone( IEnumSTATSTG* iface, IEnumSTATSTG** ppenum) { - IEnumSTATSTGImpl* const This=(IEnumSTATSTGImpl*)iface; + IEnumSTATSTGImpl* const This = impl_from_IEnumSTATSTG(iface); IEnumSTATSTGImpl* newClone; @@ -5517,7 +5521,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Clone( */ memcpy(newClone->name, This->name, sizeof(newClone->name)); - *ppenum = (IEnumSTATSTG*)newClone; + *ppenum = &newClone->IEnumSTATSTG_iface; /* * Don't forget to nail down a reference to the clone before @@ -5559,7 +5563,7 @@ static IEnumSTATSTGImpl* IEnumSTATSTGImpl_Construct( /* * Set-up the virtual function table and reference count. */ - newEnumeration->lpVtbl = &IEnumSTATSTGImpl_Vtbl; + newEnumeration->IEnumSTATSTG_iface.lpVtbl = &IEnumSTATSTGImpl_Vtbl; newEnumeration->ref = 0; /* @@ -5574,7 +5578,7 @@ static IEnumSTATSTGImpl* IEnumSTATSTGImpl_Construct( /* * Make sure the current node of the iterator is the first one. */ - IEnumSTATSTGImpl_Reset((IEnumSTATSTG*)newEnumeration); + IEnumSTATSTGImpl_Reset(&newEnumeration->IEnumSTATSTG_iface); } return newEnumeration;

1 0

Hwang YunSong : setupapi: Update Korean resource.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 8570a94e31d550e400dd2b30200ee7f2227f03de URL: http://source.winehq.org/git/wine.git/?a=commit;h=8570a94e31d550e400dd2b302… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue Jan 4 10:52:49 2011 +0900 setupapi: Update Korean resource. --- dlls/setupapi/Ko.rc | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/setupapi/Ko.rc b/dlls/setupapi/Ko.rc index c31d9e4..b608aa6 100644 --- a/dlls/setupapi/Ko.rc +++ b/dlls/setupapi/Ko.rc @@ -3,7 +3,7 @@ * * Copyright 2001 Andreas Mohr * Copyright 2009 Ricardo Filipe - * Copyright 2005,2010 YunSong Hwang + * Copyright 2005,2010,2011 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,39 +22,41 @@ #include "setupapi_private.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE { - IDS_PROMPTDISK "�� '%s' �� %s�� ʿ�� մϴ�" - IDS_UNKNOWN "�˼� ��" - IDS_COPYFROM "�� ġ�� :" - IDS_INFO "�� ġ�� θ� �Է��ϰ�, Ȯ�� Ŭ��Ͻʽÿ�." + IDS_PROMPTDISK "이 파일 '%s' 은 %s에서 필요로 합니다" + IDS_UNKNOWN "알수 없음" + IDS_COPYFROM "복사할 파일이 위치한 곳:" + IDS_INFO "파일이 위치한 경로를 입력하고, 확인을 클릭하십시오." } COPYFILEDLGORD DIALOG 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "�� ..." +CAPTION "파일 복사중..." FONT 9, "MS Shell Dlg" BEGIN - PUSHBUTTON "��", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "��:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "취소", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "원본:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "��:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "목적지:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END IDPROMPTFORDISK DIALOG 0, 0, 250, 120 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "�ʿ�� ϵ�" +CAPTION "필요한 파일들" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "��ۻ�� ġ ��ũ�� ϰ�, \ �Ʒ�� õ� ��̺갡 �ùٸ�� Ȯ��Ͻÿ� ", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "제작사의 설치 디스크를 삽입하고, \ 아래의 선택된 드라이브가 올바른지 확인하시오 ", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "��ۻ�� :", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "제작사의 파일이 복사할 곳:", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 - PUSHBUTTON "Ȯ��", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "��", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "ã��...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "확인", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "취소", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "찾기...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END

1 0

Hwang YunSong : view: Update Korean resource.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 41e6461080d1a82a044340de082476654380179d URL: http://source.winehq.org/git/wine.git/?a=commit;h=41e6461080d1a82a044340de0… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue Jan 4 10:54:18 2011 +0900 view: Update Korean resource. --- programs/view/Ko.rc | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/programs/view/Ko.rc b/programs/view/Ko.rc index efbd9dd..33c5f71 100644 --- a/programs/view/Ko.rc +++ b/programs/view/Ko.rc @@ -4,7 +4,7 @@ * * Copyright 1998 Douglas Ridgway * Copyright 2003 Marcelo Duarte - * Copyright 2005 YunSong Hwang + * Copyright 2005,2011 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,6 +23,8 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT /* @@ -33,19 +35,19 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT VIEW MENU BEGIN - POPUP "��(&F)" + POPUP "파일(&F)" BEGIN - MENUITEM "��(&O)", IDM_OPEN - MENUITEM "��(&X)", IDM_EXIT + MENUITEM "열기(&O)", IDM_OPEN + MENUITEM "나가기(&X)", IDM_EXIT END - POPUP "ȸ��(&P)" + POPUP "회전(&P)" BEGIN - MENUITEM "ȭ�� ä��(&S)", IDM_SET_EXT_TO_WIN + MENUITEM "화면 가득 채우기(&S)", IDM_SET_EXT_TO_WIN MENUITEM SEPARATOR - MENUITEM "��(&L)", IDM_LEFT - MENUITEM "��(&R)", IDM_RIGHT - MENUITEM "��(&U)", IDM_UP - MENUITEM "�Ʒ�(&D)", IDM_DOWN + MENUITEM "왼쪽(&L)", IDM_LEFT + MENUITEM "오른쪽(&R)", IDM_RIGHT + MENUITEM "위(&U)", IDM_UP + MENUITEM "아래(&D)", IDM_DOWN END END @@ -70,5 +72,5 @@ END STRINGTABLE BEGIN - IDS_DESCRIPTION "�� Ÿ�� " + IDS_DESCRIPTION "정규 메타파일 보기" END

1 0

Andrew Nguyen : mmsystem.dll16: Correctly map the MCI_SYSINFO_PARMS structure when MCI_SYSINFO_QUANTITY is set .
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: b84f2f229b08acab6622e691a5f1dbcaefa8232f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b84f2f229b08acab6622e691a… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jan 4 02:15:06 2011 -0600 mmsystem.dll16: Correctly map the MCI_SYSINFO_PARMS structure when MCI_SYSINFO_QUANTITY is set. --- dlls/mmsystem.dll16/mci16.c | 59 +++++++++++++++++++++++++++---------------- 1 files changed, 37 insertions(+), 22 deletions(-) diff --git a/dlls/mmsystem.dll16/mci16.c b/dlls/mmsystem.dll16/mci16.c index d9bf7bb..80be9ef 100644 --- a/dlls/mmsystem.dll16/mci16.c +++ b/dlls/mmsystem.dll16/mci16.c @@ -269,23 +269,30 @@ static MMSYSTEM_MapType MCI_MapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR* l } return MMSYSTEM_MAP_OKMEM; case MCI_SYSINFO: - { - LPMCI_SYSINFO_PARMSW msip32w = HeapAlloc(GetProcessHeap(), 0, sizeof(LPMCI_OPEN_PARMS16) + sizeof(MCI_SYSINFO_PARMSW)); - LPMCI_SYSINFO_PARMS16 msip16 = MapSL(*lParam); - - if (msip32w) { - *(LPMCI_SYSINFO_PARMS16*)(msip32w) = msip16; - msip32w = (LPMCI_SYSINFO_PARMSW)((char*)msip32w + sizeof(LPMCI_OPEN_PARMS16)); - msip32w->dwCallback = msip16->dwCallback; - msip32w->lpstrReturn = HeapAlloc(GetProcessHeap(), 0, msip16->dwRetSize * sizeof(WCHAR)); - msip32w->dwRetSize = msip16->dwRetSize; - msip32w->dwNumber = msip16->dwNumber; - msip32w->wDeviceType = msip16->wDeviceType; - } else { - return MMSYSTEM_MAP_NOMEM; - } - *lParam = (DWORD)msip32w; - } + { + MCI_SYSINFO_PARMSW *msip32w = HeapAlloc(GetProcessHeap(), 0, sizeof(MCI_OPEN_PARMS16 *) + sizeof(MCI_SYSINFO_PARMSW)); + MCI_SYSINFO_PARMS16 *msip16 = MapSL(*lParam); + + if (!msip32w) + return MMSYSTEM_MAP_NOMEM; + + *(MCI_SYSINFO_PARMS16 **)msip32w = msip16; + msip32w = (MCI_SYSINFO_PARMSW *)((char *)msip32w + sizeof(MCI_OPEN_PARMS16 *)); + msip32w->dwCallback = msip16->dwCallback; + msip32w->lpstrReturn = HeapAlloc(GetProcessHeap(), 0, (dwFlags & MCI_SYSINFO_QUANTITY) ? + sizeof(DWORD) : + msip16->dwRetSize * sizeof(WCHAR)); + if (!msip32w->lpstrReturn) + { + HeapFree(GetProcessHeap(), 0, msip32w); + return MMSYSTEM_MAP_NOMEM; + } + msip32w->dwRetSize = (dwFlags & MCI_SYSINFO_QUANTITY) ? sizeof(DWORD) : msip16->dwRetSize; + msip32w->dwNumber = msip16->dwNumber; + msip32w->wDeviceType = msip16->wDeviceType; + + *lParam = (DWORD)msip32w; + } return MMSYSTEM_MAP_OKMEM; case MCI_SOUND: { @@ -391,13 +398,21 @@ static MMSYSTEM_MapType MCI_UnMapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR return MMSYSTEM_MAP_OK; case MCI_SYSINFO: if (lParam) { - LPMCI_SYSINFO_PARMSW msip32w = (LPMCI_SYSINFO_PARMSW)lParam; - LPMCI_SYSINFO_PARMS16 msip16 = *(LPMCI_SYSINFO_PARMS16*)((char*)msip32w - sizeof(LPMCI_SYSINFO_PARMS16)); + MCI_SYSINFO_PARMSW *msip32w = (MCI_SYSINFO_PARMSW *)lParam; + MCI_SYSINFO_PARMS16 *msip16 = *(MCI_SYSINFO_PARMS16 **)((char *)msip32w - sizeof(MCI_SYSINFO_PARMS16 *)); + + if (dwFlags & MCI_SYSINFO_QUANTITY) { + DWORD *quantity = MapSL(msip16->lpstrReturn); + + *quantity = *(DWORD *)msip32w->lpstrReturn; + } + else { + WideCharToMultiByte(CP_ACP, 0, + msip32w->lpstrReturn, msip32w->dwRetSize, + MapSL(msip16->lpstrReturn), msip16->dwRetSize, + NULL, NULL); + } - WideCharToMultiByte(CP_ACP, 0, - msip32w->lpstrReturn, msip32w->dwRetSize, - MapSL(msip16->lpstrReturn), msip16->dwRetSize, - NULL, NULL); HeapFree(GetProcessHeap(), 0, msip32w->lpstrReturn); HeapFree(GetProcessHeap(), 0, (LPVOID)lParam); }

1 0

Alexandre Julliard : configure: Add a check for the gettextpo library.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 0e79c5c1c3aee1dd28557b3075df84abb3e52649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e79c5c1c3aee1dd28557b307… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 4 11:16:50 2011 +0100 configure: Add a check for the gettextpo library. --- configure | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 15 +++++++++++ include/config.h.in | 6 ++++ 3 files changed, 90 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 771ccba..e49ad75 100755 --- a/configure +++ b/configure @@ -622,6 +622,7 @@ GSTREAMER_LIBS ESDLIBS ESDINCL ESDCONFIG +LIBGETTEXTPO ZLIB FREETYPEINCL FREETYPELIBS @@ -777,6 +778,7 @@ with_curses with_esd with_fontconfig with_freetype +with_gettextpo with_gphoto with_glu with_gnutls @@ -1467,6 +1469,7 @@ Optional Packages: --without-esd do not use the EsounD sound support --without-fontconfig do not use fontconfig --without-freetype do not use the FreeType library + --without-gettextpo do not use the GetTextPO library --without-gphoto do not use gphoto (Digital Camera support) --without-glu do not use the GLU library --without-gnutls do not use GnuTLS (schannel support) @@ -2561,6 +2564,12 @@ if test "${with_freetype+set}" = set; then : fi +# Check whether --with-gettextpo was given. +if test "${with_gettextpo+set}" = set; then : + withval=$with_gettextpo; if test "x$withval" = "xno"; then ac_cv_header_gettext_po_h=no; fi +fi + + # Check whether --with-gphoto was given. if test "${with_gphoto+set}" = set; then : withval=$with_gphoto; @@ -5783,6 +5792,7 @@ for ac_header in \ fnmatch.h \ fontconfig/fontconfig.h \ getopt.h \ + gettext-po.h \ grp.h \ gsm.h \ gsm/gsm.h \ @@ -10581,6 +10591,65 @@ fi fi +if test "x$enable_tools" != xno +then + if test "$ac_cv_header_gettext_po_h" = "yes" + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for po_file_write in -lgettextpo" >&5 +$as_echo_n "checking for po_file_write in -lgettextpo... " >&6; } +if test "${ac_cv_lib_gettextpo_po_file_write+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgettextpo $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char po_file_write (); +int +main () +{ +return po_file_write (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_gettextpo_po_file_write=yes +else + ac_cv_lib_gettextpo_po_file_write=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gettextpo_po_file_write" >&5 +$as_echo "$ac_cv_lib_gettextpo_po_file_write" >&6; } +if test "x$ac_cv_lib_gettextpo_po_file_write" = x""yes; then : + +$as_echo "#define HAVE_LIBGETTEXTPO 1" >>confdefs.h + + LIBGETTEXTPO="-lgettextpo" + +fi + + fi + if test "x$LIBGETTEXTPO" = "x"; then : + case "x$with_gettextpo" in + x) as_fn_append wine_warnings "|GetText ${notice_platform}development files not found. Internationalization won't be fully supported." ;; + xno) ;; + *) as_fn_error $? "GetText ${notice_platform}development files not found. Internationalization won't be fully supported. +This is an error since --with-gettextpo was requested." "$LINENO" 5 ;; +esac +fi +fi + if test "x$with_esd" != xno then save_CFLAGS="$CFLAGS" @@ -15395,7 +15464,6 @@ if test "x$enable_maintainer_mode" = xyes then wine_fn_append_rule ALL_MAKEFILE_DEPENDS "\$(srcdir)/configure: configure.ac aclocal.m4 cd \$(srcdir) && autoconf --warnings=all - \$(srcdir)/include/config.h.in: include/stamp-h.in \$(srcdir)/include/stamp-h.in: configure.ac aclocal.m4 cd \$(srcdir) && autoheader --warnings=all diff --git a/configure.ac b/configure.ac index 3f06551..9ceb0f1 100644 --- a/configure.ac +++ b/configure.ac @@ -46,6 +46,8 @@ AC_ARG_WITH(esd, AS_HELP_STRING([--without-esd],[do not use the EsounD sou AC_ARG_WITH(fontconfig,AS_HELP_STRING([--without-fontconfig],[do not use fontconfig]), [if test "x$withval" = "xno"; then ac_cv_header_fontconfig_fontconfig_h=no; fi]) AC_ARG_WITH(freetype, AS_HELP_STRING([--without-freetype],[do not use the FreeType library])) +AC_ARG_WITH(gettextpo, AS_HELP_STRING([--without-gettextpo],[do not use the GetTextPO library]), + [if test "x$withval" = "xno"; then ac_cv_header_gettext_po_h=no; fi]) AC_ARG_WITH(gphoto, AS_HELP_STRING([--without-gphoto],[do not use gphoto (Digital Camera support)])) AC_ARG_WITH(glu, AS_HELP_STRING([--without-glu],[do not use the GLU library]), [if test "x$withval" = "xno"; then ac_cv_header_GL_glu_h=no; fi]) @@ -393,6 +395,7 @@ AC_CHECK_HEADERS(\ fnmatch.h \ fontconfig/fontconfig.h \ getopt.h \ + gettext-po.h \ grp.h \ gsm.h \ gsm/gsm.h \ @@ -1407,6 +1410,18 @@ then AC_SUBST(ZLIB,"-lz")]) fi +dnl **** Check for gettextpo **** +if test "x$enable_tools" != xno +then + if test "$ac_cv_header_gettext_po_h" = "yes" + then + AC_CHECK_LIB(gettextpo,po_file_write, + [AC_DEFINE(HAVE_LIBGETTEXTPO,1,[Define to 1 if you have the `gettextpo' library (-lgettextpo).]) + AC_SUBST(LIBGETTEXTPO,"-lgettextpo")]) + fi + WINE_WARNING_WITH(gettextpo,[test "x$LIBGETTEXTPO" = "x"],[GetText ${notice_platform}development files not found. Internationalization won't be fully supported.]) +fi + dnl **** Check for EsounD **** if test "x$with_esd" != xno then diff --git a/include/config.h.in b/include/config.h.in index 58767a0..8a526ea 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -226,6 +226,9 @@ /* Define to 1 if you have the `getservbyport' function. */ #undef HAVE_GETSERVBYPORT +/* Define to 1 if you have the <gettext-po.h> header file. */ +#undef HAVE_GETTEXT_PO_H + /* Define to 1 if you have the `gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY @@ -352,6 +355,9 @@ /* Define to 1 if you have the `ldap_parse_vlv_control' function. */ #undef HAVE_LDAP_PARSE_VLV_CONTROL +/* Define to 1 if you have the `gettextpo' library (-lgettextpo). */ +#undef HAVE_LIBGETTEXTPO + /* Define to 1 if you have the `i386' library (-li386). */ #undef HAVE_LIBI386

1 0