February 2019 - Wine-Commits

Alexandre Julliard : Merge branch 'lxr'.
by Alexandre Julliard Feb. 10, 2019

Feb. 10, 2019

Module: tools Branch: master Commit: 2f3cdf445736def27c55255b6638767682b3f015 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2f3cdf445736def27c55255… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Feb 10 17:04:18 2019 +0100 Merge branch 'lxr'. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> ---

1 0

Nikolay Sivov : dwrite: Store outline offset as a vector.
by Alexandre Julliard Feb. 8, 2019

Feb. 8, 2019

Module: wine Branch: master Commit: 215ad4e99ec7285050850782b2523af9a0d33c89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=215ad4e99ec7285050850782… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 8 11:59:15 2019 +0300 dwrite: Store outline offset as a vector. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/freetype.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 29acb5e..58cad41 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -317,17 +317,16 @@ BOOL freetype_is_monospaced(IDWriteFontFace4 *fontface) struct decompose_context { IDWriteGeometrySink *sink; - FLOAT xoffset; - FLOAT yoffset; + D2D1_POINT_2F offset; BOOL figure_started; BOOL move_to; /* last call was 'move_to' */ FT_Vector origin; /* 'pen' position from last call */ }; -static inline void ft_vector_to_d2d_point(const FT_Vector *v, FLOAT xoffset, FLOAT yoffset, D2D1_POINT_2F *p) +static inline void ft_vector_to_d2d_point(const FT_Vector *v, D2D1_POINT_2F offset, D2D1_POINT_2F *p) { - p->x = (v->x / 64.0f) + xoffset; - p->y = (v->y / 64.0f) + yoffset; + p->x = (v->x / 64.0f) + offset.x; + p->y = (v->y / 64.0f) + offset.y; } static void decompose_beginfigure(struct decompose_context *ctxt) @@ -337,7 +336,7 @@ static void decompose_beginfigure(struct decompose_context *ctxt) if (!ctxt->move_to) return; - ft_vector_to_d2d_point(&ctxt->origin, ctxt->xoffset, ctxt->yoffset, &point); + ft_vector_to_d2d_point(&ctxt->origin, ctxt->offset, &point); ID2D1SimplifiedGeometrySink_BeginFigure(ctxt->sink, point, D2D1_FIGURE_BEGIN_FILLED); ctxt->figure_started = TRUE; @@ -369,7 +368,7 @@ static int decompose_line_to(const FT_Vector *to, void *user) decompose_beginfigure(ctxt); - ft_vector_to_d2d_point(to, ctxt->xoffset, ctxt->yoffset, &point); + ft_vector_to_d2d_point(to, ctxt->offset, &point); ID2D1SimplifiedGeometrySink_AddLines(ctxt->sink, &point, 1); ctxt->origin = *to; @@ -414,9 +413,9 @@ static int decompose_conic_to(const FT_Vector *control, const FT_Vector *to, voi cubic[1].y += (to->y + 1) / 3; cubic[2] = *to; - ft_vector_to_d2d_point(cubic, ctxt->xoffset, ctxt->yoffset, points); - ft_vector_to_d2d_point(cubic + 1, ctxt->xoffset, ctxt->yoffset, points + 1); - ft_vector_to_d2d_point(cubic + 2, ctxt->xoffset, ctxt->yoffset, points + 2); + ft_vector_to_d2d_point(cubic, ctxt->offset, points); + ft_vector_to_d2d_point(cubic + 1, ctxt->offset, points + 1); + ft_vector_to_d2d_point(cubic + 2, ctxt->offset, points + 2); ID2D1SimplifiedGeometrySink_AddBeziers(ctxt->sink, (D2D1_BEZIER_SEGMENT*)points, 1); ctxt->origin = *to; return 0; @@ -430,9 +429,9 @@ static int decompose_cubic_to(const FT_Vector *control1, const FT_Vector *contro decompose_beginfigure(ctxt); - ft_vector_to_d2d_point(control1, ctxt->xoffset, ctxt->yoffset, points); - ft_vector_to_d2d_point(control2, ctxt->xoffset, ctxt->yoffset, points + 1); - ft_vector_to_d2d_point(to, ctxt->xoffset, ctxt->yoffset, points + 2); + ft_vector_to_d2d_point(control1, ctxt->offset, points); + ft_vector_to_d2d_point(control2, ctxt->offset, points + 1); + ft_vector_to_d2d_point(to, ctxt->offset, points + 2); ID2D1SimplifiedGeometrySink_AddBeziers(ctxt->sink, (D2D1_BEZIER_SEGMENT*)points, 1); ctxt->origin = *to; return 0; @@ -451,8 +450,7 @@ static void decompose_outline(FT_Outline *outline, D2D1_POINT_2F offset, IDWrite struct decompose_context context; context.sink = sink; - context.xoffset = offset.x; - context.yoffset = offset.y; + context.offset = offset; context.figure_started = FALSE; context.move_to = FALSE; context.origin.x = 0;

1 0

Jacek Caban : mshtml: Support custom user agent strings in IOmNavigator:: get_appVersion.
by Alexandre Julliard Feb. 8, 2019

Feb. 8, 2019

Module: wine Branch: master Commit: 91321d97cfc25877d643ab6e244e6b5fe2961fa5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91321d97cfc25877d643ab6e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 8 17:37:25 2019 +0100 mshtml: Support custom user agent strings in IOmNavigator::get_appVersion. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/omnavigator.c | 11 ++++++----- dlls/mshtml/tests/dom.c | 12 ++++++++++++ 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index a6c66d1..e0b8f73 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -1008,6 +1008,7 @@ static HRESULT WINAPI OmNavigator_get_appVersion(IOmNavigator *iface, BSTR *p) char user_agent[512]; DWORD size; HRESULT hres; + const unsigned skip_prefix = 8; /* strlen("Mozilla/") */ TRACE("(%p)->(%p)\n", This, p); @@ -1016,17 +1017,17 @@ static HRESULT WINAPI OmNavigator_get_appVersion(IOmNavigator *iface, BSTR *p) if(FAILED(hres)) return hres; - if(strncmp(user_agent, "Mozilla/", 8)) { - FIXME("Unsupported user agent\n"); - return E_FAIL; + if(size <= skip_prefix) { + *p = NULL; + return S_OK; } - size = MultiByteToWideChar(CP_ACP, 0, user_agent+8, -1, NULL, 0); + size = MultiByteToWideChar(CP_ACP, 0, user_agent + skip_prefix, -1, NULL, 0); *p = SysAllocStringLen(NULL, size-1); if(!*p) return E_OUTOFMEMORY; - MultiByteToWideChar(CP_ACP, 0, user_agent+8, -1, *p, size); + MultiByteToWideChar(CP_ACP, 0, user_agent + skip_prefix, -1, *p, size); return S_OK; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 69b6206..8f82299 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6228,6 +6228,7 @@ static void test_navigator(IHTMLDocument2 *doc) HRESULT hres; static const WCHAR v40[] = {'4','.','0'}; + static char ua[] = "1234567890xxxABC"; hres = IHTMLDocument2_get_parentWindow(doc, &window); ok(hres == S_OK, "parentWidnow failed: %08x\n", hres); @@ -6336,6 +6337,17 @@ static void test_navigator(IHTMLDocument2 *doc) skip("nonstandard user agent\n"); } + hres = UrlMkSetSessionOption(URLMON_OPTION_USERAGENT, ua, sizeof(ua), 0); + ok(hres == S_OK, "UrlMkSetSessionOption failed: %08x\n", hres); + + hres = IOmNavigator_get_appVersion(navigator, &bstr); + ok(hres == S_OK, "get_appVersion failed: %08x\n", hres); + ok(!strcmp_wa(bstr, ua+8), "appVersion returned %s, expected \"%s\"\n", wine_dbgstr_w(bstr), buf+8); + SysFreeString(bstr); + + hres = UrlMkSetSessionOption(URLMON_OPTION_USERAGENT, buf, strlen(buf), 0); + ok(hres == S_OK, "UrlMkSetSessionOption failed: %08x\n", hres); + bstr = NULL; hres = IOmNavigator_get_appMinorVersion(navigator, &bstr); ok(hres == S_OK, "get_appMonorVersion failed: %08x\n", hres);

1 0

Jacek Caban : ntoskrnl.exe: Add PsReferenceProcessFilePointer stub.
by Alexandre Julliard Feb. 8, 2019

Feb. 8, 2019

Module: wine Branch: master Commit: 6b50fa3161201e6608b9386bd0d039701ab14052 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b50fa3161201e6608b9386b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 8 17:00:33 2019 +0100 ntoskrnl.exe: Add PsReferenceProcessFilePointer stub. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 2 files changed, 11 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index aa569d5..4b62660 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2789,6 +2789,16 @@ NTSTATUS WINAPI PsRemoveCreateThreadNotifyRoutine( PCREATE_THREAD_NOTIFY_ROUTINE /*********************************************************************** + * PsReferenceProcessFilePointer (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI PsReferenceProcessFilePointer(PEPROCESS process, FILE_OBJECT **file) +{ + FIXME("%p %p\n", process, file); + return STATUS_NOT_IMPLEMENTED; +} + + +/*********************************************************************** * PsTerminateSystemThread (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS status) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index c274966..d087422 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -917,6 +917,7 @@ @ stub PsProcessType @ stub PsReferenceImpersonationToken @ stub PsReferencePrimaryToken +@ stdcall PsReferenceProcessFilePointer(ptr ptr) @ stdcall PsReleaseProcessExitSynchronization(ptr) @ stdcall PsRemoveCreateThreadNotifyRoutine(ptr) @ stdcall PsRemoveLoadImageNotifyRoutine(ptr)

1 0

Józef Kucia : d3d11: Avoid using wined3d_stream_output_element for validation.
by Alexandre Julliard Feb. 8, 2019

Feb. 8, 2019

Module: wine Branch: master Commit: 04ed44a52cee346862c9bd081896e44407923c4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=04ed44a52cee346862c9bd08… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 7 18:26:18 2019 +0100 d3d11: Avoid using wined3d_stream_output_element for validation. Validate D3D11_SO_DECLARATION_ENTRY directly. 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/d3d11/shader.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 3f5c6e1..455ff9f 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -1124,9 +1124,9 @@ static HRESULT wined3d_so_elements_from_d3d11_so_entries(struct wined3d_stream_o WARN("Invalid semantic idx %u for stream output gap.\n", f->SemanticIndex); return E_INVALIDARG; } - if (e->component_idx || !e->component_count) + if (f->StartComponent || !f->ComponentCount) { - WARN("Invalid stream output gap %u-%u.\n", e->component_idx, e->component_count); + WARN("Invalid stream output gap %u-%u.\n", f->StartComponent, f->ComponentCount); return E_INVALIDARG; } @@ -1134,10 +1134,10 @@ static HRESULT wined3d_so_elements_from_d3d11_so_entries(struct wined3d_stream_o } else if ((output = shader_find_signature_element(os, f->SemanticName, f->SemanticIndex, f->Stream))) { - if (e->component_idx > 3 || e->component_count > 4 || !e->component_count - || e->component_idx + e->component_count > 4) + if (f->StartComponent > 3 || f->ComponentCount > 4 || !f->ComponentCount + || f->StartComponent + f->ComponentCount > 4) { - WARN("Invalid component range %u-%u.\n", e->component_idx, e->component_count); + WARN("Invalid component range %u-%u.\n", f->StartComponent, f->ComponentCount); return E_INVALIDARG; } @@ -1168,17 +1168,21 @@ static HRESULT wined3d_so_elements_from_d3d11_so_entries(struct wined3d_stream_o for (i = 0; i < entry_count; ++i) { - const struct wined3d_stream_output_element *e1 = &elements[i]; - if (e1->register_idx == WINED3D_STREAM_OUTPUT_GAP) + const D3D11_SO_DECLARATION_ENTRY *e1 = &entries[i]; + if (!e1->SemanticName) /* gap */ continue; for (j = i + 1; j < entry_count; ++j) { - const struct wined3d_stream_output_element *e2 = &elements[j]; + const D3D11_SO_DECLARATION_ENTRY *e2 = &entries[j]; + if (!e2->SemanticName) /* gap */ + continue; - if (e1->register_idx == e2->register_idx - && e1->component_idx < e2->component_idx + e2->component_count - && e1->component_idx + e1->component_count > e2->component_idx) + if (e1->Stream == e2->Stream + && !strcasecmp(e1->SemanticName, e2->SemanticName) + && e1->SemanticIndex == e2->SemanticIndex + && e1->StartComponent < e2->StartComponent + e2->ComponentCount + && e1->StartComponent + e1->ComponentCount > e2->StartComponent) { WARN("Stream output elements %u and %u overlap.\n", i, j); return E_INVALIDARG; @@ -1194,14 +1198,14 @@ static HRESULT wined3d_so_elements_from_d3d11_so_entries(struct wined3d_stream_o for (j = 0; j < entry_count; ++j) { - const struct wined3d_stream_output_element *e = &elements[j]; + const D3D11_SO_DECLARATION_ENTRY *e = &entries[j]; - if (e->stream_idx != i) + if (e->Stream != i) continue; - current_stride[e->output_slot] += 4 * e->component_count; - ++element_count[e->output_slot]; - if (e->register_idx == WINED3D_STREAM_OUTPUT_GAP) - ++gap_count[e->output_slot]; + current_stride[e->OutputSlot] += 4 * e->ComponentCount; + ++element_count[e->OutputSlot]; + if (!e->SemanticName) + ++gap_count[e->OutputSlot]; } for (j = 0; j < D3D11_SO_BUFFER_SLOT_COUNT; ++j)

1 0

Alexandre Julliard : ntdll: Remove no longer used parameter from find_fileid_module().
by Alexandre Julliard Feb. 8, 2019

Feb. 8, 2019

Module: wine Branch: master Commit: f7b3120991df02ecaa975c18c6421fedb48ae731 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7b3120991df02ecaa975c18… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 8 23:00:27 2019 +0100 ntdll: Remove no longer used parameter from find_fileid_module(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index f017651..e7a9c2c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -464,7 +464,7 @@ static WINE_MODREF *find_fullname_module( const UNICODE_STRING *nt_name ) * Find a module from its file id. * The loader_section must be locked while calling this function */ -static WINE_MODREF *find_fileid_module( HANDLE handle, struct stat *st ) +static WINE_MODREF *find_fileid_module( struct stat *st ) { LIST_ENTRY *mark, *entry; @@ -2368,7 +2368,7 @@ static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, struct { fstat( fd, st ); if (needs_close) close( fd ); - if ((*pwm = find_fileid_module( handle, st ))) + if ((*pwm = find_fileid_module( st ))) { TRACE( "%s is the same file as existing module %p %s\n", debugstr_w( nt_name->Buffer ), (*pwm)->ldr.BaseAddress, debugstr_w( (*pwm)->ldr.FullDllName.Buffer ));

1 0

Alexandre Julliard : ntdll: Use NT filenames when loading dlls.
by Alexandre Julliard Feb. 8, 2019

Feb. 8, 2019

Module: wine Branch: master Commit: dc40bc85bc01b24951edb128eee11a9b740652fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc40bc85bc01b24951edb128… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 8 12:49:47 2019 +0100 ntdll: Use NT filenames when loading dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 108 +++++++++++++++++++++++++--------------------------- 1 file changed, 52 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dc40bc85bc01b24951ed…

1 0

Alexandre Julliard : ntdll: Pass an NT filename to get_load_order().
by Alexandre Julliard Feb. 8, 2019

Feb. 8, 2019

Module: wine Branch: master Commit: e24b16247d156542b209ae1d08e2c366eee3071a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e24b16247d156542b209ae1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 8 22:07:54 2019 +0100 ntdll: Pass an NT filename to get_load_order(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- dlls/ntdll/loadorder.c | 5 ++++- dlls/ntdll/ntdll_misc.h | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 0d8fc57..7e26098 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2546,7 +2546,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ filename = nt_name.Buffer + 4; /* \??\ prefix */ main_exe = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); - loadorder = get_load_order( main_exe ? main_exe->ldr.BaseDllName.Buffer : NULL, filename ); + loadorder = get_load_order( main_exe ? main_exe->ldr.BaseDllName.Buffer : NULL, &nt_name ); if (handle && is_fake_dll( handle )) { diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c index c6c0245..b965b96 100644 --- a/dlls/ntdll/loadorder.c +++ b/dlls/ntdll/loadorder.c @@ -429,16 +429,19 @@ static enum loadorder get_load_order_value( HANDLE std_key, HANDLE app_key, cons * Return the loadorder of a module. * The system directory and '.dll' extension is stripped from the path. */ -enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path ) +enum loadorder get_load_order( const WCHAR *app_name, const UNICODE_STRING *nt_name ) { + static const WCHAR nt_prefixW[] = {'\\','?','?','\\',0}; enum loadorder ret = LO_INVALID; HANDLE std_key, app_key = 0; + const WCHAR *path = nt_name->Buffer; WCHAR *module, *basename; int len; if (!init_done) init_load_order(); std_key = get_standard_key(); if (app_name) app_key = get_app_key( app_name ); + if (!strncmpW( path, nt_prefixW, 4 )) path += 4; TRACE("looking for %s\n", debugstr_w(path)); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 1630978..5b32abc 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -216,7 +216,7 @@ enum loadorder LO_DEFAULT /* nothing specified, use default strategy */ }; -extern enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path ) DECLSPEC_HIDDEN; +extern enum loadorder get_load_order( const WCHAR *app_name, const UNICODE_STRING *nt_name ) DECLSPEC_HIDDEN; struct debug_info {

1 0

Alexandre Julliard : ntdll: Use an NT filename to search for loaded modules.
by Alexandre Julliard Feb. 8, 2019

Feb. 8, 2019

Module: wine Branch: master Commit: a6e4c814b6647c11483b2a6beca551d503d19bb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6e4c814b6647c11483b2a6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 8 12:46:22 2019 +0100 ntdll: Use an NT filename to search for loaded modules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1f92eb0..c1e336cd 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -432,18 +432,23 @@ static WINE_MODREF *find_basename_module( LPCWSTR name ) * Find a module from its full path name. * The loader_section must be locked while calling this function */ -static WINE_MODREF *find_fullname_module( LPCWSTR name ) +static WINE_MODREF *find_fullname_module( const UNICODE_STRING *nt_name ) { PLIST_ENTRY mark, entry; + UNICODE_STRING name = *nt_name; - if (cached_modref && !strcmpiW( name, cached_modref->ldr.FullDllName.Buffer )) + if (name.Length <= 4 * sizeof(WCHAR)) return NULL; + name.Length -= 4 * sizeof(WCHAR); /* for \??\ prefix */ + name.Buffer += 4; + + if (cached_modref && RtlEqualUnicodeString( &name, &cached_modref->ldr.FullDllName, TRUE )) return cached_modref; mark = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList; for (entry = mark->Flink; entry != mark; entry = entry->Flink) { LDR_MODULE *mod = CONTAINING_RECORD(entry, LDR_MODULE, InLoadOrderModuleList); - if (!strcmpiW( name, mod->FullDllName.Buffer )) + if (RtlEqualUnicodeString( &name, &mod->FullDllName, TRUE )) { cached_modref = CONTAINING_RECORD(mod, WINE_MODREF, ldr); return cached_modref; @@ -2351,6 +2356,8 @@ static HANDLE open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, struct HANDLE handle; int fd, needs_close; + if ((*pwm = find_fullname_module( nt_name ))) return 0; + attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.Attributes = OBJ_CASE_INSENSITIVE; @@ -2434,8 +2441,6 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, if (len) { if (len >= *size) goto overflow; - if ((*pwm = find_fullname_module( filename ))) goto found; - if (!RtlDosPathNameToNtPathName_U( filename, &nt_name, NULL, NULL )) { RtlFreeHeap( GetProcessHeap(), 0, dllname ); @@ -2462,8 +2467,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, len = nt_name.Length - 4*sizeof(WCHAR); /* for \??\ prefix */ if (len >= *size) goto overflow; memcpy( filename, nt_name.Buffer + 4, len + sizeof(WCHAR) ); - if (!(*pwm = find_fullname_module( filename ))) - *handle = open_dll_file( &nt_name, pwm, st ); + *handle = open_dll_file( &nt_name, pwm, st ); found: RtlFreeUnicodeString( &nt_name );

1 0

Alistair Leslie-Hughes : secur32: Fix compile error on older gnutls.
by Alexandre Julliard Feb. 8, 2019

Feb. 8, 2019

Module: wine Branch: master Commit: 9bbe5c361312034c708618f2e01d7272e4fae2e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bbe5c361312034c708618f2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 8 11:07:50 2019 +0000 secur32: Fix compile error on older gnutls. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index ddb10ac..ea116e81 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -51,6 +51,13 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); /* Not present in gnutls version < 2.9.10. */ static int (*pgnutls_cipher_get_block_size)(gnutls_cipher_algorithm_t); +/* Not present in gnutls version < 3.3.0. */ +static int (*pgnutls_privkey_import_rsa_raw)(gnutls_privkey_t, const gnutls_datum_t *, + const gnutls_datum_t *, const gnutls_datum_t *, + const gnutls_datum_t *, const gnutls_datum_t *, + const gnutls_datum_t *, const gnutls_datum_t *, + const gnutls_datum_t *); + /* Not present in gnutls version < 3.4.0. */ static int (*pgnutls_privkey_export_x509)(gnutls_privkey_t, gnutls_x509_privkey_t *); @@ -79,7 +86,6 @@ MAKE_FUNCPTR(gnutls_perror); MAKE_FUNCPTR(gnutls_protocol_get_version); MAKE_FUNCPTR(gnutls_priority_set_direct); MAKE_FUNCPTR(gnutls_privkey_deinit); -MAKE_FUNCPTR(gnutls_privkey_import_rsa_raw); MAKE_FUNCPTR(gnutls_privkey_init); MAKE_FUNCPTR(gnutls_record_get_max_size); MAKE_FUNCPTR(gnutls_record_recv); @@ -138,6 +144,16 @@ static int compat_gnutls_privkey_export_x509(gnutls_privkey_t privkey, gnutls_x5 return GNUTLS_E_UNKNOWN_PK_ALGORITHM; } +static int compat_gnutls_privkey_import_rsa_raw(gnutls_privkey_t key, const gnutls_datum_t *p1, + const gnutls_datum_t *p2, const gnutls_datum_t *p3, + const gnutls_datum_t *p4, const gnutls_datum_t *p5, + const gnutls_datum_t *p6, const gnutls_datum_t *p7, + const gnutls_datum_t *p8) +{ + FIXME("\n"); + return GNUTLS_E_UNKNOWN_PK_ALGORITHM; +} + static ssize_t schan_pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t buff_len) { @@ -897,7 +913,6 @@ BOOL schan_imp_init(void) LOAD_FUNCPTR(gnutls_protocol_get_version) LOAD_FUNCPTR(gnutls_priority_set_direct) LOAD_FUNCPTR(gnutls_privkey_deinit) - LOAD_FUNCPTR(gnutls_privkey_import_rsa_raw) LOAD_FUNCPTR(gnutls_privkey_init) LOAD_FUNCPTR(gnutls_record_get_max_size); LOAD_FUNCPTR(gnutls_record_recv); @@ -924,6 +939,11 @@ BOOL schan_imp_init(void) WARN("gnutls_privkey_export_x509 not found\n"); pgnutls_privkey_export_x509 = compat_gnutls_privkey_export_x509; } + if (!(pgnutls_privkey_import_rsa_raw = wine_dlsym(libgnutls_handle, "gnutls_privkey_import_rsa_raw", NULL, 0))) + { + WARN("gnutls_privkey_import_rsa_raw not found\n"); + pgnutls_privkey_import_rsa_raw = compat_gnutls_privkey_import_rsa_raw; + } ret = pgnutls_global_init(); if (ret != GNUTLS_E_SUCCESS)

1 0