November 2020 - Wine-Commits

Michael Stefaniuc : cmd: Inline some simple extern WCHAR strings.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 9fcb2b097c3fd38a5be309b9c16b4a10b43b694c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fcb2b097c3fd38a5be309b9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 29 23:30:28 2020 +0100 cmd: Inline some simple extern WCHAR strings. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/batch.c | 20 +++++++------- programs/cmd/builtins.c | 72 ++++++++++++++++++++---------------------------- programs/cmd/directory.c | 34 +++++++++++------------ programs/cmd/wcmd.h | 8 ------ programs/cmd/wcmdmain.c | 21 ++++++-------- 5 files changed, 66 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9fcb2b097c3fd38a5be3…

1 0

Michael Stefaniuc : cmd: Avoid casting a const away.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 77fc01d39d732acf26658f13448739eeaf00de45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77fc01d39d732acf26658f13… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 29 23:30:27 2020 +0100 cmd: Avoid casting a const away. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 934e55ac587..c6dce091c69 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1968,6 +1968,7 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, BOOL thisduplicate = FALSE; BOOL anyduplicates = FALSE; int totalfound; + static WCHAR emptyW[] = L""; /* Skip lines if requested */ if (*forf_skip) { @@ -1998,7 +1999,7 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, for (varoffset=0; varidx >= 0 && varoffset<totalfound && (((varidx%26) + varoffset) < 26); varoffset++) { - forloopcontext.variable[varidx + varoffset] = (WCHAR *)nullW; + forloopcontext.variable[varidx + varoffset] = emptyW; } /* Loop extracting the tokens @@ -2048,7 +2049,7 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, int i; for (i=varidx; i<MAX_FOR_VARIABLES; i++) { if ((forloopcontext.variable[i] != oldcontext.variable[i]) && - (forloopcontext.variable[i] != nullW)) { + (forloopcontext.variable[i] != emptyW)) { heap_free(forloopcontext.variable[i]); } }

1 0

Michael Stefaniuc : urlmon: Use wide-char string literals in struct initialization.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 92825628771e79e33f84531001bb86695808feac URL: https://source.winehq.org/git/wine.git/?a=commit;h=92825628771e79e33f845310… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Nov 27 23:24:51 2020 +0100 urlmon: Use wide-char string literals in struct initialization. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/http.c | 9 ++-- dlls/urlmon/internet.c | 119 +++++++++++----------------------------------- dlls/urlmon/mimefilter.c | 74 ++++++++++------------------ dlls/urlmon/uri.c | 58 +++++++++++----------- dlls/urlmon/urlmon_main.c | 19 +++----- 5 files changed, 93 insertions(+), 186 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=92825628771e79e33f84…

1 0

Jacek Caban : server: Set console renderer thread in get_next_console_request.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 50650d6e94487bca4ad0dca7250399f1dfcec51b URL: https://source.winehq.org/git/wine.git/?a=commit;h=50650d6e94487bca4ad0dca7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 18:42:09 2020 +0100 server: Set console renderer thread in get_next_console_request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/console.c b/server/console.c index 0e779c77816..a2171b3c1b4 100644 --- a/server/console.c +++ b/server/console.c @@ -1476,6 +1476,8 @@ DECL_HANDLER(get_next_console_request) return; } + if (!server->console->renderer) server->console->renderer = current; + if (!req->signal) server->console->signaled = 0; else if (!server->console->signaled) {

1 0

Damjan Jovanovic : ntdll: Fix backward compatibility for struct link_map on FreeBSD.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 6d829f2baf156738326acc77548b37c90024a93c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d829f2baf156738326acc77… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Nov 30 20:08:01 2020 +0200 ntdll: Fix backward compatibility for struct link_map on FreeBSD. Checking for the _rtld_version_laddr_offset symbol only works when header and library versions match. Checking for the offset of l_addr instead lets us use the older header with the new library too. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 0e827315ac3..72f215eb2d3 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1417,7 +1417,7 @@ found: #ifdef __FreeBSD__ /* On older FreeBSD versions, l_addr was the absolute load address, now it's the relocation offset. */ - if (!dlsym(RTLD_DEFAULT, "_rtld_version_laddr_offset")) + if (offsetof(struct link_map, l_addr) == 0) if (!get_relocbase(map->l_addr, &relocbase)) return; #endif switch (dyn->d_tag)

1 0

Zhennan Cai : ntoskrnl.exe: Fix a reversed spin lock loop condition.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 2ad09b01673381261815bfc804a2f69ce4d85f86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ad09b01673381261815bfc8… Author: Zhennan Cai <zhennan5991(a)gmail.com> Date: Fri Nov 27 10:16:57 2020 +0800 ntoskrnl.exe: Fix a reversed spin lock loop condition. Signed-off-by: Zhennan Cai <zhennan5991(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 0ddb1b353c5..671398594e8 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -555,7 +555,7 @@ static inline void small_pause(void) void WINAPI KeAcquireSpinLockAtDpcLevel( KSPIN_LOCK *lock ) { TRACE("lock %p.\n", lock); - while (!InterlockedCompareExchangePointer( (void **)lock, (void *)1, (void *)0 )) + while (InterlockedCompareExchangePointer( (void **)lock, (void *)1, (void *)0 )) small_pause(); }

1 0

Kevin Puetz : winebuild: Find main/wmain in static libraries.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: bf5893f4899b0539fbae39879c46b6b7da33c6f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf5893f4899b0539fbae3987… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Wed Nov 25 13:00:27 2020 -0600 winebuild: Find main/wmain in static libraries. Have the winebuild -spec.o include an undefined .globl referencing symbols we know the winecrt0 entry point will eventually reference, so ld knows about that need while scanning library archives. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 11 +++++++++++ tools/winebuild/spec32.c | 12 ++++++++++++ 3 files changed, 24 insertions(+) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 26a0539c500..a4b9bc97e3e 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -300,6 +300,7 @@ extern void output_gnu_stack_note(void); extern void add_import_dll( const char *name, const char *filename ); extern void add_delayed_import( const char *name ); extern void add_extra_ld_symbol( const char *name ); +extern void add_spec_extra_ld_symbol( const char *name ); extern void read_undef_symbols( DLLSPEC *spec, char **argv ); extern void resolve_imports( DLLSPEC *spec ); extern int is_undefined( const char *name ); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index b1e6d115717..b37aec9cf6f 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -397,11 +397,22 @@ static const char *get_default_entry_point( const DLLSPEC *spec ) if (spec->characteristics & IMAGE_FILE_DLL) return "DllMain"; if (spec->subsystem == IMAGE_SUBSYSTEM_NATIVE) return "DriverEntry"; if (spec->type == SPEC_WIN16) + { + add_spec_extra_ld_symbol("WinMain16"); return "__wine_spec_exe16_entry"; + } else if (spec->unicode_app) + { + /* __wine_spec_exe_wentry always calls wmain */ + add_spec_extra_ld_symbol("wmain"); return "__wine_spec_exe_wentry"; + } else + { + /* __wine_spec_exe_entry always calls main */ + add_spec_extra_ld_symbol("main"); return "__wine_spec_exe_entry"; + } } /* parse options from the argv array and remove all the recognized ones */ diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index ba2edfb588f..a12e7d38aac 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -50,6 +50,13 @@ int needs_get_pc_thunk = 0; static const char builtin_signature[32] = "Wine builtin DLL"; static const char fakedll_signature[32] = "Wine placeholder DLL"; +static struct strarray spec_extra_ld_symbols = { 0 }; /* list of extra symbols that ld should resolve */ + +/* add a symbol to the list of extra symbols that ld must resolve */ +void add_spec_extra_ld_symbol( const char *name ) +{ + strarray_add( &spec_extra_ld_symbols, name, NULL ); +} static unsigned int hash_filename( const char *name ) { @@ -610,6 +617,7 @@ void output_exports( DLLSPEC *spec ) void output_module( DLLSPEC *spec ) { int machine = 0; + int i; unsigned int page_size = get_page_size(); const char *data_dirs[16] = { NULL }; @@ -688,6 +696,10 @@ void output_module( DLLSPEC *spec ) output( "\t.long 0\n" ); /* SizeOfCode */ output( "\t.long 0\n" ); /* SizeOfInitializedData */ output( "\t.long 0\n" ); /* SizeOfUninitializedData */ + + for (i = 0; i < spec_extra_ld_symbols.count; i++) + output( "\t.globl %s\n", asm_name(spec_extra_ld_symbols.str[i]) ); + /* note: we expand the AddressOfEntryPoint field on 64-bit by overwriting the BaseOfCode field */ output( "\t%s %s\n", /* AddressOfEntryPoint */ get_asm_ptr_keyword(), spec->init_func ? asm_name(spec->init_func) : "0" );

1 0

Francois Gouget : ntdll/tests: Don't check the load address in the WoW64 case.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: dcdd98f5c16a9be132a42bd4d6d0993451890c50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcdd98f5c16a9be132a42bd4… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Nov 30 16:19:10 2020 +0100 ntdll/tests: Don't check the load address in the WoW64 case. It could sometimes be NULL, such as win32k.sys on Win <= 7. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 5db7a800cbe..4379d8a84c6 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -490,7 +490,7 @@ static void test_query_module(void) const SYSTEM_MODULE *module = &info->Modules[i]; ok(module->LoadOrderIndex == i, "%u: got index %u\n", i, module->LoadOrderIndex); - ok(!!module->ImageBaseAddress, "%u: got NULL address\n", i); + ok(module->ImageBaseAddress || is_wow64, "%u: got NULL address for %s\n", i, module->Name); ok(module->ImageSize, "%u: got 0 size\n", i); ok(module->LoadCount, "%u: got 0 load count\n", i); } @@ -516,7 +516,7 @@ static void test_query_module(void) const SYSTEM_MODULE *module = &infoex->BaseInfo; ok(module->LoadOrderIndex == i, "%u: got index %u\n", i, module->LoadOrderIndex); - ok(!!module->ImageBaseAddress, "%u: got NULL address\n", i); + ok(module->ImageBaseAddress || is_wow64, "%u: got NULL address for %s\n", i, module->Name); ok(module->ImageSize, "%u: got 0 size\n", i); ok(module->LoadCount, "%u: got 0 load count\n", i);

1 0

Henri Verbeet : wined3d: Use command buffer IDs for synchronisation in wined3d_buffer_gl_sync_apple().
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: a7c320d184fb9d48239caf0f5529b6992477b82b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7c320d184fb9d48239caf0f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 30 18:29:25 2020 +0330 wined3d: Use command buffer IDs for synchronisation in wined3d_buffer_gl_sync_apple(). Analogous to the Vulkan adapter. This is slightly awkward in OpenGL because it doesn't have explicit command buffers like Vulkan, but calling wined3d_context_gl_submit_command_fence() on swapchain present works well enough in practice. The main advantage of this approach is that it avoids using a separate fence for each usage of each bo. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 + dlls/wined3d/buffer.c | 61 +++---------------- dlls/wined3d/context.c | 4 -- dlls/wined3d/context_gl.c | 130 +++++++++++++++++++++++++++++++++-------- dlls/wined3d/query.c | 2 +- dlls/wined3d/swapchain.c | 1 + dlls/wined3d/wined3d_private.h | 34 +++++++++-- 7 files changed, 146 insertions(+), 88 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a7c320d184fb9d48239c…

1 0

Piotr Caban : msvcrt: Use _exception definiotion from public header.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 595ee43c48dc75ebc03900b027d000ebd15dffd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=595ee43c48dc75ebc03900b0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 30 14:37:39 2020 +0100 msvcrt: Use _exception definiotion from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 6 +++--- dlls/msvcrt/msvcrt.h | 8 -------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 0d42ca9a782..8efc6d3cdb2 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -57,7 +57,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #define _OVERFLOW 3 /* range overflow */ #define _UNDERFLOW 4 /* range underflow */ -typedef int (CDECL *MSVCRT_matherr_func)(struct MSVCRT__exception *); +typedef int (CDECL *MSVCRT_matherr_func)(struct _exception *); typedef double LDOUBLE; /* long double is just a double */ static MSVCRT_matherr_func MSVCRT_default_matherr_func = NULL; @@ -83,7 +83,7 @@ static inline float fp_barrierf(float x) /********************************************************************* * _matherr (CRTDLL.@) */ -int CDECL MSVCRT__matherr(struct MSVCRT__exception *e) +int CDECL MSVCRT__matherr(struct _exception *e) { return 0; } @@ -91,7 +91,7 @@ int CDECL MSVCRT__matherr(struct MSVCRT__exception *e) static double math_error(int type, const char *name, double arg1, double arg2, double retval) { - struct MSVCRT__exception exception = {type, (char *)name, arg1, arg2, retval}; + struct _exception exception = {type, (char *)name, arg1, arg2, retval}; TRACE("(%d, %s, %g, %g, %g)\n", type, debugstr_a(name), arg1, arg2, retval); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 3d3a2d92dfe..4c1aaac2fb3 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -287,14 +287,6 @@ typedef struct _iobuf MSVCRT_FILE; extern MSVCRT_FILE MSVCRT__iob[]; -struct MSVCRT__exception { - int type; - char* name; - double arg1; - double arg2; - double retval; -}; - typedef struct _complex _Dcomplex; struct MSVCRT__heapinfo {

1 0