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

Jactry Zeng : include: Add some interface definitions for axextend.idl.
by Alexandre Julliard 12 May '20

12 May '20

Module: wine Branch: master Commit: cba0e8ec93261431ba806b67ddf881c8c3566c02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cba0e8ec93261431ba806b67… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue May 12 21:35:14 2020 +0800 include: Add some interface definitions for axextend.idl. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 3 + include/axextend.idl | 183 ++++++++++++++++++++++++++++++++++++++++ include/axextendenums.h | 32 +++++++ include/exposeenums2managed.h | 29 +++++++ include/unexposeenums2managed.h | 20 +++++ 5 files changed, 267 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cba0e8ec93261431ba80…

1 0

Jactry Zeng : qcap/tests: Add interface tests for video capture filter.
by Alexandre Julliard 12 May '20

12 May '20

Module: wine Branch: master Commit: ecf825afc7ee453747fd74fb99706cc502609e1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecf825afc7ee453747fd74fb… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue May 12 21:35:26 2020 +0800 qcap/tests: Add interface tests for video capture filter. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/videocapture.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index 448136791b..cd613b00e7 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -23,6 +23,21 @@ #include "wine/test.h" #include "wine/strmbase.h" +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + static void test_media_types(IPin *pin) { IEnumMediaTypes *enum_media_types; @@ -176,11 +191,48 @@ static void test_capture(IBaseFilter *filter) { test_media_types(pin); test_stream_config(pin); + + todo_wine check_interface(pin, &IID_IAMBufferNegotiation, TRUE); + check_interface(pin, &IID_IAMStreamConfig, TRUE); + todo_wine check_interface(pin, &IID_IAMStreamControl, TRUE); + check_interface(pin, &IID_IKsPropertySet, TRUE); + todo_wine check_interface(pin, &IID_IMediaSeeking, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + todo_wine check_interface(pin, &IID_ISpecifyPropertyPages, TRUE); + + check_interface(pin, &IID_IAMCrossbar, FALSE); + check_interface(pin, &IID_IAMDroppedFrames, FALSE); + check_interface(pin, &IID_IAMFilterMiscFlags, FALSE); + check_interface(pin, &IID_IAMPushSource, FALSE); + check_interface(pin, &IID_IAMTVTuner, FALSE); + check_interface(pin, &IID_IAMVideoCompression, FALSE); + check_interface(pin, &IID_IAMVideoProcAmp, FALSE); + check_interface(pin, &IID_IPersistPropertyBag, FALSE); } IPin_Release(pin); } IEnumPins_Release(enum_pins); + + todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); + todo_wine check_interface(filter, &IID_IAMVideoControl, TRUE); + check_interface(filter, &IID_IAMVideoProcAmp, TRUE); + check_interface(filter, &IID_IBaseFilter, TRUE); + todo_wine check_interface(filter, &IID_IKsPropertySet, TRUE); + todo_wine check_interface(filter, &IID_IMediaSeeking, TRUE); + check_interface(filter, &IID_IPersistPropertyBag, TRUE); + todo_wine check_interface(filter, &IID_ISpecifyPropertyPages, TRUE); + + check_interface(filter, &IID_IAMCrossbar, FALSE); + check_interface(filter, &IID_IAMPushSource, FALSE); + check_interface(filter, &IID_IAMStreamConfig, FALSE); + check_interface(filter, &IID_IAMTVTuner, FALSE); + check_interface(filter, &IID_IAMVideoCompression, FALSE); + check_interface(filter, &IID_IAMVfwCaptureDialogs, FALSE); + check_interface(filter, &IID_IPin, FALSE); + check_interface(filter, &IID_IReferenceClock, FALSE); + check_interface(filter, &IID_IOverlayNotify, FALSE); } START_TEST(videocapture)

1 0

Jactry Zeng : qcap/videocapture: Initialize caps struct.
by Alexandre Julliard 12 May '20

12 May '20

Module: wine Branch: master Commit: 832fec3e540257e975d3a2aabfe5ec9916f594a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=832fec3e540257e975d3a2aa… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue May 12 21:36:10 2020 +0800 qcap/videocapture: Initialize caps struct. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index afc9bf2c93..449951ad53 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -442,6 +442,7 @@ static void fill_caps(__u32 pixelformat, __u32 width, __u32 height, { LONG depth = 24; + memset(caps, 0, sizeof(*caps)); caps->video_info.dwBitRate = width * height * depth * max_fps; caps->video_info.bmiHeader.biSize = sizeof(caps->video_info.bmiHeader); caps->video_info.bmiHeader.biWidth = width;

1 0

Nikolay Sivov : shlwapi: Forward SHQueryInfoKey() to shcore.dll.
by Alexandre Julliard 12 May '20

12 May '20

Module: wine Branch: master Commit: f92a0c356724171939f2a59ca1c0fa3e78eeaeec URL: https://source.winehq.org/git/wine.git/?a=commit;h=f92a0c356724171939f2a59c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 12 22:41:08 2020 +0300 shlwapi: Forward SHQueryInfoKey() to shcore.dll. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/reg.c | 31 ------------------------------- dlls/shlwapi/shlwapi.spec | 4 ++-- 2 files changed, 2 insertions(+), 33 deletions(-) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index f33047ab38..83d83d3cb2 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -120,37 +120,6 @@ DWORD WINAPI SHSetValueW(HKEY hKey, LPCWSTR lpszSubKey, LPCWSTR lpszValue, return dwRet; } -/************************************************************************* - * SHQueryInfoKeyA [SHLWAPI.@] - * - * Get information about a registry key. See RegQueryInfoKeyA(). - * - * RETURNS - * The result of calling RegQueryInfoKeyA(). - */ -LONG WINAPI SHQueryInfoKeyA(HKEY hKey, LPDWORD pwSubKeys, LPDWORD pwSubKeyMax, - LPDWORD pwValues, LPDWORD pwValueMax) -{ - TRACE("(hkey=%p,%p,%p,%p,%p)\n", hKey, pwSubKeys, pwSubKeyMax, - pwValues, pwValueMax); - return RegQueryInfoKeyA(hKey, NULL, NULL, NULL, pwSubKeys, pwSubKeyMax, - NULL, pwValues, pwValueMax, NULL, NULL, NULL); -} - -/************************************************************************* - * SHQueryInfoKeyW [SHLWAPI.@] - * - * See SHQueryInfoKeyA. - */ -LONG WINAPI SHQueryInfoKeyW(HKEY hKey, LPDWORD pwSubKeys, LPDWORD pwSubKeyMax, - LPDWORD pwValues, LPDWORD pwValueMax) -{ - TRACE("(hkey=%p,%p,%p,%p,%p)\n", hKey, pwSubKeys, pwSubKeyMax, - pwValues, pwValueMax); - return RegQueryInfoKeyW(hKey, NULL, NULL, NULL, pwSubKeys, pwSubKeyMax, - NULL, pwValues, pwValueMax, NULL, NULL, NULL); -} - /************************************************************************* * SHQueryValueExA [SHLWAPI.@] * diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index a0782607a7..98a3ab7d99 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -709,8 +709,8 @@ @ stdcall SHOpenRegStream2W(long wstr wstr long) shcore.SHOpenRegStream2W @ stdcall SHOpenRegStreamA(long str str long) shcore.SHOpenRegStreamA @ stdcall SHOpenRegStreamW(long wstr wstr long) shcore.SHOpenRegStreamW -@ stdcall SHQueryInfoKeyA(long ptr ptr ptr ptr) -@ stdcall SHQueryInfoKeyW(long ptr ptr ptr ptr) +@ stdcall -import SHQueryInfoKeyA(long ptr ptr ptr ptr) +@ stdcall -import SHQueryInfoKeyW(long ptr ptr ptr ptr) @ stdcall SHQueryValueExA(long str ptr ptr ptr ptr) @ stdcall SHQueryValueExW(long wstr ptr ptr ptr ptr) @ stdcall SHRegCloseUSKey(ptr)

1 0

Zebediah Figura : quartz/vmr9: Get rid of VMR9_SurfaceAllocator_UpdateDeviceReset().
by Alexandre Julliard 11 May '20

11 May '20

Module: wine Branch: master Commit: b0c2e524dce57928ba838e2927f87f9045f7d605 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0c2e524dce57928ba838e29… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 11 11:03:10 2020 -0500 quartz/vmr9: Get rid of VMR9_SurfaceAllocator_UpdateDeviceReset(). It's not clear that this ever did something useful, but at least since d6a70366e this had the effect of always resetting immediately after creating the device. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 58 ------------------------------------------------------ 1 file changed, 58 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 342c44bdad..a8d4b67d7b 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -182,7 +182,6 @@ struct default_presenter HMONITOR hMon; DWORD num_surfaces; - BOOL reset; VMR9AllocationInfo info; struct quartz_vmr* pVMR9; @@ -2529,7 +2528,6 @@ static HRESULT VMR9_SurfaceAllocator_SetAllocationSettings(struct default_presen FIXME("Square texture support required..\n"); } - This->reset = TRUE; allocinfo->dwHeight = height; allocinfo->dwWidth = width; @@ -2639,60 +2637,6 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_TerminateDevice(IVMRSurfaceAllocator return S_OK; } -/* Recreate all surfaces (If allocated as D3DPOOL_DEFAULT) and survive! */ -static HRESULT VMR9_SurfaceAllocator_UpdateDeviceReset(struct default_presenter *This) -{ - unsigned int i; - D3DPRESENT_PARAMETERS d3dpp; - HRESULT hr; - - if (!This->d3d9_surfaces || !This->reset) - return S_OK; - - This->reset = FALSE; - TRACE("RESETTING\n"); - - for (i = 0; i < This->num_surfaces; ++i) - { - IDirect3DSurface9 *surface = This->d3d9_surfaces[i]; - TRACE("Releasing surface %p\n", surface); - if (surface) - IDirect3DSurface9_Release(surface); - } - ZeroMemory(This->d3d9_surfaces, sizeof(IDirect3DSurface9 *) * This->num_surfaces); - - /* Now try to create the d3d9 device */ - ZeroMemory(&d3dpp, sizeof(d3dpp)); - d3dpp.Windowed = TRUE; - d3dpp.hDeviceWindow = This->pVMR9->window.hwnd; - d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - - if (This->d3d9_dev) - IDirect3DDevice9_Release(This->d3d9_dev); - This->d3d9_dev = NULL; - hr = IDirect3D9_CreateDevice(This->d3d9_ptr, d3d9_adapter_from_hwnd(This->d3d9_ptr, - This->pVMR9->window.hwnd, &This->hMon), D3DDEVTYPE_HAL, NULL, - D3DCREATE_HARDWARE_VERTEXPROCESSING, &d3dpp, &This->d3d9_dev); - if (FAILED(hr)) - { - hr = IDirect3D9_CreateDevice(This->d3d9_ptr, d3d9_adapter_from_hwnd(This->d3d9_ptr, - This->pVMR9->window.hwnd, &This->hMon), D3DDEVTYPE_HAL, NULL, - D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &This->d3d9_dev); - if (FAILED(hr)) - { - ERR("--> Creating device: %08x\n", hr); - return S_OK; - } - } - IVMRSurfaceAllocatorNotify9_ChangeD3DDevice(This->SurfaceAllocatorNotify, This->d3d9_dev, This->hMon); - - IVMRSurfaceAllocatorNotify9_AllocateSurfaceHelper(This->SurfaceAllocatorNotify, &This->info, &This->num_surfaces, This->d3d9_surfaces); - - This->reset = FALSE; - - return S_OK; -} - static HRESULT WINAPI VMR9_SurfaceAllocator_GetSurface(IVMRSurfaceAllocatorEx9 *iface, DWORD_PTR id, DWORD surfaceindex, DWORD flags, IDirect3DSurface9 **surface) { struct default_presenter *This = impl_from_IVMRSurfaceAllocatorEx9(iface); @@ -2704,8 +2648,6 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_GetSurface(IVMRSurfaceAllocatorEx9 * return E_FAIL; } - VMR9_SurfaceAllocator_UpdateDeviceReset(This); - if (surfaceindex >= This->num_surfaces) { ERR("surfaceindex is greater than num_surfaces\n");

1 0

Zebediah Figura : quartz/vmr9: Perform image stretching in Present() instead of StretchRect().
by Alexandre Julliard 11 May '20

11 May '20

Module: wine Branch: master Commit: c7c91b93ad888d5355e261565b20d2addcddcbe6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7c91b93ad888d5355e26156… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 11 11:03:11 2020 -0500 quartz/vmr9: Perform image stretching in Present() instead of StretchRect(). This fixes resizing the window after connection time, especially when using a custom destination rect. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 14 ++++---------- dlls/quartz/vmr9.c | 12 ++++++------ 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 1e81866633..fc2794c5cb 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1517,11 +1517,8 @@ static void test_current_image(IBaseFilter *filter, IMemInputPin *input, ok(hr == S_OK, "Got hr %#x.\n", hr); ok(size == sizeof(buffer), "Got size %d.\n", size); ok(!memcmp(bih, &expect_bih, sizeof(BITMAPINFOHEADER)), "Bitmap headers didn't match.\n"); - if (0) /* FIXME: Rendering is currently broken on Wine. */ - { - for (i = 0; i < 32 * 16; ++i) - ok((data[i] & 0xffffff) == 0x7f007f, "Got unexpected color %08x at %u.\n", data[i], i); - } + for (i = 0; i < 32 * 16; ++i) + ok((data[i] & 0xffffff) == 0x7f007f, "Got unexpected color %08x at %u.\n", data[i], i); hr = IMediaControl_Run(control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1533,11 +1530,8 @@ static void test_current_image(IBaseFilter *filter, IMemInputPin *input, ok(hr == S_OK, "Got hr %#x.\n", hr); ok(size == sizeof(buffer), "Got size %d.\n", size); ok(!memcmp(bih, &expect_bih, sizeof(BITMAPINFOHEADER)), "Bitmap headers didn't match.\n"); - if (0) /* FIXME: Rendering is currently broken on Wine. */ - { - for (i = 0; i < 32 * 16; ++i) - ok((data[i] & 0xffffff) == 0x7f007f, "Got unexpected color %08x at %u.\n", data[i], i); - } + for (i = 0; i < 32 * 16; ++i) + ok((data[i] & 0xffffff) == 0x7f007f, "Got unexpected color %08x at %u.\n", data[i], i); hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index a8d4b67d7b..c7ebdc6c57 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2411,8 +2411,7 @@ static HRESULT VMR9_ImagePresenter_PresentOffscreenSurface(struct default_presen return hr; } - hr = IDirect3DDevice9_StretchRect(This->d3d9_dev, surface, - &This->pVMR9->window.src, target, NULL, D3DTEXF_LINEAR); + hr = IDirect3DDevice9_StretchRect(This->d3d9_dev, surface, NULL, target, NULL, D3DTEXF_POINT); if (FAILED(hr)) ERR("IDirect3DDevice9_StretchRect -- %08x\n", hr); IDirect3DSurface9_Release(target); @@ -2450,7 +2449,8 @@ static HRESULT WINAPI VMR9_ImagePresenter_PresentImage(IVMRImagePresenter9 *ifac hr = IDirect3DDevice9_EndScene(This->d3d9_dev); if (render && SUCCEEDED(hr)) { - hr = IDirect3DDevice9_Present(This->d3d9_dev, NULL, NULL, This->pVMR9->window.hwnd, NULL); + hr = IDirect3DDevice9_Present(This->d3d9_dev, &This->pVMR9->window.src, + &This->pVMR9->window.dst, This->pVMR9->window.hwnd, NULL); if (FAILED(hr)) FIXME("Presenting image: %08x\n", hr); } @@ -2572,9 +2572,9 @@ static BOOL CreateRenderingWindow(struct default_presenter *This, VMR9Allocation ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.hDeviceWindow = This->pVMR9->window.hwnd; - d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - d3dpp.BackBufferHeight = This->pVMR9->window.dst.bottom - This->pVMR9->window.dst.top; - d3dpp.BackBufferWidth = This->pVMR9->window.dst.right - This->pVMR9->window.dst.left; + d3dpp.SwapEffect = D3DSWAPEFFECT_COPY; + d3dpp.BackBufferWidth = info->dwWidth; + d3dpp.BackBufferHeight = info->dwHeight; hr = IDirect3D9_CreateDevice(This->d3d9_ptr, d3d9_adapter, D3DDEVTYPE_HAL, NULL, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &This->d3d9_dev); if (FAILED(hr))

1 0

Nikolay Sivov : shlwapi: Forward SHRegDuplicateHKey() to shcore.dll.
by Alexandre Julliard 11 May '20

11 May '20

Module: wine Branch: master Commit: 3e35bf3889031e86f0ad5a6ed5470843353d056b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e35bf3889031e86f0ad5a6e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 11 18:23:43 2020 +0300 shlwapi: Forward SHRegDuplicateHKey() to shcore.dll. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/Makefile.in | 1 + dlls/shlwapi/Makefile.in | 2 +- dlls/shlwapi/reg.c | 20 -------------------- dlls/shlwapi/shlwapi.spec | 2 +- 4 files changed, 3 insertions(+), 22 deletions(-) diff --git a/dlls/shcore/Makefile.in b/dlls/shcore/Makefile.in index 2e33b3e135..f296e4a830 100644 --- a/dlls/shcore/Makefile.in +++ b/dlls/shcore/Makefile.in @@ -1,4 +1,5 @@ MODULE = shcore.dll +IMPORTLIB = shcore IMPORTS = user32 gdi32 ole32 advapi32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/shlwapi/Makefile.in b/dlls/shlwapi/Makefile.in index 179fcad765..184d00dd5d 100644 --- a/dlls/shlwapi/Makefile.in +++ b/dlls/shlwapi/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_SHLWAPI_ MODULE = shlwapi.dll IMPORTLIB = shlwapi -IMPORTS = uuid user32 gdi32 advapi32 kernelbase +IMPORTS = uuid shcore user32 gdi32 advapi32 kernelbase DELAYIMPORTS = userenv oleaut32 ole32 comctl32 comdlg32 mpr mlang urlmon shell32 winmm version EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index f89636b12a..fb57f1fa16 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -932,26 +932,6 @@ BOOL WINAPI UnregisterExtensionForMIMETypeW(LPCWSTR lpszType) return TRUE; } -/************************************************************************* - * SHRegDuplicateHKey [SHLWAPI.@] - * - * Create a duplicate of a registry handle. - * - * PARAMS - * hKey [I] key to duplicate. - * - * RETURNS - * A new handle pointing to the same key as hKey. - */ -HKEY WINAPI SHRegDuplicateHKey(HKEY hKey) -{ - HKEY newKey = 0; - - RegOpenKeyExA(hKey, 0, 0, MAXIMUM_ALLOWED, &newKey); - TRACE("new key is %p\n", newKey); - return newKey; -} - /* * The following functions are ORDINAL ONLY: */ diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index f47f41aea4..99c17aa350 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -720,7 +720,7 @@ @ stdcall SHRegDeleteEmptyUSKeyW(long wstr long) @ stdcall SHRegDeleteUSValueA(long str long) @ stdcall SHRegDeleteUSValueW(long wstr long) -@ stdcall SHRegDuplicateHKey (long) +@ stdcall -import SHRegDuplicateHKey(long) @ stdcall SHRegEnumUSKeyA(long long str ptr long) @ stdcall SHRegEnumUSKeyW(long long wstr ptr long) @ stdcall SHRegEnumUSValueA(long long ptr ptr ptr ptr ptr long)

1 0

Nikolay Sivov : shlwapi: Forward SHRegGetPath() to shcore.dll.
by Alexandre Julliard 11 May '20

11 May '20

Module: wine Branch: master Commit: b1c702a97ed8decaf631b7b80cd3c27146e2cd73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1c702a97ed8decaf631b7b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 11 18:23:44 2020 +0300 shlwapi: Forward SHRegGetPath() to shcore.dll. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/reg.c | 45 --------------------------------------------- dlls/shlwapi/shlwapi.spec | 4 ++-- 2 files changed, 2 insertions(+), 47 deletions(-) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index fb57f1fa16..f8af8b3065 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -47,51 +47,6 @@ static const WCHAR szExtensionW[] = { 'E', 'x', 't','e','n','s','i','o','n','\0' INT WINAPI SHStringFromGUIDW(REFGUID,LPWSTR,INT); HRESULT WINAPI SHRegGetCLSIDKeyW(REFGUID,LPCWSTR,BOOL,BOOL,PHKEY); - -/************************************************************************* - * SHRegGetPathA [SHLWAPI.@] - * - * Get a path from the registry. - * - * PARAMS - * hKey [I] Handle to registry key - * lpszSubKey [I] Name of sub key containing path to get - * lpszValue [I] Name of value containing path to get - * lpszPath [O] Buffer for returned path - * dwFlags [I] Reserved - * - * RETURNS - * Success: ERROR_SUCCESS. lpszPath contains the path. - * Failure: An error code from RegOpenKeyExA() or SHQueryValueExA(). - */ -DWORD WINAPI SHRegGetPathA(HKEY hKey, LPCSTR lpszSubKey, LPCSTR lpszValue, - LPSTR lpszPath, DWORD dwFlags) -{ - DWORD dwSize = MAX_PATH; - - TRACE("(hkey=%p,%s,%s,%p,%d)\n", hKey, debugstr_a(lpszSubKey), - debugstr_a(lpszValue), lpszPath, dwFlags); - - return SHGetValueA(hKey, lpszSubKey, lpszValue, 0, lpszPath, &dwSize); -} - -/************************************************************************* - * SHRegGetPathW [SHLWAPI.@] - * - * See SHRegGetPathA. - */ -DWORD WINAPI SHRegGetPathW(HKEY hKey, LPCWSTR lpszSubKey, LPCWSTR lpszValue, - LPWSTR lpszPath, DWORD dwFlags) -{ - DWORD dwSize = MAX_PATH; - - TRACE("(hkey=%p,%s,%s,%p,%d)\n", hKey, debugstr_w(lpszSubKey), - debugstr_w(lpszValue), lpszPath, dwFlags); - - return SHGetValueW(hKey, lpszSubKey, lpszValue, 0, lpszPath, &dwSize); -} - - /************************************************************************* * SHRegSetPathA [SHLWAPI.@] * diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 99c17aa350..a76046783e 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -727,8 +727,8 @@ @ stdcall SHRegEnumUSValueW(long long ptr ptr ptr ptr ptr long) @ stdcall SHRegGetBoolUSValueA(str str long long) @ stdcall SHRegGetBoolUSValueW(wstr wstr long long) -@ stdcall SHRegGetPathA(long str str ptr long) -@ stdcall SHRegGetPathW(long wstr wstr ptr long) +@ stdcall -import SHRegGetPathA(long str str ptr long) +@ stdcall -import SHRegGetPathW(long wstr wstr ptr long) @ stdcall SHRegGetUSValueA ( str str ptr ptr ptr long ptr long ) @ stdcall SHRegGetUSValueW ( wstr wstr ptr ptr ptr long ptr long ) @ stdcall SHRegGetValueA ( long str str long ptr ptr ptr ) advapi32.RegGetValueA

1 0

Nikolay Sivov : shlwapi: Forward SHRegSetPath() to shcore.dll.
by Alexandre Julliard 11 May '20

11 May '20

Module: wine Branch: master Commit: eed50a780aaf5abc39182d16f9c446579061437f URL: https://source.winehq.org/git/wine.git/?a=commit;h=eed50a780aaf5abc39182d16… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 11 18:23:45 2020 +0300 shlwapi: Forward SHRegSetPath() to shcore.dll. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/reg.c | 53 ----------------------------------------------- dlls/shlwapi/shlwapi.spec | 4 ++-- 2 files changed, 2 insertions(+), 55 deletions(-) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index f8af8b3065..08cc26ee48 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -47,59 +47,6 @@ static const WCHAR szExtensionW[] = { 'E', 'x', 't','e','n','s','i','o','n','\0' INT WINAPI SHStringFromGUIDW(REFGUID,LPWSTR,INT); HRESULT WINAPI SHRegGetCLSIDKeyW(REFGUID,LPCWSTR,BOOL,BOOL,PHKEY); -/************************************************************************* - * SHRegSetPathA [SHLWAPI.@] - * - * Write a path to the registry. - * - * PARAMS - * hKey [I] Handle to registry key - * lpszSubKey [I] Name of sub key containing path to set - * lpszValue [I] Name of value containing path to set - * lpszPath [O] Path to write - * dwFlags [I] Reserved, must be 0. - * - * RETURNS - * Success: ERROR_SUCCESS. - * Failure: An error code from SHSetValueA(). - */ -DWORD WINAPI SHRegSetPathA(HKEY hKey, LPCSTR lpszSubKey, LPCSTR lpszValue, - LPCSTR lpszPath, DWORD dwFlags) -{ - char szBuff[MAX_PATH]; - - FIXME("(hkey=%p,%s,%s,%p,%d) - semi-stub\n",hKey, debugstr_a(lpszSubKey), - debugstr_a(lpszValue), lpszPath, dwFlags); - - lstrcpyA(szBuff, lpszPath); - - /* FIXME: PathUnExpandEnvStringsA(szBuff); */ - - return SHSetValueA(hKey,lpszSubKey, lpszValue, REG_SZ, szBuff, - lstrlenA(szBuff)); -} - -/************************************************************************* - * SHRegSetPathW [SHLWAPI.@] - * - * See SHRegSetPathA. - */ -DWORD WINAPI SHRegSetPathW(HKEY hKey, LPCWSTR lpszSubKey, LPCWSTR lpszValue, - LPCWSTR lpszPath, DWORD dwFlags) -{ - WCHAR szBuff[MAX_PATH]; - - FIXME("(hkey=%p,%s,%s,%p,%d) - semi-stub\n",hKey, debugstr_w(lpszSubKey), - debugstr_w(lpszValue), lpszPath, dwFlags); - - lstrcpyW(szBuff, lpszPath); - - /* FIXME: PathUnExpandEnvStringsW(szBuff); */ - - return SHSetValueW(hKey,lpszSubKey, lpszValue, REG_SZ, szBuff, - lstrlenW(szBuff)); -} - /************************************************************************* * SHGetValueA [SHLWAPI.@] * diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index a76046783e..e571eeb2e7 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -739,8 +739,8 @@ @ stdcall SHRegQueryInfoUSKeyW ( long ptr ptr ptr ptr long ) @ stdcall SHRegQueryUSValueA ( long str ptr ptr ptr long ptr long ) @ stdcall SHRegQueryUSValueW ( long wstr ptr ptr ptr long ptr long ) -@ stdcall SHRegSetPathA(long str str str long) -@ stdcall SHRegSetPathW(long wstr wstr wstr long) +@ stdcall -import SHRegSetPathA(long str str str long) +@ stdcall -import SHRegSetPathW(long wstr wstr wstr long) @ stdcall SHRegSetUSValueA ( str str long ptr long long) @ stdcall SHRegSetUSValueW ( wstr wstr long ptr long long) @ stdcall SHRegWriteUSValueA (long str long ptr long long)

1 0

Nikolay Sivov : shlwapi: Forward SHGetValue() to shcore.dll.
by Alexandre Julliard 11 May '20

11 May '20

Module: wine Branch: master Commit: ec58bd31f7b4ca99fe490daafa3759c99218c89e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec58bd31f7b4ca99fe490daa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 11 18:23:46 2020 +0300 shlwapi: Forward SHGetValue() to shcore.dll. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-downlevel-shlwapi-l2-1-0.spec | 4 +- dlls/shlwapi/reg.c | 66 ---------------------- dlls/shlwapi/shlwapi.spec | 4 +- 3 files changed, 4 insertions(+), 70 deletions(-) diff --git a/dlls/api-ms-win-downlevel-shlwapi-l2-1-0/api-ms-win-downlevel-shlwapi-l2-1-0.spec b/dlls/api-ms-win-downlevel-shlwapi-l2-1-0/api-ms-win-downlevel-shlwapi-l2-1-0.spec index 4ed7f84c78..3ee015b675 100644 --- a/dlls/api-ms-win-downlevel-shlwapi-l2-1-0/api-ms-win-downlevel-shlwapi-l2-1-0.spec +++ b/dlls/api-ms-win-downlevel-shlwapi-l2-1-0/api-ms-win-downlevel-shlwapi-l2-1-0.spec @@ -30,8 +30,8 @@ @ stdcall SHEnumValueA(long long str ptr ptr ptr ptr) shlwapi.SHEnumValueA @ stdcall SHEnumValueW(long long wstr ptr ptr ptr ptr) shlwapi.SHEnumValueW @ stdcall SHGetThreadRef(ptr) shlwapi.SHGetThreadRef -@ stdcall SHGetValueA( long str str ptr ptr ptr ) shlwapi.SHGetValueA -@ stdcall SHGetValueW( long wstr wstr ptr ptr ptr ) shlwapi.SHGetValueW +@ stdcall SHGetValueA(long str str ptr ptr ptr) shlwapi.SHGetValueA +@ stdcall SHGetValueW(long wstr wstr ptr ptr ptr) shlwapi.SHGetValueW @ stdcall SHOpenRegStream2A(long str str long) shlwapi.SHOpenRegStream2A @ stdcall SHOpenRegStream2W(long wstr wstr long) shlwapi.SHOpenRegStream2W @ stdcall SHOpenRegStreamA(long str str long) shlwapi.SHOpenRegStreamA diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index 08cc26ee48..f33047ab38 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -47,72 +47,6 @@ static const WCHAR szExtensionW[] = { 'E', 'x', 't','e','n','s','i','o','n','\0' INT WINAPI SHStringFromGUIDW(REFGUID,LPWSTR,INT); HRESULT WINAPI SHRegGetCLSIDKeyW(REFGUID,LPCWSTR,BOOL,BOOL,PHKEY); -/************************************************************************* - * SHGetValueA [SHLWAPI.@] - * - * Get a value from the registry. - * - * PARAMS - * hKey [I] Handle to registry key - * lpszSubKey [I] Name of sub key containing value to get - * lpszValue [I] Name of value to get - * pwType [O] Pointer to the values type - * pvData [O] Pointer to the values data - * pcbData [O] Pointer to the values size - * - * RETURNS - * Success: ERROR_SUCCESS. Output parameters contain the details read. - * Failure: An error code from RegOpenKeyExA() or SHQueryValueExA(). - */ -DWORD WINAPI SHGetValueA(HKEY hKey, LPCSTR lpszSubKey, LPCSTR lpszValue, - LPDWORD pwType, LPVOID pvData, LPDWORD pcbData) -{ - DWORD dwRet = 0; - HKEY hSubKey = 0; - - TRACE("(hkey=%p,%s,%s,%p,%p,%p)\n", hKey, debugstr_a(lpszSubKey), - debugstr_a(lpszValue), pwType, pvData, pcbData); - - /* lpszSubKey can be 0. In this case the value is taken from the - * current key. - */ - if(lpszSubKey) - dwRet = RegOpenKeyExA(hKey, lpszSubKey, 0, KEY_QUERY_VALUE, &hSubKey); - - if (! dwRet) - { - /* SHQueryValueEx expands Environment strings */ - dwRet = SHQueryValueExA(hSubKey ? hSubKey : hKey, lpszValue, 0, pwType, pvData, pcbData); - if (hSubKey) RegCloseKey(hSubKey); - } - return dwRet; -} - -/************************************************************************* - * SHGetValueW [SHLWAPI.@] - * - * See SHGetValueA. - */ -DWORD WINAPI SHGetValueW(HKEY hKey, LPCWSTR lpszSubKey, LPCWSTR lpszValue, - LPDWORD pwType, LPVOID pvData, LPDWORD pcbData) -{ - DWORD dwRet = 0; - HKEY hSubKey = 0; - - TRACE("(hkey=%p,%s,%s,%p,%p,%p)\n", hKey, debugstr_w(lpszSubKey), - debugstr_w(lpszValue), pwType, pvData, pcbData); - - if(lpszSubKey) - dwRet = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_QUERY_VALUE, &hSubKey); - - if (! dwRet) - { - dwRet = SHQueryValueExW(hSubKey ? hSubKey : hKey, lpszValue, 0, pwType, pvData, pcbData); - if (hSubKey) RegCloseKey(hSubKey); - } - return dwRet; -} - /************************************************************************* * SHSetValueA [SHLWAPI.@] * diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index e571eeb2e7..a0782607a7 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -702,8 +702,8 @@ @ stdcall SHEnumValueW(long long wstr ptr ptr ptr ptr) shcore.SHEnumValueW @ stdcall SHGetInverseCMAP ( ptr long ) @ stdcall SHGetThreadRef(ptr) shcore.SHGetThreadRef -@ stdcall SHGetValueA ( long str str ptr ptr ptr ) -@ stdcall SHGetValueW ( long wstr wstr ptr ptr ptr ) +@ stdcall -import SHGetValueA(long str str ptr ptr ptr) +@ stdcall -import SHGetValueW(long wstr wstr ptr ptr ptr) @ stdcall SHIsLowMemoryMachine(long) @ stdcall SHOpenRegStream2A(long str str long) shcore.SHOpenRegStream2A @ stdcall SHOpenRegStream2W(long wstr wstr long) shcore.SHOpenRegStream2W

1 0