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

Huw Davies : ole32: Add support for retrieving enhanced metafiles.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: 5c97db9db6b68c43396e419b3f860997757e92a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c97db9db6b68c43396e419b3… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 22 11:58:52 2009 +0100 ole32: Add support for retrieving enhanced metafiles. --- dlls/ole32/clipboard.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 208645e..7f19d16 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1133,6 +1133,22 @@ static HRESULT get_stgmed_for_storage(HGLOBAL h, STGMEDIUM *med) return hr; } +/************************************************************************ + * get_stgmed_for_emf + * + * Returns a stg medium with an enhanced metafile based on the handle + */ +static HRESULT get_stgmed_for_emf(HENHMETAFILE hemf, STGMEDIUM *med) +{ + med->pUnkForRelease = NULL; + med->tymed = TYMED_NULL; + + med->u.hEnhMetaFile = CopyEnhMetaFileW(hemf, NULL); + if(!med->u.hEnhMetaFile) return E_OUTOFMEMORY; + med->tymed = TYMED_ENHMF; + return S_OK; +} + static inline BOOL string_off_equal(const DVTARGETDEVICE *t1, WORD off1, const DVTARGETDEVICE *t2, WORD off2) { const WCHAR *str1, *str2; @@ -1222,6 +1238,8 @@ static HRESULT WINAPI snapshot_GetData(IDataObject *iface, FORMATETC *fmt, hr = get_stgmed_for_global(h, med); else if(mask & TYMED_ISTREAM) hr = get_stgmed_for_stream(h, med); + else if(mask & TYMED_ENHMF) + hr = get_stgmed_for_emf((HENHMETAFILE)h, med); else { FIXME("Unhandled tymed - mask %x req tymed %x\n", mask, fmt->tymed);

1 0

Huw Davies : ole32/tests: Add a test for enhanced metafile retrieval.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: 7490f922e0adaacbf5396cf8afdc90e33bc1a808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7490f922e0adaacbf5396cf8a… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 22 14:46:35 2009 +0100 ole32/tests: Add a test for enhanced metafile retrieval. --- dlls/ole32/tests/clipboard.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index a6229a1..e58ac02 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -1235,6 +1235,8 @@ static void test_nonole_clipboard(void) FORMATETC fmt; HGLOBAL h, hblob, htext; HENHMETAFILE emf; + STGMEDIUM med; + DWORD obj_type; r = OpenClipboard(NULL); ok(r, "gle %d\n", GetLastError()); @@ -1349,6 +1351,13 @@ static void test_nonole_clipboard(void) ok(hr == S_FALSE, "got %08x\n", hr); IEnumFORMATETC_Release(enum_fmt); + InitFormatEtc(fmt, CF_ENHMETAFILE, TYMED_ENHMF); + hr = IDataObject_GetData(get, &fmt, &med); + ok(hr == S_OK, "got %08x\n", hr); + obj_type = GetObjectType(U(med).hEnhMetaFile); + ok(obj_type == OBJ_ENHMETAFILE, "got %d\n", obj_type); + ReleaseStgMedium(&med); + IDataObject_Release(get); r = OpenClipboard(NULL);

1 0

Aurimas Fišeras : taskmgr: Make status bar text translatable.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: 88a08f91c9eb48d28ad6f74d1c0b36a1d7aae5de URL: http://source.winehq.org/git/wine.git/?a=commit;h=88a08f91c9eb48d28ad6f74d1… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jun 21 16:04:14 2009 +0300 taskmgr: Make status bar text translatable. --- programs/taskmgr/En.rc | 3 +++ programs/taskmgr/perfpage.c | 5 +++-- programs/taskmgr/procpage.c | 16 +++++++++++----- programs/taskmgr/resource.h | 3 +++ programs/taskmgr/taskmgr.c | 7 +++++-- 5 files changed, 25 insertions(+), 9 deletions(-) diff --git a/programs/taskmgr/En.rc b/programs/taskmgr/En.rc index a36503e..cda848f 100644 --- a/programs/taskmgr/En.rc +++ b/programs/taskmgr/En.rc @@ -500,4 +500,7 @@ BEGIN IDS_APPLICATIONS "Applications" IDS_PROCESSES "Processes" IDS_PERFORMANCE "Performance" + IDS_STATUS_BAR_CPU_USAGE "CPU Usage: %3d%%" + IDS_STATUS_BAR_PROCESSES "Processes: %d" + IDS_STATUS_BAR_MEMORY_USAGE "Mem Usage: %dK / %dK" END diff --git a/programs/taskmgr/perfpage.c b/programs/taskmgr/perfpage.c index e5f1435..b61fe05 100644 --- a/programs/taskmgr/perfpage.c +++ b/programs/taskmgr/perfpage.c @@ -141,8 +141,9 @@ static DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) WCHAR Text[256]; static const WCHAR wszFormatDigit[] = {'%','d',0}; - static const WCHAR wszMemUsage[] = {'M','e','m',' ','U','s','a','g','e',':',' ', - '%','d','K',' ','/',' ','%','d','K',0}; + WCHAR wszMemUsage[255]; + + LoadStringW(hInst, IDS_STATUS_BAR_MEMORY_USAGE, wszMemUsage, sizeof(wszMemUsage)/sizeof(WCHAR)); /* Create the event */ hPerformancePageEvent = CreateEvent(NULL, TRUE, TRUE, NULL); diff --git a/programs/taskmgr/procpage.c b/programs/taskmgr/procpage.c index adbf469..4cc02f1 100644 --- a/programs/taskmgr/procpage.c +++ b/programs/taskmgr/procpage.c @@ -386,6 +386,12 @@ static DWORD WINAPI ProcessPageRefreshThread(void *lpParameter) ULONG OldProcessorUsage = 0; ULONG OldProcessCount = 0; + WCHAR wszCPU_Usage[255]; + WCHAR wszProcesses[255]; + + LoadStringW(hInst, IDS_STATUS_BAR_CPU_USAGE, wszCPU_Usage, sizeof(wszCPU_Usage)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_STATUS_BAR_PROCESSES, wszProcesses, sizeof(wszProcesses)/sizeof(WCHAR)); + /* Create the event */ hProcessPageEvent = CreateEvent(NULL, TRUE, TRUE, NULL); @@ -405,7 +411,7 @@ static DWORD WINAPI ProcessPageRefreshThread(void *lpParameter) return 0; if (dwWaitVal == WAIT_OBJECT_0) { - TCHAR text[260]; + WCHAR text[256]; /* Reset our event */ ResetEvent(hProcessPageEvent); @@ -418,13 +424,13 @@ static DWORD WINAPI ProcessPageRefreshThread(void *lpParameter) if (OldProcessorUsage != PerfDataGetProcessorUsage()) { OldProcessorUsage = PerfDataGetProcessorUsage(); - wsprintf(text, _T("CPU Usage: %3d%%"), OldProcessorUsage); - SendMessage(hStatusWnd, SB_SETTEXT, 1, (LPARAM)text); + wsprintfW(text, wszCPU_Usage, OldProcessorUsage); + SendMessageW(hStatusWnd, SB_SETTEXTW, 1, (LPARAM)text); } if (OldProcessCount != PerfDataGetProcessCount()) { OldProcessCount = PerfDataGetProcessCount(); - wsprintf(text, _T("Processes: %d"), OldProcessCount); - SendMessage(hStatusWnd, SB_SETTEXT, 0, (LPARAM)text); + wsprintfW(text, wszProcesses, OldProcessCount); + SendMessageW(hStatusWnd, SB_SETTEXTW, 0, (LPARAM)text); } } } diff --git a/programs/taskmgr/resource.h b/programs/taskmgr/resource.h index 959efdb..d8b69e0 100644 --- a/programs/taskmgr/resource.h +++ b/programs/taskmgr/resource.h @@ -195,6 +195,9 @@ #define IDS_APPLICATIONS 32826 #define IDS_PROCESSES 32827 #define IDS_PERFORMANCE 32828 +#define IDS_STATUS_BAR_CPU_USAGE 32829 +#define IDS_STATUS_BAR_PROCESSES 32830 +#define IDS_STATUS_BAR_MEMORY_USAGE 32831 #define IDC_STATIC -1 /* diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index 8393623..01c6926 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -527,8 +527,11 @@ static void TaskManager_OnExitMenuLoop(HWND hWnd) int nParts[3]; WCHAR text[256]; - static const WCHAR wszCPU_Usage[] = {'C','P','U',' ','U','s','a','g','e',':',' ','%','3','d','%','%',0}; - static const WCHAR wszProcesses[] = {'P','r','o','c','e','s','s','e','s',':',' ','%','d',0}; + WCHAR wszCPU_Usage[255]; + WCHAR wszProcesses[255]; + + LoadStringW(hInst, IDS_STATUS_BAR_CPU_USAGE, wszCPU_Usage, sizeof(wszCPU_Usage)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_STATUS_BAR_PROCESSES, wszProcesses, sizeof(wszProcesses)/sizeof(WCHAR)); bInMenuLoop = FALSE; /* Update the status bar pane sizes */

1 0

André Hentschel : taskmgr: Add German translation.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: 5548a2596e6d9f88ac4d4775c7d026633bbcecd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5548a2596e6d9f88ac4d4775c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 22 17:29:23 2009 +0200 taskmgr: Add German translation. --- programs/taskmgr/De.rc | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/programs/taskmgr/De.rc b/programs/taskmgr/De.rc index 4f12f72..9c3c22d 100644 --- a/programs/taskmgr/De.rc +++ b/programs/taskmgr/De.rc @@ -468,3 +468,20 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Setzt den Prozess in die NIEDRIGER ALS NORMAL-Priorit�tsklasse" ID_PROCESS_PAGE_SETPRIORITY_LOW "Setzt den Prozess in die NIEDRIG-Priorit�tsklasse" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_VIEW_LARGE "&Gro�e Symbole" + IDS_VIEW_SMALL "&Kleine Symbole" + IDS_VIEW_DETAILS "&Details" + IDS_WINDOWS "&Windows" + IDS_VIEW_SELECTCOLUMNS "&Spalten ausw�hlen..." + IDS_OPTIONS_SHOW16BITTASKS "&16-bit-Tasks anzeigen" + IDS_VIEW_CPUHISTORY "&CPU Verlauf" + IDS_VIEW_CPUHISTORY_ONEGRAPHALL "&Ein Graph, Alle CPUs" + IDS_VIEW_CPUHISTORY_ONEGRAPHPERCPU "Ein Graph &pro CPU" + IDS_VIEW_SHOWKERNELTIMES "K&ernelzeiten anzeigen" + IDS_APPLICATIONS "Anwendungen" + IDS_PROCESSES "Prozesse" + IDS_PERFORMANCE "Systemleistung" +END

1 0

Jaime Rave : regedit: Spanish translation updated.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: b475deab3fb4ea26c9170a240d2cc8205ae94273 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b475deab3fb4ea26c9170a240… Author: Jaime Rave <jaimerave(a)gmail.com> Date: Sun Jun 21 12:45:53 2009 -0500 regedit: Spanish translation updated. --- programs/regedit/Es.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/regedit/Es.rc b/programs/regedit/Es.rc index 0c08a48..bfcd879 100644 --- a/programs/regedit/Es.rc +++ b/programs/regedit/Es.rc @@ -2,6 +2,7 @@ * Regedit resources * * Copyright 2003,2004,2007,2008 Jos� Manuel Ferrer Ortiz + * Copyright 2009 Jaime Andres Rave Torres * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -283,6 +284,7 @@ BEGIN ID_EDIT_COPYKEYNAME "Copia el nombre de la clave seleccionada al portapapeles" ID_EDIT_FIND "Busca una cadena de texto en una clave, valor o datos" ID_EDIT_FINDNEXT "Busca la siguiente ocurrencia del texto especificado en la b�squeda anterior" + ID_EDIT_EXPORT "Exporta la rama seleccionada del registro a un archivo de texto" END STRINGTABLE DISCARDABLE

1 0

Paul Vriens : include/activscp.idl: Add some defines.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: af1ef9281becbaf91a0adf2d9353fe9a0c5dfd6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=af1ef9281becbaf91a0adf2d9… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jun 22 20:57:32 2009 +0200 include/activscp.idl: Add some defines. --- include/activscp.idl | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/activscp.idl b/include/activscp.idl index e75fbec..9be7ec4 100644 --- a/include/activscp.idl +++ b/include/activscp.idl @@ -40,8 +40,11 @@ cpp_quote("#define SCRIPTPROP_CONVERSIONLCID 0x00001002") cpp_quote("#define SCRIPTPROP_HOSTSTACKREQUIRED 0x00001003") cpp_quote("#define SCRIPTPROP_DEBUGGER 0x00001100") cpp_quote("#define SCRIPTPROP_JITDEBUG 0x00001101") -cpp_quote("#define SCRIPTPROP_HACK_FIBERSUPPORT 0x70000000") -cpp_quote("#define SCRIPTPROP_HACK_TRIDENTEVENTSINK 0x70000001") +cpp_quote("#define SCRIPTPROP_INVOKEVERSIONING 0x00004000") + +cpp_quote("#define SCRIPTPROP_HACK_FIBERSUPPORT 0x70000000") +cpp_quote("#define SCRIPTPROP_HACK_TRIDENTEVENTSINK 0x70000001") +cpp_quote("#define SCRIPTPROP_ABBREVIATE_GLOBALNAME_RESOLUTION 0x70000002") typedef enum tagSCRIPTSTATE { SCRIPTSTATE_UNINITIALIZED = 0,

1 0

Paul Vriens : taskmgr: Fix Dutch translations.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: 71b7c2f9869ea66e035f6953d1482506f448b686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71b7c2f9869ea66e035f6953d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jun 22 21:33:39 2009 +0200 taskmgr: Fix Dutch translations. --- programs/taskmgr/Nl.rc | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/programs/taskmgr/Nl.rc b/programs/taskmgr/Nl.rc index 1529341..bc25e73 100644 --- a/programs/taskmgr/Nl.rc +++ b/programs/taskmgr/Nl.rc @@ -54,7 +54,7 @@ BEGIN MENUITEM "&Normaal", ID_VIEW_UPDATESPEED_NORMAL , CHECKED MENUITEM "&Laag", ID_VIEW_UPDATESPEED_LOW - MENUITEM "&Pause", ID_VIEW_UPDATESPEED_PAUSED + MENUITEM "&Pauze", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR @@ -197,7 +197,7 @@ BEGIN WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "&Be�indig proces",IDC_ENDPROCESS,171,189,69,14 CONTROL "&Toon processen van alle gebruikers",IDC_SHOWALLPROCESSES, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,121,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,125,10 END /*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ @@ -414,7 +414,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_APP_TITLE "Task Manager" IDC_TASKMGR "Task Manager" - IDS_RUNDLG_CAPTION "Create New Task" + IDS_RUNDLG_CAPTION "Start nieuwe taak" END STRINGTABLE DISCARDABLE @@ -468,3 +468,20 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Zet het proces in de LAGER DAN NORMAAL-prioriteitsklasse" ID_PROCESS_PAGE_SETPRIORITY_LOW "Zet het proces in de LAGE-prioriteitsklasse" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_VIEW_LARGE "&Grote symbolen" + IDS_VIEW_SMALL "&Kleine symbolen" + IDS_VIEW_DETAILS "&Details" + IDS_WINDOWS "&Vensters" + IDS_VIEW_SELECTCOLUMNS "&Selecteer kolommen" + IDS_OPTIONS_SHOW16BITTASKS "&Toon 16-bit taken" + IDS_VIEW_CPUHISTORY "&CPU historie" + IDS_VIEW_CPUHISTORY_ONEGRAPHALL "&E�n grafiek, alle CPUs" + IDS_VIEW_CPUHISTORY_ONEGRAPHPERCPU "E�n grafiek &per CPU" + IDS_VIEW_SHOWKERNELTIMES "&Toon kerneltijden" + IDS_APPLICATIONS "Toepassingen" + IDS_PROCESSES "Processen" + IDS_PERFORMANCE "Prestaties" +END

1 0

Andrew Talbot : cryptnet: Constify some variables.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: 6ddc981c2bf1c763694b896f1e1ff22bb3ac55e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ddc981c2bf1c763694b896f1… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Jun 22 22:04:07 2009 +0100 cryptnet: Constify some variables. --- dlls/cryptnet/cryptnet_main.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 83346a0..9301a56 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -608,7 +608,7 @@ static BOOL CRYPT_DownloadObject(DWORD dwRetrievalFlags, HINTERNET hHttp, * creates a new cache entry for the object and writes the object to it. * Sets the expiration time of the cache entry to expires. */ -static void CRYPT_CacheURL(LPCWSTR pszURL, PCRYPT_BLOB_ARRAY pObject, +static void CRYPT_CacheURL(LPCWSTR pszURL, const CRYPT_BLOB_ARRAY *pObject, DWORD dwRetrievalFlags, FILETIME expires) { WCHAR cacheFileName[MAX_PATH]; @@ -692,7 +692,7 @@ static void CALLBACK CRYPT_InetStatusCallback(HINTERNET hInt, } } -static BOOL CRYPT_Connect(URL_COMPONENTSW *components, +static BOOL CRYPT_Connect(const URL_COMPONENTSW *components, struct InetContext *context, PCRYPT_CREDENTIALS pCredentials, HINTERNET *phInt, HINTERNET *phHost) { @@ -1049,7 +1049,7 @@ static BOOL CRYPT_GetRetrieveFunction(LPCWSTR pszURL, } static BOOL WINAPI CRYPT_CreateBlob(LPCSTR pszObjectOid, - DWORD dwRetrievalFlags, PCRYPT_BLOB_ARRAY pObject, void **ppvContext) + DWORD dwRetrievalFlags, const CRYPT_BLOB_ARRAY *pObject, void **ppvContext) { DWORD size, i; CRYPT_BLOB_ARRAY *context; @@ -1086,7 +1086,7 @@ static BOOL WINAPI CRYPT_CreateBlob(LPCSTR pszObjectOid, typedef BOOL (WINAPI *AddContextToStore)(HCERTSTORE hCertStore, const void *pContext, DWORD dwAddDisposition, const void **ppStoreContext); -static BOOL CRYPT_CreateContext(PCRYPT_BLOB_ARRAY pObject, +static BOOL CRYPT_CreateContext(const CRYPT_BLOB_ARRAY *pObject, DWORD dwExpectedContentTypeFlags, AddContextToStore addFunc, void **ppvContext) { BOOL ret = TRUE; @@ -1142,28 +1142,28 @@ static BOOL CRYPT_CreateContext(PCRYPT_BLOB_ARRAY pObject, } static BOOL WINAPI CRYPT_CreateCert(LPCSTR pszObjectOid, - DWORD dwRetrievalFlags, PCRYPT_BLOB_ARRAY pObject, void **ppvContext) + DWORD dwRetrievalFlags, const CRYPT_BLOB_ARRAY *pObject, void **ppvContext) { return CRYPT_CreateContext(pObject, CERT_QUERY_CONTENT_FLAG_CERT, (AddContextToStore)CertAddCertificateContextToStore, ppvContext); } static BOOL WINAPI CRYPT_CreateCRL(LPCSTR pszObjectOid, - DWORD dwRetrievalFlags, PCRYPT_BLOB_ARRAY pObject, void **ppvContext) + DWORD dwRetrievalFlags, const CRYPT_BLOB_ARRAY *pObject, void **ppvContext) { return CRYPT_CreateContext(pObject, CERT_QUERY_CONTENT_FLAG_CRL, (AddContextToStore)CertAddCRLContextToStore, ppvContext); } static BOOL WINAPI CRYPT_CreateCTL(LPCSTR pszObjectOid, - DWORD dwRetrievalFlags, PCRYPT_BLOB_ARRAY pObject, void **ppvContext) + DWORD dwRetrievalFlags, const CRYPT_BLOB_ARRAY *pObject, void **ppvContext) { return CRYPT_CreateContext(pObject, CERT_QUERY_CONTENT_FLAG_CTL, (AddContextToStore)CertAddCTLContextToStore, ppvContext); } static BOOL WINAPI CRYPT_CreatePKCS7(LPCSTR pszObjectOid, - DWORD dwRetrievalFlags, PCRYPT_BLOB_ARRAY pObject, void **ppvContext) + DWORD dwRetrievalFlags, const CRYPT_BLOB_ARRAY *pObject, void **ppvContext) { BOOL ret; @@ -1187,7 +1187,7 @@ static BOOL WINAPI CRYPT_CreatePKCS7(LPCSTR pszObjectOid, } static BOOL WINAPI CRYPT_CreateAny(LPCSTR pszObjectOid, - DWORD dwRetrievalFlags, PCRYPT_BLOB_ARRAY pObject, void **ppvContext) + DWORD dwRetrievalFlags, const CRYPT_BLOB_ARRAY *pObject, void **ppvContext) { BOOL ret; @@ -1273,7 +1273,7 @@ static BOOL WINAPI CRYPT_CreateAny(LPCSTR pszObjectOid, } typedef BOOL (WINAPI *ContextDllCreateObjectContext)(LPCSTR pszObjectOid, - DWORD dwRetrievalFlags, PCRYPT_BLOB_ARRAY pObject, void **ppvContext); + DWORD dwRetrievalFlags, const CRYPT_BLOB_ARRAY *pObject, void **ppvContext); static BOOL CRYPT_GetCreateFunction(LPCSTR pszObjectOid, ContextDllCreateObjectContext *pFunc, HCRYPTOIDFUNCADDR *phFunc) @@ -1322,10 +1322,10 @@ static BOOL CRYPT_GetCreateFunction(LPCSTR pszObjectOid, return ret; } -typedef BOOL (*get_object_expiration_func)(void *pvContext, +typedef BOOL (*get_object_expiration_func)(const void *pvContext, FILETIME *expiration); -static BOOL CRYPT_GetExpirationFromCert(void *pvObject, FILETIME *expiration) +static BOOL CRYPT_GetExpirationFromCert(const void *pvObject, FILETIME *expiration) { PCCERT_CONTEXT cert = pvObject; @@ -1333,7 +1333,7 @@ static BOOL CRYPT_GetExpirationFromCert(void *pvObject, FILETIME *expiration) return TRUE; } -static BOOL CRYPT_GetExpirationFromCRL(void *pvObject, FILETIME *expiration) +static BOOL CRYPT_GetExpirationFromCRL(const void *pvObject, FILETIME *expiration) { PCCRL_CONTEXT cert = pvObject; @@ -1341,7 +1341,7 @@ static BOOL CRYPT_GetExpirationFromCRL(void *pvObject, FILETIME *expiration) return TRUE; } -static BOOL CRYPT_GetExpirationFromCTL(void *pvObject, FILETIME *expiration) +static BOOL CRYPT_GetExpirationFromCTL(const void *pvObject, FILETIME *expiration) { PCCTL_CONTEXT cert = pvObject;

1 0

Nikolay Sivov : comctl32/listview: Test for parent sequence when creating with LVS_OWNERDRAWFIXED.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: d03e63ccd7bc52a0aedb249feeea6739d930413a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d03e63ccd7bc52a0aedb249fe… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jun 22 21:39:46 2009 +0400 comctl32/listview: Test for parent sequence when creating with LVS_OWNERDRAWFIXED. --- dlls/comctl32/tests/listview.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 2d697bb..820acc6 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -114,6 +114,14 @@ static const struct message create_parent_wnd_seq[] = { { 0 } }; +static const struct message create_ownerdrawfixed_parent_seq[] = { + { WM_NOTIFYFORMAT, sent }, + { WM_QUERYUISTATE, sent|optional }, /* Win2K and higher */ + { WM_MEASUREITEM, sent }, + { WM_PARENTNOTIFY, sent }, + { 0 } +}; + static const struct message redraw_listview_seq[] = { { WM_PAINT, sent|id, 0, 0, LISTVIEW_ID }, { WM_PAINT, sent|id, 0, 0, HEADER_ID }, @@ -1392,6 +1400,13 @@ static void test_create(void) ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); DestroyWindow(hList); + + /* WM_MEASUREITEM should be sent when created with LVS_OWNERDRAWFIXED */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + hList = create_listview_control(LVS_OWNERDRAWFIXED); + ok_sequence(sequences, PARENT_SEQ_INDEX, create_ownerdrawfixed_parent_seq, + "created with LVS_OWNERDRAWFIXED - parent seq", TRUE); + DestroyWindow(hList); } static void test_redraw(void)

1 0

Nikolay Sivov : comctl32/listview: Notify parent with WM_MEASUREITEM on control creation.
by Alexandre Julliard 23 Jun '09

23 Jun '09

Module: wine Branch: master Commit: 8e18e9e6bdc6dff7f8b148bd7f9b9abd34bdee94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e18e9e6bdc6dff7f8b148bd7… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jun 22 22:04:41 2009 +0400 comctl32/listview: Notify parent with WM_MEASUREITEM on control creation. --- dlls/comctl32/listview.c | 27 +++++++++++++++++---------- dlls/comctl32/tests/listview.c | 2 +- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index f0a294e..0e22848 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1027,6 +1027,20 @@ static inline DWORD notify_postpaint (const LISTVIEW_INFO *infoPtr, NMLVCUSTOMDR return notify_customdraw(infoPtr, CDDS_POSTPAINT, lpnmlvcd); } +static void notify_measureitem(LISTVIEW_INFO *infoPtr) +{ + MEASUREITEMSTRUCT mis; + mis.CtlType = ODT_LISTVIEW; + mis.CtlID = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); + mis.itemID = -1; + mis.itemWidth = 0; + mis.itemData = 0; + mis.itemHeight= infoPtr->nItemHeight; + SendMessageW(infoPtr->hwndNotify, WM_MEASUREITEM, mis.CtlID, (LPARAM)&mis); + if (infoPtr->nItemHeight != max(mis.itemHeight, 1)) + infoPtr->nMeasureItemHeight = infoPtr->nItemHeight = max(mis.itemHeight, 1); +} + /******** Item iterator functions **********************************/ static RANGES ranges_create(int count); @@ -8654,6 +8668,8 @@ static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) ShowWindow(infoPtr->hwndHeader, SW_SHOWNORMAL); } LISTVIEW_UpdateScroll(infoPtr); + /* send WM_MEASUREITEM notification */ + if (infoPtr->dwStyle & LVS_OWNERDRAWFIXED) notify_measureitem(infoPtr); } OpenThemeData(hwnd, themeClass); @@ -10776,16 +10792,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) if ((infoPtr->dwStyle & LVS_OWNERDRAWFIXED) && (infoPtr->uView == LV_VIEW_DETAILS)) { - MEASUREITEMSTRUCT mis; - mis.CtlType = ODT_LISTVIEW; - mis.CtlID = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); - mis.itemID = -1; - mis.itemWidth = 0; - mis.itemData = 0; - mis.itemHeight= infoPtr->nItemHeight; - SendMessageW(infoPtr->hwndNotify, WM_MEASUREITEM, mis.CtlID, (LPARAM)&mis); - if (infoPtr->nItemHeight != max(mis.itemHeight, 1)) - infoPtr->nMeasureItemHeight = infoPtr->nItemHeight = max(mis.itemHeight, 1); + notify_measureitem(infoPtr); } LISTVIEW_UpdateSize(infoPtr); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 820acc6..38155b1 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1405,7 +1405,7 @@ static void test_create(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); hList = create_listview_control(LVS_OWNERDRAWFIXED); ok_sequence(sequences, PARENT_SEQ_INDEX, create_ownerdrawfixed_parent_seq, - "created with LVS_OWNERDRAWFIXED - parent seq", TRUE); + "created with LVS_OWNERDRAWFIXED|LVS_REPORT - parent seq", FALSE); DestroyWindow(hList); }

1 0