February 2020 - Wine-commits

Alistair Leslie-Hughes : oledb32: Add Advanced page to datalink dialog.
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: a45d3639afe3f0b51084e4f59276d1f0cb11482c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a45d3639afe3f0b51084e4f5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 6 03:34:59 2020 +0000 oledb32: Add Advanced page to datalink dialog. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/dslocator.c | 63 +++++++++++++++++++++++++- dlls/oledb32/resource.h | 16 +++++++ dlls/oledb32/version.rc | 26 +++++++++++ po/ar.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/ast.po | 110 +++++++++++++++++++++++++++++++++++---------- po/bg.po | 106 +++++++++++++++++++++++++++++++++---------- po/ca.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/cs.po | 112 ++++++++++++++++++++++++++++++++++++---------- po/da.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/de.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/el.po | 104 ++++++++++++++++++++++++++++++++---------- po/en.po | 98 ++++++++++++++++++++++++++++++---------- po/en_US.po | 98 ++++++++++++++++++++++++++++++---------- po/eo.po | 110 +++++++++++++++++++++++++++++++++++---------- po/es.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/fa.po | 99 ++++++++++++++++++++++++++++++---------- po/fi.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/fr.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/he.po | 111 +++++++++++++++++++++++++++++++++++---------- po/hi.po | 101 +++++++++++++++++++++++++++++++---------- po/hr.po | 112 ++++++++++++++++++++++++++++++++++++---------- po/hu.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/it.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/ja.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/ko.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/lt.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/ml.po | 105 +++++++++++++++++++++++++++++++++---------- po/nb_NO.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/nl.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/or.po | 101 +++++++++++++++++++++++++++++++---------- po/pa.po | 101 +++++++++++++++++++++++++++++++---------- po/pl.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/pt_BR.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/pt_PT.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/rm.po | 99 ++++++++++++++++++++++++++++++---------- po/ro.po | 112 ++++++++++++++++++++++++++++++++++++---------- po/ru.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/si.po | 112 ++++++++++++++++++++++++++++++++++++---------- po/sk.po | 108 ++++++++++++++++++++++++++++++++++---------- po/sl.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/sr_RS(a)cyrillic.po | 108 ++++++++++++++++++++++++++++++++++---------- po/sr_RS(a)latin.po | 111 +++++++++++++++++++++++++++++++++++---------- po/sv.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/ta.po | 104 ++++++++++++++++++++++++++++++++---------- po/te.po | 101 +++++++++++++++++++++++++++++++---------- po/th.po | 105 +++++++++++++++++++++++++++++++++---------- po/tr.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/uk.po | 112 ++++++++++++++++++++++++++++++++++++---------- po/wa.po | 103 ++++++++++++++++++++++++++++++++---------- po/wine.pot | 98 ++++++++++++++++++++++++++++++---------- po/zh_CN.po | 114 +++++++++++++++++++++++++++++++++++++---------- po/zh_TW.po | 114 +++++++++++++++++++++++++++++++++++++---------- 52 files changed, 4338 insertions(+), 1130 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a45d3639afe3f0b51084…

1 0

Zhiyi Zhang : winex11.drv: Calculate mask in X11DRV_resize_desktop().
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: 2538b0100fbbe1223e7c18a52bade5cfe5f8d3e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2538b0100fbbe1223e7c18a5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Feb 4 16:52:04 2020 +0800 winex11.drv: Calculate mask in X11DRV_resize_desktop(). Calculate XReconfigureWMWindow() mask in X11DRV_resize_desktop() instead of doing it in EnumWindows() callback update_windows_on_desktop_resize() because the result is the same anyway. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index d70b38b2b3..bde4841ed4 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -321,26 +321,16 @@ BOOL CDECL X11DRV_create_desktop( UINT width, UINT height ) return TRUE; } - -struct desktop_resize_data -{ - RECT old_virtual_rect; - RECT new_virtual_rect; -}; - static BOOL CALLBACK update_windows_on_desktop_resize( HWND hwnd, LPARAM lparam ) { struct x11drv_win_data *data; - struct desktop_resize_data *resize_data = (struct desktop_resize_data *)lparam; - int mask = 0; + UINT mask = (UINT)lparam; if (!(data = get_win_data( hwnd ))) return TRUE; /* update the full screen state */ update_net_wm_states( data ); - if (resize_data->old_virtual_rect.left != resize_data->new_virtual_rect.left) mask |= CWX; - if (resize_data->old_virtual_rect.top != resize_data->new_virtual_rect.top) mask |= CWY; if (mask && data->whole_window) { POINT pos = virtual_screen_to_root( data->whole_rect.left, data->whole_rect.top ); @@ -399,14 +389,18 @@ static void update_desktop_fullscreen( unsigned int width, unsigned int height) */ void X11DRV_resize_desktop( unsigned int width, unsigned int height ) { + RECT old_virtual_rect, new_virtual_rect; HWND hwnd = GetDesktopWindow(); - struct desktop_resize_data resize_data; + UINT mask = 0; - resize_data.old_virtual_rect = get_virtual_screen_rect(); + old_virtual_rect = get_virtual_screen_rect(); desktop_width = width; desktop_height = height; X11DRV_DisplayDevices_Init( TRUE ); - resize_data.new_virtual_rect = get_virtual_screen_rect(); + new_virtual_rect = get_virtual_screen_rect(); + + if (old_virtual_rect.left != new_virtual_rect.left) mask |= CWX; + if (old_virtual_rect.top != new_virtual_rect.top) mask |= CWY; if (GetWindowThreadProcessId( hwnd, NULL ) != GetCurrentThreadId()) { @@ -416,14 +410,13 @@ void X11DRV_resize_desktop( unsigned int width, unsigned int height ) { TRACE( "desktop %p change to (%dx%d)\n", hwnd, width, height ); update_desktop_fullscreen( width, height ); - SetWindowPos( hwnd, 0, resize_data.new_virtual_rect.left, resize_data.new_virtual_rect.top, - resize_data.new_virtual_rect.right - resize_data.new_virtual_rect.left, - resize_data.new_virtual_rect.bottom - resize_data.new_virtual_rect.top, + SetWindowPos( hwnd, 0, new_virtual_rect.left, new_virtual_rect.top, + new_virtual_rect.right - new_virtual_rect.left, new_virtual_rect.bottom - new_virtual_rect.top, SWP_NOZORDER | SWP_NOACTIVATE | SWP_DEFERERASE ); ungrab_clipping_window(); SendMessageTimeoutW( HWND_BROADCAST, WM_DISPLAYCHANGE, screen_bpp, MAKELPARAM( width, height ), SMTO_ABORTIFHUNG, 2000, NULL ); } - EnumWindows( update_windows_on_desktop_resize, (LPARAM)&resize_data ); + EnumWindows( update_windows_on_desktop_resize, (LPARAM)mask ); }

1 0

Vijay Kiran Kamuju : ws2_32: Add stub for WSCSetApplicationCategory.
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: 0df9cce29d0d32d3f1f13c4ec4eabc81675a17ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=0df9cce29d0d32d3f1f13c4e… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Jan 31 16:01:54 2020 +0100 ws2_32: Add stub for WSCSetApplicationCategory. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48392 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 11 +++++++++++ dlls/ws2_32/ws2_32.spec | 1 + include/ws2spi.h | 1 + 3 files changed, 13 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5c3d1a0dc0..c284f595ab 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -9043,6 +9043,17 @@ INT WINAPI WSCWriteProviderOrder( LPDWORD entry, DWORD number ) return 0; } +/*********************************************************************** + * WSCSetApplicationCategory (WS2_32.@) + */ +INT WINAPI WSCSetApplicationCategory( LPCWSTR path, DWORD len, LPCWSTR extra, DWORD extralen, + DWORD lspcat, DWORD *prev_lspcat, LPINT err ) +{ + FIXME("(%s %d %s %d %d %p) Stub!\n", debugstr_w(path), len, debugstr_w(extra), + extralen, lspcat, prev_lspcat); + return 0; +} + /*********************************************************************** * WSANSPIoctl (WS2_32.91) */ diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index ae3eaf0c90..37b02e5712 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -120,6 +120,7 @@ @ stdcall WSCGetProviderPath(ptr ptr ptr ptr) @ stdcall WSCInstallNameSpace(wstr wstr long long ptr) @ stdcall WSCInstallProvider(ptr wstr ptr long ptr) +@ stdcall WSCSetApplicationCategory(wstr long wstr long long ptr ptr) @ stdcall WSCUnInstallNameSpace(ptr) @ stub WSCUpdateProvider @ stub WSCWriteNameSpaceOrder diff --git a/include/ws2spi.h b/include/ws2spi.h index 5df7d24008..3d2ca84dfa 100644 --- a/include/ws2spi.h +++ b/include/ws2spi.h @@ -41,6 +41,7 @@ INT WINAPI WSCEnableNSProvider(LPGUID,BOOL); INT WINAPI WSCEnumProtocols(LPINT,LPWSAPROTOCOL_INFOW,LPDWORD,LPINT); INT WINAPI WSCGetProviderPath(LPGUID,LPWSTR,LPINT,LPINT); INT WINAPI WSCInstallNameSpace(LPWSTR,LPWSTR,DWORD,DWORD,LPGUID); +INT WINAPI WSCSetApplicationCategory(LPCWSTR,DWORD,LPCWSTR,DWORD,DWORD,DWORD*,LPINT); INT WINAPI WSCUnInstallNameSpace(LPGUID); INT WINAPI WSCUpdateProvider(LPGUID, const WCHAR *, const LPWSAPROTOCOL_INFOW, DWORD, LPINT); INT WINAPI WSCWriteProviderOrder(LPDWORD,DWORD);

1 0

Akihiro Sagawa : shlwapi: Fix wnsprintfW/wvnsprintfW %S conversion.
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: 6f8ae18cd78f4779dc459664fe53777e63391363 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f8ae18cd78f4779dc459664… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Feb 9 20:51:38 2020 +0900 shlwapi: Fix wnsprintfW/wvnsprintfW %S conversion. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/wsprintf.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/wsprintf.c b/dlls/shlwapi/wsprintf.c index 9d4088cc25..f2e5f0ace1 100644 --- a/dlls/shlwapi/wsprintf.c +++ b/dlls/shlwapi/wsprintf.c @@ -258,8 +258,22 @@ static UINT WPRINTF_GetLen( WPRINTF_FORMAT *format, WPRINTF_DATA *arg, return (format->precision = 1); case WPR_STRING: if (!arg->lpcstr_view) arg->lpcstr_view = null_stringA; - for (len = 0; !format->precision || (len < format->precision); len++) - if (!*(arg->lpcstr_view + len)) break; + if (dst_is_wide) + { + LPCSTR p = arg->lpcstr_view; + for (len = 0; (!format->precision || len < format->precision) && *p; p++) + { + /* This isn't applicable for UTF-8 and UTF-7 */ + if (IsDBCSLeadByte( *p )) p++; + len++; + if (!*p) break; + } + } + else + { + for (len = 0; !format->precision || (len < format->precision); len++) + if (!*(arg->lpcstr_view + len)) break; + } if (len > maxlen) len = maxlen; return (format->precision = len); case WPR_WSTRING: @@ -506,7 +520,14 @@ INT WINAPI wvnsprintfW( LPWSTR buffer, INT maxlen, LPCWSTR spec, __ms_va_list ar case WPR_STRING: { LPCSTR ptr = argData.lpcstr_view; - for (i = 0; i < len; i++) *p++ = (BYTE)*ptr++; + for (i = 0; i < len; i++) + { + WCHAR buf[2]; /* for LeadByte + NUL case, we need 2 WCHARs. */ + int ret, mb_len = IsDBCSLeadByte( *ptr ) ? 2 : 1; + ret = MultiByteToWideChar( CP_ACP, 0, ptr, mb_len, buf, ARRAY_SIZE( buf )); + *p++ = buf[ret - 1]; + ptr += mb_len; + } } break; case WPR_WSTRING:

1 0

Daniel Lehman : crypt32: Implement CryptBinaryToStringW(HEXRAW).
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: f92581ee82117220bdacaeebba5e8f1eae93274f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f92581ee82117220bdacaeeb… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 24 07:05:08 2020 -0800 crypt32: Implement CryptBinaryToStringW(HEXRAW). Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/base64.c | 46 +++++++++++++++++++++++++ dlls/crypt32/tests/base64.c | 82 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 127 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index ac60c6efbd..221b452d7e 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -477,6 +477,49 @@ static BOOL BinaryToBase64W(const BYTE *pbBinary, return ret; } +static BOOL BinaryToHexW(const BYTE *bin, DWORD nbin, DWORD flags, LPWSTR str, DWORD *nstr) +{ + static const WCHAR hex[] = {'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'}; + DWORD needed; + + if (flags & CRYPT_STRING_NOCRLF) + needed = 0; + else if (flags & CRYPT_STRING_NOCR) + needed = 1; + else + needed = 2; + + needed += nbin * 2 + 1; + if (needed > *nstr) + { + SetLastError(ERROR_MORE_DATA); + return FALSE; + } + + *nstr = needed; + if (!str) + return TRUE; + + while (nbin--) + { + *str++ = hex[(*bin >> 4) & 0xf]; + *str++ = hex[*bin & 0xf]; + bin++; + } + + if (flags & CRYPT_STRING_NOCR) + *str++ = '\n'; + else if (!(flags & CRYPT_STRING_NOCRLF)) + { + *str++ = '\r'; + *str++ = '\n'; + } + + *str = 0; + *nstr = needed - 1; + return TRUE; +} + BOOL WINAPI CryptBinaryToStringW(const BYTE *pbBinary, DWORD cbBinary, DWORD dwFlags, LPWSTR pszString, DWORD *pcchString) { @@ -507,6 +550,9 @@ BOOL WINAPI CryptBinaryToStringW(const BYTE *pbBinary, case CRYPT_STRING_BASE64X509CRLHEADER: encoder = BinaryToBase64W; break; + case CRYPT_STRING_HEXRAW: + encoder = BinaryToHexW; + break; case CRYPT_STRING_HEX: case CRYPT_STRING_HEXASCII: case CRYPT_STRING_HEXADDR: diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 31605fe6b9..ac41d5c86d 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -238,7 +238,12 @@ static void encode_compare_base64_W(const BYTE *toEncode, DWORD toEncodeLen, DWO static void test_CryptBinaryToString(void) { - DWORD strLen, strLen2, i; + static const DWORD flags[] = { 0, CRYPT_STRING_NOCR, CRYPT_STRING_NOCRLF }; + static const WCHAR hexdig[] = L"0123456789abcdef"; + OSVERSIONINFOA ver = { sizeof(ver) }; + BYTE input[256 * sizeof(WCHAR)]; + DWORD strLen, strLen2, i, j; + WCHAR *hex, *cmp, *ptr; BOOL ret; ret = CryptBinaryToStringA(NULL, 0, 0, NULL, NULL); @@ -357,6 +362,81 @@ static void test_CryptBinaryToString(void) heap_free(encodedW); } + + /* winxp and win2k3 are documented as not handling HEXRAW but do not return failure */ + GetVersionExA(&ver); + if (ver.dwMajorVersion <= 5) + { + win_skip("CryptBinaryToString(HEX) not supported\n"); + return; + } + + for (i = 0; i < sizeof(input) / sizeof(WCHAR); i++) + ((WCHAR *)input)[i] = i; + + for (i = 0; i < ARRAY_SIZE(flags); i++) + { + strLen = ~0; + ret = CryptBinaryToStringW(input, sizeof(input), CRYPT_STRING_HEXRAW|flags[i], + NULL, &strLen); + ok(ret, "CryptBinaryToStringW failed: %d\n", GetLastError()); + if (flags[i] & CRYPT_STRING_NOCRLF) + strLen2 = 0; + else if (flags[i] & CRYPT_STRING_NOCR) + strLen2 = 1; + else + strLen2 = 2; + strLen2 += sizeof(input) * 2 + 1; + ok(strLen == strLen2, "Expected length %d, got %d\n", strLen2, strLen); + + hex = heap_alloc(strLen * sizeof(WCHAR)); + memset(hex, 0xcc, strLen * sizeof(WCHAR)); + ptr = cmp = heap_alloc(strLen * sizeof(WCHAR)); + for (j = 0; j < ARRAY_SIZE(input); j++) + { + *ptr++ = hexdig[(input[j] >> 4) & 0xf]; + *ptr++ = hexdig[input[j] & 0xf]; + } + if (flags[i] & CRYPT_STRING_NOCR) + { + *ptr++ = '\n'; + } + else if (!(flags[i] & CRYPT_STRING_NOCRLF)) + { + *ptr++ = '\r'; + *ptr++ = '\n'; + } + *ptr++ = 0; + ret = CryptBinaryToStringW(input, sizeof(input), CRYPT_STRING_HEXRAW|flags[i], + hex, &strLen); + ok(ret, "CryptBinaryToStringW failed: %d\n", GetLastError()); + strLen2--; + ok(strLen == strLen2, "Expected length %d, got %d\n", strLen, strLen2); + ok(!memcmp(hex, cmp, strLen * sizeof(WCHAR)), "Unexpected value\n"); + + /* adjusts size if buffer too big */ + strLen *= 2; + ret = CryptBinaryToStringW(input, sizeof(input), CRYPT_STRING_HEXRAW|flags[i], + hex, &strLen); + ok(ret, "CryptBinaryToStringW failed: %d\n", GetLastError()); + ok(strLen == strLen2, "Expected length %d, got %d\n", strLen, strLen2); + + /* no writes if buffer too small */ + strLen /= 2; + strLen2 /= 2; + memset(hex, 0xcc, strLen * sizeof(WCHAR)); + memset(cmp, 0xcc, strLen * sizeof(WCHAR)); + SetLastError(0xdeadbeef); + ret = CryptBinaryToStringW(input, sizeof(input), CRYPT_STRING_HEXRAW|flags[i], + hex, &strLen); + ok(!ret && GetLastError() == ERROR_MORE_DATA,"Expected ERROR_MORE_DATA, got ret=%d le=%u\n", + ret, GetLastError()); + ok(strLen == strLen2, "Expected length %d, got %d\n", strLen, strLen2); + ok(!memcmp(hex, cmp, strLen * sizeof(WCHAR)), "Unexpected value\n"); + + heap_free(hex); + heap_free(cmp); + } } static void decodeAndCompareBase64_A(LPCSTR toDecode, LPCSTR header,

1 0

Alistair Leslie-Hughes : include: Add more x3daudio defines.
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: ec86f3eb00de14f17759b53a0e65b4db7b09ea25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec86f3eb00de14f17759b53a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 7 00:41:03 2020 +0000 include: Add more x3daudio defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/x3daudio.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/include/x3daudio.h b/include/x3daudio.h index 0fd9a30092..26e2d1df72 100644 --- a/include/x3daudio.h +++ b/include/x3daudio.h @@ -97,6 +97,51 @@ typedef struct X3DAUDIO_DSP_SETTINGS { #define X3DAUDIO_CALCULATE_ZEROCENTER 0x00010000 #define X3DAUDIO_CALCULATE_REDIRECT_TO_LFE 0x00020000 +#ifndef _SPEAKER_POSITIONS_ +#define _SPEAKER_POSITIONS_ +#define SPEAKER_FRONT_LEFT 0x00000001 +#define SPEAKER_FRONT_RIGHT 0x00000002 +#define SPEAKER_FRONT_CENTER 0x00000004 +#define SPEAKER_LOW_FREQUENCY 0x00000008 +#define SPEAKER_BACK_LEFT 0x00000010 +#define SPEAKER_BACK_RIGHT 0x00000020 +#define SPEAKER_FRONT_LEFT_OF_CENTER 0x00000040 +#define SPEAKER_FRONT_RIGHT_OF_CENTER 0x00000080 +#define SPEAKER_BACK_CENTER 0x00000100 +#define SPEAKER_SIDE_LEFT 0x00000200 +#define SPEAKER_SIDE_RIGHT 0x00000400 +#define SPEAKER_TOP_CENTER 0x00000800 +#define SPEAKER_TOP_FRONT_LEFT 0x00001000 +#define SPEAKER_TOP_FRONT_CENTER 0x00002000 +#define SPEAKER_TOP_FRONT_RIGHT 0x00004000 +#define SPEAKER_TOP_BACK_LEFT 0x00008000 +#define SPEAKER_TOP_BACK_CENTER 0x00010000 +#define SPEAKER_TOP_BACK_RIGHT 0x00020000 +#define SPEAKER_RESERVED 0x7ffc0000 +#define SPEAKER_ALL 0x80000000 +#endif + +#ifndef SPEAKER_MONO +#define SPEAKER_MONO SPEAKER_FRONT_CENTER +#define SPEAKER_STEREO (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT) +#define SPEAKER_2POINT1 (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_LOW_FREQUENCY) +#define SPEAKER_SURROUND (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_BACK_CENTER) +#define SPEAKER_QUAD (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT) +#define SPEAKER_4POINT1 (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_LOW_FREQUENCY | SPEAKER_BACK_LEFT | \ + SPEAKER_BACK_RIGHT) +#define SPEAKER_5POINT1 (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | \ + SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT) +#define SPEAKER_7POINT1 (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | \ + SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT | SPEAKER_FRONT_LEFT_OF_CENTER | \ + SPEAKER_FRONT_RIGHT_OF_CENTER) +#define SPEAKER_5POINT1_SURROUND (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | \ + SPEAKER_SIDE_LEFT | SPEAKER_SIDE_RIGHT) +#define SPEAKER_7POINT1_SURROUND (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | \ + SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT | SPEAKER_SIDE_LEFT | SPEAKER_SIDE_RIGHT) +#endif + +#define X3DAUDIO_SPEED_OF_SOUND 343.5f + #define X3DAUDIO_HANDLE_BYTESIZE 20 typedef BYTE X3DAUDIO_HANDLE[X3DAUDIO_HANDLE_BYTESIZE];

1 0

Zebediah Figura : d3d9: Retrieve the vertex shader from the primary stateblock.
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: 706e174817d3ae31c91a525c3179b3a457888087 URL: https://source.winehq.org/git/wine.git/?a=commit;h=706e174817d3ae31c91a525c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 7 22:07:08 2020 -0600 d3d9: Retrieve the vertex shader from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2d5bc77ed7..c95e1a003e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3524,7 +3524,7 @@ static HRESULT WINAPI d3d9_device_GetVertexShader(IDirect3DDevice9Ex *iface, IDi TRACE("iface %p, shader %p.\n", iface, shader); wined3d_mutex_lock(); - if ((wined3d_shader = wined3d_device_get_vertex_shader(device->wined3d_device))) + if ((wined3d_shader = wined3d_stateblock_get_state(device->state)->vs)) { shader_impl = wined3d_shader_get_parent(wined3d_shader); *shader = &shader_impl->IDirect3DVertexShader9_iface;

1 0

Zebediah Figura : d3d9: Stop setting the device state in d3d9_device_SetVertexShader().
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: 6acd71d17b2b73a8928dab33f86af31151924995 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6acd71d17b2b73a8928dab33… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 7 22:07:09 2020 -0600 d3d9: Stop setting the device state in d3d9_device_SetVertexShader(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index c95e1a003e..6f35b3caab 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3507,9 +3507,6 @@ static HRESULT WINAPI d3d9_device_SetVertexShader(IDirect3DDevice9Ex *iface, IDi wined3d_mutex_lock(); wined3d_stateblock_set_vertex_shader(device->update_state, shader_obj ? shader_obj->wined3d_shader : NULL); - if (!device->recording) - wined3d_device_set_vertex_shader(device->wined3d_device, - shader_obj ? shader_obj->wined3d_shader : NULL); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : d3d9: Retrieve the pixel shader from the primary stateblock.
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: 7027e7779de34fa3c82b1c1b8dcfa9cf5e4001c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7027e7779de34fa3c82b1c1b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 7 22:07:12 2020 -0600 d3d9: Retrieve the pixel shader from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 6f35b3caab..fe23625a05 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3872,7 +3872,7 @@ static HRESULT WINAPI d3d9_device_GetPixelShader(IDirect3DDevice9Ex *iface, IDir if (!shader) return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - if ((wined3d_shader = wined3d_device_get_pixel_shader(device->wined3d_device))) + if ((wined3d_shader = wined3d_stateblock_get_state(device->state)->ps)) { shader_impl = wined3d_shader_get_parent(wined3d_shader); *shader = &shader_impl->IDirect3DPixelShader9_iface;

1 0

Zebediah Figura : d3d9: Return a stub interface from Direct3DShaderValidatorCreate9().
by Alexandre Julliard 10 Feb '20

10 Feb '20

Module: wine Branch: master Commit: 2a4a8a5cf34e9697a976a8272a1c93e5660cbea6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a4a8a5cf34e9697a976a827… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 10 18:44:31 2020 +0330 d3d9: Return a stub interface from Direct3DShaderValidatorCreate9(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46735 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/d3d9_main.c | 124 +++++++++++++++++++++++++++++++++++++++++++---- dlls/d3d9/tests/device.c | 66 +++++++++++++++++++++++++ 2 files changed, 181 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index 21df2a34cd..75e627dd76 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -75,18 +75,124 @@ HRESULT WINAPI DECLSPEC_HOTPATCH Direct3DCreate9Ex(UINT sdk_version, IDirect3D9E return D3D_OK; } -/******************************************************************* - * Direct3DShaderValidatorCreate9 (D3D9.@) +/* The callback is called on any error encountered during validation, including + * improper IDirect3DShaderValidator9 method calls. + * - "file" and "line" are passed through directly from Instruction(). "line" + * is provably 32-bit, as 64-bit values passed to Instruction() will be + * truncated. + * - "arg3" has been observed to be at least 0, 2, and 6. The integer size is + * not known. + * - "message_id" is a numeric error code. fxc.exe adds 5000 before printing + * it. The integer size is not known. + * - "context" is passed through directly from Begin(). * - * No documentation available for this function. - * SDK only says it is internal and shouldn't be used. - */ -void* WINAPI Direct3DShaderValidatorCreate9(void) + * Improper calls to IDirect3DShaderValidator9 methods, or other errors not + * generated by specific Instruction() calls, yield NULL as the file, and + * either 0 or -1 as the line. + * + * The callback return type is not known, but programs (fxc.exe, The Sims 2) + * seem to consistently return 0. + * + * The interface and method names below are derived from the messages that + * native d3d9 prints on said improper method calls. + * + * Calls to Begin(), Instruction(), End() have been observed to return S_OK and + * E_FAIL. E_FAIL is not always returned if an error message is handed to the + * callback. */ + +typedef HRESULT (WINAPI *shader_validator_cb)(const char *file, int line, + DWORD_PTR arg3, DWORD_PTR message_id, const char *message, void *context); + +typedef struct IDirect3DShaderValidator9 IDirect3DShaderValidator9; + +struct IDirect3DShaderValidator9Vtbl +{ + HRESULT (WINAPI *QueryInterface)(IDirect3DShaderValidator9 *iface, REFIID iid, void **out); + ULONG (WINAPI *AddRef)(IDirect3DShaderValidator9 *iface); + ULONG (WINAPI *Release)(IDirect3DShaderValidator9 *iface); + HRESULT (WINAPI *Begin)(IDirect3DShaderValidator9 *iface, + shader_validator_cb callback, void *context, DWORD_PTR arg3); + HRESULT (WINAPI *Instruction)(IDirect3DShaderValidator9 *iface, + const char *file, int line, const DWORD *tokens, DWORD token_count); + HRESULT (WINAPI *End)(IDirect3DShaderValidator9 *iface); +}; + +struct IDirect3DShaderValidator9 +{ + const struct IDirect3DShaderValidator9Vtbl *vtbl; +}; + +static HRESULT WINAPI shader_validator_QueryInterface(IDirect3DShaderValidator9 *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + + return E_NOINTERFACE; +} + +static ULONG WINAPI shader_validator_AddRef(IDirect3DShaderValidator9 *iface) +{ + TRACE("iface %p.\n", iface); + + return 2; +} + +static ULONG WINAPI shader_validator_Release(IDirect3DShaderValidator9 *iface) +{ + TRACE("iface %p.\n", iface); + + return 1; +} + +/* The size and type of the third argument is not known. The Sims 2 passes 0; + * fxc.exe passes 1. */ +static HRESULT WINAPI shader_validator_Begin(IDirect3DShaderValidator9 *iface, + shader_validator_cb callback, void *context, DWORD_PTR arg3) +{ + FIXME("iface %p, callback %p, context %p, arg3 %#Ix, stub!\n", iface, callback, context, arg3); + + return S_OK; +} + +/* - "file" and "line" are passed directly through to the callback. + * - "tokens" comprises a single instruction; the caller must determine its + * length. + * - "token_count" is in DWORDs. */ +static HRESULT WINAPI shader_validator_Instruction(IDirect3DShaderValidator9 *iface, + const char *file, int line, const DWORD *tokens, DWORD token_count) +{ + FIXME("iface %p, file %s, line %u, tokens %p, token_count %u, stub!\n", + iface, debugstr_a(file), line, tokens, token_count); + + return S_OK; +} + +static HRESULT WINAPI shader_validator_End(IDirect3DShaderValidator9 *iface) +{ + FIXME("iface %p, stub!\n", iface); + + return S_OK; +} + +static const struct IDirect3DShaderValidator9Vtbl shader_validator_vtbl = +{ + shader_validator_QueryInterface, + shader_validator_AddRef, + shader_validator_Release, + shader_validator_Begin, + shader_validator_Instruction, + shader_validator_End, +}; + +static IDirect3DShaderValidator9 shader_validator = {&shader_validator_vtbl}; + +IDirect3DShaderValidator9 * WINAPI Direct3DShaderValidatorCreate9(void) { - static int once; + TRACE("Returning validator %p.\n", &shader_validator); - if (!once++) FIXME("stub\n"); - return NULL; + return &shader_validator; } /*********************************************************************** diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 156cb188f0..8c1ebc1719 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -53,6 +53,8 @@ struct device_desc static DEVMODEW registry_mode; +static void *(WINAPI *Direct3DShaderValidatorCreate9)(void); + static const DWORD simple_vs[] = { 0xfffe0101, /* vs_1_1 */ @@ -13447,8 +13449,69 @@ static void test_multi_adapter(void) IDirect3D9_Release(d3d); } +typedef HRESULT (WINAPI *shader_validator_cb)(const char *file, int line, + DWORD_PTR arg3, DWORD_PTR message_id, const char *message, void *context); + +typedef struct IDirect3DShaderValidator9 IDirect3DShaderValidator9; + +struct IDirect3DShaderValidator9Vtbl +{ + HRESULT (WINAPI *QueryInterface)(IDirect3DShaderValidator9 *iface, REFIID iid, void **out); + ULONG (WINAPI *AddRef)(IDirect3DShaderValidator9 *iface); + ULONG (WINAPI *Release)(IDirect3DShaderValidator9 *iface); + HRESULT (WINAPI *Begin)(IDirect3DShaderValidator9 *iface, + shader_validator_cb callback, void *context, DWORD_PTR arg3); + HRESULT (WINAPI *Instruction)(IDirect3DShaderValidator9 *iface, + const char *file, int line, const DWORD *tokens, DWORD token_count); + HRESULT (WINAPI *End)(IDirect3DShaderValidator9 *iface); +}; + +struct IDirect3DShaderValidator9 +{ + const struct IDirect3DShaderValidator9Vtbl *vtbl; +}; + +HRESULT WINAPI test_shader_validator_cb(const char *file, int line, DWORD_PTR arg3, + DWORD_PTR message_id, const char *message, void *context) +{ + ok(0, "Unexpected call.\n"); + return S_OK; +} + +static void test_shader_validator(void) +{ + IDirect3DShaderValidator9 *validator; + ULONG refcount; + HRESULT hr; + + validator = Direct3DShaderValidatorCreate9(); + + hr = validator->vtbl->Begin(validator, test_shader_validator_cb, NULL, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, NULL, 0, &simple_vs[0], 1); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, NULL, 0, &simple_vs[1], 3); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, NULL, 0, &simple_vs[4], 4); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, NULL, 0, &simple_vs[8], 4); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, NULL, 0, &simple_vs[12], 4); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, NULL, 0, &simple_vs[16], 4); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->Instruction(validator, NULL, 0, &simple_vs[20], 1); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = validator->vtbl->End(validator); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + refcount = validator->vtbl->Release(validator); + todo_wine ok(!refcount, "Validator has %u references left.\n", refcount); +} + START_TEST(device) { + HMODULE d3d9_handle = GetModuleHandleA("d3d9.dll"); WNDCLASSA wc = {0}; IDirect3D9 *d3d9; DEVMODEW current_mode; @@ -13476,6 +13539,8 @@ START_TEST(device) wc.lpszClassName = "d3d9_test_wc"; RegisterClassA(&wc); + Direct3DShaderValidatorCreate9 = (void *)GetProcAddress(d3d9_handle, "Direct3DShaderValidatorCreate9"); + test_get_set_vertex_declaration(); test_get_declaration(); test_fvf_decl_conversion(); @@ -13575,6 +13640,7 @@ START_TEST(device) test_vertex_buffer_read_write(); test_get_display_mode(); test_multi_adapter(); + test_shader_validator(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0