June 2013 - Wine-Commits - list.winehq.org

André Hentschel : oleaut32/tests: Get rid of HAVE_OLEAUT32_R8 in safearray.
by Alexandre Julliard June 27, 2013

June 27, 2013

Module: wine Branch: master Commit: 4e0e066ccad38aa41b7a56e4fdf1061288f25e99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e0e066ccad38aa41b7a56e4f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 26 23:47:20 2013 +0200 oleaut32/tests: Get rid of HAVE_OLEAUT32_R8 in safearray. --- dlls/oleaut32/tests/safearray.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index ca1d18c..8acca13 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -55,8 +55,6 @@ static SAFEARRAY* (WINAPI *pSafeArrayCreateVector)(VARTYPE,LONG,ULONG); /* Is a given function exported from oleaut32? */ #define HAVE_FUNC(func) ((void*)GetProcAddress(hOleaut32, #func) != NULL) -/* Have R8 data type? */ -#define HAVE_OLEAUT32_R8 HAVE_FUNC(VarR8FromI1) /* Have I8/UI8 data type? */ #define HAVE_OLEAUT32_I8 HAVE_FUNC(VarI8FromI1) /* Have INT_PTR/UINT_PTR type? */ @@ -178,9 +176,7 @@ static DWORD SAFEARRAY_GetVTSize(VARTYPE vt) case VT_UI4: case VT_R4: case VT_ERROR: return sizeof(LONG); - case VT_R8: - if (HAVE_OLEAUT32_R8) - return sizeof(LONG64); + case VT_R8: return sizeof(LONG64); case VT_I8: case VT_UI8: if (HAVE_OLEAUT32_I8)

1 0

André Hentschel : oleaut32/tests: Get rid of IS_ANCIENT in safearray.
by Alexandre Julliard June 27, 2013

June 27, 2013

Module: wine Branch: master Commit: acfc14fe9b82660adaf040f5233fbdc12995c0ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=acfc14fe9b82660adaf040f52… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 26 23:43:18 2013 +0200 oleaut32/tests: Get rid of IS_ANCIENT in safearray. --- dlls/oleaut32/tests/safearray.c | 22 ++++++---------------- 1 files changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index b689334..d434ae8 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -66,9 +66,6 @@ static SAFEARRAY* (WINAPI *pSafeArrayCreateVector)(VARTYPE,LONG,ULONG); /* Have INT_PTR/UINT_PTR type? */ static BOOL HAVE_OLEAUT32_INT_PTR; -/* very old version? */ -#define IS_ANCIENT (!HAVE_FUNC(VarI1FromI2)) - #define START_REF_COUNT 1 #define RECORD_SIZE 64 #define RECORD_SIZE_FAIL 17 @@ -481,10 +478,7 @@ static void test_safearray(void) a = SafeArrayCreate(vttypes[i].vt, 1, &bound); ok((!a && !vttypes[i].elemsize) || - (a && vttypes[i].elemsize == a->cbElements) || - (IS_ANCIENT && (vttypes[i].vt == VT_DECIMAL || vttypes[i].vt == VT_I1 || - vttypes[i].vt == VT_UI2 || vttypes[i].vt == VT_UI4 || vttypes[i].vt == VT_INT || - vttypes[i].vt == VT_UINT)), + (a && vttypes[i].elemsize == a->cbElements), "SAC(%d,1,[1,0]), %p result %d, expected %d\n", vttypes[i].vt,a,(a?a->cbElements:0),vttypes[i].elemsize); @@ -684,8 +678,7 @@ static void test_SafeArrayAllocDestroyDescriptor(void) ok(hres == E_INVALIDARG, "0 dimensions gave hres 0x%x\n", hres); hres = SafeArrayAllocDescriptor(65536, &sa); - ok(IS_ANCIENT || hres == E_INVALIDARG, - "65536 dimensions gave hres 0x%x\n", hres); + ok(hres == E_INVALIDARG, "65536 dimensions gave hres 0x%x\n", hres); if (0) { @@ -757,7 +750,7 @@ static void test_SafeArrayCreateLockDestroy(void) ok(sa == NULL, "NULL bounds didn't fail\n"); */ sa = SafeArrayCreate(VT_UI1, 65536, sab); - ok(IS_ANCIENT || !sa, "Max bounds didn't fail\n"); + ok(!sa, "Max bounds didn't fail\n"); memset(sab, 0, sizeof(sab)); @@ -776,9 +769,7 @@ static void test_SafeArrayCreateLockDestroy(void) sa = SafeArrayCreate(vt, dimension, sab); if (dwLen) - ok(sa || (IS_ANCIENT && (vt == VT_DECIMAL || vt == VT_I1 || vt == VT_UI2 || - vt == VT_UI4 || vt == VT_INT || vt == VT_UINT)), - "VARTYPE %d (@%d dimensions) failed\n", vt, dimension); + ok(sa != NULL, "VARTYPE %d (@%d dimensions) failed\n", vt, dimension); else ok(sa == NULL || vt == VT_R8, "VARTYPE %d (@%d dimensions) succeeded!\n", vt, dimension); @@ -806,7 +797,7 @@ static void test_SafeArrayCreateLockDestroy(void) { VARTYPE aVt; - ok(IS_ANCIENT || sa->fFeatures & FADF_HAVEVARTYPE, + ok(sa->fFeatures & FADF_HAVEVARTYPE, "Non interface type should have FADF_HAVEVARTYPE\n"); if (pSafeArrayGetVartype) { @@ -818,8 +809,7 @@ static void test_SafeArrayCreateLockDestroy(void) } else { - ok(IS_ANCIENT || sa->fFeatures & FADF_HAVEIID, - "Interface type should have FADF_HAVEIID\n"); + ok(sa->fFeatures & FADF_HAVEIID, "Interface type should have FADF_HAVEIID\n"); if (pSafeArraySetIID) { hres = pSafeArraySetIID(sa, &IID_IUnknown);

1 0

Jacek Caban : ole32/tests: Added tests for external connections stored in ROT.
by Alexandre Julliard June 27, 2013

June 27, 2013

Module: wine Branch: master Commit: a2aefe917e3655bca31e5f79347732769616555f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2aefe917e3655bca31e5f793… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 27 13:07:58 2013 +0200 ole32/tests: Added tests for external connections stored in ROT. --- dlls/ole32/tests/moniker.c | 59 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 2e5a603..1ff7159 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -97,6 +97,55 @@ static SIZE_T round_global_size(SIZE_T size) return ((size + global_size_alignment - 1) & ~(global_size_alignment - 1)); } +static DWORD external_connections; + +static HRESULT WINAPI ExternalConnection_QueryInterface(IExternalConnection *iface, REFIID riid, void **ppv) +{ + ok(0, "unxpected call\n"); + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI ExternalConnection_AddRef(IExternalConnection *iface) +{ + return 2; +} + +static ULONG WINAPI ExternalConnection_Release(IExternalConnection *iface) +{ + return 1; +} + +static DWORD WINAPI ExternalConnection_AddConnection(IExternalConnection *iface, DWORD extconn, DWORD reserved) +{ + trace("add connection\n"); + + ok(extconn == EXTCONN_STRONG, "extconn = %d\n", extconn); + ok(!reserved, "reserved = %x\n", reserved); + return ++external_connections; +} + +static DWORD WINAPI ExternalConnection_ReleaseConnection(IExternalConnection *iface, DWORD extconn, + DWORD reserved, BOOL fLastReleaseCloses) +{ + trace("release connection\n"); + + ok(extconn == EXTCONN_STRONG, "extconn = %d\n", extconn); + ok(!reserved, "reserved = %x\n", reserved); + + return --external_connections; +} + +static const IExternalConnectionVtbl ExternalConnectionVtbl = { + ExternalConnection_QueryInterface, + ExternalConnection_AddRef, + ExternalConnection_Release, + ExternalConnection_AddConnection, + ExternalConnection_ReleaseConnection +}; + +static IExternalConnection ExternalConnection = { &ExternalConnectionVtbl }; + static HRESULT WINAPI Test_IClassFactory_QueryInterface( LPCLASSFACTORY iface, REFIID riid, @@ -112,6 +161,11 @@ static HRESULT WINAPI Test_IClassFactory_QueryInterface( return S_OK; } + if(IsEqualGUID(riid, &IID_IExternalConnection)) { + *ppvObj = &ExternalConnection; + return S_OK; + } + *ppvObj = NULL; return E_NOINTERFACE; } @@ -588,11 +642,13 @@ static void test_ROT(void) ok_ole_success(hr, GetRunningObjectTable); expected_method_list = methods_register_no_ROTData; + external_connections = 0; /* try with our own moniker that doesn't support IROTData */ hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown*)&Test_ClassFactory, &MonikerNoROTData, &dwCookie); ok_ole_success(hr, IRunningObjectTable_Register); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); + ok(external_connections == 1, "external_connections = %d\n", external_connections); ok_more_than_one_lock(); @@ -603,6 +659,7 @@ static void test_ROT(void) hr = IRunningObjectTable_Revoke(pROT, dwCookie); ok_ole_success(hr, IRunningObjectTable_Revoke); + ok(external_connections == 0, "external_connections = %d\n", external_connections); ok_no_locks(); @@ -629,9 +686,11 @@ static void test_ROT(void) ok_ole_success(hr, CreateClassMoniker); /* test flags: 0 */ + external_connections = 0; hr = IRunningObjectTable_Register(pROT, 0, (IUnknown*)&Test_ClassFactory, pMoniker, &dwCookie); ok_ole_success(hr, IRunningObjectTable_Register); + ok(external_connections == 0, "external_connections = %d\n", external_connections); ok_more_than_one_lock();

1 0

Alexandre Julliard : winevdm: Make it a GUI application to avoid a spurious console.
by Alexandre Julliard June 27, 2013

June 27, 2013

Module: wine Branch: master Commit: 8b8d2a3d7cc97ff1562b78ddcb3a86e186ec4370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b8d2a3d7cc97ff1562b78ddc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 13:39:23 2013 +0200 winevdm: Make it a GUI application to avoid a spurious console. --- programs/winevdm/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winevdm/Makefile.in b/programs/winevdm/Makefile.in index 9e33dd3..618f0b7 100644 --- a/programs/winevdm/Makefile.in +++ b/programs/winevdm/Makefile.in @@ -1,5 +1,5 @@ MODULE = winevdm.exe -APPMODE = -mconsole +APPMODE = -mwindows IMPORTS = user32 kernel C_SRCS = \

1 0

Petr Kočandrle : po: Fix some Czech spelling errors.
by Alexandre Julliard June 27, 2013

June 27, 2013

Module: wine Branch: master Commit: eb69999a7305793fbdf3a3a9f8d07078a609d293 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb69999a7305793fbdf3a3a9f… Author: Petr Kočandrle <petr.kocandrle(a)gmail.com> Date: Wed Jun 26 20:56:37 2013 +0200 po: Fix some Czech spelling errors. --- po/cs.po | 52 ++++++++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/po/cs.po b/po/cs.po index 19a2f6d..37ad051 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1026,7 +1026,7 @@ msgid "" "Before you can perform printer-related tasks such as page setup or printing " "a document, you need to install a printer. Please install one and retry." msgstr "" -"Před provedením akce související s tiskárou jako je nastavení vzhledu " +"Před provedením akce související s tiskárnou jako je nastavení vzhledu " "stránky nebo tisk dokumentu je nejdříve nutné instalovat tiskárnu. " "Nainstalujte ji prosím a opakujte akci." @@ -1671,7 +1671,7 @@ msgstr "" #: crypt32.rc:138 msgid "Secure Email" -msgstr "Zabezečený e-mail" +msgstr "Zabezpečený e-mail" #: crypt32.rc:139 msgid "Time Stamping" @@ -3527,7 +3527,7 @@ msgstr "Očekáváno „)“" #: jscript.rc:37 msgid "Invalid character" -msgstr "Chytný znak" +msgstr "Chybný znak" #: jscript.rc:38 msgid "Unterminated string constant" @@ -3584,7 +3584,7 @@ msgstr "" #: jscript.rc:51 msgid "Boolean object expected" -msgstr "Očekáván Booleánský objekt" +msgstr "Očekáván boolean objekt" #: jscript.rc:52 msgid "Cannot delete '|'" @@ -5780,7 +5780,7 @@ msgstr "Žádné nestránkované systémové prostředky.\n" #: winerror.mc:2656 msgid "No paged system resources.\n" -msgstr "Žádné stránkováné systémové prostředky.\n" +msgstr "Žádné stránkované systémové prostředky.\n" #: winerror.mc:2661 msgid "No working set quota.\n" @@ -8750,7 +8750,7 @@ msgstr "Ovladač zařízení není připraven." #: winmm.rc:74 msgid "A problem occurred in initializing MCI. Try restarting Windows." -msgstr "Při inicialiazaci MCI došlo k problémům. Zkuste zrestartovat Windows." +msgstr "Při inicializaci MCI došlo k problémům. Zkuste restartovat Windows." #: winmm.rc:75 msgid "" @@ -8974,7 +8974,7 @@ msgid "" "All wave devices that can record files in the current format are in use. " "Wait until a wave device is free, and then try again." msgstr "" -"Všechna wave zařízení, která by mohla nahrávat oubory s tímto formátem jsou " +"Všechna wave zařízení, která by mohla nahrávat soubory s tímto formátem jsou " "používána. Vyčkejte na uvolnění zařízení a zkuste to znovu." #: winmm.rc:111 @@ -9438,13 +9438,12 @@ msgid "" "Changes to default directory, environment variables etc made within a\n" "called procedure are inherited by the caller.\n" msgstr "" -"CALL <dávkový soubor> je užíván ke spuštění příkazů\n" -"z jiného dávkového souboru. Když se běh volaného dávkového souboru ukončí, " -"kontrola se vrátí\n" +"CALL <dávkový soubor> je užíván ke spuštění příkazů z jiného dávkového\n" +"souboru. Když se běh volaného dávkového souboru ukončí, obsluha se vrátí\n" "volajícímu souboru. Příkaz CALL může předávat parametry\n" "volané proceduře.\n" "\n" -"Změny v defaultním adresáři, proměnných prostředí atd., udělané\n" +"Změny výchozího adresáře, proměnných prostředí atd. provedené\n" "volanou procedurou jsou zděděny volajícím.\n" #: cmd.rc:40 @@ -9825,7 +9824,7 @@ msgid "" "if redirected). No check is made that the file is readable text.\n" msgstr "" "TYPE <soubor> vypíše <soubor> na konzolové zařízení (nebo jinam,\n" -"je-li výstup přeměrován). Není zjišťováno, bude-li vypsán čitelný text.\n" +"je-li výstup přesměrován). Není zjišťováno, bude-li vypsán čitelný text.\n" #: cmd.rc:226 #, fuzzy @@ -11380,7 +11379,7 @@ msgstr "&DWORD položka" #: regedit.rc:51 regedit.rc:102 msgid "&Multi-String Value" -msgstr "&Víceřetězcová položka" +msgstr "&Více-řetězcová položka" #: regedit.rc:52 regedit.rc:103 msgid "&Expandable String Value" @@ -11492,7 +11491,7 @@ msgstr "Šestnáctkový" #: regedit.rc:283 msgid "Decimal" -msgstr "Desitkový" +msgstr "Desítkový" #: regedit.rc:290 msgid "Edit Binary" @@ -11500,7 +11499,7 @@ msgstr "Úprava binární položky" #: regedit.rc:303 msgid "Edit Multi-String" -msgstr "Úprava víceřetězcové položky" +msgstr "Úprava více-řetězcové položky" #: regedit.rc:134 msgid "Contains commands for working with the whole registry" @@ -11521,7 +11520,7 @@ msgstr "Obsahuje příkazy pro přístup k často užívaným klíčům" #: regedit.rc:138 msgid "" "Contains commands for displaying help and information about registry editor" -msgstr "Obsahuje příkazy pro zobrazení nápovědy a informacío editoru registru" +msgstr "Obsahuje příkazy pro zobrazení nápovědy a informací o editoru registru" #: regedit.rc:139 msgid "Contains commands for creating new keys or values" @@ -11561,7 +11560,7 @@ msgstr "(hodnota nenastavena)" #: regedit.rc:203 msgid "(cannot display value)" -msgstr "(není možné zobazit hodnotu)" +msgstr "(není možné zobrazit hodnotu)" #: regedit.rc:204 msgid "(unknown %d)" @@ -11689,7 +11688,7 @@ msgstr "Nelze najít klíč '%s'" #: regedit.rc:149 msgid "Adds a new multi-string value" -msgstr "Přidá novou víceřetězcovou položku" +msgstr "Přidá novou více-řetězcovou položku" #: regedit.rc:171 msgid "Exports selected branch of the registry to a text file" @@ -12558,7 +12557,7 @@ msgstr "Úloha" #: uninstaller.rc:26 msgid "Wine Application Uninstaller" -msgstr "Deinstalátor" +msgstr "Wine odinstalátor aplikací" #: uninstaller.rc:27 msgid "" @@ -12566,8 +12565,9 @@ msgid "" "executable.\n" "Do you want to remove the uninstall entry from the registry?" msgstr "" -"Spuštění příkazu %s selhalo, možná příčína je chybějící aplikace.\n" -"Přejete si odstranit instalační záznam z registru?" +"Spuštění odinstalačního příkazu %s selhalo, možná příčína je chybějící " +"aplikace.\n" +"Přejete si odstranit odinstalační záznam z registru?" #: view.rc:33 msgid "&Pan" @@ -12731,7 +12731,7 @@ msgstr "Úprava nastavení knihovny" #: winecfg.rc:199 msgid "Load order" -msgstr "Pořadí nahravání" +msgstr "Pořadí nahrávání" #: winecfg.rc:200 msgid "&Builtin (Wine)" @@ -13102,7 +13102,7 @@ msgstr "Písmo titulku aktivního okna" #: winecfg.rc:104 msgid "Inactive Title Bar" -msgstr "Pozadí titulku neaktivného okna" +msgstr "Pozadí titulku neaktivního okna" #: winecfg.rc:105 msgid "Inactive Title Text" @@ -13162,7 +13162,7 @@ msgstr "Přechod titulku aktivního okna" #: winecfg.rc:119 msgid "Inactive Title Bar Gradient" -msgstr "Přechod titulku neaktivného okna" +msgstr "Přechod titulku neaktivního okna" #: winecfg.rc:120 msgid "Menu Highlight" @@ -13311,7 +13311,7 @@ msgstr "Hl&edat" #: wineconsole.rc:36 msgid "Setup - Default settings" -msgstr "Setup - Defaultní nastavení" +msgstr "Setup - Výchozí nastavení" #: wineconsole.rc:37 msgid "Setup - Current settings" @@ -13323,7 +13323,7 @@ msgstr "Chyba nastavení" #: wineconsole.rc:39 msgid "Screen buffer size must be greater or equal to the window's one" -msgstr "Zásobník obrazovky musí být větší nebo stejně velký jakzásobník okna" +msgstr "Zásobník obrazovky musí být větší nebo stejně velký jako zásobník okna" #: wineconsole.rc:34 #, fuzzy

1 0

Alexandre Julliard : krnl386: Create a new console for DOS binaries.
by Alexandre Julliard June 27, 2013

June 27, 2013

Module: wine Branch: master Commit: 3d8d9f2e51be53064f57a6d70ac61ef958999e38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d8d9f2e51be53064f57a6d70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 13:39:08 2013 +0200 krnl386: Create a new console for DOS binaries. --- dlls/krnl386.exe16/dosexe.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/krnl386.exe16/dosexe.c b/dlls/krnl386.exe16/dosexe.c index ff96554..e8c8002 100644 --- a/dlls/krnl386.exe16/dosexe.c +++ b/dlls/krnl386.exe16/dosexe.c @@ -433,6 +433,8 @@ void __wine_load_dos_exe( LPCSTR filename, LPCSTR cmdline ) } } + AllocConsole(); + if (MZ_DoLoadImage( hFile, filename, NULL, 0 )) { DWORD err = MZ_Launch( dos_cmdtail, dos_length );

1 0

André Hentschel : oleaut32/tests: Get rid of HAVE_OLEAUT32_DECIMAL in safearray.
by Alexandre Julliard June 27, 2013

June 27, 2013

Module: wine Branch: master Commit: 8c0398d1a5e58283c1197d97c78b1eb8010c7e3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c0398d1a5e58283c1197d97c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 26 23:45:25 2013 +0200 oleaut32/tests: Get rid of HAVE_OLEAUT32_DECIMAL in safearray. --- dlls/oleaut32/tests/safearray.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index c6d16ce..ca1d18c 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -59,8 +59,6 @@ static SAFEARRAY* (WINAPI *pSafeArrayCreateVector)(VARTYPE,LONG,ULONG); #define HAVE_OLEAUT32_R8 HAVE_FUNC(VarR8FromI1) /* Have I8/UI8 data type? */ #define HAVE_OLEAUT32_I8 HAVE_FUNC(VarI8FromI1) -/* Have the decimal type? */ -#define HAVE_OLEAUT32_DECIMAL HAVE_FUNC(VarDecAdd) /* Have INT_PTR/UINT_PTR type? */ static BOOL HAVE_OLEAUT32_INT_PTR; @@ -201,10 +199,7 @@ static DWORD SAFEARRAY_GetVTSize(VARTYPE vt) case VT_DISPATCH: return sizeof(LPDISPATCH); case VT_VARIANT: return sizeof(VARIANT); case VT_UNKNOWN: return sizeof(LPUNKNOWN); - case VT_DECIMAL: - if (HAVE_OLEAUT32_DECIMAL) - return sizeof(DECIMAL); - break; + case VT_DECIMAL: return sizeof(DECIMAL); } return 0; }

1 0

Jacek Caban : ole32: Don't call AddConnection for weak references.
by Alexandre Julliard June 27, 2013

June 27, 2013

Module: wine Branch: master Commit: 070b22ebb4c4990c54d0e4bb7f91d868d5ac8466 URL: http://source.winehq.org/git/wine.git/?a=commit;h=070b22ebb4c4990c54d0e4bb7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 27 13:07:48 2013 +0200 ole32: Don't call AddConnection for weak references. --- dlls/ole32/stubmanager.c | 28 ++++++++++++++++++---------- 1 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 822b299..57a33b0 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -219,14 +219,8 @@ struct stub_manager *new_stub_manager(APARTMENT *apt, IUnknown *object) */ sm->extrefs = 0; - /* - * NOTE: According to tests, creating a stub causes two AddConnection calls followed by - * one ReleaseConnection call (with fLastReleaseCloses=FALSE). - */ hres = IUnknown_QueryInterface(object, &IID_IExternalConnection, (void**)&sm->extern_conn); - if(SUCCEEDED(hres)) - IExternalConnection_AddConnection(sm->extern_conn, EXTCONN_STRONG, 0); - else + if(FAILED(hres)) sm->extern_conn = NULL; EnterCriticalSection(&apt->cs); @@ -253,10 +247,8 @@ static void stub_manager_delete(struct stub_manager *m) stub_manager_delete_ifstub(m, ifstub); } - if(m->extern_conn) { - IExternalConnection_ReleaseConnection(m->extern_conn, EXTCONN_STRONG, 0, TRUE); + if(m->extern_conn) IExternalConnection_Release(m->extern_conn); - } CoTaskMemFree(m->oxid_info.psa); IUnknown_Release(m->object); @@ -393,10 +385,13 @@ struct stub_manager *get_stub_manager(APARTMENT *apt, OID oid) /* add some external references (ie from a client that unmarshaled an ifptr) */ ULONG stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak) { + BOOL first_extern_ref; ULONG rc; EnterCriticalSection(&m->lock); + first_extern_ref = refs && !m->extrefs; + /* make sure we don't overflow extrefs */ refs = min(refs, (ULONG_MAX-1 - m->extrefs)); rc = (m->extrefs += refs); @@ -408,12 +403,20 @@ ULONG stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak TRACE("added %u refs to %p (oid %s), rc is now %u\n", refs, m, wine_dbgstr_longlong(m->oid), rc); + /* + * NOTE: According to tests, creating a stub causes two AddConnection calls followed by + * one ReleaseConnection call (with fLastReleaseCloses=FALSE). + */ + if(first_extern_ref && m->extern_conn) + IExternalConnection_AddConnection(m->extern_conn, EXTCONN_STRONG, 0); + return rc; } /* remove some external references */ ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tableweak, BOOL last_unlock_releases) { + BOOL last_extern_ref; ULONG rc; EnterCriticalSection(&m->lock); @@ -427,10 +430,15 @@ ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tablewea if (!last_unlock_releases) rc += m->weakrefs; + last_extern_ref = refs && !m->extrefs; + LeaveCriticalSection(&m->lock); TRACE("removed %u refs from %p (oid %s), rc is now %u\n", refs, m, wine_dbgstr_longlong(m->oid), rc); + if (last_extern_ref && m->extern_conn) + IExternalConnection_ReleaseConnection(m->extern_conn, EXTCONN_STRONG, 0, TRUE /* FIXME: Use last_unlock releases? */); + if (rc == 0) stub_manager_int_release(m);

1 0

Lucas Zawacki : Added Portuguese translation for release 1.6-rc3
by Jeremy Newman June 27, 2013

June 27, 2013

Module: website Branch: master Commit: 0b01d3f527132031c48f444f7faf569d99486427 URL: http://source.winehq.org/git/website.git/?a=commit;h=0b01d3f527132031c48f44… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Thu Jun 27 00:33:37 2013 -0300 Added Portuguese translation for release 1.6-rc3 --- news/pt/2013062101.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/pt/2013062101.xml b/news/pt/2013062101.xml new file mode 100644 index 0000000..81970a3 --- /dev/null +++ b/news/pt/2013062101.xml @@ -0,0 +1,12 @@ +<news> +<date>21 de Junho de 2013</date> +<title>Wine 1.6-rc3 lançado</title> +<body> + A versão de desenvolvimento 1.6-rc3 já está disponível agora. + <a href="{$root}/announce/1.6-rc3">Novidades</a> desta versão: +<ul> + <li>Apenas correções de bugs, o código está congelado.</li> +</ul> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.6-rc3.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e irão aparecer em breve em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news> \ No newline at end of file

1 0

Matteo Bruni : wined3d: Fix handling of cnd instruction with coissue flag.
by Alexandre Julliard June 26, 2013

June 26, 2013

Module: wine Branch: master Commit: c9458882a0364831bded52d003da5365c0725b3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9458882a0364831bded52d00… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 25 19:23:18 2013 +0200 wined3d: Fix handling of cnd instruction with coissue flag. --- dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/glsl_shader.c | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a9894da..b7f5ffd 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1630,8 +1630,8 @@ static void pshader_hw_cnd(const struct wined3d_shader_instruction *ins) shader_arb_get_dst_param(ins, dst, dst_name); shader_arb_get_src_param(ins, &ins->src[1], 1, src_name[1]); - /* The coissue flag changes the semantic of the cnd instruction in <= 1.3 shaders */ - if (shader_version <= WINED3D_SHADER_VERSION(1, 3) && ins->coissue) + if (shader_version <= WINED3D_SHADER_VERSION(1, 3) && ins->coissue + && ins->dst->write_mask != WINED3DSP_WRITEMASK_3) { shader_addline(buffer, "MOV%s %s, %s;\n", shader_arb_get_modifier(ins), dst_name, src_name[1]); } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ad9be6a..98671aa 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3029,14 +3029,11 @@ static void shader_glsl_cnd(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); shader_glsl_add_src_param(ins, &ins->src[2], write_mask, &src2_param); - /* Fun: The D3DSI_COISSUE flag changes the semantic of the cnd instruction for < 1.4 shaders */ - if (ins->coissue) - { + if (ins->coissue && ins->dst->write_mask != WINED3DSP_WRITEMASK_3) shader_addline(ins->ctx->buffer, "%s /* COISSUE! */);\n", src1_param.param_str); - } else { + else shader_addline(ins->ctx->buffer, "%s > 0.5 ? %s : %s);\n", src0_param.param_str, src1_param.param_str, src2_param.param_str); - } return; }

1 0