February 2009 - Wine-Commits

Francois Gouget : rsaenh: {alloc,release}_handle_table() are not used so remove them.
by Alexandre Julliard Feb. 5, 2009

Feb. 5, 2009

Module: wine Branch: master Commit: d13fed31fd4d9d15373048491f7fd7079b964a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d13fed31fd4d9d15373048491… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 5 00:13:33 2009 +0100 rsaenh: {alloc,release}_handle_table() are not used so remove them. --- dlls/rsaenh/handle.c | 84 +------------------------------------------------- dlls/rsaenh/handle.h | 2 - 2 files changed, 1 insertions(+), 85 deletions(-) diff --git a/dlls/rsaenh/handle.c b/dlls/rsaenh/handle.c index 0773813..672c296 100644 --- a/dlls/rsaenh/handle.c +++ b/dlls/rsaenh/handle.c @@ -44,10 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(handle); * lpTable [I] Pointer to the HANDLETABLE structure, which is to be initalized. * * NOTES - * Note that alloc_handle_table calls init_handle_table on it's own, which - * means that you only have to call init_handle_table, if you use a global - * variable of type HANDLETABLE for your handle table. However, in this - * case you have to call destroy_handle_table when you don't need the table + * You have to call destroy_handle_table when you don't need the table * any more. */ void init_handle_table(HANDLETABLE *lpTable) @@ -68,9 +65,6 @@ void init_handle_table(HANDLETABLE *lpTable) * * PARAMS * lpTable [I] Pointer to the handle table, which is to be destroyed. - * - * NOTES - * Note that release_handle_table takes care of this. */ void destroy_handle_table(HANDLETABLE *lpTable) { @@ -124,82 +118,6 @@ exit: } /****************************************************************************** - * release_all_handles - * - * Releases all valid handles in the given handle table and shrinks the table - * to zero size. - * - * PARAMS - * lpTable [I] The table of which all valid handles shall be released. - */ -static void release_all_handles(HANDLETABLE *lpTable) -{ - unsigned int i; - - TRACE("(lpTable=%p)\n", lpTable); - - EnterCriticalSection(&lpTable->mutex); - for (i=0; i<lpTable->iEntries; i++) - if (lpTable->paEntries[i].pObject) - release_handle(lpTable, lpTable->paEntries[i].pObject->dwType, INDEX2HANDLE(i)); - LeaveCriticalSection(&lpTable->mutex); -} - -/****************************************************************************** - * alloc_handle_table - * - * Allocates a new handle table - * - * PARAMS - * lplpTable [O] Pointer to the variable, to which the pointer to the newly - * allocated handle table is written. - * RETURNS - * non zero, if successful - * zero, if not successful (out of process heap memory) - * - * NOTES - * If all you need is a single handle table, you may as well declare a global - * variable of type HANDLETABLE and call init_handle_table on your own. - */ -int alloc_handle_table(HANDLETABLE **lplpTable) -{ - TRACE("(lplpTable=%p)\n", lplpTable); - - *lplpTable = HeapAlloc(GetProcessHeap(), 0, sizeof(HANDLETABLE)); - if (*lplpTable) - { - init_handle_table(*lplpTable); - return 1; - } - else - return 0; -} - -/****************************************************************************** - * release_handle_table - * - * Releases a handle table and frees the resources it used. - * - * PARAMS - * lpTable [I] Pointer to the handle table, which is to be released. - * - * RETURNS - * non zero, if successful - * zero, if not successful - * - * NOTES - * All valid handles still in the table are released also. - */ -int release_handle_table(HANDLETABLE *lpTable) -{ - TRACE("(lpTable=%p)\n", lpTable); - - release_all_handles(lpTable); - destroy_handle_table(lpTable); - return HeapFree(GetProcessHeap(), 0, lpTable); -} - -/****************************************************************************** * grow_handle_table [Internal] * * Grows the number of entries in the given table by TABLE_SIZE_INCREMENT diff --git a/dlls/rsaenh/handle.h b/dlls/rsaenh/handle.h index d17afad..1d7b927 100644 --- a/dlls/rsaenh/handle.h +++ b/dlls/rsaenh/handle.h @@ -56,9 +56,7 @@ typedef struct tagHANDLETABLE CRITICAL_SECTION mutex; } HANDLETABLE; -int alloc_handle_table (HANDLETABLE **lplpTable); void init_handle_table (HANDLETABLE *lpTable); -int release_handle_table(HANDLETABLE *lpTable); void destroy_handle_table(HANDLETABLE *lpTable); int release_handle (HANDLETABLE *lpTable, HCRYPTKEY handle, DWORD dwType); int copy_handle (HANDLETABLE *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy);

1 0

Francois Gouget : taskmgr: Make TrayIcon_GetProcessorUsageIcon() static.
by Alexandre Julliard Feb. 5, 2009

Feb. 5, 2009

Module: wine Branch: master Commit: 678a0e1eb5fb035e474f1b2103c87fe78505011b URL: http://source.winehq.org/git/wine.git/?a=commit;h=678a0e1eb5fb035e474f1b210… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 5 00:19:35 2009 +0100 taskmgr: Make TrayIcon_GetProcessorUsageIcon() static. --- programs/taskmgr/taskmgr.h | 1 - programs/taskmgr/trayicon.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/taskmgr/taskmgr.h b/programs/taskmgr/taskmgr.h index 59a23e2..f6df582 100644 --- a/programs/taskmgr/taskmgr.h +++ b/programs/taskmgr/taskmgr.h @@ -176,7 +176,6 @@ void ProcessPage_OnDebugChannels(void); #define WM_ONTRAYICON WM_USER + 5 -HICON TrayIcon_GetProcessorUsageIcon(void); BOOL TrayIcon_ShellAddTrayIcon(void); BOOL TrayIcon_ShellRemoveTrayIcon(void); BOOL TrayIcon_ShellUpdateTrayIcon(void); diff --git a/programs/taskmgr/trayicon.c b/programs/taskmgr/trayicon.c index 36a2bcc..35740dd 100644 --- a/programs/taskmgr/trayicon.c +++ b/programs/taskmgr/trayicon.c @@ -33,7 +33,7 @@ #include "taskmgr.h" #include "perfdata.h" -HICON TrayIcon_GetProcessorUsageIcon(void) +static HICON TrayIcon_GetProcessorUsageIcon(void) { HICON hTrayIcon = NULL; HDC hScreenDC = NULL;

1 0

Francois Gouget : taskmgr: Reorder some functions to avoid forward declarations in graphctl.c.
by Alexandre Julliard Feb. 5, 2009

Feb. 5, 2009

Module: wine Branch: master Commit: 07ccd5a36da0fab8380cb015055f07a5e353f4fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=07ccd5a36da0fab8380cb0150… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 5 00:10:52 2009 +0100 taskmgr: Reorder some functions to avoid forward declarations in graphctl.c. --- programs/taskmgr/graphctl.c | 238 +++++++++++++++++++++--------------------- programs/taskmgr/graphctl.h | 4 - 2 files changed, 119 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07ccd5a36da0fab8380cb…

1 0

Francois Gouget : taskmgr: Reorder some functions to avoid forward declarations in applpage.c.
by Alexandre Julliard Feb. 5, 2009

Feb. 5, 2009

Module: wine Branch: master Commit: 097863ba4665370df83a2239cc6e834b39aa9911 URL: http://source.winehq.org/git/wine.git/?a=commit;h=097863ba4665370df83a2239c… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 5 00:10:41 2009 +0100 taskmgr: Reorder some functions to avoid forward declarations in applpage.c. --- programs/taskmgr/applpage.c | 260 +++++++++++++++++++++--------------------- programs/taskmgr/taskmgr.h | 1 - 2 files changed, 130 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=097863ba4665370df83a2…

1 0

Francois Gouget : shell32/tests: Remove spaces before a '\n's.
by Alexandre Julliard Feb. 5, 2009

Feb. 5, 2009

Module: wine Branch: master Commit: fb3f3b88ac0f8cea327dd57eaa62862691e8f8d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb3f3b88ac0f8cea327dd57ea… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 5 00:10:35 2009 +0100 shell32/tests: Remove spaces before a '\n's. --- dlls/shell32/tests/shlfolder.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 9d563e0..b8a78f8 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -96,7 +96,7 @@ static void test_ParseDisplayName(void) hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, cTestDirW, NULL, &newPIDL, 0); todo_wine ok((SUCCEEDED(hr) || broken(hr == E_FAIL) /* NT4 */), - "ParseDisplayName returned %08x, expected SUCCESS or E_FAIL \n", hr); + "ParseDisplayName returned %08x, expected SUCCESS or E_FAIL\n", hr); if (SUCCEEDED(hr)) { ok(pILFindLastID(newPIDL)->mkid.abID[0] == 0x61, "Last pidl should be of type " @@ -108,7 +108,7 @@ static void test_ParseDisplayName(void) hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, cTestDirW, NULL, &newPIDL, 0); todo_wine ok((SUCCEEDED(hr) || broken(hr == E_FAIL) /* NT4 */), - "ParseDisplayName returned %08x, expected SUCCESS or E_FAIL \n", hr); + "ParseDisplayName returned %08x, expected SUCCESS or E_FAIL\n", hr); if (SUCCEEDED(hr)) { ok(pILFindLastID(newPIDL)->mkid.abID[0] == 0x61, "Last pidl should be of type "

1 0

Detlef Riekenberg : winspool: Enable environment "Windows x64" for Win64.
by Alexandre Julliard Feb. 5, 2009

Feb. 5, 2009

Module: wine Branch: master Commit: c0e11f663b0009c52e349426ea4f69855466a2c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0e11f663b0009c52e349426e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Feb 4 23:25:36 2009 +0100 winspool: Enable environment "Windows x64" for Win64. --- dlls/winspool.drv/info.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 6212cc8..bc688f4 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -195,8 +195,10 @@ static const WCHAR WinNT_CV_PrinterPortsW[] = { 'S','o','f','t','w','a','r','e', static const WCHAR DefaultEnvironmentW[] = {'W','i','n','e',0}; static const WCHAR envname_win40W[] = {'W','i','n','d','o','w','s',' ','4','.','0',0}; +static const WCHAR envname_x64W[] = {'W','i','n','d','o','w','s',' ','x','6','4',0}; static const WCHAR envname_x86W[] = {'W','i','n','d','o','w','s',' ','N','T',' ','x','8','6',0}; static const WCHAR subdir_win40W[] = {'w','i','n','4','0',0}; +static const WCHAR subdir_x64W[] = {'x','6','4',0}; static const WCHAR subdir_x86W[] = {'w','3','2','x','8','6',0}; static const WCHAR Version0_RegPathW[] = {'\\','V','e','r','s','i','o','n','-','0',0}; static const WCHAR Version0_SubdirW[] = {'\\','0',0}; @@ -283,12 +285,14 @@ static const DWORD pi_sizeof[] = {0, sizeof(PRINTER_INFO_1W), sizeof(PRINTER_INF static const printenv_t * validate_envW(LPCWSTR env) { + static const printenv_t env_x64 = {envname_x64W, subdir_x64W, + 3, Version3_RegPathW, Version3_SubdirW}; static const printenv_t env_x86 = {envname_x86W, subdir_x86W, 3, Version3_RegPathW, Version3_SubdirW}; static const printenv_t env_win40 = {envname_win40W, subdir_win40W, 0, Version0_RegPathW, Version0_SubdirW}; - static const printenv_t * const all_printenv[]={&env_x86, &env_win40}; + static const printenv_t * const all_printenv[]={&env_x86, &env_x64, &env_win40}; const printenv_t *result = NULL; unsigned int i;

1 0

Francois Gouget : twain_32/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard Feb. 5, 2009

Feb. 5, 2009

Module: wine Branch: master Commit: ad5b8e5d1ead2ea5b2f7f9b0b3e6eec050241fcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad5b8e5d1ead2ea5b2f7f9b0b… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 5 00:10:29 2009 +0100 twain_32/tests: Add a trailing '\n' to ok() calls. --- dlls/twain_32/tests/dsm.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index 8f8e926..78b4c85 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -180,7 +180,7 @@ static void test_onevalue_cap(TW_IDENTITY *appid, TW_IDENTITY *source, TW_UINT16 "Error [rc %d|cc %d] doing MSG_QUERYSUPPORT for type 0x%x\n", rc, status.ConditionCode, captype); if (rc != TWRC_SUCCESS) return; - ok(get_onevalue(cap.hContainer, (TW_UINT32 *) &actual_support, NULL), "Returned cap.hContainer invalid for QuerySupport on type 0x%x", captype); + ok(get_onevalue(cap.hContainer, (TW_UINT32 *) &actual_support, NULL), "Returned cap.hContainer invalid for QuerySupport on type 0x%x\n", captype); ok(actual_support == expected_support, "Error: expected support 0x%x for type 0x%x, got 0x%x\n", expected_support, captype, actual_support); @@ -198,7 +198,7 @@ static void test_onevalue_cap(TW_IDENTITY *appid, TW_IDENTITY *source, TW_UINT16 "Error [rc %d|cc %d] doing MSG_GETCURRENT for type 0x%x\n", rc, status.ConditionCode, captype); if (rc == TWRC_SUCCESS) { - ok(get_onevalue(cap.hContainer, &orig_value, &rtype), "Returned cap.hContainer invalid for GETCURRENT on type 0x%x", captype); + ok(get_onevalue(cap.hContainer, &orig_value, &rtype), "Returned cap.hContainer invalid for GETCURRENT on type 0x%x\n", captype); ok(rtype == type, "Returned GETCURRENT type 0x%x for cap 0x%x is not expected 0x%x\n", rtype, captype, type); GlobalFree(cap.hContainer); } @@ -216,7 +216,7 @@ static void test_onevalue_cap(TW_IDENTITY *appid, TW_IDENTITY *source, TW_UINT16 "Error [rc %d|cc %d] doing MSG_GETDEFAULT for type 0x%x\n", rc, status.ConditionCode, captype); if (rc == TWRC_SUCCESS) { - ok(get_onevalue(cap.hContainer, &default_value, &rtype), "Returned cap.hContainer invalid for GETDEFAULT on type 0x%x", captype); + ok(get_onevalue(cap.hContainer, &default_value, &rtype), "Returned cap.hContainer invalid for GETDEFAULT on type 0x%x\n", captype); ok(rtype == type, "Returned GETDEFAULT type 0x%x for cap 0x%x is not expected 0x%x\n", rtype, captype, type); GlobalFree(cap.hContainer); }

1 0

Detlef Riekenberg : localspl: Enable environment "Windows x64" for Win64.
by Alexandre Julliard Feb. 5, 2009

Feb. 5, 2009

Module: wine Branch: master Commit: 71c27c99d44d4f1285166c29b113e723690f1100 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71c27c99d44d4f1285166c29b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Feb 4 23:28:30 2009 +0100 localspl: Enable environment "Windows x64" for Win64. --- dlls/localspl/localspl_main.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/localspl/localspl_main.c b/dlls/localspl/localspl_main.c index 7137d97..18b51ac 100644 --- a/dlls/localspl/localspl_main.c +++ b/dlls/localspl/localspl_main.c @@ -129,6 +129,8 @@ static const WCHAR win40_subdirW[] = {'w','i','n','4','0',0}; static const WCHAR version0_regpathW[] = {'\\','V','e','r','s','i','o','n','-','0',0}; static const WCHAR version0_subdirW[] = {'\\','0',0}; +static const WCHAR x64_envnameW[] = {'W','i','n','d','o','w','s',' ','x','6','4',0}; +static const WCHAR x64_subdirW[] = {'x','6','4',0}; static const WCHAR x86_envnameW[] = {'W','i','n','d','o','w','s',' ','N','T',' ','x','8','6',0}; static const WCHAR x86_subdirW[] = {'w','3','2','x','8','6',0}; static const WCHAR version3_regpathW[] = {'\\','V','e','r','s','i','o','n','-','3',0}; @@ -138,10 +140,13 @@ static const WCHAR version3_subdirW[] = {'\\','3',0}; static const printenv_t env_x86 = {x86_envnameW, x86_subdirW, 3, version3_regpathW, version3_subdirW}; +static const printenv_t env_x64 = {x64_envnameW, x64_subdirW, 3, + version3_regpathW, version3_subdirW}; + static const printenv_t env_win40 = {win40_envnameW, win40_subdirW, 0, version0_regpathW, version0_subdirW}; -static const printenv_t * const all_printenv[] = {&env_x86, &env_win40}; +static const printenv_t * const all_printenv[] = {&env_x86, &env_x64, &env_win40}; static const DWORD di_sizeof[] = {0, sizeof(DRIVER_INFO_1W), sizeof(DRIVER_INFO_2W),

1 0

Detlef Riekenberg : winspool/tests: Run more tests on Win64.
by Alexandre Julliard Feb. 5, 2009

Feb. 5, 2009

Module: wine Branch: master Commit: 1693cd1c5df08f87b40aa99bc079b62608fd3afb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1693cd1c5df08f87b40aa99bc… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Feb 4 23:16:28 2009 +0100 winspool/tests: Run more tests on Win64. --- dlls/winspool.drv/tests/info.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index fb6dc40..1e47983 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -41,6 +41,7 @@ static CHAR does_not_exist_dll[]= "does_not_exist.dll"; static CHAR does_not_exist[] = "does_not_exist"; static CHAR empty[] = ""; +static CHAR env_x64[] = "Windows x64"; static CHAR env_x86[] = "Windows NT x86"; static CHAR env_win9x_case[] = "windowS 4.0"; static CHAR illegal_name[] = "illegal,name"; @@ -176,6 +177,7 @@ static struct monitor_entry * find_installed_monitor(void) static struct monitor_entry monitor_table[] = { {env_win9x_case, "localspl.dll"}, {env_x86, "localspl.dll"}, + {env_x64, "localspl.dll"}, {env_win9x_case, "localmon.dll"}, {env_x86, "localmon.dll"}, {env_win9x_case, "tcpmon.dll"}, @@ -196,6 +198,7 @@ static struct monitor_entry * find_installed_monitor(void) num_tests = (sizeof(monitor_table)/sizeof(struct monitor_entry)); /* cleanup */ + DeleteMonitorA(NULL, env_x64, winetest); DeleteMonitorA(NULL, env_x86, winetest); DeleteMonitorA(NULL, env_win9x_case, winetest);

1 0

Andrew Talbot : dbghelp: Remove unused function.
by Alexandre Julliard Feb. 5, 2009

Feb. 5, 2009

Module: wine Branch: master Commit: 5b60142f948fa0c1fe3564f882dca83f1f1c5408 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b60142f948fa0c1fe3564f88… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Feb 4 20:39:36 2009 +0000 dbghelp: Remove unused function. --- dlls/dbghelp/dbghelp_private.h | 1 - dlls/dbghelp/storage.c | 12 ------------ 2 files changed, 0 insertions(+), 13 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 77fb47e..0345a3f 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -92,7 +92,6 @@ void hash_table_init(struct pool* pool, struct hash_table* ht, unsigned num_buckets); void hash_table_destroy(struct hash_table* ht); void hash_table_add(struct hash_table* ht, struct hash_table_elt* elt); -void* hash_table_find(const struct hash_table* ht, const char* name); struct hash_table_iter { diff --git a/dlls/dbghelp/storage.c b/dlls/dbghelp/storage.c index 23a45e1..d3f5949 100644 --- a/dlls/dbghelp/storage.c +++ b/dlls/dbghelp/storage.c @@ -396,18 +396,6 @@ void hash_table_add(struct hash_table* ht, struct hash_table_elt* elt) ht->num_elts++; } -void* hash_table_find(const struct hash_table* ht, const char* name) -{ - unsigned hash = hash_table_hash(name, ht->num_buckets); - struct hash_table_elt* elt; - - if(!ht->buckets) return NULL; - - for (elt = ht->buckets[hash]; elt; elt = elt->next) - if (!strcmp(name, elt->name)) return elt; - return NULL; -} - void hash_table_iter_init(const struct hash_table* ht, struct hash_table_iter* hti, const char* name) {

1 0