February 2017 - Wine-Devel - list.winehq.org

Re: [PATCH 1/5] ddraw/tests: Rewrite SrcColorKey32BlitTest (v2).
by Marvin Feb. 19, 2017

Feb. 19, 2017

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=28754 Your paranoid android. === w8 (32 bit ddraw1) === ddraw1.c:10154: Test failed: Got unexpected color 0x00ffffff.

1 0

Re: [PATCH] Some tests for lsa
by Sebastian Lackner Feb. 19, 2017

Feb. 19, 2017

On 17.02.2017 00:29, Julius Schwartzenberg wrote: > --- > dlls/secur32/tests/Makefile.in | 1 + > dlls/secur32/tests/lsa.c | 206 +++++++++++++++++++++++++++++++++++++++++ > include/ntsecapi.h | 50 ++++++++++ > 3 files changed, 257 insertions(+) > create mode 100644 dlls/secur32/tests/lsa.c Thanks for providing the updated version. Unfortunately there are still various problems left, see the comments below. Patches should have a subject like "component: title". In this case something like "secur32/tests: Add some tests for lsa functions." might be appropriate. > > diff --git a/dlls/secur32/tests/Makefile.in b/dlls/secur32/tests/Makefile.in > index 089d1c3..d9f140a 100644 > --- a/dlls/secur32/tests/Makefile.in > +++ b/dlls/secur32/tests/Makefile.in > @@ -2,6 +2,7 @@ TESTDLL = secur32.dll > IMPORTS = secur32 crypt32 advapi32 ws2_32 > > C_SRCS = \ > + lsa.c \ > main.c \ > negotiate.c \ > ntlm.c \ > diff --git a/dlls/secur32/tests/lsa.c b/dlls/secur32/tests/lsa.c > new file mode 100644 > index 0000000..7668df1 > --- /dev/null > +++ b/dlls/secur32/tests/lsa.c It is preferred to add tests to existing files. You can still add your own copyright of course. Splitting in separate files is usually done when there are sufficient tests. > @@ -0,0 +1,206 @@ > +/* > + * Lsa tests > + * > + * Copyright 2017 Julius Schwartzenberg > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > + */ > + > +#define SECURITY_WIN32 > + > +#include <stdio.h> > +#include <ntstatus.h> > +#define WIN32_NO_STATUS > +#include <windows.h> > +#include <ntsecapi.h> > + > +#include "wine/test.h" > + > +static void test_LsaConnectUntrusted_null_handle(void) > +{ > + NTSTATUS status; > + > + status = LsaConnectUntrusted(NULL); > + > + todo_wine ok(status == STATUS_ACCESS_VIOLATION || status == RPC_NT_NULL_REF_POINTER, > + "LsaConnectUntrusted(NULL) returned 0x%x\n", status); > +} > + > +static void test_LsaConnectUntrusted_correct_handle(void) There is no need to add a separate function for each testcase. Its better to group them, for example all tests for LsaConnectUntrusted in one function, and so on. > +{ > + NTSTATUS status; > + HANDLE lsa_handle; > + There are still some lines (see for example above) with trailing whitespace in your patch. > + status = LsaConnectUntrusted(&lsa_handle); > + > + ok(status == STATUS_SUCCESS, "LsaConnectUntrusted(valid_handle) returned 0x%x\n", status); You should try to avoid leaks and always close handles at the end of each test - in this case with LsaDeregisterLogonProcess(). > +} > + > +static void test_LsaLookupAuthenticationPackage_null_handle(void) > +{ > + NTSTATUS status; > + LSA_STRING package_name; > + ULONG auth_package; > + char name[] = MICROSOFT_KERBEROS_NAME_A; > + package_name.Buffer = name; > + package_name.Length = sizeof(MICROSOFT_KERBEROS_NAME_A) - 1; > + > + status = LsaLookupAuthenticationPackage(NULL, &package_name, &auth_package); > + > + todo_wine ok(status == STATUS_INVALID_HANDLE || status == STATUS_INVALID_CONNECTION, Please always try to document where you observed which status value. Depending on what you consider more correct, you could mark the other value as broken() and a comment which Windows versions are affected. > + "LsaLookupAuthenticationPackage(NULL, \"Kerberos\", ...) returned 0x%x\n", status); > +} > + > +static void test_LsaLookupAuthenticationPackage_correct_handle(void) > +{ > + NTSTATUS status; > + HANDLE lsa_handle; > + LSA_STRING package_name; > + ULONG auth_package; > + char name[] = MICROSOFT_KERBEROS_NAME_A; > + package_name.Buffer = name; > + package_name.Length = sizeof(MICROSOFT_KERBEROS_NAME_A) - 1; > + > + LsaConnectUntrusted(&lsa_handle); > + status = LsaLookupAuthenticationPackage(lsa_handle, &package_name, &auth_package); > + LsaDeregisterLogonProcess(&lsa_handle); You should remove the & here. Also, you might want to check the result of each function, even if they are also tested separately. > + > + ok(status == STATUS_SUCCESS, > + "LsaLookupAuthenticationPackage(valid_handle, \"Kerberos\", ...) returned 0x%x\n", status); You might also want to test the auth_package output parameter here. > +} > + > +static void test_LsaLookupAuthenticationPackage_correct_handle_wrong_name(void) > +{ > + NTSTATUS status; > + HANDLE lsa_handle; > + LSA_STRING package_name; > + ULONG auth_package; > + package_name.Buffer = "this is probably not a valid authentication package name"; This triggers a compiler warning here: lsa.c:90:25: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] package_name.Buffer = "this is probably not a valid authentication package name"; > + package_name.Length = (USHORT)strlen(package_name.Buffer); The explicit cast to USHORT should not be necessary here. > + > + LsaConnectUntrusted(&lsa_handle); > + status = LsaLookupAuthenticationPackage(lsa_handle, &package_name, &auth_package); > + LsaDeregisterLogonProcess(&lsa_handle); Similar to above, the & is wrong here. > + > + todo_wine ok(status == STATUS_NO_SUCH_PACKAGE, > + "LsaLookupAuthenticationPackage(valid_handle, invalid, ...) returned 0x%x\n", status); > +} > + > +static void test_LsaCallAuthenticationPackage_invalid_handle(void) > +{ > + NTSTATUS status; > + ULONG submit_buffer_length = 0; > + > + VOID *protocol_return_buffer = NULL; > + ULONG *return_buffer_length = 0; > + PNTSTATUS protocol_status = NULL; > + > + status = LsaCallAuthenticationPackage( > + NULL, 0xdeadbeef, NULL, submit_buffer_length, You do not really need a separate variable just to pass 0 to a function. > + protocol_return_buffer, return_buffer_length, protocol_status Those are supposed to be output pointers (&buffer, ...). Passing NULL is probably also fine, but no need for separate variables then. > + ); > + > + todo_wine ok(status == STATUS_INVALID_HANDLE || status == STATUS_INVALID_CONNECTION, > + "LsaCallAuthenticationPackage(NULL, ...) returned 0x%x\n", status); > +} > + > +static void test_LsaCallAuthenticationPackage_invalid_package(void) > +{ > + NTSTATUS status; > + HANDLE lsa_handle; > + ULONG submit_buffer_length = 0; > + > + VOID *protocol_return_buffer = NULL; > + ULONG *return_buffer_length = 0; > + PNTSTATUS protocol_status = NULL; > + > + LsaConnectUntrusted(&lsa_handle); > + status = LsaCallAuthenticationPackage( > + lsa_handle, 0xdeadbeef, NULL, submit_buffer_length, > + protocol_return_buffer, return_buffer_length, protocol_status > + ); > + LsaDeregisterLogonProcess(&lsa_handle); > + > + todo_wine ok(status == STATUS_NO_SUCH_PACKAGE, > + "LsaCallAuthenticationPackage(valid_handle, invalid, ...) returned 0x%x\n", status); > +} > + > +static void test_LsaCallAuthenticationPackage_null_submit_buffer(void) > +{ > + NTSTATUS status; > + HANDLE lsa_handle; > + LSA_STRING package_name; > + ULONG auth_package; > + ULONG submit_buffer_length = 0; > + VOID *protocol_return_buffer = NULL; > + ULONG *return_buffer_length = 0; > + PNTSTATUS protocol_status = NULL; > + char name[] = MICROSOFT_KERBEROS_NAME_A; > + package_name.Buffer = name; > + package_name.Length = sizeof(MICROSOFT_KERBEROS_NAME_A) - 1; > + > + LsaConnectUntrusted(&lsa_handle); > + LsaLookupAuthenticationPackage(lsa_handle, &package_name, &auth_package); > + status = LsaCallAuthenticationPackage( > + lsa_handle, auth_package, NULL, submit_buffer_length, > + protocol_return_buffer, return_buffer_length, protocol_status > + ); > + LsaDeregisterLogonProcess(&lsa_handle); > + > + todo_wine ok(status == STATUS_INVALID_PARAMETER, > + "LsaCallAuthenticationPackage(...) returned 0x%x\n", status); > +} > + > +static void test_LsaCallAuthenticationPackage_correct_submit_buffer(void) > +{ > + NTSTATUS status; > + HANDLE lsa_handle; > + LSA_STRING package_name; > + ULONG auth_package; > + PKERB_RETRIEVE_TKT_REQUEST protocol_submit_buffer; > + VOID *protocol_return_buffer = NULL; > + ULONG *return_buffer_length = 0; > + PNTSTATUS protocol_status = NULL; > + char name[] = MICROSOFT_KERBEROS_NAME_A; > + package_name.Buffer = name; > + package_name.Length = sizeof(MICROSOFT_KERBEROS_NAME_A) - 1; > + > + LsaConnectUntrusted(&lsa_handle); > + LsaLookupAuthenticationPackage(lsa_handle, &package_name, &auth_package); > + > + protocol_submit_buffer = LocalAlloc(LMEM_ZEROINIT, sizeof(KERB_RETRIEVE_TKT_REQUEST)); > + protocol_submit_buffer->MessageType = KerbRetrieveEncodedTicketMessage; If you use memory allocations, please also free them at the end of the function. Also, please note that it is usually preferred to use HeapAlloc(), unless the API requires to use a very specific one. In this case (fixed size struct) you could also consider allocating the memory directly on the stack. > + > + status = LsaCallAuthenticationPackage( > + lsa_handle, auth_package, protocol_submit_buffer, sizeof(KERB_RETRIEVE_TKT_REQUEST), > + protocol_return_buffer, return_buffer_length, protocol_status > + ); > + LsaDeregisterLogonProcess(&lsa_handle); > + > + ok(status == STATUS_SUCCESS, "LsaCallAuthenticationPackage(...) returned 0x%x\n", status); > +} > + > +START_TEST(lsa) > +{ > + test_LsaConnectUntrusted_null_handle(); > + test_LsaConnectUntrusted_correct_handle(); > + test_LsaLookupAuthenticationPackage_null_handle(); > + test_LsaLookupAuthenticationPackage_correct_handle(); > + test_LsaLookupAuthenticationPackage_correct_handle_wrong_name(); > + test_LsaCallAuthenticationPackage_invalid_handle(); > + test_LsaCallAuthenticationPackage_invalid_package(); > + test_LsaCallAuthenticationPackage_null_submit_buffer(); > + test_LsaCallAuthenticationPackage_correct_submit_buffer(); > +} > diff --git a/include/ntsecapi.h b/include/ntsecapi.h > index 2bb3d31..e8a2af4 100644 > --- a/include/ntsecapi.h > +++ b/include/ntsecapi.h > @@ -387,6 +387,56 @@ NTSTATUS WINAPI LsaSetTrustedDomainInformation(LSA_HANDLE,PSID,TRUSTED_INFORMATI > NTSTATUS WINAPI LsaStorePrivateData(LSA_HANDLE,PLSA_UNICODE_STRING,PLSA_UNICODE_STRING); > NTSTATUS WINAPI LsaUnregisterPolicyChangeNotification(POLICY_NOTIFICATION_INFORMATION_CLASS,HANDLE); > > +#ifndef MICROSOFT_KERBEROS_NAME_A > + > +#define MICROSOFT_KERBEROS_NAME_A "Kerberos" > +#define MICROSOFT_KERBEROS_NAME_W (const WCHAR []){'K','e','r','b','e','r','o','s',0} > +#define MICROSOFT_KERBEROS_NAME MICROSOFT_KERBEROS_NAME_W > +#endif > + > +typedef enum _KERB_PROTOCOL_MESSAGE_TYPE { > + KerbDebugRequestMessage = 0, You are using tabs here, but the file seems to use spaces. > + KerbQueryTicketCacheMessage, > + KerbChangeMachinePasswordMessage, > + KerbVerifyPacMessage, > + KerbRetrieveTicketMessage, > + KerbUpdateAddressesMessage, > + KerbPurgeTicketCacheMessage, > + KerbChangePasswordMessage, > + KerbRetrieveEncodedTicketMessage, > + KerbDecryptDataMessage, > + KerbAddBindingCacheEntryMessage, > + KerbSetPasswordMessage, > + KerbSetPasswordExMessage, > + KerbVerifyCredentialsMessage, > + KerbQueryTicketCacheExMessage, > + KerbPurgeTicketCacheExMessage, > + KerbRefreshSmartcardCredentialsMessage, > + KerbAddExtraCredentialsMessage, > + KerbQuerySupplementalCredentialsMessage, > + KerbTransferCredentialsMessage, > + KerbQueryTicketCacheEx2Message > +} KERB_PROTOCOL_MESSAGE_TYPE,*PKERB_PROTOCOL_MESSAGE_TYPE; > + > +#ifndef __SECHANDLE_DEFINED__ > + typedef struct _SecHandle { > + ULONG_PTR dwLower; > + ULONG_PTR dwUpper; > + } SecHandle,*PSecHandle; > + > +#define __SECHANDLE_DEFINED__ > +#endif > + > +typedef struct _KERB_RETRIEVE_TKT_REQUEST { > + KERB_PROTOCOL_MESSAGE_TYPE MessageType; > + LUID LogonId; > + UNICODE_STRING TargetName; > + ULONG TicketFlags; > + ULONG CacheOptions; > + LONG EncryptionType; > + SecHandle CredentialsHandle; > +} KERB_RETRIEVE_TKT_REQUEST,*PKERB_RETRIEVE_TKT_REQUEST; > + > #ifdef __cplusplus > } /* extern "C" */ > #endif /* defined(__cplusplus) */ > -- 1.9.1 >

2 1

[GSoC 2017]
by Saksham Bassi Feb. 18, 2017

Feb. 18, 2017

Hello, I am Saksham. I am pursuing Bachelors of Engineering (Information Technology) at PICT, Pune. I would like to start contributing and GSoC can be stepping stone towards it. I am new to open source community. I went through the GSoC site. I really liked previous year projects and would love to be a part of GSoC this year. I would like to familiarise myself with the code. How can I start contributing?

3 2

Wine has been accepted into Outreachy (May-August 2017)
by Austin English Feb. 18, 2017

Feb. 18, 2017

For more info, please see: https://wiki.gnome.org/Outreachy/2017/MayAugust https://wiki.winehq.org/Outreachy I am the administration coordinator, so please contact me with any questions. Please forward this to any students you know that may be eligible. -- -Austin GPG: 14FB D7EA A041 937B

3 4

Re: wine/test.h: Identify test result lines printed by child processes.
by Alexandre Julliard Feb. 18, 2017

Feb. 18, 2017

Francois Gouget <fgouget(a)codeweavers.com> writes: > Currently the child process result lines are indistinguishable from the > main process one. This makes it impossible to automatically detect > when a process exits abruptly, i.e. without printing a result line, > if it has run a subprocess. By making the subprocess result lines > different analysis tools will detect that the main result line is > missing and automatically consider that the main process crashed, > thus marking the test as failed. > > Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> > --- > > This should fix bug 32354: > https://bugs.winehq.org/show_bug.cgi?id=32354 I don't think the test framework should be modifying the environment in all the tests. It already breaks some things: ../../../tools/runtest -q -P wine -T ../../.. -M msvcrt.dll -p msvcrt_test.exe.so environ && touch environ.ok environ.c:198: Test failed: Expected environment block pointer element to be non-NULL wine: Unhandled page fault on read access to 0x00000000 at address 0x7ed2a986 (thread 0074), starting debugger... -- Alexandre Julliard julliard(a)winehq.org

2 5

Re: [PATCH v5] compobj.dll16: Implement CoGetClassObject16().
by Sebastian Lackner Feb. 17, 2017

Feb. 17, 2017

On 17.02.2017 22:32, Zebediah Figura wrote: > + SEGPTR seg_rclsid = MapLS(rclsid); > + SEGPTR seg_riid = MapLS(riid); > + SEGPTR seg_ppv = MapLS(ppv); You should also unmap them in case of an error. (Or alternatively, you could change the specfile, and pass through the SEGPTRs).

1 0

Re: [PATCH 2/5] wined3d: Handle CS op emission from CS op handlers.
by Sebastian Lackner Feb. 17, 2017

Feb. 17, 2017

On 17.02.2017 14:08, Henri Verbeet wrote: > Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> > --- > dlls/wined3d/cs.c | 37 +++++++++++++++++++++++++++++-------- > dlls/wined3d/wined3d_private.h | 2 +- > 2 files changed, 30 insertions(+), 9 deletions(-) > > diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c > index 55706cd..10905c0 100644 > --- a/dlls/wined3d/cs.c > +++ b/dlls/wined3d/cs.c > @@ -1576,26 +1576,47 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void > > static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) > { > - if (size > cs->data_size) > + if (size > (cs->data_size - cs->end)) > { > + size_t new_size; > void *new_data; > > - size = max( size, cs->data_size * 2 ); > - if (!(new_data = HeapReAlloc(GetProcessHeap(), 0, cs->data, size))) > + new_size = max(size, cs->data_size * 2); > + if (!cs->end) > + new_data = HeapReAlloc(GetProcessHeap(), 0, cs->data, new_size); > + else > + new_data = HeapAlloc(GetProcessHeap(), 0, new_size); > + if (!new_data) > return NULL; > > - cs->data_size = size; > + cs->data_size = new_size; > + cs->start = cs->end = 0; > cs->data = new_data; > } > > - return cs->data; > + cs->end += size; > + > + return (BYTE *)cs->data + cs->start; > } > > static void wined3d_cs_st_submit(struct wined3d_cs *cs) > { > - enum wined3d_cs_op opcode = *(const enum wined3d_cs_op *)cs->data; > - > - wined3d_cs_op_handlers[opcode](cs, cs->data); > + enum wined3d_cs_op opcode; > + size_t start; > + BYTE *data; > + > + data = cs->data; > + start = cs->start; > + cs->start = cs->end; > + opcode = *(const enum wined3d_cs_op *)&data[start]; > + wined3d_cs_op_handlers[opcode](cs, &data[start]); > + if (!start) > + { > + if (cs->data != data) > + HeapFree(GetProcessHeap(), 0, data); > + else > + cs->start = cs->end = 0; > + } Is it intentional that you are not updating cs->start and cs->end in any other situation? This might lead to unnecessary memory allocations because start / end is not set back before the block is fully empty. Here an example what happens if wined3d_device_delete_opengl_contexts_cs is called with lots of resources (with this patch http://ix.io/dP5) fixme:d3d:wined3d_device_delete_opengl_contexts_cs -> unloading resources fixme:d3d:wined3d_cs_st_require_space start = 12 fixme:d3d:wined3d_cs_st_require_space start = 20 fixme:d3d:wined3d_cs_st_require_space start = 28 [...] fixme:d3d:wined3d_cs_st_require_space start = 4068 fixme:d3d:wined3d_cs_st_require_space start = 4076 fixme:d3d:wined3d_cs_st_require_space start = 4084 fixme:d3d:wined3d_cs_st_require_space allocated new block 0x579fdb70 fixme:d3d:wined3d_cs_st_require_space start = 0 fixme:d3d:wined3d_cs_st_require_space start = 0 fixme:d3d:wined3d_cs_st_require_space start = 0 [..] In this case, with the buffer basically almost empty, there shouldn't be any need to do memory allocations. > } > > static void wined3d_cs_st_push_constants(struct wined3d_cs *cs, enum wined3d_push_constants p, > diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h > index 54adf26..49fba06 100644 > --- a/dlls/wined3d/wined3d_private.h > +++ b/dlls/wined3d/wined3d_private.h > @@ -3170,7 +3170,7 @@ struct wined3d_cs > struct wined3d_fb_state fb; > struct wined3d_state state; > > - size_t data_size; > + size_t data_size, start, end; > void *data; > }; > >

3 5

Re: [PATCH v4 1/5] compobj.dll16: Implement CoLoadLibrary16 and CoFreeLibrary16.
by Alexandre Julliard Feb. 17, 2017

Feb. 17, 2017

Zebediah Figura <z.figura12(a)gmail.com> writes: > +/* --- loaded dll list implementation */ > +struct open_dll > +{ > + HMODULE16 library; > + FARPROC16 DllCanUnloadNow; > + struct list entry; > +}; > + > +static struct list open_dll_list = LIST_INIT(open_dll_list); > + > +static HRESULT dll_list_add(LPCSTR library_name, struct open_dll **ret) > +{ > + struct open_dll *dll; > + HMODULE16 library; > + FARPROC16 DllCanUnloadNow; > + > + library = LoadLibrary16(library_name); > + if (!library) > + { > + ERR("couldn't load in-process dll %s\n", debugstr_a(library_name)); > + return E_ACCESSDENIED; /* FIXME: or should this be CO_E_DLLNOTFOUND? */ > + } > + > + DllCanUnloadNow = GetProcAddress16(library, "DllCanUnloadNow"); > + /* Note: failing to find DllCanUnloadNow is not a failure */ > + > + dll = HeapAlloc(GetProcessHeap(), 0, sizeof(struct open_dll)); > + dll->library = library; > + dll->DllCanUnloadNow = DllCanUnloadNow; > + list_add_tail(&open_dll_list, &dll->entry); > + *ret = dll; > + TRACE("added new loaded dll %d\n", dll->library); > + > + return S_OK; > +} I'm not sure we even need the list at all. It would be needed for CoFreeAllLibraries16, but it's not clear that this is a useful function. > +void WINAPI CoFreeLibrary16( > + HINSTANCE16 hInst) > +{ > + struct open_dll *dll; > + > + LIST_FOR_EACH_ENTRY(dll, &open_dll_list, struct open_dll, entry) > + { > + if(hInst == dll->library) > + dll_list_free(dll); > + } That's freeing all the loaded instances, I don't think that's what you want. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH] programs/regedit: Sort each of top level branches separately
by Hugh McMaster Feb. 17, 2017

Feb. 17, 2017

On Friday, 17 February 2017 9:42 AM, Nikolay Sivov wrote: > --- a/programs/regedit/treeview.c > +++ b/programs/regedit/treeview.c > @@ -477,12 +477,12 @@ BOOL RefreshTreeView(HWND hwndTV) > hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CHILD, (LPARAM)hRoot); > while (hItem) { > RefreshTreeItem(hwndTV, hItem); > + SendMessageW(hwndTV, TVM_SORTCHILDREN, TRUE, (LPARAM)hItem); > hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_NEXT, (LPARAM)hItem); > } > > SendMessageW(hwndTV, WM_SETREDRAW, TRUE, 0); > InvalidateRect(hwndTV, NULL, FALSE); > - SendMessageW(hwndTV, TVM_SORTCHILDREN, TRUE, (LPARAM)hSelectedItem); > SetCursor(hcursorOld); This doesn't seem to work. None of the treeview nodes are sorted when you click Refresh or press F5, but immediate children were sorted before this patch. Can you please take another look? This is probably due to an incomplete TREEVIEW_SortChildren() function in comctl32. case TVM_SORTCHILDREN: return TREEVIEW_SortChildren(infoPtr, lParam); Note that we ignore the wParam, which MSDN says is a "Value that specifies whether the sorting is recursive. Set wParam to TRUE to sort all levels of child items below the parent item. Otherwise, only the parent's immediate children are sorted. " -- Hugh McMaster

2 1

Re: ntoskrnl.exe: add KeAcquireInStackQueuedSpinLock stub (try 2)
by Sebastian Lackner Feb. 17, 2017

Feb. 17, 2017

On 09.02.2017 23:51, Austin English wrote: > CC: Sebastian Lackner <sebastian(a)fds-team.de> > > https://bugs.winehq.org/show_bug.cgi?id=41472 > > -- -Austin GPG: 14FB D7EA A041 937B > > > 0001-ntoskrnl.exe-add-KeAcquireInStackQueuedSpinLock-stub.patch > > > From ee6a34f4a0e558de27aa5d9f3c81a8ad45c24dbb Mon Sep 17 00:00:00 2001 > From: Austin English <austinenglish(a)gmail.com> > Date: Mon, 6 Feb 2017 17:11:15 -0600 > Subject: [PATCH] ntoskrnl.exe: add KeAcquireInStackQueuedSpinLock stub (try 2) > > Signed-off-by: Austin English <austinenglish(a)gmail.com> > --- > dlls/hal/hal.spec | 2 +- > dlls/ntoskrnl.exe/ntoskrnl.c | 13 +++++++++++++ > dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + > include/ddk/wdm.h | 10 ++++++++++ > tools/make_specfiles | 4 ++++ > 5 files changed, 29 insertions(+), 1 deletion(-) > > diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec > index bd6bc35..f441ac5 100644 > --- a/dlls/hal/hal.spec > +++ b/dlls/hal/hal.spec > @@ -4,7 +4,7 @@ > @ stub HalClearSoftwareInterrupt > @ stub HalRequestSoftwareInterrupt > @ stub HalSystemVectorDispatchEntry > -@ stub KeAcquireInStackQueuedSpinLock > +@ stdcall -norelay KeAcquireInStackQueuedSpinLock(ptr ptr) ntoskrnl.exe.KeAcquireInStackQueuedSpinLock > @ stub KeAcquireInStackQueuedSpinLockRaiseToSynch > @ stub KeAcquireQueuedSpinLock > @ stub KeAcquireQueuedSpinLockRaiseToSynch > diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c > index 06320d0..b8f6a25 100644 > --- a/dlls/ntoskrnl.exe/ntoskrnl.c > +++ b/dlls/ntoskrnl.exe/ntoskrnl.c > @@ -3188,3 +3188,16 @@ VOID WINAPI KeClearEvent(PRKEVENT event) > { > FIXME("stub: %p\n", event); > } > + > +/*********************************************************************** > + * KeAcquireInStackQueuedSpinLock (NTOSKRNL.EXE.@) > + */ > +#ifdef DEFINE_FASTCALL2_ENTRYPOINT > +DEFINE_FASTCALL2_ENTRYPOINT( KeAcquireInStackQueuedSpinLock ) > +void WINAPI __regs_KeAcquireInStackQueuedSpinLock(KSPIN_LOCK *spinlock, KLOCK_QUEUE_HANDLE *handle) > +#else > +void WINAPI KeAcquireInStackQueuedSpinLock(KSPIN_LOCK *spinlock, KLOCK_QUEUE_HANDLE *handle) > +#endif > +{ > + FIXME( "stub: %p %p\n", spinlock, handle); > +} > diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec > index efa69fe..08644fb 100644 > --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec > +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec > @@ -41,6 +41,7 @@ > @ stub IoWritePartitionTable > @ stdcall -norelay IofCallDriver(ptr ptr) > @ stdcall -norelay IofCompleteRequest(ptr long) > +@ stdcall -norelay KeAcquireInStackQueuedSpinLock(ptr ptr) Based on the information I have found, the location where this function is implemented differs between 32-bit and 64-bit Windows versions. On 32-bit its only in HAL, on 64-bit its only in ntoskrnl. Unfortunately I'm not sure what would be the best way to solve this. We probably don't want to implement it twice, but what would be the preferred location? Some shared file, or is it fine to keep the ntoskrnl export on 32-bit? > @ stub KeAcquireInStackQueuedSpinLockAtDpcLevel > @ stub KeReleaseInStackQueuedSpinLockFromDpcLevel > @ stub KeSetTimeUpdateNotifyRoutine > diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h > index 4c696f7..3e1a8a7 100644 > --- a/include/ddk/wdm.h > +++ b/include/ddk/wdm.h > @@ -1210,6 +1210,16 @@ typedef struct _CALLBACK_OBJECT > UCHAR reserved[3]; > } CALLBACK_OBJECT, *PCALLBACK_OBJECT; > > +typedef struct _KSPIN_LOCK_QUEUE { > + struct _KSPIN_LOCK_QUEUE volatile *Next; > + volatile PKSPIN_LOCK Lock; Does this really match your Windows header files? In my Win10 header files the volatile is at a different place in both lines above. > +} KSPIN_LOCK_QUEUE, *PKSPIN_LOCK_QUEUE; > + > +typedef struct _KLOCK_QUEUE_HANDLE { > + KSPIN_LOCK_QUEUE LockQueue; > + KIRQL OldIrql; > +} KLOCK_QUEUE_HANDLE, *PKLOCK_QUEUE_HANDLE; > + > typedef NTSTATUS (NTAPI EX_CALLBACK_FUNCTION)(void *CallbackContext, void *Argument1, void *Argument2); > typedef EX_CALLBACK_FUNCTION *PEX_CALLBACK_FUNCTION; > > diff --git a/tools/make_specfiles b/tools/make_specfiles > index 1e2400e..505bdf1 100755 > --- a/tools/make_specfiles > +++ b/tools/make_specfiles > @@ -338,6 +338,10 @@ my @dll_groups = > "bcrypt", > "ncrypt", > ], > + [ > + "ntoskrnl.exe", > + "hal", > + ] > ); > > my $update_flags = 0; > -- 2.10.2 >

2 1