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

Giovanni Mascellani : d2d1: Implement rounded rectangle drawing.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: 1a985ae8d65a2dfce9ea846edc94144d8bfac6f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a985ae8d65a2dfce9ea846e… Author: Giovanni Mascellani <gio(a)debian.org> Date: Tue Jan 28 16:35:44 2020 +0330 d2d1: Implement rounded rectangle drawing. Currently rounded parts are approximated with quadratic Bézier curves. Signed-off-by: Giovanni Mascellani <gio(a)debian.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f04bcb2d1b3ee9abb60ee53ab3b7d85e1f9e0c9b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 20 ++- dlls/d2d1/factory.c | 22 +++- dlls/d2d1/geometry.c | 325 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/tests/d2d1.c | 6 - 4 files changed, 362 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1a985ae8d65a2dfce9ea…

1 0

Dmitry Timoshkov : schedsvc/tests: Fix compilation with recent gcc/clang versions.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: a5d8012e3daeb9292e81a9b8116f941f86111a49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5d8012e3daeb9292e81a9b8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 15 21:43:42 2020 +0800 schedsvc/tests: Fix compilation with recent gcc/clang versions. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1d785798605c01dcfc8a2f9f6ecc24bc21351029) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/schedsvc/tests/atsvcapi.c | 6 +++--- dlls/schedsvc/tests/rpcapi.c | 6 +++--- dlls/taskschd/task.c | 4 ++-- include/wine/atsvc.idl | 2 +- include/wine/schrpc.idl | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/schedsvc/tests/atsvcapi.c b/dlls/schedsvc/tests/atsvcapi.c index d7d48a122c..f10c9d0723 100644 --- a/dlls/schedsvc/tests/atsvcapi.c +++ b/dlls/schedsvc/tests/atsvcapi.c @@ -31,7 +31,7 @@ #define JOB_ADD_CURRENT_DATE 0x08 #define JOB_NONINTERACTIVE 0x10 -extern handle_t rpc_handle; +extern handle_t atsvc_handle; static int test_failures, test_skipped; @@ -69,7 +69,7 @@ START_TEST(atsvcapi) hr = RpcStringBindingComposeA(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); ok(hr == RPC_S_OK, "RpcStringBindingCompose error %#x\n", hr); - hr = RpcBindingFromStringBindingA(binding_str, &rpc_handle); + hr = RpcBindingFromStringBindingA(binding_str, &atsvc_handle); ok(hr == RPC_S_OK, "RpcBindingFromStringBinding error %#x\n", hr); hr = RpcStringFreeA(&binding_str); ok(hr == RPC_S_OK, "RpcStringFree error %#x\n", hr); @@ -173,7 +173,7 @@ skip_tests_delete: skip_tests: SetUnhandledExceptionFilter(old_exception_filter); - hr = RpcBindingFree(&rpc_handle); + hr = RpcBindingFree(&atsvc_handle); ok(hr == RPC_S_OK, "RpcBindingFree error %#x\n", hr); } diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index 9d9557fe1c..b791a047dc 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -25,7 +25,7 @@ #include "wine/test.h" -extern handle_t rpc_handle; +extern handle_t schrpc_handle; static LONG CALLBACK rpc_exception_filter(EXCEPTION_POINTERS *ptrs) { @@ -103,7 +103,7 @@ START_TEST(rpcapi) hr = RpcStringBindingComposeA(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); ok(hr == RPC_S_OK, "RpcStringBindingCompose error %#x\n", hr); - hr = RpcBindingFromStringBindingA(binding_str, &rpc_handle); + hr = RpcBindingFromStringBindingA(binding_str, &schrpc_handle); ok(hr == RPC_S_OK, "RpcBindingFromStringBinding error %#x\n", hr); hr = RpcStringFreeA(&binding_str); ok(hr == RPC_S_OK, "RpcStringFree error %#x\n", hr); @@ -537,7 +537,7 @@ todo_wine MIDL_user_free(path); } - hr = RpcBindingFree(&rpc_handle); + hr = RpcBindingFree(&schrpc_handle); ok(hr == RPC_S_OK, "RpcBindingFree error %#x\n", hr); } diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index b75cfff8af..8d81a18b3f 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -3843,7 +3843,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V DWORD len; HRESULT hr; RPC_WSTR binding_str; - extern handle_t rpc_handle; + extern handle_t schrpc_handle; TRACE("%p,%s,%s,%s,%s\n", iface, debugstr_variant(&server), debugstr_variant(&user), debugstr_variant(&domain), debugstr_variant(&password)); @@ -3882,7 +3882,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V hr = RpcStringBindingComposeW(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); if (hr != RPC_S_OK) return hr; - hr = RpcBindingFromStringBindingW(binding_str, &rpc_handle); + hr = RpcBindingFromStringBindingW(binding_str, &schrpc_handle); RpcStringFreeW(&binding_str); if (hr != RPC_S_OK) return hr; diff --git a/include/wine/atsvc.idl b/include/wine/atsvc.idl index e95e6cf110..5e7121d016 100644 --- a/include/wine/atsvc.idl +++ b/include/wine/atsvc.idl @@ -23,7 +23,7 @@ import "ocidl.idl"; [ uuid(1ff70682-0a51-30e8-076d-740be8cee98b), - implicit_handle(handle_t rpc_handle), + implicit_handle(handle_t atsvc_handle), version(1.0), pointer_default(unique) ] diff --git a/include/wine/schrpc.idl b/include/wine/schrpc.idl index 4af709d8dd..944f283081 100644 --- a/include/wine/schrpc.idl +++ b/include/wine/schrpc.idl @@ -26,7 +26,7 @@ import "ocidl.idl"; [ uuid(86d35949-83c9-4044-b424-db363231fd0c), - implicit_handle(handle_t rpc_handle), + implicit_handle(handle_t schrpc_handle), version(1.0), pointer_default(unique) ]

1 0

Gerald Pfeifer : msi: Properly declare variables in msi/tests/utils.h as extern.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: 80df6fed6a6db09c1bb02961b8cbbf4dd6faf99a URL: https://source.winehq.org/git/wine.git/?a=commit;h=80df6fed6a6db09c1bb02961… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Jan 28 22:40:25 2020 +0100 msi: Properly declare variables in msi/tests/utils.h as extern. Omitting the extern storage qualifier when declaring a global variable in a header file is mistake. If that header is included by several files it results in multiple definitions of the same variable (unless -fcommon is specified or assumed, the latter being the case for GCC 9.x and earlier). This fixes building with GCC 10. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ea032bb7f8daddfe308f86f52c54db5f657b658a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/tests/utils.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/utils.h b/dlls/msi/tests/utils.h index f16e2d5ff5..0880553863 100644 --- a/dlls/msi/tests/utils.h +++ b/dlls/msi/tests/utils.h @@ -16,12 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -char PROG_FILES_DIR[MAX_PATH]; -char PROG_FILES_DIR_NATIVE[MAX_PATH]; -char COMMON_FILES_DIR[MAX_PATH]; -char APP_DATA_DIR[MAX_PATH]; -char WINDOWS_DIR[MAX_PATH]; -char CURR_DIR[MAX_PATH]; +extern char PROG_FILES_DIR[MAX_PATH]; +extern char PROG_FILES_DIR_NATIVE[MAX_PATH]; +extern char COMMON_FILES_DIR[MAX_PATH]; +extern char APP_DATA_DIR[MAX_PATH]; +extern char WINDOWS_DIR[MAX_PATH]; +extern char CURR_DIR[MAX_PATH]; BOOL get_system_dirs(void); BOOL get_user_dirs(void);

1 0

Michael Cronenworth : webservices: Global variable compatibility update for gcc 10.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: 8405a5ebbafebe52f38f8dec93a93c7a834d7d19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8405a5ebbafebe52f38f8dec… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jan 23 17:05:28 2020 -0600 webservices: Global variable compatibility update for gcc 10. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bc51c5d589de709e1d393b58b0cc5985c78061ac) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/webservices/webservices_private.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 6f2b90dad2..b352aa52d4 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -18,7 +18,7 @@ #include "winhttp.h" -_locale_t c_locale DECLSPEC_HIDDEN; +extern _locale_t c_locale DECLSPEC_HIDDEN; #define STREAM_BUFSIZE 4096 @@ -50,8 +50,8 @@ struct dictionary ULONG current_sequence; ULONG *sequence; }; -struct dictionary dict_builtin DECLSPEC_HIDDEN; -const struct dictionary dict_builtin_static DECLSPEC_HIDDEN; +extern struct dictionary dict_builtin DECLSPEC_HIDDEN; +extern const struct dictionary dict_builtin_static DECLSPEC_HIDDEN; int find_string( const struct dictionary *, const unsigned char *, ULONG, ULONG * ) DECLSPEC_HIDDEN; HRESULT insert_string( struct dictionary *, unsigned char *, ULONG, int, ULONG * ) DECLSPEC_HIDDEN;

1 0

Michael Cronenworth : twain_32: Global variable compatibility update for gcc 10.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: 0503b5835bf41d7feea3484a68bac067954d4e7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0503b5835bf41d7feea3484a… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jan 23 17:05:26 2020 -0600 twain_32: Global variable compatibility update for gcc 10. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4a91eb362666b3af549c48b95e093051756628e0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/twain_32/twain32_main.c | 4 +++- dlls/twain_32/twain_i.h | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/twain_32/twain32_main.c b/dlls/twain_32/twain32_main.c index b1beb96958..0f8ee14430 100644 --- a/dlls/twain_32/twain32_main.c +++ b/dlls/twain_32/twain32_main.c @@ -29,7 +29,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); -extern HINSTANCE DSM_hinstance; +TW_UINT16 DSM_twCC; +activeDS *activeSources; +HINSTANCE DSM_hinstance; BOOL WINAPI DllMain (HINSTANCE hinstance, DWORD reason, LPVOID reserved) { diff --git a/dlls/twain_32/twain_i.h b/dlls/twain_32/twain_i.h index 7939d233bb..ad513458cd 100644 --- a/dlls/twain_32/twain_i.h +++ b/dlls/twain_32/twain_i.h @@ -45,11 +45,11 @@ typedef struct tagActiveDS HWND event_window; } activeDS; -TW_UINT16 DSM_twCC DECLSPEC_HIDDEN; /* current condition code of Source Manager */ +extern TW_UINT16 DSM_twCC DECLSPEC_HIDDEN; /* current condition code of Source Manager */ -activeDS *activeSources DECLSPEC_HIDDEN; /* list of active data sources */ +extern activeDS *activeSources DECLSPEC_HIDDEN; /* list of active data sources */ -HINSTANCE DSM_hinstance DECLSPEC_HIDDEN; +extern HINSTANCE DSM_hinstance DECLSPEC_HIDDEN; /* Implementation of operation triplets (From Application to Source Manager) */ extern TW_UINT16 TWAIN_CloseDS

1 0

Michael Cronenworth : gphoto2.ds: Global variable compatibility update for gcc 10.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: 0c934a8474740126b79d2e8b028275d96a9e1ca9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c934a8474740126b79d2e8b… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jan 23 17:05:21 2020 -0600 gphoto2.ds: Global variable compatibility update for gcc 10. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 453980e13015e20dd551531be69b3361b63f22b1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gphoto2.ds/gphoto2_i.h | 4 +++- dlls/gphoto2.ds/gphoto2_main.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/gphoto2.ds/gphoto2_i.h b/dlls/gphoto2.ds/gphoto2_i.h index 9ab8bbbf33..4171fcae4f 100644 --- a/dlls/gphoto2.ds/gphoto2_i.h +++ b/dlls/gphoto2.ds/gphoto2_i.h @@ -100,7 +100,9 @@ struct tagActiveDS struct jpeg_decompress_struct jd; struct jpeg_error_mgr jerr; #endif -} activeDS DECLSPEC_HIDDEN; +}; + +extern struct tagActiveDS activeDS DECLSPEC_HIDDEN; /* Helper functions */ extern TW_UINT16 GPHOTO2_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) DECLSPEC_HIDDEN; diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c index 28100414cc..4d71c89e2e 100644 --- a/dlls/gphoto2.ds/gphoto2_main.c +++ b/dlls/gphoto2.ds/gphoto2_main.c @@ -33,6 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); +struct tagActiveDS activeDS; + DSMENTRYPROC GPHOTO2_dsmentry; #ifdef HAVE_GPHOTO2

1 0

Michael Cronenworth : sane.ds: Global variable compatibility update for gcc 10.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: a01ae837f8c668a08f085588194e5331a4a052be URL: https://source.winehq.org/git/wine.git/?a=commit;h=a01ae837f8c668a08f085588… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jan 23 17:05:24 2020 -0600 sane.ds: Global variable compatibility update for gcc 10. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c13d58780f78393571dfdeb5b4952e3dcd7ded90) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/sane.ds/sane_i.h | 6 ++++-- dlls/sane.ds/sane_main.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/sane.ds/sane_i.h b/dlls/sane.ds/sane_i.h index 941e8b9e1b..9351bdc222 100644 --- a/dlls/sane.ds/sane_i.h +++ b/dlls/sane.ds/sane_i.h @@ -36,7 +36,7 @@ #include "twain.h" #ifdef SONAME_LIBSANE -#define MAKE_FUNCPTR(f) typeof(f) * p##f DECLSPEC_HIDDEN; +#define MAKE_FUNCPTR(f) extern typeof(f) * p##f DECLSPEC_HIDDEN; MAKE_FUNCPTR(sane_init) MAKE_FUNCPTR(sane_exit) MAKE_FUNCPTR(sane_get_devices) @@ -84,7 +84,9 @@ struct tagActiveDS TW_FIX32 defaultXResolution; BOOL YResolutionSet; TW_FIX32 defaultYResolution; -} activeDS DECLSPEC_HIDDEN; +}; + +extern struct tagActiveDS activeDS DECLSPEC_HIDDEN; /* Helper functions */ extern TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) DECLSPEC_HIDDEN; diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index 7af0a2321a..0cf211d098 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -30,9 +30,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); +struct tagActiveDS activeDS; + DSMENTRYPROC SANE_dsmentry; #ifdef SONAME_LIBSANE +#define MAKE_FUNCPTR(f) typeof(f) * p##f; +MAKE_FUNCPTR(sane_init) +MAKE_FUNCPTR(sane_exit) +MAKE_FUNCPTR(sane_get_devices) +MAKE_FUNCPTR(sane_open) +MAKE_FUNCPTR(sane_close) +MAKE_FUNCPTR(sane_get_option_descriptor) +MAKE_FUNCPTR(sane_control_option) +MAKE_FUNCPTR(sane_get_parameters) +MAKE_FUNCPTR(sane_start) +MAKE_FUNCPTR(sane_read) +MAKE_FUNCPTR(sane_cancel) +MAKE_FUNCPTR(sane_set_io_mode) +MAKE_FUNCPTR(sane_get_select_fd) +MAKE_FUNCPTR(sane_strstatus) +#undef MAKE_FUNCPTR HINSTANCE SANE_instance;

1 0

Nikolay Sivov : ucrtbase: Add _query_new_handler() and _query_new_mode().
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: 51c7d18007f3f3b705a56cde3c9a7f029c0040b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51c7d18007f3f3b705a56cde… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 28 11:02:40 2020 +0300 ucrtbase: Add _query_new_handler() and _query_new_mode(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5b9323400d4d710af3ab21f445c13f99a6c228ba) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec index 0a99e870be..0885d5813e 100644 --- a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec +++ b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec @@ -16,8 +16,8 @@ @ cdecl _heapwalk(ptr) ucrtbase._heapwalk @ cdecl _malloc_base(long) ucrtbase._malloc_base @ cdecl _msize(ptr) ucrtbase._msize -@ stub _query_new_handler -@ stub _query_new_mode +@ cdecl _query_new_handler() ucrtbase._query_new_handler +@ cdecl _query_new_mode() ucrtbase._query_new_mode @ cdecl _realloc_base(ptr long) ucrtbase._realloc_base @ cdecl _recalloc(ptr long long) ucrtbase._recalloc @ cdecl _set_new_mode(long) ucrtbase._set_new_mode diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index dc95824a1f..34965e06c3 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1856,8 +1856,8 @@ @ cdecl _putwch_nolock(long) @ cdecl _putws(wstr) MSVCRT__putws @ stub _query_app_type -@ stub _query_new_handler -@ stub _query_new_mode +@ cdecl _query_new_handler() MSVCRT__query_new_handler +@ cdecl _query_new_mode() MSVCRT__query_new_mode @ cdecl _read(long ptr long) MSVCRT__read @ cdecl _realloc_base(ptr long) @ cdecl _recalloc(ptr long long)

1 0

Piotr Caban : msvcrt: Add support for quoted paths in _searchenv_s.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: 1cd091e6c11fa2f2b0de0f2f0f9de1892a22c807 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cd091e6c11fa2f2b0de0f2f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 29 13:42:11 2020 +0100 msvcrt: Add support for quoted paths in _searchenv_s. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2e7ad72a8dae21aa5a16396c408007d48e43f5ec) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/dir.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index d07fcd6c7d..806a2b0c85 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -1763,12 +1763,27 @@ int CDECL MSVCRT__searchenv_s(const char* file, const char* env, char *buf, MSVC for(; *penv; penv = (*end ? end + 1 : end)) { end = penv; - while(*end && *end != ';') end++; /* Find end of next path */ - path_len = end - penv; + path_len = 0; + while(*end && *end != ';' && path_len < MAX_PATH) + { + if (*end == '"') + { + end++; + while(*end && *end != '"' && path_len < MAX_PATH) + { + path[path_len++] = *end; + end++; + } + if (*end == '"') end++; + continue; + } + + path[path_len++] = *end; + end++; + } if (!path_len || path_len >= MAX_PATH) continue; - memcpy(path, penv, path_len); if (path[path_len - 1] != '/' && path[path_len - 1] != '\\') path[path_len++] = '\\'; if (path_len + fname_len >= MAX_PATH)

1 0

Piotr Caban : msvcrt: Don't duplicate _searchenv_s code in _searchenv.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: ea66b05c2b2a5c51f274360aa241779b2f0ce56f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea66b05c2b2a5c51f274360a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 29 13:42:15 2020 +0100 msvcrt: Don't duplicate _searchenv_s code in _searchenv. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 98c554ac0617c642bc4481e6f56e0d66adec660a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/dir.c | 90 +++++-------------------------------------------------- 1 file changed, 8 insertions(+), 82 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 806a2b0c85..83aff8bcb5 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -1640,88 +1640,6 @@ range: return MSVCRT_ERANGE; } -/********************************************************************* - * _searchenv (MSVCRT.@) - * - * Search for a file in a list of paths from an environment variable. - * - * PARAMS - * file [I] Name of the file to search for. - * env [I] Name of the environment variable containing a list of paths. - * buf [O] Destination for the found file path. - * - * RETURNS - * Nothing. If the file is not found, buf will contain an empty string - * and errno is set. - */ -void CDECL MSVCRT__searchenv(const char* file, const char* env, char *buf) -{ - char*envVal, *penv, *end; - char path[MAX_PATH]; - MSVCRT_size_t path_len, fname_len = strlen(file); - - *buf = '\0'; - - /* Try CWD first */ - if (GetFileAttributesA( file ) != INVALID_FILE_ATTRIBUTES) - { - GetFullPathNameA( file, MAX_PATH, buf, NULL ); - return; - } - - /* Search given environment variable */ - envVal = MSVCRT_getenv(env); - if (!envVal) - { - msvcrt_set_errno(ERROR_FILE_NOT_FOUND); - return; - } - - penv = envVal; - TRACE(":searching for %s in paths %s\n", file, envVal); - - for(; *penv; penv = (*end ? end + 1 : end)) - { - end = penv; - path_len = 0; - while(*end && *end != ';' && path_len < MAX_PATH) - { - if (*end == '"') - { - end++; - while(*end && *end != '"' && path_len < MAX_PATH) - { - path[path_len++] = *end; - end++; - } - if (*end == '"') end++; - continue; - } - - path[path_len++] = *end; - end++; - } - if (!path_len || path_len >= MAX_PATH) - continue; - - if (path[path_len - 1] != '/' && path[path_len - 1] != '\\') - path[path_len++] = '\\'; - if (path_len + fname_len >= MAX_PATH) - continue; - - memcpy(path + path_len, file, fname_len + 1); - TRACE("Checking for file %s\n", path); - if (GetFileAttributesA( path ) != INVALID_FILE_ATTRIBUTES) - { - memcpy(buf, path, path_len + fname_len + 1); - return; - } - } - - msvcrt_set_errno(ERROR_FILE_NOT_FOUND); - return; -} - /********************************************************************* * _searchenv_s (MSVCRT.@) */ @@ -1807,6 +1725,14 @@ int CDECL MSVCRT__searchenv_s(const char* file, const char* env, char *buf, MSVC return MSVCRT_ENOENT; } +/********************************************************************* + * _searchenv (MSVCRT.@) + */ +void CDECL MSVCRT__searchenv(const char* file, const char* env, char *buf) +{ + MSVCRT__searchenv_s(file, env, buf, MAX_PATH); +} + /********************************************************************* * _wsearchenv (MSVCRT.@) *

1 0