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

Alexandre Julliard : userenv: Build with msvcrt.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 048588ed398d3c1105f32409a7025641514f8a22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=048588ed398d3c1105f32409… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:33:34 2019 +0200 userenv: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/userenv/Makefile.in | 2 ++ dlls/userenv/userenv_main.c | 25 ++++++++++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/userenv/Makefile.in b/dlls/userenv/Makefile.in index c71dc93..df719af 100644 --- a/dlls/userenv/Makefile.in +++ b/dlls/userenv/Makefile.in @@ -2,5 +2,7 @@ MODULE = userenv.dll IMPORTS = advapi32 IMPORTLIB = userenv +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ userenv_main.c diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 4a38c9a..b811c83 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -32,7 +32,6 @@ #include "userenv.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL( userenv ); @@ -98,7 +97,7 @@ static void set_registry_variables(WCHAR **env, HKEY hkey, DWORD type, BOOL set_ { static const WCHAR SystemRootW[] = {'S','y','s','t','e','m','R','o','o','t',0}; static const WCHAR SystemDriveW[] = {'S','y','s','t','e','m','D','r','i','v','e',0}; - static const WCHAR PATHW[] = {'P','A','T','H'}; + static const WCHAR PATHW[] = {'P','A','T','H',0}; UNICODE_STRING us_name, us_value; WCHAR name[1024], value[1024]; @@ -111,19 +110,19 @@ static void set_registry_variables(WCHAR **env, HKEY hkey, DWORD type, BOOL set_ if (ret != ERROR_SUCCESS) break; - if (!strcmpiW(name, SystemRootW)) continue; - if (!strcmpiW(name, SystemDriveW)) continue; + if (!wcsicmp(name, SystemRootW)) continue; + if (!wcsicmp(name, SystemDriveW)) continue; RtlInitUnicodeString(&us_name, name); us_value.Buffer = value; us_value.MaximumLength = sizeof(value); - if (!strncmpiW(name, PATHW, ARRAY_SIZE(PATHW)) && + if (!wcsnicmp(name, PATHW, ARRAY_SIZE(PATHW)) && !RtlQueryEnvironmentVariable_U(*env, &us_name, &us_value)) { if (!set_path) continue; - size = strlenW(value)+1; + size = lstrlenW(value)+1; if (!get_reg_value(*env, hkey, name, value+size, sizeof(value)-size*sizeof(WCHAR))) continue; @@ -314,7 +313,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, { if (get_reg_value(env, hkey, ProfilesDirectoryW, profiles_dir, MAX_PATH-sizeof(WCHAR))) { - len = strlenW(profiles_dir); + len = lstrlenW(profiles_dir); if (profiles_dir[len-1] != '\\') { profiles_dir[len++] = '\\'; @@ -350,7 +349,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, { if (profiles_dir[0]) { - len = strlenW(profiles_dir); + len = lstrlenW(profiles_dir); if (len*sizeof(WCHAR)+sizeof(DefaultW) < sizeof(buf)) { memcpy(buf, profiles_dir, len*sizeof(WCHAR)); @@ -382,7 +381,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, return FALSE; } - len = strlenW(profiles_dir); + len = lstrlenW(profiles_dir); memcpy(buf, profiles_dir, len*sizeof(WCHAR)); size = UNICODE_STRING_MAX_CHARS-len; @@ -402,7 +401,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, } HeapFree(GetProcessHeap(), 0, token_user); - strcpyW(buf, sidW); + lstrcpyW(buf, sidW); LocalFree(sidW); } @@ -541,9 +540,9 @@ BOOL WINAPI GetUserProfileDirectoryW( HANDLE hToken, LPWSTR lpProfileDir, *lpcchSize = len; goto done; } - strcpyW( lpProfileDir, dirW ); - strcatW( lpProfileDir, slashW ); - strcatW( lpProfileDir, userW ); + lstrcpyW( lpProfileDir, dirW ); + lstrcatW( lpProfileDir, slashW ); + lstrcatW( lpProfileDir, userW ); *lpcchSize = len; ret = TRUE;

1 0

Alexandre Julliard : usp10: Build with msvcrt.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 8355a2018921bc9018a7c5622324ab0da083af14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8355a2018921bc9018a7c562… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:34:11 2019 +0200 usp10: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/Makefile.in | 2 ++ dlls/usp10/bidi.c | 4 +--- dlls/usp10/breaking.c | 2 +- dlls/usp10/indic.c | 2 +- dlls/usp10/opentype.c | 2 +- dlls/usp10/usp10.c | 15 +++++++-------- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/usp10/Makefile.in b/dlls/usp10/Makefile.in index 68d85fb..5b705e7 100644 --- a/dlls/usp10/Makefile.in +++ b/dlls/usp10/Makefile.in @@ -2,6 +2,8 @@ MODULE = usp10.dll IMPORTLIB = usp10 IMPORTS = advapi32 user32 gdi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ bidi.c \ bracket.c \ diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 1f04dd4..7de2be5 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -41,8 +41,6 @@ * has been modified. */ -#include "config.h" - #include <stdarg.h> #include <stdlib.h> #include "windef.h" @@ -640,7 +638,7 @@ typedef struct tagBracketPair int end; } BracketPair; -static int compr(const void *a, const void* b) +static int __cdecl compr(const void *a, const void* b) { return ((BracketPair*)a)->start - ((BracketPair*)b)->start; } diff --git a/dlls/usp10/breaking.c b/dlls/usp10/breaking.c index 9b12d9e..480d692 100644 --- a/dlls/usp10/breaking.c +++ b/dlls/usp10/breaking.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ -#include "config.h" + #include <stdarg.h> #include <stdio.h> #include <stdlib.h> diff --git a/dlls/usp10/indic.c b/dlls/usp10/indic.c index 5a228e8..b537eb2 100644 --- a/dlls/usp10/indic.c +++ b/dlls/usp10/indic.c @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ -#include "config.h" + #include <stdarg.h> #include <stdio.h> #include <stdlib.h> diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 5363271..a6ce760 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -658,7 +658,7 @@ static VOID *load_CMAP_format12_table(HDC hdc, ScriptCache *psc) return NULL; } -static int compare_group(const void *a, const void* b) +static int __cdecl compare_group(const void *a, const void* b) { const DWORD *chr = a; const CMAP_SegmentedCoverage_group *group = b; diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index a2e1a73..3cc6665 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -40,7 +40,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); @@ -876,7 +875,7 @@ static HRESULT init_script_cache(const HDC hdc, SCRIPT_CACHE *psc) return E_INVALIDARG; } /* Ensure canonical result by zeroing extra space in lfFaceName */ - size = strlenW(lf.lfFaceName); + size = lstrlenW(lf.lfFaceName); memset(lf.lfFaceName + size, 0, sizeof(lf.lfFaceName) - size * sizeof(WCHAR)); EnterCriticalSection(&cs_script_cache); @@ -952,7 +951,7 @@ static DWORD decode_surrogate_pair(const WCHAR *str, unsigned int index, unsigne return 0; } -static int usp10_compare_script_range(const void *key, const void *value) +static int __cdecl usp10_compare_script_range(const void *key, const void *value) { const struct usp10_script_range *range = value; const DWORD *ch = key; @@ -978,7 +977,7 @@ static enum usp10_script get_char_script(const WCHAR *str, unsigned int index, return Script_CR; /* These punctuation characters are separated out as Latin punctuation */ - if (strchrW(latin_punc,str[index])) + if (wcschr(latin_punc,str[index])) return Script_Punctuation2; /* These chars are itemized as Punctuation by Windows */ @@ -1023,7 +1022,7 @@ static enum usp10_script get_char_script(const WCHAR *str, unsigned int index, return range->script; } -static int compare_FindGlyph(const void *a, const void* b) +static int __cdecl compare_FindGlyph(const void *a, const void* b) { const FindGlyph_struct *find = (FindGlyph_struct*)a; const WORD *idx= (WORD*)b; @@ -1534,7 +1533,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, { if (i > 0 && i < cInChars-1 && script_is_numeric(scripts[i-1]) && - strchrW(math_punc, pwcInChars[i])) + wcschr(math_punc, pwcInChars[i])) { if (script_is_numeric(scripts[i+1])) { @@ -1543,7 +1542,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, strength[i] = strength[i-1]; i++; } - else if (strchrW(repeatable_math_punc, pwcInChars[i])) + else if (wcschr(repeatable_math_punc, pwcInChars[i])) { int j; for (j = i+1; j < cInChars; j++) @@ -1967,7 +1966,7 @@ static void find_fallback_font(enum usp10_script scriptid, WCHAR *FaceName) DWORD count = LF_FACESIZE * sizeof(WCHAR); DWORD type; - sprintfW(value, szFmt, scriptInformation[scriptid].scriptTag); + swprintf(value, ARRAY_SIZE(value), szFmt, scriptInformation[scriptid].scriptTag); if (RegQueryValueExW(hkey, value, 0, &type, (BYTE *)FaceName, &count)) lstrcpyW(FaceName,scriptInformation[scriptid].fallbackFont); RegCloseKey(hkey);

1 0

Alexandre Julliard : uxtheme: Build with msvcrt.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 21a19fb4e35f4b8c61958ba25b0058c1e090f2b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21a19fb4e35f4b8c61958ba2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:35:03 2019 +0200 uxtheme: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/Makefile.in | 2 ++ dlls/uxtheme/buffer.c | 2 -- dlls/uxtheme/draw.c | 2 -- dlls/uxtheme/main.c | 2 -- dlls/uxtheme/metric.c | 2 -- dlls/uxtheme/msstyles.c | 17 +++++++---------- dlls/uxtheme/property.c | 2 -- dlls/uxtheme/stylemap.c | 2 -- dlls/uxtheme/system.c | 2 -- dlls/uxtheme/uxini.c | 2 -- 10 files changed, 9 insertions(+), 26 deletions(-) diff --git a/dlls/uxtheme/Makefile.in b/dlls/uxtheme/Makefile.in index c3fff30..61817ee 100644 --- a/dlls/uxtheme/Makefile.in +++ b/dlls/uxtheme/Makefile.in @@ -3,6 +3,8 @@ IMPORTLIB = uxtheme IMPORTS = user32 gdi32 advapi32 DELAYIMPORTS = msimg32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ buffer.c \ draw.c \ diff --git a/dlls/uxtheme/buffer.c b/dlls/uxtheme/buffer.c index 32d341c..b07284f 100644 --- a/dlls/uxtheme/buffer.c +++ b/dlls/uxtheme/buffer.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdlib.h> #include <stdarg.h> diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 69c53b9..3dcc582 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdlib.h> #include <stdarg.h> diff --git a/dlls/uxtheme/main.c b/dlls/uxtheme/main.c index 73894e8..5e5610a 100644 --- a/dlls/uxtheme/main.c +++ b/dlls/uxtheme/main.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h" diff --git a/dlls/uxtheme/metric.c b/dlls/uxtheme/metric.c index 073422f..2d5a09d 100644 --- a/dlls/uxtheme/metric.c +++ b/dlls/uxtheme/metric.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h" diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index bc8eca7..cee5aaf 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include <stdlib.h> @@ -34,7 +32,6 @@ #include "msstyles.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "wine/heap.h" @@ -352,7 +349,7 @@ static BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR *iStateId = 0; comp = sec; /* Get the application name */ - tmp = strchrW(comp, ':'); + tmp = wcschr(comp, ':'); if(tmp) { *tmp++ = 0; tmp++; @@ -360,19 +357,19 @@ static BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR comp = tmp; } - tmp = strchrW(comp, '.'); + tmp = wcschr(comp, '.'); if(tmp) { *tmp++ = 0; lstrcpynW(szClassName, comp, MAX_THEME_CLASS_NAME); comp = tmp; /* now get the part & state */ - tmp = strchrW(comp, '('); + tmp = wcschr(comp, '('); if(tmp) { *tmp++ = 0; lstrcpynW(part, comp, ARRAY_SIZE(part)); comp = tmp; /* now get the state */ - tmp = strchrW(comp, ')'); + tmp = wcschr(comp, ')'); if (!tmp) return FALSE; *tmp = 0; @@ -383,13 +380,13 @@ static BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR } } else { - tmp = strchrW(comp, '('); + tmp = wcschr(comp, '('); if(tmp) { *tmp++ = 0; lstrcpynW(szClassName, comp, MAX_THEME_CLASS_NAME); comp = tmp; /* now get the state */ - tmp = strchrW(comp, ')'); + tmp = wcschr(comp, ')'); if (!tmp) return FALSE; *tmp = 0; @@ -1012,7 +1009,7 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(LPCWSTR pszAppName, LPCWSTR pszClassList) } start = pszClassList; - while((end = strchrW(start, ';'))) { + while((end = wcschr(start, ';'))) { len = end-start; lstrcpynW(szClassName, start, min(len+1, ARRAY_SIZE(szClassName))); start = end+1; diff --git a/dlls/uxtheme/property.c b/dlls/uxtheme/property.c index 0e077ae..93a72ab 100644 --- a/dlls/uxtheme/property.c +++ b/dlls/uxtheme/property.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h" diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 19e3c93..149ee0e 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h" diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index c898ad3..6e9c0f2 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include <stdio.h> diff --git a/dlls/uxtheme/uxini.c b/dlls/uxtheme/uxini.c index 1581ff4..361e7f1 100644 --- a/dlls/uxtheme/uxini.c +++ b/dlls/uxtheme/uxini.c @@ -18,8 +18,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 : vbscript: Build with msvcrt.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 3911e6696a2399992b0e37f9b54d7ce5ed2d8840 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3911e6696a2399992b0e37f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:38:01 2019 +0200 vbscript: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/Makefile.in | 2 ++ dlls/vbscript/compile.c | 26 +++++++++++++------------- dlls/vbscript/global.c | 20 ++++++++++---------- dlls/vbscript/interp.c | 20 ++++++++++---------- dlls/vbscript/lex.c | 26 ++++++++++++-------------- dlls/vbscript/parser.y | 6 +++--- dlls/vbscript/regexp.c | 28 ++++++++++++++-------------- dlls/vbscript/vbdisp.c | 10 +++++----- dlls/vbscript/vbregexp.c | 4 ++-- dlls/vbscript/vbscript.c | 2 +- dlls/vbscript/vbscript.h | 12 ++---------- 11 files changed, 74 insertions(+), 82 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3911e6696a2399992b0e…

1 0

Alexandre Julliard : vcomp: Build with msvcrt.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 5213ac7e085412e22b713076fe148fb60dc1e9b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5213ac7e085412e22b713076… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:38:23 2019 +0200 vcomp: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/Makefile.in | 2 ++ dlls/vcomp/main.c | 81 ++++++++++++++++++++++++-------------------------- 2 files changed, 41 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5213ac7e085412e22b71…

1 0

Alexandre Julliard : vdhcp.vxd: Build with msvcrt.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 5153645ff6447070cf2bb1d56cd309cb5596868a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5153645ff6447070cf2bb1d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:38:30 2019 +0200 vdhcp.vxd: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vdhcp.vxd/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/vdhcp.vxd/Makefile.in b/dlls/vdhcp.vxd/Makefile.in index b27d520..dc3111a 100644 --- a/dlls/vdhcp.vxd/Makefile.in +++ b/dlls/vdhcp.vxd/Makefile.in @@ -1,4 +1,6 @@ MODULE = vdhcp.vxd +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ vdhcp.c

1 0

Alexandre Julliard : vdmdbg: Build with msvcrt.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: a8e5a6109914ad6280a30c534a45a3981a1c5569 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8e5a6109914ad6280a30c53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:38:43 2019 +0200 vdmdbg: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vdmdbg/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/vdmdbg/Makefile.in b/dlls/vdmdbg/Makefile.in index 605eef4..d9294b6 100644 --- a/dlls/vdmdbg/Makefile.in +++ b/dlls/vdmdbg/Makefile.in @@ -1,5 +1,7 @@ MODULE = vdmdbg.dll IMPORTLIB = vdmdbg +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ vdmdbg.c

1 0

Alexandre Julliard : ver: Build with msvcrt.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 928104d3e26b24bd5c6ec0943fb2be6392531d0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=928104d3e26b24bd5c6ec094… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:38:54 2019 +0200 ver: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ver.dll16/Makefile.in | 2 +- dlls/ver.dll16/version.c | 27 ++++++++++----------------- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/ver.dll16/Makefile.in b/dlls/ver.dll16/Makefile.in index 1c68dfc..1465132 100644 --- a/dlls/ver.dll16/Makefile.in +++ b/dlls/ver.dll16/Makefile.in @@ -1,6 +1,6 @@ MODULE = ver.dll16 IMPORTS = version lz32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,version.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,version.dll C_SRCS = version.c diff --git a/dlls/ver.dll16/version.c b/dlls/ver.dll16/version.c index aa7b49b..269e2c9 100644 --- a/dlls/ver.dll16/version.c +++ b/dlls/ver.dll16/version.c @@ -32,17 +32,10 @@ #include "winternl.h" #include "winver.h" #include "lzexpand.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ver); -#ifndef SEEK_SET -#define SEEK_SET 0 -#define SEEK_CUR 1 -#define SEEK_END 2 -#endif - /********************************************************************** * find_entry_by_id * @@ -121,7 +114,7 @@ static const IMAGE_RESOURCE_DIRECTORY *find_entry_by_name( const IMAGE_RESOURCE_ { pos = (min + max) / 2; str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const char *)root + entry[pos].u.s.NameOffset); - res = strncmpiW( nameW, str->NameString, str->Length ); + res = wcsnicmp( nameW, str->NameString, str->Length ); if (!res && namelen == str->Length) { ret = (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].u2.s2.OffsetToDirectory); @@ -144,17 +137,17 @@ static int read_xx_header( HFILE lzfd ) IMAGE_DOS_HEADER mzh; char magic[3]; - LZSeek( lzfd, 0, SEEK_SET ); + LZSeek( lzfd, 0, FILE_BEGIN ); if ( sizeof(mzh) != LZRead( lzfd, (LPSTR)&mzh, sizeof(mzh) ) ) return 0; if ( mzh.e_magic != IMAGE_DOS_SIGNATURE ) return 0; - LZSeek( lzfd, mzh.e_lfanew, SEEK_SET ); + LZSeek( lzfd, mzh.e_lfanew, FILE_BEGIN ); if ( 2 != LZRead( lzfd, magic, 2 ) ) return 0; - LZSeek( lzfd, mzh.e_lfanew, SEEK_SET ); + LZSeek( lzfd, mzh.e_lfanew, FILE_BEGIN ); if ( magic[0] == 'N' && magic[1] == 'E' ) return IMAGE_OS2_SIGNATURE; @@ -181,7 +174,7 @@ static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, int count; /* Read in NE header */ - nehdoffset = LZSeek( lzfd, 0, SEEK_CUR ); + nehdoffset = LZSeek( lzfd, 0, FILE_CURRENT ); if ( sizeof(nehd) != LZRead( lzfd, (LPSTR)&nehd, sizeof(nehd) ) ) return FALSE; resTabSize = nehd.ne_restab - nehd.ne_rsrctab; @@ -195,7 +188,7 @@ static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, resTab = HeapAlloc( GetProcessHeap(), 0, resTabSize ); if ( !resTab ) return FALSE; - LZSeek( lzfd, nehd.ne_rsrctab + nehdoffset, SEEK_SET ); + LZSeek( lzfd, nehd.ne_rsrctab + nehdoffset, FILE_BEGIN ); if ( resTabSize != LZRead( lzfd, (char*)resTab, resTabSize ) ) { HeapFree( GetProcessHeap(), 0, resTab ); @@ -284,7 +277,7 @@ static BOOL find_pe_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, BOOL ret = FALSE; /* Read in PE header */ - pehdoffset = LZSeek( lzfd, 0, SEEK_CUR ); + pehdoffset = LZSeek( lzfd, 0, FILE_CURRENT ); if ( sizeof(pehd) != LZRead( lzfd, (LPSTR)&pehd, sizeof(pehd) ) ) return FALSE; resDataDir = pehd.OptionalHeader.DataDirectory+IMAGE_DIRECTORY_ENTRY_RESOURCE; @@ -303,7 +296,7 @@ static BOOL find_pe_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, LZSeek( lzfd, pehdoffset + sizeof(DWORD) + /* Signature */ sizeof(IMAGE_FILE_HEADER) + - pehd.FileHeader.SizeOfOptionalHeader, SEEK_SET ); + pehd.FileHeader.SizeOfOptionalHeader, FILE_BEGIN ); if ( nSections * sizeof(IMAGE_SECTION_HEADER) != LZRead( lzfd, (LPSTR)sections, nSections * sizeof(IMAGE_SECTION_HEADER) ) ) @@ -335,7 +328,7 @@ static BOOL find_pe_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, return FALSE; } - LZSeek( lzfd, sections[i].PointerToRawData, SEEK_SET ); + LZSeek( lzfd, sections[i].PointerToRawData, FILE_BEGIN ); if ( resSectionSize != LZRead( lzfd, (char*)resSection, resSectionSize ) ) goto done; /* Find resource */ @@ -458,7 +451,7 @@ DWORD WINAPI GetFileResource16( LPCSTR lpszFileName, LPCSTR lpszResType, } } - LZSeek( lzfd, dwFileOffset, SEEK_SET ); + LZSeek( lzfd, dwFileOffset, FILE_BEGIN ); reslen = LZRead( lzfd, lpvData, min( reslen, dwResLen ) ); LZClose( lzfd );

1 0

Alexandre Julliard : version: Build with msvcrt.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: ecce06841d54c07a64e741297abbe8e73f2bb854 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecce06841d54c07a64e74129… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:39:00 2019 +0200 version: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/version/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/version/Makefile.in b/dlls/version/Makefile.in index e26069e..56acecb 100644 --- a/dlls/version/Makefile.in +++ b/dlls/version/Makefile.in @@ -2,6 +2,8 @@ MODULE = version.dll IMPORTLIB = version IMPORTS = kernelbase +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ version.c

1 0

Alexandre Julliard : virtdisk: Build with msvcrt.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: c46a54d6bb92f801a3cc869495a26c95e981e680 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c46a54d6bb92f801a3cc8694… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 08:39:11 2019 +0200 virtdisk: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/virtdisk/Makefile.in | 2 ++ dlls/virtdisk/virtdisk_main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/virtdisk/Makefile.in b/dlls/virtdisk/Makefile.in index b91f0e2..463e1ac 100644 --- a/dlls/virtdisk/Makefile.in +++ b/dlls/virtdisk/Makefile.in @@ -1,4 +1,6 @@ MODULE = virtdisk.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ virtdisk_main.c diff --git a/dlls/virtdisk/virtdisk_main.c b/dlls/virtdisk/virtdisk_main.c index 2d384cb..630a97b 100644 --- a/dlls/virtdisk/virtdisk_main.c +++ b/dlls/virtdisk/virtdisk_main.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0