May 2019 - Wine-commits - list.winehq.org

Alexandre Julliard : advpack: Build with msvcrt.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 58f22b03f6732086ad5fa55266dce55a9726e612 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58f22b03f6732086ad5fa552… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 27 15:50:49 2019 +0200 advpack: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advpack/Makefile.in | 2 ++ dlls/advpack/advpack.c | 10 +++++----- dlls/advpack/files.c | 4 ++-- dlls/advpack/install.c | 15 +++++++-------- dlls/advpack/reg.c | 10 +++++----- 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/advpack/Makefile.in b/dlls/advpack/Makefile.in index 2f699a3..a622626 100644 --- a/dlls/advpack/Makefile.in +++ b/dlls/advpack/Makefile.in @@ -2,6 +2,8 @@ MODULE = advpack.dll IMPORTLIB = advpack IMPORTS = ole32 setupapi version advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ advpack.c \ files.c \ diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 2e8027f..f2de8a6 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -20,6 +20,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" @@ -29,7 +30,6 @@ #include "winnls.h" #include "setupapi.h" #include "advpub.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "advpack_private.h" @@ -139,7 +139,7 @@ void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) /* SetupGetLineTextW returns the value if there is only one key, but * returns the whole line if there is more than one key */ - if (!(value = strchrW(line, '='))) + if (!(value = wcschr(line, '='))) { SetupGetStringFieldW(&context, 0, NULL, 0, &size); key = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); @@ -158,10 +158,10 @@ void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) value++; /* Extract the flags */ - ptr = strchrW(value, ','); + ptr = wcschr(value, ','); if (ptr) { *ptr = '\0'; - flags = atolW(ptr+1); + flags = wcstol(ptr+1, NULL, 10); } /* set dest to pszWorkingDir if key is SourceDir */ @@ -177,7 +177,7 @@ void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) /* set all ldids to dest */ while ((ptr = get_parameter(&key, ',', FALSE))) { - ldid = atolW(ptr); + ldid = wcstol(ptr, NULL, 10); SetupSetDirectoryIdW(hInf, ldid, dest); } HeapFree(GetProcessHeap(), 0, key_copy); diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index c5efbb2..3e4cb36 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -25,13 +25,13 @@ #include "winbase.h" #include "winuser.h" #include "winreg.h" +#include "winnls.h" #include "winver.h" #include "winternl.h" #include "setupapi.h" #include "advpub.h" #include "fdi.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "advpack_private.h" WINE_DEFAULT_DEBUG_CHANNEL(advpack); @@ -505,7 +505,7 @@ HRESULT WINAPI DelNodeRunDLL32W(HWND hWnd, HINSTANCE hInst, LPWSTR cmdline, INT szFlags = get_parameter(&cmdline_ptr, ',', TRUE); if (szFlags) - dwFlags = atolW(szFlags); + dwFlags = wcstol(szFlags, NULL, 10); res = DelNodeW(szFilename, dwFlags); diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index c3caf3a..860abee 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -31,7 +31,6 @@ #include "advpub.h" #include "ole2.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "advpack_private.h" WINE_DEFAULT_DEBUG_CHANNEL(advpack); @@ -207,7 +206,7 @@ LPWSTR get_parameter(LPWSTR *params, WCHAR separator, BOOL quoted) if (quoted && *token == '"') { - WCHAR *end = strchrW(token + 1, '"'); + WCHAR *end = wcschr(token + 1, '"'); if (end) { *end = 0; @@ -216,7 +215,7 @@ LPWSTR get_parameter(LPWSTR *params, WCHAR separator, BOOL quoted) } } - *params = strchrW(*params, separator); + *params = wcschr(*params, separator); if (*params) *(*params)++ = '\0'; @@ -397,7 +396,7 @@ static HRESULT get_working_dir(ADVInfo *info, LPCWSTR inf_filename, LPCWSTR work static const WCHAR backslash[] = {'\\',0}; static const WCHAR inf_dir[] = {'\\','I','N','F',0}; - if ((ptr = strrchrW(inf_filename, '\\'))) + if ((ptr = wcsrchr(inf_filename, '\\'))) { len = ptr - inf_filename + 1; ptr = inf_filename; @@ -451,7 +450,7 @@ static HRESULT install_init(LPCWSTR inf_filename, LPCWSTR install_sec, 'D','e','f','a','u','l','t','I','n','s','t','a','l','l',0 }; - if (!(ptr = strrchrW(inf_filename, '\\'))) + if (!(ptr = wcsrchr(inf_filename, '\\'))) ptr = inf_filename; len = lstrlenW(ptr); @@ -769,7 +768,7 @@ INT WINAPI LaunchINFSectionW(HWND hWnd, HINSTANCE hInst, LPWSTR cmdline, INT sho str_flags = get_parameter(&cmdline_ptr, ',', TRUE); if (str_flags) { - DWORD inf_flags = atolW(str_flags); + DWORD inf_flags = wcstol(str_flags, NULL, 10); if (inf_flags & LIS_QUIET) flags |= RSC_FLAG_QUIET; if (inf_flags & LIS_NOGRPCONV) flags |= RSC_FLAG_NGCONV; } @@ -867,7 +866,7 @@ HRESULT WINAPI LaunchINFSectionExW(HWND hWnd, HINSTANCE hInst, LPWSTR cmdline, I flags = get_parameter(&cmdline_ptr, ',', TRUE); if (flags) - cabinfo.dwFlags = atolW(flags); + cabinfo.dwFlags = wcstol(flags, NULL, 10); if (!is_full_path(cabinfo.pszCab) && !is_full_path(cabinfo.pszInf)) { @@ -883,7 +882,7 @@ HRESULT WINAPI LaunchINFSectionExW(HWND hWnd, HINSTANCE hInst, LPWSTR cmdline, I else lstrcpyW(cabinfo.szSrcPath, cabinfo.pszCab); - ptr = strrchrW(cabinfo.szSrcPath, '\\'); + ptr = wcsrchr(cabinfo.szSrcPath, '\\'); *(++ptr) = '\0'; } diff --git a/dlls/advpack/reg.c b/dlls/advpack/reg.c index 82c1d2b..472bbcd 100644 --- a/dlls/advpack/reg.c +++ b/dlls/advpack/reg.c @@ -22,11 +22,11 @@ #include "windef.h" #include "winbase.h" #include "winreg.h" +#include "winnls.h" #include "winerror.h" #include "winuser.h" #include "winternl.h" #include "advpub.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(advpack); @@ -186,16 +186,16 @@ static HRESULT write_predefined_strings(HMODULE hm, LPCWSTR ini_path) *sys_root = '\0'; GetEnvironmentVariableW(SystemRoot, sys_root, ARRAY_SIZE(sys_root)); - if(!strncmpiW(sys_root, mod_path + 1, strlenW(sys_root))) + if(!wcsnicmp(sys_root, mod_path + 1, lstrlenW(sys_root))) { *sys_mod_path = '\"'; - strcpyW(sys_mod_path + 1, escaped_SystemRoot); - strcatW(sys_mod_path, mod_path + 1 + strlenW(sys_root)); + lstrcpyW(sys_mod_path + 1, escaped_SystemRoot); + lstrcatW(sys_mod_path, mod_path + 1 + lstrlenW(sys_root)); } else { FIXME("SYS_MOD_PATH needs more work\n"); - strcpyW(sys_mod_path, mod_path); + lstrcpyW(sys_mod_path, mod_path); } WritePrivateProfileStringW(Strings, SYS_MOD_PATH, sys_mod_path, ini_path);

1 0

Alexandre Julliard : amsi: Build with msvcrt.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 1a3975d87c4246776951396a285f915b18de51af URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a3975d87c4246776951396a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 27 15:50:56 2019 +0200 amsi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amsi/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/amsi/Makefile.in b/dlls/amsi/Makefile.in index 213d3e0..d71a649 100644 --- a/dlls/amsi/Makefile.in +++ b/dlls/amsi/Makefile.in @@ -1,4 +1,6 @@ MODULE = amsi.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c

1 0

Alexandre Julliard : apphelp: Build with msvcrt.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: de34d2b96685d10a371f812b0ba460c48fd46e78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de34d2b96685d10a371f812b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 27 15:51:01 2019 +0200 apphelp: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/apphelp/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/apphelp/Makefile.in b/dlls/apphelp/Makefile.in index 84f1133..b3c4de7 100644 --- a/dlls/apphelp/Makefile.in +++ b/dlls/apphelp/Makefile.in @@ -1,3 +1,5 @@ MODULE = apphelp.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = apphelp.c

1 0

Alexandre Julliard : atl: Build with msvcrt.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: aeab4af7dd29b91ff51c02d2a2be60d78576cc5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=aeab4af7dd29b91ff51c02d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 27 15:51:13 2019 +0200 atl: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl/Makefile.in | 2 ++ dlls/atl/atl.c | 3 +-- dlls/atl/atl30.c | 5 ++--- dlls/atl/atl_ax.c | 25 ++++++++++++------------- dlls/atl/registrar.c | 25 ++++++++++++------------- dlls/atl100/Makefile.in | 2 ++ dlls/atl110/Makefile.in | 2 ++ dlls/atl80/Makefile.in | 2 ++ dlls/atl80/atl80.c | 1 - dlls/atl90/Makefile.in | 2 ++ 10 files changed, 37 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aeab4af7dd29b91ff51c…

1 0

Alexandre Julliard : atlthunk: Build with msvcrt.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: cb837a5504787887ef11b5570e1b0f9ac5761d6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb837a5504787887ef11b557… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 27 15:51:19 2019 +0200 atlthunk: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atlthunk/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/atlthunk/Makefile.in b/dlls/atlthunk/Makefile.in index 1adeedf..b41ff94 100644 --- a/dlls/atlthunk/Makefile.in +++ b/dlls/atlthunk/Makefile.in @@ -1,5 +1,7 @@ MODULE = atlthunk.dll IMPORTLIB = atlthunk +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ atlthunk.c

1 0

Sven Baars : d3dx9: Release the full parameter name when a parameter is released (Valgrind).
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 63443f249f4dfe748ce3872e74ecf5c1d8aa55d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63443f249f4dfe748ce3872e… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat May 25 13:59:49 2019 +0200 d3dx9: Release the full parameter name when a parameter is released (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a4bce69..4b6321b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -581,6 +581,9 @@ static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL chil HeapFree(GetProcessHeap(), 0, param->members); } + if (param->full_name) + heap_free(param->full_name); + free_parameter_data(param, child); /* only the parent has to release name and semantic */

1 0

Sven Baars : d3dx9: Always free samplers (Valgrind).
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 7dc42119b40ad39165d881dd8d0e410d3e84fe5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dc42119b40ad39165d881dd… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat May 25 13:59:50 2019 +0200 d3dx9: Always free samplers (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 4b6321b..310dc18 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -519,6 +519,7 @@ static void free_sampler(struct d3dx_sampler *sampler) free_state(&sampler->states[i]); } HeapFree(GetProcessHeap(), 0, sampler->states); + HeapFree(GetProcessHeap(), 0, sampler); } static void d3dx_pool_release_shared_parameter(struct d3dx_top_level_parameter *param); @@ -551,7 +552,7 @@ static void free_parameter_data(struct d3dx_parameter *param, BOOL child) case D3DXPT_SAMPLER3D: case D3DXPT_SAMPLERCUBE: free_sampler((struct d3dx_sampler *)param->data); - break; + return; default: FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type));

1 0

Piotr Caban : ntoskrnl.exe: Add IoDetachDevice implementation.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: e0e795cfe9760bb0775f874fc1d32a752dced537 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0e795cfe9760bb0775f874f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 27 14:37:46 2019 +0200 ntoskrnl.exe: Add IoDetachDevice implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c26e411..08353b2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1222,6 +1222,10 @@ void WINAPI IoQueueWorkItem( PIO_WORKITEM work_item, PIO_WORKITEM_ROUTINE worker TrySubmitThreadpoolCallback( run_work_item_worker, work_item, NULL ); } +void WINAPI IoDetachDevice( DEVICE_OBJECT *device ) +{ + device->AttachedDevice = NULL; +} /*********************************************************************** * IoAttachDeviceToDeviceStack (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 202e919..72ebdc1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -369,7 +369,7 @@ @ stdcall IoDeleteDevice(ptr) @ stdcall IoDeleteDriver(ptr) @ stdcall IoDeleteSymbolicLink(ptr) -@ stub IoDetachDevice +@ stdcall IoDetachDevice(ptr) @ stub IoDeviceHandlerObjectSize @ stub IoDeviceHandlerObjectType @ extern IoDeviceObjectType diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 90a8bae..cd46f91 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1561,6 +1561,7 @@ PVOID WINAPI IoAllocateErrorLogEntry(PVOID,UCHAR); PIRP WINAPI IoAllocateIrp(CCHAR,BOOLEAN); PMDL WINAPI IoAllocateMdl(PVOID,ULONG,BOOLEAN,BOOLEAN,IRP*); PIO_WORKITEM WINAPI IoAllocateWorkItem(PDEVICE_OBJECT); +void WINAPI IoDetachDevice(PDEVICE_OBJECT); PDEVICE_OBJECT WINAPI IoAttachDeviceToDeviceStack(PDEVICE_OBJECT,PDEVICE_OBJECT); PIRP WINAPI IoBuildAsynchronousFsdRequest(ULONG,DEVICE_OBJECT*,void*,ULONG,LARGE_INTEGER*,IO_STATUS_BLOCK*); PIRP WINAPI IoBuildDeviceIoControlRequest(ULONG,DEVICE_OBJECT*,PVOID,ULONG,PVOID,ULONG,BOOLEAN,PKEVENT,IO_STATUS_BLOCK*);

1 0

Piotr Caban : ntoskrnl.exe: Fix IoAttachDeviceToDeviceStack implementation.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 294cfaf077308891689b0738a47ac67b5edfd61d URL: https://source.winehq.org/git/wine.git/?a=commit;h=294cfaf077308891689b0738… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 27 14:37:49 2019 +0200 ntoskrnl.exe: Fix IoAttachDeviceToDeviceStack implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 32 +++++++++++----------- dlls/ntoskrnl.exe/tests/driver.c | 58 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 16 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 08353b2..10cf2e2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1222,6 +1222,21 @@ void WINAPI IoQueueWorkItem( PIO_WORKITEM work_item, PIO_WORKITEM_ROUTINE worker TrySubmitThreadpoolCallback( run_work_item_worker, work_item, NULL ); } +/*********************************************************************** + * IoGetAttachedDevice (NTOSKRNL.EXE.@) + */ +DEVICE_OBJECT* WINAPI IoGetAttachedDevice( DEVICE_OBJECT *device ) +{ + DEVICE_OBJECT *result = device; + + TRACE( "(%p)\n", device ); + + while (result->AttachedDevice) + result = result->AttachedDevice; + + return result; +} + void WINAPI IoDetachDevice( DEVICE_OBJECT *device ) { device->AttachedDevice = NULL; @@ -1234,6 +1249,7 @@ PDEVICE_OBJECT WINAPI IoAttachDeviceToDeviceStack( DEVICE_OBJECT *source, DEVICE_OBJECT *target ) { TRACE( "%p, %p\n", source, target ); + target = IoGetAttachedDevice( target ); target->AttachedDevice = source; source->StackSize = target->StackSize + 1; return target; @@ -1799,22 +1815,6 @@ NTSTATUS WINAPI IoGetDeviceObjectPointer( UNICODE_STRING *name, ACCESS_MASK acc } /*********************************************************************** - * IoGetAttachedDevice (NTOSKRNL.EXE.@) - */ -DEVICE_OBJECT* WINAPI IoGetAttachedDevice( DEVICE_OBJECT *device ) -{ - DEVICE_OBJECT *result = device; - - TRACE( "(%p)\n", device ); - - while (result->AttachedDevice) - result = result->AttachedDevice; - - return result; -} - - -/*********************************************************************** * IoGetDeviceProperty (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROPERTY device_property, diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 688c608..73fc2fb 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -39,6 +39,8 @@ static const WCHAR driver_device[] = {'\\','D','e','v','i','c','e', static const WCHAR driver_link[] = {'\\','D','o','s','D','e','v','i','c','e','s', '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r',0}; +static DRIVER_OBJECT *driver_obj; + static HANDLE okfile; static LONG successes; static LONG failures; @@ -1424,6 +1426,59 @@ static void test_lookup_thread(void) "PsLookupThreadByThreadId returned %#x\n", status); } +static void test_IoAttachDeviceToDeviceStack(void) +{ + DEVICE_OBJECT *dev1, *dev2, *dev3, *ret; + NTSTATUS status; + + status = IoCreateDevice(driver_obj, 0, NULL, FILE_DEVICE_UNKNOWN, + FILE_DEVICE_SECURE_OPEN, FALSE, &dev1); + ok(status == STATUS_SUCCESS, "IoCreateDevice failed\n"); + status = IoCreateDevice(driver_obj, 0, NULL, FILE_DEVICE_UNKNOWN, + FILE_DEVICE_SECURE_OPEN, FALSE, &dev2); + ok(status == STATUS_SUCCESS, "IoCreateDevice failed\n"); + status = IoCreateDevice(driver_obj, 0, NULL, FILE_DEVICE_UNKNOWN, + FILE_DEVICE_SECURE_OPEN, FALSE, &dev3); + ok(status == STATUS_SUCCESS, "IoCreateDevice failed\n"); + + /* TODO: initialize devices properly */ + dev1->Flags &= ~DO_DEVICE_INITIALIZING; + dev2->Flags &= ~DO_DEVICE_INITIALIZING; + + ret = IoAttachDeviceToDeviceStack(dev2, dev1); + ok(ret == dev1, "IoAttachDeviceToDeviceStack returned %p, expected %p\n", ret, dev1); + ok(dev1->AttachedDevice == dev2, "dev1->AttachedDevice = %p, expected %p\n", + dev1->AttachedDevice, dev2); + ok(!dev2->AttachedDevice, "dev2->AttachedDevice = %p\n", dev2->AttachedDevice); + ok(dev1->StackSize == 1, "dev1->StackSize = %d\n", dev1->StackSize); + ok(dev2->StackSize == 2, "dev2->StackSize = %d\n", dev2->StackSize); + + ret = IoAttachDeviceToDeviceStack(dev3, dev1); + ok(ret == dev2, "IoAttachDeviceToDeviceStack returned %p, expected %p\n", ret, dev2); + ok(dev1->AttachedDevice == dev2, "dev1->AttachedDevice = %p, expected %p\n", + dev1->AttachedDevice, dev2); + ok(dev2->AttachedDevice == dev3, "dev2->AttachedDevice = %p, expected %p\n", + dev2->AttachedDevice, dev3); + ok(!dev3->AttachedDevice, "dev3->AttachedDevice = %p\n", dev3->AttachedDevice); + ok(dev1->StackSize == 1, "dev1->StackSize = %d\n", dev1->StackSize); + ok(dev2->StackSize == 2, "dev2->StackSize = %d\n", dev2->StackSize); + ok(dev3->StackSize == 3, "dev3->StackSize = %d\n", dev3->StackSize); + + IoDetachDevice(dev1); + ok(!dev1->AttachedDevice, "dev1->AttachedDevice = %p\n", dev1->AttachedDevice); + ok(dev2->AttachedDevice == dev3, "dev2->AttachedDevice = %p\n", dev2->AttachedDevice); + + IoDetachDevice(dev2); + ok(!dev2->AttachedDevice, "dev2->AttachedDevice = %p\n", dev2->AttachedDevice); + ok(dev1->StackSize == 1, "dev1->StackSize = %d\n", dev1->StackSize); + ok(dev2->StackSize == 2, "dev2->StackSize = %d\n", dev2->StackSize); + ok(dev3->StackSize == 3, "dev3->StackSize = %d\n", dev3->StackSize); + + IoDeleteDevice(dev1); + IoDeleteDevice(dev2); + IoDeleteDevice(dev3); +} + static PIO_WORKITEM main_test_work_item; static void WINAPI main_test_task(DEVICE_OBJECT *device, void *context) @@ -1501,6 +1556,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_ob_reference(test_input->path); test_resource(); test_lookup_thread(); + test_IoAttachDeviceToDeviceStack(); if (main_test_work_item) return STATUS_UNEXPECTED_IO_ERROR; @@ -1647,6 +1703,8 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) DbgPrint("loading driver\n"); + driver_obj = driver; + /* Allow unloading of the driver */ driver->DriverUnload = driver_Unload;

1 0

Piotr Caban : services: Don't double release process in service_start.
by Alexandre Julliard 27 May '19

27 May '19

Module: wine Branch: master Commit: 496380709dfdeccd2ff12358e5bdb5b7b8338ac2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=496380709dfdeccd2ff12358… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 27 17:36:17 2019 +0200 services: Don't double release process in service_start. Fixes a crash while running ntoskrnl tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 0634c83..7ca249c 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -1069,10 +1069,13 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * if (err != ERROR_SUCCESS) { service_lock(service); - service->status.dwCurrentState = SERVICE_STOPPED; - service->process = NULL; - if (!--process->use_count) process_terminate(process); - release_process(process); + if (service->process) + { + service->status.dwCurrentState = SERVICE_STOPPED; + service->process = NULL; + if (!--process->use_count) process_terminate(process); + release_process(process); + } service_unlock(service); }

1 0