November 2016 - Wine-Commits

Jacek Caban : rpcrt4: Store security package name in rpc_server_registered_auth_info.
by Alexandre Julliard Nov. 30, 2016

Nov. 30, 2016

Module: wine Branch: master Commit: da05dfd151153fda5731ddcdbcdb951354b5da56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da05dfd151153fda5731ddcdb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 30 12:08:51 2016 +0100 rpcrt4: Store security package name in rpc_server_registered_auth_info. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_server.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 73e9742..c3bc227 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -1312,9 +1312,10 @@ struct rpc_server_registered_auth_info TimeStamp exp; BOOL cred_acquired; CredHandle cred; - ULONG max_token; USHORT auth_type; + WCHAR *package_name; WCHAR *principal; + ULONG max_token; }; static RPC_STATUS find_security_package(ULONG auth_type, SecPkgInfoW **packages_buf, SecPkgInfoW **ret) @@ -1361,17 +1362,11 @@ RPC_STATUS RPCRT4_ServerGetRegisteredAuthInfo( { if (!auth_info->cred_acquired) { - SecPkgInfoW *packages, *package; SECURITY_STATUS sec_status; - status = find_security_package(auth_info->auth_type, &packages, &package); - if (status != RPC_S_OK) - break; - - sec_status = AcquireCredentialsHandleW((SEC_WCHAR *)auth_info->principal, package->Name, + sec_status = AcquireCredentialsHandleW((SEC_WCHAR *)auth_info->principal, auth_info->package_name, SECPKG_CRED_INBOUND, NULL, NULL, NULL, NULL, &auth_info->cred, &auth_info->exp); - FreeContextBuffer(packages); if (sec_status != SEC_E_OK) { status = RPC_S_SEC_PKG_ERROR; @@ -1437,6 +1432,7 @@ RPC_STATUS WINAPI RpcServerRegisterAuthInfoW( RPC_WSTR ServerPrincName, ULONG Au { struct rpc_server_registered_auth_info *auth_info; SecPkgInfoW *packages, *package; + WCHAR *package_name; ULONG max_token; RPC_STATUS status; @@ -1446,20 +1442,27 @@ RPC_STATUS WINAPI RpcServerRegisterAuthInfoW( RPC_WSTR ServerPrincName, ULONG Au if (status != RPC_S_OK) return status; + package_name = RPCRT4_strdupW(package->Name); max_token = package->cbMaxToken; FreeContextBuffer(packages); + if (!package_name) + return RPC_S_OUT_OF_RESOURCES; auth_info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*auth_info)); - if (!auth_info) + if (!auth_info) { + HeapFree(GetProcessHeap(), 0, package_name); return RPC_S_OUT_OF_RESOURCES; + } if (ServerPrincName && !(auth_info->principal = RPCRT4_strdupW(ServerPrincName))) { + HeapFree(GetProcessHeap(), 0, package_name); HeapFree(GetProcessHeap(), 0, auth_info); return RPC_S_OUT_OF_RESOURCES; } - auth_info->max_token = max_token; auth_info->auth_type = AuthnSvc; + auth_info->package_name = package_name; + auth_info->max_token = max_token; EnterCriticalSection(&server_auth_info_cs); list_add_tail(&server_registered_auth_info, &auth_info->entry);

1 0

Daniel Lehman : wininet: Canonicalize URL in HttpOpenRequest.
by Alexandre Julliard Nov. 30, 2016

Nov. 30, 2016

Module: wine Branch: master Commit: b3d12a16ce73c460166005f385530507b24e00dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3d12a16ce73c460166005f38… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Oct 26 12:17:17 2016 -0700 wininet: Canonicalize URL in HttpOpenRequest. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 7 ++++--- dlls/wininet/tests/http.c | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b51c6c9..b3c8e66 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3401,13 +3401,14 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, if (lpszObjectName && *lpszObjectName) { HRESULT rc; + WCHAR dummy; - len = 0; - rc = UrlEscapeW(lpszObjectName, NULL, &len, URL_ESCAPE_SPACES_ONLY); + len = 1; + rc = UrlCanonicalizeW(lpszObjectName, &dummy, &len, URL_ESCAPE_SPACES_ONLY); if (rc != E_POINTER) len = strlenW(lpszObjectName)+1; request->path = heap_alloc(len*sizeof(WCHAR)); - rc = UrlEscapeW(lpszObjectName, request->path, &len, + rc = UrlCanonicalizeW(lpszObjectName, request->path, &len, URL_ESCAPE_SPACES_ONLY); if (rc != S_OK) { diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index f2fe25c..9cda9c5 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2402,6 +2402,10 @@ static DWORD CALLBACK server_thread(LPVOID param) send(c, okmsg, sizeof(okmsg)-1, 0); send(c, buffer, strlen(buffer), 0); } + if (strstr(buffer, "GET /test_remove_dot_segments")) + { + send(c, okmsg, sizeof(okmsg)-1, 0); + } shutdown(c, 2); closesocket(c); c = -1; @@ -4851,6 +4855,20 @@ static void test_long_url(int port) close_request(&req); } +static void test_remove_dot_segments(int port) +{ + test_request_t req; + BOOL ret; + + open_simple_request(&req, "localhost", port, NULL, "/A/../B/./C/../../test_remove_dot_segments"); + + ret = HttpSendRequestA(req.request, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req.request, 200); + + close_request(&req); +} + static void test_http_connection(void) { struct server_info si; @@ -4902,6 +4920,7 @@ static void test_http_connection(void) test_async_read(si.port); test_http_read(si.port); test_long_url(si.port); + test_remove_dot_segments(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Carlos Rodriguez : wined3d: Recognize Geforce GTX 1050.
by Alexandre Julliard Nov. 30, 2016

Nov. 30, 2016

Module: wine Branch: master Commit: 7f80fc6bba75e40c39887a6d868363289ab56b73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f80fc6bba75e40c39887a6d8… Author: Carlos Rodriguez <mrdeathjr28(a)yahoo.es> Date: Tue Nov 29 15:34:54 2016 -0200 wined3d: Recognize Geforce GTX 1050. Signed-off-by: Carlos Rodriguez <mrdeathjr28(a)yahoo.es> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f3bb385..773d185 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1325,6 +1325,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970M, "NVIDIA GeForce GTX 970M", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX980, "NVIDIA GeForce GTX 980", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX980TI, "NVIDIA GeForce GTX 980 Ti", DRIVER_NVIDIA_GEFORCE8, 6144}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1050, "NVIDIA GeForce GTX 1050", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060, "NVIDIA GeForce GTX 1060", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1070, "NVIDIA GeForce GTX 1070", DRIVER_NVIDIA_GEFORCE8, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080, "NVIDIA GeForce GTX 1080", DRIVER_NVIDIA_GEFORCE8, 8192}, @@ -1803,6 +1804,7 @@ cards_nvidia_binary[] = {"GTX 1080", CARD_NVIDIA_GEFORCE_GTX1080}, /* GeForce 1000 - highend */ {"GTX 1070", CARD_NVIDIA_GEFORCE_GTX1070}, /* GeForce 1000 - highend */ {"GTX 1060", CARD_NVIDIA_GEFORCE_GTX1060}, /* GeForce 1000 - midend high */ + {"GTX 1050", CARD_NVIDIA_GEFORCE_GTX1050}, /* GeForce 1000 - midend */ {"GTX 980 Ti", CARD_NVIDIA_GEFORCE_GTX980TI}, /* GeForce 900 - highend */ {"GTX 980", CARD_NVIDIA_GEFORCE_GTX980}, /* GeForce 900 - highend */ {"GTX 970M", CARD_NVIDIA_GEFORCE_GTX970M}, /* GeForce 900 - highend mobile*/ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cad5bb8..ae48020 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1970,6 +1970,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX970M = 0x13d8, CARD_NVIDIA_GEFORCE_GTX980 = 0x13c0, CARD_NVIDIA_GEFORCE_GTX980TI = 0x17c8, + CARD_NVIDIA_GEFORCE_GTX1050 = 0x1c81, CARD_NVIDIA_GEFORCE_GTX1060 = 0x1c03, CARD_NVIDIA_GEFORCE_GTX1070 = 0x1b81, CARD_NVIDIA_GEFORCE_GTX1080 = 0x1b80,

1 0

Huw Davies : include: Add the lineInitializeEx() option constants.
by Alexandre Julliard Nov. 30, 2016

Nov. 30, 2016

Module: wine Branch: master Commit: 8b0c69c81fe2c4703d6db83d71b32bd2a81bbef5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b0c69c81fe2c4703d6db83d7… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 30 12:56:35 2016 +0000 include: Add the lineInitializeEx() option constants. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/tapi.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/tapi.h b/include/tapi.h index 45ab122..52ec619 100644 --- a/include/tapi.h +++ b/include/tapi.h @@ -305,6 +305,11 @@ typedef HANDLE HPHONEAPP, *LPHPHONEAPP; #define LINECALLFEATURE_UNHOLD 0x08000000 #define LINECALLFEATURE_RELEASEUSERUSERINFO 0x10000000 +#define LINEINITIALIZEEXOPTION_USEHIDDENWINDOW 0x00000001 +#define LINEINITIALIZEEXOPTION_USEEVENT 0x00000002 +#define LINEINITIALIZEEXOPTION_USECOMPLETIONPORT 0x00000003 +#define LINEINITIALIZEEXOPTION_CALLHUBTRACKING 0x80000000 + typedef struct lineaddresscaps_tag { DWORD dwTotalSize; DWORD dwNeededSize;

1 0

Nikolay Sivov : shell32: Respect SFGAO_NONENUMERATED attribute for registered shell extensions.
by Alexandre Julliard Nov. 30, 2016

Nov. 30, 2016

Module: wine Branch: master Commit: 252051cb1b3f0fc4aade128370fb3e38d90244d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=252051cb1b3f0fc4aade12837… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 30 02:39:38 2016 +0300 shell32: Respect SFGAO_NONENUMERATED attribute for registered shell extensions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_desktop.c | 75 +++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 38 deletions(-) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 8721a9a..e4cdeb1 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -278,15 +278,44 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, return hr; } +static void add_shell_namespace_extensions(IEnumIDListImpl *list, HKEY root) +{ + static const WCHAR Desktop_NameSpaceW[] = { 'S','O','F','T','W','A','R','E','\\', + 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'E','x','p','l','o','r','e','r','\\','D','e','s','k','t','o','p','\\', + 'N','a','m','e','s','p','a','c','e','\0' }; + static const WCHAR clsidfmtW[] = {'C','L','S','I','D','\\','%','s','\\', + 'S','h','e','l','l','F','o','l','d','e','r',0}; + static const WCHAR attributesW[] = {'A','t','t','r','i','b','u','t','e','s',0}; + WCHAR guid[39], clsidkeyW[sizeof(clsidfmtW)/sizeof(*clsidfmtW) + 39]; + DWORD size, i = 0; + HKEY hkey; + + if (RegOpenKeyExW(root, Desktop_NameSpaceW, 0, KEY_READ, &hkey)) + return; + + size = sizeof(guid)/sizeof(guid[0]); + while (!RegEnumKeyExW(hkey, i++, guid, &size, 0, NULL, NULL, NULL)) + { + DWORD attributes, value_size = sizeof(attributes); + + /* Check if extension is configured as nonenumerable */ + sprintfW(clsidkeyW, clsidfmtW, guid); + RegGetValueW(HKEY_CLASSES_ROOT, clsidkeyW, attributesW, RRF_RT_REG_DWORD | RRF_ZEROONFAILURE, + NULL, &attributes, &value_size); + + if (!(attributes & SFGAO_NONENUMERATED)) + AddToEnumList(list, _ILCreateGuidFromStrW(guid)); + size = sizeof(guid)/sizeof(guid[0]); + } + + RegCloseKey(hkey); +} + /************************************************************************** * CreateDesktopEnumList() */ -static const WCHAR Desktop_NameSpaceW[] = { 'S','O','F','T','W','A','R','E', - '\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l', - 'o','r','e','r','\\','D','e','s','k','t','o','p','\\','N','a','m','e','s','p', - 'a','c','e','\0' }; - static BOOL CreateDesktopEnumList(IEnumIDListImpl *list, DWORD dwFlags) { BOOL ret = TRUE; @@ -297,39 +326,9 @@ static BOOL CreateDesktopEnumList(IEnumIDListImpl *list, DWORD dwFlags) /* enumerate the root folders */ if (dwFlags & SHCONTF_FOLDERS) { - HKEY hkey; - UINT i; - - /* create the pidl for This item */ ret = AddToEnumList(list, _ILCreateMyComputer()); - - for (i=0; i<2; i++) { - if (ret && !RegOpenKeyExW(i == 0 ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, - Desktop_NameSpaceW, 0, KEY_READ, &hkey)) - { - WCHAR iid[50]; - int i=0; - - while (ret) - { - DWORD size; - LONG r; - - size = sizeof (iid) / sizeof (iid[0]); - r = RegEnumKeyExW(hkey, i, iid, &size, 0, NULL, NULL, NULL); - if (ERROR_SUCCESS == r) - { - ret = AddToEnumList(list, _ILCreateGuidFromStrW(iid)); - i++; - } - else if (ERROR_NO_MORE_ITEMS == r) - break; - else - ret = FALSE; - } - RegCloseKey(hkey); - } - } + add_shell_namespace_extensions(list, HKEY_LOCAL_MACHINE); + add_shell_namespace_extensions(list, HKEY_CURRENT_USER); } /* enumerate the elements in %windir%\desktop */

1 0

Bruno Jesus : ws2_32: Simplify IPv4 sprintf.
by Alexandre Julliard Nov. 30, 2016

Nov. 30, 2016

Module: wine Branch: master Commit: e33527b2a76ac49ed8aacd04fabc6475630124ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=e33527b2a76ac49ed8aacd04f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Nov 30 04:48:27 2016 -0200 ws2_32: Simplify IPv4 sprintf. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 898c1eb..8ad30b4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4368,13 +4368,14 @@ WS_u_short WINAPI WS_ntohs(WS_u_short netshort) */ char* WINAPI WS_inet_ntoa(struct WS_in_addr in) { + unsigned int long_ip = ntohl(in.WS_s_addr); struct per_thread_data *data = get_per_thread_data(); sprintf( data->ntoa_buffer, "%u.%u.%u.%u", - (unsigned int)(ntohl( in.WS_s_addr ) >> 24 & 0xff), - (unsigned int)(ntohl( in.WS_s_addr ) >> 16 & 0xff), - (unsigned int)(ntohl( in.WS_s_addr ) >> 8 & 0xff), - (unsigned int)(ntohl( in.WS_s_addr ) & 0xff) ); + (long_ip >> 24) & 0xff, + (long_ip >> 16) & 0xff, + (long_ip >> 8) & 0xff, + long_ip & 0xff); return data->ntoa_buffer; } @@ -8289,18 +8290,20 @@ INT WINAPI WSAAddressToStringA( LPSOCKADDR sockaddr, DWORD len, switch(sockaddr->sa_family) { case WS_AF_INET: + { + unsigned int long_ip = ntohl(((SOCKADDR_IN *)sockaddr)->sin_addr.WS_s_addr); if (len < sizeof(SOCKADDR_IN)) return SOCKET_ERROR; sprintf( buffer, "%u.%u.%u.%u:%u", - (unsigned int)(ntohl( ((SOCKADDR_IN *)sockaddr)->sin_addr.WS_s_addr ) >> 24 & 0xff), - (unsigned int)(ntohl( ((SOCKADDR_IN *)sockaddr)->sin_addr.WS_s_addr ) >> 16 & 0xff), - (unsigned int)(ntohl( ((SOCKADDR_IN *)sockaddr)->sin_addr.WS_s_addr ) >> 8 & 0xff), - (unsigned int)(ntohl( ((SOCKADDR_IN *)sockaddr)->sin_addr.WS_s_addr ) & 0xff), + (long_ip >> 24) & 0xff, + (long_ip >> 16) & 0xff, + (long_ip >> 8) & 0xff, + long_ip & 0xff, ntohs( ((SOCKADDR_IN *)sockaddr)->sin_port ) ); p = strchr( buffer, ':' ); if (!((SOCKADDR_IN *)sockaddr)->sin_port) *p = 0; break; - + } case WS_AF_INET6: { struct WS_sockaddr_in6 *sockaddr6 = (LPSOCKADDR_IN6) sockaddr;

1 0

Bruno Jesus : ws2_32: Add IDN resolution support to GetAddrInfoW.
by Alexandre Julliard Nov. 30, 2016

Nov. 30, 2016

Module: wine Branch: master Commit: fa172e1ca6d91d0ad2eb9ba442ff369bd4a7646a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa172e1ca6d91d0ad2eb9ba44… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Nov 30 04:48:26 2016 -0200 ws2_32: Add IDN resolution support to GetAddrInfoW. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 52 +++++++++++++++++++++++++++++++++++++++--------- dlls/ws2_32/tests/sock.c | 4 ++-- 2 files changed, 45 insertions(+), 11 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 8510034..898c1eb 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6743,25 +6743,56 @@ int WINAPI GetAddrInfoExW(const WCHAR *name, const WCHAR *servname, DWORD namesp */ int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hints, PADDRINFOW *res) { - int ret, len; + int ret = EAI_MEMORY, len, i; char *nodenameA = NULL, *servnameA = NULL; struct WS_addrinfo *resA, *hintsA = NULL; + WCHAR *local_nodenameW = (WCHAR *)nodename; + + TRACE("nodename %s, servname %s, hints %p, result %p\n", + debugstr_w(nodename), debugstr_w(servname), hints, res); *res = NULL; if (nodename) { - len = WideCharToMultiByte(CP_ACP, 0, nodename, -1, NULL, 0, NULL, NULL); - if (!(nodenameA = HeapAlloc(GetProcessHeap(), 0, len))) return EAI_MEMORY; - WideCharToMultiByte(CP_ACP, 0, nodename, -1, nodenameA, len, NULL, NULL); + /* Is this an IDN? Most likely if any char is above the Ascii table, this + * is the simplest validation possible, further validation will be done by + * the native getaddrinfo() */ + for (i = 0; nodename[i]; i++) + { + if (nodename[i] > 'z') + break; + } + if (nodename[i]) + { + if (hints && (hints->ai_flags & WS_AI_DISABLE_IDN_ENCODING)) + { + /* Name requires conversion but it was disabled */ + ret = WSAHOST_NOT_FOUND; + WSASetLastError(ret); + goto end; + } + + len = IdnToAscii(0, nodename, -1, NULL, 0); + if (!len) + { + ERR("Failed to convert %s to punycode\n", debugstr_w(nodename)); + ret = EAI_FAIL; + goto end; + } + if (!(local_nodenameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) goto end; + IdnToAscii(0, nodename, -1, local_nodenameW, len); + } + } + if (local_nodenameW) + { + len = WideCharToMultiByte(CP_ACP, 0, local_nodenameW, -1, NULL, 0, NULL, NULL); + if (!(nodenameA = HeapAlloc(GetProcessHeap(), 0, len))) goto end; + WideCharToMultiByte(CP_ACP, 0, local_nodenameW, -1, nodenameA, len, NULL, NULL); } if (servname) { len = WideCharToMultiByte(CP_ACP, 0, servname, -1, NULL, 0, NULL, NULL); - if (!(servnameA = HeapAlloc(GetProcessHeap(), 0, len))) - { - HeapFree(GetProcessHeap(), 0, nodenameA); - return EAI_MEMORY; - } + if (!(servnameA = HeapAlloc(GetProcessHeap(), 0, len))) goto end; WideCharToMultiByte(CP_ACP, 0, servname, -1, servnameA, len, NULL, NULL); } @@ -6775,6 +6806,9 @@ int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hin WS_freeaddrinfo(resA); } +end: + if (local_nodenameW != nodename) + HeapFree(GetProcessHeap(), 0, local_nodenameW); HeapFree(GetProcessHeap(), 0, nodenameA); HeapFree(GetProcessHeap(), 0, servnameA); return ret; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 049213a..83a931e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7026,7 +7026,7 @@ static void test_GetAddrInfoW(void) win_skip("IDN resolution not supported in Win <= 7\n"); return; } -todo_wine { + ok(!ret, "got %d expected success\n", ret); ok(result2 != NULL, "got %p\n", result2); pFreeAddrInfoW(result2); @@ -7057,7 +7057,7 @@ todo_wine { ok(!ret, "got %d expected success\n", ret); ok(result2 != NULL, "got %p\n", result2); pFreeAddrInfoW(result2); -} + /* Disable IDN resolution and test again*/ hint.ai_family = AF_INET; hint.ai_socktype = 0;

1 0

Daniel Lehman : shlwapi: Remove dot segments for URLs starting with /.
by Alexandre Julliard Nov. 30, 2016

Nov. 30, 2016

Module: wine Branch: master Commit: 4eac6e84ba4b999c234215a28314074b9581266a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eac6e84ba4b999c234215a28… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Nov 23 14:20:24 2016 -0800 shlwapi: Remove dot segments for URLs starting with /. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/url.c | 9 +++++++++ dlls/shlwapi/url.c | 3 +++ 2 files changed, 12 insertions(+) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 2cb6fea..f9fc79a 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -193,6 +193,15 @@ static const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = { {"res://c:\\tests/res\\foo%20bar/strange\\sth", 0, S_OK, "res://c:\\tests/res\\foo%20bar/strange\\sth", FALSE}, {"res://c:\\tests/res\\foo%20bar/strange\\sth", URL_FILE_USE_PATHURL, S_OK, "res://c:\\tests/res\\foo%20bar/strange\\sth", FALSE}, {"res://c:\\tests/res\\foo%20bar/strange\\sth", URL_UNESCAPE, S_OK, "res://c:\\tests/res\\foo bar/strange\\sth", FALSE}, + {"/A/../B/./C/../../test_remove_dot_segments", 0, S_OK, "/test_remove_dot_segments", FALSE}, + {"/A/../B/./C/../../test_remove_dot_segments", URL_FILE_USE_PATHURL, S_OK, "/test_remove_dot_segments", FALSE}, + {"/A/../B/./C/../../test_remove_dot_segments", URL_WININET_COMPATIBILITY, S_OK, "/test_remove_dot_segments", FALSE}, + {"/A/B\\C/D\\E", 0, S_OK, "/A/B\\C/D\\E", FALSE}, + {"/A/B\\C/D\\E", URL_FILE_USE_PATHURL, S_OK, "/A/B\\C/D\\E", FALSE}, + {"/A/B\\C/D\\E", URL_WININET_COMPATIBILITY, S_OK, "/A/B\\C/D\\E", FALSE}, + {"///A/../B", 0, S_OK, "///B", FALSE}, + {"///A/../B", URL_FILE_USE_PATHURL, S_OK, "///B", FALSE}, + {"///A/../B", URL_WININET_COMPATIBILITY, S_OK, "///B", FALSE}, {"A", 0, S_OK, "A", FALSE}, {"../A", 0, S_OK, "../A", FALSE}, {"A/../B", 0, S_OK, "B", TRUE}, diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 879a734..2caf998 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -372,6 +372,9 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, dwFlags |= URL_ESCAPE_UNSAFE; state = 5; is_file_url = TRUE; + } else if(url[0] == '/') { + state = 5; + is_file_url = TRUE; } while (*wk1) {

1 0

Józef Kucia : wined3d: Recognize SM5 dcl_uav_structured opcode.
by Alexandre Julliard Nov. 30, 2016

Nov. 30, 2016

Module: wine Branch: master Commit: a592f35d498964eb33a8884f6ebca5946440b541 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a592f35d498964eb33a8884f6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 30 12:47:32 2016 +0100 wined3d: Recognize SM5 dcl_uav_structured opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 14 ++++++++++++++ dlls/wined3d/shader_sm4.c | 14 +++++++++++++- dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f8665dd..7048021 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5249,6 +5249,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_TGSM_STRUCTURED */ NULL, /* WINED3DSIH_DCL_THREAD_GROUP */ NULL, /* WINED3DSIH_DCL_UAV_RAW */ NULL, + /* WINED3DSIH_DCL_UAV_STRUCTURED */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_hw_nop, /* WINED3DSIH_DEF */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3afed69..f1f615d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8912,6 +8912,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_TGSM_STRUCTURED */ NULL, /* WINED3DSIH_DCL_THREAD_GROUP */ NULL, /* WINED3DSIH_DCL_UAV_RAW */ NULL, + /* WINED3DSIH_DCL_UAV_STRUCTURED */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ shader_glsl_nop, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_glsl_nop, /* WINED3DSIH_DEF */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 05ab24d..765c682 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -90,6 +90,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_TGSM_STRUCTURED */ "dcl_tgsm_structured", /* WINED3DSIH_DCL_THREAD_GROUP */ "dcl_thread_group", /* WINED3DSIH_DCL_UAV_RAW */ "dcl_uav_raw", + /* WINED3DSIH_DCL_UAV_STRUCTURED */ "dcl_uav_structured", /* WINED3DSIH_DCL_UAV_TYPED */ "dcl_uav_typed", /* WINED3DSIH_DCL_VERTICES_OUT */ "dcl_maxOutputVertexCount", /* WINED3DSIH_DEF */ "def", @@ -1465,6 +1466,11 @@ static void shader_dump_uav_flags(struct wined3d_string_buffer *buffer, DWORD ua shader_addline(buffer, "_glc"); uav_flags &= ~WINED3DSUF_GLOBALLY_COHERENT; } + if (uav_flags & WINED3DSUF_ORDER_PRESERVING_COUNTER) + { + shader_addline(buffer, "_opc"); + uav_flags &= ~WINED3DSUF_ORDER_PRESERVING_COUNTER; + } if (uav_flags) shader_addline(buffer, "_unknown_flags(%#x)", uav_flags); @@ -2437,6 +2443,14 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe shader_addline(&buffer, " "); shader_dump_dst_param(&buffer, &ins.declaration.dst, &shader_version); } + else if (ins.handler_idx == WINED3DSIH_DCL_UAV_STRUCTURED) + { + shader_addline(&buffer, "%s", shader_opcode_names[ins.handler_idx]); + shader_dump_uav_flags(&buffer, ins.flags); + shader_addline(&buffer, " "); + shader_dump_dst_param(&buffer, &ins.declaration.structured_resource.reg, &shader_version); + shader_addline(&buffer, ", %u", ins.declaration.structured_resource.byte_stride); + } else if (ins.handler_idx == WINED3DSIH_DEF) { shader_addline(&buffer, "def c%u = %.8e, %.8e, %.8e, %.8e", shader_get_float_offset(ins.dst[0].reg.type, diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 94b1229..30dec14 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -65,7 +65,7 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM5_CONTROL_POINT_COUNT_MASK (0xffu << WINED3D_SM5_CONTROL_POINT_COUNT_SHIFT) #define WINED3D_SM5_UAV_FLAGS_SHIFT 11 -#define WINED3D_SM5_UAV_FLAGS_MASK (0xffu << WINED3D_SM5_UAV_FLAGS_SHIFT) +#define WINED3D_SM5_UAV_FLAGS_MASK (0x8fffu << WINED3D_SM5_UAV_FLAGS_SHIFT) #define WINED3D_SM5_SYNC_FLAGS_SHIFT 11 #define WINED3D_SM5_SYNC_FLAGS_MASK (0xffu << WINED3D_SM5_SYNC_FLAGS_SHIFT) @@ -241,6 +241,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DCL_THREAD_GROUP = 0x9b, WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, WINED3D_SM5_OP_DCL_UAV_RAW = 0x9d, + WINED3D_SM5_OP_DCL_UAV_STRUCTURED = 0x9e, WINED3D_SM5_OP_DCL_TGSM_RAW = 0x9f, WINED3D_SM5_OP_DCL_TGSM_STRUCTURED = 0xa0, WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, @@ -672,6 +673,15 @@ static void shader_sm5_read_dcl_uav_raw(struct wined3d_shader_instruction *ins, ins->flags = (opcode_token & WINED3D_SM5_UAV_FLAGS_MASK) >> WINED3D_SM5_UAV_FLAGS_SHIFT; } +static void shader_sm5_read_dcl_uav_structured(struct wined3d_shader_instruction *ins, + DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, + struct wined3d_sm4_data *priv) +{ + shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_UAV, &ins->declaration.structured_resource.reg); + ins->flags = (opcode_token & WINED3D_SM5_UAV_FLAGS_MASK) >> WINED3D_SM5_UAV_FLAGS_SHIFT; + ins->declaration.structured_resource.byte_stride = *tokens; +} + static void shader_sm5_read_dcl_tgsm_raw(struct wined3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct wined3d_sm4_data *priv) @@ -872,6 +882,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = shader_sm4_read_dcl_resource}, {WINED3D_SM5_OP_DCL_UAV_RAW, WINED3DSIH_DCL_UAV_RAW, "", "", shader_sm5_read_dcl_uav_raw}, + {WINED3D_SM5_OP_DCL_UAV_STRUCTURED, WINED3DSIH_DCL_UAV_STRUCTURED, "", "", + shader_sm5_read_dcl_uav_structured}, {WINED3D_SM5_OP_DCL_TGSM_RAW, WINED3DSIH_DCL_TGSM_RAW, "", "", shader_sm5_read_dcl_tgsm_raw}, {WINED3D_SM5_OP_DCL_TGSM_STRUCTURED, WINED3DSIH_DCL_TGSM_STRUCTURED, "", "", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 31ab656..cc3dd58 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -472,6 +472,7 @@ enum wined3d_shader_sync_flags enum wined3d_shader_uav_flags { WINED3DSUF_GLOBALLY_COHERENT = 0x20, + WINED3DSUF_ORDER_PRESERVING_COUNTER = 0x8000, }; enum wined3d_tessellator_domain @@ -615,6 +616,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_TGSM_STRUCTURED, WINED3DSIH_DCL_THREAD_GROUP, WINED3DSIH_DCL_UAV_RAW, + WINED3DSIH_DCL_UAV_STRUCTURED, WINED3DSIH_DCL_UAV_TYPED, WINED3DSIH_DCL_VERTICES_OUT, WINED3DSIH_DEF,

1 0

Józef Kucia : wined3d: Recognize SM5 dcl_uav_raw opcode.
by Alexandre Julliard Nov. 30, 2016

Nov. 30, 2016

Module: wine Branch: master Commit: 17c7cbeb887d4f91ff06c58b807b2c4da1c004e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17c7cbeb887d4f91ff06c58b8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 30 12:47:31 2016 +0100 wined3d: Recognize SM5 dcl_uav_raw opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 20 ++++++++++++++++++++ dlls/wined3d/shader_sm4.c | 14 ++++++++++++++ dlls/wined3d/wined3d_private.h | 6 ++++++ 5 files changed, 42 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index fe5b5c8..f8665dd 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5248,6 +5248,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_TGSM_RAW */ NULL, /* WINED3DSIH_DCL_TGSM_STRUCTURED */ NULL, /* WINED3DSIH_DCL_THREAD_GROUP */ NULL, + /* WINED3DSIH_DCL_UAV_RAW */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_hw_nop, /* WINED3DSIH_DEF */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ee5b6c3..3afed69 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8911,6 +8911,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_TGSM_RAW */ NULL, /* WINED3DSIH_DCL_TGSM_STRUCTURED */ NULL, /* WINED3DSIH_DCL_THREAD_GROUP */ NULL, + /* WINED3DSIH_DCL_UAV_RAW */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ shader_glsl_nop, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_glsl_nop, /* WINED3DSIH_DEF */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index e6eb351..05ab24d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -89,6 +89,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_TGSM_RAW */ "dcl_tgsm_raw", /* WINED3DSIH_DCL_TGSM_STRUCTURED */ "dcl_tgsm_structured", /* WINED3DSIH_DCL_THREAD_GROUP */ "dcl_thread_group", + /* WINED3DSIH_DCL_UAV_RAW */ "dcl_uav_raw", /* WINED3DSIH_DCL_UAV_TYPED */ "dcl_uav_typed", /* WINED3DSIH_DCL_VERTICES_OUT */ "dcl_maxOutputVertexCount", /* WINED3DSIH_DEF */ "def", @@ -1457,6 +1458,18 @@ static void shader_dump_sync_flags(struct wined3d_string_buffer *buffer, DWORD s shader_addline(buffer, "_unknown_flags(%#x)", sync_flags); } +static void shader_dump_uav_flags(struct wined3d_string_buffer *buffer, DWORD uav_flags) +{ + if (uav_flags & WINED3DSUF_GLOBALLY_COHERENT) + { + shader_addline(buffer, "_glc"); + uav_flags &= ~WINED3DSUF_GLOBALLY_COHERENT; + } + + if (uav_flags) + shader_addline(buffer, "_unknown_flags(%#x)", uav_flags); +} + static void shader_dump_tessellator_domain(struct wined3d_string_buffer *buffer, enum wined3d_tessellator_domain domain) { @@ -2417,6 +2430,13 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe ins.declaration.thread_group_size.y, ins.declaration.thread_group_size.z); } + else if (ins.handler_idx == WINED3DSIH_DCL_UAV_RAW) + { + shader_addline(&buffer, "%s", shader_opcode_names[ins.handler_idx]); + shader_dump_uav_flags(&buffer, ins.flags); + shader_addline(&buffer, " "); + shader_dump_dst_param(&buffer, &ins.declaration.dst, &shader_version); + } else if (ins.handler_idx == WINED3DSIH_DEF) { shader_addline(&buffer, "def c%u = %.8e, %.8e, %.8e, %.8e", shader_get_float_offset(ins.dst[0].reg.type, diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 2775a6e..94b1229 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -64,6 +64,9 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM5_CONTROL_POINT_COUNT_SHIFT 11 #define WINED3D_SM5_CONTROL_POINT_COUNT_MASK (0xffu << WINED3D_SM5_CONTROL_POINT_COUNT_SHIFT) +#define WINED3D_SM5_UAV_FLAGS_SHIFT 11 +#define WINED3D_SM5_UAV_FLAGS_MASK (0xffu << WINED3D_SM5_UAV_FLAGS_SHIFT) + #define WINED3D_SM5_SYNC_FLAGS_SHIFT 11 #define WINED3D_SM5_SYNC_FLAGS_MASK (0xffu << WINED3D_SM5_SYNC_FLAGS_SHIFT) @@ -237,6 +240,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DCL_HS_FORK_PHASE_INSTANCE_COUNT = 0x99, WINED3D_SM5_OP_DCL_THREAD_GROUP = 0x9b, WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, + WINED3D_SM5_OP_DCL_UAV_RAW = 0x9d, WINED3D_SM5_OP_DCL_TGSM_RAW = 0x9f, WINED3D_SM5_OP_DCL_TGSM_STRUCTURED = 0xa0, WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, @@ -660,6 +664,14 @@ static void shader_sm5_read_dcl_thread_group(struct wined3d_shader_instruction * ins->declaration.thread_group_size.z = *tokens++; } +static void shader_sm5_read_dcl_uav_raw(struct wined3d_shader_instruction *ins, + DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, + struct wined3d_sm4_data *priv) +{ + shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_UAV, &ins->declaration.dst); + ins->flags = (opcode_token & WINED3D_SM5_UAV_FLAGS_MASK) >> WINED3D_SM5_UAV_FLAGS_SHIFT; +} + static void shader_sm5_read_dcl_tgsm_raw(struct wined3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct wined3d_sm4_data *priv) @@ -858,6 +870,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = shader_sm5_read_dcl_thread_group}, {WINED3D_SM5_OP_DCL_UAV_TYPED, WINED3DSIH_DCL_UAV_TYPED, "", "", shader_sm4_read_dcl_resource}, + {WINED3D_SM5_OP_DCL_UAV_RAW, WINED3DSIH_DCL_UAV_RAW, "", "", + shader_sm5_read_dcl_uav_raw}, {WINED3D_SM5_OP_DCL_TGSM_RAW, WINED3DSIH_DCL_TGSM_RAW, "", "", shader_sm5_read_dcl_tgsm_raw}, {WINED3D_SM5_OP_DCL_TGSM_STRUCTURED, WINED3DSIH_DCL_TGSM_STRUCTURED, "", "", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c6acdd1..31ab656 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -469,6 +469,11 @@ enum wined3d_shader_sync_flags WINED3DSSF_GROUP_SHARED_MEMORY = 0x2, }; +enum wined3d_shader_uav_flags +{ + WINED3DSUF_GLOBALLY_COHERENT = 0x20, +}; + enum wined3d_tessellator_domain { WINED3D_TESSELLATOR_DOMAIN_LINE = 1, @@ -609,6 +614,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_TGSM_RAW, WINED3DSIH_DCL_TGSM_STRUCTURED, WINED3DSIH_DCL_THREAD_GROUP, + WINED3DSIH_DCL_UAV_RAW, WINED3DSIH_DCL_UAV_TYPED, WINED3DSIH_DCL_VERTICES_OUT, WINED3DSIH_DEF,

1 0