Module: wine
Branch: master
Commit: 637c3125bafb94e533bc6b9fa60add5600b2fc55
URL: http://source.winehq.org/git/wine.git/?a=commit;h=637c3125bafb94e533bc6b9fa…
Author: Rob Shearman <robertshearman(a)gmail.com>
Date: Mon Sep 29 22:30:29 2008 +0100
advapi32: Output the last error when services tests fail.
---
dlls/advapi32/tests/service.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c
index da62b0b..d28aad1 100644
--- a/dlls/advapi32/tests/service.c
+++ b/dlls/advapi32/tests/service.c
@@ -649,7 +649,7 @@ static void test_get_displayname(void)
/* Delete the service */
ret = DeleteService(svc_handle);
- ok(ret, "Expected success\n");
+ ok(ret, "Expected success (err=%d)\n", GetLastError());
CloseServiceHandle(svc_handle);
CloseServiceHandle(scm_handle);
@@ -1985,7 +1985,7 @@ static void test_refcount(void)
/* Check if we can close the handle to the Service Control Manager */
ret = CloseServiceHandle(scm_handle);
- ok(ret, "Expected success\n");
+ ok(ret, "Expected success (err=%d)\n", GetLastError());
/* Get a new handle to the Service Control Manager */
scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_ALL);
@@ -1997,7 +1997,7 @@ static void test_refcount(void)
/* Delete the service */
ret = DeleteService(svc_handle4);
- ok(ret, "Expected success\n");
+ ok(ret, "Expected success (err=%d)\n", GetLastError());
/* We cannot create the same service again as it's still marked as 'being deleted'.
* The reason is that we still have 4 open handles to this service even though we
@@ -2023,13 +2023,13 @@ static void test_refcount(void)
/* Close all the handles to the service and try again */
ret = CloseServiceHandle(svc_handle4);
- ok(ret, "Expected success\n");
+ ok(ret, "Expected success (err=%d)\n", GetLastError());
ret = CloseServiceHandle(svc_handle3);
- ok(ret, "Expected success\n");
+ ok(ret, "Expected success (err=%d)\n", GetLastError());
ret = CloseServiceHandle(svc_handle2);
- ok(ret, "Expected success\n");
+ ok(ret, "Expected success (err=%d)\n", GetLastError());
ret = CloseServiceHandle(svc_handle1);
- ok(ret, "Expected success\n");
+ ok(ret, "Expected success (err=%d)\n", GetLastError());
/* Wait a while. Doing a CreateService too soon will result again
* in an ERROR_SERVICE_MARKED_FOR_DELETE error.
@@ -2044,7 +2044,7 @@ static void test_refcount(void)
/* Delete the service */
ret = DeleteService(svc_handle5);
- ok(ret, "Expected success\n");
+ ok(ret, "Expected success (err=%d)\n", GetLastError());
/* Wait a while. Just in case one of the following tests does a CreateService again */
Sleep(1000);
Module: wine
Branch: master
Commit: 6357f9c02cb8b2990257ae03ea9e5f3ab8655bd1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6357f9c02cb8b2990257ae03e…
Author: Rob Shearman <robertshearman(a)gmail.com>
Date: Tue Sep 30 13:55:22 2008 +0100
oledlg: Fix the type of ret in UIINSERTOBJECTDLG_PopulateObjectTypes.
It is only used for storing the result of RegEnumKeyW so it should be
LSTATUS instead of HRESULT.
---
dlls/oledlg/insobjdlg.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/dlls/oledlg/insobjdlg.c b/dlls/oledlg/insobjdlg.c
index e875048..07c8a81 100644
--- a/dlls/oledlg/insobjdlg.c
+++ b/dlls/oledlg/insobjdlg.c
@@ -340,7 +340,7 @@ static BOOL UIINSERTOBJECTDLG_PopulateObjectTypes(InsertObjectDlgInfo* pdlgInfo)
HKEY hkclsids;
HKEY hkey;
CLSID clsid;
- HRESULT ret;
+ LSTATUS ret;
WCHAR keydesc[MAX_PATH];
WCHAR keyname[MAX_PATH];
WCHAR szclsid[128];