October 2014 - Wine-commits

Henri Verbeet : wined3d: Get rid of surface_prepare_texture_internal().
by Alexandre Julliard 07 Oct '14

07 Oct '14

Module: wine Branch: master Commit: bd1afdb3c33d5e398b1105372a59380a26d65524 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd1afdb3c33d5e398b1105372… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 7 08:41:16 2014 +0200 wined3d: Get rid of surface_prepare_texture_internal(). --- dlls/wined3d/surface.c | 49 ++++++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 179dd19..ff7759f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3217,50 +3217,45 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb) } /* Context activation is done by the caller. */ -static void surface_prepare_texture_internal(struct wined3d_surface *surface, - struct wined3d_context *context, BOOL srgb) +void surface_prepare_texture(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) { - const struct wined3d_format *format = surface->container->resource.format; + struct wined3d_texture *texture = surface->container; DWORD alloc_flag = srgb ? SFLAG_SRGBALLOCATED : SFLAG_ALLOCATED; + const struct wined3d_format *format = texture->resource.format; + UINT sub_count = texture->level_count * texture->layer_count; const struct wined3d_color_key_conversion *conversion; + BOOL converted = FALSE; + UINT i; - if (surface->flags & alloc_flag) return; + TRACE("surface %p is a subresource of texture %p.\n", surface, texture); if (format->convert) { - surface->flags |= SFLAG_CONVERTED; + converted = TRUE; } - else if ((conversion = d3dfmt_get_conv(surface->container, TRUE))) + else if ((conversion = d3dfmt_get_conv(texture, TRUE))) { - surface->flags |= SFLAG_CONVERTED; + converted = TRUE; format = wined3d_get_format(context->gl_info, conversion->dst_format); } - else - { - surface->flags &= ~SFLAG_CONVERTED; - } - - wined3d_texture_bind_and_dirtify(surface->container, context, srgb); - surface_allocate_surface(surface, context->gl_info, format, srgb); - surface->flags |= alloc_flag; -} -/* Context activation is done by the caller. */ -void surface_prepare_texture(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) -{ - struct wined3d_texture *texture = surface->container; - UINT sub_count = texture->level_count * texture->layer_count; - UINT i; - - TRACE("surface %p is a subresource of texture %p.\n", surface, texture); + wined3d_texture_bind_and_dirtify(texture, context, srgb); for (i = 0; i < sub_count; ++i) { struct wined3d_surface *s = surface_from_resource(texture->sub_resources[i]); - surface_prepare_texture_internal(s, context, srgb); - } - return; + if (s->flags & alloc_flag) + continue; + + if (converted) + s->flags |= SFLAG_CONVERTED; + else + s->flags &= ~SFLAG_CONVERTED; + + surface_allocate_surface(s, context->gl_info, format, srgb); + s->flags |= alloc_flag; + } } void surface_prepare_rb(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, BOOL multisample)

1 0

Stefan Dösinger : d3d9/tests: Don' t load user32 functions at runtime.
by Alexandre Julliard 07 Oct '14

07 Oct '14

Module: wine Branch: master Commit: 537febf2e86514feb0c75a6f8ba3896e057e7e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=537febf2e86514feb0c75a6f8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 7 15:11:07 2014 +0200 d3d9/tests: Don't load user32 functions at runtime. --- dlls/d3d9/tests/d3d9ex.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 0309013..582538f 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -23,18 +23,11 @@ #define COBJMACROS #include "wine/test.h" -#include "winuser.h" -#include "wingdi.h" #include <initguid.h> #include <d3d9.h> static HMODULE d3d9_handle = 0; -static BOOL (WINAPI *pEnumDisplaySettingsExA)(const char *device_name, - DWORD mode_idx, DEVMODEA *mode, DWORD flags); -static LONG (WINAPI *pChangeDisplaySettingsExA)(const char *device_name, - DEVMODEA *mode, HWND window, DWORD flags, void *param); - static HRESULT (WINAPI *pDirect3DCreate9Ex)(UINT SDKVersion, IDirect3D9Ex **d3d9ex); static HWND create_window(void) @@ -420,8 +413,7 @@ static void test_get_adapter_displaymode_ex(void) D3DDISPLAYMODE mode; D3DDISPLAYMODEEX mode_ex; D3DDISPLAYROTATION rotation; - HANDLE hdll; - DEVMODEA startmode; + DEVMODEW startmode; LONG retval; hr = pDirect3DCreate9Ex(D3D_SDK_VERSION, &d3d9ex); @@ -447,22 +439,16 @@ static void test_get_adapter_displaymode_ex(void) hr); ok(d3d9 != NULL && d3d9 != (void *) 0xdeadbeef, "QueryInterface returned interface %p, expected != NULL && != 0xdeadbeef\n", d3d9); - /* change displayorientation*/ - hdll = GetModuleHandleA("user32.dll"); - pEnumDisplaySettingsExA = (void*)GetProcAddress(hdll, "EnumDisplaySettingsExA"); - pChangeDisplaySettingsExA = (void*)GetProcAddress(hdll, "ChangeDisplaySettingsExA"); - - if (!pEnumDisplaySettingsExA || !pChangeDisplaySettingsExA) goto out; memset(&startmode, 0, sizeof(startmode)); startmode.dmSize = sizeof(startmode); - retval = pEnumDisplaySettingsExA(NULL, ENUM_CURRENT_SETTINGS, &startmode, 0); + retval = EnumDisplaySettingsExW(NULL, ENUM_CURRENT_SETTINGS, &startmode, 0); ok(retval, "Failed to retrieve current display mode, retval %d.\n", retval); if (!retval) goto out; startmode.dmFields = DM_DISPLAYORIENTATION | DM_PELSWIDTH | DM_PELSHEIGHT; S2(U1(startmode)).dmDisplayOrientation = DMDO_180; - retval = pChangeDisplaySettingsExA(NULL, &startmode, NULL, 0, NULL); + retval = ChangeDisplaySettingsExW(NULL, &startmode, NULL, 0, NULL); if(retval == DISP_CHANGE_BADMODE) { @@ -474,7 +460,7 @@ static void test_get_adapter_displaymode_ex(void) /* try retrieve orientation info with EnumDisplaySettingsEx*/ startmode.dmFields = 0; S2(U1(startmode)).dmDisplayOrientation = 0; - ok(pEnumDisplaySettingsExA(NULL, ENUM_CURRENT_SETTINGS, &startmode, EDS_ROTATEDMODE), "EnumDisplaySettingsEx failed\n"); + ok(EnumDisplaySettingsExW(NULL, ENUM_CURRENT_SETTINGS, &startmode, EDS_ROTATEDMODE), "EnumDisplaySettingsEx failed\n"); /*now that orientation has changed start tests for GetAdapterDisplayModeEx: invalid Size*/ memset(&mode_ex, 0, sizeof(mode_ex)); @@ -528,7 +514,7 @@ static void test_get_adapter_displaymode_ex(void) ok(mode_ex.ScanLineOrdering != 0, "ScanLineOrdering returned 0\n"); /* return to the default mode */ - pChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + ChangeDisplaySettingsExW(NULL, NULL, NULL, 0, NULL); out: IDirect3D9_Release(d3d9); IDirect3D9Ex_Release(d3d9ex);

1 0

Nikolay Sivov : dwmapi: Added DwmAttachMilContent() and DwmDetachMilContent() stubs.
by Alexandre Julliard 07 Oct '14

07 Oct '14

Module: wine Branch: master Commit: fb36148f47874d911bd00adc3691a9c447a4a4d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb36148f47874d911bd00adc3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 7 14:57:15 2014 +0400 dwmapi: Added DwmAttachMilContent() and DwmDetachMilContent() stubs. --- dlls/dwmapi/dwmapi.spec | 4 ++-- dlls/dwmapi/dwmapi_main.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 764f04c..e83ee22 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -20,9 +20,9 @@ 119 stub @ 120 stub @ -@ stub DwmAttachMilContent +@ stdcall DwmAttachMilContent(long) @ stdcall DwmDefWindowProc(long long long long ptr) -@ stub DwmDetachMilContent +@ stdcall DwmDetachMilContent(long) @ stdcall DwmEnableBlurBehindWindow(ptr ptr) @ stdcall DwmEnableMMCSS(long) @ stdcall DwmExtendFrameIntoClientArea(long ptr) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 6ee45af..d5fb03f 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -234,3 +234,21 @@ HRESULT WINAPI DwmGetCompositionTimingInfo(HWND hwnd, DWM_TIMING_INFO *info) return E_NOTIMPL; } + +/********************************************************************** + * DwmAttachMilContent (DWMAPI.@) + */ +HRESULT WINAPI DwmAttachMilContent(HWND hwnd) +{ + FIXME("(%p) stub\n", hwnd); + return E_NOTIMPL; +} + +/********************************************************************** + * DwmDetachMilContent (DWMAPI.@) + */ +HRESULT WINAPI DwmDetachMilContent(HWND hwnd) +{ + FIXME("(%p) stub\n", hwnd); + return E_NOTIMPL; +}

1 0

Jacek Caban : ieframe: Don' t crash if output parameter is NULL in WebBrowser:: get_RegisterAsDropTarget.
by Alexandre Julliard 07 Oct '14

07 Oct '14

Module: wine Branch: master Commit: 379b9f67758b9236317b902357aa474b30ba927e URL: http://source.winehq.org/git/wine.git/?a=commit;h=379b9f67758b9236317b90235… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 7 10:22:51 2014 +0200 ieframe: Don't crash if output parameter is NULL in WebBrowser::get_RegisterAsDropTarget. --- dlls/ieframe/tests/webbrowser.c | 4 ++++ dlls/ieframe/webbrowser.c | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 5973900..fa37169 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2321,6 +2321,10 @@ static void test_ie_funcs(IWebBrowser2 *wb) ok(sName!=NULL, "get_Name return a NULL string.\n"); SysFreeString(sName); + /* RegisterAsDropTarget */ + hres = IWebBrowser2_get_RegisterAsDropTarget(wb, NULL); + ok(hres == E_INVALIDARG, "get_RegisterAsDropTarget returned: %08x\n", hres); + /* Quit */ hres = IWebBrowser2_Quit(wb); diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index a3233e1..1f58bbb 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -943,7 +943,12 @@ static HRESULT WINAPI WebBrowser_get_RegisterAsDropTarget(IWebBrowser2 *iface, VARIANT_BOOL *pbRegister) { WebBrowser *This = impl_from_IWebBrowser2(iface); + FIXME("(%p)->(%p)\n", This, pbRegister); + + if(!pbRegister) + return E_INVALIDARG; + *pbRegister=0; return S_OK; }

1 0

Nikolay Sivov : msxml3: Implement 'name' and 'nodeName' properties for doctype node.
by Alexandre Julliard 07 Oct '14

07 Oct '14

Module: wine Branch: master Commit: d7eec962e2280f4cc3d11343f738ea3cac328db6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7eec962e2280f4cc3d11343f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 7 18:15:42 2014 +0400 msxml3: Implement 'name' and 'nodeName' properties for doctype node. --- dlls/msxml3/doctype.c | 8 ++++---- dlls/msxml3/tests/domdoc.c | 25 +++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/doctype.c b/dlls/msxml3/doctype.c index c045c79..322b6c2 100644 --- a/dlls/msxml3/doctype.c +++ b/dlls/msxml3/doctype.c @@ -155,8 +155,8 @@ static HRESULT WINAPI domdoctype_get_nodeName( BSTR* p ) { domdoctype *This = impl_from_IXMLDOMDocumentType( iface ); - FIXME("(%p)->(%p): stub\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return node_get_nodeName(&This->node, p); } static HRESULT WINAPI domdoctype_get_nodeValue( @@ -489,8 +489,8 @@ static HRESULT WINAPI domdoctype_get_name( BSTR *p) { domdoctype *This = impl_from_IXMLDOMDocumentType( iface ); - FIXME("(%p)->(%p): stub\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return node_get_nodeName(&This->node, p); } static HRESULT WINAPI domdoctype_get_entities( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 881679e..038df04 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8912,9 +8912,12 @@ static void test_appendChild(void) static void test_get_doctype(void) { + static const WCHAR emailW[] = {'e','m','a','i','l',0}; IXMLDOMDocumentType *doctype; IXMLDOMDocument *doc; + VARIANT_BOOL b; HRESULT hr; + BSTR s; doc = create_document(&IID_IXMLDOMDocument); @@ -8926,6 +8929,28 @@ static void test_get_doctype(void) ok(hr == S_FALSE, "got 0x%08x\n", hr); ok(doctype == NULL, "got %p\n", doctype); + hr = IXMLDOMDocument_loadXML(doc, _bstr_(szEmailXML), &b); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + + doctype = NULL; + hr = IXMLDOMDocument_get_doctype(doc, &doctype); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(doctype != NULL, "got %p\n", doctype); + + hr = IXMLDOMDocumentType_get_name(doctype, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXMLDOMDocumentType_get_name(doctype, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(emailW, s), "got name %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMDocumentType_get_nodeName(doctype, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(emailW, s), "got name %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + IXMLDOMDocumentType_Release(doctype); IXMLDOMDocument_Release(doc); }

1 0

Francois Gouget : d2d1: Make the IDWriteTextRenderer methods static.
by Alexandre Julliard 07 Oct '14

07 Oct '14

Module: wine Branch: master Commit: 9f8d22186934f1db3ff1ac2ea3b652da6fbf14a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f8d22186934f1db3ff1ac2ea… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 7 18:34:27 2014 +0200 d2d1: Make the IDWriteTextRenderer methods static. --- dlls/d2d1/render_target.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index f730e64..a50f473 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -905,7 +905,7 @@ static inline struct d2d_d3d_render_target *impl_from_IDWriteTextRenderer(IDWrit return CONTAINING_RECORD(iface, struct d2d_d3d_render_target, IDWriteTextRenderer_iface); } -HRESULT STDMETHODCALLTYPE d2d_text_renderer_QueryInterface(IDWriteTextRenderer *iface, REFIID iid, void **out) +static HRESULT STDMETHODCALLTYPE d2d_text_renderer_QueryInterface(IDWriteTextRenderer *iface, REFIID iid, void **out) { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); @@ -924,7 +924,7 @@ HRESULT STDMETHODCALLTYPE d2d_text_renderer_QueryInterface(IDWriteTextRenderer * return E_NOINTERFACE; } -ULONG STDMETHODCALLTYPE d2d_text_renderer_AddRef(IDWriteTextRenderer *iface) +static ULONG STDMETHODCALLTYPE d2d_text_renderer_AddRef(IDWriteTextRenderer *iface) { struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); @@ -933,7 +933,7 @@ ULONG STDMETHODCALLTYPE d2d_text_renderer_AddRef(IDWriteTextRenderer *iface) return d2d_d3d_render_target_AddRef(&render_target->ID2D1RenderTarget_iface); } -ULONG STDMETHODCALLTYPE d2d_text_renderer_Release(IDWriteTextRenderer *iface) +static ULONG STDMETHODCALLTYPE d2d_text_renderer_Release(IDWriteTextRenderer *iface) { struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); @@ -942,7 +942,7 @@ ULONG STDMETHODCALLTYPE d2d_text_renderer_Release(IDWriteTextRenderer *iface) return d2d_d3d_render_target_Release(&render_target->ID2D1RenderTarget_iface); } -HRESULT STDMETHODCALLTYPE d2d_text_renderer_IsPixelSnappingDisabled(IDWriteTextRenderer *iface, +static HRESULT STDMETHODCALLTYPE d2d_text_renderer_IsPixelSnappingDisabled(IDWriteTextRenderer *iface, void *ctx, BOOL *disabled) { FIXME("iface %p, ctx %p, disabled %p stub!\n", iface, ctx, disabled); @@ -950,7 +950,7 @@ HRESULT STDMETHODCALLTYPE d2d_text_renderer_IsPixelSnappingDisabled(IDWriteTextR return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE d2d_text_renderer_GetCurrentTransform(IDWriteTextRenderer *iface, +static HRESULT STDMETHODCALLTYPE d2d_text_renderer_GetCurrentTransform(IDWriteTextRenderer *iface, void *ctx, DWRITE_MATRIX *transform) { FIXME("iface %p, ctx %p, transform %p stub!\n", iface, ctx, transform); @@ -958,14 +958,14 @@ HRESULT STDMETHODCALLTYPE d2d_text_renderer_GetCurrentTransform(IDWriteTextRende return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE d2d_text_renderer_GetPixelsPerDip(IDWriteTextRenderer *iface, void *ctx, float *ppd) +static HRESULT STDMETHODCALLTYPE d2d_text_renderer_GetPixelsPerDip(IDWriteTextRenderer *iface, void *ctx, float *ppd) { FIXME("iface %p, ctx %p, ppd %p stub!\n", iface, ctx, ppd); return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRenderer *iface, void *ctx, +static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRenderer *iface, void *ctx, float baseline_origin_x, float baseline_origin_y, DWRITE_MEASURING_MODE measuring_mode, const DWRITE_GLYPH_RUN *glyph_run, const DWRITE_GLYPH_RUN_DESCRIPTION *desc, IUnknown *effect) { @@ -977,7 +977,7 @@ HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRenderer *if return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRenderer *iface, void *ctx, +static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRenderer *iface, void *ctx, float baseline_origin_x, float baseline_origin_y, const DWRITE_UNDERLINE *underline, IUnknown *effect) { FIXME("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, underline %p, effect %p stub!\n", @@ -986,7 +986,7 @@ HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRenderer *i return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawStrikethrough(IDWriteTextRenderer *iface, void *ctx, +static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawStrikethrough(IDWriteTextRenderer *iface, void *ctx, float baseline_origin_x, float baseline_origin_y, const DWRITE_STRIKETHROUGH *strikethrough, IUnknown *effect) { FIXME("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, strikethrough %p, effect %p stub!\n", @@ -995,7 +995,7 @@ HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawStrikethrough(IDWriteTextRendere return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawInlineObject(IDWriteTextRenderer *iface, void *ctx, +static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawInlineObject(IDWriteTextRenderer *iface, void *ctx, float origin_x, float origin_y, IDWriteInlineObject *object, BOOL is_sideways, BOOL is_rtl, IUnknown *effect) { FIXME("iface %p, ctx %p, origin_x %.8e, origin_y %.8e, object %p, is_sideways %#x, is_rtl %#x, effect %p stub!\n",

1 0

Sebastian Lackner : kernel32/tests: Add tests for K32GetModuleInformation.
by Alexandre Julliard 07 Oct '14

07 Oct '14

Module: wine Branch: master Commit: 9d30002f7db68fc7facf280d65d58967f081ad68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d30002f7db68fc7facf280d6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 1 15:54:51 2014 +0200 kernel32/tests: Add tests for K32GetModuleInformation. --- dlls/kernel32/tests/module.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 0d140a4..b54b4e3 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -20,12 +20,15 @@ #include "wine/test.h" #include <windows.h> +#include <psapi.h> static DWORD (WINAPI *pGetDllDirectoryA)(DWORD,LPSTR); static DWORD (WINAPI *pGetDllDirectoryW)(DWORD,LPWSTR); static BOOL (WINAPI *pSetDllDirectoryA)(LPCSTR); static BOOL (WINAPI *pGetModuleHandleExA)(DWORD,LPCSTR,HMODULE*); static BOOL (WINAPI *pGetModuleHandleExW)(DWORD,LPCWSTR,HMODULE*); +static BOOL (WINAPI *pK32GetModuleInformation)(HANDLE process, HMODULE module, + MODULEINFO *modinfo, DWORD cb); static BOOL is_unicode_enabled = TRUE; @@ -514,7 +517,20 @@ static void init_pointers(void) MAKEFUNC(SetDllDirectoryA); MAKEFUNC(GetModuleHandleExA); MAKEFUNC(GetModuleHandleExW); + MAKEFUNC(K32GetModuleInformation); #undef MAKEFUNC + + /* not all Windows versions export this in kernel32 */ + if (!pK32GetModuleInformation) + { + HMODULE hPsapi = LoadLibraryA("psapi.dll"); + if (hPsapi) + { + pK32GetModuleInformation = (void *)GetProcAddress(hPsapi, "GetModuleInformation"); + if (!pK32GetModuleInformation) FreeLibrary(hPsapi); + } + } + } static void testGetModuleHandleEx(void) @@ -696,6 +712,34 @@ static void testGetModuleHandleEx(void) FreeLibrary( mod_kernel32 ); } +static void testK32GetModuleInformation(void) +{ + MODULEINFO info; + HMODULE mod; + BOOL ret; + + if (!pK32GetModuleInformation) + { + win_skip("K32GetModuleInformation not available\n"); + return; + } + + mod = GetModuleHandleA(NULL); + memset(&info, 0xAA, sizeof(info)); + ret = pK32GetModuleInformation(GetCurrentProcess(), mod, &info, sizeof(info)); + ok(ret, "K32GetModuleInformation failed for main module\n"); + ok(info.lpBaseOfDll == mod, "Wrong info.lpBaseOfDll = %p, expected %p\n", info.lpBaseOfDll, mod); + todo_wine + ok(info.EntryPoint != NULL, "Expected nonzero entrypoint\n"); + + mod = GetModuleHandleA("kernel32.dll"); + memset(&info, 0xAA, sizeof(info)); + ret = pK32GetModuleInformation(GetCurrentProcess(), mod, &info, sizeof(info)); + ok(ret, "K32GetModuleInformation failed for kernel32 module\n"); + ok(info.lpBaseOfDll == mod, "Wrong info.lpBaseOfDll = %p, expected %p\n", info.lpBaseOfDll, mod); + ok(info.EntryPoint != NULL, "Expected nonzero entrypoint\n"); +} + START_TEST(module) { WCHAR filenameW[MAX_PATH]; @@ -724,4 +768,5 @@ START_TEST(module) testGetProcAddress_Wrong(); testLoadLibraryEx(); testGetModuleHandleEx(); + testK32GetModuleInformation(); }

1 0

Sebastian Lackner : ntdll: Set ldr.EntryPoint for main executable.
by Alexandre Julliard 07 Oct '14

07 Oct '14

Module: wine Branch: master Commit: 5272ca241b78cec4884d3dd7edca496b302b4508 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5272ca241b78cec4884d3dd7e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Aug 2 18:27:20 2014 +0200 ntdll: Set ldr.EntryPoint for main executable. --- dlls/kernel32/tests/module.c | 1 - dlls/ntdll/loader.c | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index b54b4e3..bb22c24 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -729,7 +729,6 @@ static void testK32GetModuleInformation(void) ret = pK32GetModuleInformation(GetCurrentProcess(), mod, &info, sizeof(info)); ok(ret, "K32GetModuleInformation failed for main module\n"); ok(info.lpBaseOfDll == mod, "Wrong info.lpBaseOfDll = %p, expected %p\n", info.lpBaseOfDll, mod); - todo_wine ok(info.EntryPoint != NULL, "Expected nonzero entrypoint\n"); mod = GetModuleHandleA("kernel32.dll"); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 18ae29c..3c2fc56 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -934,9 +934,10 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) else p = wm->ldr.FullDllName.Buffer; RtlInitUnicodeString( &wm->ldr.BaseDllName, p ); - if ((nt->FileHeader.Characteristics & IMAGE_FILE_DLL) && !is_dll_native_subsystem( hModule, nt, p )) + if (!(nt->FileHeader.Characteristics & IMAGE_FILE_DLL) || !is_dll_native_subsystem( hModule, nt, p )) { - wm->ldr.Flags |= LDR_IMAGE_IS_DLL; + if (nt->FileHeader.Characteristics & IMAGE_FILE_DLL) + wm->ldr.Flags |= LDR_IMAGE_IS_DLL; if (nt->OptionalHeader.AddressOfEntryPoint) wm->ldr.EntryPoint = (char *)hModule + nt->OptionalHeader.AddressOfEntryPoint; } @@ -1062,7 +1063,7 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved if (wm->ldr.Flags & LDR_DONT_RESOLVE_REFS) return STATUS_SUCCESS; if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.BaseAddress, reason ); - if (!entry) return STATUS_SUCCESS; + if (!entry || !(wm->ldr.Flags & LDR_IMAGE_IS_DLL)) return STATUS_SUCCESS; if (TRACE_ON(relay)) {

1 0

André Hentschel : winhttp/tests: Fix potential crash on BSD.
by Alexandre Julliard 07 Oct '14

07 Oct '14

Module: wine Branch: master Commit: 6e4d52a752c319855546e4851f40c7077af6c3c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e4d52a752c319855546e4851… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 2 00:33:11 2014 +0200 winhttp/tests: Fix potential crash on BSD. --- dlls/winhttp/tests/winhttp.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 27fb212..cf2312f 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -876,12 +876,15 @@ static void test_secure_connection(void) ret = WinHttpQueryOption(req, WINHTTP_OPTION_SECURITY_CERTIFICATE_STRUCT, &info, &size ); ok(ret, "failed to retrieve certificate info %u\n", GetLastError()); - trace("lpszSubjectInfo %s\n", wine_dbgstr_w(info.lpszSubjectInfo)); - trace("lpszIssuerInfo %s\n", wine_dbgstr_w(info.lpszIssuerInfo)); - trace("lpszProtocolName %s\n", wine_dbgstr_w(info.lpszProtocolName)); - trace("lpszSignatureAlgName %s\n", wine_dbgstr_w(info.lpszSignatureAlgName)); - trace("lpszEncryptionAlgName %s\n", wine_dbgstr_w(info.lpszEncryptionAlgName)); - trace("dwKeySize %u\n", info.dwKeySize); + if (!ret) + { + trace("lpszSubjectInfo %s\n", wine_dbgstr_w(info.lpszSubjectInfo)); + trace("lpszIssuerInfo %s\n", wine_dbgstr_w(info.lpszIssuerInfo)); + trace("lpszProtocolName %s\n", wine_dbgstr_w(info.lpszProtocolName)); + trace("lpszSignatureAlgName %s\n", wine_dbgstr_w(info.lpszSignatureAlgName)); + trace("lpszEncryptionAlgName %s\n", wine_dbgstr_w(info.lpszEncryptionAlgName)); + trace("dwKeySize %u\n", info.dwKeySize); + } ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %u\n", GetLastError());

1 0

Michael Müller : ntdll: Wait until builtin dlls are unloaded before releasing the virtual view.
by Alexandre Julliard 07 Oct '14

07 Oct '14

Module: wine Branch: master Commit: 15d013067d7cacaa8f127586b5d03336c8c2fd1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=15d013067d7cacaa8f127586b… Author: Michael Müller <michael(a)fds-team.de> Date: Sat Oct 4 02:51:51 2014 +0200 ntdll: Wait until builtin dlls are unloaded before releasing the virtual view. --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 3c2fc56..e1444d2 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2642,8 +2642,8 @@ static void free_modref( WINE_MODREF *wm ) free_tls_slot( &wm->ldr ); RtlReleaseActivationContext( wm->ldr.ActivationContext ); - NtUnmapViewOfSection( NtCurrentProcess(), wm->ldr.BaseAddress ); if (wm->ldr.Flags & LDR_WINE_INTERNAL) wine_dll_unload( wm->ldr.SectionHandle ); + NtUnmapViewOfSection( NtCurrentProcess(), wm->ldr.BaseAddress ); if (cached_modref == wm) cached_modref = NULL; RtlFreeUnicodeString( &wm->ldr.FullDllName ); RtlFreeHeap( GetProcessHeap(), 0, wm->deps );

1 0