November 2018 - Wine-devel - list.winehq.org

[PATCH 2/4] kernel32: Reimplement RemoveDirectory() by setting a delete disposition.
by Dmitry Timoshkov 09 Nov '18

09 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/path.c | 17 ++++++++--------- dlls/ntdll/tests/file.c | 8 +++++--- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 41f0d34aa4..b6faa6e0bf 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1696,11 +1696,10 @@ BOOL WINAPI RemoveDirectoryW( LPCWSTR path ) { OBJECT_ATTRIBUTES attr; UNICODE_STRING nt_name; - ANSI_STRING unix_name; IO_STATUS_BLOCK io; NTSTATUS status; HANDLE handle; - BOOL ret = FALSE; + FILE_DISPOSITION_INFORMATION fdi; TRACE( "%s\n", debugstr_w(path) ); @@ -1726,19 +1725,19 @@ BOOL WINAPI RemoveDirectoryW( LPCWSTR path ) return FALSE; } - status = wine_nt_to_unix_file_name( &nt_name, &unix_name, FILE_OPEN, FALSE ); RtlFreeUnicodeString( &nt_name ); + + fdi.DoDeleteFile = TRUE; + status = NtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation); + + NtClose( handle ); + if (status != STATUS_SUCCESS) { SetLastError( RtlNtStatusToDosError(status) ); - NtClose( handle ); return FALSE; } - - if (!(ret = (rmdir( unix_name.Buffer ) != -1))) FILE_SetDosError(); - RtlFreeAnsiString( &unix_name ); - NtClose( handle ); - return ret; + return TRUE; } diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 56a438b973..7a905526b3 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2935,16 +2935,18 @@ todo_wine fileDeleted = RemoveDirectoryA( buffer ); ok( fileDeleted, "Directory should have been deleted\n" ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; -todo_wine ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); res = nt_get_file_attrs( buffer, &fdi2 ); todo_wine ok( res == STATUS_DELETE_PENDING, "got %#x\n", res ); /* can't open the deleted directory */ handle2 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); +todo_wine ok( handle2 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); +if (handle2 != INVALID_HANDLE_VALUE) + CloseHandle( handle2 ); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( fileDeleted, "Directory should have been deleted\n" ); @@ -2967,10 +2969,10 @@ todo_wine handle3 = CreateFileA(buffer, DELETE, FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); todo_wine ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -if (handle3 != INVALID_HANDLE_VALUE) - CloseHandle( handle3 ); todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got %u\n", GetLastError()); +if (handle3 != INVALID_HANDLE_VALUE) + CloseHandle( handle3 ); /* can't open the deleted directory (wrong sharing mode) */ handle3 = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); ok( handle3 == INVALID_HANDLE_VALUE, "CreateFile should fail\n" ); -- 2.17.1

2 1

Looking at the ReactOS source
by Gijs Vermeulen 09 Nov '18

09 Nov '18

Hi everyone, Is it allowed to look at the ReactOS source for function definitions, for example? If so, in what ways is it allowed to use/look at the ReactOS source? I tried to find an answer on the wiki, but didn't find one. Kind regards, Gijs

5 5

[PATCH] appwiz.cpl: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 09 Nov '18

09 Nov '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 4e874671f2..c34101f3d8 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -636,14 +636,14 @@ static void append_url_params( WCHAR *url ) DWORD len = strlenW(url); memcpy(url+len, arch_formatW, sizeof(arch_formatW)); - len += sizeof(arch_formatW)/sizeof(WCHAR); + len += ARRAY_SIZE(arch_formatW); len += MultiByteToWideChar(CP_ACP, 0, ARCH_STRING, sizeof(ARCH_STRING), url+len, size/sizeof(WCHAR)-len)-1; memcpy(url+len, v_formatW, sizeof(v_formatW)); - len += sizeof(v_formatW)/sizeof(WCHAR); + len += ARRAY_SIZE(v_formatW); len += MultiByteToWideChar(CP_ACP, 0, addon->version, -1, url+len, size/sizeof(WCHAR)-len)-1; memcpy(url+len, winevW, sizeof(winevW)); - len += sizeof(winevW)/sizeof(WCHAR); + len += ARRAY_SIZE(winevW); MultiByteToWideChar(CP_ACP, 0, PACKAGE_VERSION, -1, url+len, size/sizeof(WCHAR)-len); } @@ -717,9 +717,9 @@ static void run_winebrowser(const WCHAR *url) url_len = strlenW(url); - len = GetSystemDirectoryW(app, MAX_PATH-sizeof(winebrowserW)/sizeof(WCHAR)); + len = GetSystemDirectoryW(app, MAX_PATH - ARRAY_SIZE(winebrowserW)); memcpy(app+len, winebrowserW, sizeof(winebrowserW)); - len += sizeof(winebrowserW)/sizeof(WCHAR) -1; + len += ARRAY_SIZE(winebrowserW) - 1; args = heap_alloc((len+1+url_len)*sizeof(WCHAR)); if(!args) -- 2.14.5

1 0

[PATCH] d2d1: Implement GetMaximumBitmapSize().
by Nikolay Sivov 09 Nov '18

09 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- For software devices returned values are much higher ranging from 8 * 1024 * 1024 to twice as much. On actual hardware I get 16384 with our tests, which is d3d11 limit. I think it's better to keep d3d10 limit for now, until we switch to using d3d11 API. dlls/d2d1/device.c | 4 ++-- dlls/d2d1/tests/d2d1.c | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 0e96224ec3..7c398962d6 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1720,9 +1720,9 @@ static D2D1_SIZE_U * STDMETHODCALLTYPE d2d_device_context_GetPixelSize(ID2D1Devi static UINT32 STDMETHODCALLTYPE d2d_device_context_GetMaximumBitmapSize(ID2D1DeviceContext *iface) { - FIXME("iface %p stub!\n", iface); + TRACE("iface %p.\n", iface); - return 0; + return D3D10_REQ_TEXTURE2D_U_OR_V_DIMENSION; } static BOOL STDMETHODCALLTYPE d2d_device_context_IsSupported(ID2D1DeviceContext *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index b7d3bfa09c..023ea18298 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4979,6 +4979,7 @@ static void test_dc_target(void) ID2D1RenderTarget *rt3; ID2D1Factory *factory; ID3D10Device1 *device; + UINT32 bitmap_size; FLOAT dpi_x, dpi_y; D2D1_COLOR_F color; D2D1_SIZE_U sizeu; @@ -5186,6 +5187,9 @@ todo_wine todo_wine ok(clr == RGB(0, 0, 255), "Unexpected color 0x%08x.\n", clr); + bitmap_size = ID2D1DCRenderTarget_GetMaximumBitmapSize(rt); + ok(bitmap_size >= D3D10_REQ_TEXTURE2D_U_OR_V_DIMENSION, "Unexpected maximum bitmap size %u.\n", bitmap_size); + DeleteDC(hdc); DeleteDC(hdc2); ID2D1DCRenderTarget_Release(rt); @@ -5201,6 +5205,7 @@ static void test_hwnd_target(void) ID2D1RenderTarget *rt3; ID2D1Factory *factory; ID3D10Device1 *device; + UINT32 bitmap_size; D2D1_SIZE_U size; HRESULT hr; @@ -5256,6 +5261,9 @@ static void test_hwnd_target(void) hr = ID2D1HwndRenderTarget_Resize(rt, &size); ok(SUCCEEDED(hr), "Failed to resize render target, hr %#x.\n", hr); + bitmap_size = ID2D1HwndRenderTarget_GetMaximumBitmapSize(rt); + ok(bitmap_size >= D3D10_REQ_TEXTURE2D_U_OR_V_DIMENSION, "Unexpected maximum bitmap size %u.\n", bitmap_size); + ID2D1HwndRenderTarget_Release(rt); DestroyWindow(hwnd_rt_desc.hwnd); @@ -5287,6 +5295,7 @@ static void test_compatible_target_size_(unsigned int line, ID2D1RenderTarget *r D2D1_SIZE_U pixel_size, expected_size; ID2D1BitmapRenderTarget *bitmap_rt; ID2D1DeviceContext *context; + UINT32 bitmap_size; unsigned int i; HRESULT hr; @@ -5352,6 +5361,9 @@ static void test_compatible_target_size_(unsigned int line, ID2D1RenderTarget *r ID2D1DeviceContext_Release(context); } + bitmap_size = ID2D1BitmapRenderTarget_GetMaximumBitmapSize(bitmap_rt); + ok(bitmap_size >= D3D10_REQ_TEXTURE2D_U_OR_V_DIMENSION, "Unexpected maximum bitmap size %u.\n", bitmap_size); + ID2D1BitmapRenderTarget_Release(bitmap_rt); } @@ -7342,6 +7354,7 @@ static void test_device_context(void) ID2D1RenderTarget *rt; ID2D1Bitmap1 *bitmap; ID2D1Image *target; + UINT32 bitmap_size; HWND window; HRESULT hr; RECT rect; @@ -7522,6 +7535,9 @@ todo_wine ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); ok(bitmap == NULL, "Unexpected target instance.\n"); + bitmap_size = ID2D1DeviceContext_GetMaximumBitmapSize(device_context); + ok(bitmap_size >= D3D10_REQ_TEXTURE2D_U_OR_V_DIMENSION, "Unexpected maximum bitmap size %u.\n", bitmap_size); + ID2D1DeviceContext_Release(device_context); ID2D1DCRenderTarget_Release(dc_rt); DeleteDC(hdc); -- 2.19.1

1 0

[PATCH] winhttp/tests: Avoid an invalid write in asynchronous mode (Valgrind).
by Hans Leidekker 09 Nov '18

09 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/tests/notification.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 086f2e7935..510d9e7a3e 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -920,7 +920,7 @@ static const struct notification read_allow_close_test[] = static void _read_request_data(struct test_request *req, struct info *info, const char *expected_data, BOOL closing_connection, unsigned line) { char buffer[1024]; - DWORD read, len; + DWORD len; BOOL ret; if (closing_connection) @@ -937,8 +937,7 @@ static void _read_request_data(struct test_request *req, struct info *info, cons setup_test( info, winhttp_read_data, line ); memset(buffer, '?', sizeof(buffer)); - read = 0xdeadbeef; - ret = WinHttpReadData( req->request, buffer, sizeof(buffer), &read ); + ret = WinHttpReadData( req->request, buffer, sizeof(buffer), NULL ); ok(ret, "failed to read data %u\n", GetLastError()); WaitForSingleObject( info->wait, INFINITE ); -- 2.11.0

1 0

[PATCH] rsaenh: Fix a memory leak (Valgrind).
by Hans Leidekker 09 Nov '18

09 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/rsaenh/rsaenh.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index bc10fc731f..c22b3dcaf1 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -3628,17 +3628,18 @@ BOOL WINAPI RSAENH_CPGetHashParam(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwPa &pCryptHash->tpPRFParams.blobSeed, pbData, *pdwDataLen); } - if ( pbData == NULL ) { - *pdwDataLen = pCryptHash->dwHashSize; - return TRUE; - } - - if (pbData && (pCryptHash->dwState != RSAENH_HASHSTATE_FINISHED)) + if (pCryptHash->dwState != RSAENH_HASHSTATE_FINISHED) { finalize_hash(pCryptHash); pCryptHash->dwState = RSAENH_HASHSTATE_FINISHED; } + if (!pbData) + { + *pdwDataLen = pCryptHash->dwHashSize; + return TRUE; + } + return copy_param(pbData, pdwDataLen, pCryptHash->abHashValue, pCryptHash->dwHashSize); -- 2.11.0

1 0

[PATCH] msi: Support substorage transforms in MsiDatabaseApplyTransform.
by Hans Leidekker 09 Nov '18

09 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40206 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/msiquery.c | 68 +++++++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 701a347a8c..db5660a647 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -824,50 +824,55 @@ MSIHANDLE WINAPI MsiGetLastErrorRecord( void ) return 0; } -UINT MSI_DatabaseApplyTransformW( MSIDATABASE *db, - LPCWSTR szTransformFile, int iErrorCond ) +UINT MSI_DatabaseApplyTransformW( MSIDATABASE *db, const WCHAR *transform, int error_cond ) { - HRESULT r; + HRESULT hr; UINT ret = ERROR_FUNCTION_FAILED; - IStorage *stg = NULL; + IStorage *stg; STATSTG stat; - TRACE("%p %s %d\n", db, debugstr_w(szTransformFile), iErrorCond); + TRACE( "%p %s %08x\n", db, debugstr_w(transform), error_cond ); - r = StgOpenStorage( szTransformFile, NULL, - STGM_DIRECT|STGM_READ|STGM_SHARE_DENY_WRITE, NULL, 0, &stg); - if ( FAILED(r) ) + if (*transform == ':') { - WARN("failed to open transform 0x%08x\n", r); - return ret; + hr = IStorage_OpenStorage( db->storage, transform + 1, NULL, STGM_SHARE_EXCLUSIVE, NULL, 0, &stg ); + if (FAILED( hr )) + { + WARN( "failed to open substorage transform 0x%08x\n", hr ); + return ERROR_FUNCTION_FAILED; + } + } + else + { + hr = StgOpenStorage( transform, NULL, STGM_DIRECT|STGM_READ|STGM_SHARE_DENY_WRITE, NULL, 0, &stg ); + if (FAILED( hr )) + { + WARN( "failed to open file transform 0x%08x\n", hr ); + return ERROR_FUNCTION_FAILED; + } } - r = IStorage_Stat( stg, &stat, STATFLAG_NONAME ); - if ( FAILED( r ) ) - goto end; - - if ( !IsEqualGUID( &stat.clsid, &CLSID_MsiTransform ) ) - goto end; - - if( TRACE_ON( msi ) ) - enum_stream_names( stg ); + hr = IStorage_Stat( stg, &stat, STATFLAG_NONAME ); + if (FAILED( hr )) goto end; + if (!IsEqualGUID( &stat.clsid, &CLSID_MsiTransform )) goto end; + if (TRACE_ON( msi )) enum_stream_names( stg ); ret = msi_table_apply_transform( db, stg ); end: IStorage_Release( stg ); - return ret; } -UINT WINAPI MsiDatabaseApplyTransformW( MSIHANDLE hdb, - LPCWSTR szTransformFile, int iErrorCond) +UINT WINAPI MsiDatabaseApplyTransformW( MSIHANDLE hdb, const WCHAR *transform, int error_cond ) { MSIDATABASE *db; UINT r; + if (error_cond) FIXME( "ignoring error conditions\n" ); + db = msihandle2msiinfo( hdb, MSIHANDLETYPE_DATABASE ); - if( !db ) + if (!db) { MSIHANDLE remote; @@ -879,27 +884,24 @@ UINT WINAPI MsiDatabaseApplyTransformW( MSIHANDLE hdb, return ERROR_SUCCESS; } - r = MSI_DatabaseApplyTransformW( db, szTransformFile, iErrorCond ); + r = MSI_DatabaseApplyTransformW( db, transform, error_cond ); msiobj_release( &db->hdr ); return r; } -UINT WINAPI MsiDatabaseApplyTransformA( MSIHANDLE hdb, - LPCSTR szTransformFile, int iErrorCond) +UINT WINAPI MsiDatabaseApplyTransformA( MSIHANDLE hdb, const char *transform, int error_cond ) { - LPWSTR wstr; + WCHAR *wstr; UINT ret; - TRACE("%d %s %d\n", hdb, debugstr_a(szTransformFile), iErrorCond); + TRACE( "%d %s %08x\n", hdb, debugstr_a(transform), error_cond ); - wstr = strdupAtoW( szTransformFile ); - if( szTransformFile && !wstr ) + wstr = strdupAtoW( transform ); + if (transform && !wstr) return ERROR_NOT_ENOUGH_MEMORY; - ret = MsiDatabaseApplyTransformW( hdb, wstr, iErrorCond); - + ret = MsiDatabaseApplyTransformW( hdb, wstr, error_cond ); msi_free( wstr ); - return ret; } -- 2.11.0

1 0

[PATCH 1/6 v2] widl: Add -acf command line option.
by Jacek Caban 09 Nov '18

09 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Include man page changes. tools/widl/widl.c | 17 ++++++++++++----- tools/widl/widl.h | 1 + tools/widl/widl.man.in | 2 ++ 3 files changed, 15 insertions(+), 5 deletions(-)

1 0

[PATCH 1/6] widl: Add -acf command line option.
by Jacek Caban 09 Nov '18

09 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/widl.c | 17 ++++++++++++----- tools/widl/widl.h | 1 + 2 files changed, 13 insertions(+), 5 deletions(-)

2 1

[PATCH] widl: Make MIDL_DEFINE_GUID more compatible with midl.
by Jacek Caban 09 Nov '18

09 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- selectany is useful on platforms that support it. Also _i.c files seem prepared to be included by #include. Windows SDK even distributes some of them along with regular headers. When such files are included from C++ (like in case of Firefox), extern "C" is needed. tools/widl/widl.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)

1 0