wine-commits December 2014

wine-commits@winehq.org

2 participants
319 discussions

Martin Storsjo : api-ms-win-core-processthreads-l1-1-2: Add stub dll.
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: 73b53905cd0c637f839c42fc962abe9f4d8b5b18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73b53905cd0c637f839c42fc9… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Dec 1 12:27:05 2014 +0200 api-ms-win-core-processthreads-l1-1-2: Add stub dll. --- configure | 2 + configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-core-processthreads-l1-1-2.spec | 70 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 75 insertions(+) diff --git a/configure b/configure index e8b75a8..3ddeb77 100755 --- a/configure +++ b/configure @@ -874,6 +874,7 @@ enable_api_ms_win_core_namedpipe_l1_2_0 enable_api_ms_win_core_processenvironment_l1_2_0 enable_api_ms_win_core_processthreads_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_1 +enable_api_ms_win_core_processthreads_l1_1_2 enable_api_ms_win_core_profile_l1_1_0 enable_api_ms_win_core_psapi_l1_1_0 enable_api_ms_win_core_registry_l1_1_0 @@ -16790,6 +16791,7 @@ wine_fn_config_dll api-ms-win-core-namedpipe-l1-2-0 enable_api_ms_win_core_named wine_fn_config_dll api-ms-win-core-processenvironment-l1-2-0 enable_api_ms_win_core_processenvironment_l1_2_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_processthreads_l1_1_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_processthreads_l1_1_1 +wine_fn_config_dll api-ms-win-core-processthreads-l1-1-2 enable_api_ms_win_core_processthreads_l1_1_2 wine_fn_config_dll api-ms-win-core-profile-l1-1-0 enable_api_ms_win_core_profile_l1_1_0 wine_fn_config_dll api-ms-win-core-psapi-l1-1-0 enable_api_ms_win_core_psapi_l1_1_0 wine_fn_config_dll api-ms-win-core-registry-l1-1-0 enable_api_ms_win_core_registry_l1_1_0 diff --git a/configure.ac b/configure.ac index 15d4dee..61bc2ad 100644 --- a/configure.ac +++ b/configure.ac @@ -2666,6 +2666,7 @@ WINE_CONFIG_DLL(api-ms-win-core-namedpipe-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-processenvironment-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-2) WINE_CONFIG_DLL(api-ms-win-core-profile-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-psapi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-registry-l1-1-0) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/Makefile.in b/dlls/api-ms-win-core-processthreads-l1-1-2/Makefile.in new file mode 100644 index 0000000..709073d --- /dev/null +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-processthreads-l1-1-2.dll diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec new file mode 100644 index 0000000..6894ce8 --- /dev/null +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -0,0 +1,70 @@ +@ stdcall CreateProcessA(str str ptr ptr long long ptr str ptr ptr) kernel32.CreateProcessA +@ stub CreateProcessAsUserW +@ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) kernel32.CreateProcessW +@ stdcall CreateRemoteThread(long ptr long ptr long long ptr) kernel32.CreateRemoteThread +@ stub CreateRemoteThreadEx +@ stdcall CreateThread(ptr long ptr long long ptr) kernel32.CreateThread +@ stub DeleteProcThreadAttributeList +@ stdcall ExitProcess(long) kernel32.ExitProcess +@ stdcall ExitThread(long) kernel32.ExitThread +@ stdcall FlushInstructionCache(long long long) kernel32.FlushInstructionCache +@ stdcall FlushProcessWriteBuffers() kernel32.FlushProcessWriteBuffers +@ stdcall -norelay GetCurrentProcess() kernel32.GetCurrentProcess +@ stdcall -norelay GetCurrentProcessId() kernel32.GetCurrentProcessId +@ stdcall GetCurrentProcessorNumber() kernel32.GetCurrentProcessorNumber +@ stub GetCurrentProcessorNumberEx +@ stdcall -norelay GetCurrentThread() kernel32.GetCurrentThread +@ stdcall -norelay GetCurrentThreadId() kernel32.GetCurrentThreadId +@ stub GetCurrentThreadStackLimits +@ stdcall GetExitCodeProcess(long ptr) kernel32.GetExitCodeProcess +@ stdcall GetExitCodeThread(long ptr) kernel32.GetExitCodeThread +@ stdcall GetPriorityClass(long) kernel32.GetPriorityClass +@ stdcall GetProcessHandleCount(long ptr) kernel32.GetProcessHandleCount +@ stdcall GetProcessId(long) kernel32.GetProcessId +@ stub GetProcessIdOfThread +@ stub GetProcessMitigationPolicy +@ stdcall GetProcessPriorityBoost(long ptr) kernel32.GetProcessPriorityBoost +@ stdcall GetProcessTimes(long ptr ptr ptr ptr) kernel32.GetProcessTimes +@ stdcall GetProcessVersion(long) kernel32.GetProcessVersion +@ stdcall GetStartupInfoW(ptr) kernel32.GetStartupInfoW +@ stdcall GetSystemTimes(ptr ptr ptr) kernel32.GetSystemTimes +@ stdcall GetThreadContext(long ptr) kernel32.GetThreadContext +@ stdcall GetThreadIOPendingFlag(long ptr) kernel32.GetThreadIOPendingFlag +@ stdcall GetThreadId(ptr) kernel32.GetThreadId +@ stub GetThreadIdealProcessorEx +@ stub GetThreadInformation +@ stdcall GetThreadPriority(long) kernel32.GetThreadPriority +@ stdcall GetThreadPriorityBoost(long ptr) kernel32.GetThreadPriorityBoost +@ stdcall GetThreadTimes(long ptr ptr ptr ptr) kernel32.GetThreadTimes +@ stub InitializeProcThreadAttributeList +@ stub IsProcessCritical +@ stdcall IsProcessorFeaturePresent(long) kernel32.IsProcessorFeaturePresent +@ stdcall OpenProcess(long long long) kernel32.OpenProcess +@ stub OpenProcessToken +@ stdcall OpenThread(long long long) kernel32.OpenThread +@ stub OpenThreadToken +@ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId +@ stub QueryProcessAffinityUpdateMode +@ stdcall QueueUserAPC(ptr long long) kernel32.QueueUserAPC +@ stdcall ResumeThread(long) kernel32.ResumeThread +@ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass +@ stub SetProcessAffinityUpdateMode +@ stub SetProcessMitigationPolicy +@ stdcall SetProcessPriorityBoost(long long) kernel32.SetProcessPriorityBoost +@ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters +@ stdcall SetThreadContext(long ptr) kernel32.SetThreadContext +@ stub SetThreadIdealProcessorEx +@ stub SetThreadInformation +@ stdcall SetThreadPriority(long long) kernel32.SetThreadPriority +@ stdcall SetThreadPriorityBoost(long long) kernel32.SetThreadPriorityBoost +@ stdcall SetThreadStackGuarantee(ptr) kernel32.SetThreadStackGuarantee +@ stub SetThreadToken +@ stdcall SuspendThread(long) kernel32.SuspendThread +@ stdcall SwitchToThread() kernel32.SwitchToThread +@ stdcall TerminateProcess(long long) kernel32.TerminateProcess +@ stdcall TerminateThread(long long) kernel32.TerminateThread +@ stdcall TlsAlloc() kernel32.TlsAlloc +@ stdcall TlsFree(long) kernel32.TlsFree +@ stdcall TlsGetValue(long) kernel32.TlsGetValue +@ stdcall TlsSetValue(long ptr) kernel32.TlsSetValue +@ stub UpdateProcThreadAttribute diff --git a/tools/make_specfiles b/tools/make_specfiles index 226f1ba..411f65e 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -158,6 +158,7 @@ my @dll_groups = "api-ms-win-core-timezone-l1-1-0", "api-ms-win-core-file-l2-1-1", "api-ms-win-core-sysinfo-l1-2-1", + "api-ms-win-core-processthreads-l1-1-2", ], [ "ole32",

1 0

Martin Storsjo : api-ms-win-core-sysinfo-l1-2-1: Add stub dll.
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: 1396c977a87eb284b4a49cc6fa3920cabc71f72d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1396c977a87eb284b4a49cc6f… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Dec 1 12:27:04 2014 +0200 api-ms-win-core-sysinfo-l1-2-1: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-sysinfo-l1-2-1/Makefile.in | 1 + .../api-ms-win-core-sysinfo-l1-2-1.spec | 36 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 41 insertions(+) diff --git a/configure b/configure index 7902a84..e8b75a8 100755 --- a/configure +++ b/configure @@ -882,6 +882,7 @@ enable_api_ms_win_core_shlwapi_legacy_l1_1_0 enable_api_ms_win_core_string_l1_1_0 enable_api_ms_win_core_synch_l1_2_0 enable_api_ms_win_core_sysinfo_l1_2_0 +enable_api_ms_win_core_sysinfo_l1_2_1 enable_api_ms_win_core_threadpool_legacy_l1_1_0 enable_api_ms_win_core_timezone_l1_1_0 enable_api_ms_win_core_url_l1_1_0 @@ -16797,6 +16798,7 @@ wine_fn_config_dll api-ms-win-core-shlwapi-legacy-l1-1-0 enable_api_ms_win_core_ wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l1_1_0 wine_fn_config_dll api-ms-win-core-synch-l1-2-0 enable_api_ms_win_core_synch_l1_2_0 wine_fn_config_dll api-ms-win-core-sysinfo-l1-2-0 enable_api_ms_win_core_sysinfo_l1_2_0 +wine_fn_config_dll api-ms-win-core-sysinfo-l1-2-1 enable_api_ms_win_core_sysinfo_l1_2_1 wine_fn_config_dll api-ms-win-core-threadpool-legacy-l1-1-0 enable_api_ms_win_core_threadpool_legacy_l1_1_0 wine_fn_config_dll api-ms-win-core-timezone-l1-1-0 enable_api_ms_win_core_timezone_l1_1_0 wine_fn_config_dll api-ms-win-core-url-l1-1-0 enable_api_ms_win_core_url_l1_1_0 diff --git a/configure.ac b/configure.ac index 8b3f400..15d4dee 100644 --- a/configure.ac +++ b/configure.ac @@ -2674,6 +2674,7 @@ WINE_CONFIG_DLL(api-ms-win-core-shlwapi-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-synch-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-2-1) WINE_CONFIG_DLL(api-ms-win-core-threadpool-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-timezone-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-url-l1-1-0) diff --git a/dlls/api-ms-win-core-sysinfo-l1-2-1/Makefile.in b/dlls/api-ms-win-core-sysinfo-l1-2-1/Makefile.in new file mode 100644 index 0000000..384a87b --- /dev/null +++ b/dlls/api-ms-win-core-sysinfo-l1-2-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-sysinfo-l1-2-1.dll diff --git a/dlls/api-ms-win-core-sysinfo-l1-2-1/api-ms-win-core-sysinfo-l1-2-1.spec b/dlls/api-ms-win-core-sysinfo-l1-2-1/api-ms-win-core-sysinfo-l1-2-1.spec new file mode 100644 index 0000000..79bfc60 --- /dev/null +++ b/dlls/api-ms-win-core-sysinfo-l1-2-1/api-ms-win-core-sysinfo-l1-2-1.spec @@ -0,0 +1,36 @@ +@ stub DnsHostnameToComputerNameExW +@ stub EnumSystemFirmwareTables +@ stdcall GetComputerNameExA(long ptr ptr) kernel32.GetComputerNameExA +@ stdcall GetComputerNameExW(long ptr ptr) kernel32.GetComputerNameExW +@ stdcall GetLocalTime(ptr) kernel32.GetLocalTime +@ stdcall GetLogicalProcessorInformation(ptr ptr) kernel32.GetLogicalProcessorInformation +@ stdcall GetLogicalProcessorInformationEx(long ptr ptr) kernel32.GetLogicalProcessorInformationEx +@ stdcall GetNativeSystemInfo(ptr) kernel32.GetNativeSystemInfo +@ stub GetOsSafeBootMode +@ stub GetPhysicallyInstalledSystemMemory +@ stdcall GetProductInfo(long long long long ptr) kernel32.GetProductInfo +@ stdcall GetSystemDirectoryA(ptr long) kernel32.GetSystemDirectoryA +@ stdcall GetSystemDirectoryW(ptr long) kernel32.GetSystemDirectoryW +@ stub GetSystemFirmwareTable +@ stdcall GetSystemInfo(ptr) kernel32.GetSystemInfo +@ stdcall GetSystemTime(ptr) kernel32.GetSystemTime +@ stdcall GetSystemTimeAdjustment(ptr ptr ptr) kernel32.GetSystemTimeAdjustment +@ stdcall GetSystemTimeAsFileTime(ptr) kernel32.GetSystemTimeAsFileTime +@ stub GetSystemTimePreciseAsFileTime +@ stdcall GetSystemWindowsDirectoryA(ptr long) kernel32.GetSystemWindowsDirectoryA +@ stdcall GetSystemWindowsDirectoryW(ptr long) kernel32.GetSystemWindowsDirectoryW +@ stdcall -ret64 GetTickCount64() kernel32.GetTickCount64 +@ stdcall GetTickCount() kernel32.GetTickCount +@ stdcall GetVersion() kernel32.GetVersion +@ stdcall GetVersionExA(ptr) kernel32.GetVersionExA +@ stdcall GetVersionExW(ptr) kernel32.GetVersionExW +@ stdcall GetWindowsDirectoryA(ptr long) kernel32.GetWindowsDirectoryA +@ stdcall GetWindowsDirectoryW(ptr long) kernel32.GetWindowsDirectoryW +@ stdcall GlobalMemoryStatusEx(ptr) kernel32.GlobalMemoryStatusEx +@ stub InstallELAMCertificateInfo +@ stub SetComputerNameEx2W +@ stdcall SetComputerNameExW(long wstr) kernel32.SetComputerNameExW +@ stdcall SetLocalTime(ptr) kernel32.SetLocalTime +@ stdcall SetSystemTime(ptr) kernel32.SetSystemTime +@ stdcall SetSystemTimeAdjustment(long long) kernel32.SetSystemTimeAdjustment +@ stdcall -ret64 VerSetConditionMask(long long long long) kernel32.VerSetConditionMask diff --git a/tools/make_specfiles b/tools/make_specfiles index 04be4c9..226f1ba 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -157,6 +157,7 @@ my @dll_groups = "api-ms-win-core-threadpool-legacy-l1-1-0", "api-ms-win-core-timezone-l1-1-0", "api-ms-win-core-file-l2-1-1", + "api-ms-win-core-sysinfo-l1-2-1", ], [ "ole32",

1 0

Martin Storsjo : api-ms-win-core-file-l2-1-1: Add stub dll.
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: 25f2f17bfb29ccb92a8aa8914589eef0616415d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25f2f17bfb29ccb92a8aa8914… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Dec 1 12:27:03 2014 +0200 api-ms-win-core-file-l2-1-1: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-file-l2-1-1/Makefile.in | 1 + .../api-ms-win-core-file-l2-1-1.spec | 12 ++++++++++++ tools/make_specfiles | 1 + 5 files changed, 17 insertions(+) diff --git a/configure b/configure index b3993ca..7902a84 100755 --- a/configure +++ b/configure @@ -858,6 +858,7 @@ enable_api_ms_win_core_console_l1_1_0 enable_api_ms_win_core_debug_l1_1_1 enable_api_ms_win_core_errorhandling_l1_1_1 enable_api_ms_win_core_file_l1_2_0 +enable_api_ms_win_core_file_l2_1_1 enable_api_ms_win_core_handle_l1_1_0 enable_api_ms_win_core_heap_l1_2_0 enable_api_ms_win_core_heap_obsolete_l1_1_0 @@ -16772,6 +16773,7 @@ wine_fn_config_dll api-ms-win-core-console-l1-1-0 enable_api_ms_win_core_console wine_fn_config_dll api-ms-win-core-debug-l1-1-1 enable_api_ms_win_core_debug_l1_1_1 wine_fn_config_dll api-ms-win-core-errorhandling-l1-1-1 enable_api_ms_win_core_errorhandling_l1_1_1 wine_fn_config_dll api-ms-win-core-file-l1-2-0 enable_api_ms_win_core_file_l1_2_0 +wine_fn_config_dll api-ms-win-core-file-l2-1-1 enable_api_ms_win_core_file_l2_1_1 wine_fn_config_dll api-ms-win-core-handle-l1-1-0 enable_api_ms_win_core_handle_l1_1_0 wine_fn_config_dll api-ms-win-core-heap-l1-2-0 enable_api_ms_win_core_heap_l1_2_0 wine_fn_config_dll api-ms-win-core-heap-obsolete-l1-1-0 enable_api_ms_win_core_heap_obsolete_l1_1_0 diff --git a/configure.ac b/configure.ac index edf5408..8b3f400 100644 --- a/configure.ac +++ b/configure.ac @@ -2650,6 +2650,7 @@ WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-file-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-1) WINE_CONFIG_DLL(api-ms-win-core-handle-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-heap-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-heap-obsolete-l1-1-0) diff --git a/dlls/api-ms-win-core-file-l2-1-1/Makefile.in b/dlls/api-ms-win-core-file-l2-1-1/Makefile.in new file mode 100644 index 0000000..f43a928 --- /dev/null +++ b/dlls/api-ms-win-core-file-l2-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-file-l2-1-1.dll diff --git a/dlls/api-ms-win-core-file-l2-1-1/api-ms-win-core-file-l2-1-1.spec b/dlls/api-ms-win-core-file-l2-1-1/api-ms-win-core-file-l2-1-1.spec new file mode 100644 index 0000000..36cf6c3 --- /dev/null +++ b/dlls/api-ms-win-core-file-l2-1-1/api-ms-win-core-file-l2-1-1.spec @@ -0,0 +1,12 @@ +@ stub CopyFile2 +@ stdcall CopyFileExW(wstr wstr ptr ptr ptr long) kernel32.CopyFileExW +@ stdcall CreateDirectoryExW(wstr wstr ptr) kernel32.CreateDirectoryExW +@ stdcall CreateHardLinkW(wstr wstr ptr) kernel32.CreateHardLinkW +@ stub CreateSymbolicLinkW +@ stdcall GetFileInformationByHandleEx(long long ptr long) kernel32.GetFileInformationByHandleEx +@ stdcall MoveFileExW(wstr wstr long) kernel32.MoveFileExW +@ stdcall MoveFileWithProgressW(wstr wstr ptr ptr long) kernel32.MoveFileWithProgressW +@ stdcall OpenFileById(long ptr long long ptr long) kernel32.OpenFileById +@ stub ReOpenFile +@ stdcall ReadDirectoryChangesW(long ptr long long long ptr ptr ptr) kernel32.ReadDirectoryChangesW +@ stdcall ReplaceFileW(wstr wstr wstr long ptr ptr) kernel32.ReplaceFileW diff --git a/tools/make_specfiles b/tools/make_specfiles index 9eae0ac..04be4c9 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -156,6 +156,7 @@ my @dll_groups = "api-ms-win-core-psapi-l1-1-0", "api-ms-win-core-threadpool-legacy-l1-1-0", "api-ms-win-core-timezone-l1-1-0", + "api-ms-win-core-file-l2-1-1", ], [ "ole32",

1 0

Marcus Meissner : ntoskrnl.exe: Added IoBuildSynchronousFsdRequest and IoGetAttachedDevice stubs.
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: c0816eabff42724de0091613bd3a304c7c497a24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0816eabff42724de0091613b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Dec 2 09:22:10 2014 +0100 ntoskrnl.exe: Added IoBuildSynchronousFsdRequest and IoGetAttachedDevice stubs. --- dlls/ntoskrnl.exe/ntoskrnl.c | 51 ++++++++++++++++++++++++++++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 +-- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a31b186..78df9f1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -532,6 +532,43 @@ PIRP WINAPI IoBuildDeviceIoControlRequest( ULONG IoControlCode, } +/********************************************************** + * IoBuildSynchronousFsdRequest (NTOSKRNL.EXE.@) + */ +PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG majorfunc, PDEVICE_OBJECT device, + PVOID buffer, ULONG length, PLARGE_INTEGER startoffset, + PKEVENT event, PIO_STATUS_BLOCK iosb) +{ + PIRP irp; + struct IrpInstance *instance; + PIO_STACK_LOCATION irpsp; + + FIXME("(%d %p %p %d %p %p %p) stub\n", majorfunc, device, buffer, length, startoffset, event, iosb); + + irp = IoAllocateIrp( device->StackSize, FALSE ); + if (irp == NULL) + return NULL; + + instance = HeapAlloc( GetProcessHeap(), 0, sizeof(struct IrpInstance) ); + if (instance == NULL) + { + IoFreeIrp( irp ); + return NULL; + } + instance->irp = irp; + list_add_tail( &Irps, &instance->entry ); + + irpsp = IoGetNextIrpStackLocation( irp ); + irpsp->MajorFunction = majorfunc; + /*irpsp->Parameters.DeviceIoControl.IoControlCode = IoControlCode;*/ + + irp->UserIosb = iosb; + irp->UserEvent = event; + irp->UserBuffer = buffer; + return irp; +} + + /*********************************************************************** * IoCreateDriver (NTOSKRNL.EXE.@) */ @@ -731,9 +768,21 @@ NTSTATUS WINAPI IoGetDeviceObjectPointer( UNICODE_STRING *name, ACCESS_MASK acc { FIXME( "stub: %s %x %p %p\n", debugstr_us(name), access, file, device ); - return STATUS_NOT_IMPLEMENTED; + *file = NULL; + *device = NULL; + + return STATUS_SUCCESS; } +/*********************************************************************** + * IoGetAttachedDevice (NTOSKRNL.EXE.@) + */ +PDEVICE_OBJECT WINAPI IoGetAttachedDevice( PDEVICE_OBJECT device ) +{ + FIXME( "stub: %p\n", device ); + + return device; +} /*********************************************************************** * IoGetDeviceProperty (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 4ead907..3bcf21c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -322,7 +322,7 @@ @ stub IoBuildAsynchronousFsdRequest @ stdcall IoBuildDeviceIoControlRequest(long ptr ptr long ptr long long ptr ptr) @ stub IoBuildPartialMdl -@ stub IoBuildSynchronousFsdRequest +@ stdcall IoBuildSynchronousFsdRequest(long ptr ptr long ptr ptr ptr) @ stdcall IoCallDriver(ptr ptr) @ stub IoCancelFileOpen @ stub IoCancelIrp @@ -373,7 +373,7 @@ @ stdcall IoFreeIrp(ptr) @ stdcall IoFreeMdl(ptr) @ stub IoFreeWorkItem -@ stub IoGetAttachedDevice +@ stdcall IoGetAttachedDevice(ptr) @ stub IoGetAttachedDeviceReference @ stub IoGetBaseFileSystemDeviceObject @ stub IoGetBootDiskInformation

1 0

Sebastian Lackner : ws2_32: Improve implementation of get_poll_results.
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: d824b1ac3c874cb493d42eb7d0b8b998dc308897 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d824b1ac3c874cb493d42eb7d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Nov 29 11:18:18 2014 +0100 ws2_32: Improve implementation of get_poll_results. --- dlls/ws2_32/socket.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 142e964..ebafed5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4386,36 +4386,37 @@ static void release_poll_fds( const WS_fd_set *readfds, const WS_fd_set *writefd static int get_poll_results( WS_fd_set *readfds, WS_fd_set *writefds, WS_fd_set *exceptfds, const struct pollfd *fds ) { - unsigned int exceptfds_off = (readfds ? readfds->fd_count : 0) + (writefds ? writefds->fd_count : 0); - unsigned int i, j = 0, k, total = 0; + const struct pollfd *poll_writefds = fds + (readfds ? readfds->fd_count : 0); + const struct pollfd *poll_exceptfds = poll_writefds + (writefds ? writefds->fd_count : 0); + unsigned int i, k, total = 0; if (readfds) { - for (i = k = 0; i < readfds->fd_count; i++, j++) + for (i = k = 0; i < readfds->fd_count; i++) { - - if (fds[j].revents || - (readfds==writefds && (fds[readfds->fd_count+i].revents & POLLOUT) && - !(fds[readfds->fd_count+i].revents & POLLHUP)) || - (readfds==exceptfds && fds[exceptfds_off+i].revents)) + if (fds[i].revents || + (readfds == writefds && (poll_writefds[i].revents & POLLOUT) && !(poll_writefds[i].revents & POLLHUP)) || + (readfds == exceptfds && poll_exceptfds[i].revents)) readfds->fd_array[k++] = readfds->fd_array[i]; } readfds->fd_count = k; total += k; } - if (writefds && writefds!=readfds) + if (writefds && writefds != readfds) { - for (i = k = 0; i < writefds->fd_count; i++, j++) - if (((fds[j].revents & POLLOUT) && !(fds[j].revents & POLLHUP)) || - (writefds==exceptfds && fds[exceptfds_off+i].revents)) + for (i = k = 0; i < writefds->fd_count; i++) + { + if (((poll_writefds[i].revents & POLLOUT) && !(poll_writefds[i].revents & POLLHUP)) || + (writefds == exceptfds && poll_exceptfds[i].revents)) writefds->fd_array[k++] = writefds->fd_array[i]; + } writefds->fd_count = k; total += k; } - if (exceptfds && exceptfds!=readfds && exceptfds!=writefds) + if (exceptfds && exceptfds != readfds && exceptfds != writefds) { for (i = k = 0; i < exceptfds->fd_count; i++) - if (fds[exceptfds_off+i].revents) exceptfds->fd_array[k++] = exceptfds->fd_array[i]; + if (poll_exceptfds[i].revents) exceptfds->fd_array[k++] = exceptfds->fd_array[i]; exceptfds->fd_count = k; total += k; }

1 0

Sebastian Lackner : wintrust: Reset data->pWintrustData->u.pFile-> hFile after closing handle.
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: 4b7ec8266340b6889c0843c5b33a5ea3ffcfe23f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b7ec8266340b6889c0843c5b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 25 21:26:54 2014 +0100 wintrust: Reset data->pWintrustData->u.pFile->hFile after closing handle. --- dlls/wintrust/softpub.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 358ba01..4e8582e 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -1209,7 +1209,11 @@ HRESULT WINAPI SoftpubCleanup(CRYPT_PROVIDER_DATA *data) if (data->fOpenedFile && data->pWintrustData->dwUnionChoice == WTD_CHOICE_FILE && data->pWintrustData->u.pFile) + { CloseHandle(data->pWintrustData->u.pFile->hFile); + data->pWintrustData->u.pFile->hFile = INVALID_HANDLE_VALUE; + data->fOpenedFile = FALSE; + } return S_OK; }

1 0

Nikolay Sivov : dwrite: Make fonts installed in Fonts dir accessible through system collection.
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: fe81deae10a41d0d72a8abfb7e92af7108c3476e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe81deae10a41d0d72a8abfb7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 1 13:22:51 2014 +0300 dwrite: Make fonts installed in Fonts dir accessible through system collection. --- dlls/dwrite/font.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 5e82b81..135ea4d 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1660,8 +1660,8 @@ static HRESULT WINAPI systemfontfileenumerator_GetCurrentFontFile(IDWriteFontFil { struct system_fontfile_enumerator *enumerator = impl_from_IDWriteFontFileEnumerator(iface); DWORD ret, type, count; + WCHAR *filename; HRESULT hr; - BYTE *data; *file = NULL; @@ -1671,17 +1671,30 @@ static HRESULT WINAPI systemfontfileenumerator_GetCurrentFontFile(IDWriteFontFil if (RegEnumValueW(enumerator->hkey, enumerator->index, NULL, NULL, NULL, &type, NULL, &count)) return E_FAIL; - if (!(data = heap_alloc(count))) + if (!(filename = heap_alloc(count))) return E_OUTOFMEMORY; - ret = RegEnumValueW(enumerator->hkey, enumerator->index, NULL, NULL, NULL, &type, data, &count); + ret = RegEnumValueW(enumerator->hkey, enumerator->index, NULL, NULL, NULL, &type, (BYTE*)filename, &count); if (ret) { - heap_free(data); + heap_free(filename); return E_FAIL; } - hr = IDWriteFactory_CreateFontFileReference(enumerator->factory, (WCHAR*)data, NULL, file); - heap_free(data); + /* Fonts installed in 'Fonts' system dir don't get full path in registry font files cache */ + if (!strchrW(filename, '\\')) { + static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\\',0}; + WCHAR fullpathW[MAX_PATH]; + + GetWindowsDirectoryW(fullpathW, sizeof(fullpathW)/sizeof(WCHAR)); + strcatW(fullpathW, fontsW); + strcatW(fullpathW, filename); + + hr = IDWriteFactory_CreateFontFileReference(enumerator->factory, fullpathW, NULL, file); + } + else + hr = IDWriteFactory_CreateFontFileReference(enumerator->factory, filename, NULL, file); + + heap_free(filename); return hr; }

1 0

Joachim Priesner : ws2_32: Use qsort() to order routes by metric in WS_get_local_ips.
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: 6eba688f2cbf13303419bee64ef4ff6511fbf380 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eba688f2cbf13303419bee64… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Tue Dec 2 10:24:11 2014 +0100 ws2_32: Use qsort() to order routes by metric in WS_get_local_ips. --- dlls/ws2_32/socket.c | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 29ac800..142e964 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5167,6 +5167,17 @@ struct WS_hostent* WINAPI WS_gethostbyaddr(const char *addr, int len, int type) } /*********************************************************************** + * WS_compare_routes_by_metric_asc (INTERNAL) + * + * Comparison function for qsort(), for sorting two routes (struct route) + * by metric in ascending order. + */ +static int WS_compare_routes_by_metric_asc(const void *left, const void *right) +{ + return ((const struct route*)left)->metric - ((const struct route*)right)->metric; +} + +/*********************************************************************** * WS_get_local_ips (INTERNAL) * * Returns the list of local IP addresses by going through the network @@ -5180,7 +5191,7 @@ struct WS_hostent* WINAPI WS_gethostbyaddr(const char *addr, int len, int type) */ static struct WS_hostent* WS_get_local_ips( char *hostname ) { - int last_metric, numroutes = 0, i, j; + int numroutes = 0, i, j; DWORD n; PIP_ADAPTER_INFO adapters = NULL, k; struct WS_hostent *hostlist = NULL; @@ -5260,30 +5271,15 @@ static struct WS_hostent* WS_get_local_ips( char *hostname ) hostlist->h_aliases[0] = NULL; /* NULL-terminate the alias list */ hostlist->h_addrtype = AF_INET; hostlist->h_length = sizeof(struct in_addr); /* = 4 */ - /* Reorder the entries when placing them in the host list, Windows expects + /* Reorder the entries before placing them in the host list. Windows expects * the IP list in order from highest priority to lowest (the critical thing * is that most applications expect the first IP to be the default route). */ - last_metric = -1; - for (i = 0; i < numroutes; i++) - { - struct in_addr addr; - int metric = 0xFFFF; + if (numroutes > 1) + qsort(route_addrs, numroutes, sizeof(struct route), WS_compare_routes_by_metric_asc); - memcpy(&addr, magic_loopback_addr, 4); - for (j = 0; j < numroutes; j++) - { - int this_metric = route_addrs[j].metric; - - if (this_metric > last_metric && this_metric < metric) - { - addr = route_addrs[j].addr; - metric = this_metric; - } - } - last_metric = metric; - (*(struct in_addr *) hostlist->h_addr_list[i]) = addr; - } + for (i = 0; i < numroutes; i++) + (*(struct in_addr *) hostlist->h_addr_list[i]) = route_addrs[i].addr; /* Cleanup all allocated memory except the address list, * the address list is used by the calling app.

1 0

Hans Leidekker : msi: Properly handle service control events in Start/ StopService.
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: 2a8043aa6bb3a128f8f41c8a45c3238ce8873771 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a8043aa6bb3a128f8f41c8a4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 2 12:41:26 2014 +0100 msi: Properly handle service control events in Start/StopService. --- dlls/msi/action.c | 33 +++++++++++++++------------------ dlls/msi/tests/action.c | 36 ++++++++++++++++++++++++++++++------ 2 files changed, 45 insertions(+), 24 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 939e426..1e527da 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5952,24 +5952,21 @@ static UINT ITERATE_StartService(MSIRECORD *rec, LPVOID param) if (!comp) return ERROR_SUCCESS; + event = MSI_RecordGetInteger( rec, 3 ); + deformat_string( package, MSI_RecordGetString( rec, 2 ), &name ); + comp->Action = msi_get_component_action( package, comp ); - if (comp->Action != INSTALLSTATE_LOCAL) + if (!(comp->Action == INSTALLSTATE_LOCAL && (event & msidbServiceControlEventStart)) && + !(comp->Action == INSTALLSTATE_ABSENT && (event & msidbServiceControlEventUninstallStart))) { - TRACE("component not scheduled for installation %s\n", debugstr_w(component)); + TRACE("not starting %s\n", debugstr_w(name)); + msi_free( name ); return ERROR_SUCCESS; } - deformat_string(package, MSI_RecordGetString(rec, 2), &name); deformat_string(package, MSI_RecordGetString(rec, 4), &args); - event = MSI_RecordGetInteger(rec, 3); wait = MSI_RecordGetInteger(rec, 5); - if (!(event & msidbServiceControlEventStart)) - { - r = ERROR_SUCCESS; - goto done; - } - scm = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); if (!scm) { @@ -6159,23 +6156,24 @@ static UINT ITERATE_StopService( MSIRECORD *rec, LPVOID param ) MSICOMPONENT *comp; MSIRECORD *uirow; LPCWSTR component; - LPWSTR name = NULL, display_name = NULL; + WCHAR *name, *display_name = NULL; DWORD event, len; SC_HANDLE scm; - event = MSI_RecordGetInteger( rec, 3 ); - if (!(event & msidbServiceControlEventStop)) - return ERROR_SUCCESS; - component = MSI_RecordGetString( rec, 6 ); comp = msi_get_loaded_component( package, component ); if (!comp) return ERROR_SUCCESS; + event = MSI_RecordGetInteger( rec, 3 ); + deformat_string( package, MSI_RecordGetString( rec, 2 ), &name ); + comp->Action = msi_get_component_action( package, comp ); - if (comp->Action != INSTALLSTATE_ABSENT) + if (!(comp->Action == INSTALLSTATE_LOCAL && (event & msidbServiceControlEventStop)) && + !(comp->Action == INSTALLSTATE_ABSENT && (event & msidbServiceControlEventUninstallStop))) { - TRACE("component not scheduled for removal %s\n", debugstr_w(component)); + TRACE("not stopping %s\n", debugstr_w(name)); + msi_free( name ); return ERROR_SUCCESS; } @@ -6195,7 +6193,6 @@ static UINT ITERATE_StopService( MSIRECORD *rec, LPVOID param ) } CloseServiceHandle( scm ); - deformat_string( package, MSI_RecordGetString( rec, 2 ), &name ); stop_service( name ); done: diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index bd074a2..60562f1 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -247,7 +247,10 @@ static const char sss_service_control_dat[] = "ServiceControl\tName\tEvent\tArguments\tWait\tComponent_\n" "s72\tl255\ti2\tL255\tI2\ts72\n" "ServiceControl\tServiceControl\n" - "ServiceControl\tSpooler\t1\t\t0\tservice_comp"; + "ServiceControl\tSpooler\t1\t\t1\tservice_comp\n" + "ServiceControl2\tSpooler\t2\t\t1\tservice_comp\n" + "ServiceControl3\tSpooler\t16\t\t1\tservice_comp\n" + "ServiceControl4\tSpooler\t32\t\t1\tservice_comp\n"; static const char sss_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" @@ -260,11 +263,15 @@ static const char sss_install_exec_seq_dat[] = "CostFinalize\t\t1000\n" "InstallValidate\t\t1400\n" "InstallInitialize\t\t1500\n" + "StopServices\t\t4000\n" "DeleteServices\t\t5000\n" "MoveFiles\t\t5100\n" "InstallFiles\t\t5200\n" "DuplicateFiles\t\t5300\n" "StartServices\t\t5400\n" + "RegisterProduct\t\t5500\n" + "PublishFeatures\t\t5600\n" + "PublishProduct\t\t5700\n" "InstallFinalize\t\t6000\n"; static const char sds_install_exec_seq_dat[] = @@ -5310,7 +5317,7 @@ error: DeleteFileA(msifile); } -static void test_start_services(void) +static void test_start_stop_services(void) { UINT r; SC_HANDLE scm, service; @@ -5359,6 +5366,23 @@ static void test_start_services(void) r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + if (error == ERROR_SUCCESS) + { + SERVICE_STATUS status; + + scm = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); + service = OpenServiceA(scm, "Spooler", SC_MANAGER_ALL_ACCESS); + + ret = ControlService(service, SERVICE_CONTROL_STOP, &status); + ok(ret, "ControlService failed %u\n", GetLastError()); + + CloseServiceHandle(service); + CloseServiceHandle(scm); + } + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); ok(delete_pf("msitest\\cabout\\new", FALSE), "Directory not created\n"); ok(delete_pf("msitest\\cabout\\four.txt", TRUE), "File not installed\n"); @@ -5373,9 +5397,6 @@ static void test_start_services(void) ok(delete_pf("msitest\\service2.exe", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); - delete_test_files(); - DeleteFileA(msifile); - if (error == ERROR_SUCCESS) { SERVICE_STATUS status; @@ -5389,6 +5410,9 @@ static void test_start_services(void) CloseServiceHandle(service); CloseServiceHandle(scm); } + + delete_test_files(); + DeleteFileA(msifile); } static void test_delete_services(void) @@ -6869,7 +6893,7 @@ START_TEST(action) test_write_registry_values(); test_envvar(); test_create_remove_folder(); - test_start_services(); + test_start_stop_services(); test_delete_services(); test_install_services(); test_self_registration();

1 0

Stefan Dösinger : wined3d: Add a comment about reset during focus change.
by Alexandre Julliard 02 Dec '14

02 Dec '14

Module: wine Branch: master Commit: f103247ddf2debba343cce4594fcaaad58917eac URL: http://source.winehq.org/git/wine.git/?a=commit;h=f103247ddf2debba343cce459… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 1 22:46:48 2014 +0100 wined3d: Add a comment about reset during focus change. --- dlls/wined3d/swapchain.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 362f0ae..89f83ea 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1176,6 +1176,11 @@ void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) { + /* This code is not protected by the wined3d mutex, so it may run while + * wined3d_device_reset is active. Testing on Windows shows that changing + * focus during resets and resetting during focus change events causes + * the application to crash with an invalid memory access. */ + if (activate) { if (!(swapchain->device->create_parms.flags & WINED3DCREATE_NOWINDOWCHANGES))

1 0

← Newer
1
...
25
26
27
28
29
30
31
32
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 December 2014