wine-commits June 2020

wine-commits@winehq.org

1 participants
947 discussions

Piotr Caban : msvcrt: Add support for quoted paths in _searchenv_s.
by Alexandre Julliard 02 Jun '20

02 Jun '20

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: Add support for quoted paths in _searchenv.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: bfd41ed7a9bb5f4ac9b125260aa727ab1fbb629f URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfd41ed7a9bb5f4ac9b12526… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 28 18:26:12 2020 +0100 msvcrt: Add support for quoted paths in _searchenv. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1d0cca465ab6b185dd91db00f61d9ad5d272a766) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/dir.c | 21 ++++++++++++++++++--- dlls/msvcrt/tests/dir.c | 14 ++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index e8cba58ac7..d07fcd6c7d 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -1683,12 +1683,27 @@ void CDECL MSVCRT__searchenv(const char* file, const char* env, char *buf) 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) diff --git a/dlls/msvcrt/tests/dir.c b/dlls/msvcrt/tests/dir.c index 210cf3983c..6c817dfb2e 100644 --- a/dlls/msvcrt/tests/dir.c +++ b/dlls/msvcrt/tests/dir.c @@ -597,6 +597,20 @@ static void test_searchenv(void) ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); } + strcpy(env1, "TEST_PATH="); + strcat(env1, tmppath); + strcat(env1, "\"\\search_env_test\\\"d\"i\"r\"1"); + putenv(env1); + strcpy(exp, tmppath); + strcat(exp, files[0]); + _searchenv("1.dat", "TEST_PATH", result); + ok(!strcmp(result, exp), "got %s, expected '%s'\n", result, exp); + + strcat(env1, ";"); + putenv(env1); + _searchenv("1.dat", "TEST_PATH", result); + ok(!result[0], "got %s, expected ''\n", result); + putenv("TEST_PATH="); for (i=ARRAY_SIZE(files)-1; i>=0; i--) {

1 0

Nikolay Sivov : ucrtbase: Add _query_new_handler() and _query_new_mode().
by Alexandre Julliard 02 Jun '20

02 Jun '20

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

Dmitry Timoshkov : gdiplus: Reimplement GdipCreateBitmapFromGdiDib by using GdipCreateBitmapFromHBITMAP.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: fb1f78d982110e267b91b050167cbcfc196791b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb1f78d982110e267b91b050… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 27 12:13:48 2020 +0800 gdiplus: Reimplement GdipCreateBitmapFromGdiDib by using GdipCreateBitmapFromHBITMAP. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 506f3bf53df421e453549127c74f1af98ddfde56) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/image.c | 47 +++++++++++++---------------------------------- 1 file changed, 13 insertions(+), 34 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 354801348e..d5af5869ec 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1381,50 +1381,29 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromGdiDib(GDIPCONST BITMAPINFO* info, VOID *bits, GpBitmap **bitmap) { DWORD height, stride; - PixelFormat format; + HBITMAP hbm; + void *bmbits; + GpStatus status; - FIXME("(%p, %p, %p) - partially implemented\n", info, bits, bitmap); + TRACE("(%p, %p, %p)\n", info, bits, bitmap); if (!info || !bits || !bitmap) return InvalidParameter; + hbm = CreateDIBSection(0, info, DIB_RGB_COLORS, &bmbits, NULL, 0); + if (!hbm) + return InvalidParameter; + height = abs(info->bmiHeader.biHeight); stride = ((info->bmiHeader.biWidth * info->bmiHeader.biBitCount + 31) >> 3) & ~3; + TRACE("height %u, stride %u, image size %u\n", height, stride, height * stride); - if(info->bmiHeader.biHeight > 0) /* bottom-up */ - { - bits = (BYTE*)bits + (height - 1) * stride; - stride = -stride; - } + memcpy(bmbits, bits, height * stride); - switch(info->bmiHeader.biBitCount) { - case 1: - format = PixelFormat1bppIndexed; - break; - case 4: - format = PixelFormat4bppIndexed; - break; - case 8: - format = PixelFormat8bppIndexed; - break; - case 16: - format = PixelFormat16bppRGB555; - break; - case 24: - format = PixelFormat24bppRGB; - break; - case 32: - format = PixelFormat32bppRGB; - break; - default: - FIXME("don't know how to handle %d bpp\n", info->bmiHeader.biBitCount); - *bitmap = NULL; - return InvalidParameter; - } - - return GdipCreateBitmapFromScan0(info->bmiHeader.biWidth, height, stride, format, - bits, bitmap); + status = GdipCreateBitmapFromHBITMAP(hbm, NULL, bitmap); + DeleteObject(hbm); + return status; } /* FIXME: no icm */

1 0

Alexandre Julliard : rundll32: Add wrapper to call entry point on i386.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: d2582c1d66a657c9efde221a74605cf08ea8ecd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2582c1d66a657c9efde221a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 21 20:58:47 2020 +0100 rundll32: Add wrapper to call entry point on i386. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48018 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 092d76b911159d87233a828b7242fb16968a02b7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/rundll32/rundll32.c | 56 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 43 insertions(+), 13 deletions(-) diff --git a/programs/rundll32/rundll32.c b/programs/rundll32/rundll32.c index 3d4a4687e2..d1caefc2e2 100644 --- a/programs/rundll32/rundll32.c +++ b/programs/rundll32/rundll32.c @@ -37,16 +37,51 @@ #define WIN32_LEAN_AND_MEAN #include "windows.h" #include "wine/winbase16.h" +#include "wine/asm.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(rundll32); -/* - * Control_RunDLL has these parameters - */ -typedef void (WINAPI *EntryPointW)(HWND hWnd, HINSTANCE hInst, LPWSTR lpszCmdLine, int nCmdShow); -typedef void (WINAPI *EntryPointA)(HWND hWnd, HINSTANCE hInst, LPSTR lpszCmdLine, int nCmdShow); +#ifdef __i386__ +/* wrapper for dlls that declare the entry point incorrectly */ +extern void call_entry_point( void *func, HWND hwnd, HINSTANCE inst, void *cmdline, int show ); +__ASM_GLOBAL_FUNC( call_entry_point, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl %edi\n\t" + __ASM_CFI(".cfi_rel_offset %edi,-4\n\t") + "pushl %esi\n\t" + __ASM_CFI(".cfi_rel_offset %esi,-8\n\t") + "pushl %ebx\n\t" + __ASM_CFI(".cfi_rel_offset %ebx,-12\n\t") + "subl $12,%esp\n\t" + "pushl 24(%ebp)\n\t" + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leal -12(%ebp),%esp\n\t" + "popl %ebx\n\t" + __ASM_CFI(".cfi_same_value %ebx\n\t") + "popl %esi\n\t" + __ASM_CFI(".cfi_same_value %esi\n\t") + "popl %edi\n\t" + __ASM_CFI(".cfi_same_value %edi\n\t") + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ) +#else +static void call_entry_point( void *func, HWND hwnd, HINSTANCE inst, void *cmdline, int show ) +{ + void (WINAPI *entry_point)( HWND hwnd, HINSTANCE inst, void *cmdline, int show ) = func; + entry_point( hwnd, inst, cmdline, show ); +} +#endif /* * Control_RunDLL needs to have a window. So lets make us a very @@ -304,12 +339,10 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE hOldInstance, LPWSTR szCmdLine if (unicode) { - EntryPointW pEntryPointW = entry_point; - WINE_TRACE( "Calling %s (%p,%p,%s,%d)\n", wine_dbgstr_w(szEntryPoint), hWnd, instance, wine_dbgstr_w(szCmdLine), info.wShowWindow ); - pEntryPointW( hWnd, instance, szCmdLine, info.wShowWindow ); + call_entry_point( entry_point, hWnd, instance, szCmdLine, info.wShowWindow ); } else { @@ -331,11 +364,8 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE hOldInstance, LPWSTR szCmdLine if (pRunDLL_CallEntry16) pRunDLL_CallEntry16( entry_point, hWnd, instance, cmdline, info.wShowWindow ); } - else - { - EntryPointA pEntryPointA = entry_point; - pEntryPointA( hWnd, instance, cmdline, info.wShowWindow ); - } + else call_entry_point( entry_point, hWnd, instance, cmdline, info.wShowWindow ); + HeapFree( GetProcessHeap(), 0, cmdline ); }

1 0

Zebediah Figura : kernelbase: Implement ReOpenFile().
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: 84fb913dd1f500603ff07ef7f2ab7d4f15c91559 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84fb913dd1f500603ff07ef7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 27 11:06:43 2020 -0600 kernelbase: Implement ReOpenFile(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47668 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c7019a8887a3b035ce6b1ff6b113a8b5c0cc5e04) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/file.c | 101 +++++++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/file.c | 80 ++++++++++++++++++++++++----------- 2 files changed, 158 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=84fb913dd1f500603ff0…

1 0

Zebediah Figura : widl: Output a registry script for all interfaces written into the typelib.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: 5b2a6414ae5551613e5d487d85c42ae2d3889688 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b2a6414ae5551613e5d487d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 28 10:10:27 2020 -0600 widl: Output a registry script for all interfaces written into the typelib. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46005 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 56995dd3223c59340037d33a6073a42bdbba1d3f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/widl/parser.y | 1 + tools/widl/register.c | 11 +++-------- tools/widl/widltypes.h | 3 +++ tools/widl/write_msft.c | 11 +++++++++++ 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 5f6eb50878..92b4f8ebd5 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1792,6 +1792,7 @@ static type_t *make_safearray(type_t *type) static typelib_t *make_library(const char *name, const attr_list_t *attrs) { typelib_t *typelib = xmalloc(sizeof(*typelib)); + memset(typelib, 0, sizeof(*typelib)); typelib->name = xstrdup(name); typelib->attrs = attrs; list_init( &typelib->importlibs ); diff --git a/tools/widl/register.c b/tools/widl/register.c index f65cbddf53..c03ab3c56b 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -119,8 +119,6 @@ static void write_typelib_interface( const type_t *iface, const typelib_t *typel if (!uuid) return; if (!is_object( iface )) return; - if (!is_attr( iface->attrs, ATTR_OLEAUTOMATION ) && !is_attr( iface->attrs, ATTR_DISPINTERFACE )) - return; put_str( indent, "'%s' = s '%s'\n", format_uuid( uuid ), iface->name ); put_str( indent, "{\n" ); indent++; @@ -137,13 +135,10 @@ static void write_typelib_interface( const type_t *iface, const typelib_t *typel static void write_typelib_interfaces( const typelib_t *typelib ) { - const statement_t *stmt; + unsigned int i; - if (typelib->stmts) LIST_FOR_EACH_ENTRY( stmt, typelib->stmts, const statement_t, entry ) - { - if (stmt->type == STMT_TYPE && type_get_type( stmt->u.type ) == TYPE_INTERFACE) - write_typelib_interface( stmt->u.type, typelib ); - } + for (i = 0; i < typelib->reg_iface_count; ++i) + write_typelib_interface( typelib->reg_ifaces[i], typelib ); } static int write_coclass( const type_t *class, const typelib_t *typelib ) diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 5e28329278..085a0ff55f 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -538,6 +538,9 @@ struct _typelib_t { const attr_list_t *attrs; struct list importlibs; statement_list_t *stmts; + + type_t **reg_ifaces; + unsigned int reg_iface_count; }; struct _user_type_t { diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index dc0a6cb45b..3a11d2ddd7 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2068,6 +2068,10 @@ static void add_dispinterface_typeinfo(msft_typelib_t *typelib, type_t *dispinte if(add_func_desc(msft_typeinfo, func, idx) == S_OK) idx++; } + + typelib->typelib->reg_ifaces = xrealloc(typelib->typelib->reg_ifaces, + (typelib->typelib->reg_iface_count + 1) * sizeof(dispinterface)); + typelib->typelib->reg_ifaces[typelib->typelib->reg_iface_count++] = dispinterface; } static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface) @@ -2142,6 +2146,13 @@ static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface) if(add_func_desc(msft_typeinfo, func, idx) == S_OK) idx++; } + + if (is_attr(interface->attrs, ATTR_OLEAUTOMATION) || is_attr(interface->attrs, ATTR_DUAL)) + { + typelib->typelib->reg_ifaces = xrealloc(typelib->typelib->reg_ifaces, + (typelib->typelib->reg_iface_count + 1) * sizeof(interface)); + typelib->typelib->reg_ifaces[typelib->typelib->reg_iface_count++] = interface; + } } static void add_structure_typeinfo(msft_typelib_t *typelib, type_t *structure)

1 0

Giovanni Mascellani : d2d1: Implement rounded rectangle drawing.
by Alexandre Julliard 02 Jun '20

02 Jun '20

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 02 Jun '20

02 Jun '20

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 02 Jun '20

02 Jun '20

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

← Newer
1
...
86
87
88
89
90
91
92
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2020