Changeset 10435 for trunk/include

Timestamp:

Jan 30, 2004, 11:22:02 PM (22 years ago)

Author:

bird

Message:

#682: Drag & Drop fixes.

Location:

trunk/include

Files:

• dbglog.h (modified) (2 diffs)
• win/thread.h (modified) (2 diffs)
• win/wine/obj_inplace.h (modified) (5 diffs)
• win/wine/obj_propertystorage.h (modified) (4 diffs)
• winuser32.h (modified) (2 diffs)

trunk/include/dbglog.h

@@ -17 +17 @@
 
 #ifdef DEBUG
+#define DEBUG_LOGGING 1
 #ifdef PRIVATE_LOGGING
   //To use private dll logging, define PRIVATE_LOGGING and
@@ -31 +32 @@
   #define dprintfNoEOL(a)      WriteLogNoEOL a
 #endif
-  #define eprintf(a)      WriteLog a 
+  #define eprintf(a)      WriteLog a
   #define dassert(a, b)   if(!(a)) dprintf b
   #define dbgCheckObj(a)        a->checkObject()

trunk/include/win/thread.h

@@ -150 +150 @@
               BOOL           fIgnoreMsgs;    // set to true if waiting in WaitForSingleObject
               BOOL           fWaitMessage;   // set if blocked in WaitMessage
-              BOOL           fWaitMessageSuspend; 
+              BOOL           fWaitMessageSuspend;
 
               CONTEXT        context;        // thread context
@@ -164 +164 @@
               void *         pWM_COPYDATA;
               //@}
+
+              /** Thread Id of the thread is attached to this threads input queue.
+               * If 0 then no thread is attached. See AttachThreadInput() for details. */
+              unsigned      tidAttachedInputThread;
 
 #ifdef DEBUG

trunk/include/win/wine/obj_inplace.h

@@ -1 @@
-/* $Id: obj_inplace.h,v 1.5 1999-08-22 22:52:08 sandervl Exp $ */
+/* $Id: obj_inplace.h,v 1.6 2004-01-30 22:22:01 bird Exp $ */
 /*
  * Defines the COM interfaces and APIs related to structured data storage.
- * 
+ *
  * Depends on 'obj_base.h'.
  */
@@ -107 +107 @@
         OLECONTF_ONLYIFRUNNING = 16
 } OLECONTF;
- 
+
 typedef HGLOBAL HOLEMENU;
 typedef LPRECT LPBORDERWIDTHS;
@@ -264 +264 @@
 #define IOleInPlaceUIWindow_SetActiveObject(p,a,b)    ICOM_CALL2(SetActiveObject,p,a,b)
 #endif
-                                  
+                                
 
 /*****************************************************************************
@@ -289 +289 @@
 #define IOleInPlaceFrame_Release(p)               ICOM_CALL (Release,p)
 /*** IOleWindow methods ***/
-#define IOleInPlaceFrame_GetWindow                ICOM_CALL1(GetWindow,p,a)
-#define IOleInPlaceFrame_ContextSensitiveHelp     ICOM_CALL1(ContextSensitiveHelp,p,a)
+#define IOleInPlaceFrame_GetWindow(p,a)             ICOM_CALL1(GetWindow,p,a)
+#define IOleInPlaceFrame_ContextSensitiveHelp(p,a)  ICOM_CALL1(ContextSensitiveHelp,p,a)
 /*** IOleInPlaceUIWindow methods ***/
-#define IOleInPlaceFrame_GetBorder                ICOM_CALL1(GetBorder,p,a)
-#define IOleInPlaceFrame_RequestBorderSpace       ICOM_CALL1(RequestBorderSpace,p,a)
-#define IOleInPlaceFrame_SetBorderSpace           ICOM_CALL1(SetBorderSpace,p,a)
-#define IOleInPlaceFrame_SetActiveObject          ICOM_CALL2(SetActiveObject,p,a,b)
+#define IOleInPlaceFrame_GetBorder(p,a)             ICOM_CALL1(GetBorder,p,a)
+#define IOleInPlaceFrame_RequestBorderSpace(p,a)    ICOM_CALL1(RequestBorderSpace,p,a)
+#define IOleInPlaceFrame_SetBorderSpace(p,a)        ICOM_CALL1(SetBorderSpace,p,a)
+#define IOleInPlaceFrame_SetActiveObject(p,a,b)     ICOM_CALL2(SetActiveObject,p,a,b)
 /*** IOleInPlaceFrame methods ***/
-#define IOleInPlaceFrame_InsertMenus              ICOM_CALL2(InsertMenus,p,a,b)
-#define IOleInPlaceFrame_SetMenu                  ICOM_CALL3(SetMenu,p,a,b,c)
-#define IOleInPlaceFrame_RemoveMenus              ICOM_CALL1(RemoveMenus,p,a)
-#define IOleInPlaceFrame_SetStatusText            ICOM_CALL1(SetStatusText,p,a)
-#define IOleInPlaceFrame_EnableModeless           ICOM_CALL1(EnableModeless,p,a)
-#define IOleInPlaceFrame_TranslateAccelerator     ICOM_CALL2(TranslateAccelerator,p,a,b)
-#endif
-                                 
+#define IOleInPlaceFrame_InsertMenus(p,a,b)         ICOM_CALL2(InsertMenus,p,a,b)
+#define IOleInPlaceFrame_SetMenu(p,a,b,c)           ICOM_CALL3(SetMenu,p,a,b,c)
+#define IOleInPlaceFrame_RemoveMenus(p,a)           ICOM_CALL1(RemoveMenus,p,a)
+#define IOleInPlaceFrame_SetStatusText(p,a)         ICOM_CALL1(SetStatusText,p,a)
+#define IOleInPlaceFrame_EnableModeless(p,a)        ICOM_CALL1(EnableModeless,p,a)
+#define IOleInPlaceFrame_TranslateAccelerator(p,a,b) ICOM_CALL2(TranslateAccelerator,p,a,b)
+#endif
+                                
 
 /*****************************************************************************
@@ -401 +401 @@
 #define IParseDisplayName_ParseDisplayName(p,a,b,c,d) ICOM_CALL4(ParseDisplayName,p,a,b,c,d)
 #endif
-                                 
+                                
                                 
 /*****************************************************************************

trunk/include/win/wine/obj_propertystorage.h

@@ -1 @@
-/* $Id: obj_propertystorage.h,v 1.5 1999-08-22 22:52:10 sandervl Exp $ */
+/* $Id: obj_propertystorage.h,v 1.6 2004-01-30 22:22:02 bird Exp $ */
 /*
  * Defines the COM interfaces and APIs related to saving properties to file.
@@ -91 +91 @@
 {
     ULONG ulKind;
-    union 
+    union
     {
         PROPID propid;
@@ -170 +170 @@
 #define IEnumSTATPROPSTG_IMETHODS \
                 IUnknown_IMETHODS \
-                IEnumSTATPROPSTG_METHODS 
+                IEnumSTATPROPSTG_METHODS
 ICOM_DEFINE(IEnumSTATPROPSTG,IUnknown)
 #undef ICOM_INTERFACE
@@ -351 +351 @@
     WORD wReserved2;
     WORD wReserved3;
-    union 
+    union
     {
-         /* Empty union arm */ 
+         /* Empty union arm */
+        char cVal;
         UCHAR bVal;
         short iVal;

trunk/include/winuser32.h

@@ -50 +50 @@
 void WIN32API SetWindowAppearance(int fOS2Looks);
 
-BOOL WIN32API OSLibWinCreateObject(LPSTR pszPath, LPSTR pszArgs, LPSTR pszWorkDir, LPSTR pszName, 
+BOOL WIN32API OSLibWinCreateObject(LPSTR pszPath, LPSTR pszArgs, LPSTR pszWorkDir, LPSTR pszName,
                                    LPSTR pszDescription, LPSTR pszIcoPath, INT iIcoNdx, BOOL fDesktop);
 
@@ -77 +77 @@
 //PostThreadMessage is done through Open32; which means the message id will be translated
 //(0xc00 added)
-#define OPEN32_MSGDIFF            0xC00
-#define WIN32APP_POSTMSG          (0x1000+OPEN32_MSGDIFF)
+#define OPEN32_MSGDIFF                  0xC00
+#define WIN32APP_POSTMSG                (0x1000+OPEN32_MSGDIFF)
+#define WIN32APP_FORWARDEDPOSTMSG       (0x1001+OPEN32_MSGDIFF)
+#define WIN32APP_FORWARDEDPOSTMSG_MAGIC 0x12345677
 
 //PM doesn't allow SetFocus during WM_SETFOCUS message processing; must delay