wine-commits August 2019

wine-commits@winehq.org

2 participants
703 discussions

Alexandre Julliard : kernel32: Move some process functions to kernelbase.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: 09f588ee6909369b541398dd392d3ff77231e6a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09f588ee6909369b541398dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 9 13:37:26 2019 +0200 kernel32: Move some process functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/heap.c | 8 - dlls/kernel32/kernel32.spec | 42 ++--- dlls/kernel32/process.c | 364 ---------------------------------------- dlls/kernel32/thread.c | 8 - dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/kernelbase.spec | 48 +++--- dlls/kernelbase/process.c | 346 ++++++++++++++++++++++++++++++++++++++ include/winbase.h | 1 + 8 files changed, 393 insertions(+), 425 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=09f588ee6909369b5413…

1 0

Alexandre Julliard : kernel32: Move more thread functions to kernelbase.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: f2e7e1658beb48480bbe453bff43155eac2c40f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2e7e1658beb48480bbe453b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 9 12:23:18 2019 +0200 kernel32: Move more thread functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 20 +++--- dlls/kernel32/process.c | 153 ---------------------------------------- dlls/kernel32/thread.c | 74 ------------------- dlls/kernelbase/kernelbase.spec | 14 ++-- dlls/kernelbase/thread.c | 138 ++++++++++++++++++++++++++++++++++++ 5 files changed, 155 insertions(+), 244 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f2e7e1658beb48480bbe…

1 0

Dridi Boukelmoune : powrprof: Add PowerReadFriendlyName() stub.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: 0fca739770492ad94f687a9c5d51879b3aa5ef6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fca739770492ad94f687a9c… Author: Dridi Boukelmoune <dridi.boukelmoune(a)gmail.com> Date: Tue Aug 6 23:22:54 2019 +0200 powrprof: Add PowerReadFriendlyName() stub. Signed-off-by: Dridi Boukelmoune <dridi.boukelmoune(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-power-setting-l1-1-0.spec | 1 + dlls/powrprof/powrprof.c | 8 ++++++++ dlls/powrprof/powrprof.spec | 1 + 3 files changed, 10 insertions(+) diff --git a/dlls/api-ms-win-power-setting-l1-1-0/api-ms-win-power-setting-l1-1-0.spec b/dlls/api-ms-win-power-setting-l1-1-0/api-ms-win-power-setting-l1-1-0.spec index 4aa924f..7f6fa28 100644 --- a/dlls/api-ms-win-power-setting-l1-1-0/api-ms-win-power-setting-l1-1-0.spec +++ b/dlls/api-ms-win-power-setting-l1-1-0/api-ms-win-power-setting-l1-1-0.spec @@ -1,6 +1,7 @@ @ stdcall PowerGetActiveScheme(ptr ptr) powrprof.PowerGetActiveScheme @ stub PowerReadACValue @ stdcall PowerReadDCValue(ptr ptr ptr ptr ptr ptr ptr) powrprof.PowerReadDCValue +@ stdcall PowerReadFriendlyName(ptr ptr ptr ptr ptr ptr) powrprof.PowerReadFriendlyName @ stdcall PowerSetActiveScheme(ptr ptr) powrprof.PowerSetActiveScheme @ stub PowerSettingRegisterNotification @ stub PowerSettingUnregisterNotification diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index 92bab03..5f00c7b 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -315,6 +315,14 @@ DWORD WINAPI PowerReadDCValue(HKEY RootPowerKey, const GUID *Scheme, const GUID return ERROR_CALL_NOT_IMPLEMENTED; } +DWORD WINAPI PowerReadFriendlyName(HKEY RootPowerKey, const GUID *Scheme, + const GUID *SubGroup, const GUID *PowerSettings, UCHAR *Buffer, + DWORD *BufferSize) +{ + FIXME("(%p,%s,%s,%s,%p,%p) stub!\n", RootPowerKey, debugstr_guid(Scheme), debugstr_guid(SubGroup), debugstr_guid(PowerSettings), Buffer, BufferSize); + return ERROR_CALL_NOT_IMPLEMENTED; +} + POWER_PLATFORM_ROLE WINAPI PowerDeterminePlatformRole(void) { FIXME("stub\n"); diff --git a/dlls/powrprof/powrprof.spec b/dlls/powrprof/powrprof.spec index 169219a..611e03d 100644 --- a/dlls/powrprof/powrprof.spec +++ b/dlls/powrprof/powrprof.spec @@ -16,6 +16,7 @@ @ stdcall PowerGetActiveScheme (ptr ptr) @ stdcall PowerSetActiveScheme (ptr ptr) @ stdcall PowerReadDCValue (ptr ptr ptr ptr ptr ptr ptr) +@ stdcall PowerReadFriendlyName (ptr ptr ptr ptr ptr ptr) @ stdcall ReadGlobalPwrPolicy (ptr) @ stdcall ReadProcessorPwrScheme (long ptr) @ stdcall ReadPwrScheme (long ptr)

1 0

Alex Henrie : ntoskrnl: Add stub for SeLocateProcessImageName.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: f04e7d2650ffc5258989672f385ac86bce04d4ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=f04e7d2650ffc5258989672f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 7 21:42:41 2019 -0600 ntoskrnl: Add stub for SeLocateProcessImageName. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47601 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 2 files changed, 11 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 8eb0f2d..95b09ab 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3801,6 +3801,16 @@ BOOLEAN WINAPI SePrivilegeCheck(PRIVILEGE_SET *privileges, SECURITY_SUBJECT_CONT } /********************************************************************* + * SeLocateProcessImageName (NTOSKRNL.@) + */ +NTSTATUS WINAPI SeLocateProcessImageName(PEPROCESS process, UNICODE_STRING **image_name) +{ + FIXME("stub: %p %p\n", process, image_name); + if (image_name) *image_name = NULL; + return STATUS_NOT_IMPLEMENTED; +} + +/********************************************************************* * KeFlushQueuedDpcs (NTOSKRNL.@) */ void WINAPI KeFlushQueuedDpcs(void) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 79cf50b..d84129a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1257,6 +1257,7 @@ @ stub SeFreePrivileges @ stub SeImpersonateClient @ stub SeImpersonateClientEx +@ stdcall SeLocateProcessImageName(ptr ptr) @ stub SeLockSubjectContext @ stub SeMarkLogonSessionForTerminationNotification @ stub SeOpenObjectAuditAlarm

1 0

Alex Henrie : ntoskrnl: Add stub for SePrivilegeCheck.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: 558d7fd1b21135dab0b91a80c236c73c3a803ed3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=558d7fd1b21135dab0b91a80… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 7 21:42:40 2019 -0600 ntoskrnl: Add stub for SePrivilegeCheck. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47601 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index ccc5fce..8eb0f2d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3792,6 +3792,15 @@ BOOLEAN WINAPI SeSinglePrivilegeCheck(LUID privilege, KPROCESSOR_MODE mode) } /********************************************************************* + * SePrivilegeCheck (NTOSKRNL.@) + */ +BOOLEAN WINAPI SePrivilegeCheck(PRIVILEGE_SET *privileges, SECURITY_SUBJECT_CONTEXT *context, KPROCESSOR_MODE mode) +{ + FIXME("stub: %p %p %u\n", privileges, context, mode); + return TRUE; +} + +/********************************************************************* * KeFlushQueuedDpcs (NTOSKRNL.@) */ void WINAPI KeFlushQueuedDpcs(void) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index a3704a5..79cf50b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1261,7 +1261,7 @@ @ stub SeMarkLogonSessionForTerminationNotification @ stub SeOpenObjectAuditAlarm @ stub SeOpenObjectForDeleteAuditAlarm -@ stub SePrivilegeCheck +@ stdcall SePrivilegeCheck(ptr ptr long) @ stub SePrivilegeObjectAuditAlarm @ stub SePublicDefaultDacl @ stub SeQueryAuthenticationIdToken

1 0

Nikolay Sivov : ntdll: Ignore -1 time value same as 0 when setting file times.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: 2a15f77b497cadcef8f984bf678e2766c7a67cec URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a15f77b497cadcef8f984bf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 9 09:50:34 2019 +0300 ntdll: Ignore -1 time value same as 0 when setting file times. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 2 -- dlls/ntdll/file.c | 8 ++++++-- dlls/ntdll/tests/file.c | 3 +-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index a2511be..9be4ecd 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5068,7 +5068,6 @@ todo_wine memset(&basicinfo, 0, sizeof(basicinfo)); basicinfo.LastAccessTime.QuadPart = -1; ret = pSetFileInformationByHandle(file, FileBasicInfo, &basicinfo, sizeof(basicinfo)); -todo_wine ok(ret, "Failed to set basic info, error %d.\n", GetLastError()); memset(&basicinfo, 0, sizeof(basicinfo)); @@ -5402,7 +5401,6 @@ static void test_SetFileTime(void) memset(&ft1, 0xff, sizeof(ft1)); ret = SetFileTime(hfile, NULL, NULL, &ft1); -todo_wine ok(ret, "SetFileTime error %d\n", GetLastError()); memset(&ft1, 0, sizeof(ft1)); ret = GetFileTime(hfile, NULL, NULL, &ft1); /* get the actual time back */ diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 1cbaa1b..cd1775a 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2513,12 +2513,16 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io, { struct stat st; const FILE_BASIC_INFORMATION *info = ptr; + LARGE_INTEGER mtime, atime; if ((io->u.Status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) return io->u.Status; - if (info->LastAccessTime.QuadPart || info->LastWriteTime.QuadPart) - io->u.Status = set_file_times( fd, &info->LastWriteTime, &info->LastAccessTime ); + mtime.QuadPart = info->LastWriteTime.QuadPart == -1 ? 0 : info->LastWriteTime.QuadPart; + atime.QuadPart = info->LastAccessTime.QuadPart == -1 ? 0 : info->LastAccessTime.QuadPart; + + if (atime.QuadPart || mtime.QuadPart) + io->u.Status = set_file_times( fd, &mtime, &atime ); if (io->u.Status == STATUS_SUCCESS && info->FileAttributes) { diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 63854b5..31fc7ae 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1332,10 +1332,9 @@ static void test_file_basic_information(void) fbi2.LastWriteTime.QuadPart = -1; U(io).Status = 0xdeadbeef; res = pNtSetInformationFile(h, &io, &fbi2, sizeof fbi2, FileBasicInformation); -todo_wine { ok ( res == STATUS_SUCCESS, "can't set system attribute, NtSetInformationFile returned %x\n", res ); ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %x\n", U(io).Status ); -} + memset(&fbi2, 0, sizeof(fbi2)); res = pNtQueryInformationFile(h, &io, &fbi2, sizeof fbi2, FileBasicInformation); ok ( res == STATUS_SUCCESS, "can't get attributes, res %x\n", res);

1 0

Nikolay Sivov : ntdll/tests: Add some tests for setting file times.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: 3172b854ae1fc087d46734bdeedd00754b50961c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3172b854ae1fc087d46734bd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 9 09:50:33 2019 +0300 ntdll/tests: Add some tests for setting file times. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 8e54dbb..63854b5 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1313,8 +1313,8 @@ static void test_file_full_size_information(void) static void test_file_basic_information(void) { + FILE_BASIC_INFORMATION fbi, fbi2; IO_STATUS_BLOCK io; - FILE_BASIC_INFORMATION fbi; HANDLE h; int res; int attrib_mask = FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_NORMAL; @@ -1328,6 +1328,30 @@ static void test_file_basic_information(void) ok ( (fbi.FileAttributes & FILE_ATTRIBUTE_ARCHIVE) == FILE_ATTRIBUTE_ARCHIVE, "attribute %x not expected\n", fbi.FileAttributes ); + memset(&fbi2, 0, sizeof(fbi2)); + fbi2.LastWriteTime.QuadPart = -1; + U(io).Status = 0xdeadbeef; + res = pNtSetInformationFile(h, &io, &fbi2, sizeof fbi2, FileBasicInformation); +todo_wine { + ok ( res == STATUS_SUCCESS, "can't set system attribute, NtSetInformationFile returned %x\n", res ); + ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %x\n", U(io).Status ); +} + memset(&fbi2, 0, sizeof(fbi2)); + res = pNtQueryInformationFile(h, &io, &fbi2, sizeof fbi2, FileBasicInformation); + ok ( res == STATUS_SUCCESS, "can't get attributes, res %x\n", res); + ok ( fbi2.LastWriteTime.QuadPart == fbi.LastWriteTime.QuadPart, "unexpected write time.\n"); + + memset(&fbi2, 0, sizeof(fbi2)); + U(io).Status = 0xdeadbeef; + res = pNtSetInformationFile(h, &io, &fbi2, sizeof fbi2, FileBasicInformation); + ok ( res == STATUS_SUCCESS, "can't set system attribute, NtSetInformationFile returned %x\n", res ); + ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %x\n", U(io).Status ); + + memset(&fbi2, 0, sizeof(fbi2)); + res = pNtQueryInformationFile(h, &io, &fbi2, sizeof fbi2, FileBasicInformation); + ok ( res == STATUS_SUCCESS, "can't get attributes, res %x\n", res); + ok ( fbi2.LastWriteTime.QuadPart == fbi.LastWriteTime.QuadPart, "unexpected write time.\n"); + /* Then SYSTEM */ /* Clear fbi to avoid setting times */ memset(&fbi, 0, sizeof(fbi));

1 0

Nikolay Sivov : kernel32/tests: Add some tests for setting file times.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: 70189853e2f0284cfd185069e4f5ead4ba0fa1ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=70189853e2f0284cfd185069… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 9 09:50:32 2019 +0300 kernel32/tests: Add some tests for setting file times. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 63a67ca..a2511be 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5065,6 +5065,17 @@ todo_wine ok(ret, "Failed to get basic info, error %d.\n", GetLastError()); ok(atime.QuadPart + 1 == basicinfo.LastAccessTime.QuadPart, "Unexpected access time.\n"); + memset(&basicinfo, 0, sizeof(basicinfo)); + basicinfo.LastAccessTime.QuadPart = -1; + ret = pSetFileInformationByHandle(file, FileBasicInfo, &basicinfo, sizeof(basicinfo)); +todo_wine + ok(ret, "Failed to set basic info, error %d.\n", GetLastError()); + + memset(&basicinfo, 0, sizeof(basicinfo)); + ret = pGetFileInformationByHandleEx(file, FileBasicInfo, &basicinfo, sizeof(basicinfo)); + ok(ret, "Failed to get basic info, error %d.\n", GetLastError()); + ok(atime.QuadPart + 1 == basicinfo.LastAccessTime.QuadPart, "Unexpected access time.\n"); + dispinfo.DeleteFile = TRUE; ret = pSetFileInformationByHandle(file, FileDispositionInfo, &dispinfo, sizeof(dispinfo)); ok(ret, "setting FileDispositionInfo failed, error %d\n", GetLastError()); @@ -5357,6 +5368,50 @@ static void test_find_file_stream(void) ok(error == ERROR_HANDLE_EOF, "Expected ERROR_HANDLE_EOF, got %d\n", error); } +static void test_SetFileTime(void) +{ + static const WCHAR prefix[] = {'p','f','x',0}; + WCHAR path[MAX_PATH], temp_path[MAX_PATH]; + FILETIME ft1, ft2; + DWORD ret, len; + HANDLE hfile; + + ret = GetTempPathW(MAX_PATH, temp_path); + ok(ret != 0, "GetTempPathW error %d\n", GetLastError()); + ok(ret < MAX_PATH, "temp path should fit into MAX_PATH\n"); + + ret = GetTempFileNameW(temp_path, prefix, 0, path); + ok(ret != 0, "GetTempFileNameW error %d\n", GetLastError()); + + hfile = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, 0); + ok(hfile != INVALID_HANDLE_VALUE, "failed to open source file\n"); + ret = WriteFile(hfile, prefix, sizeof(prefix), &len, NULL ); + ok(ret && len == sizeof(prefix), "WriteFile error %d\n", GetLastError()); + ok(GetFileSize(hfile, NULL) == sizeof(prefix), "source file has wrong size\n"); + + ret = GetFileTime(hfile, NULL, NULL, &ft1); + ok(ret, "GetFileTime error %d\n", GetLastError()); + ft2 = ft1; + ft2.dwLowDateTime -= 600000000; /* 60 second */ + ret = SetFileTime(hfile, NULL, NULL, &ft2); + ok(ret, "SetFileTime error %d\n", GetLastError()); + memset(&ft2, 0, sizeof(ft2)); + ret = GetFileTime(hfile, NULL, NULL, &ft2); /* get the actual time back */ + ok(ret, "GetFileTime error %d\n", GetLastError()); + ok(memcmp(&ft1, &ft2, sizeof(ft1)), "Unexpected write time.\n"); + + memset(&ft1, 0xff, sizeof(ft1)); + ret = SetFileTime(hfile, NULL, NULL, &ft1); +todo_wine + ok(ret, "SetFileTime error %d\n", GetLastError()); + memset(&ft1, 0, sizeof(ft1)); + ret = GetFileTime(hfile, NULL, NULL, &ft1); /* get the actual time back */ + ok(ret, "GetFileTime error %d\n", GetLastError()); + ok(!memcmp(&ft1, &ft2, sizeof(ft1)), "Unexpected write time.\n"); + + CloseHandle(hfile); +} + START_TEST(file) { char temp_path[MAX_PATH]; @@ -5429,4 +5484,5 @@ START_TEST(file) test_overlapped_read(); test_file_readonly_access(); test_find_file_stream(); + test_SetFileTime(); }

1 0

Vincent Povirk : mscoree: Add diagnostic CorGetSvc stub.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: 6e3d68b14120563fd584fe9c5a27885f51e7ae66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e3d68b14120563fd584fe9c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 8 13:58:37 2019 -0500 mscoree: Add diagnostic CorGetSvc stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45449 Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/mscoree.spec | 2 +- dlls/mscoree/mscoree_main.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index ec4668b..7fa68bf 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -24,7 +24,7 @@ @ stdcall CorBindToRuntimeHost(wstr wstr wstr ptr long ptr ptr ptr) @ stub CorDllMainWorker @ stdcall CorExitProcess(long) -@ stub CorGetSvc +@ stdcall CorGetSvc(ptr) @ stdcall CorIsLatestSvc(ptr ptr) @ stub CorMarkThreadInThreadPool @ stub CorTickleSvc diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index af0321a..81fe561 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -319,6 +319,13 @@ HRESULT WINAPI CorIsLatestSvc(int *unk1, int *unk2) return S_OK; } +HRESULT WINAPI CorGetSvc(void *unk) +{ + ERR_(winediag)("If this function is called, it is likely the result of a broken .NET installation\n"); + + return E_NOTIMPL; +} + HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR pExe, LPCWSTR pwszVersion, LPCWSTR pConfigurationFile, DWORD startupFlags, DWORD runtimeInfoFlags, LPWSTR pDirectory, DWORD dwDirectory, DWORD *dwDirectoryLength, LPWSTR pVersion, DWORD cchBuffer, DWORD *dwlength)

1 0

Jacek Caban : msvcrt: Export __p__iob only on i386.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: 8445055b7272996290d675be5f202521f01317ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=8445055b7272996290d675be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 8 18:27:26 2019 +0200 msvcrt: Export __p__iob only on i386. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index eb40249..3fc18d2 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -280,7 +280,7 @@ @ cdecl __p__dstbias() MSVCRT___p__dstbias @ cdecl __p__environ() MSVCRT___p__environ @ cdecl __p__fmode() MSVCRT___p__fmode -@ cdecl __p__iob() __iob_func +@ cdecl -arch=i386 __p__iob() __iob_func @ stub __p__mbcasemap() @ cdecl __p__mbctype() @ stub __p__osplatform diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 4ec0af1..e6f0841 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -259,7 +259,7 @@ @ cdecl -arch=win32 __p__environ() MSVCRT___p__environ @ stub -arch=win32 __p__fileinfo() @ cdecl -arch=win32 __p__fmode() MSVCRT___p__fmode -@ cdecl __p__iob() __iob_func +@ cdecl -arch=i386 __p__iob() __iob_func @ stub -arch=win32 __p__mbcasemap() @ cdecl -arch=win32 __p__mbctype() @ cdecl -arch=win32 __p__osver() diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index b3bea65..002966a 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -820,7 +820,7 @@ @ cdecl -arch=win32 __p__daylight() msvcrt.__p__daylight @ cdecl -arch=win32 __p__environ() msvcrt.__p__environ @ cdecl -arch=win32 __p__fmode() msvcrt.__p__fmode -@ cdecl __p__iob() msvcrt.__p__iob +@ cdecl -arch=i386 __p__iob() msvcrt.__p__iob @ cdecl -arch=win32 __p__mbctype() msvcrt.__p__mbctype @ cdecl -arch=win32 __p__osver() msvcrt.__p__osver @ cdecl -arch=win32 __p__pctype() msvcrt.__p__pctype diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index a8ca862..bb2ad19 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -899,7 +899,7 @@ @ cdecl -arch=win32 __p__dstbias() msvcrt.__p__dstbias @ cdecl -arch=win32 __p__environ() msvcrt.__p__environ @ cdecl -arch=win32 __p__fmode() msvcrt.__p__fmode -@ cdecl __p__iob() msvcrt.__p__iob +@ cdecl -arch=i386 __p__iob() msvcrt.__p__iob @ cdecl -arch=win32 __p__mbctype() msvcrt.__p__mbctype @ cdecl -arch=win32 __p__osver() msvcrt.__p__osver @ cdecl -arch=win32 __p__pctype() msvcrt.__p__pctype

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
71
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 August 2019