winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
June 2009
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
5 participants
1115 discussions
Start a n
N
ew thread
Aric Stewart : wintrust: Stub WTHelperCertCheckValidSignature.
by Alexandre Julliard
24 Jun '09
24 Jun '09
Module: wine Branch: master Commit: 2dca912aa9504fd5acdc78ed12bec50d2f473307 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2dca912aa9504fd5acdc78ed1…
Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 24 16:45:00 2009 +0900 wintrust: Stub WTHelperCertCheckValidSignature. --- dlls/wintrust/wintrust.spec | 1 + dlls/wintrust/wintrust_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 602d4bd..64c51e2 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -73,6 +73,7 @@ @ stub TrustFreeDecode @ stdcall TrustIsCertificateSelfSigned(ptr) @ stub TrustOpenStores +@ stdcall WTHelperCertCheckValidSignature(ptr) @ stub WTHelperCertFindIssuerCertificate @ stub WTHelperCertIsSelfSigned @ stub WTHelperCheckCertUsage diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 0a40fba..c61f6e0 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -1085,3 +1085,12 @@ BOOL WINAPI OpenPersonalTrustDBDialog(HWND hwnd) uiCertMgr.pszInitUsageOID = NULL; return CryptUIDlgCertMgr(&uiCertMgr); } + +/*********************************************************************** + * WTHelperCertCheckValidSignature + */ +HRESULT WINAPI WTHelperCertCheckValidSignature(CRYPT_PROVIDER_DATA *pProvData) +{ + FIXME("Stub\n"); + return S_OK; +}
1
0
0
0
Paul Vriens : crypt32/tests: Fix some test failures on Win9x.
by Alexandre Julliard
24 Jun '09
24 Jun '09
Module: wine Branch: master Commit: 92ec4d5d0db60773df63b7f05cdd3e3d3410d1e3 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=92ec4d5d0db60773df63b7f05…
Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jun 24 08:32:49 2009 +0200 crypt32/tests: Fix some test failures on Win9x. --- dlls/crypt32/tests/encode.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index e23c559..9babafd 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -5521,7 +5521,9 @@ static void test_decodeCTL(DWORD dwEncoding) ret = pCryptDecodeObjectEx(dwEncoding, PKCS_CTL, ctlWithBogusEntry, sizeof(ctlWithBogusEntry), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); ok(!ret && - (GetLastError() == CRYPT_E_ASN1_EOD || GetLastError() == CRYPT_E_ASN1_CORRUPT), + (GetLastError() == CRYPT_E_ASN1_EOD || + GetLastError() == CRYPT_E_ASN1_CORRUPT || + GetLastError() == OSS_MORE_INPUT), /* Win9x */ "expected CRYPT_E_ASN1_EOD or CRYPT_E_ASN1_CORRUPT, got %08x\n", GetLastError()); info.SubjectAlgorithm.Parameters.cbData = 0;
1
0
0
0
Paul Vriens : crypt32/tests: Fix a test failure on Win9x.
by Alexandre Julliard
24 Jun '09
24 Jun '09
Module: wine Branch: master Commit: c7105f82eed36fd16ee82d73771775e29eb1ec5e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c7105f82eed36fd16ee82d737…
Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jun 24 08:32:20 2009 +0200 crypt32/tests: Fix a test failure on Win9x. --- dlls/crypt32/tests/cert.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 1b60b80..415f9c7 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1854,7 +1854,9 @@ static void testSignAndEncodeCert(void) ret = CryptSignAndEncodeCertificate(0, 0, X509_ASN_ENCODING, X509_CERT_TO_BE_SIGNED, &info, &algID, NULL, NULL, &size); ok(!ret && - (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == NTE_BAD_ALGID), + (GetLastError() == ERROR_INVALID_PARAMETER || + GetLastError() == NTE_BAD_ALGID || + GetLastError() == OSS_BAD_PTR), /* Win9x */ "Expected ERROR_INVALID_PARAMETER or NTE_BAD_ALGID, got %08x\n", GetLastError()); algID.pszObjId = oid_rsa_md5;
1
0
0
0
Austin English : wined3d: Fix a compiler warning.
by Alexandre Julliard
24 Jun '09
24 Jun '09
Module: wine Branch: master Commit: a4f2d3d18e96e66d136dc94b591ffebf7af15c71 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a4f2d3d18e96e66d136dc94b5…
Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jun 23 21:58:22 2009 -0500 wined3d: Fix a compiler warning. --- dlls/wined3d/arb_program_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 72e438c..7094824 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -928,11 +928,11 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction { if(This->baseShader.reg_maps.shader_version.major < 3) { - sprintf(register_name, ctx->texcrd_output[reg->idx]); + strcpy(register_name, ctx->texcrd_output[reg->idx]); } else { - sprintf(register_name, ctx->vs_output[reg->idx]); + strcpy(register_name, ctx->vs_output[reg->idx]); } } break;
1
0
0
0
Austin English : shdocvw: Handle DISPID_AMBIENT_DLCONTROL case.
by Alexandre Julliard
24 Jun '09
24 Jun '09
Module: wine Branch: master Commit: 583be32178a24d5714c814337cf3a147550c8519 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=583be32178a24d5714c814337…
Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jun 22 01:39:20 2009 -0500 shdocvw: Handle DISPID_AMBIENT_DLCONTROL case. --- dlls/shdocvw/oleobject.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index aab06d0..017e738 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -28,6 +28,7 @@ #include "shdocvw.h" #include "htiframe.h" #include "idispids.h" +#include "mshtmdid.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); @@ -723,6 +724,8 @@ static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DIS * BUT the Webbrowser OleControl object doesn't appear to do this. */ return S_OK; + case DISPID_AMBIENT_DLCONTROL: + return S_OK; case DISPID_AMBIENT_OFFLINEIFNOTCONNECTED: return on_offlineconnected_change(This); case DISPID_AMBIENT_SILENT:
1
0
0
0
Andrew Talbot : cryptui: Constify some variables.
by Alexandre Julliard
24 Jun '09
24 Jun '09
Module: wine Branch: master Commit: b2bb4a2ca851f0f658e849f5a3575e682d9f892b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b2bb4a2ca851f0f658e849f5a…
Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jun 23 21:39:58 2009 +0100 cryptui: Constify some variables. --- dlls/cryptui/main.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index f15420b..c11868a 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -2146,7 +2146,7 @@ static CRYPT_OBJID_BLOB *find_policy_qualifier(CERT_POLICIES_INFO *policies, return ret; } -static WCHAR *get_cps_str_from_qualifier(CRYPT_OBJID_BLOB *qualifier) +static WCHAR *get_cps_str_from_qualifier(const CRYPT_OBJID_BLOB *qualifier) { LPWSTR qualifierStr = NULL; CERT_NAME_VALUE *qualifierValue; @@ -2167,7 +2167,7 @@ static WCHAR *get_cps_str_from_qualifier(CRYPT_OBJID_BLOB *qualifier) return qualifierStr; } -static WCHAR *get_user_notice_from_qualifier(CRYPT_OBJID_BLOB *qualifier) +static WCHAR *get_user_notice_from_qualifier(const CRYPT_OBJID_BLOB *qualifier) { LPWSTR str = NULL; CERT_POLICY_QUALIFIER_USER_NOTICE *qualifierValue; @@ -2773,7 +2773,7 @@ static void add_v1_fields(HWND hwnd, struct detail_data *data) add_v1_field(hwnd, data, &v1_fields[i]); } -static WCHAR *crypt_format_extension(PCERT_EXTENSION ext, DWORD formatStrType) +static WCHAR *crypt_format_extension(const CERT_EXTENSION *ext, DWORD formatStrType) { WCHAR *str = NULL; DWORD size; @@ -2788,7 +2788,7 @@ static WCHAR *crypt_format_extension(PCERT_EXTENSION ext, DWORD formatStrType) return str; } -static WCHAR *field_format_extension_hex_with_ascii(PCERT_EXTENSION ext) +static WCHAR *field_format_extension_hex_with_ascii(const CERT_EXTENSION *ext) { WCHAR *str = NULL; @@ -3986,7 +3986,7 @@ static void show_cert_chain(HWND hwnd, struct hierarchy_data *data) } } -static void set_certificate_status(HWND hwnd, CRYPT_PROVIDER_CERT *cert) +static void set_certificate_status(HWND hwnd, const CRYPT_PROVIDER_CERT *cert) { /* Select all the text in the control, the next update will replace it */ SendMessageW(hwnd, EM_SETSEL, 0, -1); @@ -5602,7 +5602,7 @@ static PCRYPT_KEY_PROV_INFO export_get_private_key_info(PCCERT_CONTEXT cert) return info; } -static BOOL export_acquire_private_key(PCRYPT_KEY_PROV_INFO info, +static BOOL export_acquire_private_key(const CRYPT_KEY_PROV_INFO *info, HCRYPTPROV *phProv) { BOOL ret; @@ -5733,7 +5733,7 @@ static BOOL export_info_has_private_key(PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo) return ret; } -static void export_format_enable_controls(HWND hwnd, struct ExportWizData *data) +static void export_format_enable_controls(HWND hwnd, const struct ExportWizData *data) { int defaultFormatID; @@ -5874,7 +5874,7 @@ static LRESULT CALLBACK export_format_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, return ret; } -static void export_password_mismatch(HWND hwnd, struct ExportWizData *data) +static void export_password_mismatch(HWND hwnd, const struct ExportWizData *data) { WCHAR title[MAX_STRING_LEN], error[MAX_STRING_LEN]; LPCWSTR pTitle; @@ -5979,7 +5979,7 @@ static LRESULT CALLBACK export_password_dlg_proc(HWND hwnd, UINT msg, return ret; } -static LPWSTR export_append_extension(struct ExportWizData *data, +static LPWSTR export_append_extension(const struct ExportWizData *data, LPWSTR fileName) { static const WCHAR cer[] = { '.','c','e','r',0 }; @@ -6305,7 +6305,7 @@ static LRESULT CALLBACK export_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, return ret; } -static void show_export_details(HWND lv, struct ExportWizData *data) +static void show_export_details(HWND lv, const struct ExportWizData *data) { WCHAR text[MAX_STRING_LEN]; LVITEMW item; @@ -6783,7 +6783,7 @@ static LRESULT CALLBACK export_finish_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, } static BOOL show_export_ui(DWORD dwFlags, HWND hwndParent, - LPCWSTR pwszWizardTitle, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, void *pvoid) + LPCWSTR pwszWizardTitle, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, const void *pvoid) { PROPSHEETHEADERW hdr; PROPSHEETPAGEW pages[6];
1
0
0
0
Aurimas Fišeras : taskmgr: Make column headers in processes tab translatable.
by Alexandre Julliard
24 Jun '09
24 Jun '09
Module: wine Branch: master Commit: 9714f4c66e516917c5829360632ee6fc2c59be27 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9714f4c66e516917c58293606…
Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Jun 22 19:50:51 2009 +0300 taskmgr: Make column headers in processes tab translatable. --- programs/taskmgr/En.rc | 29 +++++++++++++++ programs/taskmgr/column.c | 81 +++++++++++++++++++++++++++++------------- programs/taskmgr/resource.h | 25 +++++++++++++ 3 files changed, 110 insertions(+), 25 deletions(-) diff --git a/programs/taskmgr/En.rc b/programs/taskmgr/En.rc index cda848f..d824fd3 100644 --- a/programs/taskmgr/En.rc +++ b/programs/taskmgr/En.rc @@ -504,3 +504,32 @@ BEGIN IDS_STATUS_BAR_PROCESSES "Processes: %d" IDS_STATUS_BAR_MEMORY_USAGE "Mem Usage: %dK / %dK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMAGENAME "Image Name" + IDS_PID "PID" + IDS_CPUUSAGE "CPU" + IDS_CPUTIME "CPU Time" + IDS_MEMORYUSAGE "Mem Usage" + IDS_MEMORYUSAGEDELTA "Mem Delta" + IDS_PEAKMEMORYUSAGE "Peak Mem Usage" + IDS_PAGEFAULTS "Page Faults" + IDS_USEROBJECTS "USER Objects" + IDS_IOREADS "I/O Reads" + IDS_IOREADBYTES "I/O Read Bytes" + IDS_SESSIONID "Session ID" + IDS_USERNAME "Username" + IDS_PAGEFAULTSDELTA "PF Delta" + IDS_VIRTUALMEMORYSIZE "VM Size" + IDS_PAGEDPOOL "Paged Pool" + IDS_NONPAGEDPOOL "NP Pool" + IDS_BASEPRIORITY "Base Pri" + IDS_HANDLECOUNT "Handles" + IDS_THREADCOUNT "Threads" + IDS_GDIOBJECTS "GDI Objects" + IDS_IOWRITES "I/O Writes" + IDS_IOWRITEBYTES "I/O Write Bytes" + IDS_IOOTHER "I/O Other" + IDS_IOOTHERBYTES "I/O Other Bytes" +END diff --git a/programs/taskmgr/column.c b/programs/taskmgr/column.c index f64a747..4216d75 100644 --- a/programs/taskmgr/column.c +++ b/programs/taskmgr/column.c @@ -35,33 +35,62 @@ UINT ColumnDataHints[25]; /* Column Headers; Begin */ -static const WCHAR wszImageName[] = {'I','m','a','g','e',' ','N','a','m','e',0}; -static const WCHAR wszPID[] = {'P','I','D',0}; -static const WCHAR wszUserName[] = {'U','s','e','r','n','a','m','e',0}; -static const WCHAR wszSessionID[] = {'S','e','s','s','i','o','n',' ','I','D',0}; -static const WCHAR wszCPU[] = {'C','P','U',0}; -static const WCHAR wszCPUTime[] = {'C','P','U',' ','T','i','m','e',0}; -static const WCHAR wszMemUsage[] = {'M','e','m',' ','U','s','a','g','e',0}; -static const WCHAR wszPeakMemUsage[] = {'P','e','a','k',' ','M','e','m',' ','U','s','a','g','e',0}; -static const WCHAR wszMemDelta[] = {'M','e','m',' ','D','e','l','t','a',0}; -static const WCHAR wszPageFaults[] = {'P','a','g','e',' ','F','a','u','l','t','s',0}; -static const WCHAR wszPFDelta[] = {'P','F',' ','D','e','l','t','a',0}; -static const WCHAR wszVMSize[] = {'V','M',' ','S','i','z','e',0}; -static const WCHAR wszPagedPool[] = {'P','a','g','e','d',' ','P','o','o','l',0}; -static const WCHAR wszNPPool[] = {'N','P',' ','P','o','o','l',0}; -static const WCHAR wszBasePri[] = {'B','a','s','e',' ','P','r','i',0}; -static const WCHAR wszHandles[] = {'H','a','n','d','l','e','s',0}; -static const WCHAR wszThreads[] = {'T','h','r','e','a','d','s',0}; -static const WCHAR wszUSERObjects[] = {'U','S','E','R',' ','O','b','j','e','c','t','s',0}; -static const WCHAR wszGDIObjects[] = {'G','D','I',' ','O','b','j','e','c','t','s',0}; -static const WCHAR wszIOReads[] = {'I','/','O',' ','R','e','a','d','s',0}; -static const WCHAR wszIOWrites[] = {'I','/','O',' ','W','r','i','t','e','s',0}; -static const WCHAR wszIOOther[] = {'I','/','O',' ','O','t','h','e','r',0}; -static const WCHAR wszIOReadBytes[] = {'I','/','O',' ','R','e','a','d',' ','B','y','t','e','s',0}; -static const WCHAR wszIOWriteBytes[] = {'I','/','O',' ','W','r','i','t','e',' ','B','y','t','e','s',0}; -static const WCHAR wszIOOtherBytes[] = {'I','/','O',' ','O','t','h','e','r',' ','B','y','t','e','s',0}; +WCHAR wszImageName[255]; +WCHAR wszPID[255]; +WCHAR wszUserName[255]; +WCHAR wszSessionID[255]; +WCHAR wszCPU[255]; +WCHAR wszCPUTime[255]; +WCHAR wszMemUsage[255]; +WCHAR wszPeakMemUsage[255]; +WCHAR wszMemDelta[255]; +WCHAR wszPageFaults[255]; +WCHAR wszPFDelta[255]; +WCHAR wszVMSize[255]; +WCHAR wszPagedPool[255]; +WCHAR wszNPPool[255]; +WCHAR wszBasePri[255]; +WCHAR wszHandles[255]; +WCHAR wszThreads[255]; +WCHAR wszUSERObjects[255]; +WCHAR wszGDIObjects[255]; +WCHAR wszIOReads[255]; +WCHAR wszIOWrites[255]; +WCHAR wszIOOther[255]; +WCHAR wszIOReadBytes[255]; +WCHAR wszIOWriteBytes[255]; +WCHAR wszIOOtherBytes[255]; /* Column Headers; End */ +static void load_column_headers(void) +{ + LoadStringW(hInst, IDS_IMAGENAME, wszImageName, sizeof(wszImageName)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_PID, wszPID, sizeof(wszPID)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_USERNAME, wszUserName, sizeof(wszUserName)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_SESSIONID, wszSessionID, sizeof(wszSessionID)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_CPUUSAGE, wszCPU, sizeof(wszCPU)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_CPUTIME, wszCPUTime, sizeof(wszCPUTime)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_MEMORYUSAGE, wszMemUsage, sizeof(wszMemUsage)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_PEAKMEMORYUSAGE, wszPeakMemUsage, sizeof(wszPeakMemUsage)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_MEMORYUSAGEDELTA, wszMemDelta, sizeof(wszMemDelta)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_PAGEFAULTS, wszPageFaults, sizeof(wszPageFaults)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_PAGEFAULTSDELTA, wszPFDelta, sizeof(wszPFDelta)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_VIRTUALMEMORYSIZE, wszVMSize, sizeof(wszVMSize)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_PAGEDPOOL, wszPagedPool, sizeof(wszPagedPool)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_NONPAGEDPOOL, wszNPPool, sizeof(wszNPPool)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_BASEPRIORITY, wszBasePri, sizeof(wszBasePri)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_HANDLECOUNT, wszHandles, sizeof(wszHandles)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_THREADCOUNT, wszThreads, sizeof(wszThreads)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_USEROBJECTS, wszUSERObjects, sizeof(wszUSERObjects)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_GDIOBJECTS, wszGDIObjects, sizeof(wszGDIObjects)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_IOREADS, wszIOReads, sizeof(wszIOReads)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_IOWRITES, wszIOWrites, sizeof(wszIOWrites)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_IOOTHER, wszIOOther, sizeof(wszIOOther)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_IOREADBYTES, wszIOReadBytes, sizeof(wszIOReadBytes)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_IOWRITEBYTES, wszIOWriteBytes, sizeof(wszIOWriteBytes)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_IOOTHERBYTES, wszIOOtherBytes, sizeof(wszIOOtherBytes)/sizeof(WCHAR)); +} + static int InsertColumn(int nCol, LPCWSTR lpszColumnHeading, int nFormat, int nWidth, int nSubItem) { LVCOLUMNW column; @@ -89,6 +118,8 @@ void AddColumns(void) { int size; + load_column_headers(); + if (TaskManagerSettings.Column_ImageName) InsertColumn(0, wszImageName, LVCFMT_LEFT, TaskManagerSettings.ColumnSizeArray[0], -1); if (TaskManagerSettings.Column_PID) diff --git a/programs/taskmgr/resource.h b/programs/taskmgr/resource.h index d8b69e0..9bf71d7 100644 --- a/programs/taskmgr/resource.h +++ b/programs/taskmgr/resource.h @@ -198,6 +198,31 @@ #define IDS_STATUS_BAR_CPU_USAGE 32829 #define IDS_STATUS_BAR_PROCESSES 32830 #define IDS_STATUS_BAR_MEMORY_USAGE 32831 +#define IDS_IMAGENAME 32832 +#define IDS_PID 32833 +#define IDS_CPUUSAGE 32834 +#define IDS_CPUTIME 32835 +#define IDS_MEMORYUSAGE 32836 +#define IDS_MEMORYUSAGEDELTA 32837 +#define IDS_PEAKMEMORYUSAGE 32838 +#define IDS_PAGEFAULTS 32839 +#define IDS_USEROBJECTS 32840 +#define IDS_IOREADS 32841 +#define IDS_IOREADBYTES 32842 +#define IDS_SESSIONID 32843 +#define IDS_USERNAME 32844 +#define IDS_PAGEFAULTSDELTA 32845 +#define IDS_VIRTUALMEMORYSIZE 32846 +#define IDS_PAGEDPOOL 32847 +#define IDS_NONPAGEDPOOL 32848 +#define IDS_BASEPRIORITY 32849 +#define IDS_HANDLECOUNT 32850 +#define IDS_THREADCOUNT 32851 +#define IDS_GDIOBJECTS 32852 +#define IDS_IOWRITES 32853 +#define IDS_IOWRITEBYTES 32854 +#define IDS_IOOTHER 32855 +#define IDS_IOOTHERBYTES 32856 #define IDC_STATIC -1 /*
1
0
0
0
Paul Vriens : taskmgr: Update Dutch translations.
by Alexandre Julliard
24 Jun '09
24 Jun '09
Module: wine Branch: master Commit: 9c989a99a00989a76d849f9e85af99cc5810505a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9c989a99a00989a76d849f9e8…
Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jun 23 20:36:54 2009 +0200 taskmgr: Update Dutch translations. --- programs/taskmgr/Nl.rc | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/taskmgr/Nl.rc b/programs/taskmgr/Nl.rc index bc25e73..1dafd1d 100644 --- a/programs/taskmgr/Nl.rc +++ b/programs/taskmgr/Nl.rc @@ -484,4 +484,7 @@ BEGIN IDS_APPLICATIONS "Toepassingen" IDS_PROCESSES "Processen" IDS_PERFORMANCE "Prestaties" + IDS_STATUS_BAR_CPU_USAGE "CPU-gebruik: %3d%%" + IDS_STATUS_BAR_PROCESSES "Processen: %d" + IDS_STATUS_BAR_MEMORY_USAGE "Geheugengebruik: %dK / %dK" END
1
0
0
0
Francois Gouget : comctl32: Make MapIdSearchCompare() static.
by Alexandre Julliard
24 Jun '09
24 Jun '09
Module: wine Branch: master Commit: dee97f456000879ff6fb7e13643492d3a99cdb48 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=dee97f456000879ff6fb7e136…
Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 23 19:40:50 2009 +0200 comctl32: Make MapIdSearchCompare() static. --- dlls/comctl32/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ab94936..b84600a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -2352,7 +2352,7 @@ static void LISTVIEW_GetItemBox(const LISTVIEW_INFO *infoPtr, INT nItem, LPRECT } /* LISTVIEW_MapIdToIndex helper */ -INT CALLBACK MapIdSearchCompare(LPVOID p1, LPVOID p2, LPARAM lParam) +static INT CALLBACK MapIdSearchCompare(LPVOID p1, LPVOID p2, LPARAM lParam) { ITEM_ID *id1 = (ITEM_ID*)p1; ITEM_ID *id2 = (ITEM_ID*)p2;
1
0
0
0
André Hentschel : taskmgr: Update German translation.
by Alexandre Julliard
24 Jun '09
24 Jun '09
Module: wine Branch: master Commit: 20f0fcfb7527d4631ae6448f1d91845ca1fccb1a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=20f0fcfb7527d4631ae6448f1…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 23 18:32:53 2009 +0200 taskmgr: Update German translation. --- programs/taskmgr/De.rc | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/taskmgr/De.rc b/programs/taskmgr/De.rc index 9c3c22d..a31ca6b 100644 --- a/programs/taskmgr/De.rc +++ b/programs/taskmgr/De.rc @@ -484,4 +484,7 @@ BEGIN IDS_APPLICATIONS "Anwendungen" IDS_PROCESSES "Prozesse" IDS_PERFORMANCE "Systemleistung" + IDS_STATUS_BAR_CPU_USAGE "CPU-Auslastung: %3d%%" + IDS_STATUS_BAR_PROCESSES "Prozesse: %d" + IDS_STATUS_BAR_MEMORY_USAGE "Speicherauslastung: %dK / %dK" END
1
0
0
0
← Newer
1
...
26
27
28
29
30
31
32
...
112
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
Results per page:
10
25
50
100
200