Nikolay Sivov : comctl32: Export TaskDialogIndirect by ordinal and name.
Alexandre Julliard
julliard at winehq.org
Fri Apr 12 10:40:36 CDT 2013
Module: wine
Branch: master
Commit: 61a6a4f47626142fdbd0c2603c966e905a956404
URL: http://source.winehq.org/git/wine.git/?a=commit;h=61a6a4f47626142fdbd0c2603c966e905a956404
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Fri Apr 12 13:58:31 2013 +0400
comctl32: Export TaskDialogIndirect by ordinal and name.
---
dlls/comctl32/comctl32.spec | 2 +-
dlls/comctl32/tests/misc.c | 29 ++++++++++++++++++++++++++++-
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec
index 4613fda..ef638a4 100644
--- a/dlls/comctl32/comctl32.spec
+++ b/dlls/comctl32/comctl32.spec
@@ -61,6 +61,7 @@
340 stdcall -ordinal DPA_CreateEx(long long)
341 stdcall -noname SendNotify(long long long ptr)
342 stdcall -noname SendNotifyEx(long long long ptr long)
+345 stdcall -ordinal TaskDialogIndirect(ptr ptr ptr ptr)
350 stdcall -noname StrChrA(str str)
351 stdcall -noname StrRChrA(str str long)
352 stdcall -noname StrCmpNA(str str long)
@@ -188,6 +189,5 @@
@ stdcall PropertySheet(ptr) PropertySheetA
@ stdcall PropertySheetA(ptr)
@ stdcall PropertySheetW(ptr)
-@ stdcall TaskDialogIndirect(ptr ptr ptr ptr)
@ stdcall UninitializeFlatSB(long)
@ stdcall _TrackMouseEvent(ptr)
diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c
index 5aff06f..f4c2b11 100644
--- a/dlls/comctl32/tests/misc.c
+++ b/dlls/comctl32/tests/misc.c
@@ -22,6 +22,7 @@
#include <windows.h>
#include "wine/test.h"
+#include "v6util.h"
static PVOID (WINAPI * pAlloc)(LONG);
static PVOID (WINAPI * pReAlloc)(PVOID, LONG);
@@ -186,13 +187,39 @@ static void test_Alloc(void)
ok(res == TRUE, "Expected TRUE, got %d\n", res);
}
+static void test_TaskDialogIndirect(void)
+{
+ HINSTANCE hinst;
+ void *ptr, *ptr2;
+
+ hinst = LoadLibraryA("comctl32.dll");
+
+ ptr = GetProcAddress(hinst, "TaskDialogIndirect");
+ if (!ptr)
+ {
+ win_skip("TaskDialogIndirect not exported by name\n");
+ return;
+ }
+
+ ptr2 = GetProcAddress(hinst, (const CHAR*)345);
+ ok(ptr == ptr2, "got wrong pointer for ordinal 345, %p expected %p\n", ptr2, ptr);
+}
+
START_TEST(misc)
{
+ ULONG_PTR ctx_cookie;
+ HANDLE hCtx;
+
if(!InitFunctionPtrs())
return;
test_GetPtrAW();
test_Alloc();
- FreeLibrary(hComctl32);
+ if (!load_v6_module(&ctx_cookie, &hCtx))
+ return;
+
+ test_TaskDialogIndirect();
+
+ unload_v6_module(ctx_cookie, hCtx);
}
More information about the wine-cvs
mailing list