wine-commits May 2018

wine-commits@winehq.org

2 participants
716 discussions

Christian Costa : wined3d: Recognize GTX 560M card with NVIDIA driver.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: cd554b4284e7c1bc2ca17c209389b1188c8133ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd554b4284e7c1bc2ca17c20… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 5 04:17:48 2018 +0000 wined3d: Recognize GTX 560M card with NVIDIA driver. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 00b1f69cd2d3d7800cbacb4b05ae536eb6f9dc93) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1586bdc..c2142f7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1341,6 +1341,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX550, "NVIDIA GeForce GTX 550 Ti", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT555M, "NVIDIA GeForce GT 555M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560TI, "NVIDIA GeForce GTX 560 Ti", DRIVER_NVIDIA_GEFORCE8, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560M, "NVIDIA GeForce GTX 560M", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560, "NVIDIA GeForce GTX 560", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX570, "NVIDIA GeForce GTX 570", DRIVER_NVIDIA_GEFORCE8, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX580, "NVIDIA GeForce GTX 580", DRIVER_NVIDIA_GEFORCE8, 1536}, @@ -1945,6 +1946,7 @@ cards_nvidia_binary[] = {"GTX 580", CARD_NVIDIA_GEFORCE_GTX580}, /* Geforce 500 - highend */ {"GTX 570", CARD_NVIDIA_GEFORCE_GTX570}, /* Geforce 500 - midend high */ {"GTX 560 Ti", CARD_NVIDIA_GEFORCE_GTX560TI}, /* Geforce 500 - midend */ + {"GTX 560M", CARD_NVIDIA_GEFORCE_GTX560M}, /* Geforce 500 - midend mobile */ {"GTX 560", CARD_NVIDIA_GEFORCE_GTX560}, /* Geforce 500 - midend */ {"GT 555M", CARD_NVIDIA_GEFORCE_GT555M}, /* Geforce 500 - midend mobile */ {"GTX 550 Ti", CARD_NVIDIA_GEFORCE_GTX550}, /* Geforce 500 - midend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9f68b0a..a1d9058 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2341,6 +2341,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX550 = 0x1244, CARD_NVIDIA_GEFORCE_GT555M = 0x04b8, CARD_NVIDIA_GEFORCE_GTX560TI = 0x1200, + CARD_NVIDIA_GEFORCE_GTX560M = 0x1251, CARD_NVIDIA_GEFORCE_GTX560 = 0x1201, CARD_NVIDIA_GEFORCE_GTX570 = 0x1081, CARD_NVIDIA_GEFORCE_GTX580 = 0x1080,

1 0

Stefan Leichter : ntdll: Implement RtlCreateRegistryKey.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: 18489d157e1fb5401f7bb2ab199539205ef6cf1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=18489d157e1fb5401f7bb2ab… Author: Stefan Leichter <sle85276(a)gmx.de> Date: Mon Mar 12 00:15:27 2018 +0100 ntdll: Implement RtlCreateRegistryKey. Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 535419a2bf8da3fd21cfdede44bf51026a97b94d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/reg.c | 69 ++++++++++++++++++++++++++++++------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/winternl.h | 1 + 4 files changed, 60 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 5c5365d..a6d6dc8 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -509,7 +509,7 @@ @ stdcall RtlCreateProcessParameters(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stub RtlCreatePropertySet @ stdcall RtlCreateQueryDebugBuffer(long long) -@ stub RtlCreateRegistryKey +@ stdcall RtlCreateRegistryKey(long wstr) @ stdcall RtlCreateSecurityDescriptor(ptr long) # @ stub RtlCreateSystemVolumeInformationFolder @ stub RtlCreateTagHeap diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index a34c863..c6acd76 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -1133,13 +1133,10 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, } -static NTSTATUS RTL_GetKeyHandle(ULONG RelativeTo, PCWSTR Path, PHANDLE handle) +static NTSTATUS RTL_KeyHandleCreateObject(ULONG RelativeTo, PCWSTR Path, POBJECT_ATTRIBUTES regkey, PUNICODE_STRING str) { - UNICODE_STRING KeyString; - OBJECT_ATTRIBUTES regkey; PCWSTR base; INT len; - NTSTATUS status; static const WCHAR empty[] = {0}; static const WCHAR control[] = {'\\','R','e','g','i','s','t','r','y','\\','M','a','c','h','i','n','e', @@ -1191,17 +1188,30 @@ static NTSTATUS RTL_GetKeyHandle(ULONG RelativeTo, PCWSTR Path, PHANDLE handle) } len = (strlenW(base) + strlenW(Path) + 1) * sizeof(WCHAR); - KeyString.Buffer = RtlAllocateHeap(GetProcessHeap(), 0, len); - if (KeyString.Buffer == NULL) + str->Buffer = RtlAllocateHeap(GetProcessHeap(), 0, len); + if (str->Buffer == NULL) return STATUS_NO_MEMORY; - strcpyW(KeyString.Buffer, base); - strcatW(KeyString.Buffer, Path); - KeyString.Length = len - sizeof(WCHAR); - KeyString.MaximumLength = len; - InitializeObjectAttributes(&regkey, &KeyString, OBJ_CASE_INSENSITIVE, NULL, NULL); + strcpyW(str->Buffer, base); + strcatW(str->Buffer, Path); + str->Length = len - sizeof(WCHAR); + str->MaximumLength = len; + InitializeObjectAttributes(regkey, str, OBJ_CASE_INSENSITIVE, NULL, NULL); + return STATUS_SUCCESS; +} + +static NTSTATUS RTL_GetKeyHandle(ULONG RelativeTo, PCWSTR Path, PHANDLE handle) +{ + OBJECT_ATTRIBUTES regkey; + UNICODE_STRING string; + NTSTATUS status; + + status = RTL_KeyHandleCreateObject(RelativeTo, Path, &regkey, &string); + if(status != STATUS_SUCCESS) + return status; + status = NtOpenKey(handle, KEY_ALL_ACCESS, &regkey); - RtlFreeHeap(GetProcessHeap(), 0, KeyString.Buffer); + RtlFreeUnicodeString( &string ); return status; } @@ -1415,6 +1425,41 @@ NTSTATUS WINAPI RtlCheckRegistryKey(IN ULONG RelativeTo, IN PWSTR Path) } /************************************************************************* + * RtlCreateRegistryKey [NTDLL.@] + * + * Add a key to the registry given by absolute or relative path + * + * PARAMS + * RelativeTo [I] Registry path that Path refers to + * path [I] Path to key + * + * RETURNS + * STATUS_SUCCESS or an appropriate NTSTATUS error code. + */ +NTSTATUS WINAPI RtlCreateRegistryKey(ULONG RelativeTo, PWSTR path) +{ + OBJECT_ATTRIBUTES regkey; + UNICODE_STRING string; + HANDLE handle; + NTSTATUS status; + + RelativeTo &= ~RTL_REGISTRY_OPTIONAL; + + if (!RelativeTo && (path == NULL || path[0] == 0)) + return STATUS_OBJECT_PATH_SYNTAX_BAD; + if (RelativeTo <= RTL_REGISTRY_USER && (path == NULL || path[0] == 0)) + return STATUS_SUCCESS; + status = RTL_KeyHandleCreateObject(RelativeTo, path, &regkey, &string); + if(status != STATUS_SUCCESS) + return status; + + status = NtCreateKey(&handle, KEY_ALL_ACCESS, &regkey, 0, NULL, REG_OPTION_NON_VOLATILE, NULL); + if (handle) NtClose(handle); + RtlFreeUnicodeString( &string ); + return status; +} + +/************************************************************************* * RtlDeleteRegistryValue [NTDLL.@] * * Query multiple registry values with a single call. diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 24b40c3..63ef17b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -975,7 +975,7 @@ @ stdcall RtlCreateAcl(ptr long long) @ stdcall RtlCreateAtomTable(long ptr) @ stdcall RtlCreateHeap(long ptr long long ptr ptr) -@ stub RtlCreateRegistryKey +@ stdcall RtlCreateRegistryKey(long wstr) @ stdcall RtlCreateSecurityDescriptor(ptr long) @ stub RtlCreateSystemVolumeInformationFolder @ stdcall RtlCreateUnicodeString(ptr wstr) diff --git a/include/winternl.h b/include/winternl.h index f9f3350..d5aee67 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2466,6 +2466,7 @@ NTSYSAPI void WINAPI RtlClearAllBits(PRTL_BITMAP); NTSYSAPI void WINAPI RtlClearBits(PRTL_BITMAP,ULONG,ULONG); NTSYSAPI NTSTATUS WINAPI RtlCreateActivationContext(HANDLE*,const void*); NTSYSAPI PDEBUG_BUFFER WINAPI RtlCreateQueryDebugBuffer(ULONG,BOOLEAN); +NTSYSAPI NTSTATUS WINAPI RtlCreateRegistryKey(ULONG,PWSTR); NTSYSAPI ULONG WINAPI RtlCompactHeap(HANDLE,ULONG); NTSYSAPI LONG WINAPI RtlCompareString(const STRING*,const STRING*,BOOLEAN); NTSYSAPI LONG WINAPI RtlCompareUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN);

1 0

Stefan Leichter : ntdll: Fix RtlCheckRegistryKey when called with empty path.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: 0e18a08ca9d986c7bef4841e39b012e4bd82f6aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e18a08ca9d986c7bef4841e… Author: Stefan Leichter <sle85276(a)gmx.de> Date: Mon Mar 12 00:14:55 2018 +0100 ntdll: Fix RtlCheckRegistryKey when called with empty path. Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f07e8ca8f01106b6d41a933f0ac393b30d505bad) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/reg.c | 4 +++- dlls/ntdll/tests/reg.c | 13 +++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 2dd75be..a34c863 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -1401,10 +1401,12 @@ NTSTATUS WINAPI RtlCheckRegistryKey(IN ULONG RelativeTo, IN PWSTR Path) TRACE("(%d, %s)\n", RelativeTo, debugstr_w(Path)); - if((!RelativeTo) && Path == NULL) + if(!RelativeTo && (Path == NULL || Path[0] == 0)) return STATUS_OBJECT_PATH_SYNTAX_BAD; if(RelativeTo & RTL_REGISTRY_HANDLE) return STATUS_SUCCESS; + if((RelativeTo <= RTL_REGISTRY_USER) && (Path == NULL || Path[0] == 0)) + return STATUS_SUCCESS; status = RTL_GetKeyHandle(RelativeTo, Path, &handle); if (handle) NtClose(handle); diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 7d2e566..ddd400e 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -671,6 +671,7 @@ static void test_RtlOpenCurrentUser(void) static void test_RtlCheckRegistryKey(void) { + static WCHAR empty[] = {0}; NTSTATUS status; status = pRtlCheckRegistryKey(RTL_REGISTRY_ABSOLUTE, winetestpath.Buffer); @@ -678,6 +679,18 @@ static void test_RtlCheckRegistryKey(void) status = pRtlCheckRegistryKey((RTL_REGISTRY_ABSOLUTE | RTL_REGISTRY_OPTIONAL), winetestpath.Buffer); ok(status == STATUS_SUCCESS, "RtlCheckRegistryKey with RTL_REGISTRY_ABSOLUTE and RTL_REGISTRY_OPTIONAL: 0x%08x\n", status); + + status = pRtlCheckRegistryKey(RTL_REGISTRY_ABSOLUTE, NULL); + ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, "RtlCheckRegistryKey with RTL_REGISTRY_ABSOLUTE and Path being NULL: 0x%08x\n", status); + + status = pRtlCheckRegistryKey(RTL_REGISTRY_ABSOLUTE, empty); + ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, "RtlCheckRegistryKey with RTL_REGISTRY_ABSOLUTE and Path being empty: 0x%08x\n", status); + + status = pRtlCheckRegistryKey(RTL_REGISTRY_USER, NULL); + ok(status == STATUS_SUCCESS, "RtlCheckRegistryKey with RTL_REGISTRY_USER and Path being NULL: 0x%08x\n", status); + + status = pRtlCheckRegistryKey(RTL_REGISTRY_USER, empty); + ok(status == STATUS_SUCCESS, "RtlCheckRegistryKey with RTL_REGISTRY_USER and Path being empty: 0x%08x\n", status); } static void test_NtFlushKey(void)

1 0

Piotr Caban : msvcp100: Add _Runtime_object class implementation.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: 7a5b218f42e6b7aad18a152393036f61818fec03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a5b218f42e6b7aad18a1523… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 8 14:20:55 2018 -0600 msvcp100: Add _Runtime_object class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 661791cb7ea3757655aeff4fb061ada27a88cecc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 10 +++++---- dlls/msvcp100/tests/misc.c | 36 ++++++++++++++++++++++++++++- dlls/msvcp110/msvcp110.spec | 12 +++++----- dlls/msvcp120/msvcp120.spec | 12 +++++----- dlls/msvcp120_app/msvcp120_app.spec | 12 +++++----- dlls/msvcp90/misc.c | 45 +++++++++++++++++++++++++++++++++++++ 6 files changed, 104 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7a5b218f42e6b7aad18a…

1 0

Michael Müller : sfc_os: Set an error code in SfcGetNextProtectedFile stub.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: b2e374137b376e90b527eaa465f6625c1b305e6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2e374137b376e90b527eaa4… Author: Michael Müller <michael(a)fds-team.de> Date: Sun Mar 4 10:51:25 2018 -0600 sfc_os: Set an error code in SfcGetNextProtectedFile stub. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7dd74d5b5084f352b46c0e52e421bf28f34cade1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/sfc_os/sfc_os.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/sfc_os/sfc_os.c b/dlls/sfc_os/sfc_os.c index f4515f2..6193dda 100644 --- a/dlls/sfc_os/sfc_os.c +++ b/dlls/sfc_os/sfc_os.c @@ -55,6 +55,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) BOOL WINAPI SfcGetNextProtectedFile(HANDLE handle, PROTECTED_FILE_DATA *data) { FIXME("%p %p\n", handle, data); + + SetLastError(ERROR_NO_MORE_FILES); return FALSE; }

1 0

Jacek Caban : mshtml: Use nsIDOMEvent directly to prevent default event handling in dispatch_event_object.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: e93abfb47d39c1f94b4c3dcaaf15a161ac1f86a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e93abfb47d39c1f94b4c3dca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 8 08:56:28 2018 -0600 mshtml: Use nsIDOMEvent directly to prevent default event handling in dispatch_event_object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 39766bcded650cec23c0c288dde12fe1e46e43cc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/htmlevent.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index abc0a1c..78a89f7 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1684,8 +1684,8 @@ static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event, } if(event->event_id != EVENTID_LAST && (event_info[event->event_id].flags & EVENT_HASDEFAULTHANDLERS)) { - for(i = 0; !event->prevent_default && i < chain_cnt; i++) { - BOOL prevent_default = FALSE; + BOOL prevent_default = event->prevent_default; + for(i = 0; !prevent_default && i < chain_cnt; i++) { vtbl = dispex_get_vtbl(&target_chain[i]->dispex); if(!vtbl || !vtbl->handle_event_default) continue; @@ -1694,7 +1694,7 @@ static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event, if(FAILED(hres) || event->stop_propagation) break; if(prevent_default) - IDOMEvent_preventDefault(&event->IDOMEvent_iface); + nsIDOMEvent_PreventDefault(event->nsevent); } }

1 0

Alistair Leslie-Hughes : msscript: Implement IScriptControl get/ set AllowUI.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: 1e6d94b10d8da6aac6a76e2788ebcea0c162f808 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e6d94b10d8da6aac6a76e27… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 12 22:08:09 2018 +0000 msscript: Implement IScriptControl get/set AllowUI. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c21c8525f9e69cfd48906ecc33b909490bd82783) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 17 +++++++++++++---- dlls/msscript.ocx/tests/msscript.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index b0ea1e5..78b73c4 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -88,6 +88,7 @@ struct ScriptControl { IOleClientSite *site; SIZEL extent; LONG timeout; + VARIANT_BOOL allow_ui; /* connection points */ ConnectionPoint *cp_list; @@ -825,15 +826,22 @@ static HRESULT WINAPI ScriptControl_put_Timeout(IScriptControl *iface, LONG time static HRESULT WINAPI ScriptControl_get_AllowUI(IScriptControl *iface, VARIANT_BOOL *p) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + + *p = This->allow_ui; + return S_OK; } static HRESULT WINAPI ScriptControl_put_AllowUI(IScriptControl *iface, VARIANT_BOOL allow_ui) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%x)\n", This, allow_ui); - return E_NOTIMPL; + TRACE("(%p)->(%x)\n", This, allow_ui); + + This->allow_ui = allow_ui; + return S_OK; } static HRESULT WINAPI ScriptControl_get_UseSafeSubset(IScriptControl *iface, VARIANT_BOOL *p) @@ -1891,6 +1899,7 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow script_control->timeout = 10000; script_control->view_sink_flags = 0; script_control->view_sink = NULL; + script_control->allow_ui = VARIANT_TRUE; ConnectionPoint_Init(&script_control->cp_scsource, script_control, &DIID_DScriptControlSource); ConnectionPoint_Init(&script_control->cp_propnotif, script_control, &IID_IPropertyNotifySink); diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 66e2611..576a6b1 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -1227,6 +1227,33 @@ static void test_AddObject(void) SysFreeString(objname); } +static void test_AllowUI(void) +{ + IScriptControl *sc; + VARIANT_BOOL allow; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void**)&sc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_get_AllowUI(sc, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IScriptControl_get_AllowUI(sc, &allow); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(allow == VARIANT_TRUE, "got %d\n", allow); + + hr = IScriptControl_put_AllowUI(sc, VARIANT_FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_get_AllowUI(sc, &allow); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(allow == VARIANT_FALSE, "got %d\n", allow); + + IScriptControl_Release(sc); +} + START_TEST(msscript) { IUnknown *unk; @@ -1253,6 +1280,7 @@ START_TEST(msscript) test_timeout(); test_Reset(); test_AddObject(); + test_AllowUI(); CoUninitialize(); }

1 0

Louis Lenders : ntdll: Match NtAllocateUuids signature to Windows 2000 instead of NT4.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: ad7bdbd4866c0c27167cdb614e036058225cd3ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad7bdbd4866c0c27167cdb61… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sun Mar 11 21:09:48 2018 -0600 ntdll: Match NtAllocateUuids signature to Windows 2000 instead of NT4. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e24af9660aa202d5885171f55e1dd371f57fc15d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/om.c | 9 +++------ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/winternl.h | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 584b5a4..5c5365d 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -111,7 +111,7 @@ @ stdcall NtAlertThread(long) @ stdcall NtAllocateLocallyUniqueId(ptr) # @ stub NtAllocateUserPhysicalPages -@ stdcall NtAllocateUuids(ptr ptr ptr) +@ stdcall NtAllocateUuids(ptr ptr ptr ptr) @ stdcall NtAllocateVirtualMemory(long ptr long ptr long long) @ stdcall NtAreMappedFilesTheSame(ptr ptr) @ stdcall NtAssignProcessToJobObject(long long) @@ -1040,7 +1040,7 @@ @ stdcall -private ZwAlertThread(long) NtAlertThread @ stdcall -private ZwAllocateLocallyUniqueId(ptr) NtAllocateLocallyUniqueId # @ stub ZwAllocateUserPhysicalPages -@ stdcall -private ZwAllocateUuids(ptr ptr ptr) NtAllocateUuids +@ stdcall -private ZwAllocateUuids(ptr ptr ptr ptr) NtAllocateUuids @ stdcall -private ZwAllocateVirtualMemory(long ptr long ptr long long) NtAllocateVirtualMemory @ stdcall -private ZwAreMappedFilesTheSame(ptr ptr) NtAreMappedFilesTheSame @ stdcall -private ZwAssignProcessToJobObject(long long) NtAssignProcessToJobObject diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index 1279f2b..febe5bd 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -688,13 +688,10 @@ NTSTATUS WINAPI NtQuerySymbolicLinkObject( HANDLE handle, PUNICODE_STRING target /****************************************************************************** * NtAllocateUuids [NTDLL.@] */ -NTSTATUS WINAPI NtAllocateUuids( - PULARGE_INTEGER Time, - PULONG Range, - PULONG Sequence) +NTSTATUS WINAPI NtAllocateUuids( ULARGE_INTEGER *time, ULONG *delta, ULONG *sequence, UCHAR *seed ) { - FIXME("(%p,%p,%p), stub.\n", Time, Range, Sequence); - return 0; + FIXME("(%p,%p,%p,%p), stub.\n", time, delta, sequence, seed); + return STATUS_SUCCESS; } /************************************************************************** diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 7f43704..24b40c3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -740,7 +740,7 @@ @ stdcall NtAddAtom(ptr long ptr) @ stdcall NtAdjustPrivilegesToken(long long ptr long ptr ptr) @ stdcall NtAllocateLocallyUniqueId(ptr) -@ stdcall NtAllocateUuids(ptr ptr ptr) +@ stdcall NtAllocateUuids(ptr ptr ptr ptr) @ stdcall NtAllocateVirtualMemory(long ptr long ptr long long) @ stub NtBuildNumber @ stdcall NtClose(long) diff --git a/include/winternl.h b/include/winternl.h index 24cf15c..f9f3350 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2196,7 +2196,7 @@ NTSYSAPI NTSTATUS WINAPI NtAdjustPrivilegesToken(HANDLE,BOOLEAN,PTOKEN_PRIVILEG NTSYSAPI NTSTATUS WINAPI NtAlertResumeThread(HANDLE,PULONG); NTSYSAPI NTSTATUS WINAPI NtAlertThread(HANDLE ThreadHandle); NTSYSAPI NTSTATUS WINAPI NtAllocateLocallyUniqueId(PLUID lpLuid); -NTSYSAPI NTSTATUS WINAPI NtAllocateUuids(PULARGE_INTEGER,PULONG,PULONG); +NTSYSAPI NTSTATUS WINAPI NtAllocateUuids(PULARGE_INTEGER,PULONG,PULONG,PUCHAR); NTSYSAPI NTSTATUS WINAPI NtAllocateVirtualMemory(HANDLE,PVOID*,ULONG,SIZE_T*,ULONG,ULONG); NTSYSAPI NTSTATUS WINAPI NtAreMappedFilesTheSame(PVOID,PVOID); NTSYSAPI NTSTATUS WINAPI NtAssignProcessToJobObject(HANDLE,HANDLE);

1 0

Alexandre Julliard : ntdll: Avoid pushl %esp instruction in RtlUnwind prolog.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: bf25842dd2317c4b89f1585fcb298da6edf6fe5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf25842dd2317c4b89f1585f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 9 13:47:01 2018 -0600 ntdll: Avoid pushl %esp instruction in RtlUnwind prolog. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 342e2cabd21c5a836683ac30e260ec4944eeac6b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/signal_i386.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index dcca0f5..79d6e32 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2762,7 +2762,9 @@ __ASM_STDCALL_FUNC( RtlUnwind, 16, "movl %esp,%ebp\n\t" __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") "leal -(0x2cc+8)(%esp),%esp\n\t" /* sizeof(CONTEXT) + alignment */ - "pushl %esp\n\t" /* context */ + "pushl %eax\n\t" + "leal 4(%esp),%eax\n\t" /* context */ + "xchgl %eax,(%esp)\n\t" "call " __ASM_NAME("RtlCaptureContext") __ASM_STDCALL(4) "\n\t" "leal 24(%ebp),%eax\n\t" "movl %eax,0xc4(%esp)\n\t" /* context->Esp */

1 0

Andrew Wesie : ntdll: Implement NtCreateThreadEx.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: 11dbee29209da0c1bedf6cac9a57c278bbbc6042 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11dbee29209da0c1bedf6cac… Author: Andrew Wesie <awesie(a)gmail.com> Date: Tue Mar 6 03:10:30 2018 +0000 ntdll: Implement NtCreateThreadEx. Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4fda0463237d395fbee5d955e72a7c13ed125416) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/thread.c | 17 +++++++++++++++++ include/winternl.h | 7 +++++++ 3 files changed, 25 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 27c10e1..584b5a4 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -152,6 +152,7 @@ @ stdcall NtCreateSemaphore(ptr long ptr long long) @ stdcall NtCreateSymbolicLinkObject(ptr long ptr ptr) @ stub NtCreateThread +@ stdcall NtCreateThreadEx(ptr long ptr long ptr ptr long long long long ptr) @ stdcall NtCreateTimer(ptr long ptr long) @ stub NtCreateToken # @ stub NtCreateWaitablePort diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 66beeb0..88008ad 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -522,6 +522,23 @@ static void start_thread( struct startup_info *info ) /*********************************************************************** + * NtCreateThreadEx (NTDLL.@) + */ +NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle_ptr, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, + HANDLE process, LPTHREAD_START_ROUTINE start, void *param, + ULONG flags, ULONG zero_bits, ULONG stack_commit, + ULONG stack_reserve, void *attribute_list ) +{ + FIXME( "%p, %x, %p, %p, %p, %p, %x, %x, %x, %x, %p semi-stub!\n", handle_ptr, access, attr, + process, start, param, flags, zero_bits, stack_commit, stack_reserve, attribute_list ); + + return RtlCreateUserThread( process, NULL, flags & THREAD_CREATE_FLAGS_CREATE_SUSPENDED, + NULL, stack_reserve, stack_commit, (PRTL_THREAD_START_ROUTINE)start, + param, handle_ptr, NULL ); +} + + +/*********************************************************************** * RtlCreateUserThread (NTDLL.@) */ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR *descr, diff --git a/include/winternl.h b/include/winternl.h index 21353d8..24cf15c 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2149,6 +2149,13 @@ typedef struct _SYSTEM_MODULE_INFORMATION SYSTEM_MODULE Modules[1]; /* FIXME: should be Modules[0] */ } SYSTEM_MODULE_INFORMATION, *PSYSTEM_MODULE_INFORMATION; +#define THREAD_CREATE_FLAGS_CREATE_SUSPENDED 0x00000001 +#define THREAD_CREATE_FLAGS_SKIP_THREAD_ATTACH 0x00000002 +#define THREAD_CREATE_FLAGS_HIDE_FROM_DEBUGGER 0x00000004 +#define THREAD_CREATE_FLAGS_HAS_SECURITY_DESCRIPTOR 0x00000010 +#define THREAD_CREATE_FLAGS_ACCESS_CHECK_IN_TARGET 0x00000020 +#define THREAD_CREATE_FLAGS_INITIAL_THREAD 0x00000080 + /*********************************************************************** * Function declarations */

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2018