October 2013 - Wine-commits

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: aead747fa5696924f6e836a583649fdab79362b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aead747fa5696924f6e836a58… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Oct 2 20:42:39 2013 +0900 po: Update Japanese translation. --- po/ja.po | 45 +++++++++++---------------------------------- 1 files changed, 11 insertions(+), 34 deletions(-) diff --git a/po/ja.po b/po/ja.po index 744380f..c5087df 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-07-03 23:54+0900\n" +"PO-Revision-Date: 2013-10-02 19:45+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: 日本語 <>\n" "Language: Japanese\n" @@ -8516,16 +8516,11 @@ msgstr "" "直して下さい。" #: winmm.rc:52 winmm.rc:125 -#, fuzzy -#| msgid "" -#| "The current MIDI Mapper setup refers to a MIDI device that is not " -#| "installed on the system. Use MIDI Mapper to edit the setup." msgid "" "The current MIDI Mapper setup refers to a MIDI device that is not installed " "on the system." msgstr "" -"MIDIマッパの設定がシステムに装着されていないデバイスを参照しています。設定を" -"変更するにはコントロールパネルの「MIDIマッパ」アプレットを使用して下さい。" +"MIDI マッパーの設定がシステムに装着されていないデバイスを参照しています。" #: winmm.rc:53 msgid "" @@ -9348,10 +9343,6 @@ msgstr "" "し元に引き継がれます。\n" #: cmd.rc:40 -#, fuzzy -#| msgid "" -#| "CD <dir> is the short version of CHDIR. It changes the current\n" -#| "default directory.\n" msgid "" "CD <directory> is the short version of CHDIR. It changes the current\n" "default directory.\n" @@ -9360,8 +9351,6 @@ msgstr "" "を変更します。\n" #: cmd.rc:41 -#, fuzzy -#| msgid "CHDIR <dir> changes the current default directory.\n" msgid "CHDIR <directory> changes the current default directory.\n" msgstr "CHDIR <ディレクトリ> は現在のデフォルトディレクトリを変更します。\n" @@ -9414,11 +9403,6 @@ msgid "ERASE <filename> deletes a file or set of files.\n" msgstr "ERASE <ファイル名> はファイルやファイル群を削除します。\n" #: cmd.rc:68 -#, fuzzy -#| msgid "" -#| "The FOR command is used to execute a command for each of a set of files.\n" -#| "\n" -#| "Syntax: FOR %variable IN (set) DO command\n" msgid "" "The FOR command is used to execute a command for each of a set of files.\n" "\n" @@ -9426,10 +9410,12 @@ msgid "" "\n" "The % sign must be doubled when using FOR in a batch file.\n" msgstr "" -"FOR コマンドはそれぞれのファイルに対してコマンドを実行する\n" -"場合に使用します。\n" +"FOR コマンドはそれぞれのファイルに対してコマンドを実行する場合に\n" +"使用します。\n" "\n" -"構文: FOR %変数 IN (セット) DO コマンド\n" +"使い方: FOR %変数 IN (セット) DO コマンド\n" +"\n" +"バッチファイルで FOR を利用するとき、% 記号は二重にする必要があります。\n" #: cmd.rc:80 msgid "" @@ -9616,17 +9602,12 @@ msgid "RENAME <filename> renames a file.\n" msgstr "RENAME <ファイル名> はファイルを変名します。\n" #: cmd.rc:158 -#, fuzzy -#| msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgid "RD <directory> is the short version of RMDIR. It deletes a directory.\n" -msgstr "" -"RD <ディレクトリ> は RMDIR の短縮版です。サブディレクトリを削除します。\n" +msgstr "RD <ディレクトリ> は RMDIR の短縮版です。ディレクトリを削除します。\n" #: cmd.rc:159 -#, fuzzy -#| msgid "RMDIR <dir> deletes a subdirectory.\n" msgid "RMDIR <directory> deletes a directory.\n" -msgstr "RMDIR <ディレクトリ> はサブディレクトリを削除します。\n" +msgstr "RMDIR <ディレクトリ> はディレクトリを削除します。\n" #: cmd.rc:203 msgid "" @@ -9799,16 +9780,12 @@ msgstr "" "まで保持されます。終了時点で以前の環境設定が復元されます。\n" #: cmd.rc:245 -#, fuzzy -#| msgid "" -#| "PUSHD <directoryname> saves the current directory onto a\n" -#| "stack, and then changes the current directory to the supplied one.\n" msgid "" "PUSHD <directory> saves the current directory onto a\n" "stack, and then changes the current directory to the supplied one.\n" msgstr "" -"PUSHD <ディレクトリ名> はカレントディレクトリをスタック上に保存し、カ\n" -"レントディレクトリを指定されたディレクトリに変更します。\n" +"PUSHD <ディレクトリ> はカレントディレクトリをスタック上に保存し、\n" +"カレントディレクトリを指定されたディレクトリに変更します。\n" #: cmd.rc:247 msgid "POPD changes current directory to the last one saved with PUSHD.\n"

1 0

Hans Leidekker : wine.inf: Initialize 64-bit prefixes with the right Windows version.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: 621454ef0ed37c19c917aa1aa6dba66e163e07d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=621454ef0ed37c19c917aa1aa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 2 16:04:19 2013 +0200 wine.inf: Initialize 64-bit prefixes with the right Windows version. --- tools/wine.inf.in | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index fcd32cf..357b35c 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -97,7 +97,7 @@ AddReg=\ SessionMgr,\ Tapi,\ Timezones,\ - VersionInfo + VersionInfo.ntamd64 [Wow64Install] RegisterDlls=RegisterDllsSection @@ -111,7 +111,7 @@ AddReg=\ MCI,\ Misc,\ Tapi,\ - VersionInfo + VersionInfo.ntamd64 [DefaultInstall.Services] AddService=BITS,0,BITSService @@ -3028,6 +3028,16 @@ HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" HKLM,%Control%\Windows,"CSDVersion",0x10003,0x300 HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT" +[VersionInfo.ntamd64] +HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.2" +HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1" +HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"3790" +HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" +HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows XP" +HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" +HKLM,%Control%\Windows,"CSDVersion",0x10003,0x100 +HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT" + [Wow64] ; Wow6432Node symlinks HKLM,Software\Classes\Wow6432Node\AppId,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Classes\AppId"

1 0

Hans Leidekker : ws2_32: Avoid a crash with tracing on.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: 59a1e6bff913100d5c191d333c8d1198cb8a0bdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=59a1e6bff913100d5c191d333… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 2 16:04:48 2013 +0200 ws2_32: Avoid a crash with tracing on. --- dlls/ws2_32/socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a5837cf..bd5a476 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2956,7 +2956,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, INT ret = 0; TRACE("socket: %04lx, level 0x%x, name 0x%x, ptr %p, len %d\n", - s, level, optname, optval, *optlen); + s, level, optname, optval, optlen ? *optlen : 0); switch(level) {

1 0

Hans Leidekker : ws2_32: Always clear res on error in getaddrinfo/ GetAddrInfoW.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: 14a092a3369fefb3657237a2828b99d4f7845a20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14a092a3369fefb3657237a28… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 2 16:05:15 2013 +0200 ws2_32: Always clear res on error in getaddrinfo/GetAddrInfoW. --- dlls/ws2_32/socket.c | 8 ++++---- dlls/ws2_32/tests/sock.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index bd5a476..a14f624 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5397,6 +5397,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr char *hostname = NULL; const char *node; + *res = NULL; if (!nodename && !servname) return WSAHOST_NOT_FOUND; if (!nodename) @@ -5479,16 +5480,14 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr xuai = xuai->ai_next; } freeaddrinfo(unixaires); - } else { + } else result = convert_eai_u2w(result); - *res = NULL; - } + return result; outofmem: if (*res) WS_freeaddrinfo(*res); if (unixaires) freeaddrinfo(unixaires); - *res = NULL; return WSA_NOT_ENOUGH_MEMORY; #else FIXME("getaddrinfo() failed, not found during buildtime.\n"); @@ -5595,6 +5594,7 @@ int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hin char *nodenameA = NULL, *servnameA = NULL; struct WS_addrinfo *resA, *hintsA = NULL; + *res = NULL; if (nodename) { len = WideCharToMultiByte(CP_ACP, 0, nodename, -1, NULL, 0, NULL, NULL); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index fddb820..a4c94312 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5092,6 +5092,8 @@ static void test_GetAddrInfoW(void) static const WCHAR port[] = {'8','0',0}; static const WCHAR empty[] = {0}; static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; + static const WCHAR nxdomain[] = + {'n','x','d','o','m','a','i','n','.','c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0}; static const WCHAR zero[] = {'0',0}; int ret; ADDRINFOW *result, hint; @@ -5103,8 +5105,10 @@ static void test_GetAddrInfoW(void) } memset(&hint, 0, sizeof(ADDRINFOW)); + result = (ADDRINFOW *)0xdeadbeef; ret = pGetAddrInfoW(NULL, NULL, NULL, &result); ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(result == NULL, "got %p\n", result); result = NULL; ret = pGetAddrInfoW(empty, NULL, NULL, &result); @@ -5145,9 +5149,24 @@ static void test_GetAddrInfoW(void) pFreeAddrInfoW(result); result = NULL; + ret = pGetAddrInfoW(localhost, NULL, &hint, &result); + ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + pFreeAddrInfoW(result); + + result = NULL; ret = pGetAddrInfoW(localhost, port, &hint, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); pFreeAddrInfoW(result); + + result = (ADDRINFOW *)0xdeadbeef; + ret = pGetAddrInfoW(NULL, NULL, NULL, &result); + ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(result == NULL, "got %p\n", result); + + result = (ADDRINFOW *)0xdeadbeef; + ret = pGetAddrInfoW(nxdomain, NULL, NULL, &result); + ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(result == NULL, "got %p\n", result); } static void test_getaddrinfo(void) @@ -5162,8 +5181,10 @@ static void test_getaddrinfo(void) } memset(&hint, 0, sizeof(ADDRINFOA)); + result = (ADDRINFOA *)0xdeadbeef; ret = pgetaddrinfo(NULL, NULL, NULL, &result); ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(result == NULL, "got %p\n", result); result = NULL; ret = pgetaddrinfo("", NULL, NULL, &result); @@ -5204,9 +5225,19 @@ static void test_getaddrinfo(void) pfreeaddrinfo(result); result = NULL; + ret = pgetaddrinfo("localhost", NULL, &hint, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + pfreeaddrinfo(result); + + result = NULL; ret = pgetaddrinfo("localhost", "80", &hint, &result); ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); pfreeaddrinfo(result); + + result = (ADDRINFOA *)0xdeadbeef; + ret = pgetaddrinfo("nxdomain.codeweavers.com", NULL, NULL, &result); + ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(result == NULL, "got %p\n", result); } static void test_ConnectEx(void)

1 0

Hans Leidekker : ws2_32: Add some tests for getpeername.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: 9530a06fed7a9c5b0f859101b04b6d82d51328b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9530a06fed7a9c5b0f859101b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 2 16:05:45 2013 +0200 ws2_32: Add some tests for getpeername. --- dlls/ws2_32/tests/sock.c | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index a4c94312..9fd8b58 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5960,6 +5960,7 @@ static void test_getpeername(void) { SOCKET sock; struct sockaddr_in sa, sa_out; + SOCKADDR_STORAGE ss; int sa_len; const char buf[] = "hello world"; int ret; @@ -6018,17 +6019,31 @@ static void test_getpeername(void) "Expected WSAGetLastError() to return WSAEFAULT, got %d\n", WSAGetLastError()); } + ret = getpeername(sock, (struct sockaddr*)&sa_out, NULL); + ok(ret == SOCKET_ERROR, "Expected getpeername to return 0, got %d\n", ret); + ok(WSAGetLastError() == WSAEFAULT, + "Expected WSAGetLastError() to return WSAEFAULT, got %d\n", WSAGetLastError()); + sa_len = 0; - ret = getpeername(sock, (struct sockaddr*)&sa_out, &sa_len); - ok(ret == SOCKET_ERROR, "Expected getpeername to return SOCKET_ERROR, got %d\n", ret); + ret = getpeername(sock, NULL, &sa_len); + ok(ret == SOCKET_ERROR, "Expected getpeername to return 0, got %d\n", ret); + ok(WSAGetLastError() == WSAEFAULT, + "Expected WSAGetLastError() to return WSAEFAULT, got %d\n", WSAGetLastError()); + ok(!sa_len, "got %d\n", sa_len); + + sa_len = 0; + ret = getpeername(sock, (struct sockaddr *)&ss, &sa_len); + ok(ret == SOCKET_ERROR, "Expected getpeername to return 0, got %d\n", ret); ok(WSAGetLastError() == WSAEFAULT, "Expected WSAGetLastError() to return WSAEFAULT, got %d\n", WSAGetLastError()); + ok(!sa_len, "got %d\n", sa_len); - sa_len = sizeof(sa_out); - ret = getpeername(sock, (struct sockaddr*)&sa_out, &sa_len); + sa_len = sizeof(ss); + ret = getpeername(sock, (struct sockaddr *)&ss, &sa_len); ok(ret == 0, "Expected getpeername to return 0, got %d\n", ret); - ok(!memcmp(&sa, &sa_out, sizeof(sa)), + ok(!memcmp(&sa, &ss, sizeof(sa)), "Expected the returned structure to be identical to the connect structure\n"); + ok(sa_len == sizeof(sa), "got %d\n", sa_len); closesocket(sock); }

1 0

Hans Leidekker : ws2_32: Return an error from accept if the address buffer is too small.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: 260119e682d484df48bca9e2ec8ad9ccd9e3b8ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=260119e682d484df48bca9e2e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 2 16:06:25 2013 +0200 ws2_32: Return an error from accept if the address buffer is too small. --- dlls/ws2_32/socket.c | 9 ++- dlls/ws2_32/tests/sock.c | 165 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 145 insertions(+), 29 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a14f624..1d2fbcb 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2247,8 +2247,7 @@ static int WS2_register_async_shutdown( SOCKET s, int type ) /*********************************************************************** * accept (WS2_32.1) */ -SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, - int *addrlen32) +SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, int *addrlen32) { NTSTATUS status; SOCKET as; @@ -2275,7 +2274,11 @@ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, SERVER_END_REQ; if (!status) { - if (addr) WS_getpeername(as, addr, addrlen32); + if (addr && WS_getpeername(as, addr, addrlen32)) + { + WS_closesocket(as); + return SOCKET_ERROR; + } return as; } if (is_blocking && status == STATUS_CANT_WAIT) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9fd8b58..2cf851f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3110,54 +3110,93 @@ static int CALLBACK AlwaysDeferConditionFunc(LPWSABUF lpCallerId, LPWSABUF lpCal return CF_DEFER; } -static void test_accept(void) +static SOCKET setup_server_socket(struct sockaddr_in *addr, int *len) { - int ret; - SOCKET server_socket = INVALID_SOCKET, accepted = INVALID_SOCKET, connector = INVALID_SOCKET; - struct sockaddr_in address; - int socklen; - select_thread_params thread_params; - HANDLE thread_handle = NULL; - DWORD id; + int ret, val; + SOCKET server_socket; server_socket = socket(AF_INET, SOCK_STREAM, 0); if (server_socket == INVALID_SOCKET) { trace("error creating server socket: %d\n", WSAGetLastError()); - goto done; + return INVALID_SOCKET; } - memset(&address, 0, sizeof(address)); - address.sin_addr.s_addr = inet_addr("127.0.0.1"); - address.sin_family = AF_INET; - ret = bind(server_socket, (struct sockaddr*) &address, sizeof(address)); - if (ret != 0) + val = 1; + ret = setsockopt(server_socket, SOL_SOCKET, SO_REUSEADDR, (char *)&val, sizeof(val)); + if (ret) + { + trace("error setting SO_REUSEADDR: %d\n", WSAGetLastError()); + closesocket(server_socket); + return INVALID_SOCKET; + } + + ret = bind(server_socket, (struct sockaddr *)addr, *len); + if (ret) { trace("error binding server socket: %d\n", WSAGetLastError()); - goto done; } - socklen = sizeof(address); - ret = getsockname(server_socket, (struct sockaddr*)&address, &socklen); - if (ret != 0) { - skip("failed to lookup bind address, error %d\n", WSAGetLastError()); - goto done; + ret = getsockname(server_socket, (struct sockaddr *)addr, len); + if (ret) + { + skip("failed to lookup bind address: %d\n", WSAGetLastError()); + closesocket(server_socket); + return INVALID_SOCKET; } ret = listen(server_socket, 5); - if (ret != 0) + if (ret) { trace("error making server socket listen: %d\n", WSAGetLastError()); - goto done; + closesocket(server_socket); + return INVALID_SOCKET; } - trace("Blocking accept next\n"); + return server_socket; +} + +static SOCKET setup_connector_socket(struct sockaddr_in *addr, int len) +{ + int ret; + SOCKET connector; connector = socket(AF_INET, SOCK_STREAM, 0); - ok(connector != INVALID_SOCKET, "Failed to create connector socket, error %d\n", WSAGetLastError()); + ok(connector != INVALID_SOCKET, "failed to create connector socket %d\n", WSAGetLastError()); + + ret = connect(connector, (struct sockaddr *)addr, len); + ok(!ret, "connecting to accepting socket failed %d\n", WSAGetLastError()); - ret = connect(connector, (struct sockaddr*)&address, sizeof(address)); - ok(ret == 0, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); + return connector; +} + +static void test_accept(void) +{ + int ret; + SOCKET server_socket, accepted = INVALID_SOCKET, connector; + struct sockaddr_in address; + SOCKADDR_STORAGE ss; + int socklen; + select_thread_params thread_params; + HANDLE thread_handle = NULL; + DWORD id; + + memset(&address, 0, sizeof(address)); + address.sin_addr.s_addr = inet_addr("127.0.0.1"); + address.sin_family = AF_INET; + + socklen = sizeof(address); + server_socket = setup_server_socket(&address, &socklen); + if (server_socket == INVALID_SOCKET) + { + trace("error creating server socket: %d\n", WSAGetLastError()); + return; + } + + connector = setup_connector_socket(&address, socklen); + if (connector == INVALID_SOCKET) goto done; + + trace("Blocking accept next\n"); accepted = WSAAccept(server_socket, NULL, NULL, AlwaysDeferConditionFunc, 0); ok(accepted == INVALID_SOCKET && WSAGetLastError() == WSATRY_AGAIN, "Failed to defer connection, %d\n", WSAGetLastError()); @@ -3194,6 +3233,80 @@ static void test_accept(void) ok(thread_params.ReadKilled || broken(!thread_params.ReadKilled) /* Win98/ME, after accept */, "closesocket did not wakeup accept\n"); + closesocket(accepted); + closesocket(connector); + accepted = connector = server_socket = INVALID_SOCKET; + + socklen = sizeof(address); + server_socket = setup_server_socket(&address, &socklen); + if (server_socket == INVALID_SOCKET) goto done; + + connector = setup_connector_socket(&address, socklen); + if (connector == INVALID_SOCKET) goto done; + + socklen = 0; + accepted = WSAAccept(server_socket, (struct sockaddr *)&ss, &socklen, NULL, 0); + todo_wine ok(accepted == INVALID_SOCKET && WSAGetLastError() == WSAEFAULT, "got %d\n", WSAGetLastError()); + ok(!socklen, "got %d\n", socklen); + closesocket(connector); + connector = INVALID_SOCKET; + + socklen = sizeof(address); + connector = setup_connector_socket(&address, socklen); + if (connector == INVALID_SOCKET) goto done; + + accepted = WSAAccept(server_socket, NULL, NULL, NULL, 0); + ok(accepted != INVALID_SOCKET, "Failed to accept connection, %d\n", WSAGetLastError()); + closesocket(accepted); + closesocket(connector); + accepted = connector = INVALID_SOCKET; + + socklen = sizeof(address); + connector = setup_connector_socket(&address, socklen); + if (connector == INVALID_SOCKET) goto done; + + socklen = sizeof(ss); + memset(&ss, 0, sizeof(ss)); + accepted = WSAAccept(server_socket, (struct sockaddr *)&ss, &socklen, NULL, 0); + ok(accepted != INVALID_SOCKET, "Failed to accept connection, %d\n", WSAGetLastError()); + todo_wine ok(socklen != sizeof(ss), "unexpected length\n"); + todo_wine ok(ss.ss_family, "family not set\n"); + closesocket(accepted); + closesocket(connector); + accepted = connector = INVALID_SOCKET; + + socklen = sizeof(address); + connector = setup_connector_socket(&address, socklen); + if (connector == INVALID_SOCKET) goto done; + + socklen = 0; + accepted = accept(server_socket, (struct sockaddr *)&ss, &socklen); + ok(accepted == INVALID_SOCKET && WSAGetLastError() == WSAEFAULT, "got %d\n", WSAGetLastError()); + ok(!socklen, "got %d\n", socklen); + closesocket(connector); + accepted = connector = INVALID_SOCKET; + + socklen = sizeof(address); + connector = setup_connector_socket(&address, socklen); + if (connector == INVALID_SOCKET) goto done; + + accepted = accept(server_socket, NULL, NULL); + ok(accepted != INVALID_SOCKET, "Failed to accept connection, %d\n", WSAGetLastError()); + closesocket(accepted); + closesocket(connector); + accepted = connector = INVALID_SOCKET; + + socklen = sizeof(address); + connector = setup_connector_socket(&address, socklen); + if (connector == INVALID_SOCKET) goto done; + + socklen = sizeof(ss); + memset(&ss, 0, sizeof(ss)); + accepted = accept(server_socket, (struct sockaddr *)&ss, &socklen); + ok(accepted != INVALID_SOCKET, "Failed to accept connection, %d\n", WSAGetLastError()); + ok(socklen != sizeof(ss), "unexpected length\n"); + ok(ss.ss_family, "family not set\n"); + done: if (accepted != INVALID_SOCKET) closesocket(accepted);

1 0

Hans Leidekker : ws2_32: Always return the source address from WSAAccept.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: 1422a56667f1672fa75c3f4126d44d8e7f95e397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1422a56667f1672fa75c3f412… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 2 16:07:02 2013 +0200 ws2_32: Always return the source address from WSAAccept. --- dlls/ws2_32/socket.c | 27 +++++++++++++++------------ dlls/ws2_32/tests/sock.c | 6 +++--- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1d2fbcb..1b1815c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6555,7 +6555,7 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct WS_sockaddr *addr, LPINT addrlen, LPCONDITIONPROC lpfnCondition, DWORD_PTR dwCallbackData) { - int ret = 0, size = 0; + int ret = 0, size; WSABUF CallerId, CallerData, CalleeId, CalleeData; /* QOS SQOS, GQOS; */ GROUP g; @@ -6565,34 +6565,37 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct WS_sockaddr *addr, LPINT addrlen, TRACE("Socket %04lx, sockaddr %p, addrlen %p, fnCondition %p, dwCallbackData %ld\n", s, addr, addrlen, lpfnCondition, dwCallbackData); - - size = sizeof(src_addr); - cs = WS_accept(s, &src_addr, &size); - + cs = WS_accept(s, addr, addrlen); if (cs == SOCKET_ERROR) return SOCKET_ERROR; - if (!lpfnCondition) return cs; - CallerId.buf = (char *)&src_addr; - CallerId.len = sizeof(src_addr); - + if (addr && addrlen) + { + CallerId.buf = (char *)addr; + CallerId.len = *addrlen; + } + else + { + size = sizeof(src_addr); + WS_getpeername(cs, &src_addr, &size); + CallerId.buf = (char *)&src_addr; + CallerId.len = size; + } CallerData.buf = NULL; CallerData.len = 0; + size = sizeof(dst_addr); WS_getsockname(cs, &dst_addr, &size); CalleeId.buf = (char *)&dst_addr; CalleeId.len = sizeof(dst_addr); - ret = (*lpfnCondition)(&CallerId, &CallerData, NULL, NULL, &CalleeId, &CalleeData, &g, dwCallbackData); switch (ret) { case CF_ACCEPT: - if (addr && addrlen) - memcpy(addr, &src_addr, (*addrlen > size) ? size : *addrlen ); return cs; case CF_DEFER: SERVER_START_REQ( set_socket_deferred ) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2cf851f..898ecef 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3246,7 +3246,7 @@ static void test_accept(void) socklen = 0; accepted = WSAAccept(server_socket, (struct sockaddr *)&ss, &socklen, NULL, 0); - todo_wine ok(accepted == INVALID_SOCKET && WSAGetLastError() == WSAEFAULT, "got %d\n", WSAGetLastError()); + ok(accepted == INVALID_SOCKET && WSAGetLastError() == WSAEFAULT, "got %d\n", WSAGetLastError()); ok(!socklen, "got %d\n", socklen); closesocket(connector); connector = INVALID_SOCKET; @@ -3269,8 +3269,8 @@ static void test_accept(void) memset(&ss, 0, sizeof(ss)); accepted = WSAAccept(server_socket, (struct sockaddr *)&ss, &socklen, NULL, 0); ok(accepted != INVALID_SOCKET, "Failed to accept connection, %d\n", WSAGetLastError()); - todo_wine ok(socklen != sizeof(ss), "unexpected length\n"); - todo_wine ok(ss.ss_family, "family not set\n"); + ok(socklen != sizeof(ss), "unexpected length\n"); + ok(ss.ss_family, "family not set\n"); closesocket(accepted); closesocket(connector); accepted = connector = INVALID_SOCKET;

1 0

Ken Thomases : winemac: Remove a too-early attempt to set the process' s Dock icon.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: 7c55e912da3a488c8681678241d68d7033d85f6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c55e912da3a488c868167824… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Sep 30 22:18:30 2013 -0500 winemac: Remove a too-early attempt to set the process's Dock icon. --- dlls/winemac.drv/cocoa_app.m | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index e6e5c2e..4b5d1ff 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -878,7 +878,6 @@ int macdrv_err_on; } self.applicationIcon = nsimage; - [NSApp setApplicationIconImage:nsimage]; } - (void) handleCommandTab

1 0

Ken Thomases : winemac: Reapply display modes when switching back to app after "escaping" with Command-Tab.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: b7709771d1be742b04cb3b53c20a14c499e961fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7709771d1be742b04cb3b53c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Oct 1 23:24:13 2013 -0500 winemac: Reapply display modes when switching back to app after "escaping" with Command-Tab. The Mac driver captures the displays when the program changes the display mode. If the user types Command-Tab to switch away, it resets the displays to their original modes and releases them. However, if they switched back, it didn't restore the mode to what the program had set, so the program often showed the game window in a corner of the screen with the top behind the Mac menu bar. --- dlls/winemac.drv/cocoa_app.h | 1 + dlls/winemac.drv/cocoa_app.m | 58 ++++++++++++++++++++++++++++++++++-------- 2 files changed, 48 insertions(+), 11 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 25f60f6..a398bf1 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -67,6 +67,7 @@ enum { NSUInteger unmatchedMouseDowns; NSMutableDictionary* originalDisplayModes; + NSMutableDictionary* latentDisplayModes; BOOL displaysCapturedForFullscreen; NSArray* cursorFrames; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 4b5d1ff..632a1bb 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -149,11 +149,12 @@ int macdrv_err_on; keyWindows = [[NSMutableArray alloc] init]; originalDisplayModes = [[NSMutableDictionary alloc] init]; + latentDisplayModes = [[NSMutableDictionary alloc] init]; warpRecords = [[NSMutableArray alloc] init]; if (!requests || !requestsManipQueue || !eventQueues || !eventQueuesLock || - !keyWindows || !originalDisplayModes || !warpRecords) + !keyWindows || !originalDisplayModes || !latentDisplayModes || !warpRecords) { [self release]; return nil; @@ -176,6 +177,7 @@ int macdrv_err_on; [warpRecords release]; [cursorTimer release]; [cursorFrames release]; + [latentDisplayModes release]; [originalDisplayModes release]; [keyWindows release]; [eventQueues release]; @@ -686,10 +688,14 @@ int macdrv_err_on; - (BOOL) setMode:(CGDisplayModeRef)mode forDisplay:(CGDirectDisplayID)displayID { BOOL ret = FALSE; + BOOL active = [NSApp isActive]; NSNumber* displayIDKey = [NSNumber numberWithUnsignedInt:displayID]; - CGDisplayModeRef currentMode, originalMode; + CGDisplayModeRef currentMode = NULL, originalMode; - currentMode = CGDisplayCopyDisplayMode(displayID); + if (!active) + currentMode = CGDisplayModeRetain((CGDisplayModeRef)[latentDisplayModes objectForKey:displayIDKey]); + if (!currentMode) + currentMode = CGDisplayCopyDisplayMode(displayID); if (!currentMode) // Invalid display ID return FALSE; @@ -714,34 +720,47 @@ int macdrv_err_on; { if ([originalDisplayModes count] == 1) // If this is the last changed display, do a blanket reset { - CGRestorePermanentDisplayConfiguration(); - if (!displaysCapturedForFullscreen) - CGReleaseAllDisplays(); + if (active) + { + CGRestorePermanentDisplayConfiguration(); + if (!displaysCapturedForFullscreen) + CGReleaseAllDisplays(); + } [originalDisplayModes removeAllObjects]; + [latentDisplayModes removeAllObjects]; ret = TRUE; } else // ... otherwise, try to restore just the one display { - if (CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr) + if (active) + ret = (CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr); + else { - [originalDisplayModes removeObjectForKey:displayIDKey]; + [latentDisplayModes removeObjectForKey:displayIDKey]; ret = TRUE; } + if (ret) + [originalDisplayModes removeObjectForKey:displayIDKey]; } } else { if ([originalDisplayModes count] || displaysCapturedForFullscreen || - CGCaptureAllDisplays() == CGDisplayNoErr) + !active || CGCaptureAllDisplays() == CGDisplayNoErr) { - if (CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr) + if (active) + ret = (CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr); + else { - [originalDisplayModes setObject:(id)originalMode forKey:displayIDKey]; + [latentDisplayModes setObject:(id)mode forKey:displayIDKey]; ret = TRUE; } + if (ret) + [originalDisplayModes setObject:(id)originalMode forKey:displayIDKey]; else if (![originalDisplayModes count]) { CGRestorePermanentDisplayConfiguration(); + [latentDisplayModes removeAllObjects]; if (!displaysCapturedForFullscreen) CGReleaseAllDisplays(); } @@ -890,6 +909,14 @@ int macdrv_err_on; if ([originalDisplayModes count] || displaysCapturedForFullscreen) { + NSNumber* displayID; + for (displayID in originalDisplayModes) + { + CGDisplayModeRef mode = CGDisplayCopyDisplayMode([displayID unsignedIntValue]); + [latentDisplayModes setObject:(id)mode forKey:displayID]; + CGDisplayModeRelease(mode); + } + CGRestorePermanentDisplayConfiguration(); CGReleaseAllDisplays(); [originalDisplayModes removeAllObjects]; @@ -1894,6 +1921,15 @@ int macdrv_err_on; */ - (void)applicationDidBecomeActive:(NSNotification *)notification { + NSNumber* displayID; + + for (displayID in latentDisplayModes) + { + CGDisplayModeRef mode = (CGDisplayModeRef)[latentDisplayModes objectForKey:displayID]; + [self setMode:mode forDisplay:[displayID unsignedIntValue]]; + } + [latentDisplayModes removeAllObjects]; + [self activateCursorClipping]; [self updateFullscreenWindows];

1 0

Andrew Eikum : riched20: Continue interpreting data as UTF-8 after the first chunk boundary.
by Alexandre Julliard 02 Oct '13

02 Oct '13

Module: wine Branch: master Commit: 360afb93b57460ed113607a970504de1f86651e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=360afb93b57460ed113607a97… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 1 12:58:53 2013 -0500 riched20: Continue interpreting data as UTF-8 after the first chunk boundary. --- dlls/riched20/editor.c | 56 +++++++++++++++++++++++++++++++++++++++-- dlls/riched20/tests/editor.c | 39 +++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 9af8a23..42f5770 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -286,6 +286,9 @@ static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStrea WCHAR *pText; LRESULT total_bytes_read = 0; BOOL is_read = FALSE; + DWORD cp = CP_ACP, copy = 0; + char conv_buf[4 + STREAMIN_BUFFER_SIZE]; /* up to 4 additional UTF-8 bytes */ + static const char bom_utf8[] = {0xEF, 0xBB, 0xBF}; TRACE("%08x %p\n", dwFormat, stream); @@ -307,8 +310,7 @@ static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStrea if (!(dwFormat & SF_UNICODE)) { char * buf = stream->buffer; - DWORD size = stream->dwSize; - DWORD cp = CP_ACP; + DWORD size = stream->dwSize, end; if (!is_read) { @@ -321,8 +323,56 @@ static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStrea } } - nWideChars = MultiByteToWideChar(cp, 0, buf, size, wszText, STREAMIN_BUFFER_SIZE); + if (cp == CP_UTF8) + { + if (copy) + { + memcpy(conv_buf + copy, buf, size); + buf = conv_buf; + size += copy; + } + end = size; + while ((buf[end-1] & 0xC0) == 0x80) + { + --end; + --total_bytes_read; /* strange, but seems to match windows */ + } + if (buf[end-1] & 0x80) + { + DWORD need = 0; + if ((buf[end-1] & 0xE0) == 0xC0) + need = 1; + if ((buf[end-1] & 0xF0) == 0xE0) + need = 2; + if ((buf[end-1] & 0xF8) == 0xF0) + need = 3; + + if (size - end >= need) + { + /* we have enough bytes for this sequence */ + end = size; + } + else + { + /* need more bytes, so don't transcode this sequence */ + --end; + } + } + } + else + end = size; + + nWideChars = MultiByteToWideChar(cp, 0, buf, end, wszText, STREAMIN_BUFFER_SIZE); pText = wszText; + + if (cp == CP_UTF8) + { + if (end != size) + { + memcpy(conv_buf, buf + end, size - end); + copy = size - end; + } + } } else { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 15e1132..3c2e471 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5035,6 +5035,29 @@ static DWORD CALLBACK test_EM_STREAMIN_esCallback(DWORD_PTR dwCookie, return 0; } +static DWORD CALLBACK test_EM_STREAMIN_esCallback_UTF8Split(DWORD_PTR dwCookie, + LPBYTE pbBuff, + LONG cb, + LONG *pcb) +{ + DWORD *phase = (DWORD *)dwCookie; + + if(*phase == 0){ + static const char first[] = "\xef\xbb\xbf\xc3\x96\xc3"; + *pcb = sizeof(first) - 1; + memcpy(pbBuff, first, *pcb); + }else if(*phase == 1){ + static const char second[] = "\x8f\xc3\x8b"; + *pcb = sizeof(second) - 1; + memcpy(pbBuff, second, *pcb); + }else + *pcb = 0; + + ++*phase; + + return 0; +} + struct StringWithLength { int length; char *buffer; @@ -5063,6 +5086,7 @@ static DWORD CALLBACK test_EM_STREAMIN_esCallback2(DWORD_PTR dwCookie, static void test_EM_STREAMIN(void) { HWND hwndRichEdit = new_richedit(NULL); + DWORD phase; LRESULT result; EDITSTREAM es; char buffer[1024] = {0}; @@ -5204,6 +5228,21 @@ static void test_EM_STREAMIN(void) "EM_STREAMIN: Test UTF8WithBOM set wrong text: Result: %s\n",buffer); ok(es.dwError == 0, "EM_STREAMIN: Test UTF8WithBOM set error %d, expected %d\n", es.dwError, 0); + phase = 0; + es.dwCookie = (DWORD_PTR)&phase; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback_UTF8Split; + result = SendMessage(hwndRichEdit, EM_STREAMIN, SF_TEXT, (LPARAM)&es); + ok(result == 8, "got %ld\n", result); + + result = SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok(result == 3, + "EM_STREAMIN: Test UTF8Split returned %ld\n", result); + result = memcmp (buffer,"\xd6\xcf\xcb", 3); + ok(result == 0, + "EM_STREAMIN: Test UTF8Split set wrong text: Result: %s\n",buffer); + ok(es.dwError == 0, "EM_STREAMIN: Test UTF8Split set error %d, expected %d\n", es.dwError, 0); + es.dwCookie = (DWORD_PTR)&cookieForStream4; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback2;

1 0