December 2018 - Wine-devel - list.winehq.org

[PATCH v2 1/2] ntdll: Add RtlAddGrowableFunctionTable stub
by Alex Henrie 03 Dec '18

03 Dec '18

From: Austin English <austinenglish(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42255 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Copied from https://bugs.winehq.org/attachment.cgi?id=59935 with minor changes. --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/signal_arm.c | 10 ++++++++++ dlls/ntdll/signal_arm64.c | 12 ++++++++++++ dlls/ntdll/signal_x86_64.c | 12 ++++++++++++ 4 files changed, 35 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 1b0bd7f53f..1f3aeaa0bc 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -434,6 +434,7 @@ @ stdcall RtlAddMandatoryAce(ptr long long long long ptr) # @ stub RtlAddRange @ cdecl -arch=arm,arm64,x86_64 RtlAddFunctionTable(ptr long long) +@ cdecl -arch=arm,arm64,x86_64 RtlAddGrowableFunctionTable(ptr ptr long long long long) @ stdcall RtlAddRefActivationContext(ptr) # @ stub RtlAddRefMemoryStream @ stdcall RtlAddVectoredContinueHandler(long ptr) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index da0c8fb71e..72087a2c4c 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1058,6 +1058,16 @@ BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, DWORD a return TRUE; } +/************************************************************************* + * RtlAddGrowableFunctionTable (NTDLL.@) + */ +DWORD WINAPI RtlAddGrowableFunctionTable( void **table, RUNTIME_FUNCTION *functions, DWORD count, DWORD max_count, + ULONG_PTR base, ULONG_PTR end ) +{ + FIXME( "(%p, %p, %d, %d, %ld, %ld) stub!\n", table, functions, count, max_count, base, end ); + if (table) *table = NULL; + return S_OK; +} /********************************************************************** * RtlDeleteFunctionTable (NTDLL.@) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 4d2d127711..22a861da60 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -977,6 +977,18 @@ BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, ULONG_P } +/************************************************************************* + * RtlAddGrowableFunctionTable (NTDLL.@) + */ +DWORD WINAPI RtlAddGrowableFunctionTable( void **table, RUNTIME_FUNCTION *functions, DWORD count, DWORD max_count, + ULONG_PTR base, ULONG_PTR end ) +{ + FIXME( "(%p, %p, %d, %d, %ld, %ld) stub!\n", table, functions, count, max_count, base, end ); + if (table) *table = NULL; + return S_OK; +} + + /********************************************************************** * RtlDeleteFunctionTable (NTDLL.@) */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 7228adb3ab..3f886a785c 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3506,6 +3506,18 @@ BOOLEAN CDECL RtlInstallFunctionTableCallback( DWORD64 table, DWORD64 base, DWOR } +/************************************************************************* + * RtlAddGrowableFunctionTable (NTDLL.@) + */ +DWORD WINAPI RtlAddGrowableFunctionTable( void **table, RUNTIME_FUNCTION *functions, DWORD count, DWORD max_count, + ULONG_PTR base, ULONG_PTR end ) +{ + FIXME( "(%p, %p, %d, %d, %ld, %ld) semi-stub!\n", table, functions, count, max_count, base, end ); + if (table) *table = NULL; + return RtlAddFunctionTable(functions, count, base); +} + + /********************************************************************** * RtlDeleteFunctionTable (NTDLL.@) */ -- 2.19.2

2 2

[PATCH] wininet: Always check if context can be deleted when freeing netconn.
by Daniel Lehman 03 Dec '18

03 Dec '18

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- v3: supersedes https://source.winehq.org/patches/data/155145 fixes a memory leak where netcon_secure_connect_setup fails in the call to netconn_verify_cert resulting in netconn->secure being FALSE, so it doesn't get freed in free_netconn --- dlls/wininet/netconnection.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 4ad22177ee..615a43c2be 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -392,9 +392,9 @@ void free_netconn(netconn_t *netconn) heap_free(netconn->extra_buf); netconn->extra_buf = NULL; netconn->extra_len = 0; - if (SecIsValidHandle(&netconn->ssl_ctx)) - DeleteSecurityContext(&netconn->ssl_ctx); } + if (SecIsValidHandle(&netconn->ssl_ctx)) + DeleteSecurityContext(&netconn->ssl_ctx); close_netconn(netconn); heap_free(netconn); -- 2.17.1

2 2

Re: [PATCH 2/2] ntdll: Add RtlGrowFunctionTable stub
by Alex Henrie 03 Dec '18

03 Dec '18

On Sun, Dec 2, 2018 at 5:40 PM Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > > Hi Alex, > > How about stealing the ones from staging, they have been improved more than the ones you sent in. > https://github.com/wine-staging/wine-staging/tree/master/patches/ntdll-RtlA… The main difference in the staging patches is that they add the functions to winnt.h too. Since Alexandre doesn't like adding functions to the header files before they have a proper implementation, I think the patches that I sent today are more likely to be accepted. My new patches also have the advantage of making RtlAddGrowableFunctionTable on x64 call RtlAddFunctionTable (which has an x64 implementation already) instead of just doing nothing. -Alex

2 2

[PATCH 0/3] ntdll: processor info parsing improvements/fixes
by Roderick Colenbrander 03 Dec '18

03 Dec '18

Hi, This patch series was motivated by a bug exposed by earlier logical core parsing I added this summer (bug 45453). The fix was simple, but I added a new helper function as more parts of the code use similar code. While adding the fix, I noticed how our Linux CPU parsing logic will really fail on high core count (>32 or >64). These core counts are becoming more and more common. Consumer AMD Threadripper now has 64 logical cores (maybe >64 next year) and in the server space you can already easily go above on dual socket systems. Supporting high core count, doesn't look trivial to me. The CPU parsing logic is quite fragile as it is. We need to break info better down into multiple groups (hard coded to 1, right now) based on NUMA nodes. Wineserver changes likely needed as well for thread affinity. Many others like needed e.g. the classic GetLogicalProcessorInformation supposedly reports info just for the "group" the thread is currently assigned to as it can't handle >32 / >64 cores. All in all some fun improvements, which warrant a FIXME. For users who currently go above the limit, we are probably reaching undefined behavior right now... Thanks, Roderick Roderick Colenbrander (3): ntdll: parse sysfs cpu_shared_map using helper function. ntdll: Fix parsing thread_siblings bitmaps on high core count systems. ntdll: print FIXME on systems supporting more CPU cores than supported. dlls/ntdll/nt.c | 103 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 86 insertions(+), 17 deletions(-) -- 2.19.1

1 3

[PATCH] po\pt_BR: Revision on inconsistencies and spelling errors.
by Roberto Pungartnik 03 Dec '18

03 Dec '18

1 0

[PATCH 1/2] ntdll: Add RtlAddGrowableFunctionTable stub
by Alex Henrie 02 Dec '18

02 Dec '18

From: Austin English <austinenglish(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42255 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Copied from https://bugs.winehq.org/attachment.cgi?id=59935 with minor changes. --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/signal_arm.c | 10 ++++++++++ dlls/ntdll/signal_x86_64.c | 12 ++++++++++++ 3 files changed, 23 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 1b0bd7f53f..1f3aeaa0bc 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -434,6 +434,7 @@ @ stdcall RtlAddMandatoryAce(ptr long long long long ptr) # @ stub RtlAddRange @ cdecl -arch=arm,arm64,x86_64 RtlAddFunctionTable(ptr long long) +@ cdecl -arch=arm,arm64,x86_64 RtlAddGrowableFunctionTable(ptr ptr long long long long) @ stdcall RtlAddRefActivationContext(ptr) # @ stub RtlAddRefMemoryStream @ stdcall RtlAddVectoredContinueHandler(long ptr) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index da0c8fb71e..72087a2c4c 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1058,6 +1058,16 @@ BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, DWORD a return TRUE; } +/************************************************************************* + * RtlAddGrowableFunctionTable (NTDLL.@) + */ +DWORD WINAPI RtlAddGrowableFunctionTable( void **table, RUNTIME_FUNCTION *functions, DWORD count, DWORD max_count, + ULONG_PTR base, ULONG_PTR end ) +{ + FIXME( "(%p, %p, %d, %d, %ld, %ld) stub!\n", table, functions, count, max_count, base, end ); + if (table) *table = NULL; + return S_OK; +} /********************************************************************** * RtlDeleteFunctionTable (NTDLL.@) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 7228adb3ab..3f886a785c 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3506,6 +3506,18 @@ BOOLEAN CDECL RtlInstallFunctionTableCallback( DWORD64 table, DWORD64 base, DWOR } +/************************************************************************* + * RtlAddGrowableFunctionTable (NTDLL.@) + */ +DWORD WINAPI RtlAddGrowableFunctionTable( void **table, RUNTIME_FUNCTION *functions, DWORD count, DWORD max_count, + ULONG_PTR base, ULONG_PTR end ) +{ + FIXME( "(%p, %p, %d, %d, %ld, %ld) semi-stub!\n", table, functions, count, max_count, base, end ); + if (table) *table = NULL; + return RtlAddFunctionTable(functions, count, base); +} + + /********************************************************************** * RtlDeleteFunctionTable (NTDLL.@) */ -- 2.19.2

1 1

[PATCH 1/2] winex11.drv: Make several constants static
by Alex Henrie 02 Dec '18

02 Dec '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/winex11.drv/wintab.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 7a9a3a7b1c..61730ce6db 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -485,9 +485,9 @@ static void disable_system_cursors(void) */ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) { - const WCHAR SZ_CONTEXT_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','C','o','n','t','e','x','t',0}; - const WCHAR SZ_DEVICE_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','D','e','v','i','c','e',0}; - const WCHAR SZ_NON_PLUGINPLAY[] = {'n','o','n','-','p','l','u','g','i','n','p','l','a','y',0}; + static const WCHAR SZ_CONTEXT_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','C','o','n','t','e','x','t',0}; + static const WCHAR SZ_DEVICE_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','D','e','v','i','c','e',0}; + static const WCHAR SZ_NON_PLUGINPLAY[] = {'n','o','n','-','p','l','u','g','i','n','p','l','a','y',0}; struct x11drv_thread_data *data = x11drv_init_thread_data(); int num_devices; -- 2.19.2

1 1

[PATCH] wsdapi: Turn a constant and several variables into static constants
by Alex Henrie 02 Dec '18

02 Dec '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/wsdapi/soap.c | 6 +++--- dlls/wsdapi/xml.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index e1233986cc..2ecc01313f 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -364,7 +364,7 @@ HRESULT register_namespaces(IWSDXMLContext *xml_context) static BOOL create_guid(LPWSTR buffer) { - const WCHAR formatString[] = { 'u','r','n',':','u','u','i','d',':','%','s', 0 }; + static const WCHAR formatString[] = { 'u','r','n',':','u','u','i','d',':','%','s', 0 }; WCHAR* uuidString = NULL; UUID uuid; @@ -401,7 +401,7 @@ static void populate_soap_header(WSD_SOAP_HEADER *header, LPCWSTR to, LPCWSTR ac static LPWSTR ulonglong_to_string(void *parent, ULONGLONG value) { - WCHAR formatString[] = { '%','I','6','4','u', 0 }; + static const WCHAR formatString[] = { '%','I','6','4','u', 0 }; LPWSTR ret; ret = WSDAllocateLinkedMemory(parent, MAX_ULONGLONG_STRING_SIZE * sizeof(WCHAR)); @@ -560,7 +560,7 @@ static BOOL add_discovered_namespace(struct list *namespaces, WSDXML_NAMESPACE * static HRESULT build_types_list(LPWSTR buffer, size_t buffer_size, const WSD_NAME_LIST *list, struct list *namespaces) { - WCHAR format_string[] = { '%', 's', ':', '%', 's', 0 }; + static const WCHAR format_string[] = { '%', 's', ':', '%', 's', 0 }; LPWSTR current_buf_pos = buffer; size_t memory_needed = 0; const WSD_NAME_LIST *cur = list; diff --git a/dlls/wsdapi/xml.c b/dlls/wsdapi/xml.c index 98bdec6b0d..727d83af60 100644 --- a/dlls/wsdapi/xml.c +++ b/dlls/wsdapi/xml.c @@ -380,7 +380,7 @@ static BOOL is_prefix_unique(struct list *namespaces, LPCWSTR prefix) static LPWSTR generate_namespace_prefix(IWSDXMLContextImpl *impl, void *parentMemoryBlock, LPCWSTR uri) { - WCHAR formatString[] = { 'u','n','%','d', 0 }; + static const WCHAR formatString[] = { 'u','n','%','d', 0 }; WCHAR suggestedPrefix[7]; /* Find a unique prefix */ -- 2.19.2

1 0

[PATCH] windowscodecs: Make constant 'valuename_format' static
by Alex Henrie 02 Dec '18

02 Dec '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/windowscodecs/regsvr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index b011d71645..3f53591552 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1032,10 +1032,10 @@ static HRESULT register_pixelformats(struct regsvr_pixelformat const *list) if (res != ERROR_SUCCESS) goto error_close_clsid_key; if (list->channelmasks) { + static const WCHAR valuename_format[] = {'%','d',0}; HKEY masks_key; UINT i, mask_size; WCHAR mask_valuename[11]; - const WCHAR valuename_format[] = {'%','d',0}; mask_size = (list->bitsperpixel + 7)/8; -- 2.19.2

1 0

[PATCH] shlwapi: Turn several constants and variables into static constants
by Alex Henrie 02 Dec '18

02 Dec '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shlwapi/url.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 8313b98fb2..fb3892013e 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -746,26 +746,24 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, * the last leaf starting from the '#'. Otherwise the '#' is not * meaningful and just start looking from the end. */ if ((work = strpbrkW(base.pszSuffix + sizeloc, fragquerystr))) { - const WCHAR htmlW[] = {'.','h','t','m','l',0}; - const int len_htmlW = 5; - const WCHAR htmW[] = {'.','h','t','m',0}; - const int len_htmW = 4; + static const WCHAR htmlW[] = {'.','h','t','m','l'}; + static const WCHAR htmW[] = {'.','h','t','m'}; if (*work == '?' || base.nScheme == URL_SCHEME_HTTP || base.nScheme == URL_SCHEME_HTTPS) manual_search = TRUE; - else if (work - base.pszSuffix > len_htmW) { - work -= len_htmW; - if (strncmpiW(work, htmW, len_htmW) == 0) + else if (work - base.pszSuffix > ARRAY_SIZE(htmW)) { + work -= ARRAY_SIZE(htmW); + if (strncmpiW(work, htmW, ARRAY_SIZE(htmW)) == 0) manual_search = TRUE; - work += len_htmW; + work += ARRAY_SIZE(htmW); } if (!manual_search && - work - base.pszSuffix > len_htmlW) { - work -= len_htmlW; - if (strncmpiW(work, htmlW, len_htmlW) == 0) + work - base.pszSuffix > ARRAY_SIZE(htmlW)) { + work -= ARRAY_SIZE(htmlW); + if (strncmpiW(work, htmlW, ARRAY_SIZE(htmlW)) == 0) manual_search = TRUE; - work += len_htmlW; + work += ARRAY_SIZE(htmlW); } } @@ -1734,11 +1732,11 @@ static HRESULT URL_GuessScheme(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut) static HRESULT URL_CreateFromPath(LPCWSTR pszPath, LPWSTR pszUrl, LPDWORD pcchUrl) { + static const WCHAR file_colonW[] = {'f','i','l','e',':',0}; + static const WCHAR three_slashesW[] = {'/','/','/',0}; DWORD needed; HRESULT ret = S_OK; WCHAR *pszNewUrl; - WCHAR file_colonW[] = {'f','i','l','e',':',0}; - WCHAR three_slashesW[] = {'/','/','/',0}; PARSEDURLW parsed_url; parsed_url.cbSize = sizeof(parsed_url); -- 2.19.2

1 0