April 2012 - Wine-commits - list.winehq.org

Francois Gouget : po: Fix some typography issues in the Turkish translation .
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: 0dc3512bc180d295a6b67f995b6ac25faabfb8f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dc3512bc180d295a6b67f995… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 19 22:32:29 2012 +0200 po: Fix some typography issues in the Turkish translation. --- po/tr.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/po/tr.po b/po/tr.po index aa29653..b78ecaa 100644 --- a/po/tr.po +++ b/po/tr.po @@ -3105,7 +3105,7 @@ msgstr "" #: ieframe.rc:36 msgid "Pr&int..." -msgstr "&Yazdır" +msgstr "&Yazdır..." #: ieframe.rc:37 wordpad.rc:34 msgid "Print previe&w" @@ -9033,7 +9033,7 @@ msgstr "Sa&yısal" #: clock.rc:32 notepad.rc:50 winecfg.rc:289 winefile.rc:60 wordpad.rc:81 msgid "&Font..." -msgstr "&Yazıtipi" +msgstr "&Yazıtipi..." #: clock.rc:34 msgid "&Without Titlebar" @@ -9053,7 +9053,7 @@ msgstr "&Her zaman üstte" #: clock.rc:42 msgid "&About Clock" -msgstr "&Saat Hakkında..." +msgstr "&Saat Hakkında" #: clock.rc:48 msgid "Clock" @@ -12687,7 +12687,7 @@ msgstr "&Renk" #: wineconsole.rc:97 msgid "Configuration" -msgstr "Yapılandırma " +msgstr "Yapılandırma" #: wineconsole.rc:100 msgid "Buffer zone" @@ -12896,7 +12896,7 @@ msgstr "Ye&niden Adlandır..." #: winefile.rc:31 msgid "Propert&ies\tAlt+Enter" -msgstr "&Özellikler...\tAlt+Enter" +msgstr "&Özellikler\tAlt+Enter" #: winefile.rc:33 msgid "&Run..."

1 0

Francois Gouget : po: Mark an incomplete Ukrainian translation as fuzzy.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: a8878c0cd5f01c66a8731a7183aa157e8f5c7cb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8878c0cd5f01c66a8731a718… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 19 22:32:56 2012 +0200 po: Mark an incomplete Ukrainian translation as fuzzy. --- po/uk.po | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/po/uk.po b/po/uk.po index 54e94ec..af0c219 100644 --- a/po/uk.po +++ b/po/uk.po @@ -9764,7 +9764,9 @@ msgstr "" "EXIT завершує поточну сесію командного рядка та повертає вас\n" "до операційної системи чи оболонки, з якої ви запустили cmd.\n" +# FIXME: Missing CHOICE #: cmd.rc:304 +#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n"

1 0

Francois Gouget : po: Mark an incorrect Spanish translation as fuzzy.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: 636ed3d95ce506a65dca969de28580f6857fded2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=636ed3d95ce506a65dca969de… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 19 22:34:50 2012 +0200 po: Mark an incorrect Spanish translation as fuzzy. --- po/es.po | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/po/es.po b/po/es.po index 65a93cf..05aa156 100644 --- a/po/es.po +++ b/po/es.po @@ -9599,6 +9599,7 @@ msgstr "" "un subdirectorio.\n" #: cmd.rc:160 +#, fuzzy msgid "RMDIR <dir> deletes a subdirectory.\n" msgstr "" "RMDIR <directorio> es la versión corta de RMDIR. Este comando borra un "

1 0

Francois Gouget : po: Fix some typography issues in the Chinese (PRC) translation.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: 69be5e889f6ec48c4233dc81343785d64bce8427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69be5e889f6ec48c4233dc813… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 19 22:35:45 2012 +0200 po: Fix some typography issues in the Chinese (PRC) translation. --- po/zh_CN.po | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index b9e0bb5..562b8d9 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -767,7 +767,7 @@ msgstr "文件名:" #: comdlg32.rc:484 msgid "Files of type:" -msgstr "文件类型" +msgstr "文件类型:" #: comdlg32.rc:29 msgid "File not found" @@ -2041,7 +2041,7 @@ msgstr "显示(&S):" #: cryptui.rc:202 msgid "&Edit Properties..." -msgstr "编辑属性(&E)" +msgstr "编辑属性(&E)..." #: cryptui.rc:203 msgid "&Copy to File..." @@ -2061,7 +2061,7 @@ msgstr "查看证书(&V)" #: cryptui.rc:215 msgid "Certificate &status:" -msgstr "证书状态(&S)" +msgstr "证书状态(&S):" #: cryptui.rc:221 msgid "Disclaimer" @@ -2211,7 +2211,7 @@ msgstr "导出(&E)..." #: cryptui.rc:344 msgid "&Advanced..." -msgstr "高级(&A)" +msgstr "高级(&A)..." #: cryptui.rc:345 msgid "Certificate intended purposes" @@ -3281,7 +3281,7 @@ msgstr "" #: inetcpl.rc:30 msgid "Security settings for zone: " -msgstr "此区域的安全设置" +msgstr "此区域的安全设置: " #: inetcpl.rc:31 msgid "Custom" @@ -10326,7 +10326,7 @@ msgstr "复制(&C)...\tF8" #: progman.rc:35 msgid "&Properties\tAlt+Enter" -msgstr "属性(&P)...\tAlt+Enter" +msgstr "属性(&P)\tAlt+Enter" #: progman.rc:37 msgid "&Execute..."

1 0

Francois Gouget : po: Fix a Portuguese (Portugal) translation.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: ca5011814a138e9cdb474b558e8a708b88e49272 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca5011814a138e9cdb474b558… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 19 22:41:07 2012 +0200 po: Fix a Portuguese (Portugal) translation. --- po/pt_PT.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/pt_PT.po b/po/pt_PT.po index efd2cd6..47f5ad2 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -10310,7 +10310,7 @@ msgstr "&Quebrar automática de linha" #: notepad.rc:53 msgid "&Search...\tCtrl+F" -msgstr "&Localizar..." +msgstr "&Procurar...\tCtrl+F" #: notepad.rc:54 msgid "&Search next\tF3"

1 0

Aric Stewart : strmbase: Have BaseControlVideo use BaseDispatch.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: 7d5c4ec1f83fc36e1ce835ad3617023e32e616bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d5c4ec1f83fc36e1ce835ad3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Apr 20 07:26:43 2012 -0500 strmbase: Have BaseControlVideo use BaseDispatch. --- dlls/quartz/videorenderer.c | 1 + dlls/strmbase/video.c | 38 +++++++++++++++++++++++--------------- include/wine/strmbase.h | 2 ++ 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 5919ed1..96f9815 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -753,6 +753,7 @@ static ULONG WINAPI VideoRendererInner_Release(IUnknown * iface) if (!refCount) { BaseControlWindow_Destroy(&This->baseControlWindow); + BaseControlVideo_Destroy(&This->baseControlVideo); PostThreadMessageW(This->ThreadID, WM_QUIT, 0, 0); WaitForSingleObject(This->hThread, INFINITE); CloseHandle(This->hThread); diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index 3d5a4e3..83cd37f 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -43,43 +43,51 @@ HRESULT WINAPI BaseControlVideo_Init(BaseControlVideo *pControlVideo, const IBas pControlVideo->pPin = pPin; pControlVideo->pFuncsTable = pFuncsTable; + BaseDispatch_Init(&pControlVideo->baseDispatch, &IID_IBasicVideo); + return S_OK; } -HRESULT WINAPI BaseControlVideoImpl_GetTypeInfoCount(IBasicVideo *iface, UINT*pctinfo) +HRESULT WINAPI BaseControlVideo_Destroy(BaseControlVideo *pControlVideo) { - BaseControlVideo *This = impl_from_IBasicVideo(iface); + return BaseDispatch_Destroy(&pControlVideo->baseDispatch); +} - FIXME("(%p/%p)->(%p): stub !!!\n", This, iface, pctinfo); +HRESULT WINAPI BaseControlVideoImpl_GetTypeInfoCount(IBasicVideo *iface, UINT *pctinfo) +{ + BaseControlVideo *This = impl_from_IBasicVideo(iface); - return S_OK; + return BaseDispatchImpl_GetTypeInfoCount(&This->baseDispatch, pctinfo); } -HRESULT WINAPI BaseControlVideoImpl_GetTypeInfo(IBasicVideo *iface, UINT iTInfo, LCID lcid, ITypeInfo**ppTInfo) +HRESULT WINAPI BaseControlVideoImpl_GetTypeInfo(IBasicVideo *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { BaseControlVideo *This = impl_from_IBasicVideo(iface); - FIXME("(%p/%p)->(%d, %d, %p): stub !!!\n", This, iface, iTInfo, lcid, ppTInfo); - - return S_OK; + return BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, &IID_NULL, iTInfo, lcid, ppTInfo); } -HRESULT WINAPI BaseControlVideoImpl_GetIDsOfNames(IBasicVideo *iface, REFIID riid, LPOLESTR*rgszNames, UINT cNames, LCID lcid, DISPID*rgDispId) +HRESULT WINAPI BaseControlVideoImpl_GetIDsOfNames(IBasicVideo *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { BaseControlVideo *This = impl_from_IBasicVideo(iface); - FIXME("(%p/%p)->(%s (%p), %p, %d, %d, %p): stub !!!\n", This, iface, debugstr_guid(riid), riid, rgszNames, cNames, lcid, rgDispId); - - return S_OK; + return BaseDispatchImpl_GetIDsOfNames(&This->baseDispatch, riid, rgszNames, cNames, lcid, rgDispId); } -HRESULT WINAPI BaseControlVideoImpl_Invoke(IBasicVideo *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS*pDispParams, VARIANT*pVarResult, EXCEPINFO*pExepInfo, UINT*puArgErr) +HRESULT WINAPI BaseControlVideoImpl_Invoke(IBasicVideo *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, UINT *puArgErr) { BaseControlVideo *This = impl_from_IBasicVideo(iface); + HRESULT hr = S_OK; + ITypeInfo *pTypeInfo; - FIXME("(%p/%p)->(%d, %s (%p), %d, %04x, %p, %p, %p, %p): stub !!!\n", This, iface, dispIdMember, debugstr_guid(riid), riid, lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); + hr = BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, riid, 1, lcid, &pTypeInfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(pTypeInfo, &This->IBasicVideo_iface, dispIdMember, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); + ITypeInfo_Release(pTypeInfo); + } - return S_OK; + return hr; } HRESULT WINAPI BaseControlVideoImpl_get_AvgTimePerFrame(IBasicVideo *iface, REFTIME *pAvgTimePerFrame) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index bff7d8f..3e749a5 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -483,6 +483,7 @@ HRESULT WINAPI BaseControlWindowImpl_IsCursorHidden(IVideoWindow *iface, LONG *C typedef struct tagBaseControlVideo { IBasicVideo IBasicVideo_iface; + BaseDispatch baseDispatch; BaseFilter* pFilter; CRITICAL_SECTION* pInterfaceLock; @@ -517,6 +518,7 @@ typedef struct BaseControlVideoFuncTable { } BaseControlVideoFuncTable; HRESULT WINAPI BaseControlVideo_Init(BaseControlVideo *pControlVideo, const IBasicVideoVtbl *lpVtbl, BaseFilter *owner, CRITICAL_SECTION *lock, BasePin* pPin, const BaseControlVideoFuncTable* pFuncsTable); +HRESULT WINAPI BaseControlVideo_Destroy(BaseControlVideo *pControlVideo); HRESULT WINAPI BaseControlVideoImpl_GetTypeInfoCount(IBasicVideo *iface, UINT*pctinfo); HRESULT WINAPI BaseControlVideoImpl_GetTypeInfo(IBasicVideo *iface, UINT iTInfo, LCID lcid, ITypeInfo**ppTInfo);

1 0

Francois Gouget : scrrun/tests: Make test_interfaces() static.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: fe04204d11d6c5cf5274d711956708a245cfad62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe04204d11d6c5cf5274d7119… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 20 08:40:00 2012 +0200 scrrun/tests: Make test_interfaces() static. --- dlls/scrrun/tests/filesystem.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index b86c43c..c48baa4 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -29,7 +29,7 @@ #include "initguid.h" #include "scrrun.h" -void test_interfaces(void) +static void test_interfaces(void) { HRESULT hr; IDispatch *disp;

1 0

Francois Gouget : wineoss.drv: Make get_ossdevice_from_guid() static.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: d76d88a74b86b62ce9ced37bfd6323e29b0653e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d76d88a74b86b62ce9ced37bf… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 20 08:40:04 2012 +0200 wineoss.drv: Make get_ossdevice_from_guid() static. --- dlls/wineoss.drv/mmdevdrv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 70ea416..9b0f5f8 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -588,7 +588,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, return S_OK; } -const OSSDevice *get_ossdevice_from_guid(const GUID *guid) +static const OSSDevice *get_ossdevice_from_guid(const GUID *guid) { OSSDevice *dev_item; LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry)

1 0

Francois Gouget : gdiplus/tests: Make test_pathgradientpresetblend() static .
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: 84bc0f7888846dd731952b2a4144e520de35baee URL: http://source.winehq.org/git/wine.git/?a=commit;h=84bc0f7888846dd731952b2a4… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 20 08:40:12 2012 +0200 gdiplus/tests: Make test_pathgradientpresetblend() static. --- dlls/gdiplus/tests/brush.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 6321011..bf74abd 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -993,7 +993,7 @@ static void test_pathgradientcenterpoint(void) expect(Ok, status); } -void test_pathgradientpresetblend(void) +static void test_pathgradientpresetblend(void) { static const GpPointF path_points[] = {{0,0}, {3,0}, {0,4}}; GpStatus status;

1 0

Francois Gouget : msi: Make create_record() static.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: f5a5cc067a8d01ffd62419e830c9dd61dce97b30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5a5cc067a8d01ffd62419e83… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 20 08:40:15 2012 +0200 msi: Make create_record() static. --- dlls/msi/automation.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index f1a3532..375191e 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -926,7 +926,7 @@ static HRESULT RecordImpl_Invoke( return S_OK; } -HRESULT create_record(MSIHANDLE msiHandle, IDispatch **disp) +static HRESULT create_record(MSIHANDLE msiHandle, IDispatch **disp) { AutomationObject *record; HRESULT hr;

1 0