Overview
| Comment: | Add support for non-Unicode Windows in all classes |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
494acfb3e0629e598e1ea24c5b4adaf8 |
| User & Date: | js on 2020-05-17 14:08:15 |
| Other Links: | manifest | tags |
Context
|
2020-05-17
| ||
| 19:26 | platform/posix/thread.m: Fix #endif in wrong place (check-in: aabdb25fa2 user: js tags: trunk) | |
| 14:08 | Add support for non-Unicode Windows in all classes (check-in: 494acfb3e0 user: js tags: trunk) | |
| 11:04 | OFApplication: Support for non-Unicode Windows (check-in: 5292d2fd54 user: js tags: trunk) | |
Changes
Modified src/OFFile.m from [1f08d5d8ea] to [14d95d3e71].
| ︙ | ︙ | |||
28 29 30 31 32 33 34 35 36 37 38 39 40 41 | #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif #import "OFFile.h" #import "OFLocale.h" #import "OFString.h" #import "OFURL.h" #import "OFInitializationFailedException.h" #import "OFInvalidArgumentException.h" #import "OFNotOpenException.h" #import "OFOpenItemFailedException.h" #import "OFOutOfMemoryException.h" | > | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif #import "OFFile.h" #import "OFLocale.h" #import "OFString.h" #import "OFSystemInfo.h" #import "OFURL.h" #import "OFInitializationFailedException.h" #import "OFInvalidArgumentException.h" #import "OFNotOpenException.h" #import "OFOpenItemFailedException.h" #import "OFOutOfMemoryException.h" |
| ︙ | ︙ | |||
216 217 218 219 220 221 222 | #ifndef OF_AMIGAOS if ((flags = parseMode(mode.UTF8String)) == -1) @throw [OFInvalidArgumentException exception]; flags |= O_BINARY | O_CLOEXEC; | | > | | > > | > | | > | | > > | 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 | #ifndef OF_AMIGAOS if ((flags = parseMode(mode.UTF8String)) == -1) @throw [OFInvalidArgumentException exception]; flags |= O_BINARY | O_CLOEXEC; # ifdef OF_WINDOWS if ([OFSystemInfo isWindowsNT]) handle = _wopen(path.UTF16String, flags, _S_IREAD | _S_IWRITE); else # endif # ifdef HAVE_OPEN64 handle = open64( [path cStringWithEncoding: [OFLocale encoding]], flags, 0666); # else handle = open( [path cStringWithEncoding: [OFLocale encoding]], flags, 0666); # endif if (handle == -1) @throw [OFOpenItemFailedException exceptionWithPath: path mode: mode errNo: errno]; #else if ((handle = malloc(sizeof(*handle))) == NULL) @throw [OFOutOfMemoryException |
| ︙ | ︙ |
Modified src/OFFileManager.m from [6f997251ad] to [c5306f3b5d].
| ︙ | ︙ | |||
160 161 162 163 164 165 166 |
}
#ifdef OF_HAVE_FILES
- (OFString *)currentDirectoryPath
{
# if defined(OF_WINDOWS)
OFString *ret;
| > > | | | | | > > > > > > > > > > | 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 |
}
#ifdef OF_HAVE_FILES
- (OFString *)currentDirectoryPath
{
# if defined(OF_WINDOWS)
OFString *ret;
if ([OFSystemInfo isWindowsNT]) {
wchar_t *buffer = _wgetcwd(NULL, 0);
@try {
ret = [OFString stringWithUTF16String: buffer];
} @finally {
free(buffer);
}
} else {
char *buffer = _getcwd(NULL, 0);
@try {
ret = [OFString stringWithCString: buffer
encoding: [OFLocale encoding]];
} @finally {
free(buffer);
}
}
return ret;
# elif defined(OF_AMIGAOS)
char buffer[512];
if (!NameFromLock(((struct Process *)FindTask(NULL))->pr_CurrentDir,
|
| ︙ | ︙ | |||
478 479 480 481 482 483 484 |
}
- (void)changeCurrentDirectoryPath: (OFString *)path
{
if (path == nil)
@throw [OFInvalidArgumentException exception];
| < < < < < | | 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 |
}
- (void)changeCurrentDirectoryPath: (OFString *)path
{
if (path == nil)
@throw [OFInvalidArgumentException exception];
# ifdef OF_AMIGAOS
BPTR lock, oldLock;
if ((lock = Lock([path cStringWithEncoding: [OFLocale encoding]],
SHARED_LOCK)) == 0) {
int errNo;
switch (IoErr()) {
|
| ︙ | ︙ | |||
517 518 519 520 521 522 523 | if (!dirChanged) originalDirLock = oldLock; else UnLock(oldLock); dirChanged = true; # else | > > > > > > > > | > > | 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 | if (!dirChanged) originalDirLock = oldLock; else UnLock(oldLock); dirChanged = true; # else int status; # ifdef OF_WINDOWS if ([OFSystemInfo isWindowsNT]) status = _wchdir(path.UTF16String); else # endif status = chdir( [path cStringWithEncoding: [OFLocale encoding]]); if (status != 0) @throw [OFChangeCurrentDirectoryPathFailedException exceptionWithPath: path errNo: errno]; # endif } - (void)changeCurrentDirectoryURL: (OFURL *)URL |
| ︙ | ︙ |
Modified src/OFFileURLHandler.m from [3d6aca4aa4] to [b6ef19d4e0].
| ︙ | ︙ | |||
38 39 40 41 42 43 44 45 46 47 48 49 50 51 | #import "OFFileURLHandler.h" #import "OFArray.h" #import "OFDate.h" #import "OFFile.h" #import "OFFileManager.h" #import "OFLocale.h" #import "OFNumber.h" #import "OFURL.h" #ifdef OF_HAVE_THREADS # import "OFMutex.h" #endif #import "OFCreateDirectoryFailedException.h" | > | 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 | #import "OFFileURLHandler.h" #import "OFArray.h" #import "OFDate.h" #import "OFFile.h" #import "OFFileManager.h" #import "OFLocale.h" #import "OFNumber.h" #import "OFSystemInfo.h" #import "OFURL.h" #ifdef OF_HAVE_THREADS # import "OFMutex.h" #endif #import "OFCreateDirectoryFailedException.h" |
| ︙ | ︙ | |||
146 147 148 149 150 151 152 153 |
#endif
static int
of_stat(OFString *path, of_stat_t *buffer)
{
#if defined(OF_WINDOWS)
WIN32_FILE_ATTRIBUTE_DATA data;
| > > | > > > > > | > > > > > | 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 |
#endif
static int
of_stat(OFString *path, of_stat_t *buffer)
{
#if defined(OF_WINDOWS)
WIN32_FILE_ATTRIBUTE_DATA data;
bool success;
if ([OFSystemInfo isWindowsNT])
success = GetFileAttributesExW(path.UTF16String,
GetFileExInfoStandard, &data);
else
success = GetFileAttributesExA(
[path cStringWithEncoding: [OFLocale encoding]],
GetFileExInfoStandard, &data);
if (!success) {
setErrno();
return -1;
}
buffer->st_size = (uint64_t)data.nFileSizeHigh << 32 |
data.nFileSizeLow;
if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
buffer->st_mode = S_IFDIR;
else if (data.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
/*
* No need to use A functions in this branch: This is only
* available on NTFS (and hence Windows NT) anyway.
*/
WIN32_FIND_DATAW findData;
HANDLE findHandle;
if ((findHandle = FindFirstFileW(path.UTF16String,
&findData)) == INVALID_HANDLE_VALUE) {
setErrno();
return -1;
|
| ︙ | ︙ | |||
588 589 590 591 592 593 594 595 |
- (void)of_setPOSIXPermissions: (OFNumber *)permissions
ofItemAtURL: (OFURL *)URL
attributes: (of_file_attributes_t)attributes
{
#ifdef OF_FILE_MANAGER_SUPPORTS_PERMISSIONS
uint16_t mode = permissions.uInt16Value & 0777;
OFString *path = URL.fileSystemRepresentation;
| > | > | | < > > > > | 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 |
- (void)of_setPOSIXPermissions: (OFNumber *)permissions
ofItemAtURL: (OFURL *)URL
attributes: (of_file_attributes_t)attributes
{
#ifdef OF_FILE_MANAGER_SUPPORTS_PERMISSIONS
uint16_t mode = permissions.uInt16Value & 0777;
OFString *path = URL.fileSystemRepresentation;
int status;
# ifdef OF_WINDOWS
if ([OFSystemInfo isWindowsNT])
status = _wchmod(path.UTF16String, mode);
else
# endif
status = chmod(
[path cStringWithEncoding: [OFLocale encoding]], mode);
if (status != 0)
@throw [OFSetItemAttributesFailedException
exceptionWithURL: URL
attributes: attributes
failedAttribute: of_file_attribute_key_posix_permissions
errNo: errno];
#else
OF_UNRECOGNIZED_SELECTOR
|
| ︙ | ︙ | |||
776 777 778 779 780 781 782 | if (![URL.scheme isEqual: _scheme]) @throw [OFInvalidArgumentException exception]; path = URL.fileSystemRepresentation; #if defined(OF_WINDOWS) | > > > | > > > > > | 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 | if (![URL.scheme isEqual: _scheme]) @throw [OFInvalidArgumentException exception]; path = URL.fileSystemRepresentation; #if defined(OF_WINDOWS) int status; if ([OFSystemInfo isWindowsNT]) status = _wmkdir(path.UTF16String); else status = _mkdir( [path cStringWithEncoding: [OFLocale encoding]]); if (status != 0) @throw [OFCreateDirectoryFailedException exceptionWithURL: URL errNo: errno]; #elif defined(OF_AMIGAOS) BPTR lock; if ((lock = CreateDir( |
| ︙ | ︙ | |||
842 843 844 845 846 847 848 | if (![URL.scheme isEqual: _scheme]) @throw [OFInvalidArgumentException exception]; path = URL.fileSystemRepresentation; #if defined(OF_WINDOWS) HANDLE handle; | < > > > | | | | | | > | | | | | | | | | | | | | | | | | | | > | | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 |
if (![URL.scheme isEqual: _scheme])
@throw [OFInvalidArgumentException exception];
path = URL.fileSystemRepresentation;
#if defined(OF_WINDOWS)
HANDLE handle;
path = [path stringByAppendingString: @"\\*"];
if ([OFSystemInfo isWindowsNT]) {
WIN32_FIND_DATAW fd;
if ((handle = FindFirstFileW(path.UTF16String,
&fd)) == INVALID_HANDLE_VALUE) {
int errNo = 0;
if (GetLastError() == ERROR_FILE_NOT_FOUND)
errNo = ENOENT;
@throw [OFOpenItemFailedException
exceptionWithURL: URL
mode: nil
errNo: errNo];
}
@try {
do {
OFString *file;
if (wcscmp(fd.cFileName, L".") == 0 ||
wcscmp(fd.cFileName, L"..") == 0)
continue;
file = [[OFString alloc]
initWithUTF16String: fd.cFileName];
@try {
[files addObject: file];
} @finally {
[file release];
}
} while (FindNextFileW(handle, &fd));
if (GetLastError() != ERROR_NO_MORE_FILES)
@throw [OFReadFailedException
exceptionWithObject: self
requestedLength: 0
errNo: EIO];
} @finally {
FindClose(handle);
}
} else {
of_string_encoding_t encoding = [OFLocale encoding];
WIN32_FIND_DATA fd;
if ((handle = FindFirstFileA(
[path cStringWithEncoding: encoding], &fd)) ==
INVALID_HANDLE_VALUE) {
int errNo = 0;
if (GetLastError() == ERROR_FILE_NOT_FOUND)
errNo = ENOENT;
@throw [OFOpenItemFailedException
exceptionWithURL: URL
mode: nil
errNo: errNo];
}
@try {
do {
OFString *file;
if (strcmp(fd.cFileName, ".") == 0 ||
strcmp(fd.cFileName, "..") == 0)
continue;
file = [[OFString alloc]
initWithCString: fd.cFileName
encoding: encoding];
@try {
[files addObject: file];
} @finally {
[file release];
}
} while (FindNextFileA(handle, &fd));
if (GetLastError() != ERROR_NO_MORE_FILES)
@throw [OFReadFailedException
exceptionWithObject: self
requestedLength: 0
errNo: EIO];
} @finally {
FindClose(handle);
}
}
#elif defined(OF_AMIGAOS)
of_string_encoding_t encoding = [OFLocale encoding];
BPTR lock;
if ((lock = Lock([path cStringWithEncoding: encoding],
SHARED_LOCK)) == 0) {
|
| ︙ | ︙ | |||
1090 1091 1092 1093 1094 1095 1096 | [self removeItemAtURL: [OFURL fileURLWithPath: [path stringByAppendingPathComponent: item]]]; objc_autoreleasePoolPop(pool2); } #ifndef OF_AMIGAOS | > > | > | | < > > > > > > | | | | < > > > > | 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 |
[self removeItemAtURL: [OFURL fileURLWithPath:
[path stringByAppendingPathComponent: item]]];
objc_autoreleasePoolPop(pool2);
}
#ifndef OF_AMIGAOS
int status;
# ifdef OF_WINDOWS
if ([OFSystemInfo isWindowsNT])
status = _wrmdir(path.UTF16String);
else
# endif
status = rmdir(
[path cStringWithEncoding: [OFLocale encoding]]);
if (status != 0)
@throw [OFRemoveItemFailedException
exceptionWithURL: URL
errNo: errno];
} else {
int status;
# ifdef OF_WINDOWS
if ([OFSystemInfo isWindowsNT])
status = _wunlink(path.UTF16String);
else
# endif
status = unlink(
[path cStringWithEncoding: [OFLocale encoding]]);
if (status != 0)
@throw [OFRemoveItemFailedException
exceptionWithURL: URL
errNo: errno];
#endif
}
#ifdef OF_AMIGAOS
|
| ︙ | ︙ | |||
1242 1243 1244 1245 1246 1247 1248 | @throw [OFMoveItemFailedException exceptionWithSourceURL: source destinationURL: destination errNo: EEXIST]; pool = objc_autoreleasePoolPush(); | < < < < < < < | | 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 |
@throw [OFMoveItemFailedException
exceptionWithSourceURL: source
destinationURL: destination
errNo: EEXIST];
pool = objc_autoreleasePoolPush();
#ifdef OF_AMIGAOS
of_string_encoding_t encoding = [OFLocale encoding];
if (!Rename([source.fileSystemRepresentation
cStringWithEncoding: encoding],
[destination.fileSystemRepresentation
cStringWithEncoding: encoding])) {
int errNo;
|
| ︙ | ︙ | |||
1286 1287 1288 1289 1290 1291 1292 | @throw [OFMoveItemFailedException exceptionWithSourceURL: source destinationURL: destination errNo: errNo]; } #else | > > > > > > > > | | | | | > > > > > | 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 |
@throw [OFMoveItemFailedException
exceptionWithSourceURL: source
destinationURL: destination
errNo: errNo];
}
#else
int status;
# ifdef OF_WINDOWS
if ([OFSystemInfo isWindowsNT])
status = _wrename(source.fileSystemRepresentation.UTF16String,
destination.fileSystemRepresentation.UTF16String);
else {
# endif
of_string_encoding_t encoding = [OFLocale encoding];
status = rename([source.fileSystemRepresentation
cStringWithEncoding: encoding],
[destination.fileSystemRepresentation
cStringWithEncoding: encoding]);
# ifdef OF_WINDOWS
}
# endif
if (status != 0)
@throw [OFMoveItemFailedException
exceptionWithSourceURL: source
destinationURL: destination
errNo: errno];
#endif
objc_autoreleasePoolPop(pool);
return true;
}
@end
|
Modified src/OFPlugin.m from [3e825cedc9] to [539230b0ba].
| ︙ | ︙ | |||
21 22 23 24 25 26 27 28 | #include <string.h> #ifdef HAVE_DLFCN_H # include <dlfcn.h> #endif #import "OFPlugin.h" #import "OFString.h" | > | > | > > > | 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 |
#include <string.h>
#ifdef HAVE_DLFCN_H
# include <dlfcn.h>
#endif
#import "OFPlugin.h"
#import "OFLocale.h"
#import "OFString.h"
#import "OFSystemInfo.h"
#import "OFInitializationFailedException.h"
#import "OFLoadPluginFailedException.h"
typedef OFPlugin *(*init_plugin_t)(void);
of_plugin_handle_t
of_dlopen(OFString *path, int flags)
{
#ifndef OF_WINDOWS
return dlopen([path cStringWithEncoding: [OFLocale encoding]], flags);
#else
if (path == nil)
return GetModuleHandle(NULL);
if ([OFSystemInfo isWindowsNT])
return LoadLibraryW(path.UTF16String);
else
return LoadLibraryA(
[path cStringWithEncoding: [OFLocale encoding]]);
#endif
}
void *
of_dlsym(of_plugin_handle_t handle, const char *symbol)
{
#ifndef OF_WINDOWS
|
| ︙ | ︙ |
Modified src/OFString.m from [1a087004fb] to [9bf92ef7e1].
| ︙ | ︙ | |||
37 38 39 40 41 42 43 44 45 46 47 48 49 50 | #import "OFDictionary.h" #ifdef OF_HAVE_FILES # import "OFFile.h" # import "OFFileManager.h" #endif #import "OFLocale.h" #import "OFStream.h" #import "OFURL.h" #import "OFURLHandler.h" #import "OFUTF8String.h" #import "OFUTF8String+Private.h" #import "OFXMLElement.h" #import "OFInitializationFailedException.h" | > | 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 | #import "OFDictionary.h" #ifdef OF_HAVE_FILES # import "OFFile.h" # import "OFFileManager.h" #endif #import "OFLocale.h" #import "OFStream.h" #import "OFSystemInfo.h" #import "OFURL.h" #import "OFURLHandler.h" #import "OFUTF8String.h" #import "OFUTF8String+Private.h" #import "OFXMLElement.h" #import "OFInitializationFailedException.h" |
| ︙ | ︙ | |||
2707 2708 2709 2710 2711 2712 2713 |
OF_UNICODE_DECOMPOSITION_COMPAT_TABLE_SIZE);
}
#endif
#ifdef OF_WINDOWS
- (OFString *)stringByExpandingWindowsEnvironmentStrings
{
| > | | | > > > > > > > > > > > > | | | > | > | 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 |
OF_UNICODE_DECOMPOSITION_COMPAT_TABLE_SIZE);
}
#endif
#ifdef OF_WINDOWS
- (OFString *)stringByExpandingWindowsEnvironmentStrings
{
if ([OFSystemInfo isWindowsNT]) {
wchar_t buffer[512];
size_t length;
if ((length = ExpandEnvironmentStringsW(self.UTF16String,
buffer, sizeof(buffer))) == 0)
return self;
return [OFString stringWithUTF16String: buffer
length: length - 1];
} else {
of_string_encoding_t encoding = [OFLocale encoding];
char buffer[512];
size_t length;
if ((length = ExpandEnvironmentStringsA(
[self cStringWithEncoding: encoding], buffer,
sizeof(buffer))) == 0)
return self;
return [OFString stringWithCString: buffer
encoding: encoding
length: length - 1];
}
}
#endif
#ifdef OF_HAVE_FILES
- (void)writeToFile: (OFString *)path
{
[self writeToFile: path
|
| ︙ | ︙ |
Modified src/OFSystemInfo.m from [c3f493864c] to [0f92abda7c].
| ︙ | ︙ | |||
161 162 163 164 165 166 167 |
}
# endif
#elif defined(OF_WINDOWS)
# ifdef OF_HAVE_FILES
void *pool = objc_autoreleasePoolPush();
@try {
| > | | | | | | | | | | | | 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 |
}
# endif
#elif defined(OF_WINDOWS)
# ifdef OF_HAVE_FILES
void *pool = objc_autoreleasePoolPush();
@try {
of_string_encoding_t encoding = [OFLocale encoding];
char systemDir[PATH_MAX];
UINT systemDirLen;
OFString *systemDirString;
const char *path;
void *buffer;
DWORD bufferLen;
systemDirLen = GetSystemDirectoryA(systemDir, PATH_MAX);
if (systemDirLen == 0)
return;
systemDirString = [OFString stringWithCString: systemDir
encoding: encoding
length: systemDirLen];
path = [[systemDirString stringByAppendingPathComponent:
@"kernel32.dll"] cStringWithEncoding: encoding];
if ((bufferLen = GetFileVersionInfoSizeA(path, NULL)) == 0)
return;
if ((buffer = malloc(bufferLen)) == 0)
return;
@try {
void *data;
UINT dataLen;
VS_FIXEDFILEINFO *info;
if (!GetFileVersionInfoA(path, 0, bufferLen, buffer))
return;
if (!VerQueryValueA(buffer, "\\", &data, &dataLen) ||
dataLen < sizeof(info))
return;
info = (VS_FIXEDFILEINFO *)data;
operatingSystemVersion = [[OFString alloc]
initWithFormat: @"%u.%u.%u",
|
| ︙ | ︙ |
Modified src/OFWindowsRegistryKey.m from [bed1fd3ca5] to [adb04f0d00].
| ︙ | ︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 27 28 | * file. */ #include "config.h" #import "OFWindowsRegistryKey.h" #import "OFData.h" #include <windows.h> #import "OFCreateWindowsRegistryKeyFailedException.h" #import "OFDeleteWindowsRegistryKeyFailedException.h" #import "OFDeleteWindowsRegistryValueFailedException.h" #import "OFGetWindowsRegistryValueFailedException.h" | > > | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | * file. */ #include "config.h" #import "OFWindowsRegistryKey.h" #import "OFData.h" #import "OFLocale.h" #import "OFSystemInfo.h" #include <windows.h> #import "OFCreateWindowsRegistryKeyFailedException.h" #import "OFDeleteWindowsRegistryKeyFailedException.h" #import "OFDeleteWindowsRegistryValueFailedException.h" #import "OFGetWindowsRegistryValueFailedException.h" |
| ︙ | ︙ | |||
104 105 106 107 108 109 110 |
options: (DWORD)options
securityAndAccessRights: (REGSAM)securityAndAccessRights
{
void *pool = objc_autoreleasePoolPush();
LSTATUS status;
HKEY subKey;
| > | | > > > > > > | 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 |
options: (DWORD)options
securityAndAccessRights: (REGSAM)securityAndAccessRights
{
void *pool = objc_autoreleasePoolPush();
LSTATUS status;
HKEY subKey;
if ([OFSystemInfo isWindowsNT])
status = RegOpenKeyExW(_hKey, path.UTF16String, options,
securityAndAccessRights, &subKey);
else
status = RegOpenKeyExA(_hKey,
[path cStringWithEncoding: [OFLocale encoding]], options,
securityAndAccessRights, &subKey);
if (status != ERROR_SUCCESS) {
if (status == ERROR_FILE_NOT_FOUND) {
objc_autoreleasePoolPop(pool);
return nil;
}
@throw [OFOpenWindowsRegistryKeyFailedException
exceptionWithRegistryKey: self
|
| ︙ | ︙ | |||
147 148 149 150 151 152 153 |
securityAttributes: (LPSECURITY_ATTRIBUTES)securityAttributes
disposition: (DWORD *)disposition
{
void *pool = objc_autoreleasePoolPush();
LSTATUS status;
HKEY subKey;
| > | | | > > > > > > > | 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 |
securityAttributes: (LPSECURITY_ATTRIBUTES)securityAttributes
disposition: (DWORD *)disposition
{
void *pool = objc_autoreleasePoolPush();
LSTATUS status;
HKEY subKey;
if ([OFSystemInfo isWindowsNT])
status = RegCreateKeyExW(_hKey, path.UTF16String, 0,
NULL, options, securityAndAccessRights, securityAttributes,
&subKey, NULL);
else
status = RegCreateKeyExA(_hKey,
[path cStringWithEncoding: [OFLocale encoding]], 0, NULL,
options, securityAndAccessRights, securityAttributes,
&subKey, NULL);
if (status != ERROR_SUCCESS)
@throw [OFCreateWindowsRegistryKeyFailedException
exceptionWithRegistryKey: self
path: path
options: options
securityAndAccessRights: securityAndAccessRights
securityAttributes: securityAttributes
status: status];
|
| ︙ | ︙ | |||
172 173 174 175 176 177 178 179 180 181 |
- (OFData *)dataForValue: (OFString *)value
type: (DWORD *)type
{
void *pool = objc_autoreleasePoolPush();
BYTE stackBuffer[256], *buffer = stackBuffer;
DWORD length = sizeof(stackBuffer);
OFMutableData *ret = nil;
LSTATUS status;
for (;;) {
| > > | | > > > > | 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 |
- (OFData *)dataForValue: (OFString *)value
type: (DWORD *)type
{
void *pool = objc_autoreleasePoolPush();
BYTE stackBuffer[256], *buffer = stackBuffer;
DWORD length = sizeof(stackBuffer);
OFMutableData *ret = nil;
bool winNT = [OFSystemInfo isWindowsNT];
LSTATUS status;
for (;;) {
if (winNT)
status = RegQueryValueExW(_hKey, value.UTF16String,
NULL, type, buffer, &length);
else
status = RegQueryValueExA(_hKey,
[value cStringWithEncoding: [OFLocale encoding]],
NULL, type, buffer, &length);
switch (status) {
case ERROR_SUCCESS:
if (buffer == stackBuffer) {
objc_autoreleasePoolPop(pool);
return [OFData dataWithItems: buffer
|
| ︙ | ︙ | |||
225 226 227 228 229 230 231 |
{
size_t length = data.count * data.itemSize;
LSTATUS status;
if (length > UINT32_MAX)
@throw [OFOutOfRangeException exception];
| > | | > > > > > > | 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 |
{
size_t length = data.count * data.itemSize;
LSTATUS status;
if (length > UINT32_MAX)
@throw [OFOutOfRangeException exception];
if ([OFSystemInfo isWindowsNT])
status = RegSetValueExW(_hKey, value.UTF16String, 0, type,
data.items, (DWORD)length);
else
status = RegSetValueExA(_hKey,
[value cStringWithEncoding: [OFLocale encoding]], 0, type,
data.items, (DWORD)length);
if (status != ERROR_SUCCESS)
@throw [OFSetWindowsRegistryValueFailedException
exceptionWithRegistryKey: self
value: value
data: data
type: type
status: status];
}
|
| ︙ | ︙ | |||
248 249 250 251 252 253 254 |
- (OFString *)stringForValue: (OFString *)value
type: (DWORD *)typeOut
{
void *pool = objc_autoreleasePoolPush();
DWORD type;
OFData *data = [self dataForValue: value
type: &type];
| < < > > > > | | | | | | | | | | | | | | | | | > > > > > > > > > > > > > > > > > > > | 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 |
- (OFString *)stringForValue: (OFString *)value
type: (DWORD *)typeOut
{
void *pool = objc_autoreleasePoolPush();
DWORD type;
OFData *data = [self dataForValue: value
type: &type];
OFString *ret;
if (data == nil)
return nil;
if (type != REG_SZ && type != REG_EXPAND_SZ && type != REG_LINK)
@throw [OFInvalidEncodingException exception];
if (data.itemSize != 1)
@throw [OFInvalidFormatException exception];
if ([OFSystemInfo isWindowsNT]) {
const of_char16_t *UTF16String = data.items;
size_t length = data.count;
if (length % 2 == 1)
@throw [OFInvalidFormatException exception];
length /= 2;
/*
* REG_SZ and REG_EXPAND_SZ contain a \0, but can contain data
* after it that should be ignored.
*/
for (size_t i = 0; i < length; i++) {
if (UTF16String[i] == 0) {
length = i;
break;
}
}
ret = [[OFString alloc] initWithUTF16String: UTF16String
length: length];
} else {
const char *cString = data.items;
size_t length = data.count;
/*
* REG_SZ and REG_EXPAND_SZ contain a \0, but can contain data
* after it that should be ignored.
*/
for (size_t i = 0; i < length; i++) {
if (cString[i] == 0) {
length = i;
break;
}
}
ret = [[OFString alloc] initWithCString: cString
encoding: [OFLocale encoding]
length: length];
}
if (typeOut != NULL)
*typeOut = type;
objc_autoreleasePoolPop(pool);
return [ret autorelease];
|
| ︙ | ︙ | |||
303 304 305 306 307 308 309 |
- (void)setString: (OFString *)string
forValue: (OFString *)value
type: (DWORD)type
{
void *pool = objc_autoreleasePoolPush();
OFData *data;
| > | | | > > > > > > > > > > | > > > > | > | > > > > | | 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 |
- (void)setString: (OFString *)string
forValue: (OFString *)value
type: (DWORD)type
{
void *pool = objc_autoreleasePoolPush();
OFData *data;
if ([OFSystemInfo isWindowsNT])
data = [OFData dataWithItems: string.UTF16String
itemSize: sizeof(of_char16_t)
count: string.UTF16StringLength + 1];
else {
of_string_encoding_t encoding = [OFLocale encoding];
const char *cString = [string cStringWithEncoding: encoding];
size_t length = [string cStringLengthWithEncoding: encoding];
data = [OFData dataWithItems: cString
count: length + 1];
}
[self setData: data
forValue: value
type: type];
objc_autoreleasePoolPop(pool);
}
- (void)deleteValue: (OFString *)value
{
void *pool = objc_autoreleasePoolPush();
LSTATUS status;
if ([OFSystemInfo isWindowsNT])
status = RegDeleteValueW(_hKey, value.UTF16String);
else
status = RegDeleteValueA(_hKey,
[value cStringWithEncoding: [OFLocale encoding]]);
if (status != ERROR_SUCCESS)
@throw [OFDeleteWindowsRegistryValueFailedException
exceptionWithRegistryKey: self
value: value
status: status];
objc_autoreleasePoolPop(pool);
}
- (void)deleteSubkeyAtPath: (OFString *)subkeyPath
{
void *pool = objc_autoreleasePoolPush();
LSTATUS status;
if ([OFSystemInfo isWindowsNT])
status = RegDeleteKeyW(_hKey, subkeyPath.UTF16String);
else
status = RegDeleteKeyA(_hKey,
[subkeyPath cStringWithEncoding: [OFLocale encoding]]);
if (status != ERROR_SUCCESS)
@throw [OFDeleteWindowsRegistryKeyFailedException
exceptionWithRegistryKey: self
subkeyPath: subkeyPath
status: status];
objc_autoreleasePoolPop(pool);
}
@end
|
Modified src/exceptions/OFException.m from [91a0048000] to [bf7ff24437].
| ︙ | ︙ | |||
23 24 25 26 27 28 29 | #include <string.h> #ifdef HAVE_DLFCN_H # include <dlfcn.h> #endif #import "OFException.h" | | | | > | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | #include <string.h> #ifdef HAVE_DLFCN_H # include <dlfcn.h> #endif #import "OFException.h" #import "OFArray.h" #import "OFLocale.h" #import "OFString.h" #import "OFSystemInfo.h" #import "OFInitializationFailedException.h" #import "OFLockFailedException.h" #import "OFUnlockFailedException.h" #if !defined(HAVE_STRERROR_R) && defined(OF_HAVE_THREADS) # import "mutex.h" |
| ︙ | ︙ | |||
207 208 209 210 211 212 213 214 |
return ret;
}
#ifdef OF_WINDOWS
OFString *
of_windows_status_to_string(LSTATUS status)
{
void *buffer;
| > < > | | > | | | | > | | | > | > > > > > > > > > > > > > > > > | 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 |
return ret;
}
#ifdef OF_WINDOWS
OFString *
of_windows_status_to_string(LSTATUS status)
{
OFString *string = nil;
void *buffer;
if ([OFSystemInfo isWindowsNT]) {
if (FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_IGNORE_INSERTS |
FORMAT_MESSAGE_MAX_WIDTH_MASK, NULL, status, 0,
(LPWSTR)&buffer, 0, NULL) != 0) {
@try {
string = [OFString
stringWithUTF16String: buffer];
} @finally {
LocalFree(buffer);
}
}
} else {
if (FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_IGNORE_INSERTS |
FORMAT_MESSAGE_MAX_WIDTH_MASK, NULL, status, 0,
(LPSTR)&buffer, 0, NULL) != 0) {
@try {
string = [OFString
stringWithCString: buffer
encoding: [OFLocale encoding]];
} @finally {
LocalFree(buffer);
}
}
}
if (string == nil)
string = [OFString stringWithFormat: @"Status code %u", status];
return string;
}
#endif
#ifdef HAVE__UNWIND_BACKTRACE
|
| ︙ | ︙ |
Modified src/platform/windows/OFProcess.m from [4f8503117f] to [816ee6b0db].
| ︙ | ︙ | |||
17 18 19 20 21 22 23 | #include "config.h" #include <errno.h> #include <string.h> #import "OFProcess.h" | | | | > > | > | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 |
#include "config.h"
#include <errno.h>
#include <string.h>
#import "OFProcess.h"
#import "OFArray.h"
#import "OFData.h"
#import "OFDictionary.h"
#import "OFLocale.h"
#import "OFString.h"
#import "OFSystemInfo.h"
#import "OFInitializationFailedException.h"
#import "OFNotOpenException.h"
#import "OFOutOfRangeException.h"
#import "OFReadFailedException.h"
#import "OFWriteFailedException.h"
#include <windows.h>
@interface OFProcess ()
- (of_char16_t *)of_wideEnvironmentForDictionary: (OFDictionary *)dictionary;
- (char *)of_environmentForDictionary: (OFDictionary *)environment;
@end
@implementation OFProcess
+ (instancetype)processWithProgram: (OFString *)program
{
return [[[self alloc] initWithProgram: program] autorelease];
}
|
| ︙ | ︙ | |||
109 110 111 112 113 114 115 |
environment: (OFDictionary *)environment
{
self = [super init];
@try {
SECURITY_ATTRIBUTES sa;
PROCESS_INFORMATION pi;
| < < < > | | > | | < < < < < < < | 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 |
environment: (OFDictionary *)environment
{
self = [super init];
@try {
SECURITY_ATTRIBUTES sa;
PROCESS_INFORMATION pi;
void *pool;
OFMutableString *argumentsString;
_process = INVALID_HANDLE_VALUE;
_readPipe[0] = _writePipe[1] = NULL;
sa.nLength = sizeof(sa);
sa.bInheritHandle = TRUE;
sa.lpSecurityDescriptor = NULL;
if (!CreatePipe(&_readPipe[0], &_readPipe[1], &sa, 0))
@throw [OFInitializationFailedException
exceptionWithClass: self.class];
if (!SetHandleInformation(_readPipe[0], HANDLE_FLAG_INHERIT, 0))
if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED)
@throw [OFInitializationFailedException
exceptionWithClass: self.class];
if (!CreatePipe(&_writePipe[0], &_writePipe[1], &sa, 0))
@throw [OFInitializationFailedException
exceptionWithClass: self.class];
if (!SetHandleInformation(_writePipe[1],
HANDLE_FLAG_INHERIT, 0))
if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED)
@throw [OFInitializationFailedException
exceptionWithClass: self.class];
memset(&pi, 0, sizeof(pi));
pool = objc_autoreleasePoolPush();
argumentsString =
[OFMutableString stringWithString: programName];
[argumentsString replaceOccurrencesOfString: @"\\\""
withString: @"\\\\\""];
|
| ︙ | ︙ | |||
183 184 185 186 187 188 189 | [argumentsString appendString: tmp]; if (containsSpaces) [argumentsString appendString: @"\""]; } | > > > > > > > > > > > > | > | | | | | | | | | | | | | | > > > > > > > > > > > > > > > > > > > | 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 |
[argumentsString appendString: tmp];
if (containsSpaces)
[argumentsString appendString: @"\""];
}
if ([OFSystemInfo isWindowsNT]) {
size_t length;
of_char16_t *argumentsCopy;
STARTUPINFOW si;
memset(&si, 0, sizeof(si));
si.cb = sizeof(si);
si.hStdInput = _writePipe[0];
si.hStdOutput = _readPipe[1];
si.hStdError = GetStdHandle(STD_ERROR_HANDLE);
si.dwFlags |= STARTF_USESTDHANDLES;
length = argumentsString.UTF16StringLength;
argumentsCopy = [self
allocMemoryWithSize: sizeof(of_char16_t)
count: length + 1];
memcpy(argumentsCopy, argumentsString.UTF16String,
(length + 1) * 2);
@try {
if (!CreateProcessW(program.UTF16String,
argumentsCopy, NULL, NULL, TRUE,
CREATE_UNICODE_ENVIRONMENT,
[self of_wideEnvironmentForDictionary:
environment], NULL, &si, &pi))
@throw [OFInitializationFailedException
exceptionWithClass: self.class];
} @finally {
[self freeMemory: argumentsCopy];
}
} else {
of_string_encoding_t encoding = [OFLocale encoding];
STARTUPINFO si;
memset(&si, 0, sizeof(si));
si.cb = sizeof(si);
si.hStdInput = _writePipe[0];
si.hStdOutput = _readPipe[1];
si.hStdError = GetStdHandle(STD_ERROR_HANDLE);
si.dwFlags |= STARTF_USESTDHANDLES;
if (!CreateProcessA([program cStringWithEncoding:
encoding], (char *)[argumentsString
cStringWithEncoding: encoding], NULL, NULL, TRUE, 0,
[self of_environmentForDictionary: environment],
NULL, &si, &pi))
@throw [OFInitializationFailedException
exceptionWithClass: self.class];
}
objc_autoreleasePoolPop(pool);
_process = pi.hProcess;
CloseHandle(pi.hThread);
|
| ︙ | ︙ | |||
223 224 225 226 227 228 229 |
{
if (_readPipe[0] != NULL)
[self close];
[super dealloc];
}
| | | 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 |
{
if (_readPipe[0] != NULL)
[self close];
[super dealloc];
}
- (of_char16_t *)of_wideEnvironmentForDictionary: (OFDictionary *)environment
{
OFMutableData *env;
OFEnumerator *keyEnumerator, *objectEnumerator;
OFString *key, *object;
const of_char16_t equal = '=';
const of_char16_t zero[2] = { 0, 0 };
|
| ︙ | ︙ | |||
251 252 253 254 255 256 257 258 259 260 261 262 263 264 |
[env addItems: object.UTF16String
count: object.UTF16StringLength];
[env addItems: &zero
count: 1];
}
[env addItems: zero
count: 2];
return env.mutableItems;
}
- (bool)lowlevelIsAtEndOfStream
{
if (_readPipe[0] == NULL)
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 |
[env addItems: object.UTF16String
count: object.UTF16StringLength];
[env addItems: &zero
count: 1];
}
[env addItems: zero
count: 2];
return env.mutableItems;
}
- (char *)of_environmentForDictionary: (OFDictionary *)environment
{
of_string_encoding_t encoding = [OFLocale encoding];
OFMutableData *env;
OFEnumerator *keyEnumerator, *objectEnumerator;
OFString *key, *object;
if (environment == nil)
return NULL;
env = [OFMutableData data];
keyEnumerator = [environment keyEnumerator];
objectEnumerator = [environment objectEnumerator];
while ((key = [keyEnumerator nextObject]) != nil &&
(object = [objectEnumerator nextObject]) != nil) {
[env addItems: [key cStringWithEncoding: encoding]
count: [key cStringLengthWithEncoding: encoding]];
[env addItems: "="
count: 1];
[env addItems: [object cStringWithEncoding: encoding]
count: [object cStringLengthWithEncoding: encoding]];
[env addItems: ""
count: 1];
}
[env addItems: "\0"
count: 2];
return env.mutableItems;
}
- (bool)lowlevelIsAtEndOfStream
{
if (_readPipe[0] == NULL)
|
| ︙ | ︙ |