September 2006 - Wine-Commits

Paul Vriens : wintrust: Register WINTRUST_ACTION_GENERIC_VERIFY_V2.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 7b75ec20982d194ca483ac1435838e5d942bf9a2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7b75ec20982d194ca483ac1… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Sep 5 09:00:03 2006 +0200 wintrust: Register WINTRUST_ACTION_GENERIC_VERIFY_V2. --- dlls/wintrust/register.c | 181 +++++++++++++++++++++++++++++++++++++++++++++- tools/wine.inf | 1 2 files changed, 177 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=7b75ec20982d194ca48…

1 0

Paul Vriens : wintrust.h: Added a new define for a provider function.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 3943f468ac4a2b73cf3a6e50f7e62a3199ad84d6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3943f468ac4a2b73cf3a6e5… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Fri Sep 1 16:15:18 2006 +0200 wintrust.h: Added a new define for a provider function. --- include/wintrust.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/wintrust.h b/include/wintrust.h index b04e134..ce6df7b 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -303,6 +303,16 @@ #ifdef __cplusplus extern "C" { #endif +#if defined(__GNUC__) +#define WT_PROVIDER_CERTTRUST_FUNCTION (const WCHAR []) \ + {'W','i','n','t','r','u','s','t','C','e','r','t','i','f','i','c','a','t','e','T','r','u','s','t', 0} +#elif defined(_MSC_VER) +#define WT_PROVIDER_CERTTRUST_FUNCTION L"WintrustCertificateTrust" +#else +static const WCHAR WT_PROVIDER_CERTTRUST_FUNCTION[] = \ + {'W','i','n','t','r','u','s','t','C','e','r','t','i','f','i','c','a','t','e','T','r','u','s','t', 0}; +#endif + BOOL WINAPI WintrustAddActionID(GUID*,DWORD,CRYPT_REGISTER_ACTIONID*); BOOL WINAPI WintrustRemoveActionID(GUID*); BOOL WINAPI WintrustLoadFunctionPointers(GUID*,CRYPT_PROVIDER_FUNCTIONS*);

1 0

Paul Vriens : softpub.h: Added several new defines for provider functions.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 26b918aeb273ebd5cd5df30417d8101de9401ef5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=26b918aeb273ebd5cd5df30… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Sat Sep 2 12:38:20 2006 +0200 softpub.h: Added several new defines for provider functions. --- include/softpub.h | 135 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 135 insertions(+), 0 deletions(-) diff --git a/include/softpub.h b/include/softpub.h index 05a43e5..51b67b6 100644 --- a/include/softpub.h +++ b/include/softpub.h @@ -24,22 +24,157 @@ #include <wintrust.h> #define WINTRUST_ACTION_GENERIC_CERT_VERIFY \ { 0x189a3842, 0x3041, 0x11d1, { 0x85,0xe1,0x00,0xc0,0x4f,0xc2,0x95,0xee }} +#if defined(__GNUC__) +#define SP_GENERIC_CERT_INIT_FUNCTION (const WCHAR []) \ + {'S','o','f','t','p','u','b','D','e','f','C','e','r','t','I','n','i','t', 0} +#elif defined(_MSC_VER) +#define SP_GENERIC_CERT_INIT_FUNCTION L"SoftpubDefCertInit" +#else +static const WCHAR SP_GENERIC_CERT_INIT_FUNCTION[] = \ + {'S','o','f','t','p','u','b','D','e','f','C','e','r','t','I','n','i','t', 0}; +#endif + #define WINTRUST_ACTION_GENERIC_CHAIN_VERIFY \ { 0xfc451c16, 0xac75, 0x11d1, { 0xb4,0xb8,0x00,0xc0,0x4f,0xb6,0x6e,0xa0 }} +#if defined(__GNUC__) +#define GENERIC_CHAIN_FINALPOLICY_FUNCTION (const WCHAR []) \ + {'G','e','n','e','r','i','c','C','h','a','i','n','F','i','n','a','l','P','r','o','v', 0} +#define GENERIC_CHAIN_CERTTRUST_FUNCTION (const WCHAR []) \ + {'G','e','n','e','r','i','c','C','h','a','i','n','C','e','r','t','i','f','i','c','a','t','e','T','r','u','s','t', 0} +#elif defined(_MSC_VER) +#define GENERIC_CHAIN_FINALPOLICY_FUNCTION L"GenericChainFinalProv" +#define GENERIC_CHAIN_CERTTRUST_FUNCTION L"GenericChainCertificateTrust" +#else +static const WCHAR GENERIC_CHAIN_FINALPOLICY_FUNCTION[] = \ + {'G','e','n','e','r','i','c','C','h','a','i','n','F','i','n','a','l','P','r','o','v', 0}; +static const WCHAR GENERIC_CHAIN_CERTTRUST_FUNCTION[] = \ + {'G','e','n','e','r','i','c','C','h','a','i','n','C','e','r','t','i','f','i','c','a','t','e','T','r','u','s','t', 0}; +#endif + +#if defined(__GNUC__) +#define SP_POLICY_PROVIDER_DLL_NAME (const WCHAR []) \ + {'W','I','N','T','R','U','S','T','.','D','L','L' ,0} +#elif defined(_MSC_VER) +#define SP_POLICY_PROVIDER_DLL_NAME L"WINTRUST.DLL" +#else +static const WCHAR SP_POLICY_PROVIDER_DLL_NAME[] = \ + {'W','I','N','T','R','U','S','T','.','D','L','L', 0}; +#endif + #define WINTRUST_ACTION_GENERIC_VERIFY_V2 \ { 0xaac56b, 0xcd44, 0x11d0, { 0x8c,0xc2,0x00,0xc0,0x4f,0xc2,0x95,0xee }} +#if defined(__GNUC__) +#define SP_INIT_FUNCTION (const WCHAR []) \ + {'S','o','f','t','p','u','b','I','n','i','t','i','a','l','i','z','e', 0} +#define SP_OBJTRUST_FUNCTION (const WCHAR []) \ + {'S','o','f','t','p','u','b','L','o','a','d','M','e','s','s','a','g','e', 0} +#define SP_SIGTRUST_FUNCTION (const WCHAR []) \ + {'S','o','f','t','p','u','b','L','o','a','d','S','i','g','n','a','t','u','r','e', 0} +#define SP_CHKCERT_FUNCTION (const WCHAR []) \ + {'S','o','f','t','p','u','b','C','h','e','c','k','C','e','r','t', 0} +#define SP_FINALPOLICY_FUNCTION (const WCHAR []) \ + {'S','o','f','t','p','u','b','A','u','t','h','e','n','t','i','c','o','d','e', 0} +#define SP_CLEANUPPOLICY_FUNCTION (const WCHAR []) \ + {'S','o','f','t','p','u','b','C','l','e','a','n','u','p', 0} +#elif defined(_MSC_VER) +#define SP_INIT_FUNCTION L"SoftpubInitialize" +#define SP_OBJTRUST_FUNCTION L"SoftpubLoadMessage" +#define SP_SIGTRUST_FUNCTION L"SoftpubLoadSignature" +#define SP_CHKCERT_FUNCTION L"SoftpubCheckCert" +#define SP_FINALPOLICY_FUNCTION L"SoftpubAuthenticode" +#define SP_CLEANUPPOLICY_FUNCTION L"SoftpubCleanup" +#else +static const WCHAR SP_INIT_FUNCTION[] = \ + {'S','o','f','t','p','u','b','I','n','i','t','i','a','l','i','z','e', 0}; +static const WCHAR SP_OBJTRUST_FUNCTION[] = \ + {'S','o','f','t','p','u','b','L','o','a','d','M','e','s','s','a','g','e', 0}; +static const WCHAR SP_SIGTRUST_FUNCTION[] = \ + {'S','o','f','t','p','u','b','L','o','a','d','S','i','g','n','a','t','u','r','e', 0}; +static const WCHAR SP_CHKCERT_FUNCTION[] = \ + {'S','o','f','t','p','u','b','C','h','e','c','k','C','e','r','t', 0}; +static const WCHAR SP_FINALPOLICY_FUNCTION[] = \ + {'S','o','f','t','p','u','b','A','u','t','h','e','n','t','i','c','o','d','e', 0}; +static const WCHAR SP_CLEANUPPOLICY_FUNCTION[] = \ + {'S','o','f','t','p','u','b','C','l','e','a','n','u','p', 0}; +#endif + #define WINTRUST_ACTION_TRUSTPROVIDER_TEST \ { 0x573e31f8, 0xddba, 0x11d0, { 0x8c,0xcb,0x00,0xc0,0x4f,0xc2,0x95,0xee }} +#if defined(__GNUC__) +#define SP_TESTDUMPPOLICY_FUNCTION_TEST (const WCHAR []) \ + {'S','o','f','t','p','u','b','D','u','m','p','S','t','r','u','c','t','u','r','e', 0} +#elif defined(_MSC_VER) +#define SP_TESTDUMPPOLICY_FUNCTION_TEST L"SoftpubDumpStructure" +#else +static const WCHAR SP_TESTDUMPPOLICY_FUNCTION_TEST[] = \ + {'S','o','f','t','p','u','b','D','u','m','p','S','t','r','u','c','t','u','r','e', 0}; +#endif + #define HTTPSPROV_ACTION \ { 0x573e31f8, 0xaaba, 0x11d0, { 0x8c,0xcb,0x00,0xc0,0x4f,0xc2,0x95,0xee }} +#if defined(__GNUC__) +#define HTTPS_CERTTRUST_FUNCTION (const WCHAR []) \ + {'H','T','T','P','S','C','e','r','t','i','f','i','c','a','t','e','T','r','u','s','t', 0} +#define HTTPS_FINALPOLICY_FUNCTION (const WCHAR []) \ + {'H','T','T','P','S','F','i','n','a','l','P','r','o','v', 0} +#elif defined(_MSC_VER) +#define HTTPS_FINALPOLICY_FUNCTION L"HTTPSFinalProv" +#define HTTPS_CERTTRUST_FUNCTION L"HTTPSCertificateTrust" +#else +static const WCHAR HTTPS_CERTTRUST_FUNCTION[] = \ + {'H','T','T','P','S','C','e','r','t','i','f','i','c','a','t','e','T','r','u','s','t', 0}; +static const WCHAR HTTPS_FINALPOLICY_FUNCTION[] = \ + {'H','T','T','P','S','F','i','n','a','l','P','r','o','v', 0}; +#endif + #define OFFICESIGN_ACTION_VERIFY \ { 0x5555c2cd, 0x17fb, 0x11d1, { 0x85,0xc4,0x00,0xc0,0x4f,0xc2,0x95,0xee }} +#if defined(__GNUC__) +#define OFFICE_POLICY_PROVIDER_DLL_NAME (const WCHAR []) \ + {'W','I','N','T','R','U','S','T','.','D','L','L' ,0} +#define OFFICE_INITPROV_FUNCTION (const WCHAR []) \ + {'O','f','f','i','c','e','I','n','i','t','i','a','l','i','z','e','P','o','l','i','c','y', 0} +#define OFFICE_CLEANUPPOLICY_FUNCTION (const WCHAR []) \ + {'O','f','f','i','c','e','C','l','e','a','n','u','p','P','o','l','i','c','y', 0} +#elif defined(_MSC_VER) +#define OFFICE_POLICY_PROVIDER_DLL_NAME SP_POLICY_PROVIDER_DLL_NAME +#define OFFICE_INITPROV_FUNCTION L"OfficeInitializePolicy" +#define OFFICE_CLEANUPPOLICY_FUNCTION L"OfficeCleanupPolicy" +#else +static const WCHAR OFFICE_POLICY_PROVIDER_DLL_NAME[] = \ + {'W','I','N','T','R','U','S','T','.','D','L','L', 0}; +static const WCHAR OFFICE_INITPROV_FUNCTION[] = \ + {'O','f','f','i','c','e','I','n','i','t','i','a','l','i','z','e','P','o','l','i','c','y', 0}; +static const WCHAR OFFICE_CLEANUPPOLICY_FUNCTION[] = \ + {'O','f','f','i','c','e','C','l','e','a','n','u','p','P','o','l','i','c','y', 0}; +#endif + #define DRIVER_ACTION_VERIFY \ { 0xf750e6c3, 0x38ee, 0x11d1, { 0x85,0xe5,0x00,0xc0,0x4f,0xc2,0x95,0xee }} +#if defined(__GNUC__) +#define DRIVER_INITPROV_FUNCTION (const WCHAR []) \ + {'D','r','i','v','e','r','I','n','i','t','i','a','l','i','z','e','P','o','l','i','c','y', 0} +#define DRIVER_FINALPOLPROV_FUNCTION (const WCHAR []) \ + {'D','r','i','v','e','r','F','i','n','a','l','P','o','l','i','c','y', 0} +#define DRIVER_CLEANUPPOLICY_FUNCTION (const WCHAR []) \ + {'D','r','i','v','e','r','C','l','e','a','n','u','p','P','o','l','i','c','y', 0} +#elif defined(_MSC_VER) +#define DRIVER_INITPROV_FUNCTION L"DriverInitializePolicy" +#define DRIVER_FINALPOLPROV_FUNCTION L"DriverFinalPolicy" +#define DRIVER_CLEANUPPOLICY_FUNCTION L"DriverCleanupPolicy" +#else +static const WCHAR DRIVER_INITPROV_FUNCTION[] = \ + {'D','r','i','v','e','r','I','n','i','t','i','a','l','i','z','e','P','o','l','i','c','y', 0}; +static const WCHAR DRIVER_FINALPOLPROV_FUNCTION[] = \ + {'D','r','i','v','e','r','F','i','n','a','l','P','o','l','i','c','y', 0}; +static const WCHAR DRIVER_CLEANUPPOLICY_FUNCTION[] = \ + {'D','r','i','v','e','r','C','l','e','a','n','u','p','P','o','l','i','c','y', 0}; +#endif + #endif /* __WINE_SOFTPUB_H */

1 0

Andrew Talbot : kernel: Constify some formal parameters.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: a5bf67ef9b5f85ad66e722184bf828a79e0191a7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a5bf67ef9b5f85ad66e7221… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Aug 30 22:24:28 2006 +0100 kernel: Constify some formal parameters. --- dlls/kernel/resource16.c | 188 +++++++++++++++++++++++----------------------- include/wine/winuser16.h | 2 2 files changed, 95 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=a5bf67ef9b5f85ad66e…

1 0

Mike McCormack : msi: Add a short test for transforms.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: d998543edb5e3eb61da13fe9cb41721359d091fd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d998543edb5e3eb61da13fe… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Sep 1 17:31:11 2006 +0900 msi: Add a short test for transforms. --- dlls/msi/tests/db.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 66 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 878013b..043d4a5 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -26,6 +26,12 @@ #include <msiquery.h> #include "wine/test.h" static const char *msifile = "winetest.msi"; +static const char *msifile2 = "winetst2.msi"; +static const char *mstfile = "winetst.mst"; + +#ifndef ERROR_INSTALL_TRANSFORM_FAILURE +#define ERROR_INSTALL_TRANSFORM_FAILURE 1624 +#endif static void test_msidatabase(void) { @@ -1392,6 +1398,65 @@ static void test_handle_limit(void) ok( r == ERROR_SUCCESS, "failed to close database\n"); } +static void test_generate_transform(void) +{ + MSIHANDLE hdb1, hdb2; + LPCSTR query; + UINT r; + + DeleteFile(msifile); + DeleteFile(msifile2); + DeleteFile(mstfile); + + /* create an empty database */ + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb1 ); + ok( r == ERROR_SUCCESS , "Failed to create database\n" ); + + r = MsiDatabaseCommit( hdb1 ); + ok( r == ERROR_SUCCESS , "Failed to commit database\n" ); + + /* create another empty database */ + r = MsiOpenDatabase(msifile2, MSIDBOPEN_CREATE, &hdb2 ); + ok( r == ERROR_SUCCESS , "Failed to create database\n" ); + + r = MsiDatabaseCommit( hdb2 ); + ok( r == ERROR_SUCCESS , "Failed to commit database\n" ); + + /* the transform between two empty database should be empty */ + r = MsiDatabaseGenerateTransform(hdb1, hdb2, NULL, 0, 0); + todo_wine { + ok( r == ERROR_NO_DATA, "return code %d, should be ERROR_NO_DATA\n", r ); + } + + query = "CREATE TABLE `AAR` ( `BAR` SHORT NOT NULL, `CAR` CHAR(255) PRIMARY KEY `CAR`)"; + r = run_query(hdb1, 0, query); + ok(r == ERROR_SUCCESS, "failed to add table\n"); + + todo_wine { + r = MsiDatabaseGenerateTransform(hdb1, hdb2, NULL, 0, 0); + ok( r == ERROR_SUCCESS, "return code %d, should be ERROR_SUCCESS\n", r ); + + r = MsiDatabaseGenerateTransform(hdb1, hdb2, mstfile, 0, 0); + ok( r == ERROR_SUCCESS, "return code %d, should be ERROR_SUCCESS\n", r ); + + MsiCloseHandle( hdb1 ); + + r = MsiDatabaseApplyTransform( hdb2, mstfile, 0 ); + ok( r == ERROR_SUCCESS, "return code %d, should be ERROR_SUCCESS\n", r ); + + /* apply the same transform again? */ + r = MsiDatabaseApplyTransform( hdb2, mstfile, 0 ); + ok( r == ERROR_INSTALL_TRANSFORM_FAILURE, + "return code %d, should be ERROR_INSTALL_TRANSFORM_FAILURE\n", r ); + } + + MsiCloseHandle( hdb2 ); + + DeleteFile(msifile); + DeleteFile(msifile2); + DeleteFile(mstfile); +} + START_TEST(db) { test_msidatabase(); @@ -1408,4 +1473,5 @@ START_TEST(db) test_msiimport(); test_markers(); test_handle_limit(); + test_generate_transform(); }

1 0

Mike McCormack : msi: Make opening and closing 4000 handle into two tests, not 20000.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 12baa13ba56cb8ea87614ab09f7dfaf55196cca7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=12baa13ba56cb8ea87614ab… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Sep 1 17:30:49 2006 +0900 msi: Make opening and closing 4000 handle into two tests, not 20000. --- dlls/msi/tests/db.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 52e7fdf..878013b 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1371,22 +1371,23 @@ static void test_handle_limit(void) static char szQueryBuf[256] = "SELECT * from `_Tables`"; hviews[i] = 0xdeadbeeb; r = MsiDatabaseOpenView(hdb, szQueryBuf, &hviews[i]); - ok( r == ERROR_SUCCESS, "failed to open query %d\n", i); - ok( hviews[i] != 0xdeadbeeb, "no handle set\n"); - ok( hviews[i] != 0, "%d'th handle is NULL\n", i); - if (!hviews[i]) + if( r != ERROR_SUCCESS || hviews[i] == 0xdeadbeeb || + hviews[i] == 0 || (i && (hviews[i] == hviews[i-1]))) break; - ok( (i == 0 || (hviews[i] != hviews[i-1])), - "got handle %p twice\n", (void *) hviews[i] ); } + ok( i == MY_NVIEWS, "problem opening views\n"); + for (i=0; i<MY_NVIEWS; i++) { if (hviews[i] != 0 && hviews[i] != 0xdeadbeeb) { r = MsiCloseHandle(hviews[i]); - ok( r == ERROR_SUCCESS, "failed to close view handle %d\n", i); + if (r != ERROR_SUCCESS) + break; } } + ok( i == MY_NVIEWS, "problem closing views\n"); + r = MsiCloseHandle(hdb); ok( r == ERROR_SUCCESS, "failed to close database\n"); }

1 0

Robert Shearman : ole32: Allocate memory for a copy of the ptd member of FORMATETC in
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: bb1276425f8ee475e9057ac8ab7513bf9c03f48c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bb1276425f8ee475e9057ac… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Aug 31 17:21:13 2006 +0100 ole32: Allocate memory for a copy of the ptd member of FORMATETC in DataAdviseHolder_Advise since there is no requirement for the application to keep this memory valid for the lifetime of the connection. --- dlls/ole32/oleobj.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index ae06f18..a7470e4 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -723,8 +723,18 @@ static HRESULT WINAPI DataAdviseHolder_A * Store the new sink */ This->Connections[index].sink = pAdvise; - memcpy(&(This->Connections[index].fmat), pFetc, sizeof(FORMATETC)); This->Connections[index].advf = advf & ~WINE_ADVF_REMOTE; + memcpy(&(This->Connections[index].fmat), pFetc, sizeof(FORMATETC)); + if (pFetc->ptd) + { + This->Connections[index].fmat.ptd = CoTaskMemAlloc(pFetc->ptd->tdSize); + if (!This->Connections[index].fmat.ptd) + { + IDataAdviseHolder_Unadvise(iface, index + 1); + return E_OUTOFMEMORY; + } + memcpy(This->Connections[index].fmat.ptd, pFetc->ptd, pFetc->ptd->tdSize); + } if (This->Connections[index].sink != NULL) { IAdviseSink_AddRef(This->Connections[index].sink);

1 0

Robert Shearman : ole32: Don' t send data changes in DataAdviseHolder_Advise for
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 5e9df71e0e1735a60939aa1f931181429ee2afd3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5e9df71e0e1735a60939aa1… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Aug 31 17:20:09 2006 +0100 ole32: Don't send data changes in DataAdviseHolder_Advise for ADVF_PRIMEFIRST connections if we are connected to a data object, since it will send the data change for us. --- dlls/ole32/oleobj.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index 7a00d8f..ae06f18 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -728,9 +728,6 @@ static HRESULT WINAPI DataAdviseHolder_A if (This->Connections[index].sink != NULL) { IAdviseSink_AddRef(This->Connections[index].sink); - if(advf & ADVF_PRIMEFIRST) { - IDataAdviseHolder_SendOnDataChange(iface, pDataObject, 0, advf); - } /* if we are already connected advise the remote object */ if (This->delegate) @@ -748,6 +745,10 @@ static HRESULT WINAPI DataAdviseHolder_A } This->Connections[index].advf |= WINE_ADVF_REMOTE; } + else if(advf & ADVF_PRIMEFIRST) + /* only do this if we have no delegate, since in the above case the + * delegate will do the priming for us */ + IDataAdviseHolder_SendOnDataChange(iface, pDataObject, 0, advf); } /* * Return the index as the cookie.

1 0

Robert Shearman : ole32: DefaultHandler_GetData and DefaultHandler_QueryGetData should
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 53d01d2764d35a654038749770274d2d491cd23f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=53d01d2764d35a654038749… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Aug 31 17:20:02 2006 +0100 ole32: DefaultHandler_GetData and DefaultHandler_QueryGetData should both defer to the real data object if the cached versions fail and we are running. --- dlls/ole32/defaulthandler.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 4158f50..a1af68e 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -972,6 +972,9 @@ static HRESULT WINAPI DefaultHandler_Get IDataObject_Release(cacheDataObject); + if (FAILED(hres) && This->pDataDelegate) + hres = IDataObject_GetData(This->pDataDelegate, pformatetcIn, pmedium); + return hres; } @@ -1015,6 +1018,9 @@ static HRESULT WINAPI DefaultHandler_Que IDataObject_Release(cacheDataObject); + if (FAILED(hres) && This->pDataDelegate) + hres = IDataObject_QueryGetData(This->pDataDelegate, pformatetc); + return hres; }

1 0

Robert Shearman : ole32: Add a reference to the stream in RPC_StartLocalServer since we
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 6bf6caa69d6beb690227a2da45f940c115eaa0cd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6bf6caa69d6beb690227a2d… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Aug 31 17:19:49 2006 +0100 ole32: Add a reference to the stream in RPC_StartLocalServer since we release a reference to it when the local server thread dies. --- dlls/ole32/rpc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 32c8318..e7266dc 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1007,6 +1007,7 @@ void RPC_StartLocalServer(REFCLSID clsid lsp->clsid = *clsid; lsp->stream = stream; + IStream_AddRef(stream); thread = CreateThread(NULL, 0, local_server_thread, lsp, 0, &tid); CloseHandle(thread);

1 0