wine-commits January 2011

wine-commits@winehq.org

2 participants
879 discussions

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: 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

Thomas Mullaly : normaliz: Added normaliz.dll stub.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 858ccfff8bc29c6f9f8bd9d13372669ab0ac2c36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=858ccfff8bc29c6f9f8bd9d13… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Jan 2 17:13:43 2011 -0500 normaliz: Added normaliz.dll stub. --- configure | 1 + configure.ac | 1 + dlls/normaliz/Makefile.in | 7 ++++++ dlls/normaliz/normaliz.c | 50 +++++++++++++++++++++++++++++++++++++++++++ dlls/normaliz/normaliz.spec | 5 ++++ 5 files changed, 64 insertions(+), 0 deletions(-) diff --git a/configure b/configure index e49ad75..25b8533 100755 --- a/configure +++ b/configure @@ -15148,6 +15148,7 @@ wine_fn_config_dll nddeapi enable_nddeapi implib wine_fn_config_dll netapi32 enable_netapi32 implib wine_fn_config_test dlls/netapi32/tests netapi32_test wine_fn_config_dll newdev enable_newdev implib +wine_fn_config_dll normaliz enable_normaliz implib wine_fn_config_dll npmshtml enable_npmshtml wine_fn_config_dll ntdll enable_ntdll implib wine_fn_config_test dlls/ntdll/tests ntdll_test diff --git a/configure.ac b/configure.ac index 9ceb0f1..9ed1a5d 100644 --- a/configure.ac +++ b/configure.ac @@ -2635,6 +2635,7 @@ WINE_CONFIG_DLL(nddeapi,,[implib]) WINE_CONFIG_DLL(netapi32,,[implib]) WINE_CONFIG_TEST(dlls/netapi32/tests) WINE_CONFIG_DLL(newdev,,[implib]) +WINE_CONFIG_DLL(normaliz,,[implib]) WINE_CONFIG_DLL(npmshtml) WINE_CONFIG_DLL(ntdll,,[implib]) WINE_CONFIG_TEST(dlls/ntdll/tests) diff --git a/dlls/normaliz/Makefile.in b/dlls/normaliz/Makefile.in new file mode 100644 index 0000000..9cc5a52 --- /dev/null +++ b/dlls/normaliz/Makefile.in @@ -0,0 +1,7 @@ +MODULE = normaliz.dll +IMPORTLIB = normaliz + +C_SRCS = \ + normaliz.c + +@MAKE_DLL_RULES@ diff --git a/dlls/normaliz/normaliz.c b/dlls/normaliz/normaliz.c new file mode 100644 index 0000000..c00df40 --- /dev/null +++ b/dlls/normaliz/normaliz.c @@ -0,0 +1,50 @@ +/* + * Normaliz DLL. + * + * Copyright 2011 Thomas Mullaly + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* All calls to this DLL are forwarded to kernel32. On Windows XP this DLL actually contains + * the implementations for the functions it exports, but, starting with Vista these + * functions have been moved into kernel32. + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(authz); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + default: + break; + } + + return TRUE; +} diff --git a/dlls/normaliz/normaliz.spec b/dlls/normaliz/normaliz.spec new file mode 100644 index 0000000..b26649b --- /dev/null +++ b/dlls/normaliz/normaliz.spec @@ -0,0 +1,5 @@ +@ stdcall IdnToAscii(long wstr long ptr long) kernel32.IdnToAscii +@ stdcall IdnToNameprepUnicode(long wstr long ptr long) kernel32.IdnToNameprepUnicode +@ stdcall IdnToUnicode(long wstr long ptr long) kernel32.IdnToUnicode +@ stdcall IsNormalizedString(long wstr long) kernel32.IsNormalizedString +@ stdcall NormalizeString(long wstr long ptr long) kernel32.NormalizeString

1 0

Thomas Mullaly : kernel32: Added stubs for IDN functions.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 1c7d32aa25da8ae03dc91915730ed877d9c2ba13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c7d32aa25da8ae03dc919157… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Jan 2 16:54:32 2011 -0500 kernel32: Added stubs for IDN functions. --- dlls/kernel32/Makefile.in | 2 +- dlls/kernel32/kernel32.spec | 5 ++++ dlls/kernel32/locale.c | 57 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index 2072949..58a4497 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_KERNEL32_ +EXTRADEFS = -D_KERNEL32_ -D_NORMALIZE_ MODULE = kernel32.dll IMPORTLIB = kernel32 IMPORTS = winecrt0 ntdll diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f32371e..98e0fa0 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -726,6 +726,9 @@ @ stub HeapUsage @ stdcall HeapValidate(long long ptr) @ stdcall HeapWalk(long ptr) +@ stdcall IdnToAscii(long wstr long ptr long) +@ stdcall IdnToNameprepUnicode(long wstr long ptr long) +@ stdcall IdnToUnicode(long wstr long ptr long) @ stdcall InitAtomTable(long) @ stdcall InitializeCriticalSection(ptr) @ stdcall InitializeCriticalSectionAndSpinCount(ptr long) @@ -753,6 +756,7 @@ @ stdcall IsDBCSLeadByteEx(long long) @ stdcall IsDebuggerPresent() @ stub -i386 IsLSCallback +@ stdcall IsNormalizedString(long wstr long) @ stdcall IsProcessInJob(long long ptr) @ stdcall IsProcessorFeaturePresent(long) @ stub -i386 IsSLCallback @@ -832,6 +836,7 @@ # @ stub NlsConvertIntegerToString # @ stub NlsGetCacheUpdateCount # @ stub NlsResetProcessLocale +@ stdcall NormalizeString(long wstr long ptr long) @ stub NotifyNLSUserCache # @ stub NumaVirtualQueryNode @ stdcall OpenConsoleW(wstr long long long) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 927d058..a54ae37 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3857,3 +3857,60 @@ INT WINAPI GetUserDefaultLocaleName(LPWSTR localename, int buffersize) userlcid = GetUserDefaultLCID(); return LCIDToLocaleName(userlcid, localename, buffersize, 0); } + +/****************************************************************************** + * NormalizeString (KERNEL32.@) + */ +INT WINAPI NormalizeString(NORM_FORM NormForm, LPCWSTR lpSrcString, INT cwSrcLength, + LPWSTR lpDstString, INT cwDstLength) +{ + FIXME("%x %p %d %p %d\n", NormForm, lpSrcString, cwSrcLength, lpDstString, cwDstLength); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/****************************************************************************** + * IsNormalizedString (KERNEL32.@) + */ +BOOL WINAPI IsNormalizedString(NORM_FORM NormForm, LPCWSTR lpString, INT cwLength) +{ + FIXME("%x %p %d\n", NormForm, lpString, cwLength); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/****************************************************************************** + * IdnToAscii (KERNEL32.@) + */ +INT WINAPI IdnToAscii(DWORD dwFlags, LPCWSTR lpUnicodeCharStr, INT cchUnicodeChar, + LPWSTR lpASCIICharStr, INT cchASCIIChar) +{ + FIXME("%x %p %d %p %d\n", dwFlags, lpUnicodeCharStr, cchUnicodeChar, + lpASCIICharStr, cchASCIIChar); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/****************************************************************************** + * IdnToNameprepUnicode (KERNEL32.@) + */ +INT WINAPI IdnToNameprepUnicode(DWORD dwFlags, LPCWSTR lpUnicodeCharStr, INT cchUnicodeChar, + LPWSTR lpNameprepCharStr, INT cchNameprepChar) +{ + FIXME("%x %p %d %p %d\n", dwFlags, lpUnicodeCharStr, cchUnicodeChar, + lpNameprepCharStr, cchNameprepChar); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/****************************************************************************** + * IdnToUnicode (KERNEL32.@) + */ +INT WINAPI IdnToUnicode(DWORD dwFlags, LPCWSTR lpASCIICharStr, INT cchASCIIChar, + LPWSTR lpUnicodeCharStr, INT cchUnicodeChar) +{ + FIXME("%x %p %d %p %d\n", dwFlags, lpASCIICharStr, cchASCIIChar, + lpUnicodeCharStr, cchUnicodeChar); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +}

1 0

André Hentschel : ntdll: Respect multiple CPUs when faking values.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 40294182c1554a97dcfa8414b609b6f8de8f5239 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40294182c1554a97dcfa8414b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 3 20:27:00 2011 +0100 ntdll: Respect multiple CPUs when faking values. --- dlls/ntdll/nt.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 7ad56e4..ee78aec 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1647,17 +1647,18 @@ NTSTATUS WINAPI NtQuerySystemInformation( if (cpus == 0) { static int i = 1; - - sppi = RtlAllocateHeap(GetProcessHeap(),0,sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION)); - - memset(sppi, 0 , sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION)); + int n; + cpus = min(NtCurrentTeb()->Peb->NumberOfProcessors, out_cpus); + len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * cpus; + sppi = RtlAllocateHeap(GetProcessHeap(), 0, len); FIXME("stub info_class SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION\n"); - /* many programs expect these values to change so fake change */ - len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION); - sppi->KernelTime.QuadPart = 1 * i; - sppi->UserTime.QuadPart = 2 * i; - sppi->IdleTime.QuadPart = 3 * i; + for (n = 0; n < cpus; n++) + { + sppi[n].KernelTime.QuadPart = 1 * i; + sppi[n].UserTime.QuadPart = 2 * i; + sppi[n].IdleTime.QuadPart = 3 * i; + } i++; }

1 0

Alexandre Julliard : clock: Convert translations to po files.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: dcf5548bd62e6554f62d719f3102cfb2d7c18db4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcf5548bd62e6554f62d719f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 4 11:20:30 2011 +0100 clock: Convert translations to po files. --- Make.rules.in | 2 +- Makefile.in | 1 + po/LINGUAS | 37 +++++++++++++++++ po/cs.po | 58 ++++++++++++++++++++++++++ po/da.po | 58 ++++++++++++++++++++++++++ po/de.po | 58 ++++++++++++++++++++++++++ po/en_US.po | 58 ++++++++++++++++++++++++++ po/eo.po | 58 ++++++++++++++++++++++++++ po/es.po | 58 ++++++++++++++++++++++++++ po/fi.po | 58 ++++++++++++++++++++++++++ po/fr.po | 58 ++++++++++++++++++++++++++ po/he.po | 58 ++++++++++++++++++++++++++ po/hi.po | 58 ++++++++++++++++++++++++++ po/hu.po | 58 ++++++++++++++++++++++++++ po/it.po | 58 ++++++++++++++++++++++++++ po/ja.po | 58 ++++++++++++++++++++++++++ po/ko.po | 58 ++++++++++++++++++++++++++ po/lt.po | 58 ++++++++++++++++++++++++++ po/ml.po | 58 ++++++++++++++++++++++++++ po/nb_NO.po | 58 ++++++++++++++++++++++++++ po/nl.po | 58 ++++++++++++++++++++++++++ po/or.po | 58 ++++++++++++++++++++++++++ po/pa.po | 58 ++++++++++++++++++++++++++ po/pl.po | 58 ++++++++++++++++++++++++++ po/pt_BR.po | 58 ++++++++++++++++++++++++++ po/pt_PT.po | 58 ++++++++++++++++++++++++++ po/ro.po | 58 ++++++++++++++++++++++++++ po/ru.po | 58 ++++++++++++++++++++++++++ po/sk.po | 58 ++++++++++++++++++++++++++ po/sl.po | 58 ++++++++++++++++++++++++++ po/sr_Latn_SP.po | 58 ++++++++++++++++++++++++++ po/sr_SP.po | 58 ++++++++++++++++++++++++++ po/sv.po | 58 ++++++++++++++++++++++++++ po/te.po | 58 ++++++++++++++++++++++++++ po/th.po | 58 ++++++++++++++++++++++++++ po/tr.po | 58 ++++++++++++++++++++++++++ po/uk.po | 58 ++++++++++++++++++++++++++ po/wa.po | 58 ++++++++++++++++++++++++++ po/wine.pot | 55 +++++++++++++++++++++++++ po/zh_CN.po | 58 ++++++++++++++++++++++++++ po/zh_TW.po | 58 ++++++++++++++++++++++++++ programs/clock/Cs.rc | 53 ------------------------ programs/clock/Da.rc | 50 ---------------------- programs/clock/De.rc | 51 ----------------------- programs/clock/Eo.rc | 48 ---------------------- programs/clock/Es.rc | 51 ----------------------- programs/clock/Fi.rc | 49 ---------------------- programs/clock/Fr.rc | 53 ------------------------ programs/clock/He.rc | 52 ----------------------- programs/clock/Hi.rc | 51 ----------------------- programs/clock/Hu.rc | 50 ---------------------- programs/clock/It.rc | 54 ------------------------ programs/clock/Ja.rc | 52 ----------------------- programs/clock/Ko.rc | 53 ------------------------ programs/clock/Lt.rc | 51 ----------------------- programs/clock/Makefile.in | 36 +---------------- programs/clock/Ml.rc | 51 ----------------------- programs/clock/Nl.rc | 48 ---------------------- programs/clock/No.rc | 48 ---------------------- programs/clock/Or.rc | 51 ----------------------- programs/clock/Pa.rc | 51 ----------------------- programs/clock/Pl.rc | 50 ---------------------- programs/clock/Pt.rc | 79 ------------------------------------ programs/clock/Ro.rc | 50 ---------------------- programs/clock/Ru.rc | 51 ----------------------- programs/clock/Si.rc | 50 ---------------------- programs/clock/Sk.rc | 50 ---------------------- programs/clock/Sr.rc | 79 ------------------------------------ programs/clock/Sv.rc | 50 ---------------------- programs/clock/Te.rc | 51 ----------------------- programs/clock/Th.rc | 48 ---------------------- programs/clock/Tr.rc | 48 ---------------------- programs/clock/Uk.rc | 53 ------------------------ programs/clock/Wa.rc | 57 -------------------------- programs/clock/Zh.rc | 79 ------------------------------------ programs/clock/{En.rc => clock.rc} | 4 +- 76 files changed, 2243 insertions(+), 1800 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dcf5548bd62e6554f62d7…

1 0

Alexandre Julliard : wrc: Add support for loading translations from po files.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: d8c986e062cd13d851030880b2a0cdf15a4b6fd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c986e062cd13d851030880b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 4 11:18:45 2011 +0100 wrc: Add support for loading translations from po files. --- tools/wrc/po.c | 268 ++++++++++++++++++++++++++++++++++++++++++++++++++ tools/wrc/wrc.c | 8 ++ tools/wrc/wrc.h | 1 + tools/wrc/wrc.man.in | 6 + 4 files changed, 283 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8c986e062cd13d851030…

1 0

Alexandre Julliard : wrc: Add support for generating . po files from existing resources.
by Alexandre Julliard 04 Jan '11

04 Jan '11

Module: wine Branch: master Commit: 10700bf6b2a6c883dd3fab4a6af94fdfade26c75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10700bf6b2a6c883dd3fab4a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 4 11:18:10 2011 +0100 wrc: Add support for generating .po files from existing resources. --- tools/wrc/Makefile.in | 6 +- tools/wrc/po.c | 716 +++++++++++++++++++++++++++++++++++++++++++++++++ tools/wrc/wrc.c | 41 ++- tools/wrc/wrc.h | 3 +- tools/wrc/wrc.man.in | 11 +- 5 files changed, 758 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10700bf6b2a6c883dd3fa…

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

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

← Newer
1
...
76
77
78
79
80
81
82
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2011