February 2017 - Wine-Commits

Józef Kucia : d3d8: Allocate WINED3DCAPS on stack.
by Alexandre Julliard Feb. 20, 2017

Feb. 20, 2017

Module: wine Branch: master Commit: f7ca55f63a7a6815a80541c48c976af7e4130a72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7ca55f63a7a6815a80541c48… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 20 13:12:12 2017 +0100 d3d8: Allocate WINED3DCAPS on stack. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_private.h | 106 +++++++++++++++++++++++------------------------ dlls/d3d8/device.c | 12 ++---- dlls/d3d8/directx.c | 12 ++---- 3 files changed, 61 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7ca55f63a7a6815a8054…

1 0

Stefan Dösinger : d3d9/tests: Allow a higher slop for test_updatetexture.
by Alexandre Julliard Feb. 20, 2017

Feb. 20, 2017

Module: wine Branch: master Commit: 28207ea49f64204882769d056256367c4d6d0403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28207ea49f64204882769d056… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Feb 19 11:47:54 2017 +0000 d3d9/tests: Allow a higher slop for test_updatetexture. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 75c6020..4de3beb 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19917,7 +19917,7 @@ static void test_updatetexture(void) ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); color = getPixelColor(device, 320, 240); - ok (color_match(color, 0x007f7f00, 2) || broken(tests[i].broken) + ok (color_match(color, 0x007f7f00, 3) || broken(tests[i].broken) || broken(color == 0x00adbeef), /* WARP device often just breaks down. */ "Got unexpected color 0x%08x, case %u, %u.\n", color, t, i); }

1 0

Bruno Jesus : ws2_32/tests: Add IP_HDRINCL tests.
by Alexandre Julliard Feb. 20, 2017

Feb. 20, 2017

Module: wine Branch: master Commit: 19666ef55bb28ecaa4bbe14063ce0e1f25fa243f URL: http://source.winehq.org/git/wine.git/?a=commit;h=19666ef55bb28ecaa4bbe1406… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Feb 20 01:48:30 2017 -0300 ws2_32/tests: Add IP_HDRINCL tests. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7208088..59a23d7 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1565,6 +1565,8 @@ todo_wine /* test SO_PROTOCOL_INFO structure returned for different protocols */ for (i = 0; i < sizeof(prottest) / sizeof(prottest[0]); i++) { + int k; + s = socket(prottest[i].family, prottest[i].type, prottest[i].proto); if (s == INVALID_SOCKET && prottest[i].family == AF_INET6) continue; @@ -1609,6 +1611,76 @@ todo_wine ok(infoA.iProtocol == prottest[i].proto, "socket protocol invalid, expected %d received %d\n", prottest[i].proto, infoA.iProtocol); + /* IP_HDRINCL is supported only on SOCK_RAW but passed to SOCK_DGRAM by Impossible Creatures */ + size = sizeof(i); + k = 1; + SetLastError(0xdeadbeef); + err = setsockopt(s, IPPROTO_IP, IP_HDRINCL, (char *) &k, size); + if (err == -1) /* >= Vista */ + { + todo_wine { + ok(GetLastError() == WSAEINVAL, "Expected 10022, got %d\n", GetLastError()); + k = 99; + SetLastError(0xdeadbeef); + err = getsockopt(s, IPPROTO_IP, IP_HDRINCL, (char *) &k, &size); + ok(err == -1, "Expected -1, got %d\n", err); + ok(GetLastError() == WSAEINVAL, "Expected 10022, got %d\n", GetLastError()); + ok(k == 99, "Expected 99, got %d\n", k); + + size = sizeof(k); + k = 0; + SetLastError(0xdeadbeef); + err = setsockopt(s, IPPROTO_IP, IP_HDRINCL, (char *) &k, size); + } + ok(err == -1, "Expected -1, got %d\n", err); + todo_wine { + ok(GetLastError() == WSAEINVAL, "Expected 10022, got %d\n", GetLastError()); + k = 99; + SetLastError(0xdeadbeef); + err = getsockopt(s, IPPROTO_IP, IP_HDRINCL, (char *) &k, &size); + ok(err == -1, "Expected -1, got %d\n", err); + ok(GetLastError() == WSAEINVAL, "Expected 10022, got %d\n", GetLastError()); + ok(k == 99, "Expected 99, got %d\n", k); + } + } + else /* <= 2003 the tests differ between TCP and UDP, UDP silenty accepts */ + { + SetLastError(0xdeadbeef); + k = 99; + err = getsockopt(s, IPPROTO_IP, IP_HDRINCL, (char *) &k, &size); + if (prottest[i].type == SOCK_DGRAM) + { + ok(err == 0, "Expected 0, got %d\n", err); + ok(k == 1, "Expected 1, got %d\n", k); + } + else + { + /* contratry to what we could expect the function returns error but k is changed */ + ok(err == -1, "Expected -1, got %d\n", err); + ok(GetLastError() == WSAENOPROTOOPT, "Expected 10042, got %d\n", GetLastError()); + ok(k == 0, "Expected 0, got %d\n", k); + } + + k = 0; + err = setsockopt(s, IPPROTO_IP, IP_HDRINCL, (char *) &k, size); + ok(err == 0, "Expected 0, got %d\n", err); + + k = 99; + err = getsockopt(s, IPPROTO_IP, IP_HDRINCL, (char *) &k, &size); + if (prottest[i].type == SOCK_DGRAM) + { + ok(err == 0, "Expected 0, got %d\n", err); + ok(k == 0, "Expected 0, got %d\n", k); + } + else + { + /* contratry to what we could expect the function returns error but k is changed */ + ok(err == -1, "Expected -1, got %d\n", err); + ok(GetLastError() == WSAENOPROTOOPT, "Expected 10042, got %d\n", GetLastError()); + ok(k == 0, "Expected 0, got %d\n", k); + } + } + closesocket(s); }

1 0

Gerald Pfeifer : propsys: Use snprintf in PROPVAR_ConvertFILETIME.
by Alexandre Julliard Feb. 20, 2017

Feb. 20, 2017

Module: wine Branch: master Commit: 6df21d4015dcc4564e223062ec41252700fc6590 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6df21d4015dcc4564e223062e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Feb 11 23:13:00 2017 +0100 propsys: Use snprintf in PROPVAR_ConvertFILETIME. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propvar.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 002555e..3fee67a 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -50,13 +50,15 @@ static HRESULT PROPVAR_ConvertFILETIME(PROPVARIANT *ppropvarDest, static const char format[] = "%04d/%02d/%02d:%02d:%02d:%02d.%03d"; ppropvarDest->u.pszVal = HeapAlloc(GetProcessHeap(), 0, - lstrlenA(format) + 1); + sizeof(format)); if (!ppropvarDest->u.pszVal) return E_OUTOFMEMORY; - sprintf(ppropvarDest->u.pszVal, format, time.wYear, time.wMonth, - time.wDay, time.wHour, time.wMinute, - time.wSecond, time.wMilliseconds); + snprintf( ppropvarDest->u.pszVal, sizeof(format), + format, + time.wYear, time.wMonth, time.wDay, + time.wHour, time.wMinute, time.wSecond, + time.wMilliseconds ); return S_OK; }

1 0

Fabian Maurer : user32: Only send position-change messages when needed.
by Alexandre Julliard Feb. 20, 2017

Feb. 20, 2017

Module: wine Branch: master Commit: d594ba3322e1385f2ad94b7c58d3acef3f246c73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d594ba3322e1385f2ad94b7c5… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Feb 13 16:58:30 2017 +0100 user32: Only send position-change messages when needed. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 18 +++++++++--------- dlls/user32/winpos.c | 6 ++++-- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index ea5980e..13bc038 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5164,31 +5164,31 @@ static void test_messages(void) test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq2, 0, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq3, - SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOZORDER, TRUE); + SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOZORDER, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOSIZE, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq4, SWP_SHOWWINDOW | SWP_NOMOVE, FALSE); - test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOCLIENTSIZE, TRUE); - test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOCLIENTMOVE, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOCLIENTSIZE, FALSE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOCLIENTMOVE, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOZORDER, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq2, SWP_SHOWWINDOW | SWP_DEFERERASE, FALSE); - test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_DEFERERASE | SWP_NOCLIENTMOVE, TRUE); - test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_DEFERERASE | SWP_NOCLIENTSIZE, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_DEFERERASE | SWP_NOCLIENTMOVE, FALSE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_DEFERERASE | SWP_NOCLIENTSIZE, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq5, SWP_SHOWWINDOW | SWP_DEFERERASE | SWP_NOMOVE, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq2, SWP_SHOWWINDOW | SWP_DEFERERASE | SWP_NOSIZE, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq2, SWP_SHOWWINDOW | SWP_DEFERERASE | SWP_NOZORDER, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOCOPYBITS, FALSE); - test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOCLIENTMOVE, TRUE); - test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOCLIENTSIZE, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOCLIENTMOVE, FALSE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOCLIENTSIZE, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq4, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOMOVE, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOSIZE, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOZORDER, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq2, SWP_SHOWWINDOW | SWP_NOREDRAW, FALSE); - test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOREDRAW | SWP_NOCLIENTMOVE, TRUE); - test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOREDRAW | SWP_NOCLIENTSIZE, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOREDRAW | SWP_NOCLIENTMOVE, FALSE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOREDRAW | SWP_NOCLIENTSIZE, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq5, SWP_SHOWWINDOW | SWP_NOREDRAW | SWP_NOMOVE, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq2, SWP_SHOWWINDOW | SWP_NOREDRAW | SWP_NOSIZE, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq2, SWP_SHOWWINDOW | SWP_NOREDRAW | SWP_NOZORDER, FALSE); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 6ed2d95..c2b35ec 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1643,7 +1643,8 @@ static BOOL SWP_DoWinPosChanging( WINDOWPOS* pWinpos, RECT* pNewWindowRect, RECT /* Send WM_WINDOWPOSCHANGING message */ - if (!(pWinpos->flags & SWP_NOSENDCHANGING)) + if (!(pWinpos->flags & SWP_NOSENDCHANGING) + && !((pWinpos->flags & SWP_AGG_NOCLIENTCHANGE) && (pWinpos->flags & SWP_SHOWWINDOW))) SendMessageW( pWinpos->hwnd, WM_WINDOWPOSCHANGING, 0, (LPARAM)pWinpos ); if (!(wndPtr = WIN_GetPtr( pWinpos->hwnd )) || @@ -2271,7 +2272,8 @@ BOOL USER_SetWindowPos( WINDOWPOS * winpos ) TRACE("\tstatus flags = %04x\n", winpos->flags & SWP_AGG_STATUSFLAGS); - if (((winpos->flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOPOSCHANGE)) + if (((winpos->flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOPOSCHANGE) + && !((orig_flags & SWP_AGG_NOCLIENTCHANGE) && (orig_flags & SWP_SHOWWINDOW))) { /* WM_WINDOWPOSCHANGED is sent even if SWP_NOSENDCHANGING is set and always contains final window position.

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard Feb. 20, 2017

Feb. 20, 2017

Module: wine Branch: master Commit: 103f5781101e6b6c95dceb978aa3ccde8b0c7b0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=103f5781101e6b6c95dceb978… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 20 16:19:19 2017 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/po/ru.po b/po/ru.po index 136bc83..2a79729 100644 --- a/po/ru.po +++ b/po/ru.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: 2017-02-11 02:32+0300\n" +"PO-Revision-Date: 2017-02-20 15:18+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -12189,7 +12189,7 @@ msgstr "Значение слишком велико (%1!u!)." #: regedit.rc:184 msgid "Confirm Value Delete" -msgstr "Подтверждение" +msgstr "Подтверждение удаления значения" #: regedit.rc:191 msgid "Search complete. The string '%1' was not found." @@ -12220,17 +12220,13 @@ msgid "Exports selected branch of the registry to a text file" msgstr "Экспортирует выделенную ветку реестра в текстовый файл" #: regedit.rc:187 -#, fuzzy -#| msgid "Confirm Value Delete" msgid "Confirm Key Delete" -msgstr "Подтверждение" +msgstr "Подтверждение удаления ключа" #: regedit.rc:188 -#, fuzzy -#| msgid "Are you sure you want to delete the registry key '%1'?" msgid "" "Are you sure you want to delete the registry key '%1' and all of its subkeys?" -msgstr "Вы точно хотите удалить ключ реестра «%1»?" +msgstr "Вы точно хотите удалить ключ реестра «%1» и все вложенные ключи?" #: regsvr32.rc:32 msgid ""

1 0

Austin English : advapi32: Add LookupSecurityDescriptorPartsA/W stubs.
by Alexandre Julliard Feb. 20, 2017

Feb. 20, 2017

Module: wine Branch: master Commit: 03c2bf093b2f96b8bf79d9dd0a600b9efa8fa1fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=03c2bf093b2f96b8bf79d9dd0… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 16 21:17:30 2017 +0100 advapi32: Add LookupSecurityDescriptorPartsA/W stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 4 ++-- dlls/advapi32/security.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 6c57c88..88d8634 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -415,8 +415,8 @@ @ stdcall LookupPrivilegeNameW(wstr ptr ptr ptr) @ stdcall LookupPrivilegeValueA(ptr ptr ptr) @ stdcall LookupPrivilegeValueW(ptr ptr ptr) -# @ stub LookupSecurityDescriptorPartsA -# @ stub LookupSecurityDescriptorPartsW +@ stdcall LookupSecurityDescriptorPartsA(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall LookupSecurityDescriptorPartsW(ptr ptr ptr ptr ptr ptr ptr) @ stdcall LsaAddAccountRights(ptr ptr ptr long) @ stub LsaAddPrivilegesToAccount # @ stub LsaClearAuditLog diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index ac61005..e36792c 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -6093,3 +6093,27 @@ BOOL WINAPI SaferSetLevelInformation(SAFER_LEVEL_HANDLE handle, SAFER_OBJECT_INF FIXME("(%p %u %p %u) stub\n", handle, infotype, buffer, size); return FALSE; } + +/****************************************************************************** + * LookupSecurityDescriptorPartsA [ADVAPI32.@] + */ +DWORD WINAPI LookupSecurityDescriptorPartsA(TRUSTEEA *owner, TRUSTEEA *group, ULONG *access_count, + EXPLICIT_ACCESSA *access_list, ULONG *audit_count, + EXPLICIT_ACCESSA *audit_list, SECURITY_DESCRIPTOR *descriptor) +{ + FIXME("(%p %p %p %p %p %p %p) stub\n", owner, group, access_count, + access_list, audit_count, audit_list, descriptor); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * LookupSecurityDescriptorPartsW [ADVAPI32.@] + */ +DWORD WINAPI LookupSecurityDescriptorPartsW(TRUSTEEW *owner, TRUSTEEW *group, ULONG *access_count, + EXPLICIT_ACCESSW *access_list, ULONG *audit_count, + EXPLICIT_ACCESSW *audit_list, SECURITY_DESCRIPTOR *descriptor) +{ + FIXME("(%p %p %p %p %p %p %p) stub\n", owner, group, access_count, + access_list, audit_count, audit_list, descriptor); + return ERROR_CALL_NOT_IMPLEMENTED; +}

1 0

Nikolay Sivov : include: Fix PROPSHEETPAGE_V4_SIZE definition.
by Alexandre Julliard Feb. 20, 2017

Feb. 20, 2017

Module: wine Branch: master Commit: e1023765c38929bff9e2fda39fd4b69d7f011dd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1023765c38929bff9e2fda39… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 19 22:26:26 2017 +0300 include: Fix PROPSHEETPAGE_V4_SIZE definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/prsht.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/prsht.h b/include/prsht.h index 21fc266..f12f402 100644 --- a/include/prsht.h +++ b/include/prsht.h @@ -99,7 +99,7 @@ typedef const PROPSHEETPAGEA *LPCPROPSHEETPAGEA, *LPCPROPSHEETPAGEA_LATEST; #define PROPSHEETPAGEA_V1_SIZE CCSIZEOF_STRUCT(PROPSHEETPAGEA, pcRefParent) #define PROPSHEETPAGEA_V2_SIZE CCSIZEOF_STRUCT(PROPSHEETPAGEA, pszHeaderSubTitle) #define PROPSHEETPAGEA_V3_SIZE CCSIZEOF_STRUCT(PROPSHEETPAGEA, hActCtx) -#define PROPSHEETPAGEA_V4_SIZE sizeof(PROPSHEETHEADERA) +#define PROPSHEETPAGEA_V4_SIZE sizeof(PROPSHEETPAGEA) typedef struct _PROPSHEETPAGEW { @@ -136,7 +136,7 @@ typedef const PROPSHEETPAGEW *LPCPROPSHEETPAGEW, *LPCPROPSHEETPAGEW_LATEST; #define PROPSHEETPAGEW_V1_SIZE CCSIZEOF_STRUCT(PROPSHEETPAGEW, pcRefParent) #define PROPSHEETPAGEW_V2_SIZE CCSIZEOF_STRUCT(PROPSHEETPAGEW, pszHeaderSubTitle) #define PROPSHEETPAGEW_V3_SIZE CCSIZEOF_STRUCT(PROPSHEETPAGEW, hActCtx) -#define PROPSHEETPAGEW_V4_SIZE sizeof(PROPSHEETHEADERA) +#define PROPSHEETPAGEW_V4_SIZE sizeof(PROPSHEETPAGEW) typedef struct _PROPSHEETHEADERA

1 0

Bruno Jesus : ws2_32: Trace accept() error.
by Alexandre Julliard Feb. 20, 2017

Feb. 20, 2017

Module: wine Branch: master Commit: f482eed2988d0f0c88b52fc8a264a4365e14a418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f482eed2988d0f0c88b52fc8a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Feb 19 15:54:31 2017 -0300 ws2_32: Trace accept() error. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4977bbf..3c8c806 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2737,10 +2737,7 @@ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, int *addrlen32) TRACE("socket %04lx\n", s ); status = _is_blocking(s, &is_blocking); if (status) - { - set_error(status); - return INVALID_SOCKET; - } + goto error; do { /* try accepting first (if there is a deferred connection) */ @@ -2773,7 +2770,9 @@ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, int *addrlen32) } } while (is_blocking && status == STATUS_CANT_WAIT); +error: set_error(status); + WARN(" -> ERROR %d\n", GetLastError()); return INVALID_SOCKET; }

1 0

Francois Gouget : netprofm: Add a __WINE_ALLOC_SIZE attribute to heap_alloc().
by Alexandre Julliard Feb. 20, 2017

Feb. 20, 2017

Module: wine Branch: master Commit: 44b7ff8b71b3913d5fd80dc6d05e9c08daf69e97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44b7ff8b71b3913d5fd80dc6d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 18 11:21:24 2017 +0100 netprofm: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). And standardize its formatting, type names, etc. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netprofm/list.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 33b2fa6..8847758 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -41,14 +41,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(netprofm); -static inline void *heap_alloc( SIZE_T size ) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc( GetProcessHeap(), 0, size ); + return HeapAlloc(GetProcessHeap(), 0, size); } -static inline BOOL heap_free( void *mem ) +static inline BOOL heap_free(void *mem) { - return HeapFree( GetProcessHeap(), 0, mem ); + return HeapFree(GetProcessHeap(), 0, mem); } struct network

1 0