April 2016 - Wine-Commits - list.winehq.org

Sebastian Lackner : services: Change scmdatabase_remove_service to a void function.
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: 72ae095d75d11c6402c384eae2c434d0247f4d2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=72ae095d75d11c6402c384eae… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Apr 20 10:14:34 2016 +0200 services: Change scmdatabase_remove_service to a void function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 234c0ac..ab80812 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -282,18 +282,11 @@ DWORD scmdatabase_add_service(struct scmdatabase *db, struct service_entry *serv return ERROR_SUCCESS; } -static DWORD scmdatabase_remove_service(struct scmdatabase *db, struct service_entry *service) +static void scmdatabase_remove_service(struct scmdatabase *db, struct service_entry *service) { - int err; - - err = RegDeleteTreeW(db->root_key, service->name); - - if (err != 0) - return err; - + RegDeleteTreeW(db->root_key, service->name); list_remove(&service->entry); service->entry.next = service->entry.prev = NULL; - return ERROR_SUCCESS; } static void scmdatabase_autostart_services(struct scmdatabase *db)

1 0

Józef Kucia : wined3d: Add support for rendering to 2D array textures.
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: 879d4bffeb1c978d03a9925a85d5ec06f525e6c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=879d4bffeb1c978d03a9925a8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 20 11:42:17 2016 +0200 wined3d: Add support for rendering to 2D array 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/context.c | 84 +++++++++++++++++++++++++----------------- dlls/wined3d/directx.c | 6 +++ dlls/wined3d/wined3d_private.h | 5 ++- 3 files changed, 60 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 50456b4..07ddf1c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -118,6 +118,36 @@ static void context_attach_depth_stencil_rb(const struct wined3d_gl_info *gl_inf } } +static void context_attach_gl_texture_fbo(struct wined3d_context *context, + GLenum fbo_target, GLenum attachment, const struct wined3d_fbo_resource *resource) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + + if (!resource) + { + gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, attachment, GL_TEXTURE_2D, 0, 0); + checkGLcall("glFramebufferTexture2D()"); + } + else if (resource->target == GL_TEXTURE_2D_ARRAY) + { + if (!gl_info->fbo_ops.glFramebufferTextureLayer) + { + FIXME("OpenGL implementation doesn't support glFramebufferTextureLayer().\n"); + return; + } + + gl_info->fbo_ops.glFramebufferTextureLayer(fbo_target, attachment, + resource->object, resource->level, resource->layer); + checkGLcall("glFramebufferTextureLayer()"); + } + else + { + gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, attachment, + resource->target, resource->object, resource->level); + checkGLcall("glFramebufferTexture2D()"); + } +} + /* Context activation is done by the caller. */ static void context_attach_depth_stencil_fbo(struct wined3d_context *context, GLenum fbo_target, const struct wined3d_fbo_resource *resource, BOOL rb_namespace, @@ -137,41 +167,24 @@ static void context_attach_depth_stencil_fbo(struct wined3d_context *context, else { if (flags & WINED3D_FBO_ENTRY_FLAG_DEPTH) - { - gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_DEPTH_ATTACHMENT, - resource->target, resource->object, resource->level); - checkGLcall("glFramebufferTexture2D()"); - } + context_attach_gl_texture_fbo(context, fbo_target, GL_DEPTH_ATTACHMENT, resource); if (flags & WINED3D_FBO_ENTRY_FLAG_STENCIL) - { - gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_STENCIL_ATTACHMENT, - resource->target, resource->object, resource->level); - checkGLcall("glFramebufferTexture2D()"); - } + context_attach_gl_texture_fbo(context, fbo_target, GL_STENCIL_ATTACHMENT, resource); } if (!(flags & WINED3D_FBO_ENTRY_FLAG_DEPTH)) - { - gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, 0, 0); - checkGLcall("glFramebufferTexture2D()"); - } + context_attach_gl_texture_fbo(context, fbo_target, GL_DEPTH_ATTACHMENT, NULL); if (!(flags & WINED3D_FBO_ENTRY_FLAG_STENCIL)) - { - gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_STENCIL_ATTACHMENT, GL_TEXTURE_2D, 0, 0); - checkGLcall("glFramebufferTexture2D()"); - } + context_attach_gl_texture_fbo(context, fbo_target, GL_STENCIL_ATTACHMENT, NULL); } else { TRACE("Attach depth stencil 0.\n"); - gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, 0, 0); - checkGLcall("glFramebufferTexture2D()"); - - gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_STENCIL_ATTACHMENT, GL_TEXTURE_2D, 0, 0); - checkGLcall("glFramebufferTexture2D()"); + context_attach_gl_texture_fbo(context, fbo_target, GL_DEPTH_ATTACHMENT, NULL); + context_attach_gl_texture_fbo(context, fbo_target, GL_STENCIL_ATTACHMENT, NULL); } } @@ -194,15 +207,12 @@ static void context_attach_surface_fbo(struct wined3d_context *context, } else { - gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_COLOR_ATTACHMENT0 + idx, - resource->target, resource->object, resource->level); - checkGLcall("glFramebufferTexture2D()"); + context_attach_gl_texture_fbo(context, fbo_target, GL_COLOR_ATTACHMENT0 + idx, resource); } } else { - gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_COLOR_ATTACHMENT0 + idx, GL_TEXTURE_2D, 0, 0); - checkGLcall("glFramebufferTexture2D()"); + context_attach_gl_texture_fbo(context, fbo_target, GL_COLOR_ATTACHMENT0 + idx, NULL); } } @@ -353,12 +363,14 @@ static inline void context_set_fbo_key_for_surface(const struct wined3d_context if (!surface) { key->objects[idx].object = 0; - key->objects[idx].level = key->objects[idx].target = 0; + key->objects[idx].target = 0; + key->objects[idx].level = key->objects[idx].layer = 0; } else if (surface->current_renderbuffer) { key->objects[idx].object = surface->current_renderbuffer->id; - key->objects[idx].level = key->objects[idx].target = 0; + key->objects[idx].target = 0; + key->objects[idx].level = key->objects[idx].layer = 0; key->rb_namespace |= 1 << idx; } else @@ -367,25 +379,29 @@ static inline void context_set_fbo_key_for_surface(const struct wined3d_context { case WINED3D_LOCATION_TEXTURE_RGB: key->objects[idx].object = surface_get_texture_name(surface, context, FALSE); - key->objects[idx].level = surface->texture_level; key->objects[idx].target = surface->texture_target; + key->objects[idx].level = surface->texture_level; + key->objects[idx].layer = surface->texture_layer; break; case WINED3D_LOCATION_TEXTURE_SRGB: key->objects[idx].object = surface_get_texture_name(surface, context, TRUE); - key->objects[idx].level = surface->texture_level; key->objects[idx].target = surface->texture_target; + key->objects[idx].level = surface->texture_level; + key->objects[idx].layer = surface->texture_layer; break; case WINED3D_LOCATION_RB_MULTISAMPLE: key->objects[idx].object = surface->container->rb_multisample; - key->objects[idx].level = key->objects[idx].target = 0; + key->objects[idx].target = 0; + key->objects[idx].level = key->objects[idx].layer = 0; key->rb_namespace |= 1 << idx; break; case WINED3D_LOCATION_RB_RESOLVED: key->objects[idx].object = surface->container->rb_resolved; - key->objects[idx].level = key->objects[idx].target = 0; + key->objects[idx].target = 0; + key->objects[idx].level = key->objects[idx].layer = 0; key->rb_namespace |= 1 << idx; break; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c6167b6..3f80225 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3835,6 +3835,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD gl_info->fbo_ops.glFramebufferTexture1D = gl_info->gl_ops.ext.p_glFramebufferTexture1D; gl_info->fbo_ops.glFramebufferTexture2D = gl_info->gl_ops.ext.p_glFramebufferTexture2D; gl_info->fbo_ops.glFramebufferTexture3D = gl_info->gl_ops.ext.p_glFramebufferTexture3D; + gl_info->fbo_ops.glFramebufferTextureLayer = gl_info->gl_ops.ext.p_glFramebufferTextureLayer; gl_info->fbo_ops.glFramebufferRenderbuffer = gl_info->gl_ops.ext.p_glFramebufferRenderbuffer; gl_info->fbo_ops.glGetFramebufferAttachmentParameteriv = gl_info->gl_ops.ext.p_glGetFramebufferAttachmentParameteriv; @@ -3869,6 +3870,11 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD WARN_(d3d_perf)("Framebuffer objects not supported, falling back to backbuffer offscreen rendering mode.\n"); wined3d_settings.offscreen_rendering_mode = ORM_BACKBUFFER; } + + if (gl_info->supported[ARB_GEOMETRY_SHADER4]) + { + gl_info->fbo_ops.glFramebufferTextureLayer = gl_info->gl_ops.ext.p_glFramebufferTextureLayerARB; + } if (gl_info->supported[EXT_FRAMEBUFFER_BLIT]) { gl_info->fbo_ops.glBlitFramebuffer = gl_info->gl_ops.ext.p_glBlitFramebufferEXT; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c70a6f3..f630223 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1870,6 +1870,8 @@ struct wined3d_fbo_ops GLenum textarget, GLuint texture, GLint level); void (WINE_GLAPI *glFramebufferTexture3D)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint layer); + void (WINE_GLAPI *glFramebufferTextureLayer)(GLenum target, GLenum attachment, + GLuint texture, GLint level, GLint layer); void (WINE_GLAPI *glFramebufferRenderbuffer)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); void (WINE_GLAPI *glGetFramebufferAttachmentParameteriv)(GLenum target, GLenum attachment, @@ -2626,7 +2628,8 @@ struct wined3d_renderbuffer_entry struct wined3d_fbo_resource { GLuint object; - GLuint level, target; + GLenum target; + GLuint level, layer; }; #define WINED3D_FBO_ENTRY_FLAG_ATTACHED 0x1

1 0

Francois Gouget : ddraw: Spelling and plural fixes in comments.
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: 8f42343c0288a300f70cde87c637fbabd2c1e698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f42343c0288a300f70cde87c… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 20 08:56:24 2016 +0200 ddraw: Spelling and plural fixes in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index c969e4d..60875d2 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1604,7 +1604,7 @@ static HRESULT WINAPI ddraw1_Compact(IDirectDraw *iface) * * Returns information about the current display mode * - * Exists in Version 1, 2, 4 and 7 + * Exists in versions 1, 2, 4 and 7 * * Params: * DDSD: Address of a surface description structure to write the info to @@ -1695,7 +1695,7 @@ static HRESULT WINAPI ddraw1_GetDisplayMode(IDirectDraw *iface, DDSURFACEDESC *s * * Returns an array of supported FourCC codes. * - * Exists in Version 1, 2, 4 and 7 + * Exists in versions 1, 2, 4 and 7 * * Params: * NumCodes: Contains the number of Codes that Codes can carry. Returns the number @@ -3617,7 +3617,7 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA * Enumerates all supported Direct3DDevice interfaces. This is the * implementation for Direct3D 1 to Direc3D 3, Version 7 has its own. * - * Version 1, 2 and 3 + * Versions 1, 2 and 3 * * Params: * callback: Application-provided routine to call for each enumerated device @@ -3759,7 +3759,7 @@ static HRESULT WINAPI d3d1_EnumDevices(IDirect3D *iface, LPD3DENUMDEVICESCALLBAC * by the DIRECT3DLIGHT7 structure. Wine's Direct3DLight implementation * uses the IDirect3DDevice7 interface with D3D7 lights. * - * Version 1, 2 and 3 + * Versions 1, 2 and 3 * * Params: * light: Address to store the new interface pointer @@ -3822,7 +3822,7 @@ static HRESULT WINAPI d3d1_CreateLight(IDirect3D *iface, IDirect3DLight **light, * and older versions. The IDirect3DMaterial implementation wraps its * functionality to IDirect3DDevice7::SetMaterial and friends. * - * Version 1, 2 and 3 + * Versions 1, 2 and 3 * * Params: * material: Address to store the new interface's pointer to @@ -3971,7 +3971,7 @@ static HRESULT WINAPI d3d1_CreateViewport(IDirect3D *iface, IDirect3DViewport ** * This method finds a device with the requested properties and returns a * device description * - * Verion 1, 2 and 3 + * Versions 1, 2 and 3 * Params: * fds: Describes the requested device characteristics * fdr: Returns the device description @@ -4053,7 +4053,7 @@ static HRESULT WINAPI d3d1_FindDevice(IDirect3D *iface, D3DFINDDEVICESEARCH *fds * * Creates an IDirect3DDevice7 interface. * - * Version 2, 3 and 7. IDirect3DDevice 1 interfaces are interfaces to + * Versions 2, 3 and 7. IDirect3DDevice 1 interfaces are interfaces to * DirectDraw surfaces and are created with * IDirectDrawSurface::QueryInterface. This method uses CreateDevice to * create the device object and QueryInterfaces for IDirect3DDevice @@ -4155,7 +4155,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid, * Creates a new vertex buffer object and returns a IDirect3DVertexBuffer7 * interface. * - * Version 3 and 7 + * Versions 3 and 7 * * Params: * desc: Requested Vertex buffer properties @@ -4225,7 +4225,7 @@ static HRESULT WINAPI d3d3_CreateVertexBuffer(IDirect3D3 *iface, D3DVERTEXBUFFER * * Enumerates all supported Z buffer pixel formats * - * Version 3 and 7 + * Versions 3 and 7 * * Params: * device_iid: @@ -4369,7 +4369,7 @@ static HRESULT WINAPI d3d3_EnumZBufferFormats(IDirect3D3 *iface, REFCLSID device * Removes all managed textures (=surfaces with DDSCAPS2_TEXTUREMANAGE or * DDSCAPS2_D3DTEXTUREMANAGE caps) to be removed from video memory. * - * Version 3 and 7 + * Versions 3 and 7 * * Returns: * D3D_OK, because it's a stub

1 0

Caron Wills : wined3d: Add Nvidia GeForce GTX 850M.
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: e44e6b2244154c9e00f48179737c2b5d1e328201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e44e6b2244154c9e00f481797… Author: Caron Wills <caron(a)codeweavers.com> Date: Tue Apr 19 19:33:49 2016 +0000 wined3d: Add Nvidia GeForce GTX 850M. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8f47b24..c6167b6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1291,6 +1291,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_830M, "NVIDIA GeForce 830M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_840M, "NVIDIA GeForce 840M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_845M, "NVIDIA GeForce 845M", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX850M, "NVIDIA GeForce GTX 850M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1755,6 +1756,7 @@ cards_nvidia_binary[] = {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ + {"GTX 850M", CARD_NVIDIA_GEFORCE_GTX850M}, /* GeForce 800 - mobile */ {"GeForce 845M", CARD_NVIDIA_GEFORCE_845M}, /* GeForce 800 - mobile */ {"GeForce 840M", CARD_NVIDIA_GEFORCE_840M}, /* GeForce 800 - mobile */ {"GeForce 830M", CARD_NVIDIA_GEFORCE_830M}, /* GeForce 800 - mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 50034a3..c70a6f3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1799,6 +1799,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_830M = 0x1340, CARD_NVIDIA_GEFORCE_840M = 0x1341, CARD_NVIDIA_GEFORCE_845M = 0x1344, + CARD_NVIDIA_GEFORCE_GTX850M = 0x1391, CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a,

1 0

Nikolay Sivov : dwrite: Initial implementation of IDWriteFontFaceReference.
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: fd06cc7c492c20233056dc33f91c253f793802fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd06cc7c492c20233056dc33f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 20 10:51:01 2016 +0300 dwrite: Initial implementation of IDWriteFontFaceReference. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 + dlls/dwrite/font.c | 263 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/main.c | 18 ++- dlls/dwrite/tests/font.c | 13 +-- 4 files changed, 285 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd06cc7c492c20233056d…

1 0

Nikolay Sivov : dwrite: Accept local loader in CreateCustomFontFileReference().
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: e55d40743077a4fa453b432aaf617c5c9ad3cfac URL: http://source.winehq.org/git/wine.git/?a=commit;h=e55d40743077a4fa453b432aa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 20 10:51:00 2016 +0300 dwrite: Accept local loader in CreateCustomFontFileReference(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 4 +++- dlls/dwrite/tests/font.c | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index da12669..8b87590 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -807,7 +807,9 @@ static HRESULT WINAPI dwritefactory_CreateCustomFontFileReference(IDWriteFactory *font_file = NULL; - if (!loader || !factory_get_file_loader(This, loader)) + /* local loader is accepted as well */ + if (!loader || !(factory_get_file_loader(This, loader) || + (IDWriteFontFileLoader*)This->localfontfileloader == loader)) return E_INVALIDARG; return create_font_file(loader, reference_key, key_size, font_file); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 64e6a93..54f0714 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2431,6 +2431,7 @@ static void test_CreateCustomFontFileReference(void) IDWriteFontFileLoader floader2 = { &dwritefontfileloadervtbl }; IDWriteFontFileLoader floader3 = { &dwritefontfileloadervtbl }; IDWriteFactory *factory, *factory2; + IDWriteFontFileLoader *loader; IDWriteFontFile *file, *file2; BOOL support; DWRITE_FONT_FILE_TYPE file_type; @@ -2441,6 +2442,11 @@ static void test_CreateCustomFontFileReference(void) HRSRC fontrsrc; UINT32 codePoints[1] = {0xa8}; UINT16 indices[2]; + const void *key; + UINT32 key_size; + WCHAR *path; + + path = create_testfontfile(test_fontfile); factory = create_factory(); factory2 = create_factory(); @@ -2449,6 +2455,23 @@ if (0) { /* crashes on win10 */ hr = IDWriteFactory_RegisterFontFileLoader(factory, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); } + /* local loader is accepted too */ + hr = IDWriteFactory_CreateFontFileReference(factory, path, NULL, &file); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFile_GetLoader(file, &loader); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFile_GetReferenceKey(file, &key, &key_size); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateCustomFontFileReference(factory, key, key_size, loader, &file2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IDWriteFontFile_Release(file2); + IDWriteFontFile_Release(file); + IDWriteFontFileLoader_Release(loader); + hr = IDWriteFactory_RegisterFontFileLoader(factory, &floader); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFactory_RegisterFontFileLoader(factory, &floader2); @@ -2582,6 +2605,7 @@ if (0) /* crashes on native */ IDWriteFactory_Release(factory2); IDWriteFactory_Release(factory); + DELETE_FONTFILE(path); } static void test_CreateFontFileReference(void)

1 0

Francois Gouget : kernel32/tests: Spelling fixes for a couple of comments.
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: ccad9f3b978d18080dfa8660fde33bd8098167c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccad9f3b978d18080dfa8660f… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 20 08:56:57 2016 +0200 kernel32/tests: Spelling fixes for a couple of comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/debugger.c | 2 +- dlls/kernel32/tests/sync.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index d4d66b2..a277f93 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -159,7 +159,7 @@ BOOL WINAPI WaitForDebugEvent( * PARAMS * pid [I] The id of the process to continue. * tid [I] The id of the thread to continue. - * status [I] The rule to apply to unhandled exeptions. + * status [I] The rule to apply to unhandled exceptions. * * RETURNS * diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 325e1ff..26cd1d6 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -1735,9 +1735,9 @@ static SRWLOCK condvar_srwlock; /* Sequence of wake/sleep to check boundary conditions: * 0: init - * 1: producer emits a WakeConditionVaribale without consumer waiting. + * 1: producer emits a WakeConditionVariable without consumer waiting. * 2: consumer sleeps without a wake expecting timeout - * 3: producer emits a WakeAllConditionVaribale without consumer waiting. + * 3: producer emits a WakeAllConditionVariable without consumer waiting. * 4: consumer sleeps without a wake expecting timeout * 5: a wake is handed to a SleepConditionVariableCS * 6: a wakeall is handed to a SleepConditionVariableCS

1 0

Sebastian Lackner : user32: Do not block sending/ posting WM_NOTIFY messages.
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: b4ac51effaa19b3ddf64f89b23894254608b6294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4ac51effaa19b3ddf64f89b2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 19 18:28:59 2016 +0200 user32: Do not block sending/posting WM_NOTIFY messages. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 3 +-- dlls/user32/tests/msg.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 94d7a84..fb4786b 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -310,8 +310,7 @@ static const unsigned int message_pointer_flags[] = SET(WM_GETMINMAXINFO) | SET(WM_DRAWITEM) | SET(WM_MEASUREITEM) | SET(WM_DELETEITEM) | SET(WM_COMPAREITEM), /* 0x40 - 0x5f */ - SET(WM_WINDOWPOSCHANGING) | SET(WM_WINDOWPOSCHANGED) | SET(WM_COPYDATA) | - SET(WM_NOTIFY) | SET(WM_HELP), + SET(WM_WINDOWPOSCHANGING) | SET(WM_WINDOWPOSCHANGED) | SET(WM_COPYDATA) | SET(WM_HELP), /* 0x60 - 0x7f */ SET(WM_STYLECHANGING) | SET(WM_STYLECHANGED), /* 0x80 - 0x9f */ diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index d2059a8..b2630ce 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11188,6 +11188,70 @@ static void test_quit_message(void) ok_sequence(WmStopQuitSeq, "WmStopQuitSeq", FALSE); } +static const struct message WmNotifySeq[] = { + { WM_NOTIFY, sent|wparam|lparam, 0x1234, 0xdeadbeef }, + { 0 } +}; + +static void test_notify_message(void) +{ + HWND hwnd; + BOOL ret; + MSG msg; + + hwnd = CreateWindowExA(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, 300, 300, 0, NULL, NULL, 0); + ok(hwnd != 0, "Failed to create window\n"); + flush_events(); + flush_sequence(); + + ret = SendNotifyMessageA(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef); + ok(ret == TRUE, "SendNotifyMessageA failed with error %u\n", GetLastError()); + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + ret = SendNotifyMessageW(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef); + ok(ret == TRUE, "SendNotifyMessageW failed with error %u\n", GetLastError()); + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + ret = SendMessageCallbackA(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef, NULL, 0); + ok(ret == TRUE, "SendMessageCallbackA failed with error %u\n", GetLastError()); + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + ret = SendMessageCallbackW(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef, NULL, 0); + ok(ret == TRUE, "SendMessageCallbackW failed with error %u\n", GetLastError()); + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + ret = PostMessageA(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef); + ok(ret == TRUE, "PostMessageA failed with error %u\n", GetLastError()); + flush_events(); + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + ret = PostMessageW(hwnd, WM_NOTIFY, 0x1234, 0xdeadbeef); + ok(ret == TRUE, "PostMessageW failed with error %u\n", GetLastError()); + flush_events(); + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + ret = PostThreadMessageA(GetCurrentThreadId(), WM_NOTIFY, 0x1234, 0xdeadbeef); + ok(ret == TRUE, "PostThreadMessageA failed with error %u\n", GetLastError()); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + msg.hwnd = hwnd; + DispatchMessageA(&msg); + } + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + ret = PostThreadMessageW(GetCurrentThreadId(), WM_NOTIFY, 0x1234, 0xdeadbeef); + ok(ret == TRUE, "PostThreadMessageW failed with error %u\n", GetLastError()); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + msg.hwnd = hwnd; + DispatchMessageA(&msg); + } + ok_sequence(WmNotifySeq, "WmNotifySeq", FALSE); + + DestroyWindow(hwnd); +} + static const struct message WmMouseHoverSeq[] = { { WM_MOUSEACTIVATE, sent|optional }, /* we can get those when moving the mouse in focus-follow-mouse mode under X11 */ { WM_MOUSEACTIVATE, sent|optional }, @@ -15793,6 +15857,7 @@ START_TEST(msg) test_SendMessageTimeout(); test_edit_messages(); test_quit_message(); + test_notify_message(); test_SetActiveWindow(); if (!pTrackMouseEvent)

1 0

Henri Verbeet : wined3d: Use the texture dimensions in swapchain_blit().
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: 62a766f75ce068313b2a3ad2691154a78491158c URL: http://source.winehq.org/git/wine.git/?a=commit;h=62a766f75ce068313b2a3ad26… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 19 18:34:07 2016 +0200 wined3d: Use the texture dimensions in swapchain_blit(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 -- dlls/wined3d/swapchain.c | 10 +++++----- dlls/wined3d/texture.c | 2 -- dlls/wined3d/wined3d_private.h | 2 -- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f358805..c32a1f7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4351,8 +4351,6 @@ HRESULT wined3d_surface_init(struct wined3d_surface *surface, struct wined3d_tex surface->resource.access_flags = container->resource.access_flags; surface->container = container; - surface->pow2Width = wined3d_texture_get_level_pow2_width(container, level); - surface->pow2Height = wined3d_texture_get_level_pow2_height(container, level); surface->texture_target = target; surface->texture_level = level; surface->texture_layer = layer; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index bd0a089..202a890 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -361,12 +361,12 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, context2 = context_acquire(device, back_buffer); context_apply_blit_state(context2, device); - if (back_buffer->container->flags & WINED3D_TEXTURE_NORMALIZED_COORDS) + if (texture->flags & WINED3D_TEXTURE_NORMALIZED_COORDS) { - tex_left /= back_buffer->pow2Width; - tex_right /= back_buffer->pow2Width; - tex_top /= back_buffer->pow2Height; - tex_bottom /= back_buffer->pow2Height; + tex_left /= texture->pow2_width; + tex_right /= texture->pow2_width; + tex_top /= texture->pow2_height; + tex_bottom /= texture->pow2_height; } if (is_complex_fixup(texture->resource.format->color_fixup)) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 2990e44..ada571c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -987,8 +987,6 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT texture->pow2_width = width; texture->pow2_height = height; } - surface->pow2Width = texture->pow2_width; - surface->pow2Height = texture->pow2_height; sub_resource->locations = 0; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5623a62..1f04484 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2651,8 +2651,6 @@ struct wined3d_surface struct wined3d_resource resource; struct wined3d_texture *container; - UINT pow2Width; - UINT pow2Height; GLenum texture_target; unsigned int texture_level; unsigned int texture_layer;

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in texture2d_prepare_texture().
by Alexandre Julliard April 20, 2016

April 20, 2016

Module: wine Branch: master Commit: 70f1d0efdcf37d842ba5d542b1fed41c1c4a5700 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70f1d0efdcf37d842ba5d542b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 19 18:34:06 2016 +0200 wined3d: Use the texture dimension helpers in texture2d_prepare_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index c8a7695..2990e44 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1345,9 +1345,10 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi for (i = 0; i < sub_count; ++i) { struct wined3d_surface *surface = texture->sub_resources[i].u.surface; - GLsizei height = surface->pow2Height; - GLsizei width = surface->pow2Width; + GLsizei width, height; + width = wined3d_texture_get_level_pow2_width(texture, surface->texture_level); + height = wined3d_texture_get_level_pow2_height(texture, surface->texture_level); if (texture->resource.format_flags & WINED3DFMT_FLAG_HEIGHT_SCALE) { height *= format->height_scale.numerator;

1 0