June 2009 - Wine-commits - list.winehq.org

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

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

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

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

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

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

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

Aric Stewart : msctf: Implement ITfContext::GetStatus.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: 190357b14ba498cb4504410069cd4bd0bfec1955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=190357b14ba498cb450441006… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 24 17:28:31 2009 +0900 msctf: Implement ITfContext::GetStatus. --- dlls/msctf/context.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index e5cf602..e11a0e8 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -466,8 +466,25 @@ static HRESULT WINAPI Context_GetStatus (ITfContext *iface, TF_STATUS *pdcs) { Context *This = (Context *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + TRACE("(%p) %p\n",This,pdcs); + + if (!This->connected) + return TF_E_DISCONNECTED; + + if (!pdcs) + return E_INVALIDARG; + + if (!This->pITextStoreACP) + { + FIXME("Context does not have a ITextStoreACP\n"); + return E_NOTIMPL; + } + + ITextStoreACP_GetStatus(This->pITextStoreACP, &This->documentStatus); + + *pdcs = This->documentStatus; + + return S_OK; } static HRESULT WINAPI Context_GetProperty (ITfContext *iface,

1 0

Aric Stewart : msctf: ITfContext:: GetDocumentMgr should AddRef the DocumentMgr.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: 2dd5a3bea2fbcc049132708cc4859126ab2a03cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dd5a3bea2fbcc049132708cc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 24 17:29:05 2009 +0900 msctf: ITfContext::GetDocumentMgr should AddRef the DocumentMgr. --- dlls/msctf/context.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index e11a0e8..5be06d3 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -532,6 +532,9 @@ static HRESULT WINAPI Context_GetDocumentMgr (ITfContext *iface, *ppDm = This->manager; if (!This->manager) return S_FALSE; + + ITfDocumentMgr_AddRef(This->manager); + return S_OK; }

1 0

Aric Stewart : msctf: Context initialization happens before OnPushContext sink.
by Alexandre Julliard 24 Jun '09

24 Jun '09

Module: wine Branch: master Commit: e73b17d018318d0e257ceb8409c4f0e0209a6a1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e73b17d018318d0e257ceb840… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 24 17:29:51 2009 +0900 msctf: Context initialization happens before OnPushContext sink. --- dlls/msctf/documentmgr.c | 2 +- dlls/msctf/tests/inputprocessor.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index c7aa820..f5ea71f 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -145,8 +145,8 @@ static HRESULT WINAPI DocumentMgr_Push(ITfDocumentMgr *iface, ITfContext *pic) This->contextStack[1] = This->contextStack[0]; This->contextStack[0] = check; - ITfThreadMgrEventSink_OnPushContext(This->ThreadMgrSink,check); Context_Initialize(check, iface); + ITfThreadMgrEventSink_OnPushContext(This->ThreadMgrSink,check); return S_OK; } diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 61389cf..b9f2469 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -439,6 +439,20 @@ ITfDocumentMgr *pdimFocus, ITfDocumentMgr *pdimPrevFocus) static HRESULT WINAPI ThreadMgrEventSink_OnPushContext(ITfThreadMgrEventSink *iface, ITfContext *pic) { + HRESULT hr; + ITfDocumentMgr *docmgr; + ITfContext *test; + + hr = ITfContext_GetDocumentMgr(pic,&docmgr); + ok(SUCCEEDED(hr),"GetDocumenMgr failed\n"); + test = (ITfContext*)0xdeadbeef; + ITfDocumentMgr_Release(docmgr); + hr = ITfDocumentMgr_GetTop(docmgr,&test); + ok(SUCCEEDED(hr),"GetTop failed\n"); + ok(test == pic, "Wrong context is on top\n"); + if (test) + ITfContext_Release(test); + ok(test_OnPushContext == SINK_EXPECTED, "Unexpected OnPushContext sink\n"); test_OnPushContext = SINK_FIRED; return S_OK;

1 0