From 93bcd5b07de35fe16f990b35864dc935b67b84ea Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 27 六月 2024 16:53:50 +0800
Subject: [PATCH] update modifyMerge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/xframe/win32/win.hpp | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/jrj/xframe/win32/win.hpp b/jrj/xframe/win32/win.hpp
index 1d2439a..1fca858 100644
--- a/jrj/xframe/win32/win.hpp
+++ b/jrj/xframe/win32/win.hpp
@@ -29,11 +29,6 @@
#define WINAPI __stdcall
-#define SendMessage SendMessageW
-#define PostMessage PostMessageW
-#define GetWindowLong GetWindowLongW
-#define SetWindowLong SetWindowLongW
-
extern "C"
{
void WINAPI SysFreeString(BSTR str);//OleAut32.dll
@@ -110,9 +105,20 @@
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";
+ int WINAPI GetModuleFileNameW(int 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(xstring 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
#if 0
namespace win32
@@ -192,5 +198,6 @@
int 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