June 2014 - Wine-Commits - list.winehq.org

Henri Verbeet : d3d8: Check the device status in present calls.
by Alexandre Julliard June 30, 2014

June 30, 2014

Module: wine Branch: master Commit: ee7eee5511ce6badec5b383023b1cb739c829089 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee7eee5511ce6badec5b38302… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 30 11:17:02 2014 +0200 d3d8: Check the device status in present calls. --- dlls/d3d8/device.c | 3 +++ dlls/d3d8/swapchain.c | 4 ++++ dlls/d3d8/tests/device.c | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index b3aefe1..fd4cd3c 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -661,6 +661,9 @@ static HRESULT WINAPI d3d8_device_Present(IDirect3DDevice8 *iface, const RECT *s TRACE("iface %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p.\n", iface, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), dst_window_override, dirty_region); + if (device->device_state != D3D8_DEVICE_STATE_OK) + return D3DERR_DEVICELOST; + wined3d_mutex_lock(); hr = wined3d_device_present(device->wined3d_device, src_rect, dst_rect, dst_window_override, dirty_region, 0); diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index e9f4976..067a3e0 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -91,11 +91,15 @@ static HRESULT WINAPI d3d8_swapchain_Present(IDirect3DSwapChain8 *iface, const RGNDATA *dirty_region) { struct d3d8_swapchain *swapchain = impl_from_IDirect3DSwapChain8(iface); + struct d3d8_device *device = impl_from_IDirect3DDevice8(swapchain->parent_device); HRESULT hr; TRACE("iface %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p.\n", iface, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), dst_window_override, dirty_region); + if (device->device_state != D3D8_DEVICE_STATE_OK) + return D3DERR_DEVICELOST; + wined3d_mutex_lock(); hr = wined3d_swapchain_present(swapchain->wined3d_swapchain, src_rect, dst_rect, dst_window_override, dirty_region, 0); diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 9100ebf..971ef91 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -6283,7 +6283,7 @@ static void test_lost_device(void) hr = IDirect3DDevice8_TestCooperativeLevel(device); ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); - todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); ret = ShowWindow(window, SW_RESTORE); ok(ret, "Failed to restore window.\n"); @@ -6292,7 +6292,7 @@ static void test_lost_device(void) hr = IDirect3DDevice8_TestCooperativeLevel(device); ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); - todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); hr = reset_device(device, window, FALSE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);

1 0

Henri Verbeet : d3d9: Improve d3d9_device_CheckDeviceState() a little.
by Alexandre Julliard June 30, 2014

June 30, 2014

Module: wine Branch: master Commit: ae25b1eca5a2253148828af6b87717c6e680d531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae25b1eca5a2253148828af6b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 30 11:17:00 2014 +0200 d3d9: Improve d3d9_device_CheckDeviceState() a little. --- dlls/d3d9/device.c | 22 +++++++++++++++++----- dlls/d3d9/tests/d3d9ex.c | 10 +++++----- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2d9a192..d9aba20 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3147,14 +3147,26 @@ static HRESULT WINAPI d3d9_device_GetMaximumFrameLatency(IDirect3DDevice9Ex *ifa static HRESULT WINAPI d3d9_device_CheckDeviceState(IDirect3DDevice9Ex *iface, HWND dst_window) { - static int i; + struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + struct wined3d_swapchain_desc swapchain_desc; + struct wined3d_swapchain *swapchain; + + TRACE("iface %p, dst_window %p.\n", iface, dst_window); + + wined3d_mutex_lock(); + swapchain = wined3d_device_get_swapchain(device->wined3d_device, 0); + wined3d_swapchain_get_desc(swapchain, &swapchain_desc); + wined3d_mutex_unlock(); - TRACE("iface %p, dst_window %p stub!\n", iface, dst_window); + if (swapchain_desc.windowed) + return D3D_OK; - if (!i++) - FIXME("iface %p, dst_window %p stub!\n", iface, dst_window); + /* FIXME: This is actually supposed to check if any other device is in + * fullscreen mode. */ + if (dst_window != swapchain_desc.device_window) + return device->device_state == D3D9_DEVICE_STATE_OK ? S_PRESENT_OCCLUDED : D3D_OK; - return D3D_OK; + return device->device_state == D3D9_DEVICE_STATE_OK ? D3D_OK : S_PRESENT_OCCLUDED; } static HRESULT WINAPI d3d9_device_CreateRenderTargetEx(IDirect3DDevice9Ex *iface, diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 89238c8..0309013 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -1219,7 +1219,7 @@ static void test_lost_device(void) hr = IDirect3DDevice9Ex_CheckDeviceState(device, window); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_CheckDeviceState(device, NULL); - todo_wine ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); + ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); @@ -1230,7 +1230,7 @@ static void test_lost_device(void) hr = IDirect3DDevice9Ex_PresentEx(device, NULL, NULL, NULL, NULL, 0); ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_CheckDeviceState(device, window); - todo_wine ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); + ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_CheckDeviceState(device, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -1245,7 +1245,7 @@ static void test_lost_device(void) hr = IDirect3DDevice9Ex_CheckDeviceState(device, window); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_CheckDeviceState(device, NULL); - todo_wine ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); + ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); hr = reset_device(device, window, FALSE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -1258,7 +1258,7 @@ static void test_lost_device(void) hr = IDirect3DDevice9Ex_CheckDeviceState(device, window); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_CheckDeviceState(device, NULL); - todo_wine ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); + ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); hr = reset_device(device, window, TRUE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -1323,7 +1323,7 @@ static void test_lost_device(void) hr = IDirect3DDevice9Ex_CheckDeviceState(device, window); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_CheckDeviceState(device, NULL); - todo_wine ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); + ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); refcount = IDirect3DDevice9Ex_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Austin English : kernel32: Add stubs for GetFirmwareEnvironmentVariableA/ W.
by Alexandre Julliard June 30, 2014

June 30, 2014

Module: wine Branch: master Commit: 2f3fc38ee090d2d25aa925c10bed657555e5b2f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f3fc38ee090d2d25aa925c10… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jun 27 11:16:45 2014 -0700 kernel32: Add stubs for GetFirmwareEnvironmentVariableA/W. --- dlls/kernel32/environ.c | 20 ++++++++++++++++++++ dlls/kernel32/kernel32.spec | 4 ++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index 14283f8..18cb44c 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -491,3 +491,23 @@ void ENV_CopyStartupInformation(void) RtlReleasePebLock(); } + +/*********************************************************************** + * GetFirmwareEnvironmentVariableA (KERNEL32.@) + */ +DWORD WINAPI GetFirmwareEnvironmentVariableA(LPCSTR name, LPCSTR guid, PVOID buffer, DWORD size) +{ + FIXME("stub: %s %s %p %u\n", debugstr_a(name), debugstr_a(guid), buffer, size); + SetLastError(ERROR_INVALID_FUNCTION); + return 0; +} + +/*********************************************************************** + * GetFirmwareEnvironmentVariableA (KERNEL32.@) + */ +DWORD WINAPI GetFirmwareEnvironmentVariableW(LPCWSTR name, LPCWSTR guid, PVOID buffer, DWORD size) +{ + FIXME("stub: %s %s %p %u\n", debugstr_w(name), debugstr_w(guid), buffer, size); + SetLastError(ERROR_INVALID_FUNCTION); + return 0; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 8aa5d21..2de2119 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -542,8 +542,8 @@ @ stdcall GetFileSizeEx(long ptr) @ stdcall GetFileTime(long ptr ptr ptr) @ stdcall GetFileType(long) -# @ stub GetFirmwareEnvironmentVariableA -# @ stub GetFirmwareEnvironmentVariableW +@ stdcall GetFirmwareEnvironmentVariableA(str str ptr long) +@ stdcall GetFirmwareEnvironmentVariableW(wstr wstr ptr long) @ stdcall GetFullPathNameA(str long ptr ptr) @ stdcall GetFullPathNameW(wstr long ptr ptr) @ stdcall GetGeoInfoA(long long ptr long long)

1 0

Bruno Jesus : rsaenh/tests: Add tests for the default encryption chaining mode.
by Alexandre Julliard June 30, 2014

June 30, 2014

Module: wine Branch: master Commit: b6efe8c9c1e881aa3b03e282183f2e9546b480b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6efe8c9c1e881aa3b03e2821… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jun 29 22:56:04 2014 -0300 rsaenh/tests: Add tests for the default encryption chaining mode. --- dlls/rsaenh/tests/rsaenh.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index babc435..f0b7b19 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -700,6 +700,13 @@ static void test_block_cipher_modes(void) memcpy(abData, plain, sizeof(plain)); + /* test default chaining mode */ + dwMode = 0xdeadbeef; + dwLen = sizeof(dwMode); + result = CryptGetKeyParam(hKey, KP_MODE, (BYTE*)&dwMode, &dwLen, 0); + ok(result, "%08x\n", GetLastError()); + ok(dwMode == CRYPT_MODE_CBC, "Wrong default chaining mode\n"); + dwMode = CRYPT_MODE_ECB; result = CryptSetKeyParam(hKey, KP_MODE, (BYTE*)&dwMode, 0); ok(result, "%08x\n", GetLastError()); @@ -1040,7 +1047,7 @@ static void test_aes(int keylen) { HCRYPTKEY hKey; BOOL result; - DWORD dwLen; + DWORD dwLen, dwMode; unsigned char pbData[16], enc_data[16], bad_data[16]; int i; @@ -1068,6 +1075,14 @@ static void test_aes(int keylen) if (result) ok(!dwLen, "unexpected salt length %d\n", dwLen); + /* test default chaining mode */ + dwMode = 0xdeadbeef; + dwLen = sizeof(dwMode); + result = CryptGetKeyParam(hKey, KP_MODE, (BYTE*)&dwMode, &dwLen, 0); + ok(result, "%08x\n", GetLastError()); +todo_wine + ok(dwMode == CRYPT_MODE_CBC, "Wrong default chaining\n"); + dwLen = 13; result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, 16); ok(result, "%08x\n", GetLastError()); @@ -1276,6 +1291,13 @@ static void test_rc2(void) result = CryptGetKeyParam(hKey, KP_KEYLEN, (BYTE*)&dwKeyLen, &dwLen, 0); ok(result, "%08x\n", GetLastError()); + /* test default chaining mode */ + dwMode = 0xdeadbeef; + dwLen = sizeof(dwMode); + result = CryptGetKeyParam(hKey, KP_MODE, (BYTE*)&dwMode, &dwLen, 0); + ok(result, "%08x\n", GetLastError()); + ok(dwMode == CRYPT_MODE_CBC, "Wrong default chaining mode\n"); + dwMode = CRYPT_MODE_CBC; result = CryptSetKeyParam(hKey, KP_MODE, (BYTE*)&dwMode, 0); ok(result, "%08x\n", GetLastError());

1 0

Nikolay Sivov : kernel32: Added support for C3_HIGHSURROGATE/ C3_LOWSURROGATE in GetStringTypeW().
by Alexandre Julliard June 30, 2014

June 30, 2014

Module: wine Branch: master Commit: 3a2db918d9b6de27ff96ccf7adafe2006157434f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a2db918d9b6de27ff96ccf7a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 29 20:05:22 2014 +0400 kernel32: Added support for C3_HIGHSURROGATE/C3_LOWSURROGATE in GetStringTypeW(). --- dlls/kernel32/locale.c | 3 +++ dlls/kernel32/tests/locale.c | 16 ++++++++++++++++ include/winnls.h | 2 ++ 3 files changed, 21 insertions(+) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 26c00f5..b467886 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2504,6 +2504,9 @@ BOOL WINAPI GetStringTypeW( DWORD type, LPCWSTR src, INT count, LPWORD chartype if ((c>=0x0600)&&(c<=0x06FF)) type3 |= C3_KASHIDA; if ((c>=0x3000)&&(c<=0x303F)) type3 |= C3_SYMBOL; + if ((c>=0xD800)&&(c<=0xDBFF)) type3 |= C3_HIGHSURROGATE; + if ((c>=0xDC00)&&(c<=0xDFFF)) type3 |= C3_LOWSURROGATE; + if ((c>=0xFF00)&&(c<=0xFF60)) type3 |= C3_FULLWIDTH; if ((c>=0xFF00)&&(c<=0xFF20)) type3 |= C3_SYMBOL; if ((c>=0xFF3B)&&(c<=0xFF40)) type3 |= C3_SYMBOL; diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index f92311e..4992525 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3271,6 +3271,7 @@ static void test_GetStringTypeW(void) static const WCHAR space_special[] = {0x09, 0x0d, 0x85}; WORD types[20]; + WCHAR ch; int i; memset(types,0,sizeof(types)); @@ -3327,6 +3328,21 @@ static void test_GetStringTypeW(void) GetStringTypeW(CT_CTYPE1, space_special, 3, types); for (i = 0; i < 3; i++) ok(types[i] & C1_SPACE || broken(types[i] == C1_CNTRL) || broken(types[i] == 0), "incorrect types returned for %x -> (%x does not have %x)\n",space_special[i], types[i], C1_SPACE ); + + /* surrogate pairs */ + ch = 0xd800; + memset(types, 0, sizeof(types)); + GetStringTypeW(CT_CTYPE3, &ch, 1, types); + if (types[0] == C3_NOTAPPLICABLE) + win_skip("C3_HIGHSURROGATE/C3_LOWSURROGATE are not supported.\n"); + else { + ok(types[0] == C3_HIGHSURROGATE, "got %x\n", types[0]); + + ch = 0xdc00; + memset(types, 0, sizeof(types)); + GetStringTypeW(CT_CTYPE3, &ch, 1, types); + ok(types[0] == C3_LOWSURROGATE, "got %x\n", types[0]); + } } static void test_IdnToNameprepUnicode(void) diff --git a/include/winnls.h b/include/winnls.h index 9ed4344..b332b72 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -460,6 +460,8 @@ static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e',' #define C3_IDEOGRAPH 0x0100 #define C3_KASHIDA 0x0200 #define C3_LEXICAL 0x0400 +#define C3_HIGHSURROGATE 0x0800 +#define C3_LOWSURROGATE 0x1000 #define C3_ALPHA 0x8000 #define C3_NOTAPPLICABLE 0x0000

1 0

Frédéric Delanoy : msvcrt: Avoid potential integer overflow when computing median position in bsearch.
by Alexandre Julliard June 30, 2014

June 30, 2014

Module: wine Branch: master Commit: b9e306ee78ee4bb7ee51b8ffc3cf7a54ed00a2e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9e306ee78ee4bb7ee51b8ffc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jun 29 12:05:36 2014 +0200 msvcrt: Avoid potential integer overflow when computing median position in bsearch. --- dlls/msvcrt/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index d791699..fc5a5a9 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -139,7 +139,7 @@ void* CDECL MSVCRT_bsearch_s(const void *key, const void *base, while (min <= max) { - ssize_t cursor = (min + max) / 2; + ssize_t cursor = min + (max - min) / 2; int ret = compare(ctx, key,(const char *)base+(cursor*size)); if (!ret) return (char*)base+(cursor*size);

1 0

Marcus Meissner : packager: Fixed incorrect size (Coverity).
by Alexandre Julliard June 30, 2014

June 30, 2014

Module: wine Branch: master Commit: 7ef536001fa0da54dafbc32a206343ee59dc0fba URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ef536001fa0da54dafbc32a2… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jun 28 12:22:44 2014 +0200 packager: Fixed incorrect size (Coverity). --- dlls/packager/packager_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index 3f05f88..c1d194e 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -474,7 +474,7 @@ static HRESULT WINAPI PersistStorage_Load(IPersistStorage* iface, ++stream_filename; stream_filename_len = len - (stream_filename - filenameW); - len = GetTempPathW(sizeof(This->filename), This->filename); + len = GetTempPathW(sizeof(This->filename)/sizeof(WCHAR), This->filename); memcpy(This->filename + len, stream_filename, stream_filename_len * sizeof(WCHAR)); This->filename[len + stream_filename_len] = 0;

1 0

Andrew Eikum : mmdevapi: Standardize period sizes.
by Alexandre Julliard June 30, 2014

June 30, 2014

Module: wine Branch: master Commit: d5b597fee5b31b4834327540d25473de5695cf27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5b597fee5b31b4834327540d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jun 27 11:04:16 2014 -0500 mmdevapi: Standardize period sizes. --- dlls/winecoreaudio.drv/mmdevdrv.c | 4 ++-- dlls/wineoss.drv/mmdevdrv.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 81816ca..626add1 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -61,8 +61,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) -static const REFERENCE_TIME DefaultPeriod = 200000; -static const REFERENCE_TIME MinimumPeriod = 100000; +static const REFERENCE_TIME DefaultPeriod = 100000; +static const REFERENCE_TIME MinimumPeriod = 50000; typedef struct _QueuedBufInfo { Float64 start_sampletime; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 1e0e116..922cbb0 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -57,8 +57,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(oss); #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) -static const REFERENCE_TIME DefaultPeriod = 200000; -static const REFERENCE_TIME MinimumPeriod = 100000; +static const REFERENCE_TIME DefaultPeriod = 100000; +static const REFERENCE_TIME MinimumPeriod = 50000; struct ACImpl; typedef struct ACImpl ACImpl;

1 0

Henri Verbeet : ddraw: Implement ddraw7_RestoreAllSurfaces().
by Alexandre Julliard June 30, 2014

June 30, 2014

Module: wine Branch: master Commit: 881219354fe6d93996e2583c102ea9b638accba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=881219354fe6d93996e2583c1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 30 11:17:04 2014 +0200 ddraw: Implement ddraw7_RestoreAllSurfaces(). --- dlls/ddraw/ddraw.c | 29 +++++++++++------------------ dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 3 files changed, 13 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 253a828..011c115 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2675,27 +2675,20 @@ static HRESULT WINAPI ddraw4_GetSurfaceFromDC(IDirectDraw4 *iface, HDC dc, return hr; } -/***************************************************************************** - * IDirectDraw7::RestoreAllSurfaces - * - * Calls the restore method of all surfaces - * - * Params: - * - * Returns: - * Always returns DD_OK because it's a stub - * - *****************************************************************************/ +static HRESULT CALLBACK restore_callback(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) +{ + IDirectDrawSurface_Restore(surface); + IDirectDrawSurface_Release(surface); + + return DDENUMRET_OK; +} + static HRESULT WINAPI ddraw7_RestoreAllSurfaces(IDirectDraw7 *iface) { - FIXME("iface %p stub!\n", iface); + TRACE("iface %p.\n", iface); - /* This isn't hard to implement: Enumerate all WineD3D surfaces, - * get their parent and call their restore method. Do not implement - * it in WineD3D, as restoring a surface means re-creating the - * WineD3DDSurface - */ - return DD_OK; + return IDirectDraw7_EnumSurfaces(iface, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST, + NULL, NULL, restore_callback); } static HRESULT WINAPI ddraw4_RestoreAllSurfaces(IDirectDraw4 *iface) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index c5cd582..8bd9317 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -7718,7 +7718,7 @@ static void test_lost_device(void) hr = IDirectDraw4_TestCooperativeLevel(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(surface); - todo_wine ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); IDirectDrawSurface4_Release(surface); refcount = IDirectDraw4_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 7d7bca2..92e6e99 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7440,7 +7440,7 @@ static void test_lost_device(void) hr = IDirectDraw7_TestCooperativeLevel(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(surface); - todo_wine ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); IDirectDrawSurface7_Release(surface); refcount = IDirectDraw7_Release(ddraw);

1 0

Henri Verbeet : ddraw: Improve ddraw7_TestCooperativeLevel().
by Alexandre Julliard June 30, 2014

June 30, 2014

Module: wine Branch: master Commit: 8d4988a43f69dda56499f1b6750d0bf73551e14e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d4988a43f69dda56499f1b67… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 30 11:17:03 2014 +0200 ddraw: Improve ddraw7_TestCooperativeLevel(). --- dlls/ddraw/ddraw.c | 23 ++++++++++------------- dlls/ddraw/ddraw_private.h | 7 +++++++ dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 617474b..253a828 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2185,23 +2185,13 @@ static HRESULT WINAPI ddraw1_GetScanLine(IDirectDraw *iface, DWORD *line) return ddraw7_GetScanLine(&ddraw->IDirectDraw7_iface, line); } -/***************************************************************************** - * IDirectDraw7::TestCooperativeLevel - * - * Informs the application about the state of the video adapter, depending - * on the cooperative level - * - * Returns: - * DD_OK if the device is in a sane state - * DDERR_NOEXCLUSIVEMODE or DDERR_EXCLUSIVEMODEALREADYSET - * if the state is not correct(See below) - * - *****************************************************************************/ static HRESULT WINAPI ddraw7_TestCooperativeLevel(IDirectDraw7 *iface) { + struct ddraw *ddraw = impl_from_IDirectDraw7(iface); + TRACE("iface %p.\n", iface); - return DD_OK; + return ddraw->device_state == DDRAW_DEVICE_STATE_OK ? DD_OK : DDERR_NOEXCLUSIVEMODE; } static HRESULT WINAPI ddraw4_TestCooperativeLevel(IDirectDraw4 *iface) @@ -4724,7 +4714,14 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic static void CDECL device_parent_activate(struct wined3d_device_parent *device_parent, BOOL activate) { + struct ddraw *ddraw = ddraw_from_device_parent(device_parent); + TRACE("device_parent %p, activate %#x.\n", device_parent, activate); + + if (!activate) + InterlockedCompareExchange(&ddraw->device_state, DDRAW_DEVICE_STATE_LOST, DDRAW_DEVICE_STATE_OK); + else + InterlockedCompareExchange(&ddraw->device_state, DDRAW_DEVICE_STATE_OK, DDRAW_DEVICE_STATE_LOST); } static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent, diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 5a7c3c3..f5248cc 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -58,6 +58,12 @@ struct FvfToDecl #define DDRAW_STRIDE_ALIGNMENT 8 +enum ddraw_device_state +{ + DDRAW_DEVICE_STATE_OK, + DDRAW_DEVICE_STATE_LOST, +}; + struct ddraw { /* Interfaces */ @@ -77,6 +83,7 @@ struct ddraw struct wined3d *wined3d; struct wined3d_device *wined3d_device; DWORD flags; + LONG device_state; struct ddraw_surface *primary; RECT primary_lock; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 655fbfb..c5cd582 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -7644,7 +7644,7 @@ static void test_lost_device(void) ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); hr = IDirectDraw4_TestCooperativeLevel(ddraw); - todo_wine ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(surface); todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_Flip(surface, NULL, DDFLIP_WAIT); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 53c525d..7d7bca2 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7366,7 +7366,7 @@ static void test_lost_device(void) ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); hr = IDirectDraw7_TestCooperativeLevel(ddraw); - todo_wine ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(surface); todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT);

1 0

Henri Verbeet : d3d8: Improve d3d8_device_TestCooperativeLevel().
by Alexandre Julliard June 30, 2014

June 30, 2014

Module: wine Branch: master Commit: 85c203edad900039726c0d2e959b3b14dff8249b URL: http://source.winehq.org/git/wine.git/?a=commit;h=85c203edad900039726c0d2e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 30 11:17:01 2014 +0200 d3d8: Improve d3d8_device_TestCooperativeLevel(). --- dlls/d3d8/d3d8_private.h | 14 +++++++++++++- dlls/d3d8/device.c | 31 +++++++++++++++++++------------ dlls/d3d8/tests/device.c | 4 ++-- 3 files changed, 34 insertions(+), 15 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 54bbe1c..0961503 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -144,6 +144,13 @@ struct FvfToDecl struct d3d8_vertex_declaration *declaration; }; +enum d3d8_device_state +{ + D3D8_DEVICE_STATE_OK, + D3D8_DEVICE_STATE_LOST, + D3D8_DEVICE_STATE_NOT_RESET, +}; + struct d3d8_device { /* IUnknown fields */ @@ -166,14 +173,19 @@ struct d3d8_device UINT index_buffer_size; UINT index_buffer_pos; + LONG device_state; /* Avoids recursion with nested ReleaseRef to 0 */ BOOL inDestruction; - BOOL lost; }; HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wined3d *wined3d, UINT adapter, D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters) DECLSPEC_HIDDEN; +static inline struct d3d8_device *impl_from_IDirect3DDevice8(IDirect3DDevice8 *iface) +{ + return CONTAINING_RECORD(iface, struct d3d8_device, IDirect3DDevice8_iface); +} + struct d3d8_resource { LONG refcount; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 53a832e..b3aefe1 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -301,11 +301,6 @@ static void *d3d8_get_object(struct d3d8_handle_table *t, DWORD handle, enum d3d return entry->object; } -static inline struct d3d8_device *impl_from_IDirect3DDevice8(IDirect3DDevice8 *iface) -{ - return CONTAINING_RECORD(iface, struct d3d8_device, IDirect3DDevice8_iface); -} - static HRESULT WINAPI d3d8_device_QueryInterface(IDirect3DDevice8 *iface, REFIID riid, void **out) { TRACE("iface %p, riid %s, out %p.\n", @@ -388,13 +383,18 @@ static HRESULT WINAPI d3d8_device_TestCooperativeLevel(IDirect3DDevice8 *iface) TRACE("iface %p.\n", iface); - if (device->lost) + TRACE("device state: %#x.\n", device->device_state); + + switch (device->device_state) { - TRACE("Device is lost.\n"); - return D3DERR_DEVICENOTRESET; + default: + case D3D8_DEVICE_STATE_OK: + return D3D_OK; + case D3D8_DEVICE_STATE_LOST: + return D3DERR_DEVICELOST; + case D3D8_DEVICE_STATE_NOT_RESET: + return D3DERR_DEVICENOTRESET; } - - return D3D_OK; } static UINT WINAPI d3d8_device_GetAvailableTextureMem(IDirect3DDevice8 *iface) @@ -641,11 +641,11 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, NULL, reset_enum_callback, TRUE))) { wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); - device->lost = FALSE; + device->device_state = D3D8_DEVICE_STATE_OK; } else { - device->lost = TRUE; + device->device_state = D3D8_DEVICE_STATE_NOT_RESET; } wined3d_mutex_unlock(); @@ -2923,7 +2923,14 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic static void CDECL device_parent_activate(struct wined3d_device_parent *device_parent, BOOL activate) { + struct d3d8_device *device = device_from_device_parent(device_parent); + TRACE("device_parent %p, activate %#x.\n", device_parent, activate); + + if (!activate) + InterlockedCompareExchange(&device->device_state, D3D8_DEVICE_STATE_LOST, D3D8_DEVICE_STATE_OK); + else + InterlockedCompareExchange(&device->device_state, D3D8_DEVICE_STATE_NOT_RESET, D3D8_DEVICE_STATE_LOST); } static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent, diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 376097e..9100ebf 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -6281,7 +6281,7 @@ static void test_lost_device(void) ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); hr = IDirect3DDevice8_TestCooperativeLevel(device); - todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); @@ -6290,7 +6290,7 @@ static void test_lost_device(void) ret = SetForegroundWindow(window); ok(ret, "Failed to set foreground window.\n"); hr = IDirect3DDevice8_TestCooperativeLevel(device); - todo_wine ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr);

1 0

Austin English : loader: Add WBEM installation directory key.
by Alexandre Julliard June 30, 2014

June 30, 2014

Module: wine Branch: master Commit: 1aafcbab92f180e30233ee30a47fde1c4338c2f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aafcbab92f180e30233ee30a… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jun 27 18:53:53 2014 -0700 loader: Add WBEM installation directory key. --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 70010dd..76da3ac 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -640,6 +640,7 @@ HKLM,Software\Microsoft\Shared Tools\MSInfo,,16 HKLM,Software\Microsoft\SystemCertificates,,16 HKLM,Software\Microsoft\TermServLicensing,,16 HKLM,Software\Microsoft\Transaction Server,,16 +HKLM,Software\Microsoft\WBEM,"Installation Directory",2,"%11%\wbem" HKLM,Software\Policies,,16 HKLM,Software\Registered Applications,,16 HKLM,System\CurrentControlSet\Control\Lsa,,16

1 0

Stefan Dösinger : wined3d: Set palettes on the swapchain.
by Alexandre Julliard June 30, 2014

June 30, 2014

Module: wine Branch: master Commit: 9d49b7a9be6d4ed59a69c3453de4eadb0101ea09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d49b7a9be6d4ed59a69c3453… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jun 28 10:49:32 2014 +0200 wined3d: Set palettes on the swapchain. --- dlls/ddraw/ddraw_private.h | 2 + dlls/ddraw/palette.c | 4 ++ dlls/ddraw/surface.c | 10 ++--- dlls/ddraw/tests/ddraw1.c | 6 +-- dlls/ddraw/tests/ddraw2.c | 6 +-- dlls/ddraw/tests/ddraw4.c | 6 +-- dlls/ddraw/tests/ddraw7.c | 6 +-- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/palette.c | 12 ------ dlls/wined3d/surface.c | 89 ++++----------------------------------- dlls/wined3d/swapchain.c | 9 ++++ dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 3 +- include/wine/wined3d.h | 2 +- 14 files changed, 44 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d49b7a9be6d4ed59a69c…

1 0

Piotr Caban : msvcrt: Fix buffer allocation in setvbuf.
by Alexandre Julliard June 30, 2014

June 30, 2014

Module: wine Branch: master Commit: 0350b6c7fd68bcdec7d7ff56fec76b6d13864670 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0350b6c7fd68bcdec7d7ff56f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jun 29 14:58:13 2014 +0200 msvcrt: Fix buffer allocation in setvbuf. --- dlls/msvcrt/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 44e9339..8b12ae9 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4506,7 +4506,7 @@ int CDECL MSVCRT_setvbuf(MSVCRT_FILE* file, char *buf, int mode, MSVCRT_size_t s file->_flag |= MSVCRT__USERBUF; file->_bufsiz = size; }else { - file->_base = file->_ptr = malloc(size); + file->_base = file->_ptr = MSVCRT_malloc(size); if(!file->_base) { file->_bufsiz = 0; MSVCRT__unlock_file(file);

1 0

Nikolay Sivov : advapi32: Implement RegDeleteKeyValue().
by Alexandre Julliard June 30, 2014

June 30, 2014

Module: wine Branch: master Commit: da6d5e6ae60da276eb2a9b749c4d6eeb0b703afe URL: http://source.winehq.org/git/wine.git/?a=commit;h=da6d5e6ae60da276eb2a9b749… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 28 20:15:47 2014 +0400 advapi32: Implement RegDeleteKeyValue(). --- dlls/advapi32/advapi32.spec | 4 +-- dlls/advapi32/registry.c | 56 +++++++++++++++++++++++++++++++++--------- dlls/advapi32/tests/registry.c | 53 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+), 13 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 0b654c8..0efdc2c 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -588,8 +588,8 @@ # @ stub RegDeleteKeyTransactedA # @ stub RegDeleteKeyTransactedW @ stdcall RegDeleteKeyW(long wstr) -# @ stub RegDeleteKeyValueA -# @ stub RegDeleteKeyValueW +@ stdcall RegDeleteKeyValueA(long str str) +@ stdcall RegDeleteKeyValueW(long wstr wstr) @ stdcall RegDeleteTreeA(long str) @ stdcall RegDeleteTreeW(long wstr) @ stdcall RegDeleteValueA(long str) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 0a04bc7..c7ba3ef 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -2050,8 +2050,6 @@ LSTATUS WINAPI RegEnumValueA( HKEY hkey, DWORD index, LPSTR value, LPDWORD val_c return RtlNtStatusToDosError(status); } - - /****************************************************************************** * RegDeleteValueW [ADVAPI32.@] * @@ -2059,15 +2057,9 @@ LSTATUS WINAPI RegEnumValueA( HKEY hkey, DWORD index, LPSTR value, LPDWORD val_c */ LSTATUS WINAPI RegDeleteValueW( HKEY hkey, LPCWSTR name ) { - UNICODE_STRING nameW; - - if (!(hkey = get_special_root_hkey( hkey, 0 ))) return ERROR_INVALID_HANDLE; - - RtlInitUnicodeString( &nameW, name ); - return RtlNtStatusToDosError( NtDeleteValueKey( hkey, &nameW ) ); + return RegDeleteKeyValueW( hkey, NULL, name ); } - /****************************************************************************** * RegDeleteValueA [ADVAPI32.@] * @@ -2083,22 +2075,64 @@ LSTATUS WINAPI RegDeleteValueW( HKEY hkey, LPCWSTR name ) */ LSTATUS WINAPI RegDeleteValueA( HKEY hkey, LPCSTR name ) { - ANSI_STRING nameA; + return RegDeleteKeyValueA( hkey, NULL, name ); +} + +/****************************************************************************** + * RegDeleteKeyValueW [ADVAPI32.@] + */ +LONG WINAPI RegDeleteKeyValueW( HKEY hkey, LPCWSTR subkey, LPCWSTR name ) +{ UNICODE_STRING nameW; + HKEY hsubkey = 0; + LONG ret; + + if (!(hkey = get_special_root_hkey( hkey, 0 ))) return ERROR_INVALID_HANDLE; + + if (subkey) + { + if ((ret = RegOpenKeyExW( hkey, subkey, 0, KEY_SET_VALUE, &hsubkey ))) + return ret; + hkey = hsubkey; + } + + RtlInitUnicodeString( &nameW, name ); + ret = RtlNtStatusToDosError( NtDeleteValueKey( hkey, &nameW ) ); + if (hsubkey) RegCloseKey( hsubkey ); + return ret; +} + +/****************************************************************************** + * RegDeleteKeyValueA [ADVAPI32.@] + */ +LONG WINAPI RegDeleteKeyValueA( HKEY hkey, LPCSTR subkey, LPCSTR name ) +{ + UNICODE_STRING nameW; + HKEY hsubkey = 0; + ANSI_STRING nameA; NTSTATUS status; if (!(hkey = get_special_root_hkey( hkey, 0 ))) return ERROR_INVALID_HANDLE; + if (subkey) + { + LONG ret = RegOpenKeyExA( hkey, subkey, 0, KEY_SET_VALUE, &hsubkey ); + if (ret) + return ret; + hkey = hsubkey; + } + RtlInitAnsiString( &nameA, name ); if (!(status = RtlAnsiStringToUnicodeString( &nameW, &nameA, TRUE ))) { status = NtDeleteValueKey( hkey, &nameW ); RtlFreeUnicodeString( &nameW ); } + + if (hsubkey) RegCloseKey( hsubkey ); return RtlNtStatusToDosError( status ); } - /****************************************************************************** * RegLoadKeyW [ADVAPI32.@] * diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index d339253..7c4db40 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -47,6 +47,7 @@ static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); static NTSTATUS (WINAPI * pNtDeleteKey)(HANDLE); static NTSTATUS (WINAPI * pRtlFormatCurrentUserKeyPath)(UNICODE_STRING*); static NTSTATUS (WINAPI * pRtlFreeUnicodeString)(PUNICODE_STRING); +static LONG (WINAPI *pRegDeleteKeyValueA)(HKEY,LPCSTR,LPCSTR); static BOOL limited_user; @@ -135,6 +136,7 @@ static void InitFunctionPtrs(void) ADVAPI32_GET_PROC(RegGetValueA); ADVAPI32_GET_PROC(RegDeleteTreeA); ADVAPI32_GET_PROC(RegDeleteKeyExA); + ADVAPI32_GET_PROC(RegDeleteKeyValueA); pIsWow64Process = (void *)GetProcAddress( hkernel32, "IsWow64Process" ); pRtlFormatCurrentUserKeyPath = (void *)GetProcAddress( hntdll, "RtlFormatCurrentUserKeyPath" ); @@ -2768,6 +2770,56 @@ static void test_delete_value(void) "expect ERROR_FILE_NOT_FOUND, got %i\n", res); } +static void test_delete_key_value(void) +{ + HKEY subkey; + LONG ret; + + if (!pRegDeleteKeyValueA) + { + win_skip("RegDeleteKeyValue is not available.\n"); + return; + } + + ret = pRegDeleteKeyValueA(NULL, NULL, NULL); + ok(ret == ERROR_INVALID_HANDLE, "got %d\n", ret); + + ret = pRegDeleteKeyValueA(hkey_main, NULL, NULL); + ok(ret == ERROR_FILE_NOT_FOUND, "got %d\n", ret); + + ret = RegSetValueExA(hkey_main, "test", 0, REG_SZ, (const BYTE*)"value", 6); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + ret = RegQueryValueExA(hkey_main, "test", NULL, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + /* NULL subkey name means delete from open key */ + ret = pRegDeleteKeyValueA(hkey_main, NULL, "test"); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + ret = RegQueryValueExA(hkey_main, "test", NULL, NULL, NULL, NULL); + ok(ret == ERROR_FILE_NOT_FOUND, "got %d\n", ret); + + /* now with real subkey */ + ret = RegCreateKeyExA(hkey_main, "Subkey1", 0, NULL, 0, KEY_WRITE|KEY_READ, NULL, &subkey, NULL); + ok(!ret, "failed with error %d\n", ret); + + ret = RegSetValueExA(subkey, "test", 0, REG_SZ, (const BYTE*)"value", 6); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + ret = RegQueryValueExA(subkey, "test", NULL, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + ret = pRegDeleteKeyValueA(hkey_main, "Subkey1", "test"); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + ret = RegQueryValueExA(subkey, "test", NULL, NULL, NULL, NULL); + ok(ret == ERROR_FILE_NOT_FOUND, "got %d\n", ret); + + RegDeleteKeyA(subkey, ""); + RegCloseKey(subkey); +} + START_TEST(registry) { /* Load pointers for functions that are not available in all Windows versions */ @@ -2808,6 +2860,7 @@ START_TEST(registry) test_rw_order(); test_deleted_key(); test_delete_value(); + test_delete_key_value(); /* cleanup */ delete_key( hkey_main );

1 0

Nikolay Sivov : shell32: Implement PathYetAnotherMakeUniqueName().
by Alexandre Julliard June 30, 2014

June 30, 2014

Module: wine Branch: master Commit: f9a19f57e1cc696e660ad4f847516aeb768a293b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9a19f57e1cc696e660ad4f84… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 28 15:43:06 2014 +0400 shell32: Implement PathYetAnotherMakeUniqueName(). --- dlls/shell32/shellpath.c | 37 +++++++++++++------ dlls/shell32/tests/shellpath.c | 82 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 2dfed75..158b1d1 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -537,22 +537,37 @@ BOOL WINAPI PathMakeUniqueNameAW( /************************************************************************* * PathYetAnotherMakeUniqueName [SHELL32.75] - * - * NOTES - * exported by ordinal */ -BOOL WINAPI PathYetAnotherMakeUniqueName( - LPWSTR lpszBuffer, - LPCWSTR lpszPathName, - LPCWSTR lpszShortName, - LPCWSTR lpszLongName) +BOOL WINAPI PathYetAnotherMakeUniqueName(LPWSTR buffer, LPCWSTR path, LPCWSTR shortname, LPCWSTR longname) { - FIXME("(%p, %s, %s ,%s):stub.\n", - lpszBuffer, debugstr_w(lpszPathName), debugstr_w(lpszShortName), debugstr_w(lpszLongName)); + WCHAR pathW[MAX_PATH], retW[MAX_PATH]; + const WCHAR *file, *ext; + int i = 2; + + TRACE("(%p, %s, %s, %s)\n", buffer, debugstr_w(path), debugstr_w(shortname), debugstr_w(longname)); + + file = longname ? longname : shortname; + PathCombineW(pathW, path, file); + strcpyW(retW, pathW); + PathRemoveExtensionW(pathW); + + ext = PathFindExtensionW(file); + + /* now try to make it unique */ + while (PathFileExistsW(retW)) + { + static const WCHAR fmtW[] = {'%','s',' ','(','%','d',')','%','s',0}; + + sprintfW(retW, fmtW, pathW, i, ext); + i++; + } + + strcpyW(buffer, retW); + TRACE("ret - %s\n", debugstr_w(buffer)); + return TRUE; } - /* ########## cleaning and resolving paths ########## */ diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 7486fac..efdfbbd 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -101,6 +101,7 @@ static UINT (WINAPI *pGetSystemWow64DirectoryA)(LPSTR,UINT); static HRESULT (WINAPI *pSHGetKnownFolderPath)(REFKNOWNFOLDERID, DWORD, HANDLE, PWSTR *); static HRESULT (WINAPI *pSHSetKnownFolderPath)(REFKNOWNFOLDERID, DWORD, HANDLE, PWSTR); static HRESULT (WINAPI *pSHGetFolderPathEx)(REFKNOWNFOLDERID, DWORD, HANDLE, LPWSTR, DWORD); +static BOOL (WINAPI *pPathYetAnotherMakeUniqueName)(PWSTR, PCWSTR, PCWSTR, PCWSTR); static DLLVERSIONINFO shellVersion = { 0 }; static LPMALLOC pMalloc; @@ -207,6 +208,7 @@ static void loadShell32(void) pILFindLastID = (void *)GetProcAddress(hShell32, (LPCSTR)16); GET_PROC(SHFileOperationA) GET_PROC(SHGetMalloc) + GET_PROC(PathYetAnotherMakeUniqueName) ok(pSHGetMalloc != NULL, "shell32 is missing SHGetMalloc\n"); if (pSHGetMalloc) @@ -2631,6 +2633,85 @@ static void test_DoEnvironmentSubst(void) } } +static void test_PathYetAnotherMakeUniqueName(void) +{ + static const WCHAR shortW[] = {'f','i','l','e','.','t','s','t',0}; + static const WCHAR short2W[] = {'f','i','l','e',' ','(','2',')','.','t','s','t',0}; + static const WCHAR tmpW[] = {'t','m','p',0}; + static const WCHAR longW[] = {'n','a','m','e',0}; + static const WCHAR long2W[] = {'n','a','m','e',' ','(','2',')',0}; + WCHAR nameW[MAX_PATH], buffW[MAX_PATH], pathW[MAX_PATH]; + HANDLE file; + BOOL ret; + + if (!pPathYetAnotherMakeUniqueName) + { + win_skip("PathYetAnotherMakeUniqueName() is not available.\n"); + return; + } + +if (0) +{ + /* crashes on Windows */ + ret = pPathYetAnotherMakeUniqueName(NULL, NULL, NULL, NULL); + ok(!ret, "got %d\n", ret); + + ret = pPathYetAnotherMakeUniqueName(nameW, NULL, NULL, NULL); + ok(!ret, "got %d\n", ret); +} + + GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + + /* Using short name only first */ + nameW[0] = 0; + ret = pPathYetAnotherMakeUniqueName(nameW, pathW, shortW, NULL); + ok(ret, "got %d\n", ret); + lstrcpyW(buffW, pathW); + lstrcatW(buffW, shortW); + ok(!lstrcmpW(nameW, buffW), "got %s, expected %s\n", wine_dbgstr_w(nameW), wine_dbgstr_w(buffW)); + + /* now create a file with this name and get next name */ + file = CreateFileW(nameW, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, NULL); + ok(file != NULL, "got %p\n", file); + + nameW[0] = 0; + ret = pPathYetAnotherMakeUniqueName(nameW, pathW, shortW, NULL); + ok(ret, "got %d\n", ret); + lstrcpyW(buffW, pathW); + lstrcatW(buffW, short2W); + ok(!lstrcmpW(nameW, buffW), "got %s, expected %s\n", wine_dbgstr_w(nameW), wine_dbgstr_w(buffW)); + + CloseHandle(file); + + /* Using short and long */ + nameW[0] = 0; + ret = pPathYetAnotherMakeUniqueName(nameW, pathW, tmpW, longW); + ok(ret, "got %d\n", ret); + lstrcpyW(buffW, pathW); + lstrcatW(buffW, longW); + ok(!lstrcmpW(nameW, buffW), "got %s, expected %s\n", wine_dbgstr_w(nameW), wine_dbgstr_w(buffW)); + + file = CreateFileW(nameW, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, NULL); + ok(file != NULL, "got %p\n", file); + + nameW[0] = 0; + ret = pPathYetAnotherMakeUniqueName(nameW, pathW, tmpW, longW); + ok(ret, "got %d\n", ret); + lstrcpyW(buffW, pathW); + lstrcatW(buffW, long2W); + ok(!lstrcmpW(nameW, buffW), "got %s, expected %s\n", wine_dbgstr_w(nameW), wine_dbgstr_w(buffW)); + + CloseHandle(file); + + /* Using long only */ + nameW[0] = 0; + ret = pPathYetAnotherMakeUniqueName(nameW, pathW, NULL, longW); + ok(ret, "got %d\n", ret); + lstrcpyW(buffW, pathW); + lstrcatW(buffW, longW); + ok(!lstrcmpW(nameW, buffW), "got %s, expected %s\n", wine_dbgstr_w(nameW), wine_dbgstr_w(buffW)); +} + START_TEST(shellpath) { if (!init()) return; @@ -2659,5 +2740,6 @@ START_TEST(shellpath) test_SHGetFolderPathEx(); test_knownFolders(); test_DoEnvironmentSubst(); + test_PathYetAnotherMakeUniqueName(); } }

1 0

Andrew Eikum : mmdevapi: Don' t stop sending event signals after IAudioClient::Stop.
by Alexandre Julliard June 30, 2014

June 30, 2014

Module: wine Branch: master Commit: b950b9a835f153865403e453ea32e448668082d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b950b9a835f153865403e453e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jun 27 11:04:23 2014 -0500 mmdevapi: Don't stop sending event signals after IAudioClient::Stop. --- dlls/mmdevapi/tests/capture.c | 6 +++--- dlls/mmdevapi/tests/render.c | 6 +++--- dlls/winealsa.drv/mmdevdrv.c | 40 +++++++++++++++++++-------------------- dlls/winecoreaudio.drv/mmdevdrv.c | 27 +++++++++++--------------- dlls/wineoss.drv/mmdevdrv.c | 34 +++++++++++++++++---------------- 5 files changed, 54 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b950b9a835f153865403e…

1 0

Bruno Jesus : dssenh/tests: Add tests for the default encryption chaining mode.
by Alexandre Julliard June 30, 2014

June 30, 2014

Module: wine Branch: master Commit: ba06731c99bc652f21577d85116c13f47144fe48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba06731c99bc652f21577d851… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jun 29 17:20:30 2014 -0300 dssenh/tests: Add tests for the default encryption chaining mode. --- dlls/dssenh/tests/dssenh.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 75c4e4c..8b83586 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -704,6 +704,27 @@ static void test_cipher_modes(const struct ciphermode_test *tests, int testLen) result = CryptDestroyHash(hHash); ok(result, "Expected destruction of hash after deriving key.\n"); + /* the default algorithm is CBC, test that without setting a mode */ + mode = 0xdeadbeef; + dataLen = sizeof(mode); + result = CryptGetKeyParam(pKey, KP_MODE, (BYTE*)&mode, &dataLen, 0); + ok(result, "Expected getting of KP_MODE, got %x.\n", GetLastError()); + ok(mode == CRYPT_MODE_CBC, "Default mode should be CBC\n"); + + memcpy(pbData, plainText, plainLen); + dataLen = plainLen; + result = CryptEncrypt(pKey, 0, TRUE, 0, pbData, &dataLen, 36); + ok(result, "Expected data encryption, got %x.\n", GetLastError()); + + /* Verify we have the correct encrypted data */ + ok(!memcmp(pbData, tests[1].encrypted, dataLen), "Incorrect encrypted data.\n"); + + result = CryptDecrypt(pKey, 0, TRUE, 0, pbData, &dataLen); + ok(result, "Expected data decryption, got %x.\n", GetLastError()); + + /* Verify we have the correct decrypted data */ + ok(!memcmp(pbData, (BYTE *)plainText, dataLen), "Incorrect decrypted data.\n"); + /* test block cipher modes */ for(i = 0; i < testLen; i++) {

1 0

Marcus Meissner : windowscodecs: Fixed incorrect memset (Coverity).
by Alexandre Julliard June 30, 2014

June 30, 2014

Module: wine Branch: master Commit: 4cfad9c4625ee42206c977dd0e5001e68d98af8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cfad9c4625ee42206c977dd0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jun 28 12:22:46 2014 +0200 windowscodecs: Fixed incorrect memset (Coverity). --- dlls/windowscodecs/pngformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 73416eb..a8ecb73 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1138,7 +1138,7 @@ static HRESULT WINAPI PngFrameEncode_Initialize(IWICBitmapFrameEncode *iface, return hr; } else - memset(opt_values, sizeof(opt_values), 0); + memset(opt_values, 0, sizeof(opt_values)); if (V_VT(&opt_values[0]) == VT_EMPTY) interlace = FALSE;

1 0

Alexandre Julliard : Merge branch 'lxr'.
by Alexandre Julliard June 30, 2014

June 30, 2014

Module: tools Branch: master Commit: d8bd93ef76a21dfd186c192e9246ae8b483d7cd7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d8bd93ef76a21dfd186c192e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 27 13:34:29 2014 +0200 Merge branch 'lxr'. ---

1 0

Alexandre Julliard : Initial import of lxr-2.0.2.
by Alexandre Julliard June 30, 2014

June 30, 2014

Module: tools Branch: master Commit: 148ded9547ec04f4a4844d81ca5884d607649fa4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=148ded9547ec04f4a4844d81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 27 13:30:41 2014 +0200 Initial import of lxr-2.0.2. ---

1 0

Julian Rüger : German translation for release 1.7.21
by Jeremy Newman June 30, 2014

June 30, 2014

Module: website Branch: master Commit: 8227087ccf7c8256cebc552ebec9bc058abb6190 URL: http://source.winehq.org/git/website.git/?a=commit;h=8227087ccf7c8256cebc55… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jun 30 02:38:04 2014 +0200 German translation for release 1.7.21 --- news/de/2014062701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2014062701.xml b/news/de/2014062701.xml new file mode 100644 index 0000000..3817042 --- /dev/null +++ b/news/de/2014062701.xml @@ -0,0 +1,16 @@ +<news> +<date>27. Juni 2014</date> +<title>Wine 1.7.21 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.21 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.21">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für kritische Abschnitte in der C-Laufzeit.</li> + <li>Unicode-Daten auf Unicode 7.0 aktualisiert.</li> + <li>Unterstützung des Zeilensprungverfahrens bei PNG-Enkodierung.</li> + <li>Initialer Stub der Packager-Bibliothek.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.21.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.21
by Jeremy Newman June 30, 2014

June 30, 2014

Module: website Branch: master Commit: b43b1fc9c49c1d651b004764a359c8bc296c6aa2 URL: http://source.winehq.org/git/website.git/?a=commit;h=b43b1fc9c49c1d651b0047… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Jun 28 17:15:33 2014 +0200 Polish translation for release 1.7.21 --- news/pl/2014062701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2014062701.xml b/news/pl/2014062701.xml new file mode 100644 index 0000000..a3ddbdc --- /dev/null +++ b/news/pl/2014062701.xml @@ -0,0 +1,16 @@ +<news> +<date>Czerwiec 27, 2014</date> +<title>Wydano Wine 1.7.21</title> +<body> + Wydanie rozwojowe Wine 1.7.21 jest już dostępne. + <a href="{$root}/announce/1.7.21">Co nowego</a> w tym wydaniu: +<ul> + <li>Obsługa krytycznych sekcji w bibliotece uruchomieniowej C.</li> + <li>Dane Unicode uaktualniono do Unicode 7.0.</li> + <li>Obsługa kodowania PNG z przeplotem.</li> + <li>Zalążek obsługi dla biblioteki Packager.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.21.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.7.21
by Jeremy Newman June 27, 2014

June 27, 2014

Module: website Branch: master Commit: 135410afd339915d66d688bf7d06ae99676cb079 URL: http://source.winehq.org/git/website.git/?a=commit;h=135410afd339915d66d688… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jun 27 22:58:56 2014 +0200 French translation for release 1.7.21 --- news/fr/2014062701.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2014062701.xml b/news/fr/2014062701.xml new file mode 100644 index 0000000..e7bb6cc --- /dev/null +++ b/news/fr/2014062701.xml @@ -0,0 +1,15 @@ +<news> +<date>27 juin 2014</date> +<title>Sortie de Wine 1.7.21</title> +<body> + La version de développement 1.7.21 de Wine est disponible. + <a href="{$root}/announce/1.7.21">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge des sections critiques dans le moteur d'exécution C.</li> + <li>Données Unicode mises à jour vers Unicode 7.0.</li> + <li>Prise en charge du codage d'images PNG entrelacées.</li> + <li>Première ébauche de bibliothèque Packager.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.21.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.21
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: website Branch: master Commit: 5b60a5b743eeb7060665c1797da32cee60ab3d17 URL: http://source.winehq.org/git/website.git/?a=commit;h=5b60a5b743eeb7060665c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 27 20:20:10 2014 +0200 Wine release 1.7.21 --- news/en/2014062701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2014062701.xml b/news/en/2014062701.xml new file mode 100644 index 0000000..c81f919 --- /dev/null +++ b/news/en/2014062701.xml @@ -0,0 +1,16 @@ +<news> +<date>June 27, 2014</date> +<title>Wine 1.7.21 Released</title> +<body> + The Wine development release 1.7.21 is now available. + <a href="{$root}/announce/1.7.21">What's new</a> in this release: +<ul> + <li>Support for critical sections in the C runtime.</li> + <li>Unicode data updated to Unicode 7.0.</li> + <li>Support for interlaced PNG encoding.</li> + <li>Initial stub for the Packager library.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.21.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.7.21 : Alexandre Julliard : Release 1.7.21
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: wine Branch: refs/tags/wine-1.7.21 Tag: f4dd56db4d8c140b2c5b7646cf882ad6018b0f2a URL: http://source.winehq.org/git/wine.git/?a=tag;h=f4dd56db4d8c140b2c5b7646cf88… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 27 20:10:11 2014 +0200 Release 1.7.21

1 0

Alexandre Julliard : Release 1.7.21.
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: wine Branch: master Commit: 991575c2370debd29f53ab90689a8889b54a7d86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=991575c2370debd29f53ab906… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 27 20:10:11 2014 +0200 Release 1.7.21. --- ANNOUNCE | 674 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 318 insertions(+), 377 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=991575c2370debd29f53a…

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: wine Branch: master Commit: 1d84e74a953f009720d1661cfc2bc3afaf5995b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d84e74a953f009720d1661cf… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Jun 27 13:33:16 2014 +0200 po: Update German translation. --- po/de.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/de.po b/po/de.po index 8c8cb59..2d9fb28 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-05-26 01:33+0200\n" +"PO-Revision-Date: 2014-06-27 13:29+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -6597,10 +6597,8 @@ msgid "This network connection does not exist.\n" msgstr "Diese Netzwerkverbindung existiert nicht.\n" #: winerror.mc:3746 -#, fuzzy -#| msgid "Connection refused.\n" msgid "Connection reset by peer.\n" -msgstr "Verbindung abgelehnt.\n" +msgstr "Verbindung von Gegenstelle zurückgesetzt.\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port"

1 0

Jacek Caban : shdocvw: Added InstallReg_RunDLL stub.
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: wine Branch: master Commit: d404ff9ce82da66932db1b4885540b29beab0f80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d404ff9ce82da66932db1b488… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 27 11:40:20 2014 +0200 shdocvw: Added InstallReg_RunDLL stub. --- dlls/shdocvw/shdocvw.spec | 2 +- dlls/shdocvw/shdocvw_main.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec index 96bc44b..81e18df 100644 --- a/dlls/shdocvw/shdocvw.spec +++ b/dlls/shdocvw/shdocvw.spec @@ -121,7 +121,7 @@ @ stub IEAboutBox @ stub IEWriteErrorLog @ stdcall ImportPrivacySettings(wstr ptr ptr) -@ stub InstallReg_RunDLL +@ stdcall InstallReg_RunDLL(long long str long) @ stdcall OpenURL(long long str long) ieframe.OpenURL @ stub SHGetIDispatchForFolder @ stdcall SetQueryNetSessionCount(long) diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 57945b0..3ce5df1 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -542,3 +542,11 @@ HRESULT WINAPI ResetProfileSharing(HWND hwnd) FIXME("(%p) stub\n", hwnd); return E_NOTIMPL; } + +/****************************************************************** + * InstallReg_RunDLL (SHDOCVW.@) + */ +void WINAPI InstallReg_RunDLL(HWND hwnd, HINSTANCE handle, LPCSTR cmdline, INT show) +{ + FIXME("(%p %p %s %x)\n", hwnd, handle, debugstr_a(cmdline), show); +}

1 0

Piotr Caban : msvcrt: Don' t touch _bufsiz value while initializing FILE structure.
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: wine Branch: master Commit: 60eb44d8209e9829f21edb159408b8930b68107e URL: http://source.winehq.org/git/wine.git/?a=commit;h=60eb44d8209e9829f21edb159… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 27 10:17:52 2014 +0200 msvcrt: Don't touch _bufsiz value while initializing FILE structure. --- dlls/msvcrt/file.c | 4 +++- dlls/msvcrt/tests/file.c | 19 +++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 77ec853..44e9339 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -458,9 +458,11 @@ static int msvcrt_init_fp(MSVCRT_FILE* file, int fd, unsigned stream_flags) *MSVCRT__errno() = MSVCRT_EBADF; return -1; } - memset(file, 0, sizeof(*file)); + file->_ptr = file->_base = NULL; + file->_cnt = 0; file->_file = fd; file->_flag = stream_flags; + file->_tmpfname = NULL; TRACE(":got FILE* (%p)\n",file); return 0; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 2fd46f2..c253f88 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1628,7 +1628,7 @@ static void test_fopen_s( void ) const char name[] = "empty1"; char buff[16]; unsigned char *ubuff = (unsigned char*)buff; - FILE *file; + FILE *file, *file2; int ret; int len; @@ -1719,6 +1719,22 @@ static void test_fopen_s( void ) ubuff[0], ubuff[1], ubuff[2]); fclose(file); + /* test initial FILE values */ + memset(file, 0xfe, sizeof(*file)); + file->_flag = 0; + ret = p_fopen_s(&file2, name, "r"); + ok(!ret, "fopen_s failed with %d\n", ret); + ok(file == file2, "file != file2 %p %p\n", file, file2); + ok(!file->_ptr, "file->_ptr != NULL\n"); + ok(!file->_cnt, "file->_cnt != 0\n"); + ok(!file->_base, "file->_base != NULL\n"); + ok(file->_flag == 1, "file->_flag = %x\n", file->_flag); + ok(file->_file, "file->_file == 0\n"); + ok(file->_charbuf == 0xfefefefe, "file->_charbuf = %x\n", file->_charbuf); + ok(file->_bufsiz == 0xfefefefe, "file->_bufsiz = %x\n", file->_bufsiz); + ok(!file->_tmpfname, "file->_tmpfname != NULL\n"); + fclose(file2); + ok(_unlink(name) == 0, "Couldn't unlink file named '%s'\n", name); } @@ -2273,7 +2289,6 @@ static void test_write_flush(void) file = fopen(tempf, "wb+"); ok(file != NULL, "unable to create test file\n"); iobuf[0] = 0; - fwrite(iobuf, 1, 1, file); /* needed for wine to init _bufsiz */ ok(file->_bufsiz == 4096, "incorrect default buffer size: %d\n", file->_bufsiz); test_write_flush_size(file, file->_bufsiz); setvbuf(file, iobuf, _IOFBF, sizeof(iobuf));

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: wine Branch: master Commit: 4b594361f91df8b09c187ec83e5fa5139bc5dd9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b594361f91df8b09c187ec83… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Jun 26 23:41:43 2014 +0300 po: Update Finnish translation. --- po/fi.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/fi.po b/po/fi.po index e9893e5..e82349f 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6582,10 +6582,8 @@ msgid "This network connection does not exist.\n" msgstr "Tätä verkkoyhteyttä ei ole.\n" #: winerror.mc:3746 -#, fuzzy -#| msgid "Connection refused.\n" msgid "Connection reset by peer.\n" -msgstr "Yhteys estetty.\n" +msgstr "Vastapuoli nollasi yhteyden.\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port"

1 0

Piotr Caban : msvcrt: Use file-> _flag to check if file buffering is enabled.
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: wine Branch: master Commit: fffbc8e570e024558ddd21e2aab5fabf8b2056a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fffbc8e570e024558ddd21e2a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 27 10:17:24 2014 +0200 msvcrt: Use file->_flag to check if file buffering is enabled. --- dlls/msvcrt/file.c | 66 +++++++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 465a417..77ec853 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -588,7 +588,7 @@ void msvcrt_init_io(void) /* INTERNAL: Flush stdio file buffer */ static int msvcrt_flush_buffer(MSVCRT_FILE* file) { - if(file->_bufsiz) { + if(file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF)) { int cnt=file->_ptr-file->_base; if(cnt>0 && MSVCRT__write(file->_file, file->_base, cnt) != cnt) { file->_flag |= MSVCRT__IOERR; @@ -627,8 +627,8 @@ static BOOL msvcrt_alloc_buffer(MSVCRT_FILE* file) file->_flag |= MSVCRT__IOMYBUF; } else { file->_base = (char*)(&file->_charbuf); - /* put here 2 ??? */ - file->_bufsiz = sizeof(file->_charbuf); + file->_bufsiz = 2; + file->_flag |= MSVCRT__IONBF; } file->_ptr = file->_base; file->_cnt = 0; @@ -641,11 +641,13 @@ static BOOL add_std_buffer(MSVCRT_FILE *file) static char buffers[2][MSVCRT_BUFSIZ]; if((file->_file!=MSVCRT_STDOUT_FILENO && file->_file!=MSVCRT_STDERR_FILENO) - || !MSVCRT__isatty(file->_file) || file->_bufsiz) + || (file->_flag & (MSVCRT__IONBF | MSVCRT__IOMYBUF | MSVCRT__USERBUF)) + || !MSVCRT__isatty(file->_file)) return FALSE; file->_ptr = file->_base = buffers[file->_file == MSVCRT_STDOUT_FILENO ? 0 : 1]; file->_bufsiz = file->_cnt = MSVCRT_BUFSIZ; + file->_flag |= MSVCRT__USERBUF; return TRUE; } @@ -656,6 +658,7 @@ static void remove_std_buffer(MSVCRT_FILE *file) msvcrt_flush_buffer(file); file->_ptr = file->_base = NULL; file->_bufsiz = file->_cnt = 0; + file->_flag &= ~MSVCRT__USERBUF; } /* INTERNAL: Convert integer to base32 string (0-9a-v), 0 becomes "" */ @@ -3413,7 +3416,7 @@ int CDECL MSVCRT__filbuf(MSVCRT_FILE* file) } /* Allocate buffer if needed */ - if(file->_bufsiz == 0 && !(file->_flag & MSVCRT__IONBF)) + if(!(file->_flag & (MSVCRT__IONBF | MSVCRT__IOMYBUF | MSVCRT__USERBUF))) msvcrt_alloc_buffer(file); if(!(file->_flag & MSVCRT__IOREAD)) { @@ -3425,7 +3428,7 @@ int CDECL MSVCRT__filbuf(MSVCRT_FILE* file) } } - if(file->_flag & MSVCRT__IONBF) { + if(!(file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF))) { int r; if ((r = read_i(file->_file,&c,1)) != 1) { file->_flag |= (r == 0) ? MSVCRT__IOEOF : MSVCRT__IOERR; @@ -3647,7 +3650,7 @@ MSVCRT_wchar_t * CDECL MSVCRT_fgetws(MSVCRT_wchar_t *s, int size, MSVCRT_FILE* f int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) { /* Flush output buffer */ - if(file->_bufsiz == 0 && !(file->_flag & MSVCRT__IONBF)) { + if(!(file->_flag & (MSVCRT__IONBF | MSVCRT__IOMYBUF | MSVCRT__USERBUF))) { msvcrt_alloc_buffer(file); } if(!(file->_flag & MSVCRT__IOWRT)) { @@ -3656,7 +3659,7 @@ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) else return MSVCRT_EOF; } - if(file->_bufsiz && !(file->_flag&MSVCRT__IONBF)) { + if(file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF)) { int res = 0; if(file->_cnt <= 0) { @@ -3706,22 +3709,21 @@ MSVCRT_size_t CDECL MSVCRT_fwrite(const void *ptr, MSVCRT_size_t size, MSVCRT_si written += pcnt; wrcnt -= pcnt; ptr = (const char*)ptr + pcnt; - } else if(!file->_bufsiz && (file->_flag & MSVCRT__IONBF)) { - if(!(file->_flag & MSVCRT__IOWRT)) { - if(file->_flag & MSVCRT__IORW) - file->_flag |= MSVCRT__IOWRT; - else - break; - } + } else if((file->_flag & MSVCRT__IONBF) + || ((file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF)) && wrcnt >= file->_bufsiz) + || (!(file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF)) && wrcnt >= MSVCRT_INTERNAL_BUFSIZ)) { + MSVCRT_size_t pcnt; + int bufsiz; + + if(file->_flag & MSVCRT__IONBF) + bufsiz = 1; + else if(!(file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF))) + bufsiz = MSVCRT_INTERNAL_BUFSIZ; + else + bufsiz = file->_bufsiz; + + pcnt = (wrcnt / bufsiz) * bufsiz; - if(MSVCRT__write(file->_file, ptr, wrcnt) <= 0) { - file->_flag |= MSVCRT__IOERR; - break; - } - written += wrcnt; - wrcnt = 0; - } else if(file->_bufsiz && wrcnt >= file->_bufsiz) { - MSVCRT_size_t pcnt=(wrcnt / file->_bufsiz) * file->_bufsiz; if(msvcrt_flush_buffer(file) == MSVCRT_EOF) break; @@ -3939,7 +3941,7 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm { MSVCRT_size_t rcnt=size * nmemb; MSVCRT_size_t read=0; - int pread=0; + MSVCRT_size_t pread=0; if(!rcnt) return 0; @@ -3963,11 +3965,14 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm return 0; } } + + if(rcnt>0 && !(file->_flag & (MSVCRT__IONBF | MSVCRT__IOMYBUF | MSVCRT__USERBUF))) + msvcrt_alloc_buffer(file); + while(rcnt>0) { int i; - if (!file->_cnt && rcnt<MSVCRT_BUFSIZ && !(file->_flag & MSVCRT__IONBF) - && (file->_bufsiz != 0 || msvcrt_alloc_buffer(file))) { + if (!file->_cnt && rcnt<MSVCRT_BUFSIZ && (file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF))) { file->_cnt = MSVCRT__read(file->_file, file->_base, file->_bufsiz); file->_ptr = file->_base; i = (file->_cnt<rcnt) ? file->_cnt : rcnt; @@ -3981,8 +3986,8 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm file->_cnt -= i; file->_ptr += i; } - } else if (rcnt > UINT_MAX) { - i = MSVCRT__read(file->_file, ptr, UINT_MAX); + } else if (rcnt > INT_MAX) { + i = MSVCRT__read(file->_file, ptr, INT_MAX); } else if (rcnt < MSVCRT_BUFSIZ) { i = MSVCRT__read(file->_file, ptr, rcnt); } else { @@ -4190,7 +4195,7 @@ __int64 CDECL MSVCRT__ftelli64(MSVCRT_FILE* file) MSVCRT__unlock_file(file); return -1; } - if(file->_bufsiz) { + if(file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF)) { if(file->_flag & MSVCRT__IOWRT) { pos += file->_ptr - file->_base; @@ -4879,7 +4884,8 @@ int CDECL MSVCRT_ungetc(int c, MSVCRT_FILE * file) return MSVCRT_EOF; MSVCRT__lock_file(file); - if((!file->_bufsiz && msvcrt_alloc_buffer(file)) + if((!(file->_flag & (MSVCRT__IONBF | MSVCRT__IOMYBUF | MSVCRT__USERBUF)) + && msvcrt_alloc_buffer(file)) || (!file->_cnt && file->_ptr==file->_base)) file->_ptr++;

1 0

Christoph von Wittich : shlwapi: Avoid buffer overflow in PathCombineA.
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: wine Branch: master Commit: f26874c523e56c59fd23f002e0d7cae9c4ab840c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f26874c523e56c59fd23f002e… Author: Christoph von Wittich <Christoph(a)ApiViewer.de> Date: Thu Jun 26 20:31:35 2014 +0200 shlwapi: Avoid buffer overflow in PathCombineA. --- dlls/shlwapi/path.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index 01e3ae7..5c7a88a 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -155,20 +155,21 @@ LPSTR WINAPI PathCombineA(LPSTR lpszDest, LPCSTR lpszDir, LPCSTR lpszFile) if (!lpszDest) return NULL; if (!lpszDir && !lpszFile) - { - lpszDest[0] = 0; - return NULL; - } + goto fail; if (lpszDir) - MultiByteToWideChar(CP_ACP,0,lpszDir,-1,szDir,MAX_PATH); + if (!MultiByteToWideChar(CP_ACP,0,lpszDir,-1,szDir,MAX_PATH)) + goto fail; + if (lpszFile) - MultiByteToWideChar(CP_ACP,0,lpszFile,-1,szFile,MAX_PATH); + if (!MultiByteToWideChar(CP_ACP,0,lpszFile,-1,szFile,MAX_PATH)) + goto fail; if (PathCombineW(szDest, lpszDir ? szDir : NULL, lpszFile ? szFile : NULL)) if (WideCharToMultiByte(CP_ACP,0,szDest,-1,lpszDest,MAX_PATH,0,0)) return lpszDest; +fail: lpszDest[0] = 0; return NULL; }

1 0

Nikolay Sivov : iphlpapi/tests: Skipping test on access error.
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: wine Branch: master Commit: 1017a027e7acc41a06cad24946dde4a79f33ac34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1017a027e7acc41a06cad2494… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 27 11:11:45 2014 +0400 iphlpapi/tests: Skipping test on access error. --- dlls/iphlpapi/tests/iphlpapi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 13a21c0..ce68a7b 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -858,6 +858,11 @@ static void testSetTcpEntry(void) } ret = pSetTcpEntry(&row); + if (ret == ERROR_NETWORK_ACCESS_DENIED) + { + win_skip("SetTcpEntry failed with access error. Skipping test.\n"); + return; + } todo_wine ok( ret == ERROR_INVALID_PARAMETER, "got %u, expected %u\n", ret, ERROR_INVALID_PARAMETER); U(row).dwState = MIB_TCP_STATE_DELETE_TCB;

1 0

Henri Verbeet : ddraw/tests: Add some lost device tests.
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: wine Branch: master Commit: 1b4c55df296d1cc2daa2bd13394b560caff9bd7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b4c55df296d1cc2daa2bd133… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 27 08:26:58 2014 +0200 ddraw/tests: Add some lost device tests. --- dlls/ddraw/tests/ddraw1.c | 100 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 100 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 434 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b4c55df296d1cc2daa2b…

1 0

Henri Verbeet : d3d9/tests: Add some lost device tests.
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: wine Branch: master Commit: 04acac207a7b51525255359956cd4335d1eca311 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04acac207a7b5152525535995… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 27 08:26:56 2014 +0200 d3d9/tests: Add some lost device tests. --- dlls/d3d9/tests/d3d9ex.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/device.c | 85 +++++++++++++++++++++++++++++ 2 files changed, 223 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=04acac207a7b515252553…

1 0

Henri Verbeet : d3d9: Improve d3d9_device_TestCooperativeLevel().
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: wine Branch: master Commit: 09fda3b805b2defeb04f8df6ca7acbe25f2ae10d URL: http://source.winehq.org/git/wine.git/?a=commit;h=09fda3b805b2defeb04f8df6c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 27 08:26:59 2014 +0200 d3d9: Improve d3d9_device_TestCooperativeLevel(). --- dlls/d3d10core/device.c | 6 ++++++ dlls/d3d8/device.c | 6 ++++++ dlls/d3d9/d3d9_private.h | 9 ++++++++- dlls/d3d9/device.c | 40 +++++++++++++++++++++++++++++++++------- dlls/d3d9/tests/device.c | 4 ++-- dlls/ddraw/ddraw.c | 6 ++++++ dlls/wined3d/device.c | 4 ++++ include/wine/wined3d.h | 1 + 8 files changed, 66 insertions(+), 10 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 722b5aa..db3f265 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1935,6 +1935,11 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic TRACE("device_parent %p.\n", device_parent); } +static void CDECL device_parent_activate(struct wined3d_device_parent *device_parent, BOOL activate) +{ + TRACE("device_parent %p, activate %#x.\n", device_parent, activate); +} + static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent, void *container_parent, struct wined3d_surface *surface, void **parent, const struct wined3d_parent_ops **parent_ops) @@ -2033,6 +2038,7 @@ static const struct wined3d_device_parent_ops d3d10_wined3d_device_parent_ops = { device_parent_wined3d_device_created, device_parent_mode_changed, + device_parent_activate, device_parent_surface_created, device_parent_volume_created, device_parent_create_swapchain_surface, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index c83d16c..53a832e 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2921,6 +2921,11 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic TRACE("device_parent %p.\n", device_parent); } +static void CDECL device_parent_activate(struct wined3d_device_parent *device_parent, BOOL activate) +{ + TRACE("device_parent %p, activate %#x.\n", device_parent, activate); +} + static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent, void *container_parent, struct wined3d_surface *surface, void **parent, const struct wined3d_parent_ops **parent_ops) @@ -3034,6 +3039,7 @@ static const struct wined3d_device_parent_ops d3d8_wined3d_device_parent_ops = { device_parent_wined3d_device_created, device_parent_mode_changed, + device_parent_activate, device_parent_surface_created, device_parent_volume_created, device_parent_create_swapchain_surface, diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 8d75f62..8c685e4 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -139,6 +139,13 @@ struct fvf_declaration DWORD fvf; }; +enum d3d9_device_state +{ + D3D9_DEVICE_STATE_OK, + D3D9_DEVICE_STATE_LOST, + D3D9_DEVICE_STATE_NOT_RESET, +}; + struct d3d9_device { IDirect3DDevice9Ex IDirect3DDevice9Ex_iface; @@ -157,8 +164,8 @@ struct d3d9_device UINT index_buffer_size; UINT index_buffer_pos; + LONG device_state; BOOL in_destruction; - BOOL not_reset; BOOL in_scene; }; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 263ac12..57ad1e7 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -323,13 +323,21 @@ static HRESULT WINAPI d3d9_device_TestCooperativeLevel(IDirect3DDevice9Ex *iface TRACE("iface %p.\n", iface); - if (device->not_reset) + TRACE("device state: %#x.\n", device->device_state); + + if (device->d3d_parent->extended) + return D3D_OK; + + switch (device->device_state) { - TRACE("D3D9 device is marked not reset.\n"); - return D3DERR_DEVICENOTRESET; + default: + case D3D9_DEVICE_STATE_OK: + return D3D_OK; + case D3D9_DEVICE_STATE_LOST: + return D3DERR_DEVICELOST; + case D3D9_DEVICE_STATE_NOT_RESET: + return D3DERR_DEVICENOTRESET; } - - return D3D_OK; } static UINT WINAPI d3d9_device_GetAvailableTextureMem(IDirect3DDevice9Ex *iface) @@ -621,9 +629,9 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Reset(IDirect3DDevice9Ex *if hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, NULL, reset_enum_callback, !device->d3d_parent->extended); if (FAILED(hr) && !device->d3d_parent->extended) - device->not_reset = TRUE; + device->device_state = D3D9_DEVICE_STATE_NOT_RESET; else - device->not_reset = FALSE; + device->device_state = D3D9_DEVICE_STATE_OK; wined3d_mutex_unlock(); return hr; @@ -3414,6 +3422,23 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic TRACE("device_parent %p.\n", device_parent); } +static void CDECL device_parent_activate(struct wined3d_device_parent *device_parent, BOOL activate) +{ + struct d3d9_device *device = device_from_device_parent(device_parent); + + TRACE("device_parent %p, activate %#x.\n", device_parent, activate); + + if (!device->d3d_parent) + return; + + if (!activate) + InterlockedCompareExchange(&device->device_state, D3D9_DEVICE_STATE_LOST, D3D9_DEVICE_STATE_OK); + else if (device->d3d_parent->extended) + InterlockedCompareExchange(&device->device_state, D3D9_DEVICE_STATE_OK, D3D9_DEVICE_STATE_LOST); + else + InterlockedCompareExchange(&device->device_state, D3D9_DEVICE_STATE_NOT_RESET, D3D9_DEVICE_STATE_LOST); +} + static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent, void *container_parent, struct wined3d_surface *surface, void **parent, const struct wined3d_parent_ops **parent_ops) @@ -3531,6 +3556,7 @@ static const struct wined3d_device_parent_ops d3d9_wined3d_device_parent_ops = { device_parent_wined3d_device_created, device_parent_mode_changed, + device_parent_activate, device_parent_surface_created, device_parent_volume_created, device_parent_create_swapchain_surface, diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index bfd5e5a..edf3fa8 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -8930,7 +8930,7 @@ static void test_lost_device(void) ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); hr = IDirect3DDevice9_TestCooperativeLevel(device); - todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); @@ -8939,7 +8939,7 @@ static void test_lost_device(void) ret = SetForegroundWindow(window); ok(ret, "Failed to set foreground window.\n"); hr = IDirect3DDevice9_TestCooperativeLevel(device); - todo_wine ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index b62d5f6..617474b 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4722,6 +4722,11 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic ERR("Failed to resize window.\n"); } +static void CDECL device_parent_activate(struct wined3d_device_parent *device_parent, BOOL activate) +{ + TRACE("device_parent %p, activate %#x.\n", device_parent, activate); +} + static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent, void *container_parent, struct wined3d_surface *surface, void **parent, const struct wined3d_parent_ops **parent_ops) @@ -4846,6 +4851,7 @@ static const struct wined3d_device_parent_ops ddraw_wined3d_device_parent_ops = { device_parent_wined3d_device_created, device_parent_mode_changed, + device_parent_activate, device_parent_surface_created, device_parent_volume_created, device_parent_create_swapchain_surface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4cd6342..65f4ad7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4775,6 +4775,10 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL { device->device_parent->ops->mode_changed(device->device_parent); } + else if (message == WM_ACTIVATEAPP) + { + device->device_parent->ops->activate(device->device_parent, wparam); + } if (unicode) return CallWindowProcW(proc, window, message, wparam, lparam); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 328b595..f21abaf 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1981,6 +1981,7 @@ struct wined3d_device_parent_ops { void (__cdecl *wined3d_device_created)(struct wined3d_device_parent *device_parent, struct wined3d_device *device); void (__cdecl *mode_changed)(struct wined3d_device_parent *device_parent); + void (__cdecl *activate)(struct wined3d_device_parent *device_parent, BOOL activate); HRESULT (__cdecl *surface_created)(struct wined3d_device_parent *device_parent, void *container_parent, struct wined3d_surface *surface, void **parent, const struct wined3d_parent_ops **parent_ops); HRESULT (__cdecl *volume_created)(struct wined3d_device_parent *device_parent, void *container_parent,

1 0

Henri Verbeet : d3d8/tests: Add some lost device tests.
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: wine Branch: master Commit: e6de1cbdc96c1ac0f41c0776dc97fbad60ab446d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6de1cbdc96c1ac0f41c0776d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 27 08:26:57 2014 +0200 d3d8/tests: Add some lost device tests. --- dlls/d3d8/tests/device.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index e3197d2..376097e 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -6248,6 +6248,94 @@ static void test_writeonly_resource(void) DestroyWindow(window); } +static void test_lost_device(void) +{ + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + BOOL ret; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, FALSE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice8_TestCooperativeLevel(device); + if (hr == D3DERR_DEVICELOST) + { + win_skip("Broken TestCooperativeLevel(), skipping test.\n"); + IDirect3DDevice8_Release(device); + goto done; + } + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirect3DDevice8_TestCooperativeLevel(device); + todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + + ret = ShowWindow(window, SW_RESTORE); + ok(ret, "Failed to restore window.\n"); + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirect3DDevice8_TestCooperativeLevel(device); + todo_wine ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + + hr = reset_device(device, window, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_TestCooperativeLevel(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = reset_device(device, window, TRUE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_TestCooperativeLevel(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirect3DDevice8_TestCooperativeLevel(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + ret = ShowWindow(window, SW_RESTORE); + ok(ret, "Failed to restore window.\n"); + hr = IDirect3DDevice8_TestCooperativeLevel(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = reset_device(device, window, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_TestCooperativeLevel(device); + todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -6333,6 +6421,7 @@ START_TEST(device) test_resource_type(); test_mipmap_lock(); test_writeonly_resource(); + test_lost_device(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Henri Verbeet : d3d9: Check the device status in present calls.
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: wine Branch: master Commit: d50350886a3e15da29f29f7b3fb539e19a80d6d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d50350886a3e15da29f29f7b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 27 08:27:00 2014 +0200 d3d9: Check the device status in present calls. --- dlls/d3d9/device.c | 6 ++++++ dlls/d3d9/swapchain.c | 4 ++++ dlls/d3d9/tests/d3d9ex.c | 4 ++-- dlls/d3d9/tests/device.c | 4 ++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 57ad1e7..2d9a192 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -646,6 +646,9 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Present(IDirect3DDevice9Ex * TRACE("iface %p, src_rect %p, dst_rect %p, dst_window_override %p, dirty_region %p.\n", iface, src_rect, dst_rect, dst_window_override, dirty_region); + if (device->device_state != D3D9_DEVICE_STATE_OK) + return device->d3d_parent->extended ? S_PRESENT_OCCLUDED : D3DERR_DEVICELOST; + wined3d_mutex_lock(); hr = wined3d_device_present(device->wined3d_device, src_rect, dst_rect, dst_window_override, dirty_region, 0); @@ -3085,6 +3088,9 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_PresentEx(IDirect3DDevice9Ex iface, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), dst_window_override, dirty_region, flags); + if (device->device_state != D3D9_DEVICE_STATE_OK) + return S_PRESENT_OCCLUDED; + wined3d_mutex_lock(); hr = wined3d_device_present(device->wined3d_device, src_rect, dst_rect, dst_window_override, dirty_region, flags); diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index d44b449..5cf56d2 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -115,12 +115,16 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_swapchain_Present(IDirect3DSwapChai const RGNDATA *dirty_region, DWORD flags) { struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9Ex(iface); + struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(swapchain->parent_device); HRESULT hr; TRACE("iface %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p, flags %#x.\n", iface, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), dst_window_override, dirty_region, flags); + if (device->device_state != D3D9_DEVICE_STATE_OK) + return device->d3d_parent->extended ? S_PRESENT_OCCLUDED : D3DERR_DEVICELOST; + wined3d_mutex_lock(); hr = wined3d_swapchain_present(swapchain->wined3d_swapchain, src_rect, dst_rect, dst_window_override, dirty_region, flags); diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 07d1c06..89238c8 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -1226,9 +1226,9 @@ static void test_lost_device(void) hr = IDirect3DDevice9Ex_TestCooperativeLevel(device); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_Present(device, NULL, NULL, NULL, NULL); - todo_wine ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); + ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_PresentEx(device, NULL, NULL, NULL, NULL, 0); - todo_wine ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); + ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_CheckDeviceState(device, window); todo_wine ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_CheckDeviceState(device, NULL); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index edf3fa8..b11771f 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -8932,7 +8932,7 @@ static void test_lost_device(void) hr = IDirect3DDevice9_TestCooperativeLevel(device); ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); ret = ShowWindow(window, SW_RESTORE); ok(ret, "Failed to restore window.\n"); @@ -8941,7 +8941,7 @@ static void test_lost_device(void) hr = IDirect3DDevice9_TestCooperativeLevel(device); ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); hr = reset_device(device, window, FALSE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : scrrun/tests: Run test on fixed drive.
by Alexandre Julliard June 27, 2014

June 27, 2014

Module: wine Branch: master Commit: ffe16a567e056231265440b6dd682b1ab2cfb945 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffe16a567e056231265440b6d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 27 10:06:01 2014 +0400 scrrun/tests: Run test on fixed drive. --- dlls/scrrun/tests/filesystem.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 9410732..6042241 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1795,7 +1795,6 @@ static void test_SerialNumber(void) IDriveCollection *drives; IEnumVARIANT *iter; IDrive *drive; - VARIANT var; LONG serial; HRESULT hr; BSTR name; @@ -1805,13 +1804,31 @@ static void test_SerialNumber(void) hr = IDriveCollection_get__NewEnum(drives, (IUnknown**)&iter); ok(hr == S_OK, "got 0x%08x\n", hr); + IDriveCollection_Release(drives); - hr = IEnumVARIANT_Next(iter, 1, &var, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + while (1) { + DriveTypeConst type; + VARIANT var; - hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IDrive, (void**)&drive); - ok(hr == S_OK, "got 0x%08x\n", hr); - VariantClear(&var); + hr = IEnumVARIANT_Next(iter, 1, &var, NULL); + if (hr == S_FALSE) { + skip("No fixed drive found, skipping test.\n"); + IEnumVARIANT_Release(iter); + return; + } + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IDrive, (void**)&drive); + ok(hr == S_OK, "got 0x%08x\n", hr); + VariantClear(&var); + + hr = IDrive_get_DriveType(drive, &type); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (type == Fixed) + break; + + IDrive_Release(drive); + } hr = IDrive_get_SerialNumber(drive, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); @@ -1841,7 +1858,6 @@ static void test_SerialNumber(void) IDrive_Release(drive); IEnumVARIANT_Release(iter); - IDriveCollection_Release(drives); } START_TEST(filesystem)

1 0

Matteo Bruni : d3dx9: Correctly set parent_data for direct includes from the main file.
by Alexandre Julliard June 26, 2014

June 26, 2014

Module: wine Branch: master Commit: d64ec66b416a9ee0ecff5a5a1387f67b1387fa7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d64ec66b416a9ee0ecff5a5a1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 26 19:52:33 2014 +0200 d3dx9: Correctly set parent_data for direct includes from the main file. --- dlls/d3dx9_36/shader.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 68e7474..b36e7bb 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -219,6 +219,20 @@ HRESULT WINAPI D3DXAssembleShader(const char *data, UINT data_len, const D3DXMAC return hr; } +static const void *main_file_data; + +static CRITICAL_SECTION from_file_mutex; +static CRITICAL_SECTION_DEBUG from_file_mutex_debug = +{ + 0, 0, &from_file_mutex, + { + &from_file_mutex_debug.ProcessLocksList, + &from_file_mutex_debug.ProcessLocksList + }, + 0, 0, {(DWORD_PTR)(__FILE__ ": from_file_mutex")} +}; +static CRITICAL_SECTION from_file_mutex = {&from_file_mutex_debug, -1, 0, 0, 0, 0}; + /* D3DXInclude private implementation, used to implement * D3DXAssembleShaderFromFile() from D3DXAssembleShader(). */ /* To be able to correctly resolve include search paths we have to store the @@ -233,8 +247,15 @@ static HRESULT WINAPI d3dincludefromfile_open(ID3DXInclude *iface, D3DXINCLUDE_T HANDLE file; UINT size; - if(parent_data != NULL) + if (parent_data) + { parent_name = *((const char **)parent_data - 1); + } + else + { + if (main_file_data) + parent_name = *((const char **)main_file_data - 1); + } TRACE("Looking up for include file %s, parent %s\n", debugstr_a(filename), debugstr_a(parent_name)); @@ -265,6 +286,8 @@ static HRESULT WINAPI d3dincludefromfile_open(ID3DXInclude *iface, D3DXINCLUDE_T goto error; *data = buffer + 1; + if (!main_file_data) + main_file_data = *data; CloseHandle(file); return S_OK; @@ -280,6 +303,8 @@ static HRESULT WINAPI d3dincludefromfile_close(ID3DXInclude *iface, const void * { HeapFree(GetProcessHeap(), 0, *((char **)data - 1)); HeapFree(GetProcessHeap(), 0, (char **)data - 1); + if (main_file_data == data) + main_file_data = NULL; return S_OK; } @@ -339,9 +364,11 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(const WCHAR *filename, const D3DXMACR return E_OUTOFMEMORY; WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, len, NULL, NULL); + EnterCriticalSection(&from_file_mutex); hr = ID3DXInclude_Open(include, D3D_INCLUDE_LOCAL, filename_a, NULL, &buffer, &len); if (FAILED(hr)) { + LeaveCriticalSection(&from_file_mutex); HeapFree(GetProcessHeap(), 0, filename_a); return D3DXERR_INVALIDDATA; } @@ -349,6 +376,7 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(const WCHAR *filename, const D3DXMACR hr = D3DXAssembleShader(buffer, len, defines, include, flags, shader, error_messages); ID3DXInclude_Close(include, buffer); + LeaveCriticalSection(&from_file_mutex); HeapFree(GetProcessHeap(), 0, filename_a); return hr; } @@ -471,9 +499,11 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO return E_OUTOFMEMORY; WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, filename_len, NULL, NULL); + EnterCriticalSection(&from_file_mutex); hr = ID3DXInclude_Open(include, D3D_INCLUDE_LOCAL, filename_a, NULL, &buffer, &len); if (FAILED(hr)) { + LeaveCriticalSection(&from_file_mutex); HeapFree(GetProcessHeap(), 0, filename_a); return D3DXERR_INVALIDDATA; } @@ -487,6 +517,7 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO constant_table); ID3DXInclude_Close(include, buffer); + LeaveCriticalSection(&from_file_mutex); HeapFree(GetProcessHeap(), 0, filename_a); return hr; } @@ -591,9 +622,11 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileW(const WCHAR *filename, const D3DXMA return E_OUTOFMEMORY; WideCharToMultiByte(CP_ACP, 0, filename, -1, filename_a, len, NULL, NULL); + EnterCriticalSection(&from_file_mutex); hr = ID3DXInclude_Open(include, D3D_INCLUDE_LOCAL, filename_a, NULL, &buffer, &len); if (FAILED(hr)) { + LeaveCriticalSection(&from_file_mutex); HeapFree(GetProcessHeap(), 0, filename_a); return D3DXERR_INVALIDDATA; } @@ -604,6 +637,7 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileW(const WCHAR *filename, const D3DXMA (ID3DBlob **)shader, (ID3DBlob **)error_messages); ID3DXInclude_Close(include, buffer); + LeaveCriticalSection(&from_file_mutex); HeapFree(GetProcessHeap(), 0, filename_a); return hr; }

1 0

Alexander Almaleh : gdi32: Fix XFORM.eM22 calculation in PlgBlt.
by Alexandre Julliard June 26, 2014

June 26, 2014

Module: wine Branch: master Commit: 8762842cd337a809a6504420da2aeeeb5d3618b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8762842cd337a809a6504420d… Author: Alexander Almaleh <sashoalm(a)gmail.com> Date: Thu Jun 26 14:56:49 2014 +0300 gdi32: Fix XFORM.eM22 calculation in PlgBlt. --- dlls/gdi32/bitblt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 4750d1b..762ca0f 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -1037,7 +1037,7 @@ BOOL WINAPI PlgBlt( HDC hdcDest, const POINT *lpPoint, /* Y components */ xf.eM12 = (plg[1].y*(rect[2].y - rect[0].y) - plg[2].y*(rect[1].y - rect[0].y) - plg[0].y*(rect[2].y - rect[1].y)) / det; - xf.eM22 = (plg[1].x*(rect[2].y - rect[0].y) - plg[2].x*(rect[1].y - rect[0].y) - plg[0].x*(rect[2].y - rect[1].y)) / det; + xf.eM22 = (rect[1].x*(plg[2].y - plg[0].y) - rect[2].x*(plg[1].y - plg[0].y) - rect[0].x*(plg[2].y - plg[1].y)) / det; xf.eDy = (rect[0].x*(rect[1].y*plg[2].y - rect[2].y*plg[1].y) - rect[1].x*(rect[0].y*plg[2].y - rect[2].y*plg[0].y) + rect[2].x*(rect[0].y*plg[1].y - rect[1].y*plg[0].y)

1 0

Matteo Bruni : wpp: Correctly handle OOM in pop_buffer().
by Alexandre Julliard June 26, 2014

June 26, 2014

Module: wine Branch: master Commit: b5db97ac51cf3ec962d7f26c87130c1b5ac747b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5db97ac51cf3ec962d7f26c8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 26 19:52:32 2014 +0200 wpp: Correctly handle OOM in pop_buffer(). --- libs/wpp/ppl.l | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 0ce64c2..243049a 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -1354,19 +1354,20 @@ static bufferstackentry_t *pop_buffer(void) if(ppp) { iep = pp_xmalloc(sizeof(includelogicentry_t)); - if(!iep) - return NULL; - - iep->ppp = ppp; - ppp->iep = iep; - iep->filename = bufferstack[bufferstackidx].include_filename; - iep->prev = NULL; - iep->next = pp_includelogiclist; - if(iep->next) - iep->next->prev = iep; - pp_includelogiclist = iep; - if(pp_status.debug) - fprintf(stderr, "pop_buffer: %s:%d: includelogic added, include_ppp='%s', file='%s'\n", bufferstack[bufferstackidx].filename, bufferstack[bufferstackidx].line_number, pp_incl_state.ppp, iep->filename); + if (iep) + { + iep->ppp = ppp; + ppp->iep = iep; + iep->filename = bufferstack[bufferstackidx].include_filename; + iep->prev = NULL; + iep->next = pp_includelogiclist; + if(iep->next) + iep->next->prev = iep; + pp_includelogiclist = iep; + if(pp_status.debug) + fprintf(stderr, "pop_buffer: %s:%d: includelogic added, include_ppp='%s', file='%s'\n", + bufferstack[bufferstackidx].filename, bufferstack[bufferstackidx].line_number, pp_incl_state.ppp, iep->filename); + } } } free(pp_incl_state.ppp);

1 0

Matteo Bruni : wpp: Free some filename strings after processing an include (Valgrind).
by Alexandre Julliard June 26, 2014

June 26, 2014

Module: wine Branch: master Commit: 1b79df4e80c4135217ea56a20ab6c3dee5144b2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b79df4e80c4135217ea56a20… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 26 19:52:31 2014 +0200 wpp: Free some filename strings after processing an include (Valgrind). --- libs/wpp/ppl.l | 16 +++++++++++----- libs/wpp/wpp.c | 8 ++++++-- libs/wpp/wpp_private.h | 2 +- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 9655e34..0ce64c2 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -213,7 +213,7 @@ typedef struct bufferstackentry { pp_entry_t *define; /* Points to expanding define or NULL if handling includes */ int line_number; /* Line that we were handling */ int char_number; /* The current position on that line */ - const char *filename; /* Filename that we were handling */ + char *filename; /* Filename that we were handling */ int if_depth; /* How many #if:s deep to check matching #endif:s */ int ncontinuations; /* Remember the continuation state */ int should_pop; /* Set if we must pop the start-state on EOF */ @@ -1340,6 +1340,8 @@ static bufferstackentry_t *pop_buffer(void) bufferstack[bufferstackidx].define->expanding = 0; else { + includelogicentry_t *iep = NULL; + if(!bufferstack[bufferstackidx].should_pop) { wpp_callbacks->close(pp_status.file); @@ -1351,7 +1353,7 @@ static bufferstackentry_t *pop_buffer(void) pp_entry_t *ppp = pplookup(pp_incl_state.ppp); if(ppp) { - includelogicentry_t *iep = pp_xmalloc(sizeof(includelogicentry_t)); + iep = pp_xmalloc(sizeof(includelogicentry_t)); if(!iep) return NULL; @@ -1366,17 +1368,21 @@ static bufferstackentry_t *pop_buffer(void) if(pp_status.debug) fprintf(stderr, "pop_buffer: %s:%d: includelogic added, include_ppp='%s', file='%s'\n", bufferstack[bufferstackidx].filename, bufferstack[bufferstackidx].line_number, pp_incl_state.ppp, iep->filename); } - else - free(bufferstack[bufferstackidx].include_filename); } free(pp_incl_state.ppp); pp_incl_state = bufferstack[bufferstackidx].incl; } + if (bufferstack[bufferstackidx].include_filename) + { + free(pp_status.input); + pp_status.input = bufferstack[bufferstackidx].filename; + } pp_status.line_number = bufferstack[bufferstackidx].line_number; pp_status.char_number = bufferstack[bufferstackidx].char_number; - pp_status.input = bufferstack[bufferstackidx].filename; ncontinuations = bufferstack[bufferstackidx].ncontinuations; + if (!iep) + free(bufferstack[bufferstackidx].include_filename); } if(ppy_debug) diff --git a/libs/wpp/wpp.c b/libs/wpp/wpp.c index 66eb026..60b2d38 100644 --- a/libs/wpp/wpp.c +++ b/libs/wpp/wpp.c @@ -206,7 +206,7 @@ int wpp_parse( const char *input, FILE *output ) return 2; } - pp_status.input = input; + pp_status.input = input ? pp_xstrdup(input) : NULL; ppy_out = output; pp_writestring("# 1 \"%s\" 1\n", input ? input : ""); @@ -215,7 +215,11 @@ int wpp_parse( const char *input, FILE *output ) /* If there were errors during processing, return an error code */ if (!ret && pp_status.state) ret = pp_status.state; - if (input) wpp_callbacks->close(pp_status.file); + if (input) + { + wpp_callbacks->close(pp_status.file); + free(pp_status.input); + } /* Clean if_stack, it could remain dirty on errors */ while (pp_get_if_depth()) pp_pop_if(); del_special_defines(); diff --git a/libs/wpp/wpp_private.h b/libs/wpp/wpp_private.h index 4e2aa5b..caa52b9 100644 --- a/libs/wpp/wpp_private.h +++ b/libs/wpp/wpp_private.h @@ -228,7 +228,7 @@ void pp_internal_error(const char *file, int line, const char *s, ...) __attribu /* everything is in this structure to avoid polluting the global symbol space */ struct pp_status { - const char *input; /* current input file name */ + char *input; /* current input file name */ void *file; /* current input file descriptor */ int line_number; /* current line number */ int char_number; /* current char number in line */

1 0

Jacek Caban : ieframe: Use URL_APPLY_DEFAULT in UrlApplyScheme call.
by Alexandre Julliard June 26, 2014

June 26, 2014

Module: wine Branch: master Commit: 333fbba681ec2214d57bddb6c2ddf6b249090218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=333fbba681ec2214d57bddb6c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 26 11:58:57 2014 +0200 ieframe: Use URL_APPLY_DEFAULT in UrlApplyScheme call. --- dlls/ieframe/navigate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 886fa01..f3e0d0d 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -667,7 +667,7 @@ static HRESULT create_moniker(LPCWSTR url, IMoniker **mon) return CreateURLMoniker(NULL, url, mon); size = sizeof(new_url)/sizeof(WCHAR); - hres = UrlApplySchemeW(url, new_url, &size, URL_APPLY_GUESSSCHEME | URL_APPLY_GUESSFILE); + hres = UrlApplySchemeW(url, new_url, &size, URL_APPLY_GUESSSCHEME | URL_APPLY_GUESSFILE | URL_APPLY_DEFAULT); TRACE("was %s got %s\n", debugstr_w(url), debugstr_w(new_url)); if(FAILED(hres)) { WARN("UrlApplyScheme failed: %08x\n", hres);

1 0

Piotr Caban : msvcrt: Fix _flsbuf behavior on streams with MSVCRT__IONBF flag.
by Alexandre Julliard June 26, 2014

June 26, 2014

Module: wine Branch: master Commit: f91f24f6e739db14950514db99bab614dd11fe50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f91f24f6e739db14950514db9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 26 12:29:48 2014 +0200 msvcrt: Fix _flsbuf behavior on streams with MSVCRT__IONBF flag. --- dlls/msvcrt/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b60e306..70b908a 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3656,7 +3656,7 @@ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) else return MSVCRT_EOF; } - if(file->_bufsiz) { + if(file->_bufsiz && !(file->_flag&MSVCRT__IONBF)) { int res = 0; if(file->_cnt <= 0) {

1 0

Piotr Caban : msvcr110: Add __crtInitializeCriticalSectionEx implementation.
by Alexandre Julliard June 26, 2014

June 26, 2014

Module: wine Branch: master Commit: 8715d89c4942bb19914243347d470248b4f8cfe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8715d89c4942bb19914243347… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 26 14:23:07 2014 +0200 msvcr110: Add __crtInitializeCriticalSectionEx implementation. --- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcrt/misc.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 4127725..2f9ad70 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -921,7 +921,7 @@ @ cdecl __crtGetShowWindowMode() MSVCR110__crtGetShowWindowMode @ stub -arch=i386,win64 __crtGetTimeFormatEx @ stub -arch=i386,win64 __crtGetUserDefaultLocaleName -@ stub -arch=i386,win64 __crtInitializeCriticalSectionEx +@ cdecl -arch=i386,win64 __crtInitializeCriticalSectionEx(ptr long long) MSVCR110__crtInitializeCriticalSectionEx @ stub __crtIsPackagedApp @ stub -arch=i386,win64 __crtIsValidLocaleName @ cdecl __crtLCMapStringA(long long str long ptr long long long) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 4e67cba..d791699 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -480,3 +480,13 @@ int CDECL MSVCR110__crtGetShowWindowMode(void) TRACE("window=%d\n", si.wShowWindow); return si.wShowWindow; } + +/********************************************************************* + * __crtInitializeCriticalSectionEx (MSVCR110.@) + */ +BOOL CDECL MSVCR110__crtInitializeCriticalSectionEx( + CRITICAL_SECTION *cs, DWORD spin_count, DWORD flags) +{ + TRACE("(%p %x %x)\n", cs, spin_count, flags); + return InitializeCriticalSectionEx(cs, spin_count, flags); +}

1 0

Piotr Caban : msvcp110: Add _Mtx_{destroy, getconcrtcs, init, lock, unlock, trylock} implementation.
by Alexandre Julliard June 26, 2014

June 26, 2014

Module: wine Branch: master Commit: 3fa2bb2dce9b52b24e512580241185888716fc0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa2bb2dce9b52b24e5125802… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 26 13:46:09 2014 +0200 msvcp110: Add _Mtx_{destroy,getconcrtcs,init,lock,unlock,trylock} implementation. --- dlls/msvcp110/msvcp110.spec | 12 ++--- dlls/msvcp90/misc.c | 104 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 25 +++++++++++ dlls/msvcp90/msvcp_main.c | 32 ++++++++++++++ dlls/msvcrt/lock.c | 1 + 5 files changed, 168 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 331df11..5fc5348 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3819,14 +3819,14 @@ @ cdecl _Mbrtowc(ptr ptr long ptr ptr) @ stub _Mtx_clear_owner @ stub _Mtx_current_owns -@ stub _Mtx_destroy -@ stub _Mtx_getconcrtcs -@ stub _Mtx_init -@ stub _Mtx_lock +@ cdecl _Mtx_destroy(ptr) +@ cdecl _Mtx_getconcrtcs(ptr) +@ cdecl _Mtx_init(ptr long) +@ cdecl _Mtx_lock(ptr) @ stub _Mtx_reset_owner @ stub _Mtx_timedlock -@ stub _Mtx_trylock -@ stub _Mtx_unlock +@ cdecl _Mtx_trylock(ptr) +@ cdecl _Mtx_unlock(ptr) @ stub _Mtxdst @ stub _Mtxinit @ stub _Mtxlock diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 1c3bd2f..abd53d7 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -374,3 +374,107 @@ unsigned int __cdecl _Random_device(void) return ret; } #endif + +#if _MSVCP_VER >= 110 +#if defined(__i386__) && !defined(__arm__) + +#define THISCALL(func) __thiscall_ ## func +#define __thiscall __stdcall +#define DEFINE_THISCALL_WRAPPER(func,args) \ + extern void THISCALL(func)(void); \ + __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ + "popl %eax\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) + +extern void *call_thiscall_func; +__ASM_GLOBAL_FUNC(call_thiscall_func, + "popl %eax\n\t" + "popl %edx\n\t" + "popl %ecx\n\t" + "pushl %eax\n\t" + "jmp *%edx\n\t") + +#define call_func1(func,this) ((void* (WINAPI*)(void*,void*))&call_thiscall_func)(func,this) + +#else /* __i386__ */ + +#define __thiscall __cdecl +#define DEFINE_THISCALL_WRAPPER(func,args) /* nothing */ + +#define call_func1(func,this) func(this) + +#endif /* __i386__ */ + +#define MTX_MULTI_LOCK 0x100 +#define MTX_LOCKED 3 +typedef struct +{ + DWORD flags; + critical_section cs; + DWORD thread_id; + DWORD count; +} *_Mtx_t; + +int __cdecl _Mtx_init(_Mtx_t *mtx, int flags) +{ + if(flags & ~MTX_MULTI_LOCK) + FIXME("unknown flags ignorred: %x\n", flags); + + *mtx = MSVCRT_operator_new(sizeof(**mtx)); + (*mtx)->flags = flags; + call_func1(critical_section_ctor, &(*mtx)->cs); + (*mtx)->thread_id = -1; + (*mtx)->count = 0; + return 0; +} + +void __cdecl _Mtx_destroy(_Mtx_t *mtx) +{ + call_func1(critical_section_dtor, &(*mtx)->cs); + MSVCRT_operator_delete(*mtx); +} + +int __cdecl _Mtx_lock(_Mtx_t *mtx) +{ + if((*mtx)->thread_id != GetCurrentThreadId()) { + call_func1(critical_section_lock, &(*mtx)->cs); + (*mtx)->thread_id = GetCurrentThreadId(); + }else if(!((*mtx)->flags & MTX_MULTI_LOCK)) { + return MTX_LOCKED; + } + + (*mtx)->count++; + return 0; +} + +int __cdecl _Mtx_unlock(_Mtx_t *mtx) +{ + if(--(*mtx)->count) + return 0; + + (*mtx)->thread_id = -1; + call_func1(critical_section_unlock, &(*mtx)->cs); + return 0; +} + +int __cdecl _Mtx_trylock(_Mtx_t *mtx) +{ + if((*mtx)->thread_id != GetCurrentThreadId()) { + if(!call_func1(critical_section_trylock, &(*mtx)->cs)) + return MTX_LOCKED; + (*mtx)->thread_id = GetCurrentThreadId(); + }else if(!((*mtx)->flags & MTX_MULTI_LOCK)) { + return MTX_LOCKED; + } + + (*mtx)->count++; + return 0; +} + +critical_section* __cdecl _Mtx_getconcrtcs(_Mtx_t *mtx) +{ + return &(*mtx)->cs; +} +#endif diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 0d5e124..5062bdc 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -45,6 +45,31 @@ extern void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t); extern void (__cdecl *MSVCRT_operator_delete)(void*); extern void* (__cdecl *MSVCRT_set_new_handler)(void*); +#if _MSVCP_VER >= 110 +/* keep in sync with msvcrt/lock.c */ +typedef struct cs_queue +{ + struct cs_queue *next; + BOOL free; + int unknown; +} cs_queue; + +typedef struct +{ + ULONG_PTR unk_thread_id; + cs_queue unk_active; + void *unknown[2]; + cs_queue *head; + void *tail; +} critical_section; + +extern critical_section* (__thiscall *critical_section_ctor)(critical_section*); +extern void (__thiscall *critical_section_dtor)(critical_section*); +extern void (__thiscall *critical_section_lock)(critical_section*); +extern void (__thiscall *critical_section_unlock)(critical_section*); +extern MSVCP_bool (__thiscall *critical_section_trylock)(critical_section*); +#endif + /* basic_string<char, char_traits<char>, allocator<char>> */ #define BUF_SIZE_CHAR 16 typedef struct diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index 489aacb..edbdd50 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -60,6 +60,14 @@ void* (__cdecl *MSVCRT_operator_new)(MSVCP_size_t); void (__cdecl *MSVCRT_operator_delete)(void*); void* (__cdecl *MSVCRT_set_new_handler)(void*); +#if _MSVCP_VER >= 110 +critical_section* (__thiscall *critical_section_ctor)(critical_section*); +void (__thiscall *critical_section_dtor)(critical_section*); +void (__thiscall *critical_section_lock)(critical_section*); +void (__thiscall *critical_section_unlock)(critical_section*); +MSVCP_bool (__thiscall *critical_section_trylock)(critical_section*); +#endif + #define VERSION_STRING(ver) #ver #define MSVCRT_NAME(ver) "msvcr" VERSION_STRING(ver) ".dll" @@ -74,12 +82,36 @@ static void init_cxx_funcs(void) MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2(a)YAPEAX_K@Z"); MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3(a)YAXPEAX@Z"); MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "?_set_new_handler@@YAP6AH_K(a)ZP6AH0@Z(a)Z"); + +#if _MSVCP_VER >= 110 + critical_section_ctor = (void*)GetProcAddress(hmod, "??0critical_section(a)Concurrency@@QEAA(a)XZ"); + critical_section_dtor = (void*)GetProcAddress(hmod, "??1critical_section(a)Concurrency@@QEAA(a)XZ"); + critical_section_lock = (void*)GetProcAddress(hmod, "?lock(a)critical_section@Concurrency@@QEAAXXZ"); + critical_section_unlock = (void*)GetProcAddress(hmod, "?unlock(a)critical_section@Concurrency@@QEAAXXZ"); + critical_section_trylock = (void*)GetProcAddress(hmod, "?try_lock(a)critical_section@Concurrency@@QEAA_NXZ"); +#endif } else { MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2(a)YAPAXI@Z"); MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3(a)YAXPAX@Z"); MSVCRT_set_new_handler = (void*)GetProcAddress(hmod, "?_set_new_handler@@YAP6AHI(a)ZP6AHI@Z(a)Z"); + +#if _MSVCP_VER >= 110 +#ifdef __arm__ + critical_section_ctor = (void*)GetProcAddress(hmod, "??0critical_section(a)Concurrency@@QAA(a)XZ"); + critical_section_dtor = (void*)GetProcAddress(hmod, "??1critical_section(a)Concurrency@@QAA(a)XZ"); + critical_section_lock = (void*)GetProcAddress(hmod, "?lock(a)critical_section@Concurrency@@QAAXXZ"); + critical_section_unlock = (void*)GetProcAddress(hmod, "?unlock(a)critical_section@Concurrency@@QAAXXZ"); + critical_section_trylock = (void*)GetProcAddress(hmod, "?try_lock(a)critical_section@Concurrency@@QAA_NXZ"); +#else + critical_section_ctor = (void*)GetProcAddress(hmod, "??0critical_section(a)Concurrency@@QAE(a)XZ"); + critical_section_dtor = (void*)GetProcAddress(hmod, "??1critical_section(a)Concurrency@@QAE(a)XZ"); + critical_section_lock = (void*)GetProcAddress(hmod, "?lock(a)critical_section@Concurrency@@QAEXXZ"); + critical_section_unlock = (void*)GetProcAddress(hmod, "?unlock(a)critical_section@Concurrency@@QAEXXZ"); + critical_section_trylock = (void*)GetProcAddress(hmod, "?try_lock(a)critical_section@Concurrency@@QAE_NXZ"); +#endif +#endif /* _MSVCP_VER >= 110 */ } } diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index aee8d2b..328b5b5 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -287,6 +287,7 @@ MSVCRT_bool __thiscall SpinWait__SpinOnce(SpinWait *this) static HANDLE keyed_event; +/* keep in sync with msvcp90/msvcp90.h */ typedef struct cs_queue { struct cs_queue *next;

1 0

Piotr Caban : msvcrt: Fix ungetc on files with empty buffer.
by Alexandre Julliard June 26, 2014

June 26, 2014

Module: wine Branch: master Commit: 1ae475dae8ea927a659dca762cd3f51b6c894a1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae475dae8ea927a659dca762… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 26 12:29:54 2014 +0200 msvcrt: Fix ungetc on files with empty buffer. --- dlls/msvcrt/file.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 70b908a..fe2d144 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4859,12 +4859,17 @@ int CDECL MSVCRT_printf_s(const char *format, ...) */ int CDECL MSVCRT_ungetc(int c, MSVCRT_FILE * file) { - if (c == MSVCRT_EOF) + if(!MSVCRT_CHECK_PMT(file != NULL)) return MSVCRT_EOF; + + if (c == MSVCRT_EOF || !(file->_flag&MSVCRT__IOREAD || + (file->_flag&MSVCRT__IORW && !(file->_flag&MSVCRT__IOWRT)))) return MSVCRT_EOF; MSVCRT__lock_file(file); - if(file->_bufsiz == 0 && msvcrt_alloc_buffer(file)) + if((!file->_bufsiz && msvcrt_alloc_buffer(file)) + || (!file->_cnt && file->_ptr==file->_base)) file->_ptr++; + if(file->_ptr>file->_base) { file->_ptr--; if(file->_flag & MSVCRT__IOSTRG) { @@ -4878,6 +4883,7 @@ int CDECL MSVCRT_ungetc(int c, MSVCRT_FILE * file) } file->_cnt++; MSVCRT_clearerr(file); + file->_flag |= MSVCRT__IOREAD; MSVCRT__unlock_file(file); return c; }

1 0

Jacek Caban : shdocvw: Added ResetProfileSharing stub.
by Alexandre Julliard June 26, 2014

June 26, 2014

Module: wine Branch: master Commit: bf2d38fbc1224f14674f58485d34eeff70a1b3c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf2d38fbc1224f14674f58485… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 26 11:35:30 2014 +0200 shdocvw: Added ResetProfileSharing stub. --- dlls/shdocvw/shdocvw.spec | 2 +- dlls/shdocvw/shdocvw_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec index 1cdeff4..96bc44b 100644 --- a/dlls/shdocvw/shdocvw.spec +++ b/dlls/shdocvw/shdocvw.spec @@ -46,7 +46,7 @@ 161 stub @ # CSearchAssistantOC::OnDraw 162 stub -noname CDDEAuto_Navigate 163 stub SHAddSubscribeFavorite -164 stub -noname ResetProfileSharing +164 stdcall -noname ResetProfileSharing(long) 165 stub -noname URLSubstitution 167 stub -noname IsIEDefaultBrowser 169 stdcall -noname ParseURLFromOutsideSourceA(str ptr ptr ptr) diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 5095696..57945b0 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -533,3 +533,12 @@ BOOL WINAPI ImportPrivacySettings(LPCWSTR filename, BOOL *pGlobalPrefs, BOOL * p return TRUE; } + +/****************************************************************** + * ResetProfileSharing (SHDOCVW.164) + */ +HRESULT WINAPI ResetProfileSharing(HWND hwnd) +{ + FIXME("(%p) stub\n", hwnd); + return E_NOTIMPL; +}

1 0

Piotr Caban : msvcrt: Support NULL buffer in setvbuf.
by Alexandre Julliard June 26, 2014

June 26, 2014

Module: wine Branch: master Commit: 18a416f7d5a7d900aaea784b8298cb8ad5d3d13e URL: http://source.winehq.org/git/wine.git/?a=commit;h=18a416f7d5a7d900aaea784b8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 26 12:29:59 2014 +0200 msvcrt: Support NULL buffer in setvbuf. --- dlls/msvcrt/file.c | 53 ++++++++++++++++++++++++++++++------------------ dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/tests/file.c | 4 ++++ 3 files changed, 38 insertions(+), 20 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index fe2d144..465a417 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4478,26 +4478,39 @@ int CDECL MSVCRT__wrename(const MSVCRT_wchar_t *oldpath,const MSVCRT_wchar_t *ne */ int CDECL MSVCRT_setvbuf(MSVCRT_FILE* file, char *buf, int mode, MSVCRT_size_t size) { - MSVCRT__lock_file(file); - if(file->_bufsiz) { - if(file->_flag & MSVCRT__IOMYBUF) - MSVCRT_free(file->_base); - file->_flag &= ~MSVCRT__IOMYBUF; - file->_base = file->_ptr = NULL; - file->_bufsiz = 0; - file->_cnt = 0; - } - if(mode == MSVCRT__IOFBF) { - file->_flag &= ~MSVCRT__IONBF; - file->_base = file->_ptr = buf; - if(buf) { - file->_bufsiz = size; - } - } else { - file->_flag |= MSVCRT__IONBF; - } - MSVCRT__unlock_file(file); - return 0; + if(!MSVCRT_CHECK_PMT(file != NULL)) return -1; + if(!MSVCRT_CHECK_PMT(mode==MSVCRT__IONBF || mode==MSVCRT__IOFBF || mode==MSVCRT__IOLBF)) return -1; + if(!MSVCRT_CHECK_PMT(mode==MSVCRT__IONBF || (size>=2 && size<=INT_MAX))) return -1; + + MSVCRT__lock_file(file); + + MSVCRT_fflush(file); + if(file->_flag & MSVCRT__IOMYBUF) + MSVCRT_free(file->_base); + file->_flag &= ~(MSVCRT__IONBF | MSVCRT__IOMYBUF | MSVCRT__USERBUF); + file->_cnt = 0; + + if(mode == MSVCRT__IONBF) { + file->_flag |= MSVCRT__IONBF; + file->_base = file->_ptr = (char*)&file->_charbuf; + file->_bufsiz = 2; + }else if(buf) { + file->_base = file->_ptr = buf; + file->_flag |= MSVCRT__USERBUF; + file->_bufsiz = size; + }else { + file->_base = file->_ptr = malloc(size); + if(!file->_base) { + file->_bufsiz = 0; + MSVCRT__unlock_file(file); + return -1; + } + + file->_flag |= MSVCRT__IOMYBUF; + file->_bufsiz = size; + } + MSVCRT__unlock_file(file); + return 0; } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 22ba0d4..3349c9f 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -740,6 +740,7 @@ struct MSVCRT__stat64 { #define MSVCRT__IOERR 0x0020 #define MSVCRT__IOSTRG 0x0040 #define MSVCRT__IORW 0x0080 +#define MSVCRT__USERBUF 0x0100 #define MSVCRT__IOCOMMIT 0x4000 #define MSVCRT__S_IEXEC 0x0040 diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 422e41d..2fd46f2 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -144,6 +144,9 @@ static void test_fileops( void ) fd = open ("fdopen.tst", O_RDONLY | O_BINARY); file = fdopen (fd, "rb"); setvbuf(file,NULL,bufmodes[bufmode],2048); + if(bufmodes[bufmode] == _IOFBF) + ok(file->_bufsiz == 2048, "file->_bufsiz = %d\n", file->_bufsiz); + ok(file->_base != NULL, "file->_base = NULL\n"); ok(strlen(outbuffer) == (sizeof(outbuffer)-1),"strlen/sizeof error for bufmode=%x\n", bufmodes[bufmode]); ok(fgets(buffer,sizeof(buffer),file) !=0,"fgets failed unexpected for bufmode=%x\n", bufmodes[bufmode]); ok(fgets(buffer,sizeof(buffer),file) ==0,"fgets didn't signal EOF for bufmode=%x\n", bufmodes[bufmode]); @@ -629,6 +632,7 @@ static void test_flsbuf( void ) ok(tempfh->_cnt == 0, "_cnt on freshly opened file was %d\n", tempfh->_cnt); setbuf(tempfh, NULL); ok(tempfh->_cnt == 0, "_cnt on unbuffered file was %d\n", tempfh->_cnt); + ok(tempfh->_bufsiz == 2, "_bufsiz = %d\n", tempfh->_bufsiz); /* Inlined putchar sets _cnt to -1. Native seems to ignore the value... */ tempfh->_cnt = 1234; ret = _flsbuf('Q',tempfh);

1 0

Alexandre Julliard : opengl32: Make sure the function table is initialized in all threads.
by Alexandre Julliard June 25, 2014

June 25, 2014

Module: wine Branch: master Commit: b72c8a7680ad2b5bc1963f63fd342f60ab445a41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b72c8a7680ad2b5bc1963f63f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 25 11:51:31 2014 +0200 opengl32: Make sure the function table is initialized in all threads. --- dlls/opengl32/wgl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 9255e34..3a5e148 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -1726,7 +1726,6 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) switch(reason) { case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinst); NtCurrentTeb()->glTable = &null_opengl_funcs; break; case DLL_THREAD_ATTACH:

1 0

Grazvydas Ignotas : msvcrt: Implement bufsiz block flushing behavior.
by Alexandre Julliard June 25, 2014

June 25, 2014

Module: wine Branch: master Commit: ad968be779fff244574eda83d101ab8393513bf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad968be779fff244574eda83d… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Wed Jun 18 13:55:53 2014 +0300 msvcrt: Implement bufsiz block flushing behavior. --- dlls/msvcrt/file.c | 12 ++++++++++++ dlls/msvcrt/tests/file.c | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 5a9edbe..b60e306 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3720,6 +3720,18 @@ MSVCRT_size_t CDECL MSVCRT_fwrite(const void *ptr, MSVCRT_size_t size, MSVCRT_si } written += wrcnt; wrcnt = 0; + } else if(file->_bufsiz && wrcnt >= file->_bufsiz) { + MSVCRT_size_t pcnt=(wrcnt / file->_bufsiz) * file->_bufsiz; + if(msvcrt_flush_buffer(file) == MSVCRT_EOF) + break; + + if(MSVCRT__write(file->_file, ptr, pcnt) <= 0) { + file->_flag |= MSVCRT__IOERR; + break; + } + written += pcnt; + wrcnt -= pcnt; + ptr = (const char*)ptr + pcnt; } else { if(MSVCRT__flsbuf(*(const char*)ptr, file) == MSVCRT_EOF) break; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index eb21697..422e41d 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2243,7 +2243,7 @@ static void test_write_flush_size(FILE *file, int bufsize) fseek(file, 0, SEEK_SET); ok(fread(inbuffer, 1, bufsize, file) == bufsize, "read failed\n"); if (size == bufsize) - todo_wine ok(memcmp(outbuffer, inbuffer, bufsize) == 0, "missing flush by %d byte write\n", size); + ok(memcmp(outbuffer, inbuffer, bufsize) == 0, "missing flush by %d byte write\n", size); else ok(memcmp(outbuffer, inbuffer, bufsize) != 0, "unexpected flush by %d byte write\n", size); }

1 0

Grazvydas Ignotas : msvcrt: Clear _cnt on buffer flush.
by Alexandre Julliard June 25, 2014

June 25, 2014

Module: wine Branch: master Commit: c6a160691afc0c7123d505c9baf0382b56a4fb45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a160691afc0c7123d505c9b… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Wed Jun 18 13:55:52 2014 +0300 msvcrt: Clear _cnt on buffer flush. --- dlls/msvcrt/file.c | 15 ++++++++------- dlls/msvcrt/tests/file.c | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c1d9d6e..5a9edbe 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -595,7 +595,7 @@ static int msvcrt_flush_buffer(MSVCRT_FILE* file) return MSVCRT_EOF; } file->_ptr=file->_base; - file->_cnt=file->_bufsiz; + file->_cnt=0; } return 0; } @@ -3659,14 +3659,15 @@ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) if(file->_bufsiz) { int res = 0; - if(file->_cnt <= 0) + if(file->_cnt <= 0) { res = msvcrt_flush_buffer(file); - if(!res) { - *file->_ptr++ = c; - file->_cnt--; + if(res) + return res; + file->_cnt=file->_bufsiz; } - - return res ? res : c&0xff; + *file->_ptr++ = c; + file->_cnt--; + return c&0xff; } else { unsigned char cc=c; int len; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 97e70f0..eb21697 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2239,7 +2239,7 @@ static void test_write_flush_size(FILE *file, int bufsize) */ lseek(fd, 1, SEEK_SET); fflush(file); - todo_wine ok(file->_cnt == 0, "_cnt should be 0 after fflush, but is %d\n", file->_cnt); + ok(file->_cnt == 0, "_cnt should be 0 after fflush, but is %d\n", file->_cnt); fseek(file, 0, SEEK_SET); ok(fread(inbuffer, 1, bufsize, file) == bufsize, "read failed\n"); if (size == bufsize)

1 0

Matteo Bruni : d3dcompiler/tests: Add a couple more checks for parent data values.
by Alexandre Julliard June 25, 2014

June 25, 2014

Module: wine Branch: master Commit: 342eec7f7de223ebb1d350bab4c6900d7bea3bc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=342eec7f7de223ebb1d350bab… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 24 22:25:30 2014 +0200 d3dcompiler/tests: Add a couple more checks for parent data values. --- dlls/d3dcompiler_43/compiler.c | 5 +++-- dlls/d3dcompiler_43/tests/asm.c | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index d09b5f6..114b4c1 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -145,11 +145,12 @@ static void wpp_warning(const char *file, int line, int col, const char *near, static char *wpp_lookup_mem(const char *filename, int type, const char *parent_name, char **include_path, int include_path_count) { - /* Here we return always ok. We will maybe fail on the next wpp_open_mem */ + /* We don't check for file existence here. We will potentially fail on + * the following wpp_open_mem(). */ char *path; int i; - TRACE("Looking for include %s.\n", debugstr_a(filename)); + TRACE("Looking for include %s, parent %s.\n", debugstr_a(filename), debugstr_a(parent_name)); parent_include = NULL; if (strcmp(parent_name, initial_filename)) diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index 331b864..618a541 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -1446,12 +1446,14 @@ static HRESULT WINAPI testD3DInclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE i buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include)); CopyMemory(buffer, include, sizeof(include)); *bytes = sizeof(include); + ok(!parent_data, "Wrong parent_data value.\n"); } else if (!strcmp(filename, "incl2.vsh")) { buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include2)); CopyMemory(buffer, include2, sizeof(include2)); *bytes = sizeof(include2); + ok(!parent_data, "Wrong parent_data value.\n"); ok(include_type == D3D_INCLUDE_LOCAL, "Wrong include type %d.\n", include_type); } else if (!strcmp(filename, "incl3.vsh"))

1 0

Matteo Bruni : wpp: Free the include filename on error (Valgrind).
by Alexandre Julliard June 25, 2014

June 25, 2014

Module: wine Branch: master Commit: efcaad3911858be0a52a3b0606ef20ff75b8b0a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efcaad3911858be0a52a3b060… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 24 22:25:27 2014 +0200 wpp: Free the include filename on error (Valgrind). --- libs/wpp/ppl.l | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 70bd213..9655e34 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -1586,6 +1586,7 @@ void pp_do_include(char *fname, int type) * If the define was deleted, then this entry would have * been deleted too. */ + free(fname); return; } } @@ -1595,6 +1596,7 @@ void pp_do_include(char *fname, int type) if(n <= 2) { ppy_error("Empty include filename"); + free(fname); return; } @@ -1604,6 +1606,7 @@ void pp_do_include(char *fname, int type) if((fp = pp_open_include(fname+1, type, pp_status.input, &newpath)) == NULL) { ppy_error("Unable to open include file %s", fname+1); + free(fname); return; }

1 0

Bruno Jesus : bcrypt: Add a stub for BCryptCloseAlgorithmProvider.
by Alexandre Julliard June 25, 2014

June 25, 2014

Module: wine Branch: master Commit: c8c609b59dec2482abfe401414f06a80378834c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8c609b59dec2482abfe40141… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jun 24 23:53:42 2014 -0300 bcrypt: Add a stub for BCryptCloseAlgorithmProvider. --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 185f950..3b154f5 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -1,6 +1,6 @@ @ stub BCryptAddContextFunction @ stub BCryptAddContextFunctionProvider -@ stub BCryptCloseAlgorithmProvider +@ stdcall BCryptCloseAlgorithmProvider(ptr long) @ stub BCryptConfigureContext @ stub BCryptConfigureContextFunction @ stub BCryptCreateContext diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index ee203a6..5ccb9f1 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -90,3 +90,10 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider(BCRYPT_ALG_HANDLE *algorithm, LPCWST return STATUS_NOT_IMPLEMENTED; } + +NTSTATUS WINAPI BCryptCloseAlgorithmProvider(BCRYPT_ALG_HANDLE algorithm, DWORD flags) +{ + FIXME("%p, %08x - stub\n", algorithm, flags); + + return STATUS_NOT_IMPLEMENTED; +}

1 0

Huw Davies : fonts: Add some barb arrow glyphs.
by Alexandre Julliard June 25, 2014

June 25, 2014

Module: wine Branch: master Commit: 258942f28f4a5127789b5a443f20bec476c52141 URL: http://source.winehq.org/git/wine.git/?a=commit;h=258942f28f4a5127789b5a443… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 25 16:23:32 2014 +0100 fonts: Add some barb arrow glyphs. --- fonts/wingding.sfd | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++- fonts/wingding.ttf | Bin 6296 -> 6720 bytes 2 files changed, 103 insertions(+), 2 deletions(-) diff --git a/fonts/wingding.sfd b/fonts/wingding.sfd index f30ffec..55723b4 100644 --- a/fonts/wingding.sfd +++ b/fonts/wingding.sfd @@ -50,9 +50,9 @@ NameList: Adobe Glyph List DisplaySize: -48 AntiAlias: 1 FitToEm: 1 -WinInfo: 0 33 12 +WinInfo: 0 29 12 TeXData: 1 0 0 708670 354335 236222 1342177 -2147484 236222 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 256 30 +BeginChars: 256 38 StartChar: f020 Encoding: 0 61472 0 @@ -687,5 +687,106 @@ SplineSet 172 0 l 1,4,-1 EndSplineSet EndChar + +StartChar: barb2left +Encoding: 223 8659 30 +Width: 2006 +VWidth: 0 +LayerCount: 2 +Fore +SplineSet +1830 820 m 25,0,-1 + 550 820 l 25,1,-1 + 1190 1460 l 17,2,-1 + 900 1460 l 1,3,-1 + 170 730 l 1,4,-1 + 900 0 l 1,5,-1 + 1190 0 l 9,6,-1 + 550 640 l 25,7,-1 + 1830 640 l 25,8,-1 + 1830 820 l 25,0,-1 +EndSplineSet +EndChar + +StartChar: barb2right +Encoding: 224 8900 31 +Width: 2006 +VWidth: 0 +Flags: W +LayerCount: 2 +Fore +Refer: 30 8659 N -1 0 0 1 2006 0 2 +EndChar + +StartChar: barb2up +Encoding: 225 9001 32 +Width: 1825 +VWidth: 0 +Flags: W +LayerCount: 2 +Fore +Refer: 30 8659 N 0 -1 1 0 173 1653 2 +EndChar + +StartChar: barb2down +Encoding: 226 63720 33 +Width: 1825 +VWidth: 0 +Flags: W +LayerCount: 2 +Fore +Refer: 30 8659 N 0 1 -1 0 1653 -173 2 +EndChar + +StartChar: barb4left +Encoding: 231 63724 34 +Width: 2186 +VWidth: 0 +Flags: W +LayerCount: 2 +Fore +SplineSet +2010 940 m 25,0,-1 + 925 940 l 25,1,-1 + 1465 1480 l 17,2,-1 + 915 1480 l 1,3,-1 + 165 730 l 1,4,-1 + 915 0 l 1,5,-1 + 1465 0 l 9,6,-1 + 925 520 l 25,7,-1 + 2010 520 l 25,8,-1 + 2010 940 l 25,0,-1 +EndSplineSet +EndChar + +StartChar: barb4right +Encoding: 232 63725 35 +Width: 2186 +VWidth: 0 +Flags: W +LayerCount: 2 +Fore +Refer: 34 63724 N -1 0 0 1 2186 0 2 +EndChar + +StartChar: barb4up +Encoding: 233 63726 36 +Width: 1825 +VWidth: 0 +Flags: W +LayerCount: 2 +Fore +Refer: 34 63724 N 0 -1 1 0 173 1653 2 +EndChar + +StartChar: barb4down +Encoding: 234 63727 37 +Width: 1825 +VWidth: 0 +Flags: W +LayerCount: 2 +Fore +Refer: 34 63724 N 0 1 -1 0 1653 -173 2 +EndChar EndChars EndSplineFont diff --git a/fonts/wingding.ttf b/fonts/wingding.ttf index f867b97..b1e9d58 100644 Binary files a/fonts/wingding.ttf and b/fonts/wingding.ttf differ

1 0

Piotr Caban : kernel32: Fix typo in enum_locale_ex_proc.
by Alexandre Julliard June 25, 2014

June 25, 2014

Module: wine Branch: master Commit: 4eaa85ad560b0f9a921f2e78aa6285c2dcfff92d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eaa85ad560b0f9a921f2e78a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 25 14:40:55 2014 +0200 kernel32: Fix typo in enum_locale_ex_proc. --- dlls/kernel32/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index eca0e39..26c00f5 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2392,7 +2392,7 @@ static BOOL CALLBACK enum_locale_ex_proc( HMODULE module, LPCWSTR type, neutral = 0; flags = LOCALE_WINDOWS; flags |= neutral ? LOCALE_NEUTRALDATA : LOCALE_SPECIFICDATA; - if (data->flags && ~(data->flags & flags)) return TRUE; + if (data->flags && !(data->flags & flags)) return TRUE; return data->proc( buffer, flags, data->lparam ); }

1 0

Matteo Bruni : wpp: Properly free defines (Valgrind).
by Alexandre Julliard June 25, 2014

June 25, 2014

Module: wine Branch: master Commit: f91fa3722167f4ebefaa5fa9f856bd9a15ce7eb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f91fa3722167f4ebefaa5fa9f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 24 22:25:26 2014 +0200 wpp: Properly free defines (Valgrind). --- libs/wpp/preproc.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libs/wpp/preproc.c b/libs/wpp/preproc.c index 33f69c8..21830d6 100644 --- a/libs/wpp/preproc.c +++ b/libs/wpp/preproc.c @@ -292,7 +292,7 @@ void pp_pop_define_state(void) for (i = 0; i < HASHKEY; i++) { - while ((ppp = pp_def_state->defines[i]) != NULL) free_pp_entry( ppp, i ); + while ((ppp = pp_def_state->defines[i]) != NULL) pp_del_define( ppp->ident ); } state = pp_def_state; pp_def_state = state->next; @@ -302,6 +302,7 @@ void pp_pop_define_state(void) void pp_del_define(const char *name) { pp_entry_t *ppp; + int idx = pphash(name); if((ppp = pplookup(name)) == NULL) { @@ -310,13 +311,13 @@ void pp_del_define(const char *name) return; } + if(pp_status.debug) + printf("Deleting (%s, %d) <%s>\n", pp_status.input, pp_status.line_number, name); + free( ppp->ident ); free( ppp->subst.text ); free( ppp->filename ); - free_pp_entry( ppp, pphash(name) ); - - if(pp_status.debug) - printf("Deleted (%s, %d) <%s>\n", pp_status.input, pp_status.line_number, name); + free_pp_entry( ppp, idx ); } pp_entry_t *pp_add_define(const char *def, const char *text)

1 0

Jacek Caban : wininet: Don' t try to read content in response to HEAD request.
by Alexandre Julliard June 25, 2014

June 25, 2014

Module: wine Branch: master Commit: 4e53f0caa08b24bf7747c37f8c09d3e0bf40bd10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e53f0caa08b24bf7747c37f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 25 14:41:47 2014 +0200 wininet: Don't try to read content in response to HEAD request. --- dlls/wininet/http.c | 3 ++- dlls/wininet/tests/http.c | 56 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 56 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 6c60c3a..b5e6a73 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2881,10 +2881,11 @@ static const data_stream_vtbl_t chunked_stream_vtbl = { static DWORD set_content_length(http_request_t *request) { static const WCHAR szChunked[] = {'c','h','u','n','k','e','d',0}; + static const WCHAR headW[] = {'H','E','A','D',0}; WCHAR encoding[20]; DWORD size; - if(request->status_code == HTTP_STATUS_NO_CONTENT) { + if(request->status_code == HTTP_STATUS_NO_CONTENT || !strcmpW(request->verb, headW)) { request->contentLength = request->netconn_stream.content_length = 0; return ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 6e30ad4..4e8ea5b 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1979,7 +1979,7 @@ static const char *send_buffer; static DWORD CALLBACK server_thread(LPVOID param) { struct server_info *si = param; - int r, c, i, on, count = 0; + int r, c = -1, i, on, count = 0; SOCKET s; struct sockaddr_in sa; char buffer[0x100]; @@ -2015,7 +2015,8 @@ static DWORD CALLBACK server_thread(LPVOID param) do { - c = accept(s, NULL, NULL); + if(c == -1) + c = accept(s, NULL, NULL); memset(buffer, 0, sizeof buffer); for(i=0; i<(sizeof buffer-1); i++) @@ -2221,6 +2222,16 @@ static DWORD CALLBACK server_thread(LPVOID param) else send(c, notokmsg, sizeof(notokmsg)-1, 0); } + if (strstr(buffer, "HEAD /test_head")) { + static const char head_response[] = + "HTTP/1.1 200 OK\r\n" + "Connection: Keep-Alive\r\n" + "Content-Length: 100\r\n" + "\r\n"; + + send(c, head_response, sizeof(head_response), 0); + continue; + } if (strstr(buffer, "GET /send_from_buffer")) send(c, send_buffer, strlen(send_buffer), 0); if (strstr(buffer, "/test_cache_control_verb")) @@ -2235,6 +2246,7 @@ static DWORD CALLBACK server_thread(LPVOID param) shutdown(c, 2); closesocket(c); + c = -1; } while (!last_request); closesocket(s); @@ -3635,6 +3647,45 @@ static void test_response_without_headers(int port) InternetCloseHandle(hi); } +static void test_head_request(int port) +{ + DWORD len, content_length; + HINTERNET ses, con, req; + BYTE buf[100]; + BOOL ret; + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, "HEAD", "/test_head", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + + len = sizeof(content_length); + content_length = -1; + ret = HttpQueryInfoA(req, HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH, &content_length, &len, 0); + ok(ret, "HttpQueryInfo dailed: %u\n", GetLastError()); + ok(len == sizeof(DWORD), "len = %u\n", len); + ok(content_length == 100, "content_length = %u\n", content_length); + + len = -1; + ret = InternetReadFile(req, buf, sizeof(buf), &len); + ok(ret, "InternetReadFile failed: %u\n", GetLastError()); + + len = -1; + ret = InternetReadFile(req, buf, sizeof(buf), &len); + ok(ret, "InternetReadFile failed: %u\n", GetLastError()); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_HttpQueryInfo(int port) { HINTERNET hi, hc, hr; @@ -4048,6 +4099,7 @@ static void test_http_connection(void) test_connection_closing(si.port); test_cache_control_verb(si.port); test_successive_HttpSendRequest(si.port); + test_head_request(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Zhenbo Li : shell32: Fix SHFileOperation when deleting a nonexistent directory.
by Alexandre Julliard June 25, 2014

June 25, 2014

Module: wine Branch: master Commit: 2ba9ee018bce4953feb728595f4a4a6e47b186a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ba9ee018bce4953feb728595… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sat Jun 21 22:34:58 2014 +0800 shell32: Fix SHFileOperation when deleting a nonexistent directory. --- dlls/shell32/shlfileop.c | 68 +++++++++++++++++++++--------------------- dlls/shell32/tests/shlfileop.c | 4 --- 2 files changed, 34 insertions(+), 38 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index e6d44b0..62d7880 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -347,36 +347,36 @@ HRESULT WINAPI SHIsFileAvailableOffline(LPCWSTR path, LPDWORD status) * Asks for confirmation when bShowUI is true and deletes the directory and * all its subdirectories and files if necessary. */ -static BOOL SHELL_DeleteDirectoryW(HWND hwnd, LPCWSTR pszDir, BOOL bShowUI) +static DWORD SHELL_DeleteDirectoryW(HWND hwnd, LPCWSTR pszDir, BOOL bShowUI) { - BOOL ret = TRUE; - HANDLE hFind; - WIN32_FIND_DATAW wfd; - WCHAR szTemp[MAX_PATH]; - - /* Make sure the directory exists before eventually prompting the user */ - PathCombineW(szTemp, pszDir, wWildcardFile); - hFind = FindFirstFileW(szTemp, &wfd); - if (hFind == INVALID_HANDLE_VALUE) - return FALSE; + DWORD ret = 0; + HANDLE hFind; + WIN32_FIND_DATAW wfd; + WCHAR szTemp[MAX_PATH]; + + PathCombineW(szTemp, pszDir, wWildcardFile); + hFind = FindFirstFileW(szTemp, &wfd); + + if (hFind != INVALID_HANDLE_VALUE) { + if (!bShowUI || SHELL_ConfirmDialogW(hwnd, ASK_DELETE_FOLDER, pszDir, NULL)) { + do { + if (IsDotDir(wfd.cFileName)) + continue; + PathCombineW(szTemp, pszDir, wfd.cFileName); + if (FILE_ATTRIBUTE_DIRECTORY & wfd.dwFileAttributes) + ret = SHELL_DeleteDirectoryW(hwnd, szTemp, FALSE); + else + ret = SHNotifyDeleteFileW(szTemp); + } while (!ret && FindNextFileW(hFind, &wfd)); + } + FindClose(hFind); + } + if (ret == ERROR_SUCCESS) + ret = SHNotifyRemoveDirectoryW(pszDir); - if (!bShowUI || (ret = SHELL_ConfirmDialogW(hwnd, ASK_DELETE_FOLDER, pszDir, NULL))) - { - do - { - if (IsDotDir(wfd.cFileName)) - continue; - PathCombineW(szTemp, pszDir, wfd.cFileName); - if (FILE_ATTRIBUTE_DIRECTORY & wfd.dwFileAttributes) - ret = SHELL_DeleteDirectoryW(hwnd, szTemp, FALSE); - else - ret = (SHNotifyDeleteFileW(szTemp) == ERROR_SUCCESS); - } while (ret && FindNextFileW(hFind, &wfd)); - } - FindClose(hFind); - if (ret) - ret = (SHNotifyRemoveDirectoryW(pszDir) == ERROR_SUCCESS); - return ret; + return ret == ERROR_PATH_NOT_FOUND ? + 0x7C: /* DE_INVALIDFILES (legacy Windows error) */ + ret; } /************************************************************************** @@ -1331,8 +1331,7 @@ static BOOL confirm_delete_list(HWND hWnd, DWORD fFlags, BOOL fTrash, const FILE static DWORD delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) { const FILE_ENTRY *fileEntry; - DWORD i; - BOOL bPathExists; + DWORD i, ret; BOOL bTrash; if (!flFrom->dwNumFiles) @@ -1378,12 +1377,13 @@ static DWORD delete_files(LPSHFILEOPSTRUCTW lpFileOp, const FILE_LIST *flFrom) /* delete the file or directory */ if (IsAttribFile(fileEntry->attributes)) - bPathExists = DeleteFileW(fileEntry->szFullPath); + ret = DeleteFileW(fileEntry->szFullPath) ? + ERROR_SUCCESS : GetLastError(); else - bPathExists = SHELL_DeleteDirectoryW(lpFileOp->hwnd, fileEntry->szFullPath, FALSE); + ret = SHELL_DeleteDirectoryW(lpFileOp->hwnd, fileEntry->szFullPath, FALSE); - if (!bPathExists) - return ERROR_PATH_NOT_FOUND; + if (ret) + return ret; } return ERROR_SUCCESS; diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index eba5450..3468fcc 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -622,7 +622,6 @@ static void test_delete(void) shfo.pFrom = "nonexistent.txt\0"; shfo.wFunc = FO_DELETE; ret = SHFileOperationA(&shfo); - todo_wine ok(ret == 1026 || ret == ERROR_FILE_NOT_FOUND || /* Vista */ broken(ret == ERROR_SUCCESS), /* NT4 */ @@ -651,7 +650,6 @@ static void test_delete(void) shfo.pFrom = "test1.txt\0nonexistent.txt\0test2.txt\0"; shfo.wFunc = FO_DELETE; ret = SHFileOperationA(&shfo); - todo_wine ok(ret == 1026 || ret == ERROR_FILE_NOT_FOUND || /* Vista */ broken(ret == ERROR_SUCCESS), /* NT4 */ @@ -664,14 +662,12 @@ static void test_delete(void) init_shfo_tests(); shfo.pFrom = "testdir2\\nonexistent.txt\0"; ret = SHFileOperationA(&shfo); - todo_wine ok(ret == ERROR_FILE_NOT_FOUND || /* Vista */ broken(ret == 0x402) || /* XP */ broken(ret == ERROR_SUCCESS), /* NT4 */ "Expected 0x402 or ERROR_FILE_NOT_FOUND, got %x\n", ret); shfo.pFrom = "nonexistent\\one.txt\0"; ret = SHFileOperationA(&shfo); - todo_wine ok(ret == DE_INVALIDFILES || /* Vista or later */ broken(ret == 0x402), /* XP */ "Expected 0x402 or DE_INVALIDFILES, got %x\n", ret);

1 0

Bruno Jesus : opengl32/tests: Test glGetString() without an active GL context.
by Alexandre Julliard June 25, 2014

June 25, 2014

Module: wine Branch: master Commit: d0803ef1d0cba0e2f412622a6b2d53fe965f4888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0803ef1d0cba0e2f412622a6… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jun 24 21:39:07 2014 -0300 opengl32/tests: Test glGetString() without an active GL context. --- dlls/opengl32/tests/opengl.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 7384cb4..e5e1507 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -715,6 +715,9 @@ static DWORD WINAPI wgl_thread(void *param) struct wgl_thread_param *p = param; HDC hdc = GetDC( p->hwnd ); + ok(!glGetString(GL_RENDERER) && !glGetString(GL_VERSION) && !glGetString(GL_VENDOR), + "Expected NULL string when no active context is set\n"); + SetLastError(0xdeadbeef); p->make_current = wglMakeCurrent(hdc, p->hglrc); p->make_current_error = GetLastError(); @@ -1668,6 +1671,8 @@ START_TEST(opengl) test_message_window(); test_dc(hwnd, hdc); + ok(!glGetString(GL_RENDERER) && !glGetString(GL_VERSION) && !glGetString(GL_VENDOR), + "Expected NULL string when no active context is set\n"); hglrc = wglCreateContext(hdc); res = wglMakeCurrent(hdc, hglrc); ok(res, "wglMakeCurrent failed!\n");

1 0

Shuai Meng : vbscript: Implemented TypeName.
by Alexandre Julliard June 25, 2014

June 25, 2014

Module: wine Branch: master Commit: 61d49a8a97ba5b18eff931ddfbf412ded583fb19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61d49a8a97ba5b18eff931ddf… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Wed Jun 25 10:16:07 2014 +0800 vbscript: Implemented TypeName. --- dlls/vbscript/global.c | 48 +++++++++++++++++++++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 12 ++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 5160374..5a12729 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1502,8 +1502,52 @@ static HRESULT Global_DatePart(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, static HRESULT Global_TypeName(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR ByteW[] = {'B', 'y', 't', 'e', 0}; + static const WCHAR IntegerW[] = {'I', 'n', 't', 'e', 'g', 'e', 'r', 0}; + static const WCHAR LongW[] = {'L', 'o', 'n', 'g', 0}; + static const WCHAR SingleW[] = {'S', 'i', 'n', 'g', 'l', 'e', 0}; + static const WCHAR DoubleW[] = {'D', 'o', 'u', 'b', 'l', 'e', 0}; + static const WCHAR CurrencyW[] = {'C', 'u', 'r', 'r', 'e', 'n', 'c', 'y', 0}; + static const WCHAR DecimalW[] = {'D', 'e', 'c', 'i', 'm', 'a', 'l', 0}; + static const WCHAR DateW[] = {'D', 'a', 't', 'e', 0}; + static const WCHAR StringW[] = {'S', 't', 'r', 'i', 'n', 'g', 0}; + static const WCHAR BooleanW[] = {'B', 'o', 'o', 'l', 'e', 'a', 'n', 0}; + static const WCHAR EmptyW[] = {'E', 'm', 'p', 't', 'y', 0}; + static const WCHAR NullW[] = {'N', 'u', 'l', 'l', 0}; + + TRACE("(%s)\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + switch(V_VT(arg)) { + case VT_UI1: + return return_string(res, ByteW); + case VT_I2: + return return_string(res, IntegerW); + case VT_I4: + return return_string(res, LongW); + case VT_R4: + return return_string(res, SingleW); + case VT_R8: + return return_string(res, DoubleW); + case VT_CY: + return return_string(res, CurrencyW); + case VT_DECIMAL: + return return_string(res, DecimalW); + case VT_DATE: + return return_string(res, DateW); + case VT_BSTR: + return return_string(res, StringW); + case VT_BOOL: + return return_string(res, BooleanW); + case VT_EMPTY: + return return_string(res, EmptyW); + case VT_NULL: + return return_string(res, NullW); + default: + FIXME("arg %s not supported\n", debugstr_variant(arg)); + return E_NOTIMPL; + } } static HRESULT Global_Array(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 2cf9bb7..ded9b8b 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -845,4 +845,16 @@ MyObject.myval = 0 Call ok(CSng(MyObject) = 0, "CSng(MyObject) = " & CSng(MyObject)) Call ok(getVT(CSng(MyObject)) = "VT_R4", "getVT(CSng(MyObject)) = " & getVT(CSng(MyObject))) +Dim MyEmpty +Call ok(TypeName(CByte(255)) = "Byte", "TypeName(CByte(255)) = " & TypeName(CByte(255))) +Call ok(TypeName(255) = "Integer", "TypeName(255) = " & TypeName(255)) +Call ok(TypeName(32768) = "Long", "TypeName(32768) = " & TypeName(32768)) +Call ok(TypeName(CSng(0.5)) = "Single", "TypeName(CSng(0.5)) = " & TypeName(CSng(0.5))) +Call ok(TypeName(-0.5) = "Double", "TypeName(-0.5) = " & TypeName(-0.5)) +Call ok(TypeName(CCur(0.5)) = "Currency", "TypeName(CCur(0.5)) = " & TypeName(CCur(0.5))) +Call ok(TypeName(CStr(0.5)) = "String", "TypeName(CStr(0.5)) = " & TypeName(CStr(0.5))) +Call ok(TypeName(True) = "Boolean", "TypeName(True) = " & TypeName(True)) +Call ok(TypeName(MyEmpty) = "Empty", "TypeName(MyEmpty) = " & TypeName(Empty)) +Call ok(TypeName(Null) = "Null", "TypeName(Null) = " & TypeName(Null)) + Call reportSuccess()

1 0

Bruno Jesus : wininet/tests: Add more HTTP_QUERY_RAW_HEADERS tests.
by Alexandre Julliard June 25, 2014

June 25, 2014

Module: wine Branch: master Commit: f3b0f488b8233ea6b8fd7b768d93141d641ff6a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3b0f488b8233ea6b8fd7b768… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jun 24 22:34:17 2014 -0300 wininet/tests: Add more HTTP_QUERY_RAW_HEADERS tests. --- dlls/wininet/tests/http.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index f3340df..6e30ad4 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -465,7 +465,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) char *post_data = NULL; BOOL res, on_async = TRUE; CHAR buffer[4000]; - DWORD length, index, exlen = 0, post_len = 0; + DWORD length, length2, index, exlen = 0, post_len = 0; const char *types[2] = { "*", NULL }; HINTERNET hi, hic = 0, hor = 0; @@ -626,9 +626,28 @@ static void InternetReadFile_test(int flags, const test_data_t *test) ok(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed with error %d\n", GetLastError()); length = sizeof(buffer)-1; + memset(buffer, 0x77, sizeof(buffer)); res = HttpQueryInfoA(hor,HTTP_QUERY_RAW_HEADERS,buffer,&length,0x0); ok(res, "HttpQueryInfoA(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); - buffer[length]=0; + /* show that the function writes data past the length returned */ + ok(buffer[length-2], "Expected any header character, got 0x00\n"); + ok(!buffer[length-1], "Expected 0x00, got %02X\n", buffer[length-1]); + ok(!buffer[length], "Expected 0x00, got %02X\n", buffer[length]); + ok(buffer[length+1] == 0x77, "Expected 0x77, got %02X\n", buffer[length+1]); + + length2 = length; + res = HttpQueryInfoA(hor,HTTP_QUERY_RAW_HEADERS,buffer,&length2,0x0); + ok(!res, "Expected 0x00, got %d\n", res); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected last error: %d\n", GetLastError()); + ok(length2 == length+1, "Expected %d, got %d\n", length+1, length2); + /* the in length of the buffer must be +1 but the length returned does not count this */ + length2 = length+1; + memset(buffer, 0x77, sizeof(buffer)); + res = HttpQueryInfoA(hor,HTTP_QUERY_RAW_HEADERS,buffer,&length2,0x0); + ok(res, "HttpQueryInfoA(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); + ok(buffer[length2] == 0x00, "Expected 0x00, got %02X\n", buffer[length2]); + ok(buffer[length2+1] == 0x77, "Expected 0x77, got %02X\n", buffer[length2+1]); + ok(length2 == length, "Value should not have changed: %d != %d\n", length2, length); length = sizeof(buffer); res = InternetQueryOptionA(hor, INTERNET_OPTION_URL, buffer, &length);

1 0

Akihiro Sagawa : jscript: Improve CollectGarbage stub.
by Alexandre Julliard June 24, 2014

June 24, 2014

Module: wine Branch: master Commit: e29fd5429234a3e03a58ec146ccfe0b9290a0213 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e29fd5429234a3e03a58ec146… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jun 19 23:16:39 2014 +0900 jscript: Improve CollectGarbage stub. --- dlls/jscript/global.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 64546bd..4d1350f 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -753,8 +753,10 @@ static HRESULT JSGlobal_ScriptEngineBuildVersion(script_ctx_t *ctx, vdisp_t *jst static HRESULT JSGlobal_CollectGarbage(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("\n"); - return E_NOTIMPL; + static int once = 0; + if (!once++) + FIXME(": stub\n"); + return S_OK; } static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,

1 0

Piotr Caban : msvcp110: Add missing exports to msvcp110.spec file.
by Alexandre Julliard June 24, 2014

June 24, 2014

Module: wine Branch: master Commit: 1211ffd76e375b17cb2b5f3ed67a33b12579a3c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1211ffd76e375b17cb2b5f3ed… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 24 14:59:06 2014 +0200 msvcp110: Add missing exports to msvcp110.spec file. --- dlls/msvcp110/msvcp110.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 40f5577..331df11 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -2372,7 +2372,7 @@ @ cdecl -arch=win64 ?epptr@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@IEBAPEAGXZ(ptr) basic_streambuf_wchar_epptr @ cdecl -arch=arm ?epptr@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IBAPA_WXZ(ptr) basic_streambuf_wchar_epptr @ thiscall -arch=i386 ?epptr@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IBEPA_WXZ(ptr) basic_streambuf_wchar_epptr -@ cdecl -arch=win64 ?epptr@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IcoutEBAPEA_WXZ(ptr) basic_streambuf_wchar_epptr +@ cdecl -arch=win64 ?epptr@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IEBAPEA_WXZ(ptr) basic_streambuf_wchar_epptr @ cdecl -arch=arm ?exceptions(a)ios_base@std@@QAAXH(a)Z(ptr long) ios_base_exceptions_set @ thiscall -arch=i386 ?exceptions(a)ios_base@std@@QAEXH(a)Z(ptr long) ios_base_exceptions_set @ cdecl -arch=win64 ?exceptions(a)ios_base@std@@QEAAXH(a)Z(ptr long) ios_base_exceptions_set @@ -3822,9 +3822,11 @@ @ stub _Mtx_destroy @ stub _Mtx_getconcrtcs @ stub _Mtx_init +@ stub _Mtx_lock @ stub _Mtx_reset_owner @ stub _Mtx_timedlock @ stub _Mtx_trylock +@ stub _Mtx_unlock @ stub _Mtxdst @ stub _Mtxinit @ stub _Mtxlock

1 0

Piotr Caban : msvcr110: Add critical_section::try_lock_for implementation.
by Alexandre Julliard June 24, 2014

June 24, 2014

Module: wine Branch: master Commit: 5175037b635d638e16396bee7890e4512031f866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5175037b635d638e16396bee7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 24 11:57:53 2014 +0200 msvcr110: Add critical_section::try_lock_for implementation. --- dlls/msvcr110/msvcr110.spec | 6 ++-- dlls/msvcrt/lock.c | 72 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 72 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 57d7950..4127725 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -794,9 +794,9 @@ @ stub -arch=arm ?try_lock(a)reader_writer_lock@Concurrency@@QAA_NXZ @ stub -arch=i386 ?try_lock(a)reader_writer_lock@Concurrency@@QAE_NXZ @ stub -arch=win64 ?try_lock(a)reader_writer_lock@Concurrency@@QEAA_NXZ -@ stub -arch=arm ?try_lock_for(a)critical_section@Concurrency@@QAA_NI(a)Z -@ stub -arch=i386 ?try_lock_for(a)critical_section@Concurrency@@QAE_NI(a)Z -@ stub -arch=win64 ?try_lock_for(a)critical_section@Concurrency@@QEAA_NI(a)Z +@ cdecl -arch=arm ?try_lock_for(a)critical_section@Concurrency@@QAA_NI(a)Z(ptr long) critical_section_try_lock_for +@ thiscall -arch=i386 ?try_lock_for(a)critical_section@Concurrency@@QAE_NI(a)Z(ptr long) critical_section_try_lock_for +@ cdecl -arch=win64 ?try_lock_for(a)critical_section@Concurrency@@QEAA_NI(a)Z(ptr long) critical_section_try_lock_for @ stub -arch=arm ?try_lock_read(a)reader_writer_lock@Concurrency@@QAA_NXZ @ stub -arch=i386 ?try_lock_read(a)reader_writer_lock@Concurrency@@QAE_NXZ @ stub -arch=win64 ?try_lock_read(a)reader_writer_lock@Concurrency@@QEAA_NXZ diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 94599d1..aee8d2b 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -290,6 +290,10 @@ static HANDLE keyed_event; typedef struct cs_queue { struct cs_queue *next; +#if _MSVCR_VER >= 110 + BOOL free; + int unknown; +#endif } cs_queue; typedef struct @@ -298,7 +302,6 @@ typedef struct cs_queue unk_active; #if _MSVCR_VER >= 110 void *unknown[2]; - int unknown2[2]; #else void *unknown[1]; #endif @@ -373,7 +376,7 @@ void __thiscall critical_section_lock(critical_section *this) return; } - q.next = NULL; + memset(&q, 0, sizeof(q)); last = InterlockedExchangePointer(&this->tail, &q); if(last) { last->next = &q; @@ -400,7 +403,7 @@ MSVCRT_bool __thiscall critical_section_try_lock(critical_section *this) return FALSE; } - q.next = NULL; + memset(&q, 0, sizeof(q)); if(!InterlockedCompareExchangePointer(&this->tail, &q, NULL)) { this->unk_active.next = NULL; if(InterlockedCompareExchangePointer(&this->tail, &this->unk_active, &q) != &q) @@ -425,6 +428,23 @@ void __thiscall critical_section_unlock(critical_section *this) == &this->unk_active) return; spin_wait_for_next_cs(&this->unk_active); +#if _MSVCR_VER >= 110 + while(1) { + cs_queue *next; + + if(!InterlockedExchange(&this->unk_active.next->free, TRUE)) + break; + + next = this->unk_active.next; + if(InterlockedCompareExchangePointer(&this->tail, NULL, next) == next) + return; + spin_wait_for_next_cs(next); + + this->unk_active.next = next->next; + HeapFree(GetProcessHeap(), 0, next); + } +#endif + NtReleaseKeyedEvent(keyed_event, this->unk_active.next, 0, NULL); } @@ -437,6 +457,52 @@ critical_section* __thiscall critical_section_native_handle(critical_section *th return this; } +#if _MSVCR_VER >= 110 +/* ?try_lock_for(a)critical_section@Concurrency@@QAE_NI(a)Z */ +/* ?try_lock_for(a)critical_section@Concurrency@@QEAA_NI(a)Z */ +DEFINE_THISCALL_WRAPPER(critical_section_try_lock_for, 8) +MSVCRT_bool __thiscall critical_section_try_lock_for( + critical_section *this, unsigned int timeout) +{ + cs_queue *q, *last; + + TRACE("(%p %d)\n", this, timeout); + + if(this->unk_thread_id == GetCurrentThreadId()) { + FIXME("throw exception\n"); + return FALSE; + } + + if(!(q = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*q)))) + return critical_section_try_lock(this); + + last = InterlockedExchangePointer(&this->tail, q); + if(last) { + LARGE_INTEGER to; + NTSTATUS status; + FILETIME ft; + + last->next = q; + GetSystemTimeAsFileTime(&ft); + to.QuadPart = ((LONGLONG)ft.dwHighDateTime<<32) + + ft.dwLowDateTime + (LONGLONG)timeout*10000; + status = NtWaitForKeyedEvent(keyed_event, q, 0, &to); + if(status == STATUS_TIMEOUT) { + if(!InterlockedExchange(&q->free, TRUE)) + return FALSE; + } + } + + this->unk_active.next = NULL; + if(InterlockedCompareExchangePointer(&this->tail, &this->unk_active, q) != q) + spin_wait_for_next_cs(q); + + cs_set_head(this, q); + HeapFree(GetProcessHeap(), 0, q); + return TRUE; +} +#endif + typedef struct { critical_section *cs;

1 0

Piotr Caban : msvcr100: Add critical_section class implementation.
by Alexandre Julliard June 24, 2014

June 24, 2014

Module: wine Branch: master Commit: 7f23c57d09746ee8d14893f982052b08a2c675ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f23c57d09746ee8d14893f98… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 24 11:57:47 2014 +0200 msvcr100: Add critical_section class implementation. --- dlls/msvcrt/lock.c | 160 +++++++++++++++++++++++++++++++++++++++++---------- dlls/msvcrt/main.c | 4 +- dlls/msvcrt/msvcrt.h | 2 +- 3 files changed, 132 insertions(+), 34 deletions(-) diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 09ff1af..94599d1 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -83,30 +83,6 @@ void msvcrt_init_mt_locks(void) } /********************************************************************** - * msvcrt_free_mt_locks (internal) - * - * Uninitialize all mt locks. Assume that neither _lock or _unlock will - * be called once we're calling this routine (ie _LOCKTAB_LOCK can be deleted) - * - */ -void msvcrt_free_mt_locks(void) -{ - int i; - - TRACE( ": uninitializing all mtlocks\n" ); - - /* Uninitialize the table */ - for( i=0; i < _TOTAL_LOCKS; i++ ) - { - if( lock_table[ i ].bInit ) - { - msvcrt_uninitialize_mlock( i ); - } - } -} - - -/********************************************************************** * _lock (MSVCRT.@) */ void CDECL _lock( int locknum ) @@ -309,10 +285,24 @@ MSVCRT_bool __thiscall SpinWait__SpinOnce(SpinWait *this) } } +static HANDLE keyed_event; + +typedef struct cs_queue +{ + struct cs_queue *next; +} cs_queue; + typedef struct { - void *unknown[3]; - void *head; + ULONG_PTR unk_thread_id; + cs_queue unk_active; +#if _MSVCR_VER >= 110 + void *unknown[2]; + int unknown2[2]; +#else + void *unknown[1]; +#endif + cs_queue *head; void *tail; } critical_section; @@ -321,7 +311,18 @@ typedef struct DEFINE_THISCALL_WRAPPER(critical_section_ctor, 4) critical_section* __thiscall critical_section_ctor(critical_section *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + + if(!keyed_event) { + HANDLE event; + + NtCreateKeyedEvent(&event, GENERIC_READ|GENERIC_WRITE, NULL, 0); + if(InterlockedCompareExchangePointer(&keyed_event, event, NULL) != NULL) + NtClose(event); + } + + this->unk_thread_id = 0; + this->head = this->tail = NULL; return this; } @@ -330,7 +331,32 @@ critical_section* __thiscall critical_section_ctor(critical_section *this) DEFINE_THISCALL_WRAPPER(critical_section_dtor, 4) void __thiscall critical_section_dtor(critical_section *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); +} + +static void __cdecl spin_wait_yield(void) +{ + Sleep(0); +} + +static inline void spin_wait_for_next_cs(cs_queue *q) +{ + SpinWait sw; + + if(q->next) return; + + SpinWait_ctor(&sw, &spin_wait_yield); + SpinWait__Reset(&sw); + while(!q->next) + SpinWait__SpinOnce(&sw); + SpinWait_dtor(&sw); +} + +static inline void cs_set_head(critical_section *cs, cs_queue *q) +{ + cs->unk_thread_id = GetCurrentThreadId(); + cs->unk_active.next = q->next; + cs->head = &cs->unk_active; } /* ?lock(a)critical_section@Concurrency@@QAEXXZ */ @@ -338,7 +364,26 @@ void __thiscall critical_section_dtor(critical_section *this) DEFINE_THISCALL_WRAPPER(critical_section_lock, 4) void __thiscall critical_section_lock(critical_section *this) { - FIXME("(%p) stub\n", this); + cs_queue q, *last; + + TRACE("(%p)\n", this); + + if(this->unk_thread_id == GetCurrentThreadId()) { + FIXME("throw exception\n"); + return; + } + + q.next = NULL; + last = InterlockedExchangePointer(&this->tail, &q); + if(last) { + last->next = &q; + NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); + } + + this->unk_active.next = NULL; + if(InterlockedCompareExchangePointer(&this->tail, &this->unk_active, &q) != &q) + spin_wait_for_next_cs(&q); + cs_set_head(this, &q); } /* ?try_lock(a)critical_section@Concurrency@@QAE_NXZ */ @@ -346,7 +391,24 @@ void __thiscall critical_section_lock(critical_section *this) DEFINE_THISCALL_WRAPPER(critical_section_try_lock, 4) MSVCRT_bool __thiscall critical_section_try_lock(critical_section *this) { - FIXME("(%p) stub\n", this); + cs_queue q; + + TRACE("(%p)\n", this); + + if(this->unk_thread_id == GetCurrentThreadId()) { + FIXME("throw exception\n"); + return FALSE; + } + + q.next = NULL; + if(!InterlockedCompareExchangePointer(&this->tail, &q, NULL)) { + this->unk_active.next = NULL; + if(InterlockedCompareExchangePointer(&this->tail, &this->unk_active, &q) != &q) + spin_wait_for_next_cs(&q); + + cs_set_head(this, &q); + return TRUE; + } return FALSE; } @@ -355,7 +417,15 @@ MSVCRT_bool __thiscall critical_section_try_lock(critical_section *this) DEFINE_THISCALL_WRAPPER(critical_section_unlock, 4) void __thiscall critical_section_unlock(critical_section *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + + this->unk_thread_id = 0; + this->head = NULL; + if(InterlockedCompareExchangePointer(&this->tail, NULL, &this->unk_active) + == &this->unk_active) return; + spin_wait_for_next_cs(&this->unk_active); + + NtReleaseKeyedEvent(keyed_event, this->unk_active.next, 0, NULL); } /* ?native_handle(a)critical_section@Concurrency@@QAEAAV12(a)XZ */ @@ -394,3 +464,31 @@ void __thiscall critical_section_scoped_lock_dtor(critical_section_scoped_lock * critical_section_unlock(this->cs); } #endif + +/********************************************************************** + * msvcrt_free_locks (internal) + * + * Uninitialize all mt locks. Assume that neither _lock or _unlock will + * be called once we're calling this routine (ie _LOCKTAB_LOCK can be deleted) + * + */ +void msvcrt_free_locks(void) +{ + int i; + + TRACE( ": uninitializing all mtlocks\n" ); + + /* Uninitialize the table */ + for( i=0; i < _TOTAL_LOCKS; i++ ) + { + if( lock_table[ i ].bInit ) + { + msvcrt_uninitialize_mlock( i ); + } + } + +#if _MSVCR_VER >= 100 + if(keyed_event) + NtClose(keyed_event); +#endif +} diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index 5a3bba7..1deb080 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -106,7 +106,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } msvcrt_init_mt_locks(); if(!msvcrt_init_locale()) { - msvcrt_free_mt_locks(); + msvcrt_free_locks(); msvcrt_free_tls_mem(); msvcrt_destroy_heap(); return FALSE; @@ -130,7 +130,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) msvcrt_free_io(); if (lpvReserved) break; msvcrt_free_popen_data(); - msvcrt_free_mt_locks(); + msvcrt_free_locks(); msvcrt_free_console(); msvcrt_free_args(); msvcrt_free_signals(); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 9069b79..22ba0d4 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -261,7 +261,7 @@ typedef void (__cdecl *free_func_t)(void*); /* Setup and teardown multi threaded locks */ extern void msvcrt_init_mt_locks(void) DECLSPEC_HIDDEN; -extern void msvcrt_free_mt_locks(void) DECLSPEC_HIDDEN; +extern void msvcrt_free_locks(void) DECLSPEC_HIDDEN; extern void msvcrt_init_exception(void*) DECLSPEC_HIDDEN; extern BOOL msvcrt_init_locale(void) DECLSPEC_HIDDEN;

1 0

Piotr Caban : msvcr100: Add critical_section class stub.
by Alexandre Julliard June 24, 2014

June 24, 2014

Module: wine Branch: master Commit: 6c35e765c836b1f5f855215bdf7b5d42c4177c28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c35e765c836b1f5f855215bd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 24 11:57:37 2014 +0200 msvcr100: Add critical_section class stub. --- dlls/msvcr100/msvcr100.spec | 24 +++++++++---------- dlls/msvcr110/msvcr110.spec | 36 ++++++++++++++-------------- dlls/msvcrt/lock.c | 58 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 88 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c35e765c836b1f5f8552…

1 0

Nikolay Sivov : scrrun: Implement get_VolumeName().
by Alexandre Julliard June 24, 2014

June 24, 2014

Module: wine Branch: master Commit: a0954a193053cf402ff9d8702d9cd81ac6230397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0954a193053cf402ff9d8702… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 24 06:35:43 2014 +0400 scrrun: Implement get_VolumeName(). --- dlls/scrrun/filesystem.c | 15 +++++++++++++-- dlls/scrrun/tests/filesystem.c | 9 +++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index fc8531c..434b402 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -957,8 +957,19 @@ static HRESULT WINAPI drive_get_TotalSize(IDrive *iface, VARIANT *v) static HRESULT WINAPI drive_get_VolumeName(IDrive *iface, BSTR *name) { struct drive *This = impl_from_IDrive(iface); - FIXME("(%p)->(%p): stub\n", This, name); - return E_NOTIMPL; + WCHAR nameW[MAX_PATH+1]; + BOOL ret; + + TRACE("(%p)->(%p)\n", This, name); + + if (!name) + return E_POINTER; + + *name = NULL; + ret = GetVolumeInformationW(This->root, nameW, sizeof(nameW)/sizeof(WCHAR), NULL, NULL, NULL, NULL, 0); + if (ret) + *name = SysAllocString(nameW); + return ret ? S_OK : E_FAIL; } static HRESULT WINAPI drive_put_VolumeName(IDrive *iface, BSTR name) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index ac78483..9410732 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1830,6 +1830,15 @@ static void test_SerialNumber(void) ok(name != NULL, "got %p\n", name); SysFreeString(name); + hr = IDrive_get_VolumeName(drive, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + name = NULL; + hr = IDrive_get_VolumeName(drive, &name); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(name != NULL, "got %p\n", name); + SysFreeString(name); + IDrive_Release(drive); IEnumVARIANT_Release(iter); IDriveCollection_Release(drives);

1 0

Piotr Caban : msvcr100: Add critical_section::scoped_lock implementation.
by Alexandre Julliard June 24, 2014

June 24, 2014

Module: wine Branch: master Commit: dab64179236c7c23fc2832d56dc41b8985401595 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dab64179236c7c23fc2832d56… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 24 11:57:43 2014 +0200 msvcr100: Add critical_section::scoped_lock implementation. --- dlls/msvcr100/msvcr100.spec | 8 ++++---- dlls/msvcr110/msvcr110.spec | 12 ++++++------ dlls/msvcrt/lock.c | 27 +++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 32fee76..aee50c0 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -144,8 +144,8 @@ @ stub -arch=win64 ??0scheduler_resource_allocation_error(a)Concurrency@@QEAA(a)J@Z @ stub -arch=win32 ??0scheduler_resource_allocation_error(a)Concurrency@@QAE(a)PBDJ@Z @ stub -arch=win64 ??0scheduler_resource_allocation_error(a)Concurrency@@QEAA(a)PEBDJ@Z -@ stub -arch=win32 ??0scoped_lock(a)critical_section@Concurrency@@QAE(a)AAV12@@Z -@ stub -arch=win64 ??0scoped_lock(a)critical_section@Concurrency@@QEAA(a)AEAV12@@Z +@ thiscall -arch=win32 ??0scoped_lock(a)critical_section@Concurrency@@QAE(a)AAV12@@Z(ptr ptr) critical_section_scoped_lock_ctor +@ cdecl -arch=win64 ??0scoped_lock(a)critical_section@Concurrency@@QEAA(a)AEAV12@@Z(ptr ptr) critical_section_scoped_lock_ctor @ stub -arch=win32 ??0scoped_lock(a)reader_writer_lock@Concurrency@@QAE(a)AAV12@@Z @ stub -arch=win64 ??0scoped_lock(a)reader_writer_lock@Concurrency@@QEAA(a)AEAV12@@Z @ stub -arch=win32 ??0scoped_lock_read(a)reader_writer_lock@Concurrency@@QAE(a)AAV12@@Z @@ -188,8 +188,8 @@ @ cdecl -arch=win64 ??1exception(a)std@@UEAA(a)XZ(ptr) MSVCRT_exception_dtor @ stub -arch=win32 ??1reader_writer_lock(a)Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1reader_writer_lock(a)Concurrency@@QEAA(a)XZ -@ stub -arch=win32 ??1scoped_lock(a)critical_section@Concurrency@@QAE(a)XZ -@ stub -arch=win64 ??1scoped_lock(a)critical_section@Concurrency@@QEAA(a)XZ +@ thiscall -arch=win32 ??1scoped_lock(a)critical_section@Concurrency@@QAE(a)XZ(ptr) critical_section_scoped_lock_dtor +@ cdecl -arch=win64 ??1scoped_lock(a)critical_section@Concurrency@@QEAA(a)XZ(ptr) critical_section_scoped_lock_dtor @ stub -arch=win32 ??1scoped_lock(a)reader_writer_lock@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1scoped_lock(a)reader_writer_lock@Concurrency@@QEAA(a)XZ @ stub -arch=win32 ??1scoped_lock_read(a)reader_writer_lock@Concurrency@@QAE(a)XZ diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index f457285..57d7950 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -248,9 +248,9 @@ @ stub -arch=arm ??0scheduler_worker_creation_error(a)Concurrency@@QAA(a)PBDJ@Z @ stub -arch=i386 ??0scheduler_worker_creation_error(a)Concurrency@@QAE(a)PBDJ@Z @ stub -arch=win64 ??0scheduler_worker_creation_error(a)Concurrency@@QEAA(a)PEBDJ@Z -@ stub -arch=arm ??0scoped_lock(a)critical_section@Concurrency@@QAA(a)AAV12@@Z -@ stub -arch=i386 ??0scoped_lock(a)critical_section@Concurrency@@QAE(a)AAV12@@Z -@ stub -arch=win64 ??0scoped_lock(a)critical_section@Concurrency@@QEAA(a)AEAV12@@Z +@ cdecl -arch=arm ??0scoped_lock(a)critical_section@Concurrency@@QAA(a)AAV12@@Z(ptr ptr) critical_section_scoped_lock_ctor +@ thiscall -arch=i386 ??0scoped_lock(a)critical_section@Concurrency@@QAE(a)AAV12@@Z(ptr ptr) critical_section_scoped_lock_ctor +@ cdecl -arch=win64 ??0scoped_lock(a)critical_section@Concurrency@@QEAA(a)AEAV12@@Z(ptr ptr) critical_section_scoped_lock_ctor @ stub -arch=arm ??0scoped_lock(a)reader_writer_lock@Concurrency@@QAA(a)AAV12@@Z @ stub -arch=i386 ??0scoped_lock(a)reader_writer_lock@Concurrency@@QAE(a)AAV12@@Z @ stub -arch=win64 ??0scoped_lock(a)reader_writer_lock@Concurrency@@QEAA(a)AEAV12@@Z @@ -323,9 +323,9 @@ @ stub -arch=arm ??1reader_writer_lock(a)Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1reader_writer_lock(a)Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1reader_writer_lock(a)Concurrency@@QEAA(a)XZ -@ stub -arch=arm ??1scoped_lock(a)critical_section@Concurrency@@QAA(a)XZ -@ stub -arch=i386 ??1scoped_lock(a)critical_section@Concurrency@@QAE(a)XZ -@ stub -arch=win64 ??1scoped_lock(a)critical_section@Concurrency@@QEAA(a)XZ +@ cdecl -arch=arm ??1scoped_lock(a)critical_section@Concurrency@@QAA(a)XZ(ptr) critical_section_scoped_lock_dtor +@ thiscall -arch=i386 ??1scoped_lock(a)critical_section@Concurrency@@QAE(a)XZ(ptr) critical_section_scoped_lock_dtor +@ cdecl -arch=win64 ??1scoped_lock(a)critical_section@Concurrency@@QEAA(a)XZ(ptr) critical_section_scoped_lock_dtor @ stub -arch=arm ??1scoped_lock(a)reader_writer_lock@Concurrency@@QAA(a)XZ @ stub -arch=i386 ??1scoped_lock(a)reader_writer_lock@Concurrency@@QAE(a)XZ @ stub -arch=win64 ??1scoped_lock(a)reader_writer_lock@Concurrency@@QEAA(a)XZ diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index e4ec6ce..09ff1af 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -366,4 +366,31 @@ critical_section* __thiscall critical_section_native_handle(critical_section *th TRACE("(%p)\n", this); return this; } + +typedef struct +{ + critical_section *cs; + void *unknown[3]; +} critical_section_scoped_lock; + +/* ??0scoped_lock(a)critical_section@Concurrency@@QAE(a)AAV12@@Z */ +/* ??0scoped_lock(a)critical_section@Concurrency@@QEAA(a)AEAV12@@Z */ +DEFINE_THISCALL_WRAPPER(critical_section_scoped_lock_ctor, 8) +critical_section_scoped_lock* __thiscall critical_section_scoped_lock_ctor( + critical_section_scoped_lock *this, critical_section *cs) +{ + TRACE("(%p %p)\n", this, cs); + this->cs = cs; + critical_section_lock(this->cs); + return this; +} + +/* ??1scoped_lock(a)critical_section@Concurrency@@QAE(a)XZ */ +/* ??1scoped_lock(a)critical_section@Concurrency@@QEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(critical_section_scoped_lock_dtor, 4) +void __thiscall critical_section_scoped_lock_dtor(critical_section_scoped_lock *this) +{ + TRACE("(%p)\n", this); + critical_section_unlock(this->cs); +} #endif

1 0

Vincent Povirk : windowscodecs: Fix interlaced PNG writing.
by Alexandre Julliard June 24, 2014

June 24, 2014

Module: wine Branch: master Commit: e2d6b28a1b2ed064fe14409220e9fce3c0573987 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2d6b28a1b2ed064fe1440922… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jun 20 15:11:01 2014 -0500 windowscodecs: Fix interlaced PNG writing. --- dlls/windowscodecs/pngformat.c | 58 ++++++++++++++++++++++++++++++++++++ dlls/windowscodecs/tests/converter.c | 57 ++++++++++++++++++++++++++++++----- 2 files changed, 107 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e2d6b28a1b2ed064fe144…

1 0

Nikolay Sivov : scrrun: Implement FileSystem property.
by Alexandre Julliard June 24, 2014

June 24, 2014

Module: wine Branch: master Commit: 6a2e1b3f31bf3f6745fe26583620be03c5db0bfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a2e1b3f31bf3f6745fe26583… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 23 22:05:26 2014 +0400 scrrun: Implement FileSystem property. --- dlls/scrrun/filesystem.c | 15 +++++++++++++-- dlls/scrrun/tests/filesystem.c | 10 ++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 4d3c117..fc8531c 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -971,8 +971,19 @@ static HRESULT WINAPI drive_put_VolumeName(IDrive *iface, BSTR name) static HRESULT WINAPI drive_get_FileSystem(IDrive *iface, BSTR *fs) { struct drive *This = impl_from_IDrive(iface); - FIXME("(%p)->(%p): stub\n", This, fs); - return E_NOTIMPL; + WCHAR nameW[MAX_PATH+1]; + BOOL ret; + + TRACE("(%p)->(%p)\n", This, fs); + + if (!fs) + return E_POINTER; + + *fs = NULL; + ret = GetVolumeInformationW(This->root, NULL, 0, NULL, NULL, NULL, nameW, sizeof(nameW)/sizeof(WCHAR)); + if (ret) + *fs = SysAllocString(nameW); + return ret ? S_OK : E_FAIL; } static HRESULT WINAPI drive_get_SerialNumber(IDrive *iface, LONG *serial) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 7b9354e..ac78483 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1798,6 +1798,7 @@ static void test_SerialNumber(void) VARIANT var; LONG serial; HRESULT hr; + BSTR name; hr = IFileSystem3_get_Drives(fs3, &drives); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1820,6 +1821,15 @@ static void test_SerialNumber(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(serial != 0xdeadbeef, "got %x\n", serial); + hr = IDrive_get_FileSystem(drive, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + name = NULL; + hr = IDrive_get_FileSystem(drive, &name); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(name != NULL, "got %p\n", name); + SysFreeString(name); + IDrive_Release(drive); IEnumVARIANT_Release(iter); IDriveCollection_Release(drives);

1 0

Sebastian Lackner : user32/tests: Add a missing call to ReleaseActCtx().
by Alexandre Julliard June 24, 2014

June 24, 2014

Module: wine Branch: master Commit: 34f8053efe0c1e7ec11fd98e3de78e07cad6d335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34f8053efe0c1e7ec11fd98e3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jun 23 06:29:09 2014 +0200 user32/tests: Add a missing call to ReleaseActCtx(). --- dlls/user32/tests/msg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 66b9c7e..6badca1 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -7024,6 +7024,7 @@ static void test_interthread_messages(void) ret = pGetCurrentActCtx(&handle); ok(ret, "GetCurentActCtx failed: %u\n", GetLastError()); ok(handle != 0, "active context %p\n", handle); + pReleaseActCtx(handle); /* destination window will test for active context */ ret = SendMessageA(wnd_event.hwnd, WM_USER+10, 0, 0);

1 0

Nikolay Sivov : scrrun: Implement SerialNumber property.
by Alexandre Julliard June 24, 2014

June 24, 2014

Module: wine Branch: master Commit: 5af5e4010383909ff79c9fd8691fb5fcfb0280c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5af5e4010383909ff79c9fd86… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 23 21:54:50 2014 +0400 scrrun: Implement SerialNumber property. --- dlls/scrrun/filesystem.c | 11 +++++++++-- dlls/scrrun/tests/filesystem.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index c85fe63..4d3c117 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -978,8 +978,15 @@ static HRESULT WINAPI drive_get_FileSystem(IDrive *iface, BSTR *fs) static HRESULT WINAPI drive_get_SerialNumber(IDrive *iface, LONG *serial) { struct drive *This = impl_from_IDrive(iface); - FIXME("(%p)->(%p): stub\n", This, serial); - return E_NOTIMPL; + BOOL ret; + + TRACE("(%p)->(%p)\n", This, serial); + + if (!serial) + return E_POINTER; + + ret = GetVolumeInformationW(This->root, NULL, 0, (DWORD*)serial, NULL, NULL, NULL, 0); + return ret ? S_OK : E_FAIL; } static HRESULT WINAPI drive_get_IsReady(IDrive *iface, VARIANT_BOOL *ready) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index c9b41c0..7b9354e 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1790,6 +1790,41 @@ static void test_GetDriveName(void) } } +static void test_SerialNumber(void) +{ + IDriveCollection *drives; + IEnumVARIANT *iter; + IDrive *drive; + VARIANT var; + LONG serial; + HRESULT hr; + + hr = IFileSystem3_get_Drives(fs3, &drives); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDriveCollection_get__NewEnum(drives, (IUnknown**)&iter); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IEnumVARIANT_Next(iter, 1, &var, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IDrive, (void**)&drive); + ok(hr == S_OK, "got 0x%08x\n", hr); + VariantClear(&var); + + hr = IDrive_get_SerialNumber(drive, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + serial = 0xdeadbeef; + hr = IDrive_get_SerialNumber(drive, &serial); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(serial != 0xdeadbeef, "got %x\n", serial); + + IDrive_Release(drive); + IEnumVARIANT_Release(iter); + IDriveCollection_Release(drives); +} + START_TEST(filesystem) { HRESULT hr; @@ -1823,6 +1858,7 @@ START_TEST(filesystem) test_ReadAll(); test_Read(); test_GetDriveName(); + test_SerialNumber(); IFileSystem3_Release(fs3);

1 0

Michael Stefaniuc : comctl32: Functions using setjmp can never be inlined.
by Alexandre Julliard June 23, 2014

June 23, 2014

Module: wine Branch: master Commit: c1cd60957e6bd12938a396e34476bbe219f69812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1cd60957e6bd12938a396e34… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 22 23:51:25 2014 +0200 comctl32: Functions using setjmp can never be inlined. --- 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 4e0a58d..645068d 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -135,7 +135,7 @@ static inline HIMAGELIST impl_from_IImageList2(IImageList2 *iface) static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count); static HRESULT ImageListImpl_CreateInstance(const IUnknown *pUnkOuter, REFIID iid, void** ppv); -static inline BOOL is_valid(HIMAGELIST himl); +static BOOL is_valid(HIMAGELIST himl); /* * An imagelist with N images is tiled like this:

1 0

Sebastian Lackner : comctl32: Allocate new memory in notify_forward_header () to avoid Free() on wrong pointer. (Valgrind).
by Alexandre Julliard June 23, 2014

June 23, 2014

Module: wine Branch: master Commit: 392321f4f68cb3d26453680c78aaa81910e15846 URL: http://source.winehq.org/git/wine.git/?a=commit;h=392321f4f68cb3d26453680c7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jun 22 02:30:45 2014 +0200 comctl32: Allocate new memory in notify_forward_header() to avoid Free() on wrong pointer. (Valgrind). --- dlls/comctl32/listview.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 7670f18..bc748c6 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -784,6 +784,7 @@ static LRESULT notify_forward_header(const LISTVIEW_INFO *infoPtr, NMHEADERW *lp if (lpnmh->pitem->mask & HDI_TEXT) { text = (LPCWSTR)lpnmh->pitem->pszText; + lpnmh->pitem->pszText = NULL; Str_SetPtrWtoA(&lpnmh->pitem->pszText, text); } /* convert filter text */ @@ -791,6 +792,7 @@ static LRESULT notify_forward_header(const LISTVIEW_INFO *infoPtr, NMHEADERW *lp lpnmh->pitem->pvFilter) { filter = (LPCWSTR)((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText; + ((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText = NULL; Str_SetPtrWtoA(&((HD_TEXTFILTERA*)lpnmh->pitem->pvFilter)->pszText, filter); } }

1 0

Sebastian Lackner : server: Avoid invalid memory access when thread is killed while in wake_up(). ( Valgrind).
by Alexandre Julliard June 23, 2014

June 23, 2014

Module: wine Branch: master Commit: 35e56fb042e60d2182caa0ee25ad9ddba515e12d URL: http://source.winehq.org/git/wine.git/?a=commit;h=35e56fb042e60d2182caa0ee2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Jun 21 21:50:40 2014 +0200 server: Avoid invalid memory access when thread is killed while in wake_up(). (Valgrind). --- server/thread.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/server/thread.c b/server/thread.c index b310e93..50d6940 100644 --- a/server/thread.c +++ b/server/thread.c @@ -700,7 +700,7 @@ static int send_thread_wakeup( struct thread *thread, client_ptr_t cookie, int s } /* attempt to wake up a thread */ -/* return >0 if OK, 0 if the wait condition is still not satisfied */ +/* return >0 if OK, 0 if the wait condition is still not satisfied and -1 on error */ int wake_thread( struct thread *thread ) { int signaled, count; @@ -714,7 +714,10 @@ int wake_thread( struct thread *thread ) if (debug_level) fprintf( stderr, "%04x: *wakeup* signaled=%d\n", thread->id, signaled ); end_wait( thread ); if (send_thread_wakeup( thread, cookie, signaled ) == -1) /* error */ - break; + { + if (!count) count = -1; + break; + } } return count; } @@ -865,12 +868,13 @@ static timeout_t select_on( const select_op_t *select_op, data_size_t op_size, c void wake_up( struct object *obj, int max ) { struct list *ptr; + int ret; LIST_FOR_EACH( ptr, &obj->wait_queue ) { struct wait_queue_entry *entry = LIST_ENTRY( ptr, struct wait_queue_entry, entry ); - if (!wake_thread( get_wait_queue_thread( entry ))) continue; - if (max && !--max) break; + if (!(ret = wake_thread( get_wait_queue_thread( entry )))) continue; + if (ret > 0 && max && !--max) break; /* restart at the head of the list since a wake up can change the object wait queue */ ptr = &obj->wait_queue; }

1 0

Sebastian Lackner : kernel32/tests: Add missing HeapFree() in doChildren() . (Valgrind).
by Alexandre Julliard June 23, 2014

June 23, 2014

Module: wine Branch: master Commit: e5e4ef07b6e2a54000bb8572fb8bf69953cdfaea URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e4ef07b6e2a54000bb8572f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jun 22 02:47:52 2014 +0200 kernel32/tests: Add missing HeapFree() in doChildren(). (Valgrind). --- dlls/kernel32/tests/debugger.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 011ed5f..a802784 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -718,6 +718,8 @@ static void doChildren(int argc, char **argv) blackbox.failures = child_failures; save_blackbox(blackbox_file, &blackbox, sizeof(blackbox)); + + HeapFree(GetProcessHeap(), 0, cmd); } static void test_debug_children(char *name, DWORD flag, BOOL debug_child)

1 0

Nikolay Sivov : scrrun: Implement GetDriveName().
by Alexandre Julliard June 23, 2014

June 23, 2014

Module: wine Branch: master Commit: d2d62cf578a62754265fac76b332a31c482c3ca0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2d62cf578a62754265fac76b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 21 20:30:11 2014 +0400 scrrun: Implement GetDriveName(). --- dlls/scrrun/filesystem.c | 15 ++++++++++---- dlls/scrrun/tests/filesystem.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 54deb97..c85fe63 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -2937,12 +2937,19 @@ static HRESULT WINAPI filesys_BuildPath(IFileSystem3 *iface, BSTR Path, return S_OK; } -static HRESULT WINAPI filesys_GetDriveName(IFileSystem3 *iface, BSTR Path, - BSTR *pbstrResult) +static HRESULT WINAPI filesys_GetDriveName(IFileSystem3 *iface, BSTR path, BSTR *drive) { - FIXME("%p %s %p\n", iface, debugstr_w(Path), pbstrResult); + TRACE("(%p)->(%s %p)\n", iface, debugstr_w(path), drive); - return E_NOTIMPL; + if (!drive) + return E_POINTER; + + *drive = NULL; + + if (path && strlenW(path) > 1 && path[1] == ':') + *drive = SysAllocStringLen(path, 2); + + return S_OK; } static inline DWORD get_parent_folder_name(const WCHAR *path, DWORD len) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index c06b43d..c9b41c0 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1745,6 +1745,51 @@ todo_wine SysFreeString(nameW); } +struct getdrivename_test { + const WCHAR path[10]; + const WCHAR drive[5]; +}; + +static const struct getdrivename_test getdrivenametestdata[] = { + { {'C',':','\\','1','.','t','s','t',0}, {'C',':',0} }, + { {'O',':','\\','1','.','t','s','t',0}, {'O',':',0} }, + { {'O',':',0}, {'O',':',0} }, + { {'o',':',0}, {'o',':',0} }, + { {'O','O',':',0} }, + { {':',0} }, + { {'O',0} }, + { { 0 } } +}; + +static void test_GetDriveName(void) +{ + const struct getdrivename_test *ptr = getdrivenametestdata; + HRESULT hr; + BSTR name; + + hr = IFileSystem3_GetDriveName(fs3, NULL, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + name = (void*)0xdeadbeef; + hr = IFileSystem3_GetDriveName(fs3, NULL, &name); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(name == NULL, "got %p\n", name); + + while (*ptr->path) { + BSTR path = SysAllocString(ptr->path); + name = (void*)0xdeadbeef; + hr = IFileSystem3_GetDriveName(fs3, path, &name); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (name) + ok(!lstrcmpW(ptr->drive, name), "got %s, expected %s\n", wine_dbgstr_w(name), wine_dbgstr_w(ptr->drive)); + else + ok(!*ptr->drive, "got %s, expected %s\n", wine_dbgstr_w(name), wine_dbgstr_w(ptr->drive)); + SysFreeString(path); + SysFreeString(name); + ptr++; + } +} + START_TEST(filesystem) { HRESULT hr; @@ -1777,6 +1822,7 @@ START_TEST(filesystem) test_WriteLine(); test_ReadAll(); test_Read(); + test_GetDriveName(); IFileSystem3_Release(fs3);

1 0

Alexandre Julliard : usp10: Update the character data tables to Unicode 7.0.0.
by Alexandre Julliard June 23, 2014

June 23, 2014

Module: wine Branch: master Commit: 96ff3daaa31bd7b62cab307c703b0aad431a942f URL: http://source.winehq.org/git/wine.git/?a=commit;h=96ff3daaa31bd7b62cab307c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 23 16:05:13 2014 +0200 usp10: Update the character data tables to Unicode 7.0.0. --- dlls/usp10/indicsyllable.c | 184 ++++++++++++++----------- dlls/usp10/linebreak.c | 334 ++++++++++++++++++++++++--------------------- dlls/usp10/mirror.c | 2 +- dlls/usp10/shape.c | 3 +- dlls/usp10/shaping.c | 80 ++++++----- tools/make_unicode | 16 ++- 6 files changed, 339 insertions(+), 280 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96ff3daaa31bd7b62cab3…

1 0

Francois Gouget : mshtml: Remove nsAString_SetData() because it is unused.
by Alexandre Julliard June 23, 2014

June 23, 2014

Module: wine Branch: master Commit: e0537210571a71838971d4c46f567f1b06add7ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0537210571a71838971d4c46… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 20 18:23:47 2014 +0200 mshtml: Remove nsAString_SetData() because it is unused. --- dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/nsembed.c | 5 ----- 2 files changed, 6 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 8be7141..8db2ba8 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -827,7 +827,6 @@ void nsACString_Finish(nsACString*) DECLSPEC_HIDDEN; BOOL nsAString_Init(nsAString*,const PRUnichar*) DECLSPEC_HIDDEN; void nsAString_InitDepend(nsAString*,const PRUnichar*) DECLSPEC_HIDDEN; -void nsAString_SetData(nsAString*,const PRUnichar*) DECLSPEC_HIDDEN; UINT32 nsAString_GetData(const nsAString*,const PRUnichar**) DECLSPEC_HIDDEN; void nsAString_Finish(nsAString*) DECLSPEC_HIDDEN; HRESULT return_nsstr(nsresult,nsAString*,BSTR*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 18de331..fd87d37 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -836,11 +836,6 @@ void nsAString_InitDepend(nsAString *str, const PRUnichar *data) NS_StringContainerInit2(str, data, PR_UINT32_MAX, NS_STRING_CONTAINER_INIT_DEPEND); } -void nsAString_SetData(nsAString *str, const PRUnichar *data) -{ - NS_StringSetData(str, data, PR_UINT32_MAX); -} - UINT32 nsAString_GetData(const nsAString *str, const PRUnichar **data) { return NS_StringGetData(str, data, NULL);

1 0

Sebastian Lackner : server: Get rid of RIP_EVENT union elements.
by Alexandre Julliard June 23, 2014

June 23, 2014

Module: wine Branch: master Commit: 9696ea506309b4ee4b72c456085a785b5d59c2f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9696ea506309b4ee4b72c4560… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jun 23 03:02:31 2014 +0200 server: Get rid of RIP_EVENT union elements. --- include/wine/server_protocol.h | 8 +------- server/debugger.c | 2 +- server/protocol.def | 6 ------ server/trace.c | 4 ---- 4 files changed, 2 insertions(+), 18 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index a5ecb20..57ab839 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -112,12 +112,6 @@ typedef union int __pad; mod_handle_t base; } unload_dll; - struct - { - int code; - int error; - int type; - } rip_info; } debug_event_t; @@ -5840,6 +5834,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 455 +#define SERVER_PROTOCOL_VERSION 456 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/debugger.c b/server/debugger.c index 3ccec29..374f2ad 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -211,7 +211,7 @@ static int fill_unload_dll_event( struct debug_event *event, const void *arg ) typedef int (*fill_event_func)( struct debug_event *event, const void *arg ); -#define NB_DEBUG_EVENTS OUTPUT_DEBUG_STRING_EVENT /* RIP_EVENT not supported */ +#define NB_DEBUG_EVENTS UNLOAD_DLL_DEBUG_EVENT static const fill_event_func fill_debug_event[NB_DEBUG_EVENTS] = { diff --git a/server/protocol.def b/server/protocol.def index 61b9ed5..a8c1fb9 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -128,12 +128,6 @@ typedef union int __pad; mod_handle_t base; /* base address of the dll */ } unload_dll; - struct - { - int code; /* RIP_EVENT */ - int error; /* ??? */ - int type; /* ??? */ - } rip_info; } debug_event_t; /* supported CPU types */ diff --git a/server/trace.c b/server/trace.c index 0887daf..4834354 100644 --- a/server/trace.c +++ b/server/trace.c @@ -712,10 +712,6 @@ static void dump_varargs_debug_event( const char *prefix, data_size_t size ) dump_uint64( ",base=", &event.unload_dll.base ); fputc( '}', stderr ); break; - case RIP_EVENT: - fprintf( stderr, "%s{rip,err=%d,type=%d}", prefix, - event.rip_info.error, event.rip_info.type ); - break; case 0: /* zero is the code returned on timeouts */ fprintf( stderr, "%s{}", prefix ); break;

1 0

Sebastian Lackner : kernel32: Process DBG_RIPEXCEPTION events like regular exceptions.
by Alexandre Julliard June 23, 2014

June 23, 2014

Module: wine Branch: master Commit: 0114be0978b66371f708487c7a1c311a268be753 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0114be0978b66371f708487c7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jun 23 02:56:12 2014 +0200 kernel32: Process DBG_RIPEXCEPTION events like regular exceptions. --- dlls/kernel32/debugger.c | 11 +++++++---- include/ntstatus.h | 1 + include/winnt.h | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index 738b6f0..d4d66b2 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -85,6 +85,13 @@ BOOL WINAPI WaitForDebugEvent( event->u.DebugString.nDebugStringLength = data.exception.params[0]; break; } + else if (data.exception.exc_code == DBG_RIPEXCEPTION && data.exception.nb_params >= 2) + { + event->dwDebugEventCode = RIP_EVENT; + event->u.RipInfo.dwError = data.exception.params[0]; + event->u.RipInfo.dwType = data.exception.params[1]; + break; + } event->u.Exception.dwFirstChance = data.exception.first; event->u.Exception.ExceptionRecord.ExceptionCode = data.exception.exc_code; event->u.Exception.ExceptionRecord.ExceptionFlags = data.exception.flags; @@ -128,10 +135,6 @@ BOOL WINAPI WaitForDebugEvent( case UNLOAD_DLL_DEBUG_EVENT: event->u.UnloadDll.lpBaseOfDll = wine_server_get_ptr( data.unload_dll.base ); break; - case RIP_EVENT: - event->u.RipInfo.dwError = data.rip_info.error; - event->u.RipInfo.dwType = data.rip_info.type; - break; } done: /* nothing */ ; diff --git a/include/ntstatus.h b/include/ntstatus.h index 9a7ca7a..325ce55 100644 --- a/include/ntstatus.h +++ b/include/ntstatus.h @@ -1212,6 +1212,7 @@ #define DBG_TERMINATE_PROCESS ((NTSTATUS) 0x40010004) #define DBG_CONTROL_C ((NTSTATUS) 0x40010005) #define DBG_PRINTEXCEPTION_C ((NTSTATUS) 0x40010006) +#define DBG_RIPEXCEPTION ((NTSTATUS) 0x40010007) #define DBG_CONTROL_BREAK ((NTSTATUS) 0x40010008) #define DBG_COMMAND_EXCEPTION ((NTSTATUS) 0x40010009) #define DBG_EXCEPTION_NOT_HANDLED ((NTSTATUS) 0x80010001) diff --git a/include/winnt.h b/include/winnt.h index e9e330d..709a93f 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -623,6 +623,7 @@ typedef DWORD FLONG; #define DBG_TERMINATE_PROCESS ((DWORD) 0x40010004) #define DBG_CONTROL_C ((DWORD) 0x40010005) #define DBG_PRINTEXCEPTION_C ((DWORD) 0x40010006) +#define DBG_RIPEXCEPTION ((DWORD) 0x40010007) #define DBG_CONTROL_BREAK ((DWORD) 0x40010008) #define DBG_COMMAND_EXCEPTION ((DWORD) 0x40010009) #define DBG_EXCEPTION_NOT_HANDLED ((DWORD) 0x80010001)

1 0

Sebastian Lackner : kernel32/tests: Add missing ReleaseActCtx() calls. ( Valgrind).
by Alexandre Julliard June 23, 2014

June 23, 2014

Module: wine Branch: master Commit: c936e505e515f685606a1104f37686679df9883d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c936e505e515f685606a1104f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jun 22 04:29:05 2014 +0200 kernel32/tests: Add missing ReleaseActCtx() calls. (Valgrind). --- dlls/kernel32/tests/thread.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 1ea5fb3..d3ecd2a 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1578,6 +1578,7 @@ static void test_thread_actctx(void) b = pGetCurrentActCtx(&handle); ok(b, "GetCurentActCtx failed: %u\n", GetLastError()); ok(handle != 0, "no active context\n"); + pReleaseActCtx(handle); param.handle = NULL; b = pGetCurrentActCtx(&param.handle); @@ -1590,6 +1591,7 @@ static void test_thread_actctx(void) ret = WaitForSingleObject(thread, 1000); ok(ret == WAIT_OBJECT_0, "wait timeout\n"); ok(param.thread_context == context, "got wrong thread context %p, %p\n", param.thread_context, context); + pReleaseActCtx(param.thread_context); CloseHandle(thread); /* similar test for CreateRemoteThread() */ @@ -1600,8 +1602,11 @@ static void test_thread_actctx(void) ret = WaitForSingleObject(thread, 1000); ok(ret == WAIT_OBJECT_0, "wait timeout\n"); ok(param.thread_context == context, "got wrong thread context %p, %p\n", param.thread_context, context); + pReleaseActCtx(param.thread_context); CloseHandle(thread); + pReleaseActCtx(param.handle); + b = pDeactivateActCtx(0, cookie); ok(b, "DeactivateActCtx failed: %u\n", GetLastError()); pReleaseActCtx(context);

1 0

Sebastian Lackner : kernel32: Fix a valgrind warning in format_add_char() . (Valgrind).
by Alexandre Julliard June 23, 2014

June 23, 2014

Module: wine Branch: master Commit: 87a78ed8788e002afb4abd652fc40f1599a77c34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87a78ed8788e002afb4abd652… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jun 22 02:05:41 2014 +0200 kernel32: Fix a valgrind warning in format_add_char(). (Valgrind). --- dlls/kernel32/format_msg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index 37dcdb3..aee7d7a 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -297,7 +297,7 @@ static void format_add_char(struct _format_message_data *fmd, WCHAR c) LPWSTR notspace; if (fmd->space) { notspace = fmd->space; - while (*notspace == ' ' && notspace != fmd->t) + while (notspace != fmd->t && *notspace == ' ') notspace++; } else notspace = fmd->space = fmd->t;

1 0

Piotr Caban : msvcr100: Add _SpinWait implementation.
by Alexandre Julliard June 23, 2014

June 23, 2014

Module: wine Branch: master Commit: cda83f9c3342532e5557d6fbb7a3c878f9d6f68b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cda83f9c3342532e5557d6fbb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jun 21 14:22:28 2014 +0200 msvcr100: Add _SpinWait implementation. --- dlls/msvcr100/msvcr100.spec | 66 ++++++++--------- dlls/msvcr110/msvcr110.spec | 98 ++++++++++++------------- dlls/msvcrt/lock.c | 172 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 1 + 4 files changed, 255 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cda83f9c3342532e5557d…

1 0

Sebastian Lackner : ntdll/tests: Add tests for DBG_RIPEXCEPTION debugger events.
by Alexandre Julliard June 23, 2014

June 23, 2014

Module: wine Branch: master Commit: 9d82ee5cac7c5c260e757f8ac1cda6afcdb4ab04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d82ee5cac7c5c260e757f8ac… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jun 23 03:04:20 2014 +0200 ntdll/tests: Add tests for DBG_RIPEXCEPTION debugger events. --- dlls/ntdll/tests/exception.c | 75 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 5fc21de..2074f0a 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -968,6 +968,26 @@ static void test_debugger(void) if (stage == 4) continuestatus = DBG_EXCEPTION_NOT_HANDLED; } + else if (de.dwDebugEventCode == RIP_EVENT) + { + int stage; + + status = pNtReadVirtualMemory(pi.hProcess, &test_stage, &stage, + sizeof(stage), &size_read); + ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status); + + if (stage == 5 || stage == 6) + { + ok(de.u.RipInfo.dwError == 0x11223344, "got unexpected rip error code %08x, expected %08x\n", + de.u.RipInfo.dwError, 0x11223344); + ok(de.u.RipInfo.dwType == 0x55667788, "got unexpected rip type %08x, expected %08x\n", + de.u.RipInfo.dwType, 0x55667788); + } + else + ok(FALSE, "unexpected stage %x\n", stage); + + if (stage == 6) continuestatus = DBG_EXCEPTION_NOT_HANDLED; + } ContinueDebugEvent(de.dwProcessId, de.dwThreadId, continuestatus); @@ -1719,6 +1739,55 @@ static void test_outputdebugstring(DWORD numexc, BOOL todo) pRtlRemoveVectoredExceptionHandler(vectored_handler); } +static DWORD ripevent_exceptions; + +static LONG CALLBACK ripevent_vectored_handler(EXCEPTION_POINTERS *ExceptionInfo) +{ + PEXCEPTION_RECORD rec = ExceptionInfo->ExceptionRecord; + trace("vect. handler %08x addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress); + + ok(rec->ExceptionCode == DBG_RIPEXCEPTION, "ExceptionCode is %08x instead of %08x\n", + rec->ExceptionCode, DBG_RIPEXCEPTION); + ok(rec->NumberParameters == 2, "ExceptionParameters is %d instead of 2\n", rec->NumberParameters); + ok(rec->ExceptionInformation[0] == 0x11223344, "ExceptionInformation[0] = %08x instead of %08x\n", + (NTSTATUS)rec->ExceptionInformation[0], 0x11223344); + ok(rec->ExceptionInformation[1] == 0x55667788, "ExceptionInformation[1] = %08x instead of %08x\n", + (NTSTATUS)rec->ExceptionInformation[1], 0x55667788); + + ripevent_exceptions++; + return (rec->ExceptionCode == DBG_RIPEXCEPTION) ? EXCEPTION_CONTINUE_EXECUTION : EXCEPTION_CONTINUE_SEARCH; +} + +static void test_ripevent(DWORD numexc) +{ + EXCEPTION_RECORD record; + PVOID vectored_handler; + + if (!pRtlAddVectoredExceptionHandler || !pRtlRemoveVectoredExceptionHandler || !pRtlRaiseException) + { + skip("RtlAddVectoredExceptionHandler or RtlRemoveVectoredExceptionHandler or RtlRaiseException not found\n"); + return; + } + + vectored_handler = pRtlAddVectoredExceptionHandler(TRUE, &ripevent_vectored_handler); + ok(vectored_handler != 0, "RtlAddVectoredExceptionHandler failed\n"); + + record.ExceptionCode = DBG_RIPEXCEPTION; + record.ExceptionFlags = 0; + record.ExceptionRecord = NULL; + record.ExceptionAddress = NULL; + record.NumberParameters = 2; + record.ExceptionInformation[0] = 0x11223344; + record.ExceptionInformation[1] = 0x55667788; + + ripevent_exceptions = 0; + pRtlRaiseException(&record); + ok(ripevent_exceptions == numexc, "RtlRaiseException generated %d exceptions, expected %d\n", + ripevent_exceptions, numexc); + + pRtlRemoveVectoredExceptionHandler(vectored_handler); +} + START_TEST(exception) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -1792,6 +1861,10 @@ START_TEST(exception) test_outputdebugstring(0, FALSE); test_stage = 4; test_outputdebugstring(2, TRUE); /* is this a Windows bug? */ + test_stage = 5; + test_ripevent(0); + test_stage = 6; + test_ripevent(1); } else skip( "RtlRaiseException not found\n" ); @@ -1804,6 +1877,7 @@ START_TEST(exception) test_exceptions(); test_rtlraiseexception(); test_outputdebugstring(1, FALSE); + test_ripevent(1); test_debugger(); test_simd_exceptions(); test_fpu_exceptions(); @@ -1821,6 +1895,7 @@ START_TEST(exception) "RtlLookupFunctionEntry" ); test_outputdebugstring(1, FALSE); + test_ripevent(1); test_virtual_unwind(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry)

1 0

Sebastian Lackner : ntdll: Fix leaking activation context when terminating via exit_thread(). ( Valgrind).
by Alexandre Julliard June 23, 2014

June 23, 2014

Module: wine Branch: master Commit: cfd09b09675a9365f8f876b77947912e8f832861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfd09b09675a9365f8f876b77… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jun 22 03:27:31 2014 +0200 ntdll: Fix leaking activation context when terminating via exit_thread(). (Valgrind). --- dlls/kernel32/thread.c | 1 - dlls/ntdll/thread.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 5d87cdd..5b9a683 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -150,7 +150,6 @@ HANDLE WINAPI OpenThread( DWORD dwDesiredAccess, BOOL bInheritHandle, DWORD dwTh */ void WINAPI ExitThread( DWORD code ) /* [in] Exit code for this thread */ { - RtlFreeThreadActivationContextStack(); RtlExitUserThread( code ); } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 56ea033..6e2ed67 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -376,6 +376,7 @@ void exit_thread( int status ) } LdrShutdownThread(); + RtlFreeThreadActivationContextStack(); pthread_sigmask( SIG_BLOCK, &server_block_set, NULL );

1 0

Thomas Faber : msvcrt: Do not omit mandatory argument to VirtualProtect.
by Alexandre Julliard June 23, 2014

June 23, 2014

Module: wine Branch: master Commit: 1ab9c79dcae558da0f3c5c65bbef1b2f7cfacd5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ab9c79dcae558da0f3c5c65b… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Jun 22 15:15:10 2014 +0200 msvcrt: Do not omit mandatory argument to VirtualProtect. --- dlls/msvcrt/misc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index c07005a..4e67cba 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -394,9 +394,10 @@ unsigned int CDECL _set_output_format(unsigned int new_output_format) int CDECL MSVCRT__resetstkoflw(void) { int stack_addr; + DWORD oldprot; /* causes stack fault that updates NtCurrentTeb()->Tib.StackLimit */ - return VirtualProtect( &stack_addr, 1, PAGE_GUARD|PAGE_READWRITE, NULL ); + return VirtualProtect(&stack_addr, 1, PAGE_GUARD|PAGE_READWRITE, &oldprot); } /*********************************************************************

1 0

Sebastian Lackner : server: Grab borrowed debugger reference while handling wake_up() events. ( Valgrind).
by Alexandre Julliard June 23, 2014

June 23, 2014

Module: wine Branch: master Commit: 3447567b42fc5ea7ccf80876ad68ca4afb49e291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3447567b42fc5ea7ccf80876a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Jun 21 22:56:22 2014 +0200 server: Grab borrowed debugger reference while handling wake_up() events. (Valgrind). --- server/debugger.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/server/debugger.c b/server/debugger.c index 3315f6e..3ccec29 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -241,7 +241,13 @@ static void link_event( struct debug_event *event ) assert( debug_ctx ); grab_object( event ); list_add_tail( &debug_ctx->event_queue, &event->entry ); - if (!event->sender->debug_event) wake_up( &debug_ctx->obj, 0 ); + if (!event->sender->debug_event) + { + /* grab reference since debugger could be killed while trying to wake up */ + grab_object( debug_ctx ); + wake_up( &debug_ctx->obj, 0 ); + release_object( debug_ctx ); + } } /* find the next event that we can send to the debugger */

1 0

Thomas Faber : rpcrt4: Do not omit mandatory argument to VirtualProtect.
by Alexandre Julliard June 23, 2014

June 23, 2014

Module: wine Branch: master Commit: 8fe759dfae41f518940764788ebbd3544c2541b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fe759dfae41f518940764788… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jun 21 18:44:57 2014 +0200 rpcrt4: Do not omit mandatory argument to VirtualProtect. --- dlls/rpcrt4/cproxy.c | 3 ++- dlls/rpcrt4/cstub.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index b1acbb0..7513b19 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -192,13 +192,14 @@ static const struct thunk *allocate_block( unsigned int num ) { unsigned int i; struct thunk *prev, *block; + DWORD oldprot; block = VirtualAlloc( NULL, BLOCK_SIZE * sizeof(*block), MEM_COMMIT | MEM_RESERVE, PAGE_EXECUTE_READWRITE ); if (!block) return NULL; for (i = 0; i < BLOCK_SIZE; i++) init_thunk( &block[i], BLOCK_SIZE * num + i + 3 ); - VirtualProtect( block, BLOCK_SIZE * sizeof(*block), PAGE_EXECUTE_READ, NULL ); + VirtualProtect( block, BLOCK_SIZE * sizeof(*block), PAGE_EXECUTE_READ, &oldprot ); prev = InterlockedCompareExchangePointer( (void **)&method_blocks[num], block, NULL ); if (prev) /* someone beat us to it */ { diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index 680b22e..0ddb1aa 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -194,6 +194,7 @@ static const vtbl_method_t *allocate_block( unsigned int num ) { unsigned int i; vtbl_method_t *prev, *block; + DWORD oldprot; block = VirtualAlloc( NULL, BLOCK_SIZE * sizeof(*block), MEM_COMMIT | MEM_RESERVE, PAGE_EXECUTE_READWRITE ); @@ -204,7 +205,7 @@ static const vtbl_method_t *allocate_block( unsigned int num ) memcpy( &block[i], opcodes, sizeof(opcodes) ); block[i].offset = (BLOCK_SIZE * num + i + 3) * sizeof(void *); } - VirtualProtect( block, BLOCK_SIZE * sizeof(*block), PAGE_EXECUTE_READ, NULL ); + VirtualProtect( block, BLOCK_SIZE * sizeof(*block), PAGE_EXECUTE_READ, &oldprot ); prev = InterlockedCompareExchangePointer( (void **)&method_blocks[num], block, NULL ); if (prev) /* someone beat us to it */ {

1 0

Piotr Caban : msvcr100/tests: Add _SpinWait tests.
by Alexandre Julliard June 23, 2014

June 23, 2014

Module: wine Branch: master Commit: b2d22ecb074e7c6fc0a701e5e85f00dcfd029841 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2d22ecb074e7c6fc0a701e5e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jun 21 14:22:37 2014 +0200 msvcr100/tests: Add _SpinWait tests. --- dlls/msvcr100/tests/msvcr100.c | 146 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index 7550eb9..a998fb5 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -51,6 +51,7 @@ }while(0) DEFINE_EXPECT(invalid_parameter_handler); +DEFINE_EXPECT(yield_func); static _invalid_parameter_handler (__cdecl *p_set_invalid_parameter_handler)(_invalid_parameter_handler); @@ -66,6 +67,73 @@ static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, ok(arg == 0, "arg = %lx\n", (UINT_PTR)arg); } +#ifdef __i386__ + +#include "pshpack1.h" +struct thiscall_thunk +{ + BYTE pop_eax; /* popl %eax (ret addr) */ + BYTE pop_edx; /* popl %edx (func) */ + BYTE pop_ecx; /* popl %ecx (this) */ + BYTE push_eax; /* pushl %eax */ + WORD jmp_edx; /* jmp *%edx */ +}; +#include "poppack.h" + +static ULONG_PTR (WINAPI *call_thiscall_func1)( void *func, void *this ); +static ULONG_PTR (WINAPI *call_thiscall_func2)( void *func, void *this, const void *a ); + +static void init_thiscall_thunk(void) +{ + struct thiscall_thunk *thunk = VirtualAlloc( NULL, sizeof(*thunk), + MEM_COMMIT, PAGE_EXECUTE_READWRITE ); + thunk->pop_eax = 0x58; /* popl %eax */ + thunk->pop_edx = 0x5a; /* popl %edx */ + thunk->pop_ecx = 0x59; /* popl %ecx */ + thunk->push_eax = 0x50; /* pushl %eax */ + thunk->jmp_edx = 0xe2ff; /* jmp *%edx */ + call_thiscall_func1 = (void *)thunk; + call_thiscall_func2 = (void *)thunk; +} + +#define call_func1(func,_this) call_thiscall_func1(func,_this) +#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) + +#else + +#define init_thiscall_thunk() +#define call_func1(func,_this) func(_this) +#define call_func2(func,_this,a) func(_this,a) + +#endif /* __i386__ */ + +#undef __thiscall +#ifdef __i386__ +#define __thiscall __stdcall +#else +#define __thiscall __cdecl +#endif + +typedef unsigned char MSVCRT_bool; + +typedef enum +{ + SPINWAIT_INIT, + SPINWAIT_SPIN, + SPINWAIT_YIELD, + SPINWAIT_DONE +} SpinWait_state; + +typedef void (__cdecl *yield_func)(void); + +typedef struct +{ + ULONG spin; + ULONG unknown; + SpinWait_state state; + yield_func yield_func; +} SpinWait; + static int* (__cdecl *p_errno)(void); static int (__cdecl *p_wmemcpy_s)(wchar_t *dest, size_t numberOfElements, const wchar_t *src, size_t count); static int (__cdecl *p_wmemmove_s)(wchar_t *dest, size_t numberOfElements, const wchar_t *src, size_t count); @@ -77,6 +145,14 @@ static void (__cdecl *p__aligned_free)(void*); static size_t (__cdecl *p__aligned_msize)(void*, size_t, size_t); static int (__cdecl *p_atoi)(const char*); +static SpinWait* (__thiscall *pSpinWait_ctor_yield)(SpinWait*, yield_func); +static void (__thiscall *pSpinWait_dtor)(SpinWait*); +static void (__thiscall *pSpinWait__DoYield)(SpinWait*); +static ULONG (__thiscall *pSpinWait__NumberOfSpins)(SpinWait*); +static void (__thiscall *pSpinWait__SetSpinCount)(SpinWait*, unsigned int); +static MSVCRT_bool (__thiscall *pSpinWait__ShouldSpinAgain)(SpinWait*); +static MSVCRT_bool (__thiscall *pSpinWait__SpinOnce)(SpinWait*); + /* make sure we use the correct errno */ #undef errno #define errno (*p_errno()) @@ -107,6 +183,25 @@ static BOOL init(void) SET(p__aligned_msize, "_aligned_msize"); SET(p_atoi, "atoi"); + if(sizeof(void*) == 8) { /* 64-bit initialization */ + SET(pSpinWait_ctor_yield, "??0?$_SpinWait@$00(a)details@Concurrency@@QEAA(a)P6AXXZ@Z"); + SET(pSpinWait_dtor, "??_F?$_SpinWait@$00(a)details@Concurrency@@QEAAXXZ"); + SET(pSpinWait__DoYield, "?_DoYield@?$_SpinWait@$00(a)details@Concurrency@@IEAAXXZ"); + SET(pSpinWait__NumberOfSpins, "?_NumberOfSpins@?$_SpinWait@$00(a)details@Concurrency@@IEAAKXZ"); + SET(pSpinWait__SetSpinCount, "?_SetSpinCount@?$_SpinWait@$00(a)details@Concurrency@@QEAAXI(a)Z"); + SET(pSpinWait__ShouldSpinAgain, "?_ShouldSpinAgain@?$_SpinWait@$00(a)details@Concurrency@@IEAA_NXZ"); + SET(pSpinWait__SpinOnce, "?_SpinOnce@?$_SpinWait@$00(a)details@Concurrency@@QEAA_NXZ"); + } else { + SET(pSpinWait_ctor_yield, "??0?$_SpinWait@$00(a)details@Concurrency@@QAE(a)P6AXXZ@Z"); + SET(pSpinWait_dtor, "??_F?$_SpinWait@$00(a)details@Concurrency@@QAEXXZ"); + SET(pSpinWait__DoYield, "?_DoYield@?$_SpinWait@$00(a)details@Concurrency@@IAEXXZ"); + SET(pSpinWait__NumberOfSpins, "?_NumberOfSpins@?$_SpinWait@$00(a)details@Concurrency@@IAEKXZ"); + SET(pSpinWait__SetSpinCount, "?_SetSpinCount@?$_SpinWait@$00(a)details@Concurrency@@QAEXI(a)Z"); + SET(pSpinWait__ShouldSpinAgain, "?_ShouldSpinAgain@?$_SpinWait@$00(a)details@Concurrency@@IAE_NXZ"); + SET(pSpinWait__SpinOnce, "?_SpinOnce@?$_SpinWait@$00(a)details@Concurrency@@QAE_NXZ"); + } + + init_thiscall_thunk(); return TRUE; } @@ -377,6 +472,56 @@ static void test_atoi(void) ok(r == 2147483647, "atoi(4294967296) = %d\n", r); } +static void __cdecl test_yield_func(void) +{ + CHECK_EXPECT(yield_func); +} + +static void test__SpinWait(void) +{ + SpinWait sp; + ULONG ul; + MSVCRT_bool b; + + call_func2(pSpinWait_ctor_yield, &sp, test_yield_func); + + SET_EXPECT(yield_func); + call_func1(pSpinWait__DoYield, &sp); + CHECK_CALLED(yield_func); + + ul = call_func1(pSpinWait__NumberOfSpins, &sp); + ok(ul == 1, "_SpinWait::_NumberOfSpins returned %u\n", ul); + + sp.spin = 2; + b = call_func1(pSpinWait__ShouldSpinAgain, &sp); + ok(b, "_SpinWait::_ShouldSpinAgain returned %x\n", b); + ok(sp.spin == 1, "sp.spin = %u\n", sp.spin); + b = call_func1(pSpinWait__ShouldSpinAgain, &sp); + ok(!b, "_SpinWait::_ShouldSpinAgain returned %x\n", b); + ok(sp.spin == 0, "sp.spin = %u\n", sp.spin); + b = call_func1(pSpinWait__ShouldSpinAgain, &sp); + ok(b, "_SpinWait::_ShouldSpinAgain returned %x\n", b); + ok(sp.spin == -1, "sp.spin = %u\n", sp.spin); + + call_func2(pSpinWait__SetSpinCount, &sp, 2); + b = call_func1(pSpinWait__SpinOnce, &sp); + ok(b, "_SpinWait::_SpinOnce returned %x\n", b); + ok(sp.spin == 1, "sp.spin = %u\n", sp.spin); + b = call_func1(pSpinWait__SpinOnce, &sp); + ok(b, "_SpinWait::_SpinOnce returned %x\n", b); + ok(sp.spin == 0, "sp.spin = %u\n", sp.spin); + SET_EXPECT(yield_func); + b = call_func1(pSpinWait__SpinOnce, &sp); + ok(b, "_SpinWait::_SpinOnce returned %x\n", b); + ok(sp.spin == 0, "sp.spin = %u\n", sp.spin); + CHECK_CALLED(yield_func); + b = call_func1(pSpinWait__SpinOnce, &sp); + ok(!b, "_SpinWait::_SpinOnce returned %x\n", b); + ok(sp.spin==0 || sp.spin==4000, "sp.spin = %u\n", sp.spin); + + call_func1(pSpinWait_dtor, &sp); +} + START_TEST(msvcr100) { if (!init()) @@ -387,4 +532,5 @@ START_TEST(msvcr100) test_fread_s(); test__aligned_msize(); test_atoi(); + test__SpinWait(); }

1 0

Alexandre Julliard : libwine: Update the codepage tables to Unicode 7.0.0.
by Alexandre Julliard June 23, 2014

June 23, 2014

Module: wine Branch: master Commit: 500bbb3e9aafd4591cecc0d03163fd3bc967f340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=500bbb3e9aafd4591cecc0d03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 23 16:05:36 2014 +0200 libwine: Update the codepage tables to Unicode 7.0.0. --- dlls/kernel32/tests/locale.c | 2 + libs/wine/c_10003.c | 69 ++++++++++++++-------- libs/wine/c_10007.c | 100 +++++++++++++++++++++----------- libs/wine/c_10008.c | 73 ++++++++++++++--------- libs/wine/c_10017.c | 100 +++++++++++++++++++++----------- libs/wine/c_20866.c | 100 +++++++++++++++++++++----------- libs/wine/c_20932.c | 71 +++++++++++++++-------- libs/wine/c_21866.c | 100 +++++++++++++++++++++----------- libs/wine/c_28595.c | 100 +++++++++++++++++++++----------- libs/wine/c_855.c | 100 +++++++++++++++++++++----------- libs/wine/c_866.c | 100 +++++++++++++++++++++----------- libs/wine/c_878.c | 100 +++++++++++++++++++++----------- libs/wine/casemap.c | 64 ++++++++++++--------- libs/wine/wctype.c | 134 +++++++++++++++++++++---------------------- loader/l_intl.nls | Bin 6086 -> 6118 bytes 15 files changed, 765 insertions(+), 448 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=500bbb3e9aafd4591cecc…

1 0

Sebastian Lackner : ntdll: Avoid leaking activation context in RtlCreateUserThread. (Valgrind).
by Alexandre Julliard June 23, 2014

June 23, 2014

Module: wine Branch: master Commit: 2fcecdb72e11b7adb03dc797c2ccc60fcb487fcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fcecdb72e11b7adb03dc797c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jun 22 22:25:52 2014 +0200 ntdll: Avoid leaking activation context in RtlCreateUserThread. (Valgrind). --- dlls/ntdll/thread.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 6e2ed67..c8461b0 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -520,8 +520,6 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * frame->ActivationContext = actctx; frame->Flags = 0; teb->ActivationContextStack.ActiveFrame = frame; - - RtlAddRefActivationContext(actctx); } info = (struct startup_info *)(teb + 1);

1 0

André Hentschel : Add WWN 371
by Jeremy Newman June 22, 2014

June 22, 2014

Module: website Branch: master Commit: def3736c5f344830bd6226f9b17cfd40e783c194 URL: http://source.winehq.org/git/website.git/?a=commit;h=def3736c5f344830bd6226… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 21 14:15:38 2014 +0200 Add WWN 371 --- news/de/2014062001.xml | 10 + news/en/2014062001.xml | 10 + wwn/en/wn20140620_371.xml | 1047 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1067 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=def3736c5f344830bd…

1 0

Francois Gouget : packager/tests: Make the IStorage methods static.
by Alexandre Julliard June 20, 2014

June 20, 2014

Module: wine Branch: master Commit: 889cce442ed24ed8eadd09af46464b31ba57f715 URL: http://source.winehq.org/git/wine.git/?a=commit;h=889cce442ed24ed8eadd09af4… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 20 18:23:50 2014 +0200 packager/tests: Make the IStorage methods static. --- dlls/packager/tests/oleobj.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/packager/tests/oleobj.c b/dlls/packager/tests/oleobj.c index f81dc22..1f81cb5 100644 --- a/dlls/packager/tests/oleobj.c +++ b/dlls/packager/tests/oleobj.c @@ -177,7 +177,7 @@ static IStream ole10native_stream = { &ole10native_stream_vtbl }; -HRESULT WINAPI stg_QueryInterface(IStorage* This, REFIID riid, +static HRESULT WINAPI stg_QueryInterface(IStorage* This, REFIID riid, void **ppvObject) { ok(0, "queryinterface: %s\n", wine_dbgstr_guid(riid)); @@ -207,7 +207,7 @@ static HRESULT WINAPI stg_CreateStream(IStorage* This, LPCOLESTR pwcsName, return E_NOTIMPL; } -HRESULT WINAPI stg_OpenStream(IStorage* This, LPCOLESTR pwcsName, +static HRESULT WINAPI stg_OpenStream(IStorage* This, LPCOLESTR pwcsName, void *reserved1, DWORD grfMode, DWORD reserved2, IStream **ppstm) { static const WCHAR ole10NativeW[] = {1,'O','l','e','1','0','N','a','t','i','v','e',0}; @@ -220,14 +220,14 @@ HRESULT WINAPI stg_OpenStream(IStorage* This, LPCOLESTR pwcsName, return S_OK; } -HRESULT WINAPI stg_CreateStorage(IStorage* This, LPCOLESTR pwcsName, +static HRESULT WINAPI stg_CreateStorage(IStorage* This, LPCOLESTR pwcsName, DWORD grfMode, DWORD dwStgFmt, DWORD reserved2, IStorage **ppstg) { ok(0, "createstorage\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_OpenStorage(IStorage* This, LPCOLESTR pwcsName, +static HRESULT WINAPI stg_OpenStorage(IStorage* This, LPCOLESTR pwcsName, IStorage *pstgPriority, DWORD grfMode, SNB snbExclude, DWORD reserved, IStorage **ppstg) { @@ -235,73 +235,73 @@ HRESULT WINAPI stg_OpenStorage(IStorage* This, LPCOLESTR pwcsName, return E_NOTIMPL; } -HRESULT WINAPI stg_CopyTo(IStorage* This, DWORD ciidExclude, +static HRESULT WINAPI stg_CopyTo(IStorage* This, DWORD ciidExclude, const IID *rgiidExclude, SNB snbExclude, IStorage *pstgDest) { ok(0, "copyto\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_MoveElementTo(IStorage* This, LPCOLESTR pwcsName, +static HRESULT WINAPI stg_MoveElementTo(IStorage* This, LPCOLESTR pwcsName, IStorage *pstgDest, LPCOLESTR pwcsNewName, DWORD grfFlags) { ok(0, "moveelem\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_Commit(IStorage* This, DWORD grfCommitFlags) +static HRESULT WINAPI stg_Commit(IStorage* This, DWORD grfCommitFlags) { ok(0, "commit\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_Revert(IStorage* This) +static HRESULT WINAPI stg_Revert(IStorage* This) { ok(0, "revert\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_EnumElements(IStorage* This, DWORD reserved1, +static HRESULT WINAPI stg_EnumElements(IStorage* This, DWORD reserved1, void *reserved2, DWORD reserved3, IEnumSTATSTG **ppenum) { ok(0, "enumelem\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_DestroyElement(IStorage* This, LPCOLESTR pwcsName) +static HRESULT WINAPI stg_DestroyElement(IStorage* This, LPCOLESTR pwcsName) { ok(0, "destroyelem\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_RenameElement(IStorage* This, LPCOLESTR pwcsOldName, +static HRESULT WINAPI stg_RenameElement(IStorage* This, LPCOLESTR pwcsOldName, LPCOLESTR pwcsNewName) { ok(0, "renamelem\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_SetElementTimes(IStorage* This, LPCOLESTR pwcsName, +static HRESULT WINAPI stg_SetElementTimes(IStorage* This, LPCOLESTR pwcsName, const FILETIME *pctime, const FILETIME *patime, const FILETIME *pmtime) { ok(0, "setelem\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_SetClass(IStorage* This, REFCLSID clsid) +static HRESULT WINAPI stg_SetClass(IStorage* This, REFCLSID clsid) { ok(0, "setclass\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_SetStateBits(IStorage* This, DWORD grfStateBits, +static HRESULT WINAPI stg_SetStateBits(IStorage* This, DWORD grfStateBits, DWORD grfMask) { ok(0, "setstate\n"); return E_NOTIMPL; } -HRESULT WINAPI stg_Stat(IStorage* This, STATSTG *pstatstg, DWORD grfStatFlag) +static HRESULT WINAPI stg_Stat(IStorage* This, STATSTG *pstatstg, DWORD grfStatFlag) { memset(pstatstg, 0, sizeof(*pstatstg)); pstatstg->clsid = CLSID_Package;

1 0

Sebastian Lackner : ntdll/tests: Add more tests for debug string events.
by Alexandre Julliard June 20, 2014

June 20, 2014

Module: wine Branch: master Commit: 99ac786c6989a7962eed4c15e7ef8673f6988ee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99ac786c6989a7962eed4c15e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jun 19 21:19:38 2014 +0200 ntdll/tests: Add more tests for debug string events. This patch adds additional tests, to check how debuggers handle OUTPUT_DEBUG_STRING_EVENT events. --- dlls/ntdll/tests/exception.c | 44 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 623a25e..5fc21de 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -943,6 +943,31 @@ static void test_debugger(void) ok(!status, "NtSetContextThread failed with 0x%x\n", status); } } + else if (de.dwDebugEventCode == OUTPUT_DEBUG_STRING_EVENT) + { + int stage; + char buffer[64]; + + status = pNtReadVirtualMemory(pi.hProcess, &test_stage, &stage, + sizeof(stage), &size_read); + ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status); + + ok(!de.u.DebugString.fUnicode, "unepxected unicode debug string event\n"); + ok(de.u.DebugString.nDebugStringLength < sizeof(buffer) - 1, "buffer not large enough to hold %d bytes\n", + de.u.DebugString.nDebugStringLength); + + memset(buffer, 0, sizeof(buffer)); + status = pNtReadVirtualMemory(pi.hProcess, de.u.DebugString.lpDebugStringData, buffer, + de.u.DebugString.nDebugStringLength, &size_read); + ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status); + + if (stage == 3 || stage == 4) + ok(!strcmp(buffer, "Hello World"), "got unexpected debug string '%s'\n", buffer); + else /* ignore unrelated debug strings like 'SHIMVIEW: ShimInfo(Complete)' */ + ok(strstr(buffer, "SHIMVIEW") != NULL, "unexpected stage %x, got debug string event '%s'\n", stage, buffer); + + if (stage == 4) continuestatus = DBG_EXCEPTION_NOT_HANDLED; + } ContinueDebugEvent(de.dwProcessId, de.dwThreadId, continuestatus); @@ -1668,7 +1693,7 @@ static LONG CALLBACK outputdebugstring_vectored_handler(EXCEPTION_POINTERS *Exce return EXCEPTION_CONTINUE_SEARCH; } -static void test_outputdebugstring(void) +static void test_outputdebugstring(DWORD numexc, BOOL todo) { PVOID vectored_handler; @@ -1683,8 +1708,13 @@ static void test_outputdebugstring(void) outputdebugstring_exceptions = 0; OutputDebugStringA("Hello World"); - ok(outputdebugstring_exceptions == 1, "OutputDebugStringA generated %d exceptions, expected one\n", - outputdebugstring_exceptions); + if (todo) + todo_wine + ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %d exceptions, expected %d\n", + outputdebugstring_exceptions, numexc); + else + ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %d exceptions, expected %d\n", + outputdebugstring_exceptions, numexc); pRtlRemoveVectoredExceptionHandler(vectored_handler); } @@ -1758,6 +1788,10 @@ START_TEST(exception) run_rtlraiseexception_test(0x12345); run_rtlraiseexception_test(EXCEPTION_BREAKPOINT); run_rtlraiseexception_test(EXCEPTION_INVALID_HANDLE); + test_stage = 3; + test_outputdebugstring(0, FALSE); + test_stage = 4; + test_outputdebugstring(2, TRUE); /* is this a Windows bug? */ } else skip( "RtlRaiseException not found\n" ); @@ -1769,7 +1803,7 @@ START_TEST(exception) test_unwind(); test_exceptions(); test_rtlraiseexception(); - test_outputdebugstring(); + test_outputdebugstring(1, FALSE); test_debugger(); test_simd_exceptions(); test_fpu_exceptions(); @@ -1786,7 +1820,7 @@ START_TEST(exception) pRtlLookupFunctionEntry = (void *)GetProcAddress( hntdll, "RtlLookupFunctionEntry" ); - test_outputdebugstring(); + test_outputdebugstring(1, FALSE); test_virtual_unwind(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry)

1 0

Sebastian Lackner : server: Remove output_debug_string request.
by Alexandre Julliard June 20, 2014

June 20, 2014

Module: wine Branch: master Commit: 2f9fdec310a69aa0d8773c923fd58df1b40a83ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f9fdec310a69aa0d8773c923… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 20 15:23:04 2014 +0200 server: Remove output_debug_string request. --- include/wine/server_protocol.h | 24 +----------------------- server/debugger.c | 20 +------------------- server/protocol.def | 13 ------------- server/request.h | 5 ----- server/trace.c | 14 -------------- 5 files changed, 2 insertions(+), 74 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 0d69ad3..a5ecb20 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -115,12 +115,6 @@ typedef union struct { int code; - data_size_t length; - client_ptr_t string; - } output_string; - struct - { - int code; int error; int type; } rip_info; @@ -2261,19 +2255,6 @@ struct get_exception_status_reply -struct output_debug_string_request -{ - struct request_header __header; - data_size_t length; - client_ptr_t string; -}; -struct output_debug_string_reply -{ - struct reply_header __header; -}; - - - struct continue_debug_event_request { struct request_header __header; @@ -5171,7 +5152,6 @@ enum request REQ_wait_debug_event, REQ_queue_exception_event, REQ_get_exception_status, - REQ_output_debug_string, REQ_continue_debug_event, REQ_debug_process, REQ_debug_break, @@ -5433,7 +5413,6 @@ union generic_request struct wait_debug_event_request wait_debug_event_request; struct queue_exception_event_request queue_exception_event_request; struct get_exception_status_request get_exception_status_request; - struct output_debug_string_request output_debug_string_request; struct continue_debug_event_request continue_debug_event_request; struct debug_process_request debug_process_request; struct debug_break_request debug_break_request; @@ -5693,7 +5672,6 @@ union generic_reply struct wait_debug_event_reply wait_debug_event_reply; struct queue_exception_event_reply queue_exception_event_reply; struct get_exception_status_reply get_exception_status_reply; - struct output_debug_string_reply output_debug_string_reply; struct continue_debug_event_reply continue_debug_event_reply; struct debug_process_reply debug_process_reply; struct debug_break_reply debug_break_reply; @@ -5862,6 +5840,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 454 +#define SERVER_PROTOCOL_VERSION 455 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/debugger.c b/server/debugger.c index 0bb9fb8..3315f6e 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -209,13 +209,6 @@ static int fill_unload_dll_event( struct debug_event *event, const void *arg ) return 1; } -static int fill_output_debug_string_event( struct debug_event *event, const void *arg ) -{ - const debug_event_t *data = arg; - event->data.output_string = data->output_string; - return 1; -} - typedef int (*fill_event_func)( struct debug_event *event, const void *arg ); #define NB_DEBUG_EVENTS OUTPUT_DEBUG_STRING_EVENT /* RIP_EVENT not supported */ @@ -228,8 +221,7 @@ static const fill_event_func fill_debug_event[NB_DEBUG_EVENTS] = fill_exit_thread_event, /* EXIT_THREAD_DEBUG_EVENT */ fill_exit_process_event, /* EXIT_PROCESS_DEBUG_EVENT */ fill_load_dll_event, /* LOAD_DLL_DEBUG_EVENT */ - fill_unload_dll_event, /* UNLOAD_DLL_DEBUG_EVENT */ - fill_output_debug_string_event /* OUTPUT_DEBUG_STRING_EVENT */ + fill_unload_dll_event /* UNLOAD_DLL_DEBUG_EVENT */ }; @@ -695,16 +687,6 @@ DECL_HANDLER(get_exception_status) } } -/* send an output string to the debugger */ -DECL_HANDLER(output_debug_string) -{ - debug_event_t data; - - data.output_string.string = req->string; - data.output_string.length = req->length; - generate_debug_event( current, OUTPUT_DEBUG_STRING_EVENT, &data ); -} - /* simulate a breakpoint in a process */ DECL_HANDLER(debug_break) { diff --git a/server/protocol.def b/server/protocol.def index fec5e75..61b9ed5 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -130,12 +130,6 @@ typedef union } unload_dll; struct { - int code; /* OUTPUT_DEBUG_STRING_EVENT */ - data_size_t length; /* string length */ - client_ptr_t string; /* string to display (in debugged process address space) */ - } output_string; - struct - { int code; /* RIP_EVENT */ int error; /* ??? */ int type; /* ??? */ @@ -1728,13 +1722,6 @@ enum char_info_mode @END -/* Send an output string to the debugger */ -(a)REQ(output_debug_string) - data_size_t length; /* string length */ - client_ptr_t string; /* string to display (in debugged process address space) */ -(a)END - - /* Continue a debug event */ @REQ(continue_debug_event) process_id_t pid; /* process id to continue */ diff --git a/server/request.h b/server/request.h index 8e35b0d..e25e327 100644 --- a/server/request.h +++ b/server/request.h @@ -194,7 +194,6 @@ DECL_HANDLER(next_thread); DECL_HANDLER(wait_debug_event); DECL_HANDLER(queue_exception_event); DECL_HANDLER(get_exception_status); -DECL_HANDLER(output_debug_string); DECL_HANDLER(continue_debug_event); DECL_HANDLER(debug_process); DECL_HANDLER(debug_break); @@ -455,7 +454,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_wait_debug_event, (req_handler)req_queue_exception_event, (req_handler)req_get_exception_status, - (req_handler)req_output_debug_string, (req_handler)req_continue_debug_event, (req_handler)req_debug_process, (req_handler)req_debug_break, @@ -1228,9 +1226,6 @@ C_ASSERT( sizeof(struct queue_exception_event_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_exception_status_request, handle) == 12 ); C_ASSERT( sizeof(struct get_exception_status_request) == 16 ); C_ASSERT( sizeof(struct get_exception_status_reply) == 8 ); -C_ASSERT( FIELD_OFFSET(struct output_debug_string_request, length) == 12 ); -C_ASSERT( FIELD_OFFSET(struct output_debug_string_request, string) == 16 ); -C_ASSERT( sizeof(struct output_debug_string_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct continue_debug_event_request, pid) == 12 ); C_ASSERT( FIELD_OFFSET(struct continue_debug_event_request, tid) == 16 ); C_ASSERT( FIELD_OFFSET(struct continue_debug_event_request, status) == 20 ); diff --git a/server/trace.c b/server/trace.c index b792494..0887daf 100644 --- a/server/trace.c +++ b/server/trace.c @@ -712,11 +712,6 @@ static void dump_varargs_debug_event( const char *prefix, data_size_t size ) dump_uint64( ",base=", &event.unload_dll.base ); fputc( '}', stderr ); break; - case OUTPUT_DEBUG_STRING_EVENT: - fprintf( stderr, "%s{output_string", prefix ); - dump_uint64( ",string=", &event.output_string.string ); - fprintf( stderr, ",len=%u}", event.output_string.length ); - break; case RIP_EVENT: fprintf( stderr, "%s{rip,err=%d,type=%d}", prefix, event.rip_info.error, event.rip_info.type ); @@ -2174,12 +2169,6 @@ static void dump_get_exception_status_reply( const struct get_exception_status_r dump_varargs_context( " context=", cur_size ); } -static void dump_output_debug_string_request( const struct output_debug_string_request *req ) -{ - fprintf( stderr, " length=%u", req->length ); - dump_uint64( ", string=", &req->string ); -} - static void dump_continue_debug_event_request( const struct continue_debug_event_request *req ) { fprintf( stderr, " pid=%04x", req->pid ); @@ -4184,7 +4173,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_wait_debug_event_request, (dump_func)dump_queue_exception_event_request, (dump_func)dump_get_exception_status_request, - (dump_func)dump_output_debug_string_request, (dump_func)dump_continue_debug_event_request, (dump_func)dump_debug_process_request, (dump_func)dump_debug_break_request, @@ -4444,7 +4432,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_exception_status_reply, NULL, NULL, - NULL, (dump_func)dump_debug_break_reply, NULL, (dump_func)dump_read_process_memory_reply, @@ -4700,7 +4687,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "wait_debug_event", "queue_exception_event", "get_exception_status", - "output_debug_string", "continue_debug_event", "debug_process", "debug_break",

1 0