January 2018 - Wine-Devel - list.winehq.org

[PATCH] kernel32/tests: Make sure the child process is done running its tests before terminating it.
by Zebediah Figura Jan. 22, 2018

Jan. 22, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/tests/pipe.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 922eed9..1708c28 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -2962,10 +2962,15 @@ static void child_process_write_pipe(HANDLE pipe) { OVERLAPPED overlapped; char buf[10000]; + HANDLE event; memset(buf, 'x', sizeof(buf)); overlapped_write_async(pipe, buf, sizeof(buf), &overlapped); + event = OpenEventA(EVENT_MODIFY_STATE, FALSE, "wine_test_pipe_event"); + SetEvent(event); + CloseHandle(event); + /* sleep until parent process terminates this process */ Sleep(INFINITE); } @@ -3024,6 +3029,7 @@ static void test_overlapped_transport(BOOL msg_mode, BOOL msg_read_mode) HANDLE process; char buf[60000]; BOOL res; + HANDLE event; DWORD create_flags = (msg_mode ? PIPE_TYPE_MESSAGE : PIPE_TYPE_BYTE) | @@ -3074,6 +3080,7 @@ static void test_overlapped_transport(BOOL msg_mode, BOOL msg_read_mode) /* terminate process with pending write */ create_overlapped_pipe(create_flags, &client, &server); + event = CreateEventA(NULL, FALSE, FALSE, "wine_test_pipe_event"); process = create_writepipe_process(client); /* successfully read part of write that is pending in child process */ res = ReadFile(server, buf, 10, &read_bytes, NULL); @@ -3082,6 +3089,7 @@ static void test_overlapped_transport(BOOL msg_mode, BOOL msg_read_mode) else ok(!res && GetLastError() == ERROR_MORE_DATA, "ReadFile returned: %x %u\n", res, GetLastError()); ok(read_bytes == 10, "read_bytes = %u\n", read_bytes); + ok(WaitForSingleObject(event, 1000) == WAIT_OBJECT_0, "Wait failed\n"); TerminateProcess(process, 0); winetest_wait_child_process(process); /* after terminating process, there is no pending write and pipe buffer is empty */ -- 2.7.4

3 2

Vulkan ICD update
by Roderick Colenbrander Jan. 22, 2018

Jan. 22, 2018

Hi all, Last year I shared my wine-vulkan icd work (https://github.com/roderickc/wine-vulkan) Since then I made many changes and the code is in a much better shape now. I would like to ask people interested in Vulkan to try it out and report issues (on github). I just want to make sure the core Vulkan code is working properly now before I start submitting patches to Wine in the future. In particular I would like to know the stability of the nasty 32-bit struct conversion code (enabled on 64-bit as well for testing). If it works correctly I can finally rebase these nasty changes across the other commits, which is something I would like to do only once. Other improvements like support for child window rendering and more extensions are in the pipeline. Changes: - Rebased on Wine 3.0 - Perform win32 <-> host struct conversion when needed. - Improved driver model, where WSI ('WGL') now lives in the graphics driver. - Improved X11 integration including client window rendering. - Support for major games including Doom 4, Wolfenstein II and Talos Principle. - Many other bug fixes. Thanks, Roderick

1 0

[PATCH] schtasks: Added support for /f argument in create command.
by Jacek Caban Jan. 22, 2018

Jan. 22, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/schtasks/schtasks.c | 7 ++++++- programs/schtasks/tests/schtasks.c | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[PATCH] xinput: XInputGetStateEx takes the same struct as XInputGetState
by Andrew Eikum Jan. 22, 2018

Jan. 22, 2018

XINPUT_STATE_EX has four extra bytes for padding, but is otherwise identical to XINPUT_STATE. It was introduced in a libSDL header in 2012, for use with the undocumented function at xinput ordinal 100, which we call XInputGetStateEx. In Wine tests, native XInputGetStateEx does not write to these padding bytes. Some real win32 applications[1] do not allocate those bytes, and they do not crash when using native XInputGetStateEx. So I believe the evidence is that this struct doesn't exist in native xinput, and both versions of this function use XINPUT_STATE. [1] mGetState here is ordinal 100, note XINPUT_STATE is used: https://github.com/speps/XInputDotNet/blob/master/XInputInterface/GamePad.c… This library is used in real games like THOTH, available on Steam. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xinput1_3/tests/xinput.c | 34 +++++++++++++++------------------- dlls/xinput1_3/xinput_main.c | 14 ++++---------- include/xinput.h | 18 +----------------- 3 files changed, 20 insertions(+), 46 deletions(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index 87f9929782..f26fda90eb 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -24,7 +24,7 @@ #include "wine/test.h" static DWORD (WINAPI *pXInputGetState)(DWORD, XINPUT_STATE*); -static DWORD (WINAPI *pXInputGetStateEx)(DWORD, XINPUT_STATE_EX*); +static DWORD (WINAPI *pXInputGetStateEx)(DWORD, XINPUT_STATE*); static DWORD (WINAPI *pXInputGetCapabilities)(DWORD,DWORD,XINPUT_CAPABILITIES*); static DWORD (WINAPI *pXInputSetState)(DWORD, XINPUT_VIBRATION*); static void (WINAPI *pXInputEnable)(BOOL); @@ -91,23 +91,19 @@ static void test_set_state(void) static void test_get_state(void) { - union - { - XINPUT_STATE state; - XINPUT_STATE_EX state_ex; - } xinput; + XINPUT_STATE state; DWORD controllerNum, i, result, good = XUSER_MAX_COUNT; for (i = 0; i < (pXInputGetStateEx ? 2 : 1); i++) { for (controllerNum = 0; controllerNum < XUSER_MAX_COUNT; controllerNum++) { - ZeroMemory(&xinput, sizeof(xinput)); + ZeroMemory(&state, sizeof(state)); if (i == 0) - result = pXInputGetState(controllerNum, &xinput.state); + result = pXInputGetState(controllerNum, &state); else - result = pXInputGetStateEx(controllerNum, &xinput.state_ex); + result = pXInputGetStateEx(controllerNum, &state); ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "%s failed with (%d)\n", i == 0 ? "XInputGetState" : "XInputGetStateEx", result); @@ -125,39 +121,39 @@ static void test_get_state(void) } else trace("XInputGetStateEx: %d\n", result); - trace("State->dwPacketNumber: %d\n", xinput.state.dwPacketNumber); - dump_gamepad(&xinput.state.Gamepad); + trace("State->dwPacketNumber: %d\n", state.dwPacketNumber); + dump_gamepad(&state.Gamepad); } } - result = pXInputGetState(XUSER_MAX_COUNT, &xinput.state); + result = pXInputGetState(XUSER_MAX_COUNT, &state); ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result); - result = pXInputGetState(XUSER_MAX_COUNT+1, &xinput.state); + result = pXInputGetState(XUSER_MAX_COUNT+1, &state); ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result); if (pXInputGetStateEx) { - result = pXInputGetStateEx(XUSER_MAX_COUNT, &xinput.state_ex); + result = pXInputGetStateEx(XUSER_MAX_COUNT, &state); ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result); - result = pXInputGetStateEx(XUSER_MAX_COUNT+1, &xinput.state_ex); + result = pXInputGetStateEx(XUSER_MAX_COUNT+1, &state); ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result); } if (winetest_interactive && good < XUSER_MAX_COUNT) { DWORD now = GetTickCount(), packet = 0; - XINPUT_GAMEPAD *game = &xinput.state.Gamepad; + XINPUT_GAMEPAD *game = &state.Gamepad; trace("You have 20 seconds to test the joystick freely\n"); do { Sleep(100); - pXInputGetState(good, &xinput.state); - if (xinput.state.dwPacketNumber == packet) + pXInputGetState(good, &state); + if (state.dwPacketNumber == packet) continue; - packet = xinput.state.dwPacketNumber; + packet = state.dwPacketNumber; trace("Buttons 0x%04X Triggers %3d/%3d LT %6d/%6d RT %6d/%6d\n", game->wButtons, game->bLeftTrigger, game->bRightTrigger, game->sThumbLX, game->sThumbLY, game->sThumbRX, game->sThumbRY); diff --git a/dlls/xinput1_3/xinput_main.c b/dlls/xinput1_3/xinput_main.c index 402bd2f468..a0a0877cf4 100644 --- a/dlls/xinput1_3/xinput_main.c +++ b/dlls/xinput1_3/xinput_main.c @@ -73,34 +73,28 @@ DWORD WINAPI XInputSetState(DWORD index, XINPUT_VIBRATION* vibration) DWORD WINAPI DECLSPEC_HOTPATCH XInputGetState(DWORD index, XINPUT_STATE* state) { - union - { - XINPUT_STATE state; - XINPUT_STATE_EX state_ex; - } xinput; DWORD ret; static int warn_once; if (!warn_once++) FIXME("(index %u, state %p) Stub!\n", index, state); - ret = XInputGetStateEx(index, &xinput.state_ex); + ret = XInputGetStateEx(index, state); if (ret != ERROR_SUCCESS) return ret; /* The main difference between this and the Ex version is the media guide button */ - xinput.state.Gamepad.wButtons &= ~XINPUT_GAMEPAD_GUIDE; - *state = xinput.state; + state->Gamepad.wButtons &= ~XINPUT_GAMEPAD_GUIDE; return ERROR_SUCCESS; } -DWORD WINAPI DECLSPEC_HOTPATCH XInputGetStateEx(DWORD index, XINPUT_STATE_EX* state_ex) +DWORD WINAPI DECLSPEC_HOTPATCH XInputGetStateEx(DWORD index, XINPUT_STATE* state) { static int warn_once; if (!warn_once++) - FIXME("(index %u, state %p) Stub!\n", index, state_ex); + FIXME("(index %u, state %p) Stub!\n", index, state); if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; diff --git a/include/xinput.h b/include/xinput.h index ccdc023343..99ff0cc7cf 100644 --- a/include/xinput.h +++ b/include/xinput.h @@ -170,27 +170,11 @@ typedef struct _XINPUT_GAMEPAD { SHORT sThumbRY; } XINPUT_GAMEPAD, *PXINPUT_GAMEPAD; -typedef struct _XINPUT_GAMEPAD_EX { - WORD wButtons; - BYTE bLeftTrigger; - BYTE bRightTrigger; - SHORT sThumbLX; - SHORT sThumbLY; - SHORT sThumbRX; - SHORT sThumbRY; - DWORD dwPaddingReserved; -} XINPUT_GAMEPAD_EX, *PXINPUT_GAMEPAD_EX; - typedef struct _XINPUT_STATE { DWORD dwPacketNumber; XINPUT_GAMEPAD Gamepad; } XINPUT_STATE, *PXINPUT_STATE; -typedef struct _XINPUT_STATE_EX { - DWORD dwPacketNumber; - XINPUT_GAMEPAD_EX Gamepad; -} XINPUT_STATE_EX, *PXINPUT_STATE_EX; - /* * Defines the structure of how much vibration is set on both the * right and left motors in a joystick. If you're not using a 360 @@ -248,7 +232,7 @@ DWORD WINAPI XInputGetCapabilities(DWORD, DWORD, XINPUT_CAPABILITIES*); DWORD WINAPI XInputGetDSoundAudioDeviceGuids(DWORD, GUID*, GUID*); DWORD WINAPI XInputGetBatteryInformation(DWORD, BYTE, XINPUT_BATTERY_INFORMATION*); -DWORD WINAPI XInputGetStateEx(DWORD, XINPUT_STATE_EX*); +DWORD WINAPI XInputGetStateEx(DWORD, XINPUT_STATE*); #ifdef __cplusplus } -- 2.16.0

1 0

[PATCH v5 4/5] winebus.sys: Process device reports for linux event devices
by Aric Stewart Jan. 22, 2018

Jan. 22, 2018

v4: After review from Andrew Eikum Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 235 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 229 insertions(+), 6 deletions(-)

2 1

[PATCH v5 3/5] winebus.sys: Implement get_string for linux event devices
by Aric Stewart Jan. 22, 2018

Jan. 22, 2018

v5: Update from Andrew Eikum Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-)

2 1

[PATCH v5 2/5] winebus.sys: Build device reports for linux event devices
by Aric Stewart Jan. 22, 2018

Jan. 22, 2018

v5: After review from Andrew Eikum Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 471 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 469 insertions(+), 2 deletions(-)

2 1

[PATCH v5 1/5] winebus.sys: Handle linux input event device via udev
by Aric Stewart Jan. 22, 2018

Jan. 22, 2018

v5: After review from Andrew Eikum Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus.h | 6 ++ dlls/winebus.sys/bus_udev.c | 172 +++++++++++++++++++++++++++++++++++++++++--- dlls/winebus.sys/main.c | 48 +++++++++++++ 3 files changed, 218 insertions(+), 8 deletions(-)

2 1

[PATCH v2] xaudio2: Partially implement XA2SRC_SetChannelVolumes().
by Masanori Kakura Jan. 22, 2018

Jan. 22, 2018

Fixes https://bugs.winehq.org/show_bug.cgi?id=44277 Thanks to Fabian Maurer and Andrew Eikum. v2 - Also test XA27 - Disable input validation in XA27 - Fix XA27-related tests Signed-off-by: Masanori Kakura <kakurasan(a)gmail.com> --- dlls/xaudio2_7/tests/xaudio2.c | 72 ++++++++++++++++++++++++++++++++++++++++++ dlls/xaudio2_7/xaudio_dll.c | 28 ++++++++++++++++ 2 files changed, 100 insertions(+) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index ff402f87c4..ccc415afaa 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -1165,6 +1165,76 @@ static void test_xapo_creation(void) test_xapo_creation_modern("xaudio2_8.dll"); } +static void test_setchannelvolumes(IXAudio2 *xa) +{ + HRESULT hr; + IXAudio2MasteringVoice *master; + IXAudio2SourceVoice *src_2ch, *src_8ch; + WAVEFORMATEX fmt_2ch, fmt_8ch; + float volumes[] = {0.1f, 0.2f, 0.3f, 0.4f, 0.5f, 0.6f, 0.7f, 0.8f}; + + if(xaudio27) + hr = IXAudio27_CreateMasteringVoice((IXAudio27*)xa, &master, 8, 44100, 0, 0, NULL); + else + hr = IXAudio2_CreateMasteringVoice(xa, &master, 8, 44100, 0, NULL, NULL, AudioCategory_GameEffects); + ok(hr == S_OK, "CreateMasteringVoice failed: %08x\n", hr); + + fmt_2ch.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; + fmt_2ch.nChannels = 2; + fmt_2ch.nSamplesPerSec = 44100; + fmt_2ch.wBitsPerSample = 32; + fmt_2ch.nBlockAlign = fmt_2ch.nChannels * fmt_2ch.wBitsPerSample / 8; + fmt_2ch.nAvgBytesPerSec = fmt_2ch.nSamplesPerSec * fmt_2ch.nBlockAlign; + fmt_2ch.cbSize = 0; + + fmt_8ch.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; + fmt_8ch.nChannels = 8; + fmt_8ch.nSamplesPerSec = 44100; + fmt_8ch.wBitsPerSample = 32; + fmt_8ch.nBlockAlign = fmt_8ch.nChannels * fmt_8ch.wBitsPerSample / 8; + fmt_8ch.nAvgBytesPerSec = fmt_8ch.nSamplesPerSec * fmt_8ch.nBlockAlign; + fmt_8ch.cbSize = 0; + + XA2CALL(CreateSourceVoice, &src_2ch, &fmt_2ch, 0, 1.f, NULL, NULL, NULL); + ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); + + XA2CALL(CreateSourceVoice, &src_8ch, &fmt_8ch, 0, 1.f, NULL, NULL, NULL); + ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); + + hr = IXAudio2SourceVoice_SetChannelVolumes(src_2ch, 2, volumes, XAUDIO2_COMMIT_NOW); + ok(hr == S_OK, "SetChannelVolumes failed: %08x\n", hr); + + hr = IXAudio2SourceVoice_SetChannelVolumes(src_8ch, 8, volumes, XAUDIO2_COMMIT_NOW); + ok(hr == S_OK, "SetChannelVolumes failed: %08x\n", hr); + + if(xaudio27){ + /* XAudio 2.7 doesn't check the number of channels */ + hr = IXAudio2SourceVoice_SetChannelVolumes(src_8ch, 2, volumes, XAUDIO2_COMMIT_NOW); + ok(hr == S_OK, "SetChannelVolumes failed: %08x\n", hr); + }else{ + /* the number of channels must be the same as the number of channels on the source voice */ + hr = IXAudio2SourceVoice_SetChannelVolumes(src_8ch, 2, volumes, XAUDIO2_COMMIT_NOW); + ok(hr == XAUDIO2_E_INVALID_CALL, "SetChannelVolumes should have failed: %08x\n", hr); + + hr = IXAudio2SourceVoice_SetChannelVolumes(src_2ch, 8, volumes, XAUDIO2_COMMIT_NOW); + ok(hr == XAUDIO2_E_INVALID_CALL, "SetChannelVolumes should have failed: %08x\n", hr); + + /* volumes must not be NULL, XAudio 2.7 doesn't check this */ + hr = IXAudio2SourceVoice_SetChannelVolumes(src_2ch, 2, NULL, XAUDIO2_COMMIT_NOW); + ok(hr == XAUDIO2_E_INVALID_CALL, "SetChannelVolumes should have failed: %08x\n", hr); + } + + if(xaudio27){ + IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src_2ch); + IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src_8ch); + }else{ + IXAudio2SourceVoice_DestroyVoice(src_2ch); + IXAudio2SourceVoice_DestroyVoice(src_8ch); + } + + IXAudio2MasteringVoice_DestroyVoice(master); +} + static UINT32 check_has_devices(IXAudio2 *xa) { HRESULT hr; @@ -1213,6 +1283,7 @@ START_TEST(xaudio2) test_looping((IXAudio2*)xa27); test_submix((IXAudio2*)xa27); test_flush((IXAudio2*)xa27); + test_setchannelvolumes((IXAudio2*)xa27); }else skip("No audio devices available\n"); @@ -1237,6 +1308,7 @@ START_TEST(xaudio2) test_looping(xa); test_submix(xa); test_flush(xa); + test_setchannelvolumes(xa); }else skip("No audio devices available\n"); diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index bc5cf1cae9..9b7a07f7b3 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -337,7 +337,35 @@ static HRESULT WINAPI XA2SRC_SetChannelVolumes(IXAudio2SourceVoice *iface, UINT32 Channels, const float *pVolumes, UINT32 OperationSet) { XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + ALfloat al_gain; + UINT32 i; + BOOL same_volumes_given = TRUE; + TRACE("%p, %u, %p, 0x%x\n", This, Channels, pVolumes, OperationSet); + +#if XAUDIO2_VER > 7 + if(Channels != This->fmt->nChannels || !pVolumes) + return COMPAT_E_INVALID_CALL; +#endif + + al_gain = *pVolumes; + + /* check whether all volumes are the same */ + for(i = 1; i < Channels; ++i){ + if(al_gain != *(pVolumes + i)){ + same_volumes_given = FALSE; + break; + } + } + if(!same_volumes_given){ + WARN("Different volumes for channels unsupported, setting the highest volume.\n"); + for(; i < Channels; ++i) + al_gain = max(al_gain, *(pVolumes + i)); + } + + palcSetThreadContext(This->xa2->al_ctx); + alSourcef(This->al_src, AL_GAIN, al_gain); + return S_OK; } -- 2.14.1

2 1

[PATCH 1/5] d3d11: Prefer D3D11 interfaces.
by Józef Kucia Jan. 22, 2018

Jan. 22, 2018

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 4 ++-- dlls/d3d11/device.c | 20 ++++++++++---------- dlls/d3d11/texture.c | 10 +++++----- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index e7fd3a7f4c79..a184b9377a02 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -126,9 +126,9 @@ struct d3d_texture2d ID3D11Device *device; }; -static inline struct d3d_texture2d *impl_from_ID3D10Texture2D(ID3D10Texture2D *iface) +static inline struct d3d_texture2d *impl_from_ID3D11Texture2D(ID3D11Texture2D *iface) { - return CONTAINING_RECORD(iface, struct d3d_texture2d, ID3D10Texture2D_iface); + return CONTAINING_RECORD(iface, struct d3d_texture2d, ID3D11Texture2D_iface); } HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DESC *desc, diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index b2a40b3c6d31..86778f313355 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -5767,8 +5767,8 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic { struct d3d_device *device = device_from_wined3d_device_parent(device_parent); struct d3d_texture2d *texture; - ID3D10Texture2D *texture_iface; - D3D10_TEXTURE2D_DESC desc; + ID3D11Texture2D *texture_iface; + D3D11_TEXTURE2D_DESC desc; HRESULT hr; FIXME("device_parent %p, container_parent %p, wined3d_desc %p, texture flags %#x, " @@ -5784,32 +5784,32 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic desc.Format = dxgi_format_from_wined3dformat(wined3d_desc->format); desc.SampleDesc.Count = wined3d_desc->multisample_type ? wined3d_desc->multisample_type : 1; desc.SampleDesc.Quality = wined3d_desc->multisample_quality; - desc.Usage = D3D10_USAGE_DEFAULT; - desc.BindFlags = D3D10_BIND_RENDER_TARGET; + desc.Usage = D3D11_USAGE_DEFAULT; + desc.BindFlags = D3D11_BIND_RENDER_TARGET; desc.CPUAccessFlags = 0; desc.MiscFlags = 0; if (texture_flags & WINED3D_TEXTURE_CREATE_GET_DC) { - desc.MiscFlags |= D3D10_RESOURCE_MISC_GDI_COMPATIBLE; + desc.MiscFlags |= D3D11_RESOURCE_MISC_GDI_COMPATIBLE; texture_flags &= ~WINED3D_TEXTURE_CREATE_GET_DC; } if (texture_flags) FIXME("Unhandled flags %#x.\n", texture_flags); - if (FAILED(hr = d3d10_device_CreateTexture2D(&device->ID3D10Device1_iface, + if (FAILED(hr = d3d11_device_CreateTexture2D(&device->ID3D11Device_iface, &desc, NULL, &texture_iface))) { - WARN("CreateTexture2D failed, returning %#x.\n", hr); + WARN("Failed to create 2D texture, hr %#x.\n", hr); return hr; } - texture = impl_from_ID3D10Texture2D(texture_iface); + texture = impl_from_ID3D11Texture2D(texture_iface); *wined3d_texture = texture->wined3d_texture; wined3d_texture_incref(*wined3d_texture); - ID3D10Texture2D_Release(&texture->ID3D10Texture2D_iface); + ID3D11Texture2D_Release(&texture->ID3D11Texture2D_iface); return S_OK; } @@ -5823,7 +5823,7 @@ static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent TRACE("device_parent %p, desc %p, swapchain %p.\n", device_parent, desc, swapchain); - if (FAILED(hr = d3d10_device_QueryInterface(&device->ID3D10Device1_iface, + if (FAILED(hr = d3d11_device_QueryInterface(&device->ID3D11Device_iface, &IID_IWineDXGIDevice, (void **)&wine_device))) { ERR("Device should implement IWineDXGIDevice.\n"); diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 17fb4b1da37c..2644b52dfa25 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -27,11 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); /* ID3D11Texture2D methods */ -static inline struct d3d_texture2d *impl_from_ID3D11Texture2D(ID3D11Texture2D *iface) -{ - return CONTAINING_RECORD(iface, struct d3d_texture2d, ID3D11Texture2D_iface); -} - static HRESULT STDMETHODCALLTYPE d3d11_texture2d_QueryInterface(ID3D11Texture2D *iface, REFIID riid, void **object) { struct d3d_texture2d *texture = impl_from_ID3D11Texture2D(iface); @@ -251,6 +246,11 @@ struct d3d_texture2d *unsafe_impl_from_ID3D11Texture2D(ID3D11Texture2D *iface) /* IUnknown methods */ +static inline struct d3d_texture2d *impl_from_ID3D10Texture2D(ID3D10Texture2D *iface) +{ + return CONTAINING_RECORD(iface, struct d3d_texture2d, ID3D10Texture2D_iface); +} + static HRESULT STDMETHODCALLTYPE d3d10_texture2d_QueryInterface(ID3D10Texture2D *iface, REFIID riid, void **object) { struct d3d_texture2d *texture = impl_from_ID3D10Texture2D(iface); -- 2.13.6

2 9