June 2012 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : windowscodecs: Add WICImagingCategories registration.
by Alexandre Julliard June 25, 2012

June 25, 2012

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 June 25, 2012

June 25, 2012

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 June 25, 2012

June 25, 2012

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

Alexandre Julliard : winex11: Move wglGetCurrentContext and wglGetCurrentDC to the internal OpenGL extension functions .
by Alexandre Julliard June 25, 2012

June 25, 2012

Module: wine Branch: master Commit: 66a5995e119d9f91d33bf21cbe1a43e643c86c4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=66a5995e119d9f91d33bf21cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 25 16:22:16 2012 +0200 winex11: Move wglGetCurrentContext and wglGetCurrentDC to the internal OpenGL extension functions. --- dlls/opengl32/wgl.c | 12 ++++++------ dlls/wined3d/directx.c | 4 ++++ dlls/wined3d/wined3d_gl.h | 2 -- dlls/winex11.drv/opengl.c | 24 +++++++++++++++++++++++- 4 files changed, 33 insertions(+), 9 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index a3b5319..7a195be 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -50,9 +50,7 @@ static struct PROC (WINAPI *p_wglGetProcAddress)(LPCSTR lpszProc); BOOL (WINAPI *p_SetPixelFormat)(HDC hdc, INT iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd); BOOL (WINAPI *p_wglMakeCurrent)(HDC hdc, HGLRC hglrc); - HDC (WINAPI *p_wglGetCurrentDC)(void); HGLRC (WINAPI *p_wglCreateContext)(HDC hdc); - HGLRC (WINAPI *p_wglGetCurrentContext)(void); INT (WINAPI *p_ChoosePixelFormat)(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd); INT (WINAPI *p_DescribePixelFormat)(HDC hdc, INT iPixelFormat, UINT nBytes, LPPIXELFORMATDESCRIPTOR ppfd); INT (WINAPI *p_GetPixelFormat)(HDC hdc); @@ -60,9 +58,11 @@ static struct /* internal WGL functions */ BOOL (WINAPI *p_wglCopyContext)(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask); BOOL (WINAPI *p_wglDeleteContext)(HGLRC hglrc); - void (WINAPI *p_wglGetIntegerv)(GLenum pname, GLint* params); void (WINAPI *p_wglFinish)(void); void (WINAPI *p_wglFlush)(void); + HGLRC (WINAPI *p_wglGetCurrentContext)(void); + HDC (WINAPI *p_wglGetCurrentDC)(void); + void (WINAPI *p_wglGetIntegerv)(GLenum pname, GLint* params); BOOL (WINAPI *p_wglShareLists)(HGLRC hglrc1, HGLRC hglrc2); } wine_wgl; @@ -932,9 +932,7 @@ static BOOL process_attach(void) wine_wgl.p_wglGetProcAddress = (void *)GetProcAddress(mod_gdi32, "wglGetProcAddress"); wine_wgl.p_SetPixelFormat = (void *)GetProcAddress(mod_gdi32, "SetPixelFormat"); wine_wgl.p_wglMakeCurrent = (void *)GetProcAddress(mod_gdi32, "wglMakeCurrent"); - wine_wgl.p_wglGetCurrentDC = (void *)GetProcAddress(mod_gdi32, "wglGetCurrentDC"); wine_wgl.p_wglCreateContext = (void *)GetProcAddress(mod_gdi32, "wglCreateContext"); - wine_wgl.p_wglGetCurrentContext = (void *)GetProcAddress(mod_gdi32, "wglGetCurrentContext"); wine_wgl.p_ChoosePixelFormat = (void *)GetProcAddress(mod_gdi32, "ChoosePixelFormat"); wine_wgl.p_DescribePixelFormat = (void *)GetProcAddress(mod_gdi32, "DescribePixelFormat"); wine_wgl.p_GetPixelFormat = (void *)GetProcAddress(mod_gdi32, "GetPixelFormat"); @@ -942,9 +940,11 @@ static BOOL process_attach(void) /* internal WGL functions */ wine_wgl.p_wglCopyContext = (void *)wine_wgl.p_wglGetProcAddress("wglCopyContext"); wine_wgl.p_wglDeleteContext = (void *)wine_wgl.p_wglGetProcAddress("wglDeleteContext"); - wine_wgl.p_wglGetIntegerv = (void *)wine_wgl.p_wglGetProcAddress("wglGetIntegerv"); wine_wgl.p_wglFinish = (void *)wine_wgl.p_wglGetProcAddress("wglFinish"); wine_wgl.p_wglFlush = (void *)wine_wgl.p_wglGetProcAddress("wglFlush"); + wine_wgl.p_wglGetCurrentContext = (void *)wine_wgl.p_wglGetProcAddress("wglGetCurrentContext"); + wine_wgl.p_wglGetCurrentDC = (void *)wine_wgl.p_wglGetProcAddress("wglGetCurrentDC"); + wine_wgl.p_wglGetIntegerv = (void *)wine_wgl.p_wglGetProcAddress("wglGetIntegerv"); wine_wgl.p_wglShareLists = (void *)wine_wgl.p_wglGetProcAddress("wglShareLists"); if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\OpenGL", &hkey)) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0647ae3..1d0407d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5360,11 +5360,15 @@ static BOOL InitAdapters(struct wined3d *wined3d) wglFinish = (void*)GetProcAddress(mod_gl, "glFinish"); wglFlush = (void*)GetProcAddress(mod_gl, "glFlush"); pwglDeleteContext = (void*)GetProcAddress(mod_gl, "wglDeleteContext"); + pwglGetCurrentContext = (void*)GetProcAddress(mod_gl, "wglGetCurrentContext"); + pwglGetCurrentDC = (void*)GetProcAddress(mod_gl, "wglGetCurrentDC"); pwglShareLists = (void*)GetProcAddress(mod_gl, "wglShareLists"); #else wglFinish = (void*)pwglGetProcAddress("wglFinish"); wglFlush = (void*)pwglGetProcAddress("wglFlush"); pwglDeleteContext = (void*)pwglGetProcAddress("wglDeleteContext"); + pwglGetCurrentContext = (void*)pwglGetProcAddress("wglGetCurrentContext"); + pwglGetCurrentDC = (void*)pwglGetProcAddress("wglGetCurrentDC"); pwglShareLists = (void*)pwglGetProcAddress("wglShareLists"); #endif diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index fa39de5..2ffb14b 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1713,8 +1713,6 @@ BOOL (WINAPI *pwglShareLists)(HGLRC, HGLRC) DECLSPEC_HIDDEN; #define WGL_FUNCS_GEN \ USE_WGL_FUNC(wglCreateContext) \ - USE_WGL_FUNC(wglGetCurrentContext) \ - USE_WGL_FUNC(wglGetCurrentDC) \ USE_WGL_FUNC(wglGetProcAddress) \ USE_WGL_FUNC(wglMakeCurrent) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 62802b85..d3118c2 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2005,6 +2005,26 @@ static BOOL WINAPI X11DRV_wglShareLists(HGLRC hglrc1, HGLRC hglrc2) return FALSE; } +/*********************************************************************** + * X11DRV_wglGetCurrentContext + */ +static HGLRC WINAPI X11DRV_wglGetCurrentContext(void) +{ + return NtCurrentTeb()->glContext; +} + +/*********************************************************************** + * X11DRV_wglGetCurrentDC + */ +static HDC WINAPI X11DRV_wglGetCurrentDC(void) +{ + Wine_GLContext *ctx = NtCurrentTeb()->glContext; + + if (!ctx) return NULL; + TRACE("hdc %p\n", ctx->hdc); + return ctx->hdc; +} + /* WGL helper function which handles differences in glGetIntegerv from WGL and GLX */ static void WINAPI X11DRV_wglGetIntegerv(GLenum pname, GLint* params) { @@ -3251,9 +3271,11 @@ static const WineGLExtension WGL_internal_functions = { { "wglCopyContext", X11DRV_wglCopyContext }, { "wglDeleteContext", X11DRV_wglDeleteContext }, - { "wglGetIntegerv", X11DRV_wglGetIntegerv }, { "wglFinish", X11DRV_wglFinish }, { "wglFlush", X11DRV_wglFlush }, + { "wglGetCurrentContext", X11DRV_wglGetCurrentContext }, + { "wglGetCurrentDC", X11DRV_wglGetCurrentDC }, + { "wglGetIntegerv", X11DRV_wglGetIntegerv }, { "wglShareLists", X11DRV_wglShareLists }, } };

1 0

Nikolay Sivov : msxml3: Properly handle -1 as length of element qualified name in startElement().
by Alexandre Julliard June 25, 2012

June 25, 2012

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

Julian Rüger : winspool.drv/tests: Fix typos/grammar.
by Alexandre Julliard June 25, 2012

June 25, 2012

Module: wine Branch: master Commit: 0595619e0f0ff52ce2d22b5c0f98733824aa9a13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0595619e0f0ff52ce2d22b5c0… Author: Julian Rüger <jr98(a)gmx.net> Date: Sun Jun 24 19:40:56 2012 +0200 winspool.drv/tests: Fix typos/grammar. --- dlls/winspool.drv/tests/info.c | 54 ++++++++++++++++++++-------------------- 1 files changed, 27 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0595619e0f0ff52ce2d22…

1 0

André Hentschel : winebuild: Put the PE header into the text section on ARM.
by Alexandre Julliard June 25, 2012

June 25, 2012

Module: wine Branch: master Commit: e7730053f3c859b53df277386105967044a7848d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7730053f3c859b53df277386… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 25 00:20:50 2012 +0200 winebuild: Put the PE header into the text section on ARM. --- tools/winebuild/spec32.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 7743acc..3dff304 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -403,22 +403,24 @@ static void output_asm_constructor( const char *constructor ) } else { - output( "\n\t.section \".init\",\"ax\"\n" ); switch(target_cpu) { case CPU_x86: case CPU_x86_64: + output( "\n\t.section \".init\",\"ax\"\n" ); output( "\tcall %s\n", asm_name(constructor) ); break; case CPU_SPARC: + output( "\n\t.section \".init\",\"ax\"\n" ); output( "\tcall %s\n", asm_name(constructor) ); output( "\tnop\n" ); break; case CPU_ARM: + output( "\n\t.section \".text\",\"ax\"\n" ); output( "\tblx %s\n", asm_name(constructor) ); - output( "\t.arm\n" ); break; case CPU_POWERPC: + output( "\n\t.section \".init\",\"ax\"\n" ); output( "\tbl %s\n", asm_name(constructor) ); break; } @@ -452,20 +454,20 @@ void output_module( DLLSPEC *spec ) output( "\t.skip %u\n", 65536 + page_size ); break; default: - output( "\n\t.section \".init\",\"ax\"\n" ); switch(target_cpu) { case CPU_x86: case CPU_x86_64: case CPU_SPARC: + output( "\n\t.section \".init\",\"ax\"\n" ); output( "\tjmp 1f\n" ); break; case CPU_ARM: - output( "\n\t.syntax unified\n" ); - output( "\n\t.thumb\n" ); - output( "\tb.w 1f\n" ); + output( "\n\t.section \".text\",\"ax\"\n" ); + output( "\tb 1f\n" ); break; case CPU_POWERPC: + output( "\n\t.section \".init\",\"ax\"\n" ); output( "\tb 1f\n" ); break; }

1 0

Roderick Colenbrander : winex11.drv: Remove GLX_ATI_render_texture support.
by Alexandre Julliard June 25, 2012

June 25, 2012

Module: wine Branch: master Commit: c754f28f171c5cf90fecf20d9d536f476316f1c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c754f28f171c5cf90fecf20d9… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Jun 24 22:42:10 2012 -0700 winex11.drv: Remove GLX_ATI_render_texture support. --- dlls/winex11.drv/opengl.c | 419 ++++++++++++++------------------------------- include/wine/wgl.h | 36 ---- 2 files changed, 127 insertions(+), 328 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c754f28f171c5cf90fecf…

1 0

André Hentschel : configure: Downgrade the Thumb2 requirement to Thumb on ARM.
by Alexandre Julliard June 25, 2012

June 25, 2012

Module: wine Branch: master Commit: 74518c8d0472c6e494823d22291fc32cdc2a612d URL: http://source.winehq.org/git/wine.git/?a=commit;h=74518c8d0472c6e494823d222… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 25 00:22:16 2012 +0200 configure: Downgrade the Thumb2 requirement to Thumb on ARM. --- configure | 8 ++++---- configure.ac | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 465bdc4..2a26441 100755 --- a/configure +++ b/configure @@ -4142,15 +4142,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi ;; arm*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports Thumb2" >&5 -$as_echo_n "checking whether $CC supports Thumb2... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports Thumb" >&5 +$as_echo_n "checking whether $CC supports Thumb... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int ac_test(int i) { return i; } int main () { -asm(".syntax unified\n.thumb\nb.w ac_test\n.arm"); if (ac_test(1)) return 1 +asm(".thumb\nblx ac_test\n.arm"); if (ac_test(1)) return 1 ; return 0; } @@ -4161,7 +4161,7 @@ $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "You need a target with Thumb2 support to build Wine for ARM." "$LINENO" 5 + as_fn_error $? "You need a target with Thumb support to build Wine for ARM." "$LINENO" 5 fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext diff --git a/configure.ac b/configure.ac index 1753e14..70e7663 100644 --- a/configure.ac +++ b/configure.ac @@ -169,11 +169,11 @@ case $host in fi ;; arm*) - AC_MSG_CHECKING([whether $CC supports Thumb2]) - WINE_TRY_ASM_LINK([".syntax unified\n.thumb\nb.w ac_test\n.arm"],[int ac_test(int i) { return i; }], [if (ac_test(1)) return 1], + AC_MSG_CHECKING([whether $CC supports Thumb]) + WINE_TRY_ASM_LINK([".thumb\nblx ac_test\n.arm"],[int ac_test(int i) { return i; }], [if (ac_test(1)) return 1], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) - AC_MSG_ERROR([You need a target with Thumb2 support to build Wine for ARM.])]) + AC_MSG_ERROR([You need a target with Thumb support to build Wine for ARM.])]) CFLAGS="$CFLAGS -marm" ;; *-mingw32*|*-cygwin*)

1 0

André Hentschel : ntdll: Check for ARMv7 architecture dynamically when loading a PE.
by Alexandre Julliard June 25, 2012

June 25, 2012

Module: wine Branch: master Commit: 567e44161c37be60a059f2f51acbda4a4ca12b35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=567e44161c37be60a059f2f51… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 25 00:25:28 2012 +0200 ntdll: Check for ARMv7 architecture dynamically when loading a PE. --- dlls/ntdll/virtual.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d67f2d5..806b7a9 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1061,11 +1061,15 @@ static NTSTATUS check_architecture( const IMAGE_NT_HEADERS *nt ) } #elif defined(__arm__) && !defined(__ARMEB__) if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARM || -#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7R__) - nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARMV7 || -#endif nt->FileHeader.Machine == IMAGE_FILE_MACHINE_THUMB) return STATUS_SUCCESS; + if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARMV7) + { + SYSTEM_CPU_INFORMATION sci; + if (SUCCEEDED(NtQuerySystemInformation( SystemCpuInformation, &sci, sizeof(sci), NULL )) && + sci.Architecture == PROCESSOR_ARCHITECTURE_ARM && sci.Level >= 7) + return STATUS_SUCCESS; + } #endif switch (nt->FileHeader.Machine)

1 0