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