December 2013 - Wine-commits

Andrey Gusev : po: Small Ukrainian translation fix.
by Alexandre Julliard 06 Dec '13

06 Dec '13

Module: wine Branch: master Commit: 68f094b73472e9a036e71ad3bb5be26cde74e0ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=68f094b73472e9a036e71ad3b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Dec 6 18:36:02 2013 +0200 po: Small Ukrainian translation fix. --- po/uk.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/uk.po b/po/uk.po index d0fe2f0..bbb04c0 100644 --- a/po/uk.po +++ b/po/uk.po @@ -13928,7 +13928,7 @@ msgstr "&Формат символів" #: wordpad.rc:64 msgid "&Def. char format" -msgstr "Формат символів за &замовч." +msgstr "Формат символів &за замовч." #: wordpad.rc:65 msgid "Paragrap&h format"

1 0

Huw Davies : wordpad: Pass the correct window to the font size list validator.
by Alexandre Julliard 06 Dec '13

06 Dec '13

Module: wine Branch: master Commit: 39538f91f5d396cf4b721086ddddb08a38bc18d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39538f91f5d396cf4b721086d… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 6 16:28:31 2013 +0000 wordpad: Pass the correct window to the font size list validator. --- programs/wordpad/wordpad.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 9eb0700..ec813a7 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2016,7 +2016,7 @@ static LRESULT OnNotify( HWND hWnd, LPARAM lParam) on_fontlist_modified(endEdit->szText); } else if (pHdr->hwndFrom == hwndSizeList) { - on_sizelist_modified(hwndFontList,endEdit->szText); + on_sizelist_modified(hwndSizeList,endEdit->szText); } } return 0;

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 06 Dec '13

06 Dec '13

Module: wine Branch: master Commit: 4661019f641d4df285bada167a34de52bda286a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4661019f641d4df285bada167… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Dec 5 23:00:25 2013 +0200 po: Update Finnish translation. --- po/fi.po | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/po/fi.po b/po/fi.po index ff96124..c344f50 100644 --- a/po/fi.po +++ b/po/fi.po @@ -12702,10 +12702,8 @@ msgid "Select Drive Letter" msgstr "Valitse aseman kirjain" #: winecfg.rc:226 -#, fuzzy -#| msgid "Wine configuration" msgid "Drive configuration" -msgstr "Winen asetukset" +msgstr "Asemien asetukset" #: winecfg.rc:227 msgid "" @@ -12981,10 +12979,8 @@ msgid "Letter" msgstr "Kirjain" #: winecfg.rc:78 -#, fuzzy -#| msgid "New Folder" msgid "Target folder" -msgstr "Uusi kansio" +msgstr "Kohdekansio" #: winecfg.rc:79 msgid ""

1 0

Lauri Kenttä : po: Update Swedish translation.
by Alexandre Julliard 06 Dec '13

06 Dec '13

Module: wine Branch: master Commit: c607ce5eafea73cb632870020a99b7bb3deb1600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c607ce5eafea73cb632870020… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Dec 5 23:41:48 2013 +0200 po: Update Swedish translation. --- po/sv.po | 52 ++++++++++++---------------------------------------- 1 files changed, 12 insertions(+), 40 deletions(-) diff --git a/po/sv.po b/po/sv.po index 1be7ed2..b306c32 100644 --- a/po/sv.po +++ b/po/sv.po @@ -4681,10 +4681,8 @@ msgid "No Unicode translation.\n" msgstr "Ingen Unicode-översättning.\n" #: winerror.mc:1366 -#, fuzzy -#| msgid "DLL init failed.\n" msgid "DLL initialization failed.\n" -msgstr "DLL-initiering misslyckades.\n" +msgstr "DLL-initialisering misslyckades.\n" #: winerror.mc:1371 msgid "Shutdown in progress.\n" @@ -8496,17 +8494,12 @@ msgstr "" "sedan igen." #: winmm.rc:55 winmm.rc:128 -#, fuzzy -#| msgid "" -#| "The current MIDI Mapper setup refers to a MIDI device that is not " -#| "installed on the system. Use MIDI Mapper to edit the setup." msgid "" "The current MIDI Mapper setup refers to a MIDI device that is not installed " "on the system." msgstr "" "Den nuvarande MIDI Mapper-installationen refererar till en MIDI-enhet som " -"inte är installerad på systemet. Använd MIDI Mapper för att ändra " -"installationen." +"inte är installerad på systemet." #: winmm.rc:56 msgid "" @@ -9305,22 +9298,16 @@ msgstr "" "process ärvs av den som anropar processen.\n" #: cmd.rc:43 -#, fuzzy -#| msgid "" -#| "CD <dir> is the short version of CHDIR. It changes the current\n" -#| "default directory.\n" msgid "" "CD <directory> is the short version of CHDIR. It changes the current\n" "default directory.\n" msgstr "" -"CD <dir> är en synonym för CHDIR. Den används för att\n" +"CD <plats> är en synonym för CHDIR. Den används för att\n" "ändra standardsökväg.\n" #: cmd.rc:44 -#, fuzzy -#| msgid "CHDIR <dir> changes the current default directory.\n" msgid "CHDIR <directory> changes the current default directory.\n" -msgstr "CHDIR <dir> ändrar standardsökväg.\n" +msgstr "CHDIR <plats> ändrar standardsökväg.\n" #: cmd.rc:46 msgid "CLS clears the console screen.\n" @@ -9372,11 +9359,6 @@ msgid "ERASE <filename> deletes a file or set of files.\n" msgstr "ERASE <filename> tar bort en eller flera filer.\n" #: cmd.rc:71 -#, fuzzy -#| msgid "" -#| "The FOR command is used to execute a command for each of a set of files.\n" -#| "\n" -#| "Syntax: FOR %variable IN (set) DO command\n" msgid "" "The FOR command is used to execute a command for each of a set of files.\n" "\n" @@ -9386,7 +9368,9 @@ msgid "" msgstr "" "FOR används för att exekvera ett kommando var för ett flertal filer.\n" "\n" -"Syntax: FOR %variabel IN (set) DO kommando\n" +"Användning: FOR %variabel IN (set) DO kommando\n" +"\n" +"%-tecknet måste dubbleras när FOR används i en batchfil.\n" #: cmd.rc:83 msgid "" @@ -9576,14 +9560,10 @@ msgid "RENAME <filename> renames a file.\n" msgstr "RENAME <filnamn> döper om en fil.\n" #: cmd.rc:161 -#, fuzzy -#| msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgid "RD <directory> is the short version of RMDIR. It deletes a directory.\n" msgstr "RD <plats> är en synonym för RMDIR. RD tar bort vald plats.\n" #: cmd.rc:162 -#, fuzzy -#| msgid "RMDIR <dir> deletes a subdirectory.\n" msgid "RMDIR <directory> deletes a directory.\n" msgstr "RMDIR <plats> tar bort vald plats.\n" @@ -9722,15 +9702,11 @@ msgid "" msgstr "" #: cmd.rc:248 -#, fuzzy -#| msgid "" -#| "PUSHD <directoryname> saves the current directory onto a\n" -#| "stack, and then changes the current directory to the supplied one.\n" msgid "" "PUSHD <directory> saves the current directory onto a\n" "stack, and then changes the current directory to the supplied one.\n" msgstr "" -"PUSHD <mappnamn> sparar nuvarande sökväg i en stack,\n" +"PUSHD <plats> sparar nuvarande sökväg i en stack,\n" "och ändrar sedan sökvägen till den angivna mappen.\n" #: cmd.rc:250 @@ -10054,7 +10030,7 @@ msgstr "" #: dxdiag.rc:31 msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]" -msgstr "" +msgstr "Användning: dxdiag [/whql:off | /whql:on] [/t filnamn | /x filnamn]" #: explorer.rc:31 msgid "Wine Explorer" @@ -12300,7 +12276,7 @@ msgstr "Minne använt: %1!u! kB / %2!u! kB" #: taskmgr.rc:272 msgid "Image Name" -msgstr "" +msgstr "Bildnamn" #: taskmgr.rc:273 msgid "PID" @@ -12639,10 +12615,8 @@ msgid "Select Drive Letter" msgstr "Välj enhetsbokstav" #: winecfg.rc:226 -#, fuzzy -#| msgid "Wine configuration" msgid "Drive configuration" -msgstr "Konfiguration av Wine" +msgstr "Enhetskonfiguration" #: winecfg.rc:227 msgid "" @@ -12920,10 +12894,8 @@ msgid "Letter" msgstr "Bokstav" #: winecfg.rc:78 -#, fuzzy -#| msgid "New Folder" msgid "Target folder" -msgstr "Ny mapp" +msgstr "Målmapp" #: winecfg.rc:79 msgid ""

1 0

Akira Nakagawa : po: Update Japanese translation.
by Alexandre Julliard 05 Dec '13

05 Dec '13

Module: wine Branch: master Commit: 6f245443c0e1ae44bf0e76c3b05c58759fbc916c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f245443c0e1ae44bf0e76c3b… Author: Akira Nakagawa <matyapiro31(a)gmail.com> Date: Thu Dec 5 20:10:24 2013 +0900 po: Update Japanese translation. --- po/ja.po | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/po/ja.po b/po/ja.po index 065dc48..8285301 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-10-02 19:45+0900\n" -"Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" +"PO-Revision-Date: 2013-12-05 20:08+0900\n" +"Last-Translator: Akira Nakagawa <matyapiro31(a)yahoo.co.jp>\n" "Language-Team: 日本語 <>\n" "Language: Japanese\n" "MIME-Version: 1.0\n" @@ -4688,8 +4688,6 @@ msgid "No Unicode translation.\n" msgstr "Unicode 変換がありません。\n" #: winerror.mc:1366 -#, fuzzy -#| msgid "DLL init failed.\n" msgid "DLL initialization failed.\n" msgstr "DLL の初期化に失敗しました。\n" @@ -12718,10 +12716,8 @@ msgid "Select Drive Letter" msgstr "ドライブレターを選択" #: winecfg.rc:226 -#, fuzzy -#| msgid "Wine configuration" msgid "Drive configuration" -msgstr "Wine 設定" +msgstr "ドライブの設定" #: winecfg.rc:227 msgid "" @@ -13000,10 +12996,8 @@ msgid "Letter" msgstr "文字" #: winecfg.rc:78 -#, fuzzy -#| msgid "New Folder" msgid "Target folder" -msgstr "新しいフォルダ" +msgstr "対象のフォルダ" #: winecfg.rc:79 msgid ""

1 0

Nikolay Sivov : ole32: COM cleanup for StdMarshal.
by Alexandre Julliard 05 Dec '13

05 Dec '13

Module: wine Branch: master Commit: d52f18da8e4c180854dc445b56a99b055aea6f5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d52f18da8e4c180854dc445b5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 5 08:57:12 2013 +0400 ole32: COM cleanup for StdMarshal. --- dlls/ole32/marshal.c | 38 ++++++++++++++++++++++---------------- 1 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index ddaaa53..c8a02e5 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1166,7 +1166,7 @@ HRESULT apartment_disconnectproxies(struct apartment *apt) /********************** StdMarshal implementation ****************************/ typedef struct _StdMarshalImpl { - const IMarshalVtbl *lpvtbl; + IMarshal IMarshal_iface; LONG ref; IID iid; @@ -1175,6 +1175,11 @@ typedef struct _StdMarshalImpl DWORD mshlflags; } StdMarshalImpl; +static inline StdMarshalImpl *impl_from_StdMarshal(IMarshal *iface) +{ + return CONTAINING_RECORD(iface, StdMarshalImpl, IMarshal_iface); +} + static HRESULT WINAPI StdMarshalImpl_QueryInterface(IMarshal *iface, REFIID riid, void **ppv) { @@ -1190,16 +1195,16 @@ StdMarshalImpl_QueryInterface(IMarshal *iface, REFIID riid, void **ppv) } static ULONG WINAPI -StdMarshalImpl_AddRef(LPMARSHAL iface) +StdMarshalImpl_AddRef(IMarshal *iface) { - StdMarshalImpl *This = (StdMarshalImpl *)iface; + StdMarshalImpl *This = impl_from_StdMarshal(iface); return InterlockedIncrement(&This->ref); } static ULONG WINAPI -StdMarshalImpl_Release(LPMARSHAL iface) +StdMarshalImpl_Release(IMarshal *iface) { - StdMarshalImpl *This = (StdMarshalImpl *)iface; + StdMarshalImpl *This = impl_from_StdMarshal(iface); ULONG ref = InterlockedDecrement(&This->ref); if (!ref) HeapFree(GetProcessHeap(),0,This); @@ -1208,7 +1213,7 @@ StdMarshalImpl_Release(LPMARSHAL iface) static HRESULT WINAPI StdMarshalImpl_GetUnmarshalClass( - LPMARSHAL iface, REFIID riid, void* pv, DWORD dwDestContext, + IMarshal *iface, REFIID riid, void* pv, DWORD dwDestContext, void* pvDestContext, DWORD mshlflags, CLSID* pCid) { *pCid = CLSID_DfMarshal; @@ -1217,7 +1222,7 @@ StdMarshalImpl_GetUnmarshalClass( static HRESULT WINAPI StdMarshalImpl_GetMarshalSizeMax( - LPMARSHAL iface, REFIID riid, void* pv, DWORD dwDestContext, + IMarshal *iface, REFIID riid, void* pv, DWORD dwDestContext, void* pvDestContext, DWORD mshlflags, DWORD* pSize) { *pSize = sizeof(STDOBJREF); @@ -1226,7 +1231,7 @@ StdMarshalImpl_GetMarshalSizeMax( static HRESULT WINAPI StdMarshalImpl_MarshalInterface( - LPMARSHAL iface, IStream *pStm,REFIID riid, void* pv, DWORD dest_context, + IMarshal *iface, IStream *pStm,REFIID riid, void* pv, DWORD dest_context, void* dest_context_data, DWORD mshlflags) { STDOBJREF stdobjref; @@ -1328,9 +1333,9 @@ static HRESULT unmarshal_object(const STDOBJREF *stdobjref, APARTMENT *apt, } static HRESULT WINAPI -StdMarshalImpl_UnmarshalInterface(LPMARSHAL iface, IStream *pStm, REFIID riid, void **ppv) +StdMarshalImpl_UnmarshalInterface(IMarshal *iface, IStream *pStm, REFIID riid, void **ppv) { - StdMarshalImpl *This = (StdMarshalImpl *)iface; + StdMarshalImpl *This = impl_from_StdMarshal(iface); struct stub_manager *stubmgr = NULL; STDOBJREF stdobjref; ULONG res; @@ -1410,7 +1415,7 @@ StdMarshalImpl_UnmarshalInterface(LPMARSHAL iface, IStream *pStm, REFIID riid, v } static HRESULT WINAPI -StdMarshalImpl_ReleaseMarshalData(LPMARSHAL iface, IStream *pStm) +StdMarshalImpl_ReleaseMarshalData(IMarshal *iface, IStream *pStm) { STDOBJREF stdobjref; ULONG res; @@ -1452,13 +1457,13 @@ StdMarshalImpl_ReleaseMarshalData(LPMARSHAL iface, IStream *pStm) } static HRESULT WINAPI -StdMarshalImpl_DisconnectObject(LPMARSHAL iface, DWORD dwReserved) +StdMarshalImpl_DisconnectObject(IMarshal *iface, DWORD dwReserved) { FIXME("(), stub!\n"); return S_OK; } -static const IMarshalVtbl VT_StdMarshal = +static const IMarshalVtbl StdMarshalVtbl = { StdMarshalImpl_QueryInterface, StdMarshalImpl_AddRef, @@ -1477,9 +1482,9 @@ static HRESULT StdMarshalImpl_Construct(REFIID riid, void** ppvObject) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(StdMarshalImpl)); if (!pStdMarshal) return E_OUTOFMEMORY; - pStdMarshal->lpvtbl = &VT_StdMarshal; + pStdMarshal->IMarshal_iface.lpVtbl = &StdMarshalVtbl; pStdMarshal->ref = 0; - return IMarshal_QueryInterface((IMarshal*)pStdMarshal, riid, ppvObject); + return IMarshal_QueryInterface(&pStdMarshal->IMarshal_iface, riid, ppvObject); } /*********************************************************************** @@ -1519,10 +1524,11 @@ HRESULT WINAPI CoGetStandardMarshal(REFIID riid, IUnknown *pUnk, } TRACE("(%s,%p,%x,%p,%x,%p)\n", debugstr_guid(riid),pUnk,dwDestContext,pvDestContext,mshlflags,ppMarshal); + *ppMarshal = HeapAlloc(GetProcessHeap(),0,sizeof(StdMarshalImpl)); dm = (StdMarshalImpl*) *ppMarshal; if (!dm) return E_FAIL; - dm->lpvtbl = &VT_StdMarshal; + dm->IMarshal_iface.lpVtbl = &StdMarshalVtbl; dm->ref = 1; dm->iid = *riid;

1 0

Nikolay Sivov : ole32: Use existing code to return IMarshal from CoGetStandardMarshal().
by Alexandre Julliard 05 Dec '13

05 Dec '13

Module: wine Branch: master Commit: 97ec8b0150403d98e86a57a697a8cc6f3aca09bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=97ec8b0150403d98e86a57a69… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 5 08:57:33 2013 +0400 ole32: Use existing code to return IMarshal from CoGetStandardMarshal(). --- dlls/ole32/marshal.c | 50 ++++++++++++++++++++++---------------------------- 1 files changed, 22 insertions(+), 28 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index c8a02e5..4f6aee4 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1166,13 +1166,10 @@ HRESULT apartment_disconnectproxies(struct apartment *apt) /********************** StdMarshal implementation ****************************/ typedef struct _StdMarshalImpl { - IMarshal IMarshal_iface; - LONG ref; - - IID iid; - DWORD dwDestContext; - LPVOID pvDestContext; - DWORD mshlflags; + IMarshal IMarshal_iface; + LONG ref; + DWORD dest_context; + void *dest_context_data; } StdMarshalImpl; static inline StdMarshalImpl *impl_from_StdMarshal(IMarshal *iface) @@ -1401,8 +1398,8 @@ StdMarshalImpl_UnmarshalInterface(IMarshal *iface, IStream *pStm, REFIID riid, v wine_dbgstr_longlong(stdobjref.oxid)); if (hres == S_OK) - hres = unmarshal_object(&stdobjref, apt, This->dwDestContext, - This->pvDestContext, riid, + hres = unmarshal_object(&stdobjref, apt, This->dest_context, + This->dest_context_data, riid, stubmgr ? &stubmgr->oxid_info : NULL, ppv); if (stubmgr) stub_manager_int_release(stubmgr); @@ -1476,15 +1473,24 @@ static const IMarshalVtbl StdMarshalVtbl = StdMarshalImpl_DisconnectObject }; -static HRESULT StdMarshalImpl_Construct(REFIID riid, void** ppvObject) +static HRESULT StdMarshalImpl_Construct(REFIID riid, DWORD dest_context, void *dest_context_data, void** ppvObject) { - StdMarshalImpl * pStdMarshal = - HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(StdMarshalImpl)); + HRESULT hr; + + StdMarshalImpl *pStdMarshal = HeapAlloc(GetProcessHeap(), 0, sizeof(StdMarshalImpl)); if (!pStdMarshal) return E_OUTOFMEMORY; + pStdMarshal->IMarshal_iface.lpVtbl = &StdMarshalVtbl; pStdMarshal->ref = 0; - return IMarshal_QueryInterface(&pStdMarshal->IMarshal_iface, riid, ppvObject); + pStdMarshal->dest_context = dest_context; + pStdMarshal->dest_context_data = dest_context_data; + + hr = IMarshal_QueryInterface(&pStdMarshal->IMarshal_iface, riid, ppvObject); + if (FAILED(hr)) + HeapFree(GetProcessHeap(), 0, pStdMarshal); + + return hr; } /*********************************************************************** @@ -1514,8 +1520,6 @@ HRESULT WINAPI CoGetStandardMarshal(REFIID riid, IUnknown *pUnk, DWORD dwDestContext, LPVOID pvDestContext, DWORD mshlflags, LPMARSHAL *ppMarshal) { - StdMarshalImpl *dm; - if (pUnk == NULL) { FIXME("(%s,NULL,%x,%p,%x,%p), unimplemented yet.\n", @@ -1525,17 +1529,7 @@ HRESULT WINAPI CoGetStandardMarshal(REFIID riid, IUnknown *pUnk, TRACE("(%s,%p,%x,%p,%x,%p)\n", debugstr_guid(riid),pUnk,dwDestContext,pvDestContext,mshlflags,ppMarshal); - *ppMarshal = HeapAlloc(GetProcessHeap(),0,sizeof(StdMarshalImpl)); - dm = (StdMarshalImpl*) *ppMarshal; - if (!dm) return E_FAIL; - dm->IMarshal_iface.lpVtbl = &StdMarshalVtbl; - dm->ref = 1; - - dm->iid = *riid; - dm->dwDestContext = dwDestContext; - dm->pvDestContext = pvDestContext; - dm->mshlflags = mshlflags; - return S_OK; + return StdMarshalImpl_Construct(&IID_IMarshal, dwDestContext, pvDestContext, (void**)ppMarshal); } /*********************************************************************** @@ -1592,7 +1586,7 @@ static HRESULT get_unmarshaler_from_stream(IStream *stream, IMarshal **marshal, if (objref.flags & OBJREF_STANDARD) { TRACE("Using standard unmarshaling\n"); - hr = StdMarshalImpl_Construct(&IID_IMarshal, (LPVOID*)marshal); + hr = StdMarshalImpl_Construct(&IID_IMarshal, 0, NULL, (LPVOID*)marshal); } else if (objref.flags & OBJREF_CUSTOM) { @@ -2029,7 +2023,7 @@ static HRESULT WINAPI StdMarshalCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) { if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IMarshal)) - return StdMarshalImpl_Construct(riid, ppv); + return StdMarshalImpl_Construct(riid, 0, NULL, ppv); FIXME("(%s), not supported.\n",debugstr_guid(riid)); return E_NOINTERFACE;

1 0

Nikolay Sivov : ole32: Explicitly check for S_OK.
by Alexandre Julliard 05 Dec '13

05 Dec '13

Module: wine Branch: master Commit: a6944484a45b15686d29dab7f7c595084557cd20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6944484a45b15686d29dab7f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 5 08:57:52 2013 +0400 ole32: Explicitly check for S_OK. --- dlls/ole32/marshal.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 4f6aee4..b308600 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -108,7 +108,8 @@ static inline HRESULT get_facbuf_for_iid(REFIID riid, IPSFactoryBuffer **facbuf) HRESULT hr; CLSID clsid; - if ((hr = CoGetPSClsid(riid, &clsid))) + hr = CoGetPSClsid(riid, &clsid); + if (hr != S_OK) return hr; return CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER | WINE_CLSCTX_DONT_HOST, NULL, &IID_IPSFactoryBuffer, (LPVOID*)facbuf);

1 0

Henri Verbeet : ddraw: Require DDSCAPS_FLIP and DDSCAPS_COMPLEX to be used together.
by Alexandre Julliard 05 Dec '13

05 Dec '13

Module: wine Branch: master Commit: 23f47b573e3836e6e19729b75bd823e696e9f3f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23f47b573e3836e6e19729b75… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 5 10:34:14 2013 +0100 ddraw: Require DDSCAPS_FLIP and DDSCAPS_COMPLEX to be used together. --- dlls/ddraw/surface.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 79d5b31..7cb18a1 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5629,6 +5629,8 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ if (desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { + DWORD flippable = desc->ddsCaps.dwCaps & (DDSCAPS_FLIP | DDSCAPS_COMPLEX); + if (desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE) { WARN("Tried to create a primary surface with DDSCAPS_TEXTURE.\n"); @@ -5636,11 +5638,21 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return DDERR_INVALIDCAPS; } - if ((desc->ddsCaps.dwCaps & DDSCAPS_FLIP) && !(ddraw->cooperative_level & DDSCL_EXCLUSIVE)) + if (flippable) { - WARN("Tried to create a flippable primary surface without DDSCL_EXCLUSIVE.\n"); - HeapFree(GetProcessHeap(), 0, texture); - return DDERR_NOEXCLUSIVEMODE; + if (flippable != (DDSCAPS_FLIP | DDSCAPS_COMPLEX)) + { + WARN("Tried to create a flippable primary surface without both DDSCAPS_FLIP and DDSCAPS_COMPLEX.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDCAPS; + } + + if (!(ddraw->cooperative_level & DDSCL_EXCLUSIVE)) + { + WARN("Tried to create a flippable primary surface without DDSCL_EXCLUSIVE.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_NOEXCLUSIVEMODE; + } } }

1 0

Henri Verbeet : ddraw: Require a non-zero back buffer count for swap chains .
by Alexandre Julliard 05 Dec '13

05 Dec '13

Module: wine Branch: master Commit: 8797a9eda3f4ccc256cb0716389d8225da6c4615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8797a9eda3f4ccc256cb07163… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 5 10:34:15 2013 +0100 ddraw: Require a non-zero back buffer count for swap chains. --- dlls/ddraw/surface.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 7cb18a1..4c96da8 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5647,6 +5647,13 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return DDERR_INVALIDCAPS; } + if (!(desc->dwFlags & DDSD_BACKBUFFERCOUNT) || !desc->dwBackBufferCount) + { + WARN("Tried to create a flippable primary surface without any back buffers.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDCAPS; + } + if (!(ddraw->cooperative_level & DDSCL_EXCLUSIVE)) { WARN("Tried to create a flippable primary surface without DDSCL_EXCLUSIVE.\n");

1 0