March 2020 - Wine-devel - list.winehq.org

[PATCH 1/2] windowscodecs: Add test for WriteSource with indexed formats.
by Vincent Povirk 05 Mar '20

05 Mar '20

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/windowscodecs/tests/bmpformat.c | 180 +++++++++++++++++++++++++++ 1 file changed, 180 insertions(+) diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index 8bac7a3853e..9de138130e5 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -1085,6 +1085,185 @@ static void test_create_decoder(void) IWICImagingFactory_Release(factory); } +static void test_writesource_palette(void) +{ + IWICImagingFactory *factory; + HRESULT hr; + WICColor encode_palette[2] = {0xff111111, 0xffcccccc}; + WICColor source_palette[2] = {0xff555555, 0xffaaaaaa}; + WICColor result_palette[2]; + UINT result_colors; + IWICBitmap *bitmap; + IWICPalette *palette; + IStream *stream; + IWICBitmapEncoder *encoder; + IWICBitmapFrameEncode *frame_encode; + IPropertyBag2 *encode_options; + GUID pixelformat; + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame_decode; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&factory); + ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); + + /* Encoder with palette set */ + hr = IWICImagingFactory_CreateBitmap(factory, 1, 1, &GUID_WICPixelFormat1bppIndexed, + WICBitmapCacheOnDemand, &bitmap); + ok(hr == S_OK, "CreateBitmap error %#x\n", hr); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "CreateStream error %#x\n", hr); + + hr = IWICImagingFactory_CreateEncoder(factory, &GUID_ContainerFormatBmp, &GUID_VendorMicrosoft, &encoder); + ok(hr == S_OK, "CreateDecoder error %#x\n", hr); + + hr = IWICBitmapEncoder_Initialize(encoder, stream, WICBitmapEncoderNoCache); + ok(hr == S_OK, "IWICBitmapEncoder_Initialize error %#x\n", hr); + + hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frame_encode, &encode_options); + ok(hr == S_OK, "CreateNewFrame error %#x\n", hr); + + hr = IWICBitmapFrameEncode_Initialize(frame_encode, encode_options); + ok(hr == S_OK, "IWICBitmapFrameEncode_Initialize error %#x\n", hr); + + IPropertyBag2_Release(encode_options); + + hr = IWICBitmapFrameEncode_SetSize(frame_encode, 1, 1); + ok(hr == S_OK, "SetSize error %#x\n", hr); + + pixelformat = GUID_WICPixelFormat1bppIndexed; + hr = IWICBitmapFrameEncode_SetPixelFormat(frame_encode, &pixelformat); + ok(hr == S_OK, "SetPixelFormat error %#x\n", hr); + ok(!memcmp(&pixelformat, &GUID_WICPixelFormat1bppIndexed, sizeof(pixelformat)), "pixel format changed\n"); + + hr = IWICPalette_InitializeCustom(palette, encode_palette, 2); + ok(hr == S_OK, "InitializeCustom error %#x\n", hr); + + hr = IWICBitmapFrameEncode_SetPalette(frame_encode, palette); + ok(hr == S_OK, "SetPalette error %#x\n", hr); + + hr = IWICPalette_InitializeCustom(palette, source_palette, 2); + ok(hr == S_OK, "InitializeCustom error %#x\n", hr); + + hr = IWICBitmap_SetPalette(bitmap, palette); + ok(hr == S_OK, "SetPalette error %#x\n", hr); + + hr = IWICBitmapFrameEncode_WriteSource(frame_encode, (IWICBitmapSource*)bitmap, NULL); + ok(hr == S_OK, "WriteSource error %#x\n", hr); + + hr = IWICBitmapFrameEncode_Commit(frame_encode); + ok(hr == S_OK, "Commit error %#x\n", hr); + + IWICBitmapFrameEncode_Release(frame_encode); + + hr = IWICBitmapEncoder_Commit(encoder); + ok(hr == S_OK, "Commit error %#x\n", hr); + + IWICBitmapEncoder_Release(encoder); + + hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, WICDecodeMetadataCacheOnLoad, &decoder); + ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame_decode); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_CopyPalette(frame_decode, palette); + ok(hr == S_OK, "CopyPalette error %#x\n", hr); + + hr = IWICPalette_GetColors(palette, 2, result_palette, &result_colors); + ok(hr == S_OK, "GetColors error %#x\n", hr); + ok(result_colors == 2, "Got %i colors\n", result_colors); + ok(result_palette[0] == encode_palette[0], "Unexpected palette entry: %x\n", result_palette[0]); + ok(result_palette[1] == encode_palette[1], "Unexpected palette entry: %x\n", result_palette[0]); + + IWICBitmapFrameDecode_Release(frame_decode); + IWICBitmapDecoder_Release(decoder); + IStream_Release(stream); + + /* Encoder with no palette set */ + hr = IWICImagingFactory_CreateEncoder(factory, &GUID_ContainerFormatBmp, &GUID_VendorMicrosoft, &encoder); + ok(hr == S_OK, "CreateDecoder error %#x\n", hr); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "CreateStream error %#x\n", hr); + + hr = IWICBitmapEncoder_Initialize(encoder, stream, WICBitmapEncoderNoCache); + ok(hr == S_OK, "IWICBitmapEncoder_Initialize error %#x\n", hr); + + hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frame_encode, &encode_options); + ok(hr == S_OK, "CreateNewFrame error %#x\n", hr); + + hr = IWICBitmapFrameEncode_Initialize(frame_encode, encode_options); + ok(hr == S_OK, "IWICBitmapFrameEncode_Initialize error %#x\n", hr); + + IPropertyBag2_Release(encode_options); + + hr = IWICBitmapFrameEncode_SetSize(frame_encode, 1, 1); + ok(hr == S_OK, "SetSize error %#x\n", hr); + + pixelformat = GUID_WICPixelFormat1bppIndexed; + hr = IWICBitmapFrameEncode_SetPixelFormat(frame_encode, &pixelformat); + ok(hr == S_OK, "SetPixelFormat error %#x\n", hr); + ok(!memcmp(&pixelformat, &GUID_WICPixelFormat1bppIndexed, sizeof(pixelformat)), "pixel format changed\n"); + + hr = IWICPalette_InitializeCustom(palette, source_palette, 2); + ok(hr == S_OK, "InitializeCustom error %#x\n", hr); + + hr = IWICBitmap_SetPalette(bitmap, palette); + ok(hr == S_OK, "SetPalette error %#x\n", hr); + + hr = IWICBitmapFrameEncode_WriteSource(frame_encode, (IWICBitmapSource*)bitmap, NULL); + if (hr == WINCODEC_ERR_PALETTEUNAVAILABLE) + { + win_skip("old WriteSource palette behavior\n"); /* winxp */ + IWICBitmapFrameEncode_Release(frame_encode); + IWICBitmapEncoder_Release(encoder); + IStream_Release(stream); + IWICPalette_Release(palette); + IWICBitmap_Release(bitmap); + IWICImagingFactory_Release(factory); + return; + } + ok(hr == S_OK, "WriteSource error %#x\n", hr); + + hr = IWICBitmapFrameEncode_Commit(frame_encode); + ok(hr == S_OK, "Commit error %#x\n", hr); + + IWICBitmapFrameEncode_Release(frame_encode); + + hr = IWICBitmapEncoder_Commit(encoder); + ok(hr == S_OK, "Commit error %#x\n", hr); + + IWICBitmapEncoder_Release(encoder); + + hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, WICDecodeMetadataCacheOnLoad, &decoder); + ok(hr == S_OK, "CreateDecoderFromStream error %#x\n", hr); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame_decode); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_CopyPalette(frame_decode, palette); + todo_wine ok(hr == S_OK, "CopyPalette error %#x\n", hr); + + hr = IWICPalette_GetColors(palette, 2, result_palette, &result_colors); + ok(hr == S_OK, "GetColors error %#x\n", hr); + ok(result_colors == 2, "Got %i colors\n", result_colors); + ok(result_palette[0] == source_palette[0], "Unexpected palette entry: %x\n", result_palette[0]); + ok(result_palette[1] == source_palette[1], "Unexpected palette entry: %x\n", result_palette[0]); + + IWICBitmapFrameDecode_Release(frame_decode); + IWICBitmapDecoder_Release(decoder); + IStream_Release(stream); + + IWICPalette_Release(palette); + IWICBitmap_Release(bitmap); + IWICImagingFactory_Release(factory); +} + START_TEST(bmpformat) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -1097,6 +1276,7 @@ START_TEST(bmpformat) test_componentinfo(); test_createfromstream(); test_create_decoder(); + test_writesource_palette(); CoUninitialize(); } -- 2.17.1

1 0

[PATCH] gdiplus: in CompositingModeSourceCopy, fully transparent pixels are drawn black
by Damjan Jovanovic 05 Mar '20

05 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42585 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/gdiplus/graphics.c | 7 ++++++- dlls/gdiplus/tests/image.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-)

3 4

[PATCH v2 1/2] ntdll: Return a unique volume number from NtQueryInformationFile(FileIdInformation).
by Zebediah Figura 05 Mar '20

05 Mar '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: Shift the device number by 4 bytes, since the lower 4 bytes are used by the volume serial number. dlls/ntdll/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 7dfb0a4800e..2aa5d8f979f 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2508,7 +2508,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, else { FILE_ID_INFORMATION *info = ptr; - info->VolumeSerialNumber = 0; /* FIXME */ + info->VolumeSerialNumber = (ULONGLONG)st.st_dev << 32; memset( &info->FileId, 0, sizeof(info->FileId) ); *(ULONGLONG *)&info->FileId = st.st_ino; } -- 2.25.1

6 7

[PATCH v2 5/5] wined3d: Introduce wined3d_swapchain_get_output().
by Zhiyi Zhang 05 Mar '20

05 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wined3d/device.c | 9 ++++++++- dlls/wined3d/swapchain.c | 13 +++++++++++++ dlls/wined3d/wined3d_main.c | 8 +++++++- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4a5397b2e67..88c745f1e67 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5097,6 +5097,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, struct wined3d_swapchain *swapchain; struct wined3d_view_desc view_desc; BOOL backbuffer_resized, windowed; + struct wined3d_output *output; HRESULT hr = WINED3D_OK; unsigned int i; @@ -5205,8 +5206,14 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, return hr; } } + + if (!(output = wined3d_swapchain_get_output(swapchain))) + { + ERR("Failed to get output from swapchain %p.\n", swapchain); + return E_FAIL; + } if (FAILED(hr = wined3d_swapchain_state_set_fullscreen(&swapchain->state, - swapchain_desc, device->wined3d, &device->adapter->outputs[0], mode))) + swapchain_desc, device->wined3d, output, mode))) return hr; /* Switch from fullscreen to windowed. */ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index a70b6c1e063..be41cc385e7 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -289,6 +289,19 @@ static struct wined3d_output * get_output_from_window(const struct wined3d *wine return &wined3d->adapters[0]->outputs[0]; } +struct wined3d_output * wined3d_swapchain_get_output(const struct wined3d_swapchain *swapchain) +{ + HWND hwnd; + + TRACE("swapchain %p.\n", swapchain); + + hwnd = swapchain->state.device_window; + if (!hwnd) + hwnd = swapchain->win_handle; + + return get_output_from_window(swapchain->device->wined3d, hwnd); +} + HRESULT CDECL wined3d_swapchain_get_raster_status(const struct wined3d_swapchain *swapchain, struct wined3d_raster_status *raster_status) { diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 3e852bd4e62..ea58f4473b8 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -541,6 +541,7 @@ static LRESULT CALLBACK wined3d_hook_proc(int code, WPARAM wparam, LPARAM lparam struct wined3d_swapchain_desc swapchain_desc; struct wined3d_swapchain *swapchain; struct wined3d_wndproc *entry; + struct wined3d_output *output; MSG *msg = (MSG *)lparam; unsigned int i; @@ -564,8 +565,13 @@ static LRESULT CALLBACK wined3d_hook_proc(int code, WPARAM wparam, LPARAM lparam wined3d_swapchain_get_desc(swapchain, &swapchain_desc); swapchain_desc.windowed = !swapchain_desc.windowed; + if (!(output = wined3d_swapchain_get_output(swapchain))) + { + ERR("Failed to get output from swapchain %p.\n", swapchain); + break; + } wined3d_swapchain_state_set_fullscreen(&swapchain->state, &swapchain_desc, - swapchain->device->wined3d, &swapchain->device->adapter->outputs[0], NULL); + swapchain->device->wined3d, output, NULL); wined3d_wndproc_mutex_unlock(); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4c7ea1f1628..23540295bb4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4485,6 +4485,7 @@ struct wined3d_swapchain void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) DECLSPEC_HIDDEN; void wined3d_swapchain_cleanup(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; +struct wined3d_output * wined3d_swapchain_get_output(const struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_set_max_frame_latency(struct wined3d_swapchain *swapchain, const struct wined3d_device *device) DECLSPEC_HIDDEN; -- 2.20.1

2 1

[PATCH v2 4/5] wined3d: Pass a struct wined3d_output pointer to wined3d_swapchain_state_set_fullscreen().
by Zhiyi Zhang 05 Mar '20

05 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/swapchain.c | 14 ++++++-------- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_main.c | 2 +- include/wine/wined3d.h | 2 +- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 004bd1457dd..603cf171e27 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -164,7 +164,7 @@ static HRESULT dxgi_swapchain_set_fullscreen_state(struct wined3d_swapchain_stat wined3d_mutex_lock(); hr = wined3d_swapchain_state_set_fullscreen(state, swapchain_desc, - adapter->factory->wined3d, adapter->ordinal, NULL); + adapter->factory->wined3d, dxgi_output->wined3d_output, NULL); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 441601efcb6..4a5397b2e67 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5206,7 +5206,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } } if (FAILED(hr = wined3d_swapchain_state_set_fullscreen(&swapchain->state, - swapchain_desc, device->wined3d, device->adapter->ordinal, mode))) + swapchain_desc, device->wined3d, &device->adapter->outputs[0], mode))) return hr; /* Switch from fullscreen to windowed. */ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c7c751f736e..a70b6c1e063 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1604,13 +1604,13 @@ void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_st HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_state *state, const struct wined3d_swapchain_desc *swapchain_desc, struct wined3d *wined3d, - unsigned int adapter_idx, const struct wined3d_display_mode *mode) + struct wined3d_output *output, const struct wined3d_display_mode *mode) { struct wined3d_display_mode actual_mode; HRESULT hr; - TRACE("state %p, swapchain_desc %p, wined3d %p, adapter_idx %u, mode %p.\n", - state, swapchain_desc, wined3d, adapter_idx, mode); + TRACE("state %p, swapchain_desc %p, wined3d %p, output %p, mode %p.\n", + state, swapchain_desc, wined3d, output, mode); if (state->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { @@ -1622,12 +1622,10 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st { if (!swapchain_desc->windowed) { - const struct wined3d_adapter *adapter = wined3d->adapters[adapter_idx]; - actual_mode.width = swapchain_desc->backbuffer_width; actual_mode.height = swapchain_desc->backbuffer_height; actual_mode.refresh_rate = swapchain_desc->refresh_rate; - actual_mode.format_id = adapter_format_from_backbuffer_format(adapter, + actual_mode.format_id = adapter_format_from_backbuffer_format(output->adapter, swapchain_desc->backbuffer_format); actual_mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; } @@ -1637,7 +1635,7 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st } } - if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, adapter_idx, &actual_mode))) + if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, wined3d, 0, &actual_mode))) return hr; } else @@ -1645,7 +1643,7 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st if (mode) WARN("WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH is not set, ignoring mode.\n"); - if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, adapter_idx, &actual_mode, NULL))) + if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, 0, &actual_mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index a85b5ac34b1..0423423f30e 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -299,7 +299,7 @@ @ cdecl wined3d_swapchain_state_create(ptr ptr ptr long ptr) @ cdecl wined3d_swapchain_state_destroy(ptr) @ cdecl wined3d_swapchain_state_resize_target(ptr ptr long ptr) -@ cdecl wined3d_swapchain_state_set_fullscreen(ptr ptr ptr long ptr) +@ cdecl wined3d_swapchain_state_set_fullscreen(ptr ptr ptr ptr ptr) @ cdecl wined3d_texture_add_dirty_region(ptr long ptr) @ cdecl wined3d_texture_blt(ptr long ptr ptr long ptr long ptr long) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 05684aeb3ba..3e852bd4e62 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -565,7 +565,7 @@ static LRESULT CALLBACK wined3d_hook_proc(int code, WPARAM wparam, LPARAM lparam wined3d_swapchain_get_desc(swapchain, &swapchain_desc); swapchain_desc.windowed = !swapchain_desc.windowed; wined3d_swapchain_state_set_fullscreen(&swapchain->state, &swapchain_desc, - swapchain->device->wined3d, swapchain->device->adapter->ordinal, NULL); + swapchain->device->wined3d, &swapchain->device->adapter->outputs[0], NULL); wined3d_wndproc_mutex_unlock(); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 63b4cba33a0..dbee737e263 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2790,7 +2790,7 @@ HRESULT __cdecl wined3d_swapchain_state_resize_target(struct wined3d_swapchain_s struct wined3d *wined3d, unsigned int adapter_idx, const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_state *state, const struct wined3d_swapchain_desc *desc, struct wined3d *wined3d, - unsigned int adapter_idx, const struct wined3d_display_mode *mode); + struct wined3d_output *output, const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_texture_add_dirty_region(struct wined3d_texture *texture, UINT layer, const struct wined3d_box *dirty_region); -- 2.20.1

2 1

[PATCH v2 3/5] wined3d: Get output from window in wined3d_swapchain_state_init().
by Zhiyi Zhang 05 Mar '20

05 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 44 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 62bab65fcf3..c7c751f736e 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -257,6 +257,38 @@ struct wined3d_texture * CDECL wined3d_swapchain_get_back_buffer(const struct wi return swapchain->back_buffers[back_buffer_idx]; } +static struct wined3d_output * get_output_from_window(const struct wined3d *wined3d, HWND hwnd) +{ + unsigned int adapter_idx, output_idx; + struct wined3d_adapter *adapter; + MONITORINFOEXW monitor_info; + HMONITOR monitor; + + TRACE("wined3d %p, hwnd %p.\n", wined3d, hwnd); + + monitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY); + monitor_info.cbSize = sizeof(monitor_info); + if (!GetMonitorInfoW(monitor, (MONITORINFO *)&monitor_info)) + { + ERR("Failed to get monitor information.\n"); + return NULL; + } + + for (adapter_idx = 0; adapter_idx < wined3d->adapter_count; ++adapter_idx) + { + adapter = wined3d->adapters[adapter_idx]; + for (output_idx = 0; output_idx < adapter->output_count; ++output_idx) + { + if (!lstrcmpiW(adapter->outputs[output_idx].device_name, monitor_info.szDevice)) + return &adapter->outputs[output_idx]; + } + } + + /* Because wined3d only supports one output right now. A window can be on non-primary outputs + * and thus fails to get its correct output. In this case, return the primary output for now */ + return &wined3d->adapters[0]->outputs[0]; +} + HRESULT CDECL wined3d_swapchain_get_raster_status(const struct wined3d_swapchain *swapchain, struct wined3d_raster_status *raster_status) { @@ -767,10 +799,17 @@ static HRESULT wined3d_swapchain_state_init(struct wined3d_swapchain_state *stat const struct wined3d_swapchain_desc *desc, HWND window, struct wined3d *wined3d, unsigned int adapter_idx) { + struct wined3d_output *output; HRESULT hr; state->desc = *desc; + if (!(output = get_output_from_window(wined3d, window))) + { + WARN("Failed to get output from window %p.\n", window); + return E_FAIL; + } + if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, adapter_idx, &state->original_mode, NULL))) { ERR("Failed to get current display mode, hr %#x.\n", hr); @@ -781,11 +820,10 @@ static HRESULT wined3d_swapchain_state_init(struct wined3d_swapchain_state *stat { if (desc->flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { - struct wined3d_adapter *adapter = wined3d->adapters[adapter_idx]; - state->d3d_mode.width = desc->backbuffer_width; state->d3d_mode.height = desc->backbuffer_height; - state->d3d_mode.format_id = adapter_format_from_backbuffer_format(adapter, desc->backbuffer_format); + state->d3d_mode.format_id = adapter_format_from_backbuffer_format(output->adapter, + desc->backbuffer_format); state->d3d_mode.refresh_rate = desc->refresh_rate; state->d3d_mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; } -- 2.20.1

2 1

[PATCH v2 2/5] wined3d: Refactor wined3d_get_adapter_mode_count() to wined3d_output_get_mode_count().
by Zhiyi Zhang 05 Mar '20

05 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/directx.c | 8 ++++++-- dlls/d3d9/directx.c | 20 ++++++++++++++------ dlls/dxgi/output.c | 4 +--- dlls/wined3d/directx.c | 21 +++++++++------------ dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 6 files changed, 33 insertions(+), 26 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 7e9b72eea30..b78b119d22c 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -134,12 +134,16 @@ static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, static UINT WINAPI d3d8_GetAdapterModeCount(IDirect3D8 *iface, UINT adapter) { struct d3d8 *d3d8 = impl_from_IDirect3D8(iface); - UINT count; + unsigned int output_idx, count; TRACE("iface %p, adapter %u.\n", iface, adapter); + output_idx = adapter; + if (output_idx >= d3d8->wined3d_output_count) + return 0; + wined3d_mutex_lock(); - count = wined3d_get_adapter_mode_count(d3d8->wined3d, adapter, + count = wined3d_output_get_mode_count(d3d8->wined3d_outputs[output_idx], WINED3DFMT_UNKNOWN, WINED3D_SCANLINE_ORDERING_UNKNOWN); wined3d_mutex_unlock(); diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 00632019c7d..83bb3d8217c 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -149,20 +149,24 @@ static HRESULT WINAPI d3d9_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT adapte static UINT WINAPI d3d9_GetAdapterModeCount(IDirect3D9Ex *iface, UINT adapter, D3DFORMAT format) { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); - UINT ret; + unsigned int output_idx, count; TRACE("iface %p, adapter %u, format %#x.\n", iface, adapter, format); + output_idx = adapter; + if (output_idx >= d3d9->wined3d_output_count) + return 0; + /* Others than that not supported by d3d9, but reported by wined3d for ddraw. Filter them out. */ if (format != D3DFMT_X8R8G8B8 && format != D3DFMT_R5G6B5) return 0; wined3d_mutex_lock(); - ret = wined3d_get_adapter_mode_count(d3d9->wined3d, adapter, + count = wined3d_output_get_mode_count(d3d9->wined3d_outputs[output_idx], wined3dformat_from_d3dformat(format), WINED3D_SCANLINE_ORDERING_UNKNOWN); wined3d_mutex_unlock(); - return ret; + return count; } static HRESULT WINAPI d3d9_EnumAdapterModes(IDirect3D9Ex *iface, UINT adapter, @@ -440,19 +444,23 @@ static UINT WINAPI d3d9_GetAdapterModeCountEx(IDirect3D9Ex *iface, UINT adapter, const D3DDISPLAYMODEFILTER *filter) { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); - UINT ret; + unsigned int output_idx, count; TRACE("iface %p, adapter %u, filter %p.\n", iface, adapter, filter); + output_idx = adapter; + if (output_idx >= d3d9->wined3d_output_count) + return 0; + if (filter->Format != D3DFMT_X8R8G8B8 && filter->Format != D3DFMT_R5G6B5) return 0; wined3d_mutex_lock(); - ret = wined3d_get_adapter_mode_count(d3d9->wined3d, adapter, + count = wined3d_output_get_mode_count(d3d9->wined3d_outputs[output_idx], wined3dformat_from_d3dformat(filter->Format), filter->ScanLineOrdering); wined3d_mutex_unlock(); - return ret; + return count; } static HRESULT WINAPI d3d9_EnumAdapterModesEx(IDirect3D9Ex *iface, diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 063d72e13fa..fe8dd7b5c0a 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -107,7 +107,6 @@ static HRESULT dxgi_output_get_display_mode_list(struct dxgi_output *output, enum wined3d_format_id wined3d_format; struct wined3d_display_mode mode; unsigned int i, max_count; - struct wined3d *wined3d; HRESULT hr; if (!mode_count) @@ -122,8 +121,7 @@ static HRESULT dxgi_output_get_display_mode_list(struct dxgi_output *output, wined3d_format = wined3dformat_from_dxgi_format(format); wined3d_mutex_lock(); - wined3d = output->adapter->factory->wined3d; - max_count = wined3d_get_adapter_mode_count(wined3d, output->adapter->ordinal, + max_count = wined3d_output_get_mode_count(output->wined3d_output, wined3d_format, WINED3D_SCANLINE_ORDERING_UNKNOWN); if (!modes) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 66877350883..f873ed56b2a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -952,7 +952,7 @@ HRESULT CDECL wined3d_get_output_desc(const struct wined3d *wined3d, unsigned in of the same bpp but different resolutions */ /* Note: dx9 supplies a format. Calls from d3d8 supply WINED3DFMT_UNKNOWN */ -UINT CDECL wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT adapter_idx, +unsigned int CDECL wined3d_output_get_mode_count(const struct wined3d_output *output, enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering) { const struct wined3d_adapter *adapter; @@ -962,20 +962,17 @@ UINT CDECL wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT ad UINT format_bits; DEVMODEW mode; - TRACE("wined3d %p, adapter_idx %u, format %s, scanline_ordering %#x.\n", - wined3d, adapter_idx, debug_d3dformat(format_id), scanline_ordering); + TRACE("output %p, format %s, scanline_ordering %#x.\n", + output, debug_d3dformat(format_id), scanline_ordering); - if (adapter_idx >= wined3d->adapter_count) - return 0; - - adapter = wined3d->adapters[adapter_idx]; + adapter = output->adapter; format = wined3d_get_format(adapter, format_id, WINED3D_BIND_RENDER_TARGET); format_bits = format->byte_count * CHAR_BIT; memset(&mode, 0, sizeof(mode)); mode.dmSize = sizeof(mode); - while (EnumDisplaySettingsExW(adapter->device_name, j++, &mode, 0)) + while (EnumDisplaySettingsExW(output->device_name, j++, &mode, 0)) { if (mode.dmFields & DM_DISPLAYFLAGS) { @@ -999,7 +996,7 @@ UINT CDECL wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT ad } } - TRACE("Returning %u matching modes (out of %u total) for adapter %u.\n", i, j, adapter_idx); + TRACE("Returning %u matching modes (out of %u total) for output %p.\n", i, j, output); return i; } @@ -1093,10 +1090,10 @@ HRESULT CDECL wined3d_find_closest_matching_adapter_mode(const struct wined3d *w TRACE("wined3d %p, adapter_idx %u, mode %p.\n", wined3d, adapter_idx, mode); - if (!(mode_count = wined3d_get_adapter_mode_count(wined3d, adapter_idx, + if (!(mode_count = wined3d_output_get_mode_count(&wined3d->adapters[adapter_idx]->outputs[0], mode->format_id, WINED3D_SCANLINE_ORDERING_UNKNOWN))) { - WARN("Adapter has 0 matching modes.\n"); + WARN("Output has 0 matching modes.\n"); return E_FAIL; } @@ -1829,7 +1826,7 @@ HRESULT CDECL wined3d_check_device_type(const struct wined3d *wined3d, UINT adap if (!windowed) { /* If the requested display format is not available, don't continue. */ - if (!wined3d_get_adapter_mode_count(wined3d, adapter_idx, + if (!wined3d_output_get_mode_count(&wined3d->adapters[adapter_idx]->outputs[0], display_format, WINED3D_SCANLINE_ORDERING_UNKNOWN)) { TRACE("No available modes for display format %s.\n", debug_d3dformat(display_format)); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 7af7a8615f9..a85b5ac34b1 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -14,7 +14,6 @@ @ cdecl wined3d_get_adapter_count(ptr) @ cdecl wined3d_get_adapter_display_mode(ptr long ptr ptr) @ cdecl wined3d_get_adapter_identifier(ptr long long ptr) -@ cdecl wined3d_get_adapter_mode_count(ptr long long long) @ cdecl wined3d_get_adapter_raster_status(ptr long ptr) @ cdecl wined3d_get_device_caps(ptr long long ptr) @ cdecl wined3d_get_output_desc(ptr long ptr) @@ -178,6 +177,7 @@ @ cdecl wined3d_device_validate_device(ptr ptr) @ cdecl wined3d_output_get_mode(ptr long long long ptr) +@ cdecl wined3d_output_get_mode_count(ptr long long) @ cdecl wined3d_output_release_ownership(ptr) @ cdecl wined3d_output_take_ownership(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 893fb7409e0..63b4cba33a0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2267,8 +2267,6 @@ HRESULT __cdecl wined3d_get_adapter_display_mode(const struct wined3d *wined3d, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation); HRESULT __cdecl wined3d_get_adapter_identifier(const struct wined3d *wined3d, UINT adapter_idx, DWORD flags, struct wined3d_adapter_identifier *identifier); -UINT __cdecl wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT adapter_idx, - enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering); HRESULT __cdecl wined3d_get_adapter_raster_status(const struct wined3d *wined3d, UINT adapter_idx, struct wined3d_raster_status *raster_status); HRESULT __cdecl wined3d_get_device_caps(const struct wined3d *wined3d, unsigned int adapter_idx, @@ -2529,6 +2527,8 @@ HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *devi HRESULT __cdecl wined3d_output_get_mode(const struct wined3d_output *output, enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering, unsigned int mode_idx, struct wined3d_display_mode *mode); +unsigned int __cdecl wined3d_output_get_mode_count(const struct wined3d_output *output, + enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering); void __cdecl wined3d_output_release_ownership(const struct wined3d_output *output); HRESULT __cdecl wined3d_output_take_ownership(const struct wined3d_output *output, BOOL exclusive); -- 2.20.1

3 2

[PATCH v2 1/5] wined3d: Refactor wined3d_enum_adapter_modes() to wined3d_output_get_mode().
by Zhiyi Zhang 05 Mar '20

05 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 180028~180032. Fix test failures. Style changes. dlls/d3d8/directx.c | 7 ++++++- dlls/d3d9/directx.c | 20 ++++++++++++++++---- dlls/ddraw/ddraw.c | 16 +++++++++++++++- dlls/ddraw/ddraw_private.h | 2 ++ dlls/dxgi/output.c | 6 +++--- dlls/wined3d/directx.c | 23 +++++++++++++---------- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 3 +++ include/wine/wined3d.h | 6 +++--- 9 files changed, 62 insertions(+), 23 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 0f283b55354..7e9b72eea30 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -150,13 +150,18 @@ static HRESULT WINAPI d3d8_EnumAdapterModes(IDirect3D8 *iface, UINT adapter, UIN { struct d3d8 *d3d8 = impl_from_IDirect3D8(iface); struct wined3d_display_mode wined3d_mode; + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u, mode_idx %u, mode %p.\n", iface, adapter, mode_idx, mode); + output_idx = adapter; + if (output_idx >= d3d8->wined3d_output_count) + return D3DERR_INVALIDCALL; + wined3d_mutex_lock(); - hr = wined3d_enum_adapter_modes(d3d8->wined3d, adapter, WINED3DFMT_UNKNOWN, + hr = wined3d_output_get_mode(d3d8->wined3d_outputs[output_idx], WINED3DFMT_UNKNOWN, WINED3D_SCANLINE_ORDERING_UNKNOWN, mode_idx, &wined3d_mode); wined3d_mutex_unlock(); diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 3e9fabf758b..00632019c7d 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -170,17 +170,23 @@ static HRESULT WINAPI d3d9_EnumAdapterModes(IDirect3D9Ex *iface, UINT adapter, { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); struct wined3d_display_mode wined3d_mode; + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u, format %#x, mode_idx %u, mode %p.\n", iface, adapter, format, mode_idx, mode); + output_idx = adapter; + if (output_idx >= d3d9->wined3d_output_count) + return D3DERR_INVALIDCALL; + if (format != D3DFMT_X8R8G8B8 && format != D3DFMT_R5G6B5) return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - hr = wined3d_enum_adapter_modes(d3d9->wined3d, adapter, wined3dformat_from_d3dformat(format), - WINED3D_SCANLINE_ORDERING_UNKNOWN, mode_idx, &wined3d_mode); + hr = wined3d_output_get_mode(d3d9->wined3d_outputs[output_idx], + wined3dformat_from_d3dformat(format), WINED3D_SCANLINE_ORDERING_UNKNOWN, mode_idx, + &wined3d_mode); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) @@ -454,17 +460,23 @@ static HRESULT WINAPI d3d9_EnumAdapterModesEx(IDirect3D9Ex *iface, { struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); struct wined3d_display_mode wined3d_mode; + unsigned int output_idx; HRESULT hr; TRACE("iface %p, adapter %u, filter %p, mode_idx %u, mode %p.\n", iface, adapter, filter, mode_idx, mode); + output_idx = adapter; + if (output_idx >= d3d9->wined3d_output_count) + return D3DERR_INVALIDCALL; + if (filter->Format != D3DFMT_X8R8G8B8 && filter->Format != D3DFMT_R5G6B5) return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - hr = wined3d_enum_adapter_modes(d3d9->wined3d, adapter, wined3dformat_from_d3dformat(filter->Format), - filter->ScanLineOrdering, mode_idx, &wined3d_mode); + hr = wined3d_output_get_mode(d3d9->wined3d_outputs[output_idx], + wined3dformat_from_d3dformat(filter->Format), filter->ScanLineOrdering, mode_idx, + &wined3d_mode); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d744df8c918..9f51cd2ca6f 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2404,7 +2404,7 @@ static HRESULT WINAPI ddraw7_EnumDisplayModes(IDirectDraw7 *iface, DWORD Flags, for(fmt = 0; fmt < ARRAY_SIZE(checkFormatList); fmt++) { modenum = 0; - while (wined3d_enum_adapter_modes(ddraw->wined3d, WINED3DADAPTER_DEFAULT, checkFormatList[fmt], + while (wined3d_output_get_mode(ddraw->wined3d_output, checkFormatList[fmt], WINED3D_SCANLINE_ORDERING_UNKNOWN, modenum++, &mode) == WINED3D_OK) { BOOL found = FALSE; @@ -5003,6 +5003,20 @@ HRESULT ddraw_init(struct ddraw *ddraw, DWORD flags, enum wined3d_device_type de } } + if (!(ddraw->wined3d_adapter = wined3d_get_adapter(ddraw->wined3d, WINED3DADAPTER_DEFAULT))) + { + WARN("Failed to get the default wined3d adapter.\n"); + wined3d_decref(ddraw->wined3d); + return E_FAIL; + } + + if (!(ddraw->wined3d_output = wined3d_adapter_get_output(ddraw->wined3d_adapter, 0))) + { + WARN("Failed to get the default wined3d output.\n"); + wined3d_decref(ddraw->wined3d); + return E_FAIL; + } + if (FAILED(hr = wined3d_get_device_caps(ddraw->wined3d, WINED3DADAPTER_DEFAULT, device_type, &caps))) { ERR("Failed to get device caps, hr %#x.\n", hr); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 42a7a85e4ec..515a622e37a 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -94,6 +94,8 @@ struct ddraw LONG ref7, ref4, ref2, ref3, ref1, numIfaces; struct wined3d *wined3d; + struct wined3d_adapter *wined3d_adapter; + struct wined3d_output *wined3d_output; struct wined3d_device *wined3d_device; DWORD flags; LONG device_state; diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 866bcb2f7fa..063d72e13fa 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -143,10 +143,10 @@ static HRESULT dxgi_output_get_display_mode_list(struct dxgi_output *output, for (i = 0; i < *mode_count; ++i) { - if (FAILED(hr = wined3d_enum_adapter_modes(wined3d, output->adapter->ordinal, - wined3d_format, WINED3D_SCANLINE_ORDERING_UNKNOWN, i, &mode))) + if (FAILED(hr = wined3d_output_get_mode(output->wined3d_output, wined3d_format, + WINED3D_SCANLINE_ORDERING_UNKNOWN, i, &mode))) { - WARN("Failed to enum adapter mode %u, hr %#x.\n", i, hr); + WARN("Failed to get output mode %u, hr %#x.\n", i, hr); wined3d_mutex_unlock(); return hr; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index cf8616310fc..66877350883 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -116,7 +116,8 @@ static void wined3d_output_cleanup(const struct wined3d_output *output) D3DKMTCloseAdapter(&close_adapter_desc); } -static HRESULT wined3d_output_init(struct wined3d_output *output, const WCHAR *device_name) +static HRESULT wined3d_output_init(struct wined3d_output *output, struct wined3d_adapter *adapter, + const WCHAR *device_name) { D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_desc; D3DKMT_CREATEDEVICE create_device_desc = {{0}}; @@ -136,6 +137,8 @@ static HRESULT wined3d_output_init(struct wined3d_output *output, const WCHAR *d return E_FAIL; } + lstrcpyW(output->device_name, device_name); + output->adapter = adapter; output->kmt_adapter = open_adapter_desc.hAdapter; output->kmt_device = create_device_desc.hDevice; output->vidpn_source_id = open_adapter_desc.VidPnSourceId; @@ -1002,9 +1005,9 @@ UINT CDECL wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT ad } /* Note: dx9 supplies a format. Calls from d3d8 supply WINED3DFMT_UNKNOWN */ -HRESULT CDECL wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT adapter_idx, +HRESULT CDECL wined3d_output_get_mode(const struct wined3d_output *output, enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering, - UINT mode_idx, struct wined3d_display_mode *mode) + unsigned int mode_idx, struct wined3d_display_mode *mode) { const struct wined3d_adapter *adapter; const struct wined3d_format *format; @@ -1013,13 +1016,13 @@ HRESULT CDECL wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT ada UINT i = 0; int j = 0; - TRACE("wined3d %p, adapter_idx %u, format %s, scanline_ordering %#x, mode_idx %u, mode %p.\n", - wined3d, adapter_idx, debug_d3dformat(format_id), scanline_ordering, mode_idx, mode); + TRACE("output %p, format %s, scanline_ordering %#x, mode_idx %u, mode %p.\n", + output, debug_d3dformat(format_id), scanline_ordering, mode_idx, mode); - if (!mode || adapter_idx >= wined3d->adapter_count) + if (!mode) return WINED3DERR_INVALIDCALL; - adapter = wined3d->adapters[adapter_idx]; + adapter = output->adapter; format = wined3d_get_format(adapter, format_id, WINED3D_BIND_RENDER_TARGET); format_bits = format->byte_count * CHAR_BIT; @@ -1028,7 +1031,7 @@ HRESULT CDECL wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT ada while (i <= mode_idx) { - if (!EnumDisplaySettingsExW(adapter->device_name, j++, &m, 0)) + if (!EnumDisplaySettingsExW(output->device_name, j++, &m, 0)) { WARN("Invalid mode_idx %u.\n", mode_idx); return WINED3DERR_INVALIDCALL; @@ -1107,7 +1110,7 @@ HRESULT CDECL wined3d_find_closest_matching_adapter_mode(const struct wined3d *w for (i = 0; i < mode_count; ++i) { - if (FAILED(hr = wined3d_enum_adapter_modes(wined3d, adapter_idx, + if (FAILED(hr = wined3d_output_get_mode(&wined3d->adapters[adapter_idx]->outputs[0], mode->format_id, WINED3D_SCANLINE_ORDERING_UNKNOWN, i, &modes[i]))) { heap_free(matching_modes); @@ -2851,7 +2854,7 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, return FALSE; } - if (FAILED(hr = wined3d_output_init(&adapter->outputs[0], adapter->device_name))) + if (FAILED(hr = wined3d_output_init(&adapter->outputs[0], adapter, display_device.DeviceName))) { ERR("Failed to initialise output, hr %#x.\n", hr); goto done; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c891c446080..7af7a8615f9 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -9,7 +9,6 @@ @ cdecl wined3d_check_device_type(ptr long long long long long) @ cdecl wined3d_create(long) @ cdecl wined3d_decref(ptr) -@ cdecl wined3d_enum_adapter_modes(ptr long long long long ptr) @ cdecl wined3d_find_closest_matching_adapter_mode(ptr long ptr) @ cdecl wined3d_get_adapter(ptr long) @ cdecl wined3d_get_adapter_count(ptr) @@ -178,6 +177,7 @@ @ cdecl wined3d_device_update_texture(ptr ptr ptr) @ cdecl wined3d_device_validate_device(ptr ptr) +@ cdecl wined3d_output_get_mode(ptr long long long ptr) @ cdecl wined3d_output_release_ownership(ptr) @ cdecl wined3d_output_take_ownership(ptr long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1a23b9e4435..4c7ea1f1628 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2898,6 +2898,9 @@ struct wined3d_adapter_ops struct wined3d_output { + WCHAR device_name[CCHDEVICENAME]; + struct wined3d_adapter *adapter; + D3DKMT_HANDLE kmt_adapter; D3DKMT_HANDLE kmt_device; D3DDDI_VIDEO_PRESENT_SOURCE_ID vidpn_source_id; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b724424bce1..893fb7409e0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2258,9 +2258,6 @@ HRESULT __cdecl wined3d_check_device_type(const struct wined3d *wined3d, UINT ad enum wined3d_format_id backbuffer_format_id, BOOL windowed); struct wined3d * __cdecl wined3d_create(DWORD flags); ULONG __cdecl wined3d_decref(struct wined3d *wined3d); -HRESULT __cdecl wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT adapter_idx, - enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering, - UINT mode_idx, struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_find_closest_matching_adapter_mode(const struct wined3d *wined3d, unsigned int adapter_idx, struct wined3d_display_mode *mode); struct wined3d_adapter * __cdecl wined3d_get_adapter(const struct wined3d *wined3d, @@ -2529,6 +2526,9 @@ HRESULT __cdecl wined3d_device_update_texture(struct wined3d_device *device, struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture); HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes); +HRESULT __cdecl wined3d_output_get_mode(const struct wined3d_output *output, + enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering, + unsigned int mode_idx, struct wined3d_display_mode *mode); void __cdecl wined3d_output_release_ownership(const struct wined3d_output *output); HRESULT __cdecl wined3d_output_take_ownership(const struct wined3d_output *output, BOOL exclusive); -- 2.20.1

2 1

[PATCH v2 1/5] wined3d: Make some wined3d_device functions static.
by Zebediah Figura 05 Mar '20

05 Mar '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 32 ++++++++++++++++---------------- dlls/wined3d/wined3d.spec | 16 ---------------- include/wine/wined3d.h | 28 ---------------------------- 3 files changed, 16 insertions(+), 60 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 441601efcb..43505e6ad3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1314,7 +1314,7 @@ HRESULT CDECL wined3d_device_get_stream_source(const struct wined3d_device *devi return WINED3D_OK; } -HRESULT CDECL wined3d_device_set_stream_source_freq(struct wined3d_device *device, UINT stream_idx, UINT divider) +static HRESULT wined3d_device_set_stream_source_freq(struct wined3d_device *device, UINT stream_idx, UINT divider) { struct wined3d_stream_state *stream; UINT old_flags, old_freq; @@ -1350,7 +1350,7 @@ HRESULT CDECL wined3d_device_set_stream_source_freq(struct wined3d_device *devic return WINED3D_OK; } -void CDECL wined3d_device_set_transform(struct wined3d_device *device, +static void wined3d_device_set_transform(struct wined3d_device *device, enum wined3d_transform_state d3dts, const struct wined3d_matrix *matrix) { TRACE("device %p, state %s, matrix %p.\n", @@ -1376,7 +1376,7 @@ void CDECL wined3d_device_set_transform(struct wined3d_device *device, wined3d_cs_emit_set_transform(device->cs, d3dts, matrix); } -void CDECL wined3d_device_get_transform(const struct wined3d_device *device, +static void wined3d_device_get_transform(const struct wined3d_device *device, enum wined3d_transform_state state, struct wined3d_matrix *matrix) { TRACE("device %p, state %s, matrix %p.\n", device, debug_d3dtstype(state), matrix); @@ -1391,7 +1391,7 @@ void CDECL wined3d_device_get_transform(const struct wined3d_device *device, * stateblock problems. When capturing the state block, I duplicate the * hashmap, but when recording, just build a chain pretty much of commands to * be replayed. */ -HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, +static HRESULT wined3d_device_set_light(struct wined3d_device *device, UINT light_idx, const struct wined3d_light *light) { struct wined3d_light_info *object = NULL; @@ -1523,7 +1523,7 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_set_light_enable(struct wined3d_device *device, UINT light_idx, BOOL enable) +static HRESULT wined3d_device_set_light_enable(struct wined3d_device *device, UINT light_idx, BOOL enable) { struct wined3d_light_info *light_info; @@ -1548,7 +1548,7 @@ HRESULT CDECL wined3d_device_set_light_enable(struct wined3d_device *device, UIN return WINED3D_OK; } -HRESULT CDECL wined3d_device_set_clip_plane(struct wined3d_device *device, +static HRESULT wined3d_device_set_clip_plane(struct wined3d_device *device, UINT plane_idx, const struct wined3d_vec4 *plane) { TRACE("device %p, plane_idx %u, plane %p.\n", device, plane_idx, plane); @@ -1594,7 +1594,7 @@ HRESULT CDECL wined3d_device_get_clip_status(const struct wined3d_device *device return WINED3D_OK; } -void CDECL wined3d_device_set_material(struct wined3d_device *device, const struct wined3d_material *material) +static void wined3d_device_set_material(struct wined3d_device *device, const struct wined3d_material *material) { TRACE("device %p, material %p.\n", device, material); @@ -1793,7 +1793,7 @@ DWORD CDECL wined3d_device_get_render_state(const struct wined3d_device *device, return device->state.render_states[state]; } -void CDECL wined3d_device_set_sampler_state(struct wined3d_device *device, +static void wined3d_device_set_sampler_state(struct wined3d_device *device, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value) { TRACE("device %p, sampler_idx %u, state %s, value %#x.\n", @@ -2060,7 +2060,7 @@ struct wined3d_sampler * CDECL wined3d_device_get_vs_sampler(const struct wined3 return wined3d_device_get_sampler(device, WINED3D_SHADER_TYPE_VERTEX, idx); } -HRESULT CDECL wined3d_device_set_vs_consts_b(struct wined3d_device *device, +static HRESULT wined3d_device_set_vs_consts_b(struct wined3d_device *device, unsigned int start_idx, unsigned int count, const BOOL *constants) { unsigned int i; @@ -2086,7 +2086,7 @@ HRESULT CDECL wined3d_device_set_vs_consts_b(struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_set_vs_consts_i(struct wined3d_device *device, +static HRESULT wined3d_device_set_vs_consts_i(struct wined3d_device *device, unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants) { unsigned int i; @@ -2112,7 +2112,7 @@ HRESULT CDECL wined3d_device_set_vs_consts_i(struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_set_vs_consts_f(struct wined3d_device *device, +static HRESULT wined3d_device_set_vs_consts_f(struct wined3d_device *device, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants) { const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; @@ -2191,7 +2191,7 @@ struct wined3d_sampler * CDECL wined3d_device_get_ps_sampler(const struct wined3 return wined3d_device_get_sampler(device, WINED3D_SHADER_TYPE_PIXEL, idx); } -HRESULT CDECL wined3d_device_set_ps_consts_b(struct wined3d_device *device, +static HRESULT wined3d_device_set_ps_consts_b(struct wined3d_device *device, unsigned int start_idx, unsigned int count, const BOOL *constants) { unsigned int i; @@ -2217,7 +2217,7 @@ HRESULT CDECL wined3d_device_set_ps_consts_b(struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_set_ps_consts_i(struct wined3d_device *device, +static HRESULT wined3d_device_set_ps_consts_i(struct wined3d_device *device, unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants) { unsigned int i; @@ -2243,7 +2243,7 @@ HRESULT CDECL wined3d_device_set_ps_consts_i(struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_set_ps_consts_f(struct wined3d_device *device, +static HRESULT wined3d_device_set_ps_consts_f(struct wined3d_device *device, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants) { const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; @@ -3512,7 +3512,7 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, return hr; } -void CDECL wined3d_device_set_texture_stage_state(struct wined3d_device *device, +static void wined3d_device_set_texture_stage_state(struct wined3d_device *device, UINT stage, enum wined3d_texture_stage_state state, DWORD value) { const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; @@ -3544,7 +3544,7 @@ void CDECL wined3d_device_set_texture_stage_state(struct wined3d_device *device, wined3d_cs_emit_set_texture_state(device->cs, stage, state, value); } -void CDECL wined3d_device_set_texture(struct wined3d_device *device, +static void wined3d_device_set_texture(struct wined3d_device *device, UINT stage, struct wined3d_texture *texture) { struct wined3d_texture *prev; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c891c44608..05aa53dea0 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -101,7 +101,6 @@ @ cdecl wined3d_device_get_stream_source(ptr long ptr ptr ptr) @ cdecl wined3d_device_get_swapchain(ptr long) @ cdecl wined3d_device_get_swapchain_count(ptr) -@ cdecl wined3d_device_get_transform(ptr long ptr) @ cdecl wined3d_device_get_unordered_access_view(ptr long) @ cdecl wined3d_device_get_vertex_declaration(ptr) @ cdecl wined3d_device_get_vertex_shader(ptr) @@ -116,7 +115,6 @@ @ cdecl wined3d_device_resolve_sub_resource(ptr ptr long ptr long long) @ cdecl wined3d_device_set_base_vertex_index(ptr long) @ cdecl wined3d_device_set_blend_state(ptr ptr ptr) -@ cdecl wined3d_device_set_clip_plane(ptr long ptr) @ cdecl wined3d_device_set_clip_status(ptr ptr) @ cdecl wined3d_device_set_compute_shader(ptr ptr) @ cdecl wined3d_device_set_constant_buffer(ptr long long ptr) @@ -138,39 +136,25 @@ @ cdecl wined3d_device_set_hs_sampler(ptr long ptr) @ cdecl wined3d_device_set_hull_shader(ptr ptr) @ cdecl wined3d_device_set_index_buffer(ptr ptr long long) -@ cdecl wined3d_device_set_light(ptr long ptr) -@ cdecl wined3d_device_set_light_enable(ptr long long) -@ cdecl wined3d_device_set_material(ptr ptr) @ cdecl wined3d_device_set_max_frame_latency(ptr long) @ cdecl wined3d_device_set_multithreaded(ptr) @ cdecl wined3d_device_set_npatch_mode(ptr float) @ cdecl wined3d_device_set_pixel_shader(ptr ptr) @ cdecl wined3d_device_set_predication(ptr ptr long) @ cdecl wined3d_device_set_primitive_type(ptr long long) -@ cdecl wined3d_device_set_ps_consts_b(ptr long long ptr) -@ cdecl wined3d_device_set_ps_consts_f(ptr long long ptr) -@ cdecl wined3d_device_set_ps_consts_i(ptr long long ptr) @ cdecl wined3d_device_set_ps_resource_view(ptr long ptr) @ cdecl wined3d_device_set_ps_sampler(ptr long ptr) @ cdecl wined3d_device_set_rasterizer_state(ptr ptr) @ cdecl wined3d_device_set_render_state(ptr long long) @ cdecl wined3d_device_set_rendertarget_view(ptr long ptr long) -@ cdecl wined3d_device_set_sampler_state(ptr long long long) @ cdecl wined3d_device_set_scissor_rects(ptr long ptr) @ cdecl wined3d_device_set_software_vertex_processing(ptr long) @ cdecl wined3d_device_set_stream_output(ptr long ptr long) @ cdecl wined3d_device_set_stream_source(ptr long ptr long long) -@ cdecl wined3d_device_set_stream_source_freq(ptr long long) -@ cdecl wined3d_device_set_texture(ptr long ptr) -@ cdecl wined3d_device_set_texture_stage_state(ptr long long long) -@ cdecl wined3d_device_set_transform(ptr long ptr) @ cdecl wined3d_device_set_unordered_access_view(ptr long ptr long) @ cdecl wined3d_device_set_vertex_declaration(ptr ptr) @ cdecl wined3d_device_set_vertex_shader(ptr ptr) @ cdecl wined3d_device_set_viewports(ptr long ptr) -@ cdecl wined3d_device_set_vs_consts_b(ptr long long ptr) -@ cdecl wined3d_device_set_vs_consts_f(ptr long long ptr) -@ cdecl wined3d_device_set_vs_consts_i(ptr long long ptr) @ cdecl wined3d_device_set_vs_resource_view(ptr long ptr) @ cdecl wined3d_device_set_vs_sampler(ptr long ptr) @ cdecl wined3d_device_show_cursor(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b724424bce..a2a5fb8191 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2398,8 +2398,6 @@ HRESULT __cdecl wined3d_device_get_stream_source(const struct wined3d_device *de struct wined3d_swapchain * __cdecl wined3d_device_get_swapchain(const struct wined3d_device *device, UINT swapchain_idx); UINT __cdecl wined3d_device_get_swapchain_count(const struct wined3d_device *device); -void __cdecl wined3d_device_get_transform(const struct wined3d_device *device, - enum wined3d_transform_state state, struct wined3d_matrix *matrix); struct wined3d_unordered_access_view * __cdecl wined3d_device_get_unordered_access_view( const struct wined3d_device *device, unsigned int idx); struct wined3d_vertex_declaration * __cdecl wined3d_device_get_vertex_declaration(const struct wined3d_device *device); @@ -2425,8 +2423,6 @@ void __cdecl wined3d_device_resolve_sub_resource(struct wined3d_device *device, void __cdecl wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index); void __cdecl wined3d_device_set_blend_state(struct wined3d_device *device, struct wined3d_blend_state *blend_state, const struct wined3d_color *blend_factor); -HRESULT __cdecl wined3d_device_set_clip_plane(struct wined3d_device *device, - UINT plane_idx, const struct wined3d_vec4 *plane); HRESULT __cdecl wined3d_device_set_clip_status(struct wined3d_device *device, const struct wined3d_clip_status *clip_status); void __cdecl wined3d_device_set_compute_shader(struct wined3d_device *device, struct wined3d_shader *shader); @@ -2463,10 +2459,6 @@ void __cdecl wined3d_device_set_hs_sampler(struct wined3d_device *device, void __cdecl wined3d_device_set_hull_shader(struct wined3d_device *device, struct wined3d_shader *shader); void __cdecl wined3d_device_set_index_buffer(struct wined3d_device *device, struct wined3d_buffer *index_buffer, enum wined3d_format_id format_id, unsigned int offset); -HRESULT __cdecl wined3d_device_set_light(struct wined3d_device *device, - UINT light_idx, const struct wined3d_light *light); -HRESULT __cdecl wined3d_device_set_light_enable(struct wined3d_device *device, UINT light_idx, BOOL enable); -void __cdecl wined3d_device_set_material(struct wined3d_device *device, const struct wined3d_material *material); void __cdecl wined3d_device_set_max_frame_latency(struct wined3d_device *device, unsigned int max_frame_latency); void __cdecl wined3d_device_set_multithreaded(struct wined3d_device *device); HRESULT __cdecl wined3d_device_set_npatch_mode(struct wined3d_device *device, float segments); @@ -2475,12 +2467,6 @@ void __cdecl wined3d_device_set_predication(struct wined3d_device *device, struct wined3d_query *predicate, BOOL value); void __cdecl wined3d_device_set_primitive_type(struct wined3d_device *device, enum wined3d_primitive_type primitive_topology, unsigned int patch_vertex_count); -HRESULT __cdecl wined3d_device_set_ps_consts_b(struct wined3d_device *device, - unsigned int start_idx, unsigned int count, const BOOL *constants); -HRESULT __cdecl wined3d_device_set_ps_consts_f(struct wined3d_device *device, - unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants); -HRESULT __cdecl wined3d_device_set_ps_consts_i(struct wined3d_device *device, - unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants); void __cdecl wined3d_device_set_ps_resource_view(struct wined3d_device *device, UINT idx, struct wined3d_shader_resource_view *view); void __cdecl wined3d_device_set_ps_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler); @@ -2490,8 +2476,6 @@ void __cdecl wined3d_device_set_render_state(struct wined3d_device *device, enum wined3d_render_state state, DWORD value); HRESULT __cdecl wined3d_device_set_rendertarget_view(struct wined3d_device *device, unsigned int view_idx, struct wined3d_rendertarget_view *view, BOOL set_viewport); -void __cdecl wined3d_device_set_sampler_state(struct wined3d_device *device, - UINT sampler_idx, enum wined3d_sampler_state state, DWORD value); void __cdecl wined3d_device_set_scissor_rects(struct wined3d_device *device, unsigned int rect_count, const RECT *rect); void __cdecl wined3d_device_set_software_vertex_processing(struct wined3d_device *device, BOOL software); @@ -2499,12 +2483,6 @@ void __cdecl wined3d_device_set_stream_output(struct wined3d_device *device, UIN struct wined3d_buffer *buffer, UINT offset); HRESULT __cdecl wined3d_device_set_stream_source(struct wined3d_device *device, UINT stream_idx, struct wined3d_buffer *buffer, UINT offset, UINT stride); -HRESULT __cdecl wined3d_device_set_stream_source_freq(struct wined3d_device *device, UINT stream_idx, UINT divider); -void __cdecl wined3d_device_set_texture(struct wined3d_device *device, UINT stage, struct wined3d_texture *texture); -void __cdecl wined3d_device_set_texture_stage_state(struct wined3d_device *device, - UINT stage, enum wined3d_texture_stage_state state, DWORD value); -void __cdecl wined3d_device_set_transform(struct wined3d_device *device, - enum wined3d_transform_state state, const struct wined3d_matrix *matrix); void __cdecl wined3d_device_set_unordered_access_view(struct wined3d_device *device, unsigned int idx, struct wined3d_unordered_access_view *uav, unsigned int initial_count); void __cdecl wined3d_device_set_vertex_declaration(struct wined3d_device *device, @@ -2512,12 +2490,6 @@ void __cdecl wined3d_device_set_vertex_declaration(struct wined3d_device *device void __cdecl wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader); void __cdecl wined3d_device_set_viewports(struct wined3d_device *device, unsigned int viewport_count, const struct wined3d_viewport *viewports); -HRESULT __cdecl wined3d_device_set_vs_consts_b(struct wined3d_device *device, - unsigned int start_idx, unsigned int count, const BOOL *constants); -HRESULT __cdecl wined3d_device_set_vs_consts_f(struct wined3d_device *device, - unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants); -HRESULT __cdecl wined3d_device_set_vs_consts_i(struct wined3d_device *device, - unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants); void __cdecl wined3d_device_set_vs_resource_view(struct wined3d_device *device, UINT idx, struct wined3d_shader_resource_view *view); void __cdecl wined3d_device_set_vs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler); -- 2.25.1

2 9

[PATCH v2 1/3] ntdll/tests: Separate invalid name tests for RtlDosPathNameToNtPathName_U().
by Zebediah Figura 05 Mar '20

05 Mar '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/tests/path.c | 210 +++++++++++++++++++++------------------- 1 file changed, 111 insertions(+), 99 deletions(-) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 195dea37e88..2dc1ccd9910 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -402,7 +402,7 @@ static void test_RtlDosPathNameToNtPathName_U(void) UNICODE_STRING nameW; WCHAR *file_part; NTSTATUS status; - BOOL ret, expect; + BOOL ret; int i; static const struct @@ -410,123 +410,135 @@ static void test_RtlDosPathNameToNtPathName_U(void) const char *dos; const char *nt; int file_offset; /* offset to file part */ - NTSTATUS status; - NTSTATUS alt_status; - int broken; } tests[] = { - { "c:\\", "\\??\\c:\\", -1, STATUS_SUCCESS }, - { "c:/", "\\??\\c:\\", -1, STATUS_SUCCESS }, - { "c:/foo", "\\??\\c:\\foo", 7, STATUS_SUCCESS }, - { "c:/foo.", "\\??\\c:\\foo", 7, STATUS_SUCCESS }, - { "c:/foo/", "\\??\\c:\\foo\\", -1, STATUS_SUCCESS }, - { "c:/foo//", "\\??\\c:\\foo\\", -1, STATUS_SUCCESS }, - { "C:/foo", "\\??\\C:\\foo", 7, STATUS_SUCCESS }, - { "C:/foo/bar", "\\??\\C:\\foo\\bar", 11, STATUS_SUCCESS }, - { "C:/foo/bar", "\\??\\C:\\foo\\bar", 11, STATUS_SUCCESS }, - { "c:.", "\\??\\C:\\windows", 7, STATUS_SUCCESS }, - { "c:foo", "\\??\\C:\\windows\\foo", 15, STATUS_SUCCESS }, - { "c:foo/bar", "\\??\\C:\\windows\\foo\\bar", 19, STATUS_SUCCESS }, - { "c:./foo", "\\??\\C:\\windows\\foo", 15, STATUS_SUCCESS }, - { "c:/./foo", "\\??\\c:\\foo", 7, STATUS_SUCCESS }, - { "c:/foo/.", "\\??\\c:\\foo", 7, STATUS_SUCCESS }, - { "c:/foo/./bar", "\\??\\c:\\foo\\bar", 11, STATUS_SUCCESS }, - { "c:/foo/../bar", "\\??\\c:\\bar", 7, STATUS_SUCCESS }, - { "\\foo", "\\??\\C:\\foo", 7, STATUS_SUCCESS }, - { "foo", "\\??\\C:\\windows\\foo", 15, STATUS_SUCCESS }, - { ".", "\\??\\C:\\windows", 7, STATUS_SUCCESS }, - { "./", "\\??\\C:\\windows\\", -1, STATUS_SUCCESS }, - { "..", "\\??\\C:\\", -1, STATUS_SUCCESS }, - { "...", "\\??\\C:\\windows\\", -1, STATUS_SUCCESS }, - { "./foo", "\\??\\C:\\windows\\foo", 15, STATUS_SUCCESS }, - { "foo/..", "\\??\\C:\\windows", 7, STATUS_SUCCESS }, - { "AUX" , "\\??\\AUX", -1, STATUS_SUCCESS }, - { "COM1" , "\\??\\COM1", -1, STATUS_SUCCESS }, - { "?<>*\"|:", "\\??\\C:\\windows\\?<>*\"|:", 15, STATUS_SUCCESS }, - - { "", NULL, -1, STATUS_OBJECT_NAME_INVALID, STATUS_OBJECT_PATH_NOT_FOUND }, - { NULL, NULL, -1, STATUS_OBJECT_NAME_INVALID, STATUS_OBJECT_PATH_NOT_FOUND }, - { " ", NULL, -1, STATUS_OBJECT_NAME_INVALID, STATUS_OBJECT_PATH_NOT_FOUND }, - - { "\\\\foo", "\\??\\UNC\\foo", -1, STATUS_SUCCESS }, - { "//foo", "\\??\\UNC\\foo", -1, STATUS_SUCCESS }, - { "\\/foo", "\\??\\UNC\\foo", -1, STATUS_SUCCESS }, - { "//", "\\??\\UNC\\", -1, STATUS_SUCCESS }, - { "//foo/", "\\??\\UNC\\foo\\", -1, STATUS_SUCCESS }, - - { "//.", "\\??\\", -1, STATUS_SUCCESS }, - { "//./", "\\??\\", -1, STATUS_SUCCESS }, - { "//.//", "\\??\\", -1, STATUS_SUCCESS }, - { "//./foo", "\\??\\foo", 4, STATUS_SUCCESS }, - { "//./foo/", "\\??\\foo\\", -1, STATUS_SUCCESS }, - { "//./foo/bar", "\\??\\foo\\bar", 8, STATUS_SUCCESS }, - { "//./foo/.", "\\??\\foo", 4, STATUS_SUCCESS }, - { "//./foo/..", "\\??\\", -1, STATUS_SUCCESS }, - - { "//?", "\\??\\", -1, STATUS_SUCCESS }, - { "//?/", "\\??\\", -1, STATUS_SUCCESS }, - { "//?//", "\\??\\", -1, STATUS_SUCCESS }, - { "//?/foo", "\\??\\foo", 4, STATUS_SUCCESS }, - { "//?/foo/", "\\??\\foo\\", -1, STATUS_SUCCESS }, - { "//?/foo/bar", "\\??\\foo\\bar", 8, STATUS_SUCCESS }, - { "//?/foo/.", "\\??\\foo", 4, STATUS_SUCCESS }, - { "//?/foo/..", "\\??\\", -1, STATUS_SUCCESS }, - - { "\\\\?", "\\??\\", -1, STATUS_SUCCESS }, - { "\\\\?\\", "\\??\\", -1, STATUS_SUCCESS }, - - { "\\\\?\\/", "\\??\\/", 4, STATUS_SUCCESS }, - { "\\\\?\\foo", "\\??\\foo", 4, STATUS_SUCCESS }, - { "\\\\?\\foo/", "\\??\\foo/", 4, STATUS_SUCCESS }, - { "\\\\?\\foo/bar", "\\??\\foo/bar", 4, STATUS_SUCCESS }, - { "\\\\?\\foo/.", "\\??\\foo/.", 4, STATUS_SUCCESS }, - { "\\\\?\\foo/..", "\\??\\foo/..", 4, STATUS_SUCCESS }, - { "\\\\?\\\\", "\\??\\\\", -1, STATUS_SUCCESS }, - { "\\\\?\\\\\\", "\\??\\\\\\", -1, STATUS_SUCCESS }, - { "\\\\?\\foo\\", "\\??\\foo\\", -1, STATUS_SUCCESS }, - { "\\\\?\\foo\\bar", "\\??\\foo\\bar", 8, STATUS_SUCCESS }, - { "\\\\?\\foo\\.", "\\??\\foo\\.", 8, STATUS_SUCCESS }, - { "\\\\?\\foo\\..", "\\??\\foo\\..", 8, STATUS_SUCCESS }, - - { "\\??", "\\??\\C:\\??", 7, STATUS_SUCCESS }, - { "\\??\\", "\\??\\C:\\??\\", -1, STATUS_SUCCESS }, - - { "\\??\\/", "\\??\\/", 4, STATUS_SUCCESS }, - { "\\??\\foo", "\\??\\foo", 4, STATUS_SUCCESS }, - { "\\??\\foo/", "\\??\\foo/", 4, STATUS_SUCCESS }, - { "\\??\\foo/bar", "\\??\\foo/bar", 4, STATUS_SUCCESS }, - { "\\??\\foo/.", "\\??\\foo/.", 4, STATUS_SUCCESS }, - { "\\??\\foo/..", "\\??\\foo/..", 4, STATUS_SUCCESS }, - { "\\??\\\\", "\\??\\\\", -1, STATUS_SUCCESS }, - { "\\??\\\\\\", "\\??\\\\\\", -1, STATUS_SUCCESS }, - { "\\??\\foo\\", "\\??\\foo\\", -1, STATUS_SUCCESS }, - { "\\??\\foo\\bar", "\\??\\foo\\bar", 8, STATUS_SUCCESS }, - { "\\??\\foo\\.", "\\??\\foo\\.", 8, STATUS_SUCCESS }, - { "\\??\\foo\\..", "\\??\\foo\\..", 8, STATUS_SUCCESS }, + { "c:\\", "\\??\\c:\\", -1 }, + { "c:/", "\\??\\c:\\", -1 }, + { "c:/foo", "\\??\\c:\\foo", 7 }, + { "c:/foo.", "\\??\\c:\\foo", 7 }, + { "c:/foo/", "\\??\\c:\\foo\\", -1 }, + { "c:/foo//", "\\??\\c:\\foo\\", -1 }, + { "C:/foo", "\\??\\C:\\foo", 7 }, + { "C:/foo/bar", "\\??\\C:\\foo\\bar", 11 }, + { "C:/foo/bar", "\\??\\C:\\foo\\bar", 11 }, + { "c:.", "\\??\\C:\\windows", 7 }, + { "c:foo", "\\??\\C:\\windows\\foo", 15 }, + { "c:foo/bar", "\\??\\C:\\windows\\foo\\bar", 19 }, + { "c:./foo", "\\??\\C:\\windows\\foo", 15 }, + { "c:/./foo", "\\??\\c:\\foo", 7 }, + { "c:/foo/.", "\\??\\c:\\foo", 7 }, + { "c:/foo/./bar", "\\??\\c:\\foo\\bar", 11 }, + { "c:/foo/../bar", "\\??\\c:\\bar", 7 }, + { "\\foo", "\\??\\C:\\foo", 7 }, + { "foo", "\\??\\C:\\windows\\foo", 15 }, + { ".", "\\??\\C:\\windows", 7 }, + { "./", "\\??\\C:\\windows\\", -1 }, + { "..", "\\??\\C:\\", -1 }, + { "...", "\\??\\C:\\windows\\", -1 }, + { "./foo", "\\??\\C:\\windows\\foo", 15 }, + { "foo/..", "\\??\\C:\\windows", 7 }, + { "AUX" , "\\??\\AUX", -1 }, + { "COM1" , "\\??\\COM1", -1 }, + { "?<>*\"|:", "\\??\\C:\\windows\\?<>*\"|:", 15 }, + + { "\\\\foo", "\\??\\UNC\\foo", -1 }, + { "//foo", "\\??\\UNC\\foo", -1 }, + { "\\/foo", "\\??\\UNC\\foo", -1 }, + { "//", "\\??\\UNC\\", -1 }, + { "//foo/", "\\??\\UNC\\foo\\", -1 }, + + { "//.", "\\??\\", -1 }, + { "//./", "\\??\\", -1 }, + { "//.//", "\\??\\", -1 }, + { "//./foo", "\\??\\foo", 4 }, + { "//./foo/", "\\??\\foo\\", -1 }, + { "//./foo/bar", "\\??\\foo\\bar", 8 }, + { "//./foo/.", "\\??\\foo", 4 }, + { "//./foo/..", "\\??\\", -1 }, + + { "//?", "\\??\\", -1 }, + { "//?/", "\\??\\", -1 }, + { "//?//", "\\??\\", -1 }, + { "//?/foo", "\\??\\foo", 4 }, + { "//?/foo/", "\\??\\foo\\", -1 }, + { "//?/foo/bar", "\\??\\foo\\bar", 8 }, + { "//?/foo/.", "\\??\\foo", 4 }, + { "//?/foo/..", "\\??\\", -1 }, + + { "\\\\?", "\\??\\", -1 }, + { "\\\\?\\", "\\??\\", -1 }, + + { "\\\\?\\/", "\\??\\/", 4 }, + { "\\\\?\\foo", "\\??\\foo", 4 }, + { "\\\\?\\foo/", "\\??\\foo/", 4 }, + { "\\\\?\\foo/bar", "\\??\\foo/bar", 4 }, + { "\\\\?\\foo/.", "\\??\\foo/.", 4 }, + { "\\\\?\\foo/..", "\\??\\foo/..", 4 }, + { "\\\\?\\\\", "\\??\\\\", -1 }, + { "\\\\?\\\\\\", "\\??\\\\\\", -1 }, + { "\\\\?\\foo\\", "\\??\\foo\\", -1 }, + { "\\\\?\\foo\\bar", "\\??\\foo\\bar", 8 }, + { "\\\\?\\foo\\.", "\\??\\foo\\.", 8 }, + { "\\\\?\\foo\\..", "\\??\\foo\\..", 8 }, + + { "\\??", "\\??\\C:\\??", 7 }, + { "\\??\\", "\\??\\C:\\??\\", -1 }, + + { "\\??\\/", "\\??\\/", 4 }, + { "\\??\\foo", "\\??\\foo", 4 }, + { "\\??\\foo/", "\\??\\foo/", 4 }, + { "\\??\\foo/bar", "\\??\\foo/bar", 4 }, + { "\\??\\foo/.", "\\??\\foo/.", 4 }, + { "\\??\\foo/..", "\\??\\foo/..", 4 }, + { "\\??\\\\", "\\??\\\\", -1 }, + { "\\??\\\\\\", "\\??\\\\\\", -1 }, + { "\\??\\foo\\", "\\??\\foo\\", -1 }, + { "\\??\\foo\\bar", "\\??\\foo\\bar", 8 }, + { "\\??\\foo\\.", "\\??\\foo\\.", 8 }, + { "\\??\\foo\\..", "\\??\\foo\\..", 8 }, }; GetCurrentDirectoryA(sizeof(curdir), curdir); SetCurrentDirectoryA("C:\\windows\\"); + ret = pRtlDosPathNameToNtPathName_U(NULL, &nameW, &file_part, NULL); + ok(!ret, "Got %d.\n", ret); + + ret = pRtlDosPathNameToNtPathName_U(L"", &nameW, &file_part, NULL); + ok(!ret, "Got %d.\n", ret); + + ret = pRtlDosPathNameToNtPathName_U(L" ", &nameW, &file_part, NULL); + ok(!ret, "Got %d.\n", ret); + + if (pRtlDosPathNameToNtPathName_U_WithStatus) + { + status = pRtlDosPathNameToNtPathName_U_WithStatus(NULL, &nameW, &file_part, NULL); + ok(status == STATUS_OBJECT_NAME_INVALID || status == STATUS_OBJECT_PATH_NOT_FOUND /* 2003 */, + "Got status %#x.\n", status); + + status = pRtlDosPathNameToNtPathName_U_WithStatus(L"", &nameW, &file_part, NULL); + ok(status == STATUS_OBJECT_NAME_INVALID || status == STATUS_OBJECT_PATH_NOT_FOUND /* 2003 */, + "Got status %#x.\n", status); + + status = pRtlDosPathNameToNtPathName_U_WithStatus(L" ", &nameW, &file_part, NULL); + ok(status == STATUS_OBJECT_NAME_INVALID || status == STATUS_OBJECT_PATH_NOT_FOUND /* 2003 */, + "Got status %#x.\n", status); + } + for (i = 0; i < ARRAY_SIZE(tests); ++i) { MultiByteToWideChar(CP_ACP, 0, tests[i].dos, -1, path, ARRAY_SIZE(path)); ret = pRtlDosPathNameToNtPathName_U(path, &nameW, &file_part, NULL); + ok(ret == TRUE, "%s: Got %d.\n", tests[i].dos, ret); if (pRtlDosPathNameToNtPathName_U_WithStatus) { RtlFreeUnicodeString(&nameW); status = pRtlDosPathNameToNtPathName_U_WithStatus(path, &nameW, &file_part, NULL); - ok(status == tests[i].status || status == tests[i].alt_status, - "%s: Expected status %#x, got %#x.\n", tests[i].dos, tests[i].status, status); + ok(status == STATUS_SUCCESS, "%s: Got status %#x.\n", tests[i].dos, status); } - expect = (tests[i].status == STATUS_SUCCESS); - ok(ret == expect, "%s: Expected %#x, got %#x.\n", tests[i].dos, expect, ret); - - if (ret != TRUE) continue; - if (!strncmp(tests[i].dos, "\\??\\", 4) && tests[i].dos[4] && broken(!memcmp(nameW.Buffer, broken_global_prefix, sizeof(broken_global_prefix)))) { -- 2.25.1

1 2