April 2019 - Wine-Commits - list.winehq.org

Gabriel Ivăncescu : comctl32/button: Delay calling get_button_text until it is needed to prevent a leak.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 715065feb3915d37555e02f79d586f26adda1152 URL: https://source.winehq.org/git/wine.git/?a=commit;h=715065feb3915d37555e02f7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 25 15:31:53 2019 +0200 comctl32/button: Delay calling get_button_text until it is needed to prevent a leak. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index e974f86..f282abf 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2326,10 +2326,10 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in RECT bgRect, textRect; HFONT font = infoPtr->font; HFONT hPrevFont = font ? SelectObject(hDC, font) : NULL; - WCHAR *text = get_button_text(infoPtr); NMCUSTOMDRAW nmcd; LRESULT cdrf; HWND parent; + WCHAR *text; GetClientRect(infoPtr->hwnd, &bgRect); GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &bgRect, &textRect); @@ -2357,10 +2357,9 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; - if (text) + if (!(cdrf & CDRF_DOERASE) && (text = get_button_text(infoPtr))) { - if (!(cdrf & CDRF_DOERASE)) - DrawThemeText(theme, hDC, BP_PUSHBUTTON, state, text, lstrlenW(text), dtFlags, 0, &textRect); + DrawThemeText(theme, hDC, BP_PUSHBUTTON, state, text, lstrlenW(text), dtFlags, 0, &textRect); heap_free(text); } @@ -2398,11 +2397,11 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in DWORD dwStyle = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); UINT btn_type = get_button_type( dwStyle ); int part = (btn_type == BS_RADIOBUTTON) || (btn_type == BS_AUTORADIOBUTTON) ? BP_RADIOBUTTON : BP_CHECKBOX; - WCHAR *text = get_button_text(infoPtr); NMCUSTOMDRAW nmcd; LRESULT cdrf; LOGFONTW lf; HWND parent; + WCHAR *text; BOOL created_font = FALSE; HRESULT hr = GetThemeFont(theme, hDC, part, state, TMT_FONT, &lf); @@ -2456,6 +2455,7 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; + text = get_button_text(infoPtr); if (!(cdrf & CDRF_DOERASE) && text) DrawThemeText(theme, hDC, part, state, text, lstrlenW(text), dtFlags, 0, &textRect); @@ -2464,11 +2464,10 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in nmcd.dwDrawStage = CDDS_POSTPAINT; SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); } - if (cdrf & CDRF_SKIPPOSTPAINT) goto cleanup; if (text) { - if (focused) + if (!(cdrf & CDRF_SKIPPOSTPAINT) && focused) { RECT focusRect;

1 0

Józef Kucia : wined3d: Use Vulkan physical device properties to fill GPU description.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 79631ffff76b1ad8dcb74eb62af3194442b755b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79631ffff76b1ad8dcb74eb6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 5 10:52:07 2019 +0200 wined3d: Use Vulkan physical device properties to fill GPU description. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 60 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index ca3a0f9..5c4bdd0 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -186,6 +186,61 @@ fail: return FALSE; } +static VkPhysicalDevice get_vulkan_physical_device(struct wined3d_vk_info *vk_info) +{ + VkPhysicalDevice physical_devices[1]; + uint32_t count; + VkResult vr; + + if ((vr = VK_CALL(vkEnumeratePhysicalDevices(vk_info->instance, &count, NULL))) < 0) + { + WARN("Failed to enumerate physical devices, vr %d.\n", vr); + return VK_NULL_HANDLE; + } + if (!count) + { + WARN("No physical device.\n"); + return VK_NULL_HANDLE; + } + if (count > 1) + { + /* TODO: Create wined3d_adapter for each device. */ + FIXME("Multiple physical devices available.\n"); + count = 1; + } + + if ((vr = VK_CALL(vkEnumeratePhysicalDevices(vk_info->instance, &count, physical_devices))) < 0) + { + WARN("Failed to get physical devices, vr %d.\n", vr); + return VK_NULL_HANDLE; + } + + return physical_devices[0]; +} + +const struct wined3d_gpu_description *get_vulkan_gpu_description(const struct wined3d_vk_info *vk_info, + VkPhysicalDevice physical_device) +{ + const struct wined3d_gpu_description *description; + VkPhysicalDeviceProperties properties; + + VK_CALL(vkGetPhysicalDeviceProperties(physical_device, &properties)); + + TRACE("Device name: %s.\n", debugstr_a(properties.deviceName)); + TRACE("Vendor ID: 0x%04x, Device ID: 0x%04x.\n", properties.vendorID, properties.deviceID); + TRACE("Driver version: %#x.\n", properties.driverVersion); + TRACE("API version: %u.%u.%u.\n", VK_VERSION_MAJOR(properties.apiVersion), + VK_VERSION_MINOR(properties.apiVersion), VK_VERSION_PATCH(properties.apiVersion)); + + if ((description = wined3d_get_gpu_description(properties.vendorID, properties.deviceID))) + return description; + + FIXME("Failed to retrieve GPU description for device %s %04x:%04x.\n", + debugstr_a(properties.deviceName), properties.vendorID, properties.deviceID); + + return wined3d_get_gpu_description(HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA); +} + static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, unsigned int ordinal, unsigned int wined3d_creation_flags) { @@ -205,7 +260,10 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, goto fail; } - if (!(gpu_description = wined3d_get_gpu_description(HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA))) + if (!(adapter_vk->physical_device = get_vulkan_physical_device(vk_info))) + goto fail_vulkan; + + if (!(gpu_description = get_vulkan_gpu_description(vk_info, adapter_vk->physical_device))) { ERR("Failed to get GPU description.\n"); goto fail_vulkan; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 068ece6..a60a4f1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2755,6 +2755,7 @@ struct wined3d_adapter_vk struct wined3d_adapter a; struct wined3d_vk_info vk_info; + VkPhysicalDevice physical_device; }; static inline struct wined3d_adapter_vk *wined3d_adapter_vk(struct wined3d_adapter *adapter)

1 0

Michael Stefaniuc : user32: Avoid using the comma operator.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 516dc52401724906648411a577ac135a21909106 URL: https://source.winehq.org/git/wine.git/?a=commit;h=516dc52401724906648411a5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Apr 5 21:03:57 2019 +0200 user32: Avoid using the comma operator. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/text.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 9601c60..fd0751e 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -677,7 +677,7 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count, { /* Throw away katakana access keys */ (*count)--, i++; /* skip the prefix */ - (*count)--, i++; /* skip the letter */ + (*count)--; i++; /* skip the letter */ } else {

1 0

Zebediah Figura : ddraw: Forbid creating a stateblock while recording.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 1879a17ec444f0b47d78f141896e7ce9b6f007f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1879a17ec444f0b47d78f141… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 4 18:38:00 2019 -0500 ddraw: Forbid creating a stateblock while recording. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 7 +++++++ dlls/ddraw/tests/ddraw7.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index b471612..003ce1d 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6018,6 +6018,13 @@ static HRESULT d3d_device7_CreateStateBlock(IDirect3DDevice7 *iface, wined3d_mutex_lock(); + if (device->recording) + { + wined3d_mutex_unlock(); + WARN("Trying to apply a stateblock while recording, returning D3DERR_INBEGINSTATEBLOCK.\n"); + return D3DERR_INBEGINSTATEBLOCK; + } + /* The D3DSTATEBLOCKTYPE enum is fine here. */ hr = wined3d_stateblock_create(device->wined3d_device, type, &wined3d_sb); if (FAILED(hr)) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 61042e3..5f066a6 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15872,7 +15872,7 @@ static void test_begin_end_state_block(void) ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_CreateStateBlock(device, D3DSBT_ALL, &stateblock2); - todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_LIGHTING, &value); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);

1 0

Józef Kucia : ddraw: Avoid passing invalid device type to wined3d.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: c3da067216aaa842ff62943cd9d43ea041764b7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3da067216aaa842ff62943c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 5 10:52:12 2019 +0200 ddraw: Avoid passing invalid device type to wined3d. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/main.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 0faa9823..ac4d3f7 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -256,62 +256,52 @@ HRESULT WINAPI GetSurfaceFromDC(HDC dc, IDirectDrawSurface4 **surface, HDC *devi * E_OUTOFMEMORY if some allocation failed * ***********************************************************************/ -static HRESULT -DDRAW_Create(const GUID *guid, - void **DD, - IUnknown *UnkOuter, - REFIID iid) +static HRESULT DDRAW_Create(const GUID *guid, void **out, IUnknown *outer_unknown, REFIID iid) { enum wined3d_device_type device_type; struct ddraw *ddraw; - HRESULT hr; DWORD flags = 0; + HRESULT hr; TRACE("driver_guid %s, ddraw %p, outer_unknown %p, interface_iid %s.\n", - debugstr_guid(guid), DD, UnkOuter, debugstr_guid(iid)); + debugstr_guid(guid), out, outer_unknown, debugstr_guid(iid)); - *DD = NULL; + *out = NULL; if (guid == (GUID *) DDCREATE_EMULATIONONLY) { - /* Use the reference device id. This doesn't actually change anything, - * WineD3D always uses OpenGL for D3D rendering. One could make it request - * indirect rendering - */ device_type = WINED3D_DEVICE_TYPE_REF; } - else if(guid == (GUID *) DDCREATE_HARDWAREONLY) + else if (guid == (GUID *) DDCREATE_HARDWAREONLY) { device_type = WINED3D_DEVICE_TYPE_HAL; } else { - device_type = 0; + device_type = WINED3D_DEVICE_TYPE_HAL; } /* DDraw doesn't support aggregation, according to msdn */ - if (UnkOuter != NULL) + if (outer_unknown != NULL) return CLASS_E_NOAGGREGATION; if (!IsEqualGUID(iid, &IID_IDirectDraw7)) flags = WINED3D_LEGACY_FFP_LIGHTING; - /* DirectDraw creation comes here */ if (!(ddraw = heap_alloc_zero(sizeof(*ddraw)))) { - ERR("Out of memory when creating DirectDraw\n"); + ERR("Out of memory when creating DirectDraw.\n"); return E_OUTOFMEMORY; } - hr = ddraw_init(ddraw, flags, device_type); - if (FAILED(hr)) + if (FAILED(hr = ddraw_init(ddraw, flags, device_type))) { WARN("Failed to initialize ddraw object, hr %#x.\n", hr); heap_free(ddraw); return hr; } - hr = IDirectDraw7_QueryInterface(&ddraw->IDirectDraw7_iface, iid, DD); + hr = IDirectDraw7_QueryInterface(&ddraw->IDirectDraw7_iface, iid, out); IDirectDraw7_Release(&ddraw->IDirectDraw7_iface); if (SUCCEEDED(hr)) list_add_head(&global_ddraw_list, &ddraw->ddraw_list_entry);

1 0

Austin English : ksecdd.sys: Add stub driver.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 107106220be454906a56e3ef0eba095ea2a7f280 URL: https://source.winehq.org/git/wine.git/?a=commit;h=107106220be454906a56e3ef… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Apr 3 02:19:21 2019 -0500 ksecdd.sys: Add stub driver. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46898 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/ksecdd.sys/Makefile.in | 7 +++ dlls/ksecdd.sys/ksecdd.sys.spec | 104 ++++++++++++++++++++++++++++++++++++++++ dlls/ksecdd.sys/main.c | 35 ++++++++++++++ dlls/ksecdd.sys/version.rc | 26 ++++++++++ loader/wine.inf.in | 2 + 7 files changed, 177 insertions(+) diff --git a/configure b/configure index dd0473b..ee80a75 100755 --- a/configure +++ b/configure @@ -1359,6 +1359,7 @@ enable_jsproxy enable_kerberos enable_kernel32 enable_kernelbase +enable_ksecdd_sys enable_ksuser enable_ktmw32 enable_l3codeca_acm @@ -20214,6 +20215,7 @@ wine_fn_config_makefile dlls/kernelbase enable_kernelbase wine_fn_config_makefile dlls/kernelbase/tests enable_tests wine_fn_config_makefile dlls/keyboard.drv16 enable_win16 wine_fn_config_makefile dlls/krnl386.exe16 enable_win16 +wine_fn_config_makefile dlls/ksecdd.sys enable_ksecdd_sys wine_fn_config_makefile dlls/ksuser enable_ksuser wine_fn_config_makefile dlls/ktmw32 enable_ktmw32 wine_fn_config_makefile dlls/l3codeca.acm enable_l3codeca_acm diff --git a/configure.ac b/configure.ac index 2b0c8e1..1311309 100644 --- a/configure.ac +++ b/configure.ac @@ -3374,6 +3374,7 @@ WINE_CONFIG_MAKEFILE(dlls/kernelbase) WINE_CONFIG_MAKEFILE(dlls/kernelbase/tests) WINE_CONFIG_MAKEFILE(dlls/keyboard.drv16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/krnl386.exe16,enable_win16) +WINE_CONFIG_MAKEFILE(dlls/ksecdd.sys) WINE_CONFIG_MAKEFILE(dlls/ksuser) WINE_CONFIG_MAKEFILE(dlls/ktmw32) WINE_CONFIG_MAKEFILE(dlls/l3codeca.acm) diff --git a/dlls/ksecdd.sys/Makefile.in b/dlls/ksecdd.sys/Makefile.in new file mode 100644 index 0000000..9b6430e --- /dev/null +++ b/dlls/ksecdd.sys/Makefile.in @@ -0,0 +1,7 @@ +MODULE = ksecdd.sys +EXTRADLLFLAGS = -Wl,--subsystem,native + +C_SRCS = \ + main.c + +RC_SRCS = version.rc diff --git a/dlls/ksecdd.sys/ksecdd.sys.spec b/dlls/ksecdd.sys/ksecdd.sys.spec new file mode 100644 index 0000000..31b1b35 --- /dev/null +++ b/dlls/ksecdd.sys/ksecdd.sys.spec @@ -0,0 +1,104 @@ +@ stub SystemPrng +@ stub AcceptSecurityContext +@ stub AcquireCredentialsHandleW +@ stub AddCredentialsW +@ stub ApplyControlToken +@ stub BCryptCloseAlgorithmProvider +@ stub BCryptCreateHash +@ stub BCryptDecrypt +@ stub BCryptDeriveKey +@ stub BCryptDeriveKeyCapi +@ stub BCryptDeriveKeyPBKDF2 +@ stub BCryptDestroyHash +@ stub BCryptDestroyKey +@ stub BCryptDestroySecret +@ stub BCryptDuplicateHash +@ stub BCryptDuplicateKey +@ stub BCryptEncrypt +@ stub BCryptEnumAlgorithms +@ stub BCryptEnumProviders +@ stub BCryptExportKey +@ stub BCryptFinalizeKeyPair +@ stub BCryptFinishHash +@ stub BCryptFreeBuffer +@ stub BCryptGenRandom +@ stub BCryptGenerateKeyPair +@ stub BCryptGenerateSymmetricKey +@ stub BCryptGetFipsAlgorithmMode +@ stub BCryptGetProperty +@ stub BCryptHashData +@ stub BCryptImportKey +@ stub BCryptImportKeyPair +@ stub BCryptKeyDerivation +@ stub BCryptOpenAlgorithmProvider +@ stub BCryptRegisterConfigChangeNotify +@ stub BCryptResolveProviders +@ stub BCryptSecretAgreement +@ stub BCryptSetProperty +@ stub BCryptSignHash +@ stub BCryptUnregisterConfigChangeNotify +@ stub BCryptVerifySignature +@ stub CompleteAuthToken +@ stub CredMarshalTargetInfo +@ stub DeleteSecurityContext +@ stub EnumerateSecurityPackagesW +@ stub ExportSecurityContext +@ stub FreeContextBuffer +@ stub FreeCredentialsHandle +@ stub GetSecurityUserInfo +@ stub ImpersonateSecurityContext +@ stub ImportSecurityContextW +@ stub InitSecurityInterfaceW +@ stub InitializeSecurityContextW +@ stub KSecRegisterSecurityProvider +@ stub KSecValidateBuffer +@ stub LsaEnumerateLogonSessions +@ stub LsaGetLogonSessionData +@ stub MakeSignature +@ stub MapSecurityError +@ stub QueryContextAttributesW +@ stub QueryCredentialsAttributesW +@ stub QuerySecurityContextToken +@ stub QuerySecurityPackageInfoW +@ stub RevertSecurityContext +@ stub SealMessage +@ stub SecLookupAccountName +@ stub SecLookupAccountSid +@ stub SecLookupWellKnownSid +@ stub SecMakeSPN +@ stub SecMakeSPNEx +@ stub SecMakeSPNEx2 +@ stub SecSetPagingMode +@ stub SetCredentialsAttributesW +@ stub SslDecryptPacket +@ stub SslEncryptPacket +@ stub SslExportKey +@ stub SslFreeObject +@ stub SslGetServerIdentity +@ stub SslImportKey +@ stub SslLookupCipherSuiteInfo +@ stub SslOpenProvider +@ stub SspiAcceptSecurityContextAsync +@ stub SspiAcquireCredentialsHandleAsyncW +@ stub SspiCompareAuthIdentities +@ stub SspiCopyAuthIdentity +@ stub SspiCreateAsyncContext +@ stub SspiDeleteSecurityContextAsync +@ stub SspiEncodeAuthIdentityAsStrings +@ stub SspiEncodeStringsAsAuthIdentity +@ stub SspiFreeAsyncContext +@ stub SspiFreeAuthIdentity +@ stub SspiFreeCredentialsHandleAsync +@ stub SspiGetAsyncCallStatus +@ stub SspiInitializeSecurityContextAsyncW +@ stub SspiLocalFree +@ stub SspiMarshalAuthIdentity +@ stub SspiReinitAsyncContext +@ stub SspiSetAsyncNotifyCallback +@ stub SspiUnmarshalAuthIdentity +@ stub SspiValidateAuthIdentity +@ stub SspiZeroAuthIdentity +@ stub TokenBindingGetKeyTypesServer +@ stub TokenBindingVerifyMessage +@ stub UnsealMessage +@ stub VerifySignature diff --git a/dlls/ksecdd.sys/main.c b/dlls/ksecdd.sys/main.c new file mode 100644 index 0000000..2773c49 --- /dev/null +++ b/dlls/ksecdd.sys/main.c @@ -0,0 +1,35 @@ +/* + * Copyright 2019 Austin English + * + * 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 + */ +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "ddk/wdm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ksecdd); + +NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) +{ + TRACE( "(%p, %s)\n", driver, debugstr_w(path->Buffer) ); + + return STATUS_SUCCESS; +} diff --git a/dlls/ksecdd.sys/version.rc b/dlls/ksecdd.sys/version.rc new file mode 100644 index 0000000..5cea75f --- /dev/null +++ b/dlls/ksecdd.sys/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2019 Austin English + * + * 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 WINE_FILEDESCRIPTION_STR "Wine ksecdd.sys" +#define WINE_FILENAME_STR "ksecdd.sys" +#define WINE_FILEVERSION 10,0,14393,187 +#define WINE_FILEVERSION_STR "10.0.14393.187" +#define WINE_PRODUCTVERSION 10,0,14393,197 +#define WINE_PRODUCTVERSION_STR "10.0.14393.197" + +#include "wine/wine_common_ver.rc" diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 1fe8b11..48a9f4b 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2554,6 +2554,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,iexplore.exe 11,,winetest.exe,- 12,,fltmgr.sys,- +12,,ksecdd.sys,- 12,,mountmgr.sys,- 12,,ndis.sys,- 12,,tdi.sys,- @@ -2602,6 +2603,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,notepad.exe 11,,winetest.exe,- 12,,fltmgr.sys +12,,ksecdd.sys, 12,,mountmgr.sys 12,,ndis.sys 12,,tdi.sys

1 0

Thomas J. Moore : ntdll: Also try to stat() the drive root.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 071e729969c5536e3b5958b11d43341803f6bd40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=071e729969c5536e3b5958b1… Author: Thomas J. Moore <darktjm(a)gmail.com> Date: Thu Apr 4 10:59:09 2019 -0500 ntdll: Also try to stat() the drive root. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46863 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index b46c2a6..859f4d8 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2638,7 +2638,7 @@ static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer char *p; unix_name[pos + ret] = 0; for (p = unix_name + pos ; *p; p++) if (*p == '\\') *p = '/'; - if (!redirect || (!strstr( unix_name, "/windows/") && strncmp( unix_name, "windows/", 8 ))) + if (!name_len || !redirect || (!strstr( unix_name, "/windows/") && strncmp( unix_name, "windows/", 8 ))) { if (!stat( unix_name, &st )) {

1 0

Jacek Caban : server: Use generic kernel object list to store client device pointer.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: b4f78d6896a7fc85b3ec29d3db30d5d8e9b790e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4f78d6896a7fc85b3ec29d3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 17:43:27 2019 +0100 server: Use generic kernel object list to store client device pointer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 37 +++++++++++++----------------- include/wine/server_protocol.h | 11 ++++----- server/device.c | 52 ++++++++++++++++++++++++++++-------------- server/protocol.def | 7 ++---- server/request.h | 17 ++++++-------- server/trace.c | 14 ++++-------- 6 files changed, 68 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b4f78d6896a7fc85b3ec…

1 0

Jacek Caban : mshtml.idl: Add some SVG interfaces declaration.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: af77d208776c9c51d361affe37fb89accff9944f URL: https://source.winehq.org/git/wine.git/?a=commit;h=af77d208776c9c51d361affe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 5 17:59:49 2019 +0200 mshtml.idl: Add some SVG interfaces declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 280 +++++++++++ include/mshtml.idl | 1422 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1702 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=af77d208776c9c51d361…

1 0

André Hentschel : ntdll: Adjust PC according to THUMB /ARM flag.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: abca25b30f712f80b9bcd29af7096d68d11596a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abca25b30f712f80b9bcd29a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 27 13:48:12 2019 +0100 ntdll: Adjust PC according to THUMB/ARM flag. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46189 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 32205ea..db9cb80 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -283,9 +283,12 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 4, void DECLSPEC_HIDDEN set_cpu_context( const CONTEXT *context ); __ASM_GLOBAL_FUNC( set_cpu_context, ".arm\n\t" - "ldr r1, [r0, #0x44]\n\t" /* context->Cpsr */ - "msr CPSR_f, r1\n\t" + "ldr r2, [r0, #0x44]\n\t" /* context->Cpsr */ + "tst r2, #0x20\n\t" /* thumb? */ "ldr r1, [r0, #0x40]\n\t" /* context->Pc */ + "orrne r1, r1, #1\n\t" /* Adjust PC according to thumb */ + "biceq r1, r1, #1\n\t" /* Adjust PC according to arm */ + "msr CPSR_f, r2\n\t" "ldr lr, [r0, #0x3c]\n\t" /* context->Lr */ "ldr sp, [r0, #0x38]\n\t" /* context->Sp */ "push {r1}\n\t"

1 0