wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Andrew Talbot : inkobj: Remove unused variable.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 16b43ef0721406acb82c353765db482e7d26f3c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16b43ef0721406acb82c35376… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 24 21:09:39 2012 +0000 inkobj: Remove unused variable. --- dlls/inkobj/inkobj.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/inkobj/inkobj.c b/dlls/inkobj/inkobj.c index 4120144..f199f56 100644 --- a/dlls/inkobj/inkobj.c +++ b/dlls/inkobj/inkobj.c @@ -20,7 +20,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(inkobj); static LONG INKOBJ_refCount; -static HINSTANCE INKOBJ_hInstance; /***************************************************** * DllMain (INKOBJ.init) @@ -35,7 +34,6 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinst ); - INKOBJ_hInstance = hinst; break; } return TRUE;

1 0

Andrew Talbot : ntprint: Remove unused variable.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 2d50946e069c3988ad400e14e1585fb4818f2471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d50946e069c3988ad400e14e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 24 21:09:42 2012 +0000 ntprint: Remove unused variable. --- dlls/ntprint/ntprint.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/ntprint/ntprint.c b/dlls/ntprint/ntprint.c index b816666..a5431b6 100644 --- a/dlls/ntprint/ntprint.c +++ b/dlls/ntprint/ntprint.c @@ -36,8 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntprint); -static HINSTANCE NTPRINT_hInstance = NULL; - typedef struct { LPMONITOR_INFO_2W mi2; /* Buffer for installed Monitors */ DWORD installed; /* Number of installed Monitors */ @@ -56,7 +54,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: - NTPRINT_hInstance = hinstDLL; DisableThreadLibraryCalls( hinstDLL ); break; }

1 0

Andrew Talbot : opengl32: Remove unused variable.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 538a0e4a9ea04b979a14a32cffcedb0b40554908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=538a0e4a9ea04b979a14a32cf… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 24 21:09:46 2012 +0000 opengl32: Remove unused variable. --- dlls/opengl32/wgl.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 798a0e5..1317ff5 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -43,8 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wgl); WINE_DECLARE_DEBUG_CHANNEL(fps); -static HMODULE opengl32_handle; - extern struct opengl_funcs null_opengl_funcs; /* handle management */ @@ -1719,7 +1717,6 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) switch(reason) { case DLL_PROCESS_ATTACH: - opengl32_handle = hinst; DisableThreadLibraryCalls(hinst); NtCurrentTeb()->glTable = &null_opengl_funcs; break;

1 0

Andrew Talbot : printui: Remove unused variable.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 8bf312d40e218785918b65ebfde5baaeb4829208 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bf312d40e218785918b65ebf… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 24 21:09:50 2012 +0000 printui: Remove unused variable. --- dlls/printui/printui.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/printui/printui.c b/dlls/printui/printui.c index 7a2b466..c6e610d 100644 --- a/dlls/printui/printui.c +++ b/dlls/printui/printui.c @@ -38,8 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(printui); -static HINSTANCE PRINTUI_hInstance = NULL; - /* ################################# */ /* Must be in order with OPT_* */ @@ -227,7 +225,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: - PRINTUI_hInstance = hinstDLL; DisableThreadLibraryCalls( hinstDLL ); break; }

1 0

Henri Verbeet : winex11: Detect broken NVIDIA RandR setups.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 8776e1c0e1597fec169d169888660deb5bb08c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8776e1c0e1597fec169d16988… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Nov 24 17:17:09 2012 +0100 winex11: Detect broken NVIDIA RandR setups. --- dlls/winex11.drv/xrandr.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 1093541..5b2dede 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -24,6 +24,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(xrandr); +WINE_DECLARE_DEBUG_CHANNEL(winediag); #ifdef SONAME_LIBXRANDR @@ -419,6 +420,21 @@ static int xrandr12_init_modes(void) goto done; } + /* Recent (304.64, possibly earlier) versions of the nvidia driver only + * report a DFP's native mode through RandR 1.2 / 1.3. Standard DMT modes + * are only listed through RandR 1.0 / 1.1. This is completely useless, + * but NVIDIA considers this a feature, so it's unlikely to change. The + * best we can do is to fall back to RandR 1.0 and encourage users to + * consider more cooperative driver vendors when we detect such a + * configuration. */ + if (output_info->nmode == 1 && XQueryExtension( gdi_display, "NV-CONTROL", &i, &j, &ret )) + { + ERR_(winediag)("Broken NVIDIA RandR detected, falling back to RandR 1.0. " + "Please consider using the Nouveau driver instead.\n"); + ret = -1; + goto done; + } + if (!(xrandr12_modes = HeapAlloc( GetProcessHeap(), 0, sizeof(*xrandr12_modes) * output_info->nmode ))) { ERR("Failed to allocate xrandr mode info array.\n");

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_IAGetInputLayout().
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 86779241c6c3969b50c8fbd50a943f47c2b3458e URL: http://source.winehq.org/git/wine.git/?a=commit;h=86779241c6c3969b50c8fbd50… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Nov 24 17:17:08 2012 +0100 d3d10core: Implement d3d10_device_IAGetInputLayout(). --- dlls/d3d10core/device.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 0623ee5..3ac02a0 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -548,7 +548,21 @@ static void STDMETHODCALLTYPE d3d10_device_PSGetConstantBuffers(ID3D10Device *if static void STDMETHODCALLTYPE d3d10_device_IAGetInputLayout(ID3D10Device *iface, ID3D10InputLayout **input_layout) { - FIXME("iface %p, input_layout %p stub!\n", iface, input_layout); + struct d3d10_device *device = impl_from_ID3D10Device(iface); + struct wined3d_vertex_declaration *wined3d_declaration; + struct d3d10_input_layout *input_layout_impl; + + TRACE("iface %p, input_layout %p.\n", iface, input_layout); + + if (!(wined3d_declaration = wined3d_device_get_vertex_declaration(device->wined3d_device))) + { + *input_layout = NULL; + return; + } + + input_layout_impl = wined3d_vertex_declaration_get_parent(wined3d_declaration); + *input_layout = &input_layout_impl->ID3D10InputLayout_iface; + ID3D10InputLayout_AddRef(*input_layout); } static void STDMETHODCALLTYPE d3d10_device_IAGetVertexBuffers(ID3D10Device *iface,

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXPRTENGINE.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 69f059cdd7c3b14ada563353f257a67cd96f04d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f059cdd7c3b14ada563353f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Nov 24 17:17:07 2012 +0100 d3dx9: Avoid LPD3DXPRTENGINE. --- include/d3dx9mesh.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index e0b8557..a5fc6cc 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -711,7 +711,8 @@ HRESULT WINAPI D3DXCreatePRTBufferTex(UINT, UINT, UINT, UINT, LPD3DXPRTBUFFER *) HRESULT WINAPI D3DXCreatePRTCompBuffer(D3DXSHCOMPRESSQUALITYTYPE, UINT, UINT, LPD3DXSHPRTSIMCB, LPVOID, LPD3DXPRTBUFFER, LPD3DXPRTCOMPBUFFER *); HRESULT WINAPI D3DXCreateTextureGutterHelper(UINT width, UINT height, ID3DXMesh *mesh, float gutter_size, ID3DXTextureGutterHelper **gh); -HRESULT WINAPI D3DXCreatePRTEngine(LPD3DXMESH, DWORD *, BOOL, LPD3DXMESH, LPD3DXPRTENGINE *); +HRESULT WINAPI D3DXCreatePRTEngine(ID3DXMesh *mesh, DWORD *adjacency, BOOL extract_uv, + ID3DXMesh *blocker_mesh, ID3DXPRTEngine **engine); HRESULT WINAPI D3DXLoadMeshFromXA(const char *filename, DWORD flags, struct IDirect3DDevice9 *device, struct ID3DXBuffer **adjacency, struct ID3DXBuffer **materials, struct ID3DXBuffer **effect_instances, DWORD *material_count, struct ID3DXMesh **mesh);

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXTEXTUREGUTTERHELPER.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 4987196e37cf5b123f9a1b0e014f84d96a6179e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4987196e37cf5b123f9a1b0e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Nov 24 17:17:06 2012 +0100 d3dx9: Avoid LPD3DXTEXTUREGUTTERHELPER. --- include/d3dx9mesh.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 149c199..e0b8557 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -565,7 +565,7 @@ DECLARE_INTERFACE_(ID3DXPRTBuffer, IUnknown) STDMETHOD(UnlockBuffer)(THIS) PURE; STDMETHOD(ScaleBuffer)(THIS_ FLOAT scale) PURE; STDMETHOD(AddBuffer)(THIS_ LPD3DXPRTBUFFER buffer) PURE; - STDMETHOD(AttachGH)(THIS_ LPD3DXTEXTUREGUTTERHELPER) PURE; + STDMETHOD(AttachGH)(THIS_ struct ID3DXTextureGutterHelper *gh) PURE; STDMETHOD(ReleaseGH)(THIS) PURE; STDMETHOD(EvalGH)(THIS) PURE; STDMETHOD(ExtractTexture)(THIS_ UINT channel, UINT start_coefficient, @@ -709,7 +709,8 @@ HRESULT WINAPI D3DXCreatePatchMesh(const D3DXPATCHINFO *patch_info, DWORD patch_ HRESULT WINAPI D3DXCreatePRTBuffer(UINT, UINT, UINT, LPD3DXPRTBUFFER *); HRESULT WINAPI D3DXCreatePRTBufferTex(UINT, UINT, UINT, UINT, LPD3DXPRTBUFFER *); HRESULT WINAPI D3DXCreatePRTCompBuffer(D3DXSHCOMPRESSQUALITYTYPE, UINT, UINT, LPD3DXSHPRTSIMCB, LPVOID, LPD3DXPRTBUFFER, LPD3DXPRTCOMPBUFFER *); -HRESULT WINAPI D3DXCreateTextureGutterHelper(UINT, UINT, LPD3DXMESH, FLOAT, LPD3DXTEXTUREGUTTERHELPER *); +HRESULT WINAPI D3DXCreateTextureGutterHelper(UINT width, UINT height, ID3DXMesh *mesh, + float gutter_size, ID3DXTextureGutterHelper **gh); HRESULT WINAPI D3DXCreatePRTEngine(LPD3DXMESH, DWORD *, BOOL, LPD3DXMESH, LPD3DXPRTENGINE *); HRESULT WINAPI D3DXLoadMeshFromXA(const char *filename, DWORD flags, struct IDirect3DDevice9 *device, struct ID3DXBuffer **adjacency, struct ID3DXBuffer **materials, struct ID3DXBuffer **effect_instances,

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXINCLUDE.
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 69eeb35e51d2fc7bbb05af1f69fc2fbb9521e9bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=69eeb35e51d2fc7bbb05af1f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Nov 24 17:17:05 2012 +0100 d3dx9: Avoid LPD3DXINCLUDE. --- dlls/d3dx9_36/effect.c | 27 +++++++--------- dlls/d3dx9_36/shader.c | 81 +++++++++++----------------------------------- include/d3dx9effect.h | 45 +++++++------------------- include/d3dx9shader.h | 83 ++++++++++++----------------------------------- 4 files changed, 65 insertions(+), 171 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69eeb35e51d2fc7bbb05a…

1 0

Frédéric Delanoy : ddraw: Return appropriate value for non matching 32 bit pixel format in PixelFormat_DD2WineD3D (coverity).
by Alexandre Julliard 26 Nov '12

26 Nov '12

Module: wine Branch: master Commit: 80d30100993013dfdaa32d0e6c938246b5f75cbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d30100993013dfdaa32d0e6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 23 19:36:14 2012 +0100 ddraw: Return appropriate value for non matching 32 bit pixel format in PixelFormat_DD2WineD3D (coverity). --- dlls/ddraw/utils.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index d990440..1964452 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -446,6 +446,7 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat } WARN("32 bit RGB pixel format does not match.\n"); + return WINED3DFMT_UNKNOWN; default: WARN("Invalid dwRGBBitCount in Pixelformat structure.\n");

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
71
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 November 2012