wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Christian Costa : d3dxof: Prevent accessing pobj when it is null. This can happend on error.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 0eb9740e79ffd6908ced0bc2ff4203de3aaf448d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eb9740e79ffd6908ced0bc2f… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Jan 22 17:58:56 2012 +0100 d3dxof: Prevent accessing pobj when it is null. This can happend on error. --- dlls/d3dxof/d3dxof.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index ab13f17..3a6ce20 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -522,8 +522,11 @@ static ULONG WINAPI IDirectXFileDataImpl_Release(IDirectXFileData* iface) if (!This->level && !This->from_ref) { HeapFree(GetProcessHeap(), 0, This->pstrings); - HeapFree(GetProcessHeap(), 0, This->pobj->pdata); - HeapFree(GetProcessHeap(), 0, This->pobj); + if (This->pobj) + { + HeapFree(GetProcessHeap(), 0, This->pobj->pdata); + HeapFree(GetProcessHeap(), 0, This->pobj); + } } HeapFree(GetProcessHeap(), 0, This); }

1 0

Christian Costa : d3dxof: Make sure This->buf. pdata is set to NULL before being used in case of error.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 310c174eee2170395e2e3c21347d1525ae14c0bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=310c174eee2170395e2e3c213… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Jan 22 17:44:01 2012 +0100 d3dxof: Make sure This->buf.pdata is set to NULL before being used in case of error. --- dlls/d3dxof/d3dxof.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 8678396..ab13f17 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -963,6 +963,9 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE This->buf.pxo_globals = This->xobjects; This->buf.nb_pxo_globals = This->nb_xobjects; This->buf.level = 0; + This->buf.pdata = NULL; + This->buf.capacity = 0; + This->buf.cur_pos_data = 0; This->buf.pxo_tab = HeapAlloc(GetProcessHeap(), 0, sizeof(xobject)*MAX_SUBOBJECTS); if (!This->buf.pxo_tab) @@ -973,9 +976,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE } This->buf.pxo = This->xobjects[This->nb_xobjects] = This->buf.pxo_tab; - This->buf.pxo->pdata = This->buf.pdata = NULL; - This->buf.capacity = 0; - This->buf.cur_pos_data = 0; + This->buf.pxo->pdata = NULL; This->buf.pxo->nb_subobjects = 1; pstrings = HeapAlloc(GetProcessHeap(), 0, MAX_STRINGS_BUFFER);

1 0

Christian Costa : dmusic: Fix memory leak in Direct Music object.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: d3fb586024cad4d2f9e7bb3a51346f9e7e1cb7c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3fb586024cad4d2f9e7bb3a5… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Jan 22 15:10:28 2012 +0100 dmusic: Fix memory leak in Direct Music object. --- dlls/dmusic/dmusic.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 09c63ea..e4678e1 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -56,6 +56,7 @@ static ULONG WINAPI IDirectMusic8Impl_Release (LPDIRECTMUSIC8 iface) { TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); if (!refCount) { + HeapFree(GetProcessHeap(), 0, This->ppPorts); HeapFree(GetProcessHeap(), 0, This); }

1 0

Rico Schüller : d3dx9: Fix constant table trace.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 7b3863fec0134cf85a3125c0dc965e2c404c9d39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b3863fec0134cf85a3125c0d… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Jan 22 11:29:32 2012 +0100 d3dx9: Fix constant table trace. --- dlls/d3dx9_36/shader.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index eff3935..29b4f6e 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1223,12 +1223,9 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD *byte_code, object->desc.Creator = ctab_header->Creator ? object->ctab + ctab_header->Creator : NULL; object->desc.Version = ctab_header->Version; object->desc.Constants = ctab_header->Constants; - if (object->desc.Creator) - TRACE("Creator = %s\n", object->desc.Creator); - TRACE("Version = %x\n", object->desc.Version); - TRACE("Constants = %d\n", ctab_header->Constants); - if (ctab_header->Target) - TRACE("Target = %s\n", object->ctab + ctab_header->Target); + TRACE("Creator %s, Version %x, Constants %u, Target %s\n", + debugstr_a(object->desc.Creator), object->desc.Version, object->desc.Constants, + debugstr_a(ctab_header->Target ? object->ctab + ctab_header->Target : NULL)); if (object->desc.Constants > 65535) {

1 0

Rico Schüller : d3dx9: Reorder argument check in D3DXGetShaderConstantTableEx().
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 6ad34b161f57a95d124de5a306088b337be5edc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad34b161f57a95d124de5a30… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Jan 22 11:29:08 2012 +0100 d3dx9: Reorder argument check in D3DXGetShaderConstantTableEx(). --- dlls/d3dx9_36/shader.c | 35 +++++++++++++++++++++-------------- 1 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 775899d..eff3935 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1175,11 +1175,30 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD *byte_code, TRACE("(%p, %x, %p)\n", byte_code, flags, constant_table); if (!byte_code || !constant_table) + { + WARN("Invalid argument specified.\n"); return D3DERR_INVALIDCALL; + } hr = D3DXFindShaderComment(byte_code, MAKEFOURCC('C','T','A','B'), &data, &size); if (hr != D3D_OK) + { + WARN("CTAB not found.\n"); + return D3DXERR_INVALIDDATA; + } + + if (size < sizeof(D3DXSHADER_CONSTANTTABLE)) + { + WARN("Invalid CTAB size.\n"); + return D3DXERR_INVALIDDATA; + } + + ctab_header = (const D3DXSHADER_CONSTANTTABLE *)data; + if (ctab_header->Size != sizeof(D3DXSHADER_CONSTANTTABLE)) + { + WARN("Invalid D3DXSHADER_CONSTANTTABLE size.\n"); return D3DXERR_INVALIDDATA; + } object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) @@ -1191,28 +1210,16 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD *byte_code, object->ID3DXConstantTable_iface.lpVtbl = &ID3DXConstantTable_Vtbl; object->ref = 1; - if (size < sizeof(D3DXSHADER_CONSTANTTABLE)) - { - hr = D3DXERR_INVALIDDATA; - goto error; - } - object->ctab = HeapAlloc(GetProcessHeap(), 0, size); if (!object->ctab) { ERR("Out of memory\n"); - hr = E_OUTOFMEMORY; - goto error; + HeapFree(GetProcessHeap(), 0, object); + return E_OUTOFMEMORY; } object->size = size; memcpy(object->ctab, data, object->size); - ctab_header = (const D3DXSHADER_CONSTANTTABLE*)data; - if (ctab_header->Size != sizeof(D3DXSHADER_CONSTANTTABLE)) - { - hr = D3DXERR_INVALIDDATA; - goto error; - } object->desc.Creator = ctab_header->Creator ? object->ctab + ctab_header->Creator : NULL; object->desc.Version = ctab_header->Version; object->desc.Constants = ctab_header->Constants;

1 0

Rico Schüller : d3dx9: Get rid of ID3DXConstantTableImpl typedef.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 59b365f9bb2dcc1b39496d6ea8368df1c91367a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59b365f9bb2dcc1b39496d6ea… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Jan 22 11:29:03 2012 +0100 d3dx9: Get rid of ID3DXConstantTableImpl typedef. --- dlls/d3dx9_36/shader.c | 114 +++++++++++++++++++++++------------------------ 1 files changed, 56 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59b365f9bb2dcc1b39496…

1 0

Rico Schüller : d3dx9: Introduce free_constant_table() .
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: wine Branch: master Commit: 4a6e06d7bbf3228f91f117f8d61cfa82917ffc01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a6e06d7bbf3228f91f117f8d… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Jan 22 11:28:52 2012 +0100 d3dx9: Introduce free_constant_table(). --- dlls/d3dx9_36/shader.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index fd7e6b7..9a9d77c 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -632,6 +632,12 @@ typedef struct ID3DXConstantTableImpl { ctab_constant *constants; } ID3DXConstantTableImpl; +static void free_constant_table(struct ID3DXConstantTableImpl *table) +{ + HeapFree(GetProcessHeap(), 0, table->constants); + HeapFree(GetProcessHeap(), 0, table->ctab); +} + static inline ID3DXConstantTableImpl *impl_from_ID3DXConstantTable(ID3DXConstantTable *iface) { return CONTAINING_RECORD(iface, ID3DXConstantTableImpl, ID3DXConstantTable_iface); @@ -681,7 +687,7 @@ static ULONG WINAPI ID3DXConstantTableImpl_AddRef(ID3DXConstantTable* iface) return InterlockedIncrement(&This->ref); } -static ULONG WINAPI ID3DXConstantTableImpl_Release(ID3DXConstantTable* iface) +static ULONG WINAPI ID3DXConstantTableImpl_Release(ID3DXConstantTable *iface) { ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); ULONG ref = InterlockedDecrement(&This->ref); @@ -690,8 +696,7 @@ static ULONG WINAPI ID3DXConstantTableImpl_Release(ID3DXConstantTable* iface) if (!ref) { - HeapFree(GetProcessHeap(), 0, This->constants); - HeapFree(GetProcessHeap(), 0, This->ctab); + free_constant_table(This); HeapFree(GetProcessHeap(), 0, This); } @@ -1258,8 +1263,7 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* byte_code, error: - HeapFree(GetProcessHeap(), 0, object->constants); - HeapFree(GetProcessHeap(), 0, object->ctab); + free_constant_table(object); HeapFree(GetProcessHeap(), 0, object); return hr;

1 0

André Hentschel : winelib: Update information about winemaker's Makefiles.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: docs Branch: master Commit: 3e1c8092db42fd47af1fd882776887a8ee41a118 URL: http://source.winehq.org/git/docs.git/?a=commit;h=3e1c8092db42fd47af1fd8827… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 18 21:13:42 2012 +0100 winelib: Update information about winemaker's Makefiles. --- en/winelib-toolkit.sgml | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/en/winelib-toolkit.sgml b/en/winelib-toolkit.sgml index 1af66ac..2a262f2 100644 --- a/en/winelib-toolkit.sgml +++ b/en/winelib-toolkit.sgml @@ -217,13 +217,14 @@ SRCDIR = . SUBDIRS = DLLS = +LIBS = EXES = hello.exe </programlisting> <para> This is where the targets for this directory are listed. The names are pretty self-explanatory. <varname>SUBDIRS</varname> is usually only present in the top-level makefile. For libraries and - executables, specify the full name, including the '.dll' or '.exe' + executables, specify the full name, including the '.dll', '.a' or '.exe' extension. Note that these names must be in all lowercase. </para> <programlisting> @@ -232,6 +233,7 @@ EXES = hello.exe DEFINES = -DSTRICT INCLUDE_PATH = DLL_PATH = +DLL_IMPORTS = LIBRARY_PATH = LIBRARIES = </programlisting> @@ -240,23 +242,22 @@ LIBRARIES = to all the targets in this makefile. The <varname>LIBRARIES</> variable allows you to specify additional Unix libraries to link with. Note that you would normally not specify Winelib libraries - there. To link with a Winelib library, one uses the <varname>DLLS</> - variables of the Makefile. The exception is for C++ libraries where - you currently don't have a choice but to link with them in the - Unix sense. One library you are likely to find here is - <literal>mfc</> (note, the '-l' is omitted). + there. To link with a Winelib library, one uses <varname>DLL_IMPORTS</> + The exception is for C++ libraries where you currently don't have + a choice but to link with them in the Unix sense. One library you are + likely to find here is <literal>mfc</>. </para> <para> The other variable names should be self-explanatory. There are also <varname>CEXTRA</varname>, <varname>CXXEXTRA</varname> and - <varname>RCEXTRA</varname>(usually not present in the file) which + <varname>RCEXTRA</varname> which allow you to specify additional flags for, respectively, the C compiler, the C++ compiler and the resource compiler. - Finally note that all these variable contain the option's name. + Finally note that all these variables contain the option's name. </para> <para> - Then come one section per target, each describing the various + Then there is one section per target, each describing the various components that target is made of. </para> <programlisting> @@ -291,7 +292,8 @@ hello_exe_LIBRARIES = </para> <programlisting> hello_exe_OBJS = $(hello_exe_C_SRCS:.c=.o) \ - $(hello_exe_CXX_SRCS:.cpp=.o) + $(hello_exe_CXX_SRCS:.cpp=.o) \ + $(hello_exe_RC_SRCS:.rc=.res) </programlisting> <para> The above just builds a list of all the object files that @@ -311,7 +313,7 @@ RC_SRCS = $(hello_exe_RC_SRCS) <programlisting> ### Generic targets -all: $(SUBDIRS) $(DLLS:%=%.so) $(EXES:%=%.so) +all: $(SUBDIRS) $(DLLS:%=%.so) $(LIBS) $(EXES) </programlisting> <para> The above first defines the default target for this makefile. Here

1 0

André Hentschel : winelib: Update library name for uuid.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: docs Branch: master Commit: 145a5065482831d2186495a59c01533a16271f46 URL: http://source.winehq.org/git/docs.git/?a=commit;h=145a5065482831d2186495a59… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 18 21:13:33 2012 +0100 winelib: Update library name for uuid. --- en/winelib-porting.sgml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/en/winelib-porting.sgml b/en/winelib-porting.sgml index 00560a2..7a523cf 100644 --- a/en/winelib-porting.sgml +++ b/en/winelib-porting.sgml @@ -134,7 +134,7 @@ </para> <para> If you are missing GUIDs at the link stage, add - <parameter>-lwine_uuid</parameter> to the link line. + <parameter>-luuid</parameter> to the link line. </para> <para> gcc is more strict than VC++, especially when compiling

1 0

André Hentschel : winelib: Remove empty wmc section.
by Alexandre Julliard 23 Jan '12

23 Jan '12

Module: docs Branch: master Commit: 00c23b838f255f56fa1ca143a8cd55b4b5ce7e73 URL: http://source.winehq.org/git/docs.git/?a=commit;h=00c23b838f255f56fa1ca143a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 18 21:15:13 2012 +0100 winelib: Remove empty wmc section. --- en/winelib-toolkit.sgml | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/en/winelib-toolkit.sgml b/en/winelib-toolkit.sgml index c162a0a..1af66ac 100644 --- a/en/winelib-toolkit.sgml +++ b/en/winelib-toolkit.sgml @@ -419,13 +419,6 @@ WRCFLAGS = -r -L </para> </sect1> - <sect1 id="wmc"> - <title id="wmc.title">Compiling message files: WMC</title> - <para> - how does one use it??? - </para> - </sect1> - <sect1 id="spec-file"> <title id="spec-file.title">The Spec file</title>

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
98
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 January 2012