January 2014 - Wine-Commits

Piotr Caban : msvcr110: Add __crtTerminateProcess implementation.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: 460991a8e993336177e43996e773970decd3b1b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=460991a8e993336177e43996e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 7 16:14:17 2014 +0100 msvcr110: Add __crtTerminateProcess implementation. --- dlls/msvcr110/msvcr110.c | 8 ++++++++ dlls/msvcr110/msvcr110.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/msvcr110/msvcr110.c b/dlls/msvcr110/msvcr110.c index 04a0dc2..51fce29 100644 --- a/dlls/msvcr110/msvcr110.c +++ b/dlls/msvcr110/msvcr110.c @@ -62,3 +62,11 @@ int CDECL MSVCR110__crtGetShowWindowMode(void) TRACE("window=%d\n", si.wShowWindow); return si.wShowWindow; } + +/********************************************************************* + * __crtTerminateProcess (MSVCR110.@) + */ +int CDECL MSVCR110__crtTerminateProcess(UINT exit_code) +{ + return TerminateProcess(GetCurrentProcess(), exit_code); +} diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 9b3ebe8..19e1769 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -929,7 +929,7 @@ @ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW @ stub -arch=i386,win64 __crtSetThreadStackGuarantee @ cdecl __crtSetUnhandledExceptionFilter(ptr) MSVCR110__crtSetUnhandledExceptionFilter -@ stub -arch=i386,win64 __crtTerminateProcess +@ cdecl -arch=i386,win64 __crtTerminateProcess(long) MSVCR110__crtTerminateProcess @ stub -arch=i386,win64 __crtUnhandledException @ cdecl __daylight() msvcrt.__daylight @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit

1 0

Piotr Caban : msvcp110: Share the source code with msvcp90.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: 50e3f110d00f698ab17cd90064a2e7e538c855b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50e3f110d00f698ab17cd9006… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 7 15:20:57 2014 +0100 msvcp110: Share the source code with msvcp90. --- dlls/msvcp110/Makefile.in | 15 +- dlls/msvcp110/msvcp110.c | 37 - dlls/msvcp110/msvcp110.spec | 5832 +++++++++++++++++++++---------------------- dlls/msvcp90/locale.c | 15 +- 4 files changed, 2944 insertions(+), 2955 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=50e3f110d00f698ab17cd…

1 0

Dmitry Timoshkov : wmiutils: Remove unused IUnknown *outer parameter from object constructors.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: f8a18f9c904fa6f5c2f44edc7028856f5033a449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8a18f9c904fa6f5c2f44edc7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 30 18:21:40 2013 +0900 wmiutils: Remove unused IUnknown *outer parameter from object constructors. --- dlls/wmiutils/main.c | 7 ++----- dlls/wmiutils/path.c | 10 +++++----- dlls/wmiutils/statuscode.c | 4 ++-- dlls/wmiutils/wmiutils_private.h | 4 ++-- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/wmiutils/main.c b/dlls/wmiutils/main.c index c088a68..89fd26b 100644 --- a/dlls/wmiutils/main.c +++ b/dlls/wmiutils/main.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wmiutils); static HINSTANCE instance; -typedef HRESULT (*fnCreateInstance)( IUnknown *pUnkOuter, LPVOID *ppObj ); +typedef HRESULT (*fnCreateInstance)( LPVOID *ppObj ); typedef struct { @@ -87,14 +87,11 @@ static HRESULT WINAPI wmiutils_cf_CreateInstance( IClassFactory *iface, LPUNKNOW if (pOuter) return CLASS_E_NOAGGREGATION; - r = This->pfnCreateInstance( pOuter, (LPVOID *)&punk ); + r = This->pfnCreateInstance( (LPVOID *)&punk ); if (FAILED(r)) return r; r = IUnknown_QueryInterface( punk, riid, ppobj ); - if (FAILED(r)) - return r; - IUnknown_Release( punk ); return r; } diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 046f424..647724f 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -276,11 +276,11 @@ static const struct IWbemPathKeyListVtbl keylist_vtbl = keylist_GetText }; -static HRESULT WbemPathKeyList_create( IUnknown *pUnkOuter, IWbemPath *parent, LPVOID *ppObj ) +static HRESULT WbemPathKeyList_create( IWbemPath *parent, LPVOID *ppObj ) { struct keylist *keylist; - TRACE("%p, %p\n", pUnkOuter, ppObj); + TRACE("%p\n", ppObj); if (!(keylist = heap_alloc( sizeof(*keylist) ))) return E_OUTOFMEMORY; @@ -1178,7 +1178,7 @@ static HRESULT WINAPI path_GetKeyList( LeaveCriticalSection( &path->cs ); return WBEM_E_INVALID_PARAMETER; } - hr = WbemPathKeyList_create( NULL, iface, (void **)pOut ); + hr = WbemPathKeyList_create( iface, (void **)pOut ); LeaveCriticalSection( &path->cs ); return hr; @@ -1269,11 +1269,11 @@ static const struct IWbemPathVtbl path_vtbl = path_IsSameClassName }; -HRESULT WbemPath_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +HRESULT WbemPath_create( LPVOID *ppObj ) { struct path *path; - TRACE("%p, %p\n", pUnkOuter, ppObj); + TRACE("%p\n", ppObj); if (!(path = heap_alloc( sizeof(*path) ))) return E_OUTOFMEMORY; diff --git a/dlls/wmiutils/statuscode.c b/dlls/wmiutils/statuscode.c index 0718c17..719f3af 100644 --- a/dlls/wmiutils/statuscode.c +++ b/dlls/wmiutils/statuscode.c @@ -132,11 +132,11 @@ static const struct IWbemStatusCodeTextVtbl status_code_vtbl = status_code_GetFacilityCodeText }; -HRESULT WbemStatusCodeText_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +HRESULT WbemStatusCodeText_create( LPVOID *ppObj ) { status_code *sc; - TRACE("(%p,%p)\n", pUnkOuter, ppObj); + TRACE("(%p)\n", ppObj); if (!(sc = heap_alloc( sizeof(*sc) ))) return E_OUTOFMEMORY; diff --git a/dlls/wmiutils/wmiutils_private.h b/dlls/wmiutils/wmiutils_private.h index fbd6ab5..2b76f71 100644 --- a/dlls/wmiutils/wmiutils_private.h +++ b/dlls/wmiutils/wmiutils_private.h @@ -18,8 +18,8 @@ #include "wine/unicode.h" -HRESULT WbemPath_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; -HRESULT WbemStatusCodeText_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT WbemPath_create(LPVOID *) DECLSPEC_HIDDEN; +HRESULT WbemStatusCodeText_create(LPVOID *) DECLSPEC_HIDDEN; static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1); static inline void *heap_alloc( size_t len )

1 0

Huw Davies : riched20: Simplify the code by accessing paragraphs directly from runs.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: 7e7a8f1a4e14193b50607f2dbe2571385ec04f20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e7a8f1a4e14193b50607f2db… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 7 12:44:20 2014 +0000 riched20: Simplify the code by accessing paragraphs directly from runs. --- dlls/riched20/run.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 263fee4..245a031 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -658,9 +658,7 @@ void ME_SetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt) */ void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, CHARFORMAT2W *pFmt) { - ME_DisplayItem *para; - ME_DisplayItem *run; - ME_DisplayItem *end_run = NULL; + ME_DisplayItem *run, *end_run = NULL; if (end && start->pRun == end->pRun && start->nOffset == end->nOffset) return; @@ -682,27 +680,15 @@ void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, C ME_SplitRunSimple(editor, end); end_run = end ? end->pRun : NULL; - run = start->pRun; - para = start->pPara; - para->member.para.nFlags |= MEPF_REWRAP; - - while(run != end_run) + for (run = start->pRun; run != end_run; run = ME_FindItemFwd( run, diRun )) { ME_Style *new_style = ME_ApplyStyle(run->member.run.style, pFmt); - /* ME_DumpStyle(new_style); */ - add_undo_set_char_fmt( editor, para->member.para.nCharOfs + run->member.run.nCharOfs, + add_undo_set_char_fmt( editor, run->member.run.para->nCharOfs + run->member.run.nCharOfs, run->member.run.len, &run->member.run.style->fmt ); ME_ReleaseStyle(run->member.run.style); run->member.run.style = new_style; - run = ME_FindItemFwd(run, diRunOrParagraph); - if (run && run->type == diParagraph) - { - para = run; - run = ME_FindItemFwd(run, diRun); - if (run != end_run) - para->member.para.nFlags |= MEPF_REWRAP; - } + run->member.run.para->nFlags |= MEPF_REWRAP; } }

1 0

Michael Stefaniuc : dmime: COM cleanup for IDirectMusicSegment8.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: dc45b8ad06cd76786fa2e61bb5f98aef66847791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc45b8ad06cd76786fa2e61bb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 7 10:45:38 2014 +0100 dmime: COM cleanup for IDirectMusicSegment8. --- dlls/dmime/dmime_private.h | 2 +- dlls/dmime/segment.c | 93 +++++++++++++++++++++++++------------------- 2 files changed, 54 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc45b8ad06cd76786fa2e…

1 0

Andrey Gusev : d3dcompiler: Correct filename string.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: 7ad3b863dc8d2b73a69b3290cbe3c44db357fcd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ad3b863dc8d2b73a69b3290c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jan 6 16:19:28 2014 +0200 d3dcompiler: Correct filename string. --- dlls/d3dcompiler_33/version.rc | 2 +- dlls/d3dcompiler_34/version.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_33/version.rc b/dlls/d3dcompiler_33/version.rc index 11d0618..880a0b5 100644 --- a/dlls/d3dcompiler_33/version.rc +++ b/dlls/d3dcompiler_33/version.rc @@ -18,7 +18,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DCompiler" -#define WINE_FILENAME_STR "d3dcompiler_1.dll" +#define WINE_FILENAME_STR "d3dcompiler_33.dll" #define WINE_FILEVERSION 9,18,904,15 #define WINE_FILEVERSION_STR "9.18.904.0015" #define WINE_PRODUCTVERSION 9,18,904,15 diff --git a/dlls/d3dcompiler_34/version.rc b/dlls/d3dcompiler_34/version.rc index 8e89a96..b4f9788 100644 --- a/dlls/d3dcompiler_34/version.rc +++ b/dlls/d3dcompiler_34/version.rc @@ -18,7 +18,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DCompiler" -#define WINE_FILENAME_STR "d3dcompiler_1.dll" +#define WINE_FILENAME_STR "d3dcompiler_34.dll" #define WINE_FILEVERSION 9,19,949,46 #define WINE_FILEVERSION_STR "9.19.949.0046" #define WINE_PRODUCTVERSION 9,19,949,46

1 0

Nikolay Sivov : scrrun: Added stub NewEnum support for IFileCollection.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: 0920a3296ee68d07276d83b0db1f4865af102102 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0920a3296ee68d07276d83b0d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 7 03:24:41 2014 +0400 scrrun: Added stub NewEnum support for IFileCollection. --- dlls/scrrun/filesystem.c | 87 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 85 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index c61020d..94d894f 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -47,6 +47,10 @@ struct enumdata { HANDLE find; BSTR path; } foldercoll; + struct + { + IFileCollection *coll; + } filecoll; } u; }; @@ -592,6 +596,80 @@ static HRESULT create_foldercoll_enum(struct foldercollection *collection, IUnkn return S_OK; } +static ULONG WINAPI filecoll_enumvariant_Release(IEnumVARIANT *iface) +{ + struct enumvariant *This = impl_from_IEnumVARIANT(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + { + IFileCollection_Release(This->data.u.filecoll.coll); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI filecoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *var, ULONG *fetched) +{ + struct enumvariant *This = impl_from_IEnumVARIANT(iface); + FIXME("(%p)->(%d %p %p): stub\n", This, celt, var, fetched); + return E_NOTIMPL; +} + +static HRESULT WINAPI filecoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG celt) +{ + struct enumvariant *This = impl_from_IEnumVARIANT(iface); + FIXME("(%p)->(%d): stub\n", This, celt); + return E_NOTIMPL; +} + +static HRESULT WINAPI filecoll_enumvariant_Reset(IEnumVARIANT *iface) +{ + struct enumvariant *This = impl_from_IEnumVARIANT(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI filecoll_enumvariant_Clone(IEnumVARIANT *iface, IEnumVARIANT **pclone) +{ + struct enumvariant *This = impl_from_IEnumVARIANT(iface); + FIXME("(%p)->(%p): stub\n", This, pclone); + return E_NOTIMPL; +} + +static const IEnumVARIANTVtbl filecollenumvariantvtbl = { + enumvariant_QueryInterface, + enumvariant_AddRef, + filecoll_enumvariant_Release, + filecoll_enumvariant_Next, + filecoll_enumvariant_Skip, + filecoll_enumvariant_Reset, + filecoll_enumvariant_Clone +}; + +static HRESULT create_filecoll_enum(struct filecollection *collection, IUnknown **newenum) +{ + struct enumvariant *This; + + *newenum = NULL; + + This = heap_alloc(sizeof(*This)); + if (!This) return E_OUTOFMEMORY; + + This->IEnumVARIANT_iface.lpVtbl = &filecollenumvariantvtbl; + This->ref = 1; + + This->data.u.filecoll.coll = &collection->IFileCollection_iface; + IFileCollection_AddRef(This->data.u.filecoll.coll); + + *newenum = (IUnknown*)&This->IEnumVARIANT_iface; + + return S_OK; +} + static HRESULT WINAPI foldercoll_QueryInterface(IFolderCollection *iface, REFIID riid, void **obj) { struct foldercollection *This = impl_from_IFolderCollection(iface); @@ -899,8 +977,13 @@ static HRESULT WINAPI filecoll_get_Item(IFileCollection *iface, VARIANT Key, IFi static HRESULT WINAPI filecoll_get__NewEnum(IFileCollection *iface, IUnknown **ppenum) { struct filecollection *This = impl_from_IFileCollection(iface); - FIXME("(%p)->(%p)\n", This, ppenum); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ppenum); + + if(!ppenum) + return E_POINTER; + + return create_filecoll_enum(This, ppenum); } static HRESULT WINAPI filecoll_get_Count(IFileCollection *iface, LONG *count)

1 0

Nikolay Sivov : scrrun: Implement Name() property for File.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: 3ee9f2407b8fede4ddcfbf455660488b2ae856e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ee9f2407b8fede4ddcfbf455… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 7 03:25:48 2014 +0400 scrrun: Implement Name() property for File. --- dlls/scrrun/filesystem.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index a2562ef..1c0c6c3 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -1559,11 +1559,29 @@ static HRESULT WINAPI file_get_Path(IFile *iface, BSTR *pbstrPath) return E_NOTIMPL; } -static HRESULT WINAPI file_get_Name(IFile *iface, BSTR *pbstrName) +static HRESULT WINAPI file_get_Name(IFile *iface, BSTR *name) { struct file *This = impl_from_IFile(iface); - FIXME("(%p)->(%p)\n", This, pbstrName); - return E_NOTIMPL; + WCHAR *ptr; + + TRACE("(%p)->(%p)\n", This, name); + + if(!name) + return E_POINTER; + + *name = NULL; + + ptr = strrchrW(This->path, '\\'); + if (ptr) + { + *name = SysAllocString(ptr+1); + TRACE("%s\n", debugstr_w(*name)); + if (!*name) return E_OUTOFMEMORY; + } + else + return E_FAIL; + + return S_OK; } static HRESULT WINAPI file_put_Name(IFile *iface, BSTR pbstrName)

1 0

Michael Stefaniuc : dmime: Remove duplicated "IDirectMusicSegment8" from the method names.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: c236bddcef0a6f12bb2d4202ebb4a0576f1300ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=c236bddcef0a6f12bb2d4202e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 7 10:37:48 2014 +0100 dmime: Remove duplicated "IDirectMusicSegment8" from the method names. --- dlls/dmime/segment.c | 190 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 126 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c236bddcef0a6f12bb2d4…

1 0

Andrey Gusev : d3dx9_xx: Correct filename string.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: 4ec773a0991cc6bacb7e57999ecb531f46db21f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ec773a0991cc6bacb7e57999… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jan 6 16:21:02 2014 +0200 d3dx9_xx: Correct filename string. --- dlls/d3dx9_24/version.rc | 2 +- dlls/d3dx9_25/version.rc | 2 +- dlls/d3dx9_26/version.rc | 2 +- dlls/d3dx9_27/version.rc | 2 +- dlls/d3dx9_28/version.rc | 2 +- dlls/d3dx9_29/version.rc | 2 +- dlls/d3dx9_30/version.rc | 2 +- dlls/d3dx9_31/version.rc | 2 +- dlls/d3dx9_32/version.rc | 2 +- dlls/d3dx9_33/version.rc | 2 +- dlls/d3dx9_34/version.rc | 2 +- dlls/d3dx9_35/version.rc | 2 +- dlls/d3dx9_36/version.rc | 2 +- dlls/d3dx9_37/version.rc | 2 +- dlls/d3dx9_38/version.rc | 2 +- dlls/d3dx9_39/version.rc | 2 +- dlls/d3dx9_40/version.rc | 2 +- dlls/d3dx9_41/version.rc | 2 +- dlls/d3dx9_42/version.rc | 2 +- dlls/d3dx9_43/version.rc | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_24/version.rc b/dlls/d3dx9_24/version.rc index 8deff20..80a48cb 100644 --- a/dlls/d3dx9_24/version.rc +++ b/dlls/d3dx9_24/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_24.dll" #define WINE_FILEVERSION 9,5,132,0 #define WINE_FILEVERSION_STR "9.5.132.0" #define WINE_PRODUCTVERSION 9,5,132,0 diff --git a/dlls/d3dx9_25/version.rc b/dlls/d3dx9_25/version.rc index 922770c..6f89654 100644 --- a/dlls/d3dx9_25/version.rc +++ b/dlls/d3dx9_25/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_25.dll" #define WINE_FILEVERSION 9,6,168,0 #define WINE_FILEVERSION_STR "9.6.168.0" #define WINE_PRODUCTVERSION 9,6,168,0 diff --git a/dlls/d3dx9_26/version.rc b/dlls/d3dx9_26/version.rc index 56edd13..0497ee5 100644 --- a/dlls/d3dx9_26/version.rc +++ b/dlls/d3dx9_26/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_26.dll" #define WINE_FILEVERSION 9,7,239,0 #define WINE_FILEVERSION_STR "9.7.239.0" #define WINE_PRODUCTVERSION 9,7,239,0 diff --git a/dlls/d3dx9_27/version.rc b/dlls/d3dx9_27/version.rc index 82be05e..0ecef4b 100644 --- a/dlls/d3dx9_27/version.rc +++ b/dlls/d3dx9_27/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_27.dll" #define WINE_FILEVERSION 9,8,299,0 #define WINE_FILEVERSION_STR "9.8.299.0" #define WINE_PRODUCTVERSION 9,8,299,0 diff --git a/dlls/d3dx9_28/version.rc b/dlls/d3dx9_28/version.rc index 0f61f70..67f9e55 100644 --- a/dlls/d3dx9_28/version.rc +++ b/dlls/d3dx9_28/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_28.dll" #define WINE_FILEVERSION 9,10,455,0 #define WINE_FILEVERSION_STR "9.10.455.0" #define WINE_PRODUCTVERSION 9,10,455,0 diff --git a/dlls/d3dx9_29/version.rc b/dlls/d3dx9_29/version.rc index f6f7b13..8fcd63d 100644 --- a/dlls/d3dx9_29/version.rc +++ b/dlls/d3dx9_29/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_29.dll" #define WINE_FILEVERSION 9,11,519,0 #define WINE_FILEVERSION_STR "9.11.519.0" #define WINE_PRODUCTVERSION 9,11,519,0 diff --git a/dlls/d3dx9_30/version.rc b/dlls/d3dx9_30/version.rc index b10286e..575cbfe 100644 --- a/dlls/d3dx9_30/version.rc +++ b/dlls/d3dx9_30/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_30.dll" #define WINE_FILEVERSION 9,12,589,0 #define WINE_FILEVERSION_STR "9.12.589.0" #define WINE_PRODUCTVERSION 9,12,589,0 diff --git a/dlls/d3dx9_31/version.rc b/dlls/d3dx9_31/version.rc index eb97454..b9d5432 100644 --- a/dlls/d3dx9_31/version.rc +++ b/dlls/d3dx9_31/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_31.dll" #define WINE_FILEVERSION 9,15,779,0 #define WINE_FILEVERSION_STR "9.15.779.0" #define WINE_PRODUCTVERSION 9,15,779,0 diff --git a/dlls/d3dx9_32/version.rc b/dlls/d3dx9_32/version.rc index 330f8be..ca1ebde 100644 --- a/dlls/d3dx9_32/version.rc +++ b/dlls/d3dx9_32/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_32.dll" #define WINE_FILEVERSION 9,16,843,0 #define WINE_FILEVERSION_STR "9.16.843.0" #define WINE_PRODUCTVERSION 9,16,843,0 diff --git a/dlls/d3dx9_33/version.rc b/dlls/d3dx9_33/version.rc index 06eba53..2de5aa0 100644 --- a/dlls/d3dx9_33/version.rc +++ b/dlls/d3dx9_33/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_33.dll" #define WINE_FILEVERSION 9,18,904,15 #define WINE_FILEVERSION_STR "9.18.904.15" #define WINE_PRODUCTVERSION 9,18,904,15 diff --git a/dlls/d3dx9_34/version.rc b/dlls/d3dx9_34/version.rc index 5045d8f..f5385d1 100644 --- a/dlls/d3dx9_34/version.rc +++ b/dlls/d3dx9_34/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_34.dll" #define WINE_FILEVERSION 9,19,949,46 #define WINE_FILEVERSION_STR "9.19.949.46" #define WINE_PRODUCTVERSION 9,19,949,46 diff --git a/dlls/d3dx9_35/version.rc b/dlls/d3dx9_35/version.rc index 6ffaafb..8a6f11f 100644 --- a/dlls/d3dx9_35/version.rc +++ b/dlls/d3dx9_35/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_35.dll" #define WINE_FILEVERSION 9,19,949,1104 #define WINE_FILEVERSION_STR "9.19.949.1104" #define WINE_PRODUCTVERSION 9,19,949,1104 diff --git a/dlls/d3dx9_36/version.rc b/dlls/d3dx9_36/version.rc index 8ca195d..38c2942 100644 --- a/dlls/d3dx9_36/version.rc +++ b/dlls/d3dx9_36/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_36.dll" #define WINE_FILEVERSION 9,19,949,2111 #define WINE_FILEVERSION_STR "9.19.949.2111" #define WINE_PRODUCTVERSION 9,19,949,2111 diff --git a/dlls/d3dx9_37/version.rc b/dlls/d3dx9_37/version.rc index aeb99d2..996388e 100644 --- a/dlls/d3dx9_37/version.rc +++ b/dlls/d3dx9_37/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_37.dll" #define WINE_FILEVERSION 9,22,949,2248 #define WINE_FILEVERSION_STR "9.22.949.2248" #define WINE_PRODUCTVERSION 9,22,949,2248 diff --git a/dlls/d3dx9_38/version.rc b/dlls/d3dx9_38/version.rc index a8fdca8..5c33e25 100644 --- a/dlls/d3dx9_38/version.rc +++ b/dlls/d3dx9_38/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_38.dll" #define WINE_FILEVERSION 9,23,949,2378 #define WINE_FILEVERSION_STR "9.23.949.2378" #define WINE_PRODUCTVERSION 9,23,949,2378 diff --git a/dlls/d3dx9_39/version.rc b/dlls/d3dx9_39/version.rc index 234dcb9..d33fc41 100644 --- a/dlls/d3dx9_39/version.rc +++ b/dlls/d3dx9_39/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_39.dll" #define WINE_FILEVERSION 9,24,949,2307 #define WINE_FILEVERSION_STR "9.24.949.2307" #define WINE_PRODUCTVERSION 9,24,949,2307 diff --git a/dlls/d3dx9_40/version.rc b/dlls/d3dx9_40/version.rc index f951079..79894fd 100644 --- a/dlls/d3dx9_40/version.rc +++ b/dlls/d3dx9_40/version.rc @@ -18,7 +18,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_40.dll" #define WINE_FILEVERSION 9,24,950,2656 #define WINE_FILEVERSION_STR "9.24.950.2656" #define WINE_PRODUCTVERSION 9,24,950,2656 diff --git a/dlls/d3dx9_41/version.rc b/dlls/d3dx9_41/version.rc index 6db7842..2419a7d 100644 --- a/dlls/d3dx9_41/version.rc +++ b/dlls/d3dx9_41/version.rc @@ -18,7 +18,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_41.dll" #define WINE_FILEVERSION 9,26,952,2844 #define WINE_FILEVERSION_STR "9.26.952.2844" #define WINE_PRODUCTVERSION 9,26,952,2844 diff --git a/dlls/d3dx9_42/version.rc b/dlls/d3dx9_42/version.rc index 5733eb9..16afffc 100644 --- a/dlls/d3dx9_42/version.rc +++ b/dlls/d3dx9_42/version.rc @@ -19,7 +19,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_42.dll" #define WINE_FILEVERSION 9,27,952,3001 #define WINE_FILEVERSION_STR "9.27.952.3001" #define WINE_PRODUCTVERSION 9,27,952,3001 diff --git a/dlls/d3dx9_43/version.rc b/dlls/d3dx9_43/version.rc index 865caac..7220bd2 100644 --- a/dlls/d3dx9_43/version.rc +++ b/dlls/d3dx9_43/version.rc @@ -18,7 +18,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_43.dll" #define WINE_FILEVERSION 9,29,952,3111 #define WINE_FILEVERSION_STR "9.29.952.3111" #define WINE_PRODUCTVERSION 9,29,952,3111

1 0