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

Zebediah Figura : quartz/vmr9: Cache surfaces on connection.
by Alexandre Julliard 20 Mar '20

20 Mar '20

Module: wine Branch: master Commit: d6a70366e10c29ff37822e093614b5e9d9f63aba URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6a70366e10c29ff37822e09… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 19 18:50:53 2020 -0500 quartz/vmr9: Cache surfaces on connection. How to Survive does not reference the IDirect3DSurface9 in IVMRSurfaceAllocator9::GetSurface(), nor does it dereference it in IVMRSurfaceAllocator9::TerminateDevice(). Native quartz only asks for each surface once, when connecting, and releases those surfaces when disconnecting, which lets these two application bugs cancel each other out. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index ab471b9042..0aa861c3a6 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -75,6 +75,7 @@ struct quartz_vmr /* Presentation related members */ IDirect3DDevice9 *allocator_d3d9_dev; HMONITOR allocator_mon; + IDirect3DSurface9 **surfaces; DWORD num_surfaces; DWORD cur_surface; DWORD_PTR cookie; @@ -312,14 +313,9 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi info.rtEnd = tStop; info.szAspectRatio.cx = This->bmiheader.biWidth; info.szAspectRatio.cy = This->bmiheader.biHeight; - - hr = IVMRSurfaceAllocatorEx9_GetSurface(This->allocator, This->cookie, (++This->cur_surface)%This->num_surfaces, 0, &info.lpSurf); - - if (FAILED(hr)) - return hr; + info.lpSurf = This->surfaces[(++This->cur_surface) % This->num_surfaces]; VMR9_SendSampleData(This, &info, pbSrcStream, cbSrcStream); - IDirect3DSurface9_Release(info.lpSurf); if (This->renderer.filter.state == State_Paused) { @@ -351,7 +347,7 @@ static HRESULT WINAPI VMR9_CheckMediaType(struct strmbase_renderer *iface, const static HRESULT initialize_device(struct quartz_vmr *filter, VMR9AllocationInfo *info) { - DWORD buffer_count = 1; + DWORD buffer_count = 1, i; HRESULT hr; if (FAILED(hr = IVMRSurfaceAllocatorEx9_InitializeDevice(filter->allocator, @@ -361,6 +357,25 @@ static HRESULT initialize_device(struct quartz_vmr *filter, VMR9AllocationInfo * return hr; } + if (!(filter->surfaces = calloc(buffer_count, sizeof(IDirect3DSurface9 *)))) + { + IVMRSurfaceAllocatorEx9_TerminateDevice(filter->allocator, filter->cookie); + return E_OUTOFMEMORY; + } + + for (i = 0; i < buffer_count; ++i) + { + if (FAILED(hr = IVMRSurfaceAllocatorEx9_GetSurface(filter->allocator, + filter->cookie, i, 0, &filter->surfaces[i]))) + { + ERR("Failed to get surface %u, hr %#x.\n", i, hr); + while (i--) + IDirect3DSurface9_Release(filter->surfaces[i]); + IVMRSurfaceAllocatorEx9_TerminateDevice(filter->allocator, filter->cookie); + return hr; + } + } + SetRect(&filter->source_rect, 0, 0, filter->bmiheader.biWidth, filter->bmiheader.biHeight); filter->num_surfaces = buffer_count; @@ -538,6 +553,7 @@ static HRESULT WINAPI VMR9_BreakConnect(struct strmbase_renderer *This) { struct quartz_vmr *pVMR9 = impl_from_IBaseFilter(&This->filter.IBaseFilter_iface); HRESULT hr = S_OK; + DWORD i; if (!pVMR9->mode) return S_FALSE; @@ -549,6 +565,10 @@ static HRESULT WINAPI VMR9_BreakConnect(struct strmbase_renderer *This) } if (pVMR9->renderer.filter.state == State_Running) hr = IVMRImagePresenter9_StopPresenting(pVMR9->presenter, pVMR9->cookie); + + for (i = 0; i < pVMR9->num_surfaces; ++i) + IDirect3DSurface9_Release(pVMR9->surfaces[i]); + free(pVMR9->surfaces); IVMRSurfaceAllocatorEx9_TerminateDevice(pVMR9->allocator, pVMR9->cookie); pVMR9->num_surfaces = 0; }

1 0

Zebediah Figura : quartz/tests: Add some tests for renderless mode.
by Alexandre Julliard 20 Mar '20

20 Mar '20

Module: wine Branch: master Commit: 99207332d4ebc83ac230a2001a859c6404e495e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99207332d4ebc83ac230a200… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 19 18:50:54 2020 -0500 quartz/tests: Add some tests for renderless mode. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/Makefile.in | 2 +- dlls/quartz/tests/avisplit.c | 1 - dlls/quartz/tests/vmr9.c | 561 +++++++++++++++++++++++++++++++++++++++++- 3 files changed, 560 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=99207332d4ebc83ac230…

1 0

Zebediah Figura : quartz/vmr9: Create textures with D3DUSAGE_DYNAMIC.
by Alexandre Julliard 20 Mar '20

20 Mar '20

Module: wine Branch: master Commit: ef23e618a0fbf1eeb41865e8e182a78969642379 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef23e618a0fbf1eeb41865e8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 19 18:50:55 2020 -0500 quartz/vmr9: Create textures with D3DUSAGE_DYNAMIC. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/vmr9.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 45898db111..1194fd8d17 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2508,7 +2508,7 @@ static void test_allocate_surface_helper(void) ok(hr == D3D_OK, "Got hr %#x.\n", hr); ok(desc.Format == info.Format, "Got format %#x.\n", desc.Format); ok(desc.Type == D3DRTYPE_SURFACE, "Got type %u.\n", desc.Type); - todo_wine ok(desc.Usage == D3DUSAGE_DYNAMIC, "Got usage %#x.\n", desc.Usage); + ok(desc.Usage == D3DUSAGE_DYNAMIC, "Got usage %#x.\n", desc.Usage); ok(desc.Pool == D3DPOOL_DEFAULT, "Got pool %u.\n", desc.Pool); ok(desc.MultiSampleType == D3DMULTISAMPLE_NONE, "Got multisample type %u.\n", desc.MultiSampleType); ok(!desc.MultiSampleQuality, "Got multisample quality %u.\n", desc.MultiSampleQuality); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 0aa861c3a6..b2217547cd 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2138,7 +2138,7 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AllocateSurfaceHelper(IVMRSurfa { IDirect3DTexture9 *texture; - hr = IDirect3DDevice9_CreateTexture(This->allocator_d3d9_dev, allocinfo->dwWidth, allocinfo->dwHeight, 1, 0, + hr = IDirect3DDevice9_CreateTexture(This->allocator_d3d9_dev, allocinfo->dwWidth, allocinfo->dwHeight, 1, D3DUSAGE_DYNAMIC, allocinfo->Format, allocinfo->Pool, &texture, NULL); if (FAILED(hr)) break;

1 0

Bernhard Übelacker : ws2_32: Add stub implementation for WSCGetProviderInfo.
by Alexandre Julliard 20 Mar '20

20 Mar '20

Module: wine Branch: master Commit: 3795484e81d65b6eed512c5d8983b89f4c5a0974 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3795484e81d65b6eed512c5d… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Thu Mar 19 22:32:16 2020 +0100 ws2_32: Add stub implementation for WSCGetProviderInfo. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48765 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 21 +++++++++++++++++++++ dlls/ws2_32/tests/sock.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/ws2_32.spec | 1 + include/ws2spi.h | 7 +++++++ 4 files changed, 76 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index c284f595ab..5b62767795 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -9001,6 +9001,27 @@ INT WINAPI WSCEnableNSProvider( LPGUID provider, BOOL enable ) return 0; } +/*********************************************************************** + * WSCGetProviderInfo + */ +INT WINAPI WSCGetProviderInfo( LPGUID provider, WSC_PROVIDER_INFO_TYPE info_type, + PBYTE info, size_t* len, DWORD flags, LPINT errcode ) +{ + FIXME( "(%s 0x%08x %p %p 0x%08x %p) Stub!\n", + debugstr_guid(provider), info_type, info, len, flags, errcode ); + + if (!errcode) + return SOCKET_ERROR; + + if (!provider) { + *errcode = WSAEFAULT; + return SOCKET_ERROR; + } + + *errcode = WSANO_RECOVERY; + return SOCKET_ERROR; +} + /*********************************************************************** * WSCGetProviderPath (WS2_32.86) */ diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 60c5dfc63f..b17f076a40 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -27,6 +27,7 @@ #include <windows.h> #include <winternl.h> #include <ws2tcpip.h> +#include <ws2spi.h> #include <wsipx.h> #include <wsnwlink.h> #include <mswsock.h> @@ -84,6 +85,7 @@ static int (WINAPI *pWSALookupServiceNextW)(HANDLE,DWORD,LPDWORD,LPWSAQUERYSET static int (WINAPI *pWSAEnumNameSpaceProvidersA)(LPDWORD,LPWSANAMESPACE_INFOA); static int (WINAPI *pWSAEnumNameSpaceProvidersW)(LPDWORD,LPWSANAMESPACE_INFOW); static int (WINAPI *pWSAPoll)(WSAPOLLFD *,ULONG,INT); +static int (WINAPI *pWSCGetProviderInfo)(LPGUID,WSC_PROVIDER_INFO_TYPE,PBYTE,size_t*,DWORD,LPINT); /* Function pointers from iphlpapi */ static DWORD (WINAPI *pGetAdaptersInfo)(PIP_ADAPTER_INFO,PULONG); @@ -1300,6 +1302,7 @@ static void Init (void) pWSAEnumNameSpaceProvidersA = (void *)GetProcAddress(hws2_32, "WSAEnumNameSpaceProvidersA"); pWSAEnumNameSpaceProvidersW = (void *)GetProcAddress(hws2_32, "WSAEnumNameSpaceProvidersW"); pWSAPoll = (void *)GetProcAddress(hws2_32, "WSAPoll"); + pWSCGetProviderInfo = (void *)GetProcAddress(hws2_32, "WSCGetProviderInfo"); hiphlpapi = LoadLibraryA("iphlpapi.dll"); if (hiphlpapi) @@ -11597,6 +11600,48 @@ static void test_iocp(void) closesocket(dst); } +static void test_WSCGetProviderInfo(void) +{ + int ret; + int errcode; + GUID provider = {}; + char info[1]; + size_t len = 0; + + if (!pWSCGetProviderInfo) { + skip("WSCGetProviderInfo is not available.\n"); + return; + } + + ret = pWSCGetProviderInfo(NULL, -1, NULL, NULL, 0, NULL); + ok(ret == SOCKET_ERROR, "got %d, expected SOCKET_ERROR\n", ret); + + errcode = 0xdeadbeef; + ret = pWSCGetProviderInfo(NULL, ProviderInfoLspCategories, (PBYTE)&info, &len, 0, &errcode); + ok(ret == SOCKET_ERROR, "got %d, expected SOCKET_ERROR\n", ret); + ok(errcode == WSAEFAULT, "got %d, expected WSAEFAULT\n", errcode); + + errcode = 0xdeadbeef; + ret = pWSCGetProviderInfo(&provider, -1, (PBYTE)&info, &len, 0, &errcode); + ok(ret == SOCKET_ERROR, "got %d, expected SOCKET_ERROR\n", ret); + ok(errcode == WSANO_RECOVERY, "got %d, expected WSANO_RECOVERY\n", errcode); + + errcode = 0xdeadbeef; + ret = pWSCGetProviderInfo(&provider, ProviderInfoLspCategories, NULL, &len, 0, &errcode); + ok(ret == SOCKET_ERROR, "got %d, expected SOCKET_ERROR\n", ret); + ok(errcode == WSANO_RECOVERY, "got %d, expected WSANO_RECOVERY\n", errcode); + + errcode = 0xdeadbeef; + ret = pWSCGetProviderInfo(&provider, ProviderInfoLspCategories, (PBYTE)&info, NULL, 0, &errcode); + ok(ret == SOCKET_ERROR, "got %d, expected SOCKET_ERROR\n", ret); + ok(errcode == WSANO_RECOVERY, "got %d, expected WSANO_RECOVERY\n", errcode); + + errcode = 0xdeadbeef; + ret = pWSCGetProviderInfo(&provider, ProviderInfoLspCategories, (PBYTE)&info, &len, 0, &errcode); + ok(ret == SOCKET_ERROR, "got %d, expected SOCKET_ERROR\n", ret); + ok(errcode == WSANO_RECOVERY, "got %d, expected WSANO_RECOVERY\n", errcode); +} + START_TEST( sock ) { int i; @@ -11681,6 +11726,8 @@ START_TEST( sock ) test_completion_port(); test_address_list_query(); + test_WSCGetProviderInfo(); + /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send(); test_synchronous_WSAIoctl(); diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index 37b02e5712..d3c1e6214a 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -117,6 +117,7 @@ @ stdcall WSCDeinstallProvider(ptr ptr) @ stdcall WSCEnableNSProvider(ptr long) @ stdcall WSCEnumProtocols(ptr ptr ptr ptr) +@ stdcall WSCGetProviderInfo(ptr long ptr ptr long ptr) @ stdcall WSCGetProviderPath(ptr ptr ptr ptr) @ stdcall WSCInstallNameSpace(wstr wstr long long ptr) @ stdcall WSCInstallProvider(ptr wstr ptr long ptr) diff --git a/include/ws2spi.h b/include/ws2spi.h index 3d2ca84dfa..a399afe6f2 100644 --- a/include/ws2spi.h +++ b/include/ws2spi.h @@ -33,12 +33,19 @@ extern "C" { typedef BOOL (WINAPI *LPWPUPOSTMESSAGE)(HWND,UINT,WPARAM,LPARAM); +typedef enum _WSC_PROVIDER_INFO_TYPE +{ + ProviderInfoLspCategories, + ProviderInfoAudit, +} WSC_PROVIDER_INFO_TYPE; + WSAEVENT WINAPI WPUCompleteOverlappedRequest(SOCKET,LPWSAOVERLAPPED,DWORD,DWORD,LPINT); INT WINAPI WSCInstallProvider(const LPGUID,LPCWSTR,const LPWSAPROTOCOL_INFOW, DWORD,LPINT); INT WINAPI WSCDeinstallProvider(LPGUID,LPINT); INT WINAPI WSCEnableNSProvider(LPGUID,BOOL); INT WINAPI WSCEnumProtocols(LPINT,LPWSAPROTOCOL_INFOW,LPDWORD,LPINT); +INT WINAPI WSCGetProviderInfo(LPGUID,WSC_PROVIDER_INFO_TYPE,PBYTE,size_t*,DWORD,LPINT); INT WINAPI WSCGetProviderPath(LPGUID,LPWSTR,LPINT,LPINT); INT WINAPI WSCInstallNameSpace(LPWSTR,LPWSTR,DWORD,DWORD,LPGUID); INT WINAPI WSCSetApplicationCategory(LPCWSTR,DWORD,LPCWSTR,DWORD,DWORD,DWORD*,LPINT);

1 0

Dmitry Timoshkov : adsldp: If secure open object fails fallback to simple bind.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: e396c01a2b2fbd8434d76c824f0bfb99090714fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=e396c01a2b2fbd8434d76c82… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 13 11:52:55 2020 +0800 adsldp: If secure open object fails fallback to simple bind. This matches ADsGetObject() behaviour described in MSDN. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index acebf717aa..30bd1672f6 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -111,6 +111,8 @@ static HRESULT WINAPI ldap_ParseDisplayName(IParseDisplayName *iface, IBindCtx * if (hr != S_OK) return hr; hr = IADsOpenDSObject_OpenDSObject(ads_open, name, NULL, NULL, ADS_SECURE_AUTHENTICATION, &disp); + if (hr != S_OK) + hr = IADsOpenDSObject_OpenDSObject(ads_open, name, NULL, NULL, 0, &disp); if (hr == S_OK) { hr = CreatePointerMoniker((IUnknown *)disp, mk);

1 0

Dmitry Timoshkov : adsldp: Bind to an LDAP server after connection.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: 3eb581db430a6839690bb3828225bd66bc2e5a8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3eb581db430a6839690bb382… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 13 11:53:07 2020 +0800 adsldp: Bind to an LDAP server after connection. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/Makefile.in | 3 +- dlls/adsldp/adsldp.c | 29 ++++++++++++-- dlls/adsldp/adsldp_private.h | 24 ++++++++++++ dlls/adsldp/ldap.c | 91 ++++++++++++++++++++++++++++++++++++++++++++ dlls/adsldp/tests/ldap.c | 31 +++++++++++---- 5 files changed, 166 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3eb581db430a6839690b…

1 0

Dmitry Timoshkov : activeds: ADsOpenObject should return E_FAIL by default.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: 2a1841f5cfe936c69a8bfd9aca202f4e3e6a894a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a1841f5cfe936c69a8bfd9a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 13 11:53:14 2020 +0800 activeds: ADsOpenObject should return E_FAIL by default. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/activeds/activeds_main.c | 6 +++--- dlls/adsldp/tests/Makefile.in | 2 +- dlls/adsldp/tests/ldap.c | 6 ++++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index c997cab912..564acab93e 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -127,10 +127,10 @@ HRESULT WINAPI ADsOpenObject(LPCWSTR path, LPCWSTR user, LPCWSTR password, DWORD if (!path || !riid || !obj) return E_INVALIDARG; - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\ADs\\Providers", 0, KEY_READ, &hkey)) - return E_ADS_BAD_PATHNAME; + hr = E_FAIL; - hr = E_ADS_BAD_PATHNAME; + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\ADs\\Providers", 0, KEY_READ, &hkey)) + return hr; for (;;) { diff --git a/dlls/adsldp/tests/Makefile.in b/dlls/adsldp/tests/Makefile.in index 52141139d5..26b937aa68 100644 --- a/dlls/adsldp/tests/Makefile.in +++ b/dlls/adsldp/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = adsldp.dll -IMPORTS = ole32 oleaut32 secur32 advapi32 uuid +IMPORTS = ole32 oleaut32 secur32 advapi32 activeds uuid C_SRCS = \ ldap.c \ diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index 6f8c00aa89..e0e562e8bf 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -28,6 +28,7 @@ #include "objbase.h" #include "iads.h" #include "adserr.h" +#include "adshlp.h" #include "wine/test.h" @@ -98,6 +99,11 @@ static void test_LDAP(void) if (hr == S_OK) IDispatch_Release(disp); + hr = ADsOpenObject(path, user, password, test[i].flags, &IID_IADs, (void **)&ads); + ok(hr == test[i].hr || hr == test[i].hr_ads_get, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); + if (hr == S_OK) + IADs_Release(ads); + SysFreeString(path); SysFreeString(user); SysFreeString(password);

1 0

Dmitry Timoshkov : activeds: Implement ADsGetObject.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: 18d7356f0ca1c07f09cfcf0de6a9b61349fc257a URL: https://source.winehq.org/git/wine.git/?a=commit;h=18d7356f0ca1c07f09cfcf0d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 13 11:53:34 2020 +0800 activeds: Implement ADsGetObject. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/activeds/activeds_main.c | 10 +++++++--- dlls/adsldp/tests/ldap.c | 5 +++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index 564acab93e..6a825f0913 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -61,10 +61,14 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) /***************************************************** * ADsGetObject [ACTIVEDS.3] */ -HRESULT WINAPI ADsGetObject(LPCWSTR lpszPathName, REFIID riid, VOID** ppObject) +HRESULT WINAPI ADsGetObject(LPCWSTR path, REFIID riid, void **obj) { - FIXME("(%s)->(%s,%p)!stub\n",debugstr_w(lpszPathName), debugstr_guid(riid), ppObject); - return E_NOTIMPL; + HRESULT hr; + + hr = ADsOpenObject(path, NULL, NULL, ADS_SECURE_AUTHENTICATION, riid, obj); + if (hr != S_OK) + hr = ADsOpenObject(path, NULL, NULL, 0, riid, obj); + return hr; } /***************************************************** diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index e0e562e8bf..28e41e4d95 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -104,6 +104,11 @@ static void test_LDAP(void) if (hr == S_OK) IADs_Release(ads); + hr = ADsGetObject(path, &IID_IDispatch, (void **)&disp); + ok(hr == test[i].hr || hr == test[i].hr_ads_get, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); + if (hr == S_OK) + IDispatch_Release(disp); + SysFreeString(path); SysFreeString(user); SysFreeString(password);

1 0

Rémi Bernon : user32/tests: Add new test to validate WM_CANCELMODE message.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: cf2148e17c354e701285f48feee10225504da2d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf2148e17c354e701285f48f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 4 15:53:22 2020 +0100 user32/tests: Add new test to validate WM_CANCELMODE message. The ShowWindow(SW_SHOWMINIMIZED):overlapped test shows that the message should not be sent in general. This additional test shows that we should still send the message if a menu is active. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 07f21607e8..93ab7b4a27 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1923,6 +1923,41 @@ static const struct message WmSHOWNATopInvisible[] = { { 0 } }; +static const struct message WmTrackPopupMenuMinimizeWindow[] = { + { HCBT_CREATEWND, hook }, + { WM_ENTERMENULOOP, sent|wparam|lparam, TRUE, 0 }, + { WM_INITMENU, sent|lparam, 0, 0 }, + { WM_INITMENUPOPUP, sent|lparam, 0, 0 }, + { 0x0093, sent|optional }, + { 0x0094, sent|optional }, + { 0x0094, sent|optional }, + { WM_ENTERIDLE, sent|wparam, 2 }, + { HCBT_MINMAX, hook }, + { HCBT_SETFOCUS, hook }, + { WM_KILLFOCUS, sent|wparam, 0 }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent|wparam|optional, 1 }, + { WM_WINDOWPOSCHANGED, sent }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_GETTEXT, sent|optional }, + { WM_NCCALCSIZE, sent|wparam|optional, 1 }, + { WM_CANCELMODE, sent }, + { WM_CAPTURECHANGED, sent|defwinproc }, + { HCBT_DESTROYWND, hook }, + { WM_UNINITMENUPOPUP, sent|defwinproc|lparam, 0, 0 }, + { WM_MENUSELECT, sent|defwinproc|wparam|lparam, 0xffff0000, 0 }, + { WM_EXITMENULOOP, sent|defwinproc|wparam|lparam, 1, 0 }, + { WM_NCACTIVATE, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ACTIVATE, sent }, + { WM_ACTIVATEAPP, sent|wparam, 0 }, + { 0 } +}; + static const struct message WmTrackPopupMenu[] = { { HCBT_CREATEWND, hook }, { WM_ENTERMENULOOP, sent|wparam|lparam, TRUE, 0 }, @@ -17308,6 +17343,25 @@ static void test_layered_window(void) static HMENU hpopupmenu; +static LRESULT WINAPI minimize_popup_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + LRESULT ret; + + if (ignore_message( message )) return 0; + ret = MsgCheckProc( FALSE, hwnd, message, wParam, lParam ); + + switch (message) { + case WM_ENTERIDLE: + ShowWindow(hwnd, SW_MINIMIZE); + break; + case WM_TIMER: + EndMenu(); + break; + } + + return ret; +} + static LRESULT WINAPI cancel_popup_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { if (ignore_message( message )) return 0; @@ -17390,6 +17444,21 @@ static void test_TrackPopupMenu(void) ok_sequence(WmTrackPopupMenuAbort, "WmTrackPopupMenuAbort", TRUE); ok(ret == TRUE, "TrackPopupMenu failed\n"); + SetWindowLongPtrA( hwnd, GWLP_WNDPROC, (LONG_PTR)minimize_popup_proc); + + /* set cursor over the window, otherwise the WM_CANCELMODE message may not always be sent */ + SetCursorPos( 0, 0 ); + ShowWindow( hwnd, SW_SHOW ); + + flush_events(); + flush_sequence(); + SetTimer( hwnd, TIMER_ID, 500, NULL ); + ret = TrackPopupMenu( hpopupmenu, 0, 100,100, 0, hwnd, NULL ); + ok_sequence( WmTrackPopupMenuMinimizeWindow, "TrackPopupMenuMinimizeWindow", TRUE ); + ok( ret == 1, "TrackPopupMenu failed with error %i\n", GetLastError() ); + KillTimer( hwnd, TIMER_ID ); + ShowWindow( hwnd, SW_RESTORE ); + SetWindowLongPtrA( hwnd, GWLP_WNDPROC, (LONG_PTR)cancel_popup_proc); SetCapture(hwnd);

1 0

Zebediah Figura : d3dcompiler: Rename HLSL_MODIFIER_{IN, OUT} to HLSL_STORAGE_{IN, OUT}.
by Alexandre Julliard 19 Mar '20

19 Mar '20

Module: wine Branch: master Commit: a82ec54862fb092df32acd1d9690af4784c31624 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a82ec54862fb092df32acd1d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 15 16:25:09 2020 -0500 d3dcompiler: Rename HLSL_MODIFIER_{IN, OUT} to HLSL_STORAGE_{IN, OUT}. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 4 ++-- dlls/d3dcompiler_43/hlsl.y | 8 ++++---- dlls/d3dcompiler_43/utils.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 830434c9ff..957fc24e20 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -734,8 +734,8 @@ struct hlsl_ir_node #define HLSL_MODIFIER_CONST 0x00000100 #define HLSL_MODIFIER_ROW_MAJOR 0x00000200 #define HLSL_MODIFIER_COLUMN_MAJOR 0x00000400 -#define HLSL_MODIFIER_IN 0x00000800 -#define HLSL_MODIFIER_OUT 0x00001000 +#define HLSL_STORAGE_IN 0x00000800 +#define HLSL_STORAGE_OUT 0x00001000 #define HLSL_TYPE_MODIFIERS_MASK (HLSL_MODIFIER_PRECISE | HLSL_STORAGE_VOLATILE | \ HLSL_MODIFIER_CONST | HLSL_MODIFIER_ROW_MAJOR | \ diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 6a5dddf5d4..fca4ebc529 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1489,7 +1489,7 @@ parameter: input_mods var_modifiers type any_identifier colon_att if (!(type = apply_type_modifiers($3, &modifiers, get_location(&@2)))) YYABORT; - $$.modifiers = $1 ? $1 : HLSL_MODIFIER_IN; + $$.modifiers = $1 ? $1 : HLSL_STORAGE_IN; $$.modifiers |= modifiers; $$.type = type; $$.name = $4; @@ -1514,15 +1514,15 @@ input_mods: /* Empty */ input_mod: KW_IN { - $$ = HLSL_MODIFIER_IN; + $$ = HLSL_STORAGE_IN; } | KW_OUT { - $$ = HLSL_MODIFIER_OUT; + $$ = HLSL_STORAGE_OUT; } | KW_INOUT { - $$ = HLSL_MODIFIER_IN | HLSL_MODIFIER_OUT; + $$ = HLSL_STORAGE_IN | HLSL_STORAGE_OUT; } type: base_type diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 29b35c3d7e..3e8e229c8c 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1808,11 +1808,11 @@ const char *debug_modifiers(DWORD modifiers) strcat(string, " row_major"); /* 10 */ if (modifiers & HLSL_MODIFIER_COLUMN_MAJOR) strcat(string, " column_major"); /* 13 */ - if ((modifiers & (HLSL_MODIFIER_IN | HLSL_MODIFIER_OUT)) == (HLSL_MODIFIER_IN | HLSL_MODIFIER_OUT)) + if ((modifiers & (HLSL_STORAGE_IN | HLSL_STORAGE_OUT)) == (HLSL_STORAGE_IN | HLSL_STORAGE_OUT)) strcat(string, " inout"); /* 6 */ - else if (modifiers & HLSL_MODIFIER_IN) + else if (modifiers & HLSL_STORAGE_IN) strcat(string, " in"); /* 3 */ - else if (modifiers & HLSL_MODIFIER_OUT) + else if (modifiers & HLSL_STORAGE_OUT) strcat(string, " out"); /* 4 */ return wine_dbg_sprintf("%s", string[0] ? string + 1 : "");

1 0