github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-02 11:10:47 +08:00
Code Projects Activity

More syscall fixes (#3713)

Browse Source 
* More syscall fixes

* Update changelog.mdx
This commit is contained in:
Lea Anthony 2024-09-02 19:34:22 +10:00 committed by GitHub
parent d218384396
commit 3721d73423
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 20 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
v2/internal/frontend/desktop/windows/winc/w32/user32.go
View File

@ -639,7 +639,7 @@ func GetSysColorBrush(nIndex int) HBRUSH {
return HBRUSH(ret) return HBRUSH(ret)
*/ */
ret, _, _ := syscall.Syscall(getSysColorBrush, 1, ret, _, _ := syscall.SyscallN(getSysColorBrush,
uintptr(nIndex), uintptr(nIndex),
0, 0,
0) 0)
@ -792,11 +792,9 @@ func CreateMenu() HMENU {
} }
func SetMenu(hWnd HWND, hMenu HMENU) bool { func SetMenu(hWnd HWND, hMenu HMENU) bool {
ret, _, _ := syscall.Syscall(setMenu, 2, ret, _, _ := syscall.SyscallN(setMenu,
uintptr(hWnd), uintptr(hWnd),
uintptr(hMenu), uintptr(hMenu))
0)
return ret != 0 return ret != 0
} }
@ -834,11 +832,7 @@ func TrackPopupMenuEx(hMenu HMENU, fuFlags uint32, x, y int32, hWnd HWND, lptpm
} }
func DrawMenuBar(hWnd HWND) bool { func DrawMenuBar(hWnd HWND) bool {
ret, _, _ := syscall.Syscall(drawMenuBar, 1, ret, _, _ := syscall.SyscallN(drawMenuBar, hWnd)
uintptr(hWnd),
0,
0)
return ret != 0 return ret != 0
} }
@ -1231,11 +1225,8 @@ func CallNextHookEx(hhk HHOOK, nCode int, wParam WPARAM, lParam LPARAM) LRESULT
} }
func GetKeyState(nVirtKey int32) int16 { func GetKeyState(nVirtKey int32) int16 {
ret, _, _ := syscall.Syscall(getKeyState, 1, ret, _, _ := syscall.SyscallN(getKeyState,
uintptr(nVirtKey), uintptr(nVirtKey))
0,
0)
return int16(ret) return int16(ret)
} }
@ -1249,17 +1240,15 @@ func DestroyMenu(hMenu HMENU) bool {
} }
func GetWindowPlacement(hWnd HWND, lpwndpl *WINDOWPLACEMENT) bool { func GetWindowPlacement(hWnd HWND, lpwndpl *WINDOWPLACEMENT) bool {
ret, _, _ := syscall.Syscall(getWindowPlacement, 2, ret, _, _ := syscall.SyscallN(getWindowPlacement,
uintptr(hWnd), hWnd,
uintptr(unsafe.Pointer(lpwndpl)), uintptr(unsafe.Pointer(lpwndpl)))
0)
return ret != 0 return ret != 0
} }
func SetWindowPlacement(hWnd HWND, lpwndpl *WINDOWPLACEMENT) bool { func SetWindowPlacement(hWnd HWND, lpwndpl *WINDOWPLACEMENT) bool {
ret, _, _ := syscall.Syscall(setWindowPlacement, 2, ret, _, _ := syscall.SyscallN(setWindowPlacement,
uintptr(hWnd), hWnd,
uintptr(unsafe.Pointer(lpwndpl)), uintptr(unsafe.Pointer(lpwndpl)),
0) 0)
@ -1279,7 +1268,7 @@ func SetScrollInfo(hwnd HWND, fnBar int32, lpsi *SCROLLINFO, fRedraw bool) int32
} }
func GetScrollInfo(hwnd HWND, fnBar int32, lpsi *SCROLLINFO) bool { func GetScrollInfo(hwnd HWND, fnBar int32, lpsi *SCROLLINFO) bool {
ret, _, _ := syscall.Syscall(getScrollInfo, 3, ret, _, _ := syscall.SyscallN(getScrollInfo,
hwnd, hwnd,
uintptr(fnBar), uintptr(fnBar),
uintptr(unsafe.Pointer(lpsi))) uintptr(unsafe.Pointer(lpsi)))

6
v2/internal/frontend/desktop/windows/winc/w32/utils.go
View File

@ -75,7 +75,7 @@ func UTF16PtrToString(cstr *uint16) string {
} }
func ComAddRef(unknown *IUnknown) int32 { func ComAddRef(unknown *IUnknown) int32 {
ret, _, _ := syscall.Syscall(unknown.lpVtbl.pAddRef, 1, ret, _, _ := syscall.SyscallN(unknown.lpVtbl.pAddRef,
uintptr(unsafe.Pointer(unknown)), uintptr(unsafe.Pointer(unknown)),
0, 0,
0) 0)
@ -83,7 +83,7 @@ func ComAddRef(unknown *IUnknown) int32 {
} }
func ComRelease(unknown *IUnknown) int32 { func ComRelease(unknown *IUnknown) int32 {
ret, _, _ := syscall.Syscall(unknown.lpVtbl.pRelease, 1, ret, _, _ := syscall.SyscallN(unknown.lpVtbl.pRelease,
uintptr(unsafe.Pointer(unknown)), uintptr(unsafe.Pointer(unknown)),
0, 0,
0) 0)
@ -92,7 +92,7 @@ func ComRelease(unknown *IUnknown) int32 {
func ComQueryInterface(unknown *IUnknown, id *GUID) *IDispatch { func ComQueryInterface(unknown *IUnknown, id *GUID) *IDispatch {
var disp *IDispatch var disp *IDispatch
hr, _, _ := syscall.Syscall(unknown.lpVtbl.pQueryInterface, 3, hr, _, _ := syscall.SyscallN(unknown.lpVtbl.pQueryInterface,
uintptr(unsafe.Pointer(unknown)), uintptr(unsafe.Pointer(unknown)),
uintptr(unsafe.Pointer(id)), uintptr(unsafe.Pointer(id)),
uintptr(unsafe.Pointer(&disp))) uintptr(unsafe.Pointer(&disp)))

6
v2/internal/frontend/desktop/windows/winc/w32/uxtheme.go
View File

@ -83,7 +83,7 @@ func init() {
} }
func CloseThemeData(hTheme HTHEME) HRESULT { func CloseThemeData(hTheme HTHEME) HRESULT {
ret, _, _ := syscall.Syscall(closeThemeData, 1, ret, _, _ := syscall.SyscallN(closeThemeData,
uintptr(hTheme), uintptr(hTheme),
0, 0,
0) 0)
@ -134,7 +134,7 @@ func GetThemeTextExtent(hTheme HTHEME, hdc HDC, iPartId, iStateId int32, pszText
} }
func OpenThemeData(hwnd HWND, pszClassList *uint16) HTHEME { func OpenThemeData(hwnd HWND, pszClassList *uint16) HTHEME {
ret, _, _ := syscall.Syscall(openThemeData, 2, ret, _, _ := syscall.SyscallN(openThemeData,
uintptr(hwnd), uintptr(hwnd),
uintptr(unsafe.Pointer(pszClassList)), uintptr(unsafe.Pointer(pszClassList)),
0) 0)
@ -143,7 +143,7 @@ func OpenThemeData(hwnd HWND, pszClassList *uint16) HTHEME {
} }
func SetWindowTheme(hwnd HWND, pszSubAppName, pszSubIdList *uint16) HRESULT { func SetWindowTheme(hwnd HWND, pszSubAppName, pszSubIdList *uint16) HRESULT {
ret, _, _ := syscall.Syscall(setWindowTheme, 3, ret, _, _ := syscall.SyscallN(setWindowTheme,
uintptr(hwnd), uintptr(hwnd),
uintptr(unsafe.Pointer(pszSubAppName)), uintptr(unsafe.Pointer(pszSubAppName)),
uintptr(unsafe.Pointer(pszSubIdList))) uintptr(unsafe.Pointer(pszSubIdList)))

3
v2/internal/go-common-file-dialog/cfd/iFileOpenDialog.go
View File

@ -164,8 +164,7 @@ func (fileOpenDialog *iFileOpenDialog) setIsMultiselect(isMultiselect bool) erro
func (vtbl *iFileOpenDialogVtbl) getResults(objPtr unsafe.Pointer) (*iShellItemArray, error) { func (vtbl *iFileOpenDialogVtbl) getResults(objPtr unsafe.Pointer) (*iShellItemArray, error) {
var shellItemArray *iShellItemArray var shellItemArray *iShellItemArray
ret, _, _ := syscall.Syscall(vtbl.GetResults, ret, _, _ := syscall.SyscallN(vtbl.GetResults,
1,
uintptr(objPtr), uintptr(objPtr),
uintptr(unsafe.Pointer(&shellItemArray)), uintptr(unsafe.Pointer(&shellItemArray)),
0) 0)

1
website/src/pages/changelog.mdx
View File

@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fixed typos in various .mdx files. [PR #3628](https://github.com/wailsapp/wails/pull/3628) by [@deining](https://github.com/deining) - Fixed typos in various .mdx files. [PR #3628](https://github.com/wailsapp/wails/pull/3628) by [@deining](https://github.com/deining)
- Fixed `notifyListeners()` race condition when terminated mid-emission [PR](https://github.com/wailsapp/wails/pull/3695) by [@mrf345](https://github.com/mrf345) - Fixed `notifyListeners()` race condition when terminated mid-emission [PR](https://github.com/wailsapp/wails/pull/3695) by [@mrf345](https://github.com/mrf345)
- Fixed dialogs in Windows when using Go 1.23 in [PR](https://github.com/wailsapp/wails/pull/3707) by [@leaanthony](https://github.com/leaanthony) - Fixed dialogs in Windows when using Go 1.23 in [PR](https://github.com/wailsapp/wails/pull/3707) by [@leaanthony](https://github.com/leaanthony)
- More syscall fixes for Go 1.23 support in [PR](https://github.com/wailsapp/wails/pull/3713) by [@leaanthony](https://github.com/leaanthony)
- Fixed drag and drop missing cursor icon [PR](https://github.com/wailsapp/wails/pull/3703) by [@mrf345](https://github.com/mrf345) - Fixed drag and drop missing cursor icon [PR](https://github.com/wailsapp/wails/pull/3703) by [@mrf345](https://github.com/mrf345)
### Changed ### Changed