October 2018 - Wine-Commits

Dmitry Timoshkov : kernel32: MoveFile(source, source) should succeed.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: 7edfcd63ada3206b62f4fcee7b65d7a165a0cd9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7edfcd63ada3206b62f4fcee… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sun Oct 14 10:44:37 2018 +0300 kernel32: MoveFile(source, source) should succeed. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 15 ++++++++++----- dlls/kernel32/tests/file.c | 2 +- dlls/msvcp120/tests/msvcp120.c | 2 +- dlls/msvcp140/tests/msvcp140.c | 2 +- programs/cmd/tests/test_builtins.cmd.exp | 4 ++-- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 48a3e33..33b2358 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1281,7 +1281,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, OBJECT_ATTRIBUTES attr; IO_STATUS_BLOCK io; NTSTATUS status; - HANDLE source_handle = 0, dest_handle; + HANDLE source_handle = 0, dest_handle = 0; ANSI_STRING source_unix, dest_unix; DWORD options; @@ -1341,18 +1341,22 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, status = NtOpenFile( &dest_handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, 0, options ); if (status == STATUS_SUCCESS) /* destination exists */ { - NtClose( dest_handle ); if (!(flag & MOVEFILE_REPLACE_EXISTING)) { - SetLastError( ERROR_ALREADY_EXISTS ); - RtlFreeUnicodeString( &nt_name ); - goto error; + if (!is_same_file( source_handle, dest_handle )) + { + SetLastError( ERROR_ALREADY_EXISTS ); + RtlFreeUnicodeString( &nt_name ); + goto error; + } } else if (info.FileAttributes & FILE_ATTRIBUTE_DIRECTORY) /* cannot replace directory */ { SetLastError( ERROR_ACCESS_DENIED ); goto error; } + + NtClose( dest_handle ); } else if (status != STATUS_OBJECT_NAME_NOT_FOUND) { @@ -1412,6 +1416,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, error: if (source_handle) NtClose( source_handle ); + if (dest_handle) NtClose( dest_handle ); RtlFreeAnsiString( &source_unix ); RtlFreeAnsiString( &dest_unix ); return FALSE; diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 433a2e5..87e722b 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1894,7 +1894,7 @@ static void test_MoveFileA(void) ok(ret != 0, "GetTempFileNameA error %d\n", GetLastError()); ret = MoveFileA(source, source); - todo_wine ok(ret, "MoveFileA: failed, error %d\n", GetLastError()); + ok(ret, "MoveFileA: failed, error %d\n", GetLastError()); ret = MoveFileA(source, dest); ok(!ret && GetLastError() == ERROR_ALREADY_EXISTS, diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 2e63555..ac38aa6 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -1529,7 +1529,7 @@ static void test_tr2_sys__Rename(void) CloseHandle(file); ret = p_tr2_sys__Rename("tr2_test_dir\\f1", "tr2_test_dir\\f1"); - todo_wine ok(ERROR_SUCCESS == ret, "test_tr2_sys__Rename(): expect: ERROR_SUCCESS, got %d\n", ret); + ok(ERROR_SUCCESS == ret, "test_tr2_sys__Rename(): expect: ERROR_SUCCESS, got %d\n", ret); for(i=0; i<ARRAY_SIZE(tests); i++) { errno = 0xdeadbeef; if(tests[i].val == ERROR_SUCCESS) { diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index a3f9211..870573e 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -1148,7 +1148,7 @@ static void test_Rename(void) CloseHandle(file); ret = p_Rename(f1W, f1W); - todo_wine ok(ERROR_SUCCESS == ret, "_Rename(): expect: ERROR_SUCCESS, got %d\n", ret); + ok(ERROR_SUCCESS == ret, "_Rename(): expect: ERROR_SUCCESS, got %d\n", ret); for(i=0; i<ARRAY_SIZE(tests); i++) { errno = 0xdeadbeef; if(tests[i].val == ERROR_SUCCESS) { diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 797a9cc..bb27c6d 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1313,8 +1313,8 @@ file move succeeded @todo_wine(a)bar@or_broken(a)baz read-only files are moveable file moved in subdirectory -(a)todo_wine@moving a file to itself is a no-op(a)or_broken@moving a file to itself should be a no-op! -(a)todo_wine@ErrorLevel: 0(a)or_broken@ErrorLevel: 1 +moving a file to itself is a no-op(a)or_broken@moving a file to itself should be a no-op! +ErrorLevel: 0(a)or_broken@ErrorLevel: 1 --- directory move simple directory move succeeded moving a directory to itself gives error; errlevel 1

1 0

Dmitry Timoshkov : kernel32/tests: Fix compilation with PSDK.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: 75d6c63a40f59aa1d631ad0fa39ef781e97b7232 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75d6c63a40f59aa1d631ad0f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sun Oct 14 10:44:30 2018 +0300 kernel32/tests: Fix compilation with PSDK. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index eb27d55..58ce74b 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -38,9 +38,7 @@ #include "winnls.h" #include "fileapi.h" -#ifdef WINE_NO_UNICODE_MACROS #undef DeleteFile /* needed for FILE_DISPOSITION_INFO */ -#endif static HANDLE (WINAPI *pFindFirstFileExA)(LPCSTR,FINDEX_INFO_LEVELS,LPVOID,FINDEX_SEARCH_OPS,LPVOID,DWORD); static BOOL (WINAPI *pReplaceFileA)(LPCSTR, LPCSTR, LPCSTR, DWORD, LPVOID, LPVOID); @@ -61,6 +59,8 @@ static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)(LPCWSTR, PUNICODE_STRING, PW static NTSTATUS (WINAPI *pRtlAnsiStringToUnicodeString)(PUNICODE_STRING, PCANSI_STRING, BOOLEAN); static BOOL (WINAPI *pSetFileInformationByHandle)(HANDLE, FILE_INFO_BY_HANDLE_CLASS, void*, DWORD); static BOOL (WINAPI *pGetQueuedCompletionStatusEx)(HANDLE, OVERLAPPED_ENTRY*, ULONG, ULONG*, DWORD, BOOL); +static void (WINAPI *pRtlInitAnsiString)(PANSI_STRING,PCSZ); +static void (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); static const char filename[] = "testfile.xxx"; static const char sillytext[] = @@ -91,6 +91,8 @@ static void InitFunctionPointers(void) pNtCreateFile = (void *)GetProcAddress(hntdll, "NtCreateFile"); pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); pRtlAnsiStringToUnicodeString = (void *)GetProcAddress(hntdll, "RtlAnsiStringToUnicodeString"); + pRtlInitAnsiString = (void *)GetProcAddress(hntdll, "RtlInitAnsiString"); + pRtlFreeUnicodeString = (void *)GetProcAddress(hntdll, "RtlFreeUnicodeString"); pFindFirstFileExA=(void*)GetProcAddress(hkernel32, "FindFirstFileExA"); pReplaceFileA=(void*)GetProcAddress(hkernel32, "ReplaceFileA"); @@ -270,7 +272,8 @@ static void get_nt_pathW( const char *name, UNICODE_STRING *nameW ) ANSI_STRING str; NTSTATUS status; BOOLEAN ret; - RtlInitAnsiString( &str, name ); + + pRtlInitAnsiString( &str, name ); status = pRtlAnsiStringToUnicodeString( &strW, &str, TRUE ); ok( !status, "RtlAnsiStringToUnicodeString failed with %08x\n", status ); @@ -278,7 +281,7 @@ static void get_nt_pathW( const char *name, UNICODE_STRING *nameW ) ret = pRtlDosPathNameToNtPathName_U( strW.Buffer, nameW, NULL, NULL ); ok( ret, "RtlDosPathNameToNtPathName_U failed\n" ); - RtlFreeUnicodeString( &strW ); + pRtlFreeUnicodeString( &strW ); } static void test__lcreat( void ) @@ -354,30 +357,30 @@ static void test__lcreat( void ) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - status = NtCreateFile( &file, GENERIC_READ | GENERIC_WRITE | DELETE, &attr, &io, NULL, 0, + status = pNtCreateFile( &file, GENERIC_READ | GENERIC_WRITE | DELETE, &attr, &io, NULL, 0, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_OPEN, FILE_DELETE_ON_CLOSE | FILE_NON_DIRECTORY_FILE, NULL, 0 ); ok( status == STATUS_ACCESS_DENIED, "expected STATUS_ACCESS_DENIED, got %08x\n", status ); ok( GetFileAttributesA( filename ) != INVALID_FILE_ATTRIBUTES, "file was deleted\n" ); - status = NtCreateFile( &file, DELETE, &attr, &io, NULL, 0, + status = pNtCreateFile( &file, DELETE, &attr, &io, NULL, 0, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_OPEN, FILE_DELETE_ON_CLOSE | FILE_NON_DIRECTORY_FILE, NULL, 0 ); ok( status == STATUS_CANNOT_DELETE, "expected STATUS_CANNOT_DELETE, got %08x\n", status ); - status = NtCreateFile( &file, DELETE, &attr, &io, NULL, 0, + status = pNtCreateFile( &file, DELETE, &attr, &io, NULL, 0, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_OPEN, FILE_DELETE_ON_CLOSE | FILE_DIRECTORY_FILE, NULL, 0 ); ok( status == STATUS_NOT_A_DIRECTORY, "expected STATUS_NOT_A_DIRECTORY, got %08x\n", status ); - status = NtCreateFile( &file, DELETE, &attr, &io, NULL, 0, + status = pNtCreateFile( &file, DELETE, &attr, &io, NULL, 0, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_OPEN_IF, FILE_DELETE_ON_CLOSE | FILE_NON_DIRECTORY_FILE, NULL, 0 ); todo_wine ok( status == STATUS_CANNOT_DELETE, "expected STATUS_CANNOT_DELETE, got %08x\n", status ); if (!status) CloseHandle( file ); - RtlFreeUnicodeString( &filenameW ); + pRtlFreeUnicodeString( &filenameW ); todo_wine ok( GetFileAttributesA( filename ) != INVALID_FILE_ATTRIBUTES, "file was deleted\n" ); @@ -4907,7 +4910,7 @@ static void test_SetFileInformationByHandle(void) { FILE_ATTRIBUTE_TAG_INFO fileattrinfo = { 0 }; FILE_REMOTE_PROTOCOL_INFO protinfo = { 0 }; - FILE_STANDARD_INFO stdinfo = { }; + FILE_STANDARD_INFO stdinfo = { {{0}},{{0}},0,FALSE,FALSE }; FILE_COMPRESSION_INFO compressinfo; FILE_DISPOSITION_INFO dispinfo; char tempFileName[MAX_PATH];

1 0

Piotr Caban : ole32/tests: Add standard marshaling data tests.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: b2b5f81861d9c610f0ae54c5dd237b2ac223724e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2b5f81861d9c610f0ae54c5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 11 19:11:55 2018 +0200 ole32/tests: Add standard marshaling data tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/marshal.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 4f4b2b0..39d9a55 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -73,6 +73,50 @@ static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID,REFIID,LPVOID); #define ok_zero_external_conn() do {if (with_external_conn) ok(!external_connections, "got %d external connections\n", external_connections);} while(0); #define ok_last_release_closes(b) do {if (with_external_conn) ok(last_release_closes == b, "got %d expected %d\n", last_release_closes, b);} while(0); +#define OBJREF_SIGNATURE (0x574f454d) +#define OBJREF_STANDARD (0x1) + +typedef struct tagDUALSTRINGARRAY { + unsigned short wNumEntries; + unsigned short wSecurityOffset; + unsigned short aStringArray[1]; +} DUALSTRINGARRAY; + +typedef UINT64 OXID; +typedef UINT64 OID; +typedef GUID IPID; + +typedef struct tagSTDOBJREF { + ULONG flags; + ULONG cPublicRefs; + OXID oxid; + OID oid; + IPID ipid; +} STDOBJREF; + +typedef struct tagOBJREF { + ULONG signature; + ULONG flags; + GUID iid; + union { + struct OR_STANDARD { + STDOBJREF std; + DUALSTRINGARRAY saResAddr; + } u_standard; + struct OR_HANDLER { + STDOBJREF std; + CLSID clsid; + DUALSTRINGARRAY saResAddr; + } u_handler; + struct OR_CUSTOM { + CLSID clsid; + ULONG cbExtension; + ULONG size; + byte *pData; + } u_custom; + } u_objref; +} OBJREF; + static const IID IID_IWineTest = { 0x5201163f, @@ -1310,6 +1354,9 @@ todo_wine static void test_CoGetStandardMarshal(void) { + DUALSTRINGARRAY *dualstringarr; + STDOBJREF *stdobjref; + OBJREF objref; IMarshal *marshal; DWORD size, read; IStream *stream; @@ -1343,6 +1390,27 @@ static void test_CoGetStandardMarshal(void) hr = IStream_Seek(stream, ullZero, STREAM_SEEK_SET, NULL); ok_ole_success(hr, IStream_Seek); + size = FIELD_OFFSET(OBJREF, u_objref.u_standard.saResAddr.aStringArray); + hr = IStream_Read(stream, &objref, size, &read); + ok_ole_success(hr, IStream_Read); + ok(read == size, "read = %d, expected %d\n", read, size); + ok(objref.signature == OBJREF_SIGNATURE, "objref.signature = %x\n", + objref.signature); + ok(objref.flags == OBJREF_STANDARD, "objref.flags = %x\n", objref.flags); + ok(IsEqualIID(&objref.iid, &IID_IUnknown), "objref.iid = %s\n", + wine_dbgstr_guid(&objref.iid)); + stdobjref = &objref.u_objref.u_standard.std; + ok(stdobjref->flags == 0, "stdobjref.flags = %d\n", stdobjref->flags); + ok(stdobjref->cPublicRefs == 5, "stdobjref.cPublicRefs = %d\n", + stdobjref->cPublicRefs); + dualstringarr = &objref.u_objref.u_standard.saResAddr; + ok(dualstringarr->wNumEntries == 0, "dualstringarr.wNumEntries = %d\n", + dualstringarr->wNumEntries); + ok(dualstringarr->wSecurityOffset == 0, "dualstringarr.wSecurityOffset = %d\n", + dualstringarr->wSecurityOffset); + + hr = IStream_Seek(stream, ullZero, STREAM_SEEK_SET, NULL); + ok_ole_success(hr, IStream_Seek); hr = IMarshal_UnmarshalInterface(marshal, stream, &IID_IUnknown, (void**)&unk); ok_ole_success(hr, IMarshal_UnmarshalInterface); IUnknown_Release(unk);

1 0

Piotr Caban : ole32/tests: Import uuid.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: f9686b69d0b458431b2901a630add7711a8385e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9686b69d0b458431b2901a6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 11 19:11:44 2018 +0200 ole32/tests: Import uuid. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/Makefile.in | 2 +- dlls/ole32/tests/compobj.c | 4 +--- dlls/ole32/tests/marshal.c | 4 ---- dlls/ole32/tests/moniker.c | 1 - dlls/ole32/tests/ole2.c | 6 ------ dlls/ole32/tests/ole_server.c | 3 --- dlls/ole32/tests/stg_prop.c | 6 ------ 7 files changed, 2 insertions(+), 24 deletions(-) diff --git a/dlls/ole32/tests/Makefile.in b/dlls/ole32/tests/Makefile.in index a011bb7..6bf57e3 100644 --- a/dlls/ole32/tests/Makefile.in +++ b/dlls/ole32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = ole32.dll -IMPORTS = oleaut32 ole32 user32 gdi32 advapi32 +IMPORTS = oleaut32 ole32 user32 uuid gdi32 advapi32 C_SRCS = \ clipboard.c \ diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 352cfbf..33a7585 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -27,7 +27,6 @@ #include "windef.h" #include "winbase.h" #define USE_COM_CONTEXT_DEF -#include "initguid.h" #include "objbase.h" #include "shlguid.h" #include "urlmon.h" /* for CLSID_FileProtocol */ @@ -37,6 +36,7 @@ #include "ctxtcall.h" #include "wine/test.h" +#include "initguid.h" #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -95,9 +95,7 @@ static const GUID IID_Testiface5 = { 0x62222222, 0x1234, 0x1234, { 0x12, 0x34, 0 static const GUID IID_Testiface6 = { 0x72222222, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; static const GUID IID_TestPS = { 0x66666666, 0x8888, 0x7777, { 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55 } }; -DEFINE_GUID(CLSID_InProcFreeMarshaler, 0x0000033a,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_testclsid, 0xacd014c7,0x9535,0x4fac,0x8b,0x53,0xa4,0x8c,0xa7,0xf4,0xd7,0x26); -DEFINE_GUID(CLSID_GlobalOptions, 0x0000034b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); static const WCHAR stdfont[] = {'S','t','d','F','o','n','t',0}; static const WCHAR wszNonExistent[] = {'N','o','n','E','x','i','s','t','e','n','t',0}; diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index c1d5394..c0af232 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -31,7 +31,6 @@ #include "olectl.h" #include "shlguid.h" #include "shobjidl.h" -#include "initguid.h" #include "wine/test.h" #include "wine/heap.h" @@ -60,9 +59,6 @@ expect_ ## func = called_ ## func = FALSE; \ }while(0) -DEFINE_GUID(CLSID_StdGlobalInterfaceTable,0x00000323,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -DEFINE_GUID(CLSID_ManualResetEvent, 0x0000032c,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); - static const GUID CLSID_WineTestPSFactoryBuffer = { 0x22222222, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; /* functions that are not present on all versions of Windows */ diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 7302ab0..5bcc136 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -29,7 +29,6 @@ #include "winbase.h" #include "objbase.h" #include "ocidl.h" -#include "initguid.h" #include "comcat.h" #include "olectl.h" diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 18cfb19..f0ff24b 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -33,12 +33,6 @@ #include "wine/test.h" -#include "initguid.h" - -DEFINE_GUID(CLSID_Picture_Metafile,0x315,0,0,0xc0,0,0,0,0,0,0,0x46); -DEFINE_GUID(CLSID_Picture_Dib,0x316,0,0,0xc0,0,0,0,0,0,0,0x46); -DEFINE_GUID(CLSID_Picture_EnhMetafile,0x319,0,0,0xc0,0,0,0,0,0,0,0x46); - #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) #define DEFINE_EXPECT(func) \ diff --git a/dlls/ole32/tests/ole_server.c b/dlls/ole32/tests/ole_server.c index f5c845d..2f5a3ca 100644 --- a/dlls/ole32/tests/ole_server.c +++ b/dlls/ole32/tests/ole_server.c @@ -30,9 +30,6 @@ #include <initguid.h> DEFINE_GUID(CLSID_WineTestObject, 0xdeadbeef,0xdead,0xbeef,0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef); -#ifndef CLSID_IdentityUnmarshal -DEFINE_GUID(CLSID_IdentityUnmarshal,0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); -#endif DEFINE_GUID(CLSID_UnknownUnmarshal,0x4c1e39e1,0xe3e3,0x4296,0xaa,0x86,0xec,0x93,0x8d,0x89,0x6e,0x92); struct winetest_info diff --git a/dlls/ole32/tests/stg_prop.c b/dlls/ole32/tests/stg_prop.c index c6d7d3e..24ae03e 100644 --- a/dlls/ole32/tests/stg_prop.c +++ b/dlls/ole32/tests/stg_prop.c @@ -19,12 +19,6 @@ #define COBJMACROS #include "objbase.h" #include "wine/test.h" -#include "initguid.h" - -DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); -DEFINE_GUID(FMTID_SummaryInformation,0xF29F85E0,0x4FF9,0x1068,0xAB,0x91,0x08,0x00,0x2B,0x27,0xB3,0xD9); -DEFINE_GUID(FMTID_DocSummaryInformation,0xD5CDD502,0x2E9C,0x101B,0x93,0x97,0x08,0x00,0x2B,0x2C,0xF9,0xAE); -DEFINE_GUID(FMTID_UserDefinedProperties,0xD5CDD505,0x2E9C,0x101B,0x93,0x97,0x08,0x00,0x2B,0x2C,0xF9,0xAE); #ifndef PID_BEHAVIOR #define PID_BEHAVIOR 0x80000003

1 0

Piotr Caban : ole32: Use CLSID_StdMarshal in standard marshaler.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: 862ea5074a8688a68ed8e912d4729e7d89892926 URL: https://source.winehq.org/git/wine.git/?a=commit;h=862ea5074a8688a68ed8e912… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 11 19:11:30 2018 +0200 ole32: Use CLSID_StdMarshal in standard marshaler. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ftmarshal.c | 2 +- dlls/ole32/marshal.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/ftmarshal.c b/dlls/ole32/ftmarshal.c index 3eb7f87..c36f5f6 100644 --- a/dlls/ole32/ftmarshal.c +++ b/dlls/ole32/ftmarshal.c @@ -144,7 +144,7 @@ FTMarshalImpl_GetUnmarshalClass (LPMARSHAL iface, REFIID riid, void *pv, DWORD d if (dwDestContext == MSHCTX_INPROC || dwDestContext == MSHCTX_CROSSCTX) *pCid = CLSID_InProcFreeMarshaler; else - *pCid = CLSID_DfMarshal; + *pCid = CLSID_StdMarshal; return S_OK; } diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 43b9af7..d8cfffb 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -40,8 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -extern const CLSID CLSID_DfMarshal; - /* number of refs given out for normal marshaling */ #define NORMALEXTREFS 5 @@ -386,7 +384,7 @@ static HRESULT WINAPI Proxy_GetUnmarshalClass( IMarshal *iface, REFIID riid, void* pv, DWORD dwDestContext, void* pvDestContext, DWORD mshlflags, CLSID* pCid) { - *pCid = CLSID_DfMarshal; + *pCid = CLSID_StdMarshal; return S_OK; } @@ -1270,7 +1268,7 @@ StdMarshalImpl_GetUnmarshalClass( IMarshal *iface, REFIID riid, void* pv, DWORD dwDestContext, void* pvDestContext, DWORD mshlflags, CLSID* pCid) { - *pCid = CLSID_DfMarshal; + *pCid = CLSID_StdMarshal; return S_OK; } @@ -1730,7 +1728,7 @@ HRESULT WINAPI CoGetMarshalSizeMax(ULONG *pulSize, REFIID riid, IUnknown *pUnk, hr = IMarshal_GetMarshalSizeMax(pMarshal, riid, pUnk, dwDestContext, pvDestContext, mshlFlags, pulSize); - if (IsEqualCLSID(&marshaler_clsid, &CLSID_DfMarshal)) + if (IsEqualCLSID(&marshaler_clsid, &CLSID_StdMarshal)) /* add on the size of the common header */ *pulSize += FIELD_OFFSET(OBJREF, u_objref); else @@ -1824,7 +1822,7 @@ HRESULT WINAPI CoMarshalInterface(IStream *pStream, REFIID riid, IUnknown *pUnk, } /* FIXME: implement handler marshaling too */ - if (IsEqualCLSID(&marshaler_clsid, &CLSID_DfMarshal)) + if (IsEqualCLSID(&marshaler_clsid, &CLSID_StdMarshal)) { TRACE("Using standard marshaling\n"); objref.flags = OBJREF_STANDARD;

1 0

Nikolay Sivov : comctl32/listview: Skip earlier when creating iterator for empty lists.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: 39c9fe1d37e65b313c3dd5ad8a0d50e373ff17fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=39c9fe1d37e65b313c3dd5ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 15 12:39:00 2018 +0300 comctl32/listview: Skip earlier when creating iterator for empty lists. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 95d619a..6b32167 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1351,11 +1351,14 @@ static inline BOOL iterator_rangesitems(ITERATOR* i, RANGES ranges) static BOOL iterator_frameditems_absolute(ITERATOR* i, const LISTVIEW_INFO* infoPtr, const RECT *frame) { RECT rcItem, rcTemp; - + + TRACE("(frame=%s)\n", wine_dbgstr_rect(frame)); + /* in case we fail, we want to return an empty iterator */ if (!iterator_empty(i)) return FALSE; - TRACE("(frame=%s)\n", wine_dbgstr_rect(frame)); + if (infoPtr->nItemCount == 0) + return TRUE; if (infoPtr->uView == LV_VIEW_ICON || infoPtr->uView == LV_VIEW_SMALLICON) {

1 0

Nikolay Sivov : comctl32/tests: Remove remaining traces in ListView tests.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: 7a54ff771106fb2e15adc3d45bf572d430f8d7ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a54ff771106fb2e15adc3d4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 15 12:39:03 2018 +0300 comctl32/tests: Remove remaining traces in ListView tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 5c2b3b7..48612db 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -525,7 +525,6 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP /* always accept new item text */ NMLVDISPINFOA *di = (NMLVDISPINFOA*)lParam; g_editbox_disp_info = *di; - trace("LVN_ENDLABELEDIT: text=%s\n", di->item.pszText ? di->item.pszText : "(null)"); /* edit control still available from this notification */ edit = (HWND)SendMessageA(((NMHDR*)lParam)->hwndFrom, LVM_GETEDITCONTROL, 0, 0); @@ -537,15 +536,6 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP return TRUE; } - case LVN_BEGINSCROLL: - case LVN_ENDSCROLL: - { - NMLVSCROLL *pScroll = (NMLVSCROLL*)lParam; - - trace("LVN_%sSCROLL: (%d,%d)\n", pScroll->hdr.code == LVN_BEGINSCROLL ? - "BEGIN" : "END", pScroll->dx, pScroll->dy); - } - break; case LVN_ITEMCHANGING: { NMLISTVIEW *nmlv = (NMLISTVIEW*)lParam;

1 0

Zebediah Figura : rpcrt4: Discriminants can't be int3264.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: 36592505ca45fc31c6bc845df10a6a8f8343de59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36592505ca45fc31c6bc845d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 13 17:46:42 2018 -0500 rpcrt4: Discriminants can't be int3264. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_marshall.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 52e2716..58f0108 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2762,8 +2762,6 @@ static ULONG EmbeddedComplexSize(MIDL_STUB_MESSAGE *pStubMsg, case FC_LONG: case FC_ULONG: case FC_ENUM32: - case FC_INT3264: - case FC_UINT3264: return sizeof(ULONG); case FC_FLOAT: return sizeof(float); @@ -5642,9 +5640,6 @@ static ULONG get_discriminant(unsigned char fc, const unsigned char *pMemory) case FC_ULONG: case FC_ENUM32: return *(const ULONG *)pMemory; - case FC_INT3264: - case FC_UINT3264: - return *(const ULONG_PTR *)pMemory; default: FIXME("Unhandled base type: 0x%02x\n", fc); return 0;

1 0

Akihiro Sagawa : gdi32: Fix negative width/ height handling in stretch bitblt family.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: 566b92320cef43d5938f955e7112bae90a676f1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=566b92320cef43d5938f955e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Oct 13 22:31:00 2018 +0900 gdi32: Fix negative width/height handling in stretch bitblt family. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 26 ++++++++++++++------------ dlls/gdi32/tests/bitmap.c | 3 +-- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index c8d67cb..6f5af64 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -57,12 +57,13 @@ BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_coords * { /* map source rectangle into destination coordinates */ rect = src->visrect; - offset_rect( &rect, -min( src->x, src->x + src->width + 1), - -min( src->y, src->y + src->height + 1) ); - rect.left = dst->x + rect.left * dst->width / abs(src->width); - rect.top = dst->y + rect.top * dst->height / abs(src->height); - rect.right = dst->x + rect.right * dst->width / abs(src->width); - rect.bottom = dst->y + rect.bottom * dst->height / abs(src->height); + offset_rect( &rect, + -src->x - (src->width < 0 ? 1 : 0), + -src->y - (src->height < 0 ? 1 : 0)); + rect.left = dst->x + rect.left * dst->width / src->width; + rect.top = dst->y + rect.top * dst->height / src->height; + rect.right = dst->x + rect.right * dst->width / src->width; + rect.bottom = dst->y + rect.bottom * dst->height / src->height; order_rect( &rect ); /* avoid rounding errors */ @@ -74,12 +75,13 @@ BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_coords * /* map destination rectangle back to source coordinates */ rect = dst->visrect; - offset_rect( &rect, -min( dst->x, dst->x + dst->width + 1), - -min( dst->y, dst->y + dst->height + 1) ); - rect.left = src->x + rect.left * src->width / abs(dst->width); - rect.top = src->y + rect.top * src->height / abs(dst->height); - rect.right = src->x + rect.right * src->width / abs(dst->width); - rect.bottom = src->y + rect.bottom * src->height / abs(dst->height); + offset_rect( &rect, + -dst->x - (dst->width < 0 ? 1 : 0), + -dst->y - (dst->height < 0 ? 1 : 0)); + rect.left = src->x + rect.left * src->width / dst->width; + rect.top = src->y + rect.top * src->height / dst->height; + rect.right = src->x + rect.right * src->width / dst->width; + rect.bottom = src->y + rect.bottom * src->height / dst->height; order_rect( &rect ); /* avoid rounding errors */ diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index d8a6fb0..a902edc 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -3256,7 +3256,7 @@ static void test_StretchBlt(void) memset( expected, 0, get_dib_image_size( &biDst ) ); expected[17] = 0x76543210, expected[18] = 0xfedcba98; expected[32] = 0x0000cccc, expected[33] = 0x0000f0f0, expected[34] = 0x0000ff00; - todo_wine check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 2, 2, -8, -8, 0, 0, 8, 8, expected, __LINE__); /* the source rectangle doesn't fit in the device area */ @@ -3701,7 +3701,6 @@ static void test_GdiAlphaBlend(void) SetViewportExtEx(hdcDst, -1, -1, NULL); SetLastError(0xdeadbeef); ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, -1, 50, 50, blend); - todo_wine ok( ret, "GdiAlphaBlend failed err %u\n", GetLastError() ); SetLastError(0xdeadbeef); ret = pGdiAlphaBlend(hdcDst, -20, -20, 20, 20, hdcSrc, 0, -1, 50, 50, blend);

1 0

Akihiro Sagawa : gdi32/tests: Add more stretch bitblt tests.
by Alexandre Julliard Oct. 15, 2018

Oct. 15, 2018

Module: wine Branch: master Commit: 71c9a8f3cae265ff48b440e976109f602a4f1181 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71c9a8f3cae265ff48b440e9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Oct 13 22:30:58 2018 +0900 gdi32/tests: Add more stretch bitblt tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/bitmap.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 4748691..d8a6fb0 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -3252,6 +3252,26 @@ static void test_StretchBlt(void) 0, 0, 2, 2, 0, 0, 4, 1, expected, __LINE__); SetMapMode( hdcDst, MM_TEXT ); + /* the destination rectangle doesn't fit in the device area */ + memset( expected, 0, get_dib_image_size( &biDst ) ); + expected[17] = 0x76543210, expected[18] = 0xfedcba98; + expected[32] = 0x0000cccc, expected[33] = 0x0000f0f0, expected[34] = 0x0000ff00; + todo_wine check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 2, 2, -8, -8, 0, 0, 8, 8, expected, __LINE__); + + /* the source rectangle doesn't fit in the device area */ + memset( expected, 0, get_dib_image_size( &biDst ) ); + expected[102] = 0x76543210, expected[103] = 0xfedcba98; + expected[117] = 0x0000cccc, expected[118] = 0x0000f0f0, expected[119] = 0x0000ff00; + todo_wine check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 8, 8, 2, 2, -8, -8, expected, __LINE__); + + memset( expected, 0, get_dib_image_size( &biDst ) ); + expected[85] = 0x76543210, expected[86] = 0xfedcba98; + expected[99] = 0x0000aaaa, expected[100] = 0x0000cccc, expected[101] = 0x0000f0f0, expected[102] = 0x0000ff00; + todo_wine check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 8, 8, -18, -18, 0, 0, 18, 18, expected, __LINE__); + SelectObject(hdcDst, oldDst); DeleteObject(bmpDst); @@ -3573,6 +3593,12 @@ static void test_StretchDIBits(void) -4, -4, 4, 4, 0, 0, 4, 4, expected, __LINE__); ok( ret == 2, "got ret %d\n", ret ); + expected[0] = 0x00000000, expected[1] = 0x00000000; + expected[2] = 0xFEEDFACE, expected[3] = 0x00000000; + todo_wine ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 1, 1, -2, -2, 1, 1, 2, 2, expected, __LINE__); + ok( ret == 2, "got ret %d\n", ret ); + SelectObject(hdcDst, oldDst); DeleteObject(bmpDst);

1 0