wine-commits April 2020

wine-commits@winehq.org

2 participants
1016 discussions

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

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

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

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

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

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

Jacek Caban : winbase.h: Unify MSVC interlocked functions declarations.
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: wine Branch: master Commit: 4b7b7a5f4c5c4659d210846266f475c13a4119d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b7b7a5f4c5c4659d2108462… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 23 01:35:34 2020 +0200 winbase.h: Unify MSVC interlocked functions declarations. And use intrinsic versions on x86. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 101 ++++++++++++++++++++++++++---------------------------- 1 file changed, 49 insertions(+), 52 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 2aefd0e043..1d8e32d6cb 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2904,7 +2904,55 @@ extern WCHAR * CDECL wine_get_dos_file_name( LPCSTR str ); /* Interlocked functions */ -#ifdef __i386__ +#ifdef _MSC_VER + +#pragma intrinsic(_InterlockedCompareExchange) +#pragma intrinsic(_InterlockedCompareExchange64) +#pragma intrinsic(_InterlockedExchange) +#pragma intrinsic(_InterlockedExchangeAdd) +#pragma intrinsic(_InterlockedIncrement) +#pragma intrinsic(_InterlockedDecrement) + +#define InterlockedCompareExchange _InterlockedCompareExchange +#define InterlockedCompareExchange64 _InterlockedCompareExchange64 +#define InterlockedExchange _InterlockedExchange +#define InterlockedExchangeAdd _InterlockedExchangeAdd +#define InterlockedIncrement _InterlockedIncrement +#define InterlockedDecrement _InterlockedDecrement + +long InterlockedCompareExchange(long volatile*,long,long); +long long InterlockedCompareExchange64(long long volatile*,long long,long long); +long InterlockedDecrement(long volatile*); +long InterlockedExchange(long volatile*,long); +long InterlockedExchangeAdd(long volatile*,long); +long InterlockedIncrement(long volatile*); + +#ifndef __i386__ + +#pragma intrinsic(_InterlockedCompareExchangePointer) +#pragma intrinsic(_InterlockedExchangePointer) + +#define InterlockedCompareExchangePointer _InterlockedCompareExchangePointer +#define InterlockedExchangePointer _InterlockedExchangePointer + +void *InterlockedCompareExchangePointer(void *volatile*,void*,void*); +void *InterlockedExchangePointer(void *volatile*,void*); + +#else + +static FORCEINLINE void *WINAPI InterlockedCompareExchangePointer( void *volatile *dest, void *xchg, void *compare ) +{ + return (void *)InterlockedCompareExchange( (long volatile*)dest, (long)xchg, (long)compare ); +} + +static FORCEINLINE void *WINAPI InterlockedExchangePointer( void *volatile *dest, void *val ) +{ + return (void *)InterlockedExchange( (long volatile*)dest, (long)val ); +} + +#endif + +#elif defined(__i386__) # if defined(__GNUC__) && !defined(_NTSYSTEM_) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 2))) static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) @@ -2963,57 +3011,6 @@ static FORCEINLINE PVOID WINAPI InterlockedExchangePointer( PVOID volatile *dest WINBASEAPI LONGLONG WINAPI InterlockedCompareExchange64(LONGLONG volatile*,LONGLONG,LONGLONG); -#elif defined(_MSC_VER) - -#pragma intrinsic(_InterlockedCompareExchange) -#pragma intrinsic(_InterlockedCompareExchangePointer) -#pragma intrinsic(_InterlockedCompareExchange64) -#pragma intrinsic(_InterlockedExchange) -#pragma intrinsic(_InterlockedExchangePointer) -#pragma intrinsic(_InterlockedExchangeAdd) -#pragma intrinsic(_InterlockedIncrement) -#pragma intrinsic(_InterlockedDecrement) - -static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare ) -{ - return _InterlockedCompareExchange( dest, xchg, compare ); -} - -static FORCEINLINE PVOID WINAPI InterlockedCompareExchangePointer( PVOID volatile *dest, PVOID xchg, PVOID compare ) -{ - return _InterlockedCompareExchangePointer( dest, xchg, compare ); -} - -static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) -{ - return _InterlockedCompareExchange64( dest, xchg, compare ); -} - -static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) -{ - return _InterlockedExchange( dest, val ); -} - -static FORCEINLINE PVOID WINAPI InterlockedExchangePointer( PVOID volatile *dest, PVOID val ) -{ - return _InterlockedExchangePointer( dest, val ); -} - -static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG incr ) -{ - return _InterlockedExchangeAdd( dest, incr ); -} - -static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) -{ - return _InterlockedIncrement( dest ); -} - -static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) -{ - return _InterlockedDecrement( dest ); -} - #elif defined(__GNUC__) static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, LONG xchg, LONG compare )

1 0

Zebediah Figura : qcap/tests: Add tests for file writer pin connection.
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: wine Branch: master Commit: a6e65dbcc640dbea8f4fd8231e5b50262dd16203 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6e65dbcc640dbea8f4fd823… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 22 21:14:09 2020 -0500 qcap/tests: Add tests for file writer pin connection. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/filewriter.c | 176 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 176 insertions(+) diff --git a/dlls/qcap/tests/filewriter.c b/dlls/qcap/tests/filewriter.c index f5ad897f29..cfc9e5d634 100644 --- a/dlls/qcap/tests/filewriter.c +++ b/dlls/qcap/tests/filewriter.c @@ -20,6 +20,7 @@ #define COBJMACROS #include "dshow.h" +#include "wine/strmbase.h" #include "wine/test.h" static IBaseFilter *create_file_writer(void) @@ -473,6 +474,180 @@ static void test_enum_media_types(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +struct testfilter +{ + struct strmbase_filter filter; + struct strmbase_source source; +}; + +static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) +{ + return CONTAINING_RECORD(iface, struct testfilter, filter); +} + +static struct strmbase_pin *testfilter_get_pin(struct strmbase_filter *iface, unsigned int index) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + if (!index) + return &filter->source.pin; + return NULL; +} + +static void testfilter_destroy(struct strmbase_filter *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + strmbase_source_cleanup(&filter->source); + strmbase_filter_cleanup(&filter->filter); +} + +static const struct strmbase_filter_ops testfilter_ops = +{ + .filter_get_pin = testfilter_get_pin, + .filter_destroy = testfilter_destroy, +}; + +static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, + IMemInputPin *peer, IMemAllocator **allocator) +{ + return S_OK; +} + +static const struct strmbase_source_ops testsource_ops = +{ + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideAllocator = testsource_DecideAllocator, +}; + +static void testfilter_init(struct testfilter *filter) +{ + static const GUID clsid = {0xabacab}; + strmbase_filter_init(&filter->filter, NULL, &clsid, &testfilter_ops); + strmbase_source_init(&filter->source, &filter->filter, L"", &testsource_ops); +} + +static void test_allocator(IMemInputPin *input, IMemAllocator *allocator) +{ + ALLOCATOR_PROPERTIES props, ret_props; + IMemAllocator *ret_allocator; + HRESULT hr; + + memset(&props, 0xcc, sizeof(props)); + hr = IMemInputPin_GetAllocatorRequirements(input, &props); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr == S_OK) + { + ok(!props.cBuffers, "Got %d buffers.\n", props.cBuffers); + ok(!props.cbBuffer, "Got size %d.\n", props.cbBuffer); + ok(props.cbAlign == 512, "Got alignment %d.\n", props.cbAlign); + ok(!props.cbPrefix, "Got prefix %d.\n", props.cbPrefix); + } + + hr = IMemInputPin_GetAllocator(input, &ret_allocator); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IMemInputPin_NotifyAllocator(input, NULL, TRUE); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + props.cBuffers = 1; + props.cbBuffer = 256; + props.cbAlign = 512; + props.cbPrefix = 0; + hr = IMemAllocator_SetProperties(allocator, &props, &ret_props); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemInputPin_NotifyAllocator(input, allocator, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemInputPin_GetAllocator(input, &ret_allocator); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + if (hr == S_OK) + IMemAllocator_Release(ret_allocator); +} + +static void test_connect_pin(void) +{ + AM_MEDIA_TYPE req_mt = + { + .majortype = {0x1111}, + .subtype = {0x2222}, + .formattype = {0x3333}, + }; + + IBaseFilter *filter = create_file_writer(); + struct testfilter source; + IMemAllocator *allocator; + IMemInputPin *meminput; + IFilterGraph2 *graph; + AM_MEDIA_TYPE mt; + IPin *pin, *peer; + HRESULT hr; + ULONG ref; + + set_filename(filter); + + testfilter_init(&source); + CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (void **)&graph); + hr = IFilterGraph2_AddFilter(graph, filter, L"filewriter"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, L"source"); + IBaseFilter_FindPin(filter, L"in", &pin); + IPin_QueryInterface(pin, &IID_IMemInputPin, (void **)&meminput); + + peer = (IPin *)0xdeadbeef; + hr = IPin_ConnectedTo(pin, &peer); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + ok(!peer, "Got peer %p.\n", peer); + + hr = IPin_ConnectionMediaType(pin, &mt); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + req_mt.majortype = MEDIATYPE_Stream; + hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ConnectedTo(pin, &peer); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(peer == &source.source.pin.IPin_iface, "Got peer %p.\n", peer); + IPin_Release(peer); + + hr = IPin_ConnectionMediaType(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!memcmp(&mt, &req_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n"); + + CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, + &IID_IMemAllocator, (void **)&allocator); + + test_allocator(meminput, allocator); + + hr = IFilterGraph2_Disconnect(graph, pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, pin); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(source.source.pin.peer == pin, "Got peer %p.\n", source.source.pin.peer); + IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); + + peer = (IPin *)0xdeadbeef; + hr = IPin_ConnectedTo(pin, &peer); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + ok(!peer, "Got peer %p.\n", peer); + + hr = IPin_ConnectionMediaType(pin, &mt); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IMemInputPin_Release(meminput); + IPin_Release(pin); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IMemAllocator_Release(allocator); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(&source.filter.IBaseFilter_iface); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(filewriter) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -484,6 +659,7 @@ START_TEST(filewriter) test_pin_info(); test_media_types(); test_enum_media_types(); + test_connect_pin(); CoUninitialize(); }

1 0

Zebediah Figura : qcap/filewriter: Implement file_writer_sink_query_accept().
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: wine Branch: master Commit: 98da3641d15e9de42420f599ad8172347a754699 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98da3641d15e9de42420f599… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 22 21:14:08 2020 -0500 qcap/filewriter: Implement file_writer_sink_query_accept(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/filewriter.c | 10 ++++ dlls/qcap/tests/filewriter.c | 126 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c index 656f72db1a..aa58226bd0 100644 --- a/dlls/qcap/filewriter.c +++ b/dlls/qcap/filewriter.c @@ -54,9 +54,19 @@ static HRESULT file_writer_sink_query_interface(struct strmbase_pin *iface, REFI return S_OK; } +static HRESULT file_writer_sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) +{ + struct file_writer *filter = impl_from_strmbase_pin(iface); + + if (filter->filename && !IsEqualGUID(&mt->majortype, &MEDIATYPE_Stream)) + return S_FALSE; + return S_OK; +} + static const struct strmbase_sink_ops sink_ops = { .base.pin_query_interface = file_writer_sink_query_interface, + .base.pin_query_accept = file_writer_sink_query_accept, }; static inline struct file_writer *impl_from_strmbase_filter(struct strmbase_filter *iface) diff --git a/dlls/qcap/tests/filewriter.c b/dlls/qcap/tests/filewriter.c index 5d8ce45e0d..f5ad897f29 100644 --- a/dlls/qcap/tests/filewriter.c +++ b/dlls/qcap/tests/filewriter.c @@ -31,6 +31,24 @@ static IBaseFilter *create_file_writer(void) return filter; } +static WCHAR *set_filename(IBaseFilter *filter) +{ + static WCHAR filename[MAX_PATH]; + IFileSinkFilter *filesink; + WCHAR path[MAX_PATH]; + HRESULT hr; + + GetTempPathW(ARRAY_SIZE(path), path); + GetTempFileNameW(path, L"qfw", 0, filename); + DeleteFileW(filename); + + IBaseFilter_QueryInterface(filter, &IID_IFileSinkFilter, (void **)&filesink); + hr = IFileSinkFilter_SetFileName(filesink, filename, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IFileSinkFilter_Release(filesink); + return filename; +} + static ULONG get_refcount(void *iface) { IUnknown *unknown = iface; @@ -349,6 +367,112 @@ static void test_pin_info(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_media_types(void) +{ + IBaseFilter *filter = create_file_writer(); + AM_MEDIA_TYPE mt = {{0}}, *pmt; + IEnumMediaTypes *enummt; + WCHAR *filename; + HRESULT hr; + ULONG ref; + IPin *pin; + + IBaseFilter_FindPin(filter, L"in", &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + mt.majortype = MEDIATYPE_Audio; + mt.subtype = MEDIASUBTYPE_PCM; + mt.formattype = FORMAT_WaveFormatEx; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + filename = set_filename(filter); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + + memset(&mt, 0, sizeof(AM_MEDIA_TYPE)); + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.majortype = MEDIATYPE_Video; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.majortype = MEDIATYPE_Audio; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.majortype = MEDIATYPE_Stream; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.subtype = MEDIASUBTYPE_PCM; + mt.formattype = FORMAT_WaveFormatEx; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(GetFileAttributesW(filename) == INVALID_FILE_ATTRIBUTES, "File should not exist.\n"); +} + +static void test_enum_media_types(void) +{ + IBaseFilter *filter = create_file_writer(); + IEnumMediaTypes *enum1, *enum2; + AM_MEDIA_TYPE *mts[2]; + ULONG ref, count; + HRESULT hr; + IPin *pin; + + IBaseFilter_FindPin(filter, L"in", &pin); + + hr = IPin_EnumMediaTypes(pin, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumMediaTypes_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum1, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enum2, 1, mts, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enum1); + IEnumMediaTypes_Release(enum2); + IPin_Release(pin); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(filewriter) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -358,6 +482,8 @@ START_TEST(filewriter) test_enum_pins(); test_find_pin(); test_pin_info(); + test_media_types(); + test_enum_media_types(); CoUninitialize(); }

1 0

Zebediah Figura : qcap/filewriter: Implement IFileSinkFilter::SetFileName().
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: wine Branch: master Commit: 329e0210fd6dcc8b167d64d9a055a94f981d5250 URL: https://source.winehq.org/git/wine.git/?a=commit;h=329e0210fd6dcc8b167d64d9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 22 21:14:07 2020 -0500 qcap/filewriter: Implement IFileSinkFilter::SetFileName(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/filewriter.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c index e56b5f68a4..656f72db1a 100644 --- a/dlls/qcap/filewriter.c +++ b/dlls/qcap/filewriter.c @@ -22,6 +22,7 @@ #include "dshow.h" #include "qcap_main.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(qcap); @@ -31,6 +32,8 @@ struct file_writer IFileSinkFilter IFileSinkFilter_iface; struct strmbase_sink sink; + + WCHAR *filename; }; static inline struct file_writer *impl_from_strmbase_pin(struct strmbase_pin *iface) @@ -87,6 +90,7 @@ static void file_writer_destroy(struct strmbase_filter *iface) { struct file_writer *filter = impl_from_strmbase_filter(iface); + heap_free(filter->filename); strmbase_sink_cleanup(&filter->sink); strmbase_filter_cleanup(&filter->filter); heap_free(filter); @@ -126,11 +130,21 @@ static HRESULT WINAPI filesinkfilter_SetFileName(IFileSinkFilter *iface, LPCOLESTR filename, const AM_MEDIA_TYPE *mt) { struct file_writer *filter = impl_from_IFileSinkFilter(iface); + WCHAR *new_filename; - FIXME("filter %p, filename %s, mt %p, stub!\n", filter, debugstr_w(filename), mt); + TRACE("filter %p, filename %s, mt %p, stub!\n", filter, debugstr_w(filename), mt); strmbase_dump_media_type(mt); - return E_NOTIMPL; + if (mt) + FIXME("Ignoring media type %p.\n", mt); + + if (!(new_filename = heap_alloc((strlenW(filename) + 1) * sizeof(WCHAR)))) + return E_OUTOFMEMORY; + strcpyW(new_filename, filename); + + heap_free(filter->filename); + filter->filename = new_filename; + return S_OK; } static HRESULT WINAPI filesinkfilter_GetCurFile(IFileSinkFilter *iface,

1 0

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 April 2020