November 2010 - Wine-commits

Huw Davies : ole32: Remove some useless comments.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: 6b05b2a927132bc1199383df0e7d195d4c4a8db5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b05b2a927132bc1199383df0… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 1 13:11:37 2010 +0000 ole32: Remove some useless comments. --- dlls/ole32/datacache.c | 123 ++---------------------------------------------- 1 files changed, 5 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b05b2a927132bc119938…

1 0

Nikolay Sivov : comctl32/treeview: Make item data layout partially compatible with native one.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: 6ec621e835e03f715d5fee27c5de5b0d361814de URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ec621e835e03f715d5fee27c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 31 01:32:36 2010 +0400 comctl32/treeview: Make item data layout partially compatible with native one. --- dlls/comctl32/tests/treeview.c | 53 ++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/treeview.c | 7 +++-- 2 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 5088d91..dddaa9d 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1369,6 +1369,57 @@ static void test_delete_items(void) DestroyWindow(hTree); } +struct _ITEM_DATA +{ + HTREEITEM parent; /* for root value of parent field is unidetified */ + HTREEITEM nextsibling; + HTREEITEM firstchild; +}; + +static void _check_item(HTREEITEM item, HTREEITEM parent, HTREEITEM nextsibling, HTREEITEM firstchild, int line) +{ + struct _ITEM_DATA *data = (struct _ITEM_DATA*)item; + + ok_(__FILE__, line)(data->parent == parent, "parent %p, got %p\n", parent, data->parent); + ok_(__FILE__, line)(data->nextsibling == nextsibling, "sibling %p, got %p\n", nextsibling, data->nextsibling); + ok_(__FILE__, line)(data->firstchild == firstchild, "firstchild %p, got %p\n", firstchild, data->firstchild); +} + +#define check_item(a, b, c, d) _check_item(a, b, c, d, __LINE__) + +static void test_htreeitem_layout(void) +{ + TVINSERTSTRUCTA ins; + HTREEITEM item1, item2; + HWND hTree; + + hTree = create_treeview_control(); + fill_tree(hTree); + + /* root has some special pointer in parent field */ + check_item(hRoot, ((struct _ITEM_DATA*)hRoot)->parent, 0, hChild); + check_item(hChild, hRoot, 0, 0); + + ins.hParent = hChild; + ins.hInsertAfter = TVI_FIRST; + item1 = TreeView_InsertItem(hTree, &ins); + + check_item(item1, hChild, 0, 0); + + ins.hParent = hRoot; + ins.hInsertAfter = TVI_FIRST; + item2 = TreeView_InsertItem(hTree, &ins); + + check_item(item2, hRoot, hChild, 0); + + SendMessage(hTree, TVM_DELETEITEM, 0, (LPARAM)hChild); + + /* without children now */ + check_item(hRoot, ((struct _ITEM_DATA*)hRoot)->parent, 0, item2); + + DestroyWindow(hTree); +} + START_TEST(treeview) { HMODULE hComctl32; @@ -1437,6 +1488,7 @@ START_TEST(treeview) test_TVS_SINGLEEXPAND(); test_WM_PAINT(); test_delete_items(); + test_htreeitem_layout(); if (!load_v6_module(&ctx_cookie, &hCtx)) { @@ -1461,6 +1513,7 @@ START_TEST(treeview) /* comctl32 version 6 tests start here */ test_expandedimage(); + test_htreeitem_layout(); unload_v6_module(ctx_cookie, hCtx); diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index f8c28de..1e80c19 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -70,6 +70,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(treeview); typedef struct _TREEITEM /* HTREEITEM is a _TREEINFO *. */ { + HTREEITEM parent; /* handle to parent or 0 if at root */ + HTREEITEM nextSibling; /* handle to next item in list, 0 if last */ + HTREEITEM firstChild; /* handle to first child or 0 if no child */ + UINT callbackMask; UINT state; UINT stateMask; @@ -82,11 +86,8 @@ typedef struct _TREEITEM /* HTREEITEM is a _TREEINFO *. */ LPARAM lParam; int iIntegral; /* item height multiplier (1 is normal) */ int iLevel; /* indentation level:0=root level */ - HTREEITEM parent; /* handle to parent or 0 if at root */ - HTREEITEM firstChild; /* handle to first child or 0 if no child */ HTREEITEM lastChild; HTREEITEM prevSibling; /* handle to prev item in list, 0 if first */ - HTREEITEM nextSibling; /* handle to next item in list, 0 if last */ RECT rect; LONG linesOffset; LONG stateOffset;

1 0

Huw Davies : ole32/tests: Add tests to exercise the datacache's IDataObject ::GetData.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: ad326999ec01a270f7011602fbf1d73282098f42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad326999ec01a270f7011602f… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 26 14:22:19 2010 +0100 ole32/tests: Add tests to exercise the datacache's IDataObject::GetData. --- dlls/ole32/tests/ole2.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 103 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 7fadb7d..460a08f 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -69,6 +69,8 @@ static BOOL g_isRunning = TRUE; static BOOL g_failGetMiscStatus; static HRESULT g_QIFailsWith; +static UINT cf_test_1, cf_test_2, cf_test_3; + #define CHECK_EXPECTED_METHOD(method_name) \ do { \ trace("%s\n", method_name); \ @@ -1063,6 +1065,8 @@ static HRESULT WINAPI DataObject_QueryInterface( REFIID riid, void** ppvObject) { + CHECK_EXPECTED_METHOD("DataObject_QueryInterface"); + if (IsEqualIID(riid, &IID_IDataObject) || IsEqualIID(riid, &IID_IUnknown)) { *ppvObject = iface; @@ -1075,12 +1079,14 @@ static HRESULT WINAPI DataObject_QueryInterface( static ULONG WINAPI DataObject_AddRef( IDataObject* iface) { + CHECK_EXPECTED_METHOD("DataObject_AddRef"); return 2; } static ULONG WINAPI DataObject_Release( IDataObject* iface) { + CHECK_EXPECTED_METHOD("DataObject_Release"); return 1; } @@ -1145,8 +1151,20 @@ static HRESULT WINAPI DataObject_DAdvise( IAdviseSink* pAdvSink, DWORD* pdwConnection) { + STGMEDIUM stgmedium; + CHECK_EXPECTED_METHOD("DataObject_DAdvise"); *pdwConnection = 1; + + if(advf & ADVF_PRIMEFIRST) + { + ok(pformatetc->cfFormat == cf_test_2, "got %04x\n", pformatetc->cfFormat); + stgmedium.tymed = TYMED_HGLOBAL; + U(stgmedium).hGlobal = GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, 4); + stgmedium.pUnkForRelease = NULL; + IAdviseSink_OnDataChange(pAdvSink, pformatetc, &stgmedium); + } + return S_OK; } @@ -1192,6 +1210,7 @@ static void test_data_cache(void) IPersistStorage *pPS; IViewObject *pViewObject; IOleCacheControl *pOleCacheControl; + IDataObject *pCacheDataObject; FORMATETC fmtetc; STGMEDIUM stgmedium; DWORD dwConnection; @@ -1226,6 +1245,19 @@ static void test_data_cache(void) { "DataObject_GetData", 0 }, { NULL, 0 } }; + static const struct expected_method methods_cachethenrun[] = + { + { "DataObject_DAdvise", 0 }, + { "DataObject_DAdvise", 0 }, + { "DataObject_DAdvise", 0 }, + { "DataObject_QueryGetData", 1 }, /* called by win9x and nt4 */ + { "DataObject_DAdvise", 0 }, + { "DataObject_DUnadvise", 0 }, + { "DataObject_DUnadvise", 0 }, + { "DataObject_DUnadvise", 0 }, + { "DataObject_DUnadvise", 0 }, + { NULL, 0 } + }; GetSystemDirectory(szSystemDir, sizeof(szSystemDir)/sizeof(szSystemDir[0])); @@ -1340,6 +1372,7 @@ static void test_data_cache(void) fmtetc.dwAspect = DVASPECT_ICON; hr = IOleCache_SetData(pOleCache, &fmtetc, &stgmedium, FALSE); ok_ole_success(hr, "IOleCache_SetData"); + ReleaseStgMedium(&stgmedium); hr = IViewObject_Freeze(pViewObject, DVASPECT_ICON, -1, NULL, &dwFreeze); todo_wine { @@ -1467,8 +1500,73 @@ static void test_data_cache(void) CHECK_NO_EXTRA_METHODS(); } - IStorage_Release(pStorage); + hr = CreateDataCache(NULL, &CLSID_NULL, &IID_IOleCache2, (LPVOID *)&pOleCache); + ok_ole_success(hr, "CreateDataCache"); + + expected_method_list = methods_cachethenrun; + + hr = IOleCache_QueryInterface(pOleCache, &IID_IDataObject, (LPVOID *)&pCacheDataObject); + ok_ole_success(hr, "IOleCache_QueryInterface(IID_IDataObject)"); + hr = IOleCache_QueryInterface(pOleCache, &IID_IOleCacheControl, (LPVOID *)&pOleCacheControl); + ok_ole_success(hr, "IOleCache_QueryInterface(IID_IOleCacheControl)"); + + fmtetc.cfFormat = CF_METAFILEPICT; + fmtetc.dwAspect = DVASPECT_CONTENT; + fmtetc.tymed = TYMED_MFPICT; + + hr = IOleCache_Cache(pOleCache, &fmtetc, 0, &dwConnection); + ok_ole_success(hr, "IOleCache_Cache"); + + hr = IDataObject_GetData(pCacheDataObject, &fmtetc, &stgmedium); + ok(hr == OLE_E_BLANK, "got %08x\n", hr); + + fmtetc.cfFormat = cf_test_1; + fmtetc.dwAspect = DVASPECT_CONTENT; + fmtetc.tymed = TYMED_HGLOBAL; + + hr = IOleCache_Cache(pOleCache, &fmtetc, 0, &dwConnection); + ok(hr == CACHE_S_FORMATETC_NOTSUPPORTED, "got %08x\n", hr); + + hr = IDataObject_GetData(pCacheDataObject, &fmtetc, &stgmedium); + ok(hr == OLE_E_BLANK, "got %08x\n", hr); + + fmtetc.cfFormat = cf_test_2; + hr = IOleCache_Cache(pOleCache, &fmtetc, ADVF_PRIMEFIRST, &dwConnection); + ok(hr == CACHE_S_FORMATETC_NOTSUPPORTED, "got %08x\n", hr); + + hr = IDataObject_GetData(pCacheDataObject, &fmtetc, &stgmedium); + ok(hr == OLE_E_BLANK, "got %08x\n", hr); + + hr = IOleCacheControl_OnRun(pOleCacheControl, &DataObject); +todo_wine + ok_ole_success(hr, "IOleCacheControl_OnRun"); + + fmtetc.cfFormat = cf_test_3; + hr = IOleCache_Cache(pOleCache, &fmtetc, 0, &dwConnection); + ok(hr == CACHE_S_FORMATETC_NOTSUPPORTED, "got %08x\n", hr); + + fmtetc.cfFormat = cf_test_1; + hr = IDataObject_GetData(pCacheDataObject, &fmtetc, &stgmedium); + ok(hr == OLE_E_BLANK, "got %08x\n", hr); + + fmtetc.cfFormat = cf_test_2; + hr = IDataObject_GetData(pCacheDataObject, &fmtetc, &stgmedium); +todo_wine + ok(hr == S_OK, "got %08x\n", hr); ReleaseStgMedium(&stgmedium); + + fmtetc.cfFormat = cf_test_3; + hr = IDataObject_GetData(pCacheDataObject, &fmtetc, &stgmedium); + ok(hr == OLE_E_BLANK, "got %08x\n", hr); + + IOleCacheControl_Release(pOleCacheControl); + IDataObject_Release(pCacheDataObject); + IOleCache_Release(pOleCache); + +todo_wine + CHECK_NO_EXTRA_METHODS(); + + IStorage_Release(pStorage); } static void test_default_handler(void) @@ -1758,6 +1856,10 @@ START_TEST(ole2) STATSTG statstg; HRESULT hr; + cf_test_1 = RegisterClipboardFormatA("cf_winetest_1"); + cf_test_2 = RegisterClipboardFormatA("cf_winetest_2"); + cf_test_3 = RegisterClipboardFormatA("cf_winetest_3"); + CoInitialize(NULL); hr = CoRegisterClassObject(&CLSID_Equation3, (IUnknown *)&OleObjectCF, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &dwRegister);

1 0

Huw Davies : ole32: Add a stub advise sink object to the data cache.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: 4d137e4702349c3dabea18f4e31faf2f7a5d1d34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d137e4702349c3dabea18f4e… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 26 14:35:14 2010 +0100 ole32: Add a stub advise sink object to the data cache. --- dlls/ole32/datacache.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 81 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index db4cc0c..9f183b7 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -126,6 +126,10 @@ struct DataCache const IOleCache2Vtbl* lpvtblIOleCache2; const IOleCacheControlVtbl* lpvtblIOleCacheControl; + /* The sink that is connected to a remote object. + The other interfaces are not available by QI'ing the sink and vice-versa */ + const IAdviseSinkVtbl* lpvtblIAdviseSink; + /* * Reference count of this object */ @@ -193,6 +197,11 @@ static inline DataCache *impl_from_IOleCacheControl( IOleCacheControl *iface ) return (DataCache *)((char*)iface - FIELD_OFFSET(DataCache, lpvtblIOleCacheControl)); } +static inline DataCache *impl_from_IAdviseSink( IAdviseSink *iface ) +{ + return (DataCache *)((char*)iface - FIELD_OFFSET(DataCache, lpvtblIAdviseSink)); +} + static const char * debugstr_formatetc(const FORMATETC *formatetc) { return wine_dbg_sprintf("{ cfFormat = 0x%x, ptd = %p, dwAspect = %d, lindex = %d, tymed = %d }", @@ -2163,6 +2172,64 @@ static HRESULT WINAPI DataCache_OnStop( return E_NOTIMPL; } +/************************************************************************ + * IAdviseSink methods. + * This behaves as an internal object to the data cache. QI'ing its ptr doesn't + * give access to the cache's other interfaces. We don't maintain a ref count, + * the object exists as long as the cache is around. + */ +static HRESULT WINAPI DataCache_IAdviseSink_QueryInterface(IAdviseSink *iface, REFIID iid, void **obj) +{ + *obj = NULL; + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IAdviseSink, iid)) + { + *obj = iface; + } + + if(*obj) + { + IAdviseSink_AddRef(iface); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI DataCache_IAdviseSink_AddRef(IAdviseSink *iface) +{ + return 2; +} + +static ULONG WINAPI DataCache_IAdviseSink_Release(IAdviseSink *iface) +{ + return 1; +} + +static void WINAPI DataCache_OnDataChange(IAdviseSink *iface, FORMATETC *fmt, STGMEDIUM *med) +{ + FIXME("stub\n"); +} + +static void WINAPI DataCache_OnViewChange(IAdviseSink *iface, DWORD aspect, LONG index) +{ + FIXME("stub\n"); +} + +static void WINAPI DataCache_OnRename(IAdviseSink *iface, IMoniker *mk) +{ + FIXME("stub\n"); +} + +static void WINAPI DataCache_OnSave(IAdviseSink *iface) +{ + FIXME("stub\n"); +} + +static void WINAPI DataCache_OnClose(IAdviseSink *iface) +{ + FIXME("stub\n"); +} + /* * Virtual function tables for the DataCache class. */ @@ -2240,6 +2307,19 @@ static const IOleCacheControlVtbl DataCache_IOleCacheControl_VTable = DataCache_OnStop }; +static const IAdviseSinkVtbl DataCache_IAdviseSink_VTable = +{ + DataCache_IAdviseSink_QueryInterface, + DataCache_IAdviseSink_AddRef, + DataCache_IAdviseSink_Release, + DataCache_OnDataChange, + DataCache_OnViewChange, + DataCache_OnRename, + DataCache_OnSave, + DataCache_OnClose +}; + + /****************************************************************************** * CreateDataCache [OLE32.@] * @@ -2338,6 +2418,7 @@ static DataCache* DataCache_Construct( newObject->lpvtblIViewObject = &DataCache_IViewObject2_VTable; newObject->lpvtblIOleCache2 = &DataCache_IOleCache2_VTable; newObject->lpvtblIOleCacheControl = &DataCache_IOleCacheControl_VTable; + newObject->lpvtblIAdviseSink = &DataCache_IAdviseSink_VTable; /* * Start with one reference count. The caller of this function

1 0

Henri Verbeet : d3dcompiler_43/tests: Calculate the probe count.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: 362da026b05fc9c2922ad0a2aef90b41c136e5ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=362da026b05fc9c2922ad0a2a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 1 11:58:00 2010 +0100 d3dcompiler_43/tests: Calculate the probe count. --- dlls/d3dcompiler_43/tests/hlsl.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index 88acbe9..bab11a6 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -295,7 +295,7 @@ static void compute_shader_probe9(IDirect3DDevice9 *device, IDirect3DVertexShade static void test_swizzle(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geometry, IDirect3DVertexShader9 *vshader_passthru) { - static const struct hlsl_probe_info swizzle_test_probes[] = + static const struct hlsl_probe_info probes[] = { {0, 0, {0.0101f, 0.0303f, 0.0202f, 0.0404f}, 0.0001f, "swizzle_test failed"} }; @@ -318,8 +318,8 @@ static void test_swizzle(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_ { set_float4_d3d9(device, constants, "color", 0.0303f, 0.0f, 0.0f, 0.0202f); - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, swizzle_test_probes, - 1, 1, 1, __LINE__); + compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, + probes, sizeof(probes) / sizeof(*probes), 1, 1, __LINE__); IUnknown_Release(constants); IUnknown_Release(pshader); @@ -332,7 +332,7 @@ static void test_math(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geo /* Tests order of operations */ static const float u = 2.5f, v = 0.3f, w = 0.2f, x = 0.7f, y = 0.1f, z = 1.5f; - static const struct hlsl_probe_info order_of_operations_probes[] = + static const struct hlsl_probe_info probes[] = { {0, 0, {-12.4300f, 9.8333f, 1.6000f, 34.9999f}, 0.0001f, "order of operations test failed"} @@ -362,7 +362,7 @@ static void test_math(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 *quad_geo ID3DXConstantTable_SetFloat(constants, device, "$z", z); compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, - order_of_operations_probes, 1, 1, 1, __LINE__); + probes, sizeof(probes) / sizeof(*probes), 1, 1, __LINE__); IUnknown_Release(constants); IUnknown_Release(pshader); @@ -415,8 +415,8 @@ static void test_conditionals(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 * pshader = compile_pixel_shader9(device, if_greater_shader, "ps_2_0", &constants); if (pshader != NULL) { - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, - if_greater_probes, 6, 32, 1, __LINE__); + compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, if_greater_probes, + sizeof(if_greater_probes) / sizeof(*if_greater_probes), 32, 1, __LINE__); IUnknown_Release(constants); IUnknown_Release(pshader); @@ -425,8 +425,8 @@ static void test_conditionals(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 * pshader = compile_pixel_shader9(device, ternary_operator_shader, "ps_2_0", &constants); if (pshader != NULL) { - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, - ternary_operator_probes, 7, 8, 1, __LINE__); + compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, ternary_operator_probes, + sizeof(ternary_operator_probes) / sizeof(*ternary_operator_probes), 8, 1, __LINE__); IUnknown_Release(constants); IUnknown_Release(pshader); @@ -474,8 +474,8 @@ static void test_float_vectors(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 pshader = compile_pixel_shader9(device, vec4_indexing_test1_shader, "ps_2_0", &constants); if (pshader != NULL) { - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, - vec4_indexing_test1_probes, 1, 1, 1, __LINE__); + compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, vec4_indexing_test1_probes, + sizeof(vec4_indexing_test1_probes) / sizeof(*vec4_indexing_test1_probes), 1, 1, __LINE__); IUnknown_Release(constants); IUnknown_Release(pshader); @@ -486,8 +486,8 @@ static void test_float_vectors(IDirect3DDevice9 *device, IDirect3DVertexBuffer9 { ID3DXConstantTable_SetInt(constants, device, "i", 2); - compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, - vec4_indexing_test2_probes, 1, 32, 1, __LINE__); + compute_shader_probe9(device, vshader_passthru, pshader, quad_geometry, vec4_indexing_test2_probes, + sizeof(vec4_indexing_test2_probes) / sizeof(*vec4_indexing_test2_probes), 32, 1, __LINE__); IUnknown_Release(constants); IUnknown_Release(pshader);

1 0

Aric Stewart : strmbase: More properly standardized pin implementations for NewSegment.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: 7e8751b2e1e9cc6faa0bca527063f17a7de5f33e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e8751b2e1e9cc6faa0bca527… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 1 07:42:14 2010 -0500 strmbase: More properly standardized pin implementations for NewSegment. --- dlls/qcap/vfwcapture.c | 11 +---------- dlls/quartz/filesource.c | 2 +- dlls/quartz/parser.c | 2 +- dlls/quartz/videorenderer.c | 2 +- dlls/strmbase/pin.c | 39 +++++++++++++++++++++++---------------- dlls/strmbase/transform.c | 2 +- dlls/winegstreamer/gstdemux.c | 3 ++- include/wine/strmbase.h | 8 ++++---- 8 files changed, 34 insertions(+), 35 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 93542f4..387a05e 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -792,15 +792,6 @@ VfwPin_QueryInternalConnections(IPin * iface, IPin ** apPin, ULONG * cPin) return E_NOTIMPL; } -static HRESULT WINAPI -VfwPin_NewSegment(IPin * iface, REFERENCE_TIME tStart, - REFERENCE_TIME tStop, double dRate) -{ - TRACE("(%p)->(%s, %s, %e)\n", iface, wine_dbgstr_longlong(tStart), - wine_dbgstr_longlong(tStop), dRate); - return E_UNEXPECTED; -} - static const IPinVtbl VfwPin_Vtbl = { VfwPin_QueryInterface, @@ -820,5 +811,5 @@ static const IPinVtbl VfwPin_Vtbl = BaseOutputPinImpl_EndOfStream, BaseOutputPinImpl_BeginFlush, BaseOutputPinImpl_EndFlush, - VfwPin_NewSegment + BasePinImpl_NewSegment }; diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index a05f605..2f91849 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -779,7 +779,7 @@ static const IPinVtbl FileAsyncReaderPin_Vtbl = BaseOutputPinImpl_EndOfStream, BaseOutputPinImpl_BeginFlush, BaseOutputPinImpl_EndFlush, - BaseOutputPinImpl_NewSegment + BasePinImpl_NewSegment }; /* Function called as a helper to IPin_Connect */ diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 1a2e7b3..f60bd23 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -701,7 +701,7 @@ static const IPinVtbl Parser_OutputPin_Vtbl = BaseOutputPinImpl_EndOfStream, BaseOutputPinImpl_BeginFlush, BaseOutputPinImpl_EndFlush, - BaseOutputPinImpl_NewSegment + BasePinImpl_NewSegment }; static HRESULT WINAPI Parser_PullPin_Disconnect(IPin * iface) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index b309b1c..11e6099 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -455,7 +455,7 @@ static HRESULT WINAPI VideoRenderer_Receive(BaseInputPin* pin, IMediaSample * pS IReferenceClock_GetTime(This->filter.pClock, &time); trefstart = This->filter.rtStreamStart; - trefstop = (REFERENCE_TIME)((double)(tStop - tStart) / This->pInputPin->dRate) + This->filter.rtStreamStart; + trefstop = (REFERENCE_TIME)((double)(tStop - tStart) / This->pInputPin->pin.dRate) + This->filter.rtStreamStart; delta = (LONG)((trefstart-time)/10000); This->filter.rtStreamStart = trefstop; This->rtLastStop = tStop; diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index d985d6d..1b0b48c 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -332,6 +332,19 @@ HRESULT WINAPI BasePinImpl_QueryInternalConnections(IPin * iface, IPin ** apPin, return E_NOTIMPL; /* to tell caller that all input pins connected to all output pins */ } +HRESULT WINAPI BasePinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) +{ + BasePin *This = (BasePin *)iface; + + TRACE("(%x%08x, %x%08x, %e)\n", (ULONG)(tStart >> 32), (ULONG)tStart, (ULONG)(tStop >> 32), (ULONG)tStop, dRate); + + This->tStart = tStart; + This->tStop = tStop; + This->dRate = dRate; + + return S_OK; +} + /*** OutputPin implementation ***/ HRESULT WINAPI BaseOutputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) @@ -522,15 +535,6 @@ HRESULT WINAPI BaseOutputPinImpl_EndFlush(IPin * iface) return E_UNEXPECTED; } -HRESULT WINAPI BaseOutputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) -{ - TRACE("(%p)->(%x%08x, %x%08x, %e)\n", iface, (ULONG)(tStart >> 32), (ULONG)tStart, (ULONG)(tStop >> 32), (ULONG)tStop, dRate); - - /* not supposed to do anything in an output pin */ - - return E_UNEXPECTED; -} - static const IPinVtbl OutputPin_Vtbl = { BaseOutputPinImpl_QueryInterface, @@ -550,7 +554,7 @@ static const IPinVtbl OutputPin_Vtbl = BaseOutputPinImpl_EndOfStream, BaseOutputPinImpl_BeginFlush, BaseOutputPinImpl_EndFlush, - BaseOutputPinImpl_NewSegment + BasePinImpl_NewSegment }; HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(BaseOutputPin *This, IMediaSample ** ppSample, REFERENCE_TIME * tStart, REFERENCE_TIME * tStop, DWORD dwFlags) @@ -813,6 +817,9 @@ static HRESULT OutputPin_Init(const IPinVtbl *OutputPin_Vtbl, const PIN_INFO * p pPinImpl->pin.refCount = 1; pPinImpl->pin.pConnectedTo = NULL; pPinImpl->pin.pCritSec = pCritSec; + pPinImpl->pin.tStart = 0; + pPinImpl->pin.tStop = 0; + pPinImpl->pin.dRate = 1.0; Copy_PinInfo(&pPinImpl->pin.pinInfo, pPinInfo); pPinImpl->pin.pFuncsTable = pBaseFuncsTable; ZeroMemory(&pPinImpl->pin.mtCurrent, sizeof(AM_MEDIA_TYPE)); @@ -1048,9 +1055,9 @@ HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, TRACE("(%x%08x, %x%08x, %e)\n", (ULONG)(tStart >> 32), (ULONG)tStart, (ULONG)(tStop >> 32), (ULONG)tStop, dRate); - args.tStart = This->tStart = tStart; - args.tStop = This->tStop = tStop; - args.rate = This->dRate = dRate; + args.tStart = This->pin.tStart = tStart; + args.tStop = This->pin.tStop = tStop; + args.rate = This->pin.dRate = dRate; return SendFurther( iface, deliver_newsegment, &args, NULL ); } @@ -1218,6 +1225,9 @@ static HRESULT InputPin_Init(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPi pPinImpl->pin.refCount = 1; pPinImpl->pin.pConnectedTo = NULL; pPinImpl->pin.pCritSec = pCritSec; + pPinImpl->pin.tStart = 0; + pPinImpl->pin.tStop = 0; + pPinImpl->pin.dRate = 1.0; Copy_PinInfo(&pPinImpl->pin.pinInfo, pPinInfo); ZeroMemory(&pPinImpl->pin.mtCurrent, sizeof(AM_MEDIA_TYPE)); pPinImpl->pin.pFuncsTable = pBaseFuncsTable; @@ -1227,9 +1237,6 @@ static HRESULT InputPin_Init(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPi pPinImpl->pAllocator = pPinImpl->preferred_allocator = allocator; if (pPinImpl->preferred_allocator) IMemAllocator_AddRef(pPinImpl->preferred_allocator); - pPinImpl->tStart = 0; - pPinImpl->tStop = 0; - pPinImpl->dRate = 1.0; pPinImpl->pin.lpVtbl = InputPin_Vtbl; pPinImpl->lpVtblMemInput = &MemInputPin_Vtbl; pPinImpl->flushing = pPinImpl->end_of_stream = 0; diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 7a4cb84..e17620c 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -545,5 +545,5 @@ static const IPinVtbl TransformFilter_OutputPin_Vtbl = BaseOutputPinImpl_EndOfStream, BaseOutputPinImpl_BeginFlush, BaseOutputPinImpl_EndFlush, - BaseOutputPinImpl_NewSegment + BasePinImpl_NewSegment }; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 45a3c4e..84d9dad 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1387,7 +1387,7 @@ static const IPinVtbl GST_OutputPin_Vtbl = { BaseOutputPinImpl_EndOfStream, BaseOutputPinImpl_BeginFlush, BaseOutputPinImpl_EndFlush, - BaseOutputPinImpl_NewSegment + BasePinImpl_NewSegment }; static const BasePinFuncTable output_BaseFuncTable = { @@ -1580,6 +1580,7 @@ static HRESULT WINAPI GSTInPin_NewSegment(IPin *iface, REFERENCE_TIME tStart, RE GSTInPin *pin = (GSTInPin*)iface; GSTImpl *This = (GSTImpl*)pin->pin.pinInfo.pFilter; + BasePinImpl_NewSegment(iface, tStart, tStop, dRate); FIXME("Propagate message on %p\n", This); return S_OK; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 07913fe..21b6dfc 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -34,6 +34,9 @@ typedef struct BasePin PIN_INFO pinInfo; IPin * pConnectedTo; AM_MEDIA_TYPE mtCurrent; + REFERENCE_TIME tStart; + REFERENCE_TIME tStop; + double dRate; const struct BasePinFuncTable* pFuncsTable; } BasePin; @@ -81,9 +84,6 @@ typedef struct BaseInputPin const IMemInputPinVtbl * lpVtblMemInput; IMemAllocator * pAllocator; - REFERENCE_TIME tStart; - REFERENCE_TIME tStop; - double dRate; BOOL flushing, end_of_stream; IMemAllocator *preferred_allocator; @@ -110,6 +110,7 @@ HRESULT WINAPI BasePinImpl_QueryId(IPin * iface, LPWSTR * Id); HRESULT WINAPI BasePinImpl_QueryAccept(IPin * iface, const AM_MEDIA_TYPE * pmt); HRESULT WINAPI BasePinImpl_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum); HRESULT WINAPI BasePinImpl_QueryInternalConnections(IPin * iface, IPin ** apPin, ULONG * cPin); +HRESULT WINAPI BasePinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate); /* Base Output Pin */ HRESULT WINAPI BaseOutputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv); @@ -120,7 +121,6 @@ HRESULT WINAPI BaseOutputPinImpl_Disconnect(IPin * iface); HRESULT WINAPI BaseOutputPinImpl_EndOfStream(IPin * iface); HRESULT WINAPI BaseOutputPinImpl_BeginFlush(IPin * iface); HRESULT WINAPI BaseOutputPinImpl_EndFlush(IPin * iface); -HRESULT WINAPI BaseOutputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate); HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(BaseOutputPin * This, IMediaSample ** ppSample, REFERENCE_TIME * tStart, REFERENCE_TIME * tStop, DWORD dwFlags); HRESULT WINAPI BaseOutputPinImpl_Deliver(BaseOutputPin * This, IMediaSample * pSample);

1 0

Alexander Morozov : crypt32/tests: Add tests for enveloped messages.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: f45ac5a4a2814ba3af1a2599a47cdce47916bc53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f45ac5a4a2814ba3af1a2599a… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Thu Jul 15 19:36:35 2010 +0400 crypt32/tests: Add tests for enveloped messages. --- dlls/crypt32/tests/msg.c | 255 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 255 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 39662eb..a3c96e1 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2031,6 +2031,260 @@ static void test_signed_msg(void) test_signed_msg_get_param(); } +static char oid_rsa_rc4[] = szOID_RSA_RC4; + +static void test_enveloped_msg_open(void) +{ + HCRYPTMSG msg; + BOOL ret; + CMSG_ENVELOPED_ENCODE_INFO envelopedInfo = { 0 }; + PCCERT_CONTEXT context; + + SetLastError(0xdeadbeef); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, + &envelopedInfo, NULL, NULL); + todo_wine + ok(!msg && GetLastError() == E_INVALIDARG, + "expected E_INVALIDARG, got %08x\n", GetLastError()); + + envelopedInfo.cbSize = sizeof(envelopedInfo); + SetLastError(0xdeadbeef); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, + &envelopedInfo, NULL, NULL); + todo_wine + ok(!msg && + (GetLastError() == CRYPT_E_UNKNOWN_ALGO || + GetLastError() == E_INVALIDARG), /* Win9x */ + "expected CRYPT_E_UNKNOWN_ALGO or E_INVALIDARG, got %08x\n", GetLastError()); + + envelopedInfo.ContentEncryptionAlgorithm.pszObjId = oid_rsa_rc4; + SetLastError(0xdeadbeef); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, + &envelopedInfo, NULL, NULL); + todo_wine + ok(msg != NULL || + broken(!msg), /* Win9x */ + "CryptMsgOpenToEncode failed: %08x\n", GetLastError()); + CryptMsgClose(msg); + + envelopedInfo.cRecipients = 1; + if (!old_crypt32) + { + SetLastError(0xdeadbeef); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, + &envelopedInfo, NULL, NULL); + todo_wine + ok(!msg && GetLastError() == E_INVALIDARG, + "expected E_INVALIDARG, got %08x\n", GetLastError()); + } + + SetLastError(0xdeadbeef); + context = CertCreateCertificateContext(X509_ASN_ENCODING, + v1CertWithValidPubKey, sizeof(v1CertWithValidPubKey)); + ok(context != NULL, "CertCreateCertificateContext failed: %08x\n", + GetLastError()); + envelopedInfo.rgpRecipientCert = (PCERT_INFO *)&context->pCertInfo; + SetLastError(0xdeadbeef); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, + &envelopedInfo, NULL, NULL); + todo_wine + ok(msg != NULL, "CryptMsgOpenToEncode failed: %08x\n", GetLastError()); + CryptMsgClose(msg); + + SetLastError(0xdeadbeef); + ret = pCryptAcquireContextA(&envelopedInfo.hCryptProv, NULL, NULL, + PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + ok(ret, "CryptAcquireContextA failed: %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, + &envelopedInfo, NULL, NULL); + todo_wine + ok(msg != NULL, "CryptMsgOpenToEncode failed: %08x\n", GetLastError()); + CryptMsgClose(msg); + + CryptReleaseContext(envelopedInfo.hCryptProv, 0); + CertFreeCertificateContext(context); +} + +static void test_enveloped_msg_update(void) +{ + HCRYPTMSG msg; + BOOL ret; + CMSG_ENVELOPED_ENCODE_INFO envelopedInfo = { sizeof(envelopedInfo), 0, + { oid_rsa_rc4, { 0, NULL } }, NULL }; + CMSG_STREAM_INFO streamInfo = { 0, nop_stream_output, NULL }; + + SetLastError(0xdeadbeef); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, + &envelopedInfo, NULL, NULL); + todo_wine + ok(msg != NULL || + broken(!msg), /* Win9x */ + "CryptMsgOpenToEncode failed: %08x\n", GetLastError()); + if (msg) + { + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, NULL, 0, FALSE); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, + "expected CRYPT_E_MSG_ERROR, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, NULL, 0, TRUE); + todo_wine + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, NULL, 0, TRUE); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, + "expected CRYPT_E_MSG_ERROR, got %08x\n", GetLastError()); + CryptMsgClose(msg); + } + SetLastError(0xdeadbeef); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, + &envelopedInfo, NULL, NULL); + todo_wine + ok(msg != NULL || + broken(!msg), /* Win9x */ + "CryptMsgOpenToEncode failed: %08x\n", GetLastError()); + if (msg) + { + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, + "expected CRYPT_E_MSG_ERROR, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + todo_wine + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, NULL, 0, TRUE); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, + "expected CRYPT_E_MSG_ERROR, got %08x\n", GetLastError()); + CryptMsgClose(msg); + } + SetLastError(0xdeadbeef); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, CMSG_DETACHED_FLAG, + CMSG_ENVELOPED, &envelopedInfo, NULL, NULL); + todo_wine + ok(msg != NULL || + broken(!msg), /* Win9x */ + "CryptMsgOpenToEncode failed: %08x\n", GetLastError()); + if (msg) + { + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, NULL, 0, FALSE); + todo_wine + ok(!ret && GetLastError() == E_INVALIDARG, + "expected E_INVALIDARG, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, NULL, 0, TRUE); + todo_wine + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + CryptMsgClose(msg); + } + SetLastError(0xdeadbeef); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, CMSG_DETACHED_FLAG, + CMSG_ENVELOPED, &envelopedInfo, NULL, NULL); + todo_wine + ok(msg != NULL || + broken(!msg), /* Win9x */ + "CryptMsgOpenToEncode failed: %08x\n", GetLastError()); + if (msg) + { + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); + todo_wine + ok(!ret && GetLastError() == E_INVALIDARG, + "expected E_INVALIDARG, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + todo_wine + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + CryptMsgClose(msg); + } + SetLastError(0xdeadbeef); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, + &envelopedInfo, NULL, &streamInfo); + todo_wine + ok(msg != NULL || + broken(!msg), /* Win9x */ + "CryptMsgOpenToEncode failed: %08x\n", GetLastError()); + if (msg) + { + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, NULL, 0, FALSE); + todo_wine + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, NULL, 0, TRUE); + todo_wine + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + CryptMsgClose(msg); + } + SetLastError(0xdeadbeef); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, + &envelopedInfo, NULL, &streamInfo); + todo_wine + ok(msg != NULL || + broken(!msg), /* Win9x */ + "CryptMsgOpenToEncode failed: %08x\n", GetLastError()); + if (msg) + { + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); + todo_wine + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + todo_wine + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + CryptMsgClose(msg); + } +} + +static const BYTE envelopedEmptyBareContent[] = { +0x30,0x22,0x02,0x01,0x00,0x31,0x00,0x30,0x1b,0x06,0x09,0x2a,0x86,0x48,0x86, +0xf7,0x0d,0x01,0x07,0x01,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d, +0x03,0x04,0x05,0x00,0x80,0x00 }; +static const BYTE envelopedEmptyContent[] = { +0x30,0x31,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x03,0xa0,0x24, +0x30,0x22,0x02,0x01,0x00,0x31,0x00,0x30,0x1b,0x06,0x09,0x2a,0x86,0x48,0x86, +0xf7,0x0d,0x01,0x07,0x01,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d, +0x03,0x04,0x05,0x00,0x80,0x00 }; + +static void test_enveloped_msg_encoding(void) +{ + HCRYPTMSG msg; + CMSG_ENVELOPED_ENCODE_INFO envelopedInfo = { sizeof(envelopedInfo), 0, + { oid_rsa_rc4, { 0, NULL } }, NULL }; + + SetLastError(0xdeadbeef); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED, + &envelopedInfo, NULL, NULL); + todo_wine + ok(msg != NULL || + broken(!msg), /* Win9x */ + "CryptMsgOpenToEncode failed: %08x\n", GetLastError()); + if (msg) + { + check_param("enveloped empty bare content", msg, + CMSG_BARE_CONTENT_PARAM, envelopedEmptyBareContent, + sizeof(envelopedEmptyBareContent)); + check_param("enveloped empty content", msg, CMSG_CONTENT_PARAM, + envelopedEmptyContent, sizeof(envelopedEmptyContent)); + CryptMsgClose(msg); + } +} + +static void test_enveloped_msg(void) +{ + test_enveloped_msg_open(); + test_enveloped_msg_update(); + test_enveloped_msg_encoding(); +} + static CRYPT_DATA_BLOB b4 = { 0, NULL }; static const struct update_accum a4 = { 1, &b4 }; @@ -3192,6 +3446,7 @@ START_TEST(msg) test_data_msg(); test_hash_msg(); test_signed_msg(); + test_enveloped_msg(); test_decode_msg(); test_msg_get_and_verify_signer();

1 0

Henri Verbeet : d3dcompiler_43/tests: Make some variables unsigned.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: 04632c060da3ef0284f5358dc69ce58ac07556c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04632c060da3ef0284f5358dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 1 11:57:59 2010 +0100 d3dcompiler_43/tests: Make some variables unsigned. --- dlls/d3dcompiler_43/tests/hlsl.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index c5ccf23..88acbe9 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -31,9 +31,7 @@ struct vertex /* Tells compute_shader_probe* which pixels should be what colors */ struct hlsl_probe_info { - /* The x and y coordinate of the point to check. - When x < 0, this is the last probe */ - int x, y; + unsigned int x, y; /* The expected values in this region */ D3DXCOLOR c; /* The max error for any value */ @@ -215,7 +213,7 @@ static void draw_quad_with_shader9(IDirect3DDevice9 *device, IDirect3DVertexBuff } static void setup_device9(IDirect3DDevice9 *device, IDirect3DSurface9 **render_target, - IDirect3DSurface9 **readback, D3DFORMAT format, int width, int height, + IDirect3DSurface9 **readback, D3DFORMAT format, unsigned int width, unsigned int height, IDirect3DVertexShader9 *vshader, IDirect3DPixelShader9 *pshader) { HRESULT hr; @@ -248,7 +246,8 @@ static int colors_match(D3DXCOLOR a, D3DXCOLOR b, float epsilon) to see if they are as expected. */ static void compute_shader_probe9(IDirect3DDevice9 *device, IDirect3DVertexShader9 *vshader, IDirect3DPixelShader9 *pshader, IDirect3DVertexBuffer9 *quad_geometry, - const struct hlsl_probe_info *probes, int count, int width, int height, int line_number) + const struct hlsl_probe_info *probes, unsigned int count, + unsigned int width, unsigned int height, unsigned int line_number) { IDirect3DSurface9 *render_target; IDirect3DSurface9 *readback; @@ -256,7 +255,7 @@ static void compute_shader_probe9(IDirect3DDevice9 *device, IDirect3DVertexShade HRESULT hr; D3DLOCKED_RECT lr; D3DXCOLOR *pbits_data; - int i; + unsigned int i; setup_device9(device, &render_target, &readback, D3DFMT_A32B32G32R32F, width, height, vshader, pshader);

1 0

Detlef Riekenberg : wer: Add stubs for WerReportCreate + WerReportCloseHandle.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: de5e0cbbf8cd42695eddca4f4ba22743c27c27b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de5e0cbbf8cd42695eddca4f4… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Nov 1 09:22:03 2010 +0100 wer: Add stubs for WerReportCreate + WerReportCloseHandle. --- dlls/wer/main.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wer/wer.spec | 4 +- 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/wer/main.c b/dlls/wer/main.c index a283bae..b577b6b 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -22,6 +22,7 @@ #include "windef.h" #include "winbase.h" +#include "werapi.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wer); @@ -69,3 +70,60 @@ HRESULT WINAPI WerRemoveExcludedApplication(PCWSTR exeName, BOOL allUsers) FIXME("(%s, %d) :stub\n",debugstr_w(exeName), allUsers); return E_NOTIMPL; } + +/*********************************************************************** + * WerReportCloseHandle (wer.@) + * + * Close an error reporting handle and free associated resources + * + * PARAMS + * hreport [i] error reporting handle to close + * + * RETURNS + * Success: S_OK + * Failure: A HRESULT error code + * + */ +HRESULT WINAPI WerReportCloseHandle(HREPORT hreport) +{ + FIXME("(%p) :stub\n", hreport); + + return E_NOTIMPL; +} + +/*********************************************************************** + * WerReportCreate (wer.@) + * + * Create an error report in memory and return a related HANDLE + * + * PARAMS + * eventtype [i] a name for the event type + * reporttype [i] what type of report should be created + * reportinfo [i] NULL or a ptr to a struct with some detailed information + * phandle [o] ptr, where the resulting handle should be saved + * + * RETURNS + * Success: S_OK + * Failure: A HRESULT error code + * + * NOTES + * The event type must be registered at microsoft. Predefined types are + * "APPCRASH" as the default on Windows, "Crash32" and "Crash64" + * + */ +HRESULT WINAPI WerReportCreate(PCWSTR eventtype, WER_REPORT_TYPE reporttype, PWER_REPORT_INFORMATION reportinfo, HREPORT *phandle) +{ + + FIXME("(%s, %d, %p, %p) :stub\n", debugstr_w(eventtype), reporttype, reportinfo, phandle); + if (reportinfo) { + TRACE(".wzFriendlyEventName: %s\n", debugstr_w(reportinfo->wzFriendlyEventName)); + TRACE(".wzApplicationName: %s\n", debugstr_w(reportinfo->wzApplicationName)); + } + + if (phandle) *phandle = NULL; + if (!eventtype || !eventtype[0] || !phandle) { + return E_INVALIDARG; + } + + return E_NOTIMPL; +} diff --git a/dlls/wer/wer.spec b/dlls/wer/wer.spec index b50eb47..6369f85 100644 --- a/dlls/wer/wer.spec +++ b/dlls/wer/wer.spec @@ -65,8 +65,8 @@ @ stdcall WerRemoveExcludedApplication(wstr long) @ stub WerReportAddDump @ stub WerReportAddFile -@ stub WerReportCloseHandle -@ stub WerReportCreate +@ stdcall WerReportCloseHandle(ptr) +@ stdcall WerReportCreate(wstr long ptr ptr) @ stub WerReportSetParameter @ stub WerReportSetUIOption @ stub WerReportSubmit

1 0

Detlef Riekenberg : wer/tests: Add initial tests for WerReportCreate + WerReportCloseHandle.
by Alexandre Julliard 01 Nov '10

01 Nov '10

Module: wine Branch: master Commit: b55e5a006598b14b1e69551d305d8e4f95308d95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b55e5a006598b14b1e69551d3… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Nov 1 09:22:04 2010 +0100 wer/tests: Add initial tests for WerReportCreate + WerReportCloseHandle. --- dlls/wer/tests/main.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 99 insertions(+), 0 deletions(-) diff --git a/dlls/wer/tests/main.c b/dlls/wer/tests/main.c index 183974f..a431789 100644 --- a/dlls/wer/tests/main.c +++ b/dlls/wer/tests/main.c @@ -30,6 +30,7 @@ #include "werapi.h" #include "wine/test.h" +static const WCHAR appcrash[] = {'A','P','P','C','R','A','S','H',0}; static const WCHAR empty[] = {0}; static const WCHAR winetest_wer[] = {'w','i','n','e','t','e','s','t','_','w','e','r','.','e','x','e',0}; @@ -101,10 +102,108 @@ static void test_WerRemoveExcludedApplication(void) } +/* #### */ + +static void test_WerReportCloseHandle(void) +{ + HRESULT hr; + HREPORT report; + + report = (void *) 0xdeadbeef; + hr = WerReportCreate(appcrash, WerReportCritical, NULL, &report); + todo_wine + ok(hr == S_OK, "got 0x%x and %p (expected S_OK)\n", hr, report); + + if (!report) { + skip("Nothing left to test\n"); + return; + } + + /* close the handle */ + hr = WerReportCloseHandle(report); + ok(hr == S_OK, "got 0x%x for %p (expected S_OK)\n", hr, report); + + /* close the handle again */ + hr = WerReportCloseHandle(report); + ok(hr == E_INVALIDARG, "got 0x%x for %p again (expected E_INVALIDARG)\n", hr, report); + + hr = WerReportCloseHandle(NULL); + ok(hr == E_INVALIDARG, "got 0x%x for NULL(expected E_INVALIDARG)\n", hr); +} + +/* #### */ + +static void test_WerReportCreate(void) +{ + HRESULT hr; + HREPORT report; + HREPORT table[8]; + int i; + + report = (void *) 0xdeadbeef; + /* test a simple valid case */ + hr = WerReportCreate(appcrash, WerReportCritical, NULL, &report); + + todo_wine + ok(hr == S_OK, "got 0x%x and %p (expected S_OK)\n", hr, report); + + if (!report) { + skip("Nothing left to test\n"); + return; + } + + hr = WerReportCloseHandle(report); + ok(hr == S_OK, "got 0x%x for %p (expected S_OK)\n", hr, report); + + /* the ptr to store the created handle is always needed */ + hr = WerReportCreate(appcrash, WerReportCritical, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); + + /* the event type must be a valid string */ + report = (void *) 0xdeadbeef; + hr = WerReportCreate(NULL, WerReportCritical, NULL, &report); + ok(hr == E_INVALIDARG, "got 0x%x and %p(expected E_INVALIDARG)\n", hr, report); + + report = (void *) 0xdeadbeef; + hr = WerReportCreate(empty, WerReportCritical, NULL, &report); + ok(hr == E_INVALIDARG, "got 0x%x and %p(expected E_INVALIDARG)\n", hr, report); + + /* WER_REPORT_TYPE is not checked during WerReportCreate */ + for (i = 0; i <= WerReportInvalid + 1; i++) { + report = (void *) 0xdeadbeef; + hr = WerReportCreate(appcrash, i, NULL, &report); + ok(hr == S_OK, "%d: got 0x%x and %p (expected S_OK)\n", i, hr, report); + + hr = WerReportCloseHandle(report); + ok(hr == S_OK, "%d: got 0x%x for %p (expected S_OK)\n", i, hr, report); + + } + report = (void *) 0xdeadbeef; + hr = WerReportCreate(appcrash, 42, NULL, &report); + ok(hr == S_OK, "42: got 0x%x and %p (expected S_OK)\n", hr, report); + + /* multiple active reports are possible */ + memset(table, 0, sizeof(table)); + for (i = 0; i < (sizeof(table) / sizeof(table[0]) -1); i++) { + report = (void *) 0xdeadbeef; + hr = WerReportCreate(appcrash, WerReportCritical, NULL, &table[i]); + ok(hr == S_OK, "%02d: got 0x%x and %p (expected S_OK)\n", i, hr, table[i]); + } + + while (i > 0) { + i--; + hr = WerReportCloseHandle(table[i]); + ok(hr == S_OK, "got 0x%x for %p (expected S_OK)\n", hr, table[i]); + } + +} + /* ########################### */ START_TEST(main) { test_WerAddExcludedApplication(); test_WerRemoveExcludedApplication(); + test_WerReportCloseHandle(); + test_WerReportCreate(); }

1 0