June 2008 - Wine-commits - list.winehq.org

Jon Griffiths : include: Provide wide char definitions for CFSTR_*.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: f2276f5a493c8e2d1f07901781e38304e9b9c4c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2276f5a493c8e2d1f0790178… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Wed Jun 18 08:04:46 2008 -0700 include: Provide wide char definitions for CFSTR_*. --- dlls/comdlg32/filedlg.c | 4 +- dlls/shell32/dataobject.c | 4 +- dlls/shell32/pidl.c | 2 +- dlls/shell32/shfldr_fs.c | 2 +- dlls/shell32/shfldr_unixfs.c | 2 +- dlls/shell32/shlview.c | 2 +- dlls/shell32/shv_bg_cmenu.c | 2 +- include/shlobj.h | 179 +++++++++++++++++++++++++++++++++++------ programs/winefile/winefile.c | 4 - 9 files changed, 161 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f2276f5a493c8e2d1f079…

1 0

Maarten Lankhorst : quartz: Forward some messages from IMediaSeekingPassThru.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: fc3377d08bd3a43ba34f5c177f7b1e7464237980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc3377d08bd3a43ba34f5c177… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Jun 10 16:59:30 2008 +0200 quartz: Forward some messages from IMediaSeekingPassThru. --- dlls/quartz/control.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/control.c b/dlls/quartz/control.c index 63bc371..477f632 100644 --- a/dlls/quartz/control.c +++ b/dlls/quartz/control.c @@ -782,11 +782,17 @@ static HRESULT WINAPI MediaSeekingPassThru_SetTimeFormat(IMediaSeeking * iface, static HRESULT WINAPI MediaSeekingPassThru_GetDuration(IMediaSeeking * iface, LONGLONG * pDuration) { ICOM_THIS_MULTI(PassThruImpl, IMediaSeeking_vtbl, iface); + PIN_INFO info; + HRESULT hr; TRACE("(%p/%p)->(%p)\n", iface, This, pDuration); - FIXME("stub\n"); - return E_NOTIMPL; + IPin_QueryPinInfo(This->pin, &info); + + hr = ForwardCmdSeek(NULL, info.pFilter, fwd_getduration, pDuration); + IBaseFilter_Release(info.pFilter); + + return hr; } static HRESULT WINAPI MediaSeekingPassThru_GetStopPosition(IMediaSeeking * iface, LONGLONG * pStop) @@ -823,11 +829,21 @@ static HRESULT WINAPI MediaSeekingPassThru_ConvertTimeFormat(IMediaSeeking * ifa static HRESULT WINAPI MediaSeekingPassThru_SetPositions(IMediaSeeking * iface, LONGLONG * pCurrent, DWORD dwCurrentFlags, LONGLONG * pStop, DWORD dwStopFlags) { ICOM_THIS_MULTI(PassThruImpl, IMediaSeeking_vtbl, iface); + struct pos_args args; + PIN_INFO info; + HRESULT hr; TRACE("(%p/%p)->(%p, %p)\n", iface, This, pCurrent, pStop); + args.current = pCurrent; + args.stop = pStop; + args.curflags = dwCurrentFlags; + args.stopflags = dwStopFlags; - FIXME("stub\n"); - return E_NOTIMPL; + IPin_QueryPinInfo(This->pin, &info); + + hr = ForwardCmdSeek(NULL, info.pFilter, fwd_setposition, &args); + IBaseFilter_Release(info.pFilter); + return hr; } static HRESULT WINAPI MediaSeekingPassThru_GetPositions(IMediaSeeking * iface, LONGLONG * pCurrent, LONGLONG * pStop)

1 0

Roy Shea : user32: Initialize hdd HDDEDATA to NULL (valgrind).
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: 6cfc6bd4f36ecf09b3dca3edefaa963200625f9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cfc6bd4f36ecf09b3dca3ede… Author: Roy Shea <royshea(a)gmail.com> Date: Wed Jun 18 12:00:59 2008 -0700 user32: Initialize hdd HDDEDATA to NULL (valgrind). --- dlls/user32/dde_client.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 1a868ef..31a1251 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -1032,7 +1032,7 @@ static HDDEDATA WDML_SyncWaitTransactionReply(HCONV hConv, DWORD dwTimeout, cons while (PeekMessageW(&msg, 0, WM_DDE_FIRST, WM_DDE_LAST, PM_REMOVE)) { - HDDEDATA hdd; + HDDEDATA hdd = NULL; pConv = WDML_GetConv(hConv, FALSE); if (pConv == NULL)

1 0

James Hawkins : msi: Rewrite the PublishProduct test to only check the registry changes.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: bb8d253ecc0f18d32c83f7de886b09a083d1c24b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb8d253ecc0f18d32c83f7de8… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jun 19 00:37:43 2008 -0500 msi: Rewrite the PublishProduct test to only check the registry changes. --- dlls/msi/tests/install.c | 148 +++++++++++++++++++++++++++------------------- 1 files changed, 87 insertions(+), 61 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 05e1cd5..93445c9 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2239,6 +2239,12 @@ static void test_publish_registerproduct(void) "\\51AAE0C44620A5E4788506E91F249BD2"; get_user_sid(&usersid); + if (!usersid) + { + skip("ConvertSidToStringSidA is not available\n"); + return; + } + get_date_str(date); GetTempPath(MAX_PATH, temp); @@ -2457,20 +2463,29 @@ static void test_publish_publishproduct(void) { UINT r; LONG res; - HKEY uninstall, prodkey; - INSTALLSTATE state; - CHAR prodcode[] = "{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"; + LPSTR usersid; + HKEY sourcelist, net; + HKEY hkey, patches, media; + CHAR keypath[MAX_PATH]; + CHAR temp[MAX_PATH]; + CHAR path[MAX_PATH]; - static const CHAR subkey[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall"; + static const CHAR prodpath[] = "Software\\Microsoft\\Windows\\CurrentVersion" + "\\Installer\\UserData\\%s\\Products" + "\\84A88FD7F6998CE40A22FB59F6B9C2BB"; + static const CHAR cuprodpath[] = "Software\\Microsoft\\Installer\\Products" + "\\84A88FD7F6998CE40A22FB59F6B9C2BB"; + static const CHAR cuupgrades[] = "Software\\Microsoft\\Installer\\UpgradeCodes" + "\\51AAE0C44620A5E4788506E91F249BD2"; - if (!pMsiQueryComponentStateA) + get_user_sid(&usersid); + if (!usersid) { - skip("MsiQueryComponentStateA is not available\n"); + skip("ConvertSidToStringSidA is not available\n"); return; } - res = RegOpenKeyA(HKEY_LOCAL_MACHINE, subkey, &uninstall); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + GetTempPath(MAX_PATH, temp); CreateDirectoryA("msitest", NULL); create_file("msitest\\maximus", 500); @@ -2479,80 +2494,91 @@ static void test_publish_publishproduct(void) MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); - state = MsiQueryProductState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); - ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + /* PublishProduct, current user */ + r = MsiInstallProductA(msifile, "PUBLISH_PRODUCT=1"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); - state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "feature"); - ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + sprintf(keypath, prodpath, usersid); + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, keypath, &hkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "montecristo"); - ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + res = RegOpenKeyA(hkey, "Patches", &patches); + todo_wine + { + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, - "{DF2CBABC-3BCC-47E5-A998-448D1C0C895B}", &state); - ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); - ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + CHECK_DEL_REG_STR(patches, "AllPatches", NULL); + } - res = RegOpenKeyA(uninstall, prodcode, &prodkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + RegDeleteKeyA(patches, ""); + RegCloseKey(patches); + RegDeleteKeyA(hkey, ""); + RegCloseKey(hkey); - /* PublishProduct */ - r = MsiInstallProductA(msifile, "PUBLISH_PRODUCT=1"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(pf_exists("msitest\\maximus"), "File not installed\n"); - ok(pf_exists("msitest"), "File not installed\n"); + res = RegOpenKeyA(HKEY_CURRENT_USER, cuprodpath, &hkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - state = MsiQueryProductState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); - ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state); + CHECK_DEL_REG_STR(hkey, "ProductName", "MSITEST"); + CHECK_DEL_REG_DWORD(hkey, "Language", 1033); + CHECK_DEL_REG_DWORD(hkey, "Version", 0x1010001); + CHECK_DEL_REG_DWORD(hkey, "AuthorizedLUAApp", 0); + todo_wine + { + CHECK_DEL_REG_STR(hkey, "PackageCode", "AC75740029052c94DA02821EECD05F2F"); + CHECK_DEL_REG_DWORD(hkey, "Assignment", 0); + CHECK_DEL_REG_DWORD(hkey, "AdvertiseFlags", 0x184); + CHECK_DEL_REG_DWORD(hkey, "InstanceType", 0); + CHECK_DEL_REG_STR(hkey, "Clients", ":"); + } - state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "feature"); - ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + res = RegOpenKeyA(hkey, "SourceList", &sourcelist); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "montecristo"); - ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + lstrcpyA(path, "n;1;"); + lstrcatA(path, temp); + CHECK_DEL_REG_STR(sourcelist, "LastUsedSource", path); + CHECK_DEL_REG_STR(sourcelist, "PackageName", "msitest.msi"); - r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, - "{DF2CBABC-3BCC-47E5-A998-448D1C0C895B}", &state); - ok(r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r); - ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + res = RegOpenKeyA(sourcelist, "Net", &net); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - res = RegOpenKeyA(uninstall, prodcode, &prodkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + CHECK_DEL_REG_STR(net, "1", temp); - /* try to uninstall after PublishProduct */ - r = MsiInstallProductA(msifile, "REMOVE=ALL"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(pf_exists("msitest\\maximus"), "File deleted\n"); - ok(pf_exists("msitest"), "File deleted\n"); + RegDeleteKeyA(net, ""); + RegCloseKey(net); - state = MsiQueryProductState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); - ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + res = RegOpenKeyA(sourcelist, "Media", &media); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "feature"); - ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + todo_wine + { + CHECK_DEL_REG_STR(media, "1", "DISK1;"); + } - state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "montecristo"); - ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + RegDeleteKeyA(media, ""); + RegCloseKey(media); + RegDeleteKeyA(sourcelist, ""); + RegCloseKey(sourcelist); + RegDeleteKeyA(hkey, ""); + RegCloseKey(hkey); - r = pMsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, - "{DF2CBABC-3BCC-47E5-A998-448D1C0C895B}", &state); - ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); - ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + res = RegOpenKeyA(HKEY_CURRENT_USER, cuupgrades, &hkey); + todo_wine + { + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - res = RegOpenKeyA(uninstall, prodcode, &prodkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + CHECK_DEL_REG_STR(hkey, "84A88FD7F6998CE40A22FB59F6B9C2BB", NULL); + } - /* full install to remove */ - r = MsiInstallProductA(msifile, "FULL=1"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - r = MsiInstallProductA(msifile, "FULL=1 REMOVE=ALL"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + RegDeleteKeyA(hkey, ""); + RegCloseKey(hkey); - RegCloseKey(uninstall); DeleteFile(msifile); DeleteFile("msitest\\maximus"); RemoveDirectory("msitest"); - delete_pfmsitest_files(); + HeapFree(GetProcessHeap(), 0, usersid); } static void test_publish_publishfeatures(void)

1 0

James Hawkins : msi: Test the RegisterProduct action with the machine context.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: c0f8bfd2ddb58817fab56237b7399eae94dbe686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0f8bfd2ddb58817fab56237b… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Jun 19 00:36:59 2008 -0500 msi: Test the RegisterProduct action with the machine context. --- dlls/msi/tests/install.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 99 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index e7e6d47..05e1cd5 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2348,6 +2348,105 @@ static void test_publish_registerproduct(void) RegDeleteKeyA(hkey, ""); RegCloseKey(hkey); + /* RegisterProduct, machine */ + r = MsiInstallProductA(msifile, "REGISTER_PRODUCT=1 ALLUSERS=1"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, userugkey, &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, uninstall, &hkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + CHECK_DEL_REG_STR(hkey, "DisplayName", "MSITEST"); + CHECK_DEL_REG_STR(hkey, "DisplayVersion", "1.1.1"); + CHECK_DEL_REG_STR(hkey, "InstallDate", date); + CHECK_DEL_REG_STR(hkey, "InstallSource", temp); + CHECK_DEL_REG_ISTR(hkey, "ModifyPath", "MsiExec.exe /I{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); + CHECK_DEL_REG_STR(hkey, "Publisher", "Wine"); + CHECK_DEL_REG_STR(hkey, "UninstallString", "MsiExec.exe /I{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); + CHECK_DEL_REG_STR(hkey, "AuthorizedCDFPrefix", NULL); + CHECK_DEL_REG_STR(hkey, "Comments", NULL); + CHECK_DEL_REG_STR(hkey, "Contact", NULL); + CHECK_DEL_REG_STR(hkey, "HelpLink", NULL); + CHECK_DEL_REG_STR(hkey, "HelpTelephone", NULL); + CHECK_DEL_REG_STR(hkey, "InstallLocation", NULL); + CHECK_DEL_REG_STR(hkey, "Readme", NULL); + CHECK_DEL_REG_STR(hkey, "Size", NULL); + CHECK_DEL_REG_STR(hkey, "URLInfoAbout", NULL); + CHECK_DEL_REG_STR(hkey, "URLUpdateInfo", NULL); + CHECK_DEL_REG_DWORD(hkey, "Language", 1033); + CHECK_DEL_REG_DWORD(hkey, "Version", 0x1010001); + CHECK_DEL_REG_DWORD(hkey, "VersionMajor", 1); + CHECK_DEL_REG_DWORD(hkey, "VersionMinor", 1); + CHECK_DEL_REG_DWORD(hkey, "WindowsInstaller", 1); + todo_wine + { + CHECK_DEL_REG_DWORD(hkey, "EstimatedSize", 12); + } + + RegDeleteKeyA(hkey, ""); + RegCloseKey(hkey); + + sprintf(keypath, userdata, "S-1-5-18"); + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, keypath, &hkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + res = RegOpenKeyA(hkey, "InstallProperties", &props); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + RegDeleteValueA(props, "LocalPackage"); /* LocalPackage is nondeterministic */ + CHECK_DEL_REG_STR(props, "DisplayName", "MSITEST"); + CHECK_DEL_REG_STR(props, "DisplayVersion", "1.1.1"); + CHECK_DEL_REG_STR(props, "InstallDate", date); + CHECK_DEL_REG_STR(props, "InstallSource", temp); + CHECK_DEL_REG_ISTR(props, "ModifyPath", "MsiExec.exe /I{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); + CHECK_DEL_REG_STR(props, "Publisher", "Wine"); + CHECK_DEL_REG_STR(props, "UninstallString", "MsiExec.exe /I{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); + CHECK_DEL_REG_STR(props, "AuthorizedCDFPrefix", NULL); + CHECK_DEL_REG_STR(props, "Comments", NULL); + CHECK_DEL_REG_STR(props, "Contact", NULL); + CHECK_DEL_REG_STR(props, "HelpLink", NULL); + CHECK_DEL_REG_STR(props, "HelpTelephone", NULL); + CHECK_DEL_REG_STR(props, "InstallLocation", NULL); + CHECK_DEL_REG_STR(props, "Readme", NULL); + CHECK_DEL_REG_STR(props, "Size", NULL); + CHECK_DEL_REG_STR(props, "URLInfoAbout", NULL); + CHECK_DEL_REG_STR(props, "URLUpdateInfo", NULL); + CHECK_DEL_REG_DWORD(props, "Language", 1033); + CHECK_DEL_REG_DWORD(props, "Version", 0x1010001); + CHECK_DEL_REG_DWORD(props, "VersionMajor", 1); + CHECK_DEL_REG_DWORD(props, "VersionMinor", 1); + CHECK_DEL_REG_DWORD(props, "WindowsInstaller", 1); + todo_wine + { + CHECK_DEL_REG_DWORD(props, "EstimatedSize", 12); + } + + RegDeleteKeyA(props, ""); + RegCloseKey(props); + + res = RegOpenKeyA(hkey, "Usage", &usage); + todo_wine + { + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + } + + RegDeleteKeyA(usage, ""); + RegCloseKey(usage); + RegDeleteKeyA(hkey, ""); + RegCloseKey(hkey); + + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, ugkey, &hkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + CHECK_DEL_REG_STR(hkey, "84A88FD7F6998CE40A22FB59F6B9C2BB", NULL); + + RegDeleteKeyA(hkey, ""); + RegCloseKey(hkey); + DeleteFile(msifile); DeleteFile("msitest\\maximus"); RemoveDirectory("msitest");

1 0

James Hawkins : msi: Factor out the publishing of installation properties.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: 45de896a3d72f0c04ba53f76dad55ebdad81064b URL: http://source.winehq.org/git/wine.git/?a=commit;h=45de896a3d72f0c04ba53f76d… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Jun 19 00:36:10 2008 -0500 msi: Factor out the publishing of installation properties. --- dlls/msi/action.c | 216 +++++++++++++++++++++------------------------- dlls/msi/tests/install.c | 30 +++--- 2 files changed, 115 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=45de896a3d72f0c04ba53…

1 0

James Hawkins : msi: Don't publish the upgrade key to an invalid location.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: b635e3170ff6b1609cceafa35f18a82d74eafdb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b635e3170ff6b1609cceafa35… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Jun 19 00:34:52 2008 -0500 msi: Don't publish the upgrade key to an invalid location. --- dlls/msi/action.c | 5 ----- dlls/msi/tests/automation.c | 5 ++++- dlls/msi/tests/install.c | 5 +++++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index c42c4f9..abc1c35 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4125,11 +4125,6 @@ static UINT ACTION_RegisterProduct(MSIPACKAGE *package) squash_guid(package->ProductCode,squashed); msi_reg_set_val_str( hkey2, squashed, NULL ); RegCloseKey(hkey2); - MSIREG_OpenUserUpgradeCodesKey(upgrade_code, &hkey2, TRUE); - squash_guid(package->ProductCode,squashed); - msi_reg_set_val_str( hkey2, squashed, NULL ); - RegCloseKey(hkey2); - msi_free(upgrade_code); } diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 3a35d4a..2b0ada1 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -2298,7 +2298,10 @@ static void test_Installer_InstallProduct(void) ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); res = RegDeleteKeyA(hkey, "UpgradeCodes\\D8E760ECA1E276347B43E42BDBDA5656"); - ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + todo_wine + { + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + } RegCloseKey(hkey); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index a751d0b..f035650 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2235,6 +2235,8 @@ static void test_publish_registerproduct(void) "\\UserData\\%s\\Products\\84A88FD7F6998CE40A22FB59F6B9C2BB"; static const CHAR ugkey[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Installer" "\\UpgradeCodes\\51AAE0C44620A5E4788506E91F249BD2"; + static const CHAR userugkey[] = "Software\\Microsoft\\Installer\\UpgradeCodes" + "\\51AAE0C44620A5E4788506E91F249BD2"; get_user_sid(&usersid); get_date_str(date); @@ -2253,6 +2255,9 @@ static void test_publish_registerproduct(void) ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n"); + res = RegOpenKeyA(HKEY_CURRENT_USER, userugkey, &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, uninstall, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);

1 0

James Hawkins : msi: Rewrite the RegisterProduct test to only check the registry changes.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: 2194889d5d0ef3e75b1f3d3118b72b142c34055e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2194889d5d0ef3e75b1f3d311… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Jun 19 00:34:04 2008 -0500 msi: Rewrite the RegisterProduct test to only check the registry changes. --- dlls/msi/tests/install.c | 224 +++++++++++++++++++-------------------------- 1 files changed, 95 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2194889d5d0ef3e75b1f3…

1 0

James Hawkins : msi: Fix the PublishFeatures action to handle the package context.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: 2a180e060ac93006326844967ebc06c8fcb8076e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a180e060ac93006326844967… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Jun 19 00:32:59 2008 -0500 msi: Fix the PublishFeatures action to handle the package context. --- dlls/msi/action.c | 39 ++++++++++++++++++++++++++++----------- dlls/msi/msipriv.h | 2 ++ dlls/msi/registry.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/install.c | 40 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 114 insertions(+), 11 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index d3aeb38..c42c4f9 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3733,19 +3733,35 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package) { MSIFEATURE *feature; UINT rc; - HKEY hukey=0; - HKEY userdata=0; + HKEY hkey; + HKEY userdata; if (!msi_check_publish(package)) return ERROR_SUCCESS; - rc = MSIREG_OpenUserFeaturesKey(package->ProductCode,&hukey,TRUE); - if (rc != ERROR_SUCCESS) - goto end; + if (package->Context == MSIINSTALLCONTEXT_MACHINE) + { + rc = MSIREG_OpenLocalClassesFeaturesKey(package->ProductCode, + &hkey, TRUE); + if (rc != ERROR_SUCCESS) + goto end; - rc = MSIREG_OpenUserDataFeaturesKey(package->ProductCode, &userdata, TRUE); - if (rc != ERROR_SUCCESS) - goto end; + rc = MSIREG_OpenLocalUserDataFeaturesKey(package->ProductCode, + &userdata, TRUE); + if (rc != ERROR_SUCCESS) + goto end; + } + else + { + rc = MSIREG_OpenUserFeaturesKey(package->ProductCode, &hkey, TRUE); + if (rc != ERROR_SUCCESS) + goto end; + + rc = MSIREG_OpenUserDataFeaturesKey(package->ProductCode, + &userdata, TRUE); + if (rc != ERROR_SUCCESS) + goto end; + } /* here the guids are base 85 encoded */ LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) @@ -3806,7 +3822,7 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package) { static const WCHAR emptyW[] = {0}; size += sizeof(WCHAR); - RegSetValueExW(hukey,feature->Feature,0,REG_SZ, + RegSetValueExW(hkey,feature->Feature,0,REG_SZ, (LPBYTE)(feature->Feature_Parent ? feature->Feature_Parent : emptyW),size); } else @@ -3817,7 +3833,7 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package) data[1] = 0; if (feature->Feature_Parent) strcpyW( &data[1], feature->Feature_Parent ); - RegSetValueExW(hukey,feature->Feature,0,REG_SZ, + RegSetValueExW(hkey,feature->Feature,0,REG_SZ, (LPBYTE)data,size); msi_free(data); } @@ -3831,7 +3847,8 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package) } end: - RegCloseKey(hukey); + RegCloseKey(hkey); + RegCloseKey(userdata); return rc; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 0982065..b045710 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -785,7 +785,9 @@ extern UINT MSIREG_DeleteUserDataProductKey(LPCWSTR szProduct); extern UINT MSIREG_OpenLocalSystemProductKey(LPCWSTR szProductCode, HKEY *key, BOOL create); extern UINT MSIREG_OpenLocalSystemComponentKey(LPCWSTR szComponent, HKEY *key, BOOL create); extern UINT MSIREG_OpenLocalClassesProductKey(LPCWSTR szProductCode, HKEY *key, BOOL create); +extern UINT MSIREG_OpenLocalClassesFeaturesKey(LPCWSTR szProductCode, HKEY *key, BOOL create); extern UINT MSIREG_OpenLocalManagedProductKey(LPCWSTR szProductCode, HKEY *key, BOOL create); +extern UINT MSIREG_OpenLocalUserDataFeaturesKey(LPCWSTR szProduct, HKEY *key, BOOL create); extern UINT MSIREG_DeleteUserFeaturesKey(LPCWSTR szProduct); extern UINT MSIREG_DeleteLocalUserDataComponentKey(LPCWSTR szComponent); extern UINT MSIREG_DeleteUserDataComponentKey(LPCWSTR szComponent); diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 6135b47..7b586a8 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -204,6 +204,12 @@ static const WCHAR szInstaller_LocalClassesProd_fmt[] = { 'I','n','s','t','a','l','l','e','r','\\', 'P','r','o','d','u','c','t','s','\\','%','s',0}; +static const WCHAR szInstaller_LocalClassesFeat_fmt[] = { +'S','o','f','t','w','a','r','e','\\', +'C','l','a','s','s','e','s','\\', +'I','n','s','t','a','l','l','e','r','\\', +'F','e','a','t','u','r','e','s','\\','%','s',0}; + static const WCHAR szInstaller_LocalManagedProd_fmt[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -647,6 +653,24 @@ UINT MSIREG_OpenUserDataFeaturesKey(LPCWSTR szProduct, HKEY *key, BOOL create) return rc; } +UINT MSIREG_OpenLocalUserDataFeaturesKey(LPCWSTR szProduct, HKEY *key, BOOL create) +{ + WCHAR squished_pc[GUID_SIZE]; + WCHAR keypath[0x200]; + + TRACE("%s\n", debugstr_w(szProduct)); + if (!squash_guid(szProduct, squished_pc)) + return ERROR_FUNCTION_FAILED; + TRACE("squished (%s)\n", debugstr_w(squished_pc)); + + sprintfW(keypath, szUserDataFeatures_fmt, localsid, squished_pc); + + if (create) + return RegCreateKeyW(HKEY_LOCAL_MACHINE, keypath, key); + + return RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); +} + UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY* key, BOOL create) { UINT rc; @@ -1016,6 +1040,26 @@ UINT MSIREG_OpenLocalClassesProductKey(LPCWSTR szProductCode, HKEY *key, BOOL cr return RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); } +UINT MSIREG_OpenLocalClassesFeaturesKey(LPCWSTR szProductCode, HKEY *key, BOOL create) +{ + WCHAR squished_pc[GUID_SIZE]; + WCHAR keypath[0x200]; + + TRACE("%s\n", debugstr_w(szProductCode)); + + if (!squash_guid(szProductCode, squished_pc)) + return ERROR_FUNCTION_FAILED; + + TRACE("squished (%s)\n", debugstr_w(squished_pc)); + + sprintfW(keypath, szInstaller_LocalClassesFeat_fmt, squished_pc); + + if (create) + return RegCreateKeyW(HKEY_LOCAL_MACHINE, keypath, key); + + return RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); +} + UINT MSIREG_OpenLocalManagedProductKey(LPCWSTR szProductCode, HKEY *key, BOOL create) { WCHAR squished_pc[GUID_SIZE]; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 9a952d3..bc37571 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2500,6 +2500,8 @@ static void test_publish_publishfeatures(void) "\\84A88FD7F6998CE40A22FB59F6B9C2BB\\Features"; static const CHAR featkey[] = "Software\\Microsoft\\Windows\\CurrentVersion" "\\Installer\\Features"; + static const CHAR classfeat[] = "Software\\Classes\\Installer\\Features" + "\\84A88FD7F6998CE40A22FB59F6B9C2BB"; get_user_sid(&usersid); if (!usersid) @@ -2524,6 +2526,9 @@ static void test_publish_publishfeatures(void) res = RegOpenKeyA(HKEY_LOCAL_MACHINE, featkey, &hkey); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, classfeat, &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + res = RegOpenKeyA(HKEY_CURRENT_USER, cupath, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -2547,6 +2552,41 @@ static void test_publish_publishfeatures(void) RegDeleteKeyA(hkey, ""); RegCloseKey(hkey); + /* PublishFeatures, machine */ + r = MsiInstallProductA(msifile, "PUBLISH_FEATURES=1 ALLUSERS=1"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, featkey, &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + + res = RegOpenKeyA(HKEY_CURRENT_USER, cupath, &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, classfeat, &hkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + CHECK_REG_STR(hkey, "feature", ""); + CHECK_REG_STR(hkey, "montecristo", ""); + + RegDeleteValueA(hkey, "feature"); + RegDeleteValueA(hkey, "montecristo"); + RegDeleteKeyA(hkey, ""); + RegCloseKey(hkey); + + sprintf(keypath, udpath, "S-1-5-18"); + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, keypath, &hkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + CHECK_REG_STR(hkey, "feature", "VGtfp^p+,?82(a)JU1j_KE"); + CHECK_REG_STR(hkey, "montecristo", "VGtfp^p+,?82(a)JU1j_KE"); + + RegDeleteValueA(hkey, "feature"); + RegDeleteValueA(hkey, "montecristo"); + RegDeleteKeyA(hkey, ""); + RegCloseKey(hkey); + DeleteFile(msifile); DeleteFile("msitest\\maximus"); RemoveDirectory("msitest");

1 0

Alex Villacís Lasso : richedit: Empty text should result in a scroll range of 0. Tests for this behavior.
by Alexandre Julliard 19 Jun '08

19 Jun '08

Module: wine Branch: master Commit: 0e9ed5c10e3ac6b253712037f0b30046a5656239 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e9ed5c10e3ac6b253712037f… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Sun May 11 09:54:58 2008 -0500 richedit: Empty text should result in a scroll range of 0. Tests for this behavior. --- dlls/riched20/paint.c | 11 ++++++++--- dlls/riched20/tests/editor.c | 12 +++++++++++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 91b71dc..df2eda8 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -674,9 +674,14 @@ void ME_Scroll(ME_TextEditor *editor, int value, int type) si.fMask |= SIF_DISABLENOSCROLL; si.nMin = 0; - si.nMax = editor->nTotalLength; - - si.nPage = editor->sizeWindow.cy; + + if (ME_GetTextLength(editor) > 0) + { + si.nMax = editor->nTotalLength; + si.nPage = editor->sizeWindow.cy; + } else { + si.nMax = si.nPage = 0; + } TRACE("min=%d max=%d page=%d\n", si.nMin, si.nMax, si.nPage); SetScrollInfo(hWnd, SB_VERT, &si, TRUE); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 9ed600b..c9aa194 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1921,6 +1921,16 @@ static void test_EM_SCROLL(void) int expr; /* expected return value */ HWND hwndRichEdit = new_richedit(NULL); int y_before, y_after; /* units of lines of text */ + SCROLLINFO si; + + /* Empty richedit should have scroll range of 0 */ + si.cbSize = sizeof(si); + si.fMask = SIF_RANGE | SIF_PAGE | SIF_POS; + GetScrollInfo(hwndRichEdit, SB_VERT, &si); + ok(si.nMin == 0, "si.nMin == %d, expected 0\n", si.nMin); + ok(si.nMax == 0, "si.nMax == %d, expected 0\n", si.nMax); + ok(si.nPos == 0, "si.nPos == %d, expected 0\n", si.nPos); + ok(si.nPage == 0, "si.nPage == %d, expected 0\n", si.nPage); /* test a richedit box containing a single line of text */ SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) "a");/* one line of text */ @@ -4181,7 +4191,6 @@ START_TEST( editor ) test_EM_GETMODIFY(); test_EM_EXSETSEL(); test_WM_PASTE(); - test_EM_AUTOURLDETECT(); test_EM_STREAMIN(); test_EM_STREAMOUT(); test_EM_StreamIn_Undo(); @@ -4191,6 +4200,7 @@ START_TEST( editor ) test_EM_REPLACESEL(1); test_EM_REPLACESEL(0); test_WM_NOTIFY(); + test_EM_AUTOURLDETECT(); test_eventMask(); /* Set the environment variable WINETEST_RICHED20 to keep windows

1 0