March 2021 - Wine-commits - list.winehq.org

Jacek Caban : urlmon: Support version option in ObtainUserAgentString.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 3d95eef66f75a5c933666d8face08b7073733a17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d95eef66f75a5c933666d8f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 25 19:34:22 2021 +0100 urlmon: Support version option in ObtainUserAgentString. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/session.c | 96 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 65 insertions(+), 31 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index b74d56166d9..0a1be0ba367 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -505,61 +505,95 @@ static BOOL get_url_encoding(HKEY root, DWORD *encoding) static LPWSTR user_agent; -static size_t obtain_user_agent(WCHAR *ret, size_t size) +static size_t obtain_user_agent(unsigned int version, WCHAR *ret, size_t size) { OSVERSIONINFOW info = {sizeof(info)}; const WCHAR *os_type, *is_nt; - DWORD res, idx=0; + BOOL is_wow, quirks = FALSE; + DWORD res; size_t len = 0; - BOOL is_wow; HKEY key; - EnterCriticalSection(&session_cs); - if(user_agent) { - len = wcslen(user_agent) + 1; - memcpy(ret, user_agent, min(size, len) * sizeof(WCHAR)); + if(version & 0x1000) { + version &= ~0x1000; + if(version == 7) + quirks = TRUE; + else + version = 7; + }else if(version < 7) { + version = 7; + } + if(version > 11) { + FIXME("Unsupported version %u\n", version); + version = 11; + } + + if(version < 7 || (version == 7 && !quirks)) { + EnterCriticalSection(&session_cs); + if(user_agent) { + len = wcslen(user_agent) + 1; + memcpy(ret, user_agent, min(size, len) * sizeof(WCHAR)); + } + LeaveCriticalSection(&session_cs); + if(len) return len; + } + + swprintf(ret, size, L"Mozilla/%s (", version < 9 ? L"4.0" : L"5.0"); + len = lstrlenW(ret); + if(version < 11) { + swprintf(ret + len, size - len, L"compatible; MSIE %u.0; ", version); + len += wcslen(ret + len); } - LeaveCriticalSection(&session_cs); - if(len) return len; GetVersionExW(&info); is_nt = info.dwPlatformId == VER_PLATFORM_WIN32_NT ? L"NT " : L""; if(sizeof(void*) == 8) +#ifdef __x86_64__ os_type = L"Win64; x64; "; +#else + os_type = L"Win64; "; +#endif else if(IsWow64Process(GetCurrentProcess(), &is_wow) && is_wow) os_type = L"WOW64; "; else os_type = L""; - swprintf(ret, size, L"Mozilla/4.0 (compatible; MSIE 7.0; Windows %s%d.%d; %sTrident/7.0", - is_nt, info.dwMajorVersion, info.dwMinorVersion, os_type); + swprintf(ret + len, size - len, L"Windows %s%d.%d; %s", is_nt, info.dwMajorVersion, + info.dwMinorVersion, os_type); len = lstrlenW(ret); - res = RegOpenKeyW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\" - "Internet Settings\\5.0\\User Agent\\Post Platform", &key); - if(res == ERROR_SUCCESS) { - DWORD value_len; + if(!quirks) { + wcscpy(ret + len, L"Trident/7.0"); + len += ARRAY_SIZE(L"Trident/7.0") - 1; + } - while(1) { - if(idx) { - ret[len++] = ';'; - ret[len++] = ' '; + if(version < 9) { + res = RegOpenKeyW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\" + "Internet Settings\\5.0\\User Agent\\Post Platform", &key); + if(res == ERROR_SUCCESS) { + DWORD value_len, idx; + + for(idx = 0;; idx++) { + if(idx) { + ret[len++] = ';'; + ret[len++] = ' '; + } + value_len = size - len - 2; + res = RegEnumValueW(key, idx, ret + len, &value_len, NULL, NULL, NULL, NULL); + if(res != ERROR_SUCCESS) + break; + + len += value_len; } - value_len = size - len - 2; - res = RegEnumValueW(key, idx, ret + len, &value_len, NULL, NULL, NULL, NULL); - if(res != ERROR_SUCCESS) - break; - idx++; - len += value_len; + RegCloseKey(key); + if(idx) len -= 2; } - - RegCloseKey(key); } + wcscpy(ret + len, version >= 11 ? L"; rv:11.0) like Gecko" : L")"); + len += wcslen(ret + len) + 1; - ret[len++] = ')'; - ret[len++] = 0; TRACE("Using user agent %s\n", debugstr_w(ret)); return len; } @@ -570,7 +604,7 @@ static void ensure_user_agent(void) if(!user_agent) { WCHAR buf[1024]; - obtain_user_agent(buf, ARRAY_SIZE(buf)); + obtain_user_agent(0, buf, ARRAY_SIZE(buf)); user_agent = heap_strdupW(buf); } @@ -704,7 +738,7 @@ HRESULT WINAPI ObtainUserAgentString(DWORD option, char *ret, DWORD *ret_size) if(!ret || !ret_size) return E_INVALIDARG; - len = obtain_user_agent(buf, ARRAY_SIZE(buf)); + len = obtain_user_agent(option, buf, ARRAY_SIZE(buf)); size = WideCharToMultiByte(CP_ACP, 0, buf, len, NULL, 0, NULL, NULL); if(size <= *ret_size) WideCharToMultiByte(CP_ACP, 0, buf, len, ret, *ret_size+1, NULL, NULL);

1 0

Jacek Caban : urlmon/tests: Add more user agent string tests.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: b599464326b72f35959e1458f7baa3e5cd973bdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b599464326b72f35959e1458… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 25 19:34:36 2021 +0100 urlmon/tests: Add more user agent string tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/misc.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index abe77ac7eaf..5f468b80286 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1448,13 +1448,27 @@ static void test_UrlMkGetSessionOption(void) ok(encoding == 0xdeadbeef, "encoding = %08x, exepcted 0xdeadbeef\n", encoding); } +static size_t check_prefix(const char *str, const char *prefix) +{ + size_t len = strlen(prefix); + if(memcmp(str, prefix, len)) { + ok(0, "no %s prefix in %s\n", wine_dbgstr_a(prefix), wine_dbgstr_a(str)); + return 0; + } + return len; +} + static void test_user_agent(void) { static const CHAR expected[] = "Mozilla/4.0 (compatible; MSIE "; static char test_str[] = "test"; static char test2_str[] = "test\0test"; static CHAR str[3]; + OSVERSIONINFOW os_info = {sizeof(os_info)}; + char ua[1024], buf[64]; + unsigned int i; LPSTR str2 = NULL; + BOOL is_wow = FALSE; HRESULT hres; DWORD size, saved; @@ -1493,6 +1507,67 @@ static void test_user_agent(void) "user agent was \"%s\", expected to start with \"%s\"\n", str2, expected); + GetVersionExW(&os_info); + if (sizeof(void*) == 4) IsWow64Process(GetCurrentProcess(), &is_wow); + + for(i = 1; i < 12; i++) { + const char *p = ua; + + if (i != 7) { + size = sizeof(ua); + hres = pObtainUserAgentString(i | 0x1000, ua, &size); + ok(hres == S_OK, "ObtainUserAgentString failed: %08x\n", hres); + ok(size == strlen(ua) + 1, "unexpected size %u, expected %u\n", size, strlen(ua) + 1); + ok(!strcmp(ua, str2), "unexpected UA for version %u %s, expected %s\n", + i, wine_dbgstr_a(ua), wine_dbgstr_a(str2)); + } + + size = sizeof(ua); + hres = pObtainUserAgentString(i != 1 ? i : 0x1007, ua, &size); + ok(hres == S_OK, "ObtainUserAgentString failed: %08x\n", hres); + ok(size == strlen(ua) + 1, "unexpected size %u, expected %u\n", size, strlen(ua) + 1); + if(i < 8 && i != 1) + ok(!strcmp(ua, str2), "unexpected UA for version %u %s, expected %s\n", + i, wine_dbgstr_a(ua), wine_dbgstr_a(str2)); + + p += check_prefix(p, "Mozilla/"); + p += check_prefix(p, i < 9 ? "4.0 (" : "5.0 ("); + if(i < 11) { + p += check_prefix(p, "compatible; "); + sprintf(buf, "MSIE %u.0; ", max(i, 7)); + p += check_prefix(p, buf); + } + sprintf(buf, "Windows NT %u.%u; ", os_info.dwMajorVersion, os_info.dwMinorVersion); + p += check_prefix(p, buf); + if(is_wow) { + p += check_prefix(p, "WOW64; "); + }else if(sizeof(void*) == 8) { + p += check_prefix(p, "Win64; "); +#ifdef __x86_64__ + p += check_prefix(p, "x64; "); +#endif + } + if(i != 1) { + p += check_prefix(p, "Trident/"); + ok('5' <= *p && *p <= '8', "unexpected version '%c'\n", *p); + if(*p < '7') { + win_skip("skipping UA tests, too old IE\n"); + break; + } + p++; /* skip version number */ + p += check_prefix(p, ".0"); + } + if(i == 11) { + p += check_prefix(p, "; rv:11.0) like Gecko"); + }else { + if(i < 9) + p = strchr(p, ')'); + p += check_prefix(p, ")"); + } + + ok(!*p, "unexpected suffix %s for version %u\n", wine_dbgstr_a(p), i); + } + size = saved+10; hres = pObtainUserAgentString(0, str2, &size); ok(hres == S_OK, "ObtainUserAgentString failed: %08x\n", hres);

1 0

Mark Harmstone : ntstatus.h: Add MUI statuses.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 4ccf44bb92239d3ad560fe08f7fd5e31825dc076 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ccf44bb92239d3ad560fe08… Author: Mark Harmstone <mark(a)harmstone.com> Date: Thu Mar 25 01:56:20 2021 +0000 ntstatus.h: Add MUI statuses. Signed-off-by: Mark Harmstone <mark(a)harmstone.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ntstatus.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/ntstatus.h b/include/ntstatus.h index f0110659f0c..e049be0bdbd 100644 --- a/include/ntstatus.h +++ b/include/ntstatus.h @@ -1330,6 +1330,14 @@ #define STATUS_TS_INCOMPATIBLE_SESSIONS ((NTSTATUS) 0xC00A0039) #define STATUS_TS_VIDEO_SUBSYSTEM_ERROR ((NTSTATUS) 0xC00A003A) +#define STATUS_MUI_FILE_NOT_FOUND ((NTSTATUS)0xC00B0001) +#define STATUS_MUI_INVALID_FILE ((NTSTATUS)0xC00B0002) +#define STATUS_MUI_INVALID_RC_CONFIG ((NTSTATUS)0xC00B0003) +#define STATUS_MUI_INVALID_LOCALE_NAME ((NTSTATUS)0xC00B0004) +#define STATUS_MUI_INVALID_ULTIMATEFALLBACK_NAME ((NTSTATUS)0xC00B0005) +#define STATUS_MUI_FILE_NOT_LOADED ((NTSTATUS)0xC00B0006) +#define STATUS_RESOURCE_ENUM_USER_STOP ((NTSTATUS)0xC00B0007) + #define STATUS_CLUSTER_INVALID_NODE ((NTSTATUS) 0xC0130001) #define STATUS_CLUSTER_NODE_EXISTS ((NTSTATUS) 0xC0130002) #define STATUS_CLUSTER_JOIN_IN_PROGRESS ((NTSTATUS) 0xC0130003)

1 0

Mark Harmstone : ntdll: Add error mapping for MUI statuses.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 9ea1134eea7a0834a4efeafa380d1ed03eb271db URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ea1134eea7a0834a4efeafa… Author: Mark Harmstone <mark(a)harmstone.com> Date: Thu Mar 25 01:56:21 2021 +0000 ntdll: Add error mapping for MUI statuses. Signed-off-by: Mark Harmstone <mark(a)harmstone.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/error.c | 18 +++++++++++++----- dlls/ntdll/make_errors | 7 +++++++ dlls/ntdll/tests/error.c | 7 +++++++ 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/error.c b/dlls/ntdll/error.c index fb630fa9864..738f55b42dc 100644 --- a/dlls/ntdll/error.c +++ b/dlls/ntdll/error.c @@ -143,7 +143,7 @@ void WINAPI RtlSetLastWin32ErrorAndNtStatusFromNtStatus( NTSTATUS status ) /* conversion table, generated by ./make_errors */ -static const DWORD error_map[1579] = +static const DWORD error_map[1586] = { ERROR_WAIT_1, /* 00000001 (STATUS_WAIT_1) */ ERROR_WAIT_2, /* 00000002 (STATUS_WAIT_2) */ @@ -1544,6 +1544,13 @@ static const DWORD error_map[1579] = ERROR_CTX_SECURITY_LAYER_ERROR, /* c00a0038 (STATUS_CTX_SECURITY_LAYER_ERROR) */ ERROR_TS_INCOMPATIBLE_SESSIONS, /* c00a0039 (STATUS_TS_INCOMPATIBLE_SESSIONS) */ ERROR_TS_VIDEO_SUBSYSTEM_ERROR, /* c00a003a (STATUS_TS_VIDEO_SUBSYSTEM_ERROR) */ + ERROR_MUI_FILE_NOT_FOUND, /* c00b0001 (STATUS_MUI_FILE_NOT_FOUND) */ + ERROR_MUI_INVALID_FILE, /* c00b0002 (STATUS_MUI_INVALID_FILE) */ + ERROR_MUI_INVALID_RC_CONFIG, /* c00b0003 (STATUS_MUI_INVALID_RC_CONFIG) */ + ERROR_MUI_INVALID_LOCALE_NAME, /* c00b0004 (STATUS_MUI_INVALID_LOCALE_NAME) */ + ERROR_MUI_INVALID_ULTIMATEFALLBACK_NAME, /* c00b0005 (STATUS_MUI_INVALID_ULTIMATEFALLBACK_NAME) */ + ERROR_MUI_FILE_NOT_LOADED, /* c00b0006 (STATUS_MUI_FILE_NOT_LOADED) */ + ERROR_RESOURCE_ENUM_USER_STOP, /* c00b0007 (STATUS_RESOURCE_ENUM_USER_STOP) */ ERROR_CLUSTER_INVALID_NODE, /* c0130001 (STATUS_CLUSTER_INVALID_NODE) */ ERROR_CLUSTER_NODE_EXISTS, /* c0130002 (STATUS_CLUSTER_NODE_EXISTS) */ ERROR_CLUSTER_JOIN_IN_PROGRESS, /* c0130003 (STATUS_CLUSTER_JOIN_IN_PROGRESS) */ @@ -1726,7 +1733,7 @@ static const DWORD error_map[1579] = ERROR_VOLMGR_RAID5_NOT_SUPPORTED, /* c038005c (STATUS_VOLMGR_RAID5_NOT_SUPPORTED) */ }; -static const struct { ULONG start, end, offset; } table[42] = +static const struct { ULONG start, end, offset; } table[43] = { { 0x00000001, 0x00000003, 0 }, { 0x0000003f, 0x0000003f, 3 }, @@ -1767,9 +1774,10 @@ static const struct { ULONG start, end, offset; } table[42] = { 0xc0030059, 0xc0030061, 1341 }, { 0xc00a0001, 0xc00a0018, 1350 }, { 0xc00a0022, 0xc00a003a, 1374 }, - { 0xc0130001, 0xc0130031, 1399 }, - { 0xc0150001, 0xc0150027, 1448 }, - { 0xc0380001, 0xc038005c, 1487 }, + { 0xc00b0001, 0xc00b0007, 1399 }, + { 0xc0130001, 0xc0130031, 1406 }, + { 0xc0150001, 0xc0150027, 1455 }, + { 0xc0380001, 0xc038005c, 1494 }, }; static ULONG map_status( NTSTATUS status ) diff --git a/dlls/ntdll/make_errors b/dlls/ntdll/make_errors index bedce57fe7a..5b7885e0427 100755 --- a/dlls/ntdll/make_errors +++ b/dlls/ntdll/make_errors @@ -1314,6 +1314,13 @@ my %error_map = qw( STATUS_CTX_SECURITY_LAYER_ERROR ERROR_CTX_SECURITY_LAYER_ERROR STATUS_TS_INCOMPATIBLE_SESSIONS ERROR_TS_INCOMPATIBLE_SESSIONS STATUS_TS_VIDEO_SUBSYSTEM_ERROR ERROR_TS_VIDEO_SUBSYSTEM_ERROR + STATUS_MUI_FILE_NOT_FOUND ERROR_MUI_FILE_NOT_FOUND + STATUS_MUI_INVALID_FILE ERROR_MUI_INVALID_FILE + STATUS_MUI_INVALID_RC_CONFIG ERROR_MUI_INVALID_RC_CONFIG + STATUS_MUI_INVALID_LOCALE_NAME ERROR_MUI_INVALID_LOCALE_NAME + STATUS_MUI_INVALID_ULTIMATEFALLBACK_NAME ERROR_MUI_INVALID_ULTIMATEFALLBACK_NAME + STATUS_MUI_FILE_NOT_LOADED ERROR_MUI_FILE_NOT_LOADED + STATUS_RESOURCE_ENUM_USER_STOP ERROR_RESOURCE_ENUM_USER_STOP STATUS_CLUSTER_INVALID_NODE ERROR_CLUSTER_INVALID_NODE STATUS_CLUSTER_NODE_EXISTS ERROR_CLUSTER_NODE_EXISTS STATUS_CLUSTER_JOIN_IN_PROGRESS ERROR_CLUSTER_JOIN_IN_PROGRESS diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c index 05ba22223e3..c812aa779cc 100644 --- a/dlls/ntdll/tests/error.c +++ b/dlls/ntdll/tests/error.c @@ -1455,6 +1455,13 @@ static void run_error_tests(void) cmp2(STATUS_CTX_SECURITY_LAYER_ERROR, ERROR_CTX_SECURITY_LAYER_ERROR); cmp2(STATUS_TS_INCOMPATIBLE_SESSIONS, ERROR_TS_INCOMPATIBLE_SESSIONS); cmp2(STATUS_TS_VIDEO_SUBSYSTEM_ERROR, ERROR_TS_VIDEO_SUBSYSTEM_ERROR); + cmp2(STATUS_MUI_FILE_NOT_FOUND, ERROR_MUI_FILE_NOT_FOUND); + cmp2(STATUS_MUI_INVALID_FILE, ERROR_MUI_INVALID_FILE); + cmp2(STATUS_MUI_INVALID_RC_CONFIG, ERROR_MUI_INVALID_RC_CONFIG); + cmp2(STATUS_MUI_INVALID_LOCALE_NAME, ERROR_MUI_INVALID_LOCALE_NAME); + cmp2(STATUS_MUI_INVALID_ULTIMATEFALLBACK_NAME, ERROR_MUI_INVALID_ULTIMATEFALLBACK_NAME); + cmp2(STATUS_MUI_FILE_NOT_LOADED, ERROR_MUI_FILE_NOT_LOADED); + cmp2(STATUS_RESOURCE_ENUM_USER_STOP, ERROR_RESOURCE_ENUM_USER_STOP); cmp2(STATUS_CLUSTER_NO_NET_ADAPTERS, ERROR_CLUSTER_NO_NET_ADAPTERS); cmp2(STATUS_CLUSTER_POISONED, ERROR_CLUSTER_POISONED); cmp2(STATUS_CLUSTER_NON_CSV_PATH, ERROR_NON_CSV_PATH);

1 0

Jacek Caban : iphlpapi: Use nameless unions.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 1fe893a9efa09c194bcc832864d94684d7e70e06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fe893a9efa09c194bcc8328… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 25 21:40:09 2021 +0100 iphlpapi: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/Makefile.in | 1 - dlls/iphlpapi/ipstats.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in index e65e9c7e474..3a2227f5ebb 100644 --- a/dlls/iphlpapi/Makefile.in +++ b/dlls/iphlpapi/Makefile.in @@ -2,7 +2,6 @@ MODULE = iphlpapi.dll IMPORTLIB = iphlpapi IMPORTS = advapi32 EXTRALIBS = $(RESOLV_LIBS) $(KSTAT_LIBS) $(PROCSTAT_LIBS) -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION C_SRCS = \ icmp.c \ diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 36f90f2c3a8..a15a0abad22 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2437,7 +2437,7 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE if (class >= UDP_TABLE_OWNER_MODULE) { row.liCreateTimestamp.QuadPart = 0; /* FIXME */ - row.u.dwFlags = 0; + row.dwFlags = 0; memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); } if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) @@ -2547,8 +2547,8 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE if (class >= UDP_TABLE_OWNER_MODULE) { row.liCreateTimestamp.QuadPart = 0; /* FIXME */ - row.u.dwFlags = 0; - row.u.SpecificPortBind = !(pINData->inp_flags & INP_ANONPORT); + row.dwFlags = 0; + row.SpecificPortBind = !(pINData->inp_flags & INP_ANONPORT); memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); } if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) @@ -3087,7 +3087,7 @@ DWORD build_udp6_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE if (class >= UDP_TABLE_OWNER_MODULE) { row.liCreateTimestamp.QuadPart = 0; /* FIXME */ - row.u.dwFlags = 0; + row.dwFlags = 0; memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); } if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size ))) @@ -3185,8 +3185,8 @@ DWORD build_udp6_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE if (class >= UDP_TABLE_OWNER_MODULE) { row.liCreateTimestamp.QuadPart = 0; /* FIXME */ - row.u.dwFlags = 0; - row.u.SpecificPortBind = !(in->inp_flags & INP_ANONPORT); + row.dwFlags = 0; + row.SpecificPortBind = !(in->inp_flags & INP_ANONPORT); memset( &row.OwningModuleInfo, 0, sizeof(row.OwningModuleInfo) ); } if (!(table = append_table_row( heap, flags, table, &table_size, &count, &row, row_size )))

1 0

Gijs Vermeulen : wineqtdecoder: Use nameless unions.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 596fa641c61e20448371801f5abe248da7493224 URL: https://source.winehq.org/git/wine.git/?a=commit;h=596fa641c61e20448371801f… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Mar 25 22:23:11 2021 +0100 wineqtdecoder: Use nameless unions. Fixes a regression caused by b39b9eea39b19a8f91543b8350ed822d0fd9eef0. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineqtdecoder/main.c b/dlls/wineqtdecoder/main.c index 435951ba933..82563989192 100644 --- a/dlls/wineqtdecoder/main.c +++ b/dlls/wineqtdecoder/main.c @@ -27,6 +27,7 @@ #define COBJMACROS #define NONAMELESSSTRUCT #define NONAMELESSUNION +#define WINE_NO_NAMELESS_EXTENSION #include "windef.h" #include "winbase.h"

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 34652f37e443a9e7698f66d13df3b4811b1c0cc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34652f37e443a9e7698f66d1… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Mar 25 21:27:52 2021 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 159 insertions(+), 16 deletions(-) diff --git a/po/lt.po b/po/lt.po index 1b5f22f4feb..ca0c71b8f3d 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-03-05 09:05+0200\n" +"PO-Revision-Date: 2021-03-25 21:21+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -14224,17 +14224,6 @@ msgid "Icons (*.ico)" msgstr "Piktogramos (*.ico)" #: programs/reg/reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | IMPORT | EXPORT | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -14250,7 +14239,7 @@ msgstr "" " REG [operacija] [parametrai]\n" "\n" "Palaikomos operacijos:\n" -" ADD | DELETE | IMPORT | EXPORT | QUERY\n" +" ADD | DELETE | EXPORT | IMPORT | QUERY\n" "\n" "Pagalbai apie specifinę operaciją, įrašykite:\n" " REG [operacija] /?\n" @@ -14305,6 +14294,55 @@ msgid "" " Modify the registry without prompting for confirmation.\n" "\n" msgstr "" +"REG ADD <raktas> [/v reikšmės_vardas | /ve] [/t tipas] [/s skirtukas] [/d " +"duomenys] [/f]\n" +"\n" +" Prideda raktą į registrą arba prideda naują reikšmę į duotą registro " +"raktą.\n" +"\n" +" <raktas>\n" +" Registro raktas pridėjimui, arba, jei nurodytas bet kuris iš [/v] ar [/" +"ve],\n" +" raktas, į kurį pridėti naujus registro duomenis.\n" +"\n" +" Formatas: ŠAKNIS\\Poraktis\n" +"\n" +" ŠAKNIS: Numatytasis registro raktas. Privalo būti vienas iš:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Poraktis: Pilnas kelias iki registro rakto po nurodytu ŠAKNIES raktu.\n" +"\n" +" /v <reikšmės_vardas>\n" +" Pridedamos registro reikšmės vardas.\n" +"\n" +" /ve\n" +" Pridėti bevardę registro reikšmę. Šis parametras modifikuoja registro\n" +" reikšmę (numatytoji).\n" +"\n" +" /t <tipas>\n" +" Į registrą pridedamų duomenų tipas. Jei nurodytas [/t],\n" +" <tipas> privalo būti vienas iš:\n" +"\n" +" REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" +" REG_DWORD | REG_BINARY | REG_NONE\n" +"\n" +" Jei [/t] nenurodytas, numatytasis duomenų tipas yra REG_SZ.\n" +"\n" +" /s <skirtukas>\n" +" Simbolis naudojamas eilutėms REG_MULTI_SZ duomenyse atskirti.\n" +" Jei [/s] nenurodytas, numatytasis skirtukas yra \\0.\n" +"\n" +" /d <duomenys>\n" +" Duomenys pridėjimui į naują registro reikšmę.\n" +"\n" +" /f\n" +" Modifikuoti registrą be patvirtinimo klausimo.\n" +"\n" #: programs/reg/reg.rc:92 msgid "" @@ -14344,6 +14382,43 @@ msgid "" " prompting for confirmation.\n" "\n" msgstr "" +"REG DELETE <raktas> [/v reikšmės_vardas | /ve | /va] [/f]\n" +"\n" +" Pašalina registro raktą (įskaitant visus porakčius ir reikšmes), arba " +"pašalina\n" +" vieną ar daugiau reikšmių duotame registro rakte.\n" +"\n" +" <raktas>\n" +" Registro raktas pašalinimui, arba, jei nurodytas bet kuris iš [/v], [/" +"ve] ar [/va],\n" +" raktas, kuriame pašalinti vieną ar daugiau reikšmių.\n" +"\n" +" Formatas: ŠAKNIS\\Poraktis\n" +"\n" +" ŠAKNIS: Numatytasis registro raktas. Privalo būti vienas iš:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Poraktis: Pilnas kelias iki registro rakto po nurodytu ŠAKNIES raktu.\n" +"\n" +" /v <reikšmės_vardas>\n" +" Šalinamos registro reikšmės vardas.\n" +"\n" +" /ve\n" +" Pašalinti bevardę registro reikšmę. Šis parametras pašalina registro\n" +" reikšmę (numatytoji).\n" +"\n" +" /va\n" +" Pašalinti visas registro rakto reikšmes.\n" +"\n" +" /f\n" +" Pašalinti registro raktą (įskaitant visus porakčius ir reikšmes) be\n" +" patvirtinimo klausimo.\n" +"\n" #: programs/reg/reg.rc:114 msgid "" @@ -14379,16 +14454,49 @@ msgid "" " List all registry entries under <key> and its subkeys.\n" "\n" msgstr "" +"REG QUERY <raktas> [/v reikšmės_vardas | /ve] [/s]\n" +"\n" +" Užklausia nurodyto registro rakto ir išveda visus tiesioginius porakčius, " +"reikšmes\n" +" ir duomenis tame rakte. Naudokite [/s] rekursyviai užklausti kiekvieno " +"porakčio.\n" +"\n" +" <raktas>\n" +" Registro raktas užklausimui.\n" +"\n" +" Formatas: ŠAKNIS\\Poraktis\n" +"\n" +" ŠAKNIS: Numatytasis registro raktas. Privalo būti vienas iš:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Poraktis: Pilnas kelias iki registro rakto po nurodytu ŠAKNIES raktu.\n" +"\n" +" /v <reikšmės_vardas>\n" +" Užklausiamos registro reikšmės vardas. Jei nenurodytas nei [/v], nei [/" +"ve],\n" +" išvedamos visos rakto <raktas> reikšmės.\n" +"\n" +" /ve\n" +" Užklausti bevardės registro reikšmės. Šis parametras užklausia " +"registro\n" +" reikšmės (numatytoji).\n" +"\n" +" /s\n" +" Išvesti visus registro įrašus po raktu <raktas> ir jo porakčiais.\n" +"\n" #: programs/reg/reg.rc:116 msgid "The operation completed successfully\n" msgstr "Operacija sėkmingai įvykdyta\n" #: programs/reg/reg.rc:117 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid registry key\n" -msgstr "reg: Netinkamas rakto vardas\n" +msgstr "reg: Netinkamas registro raktas\n" #: programs/reg/reg.rc:118 msgid "reg: Invalid command line parameters\n" @@ -14494,6 +14602,13 @@ msgid "" " The name and path of the registry file to import.\n" "\n" msgstr "" +"REG IMPORT <failas>\n" +"\n" +" Importuoja raktus, reikšmes ir duomenis iš nurodyto failo į registrą.\n" +"\n" +" <failas>\n" +" Registro failo, kuris bus importuotas, pavadinimas ir kelias.\n" +"\n" #: programs/reg/reg.rc:149 msgid "reg: The file '%1' was not found.\n" @@ -14537,6 +14652,34 @@ msgid "" " Overwrite <file> without prompting for confirmation.\n" "\n" msgstr "" +"REG EXPORT <raktas> <failas> [/y]\n" +"\n" +" Eksportuoja nurodytą registro raktą (įskaitant visus porakčius ir " +"reikšmes)\n" +" į failą\n" +"\n" +" <raktas>\n" +" Registro raktas eksportui.\n" +"\n" +" Formatas: ŠAKNIS\\Poraktis\n" +"\n" +" ŠAKNIS: Numatytasis registro raktas. Privalo būti vienas iš:\n" +"\n" +" HKEY_LOCAL_MACHINE | HKLM\n" +" HKEY_CURRENT_USER | HKCU\n" +" HKEY_CLASSES_ROOT | HKCR\n" +" HKEY_USERS | HKU\n" +" HKEY_CURRENT_CONFIG | HKCC\n" +"\n" +" Poraktis: Pilnas kelias iki registro rakto po nurodytu ŠAKNIES raktu.\n" +"\n" +" <failas>\n" +" Registro failo, kuris bus sukurtas, pavadinimas ir kelias.\n" +" Failas privalo turėti plėtinį .reg.\n" +"\n" +" /y\n" +" Perrašyti <failas> be patvirtinimo klausimo.\n" +"\n" #: programs/reg/reg.rc:172 msgid "reg: Invalid system key [%1]\n"

1 0

Nikolay Sivov : mfplat: Implement GetScanline0AndPitch() for d3d11 buffers.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 01059d5946575d245d814f4c8247d4bae19887be URL: https://source.winehq.org/git/wine.git/?a=commit;h=01059d5946575d245d814f4c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 25 12:40:32 2021 +0300 mfplat: Implement GetScanline0AndPitch() for d3d11 buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 26 ++++++++++++++++++++++++-- dlls/mfplat/tests/mfplat.c | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index fbd3b7786b6..e6bf52662e8 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -985,9 +985,31 @@ static HRESULT WINAPI dxgi_surface_buffer_Unlock2D(IMF2DBuffer2 *iface) static HRESULT WINAPI dxgi_surface_buffer_GetScanline0AndPitch(IMF2DBuffer2 *iface, BYTE **scanline0, LONG *pitch) { - FIXME("%p, %p, %p.\n", iface, scanline0, pitch); + struct memory_buffer *buffer = impl_from_IMF2DBuffer2(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, scanline0, pitch); + + if (!scanline0 || !pitch) + return E_POINTER; + + EnterCriticalSection(&buffer->cs); + + if (!buffer->_2d.locks) + { + *scanline0 = NULL; + *pitch = 0; + hr = HRESULT_FROM_WIN32(ERROR_WAS_UNLOCKED); + } + else + { + *scanline0 = buffer->dxgi_surface.map_desc.pData; + *pitch = buffer->dxgi_surface.map_desc.RowPitch; + } + + LeaveCriticalSection(&buffer->cs); + + return hr; } static HRESULT WINAPI dxgi_surface_buffer_Lock2DSize(IMF2DBuffer2 *iface, MF2DBuffer_LockFlags flags, diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index dacad924ae9..18361d4d721 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6346,11 +6346,11 @@ static void test_dxgi_surface_buffer(void) IMFMediaBuffer *buffer; ID3D11Device *device; BYTE buff[64 * 64 * 4]; + BYTE *data, *data2; + LONG pitch, pitch2; UINT index, size; IUnknown *obj; HRESULT hr; - BYTE *data; - LONG pitch; if (!pMFCreateDXGISurfaceBuffer) { @@ -6485,6 +6485,9 @@ todo_wine hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&_2d_buffer); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMF2DBuffer_GetScanline0AndPitch(_2d_buffer, &data2, &pitch2); + ok(hr == HRESULT_FROM_WIN32(ERROR_WAS_UNLOCKED), "Unexpected hr %#x.\n", hr); + hr = IMF2DBuffer_Lock2D(_2d_buffer, &data, &pitch); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!!data && pitch == desc.Width * 4, "Unexpected pitch %d.\n", pitch); @@ -6493,6 +6496,10 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!!data && pitch == desc.Width * 4, "Unexpected pitch %d.\n", pitch); + hr = IMF2DBuffer_GetScanline0AndPitch(_2d_buffer, &data2, &pitch2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(data2 == data && pitch2 == pitch, "Unexpected data/pitch.\n"); + hr = IMFMediaBuffer_Lock(buffer, &data, &max_length, &cur_length); todo_wine ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); @@ -6509,6 +6516,27 @@ todo_wine IMF2DBuffer_Release(_2d_buffer); IMFMediaBuffer_Release(buffer); + /* Bottom up. */ + hr = pMFCreateDXGISurfaceBuffer(&IID_ID3D11Texture2D, (IUnknown *)texture, 0, TRUE, &buffer); + ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); + + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&_2d_buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMF2DBuffer_Lock2D(_2d_buffer, &data, &pitch); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!data && pitch == desc.Width * 4, "Unexpected pitch %d.\n", pitch); + + hr = IMF2DBuffer_GetScanline0AndPitch(_2d_buffer, &data2, &pitch2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(data2 == data && pitch2 == pitch, "Unexpected data/pitch.\n"); + + hr = IMF2DBuffer_Unlock2D(_2d_buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMF2DBuffer_Release(_2d_buffer); + IMFMediaBuffer_Release(buffer); + ID3D11Texture2D_Release(texture); /* Subresource index 1. */

1 0

Nikolay Sivov : mfplat: Always initialize output arguments in GetScanline0AndPitch() for d3d9 buffers.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: ca52f07565b52718f87881849bff136cf053c07c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca52f07565b52718f8788184… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 25 12:40:33 2021 +0300 mfplat: Always initialize output arguments in GetScanline0AndPitch() for d3d9 buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index e6bf52662e8..d4efafdea45 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -689,7 +689,11 @@ static HRESULT WINAPI d3d9_surface_buffer_GetScanline0AndPitch(IMF2DBuffer2 *ifa EnterCriticalSection(&buffer->cs); if (!buffer->_2d.locks) + { + *scanline0 = NULL; + *pitch = 0; hr = HRESULT_FROM_WIN32(ERROR_WAS_UNLOCKED); + } else { *scanline0 = buffer->d3d9_surface.rect.pBits;

1 0

Nikolay Sivov : mfplat: Rename media buffer structure to better reflect its usage.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 81c7633154215c86d39e7e8c49aad5608b500d3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=81c7633154215c86d39e7e8c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 25 12:40:34 2021 +0300 mfplat: Rename media buffer structure to better reflect its usage. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 118 +++++++++++++++++++++++++-------------------------- 1 file changed, 59 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=81c7633154215c86d39e…

1 0