[pywin32-checkins] pywin32/win32/src stddde.h,1.1,1.2

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/win32/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22575/win32/src

Modified Files:
	stddde.h 
Log Message:
More TCHAR fixes from py3k branch for dde support

Index: stddde.h
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/stddde.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** stddde.h	2 Sep 1999 00:19:37 -0000	1.1
--- stddde.h	13 Nov 2008 09:48:01 -0000	1.2
***************
*** 71,77 ****
  public:
      CHSZ();
!     CHSZ(CDDEServer* pServer, const char* szName);
      virtual ~CHSZ();
!     void Create(CDDEServer* pServer, const char* szName);
  	void Destroy();
      operator HSZ() {return m_hsz;}
--- 71,77 ----
  public:
      CHSZ();
!     CHSZ(CDDEServer* pServer, const TCHAR* szName);
      virtual ~CHSZ();
!     void Create(CDDEServer* pServer, const TCHAR* szName);
  	void Destroy();
      operator HSZ() {return m_hsz;}
***************
*** 95,104 ****
      CDDEItem();
      virtual ~CDDEItem();
!     void Create(const char* pszName);
      void PostAdvise();
      virtual BOOL Request(UINT wFmt, void** ppData, DWORD* pdwSize);
  //CT BEGIN
! 	virtual BOOL NSRequest(const char* szItem, void** ppData, DWORD* pdwSize);
! 	virtual BOOL NSPoke(const char* szItem, void* pData, DWORD dwSize);
  	virtual BOOL Poke(void* pData, DWORD dwSize);
  //CT END
--- 95,104 ----
      CDDEItem();
      virtual ~CDDEItem();
!     void Create(const TCHAR* pszName);
      void PostAdvise();
      virtual BOOL Request(UINT wFmt, void** ppData, DWORD* pdwSize);
  //CT BEGIN
! 	virtual BOOL NSRequest(const TCHAR* szItem, void** ppData, DWORD* pdwSize);
! 	virtual BOOL NSPoke(const TCHAR* szItem, void* pData, DWORD dwSize);
  	virtual BOOL Poke(void* pData, DWORD dwSize);
  //CT END
***************
*** 124,132 ****
  public:
      virtual void OnPoke(){;}
!     virtual void SetData(const char* pszData);
!     virtual const char* GetData()
!         {return (const char*)m_strData;}
!     operator const char*()
!         {return (const char*)m_strData;}
  
  protected:
--- 124,132 ----
  public:
      virtual void OnPoke(){;}
!     virtual void SetData(const TCHAR* pszData);
!     virtual const TCHAR* GetData()
!         {return (const TCHAR*)m_strData;}
!     operator const TCHAR*()
!         {return (const TCHAR*)m_strData;}
  
  protected:
***************
*** 165,183 ****
      CDDETopic();
      virtual ~CDDETopic();
!     void Create(const char* pszName);
      BOOL AddItem(CDDEItem* pItem);
!     virtual BOOL Request(UINT wFmt, const char* pszItem,
                           void** ppData, DWORD* pdwSize);
  //CT BEGIN
! 	virtual BOOL NSRequest(const char * szItem, void** ppData, DWORD* pdwSize);
! 	virtual BOOL NSPoke(const char * szItem, void* pData, DWORD dwSize);
!     virtual BOOL Poke(const char* pszItem,
                        void* pData, DWORD dwSize);
  //CT END
!     virtual BOOL Poke(UINT wFmt, const char* pszItem,
                        void* pData, DWORD dwSize);
      virtual BOOL Exec(void* pData, DWORD dwSize);
!     virtual CDDEItem* FindItem(const char* pszItem);
!     virtual BOOL CanAdvise(UINT wFmt, const char* pszItem);
      void PostAdvise(CDDEItem* pItem);
  
--- 165,183 ----
      CDDETopic();
      virtual ~CDDETopic();
!     void Create(const TCHAR* pszName);
      BOOL AddItem(CDDEItem* pItem);
!     virtual BOOL Request(UINT wFmt, const TCHAR* pszItem,
                           void** ppData, DWORD* pdwSize);
  //CT BEGIN
! 	virtual BOOL NSRequest(const TCHAR * szItem, void** ppData, DWORD* pdwSize);
! 	virtual BOOL NSPoke(const TCHAR * szItem, void* pData, DWORD dwSize);
!     virtual BOOL Poke(const TCHAR* pszItem,
                        void* pData, DWORD dwSize);
  //CT END
!     virtual BOOL Poke(UINT wFmt, const TCHAR* pszItem,
                        void* pData, DWORD dwSize);
      virtual BOOL Exec(void* pData, DWORD dwSize);
!     virtual CDDEItem* FindItem(const TCHAR* pszItem);
!     virtual BOOL CanAdvise(UINT wFmt, const TCHAR* pszItem);
      void PostAdvise(CDDEItem* pItem);
  
***************
*** 219,232 ****
  	BOOL Connected() {return (m_hConv != NULL);}
      virtual ~CDDEConv();
!     virtual BOOL ConnectTo(const char* pszService, const char* pszTopic);
      virtual BOOL Terminate();
!     virtual BOOL AdviseData(UINT wFmt, const char* pszTopic, const char* pszItem,
                              void* pData, DWORD dwSize);
!     virtual BOOL Request(const char* pszItem, void** ppData, DWORD* pdwSize);
!     virtual BOOL Advise(const char* pszItem);
!     virtual BOOL Exec(const char* pszCmd);
!     virtual BOOL Poke(UINT wFmt, const char* pszItem, void* pData, DWORD dwSize);
  //CT BEGIN
!     virtual BOOL Poke(const char* pszItem, void* pData, DWORD dwSize);
  //CT END
      CDDEServer* m_pServer;
--- 219,232 ----
  	BOOL Connected() {return (m_hConv != NULL);}
      virtual ~CDDEConv();
!     virtual BOOL ConnectTo(const TCHAR* pszService, const TCHAR* pszTopic);
      virtual BOOL Terminate();
!     virtual BOOL AdviseData(UINT wFmt, const TCHAR* pszTopic, const TCHAR* pszItem,
                              void* pData, DWORD dwSize);
!     virtual BOOL Request(const TCHAR* pszItem, void** ppData, DWORD* pdwSize);
!     virtual BOOL Advise(const TCHAR* pszItem);
!     virtual BOOL Exec(const TCHAR* pszCmd);
!     virtual BOOL Poke(UINT wFmt, const TCHAR* pszItem, void* pData, DWORD dwSize);
  //CT BEGIN
!     virtual BOOL Poke(const TCHAR* pszItem, void* pData, DWORD dwSize);
  //CT END
      CDDEServer* m_pServer;
***************
*** 290,294 ****
      DECLARE_DYNCREATE(CDDEServerSystemTopic);
  protected:
!     virtual BOOL Request(UINT wFmt, const char* pszItem,
                           void** ppData, DWORD* pdwSize);
  
--- 290,294 ----
      DECLARE_DYNCREATE(CDDEServerSystemTopic);
  protected:
!     virtual BOOL Request(UINT wFmt, const TCHAR* pszItem,
                           void** ppData, DWORD* pdwSize);
  
***************
*** 308,312 ****
      CDDEServer();
      virtual ~CDDEServer();
!     BOOL Create(const char* pszServiceName,
                  DWORD dwFilterFlags = 0,
                  DWORD* pdwDDEInst = NULL);
--- 308,312 ----
      CDDEServer();
      virtual ~CDDEServer();
!     BOOL Create(const TCHAR* pszServiceName,
                  DWORD dwFilterFlags = 0,
                  DWORD* pdwDDEInst = NULL);
***************
*** 326,340 ****
          {return NULL;}
  
!     virtual BOOL Request(UINT wFmt, const char* pszTopic, const char* pszItem,
                           void** ppData, DWORD* pdwSize);
!     virtual BOOL Poke(UINT wFmt, const char* pszTopic, const char* pszItem,
                        void* pData, DWORD dwSize);
!     virtual BOOL AdviseData(UINT wFmt, HCONV hConv, const char* pszTopic, const char* pszItem,
                        void* pData, DWORD dwSize);
!     virtual BOOL Exec(const char* pszTopic, void* pData, DWORD dwSize);
!     virtual void Status(const char* pszFormat, ...) {;}
      virtual BOOL AddTopic(CDDETopic* pTopic);
      CString StringFromHsz(HSZ hsz);
!     virtual BOOL CanAdvise(UINT wFmt, const char* pszTopic, const char* pszItem);
      void PostAdvise(CDDETopic* pTopic, CDDEItem* pItem);
      CDDEConv*  AddConversation(HCONV hConv, HSZ hszTopic);
--- 326,340 ----
          {return NULL;}
  
!     virtual BOOL Request(UINT wFmt, const TCHAR* pszTopic, const TCHAR* pszItem,
                           void** ppData, DWORD* pdwSize);
!     virtual BOOL Poke(UINT wFmt, const TCHAR* pszTopic, const TCHAR* pszItem,
                        void* pData, DWORD dwSize);
!     virtual BOOL AdviseData(UINT wFmt, HCONV hConv, const TCHAR* pszTopic, const TCHAR* pszItem,
                        void* pData, DWORD dwSize);
!     virtual BOOL Exec(const TCHAR* pszTopic, void* pData, DWORD dwSize);
!     virtual void Status(const TCHAR* pszFormat, ...) {;}
      virtual BOOL AddTopic(CDDETopic* pTopic);
      CString StringFromHsz(HSZ hsz);
!     virtual BOOL CanAdvise(UINT wFmt, const TCHAR* pszTopic, const TCHAR* pszItem);
      void PostAdvise(CDDETopic* pTopic, CDDEItem* pItem);
      CDDEConv*  AddConversation(HCONV hConv, HSZ hszTopic);
***************
*** 360,364 ****
                  HDDEDATA hData,
                  HDDEDATA *phReturnData);
!     CDDETopic* FindTopic(const char* pszTopic);
  
  private:
--- 360,364 ----
                  HDDEDATA hData,
                  HDDEDATA *phReturnData);
!     CDDETopic* FindTopic(const TCHAR* pszTopic);
  
  private:
***************
*** 407,410 ****
--- 407,415 ----
  };          
  
+ #ifdef UNICODE
+ #define DDE_STRING_CODEPAGE CP_WINUNICODE
+ #else
+ #define DDE_STRING_CODEPAGE CP_WINANSI
+ #endif
  
  #endif // _STDDDE_