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

Martin Liska : include: Avoid compound literals for WCHAR strings.
by Alexandre Julliard June 12, 2019

June 12, 2019

Module: wine Branch: master Commit: 9afc341c4f043240f0dc3de6351550b03d24b131 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9afc341c4f043240f0dc3de6… Author: Martin Liska <mliska(a)suse.cz> Date: Mon Jun 10 10:57:32 2019 +0200 include: Avoid compound literals for WCHAR strings. Starting from GCC 9, compound liferal's scope has changed: https://www.gnu.org/software/gcc/gcc-9/porting_to.html#complit Signed-off-by: Martin Liska <mliska(a)suse.cz> Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/winldap_private.h | 18 +++-- include/bcrypt.h | 157 ++++++++++++++++++++++++------------- include/commctrl.h | 131 +++++++------------------------ include/commdlg.h | 35 ++------- include/d3dcompiler.h | 4 +- include/ddeml.h | 13 +--- include/ddk/mountmgr.h | 5 +- include/dpaddr.h | 38 +-------- include/lmaccess.h | 16 +--- include/msacm.h | 15 +--- include/ntsecapi.h | 6 +- include/oledlg.h | 12 +-- include/prsht.h | 5 +- include/richedit.h | 8 +- include/schannel.h | 30 ++------ include/sddl.h | 14 +--- include/softpub.h | 62 ++------------- include/uxtheme.h | 7 +- include/vsstyle.h | 141 +++++++--------------------------- include/vssym32.h | 44 +++-------- include/wincrypt.h | 170 +++++++++-------------------------------- include/winnls.h | 8 +- include/winnt.h | 34 +-------- include/winspool.h | 116 +++++++--------------------- include/winsvc.h | 5 +- include/wintrust.h | 5 +- 26 files changed, 296 insertions(+), 803 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9afc341c4f043240f0dc…

1 0

Alexandre Julliard : msdaps: Build with msvcrt.
by Alexandre Julliard June 12, 2019

June 12, 2019

Module: wine Branch: master Commit: ae199998b73cf93b19dfc11db0a6b3deb03175a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae199998b73cf93b19dfc11d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 12 09:41:25 2019 +0200 msdaps: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdaps/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msdaps/Makefile.in b/dlls/msdaps/Makefile.in index 14bef85..13486c4 100644 --- a/dlls/msdaps/Makefile.in +++ b/dlls/msdaps/Makefile.in @@ -2,6 +2,8 @@ MODULE = msdaps.dll IMPORTS = uuid oleaut32 ole32 rpcrt4 advapi32 EXTRAIDLFLAGS = --win32-align=2 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c \ row_server.c \

1 0

Alexandre Julliard : msg711.acm: Build with msvcrt.
by Alexandre Julliard June 12, 2019

June 12, 2019

Module: wine Branch: master Commit: 8ffd89163f62caec6d4ff660024e2648eb144e6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ffd89163f62caec6d4ff660… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 12 09:44:39 2019 +0200 msg711.acm: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msg711.acm/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msg711.acm/Makefile.in b/dlls/msg711.acm/Makefile.in index baf8627..9335679 100644 --- a/dlls/msg711.acm/Makefile.in +++ b/dlls/msg711.acm/Makefile.in @@ -1,4 +1,6 @@ MODULE = msg711.acm IMPORTS = winmm user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = msg711.c

1 0

Alexandre Julliard : msdelta: Build with msvcrt.
by Alexandre Julliard June 12, 2019

June 12, 2019

Module: wine Branch: master Commit: d94642a6b90bae3ad36fbb8daa49c3cab0f1038b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d94642a6b90bae3ad36fbb8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 12 09:43:45 2019 +0200 msdelta: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdelta/Makefile.in | 2 ++ dlls/msdelta/msdelta_main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msdelta/Makefile.in b/dlls/msdelta/Makefile.in index afdd037..84dae3d 100644 --- a/dlls/msdelta/Makefile.in +++ b/dlls/msdelta/Makefile.in @@ -1,4 +1,6 @@ MODULE = msdelta.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ msdelta_main.c diff --git a/dlls/msdelta/msdelta_main.c b/dlls/msdelta/msdelta_main.c index 470b427..5ae8206 100644 --- a/dlls/msdelta/msdelta_main.c +++ b/dlls/msdelta/msdelta_main.c @@ -15,8 +15,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : mscat32: Build with msvcrt.
by Alexandre Julliard June 12, 2019

June 12, 2019

Module: wine Branch: master Commit: c9ea1257a194b784cbc0c57e62708f23eea637ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9ea1257a194b784cbc0c57e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 12 09:38:52 2019 +0200 mscat32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscat32/Makefile.in | 2 ++ dlls/mscat32/main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mscat32/Makefile.in b/dlls/mscat32/Makefile.in index a811964..4ccaf8c 100644 --- a/dlls/mscat32/Makefile.in +++ b/dlls/mscat32/Makefile.in @@ -1,5 +1,7 @@ MODULE = mscat32.dll IMPORTS = wintrust +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/mscat32/main.c b/dlls/mscat32/main.c index d2b9d8b..8408070 100644 --- a/dlls/mscat32/main.c +++ b/dlls/mscat32/main.c @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h" #include "winbase.h"

1 0

Alexandre Julliard : msacm32.drv: Build with msvcrt.
by Alexandre Julliard June 12, 2019

June 12, 2019

Module: wine Branch: master Commit: 9479a001381c92bc5b11371ee6e3d7e7cab2a926 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9479a001381c92bc5b11371e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 12 09:37:35 2019 +0200 msacm32.drv: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32.drv/Makefile.in | 2 ++ dlls/msacm32.drv/wavemap.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msacm32.drv/Makefile.in b/dlls/msacm32.drv/Makefile.in index ec343b0..36e7c0d 100644 --- a/dlls/msacm32.drv/Makefile.in +++ b/dlls/msacm32.drv/Makefile.in @@ -1,5 +1,7 @@ MODULE = msacm32.drv IMPORTS = msacm32 winmm user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ wavemap.c diff --git a/dlls/msacm32.drv/wavemap.c b/dlls/msacm32.drv/wavemap.c index 4c8cb6c..75d1a60 100644 --- a/dlls/msacm32.drv/wavemap.c +++ b/dlls/msacm32.drv/wavemap.c @@ -37,7 +37,6 @@ #include "mmddk.h" #include "mmreg.h" #include "msacm.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wavemap); @@ -1068,7 +1067,7 @@ static DWORD widGetDevCaps(UINT wDevID, WAVEMAPDATA* wim, LPWAVEINCAPSW lpWaveCa wic.wMid = 0x00FF; wic.wPid = 0x0001; wic.vDriverVersion = 0x0001; - strcpyW(wic.szPname, init); + lstrcpyW(wic.szPname, init); wic.dwFormats = WAVE_FORMAT_96M08 | WAVE_FORMAT_96S08 | WAVE_FORMAT_96M16 | WAVE_FORMAT_96S16 | WAVE_FORMAT_48M08 | WAVE_FORMAT_48S08 | WAVE_FORMAT_48M16 | WAVE_FORMAT_48S16 |

1 0

Alexandre Julliard : msdmo: Build with msvcrt.
by Alexandre Julliard June 12, 2019

June 12, 2019

Module: wine Branch: master Commit: b5d2b70dff4f4c0042b87991857c45dadfc39f46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5d2b70dff4f4c0042b87991… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 12 09:43:56 2019 +0200 msdmo: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/Makefile.in | 2 ++ dlls/msdmo/dmoreg.c | 9 ++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/msdmo/Makefile.in b/dlls/msdmo/Makefile.in index 566461e..798ed70 100644 --- a/dlls/msdmo/Makefile.in +++ b/dlls/msdmo/Makefile.in @@ -2,6 +2,8 @@ MODULE = msdmo.dll IMPORTLIB = msdmo IMPORTS = dmoguids uuid ole32 user32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ dmoreg.c \ dmort.c diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 1c06bbf..34532f5 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -27,7 +27,6 @@ #include "winerror.h" #include "winreg.h" #include "objbase.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "dmo.h" @@ -121,7 +120,7 @@ static HRESULT string_to_guid(const WCHAR *string, GUID *guid) { WCHAR buffer[39]; buffer[0] = '{'; - strcpyW(buffer + 1, string); + lstrcpyW(buffer + 1, string); buffer[37] = '}'; buffer[38] = 0; return CLSIDFromString(buffer, guid); @@ -218,7 +217,7 @@ HRESULT WINAPI DMORegister( /* Set default Name value */ ret = RegSetValueExW(hkey, NULL, 0, REG_SZ, (const BYTE*) szName, - (strlenW(szName) + 1) * sizeof(WCHAR)); + (lstrlenW(szName) + 1) * sizeof(WCHAR)); /* Set InputTypes */ hres = write_types(hkey, szDMOInputType, pInTypes, cInTypes); @@ -663,9 +662,9 @@ static HRESULT WINAPI IEnumDMO_fnNext( Names[count] = NULL; if (ret == ERROR_SUCCESS) { - Names[count] = CoTaskMemAlloc((strlenW(szValue) + 1) * sizeof(WCHAR)); + Names[count] = CoTaskMemAlloc((lstrlenW(szValue) + 1) * sizeof(WCHAR)); if (Names[count]) - strcpyW(Names[count], szValue); + lstrcpyW(Names[count], szValue); } } wsprintfW(szGuidKey,szToGuidFmt,szNextKey);

1 0

Alexandre Julliard : msftedit: Build with msvcrt.
by Alexandre Julliard June 12, 2019

June 12, 2019

Module: wine Branch: master Commit: 74b8da82999d350dfe5e8a9d90065ddd2ed570bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=74b8da82999d350dfe5e8a9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 12 09:44:25 2019 +0200 msftedit: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msftedit/Makefile.in | 2 ++ dlls/msftedit/msftedit_main.c | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msftedit/Makefile.in b/dlls/msftedit/Makefile.in index 3e043cd..3e76523 100644 --- a/dlls/msftedit/Makefile.in +++ b/dlls/msftedit/Makefile.in @@ -1,6 +1,8 @@ MODULE = msftedit.dll IMPORTS = uuid riched20 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ msftedit_main.c diff --git a/dlls/msftedit/msftedit_main.c b/dlls/msftedit/msftedit_main.c index b505999..c578efa 100644 --- a/dlls/msftedit/msftedit_main.c +++ b/dlls/msftedit/msftedit_main.c @@ -19,9 +19,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : msasn1: Build with msvcrt.
by Alexandre Julliard June 12, 2019

June 12, 2019

Module: wine Branch: master Commit: c63bcbbc491997bea443a543581cd2f5afa06cbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=c63bcbbc491997bea443a543… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 12 09:38:36 2019 +0200 msasn1: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msasn1/Makefile.in | 2 ++ dlls/msasn1/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msasn1/Makefile.in b/dlls/msasn1/Makefile.in index 4e901ea..b57eda7 100644 --- a/dlls/msasn1/Makefile.in +++ b/dlls/msasn1/Makefile.in @@ -1,5 +1,7 @@ MODULE = msasn1.dll IMPORTLIB = msasn1 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index 81f246a..7ca0eac 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -17,7 +17,6 @@ */ -#include "config.h" #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : msacm32: Build with msvcrt.
by Alexandre Julliard June 12, 2019

June 12, 2019

Module: wine Branch: master Commit: 77872fa87d952d36ed323c76c9c4b52bbf883920 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77872fa87d952d36ed323c76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 12 09:38:13 2019 +0200 msacm32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/Makefile.in | 2 ++ dlls/msacm32/driver.c | 11 ++++------ dlls/msacm32/format.c | 11 +++++----- dlls/msacm32/internal.c | 51 ++++++++++++++++++++++----------------------- dlls/msacm32/pcmconverter.c | 1 - 5 files changed, 36 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=77872fa87d952d36ed32…

1 0