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

Marcus Meissner : wininet: Added missing break (Coverity).
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 6e1f37151c019417426c10031f7a71796c493e4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e1f37151c019417426c10031… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Mar 18 22:14:58 2011 +0100 wininet: Added missing break (Coverity). --- dlls/wininet/internet.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 84d1770..a0db965 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2839,6 +2839,7 @@ BOOL WINAPI InternetSetOptionA(HINTERNET hInternet, DWORD dwOption, break; case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME: optW->Value.ftValue = optA->Value.ftValue; + break; default: WARN("Unknown PER_CONN dwOption: %d, guessing at conversion to Wide\n", optA->dwOption); optW->Value.dwValue = optA->Value.dwValue;

1 0

Michael Stefaniuc : oleaut32: COM cleanup for the IPropertyPageSite iface.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 269f5bbe8110e52fb86163c409109e948f0bdfc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=269f5bbe8110e52fb86163c40… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 24 13:41:22 2011 +0100 oleaut32: COM cleanup for the IPropertyPageSite iface. --- dlls/oleaut32/olepropframe.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/olepropframe.c b/dlls/oleaut32/olepropframe.c index 61655f9..8111e6b 100644 --- a/dlls/oleaut32/olepropframe.c +++ b/dlls/oleaut32/olepropframe.c @@ -36,11 +36,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); typedef struct { - const IPropertyPageSiteVtbl *lpVtbl; + IPropertyPageSite IPropertyPageSite_iface; LCID lcid; LONG ref; } PropertyPageSite; +static inline PropertyPageSite *impl_from_IPropertyPageSite(IPropertyPageSite *iface) +{ + return CONTAINING_RECORD(iface, PropertyPageSite, IPropertyPageSite_iface); +} + static INT_PTR CALLBACK property_sheet_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { IPropertyPage *property_page = (IPropertyPage*)GetWindowLongPtrW(hwnd, DWLP_USER); @@ -86,7 +91,7 @@ static HRESULT WINAPI PropertyPageSite_QueryInterface(IPropertyPageSite* iface, static ULONG WINAPI PropertyPageSite_AddRef(IPropertyPageSite* iface) { - PropertyPageSite *this = (PropertyPageSite*)iface; + PropertyPageSite *this = impl_from_IPropertyPageSite(iface); LONG ref = InterlockedIncrement(&this->ref); TRACE("(%p) ref=%d\n", this, ref); @@ -95,7 +100,7 @@ static ULONG WINAPI PropertyPageSite_AddRef(IPropertyPageSite* iface) static ULONG WINAPI PropertyPageSite_Release(IPropertyPageSite* iface) { - PropertyPageSite *this = (PropertyPageSite *)iface; + PropertyPageSite *this = impl_from_IPropertyPageSite(iface); LONG ref = InterlockedDecrement(&this->ref); TRACE("(%p) ref=%d\n", this, ref); @@ -114,7 +119,7 @@ static HRESULT WINAPI PropertyPageSite_OnStatusChange( static HRESULT WINAPI PropertyPageSite_GetLocaleID( IPropertyPageSite *iface, LCID *pLocaleID) { - PropertyPageSite *this = (PropertyPageSite *)iface; + PropertyPageSite *this = impl_from_IPropertyPageSite(iface); TRACE("(%p, %p)\n", iface, pLocaleID); *pLocaleID = this->lcid; @@ -161,7 +166,7 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) WORD title; } *dialogs; IPropertyPage **property_page; - IPropertyPageSite *property_page_site; + PropertyPageSite *property_page_site; HRESULT res; int i; HMODULE hcomctl; @@ -270,12 +275,13 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) property_page_site = HeapAlloc(GetProcessHeap(), 0, sizeof(PropertyPageSite)); if(!property_page_site) continue; - ((PropertyPageSite*)property_page_site)->lpVtbl = &PropertyPageSiteVtbl; - ((PropertyPageSite*)property_page_site)->ref = 1; - ((PropertyPageSite*)property_page_site)->lcid = lpParams->lcid; + property_page_site->IPropertyPageSite_iface.lpVtbl = &PropertyPageSiteVtbl; + property_page_site->ref = 1; + property_page_site->lcid = lpParams->lcid; - res = IPropertyPage_SetPageSite(property_page[i], property_page_site); - IPropertyPageSite_Release(property_page_site); + res = IPropertyPage_SetPageSite(property_page[i], + &property_page_site->IPropertyPageSite_iface); + IPropertyPageSite_Release(&property_page_site->IPropertyPageSite_iface); if(FAILED(res)) continue;

1 0

Vincent Povirk : gdiplus: Clean up HRGN when GdipGetRegionBounds succeeds too.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 42d1d9e9e008d174db0c51e42b5c779538f9d350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42d1d9e9e008d174db0c51e42… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 21 10:39:59 2011 -0500 gdiplus: Clean up HRGN when GdipGetRegionBounds succeeds too. --- dlls/gdiplus/region.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index f11f3ca..0afbdbd 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -683,17 +683,18 @@ GpStatus WINGDIPAPI GdipGetRegionBounds(GpRegion *region, GpGraphics *graphics, return Ok; } - if(!GetRgnBox(hrgn, &r)){ - DeleteObject(hrgn); - return GenericError; + if(GetRgnBox(hrgn, &r)){ + rect->X = r.left; + rect->Y = r.top; + rect->Width = r.right - r.left; + rect->Height = r.bottom - r.top; } + else + status = GenericError; - rect->X = r.left; - rect->Y = r.top; - rect->Width = r.right - r.left; - rect->Height = r.bottom - r.top; + DeleteObject(hrgn); - return Ok; + return status; } /*****************************************************************************

1 0

Michael Stefaniuc : xmllite: COM cleanup in reader.c.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 337e71d4f314d5fe49dc3839c545dbb46d06453a URL: http://source.winehq.org/git/wine.git/?a=commit;h=337e71d4f314d5fe49dc3839c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 24 13:53:43 2011 +0100 xmllite: COM cleanup in reader.c. --- dlls/xmllite/reader.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 00a48fc..1eb462e 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -38,7 +38,7 @@ static HRESULT xmlreaderinput_query_for_stream(IXmlReaderInput *iface, void **pO typedef struct _xmlreader { - const IXmlReaderVtbl *lpVtbl; + IXmlReader IXmlReader_iface; LONG ref; IXmlReaderInput *input; ISequentialStream *stream;/* stored as sequential stream, cause currently @@ -49,19 +49,19 @@ typedef struct _xmlreader typedef struct _xmlreaderinput { - const IUnknownVtbl *lpVtbl; + IXmlReaderInput IXmlReaderInput_iface; LONG ref; IUnknown *input; /* reference passed on IXmlReaderInput creation */ } xmlreaderinput; static inline xmlreader *impl_from_IXmlReader(IXmlReader *iface) { - return (xmlreader *)((char*)iface - FIELD_OFFSET(xmlreader, lpVtbl)); + return CONTAINING_RECORD(iface, xmlreader, IXmlReader_iface); } static inline xmlreaderinput *impl_from_IXmlReaderInput(IXmlReaderInput *iface) { - return (xmlreaderinput *)((char*)iface - FIELD_OFFSET(xmlreaderinput, lpVtbl)); + return CONTAINING_RECORD(iface, xmlreaderinput, IXmlReaderInput_iface); } static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, void** ppvObject) @@ -450,14 +450,14 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **pObject, IMalloc *pMalloc) reader = HeapAlloc(GetProcessHeap(), 0, sizeof (*reader)); if(!reader) return E_OUTOFMEMORY; - reader->lpVtbl = &xmlreader_vtbl; + reader->IXmlReader_iface.lpVtbl = &xmlreader_vtbl; reader->ref = 1; reader->stream = NULL; reader->input = NULL; reader->state = XmlReadState_Closed; reader->line = reader->pos = 0; - *pObject = &reader->lpVtbl; + *pObject = &reader->IXmlReader_iface; TRACE("returning iface %p\n", *pObject); @@ -481,11 +481,11 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, readerinput = HeapAlloc(GetProcessHeap(), 0, sizeof (*readerinput)); if(!readerinput) return E_OUTOFMEMORY; - readerinput->lpVtbl = &xmlreaderinput_vtbl; + readerinput->IXmlReaderInput_iface.lpVtbl = &xmlreaderinput_vtbl; readerinput->ref = 1; IUnknown_QueryInterface(stream, &IID_IUnknown, (void**)&readerinput->input); - *ppInput = (IXmlReaderInput*)&readerinput->lpVtbl; + *ppInput = &readerinput->IXmlReaderInput_iface; TRACE("returning iface %p\n", *ppInput);

1 0

Akihiro Sagawa : inetcpl.cpl: Update Japanese translation.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: d468fcee317608fa33f5965ecdee96a91f01da7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d468fcee317608fa33f5965ec… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Mar 26 22:57:47 2011 +0900 inetcpl.cpl: Update Japanese translation. --- dlls/inetcpl.cpl/cpl_Ja.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Ja.rc b/dlls/inetcpl.cpl/cpl_Ja.rc index b50ab01..eb17a17 100644 --- a/dlls/inetcpl.cpl/cpl_Ja.rc +++ b/dlls/inetcpl.cpl/cpl_Ja.rc @@ -41,11 +41,11 @@ BEGIN PUSHBUTTON "現在のページ(&C)", IDC_HOME_CURRENT, 58, 36, 80, 14 PUSHBUTTON "デフォルト(&D)", IDC_HOME_DEFAULT, 144, 36, 80, 14 PUSHBUTTON "空白(&B)", IDC_HOME_BLANK, 230, 36, 80, 14 - GROUPBOX " Browsing history ", IDC_STATIC, 4, 60, 312, 46 - LTEXT "You can delete cached pages, cookies and other data.", + GROUPBOX " 閲覧履歴 ", IDC_STATIC, 4, 60, 312, 46 + LTEXT "キャッシュされたページやクッキー、その他のデータを削除できます。", IDC_STATIC, 58, 72, 252, 10 - PUSHBUTTON "Delete &files...", IDC_HISTORY_DELETE, 144, 86, 80, 14 - PUSHBUTTON "&Settings...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 + PUSHBUTTON "ファイルを削除(&F)...", IDC_HISTORY_DELETE, 144, 86, 80, 14 + PUSHBUTTON "設定(&S)...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 END

1 0

Vincent Povirk : gdiplus: Initialize the ImageAttributes in GdipCreateTexture2I.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 4266b154bebc92d167b8e243b2b0c2754e8dd290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4266b154bebc92d167b8e243b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 23 14:27:47 2011 -0500 gdiplus: Initialize the ImageAttributes in GdipCreateTexture2I. --- dlls/gdiplus/brush.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 88958a7..d6fb62d 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -940,14 +940,22 @@ GpStatus WINGDIPAPI GdipCreateTextureIAI(GpImage *image, GDIPCONST GpImageAttrib GpStatus WINGDIPAPI GdipCreateTexture2I(GpImage *image, GpWrapMode wrapmode, INT x, INT y, INT width, INT height, GpTexture **texture) { - GpImageAttributes imageattr; + GpImageAttributes *imageattr; + GpStatus stat; TRACE("%p %d %d %d %d %d %p\n", image, wrapmode, x, y, width, height, texture); - imageattr.wrap = wrapmode; + stat = GdipCreateImageAttributes(&imageattr); + + if (stat == Ok) + { + imageattr->wrap = wrapmode; - return GdipCreateTextureIA(image, &imageattr, x, y, width, height, texture); + stat = GdipCreateTextureIA(image, imageattr, x, y, width, height, texture); + } + + return stat; } GpStatus WINGDIPAPI GdipGetBrushType(GpBrush *brush, GpBrushType *type)

1 0

Dmitry Timoshkov : ntdll: Use an NtWriteFile pointer instead of a static import.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: bfd69719a6d097205ba594cf45d21775a3eac9e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfd69719a6d097205ba594cf4… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Mar 22 16:18:09 2011 +0800 ntdll: Use an NtWriteFile pointer instead of a static import. --- dlls/ntdll/tests/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index c473262..58e4a4b 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -840,8 +840,8 @@ static void append_file_test(void) U(iosb).Status = STATUS_PENDING; iosb.Information = 0; - status = NtWriteFile(handle, NULL, NULL, NULL, &iosb, - text, sizeof(text), NULL, NULL); + status = pNtWriteFile(handle, NULL, NULL, NULL, &iosb, + text, sizeof(text), NULL, NULL); if (status == STATUS_PENDING) {

1 0

Dan Kegel : winemenubuilder: File associations should set wineprefix.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 94462664c5cac1b8e72bf8d2258731d796d9dc9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=94462664c5cac1b8e72bf8d22… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Mar 22 12:36:45 2011 +0000 winemenubuilder: File associations should set wineprefix. --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 9aae73f..8b230b1 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2242,7 +2242,7 @@ static BOOL write_freedesktop_association_entry(const char *desktopPath, const c fprintf(desktop, "Type=Application\n"); fprintf(desktop, "Name=%s\n", friendlyAppName); fprintf(desktop, "MimeType=%s;\n", mimeType); - fprintf(desktop, "Exec=wine start /ProgIDOpen %s %%f\n", progId); + fprintf(desktop, "Exec=env WINEPREFIX=\"%s\" wine start /ProgIDOpen %s %%f\n", wine_get_config_dir(), progId); fprintf(desktop, "NoDisplay=true\n"); fprintf(desktop, "StartupNotify=true\n"); if (openWithIcon)

1 0

Michael Stefaniuc : browseui/tests: COM cleanup in autocomplete.c.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 4c98182a5b892c6bf85f10e5aa9fef3fc4fd239b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c98182a5b892c6bf85f10e5a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 24 13:44:14 2011 +0100 browseui/tests: COM cleanup in autocomplete.c. --- dlls/browseui/tests/autocomplete.c | 44 +++++++++++++++++++++-------------- 1 files changed, 26 insertions(+), 18 deletions(-) diff --git a/dlls/browseui/tests/autocomplete.c b/dlls/browseui/tests/autocomplete.c index 89f864d..e56c599 100644 --- a/dlls/browseui/tests/autocomplete.c +++ b/dlls/browseui/tests/autocomplete.c @@ -55,8 +55,8 @@ static LPWSTR strdup_AtoW(LPCSTR str) typedef struct { - IEnumStringVtbl *vtbl; - IACListVtbl *aclVtbl; + IEnumString IEnumString_iface; + IACList IACList_iface; LONG ref; HRESULT expret; INT expcount; @@ -68,17 +68,22 @@ typedef struct extern IEnumStringVtbl TestACLVtbl; extern IACListVtbl TestACL_ACListVtbl; +static inline TestACL *impl_from_IEnumString(IEnumString *iface) +{ + return CONTAINING_RECORD(iface, TestACL, IEnumString_iface); +} + static TestACL *impl_from_IACList(IACList *iface) { - return (TestACL *)((char *)iface - FIELD_OFFSET(TestACL, aclVtbl)); + return CONTAINING_RECORD(iface, TestACL, IACList_iface); } static TestACL *TestACL_Constructor(int limit, const char **strings) { TestACL *This = CoTaskMemAlloc(sizeof(TestACL)); ZeroMemory(This, sizeof(*This)); - This->vtbl = &TestACLVtbl; - This->aclVtbl = &TestACL_ACListVtbl; + This->IEnumString_iface.lpVtbl = &TestACLVtbl; + This->IACList_iface.lpVtbl = &TestACL_ACListVtbl; This->ref = 1; This->expret = S_OK; This->limit = limit; @@ -88,14 +93,14 @@ static TestACL *TestACL_Constructor(int limit, const char **strings) static ULONG STDMETHODCALLTYPE TestACL_AddRef(IEnumString *iface) { - TestACL *This = (TestACL *)iface; + TestACL *This = impl_from_IEnumString(iface); trace("ACL(%p): addref (%d)\n", This, This->ref+1); return InterlockedIncrement(&This->ref); } static ULONG STDMETHODCALLTYPE TestACL_Release(IEnumString *iface) { - TestACL *This = (TestACL *)iface; + TestACL *This = impl_from_IEnumString(iface); ULONG res; res = InterlockedDecrement(&This->ref); @@ -105,7 +110,7 @@ static ULONG STDMETHODCALLTYPE TestACL_Release(IEnumString *iface) static HRESULT STDMETHODCALLTYPE TestACL_QueryInterface(IEnumString *iface, REFIID iid, LPVOID *ppvOut) { - TestACL *This = (TestACL *)iface; + TestACL *This = impl_from_IEnumString(iface); *ppvOut = NULL; if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IEnumString)) { @@ -113,7 +118,7 @@ static HRESULT STDMETHODCALLTYPE TestACL_QueryInterface(IEnumString *iface, REFI } else if (IsEqualGUID(iid, &IID_IACList)) { - *ppvOut = &This->aclVtbl; + *ppvOut = &This->IACList_iface; } if (*ppvOut) @@ -131,7 +136,7 @@ static HRESULT STDMETHODCALLTYPE TestACL_QueryInterface(IEnumString *iface, REFI static HRESULT STDMETHODCALLTYPE TestACL_Next(IEnumString *iface, ULONG celt, LPOLESTR *rgelt, ULONG *pceltFetched) { - TestACL *This = (TestACL *)iface; + TestACL *This = impl_from_IEnumString(iface); ULONG i; trace("ACL(%p): read %d item(s)\n", This, celt); @@ -164,7 +169,7 @@ static HRESULT STDMETHODCALLTYPE TestACL_Clone(IEnumString *iface, IEnumString * static HRESULT STDMETHODCALLTYPE TestACL_Reset(IEnumString *iface) { - TestACL *This = (TestACL *)iface; + TestACL *This = impl_from_IEnumString(iface); trace("ACL(%p): Reset\n", This); This->pos = 0; return S_OK; @@ -173,7 +178,7 @@ static HRESULT STDMETHODCALLTYPE TestACL_Reset(IEnumString *iface) static HRESULT STDMETHODCALLTYPE TestACL_Expand(IACList *iface, LPCOLESTR str) { TestACL *This = impl_from_IACList(iface); - trace("ACL(%p): Expand\n", impl_from_IACList(iface)); + trace("ACL(%p): Expand\n", This); This->expcount++; return This->expret; } @@ -192,17 +197,20 @@ IEnumStringVtbl TestACLVtbl = static ULONG STDMETHODCALLTYPE TestACL_ACList_AddRef(IACList *iface) { - return TestACL_AddRef((IEnumString *)impl_from_IACList(iface)); + TestACL *This = impl_from_IACList(iface); + return TestACL_AddRef(&This->IEnumString_iface); } static ULONG STDMETHODCALLTYPE TestACL_ACList_Release(IACList *iface) { - return TestACL_Release((IEnumString *)impl_from_IACList(iface)); + TestACL *This = impl_from_IACList(iface); + return TestACL_Release(&This->IEnumString_iface); } static HRESULT STDMETHODCALLTYPE TestACL_ACList_QueryInterface(IACList *iface, REFIID iid, LPVOID *ppvout) { - return TestACL_QueryInterface((IEnumString *)impl_from_IACList(iface), iid, ppvout); + TestACL *This = impl_from_IACList(iface); + return TestACL_QueryInterface(&This->IEnumString_iface, iid, ppvout); } IACListVtbl TestACL_ACListVtbl = @@ -259,8 +267,8 @@ static void test_ACLMulti(void) acl1 = TestACL_Constructor(3, strings1); acl2 = TestACL_Constructor(3, strings2); - stop_on_error(mgr->lpVtbl->Append(mgr, (IUnknown *)acl1)); - stop_on_error(mgr->lpVtbl->Append(mgr, (IUnknown *)acl2)); + stop_on_error(mgr->lpVtbl->Append(mgr, (IUnknown *)&acl1->IACList_iface)); + stop_on_error(mgr->lpVtbl->Append(mgr, (IUnknown *)&acl2->IACList_iface)); ok(mgr->lpVtbl->Append(mgr, NULL) == E_FAIL, "Unexpected return from Append\n"); expect_str(obj, "a"); expect_str(obj, "c"); @@ -307,7 +315,7 @@ static void test_ACLMulti(void) acl2->expret = E_FAIL; ok(acl->lpVtbl->Expand(acl, exp) == E_FAIL, "Unexpected Expand return\n"); - stop_on_error(mgr->lpVtbl->Remove(mgr, (IUnknown *)acl1)); + stop_on_error(mgr->lpVtbl->Remove(mgr, (IUnknown *)&acl1->IACList_iface)); ok(acl1->ref == 1, "acl1 not released\n"); expect_end(obj); obj->lpVtbl->Reset(obj);

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard March 28, 2011

March 28, 2011

Module: wine Branch: master Commit: 41691ba46b1425e7880ead2547ae7a7097dd69fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=41691ba46b1425e7880ead254… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Mar 26 22:57:50 2011 +0900 po: Update Japanese translation. --- po/ja.po | 30 +++++++----------------------- 1 files changed, 7 insertions(+), 23 deletions(-) diff --git a/po/ja.po b/po/ja.po index c1f8255..1b1eba0 100644 --- a/po/ja.po +++ b/po/ja.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-02-11 15:31+0900\n" +"PO-Revision-Date: 2011-03-23 23:12+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: none\n" "Language: Japanese\n" @@ -2781,7 +2781,6 @@ msgid "Signal pending\n" msgstr "シグナルは処理待ちです。\n" #: winerror.mc:681 -#, fuzzy msgid "Max system-wide thread count reached\n" msgstr "システム全体のスレッド数上限に達しました。\n" @@ -4215,9 +4214,8 @@ msgid "Private dialog index\n" msgstr "プライベートダイアログインデックスです。\n" #: winerror.mc:2476 -#, fuzzy msgid "List box ID not found\n" -msgstr "リストボックス識別子が見つかりません。\n" +msgstr "リストボックス識別子が見つかりません。\n" #: winerror.mc:2481 msgid "No wildcard characters\n" @@ -4280,18 +4278,16 @@ msgid "Hook procedure not installed\n" msgstr "フックプロシジャは設定されていません。\n" #: winerror.mc:2556 -#, fuzzy msgid "Invalid list box message\n" -msgstr "リストボックスメッセージが正しくありません。\n" +msgstr "リストボックスメッセージが正しくありません。\n" #: winerror.mc:2561 msgid "Invalid LB_SETCOUNT sent\n" msgstr "正しくない LB_SETCOUNT が送られました。\n" #: winerror.mc:2566 -#, fuzzy msgid "No tab stops on this list box\n" -msgstr "このリストボックスにタブストップがありません。\n" +msgstr "このリストボックスにタブストップがありません。\n" #: winerror.mc:2571 msgid "Can't destroy object owned by another thread\n" @@ -4306,9 +4302,8 @@ msgid "Window has no system menu\n" msgstr "ウィンドウにはシステムメニューがありません。\n" #: winerror.mc:2586 -#, fuzzy msgid "Invalid message box style\n" -msgstr "メッセージボックスのスタイルが正しくありません。\n" +msgstr "メッセージボックスのスタイルが正しくありません。\n" #: winerror.mc:2591 msgid "Invalid SPI parameter\n" @@ -4359,7 +4354,6 @@ msgid "No system resources\n" msgstr "システムリソースがありません。\n" #: winerror.mc:2651 -#, fuzzy msgid "No non-paged system resources\n" msgstr "非ページシステムリソースがありません。\n" @@ -4372,7 +4366,6 @@ msgid "No working set quota\n" msgstr "ワーキングセットの割当量がありません。\n" #: winerror.mc:2666 -#, fuzzy msgid "No page file quota\n" msgstr "ページファイルの割当量がありません。\n" @@ -4449,7 +4442,6 @@ msgid "Unknown component\n" msgstr "未知のコンポーネントです。\n" #: winerror.mc:2761 -#, fuzzy msgid "Unknown property\n" msgstr "未知のプロパティです。\n" @@ -4982,7 +4974,6 @@ msgid "Invalid printer command\n" msgstr "プリンタ　コマンドは正しくありません。\n" #: winerror.mc:3431 -#, fuzzy msgid "Invalid data type\n" msgstr "データの種類が正しくありません。\n" @@ -5297,7 +5288,6 @@ msgid "insert disk %s" msgstr "ディスク %s を挿入" #: msi.rc:30 -#, fuzzy msgid "" "Windows Installer %s\n" "\n" @@ -6875,7 +6865,6 @@ msgid "An invalid parameter was passed to a system function." msgstr "システム関数に無効なパラメータが渡されました。" #: winmm.rc:42 -#, fuzzy msgid "" "The specified format is not supported or cannot be translated. Use the " "Capabilities function to determine the supported formats." @@ -7068,7 +7057,6 @@ msgstr "" "指定されたコマンドは「all」をデバイス名として使用することができません。" #: winmm.rc:77 -#, fuzzy msgid "" "Errors occurred in more than one device. Specify each command and device " "separately to determine which devices caused the error." @@ -7987,7 +7975,6 @@ msgid "REN <filename> is the short version of RENAME. It renames a file.\n" msgstr "REN <ファイル名> は RENAME の短縮版です。ファイルを変名します。\n" #: cmd.rc:158 -#, fuzzy msgid "RENAME <filename> renames a file.\n" msgstr "RENAME <ファイル名> はファイルを変名します。\n" @@ -8083,9 +8070,8 @@ msgstr "" "Wine環境ではverifyフラグは意味を持ちません。\n" #: cmd.rc:204 -#, fuzzy msgid "VER displays the version of cmd you are running.\n" -msgstr "VER は動作しているcmdのバージョンを表示します\n" +msgstr "VER は動作しているcmdのバージョンを表示します。\n" #: cmd.rc:206 msgid "VOL shows the volume label of a disk device.\n" @@ -10355,7 +10341,6 @@ msgid "CD-ROM" msgstr "CD-ROM" #: winecfg.rc:86 -#, fuzzy msgid "" "You cannot add any more drives.\n" "\n" @@ -11269,9 +11254,8 @@ msgid "&System\tCtrl+1" msgstr "システム(&S)\tCtrl+1" #: wordpad.rc:88 -#, fuzzy msgid "&Pale yellow\tCtrl+2" -msgstr "&PostThat yellowish\tCtrl+2" +msgstr "薄黄色(&P)\tCtrl+2" #: wordpad.rc:93 msgid "&About Wine Wordpad"

1 0