Changeset 272 for Include/windows

Timestamp:

Jun 12, 2007, 7:24:38 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

StringBuilderを追加。String不変へ。共通の文字列操作関数をActiveBasic.Strings内に配置（設計に検討の余地あり）。

File:

• Include/windows/WindowHandle.sbp (modified) (8 diffs)

Include/windows/WindowHandle.sbp

@@ -5 +5 @@
 
 #ifdef _WIN64
+Declare Function _System_GetClassLongPtr Lib "user32" Alias _FuncName_GetClassLongPtr (hWnd As HWND, nIndex As Long) As LONG_PTR
+Declare Function _System_SetClassLongPtr Lib "user32" Alias _FuncName_SetClassLongPtr (hWnd As HWND, nIndex As Long, l As LONG_PTR) As LONG_PTR
 Declare Function _System_GetWindowLongPtr Lib "user32" Alias _FuncName_GetWindowLongPtr (hWnd As HWND, nIndex As Long) As LONG_PTR
 Declare Function _System_SetWindowLongPtr Lib "user32" Alias _FuncName_SetWindowLongPtr (hWnd As HWND, nIndex As Long, l As LONG_PTR) As LONG_PTR
 #else
+Declare Function _System_GetClassLongPtr Lib "user32" Alias _FuncName_GetClassLong (hWnd As HWND, nIndex As Long) As LONG_PTR
+Declare Function _System_SetClassLongPtr Lib "user32" Alias _FuncName_SetClassLong (hWnd As HWND, nIndex As Long, l As LONG_PTR) As LONG_PTR
 Declare Function _System_GetWindowLongPtr Lib "user32" Alias _FuncName_GetWindowLong (hWnd As HWND, nIndex As Long) As LONG_PTR
 Declare Function _System_SetWindowLongPtr Lib "user32" Alias _FuncName_SetWindowLong (hWnd As HWND, nIndex As Long, l As LONG_PTR) As LONG_PTR
@@ -31 +35 @@
 Declare Function _System_Isiconic Lib "user32" Alias "Isiconic" (hWnd As HWND) As BOOL
 Declare Function _System_GetClientRect Lib "user32" Alias "GetClientRect" (hWnd As HWND, ByRef Rect As RECT) As BOOL
+Declare Function _System_GetProp Lib "user32" Alias _FuncName_GetProp (hWnd As HWND, pString As PCTSTR) As HANDLE
+Declare Function _System_SetProp Lib "user32" Alias _FuncName_SetProp (hWnd As HWND, pString As PCTSTR, hData As HANDLE) As BOOL
+Declare Function _System_GetClassName Lib "user32" Alias _FuncName_GetClassName (hWnd As HWND, lpClassName As PTSTR, nMaxCount As Long) As Long
+Declare Function _System_GetScrollInfo Lib "user32" Alias "GetScrollInfo" (hWnd As HWND, fnBar As Long, ByRef lpsi As SCROLLINFO) As BOOL
+Declare Function _System_SetScrollInfo Lib "user32" Alias "SetScrollInfo" (hWnd As HWND, fnBar As Long, ByRef lpsi As SCROLLINFO, bRedraw As Long) As BOOL
+Declare Function _System_GetSystemMenu Lib "user32" Alias "GetSystemMenu" (hWnd As HWND, bRevert As BOOL) As HMENU
 
 Class WindowHandle
@@ -116 +126 @@
 
     Const Function GetClassLongPtr(index As Long) As LONG_PTR
-        Return GetClassLongPtr(hwnd, index)
+        Return _System_GetClassLongPtr(hwnd, index)
     End Function
 
     Const Function GetClassName(className As PTSTR, maxCount As Long) As Long
-        Return GetClassName(className, maxCount)
+        Return _System_GetClassName(className, maxCount)
     End Function
 
@@ -161 +171 @@
 
     Const Function GetProp(str As String) As HANDLE
-        Return GetProp(hwnd, ToTCStr(str))
+        Return _System_GetProp(hwnd, ToTCStr(str))
     End Function
 
     Const Function GetProp(psz As PCTSTR) As HANDLE
-        Return GetProp(hwnd, psz)
+        Return _System_GetProp(hwnd, psz)
     End Function
 
     Const Function GetProp(atom As ATOM) As HANDLE
-        Return GetProp(hwnd, atom As ULONG_PTR As PCTSTR)
+        Return _System_GetProp(hwnd, atom As ULONG_PTR As PCTSTR)
     End Function
 
     Const Function GetScrollInfo(fnBar As Long, ByRef si As SCROLLINFO) As Boolean
-        Return GetScrollInfo(hwnd, fnBar, si) As Boolean
+        Return _System_GetScrollInfo(hwnd, fnBar, si) As Boolean
     End Function
 
@@ -410 +420 @@
 
     Function SetClassLongPtr(index As Long, newLong As LONG_PTR) As LONG_PTR
-        Return SetClassLongPtr(hwnd, index, newLong)
+        Return _System_SetClassLongPtr(hwnd, index, newLong)
     End Function
 
@@ -430 +440 @@
 
     Function SetProp(str As String, hData As HANDLE) As Boolean
-        Return SetProp(hwnd, ToTCStr(str), hData) As Boolean
+        Return _System_SetProp(hwnd, ToTCStr(str), hData) As Boolean
     End Function
 
     Function SetProp(psz As PCTSTR, hData As HANDLE) As Boolean
-        Return SetProp(hwnd, psz, hData) As Boolean
+        Return _System_SetProp(hwnd, psz, hData) As Boolean
     End Function
 
     Function SetProp(atom As ATOM, hData As HANDLE) As Boolean
-        Return SetProp(atom As ULONG_PTR As PCTSTR, hData) As Boolean
+        Return SetProp((atom As ULONG_PTR) As PCTSTR, hData) As Boolean
     End Function
 
     Function SetScrollInfo(fnBar As Long, ByRef si As SCROLLINFO, redraw As Boolean) As Boolean
-        Return SetScrollInfo(hwnd, fnBar, si, redraw) As Boolean
+        Return _System_SetScrollInfo(hwnd, fnBar, si, redraw) As Boolean
     End Function
 
     Function SetScrollInfo(fnBar As Long, ByRef si As SCROLLINFO) As Boolean
-        Return SetScrollInfo(hwnd, fnBar, si, TRUE) As Boolean
+        Return _System_SetScrollInfo(hwnd, fnBar, si, TRUE) As Boolean
     End Function
 
@@ -652 +662 @@
 
     Const Function Maximized() As Boolean
-        Return IsIconic(hwnd) As Boolean
+        Return IsIconic() As Boolean
     End Function
 
@@ -727 +737 @@
     Const Function Text() As String
         Dim size = GetWindowTextLength(hwnd) + 1
-        Dim p = _System_malloc(SizeOf (TCHAR) * size) As PTSTR
+        Dim p = GC_malloc_atomic(SizeOf (TCHAR) * size) As PTSTR
         Dim length = GetWindowText(hwnd, p, size)
-        Return New String(p, length As SIZE_T)
+        Text = New String(p, length As Long)
     End Function