April 2020 - Wine-commits - list.winehq.org

Jacek Caban : include: Use long type for __msvcrt_long when possible.
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: wine Branch: master Commit: 22315440fcd50d2a24f91b0fe6f68b9b220c9815 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22315440fcd50d2a24f91b0f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 23 02:32:09 2020 +0200 include: Use long type for __msvcrt_long when possible. Based on patch by Chip Davis. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 8 ++++---- dlls/msvcrt/tests/file.c | 12 ++++++------ dlls/msvcrt/tests/misc.c | 8 ++++---- dlls/msvcrt/tests/time.c | 10 +++++----- include/msvcrt/corecrt.h | 5 +++++ 5 files changed, 24 insertions(+), 19 deletions(-) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 10056217ec..70fbb6afb4 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -5425,21 +5425,21 @@ static void test_istream(void) pis = call_func2(p_istream_seekg, &is1, 0); ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); - ok(_tell(fb1.fd) == 0, "expected 0 got %d\n", _tell(fb1.fd)); + ok(_tell(fb1.fd) == 0, "expected 0 got %ld\n", _tell(fb1.fd)); if (0) /* crashes on native */ is1.base_ios.sb = NULL; pis = call_func2(p_istream_seekg, &is1, -5); ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); ok(is1.base_ios.state == IOSTATE_failbit, "expected %d got %d\n", IOSTATE_failbit, is1.base_ios.state); ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); - ok(_tell(fb1.fd) == 0, "expected 0 got %d\n", _tell(fb1.fd)); + ok(_tell(fb1.fd) == 0, "expected 0 got %ld\n", _tell(fb1.fd)); fb1.base.epptr = fb1.base.ebuf; pis = call_func2(p_istream_seekg, &is1, 5); ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); ok(is1.base_ios.state == IOSTATE_failbit, "expected %d got %d\n", IOSTATE_failbit, is1.base_ios.state); ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); ok(fb1.base.epptr == NULL, "wrong put end, expected %p got %p\n", NULL, fb1.base.epptr); - ok(_tell(fb1.fd) == 5, "expected 5 got %d\n", _tell(fb1.fd)); + ok(_tell(fb1.fd) == 5, "expected 5 got %ld\n", _tell(fb1.fd)); is1.base_ios.state = IOSTATE_goodbit; fd = fb1.fd; fb1.fd = -1; @@ -5466,7 +5466,7 @@ static void test_istream(void) ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); ok(is1.base_ios.state == IOSTATE_failbit, "expected %d got %d\n", IOSTATE_failbit, is1.base_ios.state); ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); - ok(_tell(fb1.fd) == 24, "expected 24 got %d\n", _tell(fb1.fd)); + ok(_tell(fb1.fd) == 24, "expected 24 got %ld\n", _tell(fb1.fd)); /* sync */ ret = (int) call_func1(p_istream_sync, &is1); diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 8c6df2e8e2..61f6ffe373 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1185,7 +1185,7 @@ static void test_file_write_read( void ) memset(btext, 0, LLEN); tempfd = _open(tempf,_O_APPEND|_O_RDWR); /* open for APPEND in default mode */ - ok(tell(tempfd) == 0, "bad position %u expecting 0\n", tell(tempfd)); + ok(tell(tempfd) == 0, "bad position %lu expecting 0\n", tell(tempfd)); ok(_read(tempfd,btext,LLEN) == lstrlenA(mytext), "_read _O_APPEND got bad length\n"); ok( memcmp(mytext,btext,strlen(mytext)) == 0, "problems with _O_APPEND _read\n"); _close(tempfd); @@ -1206,15 +1206,15 @@ static void test_file_write_read( void ) _lseek(tempfd, -3, FILE_END); ret = _read(tempfd,btext,1); ok(ret == 1 && *btext == 'e', "_read expected 'e' got \"%.*s\" bad length: %d\n", ret, btext, ret); - ok(tell(tempfd) == 41, "bad position %u expecting 41\n", tell(tempfd)); + ok(tell(tempfd) == 41, "bad position %lu expecting 41\n", tell(tempfd)); _lseek(tempfd, -3, FILE_END); ret = _read(tempfd,btext,2); ok(ret == 1 && *btext == 'e', "_read expected 'e' got \"%.*s\" bad length: %d\n", ret, btext, ret); - ok(tell(tempfd) == 42, "bad position %u expecting 42\n", tell(tempfd)); + ok(tell(tempfd) == 42, "bad position %lu expecting 42\n", tell(tempfd)); _lseek(tempfd, -3, FILE_END); ret = _read(tempfd,btext,3); ok(ret == 2 && *btext == 'e', "_read expected 'e' got \"%.*s\" bad length: %d\n", ret, btext, ret); - ok(tell(tempfd) == 43, "bad position %u expecting 43\n", tell(tempfd)); + ok(tell(tempfd) == 43, "bad position %lu expecting 43\n", tell(tempfd)); _close(tempfd); ret = unlink(tempf); @@ -1469,7 +1469,7 @@ static void test_file_inherit( const char* selfname ) arg_v[3] = buffer; sprintf(buffer, "%d", fd); arg_v[4] = 0; _spawnvp(_P_WAIT, selfname, arg_v); - ok(tell(fd) == 8, "bad position %u expecting 8\n", tell(fd)); + ok(tell(fd) == 8, "bad position %lu expecting 8\n", tell(fd)); lseek(fd, 0, SEEK_SET); ok(read(fd, buffer, sizeof (buffer)) == 8 && memcmp(buffer, "Success", 8) == 0, "Couldn't read back the data\n"); close (fd); @@ -1482,7 +1482,7 @@ static void test_file_inherit( const char* selfname ) arg_v[3] = buffer; sprintf(buffer, "%d", fd); arg_v[4] = 0; _spawnvp(_P_WAIT, selfname, arg_v); - ok(tell(fd) == 0, "bad position %u expecting 0\n", tell(fd)); + ok(tell(fd) == 0, "bad position %lu expecting 0\n", tell(fd)); ok(read(fd, buffer, sizeof (buffer)) == 0, "Found unexpected data (%s)\n", buffer); close (fd); ok(unlink("fdopen.tst") == 0, "Couldn't unlink\n"); diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index afc3a9de21..d77b6c8edf 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -240,7 +240,7 @@ static void test__get_doserrno(void) errno = EBADF; ret = p_get_doserrno(NULL); ok(ret == EINVAL, "Expected _get_doserrno to return EINVAL, got %d\n", ret); - ok(_doserrno == ERROR_INVALID_CMM, "Expected _doserrno to be ERROR_INVALID_CMM, got %d\n", _doserrno); + ok(_doserrno == ERROR_INVALID_CMM, "Expected _doserrno to be ERROR_INVALID_CMM, got %ld\n", _doserrno); ok(errno == EBADF, "Expected errno to be EBADF, got %d\n", errno); _doserrno = ERROR_INVALID_CMM; @@ -287,19 +287,19 @@ static void test__set_doserrno(void) ret = p_set_doserrno(ERROR_FILE_NOT_FOUND); ok(ret == 0, "Expected _set_doserrno to return 0, got %d\n", ret); ok(_doserrno == ERROR_FILE_NOT_FOUND, - "Expected _doserrno to be ERROR_FILE_NOT_FOUND, got %d\n", _doserrno); + "Expected _doserrno to be ERROR_FILE_NOT_FOUND, got %ld\n", _doserrno); _doserrno = ERROR_INVALID_CMM; ret = p_set_doserrno(-1); ok(ret == 0, "Expected _set_doserrno to return 0, got %d\n", ret); ok(_doserrno == -1, - "Expected _doserrno to be -1, got %d\n", _doserrno); + "Expected _doserrno to be -1, got %ld\n", _doserrno); _doserrno = ERROR_INVALID_CMM; ret = p_set_doserrno(0xdeadbeef); ok(ret == 0, "Expected _set_doserrno to return 0, got %d\n", ret); ok(_doserrno == 0xdeadbeef, - "Expected _doserrno to be 0xdeadbeef, got %d\n", _doserrno); + "Expected _doserrno to be 0xdeadbeef, got %ld\n", _doserrno); } static void test__set_errno(void) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 45ed971ca8..0a14e64ec6 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -150,21 +150,21 @@ static void test_gmtime(void) gmt_tm->tm_wday = gmt_tm->tm_yday = 0; gmt = p_mkgmtime32(gmt_tm); - ok(gmt == valid, "gmt = %u\n", gmt); + ok(gmt == valid, "gmt = %lu\n", gmt); ok(gmt_tm->tm_wday == 4, "gmt_tm->tm_wday = %d\n", gmt_tm->tm_wday); ok(gmt_tm->tm_yday == 0, "gmt_tm->tm_yday = %d\n", gmt_tm->tm_yday); gmt_tm->tm_wday = gmt_tm->tm_yday = 0; gmt_tm->tm_isdst = -1; gmt = p_mkgmtime32(gmt_tm); - ok(gmt == valid, "gmt = %u\n", gmt); + ok(gmt == valid, "gmt = %lu\n", gmt); ok(gmt_tm->tm_wday == 4, "gmt_tm->tm_wday = %d\n", gmt_tm->tm_wday); ok(gmt_tm->tm_yday == 0, "gmt_tm->tm_yday = %d\n", gmt_tm->tm_yday); gmt_tm->tm_wday = gmt_tm->tm_yday = 0; gmt_tm->tm_isdst = 1; gmt = p_mkgmtime32(gmt_tm); - ok(gmt == valid, "gmt = %u\n", gmt); + ok(gmt == valid, "gmt = %lu\n", gmt); ok(gmt_tm->tm_wday == 4, "gmt_tm->tm_wday = %d\n", gmt_tm->tm_wday); ok(gmt_tm->tm_yday == 0, "gmt_tm->tm_yday = %d\n", gmt_tm->tm_yday); @@ -177,13 +177,13 @@ static void test_gmtime(void) gmt_tm->tm_isdst = -1; gmt = p_mkgmtime32(gmt_tm); - ok(gmt == valid, "gmt = %u\n", gmt); + ok(gmt == valid, "gmt = %lu\n", gmt); ok(gmt_tm->tm_wday == 6, "gmt_tm->tm_wday = %d\n", gmt_tm->tm_wday); ok(gmt_tm->tm_yday == 2, "gmt_tm->tm_yday = %d\n", gmt_tm->tm_yday); gmt_tm->tm_isdst = 1; gmt = p_mkgmtime32(gmt_tm); - ok(gmt == valid, "gmt = %u\n", gmt); + ok(gmt == valid, "gmt = %lu\n", gmt); if(!p_gmtime32_s) { win_skip("Skipping _gmtime32_s tests\n"); diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index ea81e95db3..3532cbf501 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -163,8 +163,13 @@ #ifndef _MSVCRT_LONG_DEFINED #define _MSVCRT_LONG_DEFINED /* we need 32-bit longs even on 64-bit */ +#ifdef __LP64__ typedef int __msvcrt_long; typedef unsigned int __msvcrt_ulong; +#else +typedef long __msvcrt_long; +typedef unsigned long __msvcrt_ulong; +#endif #endif #ifndef _INTPTR_T_DEFINED

1 0

Zebediah Figura : include: Define RTL_BALANCED_NODE.
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: wine Branch: master Commit: cd1a09be73115aa9a12fc39c2784d7e54003762f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd1a09be73115aa9a12fc39c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 22 21:07:18 2020 -0500 include: Define RTL_BALANCED_NODE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ntdef.h | 33 +++++++++++++++++++++++++++++++++ include/windef.h | 15 +++++++++++---- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/include/ntdef.h b/include/ntdef.h index 014102ac74..d85aa6feb5 100644 --- a/include/ntdef.h +++ b/include/ntdef.h @@ -19,6 +19,8 @@ #ifndef _NTDEF_ #define _NTDEF_ +#include <basetsd.h> + #ifdef __cplusplus extern "C" { #endif @@ -48,4 +50,35 @@ typedef enum _WAIT_TYPE { #define NT_WARNING(status) ((((NTSTATUS)(status)) & 0xc0000000) == 0x80000000) #define NT_ERROR(status) ((((NTSTATUS)(status)) & 0xc0000000) == 0xc0000000) +#define BASETYPES +typedef unsigned char UCHAR, *PUCHAR; +typedef unsigned short USHORT, *PUSHORT; +#ifdef _MSC_VER +typedef unsigned long ULONG, *PULONG; +#else +typedef unsigned int ULONG, *PULONG; +#endif + +typedef struct _RTL_BALANCED_NODE +{ + union + { + struct _RTL_BALANCED_NODE *Children[2]; + struct + { + struct _RTL_BALANCED_NODE *Left; + struct _RTL_BALANCED_NODE *Right; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + + union + { + UCHAR Red : 1; + UCHAR Balance : 2; + ULONG_PTR ParentValue; + } DUMMYUNIONNAME2; +} RTL_BALANCED_NODE, *PRTL_BALANCED_NODE; + +#define RTL_BALANCED_NODE_RESERVED_PARENT_MASK 3 + #endif /* _NTDEF_ */ diff --git a/include/windef.h b/include/windef.h index 0074d5cf6c..3c61cad4c5 100644 --- a/include/windef.h +++ b/include/windef.h @@ -239,13 +239,22 @@ extern "C" { /* Standard data types */ +#ifndef BASETYPES +#define BASETYPES +typedef unsigned char UCHAR, *PUCHAR; +typedef unsigned short USHORT, *PUSHORT; +#ifdef _MSC_VER +typedef unsigned long ULONG, *PULONG; +#else +typedef unsigned int ULONG, *PULONG; +#endif +#endif + typedef void *LPVOID; typedef const void *LPCVOID; typedef int BOOL, *PBOOL, *LPBOOL; typedef unsigned char BYTE, *PBYTE, *LPBYTE; -typedef unsigned char UCHAR, *PUCHAR; typedef unsigned short WORD, *PWORD, *LPWORD; -typedef unsigned short USHORT, *PUSHORT; typedef int INT, *PINT, *LPINT; typedef unsigned int UINT, *PUINT; typedef float FLOAT, *PFLOAT; @@ -253,11 +262,9 @@ typedef char *PSZ; #ifdef _MSC_VER typedef long *LPLONG; typedef unsigned long DWORD, *PDWORD, *LPDWORD; -typedef unsigned long ULONG, *PULONG; #else typedef int *LPLONG; typedef unsigned int DWORD, *PDWORD, *LPDWORD; -typedef unsigned int ULONG, *PULONG; #endif /* Macros to map Winelib names to the correct implementation name */

1 0

Zebediah Figura : include: Add more fields to LDR_MODULE.
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: wine Branch: master Commit: 18590bb2fbe511d1720ef84a17e1d0c809b35622 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18590bb2fbe511d1720ef84a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 22 21:07:19 2020 -0500 include: Add more fields to LDR_MODULE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winternl.h | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/include/winternl.h b/include/winternl.h index ac045c1709..f36419da78 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2255,6 +2255,68 @@ typedef struct _NLSTABLEINFO * * Those are not part of standard Winternl.h */ + +typedef struct _LDR_SERVICE_TAG_RECORD +{ + struct _LDR_SERVICE_TAG_RECORD *Next; + ULONG ServiceTag; +} LDR_SERVICE_TAG_RECORD, *PLDR_SERVICE_TAG_RECORD; + +typedef struct _LDRP_CSLIST +{ + SINGLE_LIST_ENTRY *Tail; +} LDRP_CSLIST, *PLDRP_CSLIST; + +typedef enum _LDR_DDAG_STATE +{ + LdrModulesMerged = -5, + LdrModulesInitError = -4, + LdrModulesSnapError = -3, + LdrModulesUnloaded = -2, + LdrModulesUnloading = -1, + LdrModulesPlaceHolder = 0, + LdrModulesMapping = 1, + LdrModulesMapped = 2, + LdrModulesWaitingForDependencies = 3, + LdrModulesSnapping = 4, + LdrModulesSnapped = 5, + LdrModulesCondensed = 6, + LdrModulesReadyToInit = 7, + LdrModulesInitializing = 8, + LdrModulesReadyToRun = 9, +} LDR_DDAG_STATE; + +typedef struct _LDR_DDAG_NODE +{ + LIST_ENTRY Modules; + LDR_SERVICE_TAG_RECORD *ServiceTagList; + ULONG LoadCount; + ULONG ReferenceCount; + ULONG DependencyCount; + union + { + LDRP_CSLIST Dependencies; + SINGLE_LIST_ENTRY RemovalLink; + }; + LDRP_CSLIST IncomingDependencies; + LDR_DDAG_STATE State; + SINGLE_LIST_ENTRY CondenseLink; + ULONG PreorderNumber; + ULONG LowestLink; +} LDR_DDAG_NODE, *PLDR_DDAG_NODE; + +typedef enum _LDR_DLL_LOAD_REASON +{ + LoadReasonStaticDependency, + LoadReasonStaticForwarderDependency, + LoadReasonDynamicForwarderDependency, + LoadReasonDelayloadDependency, + LoadReasonDynamicLoad, + LoadReasonAsImageLoad, + LoadReasonAsDataLoad, + LoadReasonUnknown = -1 +} LDR_DLL_LOAD_REASON, *PLDR_DLL_LOAD_REASON; + typedef struct _LDR_MODULE { LIST_ENTRY InLoadOrderModuleList; @@ -2272,6 +2334,20 @@ typedef struct _LDR_MODULE ULONG CheckSum; ULONG TimeDateStamp; HANDLE ActivationContext; + void* Lock; + LDR_DDAG_NODE* DdagNode; + LIST_ENTRY NodeModuleLink; + struct _LDRP_LOAD_CONTEXT *LoadContext; + void* ParentDllBase; + void* SwitchBackContext; + RTL_BALANCED_NODE BaseAddressIndexNode; + RTL_BALANCED_NODE MappingInfoIndexNode; + ULONG_PTR OriginalBase; + LARGE_INTEGER LoadTime; + ULONG BaseNameHashValue; + LDR_DLL_LOAD_REASON LoadReason; + ULONG ImplicitPathOptions; + ULONG ReferenceCount; } LDR_MODULE, *PLDR_MODULE; typedef struct _LDR_DLL_LOADED_NOTIFICATION_DATA

1 0

Paul Gofman : ntdll: Return STATUS_PENDING from NtReadFile() for async read in case of EOF.
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: wine Branch: master Commit: b0d3b5b69cf0be469a94a7330285a82f534ca3f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0d3b5b69cf0be469a94a733… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Apr 20 02:06:00 2020 +0300 ntdll: Return STATUS_PENDING from NtReadFile() for async read in case of EOF. Fixes crashes in "Planet Zoo" during character or game save. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 6 +++--- dlls/ntdll/tests/file.c | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index a9770290e0..9997a5e1cd 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1018,13 +1018,13 @@ done: err: if (needs_close) close( unix_handle ); - if (status == STATUS_SUCCESS || (status == STATUS_END_OF_FILE && !async_read)) + if (status == STATUS_SUCCESS || (status == STATUS_END_OF_FILE && (!async_read || type == FD_TYPE_FILE))) { io_status->u.Status = status; io_status->Information = total; TRACE("= SUCCESS (%u)\n", total); if (hEvent) NtSetEvent( hEvent, NULL ); - if (apc && !status) NtQueueApcThread( GetCurrentThread(), (PNTAPCFUNC)apc, + if (apc && (!status || async_read)) NtQueueApcThread( GetCurrentThread(), (PNTAPCFUNC)apc, (ULONG_PTR)apc_user, (ULONG_PTR)io_status, 0 ); } else @@ -1033,7 +1033,7 @@ err: if (status != STATUS_PENDING && hEvent) NtResetEvent( hEvent, NULL ); } - ret_status = async_read && type == FD_TYPE_FILE && status == STATUS_SUCCESS + ret_status = async_read && type == FD_TYPE_FILE && (status == STATUS_SUCCESS || status == STATUS_END_OF_FILE) ? STATUS_PENDING : status; if (send_completion) NTDLL_AddCompletion( hFile, cvalue, status, total, ret_status == STATUS_PENDING ); diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 68c6a79e79..31c18454f0 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -652,7 +652,8 @@ static void read_file_test(void) iosb.Information = 0xdeadbeef; offset.QuadPart = strlen(text) + 2; status = pNtReadFile( handle, event, apc, &apc_count, &iosb, buffer, 2, &offset, NULL ); - ok(status == STATUS_PENDING || status == STATUS_END_OF_FILE /* before Vista */, "expected STATUS_PENDING or STATUS_END_OF_FILE, got %#x\n", status); + ok(status == STATUS_PENDING || broken(status == STATUS_END_OF_FILE) /* before Vista */, + "expected STATUS_PENDING, got %#x\n", status); if (status == STATUS_PENDING) /* vista */ { WaitForSingleObject( event, 1000 ); @@ -4540,7 +4541,8 @@ static void test_read_write(void) ret = ReadFile(hfile, buf, sizeof(buf), &bytes, &ovl); ok(!ret, "ReadFile should fail\n"); ret = GetLastError(); - ok(ret == ERROR_IO_PENDING || ret == ERROR_HANDLE_EOF /* before Vista */, "expected ERROR_IO_PENDING or ERROR_HANDLE_EOF, got %d\n", ret); + ok(ret == ERROR_IO_PENDING || broken(ret == ERROR_HANDLE_EOF) /* before Vista */, + "expected ERROR_IO_PENDING, got %d\n", ret); ok(bytes == 0, "bytes %u\n", bytes); off = SetFilePointer(hfile, 0, NULL, FILE_CURRENT);

1 0

Paul Gofman : kernel32/tests: Mark ERROR_HANDLE_EOF result as broken for async file read.
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: wine Branch: master Commit: a7895485026079a57467f085f418a33dcfb94e89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7895485026079a57467f085… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Apr 20 02:06:01 2020 +0300 kernel32/tests: Mark ERROR_HANDLE_EOF result as broken for async file read. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 29620654bd..2e26e2ace8 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5418,7 +5418,7 @@ static void test_overlapped_read(void) err = GetLastError(); /* Win8+ return ERROR_IO_PENDING like stated in MSDN, while older ones * return ERROR_HANDLE_EOF right away. */ - ok(!ret && (err == ERROR_HANDLE_EOF || err == ERROR_IO_PENDING), + ok(!ret && (err == ERROR_IO_PENDING || broken(err == ERROR_HANDLE_EOF)), "Unexpected ReadFile result, ret %#x, GetLastError() %u.\n", ret, GetLastError()); if (err == ERROR_IO_PENDING) {

1 0

Serge Gautherie : ntdll: Reorder DECLSPEC_NORETURN on raise_status().
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: wine Branch: master Commit: 340bc136a733a769124287e1410737bc3738c2a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=340bc136a733a769124287e1… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Thu Apr 16 00:06:40 2020 +0200 ntdll: Reorder DECLSPEC_NORETURN on raise_status(). Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index eaed3cc1fc..b67bdf37a5 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -60,7 +60,7 @@ extern ULONG_PTR get_system_affinity_mask(void) DECLSPEC_HIDDEN; extern void wait_suspend( CONTEXT *context ) DECLSPEC_HIDDEN; extern NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, int first_chance, CONTEXT *context ) DECLSPEC_HIDDEN; extern LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) DECLSPEC_HIDDEN; -extern void raise_status( NTSTATUS status, EXCEPTION_RECORD *rec ) DECLSPEC_NORETURN DECLSPEC_HIDDEN; +extern void DECLSPEC_NORETURN raise_status( NTSTATUS status, EXCEPTION_RECORD *rec ) DECLSPEC_HIDDEN; extern NTSTATUS context_to_server( context_t *to, const CONTEXT *from ) DECLSPEC_HIDDEN; extern NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) DECLSPEC_HIDDEN; extern NTSTATUS set_thread_context( HANDLE handle, const context_t *context, BOOL *self ) DECLSPEC_HIDDEN;

1 0

Serge Gautherie : winegcc: Reorder DECLSPEC_NORETURN on error().
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: wine Branch: master Commit: 0939a3f7f23b8ed179e42df64e4ec5fde5b62658 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0939a3f7f23b8ed179e42df6… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Thu Apr 16 00:07:08 2020 +0200 winegcc: Reorder DECLSPEC_NORETURN on error(). Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winegcc/utils.h b/tools/winegcc/utils.h index 3d6b8f3665..cb4778fa09 100644 --- a/tools/winegcc/utils.h +++ b/tools/winegcc/utils.h @@ -52,7 +52,7 @@ enum target_platform PLATFORM_CYGWIN }; -void error(const char* s, ...) DECLSPEC_NORETURN; +void DECLSPEC_NORETURN error(const char* s, ...); void* xmalloc(size_t size); void* xrealloc(void* p, size_t size);

1 0

Alexandre Julliard : opengl32: Specify the exact commit when fetching Khronos files.
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: wine Branch: master Commit: 29839b7fd9e19b5624dd929ae16ba16d9f537f62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29839b7fd9e19b5624dd929a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 23 13:27:44 2020 +0200 opengl32: Specify the exact commit when fetching Khronos files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index f91796ee3a..b9f43d36ae 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -317,8 +317,11 @@ if ($version eq "1.0") { # # Fetch the registry files # --f "gl.xml" || system "wget https://raw.github.com/KhronosGroup/OpenGL-Registry/master/xml/gl.xml" || die "cannot download gl.xml"; --f "wgl.xml" || system "wget https://raw.github.com/KhronosGroup/OpenGL-Registry/master/xml/wgl.xml" || die "cannot download wgl.xml"; +my $url="https://raw.githubusercontent.com/KhronosGroup/OpenGL-Registry"; +my $commit="9929a7296ffdbd9c17125e1aa319cde78d1032e6"; + +-f "gl-$commit.xml" || system "wget", "-O", "gl-$commit.xml", "$url/$commit/xml/gl.xml" || die "cannot download gl.xml"; +-f "wgl-$commit.xml" || system "wget", "-O", "wgl-$commit.xml", "$url/$commit/xml/wgl.xml" || die "cannot download wgl.xml"; # @@ -559,8 +562,8 @@ sub parse_file($) } } -parse_file( "gl.xml" ); -parse_file( "wgl.xml" ); +parse_file( "gl-$commit.xml" ); +parse_file( "wgl-$commit.xml" ); parse_file( "winegl.xml" ); #

1 0

Henri Verbeet : wined3d: Drop the bind flag parameters to wined3d_adapter_ops.adapter_copy_bo_address().
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: wine Branch: master Commit: d1bc6843ba03ba0406b6846a14f3b16d77d45e48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1bc6843ba03ba0406b6846a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 23 02:22:54 2020 +0430 wined3d: Drop the bind flag parameters to wined3d_adapter_ops.adapter_copy_bo_address(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 3 +-- dlls/wined3d/adapter_vk.c | 23 +++++++++++++---------- dlls/wined3d/buffer.c | 3 +-- dlls/wined3d/directx.c | 3 +-- dlls/wined3d/view.c | 5 ++--- dlls/wined3d/wined3d_private.h | 9 +++------ 6 files changed, 21 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 230f76f28c..ba0026ba58 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4639,8 +4639,7 @@ static void adapter_gl_unmap_bo_address(struct wined3d_context *context, } static void adapter_gl_copy_bo_address(struct wined3d_context *context, - const struct wined3d_bo_address *dst, uint32_t dst_bind_flags, - const struct wined3d_bo_address *src, uint32_t src_bind_flags, size_t size) + const struct wined3d_bo_address *dst, const struct wined3d_bo_address *src, size_t size) { wined3d_context_gl_copy_bo_address(wined3d_context_gl(context), dst, src, size); } diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index c6c8927655..c718919a04 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -735,12 +735,12 @@ static void adapter_vk_unmap_bo_address(struct wined3d_context *context, } static void adapter_vk_copy_bo_address(struct wined3d_context *context, - const struct wined3d_bo_address *dst, uint32_t dst_bind_flags, - const struct wined3d_bo_address *src, uint32_t src_bind_flags, size_t size) + const struct wined3d_bo_address *dst, const struct wined3d_bo_address *src, size_t size) { struct wined3d_context_vk *context_vk = wined3d_context_vk(context); const struct wined3d_vk_info *vk_info = context_vk->vk_info; struct wined3d_bo_vk staging_bo, *src_bo, *dst_bo; + VkAccessFlags src_access_mask, dst_access_mask; VkBufferMemoryBarrier vk_barrier[2]; struct wined3d_bo_address staging; VkCommandBuffer vk_command_buffer; @@ -759,13 +759,16 @@ static void adapter_vk_copy_bo_address(struct wined3d_context *context, return; } + src_access_mask = vk_access_mask_from_buffer_usage(src_bo->usage); + dst_access_mask = vk_access_mask_from_buffer_usage(dst_bo->usage); + region.srcOffset = src_bo->buffer_offset + (uintptr_t)src->addr; region.dstOffset = dst_bo->buffer_offset + (uintptr_t)dst->addr; region.size = size; vk_barrier[0].sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; vk_barrier[0].pNext = NULL; - vk_barrier[0].srcAccessMask = vk_access_mask_from_bind_flags(src_bind_flags); + vk_barrier[0].srcAccessMask = src_access_mask; vk_barrier[0].dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT; vk_barrier[0].srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier[0].dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; @@ -775,7 +778,7 @@ static void adapter_vk_copy_bo_address(struct wined3d_context *context, vk_barrier[1].sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; vk_barrier[1].pNext = NULL; - vk_barrier[1].srcAccessMask = vk_access_mask_from_bind_flags(dst_bind_flags); + vk_barrier[1].srcAccessMask = dst_access_mask; vk_barrier[1].dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; vk_barrier[1].srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier[1].dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; @@ -789,10 +792,10 @@ static void adapter_vk_copy_bo_address(struct wined3d_context *context, VK_CALL(vkCmdCopyBuffer(vk_command_buffer, src_bo->vk_buffer, dst_bo->vk_buffer, 1, &region)); vk_barrier[0].srcAccessMask = VK_ACCESS_TRANSFER_READ_BIT; - vk_barrier[0].dstAccessMask = vk_access_mask_from_bind_flags(src_bind_flags); + vk_barrier[0].dstAccessMask = src_access_mask; vk_barrier[1].srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; - vk_barrier[1].dstAccessMask = vk_access_mask_from_bind_flags(dst_bind_flags); + vk_barrier[1].dstAccessMask = dst_access_mask; VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, 0, NULL, 2, vk_barrier, 0, NULL)); @@ -814,8 +817,8 @@ static void adapter_vk_copy_bo_address(struct wined3d_context *context, staging.buffer_object = (uintptr_t)&staging_bo; staging.addr = NULL; - adapter_vk_copy_bo_address(context, &staging, 0, src, src_bind_flags, size); - adapter_vk_copy_bo_address(context, dst, dst_bind_flags, &staging, 0, size); + adapter_vk_copy_bo_address(context, &staging, src, size); + adapter_vk_copy_bo_address(context, dst, &staging, size); wined3d_context_vk_destroy_bo(context_vk, &staging_bo); @@ -834,8 +837,8 @@ static void adapter_vk_copy_bo_address(struct wined3d_context *context, staging.buffer_object = (uintptr_t)&staging_bo; staging.addr = NULL; - adapter_vk_copy_bo_address(context, &staging, 0, src, src_bind_flags, size); - adapter_vk_copy_bo_address(context, dst, dst_bind_flags, &staging, 0, size); + adapter_vk_copy_bo_address(context, &staging, src, size); + adapter_vk_copy_bo_address(context, dst, &staging, size); wined3d_context_vk_destroy_bo(context_vk, &staging_bo); diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 719d4ae304..1444ac9b63 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1209,8 +1209,7 @@ void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_off src.addr += src_offset; context = context_acquire(dst_buffer->resource.device, NULL, 0); - wined3d_context_copy_bo_address(context, &dst, dst_buffer->resource.bind_flags, - &src, src_buffer->resource.bind_flags, size); + wined3d_context_copy_bo_address(context, &dst, &src, size); context_release(context); wined3d_buffer_invalidate_range(dst_buffer, ~dst_location, dst_offset, size); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c5f7eab4d1..5fe0856e51 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2426,8 +2426,7 @@ static void adapter_no3d_unmap_bo_address(struct wined3d_context *context, } static void adapter_no3d_copy_bo_address(struct wined3d_context *context, - const struct wined3d_bo_address *dst, uint32_t dst_bind_flags, - const struct wined3d_bo_address *src, uint32_t src_bind_flags, size_t size) + const struct wined3d_bo_address *dst, const struct wined3d_bo_address *src, size_t size) { if (dst->buffer_object) ERR("Unsupported dst buffer object %#lx.\n", dst->buffer_object); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 834eaa7102..093143c674 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1055,7 +1055,7 @@ void wined3d_unordered_access_view_set_counter(struct wined3d_unordered_access_v dst.buffer_object = view->counter_bo; dst.addr = NULL; - wined3d_context_copy_bo_address(context, &dst, WINED3D_BIND_UNORDERED_ACCESS, &src, 0, sizeof(uint32_t)); + wined3d_context_copy_bo_address(context, &dst, &src, sizeof(uint32_t)); context_release(context); } @@ -1075,8 +1075,7 @@ void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_ src.buffer_object = view->counter_bo; src.addr = NULL; - wined3d_context_copy_bo_address(context, &dst, buffer->resource.bind_flags, - &src, WINED3D_BIND_UNORDERED_ACCESS, sizeof(uint32_t)); + wined3d_context_copy_bo_address(context, &dst, &src, sizeof(uint32_t)); wined3d_buffer_invalidate_location(buffer, ~dst_location); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 687f6a3a9f..02418d8817 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2968,8 +2968,7 @@ struct wined3d_adapter_ops void (*adapter_unmap_bo_address)(struct wined3d_context *context, const struct wined3d_bo_address *data, unsigned int range_count, const struct wined3d_range *ranges); void (*adapter_copy_bo_address)(struct wined3d_context *context, - const struct wined3d_bo_address *dst, uint32_t dst_bind_flags, - const struct wined3d_bo_address *src, uint32_t src_bind_flags, size_t size); + const struct wined3d_bo_address *dst, const struct wined3d_bo_address *src, size_t size); HRESULT (*adapter_create_swapchain)(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain); void (*adapter_destroy_swapchain)(struct wined3d_swapchain *swapchain); @@ -5487,11 +5486,9 @@ static inline void wined3d_context_unmap_bo_address(struct wined3d_context *cont } static inline void wined3d_context_copy_bo_address(struct wined3d_context *context, - const struct wined3d_bo_address *dst, uint32_t dst_bind_flags, - const struct wined3d_bo_address *src, uint32_t src_bind_flags, size_t size) + const struct wined3d_bo_address *dst, const struct wined3d_bo_address *src, size_t size) { - context->device->adapter->adapter_ops->adapter_copy_bo_address(context, - dst, dst_bind_flags, src, src_bind_flags, size); + context->device->adapter->adapter_ops->adapter_copy_bo_address(context, dst, src, size); } static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_view *dsv,

1 0

Henri Verbeet : wined3d: Add a miscellaneous state template for the Vulkan adapter.
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: wine Branch: master Commit: 599a2992881e91801ba15fea340f5a40e853ba5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=599a2992881e91801ba15fea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 23 02:22:55 2020 +0430 wined3d: Add a miscellaneous state template for the Vulkan adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/adapter_vk.c | 172 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 172 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 3 +- 6 files changed, 349 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=599a2992881e91801ba1…

1 0