March 2019 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : setupapi: Add SetupDiInstallDeviceInterfaces.
by Alexandre Julliard March 7, 2019

March 7, 2019

Module: wine Branch: master Commit: 4d81d41899f85dc48d13a86e0045483aed9c7ad0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d81d41899f85dc48d13a86e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 6 21:25:17 2019 +0100 setupapi: Add SetupDiInstallDeviceInterfaces. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45963 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 11 +++++++++++ dlls/setupapi/setupapi.spec | 1 + 2 files changed, 12 insertions(+) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 537b335..582da37 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3855,3 +3855,14 @@ BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_ SetLastError(ls); return !ls; } + +/*********************************************************************** + * SetupDiInstallDeviceInterfaces (SETUPAPI.@) + */ +BOOL WINAPI SetupDiInstallDeviceInterfaces(HDEVINFO dev, PSP_DEVINFO_DATA info_data) +{ + FIXME("%p, %p stub\n", dev, info_data); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index d633211..1be2b62 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -367,6 +367,7 @@ @ stub SetupDiInstallClassExW @ stdcall SetupDiInstallClassW(long wstr long ptr) @ stub SetupDiInstallDevice +@ stdcall SetupDiInstallDeviceInterfaces(ptr ptr) @ stub SetupDiInstallDriverFiles @ stdcall SetupDiLoadClassIcon(ptr ptr ptr) @ stub SetupDiMoveDuplicateDevice

1 0

Michael Stefaniuc : d3dx9: Pass a struct d3dx_effect to d3dx9_copy_data().
by Alexandre Julliard March 7, 2019

March 7, 2019

Module: wine Branch: master Commit: 26b9b04e7f40c7a2011684f01ff07be91047b492 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26b9b04e7f40c7a2011684f0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 5 22:34:22 2019 +0100 d3dx9: Pass a struct d3dx_effect to d3dx9_copy_data(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 992d7b4..acc0eb7 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5315,9 +5315,9 @@ static HRESULT d3dx9_parse_name(char **name, const char *ptr) return D3D_OK; } -static HRESULT d3dx9_copy_data(struct d3dx9_base_effect *base, unsigned int object_id, const char **ptr) +static HRESULT d3dx9_copy_data(struct d3dx_effect *effect, unsigned int object_id, const char **ptr) { - struct d3dx_object *object = &base->objects[object_id]; + struct d3dx_object *object = &effect->base_effect.objects[object_id]; if (object->size || object->data) { @@ -6168,7 +6168,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, case D3DXPT_VERTEXSHADER: case D3DXPT_PIXELSHADER: state->type = ST_CONSTANT; - if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr))) + if (FAILED(hr = d3dx9_copy_data(effect, param->object_id, ptr))) return hr; if (object->data) @@ -6187,7 +6187,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, case D3DXPT_FLOAT: case D3DXPT_STRING: state->type = ST_FXLC; - if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr))) + if (FAILED(hr = d3dx9_copy_data(effect, param->object_id, ptr))) return hr; if (FAILED(hr = d3dx_create_param_eval(base, object->data, object->size, param->type, &param->param_eval, get_version_counter_ptr(base), NULL, 0))) @@ -6202,7 +6202,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, case 1: state->type = ST_PARAMETER; - if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr))) + if (FAILED(hr = d3dx9_copy_data(effect, param->object_id, ptr))) return hr; TRACE("Looking for parameter %s.\n", debugstr_a(object->data)); @@ -6234,7 +6234,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, case 2: state->type = ST_ARRAY_SELECTOR; - if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr))) + if (FAILED(hr = d3dx9_copy_data(effect, param->object_id, ptr))) return hr; hr = d3dx_parse_array_selector(effect, state, skip_constants, skip_constants_count); break; @@ -6344,7 +6344,7 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U read_dword(&ptr, &id); TRACE("id: %u.\n", id); - if (FAILED(hr = d3dx9_copy_data(base, id, &ptr))) + if (FAILED(hr = d3dx9_copy_data(effect, id, &ptr))) goto err_out; if (base->objects[id].data)

1 0

Michael Stefaniuc : d3dx9: Move object_count out of struct d3dx9_base_effect.
by Alexandre Julliard March 7, 2019

March 7, 2019

Module: wine Branch: master Commit: 54bdc66acf4abe1f1fa38238ed824c2372e1ff91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54bdc66acf4abe1f1fa38238… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 5 22:34:21 2019 +0100 d3dx9: Move object_count out of struct d3dx9_base_effect. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index bbbfb45..992d7b4 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -153,7 +153,6 @@ struct d3dx9_base_effect struct d3dx_effect *effect; UINT technique_count; - UINT object_count; struct d3dx_top_level_parameter *parameters; struct d3dx_technique *techniques; @@ -176,6 +175,7 @@ struct d3dx_effect struct d3dx9_base_effect base_effect; unsigned int parameter_count; + unsigned int object_count; struct ID3DXEffectStateManager *manager; struct IDirect3DDevice9 *device; @@ -707,7 +707,7 @@ static void d3dx9_base_effect_cleanup(struct d3dx9_base_effect *base) if (base->objects) { - for (i = 0; i < base->object_count; ++i) + for (i = 0; i < base->effect->object_count; ++i) { free_object(&base->objects[i]); } @@ -6270,10 +6270,10 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U skip_dword_unknown(&ptr, 1); - read_dword(&ptr, &base->object_count); - TRACE("Object count: %u.\n", base->object_count); + read_dword(&ptr, &effect->object_count); + TRACE("Object count: %u.\n", effect->object_count); - base->objects = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*base->objects) * base->object_count); + base->objects = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*base->objects) * effect->object_count); if (!base->objects) { ERR("Out of memory.\n"); @@ -6399,7 +6399,7 @@ err_out: if (base->objects) { - for (i = 0; i < base->object_count; ++i) + for (i = 0; i < effect->object_count; ++i) { free_object(&base->objects[i]); }

1 0

Michael Müller : msvidc32: Fix calculation of stride and size.
by Alexandre Julliard March 7, 2019

March 7, 2019

Module: wine Branch: master Commit: fb7f937305f9242c675d4ff9a7976cf121710159 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb7f937305f9242c675d4ff9… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 6 08:57:40 2019 +0100 msvidc32: Fix calculation of stride and size. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=23175 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=25180 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/tests/msvfw.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msvidc32/msvideo1.c | 34 +++++++++++++++++++++++++--------- 2 files changed, 64 insertions(+), 9 deletions(-) diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 2468f6f..2d85e26 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -252,6 +252,45 @@ static void test_Locate(void) ok(err == ICERR_OK, "Query MSVC 16->24: %d\n", err); bo.biBitCount = 16; + bi.biWidth = 553; + + bi.biBitCount = 8; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query MSVC output format: %d\n", err); + ok(tmp.biBitCount == 8, "Expected 8 bit, got %d bit\n", tmp.biBitCount); + ok(tmp.biWidth == 552, "Expected width 552, got %d\n", tmp.biWidth); + ok(tmp.biSizeImage == get_stride(552, 8) * 8, "Expected size %d, got %d\n", + get_stride(552, 8) * 8, tmp.biSizeImage); + + bi.biBitCount = 15; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_BADFORMAT, "Query MSVC output format: %d\n", err); + + bi.biBitCount = 16; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query MSVC output format: %d\n", err); + ok(tmp.biBitCount == 16, "Expected 16 bit, got %d bit\n", tmp.biBitCount); + ok(tmp.biWidth == 552, "Expected width 552, got %d\n", tmp.biWidth); + ok(tmp.biSizeImage == get_stride(552, 16) * 8, "Expected size %d, got %d\n", + get_stride(552, 16) * 8, tmp.biSizeImage); + + bi.biBitCount = 24; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_BADFORMAT, "Query MSVC output format: %d\n", err); + + bi.biBitCount = 32; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_BADFORMAT, "Query MSVC output format: %d\n", err); + + bi.biHeight = 17; + bi.biBitCount = 8; + err = ICDecompressGetFormat(h, &bi, &tmp); + ok(err == ICERR_OK, "Query MSVC output format: %d\n", err); + ok(tmp.biHeight == 16, "Expected height 16, got %d\n", tmp.biHeight); + bi.biHeight = 8; + + bi.biWidth = 32; + bi.biCompression = mmioFOURCC('m','s','v','c'); err = ICDecompressQuery(h, &bi, &bo); ok(err == ICERR_BADFORMAT, "Query msvc->RGB16: %d\n", err); diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index 9c1323b..7b866d0 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -70,6 +70,11 @@ typedef struct Msvideo1Context { int depth; } Msvideo1Context; +static inline int get_stride(int width, int depth) +{ + return ((depth * width + 31) >> 3) & ~3; +} + static void msvideo1_decode_8bit( int width, int height, const unsigned char *buf, int buf_size, unsigned char *pixels, int stride) @@ -362,12 +367,17 @@ CRAM_DecompressGetFormat( Msvideo1Context *info, LPBITMAPINFO in, LPBITMAPINFO o if (in->bmiHeader.biBitCount <= 8) size += in->bmiHeader.biClrUsed * sizeof(RGBQUAD); + if (in->bmiHeader.biBitCount != 8 && in->bmiHeader.biBitCount != 16) + return ICERR_BADFORMAT; + if( out ) { memcpy( out, in, size ); + out->bmiHeader.biWidth = in->bmiHeader.biWidth & ~1; + out->bmiHeader.biHeight = in->bmiHeader.biHeight & ~1; out->bmiHeader.biCompression = BI_RGB; - out->bmiHeader.biSizeImage = in->bmiHeader.biHeight - * in->bmiHeader.biWidth *4; + out->bmiHeader.biSizeImage = in->bmiHeader.biHeight * + get_stride(out->bmiHeader.biWidth, out->bmiHeader.biBitCount); return ICERR_OK; } @@ -398,6 +408,8 @@ static LRESULT CRAM_DecompressBegin( Msvideo1Context *info, LPBITMAPINFO in, LPB static void convert_depth(char *input, int depth_in, char *output, BITMAPINFOHEADER *out_hdr) { int x, y; + int stride_in = get_stride(out_hdr->biWidth, depth_in); + int stride_out = get_stride(out_hdr->biWidth, out_hdr->biBitCount); if (depth_in == 16 && out_hdr->biBitCount == 24) { @@ -409,15 +421,17 @@ static void convert_depth(char *input, int depth_in, char *output, BITMAPINFOHEA 0xc5, 0xce, 0xd6, 0xde, 0xe6, 0xef, 0xf7, 0xff, }; - WORD *src = (WORD *)input; for (y = 0; y < out_hdr->biHeight; y++) { + WORD *src_row = (WORD *)(input + y * stride_in); + char *out_row = output + y * stride_out; + for (x = 0; x < out_hdr->biWidth; x++) { - WORD pixel = *src++; - *output++ = convert_5to8[(pixel & 0x7c00u) >> 10]; - *output++ = convert_5to8[(pixel & 0x03e0u) >> 5]; - *output++ = convert_5to8[(pixel & 0x001fu)]; + WORD pixel = *src_row++; + *out_row++ = convert_5to8[(pixel & 0x7c00u) >> 10]; + *out_row++ = convert_5to8[(pixel & 0x03e0u) >> 5]; + *out_row++ = convert_5to8[(pixel & 0x001fu)]; } } } @@ -439,7 +453,6 @@ static LRESULT CRAM_Decompress( Msvideo1Context *info, ICDECOMPRESS *icd, DWORD width = icd->lpbiInput->biWidth; height = icd->lpbiInput->biHeight; - stride = width; /* in bytes or 16bit words */ sz = icd->lpbiInput->biSizeImage; output = icd->lpOutput; @@ -452,11 +465,13 @@ static LRESULT CRAM_Decompress( Msvideo1Context *info, ICDECOMPRESS *icd, DWORD if (info->depth == 8) { + stride = get_stride(width, 8); msvideo1_decode_8bit( width, height, icd->lpInput, sz, output, stride ); } else { + stride = get_stride(width, 16) / 2; msvideo1_decode_16bit( width, height, icd->lpInput, sz, output, stride ); } @@ -484,7 +499,6 @@ static LRESULT CRAM_DecompressEx( Msvideo1Context *info, ICDECOMPRESSEX *icd, DW width = icd->lpbiSrc->biWidth; height = icd->lpbiSrc->biHeight; - stride = width; sz = icd->lpbiSrc->biSizeImage; output = icd->lpDst; @@ -497,11 +511,13 @@ static LRESULT CRAM_DecompressEx( Msvideo1Context *info, ICDECOMPRESSEX *icd, DW if (info->depth == 8) { + stride = get_stride(width, 8); msvideo1_decode_8bit( width, height, icd->lpSrc, sz, output, stride ); } else { + stride = get_stride(width, 16) / 2; msvideo1_decode_16bit( width, height, icd->lpSrc, sz, output, stride ); }

1 0

Józef Kucia : dxgi: Trace mode on separate line for FindClosestMatchingMode().
by Alexandre Julliard March 7, 2019

March 7, 2019

Module: wine Branch: master Commit: b1a4af225807eea48300be440ff9e1ac691041de URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1a4af225807eea48300be44… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 7 11:21:24 2019 +0100 dxgi: Trace mode on separate line for FindClosestMatchingMode(). For more readable logs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/output.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 4a4b0fc..123dee8 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -305,8 +305,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode(IDXGIOutput struct wined3d_display_mode wined3d_mode; HRESULT hr; - TRACE("iface %p, mode %s, closest_match %p, device %p.\n", - iface, debug_dxgi_mode(mode), closest_match, device); + TRACE("iface %p, mode %p, closest_match %p, device %p.\n", + iface, mode, closest_match, device); + + TRACE("Mode: %s.\n", debug_dxgi_mode(mode)); wined3d_display_mode_from_dxgi(&wined3d_mode, mode); hr = dxgi_output_find_closest_matching_mode(output, &wined3d_mode, device); @@ -422,8 +424,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode1(IDXGIOutpu struct wined3d_display_mode wined3d_mode; HRESULT hr; - TRACE("iface %p, mode %s, closest_match %p, device %p.\n", - iface, debug_dxgi_mode1(mode), closest_match, device); + TRACE("iface %p, mode %p, closest_match %p, device %p.\n", + iface, mode, closest_match, device); + + TRACE("Mode: %s.\n", debug_dxgi_mode1(mode)); wined3d_display_mode_from_dxgi1(&wined3d_mode, mode); hr = dxgi_output_find_closest_matching_mode(output, &wined3d_mode, device);

1 0

Józef Kucia : dxgi: Implement dxgi_output_GetDisplayModeList1().
by Alexandre Julliard March 7, 2019

March 7, 2019

Module: wine Branch: master Commit: b817be926d86510874b6b728c75fc62ae697c32e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b817be926d86510874b6b728… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 7 11:21:23 2019 +0100 dxgi: Implement dxgi_output_GetDisplayModeList1(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/output.c | 149 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 90 insertions(+), 59 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index b1f20b9..4a4b0fc 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -75,6 +75,85 @@ static HRESULT dxgi_output_find_closest_matching_mode(struct dxgi_output *output return hr; } +enum dxgi_mode_struct_version +{ + DXGI_MODE_STRUCT_VERSION_0, + DXGI_MODE_STRUCT_VERSION_1, +}; + +static HRESULT dxgi_output_get_display_mode_list(struct dxgi_output *output, + DXGI_FORMAT format, unsigned int *mode_count, void *modes, + enum dxgi_mode_struct_version struct_version) +{ + enum wined3d_format_id wined3d_format; + struct wined3d_display_mode mode; + unsigned int i, max_count; + struct wined3d *wined3d; + HRESULT hr; + + if (!mode_count) + return DXGI_ERROR_INVALID_CALL; + + if (format == DXGI_FORMAT_UNKNOWN) + { + *mode_count = 0; + return S_OK; + } + + 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, + wined3d_format, WINED3D_SCANLINE_ORDERING_UNKNOWN); + + if (!modes) + { + wined3d_mutex_unlock(); + *mode_count = max_count; + return S_OK; + } + + if (max_count > *mode_count) + { + wined3d_mutex_unlock(); + return DXGI_ERROR_MORE_DATA; + } + + *mode_count = max_count; + + 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))) + { + WARN("Failed to enum adapter mode %u, hr %#x.\n", i, hr); + wined3d_mutex_unlock(); + return hr; + } + + switch (struct_version) + { + case DXGI_MODE_STRUCT_VERSION_0: + { + DXGI_MODE_DESC *desc = modes; + dxgi_mode_from_wined3d(&desc[i], &mode); + break; + } + + case DXGI_MODE_STRUCT_VERSION_1: + { + DXGI_MODE_DESC1 *desc = modes; + dxgi_mode1_from_wined3d(&desc[i], &mode); + break; + } + } + } + wined3d_mutex_unlock(); + + return S_OK; +} + static inline struct dxgi_output *impl_from_IDXGIOutput4(IDXGIOutput4 *iface) { return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput4_iface); @@ -208,66 +287,15 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput4 *iface, DXGI_O } static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput4 *iface, - DXGI_FORMAT format, UINT flags, UINT *mode_count, DXGI_MODE_DESC *desc) + DXGI_FORMAT format, UINT flags, UINT *mode_count, DXGI_MODE_DESC *modes) { struct dxgi_output *output = impl_from_IDXGIOutput4(iface); - enum wined3d_format_id wined3d_format; - unsigned int i, max_count; - struct wined3d *wined3d; - - FIXME("iface %p, format %s, flags %#x, mode_count %p, desc %p partial stub!\n", - iface, debug_dxgi_format(format), flags, mode_count, desc); - - if (!mode_count) - return DXGI_ERROR_INVALID_CALL; - - if (format == DXGI_FORMAT_UNKNOWN) - { - *mode_count = 0; - return S_OK; - } - wined3d = output->adapter->factory->wined3d; - wined3d_format = wined3dformat_from_dxgi_format(format); + FIXME("iface %p, format %s, flags %#x, mode_count %p, modes %p partial stub!\n", + iface, debug_dxgi_format(format), flags, mode_count, modes); - wined3d_mutex_lock(); - max_count = wined3d_get_adapter_mode_count(wined3d, output->adapter->ordinal, - wined3d_format, WINED3D_SCANLINE_ORDERING_UNKNOWN); - - if (!desc) - { - wined3d_mutex_unlock(); - *mode_count = max_count; - return S_OK; - } - - if (max_count > *mode_count) - { - wined3d_mutex_unlock(); - return DXGI_ERROR_MORE_DATA; - } - - *mode_count = max_count; - - for (i = 0; i < *mode_count; ++i) - { - struct wined3d_display_mode mode; - HRESULT hr; - - hr = wined3d_enum_adapter_modes(wined3d, output->adapter->ordinal, wined3d_format, - WINED3D_SCANLINE_ORDERING_UNKNOWN, i, &mode); - if (FAILED(hr)) - { - WARN("EnumAdapterModes failed, hr %#x.\n", hr); - wined3d_mutex_unlock(); - return hr; - } - - dxgi_mode_from_wined3d(&desc[i], &mode); - } - wined3d_mutex_unlock(); - - return S_OK; + return dxgi_output_get_display_mode_list(output, + format, mode_count, modes, DXGI_MODE_STRUCT_VERSION_0); } static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode(IDXGIOutput4 *iface, @@ -378,10 +406,13 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetFrameStatistics(IDXGIOutput4 *if static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList1(IDXGIOutput4 *iface, DXGI_FORMAT format, UINT flags, UINT *mode_count, DXGI_MODE_DESC1 *modes) { - FIXME("iface %p, format %#x, flags %#x, mode_count %p, modes %p stub!\n", - iface, format, flags, mode_count, modes); + struct dxgi_output *output = impl_from_IDXGIOutput4(iface); - return E_NOTIMPL; + FIXME("iface %p, format %s, flags %#x, mode_count %p, modes %p partial stub!\n", + iface, debug_dxgi_format(format), flags, mode_count, modes); + + return dxgi_output_get_display_mode_list(output, + format, mode_count, modes, DXGI_MODE_STRUCT_VERSION_1); } static HRESULT STDMETHODCALLTYPE dxgi_output_FindClosestMatchingMode1(IDXGIOutput4 *iface,

1 0

Józef Kucia : d3d12: Add stub for D3D12SerializeVersionedRootSignature().
by Alexandre Julliard March 7, 2019

March 7, 2019

Module: wine Branch: master Commit: 5307a251e5fa0c87023e78fac3e1a59d7d2b0047 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5307a251e5fa0c87023e78fa… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 7 11:21:22 2019 +0100 d3d12: Add stub for D3D12SerializeVersionedRootSignature(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/d3d12.spec | 2 ++ dlls/d3d12/d3d12_main.c | 13 +++++++++++++ include/d3d12.idl | 4 ++++ 3 files changed, 19 insertions(+) diff --git a/dlls/d3d12/d3d12.spec b/dlls/d3d12/d3d12.spec index 9e79891..5c4f4cf 100644 --- a/dlls/d3d12/d3d12.spec +++ b/dlls/d3d12/d3d12.spec @@ -7,3 +7,5 @@ @ stdcall D3D12CreateRootSignatureDeserializer(ptr long ptr ptr) @ stdcall D3D12SerializeRootSignature(ptr long ptr ptr) @ stdcall D3D12EnableExperimentalFeatures(long ptr ptr ptr) +#@ stub D3D12CreateVersionedRootSignatureDeserializer +@ stdcall D3D12SerializeVersionedRootSignature(ptr ptr ptr) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index 92a235e..d6d691c 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -182,3 +182,16 @@ HRESULT WINAPI D3D12SerializeRootSignature(const D3D12_ROOT_SIGNATURE_DESC *root return vkd3d_serialize_root_signature(root_signature_desc, version, blob, error_blob); } + +HRESULT WINAPI D3D12SerializeVersionedRootSignature(const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, + ID3DBlob **blob, ID3DBlob **error_blob) +{ + FIXME("desc %p, blob %p, error_blob %p partial-stub!\n", + desc, blob, error_blob); + + if (desc->Version == D3D_ROOT_SIGNATURE_VERSION_1_0) + return D3D12SerializeRootSignature(&desc->Desc_1_0, desc->Version, blob, error_blob); + + FIXME("Unsupported version %#x.\n", desc->Version); + return E_NOTIMPL; +} diff --git a/include/d3d12.idl b/include/d3d12.idl index 307a4fd..3a5a914 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -2171,6 +2171,10 @@ interface ID3D12RootSignatureDeserializer : IUnknown const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *root_signature_desc, ID3DBlob **blob, ID3DBlob **error_blob); +[local] HRESULT __stdcall D3D12SerializeVersionedRootSignature( + const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *desc, + ID3DBlob **blob, ID3DBlob **error_blob); + typedef HRESULT (__stdcall *PFN_D3D12_CREATE_DEVICE)(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device);

1 0

Józef Kucia : d3d12: Add stub for D3D12EnableExperimentalFeatures().
by Alexandre Julliard March 7, 2019

March 7, 2019

Module: wine Branch: master Commit: 8de1e92fc2ed5f3faec98c7e39a5f1dfa94272f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8de1e92fc2ed5f3faec98c7e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 7 11:21:21 2019 +0100 d3d12: Add stub for D3D12EnableExperimentalFeatures(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/d3d12.spec | 1 + dlls/d3d12/d3d12_main.c | 9 +++++++++ include/d3d12.idl | 3 +++ 3 files changed, 13 insertions(+) diff --git a/dlls/d3d12/d3d12.spec b/dlls/d3d12/d3d12.spec index 3361381..9e79891 100644 --- a/dlls/d3d12/d3d12.spec +++ b/dlls/d3d12/d3d12.spec @@ -6,3 +6,4 @@ @ stub D3D12CoreRegisterLayers @ stdcall D3D12CreateRootSignatureDeserializer(ptr long ptr ptr) @ stdcall D3D12SerializeRootSignature(ptr long ptr ptr) +@ stdcall D3D12EnableExperimentalFeatures(long ptr ptr ptr) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index f0c48ee..92a235e 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -45,6 +45,15 @@ HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) return DXGI_ERROR_SDK_COMPONENT_MISSING; } +HRESULT WINAPI D3D12EnableExperimentalFeatures(UINT feature_count, + const IID *iids, void *configurations, UINT *configurations_sizes) +{ + FIXME("feature_count %u, iids %p, configurations %p, configurations_sizes %p stub!\n", + feature_count, iids, configurations, configurations_sizes); + + return E_NOINTERFACE; +} + static HRESULT d3d12_signal_event(HANDLE event) { return SetEvent(event) ? S_OK : E_FAIL; diff --git a/include/d3d12.idl b/include/d3d12.idl index 6f515e6..307a4fd 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -2180,3 +2180,6 @@ typedef HRESULT (__stdcall *PFN_D3D12_CREATE_DEVICE)(IUnknown *adapter, typedef HRESULT (__stdcall *PFN_D3D12_GET_DEBUG_INTERFACE)(REFIID iid, void **debug); [local] HRESULT __stdcall D3D12GetDebugInterface(REFIID iid, void **debug); + +[local] HRESULT __stdcall D3D12EnableExperimentalFeatures(UINT feature_count, + const IID *iids, void *configurations, UINT *configurations_sizes);

1 0

Józef Kucia : d3d12: Remove export ordinals.
by Alexandre Julliard March 7, 2019

March 7, 2019

Module: wine Branch: master Commit: ffe1049e54a80684c7f5111474ee2613f8fd330a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffe1049e54a80684c7f51114… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 7 11:21:20 2019 +0100 d3d12: Remove export ordinals. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/d3d12.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d12/d3d12.spec b/dlls/d3d12/d3d12.spec index 53151bf..3361381 100644 --- a/dlls/d3d12/d3d12.spec +++ b/dlls/d3d12/d3d12.spec @@ -1,8 +1,8 @@ -100 stub GetBehaviorValue -101 stdcall D3D12CreateDevice(ptr long ptr ptr) -102 stdcall D3D12GetDebugInterface(ptr ptr) -103 stub D3D12CoreCreateLayeredDevice -104 stub D3D12CoreGetLayeredDeviceSize -105 stub D3D12CoreRegisterLayers -106 stdcall D3D12CreateRootSignatureDeserializer(ptr long ptr ptr) -107 stdcall D3D12SerializeRootSignature(ptr long ptr ptr) +@ stub GetBehaviorValue +@ stdcall D3D12CreateDevice(ptr long ptr ptr) +@ stdcall D3D12GetDebugInterface(ptr ptr) +@ stub D3D12CoreCreateLayeredDevice +@ stub D3D12CoreGetLayeredDeviceSize +@ stub D3D12CoreRegisterLayers +@ stdcall D3D12CreateRootSignatureDeserializer(ptr long ptr ptr) +@ stdcall D3D12SerializeRootSignature(ptr long ptr ptr)

1 0

Alistair Leslie-Hughes : setupapi: Add SetupDiRegisterCoDeviceInstallers stub.
by Alexandre Julliard March 7, 2019

March 7, 2019

Module: wine Branch: master Commit: 96ab88e1393718e1855f883c52d79a8d9a933181 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96ab88e1393718e1855f883c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 6 21:25:19 2019 +0100 setupapi: Add SetupDiRegisterCoDeviceInstallers stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 11 +++++++++++ dlls/setupapi/setupapi.spec | 1 + 2 files changed, 12 insertions(+) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 582da37..2c95b5c 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3866,3 +3866,14 @@ BOOL WINAPI SetupDiInstallDeviceInterfaces(HDEVINFO dev, PSP_DEVINFO_DATA info_d SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/*********************************************************************** + * SetupDiRegisterCoDeviceInstallers (SETUPAPI.@) + */ +BOOL WINAPI SetupDiRegisterCoDeviceInstallers(HDEVINFO dev, PSP_DEVINFO_DATA info_data) +{ + FIXME("%p, %p stub\n", dev, info_data); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 1be2b62..1d18870 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -380,6 +380,7 @@ @ stdcall SetupDiOpenDeviceInterfaceA(ptr str long ptr) @ stub SetupDiOpenDeviceInterfaceRegKey @ stdcall SetupDiOpenDeviceInterfaceW(ptr wstr long ptr) +@ stdcall SetupDiRegisterCoDeviceInstallers(ptr ptr) @ stdcall SetupDiRegisterDeviceInfo(ptr ptr long ptr ptr ptr) @ stdcall SetupDiRemoveDevice(ptr ptr) @ stdcall SetupDiRemoveDeviceInterface(ptr ptr)

1 0