June 2020 - Wine-Commits - list.winehq.org

Nikolay Sivov : ntdll: Create class section for proxy-stub interface entries.
by Alexandre Julliard June 12, 2020

June 12, 2020

Module: wine Branch: master Commit: dd9295b415345f2b686b65bd05fae0320cf6dc39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd9295b415345f2b686b65bd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 12 12:57:59 2020 +0300 ntdll: Create class section for proxy-stub interface entries. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 1fb337ea33..1fa97ac037 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1778,12 +1778,40 @@ static BOOL parse_nummethods(const xmlstr_t *str, struct entity *entity) return TRUE; } +static void parse_add_interface_class( xmlbuf_t *xmlbuf, struct entity_array *entities, + struct actctx_loader *acl, WCHAR *clsid ) +{ + struct entity *entity; + WCHAR *str; + + if (!clsid) return; + + if (!(str = strdupW(clsid))) + { + set_error( xmlbuf ); + return; + } + + if (!(entity = add_entity(entities, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION))) + { + RtlFreeHeap(GetProcessHeap(), 0, str); + set_error( xmlbuf ); + return; + } + + entity->u.comclass.clsid = str; + entity->u.comclass.model = ThreadingModel_Both; + + acl->actctx->sections |= SERVERREDIRECT_SECTION; +} + static void parse_cominterface_proxy_stub_elem( xmlbuf_t *xmlbuf, struct dll_redirect *dll, struct actctx_loader *acl, const struct xml_elem *parent ) { + WCHAR *psclsid = NULL; + struct entity *entity; struct xml_attr attr; BOOL end = FALSE; - struct entity* entity; if (!(entity = add_entity(&dll->entities, ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION))) { @@ -1815,8 +1843,12 @@ static void parse_cominterface_proxy_stub_elem( xmlbuf_t *xmlbuf, struct dll_red { if (!(entity->u.ifaceps.tlib = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } + else if (xml_attr_cmp(&attr, proxyStubClsid32W)) + { + if (!(psclsid = xmlstrdupW(&attr.value))) set_error( xmlbuf ); + } /* not used */ - else if (xml_attr_cmp(&attr, proxyStubClsid32W) || xml_attr_cmp(&attr, threadingmodelW)) + else if (xml_attr_cmp(&attr, threadingmodelW)) { } else if (!is_xmlns_attr( &attr )) @@ -1827,6 +1859,10 @@ static void parse_cominterface_proxy_stub_elem( xmlbuf_t *xmlbuf, struct dll_red acl->actctx->sections |= IFACEREDIRECT_SECTION; if (!end) parse_expect_end_elem(xmlbuf, parent); + + parse_add_interface_class(xmlbuf, &dll->entities, acl, psclsid ? psclsid : entity->u.ifaceps.iid); + + RtlFreeHeap(GetProcessHeap(), 0, psclsid); } static BOOL parse_typelib_flags(const xmlstr_t *value, struct entity *entity)

1 0

Vijay Kiran Kamuju : oleaut32: Include the leading '\1' in the CompObj stream name.
by Alexandre Julliard June 12, 2020

June 12, 2020

Module: wine Branch: master Commit: ae9a59ae05c3a066c4c8b83e5c08911f9f1b146e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae9a59ae05c3a066c4c8b83e… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Jun 12 10:07:20 2020 +0100 oleaut32: Include the leading '\1' in the CompObj stream name. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 521d176bfe..515d4b557e 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -326,12 +326,11 @@ typedef struct { /* These then get followed by this magic */ typedef struct { -/*00*/ BYTE res00; /* always 0x01 */ -/*01*/ CHAR CompObj_magic[8]; /* always "CompObj" */ +/*00*/ CHAR CompObj_magic[9]; /* always "\1CompObj" */ /*09*/ CHAR dir_magic[4]; /* always "dir" */ } SLTG_Magic; -#define SLTG_COMPOBJ_MAGIC "CompObj" +#define SLTG_COMPOBJ_MAGIC "\1CompObj" #define SLTG_DIR_MAGIC "dir" /* Next we have SLTG_Header.nrOfFileBlks - 2 of Index strings. These

1 0

Alexandre Julliard : ntdll: Move a few file functions to the Unix library.
by Alexandre Julliard June 12, 2020

June 12, 2020

Module: wine Branch: master Commit: 9ed951266244ad75454cfdb63ee0e872ca9ac43b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ed951266244ad75454cfdb6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 12 17:09:10 2020 +0200 ntdll: Move a few file functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 22 --- dlls/ntdll/file.c | 302 +++------------------------------------ dlls/ntdll/ntdll_misc.h | 5 - dlls/ntdll/unix/file.c | 357 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/loader.c | 7 + dlls/ntdll/unixlib.h | 22 ++- 6 files changed, 401 insertions(+), 314 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9ed951266244ad75454c…

1 0

Alexandre Julliard : ntdll: Move the directory functions to the Unix library.
by Alexandre Julliard June 12, 2020

June 12, 2020

Module: wine Branch: master Commit: e0fca9451146908402a8fbc770ff189aba636213 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0fca9451146908402a8fbc7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 12 14:20:16 2020 +0200 ntdll: Move the directory functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 1 + dlls/ntdll/directory.c | 2804 ++------------------------------------ dlls/ntdll/file.c | 14 +- dlls/ntdll/ntdll_misc.h | 4 - dlls/ntdll/tests/directory.c | 16 +- dlls/ntdll/unix/file.c | 2927 ++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/loader.c | 8 + dlls/ntdll/unix/sync.c | 4 - dlls/ntdll/unix/unix_private.h | 20 + dlls/ntdll/unix/virtual.c | 44 + dlls/ntdll/unixlib.h | 17 +- 11 files changed, 3137 insertions(+), 2722 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e0fca9451146908402a8…

1 0

Gabriel Ivăncescu : msscript.ocx: Add initial IScriptModule stub implementation.
by Alexandre Julliard June 12, 2020

June 12, 2020

Module: wine Branch: master Commit: 7dea4b6bea05b0497f038dea25b7c43fa909970f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dea4b6bea05b0497f038dea… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jun 12 17:11:01 2020 +0200 msscript.ocx: Add initial IScriptModule stub implementation. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 245 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 239 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7dea4b6bea05b0497f03…

1 0

Nikolay Sivov : ole32: Remove workaround for creating objects from context proxy-stub descriptions.
by Alexandre Julliard June 12, 2020

June 12, 2020

Module: wine Branch: master Commit: 1e833e58de5cabfdaec2c13a153758065408e938 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e833e58de5cabfdaec2c13a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 12 12:58:00 2020 +0300 ole32: Remove workaround for creating objects from context proxy-stub descriptions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 41 +------------------- dlls/ole32/tests/compobj.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 39 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index df234498e6..6d9904a165 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3138,9 +3138,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject( if (CLSCTX_INPROC & dwClsContext) { - ASSEMBLY_FILE_DETAILED_INFORMATION *file_info = NULL; ACTCTX_SECTION_KEYED_DATA data; - const CLSID *clsid = NULL; data.cbSize = sizeof(data); /* search activation context first */ @@ -3153,46 +3151,11 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject( clsreg.u.actctx.module_name = (WCHAR *)((BYTE *)data.lpSectionBase + comclass->name_offset); clsreg.u.actctx.hactctx = data.hActCtx; clsreg.u.actctx.threading_model = comclass->model; - clsid = &comclass->clsid; - } - else if (FindActCtxSectionGuid(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, NULL, - ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION, rclsid, &data)) - { - ACTIVATION_CONTEXT_QUERY_INDEX query_index; - SIZE_T required_len = 0; - - query_index.ulAssemblyIndex = data.ulAssemblyRosterIndex - 1; - query_index.ulFileIndexInAssembly = 0; - - QueryActCtxW(0, data.hActCtx, &query_index, FileInformationInAssemblyOfAssemblyInActivationContext, - NULL, 0, &required_len); - if (required_len) - { - file_info = heap_alloc(required_len); - if (file_info) - { - if (QueryActCtxW(0, data.hActCtx, &query_index, FileInformationInAssemblyOfAssemblyInActivationContext, - file_info, required_len, &required_len)) - { - clsreg.u.actctx.module_name = file_info->lpFileName; - clsreg.u.actctx.hactctx = data.hActCtx; - clsreg.u.actctx.threading_model = ThreadingModel_Both; - clsid = rclsid; - } - else - heap_free(file_info); - } - } - } - - if (clsreg.u.actctx.hactctx) - { clsreg.origin = CLASS_REG_ACTCTX; - hres = get_inproc_class_object(apt, &clsreg, clsid, iid, !(dwClsContext & WINE_CLSCTX_DONT_HOST), ppv); - ReleaseActCtx(clsreg.u.actctx.hactctx); + hres = get_inproc_class_object(apt, &clsreg, &comclass->clsid, iid, !(dwClsContext & WINE_CLSCTX_DONT_HOST), ppv); + ReleaseActCtx(data.hActCtx); apartment_release(apt); - heap_free(file_info); return hres; } } diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index d6ccbc5882..eb172aac28 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -347,6 +347,32 @@ static const char actctx_manifest[] = " </clrClass>" "</assembly>"; +static const char actctx_manifest2[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" +"<assemblyIdentity version=\"1.2.3.4\" name=\"Wine.Test\" type=\"win32\"" +" publicKeyToken=\"6595b6414666f1df\" />" +"<file name=\"testlib.dll\">" +" <comInterfaceProxyStub " +" name=\"Testiface7\"" +" iid=\"{52222222-1234-1234-1234-56789abcdef0}\"" +" proxyStubClsid32=\"{82222222-1234-1234-1234-56789abcdef0}\"" +" threadingModel=\"Apartment\"" +" />" +"</file>" +"<file name=\"testlib4.dll\">" +" <comInterfaceProxyStub " +" name=\"Testiface8\"" +" iid=\"{92222222-1234-1234-1234-56789abcdef0}\"" +" threadingModel=\"Apartment\"" +" />" +"</file>" +" <comInterfaceExternalProxyStub " +" name=\"Iifaceps3\"" +" iid=\"{42222222-1234-1234-1234-56789abcdef0}\"" +" proxyStubClsid32=\"{66666666-8888-7777-6666-555555555555}\"" +" />" +"</assembly>"; + DEFINE_GUID(CLSID_Testclass, 0x12345678, 0x1234, 0x1234, 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0); static void test_ProgIDFromCLSID(void) @@ -692,6 +718,28 @@ static void test_CoCreateInstance(void) test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE); } +struct comclassredirect_data +{ + ULONG size; + ULONG flags; + DWORD model; + GUID clsid; + GUID alias; + GUID clsid2; + GUID tlid; + ULONG name_len; + ULONG name_offset; + ULONG progid_len; + ULONG progid_offset; + ULONG clrdata_len; + ULONG clrdata_offset; + DWORD miscstatus; + DWORD miscstatuscontent; + DWORD miscstatusthumbnail; + DWORD miscstatusicon; + DWORD miscstatusdocprint; +}; + static void test_CoGetClassObject(void) { HRESULT hr; @@ -763,6 +811,53 @@ static void test_CoGetClassObject(void) deactivate_context(handle, cookie); } + if ((handle = activate_context(actctx_manifest2, &cookie))) + { + struct comclassredirect_data *comclass; + ACTCTX_SECTION_KEYED_DATA data; + BOOL ret; + + /* This one will load test dll and get back specific error code. */ + hr = CoGetClassObject(&IID_Testiface7, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); + ok(hr == 0x80001235 || broken(hr == HRESULT_FROM_WIN32(ERROR_MOD_NOT_FOUND)) /* winxp */, "Unexpected hr %#x.\n", hr); + + hr = CoGetClassObject(&IID_Testiface8, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + + memset(&data, 0, sizeof(data)); + data.cbSize = sizeof(data); + ret = FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION, &IID_Testiface8, &data); + ok(ret, "Section not found.\n"); + + memset(&data, 0, sizeof(data)); + data.cbSize = sizeof(data); + + /* External proxy-stubs are not accessible. */ + ret = FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, &IID_Testiface3, &data); + ok(!ret, "Unexpected return value.\n"); + + ret = FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, &IID_TestPS, &data); + ok(!ret, "Unexpected return value.\n"); + + ret = FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, &IID_Testiface7, &data); + ok(ret, "Unexpected return value.\n"); + + ret = FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, &IID_Testiface4, &data); + ok(!ret, "Unexpected return value.\n"); + + ret = FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, &IID_Testiface8, &data); + ok(ret, "Unexpected return value.\n"); + + comclass = data.lpData; + if (comclass) + { + WCHAR *name = (WCHAR *)((char *)data.lpSectionBase + comclass->name_offset); + ok(!lstrcmpW(name, L"testlib4.dll"), "Unexpected module name %s.\n", wine_dbgstr_w(name)); + } + + deactivate_context(handle, cookie); + } + CoUninitialize(); }

1 0

Matteo Bruni : d3dcompiler: Print float constants with more precision.
by Alexandre Julliard June 12, 2020

June 12, 2020

Module: wine Branch: master Commit: 2d79e04bfe2cd72526708cae936c85e07c87d52f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d79e04bfe2cd72526708cae… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 11 22:08:28 2020 +0200 d3dcompiler: Print float constants with more precision. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 4769ebc399..4b1e8f7ff0 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1831,10 +1831,10 @@ static void debug_dump_ir_constant(const struct hlsl_ir_constant *constant) switch (type->base_type) { case HLSL_TYPE_FLOAT: - wine_dbg_printf("%g ", (double)constant->value.f[y * type->dimx + x]); + wine_dbg_printf("%.8e ", constant->value.f[y * type->dimx + x]); break; case HLSL_TYPE_DOUBLE: - wine_dbg_printf("%g ", constant->value.d[y * type->dimx + x]); + wine_dbg_printf("%.16e ", constant->value.d[y * type->dimx + x]); break; case HLSL_TYPE_INT: wine_dbg_printf("%d ", constant->value.i[y * type->dimx + x]);

1 0

Piotr Caban : msvcrt: Reset buffer in fflush on error.
by Alexandre Julliard June 12, 2020

June 12, 2020

Module: wine Branch: master Commit: 855668221d37f00122537ff36258cd78876839bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=855668221d37f00122537ff3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 12 12:43:00 2020 +0200 msvcrt: Reset buffer in fflush on error. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 11 ++++++----- dlls/msvcrt/tests/file.c | 18 +++++++++++++++++- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 825d442bfa..6b7471a56a 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -656,21 +656,22 @@ void msvcrt_init_io(void) /* INTERNAL: Flush stdio file buffer */ static int msvcrt_flush_buffer(MSVCRT_FILE* file) { + int ret = 0; + if((file->_flag & (MSVCRT__IOREAD|MSVCRT__IOWRT)) == MSVCRT__IOWRT && file->_flag & (MSVCRT__IOMYBUF|MSVCRT__USERBUF)) { int cnt=file->_ptr-file->_base; if(cnt>0 && MSVCRT__write(file->_file, file->_base, cnt) != cnt) { file->_flag |= MSVCRT__IOERR; - return MSVCRT_EOF; - } - - if(file->_flag & MSVCRT__IORW) + ret = MSVCRT_EOF; + } else if(file->_flag & MSVCRT__IORW) { file->_flag &= ~MSVCRT__IOWRT; + } } file->_ptr=file->_base; file->_cnt=0; - return 0; + return ret; } /********************************************************************* diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 61f6ffe373..fc6dacd71f 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -687,7 +687,7 @@ static void test_fflush( void ) char buf1[16], buf2[24]; char *tempf; FILE *tempfh; - int ret; + int ret, fd; tempf=_tempnam(".","wne"); @@ -728,7 +728,23 @@ static void test_fflush( void ) ok(memcmp(buf1, buf2, sizeof(buf1)) == 0, "Got unexpected data (%c)\n", buf2[0]); fclose(tempfh); + unlink(tempf); + + /* test flush failure */ + tempfh = fopen(tempf,"wb"); + ok(tempfh != NULL, "Can't open test file.\n"); + fwrite(obuf, 1, sizeof(obuf), tempfh); + fd = tempfh->_file; + tempfh->_file = -1; + + ok(tempfh->_ptr - tempfh->_base, "buffer is empty\n"); + ret = fflush(tempfh); + ok(ret == EOF, "expected EOF, got %d\n", ret); + ok(!(tempfh->_ptr - tempfh->_base), "buffer should be empty\n"); + ok(!tempfh->_cnt, "tempfh->_cnt = %d\n", tempfh->_cnt); + tempfh->_file = fd; + fclose(tempfh); unlink(tempf); free(tempf); }

1 0

Zhiyi Zhang : winex11.drv: Use the default frequency in ChangeDisplaySettingsExW() if dmDisplayFrequency is 1.
by Alexandre Julliard June 12, 2020

June 12, 2020

Module: wine Branch: master Commit: c4a01d0a65905f33cbfe90f150b2d23a02c4e793 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4a01d0a65905f33cbfe90f1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jun 12 15:29:33 2020 +0800 winex11.drv: Use the default frequency in ChangeDisplaySettingsExW() if dmDisplayFrequency is 1. 0 or 1 in dmDisplayFrequency means to use the default frequency. Fix Disgaea PC and Ostriv failing to launch in exclusive fullscreen mode. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 1 - dlls/winex11.drv/settings.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 482e2f1301..afde67cd03 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -448,7 +448,6 @@ static void test_ChangeDisplaySettingsEx(void) dm.dmDisplayFrequency = vid_modes_test[i].freq; dm.dmFields = vid_modes_test[i].fields; res = ChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); - todo_wine_if(i == 2) ok(vid_modes_test[i].must_succeed ? (res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_RESTART) : (res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_RESTART || diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index c3f31d0430..bbbb6fdf0a 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -420,7 +420,7 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, continue; } if ((devmode->dmFields & DM_DISPLAYFREQUENCY) && (dd_modes[i].refresh_rate != 0) && - devmode->dmDisplayFrequency != 0) + devmode->dmDisplayFrequency != 0 && devmode->dmDisplayFrequency != 1) { if (devmode->dmDisplayFrequency != dd_modes[i].refresh_rate) continue;

1 0

Zhiyi Zhang : user32/tests: Test changing to a 1Hz display mode.
by Alexandre Julliard June 12, 2020

June 12, 2020

Module: wine Branch: master Commit: 203bd057cf2268f03558be475ce2ba984f93e581 URL: https://source.winehq.org/git/wine.git/?a=commit;h=203bd057cf2268f03558be47… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jun 12 15:29:06 2020 +0800 user32/tests: Test changing to a 1Hz display mode. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 205df1c293..482e2f1301 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -257,6 +257,7 @@ struct vid_mode static const struct vid_mode vid_modes_test[] = { {1024, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY, 0}, {1024, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY, 1}, + {1024, 768, 0, 1, DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY, 1}, {1024, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL , 0}, {1024, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT , 1}, {1024, 768, 0, 0, DM_BITSPERPEL , 0}, @@ -447,6 +448,7 @@ static void test_ChangeDisplaySettingsEx(void) dm.dmDisplayFrequency = vid_modes_test[i].freq; dm.dmFields = vid_modes_test[i].fields; res = ChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); + todo_wine_if(i == 2) ok(vid_modes_test[i].must_succeed ? (res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_RESTART) : (res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_RESTART ||

1 0