August 2018 - Wine-commits - list.winehq.org

Fabian Maurer : ntdll/actctx: Don' t stop looking for manifest if dll without manifest is found.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 56b3304a019486b52681a05d4b5454b475275e51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56b3304a019486b52681a05d… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Aug 25 19:48:37 2018 +0200 ntdll/actctx: Don't stop looking for manifest if dll without manifest is found. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/Makefile.in | 7 ++++--- dlls/kernel32/tests/actctx.c | 36 +++++++++++++++++++++++++++++++++++- dlls/kernel32/tests/dummy.c | 1 + dlls/kernel32/tests/dummy.spec | 1 + dlls/ntdll/actctx.c | 3 ++- 5 files changed, 43 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/Makefile.in b/dlls/kernel32/tests/Makefile.in index 2f2ac5f8..e06141d 100644 --- a/dlls/kernel32/tests/Makefile.in +++ b/dlls/kernel32/tests/Makefile.in @@ -1,7 +1,7 @@ TESTDLL = kernel32.dll IMPORTS = user32 advapi32 -C_SRCS = \ +SOURCES = \ actctx.c \ atom.c \ change.c \ @@ -11,6 +11,8 @@ C_SRCS = \ debugger.c \ directory.c \ drive.c \ + dummy.c \ + dummy.spec \ environ.c \ fiber.c \ file.c \ @@ -26,6 +28,7 @@ C_SRCS = \ process.c \ profile.c \ resource.c \ + resource.rc \ sync.c \ thread.c \ time.c \ @@ -34,5 +37,3 @@ C_SRCS = \ version.c \ virtual.c \ volume.c - -RC_SRCS = resource.rc diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 96d9b8c..6891fbe 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2598,9 +2598,27 @@ static void delete_manifest_file(const char *filename) DeleteFileA(path); } +static void extract_resource(const char *name, const char *type, const char *path) +{ + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", path, GetLastError()); + + res = FindResourceA(NULL, name, type); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); +} + static void test_CreateActCtx(void) { - CHAR path[MAX_PATH], dir[MAX_PATH]; + CHAR path[MAX_PATH], dir[MAX_PATH], dll[MAX_PATH]; ACTCTXA actctx; HANDLE handle; @@ -2637,6 +2655,22 @@ todo_wine { } if (handle != INVALID_HANDLE_VALUE) pReleaseActCtx(handle); + /* with specified directory, that does contain dependent assembly */ + GetTempPathA(ARRAY_SIZE(dir), dir); + actctx.lpAssemblyDirectory = dir; + handle = pCreateActCtxA(&actctx); + ok(handle != INVALID_HANDLE_VALUE, "got handle %p\n", handle); + pReleaseActCtx(handle); + + /* Should still work if we add a dll with the same name, but without manifest */ + strcpy(dll, dir); + strcat(dll, "testdep1.dll"); + extract_resource("dummy.dll", "TESTDLL", dll); + handle = pCreateActCtxA(&actctx); + ok(handle != INVALID_HANDLE_VALUE || broken(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX) , "got error %d\n", GetLastError()); + pReleaseActCtx(handle); + DeleteFileA(dll); + delete_manifest_file("main_wndcls.manifest"); delete_manifest_file("testdep1.manifest"); delete_manifest_file("testdep2.manifest"); diff --git a/dlls/kernel32/tests/dummy.c b/dlls/kernel32/tests/dummy.c new file mode 100644 index 0000000..3053583 --- /dev/null +++ b/dlls/kernel32/tests/dummy.c @@ -0,0 +1 @@ +/* nothing here */ diff --git a/dlls/kernel32/tests/dummy.spec b/dlls/kernel32/tests/dummy.spec new file mode 100644 index 0000000..b2a4ba5 --- /dev/null +++ b/dlls/kernel32/tests/dummy.spec @@ -0,0 +1 @@ +# nothing here diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 53a8b06..08b6c50 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -3294,7 +3294,8 @@ static NTSTATUS lookup_assembly(struct actctx_loader* acl, status = get_manifest_in_pe_file( acl, ai, nameW.Buffer, directory, FALSE, file, (LPCWSTR)CREATEPROCESS_MANIFEST_RESOURCE_ID, 0 ); NtClose( file ); - break; + if (status == STATUS_SUCCESS) + break; } RtlFreeUnicodeString( &nameW ); }

1 0

Michael Stefaniuc : oleaut32: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: a1e0a029b0ce80e6561e0656ae4530fb1a8d4316 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1e0a029b0ce80e6561e0656… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Aug 29 21:05:39 2018 +0200 oleaut32: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/oleaut.c | 6 +-- dlls/oleaut32/olefont.c | 4 +- dlls/oleaut32/olepicture.c | 2 +- dlls/oleaut32/tmarshal.c | 12 +++--- dlls/oleaut32/typelib.c | 8 ++-- dlls/oleaut32/varformat.c | 66 +++++++++++------------------ dlls/oleaut32/variant.c | 4 +- dlls/oleaut32/vartype.c | 103 +++++++++++++++++++++------------------------ 8 files changed, 90 insertions(+), 115 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a1e0a029b0ce80e6561e…

1 0

Alex Henrie : shell32: Add remaining optical disc icons.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 12a6a58cca74ef35dd1ff06e75de74dc78ff74fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=12a6a58cca74ef35dd1ff06e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:37 2018 -0600 shell32: Add remaining optical disc icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 68 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shresdef.h | 17 +++++++++++++ 2 files changed, 85 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 0b0c54a..16b84b4 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -796,6 +796,14 @@ IDI_SHELL_USERS ICON resources/security.ico /* @makedep: resources/shut_down.ico */ IDI_SHELL_POWER_OFF ICON resources/shut_down.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_DVD ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_MUSIC_CD_95 ICON resources/optical_disc.ico + /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico @@ -825,10 +833,26 @@ IDI_SHELL_EMPTY_RECYCLE_BIN2 ICON resources/trash_file.ico IDI_SHELL_NEW_NETWORK_FOLDER ICON resources/folder.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_WRITE_DISC ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/delete.ico */ +IDI_SHELL_DELETE_FILE ICON resources/delete.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/delete.ico */ +IDI_SHELL_ERASE_DISC ICON resources/delete.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ IDI_SHELL_TO_FOLDER ICON resources/folder.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_BURN_DISC ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ IDI_SHELL_SHARED_FOLDER ICON resources/folder.ico @@ -840,13 +864,57 @@ IDI_SHELL_USERS_XP ICON resources/security.ico /* @makedep: resources/security.ico */ IDI_SHELL_USERS_XP2 ICON resources/security.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_drive.ico */ +IDI_SHELL_DVD_DRIVE ICON resources/optical_drive.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_HYBRID_CD ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_UNKNOWN_DISC ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_CD_ROM ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_CD_R ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_CD_RW ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_DVD_RAM ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_DVD_R ICON resources/optical_disc.ico + /* @makedep: resources/optical_disc.ico */ IDI_SHELL_OPTICAL_DISC ICON resources/optical_disc.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_DVD_ROM ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_DVD_RW ICON resources/optical_disc.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ IDI_SHELL_NEW_FOLDER ICON resources/folder.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_BURN_DISC2 ICON resources/optical_disc.ico + /* @makedep: resources/favorites.ico */ IDI_SHELL_FAVORITES_SMALL ICON resources/favorites.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index c529bdf..b947300 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -291,6 +291,8 @@ /* 211 - 219 not used on Windows */ #define IDI_SHELL_USERS 220 #define IDI_SHELL_POWER_OFF 221 +#define IDI_SHELL_DVD 222 +#define IDI_SHELL_MUSIC_CD_95 228 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_MY_PICTURES 236 #define IDI_SHELL_MY_MUSIC 237 @@ -299,12 +301,27 @@ #define IDI_SHELL_COPY 243 #define IDI_SHELL_EMPTY_RECYCLE_BIN2 254 #define IDI_SHELL_NEW_NETWORK_FOLDER 258 +#define IDI_SHELL_WRITE_DISC 260 +#define IDI_SHELL_DELETE_FILE 261 +#define IDI_SHELL_ERASE_DISC 262 #define IDI_SHELL_TO_FOLDER 264 +#define IDI_SHELL_BURN_DISC 266 #define IDI_SHELL_SHARED_FOLDER 267 #define IDI_SHELL_USERS_XP 269 #define IDI_SHELL_USERS_XP2 279 +#define IDI_SHELL_DVD_DRIVE 291 +#define IDI_SHELL_HYBRID_CD 292 +#define IDI_SHELL_UNKNOWN_DISC 293 +#define IDI_SHELL_CD_ROM 294 +#define IDI_SHELL_CD_R 295 +#define IDI_SHELL_CD_RW 296 +#define IDI_SHELL_DVD_RAM 297 +#define IDI_SHELL_DVD_R 298 #define IDI_SHELL_OPTICAL_DISC 302 +#define IDI_SHELL_DVD_ROM 304 +#define IDI_SHELL_DVD_RW 318 #define IDI_SHELL_NEW_FOLDER 319 +#define IDI_SHELL_BURN_DISC2 320 #define IDI_SHELL_FAVORITES_SMALL 322 #define IDI_SHELL_APP_FOLDER_SMALL 326 #define IDI_SHELL_RESTRICTED2 338

1 0

Alex Henrie : shell32: Add documents icon.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 5d66862e5aa37ea8c6982a5783acd85ff1f2ec28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d66862e5aa37ea8c6982a57… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 28 23:47:38 2018 -0600 shell32: Add documents icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 16b84b4..6dad8bc 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -801,6 +801,10 @@ IDI_SHELL_POWER_OFF ICON resources/shut_down.ico IDI_SHELL_DVD ICON resources/optical_disc.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/document.ico */ +IDI_SHELL_DOCUMENTS ICON resources/document.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/optical_disc.ico */ IDI_SHELL_MUSIC_CD_95 ICON resources/optical_disc.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index b947300..1c28a06 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -292,6 +292,7 @@ #define IDI_SHELL_USERS 220 #define IDI_SHELL_POWER_OFF 221 #define IDI_SHELL_DVD 222 +#define IDI_SHELL_DOCUMENTS 223 #define IDI_SHELL_MUSIC_CD_95 228 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_MY_PICTURES 236

1 0

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8Client SetSPCaps.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 598b52ce38dc2b82910c390164eb95e8972df9b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=598b52ce38dc2b82910c3901… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 28 02:13:33 2018 +0000 dpnet: Implement IDirectPlay8Client SetSPCaps. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/client.c | 14 +++++++++++--- dlls/dpnet/tests/client.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index 3b3361f..ea491ef 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -309,9 +309,17 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_SetCaps(IDirectPlay8Client *iface, static HRESULT WINAPI IDirectPlay8ClientImpl_SetSPCaps(IDirectPlay8Client *iface, const GUID * const pguidSP, const DPN_SP_CAPS * const pdpspCaps, const DWORD dwFlags) { - IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%x): Stub\n", This, dwFlags); - return DPN_OK; + IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); + + TRACE("(%p)->(%p,%p,%x): stub\n", iface, pguidSP, pdpspCaps, dwFlags); + + if(!This->msghandler || pdpspCaps->dwSize != sizeof(DPN_SP_CAPS)) + return DPNERR_INVALIDPARAM; + + /* Only dwSystemBufferSize is set by this call. */ + This->spcaps.dwSystemBufferSize = pdpspCaps->dwSystemBufferSize; + + return DPN_OK; } static HRESULT WINAPI IDirectPlay8ClientImpl_GetSPCaps(IDirectPlay8Client *iface, diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index 47d8b01..af56d85 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -140,6 +140,9 @@ static BOOL test_init_dp(void) hr = IDirectPlay8Client_Initialize(client, NULL, NULL, 0); ok(hr == DPNERR_INVALIDPARAM, "got %x\n", hr); + hr = IDirectPlay8Client_SetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPNERR_INVALIDPARAM, "SetSPCaps failed with %x\n", hr); + hr = IDirectPlay8Client_Initialize(client, NULL, DirectPlayMessageHandler, 0); ok(hr == S_OK, "IDirectPlay8Client_Initialize failed with %x\n", hr); @@ -415,6 +418,33 @@ static void test_get_sp_caps(void) ok(caps.dwBuffersPerThread == 1, "expected 1, got %d\n", caps.dwBuffersPerThread); ok(caps.dwSystemBufferSize == 0x10000 || broken(caps.dwSystemBufferSize == 0x2000 /* before Win8 */), "expected 0x10000, got 0x%x\n", caps.dwSystemBufferSize); + + caps.dwNumThreads = 2; + caps.dwDefaultEnumCount = 3; + caps.dwDefaultEnumRetryInterval = 1400; + caps.dwDefaultEnumTimeout = 1400; + caps.dwMaxEnumPayloadSize = 900; + caps.dwBuffersPerThread = 2; + caps.dwSystemBufferSize = 0x0ffff; + hr = IDirectPlay8Client_SetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPN_OK, "SetSPCaps failed with %x\n", hr); + + hr = IDirectPlay8Client_GetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPN_OK, "GetSPCaps failed with %x\n", hr); + + ok(caps.dwSize == sizeof(DPN_SP_CAPS), "got %d\n", caps.dwSize); + ok(caps.dwNumThreads >= 3, "got %d\n", caps.dwNumThreads); + ok(caps.dwDefaultEnumCount == 5, "expected 5, got %d\n", caps.dwDefaultEnumCount); + ok(caps.dwDefaultEnumRetryInterval == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumRetryInterval); + ok(caps.dwDefaultEnumTimeout == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumTimeout); + ok(caps.dwMaxEnumPayloadSize == 983, "expected 983, got %d\n", caps.dwMaxEnumPayloadSize); + ok(caps.dwBuffersPerThread == 1, "expected 1, got %d\n", caps.dwBuffersPerThread); + ok(caps.dwSystemBufferSize == 0x0ffff, "expected 0x0ffff, got 0x%x\n", caps.dwSystemBufferSize); + + /* Reset the System setting back to its default. */ + caps.dwSystemBufferSize = 0x10000; + hr = IDirectPlay8Client_SetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPN_OK, "SetSPCaps failed with %x\n", hr); } static void test_lobbyclient(void)

1 0

Zebediah Figura : ntoskrnl.exe/tests: Add basic tests for ZwLoadDriver()/ ZwUnloadDriver().
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 0a648b272c197b4bc12aabd2ace11a23dbb409cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a648b272c197b4bc12aabd2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Aug 24 23:08:52 2018 -0500 ntoskrnl.exe/tests: Add basic tests for ZwLoadDriver()/ZwUnloadDriver(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/Makefile.in | 4 ++ dlls/ntoskrnl.exe/tests/driver.c | 44 +++++++++++++++++++++ dlls/ntoskrnl.exe/tests/driver.h | 1 + dlls/ntoskrnl.exe/tests/driver2.c | 45 +++++++++++++++++++++ dlls/ntoskrnl.exe/tests/driver2.spec | 1 + dlls/ntoskrnl.exe/tests/ntoskrnl.c | 77 ++++++++++++++++++++++++++---------- 6 files changed, 151 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0a648b272c197b4bc12a…

1 0

Zebediah Figura : winedevice: Make driver (un)loading synchronous.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 44e794327436effc75478ff68def40f9d8801a82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44e794327436effc75478ff6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Aug 24 22:42:57 2018 -0500 winedevice: Make driver (un)loading synchronous. This essentially reverts 440482d2ef31333d1bc3ce15b0aad4ceec60466c. 440482d was aimed towards making it possible to load multiple drivers asynchronously, as well as to allow reentrancy. Unfortunately, asynchronicity is incorrect, as demonstrated by bug 38836, and some trivial testing shows that the SCM database lock is held for the entirety of the driver entry and exit routines, and that StartService() and ControlService() block until they complete. 5726824 and dd2624a nullified the effects of 440482d, making driver loading all but synchronous (with the exception of the added 30 second timeout, but this is actually incorrect: drivers can block indefinitely). This patch therefore does not change any behaviour, but rather removes the use of threadpools and "async" functions, essentially reverting back to the implementation prior to 440482d. The incidental change to unload_driver() made by that patch (viz. never to unload a driver without a DriverUnload() routine) is kept. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedevice/device.c | 213 ++++++++++--------------------------------- 1 file changed, 46 insertions(+), 167 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=44e794327436effc7547…

1 0

Zebediah Figura : winedevice: Reimplement (un) loading drivers on top of ZwLoadDriver()/ZwUnloadDriver().
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: c18f8e4c3235d0417bfb9fdba2d938bf2e42ee65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c18f8e4c3235d0417bfb9fdb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Aug 24 22:42:58 2018 -0500 winedevice: Reimplement (un)loading drivers on top of ZwLoadDriver()/ZwUnloadDriver(). We can't implement ZwLoadDriver() on top of StartService(), since the latter takes the service database lock. Instead simply move the entire body of create_driver()/unload_driver() into ZwLoadDriver()/ZwUnloadDriver(). Similarly, clean up the list of loaded drivers in ntoskrnl rather than winedevice. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45084 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 376 +++++++++++++++++++++++++++++++++++-------- programs/winedevice/device.c | 356 +++------------------------------------- 2 files changed, 330 insertions(+), 402 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c18f8e4c3235d0417bfb…

1 0

Alistair Leslie-Hughes : comsvcs: Add DispenserManager stubbed interface.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 9b9b4c0dda66f4f950df489bb982b2ebbc4bbc31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b9b4c0dda66f4f950df489b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 29 01:30:04 2018 +0000 comsvcs: Add DispenserManager stubbed interface. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42998 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/Makefile.in | 2 +- dlls/comsvcs/main.c | 167 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 165 insertions(+), 4 deletions(-) diff --git a/dlls/comsvcs/Makefile.in b/dlls/comsvcs/Makefile.in index bd71e7d..b01c4f2 100644 --- a/dlls/comsvcs/Makefile.in +++ b/dlls/comsvcs/Makefile.in @@ -1,6 +1,6 @@ MODULE = comsvcs.dll IMPORTLIB = comsvcs -IMPORTS = ole32 +IMPORTS = ole32 uuid C_SRCS = \ main.c diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 3fc69de..6b7ec14 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -28,13 +28,120 @@ #include "winbase.h" #include "ole2.h" #include "rpcproxy.h" - +#include "comsvcs.h" +#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(comsvcs); static HINSTANCE COMSVCS_hInstance; +typedef struct dispensermanager +{ + IDispenserManager IDispenserManager_iface; + LONG ref; + +} dispensermanager; + +static inline dispensermanager *impl_from_IDispenserManager(IDispenserManager *iface) +{ + return CONTAINING_RECORD(iface, dispensermanager, IDispenserManager_iface); +} + +static HRESULT WINAPI dismanager_QueryInterface(IDispenserManager *iface, REFIID riid, void **object) +{ + dispensermanager *This = impl_from_IDispenserManager(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), object); + + *object = NULL; + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDispenserManager)) + { + *object = &This->IDispenserManager_iface; + IUnknown_AddRef( (IUnknown*)*object); + + return S_OK; + } + + WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),object); + return E_NOINTERFACE; +} + +static ULONG WINAPI dismanager_AddRef(IDispenserManager *iface) +{ + dispensermanager *This = impl_from_IDispenserManager(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI dismanager_Release(IDispenserManager *iface) +{ + dispensermanager *This = impl_from_IDispenserManager(iface); + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + { + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI dismanager_RegisterDispenser(IDispenserManager *iface, IDispenserDriver *driver, + LPCOLESTR name, IHolder **dispenser) +{ + dispensermanager *This = impl_from_IDispenserManager(iface); + + FIXME("(%p)->(%p, %s, %p) stub\n", This, driver, debugstr_w(name), dispenser); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dismanager_GetContext(IDispenserManager *iface, INSTID *id, TRANSID *transid) +{ + dispensermanager *This = impl_from_IDispenserManager(iface); + + FIXME("(%p)->(%p, %p) stub\n", This, id, transid); + + return E_NOTIMPL; +} + +struct IDispenserManagerVtbl dismanager_vtbl = +{ + dismanager_QueryInterface, + dismanager_AddRef, + dismanager_Release, + dismanager_RegisterDispenser, + dismanager_GetContext +}; + +static HRESULT WINAPI comsvcscf_CreateInstance(IClassFactory *cf,IUnknown* outer, REFIID riid,void **object) +{ + dispensermanager *dismanager; + HRESULT ret; + + TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), object); + + dismanager = heap_alloc(sizeof(*dismanager)); + if (!dismanager) + { + *object = NULL; + return E_OUTOFMEMORY; + } + + dismanager->IDispenserManager_iface.lpVtbl = &dismanager_vtbl; + dismanager->ref = 1; + + ret = dismanager_QueryInterface(&dismanager->IDispenserManager_iface, riid, object); + dismanager_Release(&dismanager->IDispenserManager_iface); + + return ret; +} + BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID lpv) { switch(reason) @@ -49,13 +156,67 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID lpv) return TRUE; } +static HRESULT WINAPI comsvcscf_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv ) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + *ppv = iface; + }else if(IsEqualGUID(&IID_IClassFactory, riid)) { + TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + *ppv = iface; + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + WARN("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI comsvcscf_AddRef(IClassFactory *iface ) +{ + TRACE("(%p)\n", iface); + return 2; +} + +static ULONG WINAPI comsvcscf_Release(IClassFactory *iface ) +{ + TRACE("(%p)\n", iface); + return 1; +} + +static HRESULT WINAPI comsvcscf_LockServer(IClassFactory *iface, BOOL fLock) +{ + TRACE("(%p)->(%x)\n", iface, fLock); + return S_OK; +} + +static const struct IClassFactoryVtbl comsvcscf_vtbl = +{ + comsvcscf_QueryInterface, + comsvcscf_AddRef, + comsvcscf_Release, + comsvcscf_CreateInstance, + comsvcscf_LockServer +}; + +static IClassFactory DispenserManageFactory = { &comsvcscf_vtbl }; + /****************************************************************** * DllGetClassObject */ -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) { - FIXME("(%s,%s,%p) stub\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + if(IsEqualGUID(&CLSID_DispenserManager, rclsid)) { + TRACE("(CLSID_DispenserManager %s %p)\n", debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&DispenserManageFactory, riid, ppv); + } + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; }

1 0

Józef Kucia : dxgi: Move D3D12 helper functions closer to the top of the file.
by Alexandre Julliard 29 Aug '18

29 Aug '18

Module: wine Branch: master Commit: 278ddcbfba3f39a06a2ea00590cd237fda9e0cfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=278ddcbfba3f39a06a2ea005… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 29 12:53:34 2018 +0200 dxgi: Move D3D12 helper functions closer to the top of the file. We need to re-create a Vulkan swapchain in ResizeBuffers(). 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/dxgi/swapchain.c | 1190 ++++++++++++++++++++++++------------------------- 1 file changed, 595 insertions(+), 595 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=278ddcbfba3f39a06a2e…

1 0