- Wine-Devel - list.winehq.org

[PATCH 4/8] oleacc: Add get_accName function for edit client accessible object.
by Piotr Caban Sept. 27, 2021

Sept. 27, 2021

From: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/client.c | 92 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 72 insertions(+), 20 deletions(-)

1 0

[PATCH 3/8] oleacc: Add get_accState function for edit client accessible object.
by Piotr Caban Sept. 27, 2021

Sept. 27, 2021

From: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/client.c | 60 +++++++++++++++++++++++++++++++++----------- 1 file changed, 45 insertions(+), 15 deletions(-)

1 0

[PATCH 2/8] oleacc: Add get_accRole implementation for edit client accessible object.
by Piotr Caban Sept. 27, 2021

Sept. 27, 2021

From: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/client.c | 32 ++++++++++++++++++++++++++++---- dlls/oleacc/oleacc_private.h | 1 + 2 files changed, 29 insertions(+), 4 deletions(-)

1 0

[PATCH 1/8] oleacc: Reorganize class specific behaviour handling.
by Piotr Caban Sept. 27, 2021

Sept. 27, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/client.c | 35 +++++++++++++++ dlls/oleacc/main.c | 82 +++++----------------------------- dlls/oleacc/oleacc_private.h | 7 +++ dlls/oleacc/tests/main.c | 85 ++++++++++++++++++++++++++++++++++++ dlls/oleacc/window.c | 9 ++++ 5 files changed, 146 insertions(+), 72 deletions(-)

1 0

[PATCH v4 1/2] uiautomationcore: Implement UiaHostProviderFromHwnd.
by Connor McAdams Sept. 27, 2021

Sept. 27, 2021

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- -v4: replace cast to long with HandleToUlong. dlls/uiautomationcore/Makefile.in | 1 + dlls/uiautomationcore/uia_main.c | 125 +++++++++++++++++++++++++++++- 2 files changed, 124 insertions(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in index 71ea7b99c94..1f6ad85c24f 100644 --- a/dlls/uiautomationcore/Makefile.in +++ b/dlls/uiautomationcore/Makefile.in @@ -1,5 +1,6 @@ MODULE = uiautomationcore.dll IMPORTLIB = uiautomationcore +IMPORTS = oleaut32 user32 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 2dada95af80..1e46b6e7e32 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -16,9 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + +#include "windows.h" +#include "initguid.h" #include "uiautomation.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(uiautomation); @@ -84,10 +89,126 @@ void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *callback) FIXME("(%p): stub\n", callback); } +typedef struct { + IRawElementProviderSimple IRawElementProviderSimple_iface; + LONG ref; + + HWND hwnd; +} HwndProvider; + +static inline HwndProvider *impl_from_HwndProvider(IRawElementProviderSimple *iface) +{ + return CONTAINING_RECORD(iface, HwndProvider, IRawElementProviderSimple_iface); +} + +HRESULT WINAPI HwndProvider_QueryInterface(IRawElementProviderSimple *iface, REFIID riid, void **ppv) +{ + if (IsEqualIID(riid, &IID_IRawElementProviderSimple) || + IsEqualIID(riid, &IID_IUnknown)) + *ppv = iface; + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IRawElementProviderSimple_AddRef(iface); + return S_OK; +} + +ULONG WINAPI HwndProvider_AddRef(IRawElementProviderSimple *iface) +{ + HwndProvider *This = impl_from_HwndProvider(iface); + return InterlockedIncrement(&This->ref); +} + +ULONG WINAPI HwndProvider_Release(IRawElementProviderSimple *iface) +{ + HwndProvider *This = impl_from_HwndProvider(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + if (!ref) + heap_free(This); + + return ref; +} + +HRESULT WINAPI HwndProvider_get_ProviderOptions(IRawElementProviderSimple *iface, + enum ProviderOptions *ret_val) +{ + *ret_val = ProviderOptions_ServerSideProvider; + return S_OK; +} + +HRESULT WINAPI HwndProvider_GetPatternProvider(IRawElementProviderSimple *iface, + PATTERNID pattern_id, IUnknown **ret_val) +{ + *ret_val = NULL; + return S_OK; +} + +HRESULT WINAPI HwndProvider_GetPropertyValue(IRawElementProviderSimple *iface, + PROPERTYID property_id, VARIANT *ret_val) +{ + HwndProvider *This = impl_from_HwndProvider(iface); + + switch (property_id) + { + case UIA_NativeWindowHandlePropertyId: + V_VT(ret_val) = VT_I4; + V_I4(ret_val) = HandleToUlong(This->hwnd); + break; + + case UIA_ProviderDescriptionPropertyId: + V_VT(ret_val) = VT_BSTR; + V_BSTR(ret_val) = SysAllocString(L"Wine: HWND Provider Proxy"); + break; + + default: + V_VT(ret_val) = VT_EMPTY; + break; + } + + return S_OK; +} + +HRESULT WINAPI HwndProvider_get_HostRawElementProvider(IRawElementProviderSimple *iface, + IRawElementProviderSimple **ret_val) +{ + *ret_val = NULL; + return S_OK; +} + +IRawElementProviderSimpleVtbl HwndProviderVtbl = { + HwndProvider_QueryInterface, + HwndProvider_AddRef, + HwndProvider_Release, + HwndProvider_get_ProviderOptions, + HwndProvider_GetPatternProvider, + HwndProvider_GetPropertyValue, + HwndProvider_get_HostRawElementProvider, +}; + HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **provider) { - FIXME("(%p, %p): stub\n", hwnd, provider); - return E_NOTIMPL; + HwndProvider *hwnd_prov; + + TRACE("(%p, %p)\n", hwnd, provider); + + *provider = NULL; + if (!IsWindow(hwnd)) + return E_INVALIDARG; + + hwnd_prov = heap_alloc_zero(sizeof(*hwnd_prov)); + if (!hwnd_prov) + return E_OUTOFMEMORY; + + hwnd_prov->IRawElementProviderSimple_iface.lpVtbl = &HwndProviderVtbl; + hwnd_prov->ref = 1; + hwnd_prov->hwnd = hwnd; + *provider = &hwnd_prov->IRawElementProviderSimple_iface; + + return S_OK; } HRESULT WINAPI UiaDisconnectProvider(IRawElementProviderSimple *provider) -- 2.25.1

3 5

[PATCH resend] wininet: Set context length for http status 403
by Alistair Leslie-Hughes Sept. 27, 2021

Sept. 27, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/http.c | 4 +++- dlls/wininet/tests/http.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index e9363208471..4bfd93aa3be 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2918,7 +2918,9 @@ static DWORD set_content_length(http_request_t *request) WCHAR encoding[20]; DWORD size; - if(request->status_code == HTTP_STATUS_NO_CONTENT || !wcscmp(request->verb, L"HEAD")) { + if(request->status_code == HTTP_STATUS_NO_CONTENT || request->status_code == HTTP_STATUS_NOT_MODIFIED || + !wcscmp(request->verb, L"HEAD")) + { request->contentLength = request->netconn_stream.content_length = 0; return ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index bf4dce80bef..d32f01be2c5 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2381,6 +2381,11 @@ static DWORD CALLBACK server_thread(LPVOID param) static const char nocontentmsg[] = "HTTP/1.1 204 No Content\r\nConnection: close\r\n\r\n"; send(c, nocontentmsg, sizeof(nocontentmsg)-1, 0); } + if (strstr(buffer, "GET /test_not_modified")) + { + static const char notmodifiedmsg[] = "HTTP/1.1 304 Not Modified\r\nConnection: close\r\n\r\n"; + send(c, notmodifiedmsg, sizeof(notmodifiedmsg)-1, 0); + } if (strstr(buffer, "GET /test_conn_close")) { static const char conn_close_response[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\nsome content"; @@ -3487,6 +3492,37 @@ static void test_no_content(int port) CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); } +static void test_not_modified(int port) +{ + DWORD len; + char buf[256]; + HINTERNET ses, con, req; + BOOL ret; + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, NULL, "/test_not_modified", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 304); + + len = sizeof(buf)-1; + ret = HttpQueryInfoA(req, HTTP_QUERY_CONTENT_LENGTH, buf, &len, 0); + ok(!ret, "HttpQueryInfo should have failed\n"); + ok(GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND , "got %u\n", GetLastError()); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_conn_close(int port) { HINTERNET session, connection, req; @@ -6060,6 +6096,7 @@ static void test_http_connection(void) test_HttpSendRequestW(si.port); test_options(si.port); test_no_content(si.port); + test_not_modified(si.port); test_conn_close(si.port); test_no_cache(si.port); test_cache_read_gzipped(si.port); -- 2.33.0

2 1

[PATCH] include: Add SPSTREAMFORMAT enum values
by Alistair Leslie-Hughes Sept. 27, 2021

Sept. 27, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/sapi.idl | 75 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/include/sapi.idl b/include/sapi.idl index 59c2540ba21..d2c1aac8afc 100644 --- a/include/sapi.idl +++ b/include/sapi.idl @@ -351,6 +351,81 @@ typedef [hidden] enum SPVALUETYPE SPDF_ALL = 0x000000ff } SPVALUETYPE; +typedef [hidden] enum SPSTREAMFORMAT +{ + SPSF_Default = -1, + SPSF_NoAssignedFormat = 0, + SPSF_Text, + SPSF_NonStandardFormat, + SPSF_ExtendedAudioFormat, + SPSF_8kHz8BitMono, + SPSF_8kHz8BitStereo, + SPSF_8kHz16BitMono, + SPSF_8kHz16BitStereo, + SPSF_11kHz8BitMono, + SPSF_11kHz8BitStereo, + SPSF_11kHz16BitMono, + SPSF_11kHz16BitStereo, + SPSF_12kHz8BitMono, + SPSF_12kHz8BitStereo, + SPSF_12kHz16BitMono, + SPSF_12kHz16BitStereo, + SPSF_16kHz8BitMono, + SPSF_16kHz8BitStereo, + SPSF_16kHz16BitMono, + SPSF_16kHz16BitStereo, + SPSF_22kHz8BitMono, + SPSF_22kHz8BitStereo, + SPSF_22kHz16BitMono, + SPSF_22kHz16BitStereo, + SPSF_24kHz8BitMono, + SPSF_24kHz8BitStereo, + SPSF_24kHz16BitMono, + SPSF_24kHz16BitStereo, + SPSF_32kHz8BitMono, + SPSF_32kHz8BitStereo, + SPSF_32kHz16BitMono, + SPSF_32kHz16BitStereo, + SPSF_44kHz8BitMono, + SPSF_44kHz8BitStereo, + SPSF_44kHz16BitMono, + SPSF_44kHz16BitStereo, + SPSF_48kHz8BitMono, + SPSF_48kHz8BitStereo, + SPSF_48kHz16BitMono, + SPSF_48kHz16BitStereo, + SPSF_TrueSpeech_8kHz1BitMono, + SPSF_CCITT_ALaw_8kHzMono, + SPSF_CCITT_ALaw_8kHzStereo, + SPSF_CCITT_ALaw_11kHzMono, + SPSF_CCITT_ALaw_11kHzStereo, + SPSF_CCITT_ALaw_22kHzMono, + SPSF_CCITT_ALaw_22kHzStereo, + SPSF_CCITT_ALaw_44kHzMono, + SPSF_CCITT_ALaw_44kHzStereo, + SPSF_CCITT_uLaw_8kHzMono, + SPSF_CCITT_uLaw_8kHzStereo, + SPSF_CCITT_uLaw_11kHzMono, + SPSF_CCITT_uLaw_11kHzStereo, + SPSF_CCITT_uLaw_22kHzMono, + SPSF_CCITT_uLaw_22kHzStereo, + SPSF_CCITT_uLaw_44kHzMono, + SPSF_CCITT_uLaw_44kHzStereo, + SPSF_ADPCM_8kHzMono, + SPSF_ADPCM_8kHzStereo, + SPSF_ADPCM_11kHzMono, + SPSF_ADPCM_11kHzStereo, + SPSF_ADPCM_22kHzMono, + SPSF_ADPCM_22kHzStereo, + SPSF_ADPCM_44kHzMono, + SPSF_ADPCM_44kHzStereo, + SPSF_GSM610_8kHzMono, + SPSF_GSM610_11kHzMono, + SPSF_GSM610_22kHzMono, + SPSF_GSM610_44kHzMono, + SPSF_NUM_FORMATS +} SPSTREAMFORMAT; + typedef unsigned short SPPHONEID; typedef [restricted, hidden] struct SPPHRASEELEMENT -- 2.33.0

1 0

[PATCH 1/5] ole32/tests: Systematically check for supported moniker interfaces.
by Nikolay Sivov Sept. 27, 2021

Sept. 27, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/moniker.c | 59 ++++++++++++++++++++++++++++++++++---- 1 file changed, 53 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index ae46db110b6..db068f1426f 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -36,6 +36,21 @@ #include "wine/test.h" #include "wine/heap.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); +} + #define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08x\n", hr) #define CHECK_EXPECTED_METHOD(method_name) \ @@ -1896,6 +1911,13 @@ static void test_class_moniker(void) hr = CreateClassMoniker(&GUID_NULL, &moniker); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + check_interface(moniker, &IID_IMoniker, TRUE); + check_interface(moniker, &IID_IPersist, TRUE); + check_interface(moniker, &IID_IPersistStream, TRUE); + check_interface(moniker, &CLSID_ClassMoniker, TRUE); + check_interface(moniker, &IID_IROTData, TRUE); + check_interface(moniker, &IID_IMarshal, TRUE); + hr = IMoniker_GetSizeMax(moniker, &size); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(size.QuadPart == 20, "Unexpected size %u.\n", size.LowPart); @@ -2222,6 +2244,14 @@ static void test_file_monikers(void) hr = CreateFileMoniker(filename, &moniker); ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + check_interface(moniker, &IID_IMoniker, TRUE); +todo_wine + check_interface(moniker, &IID_IPersist, FALSE); + check_interface(moniker, &IID_IPersistStream, TRUE); + check_interface(moniker, &CLSID_FileMoniker, TRUE); + check_interface(moniker, &IID_IROTData, TRUE); + check_interface(moniker, &IID_IMarshal, TRUE); + hr = IMoniker_BindToStorage(moniker, NULL, NULL, &IID_IStorage, (void **)&storage); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); @@ -2753,6 +2783,14 @@ static void test_anti_moniker(void) hr = CreateAntiMoniker(&moniker); ok_ole_success(hr, CreateAntiMoniker); + check_interface(moniker, &IID_IMoniker, TRUE); +todo_wine + check_interface(moniker, &IID_IPersist, FALSE); + check_interface(moniker, &IID_IPersistStream, TRUE); + check_interface(moniker, &CLSID_AntiMoniker, TRUE); + check_interface(moniker, &IID_IROTData, TRUE); + check_interface(moniker, &IID_IMarshal, TRUE); + hr = IMoniker_QueryInterface(moniker, &CLSID_AntiMoniker, (void **)&unknown); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); @@ -3067,6 +3105,13 @@ static void test_generic_composite_moniker(void) hr = CreateGenericComposite(moniker1, moniker2, &moniker); ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + check_interface(moniker, &IID_IMoniker, TRUE); +todo_wine + check_interface(moniker, &IID_IPersist, FALSE); + check_interface(moniker, &IID_IPersistStream, TRUE); + check_interface(moniker, &IID_IROTData, TRUE); + check_interface(moniker, &IID_IMarshal, TRUE); + hr = CreateGenericComposite(moniker1, moniker2, &moniker); ok(hr == S_OK, "Failed to create composite, hr %#x.\n", hr); TEST_MONIKER_TYPE(moniker, MKSYS_GENERICCOMPOSITE); @@ -3253,7 +3298,6 @@ static void test_pointer_moniker(void) FILETIME filetime; IUnknown *unknown; IStream *stream; - IROTData *rotdata; LPOLESTR display_name; IMarshal *marshal; LARGE_INTEGER pos; @@ -3267,6 +3311,14 @@ static void test_pointer_moniker(void) hr = CreatePointerMoniker((IUnknown *)&factory.IClassFactory_iface, &moniker); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + check_interface(moniker, &IID_IMoniker, TRUE); +todo_wine + check_interface(moniker, &IID_IPersist, FALSE); + check_interface(moniker, &IID_IPersistStream, TRUE); + check_interface(moniker, &CLSID_PointerMoniker, TRUE); + check_interface(moniker, &IID_IMarshal, TRUE); + check_interface(moniker, &IID_IROTData, FALSE); + hr = IMoniker_QueryInterface(moniker, &IID_IMoniker, NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); @@ -3318,11 +3370,6 @@ static void test_pointer_moniker(void) hr = IMoniker_IsDirty(moniker); ok(hr == S_FALSE, "IMoniker_IsDirty should return S_FALSE, not 0x%08x\n", hr); - /* IROTData::GetComparisonData test */ - - hr = IMoniker_QueryInterface(moniker, &IID_IROTData, (void **)&rotdata); - ok(hr == E_NOINTERFACE, "IMoniker_QueryInterface(IID_IROTData) should have returned E_NOINTERFACE instead of 0x%08x\n", hr); - /* Saving */ hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); -- 2.33.0

1 4

[PATCH v2 1/3] ntdll: Implement LdrGetDllHandleEx() function.
by Paul Gofman Sept. 27, 2021

Sept. 27, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernel32/tests/module.c | 107 +++++++++++++++++++++++++++++++++++ dlls/ntdll/loader.c | 44 ++++++++++++-- dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 5 ++ 4 files changed, 152 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 0066f7de5a8..5ca137ad6ba 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -39,6 +39,9 @@ static BOOL (WINAPI *pK32GetModuleInformation)(HANDLE process, HMODULE module, static NTSTATUS (WINAPI *pLdrGetDllDirectory)(UNICODE_STRING*); static NTSTATUS (WINAPI *pLdrSetDllDirectory)(UNICODE_STRING*); +static NTSTATUS (WINAPI *pLdrGetDllHandle)( LPCWSTR load_path, ULONG flags, const UNICODE_STRING *name, HMODULE *base ); +static NTSTATUS (WINAPI *pLdrGetDllHandleEx)( ULONG flags, LPCWSTR load_path, ULONG *dll_characteristics, + const UNICODE_STRING *name, HMODULE *base ); static BOOL is_unicode_enabled = TRUE; @@ -826,6 +829,8 @@ static void init_pointers(void) mod = GetModuleHandleA( "ntdll.dll" ); MAKEFUNC(LdrGetDllDirectory); MAKEFUNC(LdrSetDllDirectory); + MAKEFUNC(LdrGetDllHandle); + MAKEFUNC(LdrGetDllHandleEx); #undef MAKEFUNC /* before Windows 7 this was not exported in kernel32 */ @@ -1143,6 +1148,107 @@ static void test_SetDefaultDllDirectories(void) pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_DEFAULT_DIRS ); } +static void check_refcount( HMODULE mod, unsigned int refcount ) +{ + unsigned int i; + BOOL ret; + + for (i = 0; i < min( refcount, 10 ); ++i) + { + ret = FreeLibrary( mod ); + ok( ret || broken( refcount == ~0u && GetLastError() == ERROR_MOD_NOT_FOUND && i == 2 ) /* Win8 */, + "Refcount test failed, i %u, error %u.\n", i, GetLastError() ); + if (!ret) return; + } + if (refcount != ~0u) + { + ret = FreeLibrary( mod ); + ok( !ret && GetLastError() == ERROR_MOD_NOT_FOUND, "Refcount test failed, ret %d, error %u.\n", + ret, GetLastError() ); + } +} + +static void test_LdrGetDllHandleEx(void) +{ + HMODULE mod, loaded_mod; + UNICODE_STRING name; + NTSTATUS status; + unsigned int i; + + if (!pLdrGetDllHandleEx) + { + win_skip( "LdrGetDllHandleEx is not available.\n" ); + return; + } + + RtlInitUnicodeString( &name, L"unknown.dll" ); + status = pLdrGetDllHandleEx( 0, NULL, NULL, &name, &mod ); + ok( status == STATUS_DLL_NOT_FOUND, "Got unexpected status %#x.\n", status ); + + RtlInitUnicodeString( &name, L"authz.dll" ); + loaded_mod = LoadLibraryW( name.Buffer ); + ok( !!loaded_mod, "Failed to load module.\n" ); + status = pLdrGetDllHandleEx( 0, NULL, NULL, &name, &mod ); + ok( !status, "Got unexpected status %#x.\n", status ); + ok( mod == loaded_mod, "got %p\n", mod ); + winetest_push_context( "Flags 0" ); + check_refcount( loaded_mod, 2 ); + winetest_pop_context(); + + loaded_mod = LoadLibraryW( name.Buffer ); + ok( !!loaded_mod, "Failed to load module.\n" ); + status = pLdrGetDllHandleEx( LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, NULL, + NULL, &name, &mod ); + ok( !status, "Got unexpected status %#x.\n", status ); + ok( mod == loaded_mod, "got %p\n", mod ); + winetest_push_context( "LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT" ); + check_refcount( loaded_mod, 1 ); + winetest_pop_context(); + + loaded_mod = LoadLibraryW( name.Buffer ); + ok( !!loaded_mod, "Failed to load module.\n" ); + status = pLdrGetDllHandle( NULL, ~0u, &name, &mod ); + ok( !status, "Got unexpected status %#x.\n", status ); + ok( mod == loaded_mod, "got %p\n", mod ); + winetest_push_context( "LdrGetDllHandle" ); + check_refcount( loaded_mod, 1 ); + winetest_pop_context(); + + loaded_mod = LoadLibraryW( name.Buffer ); + ok( !!loaded_mod, "Failed to load module.\n" ); + status = pLdrGetDllHandleEx( 4, NULL, NULL, (void *)&name, &mod ); + ok( !status, "Got unexpected status %#x.\n", status ); + ok( mod == loaded_mod, "got %p\n", mod ); + winetest_push_context( "Flag 4" ); + check_refcount( loaded_mod, 2 ); + winetest_pop_context(); + + for (i = 3; i < 32; ++i) + { + loaded_mod = LoadLibraryW( name.Buffer ); + ok( !!loaded_mod, "Failed to load module.\n" ); + status = pLdrGetDllHandleEx( 1 << i, NULL, NULL, &name, &mod ); + ok( status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status ); + winetest_push_context( "Invalid flags, i %u", i ); + check_refcount( loaded_mod, 1 ); + winetest_pop_context(); + } + + status = pLdrGetDllHandleEx( LDR_GET_DLL_HANDLE_EX_FLAG_PIN | LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, + NULL, NULL, &name, &mod ); + ok( status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status ); + + loaded_mod = LoadLibraryW( name.Buffer ); + ok( !!loaded_mod, "Failed to load module.\n" ); + status = pLdrGetDllHandleEx( LDR_GET_DLL_HANDLE_EX_FLAG_PIN, NULL, + NULL, &name, &mod ); + ok( !status, "Got unexpected status %#x.\n", status ); + ok( mod == loaded_mod, "got %p\n", mod ); + winetest_push_context( "LDR_GET_DLL_HANDLE_EX_FLAG_PIN" ); + check_refcount( loaded_mod, ~0u ); + winetest_pop_context(); +} + START_TEST(module) { WCHAR filenameW[MAX_PATH]; @@ -1175,4 +1281,5 @@ START_TEST(module) testK32GetModuleInformation(); test_AddDllDirectory(); test_SetDefaultDllDirectories(); + test_LdrGetDllHandleEx(); } diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 819cf51b9fc..3e3f991eba2 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2996,16 +2996,33 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags, /****************************************************************** - * LdrGetDllHandle (NTDLL.@) + * LdrGetDllHandleEx (NTDLL.@) */ -NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_STRING *name, HMODULE *base ) +NTSTATUS WINAPI LdrGetDllHandleEx( ULONG flags, LPCWSTR load_path, ULONG *dll_characteristics, + const UNICODE_STRING *name, HMODULE *base ) { - NTSTATUS status; + static const ULONG supported_flags = LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT + | LDR_GET_DLL_HANDLE_EX_FLAG_PIN; + static const ULONG valid_flags = LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT + | LDR_GET_DLL_HANDLE_EX_FLAG_PIN | 4; + SECTION_IMAGE_INFORMATION image_info; UNICODE_STRING nt_name; + struct file_id id; + NTSTATUS status; WINE_MODREF *wm; HANDLE mapping; - SECTION_IMAGE_INFORMATION image_info; - struct file_id id; + + TRACE( "flag %#x, load_path %p, dll_characteristics %p, name %p, base %p.\n", + flags, load_path, dll_characteristics, name, base ); + + if (flags & ~valid_flags) return STATUS_INVALID_PARAMETER; + + if ((flags & (LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT | LDR_GET_DLL_HANDLE_EX_FLAG_PIN)) + == (LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT | LDR_GET_DLL_HANDLE_EX_FLAG_PIN)) + return STATUS_INVALID_PARAMETER; + + if (flags & ~supported_flags) FIXME( "Unsupported flags %#x.\n", flags ); + if (dll_characteristics) FIXME( "dll_characteristics unsupported.\n" ); RtlEnterCriticalSection( &loader_section ); @@ -3019,12 +3036,29 @@ NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_S } RtlFreeUnicodeString( &nt_name ); + if (!status) + { + if (flags & LDR_GET_DLL_HANDLE_EX_FLAG_PIN) + LdrAddRefDll( LDR_ADDREF_DLL_PIN, *base ); + else if (!(flags & LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) + LdrAddRefDll( 0, *base ); + } + RtlLeaveCriticalSection( &loader_section ); TRACE( "%s -> %p (load path %s)\n", debugstr_us(name), status ? NULL : *base, debugstr_w(load_path) ); return status; } +/****************************************************************** + * LdrGetDllHandle (NTDLL.@) + */ +NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_STRING *name, HMODULE *base ) +{ + return LdrGetDllHandleEx( LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, load_path, NULL, name, base ); +} + + /****************************************************************** * LdrAddRefDll (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 9837b09fd51..0f8ddbea669 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -88,6 +88,7 @@ @ stub LdrFlushAlternateResourceModules @ stdcall LdrGetDllDirectory(ptr) @ stdcall LdrGetDllHandle(wstr long ptr ptr) +@ stdcall LdrGetDllHandleEx(long ptr ptr ptr ptr) # @ stub LdrGetDllHandleEx @ stdcall LdrGetDllPath(wstr long ptr ptr) @ stdcall LdrGetProcedureAddress(ptr ptr long ptr) diff --git a/include/winternl.h b/include/winternl.h index 9e96591ad8e..7a3a5e94702 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3380,6 +3380,10 @@ typedef void (CALLBACK *PLDR_DLL_NOTIFICATION_FUNCTION)(ULONG, LDR_DLL_NOTIFICAT /* flag for LdrAddRefDll */ #define LDR_ADDREF_DLL_PIN 0x00000001 +/* flags for LdrGetDllHandleEx */ +#define LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT 0x00000001 +#define LDR_GET_DLL_HANDLE_EX_FLAG_PIN 0x00000002 + #define LDR_DLL_NOTIFICATION_REASON_LOADED 1 #define LDR_DLL_NOTIFICATION_REASON_UNLOADED 2 @@ -3778,6 +3782,7 @@ NTSYSAPI NTSTATUS WINAPI LdrFindResourceDirectory_U(HMODULE,const LDR_RESOURCE_ NTSYSAPI NTSTATUS WINAPI LdrFindResource_U(HMODULE,const LDR_RESOURCE_INFO*,ULONG,const IMAGE_RESOURCE_DATA_ENTRY**); NTSYSAPI NTSTATUS WINAPI LdrGetDllDirectory(UNICODE_STRING*); NTSYSAPI NTSTATUS WINAPI LdrGetDllHandle(LPCWSTR, ULONG, const UNICODE_STRING*, HMODULE*); +NTSYSAPI NTSTATUS WINAPI LdrGetDllHandleEx(ULONG, LPCWSTR, ULONG *, const UNICODE_STRING*, HMODULE*); NTSYSAPI NTSTATUS WINAPI LdrGetDllPath(PCWSTR,ULONG,PWSTR*,PWSTR*); NTSYSAPI NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE, const ANSI_STRING*, ULONG, void**); NTSYSAPI NTSTATUS WINAPI LdrLoadDll(LPCWSTR, DWORD, const UNICODE_STRING*, HMODULE*); -- 2.31.1

2 3

[PATCH 9/9] gdi32: Move __wine_get_wgl_driver to driver.c.
by Jacek Caban Sept. 27, 2021

Sept. 27, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/driver.c | 17 +++++++++++++++++ dlls/gdi32/opengl.c | 18 ------------------ 2 files changed, 17 insertions(+), 18 deletions(-)

2 1