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

[PATCH 1/5] msi: Build stub files with -Wno-cast-calling-convention.
by Chip Davis 08 Apr '20

08 Apr '20

Clang warns when casting between function pointer types where the calling conventions differ; this is of course intended to catch bugs that we ourselves have had to work around. But the casts here are compatible with what MIDL generates, so there isn't much we can do here beyond disabling the warning. This is generated code anyway; it should be expected to work. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- configure.ac | 1 + dlls/msi/Makefile.in | 2 ++ 2 files changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac index 970ff0b3419..aa91a15604d 100644 --- a/configure.ac +++ b/configure.ac @@ -1069,6 +1069,7 @@ then WINE_TRY_CROSSCFLAGS([-fno-strict-aliasing]) dnl clang needs to be told to fail on unknown options WINE_TRY_CROSSCFLAGS([-Werror=unknown-warning-option],[CFLAGS="$CFLAGS -Werror=unknown-warning-option"]) + WINE_TRY_CROSSCFLAGS([-Wcast-calling-convention],[AC_SUBST(NO_CAST_CALLING_CONV_CFLAGS,"-Wno-cast-calling-convention")]) WINE_TRY_CROSSCFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CROSSCFLAGS([-Wempty-body]) WINE_TRY_CROSSCFLAGS([-Wignored-qualifiers]) diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index cf6d498e344..cbc8e33dc8c 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -6,6 +6,8 @@ EXTRAIDLFLAGS = --prefix-server=s_ EXTRADLLFLAGS = -mno-cygwin +winemsi_s_EXTRADEFS = $(NO_CAST_CALLING_CONV_CFLAGS) + C_SRCS = \ action.c \ alter.c \ -- 2.24.0

2 5

[PATCH][WIP][CONFTEST] kernel32/tests: Add extra ReplaceFileW tests
by John Thomson 08 Apr '20

08 Apr '20

Troubleshooting ReplaceFileW failing with ERROR_UNABLE_TO_REMOVE_REPLACED for inplace, without backup move STATUS_CANNOT_DELETE from create_file MoveFileExW MoveFileWithProgressW ReplaceFileW GetTempPathW MoveFileWithProgressW replace tempfile DeleteFileW tempfile dlls/ntdll/file.c status = NtCreateFile(... FILE_OPEN, //disposition FILE_DELETE_ON_CLOSE | FILE_NON_DIRECTORY_FILE, //options) server/file.c create_file case FILE_OPEN: flags = 0; break; server/fd.c check_sharing open_fd if ((options & FILE_DELETE_ON_CLOSE) && !(flags & O_CREAT) && !(st.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH))) Signed-off-by: John Thomson <git(a)johnthomson.fastmail.com.au> --- dlls/kernel32/tests/file.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 29620654bd..2ddabed8a4 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3880,8 +3880,11 @@ static void test_ReplaceFileW(void) ret = GetTempFileNameW(temp_path, prefix, 0, replacement); ok(ret != 0, "GetTempFileNameW error (replacement) %d\n", GetLastError()); ret = pReplaceFileW(replaced, replacement, NULL, 0, 0, 0); - ok(ret || GetLastError() == ERROR_ACCESS_DENIED, - "ReplaceFileW: error %d\n", GetLastError()); + ok(ret || GetLastError() == ERROR_ACCESS_DENIED || + GetLastError() == ERROR_UNABLE_TO_REMOVE_REPLACED || + GetLastError() == ERROR_UNABLE_TO_MOVE_REPLACEMENT || + GetLastError() == ERROR_UNABLE_TO_MOVE_REPLACEMENT_2, + "ReplaceFileW: ret %d error %d\n", ret, GetLastError()); ret = GetTempFileNameW(temp_path, prefix, 0, replacement); ok(ret != 0, "GetTempFileNameW error (replacement) %d\n", GetLastError()); -- 2.26.0

1 0

[PATCH] winemac.drv: Build with GL_SILENCE_DEPRECATION.
by Chip Davis 08 Apr '20

08 Apr '20

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/winemac.drv/cocoa_opengl.m | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 351c7d14246..16a91023933 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define GL_SILENCE_DEPRECATION #include <OpenGL/gl.h> #import "cocoa_opengl.h" -- 2.24.0

2 1

[PATCH v2 1/5] dxgi/tests: Use 1024x768 resolution for tests.
by Zhiyi Zhang 08 Apr '20

08 Apr '20

The QXL driver used by Windows 10 TestBots doesn't report 800x600 as a supported resolution. Switching to full screen may fail even though some DXGI methods report success. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 182841, 182842, 182844, 182847 and 182848. dlls/dxgi/tests/dxgi.c | 62 +++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index e003b19d948..47e13a1fbd7 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -1522,8 +1522,8 @@ static void test_create_swapchain(void) return; } - creation_desc.BufferDesc.Width = 800; - creation_desc.BufferDesc.Height = 600; + creation_desc.BufferDesc.Width = 1024; + creation_desc.BufferDesc.Height = 768; creation_desc.BufferDesc.RefreshRate.Numerator = 60; creation_desc.BufferDesc.RefreshRate.Denominator = 60; creation_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; @@ -2222,7 +2222,7 @@ static void test_swapchain_fullscreen_state(IDXGISwapChain *swapchain, expected_state = *initial_state; compute_expected_swapchain_fullscreen_state_after_fullscreen_change(&expected_state, - &swapchain_desc, &initial_state->fullscreen_state.monitor_rect, 800, 600, NULL); + &swapchain_desc, &initial_state->fullscreen_state.monitor_rect, 1024, 768, NULL); hr = IDXGISwapChain_GetContainingOutput(swapchain, &expected_state.target); ok(SUCCEEDED(hr), "GetContainingOutput failed, hr %#x.\n", hr); @@ -2291,7 +2291,7 @@ static void test_swapchain_fullscreen_state(IDXGISwapChain *swapchain, expected_state.fullscreen_state.monitor = output_desc.Monitor; expected_state.fullscreen_state.monitor_rect = orig_monitor_rect; compute_expected_swapchain_fullscreen_state_after_fullscreen_change(&expected_state, - &swapchain_desc, &orig_monitor_rect, 800, 600, NULL); + &swapchain_desc, &orig_monitor_rect, 1024, 768, NULL); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, output); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); @@ -2376,8 +2376,8 @@ static void test_set_fullscreen(IUnknown *device, BOOL is_d3d12) get_factory(device, is_d3d12, &factory); - swapchain_desc.BufferDesc.Width = 800; - swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.Width = 1024; + swapchain_desc.BufferDesc.Height = 768; swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; @@ -2808,8 +2808,8 @@ static void test_resize_target(IUnknown *device, BOOL is_d3d12) get_factory(device, is_d3d12, &factory); - swapchain_desc.BufferDesc.Width = 800; - swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.Width = 1024; + swapchain_desc.BufferDesc.Height = 768; swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; swapchain_desc.BufferDesc.RefreshRate.Denominator = 1; swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; @@ -2848,7 +2848,7 @@ static void test_resize_target(IUnknown *device, BOOL is_d3d12) { expected_state.fullscreen = TRUE; compute_expected_swapchain_fullscreen_state_after_fullscreen_change(&expected_state, - &swapchain_desc, &initial_state.fullscreen_state.monitor_rect, 800, 600, NULL); + &swapchain_desc, &initial_state.fullscreen_state.monitor_rect, 1024, 768, NULL); hr = IDXGISwapChain_GetContainingOutput(swapchain, &expected_state.target); ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Win 7 testbot */, "GetContainingOutput failed, hr %#x.\n", hr); @@ -2918,8 +2918,8 @@ static LRESULT CALLBACK resize_target_wndproc(HWND hwnd, unsigned int message, W ok(!!swapchain, "GWLP_USERDATA is NULL.\n"); hr = IDXGISwapChain_GetDesc(swapchain, &desc); ok(hr == S_OK, "Failed to get desc, hr %#x.\n", hr); - ok(desc.BufferDesc.Width == 800, "Got unexpected buffer width %u.\n", desc.BufferDesc.Width); - ok(desc.BufferDesc.Height == 600, "Got unexpected buffer height %u.\n", desc.BufferDesc.Height); + ok(desc.BufferDesc.Width == 1024, "Got unexpected buffer width %u.\n", desc.BufferDesc.Width); + ok(desc.BufferDesc.Height == 768, "Got unexpected buffer height %u.\n", desc.BufferDesc.Height); return 0; default: @@ -3009,8 +3009,8 @@ static void test_resize_target_wndproc(void) hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); - swapchain_desc.BufferDesc.Width = 800; - swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.Width = 1024; + swapchain_desc.BufferDesc.Height = 768; swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; swapchain_desc.BufferDesc.RefreshRate.Denominator = 1; swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; @@ -3038,9 +3038,9 @@ static void test_resize_target_wndproc(void) hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); ok(hr == S_OK, "Getswapchain_desc failed, hr %#x.\n", hr); - ok(swapchain_desc.BufferDesc.Width == 800, + ok(swapchain_desc.BufferDesc.Width == 1024, "Got unexpected buffer width %u.\n", swapchain_desc.BufferDesc.Width); - ok(swapchain_desc.BufferDesc.Height == 600, + ok(swapchain_desc.BufferDesc.Height == 768, "Got unexpected buffer height %u.\n", swapchain_desc.BufferDesc.Height); ret = GetClientRect(swapchain_desc.OutputWindow, &rect); @@ -3102,8 +3102,8 @@ static void test_inexact_modes(void) hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); - swapchain_desc.BufferDesc.Width = 800; - swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.Width = 1024; + swapchain_desc.BufferDesc.Height = 768; swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; swapchain_desc.BufferDesc.RefreshRate.Denominator = 1; swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; @@ -3202,8 +3202,8 @@ static void test_inexact_modes(void) ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); /* Test ResizeTarget(). */ - swapchain_desc.BufferDesc.Width = 800; - swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.Width = 1024; + swapchain_desc.BufferDesc.Height = 768; swapchain_desc.Windowed = TRUE; hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); @@ -3220,8 +3220,8 @@ static void test_inexact_modes(void) check_swapchain_fullscreen_state(swapchain, &expected_state); hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); - ok(result_desc.BufferDesc.Width == 800, "Got width %u.\n", result_desc.BufferDesc.Width); - ok(result_desc.BufferDesc.Height == 600, "Got height %u.\n", result_desc.BufferDesc.Height); + ok(result_desc.BufferDesc.Width == 1024, "Got width %u.\n", result_desc.BufferDesc.Width); + ok(result_desc.BufferDesc.Height == 768, "Got height %u.\n", result_desc.BufferDesc.Height); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); @@ -4201,8 +4201,8 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) get_factory(device, is_d3d12, &factory); - swapchain_desc.BufferDesc.Width = 800; - swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.Width = 1024; + swapchain_desc.BufferDesc.Height = 768; swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; @@ -5288,8 +5288,8 @@ static void test_swapchain_window_messages(void) ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); IDXGIAdapter_Release(adapter); - swapchain_desc.BufferDesc.Width = 800; - swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.Width = 1024; + swapchain_desc.BufferDesc.Height = 768; swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; @@ -5315,8 +5315,8 @@ static void test_swapchain_window_messages(void) /* resize target */ expect_messages = resize_target_messages; memset(&mode_desc, 0, sizeof(mode_desc)); - mode_desc.Width = 800; - mode_desc.Height = 600; + mode_desc.Width = 1024; + mode_desc.Height = 768; hr = IDXGISwapChain_ResizeTarget(swapchain, &mode_desc); ok(hr == S_OK, "Failed to resize target, hr %#x.\n", hr); flush_events(); @@ -5449,8 +5449,8 @@ static void test_swapchain_window_styles(void) ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); IDXGIAdapter_Release(adapter); - swapchain_desc.BufferDesc.Width = 800; - swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.Width = 1024; + swapchain_desc.BufferDesc.Height = 768; swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; @@ -5889,8 +5889,8 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) check_ownership_desc.VidPnSourceId = open_adapter_gdi_desc.VidPnSourceId; wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); - swapchain_desc.BufferDesc.Width = 800; - swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.Width = 1024; + swapchain_desc.BufferDesc.Height = 768; swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; swapchain_desc.BufferDesc.RefreshRate.Denominator = 1; swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; -- 2.20.1

1 0

[PATCH 3/3] adsldp: Recognize ADS_SEARCHPREF_TOMBSTONE in IDirectorySearch::SetSearchPreference().
by Dmitry Timoshkov 08 Apr '20

08 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 03fef55f9f..c52f71b751 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -403,6 +403,7 @@ typedef struct int pagesize; BOOL cache_results; BOOL attribtypes_only; + BOOL tombstone; } search; } LDAP_namespace; @@ -1256,6 +1257,19 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S prefs[i].dwStatus = ADS_STATUS_S_OK; break; + case ADS_SEARCHPREF_TOMBSTONE: + if (prefs[i].vValue.dwType != ADSTYPE_BOOLEAN) + { + FIXME("ADS_SEARCHPREF_TOMBSTONE: not supportd dwType %d\n", prefs[i].vValue.dwType); + prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; + break; + } + + TRACE("TOMBSTONE: %d\n", prefs[i].vValue.u.Boolean); + ldap->search.tombstone = prefs[i].vValue.u.Boolean; + prefs[i].dwStatus = ADS_STATUS_S_OK; + break; + default: FIXME("pref %d, type %u: stub\n", prefs[i].dwSearchPref, prefs[i].vValue.dwType); prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREF; @@ -1887,6 +1901,7 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj) ldap->search.pagesize = 0; ldap->search.cache_results = TRUE; ldap->search.attribtypes_only = FALSE; + ldap->search.tombstone = FALSE; ldap->at = NULL; ldap->at_single_count = 0; ldap->at_multiple_count = 0; -- 2.25.2

1 0

[PATCH 2/3] adsldp: Add support for ADS_SEARCHPREF_ATTRIBTYPES_ONLY to IDirectorySearch::SetSearchPreference().
by Dmitry Timoshkov 08 Apr '20

08 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index e5310a9f4b..03fef55f9f 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -402,6 +402,7 @@ typedef struct ADS_SCOPEENUM scope; int pagesize; BOOL cache_results; + BOOL attribtypes_only; } search; } LDAP_namespace; @@ -1242,6 +1243,19 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S prefs[i].dwStatus = ADS_STATUS_S_OK; break; + case ADS_SEARCHPREF_ATTRIBTYPES_ONLY: + if (prefs[i].vValue.dwType != ADSTYPE_BOOLEAN) + { + FIXME("ADS_SEARCHPREF_ATTRIBTYPES_ONLY: not supportd dwType %d\n", prefs[i].vValue.dwType); + prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; + break; + } + + TRACE("ATTRIBTYPES_ONLY: %d\n", prefs[i].vValue.u.Boolean); + ldap->search.attribtypes_only = prefs[i].vValue.u.Boolean; + prefs[i].dwStatus = ADS_STATUS_S_OK; + break; + default: FIXME("pref %d, type %u: stub\n", prefs[i].dwSearchPref, prefs[i].vValue.dwType); prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREF; @@ -1289,7 +1303,7 @@ static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filte props[count] = NULL; } - err = ldap_search_sW(ldap->ld, ldap->object, ldap->search.scope, filter, props, FALSE, &ldap_ctx->res); + err = ldap_search_sW(ldap->ld, ldap->object, ldap->search.scope, filter, props, ldap->search.attribtypes_only, &ldap_ctx->res); heap_free(props); if (err != LDAP_SUCCESS) { @@ -1872,6 +1886,7 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj) ldap->search.scope = ADS_SCOPE_SUBTREE; ldap->search.pagesize = 0; ldap->search.cache_results = TRUE; + ldap->search.attribtypes_only = FALSE; ldap->at = NULL; ldap->at_single_count = 0; ldap->at_multiple_count = 0; -- 2.25.2

1 0

[PATCH 1/3] adsldp: Map 1.2.840.113556.1.4.903 to ADSTYPE_DN_WITH_BINARY.
by Dmitry Timoshkov 08 Apr '20

08 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 74 ++++++++++++++++++++++++++++++++++++++++++++ dlls/adsldp/schema.c | 2 ++ 2 files changed, 76 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 5504a376ba..e5310a9f4b 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1583,6 +1583,78 @@ static HRESULT add_column_values(LDAP_namespace *ldap, struct ldap_search_contex break; } + case ADSTYPE_DN_WITH_BINARY: + { + static const BYTE hex2bin[] = + { + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x00 */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x10 */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x20 */ + 0,1,2,3,4,5,6,7,8,9,0,0,0,0,0,0, /* 0x30 */ + 0,10,11,12,13,14,15,0,0,0,0,0,0,0,0,0, /* 0x40 */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x50 */ + 0,10,11,12,13,14,15 /* 0x60 */ + }; + ADS_DN_WITH_BINARY *dnb; + WCHAR **values = ldap_get_valuesW(ldap->ld, ldap_ctx->entry, name); + if (!values) + return E_ADS_COLUMN_NOT_SET; + count = ldap_count_valuesW(values); + + col->pADsValues = heap_alloc_zero(count * (sizeof(col->pADsValues[0]) + sizeof(col->pADsValues[0].u.pDNWithBinary[0]))); + if (!col->pADsValues) + { + ldap_value_freeW(values); + return E_OUTOFMEMORY; + } + + dnb = (ADS_DN_WITH_BINARY *)(col->pADsValues + count); + + for (i = 0; i < count; i++) + { + WCHAR *p = values[i]; + DWORD n; + + col->pADsValues[i].dwType = type; + col->pADsValues[i].u.pDNWithBinary = dnb++; + + if ((p[0] != 'b' && p[0] != 'B') || p[1] != ':') + FIXME("wrong DN with binary tag '%c%c'\n", p[0], p[1]); + p += 2; + + col->pADsValues[i].u.pDNWithBinary->dwLength = wcstol(p, &p, 10) / 2; + if (*p != ':') + FIXME("wrong DN with binary separator '%c'\n", *p); + p++; + col->pADsValues[i].u.pDNWithBinary->lpBinaryValue = (BYTE *)p; + /* decode values in-place */ + for (n = 0; n < col->pADsValues[i].u.pDNWithBinary->dwLength; n++, p += 2) + { + BYTE b; + + if (p[0] > 'f' || (p[0] != '0' && !hex2bin[p[0]]) || + p[1] > 'f' || (p[1] != '0' && !hex2bin[p[1]])) + { + FIXME("bad hex encoding at %s\n", debugstr_w(p)); + continue; + } + + b = (hex2bin[p[0]] << 4) | hex2bin[p[1]]; + col->pADsValues[i].u.pDNWithBinary->lpBinaryValue[n] = b; + } + if (*p != ':') + FIXME("wrong DN with binary separator '%c'\n", *p); + col->pADsValues[i].u.pDNWithBinary->pszDNString = p + 1; + + TRACE("%s => %u,%s,%s\n", debugstr_w(values[i]), + col->pADsValues[i].u.pDNWithBinary->dwLength, + debugstr_an((char *)col->pADsValues[i].u.pDNWithBinary->lpBinaryValue, col->pADsValues[i].u.pDNWithBinary->dwLength), + debugstr_w(col->pADsValues[i].u.pDNWithBinary->pszDNString)); + } + + col->hReserved = values; + break; + } } col->dwADsType = type; @@ -1654,6 +1726,8 @@ static HRESULT WINAPI search_FreeColumn(IDirectorySearch *iface, PADS_SEARCH_COL if (!col) return E_ADS_BAD_PARAMETER; heap_free(col->pADsValues); + heap_free(col->pszAttrName); + if (col->hReserved) { if (col->dwADsType == ADSTYPE_OCTET_STRING) diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index e997c6f98e..7f1f193bea 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -101,6 +101,8 @@ ADSTYPEENUM get_schema_type(const WCHAR *name, const struct attribute_type *at, return ADSTYPE_CASE_IGNORE_STRING; if (!wcscmp(type->syntax, L"1.3.6.1.4.1.1466.115.121.1.40")) return ADSTYPE_OCTET_STRING; + if (!wcscmp(type->syntax, L"1.2.840.113556.1.4.903")) + return ADSTYPE_DN_WITH_BINARY; if (!wcscmp(type->syntax, L"1.2.840.113556.1.4.906")) return ADSTYPE_LARGE_INTEGER; if (!wcscmp(type->syntax, L"1.2.840.113556.1.4.907")) -- 2.25.2

1 0

[PATCH] libwine: Add missing return. (Clang)
by Chip Davis 08 Apr '20

08 Apr '20

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- libs/wine/loader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 67e44c77d14..1e5aa820feb 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -1130,6 +1130,7 @@ void wine_init( int argc, char *argv[], char *error, int error_size ) } else error[0] = 0; } + return; } #ifdef __APPLE__ apple_main_thread( init_func ); -- 2.24.0

1 0

[PATCH] d3d9: Remove an unneeded conversion.
by Chip Davis 08 Apr '20

08 Apr '20

That parameter is already the correct type. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/d3d9/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ad32146947b..d5621dfe80b 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1570,8 +1570,8 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, unsigned i IDirect3DSurface9_AddRef(*surface); if (user_mem) - wined3d_texture_update_desc(texture, width, height, desc.format, - wined3d_multisample_type_from_d3d(multisample_type), multisample_quality, user_mem, 0); + wined3d_texture_update_desc(texture, width, height, desc.format, multisample_type, multisample_quality, + user_mem, 0); wined3d_texture_decref(texture); -- 2.24.0

1 0

[PATCH] d3dcompiler: Implement D3DCompileFromFile().
by Jactry Zeng 08 Apr '20

08 Apr '20

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/d3dcompiler_43/compiler.c | 41 ++++++++++++- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 85 ++++++++++++++++++++++++++- 2 files changed, 122 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 9fc7c1d773..06e8fb2534 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -949,10 +949,47 @@ HRESULT WINAPI D3DDisassemble(const void *data, SIZE_T size, UINT flags, const c HRESULT WINAPI D3DCompileFromFile(const WCHAR *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *includes, const char *entrypoint, const char *target, UINT flags1, UINT flags2, ID3DBlob **code, ID3DBlob **errors) { - FIXME("filename %s, defines %p, includes %p, entrypoint %s, target %s, flags1 %x, flags2 %x, code %p, errors %p\n", + char *source = NULL; + SIZE_T source_size; + DWORD read_size; + HANDLE file; + HRESULT hr; + + TRACE("filename %s, defines %p, includes %p, entrypoint %s, target %s, flags1 %x, flags2 %x, code %p, errors %p.\n", debugstr_w(filename), defines, includes, debugstr_a(entrypoint), debugstr_a(target), flags1, flags2, code, errors); - return E_NOTIMPL; + file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (file == INVALID_HANDLE_VALUE) + return HRESULT_FROM_WIN32(GetLastError()); + + source_size = GetFileSize(file, NULL); + if (source_size == INVALID_FILE_SIZE) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto end; + } + + if (!(source = heap_alloc_zero(source_size))) + { + hr = E_OUTOFMEMORY; + goto end; + } + + if (!ReadFile(file, source, source_size, &read_size, NULL) || (read_size != source_size)) + { + WARN("Failed to read file contents.\n"); + hr = E_FAIL; + goto end; + } + + hr = D3DCompile(source, strlen(source), NULL, defines, includes, entrypoint, target, flags1, flags2, code, errors); + +end: + CloseHandle(file); + if (source) + heap_free(source); + + return hr; } HRESULT WINAPI D3DLoadModule(const void *data, SIZE_T size, ID3D11Module **module) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index b96ab16679..cd93aa497d 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -26,6 +26,8 @@ static pD3DCompile ppD3DCompile; static HRESULT (WINAPI *pD3DXGetShaderConstantTable)(const DWORD *byte_code, ID3DXConstantTable **constant_table); +static HRESULT (WINAPI *pD3DCompileFromFile)(const WCHAR *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *includes, + const char *entrypoint, const char *target, UINT flags1, UINT flags2, ID3DBlob **code, ID3DBlob **errors); struct vec2 { @@ -37,10 +39,40 @@ struct vec4 float x, y, z, w; }; +static BOOL create_file(WCHAR *filename, const char *code, DWORD code_size) +{ + static WCHAR temp_dir[MAX_PATH]; + DWORD written; + HANDLE file; + + if (!temp_dir[0]) + GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); + GetTempFileNameW(temp_dir, NULL, 0, filename); + file = CreateFileW(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + if (file == INVALID_HANDLE_VALUE) + return FALSE; + + if (code) + { + WriteFile(file, code, code_size, &written, NULL); + if (written != code_size) + { + CloseHandle(file); + DeleteFileW(filename); + return FALSE; + } + } + CloseHandle(file); + return TRUE; +} + #define compile_shader(a, b) compile_shader_(__LINE__, a, b) static ID3D10Blob *compile_shader_(unsigned int line, const char *source, const char *target) { - ID3D10Blob *blob = NULL, *errors = NULL; + ID3D10Blob *blob = NULL, *errors = NULL, *file_blob = NULL, *file_errors = NULL; + WCHAR filename[MAX_PATH] = {0}; + DWORD *data, *file_data; + SIZE_T size, file_size; HRESULT hr; hr = ppD3DCompile(source, strlen(source), NULL, NULL, NULL, "main", target, 0, 0, &blob, &errors); @@ -49,8 +81,38 @@ static ID3D10Blob *compile_shader_(unsigned int line, const char *source, const { if (winetest_debug > 1) trace_(__FILE__, line)("%s\n", (char *)ID3D10Blob_GetBufferPointer(errors)); - ID3D10Blob_Release(errors); } + + if (SUCCEEDED(hr)) + { + if (!pD3DCompileFromFile || !create_file(filename, source, strlen(source))) + skip("D3DCompileFromFile() isn't supported or file creation failed.\n"); + else + { + hr = pD3DCompileFromFile(filename, NULL, NULL, "main", target, 0, 0, &file_blob, &file_errors); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to compile shader from file, hr %#x.\n", hr); + size = ID3D10Blob_GetBufferSize(blob); + file_size = ID3D10Blob_GetBufferSize(blob); + ok_(__FILE__, line)(hr == D3D_OK, "Got unexpected buffer size: %lu vs %lu.\n", size, file_size); + data = ID3D10Blob_GetBufferPointer(blob); + file_data = ID3D10Blob_GetBufferPointer(file_blob); + ok_(__FILE__, line)(!memcmp(data, file_data, size), "Got unexpected data.\n"); + ok_(__FILE__, line)(!!file_errors == !!errors, "Got unexpected errors.\n"); + if (file_errors) + { + if (winetest_debug > 1) + trace_(__FILE__, line)("%s\n", (char *)ID3D10Blob_GetBufferPointer(file_errors)); + ID3D10Blob_Release(file_errors); + } + + ID3D10Blob_Release(file_blob); + DeleteFileW(filename); + } + } + + if (errors) + ID3D10Blob_Release(errors); + return blob; } @@ -1003,6 +1065,7 @@ static BOOL load_d3dcompiler(void) #if D3D_COMPILER_VERSION == 47 if (!(module = LoadLibraryA("d3dcompiler_47.dll"))) return FALSE; + pD3DCompileFromFile = (void*)GetProcAddress(module, "D3DCompileFromFile"); #else if (!(module = LoadLibraryA("d3dcompiler_43.dll"))) return FALSE; #endif @@ -1011,6 +1074,23 @@ static BOOL load_d3dcompiler(void) return TRUE; } +static void test_compile(void) +{ + ID3D10Blob *blob = NULL, *errors = NULL; + HRESULT hr; + + if (!pD3DCompileFromFile) + { + skip("D3DCompileFromFile() isn't supported.\n"); + return; + } + + hr = pD3DCompileFromFile(L"nonexistent", NULL, NULL, "main", "vs_2_0", 0, 0, &blob, &errors); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got hr %#x.\n", hr); + ok(!blob, "Got unexpected blob.\n"); + ok(!errors, "Got unexpected errors.\n"); +} + START_TEST(hlsl_d3d9) { HMODULE mod; @@ -1038,4 +1118,5 @@ START_TEST(hlsl_d3d9) test_array_dimensions(); test_constant_table(); test_fail(); + test_compile(); } -- 2.26.0

2 2