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

Alex Henrie : ntdll/tests: Drop RTL function workarounds for Windows <= 2000.
by Alexandre Julliard May 26, 2020

May 26, 2020

Module: wine Branch: master Commit: 917002c88f82e0f4253171af9332c1ba4fff8be9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=917002c88f82e0f4253171af… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 25 22:36:21 2020 -0600 ntdll/tests: Drop RTL function workarounds for Windows <= 2000. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 459 ++++++++++++++----------------------------------- 1 file changed, 133 insertions(+), 326 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=917002c88f82e0f42531…

1 0

Alexandre Julliard : kernel32: Reimplement DosDateTimeToFileTime/FileTimeToDosDateTime using ntdll functions.
by Alexandre Julliard May 26, 2020

May 26, 2020

Module: wine Branch: master Commit: b6a38ea676081664a1fe0b318fe56339b255b6ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6a38ea676081664a1fe0b31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 26 14:05:10 2020 +0200 kernel32: Reimplement DosDateTimeToFileTime/FileTimeToDosDateTime using ntdll functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 --- configure.ac | 3 --- dlls/kernel32/file.c | 49 +++++++++++++++++++++++++++++++++++++ dlls/kernel32/time.c | 68 ---------------------------------------------------- include/config.h.in | 9 ------- 5 files changed, 49 insertions(+), 83 deletions(-) diff --git a/configure b/configure index a5516fe60e..b652ddbf79 100755 --- a/configure +++ b/configure @@ -7418,7 +7418,6 @@ for ac_header in \ mach/mach.h \ mach/machine.h \ machine/cpu.h \ - machine/limits.h \ machine/sysarch.h \ mntent.h \ ncurses.h \ @@ -7448,7 +7447,6 @@ for ac_header in \ sys/filio.h \ sys/ioctl.h \ sys/ipc.h \ - sys/limits.h \ sys/link.h \ sys/mman.h \ sys/modem.h \ @@ -17984,7 +17982,6 @@ for ac_func in \ sysinfo \ tcdrain \ thr_kill2 \ - timegm \ usleep do : diff --git a/configure.ac b/configure.ac index b43ec73929..c0f60fe694 100644 --- a/configure.ac +++ b/configure.ac @@ -473,7 +473,6 @@ AC_CHECK_HEADERS(\ mach/mach.h \ mach/machine.h \ machine/cpu.h \ - machine/limits.h \ machine/sysarch.h \ mntent.h \ ncurses.h \ @@ -503,7 +502,6 @@ AC_CHECK_HEADERS(\ sys/filio.h \ sys/ioctl.h \ sys/ipc.h \ - sys/limits.h \ sys/link.h \ sys/mman.h \ sys/modem.h \ @@ -2217,7 +2215,6 @@ AC_CHECK_FUNCS(\ sysinfo \ tcdrain \ thr_kill2 \ - timegm \ usleep ) CFLAGS="$ac_save_CFLAGS" diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 4f25331a89..29dd5791af 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -407,6 +407,55 @@ BOOL WINAPI KERNEL32_FlushFileBuffers( HANDLE file ) } +/*********************************************************************** + * DosDateTimeToFileTime (KERNEL32.@) + */ +BOOL WINAPI DosDateTimeToFileTime( WORD fatdate, WORD fattime, FILETIME *ft ) +{ + TIME_FIELDS fields; + LARGE_INTEGER time; + + fields.Year = (fatdate >> 9) + 1980; + fields.Month = ((fatdate >> 5) & 0x0f); + fields.Day = (fatdate & 0x1f); + fields.Hour = (fattime >> 11); + fields.Minute = (fattime >> 5) & 0x3f; + fields.Second = (fattime & 0x1f) * 2; + fields.Milliseconds = 0; + if (!RtlTimeFieldsToTime( &fields, &time )) return FALSE; + ft->dwLowDateTime = time.u.LowPart; + ft->dwHighDateTime = time.u.HighPart; + return TRUE; +} + + +/*********************************************************************** + * FileTimeToDosDateTime (KERNEL32.@) + */ +BOOL WINAPI FileTimeToDosDateTime( const FILETIME *ft, WORD *fatdate, WORD *fattime ) +{ + TIME_FIELDS fields; + LARGE_INTEGER time; + + if (!fatdate || !fattime) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + time.u.LowPart = ft->dwLowDateTime; + time.u.HighPart = ft->dwHighDateTime; + RtlTimeToTimeFields( &time, &fields ); + if (fields.Year < 1980) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + *fattime = (fields.Hour << 11) + (fields.Minute << 5) + (fields.Second / 2); + *fatdate = ((fields.Year - 1980) << 9) + (fields.Month << 5) + fields.Day; + return TRUE; +} + + /************************************************************************** * Operations on file names * **************************************************************************/ diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 4b959684c6..94ccbfb2b9 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -30,14 +30,6 @@ #ifdef HAVE_SYS_TIME_H # include <sys/time.h> #endif -#ifdef HAVE_SYS_TIMES_H -# include <sys/times.h> -#endif -#ifdef HAVE_SYS_LIMITS_H -#include <sys/limits.h> -#elif defined(HAVE_MACHINE_LIMITS_H) -#include <machine/limits.h> -#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -116,66 +108,6 @@ BOOL WINAPI GetDaylightFlag(void) return GetTimeZoneInformation( &tzinfo) == TIME_ZONE_ID_DAYLIGHT; } -/*********************************************************************** - * DosDateTimeToFileTime (KERNEL32.@) - */ -BOOL WINAPI DosDateTimeToFileTime( WORD fatdate, WORD fattime, LPFILETIME ft) -{ - struct tm newtm; -#ifndef HAVE_TIMEGM - struct tm *gtm; - time_t time1, time2; -#endif - - newtm.tm_sec = (fattime & 0x1f) * 2; - newtm.tm_min = (fattime >> 5) & 0x3f; - newtm.tm_hour = (fattime >> 11); - newtm.tm_mday = (fatdate & 0x1f); - newtm.tm_mon = ((fatdate >> 5) & 0x0f) - 1; - newtm.tm_year = (fatdate >> 9) + 80; - newtm.tm_isdst = -1; -#ifdef HAVE_TIMEGM - RtlSecondsSince1970ToTime( timegm(&newtm), (LARGE_INTEGER *)ft ); -#else - time1 = mktime(&newtm); - gtm = gmtime(&time1); - time2 = mktime(gtm); - RtlSecondsSince1970ToTime( 2*time1-time2, (LARGE_INTEGER *)ft ); -#endif - return TRUE; -} - - -/*********************************************************************** - * FileTimeToDosDateTime (KERNEL32.@) - */ -BOOL WINAPI FileTimeToDosDateTime( const FILETIME *ft, LPWORD fatdate, - LPWORD fattime ) -{ - LARGE_INTEGER li; - ULONG t; - time_t unixtime; - struct tm* tm; - - if (!fatdate || !fattime) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - li.u.LowPart = ft->dwLowDateTime; - li.u.HighPart = ft->dwHighDateTime; - if (!RtlTimeToSecondsSince1970( &li, &t )) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - unixtime = t; - tm = gmtime( &unixtime ); - *fattime = (tm->tm_hour << 11) + (tm->tm_min << 5) + (tm->tm_sec / 2); - *fatdate = ((tm->tm_year - 80) << 9) + ((tm->tm_mon + 1) << 5) + tm->tm_mday; - return TRUE; -} - /****************************************************************************** * GetTickCount64 (KERNEL32.@) */ diff --git a/include/config.h.in b/include/config.h.in index 2642487312..720cbd4a5d 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -539,9 +539,6 @@ /* Define to 1 if you have the <machine/cpu.h> header file. */ #undef HAVE_MACHINE_CPU_H -/* Define to 1 if you have the <machine/limits.h> header file. */ -#undef HAVE_MACHINE_LIMITS_H - /* Define to 1 if you have the <machine/sysarch.h> header file. */ #undef HAVE_MACHINE_SYSARCH_H @@ -1021,9 +1018,6 @@ /* Define to 1 if you have the <sys/ipc.h> header file. */ #undef HAVE_SYS_IPC_H -/* Define to 1 if you have the <sys/limits.h> header file. */ -#undef HAVE_SYS_LIMITS_H - /* Define to 1 if you have the <sys/link.h> header file. */ #undef HAVE_SYS_LINK_H @@ -1162,9 +1156,6 @@ /* Define to 1 if you have the <tiffio.h> header file. */ #undef HAVE_TIFFIO_H -/* Define to 1 if you have the `timegm' function. */ -#undef HAVE_TIMEGM - /* Define to 1 if you have the `trunc' function. */ #undef HAVE_TRUNC

1 0

Alexandre Julliard : kernel32: Reimplement GetProcessVersion() in kernelbase.
by Alexandre Julliard May 26, 2020

May 26, 2020

Module: wine Branch: master Commit: fc173ccca8734f6c6d54fcf56e763d4557e9eb48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc173ccca8734f6c6d54fcf5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 26 13:23:33 2020 +0200 kernel32: Reimplement GetProcessVersion() in kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 55 ----------------------------------------- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/process.c | 23 +++++++++++++++++ 4 files changed, 25 insertions(+), 57 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a095a85e66..1a6fdbab01 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -793,7 +793,7 @@ # @ stub GetProcessorSystemCycleTime @ stdcall -import GetProcessTimes(long ptr ptr ptr ptr) # @ stub GetProcessUserModeExceptionPolicy -@ stdcall GetProcessVersion(long) +@ stdcall -import GetProcessVersion(long) @ stdcall GetProcessWorkingSetSize(long ptr ptr) @ stdcall -import GetProcessWorkingSetSizeEx(long ptr ptr ptr) @ stdcall -import GetProductInfo(long long long long ptr) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index f628f96f36..1c3ed9938f 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -451,61 +451,6 @@ BOOL WINAPI GetProcessAffinityMask( HANDLE hProcess, PDWORD_PTR process_mask, PD } -/*********************************************************************** - * GetProcessVersion (KERNEL32.@) - */ -DWORD WINAPI GetProcessVersion( DWORD pid ) -{ - HANDLE process; - NTSTATUS status; - PROCESS_BASIC_INFORMATION pbi; - SIZE_T count; - PEB peb; - IMAGE_DOS_HEADER dos; - IMAGE_NT_HEADERS nt; - DWORD ver = 0; - - if (!pid || pid == GetCurrentProcessId()) - { - IMAGE_NT_HEADERS *pnt; - - if ((pnt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ))) - return ((pnt->OptionalHeader.MajorSubsystemVersion << 16) | - pnt->OptionalHeader.MinorSubsystemVersion); - return 0; - } - - process = OpenProcess(PROCESS_VM_READ | PROCESS_QUERY_INFORMATION, FALSE, pid); - if (!process) return 0; - - status = NtQueryInformationProcess(process, ProcessBasicInformation, &pbi, sizeof(pbi), NULL); - if (status) goto err; - - status = NtReadVirtualMemory(process, pbi.PebBaseAddress, &peb, sizeof(peb), &count); - if (status || count != sizeof(peb)) goto err; - - memset(&dos, 0, sizeof(dos)); - status = NtReadVirtualMemory(process, peb.ImageBaseAddress, &dos, sizeof(dos), &count); - if (status || count != sizeof(dos)) goto err; - if (dos.e_magic != IMAGE_DOS_SIGNATURE) goto err; - - memset(&nt, 0, sizeof(nt)); - status = NtReadVirtualMemory(process, (char *)peb.ImageBaseAddress + dos.e_lfanew, &nt, sizeof(nt), &count); - if (status || count != sizeof(nt)) goto err; - if (nt.Signature != IMAGE_NT_SIGNATURE) goto err; - - ver = MAKELONG(nt.OptionalHeader.MinorSubsystemVersion, nt.OptionalHeader.MajorSubsystemVersion); - -err: - CloseHandle(process); - - if (status != STATUS_SUCCESS) - SetLastError(RtlNtStatusToDosError(status)); - - return ver; -} - - /*********************************************************************** * SetProcessWorkingSetSize [KERNEL32.@] * Sets the min/max working set sizes for a specified process. diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index d85c36c6e5..986cd851ed 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -636,7 +636,7 @@ @ stdcall GetProcessPriorityBoost(long ptr) @ stdcall GetProcessShutdownParameters(ptr ptr) @ stdcall GetProcessTimes(long ptr ptr ptr ptr) -@ stdcall GetProcessVersion(long) kernel32.GetProcessVersion +@ stdcall GetProcessVersion(long) @ stdcall GetProcessWorkingSetSizeEx(long ptr ptr ptr) # @ stub GetProcessorSystemCycleTime @ stdcall GetProductInfo(long long long long ptr) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 66e115ce69..a3b168543f 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -814,6 +814,29 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetProcessTimes( HANDLE process, FILETIME *create, } +/*********************************************************************** + * GetProcessVersion (kernelbase.@) + */ +DWORD WINAPI DECLSPEC_HOTPATCH GetProcessVersion( DWORD pid ) +{ + SECTION_IMAGE_INFORMATION info; + NTSTATUS status; + HANDLE process; + + if (pid && pid != GetCurrentProcessId()) + { + if (!(process = OpenProcess( PROCESS_QUERY_INFORMATION, FALSE, pid ))) return 0; + status = NtQueryInformationProcess( process, ProcessImageInformation, &info, sizeof(info), NULL ); + CloseHandle( process ); + } + else status = NtQueryInformationProcess( GetCurrentProcess(), ProcessImageInformation, + &info, sizeof(info), NULL ); + + if (!set_ntstatus( status )) return 0; + return MAKELONG( info.SubsystemVersionLow, info.SubsystemVersionHigh ); +} + + /*********************************************************************** * GetProcessWorkingSetSizeEx (kernelbase.@) */

1 0

Alexandre Julliard : ntdll: Implement ProcessImageInformation class in NtQueryInformationProcess().
by Alexandre Julliard May 26, 2020

May 26, 2020

Module: wine Branch: master Commit: 54a7e592e44622ecd61160498fb5148a46b2e8db URL: https://source.winehq.org/git/wine.git/?a=commit;h=54a7e592e44622ecd6116049… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 26 13:23:21 2020 +0200 ntdll: Implement ProcessImageInformation class in NtQueryInformationProcess(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 23 +++++++++++++++++++++++ dlls/ntdll/tests/info.c | 32 ++++++++++++++++++++++++++++++++ include/wine/server_protocol.h | 3 ++- server/file.h | 1 + server/mapping.c | 11 +++++++++++ server/process.c | 7 +++++++ server/protocol.def | 1 + server/trace.c | 1 + 8 files changed, 78 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 637bef0b65..1bef51b00b 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -621,6 +621,29 @@ NTSTATUS WINAPI NtQueryInformationProcess( else ret = STATUS_INVALID_PARAMETER; break; + + case ProcessImageInformation: + len = sizeof(SECTION_IMAGE_INFORMATION); + if (ProcessInformationLength == len) + { + if (ProcessInformation) + { + pe_image_info_t pe_info; + + SERVER_START_REQ( get_process_info ) + { + req->handle = wine_server_obj_handle( ProcessHandle ); + wine_server_set_reply( req, &pe_info, sizeof(pe_info) ); + if ((ret = wine_server_call( req )) == STATUS_SUCCESS) + virtual_fill_image_information( &pe_info, ProcessInformation ); + } + SERVER_END_REQ; + } + else ret = STATUS_ACCESS_VIOLATION; + } + else ret = STATUS_INFO_LENGTH_MISMATCH; + break; + default: FIXME("(%p,info_class=%d,%p,0x%08x,%p) Unknown information class\n", ProcessHandle,ProcessInformationClass, diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index f923cc7743..cf3f7b9f6f 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1821,6 +1821,34 @@ todo_wine heap_free(buffer); } +static void test_query_process_image_info(void) +{ + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); + NTSTATUS status; + SECTION_IMAGE_INFORMATION info; + ULONG len; + + status = pNtQueryInformationProcess( NULL, ProcessImageInformation, &info, sizeof(info), &len ); + ok( status == STATUS_INVALID_HANDLE || broken(status == STATUS_INVALID_PARAMETER), /* winxp */ + "got %08x\n", status); + + status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageInformation, &info, sizeof(info)-1, &len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08x\n", status); + + status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageInformation, &info, sizeof(info)+1, &len ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "got %08x\n", status); + + memset( &info, 0xcc, sizeof(info) ); + status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessImageInformation, &info, sizeof(info), &len ); + ok( status == STATUS_SUCCESS, "got %08x\n", status); + ok( len == sizeof(info), "wrong len %u\n", len ); + + ok( info.SubsystemVersionHigh == nt->OptionalHeader.MajorSubsystemVersion, "wrong major version %x/%x\n", + info.SubsystemVersionHigh, nt->OptionalHeader.MajorSubsystemVersion ); + ok( info.SubsystemVersionLow == nt->OptionalHeader.MinorSubsystemVersion, "wrong minor version %x/%x\n", + info.SubsystemVersionLow, nt->OptionalHeader.MinorSubsystemVersion ); +} + static void test_query_process_debug_object_handle(int argc, char **argv) { char cmdline[MAX_PATH]; @@ -2741,6 +2769,10 @@ START_TEST(info) trace("Starting test_process_debug_flags()\n"); test_query_process_debug_flags(argc, argv); + /* 0x25 ProcessImageInformation */ + trace("Starting test_process_image_info()\n"); + test_query_process_image_info(); + /* 0x4C SystemFirmwareTableInformation */ trace("Starting test_query_firmware()\n"); test_query_firmware(); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 2419671f0d..3e205d4165 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -962,6 +962,7 @@ struct get_process_info_reply client_cpu_t cpu; short int debugger_present; short int debug_children; + /* VARARG(image,pe_image_info); */ }; @@ -6684,7 +6685,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 603 +#define SERVER_PROTOCOL_VERSION 604 /* ### protocol_version end ### */ diff --git a/server/file.h b/server/file.h index aa5f6216c2..45215c588d 100644 --- a/server/file.h +++ b/server/file.h @@ -171,6 +171,7 @@ extern struct mapping *get_mapping_obj( struct process *process, obj_handle_t ha unsigned int access ); extern struct file *get_mapping_file( struct process *process, client_ptr_t base, unsigned int access, unsigned int sharing ); +extern const pe_image_info_t *get_mapping_image_info( struct process *process, client_ptr_t base ); extern void free_mapped_views( struct process *process ); extern int get_page_size(void); diff --git a/server/mapping.c b/server/mapping.c index 0fcada7f8f..2c34b8f3c8 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -127,6 +127,7 @@ struct memory_view struct fd *fd; /* fd for mapped file */ struct ranges *committed; /* list of committed ranges in this mapping */ struct shared_map *shared; /* temp file for shared PE mapping */ + pe_image_info_t image; /* image info (for PE image mapping) */ unsigned int flags; /* SEC_* flags */ client_ptr_t base; /* view base address (in process addr space) */ mem_size_t size; /* view size */ @@ -894,6 +895,15 @@ struct file *get_mapping_file( struct process *process, client_ptr_t base, return create_file_for_fd_obj( view->fd, access, sharing ); } +/* get the image info for a SEC_IMAGE mapping */ +const pe_image_info_t *get_mapping_image_info( struct process *process, client_ptr_t base ) +{ + struct memory_view *view = find_mapped_view( process, base ); + + if (!view || !(view->flags & SEC_IMAGE)) return NULL; + return &view->image; +} + static void mapping_dump( struct object *obj, int verbose ) { struct mapping *mapping = (struct mapping *)obj; @@ -1062,6 +1072,7 @@ DECL_HANDLER(map_view) view->fd = !is_fd_removable( mapping->fd ) ? (struct fd *)grab_object( mapping->fd ) : NULL; view->committed = mapping->committed ? (struct ranges *)grab_object( mapping->committed ) : NULL; view->shared = mapping->shared ? (struct shared_map *)grab_object( mapping->shared ) : NULL; + if (mapping->flags & SEC_IMAGE) view->image = mapping->image; list_add_tail( &current->process->views, &view->entry ); } diff --git a/server/process.c b/server/process.c index 6722addb09..ab3d448b00 100644 --- a/server/process.c +++ b/server/process.c @@ -1447,6 +1447,13 @@ DECL_HANDLER(get_process_info) reply->cpu = process->cpu; reply->debugger_present = !!process->debugger; reply->debug_children = process->debug_children; + if (get_reply_max_size()) + { + const pe_image_info_t *info; + struct process_dll *exe = get_process_exe_module( process ); + if (exe && (info = get_mapping_image_info( process, exe->base ))) + set_reply_data( info, min( sizeof(*info), get_reply_max_size() )); + } release_object( process ); } } diff --git a/server/protocol.def b/server/protocol.def index 2fb8e2ec80..86efb01cc3 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -915,6 +915,7 @@ struct rawinput_device client_cpu_t cpu; /* CPU that this process is running on */ short int debugger_present; /* process is being debugged */ short int debug_children; /* inherit debugger to child processes */ + VARARG(image,pe_image_info); /* image info for main exe */ @END diff --git a/server/trace.c b/server/trace.c index ca2cbb9074..c5c006ce41 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1389,6 +1389,7 @@ static void dump_get_process_info_reply( const struct get_process_info_reply *re dump_client_cpu( ", cpu=", &req->cpu ); fprintf( stderr, ", debugger_present=%d", req->debugger_present ); fprintf( stderr, ", debug_children=%d", req->debug_children ); + dump_varargs_pe_image_info( ", image=", cur_size ); } static void dump_get_process_vm_counters_request( const struct get_process_vm_counters_request *req )

1 0

Alexandre Julliard : kernel32: Leave some more space for kernelbase.
by Alexandre Julliard May 26, 2020

May 26, 2020

Module: wine Branch: master Commit: 613389059006270fc89abdfb984c43e6fa742a9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=613389059006270fc89abdfb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 26 12:26:31 2020 +0200 kernel32: Leave some more space for kernelbase. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49208 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index b3877fe13b..d9b1ca575c 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -3,7 +3,7 @@ MODULE = kernel32.dll IMPORTLIB = kernel32 IMPORTS = winecrt0 kernelbase ntdll EXTRALIBS = $(COREFOUNDATION_LIBS) $(POLL_LIBS) $(RT_LIBS) -EXTRADLLFLAGS = -nodefaultlibs -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b400000 +EXTRADLLFLAGS = -nodefaultlibs -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b600000 C_SRCS = \ actctx.c \

1 0

Jacek Caban : winegcc: Add support for -Wl,--whole-archive option.
by Alexandre Julliard May 26, 2020

May 26, 2020

Module: wine Branch: master Commit: 0db5f6cf1b2da3c69cbf2c7700c6301f40e1411a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0db5f6cf1b2da3c69cbf2c77… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 25 20:34:31 2020 +0200 winegcc: Add support for -Wl,--whole-archive option. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index a1ba034009..776d2b6473 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1188,6 +1188,8 @@ static void build(struct options* opts) add_library(opts, lib_dirs, files, file + 2 ); else if (file[1] == 'x') lang = file; + else if(file[1] == 'W') + strarray_add(files, file); } /* add the default libraries, if needed */ @@ -1393,6 +1395,9 @@ static void build(struct options* opts) } strarray_add(link_args, name); break; + case 'W': + strarray_add(link_args, files->base[j]); + break; } } @@ -1932,6 +1937,11 @@ int main(int argc, char **argv) opts.debug_file = strdup( Wl->base[++j] ); continue; } + if (!strcmp(Wl->base[j], "--whole-archive") || !strcmp(Wl->base[j], "--no-whole-archive")) + { + strarray_add( opts.files, strmake( "-Wl,%s", Wl->base[j] )); + continue; + } if (!strcmp(Wl->base[j], "-static")) linking = -1; strarray_add(opts.linker_args, strmake("-Wl,%s",Wl->base[j])); }

1 0

Jacek Caban : winegcc: Store main arguments in strarray.
by Alexandre Julliard May 26, 2020

May 26, 2020

Module: wine Branch: master Commit: f42e4431fb0a57cac18258ee90bcbc5c6ff9f9e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f42e4431fb0a57cac18258ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 25 20:33:35 2020 +0200 winegcc: Store main arguments in strarray. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 167 +++++++++++++++++++++++++----------------------- 1 file changed, 87 insertions(+), 80 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f42e4431fb0a57cac182…

1 0

Nikolay Sivov : include: Add CResamplerMediaObject class id.
by Alexandre Julliard May 26, 2020

May 26, 2020

Module: wine Branch: master Commit: d45d34cdf5c2fc4b73aa6c07ff04079cdb9fe752 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d45d34cdf5c2fc4b73aa6c07… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 26 01:58:46 2020 +0300 include: Add CResamplerMediaObject class id. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmcodecdsp.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index d4547cd881..61381bee6d 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -25,3 +25,8 @@ cpp_quote("DEFINE_GUID(MEDIASUBTYPE_I420,0x30323449,0x0000,0x0010,0x80,0x00,0x00 uuid(bbeea841-0a63-4f52-a7ab-a9b3a84ed38a) ] coclass CMP3DecMediaObject {} + +[ + uuid(f447b69e-1884-4a7e-8055-346f74d6edb3) +] +coclass CResamplerMediaObject {}

1 0

Zebediah Figura : amstream: Don't duplicate IMediaStream method implementations.
by Alexandre Julliard May 26, 2020

May 26, 2020

Module: wine Branch: master Commit: f5aaca10affba65460206f6869fdf7fb10197468 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5aaca10affba65460206f68… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 25 14:17:32 2020 -0500 amstream: Don't duplicate IMediaStream method implementations. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 61 +++++++++++------------------------------- dlls/amstream/ddrawstream.c | 65 ++++++++++++--------------------------------- 2 files changed, 32 insertions(+), 94 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 4e82d76da0..d620abc6ec 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -605,76 +605,45 @@ static ULONG WINAPI audio_IAudioMediaStream_Release(IAudioMediaStream *iface) return IAMMediaStream_Release(&This->IAMMediaStream_iface); } -/*** IMediaStream methods ***/ static HRESULT WINAPI audio_IAudioMediaStream_GetMultiMediaStream(IAudioMediaStream *iface, - IMultiMediaStream **multi_media_stream) + IMultiMediaStream **mmstream) { - struct audio_stream *This = impl_from_IAudioMediaStream(iface); - - TRACE("(%p/%p)->(%p)\n", iface, This, multi_media_stream); - - if (!multi_media_stream) - return E_POINTER; - - IMultiMediaStream_AddRef(This->parent); - *multi_media_stream = This->parent; - - return S_OK; + struct audio_stream *stream = impl_from_IAudioMediaStream(iface); + return IAMMediaStream_GetMultiMediaStream(&stream->IAMMediaStream_iface, mmstream); } static HRESULT WINAPI audio_IAudioMediaStream_GetInformation(IAudioMediaStream *iface, MSPID *purpose_id, STREAM_TYPE *type) { - struct audio_stream *This = impl_from_IAudioMediaStream(iface); - - TRACE("(%p/%p)->(%p,%p)\n", iface, This, purpose_id, type); - - if (purpose_id) - *purpose_id = This->purpose_id; - if (type) - *type = This->stream_type; - - return S_OK; + struct audio_stream *stream = impl_from_IAudioMediaStream(iface); + return IAMMediaStream_GetInformation(&stream->IAMMediaStream_iface, purpose_id, type); } static HRESULT WINAPI audio_IAudioMediaStream_SetSameFormat(IAudioMediaStream *iface, - IMediaStream *stream_format, DWORD flags) + IMediaStream *other, DWORD flags) { - struct audio_stream *This = impl_from_IAudioMediaStream(iface); - - FIXME("(%p/%p)->(%p,%x) stub!\n", iface, This, stream_format, flags); - - return S_FALSE; + struct audio_stream *stream = impl_from_IAudioMediaStream(iface); + return IAMMediaStream_SetSameFormat(&stream->IAMMediaStream_iface, other, flags); } static HRESULT WINAPI audio_IAudioMediaStream_AllocateSample(IAudioMediaStream *iface, DWORD flags, IStreamSample **sample) { - struct audio_stream *This = impl_from_IAudioMediaStream(iface); - - FIXME("(%p/%p)->(%x,%p) stub!\n", iface, This, flags, sample); - - return S_FALSE; + struct audio_stream *stream = impl_from_IAudioMediaStream(iface); + return IAMMediaStream_AllocateSample(&stream->IAMMediaStream_iface, flags, sample); } static HRESULT WINAPI audio_IAudioMediaStream_CreateSharedSample(IAudioMediaStream *iface, IStreamSample *existing_sample, DWORD flags, IStreamSample **sample) { - struct audio_stream *This = impl_from_IAudioMediaStream(iface); - - FIXME("(%p/%p)->(%p,%x,%p) stub!\n", iface, This, existing_sample, flags, sample); - - return S_FALSE; + struct audio_stream *stream = impl_from_IAudioMediaStream(iface); + return IAMMediaStream_CreateSharedSample(&stream->IAMMediaStream_iface, existing_sample, flags, sample); } -static HRESULT WINAPI audio_IAudioMediaStream_SendEndOfStream(IAudioMediaStream *iface, - DWORD flags) +static HRESULT WINAPI audio_IAudioMediaStream_SendEndOfStream(IAudioMediaStream *iface, DWORD flags) { - struct audio_stream *This = impl_from_IAudioMediaStream(iface); - - FIXME("(%p/%p)->(%x) stub!\n", iface, This, flags); - - return S_FALSE; + struct audio_stream *stream = impl_from_IAudioMediaStream(iface); + return IAMMediaStream_SendEndOfStream(&stream->IAMMediaStream_iface, flags); } /*** IAudioMediaStream methods ***/ diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 9c552f1a03..6ef74eb7de 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -292,76 +292,45 @@ static ULONG WINAPI ddraw_IDirectDrawMediaStream_Release(IDirectDrawMediaStream return IAMMediaStream_Release(&This->IAMMediaStream_iface); } -/*** IMediaStream methods ***/ static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetMultiMediaStream(IDirectDrawMediaStream *iface, - IMultiMediaStream **multi_media_stream) + IMultiMediaStream **mmstream) { - struct ddraw_stream *This = impl_from_IDirectDrawMediaStream(iface); - - TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream); - - if (!multi_media_stream) - return E_POINTER; - - IMultiMediaStream_AddRef(This->parent); - *multi_media_stream = This->parent; - - return S_OK; + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); + return IAMMediaStream_GetMultiMediaStream(&stream->IAMMediaStream_iface, mmstream); } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_GetInformation(IDirectDrawMediaStream *iface, MSPID *purpose_id, STREAM_TYPE *type) { - struct ddraw_stream *This = impl_from_IDirectDrawMediaStream(iface); - - TRACE("(%p/%p)->(%p,%p)\n", This, iface, purpose_id, type); - - if (purpose_id) - *purpose_id = This->purpose_id; - if (type) - *type = This->stream_type; - - return S_OK; + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); + return IAMMediaStream_GetInformation(&stream->IAMMediaStream_iface, purpose_id, type); } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SetSameFormat(IDirectDrawMediaStream *iface, - IMediaStream *pStreamThatHasDesiredFormat, DWORD dwFlags) + IMediaStream *other, DWORD flags) { - struct ddraw_stream *This = impl_from_IDirectDrawMediaStream(iface); - - FIXME("(%p/%p)->(%p,%x) stub!\n", This, iface, pStreamThatHasDesiredFormat, dwFlags); - - return S_FALSE; + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); + return IAMMediaStream_SetSameFormat(&stream->IAMMediaStream_iface, other, flags); } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_AllocateSample(IDirectDrawMediaStream *iface, - DWORD dwFlags, IStreamSample **ppSample) + DWORD flags, IStreamSample **sample) { - struct ddraw_stream *This = impl_from_IDirectDrawMediaStream(iface); - - FIXME("(%p/%p)->(%x,%p) stub!\n", This, iface, dwFlags, ppSample); - - return S_FALSE; + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); + return IAMMediaStream_AllocateSample(&stream->IAMMediaStream_iface, flags, sample); } static HRESULT WINAPI ddraw_IDirectDrawMediaStream_CreateSharedSample(IDirectDrawMediaStream *iface, - IStreamSample *pExistingSample, DWORD dwFlags, IStreamSample **ppSample) + IStreamSample *existing_sample, DWORD flags, IStreamSample **sample) { - struct ddraw_stream *This = impl_from_IDirectDrawMediaStream(iface); - - FIXME("(%p/%p)->(%p,%x,%p) stub!\n", This, iface, pExistingSample, dwFlags, ppSample); - - return S_FALSE; + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); + return IAMMediaStream_CreateSharedSample(&stream->IAMMediaStream_iface, existing_sample, flags, sample); } -static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SendEndOfStream(IDirectDrawMediaStream *iface, - DWORD dwFlags) +static HRESULT WINAPI ddraw_IDirectDrawMediaStream_SendEndOfStream(IDirectDrawMediaStream *iface, DWORD flags) { - struct ddraw_stream *This = impl_from_IDirectDrawMediaStream(iface); - - FIXME("(%p/%p)->(%x) stub!\n", This, iface, dwFlags); - - return S_FALSE; + struct ddraw_stream *stream = impl_from_IDirectDrawMediaStream(iface); + return IAMMediaStream_SendEndOfStream(&stream->IAMMediaStream_iface, flags); } /*** IDirectDrawMediaStream methods ***/

1 0

Anton Baskanov : amstream: Don't crash if parent is NULL in AMAudioStream:: and AMDirectDrawStream::GetMultiMediaStream.
by Alexandre Julliard May 26, 2020

May 26, 2020

Module: wine Branch: master Commit: 4300981d6b997c0b4c70c3415d4bbcd694d1a7f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4300981d6b997c0b4c70c341… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon May 25 14:17:33 2020 -0500 amstream: Don't crash if parent is NULL in AMAudioStream:: and AMDirectDrawStream::GetMultiMediaStream. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 14 +++++++------- dlls/amstream/ddrawstream.c | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index d620abc6ec..265c3bf9f2 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -429,18 +429,18 @@ static ULONG WINAPI audio_IAMMediaStream_Release(IAMMediaStream *iface) /*** IMediaStream methods ***/ static HRESULT WINAPI audio_IAMMediaStream_GetMultiMediaStream(IAMMediaStream *iface, - IMultiMediaStream** multi_media_stream) + IMultiMediaStream **mmstream) { - struct audio_stream *This = impl_from_IAMMediaStream(iface); + struct audio_stream *stream = impl_from_IAMMediaStream(iface); - TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream); + TRACE("stream %p, mmstream %p.\n", stream, mmstream); - if (!multi_media_stream) + if (!mmstream) return E_POINTER; - IMultiMediaStream_AddRef(This->parent); - *multi_media_stream = This->parent; - + if (stream->parent) + IMultiMediaStream_AddRef(stream->parent); + *mmstream = stream->parent; return S_OK; } diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 6ef74eb7de..a4bfe948d2 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -125,18 +125,18 @@ static ULONG WINAPI ddraw_IAMMediaStream_Release(IAMMediaStream *iface) /*** IMediaStream methods ***/ static HRESULT WINAPI ddraw_IAMMediaStream_GetMultiMediaStream(IAMMediaStream *iface, - IMultiMediaStream** multi_media_stream) + IMultiMediaStream **mmstream) { - struct ddraw_stream *This = impl_from_IAMMediaStream(iface); + struct ddraw_stream *stream = impl_from_IAMMediaStream(iface); - TRACE("(%p/%p)->(%p)\n", This, iface, multi_media_stream); + TRACE("stream %p, mmstream %p.\n", stream, mmstream); - if (!multi_media_stream) + if (!mmstream) return E_POINTER; - IMultiMediaStream_AddRef(This->parent); - *multi_media_stream = This->parent; - + if (stream->parent) + IMultiMediaStream_AddRef(stream->parent); + *mmstream = stream->parent; return S_OK; }

1 0