Changeset 137 for Include/basic

Timestamp:

Mar 7, 2007, 5:36:31 PM (18 years ago)

Author:

イグトランス (egtra)

Message:

#55と#73と#75とりあえず完了

Location:

Include/basic

Files:

• function.sbp (modified) (2 diffs)
• prompt.sbp (modified) (4 diffs)

Include/basic/function.sbp

@@ -1117 +1117 @@
 Function _System_WideCharToMultiByte(ws As PCWSTR, size As Long, flag As DWord) As PSTR
     Dim sizeMBS = WideCharToMultiByte(CP_THREAD_ACP, flag, s, size, 0, 0, 0, 0)
-    Dim mbs = malloc(sizeMBS) As PSTR
+    Dim mbs = _System_malloc(sizeMBS) As PSTR
     WideCharToMultiByte(CP_THREAD_ACP, flag, s, size, mbs, sizeMBS, 0, 0)
     Return mbs
@@ -1132 +1132 @@
 Function _System_MultiByteToWideChar(s As PCSTR, size As Long, flag As DWord) As PWSTR
     Dim sizeMBS = MultiByteToWideChar(CP_THREAD_ACP, flag, s, size, 0, 0)
-    Dim mbs = malloc(SizeOf (WCHAR) * sizeMBS) As PWSTR
+    Dim mbs = _System_malloc(SizeOf (WCHAR) * sizeMBS) As PWSTR
     MultiByteToWideChar(CP_THREAD_ACP, flag, s, size, mbs, sizeMBS)
     Return mbs

Include/basic/prompt.sbp

@@ -26 +26 @@
 End Type
 
-Dim _PromptSys_LogFont As LOGFONTA 'LOGFONT
+Dim _PromptSys_LogFont As LOGFONT
 Dim _PromptSys_hFont As HFONT
 Dim _PromptSys_FontSize As SIZE
@@ -257 +257 @@
             End With
             ImmSetCompositionWindow(himc, CompForm)
-            ImmSetCompositionFontA(himc, _PromptSys_LogFont)
+            ImmSetCompositionFont(himc, _PromptSys_LogFont)
         End If
         ImmReleaseContext(hwnd, himc)
@@ -407 +407 @@
         .lfQuality = DEFAULT_QUALITY
         .lfPitchAndFamily = FIXED_PITCH
-#ifdef UNICODE
-        WideCharToMultiByte(CP_ACP, 0, "ＭＳ 明朝", 5, .lfFaceName, LF_FACESIZE, 0, 0)
-#else
         lstrcpy(.lfFaceName, "ＭＳ 明朝")
-#endif
-    End With
-
-    _PromptSys_hFont = CreateFontIndirectA(_PromptSys_LogFont)
+    End With
+
+    _PromptSys_hFont = CreateFontIndirect(_PromptSys_LogFont)
 
     'Critical Section
@@ -436 +432 @@
 
     'Create Prompt Window
-    _PromptSys_hWnd = CreateWindowEx(WS_EX_CLIENTEDGE, atom As ULONG_PTR As PCSTR, "BASIC PROMPT",
+    _PromptSys_hWnd = CreateWindowEx(WS_EX_CLIENTEDGE, atom As ULONG_PTR As PCTSTR, "BASIC PROMPT",
         WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
         0, 0, wcl.hInstance, 0)