September 2013 - Wine-Commits

Joško Nikolić : po: Update Croatian translation.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 436e8686f9694ca7a3d65dd808cbbf450a5016d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=436e8686f9694ca7a3d65dd80… Author: Joško Nikolić <josko.nikolic(a)fer.hr> Date: Tue Sep 24 06:06:21 2013 +0000 po: Update Croatian translation. --- po/hr.po | 62 +++++++++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 41 insertions(+), 21 deletions(-) diff --git a/po/hr.po b/po/hr.po index 64f0e81..a221054 100644 --- a/po/hr.po +++ b/po/hr.po @@ -9736,7 +9736,7 @@ msgstr "" #: cmd.rc:346 msgid "Wine CMD Version %1!S!\n" -msgstr "Wine CMD verzija %1!5!\n" +msgstr "Wine CMD verzija %1!S!\n" #: cmd.rc:347 msgid "More? " @@ -9895,6 +9895,13 @@ msgid "" "\n" "Where 'command' is one of HELP, START, STOP or USE.\n" msgstr "" +"Sintaksa ove naredbe je:\n" +"\n" +"NET naredba [argumenti]\n" +" -ili-\n" +"NET naredba /HELP\n" +"\n" +"Gdje 'naredba' je jedno od HELP, START, STOP ili USE.\n" #: net.rc:28 msgid "" @@ -9905,6 +9912,12 @@ msgid "" "Displays the list of running services if 'service' is omitted. Otherwise " "'service' is the name of the service to start.\n" msgstr "" +"Sintaksa ove naredbe je:\n" +"\n" +"NET START [servis]\n" +"\n" +"Prikazuje popis servisa koji se izvode ukoliko se 'servis' izostavi. Inače " +"'servis' je ime servisa koji će se pokrenuti.\n" #: net.rc:29 msgid "" @@ -9938,31 +9951,31 @@ msgstr "" #: net.rc:34 msgid "The %1 service is starting.\n" -msgstr "" +msgstr "Servis %1 se pokreće.\n" #: net.rc:35 msgid "The %1 service was started successfully.\n" -msgstr "" +msgstr "Servis %1 je uspješno pokrenut.\n" #: net.rc:36 msgid "The %1 service failed to start.\n" -msgstr "" +msgstr "Servis %1 nije uspješno pokrenut.\n" #: net.rc:37 msgid "The %1 service is stopping.\n" -msgstr "" +msgstr "Servis %1 se zaustavlja.\n" #: net.rc:38 msgid "The %1 service was stopped successfully.\n" -msgstr "" +msgstr "Servis %1 je uspješno zaustavljen.\n" #: net.rc:39 msgid "The %1 service failed to stop.\n" -msgstr "" +msgstr "Servis %1 nije uspješno zaustavljen.\n" #: net.rc:41 msgid "There are no entries in the list.\n" -msgstr "" +msgstr "Nema unosa u listi.\n" #: net.rc:42 msgid "" @@ -9992,15 +10005,15 @@ msgstr "Dogodila se mrežna pogreška" #: net.rc:48 msgid "Connection is being made" -msgstr "" +msgstr "Veza se stvara" #: net.rc:49 msgid "Reconnecting" -msgstr "" +msgstr "Ponovno povezivanje" #: net.rc:40 msgid "The following services are running:\n" -msgstr "" +msgstr "Sljedeći servisi se izvode:\n" #: netstat.rc:27 msgid "Active Connections" @@ -10008,7 +10021,7 @@ msgstr "Aktivne veze" #: netstat.rc:28 msgid "Proto" -msgstr "" +msgstr "Proto" #: netstat.rc:29 msgid "Local Address" @@ -10902,20 +10915,26 @@ msgid "" "REG [ ADD | DELETE | QUERY ]\n" "REG command /?\n" msgstr "" +"Sintaksa ove naredbe je:\n" +"\n" +"REG [ ADD | DELETE | QUERY ]\n" +"REG naredba /?\n" #: reg.rc:28 msgid "" "REG ADD key_name [/v value_name | /ve] [/t type] [/s separator] [/d data] [/" "f]\n" msgstr "" +"REG ADD ime_ključa [/v ime_vrijednosti | /ve] [/t vrsta] [/s separator] [/d " +"podaci] [/f]\n" #: reg.rc:29 msgid "REG DELETE key_name [/v value_name | /ve | /va] [/f]\n" -msgstr "" +msgstr "REG DELETE ime_ključa [/v ime_vrijednosti | /ve | /va] [/f]\n" #: reg.rc:30 msgid "REG QUERY key_name [/v value_name | /ve] [/s]\n" -msgstr "" +msgstr "REG QUERY ime_ključa [/v ime_vrijednosti | /ve] [/s]\n" #: reg.rc:31 msgid "The operation completed successfully\n" @@ -10938,6 +10957,7 @@ msgstr "" msgid "" "Error: The system was unable to find the specified registry key or value\n" msgstr "" +"Greška: Sustav nije mogao pronaći navedeni ključ ili vrijednost u registru.\n" #: regedit.rc:31 msgid "&Registry" @@ -11021,11 +11041,11 @@ msgstr "" #: regedit.rc:226 msgid "Find:" -msgstr "" +msgstr "Pronađi:" #: regedit.rc:228 msgid "Find in:" -msgstr "" +msgstr "Pronađi u:" #: regedit.rc:229 msgid "Keys" @@ -11033,11 +11053,11 @@ msgstr "Ključevi" #: regedit.rc:230 msgid "Value names" -msgstr "" +msgstr "Imena vrijednosti" #: regedit.rc:231 msgid "Value content" -msgstr "" +msgstr "Sadržaj vrijednosti" #: regedit.rc:232 msgid "Whole string only" @@ -11061,11 +11081,11 @@ msgstr "&Izmjeni" #: regedit.rc:264 regedit.rc:277 regedit.rc:293 regedit.rc:306 msgid "Value name:" -msgstr "" +msgstr "Ime vrijednosti:" #: regedit.rc:266 regedit.rc:279 regedit.rc:295 regedit.rc:308 msgid "Value data:" -msgstr "" +msgstr "Podaci vrijednosti:" #: regedit.rc:274 msgid "Edit DWORD" @@ -12994,7 +13014,7 @@ msgid "" msgstr "" "Uzrok ovome može biti problem u programu ili nedostatak u Wine-u. Provjerite " "<a href=\"http://appdb.winehq.org\">bazu aplikacija</a>za savjete o " -"pokretanjuovog programa." +"pokretanju ovog programa." #: winedbg.rc:58 msgid "Show &Details"

1 0

Dmitry Timoshkov : gdiplus/tests: Don't bother to delete a NULL hrgn.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 108873320c4366d35891e8efa44a85bc77c6da57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=108873320c4366d35891e8efa… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 24 11:24:30 2013 +0900 gdiplus/tests: Don't bother to delete a NULL hrgn. --- dlls/gdiplus/tests/region.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index ee6e158..a254bed 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -860,12 +860,10 @@ static void test_gethrgn(void) status = GdipGetRegionHRgn(region, NULL, &hrgn); ok(status == Ok, "status %08x\n", status); ok(hrgn == NULL, "hrgn=%p\n", hrgn); - DeleteObject(hrgn); status = GdipGetRegionHRgn(region, graphics, &hrgn); ok(status == Ok, "status %08x\n", status); ok(hrgn == NULL, "hrgn=%p\n", hrgn); - DeleteObject(hrgn); status = GdipSetEmpty(region); ok(status == Ok, "status %08x\n", status);

1 0

Nikolay Sivov : oleaut32: Support typelib redirection in QueryPathOfRegTypeLib().
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 4be301301467fee6cea351d8632531ef12282546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4be301301467fee6cea351d86… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 24 12:25:40 2013 +0400 oleaut32: Support typelib redirection in QueryPathOfRegTypeLib(). --- dlls/oleaut32/tests/typelib.c | 22 +++++++++--------- dlls/oleaut32/typelib.c | 49 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 55 insertions(+), 16 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index f560dd8..2966e9a 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4702,19 +4702,24 @@ static void test_LoadRegTypeLib(void) path = NULL; hr = QueryPathOfRegTypeLib(&LIBID_TestTypelib, 2, 0, LOCALE_NEUTRAL, &path); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(path); path = NULL; hr = QueryPathOfRegTypeLib(&LIBID_TestTypelib, 2, 0, lcid_en, &path); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(path); path = NULL; hr = QueryPathOfRegTypeLib(&LIBID_TestTypelib, 2, 0, lcid_ru, &path); -todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(path); + + hr = QueryPathOfRegTypeLib(&LIBID_TestTypelib, 2, 8, LOCALE_NEUTRAL, &path); + ok(hr == TYPE_E_LIBNOTREGISTERED || broken(hr == S_OK) /* winxp */, "got 0x%08x\n", hr); + + path = NULL; + hr = QueryPathOfRegTypeLib(&LIBID_TestTypelib, 2, 7, LOCALE_NEUTRAL, &path); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(path); @@ -4729,49 +4734,44 @@ todo_wine if (hr == S_OK) ITypeLib_Release(tl); hr = LoadRegTypeLib(&LIBID_register_test, 2, 0, LOCALE_NEUTRAL, &tl); +todo_wine ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr); /* manifest version is 2.7, actual is 2.5 */ hr = LoadRegTypeLib(&LIBID_TestTypelib, 2, 0, LOCALE_NEUTRAL, &tl); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) ITypeLib_Release(tl); hr = LoadRegTypeLib(&LIBID_TestTypelib, 2, 1, LOCALE_NEUTRAL, &tl); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) ITypeLib_Release(tl); hr = LoadRegTypeLib(&LIBID_TestTypelib, 2, 0, lcid_en, &tl); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) ITypeLib_Release(tl); hr = LoadRegTypeLib(&LIBID_TestTypelib, 2, 0, lcid_ru, &tl); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) ITypeLib_Release(tl); hr = LoadRegTypeLib(&LIBID_TestTypelib, 2, 7, LOCALE_NEUTRAL, &tl); +todo_wine ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr); hr = LoadRegTypeLib(&LIBID_TestTypelib, 2, 5, LOCALE_NEUTRAL, &tl); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) -{ hr = ITypeLib_GetLibAttr(tl, &attr); ok(hr == S_OK, "got 0x%08x\n", hr); ok(attr->lcid == 0, "got %x\n", attr->lcid); ok(attr->wMajorVerNum == 2, "got %d\n", attr->wMajorVerNum); ok(attr->wMinorVerNum == 5, "got %d\n", attr->wMinorVerNum); +todo_wine ok(attr->wLibFlags == LIBFLAG_FHASDISKIMAGE, "got %x\n", attr->wLibFlags); ITypeLib_ReleaseTLibAttr(tl, attr); ITypeLib_Release(tl); -} hr = LoadRegTypeLib(&LIBID_TestTypelib, 1, 7, LOCALE_NEUTRAL, &tl); ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 2877f1a..616445a 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -286,10 +286,23 @@ static WCHAR *get_lcid_subkey( LCID lcid, SYSKIND syskind, WCHAR *buffer ) static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath, ITypeLib2 **ppTypeLib); +struct tlibredirect_data +{ + ULONG size; + DWORD res; + ULONG name_len; + ULONG name_offset; + LANGID langid; + WORD flags; + ULONG help_len; + ULONG help_offset; + WORD major_version; + WORD minor_version; +}; /* Get the path to a registered type library. Helper for QueryPathOfRegTypeLib. */ static HRESULT query_typelib_path( REFGUID guid, WORD wMaj, WORD wMin, - SYSKIND syskind, LCID lcid, LPBSTR path ) + SYSKIND syskind, LCID lcid, BSTR *path, BOOL redir ) { HRESULT hr = TYPE_E_LIBNOTREGISTERED; LCID myLCID = lcid; @@ -300,6 +313,30 @@ static HRESULT query_typelib_path( REFGUID guid, WORD wMaj, WORD wMin, TRACE_(typelib)("(%s, %x.%x, 0x%x, %p)\n", debugstr_guid(guid), wMaj, wMin, lcid, path); + if (redir) + { + ACTCTX_SECTION_KEYED_DATA data; + + data.cbSize = sizeof(data); + if (FindActCtxSectionGuid( 0, NULL, ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION, guid, &data )) + { + struct tlibredirect_data *tlib = (struct tlibredirect_data*)data.lpData; + WCHAR *nameW; + DWORD len; + + if (tlib->major_version != wMaj || tlib->minor_version < wMin) + return TYPE_E_LIBNOTREGISTERED; + + nameW = (WCHAR*)((BYTE*)data.lpSectionBase + tlib->name_offset); + len = SearchPathW( NULL, nameW, NULL, sizeof(Path)/sizeof(WCHAR), Path, NULL ); + if (!len) return TYPE_E_LIBNOTREGISTERED; + + TRACE_(typelib)("got path from context %s\n", debugstr_w(Path)); + *path = SysAllocString( Path ); + return S_OK; + } + } + if (!find_typelib_key( guid, &wMaj, &wMin )) return TYPE_E_LIBNOTREGISTERED; get_typelib_key( guid, wMaj, wMin, buffer ); @@ -371,12 +408,14 @@ static HRESULT query_typelib_path( REFGUID guid, WORD wMaj, WORD wMin, */ HRESULT WINAPI QueryPathOfRegTypeLib( REFGUID guid, WORD wMaj, WORD wMin, LCID lcid, LPBSTR path ) { + BOOL redir = TRUE; #ifdef _WIN64 - HRESULT hres = query_typelib_path( guid, wMaj, wMin, SYS_WIN64, lcid, path ); + HRESULT hres = query_typelib_path( guid, wMaj, wMin, SYS_WIN64, lcid, path, TRUE ); if(SUCCEEDED(hres)) return hres; + redir = FALSE; #endif - return query_typelib_path( guid, wMaj, wMin, SYS_WIN32, lcid, path ); + return query_typelib_path( guid, wMaj, wMin, SYS_WIN32, lcid, path, redir ); } /****************************************************************************** @@ -808,7 +847,7 @@ HRESULT WINAPI UnRegisterTypeLib( } /* get the path to the typelib on disk */ - if (query_typelib_path(libid, wVerMajor, wVerMinor, syskind, lcid, &tlibPath) != S_OK) { + if (query_typelib_path(libid, wVerMajor, wVerMinor, syskind, lcid, &tlibPath, FALSE) != S_OK) { result = E_INVALIDARG; goto end; } @@ -7644,7 +7683,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( ref_type->pImpTLInfo->wVersionMajor, ref_type->pImpTLInfo->wVersionMinor, This->pTypeLib->syskind, - ref_type->pImpTLInfo->lcid, &libnam); + ref_type->pImpTLInfo->lcid, &libnam, TRUE); if(FAILED(result)) libnam = SysAllocString(ref_type->pImpTLInfo->name);

1 0

Piotr Caban : msvcp80: Fix default constructor closures arguments.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 459920a54d65f895a4da8d2e88c912f8b2181421 URL: http://source.winehq.org/git/wine.git/?a=commit;h=459920a54d65f895a4da8d2e8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 24 15:49:11 2013 +0200 msvcp80: Fix default constructor closures arguments. --- dlls/msvcp80/ios.c | 54 ++++++++++++++++++++++---------------------- dlls/msvcp80/msvcp80.spec | 36 +++++++++++++++--------------- 2 files changed, 45 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=459920a54d65f895a4da8…

1 0

Alexandre Julliard : configure: Build the makefile data into a temporary file instead of a shell variable.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 49645b6ff9292099690d0fb2d66fff75147da3cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=49645b6ff9292099690d0fb2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 24 12:33:16 2013 +0200 configure: Build the makefile data into a temporary file instead of a shell variable. --- aclocal.m4 | 92 ++++++++++++++++++++++-------------------------- configure | 111 +++++++++++++++++++++++++++++---------------------------- configure.ac | 25 +++++++++---- 3 files changed, 115 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49645b6ff9292099690d0…

1 0

Dmitry Timoshkov : gdiplus/tests: Add a test for GdipTransformMatrixPoints with number of points == 0.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 603ccca889663257ce017e4f67ee42ee7b32b008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=603ccca889663257ce017e4f6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 24 11:22:55 2013 +0900 gdiplus/tests: Add a test for GdipTransformMatrixPoints with number of points == 0. --- dlls/gdiplus/tests/matrix.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/matrix.c b/dlls/gdiplus/tests/matrix.c index cf8f158..379a8fa 100644 --- a/dlls/gdiplus/tests/matrix.c +++ b/dlls/gdiplus/tests/matrix.c @@ -77,6 +77,9 @@ static void test_transform(void) GdipCreateMatrix2(1.0, -2.0, 30.0, 40.0, -500.0, 600.0, &matrix); + status = GdipTransformMatrixPoints(matrix, pts, 0); + expect(InvalidParameter, status); + status = GdipTransformMatrixPoints(matrix, pts, 10); expect(Ok, status);

1 0

Dmitry Timoshkov : gdiplus/tests: Print actual rectangle extents if the tests fail.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: fdeab06142ad6f21b43932740fa190af352ea78d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdeab06142ad6f21b43932740… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 24 11:23:48 2013 +0900 gdiplus/tests: Print actual rectangle extents if the tests fail. --- dlls/gdiplus/tests/region.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 3052f2e..ee6e158 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -86,7 +86,9 @@ static void verify_region(HRGN hrgn, const RECT *rc) { rect = (const RECT *)rgn.data.Buffer; trace("rect (%d,%d-%d,%d)\n", rect->left, rect->top, rect->right, rect->bottom); - ok(EqualRect(rect, rc), "rects don't match\n"); + ok(EqualRect(rect, rc), "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n", + rc->left, rc->top, rc->right, rc->bottom, + rect->left, rect->top, rect->right, rect->bottom); } ok(rgn.data.rdh.dwSize == sizeof(rgn.data.rdh), "expected sizeof(rdh), got %u\n", rgn.data.rdh.dwSize); @@ -101,7 +103,9 @@ static void verify_region(HRGN hrgn, const RECT *rc) ok(rgn.data.rdh.nCount == 1, "expected 1, got %u\n", rgn.data.rdh.nCount); ok(rgn.data.rdh.nRgnSize == sizeof(RECT), "expected sizeof(RECT), got %u\n", rgn.data.rdh.nRgnSize); } - ok(EqualRect(&rgn.data.rdh.rcBound, rc), "rects don't match\n"); + ok(EqualRect(&rgn.data.rdh.rcBound, rc), "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n", + rc->left, rc->top, rc->right, rc->bottom, + rgn.data.rdh.rcBound.left, rgn.data.rdh.rcBound.top, rgn.data.rdh.rcBound.right, rgn.data.rdh.rcBound.bottom); } static void test_getregiondata(void)

1 0

Henri Verbeet : d3drm: Avoid VOID.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 7a0390d85a4ffbcdc7265764166472667ae169b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a0390d85a4ffbcdc72657641… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 23 10:26:47 2013 +0200 d3drm: Avoid VOID. --- dlls/d3drm/frame.c | 43 +++++++++++++++---------------------------- include/d3drmobj.h | 14 +++++++------- 2 files changed, 22 insertions(+), 35 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 33dfb65..6cd6c0e 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -606,12 +606,10 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_AddLight(IDirect3DRMFrame2 *iface, I return IDirect3DRMFrame3_AddLight(&This->IDirect3DRMFrame3_iface, light); } -static HRESULT WINAPI IDirect3DRMFrame2Impl_AddMoveCallback(IDirect3DRMFrame2* iface, - D3DRMFRAMEMOVECALLBACK cb, VOID *arg) +static HRESULT WINAPI IDirect3DRMFrame2Impl_AddMoveCallback(IDirect3DRMFrame2 *iface, + D3DRMFRAMEMOVECALLBACK cb, void *ctx) { - IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - - FIXME("(%p/%p)->(%p,%p): stub\n", iface, This, cb, arg); + FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); return E_NOTIMPL; } @@ -910,12 +908,10 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_DeleteLight(IDirect3DRMFrame2 *iface return IDirect3DRMFrame3_DeleteLight(&This->IDirect3DRMFrame3_iface, light); } -static HRESULT WINAPI IDirect3DRMFrame2Impl_DeleteMoveCallback(IDirect3DRMFrame2* iface, - D3DRMFRAMEMOVECALLBACK cb, VOID *arg) +static HRESULT WINAPI IDirect3DRMFrame2Impl_DeleteMoveCallback(IDirect3DRMFrame2 *iface, + D3DRMFRAMEMOVECALLBACK cb, void *ctx) { - IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - - FIXME("(%p/%p)->(%p,%p): stub\n", iface, This, cb, arg); + FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); return E_NOTIMPL; } @@ -1187,13 +1183,10 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_Transform(IDirect3DRMFrame2* iface, } /*** IDirect3DRMFrame2 methods ***/ -static HRESULT WINAPI IDirect3DRMFrame2Impl_AddMoveCallback2(IDirect3DRMFrame2* iface, - D3DRMFRAMEMOVECALLBACK cb, VOID *arg, - DWORD flags) +static HRESULT WINAPI IDirect3DRMFrame2Impl_AddMoveCallback2(IDirect3DRMFrame2 *iface, + D3DRMFRAMEMOVECALLBACK cb, void *ctx, DWORD flags) { - IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - - FIXME("(%p/%p)->(%p,%p,%u): stub\n", iface, This, cb, arg, flags); + FIXME("iface %p, cb %p, ctx %p, flags %#x stub!\n", iface, cb, ctx, flags); return E_NOTIMPL; } @@ -1527,13 +1520,10 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_AddLight(IDirect3DRMFrame3 *iface, I return D3DRM_OK; } -static HRESULT WINAPI IDirect3DRMFrame3Impl_AddMoveCallback(IDirect3DRMFrame3* iface, - D3DRMFRAME3MOVECALLBACK cb, VOID *arg, - DWORD flags) +static HRESULT WINAPI IDirect3DRMFrame3Impl_AddMoveCallback(IDirect3DRMFrame3 *iface, + D3DRMFRAME3MOVECALLBACK cb, void *ctx, DWORD flags) { - IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); - - FIXME("(%p/%p)->(%p,%p,%u): stub\n", iface, This, cb, arg, flags); + FIXME("iface %p, cb %p, ctx %p flags %#x stub!\n", iface, cb, ctx, flags); return E_NOTIMPL; } @@ -1922,13 +1912,10 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_DeleteLight(IDirect3DRMFrame3 *iface return D3DRM_OK; } -static HRESULT WINAPI IDirect3DRMFrame3Impl_DeleteMoveCallback(IDirect3DRMFrame3* iface, - D3DRMFRAME3MOVECALLBACK cb, - VOID *arg) +static HRESULT WINAPI IDirect3DRMFrame3Impl_DeleteMoveCallback(IDirect3DRMFrame3 *iface, + D3DRMFRAME3MOVECALLBACK cb, void *ctx) { - IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); - - FIXME("(%p/%p)->(%p,%p): stub\n", iface, This, cb, arg); + FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); return E_NOTIMPL; } diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 89198f8..f0ab369 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -1098,7 +1098,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame,IDirect3DRMVisual) /*** IDirect3DRMFrame methods ***/ STDMETHOD(AddChild)(THIS_ IDirect3DRMFrame *child) PURE; STDMETHOD(AddLight)(THIS_ struct IDirect3DRMLight *light) PURE; - STDMETHOD(AddMoveCallback)(THIS_ D3DRMFRAMEMOVECALLBACK, VOID *arg) PURE; + STDMETHOD(AddMoveCallback)(THIS_ D3DRMFRAMEMOVECALLBACK cb, void *ctx) PURE; STDMETHOD(AddTransform)(THIS_ D3DRMCOMBINETYPE, D3DRMMATRIX4D) PURE; STDMETHOD(AddTranslation)(THIS_ D3DRMCOMBINETYPE, D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE; STDMETHOD(AddScale)(THIS_ D3DRMCOMBINETYPE, D3DVALUE sx, D3DVALUE sy, D3DVALUE sz) PURE; @@ -1127,7 +1127,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame,IDirect3DRMVisual) STDMETHOD(Move)(THIS_ D3DVALUE delta) PURE; STDMETHOD(DeleteChild)(THIS_ IDirect3DRMFrame *child) PURE; STDMETHOD(DeleteLight)(THIS_ struct IDirect3DRMLight *light) PURE; - STDMETHOD(DeleteMoveCallback)(THIS_ D3DRMFRAMEMOVECALLBACK, VOID *arg) PURE; + STDMETHOD(DeleteMoveCallback)(THIS_ D3DRMFRAMEMOVECALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteVisual)(THIS_ IDirect3DRMVisual *visual) PURE; STDMETHOD_(D3DCOLOR, GetSceneBackground)(THIS) PURE; STDMETHOD(GetSceneBackgroundDepth)(THIS_ IDirectDrawSurface **surface) PURE; @@ -1331,7 +1331,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame) /*** IDirect3DRMFrame methods ***/ STDMETHOD(AddChild)(THIS_ IDirect3DRMFrame *child) PURE; STDMETHOD(AddLight)(THIS_ struct IDirect3DRMLight *light) PURE; - STDMETHOD(AddMoveCallback)(THIS_ D3DRMFRAMEMOVECALLBACK, VOID *arg) PURE; + STDMETHOD(AddMoveCallback)(THIS_ D3DRMFRAMEMOVECALLBACK cb, void *ctx) PURE; STDMETHOD(AddTransform)(THIS_ D3DRMCOMBINETYPE, D3DRMMATRIX4D) PURE; STDMETHOD(AddTranslation)(THIS_ D3DRMCOMBINETYPE, D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE; STDMETHOD(AddScale)(THIS_ D3DRMCOMBINETYPE, D3DVALUE sx, D3DVALUE sy, D3DVALUE sz) PURE; @@ -1360,7 +1360,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame) STDMETHOD(Move)(THIS_ D3DVALUE delta) PURE; STDMETHOD(DeleteChild)(THIS_ IDirect3DRMFrame *child) PURE; STDMETHOD(DeleteLight)(THIS_ struct IDirect3DRMLight *light) PURE; - STDMETHOD(DeleteMoveCallback)(THIS_ D3DRMFRAMEMOVECALLBACK, VOID *arg) PURE; + STDMETHOD(DeleteMoveCallback)(THIS_ D3DRMFRAMEMOVECALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteVisual)(THIS_ IDirect3DRMVisual *visual) PURE; STDMETHOD_(D3DCOLOR, GetSceneBackground)(THIS) PURE; STDMETHOD(GetSceneBackgroundDepth)(THIS_ IDirectDrawSurface **surface) PURE; @@ -1392,7 +1392,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame) STDMETHOD(SetZbufferMode)(THIS_ D3DRMZBUFFERMODE) PURE; STDMETHOD(Transform)(THIS_ D3DVECTOR *d, D3DVECTOR *s) PURE; /*** IDirect3DRMFrame2 methods ***/ - STDMETHOD(AddMoveCallback2)(THIS_ D3DRMFRAMEMOVECALLBACK, VOID *arg, DWORD flags) PURE; + STDMETHOD(AddMoveCallback2)(THIS_ D3DRMFRAMEMOVECALLBACK cb, void *ctx, DWORD flags) PURE; STDMETHOD(GetBox)(THIS_ D3DRMBOX *box) PURE; STDMETHOD_(BOOL, GetBoxEnable)(THIS) PURE; STDMETHOD(GetAxes)(THIS_ D3DVECTOR *dir, D3DVECTOR *up); @@ -1613,7 +1613,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame3,IDirect3DRMVisual) /*** IDirect3DRMFrame3 methods ***/ STDMETHOD(AddChild)(THIS_ IDirect3DRMFrame3 *child) PURE; STDMETHOD(AddLight)(THIS_ struct IDirect3DRMLight *light) PURE; - STDMETHOD(AddMoveCallback)(THIS_ D3DRMFRAME3MOVECALLBACK, VOID *arg, DWORD flags) PURE; + STDMETHOD(AddMoveCallback)(THIS_ D3DRMFRAME3MOVECALLBACK cb, void *ctx, DWORD flags) PURE; STDMETHOD(AddTransform)(THIS_ D3DRMCOMBINETYPE, D3DRMMATRIX4D) PURE; STDMETHOD(AddTranslation)(THIS_ D3DRMCOMBINETYPE, D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE; STDMETHOD(AddScale)(THIS_ D3DRMCOMBINETYPE, D3DVALUE sx, D3DVALUE sy, D3DVALUE sz) PURE; @@ -1641,7 +1641,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame3,IDirect3DRMVisual) STDMETHOD(Move)(THIS_ D3DVALUE delta) PURE; STDMETHOD(DeleteChild)(THIS_ IDirect3DRMFrame3 *child) PURE; STDMETHOD(DeleteLight)(THIS_ struct IDirect3DRMLight *light) PURE; - STDMETHOD(DeleteMoveCallback)(THIS_ D3DRMFRAME3MOVECALLBACK, VOID *arg) PURE; + STDMETHOD(DeleteMoveCallback)(THIS_ D3DRMFRAME3MOVECALLBACK cb, void *ctx) PURE; STDMETHOD(DeleteVisual)(THIS_ IUnknown *visual) PURE; STDMETHOD_(D3DCOLOR, GetSceneBackground)(THIS) PURE; STDMETHOD(GetSceneBackgroundDepth)(THIS_ IDirectDrawSurface **surface) PURE;

1 0

Henri Verbeet : wined3d: Copy some missing fields to the new swapchain desc in wined3d_device_reset ().
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: bff80b8bab25aee0cd25e1b10f1edbd7b2091631 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bff80b8bab25aee0cd25e1b10… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 23 10:26:45 2013 +0200 wined3d: Copy some missing fields to the new swapchain desc in wined3d_device_reset(). The ones that matter are enable_auto_depth_stencil and auto_depth_stencil_format. auto_restore_display_mode should never change in practice. --- dlls/wined3d/device.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 158305b..9c3200e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4505,9 +4505,12 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, /* No special treatment of these parameters. Just store them */ swapchain->desc.swap_effect = swapchain_desc->swap_effect; + swapchain->desc.enable_auto_depth_stencil = swapchain_desc->enable_auto_depth_stencil; + swapchain->desc.auto_depth_stencil_format = swapchain_desc->auto_depth_stencil_format; swapchain->desc.flags = swapchain_desc->flags; - swapchain->desc.swap_interval = swapchain_desc->swap_interval; swapchain->desc.refresh_rate = swapchain_desc->refresh_rate; + swapchain->desc.swap_interval = swapchain_desc->swap_interval; + swapchain->desc.auto_restore_display_mode = swapchain_desc->auto_restore_display_mode; /* What to do about these? */ if (swapchain_desc->backbuffer_count

1 0

Vincent Povirk : gdiplus: Always provide image data in the format requested by image encoders.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 12586f76e34c64a0b33d5e4626d67d6a07ebaeff URL: http://source.winehq.org/git/wine.git/?a=commit;h=12586f76e34c64a0b33d5e462… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 14 15:04:13 2013 -0500 gdiplus: Always provide image data in the format requested by image encoders. --- dlls/gdiplus/image.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 98c0bd0..0f97fd7 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4002,6 +4002,7 @@ static GpStatus encode_image_WIC(GpImage *image, IStream* stream, HRESULT hr; UINT width, height; PixelFormat gdipformat=0; + const WICPixelFormatGUID *desired_wicformat; WICPixelFormatGUID wicformat; GpRect rc; BitmapData lockeddata; @@ -4054,20 +4055,40 @@ static GpStatus encode_image_WIC(GpImage *image, IStream* stream, { if (pixel_formats[i].gdip_format == bitmap->format) { - memcpy(&wicformat, pixel_formats[i].wic_format, sizeof(GUID)); + desired_wicformat = pixel_formats[i].wic_format; gdipformat = bitmap->format; break; } } if (!gdipformat) { - memcpy(&wicformat, &GUID_WICPixelFormat32bppBGRA, sizeof(GUID)); + desired_wicformat = &GUID_WICPixelFormat32bppBGRA; gdipformat = PixelFormat32bppARGB; } + memcpy(&wicformat, desired_wicformat, sizeof(GUID)); hr = IWICBitmapFrameEncode_SetPixelFormat(frameencode, &wicformat); } + if (SUCCEEDED(hr) && !IsEqualGUID(desired_wicformat, &wicformat)) + { + /* Encoder doesn't support this bitmap's format. */ + gdipformat = 0; + for (i=0; pixel_formats[i].wic_format; i++) + { + if (IsEqualGUID(&wicformat, pixel_formats[i].wic_format)) + { + gdipformat = bitmap->format; + break; + } + } + if (!gdipformat) + { + ERR("Cannot support encoder format %s\n", debugstr_guid(&wicformat)); + hr = E_FAIL; + } + } + if (SUCCEEDED(hr)) { stat = GdipBitmapLockBits(bitmap, &rc, ImageLockModeRead, gdipformat,

1 0