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

Derek Lesho : ntoskrnl.exe: Export and set PsInitialSystemProcess.
by Alexandre Julliard April 29, 2019

April 29, 2019

Module: wine Branch: master Commit: 1064e20a3f7a70b5662ff59d1aa21bdb1576c30e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1064e20a3f7a70b5662ff59d… Author: Derek Lesho <dereklesho52(a)gmail.com> Date: Mon Apr 29 16:00:40 2019 +0200 ntoskrnl.exe: Export and set PsInitialSystemProcess. Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 53a1bcd..d7f57ba 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -939,6 +939,8 @@ static void unload_driver( struct wine_rb_entry *entry, void *context ) CloseServiceHandle( (void *)service_handle ); } +PEPROCESS PsInitialSystemProcess = NULL; + /*********************************************************************** * wine_ntoskrnl_main_loop (Not a Windows API) */ @@ -952,6 +954,8 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) void *in_buff = NULL; HANDLE handles[2]; + /* Set the system process global before setting up the request thread trickery */ + PsInitialSystemProcess = IoGetCurrentProcess(); request_thread = GetCurrentThreadId(); handles[0] = stop_event; diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 633a8c4..7a80206 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -906,7 +906,7 @@ @ stub PsGetThreadWin32Thread @ stdcall PsGetVersion(ptr ptr ptr ptr) @ stdcall PsImpersonateClient(ptr ptr long long long) -@ stub PsInitialSystemProcess +@ extern PsInitialSystemProcess @ stub PsIsProcessBeingDebugged @ stub PsIsSystemThread @ stub PsIsThreadImpersonating

1 0

Alexandre Julliard : extrac32: Build with msvcrt.
by Alexandre Julliard April 29, 2019

April 29, 2019

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 : dxdiag: Build with msvcrt.
by Alexandre Julliard April 29, 2019

April 29, 2019

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 : attrib: Build with msvcrt.
by Alexandre Julliard April 29, 2019

April 29, 2019

Module: wine Branch: master Commit: 45442d270cc59e1625c4a59c2816dd5939fb3dfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=45442d270cc59e1625c4a59c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:42:47 2019 +0200 attrib: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/attrib/Makefile.in | 3 ++- programs/attrib/attrib.c | 37 ++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/programs/attrib/Makefile.in b/programs/attrib/Makefile.in index 644bb9a..a346690 100644 --- a/programs/attrib/Makefile.in +++ b/programs/attrib/Makefile.in @@ -1,7 +1,8 @@ MODULE = attrib.exe -APPMODE = -mconsole -municode IMPORTS = user32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = attrib.c RC_SRCS = attrib.rc diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 79a599a..73e2f60 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -20,7 +20,6 @@ #include <windows.h> #include <wine/debug.h> -#include <wine/unicode.h> #include "attrib.h" WINE_DEFAULT_DEBUG_CHANNEL(attrib); @@ -156,8 +155,8 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, if (recurse) { /* Build spec to search for */ - strcpyW(buffer, rootdir); - strcatW(buffer, starW); + lstrcpyW(buffer, rootdir); + lstrcatW(buffer, starW); /* Search for directories in the location and recurse if necessary */ WINE_TRACE("Searching for directories with '%s'\n", wine_dbgstr_w(buffer)); @@ -169,13 +168,13 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, /* Only interested in directories, and not . nor .. */ if (!(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || - !strcmpW(fd.cFileName, dot) || !strcmpW(fd.cFileName, dotdot)) + !lstrcmpW(fd.cFileName, dot) || !lstrcmpW(fd.cFileName, dotdot)) continue; /* Build new root dir to go searching in */ - strcpyW(buffer, rootdir); - strcatW(buffer, fd.cFileName); - strcatW(buffer, slashW); + lstrcpyW(buffer, rootdir); + lstrcatW(buffer, fd.cFileName); + lstrcatW(buffer, slashW); ATTRIB_processdirectory(buffer, filespec, recurse, includedirs, attrib_set, attrib_clear); @@ -185,8 +184,8 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, } /* Build spec to search for */ - strcpyW(buffer, rootdir); - strcatW(buffer, filespec); + lstrcpyW(buffer, rootdir); + lstrcatW(buffer, filespec); WINE_TRACE("Searching for files as '%s'\n", wine_dbgstr_w(buffer)); /* Search for files in the location with the filespec supplied */ @@ -198,7 +197,7 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, DWORD count; WINE_TRACE("Found '%s'\n", wine_dbgstr_w(fd.cFileName)); - if (!strcmpW(fd.cFileName, dot) || !strcmpW(fd.cFileName, dotdot)) + if (!lstrcmpW(fd.cFileName, dot) || !lstrcmpW(fd.cFileName, dotdot)) continue; if (!includedirs && (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) @@ -209,8 +208,8 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, fd.dwFileAttributes |= attrib_set; if (!fd.dwFileAttributes) fd.dwFileAttributes |= FILE_ATTRIBUTE_NORMAL; - strcpyW(buffer, rootdir); - strcatW(buffer, fd.cFileName); + lstrcpyW(buffer, rootdir); + lstrcatW(buffer, fd.cFileName); SetFileAttributesW(buffer, fd.dwFileAttributes); found = TRUE; } else { @@ -233,8 +232,8 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, if (fd.dwFileAttributes & FILE_ATTRIBUTE_COMPRESSED) { flags[7] = 'C'; } - strcpyW(buffer, rootdir); - strcatW(buffer, fd.cFileName); + lstrcpyW(buffer, rootdir); + lstrcatW(buffer, fd.cFileName); ATTRIB_wprintf(fmt, flags, buffer); for (count = 0; count < (ARRAY_SIZE(flags) - 1); count++) flags[count] = ' '; found = TRUE; @@ -260,13 +259,13 @@ int wmain(int argc, WCHAR *argv[]) int i = 1; BOOL found = FALSE; - if ((argc >= 2) && !strcmpW(argv[1], help_option)) { + if ((argc >= 2) && !lstrcmpW(argv[1], help_option)) { ATTRIB_wprintf(ATTRIB_LoadMessage(STRING_HELP)); return 0; } /* By default all files from current directory are taken into account */ - strcpyW(name, starW); + lstrcpyW(name, starW); while (i < argc) { WCHAR *param = argv[i++]; @@ -295,7 +294,7 @@ int wmain(int argc, WCHAR *argv[]) WINE_FIXME("Unknown option %s\n", debugstr_w(param)); } } else if (param[0]) { - strcpyW(originalname, param); + lstrcpyW(originalname, param); } } @@ -305,7 +304,7 @@ int wmain(int argc, WCHAR *argv[]) GetFullPathNameW(originalname, ARRAY_SIZE(curdir), curdir, &namepart); WINE_TRACE("Result: '%s'\n", wine_dbgstr_w(curdir)); if (namepart) { - strcpyW(name, namepart); + lstrcpyW(name, namepart); *namepart = 0; } else { name[0] = 0; @@ -313,7 +312,7 @@ int wmain(int argc, WCHAR *argv[]) /* If a directory is explicitly supplied on the command line, and no wildcards are in the name, then allow it to be changed/displayed */ - if (strpbrkW(originalname, wildcardsW) == NULL) attrib_includedirs = TRUE; + if (wcspbrk(originalname, wildcardsW) == NULL) attrib_includedirs = TRUE; /* Do all the processing based on the filename arg */ found = ATTRIB_processdirectory(curdir, name, attrib_recurse,

1 0

Zebediah Figura : winegcc: Add support for -fno-PIC.
by Alexandre Julliard April 29, 2019

April 29, 2019

Module: wine Branch: master Commit: d97e544387e69d31842c3302915975711b0b405a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d97e544387e69d31842c3302… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 28 23:04:54 2019 -0500 winegcc: Add support for -fno-PIC. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 46b67ce..d339139 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -208,6 +208,7 @@ struct options int wine_builtin; int unwind_tables; int strip; + int pic; const char* wine_objdir; const char* output_name; const char* image_base; @@ -684,7 +685,10 @@ static void compile(struct options* opts, const char* lang) strarray_add(comp_args, "-DWINE_UNICODE_NATIVE"); } strarray_add(comp_args, "-D_REENTRANT"); - strarray_add(comp_args, "-fPIC"); + if (opts->pic) + strarray_add(comp_args, "-fPIC"); + else + strarray_add(comp_args, "-fno-PIC"); } if (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64) @@ -1026,7 +1030,7 @@ static void build(struct options* opts) if (opts->force_pointer_size) strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); strarray_add(spec_args, "-D_REENTRANT"); - strarray_add(spec_args, "-fPIC"); + if (opts->pic && !is_pe) strarray_add(spec_args, "-fPIC"); strarray_add(spec_args, opts->shared ? "--dll" : "--exe"); if (fake_module) { @@ -1345,6 +1349,7 @@ int main(int argc, char **argv) opts.linker_args = strarray_alloc(); opts.compiler_args = strarray_alloc(); opts.winebuild_args = strarray_alloc(); + opts.pic = 1; /* determine the processor type */ if (strendswith(argv[0], "winecpp")) opts.processor = proc_cpp; @@ -1466,6 +1471,10 @@ int main(int argc, char **argv) opts.unwind_tables = 1; else if (!strcmp("-fno-asynchronous-unwind-tables", argv[i])) opts.unwind_tables = 0; + else if (!strcmp("-fPIC", argv[i]) || !strcmp("-fpic", argv[i])) + opts.pic = 1; + else if (!strcmp("-fno-PIC", argv[i]) || !strcmp("-fno-pic", argv[i])) + opts.pic = 0; break; case 'l': strarray_add(opts.files, strmake("-l%s", option_arg));

1 0

Jactry Zeng : kernel32/tests: Avoid a crash on WinXP and Win2K.
by Alexandre Julliard April 29, 2019

April 29, 2019

Module: wine Branch: master Commit: 642919382f817e6c5c0b1b7a54aacaa7fd5ab416 URL: https://source.winehq.org/git/wine.git/?a=commit;h=642919382f817e6c5c0b1b7a… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Apr 29 11:40:43 2019 +0800 kernel32/tests: Avoid a crash on WinXP and Win2K. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 8dea3b3..188689a 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -38,6 +38,7 @@ static BOOL (WINAPI *pInitOnceExecuteOnce)(PINIT_ONCE,PINIT_ONCE_FN,PVOID,LPVO static BOOL (WINAPI *pInitOnceBeginInitialize)(PINIT_ONCE,DWORD,BOOL*,LPVOID*); static BOOL (WINAPI *pInitOnceComplete)(PINIT_ONCE,DWORD,LPVOID); +static BOOL (WINAPI *pInitializeCriticalSectionEx)(CRITICAL_SECTION*,DWORD,DWORD); static VOID (WINAPI *pInitializeConditionVariable)(PCONDITION_VARIABLE); static BOOL (WINAPI *pSleepConditionVariableCS)(PCONDITION_VARIABLE,PCRITICAL_SECTION,DWORD); static BOOL (WINAPI *pSleepConditionVariableSRW)(PCONDITION_VARIABLE,PSRWLOCK,DWORD,ULONG); @@ -2648,8 +2649,14 @@ static void test_crit_section(void) ok(cs.DebugInfo != NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); DeleteCriticalSection(&cs); + if (!pInitializeCriticalSectionEx) + { + win_skip("InitializeCriticalSectionEx isn't available, skipping tests.\n"); + return; + } + memset(&cs, 0, sizeof(cs)); - ret = InitializeCriticalSectionEx(&cs, 0, CRITICAL_SECTION_NO_DEBUG_INFO); + ret = pInitializeCriticalSectionEx(&cs, 0, CRITICAL_SECTION_NO_DEBUG_INFO); ok(ret, "Failed to initialize critical section.\n"); todo_wine ok(cs.DebugInfo == (void *)(ULONG_PTR)-1, "Unexpected debug info pointer %p.\n", cs.DebugInfo); @@ -2672,6 +2679,7 @@ START_TEST(sync) pSleepConditionVariableSRW = (void *)GetProcAddress(hdll, "SleepConditionVariableSRW"); pWakeAllConditionVariable = (void *)GetProcAddress(hdll, "WakeAllConditionVariable"); pWakeConditionVariable = (void *)GetProcAddress(hdll, "WakeConditionVariable"); + pInitializeCriticalSectionEx = (void *)GetProcAddress(hdll, "InitializeCriticalSectionEx"); pInitializeSRWLock = (void *)GetProcAddress(hdll, "InitializeSRWLock"); pAcquireSRWLockExclusive = (void *)GetProcAddress(hdll, "AcquireSRWLockExclusive"); pAcquireSRWLockShared = (void *)GetProcAddress(hdll, "AcquireSRWLockShared");

1 0

Zebediah Figura : quartz: Convert media type registration to IRegistrar mechanism.
by Alexandre Julliard April 29, 2019

April 29, 2019

Module: wine Branch: master Commit: b743cfe4fbbf34ece89c8ae019d68a24923c4b87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b743cfe4fbbf34ece89c8ae0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 28 21:40:09 2019 -0500 quartz: Convert media type registration to IRegistrar mechanism. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/Makefile.in | 2 +- dlls/quartz/{version.rc => quartz.rc} | 3 + dlls/quartz/quartz.rgs | 82 +++++++++ dlls/quartz/regsvr.c | 305 ---------------------------------- 4 files changed, 86 insertions(+), 306 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b743cfe4fbbf34ece89c…

1 0

Zebediah Figura : evr/tests: Rewrite test_evr_filter_aggregation().
by Alexandre Julliard April 29, 2019

April 29, 2019

Module: wine Branch: master Commit: b92619f092abbc24693cce0bce8ca5235b9b918b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b92619f092abbc24693cce0b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 28 21:40:11 2019 -0500 evr/tests: Rewrite test_evr_filter_aggregation(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/Makefile.in | 2 +- dlls/evr/tests/evr.c | 134 +++++++++++++++++++++++++++++++++ dlls/evr/tests/filter.c | 179 --------------------------------------------- 3 files changed, 135 insertions(+), 180 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b92619f092abbc24693c…

1 0

Alexandre Julliard : eject: Build with msvcrt.
by Alexandre Julliard April 29, 2019

April 29, 2019

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 : control: Build with msvcrt.
by Alexandre Julliard April 29, 2019

April 29, 2019

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