May 2010 - Wine-commits - list.winehq.org

Hans Leidekker : msi: Release the package in MsiGetMode and MsiSetMode.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 57a6b6fb3837721cfd13969afb3ca11849e73be2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57a6b6fb3837721cfd13969af… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 20 12:01:35 2010 +0200 msi: Release the package in MsiGetMode and MsiSetMode. --- dlls/msi/install.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index cba2dd5..fda49b9 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -721,6 +721,7 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) r = TRUE; } + msiobj_release( &package->hdr ); return r; } @@ -774,6 +775,7 @@ UINT WINAPI MsiSetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode, BOOL fState) r = ERROR_ACCESS_DENIED; } + msiobj_release( &package->hdr ); return r; }

1 0

Hans Leidekker : msi: Consistently use the allocation macros.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 7a370c8d7b83fd4738160ab4d05277cca897d680 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a370c8d7b83fd4738160ab4d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 20 12:01:50 2010 +0200 msi: Consistently use the allocation macros. --- dlls/msi/automation.c | 12 ++++++------ dlls/msi/custom.c | 4 ++-- dlls/msi/files.c | 4 ++-- dlls/msi/media.c | 4 ++-- dlls/msi/package.c | 10 +++++----- dlls/msi/script.c | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index f935a64..d6ef5c9 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -167,7 +167,7 @@ static HRESULT create_automation_object(MSIHANDLE msiHandle, IUnknown *pUnkOuter if( pUnkOuter ) return CLASS_E_NOAGGREGATION; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(AutomationObject)+sizetPrivateData); + object = msi_alloc_zero( sizeof(AutomationObject) + sizetPrivateData ); /* Set all the VTable references */ object->lpVtbl = &AutomationObject_Vtbl; @@ -184,7 +184,7 @@ static HRESULT create_automation_object(MSIHANDLE msiHandle, IUnknown *pUnkOuter object->iTypeInfo = NULL; hr = load_type_info((IDispatch *)object, &object->iTypeInfo, clsid, 0x0); if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, object); + msi_free( object ); return hr; } @@ -203,7 +203,7 @@ static HRESULT create_list_enumerator(IUnknown *pUnkOuter, LPVOID *ppObj, Automa if( pUnkOuter ) return CLASS_E_NOAGGREGATION; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ListEnumerator)); + object = msi_alloc_zero( sizeof(ListEnumerator) ); /* Set all the VTable references */ object->lpVtbl = &ListEnumerator_Vtbl; @@ -288,7 +288,7 @@ static ULONG WINAPI AutomationObject_Release(IDispatch* iface) if (This->funcFree) This->funcFree(This); ITypeInfo_Release(This->iTypeInfo); MsiCloseHandle(This->msiHandle); - HeapFree(GetProcessHeap(), 0, This); + msi_free(This); } return ref; @@ -607,7 +607,7 @@ static ULONG WINAPI ListEnumerator_Release(IEnumVARIANT* iface) if (!ref) { if (This->pObj) IDispatch_Release((IDispatch *)This->pObj); - HeapFree(GetProcessHeap(), 0, This); + msi_free(This); } return ref; @@ -1043,7 +1043,7 @@ static void WINAPI ListImpl_Free(AutomationObject *This) for (idx=0; idx<data->ulCount; idx++) VariantClear(&data->pVars[idx]); - HeapFree(GetProcessHeap(), 0, data->pVars); + msi_free(data->pVars); } static HRESULT WINAPI ViewImpl_Invoke( diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index cb67090..5a1787f 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1417,7 +1417,7 @@ void ACTION_FinishCustomActions(const MSIPACKAGE* package) EnterCriticalSection( &msi_custom_action_cs ); handle_count = list_count( &msi_pending_custom_actions ); - wait_handles = HeapAlloc( GetProcessHeap(), 0, handle_count * sizeof(HANDLE) ); + wait_handles = msi_alloc( handle_count * sizeof(HANDLE) ); handle_count = 0; LIST_FOR_EACH_ENTRY_SAFE( info, cursor, &msi_pending_custom_actions, msi_custom_action_info, entry ) @@ -1437,7 +1437,7 @@ void ACTION_FinishCustomActions(const MSIPACKAGE* package) CloseHandle( wait_handles[i] ); } - HeapFree( GetProcessHeap(), 0, wait_handles ); + msi_free( wait_handles ); } typedef struct _msi_custom_remote_impl { diff --git a/dlls/msi/files.c b/dlls/msi/files.c index f66d815..052a158 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -148,7 +148,7 @@ static UINT copy_install_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR source) GetTempFileNameW(szBackSlash, szMsi, 0, tmpfileW); len = strlenW(file->TargetPath) + strlenW(tmpfileW) + 1; - if (!(pathW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) + if (!(pathW = msi_alloc(len * sizeof(WCHAR)))) return ERROR_OUTOFMEMORY; strcpyW(pathW, file->TargetPath); @@ -168,7 +168,7 @@ static UINT copy_install_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR source) gle = GetLastError(); WARN("failed to schedule rename operation: %d)\n", gle); } - HeapFree(GetProcessHeap(), 0, pathW); + msi_free(pathW); } return gle; diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 7cac9e7..49bc199 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -411,7 +411,7 @@ static INT_PTR cabinet_copy_file(FDINOTIFICATIONTYPE fdint, GetTempFileNameW(szBackSlash, szMsi, 0, tmpfileW); len = strlenW(path) + strlenW(tmpfileW) + 1; - if (!(tmppathW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) + if (!(tmppathW = msi_alloc(len * sizeof(WCHAR)))) return ERROR_OUTOFMEMORY; strcpyW(tmppathW, path); @@ -429,7 +429,7 @@ static INT_PTR cabinet_copy_file(FDINOTIFICATIONTYPE fdint, else WARN("failed to schedule rename operation %s (error %d)\n", debugstr_w(path), GetLastError()); - HeapFree(GetProcessHeap(), 0, tmppathW); + msi_free(tmppathW); } else WARN("failed to create %s (error %d)\n", debugstr_w(path), err); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index c73a3ad..fba722f 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -893,11 +893,11 @@ static VOID set_installer_properties(MSIPACKAGE *package) if (!GetUserNameW( NULL, &len ) && GetLastError() == ERROR_MORE_DATA) { WCHAR *username; - if ((username = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + if ((username = msi_alloc( len * sizeof(WCHAR) ))) { if (GetUserNameW( username, &len )) msi_set_property( package->db, szLogonUser, username ); - HeapFree( GetProcessHeap(), 0, username ); + msi_free( username ); } } } @@ -1113,16 +1113,16 @@ UINT msi_download_file( LPCWSTR szUrl, LPWSTR filename ) GetUrlCacheEntryInfoW( szUrl, NULL, &size ); if ( GetLastError() != ERROR_FILE_NOT_FOUND ) { - cache_entry = HeapAlloc( GetProcessHeap(), 0, size ); + cache_entry = msi_alloc( size ); if ( !GetUrlCacheEntryInfoW( szUrl, cache_entry, &size ) ) { UINT error = GetLastError(); - HeapFree( GetProcessHeap(), 0, cache_entry ); + msi_free( cache_entry ); return error; } lstrcpyW( filename, cache_entry->lpszLocalFileName ); - HeapFree( GetProcessHeap(), 0, cache_entry ); + msi_free( cache_entry ); return ERROR_SUCCESS; } diff --git a/dlls/msi/script.c b/dlls/msi/script.c index 8dfa6d2..4f223da 100644 --- a/dlls/msi/script.c +++ b/dlls/msi/script.c @@ -62,7 +62,7 @@ static HRESULT create_ActiveScriptSite(IUnknown *pUnkOuter, LPVOID *ppObj) if( pUnkOuter ) return CLASS_E_NOAGGREGATION; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MsiActiveScriptSite)); + object = msi_alloc_zero( sizeof(MsiActiveScriptSite) ); object->lpVtbl.lpVtbl = &ASS_Vtbl; object->ref = 1; @@ -236,7 +236,7 @@ static ULONG WINAPI MsiActiveScriptSite_Release(IActiveScriptSite* iface) TRACE("(%p/%p)\n", iface, This); if (!ref) - HeapFree(GetProcessHeap(), 0, This); + msi_free(This); return ref; }

1 0

Hans Leidekker : msi: Fix some leaks in the tests.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 2e24d34b223f96c055af74ac65c445a61ba5da08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e24d34b223f96c055af74ac6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 20 12:02:05 2010 +0200 msi: Fix some leaks in the tests. --- dlls/msi/tests/patch.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index 8029d16..56af5f8 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -920,6 +920,9 @@ static void test_system_tables( void ) r = find_entry( hdb, "_Tables", "_Property" ); ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + MsiCloseHandle( hrec ); + MsiViewClose( hview ); + MsiCloseHandle( hview ); MsiCloseHandle( hdb ); MsiCloseHandle( hproduct ); @@ -988,6 +991,9 @@ static void test_system_tables( void ) r = find_entry( hdb, "_Tables", "PatchPackage" ); ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + MsiCloseHandle( hrec ); + MsiViewClose( hview ); + MsiCloseHandle( hview ); MsiCloseHandle( hdb ); MsiCloseHandle( hproduct );

1 0

Hans Leidekker : msi: Test the reference count on the installer object retrieved from a session object .
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: e16f1877915a988cd02b574250285759a07ffd59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e16f1877915a988cd02b57425… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 20 12:02:22 2010 +0200 msi: Test the reference count on the installer object retrieved from a session object. --- dlls/msi/tests/automation.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 99fb778..c7c8926 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1815,6 +1815,7 @@ static void test_Session(IDispatch *pSession) BOOL bool; int myint; IDispatch *pDatabase = NULL, *pInst = NULL, *record = NULL; + ULONG refs_before, refs_after; HRESULT hr; /* Session::Installer */ @@ -1822,6 +1823,14 @@ static void test_Session(IDispatch *pSession) ok(hr == S_OK, "Session_Installer failed, hresult 0x%08x\n", hr); ok(pInst != NULL, "Session_Installer returned NULL IDispatch pointer\n"); ok(pInst == pInstaller, "Session_Installer does not match Installer instance from CoCreateInstance\n"); + refs_before = IDispatch_AddRef(pInst); + + hr = Session_Installer(pSession, &pInst); + ok(hr == S_OK, "Session_Installer failed, hresult 0x%08x\n", hr); + ok(pInst != NULL, "Session_Installer returned NULL IDispatch pointer\n"); + ok(pInst == pInstaller, "Session_Installer does not match Installer instance from CoCreateInstance\n"); + refs_after = IDispatch_Release(pInst); + ok(refs_before == refs_after, "got %u and %u\n", refs_before, refs_after); /* Session::Property, get */ memset(stringw, 0, sizeof(stringw));

1 0

Hans Leidekker : msi: Add more tests for feature overrides.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 5395c999d2632220a1a67447d51ff7baaa87ae97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5395c999d2632220a1a67447d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 20 12:02:41 2010 +0200 msi: Add more tests for feature overrides. --- dlls/msi/tests/install.c | 134 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 119 insertions(+), 15 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index da4e383..f3410f6 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1413,6 +1413,63 @@ static const CHAR crs_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const CHAR fo_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "override.txt\toverride\toverride.txt\t1000\t\t\t8192\t1\n" + "preselected.txt\tpreselected\tpreselected.txt\t1000\t\t\t8192\t2\n" + "notpreselected.txt\tnotpreselected\tnotpreselected.txt\t1000\t\t\t8192\t3\n"; + +static const CHAR fo_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "override\t\t\toverride feature\t1\t1\tMSITESTDIR\t0\n" + "preselected\t\t\tpreselected feature\t1\t1\tMSITESTDIR\t0\n" + "notpreselected\t\t\tnotpreselected feature\t1\t1\tMSITESTDIR\t0\n"; + +static const CHAR fo_condition_dat[] = "Feature_\tLevel\tCondition\n" + "s38\ti2\tS255\n" + "Condition\tFeature_\tLevel\n" + "preselected\t0\tPreselected\n" + "notpreselected\t0\tNOT Preselected\n"; + +static const CHAR fo_feature_comp_dat[] = "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "override\toverride\n" + "preselected\tpreselected\n" + "notpreselected\tnotpreselected\n"; + +static const CHAR fo_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "override\t{0A00FB1D-97B0-4B42-ADF0-BB8913416623}\tMSITESTDIR\t0\t\toverride.txt\n" + "preselected\t{44E1DB75-605A-43DD-8CF5-CAB17F1BBD60}\tMSITESTDIR\t0\t\tpreselected.txt\n" + "notpreselected\t{E1647733-5E75-400A-A92E-5E60B4D4EF9F}\tMSITESTDIR\t0\t\tnotpreselected.txt\n"; + +static const CHAR fo_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComments\n" + "s72\ti2\tS64\tS0\tS255\n" + "CustomAction\tAction\n" + "SetPreselected\t51\tPreselected\t1\t\n"; + +static const CHAR fo_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "LaunchConditions\t\t100\n" + "SetPreselected\tpreselect=1\t200\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" + "InstallInitialize\t\t1500\n" + "ProcessComponents\t\t1600\n" + "RemoveFiles\t\t1700\n" + "InstallFiles\t\t2000\n" + "RegisterProduct\t\t5000\n" + "PublishFeatures\t\t5100\n" + "PublishProduct\t\t5200\n" + "InstallFinalize\t\t6000\n"; + static const CHAR pub_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" "File\tFile\n" @@ -2822,6 +2879,20 @@ static const msi_table rmi_tables[] = ADD_TABLE(property) }; +static const msi_table fo_tables[] = +{ + ADD_TABLE(directory), + ADD_TABLE(fo_file), + ADD_TABLE(fo_component), + ADD_TABLE(fo_feature), + ADD_TABLE(fo_condition), + ADD_TABLE(fo_feature_comp), + ADD_TABLE(fo_custom_action), + ADD_TABLE(fo_install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -8384,27 +8455,60 @@ static void test_feature_override(void) UINT r; create_test_files(); - create_database(msifile, tables, sizeof(tables) / sizeof(msi_table)); + create_file("msitest\\override.txt", 1000); + create_file("msitest\\preselected.txt", 1000); + create_file("msitest\\notpreselected.txt", 1000); + create_database(msifile, fo_tables, sizeof(fo_tables) / sizeof(msi_table)); - r = MsiInstallProductA(msifile, "ADDLOCAL=One"); + r = MsiInstallProductA(msifile, "ADDLOCAL=override"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(!delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File installed\n"); - ok(!delete_pf("msitest\\cabout\\new", FALSE), "File installed\n"); - ok(!delete_pf("msitest\\cabout\\four.txt", TRUE), "File installed\n"); - ok(!delete_pf("msitest\\cabout", FALSE), "File installed\n"); - ok(!delete_pf("msitest\\changed\\three.txt", TRUE), "File installed\n"); - ok(!delete_pf("msitest\\changed", FALSE), "File installed\n"); - ok(!delete_pf("msitest\\first\\two.txt", TRUE), "File installed\n"); - ok(!delete_pf("msitest\\first", FALSE), "File installed\n"); - ok(!delete_pf("msitest\\filename", TRUE), "File installed\n"); - ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); - ok(!delete_pf("msitest\\service.exe", TRUE), "File installed\n"); - ok(delete_pf("msitest", FALSE), "File not installed\n"); + ok(pf_exists("msitest\\override.txt"), "file not installed\n"); + ok(!pf_exists("msitest\\preselected.txt"), "file installed\n"); + ok(!pf_exists("msitest\\notpreselected.txt"), "file installed\n"); - delete_test_files(); + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(!delete_pf("msitest\\override.txt", TRUE), "file not removed\n"); + + r = MsiInstallProductA(msifile, "preselect=1"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(pf_exists("msitest\\override.txt"), "file not installed\n"); + ok(pf_exists("msitest\\preselected.txt"), "file not installed\n"); + ok(!pf_exists("msitest\\notpreselected.txt"), "file installed\n"); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(!delete_pf("msitest\\override.txt", TRUE), "file not removed\n"); + todo_wine { + ok(delete_pf("msitest\\preselected.txt", TRUE), "file removed\n"); + ok(delete_pf("msitest", FALSE), "directory removed\n"); + } + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(pf_exists("msitest\\override.txt"), "file not installed\n"); + ok(pf_exists("msitest\\preselected.txt"), "file not installed\n"); + ok(!pf_exists("msitest\\notpreselected.txt"), "file installed\n"); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(!delete_pf("msitest\\override.txt", TRUE), "file not removed\n"); + todo_wine { + ok(delete_pf("msitest\\preselected.txt", TRUE), "file removed\n"); + ok(delete_pf("msitest", FALSE), "directory removed\n"); + } + + DeleteFileA("msitest\\override.txt"); + DeleteFileA("msitest\\preselected.txt"); + DeleteFileA("msitest\\notpreselected.txt"); RegDeleteKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest"); + delete_test_files(); } static void test_create_folder(void)

1 0

Aleksey Bragin : winex11.drv: Fix SetCursor entry in the spec file.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: bd7859c5fea2602c15972a6a00dfa0c196e55368 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd7859c5fea2602c15972a6a0… Author: Aleksey Bragin <aleksey(a)reactos.org> Date: Thu May 20 17:01:21 2010 +0400 winex11.drv: Fix SetCursor entry in the spec file. --- dlls/winex11.drv/winex11.drv.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 0a69581..6bdf66e 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -75,7 +75,7 @@ @ cdecl VkKeyScanEx(long long) X11DRV_VkKeyScanEx @ cdecl CreateCursorIcon(long ptr) X11DRV_CreateCursorIcon @ cdecl DestroyCursorIcon(long) X11DRV_DestroyCursorIcon -@ cdecl SetCursor(long ptr) X11DRV_SetCursor +@ cdecl SetCursor(long) X11DRV_SetCursor @ cdecl GetCursorPos(ptr) X11DRV_GetCursorPos @ cdecl SetCursorPos(long long) X11DRV_SetCursorPos @ cdecl ClipCursor(ptr) X11DRV_ClipCursor

1 0

Jacek Caban : shdocvw: Added ITargetFrame2 stub implementation.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 1943d84ce0c7e15e0ac6803b3560662012b99523 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1943d84ce0c7e15e0ac6803b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 20 13:47:02 2010 +0200 shdocvw: Added ITargetFrame2 stub implementation. --- dlls/shdocvw/navigate.c | 125 +++++++++++++++++++++++++++++++++++++++++++++ dlls/shdocvw/shdocvw.h | 3 + dlls/shdocvw/webbrowser.c | 3 + 3 files changed, 131 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index db6a3c4..99980c7 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -950,7 +950,132 @@ static const IHlinkFrameVtbl HlinkFrameVtbl = { HlinkFrame_UpdateHlink }; +#define TARGETFRAME2_THIS(iface) DEFINE_THIS(WebBrowser, ITargetFrame2, iface) + +static HRESULT WINAPI TargetFrame2_QueryInterface(ITargetFrame2 *iface, REFIID riid, void **ppv) +{ + WebBrowser *This = TARGETFRAME2_THIS(iface); + return IWebBrowser2_QueryInterface(WEBBROWSER2(This), riid, ppv); +} + +static ULONG WINAPI TargetFrame2_AddRef(ITargetFrame2 *iface) +{ + WebBrowser *This = TARGETFRAME2_THIS(iface); + return IWebBrowser2_AddRef(WEBBROWSER2(This)); +} + +static ULONG WINAPI TargetFrame2_Release(ITargetFrame2 *iface) +{ + WebBrowser *This = TARGETFRAME2_THIS(iface); + return IWebBrowser2_Release(WEBBROWSER2(This)); +} + +static HRESULT WINAPI TargetFrame2_SetFrameName(ITargetFrame2 *iface, LPCWSTR pszFrameName) +{ + WebBrowser *This = TARGETFRAME2_THIS(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(pszFrameName)); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame2_GetFrameName(ITargetFrame2 *iface, LPWSTR *ppszFrameName) +{ + WebBrowser *This = TARGETFRAME2_THIS(iface); + FIXME("(%p)->(%p)\n", This, ppszFrameName); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame2_GetParentFrame(ITargetFrame2 *iface, IUnknown **ppunkParent) +{ + WebBrowser *This = TARGETFRAME2_THIS(iface); + FIXME("(%p)->(%p)\n", This, ppunkParent); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame2_SetFrameSrc(ITargetFrame2 *iface, LPCWSTR pszFrameSrc) +{ + WebBrowser *This = TARGETFRAME2_THIS(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(pszFrameSrc)); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame2_GetFrameSrc(ITargetFrame2 *iface, LPWSTR *ppszFrameSrc) +{ + WebBrowser *This = TARGETFRAME2_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame2_GetFramesContainer(ITargetFrame2 *iface, IOleContainer **ppContainer) +{ + WebBrowser *This = TARGETFRAME2_THIS(iface); + FIXME("(%p)->(%p)\n", This, ppContainer); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame2_SetFrameOptions(ITargetFrame2 *iface, DWORD dwFlags) +{ + WebBrowser *This = TARGETFRAME2_THIS(iface); + FIXME("(%p)->(%x)\n", This, dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame2_GetFrameOptions(ITargetFrame2 *iface, DWORD *pdwFlags) +{ + WebBrowser *This = TARGETFRAME2_THIS(iface); + FIXME("(%p)->(%p)\n", This, pdwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame2_SetFrameMargins(ITargetFrame2 *iface, DWORD dwWidth, DWORD dwHeight) +{ + WebBrowser *This = TARGETFRAME2_THIS(iface); + FIXME("(%p)->(%d %d)\n", This, dwWidth, dwHeight); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame2_GetFrameMargins(ITargetFrame2 *iface, DWORD *pdwWidth, DWORD *pdwHeight) +{ + WebBrowser *This = TARGETFRAME2_THIS(iface); + FIXME("(%p)->(%p %p)\n", This, pdwWidth, pdwHeight); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame2_FindFrame(ITargetFrame2 *iface, LPCWSTR pszTargetName, DWORD dwFlags, IUnknown **ppunkTargetFrame) +{ + WebBrowser *This = TARGETFRAME2_THIS(iface); + FIXME("(%p)->(%s %x %p)\n", This, debugstr_w(pszTargetName), dwFlags, ppunkTargetFrame); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame2_GetTargetAlias(ITargetFrame2 *iface, LPCWSTR pszTargetName, LPWSTR *ppszTargetAlias) +{ + WebBrowser *This = TARGETFRAME2_THIS(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(pszTargetName), ppszTargetAlias); + return E_NOTIMPL; +} + +#undef TARGETFRAME2_THIS + +static const ITargetFrame2Vtbl TargetFrame2Vtbl = { + TargetFrame2_QueryInterface, + TargetFrame2_AddRef, + TargetFrame2_Release, + TargetFrame2_SetFrameName, + TargetFrame2_GetFrameName, + TargetFrame2_GetParentFrame, + TargetFrame2_SetFrameSrc, + TargetFrame2_GetFrameSrc, + TargetFrame2_GetFramesContainer, + TargetFrame2_SetFrameOptions, + TargetFrame2_GetFrameOptions, + TargetFrame2_SetFrameMargins, + TargetFrame2_GetFrameMargins, + TargetFrame2_FindFrame, + TargetFrame2_GetTargetAlias +}; + void WebBrowser_HlinkFrame_Init(WebBrowser *This) { This->lpHlinkFrameVtbl = &HlinkFrameVtbl; + This->lpITargetFrame2Vtbl = &TargetFrame2Vtbl; } diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 2dce575..1af0365 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -37,6 +37,7 @@ #include "exdisp.h" #include "mshtmhst.h" #include "hlink.h" +#include "htiframe.h" #include "wine/unicode.h" @@ -126,6 +127,7 @@ struct WebBrowser { const IOleInPlaceActiveObjectVtbl *lpOleInPlaceActiveObjectVtbl; const IOleCommandTargetVtbl *lpOleCommandTargetVtbl; const IHlinkFrameVtbl *lpHlinkFrameVtbl; + const ITargetFrame2Vtbl *lpITargetFrame2Vtbl; const IServiceProviderVtbl *lpServiceProviderVtbl; const IDataObjectVtbl *lpDataObjectVtbl; @@ -186,6 +188,7 @@ struct InternetExplorer { #define OLECMD(x) ((IOleCommandTarget*) &(x)->lpOleCommandTargetVtbl) #define HLINKFRAME(x) ((IHlinkFrame*) &(x)->lpHlinkFrameVtbl) #define DATAOBJECT(x) ((IDataObject*) &(x)->lpDataObjectVtbl) +#define TARGETFRAME2(x) ((ITargetFrame2*) &(x)->lpITargetFrame2Vtbl) #define CLIENTSITE(x) ((IOleClientSite*) &(x)->lpOleClientSiteVtbl) #define INPLACESITE(x) ((IOleInPlaceSite*) &(x)->lpOleInPlaceSiteVtbl) diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index b2fce6a..0c26a83 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -102,6 +102,9 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid }else if(IsEqualGUID(&IID_IHlinkFrame, riid)) { TRACE("(%p)->(IID_IHlinkFrame %p)\n", This, ppv); *ppv = HLINKFRAME(This); + }else if(IsEqualGUID(&IID_ITargetFrame2, riid)) { + TRACE("(%p)->(IID_ITargetFrame2 %p)\n", This, ppv); + *ppv = TARGETFRAME2(This); }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { *ppv = SERVPROV(This); TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv);

1 0

Alexandre Julliard : user32: Define an explicit structure for storing the cursor data.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: e58afcfb2dd4263f4b41f9d118d19f25a925d94e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e58afcfb2dd4263f4b41f9d11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 19 11:56:23 2010 +0200 user32: Define an explicit structure for storing the cursor data. --- dlls/user32/cursoricon.c | 174 +++++++++++++++++++++++----------------------- 1 files changed, 87 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e58afcfb2dd4263f4b41f…

1 0

Alexandre Julliard : user32: Store color and mask bitmaps in the cursor data.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: f78c5c940a40e8d487dc09d09e527dcbe2b83abc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f78c5c940a40e8d487dc09d09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 19 12:03:45 2010 +0200 user32: Store color and mask bitmaps in the cursor data. --- dlls/user32/cursoricon.c | 219 ++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 181 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f78c5c940a40e8d487dc0…

1 0

Alexandre Julliard : user32: Store a pre-computed alpha bitmap for 32-bpp icons with an alpha channel.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: bb33cebe3f7b24759aa47238a33197bbf73cfcb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb33cebe3f7b24759aa47238a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 19 12:14:03 2010 +0200 user32: Store a pre-computed alpha bitmap for 32-bpp icons with an alpha channel. --- dlls/user32/cursoricon.c | 104 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 100 insertions(+), 4 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 24099a8..1454260 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -136,6 +136,7 @@ struct cursoricon_object struct user_object obj; /* object header */ ULONG_PTR param; /* opaque param used by 16-bit code */ HBITMAP color; /* color bitmap */ + HBITMAP alpha; /* pre-multiplied alpha bitmap for 32-bpp icons */ HBITMAP mask; /* mask bitmap (followed by color for 1-bpp icons) */ CURSORICONINFO data; /* followed by cursor bits in CURSORICONINFO format */ @@ -147,6 +148,7 @@ static HICON alloc_icon_handle( unsigned int size ) if (!obj) return 0; obj->param = 0; obj->color = 0; + obj->alpha = 0; obj->mask = 0; return alloc_user_handle( &obj->obj, USER_ICON ); } @@ -176,6 +178,7 @@ static BOOL free_icon_handle( HICON handle ) { ULONG_PTR param = obj->param; if (obj->color) DeleteObject( obj->color ); + if (obj->alpha) DeleteObject( obj->alpha ); DeleteObject( obj->mask ); HeapFree( GetProcessHeap(), 0, obj ); if (wow_handlers.free_icon_param && param) wow_handlers.free_icon_param( param ); @@ -775,12 +778,96 @@ static BOOL stretch_blt_icon(HBITMAP hDest, BITMAPINFO *pDestInfo, BITMAPINFO *p } /*********************************************************************** + * bmi_has_alpha + */ +static BOOL bmi_has_alpha( const BITMAPINFO *info, const void *bits ) +{ + int i; + BOOL has_alpha = FALSE; + const unsigned char *ptr = bits; + + if (info->bmiHeader.biBitCount != 32) return FALSE; + for (i = 0; i < info->bmiHeader.biWidth * abs(info->bmiHeader.biHeight); i++, ptr += 4) + if ((has_alpha = (ptr[3] != 0))) break; + return has_alpha; +} + +/*********************************************************************** + * create_alpha_bitmap + * + * Create the alpha bitmap for a 32-bpp icon that has an alpha channel. + */ +static HBITMAP create_alpha_bitmap( HBITMAP color, HBITMAP mask, + const BITMAPINFO *src_info, const void *color_bits ) +{ + HBITMAP alpha = 0; + BITMAPINFO *info = NULL; + BITMAP bm; + HDC hdc; + void *bits; + unsigned char *ptr; + int i; + + if (!GetObjectW( color, sizeof(bm), &bm )) return 0; + if (bm.bmBitsPixel != 32) return 0; + + if (!(hdc = CreateCompatibleDC( 0 ))) return 0; + if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto done; + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biWidth = bm.bmWidth; + info->bmiHeader.biHeight = -bm.bmHeight; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = 32; + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biSizeImage = bm.bmWidth * bm.bmHeight * 4; + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + if (!(alpha = CreateDIBSection( hdc, info, DIB_RGB_COLORS, &bits, NULL, 0 ))) goto done; + + if (src_info) + { + SelectObject( hdc, alpha ); + StretchDIBits( hdc, 0, 0, bm.bmWidth, bm.bmHeight, + 0, 0, src_info->bmiHeader.biWidth, src_info->bmiHeader.biHeight, + color_bits, src_info, DIB_RGB_COLORS, SRCCOPY ); + + } + else + { + GetDIBits( hdc, color, 0, bm.bmHeight, bits, info, DIB_RGB_COLORS ); + if (!bmi_has_alpha( info, bits )) + { + DeleteObject( alpha ); + alpha = 0; + goto done; + } + } + + /* pre-multiply by alpha */ + for (i = 0, ptr = bits; i < bm.bmWidth * bm.bmHeight; i++, ptr += 4) + { + unsigned int alpha = ptr[3]; + ptr[0] = ptr[0] * alpha / 255; + ptr[1] = ptr[1] * alpha / 255; + ptr[2] = ptr[2] * alpha / 255; + } + +done: + DeleteDC( hdc ); + HeapFree( GetProcessHeap(), 0, info ); + return alpha; +} + + +/*********************************************************************** * create_icon_bitmaps * - * Create the color and mask bitmaps from the DIB info. + * Create the color, mask and alpha bitmaps from the DIB info. */ static BOOL create_icon_bitmaps( const BITMAPINFO *bmi, int width, int height, - HBITMAP *color, HBITMAP *mask ) + HBITMAP *color, HBITMAP *mask, HBITMAP *alpha ) { BOOL monochrome = is_dib_monochrome( bmi ); unsigned int size = bitmap_info_size( bmi, DIB_RGB_COLORS ); @@ -801,6 +888,7 @@ static BOOL create_icon_bitmaps( const BITMAPINFO *bmi, int width, int height, get_dib_width_bytes( bmi->bmiHeader.biWidth, bmi->bmiHeader.biBitCount ) * abs(info->bmiHeader.biHeight); + *alpha = 0; if (monochrome) { if (!(*mask = CreateBitmap( width, height * 2, 1, 1, NULL ))) goto done; @@ -826,6 +914,9 @@ static BOOL create_icon_bitmaps( const BITMAPINFO *bmi, int width, int height, 0, 0, info->bmiHeader.biWidth, info->bmiHeader.biHeight, color_bits, info, DIB_RGB_COLORS, SRCCOPY ); + if (bmi_has_alpha( info, color_bits )) + *alpha = create_alpha_bitmap( *color, *mask, info, color_bits ); + /* convert info to monochrome to copy the mask */ info->bmiHeader.biBitCount = 1; if (info->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) @@ -866,7 +957,7 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, { HICON hObj; int sizeAnd, sizeXor; - HBITMAP color = 0, mask = 0, hAndBits = 0, hXorBits = 0; /* error condition for later */ + HBITMAP color = 0, mask = 0, alpha = 0, hAndBits = 0, hXorBits = 0; /* error condition for later */ BITMAP bmpXor, bmpAnd; BOOL do_stretch; INT size; @@ -905,7 +996,7 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, if (!screen_dc) screen_dc = CreateDCW( DISPLAYW, NULL, NULL, NULL ); if (!screen_dc) return 0; - if (create_icon_bitmaps( bmi, width, height, &color, &mask )) + if (create_icon_bitmaps( bmi, width, height, &color, &mask, &alpha )) { /* Make sure we have room for the monochrome bitmap later on. * Note that BITMAPINFOINFO and BITMAPCOREHEADER are the same @@ -1033,6 +1124,7 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, { WARN_(cursor)("\tunable to create an icon bitmap.\n"); DeleteObject( color ); + DeleteObject( alpha ); DeleteObject( mask ); return 0; } @@ -1050,6 +1142,7 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, info->color = color; info->mask = mask; + info->alpha = alpha; info->data.ptHotSpot.x = hotspot.x; info->data.ptHotSpot.y = hotspot.y; info->data.nWidth = bmpXor.bmWidth; @@ -1068,6 +1161,7 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, else { DeleteObject( color ); + DeleteObject( alpha ); DeleteObject( mask ); } @@ -1678,6 +1772,7 @@ HICON WINAPI CopyIcon( HICON hIcon ) ptrNew = get_icon_ptr( hNew ); memcpy( &ptrNew->data, &ptrOld->data, sizeof(ptrNew->data) + size ); ptrNew->color = copy_bitmap( ptrOld->color ); + ptrNew->alpha = copy_bitmap( ptrOld->alpha ); ptrNew->mask = copy_bitmap( ptrOld->mask ); release_icon_ptr( hIcon, ptrOld ); release_icon_ptr( hNew, ptrNew ); @@ -2149,6 +2244,7 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) info->color = color; info->mask = mask; + info->alpha = create_alpha_bitmap( iconinfo->hbmColor, mask, NULL, NULL ); /* If we are creating an icon, the hotspot is unused */ if (iconinfo->fIcon)

1 0