October 2008 - Wine-commits

Detlef Riekenberg : shlwapi: Fix pointer and size in AssocQueryStringA.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 78c75e20aeff2a35911953c27559e8f5257e5d11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78c75e20aeff2a35911953c27… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 17 16:36:59 2008 +0200 shlwapi: Fix pointer and size in AssocQueryStringA. --- dlls/shlwapi/assoc.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c index 31a8420..0ca8678 100644 --- a/dlls/shlwapi/assoc.c +++ b/dlls/shlwapi/assoc.c @@ -303,6 +303,8 @@ HRESULT WINAPI AssocQueryStringA(ASSOCF cfFlags, ASSOCSTR str, LPCSTR pszAssoc, if (dwLenOut >= MAX_PATH) lpszReturnW = HeapAlloc(GetProcessHeap(), 0, (dwLenOut + 1) * sizeof(WCHAR)); + else + dwLenOut = sizeof(szReturnW) / sizeof(szReturnW[0]); if (!lpszReturnW) hRet = E_OUTOFMEMORY; @@ -312,9 +314,10 @@ HRESULT WINAPI AssocQueryStringA(ASSOCF cfFlags, ASSOCSTR str, LPCSTR pszAssoc, lpszReturnW, &dwLenOut); if (SUCCEEDED(hRet)) - WideCharToMultiByte(CP_ACP,0,szReturnW,-1,pszOut,dwLenOut,0,0); - *pcchOut = dwLenOut; + dwLenOut = WideCharToMultiByte(CP_ACP, 0, lpszReturnW, -1, + pszOut, *pcchOut, NULL, NULL); + *pcchOut = dwLenOut; if (lpszReturnW != szReturnW) HeapFree(GetProcessHeap(), 0, lpszReturnW); }

1 0

Detlef Riekenberg : shlwapi/tests: Replace RegDeleteTreeW to run the tests again.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 40d74488957fb775a47913377fb6b2b3832a04f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40d74488957fb775a47913377… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 17 16:38:55 2008 +0200 shlwapi/tests: Replace RegDeleteTreeW to run the tests again. --- dlls/shlwapi/tests/assoc.c | 59 +++++++++++++++++++------------------------ 1 files changed, 26 insertions(+), 33 deletions(-) diff --git a/dlls/shlwapi/tests/assoc.c b/dlls/shlwapi/tests/assoc.c index 2e383bb..aa01814 100644 --- a/dlls/shlwapi/tests/assoc.c +++ b/dlls/shlwapi/tests/assoc.c @@ -32,19 +32,6 @@ static const WCHAR dotBad[] = { '.','b','a','d',0 }; static const WCHAR open[] = { 'o','p','e','n',0 }; static const WCHAR invalid[] = { 'i','n','v','a','l','i','d',0 }; -/* copied from libs/wine/string.c */ -WCHAR *strstrW(const WCHAR *str, const WCHAR *sub) -{ - while (*str) - { - const WCHAR *p1 = str, *p2 = sub; - while (*p1 && *p2 && *p1 == *p2) { p1++; p2++; } - if (!*p2) return (WCHAR *)str; - str++; - } - return NULL; -} - static void test_getstring_bad(void) { HRESULT hr; @@ -145,57 +132,63 @@ static void test_getstring_no_extra(void) LONG ret; HKEY hkey; HRESULT hr; - static const WCHAR dotWinetest[] = { + static const CHAR dotWinetest[] = { '.','w','i','n','e','t','e','s','t',0 }; - static const WCHAR winetestfile[] = { + static const CHAR winetestfile[] = { 'w','i','n','e','t','e','s','t', 'f','i','l','e',0 }; - static const WCHAR winetestfileAction[] = { + static const CHAR winetestfileAction[] = { 'w','i','n','e','t','e','s','t','f','i','l','e', '\\','s','h','e','l','l', '\\','f','o','o', '\\','c','o','m','m','a','n','d',0 }; - static const WCHAR action[] = { + static const CHAR action[] = { 'n','o','t','e','p','a','d','.','e','x','e',0 }; - WCHAR buf[MAX_PATH]; + CHAR buf[MAX_PATH]; DWORD len = MAX_PATH; - ret = RegCreateKeyW(HKEY_CLASSES_ROOT, dotWinetest, &hkey); - if (ret != ERROR_SUCCESS) + buf[0] = '\0'; + ret = RegCreateKeyA(HKEY_CLASSES_ROOT, dotWinetest, &hkey); + if (ret != ERROR_SUCCESS) { skip("failed to create dotWinetest key\n"); - ret = RegSetValueW(hkey, NULL, REG_SZ, winetestfile, - lstrlenW(winetestfile)); + return; + } + + ret = RegSetValueA(hkey, NULL, REG_SZ, winetestfile, lstrlenA(winetestfile)); RegCloseKey(hkey); if (ret != ERROR_SUCCESS) { - RegDeleteTreeW(HKEY_CLASSES_ROOT, dotWinetest); skip("failed to set dotWinetest key\n"); + goto cleanup; } - ret = RegCreateKeyW(HKEY_CLASSES_ROOT, winetestfileAction, &hkey); + ret = RegCreateKeyA(HKEY_CLASSES_ROOT, winetestfileAction, &hkey); if (ret != ERROR_SUCCESS) { - RegDeleteTreeW(HKEY_CLASSES_ROOT, dotWinetest); skip("failed to create winetestfileAction key\n"); + goto cleanup; } - ret = RegSetValueW(hkey, NULL, REG_SZ, action, lstrlenW(action)); + + ret = RegSetValueA(hkey, NULL, REG_SZ, action, lstrlenA(action)); RegCloseKey(hkey); if (ret != ERROR_SUCCESS) { - RegDeleteTreeW(HKEY_CLASSES_ROOT, dotWinetest); - RegDeleteTreeW(HKEY_CLASSES_ROOT, winetestfile); skip("failed to set winetestfileAction key\n"); + goto cleanup; } - hr = AssocQueryStringW(0, ASSOCSTR_EXECUTABLE, dotWinetest, NULL, - buf, &len); + hr = AssocQueryStringA(0, ASSOCSTR_EXECUTABLE, dotWinetest, NULL, buf, &len); expect_hr(S_OK, hr); - ok(strstrW(buf, action) != NULL, "exe path does not contain notepad\n"); - RegDeleteTreeW(HKEY_CLASSES_ROOT, dotWinetest); - RegDeleteTreeW(HKEY_CLASSES_ROOT, winetestfile); + ok(strstr(buf, action) != NULL, + "got '%s' (Expected result to include 'notepad.exe')\n", buf); + +cleanup: + SHDeleteKeyA(HKEY_CLASSES_ROOT, dotWinetest); + SHDeleteKeyA(HKEY_CLASSES_ROOT, winetestfile); + } START_TEST(assoc)

1 0

Vijay Kiran Kamuju : include: Add commctrl.rh.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 564dc2bfcca6c222f50dbb51b96df7b210a15d68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=564dc2bfcca6c222f50dbb51b… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Oct 17 12:35:37 2008 -0400 include: Add commctrl.rh. --- include/Makefile.in | 1 + include/commctrl.rh | 196 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/winresrc.h | 2 +- 3 files changed, 198 insertions(+), 1 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 453d528..d7e85f4 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -100,6 +100,7 @@ SRCDIR_INCLUDES = \ cierror.h \ clusapi.h \ commctrl.h \ + commctrl.rh \ commdlg.h \ compobj.h \ cor.h \ diff --git a/include/commctrl.rh b/include/commctrl.rh new file mode 100644 index 0000000..1f41cdb --- /dev/null +++ b/include/commctrl.rh @@ -0,0 +1,196 @@ +/* + * Copyright (C) 2008 Vijay Kiran Kamuju + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* Header Control */ +#define HDS_HORZ 0x0000 +#define HDS_BUTTONS 0x0002 +#define HDS_HOTTRACK 0x0004 +#define HDS_HIDDEN 0x0008 +#define HDS_DRAGDROP 0x0040 +#define HDS_FULLDRAG 0x0080 +#define HDS_FILTERBAR 0x0100 +#define HDS_FLAT 0x0200 + +/* Rebar Control */ +#define RBS_TOOLTIPS 0x0100 +#define RBS_VARHEIGHT 0x0200 +#define RBS_BANDBORDERS 0x0400 +#define RBS_FIXEDORDER 0x0800 +#define RBS_REGISTERDROP 0x1000 +#define RBS_AUTOSIZE 0x2000 +#define RBS_VERTICALGRIPPER 0x4000 +#define RBS_DBLCLKTOGGLE 0x8000 + +/*Tool tips */ +#define TTS_ALWAYSTIP 0x01 +#define TTS_NOPREFIX 0x02 +#define TTS_NOANIMATE 0x10 +#define TTS_NOFADE 0x20 +#define TTS_BALLOON 0x40 +#define TTS_CLOSE 0x80 + +/* Statusbar Control */ +#define SBARS_SIZEGRIP 0x0100 +#define SBARS_TOOLTIPS 0x0800 +#define SBT_TOOLTIPS 0x0800 + +/* Toolbar Control */ +#define TBS_BOTTOM 0x0000 +#define TBS_HORZ 0x0000 +#define TBS_RIGHT 0x0000 +#define TBS_AUTOTICKS 0x0001 +#define TBS_VERT 0x0002 +#define TBS_LEFT 0x0004 +#define TBS_TOP 0x0004 +#define TBS_BOTH 0x0008 +#define TBS_NOTICKS 0x0010 +#define TBS_ENABLESELRANGE 0x0020 +#define TBS_FIXEDLENGTH 0x0040 +#define TBS_NOTHUMB 0x0080 +#define TBS_TOOLTIPS 0x0100 +#define TBS_REVERSED 0x0200 +#define TBS_DOWNISLEFT 0x0400 + +/* UpDown Control */ +#define UDS_WRAP 0x0001 +#define UDS_SETBUDDYINT 0x0002 +#define UDS_ALIGNRIGHT 0x0004 +#define UDS_ALIGNLEFT 0x0008 +#define UDS_AUTOBUDDY 0x0010 +#define UDS_ARROWKEYS 0x0020 +#define UDS_HORZ 0x0040 +#define UDS_NOTHOUSANDS 0x0080 +#define UDS_HOTTRACK 0x0100 + +/* Progressbar Control */ +#define PBS_SMOOTH 0x01 +#define PBS_VERTICAL 0x04 + +/* Common Control Styles */ +#define CCS_TOP 0x00000001L +#define CCS_NOMOVE 0x00000002L +#define CCS_BOTTOM 0x00000003L +#define CCS_NORESIZE 0x00000004L +#define CCS_NOPARENTALIGN 0x00000008L +#define CCS_ADJUSTABLE 0x00000020L +#define CCS_NODIVIDER 0x00000040L +#define CCS_VERT 0x00000080L +#define CCS_LEFT (CCS_VERT | CCS_TOP) +#define CCS_RIGHT (CCS_VERT | CCS_BOTTOM) +#define CCS_NOMOVEX (CCS_VERT | CCS_NOMOVEY) + +/* Listview Control */ +#define LVS_ALIGNTOP 0x0000 +#define LVS_ICON 0x0000 +#define LVS_REPORT 0x0001 +#define LVS_SMALLICON 0x0002 +#define LVS_LIST 0x0003 +#define LVS_TYPEMASK 0x0003 +#define LVS_SINGLESEL 0x0004 +#define LVS_SHOWSELALWAYS 0x0008 +#define LVS_SORTASCENDING 0x0010 +#define LVS_SORTDESCENDING 0x0020 +#define LVS_SHAREIMAGELISTS 0x0040 +#define LVS_NOLABELWRAP 0x0080 +#define LVS_AUTOARRANGE 0x0100 +#define LVS_EDITLABELS 0x0200 +#define LVS_OWNERDRAWFIXED 0x0400 +#define LVS_ALIGNLEFT 0x0800 +#define LVS_ALIGNMASK 0x0c00 +#define LVS_OWNERDATA 0x1000 +#define LVS_NOSCROLL 0x2000 +#define LVS_NOCOLUMNHEADER 0x4000 +#define LVS_NOSORTHEADER 0x8000 +#define LVS_TYPESTYLEMASK 0xfc00 + +/* Treeview Control */ +#define TVS_HASBUTTONS 0x0001 +#define TVS_HASLINES 0x0002 +#define TVS_LINESATROOT 0x0004 +#define TVS_EDITLABELS 0x0008 +#define TVS_DISABLEDRAGDROP 0x0010 +#define TVS_SHOWSELALWAYS 0x0020 +#define TVS_RTLREADING 0x0040 +#define TVS_NOTOOLTIPS 0x0080 +#define TVS_CHECKBOXES 0x0100 +#define TVS_TRACKSELECT 0x0200 +#define TVS_SINGLEEXPAND 0x0400 +#define TVS_INFOTIP 0x0800 +#define TVS_FULLROWSELECT 0x1000 +#define TVS_NOSCROLL 0x2000 +#define TVS_NONEVENHEIGHT 0x4000 +#define TVS_NOHSCROLL 0x8000 + +/* Tab Control */ +#define TCS_RIGHTJUSTIFY 0x0000 +#define TCS_SINGLELINE 0x0000 +#define TCS_TABS 0x0000 +#define TCS_SCROLLOPPOSITE 0x0001 +#define TCS_BOTTOM 0x0002 +#define TCS_RIGHT 0x0002 +#define TCS_MULTISELECT 0x0004 +#define TCS_FLATBUTTONS 0x0008 +#define TCS_FORCEICONLEFT 0x0010 +#define TCS_FORCELABELLEFT 0x0020 +#define TCS_HOTTRACK 0x0040 +#define TCS_VERTICAL 0x0080 +#define TCS_BUTTONS 0x0100 +#define TCS_MULTILINE 0x0200 +#define TCS_FIXEDWIDTH 0x0400 +#define TCS_RAGGEDRIGHT 0x0800 +#define TCS_FOCUSONBUTTONDOWN 0x1000 +#define TCS_OWNERDRAWFIXED 0x2000 +#define TCS_TOOLTIPS 0x4000 +#define TCS_FOCUSNEVER 0x8000 + +/* Animate Control */ +#define ACS_CENTER 0x0001 +#define ACS_TRANSPARENT 0x0002 +#define ACS_AUTOPLAY 0x0004 +#define ACS_TIMER 0x0008 + +/* Month Calender Control */ +#define MCS_DAYSTATE 0x0001 +#define MCS_MULTISELECT 0x0002 +#define MCS_WEEKNUMBERS 0x0004 +#define MCS_NOTODAYCIRCLE 0x0008 +#define MCS_NOTODAY 0x0010 + +/* Datetime Control */ +#define DTS_SHORTDATEFORMAT 0x0000 +#define DTS_UPDOWN 0x0001 +#define DTS_SHOWNONE 0x0002 +#define DTS_LONGDATEFORMAT 0x0004 +#define DTS_TIMEFORMAT 0x0009 +#define DTS_SHORTDATECENTURYFORMAT 0x000C +#define DTS_APPCANPARSE 0x0010 +#define DTS_RIGHTALIGN 0x0020 + +/* Pager Control */ +#define PGS_VERT 0x00000000 +#define PGS_HORZ 0x00000001 +#define PGS_AUTOSCROLL 0x00000002 +#define PGS_DRAGNDROP 0x00000004 + +/* Native Font Control */ +#define NFS_EDIT 0x0001 +#define NFS_STATIC 0x0002 +#define NFS_LISTCOMBO 0x0004 +#define NFS_BUTTON 0x0008 +#define NFS_ALL 0x0010 +#define NFS_USEFONTASSOC 0x0020 diff --git a/include/winresrc.h b/include/winresrc.h index 380525c..688b922 100644 --- a/include/winresrc.h +++ b/include/winresrc.h @@ -36,7 +36,7 @@ #endif #include <winuser.rh> -/* FIXME: #include <commctrl.rh> */ +#include <commctrl.rh> /* FIXME: #include <dde.rh> */ /* FIXME: #include <winnt.rh> */ #include <dlgs.h>

1 0

James Hawkins : msi: Use the quoted part of the registry value when searching for a file or directory .
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 03282df13d69a11f0922f3691dbaa76802a61c75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03282df13d69a11f0922f3691… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Oct 20 04:20:46 2008 -0500 msi: Use the quoted part of the registry value when searching for a file or directory. --- dlls/msi/appsearch.c | 10 ++++++++-- dlls/msi/tests/package.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 1679d80..5f40ada 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -372,6 +372,7 @@ static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNAT 'S','i','g','n','a','t','u','r','e','_',' ','=',' ', '\'','%','s','\'',0}; LPWSTR keyPath = NULL, valueName = NULL; LPWSTR deformatted = NULL; + LPWSTR ptr = NULL, end; int root, type; HKEY rootKey, key = NULL; DWORD sz = 0, regType; @@ -444,13 +445,18 @@ static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNAT if (sz == 0) goto end; + if ((ptr = strchrW((LPWSTR)value, '"')) && (end = strchrW(++ptr, '"'))) + *end = '\0'; + else + ptr = (LPWSTR)value; + switch (type & 0x0f) { case msidbLocatorTypeDirectory: - rc = ACTION_SearchDirectory(package, sig, (LPWSTR)value, 0, appValue); + rc = ACTION_SearchDirectory(package, sig, ptr, 0, appValue); break; case msidbLocatorTypeFileName: - *appValue = app_search_file((LPWSTR)value, sig); + *appValue = app_search_file(ptr, sig); break; case msidbLocatorTypeRawValue: ACTION_ConvertRegValue(regType, value, sz, appValue); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 0e7a821..0f002a2 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -6254,6 +6254,14 @@ static void test_appsearch_reglocator(void) (const BYTE *)path, lstrlenA(path) + 1); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + sprintf(path, "\"%s\\FileName1\" -option", CURR_DIR); + res = RegSetValueExA(hklm, "value16", 0, REG_SZ, + (const BYTE *)path, lstrlenA(path) + 1); + + sprintf(path, "%s\\FileName1 -option", CURR_DIR); + res = RegSetValueExA(hklm, "value17", 0, REG_SZ, + (const BYTE *)path, lstrlenA(path) + 1); + hdb = create_package_db(); ok(hdb, "Expected a valid database handle\n"); @@ -6344,6 +6352,12 @@ static void test_appsearch_reglocator(void) r = add_appsearch_entry(hdb, "'SIGPROP28', 'NewSignature28'"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = add_appsearch_entry(hdb, "'SIGPROP29', 'NewSignature29'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = add_appsearch_entry(hdb, "'SIGPROP30', 'NewSignature30'"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = create_reglocator_table(hdb); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -6487,6 +6501,16 @@ static void test_appsearch_reglocator(void) r = add_reglocator_entry(hdb, str); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + /* HKLM, msidbLocatorTypeFile, file exists, in quotes */ + str = "'NewSignature29', 2, 'Software\\Wine', 'Value16', 1"; + r = add_reglocator_entry(hdb, str); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + /* HKLM, msidbLocatorTypeFile, file exists, no quotes */ + str = "'NewSignature30', 2, 'Software\\Wine', 'Value17', 1"; + r = add_reglocator_entry(hdb, str); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = create_signature_table(hdb); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -6523,6 +6547,14 @@ static void test_appsearch_reglocator(void) r = add_signature_entry(hdb, str); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + str = "'NewSignature29', 'FileName1', '', '', '', '', '', '', ''"; + r = add_signature_entry(hdb, str); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + str = "'NewSignature30', 'FileName1', '', '', '', '', '', '', ''"; + r = add_signature_entry(hdb, str); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + hpkg = package_from_db(hdb); ok(hpkg, "Expected a valid package handle\n"); @@ -6692,6 +6724,17 @@ static void test_appsearch_reglocator(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); + size = MAX_PATH; + sprintf(path, "%s\\FileName1", CURR_DIR); + r = MsiGetPropertyA(hpkg, "SIGPROP29", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); + + size = MAX_PATH; + r = MsiGetPropertyA(hpkg, "SIGPROP30", prop, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); + RegSetValueA(hklm, NULL, REG_SZ, "", 0); RegDeleteValueA(hklm, "Value1"); RegDeleteValueA(hklm, "Value2"); @@ -6708,6 +6751,8 @@ static void test_appsearch_reglocator(void) RegDeleteValueA(hklm, "Value13"); RegDeleteValueA(hklm, "Value14"); RegDeleteValueA(hklm, "Value15"); + RegDeleteValueA(hklm, "Value16"); + RegDeleteValueA(hklm, "Value17"); RegDeleteKeyA(hklm, ""); RegCloseKey(hklm);

1 0

James Hawkins : msi: Only check the file signature if the candidate file is not a directory.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 0ed516908b69aafc988a787a35f18b16c152d45a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ed516908b69aafc988a787a3… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Oct 20 04:20:30 2008 -0500 msi: Only check the file signature if the candidate file is not a directory. --- dlls/msi/appsearch.c | 19 +++++++++---------- dlls/msi/tests/package.c | 5 +---- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 79554db..74d072f 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -760,18 +760,17 @@ static UINT ACTION_RecurseSearchDirectory(MSIPACKAGE *package, LPWSTR *appValue, hFind = FindFirstFileW(buf, &findData); if (hFind != INVALID_HANDLE_VALUE) { - BOOL matches; - - /* assuming Signature can't contain wildcards for the file name, - * so don't bother with FindNextFileW here. - */ - rc = ACTION_FileMatchesSig(sig, &findData, buf, &matches); - if (rc == ERROR_SUCCESS && matches) + if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { - TRACE("found file, returning %s\n", debugstr_w(buf)); - *appValue = buf; - } + BOOL matches; + rc = ACTION_FileMatchesSig(sig, &findData, buf, &matches); + if (rc == ERROR_SUCCESS && matches) + { + TRACE("found file, returning %s\n", debugstr_w(buf)); + *appValue = buf; + } + } FindClose(hFind); } diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 30c9567..9911bd1 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -7163,10 +7163,7 @@ static void test_appsearch_drlocator(void) size = MAX_PATH; r = MsiGetPropertyA(hpkg, "SIGPROP6", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); - } + ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); size = MAX_PATH; sprintf(path, "%s\\one\\two\\three\\FileName2", CURR_DIR);

1 0

James Hawkins : msi: Strip the file off the parent path if it' s not a directory.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 7eba78dc7e19d9d9918f18c459407ba24bf3106b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eba78dc7e19d9d9918f18c45… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Oct 20 04:20:37 2008 -0500 msi: Strip the file off the parent path if it's not a directory. --- dlls/msi/appsearch.c | 6 ++++++ dlls/msi/tests/package.c | 5 +---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 74d072f..163ddf8 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -964,6 +964,12 @@ static UINT ACTION_AppSearchDr(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATU if (parent) { + if (!(GetFileAttributesW(parent) & FILE_ATTRIBUTE_DIRECTORY)) + { + PathRemoveFileSpecW(parent); + PathAddBackslashW(parent); + } + strcpyW(path, parent); strcatW(path, expanded); } diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 9911bd1..cc2b04a 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -7169,10 +7169,7 @@ static void test_appsearch_drlocator(void) sprintf(path, "%s\\one\\two\\three\\FileName2", CURR_DIR); r = MsiGetPropertyA(hpkg, "SIGPROP7", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); - } + ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); size = MAX_PATH; sprintf(path, "%s\\FileName3.dll", CURR_DIR);

1 0

James Hawkins : msi: Fix a copy and paste error.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 6df69c6aaa202a9a43acd1f0539a3d975aac2bc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6df69c6aaa202a9a43acd1f05… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Oct 20 04:20:40 2008 -0500 msi: Fix a copy and paste error. --- dlls/msi/appsearch.c | 8 ++++---- dlls/msi/tests/package.c | 5 +---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 163ddf8..1679d80 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -651,11 +651,11 @@ static UINT ACTION_FileVersionMatches(const MSISIGNATURE *sig, LPCWSTR filePath, HIWORD(sig->MinVersionLS), LOWORD(sig->MinVersionLS)); } - else if (info->dwFileVersionMS < sig->MinVersionMS - || (info->dwFileVersionMS == sig->MinVersionMS && - info->dwFileVersionLS < sig->MinVersionLS)) + else if (info->dwFileVersionMS > sig->MaxVersionMS + || (info->dwFileVersionMS == sig->MaxVersionMS && + info->dwFileVersionLS > sig->MaxVersionLS)) { - TRACE("Greater than minimum version %d.%d.%d.%d\n", + TRACE("Greater than maximum version %d.%d.%d.%d\n", HIWORD(sig->MaxVersionMS), LOWORD(sig->MaxVersionMS), HIWORD(sig->MaxVersionLS), diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index cc2b04a..0e7a821 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -7180,10 +7180,7 @@ static void test_appsearch_drlocator(void) size = MAX_PATH; r = MsiGetPropertyA(hpkg, "SIGPROP9", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); - } + ok(!lstrcmpA(prop, ""), "Expected \"\", got \"%s\"\n", prop); size = MAX_PATH; r = MsiGetPropertyA(hpkg, "SIGPROP10", prop, &size);

1 0

James Hawkins : msi: Only append a backslash to directories.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 4aca381ff77e538e539140d1b51106502752b7c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aca381ff77e538e539140d1b… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Oct 20 04:20:20 2008 -0500 msi: Only append a backslash to directories. --- dlls/msi/appsearch.c | 5 ++++- dlls/msi/tests/package.c | 10 ++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 55bc472..056cd24 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -837,6 +837,7 @@ static UINT ACTION_SearchDirectory(MSIPACKAGE *package, MSISIGNATURE *sig, LPCWSTR path, int depth, LPWSTR *appValue) { UINT rc; + DWORD attr; LPWSTR val = NULL; TRACE("%p, %p, %s, %d, %p\n", package, sig, debugstr_w(path), depth, @@ -881,7 +882,9 @@ static UINT ACTION_SearchDirectory(MSIPACKAGE *package, MSISIGNATURE *sig, } } - if (val && val[lstrlenW(val) - 1] != '\\') + attr = GetFileAttributesW(val); + if ((attr & FILE_ATTRIBUTE_DIRECTORY) && + val && val[lstrlenW(val) - 1] != '\\') { val = msi_realloc(val, (lstrlenW(val) + 2) * sizeof(WCHAR)); if (!val) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 288e227..981c39e 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -7135,10 +7135,7 @@ static void test_appsearch_drlocator(void) sprintf(path, "%s\\FileName1", CURR_DIR); r = MsiGetPropertyA(hpkg, "SIGPROP1", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); - } + ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); size = MAX_PATH; sprintf(path, "%s\\", CURR_DIR); @@ -7187,10 +7184,7 @@ static void test_appsearch_drlocator(void) sprintf(path, "%s\\FileName3.dll", CURR_DIR); r = MsiGetPropertyA(hpkg, "SIGPROP8", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); - } + ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); size = MAX_PATH; r = MsiGetPropertyA(hpkg, "SIGPROP9", prop, &size);

1 0

James Hawkins : msi: Append the next directory to search to the current directory when recursing .
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 1fb22654e4f0a3a724ebb7ef1503b6d991143364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fb22654e4f0a3a724ebb7ef1… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Oct 20 04:20:25 2008 -0500 msi: Append the next directory to search to the current directory when recursing. --- dlls/msi/appsearch.c | 27 ++++++++++++++++++++------- dlls/msi/tests/package.c | 5 +---- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 056cd24..79554db 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -731,15 +731,18 @@ static UINT ACTION_RecurseSearchDirectory(MSIPACKAGE *package, LPWSTR *appValue, WIN32_FIND_DATAW findData; UINT rc = ERROR_SUCCESS; size_t dirLen = lstrlenW(dir), fileLen = lstrlenW(sig->File); + WCHAR subpath[MAX_PATH]; WCHAR *buf; + static const WCHAR dot[] = {'.',0}; + static const WCHAR dotdot[] = {'.','.',0}; static const WCHAR starDotStarW[] = { '*','.','*',0 }; TRACE("Searching directory %s for file %s, depth %d\n", debugstr_w(dir), debugstr_w(sig->File), depth); if (depth < 0) - return ERROR_INVALID_PARAMETER; + return ERROR_SUCCESS; *appValue = NULL; /* We need the buffer in both paths below, so go ahead and allocate it @@ -772,7 +775,7 @@ static UINT ACTION_RecurseSearchDirectory(MSIPACKAGE *package, LPWSTR *appValue, FindClose(hFind); } - if (rc == ERROR_SUCCESS && !*appValue && depth > 0) + if (rc == ERROR_SUCCESS && !*appValue) { lstrcpyW(buf, dir); PathAddBackslashW(buf); @@ -781,18 +784,28 @@ static UINT ACTION_RecurseSearchDirectory(MSIPACKAGE *package, LPWSTR *appValue, hFind = FindFirstFileW(buf, &findData); if (hFind != INVALID_HANDLE_VALUE) { - if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY && + lstrcmpW(findData.cFileName, dot) && + lstrcmpW(findData.cFileName, dotdot)) + { + lstrcpyW(subpath, dir); + PathAppendW(subpath, findData.cFileName); rc = ACTION_RecurseSearchDirectory(package, appValue, sig, - findData.cFileName, - depth - 1); + subpath, depth - 1); + } while (rc == ERROR_SUCCESS && !*appValue && FindNextFileW(hFind, &findData) != 0) { + if (!lstrcmpW(findData.cFileName, dot) || + !lstrcmpW(findData.cFileName, dotdot)) + continue; + + lstrcpyW(subpath, dir); + PathAppendW(subpath, findData.cFileName); if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) rc = ACTION_RecurseSearchDirectory(package, appValue, - sig, findData.cFileName, - depth - 1); + sig, subpath, depth - 1); } FindClose(hFind); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 981c39e..30c9567 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -7158,10 +7158,7 @@ static void test_appsearch_drlocator(void) sprintf(path, "%s\\one\\two\\three\\FileName2", CURR_DIR); r = MsiGetPropertyA(hpkg, "SIGPROP5", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); - } + ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop); size = MAX_PATH; r = MsiGetPropertyA(hpkg, "SIGPROP6", prop, &size);

1 0

James Hawkins : msi: Simplify and clean up ACTION_RecurseSearchDirectory.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 2e17638dc4f63c03ac1f70908dd39ae6e801f392 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e17638dc4f63c03ac1f70908… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Oct 20 04:20:10 2008 -0500 msi: Simplify and clean up ACTION_RecurseSearchDirectory. --- dlls/msi/appsearch.c | 97 +++++++++++++++++++++++++------------------------ 1 files changed, 49 insertions(+), 48 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index d72edda..e2f03c6 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -727,13 +727,16 @@ static UINT ACTION_FileMatchesSig(const MSISIGNATURE *sig, static UINT ACTION_RecurseSearchDirectory(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATURE *sig, LPCWSTR dir, int depth) { - static const WCHAR starDotStarW[] = { '*','.','*',0 }; + HANDLE hFind; + WIN32_FIND_DATAW findData; UINT rc = ERROR_SUCCESS; size_t dirLen = lstrlenW(dir), fileLen = lstrlenW(sig->File); WCHAR *buf; + static const WCHAR starDotStarW[] = { '*','.','*',0 }; + TRACE("Searching directory %s for file %s, depth %d\n", debugstr_w(dir), - debugstr_w(sig->File), depth); + debugstr_w(sig->File), depth); if (depth < 0) return ERROR_INVALID_PARAMETER; @@ -744,62 +747,60 @@ static UINT ACTION_RecurseSearchDirectory(MSIPACKAGE *package, LPWSTR *appValue, * isn't backslash-terminated. */ buf = msi_alloc( (dirLen + max(fileLen, lstrlenW(starDotStarW)) + 2) * sizeof(WCHAR)); - if (buf) + if (!buf) + return ERROR_OUTOFMEMORY; + + lstrcpyW(buf, dir); + PathAddBackslashW(buf); + lstrcatW(buf, sig->File); + + hFind = FindFirstFileW(buf, &findData); + if (hFind != INVALID_HANDLE_VALUE) { - /* a depth of 0 implies we should search dir, so go ahead and search */ - HANDLE hFind; - WIN32_FIND_DATAW findData; - - memcpy(buf, dir, dirLen * sizeof(WCHAR)); - if (buf[dirLen - 1] != '\\') - buf[dirLen++ - 1] = '\\'; - memcpy(buf + dirLen, sig->File, (fileLen + 1) * sizeof(WCHAR)); + BOOL matches; + + /* assuming Signature can't contain wildcards for the file name, + * so don't bother with FindNextFileW here. + */ + rc = ACTION_FileMatchesSig(sig, &findData, buf, &matches); + if (rc == ERROR_SUCCESS && matches) + { + TRACE("found file, returning %s\n", debugstr_w(buf)); + *appValue = buf; + } + + FindClose(hFind); + } + + if (rc == ERROR_SUCCESS && !*appValue && depth > 0) + { + lstrcpyW(buf, dir); + PathAddBackslashW(buf); + lstrcatW(buf, starDotStarW); + hFind = FindFirstFileW(buf, &findData); if (hFind != INVALID_HANDLE_VALUE) { - BOOL matches; + if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + rc = ACTION_RecurseSearchDirectory(package, appValue, sig, + findData.cFileName, + depth - 1); - /* assuming Signature can't contain wildcards for the file name, - * so don't bother with FindNextFileW here. - */ - if (!(rc = ACTION_FileMatchesSig(sig, &findData, buf, &matches)) - && matches) - { - TRACE("found file, returning %s\n", debugstr_w(buf)); - *appValue = buf; - } - FindClose(hFind); - } - if (rc == ERROR_SUCCESS && !*appValue && depth > 0) - { - HANDLE hFind; - WIN32_FIND_DATAW findData; - - memcpy(buf, dir, dirLen * sizeof(WCHAR)); - if (buf[dirLen - 1] != '\\') - buf[dirLen++ - 1] = '\\'; - lstrcpyW(buf + dirLen, starDotStarW); - hFind = FindFirstFileW(buf, &findData); - if (hFind != INVALID_HANDLE_VALUE) + while (rc == ERROR_SUCCESS && !*appValue && + FindNextFileW(hFind, &findData) != 0) { if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - rc = ACTION_RecurseSearchDirectory(package, appValue, sig, - findData.cFileName, depth - 1); - while (rc == ERROR_SUCCESS && !*appValue && - FindNextFileW(hFind, &findData) != 0) - { - if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - rc = ACTION_RecurseSearchDirectory(package, appValue, - sig, findData.cFileName, depth - 1); - } - FindClose(hFind); + rc = ACTION_RecurseSearchDirectory(package, appValue, + sig, findData.cFileName, + depth - 1); } + + FindClose(hFind); } - if (!*appValue) - msi_free(buf); } - else - rc = ERROR_OUTOFMEMORY; + + if (!*appValue) + msi_free(buf); return rc; }

1 0