- Wine-Commits - list.winehq.org

Gabriel Ivăncescu : mshtml: Free the task after the destructor.
by Alexandre Julliard March 1, 2023

March 1, 2023

Module: wine Branch: master Commit: 63b38aed2702ce7a41b9f4e1e84a75c7ab5f8451 URL: https://gitlab.winehq.org/wine/wine/-/commit/63b38aed2702ce7a41b9f4e1e84a75… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Feb 27 16:02:12 2023 +0200 mshtml: Free the task after the destructor. And get rid of default_task_destr since it's only used in one place anyway. It was already confusing and leaking in some cases. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/navigate.c | 4 ---- dlls/mshtml/nsio.c | 1 - dlls/mshtml/olecmd.c | 1 - dlls/mshtml/persist.c | 7 +++++-- dlls/mshtml/task.c | 15 +++++---------- 5 files changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index fd92483cbf5..b8d7937f071 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1415,7 +1415,6 @@ static void stop_request_task_destr(task_t *_task) stop_request_task_t *task = (stop_request_task_t*)_task; IBindStatusCallback_Release(&task->bsc->bsc.IBindStatusCallback_iface); - free(task); } static HRESULT async_stop_request(nsChannelBSC *This) @@ -1950,7 +1949,6 @@ static void start_doc_binding_task_destr(task_t *_task) start_doc_binding_task_t *task = (start_doc_binding_task_t*)_task; IHTMLWindow2_Release(&task->pending_window->base.IHTMLWindow2_iface); - free(task); } HRESULT async_start_doc_binding(HTMLOuterWindow *window, HTMLInnerWindow *pending_window, DWORD flags) @@ -2107,7 +2105,6 @@ static void navigate_javascript_task_destr(task_t *_task) navigate_javascript_task_t *task = (navigate_javascript_task_t*)_task; IUri_Release(task->uri); - free(task); } typedef struct { @@ -2139,7 +2136,6 @@ static void navigate_task_destr(task_t *_task) IBindStatusCallback_Release(&task->bscallback->bsc.IBindStatusCallback_iface); IMoniker_Release(task->mon); IUri_Release(task->uri); - free(task); } static HRESULT navigate_fragment(HTMLOuterWindow *window, IUri *uri) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 612d91ed386..509a83efbd3 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -986,7 +986,6 @@ static void start_binding_task_destr(task_t *_task) start_binding_task_t *task = (start_binding_task_t*)_task; IBindStatusCallback_Release(&task->bscallback->bsc.IBindStatusCallback_iface); - free(task); } static nsresult async_open(nsChannel *This, HTMLOuterWindow *window, BOOL is_doc_channel, UINT32 load_type, diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 5767751ac14..9e59778ccb9 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -446,7 +446,6 @@ static void refresh_destr(task_t *_task) refresh_task_t *task = (refresh_task_t*)_task; IHTMLWindow2_Release(&task->window->base.IHTMLWindow2_iface); - free(task); } HRESULT reload_page(HTMLOuterWindow *window) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 581a25c4e2e..e527b3dc3c5 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -240,6 +240,10 @@ static void set_progress_proc(task_t *_task) } } +static void set_progress_destr(task_t *_task) +{ +} + static void set_downloading_proc(task_t *_task) { download_proc_task_t *task = (download_proc_task_t*)_task; @@ -275,7 +279,6 @@ static void set_downloading_task_destr(task_t *_task) download_proc_task_t *task = (download_proc_task_t*)_task; CoTaskMemFree(task->url); - free(task); } void prepare_for_binding(HTMLDocumentObj *This, IMoniker *mon, DWORD flags) @@ -406,7 +409,7 @@ HRESULT set_moniker(HTMLOuterWindow *window, IMoniker *mon, IUri *nav_uri, IBind task = malloc(sizeof(docobj_task_t)); task->doc = doc_obj; - hres = push_task(&task->header, set_progress_proc, NULL, doc_obj->task_magic); + hres = push_task(&task->header, set_progress_proc, set_progress_destr, doc_obj->task_magic); if(FAILED(hres)) { CoTaskMemFree(url); return hres; diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 2987b4bf19d..34b6c711ddd 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -46,27 +46,20 @@ typedef struct { struct list entry; } task_timer_t; -static void default_task_destr(task_t *task) -{ - free(task); -} - HRESULT push_task(task_t *task, task_proc_t proc, task_proc_t destr, LONG magic) { thread_data_t *thread_data; thread_data = get_thread_data(TRUE); if(!thread_data) { - if(destr) - destr(task); - else - free(task); + destr(task); + free(task); return E_OUTOFMEMORY; } task->target_magic = magic; task->proc = proc; - task->destr = destr ? destr : default_task_destr; + task->destr = destr; list_add_tail(&thread_data->task_list, &task->entry); @@ -128,6 +121,7 @@ void remove_target_tasks(LONG target) if(task->target_magic == target) { list_remove(&task->entry); task->destr(task); + free(task); } } } @@ -341,6 +335,7 @@ static LRESULT WINAPI hidden_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa task->proc(task); task->destr(task); + free(task); } return 0;

1 0

Gabriel Ivăncescu : mshtml: Pass optional args to XMLHttpRequest.open() correctly.
by Alexandre Julliard March 1, 2023

March 1, 2023

Module: wine Branch: master Commit: 59bdd9d01f83de4408204dbac7664346654a14cc URL: https://gitlab.winehq.org/wine/wine/-/commit/59bdd9d01f83de4408204dbac76643… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Feb 27 16:02:13 2023 +0200 mshtml: Pass optional args to XMLHttpRequest.open() correctly. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/xmlhttprequest.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index b4269bbe8d1..dff54abb8e2 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -546,8 +546,9 @@ static HRESULT HTMLXMLHttpRequest_open_hook(DispatchEx *dispex, WORD flags, static HRESULT WINAPI HTMLXMLHttpRequest_open(IHTMLXMLHttpRequest *iface, BSTR bstrMethod, BSTR bstrUrl, VARIANT varAsync, VARIANT varUser, VARIANT varPassword) { HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface); - nsACString method, url; nsAString user, password; + nsACString method, url; + unsigned opt_argc = 1; nsresult nsres; HRESULT hres; @@ -594,8 +595,11 @@ static HRESULT WINAPI HTMLXMLHttpRequest_open(IHTMLXMLHttpRequest *iface, BSTR b return hres; } - nsres = nsIXMLHttpRequest_Open(This->nsxhr, &method, &url, TRUE, - &user, &password, 0); + if(V_VT(&varPassword) != VT_EMPTY && V_VT(&varPassword) != VT_ERROR) + opt_argc += 2; + else if(V_VT(&varUser) != VT_EMPTY && V_VT(&varUser) != VT_ERROR) + opt_argc += 1; + nsres = nsIXMLHttpRequest_Open(This->nsxhr, &method, &url, !!V_BOOL(&varAsync), &user, &password, opt_argc); nsACString_Finish(&method); nsACString_Finish(&url);

1 0

Gabriel Ivăncescu : mshtml: Use proper types for readystate_locked and readystate_pending.
by Alexandre Julliard March 1, 2023

March 1, 2023

Module: wine Branch: master Commit: 2319a27757650086c219592cccaa2b3f5620047e URL: https://gitlab.winehq.org/wine/wine/-/commit/2319a27757650086c219592cccaa2b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Feb 27 16:02:12 2023 +0200 mshtml: Use proper types for readystate_locked and readystate_pending. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/mshtml_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index bec982a75fc..1873799dbf9 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -568,8 +568,8 @@ struct HTMLOuterWindow { struct list browser_entry; READYSTATE readystate; - BOOL readystate_locked; - unsigned readystate_pending; + unsigned readystate_locked; + BOOL readystate_pending; HTMLInnerWindow *pending_window; HTMLLocation location;

1 0

Alex Henrie : ntoskrnl: Add ExGetPreviousMode and test.
by Alexandre Julliard March 1, 2023

March 1, 2023

Module: wine Branch: master Commit: b9627b996f0a9680c95c6d705449a5925334d9f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/b9627b996f0a9680c95c6d705449a5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jan 27 21:17:42 2023 -0700 ntoskrnl: Add ExGetPreviousMode and test. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54378 --- dlls/ntoskrnl.exe/ntoskrnl.c | 6 ++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 1 + include/ddk/wdm.h | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index cc30750a160..2d506402036 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -4566,6 +4566,12 @@ NTSTATUS WINAPI KdEnableDebugger(void) return STATUS_DEBUGGER_INACTIVE; } +KPROCESSOR_MODE WINAPI ExGetPreviousMode(void) +{ + TRACE("\n"); + return PsIsSystemThread((PETHREAD)KeGetCurrentThread()) ? KernelMode : UserMode; +} + #ifdef __x86_64__ void WINAPI KfRaiseIrql(KIRQL new, KIRQL *old) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 2447d01458d..0b694b08de0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -154,7 +154,7 @@ @ stub ExGetCurrentProcessorCounts @ stub ExGetCurrentProcessorCpuUsage @ stdcall ExGetExclusiveWaiterCount(ptr) -@ stub ExGetPreviousMode +@ stdcall ExGetPreviousMode() @ stdcall ExGetSharedWaiterCount(ptr) @ stdcall ExInitializeNPagedLookasideList(ptr ptr ptr long long long long) @ stdcall ExInitializePagedLookasideList(ptr ptr ptr long long long long) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index d293889c823..d55ad846ef7 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -454,6 +454,7 @@ static void test_current_thread(BOOL is_system) ok(PsGetThreadId((PETHREAD)KeGetCurrentThread()) == PsGetCurrentThreadId(), "thread IDs don't match\n"); ok(PsIsSystemThread((PETHREAD)KeGetCurrentThread()) == is_system, "unexpected system thread\n"); + ok(ExGetPreviousMode() == is_system ? KernelMode : UserMode, "previous mode is not correct\n"); if (!is_system) { ok(create_caller_thread == KeGetCurrentThread(), "thread is not create caller thread\n"); diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 321b07b84fa..bf240f4fe53 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1683,6 +1683,7 @@ void WINAPI ExDeleteNPagedLookasideList(PNPAGED_LOOKASIDE_LIST); void WINAPI ExDeletePagedLookasideList(PPAGED_LOOKASIDE_LIST); NTSTATUS WINAPI ExDeleteResourceLite(ERESOURCE*); ULONG WINAPI ExGetExclusiveWaiterCount(ERESOURCE*); +KPROCESSOR_MODE WINAPI ExGetPreviousMode(void); ULONG WINAPI ExGetSharedWaiterCount(ERESOURCE*); void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST,PALLOCATE_FUNCTION,PFREE_FUNCTION,ULONG,SIZE_T,ULONG,USHORT); void WINAPI ExInitializePagedLookasideList(PPAGED_LOOKASIDE_LIST,PALLOCATE_FUNCTION,PFREE_FUNCTION,ULONG,SIZE_T,ULONG,USHORT);

1 0

Philip Gruebele : dwrite: Pass correct font key when adding glyph to cache.
by Alexandre Julliard March 1, 2023

March 1, 2023

Module: wine Branch: master Commit: 7eb1ac5143b08f24f5ecf07fe6599077eca347df URL: https://gitlab.winehq.org/wine/wine/-/commit/7eb1ac5143b08f24f5ecf07fe65990… Author: Philip Gruebele <philipg(a)audiophilleo.com> Date: Wed Mar 1 12:19:15 2023 +0200 dwrite: Pass correct font key when adding glyph to cache. Without this fix, the font cache was filling up with lots of duplicate entries, and getting cache misses, thereby causing font-intensive applications to be very slow (e.g. AvalonEdit). This fix provides 30x speed increase when processing glyphs. --- dlls/dwrite/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 5e1fb1c8cbf..9dce26a17c2 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -98,7 +98,7 @@ static struct cache_entry * fontface_get_cache_entry(struct dwrite_fontface *fon fontface_release_cache_entry(old_entry); } - if (wine_rb_put(&fontface->cache.tree, &key, &entry->entry) == -1) + if (wine_rb_put(&fontface->cache.tree, key, &entry->entry) == -1) { WARN("Failed to add cache entry.\n"); free(entry);

1 0

Adrian Thiele : mfreadwrite/reader: Release device manager in source_reader_release.
by Alexandre Julliard March 1, 2023

March 1, 2023

Module: wine Branch: master Commit: 0d4f63b34cd6f2f8c544714d67d31d93092d210f URL: https://gitlab.winehq.org/wine/wine/-/commit/0d4f63b34cd6f2f8c544714d67d31d… Author: Adrian Thiele <adrian.thiele(a)live.de> Date: Wed Mar 1 16:59:50 2023 +0100 mfreadwrite/reader: Release device manager in source_reader_release. --- dlls/mfreadwrite/reader.c | 2 ++ dlls/mfreadwrite/tests/mfplat.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 5296e77f3c3..e21f4e10fa9 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -211,6 +211,8 @@ static ULONG source_reader_release(struct source_reader *reader) if (!refcount) { + if (reader->device_manager) + IUnknown_Release(reader->device_manager); if (reader->async_callback) IMFSourceReaderCallback_Release(reader->async_callback); if (reader->descriptor) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 4b7600b5113..50d9d866a2c 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -1406,7 +1406,7 @@ static void test_reader_d3d9(void) IMFSourceReader_Release(reader); refcount = IDirect3DDeviceManager9_Release(d3d9_manager); - todo_wine ok(!refcount, "Unexpected refcount %lu.\n", refcount); + ok(!refcount, "Unexpected refcount %lu.\n", refcount); IDirect3DDevice9_Release(d3d9_device);

1 0

Adrian Thiele : mfreadwrite/tests: Check refcount of device manager after release.
by Alexandre Julliard March 1, 2023

March 1, 2023

Module: wine Branch: master Commit: eeb25932c7544497b93b3096e79944a9732eeb97 URL: https://gitlab.winehq.org/wine/wine/-/commit/eeb25932c7544497b93b3096e79944… Author: Adrian Thiele <adrian.thiele(a)live.de> Date: Wed Mar 1 16:54:15 2023 +0100 mfreadwrite/tests: Check refcount of device manager after release. --- dlls/mfreadwrite/tests/mfplat.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 83091b59380..4b7600b5113 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -1372,6 +1372,7 @@ static void test_reader_d3d9(void) HWND window; HRESULT hr; UINT token; + ULONG refcount; window = create_window(); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); @@ -1404,7 +1405,9 @@ static void test_reader_d3d9(void) IMFSourceReader_Release(reader); - IDirect3DDeviceManager9_Release(d3d9_manager); + refcount = IDirect3DDeviceManager9_Release(d3d9_manager); + todo_wine ok(!refcount, "Unexpected refcount %lu.\n", refcount); + IDirect3DDevice9_Release(d3d9_device); done:

1 0

Alexandre Julliard : ntdll: Implement RtlAddProcessTrustLabelAce().
by Alexandre Julliard March 1, 2023

March 1, 2023

Module: wine Branch: master Commit: d5468b9cac157bd57c081f2ca90186f8ccfe75fc URL: https://gitlab.winehq.org/wine/wine/-/commit/d5468b9cac157bd57c081f2ca90186… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 1 11:06:06 2023 +0100 ntdll: Implement RtlAddProcessTrustLabelAce(). --- dlls/ntdll/ntdll.spec | 5 +++-- dlls/ntdll/sec.c | 21 +++++++++++++++------ include/winnt.h | 8 ++++++++ include/winternl.h | 1 + 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 3117e4c9b72..b0186eb7641 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -482,10 +482,11 @@ @ stdcall RtlAddAuditAccessAceEx(ptr long long long ptr long long) @ stdcall RtlAddAuditAccessObjectAce(ptr long long long ptr ptr ptr long long) # @ stub RtlAddCompoundAce -@ stdcall RtlAddMandatoryAce(ptr long long long long ptr) -# @ stub RtlAddRange @ cdecl -arch=arm,arm64,x86_64 RtlAddFunctionTable(ptr long long) @ stdcall -arch=arm,arm64,x86_64 RtlAddGrowableFunctionTable(ptr ptr long long long long) +@ stdcall RtlAddMandatoryAce(ptr long long long long ptr) +@ stdcall RtlAddProcessTrustLabelAce(ptr long long ptr long long) +# @ stub RtlAddRange @ stdcall RtlAddRefActivationContext(ptr) # @ stub RtlAddRefMemoryStream @ stdcall RtlAddVectoredContinueHandler(long ptr) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 56f18423ad6..51308384ee8 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1478,22 +1478,31 @@ NTSTATUS WINAPI RtlAddMandatoryAce( IN DWORD dwAceType, IN PSID pSid) { - static const DWORD valid_flags = SYSTEM_MANDATORY_LABEL_NO_WRITE_UP | - SYSTEM_MANDATORY_LABEL_NO_READ_UP | - SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP; - TRACE("(%p, %lu, 0x%08lx, 0x%08lx, %lu, %p)\n", pAcl, dwAceRevision, dwAceFlags, dwMandatoryFlags, dwAceType, pSid); if (dwAceType != SYSTEM_MANDATORY_LABEL_ACE_TYPE) return STATUS_INVALID_PARAMETER; - - if (dwMandatoryFlags & ~valid_flags) + if (dwMandatoryFlags & ~SYSTEM_MANDATORY_LABEL_VALID_MASK) return STATUS_INVALID_PARAMETER; return add_access_ace(pAcl, dwAceRevision, dwAceFlags, dwMandatoryFlags, pSid, dwAceType); } +/************************************************************************** + * RtlAddProcessTrustLabelAce [NTDLL.@] + */ +NTSTATUS WINAPI RtlAddProcessTrustLabelAce( ACL *acl, DWORD revision, DWORD flags, + PSID sid, DWORD type, DWORD mask ) +{ + TRACE( "%p %lx %lx %p %lx %lx\n", acl, revision, flags, sid, type, mask ); + + if (type != SYSTEM_PROCESS_TRUST_LABEL_ACE_TYPE) return STATUS_INVALID_PARAMETER; + if (mask & ~SYSTEM_PROCESS_TRUST_LABEL_VALID_MASK) return STATUS_INVALID_PARAMETER; + + return add_access_ace( acl, revision, flags, mask, sid, type ); +} + /****************************************************************************** * RtlValidAcl [NTDLL.@] */ diff --git a/include/winnt.h b/include/winnt.h index 04c2e96d1e1..17dce6e84e5 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4848,6 +4848,12 @@ typedef struct _SYSTEM_MANDATORY_LABEL_ACE { DWORD SidStart; } SYSTEM_MANDATORY_LABEL_ACE,*PSYSTEM_MANDATORY_LABEL_ACE; +typedef struct _SYSTEM_PROCESS_TRUST_LABEL_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD SidStart; +} SYSTEM_PROCESS_TRUST_LABEL_ACE, *PSYSTEM_PROCESS_TRUST_LABEL_ACE; + typedef struct _ACCESS_ALLOWED_OBJECT_ACE { ACE_HEADER Header; ACCESS_MASK Mask; @@ -4948,6 +4954,8 @@ typedef struct _SYSTEM_ALARM_CALLBACK_OBJECT_ACE { #define SYSTEM_MANDATORY_LABEL_NO_READ_UP 0x2 #define SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP 0x4 #define SYSTEM_MANDATORY_LABEL_VALID_MASK 0x7 +#define SYSTEM_PROCESS_TRUST_LABEL_VALID_MASK 0x00ffffff +#define SYSTEM_PROCESS_TRUST_NOCONSTRAINT_MASK 0xffffffff typedef enum tagSID_NAME_USE { SidTypeUser = 1, diff --git a/include/winternl.h b/include/winternl.h index 93bd32e3786..95abf79812b 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4259,6 +4259,7 @@ NTSYSAPI NTSTATUS WINAPI RtlAddAuditAccessAce(PACL,DWORD,DWORD,PSID,BOOL,BOOL); NTSYSAPI NTSTATUS WINAPI RtlAddAuditAccessAceEx(PACL,DWORD,DWORD,DWORD,PSID,BOOL,BOOL); NTSYSAPI NTSTATUS WINAPI RtlAddAuditAccessObjectAce(PACL,DWORD,DWORD,DWORD,GUID*,GUID*,PSID,BOOL,BOOL); NTSYSAPI NTSTATUS WINAPI RtlAddMandatoryAce(PACL,DWORD,DWORD,DWORD,DWORD,PSID); +NTSYSAPI NTSTATUS WINAPI RtlAddProcessTrustLabelAce(PACL,DWORD,DWORD,PSID,DWORD,DWORD); NTSYSAPI void WINAPI RtlAddRefActivationContext(HANDLE); NTSYSAPI PVOID WINAPI RtlAddVectoredExceptionHandler(ULONG,PVECTORED_EXCEPTION_HANDLER); NTSYSAPI PVOID WINAPI RtlAddressInSectionTable(const IMAGE_NT_HEADERS*,HMODULE,DWORD);

1 0

Alex Henrie : server: Annotate allocation functions with __WINE_(ALLOC_SIZE|DEALLOC|MALLOC).
by Alexandre Julliard March 1, 2023

March 1, 2023

Module: wine Branch: master Commit: f3e1d897ca5f7d686e9a148871b8d9e2ee9931b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/f3e1d897ca5f7d686e9a148871b8d9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jan 27 12:56:55 2023 -0700 server: Annotate allocation functions with __WINE_(ALLOC_SIZE|DEALLOC|MALLOC). --- server/file.h | 2 +- server/object.h | 6 +++--- server/unicode.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/file.h b/server/file.h index 0ffe0e2c8dc..210fcec5e78 100644 --- a/server/file.h +++ b/server/file.h @@ -102,7 +102,7 @@ extern obj_handle_t lock_fd( struct fd *fd, file_pos_t offset, file_pos_t count, extern void unlock_fd( struct fd *fd, file_pos_t offset, file_pos_t count ); extern void allow_fd_caching( struct fd *fd ); extern void set_fd_signaled( struct fd *fd, int signaled ); -extern char *dup_fd_name( struct fd *root, const char *name ); +extern char *dup_fd_name( struct fd *root, const char *name ) __WINE_DEALLOC(free) __WINE_MALLOC; extern void get_nt_name( struct fd *fd, struct unicode_str *name ); extern int default_fd_signaled( struct object *obj, struct wait_queue_entry *entry ); diff --git a/server/object.h b/server/object.h index f156f1d2f13..dfdd691601f 100644 --- a/server/object.h +++ b/server/object.h @@ -139,12 +139,12 @@ struct wait_queue_entry struct thread_wait *wait; }; -extern void *mem_alloc( size_t size ); /* malloc wrapper */ -extern void *memdup( const void *data, size_t len ); +extern void *mem_alloc( size_t size ) __WINE_ALLOC_SIZE(1) __WINE_DEALLOC(free) __WINE_MALLOC; +extern void *memdup( const void *data, size_t len ) __WINE_ALLOC_SIZE(2) __WINE_DEALLOC(free); extern void *alloc_object( const struct object_ops *ops ); extern void namespace_add( struct namespace *namespace, struct object_name *ptr ); extern const WCHAR *get_object_name( struct object *obj, data_size_t *len ); -extern WCHAR *default_get_full_name( struct object *obj, data_size_t *ret_len ); +extern WCHAR *default_get_full_name( struct object *obj, data_size_t *ret_len ) __WINE_DEALLOC(free) __WINE_MALLOC; extern void dump_object_name( struct object *obj ); extern struct object *lookup_named_object( struct object *root, const struct unicode_str *name, unsigned int attr, struct unicode_str *name_left ); diff --git a/server/unicode.h b/server/unicode.h index e031d6ef0cf..951100564cd 100644 --- a/server/unicode.h +++ b/server/unicode.h @@ -28,7 +28,7 @@ extern int memicmp_strW( const WCHAR *str1, const WCHAR *str2, data_size_t len ); extern unsigned int hash_strW( const WCHAR *str, data_size_t len, unsigned int hash_size ); -extern WCHAR *ascii_to_unicode_str( const char *str, struct unicode_str *ret ); +extern WCHAR *ascii_to_unicode_str( const char *str, struct unicode_str *ret ) __WINE_DEALLOC(free) __WINE_MALLOC; extern int parse_strW( WCHAR *buffer, data_size_t *len, const char *src, char endchar ); extern int dump_strW( const WCHAR *str, data_size_t len, FILE *f, const char escape[2] ); extern struct fd *load_intl_file(void);

1 0

Alexandre Julliard : makedep: Store the list of .ok files per-architecture.
by Alexandre Julliard March 1, 2023

March 1, 2023

Module: wine Branch: master Commit: fec95db07569fa84f62150446a760e817690fcf1 URL: https://gitlab.winehq.org/wine/wine/-/commit/fec95db07569fa84f62150446a760e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 1 14:25:40 2023 +0100 makedep: Store the list of .ok files per-architecture. --- tools/makedep.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index d9ca4a1a7b6..8fa539026ca 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -203,7 +203,6 @@ struct makefile /* values generated at output time */ struct strarray in_files; - struct strarray ok_files; struct strarray pot_files; struct strarray test_files; struct strarray clean_files; @@ -218,6 +217,7 @@ struct makefile struct strarray dependencies; struct strarray object_files[MAX_ARCHS]; struct strarray implib_files[MAX_ARCHS]; + struct strarray ok_files[MAX_ARCHS]; struct strarray res_files[MAX_ARCHS]; struct strarray all_targets[MAX_ARCHS]; struct strarray install_rules[NB_INSTALL_RULES]; @@ -3163,7 +3163,7 @@ static void output_source_one_arch( struct makefile *make, struct incl_file *sou ok_file = strmake( "%s%s.ok", arch_dirs[arch], obj ); test_exe = replace_extension( make->testdll, ".dll", "_test.exe" ); - strarray_add( &make->ok_files, ok_file ); + strarray_add( &make->ok_files[arch], ok_file ); output( "%s:\n", obj_dir_path( make, ok_file )); output( "\t%s%s $(RUNTESTFLAGS) -T . -M %s -p %s %s && touch $@\n", cmd_prefix( "TEST" ), @@ -3484,10 +3484,10 @@ static void output_test_module( struct makefile *make, unsigned int arch ) if (make->disabled[arch] || (parent && parent->disabled[arch])) { - make->ok_files = empty_strarray; + make->ok_files[arch] = empty_strarray; return; } - output_filenames_obj_dir( make, make->ok_files ); + output_filenames_obj_dir( make, make->ok_files[arch] ); output( ": %s", obj_dir_path( make, testmodule )); if (parent) { @@ -3497,15 +3497,15 @@ static void output_test_module( struct makefile *make, unsigned int arch ) } output( "\n" ); output( "%s %s:", obj_dir_path( make, "check" ), obj_dir_path( make, "test" )); - output_filenames_obj_dir( make, make->ok_files ); + output_filenames_obj_dir( make, make->ok_files[arch] ); output( "\n" ); strarray_add_uniq( &make->phony_targets, obj_dir_path( make, "check" )); strarray_add_uniq( &make->phony_targets, obj_dir_path( make, "test" )); output( "%s::\n", obj_dir_path( make, "testclean" )); output( "\trm -f" ); - output_filenames_obj_dir( make, make->ok_files ); + output_filenames_obj_dir( make, make->ok_files[arch] ); output( "\n" ); - strarray_addall( &make->clean_files, make->ok_files ); + strarray_addall( &make->clean_files, make->ok_files[arch] ); strarray_add_uniq( &make->phony_targets, obj_dir_path( make, "testclean" )); } @@ -3594,13 +3594,13 @@ static void output_subdirs( struct makefile *make ) strarray_addall_path( &distclean_files, submakes[i]->obj_dir, submakes[i]->distclean_files ); strarray_addall_path( &distclean_dirs, submakes[i]->obj_dir, subclean ); strarray_addall_path( &make->maintainerclean_files, submakes[i]->obj_dir, submakes[i]->maintainerclean_files ); - strarray_addall_path( &testclean_files, submakes[i]->obj_dir, submakes[i]->ok_files ); strarray_addall_path( &make->pot_files, submakes[i]->obj_dir, submakes[i]->pot_files ); for (arch = 0; arch < archs.count; arch++) { if (submakes[i]->disabled[arch]) continue; strarray_addall_path( &all_targets, submakes[i]->obj_dir, submakes[i]->all_targets[arch] ); + strarray_addall_path( &testclean_files, submakes[i]->obj_dir, submakes[i]->ok_files[arch] ); } if (submakes[i]->disabled[0]) continue;

1 0