Changeset 119 for Include/api_gdi.sbp

Timestamp:

Feb 23, 2007, 11:00:24 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

Unicode (#50) 前準備
Byte→Char (#51) 型名は殆ど完了、ただし中身までは手を付けていないものが多い

File:

• Include/api_gdi.sbp (modified) (3 diffs)

Include/api_gdi.sbp

@@ -484 +484 @@
     lfFaceName[ELM(LF_FACESIZE)] As WCHAR
 End Type
+#ifdef UNICODE
+TypeDef LOGFONT = LOGFONTW
+#else
 TypeDef LOGFONT = LOGFONTA
+#endif
 Declare Function CreateFontIndirect Lib "gdi32" Alias "CreateFontIndirectA" (ByRef lplf As LOGFONT) As HFONT
 
@@ -730 +734 @@
 
 Declare Function GetTextColor Lib "gdi32" (hdc As HDC) As DWord
-Declare Function GetTextExtentPoint32 Lib "gdi32" Alias "GetTextExtentPoint32A" (hdc As HDC, lpString As BytePtr, cbString As Long, ByRef lpSize As SIZE) As Long
+Declare Function GetTextExtentPoint32A Lib "gdi32" (hdc As HDC, pString As PCSTR, cbString As Long, ByRef Size As SIZE) As Long
+Declare Function GetTextExtentPoint32W Lib "gdi32" (hdc As HDC, pString As PCWSTR, cbString As Long, ByRef Size As SIZE) As Long
+#ifdef UNICODE
+Declare Function GetTextExtentPoint32 Lib "gdi32" Alias "GetTextExtentPoint32W" (hdc As HDC, pString As PCTSTR, cbString As Long, ByRef Size As SIZE) As Long
+#else
+Declare Function GetTextExtentPoint32 Lib "gdi32" Alias "GetTextExtentPoint32A" (hdc As HDC, pString As PCTSTR, cbString As Long, ByRef Size As SIZE) As Long
+#endif
 
 Const TMPF_FIXED_PITCH = &H01
@@ -836 +846 @@
 Declare Function StrokeAndFillPath Lib "gdi32" (hdc As HDC) As Long
 Declare Function StrokePath Lib "gdi32" (DC As DWord) As Long
-Declare Function TextOut Lib "gdi32" Alias "TextOutA" (hdc As HDC, nXStart As Long, nYStart As Long, lpString As BytePtr, cbString As Long) As Long
-
+Declare Function TextOutA Lib "gdi32" (hdc As HDC, nXStart As Long, nYStart As Long, pString As PCSTR, cbString As Long) As Long
+Declare Function TextOutW Lib "gdi32" (hdc As HDC, nXStart As Long, nYStart As Long, pString As PCWSTR, cbString As Long) As Long
+#ifdef UNICODE
+Declare Function TextOut Lib "gdi32" Alias "TextOutW" (hdc As HDC, nXStart As Long, nYStart As Long, pString As PCTSTR, cbString As Long) As Long
+#else
+Declare Function TextOut Lib "gdi32" Alias "TextOutA" (hdc As HDC, nXStart As Long, nYStart As Long, pString As PCTSTR, cbString As Long) As Long
+#endif
 
 /* Pixel Format */