October 2013 - Wine-Commits

Hans Leidekker : ws2_32: Add some tests for getpeername.
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

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: Avoid a crash with tracing on.
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

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

Jeff Klein : mmdevapi/tests: Add some tests for MMDevPropStore_GetAt.
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

Module: wine Branch: master Commit: fabffe2b94dd7e008015484c67cce59e69110e7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fabffe2b94dd7e008015484c6… Author: Jeff Klein <jeffrey.a.klein(a)gmail.com> Date: Sun Sep 29 17:26:35 2013 -0400 mmdevapi/tests: Add some tests for MMDevPropStore_GetAt. --- dlls/mmdevapi/tests/propstore.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index 41f275d..2b5f391 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -81,6 +81,34 @@ static void test_deviceinterface(IPropertyStore *store) CoTaskMemFree(pv.u.pwszVal); } +static void test_getat(IPropertyStore *store) +{ + HRESULT hr; + DWORD propcount; + DWORD prop; + PROPERTYKEY pkey; + BOOL found_name = FALSE; + BOOL found_desc = FALSE; + char temp[128]; + temp[sizeof(temp)-1] = 0; + + hr = IPropertyStore_GetCount(store, &propcount); + + ok(hr == S_OK, "Failed with %08x\n", hr); + ok(propcount > 0, "Propcount %d should be greather than zero\n", propcount); + + for (prop = 0; prop < propcount; prop++) { + hr = IPropertyStore_GetAt(store, prop, &pkey); + ok(hr == S_OK, "Failed with %08x\n", hr); + if (IsEqualPropertyKey(pkey, DEVPKEY_Device_FriendlyName)) + found_name = TRUE; + if (IsEqualPropertyKey(pkey, DEVPKEY_Device_DeviceDesc)) + found_desc = TRUE; + } + ok(found_name == TRUE, "DEVPKEY_Device_FriendlyName not found\n"); + ok(found_desc == TRUE, "DEVPKEY_Device_DeviceDesc not found\n"); +} + START_TEST(propstore) { HRESULT hr; @@ -127,6 +155,7 @@ START_TEST(propstore) { test_propertystore(store); test_deviceinterface(store); + test_getat(store); IPropertyStore_Release(store); } IMMDevice_Release(dev);

1 0

Jeff Klein : mmdevapi: Correct MMDevPropStore_GetAt.
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

Module: wine Branch: master Commit: 5b47e9b382d05532c3b8a5b68b63cfa4fa8408b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b47e9b382d05532c3b8a5b68… Author: Jeff Klein <jeffrey.a.klein(a)gmail.com> Date: Sun Sep 29 17:26:36 2013 -0400 mmdevapi: Correct MMDevPropStore_GetAt. --- dlls/mmdevapi/devenum.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index eebf4ed..6bb0d3f 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -1343,10 +1343,10 @@ static HRESULT WINAPI MMDevPropStore_GetCount(IPropertyStore *iface, DWORD *npro *nprops = 0; do { DWORD len = sizeof(buffer)/sizeof(*buffer); - if (RegEnumKeyExW(propkey, i, buffer, &len, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) + if (RegEnumValueW(propkey, i, buffer, &len, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) break; i++; - } while (0); + } while (1); RegCloseKey(propkey); TRACE("Returning %i\n", i); *nprops = i; @@ -1369,16 +1369,16 @@ static HRESULT WINAPI MMDevPropStore_GetAt(IPropertyStore *iface, DWORD prop, PR if (FAILED(hr)) return hr; - if (RegEnumKeyExW(propkey, prop, buffer, &len, NULL, NULL, NULL, NULL) != ERROR_SUCCESS - || len <= 40) + if (RegEnumValueW(propkey, prop, buffer, &len, NULL, NULL, NULL, NULL) != ERROR_SUCCESS + || len <= 39) { WARN("GetAt %u failed\n", prop); return E_INVALIDARG; } RegCloseKey(propkey); - buffer[39] = 0; + buffer[38] = 0; CLSIDFromString(buffer, &key->fmtid); - key->pid = atoiW(&buffer[40]); + key->pid = atoiW(&buffer[39]); return S_OK; }

1 0

Sebastian Lackner : winex11: Call sync_context for DC_GL_CHILD_WIN drawables before swapping buffers.
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

Module: wine Branch: master Commit: 4e9646a7f74da5f91b164b0b0a411b4b1f3c731d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e9646a7f74da5f91b164b0b0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Oct 1 07:29:05 2013 +0200 winex11: Call sync_context for DC_GL_CHILD_WIN drawables before swapping buffers. --- dlls/winex11.drv/opengl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 3e8480b..e9a0433 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -3220,6 +3220,7 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) pglXSwapBuffers(gdi_display, gl->drawable); break; case DC_GL_CHILD_WIN: + if (ctx) sync_context( ctx ); escape.gl_drawable = gl->drawable; /* fall through */ default:

1 0

Aric Stewart : imm32: ImmGetCandidateWindow should not return unset data.
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

Module: wine Branch: master Commit: bd9e6081333240050584eb216b208728fbccf13b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd9e6081333240050584eb216… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 1 14:30:12 2013 -0500 imm32: ImmGetCandidateWindow should not return unset data. --- dlls/imm32/imm.c | 7 +++++++ dlls/imm32/tests/imm32.c | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 93e71af..4738103 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -636,6 +636,7 @@ HIMC WINAPI ImmCreateContext(void) InputContextData *new_context; LPGUIDELINE gl; LPCANDIDATEINFO ci; + int i; new_context = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(InputContextData)); @@ -663,6 +664,9 @@ HIMC WINAPI ImmCreateContext(void) gl->dwSize = sizeof(GUIDELINE); ImmUnlockIMCC(new_context->IMC.hGuideLine); + for (i = 0; i < sizeof(new_context->IMC.cfCandForm) / sizeof(CANDIDATEFORM); i++) + new_context->IMC.cfCandForm[i].dwIndex = ~0u; + /* Initialize the IME Private */ new_context->IMC.hPrivate = ImmCreateIMCC(new_context->immKbd->imeInfo.dwPrivateDataSize); @@ -1035,6 +1039,9 @@ BOOL WINAPI ImmGetCandidateWindow( if ( dwIndex >= (sizeof(data->IMC.cfCandForm) / sizeof(CANDIDATEFORM)) ) return FALSE; + if (data->IMC.cfCandForm[dwIndex].dwIndex != dwIndex) + return FALSE; + *lpCandidate = data->IMC.cfCandForm[dwIndex]; return TRUE; diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 0324304..7b81965 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -465,6 +465,7 @@ static void test_ImmThreads(void) BOOL rc; LOGFONT lf; COMPOSITIONFORM cf; + CANDIDATEFORM cdf; DWORD status, sentence; POINT pt; @@ -552,6 +553,23 @@ static void test_ImmThreads(void) rc = ImmGetStatusWindowPos(otherHimc, &pt); ok(rc != 0 || broken(rc == 0), "ImmGetStatusWindowPos failed\n"); + /* Candidate Window */ + rc = ImmGetCandidateWindow(himc, 0, &cdf); + ok (rc == 0, "ImmGetCandidateWindow should fail\n"); + cdf.dwIndex = 0; + cdf.dwStyle = CFS_CANDIDATEPOS; + cdf.ptCurrentPos.x = 0; + cdf.ptCurrentPos.y = 0; + rc = ImmSetCandidateWindow(himc, &cdf); + ok (rc == 1, "ImmSetCandidateWindow should succeed\n"); + rc = ImmGetCandidateWindow(himc, 0, &cdf); + ok (rc == 1, "ImmGetCandidateWindow should succeed\n"); + + rc = ImmGetCandidateWindow(otherHimc, 0, &cdf); + todo_wine ok (rc == 0, "ImmGetCandidateWindow should fail\n"); + rc = ImmSetCandidateWindow(otherHimc, &cdf); + todo_wine ok (rc == 0, "ImmSetCandidateWindow should fail\n"); + ImmReleaseContext(threadinfo.hwnd,otherHimc); ImmReleaseContext(hwnd,himc);

1 0

Bruno Jesus : po: Update Brazilian Portuguese translation.
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

Module: wine Branch: master Commit: cba5984330a8f010698d9cf4c6dfc391c409ccdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=cba5984330a8f010698d9cf4c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Oct 1 20:35:35 2013 -0300 po: Update Brazilian Portuguese translation. --- po/pt_BR.po | 44 ++++++++++++-------------------------------- 1 files changed, 12 insertions(+), 32 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 1894562..2e87c43 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8544,17 +8544,12 @@ msgstr "" "terminarem de ser transmitidos e tente novamente." #: 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 "" "A configuração atual do Mapeador MIDI refere-se a um dispositivo MIDI que " -"não está instalado no sistema. Use o Mapeador MIDI para editar a " -"configuração." +"não está instalado no sistema." #: winmm.rc:53 msgid "" @@ -9401,21 +9396,16 @@ msgstr "" "procedimento chamado são herdados pelo chamador.\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" msgstr "" -"CD <dir> é a abreviação de CHDIR. Ele altera o diretório padrão atual.\n" +"CD <diretório> é a abreviação de CHDIR. Ele altera o diretório padrão " +"atual.\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 <dir> altera o diretório padrão atual.\n" +msgstr "CHDIR <diretório> altera o diretório padrão atual.\n" #: cmd.rc:43 msgid "CLS clears the console screen.\n" @@ -9467,11 +9457,6 @@ msgid "ERASE <filename> deletes a file or set of files.\n" msgstr "ERASE <nomedearquivo> exclui um arquivo ou conjunto de arquivos.\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" @@ -9479,10 +9464,13 @@ msgid "" "\n" "The % sign must be doubled when using FOR in a batch file.\n" msgstr "" -"O comando FOR é usado para executar um comando a cada vez em\n" -"um conjunto de arquivos.\n" +"O comando FOR é usado para executar um comando em cada arquivo de um " +"conjunto\n" +"de arquivos.\n" "\n" "Sintaxe: FOR %variável IN (conjunto) DO comando\n" +"\n" +"O sinal de % deve ser duplicado quando se usa o FOR em um arquivo de lotes.\n" #: cmd.rc:80 msgid "" @@ -9674,16 +9662,12 @@ msgid "RENAME <filename> renames a file.\n" msgstr "RENAME <nomedearquivo> renomeia um arquivo.\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 <dir> é a abreviação de RMDIR. Ela exclui um subdiretório.\n" +msgstr "RD <diretório> é a abreviação de RMDIR. Ela exclui um diretório.\n" #: cmd.rc:159 -#, fuzzy -#| msgid "RMDIR <dir> deletes a subdirectory.\n" msgid "RMDIR <directory> deletes a directory.\n" -msgstr "RMDIR <dir> exclui um subdiretório.\n" +msgstr "RMDIR <diretório> exclui um diretório.\n" #: cmd.rc:203 msgid "" @@ -9856,15 +9840,11 @@ msgstr "" "anteriores são restauradas.\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 <nomedediretório> salva o diretório atual numa pilha e então altera o\n" +"PUSHD <diretório> salva o diretório atual em uma pilha e então altera o\n" "diretório atual para o que foi fornecido.\n" #: cmd.rc:247

1 0

Hans Leidekker : ws2_32: Always return the source address from WSAAccept.
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

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

Hans Leidekker : wine.inf: Initialize 64-bit prefixes with the right Windows version.
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

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: Return an error from accept if the address buffer is too small.
by Alexandre Julliard Oct. 2, 2013

Oct. 2, 2013

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