[ros-diffs] [akhaldi] 68489: [OLEDLG_WINETEST] Import from Wine Staging 1.7.47. CORE-9924

Author: akhaldi
Date: Mon Jul 20 22:46:22 2015
New Revision: 68489

URL: http://svn.reactos.org/svn/reactos?rev=68489&view=rev
Log:
[OLEDLG_WINETEST] Import from Wine Staging 1.7.47. CORE-9924

Added:
    trunk/rostests/winetests/oledlg/   (with props)
    trunk/rostests/winetests/oledlg/CMakeLists.txt   (with props)
    trunk/rostests/winetests/oledlg/main.c   (with props)
    trunk/rostests/winetests/oledlg/testlist.c   (with props)
Modified:
    trunk/rostests/winetests/CMakeLists.txt

Modified: trunk/rostests/winetests/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?…
==============================================================================
--- trunk/rostests/winetests/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/winetests/CMakeLists.txt	[iso-8859-1] Mon Jul 20 22:46:22 2015
@@ -67,6 +67,7 @@
 add_subdirectory(ole32)
 add_subdirectory(oleacc)
 add_subdirectory(oleaut32)
+add_subdirectory(oledlg)
 add_subdirectory(opengl32)
 add_subdirectory(pdh)
 add_subdirectory(propsys)

Propchange: trunk/rostests/winetests/oledlg/
------------------------------------------------------------------------------
--- bugtraq:logregex	(added)
+++ bugtraq:logregex	Mon Jul 20 22:46:22 2015
@@ -0,0 +1,2 @@
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)

Propchange: trunk/rostests/winetests/oledlg/
------------------------------------------------------------------------------
    bugtraq:message = See issue #%BUGID% for more details.

Propchange: trunk/rostests/winetests/oledlg/
------------------------------------------------------------------------------
    bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%

Added: trunk/rostests/winetests/oledlg/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oledlg/CMakeLis…
==============================================================================
--- trunk/rostests/winetests/oledlg/CMakeLists.txt	(added)
+++ trunk/rostests/winetests/oledlg/CMakeLists.txt	[iso-8859-1] Mon Jul 20 22:46:22 2015
@@ -0,0 +1,7 @@
+
+add_definitions(-DUSE_WINE_TODOS)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+add_executable(oledlg_winetest main.c testlist.c)
+set_module_type(oledlg_winetest win32cui)
+add_importlibs(oledlg_winetest oledlg ole32 user32 msvcrt kernel32)
+add_cd_file(TARGET oledlg_winetest DESTINATION reactos/bin FOR all)

Propchange: trunk/rostests/winetests/oledlg/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/rostests/winetests/oledlg/main.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oledlg/main.c?r…
==============================================================================
--- trunk/rostests/winetests/oledlg/main.c	(added)
+++ trunk/rostests/winetests/oledlg/main.c	[iso-8859-1] Mon Jul 20 22:46:22 2015
@@ -0,0 +1,413 @@
+/*
+ * oledlg tests
+ *
+ * Copyright 2015 Nikolay Sivov 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
+ */
+
+#define COBJMACROS
+
+#include <wine/test.h>
+#include <stdio.h>
+
+#include <initguid.h>
+#include <oledlg.h>
+
+static HRESULT WINAPI enumverbs_QueryInterface(IEnumOLEVERB *iface, REFIID riid, void
**ppv)
+{
+    if (IsEqualIID(riid, &IID_IEnumOLEVERB) || IsEqualIID(riid, &IID_IUnknown))
{
+        *ppv = iface;
+        IEnumOLEVERB_AddRef(iface);
+        return S_OK;
+    }
+
+    *ppv = NULL;
+    return E_NOINTERFACE;
+}
+
+static ULONG WINAPI enumverbs_AddRef(IEnumOLEVERB *iface)
+{
+    return 2;
+}
+
+static ULONG WINAPI enumverbs_Release(IEnumOLEVERB *iface)
+{
+    return 1;
+}
+
+static int g_enumpos;
+static const WCHAR verbW[] = {'v','e','r','b',0};
+static HRESULT WINAPI enumverbs_Next(IEnumOLEVERB *iface, ULONG count, OLEVERB *verbs,
ULONG *fetched)
+{
+    ok(count == 1, "got %u\n", count);
+    ok(fetched == NULL, "got %p\n", fetched);
+    ok(g_enumpos == 0 || g_enumpos == 1, "got pos %d\n", g_enumpos);
+
+    if (g_enumpos++ == 0) {
+        verbs->lVerb = 123;
+        verbs->lpszVerbName = CoTaskMemAlloc(sizeof(verbW));
+        lstrcpyW(verbs->lpszVerbName, verbW);
+        verbs->fuFlags = MF_ENABLED;
+        verbs->grfAttribs = OLEVERBATTRIB_ONCONTAINERMENU;
+        if (fetched) *fetched = 1;
+        return S_OK;
+    }
+
+    return S_FALSE;
+}
+
+static HRESULT WINAPI enumverbs_Skip(IEnumOLEVERB *iface, ULONG count)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI enumverbs_Reset(IEnumOLEVERB *iface)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI enumverbs_Clone(IEnumOLEVERB *iface, IEnumOLEVERB **ppenum)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static IEnumOLEVERBVtbl enumverbsvtbl = {
+    enumverbs_QueryInterface,
+    enumverbs_AddRef,
+    enumverbs_Release,
+    enumverbs_Next,
+    enumverbs_Skip,
+    enumverbs_Reset,
+    enumverbs_Clone
+};
+
+static IEnumOLEVERB enumverbs = { &enumverbsvtbl };
+
+static HRESULT WINAPI oleobject_QueryInterface(IOleObject *iface, REFIID riid, void
**ppv)
+{
+    if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IOleObject)) {
+        *ppv = iface;
+        IOleObject_AddRef(iface);
+        return S_OK;
+    }
+
+    *ppv = NULL;
+    return E_NOINTERFACE;
+}
+
+static ULONG WINAPI oleobject_AddRef(IOleObject *iface)
+{
+    return 2;
+}
+
+static ULONG WINAPI oleobject_Release(IOleObject *iface)
+{
+    return 1;
+}
+
+static HRESULT WINAPI oleobject_SetClientSite(IOleObject *iface, IOleClientSite *site)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI oleobject_GetClientSite(IOleObject *iface, IOleClientSite **site)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI oleobject_SetHostNames(IOleObject *iface, LPCOLESTR containerapp,
+    LPCOLESTR containerObj)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI oleobject_Close(IOleObject *iface, DWORD saveopt)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI oleobject_SetMoniker(IOleObject *iface, DWORD whichmoniker,
IMoniker *mk)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI oleobject_GetMoniker(IOleObject *iface, DWORD assign, DWORD
whichmoniker,
+    IMoniker **mk)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI oleobject_InitFromData(IOleObject *iface, IDataObject *dataobject,
+    BOOL creation, DWORD reserved)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI oleobject_GetClipboardData(IOleObject *iface, DWORD reserved,
IDataObject **dataobject)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI oleobject_DoVerb(IOleObject *iface, LONG verb, MSG *msg,
IOleClientSite *activesite,
+    LONG index, HWND hwndParent, LPCRECT rect)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static BOOL g_enumverbsfail;
+static HRESULT WINAPI oleobject_EnumVerbs(IOleObject *iface, IEnumOLEVERB **enumverb)
+{
+    if (g_enumverbsfail) {
+        *enumverb = NULL;
+        return E_FAIL;
+    }
+    *enumverb = &enumverbs;
+    return S_OK;
+}
+
+static HRESULT WINAPI oleobject_Update(IOleObject *iface)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI oleobject_IsUpToDate(IOleObject *iface)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI oleobject_GetUserClassID(IOleObject *iface, CLSID *clsid)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static const WCHAR testW[] = {'t','e','s','t',0};
+static HRESULT WINAPI oleobject_GetUserType(IOleObject *iface, DWORD formoftype,
+    LPOLESTR *usertype)
+{
+    ok(formoftype == USERCLASSTYPE_SHORT, "got %d\n", formoftype);
+    *usertype = CoTaskMemAlloc(sizeof(testW));
+    lstrcpyW(*usertype, testW);
+    return S_OK;
+}
+
+static HRESULT WINAPI oleobject_SetExtent(IOleObject *iface, DWORD aspect, SIZEL *size)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI oleobject_GetExtent(IOleObject *iface, DWORD aspect, SIZEL *size)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI oleobject_Advise(IOleObject *iface, IAdviseSink *sink, DWORD
*connection)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI oleobject_Unadvise(IOleObject *iface, DWORD connection)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI oleobject_EnumAdvise(IOleObject *iface, IEnumSTATDATA
**enumadvise)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI oleobject_GetMiscStatus(IOleObject *iface, DWORD aspect, DWORD
*status)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI oleobject_SetColorScheme(IOleObject *iface, LOGPALETTE *pal)
+{
+    ok(0, "unexpected call\n");
+    return E_NOTIMPL;
+}
+
+static IOleObjectVtbl oleobjectvtbl = {
+    oleobject_QueryInterface,
+    oleobject_AddRef,
+    oleobject_Release,
+    oleobject_SetClientSite,
+    oleobject_GetClientSite,
+    oleobject_SetHostNames,
+    oleobject_Close,
+    oleobject_SetMoniker,
+    oleobject_GetMoniker,
+    oleobject_InitFromData,
+    oleobject_GetClipboardData,
+    oleobject_DoVerb,
+    oleobject_EnumVerbs,
+    oleobject_Update,
+    oleobject_IsUpToDate,
+    oleobject_GetUserClassID,
+    oleobject_GetUserType,
+    oleobject_SetExtent,
+    oleobject_GetExtent,
+    oleobject_Advise,
+    oleobject_Unadvise,
+    oleobject_EnumAdvise,
+    oleobject_GetMiscStatus,
+    oleobject_SetColorScheme
+};
+
+static IOleObject oleobject = { &oleobjectvtbl };
+
+static void test_OleUIAddVerbMenu(void)
+{
+    HMENU hMenu, verbmenu;
+    MENUITEMINFOW info;
+    WCHAR buffW[50];
+    int count;
+    BOOL ret;
+
+    ret = OleUIAddVerbMenuW(NULL, NULL, NULL, 0, 0, 0, FALSE, 0, NULL);
+    ok(!ret, "got %d\n", ret);
+
+    verbmenu = (HMENU)0xdeadbeef;
+    ret = OleUIAddVerbMenuW(NULL, NULL, NULL, 0, 0, 0, FALSE, 0, &verbmenu);
+    ok(!ret, "got %d\n", ret);
+    ok(verbmenu == NULL, "got %p\n", verbmenu);
+
+    g_enumpos = 0;
+    ret = OleUIAddVerbMenuW(&oleobject, NULL, NULL, 0, 0, 0, FALSE, 0, NULL);
+    ok(!ret, "got %d\n", ret);
+
+    hMenu = CreatePopupMenu();
+
+    memset(&info, 0, sizeof(info));
+    info.cbSize = sizeof(info);
+    ret = InsertMenuItemW(hMenu, 0, TRUE, &info);
+    ok(ret, "got %d\n", ret);
+
+    count = GetMenuItemCount(hMenu);
+    ok(count == 1, "got %d\n", count);
+
+    g_enumpos = 0;
+    ret = OleUIAddVerbMenuW(&oleobject, NULL, hMenu, 0, 0, 0, FALSE, 0, NULL);
+    ok(!ret, "got %d\n", ret);
+
+    count = GetMenuItemCount(hMenu);
+    ok(count == 1, "got %d\n", count);
+
+    ret = InsertMenuItemW(hMenu, 0, TRUE, &info);
+    ok(ret, "got %d\n", ret);
+
+    count = GetMenuItemCount(hMenu);
+    ok(count == 2, "got %d\n", count);
+
+    verbmenu = (HMENU)0xdeadbeef;
+    g_enumpos = 0;
+    ret = OleUIAddVerbMenuW(&oleobject, NULL, hMenu, 1, 0, 0, FALSE, 0,
&verbmenu);
+    ok(ret, "got %d\n", ret);
+    ok(verbmenu == NULL, "got %p\n", verbmenu);
+
+    count = GetMenuItemCount(hMenu);
+    ok(count == 2, "got %d\n", count);
+
+    /* object doesn't support EnumVerbs() */
+    g_enumverbsfail = TRUE;
+    g_enumpos = 0;
+    verbmenu = (HMENU)0xdeadbeef;
+    ret = OleUIAddVerbMenuW(&oleobject, NULL, hMenu, 2, 0, 0, FALSE, 0,
&verbmenu);
+    ok(!ret, "got %d\n", ret);
+    ok(verbmenu == NULL, "got %p\n", verbmenu);
+    g_enumverbsfail = FALSE;
+
+    /* added disabled item */
+    memset(&info, 0, sizeof(info));
+    info.cbSize = sizeof(info);
+    info.fMask = MIIM_STATE|MIIM_SUBMENU;
+    ret = GetMenuItemInfoW(hMenu, 2, TRUE, &info);
+    ok(ret, "got %d\n", ret);
+    ok(info.fState & MFS_DISABLED, "got state 0x%08x\n", info.fState);
+    ok(info.hSubMenu == NULL, "got submenu %p\n", info.hSubMenu);
+
+    count = GetMenuItemCount(hMenu);
+    ok(count == 3, "got %d\n", count);
+
+    /* now without object */
+    verbmenu = (HMENU)0xdeadbeef;
+    ret = OleUIAddVerbMenuW(NULL, testW, hMenu, 3, 42, 0, FALSE, 0, &verbmenu);
+    ok(!ret, "got %d\n", ret);
+    ok(verbmenu == NULL, "got %p\n", verbmenu);
+
+    memset(&info, 0, sizeof(info));
+    info.cbSize = sizeof(info);
+    info.fMask = MIIM_STATE|MIIM_ID|MIIM_STRING|MIIM_SUBMENU;
+    info.dwTypeData = buffW;
+    info.cch = sizeof(buffW)/sizeof(WCHAR);
+    ret = GetMenuItemInfoW(hMenu, 3, TRUE, &info);
+    ok(ret, "got %d\n", ret);
+    ok(info.fState == MF_GRAYED, "got state 0x%08x\n", info.fState);
+    ok(info.wID == 42, "got id %d\n", info.wID);
+    ok(info.hSubMenu == NULL, "got submenu %p\n", info.hSubMenu);
+
+    count = GetMenuItemCount(hMenu);
+    ok(count == 4, "got %d\n", count);
+
+    verbmenu = (HMENU)0xdeadbeef;
+    g_enumpos = 0;
+    ret = OleUIAddVerbMenuW(&oleobject, NULL, hMenu, 4, 0, 0, FALSE, 0,
&verbmenu);
+    ok(ret, "got %d\n", ret);
+    ok(verbmenu == NULL, "got %p\n", verbmenu);
+
+    /* check newly added item */
+    memset(&info, 0, sizeof(info));
+    info.cbSize = sizeof(info);
+    info.fMask = MIIM_STRING|MIIM_STATE|MIIM_SUBMENU;
+    info.dwTypeData = buffW;
+    info.cch = sizeof(buffW)/sizeof(WCHAR);
+    ret = GetMenuItemInfoW(hMenu, 4, TRUE, &info);
+    ok(ret, "got %d\n", ret);
+    /* item string has a form of '<verb> <usertype> <Object>',
where Object is localized */
+    ok(!memcmp(buffW, verbW, sizeof(verbW) - sizeof(WCHAR)), "str %s\n",
wine_dbgstr_w(buffW));
+    ok(info.fState == 0, "got state 0x%08x\n", info.fState);
+    ok(info.hSubMenu == NULL, "got submenu %p\n", info.hSubMenu);
+
+    count = GetMenuItemCount(hMenu);
+    ok(count == 5, "got %d\n", count);
+
+    DestroyMenu(hMenu);
+}
+
+START_TEST(main)
+{
+    test_OleUIAddVerbMenu();
+}

Propchange: trunk/rostests/winetests/oledlg/main.c
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/rostests/winetests/oledlg/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oledlg/testlist…
==============================================================================
--- trunk/rostests/winetests/oledlg/testlist.c	(added)
+++ trunk/rostests/winetests/oledlg/testlist.c	[iso-8859-1] Mon Jul 20 22:46:22 2015
@@ -0,0 +1,12 @@
+/* Automatically generated by make depend; DO NOT EDIT!! */
+
+#define STANDALONE
+#include <wine/test.h>
+
+extern void func_main(void);
+
+const struct test winetest_testlist[] =
+{
+    { "main", func_main },
+    { 0, 0 }
+};

Propchange: trunk/rostests/winetests/oledlg/testlist.c
------------------------------------------------------------------------------
    svn:eol-style = native