January 2012 - Wine-Commits

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: wine Branch: master Commit: f445325999ebf3afd0b7df0e5c1a31eebe7b8b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f445325999ebf3afd0b7df0e5… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 23 00:44:04 2012 +0100 Assorted spelling fixes. --- dlls/kernel32/tests/atom.c | 2 +- dlls/shell32/shell32_main.c | 2 +- dlls/shlwapi/shlwapi_main.c | 2 +- dlls/urlmon/tests/misc.c | 2 +- dlls/ws2_32/tests/sock.c | 42 +++++++++++++++++++++--------------------- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/kernel32/tests/atom.c b/dlls/kernel32/tests/atom.c index a0f99d1..0c17408 100644 --- a/dlls/kernel32/tests/atom.c +++ b/dlls/kernel32/tests/atom.c @@ -266,7 +266,7 @@ static void test_get_atom_name(void) { /* len == 0 with ERROR_MORE_DATA is on NT3.51 */ ok(len == 1 || (len == 0 && GetLastError() == ERROR_MORE_DATA), - "0x%04x: got %u with %d (excepted '1' or '0' with " + "0x%04x: got %u with %d (expected '1' or '0' with " "ERROR_MORE_DATA)\n", i, len, GetLastError()); ok(outW[1] == DOUBLE('.'), "buffer overwrite\n"); } diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 5370b99..97d8e98 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1183,7 +1183,7 @@ HIMAGELIST ShellBigIconList = 0; * SHELL32 DllMain * * NOTES - * calling oleinitialize here breaks sone apps. + * calling oleinitialize here breaks some apps. */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) { diff --git a/dlls/shlwapi/shlwapi_main.c b/dlls/shlwapi/shlwapi_main.c index b51d3d6..78c4520 100644 --- a/dlls/shlwapi/shlwapi_main.c +++ b/dlls/shlwapi/shlwapi_main.c @@ -51,7 +51,7 @@ DECLSPEC_HIDDEN DWORD SHLWAPI_ThreadRef_index = TLS_OUT_OF_INDEXES; * SHLWAPI DllMain * * NOTES - * calling oleinitialize here breaks sone apps. + * calling oleinitialize here breaks some apps. */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) { diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index c45428c..ea634c1 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -766,7 +766,7 @@ static void test_FindMimeFromData(void) CoTaskMemFree(mime); hres = pFindMimeFromData(NULL, NULL, NULL, 0, NULL, 0, &mime, 0); - ok(hres == E_INVALIDARG, "FindMimeFromData failed: %08x, excepted E_INVALIDARG\n", hres); + ok(hres == E_INVALIDARG, "FindMimeFromData failed: %08x, expected E_INVALIDARG\n", hres); hres = pFindMimeFromData(NULL, NULL, NULL, 0, mimeTextPlain, 0, &mime, 0); ok(hres == E_INVALIDARG, "FindMimeFromData failed: %08x, expected E_INVALIDARG\n", hres); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index a203336..9e111f8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5263,7 +5263,7 @@ static void test_completion_port(void) todo_wine ok(GetLastError() == ERROR_NETNAME_DELETED, "Last error was %d\n", GetLastError()); ok(key == 125, "Key is %lu\n", key); ok(num_bytes == 0, "Number of bytes received is %u\n", num_bytes); - ok(olp == &ov, "Overlaped structure is at %p\n", olp); + ok(olp == &ov, "Overlapped structure is at %p\n", olp); SetLastError(0xdeadbeef); key = 0xdeadbeef; @@ -5274,8 +5274,8 @@ static void test_completion_port(void) ok(bret == FALSE, "GetQueuedCompletionStatus returned %d\n", bret ); ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); ok(key == 0xdeadbeef, "Key is %lu\n", key); - ok(num_bytes == 0xdeadbeef, "Number of bytes transfered is %u\n", num_bytes); - ok(!olp, "Overlaped structure is at %p\n", olp); + ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); + ok(!olp, "Overlapped structure is at %p\n", olp); if (dest != INVALID_SOCKET) closesocket(dest); @@ -5324,8 +5324,8 @@ static void test_completion_port(void) ok(bret == FALSE, "GetQueuedCompletionStatus returned %u\n", bret ); ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); ok(key == 0xdeadbeef, "Key is %lu\n", key); - ok(num_bytes == 0xdeadbeef, "Number of bytes transfered is %u\n", num_bytes); - ok(!olp, "Overlaped structure is at %p\n", olp); + ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); + ok(!olp, "Overlapped structure is at %p\n", olp); if (dest != INVALID_SOCKET) closesocket(dest); @@ -5399,8 +5399,8 @@ static void test_completion_port(void) ok(bret == FALSE, "failed to get completion status %u\n", bret); todo_wine ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %d\n", GetLastError()); todo_wine ok(key == 125, "Key is %lu\n", key); - todo_wine ok(num_bytes == 0, "Number of bytes transfered is %u\n", num_bytes); - todo_wine ok(olp == &ov, "Overlaped structure is at %p\n", olp); + todo_wine ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); + todo_wine ok(olp == &ov, "Overlapped structure is at %p\n", olp); todo_wine ok(olp && (olp->Internal == (ULONG)STATUS_CANCELLED), "Internal status is %lx\n", olp ? olp->Internal : 0); SetLastError(0xdeadbeef); @@ -5411,8 +5411,8 @@ static void test_completion_port(void) ok(bret == FALSE, "failed to get completion status %u\n", bret); ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); ok(key == 0xdeadbeef, "Key is %lu\n", key); - ok(num_bytes == 0xdeadbeef, "Number of bytes transfered is %u\n", num_bytes); - ok(!olp, "Overlaped structure is at %p\n", olp); + ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); + ok(!olp, "Overlapped structure is at %p\n", olp); src = socket(AF_INET, SOCK_STREAM, 0); if (src == INVALID_SOCKET) @@ -5484,8 +5484,8 @@ static void test_completion_port(void) ok(bret == TRUE, "failed to get completion status %u\n", bret); ok(GetLastError() == 0xdeadbeef, "Last error was %d\n", GetLastError()); ok(key == 125, "Key is %lu\n", key); - ok(num_bytes == 0, "Number of bytes transfered is %u\n", num_bytes); - ok(olp == &ov, "Overlaped structure is at %p\n", olp); + ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); + ok(olp == &ov, "Overlapped structure is at %p\n", olp); ok(olp && (olp->Internal == (ULONG)STATUS_SUCCESS), "Internal status is %lx\n", olp ? olp->Internal : 0); SetLastError(0xdeadbeef); @@ -5496,8 +5496,8 @@ static void test_completion_port(void) ok(bret == FALSE, "failed to get completion status %u\n", bret); ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); ok(key == 0xdeadbeef, "Key is %lu\n", key); - ok(num_bytes == 0xdeadbeef, "Number of bytes transfered is %u\n", num_bytes); - ok(!olp, "Overlaped structure is at %p\n", olp); + ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); + ok(!olp, "Overlapped structure is at %p\n", olp); if (dest != INVALID_SOCKET) closesocket(dest); @@ -5584,8 +5584,8 @@ static void test_completion_port(void) ok(bret == TRUE, "failed to get completion status %u\n", bret); ok(GetLastError() == 0xdeadbeef, "Last error was %d\n", GetLastError()); ok(key == 125, "Key is %lu\n", key); - ok(num_bytes == 1, "Number of bytes transfered is %u\n", num_bytes); - ok(olp == &ov, "Overlaped structure is at %p\n", olp); + ok(num_bytes == 1, "Number of bytes transferred is %u\n", num_bytes); + ok(olp == &ov, "Overlapped structure is at %p\n", olp); ok(olp && (olp->Internal == (ULONG)STATUS_SUCCESS), "Internal status is %lx\n", olp ? olp->Internal : 0); SetLastError(0xdeadbeef); @@ -5596,8 +5596,8 @@ static void test_completion_port(void) ok(bret == FALSE, "failed to get completion status %u\n", bret); ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); ok(key == 0xdeadbeef, "Key is %lu\n", key); - ok(num_bytes == 0xdeadbeef, "Number of bytes transfered is %u\n", num_bytes); - ok(!olp, "Overlaped structure is at %p\n", olp); + ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); + ok(!olp, "Overlapped structure is at %p\n", olp); if (dest != INVALID_SOCKET) @@ -5684,8 +5684,8 @@ static void test_completion_port(void) ok(bret == FALSE, "failed to get completion status %u\n", bret); todo_wine ok((GetLastError() == ERROR_NETNAME_DELETED) || (GetLastError() == ERROR_CONNECTION_ABORTED), "Last error was %d\n", GetLastError()); ok(key == 125, "Key is %lu\n", key); - ok(num_bytes == 0, "Number of bytes transfered is %u\n", num_bytes); - ok(olp == &ov, "Overlaped structure is at %p\n", olp); + ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); + ok(olp == &ov, "Overlapped structure is at %p\n", olp); todo_wine ok(olp && ((olp->Internal == (ULONG)STATUS_LOCAL_DISCONNECT) || (olp->Internal == (ULONG)STATUS_CONNECTION_ABORTED)), "Internal status is %lx\n", olp ? olp->Internal : 0); @@ -5697,8 +5697,8 @@ static void test_completion_port(void) ok(bret == FALSE, "failed to get completion status %u\n", bret); ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); ok(key == 0xdeadbeef, "Key is %lu\n", key); - ok(num_bytes == 0xdeadbeef, "Number of bytes transfered is %u\n", num_bytes); - ok(!olp, "Overlaped structure is at %p\n", olp); + ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); + ok(!olp, "Overlapped structure is at %p\n", olp); end:

1 0

Alexandre Julliard : dnsapi: Fix a warning when building on Mingw.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: wine Branch: master Commit: bbb8d4f865be68f9c6aa3f3a9f5ab9b87a411e94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbb8d4f865be68f9c6aa3f3a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 23 12:01:28 2012 +0100 dnsapi: Fix a warning when building on Mingw. --- dlls/dnsapi/record.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index ae31316..fbdcae7 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -23,6 +23,7 @@ #include "wine/debug.h" #include <stdarg.h> +#include <stdio.h> #include <string.h> #include <sys/types.h>

1 0

Alexandre Julliard : urlmon: Avoid some symbol redefinitions.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: wine Branch: master Commit: 292cb17ebbcdd0cca6076830b7e9830c5a5e7933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=292cb17ebbcdd0cca6076830b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 23 12:01:13 2012 +0100 urlmon: Avoid some symbol redefinitions. --- dlls/urlmon/uri.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 1dc4922..1e25952 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION +#include <limits.h> #include "urlmon_main.h" #include "wine/debug.h" @@ -27,9 +27,6 @@ #include "strsafe.h" -#define UINT_MAX 0xffffffff -#define USHORT_MAX 0xffff - #define URI_DISPLAY_NO_ABSOLUTE_URI 0x1 #define URI_DISPLAY_NO_DEFAULT_PORT_AUTH 0x2 @@ -1353,7 +1350,7 @@ static BOOL parse_port(const WCHAR **ptr, parse_data *data, DWORD flags) { port = port*10 + (**ptr-'0'); - if(port > USHORT_MAX) { + if(port > USHRT_MAX) { *ptr = data->port; data->port = NULL; return FALSE;

1 0

Francois Gouget : cmd: A few usage message tweaks and fixes.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: wine Branch: master Commit: 34c0b74ace32aa5cbabb3a2c4d67b1360983953d URL: http://source.winehq.org/git/wine.git/?a=commit;h=34c0b74ace32aa5cbabb3a2c4… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 23 00:42:25 2012 +0100 cmd: A few usage message tweaks and fixes. --- po/ar.po | 106 +++++++++++++++++++++---------------------- po/bg.po | 106 +++++++++++++++++++++---------------------- po/ca.po | 113 ++++++++++++++++++++++++---------------------- po/cs.po | 110 ++++++++++++++++++++++---------------------- po/da.po | 111 +++++++++++++++++++++++---------------------- po/de.po | 113 ++++++++++++++++++++++++---------------------- po/el.po | 106 +++++++++++++++++++++---------------------- po/en.po | 120 +++++++++++++++++++++++------------------------- po/en_US.po | 124 ++++++++++++++++++++++++-------------------------- po/eo.po | 106 +++++++++++++++++++++---------------------- po/es.po | 111 +++++++++++++++++++++++---------------------- po/fa.po | 106 +++++++++++++++++++++---------------------- po/fi.po | 106 +++++++++++++++++++++---------------------- po/fr.po | 113 ++++++++++++++++++++++++---------------------- po/he.po | 111 +++++++++++++++++++++++---------------------- po/hi.po | 106 +++++++++++++++++++++---------------------- po/hu.po | 106 +++++++++++++++++++++---------------------- po/it.po | 113 ++++++++++++++++++++++++---------------------- po/ja.po | 113 ++++++++++++++++++++++++---------------------- po/ko.po | 113 ++++++++++++++++++++++++---------------------- po/lt.po | 113 ++++++++++++++++++++++++---------------------- po/ml.po | 106 +++++++++++++++++++++---------------------- po/nb_NO.po | 111 +++++++++++++++++++++++---------------------- po/nl.po | 113 ++++++++++++++++++++++++---------------------- po/or.po | 106 +++++++++++++++++++++---------------------- po/pa.po | 106 +++++++++++++++++++++---------------------- po/pl.po | 113 ++++++++++++++++++++++++---------------------- po/pt_BR.po | 113 ++++++++++++++++++++++++---------------------- po/pt_PT.po | 110 ++++++++++++++++++++++---------------------- po/rm.po | 106 +++++++++++++++++++++---------------------- po/ro.po | 111 +++++++++++++++++++++++---------------------- po/ru.po | 113 ++++++++++++++++++++++++---------------------- po/sk.po | 106 +++++++++++++++++++++---------------------- po/sl.po | 113 ++++++++++++++++++++++++---------------------- po/sr_RS(a)cyrillic.po | 106 +++++++++++++++++++++---------------------- po/sr_RS(a)latin.po | 106 +++++++++++++++++++++---------------------- po/sv.po | 111 +++++++++++++++++++++++---------------------- po/te.po | 106 +++++++++++++++++++++---------------------- po/th.po | 106 +++++++++++++++++++++---------------------- po/tr.po | 110 ++++++++++++++++++++++---------------------- po/uk.po | 111 +++++++++++++++++++++++---------------------- po/wa.po | 106 +++++++++++++++++++++---------------------- po/wine.pot | 106 +++++++++++++++++++++---------------------- po/zh_CN.po | 106 +++++++++++++++++++++---------------------- po/zh_TW.po | 106 +++++++++++++++++++++---------------------- programs/cmd/cmd.rc | 17 +++---- 46 files changed, 2493 insertions(+), 2457 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=34c0b74ace32aa5cbabb3…

1 0

Francois Gouget : wordpad: Fix the case of the 'Del' accelerator key.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

1 0

Francois Gouget : user32: Use '+' when specifying a modifier + accelerator key combination.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

1 0

Francois Gouget : kernel32: Remove a full stop from an error message for consistency.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

1 0

Francois Gouget : wordpad: Add a full stop at the end of error messages for consistency.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

1 0

Francois Gouget : Use a single space after a full stop to follow the Windows GUI guidelines.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: wine Branch: master Commit: 47f45d793dd726b97717fc9328fa3904616a6daf URL: http://source.winehq.org/git/wine.git/?a=commit;h=47f45d793dd726b97717fc932… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 23 00:36:39 2012 +0100 Use a single space after a full stop to follow the Windows GUI guidelines. --- dlls/cryptui/cryptui.rc | 10 +++--- dlls/msi/msi.rc | 2 +- dlls/oledlg/oledlg.rc | 8 +++--- dlls/shell32/shell32.rc | 2 +- dlls/winspool.drv/winspool.rc | 2 +- po/ar.po | 34 +++++++++++++---------- po/bg.po | 35 +++++++++++++---------- po/ca.po | 43 +++++++++++++++++++---------- po/cs.po | 37 +++++++++++++++---------- po/da.po | 41 +++++++++++++++++---------- po/de.po | 44 +++++++++++++++++++---------- po/el.po | 33 ++++++++++++---------- po/en.po | 42 +++++++++++++++------------- po/en_US.po | 60 ++++++++++++++++++++-------------------- po/eo.po | 34 +++++++++++++---------- po/es.po | 57 ++++++++++++++++++++++++++++---------- po/fa.po | 34 +++++++++++++---------- po/fi.po | 36 ++++++++++++++---------- po/fr.po | 44 +++++++++++++++++++---------- po/he.po | 45 ++++++++++++++++++++---------- po/hi.po | 30 ++++++++++---------- po/hu.po | 52 +++++++++++++++++++++++++---------- po/it.po | 44 +++++++++++++++++++---------- po/ja.po | 44 +++++++++++++++++++---------- po/ko.po | 44 +++++++++++++++++++---------- po/lt.po | 44 +++++++++++++++++++---------- po/ml.po | 30 ++++++++++---------- po/nb_NO.po | 44 +++++++++++++++++++---------- po/nl.po | 60 ++++++++++++++++++++++++++++++---------- po/or.po | 30 ++++++++++---------- po/pa.po | 30 ++++++++++---------- po/pl.po | 44 +++++++++++++++++++---------- po/pt_BR.po | 44 +++++++++++++++++++---------- po/pt_PT.po | 42 ++++++++++++++++++---------- po/rm.po | 30 ++++++++++---------- po/ro.po | 60 ++++++++++++++++++++++++++++++---------- po/ru.po | 44 +++++++++++++++++++---------- po/sk.po | 30 ++++++++++---------- po/sl.po | 44 +++++++++++++++++++---------- po/sr_RS(a)cyrillic.po | 39 ++++++++++++++++---------- po/sr_RS(a)latin.po | 40 +++++++++++++++++---------- po/sv.po | 40 +++++++++++++++++---------- po/te.po | 30 ++++++++++---------- po/th.po | 30 ++++++++++---------- po/tr.po | 38 +++++++++++++++---------- po/uk.po | 44 +++++++++++++++++++---------- po/wa.po | 30 ++++++++++---------- po/wine.pot | 30 ++++++++++---------- po/zh_CN.po | 40 +++++++++++++++++---------- po/zh_TW.po | 40 +++++++++++++++++---------- programs/start/start.rc | 2 +- programs/winecfg/winecfg.rc | 2 +- 52 files changed, 1129 insertions(+), 709 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=47f45d793dd726b97717f…

1 0

Francois Gouget : cryptui: Remove a couple of duplicated spaces.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

1 0