From ebdf2bdb88da4f78a0b59c9e660deb62562a5731 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期一, 01 七月 2024 15:48:59 +0800
Subject: [PATCH] update
---
jrj/xframe/win32/win.hpp | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/jrj/xframe/win32/win.hpp b/jrj/xframe/win32/win.hpp
index 1d2439a..46f784c 100644
--- a/jrj/xframe/win32/win.hpp
+++ b/jrj/xframe/win32/win.hpp
@@ -2,6 +2,7 @@
#include "system/base.hpp"
+#ifdef _XWIN
typedef struct _GUID {
unsigned long Data1;
unsigned short Data2;
@@ -29,17 +30,12 @@
#define WINAPI __stdcall
-#define SendMessage SendMessageW
-#define PostMessage PostMessageW
-#define GetWindowLong GetWindowLongW
-#define SetWindowLong SetWindowLongW
-
extern "C"
{
void WINAPI SysFreeString(BSTR str);//OleAut32.dll
- void * WINAPI LoadLibraryW(const wchar_t* lpText);
+ HMODULE WINAPI LoadLibraryW(const wchar_t* lpText);
bool WINAPI FreeLibrary(void * hModule);
- void * WINAPI GetProcAddressW(void* hModule, const char* lpText);
+ void * WINAPI GetProcAddressW(HMODULE hModule, const char* lpText);
LPARAM WINAPI GetPropW(HWND hWnd,string lpString);
@@ -65,8 +61,8 @@
bool WINAPI AnimateWindow(HWND hWnd,int dwTime,int dwFlags) ;//native from "user32.dll" alias "AnimateWindow";
int WINAPI GetKeyState(int nVirtKey) ;//native from "user32.dll" alias "GetKeyState";
- int WINAPI SetWindowLong(HWND hWnd, int nIndex, int dwNewLong) ;//native from "user32.dll" alias "SetWindowLongW";
- LPARAM WINAPI GetWindowLong(HWND hWnd, int nIndex) ;//native from "user32.dll" alias "GetWindowLongW";
+ int WINAPI SetWindowLongW(HWND hWnd, int nIndex, int dwNewLong) ;//native from "user32.dll" alias "SetWindowLongW";
+ LPARAM WINAPI GetWindowLongW(HWND hWnd, int nIndex) ;//native from "user32.dll" alias "GetWindowLongW";
int WINAPI GetClientRect(HWND hWnd, xrect & lpRect) ;//native from "user32.dll" alias "GetClientRect";
int WINAPI GetWindowRect(HWND hWnd, xrect & lpRect) ;//native from "user32.dll" alias "GetWindowRect";
int WINAPI MoveWindow(HWND hWnd, int X, int Y, int nWidth, int nHeight, bool bRepaint) ;//native from "user32.dll" alias "MoveWindow";
@@ -109,10 +105,22 @@
HWND WINAPI FindWindowW(string lpClassName, string lpWindowName);//native from "user32.dll" alias "FindWindowW";
int WINAPI GetTempPathW(int NAME_LEN,string & OutPath) ;//native from "kernel32.dll" alias "GetTempPathW";
- int WINAPI GetModuleHandleW(string lpModuleName) ;//native from "kernel32.dll" alias "GetModuleHandleW";
- int WINAPI GetModuleFileName(int hModule ,string & lpFileName ,int nSize ) ;//native from "kernel32.dll" alias "GetModuleFileName";
+ HMODULE WINAPI GetModuleHandleW(string lpModuleName) ;//native from "kernel32.dll" alias "GetModuleHandleW";
+ int WINAPI GetModuleFileNameW(HMODULE hModule ,string lpFileName, int nSize);//native from "kernel32.dll" alias "GetModuleFileNameW";
void WINAPI GetLocalTime(SYSTEMTIME& lpSystemTime) ;//native from "kernel32.dll" alias "GetLocalTime";
+ int WINAPI PathRemoveFileSpecW(string lpFileName);// native from "shlwapi.dll" alias "PathRemoveFileSpecW";
+
}
+#define SendMessage SendMessageW
+#define PostMessage PostMessageW
+#define GetWindowLong GetWindowLongW
+#define SetWindowLong SetWindowLongW
+#define MessageBox MessageBoxW
+#define GetModuleFileName GetModuleFileNameW
+#define PathRemoveFileSpec PathRemoveFileSpecW
+#define SetWindowText SetWindowTextW
+#define GetWindowText GetWindowTextW
+#endif
#if 0
namespace win32
@@ -189,8 +197,9 @@
HWND FindWindowW(string lpClassName, string lpWindowName);//native from "user32.dll" alias "FindWindowW";
int GetTempPathW(int NAME_LEN,string & OutPath) ;//native from "kernel32.dll" alias "GetTempPathW";
- int GetModuleHandleW(string lpModuleName) ;//native from "kernel32.dll" alias "GetModuleHandleW";
+ HMODULE GetModuleHandleW(string lpModuleName) ;//native from "kernel32.dll" alias "GetModuleHandleW";
int GetModuleFileName(int hModule ,string & lpFileName ,int nSize ) ;//native from "kernel32.dll" alias "GetModuleFileName";
void GetLocalTime(SYSTEMTIME& lpSystemTime) ;//native from "kernel32.dll" alias "GetLocalTime";
+
}
#endif
\ No newline at end of file
--
Gitblit v1.9.3