February 2018 - Wine-Commits

Józef Kucia : d3d10core/tests: Add test for resource access flags.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 6801cc140f776ea08f3a62680bc0d4f257626346 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6801cc140f776ea08f3a6268… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 1 09:50:33 2018 +0100 d3d10core/tests: Add test for resource access flags. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 330 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 330 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6801cc140f776ea08f3a…

1 0

Michael Stefaniuc : mshtml: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 11e706785e9dd5870e9cb892265b87382b172cf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11e706785e9dd5870e9cb892… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jan 31 22:51:04 2018 +0100 mshtml: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban<jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 51a1add..ea38a66 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -30,6 +30,7 @@ #include "tlogstg.h" #include "shdeprecated.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/rbtree.h" #include "wine/unicode.h" @@ -1176,31 +1177,11 @@ DEFINE_GUID(IID_IDispatchJS,0x719c3050,0xf9d3,0x11cf,0xa4,0x93,0x00,0x40,0x05,0x /* memory allocation functions */ -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline void * __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t len) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, len); -} - static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t len) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); } -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR heap_strdupW(LPCWSTR str) { LPWSTR ret = NULL;

1 0

Alex Henrie : crypt32/tests: Drop store test workarounds for Windows <= 2000.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 030e4db2e459365e7c179281d9f1fb9758351123 URL: https://source.winehq.org/git/wine.git/?a=commit;h=030e4db2e459365e7c179281… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jan 30 11:08:15 2018 -0700 crypt32/tests: Drop store test workarounds for Windows <= 2000. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/store.c | 340 +++++++++++++++------------------------------ 1 file changed, 111 insertions(+), 229 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=030e4db2e459365e7c17…

1 0

Zebediah Figura : dbghelp: Avoid an infinite loop.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 5d740ddcfed5da981e2741610937e879b184004f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d740ddcfed5da981e274161… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 31 22:03:12 2018 -0600 dbghelp: Avoid an infinite loop. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/cpu_x86_64.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index 99b5c17..67b710c 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -712,6 +712,7 @@ static void* x86_64_find_runtime_function(struct module* module, DWORD64 addr while (rtf->UnwindData & 1) /* follow chained entry */ { FIXME("RunTime_Function outside IMAGE_DIRECTORY_ENTRY_EXCEPTION unimplemented yet!\n"); + return NULL; /* we need to read into the other process */ /* rtf = (RUNTIME_FUNCTION*)(module->module.BaseOfImage + (rtf->UnwindData & ~1)); */ }

1 0

Fabian Maurer : kernel32: Add stub for ReOpenFile.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 5eb13b24137d02f44cb1ef43804cb7a343340079 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5eb13b24137d02f44cb1ef43… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Jan 24 21:51:42 2018 +0100 kernel32: Add stub for ReOpenFile. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-file-l2-1-0.spec | 2 +- .../api-ms-win-core-file-l2-1-1.spec | 2 +- .../api-ms-win-core-file-l2-1-2.spec | 2 +- dlls/kernel32/file.c | 10 ++++++++++ dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec b/dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec index 3c1e59c..5272d4c 100644 --- a/dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec +++ b/dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec @@ -6,6 +6,6 @@ @ stdcall GetFileInformationByHandleEx(long long ptr long) kernel32.GetFileInformationByHandleEx @ stdcall MoveFileExW(wstr wstr long) kernel32.MoveFileExW @ stdcall MoveFileWithProgressW(wstr wstr ptr ptr long) kernel32.MoveFileWithProgressW -@ stub ReOpenFile +@ stdcall ReOpenFile(ptr long long long) kernel32.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/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 index 6bfcb08..9cd8689 100644 --- 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 @@ -7,6 +7,6 @@ @ 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 ReOpenFile(ptr long long long) kernel32.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/dlls/api-ms-win-core-file-l2-1-2/api-ms-win-core-file-l2-1-2.spec b/dlls/api-ms-win-core-file-l2-1-2/api-ms-win-core-file-l2-1-2.spec index bee3c05..ab6f303 100644 --- a/dlls/api-ms-win-core-file-l2-1-2/api-ms-win-core-file-l2-1-2.spec +++ b/dlls/api-ms-win-core-file-l2-1-2/api-ms-win-core-file-l2-1-2.spec @@ -10,5 +10,5 @@ @ stdcall MoveFileWithProgressW(wstr wstr ptr ptr long) kernel32.MoveFileWithProgressW @ stdcall OpenFileById(long ptr long long ptr long) kernel32.OpenFileById @ stdcall ReadDirectoryChangesW(long ptr long long long ptr ptr ptr) kernel32.ReadDirectoryChangesW -@ stub ReOpenFile +@ stdcall ReOpenFile(ptr long long long) kernel32.ReOpenFile @ stdcall ReplaceFileW(wstr wstr wstr long ptr ptr) kernel32.ReplaceFileW diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 7196aff..1e5b9fe 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -2820,6 +2820,16 @@ HANDLE WINAPI OpenFileById( HANDLE handle, LPFILE_ID_DESCRIPTOR id, DWORD access return result; } +/*********************************************************************** + * ReOpenFile (KERNEL32.@) + */ +HANDLE WINAPI ReOpenFile(HANDLE handle_original, DWORD access, DWORD sharing, DWORD flags) +{ + FIXME("(%p, %d, %d, %d): stub\n", handle_original, access, sharing, flags); + + return INVALID_HANDLE_VALUE; +} + /*********************************************************************** * K32EnumDeviceDrivers (KERNEL32.@) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 5ce6372..1137920 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1267,7 +1267,7 @@ # @ stub RemoveLocalAlternateComputerNameW @ stdcall RemoveVectoredContinueHandler(ptr) ntdll.RtlRemoveVectoredContinueHandler @ stdcall RemoveVectoredExceptionHandler(ptr) ntdll.RtlRemoveVectoredExceptionHandler -# @ stub ReOpenFile +@ stdcall ReOpenFile(ptr long long long) ReOpenFile @ stdcall ReplaceFile(wstr wstr wstr long ptr ptr) ReplaceFileW @ stdcall ReplaceFileA(str str str long ptr ptr) @ stdcall ReplaceFileW(wstr wstr wstr long ptr ptr) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index ca33bfd..eb6edbe 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1233,7 +1233,7 @@ # @ stub QuirkIsEnabledForProcess @ stdcall RaiseException(long long long ptr) kernel32.RaiseException # @ stub RaiseFailFastException -# @ stub ReOpenFile +@ stdcall ReOpenFile(ptr long long long) kernel32.ReOpenFile @ stdcall ReadConsoleA(long ptr long ptr ptr) kernel32.ReadConsoleA @ stdcall ReadConsoleInputA(long ptr long ptr) kernel32.ReadConsoleInputA @ stub ReadConsoleInputExA

1 0

Austin English : kernel32: Add QueryProcessCycleTime stub.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: db5a57c5f203aefad7c72ed49c96875bff1a1fbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=db5a57c5f203aefad7c72ed4… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 30 16:29:44 2018 -0600 kernel32: Add QueryProcessCycleTime stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-realtime-l1-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/time.c | 12 ++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec b/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec index 9c70db1..0def2d7 100644 --- a/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec +++ b/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec @@ -1,5 +1,5 @@ @ stub QueryIdleProcessorCycleTime @ stub QueryIdleProcessorCycleTimeEx -@ stub QueryProcessCycleTime +@ stdcall QueryProcessCycleTime(long ptr) kernel32.QueryProcessCycleTime @ stdcall QueryThreadCycleTime(long ptr) kernel32.QueryThreadCycleTime @ stdcall QueryUnbiasedInterruptTime(ptr) kernel32.QueryUnbiasedInterruptTime diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2c719d4..5ce6372 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1171,7 +1171,7 @@ @ stdcall QueryPerformanceCounter(ptr) @ stdcall QueryPerformanceFrequency(ptr) # @ stub QueryProcessAffinityUpdateMode -# @ stub QueryProcessCycleTime +@ stdcall QueryProcessCycleTime(long ptr) @ stdcall QueryThreadCycleTime(long ptr) # @ stub QueryThreadProfiling # @ stub QueryThreadpoolStackInformation diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index fbe5811..b0b8669 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1408,6 +1408,18 @@ DWORD WINAPI GetDynamicTimeZoneInformation(DYNAMIC_TIME_ZONE_INFORMATION *tzinfo } /*********************************************************************** + * QueryProcessCycleTime (KERNEL32.@) + */ +BOOL WINAPI QueryProcessCycleTime(HANDLE process, PULONG64 cycle) +{ + static int once; + if (!once++) + FIXME("(%p,%p): stub!\n", process, cycle); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * QueryThreadCycleTime (KERNEL32.@) */ BOOL WINAPI QueryThreadCycleTime(HANDLE thread, PULONG64 cycle) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index b9eb4fc..ca33bfd 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1206,7 +1206,7 @@ @ stdcall QueryPerformanceCounter(ptr) kernel32.QueryPerformanceCounter @ stdcall QueryPerformanceFrequency(ptr) kernel32.QueryPerformanceFrequency @ stub QueryProcessAffinityUpdateMode -# @ stub QueryProcessCycleTime +@ stdcall QueryProcessCycleTime(long ptr) kernel32.QueryProcessCycleTime # @ stub QueryProtectedPolicy @ stub QuerySecurityAccessMask # @ stub QueryStateAtomValueInfo

1 0

Alexandre Julliard : krnl386: Remove support for running DOS executables.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: 5e0fd3403e57b5f53513fc2e14a2a5b934dc8066 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e0fd3403e57b5f53513fc2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 1 13:50:20 2018 +0100 krnl386: Remove support for running DOS executables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/Makefile.in | 1 - dlls/krnl386.exe16/dosexe.c | 796 ---------------------------------- dlls/krnl386.exe16/dosexe.h | 24 +- dlls/krnl386.exe16/dosvm.c | 423 +----------------- dlls/krnl386.exe16/int21.c | 104 ++--- dlls/krnl386.exe16/int31.c | 8 +- dlls/krnl386.exe16/interrupts.c | 71 +-- dlls/krnl386.exe16/krnl386.exe16.spec | 1 - dlls/krnl386.exe16/timer.c | 122 ------ dlls/krnl386.exe16/vga.c | 14 +- dlls/krnl386.exe16/wowthunk.c | 96 ++-- 11 files changed, 73 insertions(+), 1587 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5e0fd3403e57b5f53513…

1 0

Alexandre Julliard : ntdll: Remove support for vm86 mode.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: e7202687fc9cd0dedf65ac7a4bf0446c308f7e9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7202687fc9cd0dedf65ac7a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 1 13:50:46 2018 +0100 ntdll: Remove support for vm86 mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/ntdll/ntdll.spec | 3 - dlls/ntdll/signal_arm.c | 9 -- dlls/ntdll/signal_arm64.c | 8 -- dlls/ntdll/signal_i386.c | 321 -------------------------------------------- dlls/ntdll/signal_powerpc.c | 8 -- dlls/ntdll/signal_x86_64.c | 8 -- include/config.h.in | 3 - 9 files changed, 362 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e7202687fc9cd0dedf65…

1 0

Alex Henrie : include: Add CertRegisterSystemStore and CertUnregisterSystemStore.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: f0da42f7f622958b6954a1d94bcab9f30847383a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0da42f7f622958b6954a1d9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jan 30 11:08:14 2018 -0700 include: Add CertRegisterSystemStore and CertUnregisterSystemStore. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/store.c | 2 +- include/wincrypt.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 91a3cbc..bc4ebde 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1414,7 +1414,7 @@ BOOL WINAPI CertRegisterSystemStore(const void *pvSystemStore, DWORD dwFlags, return FALSE; } -BOOL WINAPI CertUnregisterSystemStore(void *pvSystemStore, DWORD dwFlags) +BOOL WINAPI CertUnregisterSystemStore(const void *pvSystemStore, DWORD dwFlags) { HCERTSTORE hstore; diff --git a/include/wincrypt.h b/include/wincrypt.h index d688567..6e71fb9 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -4087,6 +4087,11 @@ BOOL WINAPI CertEnumSystemStoreLocation(DWORD dwFlags, void *pvArg, BOOL WINAPI CertEnumSystemStore(DWORD dwFlags, void *pvSystemStoreLocationPara, void *pvArg, PFN_CERT_ENUM_SYSTEM_STORE pfnEnum); +BOOL WINAPI CertRegisterSystemStore(const void *store, DWORD flags, + CERT_SYSTEM_STORE_INFO *info, void *reserved); + +BOOL WINAPI CertUnregisterSystemStore(const void *store, DWORD flags); + BOOL WINAPI CertEnumPhysicalStore(const void *pvSystemStore, DWORD dwFlags, void *pvArg, PFN_CERT_ENUM_PHYSICAL_STORE pfnEnum);

1 0

Dmitry Timoshkov : secur32: Remove Kerberos SSPI stubs.
by Alexandre Julliard Feb. 1, 2018

Feb. 1, 2018

Module: wine Branch: master Commit: a87b55d92e07f4ebbeb21183d85fd7e06ded0f04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a87b55d92e07f4ebbeb21183… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 1 18:04:33 2018 +0800 secur32: Remove Kerberos SSPI stubs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/Makefile.in | 1 - dlls/secur32/kerberos.c | 323 -------------------------------------------- dlls/secur32/secur32.c | 3 +- dlls/secur32/secur32_priv.h | 2 +- 4 files changed, 3 insertions(+), 326 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a87b55d92e07f4ebbeb2…

1 0