December 2010 - Wine-commits

Alexandre Julliard : configure: Add a generic mechanism for passing flags to dll and program rules.
by Alexandre Julliard 28 Dec '10

28 Dec '10

Module: wine Branch: master Commit: 6cce7fa0ce3ef6a7884008080e84dd5e7fc3831d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cce7fa0ce3ef6a7884008080… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 28 15:42:43 2010 +0100 configure: Add a generic mechanism for passing flags to dll and program rules. --- aclocal.m4 | 29 ++-- configure | 339 ++++++++++++++++++++-------------------- configure.ac | 428 +++++++++++++++++++++++++------------------------- tools/make_makefiles | 18 ++- 4 files changed, 413 insertions(+), 401 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6cce7fa0ce3ef6a788400…

1 0

Rico Schüller : d3dcompiler: Add initial SHDR and SHEX parsing.
by Alexandre Julliard 28 Dec '10

28 Dec '10

Module: wine Branch: master Commit: 127d07a3ccbb7ef9446e2eb1e78a514e644959d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=127d07a3ccbb7ef9446e2eb1e… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Dec 28 11:50:13 2010 +0100 d3dcompiler: Add initial SHDR and SHEX parsing. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 3 +++ dlls/d3dcompiler_43/reflection.c | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 91cce9e..d69b88c 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -72,6 +72,7 @@ struct d3dcompiler_shader_reflection char *creator; UINT flags; + UINT version; UINT bound_resource_count; UINT constant_buffer_count; @@ -630,6 +631,8 @@ void SlDeleteShader(struct bwriter_shader *shader) DECLSPEC_HIDDEN; #define TAG_PCSG MAKE_TAG('P', 'C', 'S', 'G') #define TAG_RDEF MAKE_TAG('R', 'D', 'E', 'F') #define TAG_SDBG MAKE_TAG('S', 'D', 'B', 'G') +#define TAG_SHDR MAKE_TAG('S', 'H', 'D', 'R') +#define TAG_SHEX MAKE_TAG('S', 'H', 'E', 'X') #define TAG_STAT MAKE_TAG('S', 'T', 'A', 'T') #define TAG_XNAP MAKE_TAG('X', 'N', 'A', 'P') #define TAG_XNAS MAKE_TAG('X', 'N', 'A', 'S') diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index eb01db8..b3b7055 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -556,6 +556,18 @@ HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature *s, cons return S_OK; } +static HRESULT d3dcompiler_parse_shdr(struct d3dcompiler_shader_reflection *r, const char *data, DWORD data_size) +{ + const char *ptr = data; + + read_dword(&ptr, &r->version); + TRACE("Shader version: %u\n", r->version); + + /* todo: Check if anything else is needed from the shdr or shex blob. */ + + return S_OK; +} + HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection *reflection, const void *data, SIZE_T data_size) { @@ -588,6 +600,16 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection } break; + case TAG_SHEX: + case TAG_SHDR: + hr = d3dcompiler_parse_shdr(reflection, section->data, section->data_size); + if (FAILED(hr)) + { + WARN("Failed to parse SHDR section.\n"); + goto err_out; + } + break; + case TAG_RDEF: hr = d3dcompiler_parse_rdef(reflection, section->data, section->data_size); if (FAILED(hr))

1 0

Rico Schüller : d3dcompiler: Implement ID3D11ReflectionInterface::GetDesc().
by Alexandre Julliard 28 Dec '10

28 Dec '10

Module: wine Branch: master Commit: ba9d311f0d176779495707b9efc890aa2eafe31c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba9d311f0d176779495707b9e… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Dec 28 11:50:16 2010 +0100 d3dcompiler: Implement ID3D11ReflectionInterface::GetDesc(). --- dlls/d3dcompiler_43/reflection.c | 51 ++++++++++++++++++++++++++++++++++++- 1 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index b3b7055..4b0467a 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -137,9 +137,56 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_Release(ID3D11Shade static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetDesc(ID3D11ShaderReflection *iface, D3D11_SHADER_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); - return E_NOTIMPL; + FIXME("iface %p, desc %p partial stub!\n", iface, desc); + + if (!desc) + { + WARN("Invalid argument specified\n"); + return E_FAIL; + } + + desc->Version = This->version; + desc->Creator = This->creator; + desc->Flags = This->flags; + desc->ConstantBuffers = This->constant_buffer_count; + desc->BoundResources = This->bound_resource_count; + desc->InputParameters = This->isgn ? This->isgn->element_count : 0; + desc->OutputParameters = This->osgn ? This->osgn->element_count : 0; + desc->InstructionCount = This->instruction_count; + desc->TempRegisterCount = This->temp_register_count; + desc->TempArrayCount = This->temp_array_count; + desc->DefCount = 0; + desc->DclCount = This->dcl_count; + desc->TextureNormalInstructions = This->texture_normal_instructions; + desc->TextureLoadInstructions = This->texture_load_instructions; + desc->TextureCompInstructions = This->texture_comp_instructions; + desc->TextureBiasInstructions = This->texture_bias_instructions; + desc->TextureGradientInstructions = This->texture_gradient_instructions; + desc->FloatInstructionCount = This->float_instruction_count; + desc->IntInstructionCount = This->int_instruction_count; + desc->UintInstructionCount = This->uint_instruction_count; + desc->StaticFlowControlCount = This->static_flow_control_count; + desc->DynamicFlowControlCount = This->dynamic_flow_control_count; + desc->MacroInstructionCount = 0; + desc->ArrayInstructionCount = This->array_instruction_count; + desc->CutInstructionCount = This->cut_instruction_count; + desc->EmitInstructionCount = This->emit_instruction_count; + desc->GSOutputTopology = This->gs_output_topology; + desc->GSMaxOutputVertexCount = This->gs_max_output_vertex_count; + desc->InputPrimitive = This->input_primitive; + desc->PatchConstantParameters = This->pcsg ? This->pcsg->element_count : 0; + desc->cGSInstanceCount = 0; + desc->cControlPoints = This->c_control_points; + desc->HSOutputPrimitive = This->hs_output_primitive; + desc->HSPartitioning = This->hs_prtitioning; + desc->TessellatorDomain = This->tessellator_domain; + desc->cBarrierInstructions = 0; + desc->cInterlockedInstructions = 0; + desc->cTextureStoreInstructions = 0; + + return S_OK; } static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetConstantBufferByIndex(

1 0

Greg Geldorp : shell32/tests: Fix race conditions.
by Alexandre Julliard 28 Dec '10

28 Dec '10

Module: wine Branch: master Commit: 519c28894693bc2e597fc794d9114d5ccb1cd311 URL: http://source.winehq.org/git/wine.git/?a=commit;h=519c28894693bc2e597fc794d… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Tue Dec 28 13:34:11 2010 +0100 shell32/tests: Fix race conditions. --- dlls/shell32/tests/shlexec.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index c32a065..252aed7 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -57,6 +57,7 @@ static char tmpdir[MAX_PATH]; static char child_file[MAX_PATH]; static DLLVERSIONINFO dllver; static BOOL skip_noassoc_tests = FALSE; +static HANDLE dde_ready_event; /*** @@ -572,13 +573,14 @@ static void doChild(int argc, char** argv) timer = SetTimer(NULL, 0, 2500, childTimeout); - dde_ready = CreateEvent(NULL, FALSE, FALSE, "winetest_shlexec_dde_ready"); + dde_ready = OpenEvent(EVENT_MODIFY_STATE, FALSE, "winetest_shlexec_dde_ready"); SetEvent(dde_ready); CloseHandle(dde_ready); while (GetMessage(&msg, NULL, 0, 0)) DispatchMessage(&msg); + Sleep(500); KillTimer(NULL, timer); assert(DdeNameService(ddeInst, hszApplication, 0L, DNS_UNREGISTER)); assert(DdeFreeStringHandle(ddeInst, hszTopic)); @@ -587,7 +589,7 @@ static void doChild(int argc, char** argv) } else { - dde_ready = CreateEvent(NULL, FALSE, FALSE, "winetest_shlexec_dde_ready"); + dde_ready = OpenEvent(EVENT_MODIFY_STATE, FALSE, "winetest_shlexec_dde_ready"); SetEvent(dde_ready); CloseHandle(dde_ready); } @@ -1613,14 +1615,7 @@ static dde_tests_t dde_tests[] = static DWORD WINAPI hooked_WaitForInputIdle(HANDLE process, DWORD timeout) { - HANDLE dde_ready; - DWORD wait_result; - - dde_ready = CreateEventA(NULL, FALSE, FALSE, "winetest_shlexec_dde_ready"); - wait_result = WaitForSingleObject(dde_ready, timeout); - CloseHandle(dde_ready); - - return wait_result; + return WaitForSingleObject(dde_ready_event, timeout); } /* @@ -1732,7 +1727,9 @@ static void test_dde(void) } ddeExec[0] = 0; + dde_ready_event = CreateEventA(NULL, FALSE, FALSE, "winetest_shlexec_dde_ready"); rc = shell_execute_ex(SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI, NULL, filename, NULL, NULL); + CloseHandle(dde_ready_event); if ((test->todo & 0x1)==0) { ok(32 < rc, "%s failed: rc=%d err=%d\n", shell_call,

1 0

Michael Stefaniuc : avifil32: Use an iface instead of a vtbl pointer in IAVIStreamImpl.
by Alexandre Julliard 28 Dec '10

28 Dec '10

Module: wine Branch: master Commit: a45ae7ba889e0813e82c437a91d49ac6e6454f86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a45ae7ba889e0813e82c437a9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 27 23:12:14 2010 +0100 avifil32: Use an iface instead of a vtbl pointer in IAVIStreamImpl. --- dlls/avifil32/icmstream.c | 39 ++++++++++++++++++++++----------------- 1 files changed, 22 insertions(+), 17 deletions(-) diff --git a/dlls/avifil32/icmstream.c b/dlls/avifil32/icmstream.c index dba120b..58d7790 100644 --- a/dlls/avifil32/icmstream.c +++ b/dlls/avifil32/icmstream.c @@ -72,8 +72,8 @@ static const struct IAVIStreamVtbl iicmst = { typedef struct _IAVIStreamImpl { /* IUnknown stuff */ - const IAVIStreamVtbl *lpVtbl; - LONG ref; + IAVIStream IAVIStream_iface; + LONG ref; /* IAVIStream stuff */ PAVISTREAM pStream; @@ -107,6 +107,11 @@ static HRESULT AVIFILE_EncodeFrame(IAVIStreamImpl *This, LPBITMAPINFOHEADER lpbi, LPVOID lpBits); static HRESULT AVIFILE_OpenGetFrame(IAVIStreamImpl *This); +static inline IAVIStreamImpl *impl_from_IAVIStream(IAVIStream *iface) +{ + return CONTAINING_RECORD(iface, IAVIStreamImpl, IAVIStream_iface); +} + static inline void AVIFILE_Reset(IAVIStreamImpl *This) { This->lCurrent = -1; @@ -128,10 +133,10 @@ HRESULT AVIFILE_CreateICMStream(REFIID riid, LPVOID *ppv) if (pstream == NULL) return AVIERR_MEMORY; - pstream->lpVtbl = &iicmst; + pstream->IAVIStream_iface.lpVtbl = &iicmst; AVIFILE_Reset(pstream); - hr = IAVIStream_QueryInterface((IAVIStream*)pstream, riid, ppv); + hr = IAVIStream_QueryInterface(&pstream->IAVIStream_iface, riid, ppv); if (FAILED(hr)) HeapFree(GetProcessHeap(), 0, pstream); @@ -141,7 +146,7 @@ HRESULT AVIFILE_CreateICMStream(REFIID riid, LPVOID *ppv) static HRESULT WINAPI ICMStream_fnQueryInterface(IAVIStream *iface, REFIID refiid, LPVOID *obj) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(refiid), obj); @@ -158,7 +163,7 @@ static HRESULT WINAPI ICMStream_fnQueryInterface(IAVIStream *iface, static ULONG WINAPI ICMStream_fnAddRef(IAVIStream *iface) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) -> %d\n", iface, ref); @@ -172,7 +177,7 @@ static ULONG WINAPI ICMStream_fnAddRef(IAVIStream *iface) static ULONG WINAPI ICMStream_fnRelease(IAVIStream* iface) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) -> %d\n", iface, ref); @@ -231,7 +236,7 @@ static ULONG WINAPI ICMStream_fnRelease(IAVIStream* iface) static HRESULT WINAPI ICMStream_fnCreate(IAVIStream *iface, LPARAM lParam1, LPARAM lParam2) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); ICINFO icinfo; ICCOMPRESSFRAMES icFrames; @@ -320,7 +325,7 @@ static HRESULT WINAPI ICMStream_fnCreate(IAVIStream *iface, LPARAM lParam1, static HRESULT WINAPI ICMStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi, LONG size) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,%p,%d)\n", iface, psi, size); @@ -339,7 +344,7 @@ static HRESULT WINAPI ICMStream_fnInfo(IAVIStream *iface,LPAVISTREAMINFOW psi, static LONG WINAPI ICMStream_fnFindSample(IAVIStream *iface, LONG pos, LONG flags) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,%d,0x%08X)\n",iface,pos,flags); @@ -376,7 +381,7 @@ static LONG WINAPI ICMStream_fnFindSample(IAVIStream *iface, LONG pos, static HRESULT WINAPI ICMStream_fnReadFormat(IAVIStream *iface, LONG pos, LPVOID format, LONG *formatsize) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); LPBITMAPINFOHEADER lpbi; HRESULT hr; @@ -427,7 +432,7 @@ static HRESULT WINAPI ICMStream_fnReadFormat(IAVIStream *iface, LONG pos, static HRESULT WINAPI ICMStream_fnSetFormat(IAVIStream *iface, LONG pos, LPVOID format, LONG formatsize) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,%d,%p,%d)\n", iface, pos, format, formatsize); @@ -579,7 +584,7 @@ static HRESULT WINAPI ICMStream_fnRead(IAVIStream *iface, LONG start, LONG buffersize, LPLONG bytesread, LPLONG samplesread) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); LPBITMAPINFOHEADER lpbi; @@ -673,7 +678,7 @@ static HRESULT WINAPI ICMStream_fnWrite(IAVIStream *iface, LONG start, LPLONG sampwritten, LPLONG byteswritten) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); HRESULT hr; @@ -718,7 +723,7 @@ static HRESULT WINAPI ICMStream_fnWrite(IAVIStream *iface, LONG start, static HRESULT WINAPI ICMStream_fnDelete(IAVIStream *iface, LONG start, LONG samples) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,%d,%d)\n", iface, start, samples); @@ -728,7 +733,7 @@ static HRESULT WINAPI ICMStream_fnDelete(IAVIStream *iface, LONG start, static HRESULT WINAPI ICMStream_fnReadData(IAVIStream *iface, DWORD fcc, LPVOID lp, LPLONG lpread) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,0x%08X,%p,%p)\n", iface, fcc, lp, lpread); @@ -740,7 +745,7 @@ static HRESULT WINAPI ICMStream_fnReadData(IAVIStream *iface, DWORD fcc, static HRESULT WINAPI ICMStream_fnWriteData(IAVIStream *iface, DWORD fcc, LPVOID lp, LONG size) { - IAVIStreamImpl *This = (IAVIStreamImpl *)iface; + IAVIStreamImpl *This = impl_from_IAVIStream(iface); TRACE("(%p,0x%08x,%p,%d)\n", iface, fcc, lp, size);

1 0

Michael Stefaniuc : avifil32: Reorder some code to avoid forward declarations for the IAVIStreamVtbl methods .
by Alexandre Julliard 28 Dec '10

28 Dec '10

Module: wine Branch: master Commit: 61d84d68bbd170a6ab459386547fe1dfb0acb372 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61d84d68bbd170a6ab4593865… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 27 23:16:22 2010 +0100 avifil32: Reorder some code to avoid forward declarations for the IAVIStreamVtbl methods. --- dlls/avifil32/icmstream.c | 95 +++++++++++++++++++-------------------------- 1 files changed, 40 insertions(+), 55 deletions(-) diff --git a/dlls/avifil32/icmstream.c b/dlls/avifil32/icmstream.c index 58d7790..31dd2be 100644 --- a/dlls/avifil32/icmstream.c +++ b/dlls/avifil32/icmstream.c @@ -38,38 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(avifile); /***********************************************************************/ -static HRESULT WINAPI ICMStream_fnQueryInterface(IAVIStream*iface,REFIID refiid,LPVOID *obj); -static ULONG WINAPI ICMStream_fnAddRef(IAVIStream*iface); -static ULONG WINAPI ICMStream_fnRelease(IAVIStream* iface); -static HRESULT WINAPI ICMStream_fnCreate(IAVIStream*iface,LPARAM lParam1,LPARAM lParam2); -static HRESULT WINAPI ICMStream_fnInfo(IAVIStream*iface,AVISTREAMINFOW *psi,LONG size); -static LONG WINAPI ICMStream_fnFindSample(IAVIStream*iface,LONG pos,LONG flags); -static HRESULT WINAPI ICMStream_fnReadFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG *formatsize); -static HRESULT WINAPI ICMStream_fnSetFormat(IAVIStream*iface,LONG pos,LPVOID format,LONG formatsize); -static HRESULT WINAPI ICMStream_fnRead(IAVIStream*iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,LONG *bytesread,LONG *samplesread); -static HRESULT WINAPI ICMStream_fnWrite(IAVIStream*iface,LONG start,LONG samples,LPVOID buffer,LONG buffersize,DWORD flags,LONG *sampwritten,LONG *byteswritten); -static HRESULT WINAPI ICMStream_fnDelete(IAVIStream*iface,LONG start,LONG samples); -static HRESULT WINAPI ICMStream_fnReadData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG *lpread); -static HRESULT WINAPI ICMStream_fnWriteData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG size); -static HRESULT WINAPI ICMStream_fnSetInfo(IAVIStream*iface,AVISTREAMINFOW*info,LONG infolen); - -static const struct IAVIStreamVtbl iicmst = { - ICMStream_fnQueryInterface, - ICMStream_fnAddRef, - ICMStream_fnRelease, - ICMStream_fnCreate, - ICMStream_fnInfo, - ICMStream_fnFindSample, - ICMStream_fnReadFormat, - ICMStream_fnSetFormat, - ICMStream_fnRead, - ICMStream_fnWrite, - ICMStream_fnDelete, - ICMStream_fnReadData, - ICMStream_fnWriteData, - ICMStream_fnSetInfo -}; - typedef struct _IAVIStreamImpl { /* IUnknown stuff */ IAVIStream IAVIStream_iface; @@ -120,29 +88,6 @@ static inline void AVIFILE_Reset(IAVIStreamImpl *This) This->dwUnusedBytes = 0; } -HRESULT AVIFILE_CreateICMStream(REFIID riid, LPVOID *ppv) -{ - IAVIStreamImpl *pstream; - HRESULT hr; - - assert(riid != NULL && ppv != NULL); - - *ppv = NULL; - - pstream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IAVIStreamImpl)); - if (pstream == NULL) - return AVIERR_MEMORY; - - pstream->IAVIStream_iface.lpVtbl = &iicmst; - AVIFILE_Reset(pstream); - - hr = IAVIStream_QueryInterface(&pstream->IAVIStream_iface, riid, ppv); - if (FAILED(hr)) - HeapFree(GetProcessHeap(), 0, pstream); - - return hr; -} - static HRESULT WINAPI ICMStream_fnQueryInterface(IAVIStream *iface, REFIID refiid, LPVOID *obj) { @@ -762,6 +707,46 @@ static HRESULT WINAPI ICMStream_fnSetInfo(IAVIStream *iface, return E_FAIL; } +static const struct IAVIStreamVtbl iicmst = { + ICMStream_fnQueryInterface, + ICMStream_fnAddRef, + ICMStream_fnRelease, + ICMStream_fnCreate, + ICMStream_fnInfo, + ICMStream_fnFindSample, + ICMStream_fnReadFormat, + ICMStream_fnSetFormat, + ICMStream_fnRead, + ICMStream_fnWrite, + ICMStream_fnDelete, + ICMStream_fnReadData, + ICMStream_fnWriteData, + ICMStream_fnSetInfo +}; + +HRESULT AVIFILE_CreateICMStream(REFIID riid, LPVOID *ppv) +{ + IAVIStreamImpl *pstream; + HRESULT hr; + + assert(riid != NULL && ppv != NULL); + + *ppv = NULL; + + pstream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IAVIStreamImpl)); + if (pstream == NULL) + return AVIERR_MEMORY; + + pstream->IAVIStream_iface.lpVtbl = &iicmst; + AVIFILE_Reset(pstream); + + hr = IAVIStream_QueryInterface(&pstream->IAVIStream_iface, riid, ppv); + if (FAILED(hr)) + HeapFree(GetProcessHeap(), 0, pstream); + + return hr; +} + /***********************************************************************/ static HRESULT AVIFILE_EncodeFrame(IAVIStreamImpl *This,

1 0

Michael Stefaniuc : avifil32: Use an iface instead of a vtbl pointer in IGetFrameImpl.
by Alexandre Julliard 28 Dec '10

28 Dec '10

Module: wine Branch: master Commit: 157480df1a00f041706fa91d405be36b2c2dd00a URL: http://source.winehq.org/git/wine.git/?a=commit;h=157480df1a00f041706fa91d4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 27 23:18:54 2010 +0100 avifil32: Use an iface instead of a vtbl pointer in IGetFrameImpl. --- dlls/avifil32/getframe.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c index db05f85..6f3e6ba 100644 --- a/dlls/avifil32/getframe.c +++ b/dlls/avifil32/getframe.c @@ -62,7 +62,7 @@ static const struct IGetFrameVtbl igetframeVtbl = { typedef struct _IGetFrameImpl { /* IUnknown stuff */ - const IGetFrameVtbl *lpVtbl; + IGetFrame IGetFrame_iface; LONG ref; /* IGetFrame stuff */ @@ -92,6 +92,11 @@ typedef struct _IGetFrameImpl { /***********************************************************************/ +static inline IGetFrameImpl *impl_from_IGetFrame(IGetFrame *iface) +{ + return CONTAINING_RECORD(iface, IGetFrameImpl, IGetFrame_iface); +} + static void AVIFILE_CloseCompressor(IGetFrameImpl *This) { if (This->lpInFormat != This->lpOutFormat) { @@ -120,7 +125,7 @@ PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pStream) pg = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IGetFrameImpl)); if (pg != NULL) { - pg->lpVtbl = &igetframeVtbl; + pg->IGetFrame_iface.lpVtbl = &igetframeVtbl; pg->ref = 1; pg->lCurrentFrame = -1; pg->pStream = pStream; @@ -133,7 +138,7 @@ PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pStream) static HRESULT WINAPI IGetFrame_fnQueryInterface(IGetFrame *iface, REFIID refiid, LPVOID *obj) { - IGetFrameImpl *This = (IGetFrameImpl *)iface; + IGetFrameImpl *This = impl_from_IGetFrame(iface); TRACE("(%p,%s,%p)\n", This, debugstr_guid(refiid), obj); @@ -149,7 +154,7 @@ static HRESULT WINAPI IGetFrame_fnQueryInterface(IGetFrame *iface, static ULONG WINAPI IGetFrame_fnAddRef(IGetFrame *iface) { - IGetFrameImpl *This = (IGetFrameImpl *)iface; + IGetFrameImpl *This = impl_from_IGetFrame(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p)\n", iface); @@ -159,7 +164,7 @@ static ULONG WINAPI IGetFrame_fnAddRef(IGetFrame *iface) static ULONG WINAPI IGetFrame_fnRelease(IGetFrame *iface) { - IGetFrameImpl *This = (IGetFrameImpl *)iface; + IGetFrameImpl *This = impl_from_IGetFrame(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p)\n", iface); @@ -180,7 +185,7 @@ static ULONG WINAPI IGetFrame_fnRelease(IGetFrame *iface) static LPVOID WINAPI IGetFrame_fnGetFrame(IGetFrame *iface, LONG lPos) { - IGetFrameImpl *This = (IGetFrameImpl *)iface; + IGetFrameImpl *This = impl_from_IGetFrame(iface); LONG readBytes; LONG readSamples; @@ -299,7 +304,7 @@ static LPVOID WINAPI IGetFrame_fnGetFrame(IGetFrame *iface, LONG lPos) static HRESULT WINAPI IGetFrame_fnBegin(IGetFrame *iface, LONG lStart, LONG lEnd, LONG lRate) { - IGetFrameImpl *This = (IGetFrameImpl *)iface; + IGetFrameImpl *This = impl_from_IGetFrame(iface); TRACE("(%p,%d,%d,%d)\n", iface, lStart, lEnd, lRate); @@ -310,7 +315,7 @@ static HRESULT WINAPI IGetFrame_fnBegin(IGetFrame *iface, LONG lStart, static HRESULT WINAPI IGetFrame_fnEnd(IGetFrame *iface) { - IGetFrameImpl *This = (IGetFrameImpl *)iface; + IGetFrameImpl *This = impl_from_IGetFrame(iface); TRACE("(%p)\n", iface); @@ -324,7 +329,7 @@ static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface, LPVOID lpBits, INT x, INT y, INT dx, INT dy) { - IGetFrameImpl *This = (IGetFrameImpl *)iface; + IGetFrameImpl *This = impl_from_IGetFrame(iface); AVISTREAMINFOW sInfo; LPBITMAPINFOHEADER lpbi = lpbiWanted;

1 0

Michael Stefaniuc : avifil32: Reorder some code to avoid forward declarations for the IGetFrameVtbl methods .
by Alexandre Julliard 28 Dec '10

28 Dec '10

Module: wine Branch: master Commit: 6994317b05a554f0e7ab5956c0f95ebd90a14388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6994317b05a554f0e7ab5956c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 27 23:26:23 2010 +0100 avifil32: Reorder some code to avoid forward declarations for the IGetFrameVtbl methods. --- dlls/avifil32/getframe.c | 73 +++++++++++++++++++--------------------------- 1 files changed, 30 insertions(+), 43 deletions(-) diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c index 6f3e6ba..c24009c 100644 --- a/dlls/avifil32/getframe.c +++ b/dlls/avifil32/getframe.c @@ -37,29 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(avifile); /***********************************************************************/ -static HRESULT WINAPI IGetFrame_fnQueryInterface(IGetFrame *iface, - REFIID refiid, LPVOID *obj); -static ULONG WINAPI IGetFrame_fnAddRef(IGetFrame *iface); -static ULONG WINAPI IGetFrame_fnRelease(IGetFrame *iface); -static LPVOID WINAPI IGetFrame_fnGetFrame(IGetFrame *iface, LONG lPos); -static HRESULT WINAPI IGetFrame_fnBegin(IGetFrame *iface, LONG lStart, - LONG lEnd, LONG lRate); -static HRESULT WINAPI IGetFrame_fnEnd(IGetFrame *iface); -static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface, - LPBITMAPINFOHEADER lpbi, - LPVOID lpBits, INT x, INT y, - INT dx, INT dy); - -static const struct IGetFrameVtbl igetframeVtbl = { - IGetFrame_fnQueryInterface, - IGetFrame_fnAddRef, - IGetFrame_fnRelease, - IGetFrame_fnGetFrame, - IGetFrame_fnBegin, - IGetFrame_fnEnd, - IGetFrame_fnSetFormat -}; - typedef struct _IGetFrameImpl { /* IUnknown stuff */ IGetFrame IGetFrame_iface; @@ -115,26 +92,6 @@ static void AVIFILE_CloseCompressor(IGetFrameImpl *This) } } -PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pStream) -{ - IGetFrameImpl *pg; - - /* check parameter */ - if (pStream == NULL) - return NULL; - - pg = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IGetFrameImpl)); - if (pg != NULL) { - pg->IGetFrame_iface.lpVtbl = &igetframeVtbl; - pg->ref = 1; - pg->lCurrentFrame = -1; - pg->pStream = pStream; - IAVIStream_AddRef(pStream); - } - - return (PGETFRAME)pg; -} - static HRESULT WINAPI IGetFrame_fnQueryInterface(IGetFrame *iface, REFIID refiid, LPVOID *obj) { @@ -521,4 +478,34 @@ static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface, } } +static const struct IGetFrameVtbl igetframeVtbl = { + IGetFrame_fnQueryInterface, + IGetFrame_fnAddRef, + IGetFrame_fnRelease, + IGetFrame_fnGetFrame, + IGetFrame_fnBegin, + IGetFrame_fnEnd, + IGetFrame_fnSetFormat +}; + +PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pStream) +{ + IGetFrameImpl *pg; + + /* check parameter */ + if (pStream == NULL) + return NULL; + + pg = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IGetFrameImpl)); + if (pg != NULL) { + pg->IGetFrame_iface.lpVtbl = &igetframeVtbl; + pg->ref = 1; + pg->lCurrentFrame = -1; + pg->pStream = pStream; + IAVIStream_AddRef(pStream); + } + + return (PGETFRAME)pg; +} + /***********************************************************************/

1 0

Michael Stefaniuc : mshtml: COM cleanup for the nsIWebBrowserChrome iface.
by Alexandre Julliard 28 Dec '10

28 Dec '10

Module: wine Branch: master Commit: 29944c7cafa573b5b00a656e2b3dd28274e5bc7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=29944c7cafa573b5b00a656e2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 27 23:27:55 2010 +0100 mshtml: COM cleanup for the nsIWebBrowserChrome iface. --- dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/nsembed.c | 97 +++++++++++++++++++++-------------------- dlls/mshtml/nsio.c | 8 ++-- 3 files changed, 55 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=29944c7cafa573b5b00a6…

1 0

Michael Stefaniuc : mshtml: COM cleanup for the remaining ifaces in NSContainer.
by Alexandre Julliard 28 Dec '10

28 Dec '10

Module: wine Branch: master Commit: 6723b3c56c12eac31cc4db3d7e657b09e07eb3d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6723b3c56c12eac31cc4db3d7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 27 23:30:53 2010 +0100 mshtml: COM cleanup for the remaining ifaces in NSContainer. --- dlls/mshtml/mshtml_private.h | 21 ++---- dlls/mshtml/nsembed.c | 172 ++++++++++++++++++++++-------------------- 2 files changed, 97 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6723b3c56c12eac31cc4d…

1 0