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

Dmitry Timoshkov : kernel32: Fix compilation of loader tests with PSDK.
by Alexandre Julliard July 13, 2015

July 13, 2015

Module: wine Branch: master Commit: edc0fa74a3c38b628316a7613e9d54b024e44732 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edc0fa74a3c38b628316a7613… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 13 14:17:26 2015 +0800 kernel32: Fix compilation of loader tests with PSDK. --- dlls/kernel32/tests/loader.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 0f9ac38..abd17df 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -68,6 +68,7 @@ static void (WINAPI *pRtlReleasePebLock)(void); static PVOID (WINAPI *pResolveDelayLoadedAPI)(PVOID, PCIMAGE_DELAYLOAD_DESCRIPTOR, PDELAYLOAD_FAILURE_DLL_CALLBACK, PVOID, PIMAGE_THUNK_DATA ThunkAddress,ULONG); +static PVOID (WINAPI *pRtlImageDirectoryEntryToData)(HMODULE,BOOL,WORD,ULONG *); static PVOID RVAToAddr(DWORD_PTR rva, HMODULE module) { @@ -2703,7 +2704,7 @@ static void test_ResolveDelayLoadedAPI(void) return; } - delaydir = RtlImageDirectoryEntryToData(hlib, TRUE, IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT, &file_size); + delaydir = pRtlImageDirectoryEntryToData(hlib, TRUE, IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT, &file_size); if (!delaydir) { skip("haven't found section for delay import directory.\n"); @@ -2783,6 +2784,7 @@ START_TEST(loader) pLdrUnlockLoaderLock = (void *)GetProcAddress(ntdll, "LdrUnlockLoaderLock"); pRtlAcquirePebLock = (void *)GetProcAddress(ntdll, "RtlAcquirePebLock"); pRtlReleasePebLock = (void *)GetProcAddress(ntdll, "RtlReleasePebLock"); + pRtlImageDirectoryEntryToData = (void *)GetProcAddress(ntdll, "RtlImageDirectoryEntryToData"); pResolveDelayLoadedAPI = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "ResolveDelayLoadedAPI"); GetSystemInfo( &si );

1 0

Matteo Bruni : wined3d: Make the core extensions enabling table-based.
by Alexandre Julliard July 13, 2015

July 13, 2015

Module: wine Branch: master Commit: 6dc3ac2b04b7df6b84a96a9707ecf2081f3231bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dc3ac2b04b7df6b84a96a970… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 10 00:06:17 2015 +0200 wined3d: Make the core extensions enabling table-based. --- dlls/wined3d/directx.c | 54 +++++++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 42072e9..f045bb5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3342,6 +3342,19 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) /* Context activation is done by the caller. */ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) { + static const struct + { + enum wined3d_gl_extension extension; + DWORD min_gl_version; + } + core_extensions[] = + { + {EXT_TEXTURE3D, MAKEDWORD_VERSION(1, 2)}, + {EXT_BLEND_MINMAX, MAKEDWORD_VERSION(1, 4)}, + {EXT_BLEND_SUBTRACT, MAKEDWORD_VERSION(1, 4)}, + {NV_POINT_SPRITE, MAKEDWORD_VERSION(1, 4)}, + {ARB_TEXTURE_NON_POWER_OF_TWO, MAKEDWORD_VERSION(2, 0)}, + }; struct wined3d_driver_info *driver_info = &adapter->driver_info; const char *gl_vendor_str, *gl_renderer_str, *gl_version_str; struct wined3d_gl_info *gl_info = &adapter->gl_info; @@ -3354,7 +3367,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) enum wined3d_pci_device device; DWORD gl_version; HDC hdc; - unsigned int i; + unsigned int i, j; GLint context_profile = 0; TRACE("adapter %p.\n", adapter); @@ -3429,30 +3442,25 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) parse_extension_string(gl_info, WGL_Extensions, wgl_extension_map, sizeof(wgl_extension_map) / sizeof(*wgl_extension_map)); - if (!gl_info->supported[EXT_TEXTURE3D] && gl_version >= MAKEDWORD_VERSION(1, 2)) - { - TRACE("GL CORE: GL_EXT_texture3D support.\n"); - gl_info->supported[EXT_TEXTURE3D] = TRUE; - } - - if (!gl_info->supported[NV_POINT_SPRITE] && gl_version >= MAKEDWORD_VERSION(1, 4)) - { - TRACE("GL CORE: GL_NV_point_sprite support.\n"); - gl_info->supported[NV_POINT_SPRITE] = TRUE; - } - - if ((!gl_info->supported[EXT_BLEND_MINMAX] || !gl_info->supported[EXT_BLEND_SUBTRACT]) - && gl_version >= MAKEDWORD_VERSION(1, 4)) + for (i = 0; i < ARRAY_SIZE(core_extensions); ++i) { - TRACE("GL CORE: GL_EXT_blend_minmax / GL_EXT_blend_subtract support.\n"); - gl_info->supported[EXT_BLEND_MINMAX] = TRUE; - gl_info->supported[EXT_BLEND_SUBTRACT] = TRUE; - } + if (!gl_info->supported[core_extensions[i].extension] + && gl_version >= core_extensions[i].min_gl_version) + { + for (j = 0; j < ARRAY_SIZE(gl_extension_map); ++j) + if (gl_extension_map[j].extension == core_extensions[i].extension) + break; - if (!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] && gl_version >= MAKEDWORD_VERSION(2, 0)) - { - TRACE("GL CORE: GL_ARB_texture_non_power_of_two support.\n"); - gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] = TRUE; + if (j < ARRAY_SIZE(gl_extension_map)) + { + TRACE("GL CORE: %s support.\n", gl_extension_map[j].extension_string); + gl_info->supported[core_extensions[i].extension] = TRUE; + } + else + { + FIXME("GL extension %u not in the GL extensions map.\n", core_extensions[i].extension); + } + } } if (gl_info->supported[EXT_BLEND_MINMAX] || gl_info->supported[EXT_BLEND_SUBTRACT])

1 0

Austin English : loader: Add HKLM\Software\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers registry key.
by Alexandre Julliard July 13, 2015

July 13, 2015

Module: wine Branch: master Commit: 25247c5a34f4c569a5e0ba2aad5803fadf0ef02b URL: http://source.winehq.org/git/wine.git/?a=commit;h=25247c5a34f4c569a5e0ba2aa… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jul 12 20:44:27 2015 -0500 loader: Add HKLM\Software\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers registry key. --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index b647c3b..315ef29 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -490,6 +490,7 @@ HKLM,%CurrentVersionNT%\Hotfix\Q246009,"Installed",,"1" HKLM,%CurrentVersionNT%\Image File Execution Options,,16 HKLM,%CurrentVersionNT%\Language Pack,,16 HKLM,%CurrentVersionNT%\NetworkCards,,16 +HKLM,%CurrentVersionNT%\OpenGLDrivers,,16 HKLM,%CurrentVersionNT%\Perflib,,16 HKLM,%CurrentVersionNT%\Ports,,16 HKLM,%CurrentVersionNT%\Print,,16

1 0

Nikolay Sivov : dwrite: Remove excessive tracing when forwarding to IDWriteTextFormat1.
by Alexandre Julliard July 13, 2015

July 13, 2015

Module: wine Branch: master Commit: fda08897e43b7feee02ef50cf247936c797fa34a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fda08897e43b7feee02ef50cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 12 23:36:36 2015 +0300 dwrite: Remove excessive tracing when forwarding to IDWriteTextFormat1. --- dlls/dwrite/layout.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 5e26b7c..1f7beb4 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2257,35 +2257,30 @@ static DWRITE_TEXT_ALIGNMENT WINAPI dwritetextlayout_GetTextAlignment(IDWriteTex static DWRITE_PARAGRAPH_ALIGNMENT WINAPI dwritetextlayout_GetParagraphAlignment(IDWriteTextLayout2 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)\n", This); return IDWriteTextFormat1_GetParagraphAlignment(&This->IDWriteTextFormat1_iface); } static DWRITE_WORD_WRAPPING WINAPI dwritetextlayout_GetWordWrapping(IDWriteTextLayout2 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)\n", This); return IDWriteTextFormat1_GetWordWrapping(&This->IDWriteTextFormat1_iface); } static DWRITE_READING_DIRECTION WINAPI dwritetextlayout_GetReadingDirection(IDWriteTextLayout2 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)\n", This); return IDWriteTextFormat1_GetReadingDirection(&This->IDWriteTextFormat1_iface); } static DWRITE_FLOW_DIRECTION WINAPI dwritetextlayout_GetFlowDirection(IDWriteTextLayout2 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)\n", This); return IDWriteTextFormat1_GetFlowDirection(&This->IDWriteTextFormat1_iface); } static FLOAT WINAPI dwritetextlayout_GetIncrementalTabStop(IDWriteTextLayout2 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)\n", This); return IDWriteTextFormat1_GetIncrementalTabStop(&This->IDWriteTextFormat1_iface); } @@ -2293,7 +2288,6 @@ static HRESULT WINAPI dwritetextlayout_GetTrimming(IDWriteTextLayout2 *iface, DW IDWriteInlineObject **trimming_sign) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)->(%p %p)\n", This, options, trimming_sign); return IDWriteTextFormat1_GetTrimming(&This->IDWriteTextFormat1_iface, options, trimming_sign); } @@ -2301,70 +2295,60 @@ static HRESULT WINAPI dwritetextlayout_GetLineSpacing(IDWriteTextLayout2 *iface, FLOAT *spacing, FLOAT *baseline) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)->(%p %p %p)\n", This, method, spacing, baseline); return IDWriteTextFormat1_GetLineSpacing(&This->IDWriteTextFormat1_iface, method, spacing, baseline); } static HRESULT WINAPI dwritetextlayout_GetFontCollection(IDWriteTextLayout2 *iface, IDWriteFontCollection **collection) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)->(%p)\n", This, collection); return IDWriteTextFormat1_GetFontCollection(&This->IDWriteTextFormat1_iface, collection); } static UINT32 WINAPI dwritetextlayout_GetFontFamilyNameLength(IDWriteTextLayout2 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)\n", This); return IDWriteTextFormat1_GetFontFamilyNameLength(&This->IDWriteTextFormat1_iface); } static HRESULT WINAPI dwritetextlayout_GetFontFamilyName(IDWriteTextLayout2 *iface, WCHAR *name, UINT32 size) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)->(%p %u)\n", This, name, size); return IDWriteTextFormat1_GetFontFamilyName(&This->IDWriteTextFormat1_iface, name, size); } static DWRITE_FONT_WEIGHT WINAPI dwritetextlayout_GetFontWeight(IDWriteTextLayout2 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)\n", This); return IDWriteTextFormat1_GetFontWeight(&This->IDWriteTextFormat1_iface); } static DWRITE_FONT_STYLE WINAPI dwritetextlayout_GetFontStyle(IDWriteTextLayout2 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)\n", This); return IDWriteTextFormat1_GetFontStyle(&This->IDWriteTextFormat1_iface); } static DWRITE_FONT_STRETCH WINAPI dwritetextlayout_GetFontStretch(IDWriteTextLayout2 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)\n", This); return IDWriteTextFormat1_GetFontStretch(&This->IDWriteTextFormat1_iface); } static FLOAT WINAPI dwritetextlayout_GetFontSize(IDWriteTextLayout2 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)\n", This); return IDWriteTextFormat1_GetFontSize(&This->IDWriteTextFormat1_iface); } static UINT32 WINAPI dwritetextlayout_GetLocaleNameLength(IDWriteTextLayout2 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)\n", This); return IDWriteTextFormat1_GetLocaleNameLength(&This->IDWriteTextFormat1_iface); } static HRESULT WINAPI dwritetextlayout_GetLocaleName(IDWriteTextLayout2 *iface, WCHAR *name, UINT32 size) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)->(%p %u)\n", This, name, size); return IDWriteTextFormat1_GetLocaleName(&This->IDWriteTextFormat1_iface, name, size); } @@ -3385,7 +3369,7 @@ static DWRITE_PARAGRAPH_ALIGNMENT WINAPI dwritetextformat1_layout_GetParagraphAl static DWRITE_WORD_WRAPPING WINAPI dwritetextformat1_layout_GetWordWrapping(IDWriteTextFormat1 *iface) { struct dwrite_textlayout *This = impl_layout_form_IDWriteTextFormat1(iface); - FIXME("(%p): stub\n", This); + TRACE("(%p)\n", This); return This->format.wrapping; }

1 0

Matteo Bruni : wined3d: Add more entries to the core extensions table.
by Alexandre Julliard July 13, 2015

July 13, 2015

Module: wine Branch: master Commit: 3c49a012c032759f015fca0594e8818040e26cf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c49a012c032759f015fca059… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 10 00:06:18 2015 +0200 wined3d: Add more entries to the core extensions table. --- dlls/wined3d/directx.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f045bb5..859da9d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3350,10 +3350,73 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) core_extensions[] = { {EXT_TEXTURE3D, MAKEDWORD_VERSION(1, 2)}, + {ARB_MULTISAMPLE, MAKEDWORD_VERSION(1, 3)}, + {ARB_MULTITEXTURE, MAKEDWORD_VERSION(1, 3)}, + {ARB_TEXTURE_BORDER_CLAMP, MAKEDWORD_VERSION(1, 3)}, + {ARB_TEXTURE_COMPRESSION, MAKEDWORD_VERSION(1, 3)}, + {ARB_TEXTURE_CUBE_MAP, MAKEDWORD_VERSION(1, 3)}, + {ARB_DEPTH_TEXTURE, MAKEDWORD_VERSION(1, 4)}, + {ARB_POINT_PARAMETERS, MAKEDWORD_VERSION(1, 4)}, + {ARB_SHADOW, MAKEDWORD_VERSION(1, 4)}, + {ARB_TEXTURE_MIRRORED_REPEAT, MAKEDWORD_VERSION(1, 4)}, + {EXT_BLEND_COLOR, MAKEDWORD_VERSION(1, 4)}, + {EXT_BLEND_FUNC_SEPARATE, MAKEDWORD_VERSION(1, 4)}, {EXT_BLEND_MINMAX, MAKEDWORD_VERSION(1, 4)}, {EXT_BLEND_SUBTRACT, MAKEDWORD_VERSION(1, 4)}, + {EXT_STENCIL_WRAP, MAKEDWORD_VERSION(1, 4)}, {NV_POINT_SPRITE, MAKEDWORD_VERSION(1, 4)}, + {ARB_OCCLUSION_QUERY, MAKEDWORD_VERSION(1, 5)}, + {ARB_VERTEX_BUFFER_OBJECT, MAKEDWORD_VERSION(1, 5)}, + {ARB_DRAW_BUFFERS, MAKEDWORD_VERSION(2, 0)}, + {ARB_FRAGMENT_SHADER, MAKEDWORD_VERSION(2, 0)}, + {ARB_SHADING_LANGUAGE_100, MAKEDWORD_VERSION(2, 0)}, {ARB_TEXTURE_NON_POWER_OF_TWO, MAKEDWORD_VERSION(2, 0)}, + {ARB_VERTEX_SHADER, MAKEDWORD_VERSION(2, 0)}, + {EXT_BLEND_EQUATION_SEPARATE, MAKEDWORD_VERSION(2, 0)}, + {ARB_PIXEL_BUFFER_OBJECT, MAKEDWORD_VERSION(2, 1)}, + {EXT_TEXTURE_SRGB, MAKEDWORD_VERSION(2, 1)}, + {ARB_COLOR_BUFFER_FLOAT, MAKEDWORD_VERSION(3, 0)}, + {ARB_DEPTH_BUFFER_FLOAT, MAKEDWORD_VERSION(3, 0)}, + {ARB_FRAMEBUFFER_OBJECT, MAKEDWORD_VERSION(3, 0)}, + {ARB_FRAMEBUFFER_SRGB, MAKEDWORD_VERSION(3, 0)}, + {ARB_HALF_FLOAT_PIXEL, MAKEDWORD_VERSION(3, 0)}, + {ARB_HALF_FLOAT_VERTEX, MAKEDWORD_VERSION(3, 0)}, + {ARB_MAP_BUFFER_RANGE, MAKEDWORD_VERSION(3, 0)}, + {ARB_TEXTURE_COMPRESSION_RGTC, MAKEDWORD_VERSION(3, 0)}, + {ARB_TEXTURE_FLOAT, MAKEDWORD_VERSION(3, 0)}, + {ARB_TEXTURE_RG, MAKEDWORD_VERSION(3, 0)}, + {EXT_DRAW_BUFFERS2, MAKEDWORD_VERSION(3, 0)}, + /* We don't want to enable EXT_GPU_SHADER4: even though similar + * functionality is available in core GL 3.0 / GLSL 1.30, it's different + * enough that reusing the same flag for the new features hurts more + * than it helps. */ + /* EXT_framebuffer_object, EXT_framebuffer_blit, + * EXT_framebuffer_multisample and EXT_packed_depth_stencil + * are integrated into ARB_framebuffer_object. */ + + {ARB_DRAW_INSTANCED, MAKEDWORD_VERSION(3, 1)}, + {ARB_UNIFORM_BUFFER_OBJECT, MAKEDWORD_VERSION(3, 1)}, + {EXT_TEXTURE_SNORM, MAKEDWORD_VERSION(3, 1)}, + /* We don't need or want GL_ARB_texture_rectangle (core in 3.1). */ + + {ARB_DRAW_ELEMENTS_BASE_VERTEX, MAKEDWORD_VERSION(3, 2)}, + /* ARB_geometry_shader4 exposes a somewhat different API compared to 3.2 + * core geometry shaders so it's not really correct to expose the + * extension for core-only support. */ + {ARB_PROVOKING_VERTEX, MAKEDWORD_VERSION(3, 2)}, + {ARB_SYNC, MAKEDWORD_VERSION(3, 2)}, + {ARB_VERTEX_ARRAY_BGRA, MAKEDWORD_VERSION(3, 2)}, + + {ARB_BLEND_FUNC_EXTENDED, MAKEDWORD_VERSION(3, 3)}, + {ARB_INSTANCED_ARRAYS, MAKEDWORD_VERSION(3, 3)}, + {ARB_SAMPLER_OBJECTS, MAKEDWORD_VERSION(3, 3)}, + {ARB_SHADER_BIT_ENCODING, MAKEDWORD_VERSION(3, 3)}, + {ARB_TIMER_QUERY, MAKEDWORD_VERSION(3, 3)}, + + {ARB_MAP_BUFFER_ALIGNMENT, MAKEDWORD_VERSION(4, 2)}, + + {ARB_DEBUG_OUTPUT, MAKEDWORD_VERSION(4, 3)}, + {ARB_INTERNALFORMAT_QUERY2, MAKEDWORD_VERSION(4, 3)}, }; struct wined3d_driver_info *driver_info = &adapter->driver_info; const char *gl_vendor_str, *gl_renderer_str, *gl_version_str;

1 0

Aaryaman Vasishta : d3drm: Move AddRef from device2->device3.
by Alexandre Julliard July 13, 2015

July 13, 2015

Module: wine Branch: master Commit: ee6004ce0ce7cc92395a2bdf1607e1e42b1cd4c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee6004ce0ce7cc92395a2bdf1… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sat Jul 11 18:28:42 2015 +0530 d3drm: Move AddRef from device2->device3. --- dlls/d3drm/device.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index c53abfc..f3f68fa 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -93,11 +93,8 @@ static HRESULT WINAPI d3drm_device2_QueryInterface(IDirect3DRMDevice2 *iface, RE static ULONG WINAPI d3drm_device2_AddRef(IDirect3DRMDevice2 *iface) { struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); - ULONG refcount = InterlockedIncrement(&device->ref); - - TRACE("%p increasing refcount to %u.\n", iface, refcount); - return refcount; + return IDirect3DRMDevice3_AddRef(&device->IDirect3DRMDevice3_iface); } static ULONG WINAPI d3drm_device2_Release(IDirect3DRMDevice2 *iface) @@ -452,8 +449,11 @@ static HRESULT WINAPI d3drm_device3_QueryInterface(IDirect3DRMDevice3 *iface, RE static ULONG WINAPI d3drm_device3_AddRef(IDirect3DRMDevice3 *iface) { struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); + ULONG refcount = InterlockedIncrement(&device->ref); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); - return d3drm_device2_AddRef(&device->IDirect3DRMDevice2_iface); + return refcount; } static ULONG WINAPI d3drm_device3_Release(IDirect3DRMDevice3 *iface) @@ -865,7 +865,7 @@ static ULONG WINAPI d3drm_device_win_AddRef(IDirect3DRMWinDevice *iface) { struct d3drm_device *device = impl_from_IDirect3DRMWinDevice(iface); - return d3drm_device2_AddRef(&device->IDirect3DRMDevice2_iface); + return d3drm_device3_AddRef(&device->IDirect3DRMDevice3_iface); } static ULONG WINAPI d3drm_device_win_Release(IDirect3DRMWinDevice *iface)

1 0

Erich E. Hoover : ntoskrnl.exe: Improve IoGetDeviceObjectPointer stub to appease SecuROM 5.x.
by Alexandre Julliard July 13, 2015

July 13, 2015

Module: wine Branch: master Commit: 68f23a1138ed697257c348011d77ec8519b44294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68f23a1138ed697257c348011… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Sun Jun 14 18:58:20 2015 -0600 ntoskrnl.exe: Improve IoGetDeviceObjectPointer stub to appease SecuROM 5.x. --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c2ffdf3..a4a37d9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1009,10 +1009,16 @@ NTSTATUS WINAPI IoGetDeviceInterfaces( const GUID *InterfaceClassGuid, */ NTSTATUS WINAPI IoGetDeviceObjectPointer( UNICODE_STRING *name, ACCESS_MASK access, PFILE_OBJECT *file, PDEVICE_OBJECT *device ) { + static DEVICE_OBJECT stub_device; + static DRIVER_OBJECT stub_driver; + FIXME( "stub: %s %x %p %p\n", debugstr_us(name), access, file, device ); + stub_device.StackSize = 0x80; /* minimum value to appease SecuROM 5.x */ + stub_device.DriverObject = &stub_driver; + *file = NULL; - *device = NULL; + *device = &stub_device; return STATUS_SUCCESS; }

1 0

Nikolay Sivov : dwrite: Fix EndFigure notification in GetGlyphRunOutline() .
by Alexandre Julliard July 13, 2015

July 13, 2015

Module: wine Branch: master Commit: 2b59cf84be0049fe3bf75badc6698495c0519973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b59cf84be0049fe3bf75badc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 12 23:37:05 2015 +0300 dwrite: Fix EndFigure notification in GetGlyphRunOutline(). --- dlls/dwrite/freetype.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index bf6c866..778f9cf 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -297,12 +297,6 @@ static void get_cubic_glyph_outline(const FT_Outline *outline, short point, shor cubic_control[2].y += (cubic_control[3].y + 1) / 3; } -static inline void set_outline_end_tag(short point, short endpoint, UINT8 *tag) -{ - if (point == endpoint) - *tag |= OUTLINE_POINT_END; -} - static short get_outline_data(const FT_Outline *outline, struct glyph_outline *ret) { short contour, point = 0, first_pt, count; @@ -312,6 +306,8 @@ static short get_outline_data(const FT_Outline *outline, struct glyph_outline *r if (ret) { ft_vector_to_d2d_point(&outline->points[point], &ret->points[count]); ret->tags[count] = OUTLINE_POINT_START; + if (count) + ret->tags[count-1] |= OUTLINE_POINT_END; } point++; @@ -323,7 +319,6 @@ static short get_outline_data(const FT_Outline *outline, struct glyph_outline *r if (ret) { ft_vector_to_d2d_point(&outline->points[point], &ret->points[count]); ret->tags[count] |= OUTLINE_POINT_LINE; - set_outline_end_tag(point, outline->contours[contour], &ret->tags[count]); } point++; @@ -341,7 +336,6 @@ static short get_outline_data(const FT_Outline *outline, struct glyph_outline *r ret->tags[count] = OUTLINE_POINT_BEZIER; ret->tags[count+1] = OUTLINE_POINT_BEZIER; ret->tags[count+2] = OUTLINE_POINT_BEZIER; - set_outline_end_tag(point, outline->contours[contour], &ret->tags[count+2]); } count += 3; @@ -361,6 +355,9 @@ static short get_outline_data(const FT_Outline *outline, struct glyph_outline *r } } + if (ret) + ret->tags[count-1] |= OUTLINE_POINT_END; + return count; }

1 0

Nikolay Sivov : dwrite: Implement pixel snapping in Draw().
by Alexandre Julliard July 13, 2015

July 13, 2015

Module: wine Branch: master Commit: 66efbbbae24ce696141be74e64011951a7c7b177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66efbbbae24ce696141be74e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 12 23:22:50 2015 +0300 dwrite: Implement pixel snapping in Draw(). --- dlls/dwrite/layout.c | 65 ++++++++++++++- dlls/dwrite/tests/layout.c | 203 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 256 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=66efbbbae24ce696141be…

1 0

Sebastian Lackner : dwrite: Avoid dereferencing NULL pointer for fonts without VDMX.
by Alexandre Julliard July 13, 2015

July 13, 2015

Module: wine Branch: master Commit: 402caa632b1d022a2aac15e214e3b9e31faece13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=402caa632b1d022a2aac15e21… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jul 12 03:46:20 2015 +0200 dwrite: Avoid dereferencing NULL pointer for fonts without VDMX. --- dlls/dwrite/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 63e1b74..8d90c04 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1347,7 +1347,7 @@ static const struct VDMX_group *find_vdmx_group(const struct VDMX_Header *hdr) BOOL opentype_get_vdmx_size(const void *data, INT emsize, UINT16 *ascent, UINT16 *descent) { const struct VDMX_Header *hdr = (const struct VDMX_Header*)data; - const struct VDMX_group *group = find_vdmx_group(hdr); + const struct VDMX_group *group; const struct VDMX_vTable *tables; WORD recs, i;

1 0