Skip to content

W
wine-winehq
Commit e9e7301b authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

urlmon/tests: Use nameless unions/structs.

parent 3d52c87d
Show whitespace changes
Inline Side-by-side
Showing with 65 additions and 67 deletions
dlls/urlmon/tests/misc.c
View file @ e9e7301b
......@@ -18,7 +18,6 @@
#define COBJMACROS
#define CONST_VTABLE
#define NONAMELESSUNION
#include <wine/test.h>
#include <stdarg.h>
......@@ -1238,28 +1237,28 @@ static void test_CopyStgMedium(void)
hres = pCopyStgMedium(&src, &dst);
ok(hres == S_OK, "CopyStgMedium failed: %08lx\n", hres);
ok(dst.tymed == TYMED_NULL, "tymed=%ld\n", dst.tymed);
ok(dst.u.hGlobal == empty, "u=%p\n", dst.u.hGlobal);
ok(dst.hGlobal == empty, "u=%p\n", dst.hGlobal);
ok(!dst.pUnkForRelease, "pUnkForRelease=%p, expected NULL\n", dst.pUnkForRelease);
memset(&dst, 0xe0, sizeof(dst));
src.tymed = TYMED_ISTREAM;
src.u.pstm = NULL;
src.pstm = NULL;
src.pUnkForRelease = NULL;
hres = pCopyStgMedium(&src, &dst);
ok(hres == S_OK, "CopyStgMedium failed: %08lx\n", hres);
ok(dst.tymed == TYMED_ISTREAM, "tymed=%ld\n", dst.tymed);
ok(!dst.u.pstm, "pstm=%p\n", dst.u.pstm);
ok(!dst.pstm, "pstm=%p\n", dst.pstm);
ok(!dst.pUnkForRelease, "pUnkForRelease=%p, expected NULL\n", dst.pUnkForRelease);
memset(&dst, 0xe0, sizeof(dst));
src.tymed = TYMED_FILE;
src.u.lpszFileName = fileW;
src.lpszFileName = fileW;
src.pUnkForRelease = NULL;
hres = pCopyStgMedium(&src, &dst);
ok(hres == S_OK, "CopyStgMedium failed: %08lx\n", hres);
ok(dst.tymed == TYMED_FILE, "tymed=%ld\n", dst.tymed);
ok(dst.u.lpszFileName && dst.u.lpszFileName != fileW, "lpszFileName=%p\n", dst.u.lpszFileName);
ok(!lstrcmpW(dst.u.lpszFileName, fileW), "wrong file name\n");
ok(dst.lpszFileName && dst.lpszFileName != fileW, "lpszFileName=%p\n", dst.lpszFileName);
ok(!lstrcmpW(dst.lpszFileName, fileW), "wrong file name\n");
ok(!dst.pUnkForRelease, "pUnkForRelease=%p, expected NULL\n", dst.pUnkForRelease);
ReleaseStgMedium(&dst);
......@@ -1269,28 +1268,28 @@ static void test_CopyStgMedium(void)
memset(ptr1, 0xfa, 10);
memset(&dst, 0xe0, sizeof(dst));
src.tymed = TYMED_HGLOBAL;
src.u.hGlobal = hg;
src.hGlobal = hg;
hres = pCopyStgMedium(&src, &dst);
ok(hres == S_OK, "CopyStgMedium failed: %08lx\n", hres);
ok(dst.tymed == TYMED_HGLOBAL, "tymed=%ld\n", dst.tymed);
ok(dst.u.hGlobal != hg, "got %p, %p\n", dst.u.hGlobal, hg);
size = GlobalSize(dst.u.hGlobal);
ok(dst.hGlobal != hg, "got %p, %p\n", dst.hGlobal, hg);
size = GlobalSize(dst.hGlobal);
ok(size == 10, "got size %d\n", size);
/* compare contents */
ptr2 = GlobalLock(dst.u.hGlobal);
ptr2 = GlobalLock(dst.hGlobal);
ok(!memcmp(ptr1, ptr2, 10), "got wrong data\n");
GlobalUnlock(ptr2);
GlobalUnlock(ptr1);
ok(GlobalFlags(dst.u.hGlobal) == 0, "got 0x%08x\n", GlobalFlags(dst.u.hGlobal));
ok(GlobalFlags(dst.hGlobal) == 0, "got 0x%08x\n", GlobalFlags(dst.hGlobal));
GlobalFree(hg);
ReleaseStgMedium(&dst);
memset(&dst, 0xe0, sizeof(dst));
src.tymed = TYMED_HGLOBAL;
src.u.hGlobal = NULL;
src.hGlobal = NULL;
hres = pCopyStgMedium(&src, &dst);
ok(hres == S_OK, "CopyStgMedium failed: %08lx\n", hres);
ok(dst.u.hGlobal == NULL, "got %p\n", dst.u.hGlobal);
ok(dst.hGlobal == NULL, "got %p\n", dst.hGlobal);
hres = pCopyStgMedium(&src, NULL);
ok(hres == E_POINTER, "CopyStgMedium failed: %08lx, expected E_POINTER\n", hres);
......@@ -2358,7 +2357,7 @@ static void test_bsc_marshaling(void)
rem_bindinfo.cbSize = sizeof(rem_bindinfo);
rem_bindinfo.stgmedData.tymed = TYMED_ISTREAM;
rem_bindinfo.stgmedData.u.pstm = binding_stream;
rem_bindinfo.stgmedData.pstm = binding_stream;
rem_bindinfo.cbstgmedData = 3;
IStream_AddRef(binding_stream);
......@@ -2375,8 +2374,8 @@ static void test_bsc_marshaling(void)
ok(!bindinfo.pUnk, "pUnk = %p\n", bindinfo.pUnk);
ok(bindinfo.stgmedData.tymed == TYMED_NULL, "tymed = %lu\n",
bindinfo.stgmedData.tymed);
ok(!bindinfo.stgmedData.u.pstm, "stm = %p\n",
bindinfo.stgmedData.u.pstm);
ok(!bindinfo.stgmedData.pstm, "stm = %p\n",
bindinfo.stgmedData.pstm);
ok(!bindinfo.stgmedData.pUnkForRelease, "pUnkForRelease = %p\n",
bindinfo.stgmedData.pUnkForRelease);
ok(bindinfo.cbstgmedData == 3, "cbstgmedData = %lu\n", bindinfo.cbstgmedData);
......@@ -2394,7 +2393,7 @@ static void test_bsc_marshaling(void)
rem_bindinfo.cbSize = sizeof(rem_bindinfo);
rem_bindinfo.stgmedData.tymed = TYMED_ISTREAM;
rem_bindinfo.stgmedData.u.pstm = binding_stream;
rem_bindinfo.stgmedData.pstm = binding_stream;
rem_bindinfo.stgmedData.pUnkForRelease = &unk_out.IUnknown_iface;
unk_out.ref = 1;
rem_bindinfo.cbstgmedData = 3;
......@@ -2413,8 +2412,8 @@ static void test_bsc_marshaling(void)
ok(!bindinfo.pUnk, "pUnk = %p\n", bindinfo.pUnk);
ok(bindinfo.stgmedData.tymed == TYMED_NULL, "tymed = %lu\n",
bindinfo.stgmedData.tymed);
ok(!bindinfo.stgmedData.u.pstm, "stm = %p\n",
bindinfo.stgmedData.u.pstm);
ok(!bindinfo.stgmedData.pstm, "stm = %p\n",
bindinfo.stgmedData.pstm);
ok(!bindinfo.stgmedData.pUnkForRelease, "pUnkForRelease = %p\n",
bindinfo.stgmedData.pUnkForRelease);
ok(bindinfo.cbstgmedData == 3, "cbstgmedData = %lu\n", bindinfo.cbstgmedData);
......@@ -2435,7 +2434,7 @@ static void test_bsc_marshaling(void)
buf = GlobalAlloc(0, 5);
strcpy(buf, "test");
rem_bindinfo.stgmedData.u.hGlobal = buf;
rem_bindinfo.stgmedData.hGlobal = buf;
rem_bindinfo.cbstgmedData = 5;
hres = IBindStatusCallback_GetBindInfo(bsc, &bindf, &bindinfo);
......@@ -2451,8 +2450,8 @@ static void test_bsc_marshaling(void)
ok(!bindinfo.pUnk, "pUnk = %p\n", bindinfo.pUnk);
ok(bindinfo.stgmedData.tymed == TYMED_NULL, "tymed = %lu\n",
bindinfo.stgmedData.tymed);
ok(!bindinfo.stgmedData.u.pstm, "stm = %p\n",
bindinfo.stgmedData.u.pstm);
ok(!bindinfo.stgmedData.pstm, "stm = %p\n",
bindinfo.stgmedData.pstm);
ok(!bindinfo.stgmedData.pUnkForRelease, "pUnkForRelease = %p\n",
bindinfo.stgmedData.pUnkForRelease);
ok(bindinfo.cbstgmedData == 5, "cbstgmedData = %lu\n", bindinfo.cbstgmedData);
......@@ -2574,7 +2573,7 @@ static void test_bsc_marshaling(void)
rem_bindinfo.cbSize = sizeof(rem_bindinfo);
rem_bindinfo.stgmedData.tymed = TYMED_ISTREAM;
rem_bindinfo.stgmedData.u.pstm = binding_stream;
rem_bindinfo.stgmedData.pstm = binding_stream;
rem_bindinfo.cbstgmedData = 3;
IStream_AddRef(binding_stream);
......@@ -2591,8 +2590,8 @@ static void test_bsc_marshaling(void)
ok(!bindinfo.pUnk, "pUnk = %p\n", bindinfo.pUnk);
ok(bindinfo.stgmedData.tymed == TYMED_NULL, "tymed = %lu\n",
bindinfo.stgmedData.tymed);
ok(!bindinfo.stgmedData.u.pstm, "stm = %p\n",
bindinfo.stgmedData.u.pstm);
ok(!bindinfo.stgmedData.pstm, "stm = %p\n",
bindinfo.stgmedData.pstm);
ok(!bindinfo.stgmedData.pUnkForRelease, "pUnkForRelease = %p\n",
bindinfo.stgmedData.pUnkForRelease);
ok(bindinfo.cbstgmedData == 3, "cbstgmedData = %lu\n", bindinfo.cbstgmedData);
......@@ -2610,7 +2609,7 @@ static void test_bsc_marshaling(void)
rem_bindinfo.cbSize = sizeof(rem_bindinfo);
rem_bindinfo.stgmedData.tymed = TYMED_ISTREAM;
rem_bindinfo.stgmedData.u.pstm = binding_stream;
rem_bindinfo.stgmedData.pstm = binding_stream;
rem_bindinfo.stgmedData.pUnkForRelease = &unk_out.IUnknown_iface;
unk_out.ref = 1;
rem_bindinfo.cbstgmedData = 3;
......@@ -2629,8 +2628,8 @@ static void test_bsc_marshaling(void)
ok(!bindinfo.pUnk, "pUnk = %p\n", bindinfo.pUnk);
ok(bindinfo.stgmedData.tymed == TYMED_NULL, "tymed = %lu\n",
bindinfo.stgmedData.tymed);
ok(!bindinfo.stgmedData.u.pstm, "stm = %p\n",
bindinfo.stgmedData.u.pstm);
ok(!bindinfo.stgmedData.pstm, "stm = %p\n",
bindinfo.stgmedData.pstm);
ok(!bindinfo.stgmedData.pUnkForRelease, "pUnkForRelease = %p\n",
bindinfo.stgmedData.pUnkForRelease);
ok(bindinfo.cbstgmedData == 3, "cbstgmedData = %lu\n", bindinfo.cbstgmedData);
......@@ -2651,7 +2650,7 @@ static void test_bsc_marshaling(void)
buf = GlobalAlloc(0, 5);
strcpy(buf, "test");
rem_bindinfo.stgmedData.u.hGlobal = buf;
rem_bindinfo.stgmedData.hGlobal = buf;
rem_bindinfo.cbstgmedData = 5;
hres = IBindStatusCallbackEx_GetBindInfoEx(callbackex, &bindf, &bindinfo, &bindf2, &reserved);
......@@ -2667,8 +2666,8 @@ static void test_bsc_marshaling(void)
ok(!bindinfo.pUnk, "pUnk = %p\n", bindinfo.pUnk);
ok(bindinfo.stgmedData.tymed == TYMED_NULL, "tymed = %lu\n",
bindinfo.stgmedData.tymed);
ok(!bindinfo.stgmedData.u.pstm, "stm = %p\n",
bindinfo.stgmedData.u.pstm);
ok(!bindinfo.stgmedData.pstm, "stm = %p\n",
bindinfo.stgmedData.pstm);
ok(!bindinfo.stgmedData.pUnkForRelease, "pUnkForRelease = %p\n",
bindinfo.stgmedData.pUnkForRelease);
ok(bindinfo.cbstgmedData == 5, "cbstgmedData = %lu\n", bindinfo.cbstgmedData);
......@@ -2683,20 +2682,20 @@ static void test_bsc_marshaling(void)
/* Test marshaling stgmed from OnDataAvailable */
memset(&in_stgmed, 0xcc, sizeof(in_stgmed));
stgmed.tymed = TYMED_ISTREAM;
stgmed.u.pstm = binding_stream;
stgmed.pstm = binding_stream;
stgmed.pUnkForRelease = NULL;
hres = IBindStatusCallback_OnDataAvailable(bsc, 1, 10, &formatetc, &stgmed);
ok(hres == S_OK, "OnDataAvailable failed: %08lx\n", hres);
ok(in_stgmed.tymed == TYMED_ISTREAM, "tymed = %lu\n", in_stgmed.tymed);
ok(in_stgmed.u.pstm != NULL, "pstm = NULL\n");
ok(in_stgmed.pstm != NULL, "pstm = NULL\n");
ok(!in_stgmed.pUnkForRelease, "pUnkForRelease = %p\n", in_stgmed.pUnkForRelease);
/* OnDataAvailable with both IStream and pUnkForRelease */
memset(&in_stgmed, 0xcc, sizeof(in_stgmed));
stgmed.tymed = TYMED_ISTREAM;
stgmed.u.pstm = binding_stream;
stgmed.pstm = binding_stream;
stgmed.pUnkForRelease = &unk_in.IUnknown_iface;
unk_in.ref = 1;
......@@ -2704,27 +2703,27 @@ static void test_bsc_marshaling(void)
ok(hres == S_OK, "OnDataAvailable failed: %08lx\n", hres);
ok(in_stgmed.tymed == TYMED_ISTREAM, "tymed = %lu\n", in_stgmed.tymed);
ok(in_stgmed.u.pstm != NULL, "pstm = NULL\n");
ok(in_stgmed.pstm != NULL, "pstm = NULL\n");
ok(in_stgmed.pUnkForRelease != NULL, "pUnkForRelease = %p\n", in_stgmed.pUnkForRelease);
ok(unk_in.ref > 1, "ref = %lu\n", unk_in.ref);
/* OnDataAvailable with TYMED_ISTREAM, but NULL stream */
memset(&in_stgmed, 0xcc, sizeof(in_stgmed));
stgmed.tymed = TYMED_ISTREAM;
stgmed.u.pstm = binding_stream;
stgmed.pstm = binding_stream;
stgmed.pUnkForRelease = NULL;
hres = IBindStatusCallback_OnDataAvailable(bsc, 1, 10, &formatetc, &stgmed);
ok(hres == S_OK, "OnDataAvailable failed: %08lx\n", hres);
ok(in_stgmed.tymed == TYMED_ISTREAM, "tymed = %lu\n", in_stgmed.tymed);
ok(in_stgmed.u.pstm != NULL, "pstm = NULL\n");
ok(in_stgmed.pstm != NULL, "pstm = NULL\n");
ok(!in_stgmed.pUnkForRelease, "pUnkForRelease = %p\n", in_stgmed.pUnkForRelease);
/* OnDataAvailable with TYMED_NULL and pUnkForRelease */
memset(&in_stgmed, 0xcc, sizeof(in_stgmed));
stgmed.tymed = TYMED_NULL;
stgmed.u.pstm = binding_stream;
stgmed.pstm = binding_stream;
stgmed.pUnkForRelease = &unk_in.IUnknown_iface;
unk_in.ref = 1;
......@@ -2732,7 +2731,7 @@ static void test_bsc_marshaling(void)
ok(hres == S_OK, "OnDataAvailable failed: %08lx\n", hres);
ok(in_stgmed.tymed == TYMED_NULL, "tymed = %lu\n", in_stgmed.tymed);
ok(!in_stgmed.u.pstm, "pstm != NULL\n");
ok(!in_stgmed.pstm, "pstm != NULL\n");
ok(in_stgmed.pUnkForRelease != NULL, "pUnkForRelease = %p\n", in_stgmed.pUnkForRelease);
ok(unk_in.ref == 1, "ref = %lu\n", unk_in.ref);
......
dlls/urlmon/tests/protocol.c
View file @ e9e7301b
......@@ -1448,9 +1448,9 @@ static HRESULT WINAPI BindInfo_GetBindInfo(IInternetBindInfo *iface, DWORD *grfB
/* Must be GMEM_FIXED, GMEM_MOVABLE does not work properly */
data = GlobalAlloc(GPTR, sizeof(post_data));
memcpy(data, post_data, sizeof(post_data));
U(pbindinfo->stgmedData).hGlobal = data;
pbindinfo->stgmedData.hGlobal = data;
}else {
U(pbindinfo->stgmedData).pstm = &Stream;
pbindinfo->stgmedData.pstm = &Stream;
}
}
......
dlls/urlmon/tests/stream.c
View file @ e9e7301b
......@@ -224,13 +224,13 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallback *iface, DWOR
ok(pstgmed != NULL, "stgmeg == NULL\n");
if(pstgmed) {
ok(pstgmed->tymed == TYMED_ISTREAM, "tymed=%lu\n", pstgmed->tymed);
ok(U(*pstgmed).pstm != NULL, "pstm == NULL\n");
ok(pstgmed->pstm != NULL, "pstm == NULL\n");
ok(pstgmed->pUnkForRelease != NULL, "pUnkForRelease == NULL\n");
}
}
if(U(*pstgmed).pstm) {
do hres = IStream_Read(U(*pstgmed).pstm, buf, 512, &read);
if(pstgmed->pstm) {
do hres = IStream_Read(pstgmed->pstm, buf, 512, &read);
while(hres == S_OK);
ok(hres == S_FALSE || hres == E_PENDING, "IStream_Read returned %08lx\n", hres);
}
......
dlls/urlmon/tests/uri.c
View file @ e9e7301b
......@@ -11433,14 +11433,14 @@ static void test_IPersistStream(void)
ok(hr == S_OK, "%d) Seek failed 0x%08lx, expected S_OK.\n", i, hr);
hr = IPersistStream_GetSizeMax(persist_stream, &max_size);
ok(hr == S_OK, "%d) GetSizeMax failed 0x%08lx, expected S_OK.\n", i, hr);
ok(U(size).LowPart+2 == U(max_size).LowPart,
ok(size.LowPart+2 == max_size.LowPart,
"%d) Written data size is %ld, max_size %ld.\n",
i, U(size).LowPart, U(max_size).LowPart);
i, size.LowPart, max_size.LowPart);
hr = IStream_Read(stream, (void*)dw_data, sizeof(DWORD), NULL);
ok(hr == S_OK, "%d) Read failed 0x%08lx, expected S_OK.\n", i, hr);
ok(dw_data[0]-2 == U(size).LowPart, "%d) Structure size is %ld, expected %ld\n",
i, dw_data[0]-2, U(size).LowPart);
ok(dw_data[0]-2 == size.LowPart, "%d) Structure size is %ld, expected %ld\n",
i, dw_data[0]-2, size.LowPart);
hr = IStream_Read(stream, (void*)dw_data, 6*sizeof(DWORD), NULL);
ok(hr == S_OK, "%d) Read failed 0x%08lx, expected S_OK.\n", i, hr);
ok(dw_data[0] == 0, "%d) Incorrect value %lx, expected 0 (unknown).\n", i, dw_data[0]);
......@@ -11568,8 +11568,8 @@ static void test_IPersistStream(void)
ok(hr == S_OK, "%d) Seek failed 0x%08lx, expected S_OK.\n", i, hr);
hr = IStream_Read(stream, (void*)dw_data, 3*sizeof(DWORD), NULL);
ok(hr == S_OK, "%d) Read failed 0x%08lx, expected S_OK.\n", i, hr);
ok(dw_data[0]-2 == U(size).LowPart, "%d) Structure size is %ld, expected %ld\n",
i, dw_data[0]-2, U(size).LowPart);
ok(dw_data[0]-2 == size.LowPart, "%d) Structure size is %ld, expected %ld\n",
i, dw_data[0]-2, size.LowPart);
ok(dw_data[1] == MSHCTX_LOCAL, "%d) Incorrect value %ld, expected MSHCTX_LOCAL.\n",
i, dw_data[1]);
ok(dw_data[2] == dw_data[0]-8, "%d) Incorrect value %ld, expected %ld (PersistStream size).\n",
......@@ -11578,9 +11578,9 @@ static void test_IPersistStream(void)
(test->dword_props[Uri_PROPERTY_SCHEME-Uri_PROPERTY_DWORD_START].value == URL_SCHEME_HTTP
|| test->dword_props[Uri_PROPERTY_SCHEME-Uri_PROPERTY_DWORD_START].value == URL_SCHEME_FTP
|| test->dword_props[Uri_PROPERTY_SCHEME-Uri_PROPERTY_DWORD_START].value == URL_SCHEME_HTTPS))
U(max_size).LowPart += 3*sizeof(DWORD);
ok(dw_data[2] == U(max_size).LowPart, "%d) Incorrect value %ld, expected %ld (PersistStream size).\n",
i, dw_data[2], U(max_size).LowPart);
max_size.LowPart += 3*sizeof(DWORD);
ok(dw_data[2] == max_size.LowPart, "%d) Incorrect value %ld, expected %ld (PersistStream size).\n",
i, dw_data[2], max_size.LowPart);
IMarshal_Release(marshal);
IUri_Release(uri);
......
dlls/urlmon/tests/url.c
View file @ e9e7301b
......@@ -23,7 +23,6 @@
#include <stdio.h>
#define COBJMACROS
#define NONAMELESSUNION
#define CONST_VTABLE
#include "windef.h"
......@@ -1998,9 +1997,9 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DW
switch(pstgmed->tymed) {
case TYMED_ISTREAM: {
IStream *stream = U(*pstgmed).pstm;
IStream *stream = pstgmed->pstm;
ok(stream != NULL, "U(*pstgmed).pstm == NULL\n");
ok(stream != NULL, "pstgmed->pstm == NULL\n");
if(grfBSCF & BSCF_FIRSTDATANOTIFICATION) {
STATSTG stat;
......@@ -2024,8 +2023,8 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DW
"stat.pwcsName = %s, cache_file_name = %s\n",
wine_dbgstr_w(stat.pwcsName), wine_dbgstr_w(cache_file_name));
CoTaskMemFree(stat.pwcsName);
ok(U(stat.cbSize).LowPart == (bindf&BINDF_ASYNCHRONOUS?0:6500),
"stat.cbSize.LowPart = %lu\n", U(stat.cbSize).LowPart);
ok(stat.cbSize.LowPart == (bindf&BINDF_ASYNCHRONOUS?0:6500),
"stat.cbSize.LowPart = %lu\n", stat.cbSize.LowPart);
} else {
hres = IStream_Stat(stream, &stat, STATFLAG_NONAME);
ok(hres == S_OK, "hres = %lx\n", hres);
......@@ -2033,8 +2032,8 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DW
"stat.pwcsName = %s\n", wine_dbgstr_w(stat.pwcsName));
}
ok(stat.type == STGTY_STREAM, "stat.type = %lx\n", stat.type);
ok(U(stat.cbSize).HighPart == 0, "stat.cbSize.HighPart != 0\n");
ok(stat.grfMode == (U(stat.cbSize).LowPart?GENERIC_READ:0), "stat.grfMode = %lx\n", stat.grfMode);
ok(stat.cbSize.HighPart == 0, "stat.cbSize.HighPart != 0\n");
ok(stat.grfMode == (stat.cbSize.LowPart?GENERIC_READ:0), "stat.grfMode = %lx\n", stat.grfMode);
ok(stat.grfLocksSupported == 0, "stat.grfLocksSupported = %lx\n", stat.grfLocksSupported);
ok(stat.grfStateBits == 0, "stat.grfStateBits = %lx\n", stat.grfStateBits);
ok(stat.reserved == 0, "stat.reserved = %lx\n", stat.reserved);
......@@ -2055,15 +2054,15 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DW
}
case TYMED_FILE:
if(test_protocol == FILE_TEST)
ok(!lstrcmpW(pstgmed->u.lpszFileName, file_url+7),
"unexpected file name %s\n", wine_dbgstr_w(pstgmed->u.lpszFileName));
ok(!lstrcmpW(pstgmed->lpszFileName, file_url+7),
"unexpected file name %s\n", wine_dbgstr_w(pstgmed->lpszFileName));
else if(emulate_protocol)
ok(!lstrcmpW(pstgmed->u.lpszFileName, cache_fileW),
"unexpected file name %s\n", wine_dbgstr_w(pstgmed->u.lpszFileName));
ok(!lstrcmpW(pstgmed->lpszFileName, cache_fileW),
"unexpected file name %s\n", wine_dbgstr_w(pstgmed->lpszFileName));
else if(test_protocol == HTTP_TEST)
lstrcpyW(http_cache_file, pstgmed->u.lpszFileName);
lstrcpyW(http_cache_file, pstgmed->lpszFileName);
else
ok(pstgmed->u.lpszFileName != NULL, "lpszFileName == NULL\n");
ok(pstgmed->lpszFileName != NULL, "lpszFileName == NULL\n");
}
if((test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == WINETEST_TEST)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment