paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2026-01-08 11:01:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Use PCharToPWideChar instead of StringToPWideChar in wrapper functions.

Browse Source 
* Updated dependencies in makefile.
* Fixed declaration of RegEnumValue and RegEnumValueW.

git-svn-id: trunk@6340 -
This commit is contained in:
yury 2007-02-04 19:09:48 +00:00
parent a36ce7c37b
commit 3b32e96f10
5 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtl/wince/Makefile
View File

@ -1974,7 +1974,7 @@ strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc\
$(SYSTEMUNIT)$(PPUEXT)
windows$(PPUEXT) : windows.pp $(WINDOWS_SOURCE_FILES) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -I$(WININC) windows.pp
messages$(PPUEXT): messages.pp $(WININC)/messages.inc $(SYSTEMUNIT)$(PPUEXT)
messages$(PPUEXT): messages.pp $(WININC)/messages.inc windows$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -I$(WININC) messages.pp
winsock$(PPUEXT) : winsock.pp windows$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
sockets$(PPUEXT) : sockets.pp windows$(PPUEXT) winsock$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \

2
rtl/wince/Makefile.fpc
View File

@ -114,7 +114,7 @@ strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc\
windows$(PPUEXT) : windows.pp $(WINDOWS_SOURCE_FILES) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -I$(WININC) windows.pp
messages$(PPUEXT): messages.pp $(WININC)/messages.inc $(SYSTEMUNIT)$(PPUEXT)
messages$(PPUEXT): messages.pp $(WININC)/messages.inc windows$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -I$(WININC) messages.pp
#opengl32$(PPUEXT) : opengl32.pp windows$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)

24
rtl/wince/wininc/cemiss.inc
View File

@ -41,7 +41,7 @@ function RegSetValueExA(hKey:HKEY; lpValueName:LPCSTR; Reserved:DWORD; dwType:DW
function LoadLibraryA(lpLibFileName:LPCSTR):HINST;
var ws: PWideChar;
begin
ws:=StringToPWideChar(lpLibFileName);
ws:=PCharToPWideChar(lpLibFileName);
Result:=Windows.LoadLibrary(ws);
FreeMem(ws);
end;
@ -50,8 +50,8 @@ function RegCreateKeyExA(hKey:HKEY; lpSubKey:LPCSTR; Reserved:DWORD; lpClass:LPS
var lpwsSubKey,
lpwsClass: PWideChar;
begin
lpwsSubKey:=StringToPWideChar(lpSubKey);
lpwsClass:=StringToPWideChar(lpClass);
lpwsSubKey:=PCharToPWideChar(lpSubKey);
lpwsClass:=PCharToPWideChar(lpClass);
Result:=RegCreateKeyExW(hKey,lpwsSubKey,Reserved,lpwsClass,dwOptions,samDesired,lpSecurityAttributes, hkResult,lpdwDisposition);
FreeMem(lpwsClass); FreeMem(lpwsSubKey);
end;
@ -59,7 +59,7 @@ end;
function RegDeleteKeyA(hKey:HKEY; lpSubKey:LPCSTR):LONG;
var lpwsSubKey: PWideChar;
begin
lpwsSubKey:=StringToPWideChar(lpSubKey);
lpwsSubKey:=PCharToPWideChar(lpSubKey);
Result:=RegDeleteKeyW(hKey,lpwsSubKey);
FreeMem(lpwsSubKey);
end;
@ -67,7 +67,7 @@ end;
function RegDeleteValueA(hKey:HKEY; lpValueName:LPCSTR):LONG;
var lpwsValueName: PWideChar;
begin
lpwsValueName:=StringToPWideChar(lpValueName);
lpwsValueName:=PCharToPWideChar(lpValueName);
Result:=RegDeleteValueW(hKey,lpwsValueName);
FreeMem(lpwsValueName);
end;
@ -76,8 +76,8 @@ function RegEnumKeyExA(hKey:HKEY; dwIndex:DWORD; lpName:LPSTR; var cbName:DWORD;
var lpwsName,
lpwsClass: PWideChar;
begin
lpwsName:=StringToPWideChar(lpName);
lpwsClass:=StringToPWideChar(lpClass);
lpwsName:=PCharToPWideChar(lpName);
lpwsClass:=PCharToPWideChar(lpClass);
Result:=RegEnumKeyExW(hKey, dwIndex, lpwsName, cbName, lpReserved, lpwsClass, lpcbClass, lpftLastWriteTime);
FreeMem(lpwsName); FreeMem(lpwsClass);
end;
@ -85,7 +85,7 @@ end;
function RegEnumValueA(hKey:HKEY; dwIndex:DWORD; lpValueName:LPSTR; var cbValueName: DWORD; lpReserved:LPDWORD;lpType:LPDWORD; lpData:pointer; lpcbData:LPDWORD):LONG;
var lpwsValueName: PWideChar;
begin
lpwsValueName:=StringToPWideChar(lpValueName);
lpwsValueName:=PCharToPWideChar(lpValueName);
Result:=RegEnumValueW(hKey, dwIndex, lpwsValueName, @cbValueName, lpReserved, lpType, lpData, lpcbData);
FreeMem(lpwsValueName);
end;
@ -93,7 +93,7 @@ end;
function RegQueryValueExA(hKey:HKEY; lpValueName:LPCSTR; lpReserved:LPDWORD; lpType:LPDWORD; lpData:pointer;lpcbData:LPDWORD):LONG;
var lpwsValueName: PWideChar;
begin
lpwsValueName:=StringToPWideChar(lpValueName);
lpwsValueName:=PCharToPWideChar(lpValueName);
Result:=RegQueryValueExW(hKey, lpwsValueName, lpReserved, lpType, lpData, lpcbData);
FreeMem(lpwsValueName);
end;
@ -102,7 +102,7 @@ function RegQueryInfoKeyA(hKey:HKEY; lpClass:LPSTR; lpcbClass:LPDWORD; lpReserve
lpcbMaxValueLen:LPDWORD;lpcbSecurityDescriptor:LPDWORD; lpftLastWriteTime:PFILETIME):LONG;
var lpwsClass: PWideChar;
begin
lpwsClass:=StringToPWideChar(lpClass);
lpwsClass:=PCharToPWideChar(lpClass);
Result:=RegQueryInfoKeyW(hKey, lpwsClass, lpcbClass, lpReserved, lpcSubKeys , lpcbMaxSubKeyLen, lpcbMaxClassLen,
lpcValues, lpcbMaxValueNameLen, lpcbMaxValueLen, lpcbSecurityDescriptor, lpftLastWriteTime);
FreeMem(lpwsClass);
@ -111,7 +111,7 @@ end;
function RegOpenKeyExA(hKey:HKEY; lpSubKey:LPCSTR; ulOptions:DWORD; samDesired:REGSAM; var hkResult: HKEY):LONG;
var lpwsSubKey: PWideChar;
begin
lpwsSubKey:=StringToPWideChar(lpSubKey);
lpwsSubKey:=PCharToPWideChar(lpSubKey);
Result:=RegOpenKeyExW(hKey, lpwsSubKey, ulOptions, samDesired, hkResult);
FreeMem(lpwsSubKey);
end;
@ -119,7 +119,7 @@ end;
function RegSetValueExA(hKey:HKEY; lpValueName:LPCSTR; Reserved:DWORD; dwType:DWORD; lpData:pointer;cbData:DWORD):LONG;
var lpwsValueName: PWideChar;
begin
lpwsValueName:=StringToPWideChar(lpValueName);
lpwsValueName:=PCharToPWideChar(lpValueName);
Result:=RegSetValueExW(hKey, lpwsValueName, Reserved, dwType, lpData, cbData);
FreeMem(lpwsValueName);
end;

2
rtl/wince/wininc/makefile.inc
View File

@ -1 +1 @@
WINDOWS_FILES=base errors defines struct redef
WINDOWS_FILES=base errors defines struct redef aygshell cemiss ceshell commctrl coredll iphlpapi oleaut32

5
rtl/wince/wininc/redef.inc
View File

@ -194,9 +194,8 @@ function RegCreateKeyEx(hKey: HKEY; lpSubKey: LPWSTR; Reserved: DWORD; lpClass:
function RegCreateKeyExW(hKey: HKEY; lpSubKey: LPWSTR; Reserved: DWORD; lpClass: LPWSTR; dwOptions: DWORD; samDesired: REGSAM; lpSecurityAttributes: PSecurityAttributes; var phkResult: HKEY; lpdwDisposition: PDWORD): Longint; external KERNELDLL name 'RegCreateKeyExW';
function RegEnumKeyEx(hKey: HKEY; dwIndex: DWORD; lpName: LPWSTR; var lpcbName: DWORD; lpReserved: Pointer; lpClass: LPWSTR; lpcbClass: PDWORD; lpftLastWriteTime: PFileTime): Longint; external KernelDLL name 'RegEnumKeyExW';
function RegEnumKeyExW(hKey: HKEY; dwIndex: DWORD; lpName: LPWSTR; var lpcbName: DWORD; lpReserved: Pointer; lpClass: LPWSTR; lpcbClass: PDWORD; lpftLastWriteTime: PFileTime): Longint; external KernelDLL name 'RegEnumKeyExW';
function RegEnumValue(hKey: HKEY; dwIndex: DWORD; lpValueName: PChar; var lpcbValueName: DWORD; lpReserved: Pointer; lpType: PDWORD; lpData: PByte; lpcbData: PDWORD): Longint; external KernelDLL name 'RegEnumValueW';
//removed use RegEnumValueA instead
//function RegEnumValueW(hKey: HKEY; dwIndex: DWORD; lpValueName: PChar; var lpcbValueName: DWORD; lpReserved: Pointer; lpType: PDWORD; lpData: PByte; lpcbData: PDWORD): Longint; external KernelDLL name 'RegEnumValueW';
function RegEnumValue(hKey: HKEY; dwIndex: DWORD; lpValueName: LPWSTR; var lpcbValueName: DWORD; lpReserved: Pointer; lpType: PDWORD; lpData: PByte; lpcbData: PDWORD): Longint; external KernelDLL name 'RegEnumValueW';
function RegEnumValueW(hKey: HKEY; dwIndex: DWORD; lpValueName: LPWSTR; var lpcbValueName: DWORD; lpReserved: Pointer; lpType: PDWORD; lpData: PByte; lpcbData: PDWORD): Longint; external KernelDLL name 'RegEnumValueW';
function RegisterClass(const lpWndClass: TWndClass): ATOM;external KernelDLL name 'RegisterClassW';
function RegisterClassW(const lpWndClass: TWndClassW): ATOM; external KernelDLL name 'RegisterClassW';
function RegOpenKeyEx(hKey: HKEY; lpSubKey: LPWSTR; ulOptions: DWORD; samDesired: REGSAM; var phkResult: HKEY): Longint; external KernelDLL name 'RegOpenKeyExW';