December 2010 - Wine-commits

Francois Gouget : comctl32: Add a trailing '\n' to a FIXME() call.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: 320d8d2a52021cbf559a1ea1ecd345559ea35d20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=320d8d2a52021cbf559a1ea1e… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 9 12:00:43 2010 +0100 comctl32: Add a trailing '\n' to a FIXME() call. --- dlls/comctl32/progress.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index 1144b62..71fba9d 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -707,7 +707,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, case PBM_SETSTATE: if(wParam != PBST_NORMAL) - FIXME("state %04lx not yet handled", wParam); + FIXME("state %04lx not yet handled\n", wParam); return PBST_NORMAL; case PBM_GETSTATE:

1 0

Michael Stefaniuc : quartz: Use an iface instead of a vtbl pointer in IEnumFiltersImpl.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: 70f1c34300766eea5e346b97901423f01fcdd978 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70f1c34300766eea5e346b979… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 22:53:33 2010 +0100 quartz: Use an iface instead of a vtbl pointer in IEnumFiltersImpl. --- dlls/quartz/enumfilters.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/enumfilters.c b/dlls/quartz/enumfilters.c index ab1f6ec..2b9dc53 100644 --- a/dlls/quartz/enumfilters.c +++ b/dlls/quartz/enumfilters.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct IEnumFiltersImpl { - const IEnumFiltersVtbl * lpVtbl; + IEnumFilters IEnumFilters_iface; LONG refCount; IBaseFilter ** ppFilters; int nFilters; @@ -35,6 +35,11 @@ typedef struct IEnumFiltersImpl static const struct IEnumFiltersVtbl IEnumFiltersImpl_Vtbl; +static inline IEnumFiltersImpl *impl_from_IEnumFilters(IEnumFilters *iface) +{ + return CONTAINING_RECORD(iface, IEnumFiltersImpl, IEnumFilters_iface); +} + HRESULT IEnumFiltersImpl_Construct(IBaseFilter ** ppFilters, ULONG nFilters, IEnumFilters ** ppEnum) { /* Note: The incoming IBaseFilter interfaces are not AddRef'd here as in Windows, @@ -50,7 +55,7 @@ HRESULT IEnumFiltersImpl_Construct(IBaseFilter ** ppFilters, ULONG nFilters, IEn return E_OUTOFMEMORY; } - pEnumFilters->lpVtbl = &IEnumFiltersImpl_Vtbl; + pEnumFilters->IEnumFilters_iface.lpVtbl = &IEnumFiltersImpl_Vtbl; pEnumFilters->refCount = 1; pEnumFilters->uIndex = 0; pEnumFilters->nFilters = nFilters; @@ -63,7 +68,7 @@ HRESULT IEnumFiltersImpl_Construct(IBaseFilter ** ppFilters, ULONG nFilters, IEn memcpy(pEnumFilters->ppFilters, ppFilters, nFilters * sizeof(IBaseFilter*)); - *ppEnum = (IEnumFilters *)(&pEnumFilters->lpVtbl); + *ppEnum = &pEnumFilters->IEnumFilters_iface; return S_OK; } @@ -91,7 +96,7 @@ static HRESULT WINAPI IEnumFiltersImpl_QueryInterface(IEnumFilters * iface, REFI static ULONG WINAPI IEnumFiltersImpl_AddRef(IEnumFilters * iface) { - IEnumFiltersImpl *This = (IEnumFiltersImpl *)iface; + IEnumFiltersImpl *This = impl_from_IEnumFilters(iface); ULONG refCount = InterlockedIncrement(&This->refCount); TRACE("(%p)->()\n", iface); @@ -101,7 +106,7 @@ static ULONG WINAPI IEnumFiltersImpl_AddRef(IEnumFilters * iface) static ULONG WINAPI IEnumFiltersImpl_Release(IEnumFilters * iface) { - IEnumFiltersImpl *This = (IEnumFiltersImpl *)iface; + IEnumFiltersImpl *This = impl_from_IEnumFilters(iface); ULONG refCount = InterlockedDecrement(&This->refCount); TRACE("(%p)->()\n", iface); @@ -120,7 +125,7 @@ static HRESULT WINAPI IEnumFiltersImpl_Next(IEnumFilters * iface, ULONG cFilters { ULONG cFetched; ULONG i; - IEnumFiltersImpl *This = (IEnumFiltersImpl *)iface; + IEnumFiltersImpl *This = impl_from_IEnumFilters(iface); cFetched = min(This->nFilters, This->uIndex + cFilters) - This->uIndex; @@ -147,7 +152,7 @@ static HRESULT WINAPI IEnumFiltersImpl_Next(IEnumFilters * iface, ULONG cFilters static HRESULT WINAPI IEnumFiltersImpl_Skip(IEnumFilters * iface, ULONG cFilters) { - IEnumFiltersImpl *This = (IEnumFiltersImpl *)iface; + IEnumFiltersImpl *This = impl_from_IEnumFilters(iface); TRACE("(%p)->(%u)\n", iface, cFilters); @@ -161,7 +166,7 @@ static HRESULT WINAPI IEnumFiltersImpl_Skip(IEnumFilters * iface, ULONG cFilters static HRESULT WINAPI IEnumFiltersImpl_Reset(IEnumFilters * iface) { - IEnumFiltersImpl *This = (IEnumFiltersImpl *)iface; + IEnumFiltersImpl *This = impl_from_IEnumFilters(iface); TRACE("(%p)->()\n", iface); @@ -172,7 +177,7 @@ static HRESULT WINAPI IEnumFiltersImpl_Reset(IEnumFilters * iface) static HRESULT WINAPI IEnumFiltersImpl_Clone(IEnumFilters * iface, IEnumFilters ** ppEnum) { HRESULT hr; - IEnumFiltersImpl *This = (IEnumFiltersImpl *)iface; + IEnumFiltersImpl *This = impl_from_IEnumFilters(iface); TRACE("(%p)->(%p)\n", iface, ppEnum);

1 0

Michael Stefaniuc : quartz: Use an iface instead of a vtbl pointer in EnumMonikerImpl.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: 80db15faa1dc4af449484a032310890b33d7c94f URL: http://source.winehq.org/git/wine.git/?a=commit;h=80db15faa1dc4af449484a032… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 22:54:07 2010 +0100 quartz: Use an iface instead of a vtbl pointer in EnumMonikerImpl. --- dlls/quartz/enummoniker.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/enummoniker.c b/dlls/quartz/enummoniker.c index 0cc804a..ba4e687 100644 --- a/dlls/quartz/enummoniker.c +++ b/dlls/quartz/enummoniker.c @@ -31,7 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct EnumMonikerImpl { - const IEnumMonikerVtbl *lpVtbl; + IEnumMoniker IEnumMoniker_iface; LONG ref; IMoniker ** ppMoniker; ULONG nMonikerCount; @@ -40,6 +40,11 @@ typedef struct EnumMonikerImpl static const IEnumMonikerVtbl EnumMonikerImpl_Vtbl; +static inline EnumMonikerImpl *impl_from_IEnumMoniker(IEnumMoniker *iface) +{ + return CONTAINING_RECORD(iface, EnumMonikerImpl, IEnumMoniker_iface); +} + static ULONG WINAPI EnumMonikerImpl_AddRef(LPENUMMONIKER iface); HRESULT EnumMonikerImpl_Create(IMoniker ** ppMoniker, ULONG nMonikerCount, IEnumMoniker ** ppEnum) @@ -56,14 +61,14 @@ HRESULT EnumMonikerImpl_Create(IMoniker ** ppMoniker, ULONG nMonikerCount, IEnum if (!pemi) return E_OUTOFMEMORY; - pemi->lpVtbl = &EnumMonikerImpl_Vtbl; + pemi->IEnumMoniker_iface.lpVtbl = &EnumMonikerImpl_Vtbl; pemi->ref = 1; pemi->ppMoniker = CoTaskMemAlloc(nMonikerCount * sizeof(IMoniker*)); memcpy(pemi->ppMoniker, ppMoniker, nMonikerCount*sizeof(IMoniker*)); pemi->nMonikerCount = nMonikerCount; pemi->index = 0; - *ppEnum = (IEnumMoniker *)pemi; + *ppEnum = &pemi->IEnumMoniker_iface; return S_OK; } @@ -76,7 +81,7 @@ static HRESULT WINAPI EnumMonikerImpl_QueryInterface( REFIID riid, LPVOID *ppvObj) { - EnumMonikerImpl *This = (EnumMonikerImpl *)iface; + EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); if (This == NULL || ppvObj == NULL) return E_POINTER; @@ -99,7 +104,7 @@ static HRESULT WINAPI EnumMonikerImpl_QueryInterface( */ static ULONG WINAPI EnumMonikerImpl_AddRef(LPENUMMONIKER iface) { - EnumMonikerImpl *This = (EnumMonikerImpl *)iface; + EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); ULONG ref; if (This == NULL) return E_POINTER; @@ -116,7 +121,7 @@ static ULONG WINAPI EnumMonikerImpl_AddRef(LPENUMMONIKER iface) */ static ULONG WINAPI EnumMonikerImpl_Release(LPENUMMONIKER iface) { - EnumMonikerImpl *This = (EnumMonikerImpl *)iface; + EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p)->() Release from %d\n", iface, ref + 1); @@ -139,7 +144,7 @@ static ULONG WINAPI EnumMonikerImpl_Release(LPENUMMONIKER iface) static HRESULT WINAPI EnumMonikerImpl_Next(LPENUMMONIKER iface, ULONG celt, IMoniker ** rgelt, ULONG * pceltFetched) { ULONG fetched; - EnumMonikerImpl *This = (EnumMonikerImpl *)iface; + EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); TRACE("(%p)->(%d, %p, %p)\n", iface, celt, rgelt, pceltFetched); @@ -164,7 +169,7 @@ static HRESULT WINAPI EnumMonikerImpl_Next(LPENUMMONIKER iface, ULONG celt, IMon static HRESULT WINAPI EnumMonikerImpl_Skip(LPENUMMONIKER iface, ULONG celt) { - EnumMonikerImpl *This = (EnumMonikerImpl *)iface; + EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); TRACE("(%p)->(%d)\n", iface, celt); @@ -175,7 +180,7 @@ static HRESULT WINAPI EnumMonikerImpl_Skip(LPENUMMONIKER iface, ULONG celt) static HRESULT WINAPI EnumMonikerImpl_Reset(LPENUMMONIKER iface) { - EnumMonikerImpl *This = (EnumMonikerImpl *)iface; + EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); TRACE("(%p)->()\n", iface);

1 0

Michael Stefaniuc : quartz: Use an iface instead of a vtbl pointer in BaseMemAllocator.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: bf247fad13ec5e60a56bf1f0c3457d7428cf54c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf247fad13ec5e60a56bf1f0c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 22:59:34 2010 +0100 quartz: Use an iface instead of a vtbl pointer in BaseMemAllocator. --- dlls/quartz/memallocator.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 575af9d..4858c02 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct BaseMemAllocator { - const IMemAllocatorVtbl * lpVtbl; + IMemAllocator IMemAllocator_iface; LONG ref; ALLOCATOR_PROPERTIES props; @@ -52,6 +52,11 @@ typedef struct BaseMemAllocator CRITICAL_SECTION *pCritSect; } BaseMemAllocator; +static inline BaseMemAllocator *impl_from_IMemAllocator(IMemAllocator *iface) +{ + return CONTAINING_RECORD(iface, BaseMemAllocator, IMemAllocator_iface); +} + static const IMemAllocatorVtbl BaseMemAllocator_VTable; static const IMediaSample2Vtbl StdMediaSample2_VTable; @@ -70,7 +75,7 @@ static HRESULT BaseMemAllocator_Init(HRESULT (* fnAlloc)(IMemAllocator *), { assert(fnAlloc && fnFree && fnDestroyed); - pMemAlloc->lpVtbl = &BaseMemAllocator_VTable; + pMemAlloc->IMemAllocator_iface.lpVtbl = &BaseMemAllocator_VTable; pMemAlloc->ref = 1; ZeroMemory(&pMemAlloc->props, sizeof(pMemAlloc->props)); @@ -93,7 +98,7 @@ static HRESULT BaseMemAllocator_Init(HRESULT (* fnAlloc)(IMemAllocator *), static HRESULT WINAPI BaseMemAllocator_QueryInterface(IMemAllocator * iface, REFIID riid, LPVOID * ppv) { - BaseMemAllocator *This = (BaseMemAllocator *)iface; + BaseMemAllocator *This = impl_from_IMemAllocator(iface); TRACE("(%p)->(%s, %p)\n", This, qzdebugstr_guid(riid), ppv); *ppv = NULL; @@ -116,7 +121,7 @@ static HRESULT WINAPI BaseMemAllocator_QueryInterface(IMemAllocator * iface, REF static ULONG WINAPI BaseMemAllocator_AddRef(IMemAllocator * iface) { - BaseMemAllocator *This = (BaseMemAllocator *)iface; + BaseMemAllocator *This = impl_from_IMemAllocator(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p)->() AddRef from %d\n", iface, ref - 1); @@ -126,7 +131,7 @@ static ULONG WINAPI BaseMemAllocator_AddRef(IMemAllocator * iface) static ULONG WINAPI BaseMemAllocator_Release(IMemAllocator * iface) { - BaseMemAllocator *This = (BaseMemAllocator *)iface; + BaseMemAllocator *This = impl_from_IMemAllocator(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p)->() Release from %d\n", iface, ref + 1); @@ -145,7 +150,7 @@ static ULONG WINAPI BaseMemAllocator_Release(IMemAllocator * iface) static HRESULT WINAPI BaseMemAllocator_SetProperties(IMemAllocator * iface, ALLOCATOR_PROPERTIES *pRequest, ALLOCATOR_PROPERTIES *pActual) { - BaseMemAllocator *This = (BaseMemAllocator *)iface; + BaseMemAllocator *This = impl_from_IMemAllocator(iface); HRESULT hr; TRACE("(%p)->(%p, %p)\n", This, pRequest, pActual); @@ -178,7 +183,7 @@ static HRESULT WINAPI BaseMemAllocator_SetProperties(IMemAllocator * iface, ALLO static HRESULT WINAPI BaseMemAllocator_GetProperties(IMemAllocator * iface, ALLOCATOR_PROPERTIES *pProps) { - BaseMemAllocator *This = (BaseMemAllocator *)iface; + BaseMemAllocator *This = impl_from_IMemAllocator(iface); HRESULT hr = S_OK; TRACE("(%p)->(%p)\n", This, pProps); @@ -194,7 +199,7 @@ static HRESULT WINAPI BaseMemAllocator_GetProperties(IMemAllocator * iface, ALLO static HRESULT WINAPI BaseMemAllocator_Commit(IMemAllocator * iface) { - BaseMemAllocator *This = (BaseMemAllocator *)iface; + BaseMemAllocator *This = impl_from_IMemAllocator(iface); HRESULT hr; TRACE("(%p)->()\n", This); @@ -238,7 +243,7 @@ static HRESULT WINAPI BaseMemAllocator_Commit(IMemAllocator * iface) static HRESULT WINAPI BaseMemAllocator_Decommit(IMemAllocator * iface) { - BaseMemAllocator *This = (BaseMemAllocator *)iface; + BaseMemAllocator *This = impl_from_IMemAllocator(iface); HRESULT hr; TRACE("(%p)->()\n", This); @@ -279,7 +284,7 @@ static HRESULT WINAPI BaseMemAllocator_Decommit(IMemAllocator * iface) static HRESULT WINAPI BaseMemAllocator_GetBuffer(IMemAllocator * iface, IMediaSample ** pSample, REFERENCE_TIME *pStartTime, REFERENCE_TIME *pEndTime, DWORD dwFlags) { - BaseMemAllocator *This = (BaseMemAllocator *)iface; + BaseMemAllocator *This = impl_from_IMemAllocator(iface); HRESULT hr = S_OK; /* NOTE: The pStartTime and pEndTime parameters are not applied to the sample. @@ -339,7 +344,7 @@ static HRESULT WINAPI BaseMemAllocator_GetBuffer(IMemAllocator * iface, IMediaSa static HRESULT WINAPI BaseMemAllocator_ReleaseBuffer(IMemAllocator * iface, IMediaSample * pSample) { - BaseMemAllocator *This = (BaseMemAllocator *)iface; + BaseMemAllocator *This = impl_from_IMemAllocator(iface); StdMediaSample2 * pStdSample = (StdMediaSample2 *)pSample; HRESULT hr = S_OK;

1 0

Alexandre Julliard : wuapi: Add a typelib resource.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: 2f0371e84dfbb9e82fcda981b7197742576966a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f0371e84dfbb9e82fcda981b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 10:33:25 2010 +0100 wuapi: Add a typelib resource. --- .gitignore | 1 + dlls/wuapi/Makefile.in | 4 ++++ dlls/wuapi/rsrc.rc | 22 ++++++++++++++++++++++ dlls/wuapi/wuapi_tlb.idl | 21 +++++++++++++++++++++ include/wuapi.idl | 11 +++++++++++ 5 files changed, 59 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index a981f92..88001d8 100644 --- a/.gitignore +++ b/.gitignore @@ -145,6 +145,7 @@ dlls/urlmon/urlmon_urlmon.h dlls/urlmon/urlmon_urlmon_p.c dlls/windowscodecs/windowscodecs_wincodec.h dlls/windowscodecs/windowscodecs_wincodec_p.c +dlls/wuapi/wuapi_tlb.tlb include/activaut.h include/activdbg.h include/activscp.h diff --git a/dlls/wuapi/Makefile.in b/dlls/wuapi/Makefile.in index 658008a..563f611 100644 --- a/dlls/wuapi/Makefile.in +++ b/dlls/wuapi/Makefile.in @@ -11,4 +11,8 @@ C_SRCS = \ session.c \ updates.c +IDL_TLB_SRCS = wuapi_tlb.idl + +RC_SRCS = rsrc.rc + @MAKE_DLL_RULES@ diff --git a/dlls/wuapi/rsrc.rc b/dlls/wuapi/rsrc.rc new file mode 100644 index 0000000..9ddce3b --- /dev/null +++ b/dlls/wuapi/rsrc.rc @@ -0,0 +1,22 @@ +/* + * Resources for wuapi + * + * Copyright 2010 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: wuapi_tlb.tlb */ +1 TYPELIB wuapi_tlb.tlb diff --git a/dlls/wuapi/wuapi_tlb.idl b/dlls/wuapi/wuapi_tlb.idl new file mode 100644 index 0000000..120e364 --- /dev/null +++ b/dlls/wuapi/wuapi_tlb.idl @@ -0,0 +1,21 @@ +/* + * Typelib for wuapi + * + * Copyright 2010 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wuapi.idl" diff --git a/include/wuapi.idl b/include/wuapi.idl index dd5da68..31ae49c 100644 --- a/include/wuapi.idl +++ b/include/wuapi.idl @@ -21,6 +21,15 @@ cpp_quote("DEFINE_GUID(CLSID_UpdateSession, 0x4cb43d7f,0x7eee,0x4906,0x86,0x98,0 import "oaidl.idl"; +[ + helpstring("WUAPI 2.0 Type Library"), + uuid(b596cc9f-56e5-419e-a622-e01bb457431e), + version(2.0) +] +library WUApiLib { + +importlib("stdole2.tlb"); + interface ICategoryCollection; interface IStringCollection; interface IUpdateCollection; @@ -1287,3 +1296,5 @@ interface IUpdateInstaller : IDispatch HRESULT RebootRequiredBeforeInstallation( [out, retval] VARIANT_BOOL *retval); } + +} /* WUApiLib */

1 0

Alexandre Julliard : wuapi: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: 69f58161b9e818341bd3ace0b7bfe26f4a5b1d93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f58161b9e818341bd3ace0b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 10:34:19 2010 +0100 wuapi: Convert dll registration to the IRegistrar mechanism. --- dlls/wuapi/Makefile.in | 2 +- dlls/wuapi/main.c | 20 +++ dlls/wuapi/regsvr.c | 430 ------------------------------------------------ include/wuapi.idl | 21 ++- 4 files changed, 39 insertions(+), 434 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69f58161b9e818341bd3a…

1 0

Alexandre Julliard : gameux: Add a typelib resource.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: 092af1be3721d2f43638efc756ed3d0ba4396524 URL: http://source.winehq.org/git/wine.git/?a=commit;h=092af1be3721d2f43638efc75… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 11:18:11 2010 +0100 gameux: Add a typelib resource. --- .gitignore | 1 + dlls/gameux/Makefile.in | 4 +++- dlls/gameux/{version.rc => gameux_tlb.idl} | 14 +++----------- dlls/gameux/{version.rc => rsrc.rc} | 5 ++++- include/gameux.idl | 2 +- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 88001d8..36c11ee 100644 --- a/.gitignore +++ b/.gitignore @@ -50,6 +50,7 @@ dlls/d3dcompiler_43/asmshader.yy.c dlls/dispex/disp_ex.h dlls/dispex/disp_ex_p.c dlls/dxdiagn/fil_data.h +dlls/gameux/gameux_tlb.tlb dlls/infosoft/infosoft.h dlls/jscript/jsglobal.tlb dlls/jscript/parser.tab.c diff --git a/dlls/gameux/Makefile.in b/dlls/gameux/Makefile.in index d47c907..94cc810 100644 --- a/dlls/gameux/Makefile.in +++ b/dlls/gameux/Makefile.in @@ -9,6 +9,8 @@ C_SRCS = \ main.c \ regsvr.c -RC_SRCS = version.rc +IDL_TLB_SRCS = gameux_tlb.idl + +RC_SRCS = rsrc.rc @MAKE_DLL_RULES@ diff --git a/dlls/gameux/version.rc b/dlls/gameux/gameux_tlb.idl similarity index 63% copy from dlls/gameux/version.rc copy to dlls/gameux/gameux_tlb.idl index 286add1..8b18ca0 100644 --- a/dlls/gameux/version.rc +++ b/dlls/gameux/gameux_tlb.idl @@ -1,7 +1,7 @@ /* - * Gameux library version resource + * Typelib for gameux * - * Copyright (C) 2010 Mariusz Pluciński + * Copyright 2010 Alexandre Julliard * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,12 +18,4 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_FILEDESCRIPTION_STR "Wine Games Explorer" -#define WINE_FILENAME_STR "gameux.dll" -#define WINE_FILEVERSION 6,1,7600,16385 -#define WINE_FILEVERSION_STR "6.1.7600.16385" -#define WINE_PRODUCTVERSION 6,1,7600,16385 -#define WINE_PRODUCTVERSION_STR "6.1.7600.16385" -#define WINE_EXTRAVALUES VALUE "OLESelfRegister","" - -#include "wine/wine_common_ver.rc" +#include "gameux.idl" diff --git a/dlls/gameux/version.rc b/dlls/gameux/rsrc.rc similarity index 93% rename from dlls/gameux/version.rc rename to dlls/gameux/rsrc.rc index 286add1..f5670b7 100644 --- a/dlls/gameux/version.rc +++ b/dlls/gameux/rsrc.rc @@ -1,5 +1,5 @@ /* - * Gameux library version resource + * Gameux library resources * * Copyright (C) 2010 Mariusz Pluciński * @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* @makedep: gameux_tlb.tlb */ +1 TYPELIB gameux_tlb.tlb + #define WINE_FILEDESCRIPTION_STR "Wine Games Explorer" #define WINE_FILENAME_STR "gameux.dll" #define WINE_FILEVERSION 6,1,7600,16385 diff --git a/include/gameux.idl b/include/gameux.idl index 773e784..5c50a3c 100644 --- a/include/gameux.idl +++ b/include/gameux.idl @@ -24,7 +24,7 @@ import "ocidl.idl"; import "shobjidl.idl"; [ - uuid(1DE6CE3D-EA69-4671-941F-26F789F39C5B), + uuid(4F48A59C-942D-4F3C-83C9-4EFFE84E4959), version(1.0), helpstring("gameux public 1.0 Type Library") ]

1 0

Alexandre Julliard : gameux: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: 71dbeb2ebe3434e9abe67d64f981fffdcb78a168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71dbeb2ebe3434e9abe67d64f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 11:33:09 2010 +0100 gameux: Convert dll registration to the IRegistrar mechanism. --- dlls/gameux/Makefile.in | 4 +- dlls/gameux/main.c | 20 ++ dlls/gameux/regsvr.c | 532 ----------------------------------------------- include/gameux.idl | 8 + 4 files changed, 30 insertions(+), 534 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71dbeb2ebe3434e9abe67…

1 0

Alexandre Julliard : hnetcfg: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: c0be1ec8428590956214b3ff5f148fac4d4fc837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0be1ec8428590956214b3ff5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 11:47:19 2010 +0100 hnetcfg: Convert dll registration to the IRegistrar mechanism. --- dlls/hnetcfg/Makefile.in | 3 +- dlls/hnetcfg/hnetcfg.c | 20 ++ dlls/hnetcfg/hnetcfg.idl | 35 ++++ dlls/hnetcfg/regsvr.c | 430 ---------------------------------------------- 4 files changed, 57 insertions(+), 431 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0be1ec8428590956214b…

1 0

Alexandre Julliard : rsaenh: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: 07a627b1b88aedd3f7de41726c5291dc021a9001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07a627b1b88aedd3f7de41726… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 12:11:20 2010 +0100 rsaenh: Convert dll registration to the IRegistrar mechanism. --- dlls/rsaenh/Makefile.in | 2 +- dlls/rsaenh/rsaenh.c | 125 ++--------------------------------- dlls/rsaenh/rsaenh.rgs | 72 ++++++++++++++++++++ dlls/rsaenh/{version.rc => rsrc.rc} | 5 ++ 4 files changed, 84 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07a627b1b88aedd3f7de4…

1 0