[ros-diffs] [jimtabor] 23382: User32 synced up to 22634
jimtabor at svn.reactos.org
jimtabor at svn.reactos.org
Mon Jul 31 04:17:14 CEST 2006
Author: jimtabor
Date: Mon Jul 31 06:17:13 2006
New Revision: 23382
URL: http://svn.reactos.org/svn/reactos?rev=23382&view=rev
Log:
User32 synced up to 22634
Modified:
branches/ros-branch-0_3_0/reactos/dll/win32/user32/Da.rc
branches/ros-branch-0_3_0/reactos/dll/win32/user32/De.rc
branches/ros-branch-0_3_0/reactos/dll/win32/user32/En.rc
branches/ros-branch-0_3_0/reactos/dll/win32/user32/Es.rc
branches/ros-branch-0_3_0/reactos/dll/win32/user32/Fr.rc
branches/ros-branch-0_3_0/reactos/dll/win32/user32/Hu.rc
branches/ros-branch-0_3_0/reactos/dll/win32/user32/Nl.rc
branches/ros-branch-0_3_0/reactos/dll/win32/user32/Pl.rc
branches/ros-branch-0_3_0/reactos/dll/win32/user32/Sv.rc
branches/ros-branch-0_3_0/reactos/dll/win32/user32/user32.rbuild
branches/ros-branch-0_3_0/reactos/dll/win32/user32/user32.rc
branches/ros-branch-0_3_0/reactos/include/dde.h
branches/ros-branch-0_3_0/reactos/include/ddeml.h
branches/ros-branch-0_3_0/reactos/include/winuser.h
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/Da.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win32/user32/Da.rc?rev=23382&r1=23381&r2=23382&view=diff
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/Da.rc (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/Da.rc Mon Jul 31 06:17:13 2006
@@ -8,7 +8,7 @@
SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140
STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
-FONT 8, "Bitstream Vera Sans"
+FONT 8, "MS Shell Dlg"
CAPTION "Vælg Vindue"
BEGIN
LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/De.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win32/user32/De.rc?rev=23382&r1=23381&r2=23382&view=diff
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/De.rc (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/De.rc Mon Jul 31 06:17:13 2006
@@ -10,7 +10,7 @@
SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140
STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
-FONT 8, "Bitstream Vera Sans"
+FONT 8, "MS Shell Dlg"
CAPTION "Fenster Auswählen"
BEGIN
LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/En.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win32/user32/En.rc?rev=23382&r1=23381&r2=23382&view=diff
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/En.rc (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/En.rc Mon Jul 31 06:17:13 2006
@@ -8,7 +8,7 @@
SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140
STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
-FONT 8, "Bitstream Vera Sans"
+FONT 8, "MS Shell Dlg"
CAPTION "Select Window"
BEGIN
LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/Es.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win32/user32/Es.rc?rev=23382&r1=23381&r2=23382&view=diff
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/Es.rc (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/Es.rc Mon Jul 31 06:17:13 2006
@@ -8,7 +8,7 @@
SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140
STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
-FONT 8, "Bitstream Vera Sans"
+FONT 8, "MS Shell Dlg"
CAPTION "Selecciones Ventana"
BEGIN
LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/Fr.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win32/user32/Fr.rc?rev=23382&r1=23381&r2=23382&view=diff
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/Fr.rc (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/Fr.rc Mon Jul 31 06:17:13 2006
@@ -12,7 +12,7 @@
SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140
STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
-FONT 8, "Bitstream Vera Sans"
+FONT 8, "MS Shell Dlg"
CAPTION "Select Window"
BEGIN
LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/Hu.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win32/user32/Hu.rc?rev=23382&r1=23381&r2=23382&view=diff
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/Hu.rc (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/Hu.rc Mon Jul 31 06:17:13 2006
@@ -12,7 +12,7 @@
SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140
STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
-FONT 8, "Bitstream Vera Sans"
+FONT 8, "MS Shell Dlg"
CAPTION "Select Window"
BEGIN
LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/Nl.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win32/user32/Nl.rc?rev=23382&r1=23381&r2=23382&view=diff
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/Nl.rc (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/Nl.rc Mon Jul 31 06:17:13 2006
@@ -8,7 +8,7 @@
SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140
STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
-FONT 8, "Bitstream Vera Sans"
+FONT 8, "MS Shell Dlg"
CAPTION "Selecteer venster"
BEGIN
LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/Pl.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win32/user32/Pl.rc?rev=23382&r1=23381&r2=23382&view=diff
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/Pl.rc (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/Pl.rc Mon Jul 31 06:17:13 2006
@@ -10,7 +10,7 @@
SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140
STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
-FONT 8, "Bitstream Vera Sans"
+FONT 8, "MS Shell Dlg"
CAPTION "Wybieranie okna"
BEGIN
LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/Sv.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win32/user32/Sv.rc?rev=23382&r1=23381&r2=23382&view=diff
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/Sv.rc (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/Sv.rc Mon Jul 31 06:17:13 2006
@@ -28,7 +28,7 @@
SELWINDOW DIALOG DISCARDABLE 20, 20, 220, 140
STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
-FONT 8, "Bitstream Vera Sans"
+FONT 8, "MS Shell Dlg"
CAPTION "Välj fönster"
BEGIN
LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/user32.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win32/user32/user32.rbuild?rev=23382&r1=23381&r2=23382&view=diff
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/user32.rbuild (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/user32.rbuild Mon Jul 31 06:17:13 2006
@@ -14,6 +14,7 @@
<library>gdi32</library>
<library>kernel32</library>
<library>advapi32</library>
+ <library>imm32</library>
<directory name="include">
<pch>user32.h</pch>
</directory>
Modified: branches/ros-branch-0_3_0/reactos/dll/win32/user32/user32.rc
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/win32/user32/user32.rc?rev=23382&r1=23381&r2=23382&view=diff
==============================================================================
--- branches/ros-branch-0_3_0/reactos/dll/win32/user32/user32.rc (original)
+++ branches/ros-branch-0_3_0/reactos/dll/win32/user32/user32.rc Mon Jul 31 06:17:13 2006
@@ -73,3 +73,4 @@
#include "Sv.rc"
#include "Hu.rc"
#include "Es.rc"
+#include "Uk.rc"
Modified: branches/ros-branch-0_3_0/reactos/include/dde.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/include/dde.h?rev=23382&r1=23381&r2=23382&view=diff
==============================================================================
--- branches/ros-branch-0_3_0/reactos/include/dde.h (original)
+++ branches/ros-branch-0_3_0/reactos/include/dde.h Mon Jul 31 06:17:13 2006
@@ -1,64 +1,90 @@
-#ifndef _DDE_H
-#define _DDE_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
+/*****************************************************************************
+ * Copyright 1995, Technion, Israel Institute of Technology
+ * Electrical Eng, Software Lab.
+ * Author: Michael Veksler.
+ * Purpose: dde declarations
+ *
+ * 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
+ *****************************************************************************
+ */
+#ifndef __WINE_DDE_H
+#define __WINE_DDE_H
+
+#include <windef.h>
#ifdef __cplusplus
extern "C" {
#endif
-#define WM_DDE_FIRST 0x03E0
-#define WM_DDE_INITIATE (WM_DDE_FIRST)
-#define WM_DDE_TERMINATE (WM_DDE_FIRST+1)
-#define WM_DDE_ADVISE (WM_DDE_FIRST+2)
-#define WM_DDE_UNADVISE (WM_DDE_FIRST+3)
-#define WM_DDE_ACK (WM_DDE_FIRST+4)
-#define WM_DDE_DATA (WM_DDE_FIRST+5)
-#define WM_DDE_REQUEST (WM_DDE_FIRST+6)
-#define WM_DDE_POKE (WM_DDE_FIRST+7)
-#define WM_DDE_EXECUTE (WM_DDE_FIRST+8)
-#define WM_DDE_LAST (WM_DDE_FIRST+8)
-#ifndef RC_INVOKED
-typedef struct {
- unsigned short bAppReturnCode:8,reserved:6,fBusy:1,fAck:1;
+#define WM_DDE_INITIATE 0x3E0
+#define WM_DDE_TERMINATE 0x3E1
+#define WM_DDE_ADVISE 0x3E2
+#define WM_DDE_UNADVISE 0x3E3
+#define WM_DDE_ACK 0x3E4
+#define WM_DDE_DATA 0x3E5
+#define WM_DDE_REQUEST 0x3E6
+#define WM_DDE_POKE 0x3E7
+#define WM_DDE_EXECUTE 0x3E8
+#define WM_DDE_LAST WM_DDE_EXECUTE
+#define WM_DDE_FIRST WM_DDE_INITIATE
+
+/* DDEACK: wStatus in WM_DDE_ACK message */
+typedef struct
+{
+ unsigned short bAppReturnCode:8, reserved:6, fBusy:1, fAck:1;
} DDEACK;
-typedef struct {
- unsigned short reserved:14,fDeferUpd:1,fAckReq:1;
- short cfFormat;
+
+/* DDEDATA: hData in WM_DDE_DATA message */
+typedef struct
+{
+ unsigned short unused:12, fResponse:1, fRelease:1, reserved:1, fAckReq:1;
+ short cfFormat;
+ BYTE Value[1]; /* undetermined array */
+} DDEDATA;
+
+/* DDEADVISE: hOptions in WM_DDE_ADVISE message */
+typedef struct
+{
+ unsigned short reserved:14, fDeferUpd:1, fAckReq:1;
+ short cfFormat;
} DDEADVISE;
-typedef struct {
- unsigned short unused:12,fResponse:1,fRelease:1,reserved:1,fAckReq:1;
- short cfFormat;
- BYTE Value[1];
-} DDEDATA;
-typedef struct {
- unsigned short unused:13,fRelease:1,fReserved:2;
- short cfFormat;
- BYTE Value[1];
+
+/* DDEPOKE: hData in WM_DDE_POKE message. */
+typedef struct
+{
+ unsigned short unused:13, fRelease:1, fReserved:2;
+ short cfFormat;
+ BYTE Value[1]; /* undetermined array */
} DDEPOKE;
-typedef struct {
- unsigned short unused:13,
- fRelease:1,
- fDeferUpd:1,
- fAckReq:1;
- short cfFormat;
-} DDELN;
-typedef struct {
- unsigned short unused:12,fAck:1,fRelease:1,fReserved:1,fAckReq:1;
- short cfFormat;
- BYTE rgb[1];
-} DDEUP;
-BOOL WINAPI DdeSetQualityOfService(HWND,const SECURITY_QUALITY_OF_SERVICE*,PSECURITY_QUALITY_OF_SERVICE);
-BOOL WINAPI ImpersonateDdeClientWindow(HWND,HWND);
-LPARAM WINAPI PackDDElParam(UINT,UINT_PTR,UINT_PTR);
-BOOL WINAPI UnpackDDElParam(UINT,LPARAM,PUINT_PTR,PUINT_PTR);
-BOOL WINAPI FreeDDElParam(UINT,LPARAM);
-LPARAM WINAPI ReuseDDElParam(LPARAM,UINT,UINT,UINT_PTR,UINT_PTR);
-#endif
+BOOL WINAPI DdeSetQualityOfService(HWND hwndClient,
+ CONST SECURITY_QUALITY_OF_SERVICE *pqosNew,
+ PSECURITY_QUALITY_OF_SERVICE pqosPrev);
+
+BOOL WINAPI ImpersonateDdeClientWindow(HWND hWndClient, HWND hWndServer);
+
+/* lParam packing/unpacking API */
+
+LPARAM WINAPI PackDDElParam(UINT,UINT_PTR,UINT_PTR);
+BOOL WINAPI UnpackDDElParam(UINT,LPARAM,PUINT_PTR,PUINT_PTR);
+BOOL WINAPI FreeDDElParam(UINT,LPARAM);
+LPARAM WINAPI ReuseDDElParam(LPARAM,UINT,UINT,UINT_PTR,UINT_PTR);
+
#ifdef __cplusplus
}
#endif
-#endif
+
+#endif /* __WINE_DDE_H */
Modified: branches/ros-branch-0_3_0/reactos/include/ddeml.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/include/ddeml.h?rev=23382&r1=23381&r2=23382&view=diff
==============================================================================
--- branches/ros-branch-0_3_0/reactos/include/ddeml.h (original)
+++ branches/ros-branch-0_3_0/reactos/include/ddeml.h Mon Jul 31 06:17:13 2006
@@ -1,326 +1,377 @@
-#ifndef _DDEML_H
-#define _DDEML_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
+/*
+ * DDEML library definitions
+ *
+ * Copyright 1997 Alexandre Julliard
+ * Copyright 1997 Len White
+ *
+ * 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
+ */
+
+#ifndef __WINE_DDEML_H
+#define __WINE_DDEML_H
#ifdef __cplusplus
extern "C" {
-#endif
-
-#define EXPENTRY CALLBACK
-#define CP_WINANSI 1004
-#define CP_WINUNICODE 1200
-#define XTYPF_NOBLOCK 2
-#define XTYPF_NODATA 4
-#define XTYPF_ACKREQ 8
-#define XCLASS_MASK 0xFC00
-#define XCLASS_BOOL 0x1000
-#define XCLASS_DATA 0x2000
-#define XCLASS_FLAGS 0x4000
-#define XCLASS_NOTIFICATION 0x8000
-#define XST_NULL 0
-#define XST_INCOMPLETE 1
-#define XST_CONNECTED 2
-#define XST_INIT1 3
-#define XST_INIT2 4
-#define XST_REQSENT 5
-#define XST_DATARCVD 6
-#define XST_POKESENT 7
-#define XST_POKEACKRCVD 8
-#define XST_EXECSENT 9
-#define XST_EXECACKRCVD 10
-#define XST_ADVSENT 11
-#define XST_UNADVSENT 12
-#define XST_ADVACKRCVD 13
-#define XST_UNADVACKRCVD 14
-#define XST_ADVDATASENT 15
-#define XST_ADVDATAACKRCVD 16
-#define XTYP_ERROR (XCLASS_NOTIFICATION|XTYPF_NOBLOCK)
-#define XTYP_ADVDATA (16|XCLASS_FLAGS)
-#define XTYP_ADVREQ (32|XCLASS_DATA|XTYPF_NOBLOCK)
-#define XTYP_ADVSTART (0x30|XCLASS_BOOL)
-#define XTYP_ADVSTOP (0x0040|XCLASS_NOTIFICATION)
-#define XTYP_EXECUTE (0x0050|XCLASS_FLAGS)
-#define XTYP_CONNECT (0x0060|XCLASS_BOOL|XTYPF_NOBLOCK)
-#define XTYP_CONNECT_CONFIRM (0x0070|XCLASS_NOTIFICATION|XTYPF_NOBLOCK)
-#define XTYP_XACT_COMPLETE (0x0080|XCLASS_NOTIFICATION)
-#define XTYP_POKE (0x0090|XCLASS_FLAGS)
-#define XTYP_REGISTER (0x00A0|XCLASS_NOTIFICATION|XTYPF_NOBLOCK)
-#define XTYP_REQUEST (0x00B0|XCLASS_DATA)
-#define XTYP_DISCONNECT (0x00C0|XCLASS_NOTIFICATION|XTYPF_NOBLOCK)
-#define XTYP_UNREGISTER (0x00D0|XCLASS_NOTIFICATION|XTYPF_NOBLOCK)
-#define XTYP_WILDCONNECT (0x00E0|XCLASS_DATA|XTYPF_NOBLOCK)
-#define XTYP_MASK 0xF0
-#define XTYP_SHIFT 4
-#define TIMEOUT_ASYNC 0xFFFFFFFF
+#endif /* defined(__cplusplus) */
+
+/* Codepage Constants
+ */
+
+#define CP_WINANSI 1004
+#define CP_WINUNICODE 1200
+
+/* DDE synchronisation constants
+ */
+
+#define MSGF_DDEMGR 0x8001
+
#define QID_SYNC 0xFFFFFFFF
-#define ST_CONNECTED 1
-#define ST_ADVISE 2
-#define ST_ISLOCAL 4
-#define ST_BLOCKED 8
-#define ST_CLIENT 16
-#define ST_TERMINATED 32
-#define ST_INLIST 64
-#define ST_BLOCKNEXT 128
-#define ST_ISSELF 256
-#define CADV_LATEACK 0xFFFF
-#define DMLERR_NO_ERROR 0
-#define DMLERR_FIRST 0x4000
-#define DMLERR_ADVACKTIMEOUT 0x4000
-#define DMLERR_BUSY 0x4001
-#define DMLERR_DATAACKTIMEOUT 0x4002
-#define DMLERR_DLL_NOT_INITIALIZED 0x4003
-#define DMLERR_DLL_USAGE 0x4004
-#define DMLERR_EXECACKTIMEOUT 0x4005
-#define DMLERR_INVALIDPARAMETER 0x4006
-#define DMLERR_LOW_MEMORY 0x4007
-#define DMLERR_MEMORY_ERROR 0x4008
-#define DMLERR_NOTPROCESSED 0x4009
-#define DMLERR_NO_CONV_ESTABLISHED 0x400a
-#define DMLERR_POKEACKTIMEOUT 0x400b
-#define DMLERR_POSTMSG_FAILED 0x400c
-#define DMLERR_REENTRANCY 0x400d
-#define DMLERR_SERVER_DIED 0x400e
-#define DMLERR_SYS_ERROR 0x400f
-#define DMLERR_UNADVACKTIMEOUT 0x4010
-#define DMLERR_UNFOUND_QUEUE_ID 0x4011
-#define DMLERR_LAST 0x4011
-#define DDE_FACK 0x8000
-#define DDE_FBUSY 0x4000
-#define DDE_FDEFERUPD 0x4000
-#define DDE_FACKREQ 0x8000
-#define DDE_FRELEASE 0x2000
-#define DDE_FREQUESTED 0x1000
-#define DDE_FAPPSTATUS 0x00ff
-#define DDE_FNOTPROCESSED 0
-#define DDE_FACKRESERVED (~(DDE_FACK|DDE_FBUSY|DDE_FAPPSTATUS))
-#define DDE_FADVRESERVED (~(DDE_FACKREQ|DDE_FDEFERUPD))
-#define DDE_FDATRESERVED (~(DDE_FACKREQ|DDE_FRELEASE|DDE_FREQUESTED))
-#define DDE_FPOKRESERVED (~DDE_FRELEASE)
-#define MSGF_DDEMGR 0x8001
-#define CBR_BLOCK ((HDDEDATA)0xffffffff)
-#define CBF_FAIL_SELFCONNECTIONS 0x1000
-#define CBF_FAIL_CONNECTIONS 0x2000
-#define CBF_FAIL_ADVISES 0x4000
-#define CBF_FAIL_EXECUTES 0x8000
-#define CBF_FAIL_POKES 0x10000
-#define CBF_FAIL_REQUESTS 0x20000
-#define CBF_FAIL_ALLSVRXACTIONS 0x3f000
-#define CBF_SKIP_CONNECT_CONFIRMS 0x40000
-#define CBF_SKIP_REGISTRATIONS 0x80000
-#define CBF_SKIP_UNREGISTRATIONS 0x100000
-#define CBF_SKIP_DISCONNECTS 0x200000
-#define CBF_SKIP_ALLNOTIFICATIONS 0x3c0000
-#define APPCMD_CLIENTONLY 0x10L
-#define APPCMD_FILTERINITS 0x20L
-#define APPCMD_MASK 0xFF0L
-#define APPCLASS_STANDARD 0
-#define APPCLASS_MASK 0xFL
-#define EC_ENABLEALL 0
-#define EC_ENABLEONE ST_BLOCKNEXT
-#define EC_DISABLE ST_BLOCKED
-#define EC_QUERYWAITING 2
-#define DNS_REGISTER 1
-#define DNS_UNREGISTER 2
-#define DNS_FILTERON 4
-#define DNS_FILTEROFF 8
-#define HDATA_APPOWNED 1
-#define MAX_MONITORS 4
-#define APPCLASS_MONITOR 1L
-#define XTYP_MONITOR (XCLASS_NOTIFICATION|XTYPF_NOBLOCK|0xF0)
-#define MF_HSZ_INFO 0x1000000
-#define MF_SENDMSGS 0x2000000
-#define MF_POSTMSGS 0x4000000
-#define MF_CALLBACKS 0x8000000
-#define MF_ERRORS 0x10000000
-#define MF_LINKS 0x20000000
-#define MF_CONV 0x40000000
-#define MF_MASK 0xFF000000
-#define MH_CREATE 1
-#define MH_KEEP 2
-#define MH_DELETE 3
-#define MH_CLEANUP 4
+
+/* Type variation for MS deliberate departures from ANSI standards
+ */
+
+#define EXPENTRY CALLBACK
+
+#define SZDDESYS_TOPIC TEXT("System")
+#define SZDDESYS_ITEM_TOPICS TEXT("Topics")
+#define SZDDESYS_ITEM_SYSITEMS TEXT("SysItems")
+#define SZDDESYS_ITEM_RTNMSG TEXT("ReturnMessage")
+#define SZDDESYS_ITEM_STATUS TEXT("Status")
+#define SZDDESYS_ITEM_FORMATS TEXT("Formats")
+#define SZDDESYS_ITEM_HELP TEXT("Help")
+#define SZDDE_ITEM_ITEMLIST TEXT("TopicItemList")
+
+/***************************************************
+
+ FLAGS Section - copied from Microsoft SDK as must be standard, probably Copyright Microsoft Corporation
+
+***************************************************/
+
+#define XST_NULL 0
+#define XST_INCOMPLETE 1
+#define XST_CONNECTED 2
+#define XST_INIT1 3
+#define XST_INIT2 4
+#define XST_REQSENT 5
+#define XST_DATARCVD 6
+#define XST_POKESENT 7
+#define XST_POKEACKRCVD 8
+#define XST_EXECSENT 9
+#define XST_EXECACKRCVD 10
+#define XST_ADVSENT 11
+#define XST_UNADVSENT 12
+#define XST_ADVACKRCVD 13
+#define XST_UNADVACKRCVD 14
+#define XST_ADVDATASENT 15
+#define XST_ADVDATAACKRCVD 16
+
+#define ST_CONNECTED 0x0001
+#define ST_ADVISE 0x0002
+#define ST_ISLOCAL 0x0004
+#define ST_BLOCKED 0x0008
+#define ST_CLIENT 0x0010
+#define ST_TERMINATED 0x0020
+#define ST_INLIST 0x0040
+#define ST_BLOCKNEXT 0x0080
+#define ST_ISSELF 0x0100
+
+/*
+ * DdeEnableCallback function codes
+ */
+
+#define EC_ENABLEALL 0
+#define EC_ENABLEONE ST_BLOCKNEXT
+#define EC_DISABLE ST_BLOCKED
+#define EC_QUERYWAITING 2
+
+/*
+ * Callback filter flags for use with standard apps.
+ */
+
+#define CBF_FAIL_SELFCONNECTIONS 0x00001000
+#define CBF_FAIL_CONNECTIONS 0x00002000
+#define CBF_FAIL_ADVISES 0x00004000
+#define CBF_FAIL_EXECUTES 0x00008000
+#define CBF_FAIL_POKES 0x00010000
+#define CBF_FAIL_REQUESTS 0x00020000
+#define CBF_FAIL_ALLSVRXACTIONS 0x0003f000
+
+#define CBF_SKIP_CONNECT_CONFIRMS 0x00040000
+#define CBF_SKIP_REGISTRATIONS 0x00080000
+#define CBF_SKIP_UNREGISTRATIONS 0x00100000
+#define CBF_SKIP_DISCONNECTS 0x00200000
+#define CBF_SKIP_ALLNOTIFICATIONS 0x003c0000
+
+#define CBR_BLOCK ((HDDEDATA)~0UL)
+
+/*
+ * Application command flags
+ */
+#define APPCMD_CLIENTONLY 0x00000010L
+#define APPCMD_FILTERINITS 0x00000020L
+#define APPCMD_MASK 0x00000FF0L
+
+/*
+ * Application classification flags
+ */
+
+#define APPCLASS_STANDARD 0x00000000L
+#define APPCLASS_MONITOR 0x00000001L
+#define APPCLASS_MASK 0x0000000FL
+
+/*
+ * Callback filter flags for use with MONITOR apps - 0 implies no monitor
+ * callbacks.
+ */
+#define MF_HSZ_INFO 0x01000000
+#define MF_SENDMSGS 0x02000000
+#define MF_POSTMSGS 0x04000000
+#define MF_CALLBACKS 0x08000000
+#define MF_ERRORS 0x10000000
+#define MF_LINKS 0x20000000
+#define MF_CONV 0x40000000
+
+#define MF_MASK 0xFF000000
+
+/*
+ * DdeNameService service name flags
+ */
+
+#define DNS_REGISTER 0x0001
+#define DNS_UNREGISTER 0x0002
+#define DNS_FILTERON 0x0004
+#define DNS_FILTEROFF 0x0008
+
+
+/****************************************************
+
+ End of Flags section
+
+****************************************************/
+
+/****************************************************
+
+ Message Types Section
+
+****************************************************/
+
+#define XTYPF_NOBLOCK 0x0002 /* CBR_NOBLOCK will not work */
+#define XTYPF_NODATA 0x0004 /* DDE_FDEFERUPD */
+#define XTYPF_ACKREQ 0x0008 /* DDE_FACKREQ */
+
+#define XCLASS_MASK 0xFC00
+#define XCLASS_BOOL 0x1000
+#define XCLASS_DATA 0x2000
+#define XCLASS_FLAGS 0x4000
+#define XCLASS_NOTIFICATION 0x8000
+
+#define XTYP_ERROR (0x0000 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK)
+#define XTYP_ADVDATA (0x0010 | XCLASS_FLAGS)
+#define XTYP_ADVREQ (0x0020 | XCLASS_DATA | XTYPF_NOBLOCK)
+#define XTYP_ADVSTART (0x0030 | XCLASS_BOOL)
+#define XTYP_ADVSTOP (0x0040 | XCLASS_NOTIFICATION)
+#define XTYP_EXECUTE (0x0050 | XCLASS_FLAGS)
+#define XTYP_CONNECT (0x0060 | XCLASS_BOOL | XTYPF_NOBLOCK)
+#define XTYP_CONNECT_CONFIRM (0x0070 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK)
+#define XTYP_XACT_COMPLETE (0x0080 | XCLASS_NOTIFICATION )
+#define XTYP_POKE (0x0090 | XCLASS_FLAGS)
+#define XTYP_REGISTER (0x00A0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK )
+#define XTYP_REQUEST (0x00B0 | XCLASS_DATA )
+#define XTYP_DISCONNECT (0x00C0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK )
+#define XTYP_UNREGISTER (0x00D0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK )
+#define XTYP_WILDCONNECT (0x00E0 | XCLASS_DATA | XTYPF_NOBLOCK)
+
+#define XTYP_MASK 0x00F0
+#define XTYP_SHIFT 4
+
+#define TIMEOUT_ASYNC 0xFFFFFFFF
+
+#define CADV_LATEACK 0xFFFF
+
+/**************************************************
+
+ End of Message Types Section
+
+****************************************************/
+
+/*****************************************************
+
+ DDE Codes for wStatus field
+
+*****************************************************/
+
+#define DDE_FACK 0x8000
+#define DDE_FBUSY 0x4000
+#define DDE_FDEFERUPD 0x4000
+#define DDE_FACKREQ 0x8000
+#define DDE_FRELEASE 0x2000
+#define DDE_FREQUESTED 0x1000
+#define DDE_FAPPSTATUS 0x00FF
+#define DDE_FNOTPROCESSED 0x0000
+
+#define DDE_FACKRESERVED (~(DDE_FACK | DDE_FBUSY | DDE_FAPPSTATUS))
+#define DDE_FADVRESERVED (~(DDE_FACKREQ | DDE_FDEFERUPD))
+#define DDE_FDATRESERVED (~(DDE_FACKREQ | DDE_FRELEASE | DDE_FREQUESTED))
+#define DDE_FPOKRESERVED (~(DDE_FRELEASE))
+
+/*****************************************************
+
+ End of wStatus codes
+
+*****************************************************/
+
+/****************************************************
+
+ Return Codes section again copied from SDK as must be same
+
+*****************************************************/
+
+#define DMLERR_NO_ERROR 0 /* must be 0 */
+
+#define DMLERR_FIRST 0x4000
+
+#define DMLERR_ADVACKTIMEOUT 0x4000
+#define DMLERR_BUSY 0x4001
+#define DMLERR_DATAACKTIMEOUT 0x4002
+#define DMLERR_DLL_NOT_INITIALIZED 0x4003
+#define DMLERR_DLL_USAGE 0x4004
+#define DMLERR_EXECACKTIMEOUT 0x4005
+#define DMLERR_INVALIDPARAMETER 0x4006
+#define DMLERR_LOW_MEMORY 0x4007
+#define DMLERR_MEMORY_ERROR 0x4008
+#define DMLERR_NOTPROCESSED 0x4009
+#define DMLERR_NO_CONV_ESTABLISHED 0x400a
+#define DMLERR_POKEACKTIMEOUT 0x400b
+#define DMLERR_POSTMSG_FAILED 0x400c
+#define DMLERR_REENTRANCY 0x400d
+#define DMLERR_SERVER_DIED 0x400e
+#define DMLERR_SYS_ERROR 0x400f
+#define DMLERR_UNADVACKTIMEOUT 0x4010
+#define DMLERR_UNFOUND_QUEUE_ID 0x4011
+
+#define DMLERR_LAST 0x4011
+
+#define HDATA_APPOWNED 0x0001
+
+/*****************************************************
+
+ End of Return Codes and Microsoft section
+
+******************************************************/
+
+
DECLARE_HANDLE(HCONVLIST);
DECLARE_HANDLE(HCONV);
DECLARE_HANDLE(HSZ);
DECLARE_HANDLE(HDDEDATA);
-typedef HDDEDATA CALLBACK FNCALLBACK(UINT,UINT,HCONV,HSZ,HSZ,HDDEDATA,DWORD,DWORD);
-typedef HDDEDATA(CALLBACK *PFNCALLBACK)(UINT,UINT,HCONV,HSZ,HSZ,HDDEDATA,DWORD,DWORD);
-typedef struct tagHSZPAIR {
- HSZ hszSvc;
- HSZ hszTopic;
+
+
+
+/*******************************************************
+
+ API Entry Points
+
+*******************************************************/
+
+typedef HDDEDATA (CALLBACK *PFNCALLBACK)(UINT, UINT, HCONV, HSZ, HSZ,
+ HDDEDATA, ULONG_PTR, ULONG_PTR);
+
+/***************************************************
+
+ Externally visible data structures
+
+***************************************************/
+
+typedef struct tagHSZPAIR
+{
+ HSZ hszSvc;
+ HSZ hszTopic;
} HSZPAIR, *PHSZPAIR;
-typedef struct tagCONVCONTEXT {
- UINT cb;
- UINT wFlags;
- UINT wCountryID;
- int iCodePage;
- DWORD dwLangID;
- DWORD dwSecurity;
- SECURITY_QUALITY_OF_SERVICE qos;
-} CONVCONTEXT,*PCONVCONTEXT;
-typedef struct tagCONVINFO {
- DWORD cb;
- DWORD hUser;
- HCONV hConvPartner;
- HSZ hszSvcPartner;
- HSZ hszServiceReq;
- HSZ hszTopic;
- HSZ hszItem;
- UINT wFmt;
- UINT wType;
- UINT wStatus;
- UINT wConvst;
- UINT wLastError;
- HCONVLIST hConvList;
- CONVCONTEXT ConvCtxt;
- HWND hwnd;
- HWND hwndPartner;
-} CONVINFO,*PCONVINFO;
-typedef struct tagDDEML_MSG_HOOK_DATA {
- UINT uiLo;
- UINT uiHi;
- DWORD cbData;
- DWORD Data[8];
-} DDEML_MSG_HOOK_DATA;
-typedef struct tagMONHSZSTRUCTA {
- UINT cb;
- BOOL fsAction;
- DWORD dwTime;
- HSZ hsz;
- HANDLE hTask;
- CHAR str[1];
-} MONHSZSTRUCTA, *PMONHSZSTRUCTA;
-typedef struct tagMONHSZSTRUCTW {
- UINT cb;
- BOOL fsAction;
- DWORD dwTime;
- HSZ hsz;
- HANDLE hTask;
- WCHAR str[1];
-} MONHSZSTRUCTW, *PMONHSZSTRUCTW;
-typedef struct tagMONLINKSTRUCT {
- UINT cb;
- DWORD dwTime;
- HANDLE hTask;
- BOOL fEstablished;
- BOOL fNoData;
- HSZ hszSvc;
- HSZ hszTopic;
- HSZ hszItem;
- UINT wFmt;
- BOOL fServer;
- HCONV hConvServer;
- HCONV hConvClient;
-} MONLINKSTRUCT, *PMONLINKSTRUCT;
-typedef struct tagMONCONVSTRUCT {
- UINT cb;
- BOOL fConnect;
- DWORD dwTime;
- HANDLE hTask;
- HSZ hszSvc;
- HSZ hszTopic;
- HCONV hConvClient;
- HCONV hConvServer;
-} MONCONVSTRUCT, *PMONCONVSTRUCT;
-typedef struct tagMONCBSTRUCT {
- UINT cb;
- DWORD dwTime;
- HANDLE hTask;
- DWORD dwRet;
- UINT wType;
- UINT wFmt;
- HCONV hConv;
- HSZ hsz1;
- HSZ hsz2;
- HDDEDATA hData;
- ULONG_PTR dwData1;
- ULONG_PTR dwData2;
- CONVCONTEXT cc;
- DWORD cbData;
- DWORD Data[8];
-} MONCBSTRUCT, *PMONCBSTRUCT;
-typedef struct tagMONERRSTRUCT {
- UINT cb;
- UINT wLastError;
- DWORD dwTime;
- HANDLE hTask;
-} MONERRSTRUCT, *PMONERRSTRUCT;
-typedef struct tagMONMSGSTRUCT {
- UINT cb;
- HWND hwndTo;
- DWORD dwTime;
- HANDLE hTask;
- UINT wMsg;
- WPARAM wParam;
- LPARAM lParam;
- DDEML_MSG_HOOK_DATA dmhd;
-} MONMSGSTRUCT, *PMONMSGSTRUCT;
-
-BOOL WINAPI DdeAbandonTransaction(DWORD,HCONV,DWORD);
-PBYTE WINAPI DdeAccessData(HDDEDATA,PDWORD);
-HDDEDATA WINAPI DdeAddData(HDDEDATA,PBYTE,DWORD,DWORD);
-HDDEDATA WINAPI DdeClientTransaction(PBYTE,DWORD,HCONV,HSZ,UINT,UINT,DWORD,PDWORD);
-int WINAPI DdeCmpStringHandles(HSZ,HSZ);
-HCONV WINAPI DdeConnect(DWORD,HSZ,HSZ,PCONVCONTEXT);
+
+typedef struct tagCONVCONTEXT
+{
+ UINT cb;
+ UINT wFlags;
+ UINT wCountryID;
+ INT iCodePage;
+ DWORD dwLangID;
+ DWORD dwSecurity;
+} CONVCONTEXT, *PCONVCONTEXT;
+
+typedef struct tagCONVINFO
+{
+ DWORD cb;
+ DWORD hUser;
+ HCONV hConvPartner;
+ HSZ hszSvcPartner;
+ HSZ hszServiceReq;
+ HSZ hszTopic;
+ HSZ hszItem;
+ UINT wFmt;
+ UINT wType;
+ UINT wStatus;
+ UINT wConvst;
+ UINT wLastError;
+ HCONVLIST hConvList;
+ CONVCONTEXT ConvCtxt;
+ HWND hwnd;
+ HWND hwndPartner;
+} CONVINFO, *PCONVINFO;
+
+/* Interface Definitions */
+
+
+UINT WINAPI DdeInitializeA(LPDWORD,PFNCALLBACK,DWORD,DWORD);
+UINT WINAPI DdeInitializeW(LPDWORD,PFNCALLBACK,DWORD,DWORD);
+#define DdeInitialize WINELIB_NAME_AW(DdeInitialize)
+BOOL WINAPI DdeUninitialize(DWORD);
HCONVLIST WINAPI DdeConnectList(DWORD,HSZ,HSZ,HCONVLIST,PCONVCONTEXT);
-HDDEDATA WINAPI DdeCreateDataHandle(DWORD,PBYTE,DWORD,DWORD,HSZ,UINT,UINT);
-HSZ WINAPI DdeCreateStringHandleA(DWORD,LPSTR,int);
-HSZ WINAPI DdeCreateStringHandleW(DWORD,LPWSTR,int);
-BOOL WINAPI DdeDisconnect(HCONV);
-BOOL WINAPI DdeDisconnectList(HCONVLIST);
-BOOL WINAPI DdeEnableCallback(DWORD,HCONV,UINT);
-BOOL WINAPI DdeFreeDataHandle(HDDEDATA);
-BOOL WINAPI DdeFreeStringHandle(DWORD,HSZ);
-DWORD WINAPI DdeGetData(HDDEDATA,PBYTE,DWORD,DWORD);
-UINT WINAPI DdeGetLastError(DWORD);
-BOOL WINAPI DdeImpersonateClient(HCONV);
-UINT WINAPI DdeInitializeA(PDWORD,PFNCALLBACK,DWORD,DWORD);
-UINT WINAPI DdeInitializeW(PDWORD,PFNCALLBACK,DWORD,DWORD);
-BOOL WINAPI DdeKeepStringHandle(DWORD,HSZ);
-HDDEDATA WINAPI DdeNameService(DWORD,HSZ,HSZ,UINT);
-BOOL WINAPI DdePostAdvise(DWORD,HSZ,HSZ);
-UINT WINAPI DdeQueryConvInfo(HCONV,DWORD,PCONVINFO);
-HCONV WINAPI DdeQueryNextServer(HCONVLIST,HCONV);
-DWORD WINAPI DdeQueryStringA(DWORD,HSZ,LPSTR,DWORD,int);
-DWORD WINAPI DdeQueryStringW(DWORD,HSZ,LPWSTR,DWORD,int);
-HCONV WINAPI DdeReconnect(HCONV);
-BOOL WINAPI DdeSetUserHandle(HCONV,DWORD,DWORD);
-BOOL WINAPI DdeUnaccessData(HDDEDATA);
-BOOL WINAPI DdeUninitialize(DWORD);
-
-#ifdef UNICODE
-#define SZDDESYS_TOPIC L"System"
-#define SZDDESYS_ITEM_TOPICS L"Topics"
-#define SZDDESYS_ITEM_SYSITEMS L"SysItems"
-#define SZDDESYS_ITEM_RTNMSG L"ReturnMessage"
-#define SZDDESYS_ITEM_STATUS L"Status"
-#define SZDDESYS_ITEM_FORMATS L"Formats"
-#define SZDDESYS_ITEM_HELP L"Help"
-#define SZDDE_ITEM_ITEMLIST L"TopicItemList"
-#define MONHSZSTRUCT MONHSZSTRUCTA
-#define PMONHSZSTRUCT PMONHSZSTRUCTA
-#define DdeCreateStringHandle DdeCreateStringHandleW
-#define DdeInitialize DdeInitializeW
-#define DdeQueryString DdeQueryStringW
-#else
-#define SZDDESYS_TOPIC "System"
-#define SZDDESYS_ITEM_TOPICS "Topics"
-#define SZDDESYS_ITEM_SYSITEMS "SysItems"
-#define SZDDESYS_ITEM_RTNMSG "ReturnMessage"
-#define SZDDESYS_ITEM_STATUS "Status"
-#define SZDDESYS_ITEM_FORMATS "Formats"
-#define SZDDESYS_ITEM_HELP "Help"
-#define SZDDE_ITEM_ITEMLIST "TopicItemList"
-#define MONHSZSTRUCT MONHSZSTRUCTW
-#define PMONHSZSTRUCT PMONHSZSTRUCTW
-#define DdeCreateStringHandle DdeCreateStringHandleA
-#define DdeInitialize DdeInitializeA
-#define DdeQueryString DdeQueryStringA
-#endif
+HCONV WINAPI DdeQueryNextServer(HCONVLIST, HCONV);
+DWORD WINAPI DdeQueryStringA(DWORD, HSZ, LPSTR, DWORD, INT);
+DWORD WINAPI DdeQueryStringW(DWORD, HSZ, LPWSTR, DWORD, INT);
+#define DdeQueryString WINELIB_NAME_AW(DdeQueryString)
+BOOL WINAPI DdeDisconnectList(HCONVLIST);
+HCONV WINAPI DdeConnect(DWORD,HSZ,HSZ,PCONVCONTEXT);
+BOOL WINAPI DdeDisconnect(HCONV);
+HDDEDATA WINAPI DdeCreateDataHandle(DWORD,LPBYTE,DWORD,DWORD,HSZ,UINT,UINT);
+HCONV WINAPI DdeReconnect(HCONV);
+HSZ WINAPI DdeCreateStringHandleA(DWORD,LPCSTR,INT);
+HSZ WINAPI DdeCreateStringHandleW(DWORD,LPCWSTR,INT);
+#define DdeCreateStringHandle WINELIB_NAME_AW(DdeCreateStringHandle)
+BOOL WINAPI DdeFreeStringHandle(DWORD,HSZ);
+BOOL WINAPI DdeFreeDataHandle(HDDEDATA);
+BOOL WINAPI DdeKeepStringHandle(DWORD,HSZ);
+HDDEDATA WINAPI DdeClientTransaction(LPBYTE,DWORD,HCONV,HSZ,UINT,UINT,DWORD,LPDWORD);
+BOOL WINAPI DdeAbandonTransaction(DWORD idInst, HCONV hConv, DWORD idTransaction);
+BOOL WINAPI DdeImpersonateClient(HCONV);
+BOOL WINAPI DdePostAdvise(DWORD,HSZ,HSZ);
+HDDEDATA WINAPI DdeAddData(HDDEDATA,LPBYTE,DWORD,DWORD);
+DWORD WINAPI DdeGetData(HDDEDATA,LPBYTE,DWORD,DWORD);
+LPBYTE WINAPI DdeAccessData(HDDEDATA,LPDWORD);
+BOOL WINAPI DdeUnaccessData(HDDEDATA);
+BOOL WINAPI DdeEnableCallback(DWORD,HCONV,UINT);
+INT WINAPI DdeCmpStringHandles(HSZ,HSZ);
+BOOL WINAPI DdeSetUserHandle(HCONV,DWORD,DWORD);
+
+HDDEDATA WINAPI DdeNameService(DWORD,HSZ,HSZ,UINT);
+UINT WINAPI DdeGetLastError(DWORD);
+UINT WINAPI DdeQueryConvInfo(HCONV,DWORD,PCONVINFO);
+
#ifdef __cplusplus
-}
-#endif
-#endif /* _DDEML_H */
+} /* extern "C" */
+#endif /* defined(__cplusplus) */
+
+#endif /* __WINE_DDEML_H */
Modified: branches/ros-branch-0_3_0/reactos/include/winuser.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/include/winuser.h?rev=23382&r1=23381&r2=23382&view=diff
==============================================================================
--- branches/ros-branch-0_3_0/reactos/include/winuser.h (original)
+++ branches/ros-branch-0_3_0/reactos/include/winuser.h Mon Jul 31 06:17:13 2006
@@ -306,6 +306,7 @@
#define SS_BLACKRECT 4
#define SS_CENTER 1
#define SS_CENTERIMAGE 512
+#define SS_EDITCONTROL 0x2000
#define SS_ENHMETAFILE 15
#define SS_ETCHEDFRAME 18
#define SS_ETCHEDHORZ 16
@@ -318,6 +319,7 @@
#define SS_NOPREFIX 128
#define SS_NOTIFY 256
#define SS_OWNERDRAW 0xd
+#define SS_REALSIZECONTROL 0x040
#define SS_REALSIZEIMAGE 0x800
#define SS_RIGHT 2
#define SS_RIGHTJUST 0x400
More information about the Ros-diffs
mailing list