- Wine-Devel - list.winehq.org

[PATCH] winepulse.drv: Use the official PulseAudio case for the endpoint id.
by Francois Gouget Aug. 27, 2021

Aug. 27, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- It looks like this is just an opaque string so we might as well write PulseAudio the way it's normally written (references being Wikipedia and the PulseAudio website). --- dlls/winepulse.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index ab4cccd7242..35a66e18d8a 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -147,7 +147,7 @@ struct ACImpl { AudioSessionWrapper *session_wrapper; }; -static const WCHAR defaultW[] = L"Pulseaudio"; +static const WCHAR defaultW[] = L"PulseAudio"; static const IAudioClient3Vtbl AudioClient3_Vtbl; static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; -- 2.20.1

1 0

[PATCH] wpcap: Make wrap_pcap_handler() static.
by Francois Gouget Aug. 27, 2021

Aug. 27, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wpcap/unixlib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wpcap/unixlib.c b/dlls/wpcap/unixlib.c index 531fa05941f..f3eb06a2849 100644 --- a/dlls/wpcap/unixlib.c +++ b/dlls/wpcap/unixlib.c @@ -90,7 +90,7 @@ static const char * CDECL wrap_datalink_val_to_name( int link ) return pcap_datalink_val_to_name( link ); } -void wrap_pcap_handler( unsigned char *user, const struct pcap_pkthdr *hdr, const unsigned char *packet ) +static void wrap_pcap_handler( unsigned char *user, const struct pcap_pkthdr *hdr, const unsigned char *packet ) { struct handler_callback *cb = (struct handler_callback *)user; callbacks->handler( cb, hdr, packet ); -- 2.20.1

1 0

[PATCH] winedump: Fix the spelling of a trace and a comment.
by Francois Gouget Aug. 27, 2021

Aug. 27, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- get_varflags() is used to print the flags so the flag names can be anything we want. --- tools/winedump/msc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 25cfcba0630..12ec25b1a1c 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -299,7 +299,7 @@ static const char* get_varflags(unsigned flags) if (flags & 0x0002) X("addr-taken"); if (flags & 0x0004) X("compiler-gen"); if (flags & 0x0008) X("aggregated"); - if (flags & 0x0010) X("in-aggreate"); + if (flags & 0x0010) X("in-aggregate"); if (flags & 0x0020) X("aliased"); if (flags & 0x0040) X("alias"); if (flags & 0x0080) X("retval"); @@ -1189,7 +1189,7 @@ static void dump_defrange(const struct cv_addr_range* range, const void* last, c printf("%s\toffset:%x range:#%x\n", pfx, gap->gapStartOffset, gap->cbRange); } -/* return adress of first byte after the symbol */ +/* return address of first byte after the symbol */ static inline const char* get_last(const union codeview_symbol* sym) { return (const char*)sym + sym->generic.len + 2; -- 2.20.1

1 0

[PATCH] msxml3: SchemaCache_version() is unused so remove it.
by Francois Gouget Aug. 27, 2021

Aug. 27, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- In fact I cannot find any trace of it ever being used. So either it is not needed and should be removed per this patch, or there is some code that's missing. --- dlls/msxml3/main.c | 12 ------------ dlls/msxml3/msxml_private.h | 1 - 2 files changed, 13 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index c11f662eec3..25d402efd20 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -406,18 +406,6 @@ const CLSID* DOMDocument_version(MSXML_VERSION v) } } -const CLSID* SchemaCache_version(MSXML_VERSION v) -{ - switch (v) - { - default: - case MSXML_DEFAULT: return &CLSID_XMLSchemaCache; - case MSXML3: return &CLSID_XMLSchemaCache30; - case MSXML4: return &CLSID_XMLSchemaCache40; - case MSXML6: return &CLSID_XMLSchemaCache60; - } -} - BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) { MSXML_hInstance = hInstDLL; diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 29b1156775c..f16040f3542 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -34,7 +34,6 @@ #endif extern const CLSID * DOMDocument_version(MSXML_VERSION v) DECLSPEC_HIDDEN; -extern const CLSID * SchemaCache_version(MSXML_VERSION v) DECLSPEC_HIDDEN; /* The XDR datatypes (urn:schemas-microsoft-com:datatypes) -- 2.20.1

1 0

[PATCH] kernel32/tests: Fix a couple of ASCII / ANSI mixups in ok() messages.
by Francois Gouget Aug. 27, 2021

Aug. 27, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/kernel32/tests/atom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/atom.c b/dlls/kernel32/tests/atom.c index ad9e91ba257..4796d41d23d 100644 --- a/dlls/kernel32/tests/atom.c +++ b/dlls/kernel32/tests/atom.c @@ -86,7 +86,7 @@ static void test_add_atom(void) if (unicode_OS) { - ok( w_atom == atom, "Unicode atom does not match ASCII\n" ); + ok( w_atom == atom, "Unicode atom does not match ANSI one\n" ); ok( GetLastError() == 0xdeadbeef, "GlobalAddAtomW set last error\n" ); } @@ -344,7 +344,7 @@ static void test_local_add_atom(void) if (unicode_OS) { - ok( w_atom == atom, "Unicode atom does not match ASCII\n" ); + ok( w_atom == atom, "Unicode atom does not match ANSI one\n" ); ok( GetLastError() == 0xdeadbeef, "AddAtomW set last error\n" ); } -- 2.20.1

1 0

[PATCH] kernel32/tests: Fix ASCII / ANSI mixups in comments.
by Francois Gouget Aug. 27, 2021

Aug. 27, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/kernel32/tests/format_msg.c | 4 ++-- dlls/kernel32/tests/process.c | 4 ++-- dlls/kernel32/tests/profile.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 4997f8991bd..794069e341d 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -144,7 +144,7 @@ static void test_message_from_string_wide(void) ok(!lstrcmpW(L"test", out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4, "failed: r=%d\n", r); - /* S is ascii */ + /* S is ansi */ r = doitW(FORMAT_MESSAGE_FROM_STRING, L"%1!S!", 0, 0, out, ARRAY_SIZE(out), "test"); ok(!lstrcmpW(L"test", out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==4, "failed: r=%d\n", r); @@ -417,7 +417,7 @@ static void test_message_from_string(void) ok(!strcmp("test", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); - /* s is ascii */ + /* s is ansi */ r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!s!", 0, 0, out, ARRAY_SIZE(out), "test"); ok(!strcmp("test", out),"failed out=[%s]\n",out); ok(r==4,"failed: r=%d\n",r); diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index e729bca87ef..b1b76a88878 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1952,9 +1952,9 @@ static void test_QueryFullProcessImageNameA(void) expect_eq_d(4, size); expect_eq_s(INIT_STR, buf); - /* this is a difference between the ascii and the unicode version + /* this is a difference between the ansi and the unicode version * the unicode version crashes when the size is big enough to hold - * the result while the ascii version throws an error + * the result while the ansi version throws an error */ size = 1024; expect_eq_d(FALSE, pQueryFullProcessImageNameA(GetCurrentProcess(), 0, NULL, &size)); diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index f9815585480..94ef0a85467 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -150,7 +150,7 @@ static void test_profile_string(void) WriteFile( h, content2, sizeof(content2), &count, NULL); CloseHandle( h); - /* works only in unicode, ascii crashes */ + /* works only in unicode, ansi crashes */ ret=GetPrivateProfileStringW(emptyW, keyW, emptyW, bufW, ARRAY_SIZE(bufW), TESTFILE2W); todo_wine ok(ret == 13, "expected 13, got %u\n", ret); @@ -158,7 +158,7 @@ static void test_profile_string(void) ok(!lstrcmpW(valsectionW,bufW), "expected %s, got %s\n", wine_dbgstr_w(valsectionW), wine_dbgstr_w(bufW) ); - /* works only in unicode, ascii crashes */ + /* works only in unicode, ansi crashes */ ret=GetPrivateProfileStringW(sW, emptyW, emptyW, bufW, ARRAY_SIZE(bufW), TESTFILE2W); ok(ret == 10, "expected 10, got %u\n", ret); ok(!lstrcmpW(valnokeyW,bufW), "expected %s, got %s\n", -- 2.20.1

1 0

[PATCH] kernel32: Fix ASCII / ANSI mixups in comments.
by Francois Gouget Aug. 27, 2021

Aug. 27, 2021

It's quite possible that the device name is entirely composed of ASCII characters but, as far as the API is concerned, it's still an ANSI string. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- The name of RtlCreateUnicodeStringFromAsciiz() is actually pretty misleading since all it does is manipulate ANSI strings (at least as far as the Wine implementation is concerned): RtlInitAnsiString( &ansi, src ); // no charset conversion here! return !RtlAnsiStringToUnicodeString( target, &ansi, TRUE ); --- dlls/kernel32/comm.c | 12 ++++++------ dlls/kernel32/lcformat.c | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/comm.c b/dlls/kernel32/comm.c index e9dd0feac58..e6d1c06b11e 100644 --- a/dlls/kernel32/comm.c +++ b/dlls/kernel32/comm.c @@ -398,7 +398,7 @@ static BOOL COMM_BuildNewCommDCB(LPCWSTR device, LPDCB lpdcb, LPCOMMTIMEOUTS lpt * BuildCommDCBA (KERNEL32.@) * * Updates a device control block data structure with values from an - * ascii device control string. The device control string has two forms + * ANSI device control string. The device control string has two forms * normal and extended, it must be exclusively in one or the other form. * * RETURNS @@ -406,7 +406,7 @@ static BOOL COMM_BuildNewCommDCB(LPCWSTR device, LPDCB lpdcb, LPCOMMTIMEOUTS lpt * True on success, false on a malformed control string. */ BOOL WINAPI BuildCommDCBA( - LPCSTR device, /* [in] The ascii device control string used to update the DCB. */ + LPCSTR device, /* [in] The ANSI device control string used to update the DCB. */ LPDCB lpdcb) /* [out] The device control block to be updated. */ { return BuildCommDCBAndTimeoutsA(device,lpdcb,NULL); @@ -416,7 +416,7 @@ BOOL WINAPI BuildCommDCBA( * BuildCommDCBAndTimeoutsA (KERNEL32.@) * * Updates a device control block data structure with values from an - * ascii device control string. Taking timeout values from a timeouts + * ANSI device control string. Taking timeout values from a timeouts * struct if desired by the control string. * * RETURNS @@ -424,7 +424,7 @@ BOOL WINAPI BuildCommDCBA( * True on success, false bad handles etc. */ BOOL WINAPI BuildCommDCBAndTimeoutsA( - LPCSTR device, /* [in] The ascii device control string. */ + LPCSTR device, /* [in] The ANSI device control string. */ LPDCB lpdcb, /* [out] The device control block to be updated. */ LPCOMMTIMEOUTS lptimeouts) /* [in] The COMMTIMEOUTS structure to be updated. */ { @@ -705,7 +705,7 @@ BOOL WINAPI GetDefaultCommConfigW( /************************************************************************** * GetDefaultCommConfigA (KERNEL32.@) * - * Acquires the default configuration of the specified communication device. (ascii) + * Acquires the default configuration of the specified communication device. * * RETURNS * @@ -713,7 +713,7 @@ BOOL WINAPI GetDefaultCommConfigW( * if the device is not found or the buffer is too small. */ BOOL WINAPI GetDefaultCommConfigA( - LPCSTR lpszName, /* [in] The ascii name of the device targeted for configuration. */ + LPCSTR lpszName, /* [in] The ANSI name of the device targeted for configuration. */ LPCOMMCONFIG lpCC, /* [out] The default configuration for the device. */ LPDWORD lpdwSize) /* [in/out] Initially the size of the default configuration buffer, afterwards the number of bytes copied to the buffer or diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 5711d05b76f..22a9efb24c7 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -315,7 +315,7 @@ static const NLS_FORMAT_NODE *NLS_GetFormats(LCID lcid, DWORD dwFlags) /************************************************************************** * NLS_IsUnicodeOnlyLcid <internal> * - * Determine if a locale is Unicode only, and thus invalid in ASCII calls. + * Determine if a locale is Unicode only, and thus invalid in ANSI calls. */ static BOOL NLS_IsUnicodeOnlyLcid(LCID lcid) { @@ -816,7 +816,7 @@ static INT NLS_GetDateTimeFormatA(LCID lcid, DWORD dwFlags, *| gg Era string, for example 'AD'. * - To output any literal character that could be misidentified as a token, * enclose it in single quotes. - * - The Ascii version of this function fails if lcid is Unicode only. + * - The ANSI version of this function fails if lcid is Unicode only. * * RETURNS * Success: The number of character written to lpDateStr, or that would @@ -922,7 +922,7 @@ INT WINAPI GetDateFormatW(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime, *| tt Long time marker (e.g. "AM", "PM") * - To output any literal character that could be misidentified as a token, * enclose it in single quotes. - * - The Ascii version of this function fails if lcid is Unicode only. + * - The ANSI version of this function fails if lcid is Unicode only. * * RETURNS * Success: The number of character written to lpTimeStr, or that would @@ -1006,7 +1006,7 @@ INT WINAPI GetTimeFormatW(LCID lcid, DWORD dwFlags, const SYSTEMTIME* lpTime, * - This function rounds the number string if the number of decimals exceeds the * locales normal number of decimal places. * - If cchOut is 0, this function does not write to lpNumberStr. - * - The Ascii version of this function fails if lcid is Unicode only. + * - The ANSI version of this function fails if lcid is Unicode only. * * RETURNS * Success: The number of character written to lpNumberStr, or that would @@ -1370,7 +1370,7 @@ INT WINAPI GetNumberFormatEx(LPCWSTR name, DWORD flags, * - This function rounds the currency if the number of decimals exceeds the * locales number of currency decimal places. * - If cchOut is 0, this function does not write to lpCurrencyStr. - * - The Ascii version of this function fails if lcid is Unicode only. + * - The ANSI version of this function fails if lcid is Unicode only. * * RETURNS * Success: The number of character written to lpNumberStr, or that would -- 2.20.1

1 0

[PATCH v2 01/10] dinput: Add read event and callback for file-based devices.
by Rémi Bernon Aug. 27, 2021

Aug. 27, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Split the state reading patch, introduce the read event and callback first, and loop on PeekMessageW instead of only calling once, missing messages and causing test timeouts. dlls/dinput/device_private.h | 6 ++++ dlls/dinput/dinput_main.c | 53 ++++++++++++++++++++++++++++++++---- 2 files changed, 53 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 1811e0cc5a6..0e72ee77bf1 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -53,6 +53,8 @@ typedef struct UINT_PTR uAppData; } ActionMap; +typedef HRESULT dinput_device_read_state( IDirectInputDevice8W *iface ); + /* Device implementation */ typedef struct IDirectInputDeviceImpl IDirectInputDeviceImpl; struct IDirectInputDeviceImpl @@ -84,6 +86,10 @@ struct IDirectInputDeviceImpl /* Action mapping */ int num_actions; /* number of actions mapped */ ActionMap *action_map; /* array of mappings */ + + /* internal device file reading */ + HANDLE read_event; + dinput_device_read_state *read_callback; }; extern HRESULT direct_input_device_alloc( SIZE_T size, const IDirectInputDevice8WVtbl *vtbl, const GUID *guid, diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 88ee1855675..1cd6d390430 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1289,6 +1289,12 @@ static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam static DWORD WINAPI hook_thread_proc(void *param) { static HHOOK kbd_hook, mouse_hook; + IDirectInputDeviceImpl *impl; + IDirectInputDevice8W *iface; + SIZE_T events_count = 0; + HANDLE finished_event; + HANDLE events[128]; + DWORD ret; MSG msg; di_em_win = CreateWindowW( di_em_win_w, di_em_win_w, 0, 0, 0, 0, 0, @@ -1298,13 +1304,42 @@ static DWORD WINAPI hook_thread_proc(void *param) PeekMessageW( &msg, 0, 0, 0, PM_NOREMOVE ); SetEvent(param); - while (GetMessageW( &msg, 0, 0, 0 )) + while ((ret = MsgWaitForMultipleObjectsEx( events_count, events, INFINITE, QS_ALLINPUT, 0 )) <= events_count) { UINT kbd_cnt = 0, mice_cnt = 0; - if (msg.message == WM_USER+0x10) + if (ret < events_count) { - HANDLE finished_event = (HANDLE)msg.lParam; + iface = NULL; + EnterCriticalSection( &dinput_hook_crit ); + LIST_FOR_EACH_ENTRY( impl, &acquired_device_list, IDirectInputDeviceImpl, entry ) + { + if (impl->read_event == events[ret]) + { + iface = &impl->IDirectInputDevice8W_iface; + IDirectInputDevice8_AddRef( iface ); + break; + } + } + LeaveCriticalSection( &dinput_hook_crit ); + + if (iface) + { + impl->read_callback( iface ); + IDirectInputDevice8_Release( iface ); + } + } + + while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) + { + if (msg.message != WM_USER+0x10) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + continue; + } + + finished_event = (HANDLE)msg.lParam; TRACE( "Processing hook change notification wp:%ld lp:%#lx\n", msg.wParam, msg.lParam ); @@ -1313,12 +1348,19 @@ static DWORD WINAPI hook_thread_proc(void *param) if (kbd_hook) UnhookWindowsHookEx( kbd_hook ); if (mouse_hook) UnhookWindowsHookEx( mouse_hook ); kbd_hook = mouse_hook = NULL; - break; + goto done; } + events_count = 0; EnterCriticalSection( &dinput_hook_crit ); kbd_cnt = list_count( &acquired_keyboard_list ); mice_cnt = list_count( &acquired_mouse_list ); + LIST_FOR_EACH_ENTRY( impl, &acquired_device_list, IDirectInputDeviceImpl, entry ) + { + if (!impl->read_event || !impl->read_callback) continue; + if (events_count >= ARRAY_SIZE(events)) break; + events[events_count++] = impl->read_event; + } LeaveCriticalSection( &dinput_hook_crit ); if (kbd_cnt && !kbd_hook) @@ -1340,10 +1382,9 @@ static DWORD WINAPI hook_thread_proc(void *param) if (finished_event) SetEvent(finished_event); } - TranslateMessage(&msg); - DispatchMessageW(&msg); } +done: DestroyWindow( di_em_win ); di_em_win = NULL; -- 2.33.0

1 9

[PATCH 1/9] dinput: Implement HID joystick IDirectInputDevice8_GetDeviceInfo.
by Rémi Bernon Aug. 27, 2021

Aug. 27, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/joystick_hid.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 0d362cf9af3..d7efc44e806 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -54,6 +54,8 @@ struct hid_joystick HANDLE device; PHIDP_PREPARSED_DATA preparsed; + + DIDEVICEINSTANCEW instance; }; static inline struct hid_joystick *impl_from_IDirectInputDevice8W( IDirectInputDevice8W *iface ) @@ -97,14 +99,18 @@ static HRESULT WINAPI hid_joystick_GetDeviceState( IDirectInputDevice8W *iface, static HRESULT WINAPI hid_joystick_GetDeviceInfo( IDirectInputDevice8W *iface, DIDEVICEINSTANCEW *instance ) { - FIXME( "iface %p, instance %p stub!\n", iface, instance ); + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + + TRACE( "iface %p, instance %p.\n", iface, instance ); if (!instance) return E_POINTER; if (instance->dwSize != sizeof(DIDEVICEINSTANCE_DX3W) && instance->dwSize != sizeof(DIDEVICEINSTANCEW)) return DIERR_INVALIDPARAM; - return DIERR_UNSUPPORTED; + memcpy( instance, &impl->instance, instance->dwSize ); + + return S_OK; } static HRESULT WINAPI hid_joystick_BuildActionMap( IDirectInputDevice8W *iface, DIACTIONFORMATW *format, @@ -342,6 +348,8 @@ static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID &attrs, &caps, dinput->dwVersion ); if (hr != DI_OK) goto failed; + impl->instance = instance; + *out = &impl->base.IDirectInputDevice8W_iface; return DI_OK; -- 2.33.0

2 9

[PATCH] d3dx9/shader: Set backwards compatibility compile flag at preprocessing.
by Nikolay Sivov Aug. 27, 2021

Aug. 27, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx9_36/shader.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 7033972af36..6dc145a4faa 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -424,8 +424,9 @@ HRESULT WINAPI D3DXCompileShader(const char *data, UINT length, const D3DXMACRO debugstr_a(data), length, defines, include, debugstr_a(function), debugstr_a(profile), flags, shader, error_msgs, constant_table); - if (D3DX_SDK_VERSION <= 36) - flags |= D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY; +#if D3DX_SDK_VERSION <= 36 + flags |= D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY; +#endif hr = D3DCompile(data, length, NULL, (D3D_SHADER_MACRO *)defines, (ID3DInclude *)include, function, profile, flags, 0, (ID3DBlob **)shader, (ID3DBlob **)error_msgs); @@ -507,8 +508,9 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO return D3DXERR_INVALIDDATA; } - if (D3DX_SDK_VERSION <= 36) - flags |= D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY; +#if D3DX_SDK_VERSION <= 36 + flags |= D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY; +#endif hr = D3DCompile(buffer, len, filename_a, (const D3D_SHADER_MACRO *)defines, (ID3DInclude *)include, entrypoint, profile, flags, 0, -- 2.33.0

2 1