Changeset 19

Timestamp:

12/04/06 18:38:17 (2 years ago)

Author:

lindquist

Message:

Added new Windows functions. Improved GetTextExtentPoint?32X

Files:

• trunk/minwin/mswindows.d (modified) (4 diffs)

trunk/minwin/mswindows.d

@@ -36 +36 @@
-export int LoadStringW(HINSTANCE inst, LPWSTR id, LPWSTR buf, int siz);
-export int MessageBoxW(HWND hWnd, LPCWSTR lpText, LPCWSTR lpCaption, UINT uType);
+export int GetSystemMetrics(int nIndex);
+
-/*
-struct INITCOMMONCONTROLSEX {
@@ -488 +490 @@
-export BOOL SwapBuffers(HDC);
-
+const int SM_CXBORDER = 5;
+const int SM_CYBORDER = 5;
+const int SM_CXFIXEDFRAME = 7;
+const int SM_CYFIXEDFRAME = 8;
+const int SM_CXEDGE = 45;
+const int SM_CYEDGE= 46;
+const int SM_CXMENUCHECK = 71;
+const int SM_CYMENUCHECK = 72;
+
-//
-// these wrappers makes windows unicode look alot better and avoids excessive code duplication
@@ -529 +540 @@
-    BOOL GetTextExtentPoint32X(HDC dc, char[] str, int len, SIZE* s)
-    {
-
-
-
-
+
+
+
+
+
+
+
+
-    }
-
@@ -543 +558 @@
-    }
-}
+
+/******************************************
+ * Converts the UTF-8 string s into a null-terminated string in a Windows
+ * 8-bit character set.
+ *
+ * Params:
+ * s = UTF-8 string to convert.
+ * reslen = the number of bytes in the resulting buffer
+ *   (not including the null terminator) will be place here.
+ * codePage = is the number of the target codepage, or
+ *   0 - ANSI,
+ *   1 - OEM,
+ *   2 - Mac
+ *
+ * Authors:
+ *  yaneurao, Walter Bright, Stewart Gordon
+ */
+private import std.windows.syserror;
+char* toMBSzl(char[] s, out size_t reslen, uint codePage = 0)
+{
+    // Only need to do this if any chars have the high bit set
+    foreach (char c; s)
+    {
+        if (c >= 0x80)
+        {
+            char[] result;
+            int readLen;
+            wchar* ws = std.utf.toUTF16z(s);
+            result.length = WideCharToMultiByte(codePage, 0, ws, -1, null, 0,
+            null, null);
+
+            if (result.length)
+            {
+            readLen = WideCharToMultiByte(codePage, 0, ws, -1, result.ptr,
+                result.length, null, null);
+            }
+
+            if (!readLen || readLen != result.length)
+            {
+            throw new Exception("Couldn't convert string: " ~
+                sysErrorString(GetLastError()));
+            }
+
+            reslen = result.length ? result.length-1 : 0;
+            return result;
+        }
+    }
+    reslen = s.length;
+    return std.string.toStringz(s);
+}