Changeset 5416 for trunk/src/comctl32/datetime.c

Timestamp:

Mar 31, 2001, 3:25:59 PM (24 years ago)

Author:

sandervl

Message:

Resync with Wine + previous merge fixes

File:

• trunk/src/comctl32/datetime.c (modified) (6 diffs)

trunk/src/comctl32/datetime.c

@@ -19 +19 @@
 #include "winbase.h"
 #include "wingdi.h"
-#include "wine/winestring.h"
 #include "commctrl.h"
 #include "debugtools.h"
 
+#ifdef __WIN32OS2__
+#include "ccbase.h"
+#define inline
+#endif
+
 DEFAULT_DEBUG_CHANNEL(datetime);
 
 typedef struct
 {
+#ifdef __WIN32OS2__
+        COMCTL32_HEADER header;
+#endif
         HWND hMonthCal;
         HWND hUpdown;
@@ -308 +315 @@
         LPSTR buf;
         int retval;
-        int len = lstrlenW ((LPWSTR) lParam)+1;
+        int len = WideCharToMultiByte( CP_ACP, 0, (LPWSTR)lParam, -1, NULL, 0, NULL, NULL );
 
         buf = (LPSTR) COMCTL32_Alloc (len);
-        lstrcpyWtoA (buf, (LPWSTR) lParam);
+        WideCharToMultiByte( CP_ACP, 0, (LPWSTR)lParam, -1, buf, len, NULL, NULL );
         retval=DATETIME_SetFormat (hwnd, 0, (LPARAM) buf);
         COMCTL32_Free (buf);
@@ -1112 +1119 @@
   /* allocate memory for info structure */
   TRACE("%04x %08lx\n",wParam,lParam);
+#ifdef __WIN32OS2__
+  infoPtr = (DATETIME_INFO*)initControl(hwnd,sizeof(DATETIME_INFO));
+#else
   infoPtr = (DATETIME_INFO *)COMCTL32_Alloc (sizeof(DATETIME_INFO));
+#endif
   if (infoPtr == NULL) {
     ERR("could not allocate info memory!\n");
@@ -1166 +1177 @@
     TRACE("\n");
     COMCTL32_Free (infoPtr);
+    SetWindowLongA( hwnd, 0, 0 );
     return 0;
 }
@@ -1173 +1185 @@
 DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
+    if (!DATETIME_GetInfoPtr(hwnd) && (uMsg != WM_CREATE))
+        return DefWindowProcA( hwnd, uMsg, wParam, lParam );
+    
     switch (uMsg)
     {
@@ -1252 +1267 @@
                      uMsg, wParam, lParam);
 #ifdef __WIN32OS2__
-            return defComCtl32ProcA (hwnd, uMsg, wParam, lParam);
+        return defComCtl32ProcA (hwnd, uMsg, wParam, lParam);
 #else
         return DefWindowProcA (hwnd, uMsg, wParam, lParam);