Initial implementation of OleUIInsertObject.

dlls/oledlg/.cvsignore

@@ -2,3 +2,4 @@ Makefile
 oledlg.dll.dbg.c
 oledlg.spec.c
 oledlg.spec.def
+rsrc.res

dlls/oledlg/Makefile.in

@@ -3,12 +3,14 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = oledlg.dll
-IMPORTS   = kernel32
+IMPORTS   = ole32 comdlg32 user32 advapi32 kernel32 ntdll
 
 C_SRCS = \
+	insobjdlg.c \
 	oledlg_main.c
 
+RC_SRCS = rsrc.rc
+
 @MAKE_DLL_RULES@
 
 ### Dependencies:
-

dlls/oledlg/oledlg_En.rc

+/*
+ * Copyright 2003 Ulrich Czekalla 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+
+UIINSERTOBJECT DIALOG DISCARDABLE  0, 0, 294, 151
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Insert Object"
+FONT 8, "MS Sans Serif"
+BEGIN
+    LISTBOX         IDC_OBJTYPELIST,82,19,131,66,LBS_SORT |
+                    LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL |
+                    WS_TABSTOP
+    LTEXT           "Object Type:",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE
+    DEFPUSHBUTTON   "OK",IDOK,221,7,66,14
+    PUSHBUTTON      "Cancel",IDCANCEL,221,24,66,14
+    GROUPBOX        "Result",IDC_RESULT,7,103,208,41
+    CONTROL         "Create New",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | 
+                    WS_GROUP,7,20,62,10
+    CONTROL         "Create Control",IDC_CREATECONTROL,"Button",
+                    BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10
+    CONTROL         "Create From File",IDC_CREATEFROMFILE,"Button",
+                    BS_AUTORADIOBUTTON,7,37,67,10
+    LTEXT           "",IDC_RESULTDESC,49,112,159,23
+    PUSHBUTTON      "&Add Control...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE
+    CONTROL         "Display As Icon",IDC_ASICON,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10
+    PUSHBUTTON      "Browse...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE
+    LTEXT           "File:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE
+    EDITTEXT        IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE
+END
+
+STRINGTABLE DISCARDABLE
+{
+  IDS_RESULTOBJDESC	"Insert a new %s object into your document"
+  IDS_RESULTFILEOBJDESC	"Insert the contents of the file as an object into your document so that you may activate it using the program which created it."
+  IDS_BROWSE            "Browse"
+  IDS_NOTOLEMOD         "File does not appear to be a valid OLE module. Unable to register OLE control."
+  IDS_NOTOLEMODCAPTION  "Add Control"
+}

dlls/oledlg/oledlg_main.c

@@ -32,6 +32,29 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
+HINSTANCE OLEDLG_hInstance = 0;
+
+/***********************************************************************
+ *		DllMain
+ */
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
+{
+    TRACE("%p 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad);
+
+    switch(fdwReason) {
+    case DLL_PROCESS_ATTACH:
+        DisableThreadLibraryCalls(hinstDLL);
+        OLEDLG_hInstance = hinstDLL;
+        break;
+
+    case DLL_PROCESS_DETACH:
+        OLEDLG_hInstance = 0;
+        break;
+    }
+    return TRUE;
+}
+
+
 /***********************************************************************
  *           OleUIAddVerbMenuA (OLEDLG.1)
  */
@@ -80,16 +103,6 @@ BOOL WINAPI OleUICanConvertOrActivateAs(
 }
 
 /***********************************************************************
- *           OleUIInsertObjectA (OLEDLG.3)
- */
-UINT WINAPI OleUIInsertObjectA(LPOLEUIINSERTOBJECTA lpOleUIInsertObject)
-{
-  FIXME("(%p): stub\n", lpOleUIInsertObject);
-  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return OLEUI_FALSE;
-}
-
-/***********************************************************************
  *           OleUIInsertObjectW (OLEDLG.20)
  */
 UINT WINAPI OleUIInsertObjectW(LPOLEUIINSERTOBJECTW lpOleUIInsertObject)

dlls/oledlg/resource.h

+/*
+ * Definitions for OLE dialog resources
+ *
+ * Copyright 2003 Ulrich Czekalla 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#define IDS_RESULTOBJDESC               101
+#define IDS_RESULTFILEOBJDESC           102
+#define IDS_BROWSE                      103
+#define IDS_NOTOLEMOD                   104
+#define IDS_NOTOLEMODCAPTION            105
+
+#define UIINSERTOBJECT                  129
+
+#define IDC_OBJTYPELIST                 1000
+#define IDC_RESULT                      1001
+#define IDC_CREATENEW                   1002
+#define IDC_CREATECONTROL               1003
+#define IDC_CREATEFROMFILE              1004
+#define IDC_OBJTYPELBL                  1005
+#define IDC_RESULTDESC                  1006
+#define IDC_ADDCONTROL                  1007
+#define IDC_ASICON                      1008
+#define IDC_BROWSE                      1009
+#define IDC_FILELBL                     1010
+#define IDC_FILE                        1011

dlls/oledlg/rsrc.rc

+/*
+ * Top level resource file for OLE Dialogs
+ *
+ * Copyright 2003 Ulrich Czekalla 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "winnls.h"
+#include "resource.h"
+
+/*
+ * Everything specific to any language goes
+ * in one of the specific files.
+ * Note that you can and may override resources
+ * which also have a neutral version. This is to
+ * get localized bitmaps for example.
+ */
+#include "oledlg_En.rc"

include/oledlg.h

@@ -104,6 +104,25 @@ typedef struct IOleUIObjInfoW IOleUIObjInfoW, *POLEUIOBJINFOW, *LPOLEUIOBJINFOW;
 #define OLEUI_OK      1 /* OK button pressed */
 #define OLEUI_CANCEL  2 /* Cancel button pressed */
 
+#define OLEUI_ERR_STANDARDMIN           100
+#define OLEUI_ERR_OLEMEMALLOC           100
+#define OLEUI_ERR_STRUCTURENULL         101
+#define OLEUI_ERR_STRUCTUREINVALID      102
+#define OLEUI_ERR_CBSTRUCTINCORRECT     103
+#define OLEUI_ERR_HWNDOWNERINVALID      104
+#define OLEUI_ERR_LPSZCAPTIONINVALID    105
+#define OLEUI_ERR_LPFNHOOKINVALID       106
+#define OLEUI_ERR_HINSTANCEINVALID      107
+#define OLEUI_ERR_LPSZTEMPLATEINVALID   108
+#define OLEUI_ERR_HRESOURCEINVALID      109
+#define OLEUI_ERR_FINDTEMPLATEFAILURE   110
+#define OLEUI_ERR_LOADTEMPLATEFAILURE   111
+#define OLEUI_ERR_DIALOGFAILURE         112
+#define OLEUI_ERR_LOCALMEMALLOC         113
+#define OLEUI_ERR_GLOBALMEMALLOC        114
+#define OLEUI_ERR_LOADSTRING            115
+#define OLEUI_ERR_STANDARDMAX           116
+
 #define OPF_OBJECTISLINK                0x00000001L
 #define OPF_NOFILLDEFAULT               0x00000002L
 #define OPF_SHOWHELP                    0x00000004L