October 2014 - Wine-Commits

Henri Verbeet : ws2_32: Return an error if "out_buff" is NULL for SIO_ADDRESS_LIST_QUERY.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 32724def728e54b9023fbec9d43854e8afdbf43c URL: http://source.winehq.org/git/wine.git/?a=commit;h=32724def728e54b9023fbec9d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 7 08:41:12 2014 +0200 ws2_32: Return an error if "out_buff" is NULL for SIO_ADDRESS_LIST_QUERY. --- dlls/ws2_32/socket.c | 39 ++++++++++++++++++--------------------- dlls/ws2_32/tests/sock.c | 5 +++++ 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 98ed686..aba7d3f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3947,6 +3947,10 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID if (GetAdaptersInfo(NULL, &size) == ERROR_BUFFER_OVERFLOW) { IP_ADAPTER_INFO *p, *table = HeapAlloc(GetProcessHeap(), 0, size); + SOCKET_ADDRESS_LIST *sa_list; + SOCKADDR_IN *sockaddr; + SOCKET_ADDRESS *sa; + unsigned int i; DWORD num; if (!table || GetAdaptersInfo(table, &size)) @@ -3962,7 +3966,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID total = sizeof(SOCKET_ADDRESS_LIST) + sizeof(SOCKET_ADDRESS) * (num - 1); total += sizeof(SOCKADDR) * num; - if (total > out_size) + if (total > out_size || !out_buff) { *ret_size = total; HeapFree(GetProcessHeap(), 0, table); @@ -3970,29 +3974,22 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID break; } - if (out_buff) - { - unsigned int i; - SOCKET_ADDRESS *sa; - SOCKET_ADDRESS_LIST *sa_list = out_buff; - SOCKADDR_IN *sockaddr; - - sa = sa_list->Address; - sockaddr = (SOCKADDR_IN *)((char *)sa + num * sizeof(SOCKET_ADDRESS)); - sa_list->iAddressCount = num; + sa_list = out_buff; + sa = sa_list->Address; + sockaddr = (SOCKADDR_IN *)((char *)sa + num * sizeof(SOCKET_ADDRESS)); + sa_list->iAddressCount = num; - for (p = table, i = 0; p; p = p->Next) - { - if (!p->IpAddressList.IpAddress.String[0]) continue; + for (p = table, i = 0; p; p = p->Next) + { + if (!p->IpAddressList.IpAddress.String[0]) continue; - sa[i].lpSockaddr = (SOCKADDR *)&sockaddr[i]; - sa[i].iSockaddrLength = sizeof(SOCKADDR); + sa[i].lpSockaddr = (SOCKADDR *)&sockaddr[i]; + sa[i].iSockaddrLength = sizeof(SOCKADDR); - sockaddr[i].sin_family = AF_INET; - sockaddr[i].sin_port = 0; - sockaddr[i].sin_addr.WS_s_addr = inet_addr(p->IpAddressList.IpAddress.String); - i++; - } + sockaddr[i].sin_family = AF_INET; + sockaddr[i].sin_port = 0; + sockaddr[i].sin_addr.WS_s_addr = inet_addr(p->IpAddressList.IpAddress.String); + i++; } HeapFree(GetProcessHeap(), 0, table); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 1d61f9a..0ad6e8a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7499,6 +7499,11 @@ static void test_address_list_query(void) ok(WSAGetLastError() == WSAEFAULT, "Got unexpected error %d.\n", WSAGetLastError()); bytes_returned = 0xdeadbeef; + ret = WSAIoctl(s, SIO_ADDRESS_LIST_QUERY, NULL, 0, NULL, size, &bytes_returned, NULL, NULL); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "Got unexpected error %d.\n", WSAGetLastError()); + ok(bytes_returned == size, "Got unexpected bytes_returned %u, expected %u.\n", bytes_returned, size); + ret = WSAIoctl(s, SIO_ADDRESS_LIST_QUERY, NULL, 0, address_list, 1, &bytes_returned, NULL, NULL); ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); ok(WSAGetLastError() == WSAEINVAL, "Got unexpected error %d.\n", WSAGetLastError());

1 0

Nikolay Sivov : fusion: Use E_NOT_SUFFICIENT_BUFFER definition.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: d92d108a1b0be69040d870e15f87330711d83fa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d92d108a1b0be69040d870e15… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 7 09:44:30 2014 +0400 fusion: Use E_NOT_SUFFICIENT_BUFFER definition. --- dlls/fusion/asmname.c | 2 +- dlls/fusion/fusion.c | 2 +- dlls/fusion/tests/asmcache.c | 13 +++++-------- dlls/fusion/tests/fusion.c | 9 +++------ 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index a17957a..f18e622 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -497,7 +497,7 @@ HRESULT IAssemblyName_GetPath(IAssemblyName *iface, LPWSTR buf, ULONG *len) if (*len <= buffer_size) lstrcpyW(buf, name->path); else - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + return E_NOT_SUFFICIENT_BUFFER; return S_OK; } diff --git a/dlls/fusion/fusion.c b/dlls/fusion/fusion.c index e638208..6c0bc00 100644 --- a/dlls/fusion/fusion.c +++ b/dlls/fusion/fusion.c @@ -161,7 +161,7 @@ HRESULT WINAPI GetCachePath(ASM_CACHE_FLAGS dwCacheFlags, LPWSTR pwzCachePath, len++; if (*pcchPath <= len || !pwzCachePath) - hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + hr = E_NOT_SUFFICIENT_BUFFER; else if (pwzCachePath) strcpyW(pwzCachePath, path); diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index 6fe72bf..59b288a 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -1235,8 +1235,7 @@ static void test_QueryAssemblyInfo(void) "Expected ASSEMBLYINFO_FLAG_INSTALLED, got %08x\n", info.dwAssemblyFlags); ok(info.uliAssemblySizeInKB.u.HighPart == 0, "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), - "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Expected E_NOT_SUFFICIENT_BUFFER, got %08x\n", hr); todo_wine { ok((info.uliAssemblySizeInKB.u.LowPart == 4), @@ -1258,8 +1257,7 @@ static void test_QueryAssemblyInfo(void) "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, empty), "Assembly path was changed\n"); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), - "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Expected E_NOT_SUFFICIENT_BUFFER, got %08x\n", hr); todo_wine { ok((info.uliAssemblySizeInKB.u.LowPart == 4), @@ -1321,7 +1319,7 @@ static void test_QueryAssemblyInfo(void) lstrcatW(name, otherver); hr = IAssemblyCache_QueryAssemblyInfo(cache, QUERYASMINFO_FLAG_VALIDATE, name, &info); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); ok(info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED, "got %08x\n", info.dwAssemblyFlags); /* short buffer, QUERYASMINFO_FLAG_GETSIZE */ @@ -1331,7 +1329,7 @@ static void test_QueryAssemblyInfo(void) lstrcatW(name, otherver); hr = IAssemblyCache_QueryAssemblyInfo(cache, QUERYASMINFO_FLAG_GETSIZE, name, &info); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); ok(info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED, "got %08x\n", info.dwAssemblyFlags); /* display name is "wine, Version=1.0.0.00000" */ @@ -1525,8 +1523,7 @@ static void test_QueryAssemblyInfo(void) lstrcatW(name, commasep); lstrcatW(name, ver); hr = IAssemblyCache_QueryAssemblyInfo(cache, 0, name, &info); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), - "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Expected E_NOT_SUFFICIENT_BUFFER, got %08x\n", hr); ok(info.cbAssemblyInfo == sizeof(ASSEMBLY_INFO), "Expected sizeof(ASSEMBLY_INFO), got %d\n", info.cbAssemblyInfo); ok(info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED, diff --git a/dlls/fusion/tests/fusion.c b/dlls/fusion/tests/fusion.c index 3fc67ef..82829d5 100644 --- a/dlls/fusion/tests/fusion.c +++ b/dlls/fusion/tests/fusion.c @@ -98,16 +98,14 @@ static void test_GetCachePath(void) /* NULL pwzCachePath, pcchPath is 0 */ size = 0; hr = pGetCachePath(ASM_CACHE_GAC, NULL, &size); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), - "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Expected E_NOT_SUFFICIENT_BUFFER, got %08x\n", hr); ok(size == lstrlenW(cachepath) + 1, "Expected %d, got %d\n", lstrlenW(cachepath) + 1, size); /* NULL pwszCachePath, pcchPath is MAX_PATH */ size = MAX_PATH; hr = pGetCachePath(ASM_CACHE_GAC, NULL, &size); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), - "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Expected E_NOT_SUFFICIENT_BUFFER, got %08x\n", hr); ok(size == lstrlenW(cachepath) + 1, "Expected %d, got %d\n", lstrlenW(cachepath) + 1, size); @@ -132,8 +130,7 @@ static void test_GetCachePath(void) lstrcpyW(path, nochange); size = lstrlenW(cachepath); hr = pGetCachePath(ASM_CACHE_GAC, path, &size); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), - "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Expected E_NOT_SUFFICIENT_BUFFER, got %08x\n", hr); ok( !lstrcmpW( nochange, path ), "Expected %s, got %s\n", wine_dbgstr_w(nochange), wine_dbgstr_w(path)); lstrcpyW(cachepath, windir);

1 0

Michael Stefaniuc : comctl32: Correctly handle the ImageList index in BeginDrag().
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 753de28cd525eca4e4ae6e904d3b543a6516ef44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=753de28cd525eca4e4ae6e904… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 7 00:59:32 2014 +0200 comctl32: Correctly handle the ImageList index in BeginDrag(). --- dlls/comctl32/imagelist.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 645068d..3b11e89 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -599,6 +599,7 @@ ImageList_BeginDrag (HIMAGELIST himlTrack, INT iTrack, INT dxHotspot, INT dyHotspot) { INT cx, cy; + POINT src, dst; TRACE("(himlTrack=%p iTrack=%d dx=%d dy=%d)\n", himlTrack, iTrack, dxHotspot, dyHotspot); @@ -606,6 +607,9 @@ ImageList_BeginDrag (HIMAGELIST himlTrack, INT iTrack, if (!is_valid(himlTrack)) return FALSE; + if (iTrack >= himlTrack->cCurImage) + return FALSE; + if (InternalDrag.himl) ImageList_EndDrag (); @@ -622,10 +626,12 @@ ImageList_BeginDrag (HIMAGELIST himlTrack, INT iTrack, InternalDrag.dyHotspot = dyHotspot; /* copy image */ - BitBlt (InternalDrag.himl->hdcImage, 0, 0, cx, cy, himlTrack->hdcImage, iTrack * cx, 0, SRCCOPY); - - /* copy mask */ - BitBlt (InternalDrag.himl->hdcMask, 0, 0, cx, cy, himlTrack->hdcMask, iTrack * cx, 0, SRCCOPY); + imagelist_point_from_index(InternalDrag.himl, 0, &dst); + imagelist_point_from_index(himlTrack, iTrack, &src); + BitBlt(InternalDrag.himl->hdcImage, dst.x, dst.y, cx, cy, himlTrack->hdcImage, src.x, src.y, + SRCCOPY); + BitBlt(InternalDrag.himl->hdcMask, dst.x, dst.y, cx, cy, himlTrack->hdcMask, src.x, src.y, + SRCCOPY); InternalDrag.himl->cCurImage = 1;

1 0

Sebastian Lackner : kernel32/tests: Add tests for PAGE_GUARD memory protection.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 53611dfbabf0282361c684a7c9b412e38e395223 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53611dfbabf0282361c684a7c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Oct 7 02:16:38 2014 +0200 kernel32/tests: Add tests for PAGE_GUARD memory protection. --- dlls/kernel32/tests/virtual.c | 261 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 261 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=53611dfbabf0282361c68…

1 0

Michael Stefaniuc : comctl32/tests: Add some ImageList_BeginDrag() tests.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 89e9d6db33d6745ed86cb3112bae47c2b87aeaf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89e9d6db33d6745ed86cb3112… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 7 01:01:56 2014 +0200 comctl32/tests: Add some ImageList_BeginDrag() tests. --- dlls/comctl32/tests/imagelist.c | 45 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 5085c70..921a16a 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -253,6 +253,50 @@ static void check_bits(HWND hwnd, HIMAGELIST himl, int idx, int size, #endif /* VISIBLE */ } +static void test_begindrag(void) +{ + HIMAGELIST himl = createImageList(7,13); + HIMAGELIST drag; + BOOL ret; + int count; + POINT hotspot; + + count = ImageList_GetImageCount(himl); + ok(count > 2, "Tests need an ImageList with more than 2 images\n"); + + /* Two BeginDrag() without EndDrag() in between */ + ret = ImageList_BeginDrag(himl, 1, 0, 0); + drag = ImageList_GetDragImage(NULL, NULL); + ok(ret && drag, "ImageList_BeginDrag() failed\n"); + ret = ImageList_BeginDrag(himl, 0, 3, 5); + ok(!ret, "ImageList_BeginDrag() returned TRUE\n"); + drag = ImageList_GetDragImage(NULL, &hotspot); + ok(!!drag, "No active ImageList drag left\n"); + ok(hotspot.x == 0 && hotspot.y == 0, "New ImageList drag was created\n"); + ImageList_EndDrag(); + drag = ImageList_GetDragImage(NULL, NULL); + ok(!drag, "ImageList drag was not destroyed\n"); + + /* Invalid image index */ + ImageList_BeginDrag(himl, 0, 0, 0); + ret = ImageList_BeginDrag(himl, count, 3, 5); + ok(!ret, "ImageList_BeginDrag() returned TRUE\n"); + drag = ImageList_GetDragImage(NULL, &hotspot); + ok(drag && hotspot.x == 0 && hotspot.y == 0, "Active drag should not have been canceled\n"); + ImageList_EndDrag(); + drag = ImageList_GetDragImage(NULL, NULL); + ok(!drag, "ImageList drag was not destroyed\n"); + /* Invalid negative image indexes succeed */ + ret = ImageList_BeginDrag(himl, -17, 0, 0); + drag = ImageList_GetDragImage(NULL, NULL); + ok(ret && drag, "ImageList drag was created\n"); + ImageList_EndDrag(); + ret = ImageList_BeginDrag(himl, -1, 0, 0); + drag = ImageList_GetDragImage(NULL, NULL); + ok(ret && drag, "ImageList drag was created\n"); + ImageList_EndDrag(); +} + static void test_hotspot(void) { struct hotspot { @@ -2087,6 +2131,7 @@ START_TEST(imagelist) InitCommonControls(); test_create_destroy(); + test_begindrag(); test_hotspot(); test_add_remove(); test_imagecount();

1 0

Michael Stefaniuc : comctl32: Don' t start a new ImageList Drag if another one is ongoing.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 0a191f85ad3c490b499cf989f8a9cf7c627f2987 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a191f85ad3c490b499cf989f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 7 01:00:46 2014 +0200 comctl32: Don't start a new ImageList Drag if another one is ongoing. --- dlls/comctl32/imagelist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 3b11e89..c915472 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -611,7 +611,7 @@ ImageList_BeginDrag (HIMAGELIST himlTrack, INT iTrack, return FALSE; if (InternalDrag.himl) - ImageList_EndDrag (); + return FALSE; cx = himlTrack->cx; cy = himlTrack->cy;

1 0

Nikolay Sivov : dmsynth: Use E_NOT_SUFFICIENT_BUFFER definition.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 477dfbca59d6dc0fa0cf77f1534d073e68a39e2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=477dfbca59d6dc0fa0cf77f15… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 7 09:36:48 2014 +0400 dmsynth: Use E_NOT_SUFFICIENT_BUFFER definition. --- dlls/dmsynth/synth.c | 2 +- dlls/dmsynth/synthsink.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 9850628..af8a6fd 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -511,7 +511,7 @@ static HRESULT WINAPI DMSynthImpl_IKsControl_KsProperty(IKsControl* iface, PKSPR } if (DataLength < sizeof(DWORD)) - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + return E_NOT_SUFFICIENT_BUFFER; if (IsEqualGUID(&Property->u.s.Set, &GUID_DMUS_PROP_INSTRUMENT2)) { diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index c5a1c7e..498c390 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -223,7 +223,7 @@ static HRESULT WINAPI DMSynthSinkImpl_IKsControl_KsProperty(IKsControl* iface, P } if (DataLength < sizeof(DWORD)) - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + return E_NOT_SUFFICIENT_BUFFER; if (IsEqualGUID(&Property->u.s.Set, &GUID_DMUS_PROP_SinkUsesDSound)) {

1 0

Nikolay Sivov : advpack: Use E_NOT_SUFFICIENT_BUFFER definition.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 6db64236a12f06cdfdef9975d09ab558c7de4be5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6db64236a12f06cdfdef9975d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 7 09:34:33 2014 +0400 advpack: Use E_NOT_SUFFICIENT_BUFFER definition. --- dlls/advpack/advpack.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 83dda08..2469f7b 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -679,7 +679,7 @@ HRESULT WINAPI TranslateInfStringA(LPCSTR pszInfFilename, LPCSTR pszInstallSecti dwBufferSize, NULL, NULL); } else - res = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + res = E_NOT_SUFFICIENT_BUFFER; } HeapFree(GetProcessHeap(), 0, bufferW); @@ -739,7 +739,7 @@ HRESULT WINAPI TranslateInfStringW(LPCWSTR pszInfFilename, LPCWSTR pszInstallSec pszBuffer, dwBufferSize, pdwRequiredSize)) { if (dwBufferSize < *pdwRequiredSize) - hret = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + hret = E_NOT_SUFFICIENT_BUFFER; else hret = SPAPI_E_LINE_NOT_FOUND; } @@ -796,7 +796,7 @@ HRESULT WINAPI TranslateInfStringExA(HINF hInf, LPCSTR pszInfFilename, dwBufferSize, NULL, NULL); } else - res = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + res = E_NOT_SUFFICIENT_BUFFER; } HeapFree(GetProcessHeap(), 0, bufferW); @@ -854,7 +854,7 @@ HRESULT WINAPI TranslateInfStringExW(HINF hInf, LPCWSTR pszInfFilename, pszBuffer, dwBufferSize, pdwRequiredSize)) { if (dwBufferSize < *pdwRequiredSize) - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + return E_NOT_SUFFICIENT_BUFFER; return SPAPI_E_LINE_NOT_FOUND; }

1 0

Michael Müller : ntdll: Fix handling of page fault if a guard page and write watch is triggered at the same time.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 9e6971590000dcc9d4b7ed9e69d51bb340cf5412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e6971590000dcc9d4b7ed9e6… Author: Michael Müller <michael(a)fds-team.de> Date: Sat Oct 4 02:48:16 2014 +0200 ntdll: Fix handling of page fault if a guard page and write watch is triggered at the same time. --- dlls/kernel32/tests/virtual.c | 1 - dlls/ntdll/virtual.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index af0e6b4..0fa2b99 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1728,7 +1728,6 @@ static void test_guard_page(void) num_guard_page_calls = 0; *value = 1; *(value + 1) = 2; - todo_wine ok( num_guard_page_calls == 1, "expected one callback of guard page handler, got %d calls\n", num_guard_page_calls ); pNtCurrentTeb()->Tib.ExceptionList = frame.Prev; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 4819d2d..f8a5dd3 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1522,11 +1522,6 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err ) { void *page = ROUND_ADDR( addr, page_mask ); BYTE *vprot = &view->prot[((const char *)page - (const char *)view->base) >> page_shift]; - if (*vprot & VPROT_GUARD) - { - VIRTUAL_SetProt( view, page, page_size, *vprot & ~VPROT_GUARD ); - ret = STATUS_GUARD_PAGE_VIOLATION; - } if ((err & EXCEPTION_WRITE_FAULT) && (view->protect & VPROT_WRITEWATCH)) { if (*vprot & VPROT_WRITEWATCH) @@ -1537,6 +1532,11 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err ) /* ignore fault if page is writable now */ if (VIRTUAL_GetUnixProt( *vprot ) & PROT_WRITE) ret = STATUS_SUCCESS; } + if (*vprot & VPROT_GUARD) + { + VIRTUAL_SetProt( view, page, page_size, *vprot & ~VPROT_GUARD ); + ret = STATUS_GUARD_PAGE_VIOLATION; + } } server_leave_uninterrupted_section( &csVirtual, &sigset ); return ret;

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: cf8e3c9a11bb8ab8ef9957e286625bce95ddefd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf8e3c9a11bb8ab8ef9957e28… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Oct 6 21:52:19 2014 +0200 po: Update German translation. --- po/de.po | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/po/de.po b/po/de.po index 88552ec..c13802d 100644 --- a/po/de.po +++ b/po/de.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: 2014-08-13 01:33+0200\n" +"PO-Revision-Date: 2014-10-06 21:51+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -850,7 +850,7 @@ msgstr "Die Datei existiert nicht" #: comdlg32.rc:40 msgid "The selection contains a non-folder object" -msgstr "" +msgstr "Die Auswahl enthält ein Objekt, das kein Ordner ist" #: comdlg32.rc:45 msgid "Up One Level" @@ -3547,16 +3547,12 @@ msgid "Expected ')'" msgstr "')' erwartet" #: jscript.rc:40 -#, fuzzy -#| msgid "Subject Key Identifier" msgid "Expected identifier" -msgstr "Schlüsselkennung des Antragstellers" +msgstr "Bezeichner erwartet" #: jscript.rc:41 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '='" -msgstr "';' erwartet" +msgstr "'=' erwartet" #: jscript.rc:42 msgid "Invalid character" @@ -3587,20 +3583,16 @@ msgid "Label not found" msgstr "Label nicht gefunden" #: jscript.rc:49 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@end'" -msgstr "';' erwartet" +msgstr "'@end' erwartet" #: jscript.rc:50 msgid "Conditional compilation is turned off" msgstr "Bedingte Kompilierung ist ausgeschaltet" #: jscript.rc:51 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@'" -msgstr "';' erwartet" +msgstr "'@' erwartet" #: jscript.rc:54 msgid "Number expected"

1 0