September 2006 - Wine-Commits

Alexandre Julliard : msiexec: Ignore failure to create the service if it already exists.
by Alexandre Julliard Sept. 13, 2006

Sept. 13, 2006

Module: wine Branch: master Commit: 85809843468f6040e25dcd5ed10f9b0a2c4e551f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=85809843468f6040e25dcd5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 13 12:56:37 2006 +0200 msiexec: Ignore failure to create the service if it already exists. --- programs/msiexec/msiexec.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index d8025bf..364d54a 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -333,6 +333,7 @@ static DWORD DoRegServer(void) { SC_HANDLE scm, service; CHAR path[MAX_PATH+12]; + DWORD ret = 0; scm = OpenSCManager(NULL, SERVICES_ACTIVE_DATABASE, SC_MANAGER_CREATE_SERVICE); if (!scm) @@ -348,16 +349,15 @@ static DWORD DoRegServer(void) SERVICE_WIN32_SHARE_PROCESS, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, path, NULL, NULL, NULL, NULL, NULL); - if (!service) + + if (service) CloseServiceHandle(service); + else if (GetLastError() != ERROR_SERVICE_EXISTS) { fprintf(stderr, "Failed to create MSI service\n"); - CloseServiceHandle(scm); - return 1; + ret = 1; } - - CloseServiceHandle(scm); - CloseServiceHandle(service); - return 0; + CloseServiceHandle(scm); + return ret; } static BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv )

1 0

Marcus Meissner : README.de: Updated comment on support libraries to match English.
by Alexandre Julliard Sept. 13, 2006

Sept. 13, 2006

Module: wine Branch: master Commit: 19cb5a4f22c506c5ce019b4229a1ad4693323bc2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=19cb5a4f22c506c5ce019b4… Author: Marcus Meissner <marcus(a)beiboot.franken.de> Date: Wed Sep 13 11:40:31 2006 +0200 README.de: Updated comment on support libraries to match English. --- documentation/README.de | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/documentation/README.de b/documentation/README.de index 680e077..6ee1b14 100644 --- a/documentation/README.de +++ b/documentation/README.de @@ -89,9 +89,10 @@ Vorausgesetzte Build-Tools: Wenn Sie RedHat oder Debian benutzen, installieren Sie bitte die flex- und bison-Pakete. -Optionale Support-Libraries: - Wenn Sie CUPS Drucker-Unterst�tzung haben wollen, installieren Sie bitte - die Pakete cups und cups-devel. +Optionale Support-Bibliotheken: + Der ./configure Aufruf zeigt am Ende optionale Bibliotheken an, + die von Wine benutzt werden k�nnen, aber auf dem System nicht vorhanden + sind. 4. KOMPILIEREN

1 0

Marcus Meissner : README.de: Mention kernel 2.6.
by Alexandre Julliard Sept. 13, 2006

Sept. 13, 2006

Module: wine Branch: master Commit: 48882d2007a1ad770d17c381a5241e3d849358f0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=48882d2007a1ad770d17c38… Author: Marcus Meissner <marcus(a)beiboot.franken.de> Date: Wed Sep 13 10:57:33 2006 +0200 README.de: Mention kernel 2.6. --- documentation/README.de | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/documentation/README.de b/documentation/README.de index c4a1324..680e077 100644 --- a/documentation/README.de +++ b/documentation/README.de @@ -45,7 +45,7 @@ Linux-Info: Obwohl Linux 2.2.x immer noch funktionieren sollte und Linux 2.0.x vielleicht auch noch funktioniert (�ltere 2.0.x-Versionen verzeichneten Abst�rze im Zusammenhang mit Threads), sollte man am besten einen - aktuellen Kernel wie 2.4.x verwenden. + aktuellen Kernel wie 2.4.x oder 2.6.x verwenden. FreeBSD-Info: Stellen Sie sicher, dass Sie die Optionen USER_LDT, SYSVSHM, SYSVSEM und

1 0

Paul Vriens : wintrust: Add CryptSIPAddProvider calls to the registration.
by Alexandre Julliard Sept. 13, 2006

Sept. 13, 2006

Module: wine Branch: master Commit: 443aa69e201c357d030ffd9dbd274facb8cf48ef URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=443aa69e201c357d030ffd9… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Wed Sep 13 12:01:02 2006 +0200 wintrust: Add CryptSIPAddProvider calls to the registration. --- dlls/wintrust/register.c | 108 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 92 insertions(+), 16 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index 7a55e88..6fb1f58 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -30,6 +30,7 @@ #include "winnls.h" #include "guiddef.h" #include "wintrust.h" #include "softpub.h" +#include "mssip.h" #include "wine/debug.h" @@ -771,6 +772,49 @@ BOOL WINAPI WintrustAddDefaultForUsage(c } /*********************************************************************** + * WINTRUST_SIPPAddProvider + * + * Helper for DllRegisterServer. + */ +static BOOL WINTRUST_SIPPAddProvider(GUID* Subject, WCHAR* MagicNumber) +{ + static WCHAR CryptSIPGetSignedDataMsg[] = + {'C','r','y','p','t','S','I','P','G','e','t','S','i','g','n','e','d','D','a','t','a','M','s','g', 0}; + static WCHAR CryptSIPPutSignedDataMsg[] = + {'C','r','y','p','t','S','I','P','P','u','t','S','i','g','n','e','d','D','a','t','a','M','s','g', 0}; + static WCHAR CryptSIPCreateIndirectData[] = + {'C','r','y','p','t','S','I','P','C','r','e','a','t','e','I','n','d','i','r','e','c','t','D','a','t','a', 0}; + static WCHAR CryptSIPVerifyIndirectData[] = + {'C','r','y','p','t','S','I','P','V','e','r','i','f','y','I','n','d','i','r','e','c','t','D','a','t','a', 0}; + static WCHAR CryptSIPRemoveSignedDataMsg[] = + {'C','r','y','p','t','S','I','P','R','e','m','o','v','e','S','i','g','n','e','d','D','a','t','a','M','s','g', 0}; + SIP_ADD_NEWPROVIDER NewProv; + BOOL Ret; + + /* Clear and initialize the structure */ + memset(&NewProv, 0, sizeof(SIP_ADD_NEWPROVIDER)); + NewProv.cbStruct = sizeof(SIP_ADD_NEWPROVIDER); + NewProv.pwszDLLFileName = HeapAlloc(GetProcessHeap(), 0, sizeof(SP_POLICY_PROVIDER_DLL_NAME)); + /* Fill the structure */ + NewProv.pgSubject = Subject; + lstrcpyW(NewProv.pwszDLLFileName, SP_POLICY_PROVIDER_DLL_NAME); + NewProv.pwszMagicNumber = MagicNumber; + NewProv.pwszIsFunctionName = NULL; + NewProv.pwszGetFuncName = CryptSIPGetSignedDataMsg; + NewProv.pwszPutFuncName = CryptSIPPutSignedDataMsg; + NewProv.pwszCreateFuncName = CryptSIPCreateIndirectData; + NewProv.pwszVerifyFuncName = CryptSIPVerifyIndirectData; + NewProv.pwszRemoveFuncName = CryptSIPRemoveSignedDataMsg; + NewProv.pwszIsFunctionNameFmt2 = NULL; + + Ret = CryptSIPAddProvider(&NewProv); + + HeapFree(GetProcessHeap(), 0, NewProv.pwszDLLFileName); + + return Ret; +} + +/*********************************************************************** * DllRegisterServer (WINTRUST.@) */ HRESULT WINAPI DllRegisterServer(void) @@ -797,21 +841,22 @@ HRESULT WINAPI DllRegisterServer(void) static const CHAR CatMemberInfoDecode[] = "WVTAsn1CatMemberInfoDecode"; static const CHAR SpcSpOpusInfoEncode[] = "WVTAsn1SpcSpOpusInfoEncode"; static const CHAR SpcSpOpusInfoDecode[] = "WVTAsn1SpcSpOpusInfoDecode"; + static GUID Unknown1 = { 0xDE351A42, 0x8E59, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; + static GUID Unknown2 = { 0xC689AABA, 0x8E78, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; + static GUID Unknown3 = { 0xC689AAB8, 0x8E78, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; + static GUID Unknown4 = { 0xC689AAB9, 0x8E78, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; + static GUID Unknown5 = { 0xDE351A43, 0x8E59, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; + static GUID Unknown6 = { 0x9BA61D3F, 0xE73A, 0x11D0, { 0x8C,0xD2,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; + static WCHAR MagicNumber2[] = {'M','S','C','F', 0}; + static WCHAR MagicNumber3[] = {'0','x','0','0','0','0','4','5','5','0', 0}; + static WCHAR CafeBabe[] = {'0','x','c','a','f','e','b','a','b','e', 0}; + HRESULT CryptRegisterRes = S_OK; HRESULT TrustProviderRes = S_OK; + HRESULT SIPAddProviderRes = S_OK; TRACE("\n"); - /* FIXME: - * - * A short list of stuff that should be done here: - * - * - Several calls to CryptRegisterOIDFunction - * - Several action registrations (NOT through WintrustAddActionID) - * - Several calls to CryptSIPAddProvider - * - One call to CryptSIPRemoveProvider (do we need that?) - */ - /* Testing on native shows that when an error is encountered in one of the CryptRegisterOIDFunction calls * the rest of these calls is skipped. Registering is however continued for the trust providers. * @@ -864,9 +909,7 @@ #undef WINTRUST_REGISTEROID add_trust_providers: /* Testing on W2K3 shows: - * All registry writes are tried. If one fails this part will return S_FALSE - * but only if the first (CryptRegisterOIDFunction calls) and the third - * (CryptSIPAddProvider calls) part succeed. + * All registry writes are tried. If one fails this part will return S_FALSE. * * Last error is set to the last error encountered, regardless if the first * part failed or not. @@ -898,10 +941,43 @@ add_trust_providers: /* Free the registry structures */ WINTRUST_FreeRegStructs(); - if (CryptRegisterRes == S_OK) - return TrustProviderRes; + /* Testing on W2K3 shows: + * All registry writes are tried. If one fails this part will return S_FALSE. + * + * Last error is set to the last error encountered, regardless if the previous + * parts failed or not. + */ - return CryptRegisterRes; + if (!WINTRUST_SIPPAddProvider(&Unknown1, NULL)) + SIPAddProviderRes = S_FALSE; + if (!WINTRUST_SIPPAddProvider(&Unknown2, MagicNumber2)) + SIPAddProviderRes = S_FALSE; + if (!WINTRUST_SIPPAddProvider(&Unknown3, MagicNumber3)) + SIPAddProviderRes = S_FALSE; + if (!WINTRUST_SIPPAddProvider(&Unknown4, CafeBabe)) + SIPAddProviderRes = S_FALSE; + if (!WINTRUST_SIPPAddProvider(&Unknown5, CafeBabe)) + SIPAddProviderRes = S_FALSE; + if (!WINTRUST_SIPPAddProvider(&Unknown6, CafeBabe)) + SIPAddProviderRes = S_FALSE; + + /* Native does a CryptSIPRemoveProvider here for {941C2937-1292-11D1-85BE-00C04FC295EE}. + * This SIP Provider is however not found on up-to-date window install and native will + * set the last error to ERROR_FILE_NOT_FOUND. + * Wine has the last error set to ERROR_INVALID_PARAMETER. There shouldn't be an app + * depending on this last error though so there is no need to imitate native to the full extent. + * + * (The ERROR_INVALID_PARAMETER for Wine it totally valid as we (and native) do register + * a trust provider without a diagnostic policy). + */ + + /* If CryptRegisterRes is not S_OK it will always overrule the return value. */ + if (CryptRegisterRes != S_OK) + return CryptRegisterRes; + else if (SIPAddProviderRes == S_OK) + return TrustProviderRes; + else + return SIPAddProviderRes; } /***********************************************************************

1 0

Mike McCormack : msi: Fix a couple of test cases for MsiDatabaseIsTablePersistent.
by Alexandre Julliard Sept. 13, 2006

Sept. 13, 2006

Module: wine Branch: master Commit: 60d92d42a3a256c9810fe9e6a34089d2951ef56e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=60d92d42a3a256c9810fe9e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Sep 13 18:46:13 2006 +0900 msi: Fix a couple of test cases for MsiDatabaseIsTablePersistent. --- dlls/msi/msipriv.h | 1 + dlls/msi/msiquery.c | 16 ++++++++++++++-- dlls/msi/table.c | 8 ++++++++ dlls/msi/tests/db.c | 4 ++-- 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 9177b1d..a10be59 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -338,6 +338,7 @@ extern UINT msi_string_get_codepage( str extern BOOL TABLE_Exists( MSIDATABASE *db, LPWSTR name ); +extern MSICONDITION MSI_DatabaseIsTablePersistent( MSIDATABASE *db, LPCWSTR table ); extern UINT read_raw_stream_data( MSIDATABASE*, LPCWSTR stname, USHORT **pdata, UINT *psz ); diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 157ae18..e146cc8 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -898,6 +898,18 @@ MSICONDITION WINAPI MsiDatabaseIsTablePe MSICONDITION WINAPI MsiDatabaseIsTablePersistentW( MSIHANDLE hDatabase, LPCWSTR szTableName) { - FIXME("%lx %s\n", hDatabase, debugstr_w(szTableName)); - return MSICONDITION_FALSE; + MSIDATABASE *db; + MSICONDITION r; + + TRACE("%lx %s\n", hDatabase, debugstr_w(szTableName)); + + db = msihandle2msiinfo( hDatabase, MSIHANDLETYPE_DATABASE ); + if( !db ) + return MSICONDITION_ERROR; + + r = MSI_DatabaseIsTablePersistent( db, szTableName ); + + msiobj_release( &db->hdr ); + + return r; } diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 1c05e79..4eb3f52 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1643,6 +1643,14 @@ UINT MSI_CommitTables( MSIDATABASE *db ) return ERROR_SUCCESS; } +MSICONDITION MSI_DatabaseIsTablePersistent( MSIDATABASE *db, LPCWSTR table ) +{ + if (!table) + return MSICONDITION_ERROR; + + return MSICONDITION_FALSE; +} + static MSIRECORD *msi_get_transform_record( MSITABLEVIEW *tv, string_table *st, USHORT *rawdata ) { UINT i, val, ofs = 0; diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 7ec5a70..acfa093 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -2170,15 +2170,15 @@ static void test_temporary_table(void) DWORD sz; cond = MsiDatabaseIsTablePersistent(0, NULL); - todo_wine ok( cond == MSICONDITION_ERROR, "wrong return condition\n"); + ok( cond == MSICONDITION_ERROR, "wrong return condition\n"); hdb = create_db(); ok( hdb, "failed to create db\n"); - todo_wine { cond = MsiDatabaseIsTablePersistent(hdb, NULL); ok( cond == MSICONDITION_ERROR, "wrong return condition\n"); + todo_wine { cond = MsiDatabaseIsTablePersistent(hdb, "_Tables"); ok( cond == MSICONDITION_NONE, "wrong return condition\n");

1 0

Vitaliy Margolen : dinput: Create/destroy hook thread from DirectInput.
by Alexandre Julliard Sept. 13, 2006

Sept. 13, 2006

Module: wine Branch: master Commit: ad045d6e8142d8fd197a8d445670a3fc95dfcda2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ad045d6e8142d8fd197a8d4… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Wed Sep 13 00:06:15 2006 -0600 dinput: Create/destroy hook thread from DirectInput. --- dlls/dinput/dinput_main.c | 78 +++++++++++++++++++++++++++++++-------------- 1 files changed, 53 insertions(+), 25 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 2a05347..b60cd89 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -76,6 +76,8 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWO return TRUE; } +static BOOL create_hook_thread(void); +static void release_hook_thread(void); /****************************************************************************** * DirectInputCreateEx (DINPUT.@) @@ -118,6 +120,7 @@ HRESULT WINAPI DirectInputCreateEx( res = DI_OK; } + if (res == DI_OK && !create_hook_thread()) res = DIERR_GENERIC; if (res == DI_OK) { This = HeapAlloc(GetProcessHeap(), 0, sizeof(IDirectInputImpl)); @@ -255,7 +258,10 @@ static ULONG WINAPI IDirectInputAImpl_Re ULONG ref; ref = InterlockedDecrement(&(This->ref)); if (ref == 0) - HeapFree(GetProcessHeap(),0,This); + { + HeapFree(GetProcessHeap(), 0, This); + release_hook_thread(); + } return ref; } @@ -732,15 +738,21 @@ static LRESULT CALLBACK dinput_hook_WndP return res; } } + else if (!wParam && !lParam) + DestroyWindow(hWnd); + return 0; case WM_DESTROY: + if (kbd_hook) UnhookWindowsHookEx(kbd_hook); + if (mouse_hook) UnhookWindowsHookEx(mouse_hook); PostQuitMessage(0); } return DefWindowProcW(hWnd, message, wParam, lParam); } -static HANDLE signal_event; +static HWND hook_thread_hwnd; +static LONG hook_thread_refcount; static DWORD WINAPI hook_thread_proc(void *param) { @@ -757,9 +769,9 @@ static DWORD WINAPI hook_thread_proc(voi if (!RegisterClassExW(&wcex)) ERR("Error registering window class\n"); hwnd = CreateWindowExW(0, classW, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, 0); - *(HWND*)param = hwnd; + hook_thread_hwnd = hwnd; - SetEvent(signal_event); + SetEvent(*(LPHANDLE)param); if (hwnd) { while (GetMessageW(&msg, 0, 0, 0)) @@ -767,10 +779,10 @@ static DWORD WINAPI hook_thread_proc(voi TranslateMessage(&msg); DispatchMessageW(&msg); } + DestroyWindow(hwnd); } else ERR("Error creating message window\n"); - DestroyWindow(hwnd); UnregisterClassW(wcex.lpszClassName, wcex.hInstance); return 0; } @@ -784,41 +796,57 @@ static CRITICAL_SECTION_DEBUG dinput_cri }; static CRITICAL_SECTION dinput_hook_crit = { &dinput_critsect_debug, -1, 0, 0, 0, 0 }; -static HWND get_thread_hwnd(void) +static BOOL create_hook_thread(void) { - static HANDLE hook_thread; - static HWND hook_thread_hwnd; + LONG ref; EnterCriticalSection(&dinput_hook_crit); - if (!hook_thread) + ref = ++hook_thread_refcount; + TRACE("Refcount %ld\n", ref); + if (ref == 1) { DWORD tid; - HWND hwnd; + HANDLE thread, event; - signal_event = CreateEventW(NULL, FALSE, FALSE, NULL); - hook_thread = CreateThread(NULL, 0, hook_thread_proc, &hwnd, 0, &tid); - if (signal_event && hook_thread) + event = CreateEventW(NULL, FALSE, FALSE, NULL); + thread = CreateThread(NULL, 0, hook_thread_proc, &event, 0, &tid); + if (event && thread) { HANDLE handles[2]; - handles[0] = signal_event; - handles[1] = hook_thread; + handles[0] = event; + handles[1] = thread; WaitForMultipleObjects(2, handles, FALSE, INFINITE); } - CloseHandle(signal_event); - - if (!(hook_thread_hwnd = hwnd)) - { - /* Thread failed to create window - reset things so we could try again later */ - CloseHandle(hook_thread); - hook_thread = 0; - } + CloseHandle(event); + CloseHandle(thread); } LeaveCriticalSection(&dinput_hook_crit); - return hook_thread_hwnd; + return hook_thread_hwnd != 0; +} + +static void release_hook_thread(void) +{ + LONG ref; + + EnterCriticalSection(&dinput_hook_crit); + ref = --hook_thread_refcount; + TRACE("Releasing to %ld\n", ref); + if (ref == 0) + { + HWND hwnd = hook_thread_hwnd; + hook_thread_hwnd = 0; + SendMessageW(hwnd, WM_USER+0x10, 0, 0); + } + LeaveCriticalSection(&dinput_hook_crit); } HHOOK set_dinput_hook(int hook_id, LPVOID proc) { - return (HHOOK)SendMessageW(get_thread_hwnd(), WM_USER+0x10, (WPARAM)hook_id, (LPARAM)proc); + HWND hwnd; + + EnterCriticalSection(&dinput_hook_crit); + hwnd = hook_thread_hwnd; + LeaveCriticalSection(&dinput_hook_crit); + return (HHOOK)SendMessageW(hwnd, WM_USER+0x10, (WPARAM)hook_id, (LPARAM)proc); }

1 0

Mike McCormack : msi: Add a test for ALTER TABLE.
by Alexandre Julliard Sept. 13, 2006

Sept. 13, 2006

Module: wine Branch: master Commit: 61c1dd2b3262749c2620f78c3cc928dd34bb8d99 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=61c1dd2b3262749c2620f78… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Sep 13 18:14:18 2006 +0900 msi: Add a test for ALTER TABLE. --- dlls/msi/tests/db.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 26b6fa0..7ec5a70 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -2281,6 +2281,50 @@ static void test_temporary_table(void) DeleteFile(msifile); } +static void test_alter(void) +{ + MSICONDITION cond; + MSIHANDLE hdb = 0; + const char *query; + UINT r; + + hdb = create_db(); + ok( hdb, "failed to create db\n"); + + query = "CREATE TABLE `T` ( `B` SHORT NOT NULL TEMPORARY, `C` CHAR(255) TEMPORARY PRIMARY KEY `C`) HOLD"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "failed to add table\n"); + + cond = MsiDatabaseIsTablePersistent(hdb, "T"); + ok( cond == MSICONDITION_FALSE, "wrong return condition\n"); + + todo_wine { + query = "ALTER TABLE `T` HOLD"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "failed to hold table %d\n", r); + + query = "ALTER TABLE `T` FREE"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "failed to free table\n"); + + query = "ALTER TABLE `T` FREE"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "failed to free table\n"); + } + + query = "ALTER TABLE `T` FREE"; + r = run_query(hdb, 0, query); + ok(r == ERROR_BAD_QUERY_SYNTAX, "failed to free table\n"); + + query = "ALTER TABLE `T` HOLD"; + r = run_query(hdb, 0, query); + ok(r == ERROR_BAD_QUERY_SYNTAX, "failed to hold table %d\n", r); + + MsiCloseHandle( hdb ); + + DeleteFile(msifile); +} + START_TEST(db) { test_msidatabase(); @@ -2300,4 +2344,5 @@ START_TEST(db) test_generate_transform(); test_join(); test_temporary_table(); + test_alter(); }

1 0

Mike McCormack : msi: Fix database creation.
by Alexandre Julliard Sept. 13, 2006

Sept. 13, 2006

Module: wine Branch: master Commit: b4005c15f0ea05d6e26208a6690f988c90839605 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b4005c15f0ea05d6e26208a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Sep 13 15:55:57 2006 +0900 msi: Fix database creation. --- dlls/msi/database.c | 2 +- dlls/msi/tests/db.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 1c0a586..d984613 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -107,7 +107,7 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, /* FIXME: MSIDBOPEN_CREATE should case STGM_TRANSACTED flag to be * used here: */ r = StgCreateDocfile( szDBPath, - STGM_DIRECT|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, 0, &stg); + STGM_CREATE|STGM_DIRECT|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, 0, &stg); if( r == ERROR_SUCCESS ) { IStorage_SetClass( stg, &CLSID_MsiDatabase ); diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 44a2532..26b6fa0 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -109,23 +109,28 @@ static void test_msidatabase(void) ok( res == ERROR_SUCCESS , "Failed to close database\n" ); ok( INVALID_FILE_ATTRIBUTES != GetFileAttributes( msifile ), "database should exist\n"); - todo_wine { /* MSIDBOPEN_CREATE deletes the database if MsiCommitDatabase isn't called */ res = MsiOpenDatabase( msifile, MSIDBOPEN_CREATE, &hdb ); ok( res == ERROR_SUCCESS , "Failed to open database\n" ); + ok( INVALID_FILE_ATTRIBUTES != GetFileAttributes( msifile ), "database should exist\n"); + res = MsiCloseHandle( hdb ); ok( res == ERROR_SUCCESS , "Failed to close database\n" ); + ok( INVALID_FILE_ATTRIBUTES == GetFileAttributes( msifile ), "database should exist\n"); + res = MsiOpenDatabase( msifile, MSIDBOPEN_CREATE, &hdb ); ok( res == ERROR_SUCCESS , "Failed to open database\n" ); res = MsiDatabaseCommit( hdb ); ok( res == ERROR_SUCCESS , "Failed to commit database\n" ); + ok( INVALID_FILE_ATTRIBUTES != GetFileAttributes( msifile ), "database should exist\n"); + res = MsiCloseHandle( hdb ); ok( res == ERROR_SUCCESS , "Failed to close database\n" ); - } + res = DeleteFile( msifile2 ); ok( res == TRUE, "Failed to delete database\n" );

1 0

Mike McCormack : msi: Split the font registration code out into a separate file.
by Alexandre Julliard Sept. 13, 2006

Sept. 13, 2006

Module: wine Branch: master Commit: 4fa08a638c5a96e855f6d272dae333b921dda350 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4fa08a638c5a96e855f6d27… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Sep 13 15:55:34 2006 +0900 msi: Split the font registration code out into a separate file. --- dlls/msi/Makefile.in | 1 dlls/msi/action.c | 223 ------------------------------------------- dlls/msi/action.h | 1 dlls/msi/font.c | 262 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 264 insertions(+), 223 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=4fa08a638c5a96e855f…

1 0

Andrew Talbot : dxdiagn: Cast-qual warning fix.
by Alexandre Julliard Sept. 13, 2006

Sept. 13, 2006

Module: wine Branch: master Commit: 6fc8454825d9d1e035613e0685a210438a0872c0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6fc8454825d9d1e035613e0… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Sep 12 22:56:37 2006 +0100 dxdiagn: Cast-qual warning fix. --- dlls/dxdiagn/provider.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 3719cd4..56b2fc1 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -145,7 +145,7 @@ HRESULT DXDiag_CreateDXDiagProvider(LPCL static HRESULT DXDiag_AddFileDescContainer(IDxDiagContainer* pSubCont, const WCHAR* szFilePath, const WCHAR* szFileName) { HRESULT hr = S_OK; /**/ - static const WCHAR szSlashSep[] = {'\\',0}; + static WCHAR szSlashSep[] = {'\\',0}; static const WCHAR szPath[] = {'s','z','P','a','t','h',0}; static const WCHAR szName[] = {'s','z','N','a','m','e',0}; static const WCHAR szVersion[] = {'s','z','V','e','r','s','i','o','n',0}; @@ -179,7 +179,7 @@ static HRESULT DXDiag_AddFileDescContain retval = GetFileVersionInfoSizeW(szFile, &hdl); pVersionInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, retval); hr = GetFileVersionInfoW(szFile, 0, retval, pVersionInfo); - boolret = VerQueryValueW(pVersionInfo, (LPWSTR) szSlashSep, (LPVOID) &pFileInfo, &uiLength); + boolret = VerQueryValueW(pVersionInfo, szSlashSep, (LPVOID) &pFileInfo, &uiLength); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szFile); hr = IDxDiagContainerImpl_AddProp(pSubCont, szPath, &v);

1 0