wine-commits June 2012

wine-commits@winehq.org

3 participants
827 discussions

Dmitry Timoshkov : windowscodecs: Add WICImagingCategories registration.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 40185b6c6e5aca9e55d1f94740d4f39c27f06a6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=40185b6c6e5aca9e55d1f9474… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 22 15:12:54 2012 +0900 windowscodecs: Add WICImagingCategories registration. --- dlls/windowscodecs/regsvr.c | 102 +++++++++++++++++++++++++++++++++++++++++++ include/wincodec.idl | 1 + 2 files changed, 103 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index b73b645..a422747 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1788,6 +1788,104 @@ static struct regsvr_pixelformat const pixelformat_list[] = { { NULL } /* list terminator */ }; +struct regsvr_category +{ + const CLSID *clsid; /* NULL for end of list */ +}; + +static const struct regsvr_category category_list[] = { + { &CATID_WICBitmapDecoders }, + { &CATID_WICBitmapEncoders }, + { &CATID_WICFormatConverters }, + { &CATID_WICMetadataReader }, + { &CATID_WICPixelFormats }, + { NULL } +}; + +static HRESULT register_categories(const struct regsvr_category *list) +{ + LONG res; + WCHAR buf[39]; + HKEY coclass_key, categories_key, instance_key; + + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL); + if (res != ERROR_SUCCESS) return HRESULT_FROM_WIN32(res); + + StringFromGUID2(&CLSID_WICImagingCategories, buf, 39); + res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &categories_key, NULL); + if (res != ERROR_SUCCESS) + { + RegCloseKey(coclass_key); + return HRESULT_FROM_WIN32(res); + } + + res = RegCreateKeyExW(categories_key, instance_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &instance_key, NULL); + + for (; res == ERROR_SUCCESS && list->clsid; list++) + { + HKEY instance_clsid_key; + + StringFromGUID2(list->clsid, buf, 39); + res = RegCreateKeyExW(instance_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &instance_clsid_key, NULL); + if (res == ERROR_SUCCESS) + { + res = RegSetValueExW(instance_clsid_key, clsid_valuename, 0, REG_SZ, + (const BYTE *)buf, 78); + RegCloseKey(instance_clsid_key); + } + } + + RegCloseKey(instance_key); + RegCloseKey(categories_key); + RegCloseKey(coclass_key); + + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +static HRESULT unregister_categories(const struct regsvr_category *list) +{ + LONG res; + WCHAR buf[39]; + HKEY coclass_key, categories_key, instance_key; + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, + KEY_READ | KEY_WRITE, &coclass_key); + if (res != ERROR_SUCCESS) return HRESULT_FROM_WIN32(res); + + StringFromGUID2(&CLSID_WICImagingCategories, buf, 39); + res = RegOpenKeyExW(coclass_key, buf, 0, + KEY_READ | KEY_WRITE, &categories_key); + if (res != ERROR_SUCCESS) + { + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; + RegCloseKey(coclass_key); + return HRESULT_FROM_WIN32(res); + } + + res = RegOpenKeyExW(categories_key, instance_keyname, 0, + KEY_READ | KEY_WRITE, &instance_key); + + for (; res == ERROR_SUCCESS && list->clsid; list++) + { + StringFromGUID2(list->clsid, buf, 39); + res = RegDeleteTreeW(instance_key, buf); + } + + RegCloseKey(instance_key); + RegCloseKey(categories_key); + + StringFromGUID2(&CLSID_WICImagingCategories, buf, 39); + res = RegDeleteTreeW(coclass_key, buf); + + RegCloseKey(coclass_key); + + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + extern HRESULT WINAPI WIC_DllRegisterServer(void) DECLSPEC_HIDDEN; extern HRESULT WINAPI WIC_DllUnregisterServer(void) DECLSPEC_HIDDEN; @@ -1799,6 +1897,8 @@ HRESULT WINAPI DllRegisterServer(void) hr = WIC_DllRegisterServer(); if (SUCCEEDED(hr)) + hr = register_categories(category_list); + if (SUCCEEDED(hr)) hr = register_decoders(decoder_list); if (SUCCEEDED(hr)) hr = register_encoders(encoder_list); @@ -1819,6 +1919,8 @@ HRESULT WINAPI DllUnregisterServer(void) hr = WIC_DllUnregisterServer(); if (SUCCEEDED(hr)) + hr = unregister_categories(category_list); + if (SUCCEEDED(hr)) hr = unregister_decoders(decoder_list); if (SUCCEEDED(hr)) hr = unregister_encoders(encoder_list); diff --git a/include/wincodec.idl b/include/wincodec.idl index 82f419c..ab1e490 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -1001,6 +1001,7 @@ cpp_quote("DEFINE_GUID(GUID_ContainerFormatWmp, 0x57a37caa,0x367a,0x4540,0x91,0x cpp_quote("DEFINE_GUID(GUID_VendorMicrosoft, 0xf0e749ca,0xedef,0x4589,0xa7,0x3a,0xee,0x0e,0x62,0x6a,0x2a,0x2b);") +cpp_quote("DEFINE_GUID(CLSID_WICImagingCategories, 0xfae3d380,0xfea4,0x4623,0x8c,0x75,0xc6,0xb6,0x11,0x10,0xb6,0x81);") cpp_quote("DEFINE_GUID(CATID_WICBitmapDecoders, 0x7ed96837,0x96f0,0x4812,0xb2,0x11,0xf1,0x3c,0x24,0x11,0x7e,0xd3);") cpp_quote("DEFINE_GUID(CATID_WICBitmapEncoders, 0xac757296,0x3522,0x4e11,0x98,0x62,0xc1,0x7b,0xe5,0xa1,0x76,0x7e);") cpp_quote("DEFINE_GUID(CATID_WICFormatConverters, 0x7835eae8,0xbf14,0x49d1,0x93,0xce,0x53,0x3a,0x40,0x7b,0x22,0x48);")

1 0

Erich Hoover : hhctrl.ocx: Add icons for the table of contents TreeView control.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: fc413c70a5f4383bdd7e3c393c4429a8a712a5df URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc413c70a5f4383bdd7e3c393… Author: Erich Hoover <ehoover(a)mines.edu> Date: Fri Jun 22 11:07:19 2012 -0600 hhctrl.ocx: Add icons for the table of contents TreeView control. --- dlls/hhctrl.ocx/Makefile.in | 4 ++- dlls/hhctrl.ocx/content.c | 5 +++- dlls/hhctrl.ocx/help.c | 41 +++++++++++++++++++++++++++++++++++---- dlls/hhctrl.ocx/hhctrl.h | 5 ++++ dlls/hhctrl.ocx/hhctrl.rc | 3 ++ dlls/hhctrl.ocx/hhtreeview.bmp | Bin 0 -> 3194 bytes dlls/hhctrl.ocx/hhtreeview.svg | 18 +++++++++++++++++ dlls/hhctrl.ocx/resource.h | 7 ++++++ 8 files changed, 76 insertions(+), 7 deletions(-) diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in index 05b3e35..289cc39 100644 --- a/dlls/hhctrl.ocx/Makefile.in +++ b/dlls/hhctrl.ocx/Makefile.in @@ -16,6 +16,8 @@ IDL_TLB_SRCS = hhctrl_tlb.idl RC_SRCS = hhctrl.rc PO_SRCS = hhctrl.rc -SVG_SRCS = hhtoolbar.svg +SVG_SRCS = \ + hhtoolbar.svg \ + hhtreeview.svg @MAKE_DLL_RULES@ diff --git a/dlls/hhctrl.ocx/content.c b/dlls/hhctrl.ocx/content.c index d246c49..28bda11 100644 --- a/dlls/hhctrl.ocx/content.c +++ b/dlls/hhctrl.ocx/content.c @@ -22,6 +22,7 @@ #include "hhctrl.h" #include "stream.h" +#include "resource.h" #include "wine/debug.h" @@ -267,10 +268,12 @@ static void insert_content_item(HWND hwnd, ContentItem *parent, ContentItem *ite TVINSERTSTRUCTW tvis; memset(&tvis, 0, sizeof(tvis)); - tvis.u.item.mask = TVIF_TEXT|TVIF_PARAM; + tvis.u.item.mask = TVIF_TEXT|TVIF_PARAM|TVIF_IMAGE|TVIF_SELECTEDIMAGE; tvis.u.item.cchTextMax = strlenW(item->name)+1; tvis.u.item.pszText = item->name; tvis.u.item.lParam = (LPARAM)item; + tvis.u.item.iImage = item->child ? HHTV_FOLDER : HHTV_DOCUMENT; + tvis.u.item.iSelectedImage = item->child ? HHTV_FOLDER : HHTV_DOCUMENT; tvis.hParent = parent ? parent->id : 0; tvis.hInsertAfter = TVI_LAST; diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index ef41ec2..3acb024 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -707,6 +707,24 @@ static LRESULT CALLBACK Child_WndProc(HWND hWnd, UINT message, WPARAM wParam, LP return OnTabChange(hWnd); case TVN_SELCHANGEDW: return OnTopicChange(info, (void*)((NMTREEVIEWW *)lParam)->itemNew.lParam); + case TVN_ITEMEXPANDINGW: { + TVITEMW *item = &((NMTREEVIEWW *)lParam)->itemNew; + HWND hwndTreeView = info->tabs[TAB_CONTENTS].hwnd; + + item->mask = TVIF_IMAGE|TVIF_SELECTEDIMAGE; + if (item->state & TVIS_EXPANDED) + { + item->iImage = HHTV_FOLDER; + item->iSelectedImage = HHTV_FOLDER; + } + else + { + item->iImage = HHTV_OPENFOLDER; + item->iSelectedImage = HHTV_OPENFOLDER; + } + SendMessageW(hwndTreeView, TVM_SETITEMW, 0, (LPARAM)item); + return 0; + } case NM_DBLCLK: if(!info) return 0; @@ -1163,18 +1181,29 @@ static BOOL HH_AddHTMLPane(HHInfo *pHHInfo) static BOOL AddContentTab(HHInfo *info) { + HIMAGELIST hImageList; + HBITMAP hBitmap; + HWND hWnd; + if(info->tabs[TAB_CONTENTS].id == -1) return TRUE; /* No "Contents" tab */ - info->tabs[TAB_CONTENTS].hwnd = CreateWindowExW(WS_EX_CLIENTEDGE, WC_TREEVIEWW, - szEmpty, WS_CHILD | WS_BORDER | 0x25, 50, 50, 100, 100, - info->WinType.hwndNavigation, NULL, hhctrl_hinstance, NULL); - if(!info->tabs[TAB_CONTENTS].hwnd) { + hWnd = CreateWindowExW(WS_EX_CLIENTEDGE, WC_TREEVIEWW, szEmpty, WS_CHILD | WS_BORDER | TVS_LINESATROOT + | TVS_SHOWSELALWAYS | TVS_HASBUTTONS, 50, 50, 100, 100, + info->WinType.hwndNavigation, NULL, hhctrl_hinstance, NULL); + if(!hWnd) { ERR("Could not create treeview control\n"); return FALSE; } + hImageList = ImageList_Create(16, 16, ILC_COLOR32, 0, HHTV_NUMBITMAPS); + hBitmap = LoadBitmapW(hhctrl_hinstance, MAKEINTRESOURCEW(IDB_HHTREEVIEW)); + ImageList_Add(hImageList, hBitmap, NULL); + SendMessageW(hWnd, TVM_SETIMAGELIST, TVSIL_NORMAL, (LPARAM)hImageList); + + info->contents.hImageList = hImageList; + info->tabs[TAB_CONTENTS].hwnd = hWnd; ResizeTabChild(info, TAB_CONTENTS); - ShowWindow(info->tabs[TAB_CONTENTS].hwnd, SW_SHOW); + ShowWindow(hWnd, SW_SHOW); return TRUE; } @@ -1729,6 +1758,8 @@ void ReleaseHelpViewer(HHInfo *info) ReleaseIndex(info); ReleaseSearch(info); + if(info->contents.hImageList) + ImageList_Destroy(info->contents.hImageList); if(info->WinType.hwndHelp) DestroyWindow(info->WinType.hwndHelp); diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 73b2a6b..eea7f7f 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -135,6 +135,10 @@ typedef struct { } SearchTab; typedef struct { + HIMAGELIST hImageList; +} ContentsTab; + +typedef struct { IOleClientSite *client_site; IWebBrowser2 *web_browser; IOleObject *wb_object; @@ -158,6 +162,7 @@ typedef struct { IndexItem *index; IndexPopup popup; SearchTab search; + ContentsTab contents; HWND hwndTabCtrl; HWND hwndSizeBar; HFONT hFont; diff --git a/dlls/hhctrl.ocx/hhctrl.rc b/dlls/hhctrl.ocx/hhctrl.rc index 4ec8fe9..a9ccee2 100644 --- a/dlls/hhctrl.ocx/hhctrl.rc +++ b/dlls/hhctrl.ocx/hhctrl.rc @@ -76,3 +76,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: hhtoolbar.bmp */ IDB_HHTOOLBAR BITMAP hhtoolbar.bmp + +/* @makedep: hhtreeview.bmp */ +IDB_HHTREEVIEW BITMAP hhtreeview.bmp diff --git a/dlls/hhctrl.ocx/hhtreeview.bmp b/dlls/hhctrl.ocx/hhtreeview.bmp new file mode 100644 index 0000000..b8e262c Binary files /dev/null and b/dlls/hhctrl.ocx/hhtreeview.bmp differ diff --git a/dlls/hhctrl.ocx/hhtreeview.svg b/dlls/hhctrl.ocx/hhtreeview.svg new file mode 100644 index 0000000..6b8517f --- /dev/null +++ b/dlls/hhctrl.ocx/hhtreeview.svg @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + +<svg id="bitmap:48-32" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="48" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <metadata id="metadata3206"> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g id="layer1" transform="translate(0 -1036.4)"> + <image id="icon:16-32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlz AAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAHCSURB VDiNpZAxa5NRFIafc+9XLCni4BC6FBycMnbrLpkcgtDVX6C70D/g4lZX/4coxLlgxFkpiiSSUGm/ JiXfveee45AmNlhawXc53HvPee55X+l2u/yPqt3d3Tfu/viatwt3fzIYDI5uBJhZr9fr3TMzzAx3 B+D09PR+v98/7HQ6z5fNOWdCCGU4HH6s67oAVDlnV1UmkwmllBUkhMD29nYHeLuEAkyn06qU8qqu 64MrgIyqYmZrkHa73drc3KTVahFjJITAaDRiPB4/XFlQVVMtHH5IzJo/P4EA4MyB+erWPQB7++zs 7ccYvlU5Z08pMW2cl88eIXLZeDUpXzsBkNQ5eP1+p0opmaoCTgzw6fjs6gLLsp58FB60t0DcK1Ul 54yIEIMQ43Uj68pquDmCeJVztpwzuBNE2LgBoMVpslHMCUEAFgDVxQbzVAiA+aK5uGPmmDtZF3Vp oUm2ArhqQaRiUjcMf81p1G60UEVhcjZfAFTVUkrgkS+jc06mDX9nvq4YhJ9nlxZExMwMEaHJRutO dWuIIsJFUoBSuTvHJ4YIfP46unV4qdlsjsBRZRtb/XfHd5+C8+P7+J8BIoxFwovfRxYhnhxjpzEA AAAASUVORK5CYII= " height="16" width="16" y="1036.4" x="16"/> + <image id="icon:16-32-5" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB70lEQVQ4jaWRPU9UURCGn3Pu3V3D JdkQPxIbLbUwITZa2xmjBYX/wFhSE2Jniw2thTT4L9QYCqOFCdGYWIkRSQR2AQP7cWbOjMWyuAsE Cyc51Zn3mZn3hf+sMD8//8LdH5zy1xGRhwsLC+/PBMzNze3OzMw0zQwzw90BaLfbrKysvKqq6v6w eW1tDYClpaU+4ACliLiqsrW1Rc55DFKr1W63Wq19d8fdqaoKd2d2dvbT4uLizRGAoKqY2Rhkenp6 cmpqiqqqKIqCGCOdTofl5eUbw61KVTXVTM5/3xAgInQ6HUIIhBCIMQKQUvIjgIh4SmkMkHNmuLa7 nwCo6pGJZUrJVJWcMy8/Rna7EaidGZ1Vd2u3Ht/rhhi/laqKiJBzZqcbefLoDkUMhxkB7qdCktq5 p8/fXi9FxEQEMyPgTDQKPv/4jftATziWOxBj4Mr5CULAShEx1QGgiIEiBmIIJ4Qjk+n1MvEiAH4Y 48C0sigoYqBRxhPCvhjdlMnmNIo4PNNKVbWUEvt9aE7W2dzr00sZ98G0vmaS2pgVZRHY3O0NTggh mJnxdbvO5UtNdg6EnhjdpEei4yfFEFjfPiCGuFm6w+oGrP6qc61Z583qT7Kd7vxotVt7ZLfXZW5c ePdho7oKzucv3/8pHKl1zJ79AVcbTQP9EwlzAAAAAElFTkSuQmCC " height="16" width="16" y="1036.4" x="32"/> + <image id="icon:16-32-9" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA3ElEQVQ4jZ2SsQ2DMBBF/4GlhAoJ eQYMs6RMkXGQ2YIREqXNMJgFaOipTIrIyITDhPzqLPv+f3cyNU3z7Pv+imO6VVX1AABoraej0lpP zkm4YhgGWGsBAEQ0R7maiBDHMdI0XaDMBtZaGGMWDb6ICGVZrmYR/kEpFSTgJPyHPsG3fiLI85xJ HDFNJ0RRFCYAgK7rFpdFUQBIAIwAzvsjcAREBKKEbV4RGGPmmlvehyhgoJTaIOAXuxqhbVs22W2f M2IJOJPdf5Bl2SZmSEJK+arr+nKkSUp5/yuN0xtUUV+5ugGgGgAAAABJRU5ErkJggg== " height="16" width="16" y="1036.4" x="0"/> + </g> +</svg> diff --git a/dlls/hhctrl.ocx/resource.h b/dlls/hhctrl.ocx/resource.h index 560a0c3..0faa9da 100644 --- a/dlls/hhctrl.ocx/resource.h +++ b/dlls/hhctrl.ocx/resource.h @@ -41,3 +41,10 @@ #define HHTB_CONTRACT 4 #define HHTB_EXPAND 5 #define HHTB_NUMBITMAPS HHTB_EXPAND + +#define IDB_HHTREEVIEW 1001 +/* IDB_HHTREEVIEW bitmaps: */ +#define HHTV_DOCUMENT 0 +#define HHTV_FOLDER 1 +#define HHTV_OPENFOLDER 2 +#define HHTV_NUMBITMAPS HHTV_OPENFOLDER

1 0

Nikolay Sivov : msxml3: Basic refcount test for IMXNamespacePrefixes.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 924a4e13710fa8eeac3e729b6c90e94bbc9c99b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=924a4e13710fa8eeac3e729b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 23 15:03:42 2012 +0400 msxml3: Basic refcount test for IMXNamespacePrefixes. --- dlls/msxml3/tests/domdoc.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 0c9d65a..4bbbe56 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10484,8 +10484,10 @@ static void test_domobj_dispex(IUnknown *obj) static void test_mxnamespacemanager(void) { static const char xmluriA[] = "http://www.w3.org/XML/1998/namespace"; + IMXNamespacePrefixes *prefixes; IVBMXNamespaceManager *mgr2; IMXNamespaceManager *nsmgr; + IUnknown *unk1, *unk2; WCHAR buffW[250]; IDispatch *disp; IUnknown *unk; @@ -10503,6 +10505,28 @@ static void test_mxnamespacemanager(void) hr = IMXNamespaceManager_QueryInterface(nsmgr, &IID_IVBMXNamespaceManager, (void**)&mgr2); EXPECT_HR(hr, S_OK); + + EXPECT_REF(nsmgr, 2); + EXPECT_REF(mgr2, 2); + prefixes = NULL; + hr = IVBMXNamespaceManager_getDeclaredPrefixes(mgr2, &prefixes); + if (hr == S_OK) + { + ok(prefixes != NULL, "got %p\n", prefixes); + EXPECT_REF(nsmgr, 2); + EXPECT_REF(mgr2, 2); + EXPECT_REF(prefixes, 1); + + IVBMXNamespaceManager_QueryInterface(mgr2, &IID_IUnknown, (void**)&unk1); + IMXNamespacePrefixes_QueryInterface(prefixes, &IID_IUnknown, (void**)&unk2); + + EXPECT_REF(mgr2, 3); + EXPECT_REF(prefixes, 2); + + IUnknown_Release(unk1); + IUnknown_Release(unk2); + IMXNamespacePrefixes_Release(prefixes); + } IVBMXNamespaceManager_Release(mgr2); hr = IMXNamespaceManager_declarePrefix(nsmgr, NULL, NULL);

1 0

Nikolay Sivov : msxml3: Implement internalEntityDecl() for writer.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: acce94a04ee35f01dd77fa8aedf7255443941c0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=acce94a04ee35f01dd77fa8ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 23 13:56:53 2012 +0400 msxml3: Implement internalEntityDecl() for writer. --- dlls/msxml3/mxwriter.c | 28 ++++++++++++++++++++++------ dlls/msxml3/tests/saxreader.c | 21 +++++++++++++++++++++ 2 files changed, 43 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index b9989b2..f03ceb0 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -42,6 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); static const WCHAR emptyW[] = {0}; static const WCHAR spaceW[] = {' '}; static const WCHAR quotW[] = {'\"'}; +static const WCHAR closetagW[] = {'>','\r','\n'}; /* should be ordered as encoding names are sorted */ typedef enum @@ -1455,7 +1456,6 @@ static HRESULT WINAPI SAXDeclHandler_elementDecl(ISAXDeclHandler *iface, const WCHAR *name, int n_name, const WCHAR *model, int n_model) { static const WCHAR elementW[] = {'<','!','E','L','E','M','E','N','T',' '}; - static const WCHAR closeelementW[] = {'>','\r','\n'}; mxwriter *This = impl_from_ISAXDeclHandler( iface ); TRACE("(%p)->(%s:%d %s:%d)\n", This, debugstr_wn(name, n_name), n_name, @@ -1470,7 +1470,7 @@ static HRESULT WINAPI SAXDeclHandler_elementDecl(ISAXDeclHandler *iface, } if (n_model) write_output_buffer(This->buffer, model, n_model); - write_output_buffer(This->buffer, closeelementW, sizeof(closeelementW)/sizeof(WCHAR)); + write_output_buffer(This->buffer, closetagW, sizeof(closetagW)/sizeof(WCHAR)); return S_OK; } @@ -1482,7 +1482,7 @@ static HRESULT WINAPI SAXDeclHandler_attributeDecl(ISAXDeclHandler *iface, { mxwriter *This = impl_from_ISAXDeclHandler( iface ); static const WCHAR attlistW[] = {'<','!','A','T','T','L','I','S','T',' '}; - static const WCHAR closeelementW[] = {'>','\r','\n'}; + static const WCHAR closetagW[] = {'>','\r','\n'}; TRACE("(%p)->(%s:%d %s:%d %s:%d %s:%d %s:%d)\n", This, debugstr_wn(element, n_element), n_element, debugstr_wn(attr, n_attr), n_attr, debugstr_wn(type, n_type), n_type, debugstr_wn(Default, n_default), n_default, @@ -1512,7 +1512,7 @@ static HRESULT WINAPI SAXDeclHandler_attributeDecl(ISAXDeclHandler *iface, if (n_value) write_output_buffer_quoted(This->buffer, value, n_value); - write_output_buffer(This->buffer, closeelementW, sizeof(closeelementW)/sizeof(WCHAR)); + write_output_buffer(This->buffer, closetagW, sizeof(closetagW)/sizeof(WCHAR)); return S_OK; } @@ -1521,9 +1521,25 @@ static HRESULT WINAPI SAXDeclHandler_internalEntityDecl(ISAXDeclHandler *iface, const WCHAR *name, int n_name, const WCHAR *value, int n_value) { mxwriter *This = impl_from_ISAXDeclHandler( iface ); - FIXME("(%p)->(%s:%d %s:%d): stub\n", This, debugstr_wn(name, n_name), n_name, + static const WCHAR entityW[] = {'<','!','E','N','T','I','T','Y',' '}; + + TRACE("(%p)->(%s:%d %s:%d)\n", This, debugstr_wn(name, n_name), n_name, debugstr_wn(value, n_value), n_value); - return E_NOTIMPL; + + if (!name || !value) return E_INVALIDARG; + + write_output_buffer(This->buffer, entityW, sizeof(entityW)/sizeof(WCHAR)); + if (n_name) { + write_output_buffer(This->buffer, name, n_name); + write_output_buffer(This->buffer, spaceW, sizeof(spaceW)/sizeof(WCHAR)); + } + + if (n_value) + write_output_buffer_quoted(This->buffer, value, n_value); + + write_output_buffer(This->buffer, closetagW, sizeof(closetagW)/sizeof(WCHAR)); + + return S_OK; } static HRESULT WINAPI SAXDeclHandler_externalEntityDecl(ISAXDeclHandler *iface, diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 5efe44e..2858583 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -4488,6 +4488,27 @@ static void test_mxwriter_dtd(void) V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); + /* internal entities */ + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_put_output(writer, dest); + EXPECT_HR(hr, S_OK); + + hr = ISAXDeclHandler_internalEntityDecl(decl, NULL, 0, NULL, 0); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXDeclHandler_internalEntityDecl(decl, _bstr_("name"), -1, NULL, 0); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXDeclHandler_internalEntityDecl(decl, _bstr_("name"), strlen("name"), _bstr_("value"), strlen("value")); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("<!ENTITY name \"value\">\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + ISAXContentHandler_Release(content); ISAXLexicalHandler_Release(lexical); ISAXDeclHandler_Release(decl);

1 0

Nikolay Sivov : msxml3: Initial implementation of attributeDecl() in writer .
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: d20e487717cb9e6b47629932f44d9b7c9212df2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d20e487717cb9e6b47629932f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 23 13:38:03 2012 +0400 msxml3: Initial implementation of attributeDecl() in writer. --- dlls/msxml3/mxwriter.c | 34 ++++++++++++++++++++++++++++++++-- dlls/msxml3/tests/saxreader.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index daa6db8..b9989b2 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1481,10 +1481,40 @@ static HRESULT WINAPI SAXDeclHandler_attributeDecl(ISAXDeclHandler *iface, const WCHAR *value, int n_value) { mxwriter *This = impl_from_ISAXDeclHandler( iface ); - FIXME("(%p)->(%s:%d %s:%d %s:%d %s:%d %s:%d): stub\n", This, debugstr_wn(element, n_element), n_element, + static const WCHAR attlistW[] = {'<','!','A','T','T','L','I','S','T',' '}; + static const WCHAR closeelementW[] = {'>','\r','\n'}; + + TRACE("(%p)->(%s:%d %s:%d %s:%d %s:%d %s:%d)\n", This, debugstr_wn(element, n_element), n_element, debugstr_wn(attr, n_attr), n_attr, debugstr_wn(type, n_type), n_type, debugstr_wn(Default, n_default), n_default, debugstr_wn(value, n_value), n_value); - return E_NOTIMPL; + + write_output_buffer(This->buffer, attlistW, sizeof(attlistW)/sizeof(WCHAR)); + if (n_element) { + write_output_buffer(This->buffer, element, n_element); + write_output_buffer(This->buffer, spaceW, sizeof(spaceW)/sizeof(WCHAR)); + } + + if (n_attr) { + write_output_buffer(This->buffer, attr, n_attr); + write_output_buffer(This->buffer, spaceW, sizeof(spaceW)/sizeof(WCHAR)); + } + + if (n_type) { + write_output_buffer(This->buffer, type, n_type); + write_output_buffer(This->buffer, spaceW, sizeof(spaceW)/sizeof(WCHAR)); + } + + if (n_default) { + write_output_buffer(This->buffer, Default, n_default); + write_output_buffer(This->buffer, spaceW, sizeof(spaceW)/sizeof(WCHAR)); + } + + if (n_value) + write_output_buffer_quoted(This->buffer, value, n_value); + + write_output_buffer(This->buffer, closeelementW, sizeof(closeelementW)/sizeof(WCHAR)); + + return S_OK; } static HRESULT WINAPI SAXDeclHandler_internalEntityDecl(ISAXDeclHandler *iface, diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index be96716..5efe44e 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -4450,6 +4450,44 @@ static void test_mxwriter_dtd(void) V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); + /* attribute declaration */ + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_put_output(writer, dest); + EXPECT_HR(hr, S_OK); + + hr = ISAXDeclHandler_attributeDecl(decl, _bstr_("element"), strlen("element"), + _bstr_("attribute"), strlen("attribute"), _bstr_("CDATA"), strlen("CDATA"), + _bstr_("#REQUIRED"), strlen("#REQUIRED"), _bstr_("value"), strlen("value")); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("<!ATTLIST element attribute CDATA #REQUIRED \"value\">\r\n"), + V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + hr = ISAXDeclHandler_attributeDecl(decl, _bstr_("element"), strlen("element"), + _bstr_("attribute2"), strlen("attribute2"), _bstr_("CDATA"), strlen("CDATA"), + _bstr_("#REQUIRED"), strlen("#REQUIRED"), _bstr_("value2"), strlen("value2")); + EXPECT_HR(hr, S_OK); + + hr = ISAXDeclHandler_attributeDecl(decl, _bstr_("element2"), strlen("element2"), + _bstr_("attribute3"), strlen("attribute3"), _bstr_("CDATA"), strlen("CDATA"), + _bstr_("#REQUIRED"), strlen("#REQUIRED"), _bstr_("value3"), strlen("value3")); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("<!ATTLIST element attribute CDATA #REQUIRED \"value\">\r\n" + "<!ATTLIST element attribute2 CDATA #REQUIRED \"value2\">\r\n" + "<!ATTLIST element2 attribute3 CDATA #REQUIRED \"value3\">\r\n"), + V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + ISAXContentHandler_Release(content); ISAXLexicalHandler_Release(lexical); ISAXDeclHandler_Release(decl);

1 0

Nikolay Sivov : msxml3: Fix closing of open element.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 7c9a1b52e3ba49ee77a6125ccbd8b0e4ff8d2d0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c9a1b52e3ba49ee77a6125cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 23 12:29:14 2012 +0400 msxml3: Fix closing of open element. --- dlls/msxml3/mxwriter.c | 9 ++-- dlls/msxml3/tests/saxreader.c | 91 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 0455dc4..daa6db8 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1071,7 +1071,8 @@ static HRESULT WINAPI SAXContentHandler_startElement( TRACE("(%p)->(%s %s %s %p)\n", This, debugstr_wn(namespaceUri, nnamespaceUri), debugstr_wn(local_name, nlocal_name), debugstr_wn(QName, nQName), attr); - if ((!namespaceUri || !local_name || !QName) && This->class_version != MSXML6) + if (((!namespaceUri || !local_name || !QName) && This->class_version != MSXML6) || + (nQName == -1 && This->class_version == MSXML6)) return E_INVALIDARG; close_element_starttag(This); @@ -1139,13 +1140,13 @@ static HRESULT WINAPI SAXContentHandler_endElement( TRACE("(%p)->(%s:%d %s:%d %s:%d)\n", This, debugstr_wn(namespaceUri, nnamespaceUri), nnamespaceUri, debugstr_wn(local_name, nlocal_name), nlocal_name, debugstr_wn(QName, nQName), nQName); - if ((!namespaceUri || !local_name || !QName) && This->class_version != MSXML6) + if (((!namespaceUri || !local_name || !QName) && This->class_version != MSXML6) || + (nQName == -1 && This->class_version == MSXML6)) return E_INVALIDARG; - if (This->element && QName && !strncmpW(This->element, QName, nQName)) + if (This->element) { static const WCHAR closeW[] = {'/','>'}; - write_output_buffer(This->buffer, closeW, 2); } else diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 267aea3..be96716 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3304,6 +3304,94 @@ static void test_mxwriter_startendelement_batch(const struct writer_startendelem free_bstrs(); } +/* point of these test is to start/end element with different names and name lengths */ +struct writer_startendelement2_t { + const GUID *clsid; + const char *qnamestart; + int qnamestart_len; + const char *qnameend; + int qnameend_len; + const char *output; + HRESULT hr; +}; + +static const struct writer_startendelement2_t writer_startendelement2[] = { + { &CLSID_MXXMLWriter, "a", -1, "b", -1, "<a/>", S_OK }, + { &CLSID_MXXMLWriter30, "a", -1, "b", -1, "<a/>", S_OK }, + { &CLSID_MXXMLWriter40, "a", -1, "b", -1, "<a/>", S_OK }, + /* -1 length is not allowed for version 6 */ + { &CLSID_MXXMLWriter60, "a", -1, "b", -1, "<a/>", E_INVALIDARG }, + + { &CLSID_MXXMLWriter, "a", 1, "b", 1, "<a/>", S_OK }, + { &CLSID_MXXMLWriter30, "a", 1, "b", 1, "<a/>", S_OK }, + { &CLSID_MXXMLWriter40, "a", 1, "b", 1, "<a/>", S_OK }, + { &CLSID_MXXMLWriter60, "a", 1, "b", 1, "<a/>", S_OK }, + { NULL } +}; + +static void test_mxwriter_startendelement_batch2(const struct writer_startendelement2_t *table) +{ + int i = 0; + + while (table->clsid) + { + ISAXContentHandler *content; + IMXWriter *writer; + HRESULT hr; + + if (!is_clsid_supported(table->clsid, mxwriter_support_data)) + { + table++; + i++; + continue; + } + + hr = CoCreateInstance(table->clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startDocument(content); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startElement(content, _bstr_(""), 0, _bstr_(""), 0, + _bstr_(table->qnamestart), table->qnamestart_len, NULL); + ok(hr == table->hr, "test %d: got 0x%08x, expected 0x%08x\n", i, hr, table->hr); + + hr = ISAXContentHandler_endElement(content, _bstr_(""), 0, _bstr_(""), 0, + _bstr_(table->qnameend), table->qnameend_len); + ok(hr == table->hr, "test %d: got 0x%08x, expected 0x%08x\n", i, hr, table->hr); + + /* test output */ + if (hr == S_OK) + { + VARIANT dest; + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_(table->output), V_BSTR(&dest)), + "test %d: got wrong content %s, expected %s\n", i, wine_dbgstr_w(V_BSTR(&dest)), table->output); + VariantClear(&dest); + } + + ISAXContentHandler_Release(content); + IMXWriter_Release(writer); + + table++; + i++; + + free_bstrs(); + } +} + + static void test_mxwriter_startendelement(void) { ISAXContentHandler *content; @@ -3312,6 +3400,7 @@ static void test_mxwriter_startendelement(void) HRESULT hr; test_mxwriter_startendelement_batch(writer_startendelement); + test_mxwriter_startendelement_batch2(writer_startendelement2); hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, &IID_IMXWriter, (void**)&writer); @@ -3410,6 +3499,7 @@ static void test_mxwriter_startendelement(void) hr = IMXWriter_put_output(writer, dest); EXPECT_HR(hr, S_OK); + /* length -1 */ hr = ISAXContentHandler_startElement(content, _bstr_(""), 0, _bstr_(""), 0, _bstr_("a"), -1, NULL); EXPECT_HR(hr, S_OK); V_VT(&dest) = VT_EMPTY; @@ -3417,6 +3507,7 @@ static void test_mxwriter_startendelement(void) EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); ok(!lstrcmpW(_bstr_("<a>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); ISAXContentHandler_Release(content); IMXWriter_Release(writer);

1 0

Nikolay Sivov : msxml3: Properly handle -1 as length of element qualified name in startElement().
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 5e08765fbb7bd578aa1adce11b59e8bf9433ac87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e08765fbb7bd578aa1adce11… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 23 00:38:12 2012 +0400 msxml3: Properly handle -1 as length of element qualified name in startElement(). --- dlls/msxml3/mxwriter.c | 5 +++- dlls/msxml3/tests/saxreader.c | 46 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 0382690..0455dc4 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -536,7 +536,10 @@ static void close_element_starttag(const mxwriter *This) static void set_element_name(mxwriter *This, const WCHAR *name, int len) { SysFreeString(This->element); - This->element = name ? SysAllocStringLen(name, len) : NULL; + if (name) + This->element = len != -1 ? SysAllocStringLen(name, len) : SysAllocString(name); + else + This->element = NULL; } static inline HRESULT flush_output_buffer(mxwriter *This) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index e7e3172..267aea3 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2822,6 +2822,7 @@ static void test_mxwriter_flush(void) HRESULT hr; char *buff; LONG ref; + int len; hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, &IID_IMXWriter, (void**)&writer); @@ -2919,9 +2920,10 @@ static void test_mxwriter_flush(void) EXPECT_HR(hr, S_OK); ok(pos2.QuadPart == 0, "expected stream beginning\n"); - buff = HeapAlloc(GetProcessHeap(), 0, 2048); - memset(buff, 'A', 2048); - hr = ISAXContentHandler_characters(content, _bstr_(buff), 2048); + len = 2048; + buff = HeapAlloc(GetProcessHeap(), 0, len); + memset(buff, 'A', len); + hr = ISAXContentHandler_characters(content, _bstr_(buff), len); EXPECT_HR(hr, S_OK); pos.QuadPart = 0; @@ -2965,8 +2967,8 @@ todo_wine EXPECT_HR(hr, S_OK); ok(pos2.QuadPart == 0, "expected stream beginning\n"); - memset(buff, 'A', 2048); - hr = ISAXContentHandler_characters(content, _bstr_(buff), 2040); + memset(buff, 'A', len); + hr = ISAXContentHandler_characters(content, _bstr_(buff), len - 8); EXPECT_HR(hr, S_OK); pos.QuadPart = 0; @@ -2978,6 +2980,28 @@ todo_wine hr = ISAXContentHandler_endDocument(content); EXPECT_HR(hr, S_OK); + /* test auto-flush function when stream is not set */ + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_put_output(writer, dest); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startDocument(content); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startElement(content, emptyW, 0, emptyW, 0, _bstr_("a"), -1, NULL); + EXPECT_HR(hr, S_OK); + + memset(buff, 'A', len); + hr = ISAXContentHandler_characters(content, _bstr_(buff), len); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + len += strlen("<a>"); + ok(SysStringLen(V_BSTR(&dest)) == len, "got len=%d, expected %d\n", SysStringLen(V_BSTR(&dest)), len); + VariantClear(&dest); + HeapFree(GetProcessHeap(), 0, buff); ISAXContentHandler_Release(content); IStream_Release(stream); @@ -3382,6 +3406,18 @@ static void test_mxwriter_startendelement(void) ok(!lstrcmpW(_bstr_("<abc></abd>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_put_output(writer, dest); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startElement(content, _bstr_(""), 0, _bstr_(""), 0, _bstr_("a"), -1, NULL); + EXPECT_HR(hr, S_OK); + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("<a>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ISAXContentHandler_Release(content); IMXWriter_Release(writer); free_bstrs();

1 0

Nikolay Sivov : msxml3: Return stream reference from get_output() if stream is set.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 6ab3f1ae9940351f0a26d09516f185f452e9a8b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ab3f1ae9940351f0a26d0951… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 22 22:36:04 2012 +0400 msxml3: Return stream reference from get_output() if stream is set. --- dlls/msxml3/mxwriter.c | 11 ++++++++--- dlls/msxml3/tests/saxreader.c | 13 +++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 81d498e..0382690 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -755,6 +755,8 @@ static HRESULT WINAPI mxwriter_get_output(IMXWriter *iface, VARIANT *dest) TRACE("(%p)->(%p)\n", This, dest); + if (!dest) return E_POINTER; + if (!This->dest) { HRESULT hr = flush_output_buffer(This); @@ -766,10 +768,13 @@ static HRESULT WINAPI mxwriter_get_output(IMXWriter *iface, VARIANT *dest) return S_OK; } - else - FIXME("not implemented when stream is set up\n"); - return E_NOTIMPL; + /* we only support IStream output so far */ + V_VT(dest) = VT_UNKNOWN; + V_UNKNOWN(dest) = (IUnknown*)This->dest; + IStream_AddRef(This->dest); + + return S_OK; } static HRESULT WINAPI mxwriter_put_encoding(IMXWriter *iface, BSTR encoding) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index c9480a9..e7e3172 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2821,6 +2821,7 @@ static void test_mxwriter_flush(void) VARIANT dest; HRESULT hr; char *buff; + LONG ref; hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, &IID_IMXWriter, (void**)&writer); @@ -2930,6 +2931,18 @@ static void test_mxwriter_flush(void) todo_wine ok(pos2.QuadPart != 0, "unexpected stream beginning\n"); + hr = IMXWriter_get_output(writer, NULL); + EXPECT_HR(hr, E_POINTER); + + ref = get_refcount(stream); + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_UNKNOWN, "got vt type %d\n", V_VT(&dest)); + ok(V_UNKNOWN(&dest) == (IUnknown*)stream, "got pointer %p\n", V_UNKNOWN(&dest)); + ok(ref+1 == get_refcount(stream), "expected increased refcount\n"); + VariantClear(&dest); + hr = ISAXContentHandler_endDocument(content); EXPECT_HR(hr, S_OK);

1 0

Austin English : kernel32: Add more tracing to GetDiskFreeSpaceW.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 729afb18fe200a296498ec7fe15cc221e3494f78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=729afb18fe200a296498ec7fe… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jun 25 01:03:37 2012 -0500 kernel32: Add more tracing to GetDiskFreeSpaceW. --- dlls/kernel32/volume.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 23bcca1..8377e41 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1687,6 +1687,8 @@ BOOL WINAPI GetDiskFreeSpaceW( LPCWSTR root, LPDWORD cluster_sectors, if (sector_bytes) *sector_bytes = info.BytesPerSector; if (free_clusters) *free_clusters = info.AvailableAllocationUnits.u.LowPart; if (total_clusters) *total_clusters = info.TotalAllocationUnits.u.LowPart; + TRACE("%#08x, %#08x, %#08x, %#08x\n", info.SectorsPerAllocationUnit, info.BytesPerSector, + info.AvailableAllocationUnits.u.LowPart, info.TotalAllocationUnits.u.LowPart); return TRUE; }

1 0

Roderick Colenbrander : opengl32: Check for valid context in wglGetProcAddress.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: c9962bbb581057b0f06473d3360631ed130b4bfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9962bbb581057b0f06473d33… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Jun 24 22:42:11 2012 -0700 opengl32: Check for valid context in wglGetProcAddress. --- dlls/opengl32/tests/opengl.c | 2 +- dlls/opengl32/wgl.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index ffc676e..c18b0ad 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -797,7 +797,7 @@ static void test_getprocaddress(HDC hdc) /* Temporarily disable the context, so we can see that we can't retrieve functions now. */ wglMakeCurrent(hdc, NULL); func = wglGetProcAddress("glActiveTextureARB"); - todo_wine ok(func == NULL, "Function lookup without a context passed, expected a failure; last error %#x\n", GetLastError()); + ok(func == NULL, "Function lookup without a context passed, expected a failure; last error %#x\n", GetLastError()); wglMakeCurrent(hdc, ctx); } diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 98b04d4..9200dd6 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -300,9 +300,18 @@ PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) { TRACE("(%s)\n", lpszProc); - if(lpszProc == NULL) + if (lpszProc == NULL) return NULL; + /* Without an active context opengl32 doesn't know to what + * driver it has to dispatch wglGetProcAddress. + */ + if (wglGetCurrentContext() == NULL) + { + WARN("No active WGL context found\n"); + return NULL; + } + /* First, look if it's not already defined in the 'standard' OpenGL functions */ if ((local_func = GetProcAddress(opengl32_handle, lpszProc)) != NULL) { TRACE(" found function in 'standard' OpenGL functions (%p)\n", local_func);

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2012