February 2011 - Wine-Commits

Hans Leidekker : msi: Fix a trace.
by Alexandre Julliard Feb. 22, 2011

Feb. 22, 2011

Module: wine Branch: master Commit: 178d39ccc570cdc3321ad57d686e085a3553b012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=178d39ccc570cdc3321ad57d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 22 13:16:55 2011 +0100 msi: Fix a trace. --- dlls/msi/custom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index cb7a48c..c3f2302 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -424,7 +424,7 @@ static MSIBINARY *create_temp_binary( MSIPACKAGE *package, LPCWSTR source, BOOL /* keep a reference to prevent the dll from being unloaded */ if (dll && !(binary->module = LoadLibraryW( tmpfile ))) { - ERR("failed to load dll %s (%u)\n", debugstr_w( binary->tmpfile ), GetLastError() ); + ERR("failed to load dll %s (%u)\n", debugstr_w( tmpfile ), GetLastError() ); DeleteFileW( tmpfile ); msi_free( binary ); return NULL;

1 0

Alistair Leslie-Hughes : oleaut32: Implement ITypeInfo_GetNames Stub/Proxy.
by Alexandre Julliard Feb. 22, 2011

Feb. 22, 2011

Module: wine Branch: master Commit: f6b16ea774908ee195788f8a8c449259a6fe668e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b16ea774908ee195788f8a8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 18 12:04:56 2011 +1100 oleaut32: Implement ITypeInfo_GetNames Stub/Proxy. --- dlls/oleaut32/usrmarshal.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index cc4d2e7..b553f40 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1598,8 +1598,9 @@ HRESULT CALLBACK ITypeInfo_GetNames_Proxy( UINT cMaxNames, UINT* pcNames) { - FIXME("not implemented\n"); - return E_FAIL; + TRACE("(%p, %08x, %p, %d, %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames); + + return ITypeInfo_RemoteGetNames_Proxy(This, memid, rgBstrNames, cMaxNames, pcNames); } HRESULT __RPC_STUB ITypeInfo_GetNames_Stub( @@ -1609,8 +1610,9 @@ HRESULT __RPC_STUB ITypeInfo_GetNames_Stub( UINT cMaxNames, UINT* pcNames) { - FIXME("not implemented\n"); - return E_FAIL; + TRACE("(%p, %08x, %p, %d, %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames); + + return ITypeInfo_GetNames(This, memid, rgBstrNames, cMaxNames, pcNames); } HRESULT CALLBACK ITypeInfo_GetIDsOfNames_Proxy(

1 0

Maarten Lankhorst : gdi32: Handle BITMAP_CopyBitmap correctly for negative heights.
by Alexandre Julliard Feb. 22, 2011

Feb. 22, 2011

Module: wine Branch: master Commit: 720bc3fa5374cb72ed4fb887bc3d7c0e5eeacb16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=720bc3fa5374cb72ed4fb887b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Feb 19 02:27:13 2011 +0100 gdi32: Handle BITMAP_CopyBitmap correctly for negative heights. --- dlls/gdi32/bitmap.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 9d05ff5..a5c53a9 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -512,15 +512,18 @@ HBITMAP BITMAP_CopyBitmap(HBITMAP hbitmap) { HBITMAP res; DIBSECTION dib; - DWORD size; - - if (!(size = GetObjectW( hbitmap, sizeof(dib), &dib ))) return 0; + BITMAPOBJ *bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ); - if (size == sizeof(DIBSECTION)) + if (!bmp) return 0; + if (bmp->dib) { void *bits; BITMAPINFO *bi; - HDC dc = CreateCompatibleDC( NULL ); + HDC dc; + + dib = *bmp->dib; + GDI_ReleaseObj( hbitmap ); + dc = CreateCompatibleDC( NULL ); if (!dc) return 0; if (!(bi = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) @@ -532,6 +535,7 @@ HBITMAP BITMAP_CopyBitmap(HBITMAP hbitmap) /* Get the color table or the color masks */ GetDIBits( dc, hbitmap, 0, 0, NULL, bi, DIB_RGB_COLORS ); + bi->bmiHeader.biHeight = dib.dsBmih.biHeight; res = CreateDIBSection( dc, bi, DIB_RGB_COLORS, &bits, NULL, 0 ); if (res) SetDIBits( dc, res, 0, dib.dsBm.bmHeight, dib.dsBm.bmBits, bi, DIB_RGB_COLORS ); @@ -539,13 +543,16 @@ HBITMAP BITMAP_CopyBitmap(HBITMAP hbitmap) DeleteDC( dc ); return res; } + dib.dsBm = bmp->bitmap; + dib.dsBm.bmBits = NULL; + GDI_ReleaseObj( hbitmap ); res = CreateBitmapIndirect( &dib.dsBm ); if(res) { char *buf = HeapAlloc( GetProcessHeap(), 0, dib.dsBm.bmWidthBytes * dib.dsBm.bmHeight ); GetBitmapBits (hbitmap, dib.dsBm.bmWidthBytes * dib.dsBm.bmHeight, buf); SetBitmapBits (res, dib.dsBm.bmWidthBytes * dib.dsBm.bmHeight, buf); - HeapFree( GetProcessHeap(), 0, buf ); + HeapFree( GetProcessHeap(), 0, buf ); } return res; }

1 0

Nikolay Sivov : msxml3: Remove useless parts of schema cleanup helper.
by Alexandre Julliard Feb. 22, 2011

Feb. 22, 2011

Module: wine Branch: master Commit: 26084daa46ee646b4e3d9e79bc68b35bf4f31b65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26084daa46ee646b4e3d9e79b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 22 00:49:18 2011 +0300 msxml3: Remove useless parts of schema cleanup helper. --- dlls/msxml3/schema.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 9239326..f195804 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -660,7 +660,7 @@ static inline xmlSchemaPtr get_node_schema(schema_cache* This, xmlNodePtr node) return (!entry)? NULL : entry->schema; } -xmlExternalEntityLoader _external_entity_loader = NULL; +static xmlExternalEntityLoader _external_entity_loader; static xmlParserInputPtr external_entity_loader(const char *URL, const char *ID, xmlParserCtxtPtr ctxt) @@ -713,7 +713,7 @@ void schemasInit(void) datatypes_src = BAD_CAST buf; datatypes_len = len + 1; - if ((void*)xmlGetExternalEntityLoader() != (void*)external_entity_loader) + if (xmlGetExternalEntityLoader() != external_entity_loader) { _external_entity_loader = xmlGetExternalEntityLoader(); xmlSetExternalEntityLoader(external_entity_loader); @@ -722,10 +722,7 @@ void schemasInit(void) void schemasCleanup(void) { - if (datatypes_handle) - FreeResource(datatypes_handle); - if (datatypes_schema) - xmlSchemaFree(datatypes_schema); + xmlSchemaFree(datatypes_schema); xmlSetExternalEntityLoader(_external_entity_loader); }

1 0

Nikolay Sivov : msxml4: Add version info.
by Alexandre Julliard Feb. 22, 2011

Feb. 22, 2011

Module: wine Branch: master Commit: 565a66654c1d9c6bacd33519bf84c5964d677fcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=565a66654c1d9c6bacd33519b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 22 02:48:01 2011 +0300 msxml4: Add version info. --- dlls/msxml4/rsrc.rc | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/msxml4/rsrc.rc b/dlls/msxml4/rsrc.rc index ca055e4..4ca1abb 100644 --- a/dlls/msxml4/rsrc.rc +++ b/dlls/msxml4/rsrc.rc @@ -20,3 +20,12 @@ /* @makedep: msxml4_tlb.tlb */ 1 TYPELIB msxml4_tlb.tlb + +#define WINE_FILEDESCRIPTION_STR "Wine MSXML 4.0" +#define WINE_FILENAME_STR "msxml4.dll" +#define WINE_FILEVERSION 4,20,9818,0 +#define WINE_FILEVERSION_STR "4.20.9818.0" +#define WINE_PRODUCTVERSION 4,20,9818,0 +#define WINE_PRODUCTVERSION_STR "4.20.9818.0" + +#include "wine/wine_common_ver.rc"

1 0

Michael Stefaniuc : storage.dll16: Remove unused struct declaration.
by Alexandre Julliard Feb. 22, 2011

Feb. 22, 2011

Module: wine Branch: master Commit: 59e058ab20618a11b3f18ca904dd32e229df2b5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=59e058ab20618a11b3f18ca90… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 22 12:12:27 2011 +0100 storage.dll16: Remove unused struct declaration. --- dlls/storage.dll16/storage.c | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) diff --git a/dlls/storage.dll16/storage.c b/dlls/storage.dll16/storage.c index bf79e33..8f3c602 100644 --- a/dlls/storage.dll16/storage.c +++ b/dlls/storage.dll16/storage.c @@ -1608,20 +1608,6 @@ static void _create_istream16(LPSTREAM16 *str) { } -/* --- IStream32 implementation */ - -typedef struct -{ - /* IUnknown fields */ - const IStreamVtbl *lpVtbl; - LONG ref; - /* IStream32 fields */ - struct storage_pps_entry stde; - int ppsent; - HANDLE hf; - ULARGE_INTEGER offset; -} IStream32Impl; - /****************************************************************************** * IStorage16_QueryInterface [STORAGE.500] */

1 0

Alexander Kochetkov : gdi32: Fix scaling factors for EMR_EXTTEXTOUTW.
by Alexandre Julliard Feb. 22, 2011

Feb. 22, 2011

Module: wine Branch: master Commit: 005915f405bcf36b9f1a1694ec212559933f9aad URL: http://source.winehq.org/git/wine.git/?a=commit;h=005915f405bcf36b9f1a1694e… Author: Alexander Kochetkov <al.kochet(a)gmail.com> Date: Sat Feb 19 01:56:01 2011 +0300 gdi32: Fix scaling factors for EMR_EXTTEXTOUTW. --- dlls/gdi32/enhmfdrv/graphics.c | 30 ++++++++- dlls/gdi32/tests/metafile.c | 136 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 162 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index e066d0d..95a8353 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -728,6 +728,8 @@ BOOL CDECL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, int textHeight = 0; int textWidth = 0; const UINT textAlign = GetTextAlign(physDev->hdc); + const INT graphicsMode = GetGraphicsMode(physDev->hdc); + FLOAT exScale, eyScale; nSize = sizeof(*pemr) + ((count+1) & ~1) * sizeof(WCHAR) + count * sizeof(INT); @@ -735,12 +737,32 @@ BOOL CDECL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, wine_dbgstr_rect(lprect), count, nSize); pemr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nSize); + if (graphicsMode == GM_COMPATIBLE) + { + const INT horzSize = GetDeviceCaps(physDev->hdc, HORZSIZE); + const INT horzRes = GetDeviceCaps(physDev->hdc, HORZRES); + const INT vertSize = GetDeviceCaps(physDev->hdc, VERTSIZE); + const INT vertRes = GetDeviceCaps(physDev->hdc, VERTRES); + SIZE wndext, vportext; + + GetViewportExtEx(physDev->hdc, &vportext); + GetWindowExtEx(physDev->hdc, &wndext); + exScale = 100.0 * ((FLOAT)horzSize / (FLOAT)horzRes) / + ((FLOAT)wndext.cx / (FLOAT)vportext.cx); + eyScale = 100.0 * ((FLOAT)vertSize / (FLOAT)vertRes) / + ((FLOAT)wndext.cy / (FLOAT)vportext.cy); + } + else + { + exScale = 0.0; + eyScale = 0.0; + } + pemr->emr.iType = EMR_EXTTEXTOUTW; pemr->emr.nSize = nSize; - - pemr->iGraphicsMode = GetGraphicsMode(physDev->hdc); - pemr->exScale = pemr->eyScale = 1.0; /* FIXME */ - + pemr->iGraphicsMode = graphicsMode; + pemr->exScale = exScale; + pemr->eyScale = eyScale; pemr->emrtext.ptlReference.x = x; pemr->emrtext.ptlReference.y = y; pemr->emrtext.nChars = count; diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index a4630f1..9ccb9ce 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -264,6 +264,141 @@ static void test_ExtTextOut(void) DestroyWindow(hwnd); } +struct eto_scale_test_record +{ + INT graphics_mode; + INT map_mode; + double ex_scale; + double ey_scale; + BOOL processed; +}; + +static int CALLBACK eto_scale_enum_proc(HDC hdc, HANDLETABLE *handle_table, + const ENHMETARECORD *emr, int n_objs, LPARAM param) +{ + struct eto_scale_test_record *test = (struct eto_scale_test_record*)param; + + if (emr->iType == EMR_EXTTEXTOUTW) + { + const EMREXTTEXTOUTW *pExtTextOutW = (const EMREXTTEXTOUTW *)emr; + trace("gm %d, mm %d, scale %f, %f, expected %f, %f\n", + test->graphics_mode, test->map_mode, + pExtTextOutW->exScale, pExtTextOutW->eyScale, + test->ex_scale, test->ey_scale); + ok(fabs(test->ex_scale - pExtTextOutW->exScale) < 0.001, + "Got exScale %f, expected %f\n", pExtTextOutW->exScale, test->ex_scale); + ok(fabs(test->ey_scale - pExtTextOutW->eyScale) < 0.001, + "Got eyScale %f, expected %f\n", pExtTextOutW->eyScale, test->ey_scale); + test->processed = TRUE; + } + + return 1; +} + +static void test_ExtTextOutScale(void) +{ + const RECT rc = { 0, 0, 100, 100 }; + const WCHAR str[] = {'a',0 }; + struct eto_scale_test_record test; + HDC hdcDisplay, hdcMetafile; + HENHMETAFILE hMetafile; + HWND hwnd; + SIZE wndext, vportext; + int horzSize, vertSize, horzRes, vertRes; + int ret; + int i; + + hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP | WS_VISIBLE, + 0, 0, 200, 200, 0, 0, 0, NULL); + ok(hwnd != 0, "CreateWindowExA failed\n"); + + hdcDisplay = GetDC(hwnd); + ok(hdcDisplay != 0, "GetDC failed\n"); + + horzSize = GetDeviceCaps(hdcDisplay, HORZSIZE); + horzRes = GetDeviceCaps(hdcDisplay, HORZRES); + vertSize = GetDeviceCaps(hdcDisplay, VERTSIZE); + vertRes = GetDeviceCaps(hdcDisplay, VERTRES); + ok(horzSize && horzRes && vertSize && vertRes, "GetDeviceCaps failed\n"); + + for (i = 0; i < 16; i++) + { + test.graphics_mode = i / 8 + 1; + test.map_mode = i % 8 + 1; + + ret = SetGraphicsMode(hdcDisplay, test.graphics_mode); + ok(ret, "SetGraphicsMode failed\n"); + ret = SetMapMode(hdcDisplay, test.map_mode); + ok(ret, "SetMapMode failed\n"); + + if ((test.map_mode == MM_ISOTROPIC) || (test.map_mode == MM_ANISOTROPIC)) + { + ret = SetWindowExtEx(hdcDisplay, 1, 1, NULL); + ok(ret, "SetWindowExtEx failed\n"); + ret = SetViewportExtEx(hdcDisplay, -20, -10, NULL); + ok(ret, "SetViewportExtEx failed\n"); + } + + ret = GetViewportExtEx(hdcDisplay, &vportext); + ok(ret, "GetViewportExtEx failed\n"); + ret = GetWindowExtEx(hdcDisplay, &wndext); + ok(ret, "GetWindowExtEx failed\n"); + + trace("gm %d, mm %d, wnd %d,%d, vp %d,%d horz %d,%d vert %d,%d\n", + test.graphics_mode, test.map_mode, + wndext.cx, wndext.cy, vportext.cx, vportext.cy, + horzSize, horzRes, vertSize, vertRes); + + if (test.graphics_mode == GM_COMPATIBLE) + { + test.ex_scale = 100.0 * ((FLOAT)horzSize / (FLOAT)horzRes) / + ((FLOAT)wndext.cx / (FLOAT)vportext.cx); + test.ey_scale = 100.0 * ((FLOAT)vertSize / (FLOAT)vertRes) / + ((FLOAT)wndext.cy / (FLOAT)vportext.cy); + } + else + { + test.ex_scale = 0.0; + test.ey_scale = 0.0; + } + + hdcMetafile = CreateEnhMetaFileA(hdcDisplay, NULL, NULL, NULL); + ok(hdcMetafile != 0, "CreateEnhMetaFileA failed\n"); + + ret = SetGraphicsMode(hdcMetafile, test.graphics_mode); + ok(ret, "SetGraphicsMode failed\n"); + ret = SetMapMode(hdcMetafile, test.map_mode); + ok(ret, "SetMapMode failed\n"); + + if ((test.map_mode == MM_ISOTROPIC) || (test.map_mode == MM_ANISOTROPIC)) + { + ret = SetWindowExtEx(hdcMetafile, 1, 1, NULL); + ok(ret, "SetWindowExtEx failed\n"); + ret = SetViewportExtEx(hdcMetafile, -20, -10, NULL); + ok(ret, "SetViewportExtEx failed\n"); + } + + ret = ExtTextOutW(hdcMetafile, 0, 0, 0, 0, str, 1, NULL); + ok(ret, "ExtTextOutW failed\n"); + + hMetafile = CloseEnhMetaFile(hdcMetafile); + ok(hMetafile != 0, "CloseEnhMetaFile failed\n"); + + test.processed = 0; + ret = EnumEnhMetaFile(hdcDisplay, hMetafile, eto_scale_enum_proc, &test, &rc); + ok(ret, "EnumEnhMetaFile failed\n"); + ok(test.processed, "EnumEnhMetaFile couldn't find EMR_EXTTEXTOUTW record\n"); + + ret = DeleteEnhMetaFile(hMetafile); + ok(ret, "DeleteEnhMetaFile failed\n"); + } + + ret = ReleaseDC(hwnd, hdcDisplay); + ok(ret, "ReleaseDC failed\n"); + DestroyWindow(hwnd); +} + + static void check_dc_state(HDC hdc, int restore_no, int wnd_org_x, int wnd_org_y, int wnd_ext_x, int wnd_ext_y, int vp_org_x, int vp_org_y, int vp_ext_x, int vp_ext_y) @@ -2779,6 +2914,7 @@ START_TEST(metafile) /* For enhanced metafiles (enhmfdrv) */ test_ExtTextOut(); + test_ExtTextOutScale(); test_SaveDC(); test_emf_BitBlt();

1 0

Rico Schüller : d3dcompiler: Implement ID3D11ShaderReflectionVariable::GetBuffer().
by Alexandre Julliard Feb. 22, 2011

Feb. 22, 2011

Module: wine Branch: master Commit: e8c6ea220d9f6566971582fd92a754b0c765364c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8c6ea220d9f6566971582fd9… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Feb 21 22:52:30 2011 +0100 d3dcompiler: Implement ID3D11ShaderReflectionVariable::GetBuffer(). --- dlls/d3dcompiler_43/d3dcompiler_private.h | 1 + dlls/d3dcompiler_43/reflection.c | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 3107733..4d90def 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -81,6 +81,7 @@ struct d3dcompiler_shader_reflection_variable { ID3D11ShaderReflectionVariable ID3D11ShaderReflectionVariable_iface; + struct d3dcompiler_shader_reflection_constant_buffer *constant_buffer; struct d3dcompiler_shader_reflection_type *type; char *name; diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 1165976..22522bf 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -36,7 +36,7 @@ const struct ID3D11ShaderReflectionVariableVtbl d3dcompiler_shader_reflection_va /* null objects - needed for invalid calls */ static struct d3dcompiler_shader_reflection_constant_buffer null_constant_buffer = {{&d3dcompiler_shader_reflection_constant_buffer_vtbl}}; -static struct d3dcompiler_shader_reflection_variable null_variable = {{&d3dcompiler_shader_reflection_variable_vtbl}}; +static struct d3dcompiler_shader_reflection_variable null_variable = {{&d3dcompiler_shader_reflection_variable_vtbl}, &null_constant_buffer}; static BOOL copy_name(const char *ptr, char **name) { @@ -692,9 +692,11 @@ static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflect static ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetBuffer( ID3D11ShaderReflectionVariable *iface) { - FIXME("iface %p stub!\n", iface); + struct d3dcompiler_shader_reflection_variable *This = impl_from_ID3D11ShaderReflectionVariable(iface); - return NULL; + TRACE("iface %p\n", iface); + + return &This->constant_buffer->ID3D11ShaderReflectionConstantBuffer_iface; } static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetInterfaceSlot( @@ -1031,6 +1033,7 @@ static HRESULT d3dcompiler_parse_variables(struct d3dcompiler_shader_reflection_ DWORD offset; v->ID3D11ShaderReflectionVariable_iface.lpVtbl = &d3dcompiler_shader_reflection_variable_vtbl; + v->constant_buffer = cb; read_dword(&ptr, &offset); if (!copy_name(data + offset, &v->name))

1 0

Nikolay Sivov : msxml3: Use helper to consistently dump variant parameters.
by Alexandre Julliard Feb. 22, 2011

Feb. 22, 2011

Module: wine Branch: master Commit: a0a464ad81ef6d2c3c98cd3ccaa3d403ee2bff9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0a464ad81ef6d2c3c98cd3cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 22 02:04:02 2011 +0300 msxml3: Use helper to consistently dump variant parameters. --- dlls/msxml3/attribute.c | 6 ++-- dlls/msxml3/cdata.c | 4 +- dlls/msxml3/comment.c | 4 +- dlls/msxml3/docfrag.c | 4 +- dlls/msxml3/doctype.c | 8 +++--- dlls/msxml3/element.c | 8 +++--- dlls/msxml3/entityref.c | 4 +- dlls/msxml3/httprequest.c | 5 ++- dlls/msxml3/main.c | 2 + dlls/msxml3/pi.c | 4 +- dlls/msxml3/saxreader.c | 4 +- dlls/msxml3/schema.c | 2 +- dlls/msxml3/stylesheet.c | 3 +- dlls/msxml3/text.c | 10 ++++---- dlls/msxml3/xmldoc.c | 3 +- dlls/msxml3/xmlelem.c | 52 +++++++++++++++++++++++++------------------- 16 files changed, 67 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0a464ad81ef6d2c3c98c…

1 0

Nikolay Sivov : msxml3: Store document event handler for ready state notification.
by Alexandre Julliard Feb. 22, 2011

Feb. 22, 2011

Module: wine Branch: master Commit: df08e9b4f63064e017f6f1058cec87f1fb7a6dd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df08e9b4f63064e017f6f1058… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 19 17:09:58 2011 +0300 msxml3: Store document event handler for ready state notification. --- dlls/msxml3/domdoc.c | 54 +++++++++++++++++++++++++++++++++++++++---- dlls/msxml3/tests/domdoc.c | 51 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index f5bfaa4..417b988 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -105,6 +105,13 @@ struct ConnectionPoint DWORD sinks_size; }; +typedef enum { + EVENTID_READYSTATECHANGE = 0, + EVENTID_DATAAVAILABLE, + EVENTID_TRANSFORMNODE, + EVENTID_LAST +} eventid_t; + struct domdoc { xmlnode node; @@ -136,8 +143,37 @@ struct domdoc ConnectionPoint cp_domdocevents; ConnectionPoint cp_propnotif; ConnectionPoint cp_dispatch; + + /* events */ + IDispatch *events[EVENTID_LAST]; }; +static HRESULT set_doc_event(domdoc *doc, eventid_t eid, const VARIANT *v) +{ + IDispatch *disp; + + switch (V_VT(v)) + { + case VT_UNKNOWN: + if (V_UNKNOWN(v)) + IUnknown_QueryInterface(V_UNKNOWN(v), &IID_IDispatch, (void**)&disp); + else + disp = NULL; + break; + case VT_DISPATCH: + disp = V_DISPATCH(v); + if (disp) IDispatch_AddRef(disp); + break; + default: + return DISP_E_TYPEMISMATCH; + } + + if (doc->events[eid]) IDispatch_Release(doc->events[eid]); + doc->events[eid] = disp; + + return S_OK; +} + static inline ConnectionPoint *impl_from_IConnectionPoint(IConnectionPoint *iface) { return (ConnectionPoint *)((char*)iface - FIELD_OFFSET(ConnectionPoint, lpVtblConnectionPoint)); @@ -909,6 +945,8 @@ static ULONG WINAPI domdoc_Release( if ( ref == 0 ) { + int eid; + if(This->bsc) detach_bsc(This->bsc); @@ -917,6 +955,10 @@ static ULONG WINAPI domdoc_Release( destroy_xmlnode(&This->node); if (This->stream) IStream_Release(This->stream); + + for (eid = 0; eid < EVENTID_LAST; eid++) + if (This->events[eid]) IDispatch_Release(This->events[eid]); + heap_free(This); } @@ -2470,13 +2512,14 @@ static HRESULT WINAPI domdoc_put_preserveWhiteSpace( } -static HRESULT WINAPI domdoc_put_onReadyStateChange( +static HRESULT WINAPI domdoc_put_onreadystatechange( IXMLDOMDocument3 *iface, - VARIANT readyStateChangeSink ) + VARIANT event ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - FIXME("%p\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&event)); + return set_doc_event(This, EVENTID_READYSTATECHANGE, &event); } @@ -3040,7 +3083,7 @@ static const struct IXMLDOMDocument3Vtbl domdoc_vtbl = domdoc_put_resolveExternals, domdoc_get_preserveWhiteSpace, domdoc_put_preserveWhiteSpace, - domdoc_put_onReadyStateChange, + domdoc_put_onreadystatechange, domdoc_put_onDataAvailable, domdoc_put_onTransformNode, domdoc_get_namespaces, @@ -3402,6 +3445,7 @@ HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **docu doc->safeopt = 0; doc->bsc = NULL; doc->cp_list = NULL; + memset(doc->events, 0, sizeof(doc->events)); /* events connection points */ ConnectionPoint_Init(&doc->cp_dispatch, doc, &IID_IDispatch); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index e38d3b5..eee20a6 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7530,6 +7530,9 @@ static void test_events(void) IConnectionPoint *point; IXMLDOMDocument *doc; HRESULT hr; + VARIANT v; + IDispatch *event; + ULONG ref; doc = create_document(&IID_IXMLDOMDocument); if (!doc) return; @@ -7549,6 +7552,54 @@ static void test_events(void) IConnectionPointContainer_Release(conn); + /* ready state callback */ + VariantInit(&v); + hr = IXMLDOMDocument_put_onreadystatechange(doc, v); + ok(hr == DISP_E_TYPEMISMATCH, "got 0x%08x\n", hr); + + event = create_dispevent(); + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown*)event; + + hr = IXMLDOMDocument_put_onreadystatechange(doc, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + ref = IDispatch_AddRef(event); + IDispatch_Release(event); + ok(ref == 3, "got %d\n", ref); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = event; + + hr = IXMLDOMDocument_put_onreadystatechange(doc, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + ref = IDispatch_AddRef(event); + IDispatch_Release(event); + ok(ref == 3, "got %d\n", ref); + + /* VT_NULL doesn't reset event handler */ + V_VT(&v) = VT_NULL; + hr = IXMLDOMDocument_put_onreadystatechange(doc, v); + ok(hr == DISP_E_TYPEMISMATCH, "got 0x%08x\n", hr); + ref = IDispatch_AddRef(event); + IDispatch_Release(event); + ok(ref == 3, "got %d\n", ref); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = NULL; + + hr = IXMLDOMDocument_put_onreadystatechange(doc, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + ref = IDispatch_AddRef(event); + IDispatch_Release(event); + ok(ref == 2, "got %d\n", ref); + + V_VT(&v) = VT_UNKNOWN; + V_DISPATCH(&v) = NULL; + hr = IXMLDOMDocument_put_onreadystatechange(doc, v); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IDispatch_Release(event); + IXMLDOMDocument_Release(doc); }

1 0