Nikolay Sivov : oledb32/tests: Simplify IMalloc handling.
Alexandre Julliard
julliard at winehq.org
Mon May 5 15:03:26 CDT 2014
Module: wine
Branch: master
Commit: 51a4fce54d9807043534ccf139c694c8800b13b9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=51a4fce54d9807043534ccf139c694c8800b13b9
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Sun May 4 20:34:27 2014 +0400
oledb32/tests: Simplify IMalloc handling.
---
dlls/oledb32/tests/Makefile.in | 2 +-
dlls/oledb32/tests/database.c | 14 +-------------
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/dlls/oledb32/tests/Makefile.in b/dlls/oledb32/tests/Makefile.in
index df71d64..1a4e07e 100644
--- a/dlls/oledb32/tests/Makefile.in
+++ b/dlls/oledb32/tests/Makefile.in
@@ -1,5 +1,5 @@
TESTDLL = oledb32.dll
-IMPORTS = uuid shell32 oleaut32 ole32 user32 gdi32 advapi32
+IMPORTS = uuid oleaut32 ole32 user32 gdi32 advapi32
C_SRCS = \
convert.c \
diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c
index b7020ab..a46725c 100644
--- a/dlls/oledb32/tests/database.c
+++ b/dlls/oledb32/tests/database.c
@@ -29,7 +29,6 @@
#include "ole2.h"
#include "msdadc.h"
#include "msdasc.h"
-#include "shlobj.h"
#include "msdaguid.h"
#include "initguid.h"
#include "oledberr.h"
@@ -56,14 +55,6 @@ static void test_GetDataSource(WCHAR *initstring)
if(SUCCEEDED(hr))
{
IDBProperties *props = NULL;
- IMalloc *ppM = NULL;
-
- hr = SHGetMalloc(&ppM);
- if (FAILED(hr))
- {
- ok(0, "Couldn't get IMalloc object.\n");
- goto end;
- }
hr = IDBInitialize_QueryInterface(dbinit, &IID_IDBProperties, (void**)&props);
ok(hr == S_OK, "got %08x\n", hr);
@@ -84,15 +75,12 @@ static void test_GetDataSource(WCHAR *initstring)
pInfoset->rgPropertyInfos[i].vtType);
}
- IMalloc_Free(ppM, ary);
+ CoTaskMemFree(ary);
}
IDBProperties_Release(props);
}
- IMalloc_Release(ppM);
-
-end:
IDBInitialize_Release(dbinit);
}
More information about the wine-cvs
mailing list