February 2018 - Wine-Commits

Nikolay Sivov : comctl32/animate: Use the global HeapAlloc() helpers.
by Alexandre Julliard Feb. 9, 2018

Feb. 9, 2018

Module: wine Branch: master Commit: 61de79dcab2896ab0dc5b5325fdb20432d750d40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61de79dcab2896ab0dc5b532… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 9 09:41:26 2018 +0300 comctl32/animate: Use the global HeapAlloc() helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/animate.c | 64 ++++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index 12c4f65..169291b 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -45,6 +45,7 @@ #include "mmsystem.h" #include "comctl32.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(animate); @@ -188,36 +189,39 @@ static BOOL ANIMATE_DoStop(ANIMATE_INFO *infoPtr) static void ANIMATE_Free(ANIMATE_INFO *infoPtr) { - if (infoPtr->hMMio) { - ANIMATE_DoStop(infoPtr); - mmioClose(infoPtr->hMMio, 0); - if (infoPtr->hRes) { - FreeResource(infoPtr->hRes); - infoPtr->hRes = 0; - } - Free (infoPtr->lpIndex); + if (infoPtr->hMMio) + { + ANIMATE_DoStop(infoPtr); + mmioClose(infoPtr->hMMio, 0); + if (infoPtr->hRes) + { + FreeResource(infoPtr->hRes); + infoPtr->hRes = 0; + } + heap_free (infoPtr->lpIndex); infoPtr->lpIndex = NULL; - if (infoPtr->hic) { - fnIC.fnICClose(infoPtr->hic); - infoPtr->hic = 0; - } - Free (infoPtr->inbih); + if (infoPtr->hic) + { + fnIC.fnICClose(infoPtr->hic); + infoPtr->hic = 0; + } + heap_free (infoPtr->inbih); infoPtr->inbih = NULL; - Free (infoPtr->outbih); + heap_free (infoPtr->outbih); infoPtr->outbih = NULL; - Free (infoPtr->indata); + heap_free (infoPtr->indata); infoPtr->indata = NULL; - Free (infoPtr->outdata); + heap_free (infoPtr->outdata); infoPtr->outdata = NULL; - if( infoPtr->hbmPrevFrame ) + if (infoPtr->hbmPrevFrame) { - DeleteObject(infoPtr->hbmPrevFrame); + DeleteObject(infoPtr->hbmPrevFrame); infoPtr->hbmPrevFrame = 0; } - memset(&infoPtr->mah, 0, sizeof(infoPtr->mah)); - memset(&infoPtr->ash, 0, sizeof(infoPtr->ash)); - infoPtr->nFromFrame = infoPtr->nToFrame = infoPtr->nLoop = infoPtr->currFrame = 0; + memset(&infoPtr->mah, 0, sizeof(infoPtr->mah)); + memset(&infoPtr->ash, 0, sizeof(infoPtr->ash)); + infoPtr->nFromFrame = infoPtr->nToFrame = infoPtr->nLoop = infoPtr->currFrame = 0; } infoPtr->transparentColor = ANIMATE_COLOR_NONE; } @@ -571,7 +575,7 @@ static BOOL ANIMATE_GetAviInfo(ANIMATE_INFO *infoPtr) return FALSE; } - infoPtr->inbih = Alloc(mmckInfo.cksize); + infoPtr->inbih = heap_alloc_zero(mmckInfo.cksize); if (!infoPtr->inbih) { WARN("Can't alloc input BIH\n"); return FALSE; @@ -618,7 +622,7 @@ static BOOL ANIMATE_GetAviInfo(ANIMATE_INFO *infoPtr) /* FIXME: should handle the 'rec ' LIST when present */ - infoPtr->lpIndex = Alloc(infoPtr->mah.dwTotalFrames * sizeof(DWORD)); + infoPtr->lpIndex = heap_alloc_zero(infoPtr->mah.dwTotalFrames * sizeof(DWORD)); if (!infoPtr->lpIndex) return FALSE; @@ -640,7 +644,7 @@ static BOOL ANIMATE_GetAviInfo(ANIMATE_INFO *infoPtr) infoPtr->ash.dwSuggestedBufferSize = insize; } - infoPtr->indata = Alloc(infoPtr->ash.dwSuggestedBufferSize); + infoPtr->indata = heap_alloc_zero(infoPtr->ash.dwSuggestedBufferSize); if (!infoPtr->indata) return FALSE; @@ -671,7 +675,7 @@ static BOOL ANIMATE_GetAviCodec(ANIMATE_INFO *infoPtr) outSize = fnIC.fnICSendMessage(infoPtr->hic, ICM_DECOMPRESS_GET_FORMAT, (DWORD_PTR)infoPtr->inbih, 0L); - infoPtr->outbih = Alloc(outSize); + infoPtr->outbih = heap_alloc_zero(outSize); if (!infoPtr->outbih) return FALSE; @@ -682,7 +686,7 @@ static BOOL ANIMATE_GetAviCodec(ANIMATE_INFO *infoPtr) return FALSE; } - infoPtr->outdata = Alloc(infoPtr->outbih->biSizeImage); + infoPtr->outdata = heap_alloc_zero(infoPtr->outbih->biSizeImage); if (!infoPtr->outdata) return FALSE; @@ -776,12 +780,12 @@ static BOOL ANIMATE_OpenA(ANIMATE_INFO *infoPtr, HINSTANCE hInstance, LPSTR lpsz return ANIMATE_OpenW(infoPtr, hInstance, (LPWSTR)lpszName); len = MultiByteToWideChar(CP_ACP, 0, lpszName, -1, NULL, 0); - lpwszName = Alloc(len * sizeof(WCHAR)); + lpwszName = heap_alloc(len * sizeof(WCHAR)); if (!lpwszName) return FALSE; MultiByteToWideChar(CP_ACP, 0, lpszName, -1, lpwszName, len); result = ANIMATE_OpenW(infoPtr, hInstance, lpwszName); - Free (lpwszName); + heap_free (lpwszName); return result; } @@ -814,7 +818,7 @@ static BOOL ANIMATE_Create(HWND hWnd, const CREATESTRUCTW *lpcs) } /* allocate memory for info structure */ - infoPtr = Alloc(sizeof(ANIMATE_INFO)); + infoPtr = heap_alloc_zero(sizeof(*infoPtr)); if (!infoPtr) return FALSE; /* store crossref hWnd <-> info structure */ @@ -844,7 +848,7 @@ static LRESULT ANIMATE_Destroy(ANIMATE_INFO *infoPtr) infoPtr->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&infoPtr->cs); - Free(infoPtr); + heap_free(infoPtr); return 0; }

1 0

Józef Kucia : wined3d: Do not enable GL_ARB_texture_multisample in GLSL.
by Alexandre Julliard Feb. 9, 2018

Feb. 9, 2018

Module: wine Branch: master Commit: 220841f33a4b343709802cb94a852730f2d20d82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=220841f33a4b343709802cb9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 9 13:03:26 2018 +0100 wined3d: Do not enable GL_ARB_texture_multisample in GLSL. GLSL 1.50 is required for SM4+. 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/wined3d/glsl_shader.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b3c6404..6f59cf1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7481,8 +7481,6 @@ static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, shader_addline(buffer, "#extension GL_ARB_texture_cube_map_array : enable\n"); if (gl_info->supported[ARB_TEXTURE_GATHER]) shader_addline(buffer, "#extension GL_ARB_texture_gather : enable\n"); - if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) - shader_addline(buffer, "#extension GL_ARB_texture_multisample : enable\n"); if (gl_info->supported[ARB_TEXTURE_QUERY_LEVELS]) shader_addline(buffer, "#extension GL_ARB_texture_query_levels : enable\n"); if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT])

1 0

Alex Henrie : dhtmled.ocx: Remove IDHTMLSafe interface from DHTMLEdit object.
by Alexandre Julliard Feb. 9, 2018

Feb. 9, 2018

Module: wine Branch: master Commit: 1726d312f94fe6d7a97e834b737957b711cb0ff7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1726d312f94fe6d7a97e834b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Feb 8 23:55:57 2018 -0700 dhtmled.ocx: Remove IDHTMLSafe interface from DHTMLEdit object. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dhtmled.ocx/edit.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c index 1da0890..874b655 100644 --- a/dlls/dhtmled.ocx/edit.c +++ b/dlls/dhtmled.ocx/edit.c @@ -63,7 +63,6 @@ static HRESULT dhtml_edit_qi(DHTMLEditImpl *This, REFIID iid, void **out) if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IDispatch) || - IsEqualGUID(iid, &IID_IDHTMLSafe) || IsEqualGUID(iid, &IID_IDHTMLEdit)) { dhtml_edit_addref(This);

1 0

Alex Henrie : dhtmled.ocx: Add IPersistStreamInit interface to DHTMLEdit object.
by Alexandre Julliard Feb. 9, 2018

Feb. 9, 2018

Module: wine Branch: master Commit: c654bc57464503be972d7e050975e12cf3e0554b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c654bc57464503be972d7e05… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Feb 8 23:55:56 2018 -0700 dhtmled.ocx: Add IPersistStreamInit interface to DHTMLEdit object. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dhtmled.ocx/edit.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c index ef5a0c3..1da0890 100644 --- a/dlls/dhtmled.ocx/edit.c +++ b/dlls/dhtmled.ocx/edit.c @@ -28,6 +28,7 @@ typedef struct { IDHTMLEdit IDHTMLEdit_iface; IOleObject IOleObject_iface; + IPersistStreamInit IPersistStreamInit_iface; IOleClientSite *client_site; LONG ref; } DHTMLEditImpl; @@ -42,6 +43,11 @@ static inline DHTMLEditImpl *impl_from_IOleObject(IOleObject *iface) return CONTAINING_RECORD(iface, DHTMLEditImpl, IOleObject_iface); } +static inline DHTMLEditImpl *impl_from_IPersistStreamInit(IPersistStreamInit *iface) +{ + return CONTAINING_RECORD(iface, DHTMLEditImpl, IPersistStreamInit_iface); +} + static ULONG dhtml_edit_addref(DHTMLEditImpl *This) { LONG ref = InterlockedIncrement(&This->ref); @@ -70,6 +76,12 @@ static HRESULT dhtml_edit_qi(DHTMLEditImpl *This, REFIID iid, void **out) *out = &This->IOleObject_iface; return S_OK; } + else if (IsEqualGUID(iid, &IID_IPersistStreamInit)) + { + dhtml_edit_addref(This); + *out = &This->IPersistStreamInit_iface; + return S_OK; + } *out = NULL; ERR("no interface for %s\n", debugstr_guid(iid)); @@ -765,6 +777,76 @@ static const IOleObjectVtbl OleObjectVtbl = { OleObject_SetColorScheme }; +static HRESULT WINAPI PersistStreamInit_QueryInterface(IPersistStreamInit *iface, REFIID iid, void **out) +{ + return dhtml_edit_qi(impl_from_IPersistStreamInit(iface), iid, out); +} + +static ULONG WINAPI PersistStreamInit_AddRef(IPersistStreamInit *iface) +{ + return dhtml_edit_addref(impl_from_IPersistStreamInit(iface)); +} + +static ULONG WINAPI PersistStreamInit_Release(IPersistStreamInit *iface) +{ + return dhtml_edit_release(impl_from_IPersistStreamInit(iface)); +} + +static HRESULT WINAPI PersistStreamInit_GetClassID(IPersistStreamInit *iface, CLSID *clsid) +{ + DHTMLEditImpl *This = impl_from_IPersistStreamInit(iface); + FIXME("(%p)->(%p) stub\n", This, clsid); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_IsDirty(IPersistStreamInit *iface) +{ + DHTMLEditImpl *This = impl_from_IPersistStreamInit(iface); + FIXME("(%p) stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, IStream *stream) +{ + DHTMLEditImpl *This = impl_from_IPersistStreamInit(iface); + FIXME("(%p)->(%p) stub\n", This, stream); + return S_OK; +} + +static HRESULT WINAPI PersistStreamInit_Save(IPersistStreamInit *iface, IStream *stream, BOOL clear_dirty) +{ + DHTMLEditImpl *This = impl_from_IPersistStreamInit(iface); + FIXME("(%p)->(%p, %u) stub\n", This, stream, clear_dirty); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_GetSizeMax(IPersistStreamInit *iface, ULARGE_INTEGER *value) +{ + DHTMLEditImpl *This = impl_from_IPersistStreamInit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + value->QuadPart = 0; + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) +{ + DHTMLEditImpl *This = impl_from_IPersistStreamInit(iface); + FIXME("(%p) stub\n", This); + return E_NOTIMPL; +} + +static const IPersistStreamInitVtbl PersistStreamInitVtbl = { + PersistStreamInit_QueryInterface, + PersistStreamInit_AddRef, + PersistStreamInit_Release, + PersistStreamInit_GetClassID, + PersistStreamInit_IsDirty, + PersistStreamInit_Load, + PersistStreamInit_Save, + PersistStreamInit_GetSizeMax, + PersistStreamInit_InitNew +}; + HRESULT dhtml_edit_create(REFIID iid, void **out) { DHTMLEditImpl *This; @@ -778,6 +860,7 @@ HRESULT dhtml_edit_create(REFIID iid, void **out) This->IDHTMLEdit_iface.lpVtbl = &DHTMLEditVtbl; This->IOleObject_iface.lpVtbl = &OleObjectVtbl; + This->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; This->client_site = NULL; This->ref = 1;

1 0

Józef Kucia : d3d9/tests: Add test for changing multisample type of implicit swapchain.
by Alexandre Julliard Feb. 9, 2018

Feb. 9, 2018

Module: wine Branch: master Commit: f37eb6c0def54bef4297f5e44e3acad3aebb5c9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f37eb6c0def54bef4297f5e4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 9 13:03:25 2018 +0100 d3d9/tests: Add test for changing multisample type of implicit swapchain. 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/d3d9/tests/device.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index a9fd4e4..7c7017d 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12122,6 +12122,65 @@ static void test_clip_planes_limits(void) DestroyWindow(window); } +static void test_swapchain_multisample_reset(void) +{ + IDirect3DSwapChain9 *swapchain; + D3DPRESENT_PARAMETERS d3dpp; + IDirect3DDevice9 *device; + DWORD quality_levels; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + + window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + ok(!!window, "Failed to create a window.\n"); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, &quality_levels) == D3DERR_NOTAVAILABLE) + { + skip("Multisampling not supported for D3DFMT_A8R8G8B8.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + if (!(device = create_device(d3d, window, NULL))) + { + skip("Failed to create a 3D device.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetSwapChain(device, 0, &swapchain); + ok(hr == D3D_OK, "Failed to get the implicit swapchain, hr %#x.\n", hr); + hr = IDirect3DSwapChain9_GetPresentParameters(swapchain, &d3dpp); + ok(hr == D3D_OK, "Failed to get present parameters, hr %#x.\n", hr); + ok(d3dpp.MultiSampleType == D3DMULTISAMPLE_NONE, + "Got unexpected multisample type %#x.\n", d3dpp.MultiSampleType); + IDirect3DSwapChain9_Release(swapchain); + + d3dpp.MultiSampleType = D3DMULTISAMPLE_2_SAMPLES; + d3dpp.MultiSampleQuality = quality_levels - 1; + hr = IDirect3DDevice9_Reset(device, &d3dpp); + ok(hr == D3D_OK, "Failed to reset device, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -12243,6 +12302,7 @@ START_TEST(device) test_destroyed_window(); test_lockable_backbuffer(); test_clip_planes_limits(); + test_swapchain_multisample_reset(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Jacek Caban : jscript: Improve interp_local debug traces.
by Alexandre Julliard Feb. 9, 2018

Feb. 9, 2018

Module: wine Branch: master Commit: a48ecc7e7c09e1912ae4d718fcc7b3d5d7442559 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a48ecc7e7c09e1912ae4d718… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 9 14:30:41 2018 +0100 jscript: Improve interp_local debug traces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 38d8657..8092159 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1296,7 +1296,7 @@ static HRESULT interp_local(script_ctx_t *ctx) jsval_t copy; HRESULT hres; - TRACE("%d\n", arg); + TRACE("%d: %s\n", arg, debugstr_w(local_name(frame, arg))); if(!frame->base_scope || !frame->base_scope->frame) return identifier_value(ctx, local_name(frame, arg));

1 0

Anton Romanov : wmp: Add IWMPPlayer interface.
by Alexandre Julliard Feb. 9, 2018

Feb. 9, 2018

Module: wine Branch: master Commit: 354fa7eb7921c3317e7943c18871febe5570dd52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=354fa7eb7921c3317e7943c1… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Wed Feb 7 12:24:44 2018 -0800 wmp: Add IWMPPlayer interface. Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/oleobj.c | 3 + dlls/wmp/player.c | 271 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wmp/tests/oleobj.c | 17 +++ dlls/wmp/wmp_private.h | 1 + include/wmp.idl | 27 ++++- 5 files changed, 318 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=354fa7eb7921c3317e79…

1 0

Józef Kucia : wined3d: Add support for multisample textures in wined3d_texture_update_desc().
by Alexandre Julliard Feb. 9, 2018

Feb. 9, 2018

Module: wine Branch: master Commit: 7517d8c2e45e9c28203c269ea54033a1a31d1254 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7517d8c2e45e9c28203c269e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 9 13:03:24 2018 +0100 wined3d: Add support for multisample textures in wined3d_texture_update_desc(). This might be called from wined3d_device_reset(). 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/wined3d/texture.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5ff8a4f..750101f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1347,9 +1347,9 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT return WINED3DERR_INVALIDCALL; } - if (texture->resource.type == WINED3D_RTYPE_TEXTURE_3D) + if (texture->resource.type != WINED3D_RTYPE_TEXTURE_2D) { - WARN("Not supported on 3D textures.\n"); + WARN("Not supported on %s.\n", debug_d3dresourcetype(texture->resource.type)); return WINED3DERR_INVALIDCALL; } @@ -1403,6 +1403,12 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT sub_resource->size = texture->slice_pitch; sub_resource->locations = WINED3D_LOCATION_DISCARDED; + if (multisample_type && gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + texture->target = GL_TEXTURE_2D_MULTISAMPLE; + else + texture->target = GL_TEXTURE_2D; + texture->sub_resources[0].u.surface->texture_target = texture->target; + if (((width & (width - 1)) || (height & (height - 1))) && !gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] && !gl_info->supported[ARB_TEXTURE_RECTANGLE] && !gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) {

1 0

Nikolay Sivov : comctl32/ipaddress: Use the global HeapAlloc() helpers.
by Alexandre Julliard Feb. 9, 2018

Feb. 9, 2018

Module: wine Branch: master Commit: bd4193ef9f0c08ecfa51a7d3e0740ff1eef7011d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd4193ef9f0c08ecfa51a7d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 9 09:41:25 2018 +0300 comctl32/ipaddress: Use the global HeapAlloc() helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/ipaddress.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index 98e7259..6c1edf9 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -50,6 +50,7 @@ #include "vssym32.h" #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(ipaddress); @@ -228,7 +229,7 @@ static LRESULT IPADDRESS_Create (HWND hwnd, const CREATESTRUCTA *lpCreate) SetWindowLongW (hwnd, GWL_STYLE, GetWindowLongW(hwnd, GWL_STYLE) & ~WS_BORDER); - infoPtr = Alloc (sizeof(IPADDRESS_INFO)); + infoPtr = heap_alloc_zero (sizeof(*infoPtr)); if (!infoPtr) return -1; SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); @@ -287,7 +288,7 @@ static LRESULT IPADDRESS_Destroy (IPADDRESS_INFO *infoPtr) } SetWindowLongPtrW (infoPtr->Self, 0, 0); - Free (infoPtr); + heap_free (infoPtr); return 0; }

1 0

Nikolay Sivov : comctl32/pager: Use the global HeapAlloc() helpers.
by Alexandre Julliard Feb. 9, 2018

Feb. 9, 2018

Module: wine Branch: master Commit: 0e403837ff8f980196936749f3456fad85957c18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e403837ff8f980196936749… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 9 09:41:23 2018 +0300 comctl32/pager: Use the global HeapAlloc() helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/pager.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index e9bcbe8..fe68515 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -62,6 +62,7 @@ #include "commctrl.h" #include "comctl32.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(pager); @@ -556,7 +557,7 @@ PAGER_Create (HWND hwnd, const CREATESTRUCTW *lpcs) PAGER_INFO *infoPtr; /* allocate memory for info structure */ - infoPtr = Alloc (sizeof(PAGER_INFO)); + infoPtr = heap_alloc_zero (sizeof(*infoPtr)); if (!infoPtr) return -1; SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); @@ -588,7 +589,7 @@ static LRESULT PAGER_Destroy (PAGER_INFO *infoPtr) { SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); - Free (infoPtr); /* free pager info data */ + heap_free (infoPtr); return 0; }

1 0

Henri Verbeet : d3d9: Use wined3d_buffer_create() in d3d9_device_prepare_vertex_buffer().
by Alexandre Julliard Feb. 9, 2018

Feb. 9, 2018

Module: wine Branch: master Commit: 96432c4cc26dbdd85fd6240b8f2aff425d53351d URL: https://source.winehq.org/git/wine.git/?a=commit;h=96432c4cc26dbdd85fd6240b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 9 01:46:43 2018 +0330 d3d9: Use wined3d_buffer_create() in d3d9_device_prepare_vertex_buffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 15 +++++++++++---- dlls/wined3d/buffer.c | 46 ---------------------------------------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 10 ---------- 4 files changed, 11 insertions(+), 61 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 9dd58a3..3bd23b6 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2543,15 +2543,22 @@ static HRESULT d3d9_device_prepare_vertex_buffer(struct d3d9_device *device, UIN if (device->vertex_buffer_size < min_size || !device->vertex_buffer) { UINT size = max(device->vertex_buffer_size * 2, min_size); + struct wined3d_buffer_desc desc; struct wined3d_buffer *buffer; TRACE("Growing vertex buffer to %u bytes.\n", size); - hr = wined3d_buffer_create_vb(device->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, - WINED3D_POOL_DEFAULT, NULL, &d3d9_null_wined3d_parent_ops, &buffer); - if (FAILED(hr)) + desc.byte_width = size; + desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY; + desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.misc_flags = 0; + desc.structure_byte_stride = 0; + + if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, + NULL, NULL, &d3d9_null_wined3d_parent_ops, &buffer))) { - ERR("(%p) wined3d_buffer_create_vb failed with hr = %08x.\n", device, hr); + ERR("Failed to create vertex buffer, hr %#x.\n", hr); return hr; } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f1b4556..f907ece 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1441,49 +1441,3 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct return WINED3D_OK; } - -static DWORD resource_access_from_pool(enum wined3d_pool pool) -{ - switch (pool) - { - case WINED3D_POOL_DEFAULT: - return WINED3D_RESOURCE_ACCESS_GPU; - - case WINED3D_POOL_MANAGED: - return WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; - - case WINED3D_POOL_SYSTEM_MEM: - return WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; - - default: - FIXME("Unhandled pool %#x.\n", pool); - return 0; - } -} - -HRESULT CDECL wined3d_buffer_create_vb(struct wined3d_device *device, UINT size, DWORD usage, enum wined3d_pool pool, - void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer) -{ - struct wined3d_buffer_desc desc; - - TRACE("device %p, size %u, usage %#x, pool %#x, parent %p, parent_ops %p, buffer %p.\n", - device, size, usage, pool, parent, parent_ops, buffer); - - if (usage & WINED3DUSAGE_SCRATCH) - { - /* The d3d9 tests shows that this is not allowed. It doesn't make much - * sense anyway, SCRATCH buffers wouldn't be usable anywhere. */ - WARN("Vertex buffer with WINED3DUSAGE_SCRATCH requested, returning WINED3DERR_INVALIDCALL.\n"); - *buffer = NULL; - return WINED3DERR_INVALIDCALL; - } - - desc.byte_width = size; - desc.usage = usage; - desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; - desc.access = resource_access_from_pool(pool); - desc.misc_flags = 0; - desc.structure_byte_stride = 0; - - return wined3d_buffer_create(device, &desc, NULL, parent, parent_ops, buffer); -} diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index f65cc85..7c1b5e3 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -28,7 +28,6 @@ @ cdecl wined3d_blend_state_incref(ptr) @ cdecl wined3d_buffer_create(ptr ptr ptr ptr ptr ptr) -@ cdecl wined3d_buffer_create_vb(ptr long long long ptr ptr ptr) @ cdecl wined3d_buffer_decref(ptr) @ cdecl wined3d_buffer_get_parent(ptr) @ cdecl wined3d_buffer_get_resource(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f6ffdba..9d551d8 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -680,13 +680,6 @@ enum wined3d_resource_type WINED3D_RTYPE_TEXTURE_3D = 3, }; -enum wined3d_pool -{ - WINED3D_POOL_DEFAULT = 0, - WINED3D_POOL_MANAGED = 1, - WINED3D_POOL_SYSTEM_MEM = 2, -}; - enum wined3d_query_type { WINED3D_QUERY_TYPE_VCACHE = 4, @@ -2195,9 +2188,6 @@ HRESULT __cdecl wined3d_set_adapter_display_mode(struct wined3d *wined3d, HRESULT __cdecl wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer); -HRESULT __cdecl wined3d_buffer_create_vb(struct wined3d_device *device, UINT length, DWORD usage, - enum wined3d_pool pool, void *parent, const struct wined3d_parent_ops *parent_ops, - struct wined3d_buffer **buffer); ULONG __cdecl wined3d_buffer_decref(struct wined3d_buffer *buffer); void * __cdecl wined3d_buffer_get_parent(const struct wined3d_buffer *buffer); struct wined3d_resource * __cdecl wined3d_buffer_get_resource(struct wined3d_buffer *buffer);

1 0

Henri Verbeet : wined3d: Update the depth/ stencil resource location for stencil clears as well.
by Alexandre Julliard Feb. 9, 2018

Feb. 9, 2018

Module: wine Branch: master Commit: 1b7f06acb121fe90dd694ea5508d6050cc3df23c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b7f06acb121fe90dd694ea5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 9 01:46:45 2018 +0330 wined3d: Update the depth/stencil resource location for stencil clears as well. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 78610fc..7881bca 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -288,16 +288,22 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c depth_stencil->texture_level); } - if (depth_stencil && render_offscreen) - wined3d_texture_prepare_location(depth_stencil->container, - dsv->sub_resource_idx, context, dsv->resource->draw_binding); - - if (flags & WINED3DCLEAR_ZBUFFER) + if (depth_stencil) { - DWORD location = render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; + DWORD ds_location = render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; + struct wined3d_texture *ds = wined3d_texture_from_resource(dsv->resource); + + if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL) + && !is_full_clear(depth_stencil, draw_rect, rect_count ? clear_rect : NULL)) + wined3d_texture_load_location(ds, dsv->sub_resource_idx, context, ds_location); + else + wined3d_texture_prepare_location(ds, dsv->sub_resource_idx, context, ds_location); - wined3d_texture_load_location(depth_stencil->container, - dsv->sub_resource_idx, context, location); + if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) + { + wined3d_texture_validate_location(ds, dsv->sub_resource_idx, ds_location); + wined3d_texture_invalidate_location(ds, dsv->sub_resource_idx, ~ds_location); + } } if (!context_apply_clear_state(context, state, rt_count, fb)) @@ -324,11 +330,6 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c if (flags & WINED3DCLEAR_ZBUFFER) { - DWORD location = render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; - - wined3d_texture_validate_location(depth_stencil->container, dsv->sub_resource_idx, location); - wined3d_texture_invalidate_location(depth_stencil->container, dsv->sub_resource_idx, ~location); - gl_info->gl_ops.gl.p_glDepthMask(GL_TRUE); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_ZWRITEENABLE)); gl_info->gl_ops.gl.p_glClearDepth(depth);

1 0

Henri Verbeet : d3drm: Use the global memory allocation helpers.
by Alexandre Julliard Feb. 9, 2018

Feb. 9, 2018

Module: wine Branch: master Commit: 8cfa75f176dc35793eae7c47d346b59c0b95919e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cfa75f176dc35793eae7c47… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 9 01:46:47 2018 +0330 d3drm: Use the global memory allocation helpers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 4 +- dlls/d3drm/d3drm_main.c | 13 +++--- dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/device.c | 4 +- dlls/d3drm/face.c | 4 +- dlls/d3drm/frame.c | 52 +++++++++++------------ dlls/d3drm/light.c | 4 +- dlls/d3drm/material.c | 4 +- dlls/d3drm/meshbuilder.c | 103 +++++++++++++++++++++------------------------ dlls/d3drm/texture.c | 4 +- dlls/d3drm/viewport.c | 4 +- 11 files changed, 94 insertions(+), 103 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8cfa75f176dc35793eae…

1 0

Nikolay Sivov : comctl32/progress: Use the global HeapAlloc() helpers.
by Alexandre Julliard Feb. 9, 2018

Feb. 9, 2018

Module: wine Branch: master Commit: cfac6021e9b8ae9c9a061894ee2c657c23b80843 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfac6021e9b8ae9c9a061894… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 9 09:41:24 2018 +0300 comctl32/progress: Use the global HeapAlloc() helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/progress.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index 4638ffc..62234b9 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -46,6 +46,7 @@ #include "uxtheme.h" #include "vssym32.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(progress); @@ -562,7 +563,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, SWP_FRAMECHANGED | SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); /* allocate memory for info struct */ - infoPtr = Alloc (sizeof(PROGRESS_INFO)); + infoPtr = heap_alloc_zero (sizeof(*infoPtr)); if (!infoPtr) return -1; SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr); @@ -584,7 +585,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, case WM_DESTROY: TRACE("Progress Ctrl destruction, hwnd=%p\n", hwnd); - Free (infoPtr); + heap_free (infoPtr); SetWindowLongPtrW(hwnd, 0, 0); theme = GetWindowTheme (hwnd); CloseThemeData (theme);

1 0

Henri Verbeet : wined3d: Explicitly check for dynamic usage in wined3d_texture_use_pbo().
by Alexandre Julliard Feb. 9, 2018

Feb. 9, 2018

Module: wine Branch: master Commit: a93120c340431e65e44385d94b3420ee60ec24ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=a93120c340431e65e44385d9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 9 01:46:46 2018 +0330 wined3d: Explicitly check for dynamic usage in wined3d_texture_use_pbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ed1ca21..116b8db 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -32,8 +32,8 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); static BOOL wined3d_texture_use_pbo(const struct wined3d_texture *texture, const struct wined3d_gl_info *gl_info) { - return (texture->resource.access & (WINED3D_RESOURCE_ACCESS_CPU - | WINED3D_RESOURCE_ACCESS_MAP)) == WINED3D_RESOURCE_ACCESS_MAP + return !(texture->resource.access & WINED3D_RESOURCE_ACCESS_CPU) + && texture->resource.usage & WINED3DUSAGE_DYNAMIC && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] && !texture->resource.format->conv_byte_count && !(texture->flags & (WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_COND_NP2_EMULATED));

1 0

Henri Verbeet : wined3d: Get rid of wined3d_get_draw_rect().
by Alexandre Julliard Feb. 9, 2018

Feb. 9, 2018

Module: wine Branch: master Commit: eb83a7c993a3c6f048dc882164c229710460bf63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb83a7c993a3c6f048dc8821… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 9 01:46:44 2018 +0330 wined3d: Get rid of wined3d_get_draw_rect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 8 ++++---- dlls/wined3d/utils.c | 10 ---------- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 76316e0..ed249f4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -501,14 +501,11 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) { - const struct wined3d_state *state = &cs->state; const struct wined3d_cs_clear *op = data; struct wined3d_device *device; unsigned int i; - RECT draw_rect; device = cs->device; - wined3d_get_draw_rect(state, &draw_rect); device->blitter->ops->blitter_clear(device->blitter, device, op->rt_count, op->fb, op->rect_count, op->rects, &op->draw_rect, op->flags, &op->color, op->depth, op->stencil); @@ -529,6 +526,7 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * { unsigned int rt_count = cs->device->adapter->gl_info.limits.buffers; const struct wined3d_state *state = &cs->device->state; + const struct wined3d_viewport *vp = &state->viewport; struct wined3d_cs_clear *op; unsigned int i; @@ -538,7 +536,9 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * op->flags = flags; op->rt_count = rt_count; op->fb = &cs->fb; - wined3d_get_draw_rect(state, &op->draw_rect); + SetRect(&op->draw_rect, vp->x, vp->y, vp->x + vp->width, vp->y + vp->height); + if (state->render_states[WINED3D_RS_SCISSORTESTENABLE]) + IntersectRect(&op->draw_rect, &op->draw_rect, &state->scissor_rect); op->color = *color; op->depth = depth; op->stencil = stencil; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a31baa4..48f72fe 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5990,16 +5990,6 @@ int wined3d_ffp_vertex_program_key_compare(const void *key, const struct wine_rb return memcmp(ka, kb, sizeof(*ka)); } -void wined3d_get_draw_rect(const struct wined3d_state *state, RECT *rect) -{ - const struct wined3d_viewport *vp = &state->viewport; - - SetRect(rect, vp->x, vp->y, vp->x + vp->width, vp->y + vp->height); - - if (state->render_states[WINED3D_RS_SCISSORTESTENABLE]) - IntersectRect(rect, rect, &state->scissor_rect); -} - const char *wined3d_debug_location(DWORD location) { const char *prefix = ""; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e2527f2..bf17a1c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2695,7 +2695,6 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d const struct ffp_frag_desc *find_ffp_frag_shader(const struct wine_rb_tree *fragment_shaders, const struct ffp_frag_settings *settings) DECLSPEC_HIDDEN; void add_ffp_frag_shader(struct wine_rb_tree *shaders, struct ffp_frag_desc *desc) DECLSPEC_HIDDEN; -void wined3d_get_draw_rect(const struct wined3d_state *state, RECT *rect) DECLSPEC_HIDDEN; void wined3d_ftoa(float value, char *s) DECLSPEC_HIDDEN; extern const float wined3d_srgb_const0[] DECLSPEC_HIDDEN;

1 0

Józef Kucia : include: Cleanup d3d12 header files.
by Alexandre Julliard Feb. 9, 2018

Feb. 9, 2018

Module: vkd3d Branch: master Commit: 70493640e3a93726bdc308bbb60aef9e686d28f2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=70493640e3a93726bdc308b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 9 13:45:09 2018 +0100 include: Cleanup d3d12 header files. 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> --- Makefile.am | 3 + include/.gitignore | 1 + include/vkd3d_d3d12.idl | 154 +++++++++++++++++++++++++++++++------------- include/vkd3d_d3dcommon.idl | 49 ++++++++++++++ 4 files changed, 164 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=70493640e3a93726bdc…

1 0

Józef Kucia : build: Use shared SPIRV-Tools library.
by Alexandre Julliard Feb. 9, 2018

Feb. 9, 2018

Module: vkd3d Branch: master Commit: 389c18272f988b88ef881923195082ac113e6110 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=389c18272f988b88ef88192… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 7 21:27:11 2018 +0100 build: Use shared SPIRV-Tools library. SPIRV-Tools are now also built as a shared library. 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> --- Makefile.am | 1 + configure.ac | 16 ++++------------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/Makefile.am b/Makefile.am index aeb66eb..260641b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,6 +70,7 @@ libvkd3d_shader_la_SOURCES = \ libs/vkd3d-shader/vkd3d_shader.map \ libs/vkd3d-shader/vkd3d_shader_main.c \ libs/vkd3d-shader/vkd3d_shader_private.h +libvkd3d_shader_la_CFLAGS = @SPIRV_TOOLS_CFLAGS@ libvkd3d_shader_la_LIBADD = @SPIRV_TOOLS_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_shader_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map diff --git a/configure.ac b/configure.ac index 8a39fef..f9616e3 100644 --- a/configure.ac +++ b/configure.ac @@ -54,9 +54,6 @@ AS_IF([test "x$ac_cv_header_vulkan_vulkan_h" != "xyes"], [AC_MSG_ERROR([vulkan.h AS_IF([test "x$ac_cv_header_spirv_1_0_spirv_h" != "xyes"], [AC_MSG_ERROR([spirv.h not found.])]) AS_IF([test "x$ac_cv_header_spirv_1_0_GLSL_std_450_h" != "xyes"], [AC_MSG_ERROR([GLSL.std.450.h not found.])]) -AS_IF([test "x$with_spirv_tools" = "xyes"], - [AC_CHECK_HEADERS([spirv-tools/libspirv.h], [], [AC_MSG_ERROR([spirv-tools/libspirv.h not found.])])]) - dnl Check for libraries m4_ifdef([PKG_PROG_PKG_CONFIG], [PKG_PROG_PKG_CONFIG], [m4_fatal([pkg-config autoconf macros not found.])]) @@ -77,11 +74,11 @@ AC_CHECK_LIB([vulkan], [vkGetInstanceProcAddr], [VULKAN_LIBS="-lvulkan"], [AC_MSG_ERROR([libvulkan not found.])]) -AC_SUBST([SPIRV_TOOLS_LIBS]) +HAVE_SPIRV_TOOLS=no AS_IF([test "x$with_spirv_tools" = "xyes"], - [AC_CHECK_LIB([SPIRV-Tools], [spvTextToBinary], - [SPIRV_TOOLS_LIBS="-lstdc++ -lSPIRV-Tools"], - [AC_MSG_ERROR([libSPIRV-Tools not found.])], [-lstdc++])]) + [PKG_CHECK_MODULES([SPIRV_TOOLS], [SPIRV-Tools-shared], + [AC_DEFINE([HAVE_SPIRV_TOOLS], [1], [Define to 1 if you have SPIRV-Tools.]) + HAVE_SPIRV_TOOLS=yes])]) PKG_CHECK_MODULES([XCB], [xcb xcb-keysyms]) @@ -94,11 +91,6 @@ VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_ AM_CONDITIONAL([HAS_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"]) AM_CONDITIONAL([HAS_CROSSTARGET64], [test "x$CROSSTARGET64" != "xno"]) -AS_IF([test "x$ac_cv_header_spirv_tools_libspirv_h" = "xyes" -a "x$ac_cv_lib_SPIRV_Tools_spvTextToBinary" = "xyes"], - [AC_DEFINE([HAVE_SPIRV_TOOLS], [1], [Define to 1 if you have SPIRV-Tools.]) - HAVE_SPIRV_TOOLS=yes], - [HAVE_SPIRV_TOOLS=no]) - AC_CONFIG_FILES([Makefile]) AC_OUTPUT

1 0

Francois Gouget : testbot: Fix activity statistics for short periods of time.
by Alexandre Julliard Feb. 9, 2018

Feb. 9, 2018

Module: tools Branch: master Commit: c40e81b67b22353b285edbebdbe3c00f3d3da6f3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c40e81b67b22353b285edbe… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 9 03:23:47 2018 +0100 testbot: Fix activity statistics for short periods of time. When looking at the activity for a VM we get an initial 'unknown' segment that goes up to the first record for that VM. This is because we don't know what the state of the VM was before that first record. For long periods it does not matter much but for short ones, say 5 minutes, an unknown segment could be all we have if the VM has been in the same state for more than 5 minutes, for instance while running a task. So analyze the activity beyond the specified period, up to the largest amount of time a task can take so we are sure to get the VM's 'previous' record. Then, when computing the statistics, ignore any data that falls outside the period under consideration. Of course this only works for statistics about VM operations and running tasks (so running.time, reverting.time, etc) not for those about idle or off VMs (idle.time, etc.). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index df1cc59..4aed4ed 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -412,11 +412,33 @@ sub GetStatistics($;$) @JobTimes = (); # free early } - my ($Activity, $Counters) = GetActivity($VMs, $Seconds); + my $ActivitySeconds; + if ($Seconds) + { + # When looking at the activity for a VM we get an initial 'unknown' segment + # that goes up to the first record for that VM. This is because we don't + # know what the state of the VM was before that first record. + # For long periods it does not matter much but for short ones, say 5 + # minutes, an unknown segment could be all we have if the VM has been in + # the same state for more than 5 minutes, for instance while running a + # task. + # So analyze the activity beyond the specified period, up to the largest + # amount of time a task can take so are sure to get the VM's 'previous' + # record. Then when computing the statistics, ignore any data that falls + # outside the period under consideration. + # Of course this only works for statistics about VM operations and running + # tasks (so running.time, reverting.time, etc) not for those about idle or + # off VMs (idle.time, etc.). + $ActivitySeconds = $Seconds + 60 + + ($SuiteTimeout > $ReconfigTimeout ? $SuiteTimeout : $ReconfigTimeout); + } + my ($Activity, $Counters) = GetActivity($VMs, $ActivitySeconds); $GlobalStats->{"recordgroups.count"} = $Counters->{recordgroups}; $GlobalStats->{"records.count"} = $Counters->{records}; foreach my $Group (@$Activity) { + next if ($Group->{end} < $Cutoff); + _UpdateMin($VMsStats->{start}, $Group->{start}); next if (!$Group->{statusvms});

1 0

Francois Gouget : testbot: Allow restricting the statistics to the recent past.
by Alexandre Julliard Feb. 9, 2018

Feb. 9, 2018

Module: tools Branch: master Commit: f421e67ed2239b5f519db69dbcf903fa6428ad7e URL: https://source.winehq.org/git/tools.git/?a=commit;h=f421e67ed2239b5f519db69… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 9 03:22:44 2018 +0100 testbot: Allow restricting the statistics to the recent past. Over long periods of time (days) and as long as the TestBot can keep up, the job & task creation rate should be almost identical to the job and task completion rate (modulo build errors for tasks). But for short periods (under an hour) they can be significantly different. Specifically the job and task completion rates are capped by the TestBot's processing speed, while the job and task creation rates are not. This means jobs must be filtered based on their Submitted field when counting new jobs, and on their Ended field when dealing with completed jobs. Rename the job and task counters to newjobs and newtasks to emphasize that they count new jobs and tasks. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 32 +++++++++++++++++++++----------- testbot/web/Stats.pl | 12 ++++++------ 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 5122dc3..df1cc59 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -43,6 +43,12 @@ sub _UpdateMin($$) $_[0] = $_[1] if (!defined $_[0] or $_[1] < $_[0]); } +sub max($$) +{ + my ($a, $b) = @_; + return $a > $b ? $a : $b; +} + =pod =over 12 @@ -336,18 +342,20 @@ sub _AddFullStat($$$$;$) } } -sub GetStatistics($) +sub GetStatistics($;$) { - my ($VMs) = @_; + my ($VMs, $Seconds) = @_; my ($GlobalStats, $HostsStats, $VMsStats) = ({}, {}, {}); my @JobTimes; my $Jobs = CreateJobs(); + my $Cutoff = $Seconds ? (time() - $Seconds) : 0; foreach my $Job (@{$Jobs->GetItems()}) { - $GlobalStats->{"jobs.count"}++; - _UpdateMin($GlobalStats->{start}, $Job->Submitted); + my $CountsAsNew = ($Job->Submitted >= $Cutoff); + $GlobalStats->{"newjobs.count"}++ if ($CountsAsNew); + _UpdateMin($GlobalStats->{start}, max($Cutoff, $Job->Submitted)); my $IsSpecialJob; my $Steps = $Job->Steps; @@ -359,9 +367,11 @@ sub GetStatistics($) my $Tasks = $Step->Tasks; foreach my $Task (@{$Tasks->GetItems()}) { - $GlobalStats->{"tasks.count"}++; - if ($Task->Started and $Task->Ended and - $Task->Status !~ /^(?:queued|running|canceled)$/) + $GlobalStats->{"newtasks.count"}++ if ($CountsAsNew); + next if (!$Task->Ended or $Task->Ended < $Cutoff); + + # $Task->Started should really be set since $Task->Ended is + if ($Task->Started and $Task->Status !~ /^(?:queued|running|canceled)$/) { my $Time = $Task->Ended - $Task->Started; _AddFullStat($GlobalStats, "$StepType.time", $Time, undef, $Task); @@ -383,7 +393,7 @@ sub GetStatistics($) } } - if (!$IsSpecialJob and$Job->Ended and + if (!$IsSpecialJob and $Job->Ended and $Job->Ended >= $Cutoff and $Job->Status !~ /^(?:queued|running|canceled)$/) { my $Time = $Job->Ended - $Job->Submitted; @@ -402,7 +412,7 @@ sub GetStatistics($) @JobTimes = (); # free early } - my ($Activity, $Counters) = GetActivity($VMs); + my ($Activity, $Counters) = GetActivity($VMs, $Seconds); $GlobalStats->{"recordgroups.count"} = $Counters->{recordgroups}; $GlobalStats->{"records.count"} = $Counters->{records}; foreach my $Group (@$Activity) @@ -456,14 +466,14 @@ sub GetStatistics($) # Note that we cannot simply sum the VMs busy wall clock times to get # the host busy wall clock time because this would count periods where # more than one VM is busy multiple times. - $HostStats->{"busy.elapsed"} += $Group->{end} - $Group->{start}; + $HostStats->{"busy.elapsed"} += $Group->{end} - max($Cutoff, $Group->{start}); $IsHostBusy{$Host} = 1; $IsGroupBusy = 1; } } if ($IsGroupBusy) { - $GlobalStats->{"busy.elapsed"} += $Group->{end} - $Group->{start}; + $GlobalStats->{"busy.elapsed"} += $Group->{end} - max($Cutoff, $Group->{start}); } } diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 9db2ad3..51a7227 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -206,12 +206,12 @@ sub GenerateBody($) _GenGlobalLine($GlobalStats, "elapsed", "Job history", "How far back the job history goes."); - _GenGlobalLine($GlobalStats, "jobs.count", "Job count", "The number of jobs in the job history."); - _AddRate($GlobalStats, "jobs.count"); - _GenGlobalLine($GlobalStats, "jobs.rate", "Job rate", "How fast new jobs are coming in."); - _GenGlobalLine($GlobalStats, "tasks.count", "Task count", "The number of tasks."); - _AddRate($GlobalStats, "tasks.count"); - _GenGlobalLine($GlobalStats, "tasks.rate", "Task rate", "How fast new tasks are coming in."); + _GenGlobalLine($GlobalStats, "newjobs.count", "Job count", "The number of jobs in the job history."); + _AddRate($GlobalStats, "newjobs.count"); + _GenGlobalLine($GlobalStats, "newjobs.rate", "Job rate", "How fast new jobs are coming in."); + _GenGlobalLine($GlobalStats, "newtasks.count", "Task count", "The number of tasks."); + _AddRate($GlobalStats, "newtasks.count"); + _GenGlobalLine($GlobalStats, "newtasks.rate", "Task rate", "How fast new tasks are coming in."); _GenGlobalLine($GlobalStats, "busy.elapsed", "Busy time", "How much wall clock time was spent running jobs.", $NO_PERCENTAGE); _GenGlobalLine($GlobalStats, "busy.elapsed", "Busy \%", "The percentage of wall clock time where the TestBot was busy running jobs.");

1 0

Jacek Caban : mshtml/tests: Run form element tests in both quirks and IE9 compat mode.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: f7b95a77c30d1915f64ece310942844459db3e02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7b95a77c30d1915f64ece31… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 8 20:54:09 2018 +0100 mshtml/tests: Run form element tests in both quirks and IE9 compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 95 ++++++++++++++++++++++++++++++------------------- 1 file changed, 59 insertions(+), 36 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 2ef7f38..f9d2690 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2752,7 +2752,10 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, V_I4(&name) = -1; disp = (void*)0xdeadbeef; hres = IHTMLElementCollection_item(col, name, index, &disp); - ok_(__FILE__,line) (hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); + if(compat_mode < COMPAT_IE9) + ok_(__FILE__,line) (hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); + else + ok_(__FILE__,line) (hres == S_OK, "item failed: %08x\n", hres); ok_(__FILE__,line) (disp == NULL, "disp != NULL\n"); IHTMLElementCollection_Release(col); @@ -4577,8 +4580,9 @@ static void _test_form_put_encoding(unsigned line, IUnknown *unk, HRESULT exp_hr _test_form_encoding(line, unk, encoding); } -#define test_form_elements(a) _test_form_elements(__LINE__,a) -static void _test_form_elements(unsigned line, IUnknown *unk) +#define test_form_elements(a,b,c) _test_form_elements(__LINE__,a,b,c) +static void _test_form_elements(unsigned line, IUnknown *unk, const elem_type_t *elem_types, + LONG elem_types_cnt) { IHTMLFormElement *form = _get_form_iface(line, unk); IDispatch *disp; @@ -4588,7 +4592,10 @@ static void _test_form_elements(unsigned line, IUnknown *unk) hres = IHTMLFormElement_get_elements(form, &disp); ok_(__FILE__,line)(hres == S_OK, "get_elements failed: %08x\n", hres); ok_(__FILE__,line)(disp != NULL, "disp = NULL\n"); - ok_(__FILE__,line)(iface_cmp((IUnknown*)form, (IUnknown*)disp), "disp != form\n"); + if(compat_mode < COMPAT_IE9) + ok_(__FILE__,line)(iface_cmp((IUnknown*)form, (IUnknown*)disp), "disp != form\n"); + else + _test_elem_collection(line, (IUnknown*)disp, elem_types, elem_types_cnt); IDispatch_Release(disp); IHTMLFormElement_Release(form); @@ -4640,7 +4647,7 @@ static void test_select_form(IUnknown *uselect, IUnknown *uform) ok(form != NULL, "form == NULL\n"); test_form_length((IUnknown*)form, 2); - test_form_elements((IUnknown*)form); + test_form_elements((IUnknown*)form, NULL, 0); test_form_name((IUnknown*)form, "form_name"); ok(iface_cmp(uform, (IUnknown*)form), "Expected %p, got %p\n", uform, form); @@ -5378,7 +5385,10 @@ static void test_form_item(IHTMLElement *elem) V_I4(&name) = -1; disp = (void*)0xdeadbeef; hres = IHTMLFormElement_item(form, name, index, &disp); - ok(hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); + if(compat_mode < COMPAT_IE9) + ok(hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); + else + ok(hres == S_OK, "item failed: %08x\n", hres); ok(!disp, "disp = %p\n", disp); V_I4(&name) = 2; @@ -8882,7 +8892,7 @@ static void test_elems(IHTMLDocument2 *doc) ok(elem != NULL, "elem == NULL\n"); if(elem) { test_form_length((IUnknown*)elem, 0); - test_form_elements((IUnknown*)elem); + test_form_elements((IUnknown*)elem, NULL, 0); IHTMLElement_Release(elem); } @@ -9262,35 +9272,6 @@ static void test_elems2(IHTMLDocument2 *doc) test_insert_adjacent_elems(doc, div); test_elem_set_innerhtml((IUnknown*)div, - "<form id=\"form\"><input type=\"button\" /><div><input type=\"text\" id=\"inputid\"/></div></textarea>"); - elem = get_elem_by_id(doc, "form", TRUE); - if(elem) { - test_form_length((IUnknown*)elem, 2); - test_form_item(elem); - test_form_action((IUnknown*)elem, NULL); - test_form_put_action((IUnknown*)elem, "about:blank"); - test_form_method((IUnknown*)elem, "get"); - test_form_put_method((IUnknown*)elem, S_OK, "post"); - test_form_put_method((IUnknown*)elem, E_INVALIDARG, "put"); - test_form_method((IUnknown*)elem, "post"); - test_form_name((IUnknown*)elem, NULL); - test_form_put_name((IUnknown*)elem, "Name"); - test_form_encoding((IUnknown*)elem, "application/x-www-form-urlencoded"); - test_form_put_encoding((IUnknown*)elem, S_OK, "text/plain"); - test_form_put_encoding((IUnknown*)elem, S_OK, "multipart/form-data"); - test_form_put_encoding((IUnknown*)elem, E_INVALIDARG, "image/png"); - test_form_encoding((IUnknown*)elem, "multipart/form-data"); - test_form_elements((IUnknown*)elem); - test_form_reset((IUnknown*)elem); - test_form_target((IUnknown*)elem); - IHTMLElement_Release(elem); - - elem = get_elem_by_id(doc, "inputid", TRUE); - test_input_get_form((IUnknown*)elem, "form"); - IHTMLElement_Release(elem); - } - - test_elem_set_innerhtml((IUnknown*)div, "<form id=\"form\" name=\"form_name\"><select id=\"sform\"><option id=\"oform\"></option></select><button id=\"btnid\"></button></form>"); elem = get_elem_by_id(doc, "sform", TRUE); elem2 = get_elem_by_id(doc, "form", TRUE); @@ -9393,6 +9374,47 @@ static void test_textarea_element(IHTMLDocument2 *doc, IHTMLElement *parent) IHTMLElement_Release(elem); } +static void test_form_element(IHTMLDocument2 *doc, IHTMLElement *parent) +{ + IHTMLElement *elem, *input_elem; + + static const elem_type_t elems_textarea_input[] = { ET_TEXTAREA, ET_INPUT }; + + test_elem_set_innerhtml((IUnknown*)parent, + "<form id=\"form\">" + "<textarea></textarea>" + "<div><input type=\"text\" id=\"inputid\" /></div>" + "</form>"); + elem = get_elem_by_id(doc, "form", TRUE); + test_elem_type((IUnknown*)elem, ET_FORM); + + test_form_length((IUnknown*)elem, 2); + test_form_item(elem); + test_form_action((IUnknown*)elem, NULL); + test_form_put_action((IUnknown*)elem, "about:blank"); + test_form_method((IUnknown*)elem, "get"); + test_form_put_method((IUnknown*)elem, S_OK, "post"); + test_form_put_method((IUnknown*)elem, E_INVALIDARG, "put"); + test_form_method((IUnknown*)elem, "post"); + test_form_name((IUnknown*)elem, NULL); + test_form_put_name((IUnknown*)elem, "Name"); + test_form_encoding((IUnknown*)elem, "application/x-www-form-urlencoded"); + test_form_put_encoding((IUnknown*)elem, S_OK, "text/plain"); + test_form_put_encoding((IUnknown*)elem, S_OK, "multipart/form-data"); + test_form_put_encoding((IUnknown*)elem, E_INVALIDARG, "image/png"); + test_form_encoding((IUnknown*)elem, "multipart/form-data"); + test_form_elements((IUnknown*)elem, elems_textarea_input, + sizeof(elems_textarea_input)/sizeof(*elems_textarea_input)); + test_form_reset((IUnknown*)elem); + test_form_target((IUnknown*)elem); + + input_elem = get_elem_by_id(doc, "inputid", TRUE); + test_input_get_form((IUnknown*)input_elem, "form"); + IHTMLElement_Release(input_elem); + + IHTMLElement_Release(elem); +} + static void test_dom_elements(IHTMLDocument2 *doc) { IHTMLElement *body, *div; @@ -9402,6 +9424,7 @@ static void test_dom_elements(IHTMLDocument2 *doc) div = get_doc_elem_by_id(doc, "parentdiv"); test_textarea_element(doc, div); + test_form_element(doc, div); IHTMLElement_Release(body); IHTMLElement_Release(div);

1 0

Jacek Caban : mshtml: Fixed error handling in IHTMLFormElement:: item in IE9+ mode.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 7da84dfe97147fa2eb2e9b582975eec84fa4cc16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7da84dfe97147fa2eb2e9b58… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 8 20:53:48 2018 +0100 mshtml: Fixed error handling in IHTMLFormElement::item in IE9+ mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlform.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 2957ad1..51adc20 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -540,8 +540,11 @@ static HRESULT WINAPI HTMLFormElement_item(IHTMLFormElement *iface, VARIANT name *pdisp = NULL; if(V_VT(&name) == VT_I4) { - if(V_I4(&name) < 0) - return E_INVALIDARG; + if(V_I4(&name) < 0) { + *pdisp = NULL; + return dispex_compat_mode(&This->element.node.event_target.dispex) >= COMPAT_MODE_IE9 + ? S_OK : E_INVALIDARG; + } return htmlform_item(This, V_I4(&name), pdisp); }

1 0

Jacek Caban : mshtml: Fixed error handling in IHTMLElementCollection:: item in IE9+ mode.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 9623fcb4747f252a54041a6fec7080e0faacbc1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9623fcb4747f252a54041a6f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 8 20:53:55 2018 +0100 mshtml: Fixed error handling in IHTMLElementCollection::item in IE9+ mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelemcol.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 8407e02..c08a876 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -63,7 +63,7 @@ static inline HTMLElement *elem_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLElement, node); } -static IHTMLElementCollection *HTMLElementCollection_Create(HTMLElement **elems, DWORD len); +static IHTMLElementCollection *HTMLElementCollection_Create(HTMLElement**,DWORD,compat_mode_t); static void elem_vector_add(elem_vector_t *buf, HTMLElement *elem) { @@ -421,7 +421,7 @@ static HRESULT WINAPI HTMLElementCollection_item(IHTMLElementCollection *iface, case VT_I4: case VT_INT: if(V_I4(&name) < 0) - return E_INVALIDARG; + return dispex_compat_mode(&This->dispex) < COMPAT_MODE_IE9 ? E_INVALIDARG : S_OK; hres = get_item_idx(This, V_I4(&name), pdisp); break; @@ -462,7 +462,8 @@ static HRESULT WINAPI HTMLElementCollection_item(IHTMLElementCollection *iface, if(buf.len > 1) { elem_vector_normalize(&buf); - *pdisp = (IDispatch*)HTMLElementCollection_Create(buf.buf, buf.len); + *pdisp = (IDispatch*)HTMLElementCollection_Create(buf.buf, buf.len, + dispex_compat_mode(&This->dispex)); }else { if(buf.len == 1) { /* Already AddRef-ed */ @@ -524,7 +525,8 @@ static HRESULT WINAPI HTMLElementCollection_tags(IHTMLElementCollection *iface, TRACE("fount %d tags\n", buf.len); - *pdisp = (IDispatch*)HTMLElementCollection_Create(buf.buf, buf.len); + *pdisp = (IDispatch*)HTMLElementCollection_Create(buf.buf, buf.len, + dispex_compat_mode(&This->dispex)); return S_OK; } @@ -677,7 +679,8 @@ IHTMLElementCollection *create_all_collection(HTMLDOMNode *node, BOOL include_ro create_all_list(node->doc, node, &buf); elem_vector_normalize(&buf); - return HTMLElementCollection_Create(buf.buf, buf.len); + return HTMLElementCollection_Create(buf.buf, buf.len, + dispex_compat_mode(&node->event_target.dispex)); } IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode *doc, nsIDOMNodeList *nslist) @@ -712,7 +715,7 @@ IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode *doc, n buf.buf = NULL; } - return HTMLElementCollection_Create(buf.buf, buf.len); + return HTMLElementCollection_Create(buf.buf, buf.len, doc->document_mode); } IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode *doc, nsIDOMHTMLCollection *nscol) @@ -748,7 +751,7 @@ IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode *doc, ns return NULL; } - return HTMLElementCollection_Create(buf.buf, buf.len); + return HTMLElementCollection_Create(buf.buf, buf.len, doc->document_mode); } HRESULT get_elem_source_index(HTMLElement *elem, LONG *ret) @@ -820,7 +823,8 @@ HRESULT get_elem_source_index(HTMLElement *elem, LONG *ret) return S_OK; } -static IHTMLElementCollection *HTMLElementCollection_Create(HTMLElement **elems, DWORD len) +static IHTMLElementCollection *HTMLElementCollection_Create(HTMLElement **elems, DWORD len, + compat_mode_t compat_mode) { HTMLElementCollection *ret = heap_alloc_zero(sizeof(HTMLElementCollection)); @@ -832,8 +836,8 @@ static IHTMLElementCollection *HTMLElementCollection_Create(HTMLElement **elems, ret->elems = elems; ret->len = len; - init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLElementCollection_iface, - &HTMLElementCollection_dispex); + init_dispex_with_compat_mode(&ret->dispex, (IUnknown*)&ret->IHTMLElementCollection_iface, + &HTMLElementCollection_dispex, compat_mode); TRACE("ret=%p len=%d\n", ret, len);

1 0

Michael Stefaniuc : xmllite: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: c9f1ada8e5d9134dc86271423409338b0370062a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9f1ada8e5d9134dc8627142… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 7 00:20:06 2018 +0100 xmllite: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/xmllite_private.h | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/xmllite/xmllite_private.h b/dlls/xmllite/xmllite_private.h index 702fadb..7884e27 100644 --- a/dlls/xmllite/xmllite_private.h +++ b/dlls/xmllite/xmllite_private.h @@ -21,22 +21,7 @@ #ifndef __XMLLITE_PRIVATE__ #define __XMLLITE_PRIVATE__ -/* memory allocation functions */ - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} +#include "wine/heap.h" static inline void *m_alloc(IMalloc *imalloc, size_t len) {

1 0

Andrey Gusev : api-ms-win-perf-legacy-l1-1-0: Add dll.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 661d11d07161b29226becd053018626e338a73c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=661d11d07161b29226becd05… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Feb 8 15:12:44 2018 +0200 api-ms-win-perf-legacy-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-perf-legacy-l1-1-0/Makefile.in | 1 + .../api-ms-win-perf-legacy-l1-1-0.spec | 9 +++++++++ tools/make_specfiles | 1 + 5 files changed, 14 insertions(+) diff --git a/configure b/configure index 6b7f7d8..57577da 100755 --- a/configure +++ b/configure @@ -1055,6 +1055,7 @@ enable_api_ms_win_mm_mme_l1_1_0 enable_api_ms_win_mm_time_l1_1_0 enable_api_ms_win_ntuser_dc_access_l1_1_0 enable_api_ms_win_ntuser_rectangle_l1_1_0 +enable_api_ms_win_perf_legacy_l1_1_0 enable_api_ms_win_power_base_l1_1_0 enable_api_ms_win_power_setting_l1_1_0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 @@ -18487,6 +18488,7 @@ wine_fn_config_dll api-ms-win-mm-mme-l1-1-0 enable_api_ms_win_mm_mme_l1_1_0 wine_fn_config_dll api-ms-win-mm-time-l1-1-0 enable_api_ms_win_mm_time_l1_1_0 wine_fn_config_dll api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_dc_access_l1_1_0 wine_fn_config_dll api-ms-win-ntuser-rectangle-l1-1-0 enable_api_ms_win_ntuser_rectangle_l1_1_0 +wine_fn_config_dll api-ms-win-perf-legacy-l1-1-0 enable_api_ms_win_perf_legacy_l1_1_0 wine_fn_config_dll api-ms-win-power-base-l1-1-0 enable_api_ms_win_power_base_l1_1_0 wine_fn_config_dll api-ms-win-power-setting-l1-1-0 enable_api_ms_win_power_setting_l1_1_0 wine_fn_config_dll api-ms-win-rtcore-ntuser-private-l1-1-0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 diff --git a/configure.ac b/configure.ac index 016b9bf..58ce104 100644 --- a/configure.ac +++ b/configure.ac @@ -2968,6 +2968,7 @@ WINE_CONFIG_DLL(api-ms-win-mm-mme-l1-1-0) WINE_CONFIG_DLL(api-ms-win-mm-time-l1-1-0) WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) WINE_CONFIG_DLL(api-ms-win-ntuser-rectangle-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-perf-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-power-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-power-setting-l1-1-0) WINE_CONFIG_DLL(api-ms-win-rtcore-ntuser-private-l1-1-0) diff --git a/dlls/api-ms-win-perf-legacy-l1-1-0/Makefile.in b/dlls/api-ms-win-perf-legacy-l1-1-0/Makefile.in new file mode 100644 index 0000000..0328476 --- /dev/null +++ b/dlls/api-ms-win-perf-legacy-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-perf-legacy-l1-1-0.dll diff --git a/dlls/api-ms-win-perf-legacy-l1-1-0/api-ms-win-perf-legacy-l1-1-0.spec b/dlls/api-ms-win-perf-legacy-l1-1-0/api-ms-win-perf-legacy-l1-1-0.spec new file mode 100644 index 0000000..9fe91d1 --- /dev/null +++ b/dlls/api-ms-win-perf-legacy-l1-1-0/api-ms-win-perf-legacy-l1-1-0.spec @@ -0,0 +1,9 @@ +@ stub PerfAddCounters +@ stub PerfCloseQueryHandle +@ stub PerfDeleteCounters +@ stub PerfEnumerateCounterSet +@ stub PerfEnumerateCounterSetInstances +@ stub PerfOpenQueryHandle +@ stub PerfQueryCounterData +@ stub PerfQueryCounterInfo +@ stub PerfQueryCounterSetRegistrationInfo diff --git a/tools/make_specfiles b/tools/make_specfiles index e5b2617..6b59b32 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -123,6 +123,7 @@ my @dll_groups = "api-ms-win-eventing-legacy-l1-1-0", "api-ms-win-eventing-provider-l1-1-0", "api-ms-win-eventlog-legacy-l1-1-0", + "api-ms-win-perf-legacy-l1-1-0", "api-ms-win-security-audit-l1-1-1", "api-ms-win-security-base-l1-2-0", "api-ms-win-security-base-private-l1-1-1",

1 0

Matteo Bruni : d3d10core/tests: Add tests for GenerateMips().
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 02e162eeea863cb8ecb057ffab1cefb8c51d01b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02e162eeea863cb8ecb057ff… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 6 19:36:13 2018 +0100 d3d10core/tests: Add tests for GenerateMips(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 463 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 463 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02e162eeea863cb8ecb0…

1 0

Jacek Caban : mshtml: Added IE9+ mode support to HTMLFormElement:: elements property.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 86475d5bab78e243750bd40b22b375a60c5d229f URL: https://source.winehq.org/git/wine.git/?a=commit;h=86475d5bab78e243750bd40b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 8 20:53:41 2018 +0100 mshtml: Added IE9+ mode support to HTMLFormElement::elements property. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlform.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index f73970f..2957ad1 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -275,11 +275,24 @@ static HRESULT WINAPI HTMLFormElement_get_method(IHTMLFormElement *iface, BSTR * static HRESULT WINAPI HTMLFormElement_get_elements(IHTMLFormElement *iface, IDispatch **p) { HTMLFormElement *This = impl_from_IHTMLFormElement(iface); + nsIDOMHTMLCollection *elements; + nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - *p = (IDispatch*)&This->IHTMLFormElement_iface; - IDispatch_AddRef(*p); + if(dispex_compat_mode(&This->element.node.event_target.dispex) < COMPAT_MODE_IE9) { + IDispatch_AddRef(*p = (IDispatch*)&This->IHTMLFormElement_iface); + return S_OK; + } + + nsres = nsIDOMHTMLFormElement_GetElements(This->nsform, &elements); + if(NS_FAILED(nsres)) { + ERR("GetElements failed: %08x\n", nsres); + return E_FAIL; + } + + *p = (IDispatch*)create_collection_from_htmlcol(This->element.node.doc, elements); + nsIDOMHTMLCollection_Release(elements); return S_OK; }

1 0

Jacek Caban : mshtml/tests: Run textarea tests in both quirks and IE9 compat mode.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 52c74af96b1869741aa5521e3e49f507635f8db3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52c74af96b1869741aa5521e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 8 20:53:35 2018 +0100 mshtml/tests: Run textarea tests in both quirks and IE9 compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 137 ++++++++++++++++++++++++++++++------------------ 1 file changed, 87 insertions(+), 50 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 2a4ae62..2ef7f38 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -43,7 +43,24 @@ static LANGID (WINAPI *pGetUserDefaultUILanguage)(void); static BOOL is_ie9plus; -static const char doc_blank[] = "<html></html>"; +static enum { + COMPAT_NONE, + COMPAT_IE9 +} compat_mode = COMPAT_NONE; + +static const char doc_blank[] = + "<html></html>"; + +static const char doc_blank_ie9[] = + "<!DOCTYPE html>\n" + "<html>" + " <head>" + " <meta http-equiv=\"x-ua-compatible\" content=\"IE=9\" />" + " </head>" + " <body>" + " </body>" + "</html>"; + static const char doc_str1[] = "<html><body>test</body></html>"; static const char range_test_str[] = "<html><body>test \na<font size=\"2\">bc\t123<br /> it's\r\n \t</font>text<br /></body></html>"; @@ -757,7 +774,7 @@ static void _test_disp2(unsigned line, IUnknown *unk, const IID *diid, const IID IID iid; HRESULT hres; - if(_test_get_dispid(line, unk, &iid)) + if(_test_get_dispid(line, unk, &iid) && compat_mode < COMPAT_IE9) ok_(__FILE__,line) (IsEqualGUID(&iid, diid) || broken(diid2 && IsEqualGUID(&iid, diid2)), "unexpected guid %s\n", wine_dbgstr_guid(&iid)); @@ -773,7 +790,7 @@ static void _test_disp2(unsigned line, IUnknown *unk, const IID *diid, const IID ok_(__FILE__,line)(hres == E_NOINTERFACE, "Got IManagedObject iface\n"); ok_(__FILE__,line)(!u, "u = %p\n", u); - if(val) + if(val && compat_mode < COMPAT_IE9) /* FIXME: Enable those tests in IE9+ mode */ _test_disp_value(line, unk, val); if(clsid) { @@ -9230,53 +9247,6 @@ static void test_elems2(IHTMLDocument2 *doc) test_elem_all((IUnknown*)div, outer_types, 1); IHTMLElement_Release(elem2); - test_elem_set_innerhtml((IUnknown*)div, "<textarea id=\"ta\"></textarea>"); - elem = get_elem_by_id(doc, "ta", TRUE); - if(elem) { - IHTMLFormElement *form; - - test_textarea_value((IUnknown*)elem, NULL); - test_textarea_put_value((IUnknown*)elem, "test"); - test_textarea_defaultvalue((IUnknown*)elem, NULL); - test_textarea_put_defaultvalue((IUnknown*)elem, "defval text"); - test_textarea_put_value((IUnknown*)elem, "test"); - test_textarea_readonly((IUnknown*)elem, VARIANT_FALSE); - test_textarea_put_readonly((IUnknown*)elem, VARIANT_TRUE); - test_textarea_put_readonly((IUnknown*)elem, VARIANT_FALSE); - test_textarea_type((IUnknown*)elem); - - form = get_textarea_form((IUnknown*)elem); - ok(!form, "form = %p\n", form); - - test_elem_istextedit(elem, VARIANT_TRUE); - - IHTMLElement_Release(elem); - } - - test_elem_set_innerhtml((IUnknown*)div, "<textarea id=\"ta\">default text</textarea>"); - elem = get_elem_by_id(doc, "ta", TRUE); - if(elem) { - test_textarea_defaultvalue((IUnknown*)elem, "default text"); - IHTMLElement_Release(elem); - } - - test_elem_set_innerhtml((IUnknown*)div, "<form id=\"fid\"><textarea id=\"ta\"></textarea></form>"); - elem = get_elem_by_id(doc, "ta", TRUE); - if(elem) { - IHTMLFormElement *form; - - elem2 = get_elem_by_id(doc, "fid", TRUE); - ok(elem2 != NULL, "elem2 == NULL\n"); - - form = get_textarea_form((IUnknown*)elem); - ok(form != NULL, "form = NULL\n"); - ok(iface_cmp((IUnknown*)form, (IUnknown*)elem2), "form != elem2\n"); - - IHTMLFormElement_Release(form); - IHTMLElement_Release(elem2); - IHTMLElement_Release(elem); - } - test_elem_set_innerhtml((IUnknown*)div, "<input value=\"val\" id =\"inputid\" />"); elem = get_elem_by_id(doc, "inputid", TRUE); @@ -9376,6 +9346,67 @@ static void test_elems2(IHTMLDocument2 *doc) IHTMLElement_Release(div); } +static void test_textarea_element(IHTMLDocument2 *doc, IHTMLElement *parent) +{ + IHTMLElement *form_elem, *elem; + IHTMLFormElement *form; + + test_elem_set_innerhtml((IUnknown*)parent, + "<form id=\"fid\"><textarea id=\"ta\"></textarea></form>"); + elem = get_elem_by_id(doc, "ta", TRUE); + test_elem_type((IUnknown*)elem, ET_TEXTAREA); + + form_elem = get_elem_by_id(doc, "fid", TRUE); + ok(form_elem != NULL, "form_elem == NULL\n"); + + form = get_textarea_form((IUnknown*)elem); + ok(form != NULL, "form = NULL\n"); + ok(iface_cmp((IUnknown*)form, (IUnknown*)form_elem), "form != form_elem\n"); + + IHTMLFormElement_Release(form); + IHTMLElement_Release(form_elem); + IHTMLElement_Release(elem); + + test_elem_set_innerhtml((IUnknown*)parent, "<textarea id=\"ta\"></textarea>"); + elem = get_elem_by_id(doc, "ta", TRUE); + + test_textarea_value((IUnknown*)elem, NULL); + test_textarea_put_value((IUnknown*)elem, "test"); + test_textarea_defaultvalue((IUnknown*)elem, NULL); + test_textarea_put_defaultvalue((IUnknown*)elem, "defval text"); + test_textarea_put_value((IUnknown*)elem, "test"); + test_textarea_readonly((IUnknown*)elem, VARIANT_FALSE); + test_textarea_put_readonly((IUnknown*)elem, VARIANT_TRUE); + test_textarea_put_readonly((IUnknown*)elem, VARIANT_FALSE); + test_textarea_type((IUnknown*)elem); + + form = get_textarea_form((IUnknown*)elem); + ok(!form, "form = %p\n", form); + + test_elem_istextedit(elem, VARIANT_TRUE); + + IHTMLElement_Release(elem); + + test_elem_set_innerhtml((IUnknown*)parent, "<textarea id=\"ta\">default text</textarea>"); + elem = get_elem_by_id(doc, "ta", TRUE); + test_textarea_defaultvalue((IUnknown*)elem, "default text"); + IHTMLElement_Release(elem); +} + +static void test_dom_elements(IHTMLDocument2 *doc) +{ + IHTMLElement *body, *div; + + body = doc_get_body(doc); + test_elem_set_innerhtml((IUnknown*)body, "<div id=\"parentdiv\"></div>"); + div = get_doc_elem_by_id(doc, "parentdiv"); + + test_textarea_element(doc, div); + + IHTMLElement_Release(body); + IHTMLElement_Release(div); +} + static void test_create_elems(IHTMLDocument2 *doc) { IHTMLElement *elem, *body, *elem2; @@ -10719,6 +10750,12 @@ START_TEST(dom) if (winetest_interactive || ! is_ie_hardened()) { run_domtest(elem_test_str, test_elems); run_domtest(elem_test2_str, test_elems2); + run_domtest(doc_blank, test_dom_elements); + if(is_ie9plus) { + compat_mode = COMPAT_IE9; + run_domtest(doc_blank_ie9, test_dom_elements); + compat_mode = COMPAT_NONE; + } run_domtest(noscript_str, test_noscript); }else { skip("IE running in Enhanced Security Configuration\n");

1 0

Jacek Caban : mshtml: Always set valid IEventTarget vtbl.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: a25d8c342fbe4eed4e9909cd503ac7e3073ba978 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a25d8c342fbe4eed4e9909cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 8 20:53:28 2018 +0100 mshtml: Always set valid IEventTarget vtbl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 44 +++++++++++--------------------------------- 1 file changed, 11 insertions(+), 33 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 2931318..69c9444 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -213,8 +213,6 @@ static const event_info_t event_info[] = { EVENT_FIXME} }; -static BOOL use_event_quirks(EventTarget*); - static eventid_t str_to_eid(const WCHAR *str) { int i; @@ -859,7 +857,7 @@ static ULONG WINAPI DOMEvent_Release(IDOMEvent *iface) if(This->mouse_event) nsIDOMMouseEvent_Release(This->mouse_event); if(This->target) - IDispatchEx_Release(&This->target->dispex.IDispatchEx_iface); + IEventTarget_Release(&This->target->IEventTarget_iface); nsIDOMEvent_Release(This->nsevent); release_dispex(&This->dispex); heap_free(This->type); @@ -2085,6 +2083,11 @@ static HRESULT call_cp_func(IDispatch *disp, DISPID dispid, IHTMLEventObj *event return IDispatch_Invoke(disp, dispid, &IID_NULL, 0, DISPATCH_METHOD, &dp, retv, &ei, &argerr); } +static BOOL use_event_quirks(EventTarget *event_target) +{ + return dispex_compat_mode(&event_target->dispex) < COMPAT_MODE_IE9; +} + static BOOL is_cp_event(cp_static_data_t *data, DISPID dispid) { int min, max, i; @@ -2342,7 +2345,7 @@ static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event, } iter = event_target; - IDispatchEx_AddRef(&event_target->dispex.IDispatchEx_iface); + IEventTarget_AddRef(&event_target->IEventTarget_iface); chain_cnt = 0; chain_buf_size = sizeof(target_chain_buf)/sizeof(*target_chain_buf); @@ -2382,9 +2385,9 @@ static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event, prev_event = target_vtbl->set_current_event(&event_target->dispex, event->event_obj); if(event->target) - IDispatchEx_Release(&event->target->dispex.IDispatchEx_iface); + IEventTarget_Release(&event->target->IEventTarget_iface); event->target = event_target; - IDispatchEx_AddRef(&event_target->dispex.IDispatchEx_iface); + IEventTarget_AddRef(&event_target->IEventTarget_iface); event->phase = DEP_CAPTURING_PHASE; i = chain_cnt-1; @@ -2433,7 +2436,7 @@ static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event, } for(i = 0; i < chain_cnt; i++) - IDispatchEx_Release(&target_chain[i]->dispex.IDispatchEx_iface); + IEventTarget_Release(&target_chain[i]->IEventTarget_iface); if(target_chain != target_chain_buf) heap_free(target_chain); @@ -3044,18 +3047,6 @@ static const IEventTargetVtbl EventTargetVtbl = { EventTarget_dispatchEvent }; -#define DELAY_INIT_VTBL ((const IEventTargetVtbl*)1) - -static BOOL use_event_quirks(EventTarget *event_target) -{ - if(event_target->IEventTarget_iface.lpVtbl == DELAY_INIT_VTBL) { - event_target->IEventTarget_iface.lpVtbl = - dispex_compat_mode(&event_target->dispex) >= COMPAT_MODE_IE9 - ? &EventTargetVtbl : NULL; - } - return !event_target->IEventTarget_iface.lpVtbl; -} - HRESULT EventTarget_QI(EventTarget *event_target, REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IEventTarget)) { @@ -3098,21 +3089,8 @@ void EventTarget_Init(EventTarget *event_target, IUnknown *outer, dispex_static_ compat_mode_t compat_mode) { init_dispex_with_compat_mode(&event_target->dispex, outer, dispex_data, compat_mode); + event_target->IEventTarget_iface.lpVtbl = &EventTargetVtbl; wine_rb_init(&event_target->handler_map, event_id_cmp); - - /* - * IEventTarget is supported by the object or not depending on compatibility mode. - * We use NULL vtbl for objects in compatibility mode not supporting the interface. - * For targets that don't know compatibility mode at creation time, we set vtbl - * to special DELAY_INIT_VTBL value so that vtbl will be set to proper value - * when it's needed. - */ - if(compat_mode == COMPAT_MODE_QUIRKS && dispex_data->vtbl && dispex_data->vtbl->get_compat_mode) - event_target->IEventTarget_iface.lpVtbl = DELAY_INIT_VTBL; - else if(compat_mode < COMPAT_MODE_IE9) - event_target->IEventTarget_iface.lpVtbl = NULL; - else - event_target->IEventTarget_iface.lpVtbl = &EventTargetVtbl; } void release_event_target(EventTarget *event_target)

1 0

Józef Kucia : d3d11/tests: Add test for alpha to coverage.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 6ce8b622c5571508dde6a4deacc384b49096a699 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ce8b622c5571508dde6a4de… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 8 15:22:43 2018 +0100 d3d11/tests: Add test for alpha to coverage. 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/tests/d3d11.c | 223 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 223 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6ce8b622c5571508dde6…

1 0

Nikolay Sivov : xmllite/tests: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: f826b25019e7cc6856dbaf11bd07bf45e82719f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f826b25019e7cc6856dbaf11… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 8 14:17:02 2018 +0300 xmllite/tests: Use the global HeapAlloc() wrappers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 0033776..3cdc177 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -30,20 +30,21 @@ #include "ole2.h" #include "xmllite.h" #include "wine/test.h" +#include "wine/heap.h" DEFINE_GUID(IID_IXmlReaderInput, 0x0b3ccc9b, 0x9214, 0x428b, 0xa2, 0xae, 0xef, 0x3a, 0xa8, 0x71, 0xaf, 0xda); static WCHAR *a2w(const char *str) { int len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - WCHAR *ret = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + WCHAR *ret = heap_alloc(len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); return ret; } static void free_str(WCHAR *str) { - HeapFree(GetProcessHeap(), 0, str); + heap_free(str); } static int strcmp_wa(const WCHAR *str1, const char *stra) @@ -408,9 +409,7 @@ static ULONG WINAPI testinput_Release(IUnknown *iface) ref = InterlockedDecrement(&This->ref); if (ref == 0) - { - HeapFree(GetProcessHeap(), 0, This); - } + heap_free(This); return ref; } @@ -426,7 +425,7 @@ static HRESULT testinput_createinstance(void **ppObj) { testinput *input; - input = HeapAlloc(GetProcessHeap(), 0, sizeof (*input)); + input = heap_alloc(sizeof(*input)); if(!input) return E_OUTOFMEMORY; input->IUnknown_iface.lpVtbl = &testinput_vtbl;

1 0

Józef Kucia : wined3d: Introduce blend state object.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 350a757e37965a646128f8600a0eb2c4bca6e20f URL: https://source.winehq.org/git/wine.git/?a=commit;h=350a757e37965a646128f860… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 8 15:22:44 2018 +0100 wined3d: Introduce blend state object. 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/wined3d/cs.c | 27 +++++++++++++ dlls/wined3d/device.c | 25 ++++++++++++ dlls/wined3d/state.c | 88 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d.spec | 7 ++++ dlls/wined3d/wined3d_private.h | 18 ++++++++- include/wine/wined3d.h | 15 +++++++ 6 files changed, 178 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=350a757e37965a646128…

1 0

Jacek Caban : mshtml: Store compat mode in dispex_data_t and use it in dispex_compat_mode when possible.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 728080667267a636d68cdf8ff8d1731a6e27aa0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=728080667267a636d68cdf8f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 8 20:53:21 2018 +0100 mshtml: Store compat mode in dispex_data_t and use it in dispex_compat_mode when possible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index ea20baf..360d915 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -64,6 +64,7 @@ typedef struct { struct dispex_data_t { dispex_static_data_t *desc; + compat_mode_t compat_mode; DWORD func_cnt; DWORD func_size; @@ -411,6 +412,7 @@ static dispex_data_t *preprocess_dispex_data(dispex_static_data_t *desc, compat_ return NULL; } data->desc = desc; + data->compat_mode = compat_mode; data->func_cnt = 0; data->func_disp_cnt = 0; data->func_size = 16; @@ -1364,7 +1366,9 @@ HRESULT remove_attribute(DispatchEx *This, DISPID id, VARIANT_BOOL *success) compat_mode_t dispex_compat_mode(DispatchEx *dispex) { - return dispex->info->desc->vtbl->get_compat_mode(dispex); + return dispex->info != dispex->info->desc->delayed_init_info + ? dispex->info->compat_mode + : dispex->info->desc->vtbl->get_compat_mode(dispex); } static dispex_data_t *ensure_dispex_info(dispex_static_data_t *desc, compat_mode_t compat_mode)

1 0

Nikolay Sivov : comctl32: Introduce Static control.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 31d3fcc0b20eabe40182300219eecc832f5e3afe URL: https://source.winehq.org/git/wine.git/?a=commit;h=31d3fcc0b20eabe401823002… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 8 13:37:23 2018 +0300 comctl32: Introduce Static control. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/Makefile.in | 1 + dlls/comctl32/button.c | 2 +- dlls/comctl32/comctl32.h | 3 + dlls/comctl32/commctrl.c | 2 + dlls/comctl32/static.c | 812 +++++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/misc.c | 3 +- dlls/user32/class.c | 1 - dlls/user32/tests/class.c | 1 + 8 files changed, 822 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=31d3fcc0b20eabe40182…

1 0

Hans Leidekker : kerberos: Don' t fail on caller supplied credentials in kerberos_SpAcquireCredentialsHandle.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 574446923420a9ec23f6d73bedc216fe960b4060 URL: https://source.winehq.org/git/wine.git/?a=commit;h=574446923420a9ec23f6d73b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 8 11:53:57 2018 +0100 kerberos: Don't fail on caller supplied credentials in kerberos_SpAcquireCredentialsHandle. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 99673b0..78ec6d3 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -832,11 +832,7 @@ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( TRACE( "(%s 0x%08x %p %p %p %p %p %p)\n", debugstr_us(principal_us), credential_use, logon_id, auth_data, get_key_fn, get_key_arg, credential, ts_expiry ); - if (auth_data) - { - FIXME( "specific credentials not supported\n" ); - return SEC_E_UNKNOWN_CREDENTIALS; - } + if (auth_data) FIXME( "specific credentials not supported\n" ); switch (credential_use) {

1 0

Dmitry Timoshkov : kerberos: Slightly simplify name_sspi_to_gss.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 0d44fc790492afb616727ca2f1991c9f193468c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d44fc790492afb616727ca2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 8 09:42:43 2018 +0800 kerberos: Slightly simplify name_sspi_to_gss. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index e3ede45..99673b0 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -748,10 +748,9 @@ static SECURITY_STATUS name_sspi_to_gss( const UNICODE_STRING *name_str, gss_nam gss_OID type = GSS_C_NO_OID; /* FIXME: detect the appropriate value for this ourselves? */ gss_buffer_desc buf; - buf.length = WideCharToMultiByte( CP_UNIXCP, 0, name_str->Buffer, name_str->Length / sizeof(WCHAR), NULL, 0, NULL, NULL ) + 1; + buf.length = WideCharToMultiByte( CP_UNIXCP, 0, name_str->Buffer, name_str->Length / sizeof(WCHAR), NULL, 0, NULL, NULL ); if (!(buf.value = heap_alloc( buf.length ))) return SEC_E_INSUFFICIENT_MEMORY; WideCharToMultiByte( CP_UNIXCP, 0, name_str->Buffer, name_str->Length / sizeof(WCHAR), buf.value, buf.length, NULL, NULL ); - buf.length--; ret = pgss_import_name( &minor_status, &buf, type, name ); TRACE( "gss_import_name returned %08x minor status %08x\n", ret, minor_status );

1 0

Hans Leidekker : secur32: Implement QueryContextAttributesA( SECPKG_ATTR_NEGOTIATION_INFO) in the LSA wrapper.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 3e4fb94d82530580bb7db42b2ce99965d7f38861 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e4fb94d82530580bb7db42b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 8 11:54:00 2018 +0100 secur32: Implement QueryContextAttributesA(SECPKG_ATTR_NEGOTIATION_INFO) in the LSA wrapper. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/lsa.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 511e24a..b93006a 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -554,6 +554,32 @@ static SECURITY_STATUS WINAPI lsa_QueryContextAttributesW(CtxtHandle *context, U return lsa_package->lsa_api->SpQueryContextAttributes(lsa_context, attribute, buffer); } +static SecPkgInfoA *package_infoWtoA( const SecPkgInfoW *info ) +{ + SecPkgInfoA *ret; + int size_name = WideCharToMultiByte( CP_ACP, 0, info->Name, -1, NULL, 0, NULL, NULL ); + int size_comment = WideCharToMultiByte( CP_ACP, 0, info->Comment, -1, NULL, 0, NULL, NULL ); + + if (!(ret = HeapAlloc( GetProcessHeap(), 0, sizeof(*ret) + size_name + size_comment ))) return NULL; + ret->fCapabilities = info->fCapabilities; + ret->wVersion = info->wVersion; + ret->wRPCID = info->wRPCID; + ret->cbMaxToken = info->cbMaxToken; + ret->Name = (SEC_CHAR *)(ret + 1); + WideCharToMultiByte( CP_ACP, 0, info->Name, -1, ret->Name, size_name, NULL, NULL ); + ret->Comment = ret->Name + size_name; + WideCharToMultiByte( CP_ACP, 0, info->Comment, -1, ret->Comment, size_comment, NULL, NULL ); + return ret; +} + +static SECURITY_STATUS nego_info_WtoA( const SecPkgContext_NegotiationInfoW *infoW, + SecPkgContext_NegotiationInfoA *infoA ) +{ + infoA->NegotiationState = infoW->NegotiationState; + if (!(infoA->PackageInfo = package_infoWtoA( infoW->PackageInfo ))) return SEC_E_INSUFFICIENT_MEMORY; + return SEC_E_OK; +} + static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, ULONG attribute, void *buffer) { TRACE("%p %d %p\n", context, attribute, buffer); @@ -565,6 +591,18 @@ static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, U case SECPKG_ATTR_SIZES: return lsa_QueryContextAttributesW( context, attribute, buffer ); + case SECPKG_ATTR_NEGOTIATION_INFO: + { + SecPkgContext_NegotiationInfoW infoW; + SecPkgContext_NegotiationInfoA *infoA = (SecPkgContext_NegotiationInfoA *)buffer; + SECURITY_STATUS status = lsa_QueryContextAttributesW( context, SECPKG_ATTR_NEGOTIATION_INFO, &infoW ); + + if (status != SEC_E_OK) return status; + status = nego_info_WtoA( &infoW, infoA ); + FreeContextBuffer( infoW.PackageInfo ); + return status; + } + #define X(x) case (x) : FIXME(#x" stub\n"); break X(SECPKG_ATTR_ACCESS_TOKEN); X(SECPKG_ATTR_AUTHORITY); @@ -578,7 +616,6 @@ static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, U X(SECPKG_ATTR_SESSION_KEY); X(SECPKG_ATTR_STREAM_SIZES); X(SECPKG_ATTR_TARGET_INFORMATION); - X(SECPKG_ATTR_NEGOTIATION_INFO); #undef X default: FIXME( "unknown attribute %u\n", attribute );

1 0

Nikolay Sivov : user32: Remove confusing comments.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 1ae05c04a28065aed9b045ec3f73a66dcc5c07b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ae05c04a28065aed9b045ec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 8 13:52:16 2018 +0300 user32: Remove confusing comments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 9 --------- dlls/user32/combo.c | 9 --------- dlls/user32/edit.c | 9 --------- dlls/user32/listbox.c | 9 --------- dlls/user32/scroll.c | 9 --------- dlls/user32/static.c | 9 --------- 6 files changed, 54 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index e5cee12..52e718f 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -18,15 +18,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * - * NOTES - * - * This code was audited for completeness against the documented features - * of Comctl32.dll version 6.0 on Oct. 3, 2004, by Dimitrie O. Paun. - * - * Unless otherwise noted, we believe this code to be complete, as per - * the specification mentioned above. - * If you discover missing features, or bugs, please note them below. - * * TODO * Styles * - BS_NOTIFY: is it complete? diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index b69f892..ef75c76 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -17,15 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * - * NOTES - * - * This code was audited for completeness against the documented features - * of Comctl32.dll version 6.0 on Oct. 4, 2004, by Dimitrie O. Paun. - * - * Unless otherwise noted, we believe this code to be complete, as per - * the specification mentioned above. - * If you discover missing features, or bugs, please note them below. - * * TODO: * - ComboBox_[GS]etMinVisible() * - CB_GETMINVISIBLE, CB_SETMINVISIBLE diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 614a979..693c58f 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -20,15 +20,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * - * NOTES - * - * This code was audited for completeness against the documented features - * of Comctl32.dll version 6.0 on Oct. 8, 2004, by Dimitrie O. Paun. - * - * Unless otherwise noted, we believe this code to be complete, as per - * the specification mentioned above. - * If you discover missing features, or bugs, please note them below. - * * TODO: * - EDITBALLOONTIP structure * - EM_GETCUEBANNER/Edit_GetCueBannerText diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 6b47f05..f6b936a 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -17,15 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * - * NOTES - * - * This code was audited for completeness against the documented features - * of Comctl32.dll version 6.0 on Oct. 9, 2004, by Dimitrie O. Paun. - * - * Unless otherwise noted, we believe this code to be complete, as per - * the specification mentioned above. - * If you discover missing features, or bugs, please note them below. - * * TODO: * - LBS_NODATA */ diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 4b572e5..1c127fb 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -17,15 +17,6 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * NOTES - * - * This code was audited for completeness against the documented features - * of Comctl32.dll version 6.0 on Oct. 8, 2004, by Dimitrie O. Paun. - * - * Unless otherwise noted, we believe this code to be complete, as per - * the specification mentioned above. - * If you discover missing features, or bugs, please note them below. */ #include "config.h" diff --git a/dlls/user32/static.c b/dlls/user32/static.c index 60fcb79..11b04fc 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -17,15 +17,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * - * NOTES - * - * This code was audited for completeness against the documented features - * of Comctl32.dll version 6.0 on Oct. 4, 2004, by Dimitrie O. Paun. - * - * Unless otherwise noted, we believe this code to be complete, as per - * the specification mentioned above. - * If you discover missing features, or bugs, please note them below. - * * Notes: * - Windows XP introduced new behavior: The background of centered * icons and bitmaps is painted differently. This is only done if

1 0

Józef Kucia : wined3d: Simplify shader_calculate_clip_or_cull_distance_mask().
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 87f823ad9196a8f26d1ac4272630e73aaae5cd17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87f823ad9196a8f26d1ac427… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 8 15:22:47 2018 +0100 wined3d: Simplify shader_calculate_clip_or_cull_distance_mask(). 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/wined3d/shader.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index c775df0..424025c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -958,27 +958,19 @@ static HRESULT shader_record_shader_phase(struct wined3d_shader *shader, } static HRESULT shader_calculate_clip_or_cull_distance_mask( - const struct wined3d_shader_signature_element *e, DWORD *mask) + const struct wined3d_shader_signature_element *e, unsigned int *mask) { - unsigned int i; - - *mask = 0; - - /* Cull and clip distances are packed in 4 component registers. 0 and 1 are + /* Clip and cull distances are packed in 4 component registers. 0 and 1 are * the only allowed semantic indices. */ if (e->semantic_idx >= MAX_CLIP_DISTANCES / 4) { + *mask = 0; WARN("Invalid clip/cull distance index %u.\n", e->semantic_idx); return WINED3DERR_INVALIDCALL; } - for (i = 0; i < 4; ++i) - { - if (e->mask & (WINED3DSP_WRITEMASK_0 << i)) - *mask |= 1u << (4 * e->semantic_idx + i); - } - + *mask = (e->mask & WINED3DSP_WRITEMASK_ALL) << (4 * e->semantic_idx); return WINED3D_OK; } @@ -1786,7 +1778,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st for (i = 0; i < output_signature->element_count; ++i) { const struct wined3d_shader_signature_element *e = &output_signature->elements[i]; - DWORD mask; + unsigned int mask; reg_maps->output_registers |= 1u << e->register_idx; if (e->sysval_semantic == WINED3D_SV_CLIP_DISTANCE)

1 0

Akihiro Sagawa : gdi32/tests: Add more ABC width tests in various widths.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: da63c2356dffbfdcfe0566d312a05202900a547d URL: https://source.winehq.org/git/wine.git/?a=commit;h=da63c2356dffbfdcfe0566d3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Feb 4 21:02:09 2018 +0900 gdi32/tests: Add more ABC width tests in various widths. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 4bac19a..7a74565 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1340,6 +1340,56 @@ static void test_GetCharABCWidths(void) "got %d, expected %d (C)\n", abc[0].abcC, abcw[0].abcC); DeleteObject(SelectObject(hdc, hfont)); + + /* test abcA == gmptGlyphOrigin.x && abcB == gmBlackBoxX + in various widths. */ + for (i = 1; i <= 2; i++) + { + UINT j; + UINT code; + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = 20; + switch(i) + { + case 1: + strcpy(lf.lfFaceName, "Tahoma"); + code = 'a'; + break; + case 2: + strcpy(lf.lfFaceName, "Times New Roman"); + lf.lfItalic = TRUE; + code = 'f'; + break; + } + if (!is_truetype_font_installed(lf.lfFaceName)) + { + skip("%s is not installed\n", lf.lfFaceName); + continue; + } + for (j = 1; j <= 80; j++) + { + GLYPHMETRICS gm; + + lf.lfWidth = j; + hfont = CreateFontIndirectA(&lf); + hfont = SelectObject(hdc, hfont); + + nb = GetGlyphOutlineA(hdc, code, GGO_METRICS, &gm, 0, NULL, &mat); + ok(nb, "GetGlyphOutlineA should have succeeded at width %d\n", i); + + ret = GetCharABCWidthsA(hdc, code, code, abc); + ok(ret, "GetCharABCWidthsA should have succeeded at width %d\n", i); + + ok(abc[0].abcA == gm.gmptGlyphOrigin.x, + "abcA(%d) and gmptGlyphOrigin.x(%d) values are different at width %d\n", + abc[0].abcA, gm.gmptGlyphOrigin.x, i); + ok(abc[0].abcB == gm.gmBlackBoxX, + "abcB(%d) and gmBlackBoxX(%d) values are different at width %d\n", + abc[0].abcB, gm.gmBlackBoxX, i); + DeleteObject(SelectObject(hdc, hfont)); + } + } ReleaseDC(NULL, hdc); trace("ABC sign test for a variety of transforms:\n");

1 0

Akihiro Sagawa : gdi32: Fix ABC width calculations when using vertical font.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: c17a8f32c412cf9d825da87f5ccf682d52f2b1ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=c17a8f32c412cf9d825da87f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Feb 4 21:02:13 2018 +0900 gdi32: Fix ABC width calculations when using vertical font. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 3 ++- dlls/gdi32/tests/font.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 7016095..3833147 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7050,6 +7050,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, pFT_Vector_Transform(&vec, &transMat); origin_x = (vec.x + left) & -64; origin_y = (vec.y + top + 63) & -64; + lsb -= metrics.horiBearingY; } else { @@ -7074,7 +7075,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, else abc->abcA = -((pFT_Vector_Length(&vec) + 63) >> 6); /* We use lsb again to avoid rounding errors */ - vec.x = lsb + metrics.width; + vec.x = lsb + (tategaki ? metrics.height : metrics.width); vec.y = 0; pFT_Vector_Transform(&vec, &transMatUnrotated); abc->abcB = ((pFT_Vector_Length(&vec) + 63) >> 6) - abc->abcA; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index d5f04ff..d6fe9e3 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5959,9 +5959,9 @@ static void check_vertical_metrics(const char *face) ok(ret != GDI_ERROR, "GetGlyphOutlineW failed\n"); ret = GetCharABCWidthsW(hdc, code, code, &vabc); ok(ret, "GetCharABCWidthsW failed\n"); - todo_wine ok(vabc.abcA == vgm.gmptGlyphOrigin.x, "expected %d, got %d\n", + ok(vabc.abcA == vgm.gmptGlyphOrigin.x, "expected %d, got %d\n", vabc.abcA, vgm.gmptGlyphOrigin.x); - todo_wine ok(vabc.abcB == vgm.gmBlackBoxX, "expected %d, got %d\n", + ok(vabc.abcB == vgm.gmBlackBoxX, "expected %d, got %d\n", vabc.abcB, vgm.gmBlackBoxX); ok(vabc.abcA + vabc.abcB + vabc.abcC == vgm.gmCellIncX, "expected %d, got %d\n",

1 0

Józef Kucia : d3d11: Use wined3d blend state objects.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: dec8b87c9450d2d458ed2b005d3b04c6a59f6414 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dec8b87c9450d2d458ed2b00… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 8 15:22:45 2018 +0100 d3d11: Use wined3d blend state objects. 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/d3d11_private.h | 2 +- dlls/d3d11/device.c | 20 +++++++++--- dlls/d3d11/state.c | 78 ++++++++++++++++++++++++++++------------------ 3 files changed, 64 insertions(+), 36 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 1030b96..52496d8 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -392,6 +392,7 @@ struct d3d_blend_state LONG refcount; struct wined3d_private_store private_store; + struct wined3d_blend_state *wined3d_state; D3D11_BLEND_DESC desc; struct wine_rb_entry entry; ID3D11Device *device; @@ -522,7 +523,6 @@ struct d3d_device struct wine_rb_tree rasterizer_states; struct wine_rb_tree sampler_states; - struct d3d_blend_state *blend_state; float blend_factor[4]; struct d3d_depthstencil_state *depth_stencil_state; UINT stencil_ref; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index b14c386..f9db15f 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -686,6 +686,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi { struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); static const float default_blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; + struct d3d_blend_state *blend_state_impl; const D3D11_BLEND_DESC *desc; TRACE("iface %p, blend_state %p, blend_factor %s, sample_mask 0x%08x.\n", @@ -697,8 +698,9 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi wined3d_mutex_lock(); memcpy(device->blend_factor, blend_factor, 4 * sizeof(*blend_factor)); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEMASK, sample_mask); - if (!(device->blend_state = unsafe_impl_from_ID3D11BlendState(blend_state))) + if (!(blend_state_impl = unsafe_impl_from_ID3D11BlendState(blend_state))) { + wined3d_device_set_blend_state(device->wined3d_device, NULL); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ALPHABLENDENABLE, FALSE); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_COLORWRITEENABLE, D3D11_COLOR_WRITE_ENABLE_ALL); @@ -712,7 +714,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi return; } - desc = &device->blend_state->desc; + wined3d_device_set_blend_state(device->wined3d_device, blend_state_impl->wined3d_state); + desc = &blend_state_impl->desc; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ALPHABLENDENABLE, desc->RenderTarget[0].BlendEnable); if (desc->RenderTarget[0].BlendEnable) @@ -1988,13 +1991,22 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetBlendState(ID3D11Devi ID3D11BlendState **blend_state, FLOAT blend_factor[4], UINT *sample_mask) { struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct wined3d_blend_state *wined3d_state; + struct d3d_blend_state *blend_state_impl; TRACE("iface %p, blend_state %p, blend_factor %p, sample_mask %p.\n", iface, blend_state, blend_factor, sample_mask); - if ((*blend_state = device->blend_state ? &device->blend_state->ID3D11BlendState_iface : NULL)) - ID3D11BlendState_AddRef(*blend_state); wined3d_mutex_lock(); + if ((wined3d_state = wined3d_device_get_blend_state(device->wined3d_device))) + { + blend_state_impl = wined3d_blend_state_get_parent(wined3d_state); + ID3D11BlendState_AddRef(*blend_state = &blend_state_impl->ID3D11BlendState_iface); + } + else + { + *blend_state = NULL; + } memcpy(blend_factor, device->blend_factor, 4 * sizeof(*blend_factor)); *sample_mask = wined3d_device_get_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEMASK); wined3d_mutex_unlock(); diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 47058a0..a14c9d3 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -64,13 +64,15 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_AddRef(ID3D11BlendState *iface) TRACE("%p increasing refcount to %u.\n", state, refcount); - return refcount; -} + if (refcount == 1) + { + ID3D11Device_AddRef(state->device); + wined3d_mutex_lock(); + wined3d_blend_state_incref(state->wined3d_state); + wined3d_mutex_unlock(); + } -static void d3d_blend_state_cleanup(struct d3d_blend_state *state) -{ - wined3d_private_store_cleanup(&state->private_store); - ID3D11Device_Release(state->device); + return refcount; } static ULONG STDMETHODCALLTYPE d3d11_blend_state_Release(ID3D11BlendState *iface) @@ -82,12 +84,13 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_Release(ID3D11BlendState *iface if (!refcount) { - struct d3d_device *device = impl_from_ID3D11Device(state->device); + ID3D11Device *device = state->device; + wined3d_mutex_lock(); - wine_rb_remove(&device->blend_states, &state->entry); - d3d_blend_state_cleanup(state); + wined3d_blend_state_decref(state->wined3d_state); wined3d_mutex_unlock(); - heap_free(state); + + ID3D11Device_Release(device); } return refcount; @@ -288,24 +291,25 @@ static const struct ID3D10BlendState1Vtbl d3d10_blend_state_vtbl = d3d10_blend_state_GetDesc1, }; -static HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *device, - const D3D11_BLEND_DESC *desc) +static void STDMETHODCALLTYPE d3d_blend_state_wined3d_object_destroyed(void *parent) { - state->ID3D11BlendState_iface.lpVtbl = &d3d11_blend_state_vtbl; - state->ID3D10BlendState1_iface.lpVtbl = &d3d10_blend_state_vtbl; - state->refcount = 1; - wined3d_private_store_init(&state->private_store); - state->desc = *desc; - - state->device = &device->ID3D11Device_iface; - ID3D11Device_AddRef(state->device); + struct d3d_blend_state *state = parent; + struct d3d_device *device = impl_from_ID3D11Device(state->device); - return S_OK; + wine_rb_remove(&device->blend_states, &state->entry); + wined3d_private_store_cleanup(&state->private_store); + heap_free(parent); } +static const struct wined3d_parent_ops d3d_blend_state_wined3d_parent_ops = +{ + d3d_blend_state_wined3d_object_destroyed, +}; + HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC *desc, struct d3d_blend_state **state) { + struct wined3d_blend_state_desc wined3d_desc; struct d3d_blend_state *object; struct wine_rb_entry *entry; D3D11_BLEND_DESC tmp_desc; @@ -337,9 +341,6 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC tmp_desc.RenderTarget[i].RenderTargetWriteMask, i); } - /* glSampleCoverage() */ - if (tmp_desc.AlphaToCoverageEnable) - FIXME("Ignoring AlphaToCoverageEnable %#x.\n", tmp_desc.AlphaToCoverageEnable); /* glEnableIndexedEXT(GL_BLEND, ...) */ if (tmp_desc.IndependentBlendEnable) FIXME("Per-rendertarget blend not implemented.\n"); @@ -363,24 +364,39 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC return E_OUTOFMEMORY; } - if (FAILED(hr = d3d_blend_state_init(object, device, &tmp_desc))) + object->ID3D11BlendState_iface.lpVtbl = &d3d11_blend_state_vtbl; + object->ID3D10BlendState1_iface.lpVtbl = &d3d10_blend_state_vtbl; + object->refcount = 1; + wined3d_private_store_init(&object->private_store); + object->desc = tmp_desc; + + if (wine_rb_put(&device->blend_states, &tmp_desc, &object->entry) == -1) { - WARN("Failed to initialize blend state, hr %#x.\n", hr); + ERR("Failed to insert blend state entry.\n"); + wined3d_private_store_cleanup(&object->private_store); heap_free(object); wined3d_mutex_unlock(); - return hr; + return E_FAIL; } - if (wine_rb_put(&device->blend_states, desc, &object->entry) == -1) + wined3d_desc.alpha_to_coverage = desc->AlphaToCoverageEnable; + + /* We cannot fail after creating a wined3d_blend_state object. It + * would lead to double free. */ + if (FAILED(hr = wined3d_blend_state_create(device->wined3d_device, &wined3d_desc, + object, &d3d_blend_state_wined3d_parent_ops, &object->wined3d_state))) { - ERR("Failed to insert blend state entry.\n"); - d3d_blend_state_cleanup(object); + WARN("Failed to create wined3d blend state, hr %#x.\n", hr); + wined3d_private_store_cleanup(&object->private_store); + wine_rb_remove(&device->blend_states, &object->entry); heap_free(object); wined3d_mutex_unlock(); - return E_FAIL; + return hr; } wined3d_mutex_unlock(); + ID3D11Device_AddRef(object->device = &device->ID3D11Device_iface); + TRACE("Created blend state %p.\n", object); *state = object;

1 0

Józef Kucia : wined3d: Fix resinfo for multisample textures.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: cd5f8f786badfa712aeb097791df86379fbd86b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd5f8f786badfa712aeb0977… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 8 15:22:46 2018 +0100 wined3d: Fix resinfo for multisample textures. 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/wined3d/glsl_shader.c | 72 ++++++++++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6f54b31..b3c6404 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5894,15 +5894,28 @@ static void shader_glsl_bufinfo(const struct wined3d_shader_instruction *ins) shader_addline(buffer, ", %u)%s);\n", resource_info->stride, dst_swizzle); } +static BOOL is_multisampled(enum wined3d_shader_resource_type resource_type) +{ + return resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2DMS + || resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY; +} + +static BOOL is_mipmapped(enum wined3d_shader_resource_type resource_type) +{ + return resource_type != WINED3D_SHADER_RESOURCE_BUFFER && !is_multisampled(resource_type); +} + static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_version *version = &ins->ctx->reg_maps->shader_version; const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + struct wined3d_string_buffer *buffer = ins->ctx->buffer; enum wined3d_shader_resource_type resource_type; enum wined3d_shader_register_type reg_type; unsigned int resource_idx, bind_idx, i; enum wined3d_data_type dst_data_type; struct glsl_src_param lod_param; + BOOL supports_mipmaps; char dst_swizzle[6]; DWORD write_mask; @@ -5912,9 +5925,6 @@ static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) else if (ins->flags) FIXME("Unhandled flags %#x.\n", ins->flags); - write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &ins->dst[0], dst_data_type); - shader_glsl_get_swizzle(&ins->src[1], FALSE, write_mask, dst_swizzle); - reg_type = ins->src[1].reg.type; resource_idx = ins->src[1].reg.idx[0].offset; shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &lod_param); @@ -5933,46 +5943,55 @@ static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) if (resource_type >= ARRAY_SIZE(resource_type_info)) { ERR("Unexpected resource type %#x.\n", resource_type); - resource_type = WINED3D_SHADER_RESOURCE_TEXTURE_2D; + return; } + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], dst_data_type); + shader_glsl_get_swizzle(&ins->src[1], FALSE, write_mask, dst_swizzle); + if (dst_data_type == WINED3D_DATA_UINT) - shader_addline(ins->ctx->buffer, "uvec4("); + shader_addline(buffer, "uvec4("); else - shader_addline(ins->ctx->buffer, "vec4("); + shader_addline(buffer, "vec4("); if (reg_type == WINED3DSPR_RESOURCE) { - shader_addline(ins->ctx->buffer, "textureSize(%s_sampler%u, %s), ", - shader_glsl_get_prefix(version->type), bind_idx, lod_param.param_str); + shader_addline(buffer, "textureSize(%s_sampler%u", + shader_glsl_get_prefix(version->type), bind_idx); + } + else + { + shader_addline(buffer, "imageSize(%s_image%u", + shader_glsl_get_prefix(version->type), bind_idx); + } - for (i = 0; i < 3 - resource_type_info[resource_type].resinfo_size; ++i) - shader_addline(ins->ctx->buffer, "0, "); + supports_mipmaps = is_mipmapped(resource_type) && reg_type != WINED3DSPR_UAV; + if (supports_mipmaps) + shader_addline(buffer, ", %s", lod_param.param_str); + shader_addline(buffer, "), "); + for (i = 0; i < 3 - resource_type_info[resource_type].resinfo_size; ++i) + shader_addline(buffer, "0, "); + + if (supports_mipmaps) + { if (gl_info->supported[ARB_TEXTURE_QUERY_LEVELS]) { - shader_addline(ins->ctx->buffer, "textureQueryLevels(%s_sampler%u)", + shader_addline(buffer, "textureQueryLevels(%s_sampler%u)", shader_glsl_get_prefix(version->type), bind_idx); } else { - FIXME("textureQueryLevels is not supported, returning 1 mipmap level.\n"); - shader_addline(ins->ctx->buffer, "1"); + FIXME("textureQueryLevels is not supported, returning 1 level.\n"); + shader_addline(buffer, "1"); } } else { - shader_addline(ins->ctx->buffer, "imageSize(%s_image%u), ", - shader_glsl_get_prefix(version->type), bind_idx); - - for (i = 0; i < 3 - resource_type_info[resource_type].resinfo_size; ++i) - shader_addline(ins->ctx->buffer, "0, "); - - /* For UAVs the returned miplevel count is always 1. */ - shader_addline(ins->ctx->buffer, "1"); + shader_addline(buffer, "1"); } - shader_addline(ins->ctx->buffer, ")%s);\n", dst_swizzle); + shader_addline(buffer, ")%s);\n", dst_swizzle); } static void shader_glsl_ld(const struct wined3d_shader_instruction *ins) @@ -5982,7 +6001,7 @@ static void shader_glsl_ld(const struct wined3d_shader_instruction *ins) unsigned int resource_idx, sampler_idx, sampler_bind_idx; struct glsl_sample_function sample_function; DWORD flags = WINED3D_GLSL_SAMPLE_LOAD; - BOOL has_lod_param, multisample; + BOOL has_lod_param; if (wined3d_shader_instruction_has_texel_offset(ins)) flags |= WINED3D_GLSL_SAMPLE_OFFSET; @@ -5995,16 +6014,13 @@ static void shader_glsl_ld(const struct wined3d_shader_instruction *ins) ERR("Invalid resource index %u.\n", resource_idx); return; } - multisample = reg_maps->resource_info[resource_idx].type == WINED3D_SHADER_RESOURCE_TEXTURE_2DMS - || reg_maps->resource_info[resource_idx].type == WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY; - has_lod_param = reg_maps->resource_info[resource_idx].type != WINED3D_SHADER_RESOURCE_BUFFER - && !multisample; + has_lod_param = is_mipmapped(reg_maps->resource_info[resource_idx].type); shader_glsl_get_sample_function(ins->ctx, resource_idx, sampler_idx, flags, &sample_function); shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask, &coord_param); shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &lod_param); sampler_bind_idx = shader_glsl_find_sampler(&reg_maps->sampler_map, resource_idx, sampler_idx); - if (multisample) + if (is_multisampled(reg_maps->resource_info[resource_idx].type)) { shader_glsl_add_src_param(ins, &ins->src[2], WINED3DSP_WRITEMASK_0, &sample_param); shader_glsl_gen_sample_code(ins, sampler_bind_idx, &sample_function, ins->src[1].swizzle,

1 0

Hans Leidekker : secur32: Implement SECPKG_ATTR_NEGOTIATION_INFO for NTLM.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 54dea1dc6a4b6a98c7b7e15ac6bda44872a362f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54dea1dc6a4b6a98c7b7e15a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 8 11:53:56 2018 +0100 secur32: Implement SECPKG_ATTR_NEGOTIATION_INFO for NTLM. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/ntlm.c | 149 +++++++++++++++++++++++++++++++--------------- dlls/secur32/tests/ntlm.c | 2 - 2 files changed, 100 insertions(+), 51 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 94b94f4..6a94d42 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1421,6 +1421,87 @@ SECURITY_STATUS SEC_ENTRY ntlm_DeleteSecurityContext(PCtxtHandle phContext) return SEC_E_OK; } +#define NTLM_COMMENT \ + { 'N', 'T', 'L', 'M', ' ', \ + 'S', 'e', 'c', 'u', 'r', 'i', 't', 'y', ' ', \ + 'P', 'a', 'c', 'k', 'a', 'g', 'e', 0} + +static CHAR ntlm_comment_A[] = NTLM_COMMENT; +static WCHAR ntlm_comment_W[] = NTLM_COMMENT; + +#define NTLM_NAME {'N', 'T', 'L', 'M', 0} + +static char ntlm_name_A[] = NTLM_NAME; +static WCHAR ntlm_name_W[] = NTLM_NAME; + +#define NTLM_CAPS ( \ + SECPKG_FLAG_INTEGRITY | \ + SECPKG_FLAG_PRIVACY | \ + SECPKG_FLAG_TOKEN_ONLY | \ + SECPKG_FLAG_CONNECTION | \ + SECPKG_FLAG_MULTI_REQUIRED | \ + SECPKG_FLAG_IMPERSONATION | \ + SECPKG_FLAG_ACCEPT_WIN32_NAME | \ + SECPKG_FLAG_NEGOTIABLE | \ + SECPKG_FLAG_LOGON | \ + SECPKG_FLAG_RESTRICTED_TOKENS ) + +static const SecPkgInfoW infoW = { + NTLM_CAPS, + 1, + RPC_C_AUTHN_WINNT, + NTLM_MAX_BUF, + ntlm_name_W, + ntlm_comment_W +}; + +static const SecPkgInfoA infoA = { + NTLM_CAPS, + 1, + RPC_C_AUTHN_WINNT, + NTLM_MAX_BUF, + ntlm_name_A, + ntlm_comment_A +}; + +SecPkgInfoA *ntlm_package_infoA = (SecPkgInfoA *)&infoA; +SecPkgInfoW *ntlm_package_infoW = (SecPkgInfoW *)&infoW; + +static SecPkgInfoW *build_package_infoW( const SecPkgInfoW *info ) +{ + SecPkgInfoW *ret; + DWORD size_name = (strlenW(info->Name) + 1) * sizeof(WCHAR); + DWORD size_comment = (strlenW(info->Comment) + 1) * sizeof(WCHAR); + + if (!(ret = HeapAlloc( GetProcessHeap(), 0, sizeof(*ret) + size_name + size_comment ))) return NULL; + ret->fCapabilities = info->fCapabilities; + ret->wVersion = info->wVersion; + ret->wRPCID = info->wRPCID; + ret->cbMaxToken = info->cbMaxToken; + ret->Name = (SEC_WCHAR *)(ret + 1); + memcpy( ret->Name, info->Name, size_name ); + ret->Comment = (SEC_WCHAR *)((char *)ret->Name + size_name); + memcpy( ret->Comment, info->Comment, size_comment ); + return ret; +} + +static SecPkgInfoA *build_package_infoA( const SecPkgInfoA *info ) +{ + SecPkgInfoA *ret; + DWORD size_name = strlen(info->Name) + 1, size_comment = strlen(info->Comment) + 1; + + if (!(ret = HeapAlloc( GetProcessHeap(), 0, sizeof(*ret) + size_name + size_comment ))) return NULL; + ret->fCapabilities = info->fCapabilities; + ret->wVersion = info->wVersion; + ret->wRPCID = info->wRPCID; + ret->cbMaxToken = info->cbMaxToken; + ret->Name = (SEC_CHAR *)(ret + 1); + memcpy( ret->Name, info->Name, size_name ); + ret->Comment = ret->Name + size_name; + memcpy( ret->Comment, info->Comment, size_comment ); + return ret; +} + /*********************************************************************** * QueryContextAttributesW */ @@ -1453,7 +1534,13 @@ SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesW(PCtxtHandle phContext, _x(SECPKG_ATTR_LIFESPAN); _x(SECPKG_ATTR_NAMES); _x(SECPKG_ATTR_NATIVE_NAMES); - _x(SECPKG_ATTR_NEGOTIATION_INFO); + case SECPKG_ATTR_NEGOTIATION_INFO: + { + SecPkgContext_NegotiationInfoW *info = (SecPkgContext_NegotiationInfoW *)pBuffer; + if (!(info->PackageInfo = build_package_infoW( &infoW ))) return SEC_E_INSUFFICIENT_MEMORY; + info->NegotiationState = SECPKG_NEGOTIATION_COMPLETE; + return SEC_E_OK; + } _x(SECPKG_ATTR_PACKAGE_INFO); _x(SECPKG_ATTR_PASSWORD_EXPIRY); _x(SECPKG_ATTR_SESSION_KEY); @@ -1482,7 +1569,18 @@ SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesW(PCtxtHandle phContext, SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesA(PCtxtHandle phContext, ULONG ulAttribute, void *pBuffer) { - return ntlm_QueryContextAttributesW(phContext, ulAttribute, pBuffer); + switch(ulAttribute) + { + case SECPKG_ATTR_NEGOTIATION_INFO: + { + SecPkgContext_NegotiationInfoA *info = (SecPkgContext_NegotiationInfoA *)pBuffer; + if (!(info->PackageInfo = build_package_infoA( &infoA ))) return SEC_E_INSUFFICIENT_MEMORY; + info->NegotiationState = SECPKG_NEGOTIATION_COMPLETE; + return SEC_E_OK; + } + default: + return ntlm_QueryContextAttributesW( phContext, ulAttribute, pBuffer ); + } } /*********************************************************************** @@ -1976,53 +2074,6 @@ static const SecurityFunctionTableW ntlmTableW = { NULL, /* SetContextAttributesW */ }; -#define NTLM_COMMENT \ - { 'N', 'T', 'L', 'M', ' ', \ - 'S', 'e', 'c', 'u', 'r', 'i', 't', 'y', ' ', \ - 'P', 'a', 'c', 'k', 'a', 'g', 'e', 0} - -static CHAR ntlm_comment_A[] = NTLM_COMMENT; -static WCHAR ntlm_comment_W[] = NTLM_COMMENT; - -#define NTLM_NAME {'N', 'T', 'L', 'M', 0} - -static char ntlm_name_A[] = NTLM_NAME; -static WCHAR ntlm_name_W[] = NTLM_NAME; - -/* According to Windows, NTLM has the following capabilities. */ -#define CAPS ( \ - SECPKG_FLAG_INTEGRITY | \ - SECPKG_FLAG_PRIVACY | \ - SECPKG_FLAG_TOKEN_ONLY | \ - SECPKG_FLAG_CONNECTION | \ - SECPKG_FLAG_MULTI_REQUIRED | \ - SECPKG_FLAG_IMPERSONATION | \ - SECPKG_FLAG_ACCEPT_WIN32_NAME | \ - SECPKG_FLAG_NEGOTIABLE | \ - SECPKG_FLAG_LOGON | \ - SECPKG_FLAG_RESTRICTED_TOKENS ) - -static const SecPkgInfoW infoW = { - CAPS, - 1, - RPC_C_AUTHN_WINNT, - NTLM_MAX_BUF, - ntlm_name_W, - ntlm_comment_W -}; - -static const SecPkgInfoA infoA = { - CAPS, - 1, - RPC_C_AUTHN_WINNT, - NTLM_MAX_BUF, - ntlm_name_A, - ntlm_comment_A -}; - -SecPkgInfoA *ntlm_package_infoA = (SecPkgInfoA *)&infoA; -SecPkgInfoW *ntlm_package_infoW = (SecPkgInfoW *)&infoW; - void SECUR32_initNTLMSP(void) { PNegoHelper helper; diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index c060420..b9fdf6f 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -916,12 +916,10 @@ static void testAuth(ULONG data_rep, BOOL fake) memset(&info, 0, sizeof(info)); sec_status = QueryContextAttributesA(&client.ctxt, SECPKG_ATTR_NEGOTIATION_INFO, &info); -todo_wine ok(sec_status == SEC_E_OK, "QueryContextAttributesA returned %08x\n", sec_status); pi = info.PackageInfo; ok(info.NegotiationState == SECPKG_NEGOTIATION_COMPLETE, "got %u\n", info.NegotiationState); -todo_wine ok(pi != NULL, "expected non-NULL PackageInfo\n"); if (pi) {

1 0

Hans Leidekker : kerberos: Allocate a buffer for the package info structure in kerberos_SpQueryContextAttributes.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: c6e607ff1f9219b9c3209e3490f6c954e40f9277 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6e607ff1f9219b9c3209e34… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 8 11:53:59 2018 +0100 kerberos: Allocate a buffer for the package info structure in kerberos_SpQueryContextAttributes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index e4011ff..767a86e 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -46,6 +46,7 @@ #include "wine/heap.h" #include "wine/library.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(kerberos); @@ -1059,6 +1060,24 @@ static NTSTATUS NTAPI kerberos_SpDeleteContext( LSA_SEC_HANDLE context ) #endif } +static SecPkgInfoW *build_package_info( const SecPkgInfoW *info ) +{ + SecPkgInfoW *ret; + DWORD size_name = (strlenW(info->Name) + 1) * sizeof(WCHAR); + DWORD size_comment = (strlenW(info->Comment) + 1) * sizeof(WCHAR); + + if (!(ret = heap_alloc( sizeof(*ret) + size_name + size_comment ))) return NULL; + ret->fCapabilities = info->fCapabilities; + ret->wVersion = info->wVersion; + ret->wRPCID = info->wRPCID; + ret->cbMaxToken = info->cbMaxToken; + ret->Name = (SEC_WCHAR *)(ret + 1); + memcpy( ret->Name, info->Name, size_name ); + ret->Comment = (SEC_WCHAR *)((char *)ret->Name + size_name); + memcpy( ret->Comment, info->Comment, size_comment ); + return ret; +} + static NTSTATUS NTAPI kerberos_SpQueryContextAttributes( LSA_SEC_HANDLE context, ULONG attribute, void *buffer ) { TRACE( "(%lx %u %p)\n", context, attribute, buffer ); @@ -1103,7 +1122,7 @@ static NTSTATUS NTAPI kerberos_SpQueryContextAttributes( LSA_SEC_HANDLE context, case SECPKG_ATTR_NEGOTIATION_INFO: { SecPkgContext_NegotiationInfoW *info = (SecPkgContext_NegotiationInfoW *)buffer; - info->PackageInfo = (SecPkgInfoW *)&infoW; + if (!(info->PackageInfo = build_package_info( &infoW ))) return SEC_E_INSUFFICIENT_MEMORY; info->NegotiationState = SECPKG_NEGOTIATION_COMPLETE; return SEC_E_OK; }

1 0

Nikolay Sivov : user32/tests: Remove workaround for GetComboBoxInfo() availability.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 3436460c511f83607067183954b4c180d31f5024 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3436460c511f836070671839… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 8 14:12:27 2018 +0300 user32/tests: Remove workaround for GetComboBoxInfo() availability. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/combo.c | 58 ++++++----------------------------------------- dlls/user32/tests/msg.c | 12 ++-------- 2 files changed, 9 insertions(+), 61 deletions(-) diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index 6dbdafb..ad706ea 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -287,13 +287,6 @@ static void test_WM_LBUTTONDOWN(void) static const UINT choices[] = {8,9,10,11,12,14,16,18,20,22,24,26,28,36,48,72}; static const CHAR stringFormat[] = "%2d"; BOOL ret; - BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); - - pGetComboBoxInfo = (void*)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); - if (!pGetComboBoxInfo){ - win_skip("GetComboBoxInfo is not available\n"); - return; - } hCombo = CreateWindowA("ComboBox", "Combo", WS_VISIBLE|WS_CHILD|CBS_DROPDOWN, 0, 0, 200, 150, hMainWnd, (HMENU)COMBO_ID, NULL, 0); @@ -307,7 +300,7 @@ static void test_WM_LBUTTONDOWN(void) cbInfo.cbSize = sizeof(COMBOBOXINFO); SetLastError(0xdeadbeef); - ret = pGetComboBoxInfo(hCombo, &cbInfo); + ret = GetComboBoxInfo(hCombo, &cbInfo); ok(ret, "Failed to get combobox info structure. LastError=%d\n", GetLastError()); hEdit = cbInfo.hwndItem; @@ -448,20 +441,13 @@ static void test_editselection(void) COMBOBOXINFO cbInfo; BOOL ret; DWORD len; - BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); char edit[20]; - pGetComboBoxInfo = (void*)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); - if (!pGetComboBoxInfo){ - win_skip("GetComboBoxInfo is not available\n"); - return; - } - /* Build a combo */ hCombo = build_combo(CBS_SIMPLE); cbInfo.cbSize = sizeof(COMBOBOXINFO); SetLastError(0xdeadbeef); - ret = pGetComboBoxInfo(hCombo, &cbInfo); + ret = GetComboBoxInfo(hCombo, &cbInfo); ok(ret, "Failed to get combobox info structure. LastError=%d\n", GetLastError()); hEdit = cbInfo.hwndItem; @@ -515,7 +501,7 @@ static void test_editselection(void) hCombo = build_combo(CBS_SIMPLE); cbInfo.cbSize = sizeof(COMBOBOXINFO); SetLastError(0xdeadbeef); - ret = pGetComboBoxInfo(hCombo, &cbInfo); + ret = GetComboBoxInfo(hCombo, &cbInfo); ok(ret, "Failed to get combobox info structure. LastError=%d\n", GetLastError()); hEdit = cbInfo.hwndItem; @@ -584,7 +570,6 @@ static LRESULT CALLBACK test_window_proc(HWND hwnd, UINT msg, WPARAM wParam, LPA static void test_editselection_focus(DWORD style) { - BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); HWND hCombo, hEdit, hButton; COMBOBOXINFO cbInfo; BOOL ret; @@ -592,17 +577,10 @@ static void test_editselection_focus(DWORD style) char buffer[16] = {0}; DWORD len; - pGetComboBoxInfo = (void *)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); - if (!pGetComboBoxInfo) - { - win_skip("GetComboBoxInfo is not available\n"); - return; - } - hCombo = build_combo(style); cbInfo.cbSize = sizeof(COMBOBOXINFO); SetLastError(0xdeadbeef); - ret = pGetComboBoxInfo(hCombo, &cbInfo); + ret = GetComboBoxInfo(hCombo, &cbInfo); ok(ret, "Failed to get COMBOBOXINFO structure; LastError: %u\n", GetLastError()); hEdit = cbInfo.hwndItem; @@ -649,18 +627,11 @@ static void test_editselection_focus(DWORD style) static void test_listbox_styles(DWORD cb_style) { - BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); HWND combo; COMBOBOXINFO info; DWORD style, exstyle, expect_style, expect_exstyle; BOOL ret; - pGetComboBoxInfo = (void*)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); - if (!pGetComboBoxInfo){ - win_skip("GetComboBoxInfo is not available\n"); - return; - } - expect_style = WS_CHILD|WS_CLIPSIBLINGS|LBS_COMBOBOX|LBS_HASSTRINGS|LBS_NOTIFY; if (cb_style == CBS_SIMPLE) { @@ -676,7 +647,7 @@ static void test_listbox_styles(DWORD cb_style) combo = build_combo(cb_style); info.cbSize = sizeof(COMBOBOXINFO); SetLastError(0xdeadbeef); - ret = pGetComboBoxInfo(combo, &info); + ret = GetComboBoxInfo(combo, &info); ok(ret, "Failed to get combobox info structure.\n"); style = GetWindowLongW( info.hwndList, GWL_STYLE ); @@ -704,7 +675,6 @@ static void test_listbox_styles(DWORD cb_style) static void test_listbox_size(DWORD style) { - BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); HWND hCombo, hList; COMBOBOXINFO cbInfo; UINT x, y; @@ -739,13 +709,6 @@ static void test_listbox_size(DWORD style) {10, 100, TRUE}, }; - pGetComboBoxInfo = (void *)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); - if (!pGetComboBoxInfo) - { - win_skip("GetComboBoxInfo is not available\n"); - return; - } - for(test = 0; test < sizeof(info_height) / sizeof(info_height[0]); test++) { const struct list_size_info *info_test = &info_height[test]; @@ -762,7 +725,7 @@ static void test_listbox_size(DWORD style) cbInfo.cbSize = sizeof(COMBOBOXINFO); SetLastError(0xdeadbeef); - ret = pGetComboBoxInfo(hCombo, &cbInfo); + ret = GetComboBoxInfo(hCombo, &cbInfo); ok(ret, "Failed to get COMBOBOXINFO structure; LastError: %u\n", GetLastError()); hList = cbInfo.hwndList; @@ -808,24 +771,17 @@ static void test_listbox_size(DWORD style) static void test_WS_VSCROLL(void) { - BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); HWND hCombo, hList; COMBOBOXINFO info; DWORD style; BOOL ret; int i; - pGetComboBoxInfo = (void *)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); - if (!pGetComboBoxInfo) - { - win_skip("GetComboBoxInfo is not available\n"); - return; - } info.cbSize = sizeof(info); hCombo = build_combo(CBS_DROPDOWNLIST); SetLastError(0xdeadbeef); - ret = pGetComboBoxInfo(hCombo, &info); + ret = GetComboBoxInfo(hCombo, &info); ok(ret, "Failed to get COMBOBOXINFO structure; LastError: %u\n", GetLastError()); hList = info.hwndList; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f391ab9..1d569a3 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6834,7 +6834,6 @@ static void test_combobox_messages(void) { HWND parent, combo, button, edit, lbox; LRESULT ret; - BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); COMBOBOXINFO cbInfo; BOOL res; @@ -6879,13 +6878,6 @@ static void test_combobox_messages(void) DestroyWindow(parent); /* Start again. Test combobox text selection when getting and losing focus */ - pGetComboBoxInfo = (void *)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); - if (!pGetComboBoxInfo) - { - win_skip("GetComboBoxInfo is not available\n"); - return; - } - parent = CreateWindowExA(0, "TestParentClass", "Parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 10, 10, 300, 300, NULL, NULL, NULL, NULL); ok(parent != 0, "Failed to create parent window\n"); @@ -6896,7 +6888,7 @@ static void test_combobox_messages(void) cbInfo.cbSize = sizeof(COMBOBOXINFO); SetLastError(0xdeadbeef); - res = pGetComboBoxInfo(combo, &cbInfo); + res = GetComboBoxInfo(combo, &cbInfo); ok(res, "Failed to get COMBOBOXINFO structure; LastError: %u\n", GetLastError()); edit = cbInfo.hwndItem; @@ -6955,7 +6947,7 @@ static void test_combobox_messages(void) cbInfo.cbSize = sizeof(COMBOBOXINFO); SetLastError(0xdeadbeef); - res = pGetComboBoxInfo(combo, &cbInfo); + res = GetComboBoxInfo(combo, &cbInfo); ok(res, "Failed to get COMBOBOXINFO structure; LastError: %u\n", GetLastError()); lbox = cbInfo.hwndList; lbox_window_proc = (WNDPROC)SetWindowLongPtrA(lbox, GWLP_WNDPROC,

1 0

Akihiro Sagawa : gdi32/tests: Add more ABC width tests with vertical font.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 34c4687f254c349049bd7cb7fcbae99e9dbff9aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=34c4687f254c349049bd7cb7… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Feb 4 21:02:11 2018 +0900 gdi32/tests: Add more ABC width tests with vertical font. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 7a74565..d5f04ff 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5929,7 +5929,7 @@ static void check_vertical_metrics(const char *face) GLYPHMETRICS rgm, vgm; const UINT code = 0x5EAD, height = 1000; WORD idx; - ABC abc; + ABC abc, vabc; OUTLINETEXTMETRICA otm; USHORT numOfLongVerMetrics; @@ -5957,6 +5957,15 @@ static void check_vertical_metrics(const char *face) hfont_prev = SelectObject(hdc, hfont); ret = GetGlyphOutlineW(hdc, code, GGO_METRICS, &vgm, 0, NULL, &mat); ok(ret != GDI_ERROR, "GetGlyphOutlineW failed\n"); + ret = GetCharABCWidthsW(hdc, code, code, &vabc); + ok(ret, "GetCharABCWidthsW failed\n"); + todo_wine ok(vabc.abcA == vgm.gmptGlyphOrigin.x, "expected %d, got %d\n", + vabc.abcA, vgm.gmptGlyphOrigin.x); + todo_wine ok(vabc.abcB == vgm.gmBlackBoxX, "expected %d, got %d\n", + vabc.abcB, vgm.gmBlackBoxX); + ok(vabc.abcA + vabc.abcB + vabc.abcC == vgm.gmCellIncX, + "expected %d, got %d\n", + vabc.abcA + vabc.abcB + vabc.abcC, vgm.gmCellIncX); memset(&otm, 0, sizeof(otm)); otm.otmSize = sizeof(otm);

1 0

Hans Leidekker : kerberos: Simplify kerberos_SpInitLsaModeContext.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 64cbf292bb87f65b841143db0c8f24802ea7c42a URL: https://source.winehq.org/git/wine.git/?a=commit;h=64cbf292bb87f65b841143db… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 8 11:53:58 2018 +0100 kerberos: Simplify kerberos_SpInitLsaModeContext. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 78ec6d3..e4011ff 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -919,16 +919,11 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, cred_handle = credhandle_sspi_to_gss( credential ); ctxt_handle = ctxthandle_sspi_to_gss( context ); - if (!input) input_token.length = 0; + if (!input || (idx = get_buffer_index( input, SECBUFFER_TOKEN )) == -1) input_token.length = 0; else { - if ((idx = get_buffer_index( input, SECBUFFER_TOKEN )) == -1) - input_token.length = 0; - else - { - input_token.length = input->pBuffers[idx].cbBuffer; - input_token.value = input->pBuffers[idx].pvBuffer; - } + input_token.length = input->pBuffers[idx].cbBuffer; + input_token.value = input->pBuffers[idx].pvBuffer; } if ((idx = get_buffer_index( output, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN;

1 0

Akihiro Sagawa : gdi32: Fix ABC width calculations when applying transformations internally.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 2a402a427a7d3bad1ea8043b9d7db011727cbc6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a402a427a7d3bad1ea8043b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Feb 4 21:02:07 2018 +0900 gdi32: Fix ABC width calculations when applying transformations internally. This fixes a regression introduced by f6bc356860a1ea2e5b4aed43e38ddf8b7d24a8b0. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 15 ++++++++------- dlls/gdi32/tests/font.c | 44 +++++++++++++++++++------------------------- 2 files changed, 27 insertions(+), 32 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 4db1c7e..7016095 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7008,7 +7008,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, origin_x = left; origin_y = top; abc->abcA = origin_x >> 6; - abc->abcB = metrics.width >> 6; + abc->abcB = (metrics.width + 63) >> 6; } else { INT xc, yc; FT_Vector vec; @@ -7064,19 +7064,20 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, gm.gmCellIncY = adv.y >> 6; adv = get_advance_metric(incoming_font, font, &metrics, &transMatUnrotated, vertical_metrics); + adv.x = pFT_Vector_Length(&adv); + adv.y = 0; vec.x = lsb; vec.y = 0; pFT_Vector_Transform(&vec, &transMatUnrotated); - abc->abcA = vec.x >> 6; + if(lsb > 0) abc->abcA = pFT_Vector_Length(&vec) >> 6; + else abc->abcA = -((pFT_Vector_Length(&vec) + 63) >> 6); - vec.x = metrics.width; + /* We use lsb again to avoid rounding errors */ + vec.x = lsb + metrics.width; vec.y = 0; pFT_Vector_Transform(&vec, &transMatUnrotated); - if (vec.x >= 0) - abc->abcB = vec.x >> 6; - else - abc->abcB = -vec.x >> 6; + abc->abcB = ((pFT_Vector_Length(&vec) + 63) >> 6) - abc->abcA; } width = (right - left) >> 6; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 70e44f3..4bac19a 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1128,7 +1128,7 @@ static int CALLBACK create_font_proc(const LOGFONTA *lpelfe, return 1; } -static void ABCWidths_helper(const char* description, HDC hdc, WORD *glyphs, ABC *base_abci, ABC *base_abcw, ABCFLOAT *base_abcf, INT todo) +static void ABCWidths_helper(const char* description, HDC hdc, WORD *glyphs, const ABC *base_abci, const ABC *base_abcw, const ABCFLOAT *base_abcf) { ABC abc[1]; ABCFLOAT abcf[1]; @@ -1137,26 +1137,20 @@ static void ABCWidths_helper(const char* description, HDC hdc, WORD *glyphs, ABC ret = pGetCharABCWidthsI(hdc, 0, 1, glyphs, abc); ok(ret, "%s: GetCharABCWidthsI should have succeeded\n", description); ok ((INT)abc->abcB > 0, "%s: abcB should be positive\n", description); - todo_wine_if (todo) - ok(abc->abcA * base_abci->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); - todo_wine_if (todo) - ok(abc->abcC * base_abci->abcC >= 0, "%s: abcC's sign should be unchanged\n", description); + ok(abc->abcA * base_abci->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); + ok(abc->abcC * base_abci->abcC >= 0, "%s: abcC's sign should be unchanged\n", description); ret = pGetCharABCWidthsW(hdc, 'i', 'i', abc); ok(ret, "%s: GetCharABCWidthsW should have succeeded\n", description); ok ((INT)abc->abcB > 0, "%s: abcB should be positive\n", description); - todo_wine_if (todo) - ok(abc->abcA * base_abcw->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); - todo_wine_if (todo) - ok(abc->abcC * base_abcw->abcC >= 0, "%s: abcC's sign should be unchanged\n", description); + ok(abc->abcA * base_abcw->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); + ok(abc->abcC * base_abcw->abcC >= 0, "%s: abcC's sign should be unchanged\n", description); ret = pGetCharABCWidthsFloatW(hdc, 'i', 'i', abcf); ok(ret, "%s: GetCharABCWidthsFloatW should have succeeded\n", description); ok (abcf->abcfB > 0.0, "%s: abcfB should be positive\n", description); - todo_wine_if (todo) - ok(abcf->abcfA * base_abcf->abcfA >= 0.0, "%s: abcfA's sign should be unchanged\n", description); - todo_wine_if (todo) - ok(abcf->abcfC * base_abcf->abcfC >= 0.0, "%s: abcfC's sign should be unchanged\n", description); + ok(abcf->abcfA * base_abcf->abcfA >= 0.0, "%s: abcfA's sign should be unchanged\n", description); + ok(abcf->abcfC * base_abcf->abcfC >= 0.0, "%s: abcfC's sign should be unchanged\n", description); } static void test_GetCharABCWidths(void) @@ -1369,17 +1363,17 @@ static void test_GetCharABCWidths(void) ret = pGetCharABCWidthsFloatW(hdc, 'i', 'i', abcf); ok(ret, "GetCharABCWidthsFloatW should have succeeded\n"); - ABCWidths_helper("LTR", hdc, glyphs, abc, abcw, abcf, 0); + ABCWidths_helper("LTR", hdc, glyphs, abc, abcw, abcf); SetWindowExtEx(hdc, -1, -1, NULL); SetGraphicsMode(hdc, GM_COMPATIBLE); - ABCWidths_helper("LTR -1 compatible", hdc, glyphs, abc, abcw, abcf, 0); + ABCWidths_helper("LTR -1 compatible", hdc, glyphs, abc, abcw, abcf); SetGraphicsMode(hdc, GM_ADVANCED); - ABCWidths_helper("LTR -1 advanced", hdc, glyphs, abc, abcw, abcf, 1); + ABCWidths_helper("LTR -1 advanced", hdc, glyphs, abc, abcw, abcf); SetWindowExtEx(hdc, 1, 1, NULL); SetGraphicsMode(hdc, GM_COMPATIBLE); - ABCWidths_helper("LTR 1 compatible", hdc, glyphs, abc, abcw, abcf, 0); + ABCWidths_helper("LTR 1 compatible", hdc, glyphs, abc, abcw, abcf); SetGraphicsMode(hdc, GM_ADVANCED); - ABCWidths_helper("LTR 1 advanced", hdc, glyphs, abc, abcw, abcf, 0); + ABCWidths_helper("LTR 1 advanced", hdc, glyphs, abc, abcw, abcf); ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); @@ -1391,17 +1385,17 @@ static void test_GetCharABCWidths(void) SetMapMode(hdc, MM_ANISOTROPIC); SelectObject(hdc, hfont); - ABCWidths_helper("RTL", hdc, glyphs, abc, abcw, abcf, 0); + ABCWidths_helper("RTL", hdc, glyphs, abc, abcw, abcf); SetWindowExtEx(hdc, -1, -1, NULL); SetGraphicsMode(hdc, GM_COMPATIBLE); - ABCWidths_helper("RTL -1 compatible", hdc, glyphs, abc, abcw, abcf, 0); + ABCWidths_helper("RTL -1 compatible", hdc, glyphs, abc, abcw, abcf); SetGraphicsMode(hdc, GM_ADVANCED); - ABCWidths_helper("RTL -1 advanced", hdc, glyphs, abc, abcw, abcf, 0); + ABCWidths_helper("RTL -1 advanced", hdc, glyphs, abc, abcw, abcf); SetWindowExtEx(hdc, 1, 1, NULL); SetGraphicsMode(hdc, GM_COMPATIBLE); - ABCWidths_helper("RTL 1 compatible", hdc, glyphs, abc, abcw, abcf, 0); + ABCWidths_helper("RTL 1 compatible", hdc, glyphs, abc, abcw, abcf); SetGraphicsMode(hdc, GM_ADVANCED); - ABCWidths_helper("RTL 1 advanced", hdc, glyphs, abc, abcw, abcf, 1); + ABCWidths_helper("RTL 1 advanced", hdc, glyphs, abc, abcw, abcf); ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); @@ -6372,7 +6366,7 @@ static void test_GetCharWidth32(void) SetGraphicsMode(hdc, GM_ADVANCED); ret = pGetCharWidth32W(hdc, 'a', 'a', &bufferW); ok(ret, "GetCharWidth32W should have succeeded\n"); - todo_wine ok (bufferW > 0," Width should be greater than zero\n"); + ok (bufferW > 0," Width should be greater than zero\n"); SetWindowExtEx(hdc, 1,1,NULL); SetGraphicsMode(hdc, GM_COMPATIBLE); ret = pGetCharWidth32W(hdc, 'a', 'a', &bufferW); @@ -6412,7 +6406,7 @@ static void test_GetCharWidth32(void) SetGraphicsMode(hdc, GM_ADVANCED); ret = pGetCharWidth32W(hdc, 'a', 'a', &bufferW); ok(ret, "GetCharWidth32W should have succeeded\n"); - todo_wine ok (bufferW > 0," Width should be greater than zero\n"); + ok (bufferW > 0," Width should be greater than zero\n"); ReleaseDC(hwnd, hdc); DestroyWindow(hwnd);

1 0

Michael Stefaniuc : reg: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 6542c3e8607fff57756ab16f2096601c3eaf01e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6542c3e8607fff57756ab16f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 7 23:48:40 2018 +0100 reg: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/export.c | 1 + programs/reg/import.c | 1 + programs/reg/reg.c | 15 +++------------ programs/reg/reg.h | 1 - 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index 39001c8..622e7ca 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -20,6 +20,7 @@ #include <stdlib.h> #include <wine/unicode.h> +#include <wine/heap.h> #include "reg.h" diff --git a/programs/reg/import.c b/programs/reg/import.c index 8350fa7..f2ce80e 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -23,6 +23,7 @@ #include <wine/unicode.h> #include <wine/debug.h> +#include <wine/heap.h> #include "reg.h" diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 8d510f7..455d3dd 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -21,6 +21,7 @@ #include <stdlib.h> #include <wine/unicode.h> #include <wine/debug.h> +#include <wine/heap.h> #include "reg.h" WINE_DEFAULT_DEBUG_CHANNEL(reg); @@ -81,7 +82,7 @@ static const WCHAR newlineW[] = {'\n',0}; void *heap_xalloc(size_t size) { - void *buf = HeapAlloc(GetProcessHeap(), 0, size); + void *buf = heap_alloc(size); if (!buf) { ERR("Out of memory!\n"); @@ -92,12 +93,7 @@ void *heap_xalloc(size_t size) void *heap_xrealloc(void *buf, size_t size) { - void *new_buf; - - if (buf) - new_buf = HeapReAlloc(GetProcessHeap(), 0, buf, size); - else - new_buf = HeapAlloc(GetProcessHeap(), 0, size); + void *new_buf = heap_realloc(buf, size); if (!new_buf) { @@ -108,11 +104,6 @@ void *heap_xrealloc(void *buf, size_t size) return new_buf; } -BOOL heap_free(void *buf) -{ - return HeapFree(GetProcessHeap(), 0, buf); -} - void output_writeconsole(const WCHAR *str, DWORD wlen) { DWORD count, ret; diff --git a/programs/reg/reg.h b/programs/reg/reg.h index eb792bb..dbce738 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -27,7 +27,6 @@ /* reg.c */ void *heap_xalloc(size_t size); void *heap_xrealloc(void *buf, size_t size); -BOOL heap_free(void *buf); void output_writeconsole(const WCHAR *str, DWORD wlen); void WINAPIV output_message(unsigned int id, ...); BOOL ask_confirm(unsigned int msgid, WCHAR *reg_info);

1 0

Henri Verbeet : d3d8: Use wined3d_buffer_create() in vertexbuffer_init().
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 5fc8b43c8a2da3408ecdc3010d53c3b6b521ea04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fc8b43c8a2da3408ecdc301… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 8 02:58:48 2018 +0330 d3d8: Use wined3d_buffer_create() in vertexbuffer_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 10ba302..14a2fb6 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -273,25 +273,29 @@ static const struct wined3d_parent_ops d3d8_vertexbuffer_wined3d_parent_ops = HRESULT vertexbuffer_init(struct d3d8_vertexbuffer *buffer, struct d3d8_device *device, UINT size, DWORD usage, DWORD fvf, D3DPOOL pool) { - enum wined3d_pool wined3d_pool; - DWORD wined3d_usage; + struct wined3d_buffer_desc desc; HRESULT hr; - wined3d_pool = pool; - wined3d_usage = usage & WINED3DUSAGE_MASK; if (pool == D3DPOOL_SCRATCH) { - wined3d_pool = WINED3D_POOL_SYSTEM_MEM; - wined3d_usage |= WINED3DUSAGE_SCRATCH; + WARN("Vertex buffer with D3DPOOL_SCRATCH requested.\n"); + return D3DERR_INVALIDCALL; } buffer->IDirect3DVertexBuffer8_iface.lpVtbl = &Direct3DVertexBuffer8_Vtbl; d3d8_resource_init(&buffer->resource); buffer->fvf = fvf; + desc.byte_width = size; + desc.usage = usage & WINED3DUSAGE_MASK; + desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; + desc.access = wined3daccess_from_d3dpool(pool); + desc.misc_flags = 0; + desc.structure_byte_stride = 0; + wined3d_mutex_lock(); - hr = wined3d_buffer_create_vb(device->wined3d_device, size, wined3d_usage, wined3d_pool, - buffer, &d3d8_vertexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); + hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer, + &d3d8_vertexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); wined3d_mutex_unlock(); if (FAILED(hr)) {

1 0

Henri Verbeet : d3d8: Use wined3d_buffer_create() in d3d8_device_prepare_vertex_buffer().
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 74490bd9c67a53efcfc3083506b5d52a1d7a01eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=74490bd9c67a53efcfc30835… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 8 02:58:49 2018 +0330 d3d8: Use wined3d_buffer_create() in d3d8_device_prepare_vertex_buffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 590ab45..3ce0460 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2108,15 +2108,22 @@ static HRESULT d3d8_device_prepare_vertex_buffer(struct d3d8_device *device, UIN if (device->vertex_buffer_size < min_size || !device->vertex_buffer) { UINT size = max(device->vertex_buffer_size * 2, min_size); + struct wined3d_buffer_desc desc; struct wined3d_buffer *buffer; TRACE("Growing vertex buffer to %u bytes\n", size); - hr = wined3d_buffer_create_vb(device->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, - WINED3D_POOL_DEFAULT, NULL, &d3d8_null_wined3d_parent_ops, &buffer); - if (FAILED(hr)) + desc.byte_width = size; + desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY; + desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.misc_flags = 0; + desc.structure_byte_stride = 0; + + if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, + NULL, NULL, &d3d8_null_wined3d_parent_ops, &buffer))) { - ERR("(%p) wined3d_buffer_create_vb failed with hr = %08x\n", device, hr); + ERR("Failed to create vertex buffer, hr %#x.\n", hr); return hr; }

1 0

Henri Verbeet : ddraw: Use wined3d_buffer_create() in d3d_vertex_buffer_create_wined3d_buffer().
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 0b92a6fba7a6e60c6ff1a3729a3b21019c2df0ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b92a6fba7a6e60c6ff1a372… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 8 02:58:47 2018 +0330 ddraw: Use wined3d_buffer_create() in d3d_vertex_buffer_create_wined3d_buffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/vertexbuffer.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 6a9544b..df8531d 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -115,22 +115,24 @@ static ULONG WINAPI d3d_vertex_buffer7_Release(IDirect3DVertexBuffer7 *iface) static HRESULT d3d_vertex_buffer_create_wined3d_buffer(struct d3d_vertex_buffer *buffer, BOOL dynamic, struct wined3d_buffer **wined3d_buffer) { - DWORD usage = WINED3DUSAGE_STATICDECL; - enum wined3d_pool pool; - - if (buffer->Caps & D3DVBCAPS_SYSTEMMEMORY) - pool = WINED3D_POOL_SYSTEM_MEM; - else - pool = WINED3D_POOL_DEFAULT; + struct wined3d_buffer_desc desc; + desc.byte_width = buffer->size; + desc.usage = WINED3DUSAGE_STATICDECL; if (buffer->Caps & D3DVBCAPS_WRITEONLY) - usage |= WINED3DUSAGE_WRITEONLY; + desc.usage |= WINED3DUSAGE_WRITEONLY; if (dynamic) - usage |= WINED3DUSAGE_DYNAMIC; + desc.usage |= WINED3DUSAGE_DYNAMIC; + desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; + if (buffer->Caps & D3DVBCAPS_SYSTEMMEMORY) + desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; + else + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.misc_flags = 0; + desc.structure_byte_stride = 0; - return wined3d_buffer_create_vb(buffer->ddraw->wined3d_device, - buffer->size, usage, pool, buffer, &ddraw_null_wined3d_parent_ops, - wined3d_buffer); + return wined3d_buffer_create(buffer->ddraw->wined3d_device, &desc, + NULL, buffer, &ddraw_null_wined3d_parent_ops, wined3d_buffer); } /*****************************************************************************

1 0

Henri Verbeet : d3d9: Use wined3d_buffer_create() in vertexbuffer_init().
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 6187de0143d4f27fad330ada8be1196bbda1d654 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6187de0143d4f27fad330ada… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 8 02:58:50 2018 +0330 d3d9: Use wined3d_buffer_create() in vertexbuffer_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 795164c..30e86f8 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -274,25 +274,29 @@ static const struct wined3d_parent_ops d3d9_vertexbuffer_wined3d_parent_ops = HRESULT vertexbuffer_init(struct d3d9_vertexbuffer *buffer, struct d3d9_device *device, UINT size, UINT usage, DWORD fvf, D3DPOOL pool) { - enum wined3d_pool wined3d_pool; - DWORD wined3d_usage; + struct wined3d_buffer_desc desc; HRESULT hr; - wined3d_pool = pool; - wined3d_usage = usage & WINED3DUSAGE_MASK; if (pool == D3DPOOL_SCRATCH) { - wined3d_pool = WINED3D_POOL_SYSTEM_MEM; - wined3d_usage |= WINED3DUSAGE_SCRATCH; + WARN("Vertex buffer with D3DPOOL_SCRATCH requested.\n"); + return D3DERR_INVALIDCALL; } buffer->IDirect3DVertexBuffer9_iface.lpVtbl = &d3d9_vertexbuffer_vtbl; buffer->fvf = fvf; d3d9_resource_init(&buffer->resource); + desc.byte_width = size; + desc.usage = usage & WINED3DUSAGE_MASK; + desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; + desc.access = wined3daccess_from_d3dpool(pool); + desc.misc_flags = 0; + desc.structure_byte_stride = 0; + wined3d_mutex_lock(); - hr = wined3d_buffer_create_vb(device->wined3d_device, size, wined3d_usage, wined3d_pool, - buffer, &d3d9_vertexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); + hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer, + &d3d9_vertexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); wined3d_mutex_unlock(); if (FAILED(hr)) {

1 0

Henri Verbeet : d3d8: Use the global memory allocation helpers.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: wine Branch: master Commit: 4b08687757bf036f45aa18e41c6b72345f089d7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b08687757bf036f45aa18e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 8 02:58:51 2018 +0330 d3d8: Use the global memory allocation helpers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 4 +-- dlls/d3d8/d3d8_main.c | 4 +-- dlls/d3d8/d3d8_private.h | 1 + dlls/d3d8/device.c | 82 +++++++++++++++++++------------------------ dlls/d3d8/directx.c | 7 ++-- dlls/d3d8/shader.c | 9 +++-- dlls/d3d8/surface.c | 2 +- dlls/d3d8/swapchain.c | 6 ++-- dlls/d3d8/texture.c | 2 +- dlls/d3d8/vertexdeclaration.c | 15 ++++---- dlls/d3d8/volume.c | 2 +- 11 files changed, 61 insertions(+), 73 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4b08687757bf036f45aa…

1 0

Józef Kucia : libs/vkd3d: Add remaining helper functions for CPU descriptor handles.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: vkd3d Branch: master Commit: dd6dedd9d199bb0c03e9fd34ded813a422838861 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=dd6dedd9d199bb0c03e9fd3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 7 21:27:09 2018 +0100 libs/vkd3d: Add remaining helper functions for CPU descriptor handles. 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> --- libs/vkd3d/command.c | 8 ++++---- libs/vkd3d/device.c | 12 ++++++------ libs/vkd3d/vkd3d_private.h | 10 ++++++++++ 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 3b7d2ee..4273a66 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3390,7 +3390,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi list->fb_height = 0; for (i = 0; i < render_target_descriptor_count; ++i) { - const struct d3d12_rtv_desc *rtv_desc = (const struct d3d12_rtv_desc *)render_target_descriptors[i].ptr; + const struct d3d12_rtv_desc *rtv_desc = d3d12_rtv_desc_from_cpu_handle(render_target_descriptors[i]); d3d12_command_list_track_resource_usage(list, rtv_desc->resource); @@ -3403,7 +3403,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi if (depth_stencil_descriptor) { - const struct d3d12_dsv_desc *dsv_desc = (const struct d3d12_dsv_desc *)depth_stencil_descriptor->ptr; + const struct d3d12_dsv_desc *dsv_desc = d3d12_dsv_desc_from_cpu_handle(*depth_stencil_descriptor); d3d12_command_list_track_resource_usage(list, dsv_desc->resource); @@ -3523,7 +3523,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearDepthStencilView(ID3D12Gra { const union VkClearValue clear_value = {.depthStencil = {depth, stencil}}; struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); - struct d3d12_dsv_desc *dsv_desc = (struct d3d12_dsv_desc *)dsv.ptr; + const struct d3d12_dsv_desc *dsv_desc = d3d12_dsv_desc_from_cpu_handle(dsv); struct VkAttachmentDescription attachment_desc; struct VkAttachmentReference ds_reference; @@ -3570,7 +3570,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearRenderTargetView(ID3D12Gra { const union VkClearValue clear_value = {{{color[0], color[1], color[2], color[3]}}}; struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); - struct d3d12_rtv_desc *rtv_desc = (struct d3d12_rtv_desc *)rtv.ptr; + const struct d3d12_rtv_desc *rtv_desc = d3d12_rtv_desc_from_cpu_handle(rtv); struct VkAttachmentDescription attachment_desc; struct VkAttachmentReference color_reference; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 31fee8a..54b3d0e 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1605,7 +1605,7 @@ static void STDMETHODCALLTYPE d3d12_device_CreateConstantBufferView(ID3D12Device { TRACE("iface %p, desc %p, descriptor %#lx.\n", iface, desc, descriptor.ptr); - d3d12_desc_create_cbv((struct d3d12_desc *)descriptor.ptr, + d3d12_desc_create_cbv(d3d12_desc_from_cpu_handle(descriptor), impl_from_ID3D12Device(iface), desc); } @@ -1616,7 +1616,7 @@ static void STDMETHODCALLTYPE d3d12_device_CreateShaderResourceView(ID3D12Device TRACE("iface %p, resource %p, desc %p, descriptor %#lx.\n", iface, resource, desc, descriptor.ptr); - d3d12_desc_create_srv((struct d3d12_desc *)descriptor.ptr, + d3d12_desc_create_srv(d3d12_desc_from_cpu_handle(descriptor), impl_from_ID3D12Device(iface), unsafe_impl_from_ID3D12Resource(resource), desc); } @@ -1627,7 +1627,7 @@ static void STDMETHODCALLTYPE d3d12_device_CreateUnorderedAccessView(ID3D12Devic TRACE("iface %p, resource %p, counter_resource %p, desc %p, descriptor %#lx.\n", iface, resource, counter_resource, desc, descriptor.ptr); - d3d12_desc_create_uav((struct d3d12_desc *)descriptor.ptr, + d3d12_desc_create_uav(d3d12_desc_from_cpu_handle(descriptor), impl_from_ID3D12Device(iface), unsafe_impl_from_ID3D12Resource(resource), unsafe_impl_from_ID3D12Resource(counter_resource), desc); } @@ -1639,7 +1639,7 @@ static void STDMETHODCALLTYPE d3d12_device_CreateRenderTargetView(ID3D12Device * TRACE("iface %p, resource %p, desc %p, descriptor %#lx.\n", iface, resource, desc, descriptor.ptr); - d3d12_rtv_desc_create_rtv((struct d3d12_rtv_desc *)descriptor.ptr, + d3d12_rtv_desc_create_rtv(d3d12_rtv_desc_from_cpu_handle(descriptor), impl_from_ID3D12Device(iface), unsafe_impl_from_ID3D12Resource(resource), desc); } @@ -1650,7 +1650,7 @@ static void STDMETHODCALLTYPE d3d12_device_CreateDepthStencilView(ID3D12Device * TRACE("iface %p, resource %p, desc %p, descriptor %#lx.\n", iface, resource, desc, descriptor.ptr); - d3d12_dsv_desc_create_dsv((struct d3d12_dsv_desc *)descriptor.ptr, + d3d12_dsv_desc_create_dsv(d3d12_dsv_desc_from_cpu_handle(descriptor), impl_from_ID3D12Device(iface), unsafe_impl_from_ID3D12Resource(resource), desc); } @@ -1659,7 +1659,7 @@ static void STDMETHODCALLTYPE d3d12_device_CreateSampler(ID3D12Device *iface, { TRACE("iface %p, desc %p, descriptor %#lx.\n", iface, desc, descriptor.ptr); - d3d12_desc_create_sampler((struct d3d12_desc *)descriptor.ptr, + d3d12_desc_create_sampler(d3d12_desc_from_cpu_handle(descriptor), impl_from_ID3D12Device(iface), desc); } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index f222871..89e4f23 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -286,6 +286,11 @@ struct d3d12_rtv_desc struct d3d12_resource *resource; }; +static inline struct d3d12_rtv_desc *d3d12_rtv_desc_from_cpu_handle(D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle) +{ + return (struct d3d12_rtv_desc *)cpu_handle.ptr; +} + void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_device *device, struct d3d12_resource *resource, const D3D12_RENDER_TARGET_VIEW_DESC *desc) DECLSPEC_HIDDEN; @@ -299,6 +304,11 @@ struct d3d12_dsv_desc struct d3d12_resource *resource; }; +static inline struct d3d12_dsv_desc *d3d12_dsv_desc_from_cpu_handle(D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle) +{ + return (struct d3d12_dsv_desc *)cpu_handle.ptr; +} + void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_device *device, struct d3d12_resource *resource, const D3D12_DEPTH_STENCIL_VIEW_DESC *desc) DECLSPEC_HIDDEN;

1 0

Francois Gouget : testbot: Don' t include incomplete VM operations in statistics.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: tools Branch: master Commit: 31ba0abf4f232c8dd174824c469408634d459ba4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=31ba0abf4f232c8dd174824… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 8 12:10:03 2018 +0100 testbot: Don't include incomplete VM operations in statistics. Including a revert operation that started a couple of seconds ago but has not yet completed in the average revert time would distort the result (particularly if restricting the analysis to the recent past). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index c04a1e4..5122dc3 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -311,6 +311,7 @@ sub GetActivity($;$) my $LastVMStatus = $LastStatusVMs{$VM->Name}->{$VM->Name}; next if (!$LastVMStatus); $LastVMStatus->{end} = $Counters->{now}; + $LastVMStatus->{ongoing} = 1; if ($LastVMStatus->{status} eq "unknown") { $LastVMStatus->{status} = $VM->Status; @@ -422,8 +423,11 @@ sub GetStatistics($) my $Status = $VMStatus->{status}; my $Time = $VMStatus->{end} - $VMStatus->{start}; - _AddFullStat($VMStats, "$Status.time", $Time, $Group->{id}); - _AddFullStat($HostStats, "$Status.time", $Time, $Group->{id}); + if (!$VMStatus->{ongoing}) + { + _AddFullStat($VMStats, "$Status.time", $Time, $Group->{id}); + _AddFullStat($HostStats, "$Status.time", $Time, $Group->{id}); + } if ($Status =~ /^(?:reverting|sleeping|running|dirty)$/) { $VMStats->{"busy.elapsed"} += $Time;

1 0

Francois Gouget : testbot: Fix the duration of some VM operations.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: tools Branch: master Commit: 0d8799b58d9d22eaa4ee48c474d5fc7949b0f36a URL: https://source.winehq.org/git/tools.git/?a=commit;h=0d8799b58d9d22eaa4ee48c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 8 12:09:53 2018 +0100 testbot: Fix the duration of some VM operations. Sometimes a RecordGroup containing VM status information is followed by a RecordGroup containing only VM result information. This typically happens when a VM is running a task which ends in the 'boterror' state. However this VM result RecordGroup does not mean the VM is no longer in the 'running' state so it should not be used to set the previous group's 'end' time. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 5d8ee5f..c04a1e4 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -226,19 +226,25 @@ sub GetActivity($;$) { my $StatusVMs = $Group->{statusvms}; my $ResultVMs = $Group->{resultvms}; - next if (!$StatusVMs and !$ResultVMs); - if ($LastGroup) + if ($StatusVMs) { - $LastGroup->{end} = $Group->{start}; - foreach my $Counter ('runnable', 'queued') + if ($LastGroup) { - if (!exists $Group->{$Counter} and exists $LastGroup->{$Counter}) + $LastGroup->{end} = $Group->{start}; + foreach my $Counter ('runnable', 'queued') { - $Group->{$Counter} = $LastGroup->{$Counter}; + if (!exists $Group->{$Counter} and exists $LastGroup->{$Counter}) + { + $Group->{$Counter} = $LastGroup->{$Counter}; + } } } + $LastGroup = $Group; + } + elsif (!$ResultVMs) + { + next; } - $LastGroup = $Group; foreach my $VM (@{$VMs->GetItems()}) {

1 0

Francois Gouget : testbot: Fix the activity start and end times.
by Alexandre Julliard Feb. 8, 2018

Feb. 8, 2018

Module: tools Branch: master Commit: 2939680d831e6fd954a7455faf38c32a9405acec URL: https://source.winehq.org/git/tools.git/?a=commit;h=2939680d831e6fd954a7455… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 8 12:09:44 2018 +0100 testbot: Fix the activity start and end times. Even if the last job completed hours ago, the period covered by the data we have in the jobs table always goes all the way up to now. Also it starts with when the oldest job on record was submitted, whether that job completed successfully or not. Similarly the data in our activity records always covers everything up until the present. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 8c22e01..5d8ee5f 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -43,11 +43,6 @@ sub _UpdateMin($$) $_[0] = $_[1] if (!defined $_[0] or $_[1] < $_[0]); } -sub _UpdateMax($$) -{ - $_[0] = $_[1] if (!defined $_[0] or $_[0] < $_[1]); -} - =pod =over 12 @@ -345,6 +340,7 @@ sub GetStatistics($) foreach my $Job (@{$Jobs->GetItems()}) { $GlobalStats->{"jobs.count"}++; + _UpdateMin($GlobalStats->{start}, $Job->Submitted); my $IsSpecialJob; my $Steps = $Job->Steps; @@ -386,9 +382,6 @@ sub GetStatistics($) my $Time = $Job->Ended - $Job->Submitted; _AddFullStat($GlobalStats, "jobs.time", $Time, undef, $Job); push @JobTimes, $Time; - - _UpdateMin($GlobalStats->{start}, $Job->Submitted); - _UpdateMax($GlobalStats->{end}, $Job->Ended); } } @@ -408,7 +401,6 @@ sub GetStatistics($) foreach my $Group (@$Activity) { _UpdateMin($VMsStats->{start}, $Group->{start}); - _UpdateMax($VMsStats->{end}, $Group->{end}); next if (!$Group->{statusvms}); my ($IsGroupBusy, %IsHostBusy); @@ -464,6 +456,9 @@ sub GetStatistics($) $GlobalStats->{"busy.elapsed"} += $Group->{end} - $Group->{start}; } } + + # The end is now! + $GlobalStats->{end} = $VMsStats->{end} = $Counters->{now}; $GlobalStats->{elapsed} = $GlobalStats->{end} - $GlobalStats->{start}; $HostsStats->{elapsed} = $VMsStats->{elapsed} = $VMsStats->{end} - $VMsStats->{start};

1 0

Jacek Caban : mshtml: Added IHTMLKeyboardEvent:: location property implementation.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: d3cd6a3691a7f976927578201b09a2e9ba904ee8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3cd6a3691a7f97692757820… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 7 16:25:51 2018 +0100 mshtml: Added IHTMLKeyboardEvent::location property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 1 + dlls/mshtml/htmlevent.c | 13 +++++++++++-- dlls/mshtml/tests/events.js | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index a46a0cd..ea20baf 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -209,6 +209,7 @@ HRESULT get_class_typeinfo(const CLSID *clsid, ITypeInfo **typeinfo) CASE_VT(VT_I2, INT16, V_I2); \ CASE_VT(VT_UI2, UINT16, V_UI2); \ CASE_VT(VT_I4, INT32, V_I4); \ + CASE_VT(VT_UI4, UINT32, V_UI4); \ CASE_VT(VT_R4, float, V_R4); \ CASE_VT(VT_BSTR, BSTR, V_BSTR); \ CASE_VT(VT_BOOL, VARIANT_BOOL, V_BOOL) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 9f115a8..2931318 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1675,8 +1675,17 @@ static HRESULT WINAPI DOMKeyboardEvent_get_key(IDOMKeyboardEvent *iface, BSTR *p static HRESULT WINAPI DOMKeyboardEvent_get_location(IDOMKeyboardEvent *iface, ULONG *p) { DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + UINT32 r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMKeyEvent_GetLocation(This->keyboard_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = r; + return S_OK; } static HRESULT WINAPI DOMKeyboardEvent_get_ctrlKey(IDOMKeyboardEvent *iface, VARIANT_BOOL *p) diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index bf37b3f..4560d93 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -698,6 +698,7 @@ function test_keyboard_event() { ok(e.altKey === false, "altKey = " + e.altKey); ok(e.shiftKey === false, "shiftKey = " + e.shiftKey); ok(e.metaKey === false, "metaKey = " + e.metaKey); + ok(e.location === 0, "location = " + e.location); ok(e.detail === 0, "detail = " + e.detail); next_test();

1 0

Fabian Maurer : cmd.exe: Parse parameters in "FOR /F" properly.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: e62000c5c0ba17be6d3c6397e04604407cfb7601 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e62000c5c0ba17be6d3c6397… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Feb 3 17:13:11 2018 +0100 cmd.exe: Parse parameters in "FOR /F" properly. We must not remove the quotes from parameters, or strings like "param=value" will get parsed incorrectly. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 2 +- programs/cmd/tests/test_builtins.cmd | 10 ++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 14961d7..ec66cd5 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1978,7 +1978,7 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, anyduplicates |= thisduplicate; /* Extract the token number requested and set into the next variable context */ - parm = WCMD_parameter_with_delims(buffer, (nexttoken-1), NULL, FALSE, FALSE, forf_delims); + parm = WCMD_parameter_with_delims(buffer, (nexttoken-1), NULL, TRUE, FALSE, forf_delims); WINE_TRACE("Parsed token %d(%d) as parameter %s\n", nexttoken, varidx + varoffset, wine_dbgstr_w(parm)); if (varidx >=0) { diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 62334b1..f684628 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1696,6 +1696,16 @@ for /f "tokens=2,2,3*" %%i in ("a b c d e f g") do echo h=%%h i=%%i j=%%j k=%%k for /f "tokens=3,2,3*" %%i in ("a b c d e f g") do echo h=%%h i=%%i j=%%j k=%%k l=%%l m=%%m n=%%n o=%%o cd .. rd /s/q foobar +echo ------ parameter splitting +echo forFParameterSplittingFunc "myparam1=myvalue1 myparam2=myparam2" mytest> foo +for /f "tokens=1 delims=;" %%i in (foo) do (call :%%i) +del foo +for /f "tokens=1 delims=;" %%i in ("forFParameterSplittingFunc "myparam1^=myvalue1 myparam2^=myparam2" mytest") do (call :%%i) +goto :forFParameterSplittingEnd +:forFParameterSplittingFunc +echo %~0 %~1 %~2 %~3 %~4 %~5 +goto :eof +:forFParameterSplittingEnd echo ------------ Testing del ------------ echo abc > file diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 796550e..4663c86 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1222,6 +1222,9 @@ h=%h i=a j=b k=c l=d e f g m=%m n=%n o=%o(a)or_broken@h=%h i=a j=b k=c l=d e f g m h=%h i=a j=c k= l= m=%m n=%n o=%o(a)or_broken@h=%h i=a j=c k= l= m= n=%n o=%o h=%h i=b j=c k= l= m=%m n=%n o=%o(a)or_broken@h=%h i=b j=c k= l= m= n=%n o=%o h=%h i=b j=c k= l= m=%m n=%n o=%o(a)or_broken@h=%h i=b j=c k= l= m= n=%n o=%o +------ parameter splitting +:forFParameterSplittingFunc myparam1=myvalue1 myparam2=myparam2 mytest(a)space@@space@@space@ +:forFParameterSplittingFunc myparam1=myvalue1 myparam2=myparam2 mytest(a)space@@space@@space@ ------------ Testing del ------------ deleting 'file' errorlevel is 0, good

1 0

Andrey Gusev : cdosys: Add stub dll.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 35af567d0b5459ad6edc25d5a26b020fe0ee2deb URL: https://source.winehq.org/git/wine.git/?a=commit;h=35af567d0b5459ad6edc25d5… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Feb 6 15:24:32 2018 +0200 cdosys: Add stub dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/cdosys/Makefile.in | 5 ++++ dlls/cdosys/cdosys.spec | 4 +++ dlls/cdosys/main.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 84 insertions(+) diff --git a/configure b/configure index c7c7e40..6b7f7d8 100755 --- a/configure +++ b/configure @@ -1101,6 +1101,7 @@ enable_bthprops_cpl enable_cabinet enable_capi2032 enable_cards +enable_cdosys enable_cfgmgr32 enable_clusapi enable_combase @@ -18541,6 +18542,7 @@ wine_fn_config_dll cabinet enable_cabinet implib wine_fn_config_test dlls/cabinet/tests cabinet_test wine_fn_config_dll capi2032 enable_capi2032 implib wine_fn_config_dll cards enable_cards implib +wine_fn_config_dll cdosys enable_cdosys wine_fn_config_dll cfgmgr32 enable_cfgmgr32 implib wine_fn_config_dll clusapi enable_clusapi implib wine_fn_config_dll combase enable_combase diff --git a/configure.ac b/configure.ac index 23f297b..016b9bf 100644 --- a/configure.ac +++ b/configure.ac @@ -3023,6 +3023,7 @@ WINE_CONFIG_DLL(cabinet,,[implib]) WINE_CONFIG_TEST(dlls/cabinet/tests) WINE_CONFIG_DLL(capi2032,,[implib]) WINE_CONFIG_DLL(cards,,[implib]) +WINE_CONFIG_DLL(cdosys) WINE_CONFIG_DLL(cfgmgr32,,[implib]) WINE_CONFIG_DLL(clusapi,,[implib]) WINE_CONFIG_DLL(combase) diff --git a/dlls/cdosys/Makefile.in b/dlls/cdosys/Makefile.in new file mode 100644 index 0000000..d1ce780 --- /dev/null +++ b/dlls/cdosys/Makefile.in @@ -0,0 +1,5 @@ +MODULE = cdosys.dll +IMPORTS = uuid ole32 + +C_SRCS = \ + main.c diff --git a/dlls/cdosys/cdosys.spec b/dlls/cdosys/cdosys.spec new file mode 100644 index 0000000..b16365d --- /dev/null +++ b/dlls/cdosys/cdosys.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/cdosys/main.c b/dlls/cdosys/main.c new file mode 100644 index 0000000..1a9affe --- /dev/null +++ b/dlls/cdosys/main.c @@ -0,0 +1,72 @@ +/* + * Copyright 2018 Andrey Gusev + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <string.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" + +#include "ole2.h" +#include "rpcproxy.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(cdosys); + +static HINSTANCE instance; + +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv) +{ + TRACE("(%p, %d, %p)\n", hInstDLL, reason, lpv); + + switch (reason) + { + case DLL_PROCESS_ATTACH: + instance = hInstDLL; + DisableThreadLibraryCalls(hInstDLL); + break; + } + return TRUE; +} + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **obj) +{ + FIXME("(%s, %s, %p) stub!\n", debugstr_guid(rclsid), debugstr_guid(riid), obj); + + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources( instance ); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources( instance ); +}

1 0

Aric Stewart : winebus.sys: Implement get_string for linux event devices.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: f6cb73856df7b8f391040cb193c6e7ca0237ffea URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6cb73856df7b8f391040cb1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 1 11:36:25 2018 -0600 winebus.sys: Implement get_string for linux event devices. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 52f5c4f..4e5f80c 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -862,7 +862,27 @@ static NTSTATUS lnxev_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, static NTSTATUS lnxev_get_string(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD length) { - return STATUS_NOT_IMPLEMENTED; + struct wine_input_private *ext = input_impl_from_DEVICE_OBJECT(device); + char str[255]; + + str[0] = 0; + switch (index) + { + case HID_STRING_ID_IPRODUCT: + ioctl(ext->base.device_fd, EVIOCGNAME(sizeof(str)), str); + break; + case HID_STRING_ID_IMANUFACTURER: + strcpy(str,"evdev"); + break; + case HID_STRING_ID_ISERIALNUMBER: + ioctl(ext->base.device_fd, EVIOCGUNIQ(sizeof(str)), str); + break; + default: + ERR("Unhandled string index %i\n", index); + } + + MultiByteToWideChar(CP_ACP, 0, str, -1, buffer, length); + return STATUS_SUCCESS; } static NTSTATUS lnxev_begin_report_processing(DEVICE_OBJECT *device)

1 0

Aric Stewart : winebus.sys: Build device reports for linux event devices.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 890107e3138f328e132b41aa36f9fe094e53e205 URL: https://source.winehq.org/git/wine.git/?a=commit;h=890107e3138f328e132b41aa… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 1 11:36:16 2018 -0600 winebus.sys: Build device reports for linux event devices. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 471 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 469 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=890107e3138f328e132b…

1 0

Aric Stewart : winebus.sys: Handle linux input event device via udev.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 41d46f7461674e7af1013956d76e6c9b0bc05f59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41d46f7461674e7af1013956… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 1 11:36:04 2018 -0600 winebus.sys: Handle linux input event device via udev. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 6 ++ dlls/winebus.sys/bus_udev.c | 173 ++++++++++++++++++++++++++++++++++++++++++-- dlls/winebus.sys/main.c | 48 ++++++++++++ 3 files changed, 219 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=41d46f7461674e7af101…

1 0

Nikolay Sivov : comctl32/button: Fix dialog code for new button types.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: bf152cb0cc7b3ee73c4a81835761d52de42d90e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf152cb0cc7b3ee73c4a8183… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 7 16:13:09 2018 +0300 comctl32/button: Fix dialog code for new button types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 4 ++++ dlls/comctl32/tests/button.c | 28 ++++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index b0eea99..a39a64c 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -237,12 +237,16 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L case WM_GETDLGCODE: switch(btn_type) { + case BS_COMMANDLINK: case BS_USERBUTTON: case BS_PUSHBUTTON: return DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON; + case BS_DEFCOMMANDLINK: case BS_DEFPUSHBUTTON: return DLGC_BUTTON | DLGC_DEFPUSHBUTTON; case BS_RADIOBUTTON: case BS_AUTORADIOBUTTON: return DLGC_BUTTON | DLGC_RADIOBUTTON; case BS_GROUPBOX: return DLGC_STATIC; + case BS_SPLITBUTTON: return DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON | DLGC_WANTARROWS; + case BS_DEFSPLITBUTTON: return DLGC_BUTTON | DLGC_DEFPUSHBUTTON | DLGC_WANTARROWS; default: return DLGC_BUTTON; } diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 38e55c8..425e145 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -511,6 +511,18 @@ static void test_button_messages(void) { BS_OWNERDRAW, DLGC_BUTTON, setfocus_ownerdraw_seq, killfocus_ownerdraw_seq, setstyle_ownerdraw_seq, setstate_ownerdraw_seq, clearstate_ownerdraw_seq, setcheck_ignored_seq }, + { BS_SPLITBUTTON, DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON | DLGC_WANTARROWS, + setfocus_seq, killfocus_seq, setstyle_seq, + setstate_seq, setstate_seq, setcheck_ignored_seq }, + { BS_DEFSPLITBUTTON, DLGC_BUTTON | DLGC_DEFPUSHBUTTON | DLGC_WANTARROWS, + setfocus_seq, killfocus_seq, setstyle_seq, + setstate_seq, setstate_seq, setcheck_ignored_seq }, + { BS_COMMANDLINK, DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON, + setfocus_seq, killfocus_seq, setstyle_seq, + setstate_seq, setstate_seq, setcheck_ignored_seq }, + { BS_DEFCOMMANDLINK, DLGC_BUTTON | DLGC_DEFPUSHBUTTON, + setfocus_seq, killfocus_seq, setstyle_seq, + setstate_seq, setstate_seq, setcheck_ignored_seq }, }; const struct message *seq; unsigned int i; @@ -550,7 +562,15 @@ static void test_button_messages(void) ok(style == button[i].style, "expected style %x got %x\n", button[i].style, style); dlg_code = SendMessageA(hwnd, WM_GETDLGCODE, 0, 0); - ok(dlg_code == button[i].dlg_code, "%u: wrong dlg_code %08x\n", i, dlg_code); + if (button[i].style == BS_SPLITBUTTON || + button[i].style == BS_DEFSPLITBUTTON || + button[i].style == BS_COMMANDLINK || + button[i].style == BS_DEFCOMMANDLINK) + { + ok(dlg_code == button[i].dlg_code || broken(dlg_code == DLGC_BUTTON) /* WinXP */, "%u: wrong dlg_code %08x\n", i, dlg_code); + } + else + ok(dlg_code == button[i].dlg_code, "%u: wrong dlg_code %08x\n", i, dlg_code); ShowWindow(hwnd, SW_SHOW); UpdateWindow(hwnd); @@ -650,7 +670,11 @@ static void test_button_messages(void) button[i].style == BS_DEFPUSHBUTTON || button[i].style == BS_GROUPBOX || button[i].style == BS_USERBUTTON || - button[i].style == BS_OWNERDRAW) + button[i].style == BS_OWNERDRAW || + button[i].style == BS_SPLITBUTTON || + button[i].style == BS_DEFSPLITBUTTON || + button[i].style == BS_COMMANDLINK || + button[i].style == BS_DEFCOMMANDLINK) { ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].setcheck, "BM_SETCHECK on a button", FALSE); state = SendMessageA(hwnd, BM_GETCHECK, 0, 0);

1 0

Huw Davies : winebuild: On x86_64, save xmm0 - 3 during the delayed import lookup.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 13fec030e73abe3a54e23288900f6ca528cf6cb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13fec030e73abe3a54e23288… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 7 12:47:10 2018 +0000 winebuild: On x86_64, save xmm0 - 3 during the delayed import lookup. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 01a418f..5e5866c 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -943,24 +943,32 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tjmp *%%eax\n" ); break; case CPU_x86_64: - output( "\tsubq $88,%%rsp\n" ); - output_cfi( ".cfi_adjust_cfa_offset 88" ); - output( "\tmovq %%rdx,80(%%rsp)\n" ); - output( "\tmovq %%rcx,72(%%rsp)\n" ); - output( "\tmovq %%r8,64(%%rsp)\n" ); - output( "\tmovq %%r9,56(%%rsp)\n" ); - output( "\tmovq %%r10,48(%%rsp)\n" ); - output( "\tmovq %%r11,40(%%rsp)\n" ); + output( "\tsubq $0x98,%%rsp\n" ); + output_cfi( ".cfi_adjust_cfa_offset 0x98" ); + output( "\tmovq %%rdx,0x88(%%rsp)\n" ); + output( "\tmovq %%rcx,0x80(%%rsp)\n" ); + output( "\tmovq %%r8,0x78(%%rsp)\n" ); + output( "\tmovq %%r9,0x70(%%rsp)\n" ); + output( "\tmovq %%r10,0x68(%%rsp)\n" ); + output( "\tmovq %%r11,0x60(%%rsp)\n" ); + output( "\tmovups %%xmm0,0x50(%%rsp)\n" ); + output( "\tmovups %%xmm1,0x40(%%rsp)\n" ); + output( "\tmovups %%xmm2,0x30(%%rsp)\n" ); + output( "\tmovups %%xmm3,0x20(%%rsp)\n" ); output( "\tmovq %%rax,%%rcx\n" ); output( "\tcall %s\n", asm_name("__wine_spec_delay_load") ); - output( "\tmovq 40(%%rsp),%%r11\n" ); - output( "\tmovq 48(%%rsp),%%r10\n" ); - output( "\tmovq 56(%%rsp),%%r9\n" ); - output( "\tmovq 64(%%rsp),%%r8\n" ); - output( "\tmovq 72(%%rsp),%%rcx\n" ); - output( "\tmovq 80(%%rsp),%%rdx\n" ); - output( "\taddq $88,%%rsp\n" ); - output_cfi( ".cfi_adjust_cfa_offset -88" ); + output( "\tmovups 0x20(%%rsp),%%xmm3\n" ); + output( "\tmovups 0x30(%%rsp),%%xmm2\n" ); + output( "\tmovups 0x40(%%rsp),%%xmm1\n" ); + output( "\tmovups 0x50(%%rsp),%%xmm0\n" ); + output( "\tmovq 0x60(%%rsp),%%r11\n" ); + output( "\tmovq 0x68(%%rsp),%%r10\n" ); + output( "\tmovq 0x70(%%rsp),%%r9\n" ); + output( "\tmovq 0x78(%%rsp),%%r8\n" ); + output( "\tmovq 0x80(%%rsp),%%rcx\n" ); + output( "\tmovq 0x88(%%rsp),%%rdx\n" ); + output( "\taddq $0x98,%%rsp\n" ); + output_cfi( ".cfi_adjust_cfa_offset -0x98" ); output( "\tjmp *%%rax\n" ); break; case CPU_ARM:

1 0

Vladimir Bespalov : winedbg: Fix enum value compilation warning.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 57ccf8221fdabfb90c4117b34478919e21e72858 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57ccf8221fdabfb90c4117b3… Author: Vladimir Bespalov <vlad.botanic(a)gmail.com> Date: Fri Feb 2 04:11:26 2018 -0800 winedbg: Fix enum value compilation warning. Signed-off-by: Vlad Bespalov <vlad.botanic(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_cpu.h | 2 +- programs/winedbg/gdbproxy.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winedbg/be_cpu.h b/programs/winedbg/be_cpu.h index 889f638..d62b517 100644 --- a/programs/winedbg/be_cpu.h +++ b/programs/winedbg/be_cpu.h @@ -20,7 +20,7 @@ enum be_cpu_addr {be_cpu_addr_pc, be_cpu_addr_stack, be_cpu_addr_frame}; enum be_xpoint_type {be_xpoint_break, be_xpoint_watch_exec, be_xpoint_watch_read, - be_xpoint_watch_write}; + be_xpoint_watch_write, be_xpoint_free=-1}; struct backend_cpu { const DWORD machine; diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 7b9a476..5fa4883 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -74,7 +74,7 @@ struct gdb_ctx_Xpoint { - enum be_xpoint_type type; /* -1 means free */ + enum be_xpoint_type type; /* (-1) == be_xpoint_free means free */ void* addr; unsigned long val; }; @@ -1583,7 +1583,7 @@ static BOOL read_memory(struct gdb_context *gdbctx, char *addr, char *buffer, SI { char *xpt_addr = xpt->addr; - if (xpt->type != -1 && xpt_addr >= addr && xpt_addr < addr + blk_len) + if (xpt->type != be_xpoint_free && xpt_addr >= addr && xpt_addr < addr + blk_len) buffer[xpt_addr - addr] = xpt->val; } } @@ -2192,7 +2192,7 @@ static enum packet_return packet_remove_breakpoint(struct gdb_context* gdbctx) gdbctx->process->process_io, &gdbctx->context, t, xpt->addr, xpt->val, len)) { - xpt->type = -1; + xpt->type = be_xpoint_free; return packet_ok; } break; @@ -2233,7 +2233,7 @@ static enum packet_return packet_set_breakpoint(struct gdb_context* gdbctx) /* really set the Xpoint */ for (xpt = &gdbctx->Xpoints[NUM_XPOINT - 1]; xpt >= gdbctx->Xpoints; xpt--) { - if (xpt->type == -1) + if (xpt->type == be_xpoint_free) { if (be_cpu->insert_Xpoint(gdbctx->process->handle, gdbctx->process->process_io, &gdbctx->context,

1 0

Huw Davies : kernel32: Save xmm0 - 3 to work around a Delphi bug on x86_64.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 1e945155f906bde15c5d70ec5ed253c1d7ce5148 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e945155f906bde15c5d70ec… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 6 10:26:13 2018 +0000 kernel32: Save xmm0 - 3 to work around a Delphi bug on x86_64. When delay loading a symbol, Delphi saves rcx, rdx, r8 and r9 to the stack. It then calls GetProcAddress(), pops the saved registers and calls the function. This works fine if all of the parameters are ints. However, since it does not save xmm0 - 3, it relies on GetProcAddress() preserving these registers if the function takes floating point parameters. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index b97c79b..a5346db 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1363,7 +1363,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeLibrary(HINSTANCE hLibModule) * Success: A pointer to the symbol in the process address space. * Failure: NULL. Use GetLastError() to determine the cause. */ -FARPROC WINAPI GetProcAddress( HMODULE hModule, LPCSTR function ) +FARPROC get_proc_address( HMODULE hModule, LPCSTR function ) { NTSTATUS nts; FARPROC fp; @@ -1387,6 +1387,54 @@ FARPROC WINAPI GetProcAddress( HMODULE hModule, LPCSTR function ) return fp; } +#ifdef __x86_64__ +/* + * Work around a Delphi bug on x86_64. When delay loading a symbol, + * Delphi saves rcx, rdx, r8 and r9 to the stack. It then calls + * GetProcAddress(), pops the saved registers and calls the function. + * This works fine if all of the parameters are ints. However, since + * it does not save xmm0 - 3, it relies on GetProcAddress() preserving + * these registers if the function takes floating point parameters. + * This wrapper saves xmm0 - 3 to the stack. + */ +extern FARPROC get_proc_address_wrapper( HMODULE module, LPCSTR function ); + +__ASM_GLOBAL_FUNC( get_proc_address_wrapper, + "pushq %rbp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") + __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") + "movq %rsp,%rbp\n\t" + __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") + "subq $0x40,%rsp\n\t" + "movaps %xmm0,-0x10(%rbp)\n\t" + "movaps %xmm1,-0x20(%rbp)\n\t" + "movaps %xmm2,-0x30(%rbp)\n\t" + "movaps %xmm3,-0x40(%rbp)\n\t" + "call " __ASM_NAME("get_proc_address") "\n\t" + "movaps -0x40(%rbp), %xmm3\n\t" + "movaps -0x30(%rbp), %xmm2\n\t" + "movaps -0x20(%rbp), %xmm1\n\t" + "movaps -0x10(%rbp), %xmm0\n\t" + "movq %rbp,%rsp\n\t" + __ASM_CFI(".cfi_def_cfa_register %rsp\n\t") + "popq %rbp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") + __ASM_CFI(".cfi_same_value %rbp\n\t") + "ret" ) +#else /* __x86_64__ */ + +static inline FARPROC get_proc_address_wrapper( HMODULE module, LPCSTR function ) +{ + return get_proc_address( module, function ); +} + +#endif /* __x86_64__ */ + +FARPROC WINAPI GetProcAddress( HMODULE hModule, LPCSTR function ) +{ + return get_proc_address_wrapper( hModule, function ); +} + /*********************************************************************** * DelayLoadFailureHook (KERNEL32.@) */

1 0

Michael Stefaniuc : wmvcore: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 06a3a32294e270f4dcbc4f96c9ad17aebe24188c URL: https://source.winehq.org/git/wine.git/?a=commit;h=06a3a32294e270f4dcbc4f96… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 7 00:20:05 2018 +0100 wmvcore: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/wmvcore.h | 10 ---------- dlls/wmvcore/wmvcore_main.c | 1 + dlls/wmvcore/writer.c | 1 + 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/wmvcore/wmvcore.h b/dlls/wmvcore/wmvcore.h index ca06e0a..e175470 100644 --- a/dlls/wmvcore/wmvcore.h +++ b/dlls/wmvcore/wmvcore.h @@ -24,13 +24,3 @@ #include "windef.h" #include "winbase.h" - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index ae8b486..1b45288 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -21,6 +21,7 @@ #include "initguid.h" #include "wmsdk.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wmvcore); diff --git a/dlls/wmvcore/writer.c b/dlls/wmvcore/writer.c index c1c30be..717984d 100644 --- a/dlls/wmvcore/writer.c +++ b/dlls/wmvcore/writer.c @@ -20,6 +20,7 @@ #include "wmsdkidl.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wmvcore);

1 0

Michael Stefaniuc : wmp: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: b3a24b58d4b431b48548583be5563713cc9d15c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3a24b58d4b431b48548583b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 7 00:20:04 2018 +0100 wmp: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/oleobj.c | 1 + dlls/wmp/wmp_private.h | 15 --------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index acf38f3..4799712 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -20,6 +20,7 @@ #include "olectl.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wmp); diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 7b7f51c..04173f3 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -46,18 +46,3 @@ HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) void unregister_wmp_class(void) DECLSPEC_HIDDEN; extern HINSTANCE wmp_instance DECLSPEC_HIDDEN; - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -}

1 0

Alexandre Julliard : server: Add a macro to define SIDs.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 6b758dd1dc5231b55684e17a5bb64cc42f8ab641 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b758dd1dc5231b55684e17a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 7 10:25:07 2018 +0100 server: Add a macro to define SIDs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/token.c | 40 ++++++++++++---------------------------- 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/server/token.c b/server/token.c index 85aab73..7deddc4 100644 --- a/server/token.c +++ b/server/token.c @@ -64,6 +64,14 @@ const LUID SeManageVolumePrivilege = { 28, 0 }; const LUID SeImpersonatePrivilege = { 29, 0 }; const LUID SeCreateGlobalPrivilege = { 30, 0 }; +#define SID_N(n) struct /* same fields as struct SID */ \ + { \ + BYTE Revision; \ + BYTE SubAuthorityCount; \ + SID_IDENTIFIER_AUTHORITY IdentifierAuthority; \ + DWORD SubAuthority[n]; \ + } + static const SID world_sid = { SID_REVISION, 1, { SECURITY_WORLD_SID_AUTHORITY }, { SECURITY_WORLD_RID } }; static const SID local_sid = { SID_REVISION, 1, { SECURITY_LOCAL_SID_AUTHORITY }, { SECURITY_LOCAL_RID } }; static const SID interactive_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_INTERACTIVE_RID } }; @@ -71,34 +79,10 @@ static const SID anonymous_logon_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORIT static const SID authenticated_user_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_AUTHENTICATED_USER_RID } }; static const SID local_system_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_LOCAL_SYSTEM_RID } }; static const SID high_label_sid = { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY }, { SECURITY_MANDATORY_HIGH_RID } }; -static const struct /* same fields as struct SID */ -{ - BYTE Revision; - BYTE SubAuthorityCount; - SID_IDENTIFIER_AUTHORITY IdentifierAuthority; - DWORD SubAuthority[5]; -} local_user_sid = { SID_REVISION, 5, { SECURITY_NT_AUTHORITY }, { SECURITY_NT_NON_UNIQUE, 0, 0, 0, 1000 } }; -static const struct /* same fields as struct SID */ -{ - BYTE Revision; - BYTE SubAuthorityCount; - SID_IDENTIFIER_AUTHORITY IdentifierAuthority; - DWORD SubAuthority[2]; -} builtin_admins_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS } }; -static const struct /* same fields as struct SID */ -{ - BYTE Revision; - BYTE SubAuthorityCount; - SID_IDENTIFIER_AUTHORITY IdentifierAuthority; - DWORD SubAuthority[2]; -} builtin_users_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS } }; -static const struct /* same fields as struct SID */ -{ - BYTE Revision; - BYTE SubAuthorityCount; - SID_IDENTIFIER_AUTHORITY IdentifierAuthority; - DWORD SubAuthority[SECURITY_LOGON_IDS_RID_COUNT]; -} builtin_logon_sid = { SID_REVISION, SECURITY_LOGON_IDS_RID_COUNT, {SECURITY_NT_AUTHORITY}, {SECURITY_LOGON_IDS_RID, 0, 0} }; +static const SID_N(5) local_user_sid = { SID_REVISION, 5, { SECURITY_NT_AUTHORITY }, { SECURITY_NT_NON_UNIQUE, 0, 0, 0, 1000 } }; +static const SID_N(2) builtin_admins_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS } }; +static const SID_N(2) builtin_users_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS } }; +static const SID_N(3) builtin_logon_sid = { SID_REVISION, 3, { SECURITY_NT_AUTHORITY }, { SECURITY_LOGON_IDS_RID, 0, 0 } }; const PSID security_world_sid = (PSID)&world_sid; static const PSID security_local_sid = (PSID)&local_sid;

1 0

Aric Stewart : loader: Add LNXEV to the critical event database.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 3e276f7e39fa0fabb8250c1f0dcbf180cd43247a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e276f7e39fa0fabb8250c1f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 1 11:36:44 2018 -0600 loader: Add LNXEV to the critical event database. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index a991319..c03fc26 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -472,6 +472,7 @@ HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57d [CriticalDevice] HKLM,System\CurrentControlSet\Control\CriticalDeviceDatabase\HIDRAW,"Service",,"WineHID" HKLM,System\CurrentControlSet\Control\CriticalDeviceDatabase\IOHID,"Service",,"WineHID" +HKLM,System\CurrentControlSet\Control\CriticalDeviceDatabase\LNXEV,"Service",,"WineHID" [CurrentVersion] HKCU,%CurrentVersion%\Run,,16

1 0

Hans Leidekker : msi: Don' t mark uncompressed global assembly files as installed until they are in the assembly cache.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: ff754f4edef05ab967ace9dc61400b32187de699 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff754f4edef05ab967ace9dc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 7 10:46:09 2018 +0100 msi: Don't mark uncompressed global assembly files as installed until they are in the assembly cache. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/files.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 02ff8ec..adffcaf 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -200,8 +200,6 @@ static UINT copy_file(MSIFILE *file, LPWSTR source) return GetLastError(); SetFileAttributesW(file->TargetPath, FILE_ATTRIBUTE_NORMAL); - - file->state = msifs_installed; return ERROR_SUCCESS; } @@ -249,7 +247,6 @@ static UINT copy_install_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR source) MoveFileExW(file->TargetPath, NULL, MOVEFILE_DELAY_UNTIL_REBOOT) && MoveFileExW(tmpfileW, file->TargetPath, MOVEFILE_DELAY_UNTIL_REBOOT)) { - file->state = msifs_installed; package->need_reboot_at_end = 1; gle = ERROR_SUCCESS; } @@ -365,6 +362,8 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { + BOOL is_global_assembly = msi_is_global_assembly( file->Component ); + msi_file_update_ui( package, file, szInstallFiles ); rc = msi_load_media_info( package, file->Sequence, mi ); @@ -412,7 +411,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) TRACE("copying %s to %s\n", debugstr_w(source), debugstr_w(file->TargetPath)); - if (!msi_is_global_assembly( file->Component )) + if (!is_global_assembly) { msi_create_directory(package, file->Component->Directory); } @@ -424,10 +423,11 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) msi_free(source); goto done; } + if (!is_global_assembly) file->state = msifs_installed; msi_free(source); } - else if (!msi_is_global_assembly( file->Component ) && - file->state != msifs_installed && !(file->Attributes & msidbFileAttributesPatchAdded)) + else if (!is_global_assembly && file->state != msifs_installed && + !(file->Attributes & msidbFileAttributesPatchAdded)) { ERR("compressed file wasn't installed (%s)\n", debugstr_w(file->File)); rc = ERROR_INSTALL_FAILURE;

1 0

Henri Verbeet : winedbg: Handle byte-sized registers in cpu_register() and cpu_register_hex_from().
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: fc3ea7d1ef6860ab04fcfaa24353c5a8d06ff8ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc3ea7d1ef6860ab04fcfaa2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 7 17:09:17 2018 +0330 winedbg: Handle byte-sized registers in cpu_register() and cpu_register_hex_from(). Like for example the recently added floating-point TagWord on AMD64. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 5fa4883..618c5df 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -517,6 +517,7 @@ static inline DWORD64 cpu_register(CONTEXT* ctx, unsigned idx) { switch (cpu_register_map[idx].ctx_length) { + case 1: return *(BYTE*)cpu_register_ptr(ctx, idx); case 2: return *(WORD*)cpu_register_ptr(ctx, idx); case 4: return *(DWORD*)cpu_register_ptr(ctx, idx); case 8: return *(DWORD64*)cpu_register_ptr(ctx, idx); @@ -545,6 +546,7 @@ static inline void cpu_register_hex_from(CONTEXT* ctx, unsigned idx, const } switch (cpu_register_map[idx].ctx_length) { + case 1: *(BYTE*)cpu_register_ptr(ctx, idx) = (BYTE)val; break; case 2: *(WORD*)cpu_register_ptr(ctx, idx) = (WORD)val; break; case 4: *(DWORD*)cpu_register_ptr(ctx, idx) = (DWORD)val; break; case 8: *(DWORD64*)cpu_register_ptr(ctx, idx) = val; break;

1 0

Aric Stewart : winebus.sys: Process device reports for linux event devices.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 52cafe87133c9a88b5cba071de60ecd536f82266 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52cafe87133c9a88b5cba071… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 1 11:36:35 2018 -0600 winebus.sys: Process device reports for linux event devices. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 233 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 227 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=52cafe87133c9a88b5cb…

1 0

Henri Verbeet : ddraw: Avoid using WINED3DUSAGE_DYNAMIC without WINED3D_RESOURCE_ACCESS_GPU in d3d_execute_buffer_SetExecuteData ().
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: c8dd71bbc4617631a986bce404b8efbc56ef300c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8dd71bbc4617631a986bce4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 7 02:29:31 2018 +0330 ddraw: Avoid using WINED3DUSAGE_DYNAMIC without WINED3D_RESOURCE_ACCESS_GPU in d3d_execute_buffer_SetExecuteData(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/executebuffer.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index b1afcf5..d710b34 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -620,7 +620,7 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * struct wined3d_buffer_desc desc; desc.byte_width = new_size * sizeof(D3DVERTEX); - desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY; + desc.usage = 0; desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; desc.misc_flags = 0; @@ -660,9 +660,8 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * { box.left = buffer->src_vertex_pos * sizeof(D3DVERTEX); box.right = box.left + data->dwVertexCount * sizeof(D3DVERTEX); - hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->src_vertex_buffer), 0, - &map_desc, &box, buffer->src_vertex_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); - if (FAILED(hr)) + if (FAILED(hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->src_vertex_buffer), + 0, &map_desc, &box, 0))) return hr; memcpy(map_desc.data, ((BYTE *)buffer->desc.lpData) + data->dwVertexOffset,

1 0

Henri Verbeet : d3d9: Use the global memory allocation helpers.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 31250d6d4daa6a907aa4d595a13f7a1c142d5097 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31250d6d4daa6a907aa4d595… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 7 02:29:32 2018 +0330 d3d9: Use the global memory allocation helpers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 4 +-- dlls/d3d9/d3d9_main.c | 8 ++--- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 84 ++++++++++++++++++------------------------- dlls/d3d9/directx.c | 12 +++---- dlls/d3d9/query.c | 2 +- dlls/d3d9/shader.c | 4 +-- dlls/d3d9/stateblock.c | 2 +- dlls/d3d9/surface.c | 2 +- dlls/d3d9/swapchain.c | 6 ++-- dlls/d3d9/texture.c | 2 +- dlls/d3d9/vertexdeclaration.c | 28 +++++++-------- dlls/d3d9/volume.c | 2 +- 13 files changed, 70 insertions(+), 87 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=31250d6d4daa6a907aa4…

1 0

Michael Stefaniuc : regedit: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 505a9e0283bb7acc6d3647dd602c1c1df8a0c4a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=505a9e0283bb7acc6d3647dd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 7 00:20:07 2018 +0100 regedit: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 3 ++- programs/regedit/edit.c | 1 + programs/regedit/framewnd.c | 1 + programs/regedit/hexedit.c | 1 + programs/regedit/listview.c | 1 + programs/regedit/regedit.c | 1 + programs/regedit/regproc.c | 15 +++------------ programs/regedit/regproc.h | 1 - programs/regedit/treeview.c | 1 + 9 files changed, 11 insertions(+), 14 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 7a5633f..0c6d895 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -27,8 +27,9 @@ #include "regproc.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" - + WINE_DEFAULT_DEBUG_CHANNEL(regedit); ChildWnd* g_pChildWnd; diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 6ccce00..c8b77bd 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -29,6 +29,7 @@ #include <shellapi.h> #include <shlwapi.h> +#include "wine/heap.h" #include "wine/unicode.h" #include "main.h" #include "regproc.h" diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index c6fcee4..94da217 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -31,6 +31,7 @@ #include "main.h" #include "regproc.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(regedit); diff --git a/programs/regedit/hexedit.c b/programs/regedit/hexedit.c index 3f05aa6..fc6c3a3 100644 --- a/programs/regedit/hexedit.c +++ b/programs/regedit/hexedit.c @@ -35,6 +35,7 @@ #include "winnls.h" #include "commctrl.h" +#include "wine/heap.h" #include "main.h" #include "regproc.h" diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 4c2ec36..0934e03 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -27,6 +27,7 @@ #include "main.h" #include "regproc.h" +#include "wine/heap.h" #include "wine/unicode.h" static INT Image_String; diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index fe0163c..a69e929 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -24,6 +24,7 @@ #include <shellapi.h> #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" #include "regproc.h" WINE_DEFAULT_DEBUG_CHANNEL(regedit); diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 0911b50..35b0322 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -29,6 +29,7 @@ #include <windows.h> #include <wine/unicode.h> #include <wine/debug.h> +#include <wine/heap.h> #include "regproc.h" WINE_DEFAULT_DEBUG_CHANNEL(regedit); @@ -46,7 +47,7 @@ static HKEY reg_class_keys[] = { void *heap_xalloc(size_t size) { - void *buf = HeapAlloc(GetProcessHeap(), 0, size); + void *buf = heap_alloc(size); if (!buf) { ERR("Out of memory!\n"); @@ -57,12 +58,7 @@ void *heap_xalloc(size_t size) void *heap_xrealloc(void *buf, size_t size) { - void *new_buf; - - if (buf) - new_buf = HeapReAlloc(GetProcessHeap(), 0, buf, size); - else - new_buf = HeapAlloc(GetProcessHeap(), 0, size); + void *new_buf = heap_realloc(buf, size); if (!new_buf) { @@ -73,11 +69,6 @@ void *heap_xrealloc(void *buf, size_t size) return new_buf; } -BOOL heap_free(void *buf) -{ - return HeapFree(GetProcessHeap(), 0, buf); -} - /****************************************************************************** * Allocates memory and converts input from multibyte to wide chars * Returned string must be freed by the caller diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index 9364fde..bfb0cba 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -30,7 +30,6 @@ void WINAPIV error_exit(unsigned int id, ...); char *GetMultiByteString(const WCHAR *strW); void *heap_xalloc(size_t size); void *heap_xrealloc(void *buf, size_t size); -BOOL heap_free(void *buf); BOOL import_registry_file(FILE *reg_file); void delete_registry_key(WCHAR *reg_key_name); BOOL export_registry_key(WCHAR *file_name, WCHAR *path, DWORD format); diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 77befb5..4bbec40 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -30,6 +30,7 @@ #include <wine/debug.h> #include <shlwapi.h> +#include "wine/heap.h" #include "main.h" #include "regproc.h"

1 0

Michael Stefaniuc : wscript: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: e68620c044848b2bc5251238ac23b322d6a5ea14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e68620c044848b2bc5251238… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 7 00:20:08 2018 +0100 wscript: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wscript/host.c | 1 + programs/wscript/wscript.h | 15 --------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index 3c30c3c..fb95c0c 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -28,6 +28,7 @@ #include "wscript.h" #include <wine/debug.h> +#include <wine/heap.h> #include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(wscript); diff --git a/programs/wscript/wscript.h b/programs/wscript/wscript.h index 2a64b34..d624a2d 100644 --- a/programs/wscript/wscript.h +++ b/programs/wscript/wscript.h @@ -33,18 +33,3 @@ extern WCHAR **argums; extern int numOfArgs; extern VARIANT_BOOL wshInteractive; - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -}

1 0

Francois Gouget : msvcp120/tests: A spelling fix in a comment.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 8ce7f782cc3db048e553cd53c2d53b7348da55f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ce7f782cc3db048e553cd53… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 7 09:31:04 2018 +0100 msvcp120/tests: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 5ae858d..dfd2d06 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -2496,7 +2496,7 @@ static void test_queue_base_v4(void) ok(b, "pop returned false\n"); ok(c == (char)('a'+i), "got '%c', expected '%c'\n", c, 'a'+i); - /* destructor does't clear the memory, _Internal_finish_clear needs to be called */ + /* destructor doesn't clear the memory, _Internal_finish_clear needs to be called */ SET_EXPECT(queue_char__Deallocate_page); call_func1(p_queue_base_v4__Internal_finish_clear, &queue); CHECK_CALLED(queue_char__Deallocate_page);

1 0

Alistair Leslie-Hughes : ntdll: Support TokenLogonSid in NtQueryInformationToken.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 4bbbc261d1298210ec3eaf49b783defc6988da83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bbbc261d1298210ec3eaf49… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 6 04:19:37 2018 +0000 ntdll: Support TokenLogonSid in NtQueryInformationToken. Based on a patch by Andrew Wesie. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 4 ++-- dlls/ntdll/nt.c | 21 +++++++++++++++++++++ server/token.c | 10 ++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 57889dc..bc14a80 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1843,11 +1843,11 @@ static void test_token_attr(void) todo_wine win_skip("TokenLogonSid not supported. Skipping tests\n"); else { - todo_wine ok(!ret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + ok(!ret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), "GetTokenInformation(TokenLogonSid) failed with error %d\n", GetLastError()); Groups = HeapAlloc(GetProcessHeap(), 0, Size); ret = GetTokenInformation(Token, TokenLogonSid, Groups, Size, &Size); - todo_wine ok(ret, + ok(ret, "GetTokenInformation(TokenLogonSid) failed with error %d\n", GetLastError()); if (ret) { diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 8938d5d..8995c36 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -552,6 +552,27 @@ NTSTATUS WINAPI NtQueryInformationToken( *(DWORD*)tokeninfo = 0; break; } + case TokenLogonSid: + SERVER_START_REQ( get_token_sid ) + { + TOKEN_GROUPS * groups = tokeninfo; + PSID sid = groups + 1; + DWORD sid_len = tokeninfolength < sizeof(TOKEN_GROUPS) ? 0 : tokeninfolength - sizeof(TOKEN_GROUPS); + + req->handle = wine_server_obj_handle( token ); + req->which_sid = tokeninfoclass; + wine_server_set_reply( req, sid, sid_len ); + status = wine_server_call( req ); + if (retlen) *retlen = reply->sid_len + sizeof(TOKEN_GROUPS); + if (status == STATUS_SUCCESS) + { + groups->GroupCount = 1; + groups->Groups[0].Sid = sid; + groups->Groups[0].Attributes = 0; + } + } + SERVER_END_REQ; + break; default: { ERR("Unhandled Token Information class %d!\n", tokeninfoclass); diff --git a/server/token.c b/server/token.c index 532d7b7..85aab73 100644 --- a/server/token.c +++ b/server/token.c @@ -92,6 +92,13 @@ static const struct /* same fields as struct SID */ SID_IDENTIFIER_AUTHORITY IdentifierAuthority; DWORD SubAuthority[2]; } builtin_users_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS } }; +static const struct /* same fields as struct SID */ +{ + BYTE Revision; + BYTE SubAuthorityCount; + SID_IDENTIFIER_AUTHORITY IdentifierAuthority; + DWORD SubAuthority[SECURITY_LOGON_IDS_RID_COUNT]; +} builtin_logon_sid = { SID_REVISION, SECURITY_LOGON_IDS_RID_COUNT, {SECURITY_NT_AUTHORITY}, {SECURITY_LOGON_IDS_RID, 0, 0} }; const PSID security_world_sid = (PSID)&world_sid; static const PSID security_local_sid = (PSID)&local_sid; @@ -1436,6 +1443,9 @@ DECL_HANDLER(get_token_sid) } break; } + case TokenLogonSid: + sid = (const SID *)&builtin_logon_sid; + break; default: set_error( STATUS_INVALID_PARAMETER ); break;

1 0

Nikolay Sivov : user32: Automatically load the module implementing redirected class.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 0de689f41560208bbc14fb1a6b9f7dfe154326c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0de689f41560208bbc14fb1a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 7 18:08:52 2018 +0300 user32: Automatically load the module implementing redirected class. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/class.c | 5 ++ dlls/user32/tests/class.c | 223 +++++++++++++++++++++++++++++++++------------- 2 files changed, 167 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0de689f41560208bbc14…

1 0

Henri Verbeet : ddraw: Use wined3d_buffer_create() in d3d_execute_buffer_SetExecuteData().
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: cbd1aaafa0ff096b037f026a0900337bcb9a45f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbd1aaafa0ff096b037f026a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 7 02:29:30 2018 +0330 ddraw: Use wined3d_buffer_create() in d3d_execute_buffer_SetExecuteData(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/executebuffer.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 6ce77e3..b1afcf5 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -617,17 +617,25 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * { unsigned int new_size = max(data->dwVertexCount, buffer->vertex_size * 2); struct wined3d_buffer *src_buffer, *dst_buffer; + struct wined3d_buffer_desc desc; - hr = wined3d_buffer_create_vb(buffer->d3ddev->wined3d_device, new_size * sizeof(D3DVERTEX), - WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, WINED3D_POOL_SYSTEM_MEM, - NULL, &ddraw_null_wined3d_parent_ops, &src_buffer); - if (FAILED(hr)) + desc.byte_width = new_size * sizeof(D3DVERTEX); + desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY; + desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; + desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; + desc.misc_flags = 0; + desc.structure_byte_stride = 0; + + if (FAILED(hr = wined3d_buffer_create(buffer->d3ddev->wined3d_device, &desc, + NULL, NULL, &ddraw_null_wined3d_parent_ops, &src_buffer))) return hr; - hr = wined3d_buffer_create_vb(buffer->d3ddev->wined3d_device, new_size * sizeof(D3DTLVERTEX), - WINED3DUSAGE_STATICDECL, WINED3D_POOL_DEFAULT, - NULL, &ddraw_null_wined3d_parent_ops, &dst_buffer); - if (FAILED(hr)) + desc.byte_width = new_size * sizeof(D3DTLVERTEX); + desc.usage = WINED3DUSAGE_STATICDECL; + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + + if (FAILED(hr = wined3d_buffer_create(buffer->d3ddev->wined3d_device, &desc, + NULL, NULL, &ddraw_null_wined3d_parent_ops, &dst_buffer))) { wined3d_buffer_decref(src_buffer); return hr;

1 0

Henri Verbeet : ddraw: Use wined3d_buffer_create() in d3d_device_prepare_vertex_buffer().
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: 3aafba2b6907e31ac2a6b3a782d5f59024e8f004 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3aafba2b6907e31ac2a6b3a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 7 02:29:29 2018 +0330 ddraw: Use wined3d_buffer_create() in d3d_device_prepare_vertex_buffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 75fd6c4..c052dc2 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3465,15 +3465,22 @@ static HRESULT d3d_device_prepare_vertex_buffer(struct d3d_device *device, UINT if (device->vertex_buffer_size < min_size || !device->vertex_buffer) { UINT size = max(device->vertex_buffer_size * 2, min_size); + struct wined3d_buffer_desc desc; struct wined3d_buffer *buffer; TRACE("Growing vertex buffer to %u bytes\n", size); - hr = wined3d_buffer_create_vb(device->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, - WINED3D_POOL_DEFAULT, NULL, &ddraw_null_wined3d_parent_ops, &buffer); - if (FAILED(hr)) + desc.byte_width = size; + desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY; + desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.misc_flags = 0; + desc.structure_byte_stride = 0; + + if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, + NULL, NULL, &ddraw_null_wined3d_parent_ops, &buffer))) { - ERR("(%p) wined3d_buffer_create_vb failed with hr = %08x\n", device, hr); + ERR("Failed to create vertex buffer, hr %#x.\n", hr); return hr; }

1 0

Henri Verbeet : d3d9: Use wined3d_buffer_create() in d3d9_device_prepare_index_buffer().
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: wine Branch: master Commit: f181da61a0285dd151926b56c83de062d5006a77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f181da61a0285dd151926b56… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 7 02:29:28 2018 +0330 d3d9: Use wined3d_buffer_create() in d3d9_device_prepare_index_buffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 15 +++++++++++---- dlls/wined3d/buffer.c | 18 ------------------ dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 3 --- 4 files changed, 11 insertions(+), 26 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 954f3fa..8f992ba 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2646,15 +2646,22 @@ static HRESULT d3d9_device_prepare_index_buffer(struct d3d9_device *device, UINT if (device->index_buffer_size < min_size || !device->index_buffer) { UINT size = max(device->index_buffer_size * 2, min_size); + struct wined3d_buffer_desc desc; struct wined3d_buffer *buffer; TRACE("Growing index buffer to %u bytes.\n", size); - hr = wined3d_buffer_create_ib(device->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, - WINED3D_POOL_DEFAULT, NULL, &d3d9_null_wined3d_parent_ops, &buffer); - if (FAILED(hr)) + desc.byte_width = size; + desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL; + desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.misc_flags = 0; + desc.structure_byte_stride = 0; + + if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, + NULL, NULL, &d3d9_null_wined3d_parent_ops, &buffer))) { - ERR("(%p) wined3d_buffer_create_ib failed with hr = %08x.\n", device, hr); + ERR("Failed to create index buffer, hr %#x.\n", hr); return hr; } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 593d886..f1b4556 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1487,21 +1487,3 @@ HRESULT CDECL wined3d_buffer_create_vb(struct wined3d_device *device, UINT size, return wined3d_buffer_create(device, &desc, NULL, parent, parent_ops, buffer); } - -HRESULT CDECL wined3d_buffer_create_ib(struct wined3d_device *device, UINT size, DWORD usage, enum wined3d_pool pool, - void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer) -{ - struct wined3d_buffer_desc desc; - - TRACE("device %p, size %u, usage %#x, pool %#x, parent %p, parent_ops %p, buffer %p.\n", - device, size, usage, pool, parent, parent_ops, buffer); - - desc.byte_width = size; - desc.usage = usage | WINED3DUSAGE_STATICDECL; - desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; - desc.access = resource_access_from_pool(pool); - desc.misc_flags = 0; - desc.structure_byte_stride = 0; - - return wined3d_buffer_create(device, &desc, NULL, parent, parent_ops, buffer); -} diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 74e61ea..606ba0b 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -23,7 +23,6 @@ @ cdecl wined3d_set_adapter_display_mode(ptr long ptr) @ cdecl wined3d_buffer_create(ptr ptr ptr ptr ptr ptr) -@ cdecl wined3d_buffer_create_ib(ptr long long long ptr ptr ptr) @ cdecl wined3d_buffer_create_vb(ptr long long long ptr ptr ptr) @ cdecl wined3d_buffer_decref(ptr) @ cdecl wined3d_buffer_get_parent(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 72168e5..2a79602 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2189,9 +2189,6 @@ HRESULT __cdecl wined3d_set_adapter_display_mode(struct wined3d *wined3d, HRESULT __cdecl wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer); -HRESULT __cdecl wined3d_buffer_create_ib(struct wined3d_device *device, UINT length, DWORD usage, - enum wined3d_pool pool, void *parent, const struct wined3d_parent_ops *parent_ops, - struct wined3d_buffer **buffer); HRESULT __cdecl wined3d_buffer_create_vb(struct wined3d_device *device, UINT length, DWORD usage, enum wined3d_pool pool, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer);

1 0

Francois Gouget : testbot/web: Fix an indentation in the Stats code.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: tools Branch: master Commit: 93cea25fc124c258726bc0af985532512e1fe3d6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=93cea25fc124c258726bc0a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 7 05:29:59 2018 +0100 testbot/web: Fix an indentation in the Stats code. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Stats.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index d9a3ce5..9db2ad3 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -82,8 +82,8 @@ sub _AddRate($$;$) $RateKey =~ s/(?:\.time)?\.count$/.rate/; $AllStats ||= $Stats; $Stats->{$RateKey} = $AllStats->{elapsed} ? - 3600 * $Stats->{$StatKey} / $AllStats->{elapsed} : - "n/a"; + 3600 * $Stats->{$StatKey} / $AllStats->{elapsed} : + "n/a"; } sub _GetAverage($$)

1 0

Francois Gouget : testbot: Use the same 'now' for all activity values.
by Alexandre Julliard Feb. 7, 2018

Feb. 7, 2018

Module: tools Branch: master Commit: c10d1f8818a445ddd047814c316098eeaa6193fd URL: https://source.winehq.org/git/tools.git/?a=commit;h=c10d1f8818a445ddd047814… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 7 05:30:55 2018 +0100 testbot: Use the same 'now' for all activity values. The code was calling time() in various places which could result in different notions of when 'now' is depending on the place. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index a2bd1b0..8c22e01 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -106,12 +106,13 @@ sub GetActivity($;$) { my ($VMs, $Seconds) = @_; my ($ActivityHash, $Activity, $Counters) = ({}, [], {}); + $Counters->{now} = time(); ### First load all the RecordGroups my $RecordGroups = CreateRecordGroups(); if ($Seconds) { - $RecordGroups->AddFilter("Timestamp", [time() - $Seconds], ">="); + $RecordGroups->AddFilter("Timestamp", [$Counters->{now} - $Seconds], ">="); } my $MinId; $Counters->{recordgroups} = $RecordGroups->GetItemsCount(); @@ -302,13 +303,13 @@ sub GetActivity($;$) $LastStatusVMs{$VM->Name} = $StatusVMs; } } - $LastGroup->{end} = time() if ($LastGroup); + $LastGroup->{end} = $Counters->{now} if ($LastGroup); foreach my $VM (@{$VMs->GetItems()}) { my $LastVMStatus = $LastStatusVMs{$VM->Name}->{$VM->Name}; next if (!$LastVMStatus); - $LastVMStatus->{end} = time(); + $LastVMStatus->{end} = $Counters->{now}; if ($LastVMStatus->{status} eq "unknown") { $LastVMStatus->{status} = $VM->Status;

1 0

Józef Kucia : wined3d: Add support for multisample texture views.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 7cdf7f56096b97cc4a1e2c5265bf540b845a9e65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cdf7f56096b97cc4a1e2c52… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 6 11:40:05 2018 +0100 wined3d: Add support for multisample texture views. 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/wined3d/view.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index a8e0259..b06dacc 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -44,15 +44,21 @@ static GLenum get_texture_view_target(const struct wined3d_gl_info *gl_info, } view_types[] = { - {GL_TEXTURE_CUBE_MAP, 0, GL_TEXTURE_CUBE_MAP}, - {GL_TEXTURE_RECTANGLE, 0, GL_TEXTURE_RECTANGLE}, - {GL_TEXTURE_2D, 0, GL_TEXTURE_2D}, - {GL_TEXTURE_2D, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY}, - {GL_TEXTURE_2D_ARRAY, 0, GL_TEXTURE_2D}, - {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY}, - {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_CUBE, GL_TEXTURE_CUBE_MAP}, - {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_CUBE_ARRAY, GL_TEXTURE_CUBE_MAP_ARRAY, ARB_TEXTURE_CUBE_MAP_ARRAY}, - {GL_TEXTURE_3D, 0, GL_TEXTURE_3D}, + {GL_TEXTURE_CUBE_MAP, 0, GL_TEXTURE_CUBE_MAP}, + {GL_TEXTURE_RECTANGLE, 0, GL_TEXTURE_RECTANGLE}, + {GL_TEXTURE_3D, 0, GL_TEXTURE_3D}, + + {GL_TEXTURE_2D, 0, GL_TEXTURE_2D}, + {GL_TEXTURE_2D, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY}, + {GL_TEXTURE_2D_ARRAY, 0, GL_TEXTURE_2D}, + {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_ARRAY}, + {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_TEXTURE_CUBE, GL_TEXTURE_CUBE_MAP}, + {GL_TEXTURE_2D_ARRAY, WINED3D_VIEW_CUBE_ARRAY, GL_TEXTURE_CUBE_MAP_ARRAY, ARB_TEXTURE_CUBE_MAP_ARRAY}, + + {GL_TEXTURE_2D_MULTISAMPLE, 0, GL_TEXTURE_2D_MULTISAMPLE}, + {GL_TEXTURE_2D_MULTISAMPLE, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_MULTISAMPLE_ARRAY}, + {GL_TEXTURE_2D_MULTISAMPLE_ARRAY, 0, GL_TEXTURE_2D_MULTISAMPLE}, + {GL_TEXTURE_2D_MULTISAMPLE_ARRAY, WINED3D_VIEW_TEXTURE_ARRAY, GL_TEXTURE_2D_MULTISAMPLE_ARRAY}, }; unsigned int i;

1 0

Daniel Lehman : oleaut32/tests: Fix leak (Valgrind).
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: ff4a02fe3cf2eb096508ac7d553986c3e4830372 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff4a02fe3cf2eb096508ac7d… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Feb 5 22:48:14 2018 -0800 oleaut32/tests: Fix leak (Valgrind). Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartype.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 6348fee..9be2eb2 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -6074,6 +6074,7 @@ static void test_recinfo(void) IRecordInfo_Release(recinfo); ITypeInfo_Release(typeinfo); + ITypeLib_Release(typelib2); ITypeLib_Release(typelib); DeleteFileW(filenameW); DeleteFileW(filename2W);

1 0

Józef Kucia : wined3d: Factor out wined3d_texture_get_gl_sample_count() function.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: b5f1d3085f49b57b2d145c04522258bc428133eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5f1d3085f49b57b2d145c04… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 6 11:40:06 2018 +0100 wined3d: Factor out wined3d_texture_get_gl_sample_count() function. For creating multisample textures. 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/wined3d/texture.c | 47 ++++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 29c4963..ed1ca21 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -456,6 +456,31 @@ static void gltexture_delete(struct wined3d_device *device, const struct wined3d tex->name = 0; } +static unsigned int wined3d_texture_get_gl_sample_count(const struct wined3d_texture *texture) +{ + const struct wined3d_format *format = texture->resource.format; + + /* We advertise as many WINED3D_MULTISAMPLE_NON_MASKABLE quality + * levels as the count of advertised multisample types for the texture + * format. */ + if (texture->resource.multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE) + { + unsigned int i, count = 0; + + for (i = 0; i < sizeof(format->multisample_types) * CHAR_BIT; ++i) + { + if (format->multisample_types & 1u << i) + { + if (texture->resource.multisample_quality == count++) + break; + } + } + return i + 1; + } + + return texture->resource.multisample_type; +} + /* Context activation is done by the caller. */ /* The caller is responsible for binding the correct texture. */ static void wined3d_texture_allocate_gl_mutable_storage(struct wined3d_texture *texture, @@ -1484,27 +1509,7 @@ static void wined3d_texture_prepare_rb(struct wined3d_texture *texture, * AMD have a similar feature called Enhanced Quality Anti-Aliasing * (EQAA), but it does not have an equivalent OpenGL extension. */ - /* We advertise as many WINED3D_MULTISAMPLE_NON_MASKABLE quality - * levels as the count of advertised multisample types for the texture - * format. */ - if (texture->resource.multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE) - { - unsigned int i, count = 0; - - for (i = 0; i < sizeof(format->multisample_types) * 8; ++i) - { - if (format->multisample_types & 1u << i) - { - if (texture->resource.multisample_quality == count++) - break; - } - } - samples = i + 1; - } - else - { - samples = texture->resource.multisample_type; - } + samples = wined3d_texture_get_gl_sample_count(texture); gl_info->fbo_ops.glGenRenderbuffers(1, &texture->rb_multisample); gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, texture->rb_multisample);

1 0

Piotr Caban : msvcr110: Add Concurrency::_Trace_agents function stub.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 475fa2c749e7ca5b648f456b8ecf47fe3d1b4964 URL: https://source.winehq.org/git/wine.git/?a=commit;h=475fa2c749e7ca5b648f456b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 6 15:38:05 2018 +0100 msvcr110: Add Concurrency::_Trace_agents function stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/misc.c | 6 ++++++ 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index b388c29..ebc35bd 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -455,7 +455,7 @@ @ stub -arch=win64 ?_Start(a)_Timer@details(a)Concurrency@@IEAAXXZ @ stub -arch=i386 ?_Stop(a)_Timer@details(a)Concurrency@@IAEXXZ @ stub -arch=win64 ?_Stop(a)_Timer@details(a)Concurrency@@IEAAXXZ -@ stub ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ +@ varargs ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ(long int64) msvcr120.?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ @ cdecl -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) msvcr120.?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z @ cdecl -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) msvcr120.?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z @ thiscall -arch=i386 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ(ptr) msvcr120.?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 0e3b0f3..a6664a5 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -657,7 +657,7 @@ @ stub -arch=arm ?_Tidy(a)exception@std@@AAAXXZ @ stub -arch=i386 ?_Tidy(a)exception@std@@AAEXXZ @ stub -arch=win64 ?_Tidy(a)exception@std@@AEAAXXZ -@ stub ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ +@ varargs ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ(long int64) _Trace_agents @ cdecl -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function @ cdecl -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function @ cdecl -arch=arm ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAA_NXZ(ptr) _ReentrantBlockingLock__TryAcquire diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index aebb12c..0748ccf 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -639,7 +639,7 @@ @ stub -arch=arm ?_Tidy(a)exception@std@@AAAXXZ @ stub -arch=i386 ?_Tidy(a)exception@std@@AAEXXZ @ stub -arch=win64 ?_Tidy(a)exception@std@@AEAAXXZ -@ stub ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ +@ varargs ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ(long int64) _Trace_agents @ cdecl -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function @ cdecl -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function @ cdecl -arch=arm ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAA_NXZ(ptr) _ReentrantBlockingLock__TryAcquire diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 6ffc308..c1d2e4b 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -635,7 +635,7 @@ @ stub -arch=arm ?_Tidy(a)exception@std@@AAAXXZ @ stub -arch=i386 ?_Tidy(a)exception@std@@AAEXXZ @ stub -arch=win64 ?_Tidy(a)exception@std@@AEAAXXZ -@ stub ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ +@ varargs ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ(long int64) msvcr120.?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ @ cdecl -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) msvcr120.?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z @ cdecl -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) msvcr120.?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z @ cdecl -arch=arm ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAA_NXZ(ptr) msvcr120.?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAA_NXZ diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 8f18aa4..c197d69 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -561,6 +561,12 @@ LONG CDECL MSVCRT__crtUnhandledException(EXCEPTION_POINTERS *ep) SetUnhandledExceptionFilter(NULL); return UnhandledExceptionFilter(ep); } + +/* ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ */ +void WINAPIV _Trace_agents(/*enum Concurrency::Agents_EventType*/int type, __int64 id, ...) +{ + FIXME("(%d %s)\n", type, wine_dbgstr_longlong(id)); +} #endif #if _MSVCR_VER>=120

1 0

Andrew Eikum : xaudio2: Fix ClassFactory ref counting.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 45babd780f586eb8d0a93205d0998d6ce3f8396d URL: https://source.winehq.org/git/wine.git/?a=commit;h=45babd780f586eb8d0a93205… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Feb 6 10:52:19 2018 -0600 xaudio2: Fix ClassFactory ref counting. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xapofx.c | 27 ++++++++++++++++++++------- dlls/xaudio2_7/xaudio_dll.c | 38 ++++++++++++++++++++------------------ dlls/xaudio2_7/xaudio_private.h | 2 +- 3 files changed, 41 insertions(+), 26 deletions(-) diff --git a/dlls/xaudio2_7/xapofx.c b/dlls/xaudio2_7/xapofx.c index 44dfb47..c39b428 100644 --- a/dlls/xaudio2_7/xapofx.c +++ b/dlls/xaudio2_7/xapofx.c @@ -764,7 +764,8 @@ static HRESULT WINAPI xapocf_CreateInstance(IClassFactory *iface, IUnknown *pOut static HRESULT WINAPI xapocf_LockServer(IClassFactory *iface, BOOL dolock) { - FIXME("(static)->(%d): stub!\n", dolock); + struct xapo_cf *This = xapo_impl_from_IClassFactory(iface); + FIXME("(%p)->(%d): stub!\n", This, dolock); return S_OK; } @@ -777,13 +778,17 @@ static const IClassFactoryVtbl xapo_Vtbl = xapocf_LockServer }; -IClassFactory *make_xapo_factory(REFCLSID clsid) +HRESULT make_xapo_factory(REFCLSID clsid, REFIID riid, void **ppv) { + HRESULT hr; struct xapo_cf *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(struct xapo_cf)); ret->IClassFactory_iface.lpVtbl = &xapo_Vtbl; ret->class = clsid; ret->ref = 0; - return &ret->IClassFactory_iface; + hr = IClassFactory_QueryInterface(&ret->IClassFactory_iface, riid, ppv); + if(FAILED(hr)) + HeapFree(GetProcessHeap(), 0, ret); + return hr; } #if XAUDIO2_VER >= 8 @@ -792,7 +797,9 @@ HRESULT WINAPI CreateAudioVolumeMeter(IUnknown **out) IClassFactory *cf; HRESULT hr; - cf = make_xapo_factory(&CLSID_AudioVolumeMeter27); + hr = make_xapo_factory(&CLSID_AudioVolumeMeter27, &IID_IClassFactory, (void**)&cf); + if(FAILED(hr)) + return hr; hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)out); @@ -806,7 +813,9 @@ HRESULT WINAPI CreateAudioReverb(IUnknown **out) IClassFactory *cf; HRESULT hr; - cf = make_xapo_factory(&CLSID_FXReverb); + hr = make_xapo_factory(&CLSID_FXReverb, &IID_IClassFactory, (void**)&cf); + if(FAILED(hr)) + return hr; hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)out); @@ -832,7 +841,9 @@ HRESULT CDECL CreateFX(REFCLSID clsid, IUnknown **out, void *initdata, UINT32 in class = &CLSID_FXEQ; if(class){ - cf = make_xapo_factory(class); + hr = make_xapo_factory(class, &IID_IClassFactory, (void**)&cf); + if(FAILED(hr)) + return hr; hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&obj); IClassFactory_Release(cf); @@ -890,7 +901,9 @@ HRESULT CDECL CreateFX(REFCLSID clsid, IUnknown **out) /* TODO FXECHO, FXMasteringLimiter, */ if(class){ - cf = make_xapo_factory(class); + hr = make_xapo_factory(class, &IID_IClassFactory, (void**)&cf); + if(FAILED(hr)) + return hr; hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&obj); IClassFactory_Release(cf); diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 9b7a07f..0682a5f 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2121,7 +2121,8 @@ static HRESULT WINAPI XAudio2CF_CreateInstance(IClassFactory *iface, IUnknown *p static HRESULT WINAPI XAudio2CF_LockServer(IClassFactory *iface, BOOL dolock) { - FIXME("(static)->(%d): stub!\n", dolock); + struct xaudio2_cf *This = impl_from_IClassFactory(iface); + FIXME("(%p)->(%d): stub!\n", This, dolock); return S_OK; } @@ -2134,18 +2135,20 @@ static const IClassFactoryVtbl XAudio2CF_Vtbl = XAudio2CF_LockServer }; -static IClassFactory *make_xaudio2_factory(void) +static HRESULT make_xaudio2_factory(REFIID riid, void **ppv) { + HRESULT hr; struct xaudio2_cf *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(struct xaudio2_cf)); ret->IClassFactory_iface.lpVtbl = &XAudio2CF_Vtbl; ret->ref = 0; - return &ret->IClassFactory_iface; + hr = IClassFactory_QueryInterface(&ret->IClassFactory_iface, riid, ppv); + if(FAILED(hr)) + HeapFree(GetProcessHeap(), 0, ret); + return hr; } HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) { - IClassFactory *factory = NULL; - TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); if(IsEqualGUID(rclsid, &CLSID_XAudio20) || @@ -2155,33 +2158,30 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) IsEqualGUID(rclsid, &CLSID_XAudio24) || IsEqualGUID(rclsid, &CLSID_XAudio25) || IsEqualGUID(rclsid, &CLSID_XAudio26) || - IsEqualGUID(rclsid, &CLSID_XAudio27)){ - factory = make_xaudio2_factory(); + IsEqualGUID(rclsid, &CLSID_XAudio27)) + return make_xaudio2_factory(riid, ppv); - }else if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter20) || + if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter20) || IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter21) || IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter22) || IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter23) || IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter24) || IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter25) || IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter26) || - IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter27)){ - factory = make_xapo_factory(&CLSID_AudioVolumeMeter27); + IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter27)) + return make_xapo_factory(&CLSID_AudioVolumeMeter27, riid, ppv); - }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb20) || + if(IsEqualGUID(rclsid, &CLSID_AudioReverb20) || IsEqualGUID(rclsid, &CLSID_AudioReverb21) || IsEqualGUID(rclsid, &CLSID_AudioReverb22) || IsEqualGUID(rclsid, &CLSID_AudioReverb23) || IsEqualGUID(rclsid, &CLSID_AudioReverb24) || IsEqualGUID(rclsid, &CLSID_AudioReverb25) || IsEqualGUID(rclsid, &CLSID_AudioReverb26) || - IsEqualGUID(rclsid, &CLSID_AudioReverb27)){ - factory = make_xapo_factory(&CLSID_FXReverb); - } - - if(!factory) return CLASS_E_CLASSNOTAVAILABLE; + IsEqualGUID(rclsid, &CLSID_AudioReverb27)) + return make_xapo_factory(&CLSID_FXReverb, riid, ppv); - return IClassFactory_QueryInterface(factory, riid, ppv); + return CLASS_E_CLASSNOTAVAILABLE; } HRESULT xaudio2_initialize(IXAudio2Impl *This, UINT32 flags, XAUDIO2_PROCESSOR proc) @@ -2200,7 +2200,9 @@ HRESULT WINAPI XAudio2Create(IXAudio2 **ppxa2, UINT32 flags, XAUDIO2_PROCESSOR p TRACE("%p 0x%x 0x%x\n", ppxa2, flags, proc); - cf = make_xaudio2_factory(); + hr = make_xaudio2_factory(&IID_IClassFactory, (void**)&cf); + if(FAILED(hr)) + return hr; hr = IClassFactory_CreateInstance(cf, NULL, &IID_IXAudio2, (void**)&xa2); IClassFactory_Release(cf); diff --git a/dlls/xaudio2_7/xaudio_private.h b/dlls/xaudio2_7/xaudio_private.h index 1a4aa08..5d3814f 100644 --- a/dlls/xaudio2_7/xaudio_private.h +++ b/dlls/xaudio2_7/xaudio_private.h @@ -181,5 +181,5 @@ extern const IXAudio22Vtbl XAudio22_Vtbl DECLSPEC_HIDDEN; extern const IXAudio27Vtbl XAudio27_Vtbl DECLSPEC_HIDDEN; #endif -extern IClassFactory *make_xapo_factory(REFCLSID clsid) DECLSPEC_HIDDEN; +extern HRESULT make_xapo_factory(REFCLSID clsid, REFIID riid, void **ppv) DECLSPEC_HIDDEN; extern HRESULT xaudio2_initialize(IXAudio2Impl *This, UINT32 flags, XAUDIO2_PROCESSOR proc) DECLSPEC_HIDDEN;

1 0

Andrew Eikum : advapi32: Also wait on services without a control thread during shutdown.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: e5294a7414ca81c4761c00421cd7d59d9b83caa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5294a7414ca81c4761c0042… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Feb 6 10:43:57 2018 -0600 advapi32: Also wait on services without a control thread during shutdown. Tested service messages during OS shutdown manually on Windows 7. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/service.c | 94 +++++++++++++++++++++++++++++++------------------ 1 file changed, 59 insertions(+), 35 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 7d66326..70907e1 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -529,6 +529,63 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) return 1; } +/* wait for services which accept this type of message to become STOPPED */ +static void handle_shutdown_msg(DWORD msg, DWORD accept) +{ + SERVICE_STATUS st; + SERVICE_PRESHUTDOWN_INFO spi; + DWORD i, n = 0, sz, timeout = 2000; + ULONGLONG stop_time; + BOOL res, done = TRUE; + SC_HANDLE *wait_handles = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SC_HANDLE) * nb_services ); + + EnterCriticalSection( &service_cs ); + for (i = 0; i < nb_services; i++) + { + res = QueryServiceStatus( services[i]->full_access_handle, &st ); + if (!res || st.dwCurrentState == SERVICE_STOPPED || !(st.dwControlsAccepted & accept)) + continue; + + done = FALSE; + + if (accept == SERVICE_ACCEPT_PRESHUTDOWN) + { + res = QueryServiceConfig2W( services[i]->full_access_handle, SERVICE_CONFIG_PRESHUTDOWN_INFO, + (LPBYTE)&spi, sizeof(spi), &sz ); + if (res) + { + FIXME( "service should be able to delay shutdown\n" ); + timeout = max( spi.dwPreshutdownTimeout, timeout ); + } + } + + service_handle_control( services[i], msg, NULL, 0 ); + wait_handles[n++] = services[i]->full_access_handle; + } + LeaveCriticalSection( &service_cs ); + + /* FIXME: these timeouts should be more generous, but we can't currently delay prefix shutdown */ + timeout = min( timeout, 3000 ); + stop_time = GetTickCount64() + timeout; + + while (!done && GetTickCount64() < stop_time) + { + done = TRUE; + for (i = 0; i < n; i++) + { + res = QueryServiceStatus( wait_handles[i], &st ); + if (!res || st.dwCurrentState == SERVICE_STOPPED) + continue; + + done = FALSE; + Sleep( 100 ); + break; + } + } + + HeapFree( GetProcessHeap(), 0, wait_handles ); +} + /****************************************************************************** * service_run_main_thread */ @@ -583,41 +640,8 @@ static BOOL service_run_main_thread(void) ret = WaitForMultipleObjects( n, wait_handles, FALSE, INFINITE ); if (!ret) /* system process event */ { - SERVICE_STATUS st; - SERVICE_PRESHUTDOWN_INFO spi; - DWORD timeout = 5000; - BOOL res; - - EnterCriticalSection( &service_cs ); - n = 0; - for (i = 0; i < nb_services && n < MAXIMUM_WAIT_OBJECTS; i++) - { - if (!services[i]->thread) continue; - - res = QueryServiceStatus(services[i]->full_access_handle, &st); - ret = ERROR_SUCCESS; - if (res && (st.dwControlsAccepted & SERVICE_ACCEPT_PRESHUTDOWN)) - { - res = QueryServiceConfig2W( services[i]->full_access_handle, SERVICE_CONFIG_PRESHUTDOWN_INFO, - (LPBYTE)&spi, sizeof(spi), &i ); - if (res) - { - FIXME("service should be able to delay shutdown\n"); - timeout += spi.dwPreshutdownTimeout; - ret = service_handle_control( services[i], SERVICE_CONTROL_PRESHUTDOWN, NULL, 0 ); - wait_handles[n++] = services[i]->thread; - } - } - else if (res && (st.dwControlsAccepted & SERVICE_ACCEPT_SHUTDOWN)) - { - ret = service_handle_control( services[i], SERVICE_CONTROL_SHUTDOWN, NULL, 0 ); - wait_handles[n++] = services[i]->thread; - } - } - LeaveCriticalSection( &service_cs ); - - TRACE("last user process exited, shutting down (timeout: %d)\n", timeout); - WaitForMultipleObjects( n, wait_handles, TRUE, timeout ); + handle_shutdown_msg(SERVICE_CONTROL_PRESHUTDOWN, SERVICE_ACCEPT_PRESHUTDOWN); + handle_shutdown_msg(SERVICE_CONTROL_SHUTDOWN, SERVICE_ACCEPT_SHUTDOWN); ExitProcess(0); } else if (ret == 1)

1 0

Piotr Caban : msvcr100: Add _ReentrantPPLLock:: _Scoped_lock class implementation.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 19ef182c81bbc92aba1f73179d77f376af1d8b38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19ef182c81bbc92aba1f7317… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 6 17:03:59 2018 +0100 msvcr100: Add _ReentrantPPLLock::_Scoped_lock class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 8 ++++---- dlls/msvcr100/msvcr100.spec | 8 ++++---- dlls/msvcr110/msvcr110.spec | 12 ++++++------ dlls/msvcr120/msvcr120.spec | 12 ++++++------ dlls/msvcr120_app/msvcr120_app.spec | 12 ++++++------ dlls/msvcrt/lock.c | 35 +++++++++++++++++++++++++++++++++++ 6 files changed, 61 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=19ef182c81bbc92aba1f…

1 0

Józef Kucia : wined3d: Introduce wined3d_bit_scan().
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: e8d2febaad934ba64b63dcb46f7257b6a088ec01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8d2febaad934ba64b63dcb4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 6 11:40:02 2018 +0100 wined3d: Introduce wined3d_bit_scan(). 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/wined3d/wined3d_private.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 05576cd..3347245 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4352,6 +4352,13 @@ static inline BOOL is_rasterization_disabled(const struct wined3d_shader *geomet && geometry_shader->u.gs.so_desc.rasterizer_stream_idx == WINED3D_NO_RASTERIZER_STREAM; } +static inline int wined3d_bit_scan(unsigned int *x) +{ + int bit_offset = ffs(*x) - 1; + *x ^= 1u << bit_offset; + return bit_offset; +} + static inline DWORD wined3d_extract_bits(const DWORD *bitstream, unsigned int offset, unsigned int count) {

1 0

Michael Stefaniuc : urlmon/tests: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 6ec880993b98800b4cd790cde72ae785e6c60241 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ec880993b98800b4cd790cd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 6 01:07:13 2018 +0100 urlmon/tests: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/misc.c | 6 +----- dlls/urlmon/tests/sec_mgr.c | 6 +----- dlls/urlmon/tests/uri.c | 11 +---------- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index dc8b179..73c6374 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -31,6 +31,7 @@ #include "urlmon.h" #include "initguid.h" +#include "wine/heap.h" DEFINE_GUID(CLSID_AboutProtocol, 0x3050F406, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); @@ -88,11 +89,6 @@ static int strcmp_wa(const WCHAR *strw, const char *stra) return lstrcmpW(strw, buf); } -static void heap_free(void *mem) -{ - HeapFree(GetProcessHeap(), 0, mem); -} - static WCHAR *a2w(const char *str) { WCHAR *ret; diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 33e295a..411a3b7 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -35,6 +35,7 @@ #include "urlmon.h" #include "initguid.h" +#include <wine/heap.h> #define URLZONE_CUSTOM URLZONE_USER_MIN+1 #define URLZONE_CUSTOM2 URLZONE_CUSTOM+1 @@ -176,11 +177,6 @@ static int strcmp_w(const WCHAR *str1, const WCHAR *str2) return memcmp(str1, str2, len1*sizeof(WCHAR)); } -static inline void heap_free(void *mem) -{ - HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR a2w(LPCSTR str) { LPWSTR ret = NULL; diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index a0e3f61..796e4d3 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -33,6 +33,7 @@ #include "wininet.h" #include "strsafe.h" #include "initguid.h" +#include <wine/heap.h> DEFINE_GUID(CLSID_CUri, 0xDF2FCE13, 0x25EC, 0x45BB, 0x9D,0x4C, 0xCE,0xCD,0x47,0xC2,0x43,0x0C); @@ -7436,16 +7437,6 @@ static inline LPWSTR a2w(LPCSTR str) { return ret; } -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline DWORD strcmp_aw(LPCSTR strA, LPCWSTR strB) { LPWSTR strAW = a2w(strA); DWORD ret = lstrcmpW(strAW, strB);

1 0

Michael Stefaniuc : urlmon: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 3c1356888a6f16d3cd6e3169f8733386200f2976 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c1356888a6f16d3cd6e3169… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 6 01:07:14 2018 +0100 urlmon: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/urlmon_main.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index ee26bed..a4a1c78 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -32,6 +32,7 @@ #include "wininet.h" #include "wine/unicode.h" +#include "wine/heap.h" #include "wine/list.h" extern HINSTANCE hProxyDll DECLSPEC_HIDDEN; @@ -234,31 +235,11 @@ void release_notif_hwnd(HWND) DECLSPEC_HIDDEN; const char *debugstr_bindstatus(ULONG) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); } -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR heap_strdupW(LPCWSTR str) { LPWSTR ret = NULL;

1 0

Michael Stefaniuc : shdocvw: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 373d32efa67a7f0562f0f6562b81f56a5b9a936c URL: https://source.winehq.org/git/wine.git/?a=commit;h=373d32efa67a7f0562f0f656… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Feb 3 00:17:57 2018 +0100 shdocvw: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shdocvw/shdocvw.h | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index a2736d8..8cac507 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -35,6 +35,7 @@ #include "exdisp.h" #include "wine/unicode.h" +#include "wine/heap.h" #include "wine/list.h" /********************************************************************** @@ -50,17 +51,4 @@ extern LONG SHDOCVW_refCount DECLSPEC_HIDDEN; static inline void SHDOCVW_LockModule(void) { InterlockedIncrement( &SHDOCVW_refCount ); } static inline void SHDOCVW_UnlockModule(void) { InterlockedDecrement( &SHDOCVW_refCount ); } - -/* memory allocation functions */ - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - #endif /* __WINE_SHDOCVW_H */

1 0

Huw Davies : user32: Add a heuristic to find the mouse message's window.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 0d9ce8a02502981fdbb7fd7a772e719b67f03d2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d9ce8a02502981fdbb7fd7a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 6 10:08:25 2018 +0000 user32: Add a heuristic to find the mouse message's window. This can't be done properly without support from the native windowing system. However, it's a good bet to try the next window in the z-order if it's the owner of the original window and it's in the same thread. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 172d659..6b7f918 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2502,7 +2502,16 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H } else { + HWND orig = msg->hwnd; + msg->hwnd = WINPOS_WindowFromPoint( msg->hwnd, msg->pt, &hittest ); + if (!msg->hwnd) /* As a heuristic, try the next window if it's the owner of orig */ + { + HWND next = GetWindow( orig, GW_HWNDNEXT ); + + if (next && GetWindow( orig, GW_OWNER ) == next && WIN_IsCurrentThread( next )) + msg->hwnd = WINPOS_WindowFromPoint( next, msg->pt, &hittest ); + } } if (!msg->hwnd || !WIN_IsCurrentThread( msg->hwnd ))

1 0