Ros-diffs July 2015

ros-diffs@reactos.org

13 participants
257 discussions

[akhaldi] 68484: [OLEACC_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jul 20 21:52:30 2015 New Revision: 68484 URL: http://svn.reactos.org/svn/reactos?rev=68484&view=rev Log: [OLEACC_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/rostests/winetests/oleacc/main.c Modified: trunk/rostests/winetests/oleacc/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleacc/main.c?r… ============================================================================== --- trunk/rostests/winetests/oleacc/main.c [iso-8859-1] (original) +++ trunk/rostests/winetests/oleacc/main.c [iso-8859-1] Mon Jul 20 21:52:30 2015 @@ -20,10 +20,39 @@ #define COBJMACROS +#include <wine/test.h> #include <stdio.h> + +//#include "initguid.h" #include <oleacc.h> -#include <wine/test.h> +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + do { called_ ## func = FALSE; expect_ ## func = TRUE; } while(0) + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_EXPECT(func) \ + do { \ + CHECK_EXPECT2(func); \ + expect_ ## func = FALSE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +DEFINE_EXPECT(Accessible_QI_IEnumVARIANT); +DEFINE_EXPECT(Accessible_get_accChildCount); +DEFINE_EXPECT(Accessible_get_accChild); static HANDLE (WINAPI *pGetProcessHandleFromHwnd)(HWND); @@ -39,6 +68,241 @@ return TRUE; } + +static HRESULT WINAPI Accessible_QueryInterface( + IAccessible *iface, REFIID riid, void **ppvObject) +{ + if(IsEqualIID(riid, &IID_IEnumVARIANT)) { + CHECK_EXPECT(Accessible_QI_IEnumVARIANT); + return E_NOINTERFACE; + } + + ok(0, "unexpected QI call: %s\n", wine_dbgstr_guid(riid)); + return E_NOTIMPL; +} + +static ULONG WINAPI Accessible_AddRef(IAccessible *iface) +{ + return 2; +} + +static ULONG WINAPI Accessible_Release(IAccessible *iface) +{ + return 1; +} + +static HRESULT WINAPI Accessible_GetTypeInfoCount( + IAccessible *iface, UINT *pctinfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Accessible_GetTypeInfo(IAccessible *iface, + UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Accessible_GetIDsOfNames(IAccessible *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Accessible_Invoke(IAccessible *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Accessible_get_accParent( + IAccessible *iface, IDispatch **ppdispParent) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Accessible_get_accChildCount( + IAccessible *iface, LONG *pcountChildren) +{ + CHECK_EXPECT(Accessible_get_accChildCount); + *pcountChildren = 1; + return S_OK; +} + +static HRESULT WINAPI Accessible_get_accChild(IAccessible *iface, + VARIANT varChildID, IDispatch **ppdispChild) +{ + CHECK_EXPECT(Accessible_get_accChild); + ok(V_VT(&varChildID) == VT_I4, "V_VT(&varChildID) = %d\n", V_VT(&varChildID)); + ok(V_I4(&varChildID) == 1, "V_I4(&varChildID) = %d\n", V_I4(&varChildID)); + + *ppdispChild = NULL; + return S_OK; +} + +static HRESULT WINAPI Accessible_get_accName(IAccessible *iface, + VARIANT varID, BSTR *pszName) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Accessible_get_accValue(IAccessible *iface, + VARIANT varID, BSTR *pszValue) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Accessible_get_accDescription(IAccessible *iface, + VARIANT varID, BSTR *pszDescription) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Accessible_get_accRole(IAccessible *iface, + VARIANT varID, VARIANT *pvarRole) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Accessible_get_accState(IAccessible *iface, + VARIANT varID, VARIANT *pvarState) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Accessible_get_accHelp(IAccessible *iface, + VARIANT varID, BSTR *pszHelp) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Accessible_get_accHelpTopic(IAccessible *iface, + BSTR *pszHelpFile, VARIANT varID, LONG *pidTopic) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Accessible_get_accKeyboardShortcut(IAccessible *iface, + VARIANT varID, BSTR *pszKeyboardShortcut) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Accessible_get_accFocus(IAccessible *iface, VARIANT *pvarID) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Accessible_get_accSelection( + IAccessible *iface, VARIANT *pvarID) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Accessible_get_accDefaultAction(IAccessible *iface, + VARIANT varID, BSTR *pszDefaultAction) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Accessible_accSelect(IAccessible *iface, + LONG flagsSelect, VARIANT varID) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Accessible_accLocation(IAccessible *iface, LONG *pxLeft, + LONG *pyTop, LONG *pcxWidth, LONG *pcyHeight, VARIANT varID) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Accessible_accNavigate(IAccessible *iface, + LONG navDir, VARIANT varStart, VARIANT *pvarEnd) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Accessible_accHitTest(IAccessible *iface, + LONG xLeft, LONG yTop, VARIANT *pvarID) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Accessible_accDoDefaultAction( + IAccessible *iface, VARIANT varID) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Accessible_put_accName(IAccessible *iface, + VARIANT varID, BSTR pszName) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Accessible_put_accValue(IAccessible *iface, + VARIANT varID, BSTR pszValue) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static IAccessibleVtbl AccessibleVtbl = { + Accessible_QueryInterface, + Accessible_AddRef, + Accessible_Release, + Accessible_GetTypeInfoCount, + Accessible_GetTypeInfo, + Accessible_GetIDsOfNames, + Accessible_Invoke, + Accessible_get_accParent, + Accessible_get_accChildCount, + Accessible_get_accChild, + Accessible_get_accName, + Accessible_get_accValue, + Accessible_get_accDescription, + Accessible_get_accRole, + Accessible_get_accState, + Accessible_get_accHelp, + Accessible_get_accHelpTopic, + Accessible_get_accKeyboardShortcut, + Accessible_get_accFocus, + Accessible_get_accSelection, + Accessible_get_accDefaultAction, + Accessible_accSelect, + Accessible_accLocation, + Accessible_accNavigate, + Accessible_accHitTest, + Accessible_accDoDefaultAction, + Accessible_put_accName, + Accessible_put_accValue +}; + +static IAccessible Accessible = {&AccessibleVtbl}; static void test_getroletext(void) { @@ -375,6 +639,91 @@ DestroyWindow(hwnd); } +static void test_AccessibleChildren(IAccessible *acc) +{ + VARIANT children[3]; + LONG count; + HRESULT hr; + + count = -1; + hr = AccessibleChildren(NULL, 0, 0, children, &count); + ok(hr == E_INVALIDARG, "AccessibleChildren returned %x\n", hr); + ok(count == -1, "count = %d\n", count); + hr = AccessibleChildren(acc, 0, 0, NULL, &count); + ok(hr == E_INVALIDARG, "AccessibleChildren returned %x\n", hr); + ok(count == -1, "count = %d\n", count); + hr = AccessibleChildren(acc, 0, 0, children, NULL); + ok(hr == E_INVALIDARG, "AccessibleChildren returned %x\n", hr); + + if(acc == &Accessible) { + SET_EXPECT(Accessible_QI_IEnumVARIANT); + SET_EXPECT(Accessible_get_accChildCount); + } + hr = AccessibleChildren(acc, 0, 0, children, &count); + ok(hr == S_OK, "AccessibleChildren returned %x\n", hr); + if(acc == &Accessible) { + CHECK_CALLED(Accessible_QI_IEnumVARIANT); + CHECK_CALLED(Accessible_get_accChildCount); + } + ok(!count, "count = %d\n", count); + count = -1; + if(acc == &Accessible) { + SET_EXPECT(Accessible_QI_IEnumVARIANT); + SET_EXPECT(Accessible_get_accChildCount); + } + hr = AccessibleChildren(acc, 5, 0, children, &count); + ok(hr == S_OK, "AccessibleChildren returned %x\n", hr); + if(acc == &Accessible) { + CHECK_CALLED(Accessible_QI_IEnumVARIANT); + CHECK_CALLED(Accessible_get_accChildCount); + } + ok(!count, "count = %d\n", count); + + memset(children, 0xfe, sizeof(children)); + V_VT(children) = VT_DISPATCH; + if(acc == &Accessible) { + SET_EXPECT(Accessible_QI_IEnumVARIANT); + SET_EXPECT(Accessible_get_accChildCount); + SET_EXPECT(Accessible_get_accChild); + } + hr = AccessibleChildren(acc, 0, 1, children, &count); + ok(hr == S_OK, "AccessibleChildren returned %x\n", hr); + if(acc == &Accessible) { + CHECK_CALLED(Accessible_QI_IEnumVARIANT); + CHECK_CALLED(Accessible_get_accChildCount); + CHECK_CALLED(Accessible_get_accChild); + + ok(V_VT(children) == VT_I4, "V_VT(children) = %d\n", V_VT(children)); + ok(V_I4(children) == 1, "V_I4(children) = %d\n", V_I4(children)); + }else { + ok(V_VT(children) == VT_DISPATCH, "V_VT(children) = %d\n", V_VT(children)); + IDispatch_Release(V_DISPATCH(children)); + } + ok(count == 1, "count = %d\n", count); + + if(acc == &Accessible) { + SET_EXPECT(Accessible_QI_IEnumVARIANT); + SET_EXPECT(Accessible_get_accChildCount); + SET_EXPECT(Accessible_get_accChild); + } + hr = AccessibleChildren(acc, 0, 3, children, &count); + ok(hr == S_FALSE, "AccessibleChildren returned %x\n", hr); + if(acc == &Accessible) { + CHECK_CALLED(Accessible_QI_IEnumVARIANT); + CHECK_CALLED(Accessible_get_accChildCount); + CHECK_CALLED(Accessible_get_accChild); + + ok(V_VT(children) == VT_I4, "V_VT(children) = %d\n", V_VT(children)); + ok(V_I4(children) == 1, "V_I4(children) = %d\n", V_I4(children)); + }else { + ok(V_VT(children) == VT_DISPATCH, "V_VT(children) = %d\n", V_VT(children)); + IDispatch_Release(V_DISPATCH(children)); + } + ok(count == 1, "count = %d\n", count); + ok(V_VT(children+1) == VT_EMPTY, "V_VT(children+1) = %d\n", V_VT(children+1)); + ok(V_VT(children+2) == VT_EMPTY, "V_VT(children+2) = %d\n", V_VT(children+2)); +} + static void test_default_client_accessible_object(void) { static const WCHAR testW[] = {'t','e','s','t',' ','t',' ','&','j','u','n','k',0}; @@ -383,6 +732,7 @@ IAccessible *acc; IDispatch *disp; IOleWindow *ow; + IEnumVARIANT *ev; HWND chld, hwnd, hwnd2; HRESULT hr; VARIANT vid, v; @@ -390,6 +740,7 @@ POINT pt; RECT rect; LONG l, left, top, width, height; + ULONG fetched; hwnd = CreateWindowA("oleacc_test", "test &t &junk", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, NULL, NULL, NULL, NULL); @@ -417,6 +768,46 @@ hr = IAccessible_get_accChildCount(acc, &l); ok(hr == S_OK, "got %x\n", hr); ok(l == 1, "l = %d\n", l); + + V_VT(&vid) = VT_I4; + V_I4(&vid) = CHILDID_SELF; + disp = (void*)0xdeadbeef; + hr = IAccessible_get_accChild(acc, vid, &disp); + ok(hr == E_INVALIDARG, "get_accChild returned %x\n", hr); + ok(disp == NULL, "disp = %p\n", disp); + + V_I4(&vid) = 1; + disp = (void*)0xdeadbeef; + hr = IAccessible_get_accChild(acc, vid, &disp); + ok(hr == E_INVALIDARG, "get_accChild returned %x\n", hr); + ok(disp == NULL, "disp = %p\n", disp); + + hr = IAccessible_QueryInterface(acc, &IID_IEnumVARIANT, (void**)&ev); + ok(hr == S_OK, "got %x\n", hr); + + hr = IEnumVARIANT_Skip(ev, 100); + ok(hr == S_FALSE, "Skip returned %x\n", hr); + + V_VT(&v) = VT_I4; + fetched = 1; + hr = IEnumVARIANT_Next(ev, 1, &v, &fetched); + ok(hr == S_FALSE, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(fetched == 0, "fetched = %d\n", fetched); + + hr = IEnumVARIANT_Reset(ev); + ok(hr == S_OK, "got %x\n", hr); + + V_VT(&v) = VT_I4; + fetched = 2; + hr = IEnumVARIANT_Next(ev, 1, &v, &fetched); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(&v) = %d\n", V_VT(&v)); + IDispatch_Release(V_DISPATCH(&v)); + ok(fetched == 1, "fetched = %d\n", fetched); + IEnumVARIANT_Release(ev); + + test_AccessibleChildren(acc); V_VT(&vid) = VT_I4; V_I4(&vid) = CHILDID_SELF; @@ -621,6 +1012,7 @@ test_AccessibleObjectFromWindow(); test_GetProcessHandleFromHwnd(); test_default_client_accessible_object(); + test_AccessibleChildren(&Accessible); unregister_window_class(); CoUninitialize();

9 years, 5 months

[akhaldi] 68483: [OLEACC] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jul 20 21:52:13 2015 New Revision: 68483 URL: http://svn.reactos.org/svn/reactos?rev=68483&view=rev Log: [OLEACC] Sync with Wine Staging 1.7.47. CORE-9924 Added: trunk/reactos/dll/win32/oleacc/guid.c (with props) trunk/reactos/dll/win32/oleacc/oleacc_classes_r.rgs - copied, changed from r68415, trunk/reactos/dll/win32/oleacc/oleacc_classes.rgs trunk/reactos/dll/win32/oleacc/oleacc_classes_t.rgs (with props) Removed: trunk/reactos/dll/win32/oleacc/oleacc_classes.rgs Modified: trunk/reactos/dll/win32/oleacc/CMakeLists.txt trunk/reactos/dll/win32/oleacc/client.c trunk/reactos/dll/win32/oleacc/main.c trunk/reactos/dll/win32/oleacc/oleacc.rc trunk/reactos/dll/win32/oleacc/oleacc.spec trunk/reactos/dll/win32/oleacc/oleacc_classes.idl trunk/reactos/dll/win32/oleacc/oleacc_private.h trunk/reactos/dll/win32/oleacc/propservice.c trunk/reactos/dll/win32/oleacc/window.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/oleacc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/oleacc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleacc/CMakeLists.txt [iso-8859-1] Mon Jul 20 21:52:13 2015 @@ -1,5 +1,10 @@ -add_definitions(-D__WINESRC__) +add_definitions( + -D__WINESRC__ + -DENTRY_PREFIX=OLEACC_ + -DPROXY_DELEGATION + -DWINE_REGISTER_DLL) + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(oleacc.dll oleacc.spec ADD_IMPORTLIB) @@ -8,25 +13,31 @@ main.c propservice.c window.c - oleacc_private.h) + oleacc_private.h + ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c) +add_idl_headers(oleacc_idlheader oleacc_classes.idl) add_typelib(oleacc_classes.idl) +add_rpcproxy_files(oleacc_classes.idl) list(APPEND oleacc_rc_deps - ${CMAKE_CURRENT_SOURCE_DIR}/oleacc_classes.rgs + ${CMAKE_CURRENT_SOURCE_DIR}/oleacc_classes_r.rgs + ${CMAKE_CURRENT_SOURCE_DIR}/oleacc_classes_t.rgs ${CMAKE_CURRENT_BINARY_DIR}/oleacc_classes.tlb) set_source_files_properties(oleacc.rc PROPERTIES OBJECT_DEPENDS "${oleacc_rc_deps}") add_library(oleacc SHARED ${SOURCE} + guid.c oleacc.rc + ${CMAKE_CURRENT_BINARY_DIR}/oleacc_classes_p.c ${CMAKE_CURRENT_BINARY_DIR}/oleacc_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/oleacc.def) -add_dependencies(oleacc stdole2) +add_dependencies(oleacc oleacc_idlheader stdole2) set_module_type(oleacc win32dll) -target_link_libraries(oleacc uuid wine) -add_importlibs(oleacc oleaut32 ole32 user32 msvcrt kernel32 ntdll) +target_link_libraries(oleacc uuid wine ${PSEH_LIB}) +add_importlibs(oleacc oleaut32 ole32 user32 rpcrt4 msvcrt kernel32 ntdll) add_pch(oleacc oleacc_private.h SOURCE) add_cd_file(TARGET oleacc DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/oleacc/client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/client.c?… ============================================================================== --- trunk/reactos/dll/win32/oleacc/client.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleacc/client.c [iso-8859-1] Mon Jul 20 21:52:13 2015 @@ -21,10 +21,12 @@ typedef struct { IAccessible IAccessible_iface; IOleWindow IOleWindow_iface; + IEnumVARIANT IEnumVARIANT_iface; LONG ref; HWND hwnd; + HWND enum_pos; } Client; static inline Client* impl_from_Client(IAccessible *iface) @@ -44,6 +46,8 @@ *ppv = iface; }else if(IsEqualIID(riid, &IID_IOleWindow)) { *ppv = &This->IOleWindow_iface; + }else if(IsEqualIID(riid, &IID_IEnumVARIANT)) { + *ppv = &This->IEnumVARIANT_iface; }else { WARN("no interface: %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -137,8 +141,11 @@ VARIANT varChildID, IDispatch **ppdispChild) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varChildID), ppdispChild); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varChildID), ppdispChild); + + *ppdispChild = NULL; + return E_INVALIDARG; } static HRESULT WINAPI Client_get_accName(IAccessible *iface, VARIANT varID, BSTR *pszName) @@ -486,6 +493,128 @@ Client_OleWindow_ContextSensitiveHelp }; +static inline Client* impl_from_Client_EnumVARIANT(IEnumVARIANT *iface) +{ + return CONTAINING_RECORD(iface, Client, IEnumVARIANT_iface); +} + +static HRESULT WINAPI Client_EnumVARIANT_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv) +{ + Client *This = impl_from_Client_EnumVARIANT(iface); + return IAccessible_QueryInterface(&This->IAccessible_iface, riid, ppv); +} + +static ULONG WINAPI Client_EnumVARIANT_AddRef(IEnumVARIANT *iface) +{ + Client *This = impl_from_Client_EnumVARIANT(iface); + return IAccessible_AddRef(&This->IAccessible_iface); +} + +static ULONG WINAPI Client_EnumVARIANT_Release(IEnumVARIANT *iface) +{ + Client *This = impl_from_Client_EnumVARIANT(iface); + return IAccessible_Release(&This->IAccessible_iface); +} + +static HRESULT WINAPI Client_EnumVARIANT_Next(IEnumVARIANT *iface, + ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) +{ + Client *This = impl_from_Client_EnumVARIANT(iface); + HWND cur = This->enum_pos, next; + ULONG fetched = 0; + HRESULT hr; + + TRACE("(%p)->(%u %p %p)\n", This, celt, rgVar, pCeltFetched); + + if(!celt) { + if(pCeltFetched) + *pCeltFetched = 0; + return S_OK; + } + + if(!This->enum_pos) + next = GetWindow(This->hwnd, GW_CHILD); + else + next = GetWindow(This->enum_pos, GW_HWNDNEXT); + + while(next) { + cur = next; + + V_VT(rgVar+fetched) = VT_DISPATCH; + hr = AccessibleObjectFromWindow(cur, OBJID_WINDOW, + &IID_IDispatch, (void**)&V_DISPATCH(rgVar+fetched)); + if(FAILED(hr)) { + V_VT(rgVar+fetched) = VT_EMPTY; + while(fetched > 0) { + VariantClear(rgVar+fetched-1); + fetched--; + } + if(pCeltFetched) + *pCeltFetched = 0; + return hr; + } + fetched++; + if(fetched == celt) + break; + + next = GetWindow(cur, GW_HWNDNEXT); + } + + This->enum_pos = cur; + if(pCeltFetched) + *pCeltFetched = fetched; + return celt == fetched ? S_OK : S_FALSE; +} + +static HRESULT WINAPI Client_EnumVARIANT_Skip(IEnumVARIANT *iface, ULONG celt) +{ + Client *This = impl_from_Client_EnumVARIANT(iface); + HWND next; + + TRACE("(%p)->(%u)\n", This, celt); + + while(celt) { + if(!This->enum_pos) + next = GetWindow(This->hwnd, GW_CHILD); + else + next = GetWindow(This->enum_pos, GW_HWNDNEXT); + if(!next) + return S_FALSE; + + This->enum_pos = next; + celt--; + } + + return S_OK; +} + +static HRESULT WINAPI Client_EnumVARIANT_Reset(IEnumVARIANT *iface) +{ + Client *This = impl_from_Client_EnumVARIANT(iface); + + TRACE("(%p)\n", This); + + This->enum_pos = 0; + return S_OK; +} + +static HRESULT WINAPI Client_EnumVARIANT_Clone(IEnumVARIANT *iface, IEnumVARIANT **ppEnum) +{ + Client *This = impl_from_Client_EnumVARIANT(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} + +static const IEnumVARIANTVtbl ClientEnumVARIANTVtbl = { + Client_EnumVARIANT_QueryInterface, + Client_EnumVARIANT_AddRef, + Client_EnumVARIANT_Release, + Client_EnumVARIANT_Next, + Client_EnumVARIANT_Skip, + Client_EnumVARIANT_Reset, + Client_EnumVARIANT_Clone +}; + HRESULT create_client_object(HWND hwnd, const IID *iid, void **obj) { Client *client; @@ -500,8 +629,10 @@ client->IAccessible_iface.lpVtbl = &ClientVtbl; client->IOleWindow_iface.lpVtbl = &ClientOleWindowVtbl; + client->IEnumVARIANT_iface.lpVtbl = &ClientEnumVARIANTVtbl; client->ref = 1; client->hwnd = hwnd; + client->enum_pos = 0; hres = IAccessible_QueryInterface(&client->IAccessible_iface, iid, obj); IAccessible_Release(&client->IAccessible_iface); Added: trunk/reactos/dll/win32/oleacc/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/guid.c?re… ============================================================================== --- trunk/reactos/dll/win32/oleacc/guid.c (added) +++ trunk/reactos/dll/win32/oleacc/guid.c [iso-8859-1] Mon Jul 20 21:52:13 2015 @@ -0,0 +1,15 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <initguid.h> +#include <oleacc_classes.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/win32/oleacc/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/oleacc/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/oleacc/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleacc/main.c [iso-8859-1] Mon Jul 20 21:52:13 2015 @@ -39,6 +39,11 @@ static const WCHAR richedit20wW[] = {'R','i','c','h','E','d','i','t','2','0','W',0}; typedef HRESULT (WINAPI *accessible_create)(HWND, const IID*, void**); + +extern HRESULT WINAPI OLEACC_DllGetClassObject(REFCLSID, REFIID, void**) DECLSPEC_HIDDEN; +extern BOOL WINAPI OLEACC_DllMain(HINSTANCE, DWORD, void*) DECLSPEC_HIDDEN; +extern HRESULT WINAPI OLEACC_DllRegisterServer(void) DECLSPEC_HIDDEN; +extern HRESULT WINAPI OLEACC_DllUnregisterServer(void) DECLSPEC_HIDDEN; static struct { const WCHAR *name; @@ -397,25 +402,45 @@ DisableThreadLibraryCalls(hinstDLL); break; } - return TRUE; + + return OLEACC_DllMain(hinstDLL, fdwReason, lpvReserved); } HRESULT WINAPI DllRegisterServer(void) { - TRACE("()\n"); - return __wine_register_resources(oleacc_handle); + return OLEACC_DllRegisterServer(); } HRESULT WINAPI DllUnregisterServer(void) { - TRACE("()\n"); - return __wine_unregister_resources(oleacc_handle); + return OLEACC_DllUnregisterServer(); +} + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, void **ppv) +{ + if(IsEqualGUID(&CLSID_CAccPropServices, rclsid)) { + TRACE("(CLSID_CAccPropServices %s %p)\n", debugstr_guid(iid), ppv); + return get_accpropservices_factory(iid, ppv); + } + + if(IsEqualGUID(&CLSID_PSFactoryBuffer, rclsid)) { + TRACE("(CLSID_PSFactoryBuffer %s %p)\n", debugstr_guid(iid), ppv); + return OLEACC_DllGetClassObject(rclsid, iid, ppv); + } + + FIXME("%s %s %p: stub\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + return E_NOTIMPL; } void WINAPI GetOleaccVersionInfo(DWORD* pVersion, DWORD* pBuild) { +#ifdef __REACTOS__ *pVersion = MAKELONG(2,4); /* Windows XP version of oleacc: 4.2.5406.0 */ *pBuild = MAKELONG(0,5406); +#else + *pVersion = MAKELONG(0,7); /* Windows 7 version of oleacc: 7.0.0.0 */ + *pBuild = MAKELONG(0,0); +#endif } HANDLE WINAPI GetProcessHandleFromHwnd(HWND hwnd) @@ -559,3 +584,50 @@ return LoadStringA(oleacc_handle, state_id, tmp, sizeof(tmp)); } } + +HRESULT WINAPI AccessibleChildren(IAccessible *container, + LONG start, LONG count, VARIANT *children, LONG *children_cnt) +{ + IEnumVARIANT *ev; + LONG i, child_no; + HRESULT hr; + + TRACE("%p %d %d %p %p\n", container, start, count, children, children_cnt); + + if(!container || !children || !children_cnt) + return E_INVALIDARG; + + for(i=0; i<count; i++) + VariantInit(children+i); + + hr = IAccessible_QueryInterface(container, &IID_IEnumVARIANT, (void**)&ev); + if(SUCCEEDED(hr)) { + hr = IEnumVARIANT_Reset(ev); + if(SUCCEEDED(hr)) + hr = IEnumVARIANT_Skip(ev, start); + if(SUCCEEDED(hr)) + hr = IEnumVARIANT_Next(ev, count, children, (ULONG*)children_cnt); + IEnumVARIANT_Release(ev); + return hr; + } + + hr = IAccessible_get_accChildCount(container, &child_no); + if(FAILED(hr)) + return hr; + + for(i=0; i<count && start+i+1<=child_no; i++) { + IDispatch *disp; + + V_VT(children+i) = VT_I4; + V_I4(children+i) = start+i+1; + + hr = IAccessible_get_accChild(container, children[i], &disp); + if(SUCCEEDED(hr) && disp) { + V_VT(children+i) = VT_DISPATCH; + V_DISPATCH(children+i) = disp; + } + } + + *children_cnt = i; + return i==count ? S_OK : S_FALSE; +} Modified: trunk/reactos/dll/win32/oleacc/oleacc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc.rc… ============================================================================== --- trunk/reactos/dll/win32/oleacc/oleacc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleacc/oleacc.rc [iso-8859-1] Mon Jul 20 21:52:13 2015 @@ -24,7 +24,8 @@ #include "resource.h" 1 TYPELIB "oleacc_classes.tlb" -1 WINE_REGISTRY "oleacc_classes.rgs" +1 WINE_REGISTRY "oleacc_classes_r.rgs" +2 WINE_REGISTRY "oleacc_classes_t.rgs" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/oleacc/oleacc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc.sp… ============================================================================== --- trunk/reactos/dll/win32/oleacc/oleacc.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleacc/oleacc.spec [iso-8859-1] Mon Jul 20 21:52:13 2015 @@ -1,4 +1,4 @@ -@ stub AccessibleChildren +@ stdcall AccessibleChildren(ptr long long ptr ptr) @ stub AccessibleObjectFromEvent @ stdcall AccessibleObjectFromPoint(int64 ptr ptr) @ stdcall AccessibleObjectFromWindow(ptr long ptr ptr) Modified: trunk/reactos/dll/win32/oleacc/oleacc_classes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc_cl… ============================================================================== --- trunk/reactos/dll/win32/oleacc/oleacc_classes.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleacc/oleacc_classes.idl [iso-8859-1] Mon Jul 20 21:52:13 2015 @@ -17,5 +17,13 @@ */ #pragma makedep regtypelib +#pragma makedep proxy +#pragma makedep register #include "oleacc.idl" + +[ + threading(both), + uuid(03022430-abc4-11d0-bde2-00aa001a1953) /* IAccessibleHandler */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } Removed: trunk/reactos/dll/win32/oleacc/oleacc_classes.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc_cl… ============================================================================== --- trunk/reactos/dll/win32/oleacc/oleacc_classes.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleacc/oleacc_classes.rgs (removed) @@ -1,20 +0,0 @@ -HKCR -{ - NoRemove Typelib - { - NoRemove '{1EA4DBF0-3C3B-11CF-810C-00AA00389B71}' - { - '1.1' = s 'Accessibility' - { - '0' { win32 = s '%MODULE%' } - FLAGS = s '4' - } - } - } - NoRemove Interface - { - } - NoRemove CLSID - { - } -} Copied: trunk/reactos/dll/win32/oleacc/oleacc_classes_r.rgs (from r68415, trunk/reactos/dll/win32/oleacc/oleacc_classes.rgs) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc_cl… ============================================================================== --- trunk/reactos/dll/win32/oleacc/oleacc_classes.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleacc/oleacc_classes_r.rgs [iso-8859-1] Mon Jul 20 21:52:13 2015 @@ -1,20 +1,38 @@ HKCR { - NoRemove Typelib - { - NoRemove '{1EA4DBF0-3C3B-11CF-810C-00AA00389B71}' - { - '1.1' = s 'Accessibility' - { - '0' { win32 = s '%MODULE%' } - FLAGS = s '4' - } - } - } NoRemove Interface { + '{618736E0-3C3D-11CF-810C-00AA00389B71}' = s 'IAccessible' + { + NumMethods = s 28 + ProxyStubClsid32 = s '{03022430-ABC4-11D0-BDE2-00AA001A1953}' + } + '{03022430-ABC4-11D0-BDE2-00AA001A1953}' = s 'IAccessibleHandler' + { + NumMethods = s 4 + ProxyStubClsid32 = s '{03022430-ABC4-11D0-BDE2-00AA001A1953}' + } + '{7852B78D-1CFD-41C1-A615-9C0C85960B5F}' = s 'IAccIdentity' + { + NumMethods = s 4 + ProxyStubClsid32 = s '{03022430-ABC4-11D0-BDE2-00AA001A1953}' + } + '{76C0DBBB-15E0-4E7B-B61B-20EEEA2001E0}' = s 'IAccPropServer' + { + NumMethods = s 4 + ProxyStubClsid32 = s '{03022430-ABC4-11D0-BDE2-00AA001A1953}' + } + '{6E26E776-04F0-495D-80E4-3330352E3169}' = s 'IAccPropServices' + { + NumMethods = s 18 + ProxyStubClsid32 = s '{03022430-ABC4-11D0-BDE2-00AA001A1953}' + } } NoRemove CLSID { + '{03022430-ABC4-11D0-BDE2-00AA001A1953}' = s 'PSFactoryBuffer' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } } } Added: trunk/reactos/dll/win32/oleacc/oleacc_classes_t.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc_cl… ============================================================================== --- trunk/reactos/dll/win32/oleacc/oleacc_classes_t.rgs (added) +++ trunk/reactos/dll/win32/oleacc/oleacc_classes_t.rgs [iso-8859-1] Mon Jul 20 21:52:13 2015 @@ -0,0 +1,26 @@ +HKCR +{ + NoRemove Typelib + { + NoRemove '{1EA4DBF0-3C3B-11CF-810C-00AA00389B71}' + { + '1.1' = s 'Accessibility' + { + '0' { win32 = s '%MODULE%' } + FLAGS = s '4' + } + } + } + NoRemove Interface + { + } + NoRemove CLSID + { + '{B5F8350B-0548-48B1-A6EE-88BD00B4A5E7}' = s 'CAccPropServices' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + TypeLib = s '{1EA4DBF0-3C3B-11CF-810C-00AA00389B71}' + Version = s '1.1' + } + } +} Propchange: trunk/reactos/dll/win32/oleacc/oleacc_classes_t.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/oleacc/oleacc_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc_pr… ============================================================================== --- trunk/reactos/dll/win32/oleacc/oleacc_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleacc/oleacc_private.h [iso-8859-1] Mon Jul 20 21:52:13 2015 @@ -28,13 +28,14 @@ #include <windef.h> #include <winbase.h> #include <ole2.h> -#include <oleacc.h> +#include <oleacc_classes.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(oleacc); HRESULT create_client_object(HWND, const IID*, void**) DECLSPEC_HIDDEN; HRESULT create_window_object(HWND, const IID*, void**) DECLSPEC_HIDDEN; +HRESULT get_accpropservices_factory(REFIID, void**) DECLSPEC_HIDDEN; int convert_child_id(VARIANT *v) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/oleacc/propservice.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/propservi… ============================================================================== --- trunk/reactos/dll/win32/oleacc/propservice.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleacc/propservice.c [iso-8859-1] Mon Jul 20 21:52:13 2015 @@ -236,13 +236,7 @@ static IClassFactory CAccPropServicesFactory = { &CAccPropServicesFactoryVtbl }; -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, void **ppv) -{ - if(IsEqualGUID(&CLSID_CAccPropServices, rclsid)) { - TRACE("(CLSID_CAccPropServices %s %p)\n", debugstr_guid(iid), ppv); - return IClassFactory_QueryInterface(&CAccPropServicesFactory, iid, ppv); - } - - FIXME("%s %s %p: stub\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); - return E_NOTIMPL; -} +HRESULT get_accpropservices_factory(REFIID riid, void **ppv) +{ + return IClassFactory_QueryInterface(&CAccPropServicesFactory, riid, ppv); +} Modified: trunk/reactos/dll/win32/oleacc/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/window.c?… ============================================================================== --- trunk/reactos/dll/win32/oleacc/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleacc/window.c [iso-8859-1] Mon Jul 20 21:52:13 2015 @@ -21,6 +21,7 @@ typedef struct { IAccessible IAccessible_iface; IOleWindow IOleWindow_iface; + IEnumVARIANT IEnumVARIANT_iface; LONG ref; } Window; @@ -42,6 +43,8 @@ *ppv = iface; }else if(IsEqualIID(riid, &IID_IOleWindow)) { *ppv = &This->IOleWindow_iface; + }else if(IsEqualIID(riid, &IID_IEnumVARIANT)) { + *ppv = &This->IEnumVARIANT_iface; }else { WARN("no interface: %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -339,6 +342,68 @@ Window_OleWindow_ContextSensitiveHelp }; +static inline Window* impl_from_Window_EnumVARIANT(IEnumVARIANT *iface) +{ + return CONTAINING_RECORD(iface, Window, IEnumVARIANT_iface); +} + +static HRESULT WINAPI Window_EnumVARIANT_QueryInterface(IEnumVARIANT *iface, REFIID riid, void **ppv) +{ + Window *This = impl_from_Window_EnumVARIANT(iface); + return IAccessible_QueryInterface(&This->IAccessible_iface, riid, ppv); +} + +static ULONG WINAPI Window_EnumVARIANT_AddRef(IEnumVARIANT *iface) +{ + Window *This = impl_from_Window_EnumVARIANT(iface); + return IAccessible_AddRef(&This->IAccessible_iface); +} + +static ULONG WINAPI Window_EnumVARIANT_Release(IEnumVARIANT *iface) +{ + Window *This = impl_from_Window_EnumVARIANT(iface); + return IAccessible_Release(&This->IAccessible_iface); +} + +static HRESULT WINAPI Window_EnumVARIANT_Next(IEnumVARIANT *iface, + ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) +{ + Window *This = impl_from_Window_EnumVARIANT(iface); + FIXME("(%p)->(%u %p %p)\n", This, celt, rgVar, pCeltFetched); + return E_NOTIMPL; +} + +static HRESULT WINAPI Window_EnumVARIANT_Skip(IEnumVARIANT *iface, ULONG celt) +{ + Window *This = impl_from_Window_EnumVARIANT(iface); + FIXME("(%p)->(%u)\n", This, celt); + return E_NOTIMPL; +} + +static HRESULT WINAPI Window_EnumVARIANT_Reset(IEnumVARIANT *iface) +{ + Window *This = impl_from_Window_EnumVARIANT(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI Window_EnumVARIANT_Clone(IEnumVARIANT *iface, IEnumVARIANT **ppEnum) +{ + Window *This = impl_from_Window_EnumVARIANT(iface); + FIXME("(%p)->(%p)\n", This, ppEnum); + return E_NOTIMPL; +} + +static const IEnumVARIANTVtbl WindowEnumVARIANTVtbl = { + Window_EnumVARIANT_QueryInterface, + Window_EnumVARIANT_AddRef, + Window_EnumVARIANT_Release, + Window_EnumVARIANT_Next, + Window_EnumVARIANT_Skip, + Window_EnumVARIANT_Reset, + Window_EnumVARIANT_Clone +}; + HRESULT create_window_object(HWND hwnd, const IID *iid, void **obj) { Window *window; @@ -353,6 +418,7 @@ window->IAccessible_iface.lpVtbl = &WindowVtbl; window->IOleWindow_iface.lpVtbl = &WindowOleWindowVtbl; + window->IEnumVARIANT_iface.lpVtbl = &WindowEnumVARIANTVtbl; window->ref = 1; hres = IAccessible_QueryInterface(&window->IAccessible_iface, iid, obj); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Jul 20 21:52:13 2015 @@ -146,7 +146,7 @@ reactos/dll/win32/odbc32 # Synced to WineStaging-1.7.37. Depends on port of Linux ODBC. reactos/dll/win32/odbccp32 # Synced to WineStaging-1.7.47 reactos/dll/win32/ole32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/oleacc # Synced to WineStaging-1.7.37 +reactos/dll/win32/oleacc # Synced to WineStaging-1.7.47 reactos/dll/win32/oleaut32 # Synced to WineStaging-1.7.37 reactos/dll/win32/olecli32 # Synced to WineStaging-1.7.37 reactos/dll/win32/oledlg # Synced to WineStaging-1.7.37

9 years, 5 months

[akhaldi] 68482: [PSDK] Add GetFileVersionInfoSizeEx{A, W} definitions.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jul 20 21:50:59 2015 New Revision: 68482 URL: http://svn.reactos.org/svn/reactos?rev=68482&view=rev Log: [PSDK] Add GetFileVersionInfoSizeEx{A,W} definitions. Modified: trunk/reactos/include/psdk/winver.h Modified: trunk/reactos/include/psdk/winver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winver.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winver.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winver.h [iso-8859-1] Mon Jul 20 21:50:59 2015 @@ -4,6 +4,7 @@ #ifdef __cplusplus extern "C" { #endif + #define VS_FILE_INFO RT_VERSION #define VS_VERSION_INFO 1 #define VS_USER_DEFINED 100 @@ -79,7 +80,9 @@ #define VIF_CANNOTREADSRC 65536 #define VIF_CANNOTREADDST 0x20000 #define VIF_BUFFTOOSMALL 0x40000 + #ifndef RC_INVOKED + typedef struct tagVS_FIXEDFILEINFO { DWORD dwSignature; DWORD dwStrucVersion; @@ -107,6 +110,21 @@ DWORD WINAPI VerLanguageNameW(DWORD,LPWSTR,DWORD); BOOL WINAPI VerQueryValueA(LPCVOID,LPCSTR,LPVOID*,PUINT); BOOL WINAPI VerQueryValueW(LPCVOID,LPCWSTR,LPVOID*,PUINT); + +DWORD +WINAPI +GetFileVersionInfoSizeExA( + _In_ DWORD dwFlags, + _In_ LPCSTR lpwstrFilename, + _Out_ LPDWORD lpdwHandle); + +DWORD +WINAPI +GetFileVersionInfoSizeExW( + _In_ DWORD dwFlags, + _In_ LPCWSTR lpwstrFilename, + _Out_ LPDWORD lpdwHandle); + #ifdef UNICODE #define VerFindFile VerFindFileW #define VerQueryValue VerQueryValueW @@ -115,6 +133,7 @@ #define GetFileVersionInfo GetFileVersionInfoW #define VerLanguageName VerLanguageNameW #define VerQueryValue VerQueryValueW +#define GetFileVersionInfoSizeEx GetFileVersionInfoSizeExW #else #define VerQueryValue VerQueryValueA #define VerFindFile VerFindFileA @@ -123,9 +142,13 @@ #define GetFileVersionInfo GetFileVersionInfoA #define VerLanguageName VerLanguageNameA #define VerQueryValue VerQueryValueA -#endif -#endif +#define GetFileVersionInfoSizeEx GetFileVersionInfoSizeExA +#endif /* UNICODE */ + +#endif /* !RC_INVOKED */ + #ifdef __cplusplus } #endif -#endif + +#endif /* VER_H */

9 years, 5 months

[akhaldi] 68481: [PSDK] Update oleacc.idl CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jul 20 21:46:05 2015 New Revision: 68481 URL: http://svn.reactos.org/svn/reactos?rev=68481&view=rev Log: [PSDK] Update oleacc.idl CORE-9924 Modified: trunk/reactos/include/psdk/oleacc.idl Modified: trunk/reactos/include/psdk/oleacc.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/oleacc.idl?re… ============================================================================== --- trunk/reactos/include/psdk/oleacc.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/oleacc.idl [iso-8859-1] Mon Jul 20 21:46:05 2015 @@ -154,10 +154,11 @@ } AnnoScope; [ - local, - object, - uuid(618736e0-3c3d-11cf-810c-00aa00389b71), - pointer_default(unique) + object, + hidden, + dual, + uuid(618736e0-3c3d-11cf-810c-00aa00389b71), + pointer_default(unique) ] interface IAccessible : IDispatch { @@ -185,26 +186,26 @@ [hidden, propget, id(DISPID_ACC_PARENT)] HRESULT accParent([out, retval]IDispatch** ppdispParent); [hidden, propget, id(DISPID_ACC_CHILDCOUNT)] HRESULT accChildCount([out, retval] long* pcountChildren); [hidden, propget, id(DISPID_ACC_CHILD)] HRESULT accChild([in] VARIANT varChildID, [out, retval]IDispatch **ppdispChild); - [hidden, propget, id(DISPID_ACC_NAME)] HRESULT accName([in]VARIANT varID, [out, retval] BSTR* pszName); - [hidden, propget, id(DISPID_ACC_VALUE)] HRESULT accValue([in]VARIANT varID, [out, retval] BSTR* pszValue); - [hidden, propget, id(DISPID_ACC_DESCRIPTION)] HRESULT accDescription([in]VARIANT varID, [out, retval] BSTR* pszDescription); - [hidden, propget, id(DISPID_ACC_ROLE)] HRESULT accRole([in]VARIANT varID, [out, retval]VARIANT* pvarRole); - [hidden, propget, id(DISPID_ACC_STATE)] HRESULT accState([in]VARIANT varID, [out, retval]VARIANT* pvarState); - [hidden, propget, id(DISPID_ACC_HELP)] HRESULT accHelp([in]VARIANT varID, [out, retval]BSTR* pszHelp); - [hidden, propget, id(DISPID_ACC_HELPTOPIC)] HRESULT accHelpTopic([out]BSTR* pszHelpFile, [in]VARIANT varID, [out, retval] long* pidTopic); - [hidden, propget, id(DISPID_ACC_KEYBOARDSHORTCUT)] HRESULT accKeyboardShortcut([in]VARIANT varID, [out, retval] BSTR* pszKeyboardShortcut); + [hidden, propget, id(DISPID_ACC_NAME)] HRESULT accName([in, optional] VARIANT varID, [out, retval] BSTR* pszName); + [hidden, propget, id(DISPID_ACC_VALUE)] HRESULT accValue([in, optional] VARIANT varID, [out, retval] BSTR* pszValue); + [hidden, propget, id(DISPID_ACC_DESCRIPTION)] HRESULT accDescription([in, optional] VARIANT varID, [out, retval] BSTR *description); + [hidden, propget, id(DISPID_ACC_ROLE)] HRESULT accRole([in, optional] VARIANT varID, [out, retval] VARIANT *role); + [hidden, propget, id(DISPID_ACC_STATE)] HRESULT accState([in, optional] VARIANT varID, [out, retval] VARIANT *state); + [hidden, propget, id(DISPID_ACC_HELP)] HRESULT accHelp([in, optional] VARIANT varID, [out, retval] BSTR *help); + [hidden, propget, id(DISPID_ACC_HELPTOPIC)] HRESULT accHelpTopic([out] BSTR *helpfile, [in, optional] VARIANT varID, [out, retval] long* pidTopic); + [hidden, propget, id(DISPID_ACC_KEYBOARDSHORTCUT)] HRESULT accKeyboardShortcut([in, optional] VARIANT varID, [out, retval] BSTR *shortcut); [hidden, propget, id(DISPID_ACC_FOCUS)] HRESULT accFocus([out, retval] VARIANT* pvarID); [hidden, propget, id(DISPID_ACC_SELECTION)] HRESULT accSelection([out, retval] VARIANT* pvarID); - [hidden, propget, id(DISPID_ACC_DEFAULTACTION)] HRESULT accDefaultAction([in]VARIANT varID, [out, retval] BSTR* pszDefaultAction); - - [hidden, id(DISPID_ACC_SELECT)] HRESULT accSelect([in]long flagsSelect, [in]VARIANT varID); - [hidden, id(DISPID_ACC_LOCATION)] HRESULT accLocation([out]long* pxLeft, [out]long* pyTop, [out]long* pcxWidth, [out]long* pcyHeight, [in]VARIANT varID); - [hidden, id(DISPID_ACC_NAVIGATE)] HRESULT accNavigate([in]long navDir, [in]VARIANT varStart, [out, retval] VARIANT* pvarEnd); - [hidden, id(DISPID_ACC_HITTEST)] HRESULT accHitTest([in]long xLeft, [in]long yTop, [out,retval] VARIANT* pvarID); - [hidden, id(DISPID_ACC_DODEFAULTACTION)] HRESULT accDoDefaultAction([in]VARIANT varID); - - [hidden, propput, id(DISPID_ACC_NAME)] HRESULT accName([in]VARIANT varID, [in]BSTR pszName); - [hidden, propput, id(DISPID_ACC_VALUE)] HRESULT accValue([in]VARIANT varID, [out, retval]BSTR pszValue); + [hidden, propget, id(DISPID_ACC_DEFAULTACTION)] HRESULT accDefaultAction([in, optional] VARIANT varID, [out, retval] BSTR *action); + + [hidden, id(DISPID_ACC_SELECT)] HRESULT accSelect([in] long flagsSelect, [in, optional] VARIANT varID); + [hidden, id(DISPID_ACC_LOCATION)] HRESULT accLocation([out] long *left, [out] long *top, [out] long *width, [out] long *height, [in, optional] VARIANT varID); + [hidden, id(DISPID_ACC_NAVIGATE)] HRESULT accNavigate([in] long dir, [in, optional] VARIANT varStart, [out, retval] VARIANT *pvarEnd); + [hidden, id(DISPID_ACC_HITTEST)] HRESULT accHitTest([in] long left, [in] long top, [out, retval] VARIANT *pvarID); + [hidden, id(DISPID_ACC_DODEFAULTACTION)] HRESULT accDoDefaultAction([in, optional] VARIANT varID); + + [hidden, propput, id(DISPID_ACC_NAME)] HRESULT accName([in, optional] VARIANT varID, [in] BSTR name); + [hidden, propput, id(DISPID_ACC_VALUE)] HRESULT accValue([in, optional] VARIANT varID, [in] BSTR value); } [ @@ -228,7 +229,9 @@ ] interface IAccIdentity : IUnknown { - HRESULT GetIdentityString ([in] DWORD dwIDChild, [out] BYTE **ppIDString, [out] DWORD *pdwIDStringLen); + HRESULT GetIdentityString([in] DWORD idchild, + [out, size_is(,*string_len)] BYTE **str, + [out] DWORD *string_len); } [ @@ -238,8 +241,11 @@ ] interface IAccPropServer: IUnknown { - HRESULT GetPropValue ([in] const BYTE *pIDString, [in] DWORD dwIDStringLen, [in] MSAAPROPID idProp, - [out] VARIANT *pvarValue, [out] BOOL *pfHasProp); + HRESULT GetPropValue([in, size_is(string_len)] const BYTE *str, + [in] DWORD string_len, + [in] MSAAPROPID idProp, + [out] VARIANT *value, + [out] BOOL *has_prop); } [ @@ -249,45 +255,80 @@ ] interface IAccPropServices : IUnknown { - HRESULT SetPropValue([in] const BYTE *pIDString, [in] DWORD dwIDStringLen, [in] MSAAPROPID idProp, [in] VARIANT var); - - HRESULT SetPropServer([in] const BYTE * pIDString, [in] DWORD dwIDStringLen, [in] const MSAAPROPID* paProps, - [in] int cProps, [in] IAccPropServer* pServer, [in] AnnoScope AnnoScope); - - HRESULT ClearProps([in] const BYTE *pIDString, [in] DWORD dwIDStringLen, [in] const MSAAPROPID* paProps, [in] int cProps); + HRESULT SetPropValue([in, size_is(string_len)] const BYTE *str, + [in] DWORD string_len, + [in] MSAAPROPID idProp, + [in] VARIANT var); + + HRESULT SetPropServer([in, size_is(string_len)] const BYTE *str, + [in] DWORD string_len, + [in, size_is(cProps)] const MSAAPROPID *props, + [in] int cProps, + [in] IAccPropServer* pServer, + [in] AnnoScope AnnoScope); + + HRESULT ClearProps([in, size_is(string_len)] const BYTE *str, + [in] DWORD string_len, + [in, size_is(cProps)] const MSAAPROPID *props, + [in] int cProps); HRESULT SetHwndProp([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, [in] MSAAPROPID idProp, [in] VARIANT var); HRESULT SetHwndPropStr([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, - [in] MSAAPROPID idProp, [in] LPWSTR str); - - HRESULT SetHwndPropServer([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, - [in] const MSAAPROPID* paProps, [in] int cProps, [in] IAccPropServer* pServer, [in] AnnoScope AnnoScope); - - HRESULT ClearHwndProps([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, - [in] const MSAAPROPID* paProps, [in] int cProps); - - HRESULT ComposeHwndIdentityString([in] HWND hwnd, [in] DWORD idObject, [in] DWORD idChild, - [out] BYTE **ppIDString, [out] DWORD* pdwIDStringLen); - - HRESULT DecomposeHwndIdentityString([in] const BYTE *pIDString, [in] DWORD dwIDStringLen, - [out] HWND* phwnd, [out] DWORD* pidObject, [out] DWORD* pidChild); + [in] MSAAPROPID idProp, [in, string] LPWSTR str); + + HRESULT SetHwndPropServer([in] HWND hwnd, + [in] DWORD idObject, + [in] DWORD idChild, + [in, size_is(cProps)] const MSAAPROPID *props, + [in] int cProps, + [in] IAccPropServer *server, + [in] AnnoScope scope); + + HRESULT ClearHwndProps([in] HWND hwnd, + [in] DWORD idObject, + [in] DWORD idChild, + [in, size_is(cProps)] const MSAAPROPID *props, + [in] int cProps); + + HRESULT ComposeHwndIdentityString([in] HWND hwnd, + [in] DWORD idObject, + [in] DWORD idChild, + [out, size_is(,*string_len)] BYTE **str, + [out] DWORD *string_len); + + HRESULT DecomposeHwndIdentityString([in, size_is(string_len)] const BYTE *str, + [in] DWORD string_len, + [out] HWND *phwnd, + [out] DWORD *pidObject, + [out] DWORD *pidChild); HRESULT SetHmenuProp([in] HMENU hmenu, [in] DWORD idChild, [in] MSAAPROPID idProp, [in] VARIANT var); - HRESULT SetHmenuPropStr([in] HMENU hmenu, [in] DWORD idChild, [in] MSAAPROPID idProp, [in] LPWSTR str); - - HRESULT SetHmenuPropServer([in] HMENU hmenu, [in] DWORD idChild, [in] const MSAAPROPID* paProps, - [in] int cProps, [in] IAccPropServer* pServer, [in] AnnoScope AnnoScope); - - HRESULT ClearHmenuProps([in] HMENU hmenu, [in] DWORD idChild, [in] const MSAAPROPID* paProps, [in] int cProps); - - HRESULT ComposeHmenuIdentityString([in] HMENU hmenu, [in] DWORD idChild, - [out] BYTE **ppIDString, [out] DWORD *pdwIDStringLen); - - HRESULT DecomposeHmenuIdentityString([in] const BYTE *pIDString, [in] DWORD dwIDStringLen, - [out] HMENU *phmenu, [out] DWORD *pidChild); + HRESULT SetHmenuPropStr([in] HMENU hmenu, [in] DWORD idChild, [in] MSAAPROPID idProp, [in, string] LPWSTR str); + + HRESULT SetHmenuPropServer([in] HMENU hmenu, + [in] DWORD idChild, + [in, size_is(cProps)] const MSAAPROPID *props, + [in] int cProps, + [in] IAccPropServer *server, + [in] AnnoScope scope); + + HRESULT ClearHmenuProps([in] HMENU hmenu, + [in] DWORD idChild, + [in, size_is(cProps)] const MSAAPROPID *props, + [in] int cProps); + + HRESULT ComposeHmenuIdentityString([in] HMENU hmenu, + [in] DWORD idChild, + [out, size_is(,*string_len)] BYTE **str, + [out] DWORD *string_len); + + HRESULT DecomposeHmenuIdentityString([in, size_is(string_len)] const BYTE *str, + [in] DWORD string_len, + [out] HMENU *phmenu, + [out] DWORD *pidChild); } [

9 years, 5 months

[akhaldi] 68480: [PSDK] Update wincodec.idl CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jul 20 21:43:12 2015 New Revision: 68480 URL: http://svn.reactos.org/svn/reactos?rev=68480&view=rev Log: [PSDK] Update wincodec.idl CORE-9924 Modified: trunk/reactos/include/psdk/wincodec.idl Modified: trunk/reactos/include/psdk/wincodec.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincodec.idl?… ============================================================================== --- trunk/reactos/include/psdk/wincodec.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincodec.idl [iso-8859-1] Mon Jul 20 21:43:12 2015 @@ -193,6 +193,9 @@ cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppBGR, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0e);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppBGRA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x0f);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppPBGRA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x10);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppRGB, 0xd98c6b95,0x3efe,0x47d6,0xbb,0x25,0xeb,0x17,0x48,0xab,0x0c,0xf1);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppRGBA, 0xf5c7ad2d,0x6a8d,0x43dd,0xa7,0xa8,0xa2,0x99,0x35,0x26,0x1a,0xe9);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppPRGBA, 0x3cc4a650,0xa527,0x4d37,0xa9,0x16,0x31,0x42,0xc7,0xeb,0xed,0xba);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat48bppRGB, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x15);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppRGBA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x16);")

9 years, 5 months

[akhaldi] 68479: [PSDK] Import bits2_{0, 5}.idl from Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jul 20 21:40:05 2015 New Revision: 68479 URL: http://svn.reactos.org/svn/reactos?rev=68479&view=rev Log: [PSDK] Import bits2_{0,5}.idl from Wine Staging 1.7.47. CORE-9924 Added: trunk/reactos/include/psdk/bits2_0.idl (with props) trunk/reactos/include/psdk/bits2_5.idl (with props) Modified: trunk/reactos/include/psdk/CMakeLists.txt Modified: trunk/reactos/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/CMakeLists.tx… ============================================================================== --- trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] Mon Jul 20 21:40:05 2015 @@ -18,6 +18,8 @@ # binres.idl bits.idl bits1_5.idl + bits2_0.idl + bits2_5.idl bits3_0.idl # cmdbas.idl # cmdtxt.idl Added: trunk/reactos/include/psdk/bits2_0.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/bits2_0.idl?r… ============================================================================== --- trunk/reactos/include/psdk/bits2_0.idl (added) +++ trunk/reactos/include/psdk/bits2_0.idl [iso-8859-1] Mon Jul 20 21:40:05 2015 @@ -0,0 +1,95 @@ +/* + * Background Intelligent Transfer Service (BITS) 2.0 interface + * + * Copyright 2015 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#ifndef DO_NO_IMPORTS +import "bits.idl"; +import "bits1_5.idl"; +#endif + +cpp_quote("#define BG_COPY_FILE_OWNER 1") +cpp_quote("#define BG_COPY_FILE_GROUP 2") +cpp_quote("#define BG_COPY_FILE_DACL 4") +cpp_quote("#define BG_COPY_FILE_SACL 8") +cpp_quote("#define BG_COPY_FILE_ALL 15") + +cpp_quote("#define BG_LENGTH_TO_EOF (UINT64)(-1)") + +typedef struct _BG_FILE_RANGE +{ + UINT64 InitialOffset; + UINT64 Length; +} BG_FILE_RANGE; + +[ + uuid(443c8934-90ff-48ed-bcde-26f5c7450042), + odl +] +interface IBackgroundCopyJob3 : IBackgroundCopyJob2 +{ + HRESULT ReplaceRemotePrefix( + [in] LPCWSTR OldPrefix, + [in] LPCWSTR NewPrefix); + + HRESULT AddFileWithRanges( + [in] LPCWSTR RemoteUrl, + [in] LPCWSTR LocalName, + [in] DWORD RangeCount, + [in, size_is(RangeCount)] BG_FILE_RANGE Ranges[]); + + HRESULT SetFileACLFlags( + [in] DWORD Flags); + + HRESULT GetFileACLFlags( + [out, ref] DWORD *Flags); +} + +[ + uuid(83e81b93-0873-474d-8a8c-f2018b1a939c), + odl +] +interface IBackgroundCopyFile2 : IBackgroundCopyFile +{ + HRESULT GetFileRanges( + [in, out, unique] DWORD *RangeCount, + [out, size_is(, *RangeCount)] BG_FILE_RANGE **Ranges); + + HRESULT SetRemoteName( + LPCWSTR Val); +} + +[ + uuid(2289a9af-dc96-486e-b268-89c9e3397c3d), + version(1.0) +] +library BackgroundCopyManager2_0 +{ + [ + uuid(6d18ad12-bde3-4393-b311-099c346e6df9) + ] + coclass BackgroundCopyManager2_0 + { + [default] interface IBackgroundCopyManager; + }; + + interface IBackgroundCopyCallback; + interface IBackgroundCopyJob3; + interface IBackgroundCopyFile2; +} Propchange: trunk/reactos/include/psdk/bits2_0.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/bits2_5.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/bits2_5.idl?r… ============================================================================== --- trunk/reactos/include/psdk/bits2_5.idl (added) +++ trunk/reactos/include/psdk/bits2_5.idl [iso-8859-1] Mon Jul 20 21:40:05 2015 @@ -0,0 +1,100 @@ +/* + * Background Intelligent Transfer Service (BITS) 2.5 interface + * + * Copyright 2015 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#ifndef DO_NO_IMPORTS +import "bits.idl"; +import "bits1_5.idl"; +import "bits2_0.idl"; +#endif + +[ + uuid(f1bd1079-9f01-4bdc-8036-f09b70095066), + odl +] +interface IBackgroundCopyJobHttpOptions : IUnknown +{ + typedef enum + { + BG_CERT_STORE_LOCATION_CURRENT_USER, + BG_CERT_STORE_LOCATION_LOCAL_MACHINE, + BG_CERT_STORE_LOCATION_CURRENT_SERVICE, + BG_CERT_STORE_LOCATION_SERVICES, + BG_CERT_STORE_LOCATION_USERS, + BG_CERT_STORE_LOCATION_CURRENT_USER_GROUP_POLICY, + BG_CERT_STORE_LOCATION_LOCAL_MACHINE_GROUP_POLICY, + BG_CERT_STORE_LOCATION_LOCAL_MACHINE_ENTERPRISE + } BG_CERT_STORE_LOCATION; + + HRESULT SetClientCertificateByID( + [in] BG_CERT_STORE_LOCATION StoreLocation, + [in] LPCWSTR StoreName, + [in, size_is(20), ref] BYTE *pCertHashBlob + ); + + HRESULT SetClientCertificateByName( + [in] BG_CERT_STORE_LOCATION StoreLocation, + [in] LPCWSTR StoreName, + [in] LPCWSTR SubjectName + ); + + HRESULT RemoveClientCertificate(); + + HRESULT GetClientCertificate( + [out, ref] BG_CERT_STORE_LOCATION *pStoreLocation, + [out, ref] LPWSTR *pStoreName, + [out, size_is(, 20), ref] BYTE **ppCertHashBlob, + [out, ref] LPWSTR *pSubjectName + ); + + HRESULT SetCustomHeaders( + [in, unique] LPCWSTR RequestHeaders + ); + + HRESULT GetCustomHeaders( + [out] LPWSTR *pRequestHeaders + ); + + HRESULT SetSecurityFlags( + [in] ULONG Flags + ); + + HRESULT GetSecurityFlags( + [out, ref] ULONG *pFlags + ); +} + +[ + uuid(4974177c-3bb6-4c37-9ff0-6b7426f0aba9), + version(1.0) +] +library BackgroundCopyManager2_5 +{ + [ + uuid(03ca98d6-ff5d-49b8-abc6-03dd84127020) + ] + coclass BackgroundCopyManager2_5 + { + [default] interface IBackgroundCopyManager; + }; + + interface IBackgroundCopyCallback; + interface IBackgroundCopyJobHttpOptions; +} Propchange: trunk/reactos/include/psdk/bits2_5.idl ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 5 months

[akhaldi] 68478: [PSDK] Update urlmon.idl. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jul 20 21:34:01 2015 New Revision: 68478 URL: http://svn.reactos.org/svn/reactos?rev=68478&view=rev Log: [PSDK] Update urlmon.idl. CORE-9924 Modified: trunk/reactos/include/psdk/urlmon.idl Modified: trunk/reactos/include/psdk/urlmon.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/urlmon.idl?re… ============================================================================== --- trunk/reactos/include/psdk/urlmon.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/urlmon.idl [iso-8859-1] Mon Jul 20 21:34:01 2015 @@ -292,7 +292,7 @@ [in] ULONG ulProgress, [in] ULONG ulProgressMax, [in] ULONG ulStatusCode, - [in] LPCWSTR szStatusText); + [in, unique] LPCWSTR szStatusText); HRESULT OnStopBinding( [in] HRESULT hresult, @@ -593,6 +593,7 @@ * IHttpSecurity interface */ [ + local, object, uuid(79eac9d7-bafa-11ce-8c82-00aa004ba90b), pointer_default(unique) @@ -1092,7 +1093,7 @@ [in] DWORD dwAction, [out, size_is(cbPolicy)] BYTE *pPolicy, [in] DWORD cbPolicy, - [in] BYTE *pContext, + [in, unique] BYTE *pContext, [in] DWORD cbContext, [in] DWORD dwFlags, [in] DWORD dwReserved); @@ -1137,7 +1138,7 @@ HRESULT ProcessUrlActionEx( [in] LPCWSTR pwszUrl, [in] DWORD dwAction, - [out] BYTE *pPolicy, + [out, size_is(cbPolicy)] BYTE *pPolicy, [in] DWORD cbPolicy, [in] BYTE *pContext, [in] DWORD cbContext, @@ -1168,9 +1169,9 @@ HRESULT ProcessUrlActionEx2( [in] IUri *pUri, [in] DWORD dwAction, - [out] BYTE *pPolicy, + [out, size_is(cbPolicy)] BYTE *pPolicy, [in] DWORD cbPolicy, - [in] BYTE *pContext, + [in, unique] BYTE *pContext, [in] DWORD cbContext, [in] DWORD dwFlags, [in] DWORD_PTR dwReserved, @@ -1178,14 +1179,14 @@ HRESULT GetSecurityIdEx2( [in] IUri *pUri, - [out] BYTE *pbSecurityId, + [out, size_is(*pcbSecurityId)] BYTE *pbSecurityId, [in, out] DWORD *pcbSecurityId, [in] DWORD_PTR dwReserved); HRESULT QueryCustomPolicyEx2( [in] IUri *pUri, [in] REFGUID guidKey, - [out] BYTE **ppPolicy, + [out, size_is(,*pcbPolicy)] BYTE **ppPolicy, [out] DWORD *pcbPolicy, [in] BYTE *pContext, [in] DWORD cbContext, @@ -1441,28 +1442,28 @@ HRESULT GetZoneCustomPolicy( [in] DWORD dwZone, [in] REFGUID guidKey, - [out] BYTE **ppPolicy, + [out, size_is(,*pcbPolicy)] BYTE **ppPolicy, [out] DWORD* pcbPolicy, [in] URLZONEREG ulrZoneReg); HRESULT SetZoneCustomPolicy( [in] DWORD dwZone, [in] REFGUID guidKey, - [in] BYTE *ppPolicy, + [in, size_is(pcbPolicy)] BYTE *ppPolicy, [in] DWORD pcbPolicy, [in] URLZONEREG ulrZoneReg); HRESULT GetZoneActionPolicy( [in] DWORD dwZone, [in] DWORD dwAction, - [out] BYTE* pPolicy, + [out, size_is(cbPolicy)] BYTE* pPolicy, [in] DWORD cbPolicy, [in] URLZONEREG urlZoneReg); HRESULT SetZoneActionPolicy( [in] DWORD dwZone, [in] DWORD dwAction, - [in] BYTE* pPolicy, + [in, size_is(cbPolicy)] BYTE* pPolicy, [in] DWORD cbPolicy, [in] URLZONEREG urlZoneReg); @@ -1512,7 +1513,7 @@ HRESULT GetZoneActionPolicyEx( [in] DWORD dwZone, [in] DWORD dwAction, - [out] BYTE* pPolicy, + [out, size_is(cbPolicy)] BYTE *pPolicy, [in] DWORD cbPolicy, [in] URLZONEREG urlZoneReg, [in] DWORD dwFlags); @@ -1520,7 +1521,7 @@ HRESULT SetZoneActionPolicyEx( [in] DWORD dwZone, [in] DWORD dwAction, - [in] BYTE* pPolicy, + [in, size_is(cbPolicy)] BYTE *pPolicy, [in] DWORD cbPolicy, [in] URLZONEREG urlZoneReg, [in] DWORD dwFlags); @@ -1848,6 +1849,8 @@ cpp_quote("#define Uri_CREATE_IE_SETTINGS 0x2000") cpp_quote("#define Uri_CREATE_NO_IE_SETTINGS 0x4000") cpp_quote("#define Uri_CREATE_NO_ENCODE_FORBIDDEN_CHARACTERS 0x8000") +cpp_quote("#define Uri_CREATE_NORMALIZE_INTL_CHARACTERS 0x00010000") +cpp_quote("#define Uri_CREATE_CANONICALIZE_ABSOLUTE 0x00020000") cpp_quote("#define Uri_DISPLAY_NO_FRAGMENT 0x00000001") cpp_quote("#define Uri_PUNYCODE_IDN_HOST 0x00000002")

9 years, 5 months

[akhaldi] 68477: [PSDK] Update tom.idl. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jul 20 21:25:42 2015 New Revision: 68477 URL: http://svn.reactos.org/svn/reactos?rev=68477&view=rev Log: [PSDK] Update tom.idl. CORE-9924 Modified: trunk/reactos/include/psdk/tom.idl Modified: trunk/reactos/include/psdk/tom.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/tom.idl?rev=6… ============================================================================== --- trunk/reactos/include/psdk/tom.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/tom.idl [iso-8859-1] Mon Jul 20 21:25:42 2015 @@ -33,10 +33,18 @@ tomDefault = -9999996, tomSuspend = -9999995, tomResume = -9999994, - tomApplyNow = 0, - tomApplyLater = 1, - tomTrackParms = 2, - tomCacheParms = 3, + + /* ITextFont::Reset() modes */ + tomApplyNow = 0, + tomApplyLater = 1, + tomTrackParms = 2, + tomCacheParms = 3, + tomApplyTmp = 4, + tomDisableSmartFont = 8, + tomEnableSmartFont = 9, + tomUsePoints = 10, + tomUseTwips = 11, + tomBackward = 0xc0000001, tomForward = 0x3fffffff, tomMove = 0, @@ -126,6 +134,8 @@ tomMatchWord = 2, tomMatchCase = 4, tomMatchPattern = 8, + + /* ITextRange story type values */ tomUnknownStory = 0, tomMainTextStory = 1, tomFootnotesStory = 2, @@ -138,6 +148,8 @@ tomPrimaryFooterStory = 9, tomFirstPageHeaderStory = 10, tomFirstPageFooterStory = 11, + + /* ITextFont animation property */ tomNoAnimation = 0, tomLasVegasLights = 1, tomBlinkingBackground = 2, @@ -148,6 +160,7 @@ tomWipeDown = 7, tomWipeRight = 8, tomAnimationMax = 8, + tomLowerCase = 0, tomUpperCase = 1, tomTitleCase = 2, @@ -254,7 +267,7 @@ HRESULT Expand([in]LONG Unit, [retval, out]LONG *pDelta); HRESULT GetIndex([in]LONG Unit, [retval, out]LONG *pIndex); HRESULT SetIndex([in]LONG Unit, [in]LONG Index, [in]LONG Extend); - HRESULT SetRange([in]LONG cpActive, [in]LONG cpOther); + HRESULT SetRange([in]LONG anchor, [in]LONG active); HRESULT InRange([in]ITextRange *pRange, [retval, out]LONG *pb); HRESULT InStory([in]ITextRange *pRange, [retval, out]LONG *pb); HRESULT IsEqual([in]ITextRange *pRange, [retval, out]LONG *pb);

9 years, 5 months

[jimtabor] 68476: [Win32k] - Add ellipsis to the caption text if the window size is reduced. See CORE-9474, it can use more tweaks. - Also after all this, DefWndNCPaint can soon be moved into Win32...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Jul 20 19:58:11 2015 New Revision: 68476 URL: http://svn.reactos.org/svn/reactos?rev=68476&view=rev Log: [Win32k] - Add ellipsis to the caption text if the window size is reduced. See CORE-9474, it can use more tweaks. - Also after all this, DefWndNCPaint can soon be moved into Win32k, draw.c in already in. This could help with caption redrawing while moving the window. Modified: trunk/reactos/win32ss/user/ntuser/painting.c Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Mon Jul 20 19:58:11 2015 @@ -2461,8 +2461,11 @@ END_CLEANUP; } +static const WCHAR ELLIPSISW[] = {'.','.','.', 0}; + BOOL UserDrawCaptionText( + PWND pWnd, HDC hDc, const PUNICODE_STRING Text, const RECTL *lpRc, @@ -2475,12 +2478,14 @@ NTSTATUS Status; BOOLEAN bDeleteFont = FALSE; SIZE Size; + ULONG fit = 0, Length; + WCHAR szText[128]; + RECTL r = *lpRc; TRACE("UserDrawCaptionText: %wZ\n", Text); nclm.cbSize = sizeof(nclm); - if(!UserSystemParametersInfo(SPI_GETNONCLIENTMETRICS, - sizeof(NONCLIENTMETRICS), &nclm, 0)) + if(!UserSystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &nclm, 0)) { ERR("UserSystemParametersInfo() failed!\n"); return FALSE; @@ -2505,27 +2510,51 @@ IntGdiSetBkMode(hDc, TRANSPARENT); hOldFont = NtGdiSelectFont(hDc, hFont); - if(!hOldFont) - { - ERR("SelectFont() failed!\n"); - /* Don't fail */ - } if(uFlags & DC_INBUTTON) OldTextColor = IntGdiSetTextColor(hDc, IntGetSysColor(COLOR_BTNTEXT)); else - OldTextColor = IntGdiSetTextColor(hDc, IntGetSysColor(uFlags & DC_ACTIVE - ? COLOR_CAPTIONTEXT : COLOR_INACTIVECAPTIONTEXT)); - - // FIXME: If string doesn't fit to rc, truncate it and add ellipsis. - GreGetTextExtentW(hDc, Text->Buffer, Text->Length/sizeof(WCHAR), &Size, 0); - GreExtTextOutW(hDc, - lpRc->left, (lpRc->top + lpRc->bottom)/2 - Size.cy/2, - 0, NULL, Text->Buffer, Text->Length/sizeof(WCHAR), NULL, 0); + OldTextColor = IntGdiSetTextColor(hDc, + IntGetSysColor(uFlags & DC_ACTIVE ? COLOR_CAPTIONTEXT : COLOR_INACTIVECAPTIONTEXT)); + + // Adjust for system menu. + if (pWnd && pWnd->style & WS_SYSMENU) + { + r.right -= UserGetSystemMetrics(SM_CYCAPTION) - 1; + if ((pWnd->style & (WS_MAXIMIZEBOX | WS_MINIMIZEBOX)) && !(pWnd->ExStyle & WS_EX_TOOLWINDOW)) + { + r.right -= UserGetSystemMetrics(SM_CXSIZE) + 1; + r.right -= UserGetSystemMetrics(SM_CXSIZE) + 1; + } + } + + GreGetTextExtentExW(hDc, Text->Buffer, Text->Length/sizeof(WCHAR), r.right - r.left, &fit, 0, &Size, 0); + + Length = (Text->Length/sizeof(WCHAR) == fit ? fit : fit+1); + + RtlZeroMemory(&szText, sizeof(szText)); + RtlCopyMemory(&szText, Text->Buffer, Text->Length); + + if (Text->Length/sizeof(WCHAR) > Length && Length > 3) + { + RtlCopyMemory(&szText[Length-3], ELLIPSISW, sizeof(ELLIPSISW)); + } + + GreExtTextOutW( hDc, + lpRc->left, + lpRc->top + (lpRc->bottom - lpRc->top) / 2 - Size.cy / 2, // DT_SINGLELINE && DT_VCENTER + ETO_CLIPPED, + (RECTL *)lpRc, + (LPWSTR)&szText, + Length, + NULL, + 0 ); IntGdiSetTextColor(hDc, OldTextColor); + if (hOldFont) NtGdiSelectFont(hDc, hOldFont); + if (bDeleteFont) GreDeleteObject(hFont); @@ -2657,14 +2686,14 @@ Rect.left += 2; if (Str) - UserDrawCaptionText(hDc, Str, &Rect, uFlags, hFont); + UserDrawCaptionText(pWnd, hDc, Str, &Rect, uFlags, hFont); else if (pWnd != NULL) // FIXME: Windows does not do that { UNICODE_STRING ustr; ustr.Buffer = pWnd->strName.Buffer; // FIXME: LARGE_STRING truncated! ustr.Length = (USHORT)min(pWnd->strName.Length, MAXUSHORT); ustr.MaximumLength = (USHORT)min(pWnd->strName.MaximumLength, MAXUSHORT); - UserDrawCaptionText(hDc, &ustr, &Rect, uFlags, hFont); + UserDrawCaptionText(pWnd, hDc, &ustr, &Rect, uFlags, hFont); } }

9 years, 5 months

[ekohl] 68475: [DISKPART] Speed up the interpreter a bit. Patch by Lee Schroeder. CORE-9925 #resolve #comment Thank's a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Jul 20 19:47:08 2015 New Revision: 68475 URL: http://svn.reactos.org/svn/reactos?rev=68475&view=rev Log: [DISKPART] Speed up the interpreter a bit. Patch by Lee Schroeder. CORE-9925 #resolve #comment Thank's a lot! Modified: trunk/reactos/base/system/diskpart/interpreter.c Modified: trunk/reactos/base/system/diskpart/interpreter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/inter… ============================================================================== --- trunk/reactos/base/system/diskpart/interpreter.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/interpreter.c [iso-8859-1] Mon Jul 20 19:47:08 2015 @@ -69,17 +69,17 @@ { PCOMMAND cmdptr; + /* First, determine if the user wants to exit + or to use a comment */ + if(wcsicmp(argv[0], L"exit") == 0) + return FALSE; + + if(wcsicmp(argv[0], L"rem") == 0) + return TRUE; + /* Scan internal command table */ for (cmdptr = cmds; cmdptr->name; cmdptr++) { - /* First, determine if the user wants to exit - or to use a comment */ - if(wcsicmp(argv[0], L"exit") == 0) - return FALSE; - - if(wcsicmp(argv[0], L"rem") == 0) - return TRUE; - if (wcsicmp(argv[0], cmdptr->name) == 0) return cmdptr->func(argc, argv); }

9 years, 5 months

← Newer
1
...
8
9
10
11
12
13
14
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2015