July 2015 - Wine-Commits - list.winehq.org

Andrew Eikum : xaudio2_8: Add DLL and implement XAudio2Create.
by Alexandre Julliard July 31, 2015

July 31, 2015

Module: wine Branch: master Commit: 929ab3e527b25bcfea375e4373230748868d8714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=929ab3e527b25bcfea375e437… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jul 30 10:58:54 2015 -0500 xaudio2_8: Add DLL and implement XAudio2Create. --- configure | 2 ++ configure.ac | 1 + dlls/xaudio2_8/Makefile.in | 5 +++ dlls/xaudio2_8/xaudio2_8.spec | 1 + dlls/xaudio2_8/xaudio_dll.c | 73 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 82 insertions(+) diff --git a/configure b/configure index da4c15a..dff3e10 100755 --- a/configure +++ b/configure @@ -1355,6 +1355,7 @@ enable_xapofx1_3 enable_xapofx1_4 enable_xapofx1_5 enable_xaudio2_7 +enable_xaudio2_8 enable_xinput1_1 enable_xinput1_2 enable_xinput1_3 @@ -17821,6 +17822,7 @@ wine_fn_config_dll xapofx1_3 enable_xapofx1_3 wine_fn_config_dll xapofx1_4 enable_xapofx1_4 wine_fn_config_dll xapofx1_5 enable_xapofx1_5 wine_fn_config_dll xaudio2_7 enable_xaudio2_7 clean +wine_fn_config_dll xaudio2_8 enable_xaudio2_8 wine_fn_config_dll xinput1_1 enable_xinput1_1 wine_fn_config_dll xinput1_2 enable_xinput1_2 wine_fn_config_dll xinput1_3 enable_xinput1_3 implib xinput diff --git a/configure.ac b/configure.ac index 45b8fdb..0489739 100644 --- a/configure.ac +++ b/configure.ac @@ -3424,6 +3424,7 @@ WINE_CONFIG_DLL(xapofx1_3) WINE_CONFIG_DLL(xapofx1_4) WINE_CONFIG_DLL(xapofx1_5) WINE_CONFIG_DLL(xaudio2_7,,[clean]) +WINE_CONFIG_DLL(xaudio2_8) WINE_CONFIG_DLL(xinput1_1) WINE_CONFIG_DLL(xinput1_2) WINE_CONFIG_DLL(xinput1_3,,[implib],[xinput]) diff --git a/dlls/xaudio2_8/Makefile.in b/dlls/xaudio2_8/Makefile.in new file mode 100644 index 0000000..d5fb624 --- /dev/null +++ b/dlls/xaudio2_8/Makefile.in @@ -0,0 +1,5 @@ +MODULE = xaudio2_8.dll +IMPORTS = ole32 + +C_SRCS = \ + xaudio_dll.c diff --git a/dlls/xaudio2_8/xaudio2_8.spec b/dlls/xaudio2_8/xaudio2_8.spec new file mode 100644 index 0000000..dd4fee1 --- /dev/null +++ b/dlls/xaudio2_8/xaudio2_8.spec @@ -0,0 +1 @@ +@ stdcall XAudio2Create(ptr long long) diff --git a/dlls/xaudio2_8/xaudio_dll.c b/dlls/xaudio2_8/xaudio_dll.c new file mode 100644 index 0000000..e5dfb9d --- /dev/null +++ b/dlls/xaudio2_8/xaudio_dll.c @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2015 Andrew Eikum for CodeWeavers + * + * 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> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" + +#include "initguid.h" +#include "xaudio2.h" + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinstDLL ); + break; + } + return TRUE; +} + +HRESULT WINAPI XAudio2Create(IXAudio2 **ppxa2, UINT32 flags, XAUDIO2_PROCESSOR proc) +{ + HRESULT hr; + IXAudio2 *xa2; + IXAudio27 *xa27; + + /* create XAudio2 2.8 instance */ + hr = CoCreateInstance(&CLSID_XAudio2, NULL, CLSCTX_INPROC_SERVER, + &IID_IXAudio2, (void**)&xa2); + if(FAILED(hr)) + return hr; + + hr = IXAudio2_QueryInterface(xa2, &IID_IXAudio27, (void**)&xa27); + if(FAILED(hr)){ + IXAudio2_Release(xa2); + return hr; + } + + hr = IXAudio27_Initialize(xa27, flags, proc); + if(FAILED(hr)){ + IXAudio27_Release(xa27); + IXAudio2_Release(xa2); + return hr; + } + + IXAudio27_Release(xa27); + + *ppxa2 = xa2; + + return S_OK; +}

1 0

Nikolay Sivov : dwrite: Implement DrawGlyphRun().
by Alexandre Julliard July 31, 2015

July 31, 2015

Module: wine Branch: master Commit: 44c301c584935fbe4a1e95e65306f5ec13791552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44c301c584935fbe4a1e95e65… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 31 01:30:50 2015 +0300 dwrite: Implement DrawGlyphRun(). --- dlls/dwrite/gdiinterop.c | 171 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 154 insertions(+), 17 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index aeb61eb..86778df 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -1,6 +1,7 @@ /* * GDI Interop * + * Copyright 2011 Huw Davies * Copyright 2012, 2014 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -36,17 +37,30 @@ struct gdiinterop { IDWriteFactory2 *factory; }; +struct dib_data { + DWORD *ptr; + int stride; + int width; +}; + struct rendertarget { IDWriteBitmapRenderTarget1 IDWriteBitmapRenderTarget1_iface; LONG ref; + IDWriteFactory *factory; DWRITE_TEXT_ANTIALIAS_MODE antialiasmode; - FLOAT pixels_per_dip; + FLOAT ppdip; DWRITE_MATRIX m; SIZE size; HDC hdc; + struct dib_data dib; }; +static inline int get_dib_stride(int width, int bpp) +{ + return ((width * bpp + 31) >> 3) & ~3; +} + static HRESULT create_target_dibsection(struct rendertarget *target, UINT32 width, UINT32 height) { char bmibuf[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; @@ -64,9 +78,17 @@ static HRESULT create_target_dibsection(struct rendertarget *target, UINT32 widt bmi->bmiHeader.biPlanes = 1; bmi->bmiHeader.biCompression = BI_RGB; - hbm = CreateDIBSection(target->hdc, bmi, DIB_RGB_COLORS, NULL, NULL, 0); - if (!hbm) + hbm = CreateDIBSection(target->hdc, bmi, DIB_RGB_COLORS, (void**)&target->dib.ptr, NULL, 0); + if (!hbm) { hbm = CreateBitmap(1, 1, 1, 1, NULL); + target->dib.ptr = NULL; + target->dib.stride = 0; + target->dib.width = 0; + } + else { + target->dib.stride = get_dib_stride(width, 32); + target->dib.width = width; + } DeleteObject(SelectObject(target->hdc, hbm)); return S_OK; @@ -119,6 +141,7 @@ static ULONG WINAPI rendertarget_Release(IDWriteBitmapRenderTarget1 *iface) if (!ref) { + IDWriteFactory_Release(This->factory); DeleteDC(This->hdc); heap_free(This); } @@ -126,15 +149,127 @@ static ULONG WINAPI rendertarget_Release(IDWriteBitmapRenderTarget1 *iface) return ref; } +static inline DWORD *get_pixel_ptr_32(struct dib_data *dib, int x, int y) +{ + return (DWORD *)((BYTE*)dib->ptr + y * dib->stride + x * 4); +} + +static void blit_8(struct dib_data *dib, const BYTE *src, const RECT *rect, DWORD text_pixel) +{ + DWORD *dst_ptr = get_pixel_ptr_32(dib, rect->left, rect->top); + int x, y, src_width = rect->right - rect->left; + + for (y = rect->top; y < rect->bottom; y++) { + for (x = 0; x < src_width; x++) { + if (src[x] < DWRITE_ALPHA_MAX) continue; + dst_ptr[x] = text_pixel; + } + + src += src_width; + dst_ptr += dib->stride / 4; + } +} + +static inline BYTE blend_color(BYTE dst, BYTE src, BYTE alpha) +{ + return (src * alpha + dst * (255 - alpha) + 127) / 255; +} + +static inline DWORD blend_subpixel(BYTE r, BYTE g, BYTE b, DWORD text, const BYTE *alpha) +{ + return blend_color(r, text >> 16, alpha[0]) << 16 | + blend_color(g, text >> 8, alpha[1]) << 8 | + blend_color(b, text, alpha[2]); +} + +static void blit_subpixel_888(struct dib_data *dib, int dib_width, const BYTE *src, + const RECT *rect, DWORD text_pixel) +{ + DWORD *dst_ptr = get_pixel_ptr_32(dib, rect->left, rect->top); + int x, y, src_width = rect->right - rect->left; + + for (y = rect->top; y < rect->bottom; y++) { + for (x = 0; x < src_width; x++) { + if (src[3*x] == 0 && src[3*x+1] == 0 && src[3*x+2] == 0) continue; + dst_ptr[x] = blend_subpixel(dst_ptr[x] >> 16, dst_ptr[x] >> 8, dst_ptr[x], text_pixel, &src[3*x]); + } + dst_ptr += dib->stride / 4; + src += src_width * 3; + } +} + static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *iface, - FLOAT baselineOriginX, FLOAT baselineOriginY, DWRITE_MEASURING_MODE measuring_mode, - DWRITE_GLYPH_RUN const* glyph_run, IDWriteRenderingParams* params, COLORREF textColor, - RECT *blackbox_rect) + FLOAT originX, FLOAT originY, DWRITE_MEASURING_MODE measuring_mode, + DWRITE_GLYPH_RUN const *run, IDWriteRenderingParams *params, COLORREF color, + RECT *bbox_ret) { struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget1(iface); - FIXME("(%p)->(%f %f %d %p %p 0x%08x %p): stub\n", This, baselineOriginX, baselineOriginY, - measuring_mode, glyph_run, params, textColor, blackbox_rect); - return E_NOTIMPL; + IDWriteGlyphRunAnalysis *analysis; + DWRITE_RENDERING_MODE rendermode; + DWRITE_TEXTURE_TYPE texturetype; + RECT target, bounds; + HRESULT hr; + + TRACE("(%p)->(%.2f %.2f %d %p %p 0x%08x %p)\n", This, originX, originY, + measuring_mode, run, params, color, bbox_ret); + + if (!This->dib.ptr) + return S_OK; + + hr = IDWriteFontFace_GetRecommendedRenderingMode(run->fontFace, run->fontEmSize, + This->ppdip, measuring_mode, params, &rendermode); + if (FAILED(hr)) + return hr; + + /* FIXME: outline mode rendering is not supported for this target yet */ + if (rendermode == DWRITE_RENDERING_MODE_OUTLINE) + rendermode = DWRITE_RENDERING_MODE_ALIASED; + + hr = IDWriteFactory_CreateGlyphRunAnalysis(This->factory, + run, This->ppdip, &This->m, rendermode, measuring_mode, + originX, originY, &analysis); + if (FAILED(hr)) { + WARN("failed to create analysis instance, 0x%08x\n", hr); + return hr; + } + + SetRectEmpty(&bounds); + texturetype = DWRITE_TEXTURE_ALIASED_1x1; + hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_ALIASED_1x1, &bounds); + if (FAILED(hr) || IsRectEmpty(&bounds)) { + hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_CLEARTYPE_3x1, &bounds); + texturetype = DWRITE_TEXTURE_CLEARTYPE_3x1; + } + + target.left = target.top = 0; + target.right = This->size.cx; + target.bottom = This->size.cy; + + SetRectEmpty(bbox_ret); + if (IntersectRect(&target, &target, &bounds)) { + UINT32 size = (target.right - target.left) * (target.bottom - target.top); + BYTE *bitmap; + + if (texturetype == DWRITE_TEXTURE_CLEARTYPE_3x1) + size *= 3; + bitmap = heap_alloc_zero(size); + hr = IDWriteGlyphRunAnalysis_CreateAlphaTexture(analysis, texturetype, &target, bitmap, size); + if (hr == S_OK) { + /* blit to target dib */ + if (texturetype == DWRITE_TEXTURE_ALIASED_1x1) + blit_8(&This->dib, bitmap, &target, color); + else + blit_subpixel_888(&This->dib, This->size.cx, bitmap, &target, color); + + *bbox_ret = target; + } + + heap_free(bitmap); + } + + IDWriteGlyphRunAnalysis_Release(analysis); + + return S_OK; } static HDC WINAPI rendertarget_GetMemoryDC(IDWriteBitmapRenderTarget1 *iface) @@ -148,19 +283,19 @@ static FLOAT WINAPI rendertarget_GetPixelsPerDip(IDWriteBitmapRenderTarget1 *ifa { struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget1(iface); TRACE("(%p)\n", This); - return This->pixels_per_dip; + return This->ppdip; } -static HRESULT WINAPI rendertarget_SetPixelsPerDip(IDWriteBitmapRenderTarget1 *iface, FLOAT pixels_per_dip) +static HRESULT WINAPI rendertarget_SetPixelsPerDip(IDWriteBitmapRenderTarget1 *iface, FLOAT ppdip) { struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget1(iface); - TRACE("(%p)->(%.2f)\n", This, pixels_per_dip); + TRACE("(%p)->(%.2f)\n", This, ppdip); - if (pixels_per_dip <= 0.0) + if (ppdip <= 0.0) return E_INVALIDARG; - This->pixels_per_dip = pixels_per_dip; + This->ppdip = ppdip; return S_OK; } @@ -241,7 +376,7 @@ static const IDWriteBitmapRenderTarget1Vtbl rendertargetvtbl = { rendertarget_SetTextAntialiasMode }; -static HRESULT create_rendertarget(HDC hdc, UINT32 width, UINT32 height, IDWriteBitmapRenderTarget **ret) +static HRESULT create_rendertarget(IDWriteFactory *factory, HDC hdc, UINT32 width, UINT32 height, IDWriteBitmapRenderTarget **ret) { struct rendertarget *target; HRESULT hr; @@ -262,8 +397,10 @@ static HRESULT create_rendertarget(HDC hdc, UINT32 width, UINT32 height, IDWrite } target->m = identity; - target->pixels_per_dip = 1.0; + target->ppdip = 1.0; target->antialiasmode = DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE; + target->factory = factory; + IDWriteFactory_AddRef(factory); *ret = (IDWriteBitmapRenderTarget*)&target->IDWriteBitmapRenderTarget1_iface; @@ -501,7 +638,7 @@ static HRESULT WINAPI gdiinterop_CreateBitmapRenderTarget(IDWriteGdiInterop *ifa { struct gdiinterop *This = impl_from_IDWriteGdiInterop(iface); TRACE("(%p)->(%p %u %u %p)\n", This, hdc, width, height, target); - return create_rendertarget(hdc, width, height, target); + return create_rendertarget((IDWriteFactory*)This->factory, hdc, width, height, target); } static const struct IDWriteGdiInteropVtbl gdiinteropvtbl = {

1 0

Nikolay Sivov : dwrite: Implement CreateAlphaTexture().
by Alexandre Julliard July 31, 2015

July 31, 2015

Module: wine Branch: master Commit: e08b77b0a92aa1f0d28e9a27ade000e4904d189d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e08b77b0a92aa1f0d28e9a27a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 31 01:30:08 2015 +0300 dwrite: Implement CreateAlphaTexture(). --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 130 ++++++++++++++++++++++++++++++++++++++++--- dlls/dwrite/freetype.c | 65 +++++++++++++++++++++- include/dwrite.idl | 2 + 4 files changed, 189 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e08b77b0a92aa1f0d28e9…

1 0

Piotr Caban : ole32/tests: Fix new failures in CoWaitForMultipleHandles tests.
by Alexandre Julliard July 31, 2015

July 31, 2015

Module: wine Branch: master Commit: 9fd75e865073e304573877e6a312fdff6d6f7476 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fd75e865073e304573877e6a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 31 00:39:00 2015 +0200 ole32/tests: Fix new failures in CoWaitForMultipleHandles tests. --- dlls/ole32/tests/compobj.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 1dc3af0..ecd8fb0 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2145,16 +2145,16 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) index = 0xdeadbeef; PostMessageA(hWnd, WM_DDE_FIRST, 0, 0); hr = CoWaitForMultipleHandles(0, 50, 2, handles, &index); - ok(hr == RPC_S_CALLPENDING, "expected S_OK, got 0x%08x\n", hr); - ok(index == 0, "expected index 0, got %u\n", index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + ok(index==0 || index==0xdeadbeef/* Win 8 */, "expected index 0, got %u\n", index); success = PeekMessageA(&msg, hWnd, WM_DDE_FIRST, WM_DDE_FIRST, PM_REMOVE); ok(!success, "CoWaitForMultipleHandles didn't pump any messages\n"); index = 0xdeadbeef; PostMessageA(hWnd, WM_USER, 0, 0); hr = CoWaitForMultipleHandles(0, 50, 2, handles, &index); - ok(hr == RPC_S_CALLPENDING, "expected S_OK, got 0x%08x\n", hr); - ok(index == 0, "expected index 0, got %u\n", index); + ok(hr == RPC_S_CALLPENDING, "expected RPC_S_CALLPENDING, got 0x%08x\n", hr); + ok(index==0 || index==0xdeadbeef/* Win 8 */, "expected index 0, got %u\n", index); success = PeekMessageA(&msg, hWnd, WM_USER, WM_USER, PM_REMOVE); ok(success, "CoWaitForMultipleHandles unexpectedly pumped messages\n");

1 0

Sebastian Lackner : ntdll: Improve stub for NtQueryInformationJobObject.
by Alexandre Julliard July 31, 2015

July 31, 2015

Module: wine Branch: master Commit: 10509889973a5182e68c7f746b88ccc1efa2e956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10509889973a5182e68c7f746… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jul 31 07:48:47 2015 +0200 ntdll: Improve stub for NtQueryInformationJobObject. --- dlls/ntdll/sync.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 04c6de30..b0329ab 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -636,7 +636,39 @@ NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS c ULONG len, PULONG ret_len ) { FIXME( "stub: %p %u %p %u %p\n", handle, class, info, len, ret_len ); - return STATUS_NOT_IMPLEMENTED; + + if (class >= MaxJobObjectInfoClass) + return STATUS_INVALID_PARAMETER; + + switch (class) + { + case JobObjectExtendedLimitInformation: + { + JOBOBJECT_EXTENDED_LIMIT_INFORMATION *extended_limit; + if (len < sizeof(*extended_limit)) + return STATUS_INFO_LENGTH_MISMATCH; + + extended_limit = (JOBOBJECT_EXTENDED_LIMIT_INFORMATION *)info; + memset(extended_limit, 0, sizeof(*extended_limit)); + if (ret_len) *ret_len = sizeof(*extended_limit); + return STATUS_SUCCESS; + } + + case JobObjectBasicLimitInformation: + { + JOBOBJECT_BASIC_LIMIT_INFORMATION *basic_limit; + if (len < sizeof(*basic_limit)) + return STATUS_INFO_LENGTH_MISMATCH; + + basic_limit = (JOBOBJECT_BASIC_LIMIT_INFORMATION *)info; + memset(basic_limit, 0, sizeof(*basic_limit)); + if (ret_len) *ret_len = sizeof(*basic_limit); + return STATUS_SUCCESS; + } + + default: + return STATUS_NOT_IMPLEMENTED; + } } /******************************************************************************

1 0

Sebastian Lackner : kernel32/tests: Add tests for JobObjectLimitInformation info classes.
by Alexandre Julliard July 31, 2015

July 31, 2015

Module: wine Branch: master Commit: 1d2331344fbfce2bf9f66a08a609895f10fca094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d2331344fbfce2bf9f66a08a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jul 31 07:49:04 2015 +0200 kernel32/tests: Add tests for JobObjectLimitInformation info classes. --- dlls/kernel32/tests/process.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 9f62e13..113ec35 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2304,6 +2304,8 @@ static void test_QueryInformationJobObject(void) { char buf[FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[5])]; PJOBOBJECT_BASIC_PROCESS_ID_LIST pid_list = (JOBOBJECT_BASIC_PROCESS_ID_LIST *)buf; + JOBOBJECT_EXTENDED_LIMIT_INFORMATION ext_limit_info; + JOBOBJECT_BASIC_LIMIT_INFORMATION *basic_limit_info = &ext_limit_info.BasicLimitInformation; DWORD dwret, ret_len; PROCESS_INFORMATION pi[2]; HANDLE job; @@ -2374,6 +2376,34 @@ static void test_QueryInformationJobObject(void) } } + /* test JobObjectBasicLimitInformation */ + ret = pQueryInformationJobObject(job, JobObjectBasicLimitInformation, basic_limit_info, + sizeof(*basic_limit_info) - 1, &ret_len); + ok(!ret, "QueryInformationJobObject expected failure\n"); + expect_eq_d(ERROR_BAD_LENGTH, GetLastError()); + + ret_len = 0xdeadbeef; + memset(basic_limit_info, 0x11, sizeof(*basic_limit_info)); + ret = pQueryInformationJobObject(job, JobObjectBasicLimitInformation, basic_limit_info, + sizeof(*basic_limit_info), &ret_len); + ok(ret, "QueryInformationJobObject error %u\n", GetLastError()); + ok(ret_len == sizeof(*basic_limit_info), "QueryInformationJobObject returned ret_len=%u\n", ret_len); + expect_eq_d(0, basic_limit_info->LimitFlags); + + /* test JobObjectExtendedLimitInformation */ + ret = pQueryInformationJobObject(job, JobObjectExtendedLimitInformation, &ext_limit_info, + sizeof(ext_limit_info) - 1, &ret_len); + ok(!ret, "QueryInformationJobObject expected failure\n"); + expect_eq_d(ERROR_BAD_LENGTH, GetLastError()); + + ret_len = 0xdeadbeef; + memset(&ext_limit_info, 0x11, sizeof(ext_limit_info)); + ret = pQueryInformationJobObject(job, JobObjectExtendedLimitInformation, &ext_limit_info, + sizeof(ext_limit_info), &ret_len); + ok(ret, "QueryInformationJobObject error %u\n", GetLastError()); + ok(ret_len == sizeof(ext_limit_info), "QueryInformationJobObject returned ret_len=%u\n", ret_len); + expect_eq_d(0, basic_limit_info->LimitFlags); + TerminateProcess(pi[0].hProcess, 0); CloseHandle(pi[0].hProcess); CloseHandle(pi[0].hThread);

1 0

Henri Verbeet : d2d1: Implement d2d_state_block_GetFactory().
by Alexandre Julliard July 31, 2015

July 31, 2015

Module: wine Branch: master Commit: c1fc008493b8eb85eb921b3dbd154b1753acdc47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1fc008493b8eb85eb921b3db… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 31 09:46:30 2015 +0200 d2d1: Implement d2d_state_block_GetFactory(). --- dlls/d2d1/d2d1_private.h | 5 +++-- dlls/d2d1/factory.c | 2 +- dlls/d2d1/state_block.c | 12 ++++++++---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index cf98ff8..3c49c7b 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -200,12 +200,13 @@ struct d2d_state_block ID2D1DrawingStateBlock ID2D1DrawingStateBlock_iface; LONG refcount; + ID2D1Factory *factory; D2D1_DRAWING_STATE_DESCRIPTION drawing_state; IDWriteRenderingParams *text_rendering_params; }; -void d2d_state_block_init(struct d2d_state_block *state_block, const D2D1_DRAWING_STATE_DESCRIPTION *desc, - IDWriteRenderingParams *text_rendering_params) DECLSPEC_HIDDEN; +void d2d_state_block_init(struct d2d_state_block *state_block, ID2D1Factory *factory, + const D2D1_DRAWING_STATE_DESCRIPTION *desc, IDWriteRenderingParams *text_rendering_params) DECLSPEC_HIDDEN; struct d2d_state_block *unsafe_impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStateBlock *iface) DECLSPEC_HIDDEN; enum d2d_geometry_state diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index b2d5dd0..ae40b1f 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -199,7 +199,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factor if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - d2d_state_block_init(object, desc, text_rendering_params); + d2d_state_block_init(object, iface, desc, text_rendering_params); TRACE("Created state block %p.\n", object); *state_block = &object->ID2D1DrawingStateBlock_iface; diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c index 83fd162..90195fe 100644 --- a/dlls/d2d1/state_block.c +++ b/dlls/d2d1/state_block.c @@ -68,6 +68,7 @@ static ULONG STDMETHODCALLTYPE d2d_state_block_Release(ID2D1DrawingStateBlock *i { if (state_block->text_rendering_params) IDWriteRenderingParams_Release(state_block->text_rendering_params); + ID2D1Factory_Release(state_block->factory); HeapFree(GetProcessHeap(), 0, state_block); } @@ -76,9 +77,11 @@ static ULONG STDMETHODCALLTYPE d2d_state_block_Release(ID2D1DrawingStateBlock *i static void STDMETHODCALLTYPE d2d_state_block_GetFactory(ID2D1DrawingStateBlock *iface, ID2D1Factory **factory) { - FIXME("iface %p, factory %p stub!\n", iface, factory); + struct d2d_state_block *state_block = impl_from_ID2D1DrawingStateBlock(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); - *factory = NULL; + ID2D1Factory_AddRef(*factory = state_block->factory); } static void STDMETHODCALLTYPE d2d_state_block_GetDescription(ID2D1DrawingStateBlock *iface, @@ -138,8 +141,8 @@ static const struct ID2D1DrawingStateBlockVtbl d2d_state_block_vtbl = d2d_state_block_GetTextRenderingParams, }; -void d2d_state_block_init(struct d2d_state_block *state_block, const D2D1_DRAWING_STATE_DESCRIPTION *desc, - IDWriteRenderingParams *text_rendering_params) +void d2d_state_block_init(struct d2d_state_block *state_block, ID2D1Factory *factory, + const D2D1_DRAWING_STATE_DESCRIPTION *desc, IDWriteRenderingParams *text_rendering_params) { static const D2D1_MATRIX_3X2_F identity = { @@ -150,6 +153,7 @@ void d2d_state_block_init(struct d2d_state_block *state_block, const D2D1_DRAWIN state_block->ID2D1DrawingStateBlock_iface.lpVtbl = &d2d_state_block_vtbl; state_block->refcount = 1; + ID2D1Factory_AddRef(state_block->factory = factory); if (desc) state_block->drawing_state = *desc; else

1 0

Henri Verbeet : d2d1: Implement d2d_mesh_GetFactory().
by Alexandre Julliard July 31, 2015

July 31, 2015

Module: wine Branch: master Commit: 9745efaf6ddefe821d63563998375c0fd990ab23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9745efaf6ddefe821d6356399… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 31 09:46:31 2015 +0200 d2d1: Implement d2d_mesh_GetFactory(). --- dlls/d2d1/d2d1_private.h | 4 +++- dlls/d2d1/mesh.c | 12 +++++++++--- dlls/d2d1/render_target.c | 3 ++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 3c49c7b..47ba63c 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -175,9 +175,11 @@ struct d2d_mesh { ID2D1Mesh ID2D1Mesh_iface; LONG refcount; + + ID2D1Factory *factory; }; -void d2d_mesh_init(struct d2d_mesh *mesh) DECLSPEC_HIDDEN; +void d2d_mesh_init(struct d2d_mesh *mesh, ID2D1Factory *factory) DECLSPEC_HIDDEN; struct d2d_bitmap { diff --git a/dlls/d2d1/mesh.c b/dlls/d2d1/mesh.c index b566382..28d34da 100644 --- a/dlls/d2d1/mesh.c +++ b/dlls/d2d1/mesh.c @@ -65,16 +65,21 @@ static ULONG STDMETHODCALLTYPE d2d_mesh_Release(ID2D1Mesh *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + ID2D1Factory_Release(mesh->factory); HeapFree(GetProcessHeap(), 0, mesh); + } return refcount; } static void STDMETHODCALLTYPE d2d_mesh_GetFactory(ID2D1Mesh *iface, ID2D1Factory **factory) { - FIXME("iface %p, factory %p stub!\n", iface, factory); + struct d2d_mesh *mesh = impl_from_ID2D1Mesh(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); - *factory = NULL; + ID2D1Factory_AddRef(*factory = mesh->factory); } static HRESULT STDMETHODCALLTYPE d2d_mesh_Open(ID2D1Mesh *iface, ID2D1TessellationSink **sink) @@ -93,8 +98,9 @@ static const struct ID2D1MeshVtbl d2d_mesh_vtbl = d2d_mesh_Open, }; -void d2d_mesh_init(struct d2d_mesh *mesh) +void d2d_mesh_init(struct d2d_mesh *mesh, ID2D1Factory *factory) { mesh->ID2D1Mesh_iface.lpVtbl = &d2d_mesh_vtbl; mesh->refcount = 1; + ID2D1Factory_AddRef(mesh->factory = factory); } diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index a25b8ea..438fced 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -533,6 +533,7 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateLayer(ID2D1RenderTa static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateMesh(ID2D1RenderTarget *iface, ID2D1Mesh **mesh) { + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); struct d2d_mesh *object; TRACE("iface %p, mesh %p.\n", iface, mesh); @@ -540,7 +541,7 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateMesh(ID2D1RenderTar if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - d2d_mesh_init(object); + d2d_mesh_init(object, render_target->factory); TRACE("Created mesh %p.\n", object); *mesh = &object->ID2D1Mesh_iface;

1 0

Jacek Caban : widl: Properly handle namespaces in write_uuid_decl.
by Alexandre Julliard July 31, 2015

July 31, 2015

Module: wine Branch: master Commit: cccbb4ebe892be266bc428dc203522f4cee2bd50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cccbb4ebe892be266bc428dc2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 31 13:38:32 2015 +0200 widl: Properly handle namespaces in write_uuid_decl. --- tools/widl/header.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index d44f98d..76f7ed0 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -129,8 +129,9 @@ static void write_guid(FILE *f, const char *guid_prefix, const char *name, const uuid->Data4[6], uuid->Data4[7]); } -static void write_uuid_decl(FILE *f, const char *name, const UUID *uuid) +static void write_uuid_decl(FILE *f, type_t *type, const UUID *uuid) { + char *name = format_namespace(type->namespace, "", "::", type->name); fprintf(f, "#ifdef __CRT_UUID_DECL\n"); fprintf(f, "__CRT_UUID_DECL(%s, 0x%08x, 0x%04x, 0x%04x, 0x%02x,0x%02x, 0x%02x," "0x%02x,0x%02x,0x%02x,0x%02x,0x%02x)\n", @@ -138,6 +139,7 @@ static void write_uuid_decl(FILE *f, const char *name, const UUID *uuid) uuid->Data4[2], uuid->Data4[3], uuid->Data4[4], uuid->Data4[5], uuid->Data4[6], uuid->Data4[7]); fprintf(f, "#endif\n"); + free(name); } static const char *uuid_string(const UUID *uuid) @@ -1314,7 +1316,7 @@ static void write_com_interface_end(FILE *header, type_t *iface) write_line(header, 0, "extern \"C\" {"); } if (uuid) - write_uuid_decl(header, iface->name, uuid); + write_uuid_decl(header, iface, uuid); fprintf(header, "#else\n"); /* C interface */ write_line(header, 1, "typedef struct %sVtbl {", iface->c_name); @@ -1400,7 +1402,7 @@ static void write_coclass(FILE *header, type_t *cocl) if (uuid) { fprintf(header, "class DECLSPEC_UUID(\"%s\") %s;\n", uuid_string(uuid), cocl->name); - write_uuid_decl(header, cocl->name, uuid); + write_uuid_decl(header, cocl, uuid); } else {

1 0

Jacek Caban : widl: Use proper names for namespaced interfaces in C declaration.
by Alexandre Julliard July 31, 2015

July 31, 2015

Module: wine Branch: master Commit: 83e197df0f079e3419e38eca1b1c801203be8b60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83e197df0f079e3419e38eca1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 31 13:38:18 2015 +0200 widl: Use proper names for namespaced interfaces in C declaration. --- tools/widl/header.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index ec32512..d44f98d 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1106,12 +1106,12 @@ static void do_write_c_method_def(FILE *header, const type_t *iface, const char static void write_c_method_def(FILE *header, const type_t *iface) { - do_write_c_method_def(header, iface, iface->name); + do_write_c_method_def(header, iface, iface->c_name); } static void write_c_disp_method_def(FILE *header, const type_t *iface) { - do_write_c_method_def(header, type_iface_get_inherit(iface), iface->name); + do_write_c_method_def(header, type_iface_get_inherit(iface), iface->c_name); } static void write_method_proto(FILE *header, const type_t *iface) @@ -1264,8 +1264,8 @@ static void write_com_interface_start(FILE *header, const type_t *iface) fprintf(header, "/*****************************************************************************\n"); fprintf(header, " * %s %sinterface\n", iface->name, dispinterface ? "disp" : ""); fprintf(header, " */\n"); - fprintf(header,"#ifndef __%s_%sINTERFACE_DEFINED__\n", iface->name, dispinterface ? "DISP" : ""); - fprintf(header,"#define __%s_%sINTERFACE_DEFINED__\n\n", iface->name, dispinterface ? "DISP" : ""); + fprintf(header,"#ifndef __%s_%sINTERFACE_DEFINED__\n", iface->c_name, dispinterface ? "DISP" : ""); + fprintf(header,"#define __%s_%sINTERFACE_DEFINED__\n\n", iface->c_name, dispinterface ? "DISP" : ""); } static void write_com_interface_end(FILE *header, type_t *iface) @@ -1275,7 +1275,7 @@ static void write_com_interface_end(FILE *header, type_t *iface) type_t *type; if (uuid) - write_guid(header, dispinterface ? "DIID" : "IID", iface->name, uuid); + write_guid(header, dispinterface ? "DIID" : "IID", iface->c_name, uuid); /* C++ interface */ fprintf(header, "#if defined(__cplusplus) && !defined(CINTERFACE)\n"); @@ -1317,29 +1317,25 @@ static void write_com_interface_end(FILE *header, type_t *iface) write_uuid_decl(header, iface->name, uuid); fprintf(header, "#else\n"); /* C interface */ - fprintf(header, "typedef struct %sVtbl {\n", iface->name); - indentation++; - fprintf(header, " BEGIN_INTERFACE\n"); - fprintf(header, "\n"); + write_line(header, 1, "typedef struct %sVtbl {", iface->c_name); + write_line(header, 0, "BEGIN_INTERFACE\n"); if (dispinterface) write_c_disp_method_def(header, iface); else write_c_method_def(header, iface); - indentation--; - fprintf(header, " END_INTERFACE\n"); - fprintf(header, "} %sVtbl;\n", iface->name); - fprintf(header, "interface %s {\n", iface->name); - fprintf(header, " CONST_VTBL %sVtbl* lpVtbl;\n", iface->name); - fprintf(header, "};\n"); - fprintf(header, "\n"); + write_line(header, 0, "END_INTERFACE"); + write_line(header, -1, "} %sVtbl;\n", iface->c_name); + fprintf(header, "interface %s {\n", iface->c_name); + fprintf(header, " CONST_VTBL %sVtbl* lpVtbl;\n", iface->c_name); + fprintf(header, "};\n\n"); fprintf(header, "#ifdef COBJMACROS\n"); /* dispinterfaces don't have real functions, so don't write macros for them, * only for the interface this interface inherits from, i.e. IDispatch */ fprintf(header, "#ifndef WIDL_C_INLINE_WRAPPERS\n"); type = dispinterface ? type_iface_get_inherit(iface) : iface; - write_method_macro(header, type, type, iface->name); + write_method_macro(header, type, type, iface->c_name); fprintf(header, "#else\n"); - write_inline_wrappers(header, type, type, iface->name); + write_inline_wrappers(header, type, type, iface->c_name); fprintf(header, "#endif\n"); fprintf(header, "#endif\n"); fprintf(header, "\n"); @@ -1347,13 +1343,13 @@ static void write_com_interface_end(FILE *header, type_t *iface) fprintf(header, "\n"); /* dispinterfaces don't have real functions, so don't write prototypes for * them */ - if (!dispinterface) + if (!dispinterface && !winrt_mode) { write_method_proto(header, iface); write_locals(header, iface, FALSE); fprintf(header, "\n"); } - fprintf(header,"#endif /* __%s_%sINTERFACE_DEFINED__ */\n\n", iface->name, dispinterface ? "DISP" : ""); + fprintf(header,"#endif /* __%s_%sINTERFACE_DEFINED__ */\n\n", iface->c_name, dispinterface ? "DISP" : ""); } static void write_rpc_interface_start(FILE *header, const type_t *iface)

1 0