browseui: Implement the progress dialog.

.gitignore

@@ -31,10 +31,10 @@ dlls/avicap32/libavicap32.def
 dlls/avifil32/libavifil32.def
 dlls/avifil32/rsrc.res
 dlls/avifile.dll16
+dlls/browseui/rsrc.res
 dlls/browseui/tests/*.ok
 dlls/browseui/tests/browseui_crosstest.exe
 dlls/browseui/tests/testlist.c
-dlls/browseui/version.res
 dlls/cabinet/cabinet.res
 dlls/cabinet/libcabinet.def
 dlls/cabinet/tests/*.ok

dlls/browseui/Makefile.in

@@ -10,9 +10,10 @@ EXTRADEFS = -DCOM_NO_WINDOWS_H
 C_SRCS = \
 	aclmulti.c \
 	browseui_main.c \
+	progressdlg.c \
 	regsvr.c
 
-RC_SRCS = version.rc
+RC_SRCS = rsrc.rc
 
 @MAKE_DLL_RULES@
 

dlls/browseui/browseui.h

@@ -22,7 +22,9 @@
 #define __WINE_BROWSEUI_H
 
 extern LONG BROWSEUI_refCount;
+extern HINSTANCE BROWSEUI_hinstance;
 
 HRESULT WINAPI ACLMulti_Constructor(IUnknown *punkOuter, IUnknown **ppOut);
+HRESULT WINAPI ProgressDialog_Constructor(IUnknown *punkOuter, IUnknown **ppOut);
 
 #endif /* __WINE_SHDOCVW_H */

dlls/browseui/browseui_main.c

@@ -41,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(browseui);
 
 LONG BROWSEUI_refCount = 0;
 
-HINSTANCE browseui_hinstance = 0;
+HINSTANCE BROWSEUI_hinstance = 0;
 
 typedef HRESULT (WINAPI *LPFNCONSTRUCTOR)(IUnknown *pUnkOuter, IUnknown **ppvOut);
 
@@ -50,6 +50,7 @@ static const struct {
     LPFNCONSTRUCTOR ctor;
 } ClassesTable[] = {
     {&CLSID_ACLMulti, ACLMulti_Constructor},
+    {&CLSID_ProgressDialog, ProgressDialog_Constructor},
     {NULL, NULL}
 };
 
@@ -161,7 +162,7 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad)
             return FALSE;   /* prefer native version */
         case DLL_PROCESS_ATTACH:
             DisableThreadLibraryCalls(hinst);
-            browseui_hinstance = hinst;
+            BROWSEUI_hinstance = hinst;
             break;
     }
     return TRUE;

dlls/browseui/regsvr.c

@@ -447,6 +447,13 @@ static struct regsvr_coclass const coclass_list[] = {
         "browseui.dll",
         "Apartment"
     },
+    {
+        &CLSID_ProgressDialog,
+        "Progress Dialog",
+        NULL,
+        "browseui.dll",
+        "Both"
+    },
     { NULL }			/* list terminator */
 };
 

dlls/browseui/resids.h

+/*
+ * Copyright 2007 Mikolaj Zalewski
+ *
+ * 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 IDS_CANCELLING      16
+
+#define IDC_ANIMATION           100
+#define IDC_PROGRESS_BAR        102
+#define IDC_TEXT_LINE           103
+
+#define IDD_PROGRESS_DLG        100

dlls/browseui/rsrc.rc

+/*
+ * Copyright 2007 Mikolaj Zalewski
+ *
+ * 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
+ */
+
+#include "windef.h"
+#include "winuser.h"
+#include "commctrl.h"
+
+#include "resids.h"
+
+#include "version.rc"
+
+#include "rsrc_En.rc"

dlls/browseui/rsrc_En.rc

+/*
+ * Copyright 2007 Mikolaj Zalewski
+ *
+ * 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
+ */
+
+
+LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+
+STRINGTABLE
+{
+    IDS_CANCELLING    "Cancelling..."
+}
+
+IDD_PROGRESS_DLG DIALOG 0, 0, 260, 85
+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU
+CAPTION ""
+FONT 8, "MS Shell Dlg"
+{
+    CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */
+    LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX
+    LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX
+    CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8
+    PUSHBUTTON "&Cancel", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE
+    LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX
+}