October 2020 - Wine-commits

Nikolay Sivov : evr/presenter: Create device manager for the presenter.
by Alexandre Julliard 01 Oct '20

01 Oct '20

Module: wine Branch: master Commit: 2ff55d97d7e86fb80fa4f84a769523add3216ce8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ff55d97d7e86fb80fa4f84a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 1 15:59:33 2020 +0300 evr/presenter: Create device manager for the presenter. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/Makefile.in | 2 +- dlls/evr/presenter.c | 21 ++++++++++++++++++++- dlls/evr/tests/evr.c | 37 +++++++++++++++++++++++++++++++++++-- 3 files changed, 56 insertions(+), 4 deletions(-) diff --git a/dlls/evr/Makefile.in b/dlls/evr/Makefile.in index c8178297da..6d936d65b7 100644 --- a/dlls/evr/Makefile.in +++ b/dlls/evr/Makefile.in @@ -1,6 +1,6 @@ MODULE = evr.dll IMPORTLIB = evr -IMPORTS = mfuuid strmiids strmbase uuid dxguid ole32 oleaut32 +IMPORTS = mfuuid strmiids strmbase uuid dxguid ole32 oleaut32 dxva2 DELAYIMPORTS = mfplat EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 5e458f72f1..b60de4b82a 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -22,6 +22,7 @@ #include "d3d9.h" #include "mfapi.h" #include "mferror.h" +#include "dxva2api.h" #include "evr_classes.h" #include "evr_private.h" @@ -55,6 +56,8 @@ struct video_presenter IMFClock *clock; IMediaEventSink *event_sink; + IDirect3DDeviceManager9 *device_manager; + UINT reset_token; unsigned int state; CRITICAL_SECTION cs; }; @@ -174,6 +177,8 @@ static ULONG WINAPI video_presenter_inner_Release(IUnknown *iface) { video_presenter_clear_container(presenter); DeleteCriticalSection(&presenter->cs); + if (presenter->device_manager) + IDirect3DDeviceManager9_Release(presenter->device_manager); heap_free(presenter); } @@ -606,7 +611,14 @@ static ULONG WINAPI video_presenter_getservice_Release(IMFGetService *iface) static HRESULT WINAPI video_presenter_getservice_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) { - FIXME("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + struct video_presenter *presenter = impl_from_IMFGetService(iface); + + TRACE("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + + if (IsEqualGUID(&MR_VIDEO_ACCELERATION_SERVICE, service)) + return IDirect3DDeviceManager9_QueryInterface(presenter->device_manager, riid, obj); + + FIXME("Unimplemented service %s.\n", debugstr_guid(service)); return E_NOTIMPL; } @@ -634,6 +646,7 @@ HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFII HRESULT evr_presenter_create(IUnknown *outer, void **out) { struct video_presenter *object; + HRESULT hr; if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; @@ -649,6 +662,12 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) object->refcount = 1; InitializeCriticalSection(&object->cs); + if (FAILED(hr = DXVA2CreateDirect3DDeviceManager9(&object->reset_token, &object->device_manager))) + { + IUnknown_Release(&object->IUnknown_inner); + return hr; + } + *out = &object->IUnknown_inner; return S_OK; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index b59da51e47..0dff691b59 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -966,9 +966,14 @@ done: static void test_default_presenter(void) { + D3DDEVICE_CREATION_PARAMETERS device_params = { 0 }; IMFVideoPresenter *presenter; IMFRateSupport *rate_support; + IDirect3DDevice9 *d3d_device; + IDirect3DDeviceManager9 *dm; IMFVideoDeviceID *deviceid; + IMFGetService *gs; + HANDLE handle; IUnknown *unk; float rate; HRESULT hr; @@ -1002,9 +1007,37 @@ static void test_default_presenter(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IUnknown_Release(unk); - hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFGetService, (void **)&unk); + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFGetService, (void **)&gs); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); + + hr = IMFGetService_GetService(gs, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, (void **)&dm); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_OpenDeviceHandle(dm, &handle); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_LockDevice(dm, handle, &d3d_device, FALSE); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + +if (SUCCEEDED(hr)) +{ + hr = IDirect3DDevice9_GetCreationParameters(d3d_device, &device_params); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(device_params.hFocusWindow == GetDesktopWindow(), "Unexpected window %p.\n", device_params.hFocusWindow); + + IDirect3DDevice9_Release(d3d_device); + + hr = IDirect3DDeviceManager9_UnlockDevice(dm, handle, FALSE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_CloseDeviceHandle(dm, handle); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +} + IDirect3DDeviceManager9_Release(dm); + + IMFGetService_Release(gs); /* Rate support. */ hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFRateSupport, (void **)&rate_support);

1 0

Jacek Caban : conhost: Call ensure_tty_input_thread in IOCTL_CONDRV_PEEK implementation.
by Alexandre Julliard 01 Oct '20

01 Oct '20

Module: wine Branch: master Commit: 45b8489ba5a1726cb9d0e163de41cb1c0ddaa23b URL: https://source.winehq.org/git/wine.git/?a=commit;h=45b8489ba5a1726cb9d0e163… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 1 15:08:40 2020 +0200 conhost: Call ensure_tty_input_thread in IOCTL_CONDRV_PEEK implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index fadba2728d..86a400307d 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2476,6 +2476,7 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, void *result; TRACE( "peek\n "); if (in_size) return STATUS_INVALID_PARAMETER; + ensure_tty_input_thread( console ); *out_size = min( *out_size, console->record_count * sizeof(INPUT_RECORD) ); if (!(result = alloc_ioctl_buffer( *out_size ))) return STATUS_NO_MEMORY; if (*out_size) memcpy( result, console->records, *out_size );

1 0

Jacek Caban : conhost: Clear out_size in IOCTL_CONDRV_READ_CONSOLE implementation.
by Alexandre Julliard 01 Oct '20

01 Oct '20

Module: wine Branch: master Commit: c9e1b789d285fc43c1d8142eb8b4f2fe969c6c45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9e1b789d285fc43c1d8142e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 1 15:08:50 2020 +0200 conhost: Clear out_size in IOCTL_CONDRV_READ_CONSOLE implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 86a400307d..ac0e22b4c4 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2425,6 +2425,8 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, const void *in_data, size_t in_size, size_t *out_size ) { + NTSTATUS status; + switch (code) { case IOCTL_CONDRV_GET_MODE: @@ -2446,12 +2448,13 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, case IOCTL_CONDRV_READ_CONSOLE: if (in_size || *out_size % sizeof(WCHAR)) return STATUS_INVALID_PARAMETER; ensure_tty_input_thread( console ); - return read_console( console, *out_size ); + status = read_console( console, *out_size ); + *out_size = 0; + return status; case IOCTL_CONDRV_READ_INPUT: { unsigned int blocking; - NTSTATUS status; if (in_size && in_size != sizeof(blocking)) return STATUS_INVALID_PARAMETER; ensure_tty_input_thread( console ); blocking = in_size && *(unsigned int *)in_data;

1 0

Jacek Caban : server: Don't propagate STATUS_PENDING in get_next_console_request request.
by Alexandre Julliard 01 Oct '20

01 Oct '20

Module: wine Branch: master Commit: 95e1de8215ce8b0ece486dcf8c713e98d5dd3a0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=95e1de8215ce8b0ece486dcf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 1 15:10:09 2020 +0200 server: Don't propagate STATUS_PENDING in get_next_console_request request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/console.c b/server/console.c index b0b6de2eef..44cacfbb99 100644 --- a/server/console.c +++ b/server/console.c @@ -2715,10 +2715,11 @@ DECL_HANDLER(get_next_console_request) if (ioctl) { unsigned int status = req->status; + if (status == STATUS_PENDING) status = STATUS_INVALID_PARAMETER; if (ioctl->async) { iosb = async_get_iosb( ioctl->async ); - iosb->status = req->status; + iosb->status = status; iosb->out_size = min( iosb->out_size, get_req_data_size() ); if (iosb->out_size) {

1 0

Jacek Caban : server: Use set_active_screen_buffer for consoles attached to server.
by Alexandre Julliard 01 Oct '20

01 Oct '20

Module: wine Branch: master Commit: fa9f4a20f5305b7cbcfe3a644d39d4b759f89203 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa9f4a20f5305b7cbcfe3a64… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 1 15:10:26 2020 +0200 server: Use set_active_screen_buffer for consoles attached to server. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/server/console.c b/server/console.c index 44cacfbb99..5f295d4184 100644 --- a/server/console.c +++ b/server/console.c @@ -2130,10 +2130,6 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * } case IOCTL_CONDRV_ACTIVATE: - if (screen_buffer->input && screen_buffer->input->server) - return queue_host_ioctl( screen_buffer->input->server, code, screen_buffer->id, - async, &screen_buffer->ioctl_q ); - if (!screen_buffer->input) { set_error( STATUS_INVALID_HANDLE );

1 0

Michael Stefaniuc : comcat/tests: Use wide-char string literals.
by Alexandre Julliard 01 Oct '20

01 Oct '20

Module: wine Branch: master Commit: 9ec0c082106418510231ae12da428f8789bfec4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ec0c082106418510231ae12… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 30 23:14:49 2020 +0200 comcat/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comcat/tests/comcat.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/dlls/comcat/tests/comcat.c b/dlls/comcat/tests/comcat.c index ff5b51a87b..97048cc46b 100644 --- a/dlls/comcat/tests/comcat.c +++ b/dlls/comcat/tests/comcat.c @@ -66,26 +66,10 @@ static void do_enum(void) GUID wanted_guid; ULONG fetched = -1; - static const WCHAR szCatID[] = { - '{', - 'd','e','a','d','c','a','f','e', - '-','0','0','0','0','-','0','0','0','0', - '-','0','0','0','0', - '-','0','0','0','0','0','0','0','0','0','0','0','0', - '}',0}; - static const WCHAR szGuid[] = { - '{', - 'd','e','a','d','c','a','f','e','-', - 'b','e','e','d','-', - 'b','e','a','d','-', - 'd','e','a','d','-', - 'c','a','f','e','b','e','a','d','d','e','a','d', - '}',0}; - IEnumCLSID *pIEnum =(IEnumCLSID*)0xdeadcafe; - CLSIDFromString(szCatID,the_cat); - CLSIDFromString(szGuid,&wanted_guid); + CLSIDFromString(L"{deadcafe-0000-0000-0000-000000000000}", the_cat); + CLSIDFromString(L"{deadcafe-beed-bead-dead-cafebeaddead}", &wanted_guid); OleInitialize(NULL);

1 0

Michael Stefaniuc : comsvcs/tests: Use wide-char string literals.
by Alexandre Julliard 01 Oct '20

01 Oct '20

Module: wine Branch: master Commit: eadbba41246d26523cef48323deea46f2a45b310 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eadbba41246d26523cef4832… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 30 23:14:50 2020 +0200 comsvcs/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/tests/comsvcs.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index ca59951c81..4e9471e734 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -176,9 +176,6 @@ static DWORD WINAPI com_thread(void *arg) static void create_dispenser(void) { - static const WCHAR pool0[] = {'S','C','.','P','o','o','l',' ','0',' ','0',0}; - static const WCHAR pool1[] = {'S','C','.','P','o','o','l',' ','1',' ','1',0}; - static const WCHAR data[] = {'d','a','t','a','1',0}; HRESULT hr; IDispenserManager *dispenser = NULL; IHolder *holder1 = NULL, *holder2 = NULL, *holder3 = NULL; @@ -203,7 +200,7 @@ static void create_dispenser(void) init_test_driver(&driver); - hr = IDispenserManager_RegisterDispenser(dispenser, &driver.IDispenserDriver_iface, pool0, &holder1); + hr = IDispenserManager_RegisterDispenser(dispenser, &driver.IDispenserDriver_iface, L"SC.Pool 0 0", &holder1); ok(hr == S_OK, "got 0x%08x\n", hr); /* The above call creates an MTA thread, but we need to wait for it to @@ -214,11 +211,11 @@ static void create_dispenser(void) GetExitCodeThread(thread, &ret); ok(ret == S_OK, "got unexpected hr %#x\n", ret); - hr = IDispenserManager_RegisterDispenser(dispenser, &driver.IDispenserDriver_iface, pool0, &holder2); + hr = IDispenserManager_RegisterDispenser(dispenser, &driver.IDispenserDriver_iface, L"SC.Pool 0 0", &holder2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(holder1 != holder2, "same holder object returned\n"); - hr = IDispenserManager_RegisterDispenser(dispenser, &driver.IDispenserDriver_iface, pool1, &holder3); + hr = IDispenserManager_RegisterDispenser(dispenser, &driver.IDispenserDriver_iface, L"SC.Pool 1 1", &holder3); ok(hr == S_OK, "got 0x%08x\n", hr); if(holder1) @@ -226,7 +223,7 @@ static void create_dispenser(void) SET_EXPECT(driver_CreateResource); SET_EXPECT(driver_Release); - str = SysAllocString(data); + str = SysAllocString(L"data1"); hr = IHolder_AllocResource(holder1, (RESTYPID)str, &resid); ok(hr == S_OK, "got 0x%08x\n", hr); ok(resid == 10, "got %d\n", (int)resid); @@ -254,7 +251,7 @@ static void create_dispenser(void) SET_EXPECT(driver_CreateResource); SET_EXPECT(driver_Release); - str = SysAllocString(data); + str = SysAllocString(L"data1"); hr = IHolder_AllocResource(holder2, (RESTYPID)str, &resid); ok(hr == S_OK, "got 0x%08x\n", hr); ok(resid == 10, "got %d\n", (int)resid);

1 0

Michael Stefaniuc : d3dx10/tests: Use wide-char string literals.
by Alexandre Julliard 01 Oct '20

01 Oct '20

Module: wine Branch: master Commit: 6325887e3de4e96d2b7e173c878251a562a84a1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6325887e3de4e96d2b7e173c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 30 23:14:51 2020 +0200 d3dx10/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 897c54249b..54cb4df3b7 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1340,7 +1340,6 @@ static void test_D3DX10CreateAsyncFileLoader(void) static void test_D3DX10CreateAsyncResourceLoader(void) { - static const WCHAR resource_name[] = {'n','o','n','a','m','e',0}; ID3DX10DataLoader *loader; HRESULT hr; @@ -1359,7 +1358,7 @@ static void test_D3DX10CreateAsyncResourceLoader(void) hr = D3DX10CreateAsyncResourceLoaderW(NULL, NULL, &loader); ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); - hr = D3DX10CreateAsyncResourceLoaderW(NULL, resource_name, &loader); + hr = D3DX10CreateAsyncResourceLoaderW(NULL, L"noname", &loader); ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); }

1 0

Michael Stefaniuc : d3dx11/tests: Use wide-char string literals.
by Alexandre Julliard 01 Oct '20

01 Oct '20

Module: wine Branch: master Commit: 052d9e6f3dcabde95a74981f925a0ca066a591ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=052d9e6f3dcabde95a74981f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 30 23:14:52 2020 +0200 d3dx11/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_43/tests/d3dx11.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx11_43/tests/d3dx11.c b/dlls/d3dx11_43/tests/d3dx11.c index db06c97144..06924877da 100644 --- a/dlls/d3dx11_43/tests/d3dx11.c +++ b/dlls/d3dx11_43/tests/d3dx11.c @@ -129,13 +129,12 @@ static void test_D3DX11CreateAsyncMemoryLoader(void) static void create_testfile(WCHAR *path, const void *data, int data_len) { - static const WCHAR test_filename[] = {'a','s','y','n','c','l','o','a','d','e','r','.','d','a','t','a',0}; DWORD written; HANDLE file; BOOL ret; GetTempPathW(MAX_PATH, path); - lstrcatW(path, test_filename); + lstrcatW(path, L"asyncloader.data"); file = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); ok(file != INVALID_HANDLE_VALUE, "Test file creation failed, at %s, error %d.\n", @@ -240,7 +239,6 @@ static void test_D3DX11CreateAsyncFileLoader(void) static void test_D3DX11CreateAsyncResourceLoader(void) { - static const WCHAR resource_name[] = {'n','o','n','a','m','e',0}; ID3DX11DataLoader *loader; HRESULT hr; @@ -259,7 +257,7 @@ static void test_D3DX11CreateAsyncResourceLoader(void) hr = D3DX11CreateAsyncResourceLoaderW(NULL, NULL, &loader); ok(hr == D3DX11_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); - hr = D3DX11CreateAsyncResourceLoaderW(NULL, resource_name, &loader); + hr = D3DX11CreateAsyncResourceLoaderW(NULL, L"noname", &loader); ok(hr == D3DX11_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); }

1 0

Michael Stefaniuc : d3dx9/tests: Use wide-char string literals.
by Alexandre Julliard 01 Oct '20

01 Oct '20

Module: wine Branch: master Commit: bffe111672972cb26c319c029ca469520742c720 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bffe111672972cb26c319c02… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 30 23:14:53 2020 +0200 d3dx9/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/asm.c | 6 ++---- dlls/d3dx9_36/tests/effect.c | 8 +++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 4087bd89b0..9b4e82f218 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -195,7 +195,6 @@ static void assembleshader_test(void) }; struct D3DXIncludeImpl include; char shader_vsh_path[MAX_PATH], shader3_vsh_path[MAX_PATH]; - static const WCHAR shader_filename_w[] = {'s','h','a','d','e','r','.','v','s','h',0}; /* pDefines test */ shader = NULL; @@ -356,7 +355,7 @@ static void assembleshader_test(void) shader = NULL; messages = NULL; - hr = D3DXAssembleShaderFromFileW(shader_filename_w, NULL, &include.ID3DXInclude_iface, + hr = D3DXAssembleShaderFromFileW(L"shader.vsh", NULL, &include.ID3DXInclude_iface, D3DXSHADER_SKIPVALIDATION, &shader, &messages); ok(hr == D3D_OK, "D3DXAssembleShaderFromFile + pInclude main shader test failed with error 0x%x - %d\n", hr, hr & 0x0000ffff); @@ -445,7 +444,6 @@ static void d3dxpreprocess_test(void) ID3DXBuffer *shader, *messages; char shader_vsh_path[MAX_PATH], shader3_vsh_path[MAX_PATH]; static struct D3DXIncludeImpl include = {{&D3DXInclude_Vtbl}}; - static const WCHAR shader_filename_w[] = {'s','h','a','d','e','r','.','v','s','h',0}; if (create_file("shader.vsh", testshader, sizeof(testshader) - 1, shader_vsh_path)) { @@ -520,7 +518,7 @@ static void d3dxpreprocess_test(void) shader = NULL; messages = NULL; - hr = D3DXPreprocessShaderFromFileW(shader_filename_w, NULL, &include.ID3DXInclude_iface, + hr = D3DXPreprocessShaderFromFileW(L"shader.vsh", NULL, &include.ID3DXInclude_iface, &shader, &messages); ok(hr == D3D_OK, "D3DXPreprocessShaderFromFile + pInclude main shader test failed with error 0x%x - %d\n", hr, hr & 0x0000ffff); diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index c72049d553..ae6f65d52d 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -7740,8 +7740,6 @@ static void test_create_effect_from_file(void) " VertexShader = compile vs_2_0 vs_main();\n" " }\n" "}\n"; - static const WCHAR effect1_filename_w[] = {'e','f','f','e','c','t','1','.','f','x',0}; - static const WCHAR effect2_filename_w[] = {'e','f','f','e','c','t','2','.','f','x',0}; WCHAR effect_path_w[MAX_PATH], filename_w[MAX_PATH]; char effect_path[MAX_PATH], filename[MAX_PATH]; D3DPRESENT_PARAMETERS present_parameters = {0}; @@ -7798,7 +7796,7 @@ static void test_create_effect_from_file(void) create_file("include1.h", include1_wrong, sizeof(include1_wrong) - 1, NULL); lstrcpyW(filename_w, effect_path_w); - lstrcatW(filename_w, effect1_filename_w); + lstrcatW(filename_w, L"effect1.fx"); effect = NULL; messages = NULL; hr = D3DXCreateEffectFromFileExW(device, filename_w, NULL, NULL, NULL, @@ -7813,7 +7811,7 @@ static void test_create_effect_from_file(void) effect->lpVtbl->Release(effect); lstrcpyW(filename_w, effect_path_w); - lstrcatW(filename_w, effect2_filename_w); + lstrcatW(filename_w, L"effect2.fx"); effect = NULL; messages = NULL; /* This is apparently broken on native, it ends up using the wrong include. */ @@ -7835,7 +7833,7 @@ static void test_create_effect_from_file(void) delete_file("include2.h"); delete_directory("include"); - lstrcpyW(filename_w, effect2_filename_w); + lstrcpyW(filename_w, L"effect2.fx"); effect = NULL; messages = NULL; include.ID3DXInclude_iface.lpVtbl = &d3dxinclude_vtbl;

1 0