mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-15 22:37:17 +00:00
packager/tests: Enable compilation with long types.
Signed-off-by: Eric Pouech <eric.pouech@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
d3735faacf
commit
c10dc03e79
|
@ -1,4 +1,3 @@
|
||||||
EXTRADEFS = -DWINE_NO_LONG_TYPES
|
|
||||||
TESTDLL = packager.dll
|
TESTDLL = packager.dll
|
||||||
IMPORTS = ole32
|
IMPORTS = ole32
|
||||||
|
|
||||||
|
|
|
@ -418,7 +418,7 @@ static void test_packager(void)
|
||||||
hr = CoCreateInstance(&CLSID_Package, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER,
|
hr = CoCreateInstance(&CLSID_Package, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER,
|
||||||
&IID_IOleObject, (void**)&oleobj);
|
&IID_IOleObject, (void**)&oleobj);
|
||||||
ok(hr == S_OK ||
|
ok(hr == S_OK ||
|
||||||
hr == REGDB_E_CLASSNOTREG, "CoCreateInstance(CLSID_Package) failed: %08x\n", hr);
|
hr == REGDB_E_CLASSNOTREG, "CoCreateInstance(CLSID_Package) failed: %08lx\n", hr);
|
||||||
if(hr == S_OK){
|
if(hr == S_OK){
|
||||||
IOleObject_Release(oleobj);
|
IOleObject_Release(oleobj);
|
||||||
/* older OSes store temporary files in obscure locations, so don't run
|
/* older OSes store temporary files in obscure locations, so don't run
|
||||||
|
@ -429,28 +429,28 @@ static void test_packager(void)
|
||||||
|
|
||||||
hr = CoCreateInstance(&CLSID_Package_Alt, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER,
|
hr = CoCreateInstance(&CLSID_Package_Alt, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER,
|
||||||
&IID_IOleObject, (void**)&oleobj);
|
&IID_IOleObject, (void**)&oleobj);
|
||||||
ok(hr == S_OK, "CoCreateInstance(CLSID_Package_Alt) failed: %08x\n", hr);
|
ok(hr == S_OK, "CoCreateInstance(CLSID_Package_Alt) failed: %08lx\n", hr);
|
||||||
|
|
||||||
hr = IOleObject_SetClientSite(oleobj, NULL);
|
hr = IOleObject_SetClientSite(oleobj, NULL);
|
||||||
ok(hr == S_OK, "SetClientSite failed: %08x\n", hr);
|
ok(hr == S_OK, "SetClientSite failed: %08lx\n", hr);
|
||||||
|
|
||||||
hr = IOleObject_SetClientSite(oleobj, &clientsite);
|
hr = IOleObject_SetClientSite(oleobj, &clientsite);
|
||||||
ok(hr == S_OK, "SetClientSite failed: %08x\n", hr);
|
ok(hr == S_OK, "SetClientSite failed: %08lx\n", hr);
|
||||||
|
|
||||||
hr = IOleObject_GetMiscStatus(oleobj, DVASPECT_CONTENT, NULL);
|
hr = IOleObject_GetMiscStatus(oleobj, DVASPECT_CONTENT, NULL);
|
||||||
ok(hr == E_INVALIDARG, "GetMiscStatus failed: %08x\n", hr);
|
ok(hr == E_INVALIDARG, "GetMiscStatus failed: %08lx\n", hr);
|
||||||
|
|
||||||
hr = IOleObject_GetMiscStatus(oleobj, DVASPECT_CONTENT, &status);
|
hr = IOleObject_GetMiscStatus(oleobj, DVASPECT_CONTENT, &status);
|
||||||
ok(hr == S_OK, "GetMiscStatus failed: %08x\n", hr);
|
ok(hr == S_OK, "GetMiscStatus failed: %08lx\n", hr);
|
||||||
ok(status == OLEMISC_ONLYICONIC ||
|
ok(status == OLEMISC_ONLYICONIC ||
|
||||||
status == OLEMISC_CANTLINKINSIDE /* winxp */,
|
status == OLEMISC_CANTLINKINSIDE /* winxp */,
|
||||||
"Got wrong DVASPECT_CONTENT status: 0x%x\n", status);
|
"Got wrong DVASPECT_CONTENT status: 0x%lx\n", status);
|
||||||
|
|
||||||
hr = IOleObject_QueryInterface(oleobj, &IID_IPersistStorage, (void**)&persist);
|
hr = IOleObject_QueryInterface(oleobj, &IID_IPersistStorage, (void**)&persist);
|
||||||
ok(hr == S_OK, "QueryInterface(IPersistStorage) failed: %08x\n", hr);
|
ok(hr == S_OK, "QueryInterface(IPersistStorage) failed: %08lx\n", hr);
|
||||||
|
|
||||||
hr = IPersistStorage_Load(persist, &stg);
|
hr = IPersistStorage_Load(persist, &stg);
|
||||||
ok(hr == S_OK, "Load failed: %08x\n", hr);
|
ok(hr == S_OK, "Load failed: %08lx\n", hr);
|
||||||
|
|
||||||
if(extended){
|
if(extended){
|
||||||
len = GetTempPathW(ARRAY_SIZE(filename), filename);
|
len = GetTempPathW(ARRAY_SIZE(filename), filename);
|
||||||
|
@ -458,19 +458,19 @@ static void test_packager(void)
|
||||||
|
|
||||||
file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING,
|
file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING,
|
||||||
FILE_ATTRIBUTE_NORMAL, NULL);
|
FILE_ATTRIBUTE_NORMAL, NULL);
|
||||||
ok(file != INVALID_HANDLE_VALUE, "Couldn't find temporary file %s: %u\n",
|
ok(file != INVALID_HANDLE_VALUE, "Couldn't find temporary file %s: %lu\n",
|
||||||
wine_dbgstr_w(filename), GetLastError());
|
wine_dbgstr_w(filename), GetLastError());
|
||||||
|
|
||||||
br = ReadFile(file, contents, sizeof(contents), &bytes_read, NULL);
|
br = ReadFile(file, contents, sizeof(contents), &bytes_read, NULL);
|
||||||
ok(br == TRUE, "ReadFile failed\n");
|
ok(br == TRUE, "ReadFile failed\n");
|
||||||
ok(bytes_read == 10, "Got wrong file size: %u\n", bytes_read);
|
ok(bytes_read == 10, "Got wrong file size: %lu\n", bytes_read);
|
||||||
ok(!memcmp(contents, "some text\n", 10), "Got wrong file contents\n");
|
ok(!memcmp(contents, "some text\n", 10), "Got wrong file contents\n");
|
||||||
|
|
||||||
CloseHandle(file);
|
CloseHandle(file);
|
||||||
}
|
}
|
||||||
|
|
||||||
hr = IOleObject_Close(oleobj, OLECLOSE_NOSAVE);
|
hr = IOleObject_Close(oleobj, OLECLOSE_NOSAVE);
|
||||||
ok(hr == S_OK, "Close failed: %08x\n", hr);
|
ok(hr == S_OK, "Close failed: %08lx\n", hr);
|
||||||
|
|
||||||
if(extended){
|
if(extended){
|
||||||
file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING,
|
file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING,
|
||||||
|
|
Loading…
Reference in a new issue