January 2014 - Wine-Commits

André Hentschel : shlwapi/tests: Avoid preprocessor check to ensure it compiles.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: e98844e5c92e47a5a8d15e70007ff8f06982cb42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e98844e5c92e47a5a8d15e700… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 24 23:07:39 2014 +0100 shlwapi/tests: Avoid preprocessor check to ensure it compiles. --- dlls/shlwapi/tests/istream.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index bacd0e6..95485b9 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -283,10 +283,11 @@ static void test_SHCreateStreamOnFileA(DWORD mode, DWORD stgm) "or HRESULT_FROM_WIN32(ERROR_BAD_PATHNAME), got 0x%08x\n", ret); ok(stream == NULL, "SHCreateStreamOnFileA: expected a NULL IStream object, got %p\n", stream); -#if 0 /* This test crashes on WinXP SP2 */ +if (0) /* This test crashes on WinXP SP2 */ +{ ret = (*pSHCreateStreamOnFileA)(test_file, mode | stgm, NULL); ok(ret == E_INVALIDARG, "SHCreateStreamOnFileA: expected E_INVALIDARG, got 0x%08x\n", ret); -#endif +} stream = NULL; ret = (*pSHCreateStreamOnFileA)(test_file, mode | STGM_CONVERT | stgm, &stream);

1 0

Henri Verbeet : d3d10core/tests: Use D3D10CreateDevice() to create a device.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 80ce3b319a0b62016e91abc438d577b866154f83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80ce3b319a0b62016e91abc43… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 27 10:07:55 2014 +0100 d3d10core/tests: Use D3D10CreateDevice() to create a device. --- dlls/d3d10core/tests/Makefile.in | 2 +- dlls/d3d10core/tests/device.c | 55 ++++++-------------------------------- 2 files changed, 9 insertions(+), 48 deletions(-) diff --git a/dlls/d3d10core/tests/Makefile.in b/dlls/d3d10core/tests/Makefile.in index 0dfec79..ca96a25 100644 --- a/dlls/d3d10core/tests/Makefile.in +++ b/dlls/d3d10core/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d3d10core.dll -IMPORTS = d3d10core dxgi +IMPORTS = d3d10 C_SRCS = \ device.c diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 63b65bc..8278afc 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -21,57 +21,18 @@ #include "d3d10.h" #include "wine/test.h" -HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, - UINT flags, void *unknown0, ID3D10Device **device); - static ID3D10Device *create_device(void) { - IDXGIFactory *factory = NULL; - IDXGIAdapter *adapter = NULL; - ID3D10Device *device = NULL; - HRESULT hr; - - hr = CreateDXGIFactory(&IID_IDXGIFactory, (void *)&factory); - if (FAILED(hr)) goto cleanup; - - hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); - ok(SUCCEEDED(hr) || hr == DXGI_ERROR_NOT_FOUND, /* Some VMware and VirtualBox */ - "EnumAdapters failed, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - hr = D3D10CoreCreateDevice(factory, adapter, 0, NULL, &device); - } - - if (FAILED(hr)) - { - HMODULE d3d10ref; - - trace("Failed to create a HW device, trying REF\n"); - if (adapter) IDXGIAdapter_Release(adapter); - adapter = NULL; - - d3d10ref = LoadLibraryA("d3d10ref.dll"); - if (!d3d10ref) - { - trace("d3d10ref.dll not available, unable to create a REF device\n"); - goto cleanup; - } - - hr = IDXGIFactory_CreateSoftwareAdapter(factory, d3d10ref, &adapter); - FreeLibrary(d3d10ref); - ok(SUCCEEDED(hr), "CreateSoftwareAdapter failed, hr %#x\n", hr); - if (FAILED(hr)) goto cleanup; - - hr = D3D10CoreCreateDevice(factory, adapter, 0, NULL, &device); - ok(SUCCEEDED(hr), "Failed to create a REF device, hr %#x\n", hr); - if (FAILED(hr)) goto cleanup; - } + ID3D10Device *device; -cleanup: - if (adapter) IDXGIAdapter_Release(adapter); - if (factory) IDXGIFactory_Release(factory); + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_SDK_VERSION, &device))) + return device; + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_WARP, NULL, 0, D3D10_SDK_VERSION, &device))) + return device; + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, 0, D3D10_SDK_VERSION, &device))) + return device; - return device; + return NULL; } static void test_device_interfaces(void)

1 0

Michael Stefaniuc : dmusic: Use the defines for the FOURCC codes.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 2973dbb856c142812e0679c09a7bb786965cdaa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2973dbb856c142812e0679c09… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 27 14:48:31 2014 +0100 dmusic: Use the defines for the FOURCC codes. --- dlls/dmusic/collection.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 20380fe..90a7918 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -289,7 +289,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescrip TRACE_(dmfile)(": RIFF chunk of type %s", debugstr_fourcc(chunk.fccID)); StreamSize = chunk.dwSize - sizeof(FOURCC); - if (chunk.fccID != mmioFOURCC('D','L','S',' ')) { + if (chunk.fccID != FOURCC_DLS) { TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); liMove.QuadPart = StreamSize; IStream_Seek(stream, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */ @@ -339,7 +339,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescrip ListCount[0] = 0; switch (chunk.fccID) { /* pure INFO list, such can be found in dls collections */ - case mmioFOURCC('I','N','F','O'): + case DMUS_FOURCC_INFO_LIST: TRACE_(dmfile)(": INFO list\n"); do { hr = read_from_stream(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD)); @@ -558,7 +558,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST ListSize[0] = chunk.dwSize - sizeof(FOURCC); ListCount[0] = 0; switch (chunk.fccID) { - case mmioFOURCC('I','N','F','O'): { + case DMUS_FOURCC_INFO_LIST: { TRACE_(dmfile)(": INFO list\n"); do { IStream_Read(stream, &chunk, sizeof(FOURCC) + sizeof(DWORD), NULL);

1 0

Stefan Dösinger : wined3d: Set buffer-> map_ptr to NULL on unmap.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 9f72f784310320ec219401fde54815ab05564aa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f72f784310320ec219401fde… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 27 14:41:47 2014 +0100 wined3d: Set buffer->map_ptr to NULL on unmap. --- dlls/wined3d/buffer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b857119..c53021b 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1117,6 +1117,7 @@ void CDECL wined3d_buffer_unmap(struct wined3d_buffer *buffer) context_release(context); buffer_clear_dirty_areas(buffer); + buffer->map_ptr = NULL; } else if (buffer->flags & WINED3D_BUFFER_HASDESC) {

1 0

Stefan Dösinger : include: Fix IDirect3DSwapChain8_Present argument count.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: f9f52edbf77a616609e19e4f7c973dc4e934335d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9f52edbf77a616609e19e4f7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 22 17:50:32 2014 +0100 include: Fix IDirect3DSwapChain8_Present argument count. --- include/d3d8.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3d8.h b/include/d3d8.h index dcc25f1..d56e67f 100644 --- a/include/d3d8.h +++ b/include/d3d8.h @@ -265,7 +265,7 @@ DECLARE_INTERFACE_(IDirect3DSwapChain8,IUnknown) #define IDirect3DSwapChain8_AddRef(p) (p)->lpVtbl->AddRef(p) #define IDirect3DSwapChain8_Release(p) (p)->lpVtbl->Release(p) /*** IDirect3DSwapChain8 methods ***/ -#define IDirect3DSwapChain8_Present(p,a,b,c) (p)->lpVtbl->Present(p,a,b,c) +#define IDirect3DSwapChain8_Present(p,a,b,c,d) (p)->lpVtbl->Present(p,a,b,c,d) #define IDirect3DSwapChain8_GetBackBuffer(p,a,b,c) (p)->lpVtbl->GetBackBuffer(p,a,b,c) #else /*** IUnknown methods ***/ @@ -273,7 +273,7 @@ DECLARE_INTERFACE_(IDirect3DSwapChain8,IUnknown) #define IDirect3DSwapChain8_AddRef(p) (p)->AddRef() #define IDirect3DSwapChain8_Release(p) (p)->Release() /*** IDirect3DSwapChain8 methods ***/ -#define IDirect3DSwapChain8_Present(p,a,b,c) (p)->Present(a,b,c) +#define IDirect3DSwapChain8_Present(p,a,b,c,d) (p)->Present(a,b,c,d) #define IDirect3DSwapChain8_GetBackBuffer(p,a,b,c) (p)->GetBackBuffer(a,b,c) #endif

1 0

Henri Verbeet : d3d10: Add D3D10_DRIVER_TYPE_WARP.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 2d06703dc752e00b05710125d8bc3fb505ca4beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d06703dc752e00b05710125d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 27 10:07:53 2014 +0100 d3d10: Add D3D10_DRIVER_TYPE_WARP. --- dlls/d3d10/d3d10_main.c | 5 +++++ dlls/d3d10/utils.c | 1 + include/d3d10misc.h | 1 + 3 files changed, 7 insertions(+) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 01fefba..6d4d626 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -121,6 +121,11 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver } break; } + + default: + FIXME("Unhandled driver type %#x.\n", driver_type); + IDXGIFactory_Release(factory); + return E_FAIL; } } diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c index 6bb7d05..9ffff13 100644 --- a/dlls/d3d10/utils.c +++ b/dlls/d3d10/utils.c @@ -34,6 +34,7 @@ const char *debug_d3d10_driver_type(D3D10_DRIVER_TYPE driver_type) WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_REFERENCE); WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_NULL); WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_SOFTWARE); + WINE_D3D10_TO_STR(D3D10_DRIVER_TYPE_WARP); default: FIXME("Unrecognized D3D10_DRIVER_TYPE %#x\n", driver_type); return "unrecognized"; diff --git a/include/d3d10misc.h b/include/d3d10misc.h index 9f7f8e9..f8f5617 100644 --- a/include/d3d10misc.h +++ b/include/d3d10misc.h @@ -30,6 +30,7 @@ typedef enum D3D10_DRIVER_TYPE { D3D10_DRIVER_TYPE_REFERENCE = 1, D3D10_DRIVER_TYPE_NULL = 2, D3D10_DRIVER_TYPE_SOFTWARE = 3, + D3D10_DRIVER_TYPE_WARP = 5, } D3D10_DRIVER_TYPE; HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type,

1 0

Sebastian Lackner : kernel32/tests: Add tests for TryAcquireSRWLockExclusive/Shared.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: e7b3a43759fffd1dc921fb9a953526fc33beac6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7b3a43759fffd1dc921fb9a9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jan 22 00:37:28 2014 +0100 kernel32/tests: Add tests for TryAcquireSRWLockExclusive/Shared. --- dlls/kernel32/tests/sync.c | 207 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 205 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7b3a43759fffd1dc921f…

1 0

Austin English : mscms: Make missing lcms2 an error, not a fixme.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 77f871ab7c6b5617e35580ef7d6d3d2c73c72ead URL: http://source.winehq.org/git/wine.git/?a=commit;h=77f871ab7c6b5617e35580ef7… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 22 21:28:27 2014 -0800 mscms: Make missing lcms2 an error, not a fixme. --- dlls/mscms/mscms_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscms/mscms_main.c b/dlls/mscms/mscms_main.c index 4653cc7..e4c5f28 100644 --- a/dlls/mscms/mscms_main.c +++ b/dlls/mscms/mscms_main.c @@ -54,7 +54,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) #ifdef HAVE_LCMS2 cmsSetLogErrorHandler( lcms_error_handler ); #else - FIXME( "Wine was built without support for liblcms2, expect problems\n" ); + ERR( "Wine was built without support for liblcms2, expect problems\n" ); #endif break; case DLL_PROCESS_DETACH:

1 0

Bruno Jesus : programs: Add support to arguments with dash in taskkill.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 8a7687d868728bd3c9fe922562f5a78045f05242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a7687d868728bd3c9fe92256… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jan 21 21:24:54 2014 -0200 programs: Add support to arguments with dash in taskkill. --- programs/taskkill/taskkill.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 18edec3..7f0e7ad 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -447,36 +447,46 @@ static BOOL add_to_task_list(WCHAR *name) * options are detected as parameters when placed after options that accept one. */ static BOOL process_arguments(int argc, WCHAR *argv[]) { - static const WCHAR slashForceTerminate[] = {'/','f',0}; - static const WCHAR slashImage[] = {'/','i','m',0}; - static const WCHAR slashPID[] = {'/','p','i','d',0}; - static const WCHAR slashHelp[] = {'/','?',0}; - static const WCHAR slashTerminateChildren[] = {'/','t',0}; + static const WCHAR opForceTerminate[] = {'f',0}; + static const WCHAR opImage[] = {'i','m',0}; + static const WCHAR opPID[] = {'p','i','d',0}; + static const WCHAR opHelp[] = {'?',0}; + static const WCHAR opTerminateChildren[] = {'t',0}; if (argc > 1) { int i; + WCHAR *argdata; BOOL has_im = FALSE, has_pid = FALSE; /* Only the lone help option is recognized. */ - if (argc == 2 && !strcmpW(slashHelp, argv[1])) + if (argc == 2) { - taskkill_message(STRING_USAGE); - exit(0); + argdata = argv[1]; + if ((*argdata == '/' || *argdata == '-') && !strcmpW(opHelp, argdata + 1)) + { + taskkill_message(STRING_USAGE); + exit(0); + } } for (i = 1; i < argc; i++) { int got_im = 0, got_pid = 0; - if (!strcmpiW(slashTerminateChildren, argv[i])) - WINE_FIXME("/T not supported\n"); - if (!strcmpiW(slashForceTerminate, argv[i])) + argdata = argv[i]; + if (*argdata != '/' && *argdata != '-') + goto invalid; + argdata++; + + if (!strcmpiW(opTerminateChildren, argdata)) + WINE_FIXME("argument T not supported\n"); + if (!strcmpiW(opForceTerminate, argdata)) force_termination = TRUE; /* Options /IM and /PID appear to behave identically, except for * the fact that they cannot be specified at the same time. */ - else if ((got_im = !strcmpiW(slashImage, argv[i])) || - (got_pid = !strcmpiW(slashPID, argv[i]))) + else if ((got_im = !strcmpiW(opImage, argdata)) || + (got_pid = !strcmpiW(opPID, argdata))) { if (!argv[i + 1]) { @@ -501,6 +511,7 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) } else { + invalid: taskkill_message(STRING_INVALID_OPTION); taskkill_message(STRING_USAGE); return FALSE;

1 0

Dmitry Timoshkov : kernel32/tests: Don' t forget to delete a temporary file.
by Alexandre Julliard Jan. 27, 2014

Jan. 27, 2014

Module: wine Branch: master Commit: 294adeec4fff290ee67df3861ce39e59e4600774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=294adeec4fff290ee67df3861… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 21 17:51:27 2014 +0900 kernel32/tests: Don't forget to delete a temporary file. --- dlls/kernel32/tests/file.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 4a6828b..f89e5af 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3843,6 +3843,7 @@ static void test_SetFileValidData(void) { win_skip("cannot enable SE_MANAGE_VOLUME_NAME privilege\n"); CloseHandle(token); + DeleteFileA(filename); return; } handle = CreateFileA(filename, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); @@ -3906,7 +3907,9 @@ static void test_SetFileValidData(void) privs.Privileges[0].Attributes = 0; AdjustTokenPrivileges(token, FALSE, &privs, sizeof(privs), NULL, NULL); + CloseHandle(token); + CloseHandle(handle); DeleteFileA(filename); }

1 0