February 2019 - Wine-commits

Stefan Riesenberger : opengl32: Add wrapper for wglCreateContext.
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: 4285c619a07de29df2c51de198c65104678d1c78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4285c619a07de29df2c51de1… Author: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> Date: Mon Feb 25 18:34:36 2019 +0100 opengl32: Add wrapper for wglCreateContext. Signed-off-by: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/wgl.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 9241005..c6018b0 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -398,9 +398,9 @@ HDC WINAPI wglGetCurrentDC(void) } /*********************************************************************** - * wglCreateContext (OPENGL32.@) + * wgl_create_context wrapper for hooking */ -HGLRC WINAPI wglCreateContext(HDC hdc) +static HGLRC wgl_create_context(HDC hdc) { HGLRC ret = 0; struct wgl_context *drv_ctx; @@ -420,6 +420,14 @@ HGLRC WINAPI wglCreateContext(HDC hdc) } /*********************************************************************** + * wglCreateContext (OPENGL32.@) + */ +HGLRC WINAPI wglCreateContext(HDC hdc) +{ + return wgl_create_context(hdc); +} + +/*********************************************************************** * wglGetCurrentContext (OPENGL32.@) */ HGLRC WINAPI wglGetCurrentContext(void) @@ -667,7 +675,7 @@ HGLRC WINAPI wglCreateLayerContext(HDC hdc, TRACE("(%p,%d)\n", hdc, iLayerPlane); if (iLayerPlane == 0) { - return wglCreateContext(hdc); + return wgl_create_context(hdc); } FIXME("no handler for layer %d\n", iLayerPlane); @@ -1212,8 +1220,8 @@ BOOL WINAPI wglUseFontBitmapsW(HDC hdc, DWORD first, DWORD count, DWORD listBase static void fixed_to_double(POINTFX fixed, UINT em_size, GLdouble vertex[3]) { - vertex[0] = (fixed.x.value + (GLdouble)fixed.x.fract / (1 << 16)) / em_size; - vertex[1] = (fixed.y.value + (GLdouble)fixed.y.fract / (1 << 16)) / em_size; + vertex[0] = (fixed.x.value + (GLdouble)fixed.x.fract / (1 << 16)) / em_size; + vertex[1] = (fixed.y.value + (GLdouble)fixed.y.fract / (1 << 16)) / em_size; vertex[2] = 0.0; } @@ -1393,7 +1401,7 @@ static BOOL wglUseFontOutlines_common(HDC hdc, lpgmf->gmfCellIncY = (float)gm.gmCellIncY / em_size; TRACE("%fx%f at %f,%f inc %f,%f\n", lpgmf->gmfBlackBoxX, lpgmf->gmfBlackBoxY, - lpgmf->gmfptGlyphOrigin.x, lpgmf->gmfptGlyphOrigin.y, lpgmf->gmfCellIncX, lpgmf->gmfCellIncY); + lpgmf->gmfptGlyphOrigin.x, lpgmf->gmfptGlyphOrigin.y, lpgmf->gmfCellIncX, lpgmf->gmfCellIncY); lpgmf++; }

1 0

Stefan Riesenberger : d3d11: Avoid calling D3D11CreateDevice() from D3D11CreateDeviceAndSwapChain().
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: e728156d2c31aa82ed3aab9629a03a8a6f8ca5bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=e728156d2c31aa82ed3aab96… Author: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> Date: Tue Feb 26 22:57:00 2019 +0330 d3d11: Avoid calling D3D11CreateDevice() from D3D11CreateDeviceAndSwapChain(). Signed-off-by: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_main.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index 9c89820..b0a32ac 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -136,7 +136,7 @@ HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapte return S_OK; } -HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, +static HRESULT d3d11_create_device(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device_out, D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context) { @@ -278,6 +278,14 @@ HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_t return (device_out || immediate_context) ? S_OK : S_FALSE; } +HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, + const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device_out, + D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context) +{ + return d3d11_create_device(adapter, driver_type, swrast, flags, feature_levels, + levels, sdk_version, device_out, obtained_feature_level, immediate_context); +} + HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, const DXGI_SWAP_CHAIN_DESC *swapchain_desc, IDXGISwapChain **swapchain, @@ -299,8 +307,10 @@ HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_T if (device_out) *device_out = NULL; - if (FAILED(hr = D3D11CreateDevice(adapter, driver_type, swrast, flags, feature_levels, levels, sdk_version, - &device, obtained_feature_level, immediate_context))) + /* Avoid forwarding to D3D11CreateDevice(), since it breaks applications + * hooking these entry-points. */ + if (FAILED(hr = d3d11_create_device(adapter, driver_type, swrast, flags, feature_levels, + levels, sdk_version, &device, obtained_feature_level, immediate_context))) { WARN("Failed to create a device, returning %#x.\n", hr); return hr;

1 0

Stefan Riesenberger : d3d10_1: Avoid calling D3D10CreateDevice1() from D3D10CreateDeviceAndSwapChain1().
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: c795487ab00b763ba7aac73a7ba943d4446b27d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c795487ab00b763ba7aac73a… Author: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> Date: Tue Feb 26 22:57:01 2019 +0330 d3d10_1: Avoid calling D3D10CreateDevice1() from D3D10CreateDeviceAndSwapChain1(). Signed-off-by: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/d3d10_1_main.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10_1/d3d10_1_main.c b/dlls/d3d10_1/d3d10_1_main.c index e9fad3e..8ee5aa7 100644 --- a/dlls/d3d10_1/d3d10_1_main.c +++ b/dlls/d3d10_1/d3d10_1_main.c @@ -63,7 +63,7 @@ static const char *debug_d3d10_feature_level(D3D10_FEATURE_LEVEL1 feature_level) #undef WINE_D3D10_TO_STR -HRESULT WINAPI D3D10CreateDevice1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, +static HRESULT d3d10_create_device1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, D3D10_FEATURE_LEVEL1 hw_level, UINT sdk_version, ID3D10Device1 **device) { IDXGIFactory *factory; @@ -175,6 +175,12 @@ HRESULT WINAPI D3D10CreateDevice1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE drive return hr; } +HRESULT WINAPI D3D10CreateDevice1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, + UINT flags, D3D10_FEATURE_LEVEL1 hw_level, UINT sdk_version, ID3D10Device1 **device) +{ + return d3d10_create_device1(adapter, driver_type, swrast, flags, hw_level, sdk_version, device); +} + HRESULT WINAPI D3D10CreateDeviceAndSwapChain1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, D3D10_FEATURE_LEVEL1 feature_level, UINT sdk_version, DXGI_SWAP_CHAIN_DESC *swapchain_desc, IDXGISwapChain **swapchain, ID3D10Device1 **device) @@ -194,7 +200,9 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain1(IDXGIAdapter *adapter, D3D10_DRIVE if (!device) return E_INVALIDARG; - if (FAILED(hr = D3D10CreateDevice1(adapter, driver_type, swrast, flags, feature_level, sdk_version, device))) + /* Avoid forwarding to D3D10CreateDevice1(), since it breaks applications + * hooking these entry-points. */ + if (FAILED(hr = d3d10_create_device1(adapter, driver_type, swrast, flags, feature_level, sdk_version, device))) { WARN("Failed to create a device, returning %#x.\n", hr); *device = NULL;

1 0

Stefan Riesenberger : d3d10: Avoid calling D3D10CreateDevice() from D3D10CreateDeviceAndSwapChain().
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: 4826b77d71899311a961319a2f8b55ab07a6eed4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4826b77d71899311a961319a… Author: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> Date: Tue Feb 26 22:57:02 2019 +0330 d3d10: Avoid calling D3D10CreateDevice() from D3D10CreateDeviceAndSwapChain(). Signed-off-by: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_main.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 4d3ed12..bc90ff1 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); -HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, +static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, UINT sdk_version, ID3D10Device **device) { IDXGIFactory *factory; @@ -139,6 +139,12 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver return hr; } +HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, + HMODULE swrast, UINT flags, UINT sdk_version, ID3D10Device **device) +{ + return d3d10_create_device(adapter, driver_type, swrast, flags, sdk_version, device); +} + HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, UINT sdk_version, DXGI_SWAP_CHAIN_DESC *swapchain_desc, IDXGISwapChain **swapchain, ID3D10Device **device) @@ -152,8 +158,9 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER adapter, debug_d3d10_driver_type(driver_type), swrast, flags, sdk_version, swapchain_desc, swapchain, device); - hr = D3D10CreateDevice(adapter, driver_type, swrast, flags, sdk_version, device); - if (FAILED(hr)) + /* Avoid forwarding to D3D10CreateDevice(), since it breaks applications + * hooking these entry-points. */ + if (FAILED(hr = d3d10_create_device(adapter, driver_type, swrast, flags, sdk_version, device))) { WARN("Failed to create a device, returning %#x\n", hr); *device = NULL;

1 0

Paul Gofman : wined3d: Add a setting to turn off aggressive optimization on NVIDIA.
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: 32b6ccb9c17b0d4c1d9acd6cbb91b28e7cbd97de URL: https://source.winehq.org/git/wine.git/?a=commit;h=32b6ccb9c17b0d4c1d9acd6c… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Feb 26 22:57:03 2019 +0330 wined3d: Add a setting to turn off aggressive optimization on NVIDIA. NVIDIA drivers perform too aggressive optimization involving change of computation order (aka 'fastmath') by default. The setting helps to workaround bugs like https://bugs.winehq.org/show_bug.cgi?id=35207. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 3 +++ dlls/wined3d/wined3d_main.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 7 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 660005f..4613d78 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2416,6 +2416,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont unsigned int i; DWORD map; + if (wined3d_settings.strict_shader_math) + shader_addline(buffer, "#pragma optionNV(fastmath off)\n"); + prefix = shader_glsl_get_prefix(version->type); /* Prototype the subroutines */ diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 1b64d2c..fb70b94 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -82,6 +82,7 @@ struct wined3d_settings wined3d_settings = TRUE, /* Prefer multisample textures to multisample renderbuffers. */ ~0u, /* Don't force a specific sample count by default. */ FALSE, /* Don't range check relative addressing indices in float constants. */ + FALSE, /* No strict shader math by default. */ ~0U, /* No VS shader model limit by default. */ ~0U, /* No HS shader model limit by default. */ ~0U, /* No DS shader model limit by default. */ @@ -312,6 +313,8 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) TRACE("Checking relative addressing indices in float constants.\n"); wined3d_settings.check_float_constants = TRUE; } + if (!get_config_key_dword(hkey, appkey, "strict_shader_math", &wined3d_settings.strict_shader_math)) + ERR_(winediag)("Setting strict shader math to %#x.\n", wined3d_settings.strict_shader_math); if (!get_config_key_dword(hkey, appkey, "MaxShaderModelVS", &wined3d_settings.max_sm_vs)) TRACE("Limiting VS shader model to %u.\n", wined3d_settings.max_sm_vs); if (!get_config_key_dword(hkey, appkey, "MaxShaderModelHS", &wined3d_settings.max_sm_hs)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b3f3847..f2b9b5f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -398,6 +398,7 @@ struct wined3d_settings unsigned int multisample_textures; unsigned int sample_count; BOOL check_float_constants; + unsigned int strict_shader_math; unsigned int max_sm_vs; unsigned int max_sm_hs; unsigned int max_sm_ds;

1 0

Zebediah Figura : setupapi: Search for substituted strings in SetupFindNextMatchLine().
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: bb4a6da373d7fdb4a61743ee0632298f6a2f333f URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb4a6da373d7fdb4a61743ee… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 25 22:26:39 2019 -0600 setupapi: Search for substituted strings in SetupFindNextMatchLine(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/parser.c | 4 +++- dlls/setupapi/tests/parser.c | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index bc5dba0..5cde5eb 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -1557,6 +1557,7 @@ BOOL WINAPI SetupFindNextMatchLineW( PINFCONTEXT context_in, PCWSTR key, PINFCONTEXT context_out ) { struct inf_file *file = context_in->CurrentInf; + WCHAR buffer[MAX_STRING_LEN + 1]; struct section *section; struct line *line; unsigned int i; @@ -1570,7 +1571,8 @@ BOOL WINAPI SetupFindNextMatchLineW( PINFCONTEXT context_in, PCWSTR key, for (i = context_in->Line+1, line = &section->lines[i]; i < section->nb_lines; i++, line++) { if (line->key_field == -1) continue; - if (!strcmpiW( key, file->fields[line->key_field].text )) + PARSER_string_substW( file, file->fields[line->key_field].text, buffer, ARRAY_SIZE(buffer) ); + if (!strcmpiW( key, buffer )) { if (context_out != context_in) *context_out = *context_in; context_out->Line = i; diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 07dcaaf..06c674a 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -428,6 +428,16 @@ static void test_key_names(void) ok( hinf != INVALID_HANDLE_VALUE, "line %u: open failed err %u\n", i, GetLastError() ); if (hinf == INVALID_HANDLE_VALUE) continue; + ret = SetupFindFirstLineA( hinf, "Test", key_names[i].key, &context ); + ok(ret, "Test %d: failed to find key %s\n", i, key_names[i].key); + + if (!strncmp( key_names[i].data, "%foo%", strlen( "%foo%" ) )) + { + ret = SetupFindFirstLineA( hinf, "Test", "%foo%", &context ); + ok(!ret, "SetupFindFirstLine() should not match unsubstituted keys\n"); + ok(GetLastError() == ERROR_LINE_NOT_FOUND, "got wrong error %u\n", GetLastError()); + } + ret = SetupFindFirstLineA( hinf, "Test", 0, &context ); ok(ret, "SetupFindFirstLineA failed: le=%u\n", GetLastError()); if (!ret)

1 0

Zhiyi Zhang : include: Add EnumDisplayDevices flags.
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: aa754f3ae4a2f936c1be03267b435a8df5cd3bfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa754f3ae4a2f936c1be0326… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Feb 21 17:04:22 2019 +0800 include: Add EnumDisplayDevices flags. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wingdi.h | 14 +++++++++++++- include/winuser.h | 3 +++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/include/wingdi.h b/include/wingdi.h index 1851654..01d3ff3 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3318,12 +3318,24 @@ DECL_WINELIB_TYPE_AW(DISPLAY_DEVICE) DECL_WINELIB_TYPE_AW(PDISPLAY_DEVICE) DECL_WINELIB_TYPE_AW(LPDISPLAY_DEVICE) -/* DISPLAY_DEVICE.StateFlags (?)*/ +/* DISPLAY_DEVICE.StateFlags for adapters */ #define DISPLAY_DEVICE_ATTACHED_TO_DESKTOP 0x00000001 #define DISPLAY_DEVICE_MULTI_DRIVER 0x00000002 #define DISPLAY_DEVICE_PRIMARY_DEVICE 0x00000004 #define DISPLAY_DEVICE_MIRRORING_DRIVER 0x00000008 #define DISPLAY_DEVICE_VGA_COMPATIBLE 0x00000010 +#define DISPLAY_DEVICE_REMOVABLE 0x00000020 +#define DISPLAY_DEVICE_ACC_DRIVER 0x00000040 +#define DISPLAY_DEVICE_UNSAFE_MODES_ON 0x00080000 +#define DISPLAY_DEVICE_TS_COMPATIBLE 0x00200000 +#define DISPLAY_DEVICE_RDPUDD 0x01000000 +#define DISPLAY_DEVICE_DISCONNECT 0x02000000 +#define DISPLAY_DEVICE_REMOTE 0x04000000 +#define DISPLAY_DEVICE_MODESPRUNED 0x08000000 + +/* DISPLAY_DEVICE.StateFlags for monitors */ +#define DISPLAY_DEVICE_ACTIVE 0x00000001 +#define DISPLAY_DEVICE_ATTACHED 0x00000002 typedef struct DISPLAYCONFIG_DESKTOP_IMAGE_INFO { diff --git a/include/winuser.h b/include/winuser.h index 693965a..6300cc9 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -1082,6 +1082,9 @@ WINUSERAPI BOOL WINAPI SetSysColors(INT,const INT*,const COLORREF*); #define ENUM_CURRENT_SETTINGS ((DWORD) -1) #define ENUM_REGISTRY_SETTINGS ((DWORD) -2) +/* Used by EnumDisplayDevices */ +#define EDD_GET_DEVICE_INTERFACE_NAME 0x00000001 + #define EDS_RAWMODE 0x00000002 #define EDS_ROTATEDMODE 0x00000004

1 0

Zhiyi Zhang : user32/tests: Add more EnumDisplayDevices tests.
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: 741b673bc997ec7c79866afad42fd746c4244f76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=741b673bc997ec7c79866afa… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Feb 21 17:04:39 2019 +0800 user32/tests: Add more EnumDisplayDevices tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 194 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 174 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=741b673bc997ec7c7986…

1 0

Vijay Kiran Kamuju : wmvcore: Add stub for WMCheckURlExtension.
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: 474a6771ba03e2c475cd088ff40c97e8285a455f URL: https://source.winehq.org/git/wine.git/?a=commit;h=474a6771ba03e2c475cd088f… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Thu Feb 21 08:55:56 2019 +0100 wmvcore: Add stub for WMCheckURlExtension. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44300 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 23 ++++++++++++++++++++++- dlls/wmvcore/wmvcore.spec | 2 +- dlls/wmvcore/wmvcore_main.c | 10 ++++++++++ include/wmsdkidl.idl | 2 ++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index b11a5bf..af6d32a 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -18,7 +18,7 @@ #define COBJMACROS #define WIN32_LEAN_AND_MEAN #include "initguid.h" -#include "wmsdkidl.h" +#include "wmsdk.h" #include "wine/test.h" @@ -232,6 +232,26 @@ static void test_WMCreateWriterPriv(void) IWMWriter_Release(writer2); } +static void test_urlextension(void) +{ + HRESULT hr; + const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; + const WCHAR mkvfile[] = {'t','e','s','t','.','m','k','v',0}; + const WCHAR urlfile[] = {'a','b','c','d',':','/','/','t','e','s','t','/','t','e','s','t','.','w','m','v',0}; + const WCHAR testurl[] = {'h','t','t','p',':','/','/','t','e','s','t','/','t','.','a','s','f','?','a','l','t','=','t','.','m','k','v',0}; + + hr = WMCheckURLExtension(NULL); + ok(hr == E_INVALIDARG, "WMCheckURLExtension failed 0x%08x\n", hr); + hr = WMCheckURLExtension(mkvfile); + ok(hr == NS_E_INVALID_NAME, "WMCheckURLExtension failed 0x%08x\n", hr); + hr = WMCheckURLExtension(mp3file); + todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); + hr = WMCheckURLExtension(urlfile); + todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); + hr = WMCheckURLExtension(testurl); + todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); +} + START_TEST(wmvcore) { HRESULT hr; @@ -245,6 +265,7 @@ START_TEST(wmvcore) test_wmwriter_interfaces(); test_profile_manager_interfaces(); test_WMCreateWriterPriv(); + test_urlextension(); CoUninitialize(); } diff --git a/dlls/wmvcore/wmvcore.spec b/dlls/wmvcore/wmvcore.spec index f3e3b64..61c3c08 100644 --- a/dlls/wmvcore/wmvcore.spec +++ b/dlls/wmvcore/wmvcore.spec @@ -1,4 +1,4 @@ -@ stub WMCheckURLExtension +@ stdcall WMCheckURLExtension(wstr) @ stdcall WMCheckURLScheme(wstr) @ stub WMCreateBackupRestorerPrivate @ stub WMCreateSyncReaderPriv diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 690885e..14014ee 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -48,6 +48,16 @@ HRESULT WINAPI DllRegisterServer(void) return S_OK; } +HRESULT WINAPI WMCheckURLExtension(const WCHAR *url) +{ + FIXME("(%s): stub\n", wine_dbgstr_w(url)); + + if (!url) + return E_INVALIDARG; + + return NS_E_INVALID_NAME; +} + HRESULT WINAPI WMCheckURLScheme(const WCHAR *scheme) { FIXME("(%s): stub\n", wine_dbgstr_w(scheme)); diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 5bc8546..bb7bfee 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1787,6 +1787,8 @@ interface IWMWriterPreprocess : IUnknown [in] DWORD flags); }; +cpp_quote("HRESULT WINAPI WMCheckURLExtension(LPCWSTR);") +cpp_quote("HRESULT WINAPI WMCheckURLScheme(LPCWSTR);") cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") cpp_quote("HRESULT WINAPI WMCreateReader(IUnknown*,DWORD,IWMReader**);")

1 0

Zebediah Figura : quartz/filesource: Set the sample length in IAsyncReader_SyncReadAligned().
by Alexandre Julliard 26 Feb '19

26 Feb '19

Module: wine Branch: master Commit: 3d24e7dea9470c77cb5da3a8ebe841261f1c8d6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d24e7dea9470c77cb5da3a8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 25 21:39:44 2019 -0600 quartz/filesource: Set the sample length in IAsyncReader_SyncReadAligned(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 5 +++++ dlls/quartz/tests/filesource.c | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 71724af..9e36057 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -1292,6 +1292,8 @@ static BOOL sync_read(HANDLE file, LONGLONG offset, LONG length, BYTE *buffer, D ovl.u.s.Offset = (DWORD)offset; ovl.u.s.OffsetHigh = offset >> 32; + *read_len = 0; + ret = ReadFile(file, buffer, length, NULL, &ovl); if (ret || GetLastError() == ERROR_IO_PENDING) ret = GetOverlappedResult(file, &ovl, read_len, TRUE); @@ -1331,6 +1333,9 @@ static HRESULT WINAPI FileAsyncReader_SyncReadAligned(IAsyncReader *iface, IMedi hr = HRESULT_FROM_WIN32(GetLastError()); } + if (SUCCEEDED(hr)) + IMediaSample_SetActualDataLength(sample, read_len); + return hr; } diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 340d1c4..36a2539 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -687,7 +687,6 @@ static void test_sync_read_aligned(IAsyncReader *reader, IMemAllocator *allocato ok(hr == S_OK, "Got hr %#x.\n", hr); len = IMediaSample_GetActualDataLength(sample); -todo_wine ok(len == 512, "Got length %d.\n", len); for (i = 0; i < 512; i++) @@ -702,7 +701,6 @@ todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); len = IMediaSample_GetActualDataLength(sample); -todo_wine ok(len == 88, "Got length %d.\n", len); for (i = 0; i < 88; i++) @@ -717,7 +715,6 @@ todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); len = IMediaSample_GetActualDataLength(sample); -todo_wine ok(len == 0, "Got length %d.\n", len); IMediaSample_Release(sample);

1 0