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

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