3 files changed, 26 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4694c984f2d..a707d884454 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -36,6 +36,13 @@
 
         * term.c: Include unistd.h only if HAVE_UNISTD_H.
 
+2007-07-11  Jason Rumney  <jasonr@gnu.org>
+
+        * makefile.w32-in (LIBS): Include OLE32.
+
+        * w32fns.c (w32_msg_pump) <WM_EMACS_CREATEWINDOW>: Initialize COM.
+        (w32_msg_pump) <WM_DESTROY>: Uninitialize COM.
+
 2007-07-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * lisp.h (struct Lisp_Hash_Table): Turn next_weak into a bare pointer.
@@ -1206,13 +1213,13 @@
         when popup menu finishes.
 
         * w32fns.c (menubar_in_use): New flag.
-        (w32_wnd_proc) [WM_INITMENU, WM_EXITMENULOOP, WM_TIMER, WM_COMMAND]:
+        (w32_wnd_proc) <WM_INITMENU, WM_EXITMENULOOP, WM_TIMER, WM_COMMAND>:
         Use it.
 
         * w32menu.c (Fx_popup_menu): Don't free menu strings here.
         (w32_menu_show): Do it here instead.
 
-        * w32fns.c (w32_wnd_proc) [WM_INITMENU]: Set menubar_active frame
+        * w32fns.c (w32_wnd_proc) <WM_INITMENU>: Set menubar_active frame
         parameter.
 
         * w32menu.c (current_popup_menu): Make available globally.
@@ -1220,7 +1227,7 @@
         menu event into the keyboard buffer.  Remove menu_command_in_progress.
 
         * w32fns.c (current_popup_menu): Use from w32menu.c.
-        (w32_wnd_proc) [WM_EXITMENULOOP, WM_TIMER]: Use menubar_active
+        (w32_wnd_proc) <WM_EXITMENULOOP, WM_TIMER>: Use menubar_active
         and current_popup_menu to determine whether a menubar menu has
         been cancelled.
 
@@ -10331,7 +10338,7 @@
         * w32term.h (x_output): Add focus_state.
 
         * w32term.c (x_focus_changed, w32_detect_focus_change): New functions.
-        (w32_read_socket) [WM_SETFOCUS]: Call w32_detect_focus_change.
+        (w32_read_socket) <WM_SETFOCUS>: Call w32_detect_focus_change.
 
 2005-03-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -13624,7 +13631,7 @@
 
         * w32term.h (AppendMenuW_Proc): Move declaration from w32menu.c.
 
-        * w32fns.c (w32_wnd_proc) [WM_MEASUREITEM, WM_DRAWITEM]:
+        * w32fns.c (w32_wnd_proc) <WM_MEASUREITEM, WM_DRAWITEM>:
         Handle Unicode menu titles.
 
 2004-09-07  Kim F. Storm  <storm@cua.dk>
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 4dad03f4c0c..ccb0dcf9f5f 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -138,7 +138,7 @@ LIBS =  $(TLIB0)	\
         $(TLIB1)        \
         $(TLIBW32)      \
         $(TLASTLIB)     \
-        $(WINMM)    \
+        $(WINMM)        \
         $(ADVAPI32)     \
         $(GDI32)        \
         $(COMDLG32)     \
@@ -146,6 +146,7 @@ LIBS =  $(TLIB0)	\
         $(MPR)          \
         $(SHELL32)      \
         $(WINSPOOL)     \
+        $(OLE32)        \
         $(libc)
 
 #
diff --git a/src/w32fns.c b/src/w32fns.c
index fd8df29affa..47ca9157623 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -52,6 +52,7 @@ Boston, MA 02110-1301, USA.  */
 #include <shellapi.h>
 #include <ctype.h>
 #include <winspool.h>
+#include <objbase.h>
 
 #include <dlgs.h>
 #define FILE_NAME_TEXT_FIELD edt1
@@ -2514,6 +2515,13 @@ w32_msg_pump (deferred_msg * msg_buf)
               /* Produced by complete_deferred_msg; just ignore.  */
               break;
             case WM_EMACS_CREATEWINDOW:
+              /* Initialize COM for this window. Even though we don't use it,
+                 some third party shell extensions can cause it to be used in
+                 system dialogs, which causes a crash if it is not initialized.
+                 This is a known bug in Windows, which was fixed long ago, but
+                 the patch for XP is not publically available until XP SP3,
+                 and older versions will never be patched.  */
+              CoInitialize (NULL);
               w32_createwindow ((struct frame *) msg.wParam);
               if (!PostThreadMessage (dwMainThreadId, WM_EMACS_DONE, 0, 0))
                 abort ();
@@ -3660,6 +3668,10 @@ w32_wnd_proc (hwnd, msg, wParam, lParam)
       my_post_msg (&wmsg, hwnd, msg, wParam, lParam);
       goto dflt;
 
+    case WM_DESTROY:
+      CoUninitialize ();
+      return 0;
+
     case WM_CLOSE:
       wmsg.dwModifiers = w32_get_modifiers ();
       my_post_msg (&wmsg, hwnd, msg, wParam, lParam);