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

Jason Edmeades : cmd: for /f fails to launch quoted program plus args.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: 8b6ba774c0ef5f25e1dfd314d870b16f60dce2b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b6ba774c0ef5f25e1dfd314… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Mon Aug 27 20:41:51 2018 +0100 cmd: for /f fails to launch quoted program plus args. for /f can run a program and parse its output. The program name can supply args and be quoted or not. If quoted, wine fails to run the program because internally we were adding an extra pair of quotes. These are not needed and can be removed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39906 Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 2 +- programs/cmd/tests/test_builtins.cmd | 4 +++- programs/cmd/tests/test_builtins.cmd.exp | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 5026f9c..cb4a7b9 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2073,7 +2073,7 @@ static HANDLE WCMD_forf_getinputhandle(BOOL usebackq, WCHAR *itemstr, BOOL iscmd static const WCHAR redirOutW[] = {'>','%','s','\0'}; static const WCHAR cmdW[] = {'C','M','D','\0'}; static const WCHAR cmdslashcW[] = {'C','M','D','.','E','X','E',' ', - '/','C',' ','"','%','s','"','\0'}; + '/','C',' ','%','s','\0'}; /* Remove leading and trailing character */ if ((iscmd && (itemstr[0] == '`' && usebackq)) || diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 0738f2d..0e88ad1 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1724,9 +1724,11 @@ if "%CD%"=="" goto :SkipFORFcmdNT4 for /f %%i in ('echo.Passed1') do echo %%i for /f "usebackq" %%i in (`echo.Passed2`) do echo %%i for /f usebackq %%i in (`echo.Passed3`) do echo %%i +for /f "usebackq" %%i in (`"c:\windows\system32\cmd.exe" /C echo Passed4`) do echo %%i +for /f "usebackq" %%i in (`""c:\windows\system32\cmd.exe" /C echo Passed5"`) do echo %%i goto :ContinueFORF :SkipFORFcmdNT4 -for /l %%i in (1,1,3) do echo Missing functionality - Broken%%i +for /l %%i in (1,1,5) do echo Missing functionality - Broken%%i :ContinueFORF rem FIXME: Rest not testable right now in wine: not implemented and would need rem preliminary grep-like program implementation (e.g. like findstr or fc) even diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 7ec83d7..1f2b5dd 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1209,6 +1209,8 @@ c Passed1(a)or_broken@Missing functionality - Broken1 Passed2(a)or_broken@Missing functionality - Broken2 Passed3(a)or_broken@Missing functionality - Broken3 +Passed4(a)or_broken@Missing functionality - Broken4 +Passed5(a)or_broken@Missing functionality - Broken5 ------ eol option and(a)or_broken@Broken NT4 functionality1 Line(a)or_broken@Broken NT4 functionality2

1 0

Jason Edmeades : cmd: Fix shortpath handling in for loops.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: 5c444c4e0dd51e824468d78215f795d67632ea49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c444c4e0dd51e824468d782… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Mon Aug 27 20:41:49 2018 +0100 cmd: Fix shortpath handling in for loops. When 's' is used as a modifier, the paths that are presented to the other modifiers needs to be a short path. Given the 'filename' part of the path may not exist, we cannot use GetShortPathName directly without first removing the filename part to just leave the directory bit. Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/batch.c | 17 +++++++++++++---- programs/cmd/tests/test_builtins.cmd.exp | 12 ++++++------ 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 14e2539..1ed5197 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -399,6 +399,7 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) WCHAR finaloutput[MAX_PATH]; WCHAR fullfilename[MAX_PATH]; WCHAR thisoutput[MAX_PATH]; + WCHAR *filepart = NULL; WCHAR *pos = *start+1; WCHAR *firstModifier = pos; WCHAR *lastModifier = NULL; @@ -522,7 +523,7 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) /* After this, we need full information on the file, which is valid not to exist. */ if (!skipFileParsing) { - if (GetFullPathNameW(outputparam, MAX_PATH, fullfilename, NULL) == 0) { + if (GetFullPathNameW(outputparam, MAX_PATH, fullfilename, &filepart) == 0) { exists = FALSE; fullfilename[0] = 0x00; } else { @@ -598,8 +599,16 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) /* 4. Handle 's' : Use short paths (File doesn't have to exist) */ if (memchrW(firstModifier, 's', modifierLen) != NULL) { if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW); - /* Don't flag as doneModifier - %~s on its own is processed later */ - GetShortPathNameW(outputparam, outputparam, ARRAY_SIZE(outputparam)); + + /* Convert fullfilename's path to a short path - Save filename away as + only path is valid, name may not exist which causes GetShortPathName + to fail if it is provided */ + if (filepart) { + strcpyW(thisoutput, filepart); + *filepart = 0x00; + GetShortPathNameW(fullfilename, fullfilename, ARRAY_SIZE(fullfilename)); + strcatW(fullfilename, thisoutput); + } } /* 5. Handle 'f' : Fully qualified path (File doesn't have to exist) */ @@ -673,7 +682,7 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) memchrW(firstModifier, 's', modifierLen) != NULL) { doneModifier = TRUE; if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW); - strcatW(finaloutput, outputparam); + strcatW(finaloutput, fullfilename); } } } diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index ea4157c..35e0cf2 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -530,9 +530,9 @@ N '.OOL' '.TABC' '' -(a)todo_wine@'@drive@@shortpath(a)R S'@or_broken@'' -(a)todo_wine@'@drive@@shortpath(a)T'@or_broken@'' -(a)todo_wine@'@drive@@shortpath(a)ABCDEFGHIJK.LMNOP'@or_broken@'' +'@drive@@shortpath(a)R S'@or_broken@'' +'@drive@@shortpath(a)T'@or_broken@'' +'@drive@@shortpath(a)ABCDEFGHIJK.LMNOP'@or_broken@'' ''@or_broken@'%~ai' ''@or_broken@'%~ai' '--a------'@or_broken@'--a--------'@or_broken@'--a--c---'@or_broken@'%~ai' @@ -566,9 +566,9 @@ N '.OOL' '.TABC' '' -(a)todo_wine@'@drive@@shortpath(a)R S'@or_broken@'' -(a)todo_wine@'@drive@@shortpath(a)T'@or_broken@'' -(a)todo_wine@'@drive@@shortpath(a)ABCDEFGHIJK.LMNOP'@or_broken@'' +'@drive@@shortpath(a)R S'@or_broken@'' +'@drive@@shortpath(a)T'@or_broken@'' +'@drive@@shortpath(a)ABCDEFGHIJK.LMNOP'@or_broken@'' @drive@@path@ @drive@@path@ @drive@

1 0

Thomas Faller : wine.inf: Set CurrentBuild always to the same value as CurrentBuildNumber.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: 6c1118994cc4c2ba8f24325099fdc7f76115fe4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c1118994cc4c2ba8f243250… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Wed Aug 29 00:14:17 2018 +0200 wine.inf: Set CurrentBuild always to the same value as CurrentBuildNumber. Make that the registry entry HKLM\Software\Microsoft\Windows NT\CurrentVersion\CurrentBuild has always the same value as HKLM\Software\Microsoft\Windows NT\CurrentVersion\CurrentBuildNumber Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42870 Signed-off-by: Thomas Faller <tfaller1(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 ++ programs/winecfg/appdefaults.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 79ac6c5..4f241c0 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3424,6 +3424,7 @@ HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Ca [VersionInfo] HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.1" HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1" +HKLM,%CurrentVersionNT%,"CurrentBuild",2,"7601" HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows 7" @@ -3434,6 +3435,7 @@ HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT" [VersionInfo.ntamd64] HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.1" HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1" +HKLM,%CurrentVersionNT%,"CurrentBuild",2,"7601" HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows 7" diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index e098c2b..d598fd4 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -431,6 +431,7 @@ static void on_winver_change(HWND dialog) set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CSDVersion", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", NULL); + set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuild", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuildNumber", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "ProductName", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyProdNT, "ProductType", NULL); @@ -445,6 +446,7 @@ static void on_winver_change(HWND dialog) set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", Buffer); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CSDVersion", win_versions[selection].szCSDVersion); snprintf(Buffer, sizeof(Buffer), "%d", win_versions[selection].dwBuildNumber); + set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuild", Buffer); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuildNumber", Buffer); snprintf(Buffer, sizeof(Buffer), "Microsoft %s", win_versions[selection].szDescription); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "ProductName", Buffer); @@ -463,6 +465,7 @@ static void on_winver_change(HWND dialog) case VER_PLATFORM_WIN32s: set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CSDVersion", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", NULL); + set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuild", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuildNumber", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "ProductName", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyProdNT, "ProductType", NULL);

1 0

Józef Kucia : dxgi/tests: Run test_swapchain_resize() on D3D12.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: f28a82bf577703e706bf6a040bbf0f69c6423bbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f28a82bf577703e706bf6a04… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 29 12:53:38 2018 +0200 dxgi/tests: Run test_swapchain_resize() on D3D12. 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/tests/dxgi.c | 266 +++++++++++++++++++++++++++++-------------------- 1 file changed, 159 insertions(+), 107 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f28a82bf577703e706bf…

1 0

Józef Kucia : dxgi: Implement d3d12_swapchain_ResizeBuffers().
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: d10a9faa46382a86cec53996e5ffa3d5c6d7307d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d10a9faa46382a86cec53996… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 29 12:53:37 2018 +0200 dxgi: Implement d3d12_swapchain_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 | 118 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 88 insertions(+), 30 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 71183f6..b285f3d 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1344,6 +1344,34 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, return S_OK; } +static HRESULT d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapchain) +{ + const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; + VkDevice vk_device = swapchain->vk_device; + VkFence vk_fence = swapchain->vk_fence; + VkResult vr; + + if ((vr = vk_funcs->p_vkAcquireNextImageKHR(vk_device, swapchain->vk_swapchain, UINT64_MAX, + VK_NULL_HANDLE, vk_fence, &swapchain->current_buffer_index)) < 0) + { + ERR("Failed to acquire next Vulkan image, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + + if ((vr = vk_funcs->p_vkWaitForFences(vk_device, 1, &vk_fence, VK_TRUE, UINT64_MAX)) != VK_SUCCESS) + { + ERR("Failed to wait for fence, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + if ((vr = vk_funcs->p_vkResetFences(vk_device, 1, &vk_fence)) < 0) + { + ERR("Failed to reset fence, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + + return S_OK; +} + static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; @@ -1700,10 +1728,68 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetDesc(IDXGISwapChain3 *iface, static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers(IDXGISwapChain3 *iface, UINT buffer_count, UINT width, UINT height, DXGI_FORMAT format, UINT flags) { - FIXME("iface %p, buffer_count %u, width %u, height %u, format %s, flags %#x stub!\n", + struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); + DXGI_SWAP_CHAIN_DESC1 *desc; + unsigned int i; + ULONG refcount; + HRESULT hr; + + TRACE("iface %p, buffer_count %u, width %u, height %u, format %s, flags %#x.\n", iface, buffer_count, width, height, debug_dxgi_format(format), flags); - return E_NOTIMPL; + if (flags) + FIXME("Ignoring flags %#x.\n", flags); + + for (i = 0; i < swapchain->buffer_count; ++i) + { + ID3D12Resource_AddRef(swapchain->buffers[i]); + if ((refcount = ID3D12Resource_Release(swapchain->buffers[i]))) + { + WARN("Buffer %p has %u references left.\n", swapchain->buffers[i], refcount); + return DXGI_ERROR_INVALID_CALL; + } + } + + desc = &swapchain->desc; + + if (!buffer_count) + buffer_count = desc->BufferCount; + if (!width || !height) + { + RECT client_rect; + + if (!GetClientRect(swapchain->window, &client_rect)) + { + WARN("Failed to get client rect, last error %#x.\n", GetLastError()); + return DXGI_ERROR_INVALID_CALL; + } + + if (!width) + width = client_rect.right; + if (!height) + height = client_rect.bottom; + } + if (!format) + format = desc->Format; + + if (desc->Width == width && desc->Height == height + && desc->Format == format && desc->BufferCount == buffer_count) + return S_OK; + + d3d12_swapchain_destroy_buffers(swapchain); + + desc->Width = width; + desc->Height = height; + desc->Format = format; + desc->BufferCount = buffer_count; + + if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) + { + ERR("Failed to recreate Vulkan swapchain, hr %#x.\n", hr); + return hr; + } + + return d3d12_swapchain_acquire_next_image(swapchain); } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeTarget(IDXGISwapChain3 *iface, @@ -1800,34 +1886,6 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetCoreWindow(IDXGISwapChain3 * return DXGI_ERROR_INVALID_CALL; } -static HRESULT d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapchain) -{ - const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; - VkDevice vk_device = swapchain->vk_device; - VkFence vk_fence = swapchain->vk_fence; - VkResult vr; - - if ((vr = vk_funcs->p_vkAcquireNextImageKHR(vk_device, swapchain->vk_swapchain, UINT64_MAX, - VK_NULL_HANDLE, vk_fence, &swapchain->current_buffer_index)) < 0) - { - ERR("Failed to acquire next Vulkan image, vr %d.\n", vr); - return hresult_from_vk_result(vr); - } - - if ((vr = vk_funcs->p_vkWaitForFences(vk_device, 1, &vk_fence, VK_TRUE, UINT64_MAX)) != VK_SUCCESS) - { - ERR("Failed to wait for fence, vr %d.\n", vr); - return hresult_from_vk_result(vr); - } - if ((vr = vk_funcs->p_vkResetFences(vk_device, 1, &vk_fence)) < 0) - { - ERR("Failed to reset fence, vr %d.\n", vr); - return hresult_from_vk_result(vr); - } - - return S_OK; -} - static HRESULT d3d12_swapchain_blit_buffer(struct d3d12_swapchain *swapchain, VkQueue vk_queue) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs;

1 0

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

Aug. 29, 2018

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

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

Aug. 29, 2018

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

Alex Henrie : shell32: Add documents icon.
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

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

Józef Kucia : dxgi: Factor out d3d12_swapchain_destroy_buffers().
by Alexandre Julliard Aug. 29, 2018

Aug. 29, 2018

Module: wine Branch: master Commit: 7343aec0cd4ea6447b523b0b09e8487ced1316b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7343aec0cd4ea6447b523b0b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 29 12:53:35 2018 +0200 dxgi: Factor out d3d12_swapchain_destroy_buffers(). 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 | 84 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 51 insertions(+), 33 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index a2fc37d..0b651c4 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1345,6 +1345,52 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, return S_OK; } +static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain) +{ + const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; + VkQueue vk_queue; + unsigned int i; + + if (swapchain->command_queue) + { + if ((vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue))) + { + vk_funcs->p_vkQueueWaitIdle(vk_queue); + + vkd3d_release_vk_queue(swapchain->command_queue); + } + else + { + WARN("Failed to acquire Vulkan queue.\n"); + } + } + + for (i = 0; i < swapchain->buffer_count; ++i) + { + if (swapchain->buffers[i]) + { + vkd3d_resource_decref(swapchain->buffers[i]); + swapchain->buffers[i] = NULL; + } + + if (swapchain->vk_device) + { + vk_funcs->p_vkDestroyImage(swapchain->vk_device, swapchain->vk_images[i], NULL); + swapchain->vk_images[i] = VK_NULL_HANDLE; + vk_funcs->p_vkDestroySemaphore(swapchain->vk_device, swapchain->vk_semaphores[i], NULL); + swapchain->vk_semaphores[i] = VK_NULL_HANDLE; + } + } + + if (swapchain->vk_device) + { + vk_funcs->p_vkFreeMemory(swapchain->vk_device, swapchain->vk_memory, NULL); + swapchain->vk_memory = VK_NULL_HANDLE; + vk_funcs->p_vkDestroyCommandPool(swapchain->vk_device, swapchain->vk_cmd_pool, NULL); + swapchain->vk_cmd_pool = VK_NULL_HANDLE; + } +} + static inline struct d3d12_swapchain *d3d12_swapchain_from_IDXGISwapChain3(IDXGISwapChain3 *iface) { return CONTAINING_RECORD(iface, struct d3d12_swapchain, IDXGISwapChain3_iface); @@ -1388,49 +1434,18 @@ static ULONG STDMETHODCALLTYPE d3d12_swapchain_AddRef(IDXGISwapChain3 *iface) static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; - VkQueue vk_queue; - unsigned int i; - - if (swapchain->command_queue) - { - if ((vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue))) - { - vk_funcs->p_vkQueueWaitIdle(vk_queue); - vkd3d_release_vk_queue(swapchain->command_queue); - } - else - { - WARN("Failed to acquire Vulkan queue.\n"); - } + d3d12_swapchain_destroy_buffers(swapchain); + if (swapchain->command_queue) ID3D12CommandQueue_Release(swapchain->command_queue); - } - - if (swapchain->factory) - IWineDXGIFactory_Release(swapchain->factory); wined3d_private_store_cleanup(&swapchain->private_store); - for (i = 0; i < swapchain->buffer_count; ++i) - { - if (swapchain->buffers[i]) - vkd3d_resource_decref(swapchain->buffers[i]); - - if (swapchain->vk_device) - { - vk_funcs->p_vkDestroyImage(swapchain->vk_device, swapchain->vk_images[i], NULL); - vk_funcs->p_vkDestroySemaphore(swapchain->vk_device, swapchain->vk_semaphores[i], NULL); - } - } - if (swapchain->vk_device) { vk_funcs->p_vkDestroyFence(swapchain->vk_device, swapchain->vk_fence, NULL); vk_funcs->p_vkDestroySwapchainKHR(swapchain->vk_device, swapchain->vk_swapchain, NULL); - - vk_funcs->p_vkFreeMemory(swapchain->vk_device, swapchain->vk_memory, NULL); - vk_funcs->p_vkDestroyCommandPool(swapchain->vk_device, swapchain->vk_cmd_pool, NULL); } if (swapchain->vk_instance) @@ -1438,6 +1453,9 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) if (swapchain->device) ID3D12Device_Release(swapchain->device); + + if (swapchain->factory) + IWineDXGIFactory_Release(swapchain->factory); } static ULONG STDMETHODCALLTYPE d3d12_swapchain_Release(IDXGISwapChain3 *iface)

1 0

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

Aug. 29, 2018

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