January 2011 - Wine-commits

Austin English : winecfg: Fix a compiler warning on PowerPC.
by Alexandre Julliard 13 Jan '11

13 Jan '11

Module: wine Branch: master Commit: c3d28bae6d1438b82dc45425fbf6677625cc3378 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3d28bae6d1438b82dc45425f… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 12 15:29:55 2011 -0800 winecfg: Fix a compiler warning on PowerPC. --- programs/winecfg/driveui.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index 58adb98..ead74b6 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -307,6 +307,7 @@ static void on_add_click(HWND dialog) char new = 'C'; /* we skip A and B, they are historically floppy drives */ ULONG mask = ~drive_available_mask(0); /* the mask is now which drives aren't available */ int i, c; + INT_PTR ret; while (mask & (1 << (new - 'A'))) { @@ -319,9 +320,10 @@ static void on_add_click(HWND dialog) } - new = DialogBoxParam(0, MAKEINTRESOURCE(IDD_DRIVECHOOSE), dialog, drivechoose_dlgproc, new); + ret = DialogBoxParam(0, MAKEINTRESOURCE(IDD_DRIVECHOOSE), dialog, drivechoose_dlgproc, new); - if( new == -1) return; + if( ret == -1) return; + new = ret; WINE_TRACE("selected drive letter %c\n", new);

1 0

Michael Stefaniuc : wiaservc: COM cleanup for the IClassFactory iface.
by Alexandre Julliard 13 Jan '11

13 Jan '11

Module: wine Branch: master Commit: 70a1ce995445d8f1714044b7893538c6d06f91e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70a1ce995445d8f1714044b78… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 13 01:27:09 2011 +0100 wiaservc: COM cleanup for the IClassFactory iface. --- dlls/wiaservc/factory.c | 11 ++++++++--- dlls/wiaservc/service.c | 5 ++--- dlls/wiaservc/wiaservc_private.h | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/wiaservc/factory.c b/dlls/wiaservc/factory.c index 30caa89..a80b830 100644 --- a/dlls/wiaservc/factory.c +++ b/dlls/wiaservc/factory.c @@ -32,6 +32,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(wia); +static inline ClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, ClassFactoryImpl, IClassFactory_iface); +} + static ULONG WINAPI WIASERVC_IClassFactory_AddRef(LPCLASSFACTORY iface) { @@ -42,11 +47,11 @@ static HRESULT WINAPI WIASERVC_IClassFactory_QueryInterface(LPCLASSFACTORY iface, REFIID riid, LPVOID *ppvObj) { - ClassFactoryImpl *This = (ClassFactoryImpl *) iface; + ClassFactoryImpl *This = impl_from_IClassFactory(iface); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { - *ppvObj = &This->lpVtbl; + *ppvObj = &This->IClassFactory_iface; return S_OK; } @@ -99,5 +104,5 @@ static const IClassFactoryVtbl WIASERVC_IClassFactory_Vtbl = ClassFactoryImpl WIASERVC_ClassFactory = { - &WIASERVC_IClassFactory_Vtbl + { &WIASERVC_IClassFactory_Vtbl } }; diff --git a/dlls/wiaservc/service.c b/dlls/wiaservc/service.c index 14b21bd..c1cdb83 100644 --- a/dlls/wiaservc/service.c +++ b/dlls/wiaservc/service.c @@ -95,9 +95,8 @@ StartCount(void) return FALSE; hr = CoRegisterClassObject(&CLSID_WiaDevMgr, - (IUnknown *) &WIASERVC_ClassFactory, - CLSCTX_LOCAL_SERVER, REGCLS_MULTIPLEUSE, - &dwReg); + (IUnknown *) &WIASERVC_ClassFactory.IClassFactory_iface, + CLSCTX_LOCAL_SERVER, REGCLS_MULTIPLEUSE, &dwReg); if (FAILED(hr)) return FALSE; diff --git a/dlls/wiaservc/wiaservc_private.h b/dlls/wiaservc/wiaservc_private.h index 1032819..72c0b21 100644 --- a/dlls/wiaservc/wiaservc_private.h +++ b/dlls/wiaservc/wiaservc_private.h @@ -23,7 +23,7 @@ typedef struct { - const IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; } ClassFactoryImpl; extern ClassFactoryImpl WIASERVC_ClassFactory;

1 0

Michael Stefaniuc : wiaservc: COM cleanup for the IWiaDevMgr iface.
by Alexandre Julliard 13 Jan '11

13 Jan '11

Module: wine Branch: master Commit: c4e71c2e09b51a46d1b93e3bc8f4e282778b6119 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4e71c2e09b51a46d1b93e3bc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 13 01:29:25 2011 +0100 wiaservc: COM cleanup for the IWiaDevMgr iface. --- dlls/wiaservc/wiadevmgr.c | 30 +++++++++++++++--------------- dlls/wiaservc/wiaservc_private.h | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wiaservc/wiadevmgr.c b/dlls/wiaservc/wiadevmgr.c index 6cfc3e7..fea4e94 100644 --- a/dlls/wiaservc/wiadevmgr.c +++ b/dlls/wiaservc/wiadevmgr.c @@ -29,14 +29,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(wia); -static inline wiadevmgr *impl_from_WiaDevMgr(IWiaDevMgr *iface) +static inline wiadevmgr *impl_from_IWiaDevMgr(IWiaDevMgr *iface) { - return (wiadevmgr *)((char*)iface - FIELD_OFFSET(wiadevmgr, lpVtbl)); + return CONTAINING_RECORD(iface, wiadevmgr, IWiaDevMgr_iface); } static HRESULT WINAPI wiadevmgr_QueryInterface(IWiaDevMgr *iface, REFIID riid, void **ppvObject) { - wiadevmgr *This = impl_from_WiaDevMgr(iface); + wiadevmgr *This = impl_from_IWiaDevMgr(iface); TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppvObject); @@ -54,14 +54,14 @@ static HRESULT WINAPI wiadevmgr_QueryInterface(IWiaDevMgr *iface, REFIID riid, v static ULONG WINAPI wiadevmgr_AddRef(IWiaDevMgr *iface) { - wiadevmgr *This = impl_from_WiaDevMgr(iface); + wiadevmgr *This = impl_from_IWiaDevMgr(iface); return InterlockedIncrement(&This->ref); } static ULONG WINAPI wiadevmgr_Release(IWiaDevMgr *iface) { ULONG ref; - wiadevmgr *This = impl_from_WiaDevMgr(iface); + wiadevmgr *This = impl_from_IWiaDevMgr(iface); ref = InterlockedDecrement(&This->ref); if (ref == 0) @@ -71,14 +71,14 @@ static ULONG WINAPI wiadevmgr_Release(IWiaDevMgr *iface) static HRESULT WINAPI wiadevmgr_EnumDeviceInfo(IWiaDevMgr *iface, LONG lFlag, IEnumWIA_DEV_INFO **ppIEnum) { - wiadevmgr *This = impl_from_WiaDevMgr(iface); + wiadevmgr *This = impl_from_IWiaDevMgr(iface); FIXME("(%p, %d, %p): stub\n", This, lFlag, ppIEnum); return E_NOTIMPL; } static HRESULT WINAPI wiadevmgr_CreateDevice(IWiaDevMgr *iface, BSTR bstrDeviceID, IWiaItem **ppWiaItemRoot) { - wiadevmgr *This = impl_from_WiaDevMgr(iface); + wiadevmgr *This = impl_from_IWiaDevMgr(iface); FIXME("(%p, %s, %p): stub\n", This, debugstr_w(bstrDeviceID), ppWiaItemRoot); return E_NOTIMPL; } @@ -86,7 +86,7 @@ static HRESULT WINAPI wiadevmgr_CreateDevice(IWiaDevMgr *iface, BSTR bstrDeviceI static HRESULT WINAPI wiadevmgr_SelectDeviceDlg(IWiaDevMgr *iface, HWND hwndParent, LONG lDeviceType, LONG lFlags, BSTR *pbstrDeviceID, IWiaItem **ppItemRoot) { - wiadevmgr *This = impl_from_WiaDevMgr(iface); + wiadevmgr *This = impl_from_IWiaDevMgr(iface); FIXME("(%p, %p, %d, 0x%x, %p, %p): stub\n", This, hwndParent, lDeviceType, lFlags, pbstrDeviceID, ppItemRoot); return E_NOTIMPL; } @@ -94,7 +94,7 @@ static HRESULT WINAPI wiadevmgr_SelectDeviceDlg(IWiaDevMgr *iface, HWND hwndPare static HRESULT WINAPI wiadevmgr_SelectDeviceDlgID(IWiaDevMgr *iface, HWND hwndParent, LONG lDeviceType, LONG lFlags, BSTR *pbstrDeviceID) { - wiadevmgr *This = impl_from_WiaDevMgr(iface); + wiadevmgr *This = impl_from_IWiaDevMgr(iface); FIXME("(%p, %p, %d, 0x%x, %p): stub\n", This, hwndParent, lDeviceType, lFlags, pbstrDeviceID); return E_NOTIMPL; } @@ -103,7 +103,7 @@ static HRESULT WINAPI wiadevmgr_GetImageDlg(IWiaDevMgr *iface, HWND hwndParent, LONG lFlags, LONG lIntent, IWiaItem *pItemRoot, BSTR bstrFilename, GUID *pguidFormat) { - wiadevmgr *This = impl_from_WiaDevMgr(iface); + wiadevmgr *This = impl_from_IWiaDevMgr(iface); FIXME("(%p, %p, %d, 0x%x, %d, %p, %s, %s): stub\n", This, hwndParent, lDeviceType, lFlags, lIntent, pItemRoot, debugstr_w(bstrFilename), debugstr_guid(pguidFormat)); return E_NOTIMPL; @@ -113,7 +113,7 @@ static HRESULT WINAPI wiadevmgr_RegisterEventCallbackProgram(IWiaDevMgr *iface, const GUID *pEventGUID, BSTR bstrCommandline, BSTR bstrName, BSTR bstrDescription, BSTR bstrIcon) { - wiadevmgr *This = impl_from_WiaDevMgr(iface); + wiadevmgr *This = impl_from_IWiaDevMgr(iface); FIXME("(%p, 0x%x, %s, %s, %s, %s, %s, %s): stub\n", This, lFlags, debugstr_w(bstrDeviceID), debugstr_guid(pEventGUID), debugstr_w(bstrCommandline), debugstr_w(bstrName), debugstr_w(bstrDescription), debugstr_w(bstrIcon)); @@ -124,7 +124,7 @@ static HRESULT WINAPI wiadevmgr_RegisterEventCallbackInterface(IWiaDevMgr *iface const GUID *pEventGUID, IWiaEventCallback *pIWiaEventCallback, IUnknown **pEventObject) { - wiadevmgr *This = impl_from_WiaDevMgr(iface); + wiadevmgr *This = impl_from_IWiaDevMgr(iface); FIXME("(%p, 0x%x, %s, %s, %p, %p): stub\n", This, lFlags, debugstr_w(bstrDeviceID), debugstr_guid(pEventGUID), pIWiaEventCallback, pEventObject); return E_NOTIMPL; @@ -134,7 +134,7 @@ static HRESULT WINAPI wiadevmgr_RegisterEventCallbackCLSID(IWiaDevMgr *iface, LO const GUID *pEventGUID, const GUID *pClsID, BSTR bstrName, BSTR bstrDescription, BSTR bstrIcon) { - wiadevmgr *This = impl_from_WiaDevMgr(iface); + wiadevmgr *This = impl_from_IWiaDevMgr(iface); FIXME("(%p, 0x%x, %s, %s, %s, %s, %s, %s): stub\n", This, lFlags, debugstr_w(bstrDeviceID), debugstr_guid(pEventGUID), debugstr_guid(pClsID), debugstr_w(bstrName), debugstr_w(bstrDescription), debugstr_w(bstrIcon)); @@ -143,7 +143,7 @@ static HRESULT WINAPI wiadevmgr_RegisterEventCallbackCLSID(IWiaDevMgr *iface, LO static HRESULT WINAPI wiadevmgr_AddDeviceDlg(IWiaDevMgr *iface, HWND hwndParent, LONG lFlags) { - wiadevmgr *This = impl_from_WiaDevMgr(iface); + wiadevmgr *This = impl_from_IWiaDevMgr(iface); FIXME("(%p, %p, 0x%x): stub\n", This, hwndParent, lFlags); return E_NOTIMPL; } @@ -171,7 +171,7 @@ HRESULT wiadevmgr_Constructor(IUnknown *pUnkOuter, LPVOID *ppObj) This = HeapAlloc(GetProcessHeap(), 0, sizeof(wiadevmgr)); if (This) { - This->lpVtbl = &WIASERVC_IWiaDevMgr_Vtbl; + This->IWiaDevMgr_iface.lpVtbl = &WIASERVC_IWiaDevMgr_Vtbl; This->ref = 1; *ppObj = This; return S_OK; diff --git a/dlls/wiaservc/wiaservc_private.h b/dlls/wiaservc/wiaservc_private.h index 72c0b21..97b9770 100644 --- a/dlls/wiaservc/wiaservc_private.h +++ b/dlls/wiaservc/wiaservc_private.h @@ -30,7 +30,7 @@ extern ClassFactoryImpl WIASERVC_ClassFactory; typedef struct { - const IWiaDevMgrVtbl *lpVtbl; + IWiaDevMgr IWiaDevMgr_iface; LONG ref; } wiadevmgr;

1 0

Alexandre Julliard : cryptui: Unify the spelling of "All files" with the other modules.
by Alexandre Julliard 13 Jan '11

13 Jan '11

1 0

Alexandre Julliard : avifil32: Append the *. * extension by hand after loading the string.
by Alexandre Julliard 13 Jan '11

13 Jan '11

Module: wine Branch: master Commit: fc872b5b15f16bd89a9df09d20efe7bae7e6e30f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc872b5b15f16bd89a9df09d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 12 20:32:10 2011 +0100 avifil32: Append the *.* extension by hand after loading the string. --- dlls/avifil32/api.c | 19 +++++-------------- dlls/avifil32/avifile_Cs.rc | 2 +- dlls/avifil32/avifile_Da.rc | 2 +- dlls/avifil32/avifile_De.rc | 2 +- dlls/avifil32/avifile_En.rc | 2 +- dlls/avifil32/avifile_Es.rc | 2 +- dlls/avifil32/avifile_Fr.rc | 2 +- dlls/avifil32/avifile_He.rc | 2 +- dlls/avifil32/avifile_Hu.rc | 2 +- dlls/avifil32/avifile_It.rc | 2 +- dlls/avifil32/avifile_Ja.rc | 2 +- dlls/avifil32/avifile_Ko.rc | 2 +- dlls/avifil32/avifile_Lt.rc | 2 +- dlls/avifil32/avifile_Nl.rc | 2 +- dlls/avifil32/avifile_No.rc | 2 +- dlls/avifil32/avifile_Pl.rc | 2 +- dlls/avifil32/avifile_Pt.rc | 4 ++-- dlls/avifil32/avifile_Ro.rc | 2 +- dlls/avifil32/avifile_Ru.rc | 2 +- dlls/avifil32/avifile_Si.rc | 2 +- dlls/avifil32/avifile_Sr.rc | 4 ++-- dlls/avifil32/avifile_Sv.rc | 2 +- dlls/avifil32/avifile_Tr.rc | 2 +- dlls/avifil32/avifile_Uk.rc | 2 +- dlls/avifil32/avifile_Zh.rc | 4 ++-- 25 files changed, 32 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fc872b5b15f16bd89a9df…

1 0

Alexandre Julliard : shell32: Build the file filter by hand instead of hardcoding it in resource strings .
by Alexandre Julliard 13 Jan '11

13 Jan '11

Module: wine Branch: master Commit: 7ed304dd382c90dac7518917e2cd9e81c72de24f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ed304dd382c90dac7518917e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 13 12:33:44 2011 +0100 shell32: Build the file filter by hand instead of hardcoding it in resource strings. --- dlls/shell32/dialogs.c | 9 ++++++--- dlls/shell32/shell32_Da.rc | 3 ++- dlls/shell32/shell32_De.rc | 3 ++- dlls/shell32/shell32_En.rc | 3 ++- dlls/shell32/shell32_Es.rc | 3 ++- dlls/shell32/shell32_Fi.rc | 3 ++- dlls/shell32/shell32_Fr.rc | 3 ++- dlls/shell32/shell32_He.rc | 3 ++- dlls/shell32/shell32_Hu.rc | 3 ++- dlls/shell32/shell32_It.rc | 3 ++- dlls/shell32/shell32_Ja.rc | 3 ++- dlls/shell32/shell32_Ko.rc | 3 ++- dlls/shell32/shell32_Lt.rc | 3 ++- dlls/shell32/shell32_Nl.rc | 3 ++- dlls/shell32/shell32_No.rc | 3 ++- dlls/shell32/shell32_Pl.rc | 3 ++- dlls/shell32/shell32_Pt.rc | 6 ++++-- dlls/shell32/shell32_Ro.rc | 3 ++- dlls/shell32/shell32_Ru.rc | 3 ++- dlls/shell32/shell32_Si.rc | 3 ++- dlls/shell32/shell32_Sr.rc | 6 ++++-- dlls/shell32/shell32_Sv.rc | 3 ++- dlls/shell32/shell32_Uk.rc | 3 ++- dlls/shell32/shell32_Zh.rc | 3 ++- dlls/shell32/shresdef.h | 5 +++-- 25 files changed, 59 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7ed304dd382c90dac7518…

1 0

Alexandre Julliard : appwiz.cpl: Build the file filter by hand instead of hardcoding it in resource strings .
by Alexandre Julliard 13 Jan '11

13 Jan '11

Module: wine Branch: master Commit: 85b4d92831d31c639a99272dc6cb166c29d12f22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85b4d92831d31c639a99272dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 13 12:20:14 2011 +0100 appwiz.cpl: Build the file filter by hand instead of hardcoding it in resource strings. --- dlls/appwiz.cpl/Da.rc | 4 +++- dlls/appwiz.cpl/De.rc | 4 +++- dlls/appwiz.cpl/En.rc | 4 +++- dlls/appwiz.cpl/Es.rc | 4 +++- dlls/appwiz.cpl/Fr.rc | 4 +++- dlls/appwiz.cpl/He.rc | 4 +++- dlls/appwiz.cpl/Hu.rc | 4 +++- dlls/appwiz.cpl/It.rc | 4 +++- dlls/appwiz.cpl/Ja.rc | 4 +++- dlls/appwiz.cpl/Ko.rc | 4 +++- dlls/appwiz.cpl/Lt.rc | 4 +++- dlls/appwiz.cpl/Nl.rc | 4 +++- dlls/appwiz.cpl/No.rc | 4 +++- dlls/appwiz.cpl/Pl.rc | 4 +++- dlls/appwiz.cpl/Pt.rc | 8 ++++++-- dlls/appwiz.cpl/Ro.rc | 4 +++- dlls/appwiz.cpl/Ru.rc | 4 +++- dlls/appwiz.cpl/Si.rc | 4 +++- dlls/appwiz.cpl/Sr.rc | 8 ++++++-- dlls/appwiz.cpl/Sv.rc | 4 +++- dlls/appwiz.cpl/Uk.rc | 4 +++- dlls/appwiz.cpl/Zh.rc | 8 ++++++-- dlls/appwiz.cpl/appwiz.c | 13 +++++++++++-- dlls/appwiz.cpl/res.h | 14 ++++++++------ 24 files changed, 94 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=85b4d92831d31c639a992…

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard 13 Jan '11

13 Jan '11

Module: wine Branch: master Commit: 36352aaff9b8f5fbef06351973d93345f4805d38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36352aaff9b8f5fbef0635197… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 12 20:54:13 2011 +0100 po: Update German translation. --- po/de.po | 116 ++++++++++---------------------------------------------------- 1 files changed, 18 insertions(+), 98 deletions(-) diff --git a/po/de.po b/po/de.po index 5b0ce74..5b96518 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-01-11 19:58+0100\n" +"PO-Revision-Date: 2011-01-12 20:41+0100\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -441,13 +441,8 @@ msgid "CA Encryption Certificate" msgstr "CA Verschlüsselungszertifikat" #: crypt32.rc:119 cryptui.rc:145 -#, fuzzy msgid "Key Recovery Agent" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Agent zur Schlüsselwiederherstellung\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Schlüsselwiederherstellung" +msgstr "Agent zur Schlüsselwiederherstellung" #: crypt32.rc:120 msgid "Certificate Template Information" @@ -582,31 +577,16 @@ msgid "Embedded Windows System Component Verification" msgstr "Embedded Windows System Komponenten Verifizierung" #: crypt32.rc:153 cryptui.rc:140 -#, fuzzy msgid "Key Pack Licenses" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Schlüsselpaketlizenzen\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Lizenzschlüssel" +msgstr "Schlüsselpaketlizenzen" #: crypt32.rc:154 cryptui.rc:141 -#, fuzzy msgid "License Server Verification" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Lizenzserver Verifizierung\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Lizenz Server Verifizierung" +msgstr "Lizenzserver Verifizierung" #: crypt32.rc:155 cryptui.rc:143 -#, fuzzy msgid "Smart Card Logon" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Smartcard Login\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Smart Card Anmeldung" +msgstr "Smart Card Anmeldung" #: crypt32.rc:156 cryptui.rc:139 msgid "Digital Rights" @@ -621,66 +601,36 @@ msgid "Key Recovery" msgstr "Schlüsselwiederherstellung" #: crypt32.rc:159 cryptui.rc:137 -#, fuzzy msgid "Document Signing" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Dokumentensignatur\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Dokument signieren" +msgstr "Dokumentensignatur" #: crypt32.rc:160 msgid "IP security IKE intermediate" msgstr "Dazwischenliegende IP Sicherheits-IKE" #: crypt32.rc:161 cryptui.rc:129 -#, fuzzy msgid "File Recovery" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Dateiwiederherstellung\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Datenwiederherstellung" +msgstr "Datenwiederherstellung" #: crypt32.rc:162 cryptui.rc:134 -#, fuzzy msgid "Root List Signer" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Stammlistengeber\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Stammlisten Signierer" +msgstr "Stammlisten Signierer" #: crypt32.rc:163 msgid "All application policies" msgstr "Alle Anwendungsrichtlinien" #: crypt32.rc:164 cryptui.rc:146 -#, fuzzy msgid "Directory Service Email Replication" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Verzeichnisdienst für E-Mail Replikation\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Verzeichnissdienst E-Mail-Replikation" +msgstr "Verzeichnisdienst für E-Mail Replikation" #: crypt32.rc:165 cryptui.rc:142 -#, fuzzy msgid "Certificate Request Agent" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Agent für Zertifikationsanforderung\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Zertifikatsanfrage" +msgstr "Dienst für Zertifikationsanforderung" #: crypt32.rc:166 cryptui.rc:138 -#, fuzzy msgid "Lifetime Signing" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Lebensdauersignatur\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Lebensdauer signieren" +msgstr "Lebensdauersignatur" #: crypt32.rc:167 msgid "All issuance policies" @@ -1584,26 +1534,16 @@ msgid "Stop" msgstr "Stopp" #: hhctrl.rc:38 shdocvw.rc:66 -#, fuzzy msgid "Refresh" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Aktualisieren\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Neu laden" +msgstr "Neu laden" #: hhctrl.rc:39 shdocvw.rc:63 msgid "Back" msgstr "Zurück" #: hhctrl.rc:40 shdocvw.rc:67 -#, fuzzy msgid "Home" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Startseite\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Start" +msgstr "Start" #: hhctrl.rc:41 msgid "Sync" @@ -1794,13 +1734,8 @@ msgid "Array object expected" msgstr "Array Objekt erwartet" #: localspl.rc:28 localui.rc:28 winspool.rc:27 -#, fuzzy msgid "Local Port" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Lokaler Anschluss\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Lokaler Anschluß" +msgstr "Lokaler Anschluss" #: localspl.rc:29 msgid "Local Monitor" @@ -2395,13 +2330,8 @@ msgid "&Save" msgstr "&Speichern" #: shdocvw.rc:33 notepad.rc:30 wordpad.rc:31 -#, fuzzy msgid "Save &as..." -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Speichern &unter...\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Speichern &als..." +msgstr "Speichern &unter..." #: shdocvw.rc:35 msgid "Print &format..." @@ -2409,29 +2339,19 @@ msgstr "Seite &einrichten..." #: shdocvw.rc:36 msgid "Pr&int..." -msgstr "Dr&ucken..." +msgstr "&Drucken..." #: shdocvw.rc:37 wordpad.rc:34 -#, fuzzy msgid "Print previe&w..." -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Seitenansi&cht\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"Seiten&vorschau..." +msgstr "Seitenansi&cht" #: shdocvw.rc:39 msgid "&Properties..." msgstr "Ei&genschaften..." #: shdocvw.rc:40 taskmgr.rc:140 -#, fuzzy msgid "&Close" -msgstr "" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"&Schließen\n" -"#-#-#-#-# de.po (Wine) #-#-#-#-#\n" -"&Beenden" +msgstr "&Beenden" #: shdocvw.rc:42 taskmgr.rc:52 winefile.rc:76 wordpad.rc:66 msgid "&View"

1 0

André Hentschel : kernel32/tests: Use the right return type and a better failed test message.
by Alexandre Julliard 13 Jan '11

13 Jan '11

Module: wine Branch: master Commit: dd07baa824630a1b9edf89e2b0dc2d5c78dbc1c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd07baa824630a1b9edf89e2b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 12 20:54:24 2011 +0100 kernel32/tests: Use the right return type and a better failed test message. --- dlls/kernel32/tests/pipe.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 2fad657..57129b0 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1449,7 +1449,7 @@ static void test_overlapped(void) { DWORD tid, num; HANDLE thread, pipe; - int ret; + BOOL ret; struct overlapped_server_args args; args.pipe_created = CreateEventA(0, 1, 0, 0); @@ -1463,7 +1463,7 @@ static void test_overlapped(void) Sleep(1); ret = WriteFile(pipe, "x", 1, &num, NULL); - ok(ret == 1, "ret %d\n", ret); + ok(ret, "WriteFile failed with error %d\n", GetLastError()); WaitForSingleObject(thread, INFINITE); CloseHandle(pipe);

1 0

Michael Stefaniuc : windowscodecs/tests: Fix crash introduced with eaf394a9ac4c.
by Alexandre Julliard 13 Jan '11

13 Jan '11

Module: wine Branch: master Commit: b1d9b7ee2ad27fe8c25cb2d0724ddab735027890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1d9b7ee2ad27fe8c25cb2d07… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 12 22:00:41 2011 +0100 windowscodecs/tests: Fix crash introduced with eaf394a9ac4c. --- dlls/windowscodecs/tests/converter.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index a720b4b..969dc16 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -179,7 +179,7 @@ static const IWICBitmapSourceVtbl BitmapTestSrc_Vtbl = { static void CreateTestBitmap(const bitmap_data *data, BitmapTestSrc **This) { - *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + *This = HeapAlloc(GetProcessHeap(), 0, sizeof(**This)); if (*This) {

1 0