January 2009 - Wine-commits

Alexandre Julliard : mshtml: Fix pointer cast warnings on 64-bit.
by Alexandre Julliard 09 Jan '09

09 Jan '09

Module: wine Branch: master Commit: c9ee551efd6f1f9892d96de2a972b3d6592d2411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9ee551efd6f1f9892d96de2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 17:26:38 2009 +0100 mshtml: Fix pointer cast warnings on 64-bit. --- dlls/mshtml/protocol.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 8483600..e5e22da 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -647,7 +647,7 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, LPWSTR endpoint = NULL; DWORD file_id = strtolW(url_file, &endpoint, 10); if(endpoint == url_file+strlenW(url_file)) - src = FindResourceW(hdll, (LPCWSTR)file_id, (LPCWSTR)RT_HTML); + src = FindResourceW(hdll, MAKEINTRESOURCEW(file_id), MAKEINTRESOURCEW(RT_HTML)); if(!src) { WARN("Could not find resource\n");

1 0

Alexandre Julliard : msi: Fix pointer cast warnings on 64-bit.
by Alexandre Julliard 09 Jan '09

09 Jan '09

Module: wine Branch: master Commit: 81ecd7041a97beb97e58d569125bd4e95b3ff671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81ecd7041a97beb97e58d5691… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 17:26:44 2009 +0100 msi: Fix pointer cast warnings on 64-bit. --- dlls/msi/automation.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 3b01266..6668b17 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1731,9 +1731,9 @@ static HRESULT WINAPI InstallerImpl_Invoke( if (V_I4(&varg0) >= REG_INDEX_CLASSES_ROOT && V_I4(&varg0) <= REG_INDEX_DYN_DATA) - V_I4(&varg0) |= (UINT)HKEY_CLASSES_ROOT; + V_I4(&varg0) |= (UINT_PTR)HKEY_CLASSES_ROOT; - ret = RegOpenKeyW((HKEY)V_I4(&varg0), V_BSTR(&varg1), &hkey); + ret = RegOpenKeyW((HKEY)(UINT_PTR)V_I4(&varg0), V_BSTR(&varg1), &hkey); /* Third parameter can be VT_EMPTY, VT_I4, or VT_BSTR */ switch (V_VT(&varg2))

1 0

Alexandre Julliard : advapi32: Fix pointer cast warnings on 64-bit.
by Alexandre Julliard 09 Jan '09

09 Jan '09

Module: wine Branch: master Commit: b88554d22f81e77c1f8f84fe67f7c2b08144d1aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b88554d22f81e77c1f8f84fe6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 17:26:18 2009 +0100 advapi32: Fix pointer cast warnings on 64-bit. --- dlls/advapi32/registry.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 6615bc0..52de6c5 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(reg); #define HKEY_SPECIAL_ROOT_FIRST HKEY_CLASSES_ROOT #define HKEY_SPECIAL_ROOT_LAST HKEY_DYN_DATA -#define NB_SPECIAL_ROOT_KEYS ((UINT)HKEY_SPECIAL_ROOT_LAST - (UINT)HKEY_SPECIAL_ROOT_FIRST + 1) +#define NB_SPECIAL_ROOT_KEYS ((UINT_PTR)HKEY_SPECIAL_ROOT_LAST - (UINT_PTR)HKEY_SPECIAL_ROOT_FIRST + 1) static HKEY special_root_keys[NB_SPECIAL_ROOT_KEYS]; static BOOL hkcu_cache_disabled;

1 0

Jeremy Newman : use {$root} template var for relative paths
by Jeremy Newman 08 Jan '09

08 Jan '09

Module: website Branch: master Commit: 7e9f6f41d5d7a3c09baa05c60b6120072dd1dec1 URL: http://source.winehq.org/git/website.git/?a=commit;h=7e9f6f41d5d7a3c09baa05… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 8 12:20:01 2009 -0600 use {$root} template var for relative paths --- wwn/en/wn20081007_353.xml | 476 ++++++++++++++++++++++---------------------- wwn/en/wn20081209_354.xml | 492 ++++++++++++++++++++++---------------------- 2 files changed, 484 insertions(+), 484 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=7e9f6f41d5d7a3c09b…

1 0

Jeremy Newman : fix for prev/next news page links
by Jeremy Newman 08 Jan '09

08 Jan '09

Module: website Branch: master Commit: aed971d3bd679f5dd5d7fc8e296bc0d6b4c39a50 URL: http://source.winehq.org/git/website.git/?a=commit;h=aed971d3bd679f5dd5d7fc… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 8 11:14:24 2009 -0600 fix for prev/next news page links --- include/plugins/news.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/plugins/news.php b/include/plugins/news.php index bda5eef..2606b4e 100644 --- a/include/plugins/news.php +++ b/include/plugins/news.php @@ -13,7 +13,7 @@ global $html, $config; switch (true) { // single issue view - case (defined('PAGE_PARAMS') and preg_match("/[0-9]+/", PAGE_PARAMS)): + case (defined('PAGE_PARAMS') and preg_match("/[0-9]{10}/", PAGE_PARAMS)): // get data from XML file $item = PAGE_PARAMS . '.xml'; $vars = array();

1 0

Jeremy Newman : fix old announce URLs
by Jeremy Newman 08 Jan '09

08 Jan '09

Module: website Branch: master Commit: 9f696588a8d1d6984905798011b764b8a566bff9 URL: http://source.winehq.org/git/website.git/?a=commit;h=9f696588a8d1d698490579… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 8 10:49:54 2009 -0600 fix old announce URLs --- site | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/site b/site index 209c6b8..69da02c 100644 --- a/site +++ b/site @@ -91,6 +91,13 @@ if (defined("PAGE") and PAGE == "home") $html->redirect("{$config->base_url}interview/{$_GET['interview']}"); exit(); } + + // fix old announce URLS + if (isset($_GET['announce']) and (intval($_GET['announce']) > 0 or $_GET['announce'] == 'latest')) + { + $html->redirect("{$config->base_url}announce/{$_GET['announce']}"); + exit(); + } } // loag page content

1 0

Francois Gouget : ole32: Don' t use the default debug channel before it has been defined.
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: ad587aa036f975cf4585cfef9278c2d49fada605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad587aa036f975cf4585cfef9… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 8 14:15:32 2009 +0100 ole32: Don't use the default debug channel before it has been defined. --- dlls/ole32/clipboard.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index a358654..8cfaffc 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -80,9 +80,10 @@ #include "compobj_private.h" +WINE_DEFAULT_DEBUG_CHANNEL(ole); + #define HANDLE_ERROR(err) do { hr = err; TRACE("(HRESULT=%x)\n", (HRESULT)err); goto CLEANUP; } while (0) -WINE_DEFAULT_DEBUG_CHANNEL(ole); /**************************************************************************** * OLEClipbrd

1 0

Francois Gouget : winhlp32: Make some functions static in winhelp.c.
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: 7d81ca1c3158d6f384a06828c6f2558f18d8c701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d81ca1c3158d6f384a06828c… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 8 14:13:30 2009 +0100 winhlp32: Make some functions static in winhelp.c. --- programs/winhlp32/winhelp.c | 6 +++--- programs/winhlp32/winhelp.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index ebcd7c9..7cb4a12 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -194,7 +194,7 @@ BOOL WINHELP_GetOpenFileName(LPSTR lpszFile, int len) * * WINHELP_MessageBoxIDS_s */ -INT WINHELP_MessageBoxIDS_s(UINT ids_text, LPCSTR str, UINT ids_title, WORD type) +static INT WINHELP_MessageBoxIDS_s(UINT ids_text, LPCSTR str, UINT ids_title, WORD type) { CHAR text[MAX_STRING_LEN]; CHAR newtext[MAX_STRING_LEN + MAX_PATH]; @@ -1164,7 +1164,7 @@ struct index_data * WINHELP_IndexDlgProc * */ -INT_PTR CALLBACK WINHELP_IndexDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK WINHELP_IndexDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { static struct index_data* id; int sel; @@ -1232,7 +1232,7 @@ INT_PTR CALLBACK WINHELP_IndexDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM * WINHELP_SearchDlgProc * */ -INT_PTR CALLBACK WINHELP_SearchDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK WINHELP_SearchDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { static struct index_data* id; diff --git a/programs/winhlp32/winhelp.h b/programs/winhlp32/winhelp.h index f06b082..feaf637 100644 --- a/programs/winhlp32/winhelp.h +++ b/programs/winhlp32/winhelp.h @@ -149,7 +149,6 @@ BOOL WINHELP_OpenHelpWindow(HLPFILE_PAGE* (*)(HLPFILE*, LONG, ULONG*), BOOL WINHELP_GetOpenFileName(LPSTR, int); BOOL WINHELP_CreateIndexWindow(BOOL); void WINHELP_DeleteBackSet(WINHELP_WINDOW*); -INT WINHELP_MessageBoxIDS_s(UINT, LPCSTR, UINT, WORD); HLPFILE* WINHELP_LookupHelpFile(LPCSTR lpszFile); HLPFILE_WINDOWINFO* WINHELP_GetWindowInfo(HLPFILE* hlpfile, LPCSTR name); void WINHELP_LayoutMainWindow(WINHELP_WINDOW* win);

1 0

Paul Vriens : wintrust/tests: Add a few tests.
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: 5bfed84410ef6c359fb107f3a87c75ddf46abd89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bfed84410ef6c359fb107f3a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jan 7 22:25:28 2009 +0100 wintrust/tests: Add a few tests. --- dlls/wintrust/tests/crypt.c | 62 +++++++++++++++++++++++++++++++++++++----- 1 files changed, 54 insertions(+), 8 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index f9a57af..b1b7bc5 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -29,6 +29,8 @@ static char selfname[MAX_PATH]; static CHAR CURR_DIR[MAX_PATH]; +static CHAR catroot[MAX_PATH]; +static CHAR catroot2[MAX_PATH]; /* * Minimalistic catalog file. To reconstruct, save text below as winetest.cdf, @@ -123,7 +125,7 @@ static void test_context(void) BOOL ret; HCATADMIN hca; static GUID unknown = { 0xC689AABA, 0x8E78, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; /* WINTRUST.DLL */ - CHAR windir[MAX_PATH], catroot[MAX_PATH], catroot2[MAX_PATH], dummydir[MAX_PATH]; + CHAR dummydir[MAX_PATH]; DWORD attrs; /* When CryptCATAdminAcquireContext is successful it will create @@ -208,12 +210,6 @@ static void test_context(void) ok(ret, "Expected success\n"); ok(hca != NULL, "Expected a context handle, got NULL\n"); - GetWindowsDirectoryA(windir, MAX_PATH); - lstrcpyA(catroot, windir); - lstrcatA(catroot, "\\system32\\CatRoot"); - lstrcpyA(catroot2, windir); - lstrcatA(catroot2, "\\system32\\CatRoot2"); - attrs = GetFileAttributes(catroot); ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected the CatRoot directory to exist\n"); @@ -354,14 +350,18 @@ static void test_calchash(void) static void test_CryptCATAdminAddRemoveCatalog(void) { static WCHAR basenameW[] = {'w','i','n','e','t','e','s','t','.','c','a','t',0}; + static CHAR basename[] = "winetest.cat"; HCATADMIN hcatadmin; HCATINFO hcatinfo; CATALOG_INFO info; WCHAR tmpfileW[MAX_PATH]; char tmpfile[MAX_PATH]; + char catfile[MAX_PATH], catfilepath[MAX_PATH], *p; + WCHAR catfileW[MAX_PATH]; HANDLE file; DWORD error, written; BOOL ret; + DWORD attrs; if (!pCryptCATAdminRemoveCatalog) { @@ -419,22 +419,61 @@ static void test_CryptCATAdminAddRemoveCatalog(void) WriteFile(file, test_catalog, sizeof(test_catalog), &written, NULL); CloseHandle(file); + /* Unique name will be created */ hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, tmpfileW, NULL, 0); todo_wine ok(hcatinfo != NULL, "CryptCATAdminAddCatalog failed %u\n", GetLastError()); + info.cbStruct = sizeof(info); + info.wszCatalogFile[0] = 0; + ret = pCryptCATCatalogInfoFromContext(hcatinfo, &info, 0); + todo_wine + { + ok(ret, "CryptCATCatalogInfoFromContext failed %u\n", GetLastError()); + ok(info.wszCatalogFile[0] != 0, "Expected a filename\n"); + } + WideCharToMultiByte(CP_ACP, 0, info.wszCatalogFile, -1, catfile, MAX_PATH, 0, 0); + if ((p = strrchr(catfile, '\\'))) p++; + MultiByteToWideChar(0, 0, p, -1, catfileW, MAX_PATH); + + /* winetest.cat will be created */ hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, tmpfileW, basenameW, 0); ok(hcatinfo != NULL, "CryptCATAdminAddCatalog failed %u\n", GetLastError()); + lstrcpyA(catfilepath, catroot); + lstrcatA(catfilepath, "\\{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF}\\winetest.cat"); + attrs = GetFileAttributes(catfilepath); + ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected %s to exist\n", catfilepath); + info.cbStruct = sizeof(info); info.wszCatalogFile[0] = 0; ret = pCryptCATCatalogInfoFromContext(hcatinfo, &info, 0); ok(ret, "CryptCATCatalogInfoFromContext failed %u\n", GetLastError()); + ok(info.wszCatalogFile[0] != 0, "Expected a filename\n"); + WideCharToMultiByte(CP_ACP, 0, info.wszCatalogFile, -1, catfile, MAX_PATH, 0, 0); + if ((p = strrchr(catfile, '\\'))) p++; + ok(!lstrcmpA(basename, p), "Expected %s, got %s\n", basename, p); ret = pCryptCATAdminReleaseCatalogContext(hcatadmin, hcatinfo, 0); ok(ret, "CryptCATAdminReleaseCatalogContext failed %u\n", GetLastError()); - ret = pCryptCATAdminRemoveCatalog(hcatadmin, tmpfileW, 0); + /* Remove the catalog file with the unique name */ + ret = pCryptCATAdminRemoveCatalog(hcatadmin, catfileW, 0); + todo_wine + ok(ret, "CryptCATAdminRemoveCatalog failed %u\n", GetLastError()); + + /* Remove the winetest.cat catalog file, first with the full path. This should not succeed + * according to MSDN */ + ret = pCryptCATAdminRemoveCatalog(hcatadmin, info.wszCatalogFile, 0); + ok(ret, "CryptCATAdminRemoveCatalog failed %u\n", GetLastError()); + /* The call succeeds but the file is not removed */ + attrs = GetFileAttributes(catfilepath); + todo_wine + ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected %s to exist\n", catfilepath); + ret = pCryptCATAdminRemoveCatalog(hcatadmin, basenameW, 0); + todo_wine ok(ret, "CryptCATAdminRemoveCatalog failed %u\n", GetLastError()); + attrs = GetFileAttributes(catfilepath); + ok(attrs == INVALID_FILE_ATTRIBUTES, "Expected %s to be removed\n", catfilepath); ret = pCryptCATAdminReleaseContext(hcatadmin, 0); ok(ret, "CryptCATAdminReleaseContext failed %u\n", GetLastError()); @@ -506,6 +545,7 @@ START_TEST(crypt) { int myARGC; char** myARGV; + char windir[MAX_PATH]; InitFunctionPtrs(); @@ -515,6 +555,12 @@ START_TEST(crypt) return; } + GetWindowsDirectoryA(windir, MAX_PATH); + lstrcpyA(catroot, windir); + lstrcatA(catroot, "\\system32\\CatRoot"); + lstrcpyA(catroot2, windir); + lstrcatA(catroot2, "\\system32\\CatRoot2"); + myARGC = winetest_get_mainargs(&myARGV); strcpy(selfname, myARGV[0]);

1 0

Paul Vriens : wintrust: Fix removing a catalog file.
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: 00ed4057b50f3794a9308036715ae857928b3784 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ed4057b50f3794a93080367… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jan 8 13:36:42 2009 +0100 wintrust: Fix removing a catalog file. --- dlls/wintrust/crypt.c | 27 ++++++++++++++++++++++++++- dlls/wintrust/tests/crypt.c | 7 +++---- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 99989fd..8049f33 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -471,7 +471,32 @@ BOOL WINAPI CryptCATAdminRemoveCatalog(HCATADMIN hCatAdmin, LPCWSTR pwszCatalogF SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - return DeleteFileW(pwszCatalogFile); + + /* Only delete when there is a filename and no path */ + if (pwszCatalogFile && pwszCatalogFile[0] != 0 && + !strchrW(pwszCatalogFile, '\\') && !strchrW(pwszCatalogFile, '/') && + !strchrW(pwszCatalogFile, ':')) + { + static const WCHAR slashW[] = {'\\',0}; + WCHAR *target; + DWORD len; + + len = strlenW(ca->path) + strlenW(pwszCatalogFile) + 2; + if (!(target = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + strcpyW(target, ca->path); + strcatW(target, slashW); + strcatW(target, pwszCatalogFile); + + DeleteFileW(target); + + HeapFree(GetProcessHeap(), 0, target); + } + + return TRUE; } /*********************************************************************** diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index b1b7bc5..383fe8b 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -433,6 +433,7 @@ static void test_CryptCATAdminAddRemoveCatalog(void) } WideCharToMultiByte(CP_ACP, 0, info.wszCatalogFile, -1, catfile, MAX_PATH, 0, 0); if ((p = strrchr(catfile, '\\'))) p++; + memset(catfileW, 0, sizeof(catfileW)); MultiByteToWideChar(0, 0, p, -1, catfileW, MAX_PATH); /* winetest.cat will be created */ @@ -458,19 +459,17 @@ static void test_CryptCATAdminAddRemoveCatalog(void) /* Remove the catalog file with the unique name */ ret = pCryptCATAdminRemoveCatalog(hcatadmin, catfileW, 0); - todo_wine ok(ret, "CryptCATAdminRemoveCatalog failed %u\n", GetLastError()); /* Remove the winetest.cat catalog file, first with the full path. This should not succeed * according to MSDN */ ret = pCryptCATAdminRemoveCatalog(hcatadmin, info.wszCatalogFile, 0); ok(ret, "CryptCATAdminRemoveCatalog failed %u\n", GetLastError()); - /* The call succeeds but the file is not removed */ + /* The call succeeded with the full path but the file is not removed */ attrs = GetFileAttributes(catfilepath); - todo_wine ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected %s to exist\n", catfilepath); + /* Given only the filename the file is removed */ ret = pCryptCATAdminRemoveCatalog(hcatadmin, basenameW, 0); - todo_wine ok(ret, "CryptCATAdminRemoveCatalog failed %u\n", GetLastError()); attrs = GetFileAttributes(catfilepath); ok(attrs == INVALID_FILE_ATTRIBUTES, "Expected %s to be removed\n", catfilepath);

1 0