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

Alistair Leslie-Hughes : directmanipulation: New stub dll.
by Alexandre Julliard 12 Jun '20

12 Jun '20

Module: wine Branch: master Commit: ed9e60fb775bbaf4d3bbb7a7480d6285954b3d1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed9e60fb775bbaf4d3bbb7a7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 17 09:26:16 2019 +1000 directmanipulation: New stub dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44865 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> --- configure | 2 + configure.ac | 1 + dlls/directmanipulation/Makefile.in | 6 +++ dlls/directmanipulation/directmanipulation.c | 55 +++++++++++++++++++++++++ dlls/directmanipulation/directmanipulation.spec | 6 +++ 5 files changed, 70 insertions(+) diff --git a/configure b/configure index b5287cdce1..2832456d30 100755 --- a/configure +++ b/configure @@ -1246,6 +1246,7 @@ enable_dhtmled_ocx enable_difxapi enable_dinput enable_dinput8 +enable_directmanipulation enable_dispex enable_dmband enable_dmcompos @@ -20622,6 +20623,7 @@ wine_fn_config_makefile dlls/dinput enable_dinput wine_fn_config_makefile dlls/dinput/tests enable_tests wine_fn_config_makefile dlls/dinput8 enable_dinput8 wine_fn_config_makefile dlls/dinput8/tests enable_tests +wine_fn_config_makefile dlls/directmanipulation enable_directmanipulation wine_fn_config_makefile dlls/dispdib.dll16 enable_win16 wine_fn_config_makefile dlls/dispex enable_dispex wine_fn_config_makefile dlls/dispex/tests enable_tests diff --git a/configure.ac b/configure.ac index 72276fc066..b5f2ef0327 100644 --- a/configure.ac +++ b/configure.ac @@ -3210,6 +3210,7 @@ WINE_CONFIG_MAKEFILE(dlls/dinput) WINE_CONFIG_MAKEFILE(dlls/dinput/tests) WINE_CONFIG_MAKEFILE(dlls/dinput8) WINE_CONFIG_MAKEFILE(dlls/dinput8/tests) +WINE_CONFIG_MAKEFILE(dlls/directmanipulation) WINE_CONFIG_MAKEFILE(dlls/dispdib.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/dispex) WINE_CONFIG_MAKEFILE(dlls/dispex/tests) diff --git a/dlls/directmanipulation/Makefile.in b/dlls/directmanipulation/Makefile.in new file mode 100644 index 0000000000..d09d652b61 --- /dev/null +++ b/dlls/directmanipulation/Makefile.in @@ -0,0 +1,6 @@ +MODULE = directmanipulation.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + directmanipulation.c diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c new file mode 100644 index 0000000000..21458ba1fe --- /dev/null +++ b/dlls/directmanipulation/directmanipulation.c @@ -0,0 +1,55 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(manipulation); + +static HINSTANCE dm_instance; + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + dm_instance = instance; + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + FIXME("(%s,%s,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/directmanipulation/directmanipulation.spec b/dlls/directmanipulation/directmanipulation.spec new file mode 100644 index 0000000000..6c8a107d5c --- /dev/null +++ b/dlls/directmanipulation/directmanipulation.spec @@ -0,0 +1,6 @@ +@ stub InitializeDManipHook +@ stdcall -private DllCanUnloadNow() +@ stub DllGetActivationFactory +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stub DllRegisterServer() +@ stub DllUnregisterServer()

1 0

Louis Lenders : pwrshplugin: New stub dll.
by Alexandre Julliard 12 Jun '20

12 Jun '20

Module: wine Branch: master Commit: 77e9ca7b4c4cfc544225fda2a9e714be766a6923 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77e9ca7b4c4cfc544225fda2… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Jun 9 14:49:58 2020 +0200 pwrshplugin: New stub dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49351 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/pwrshplugin/Makefile.in | 5 +++++ dlls/pwrshplugin/pwrshplugin.spec | 12 ++++++++++++ dlls/pwrshplugin/version.rc | 26 ++++++++++++++++++++++++++ 5 files changed, 46 insertions(+) diff --git a/configure b/configure index 2832456d30..3e28ac28cb 100755 --- a/configure +++ b/configure @@ -1532,6 +1532,7 @@ enable_prntvpt enable_propsys enable_psapi enable_pstorec +enable_pwrshplugin enable_qasf enable_qcap enable_qdvd @@ -21037,6 +21038,7 @@ wine_fn_config_makefile dlls/psapi enable_psapi wine_fn_config_makefile dlls/psapi/tests enable_tests wine_fn_config_makefile dlls/pstorec enable_pstorec wine_fn_config_makefile dlls/pstorec/tests enable_tests +wine_fn_config_makefile dlls/pwrshplugin enable_pwrshplugin wine_fn_config_makefile dlls/qasf enable_qasf wine_fn_config_makefile dlls/qasf/tests enable_tests wine_fn_config_makefile dlls/qcap enable_qcap diff --git a/configure.ac b/configure.ac index b5f2ef0327..8a76b74e83 100644 --- a/configure.ac +++ b/configure.ac @@ -3624,6 +3624,7 @@ WINE_CONFIG_MAKEFILE(dlls/psapi) WINE_CONFIG_MAKEFILE(dlls/psapi/tests) WINE_CONFIG_MAKEFILE(dlls/pstorec) WINE_CONFIG_MAKEFILE(dlls/pstorec/tests) +WINE_CONFIG_MAKEFILE(dlls/pwrshplugin) WINE_CONFIG_MAKEFILE(dlls/qasf) WINE_CONFIG_MAKEFILE(dlls/qasf/tests) WINE_CONFIG_MAKEFILE(dlls/qcap) diff --git a/dlls/pwrshplugin/Makefile.in b/dlls/pwrshplugin/Makefile.in new file mode 100644 index 0000000000..03138ab166 --- /dev/null +++ b/dlls/pwrshplugin/Makefile.in @@ -0,0 +1,5 @@ +MODULE = pwrshplugin.dll + +EXTRADLLFLAGS = -mno-cygwin + +RC_SRCS = version.rc diff --git a/dlls/pwrshplugin/pwrshplugin.spec b/dlls/pwrshplugin/pwrshplugin.spec new file mode 100644 index 0000000000..8887bfc59c --- /dev/null +++ b/dlls/pwrshplugin/pwrshplugin.spec @@ -0,0 +1,12 @@ +@ stub GetCLRVersionForPSVersion +@ stub PerformWSManPluginReportCompletion +@ stub WSManPluginCommand +@ stub WSManPluginConnect +@ stub WSManPluginReceive +@ stub WSManPluginReleaseCommandContext +@ stub WSManPluginReleaseShellContext +@ stub WSManPluginSend +@ stub WSManPluginShell +@ stub WSManPluginShutdown +@ stub WSManPluginSignal +@ stub WSManPluginStartup diff --git a/dlls/pwrshplugin/version.rc b/dlls/pwrshplugin/version.rc new file mode 100644 index 0000000000..f3ea96f3cc --- /dev/null +++ b/dlls/pwrshplugin/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine powershell plugin" +#define WINE_FILENAME_STR "pwrshplugin.dll" +#define WINE_FILEVERSION 6,3,9600,16384 +#define WINE_FILEVERSION_STR "6.3.9600.16384" +#define WINE_PRODUCTVERSION 6,3,9600,16384 +#define WINE_PRODUCTVERSION_STR "6.3.9600.16384" + +#include "wine/wine_common_ver.rc"

1 0

Vijay Kiran Kamuju : include: Add missing packing, structs and defines for xact3wb.h.
by Alexandre Julliard 12 Jun '20

12 Jun '20

Module: wine Branch: master Commit: 948a6a47b8dbd0ddd86cad04de03f0e4ba81b65d URL: https://source.winehq.org/git/wine.git/?a=commit;h=948a6a47b8dbd0ddd86cad04… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Mar 20 13:37:35 2020 +0100 include: Add missing packing, structs and defines for xact3wb.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/xact3wb.h | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 89 insertions(+), 4 deletions(-) diff --git a/include/xact3wb.h b/include/xact3wb.h index b4c5a53d40..c68d7a30fa 100644 --- a/include/xact3wb.h +++ b/include/xact3wb.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2020 Alistair Leslie-Hughes + * Copyright (c) 2020 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,6 +19,52 @@ #ifndef __XACT3WB_H__ #define __XACT3WB_H__ +#include <pshpack1.h> + +typedef DWORD WAVEBANKOFFSET; + +#define WAVEBANK_HEADER_SIGNATURE 0x444e4257 /* DNBW */ +#define WAVEBANK_HEADER_VERSION 44 +#define WAVEBANK_BANKNAME_LENGTH 64 +#define WAVEBANK_ENTRYNAME_LENGTH 64 + +#define WAVEBANK_MAX_DATA_SEGMENT_SIZE 0xffffffff +#define WAVEBANK_COMPACT_DATA_SEGMENT_SIZE 0x001fffff + +#define WAVEBANK_TYPE_BUFFER 0x00000000 +#define WAVEBANK_TYPE_STREAMING 0x00000001 +#define WAVEBANK_TYPE_MASK 0x00000001 + +#define WAVEBANK_FLAGS_ENTRYNAMES 0x00010000 +#define WAVEBANK_FLAGS_COMPACT 0x00020000 +#define WAVEBANK_FLAGS_SYNC_DISABLED 0x00040000 +#define WAVEBANK_FLAGS_SEEKTABLES 0x00080000 +#define WAVEBANK_FLAGS_MASK 0x000F0000 + +#define WAVEBANK_DVD_SECTOR_SIZE 2048 +#define WAVEBANK_DVD_BLOCK_SIZE (WAVEBANK_DVD_SECTOR_SIZE * 16) +#define WAVEBANK_ALIGNMENT_MIN 4 +#define WAVEBANK_ALIGNMENT_DVD WAVEBANK_DVD_SECTOR_SIZE + +typedef enum WAVEBANKSEGIDX +{ + WAVEBANK_SEGIDX_BANKDATA = 0, + WAVEBANK_SEGIDX_ENTRYMETADATA, + WAVEBANK_SEGIDX_SEEKTABLES, + WAVEBANK_SEGIDX_ENTRYNAMES, + WAVEBANK_SEGIDX_ENTRYWAVEDATA, + WAVEBANK_SEGIDX_COUNT +} WAVEBANKSEGIDX, *LPWAVEBANKSEGIDX; +typedef const WAVEBANKSEGIDX *LPCWAVEBANKSEGIDX; + +#define WAVEBANKMINIFORMAT_TAG_PCM 0x0 +#define WAVEBANKMINIFORMAT_TAG_XMA 0x1 +#define WAVEBANKMINIFORMAT_TAG_ADPCM 0x2 +#define WAVEBANKMINIFORMAT_TAG_WMA 0x3 + +#define WAVEBANKMINIFORMAT_BITDEPTH_8 0x0 +#define WAVEBANKMINIFORMAT_BITDEPTH_16 0x1 + typedef union WAVEBANKMINIWAVEFORMAT { struct @@ -29,19 +76,34 @@ typedef union WAVEBANKMINIWAVEFORMAT DWORD wBitsPerSample : 1; } DUMMYSTRUCTNAME; DWORD dwValue; -} WAVEBANKMINIWAVEFORMAT; +} WAVEBANKMINIWAVEFORMAT, *LPWAVEBANKMINIWAVEFORMAT; +typedef const WAVEBANKMINIWAVEFORMAT *LPCWAVEBANKMINIWAVEFORMAT; typedef struct WAVEBANKREGION { DWORD dwOffset; DWORD dwLength; -} WAVEBANKREGION; +} WAVEBANKREGION, *LPWAVEBANKREGION; +typedef const WAVEBANKREGION *LPCWAVEBANKREGION; typedef struct WAVEBANKSAMPLEREGION { DWORD dwStartSample; DWORD dwTotalSamples; -} WAVEBANKSAMPLEREGION; +} WAVEBANKSAMPLEREGION, *LPWAVEBANKSAMPLEREGION; +typedef const WAVEBANKSAMPLEREGION *LPCWAVEBANKSAMPLEREGION; + +typedef struct WAVEBANKHEADER +{ + DWORD dwSignature; + DWORD dwVersion; + DWORD dwHeaderVersion; + WAVEBANKREGION Segments[WAVEBANK_SEGIDX_COUNT]; +} WAVEBANKHEADER, *LPWAVEBANKHEADER; +typedef const WAVEBANKHEADER *LPCWAVEBANKHEADER; + +#define WAVEBANKENTRY_XMASTREAMS_MAX 3 +#define WAVEBANKENTRY_XMACHANNELS_MAX 6 typedef struct WAVEBANKENTRY { @@ -58,6 +120,29 @@ typedef struct WAVEBANKENTRY WAVEBANKMINIWAVEFORMAT Format; WAVEBANKREGION PlayRegion; WAVEBANKSAMPLEREGION LoopRegion; -} WAVEBANKENTRY; +} WAVEBANKENTRY, *LPWAVEBANKENTRY; +typedef const WAVEBANKENTRY *LPCWAVEBANKENTRY; + +typedef struct WAVEBANKENTRYCOMPACT +{ + DWORD dwOffset : 21; + DWORD dwLengthDeviation : 11; +} WAVEBANKENTRYCOMPACT, *LPWAVEBANKENTRYCOMPACT; +typedef const WAVEBANKENTRYCOMPACT *LPCWAVEBANKENTRYCOMPACT; + +typedef struct WAVEBANKDATA +{ + DWORD dwFlags; + DWORD dwEntryCount; + CHAR szBankName[WAVEBANK_BANKNAME_LENGTH]; + DWORD dwEntryMetaDataElementSize; + DWORD dwEntryNameElementSize; + DWORD dwAlignment; + WAVEBANKMINIFORMAT CompactFormat; + FILETIME BuildTime; +} WAVEBANKDATA, *LPWAVEBANKDATA; +typedef const WAVEBANKDATA *LPCWAVEBANKDATA; + +#include <poppack.h> #endif /* __XACT3WB_H__ */

1 0

Alexandre Julliard : ntdll: Move the directory functions to the Unix library.
by Alexandre Julliard 12 Jun '20

12 Jun '20

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

Alexandre Julliard : ntdll: Move a few file functions to the Unix library.
by Alexandre Julliard 12 Jun '20

12 Jun '20

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

Zhiyi Zhang : user32/tests: Test changing to a 1Hz display mode.
by Alexandre Julliard 12 Jun '20

12 Jun '20

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

Zhiyi Zhang : winex11.drv: Use the default frequency in ChangeDisplaySettingsExW() if dmDisplayFrequency is 1.
by Alexandre Julliard 12 Jun '20

12 Jun '20

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 : winemac.drv: Use the default frequency in ChangeDisplaySettingsExW() if dmDisplayFrequency is 1.
by Alexandre Julliard 12 Jun '20

12 Jun '20

Module: wine Branch: master Commit: ca1d31fc3b153a38c38b27b873052ce6f04cb5d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca1d31fc3b153a38c38b27b8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jun 12 15:30:02 2020 +0800 winemac.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/winemac.drv/display.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 1a3cc349b5..001906efdf 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -893,7 +893,9 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, if (devmode->dmPelsHeight != height) continue; } - if ((devmode->dmFields & DM_DISPLAYFREQUENCY) && devmode->dmDisplayFrequency != 0) + if ((devmode->dmFields & DM_DISPLAYFREQUENCY) && + devmode->dmDisplayFrequency != 0 && + devmode->dmDisplayFrequency != 1) { double refresh_rate = CGDisplayModeGetRefreshRate(display_mode); if (!refresh_rate)

1 0

Vijay Kiran Kamuju : oleaut32: Merge four DWORDs into a GUID.
by Alexandre Julliard 12 Jun '20

12 Jun '20

Module: wine Branch: master Commit: 45f0a15edc8e9a42ff317fab8677d9c107c8d48a URL: https://source.winehq.org/git/wine.git/?a=commit;h=45f0a15edc8e9a42ff317fab… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Jun 12 10:07:19 2020 +0100 oleaut32: Merge four DWORDs into a GUID. 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, 1 insertion(+), 4 deletions(-) diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 9c700b11a7..521d176bfe 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -309,10 +309,7 @@ typedef struct { /*08*/ WORD res08; /* some kind of len/offset ?? */ /*0a*/ WORD first_blk; /* 1 based index into blk entries that corresponds to first block in file */ -/*0c*/ DWORD res0c; /* always 0x000204ff */ -/*10*/ DWORD res10; /* always 0x00000000 */ -/*14*/ DWORD res14; /* always 0x000000c0 */ -/*18*/ DWORD res18; /* always 0x46000000 */ +/*0c*/ GUID guid; /* always 000204ff-0000-0000-c000-000000000046 */ /*1c*/ DWORD res1c; /* always 0x00000044 */ /*20*/ DWORD res20; /* always 0xffff0000 */ } SLTG_Header;

1 0

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

12 Jun '20

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