May 2011 - Wine-Commits - list.winehq.org

Francois Gouget : msi: get_msi_typelib() is not used anymore so remove it.
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: f09bbacf9e0f246911ce7f3a7e3055461f275f20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f09bbacf9e0f246911ce7f3a7… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 3 00:37:41 2011 +0200 msi: get_msi_typelib() is not used anymore so remove it. --- dlls/msi/msi_main.c | 36 ------------------------------------ dlls/msi/msipriv.h | 1 - 2 files changed, 0 insertions(+), 37 deletions(-) diff --git a/dlls/msi/msi_main.c b/dlls/msi/msi_main.c index fa54932..7288f3d 100644 --- a/dlls/msi/msi_main.c +++ b/dlls/msi/msi_main.c @@ -49,8 +49,6 @@ LPVOID gUIContext = NULL; WCHAR *gszLogFile = NULL; HINSTANCE msi_hInstance; -static WCHAR msi_path[MAX_PATH]; -static ITypeLib *msi_typelib; /* * Dll lifetime tracking declaration @@ -77,7 +75,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) DisableThreadLibraryCalls(hinstDLL); break; case DLL_PROCESS_DETACH: - if (msi_typelib) ITypeLib_Release( msi_typelib ); msi_dialog_unregister_class(); msi_free_handle_table(); msi_free( gszLogFile ); @@ -86,39 +83,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } -static CRITICAL_SECTION MSI_typelib_cs; -static CRITICAL_SECTION_DEBUG MSI_typelib_cs_debug = -{ - 0, 0, &MSI_typelib_cs, - { &MSI_typelib_cs_debug.ProcessLocksList, - &MSI_typelib_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": MSI_typelib_cs") } -}; -static CRITICAL_SECTION MSI_typelib_cs = { &MSI_typelib_cs_debug, -1, 0, 0, 0, 0 }; - -ITypeLib *get_msi_typelib( LPWSTR *path ) -{ - EnterCriticalSection( &MSI_typelib_cs ); - - if (!msi_typelib) - { - TRACE("loading typelib\n"); - - if (GetModuleFileNameW( msi_hInstance, msi_path, MAX_PATH )) - LoadTypeLib( msi_path, &msi_typelib ); - } - - LeaveCriticalSection( &MSI_typelib_cs ); - - if (path) - *path = msi_path; - - if (msi_typelib) - ITypeLib_AddRef( msi_typelib ); - - return msi_typelib; -} - typedef struct tagIClassFactoryImpl { IClassFactory IClassFactory_iface; HRESULT (*create_object)( IUnknown*, LPVOID* ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 5c4faca..11b9d5b 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -704,7 +704,6 @@ typedef struct { UINT msi_strcpy_to_awstring( LPCWSTR str, awstring *awbuf, DWORD *sz ) DECLSPEC_HIDDEN; /* msi server interface */ -extern ITypeLib *get_msi_typelib( LPWSTR *path ) DECLSPEC_HIDDEN; extern HRESULT create_msi_custom_remote( IUnknown *pOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; extern HRESULT create_msi_remote_package( IUnknown *pOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; extern HRESULT create_msi_remote_database( IUnknown *pOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN;

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetValue().
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: 46b3727df3eec7b5ce649a28da78e6008d848f6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=46b3727df3eec7b5ce649a28d… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue May 3 14:46:52 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetValue(). --- dlls/d3dx9_36/effect.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 81ef017..6373f1c 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -969,10 +969,22 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetValue(ID3DXBaseEffect *iface, D3DXH static HRESULT WINAPI ID3DXBaseEffectImpl_GetValue(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPVOID data, UINT bytes) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = is_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, data %p, bytes %u stub\n", This, parameter, data, bytes); + TRACE("iface %p, parameter %p, data %p, bytes %u\n", This, parameter, data, bytes); - return E_NOTIMPL; + if (!param) param = get_parameter_by_name(This, NULL, parameter); + + if (data && param && param->data && param->bytes <= bytes) + { + TRACE("Copy %u bytes\n", param->bytes); + memcpy(data, param->data, param->bytes); + return D3D_OK; + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_SetBool(ID3DXBaseEffect *iface, D3DXHANDLE parameter, BOOL b)

1 0

Francois Gouget : winecfg: Fix ellipsis usage in the menu and button labels .
by Alexandre Julliard May 3, 2011

May 3, 2011

1 0

Francois Gouget : winefile: Fix ellipsis usage in the menu and button labels.
by Alexandre Julliard May 3, 2011

May 3, 2011

1 0

Francois Gouget : winhlp32: Fix the ellipsis usage in the menu and button labels.
by Alexandre Julliard May 3, 2011

May 3, 2011

1 0

Francois Gouget : view: Fix ellipsis usage in the menus.
by Alexandre Julliard May 3, 2011

May 3, 2011

1 0

Francois Gouget : regedit: Fix ellipsis usage in the menu labels.
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: d1e487f9400373706244712233b88739f5770f56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e487f940037370624471223… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 3 00:41:17 2011 +0200 regedit: Fix ellipsis usage in the menu labels. --- po/ar.po | 20 +++++--------------- po/bg.po | 24 +++++++++--------------- po/ca.po | 22 +++++++--------------- po/cs.po | 24 +++++++++--------------- po/da.po | 22 ++++++++-------------- po/de.po | 22 ++++++++-------------- po/el.po | 19 +++++-------------- po/en.po | 22 +++++++--------------- po/en_US.po | 24 ++++++++---------------- po/eo.po | 20 +++++--------------- po/es.po | 24 +++++++++--------------- po/fa.po | 20 +++++--------------- po/fi.po | 20 +++++--------------- po/fr.po | 20 +++++++------------- po/he.po | 22 ++++++++-------------- po/hi.po | 18 +++++------------- po/hu.po | 21 +++++++-------------- po/it.po | 22 ++++++++-------------- po/ja.po | 22 ++++++++-------------- po/ko.po | 22 ++++++++-------------- po/lt.po | 22 ++++++++-------------- po/ml.po | 18 +++++------------- po/nb_NO.po | 22 ++++++++-------------- po/nl.po | 22 ++++++++-------------- po/or.po | 18 +++++------------- po/pa.po | 18 +++++------------- po/pl.po | 22 ++++++++-------------- po/pt_BR.po | 21 +++++++-------------- po/pt_PT.po | 22 ++++++++-------------- po/rm.po | 22 +++++++--------------- po/ro.po | 22 ++++++++-------------- po/ru.po | 22 ++++++++-------------- po/sk.po | 19 +++++-------------- po/sl.po | 22 ++++++++-------------- po/sr_RS(a)cyrillic.po | 20 +++++--------------- po/sr_RS(a)latin.po | 20 +++++--------------- po/sv.po | 22 ++++++++-------------- po/te.po | 18 +++++------------- po/th.po | 20 +++++--------------- po/tr.po | 22 ++++++++-------------- po/uk.po | 22 ++++++++-------------- po/wa.po | 23 +++++++---------------- po/wine.pot | 18 +++++------------- po/zh_CN.po | 22 ++++++++-------------- po/zh_TW.po | 22 ++++++++-------------- programs/regedit/regedit.rc | 12 ++++++------ 46 files changed, 317 insertions(+), 646 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1e487f94003737062447…

1 0

Alexandre Julliard : msvcp: Don't define stubs for data exports.
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: 537b35006c553a55acda587d6ebac108c4dc92a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=537b35006c553a55acda587d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 16:59:58 2011 +0200 msvcp: Don't define stubs for data exports. --- dlls/msvcp100/msvcp100.spec | 532 +++++++++++++++--------------- dlls/msvcp60/msvcp60.spec | 360 +++++++++++----------- dlls/msvcp70/msvcp70.spec | 746 +++++++++++++++++++++--------------------- dlls/msvcp71/msvcp71.spec | 712 +++++++++++++++++++++--------------------- dlls/msvcp80/msvcp80.spec | 726 +++++++++++++++++++++--------------------- dlls/msvcp90/msvcp90.spec | 724 +++++++++++++++++++++--------------------- 6 files changed, 1900 insertions(+), 1900 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=537b35006c553a55acda5…

1 0

Marcus Meissner : quartz: Handle NULL return from strchr() (Coverity).
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: 63823061ed2137544fdd8822f64bff6d29a0aa9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=63823061ed2137544fdd8822f… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue May 3 16:19:02 2011 +0200 quartz: Handle NULL return from strchr() (Coverity). --- dlls/quartz/filesource.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 6093713..ab72f4f 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -179,8 +179,8 @@ static HRESULT process_pattern_string(LPCWSTR wszPatternString, IAsyncReader * p if (!(wszPatternString = strchrW(wszPatternString, ','))) hr = E_INVALIDARG; - - wszPatternString++; /* skip ',' */ + else + wszPatternString++; /* skip ',' */ } if (hr == S_OK)

1 0

Aric Stewart : wine.inf: Register wineqtdecoder.dll.
by Alexandre Julliard May 3, 2011

May 3, 2011

Module: wine Branch: master Commit: 14efad5d66f26d129b3a5094e6ab7dacdf484dfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=14efad5d66f26d129b3a5094e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue May 3 08:33:45 2011 -0500 wine.inf: Register wineqtdecoder.dll. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index ee23bb3..1ce4ffc 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2562,6 +2562,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,wiaservc.dll,1 11,,windowscodecs.dll,1 11,,winegstreamer.dll,1 +11,,wineqtdecoder.dll,1 11,,wintrust.dll,1 11,,wmiutils.dll,1 11,,wuapi.dll,1

1 0