tools/wine.inf: add HKLM\\System\\CurrentControlSet\\Services\\Eventlog\\Application registry key
Daniel Jeliński
djelinski1 at gmail.com
Sat May 25 13:50:37 CDT 2013
based on Austin's patch, fixed tests.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.winehq.org/pipermail/wine-patches/attachments/20130525/bcde2f5b/attachment.html>
-------------- next part --------------
From f97dd45f1689f11dc7ea207df35c5845276ff1c1 Mon Sep 17 00:00:00 2001
From: Daniel Jelinski <djelinski1 at gmail.com>
Date: Sat, 25 May 2013 20:12:51 +0200
Subject: tools/wine.inf: add
HKLM\\System\\CurrentControlSet\\Services\\Eventlog\\Application
registry key
Originally sent by Austin English here:
http://www.winehq.org/pipermail/wine-patches/2013-March/123004.html
Fixed test failures.
---
dlls/advapi32/tests/eventlog.c | 7 ++++---
tools/wine.inf.in | 3 ++-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c
index 543b41c..b028354 100644
--- a/dlls/advapi32/tests/eventlog.c
+++ b/dlls/advapi32/tests/eventlog.c
@@ -637,7 +637,6 @@ static BOOL create_new_eventlog(void)
/* First create our eventlog */
lret = RegOpenKeyA(HKEY_LOCAL_MACHINE, eventlogsvc, &key);
- /* FIXME: Wine stops here */
if (lret != ERROR_SUCCESS)
{
skip("Could not open the EventLog service registry key\n");
@@ -832,11 +831,13 @@ static void test_readwrite(void)
SetLastError(0xdeadbeef);
ret = GetNumberOfEventLogRecords(handle, &count);
ok(ret, "Expected GetNumberOfEventLogRecords success : %d\n", GetLastError());
+ todo_wine
ok(count == (i + 1), "Expected %d records, got %d\n", i + 1, count);
oldest = 0xdeadbeef;
ret = GetOldestEventLogRecord(handle, &oldest);
ok(ret, "Expected GetOldestEventLogRecord success : %d\n", GetLastError());
+ todo_wine
ok(oldest == 1 ||
(oldest > 1 && oldest != 0xdeadbeef), /* Vista SP1+, W2K8 and Win7 */
"Expected oldest to be 1 or higher, got %d\n", oldest);
@@ -855,6 +856,7 @@ static void test_readwrite(void)
count = 0xdeadbeef;
ret = GetNumberOfEventLogRecords(handle, &count);
ok(ret, "Expected success\n");
+ todo_wine
ok(count == i, "Expected %d records, got %d\n", i, count);
CloseEventLog(handle);
@@ -1083,6 +1085,7 @@ static void test_autocreation(void)
lstrcatA(eventlogfile, ".evtx");
}
+ todo_wine
ok(GetFileAttributesA(eventlogfile) != INVALID_FILE_ATTRIBUTES,
"Expected an eventlog file\n");
@@ -1109,14 +1112,12 @@ static void cleanup_eventlog(void)
RegDeleteValueA(key, "Sources");
RegCloseKey(key);
lret = RegDeleteKeyA(HKEY_LOCAL_MACHINE, winesvc);
- todo_wine
ok(lret == ERROR_SUCCESS, "Could not delete the registry tree : %d\n", lret);
/* A handle to the eventlog is locked by services.exe. We can only
* delete the eventlog file after reboot.
*/
bret = MoveFileExA(eventlogfile, NULL, MOVEFILE_DELAY_UNTIL_REBOOT);
- todo_wine
ok(bret, "Expected MoveFileEx to succeed: %d\n", GetLastError());
}
diff --git a/tools/wine.inf.in b/tools/wine.inf.in
index e48d824..14fde79 100644
--- a/tools/wine.inf.in
+++ b/tools/wine.inf.in
@@ -3005,8 +3005,9 @@ HKR,Parameters,"ServiceDll",,"%11%\srvsvc.dll"
[Services]
HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r"
-HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16
+HKLM,"System\CurrentControlSet\Services\Eventlog\Application",,16
HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters",,16
+HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16
HKLM,"System\CurrentControlSet\Services\Winsock\Parameters",,16
HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Catalog_Entries",,16
--
1.7.5.4
More information about the wine-patches
mailing list