wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Nikolay Sivov : wshom: Fix refcount for typeinfo pointers.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 13d99144bdb256a7ff7fc377955c8d1253d667fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=13d99144bdb256a7ff7fc3779… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 29 07:26:41 2012 -0500 wshom: Fix refcount for typeinfo pointers. --- dlls/wshom.ocx/wshom_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wshom.ocx/wshom_main.c b/dlls/wshom.ocx/wshom_main.c index 1c6bb44..c253b61 100644 --- a/dlls/wshom.ocx/wshom_main.c +++ b/dlls/wshom.ocx/wshom_main.c @@ -77,6 +77,7 @@ HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) } *typeinfo = typeinfos[tid]; + ITypeInfo_AddRef(*typeinfo); return S_OK; }

1 0

Henri Verbeet : wined3d: Fix a typo in wined3d_device_set_stream_output().
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 56b3953207a8afa2f54f59d339714cb9a6410e2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b3953207a8afa2f54f59d33… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 28 22:11:48 2012 +0100 wined3d: Fix a typo in wined3d_device_set_stream_output(). --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 713e959..c52882b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1581,7 +1581,7 @@ void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT if (buffer) wined3d_buffer_incref(buffer); if (prev_buffer) - wined3d_buffer_decref(buffer); + wined3d_buffer_decref(prev_buffer); return; }

1 0

Henri Verbeet : wined3d: Also unbind stream outputs and the geometry shader in stateblock_unbind_resources ().
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 5d9d20ee0ef1ea7d4269fc12a79f80621dc5dffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d9d20ee0ef1ea7d4269fc12a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 28 22:11:47 2012 +0100 wined3d: Also unbind stream outputs and the geometry shader in stateblock_unbind_resources(). --- dlls/wined3d/stateblock.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index c399bad..9b71486 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -491,6 +491,15 @@ void stateblock_unbind_resources(struct wined3d_stateblock *stateblock) } } + for (i = 0; i < MAX_STREAM_OUT; ++i) + { + if ((buffer = state->stream_output[i].buffer)) + { + state->stream_output[i].buffer = NULL; + wined3d_buffer_decref(buffer); + } + } + for (i = 0; i < MAX_STREAMS; ++i) { if ((buffer = state->streams[i].buffer)) @@ -512,6 +521,12 @@ void stateblock_unbind_resources(struct wined3d_stateblock *stateblock) wined3d_shader_decref(shader); } + if ((shader = state->geometry_shader)) + { + state->geometry_shader = NULL; + wined3d_shader_decref(shader); + } + if ((shader = state->pixel_shader)) { state->pixel_shader = NULL;

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXMATRIXSTACK.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 8c94757c2b6d84110b7fdc82125053e8f44fa236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c94757c2b6d84110b7fdc821… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 28 22:11:46 2012 +0100 d3dx9: Avoid LPD3DXMATRIXSTACK. --- dlls/d3dx9_36/math.c | 2 +- include/d3dx9math.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 12073e3..e09dbec 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -877,7 +877,7 @@ D3DXMATRIX* WINAPI D3DXMatrixTranspose(D3DXMATRIX *pout, CONST D3DXMATRIX *pm) static const unsigned int INITIAL_STACK_SIZE = 32; -HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, LPD3DXMATRIXSTACK *ppstack) +HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, ID3DXMatrixStack **ppstack) { struct ID3DXMatrixStackImpl *object; diff --git a/include/d3dx9math.h b/include/d3dx9math.h index 0f5dc7c..769e086 100644 --- a/include/d3dx9math.h +++ b/include/d3dx9math.h @@ -451,7 +451,7 @@ DECLARE_INTERFACE_(ID3DXMatrixStack, IUnknown) extern "C" { #endif -HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, LPD3DXMATRIXSTACK* ppstack); +HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, ID3DXMatrixStack **stack); #ifdef __cplusplus }

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXBASEMESH.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: d608de9341ccd75c0a6ce36901bf2cc806487338 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d608de9341ccd75c0a6ce3690… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 28 22:11:45 2012 +0100 d3dx9: Avoid LPD3DXBASEMESH. --- include/d3dx9mesh.h | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 76e7179..21261ab 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -782,7 +782,7 @@ HRESULT WINAPI D3DXComputeIMTFromSignal(ID3DXMesh *mesh, DWORD texture_idx, UINT LPD3DXUVATLASCB status_cb, void *status_ctx, ID3DXBuffer **buffer); HRESULT WINAPI D3DXComputeIMTFromTexture(struct ID3DXMesh *mesh, struct IDirect3DTexture9 *texture, DWORD texture_idx, DWORD options, LPD3DXUVATLASCB cb, void *ctx, struct ID3DXBuffer **out); -HRESULT WINAPI D3DXComputeNormals(LPD3DXBASEMESH, CONST DWORD *); +HRESULT WINAPI D3DXComputeNormals(ID3DXBaseMesh *mesh, const DWORD *adjacency); HRESULT WINAPI D3DXComputeTangentFrameEx(ID3DXMesh *mesh_in, DWORD texture_in_semantic, DWORD texture_in_idx, DWORD u_partial_out_semantic, DWORD u_partial_out_idx, DWORD v_partial_out_semantic, DWORD v_partial_out_idx, DWORD normal_out_semantic, DWORD normal_out_idx, DWORD flags, @@ -801,8 +801,11 @@ HRESULT WINAPI D3DXGenerateOutputDecl(D3DVERTEXELEMENT9 *, CONST D3DVERTEXELEMEN HRESULT WINAPI D3DXGeneratePMesh(ID3DXMesh *mesh, const DWORD *adjacency, const D3DXATTRIBUTEWEIGHTS *attribute_weights, const float *vertex_weights, DWORD min_value, DWORD flags, ID3DXPMesh **pmesh); -HRESULT WINAPI D3DXIntersect(LPD3DXBASEMESH, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, BOOL *, DWORD *, FLOAT *, FLOAT *, FLOAT *, LPD3DXBUFFER *, DWORD *); -HRESULT WINAPI D3DXIntersectSubset(LPD3DXBASEMESH, DWORD, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, BOOL *, DWORD *, FLOAT *, FLOAT *, FLOAT *, LPD3DXBUFFER *, DWORD *); +HRESULT WINAPI D3DXIntersect(ID3DXBaseMesh *mesh, const D3DXVECTOR3 *ray_position, const D3DXVECTOR3 *ray_direction, + BOOL *hit, DWORD *face_idx, float *u, float *v, float *distance, ID3DXBuffer **hits, DWORD *hit_count); +HRESULT WINAPI D3DXIntersectSubset(ID3DXBaseMesh *mesh, DWORD attribute_id, const D3DXVECTOR3 *ray_position, + const D3DXVECTOR3 *ray_direction, BOOL *hit, DWORD *face_idx, float *u, float *v, float *distance, + ID3DXBuffer **hits, DWORD *hit_count); BOOL WINAPI D3DXIntersectTri(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3*, FLOAT *, FLOAT *, FLOAT *); HRESULT WINAPI D3DXOptimizeFaces(LPCVOID, UINT, UINT, BOOL, DWORD *); HRESULT WINAPI D3DXOptimizeVertices(LPCVOID, UINT, UINT, BOOL, DWORD *);

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXMESH.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: d480f9e1a8c03029efa6604abe76d6873c75337c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d480f9e1a8c03029efa6604ab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 28 22:11:44 2012 +0100 d3dx9: Avoid LPD3DXMESH. --- dlls/d3dx9_36/mesh.c | 19 ++++------ dlls/d3dx9_36/skin.c | 16 ++++---- include/d3dx9anim.h | 2 +- include/d3dx9mesh.h | 91 +++++++++++++++++++++++++++++++++----------------- 4 files changed, 76 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d480f9e1a8c03029efa66…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 04bcba1c3ed777e23975bfe147087f28d257235b URL: http://source.winehq.org/git/wine.git/?a=commit;h=04bcba1c3ed777e23975bfe14… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Nov 28 22:48:10 2012 +0200 po: Update Lithuanian translation. --- po/lt.po | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index 0939da1..2f02cab 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-11-03 18:42+0300\n" +"PO-Revision-Date: 2012-11-28 22:47+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -10101,10 +10101,8 @@ msgid "Wine Command Prompt" msgstr "Wine komandų interpretatorius" #: cmd.rc:349 -#, fuzzy -#| msgid "CMD Version %1!S!\n" msgid "Wine CMD Version %1!S!\n" -msgstr "CMD versija %1!S!\n" +msgstr "Wine CMD versija %1!S!\n" #: cmd.rc:350 msgid "More? "

1 0

Andrew Talbot : shdocvw: Remove unused variable.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: acb1d678a982972255980628772330e23a9768a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acb1d678a9829722559806287… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 28 20:37:23 2012 +0000 shdocvw: Remove unused variable. --- dlls/shdocvw/shdocvw.h | 2 -- dlls/shdocvw/shdocvw_main.c | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index e741482..341cdc5 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -50,8 +50,6 @@ extern LONG SHDOCVW_refCount DECLSPEC_HIDDEN; static inline void SHDOCVW_LockModule(void) { InterlockedIncrement( &SHDOCVW_refCount ); } static inline void SHDOCVW_UnlockModule(void) { InterlockedDecrement( &SHDOCVW_refCount ); } -extern HINSTANCE shdocvw_hinstance DECLSPEC_HIDDEN; - /* memory allocation functions */ diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index db9034c..be1588c 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -41,7 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); LONG SHDOCVW_refCount = 0; -HINSTANCE shdocvw_hinstance = 0; static HMODULE SHDOCVW_hshell32 = 0; static HINSTANCE ieframe_instance; @@ -148,7 +147,6 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) switch (fdwReason) { case DLL_PROCESS_ATTACH: - shdocvw_hinstance = hinst; break; case DLL_PROCESS_DETACH: if (SHDOCVW_hshell32) FreeLibrary(SHDOCVW_hshell32);

1 0

Andrew Talbot : uxtheme: Remove unused variable.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 925a4411e8dac1e3fd9ff3c81736a2324d50b87c URL: http://source.winehq.org/git/wine.git/?a=commit;h=925a4411e8dac1e3fd9ff3c81… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 28 20:37:26 2012 +0000 uxtheme: Remove unused variable. --- dlls/uxtheme/msstyles.c | 1 - dlls/uxtheme/system.c | 3 --- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 0adb70d..8205a12 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -48,7 +48,6 @@ static BOOL MSSTYLES_GetNextToken(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LP static void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics); static HRESULT MSSTYLES_GetFont (LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LOGFONTW* logfont); -extern HINSTANCE hDllInst; extern int alphaBlendMode; #define MSSTYLES_VERSION 0x0003 diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 6ee1dac..8947587 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -57,7 +57,6 @@ static const WCHAR szDllName[] = {'D','l','l','N','a','m','e','\0'}; static const WCHAR szIniDocumentation[] = {'d','o','c','u','m','e','n','t','a','t','i','o','n','\0'}; -DECLSPEC_HIDDEN HINSTANCE hDllInst; DECLSPEC_HIDDEN ATOM atDialogThemeEnabled; static DWORD dwThemeAppProperties = STAP_ALLOW_NONCLIENT | STAP_ALLOW_CONTROLS; @@ -537,8 +536,6 @@ void UXTHEME_InitSystem(HINSTANCE hInst) 'u','x','_','d','i','a','l','o','g','t','h','e','m','e','\0' }; - hDllInst = hInst; - atWindowTheme = GlobalAddAtomW(szWindowTheme); atSubAppName = GlobalAddAtomW(szSubAppName); atSubIdList = GlobalAddAtomW(szSubIdList);

1 0

Andrew Talbot : winex11.drv: Remove unused variable.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 00360e7c03acc63c619573e1c706f7952f44a917 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00360e7c03acc63c619573e1c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 28 20:37:30 2012 +0000 winex11.drv: Remove unused variable. --- dlls/winex11.drv/palette.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index b9ad599..bd687ca 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -54,7 +54,6 @@ static PALETTEENTRY *COLOR_sysPal; /* current system palette */ static int COLOR_gapStart = 256; static int COLOR_gapEnd = -1; -static int COLOR_gapFilled = 0; UINT16 X11DRV_PALETTE_PaletteFlags = 0; @@ -670,7 +669,6 @@ static void X11DRV_PALETTE_FillDefaultColors( const PALETTEENTRY *sys_pal_templa if( --max <= 0 ) break; } } - COLOR_gapFilled = idx - COLOR_gapStart; } }

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
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