February 2015 - Wine-commits

Jonathan Vollebregt : reg: Add sane_path function to do preliminary key validation.
by Alexandre Julliard 23 Feb '15

23 Feb '15

1 0

Jonathan Vollebregt : reg: Add a check for multiple backslashes at the end of the key.
by Alexandre Julliard 23 Feb '15

23 Feb '15

Module: wine Branch: master Commit: 513505d6c4892bc276a5c2e780bf0f6cc2051416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=513505d6c4892bc276a5c2e78… Author: Jonathan Vollebregt <jnvsor(a)gmail.com> Date: Thu Feb 19 13:19:11 2015 +0100 reg: Add a check for multiple backslashes at the end of the key. --- programs/reg/reg.c | 8 ++++++++ programs/reg/tests/reg.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index ffcbd4a..0fd579c 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -181,6 +181,14 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r static BOOL sane_path(const WCHAR *key) { + unsigned int i = strlenW(key); + + if (i < 3 || (key[i - 1] == '\\' && key[i - 2] == '\\')) + { + reg_message(STRING_INVALID_KEY); + return FALSE; + } + if (key[0] == '\\' && key[1] == '\\' && key[2] != '\\') { reg_message(STRING_NO_REMOTE); diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index b7605e4..dbfce89 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -129,10 +129,10 @@ static void test_add(void) ok(err == ERROR_FILE_NOT_FOUND, "got exit code %d\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest2\\\\ /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest2"); - todo_wine ok(err == ERROR_FILE_NOT_FOUND || broken(err == ERROR_SUCCESS /* WinXP */), + ok(err == ERROR_FILE_NOT_FOUND || broken(err == ERROR_SUCCESS /* WinXP */), "got exit code %d\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest3\\ /f", &r);

1 0

Jonathan Vollebregt : reg: Add wchar/type conversion functions.
by Alexandre Julliard 23 Feb '15

23 Feb '15

1 0

Austin English : shlwapi: Sync wsprintf implementation from user32.
by Alexandre Julliard 23 Feb '15

23 Feb '15

Module: wine Branch: master Commit: 1b698ccd59887c80f65b315193dc789ab0bf7586 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b698ccd59887c80f65b31519… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 23 04:25:16 2015 -0600 shlwapi: Sync wsprintf implementation from user32. --- dlls/shlwapi/wsprintf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/wsprintf.c b/dlls/shlwapi/wsprintf.c index 56eea41..6a36b6a 100644 --- a/dlls/shlwapi/wsprintf.c +++ b/dlls/shlwapi/wsprintf.c @@ -327,7 +327,7 @@ INT WINAPI wvnsprintfA( LPSTR buffer, INT maxlen, LPCSTR spec, __ms_va_list args WPRINTF_FORMAT format; LPSTR p = buffer; UINT i, len, sign; - CHAR number[20]; + CHAR number[21]; /* 64bit number can be 18446744073709551616 which is 20 chars. and a \0 */ WPRINTF_DATA argData; TRACE("%p %u %s\n", buffer, maxlen, debugstr_a(spec)); @@ -434,7 +434,7 @@ INT WINAPI wvnsprintfW( LPWSTR buffer, INT maxlen, LPCWSTR spec, __ms_va_list ar WPRINTF_FORMAT format; LPWSTR p = buffer; UINT i, len, sign; - CHAR number[20]; + CHAR number[21]; /* 64bit number can be 18446744073709551616 which is 20 chars. and a \0 */ WPRINTF_DATA argData; TRACE("%p %u %s\n", buffer, maxlen, debugstr_w(spec));

1 0

Jacek Caban : mshtml: Added OLECMDID_COPY implementation.
by Alexandre Julliard 23 Feb '15

23 Feb '15

Module: wine Branch: master Commit: 3f158bf29d9e034dfd6bc1c4a96d5052d3642f41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f158bf29d9e034dfd6bc1c4a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 23 13:25:51 2015 +0100 mshtml: Added OLECMDID_COPY implementation. --- dlls/mshtml/olecmd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index f4bf002..901bb78 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -355,8 +355,10 @@ static HRESULT exec_cut(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, V static HRESULT exec_copy(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { - FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut); - return E_NOTIMPL; + TRACE("(%p)->(%d %s %p)\n", This, nCmdexecopt, debugstr_variant(pvaIn), pvaOut); + + do_ns_command(This, NSCMD_COPY, NULL); + return S_OK; } static HRESULT exec_paste(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut)

1 0

Jacek Caban : mshtml: Share OLECMDID_SELECTALL implementation with IDM_SELECTALL.
by Alexandre Julliard 23 Feb '15

23 Feb '15

Module: wine Branch: master Commit: 17c91f607c51fb31d4932c1407ae531abebab805 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17c91f607c51fb31d4932c140… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 23 13:26:01 2015 +0100 mshtml: Share OLECMDID_SELECTALL implementation with IDM_SELECTALL. --- dlls/mshtml/editor.c | 24 ------------------------ dlls/mshtml/olecmd.c | 24 +++++++++++++++++++++--- 2 files changed, 21 insertions(+), 27 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index b059a95..8166094 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -60,7 +60,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NSCMD_OL "cmd_ol" #define NSCMD_OUTDENT "cmd_outdent" #define NSCMD_PASTE "cmd_paste" -#define NSCMD_SELECTALL "cmd_selectAll" #define NSCMD_SELECTBEGINLINE "cmd_selectBeginLine" #define NSCMD_SELECTBOTTOM "cmd_selectBottom" #define NSCMD_SELECTCHARNEXT "cmd_selectCharNext" @@ -651,20 +650,6 @@ static HRESULT exec_font(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARI return E_NOTIMPL; } -static HRESULT exec_selectall(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) -{ - TRACE("(%p)\n", This); - - if(in || out) - FIXME("unsupported args\n"); - - if(This->doc_obj->nscontainer) - do_ns_command(This, NSCMD_SELECTALL, NULL); - - update_doc(This, UPDATE_UI); - return S_OK; -} - static HRESULT exec_bold(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { TRACE("(%p)\n", This); @@ -1208,19 +1193,10 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, return hres; } -static HRESULT query_selall_status(HTMLDocument *This, OLECMD *cmd) -{ - TRACE("(%p)->(%p)\n", This, cmd); - - cmd->cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; - return S_OK; -} - const cmdtable_t editmode_cmds[] = { {IDM_DELETE, query_edit_status, exec_delete}, {IDM_FONTNAME, query_edit_status, exec_fontname}, {IDM_FONTSIZE, query_edit_status, exec_fontsize}, - {IDM_SELECTALL, query_selall_status , exec_selectall}, {IDM_FORECOLOR, query_edit_status, exec_forecolor}, {IDM_BOLD, query_edit_status, exec_bold}, {IDM_ITALIC, query_edit_status, exec_italic}, diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 901bb78..fc2a6ac 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -38,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NSCMD_COPY "cmd_copy" +#define NSCMD_SELECTALL "cmd_selectAll" void do_ns_command(HTMLDocument *This, const char *cmd, nsICommandParams *nsparam) { @@ -385,10 +386,18 @@ static HRESULT exec_rendo(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, return E_NOTIMPL; } -static HRESULT exec_select_all(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +static HRESULT exec_select_all(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *in, VARIANT *out) { - FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut); - return E_NOTIMPL; + TRACE("(%p)\n", This); + + if(in || out) + FIXME("unsupported args\n"); + + if(This->doc_obj->nscontainer) + do_ns_command(This, NSCMD_SELECTALL, NULL); + + update_doc(This, UPDATE_UI); + return S_OK; } static HRESULT exec_clear_selection(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) @@ -641,6 +650,14 @@ static HRESULT exec_mshtml_paste(HTMLDocument *This, DWORD cmdexecopt, VARIANT * return S_OK; } +static HRESULT query_selall_status(HTMLDocument *This, OLECMD *cmd) +{ + TRACE("(%p)->(%p)\n", This, cmd); + + cmd->cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + return S_OK; +} + static HRESULT exec_browsemode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { WARN("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); @@ -759,6 +776,7 @@ static const cmdtable_t base_cmds[] = { {IDM_COPY, query_mshtml_copy, exec_mshtml_copy}, {IDM_PASTE, query_mshtml_paste, exec_mshtml_paste}, {IDM_CUT, query_mshtml_cut, exec_mshtml_cut}, + {IDM_SELECTALL, query_selall_status, exec_select_all}, {IDM_BROWSEMODE, NULL, exec_browsemode}, {IDM_EDITMODE, NULL, exec_editmode}, {IDM_PRINT, query_enabled_stub, exec_print},

1 0

Thomas Faber : wbemprox: Allocate a large enough buffer in get_computername.
by Alexandre Julliard 23 Feb '15

23 Feb '15

Module: wine Branch: master Commit: 42825cdc146873a5dd804e33a58d84baa0c25068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42825cdc146873a5dd804e33a… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Feb 22 21:17:46 2015 +0100 wbemprox: Allocate a large enough buffer in get_computername. --- dlls/wbemprox/builtin.c | 2 +- dlls/wbemprox/tests/query.c | 51 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 16c58a8..6ead196 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1121,7 +1121,7 @@ static UINT64 get_total_physical_memory(void) static WCHAR *get_computername(void) { WCHAR *ret; - DWORD size = MAX_COMPUTERNAME_LENGTH; + DWORD size = MAX_COMPUTERNAME_LENGTH + 1; if (!(ret = heap_alloc( size * sizeof(WCHAR) ))) return NULL; GetComputerNameW( ret, &size ); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 467a63c..bdac50d 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -341,6 +341,56 @@ static void test_Win32_Process( IWbemServices *services ) IWbemClassObject_Release( out ); } +static void test_Win32_ComputerSystem( IWbemServices *services ) +{ + static const WCHAR nameW[] = {'N','a','m','e',0}; + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'C','o','m','p','u','t','e','r','S','y','s','t','e','m',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + IEnumWbemClassObject *result; + IWbemClassObject *service; + VARIANT value; + CIMTYPE type; + HRESULT hr; + WCHAR compname[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD len, count; + + len = sizeof(compname) / sizeof(compname[0]); + if (!GetComputerNameW( compname, &len )) + compname[0] = 0; + + if (!compname[0]) + { + skip( "Failed to get computer name\n" ); + return; + } + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + if (hr != S_OK) + { + win_skip( "Win32_ComputerSystem not available\n" ); + return; + } + + IEnumWbemClassObject_Next( result, 10000, 1, &service, &count ); + ok( hr == S_OK, "got %08x\n", hr ); + + type = 0xdeadbeef; + VariantInit( &value ); + hr = IWbemClassObject_Get( service, nameW, 0, &value, &type, NULL ); + ok( hr == S_OK, "failed to get computer name %08x\n", hr ); + ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + ok( !lstrcmpiW( V_BSTR( &value ), compname ), "got %s, expected %s\n", wine_dbgstr_w(V_BSTR(&value)), wine_dbgstr_w(compname) ); + VariantClear( &value ); + + IWbemClassObject_Release( service ); + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void test_StdRegProv( IWbemServices *services ) { static const WCHAR enumkeyW[] = {'E','n','u','m','K','e','y',0}; @@ -756,6 +806,7 @@ START_TEST(query) test_select( services ); test_Win32_Process( services ); test_Win32_Service( services ); + test_Win32_ComputerSystem( services ); test_StdRegProv( services ); test_notification_query_async( services ); test_query_async( services );

1 0

Thomas Faber : wbemprox: Implement Win32_ComputerSystem.UserName.
by Alexandre Julliard 23 Feb '15

23 Feb '15

Module: wine Branch: master Commit: 00b2461ba98a7006bdd43ec2bf0c70412d8c3561 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00b2461ba98a7006bdd43ec2b… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Feb 22 22:23:12 2015 +0100 wbemprox: Implement Win32_ComputerSystem.UserName. --- dlls/wbemprox/builtin.c | 25 ++++++++++++++++++++++++- dlls/wbemprox/tests/query.c | 22 ++++++++++++++++++++-- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 6ead196..e9c95ac 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -306,6 +306,8 @@ static const WCHAR prop_typeW[] = {'T','y','p','e',0}; static const WCHAR prop_uniqueidW[] = {'U','n','i','q','u','e','I','d',0}; +static const WCHAR prop_usernameW[] = + {'U','s','e','r','N','a','m','e',0}; static const WCHAR prop_uuidW[] = {'U','U','I','D',0}; static const WCHAR prop_varianttypeW[] = @@ -358,7 +360,8 @@ static const struct column col_compsys[] = { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_numlogicalprocessorsW, CIM_UINT32, VT_I4 }, { prop_numprocessorsW, CIM_UINT32, VT_I4 }, - { prop_totalphysicalmemoryW, CIM_UINT64 } + { prop_totalphysicalmemoryW, CIM_UINT64 }, + { prop_usernameW, CIM_STRING } }; static const struct column col_compsysproduct[] = { @@ -705,6 +708,7 @@ struct record_computersystem UINT32 num_logical_processors; UINT32 num_processors; UINT64 total_physical_memory; + const WCHAR *username; }; struct record_computersystemproduct { @@ -1128,6 +1132,24 @@ static WCHAR *get_computername(void) return ret; } +static WCHAR *get_username(void) +{ + WCHAR *ret; + DWORD compsize, usersize; + DWORD size; + + compsize = 0; + GetComputerNameW( NULL, &compsize ); + usersize = 0; + GetUserNameW( NULL, &usersize ); + size = compsize + usersize; /* two null terminators account for the \ */ + if (!(ret = heap_alloc( size * sizeof(WCHAR) ))) return NULL; + GetComputerNameW( ret, &compsize ); + ret[compsize] = '\\'; + GetUserNameW( ret + compsize + 1, &usersize ); + return ret; +} + static enum fill_status fill_compsys( struct table *table, const struct expr *cond ) { struct record_computersystem *rec; @@ -1146,6 +1168,7 @@ static enum fill_status fill_compsys( struct table *table, const struct expr *co rec->num_logical_processors = get_logical_processor_count( NULL ); rec->num_processors = get_processor_count(); rec->total_physical_memory = get_total_physical_memory(); + rec->username = get_username(); if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index bdac50d..7e031d2 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -344,6 +344,8 @@ static void test_Win32_Process( IWbemServices *services ) static void test_Win32_ComputerSystem( IWbemServices *services ) { static const WCHAR nameW[] = {'N','a','m','e',0}; + static const WCHAR usernameW[] = {'U','s','e','r','N','a','m','e',0}; + static const WCHAR backslashW[] = {'\\',0}; static const WCHAR queryW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', 'C','o','m','p','u','t','e','r','S','y','s','t','e','m',0}; @@ -354,15 +356,22 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) CIMTYPE type; HRESULT hr; WCHAR compname[MAX_COMPUTERNAME_LENGTH + 1]; + WCHAR username[128]; DWORD len, count; len = sizeof(compname) / sizeof(compname[0]); if (!GetComputerNameW( compname, &len )) compname[0] = 0; - if (!compname[0]) + lstrcpyW( username, compname ); + lstrcatW( username, backslashW ); + len = sizeof(username) / sizeof(username[0]) - lstrlenW( username ); + if (!GetUserNameW( username + lstrlenW( username ), &len )) + username[0] = 0; + + if (!compname[0] || !username[0]) { - skip( "Failed to get computer name\n" ); + skip( "Failed to get user or computer name\n" ); return; } @@ -385,6 +394,15 @@ static void test_Win32_ComputerSystem( IWbemServices *services ) ok( !lstrcmpiW( V_BSTR( &value ), compname ), "got %s, expected %s\n", wine_dbgstr_w(V_BSTR(&value)), wine_dbgstr_w(compname) ); VariantClear( &value ); + type = 0xdeadbeef; + VariantInit( &value ); + hr = IWbemClassObject_Get( service, usernameW, 0, &value, &type, NULL ); + ok( hr == S_OK, "failed to get computer name %08x\n", hr ); + ok( V_VT( &value ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &value ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + ok( !lstrcmpiW( V_BSTR( &value ), username ), "got %s, expected %s\n", wine_dbgstr_w(V_BSTR(&value)), wine_dbgstr_w(username) ); + VariantClear( &value ); + IWbemClassObject_Release( service ); IEnumWbemClassObject_Release( result ); SysFreeString( query );

1 0

Thomas Faber : wbemprox: Implement MSVC version of do_cpuid.
by Alexandre Julliard 23 Feb '15

23 Feb '15

Module: wine Branch: master Commit: b7664e603bd6f937542c260ad2d35742c77c6293 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7664e603bd6f937542c260ad… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Feb 22 21:20:25 2015 +0100 wbemprox: Implement MSVC version of do_cpuid. --- dlls/wbemprox/builtin.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index e9c95ac..3548c61 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2074,6 +2074,9 @@ done: static inline void do_cpuid( unsigned int ax, unsigned int *p ) { #ifdef __i386__ +#ifdef _MSC_VER + __cpuid(p, ax); +#else __asm__("pushl %%ebx\n\t" "cpuid\n\t" "movl %%ebx, %%esi\n\t" @@ -2081,6 +2084,7 @@ static inline void do_cpuid( unsigned int ax, unsigned int *p ) : "=a" (p[0]), "=S" (p[1]), "=c" (p[2]), "=d" (p[3]) : "0" (ax)); #endif +#endif } static void get_processor_id( WCHAR *processor_id )

1 0

André Hentschel : taskmgr: Remove dead code.
by Alexandre Julliard 23 Feb '15

23 Feb '15

Module: wine Branch: master Commit: 68d85cc7f8004c7d08584336ba24b18bf908ff9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=68d85cc7f8004c7d08584336b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Feb 21 14:58:27 2015 +0100 taskmgr: Remove dead code. --- programs/taskmgr/taskmgr.c | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index b876cbf..80dc81c 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -184,26 +184,13 @@ static BOOL OnCreate(HWND hWnd) GetClientRect(hWnd, &rc); nOldWidth = rc.right; nOldHeight = rc.bottom; - /* nOldStartX = rc.left; */ - /*nOldStartY = rc.top; */ - -#define PAGE_OFFSET_LEFT 17 -#define PAGE_OFFSET_TOP 72 -#define PAGE_OFFSET_WIDTH (PAGE_OFFSET_LEFT*2) -#define PAGE_OFFSET_HEIGHT (PAGE_OFFSET_TOP+32) if ((TaskManagerSettings.Left != 0) || (TaskManagerSettings.Top != 0) || (TaskManagerSettings.Right != 0) || (TaskManagerSettings.Bottom != 0)) - { MoveWindow(hWnd, TaskManagerSettings.Left, TaskManagerSettings.Top, TaskManagerSettings.Right - TaskManagerSettings.Left, TaskManagerSettings.Bottom - TaskManagerSettings.Top, TRUE); -#ifdef __GNUC__TEST__ - MoveWindow(hApplicationPage, TaskManagerSettings.Left + PAGE_OFFSET_LEFT, TaskManagerSettings.Top + PAGE_OFFSET_TOP, TaskManagerSettings.Right - TaskManagerSettings.Left - PAGE_OFFSET_WIDTH, TaskManagerSettings.Bottom - TaskManagerSettings.Top - PAGE_OFFSET_HEIGHT, FALSE); - MoveWindow(hProcessPage, TaskManagerSettings.Left + PAGE_OFFSET_LEFT, TaskManagerSettings.Top + PAGE_OFFSET_TOP, TaskManagerSettings.Right - TaskManagerSettings.Left - PAGE_OFFSET_WIDTH, TaskManagerSettings.Bottom - TaskManagerSettings.Top - PAGE_OFFSET_HEIGHT, FALSE); - MoveWindow(hPerformancePage, TaskManagerSettings.Left + PAGE_OFFSET_LEFT, TaskManagerSettings.Top + PAGE_OFFSET_TOP, TaskManagerSettings.Right - TaskManagerSettings.Left - PAGE_OFFSET_WIDTH, TaskManagerSettings.Bottom - TaskManagerSettings.Top - PAGE_OFFSET_HEIGHT, FALSE); -#endif - } + if (TaskManagerSettings.Maximized) ShowWindow(hWnd, SW_MAXIMIZE); @@ -297,19 +284,6 @@ static BOOL OnCreate(HWND hWnd) return TRUE; } -/* OnMove() - * This function handles all the moving events for the application - * It moves every child window that needs moving - */ -static void OnMove( UINT nType, int cx, int cy ) -{ -#ifdef __GNUC__TEST__ - MoveWindow(hApplicationPage, TaskManagerSettings.Left + PAGE_OFFSET_LEFT, TaskManagerSettings.Top + PAGE_OFFSET_TOP, TaskManagerSettings.Right - TaskManagerSettings.Left - PAGE_OFFSET_WIDTH, TaskManagerSettings.Bottom - TaskManagerSettings.Top - PAGE_OFFSET_HEIGHT, FALSE); - MoveWindow(hProcessPage, TaskManagerSettings.Left + PAGE_OFFSET_LEFT, TaskManagerSettings.Top + PAGE_OFFSET_TOP, TaskManagerSettings.Right - TaskManagerSettings.Left - PAGE_OFFSET_WIDTH, TaskManagerSettings.Bottom - TaskManagerSettings.Top - PAGE_OFFSET_HEIGHT, FALSE); - MoveWindow(hPerformancePage, TaskManagerSettings.Left + PAGE_OFFSET_LEFT, TaskManagerSettings.Top + PAGE_OFFSET_TOP, TaskManagerSettings.Right - TaskManagerSettings.Left - PAGE_OFFSET_WIDTH, TaskManagerSettings.Bottom - TaskManagerSettings.Top - PAGE_OFFSET_HEIGHT, FALSE); -#endif -} - /* OnSize() * This function handles all the sizing events for the application * It re-sizes every window, and child window that needs re-sizing @@ -1011,11 +985,6 @@ TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) OnSize(wParam, LOWORD(lParam), HIWORD(lParam)); break; - case WM_MOVE: - /* Handle the window moving in its own function */ - OnMove(wParam, LOWORD(lParam), HIWORD(lParam)); - break; - case WM_DESTROY: ShowWindow(hDlg, SW_HIDE); TrayIcon_ShellRemoveTrayIcon();

1 0