January 2012 - Wine-Commits

Nikolay Sivov : msxml3: Make remove() method a stub in version 6, more collection tests.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: wine Branch: master Commit: ca48dac8821e128db8991dc54b4dedc8c321e816 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca48dac8821e128db8991dc54… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 23 07:23:47 2012 +0300 msxml3: Make remove() method a stub in version 6, more collection tests. --- dlls/msxml3/schema.c | 2 + dlls/msxml3/tests/domdoc.c | 180 +++++++++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/schema.c | 104 +++++++++++++++++++++++-- 3 files changed, 275 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca48dac8821e128db8991…

1 0

Nikolay Sivov : msxml3: Try IStream if IPersistStream save failed.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: wine Branch: master Commit: 012806a0772087ffb77234a482acafd431173ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=012806a0772087ffb77234a48… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 23 10:31:55 2012 +0300 msxml3: Try IStream if IPersistStream save failed. --- dlls/msxml3/saxreader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 16b85ed..fb41c10 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2377,9 +2377,10 @@ static HRESULT internal_parse( if(hr != S_OK) { IStream_Release(stream); - break; + stream = NULL; } } + if(stream || IUnknown_QueryInterface(V_UNKNOWN(&varInput), &IID_IStream, (void**)&stream) == S_OK) {

1 0

Aric Stewart : winegstreamer: Update transform filters to use the correct csReceive critical section.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: wine Branch: master Commit: cb2d40275b4d3e7407130f29749a2decb53a48cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb2d40275b4d3e7407130f297… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sun Jan 22 21:45:14 2012 -0600 winegstreamer: Update transform filters to use the correct csReceive critical section. --- dlls/winegstreamer/gsttffilter.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index b113c4e..1286cd8 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -225,11 +225,11 @@ static HRESULT WINAPI Gstreamer_transform_ProcessData(TransformFilter *iface, IM int ret; TRACE("Reading %p\n", sample); - EnterCriticalSection(&This->tf.filter.csFilter); + EnterCriticalSection(&This->tf.csReceive); IMediaSample_GetPointer(sample, &data); buf = gst_app_buffer_new(data, IMediaSample_GetActualDataLength(sample), release_sample, sample); if (!buf) { - LeaveCriticalSection(&This->tf.filter.csFilter); + LeaveCriticalSection(&This->tf.csReceive); return S_OK; } gst_buffer_set_caps(buf, gst_pad_get_caps_reffed(This->my_src)); @@ -251,7 +251,7 @@ static HRESULT WINAPI Gstreamer_transform_ProcessData(TransformFilter *iface, IM GST_BUFFER_FLAG_SET(buf, GST_BUFFER_FLAG_PREROLL); if (IMediaSample_IsSyncPoint(sample) != S_OK) GST_BUFFER_FLAG_SET(buf, GST_BUFFER_FLAG_DELTA_UNIT); - LeaveCriticalSection(&This->tf.filter.csFilter); + LeaveCriticalSection(&This->tf.csReceive); ret = gst_pad_push(This->my_src, buf); if (ret) WARN("Sending returned: %i\n", ret); @@ -268,9 +268,9 @@ static HRESULT WINAPI Gstreamer_transform_ProcessEnd(TransformFilter *iface) { GstTfImpl *This = (GstTfImpl*)iface; int ret; - LeaveCriticalSection(&This->tf.filter.csFilter); + LeaveCriticalSection(&This->tf.csReceive); ret = gst_element_set_state(This->filter, GST_STATE_READY); - EnterCriticalSection(&This->tf.filter.csFilter); + EnterCriticalSection(&This->tf.csReceive); TRACE("Returned: %i\n", ret); return S_OK; }

1 0

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

Jan. 23, 2012

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: Introduce free_constant_table() .
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

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

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

Jan. 23, 2012

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: Reorder argument check in D3DXGetShaderConstantTableEx().
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

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

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

Jan. 23, 2012

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 Jan. 23, 2012

Jan. 23, 2012

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: Winelib isn' t limited to 32-bit.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: docs Branch: master Commit: 8ea3494b2db91e896125cf5d4f399f0979a1aeb7 URL: http://source.winehq.org/git/docs.git/?a=commit;h=8ea3494b2db91e896125cf5d4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 18 21:13:17 2012 +0100 winelib: Winelib isn't limited to 32-bit. --- en/winelib-intro.sgml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/en/winelib-intro.sgml b/en/winelib-intro.sgml index cfe8d8f..9148336 100644 --- a/en/winelib-intro.sgml +++ b/en/winelib-intro.sgml @@ -15,7 +15,7 @@ compiler (and even these are used when compiling Wine). </para> <para> - Thanks to the above, Winelib supports most C and C++ 32bit source code, + Thanks to the above, Winelib supports most C and C++ source code, resource and message files, and can generate graphical or console applications as well as dynamic libraries. </para>

1 0