ObjFW  Diff

Differences From Artifact [ccda58f080]:

To Artifact [a2f59b5b67]:


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
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







-
-
+
+










-
+



-
+







	objc_autoreleasePoolPop(pool);

	return [[[OFWindowsRegistryKey alloc] of_initWithHKey: subKey
							close: true]
	    autorelease];
}

- (OFData *)dataForValue: (OFString *)value
		    type: (DWORD *)type
- (OFData *)dataForValueNamed: (OFString *)name
			 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,
			status = RegQueryValueExW(_hKey, name.UTF16String,
			    NULL, type, buffer, &length);
		else
			status = RegQueryValueExA(_hKey,
			    [value cStringWithEncoding: [OFLocale encoding]],
			    [name cStringWithEncoding: [OFLocale encoding]],
			    NULL, type, buffer, &length);

		switch (status) {
		case ERROR_SUCCESS:
			if (buffer == stackBuffer) {
				objc_autoreleasePoolPop(pool);

231
232
233
234
235
236
237
238

239
240
241
242
243
244
245

246
247
248
249
250
251
252
253
254
255

256
257
258
259

260
261
262
263
264
265

266
267
268
269
270
271

272
273
274


275
276
277
278


279
280
281
282
283


284
285
286
287
288
289
290
231
232
233
234
235
236
237

238
239
240
241
242
243
244

245
246
247
248
249
250
251
252
253
254

255
256
257
258

259
260
261
262
263
264

265
266
267
268
269
270

271
272


273
274
275
276


277
278
279
280
281


282
283
284
285
286
287
288
289
290







-
+






-
+









-
+



-
+





-
+





-
+

-
-
+
+


-
-
+
+



-
-
+
+







			[ret increaseCountBy: length];
			buffer = ret.mutableItems;

			continue;
		default:
			@throw [OFGetWindowsRegistryValueFailedException
			    exceptionWithRegistryKey: self
					       value: value
					   valueName: name
					      status: status];
		}
	}
}

- (void)setData: (OFData *)data
       forValue: (OFString *)value
  forValueNamed: (OFString *)name
	   type: (DWORD)type
{
	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,
		status = RegSetValueExW(_hKey, name.UTF16String, 0, type,
		    data.items, (DWORD)length);
	else
		status = RegSetValueExA(_hKey,
		    [value cStringWithEncoding: [OFLocale encoding]], 0, type,
		    [name cStringWithEncoding: [OFLocale encoding]], 0, type,
		    data.items, (DWORD)length);

	if (status != ERROR_SUCCESS)
		@throw [OFSetWindowsRegistryValueFailedException
		    exceptionWithRegistryKey: self
				       value: value
				   valueName: name
					data: data
					type: type
				      status: status];
}

- (OFString *)stringForValue: (OFString *)value
- (OFString *)stringForValueNamed: (OFString *)name
{
	return [self stringForValue: value
			       type: NULL];
	return [self stringForValueNamed: name
				    type: NULL];
}

- (OFString *)stringForValue: (OFString *)value
			type: (DWORD *)typeOut
- (OFString *)stringForValueNamed: (OFString *)name
			     type: (DWORD *)typeOut
{
	void *pool = objc_autoreleasePoolPush();
	DWORD type;
	OFData *data = [self dataForValue: value
				     type: &type];
	OFData *data = [self dataForValueNamed: name
					  type: &type];
	OFString *ret;

	if (data == nil)
		return nil;

	if (type != REG_SZ && type != REG_EXPAND_SZ && type != REG_LINK)
		@throw [OFInvalidEncodingException exception];
339
340
341
342
343
344
345
346

347
348
349
350



351
352
353
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
339
340
341
342
343
344
345

346
347



348
349
350
351
352
353

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







-
+

-
-
-
+
+
+



-
+


















-
-
-
+
+
+




-
+





-
+


-
+




-
+








	objc_autoreleasePoolPop(pool);

	return [ret autorelease];
}

- (void)setString: (OFString *)string
	 forValue: (OFString *)value
    forValueNamed: (OFString *)name
{
	[self setString: string
	       forValue: value
		   type: REG_SZ];
	[self	setString: string
	    forValueNamed: name
		     type: REG_SZ];
}

- (void)setString: (OFString *)string
	 forValue: (OFString *)value
    forValueNamed: (OFString *)name
	     type: (DWORD)type
{
	void *pool = objc_autoreleasePoolPush();
	OFData *data;

	if ([OFSystemInfo isWindowsNT])
		data = [OFData dataWithItems: string.UTF16String
				       count: string.UTF16StringLength + 1
				    itemSize: sizeof(of_char16_t)];
	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];
	[self	  setData: data
	    forValueNamed: name
		     type: type];

	objc_autoreleasePoolPop(pool);
}

- (void)deleteValue: (OFString *)value
- (void)deleteValueNamed: (OFString *)name
{
	void *pool = objc_autoreleasePoolPush();
	LSTATUS status;

	if ([OFSystemInfo isWindowsNT])
		status = RegDeleteValueW(_hKey, value.UTF16String);
		status = RegDeleteValueW(_hKey, name.UTF16String);
	else
		status = RegDeleteValueA(_hKey,
		    [value cStringWithEncoding: [OFLocale encoding]]);
		    [name cStringWithEncoding: [OFLocale encoding]]);

	if (status != ERROR_SUCCESS)
		@throw [OFDeleteWindowsRegistryValueFailedException
		    exceptionWithRegistryKey: self
				       value: value
				   valueName: name
				      status: status];

	objc_autoreleasePoolPop(pool);
}

- (void)deleteSubkeyAtPath: (OFString *)subkeyPath
{