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

Alexandre Julliard : control: Build with msvcrt.
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: 3efefad87deec2b03a826331e03bef9203581f81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3efefad87deec2b03a826331… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:46:34 2019 +0200 control: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/control/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/control/Makefile.in b/programs/control/Makefile.in index 6efa1e5..c90fca4 100644 --- a/programs/control/Makefile.in +++ b/programs/control/Makefile.in @@ -1,5 +1,6 @@ MODULE = control.exe -APPMODE = -mwindows -municode IMPORTS = shell32 user32 +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin + C_SRCS = control.c

1 0

Alexandre Julliard : dxdiag: Build with msvcrt.
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: d846e49a746e71baa1a3fc1aeedcb7719f21588d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d846e49a746e71baa1a3fc1a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 11:52:43 2019 +0200 dxdiag: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/dxdiag/Makefile.in | 3 ++- programs/dxdiag/information.c | 6 ++---- programs/dxdiag/main.c | 20 +++++++++----------- programs/dxdiag/output.c | 4 +--- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/programs/dxdiag/Makefile.in b/programs/dxdiag/Makefile.in index 437cc5e..aeab69e 100644 --- a/programs/dxdiag/Makefile.in +++ b/programs/dxdiag/Makefile.in @@ -1,7 +1,8 @@ MODULE = dxdiag.exe -APPMODE = -mwindows -municode IMPORTS = dxguid ole32 oleaut32 user32 +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin + C_SRCS = \ information.c \ main.c \ diff --git a/programs/dxdiag/information.c b/programs/dxdiag/information.c index ec2b2b5..e30aa89 100644 --- a/programs/dxdiag/information.c +++ b/programs/dxdiag/information.c @@ -23,8 +23,6 @@ #include <dxdiag.h> #include "wine/debug.h" -#include "wine/unicode.h" - #include "dxdiag_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); @@ -69,10 +67,10 @@ static BOOL property_to_string(IDxDiagContainer *container, const WCHAR *propert { WCHAR *bstr = V_BSTR(&var); - *output = HeapAlloc(GetProcessHeap(), 0, (strlenW(bstr) + 1) * sizeof(WCHAR)); + *output = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(bstr) + 1) * sizeof(WCHAR)); if (*output) { - strcpyW(*output, bstr); + lstrcpyW(*output, bstr); ret = TRUE; } } diff --git a/programs/dxdiag/main.c b/programs/dxdiag/main.c index b073674..4533236 100644 --- a/programs/dxdiag/main.c +++ b/programs/dxdiag/main.c @@ -23,8 +23,6 @@ #include <dxdiag.h> #include "wine/debug.h" -#include "wine/unicode.h" - #include "dxdiag_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); @@ -61,7 +59,7 @@ static BOOL process_file_name(const WCHAR *cmdline, enum output_type output_type cmdline++; /* Ignore filename quoting, if any. */ - if (*cmdline == '"' && (endptr = strrchrW(cmdline, '"'))) + if (*cmdline == '"' && (endptr = wcsrchr(cmdline, '"'))) { /* Reject a string with only one quote. */ if (cmdline == endptr) @@ -70,7 +68,7 @@ static BOOL process_file_name(const WCHAR *cmdline, enum output_type output_type cmdline++; } else - endptr = cmdline + strlenW(cmdline); + endptr = cmdline + lstrlenW(cmdline); len = endptr - cmdline; if (len == 0 || len >= filename_len) @@ -80,14 +78,14 @@ static BOOL process_file_name(const WCHAR *cmdline, enum output_type output_type filename[len] = '\0'; /* Append an extension appropriate for the output type if the filename does not have one. */ - if (!strrchrW(filename, '.')) + if (!wcsrchr(filename, '.')) { const WCHAR *filename_ext = get_output_extension(output_type); - if (len + strlenW(filename_ext) >= filename_len) + if (len + lstrlenW(filename_ext) >= filename_len) return FALSE; - strcatW(filename, filename_ext); + lstrcatW(filename, filename_ext); } return TRUE; @@ -145,17 +143,17 @@ static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info ARRAY_SIZE(info->outfile)); case 'W': case 'w': - if (strncmpiW(cmdline, whql_colonW, 5)) + if (wcsnicmp(cmdline, whql_colonW, 5)) return FALSE; cmdline += 5; - if (!strncmpiW(cmdline, offW, 3)) + if (!wcsnicmp(cmdline, offW, 3)) { info->whql_check = FALSE; cmdline += 2; } - else if (!strncmpiW(cmdline, onW, 2)) + else if (!wcsnicmp(cmdline, onW, 2)) { info->whql_check = TRUE; cmdline++; @@ -167,7 +165,7 @@ static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info case 'd': case 'D': - if (strncmpiW(cmdline, dontskipW, 8)) + if (wcsnicmp(cmdline, dontskipW, 8)) return FALSE; cmdline += 8; break; diff --git a/programs/dxdiag/output.c b/programs/dxdiag/output.c index b1e0f18..50240fb 100644 --- a/programs/dxdiag/output.c +++ b/programs/dxdiag/output.c @@ -26,8 +26,6 @@ #include <stdio.h> #include "wine/debug.h" -#include "wine/unicode.h" - #include "dxdiag_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); @@ -98,7 +96,7 @@ static BOOL output_text_header(HANDLE hFile, const char *caption) static BOOL output_text_field(HANDLE hFile, const char *field_name, DWORD field_width, const WCHAR *value) { - DWORD value_lenW = strlenW(value); + DWORD value_lenW = lstrlenW(value); DWORD value_lenA = WideCharToMultiByte(CP_ACP, 0, value, value_lenW, NULL, 0, NULL, NULL); DWORD total_len = field_width + sizeof(": ") - 1 + value_lenA + sizeof(crlf); char sprintf_fmt[1 + 10 + 3 + 1];

1 0

Alexandre Julliard : eject: Build with msvcrt.
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: 5bf6ab713dd5f62dabac00b924924626d334dd39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bf6ab713dd5f62dabac00b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:46:50 2019 +0200 eject: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/eject/Makefile.in | 3 ++- programs/eject/eject.c | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/eject/Makefile.in b/programs/eject/Makefile.in index 07955d6..16c76c4 100644 --- a/programs/eject/Makefile.in +++ b/programs/eject/Makefile.in @@ -1,4 +1,5 @@ MODULE = eject.exe -APPMODE = -mconsole + +EXTRADLLFLAGS = -mconsole -mno-cygwin C_SRCS = eject.c diff --git a/programs/eject/eject.c b/programs/eject/eject.c index 483ac21..09922be 100644 --- a/programs/eject/eject.c +++ b/programs/eject/eject.c @@ -20,8 +20,6 @@ #define WIN32_LEAN_AND_MEAN -#include "config.h" - #include <windows.h> #include <winioctl.h> #include <ntddstor.h>

1 0

Alexandre Julliard : expand: Build with msvcrt.
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: b5e2f767b6834f6e7daeeab298e29fcbc6d0c763 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5e2f767b6834f6e7daeeab2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:47:01 2019 +0200 expand: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/expand/Makefile.in | 3 ++- programs/expand/expand.c | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/programs/expand/Makefile.in b/programs/expand/Makefile.in index 0e83e63..b6dd16b 100644 --- a/programs/expand/Makefile.in +++ b/programs/expand/Makefile.in @@ -1,5 +1,6 @@ MODULE = expand.exe -APPMODE = -mconsole IMPORTS = setupapi +EXTRADLLFLAGS = -mconsole -mno-cygwin + C_SRCS = expand.c diff --git a/programs/expand/expand.c b/programs/expand/expand.c index ea7bfdf..cf7eb20 100644 --- a/programs/expand/expand.c +++ b/programs/expand/expand.c @@ -26,18 +26,18 @@ #include <lzexpand.h> #include <setupapi.h> -static int myprintf(const char* format, ...) +static int WINAPIV myprintf(const char* format, ...) { - va_list va; + __ms_va_list va; char tmp[8192]; DWORD w = 0; int len; - va_start(va, format); + __ms_va_start(va, format); len = vsnprintf(tmp, sizeof(tmp), format, va); if (len > 0) WriteFile(GetStdHandle(STD_ERROR_HANDLE), tmp, len, &w, NULL); - va_end(va); + __ms_va_end(va); return w; }

1 0

Alexandre Julliard : extrac32: Build with msvcrt.
by Alexandre Julliard 29 Apr '19

29 Apr '19

Module: wine Branch: master Commit: 7cbae6b62c0bf885bacfecbe3b9d57b8e413d70f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cbae6b62c0bf885bacfecbe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 11:52:02 2019 +0200 extrac32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/extrac32/Makefile.in | 3 ++- programs/extrac32/extrac32.c | 14 +++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/programs/extrac32/Makefile.in b/programs/extrac32/Makefile.in index 246ef09..cda7a84 100644 --- a/programs/extrac32/Makefile.in +++ b/programs/extrac32/Makefile.in @@ -1,6 +1,7 @@ MODULE = extrac32.exe -APPMODE = -mwindows -municode IMPORTS = shell32 setupapi shlwapi user32 +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin + C_SRCS = \ extrac32.c diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index 7ab936e..c557ff0 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -19,13 +19,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdio.h> #include <windows.h> #include <shellapi.h> #include <setupapi.h> #include <shlwapi.h> #include <shlobj.h> -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(extrac32); @@ -38,7 +38,7 @@ static void create_target_directory(LPWSTR Target) WCHAR dir[MAX_PATH]; int res; - strcpyW(dir, Target); + lstrcpyW(dir, Target); *PathFindFileNameW(dir) = 0; /* Truncate file name */ if(!PathIsDirectoryW(dir)) { @@ -118,7 +118,7 @@ static void copy_file(LPCWSTR source, LPCWSTR destination) static const WCHAR overwriteMsg[] = {'O','v','e','r','w','r','i','t','e',' ','"','%','s','"','?',0}; static const WCHAR titleMsg[] = {'E','x','t','r','a','c','t',0}; WCHAR msg[MAX_PATH+100]; - snprintfW(msg, ARRAY_SIZE(msg), overwriteMsg, destination); + swprintf(msg, ARRAY_SIZE(msg), overwriteMsg, destination); if (MessageBoxW(NULL, msg, titleMsg, MB_YESNO | MB_ICONWARNING) != IDYES) return; } @@ -137,9 +137,9 @@ static LPWSTR *get_extrac_args(LPWSTR cmdline, int *pargc) BOOL new_arg; WINE_TRACE("cmdline: %s\n", wine_dbgstr_w(cmdline)); - str = HeapAlloc(GetProcessHeap(), 0, (strlenW(cmdline) + 1) * sizeof(WCHAR)); + str = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(cmdline) + 1) * sizeof(WCHAR)); if(!str) return NULL; - strcpyW(str, cmdline); + lstrcpyW(str, cmdline); argv = HeapAlloc(GetProcessHeap(), 0, (max_argc + 1) * sizeof(LPWSTR)); if(!argv) { @@ -154,7 +154,7 @@ static LPWSTR *get_extrac_args(LPWSTR cmdline, int *pargc) { new_arg = FALSE; /* Check character */ - if(isspaceW(*str)) /* white space */ + if(iswspace(*str)) /* white space */ { if(state == INSIDE_ARG) { @@ -257,7 +257,7 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho break; } /* Get parameters for commands */ - check = toupperW( argv[i][1] ); + check = towupper( argv[i][1] ); switch(check) { case 'A':

1 0

Alexandre Julliard : Wine release 4.7
by Alexandre Julliard 26 Apr '19

26 Apr '19

Module: website Branch: master Commit: 02736f542477189934e0ae4f432c031a42a135ae URL: https://source.winehq.org/git/website.git/?a=commit;h=02736f542477189934e0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 26 22:31:17 2019 +0200 Wine release 4.7 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019042601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2019042601.xml b/news/en/2019042601.xml new file mode 100644 index 0000000..cacdf4b --- /dev/null +++ b/news/en/2019042601.xml @@ -0,0 +1,17 @@ +<news> +<date>April 26, 2019</date> +<title>Wine 4.7 Released</title> +<body> + The Wine development release 4.7 is now available. + <a href="{$root}/announce/4.7">What's new</a> in this release: +<ul> + <li>Support for builtin libraries in PE format even on Unix.</li> + <li>Updated version of the Mono engine.</li> + <li>More implementation of the Debug Engine DLL.</li> + <li>Support for the Command Link standard control.</li> + <li>Improved Edit control sizing in CJK locales.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.7.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : include/msvcrt: Add stdint.h header.
by Alexandre Julliard 26 Apr '19

26 Apr '19

Module: wine Branch: master Commit: ba2ca27dfe67e4f60a0a246b354390ef992f497c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba2ca27dfe67e4f60a0a246b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 26 12:50:34 2019 +0200 include/msvcrt: Add stdint.h header. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/msvcrt/stdint.h | 211 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 212 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 09c84d8..4a0f927 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -437,6 +437,7 @@ SOURCES = \ msvcrt/share.h \ msvcrt/signal.h \ msvcrt/stddef.h \ + msvcrt/stdint.h \ msvcrt/stdio.h \ msvcrt/stdlib.h \ msvcrt/string.h \ diff --git a/include/msvcrt/stdint.h b/include/msvcrt/stdint.h new file mode 100644 index 0000000..d228071 --- /dev/null +++ b/include/msvcrt/stdint.h @@ -0,0 +1,211 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ +/* ISO C9x 7.18 Integer types <stdint.h> + * Based on ISO/IEC SC22/WG14 9899 Committee draft (SC22 N2794) + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * Contributor: Danny Smith <danny_r_smith_2001(a)yahoo.co.nz> + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * Date: 2000-12-02 + */ + + +#ifndef _STDINT_H +#define _STDINT_H + +#include <crtdefs.h> + +#define __need_wint_t +#define __need_wchar_t +#include <stddef.h> + +/* 7.18.1.1 Exact-width integer types */ +typedef signed char int8_t; +typedef unsigned char uint8_t; +typedef short int16_t; +typedef unsigned short uint16_t; +typedef int int32_t; +typedef unsigned uint32_t; +typedef long long int64_t; +typedef unsigned long long uint64_t; + +/* 7.18.1.2 Minimum-width integer types */ +typedef signed char int_least8_t; +typedef unsigned char uint_least8_t; +typedef short int_least16_t; +typedef unsigned short uint_least16_t; +typedef int int_least32_t; +typedef unsigned uint_least32_t; +typedef long long int_least64_t; +typedef unsigned long long uint_least64_t; + +/* 7.18.1.3 Fastest minimum-width integer types + * Not actually guaranteed to be fastest for all purposes + * Here we use the exact-width types for 8 and 16-bit ints. + */ +typedef signed char int_fast8_t; +typedef unsigned char uint_fast8_t; +typedef short int_fast16_t; +typedef unsigned short uint_fast16_t; +typedef int int_fast32_t; +typedef unsigned int uint_fast32_t; +typedef long long int_fast64_t; +typedef unsigned long long uint_fast64_t; + +/* 7.18.1.5 Greatest-width integer types */ +typedef long long intmax_t; +typedef unsigned long long uintmax_t; + +/* 7.18.2 Limits of specified-width integer types */ +#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) || \ + defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L + +/* 7.18.2.1 Limits of exact-width integer types */ +#define INT8_MIN (-128) +#define INT16_MIN (-32768) +#define INT32_MIN (-2147483647 - 1) +#define INT64_MIN (-9223372036854775807LL - 1) + +#define INT8_MAX 127 +#define INT16_MAX 32767 +#define INT32_MAX 2147483647 +#define INT64_MAX 9223372036854775807LL + +#define UINT8_MAX 255 +#define UINT16_MAX 65535 +#define UINT32_MAX 0xffffffffU /* 4294967295U */ +#define UINT64_MAX 0xffffffffffffffffULL /* 18446744073709551615ULL */ + +/* 7.18.2.2 Limits of minimum-width integer types */ +#define INT_LEAST8_MIN INT8_MIN +#define INT_LEAST16_MIN INT16_MIN +#define INT_LEAST32_MIN INT32_MIN +#define INT_LEAST64_MIN INT64_MIN + +#define INT_LEAST8_MAX INT8_MAX +#define INT_LEAST16_MAX INT16_MAX +#define INT_LEAST32_MAX INT32_MAX +#define INT_LEAST64_MAX INT64_MAX + +#define UINT_LEAST8_MAX UINT8_MAX +#define UINT_LEAST16_MAX UINT16_MAX +#define UINT_LEAST32_MAX UINT32_MAX +#define UINT_LEAST64_MAX UINT64_MAX + +/* 7.18.2.3 Limits of fastest minimum-width integer types */ +#define INT_FAST8_MIN INT8_MIN +#define INT_FAST16_MIN INT16_MIN +#define INT_FAST32_MIN INT32_MIN +#define INT_FAST64_MIN INT64_MIN + +#define INT_FAST8_MAX INT8_MAX +#define INT_FAST16_MAX INT16_MAX +#define INT_FAST32_MAX INT32_MAX +#define INT_FAST64_MAX INT64_MAX + +#define UINT_FAST8_MAX UINT8_MAX +#define UINT_FAST16_MAX UINT16_MAX +#define UINT_FAST32_MAX UINT32_MAX +#define UINT_FAST64_MAX UINT64_MAX + +/* 7.18.2.4 Limits of integer types capable of holding + object pointers */ +#ifdef _WIN64 +#define INTPTR_MIN INT64_MIN +#define INTPTR_MAX INT64_MAX +#define UINTPTR_MAX UINT64_MAX +#else +#define INTPTR_MIN INT32_MIN +#define INTPTR_MAX INT32_MAX +#define UINTPTR_MAX UINT32_MAX +#endif + +/* 7.18.2.5 Limits of greatest-width integer types */ +#define INTMAX_MIN INT64_MIN +#define INTMAX_MAX INT64_MAX +#define UINTMAX_MAX UINT64_MAX + +/* 7.18.3 Limits of other integer types */ +#ifdef _WIN64 +#define PTRDIFF_MIN INT64_MIN +#define PTRDIFF_MAX INT64_MAX +#else +#define PTRDIFF_MIN INT32_MIN +#define PTRDIFF_MAX INT32_MAX +#endif + +#define SIG_ATOMIC_MIN INT32_MIN +#define SIG_ATOMIC_MAX INT32_MAX + +#ifndef SIZE_MAX +#ifdef _WIN64 +#define SIZE_MAX UINT64_MAX +#else +#define SIZE_MAX UINT32_MAX +#endif +#endif + +#ifndef WCHAR_MIN /* also in wchar.h */ +#define WCHAR_MIN 0U +#define WCHAR_MAX 0xffffU +#endif + +/* + * wint_t is unsigned short for compatibility with MS runtime + */ +#define WINT_MIN 0U +#define WINT_MAX 0xffffU + +#endif /* !defined ( __cplusplus) || defined __STDC_LIMIT_MACROS */ + + +/* 7.18.4 Macros for integer constants */ +#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) || \ + defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L + +/* 7.18.4.1 Macros for minimum-width integer constants + + Accoding to Douglas Gwyn <gwyn(a)arl.mil>: + "This spec was changed in ISO/IEC 9899:1999 TC1; in ISO/IEC + 9899:1999 as initially published, the expansion was required + to be an integer constant of precisely matching type, which + is impossible to accomplish for the shorter types on most + platforms, because C99 provides no standard way to designate + an integer constant with width less than that of type int. + TC1 changed this to require just an integer constant + *expression* with *promoted* type." + + The trick used here is from Clive D W Feather. +*/ + +#define INT8_C(val) (INT_LEAST8_MAX-INT_LEAST8_MAX+(val)) +#define INT16_C(val) (INT_LEAST16_MAX-INT_LEAST16_MAX+(val)) +#define INT32_C(val) (INT_LEAST32_MAX-INT_LEAST32_MAX+(val)) +/* The 'trick' doesn't work in C89 for long long because, without + suffix, (val) will be evaluated as int, not intmax_t */ +#define INT64_C(val) val##LL + +#define UINT8_C(val) (val) +#define UINT16_C(val) (val) +#define UINT32_C(val) (val##U) +#define UINT64_C(val) val##ULL + +/* 7.18.4.2 Macros for greatest-width integer constants */ +#define INTMAX_C(val) val##LL +#define UINTMAX_C(val) val##ULL + +#endif /* !defined ( __cplusplus) || defined __STDC_CONSTANT_MACROS */ + +#endif /* _STDINT_H */

1 0

Alexandre Julliard : makefiles: Don' t allow using system headers with msvcrt.
by Alexandre Julliard 26 Apr '19

26 Apr '19

Module: wine Branch: master Commit: 87f7818f4b7573d82a663736afbc2094a4006355 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87f7818f4b7573d82a663736… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 26 12:51:43 2019 +0200 makefiles: Don't allow using system headers with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/makedep.c b/tools/makedep.c index a051281..05c574d 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1526,6 +1526,15 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ return file; } } + + if (pFile->type == INCL_SYSTEM && make->use_msvcrt) + { + if (!strcmp( pFile->name, "stdarg.h" )) return NULL; + fprintf( stderr, "%s:%d: error: system header %s cannot be used with msvcrt\n", + pFile->included_by->file->name, pFile->included_line, pFile->name ); + exit(1); + } + if (pFile->type == INCL_SYSTEM) return NULL; /* ignore system files we cannot find */ /* try in src file directory */

1 0

Erich E. Hoover : kernel32: NeedCurrentDirectoryForExePath does not use the registry.
by Alexandre Julliard 26 Apr '19

26 Apr '19

Module: wine Branch: master Commit: 2295d937a8ae917deb739999ff4f81d474f7f122 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2295d937a8ae917deb739999… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Wed Apr 17 10:57:25 2019 +0200 kernel32: NeedCurrentDirectoryForExePath does not use the registry. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index cf1c768..b8f49bd 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1991,8 +1991,7 @@ BOOL WINAPI NeedCurrentDirectoryForExePathW( LPCWSTR name ) 'I','n','E','x','e','P','a','t','h',0}; WCHAR env_val; - /* MSDN mentions some 'registry location'. We do not use registry. */ - FIXME("(%s): partial stub\n", debugstr_w(name)); + TRACE("(%s)\n", debugstr_w(name)); if (strchrW(name, '\\')) return TRUE;

1 0

Nikolay Sivov : mfplat: Add partial implementation of ConvertToContiguousBuffer().
by Alexandre Julliard 26 Apr '19

26 Apr '19

Module: wine Branch: master Commit: 2e9a036f9a263c3a7d66834a44cfc8bdbbcbb346 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e9a036f9a263c3a7d66834a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 26 09:56:49 2019 +0300 mfplat: Add partial implementation of ConvertToContiguousBuffer(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 24 +++++++++++++++++++++-- dlls/mfplat/tests/mfplat.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 524398a..27ae44a 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -686,9 +686,29 @@ static HRESULT WINAPI sample_GetBufferByIndex(IMFSample *iface, DWORD index, IMF static HRESULT WINAPI sample_ConvertToContiguousBuffer(IMFSample *iface, IMFMediaBuffer **buffer) { - FIXME("%p, %p.\n", iface, buffer); + struct sample *sample = impl_from_IMFSample(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, buffer); + + EnterCriticalSection(&sample->cs); + + if (sample->buffer_count == 0) + hr = E_UNEXPECTED; + else if (sample->buffer_count == 1) + { + *buffer = sample->buffers[0]; + IMFMediaBuffer_AddRef(*buffer); + } + else + { + FIXME("Samples with multiple buffers are not supported.\n"); + hr = E_NOTIMPL; + } + + LeaveCriticalSection(&sample->cs); + + return hr; } static HRESULT WINAPI sample_AddBuffer(IMFSample *iface, IMFMediaBuffer *buffer) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 571d57a..541b236 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1475,6 +1475,53 @@ static void test_sample(void) IMFAttributes_Release(attributes); IMFSample_Release(sample); + + /* ConvertToContiguousBuffer() */ + hr = MFCreateSample(&sample); + ok(hr == S_OK, "Failed to create a sample, hr %#x.\n", hr); + + hr = IMFSample_ConvertToContiguousBuffer(sample, &buffer); + ok(hr == E_UNEXPECTED, "Unexpected hr %#x.\n", hr); + + hr = MFCreateMemoryBuffer(16, &buffer); + ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); + + hr = IMFSample_AddBuffer(sample, buffer); + ok(hr == S_OK, "Failed to add buffer, hr %#x.\n", hr); + + hr = IMFSample_ConvertToContiguousBuffer(sample, &buffer2); + ok(hr == S_OK, "Failed to convert, hr %#x.\n", hr); + ok(buffer2 == buffer, "Unexpected buffer instance.\n"); + IMFMediaBuffer_Release(buffer2); + + hr = IMFSample_ConvertToContiguousBuffer(sample, &buffer2); + ok(hr == S_OK, "Failed to convert, hr %#x.\n", hr); + ok(buffer2 == buffer, "Unexpected buffer instance.\n"); + IMFMediaBuffer_Release(buffer2); + + hr = MFCreateMemoryBuffer(16, &buffer2); + ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); + + hr = IMFSample_AddBuffer(sample, buffer2); + ok(hr == S_OK, "Failed to add buffer, hr %#x.\n", hr); + IMFMediaBuffer_Release(buffer2); + + hr = IMFSample_GetBufferCount(sample, &count); + ok(hr == S_OK, "Failed to get buffer count, hr %#x.\n", hr); + ok(count == 2, "Unexpected buffer count %u.\n", count); + + hr = IMFSample_ConvertToContiguousBuffer(sample, &buffer2); +todo_wine + ok(hr == S_OK, "Failed to convert, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IMFMediaBuffer_Release(buffer2); + + hr = IMFSample_GetBufferCount(sample, &count); + ok(hr == S_OK, "Failed to get buffer count, hr %#x.\n", hr); +todo_wine + ok(count == 1, "Unexpected buffer count %u.\n", count); + + IMFSample_Release(sample); } struct test_callback

1 0