wine-commits September 2013

wine-commits@winehq.org

2 participants
645 discussions

Henri Verbeet : d3dcompiler: Avoid LPVOID.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: 5daf5e80fbb2ce5043163f46fdaaf831d340850a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5daf5e80fbb2ce5043163f46f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 6 09:57:42 2013 +0200 d3dcompiler: Avoid LPVOID. --- dlls/d3dcompiler_43/d3dcompiler_43_main.c | 2 +- dlls/d3dcompiler_43/reflection.c | 2 +- dlls/d3dcompiler_43/tests/asm.c | 2 +- include/d3d11shader.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_43_main.c b/dlls/d3dcompiler_43/d3dcompiler_43_main.c index 0c66471..929cec0 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43_main.c +++ b/dlls/d3dcompiler_43/d3dcompiler_43_main.c @@ -28,7 +28,7 @@ #include "d3dcompiler_private.h" -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { switch (reason) { diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 77e7ac3..97d4148 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -72,7 +72,7 @@ struct d3dcompiler_shader_reflection_variable UINT start_offset; UINT size; UINT flags; - LPVOID default_value; + void *default_value; }; struct d3dcompiler_shader_reflection_constant_buffer diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index cb1453f..331b864 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -1486,7 +1486,7 @@ static HRESULT WINAPI testD3DInclude_open(ID3DInclude *iface, D3D_INCLUDE_TYPE i static HRESULT WINAPI testD3DInclude_close(ID3DInclude *iface, const void *data) { - HeapFree(GetProcessHeap(), 0, (LPVOID)data); + HeapFree(GetProcessHeap(), 0, (void *)data); return S_OK; } diff --git a/include/d3d11shader.h b/include/d3d11shader.h index ea271f6..9ee78a8 100644 --- a/include/d3d11shader.h +++ b/include/d3d11shader.h @@ -80,7 +80,7 @@ typedef struct _D3D11_SHADER_VARIABLE_DESC UINT StartOffset; UINT Size; UINT uFlags; - LPVOID DefaultValue; + void *DefaultValue; UINT StartTexture; UINT TextureSize; UINT StartSampler; @@ -180,7 +180,7 @@ DEFINE_GUID(IID_ID3D11ShaderReflection, 0x0a233719, 0x3960, 0x4578, 0x9d, 0x7c, DECLARE_INTERFACE_(ID3D11ShaderReflection, IUnknown) { /* IUnknown methods */ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *object) PURE; + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE; /* ID3D11ShaderReflection methods */

1 0

Henri Verbeet : ddraw: Introduce a helper function for initializing a D3DDEVICEDESC structure from a D3DDEVICEDESC7 structure .
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: 4735690dc2482c41dfbb2e1adc1722bea2c92d0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4735690dc2482c41dfbb2e1ad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 6 09:57:41 2013 +0200 ddraw: Introduce a helper function for initializing a D3DDEVICEDESC structure from a D3DDEVICEDESC7 structure. --- dlls/ddraw/ddraw.c | 571 +++++++++++++++++++++----------------------- dlls/ddraw/ddraw_private.h | 6 +- dlls/ddraw/device.c | 39 +--- 3 files changed, 282 insertions(+), 334 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4735690dc2482c41dfbb2…

1 0

Henri Verbeet : wined3d: Get rid of the SFLAG_INTEXTURE / SFLAG_INSRGBTEX check in surface_set_texture_name().
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: 7859509f5b09ee2184c8c9e971ebeb92eec80fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=7859509f5b09ee2184c8c9e97… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 6 09:57:40 2013 +0200 wined3d: Get rid of the SFLAG_INTEXTURE / SFLAG_INSRGBTEX check in surface_set_texture_name(). --- dlls/wined3d/surface.c | 31 +++++-------------------------- 1 files changed, 5 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e36f61d..011be7a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1709,36 +1709,15 @@ static const struct wined3d_surface_ops gdi_surface_ops = gdi_surface_unmap, }; -void surface_set_texture_name(struct wined3d_surface *surface, GLuint new_name, BOOL srgb) +void surface_set_texture_name(struct wined3d_surface *surface, GLuint name, BOOL srgb) { - GLuint *name; - DWORD flag; + TRACE("surface %p, name %u, srgb %#x.\n", surface, name, srgb); - TRACE("surface %p, new_name %u, srgb %#x.\n", surface, new_name, srgb); - - if(srgb) - { - name = &surface->texture_name_srgb; - flag = SFLAG_INSRGBTEX; - } + if (srgb) + surface->texture_name_srgb = name; else - { - name = &surface->texture_name; - flag = SFLAG_INTEXTURE; - } - - if (!*name && new_name) - { - /* FIXME: We shouldn't need to remove SFLAG_INTEXTURE if the - * surface has no texture name yet. See if we can get rid of this. */ - if (surface->flags & flag) - { - ERR("Surface has %s set, but no texture name.\n", debug_surflocation(flag)); - surface_modify_location(surface, flag, FALSE); - } - } + surface->texture_name = name; - *name = new_name; surface_force_reload(surface); }

1 0

Henri Verbeet : wined3d: Return 1 instead of 0 for max_vertex_blend_matrices in glsl_vertex_pipe_vp_get_caps ().
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: 137590be3106c0589947c09ba0a626349e2e4a5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=137590be3106c0589947c09ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 6 09:57:39 2013 +0200 wined3d: Return 1 instead of 0 for max_vertex_blend_matrices in glsl_vertex_pipe_vp_get_caps(). It's not necessarily clear to me that one is better than the other here, but this is what we returned in the old GL fixed function implementation of the D3D fixed function vertex pipe, and apparently EverQuest depends on this. This fixes a regression introduced by commit 2014141a253a791fc9c79aae3c8ef3c35b73e658. --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0dd0197..37661d3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6808,7 +6808,7 @@ static void glsl_vertex_pipe_vp_get_caps(const struct wined3d_gl_info *gl_info, { caps->xyzrhw = TRUE; caps->max_active_lights = gl_info->limits.lights; - caps->max_vertex_blend_matrices = 0; + caps->max_vertex_blend_matrices = 1; caps->max_vertex_blend_matrix_index = 0; caps->vertex_processing_caps = WINED3DVTXPCAPS_TEXGEN | WINED3DVTXPCAPS_MATERIALSOURCE7

1 0

Ken Thomases : winemac: Add support for mouse-move and right- and middle-click events on systray icons in the Mac status bar .
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: 7ed00f6d975718ab32cf30a7fe6c6c27c8f69364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ed00f6d975718ab32cf30a7f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Sep 5 22:23:52 2013 -0500 winemac: Add support for mouse-move and right- and middle-click events on systray icons in the Mac status bar. --- dlls/winemac.drv/cocoa_status_item.m | 136 +++++++++++++++++++++++++++++---- dlls/winemac.drv/event.c | 13 ++- dlls/winemac.drv/macdrv.h | 3 +- dlls/winemac.drv/macdrv_cocoa.h | 10 ++- dlls/winemac.drv/systray.c | 69 ++++++++++++----- 5 files changed, 186 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7ed00f6d975718ab32cf3…

1 0

Frédéric Delanoy : loader: Mention builtin executables in wine manpage.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: ee771fddaacfdcc3d33b8cb46ac1f638b353b3da URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee771fddaacfdcc3d33b8cb46… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Sep 5 17:14:36 2013 +0200 loader: Mention builtin executables in wine manpage. --- loader/wine.man.in | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/loader/wine.man.in b/loader/wine.man.in index 6b60000..f5647a3 100644 --- a/loader/wine.man.in +++ b/loader/wine.man.in @@ -53,6 +53,10 @@ a shell, e.g. .PP wine C:\(rs\(rsProgram\(rs Files\(rs\(rsMyPrg\(rs\(rstest.exe .PP +It can also be one of the Windows executables shipped with Wine, in +which case specifying the full path is not mandatory, e.g. \fIwine +explorer\fR or \fIwine notepad\fR. +.PP .SH ENVIRONMENT .B wine makes the environment variables of the shell from which it

1 0

Marcus Meissner : mciqtz32: Do not print uninitialized variables (Coverity) .
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: c6761b8b9dc13eca8293ffcefb5bd19608fbffc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6761b8b9dc13eca8293ffcef… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Aug 31 13:17:56 2013 +0200 mciqtz32: Do not print uninitialized variables (Coverity). --- dlls/mciqtz32/mciqtz.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 546f3ed..eb77929 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -733,13 +733,13 @@ static DWORD MCIQTZ_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lp if (dwFlags & MCI_DGV_WHERE_SOURCE) { if (dwFlags & MCI_DGV_WHERE_MAX) - FIXME("MCI_DGV_WHERE_SOURCE_MAX stub %s\n", wine_dbgstr_rect(&rc)); + FIXME("MCI_DGV_WHERE_SOURCE_MAX stub\n"); IBasicVideo_GetSourcePosition(wma->vidbasic, &rc.left, &rc.top, &rc.right, &rc.bottom); TRACE("MCI_DGV_WHERE_SOURCE %s\n", wine_dbgstr_rect(&rc)); } if (dwFlags & MCI_DGV_WHERE_DESTINATION) { if (dwFlags & MCI_DGV_WHERE_MAX) - FIXME("MCI_DGV_WHERE_DESTINATION_MAX stub %s\n", wine_dbgstr_rect(&rc)); + FIXME("MCI_DGV_WHERE_DESTINATION_MAX stub\n"); IBasicVideo_GetDestinationPosition(wma->vidbasic, &rc.left, &rc.top, &rc.right, &rc.bottom); TRACE("MCI_DGV_WHERE_DESTINATION %s\n", wine_dbgstr_rect(&rc)); }

1 0

Ralf Habacker : gdi32: Fixed Rectangle() rotation with GM_ADVANCED graphics mode in dib driver.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: 39629a3d35f1bf4453733f70685110208c4f778c URL: http://source.winehq.org/git/wine.git/?a=commit;h=39629a3d35f1bf4453733f706… Author: Ralf Habacker <ralf.habacker(a)freenet.de> Date: Fri Aug 30 12:39:12 2013 +0200 gdi32: Fixed Rectangle() rotation with GM_ADVANCED graphics mode in dib driver. --- dlls/gdi32/dibdrv/graphics.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index d91ef11..f3aaeb6 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -1285,6 +1285,15 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) TRACE("(%p, %d, %d, %d, %d)\n", dev, left, top, right, bottom); + if (GetGraphicsMode( dev->hdc ) == GM_ADVANCED) + { + pts[0].x = pts[3].x = left; + pts[0].y = pts[1].y = top; + pts[1].x = pts[2].x = right; + pts[2].y = pts[3].y = bottom; + return dibdrv_Polygon( dev, pts, 4 ); + } + if (!get_pen_device_rect( pdev, &rect, left, top, right, bottom )) return TRUE; if (pdev->pen_uses_region && !(outline = CreateRectRgn( 0, 0, 0, 0 ))) return FALSE;

1 0

Frédéric Delanoy : winedev: Assorted tagging fixes.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: docs Branch: master Commit: fca7cf10155ec4b668cbf66cc82e15073d25269e URL: http://source.winehq.org/git/docs.git/?a=commit;h=fca7cf10155ec4b668cbf66cc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Sep 5 22:56:50 2013 +0200 winedev: Assorted tagging fixes. --- en/winedev-architecture.sgml | 3 +- en/winedev-debugger.sgml | 3 +- en/winedev-debugging.sgml | 4 +- en/winedev-documentation.sgml | 2 +- en/winedev-kernel.sgml | 70 +++++++++++++++++++++++++--------------- en/winedev-opengl.sgml | 4 +- en/winedev-testing.sgml | 8 ++-- 7 files changed, 56 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=fca7cf10155ec4b668cbf…

1 0

Frédéric Delanoy : winedev: Use appropriate tags for code excerpts.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: docs Branch: master Commit: 828e4b06f1a6eec1deacf6d1552811cfd31a6130 URL: http://source.winehq.org/git/docs.git/?a=commit;h=828e4b06f1a6eec1deacf6d15… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Sep 5 22:56:49 2013 +0200 winedev: Use appropriate tags for code excerpts. --- en/winedev-architecture.sgml | 2 +- en/winedev-coding.sgml | 34 +++++++++++++++--------------- en/winedev-ddraw.sgml | 2 +- en/winedev-debugger.sgml | 20 +++++++++--------- en/winedev-debugging.sgml | 14 ++++++------ en/winedev-kernel.sgml | 6 ++-- en/winedev-ole.sgml | 8 +++--- en/winedev-opengl.sgml | 2 +- en/winedev-otherdebug.sgml | 45 ++++++++++++++++++++--------------------- en/winedev-testing.sgml | 22 ++++++++++---------- en/winedev-windowing.sgml | 14 ++++++------ 11 files changed, 84 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/docs.git/?a=commitdiff;h=828e4b06f1a6eec1deacf…

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
65
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2013