Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 75954: [WINDOWSCODECS_WINETEST] Sync with Wine Staging 2.16. CORE-13762
by akhaldi＠svn.reactos.org 24 Sep '17

24 Sep '17

Author: akhaldi Date: Sun Sep 24 11:19:20 2017 New Revision: 75954 URL: http://svn.reactos.org/svn/reactos?rev=75954&view=rev Log: [WINDOWSCODECS_WINETEST] Sync with Wine Staging 2.16. CORE-13762 Modified: trunk/rostests/winetests/windowscodecs/CMakeLists.txt trunk/rostests/winetests/windowscodecs/converter.c trunk/rostests/winetests/windowscodecs/metadata.c Modified: trunk/rostests/winetests/windowscodecs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/C… ============================================================================== --- trunk/rostests/winetests/windowscodecs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/windowscodecs/CMakeLists.txt [iso-8859-1] Sun Sep 24 11:19:20 2017 @@ -18,7 +18,7 @@ add_executable(windowscodecs_winetest ${SOURCE}) set_module_type(windowscodecs_winetest win32cui) -add_importlibs(windowscodecs_winetest windowscodecs oleaut32 ole32 user32 gdi32 shlwapi msvcrt kernel32) +add_importlibs(windowscodecs_winetest windowscodecs oleaut32 ole32 propsys user32 gdi32 shlwapi msvcrt kernel32) if(MSVC) add_importlibs(windowscodecs_winetest ntdll) Modified: trunk/rostests/winetests/windowscodecs/converter.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/c… ============================================================================== --- trunk/rostests/winetests/windowscodecs/converter.c [iso-8859-1] (original) +++ trunk/rostests/winetests/windowscodecs/converter.c [iso-8859-1] Sun Sep 24 11:19:20 2017 @@ -54,6 +54,9 @@ const bitmap_data *data; } BitmapTestSrc; +extern HRESULT STDMETHODCALLTYPE IWICBitmapFrameEncode_WriteSource_Proxy(IWICBitmapFrameEncode* This, + IWICBitmapSource *pIBitmapSource, WICRect *prc); + static BOOL near_equal(float a, float b) { return fabsf(a - b) < 0.001; @@ -631,6 +634,12 @@ static const WCHAR wszCompressionQuality[] = {'C','o','m','p','r','e','s','s','i','o','n','Q','u','a','l','i','t','y',0}; static const WCHAR wszInterlaceOption[] = {'I','n','t','e','r','l','a','c','e','O','p','t','i','o','n',0}; static const WCHAR wszFilterOption[] = {'F','i','l','t','e','r','O','p','t','i','o','n',0}; +static const WCHAR wszImageQuality[] = {'I','m','a','g','e','Q','u','a','l','i','t','y',0}; +static const WCHAR wszBitmapTransform[] = {'B','i','t','m','a','p','T','r','a','n','s','f','o','r','m',0}; +static const WCHAR wszLuminance[] = {'L','u','m','i','n','a','n','c','e',0}; +static const WCHAR wszChrominance[] = {'C','h','r','o','m','i','n','a','n','c','e',0}; +static const WCHAR wszJpegYCrCbSubsampling[] = {'J','p','e','g','Y','C','r','C','b','S','u','b','s','a','m','p','l','i','n','g',0}; +static const WCHAR wszSuppressApp0[] = {'S','u','p','p','r','e','s','s','A','p','p','0',0}; static const struct property_opt_test_data testdata_tiff_props[] = { { wszTiffCompressionMethod, VT_UI1, VT_UI1, WICTiffCompressionDontCare }, @@ -641,6 +650,16 @@ static const struct property_opt_test_data testdata_png_props[] = { { wszInterlaceOption, VT_BOOL, VT_BOOL, 0 }, { wszFilterOption, VT_UI1, VT_UI1, WICPngFilterUnspecified, 0.0f, TRUE /* not supported on XP/2k3 */}, + { NULL } +}; + +static const struct property_opt_test_data testdata_jpeg_props[] = { + { wszImageQuality, VT_R4, VT_EMPTY }, + { wszBitmapTransform, VT_UI1, VT_UI1, WICBitmapTransformRotate0 }, + { wszLuminance, VT_I4|VT_ARRAY, VT_EMPTY }, + { wszChrominance, VT_I4|VT_ARRAY, VT_EMPTY }, + { wszJpegYCrCbSubsampling, VT_UI1, VT_UI1, WICJpegYCrCbSubsamplingDefault, 0.0f, TRUE }, /* not supported on XP/2k3 */ + { wszSuppressApp0, VT_BOOL, VT_BOOL, FALSE }, { NULL } }; @@ -768,6 +787,8 @@ test_specific_encoder_properties(options, testdata_tiff_props, all_props, cProperties2); else if (IsEqualCLSID(clsid_encoder, &CLSID_WICPngEncoder)) test_specific_encoder_properties(options, testdata_png_props, all_props, cProperties2); + else if (IsEqualCLSID(clsid_encoder, &CLSID_WICJpegEncoder)) + test_specific_encoder_properties(options, testdata_jpeg_props, all_props, cProperties2); for (i=0; i < cProperties2; i++) { @@ -1367,6 +1388,13 @@ DeleteTestBitmap(src_obj); i++; + } + + if (clsid_decoder == NULL) + { + IStream_Release(stream); + IWICBitmapEncoder_Release(encoder); + return; } if (SUCCEEDED(hr)) @@ -1869,6 +1897,9 @@ test_encoder(&testdata_24bppBGR, &CLSID_WICTiffEncoder, &testdata_24bppBGR, &CLSID_WICTiffDecoder, "TIFF encoder 24bppBGR"); + test_encoder(&testdata_24bppBGR, &CLSID_WICJpegEncoder, + &testdata_24bppBGR, NULL, "JPEG encoder 24bppBGR"); + test_multi_encoder(multiple_frames, &CLSID_WICTiffEncoder, multiple_frames, &CLSID_WICTiffDecoder, NULL, NULL, "TIFF encoder multi-frame", NULL); Modified: trunk/rostests/winetests/windowscodecs/metadata.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/windowscodecs/m… ============================================================================== --- trunk/rostests/winetests/windowscodecs/metadata.c [iso-8859-1] (original) +++ trunk/rostests/winetests/windowscodecs/metadata.c [iso-8859-1] Sun Sep 24 11:19:20 2017 @@ -30,10 +30,16 @@ #include <windef.h> #include <winbase.h> +#include <winnls.h> +#include <winreg.h> #include <ole2.h> //#include "wincodec.h" #include <wincodecsdk.h> +#include <propvarutil.h> #include <wine/test.h> + +#include <initguid.h> +DEFINE_GUID(IID_MdbrUnknown, 0x00240e6f,0x3f23,0x4432,0xb0,0xcc,0x48,0xd5,0xbb,0xff,0x6c,0x36); #define expect_blob(propvar, data, length) do { \ ok((propvar).vt == VT_BLOB, "unexpected vt: %i\n", (propvar).vt); \ @@ -1552,13 +1558,207 @@ IWICMetadataBlockReader_Release(blockreader); } + hr = IWICBitmapDecoder_GetMetadataQueryReader(decoder, &queryreader); + ok(hr == S_OK || broken(hr == WINCODEC_ERR_UNSUPPORTEDOPERATION) /* before Vista */, + "GetMetadataQueryReader error %#x\n", hr); + if (SUCCEEDED(hr)) + { + static const struct + { + const char *query; + HRESULT hr; + UINT vt; + } decoder_data[] = + { + { "/logscrdesc/Signature", S_OK, VT_UI1 | VT_VECTOR }, + { "/[0]logscrdesc/Signature", S_OK, VT_UI1 | VT_VECTOR }, + { "/logscrdesc/\\Signature", S_OK, VT_UI1 | VT_VECTOR }, + { "/Logscrdesc/\\signature", S_OK, VT_UI1 | VT_VECTOR }, + { "/logscrdesc/{str=signature}", S_OK, VT_UI1 | VT_VECTOR }, + { "/[0]logscrdesc/{str=signature}", S_OK, VT_UI1 | VT_VECTOR }, + { "/logscrdesc/{wstr=signature}", S_OK, VT_UI1 | VT_VECTOR }, + { "/[0]logscrdesc/{wstr=signature}", S_OK, VT_UI1 | VT_VECTOR }, + { "/appext/Application", S_OK, VT_UI1 | VT_VECTOR }, + { "/appext/{STR=APPlication}", S_OK, VT_UI1 | VT_VECTOR }, + { "/appext/{WSTR=APPlication}", S_OK, VT_UI1 | VT_VECTOR }, + { "/LogSCRdesC", S_OK, VT_UNKNOWN }, + { "/[0]LogSCRdesC", S_OK, VT_UNKNOWN }, + { "/appEXT", S_OK, VT_UNKNOWN }, + { "/[0]appEXT", S_OK, VT_UNKNOWN }, + { "grctlext", WINCODEC_ERR_PROPERTYNOTSUPPORTED, 0 }, + { "/imgdesc", WINCODEC_ERR_PROPERTYNOTFOUND, 0 }, + }; + static const WCHAR rootW[] = {'/',0}; + WCHAR name[256]; + UINT len, i, j; + PROPVARIANT value; + IWICMetadataQueryReader *meta_reader; + + hr = IWICMetadataQueryReader_GetContainerFormat(queryreader, &format); + ok(hr == S_OK, "GetContainerFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_ContainerFormatGif), + "wrong container format %s\n", wine_dbgstr_guid(&format)); + + name[0] = 0; + len = 0xdeadbeef; + hr = IWICMetadataQueryReader_GetLocation(queryreader, 256, name, &len); + ok(hr == S_OK, "GetLocation error %#x\n", hr); + ok(len == 2, "expected 2, got %u\n", len); + ok(!lstrcmpW(name, rootW), "expected '/', got %s\n", wine_dbgstr_w(name)); + + for (i = 0; i < sizeof(decoder_data)/sizeof(decoder_data[0]); i++) + { + WCHAR queryW[256]; + + if (winetest_debug > 1) + trace("query: %s\n", decoder_data[i].query); + MultiByteToWideChar(CP_ACP, 0, decoder_data[i].query, -1, queryW, 256); + PropVariantInit(&value); + hr = IWICMetadataQueryReader_GetMetadataByName(queryreader, queryW, &value); + ok(hr == decoder_data[i].hr, "GetMetadataByName(%s) returned %#x, expected %#x\n", wine_dbgstr_w(queryW), hr, decoder_data[i].hr); + ok(value.vt == decoder_data[i].vt, "expected %#x, got %#x\n", decoder_data[i].vt, value.vt); + if (hr == S_OK && value.vt == VT_UNKNOWN) + { + hr = IUnknown_QueryInterface(value.punkVal, &IID_IWICMetadataQueryReader, (void **)&meta_reader); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + + name[0] = 0; + len = 0xdeadbeef; + hr = IWICMetadataQueryReader_GetLocation(meta_reader, 256, name, &len); + ok(hr == S_OK, "GetLocation error %#x\n", hr); + ok(len == lstrlenW(queryW) + 1, "expected %u, got %u\n", lstrlenW(queryW) + 1, len); + ok(!lstrcmpW(name, queryW), "expected %s, got %s\n", wine_dbgstr_w(queryW), wine_dbgstr_w(name)); + + for (j = 0; j < sizeof(decoder_data)/sizeof(decoder_data[0]); j++) + { + MultiByteToWideChar(CP_ACP, 0, decoder_data[j].query, -1, queryW, 256); + + if (CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, queryW, len-1, name, len-1) == CSTR_EQUAL && decoder_data[j].query[len - 1] != 0) + { + if (winetest_debug > 1) + trace("query: %s\n", wine_dbgstr_w(queryW + len - 1)); + PropVariantClear(&value); + hr = IWICMetadataQueryReader_GetMetadataByName(meta_reader, queryW + len - 1, &value); + ok(hr == decoder_data[j].hr, "GetMetadataByName(%s) returned %#x, expected %#x\n", wine_dbgstr_w(queryW + len - 1), hr, decoder_data[j].hr); + ok(value.vt == decoder_data[j].vt, "expected %#x, got %#x\n", decoder_data[j].vt, value.vt); + } + } + + IWICMetadataQueryReader_Release(meta_reader); + } + + PropVariantClear(&value); + } + + IWICMetadataQueryReader_Release(queryreader); + } + hr = IWICBitmapFrameDecode_GetMetadataQueryReader(frame, &queryreader); - ok(hr == S_OK || - broken(hr == WINCODEC_ERR_UNSUPPORTEDOPERATION) /* before Vista */, - "GetMetadataQueryReader failed: %08x\n", hr); - + ok(hr == S_OK || broken(hr == WINCODEC_ERR_UNSUPPORTEDOPERATION) /* before Vista */, + "GetMetadataQueryReader error %#x\n", hr); if (SUCCEEDED(hr)) { + static const struct + { + const char *query; + HRESULT hr; + UINT vt; + } frame_data[] = + { + { "/grctlext/Delay", S_OK, VT_UI2 }, + { "/[0]grctlext/Delay", S_OK, VT_UI2 }, + { "/grctlext/{str=delay}", S_OK, VT_UI2 }, + { "/[0]grctlext/{str=delay}", S_OK, VT_UI2 }, + { "/grctlext/{wstr=delay}", S_OK, VT_UI2 }, + { "/[0]grctlext/{wstr=delay}", S_OK, VT_UI2 }, + { "/imgdesc/InterlaceFlag", S_OK, VT_BOOL }, + { "/imgdesc/{STR=interlaceFLAG}", S_OK, VT_BOOL }, + { "/imgdesc/{WSTR=interlaceFLAG}", S_OK, VT_BOOL }, + { "/grctlext", S_OK, VT_UNKNOWN }, + { "/[0]grctlext", S_OK, VT_UNKNOWN }, + { "/imgdesc", S_OK, VT_UNKNOWN }, + { "/[0]imgdesc", S_OK, VT_UNKNOWN }, + { "/LogSCRdesC", WINCODEC_ERR_PROPERTYNOTFOUND, 0 }, + { "/appEXT", WINCODEC_ERR_PROPERTYNOTFOUND, 0 }, + { "/grctlext/{\\str=delay}", WINCODEC_ERR_WRONGSTATE, 0 }, + { "/grctlext/{str=\\delay}", S_OK, VT_UI2 }, + { "grctlext/Delay", WINCODEC_ERR_PROPERTYNOTSUPPORTED, 0 }, + }; + static const WCHAR rootW[] = {'/',0}; + static const WCHAR guidW[] = {'/','{','g','u','i','d','=','\\',0}; + static const WCHAR imgdescW[] = {'i','m','g','d','e','s','c',0}; + static const WCHAR ImgDescW[] = {'I','m','g','D','e','s','c',0}; + WCHAR name[256], queryW[256]; + UINT len, i; + PROPVARIANT value; + IWICMetadataQueryReader *meta_reader; + + hr = IWICMetadataQueryReader_GetContainerFormat(queryreader, &format); + ok(hr == S_OK, "GetContainerFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_ContainerFormatGif), + "wrong container format %s\n", wine_dbgstr_guid(&format)); + + name[0] = 0; + len = 0xdeadbeef; + hr = IWICMetadataQueryReader_GetLocation(queryreader, 256, name, &len); + ok(hr == S_OK, "GetLocation error %#x\n", hr); + ok(len == 2, "expected 2, got %u\n", len); + ok(!lstrcmpW(name, rootW), "expected '/', got %s\n", wine_dbgstr_w(name)); + + for (i = 0; i < sizeof(frame_data)/sizeof(frame_data[0]); i++) + { + if (winetest_debug > 1) + trace("query: %s\n", frame_data[i].query); + MultiByteToWideChar(CP_ACP, 0, frame_data[i].query, -1, queryW, 256); + PropVariantInit(&value); + hr = IWICMetadataQueryReader_GetMetadataByName(queryreader, queryW, &value); + ok(hr == frame_data[i].hr, "GetMetadataByName(%s) returned %#x, expected %#x\n", wine_dbgstr_w(queryW), hr, frame_data[i].hr); + ok(value.vt == frame_data[i].vt, "expected %#x, got %#x\n", frame_data[i].vt, value.vt); + if (hr == S_OK && value.vt == VT_UNKNOWN) + { + hr = IUnknown_QueryInterface(value.punkVal, &IID_IWICMetadataQueryReader, (void **)&meta_reader); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + + name[0] = 0; + len = 0xdeadbeef; + hr = IWICMetadataQueryReader_GetLocation(meta_reader, 256, name, &len); + ok(hr == S_OK, "GetLocation error %#x\n", hr); + ok(len == lstrlenW(queryW) + 1, "expected %u, got %u\n", lstrlenW(queryW) + 1, len); + ok(!lstrcmpW(name, queryW), "expected %s, got %s\n", wine_dbgstr_w(queryW), wine_dbgstr_w(name)); + + IWICMetadataQueryReader_Release(meta_reader); + } + + PropVariantClear(&value); + } + + name[0] = 0; + len = 0xdeadbeef; + hr = WICMapGuidToShortName(&GUID_MetadataFormatIMD, 256, name, &len); + ok(hr == S_OK, "WICMapGuidToShortName error %#x\n", hr); + ok(!lstrcmpW(name, imgdescW), "wrong short name %s\n", wine_dbgstr_w(name)); + + format = GUID_NULL; + hr = WICMapShortNameToGuid(imgdescW, &format); + ok(hr == S_OK, "WICMapGuidToShortName error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_MetadataFormatIMD), "wrong guid %s\n", wine_dbgstr_guid(&format)); + + format = GUID_NULL; + hr = WICMapShortNameToGuid(ImgDescW, &format); + ok(hr == S_OK, "WICMapGuidToShortName error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_MetadataFormatIMD), "wrong guid %s\n", wine_dbgstr_guid(&format)); + + lstrcpyW(queryW, guidW); + StringFromGUID2(&GUID_MetadataFormatIMD, queryW + lstrlenW(queryW) - 1, 39); + memcpy(queryW, guidW, sizeof(guidW) - 2); + if (winetest_debug > 1) + trace("query: %s\n", wine_dbgstr_w(queryW)); + PropVariantInit(&value); + hr = IWICMetadataQueryReader_GetMetadataByName(queryreader, queryW, &value); + ok(hr == S_OK, "GetMetadataByName(%s) error %#x\n", wine_dbgstr_w(queryW), hr); + ok(value.vt == VT_UNKNOWN, "expected VT_UNKNOWN, got %#x\n", value.vt); + PropVariantClear(&value); + IWICMetadataQueryReader_Release(queryreader); } @@ -2252,10 +2452,610 @@ } } +struct metadata_item +{ + const char *schema, *id_str; + UINT id, type, value; +}; + +struct metadata_block +{ + const GUID *metadata_format; + UINT count; + const struct metadata_item *item; +}; + +struct metadata +{ + const GUID *container_format; + UINT count; + const struct metadata_block *block; +}; + +static const struct metadata *current_metadata; +static const struct metadata_block *current_metadata_block; + +static char the_best[] = "The Best"; +static char the_worst[] = "The Worst"; + +static HRESULT WINAPI mdr_QueryInterface(IWICMetadataReader *iface, REFIID iid, void **out) +{ + trace("%p,%s,%p\n", iface, wine_dbgstr_guid(iid), out); + + if (IsEqualIID(iid, &IID_IUnknown) || + IsEqualIID(iid, &IID_IWICMetadataReader)) + { + *out = iface; + return S_OK; + } + + ok(0, "unknown iid %s\n", wine_dbgstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI mdr_AddRef(IWICMetadataReader *iface) +{ + return 2; +} + +static ULONG WINAPI mdr_Release(IWICMetadataReader *iface) +{ + return 1; +} + +static HRESULT WINAPI mdr_GetMetadataFormat(IWICMetadataReader *iface, GUID *format) +{ + trace("%p,%p\n", iface, format); + + ok(current_metadata_block != NULL, "current_metadata_block can't be NULL\n"); + if (!current_metadata_block) return E_POINTER; + + *format = *current_metadata_block->metadata_format; + return S_OK; +} + +static HRESULT WINAPI mdr_GetMetadataHandlerInfo(IWICMetadataReader *iface, IWICMetadataHandlerInfo **handler) +{ + ok(0, "not implemented\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI mdr_GetCount(IWICMetadataReader *iface, UINT *count) +{ + trace("%p,%p\n", iface, count); + + ok(current_metadata_block != NULL, "current_metadata_block can't be NULL\n"); + if (!current_metadata_block) return E_POINTER; + + *count = current_metadata_block->count; + return S_OK; +} + +static HRESULT WINAPI mdr_GetValueByIndex(IWICMetadataReader *iface, UINT index, PROPVARIANT *schema, PROPVARIANT *id, PROPVARIANT *value) +{ + ok(0, "not implemented\n"); + return E_NOTIMPL; +} + +static char *get_temp_buffer(int size) +{ + static char buf[16][256]; + static int idx; + char *p; + + assert(size < 256); + + p = buf[idx & 0x0f]; + idx++; + return p; +} + +static const char *wine_dbgstr_propvariant(const PROPVARIANT *var) +{ + char *ret; + + if (!var) return "(null)"; + + switch (var->vt) + { + case VT_LPWSTR: + ret = get_temp_buffer(lstrlenW(U(*var).pwszVal) + 16); + sprintf(ret, "(VT_LPWSTR:%s)", wine_dbgstr_w(U(*var).pwszVal)); + break; + + case VT_LPSTR: + ret = get_temp_buffer(lstrlenA(U(*var).pszVal) + 16); + sprintf(ret, "(VT_LPSTR:%s)", U(*var).pszVal); + break; + + default: + ret = get_temp_buffer(16); + sprintf(ret, "(vt:%u)", var->vt); + break; + } + + return ret; +} + +static int propvar_cmp(const PROPVARIANT *v1, LONGLONG value2) +{ + LONGLONG value1; + + if (PropVariantToInt64(v1, &value1) != S_OK) return -1; + + value1 -= value2; + if (value1) return value1 < 0 ? -1 : 1; + return 0; +} + +static HRESULT WINAPI mdr_GetValue(IWICMetadataReader *iface, const PROPVARIANT *schema, const PROPVARIANT *id, PROPVARIANT *value) +{ + UINT i; + + trace("%p,%s,%s,%s\n", iface, wine_dbgstr_propvariant(schema), wine_dbgstr_propvariant(id), wine_dbgstr_propvariant(value)); + + ok(current_metadata_block != NULL, "current_metadata_block can't be NULL\n"); + if (!current_metadata_block) return E_POINTER; + + ok(schema != NULL && id != NULL && value != NULL, "%p, %p, %p should not be NULL\n", schema, id, value); + + for (i = 0; i < current_metadata_block->count; i++) + { + if (schema->vt != VT_EMPTY) + { + if (!current_metadata_block->item[i].schema) + continue; + + switch (schema->vt) + { + case VT_LPSTR: + if (lstrcmpA(U(*schema).pszVal, current_metadata_block->item[i].schema) != 0) + continue; + break; + + case VT_LPWSTR: + { + char schemaA[256]; + WideCharToMultiByte(CP_ACP, 0, U(*schema).pwszVal, -1, schemaA, sizeof(schemaA), NULL, NULL); + if (lstrcmpA(schemaA, current_metadata_block->item[i].schema) != 0) + continue; + break; + } + + default: + ok(0, "unsupported schema vt %u\n", schema->vt); + continue; + } + } + else if (current_metadata_block->item[i].schema) + continue; + + switch (id->vt) + { + case VT_LPSTR: + if (current_metadata_block->item[i].id_str) + { + if (!lstrcmpA(U(*id).pszVal, current_metadata_block->item[i].id_str)) + { + value->vt = VT_LPSTR; + U(*value).pszVal = the_best; + return S_OK; + } + break; + } + break; + + case VT_LPWSTR: + if (current_metadata_block->item[i].id_str) + { + char idA[256]; + WideCharToMultiByte(CP_ACP, 0, U(*id).pwszVal, -1, idA, sizeof(idA), NULL, NULL); + if (!lstrcmpA(idA, current_metadata_block->item[i].id_str)) + { + value->vt = VT_LPSTR; + U(*value).pszVal = the_worst; + return S_OK; + } + break; + } + break; + + case VT_CLSID: + if (IsEqualGUID(U(*id).puuid, &GUID_MetadataFormatXMP) || + IsEqualGUID(U(*id).puuid, &GUID_ContainerFormatTiff)) + { + value->vt = VT_UNKNOWN; + value->punkVal = (IUnknown *)iface; + return S_OK; + } + break; + + default: + if (!propvar_cmp(id, current_metadata_block->item[i].id)) + { + value->vt = current_metadata_block->item[i].type; + U(*value).uiVal = current_metadata_block->item[i].value; + return S_OK; + } + break; + } + } + + return 0xdeadbeef; +} + +static HRESULT WINAPI mdr_GetEnumerator(IWICMetadataReader *iface, IWICEnumMetadataItem **enumerator) +{ + ok(0, "not implemented\n"); + return E_NOTIMPL; +} + +static /* const */ IWICMetadataReaderVtbl mdr_vtbl = +{ + mdr_QueryInterface, + mdr_AddRef, + mdr_Release, + mdr_GetMetadataFormat, + mdr_GetMetadataHandlerInfo, + mdr_GetCount, + mdr_GetValueByIndex, + mdr_GetValue, + mdr_GetEnumerator +}; + +static IWICMetadataReader mdr = { &mdr_vtbl }; + +static HRESULT WINAPI mdbr_QueryInterface(IWICMetadataBlockReader *iface, REFIID iid, void **out) +{ + if (IsEqualIID(iid, &IID_IUnknown) || + IsEqualIID(iid, &IID_IWICMetadataBlockReader)) + { + *out = iface; + return S_OK; + } + + /* Windows 8/10 query for some undocumented IID */ + if (!IsEqualIID(iid, &IID_MdbrUnknown)) + ok(0, "unknown iid %s\n", wine_dbgstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI mdbr_AddRef(IWICMetadataBlockReader *iface) +{ + return 2; +} + +static ULONG WINAPI mdbr_Release(IWICMetadataBlockReader *iface) +{ + return 1; +} + +static HRESULT WINAPI mdbr_GetContainerFormat(IWICMetadataBlockReader *iface, GUID *format) +{ + trace("%p,%p\n", iface, format); + + ok(current_metadata != NULL, "current_metadata can't be NULL\n"); + if (!current_metadata) return E_POINTER; + + *format = *current_metadata->container_format; + return S_OK; +} + +static HRESULT WINAPI mdbr_GetCount(IWICMetadataBlockReader *iface, UINT *count) +{ + trace("%p,%p\n", iface, count); + + ok(current_metadata != NULL, "current_metadata can't be NULL\n"); + if (!current_metadata) return E_POINTER; + + *count = current_metadata->count; + return S_OK; +} + +static HRESULT WINAPI mdbr_GetReaderByIndex(IWICMetadataBlockReader *iface, UINT index, IWICMetadataReader **out) +{ + trace("%p,%u,%p\n", iface, index, out); + + *out = NULL; + + ok(current_metadata != NULL, "current_metadata can't be NULL\n"); + if (!current_metadata) return E_POINTER; + + if (index < current_metadata->count) + { + current_metadata_block = &current_metadata->block[index]; + *out = &mdr; + return S_OK; + } + + current_metadata_block = NULL; + return E_INVALIDARG; +} + +static HRESULT WINAPI mdbr_GetEnumerator(IWICMetadataBlockReader *iface, IEnumUnknown **enumerator) +{ + ok(0, "not implemented\n"); + return E_NOTIMPL; +} + +static /* const */ IWICMetadataBlockReaderVtbl mdbr_vtbl = +{ + mdbr_QueryInterface, + mdbr_AddRef, + mdbr_Release, + mdbr_GetContainerFormat, + mdbr_GetCount, + mdbr_GetReaderByIndex, + mdbr_GetEnumerator +}; + +static IWICMetadataBlockReader mdbr = { &mdbr_vtbl }; + +static const char xmp[] = "http://ns.adobe.com/xap/1.0/"; +static const char dc[] = "http://purl.org/dc/elements/1.1/"; +static const char tiff[] = "http://ns.adobe.com/tiff/1.0/"; + +static const struct metadata_item item1[] = +{ + { NULL, NULL, 1, 2, 3 } +}; + +static const struct metadata_item item2[] = +{ + { NULL, NULL, 1, 2, 3 }, + { "xmp", "Rating", 4, 5, 6 }, + { NULL, "Rating", 7, 8, 9 } +}; + +static const struct metadata_item item3[] = +{ + { NULL, NULL, 1, 2, 3 }, + { NULL, NULL, 4, 5, 6 }, + { NULL, NULL, 7, 8, 9 }, + { NULL, NULL, 10, 11, 12 } +}; + +static const struct metadata_item item4[] = +{ + { NULL, NULL, 1, 2, 3 }, + { xmp, "Rating", 4, 5, 6 }, + { dc, NULL, 7, 8, 9 }, + { tiff, NULL, 10, 11, 12 }, + { NULL, "RATING", 13, 14, 15 }, + { NULL, "R}ATING", 16, 17, 18 }, + { NULL, "xmp", 19, 20, 21 } +}; + +static const struct metadata_block block1[] = +{ + { &GUID_MetadataFormatIfd, 1, item1 } +}; + +static const struct metadata_block block2[] = +{ + { &GUID_MetadataFormatXMP, 1, item1 }, + { &GUID_MetadataFormatIfd, 3, item2 } +}; + +static const struct metadata_block block3[] = +{ + { &GUID_MetadataFormatXMP, 1, item1 }, + { &GUID_MetadataFormatIfd, 3, item2 }, + { &GUID_MetadataFormatXMP, 4, item3 }, + { &GUID_MetadataFormatXMP, 7, item4 }, + { &GUID_MetadataFormatIfd, 7, item4 } +}; + +static const struct metadata data1 = +{ + &GUID_ContainerFormatGif, + 1, block1 +}; + +static const struct metadata data2 = +{ + &GUID_ContainerFormatTiff, + 2, block2 +}; + +static const struct metadata data3 = +{ + &GUID_ContainerFormatPng, + 5, block3 +}; + +static void test_queryreader(void) +{ + static const char q1[] = "/ifd/{uchar=1}"; + static const char q2[] = "/ifd/xmp:{long=4}"; + static const char q3[] = "/ifd/{str=xmp}:{uint=4}"; + static const char q4[] = "/xmp/{char=7}"; + static const char q5[] = "/[1]xmp/{short=7}"; + static const char q6[] = "/[1]ifd/{str=dc}:{uint=7}"; + static const char q7[] = "/[1]ifd/{str=http://purl.org/dc/elements/1.1/}:{longlong=7}"; + static const char q8[] = "/[1]ifd/{str=http://ns.adobe.com/tiff/1.0/}:{int=10}"; + static const char q9[] = "/[2]xmp/xmp:{ulong=4}"; + static const char q10[] = "/[2]xmp/{str=xmp}:{ulong=4}"; + static const char q11[] = "/xmp"; + static const char q12[] = "/ifd/xmp"; + static const char q13[] = "/ifd/xmp/tiff"; + static const char q14[] = "/[0]ifd/[0]xmp/[0]tiff"; + static const char q15[] = "/[*]xmp"; + + static const char q20[] = "/ifd/\\Rating"; + static const char q21[] = "/[0]ifd/Rating"; + static const char q22[] = "/[2]xmp/xmp:{str=Rating}"; + static const char q23[] = "/[2]xmp/xmp:Rating"; + + static const char q24[] = "/[1]ifd/{str=http://ns.adobe.com/xap/1.0/}:Rating"; + static const char q25[] = "/[1]ifd/{str=http://ns.adobe.com/xap/1.0/}:{str=Rating}"; + static const char q26[] = "/[1]ifd/{wstr=\\RATING}"; + static const char q27[] = "/[1]ifd/{str=R\\ATING}"; + static const char q28[] = "/[1]ifd/{str=R\\}ATING}"; + + static const char q40[] = "[0]/ifd/Rating"; + static const char q41[] = "/[+1]ifd/Rating"; + static const char q42[] = "/[-1]ifd/Rating"; + static const char q43[] = "/ifd/{\\str=Rating}"; + static const char q44[] = "/ifd/{badtype=0}"; + static const char q45[] = "/ifd/{uint=0x1234}"; + static const char q46[] = "/ifd/[0]Rating"; + static const char q47[] = "/ifd/[*]Rating"; + static const struct + { + BOOL todo; + const struct metadata *data; + const char *query; + HRESULT hr; + UINT vt, value; + const char *str_value; + } test_data[] = + { + { FALSE, &data1, q1, S_OK, 2, 3, NULL }, + { FALSE, &data2, q2, S_OK, 5, 6, NULL }, + { FALSE, &data2, q3, S_OK, 5, 6, NULL }, + { FALSE, &data3, q4, 0xdeadbeef }, + { FALSE, &data3, q5, S_OK, 8, 9, NULL }, + { FALSE, &data3, q6, 0xdeadbeef }, + { FALSE, &data3, q7, S_OK, 8, 9, NULL }, + { FALSE, &data3, q8, S_OK, 11, 12, NULL }, + { FALSE, &data3, q9, S_OK, 5, 6, NULL }, + { FALSE, &data3, q10, 0xdeadbeef }, + + { FALSE, &data3, q11, S_OK, VT_UNKNOWN, 0, NULL }, + { FALSE, &data3, q12, S_OK, VT_UNKNOWN, 0, NULL }, + { FALSE, &data3, q13, S_OK, VT_UNKNOWN, 0, NULL }, + { FALSE, &data3, q14, S_OK, VT_UNKNOWN, 0, NULL }, + { TRUE, &data3, q15, S_OK, VT_LPSTR, 0, the_worst }, + + { FALSE, &data3, q20, S_OK, VT_LPSTR, 0, the_worst }, + { FALSE, &data3, q21, S_OK, VT_LPSTR, 0, the_worst }, + { FALSE, &data3, q22, S_OK, VT_LPSTR, 0, the_best }, + { FALSE, &data3, q23, S_OK, VT_LPSTR, 0, the_worst }, + { FALSE, &data3, q24, S_OK, VT_LPSTR, 0, the_worst }, + { FALSE, &data3, q25, S_OK, VT_LPSTR, 0, the_best }, + { FALSE, &data3, q26, S_OK, VT_LPSTR, 0, the_worst }, + { FALSE, &data3, q27, S_OK, VT_LPSTR, 0, the_best }, + { FALSE, &data3, q28, S_OK, VT_LPSTR, 0, the_best }, + + { FALSE, &data1, q40, WINCODEC_ERR_PROPERTYNOTSUPPORTED }, + { TRUE, &data1, q41, WINCODEC_ERR_INVALIDQUERYCHARACTER }, + { TRUE, &data1, q42, WINCODEC_ERR_INVALIDQUERYCHARACTER }, + { FALSE, &data1, q43, WINCODEC_ERR_WRONGSTATE }, + { FALSE, &data1, q44, WINCODEC_ERR_WRONGSTATE }, + { TRUE, &data1, q45, DISP_E_TYPEMISMATCH }, + { TRUE, &data1, q46, E_INVALIDARG }, + { TRUE, &data1, q47, WINCODEC_ERR_REQUESTONLYVALIDATMETADATAROOT }, + }; + WCHAR queryW[256]; + HRESULT hr; + IWICComponentFactory *factory; + IWICMetadataQueryReader *reader; + GUID format; + PROPVARIANT value; + UINT i; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICComponentFactory, (void **)&factory); + ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); + + hr = IWICComponentFactory_CreateQueryReaderFromBlockReader(factory, &mdbr, &reader); + ok(hr == S_OK, "CreateQueryReaderFromBlockReader error %#x\n", hr); + + for (i = 0; i < sizeof(test_data)/sizeof(test_data[0]); i++) + { + current_metadata = test_data[i].data; + + hr = IWICMetadataQueryReader_GetContainerFormat(reader, &format); + ok(hr == S_OK, "%u: GetContainerFormat error %#x\n", i, hr); + ok(IsEqualGUID(&format, test_data[i].data->container_format), "%u: expected %s, got %s\n", + i, wine_dbgstr_guid(test_data[i].data->container_format), wine_dbgstr_guid(&format)); + + MultiByteToWideChar(CP_ACP, 0, test_data[i].query, -1, queryW, 256); + PropVariantInit(&value); + hr = IWICMetadataQueryReader_GetMetadataByName(reader, queryW, &value); + todo_wine_if(test_data[i].todo) + ok(hr == test_data[i].hr, "%u: expected %#x, got %#x\n", i, test_data[i].hr, hr); + if (hr == S_OK) + { + ok(value.vt == test_data[i].vt, "%u: expected %u, got %u\n", i, test_data[i].vt, value.vt); + if (test_data[i].vt == value.vt) + { + if (value.vt == VT_UNKNOWN) + { + IWICMetadataQueryReader *new_reader; + WCHAR location[256]; + UINT len; + + hr = IUnknown_QueryInterface(value.punkVal, &IID_IWICMetadataQueryReader, (void **)&new_reader); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + + location[0] = 0; + len = 0xdeadbeef; + hr = IWICMetadataQueryReader_GetLocation(new_reader, 256, location, &len); + ok(hr == S_OK, "GetLocation error %#x\n", hr); + ok(len == lstrlenW(queryW) + 1, "expected %u, got %u\n", lstrlenW(queryW) + 1, len); + ok(!lstrcmpW(location, queryW), "expected %s, got %s\n", wine_dbgstr_w(queryW), wine_dbgstr_w(location)); + + hr = IWICMetadataQueryReader_GetLocation(new_reader, 256, location, NULL); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + + location[0] = 0; + len = 0xdeadbeef; + hr = IWICMetadataQueryReader_GetLocation(new_reader, 3, location, &len); + ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "got %#x\n", hr); + ok(len == 0xdeadbeef, "got %u\n", len); + ok(!location[0], "got %s\n", wine_dbgstr_w(location)); + + location[0] = 0; + len = 0xdeadbeef; + hr = IWICMetadataQueryReader_GetLocation(new_reader, 0, location, &len); + ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "got %#x\n", hr); + ok(len == 0xdeadbeef, "got %u\n", len); + ok(!location[0], "got %s\n", wine_dbgstr_w(location)); + + len = 0xdeadbeef; + hr = IWICMetadataQueryReader_GetLocation(new_reader, 0, NULL, &len); + ok(hr == S_OK, "GetLocation error %#x\n", hr); + ok(len == lstrlenW(queryW) + 1, "expected %u, got %u\n", lstrlenW(queryW) + 1, len); + + len = 0xdeadbeef; + hr = IWICMetadataQueryReader_GetLocation(new_reader, 3, NULL, &len); + ok(hr == S_OK, "GetLocation error %#x\n", hr); + ok(len == lstrlenW(queryW) + 1, "expected %u, got %u\n", lstrlenW(queryW) + 1, len); + + hr = IWICMetadataQueryReader_GetLocation(new_reader, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + + IWICMetadataQueryReader_Release(new_reader); + } + else if (value.vt == VT_LPSTR) + ok(!lstrcmpA(U(value).pszVal, test_data[i].str_value), "%u: expected %s, got %s\n", + i, test_data[i].str_value, U(value).pszVal); + else + ok(U(value).uiVal == test_data[i].value, "%u: expected %u, got %u\n", + i, test_data[i].value, U(value).uiVal); + } + + /* + * Do NOT call PropVariantClear(&value) for fake value types. + */ + } + } + + IWICMetadataQueryReader_Release(reader); + IWICComponentFactory_Release(factory); +} + START_TEST(metadata) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + test_queryreader(); test_WICMapGuidToShortName(); test_WICMapShortNameToGuid(); test_WICMapSchemaToName();

1 0

[akhaldi] 75953: [PSDK] Update wincodec.idl and winerror.h. [WINDOWSCODECS] Sync with Wine Staging 2.16. CORE-13762 b2229cc windowscodecs: Add support for CMYK to BGR conversion. 22b69e6 windowscod...
by akhaldi＠svn.reactos.org 24 Sep '17

24 Sep '17

Author: akhaldi Date: Sun Sep 24 11:19:07 2017 New Revision: 75953 URL: http://svn.reactos.org/svn/reactos?rev=75953&view=rev Log: [PSDK] Update wincodec.idl and winerror.h. [WINDOWSCODECS] Sync with Wine Staging 2.16. CORE-13762 b2229cc windowscodecs: Add support for CMYK to BGR conversion. 22b69e6 windowscodecs: Move JPEG frame image data initialization from Frame::CopyPixels to Decoder::Initialize. (v2) b635fa0 windowscodecs: Move additional processing out of the JPEG decoding loop. 80649c5 windowscodecs: Fix stride calculation in JPEG decoder. 0d88ec1 windowscodecs: Fix IWICBitmapEncoder::SetPalette for a not initialized case in JPEG encoder. 267bca1 windowscodecs: PNGEncoder: Return 32bppRGBA pixel format by default. 8bae213 windowscodecs: Fix 32bppGrayFloat to 8bppGray conversion. 8648aaf wincodecs: Add encoder options for JPEG. 2eeef78 windowscodecs: Fix a memory leak. c092f1a windowscodecs: Add some tests for IWICMetadataQueryReader. 2271ba8 windowscodecs: Add initial implementation of IWICMetadataQueryReader::GetMetadataByName. d3280c8 windowscodecs: Implement IWICBitmapDecoder::GetMetadataQueryReader in the GIF decoder. c94bf3c windowscodecs: Implement IWICMetadataQueryReader::GetLocation. 3059668 windowscodecs: Use PropVariantCompareEx to compare metadata items. f258903 windowscodecs: Implement IWICMetadataQueryReader::GetContainerFormat. 714175e windowscodecs: Implement WICMapSchemaToName. e1eed88 windowscodecs: Implement WICMapShortNameToGuid. 37ae4f2 windowscodecs: Implement WICMapGuidToShortName. cf1269a windowscodecs: Register WICImagingFactory2 interface. Modified: trunk/reactos/dll/win32/windowscodecs/converter.c trunk/reactos/dll/win32/windowscodecs/gifformat.c trunk/reactos/dll/win32/windowscodecs/imgfactory.c trunk/reactos/dll/win32/windowscodecs/jpegformat.c trunk/reactos/dll/win32/windowscodecs/metadatahandler.c trunk/reactos/dll/win32/windowscodecs/metadataquery.c trunk/reactos/dll/win32/windowscodecs/pngformat.c trunk/reactos/dll/win32/windowscodecs/tiffformat.c trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h trunk/reactos/dll/win32/windowscodecs/windowscodecs_wincodec.idl trunk/reactos/dll/win32/windowscodecs/windowscodecs_wincodec.rgs trunk/reactos/media/doc/README.WINE trunk/reactos/sdk/include/psdk/wincodec.idl trunk/reactos/sdk/include/psdk/winerror.h Modified: trunk/reactos/dll/win32/windowscodecs/converter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/co… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/converter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/converter.c [iso-8859-1] Sun Sep 24 11:19:07 2017 @@ -1072,6 +1072,48 @@ } return S_OK; + case format_32bppCMYK: + if (prc) + { + BYTE *srcdata; + UINT srcstride, srcdatasize; + + srcstride = 4 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + hr = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + if (SUCCEEDED(hr)) + { + INT x, y; + BYTE *src = srcdata, *dst = pbBuffer; + + for (y = 0; y < prc->Height; y++) + { + BYTE *cmyk = src; + BYTE *bgr = dst; + + for (x = 0; x < prc->Width; x++) + { + BYTE c = cmyk[0], m = cmyk[1], y = cmyk[2], k = cmyk[3]; + bgr[0] = (255 - y) * (255 - k) / 255; /* B */ + bgr[1] = (255 - m) * (255 - k) / 255; /* G */ + bgr[2] = (255 - c) * (255 - k) / 255; /* R */ + cmyk += 4; + bgr += 3; + } + src += srcstride; + dst += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + return hr; + } + return S_OK; + default: FIXME("Unimplemented conversion path!\n"); return WINCODEC_ERR_UNSUPPORTEDOPERATION; @@ -1209,6 +1251,43 @@ return S_OK; } + if (source_format == format_32bppGrayFloat) + { + hr = S_OK; + + if (prc) + { + srcstride = 4 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + hr = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + if (SUCCEEDED(hr)) + { + INT x, y; + BYTE *src = srcdata, *dst = pbBuffer; + + for (y=0; y < prc->Height; y++) + { + float *srcpixel = (float*)src; + BYTE *dstpixel = dst; + + for (x=0; x < prc->Width; x++) + *dstpixel++ = (BYTE)floorf(to_sRGB_component(*srcpixel++) * 255.0f + 0.51f); + + src += srcstride; + dst += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + } + + return hr; + } + srcstride = 3 * prc->Width; srcdatasize = srcstride * prc->Height; @@ -1229,12 +1308,7 @@ { float gray = (bgr[2] * 0.2126f + bgr[1] * 0.7152f + bgr[0] * 0.0722f) / 255.0f; - /* conversion from 32bppGrayFloat to 24bppBGR has already applied sRGB gamma */ - if (source_format == format_32bppGrayFloat) - gray *= 255.0f; - else - gray = to_sRGB_component(gray) * 255.0f; - + gray = to_sRGB_component(gray) * 255.0f; dst[x] = (BYTE)floorf(gray + 0.51f); bgr += 3; } Modified: trunk/reactos/dll/win32/windowscodecs/gifformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/gi… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/gifformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/gifformat.c [iso-8859-1] Sun Sep 24 11:19:07 2017 @@ -810,7 +810,7 @@ if (!ppIMetadataQueryReader) return E_INVALIDARG; - return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, ppIMetadataQueryReader); + return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, NULL, ppIMetadataQueryReader); } static HRESULT WINAPI GifFrameDecode_GetColorContexts(IWICBitmapFrameDecode *iface, @@ -1239,8 +1239,13 @@ static HRESULT WINAPI GifDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, IWICMetadataQueryReader **ppIMetadataQueryReader) { + GifDecoder *This = impl_from_IWICBitmapDecoder(iface); + TRACE("(%p,%p)\n", iface, ppIMetadataQueryReader); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; + + if (!ppIMetadataQueryReader) return E_INVALIDARG; + + return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, NULL, ppIMetadataQueryReader); } static HRESULT WINAPI GifDecoder_GetPreview(IWICBitmapDecoder *iface, Modified: trunk/reactos/dll/win32/windowscodecs/imgfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/im… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/imgfactory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/imgfactory.c [iso-8859-1] Sun Sep 24 11:19:07 2017 @@ -1113,7 +1113,7 @@ if (!block_reader || !query_reader) return E_INVALIDARG; - return MetadataQueryReader_CreateInstance(block_reader, query_reader); + return MetadataQueryReader_CreateInstance(block_reader, NULL, query_reader); } static HRESULT WINAPI ComponentFactory_CreateQueryWriterFromBlockWriter(IWICComponentFactory *iface, Modified: trunk/reactos/dll/win32/windowscodecs/jpegformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/jp… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/jpegformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/jpegformat.c [iso-8859-1] Sun Sep 24 11:19:07 2017 @@ -42,6 +42,13 @@ static void *libjpeg_handle; +static const WCHAR wszImageQuality[] = {'I','m','a','g','e','Q','u','a','l','i','t','y',0}; +static const WCHAR wszBitmapTransform[] = {'B','i','t','m','a','p','T','r','a','n','s','f','o','r','m',0}; +static const WCHAR wszLuminance[] = {'L','u','m','i','n','a','n','c','e',0}; +static const WCHAR wszChrominance[] = {'C','h','r','o','m','i','n','a','n','c','e',0}; +static const WCHAR wszJpegYCrCbSubsampling[] = {'J','p','e','g','Y','C','r','C','b','S','u','b','s','a','m','p','l','i','n','g',0}; +static const WCHAR wszSuppressApp0[] = {'S','u','p','p','r','e','s','s','A','p','p','0',0}; + #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(jpeg_CreateCompress); MAKE_FUNCPTR(jpeg_CreateDecompress); @@ -130,6 +137,7 @@ struct jpeg_error_mgr jerr; struct jpeg_source_mgr source_mgr; BYTE source_buffer[1024]; + UINT bpp, stride; BYTE *image_data; CRITICAL_SECTION lock; } JpegDecoder; @@ -278,6 +286,8 @@ int ret; LARGE_INTEGER seek; jmp_buf jmpbuf; + UINT data_size, i; + TRACE("(%p,%p,%u)\n", iface, pIStream, cacheOptions); EnterCriticalSection(&This->lock); @@ -354,6 +364,55 @@ ERR("jpeg_start_decompress failed\n"); LeaveCriticalSection(&This->lock); return E_FAIL; + } + + if (This->cinfo.out_color_space == JCS_GRAYSCALE) This->bpp = 8; + else if (This->cinfo.out_color_space == JCS_CMYK) This->bpp = 32; + else This->bpp = 24; + + This->stride = (This->bpp * This->cinfo.output_width + 7) / 8; + data_size = This->stride * This->cinfo.output_height; + + This->image_data = HeapAlloc(GetProcessHeap(), 0, data_size); + if (!This->image_data) + { + LeaveCriticalSection(&This->lock); + return E_OUTOFMEMORY; + } + + while (This->cinfo.output_scanline < This->cinfo.output_height) + { + UINT first_scanline = This->cinfo.output_scanline; + UINT max_rows; + JSAMPROW out_rows[4]; + JDIMENSION ret; + + max_rows = min(This->cinfo.output_height-first_scanline, 4); + for (i=0; i<max_rows; i++) + out_rows[i] = This->image_data + This->stride * (first_scanline+i); + + ret = pjpeg_read_scanlines(&This->cinfo, out_rows, max_rows); + if (ret == 0) + { + ERR("read_scanlines failed\n"); + LeaveCriticalSection(&This->lock); + return E_FAIL; + } + } + + if (This->bpp == 24) + { + /* libjpeg gives us RGB data and we want BGR, so byteswap the data */ + reverse_bgr8(3, This->image_data, + This->cinfo.output_width, This->cinfo.output_height, + This->stride); + } + + if (This->cinfo.out_color_space == JCS_CMYK && This->cinfo.saw_Adobe_marker) + { + /* Adobe JPEG's have inverted CMYK data. */ + for (i=0; i<data_size; i++) + This->image_data[i] ^= 0xff; } This->initialized = TRUE; @@ -576,98 +635,11 @@ const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) { JpegDecoder *This = impl_from_IWICBitmapFrameDecode(iface); - UINT bpp; - UINT stride; - UINT data_size; - UINT max_row_needed; - jmp_buf jmpbuf; - WICRect rect; + TRACE("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); - if (!prc) - { - rect.X = 0; - rect.Y = 0; - rect.Width = This->cinfo.output_width; - rect.Height = This->cinfo.output_height; - prc = &rect; - } - else - { - if (prc->X < 0 || prc->Y < 0 || prc->X+prc->Width > This->cinfo.output_width || - prc->Y+prc->Height > This->cinfo.output_height) - return E_INVALIDARG; - } - - if (This->cinfo.out_color_space == JCS_GRAYSCALE) bpp = 8; - else if (This->cinfo.out_color_space == JCS_CMYK) bpp = 32; - else bpp = 24; - - stride = bpp * This->cinfo.output_width; - data_size = stride * This->cinfo.output_height; - - max_row_needed = prc->Y + prc->Height; - if (max_row_needed > This->cinfo.output_height) return E_INVALIDARG; - - EnterCriticalSection(&This->lock); - - if (!This->image_data) - { - This->image_data = HeapAlloc(GetProcessHeap(), 0, data_size); - if (!This->image_data) - { - LeaveCriticalSection(&This->lock); - return E_OUTOFMEMORY; - } - } - - This->cinfo.client_data = jmpbuf; - - if (setjmp(jmpbuf)) - { - LeaveCriticalSection(&This->lock); - return E_FAIL; - } - - while (max_row_needed > This->cinfo.output_scanline) - { - UINT first_scanline = This->cinfo.output_scanline; - UINT max_rows; - JSAMPROW out_rows[4]; - UINT i; - JDIMENSION ret; - - max_rows = min(This->cinfo.output_height-first_scanline, 4); - for (i=0; i<max_rows; i++) - out_rows[i] = This->image_data + stride * (first_scanline+i); - - ret = pjpeg_read_scanlines(&This->cinfo, out_rows, max_rows); - - if (ret == 0) - { - ERR("read_scanlines failed\n"); - LeaveCriticalSection(&This->lock); - return E_FAIL; - } - - if (bpp == 24) - { - /* libjpeg gives us RGB data and we want BGR, so byteswap the data */ - reverse_bgr8(3, This->image_data + stride * first_scanline, - This->cinfo.output_width, This->cinfo.output_scanline - first_scanline, - stride); - } - - if (This->cinfo.out_color_space == JCS_CMYK && This->cinfo.saw_Adobe_marker) - /* Adobe JPEG's have inverted CMYK data. */ - for (i=0; i<data_size; i++) - This->image_data[i] ^= 0xff; - } - - LeaveCriticalSection(&This->lock); - - return copy_pixels(bpp, This->image_data, - This->cinfo.output_width, This->cinfo.output_height, stride, + return copy_pixels(This->bpp, This->image_data, + This->cinfo.output_width, This->cinfo.output_height, This->stride, prc, cbStride, cbBufferSize, pbBuffer); } @@ -681,7 +653,7 @@ if (!ppIMetadataQueryReader) return E_INVALIDARG; - return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, ppIMetadataQueryReader); + return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, NULL, ppIMetadataQueryReader); } static HRESULT WINAPI JpegDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *iface, @@ -1062,7 +1034,7 @@ EnterCriticalSection(&This->lock); - if (This->initialized) + if (This->frame_initialized) hr = IWICPalette_GetColors(palette, 256, This->palette, &This->colors); else hr = WINCODEC_ERR_NOTINITIALIZED; @@ -1399,8 +1371,18 @@ static HRESULT WINAPI JpegEncoder_SetPalette(IWICBitmapEncoder *iface, IWICPalette *pIPalette) { + JpegEncoder *This = impl_from_IWICBitmapEncoder(iface); + HRESULT hr; + TRACE("(%p,%p)\n", iface, pIPalette); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; + + EnterCriticalSection(&This->lock); + + hr = This->initialized ? WINCODEC_ERR_UNSUPPORTEDOPERATION : WINCODEC_ERR_NOTINITIALIZED; + + LeaveCriticalSection(&This->lock); + + return hr; } static HRESULT WINAPI JpegEncoder_SetThumbnail(IWICBitmapEncoder *iface, IWICBitmapSource *pIThumbnail) @@ -1420,6 +1402,7 @@ { JpegEncoder *This = impl_from_IWICBitmapEncoder(iface); HRESULT hr; + PROPBAG2 opts[6] = {{0}}; TRACE("(%p,%p,%p)\n", iface, ppIFrameEncode, ppIEncoderOptions); @@ -1437,9 +1420,28 @@ return WINCODEC_ERR_NOTINITIALIZED; } + opts[0].pstrName = (LPOLESTR)wszImageQuality; + opts[0].vt = VT_R4; + opts[0].dwType = PROPBAG2_TYPE_DATA; + opts[1].pstrName = (LPOLESTR)wszBitmapTransform; + opts[1].vt = VT_UI1; + opts[1].dwType = PROPBAG2_TYPE_DATA; + opts[2].pstrName = (LPOLESTR)wszLuminance; + opts[2].vt = VT_I4|VT_ARRAY; + opts[2].dwType = PROPBAG2_TYPE_DATA; + opts[3].pstrName = (LPOLESTR)wszChrominance; + opts[3].vt = VT_I4|VT_ARRAY; + opts[3].dwType = PROPBAG2_TYPE_DATA; + opts[4].pstrName = (LPOLESTR)wszJpegYCrCbSubsampling; + opts[4].vt = VT_UI1; + opts[4].dwType = PROPBAG2_TYPE_DATA; + opts[5].pstrName = (LPOLESTR)wszSuppressApp0; + opts[5].vt = VT_BOOL; + opts[5].dwType = PROPBAG2_TYPE_DATA; + if (ppIEncoderOptions) { - hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); + hr = CreatePropertyBag2(opts, 6, ppIEncoderOptions); if (FAILED(hr)) { LeaveCriticalSection(&This->lock); Modified: trunk/reactos/dll/win32/windowscodecs/metadatahandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/me… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/metadatahandler.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/metadatahandler.c [iso-8859-1] Sun Sep 24 11:19:07 2017 @@ -198,29 +198,6 @@ return hr; } -/* FiXME: Use propsys.PropVariantCompareEx once it's implemented */ -static int propvar_cmp(const PROPVARIANT *v1, const PROPVARIANT *v2) -{ - LONGLONG value1, value2; - - if (v1->vt == VT_LPSTR && v2->vt == VT_LPSTR) - { - return lstrcmpA(v1->u.pszVal, v2->u.pszVal); - } - - if (v1->vt == VT_LPWSTR && v2->vt == VT_LPWSTR) - { - return lstrcmpiW(v1->u.pwszVal, v2->u.pwszVal); - } - - if (PropVariantToInt64(v1, &value1) != S_OK) return -1; - if (PropVariantToInt64(v2, &value2) != S_OK) return -1; - - value1 -= value2; - if (value1) return value1 < 0 ? -1 : 1; - return 0; -} - static HRESULT WINAPI MetadataHandler_GetValue(IWICMetadataWriter *iface, const PROPVARIANT *schema, const PROPVARIANT *id, PROPVARIANT *value) { @@ -228,7 +205,7 @@ HRESULT hr = WINCODEC_ERR_PROPERTYNOTFOUND; MetadataHandler *This = impl_from_IWICMetadataWriter(iface); - TRACE("(%p,%p,%p,%p)\n", iface, schema, id, value); + TRACE("(%p,%s,%s,%p)\n", iface, wine_dbgstr_variant((const VARIANT *)schema), wine_dbgstr_variant((const VARIANT *)id), value); if (!id) return E_INVALIDARG; @@ -238,10 +215,10 @@ { if (schema && This->items[i].schema.vt != VT_EMPTY) { - if (propvar_cmp(schema, &This->items[i].schema) != 0) continue; - } - - if (propvar_cmp(id, &This->items[i].id) != 0) continue; + if (PropVariantCompareEx(schema, &This->items[i].schema, 0, PVCF_USESTRCMPI) != 0) continue; + } + + if (PropVariantCompareEx(id, &This->items[i].id, 0, PVCF_USESTRCMPI) != 0) continue; hr = value ? PropVariantCopy(value, &This->items[i].value) : S_OK; break; Modified: trunk/reactos/dll/win32/windowscodecs/metadataquery.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/me… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/metadataquery.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/metadataquery.c [iso-8859-1] Sun Sep 24 11:19:07 2017 @@ -19,12 +19,15 @@ #include "wincodecs_private.h" +#include <propvarutil.h> + +static const WCHAR *map_shortname_to_schema(const GUID *format, const WCHAR *name); + typedef struct { IWICMetadataQueryReader IWICMetadataQueryReader_iface; - LONG ref; - IWICMetadataBlockReader *block; + WCHAR *root; } QueryReader; static inline QueryReader *impl_from_IWICMetadataQueryReader(IWICMetadataQueryReader *iface) @@ -70,6 +73,7 @@ if (!ref) { IWICMetadataBlockReader_Release(This->block); + HeapFree(GetProcessHeap(), 0, This->root); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -84,20 +88,501 @@ return IWICMetadataBlockReader_GetContainerFormat(This->block, format); } -static HRESULT WINAPI mqr_GetLocation(IWICMetadataQueryReader *iface, - UINT cchMaxLength, WCHAR *wzNamespace, UINT *pcchActualLength) -{ +static HRESULT WINAPI mqr_GetLocation(IWICMetadataQueryReader *iface, UINT len, WCHAR *location, UINT *ret_len) +{ + static const WCHAR rootW[] = { '/',0 }; QueryReader *This = impl_from_IWICMetadataQueryReader(iface); - FIXME("(%p,%u,%p,%p)\n", This, cchMaxLength, wzNamespace, pcchActualLength); - return E_NOTIMPL; -} - -static HRESULT WINAPI mqr_GetMetadataByName(IWICMetadataQueryReader *iface, - LPCWSTR wzName, PROPVARIANT *pvarValue) + const WCHAR *root; + UINT actual_len; + + TRACE("(%p,%u,%p,%p)\n", This, len, location, ret_len); + + if (!ret_len) return E_INVALIDARG; + + root = This->root ? This->root : rootW; + actual_len = lstrlenW(root) + 1; + + if (location) + { + if (len < actual_len) + return WINCODEC_ERR_INSUFFICIENTBUFFER; + + memcpy(location, root, actual_len * sizeof(WCHAR)); + } + + *ret_len = actual_len; + + return S_OK; +} + +struct string_t +{ + const WCHAR *str; + int len; +}; + +static const struct +{ + int len; + WCHAR str[10]; + VARTYPE vt; +} str2vt[] = +{ + { 4, {'c','h','a','r'}, VT_I1 }, + { 5, {'u','c','h','a','r'}, VT_UI1 }, + { 5, {'s','h','o','r','t'}, VT_I2 }, + { 6, {'u','s','h','o','r','t'}, VT_UI2 }, + { 4, {'l','o','n','g'}, VT_I4 }, + { 5, {'u','l','o','n','g'}, VT_UI4 }, + { 3, {'i','n','t'}, VT_I4 }, + { 4, {'u','i','n','t'}, VT_UI4 }, + { 8, {'l','o','n','g','l','o','n','g'}, VT_I8 }, + { 9, {'u','l','o','n','g','l','o','n','g'}, VT_UI8 }, + { 5, {'f','l','o','a','t'}, VT_R4 }, + { 6, {'d','o','u','b','l','e'}, VT_R8 }, + { 3, {'s','t','r'}, VT_LPSTR }, + { 4, {'w','s','t','r'}, VT_LPWSTR }, + { 4, {'g','u','i','d'}, VT_CLSID }, + { 4, {'b','o','o','l'}, VT_BOOL } +}; + +static VARTYPE map_type(struct string_t *str) +{ + UINT i; + + for (i = 0; i < sizeof(str2vt)/sizeof(str2vt[0]); i++) + { + if (str2vt[i].len == str->len) + { + if (CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, + str->str, str->len, str2vt[i].str, str2vt[i].len) == CSTR_EQUAL) + return str2vt[i].vt; + } + } + + WARN("type %s is not recognized\n", wine_dbgstr_wn(str->str, str->len)); + + return VT_ILLEGAL; +} + +static HRESULT get_token(struct string_t *elem, PROPVARIANT *id, PROPVARIANT *schema, int *idx) +{ + const WCHAR *start, *end, *p; + WCHAR *bstr; + struct string_t next_elem; + HRESULT hr; + + TRACE("%s, len %d\n", wine_dbgstr_wn(elem->str, elem->len), elem->len); + + PropVariantInit(id); + PropVariantInit(schema); + + if (!elem->len) return S_OK; + + start = elem->str; + + if (*start == '[') + { + WCHAR *idx_end; + + if (start[1] < '0' || start[1] > '9') return DISP_E_TYPEMISMATCH; + + *idx = strtolW(start + 1, &idx_end, 10); + if (idx_end > elem->str + elem->len) return WINCODEC_ERR_INVALIDQUERYREQUEST; + if (*idx_end != ']') return WINCODEC_ERR_INVALIDQUERYREQUEST; + if (*idx < 0) return WINCODEC_ERR_INVALIDQUERYREQUEST; + end = idx_end + 1; + + next_elem.str = end; + next_elem.len = elem->len - (end - start); + hr = get_token(&next_elem, id, schema, idx); + if (hr != S_OK) + { + TRACE("get_token error %#x\n", hr); + return hr; + } + elem->len = (end - start) + next_elem.len; + + TRACE("indexed %s [%d]\n", wine_dbgstr_wn(elem->str, elem->len), *idx); + return S_OK; + } + else if (*start == '{') + { + VARTYPE vt; + PROPVARIANT next_token; + + end = memchrW(start + 1, '=', elem->len - 1); + if (!end) return WINCODEC_ERR_INVALIDQUERYREQUEST; + if (end > elem->str + elem->len) return WINCODEC_ERR_INVALIDQUERYREQUEST; + + next_elem.str = start + 1; + next_elem.len = end - start - 1; + vt = map_type(&next_elem); + TRACE("type %s => %d\n", wine_dbgstr_wn(next_elem.str, next_elem.len), vt); + if (vt == VT_ILLEGAL) return WINCODEC_ERR_WRONGSTATE; + + next_token.vt = VT_BSTR; + next_token.u.bstrVal = SysAllocStringLen(NULL, elem->len - (end - start) + 1); + if (!next_token.u.bstrVal) return E_OUTOFMEMORY; + + bstr = next_token.u.bstrVal; + + end++; + p = end; + while (*end && *end != '}' && end - start < elem->len) + { + if (*end == '\\') end++; + *bstr++ = *end++; + } + if (*end != '}') + { + PropVariantClear(&next_token); + return WINCODEC_ERR_INVALIDQUERYREQUEST; + } + *bstr = 0; + TRACE("schema/id %s\n", wine_dbgstr_w(next_token.u.bstrVal)); + + if (vt == VT_CLSID) + { + id->vt = VT_CLSID; + id->u.puuid = CoTaskMemAlloc(sizeof(GUID)); + if (!id->u.puuid) + { + PropVariantClear(&next_token); + return E_OUTOFMEMORY; + } + + hr = UuidFromStringW(next_token.u.bstrVal, id->u.puuid); + } + else + hr = PropVariantChangeType(id, &next_token, 0, vt); + PropVariantClear(&next_token); + if (hr != S_OK) + { + PropVariantClear(id); + PropVariantClear(schema); + return hr; + } + + end++; + if (*end == ':') + { + PROPVARIANT next_id, next_schema; + int next_idx = 0; + + next_elem.str = end + 1; + next_elem.len = elem->len - (end - start + 1); + hr = get_token(&next_elem, &next_id, &next_schema, &next_idx); + if (hr != S_OK) + { + TRACE("get_token error %#x\n", hr); + return hr; + } + elem->len = (end - start + 1) + next_elem.len; + + TRACE("id %s [%d]\n", wine_dbgstr_wn(elem->str, elem->len), *idx); + + if (next_schema.vt != VT_EMPTY) + { + PropVariantClear(&next_id); + PropVariantClear(&next_schema); + return WINCODEC_ERR_WRONGSTATE; + } + + *schema = *id; + *id = next_id; + + return S_OK; + } + + elem->len = end - start; + return S_OK; + } + + end = memchrW(start, '/', elem->len); + if (!end) end = start + elem->len; + + p = memchrW(start, ':', end - start); + if (p) + { + next_elem.str = p + 1; + next_elem.len = end - p - 1; + + elem->len = p - start; + } + else + elem->len = end - start; + + id->vt = VT_BSTR; + id->u.bstrVal = SysAllocStringLen(NULL, elem->len + 1); + if (!id->u.bstrVal) return E_OUTOFMEMORY; + + bstr = id->u.bstrVal; + p = elem->str; + while (p - elem->str < elem->len) + { + if (*p == '\\') p++; + *bstr++ = *p++; + } + *bstr = 0; + TRACE("%s [%d]\n", wine_dbgstr_variant((VARIANT *)id), *idx); + + if (*p == ':') + { + PROPVARIANT next_id, next_schema; + int next_idx = 0; + + hr = get_token(&next_elem, &next_id, &next_schema, &next_idx); + if (hr != S_OK) + { + TRACE("get_token error %#x\n", hr); + PropVariantClear(id); + PropVariantClear(schema); + return hr; + } + elem->len += next_elem.len + 1; + + TRACE("id %s [%d]\n", wine_dbgstr_wn(elem->str, elem->len), *idx); + + if (next_schema.vt != VT_EMPTY) + { + PropVariantClear(&next_id); + PropVariantClear(&next_schema); + PropVariantClear(id); + PropVariantClear(schema); + return WINCODEC_ERR_WRONGSTATE; + } + + *schema = *id; + *id = next_id; + } + + return S_OK; +} + +static HRESULT find_reader_from_block(IWICMetadataBlockReader *block_reader, UINT index, + GUID *guid, IWICMetadataReader **reader) +{ + HRESULT hr; + GUID format; + IWICMetadataReader *new_reader; + UINT count, i, matched_index; + + *reader = NULL; + + hr = IWICMetadataBlockReader_GetCount(block_reader, &count); + if (hr != S_OK) return hr; + + matched_index = 0; + + for (i = 0; i < count; i++) + { + hr = IWICMetadataBlockReader_GetReaderByIndex(block_reader, i, &new_reader); + if (hr != S_OK) return hr; + + hr = IWICMetadataReader_GetMetadataFormat(new_reader, &format); + if (hr == S_OK) + { + if (IsEqualGUID(&format, guid)) + { + if (matched_index == index) + { + *reader = new_reader; + return S_OK; + } + + matched_index++; + } + } + + IWICMetadataReader_Release(new_reader); + if (hr != S_OK) return hr; + } + + return WINCODEC_ERR_PROPERTYNOTFOUND; +} + +static HRESULT get_next_reader(IWICMetadataReader *reader, UINT index, + GUID *guid, IWICMetadataReader **new_reader) +{ + HRESULT hr; + PROPVARIANT schema, id, value; + + *new_reader = NULL; + + PropVariantInit(&schema); + PropVariantInit(&id); + PropVariantInit(&value); + + if (index) + { + schema.vt = VT_UI2; + schema.u.uiVal = index; + } + + id.vt = VT_CLSID; + id.u.puuid = guid; + hr = IWICMetadataReader_GetValue(reader, &schema, &id, &value); + if (hr != S_OK) return hr; + + if (value.vt == VT_UNKNOWN) + hr = IUnknown_QueryInterface(value.u.punkVal, &IID_IWICMetadataReader, (void **)new_reader); + else + hr = WINCODEC_ERR_UNEXPECTEDMETADATATYPE; + + PropVariantClear(&value); + return hr; +} + +static HRESULT WINAPI mqr_GetMetadataByName(IWICMetadataQueryReader *iface, LPCWSTR query, PROPVARIANT *value) { QueryReader *This = impl_from_IWICMetadataQueryReader(iface); - FIXME("(%p,%s,%p)\n", This, wine_dbgstr_w(wzName), pvarValue); - return WINCODEC_ERR_PROPERTYNOTFOUND; + struct string_t elem; + WCHAR *full_query; + const WCHAR *p; + int index, len; + PROPVARIANT tk_id, tk_schema, new_value; + GUID guid; + IWICMetadataReader *reader; + HRESULT hr = S_OK; + + TRACE("(%p,%s,%p)\n", This, wine_dbgstr_w(query), value); + + len = lstrlenW(query) + 1; + if (This->root) len += lstrlenW(This->root); + full_query = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + full_query[0] = 0; + if (This->root) + lstrcpyW(full_query, This->root); + lstrcatW(full_query, query); + + PropVariantInit(&tk_id); + PropVariantInit(&tk_schema); + PropVariantInit(&new_value); + + reader = NULL; + p = full_query; + + while (*p) + { + if (*p != '/') + { + WARN("query should start with '/'\n"); + hr = WINCODEC_ERR_PROPERTYNOTSUPPORTED; + break; + } + + p++; + + index = 0; + elem.str = p; + elem.len = lstrlenW(p); + hr = get_token(&elem, &tk_id, &tk_schema, &index); + if (hr != S_OK) + { + WARN("get_token error %#x\n", hr); + break; + } + TRACE("parsed %d characters: %s, index %d\n", elem.len, wine_dbgstr_wn(elem.str, elem.len), index); + TRACE("id %s, schema %s\n", wine_dbgstr_variant((VARIANT *)&tk_id), wine_dbgstr_variant((VARIANT *)&tk_schema)); + + if (!elem.len) break; + + if (tk_id.vt == VT_CLSID || (tk_id.vt == VT_BSTR && WICMapShortNameToGuid(tk_id.u.bstrVal, &guid) == S_OK)) + { + WCHAR *root; + + if (tk_schema.vt != VT_EMPTY) + { + FIXME("unsupported schema vt %u\n", tk_schema.vt); + PropVariantClear(&tk_schema); + } + + if (tk_id.vt == VT_CLSID) guid = *tk_id.u.puuid; + + if (reader) + { + IWICMetadataReader *new_reader; + + hr = get_next_reader(reader, index, &guid, &new_reader); + IWICMetadataReader_Release(reader); + reader = new_reader; + } + else + hr = find_reader_from_block(This->block, index, &guid, &reader); + + if (hr != S_OK) break; + + root = SysAllocStringLen(NULL, elem.str + elem.len - full_query + 2); + if (!root) + { + hr = E_OUTOFMEMORY; + break; + } + lstrcpynW(root, full_query, p - full_query + elem.len + 1); + + PropVariantClear(&new_value); + new_value.vt = VT_UNKNOWN; + hr = MetadataQueryReader_CreateInstance(This->block, root, (IWICMetadataQueryReader **)&new_value.u.punkVal); + SysFreeString(root); + if (hr != S_OK) break; + } + else + { + PROPVARIANT schema, id; + + if (!reader) + { + hr = WINCODEC_ERR_INVALIDQUERYREQUEST; + break; + } + + if (tk_schema.vt == VT_BSTR) + { + hr = IWICMetadataReader_GetMetadataFormat(reader, &guid); + if (hr != S_OK) break; + + schema.vt = VT_LPWSTR; + schema.u.pwszVal = (LPWSTR)map_shortname_to_schema(&guid, tk_schema.u.bstrVal); + if (!schema.u.pwszVal) + schema.u.pwszVal = tk_schema.u.bstrVal; + } + else + schema = tk_schema; + + if (tk_id.vt == VT_BSTR) + { + id.vt = VT_LPWSTR; + id.u.pwszVal = tk_id.u.bstrVal; + } + else + id = tk_id; + + PropVariantClear(&new_value); + hr = IWICMetadataReader_GetValue(reader, &schema, &id, &new_value); + if (hr != S_OK) break; + } + + p += elem.len; + + PropVariantClear(&tk_id); + PropVariantClear(&tk_schema); + } + + if (reader) + IWICMetadataReader_Release(reader); + + PropVariantClear(&tk_id); + PropVariantClear(&tk_schema); + + if (hr == S_OK) + *value = new_value; + else + PropVariantClear(&new_value); + + HeapFree(GetProcessHeap(), 0, full_query); + + return hr; } static HRESULT WINAPI mqr_GetEnumerator(IWICMetadataQueryReader *iface, @@ -118,7 +603,7 @@ mqr_GetEnumerator }; -HRESULT MetadataQueryReader_CreateInstance(IWICMetadataBlockReader *mbr, IWICMetadataQueryReader **out) +HRESULT MetadataQueryReader_CreateInstance(IWICMetadataBlockReader *mbr, const WCHAR *root, IWICMetadataQueryReader **out) { QueryReader *obj; @@ -131,6 +616,8 @@ IWICMetadataBlockReader_AddRef(mbr); obj->block = mbr; + + obj->root = root ? heap_strdupW(root) : NULL; *out = &obj->IWICMetadataQueryReader_iface; @@ -250,14 +737,14 @@ { if (!len) return E_INVALIDARG; - len = min(len - 1, strlenW(guid2name[i].name)); + len = min(len - 1, lstrlenW(guid2name[i].name)); memcpy(name, guid2name[i].name, len * sizeof(WCHAR)); name[len] = 0; - if (len < strlenW(guid2name[i].name)) + if (len < lstrlenW(guid2name[i].name)) return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); } - if (ret_len) *ret_len = strlenW(guid2name[i].name) + 1; + if (ret_len) *ret_len = lstrlenW(guid2name[i].name) + 1; return S_OK; } } @@ -265,7 +752,7 @@ return WINCODEC_ERR_PROPERTYNOTFOUND; } -HRESULT WINAPI WICMapShortNameToGuid(const WCHAR *name, GUID *guid) +HRESULT WINAPI WICMapShortNameToGuid(PCWSTR name, GUID *guid) { UINT i; @@ -275,7 +762,7 @@ for (i = 0; i < sizeof(guid2name)/sizeof(guid2name[0]); i++) { - if (!strcmpiW(name, guid2name[i].name)) + if (!lstrcmpiW(name, guid2name[i].name)) { *guid = *guid2name[i].guid; return S_OK; @@ -372,7 +859,27 @@ { MPReg, MPReg_scheme } }; -HRESULT WINAPI WICMapSchemaToName(REFGUID format, const WCHAR *schema, UINT len, WCHAR *name, UINT *ret_len) +static const WCHAR *map_shortname_to_schema(const GUID *format, const WCHAR *name) +{ + UINT i; + + /* It appears that the only metadata formats + * that support schemas are xmp and xmpstruct. + */ + if (!IsEqualGUID(format, &GUID_MetadataFormatXMP) && + !IsEqualGUID(format, &GUID_MetadataFormatXMPStruct)) + return NULL; + + for (i = 0; i < sizeof(name2schema)/sizeof(name2schema[0]); i++) + { + if (!lstrcmpW(name2schema[i].name, name)) + return name2schema[i].schema; + } + + return NULL; +} + +HRESULT WINAPI WICMapSchemaToName(REFGUID format, LPWSTR schema, UINT len, WCHAR *name, UINT *ret_len) { UINT i; @@ -390,13 +897,13 @@ for (i = 0; i < sizeof(name2schema)/sizeof(name2schema[0]); i++) { - if (!strcmpW(name2schema[i].schema, schema)) + if (!lstrcmpW(name2schema[i].schema, schema)) { if (name) { if (!len) return E_INVALIDARG; - len = min(len - 1, strlenW(name2schema[i].name)); + len = min(len - 1, lstrlenW(name2schema[i].name)); memcpy(name, name2schema[i].name, len * sizeof(WCHAR)); name[len] = 0; @@ -404,7 +911,7 @@ return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); } - if (ret_len) *ret_len = strlenW(name2schema[i].name) + 1; + if (ret_len) *ret_len = lstrlenW(name2schema[i].name) + 1; return S_OK; } } Modified: trunk/reactos/dll/win32/windowscodecs/pngformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/pn… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/pngformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/pngformat.c [iso-8859-1] Sun Sep 24 11:19:07 2017 @@ -1085,7 +1085,7 @@ if (!ppIMetadataQueryReader) return E_INVALIDARG; - return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, ppIMetadataQueryReader); + return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, NULL, ppIMetadataQueryReader); } static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *iface, @@ -1307,6 +1307,7 @@ }; static const struct png_pixelformat formats[] = { + {&GUID_WICPixelFormat32bppBGRA, 32, 8, PNG_COLOR_TYPE_RGB_ALPHA, 0, 1}, {&GUID_WICPixelFormat24bppBGR, 24, 8, PNG_COLOR_TYPE_RGB, 0, 1}, {&GUID_WICPixelFormatBlackWhite, 1, 1, PNG_COLOR_TYPE_GRAY, 0, 0}, {&GUID_WICPixelFormat2bppGray, 2, 2, PNG_COLOR_TYPE_GRAY, 0, 0}, @@ -1314,7 +1315,6 @@ {&GUID_WICPixelFormat8bppGray, 8, 8, PNG_COLOR_TYPE_GRAY, 0, 0}, {&GUID_WICPixelFormat16bppGray, 16, 16, PNG_COLOR_TYPE_GRAY, 0, 0}, {&GUID_WICPixelFormat32bppBGR, 32, 8, PNG_COLOR_TYPE_RGB, 1, 1}, - {&GUID_WICPixelFormat32bppBGRA, 32, 8, PNG_COLOR_TYPE_RGB_ALPHA, 0, 1}, {&GUID_WICPixelFormat48bppRGB, 48, 16, PNG_COLOR_TYPE_RGB, 0, 0}, {&GUID_WICPixelFormat64bppRGBA, 64, 16, PNG_COLOR_TYPE_RGB_ALPHA, 0, 0}, {&GUID_WICPixelFormat1bppIndexed, 1, 1, PNG_COLOR_TYPE_PALETTE, 0, 0}, Modified: trunk/reactos/dll/win32/windowscodecs/tiffformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ti… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/tiffformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/tiffformat.c [iso-8859-1] Sun Sep 24 11:19:07 2017 @@ -1373,7 +1373,7 @@ if (!ppIMetadataQueryReader) return E_INVALIDARG; - return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, ppIMetadataQueryReader); + return MetadataQueryReader_CreateInstance(&This->IWICMetadataBlockReader_iface, NULL, ppIMetadataQueryReader); } static HRESULT WINAPI TiffFrameDecode_GetColorContexts(IWICBitmapFrameDecode *iface, Modified: trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/wi… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h [iso-8859-1] Sun Sep 24 11:19:07 2017 @@ -251,9 +251,17 @@ extern HRESULT GCEReader_CreateInstance(REFIID iid, void **ppv) DECLSPEC_HIDDEN; extern HRESULT APEReader_CreateInstance(REFIID iid, void **ppv) DECLSPEC_HIDDEN; extern HRESULT GifCommentReader_CreateInstance(REFIID iid, void **ppv) DECLSPEC_HIDDEN; - -extern HRESULT MetadataQueryReader_CreateInstance(IWICMetadataBlockReader *mbr, IWICMetadataQueryReader **out) DECLSPEC_HIDDEN; - +extern HRESULT MetadataQueryReader_CreateInstance(IWICMetadataBlockReader *, const WCHAR *, IWICMetadataQueryReader **) DECLSPEC_HIDDEN; extern HRESULT stream_initialize_from_filehandle(IWICStream *iface, HANDLE hfile) DECLSPEC_HIDDEN; +static inline WCHAR *heap_strdupW(const WCHAR *src) +{ + WCHAR *dst; + SIZE_T len; + if (!src) return NULL; + len = (strlenW(src) + 1) * sizeof(WCHAR); + if ((dst = HeapAlloc(GetProcessHeap(), 0, len))) memcpy(dst, src, len); + return dst; +} + #endif /* WINCODECS_PRIVATE_H */ Modified: trunk/reactos/dll/win32/windowscodecs/windowscodecs_wincodec.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/wi… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/windowscodecs_wincodec.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/windowscodecs_wincodec.idl [iso-8859-1] Sun Sep 24 11:19:07 2017 @@ -35,6 +35,13 @@ coclass WICImagingFactory { interface IWICImagingFactory; } [ + helpstring("WIC Imaging Factory 2"), + threading(both), + uuid(317d06e8-5f24-433d-bdf7-79ce68d8abc2) +] +coclass WICImagingFactory2 { interface IWICImagingFactory2; } + +[ helpstring("WIC BMP Decoder"), threading(both), uuid(6b462062-7cbf-400d-9fdb-813dd10f2778) Modified: trunk/reactos/dll/win32/windowscodecs/windowscodecs_wincodec.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/wi… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/windowscodecs_wincodec.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/windowscodecs_wincodec.rgs [iso-8859-1] Sun Sep 24 11:19:07 2017 @@ -143,6 +143,10 @@ { InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } } + '{317D06E8-5F24-433D-BDF7-79CE68D8ABC2}' = s 'WIC Imaging Factory 2' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } '{6B462062-7CBF-400D-9FDB-813DD10F2778}' = s 'WIC BMP Decoder' { InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } @@ -160,10 +164,6 @@ InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } } '{381DDA3C-9CE9-4834-A23E-1F98F8FC52BE}' = s 'WIC GIF Decoder' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } - } - '{114F5598-0B22-40A0-86A1-C83EA495ADBD}' = s 'WIC GIF Encoder' { InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 24 11:19:07 2017 @@ -196,7 +196,7 @@ reactos/dll/win32/vssapi # Synced to WineStaging-2.9 reactos/dll/win32/wbemdisp # Synced to WineStaging-2.16 reactos/dll/win32/wbemprox # Synced to WineStaging-2.16 -reactos/dll/win32/windowscodecs # Synced to WineStaging-2.9 +reactos/dll/win32/windowscodecs # Synced to WineStaging-2.16 reactos/dll/win32/windowscodecsext # Synced to WineStaging-2.9 reactos/dll/win32/winemp3.acm # Synced to WineStaging-2.16 reactos/dll/win32/wing32 # Synced to WineStaging-2.9 Modified: trunk/reactos/sdk/include/psdk/wincodec.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/wincodec.… ============================================================================== --- trunk/reactos/sdk/include/psdk/wincodec.idl [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/wincodec.idl [iso-8859-1] Sun Sep 24 11:19:07 2017 @@ -146,6 +146,14 @@ WICComponentEnumerateDisabled = 0x80000000 } WICComponentEnumerateOptions; +typedef enum WICJpegYCrCbSubsamplingOption { + WICJpegYCrCbSubsamplingDefault = 0x00000000, + WICJpegYCrCbSubsampling420 = 0x00000001, + WICJpegYCrCbSubsampling422 = 0x00000002, + WICJpegYCrCbSubsampling444 = 0x00000003, + WICJpegYCrCbSubsampling440 = 0x00000004 +} WICJpegYCrCbSubsamplingOption; + typedef enum WICPixelFormatNumericRepresentation { WICPixelFormatNumericRepresentationUnspecified = 0x00000000, WICPixelFormatNumericRepresentationIndexed = 0x00000001, @@ -241,23 +249,6 @@ typedef UINT32 WICColor; -cpp_quote("#define WINCODEC_ERR_WRONGSTATE 0x88982f04") -cpp_quote("#define WINCODEC_ERR_VALUEOUTOFRANGE 0x88982f05") -cpp_quote("#define WINCODEC_ERR_NOTINITIALIZED 0x88982f0c") -cpp_quote("#define WINCODEC_ERR_ALREADYLOCKED 0x88982f0d") -cpp_quote("#define WINCODEC_ERR_PROPERTYNOTFOUND 0x88982f40") -cpp_quote("#define WINCODEC_ERR_CODECNOTHUMBNAIL 0x88982f44") -cpp_quote("#define WINCODEC_ERR_PALETTEUNAVAILABLE 0x88982f45") -cpp_quote("#define WINCODEC_ERR_COMPONENTNOTFOUND 0x88982f50") -cpp_quote("#define WINCODEC_ERR_BADIMAGE 0x88982f60") -cpp_quote("#define WINCODEC_ERR_FRAMEMISSING 0x88982f62") -cpp_quote("#define WINCODEC_ERR_BADMETADATAHEADER 0x88982f63") -cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT 0x88982f80") -cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDOPERATION 0x88982f81") -cpp_quote("#define WINCODEC_ERR_INSUFFICIENTBUFFER 0x88982f8c") -cpp_quote("#define WINCODEC_ERR_PROPERTYUNEXPECTEDTYPE 0x88982f8e") -cpp_quote("#define WINCODEC_ERR_WIN32ERROR 0x88982f94") - interface IWICPalette; [ @@ -1024,8 +1015,8 @@ cpp_quote("HRESULT WINAPI WICCreateBitmapFromSectionEx(UINT width, UINT height, REFWICPixelFormatGUID format, HANDLE section, UINT stride, UINT offset, WICSectionAccessLevel access, IWICBitmap **bitmap);") cpp_quote("HRESULT WINAPI WICMapGuidToShortName(REFGUID,UINT,WCHAR *,UINT *);") -cpp_quote("HRESULT WINAPI WICMapShortNameToGuid(const WCHAR *,GUID *);") -cpp_quote("HRESULT WINAPI WICMapSchemaToName(REFGUID,const WCHAR *,UINT,WCHAR *,UINT *);") +cpp_quote("HRESULT WINAPI WICMapShortNameToGuid(PCWSTR,GUID *);") +cpp_quote("HRESULT WINAPI WICMapSchemaToName(REFGUID,LPWSTR,UINT,WCHAR *,UINT *);") cpp_quote("DEFINE_GUID(CLSID_WICBmpDecoder, 0x6b462062,0x7cbf,0x400d,0x9f,0xdb,0x81,0x3d,0xd1,0x0f,0x27,0x78);") cpp_quote("DEFINE_GUID(CLSID_WICPngDecoder, 0x389ea17b,0x5078,0x4cde,0xb6,0xef,0x25,0xc1,0x51,0x75,0xc7,0x51);") Modified: trunk/reactos/sdk/include/psdk/winerror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/winerror.… ============================================================================== --- trunk/reactos/sdk/include/psdk/winerror.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/winerror.h [iso-8859-1] Sun Sep 24 11:19:07 2017 @@ -3268,7 +3268,46 @@ #define SCARD_W_CACHE_ITEM_STALE _HRESULT_TYPEDEF_(0x80100071L) #define SCARD_W_CACHE_ITEM_TOO_BIG _HRESULT_TYPEDEF_(0x80100072L) +#define WINCODEC_ERR_WRONGSTATE _HRESULT_TYPEDEF_(0x88982f04) +#define WINCODEC_ERR_VALUEOUTOFRANGE _HRESULT_TYPEDEF_(0x88982f05) #define WINCODEC_ERR_UNKNOWNIMAGEFORMAT _HRESULT_TYPEDEF_(0x88982f07) +#define WINCODEC_ERR_UNSUPPORTEDVERSION _HRESULT_TYPEDEF_(0x88982f0b) +#define WINCODEC_ERR_NOTINITIALIZED _HRESULT_TYPEDEF_(0x88982f0c) +#define WINCODEC_ERR_ALREADYLOCKED _HRESULT_TYPEDEF_(0x88982f0d) +#define WINCODEC_ERR_PROPERTYNOTFOUND _HRESULT_TYPEDEF_(0x88982f40) +#define WINCODEC_ERR_PROPERTYNOTSUPPORTED _HRESULT_TYPEDEF_(0x88982f41) +#define WINCODEC_ERR_PROPERTYSIZE _HRESULT_TYPEDEF_(0x88982f42) +#define WINCODEC_ERR_CODECPRESENT _HRESULT_TYPEDEF_(0x88982f43) +#define WINCODEC_ERR_CODECNOTHUMBNAIL _HRESULT_TYPEDEF_(0x88982f44) +#define WINCODEC_ERR_PALETTEUNAVAILABLE _HRESULT_TYPEDEF_(0x88982f45) +#define WINCODEC_ERR_CODECTOOMANYSCANLINES _HRESULT_TYPEDEF_(0x88982f46) +#define WINCODEC_ERR_INTERNALERROR _HRESULT_TYPEDEF_(0x88982f48) +#define WINCODEC_ERR_SOURCERECTDOESNOTMATCHDIMENSIONS _HRESULT_TYPEDEF_(0x88982f49) +#define WINCODEC_ERR_COMPONENTNOTFOUND _HRESULT_TYPEDEF_(0x88982f50) +#define WINCODEC_ERR_IMAGESIZEOUTOFRANGE _HRESULT_TYPEDEF_(0x88982f51) +#define WINCODEC_ERR_TOOMUCHMETADATA _HRESULT_TYPEDEF_(0x88982f52) +#define WINCODEC_ERR_BADIMAGE _HRESULT_TYPEDEF_(0x88982f60) +#define WINCODEC_ERR_BADHEADER _HRESULT_TYPEDEF_(0x88982f61) +#define WINCODEC_ERR_FRAMEMISSING _HRESULT_TYPEDEF_(0x88982f62) +#define WINCODEC_ERR_BADMETADATAHEADER _HRESULT_TYPEDEF_(0x88982f63) +#define WINCODEC_ERR_BADSTREAMDATA _HRESULT_TYPEDEF_(0x88982f70) +#define WINCODEC_ERR_STREAMWRITE _HRESULT_TYPEDEF_(0x88982f71) +#define WINCODEC_ERR_STREAMREAD _HRESULT_TYPEDEF_(0x88982f72) +#define WINCODEC_ERR_STREAMNOTAVAILABLE _HRESULT_TYPEDEF_(0x88982f73) +#define WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT _HRESULT_TYPEDEF_(0x88982f80) +#define WINCODEC_ERR_UNSUPPORTEDOPERATION _HRESULT_TYPEDEF_(0x88982f81) +#define WINCODEC_ERR_INVALIDREGISTRATION _HRESULT_TYPEDEF_(0x88982f8a) +#define WINCODEC_ERR_COMPONENTINITIALIZEFAILURE _HRESULT_TYPEDEF_(0x88982f8b) +#define WINCODEC_ERR_INSUFFICIENTBUFFER _HRESULT_TYPEDEF_(0x88982f8c) +#define WINCODEC_ERR_DUPLICATEMETADATAPRESENT _HRESULT_TYPEDEF_(0x88982f8d) +#define WINCODEC_ERR_PROPERTYUNEXPECTEDTYPE _HRESULT_TYPEDEF_(0x88982f8e) +#define WINCODEC_ERR_UNEXPECTEDSIZE _HRESULT_TYPEDEF_(0x88982f8f) +#define WINCODEC_ERR_INVALIDQUERYREQUEST _HRESULT_TYPEDEF_(0x88982f90) +#define WINCODEC_ERR_UNEXPECTEDMETADATATYPE _HRESULT_TYPEDEF_(0x88982f91) +#define WINCODEC_ERR_REQUESTONLYVALIDATMETADATAROOT _HRESULT_TYPEDEF_(0x88982f92) +#define WINCODEC_ERR_INVALIDQUERYCHARACTER _HRESULT_TYPEDEF_(0x88982f93) +#define WINCODEC_ERR_WIN32ERROR _HRESULT_TYPEDEF_(0x88982f94) +#define WINCODEC_ERR_INVALIDPROGRESSIVELEVEL _HRESULT_TYPEDEF_(0x88982f95) #define ERROR_AUDITING_DISABLED _HRESULT_TYPEDEF_(0xC0090001L) #define ERROR_ALL_SIDS_FILTERED _HRESULT_TYPEDEF_(0xC0090002L)

1 0

[akhaldi] 75952: [PSDK] Update propidl.idl. CORE-13762
by akhaldi＠svn.reactos.org 24 Sep '17

24 Sep '17

Author: akhaldi Date: Sun Sep 24 11:18:52 2017 New Revision: 75952 URL: http://svn.reactos.org/svn/reactos?rev=75952&view=rev Log: [PSDK] Update propidl.idl. CORE-13762 Modified: trunk/reactos/sdk/include/psdk/propidl.idl Modified: trunk/reactos/sdk/include/psdk/propidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/propidl.i… ============================================================================== --- trunk/reactos/sdk/include/psdk/propidl.idl [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/propidl.idl [iso-8859-1] Sun Sep 24 11:18:52 2017 @@ -141,6 +141,8 @@ [case(VT_BSTR_BLOB)] BSTRBLOB bstrblobVal; [case(VT_LPSTR)] LPSTR pszVal; [case(VT_LPWSTR)] LPWSTR pwszVal; + [case(VT_UNKNOWN)] IUnknown *punkVal; + [case(VT_DISPATCH)] IDispatch *pdispVal; [case(VT_UI1|VT_VECTOR)] CAUB caub; [case(VT_I2|VT_VECTOR)] CAI cai; [case(VT_UI2|VT_VECTOR)] CAUI caui;

1 0

[akhaldi] 75951: [XMLLITE_WINETEST] Sync with Wine Staging 2.16. CORE-13762
by akhaldi＠svn.reactos.org 24 Sep '17

24 Sep '17

Author: akhaldi Date: Sun Sep 24 11:18:47 2017 New Revision: 75951 URL: http://svn.reactos.org/svn/reactos?rev=75951&view=rev Log: [XMLLITE_WINETEST] Sync with Wine Staging 2.16. CORE-13762 Modified: trunk/rostests/winetests/xmllite/reader.c trunk/rostests/winetests/xmllite/writer.c Modified: trunk/rostests/winetests/xmllite/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/reader.… ============================================================================== --- trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/reader.c [iso-8859-1] Sun Sep 24 11:18:47 2017 @@ -801,7 +801,6 @@ { XmlNodeType nodetype; IXmlReader *reader; - IStream *stream; HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); @@ -820,12 +819,7 @@ hr = IXmlReader_Read(reader, &nodetype); ok(hr == S_FALSE, "got %08x\n", hr); } - - stream = create_stream_on_data("xml", sizeof("xml")); - - hr = IXmlReader_SetInput(reader, (IUnknown *)stream); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - + set_input_string(reader, "xml"); TEST_READER_STATE(reader, XmlReadState_Initial); nodetype = XmlNodeType_Element; @@ -843,7 +837,6 @@ ok(FAILED(hr), "got %08x\n", hr); ok(nodetype == XmlNodeType_None, "Unexpected node type %d\n", nodetype); - IStream_Release(stream); IXmlReader_Release(reader); } @@ -1287,7 +1280,6 @@ IXmlReader *reader; const WCHAR *str; XmlNodeType type; - IStream *stream; UINT len, count; HRESULT hr; @@ -1297,9 +1289,7 @@ hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, DtdProcessing_Parse); ok(hr == S_OK, "got 0x%8x\n", hr); - stream = create_stream_on_data(test_public_dtd, sizeof(test_public_dtd)); - hr = IXmlReader_SetInput(reader, (IUnknown*)stream); - ok(hr == S_OK, "got %08x\n", hr); + set_input_string(reader, test_public_dtd); read_node(reader, XmlNodeType_DocumentType); @@ -1340,7 +1330,6 @@ ok(len == lstrlenW(dtdnameW), "got %u\n", len); ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str)); } - IStream_Release(stream); IXmlReader_Release(reader); } @@ -1354,7 +1343,6 @@ IXmlReader *reader; const WCHAR *str; XmlNodeType type; - IStream *stream; UINT len, count; HRESULT hr; @@ -1364,9 +1352,7 @@ hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, DtdProcessing_Parse); ok(hr == S_OK, "got 0x%8x\n", hr); - stream = create_stream_on_data(test_system_dtd, sizeof(test_system_dtd)); - hr = IXmlReader_SetInput(reader, (IUnknown*)stream); - ok(hr == S_OK, "got %08x\n", hr); + set_input_string(reader, test_system_dtd); read_node(reader, XmlNodeType_DocumentType); @@ -1400,7 +1386,6 @@ read_node(reader, XmlNodeType_Comment); - IStream_Release(stream); IXmlReader_Release(reader); } @@ -1714,11 +1699,8 @@ while (test->xml) { XmlNodeType type; - IStream *stream; - - stream = create_stream_on_data(test->xml, strlen(test->xml)+1); - hr = IXmlReader_SetInput(reader, (IUnknown*)stream); - ok(hr == S_OK, "got %08x\n", hr); + + set_input_string(reader, test->xml); type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); @@ -1764,7 +1746,6 @@ reader_value(reader, test->value); } - IStream_Release(stream); test++; } @@ -1791,11 +1772,8 @@ while (test->xml) { XmlNodeType type; - IStream *stream; - - stream = create_stream_on_data(test->xml, strlen(test->xml)+1); - hr = IXmlReader_SetInput(reader, (IUnknown*)stream); - ok(hr == S_OK, "got %08x\n", hr); + + set_input_string(reader, test->xml); type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); @@ -1837,7 +1815,6 @@ reader_value(reader, test->value); } - IStream_Release(stream); test++; } @@ -1867,12 +1844,9 @@ while (test->xml) { XmlNodeType type; - IStream *stream; BOOL ret; - stream = create_stream_on_data(test->xml, strlen(test->xml)+1); - hr = IXmlReader_SetInput(reader, (IUnknown*)stream); - ok(hr == S_OK, "got %08x\n", hr); + set_input_string(reader, test->xml); type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); @@ -1882,7 +1856,6 @@ ret = IXmlReader_IsEmptyElement(reader); ok(ret == test->empty, "got %d, expected %d. xml=%s\n", ret, test->empty, test->xml); - IStream_Release(stream); test++; } @@ -1925,11 +1898,8 @@ while (test->xml) { XmlNodeType type; - IStream *stream; - - stream = create_stream_on_data(test->xml, strlen(test->xml)+1); - hr = IXmlReader_SetInput(reader, (IUnknown*)stream); - ok(hr == S_OK, "got %08x\n", hr); + + set_input_string(reader, test->xml); hr = IXmlReader_Read(reader, NULL); @@ -1967,7 +1937,6 @@ reader_value(reader, test->value); } - IStream_Release(stream); test++; } @@ -2024,11 +1993,8 @@ for (i = 0; i < sizeof(prefix_tests)/sizeof(prefix_tests[0]); i++) { XmlNodeType type; - IStream *stream; - - stream = create_stream_on_data(prefix_tests[i].xml, strlen(prefix_tests[i].xml) + 1); - hr = IXmlReader_SetInput(reader, (IUnknown *)stream); - ok(hr == S_OK, "got %08x\n", hr); + + set_input_string(reader, prefix_tests[i].xml); hr = IXmlReader_Read(reader, &type); ok(hr == S_OK, "Read() failed, %#x\n", hr); @@ -2056,8 +2022,6 @@ /* back to the element, check prefix */ move_to_element(reader); reader_prefix(reader, prefix_tests[i].prefix1); - - IStream_Release(stream); } IXmlReader_Release(reader); @@ -2103,11 +2067,9 @@ ok(hr == S_OK, "S_OK, got %08x\n", hr); for (i = 0; i < sizeof(uri_tests)/sizeof(uri_tests[0]); i++) { - IStream *stream = create_stream_on_data(uri_tests[i].xml, strlen(uri_tests[i].xml) + 1); unsigned int j = 0; - hr = IXmlReader_SetInput(reader, (IUnknown *)stream); - ok(hr == S_OK, "got %08x\n", hr); + set_input_string(reader, uri_tests[i].xml); type = ~0u; while (IXmlReader_Read(reader, &type) == S_OK) { @@ -2152,8 +2114,6 @@ j++; } ok(type == XmlNodeType_None, "Unexpected node type %d\n", type); - - IStream_Release(stream); } IXmlReader_Release(reader); @@ -2229,17 +2189,12 @@ for (i = 0; i < sizeof(encoding_testsA)/sizeof(encoding_testsA[0]); i++) { - stream = create_stream_on_data(encoding_testsA[i], strlen(encoding_testsA[i])); - - hr = IXmlReader_SetInput(reader, (IUnknown *)stream); - ok(hr == S_OK, "got %08x\n", hr); + set_input_string(reader, encoding_testsA[i]); type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); ok(hr == S_OK, "got %08x\n", hr); ok(type != XmlNodeType_None, "Unexpected node type %d\n", type); - - IStream_Release(stream); } for (i = 0; i < sizeof(encoding_testsW)/sizeof(encoding_testsW[0]); i++) @@ -2617,6 +2572,90 @@ next_attribute(reader); ok(name == reader_name(reader, "attr"), "attr pointer changed\n"); ok(value == reader_value(reader, "value"), "value pointer changed\n"); + + IXmlReader_Release(reader); +} + +static void test_attribute_by_name(void) +{ + static const char *xml = "<a><elem xmlns=\"myns\" a=\"value a\" b=\"value b\" xmlns:ns=\"ns uri\" " + "ns:c=\"value c\" c=\"value c2\"/></a>"; + static const WCHAR xmlns_uriW[] = {'h','t','t','p',':','/','/','w','w','w','.','w','3','.','o','r','g','/', + '2','0','0','0','/','x','m','l','n','s','/',0}; + static const WCHAR nsuriW[] = {'n','s',' ','u','r','i',0}; + static const WCHAR xmlnsW[] = {'x','m','l','n','s',0}; + static const WCHAR mynsW[] = {'m','y','n','s',0}; + static const WCHAR nsW[] = {'n','s',0}; + static const WCHAR emptyW[] = {0}; + static const WCHAR aW[] = {'a',0}; + static const WCHAR bW[] = {'b',0}; + static const WCHAR cW[] = {'c',0}; + IXmlReader *reader; + HRESULT hr; + + hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); + ok(hr == S_OK, "Failed to create reader, hr %#x.\n", hr); + + set_input_string(reader, xml); + + hr = IXmlReader_MoveToAttributeByName(reader, NULL, NULL); + ok(hr == E_INVALIDARG || broken(hr == S_FALSE) /* WinXP */, "Unexpected hr %#x.\n", hr); + + hr = IXmlReader_MoveToAttributeByName(reader, emptyW, NULL); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + read_node(reader, XmlNodeType_Element); + + hr = IXmlReader_MoveToAttributeByName(reader, emptyW, NULL); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + read_node(reader, XmlNodeType_Element); + + hr = IXmlReader_MoveToAttributeByName(reader, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IXmlReader_MoveToAttributeByName(reader, NULL, xmlns_uriW); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IXmlReader_MoveToAttributeByName(reader, emptyW, xmlns_uriW); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IXmlReader_MoveToAttributeByName(reader, xmlnsW, NULL); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IXmlReader_MoveToAttributeByName(reader, xmlnsW, xmlns_uriW); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + reader_value(reader, "myns"); + + hr = IXmlReader_MoveToAttributeByName(reader, aW, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + reader_value(reader, "value a"); + + hr = IXmlReader_MoveToAttributeByName(reader, bW, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + reader_value(reader, "value b"); + + hr = IXmlReader_MoveToAttributeByName(reader, aW, mynsW); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IXmlReader_MoveToAttributeByName(reader, nsW, NULL); + ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); + + hr = IXmlReader_MoveToAttributeByName(reader, nsW, xmlns_uriW); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + reader_value(reader, "ns uri"); + + hr = IXmlReader_MoveToAttributeByName(reader, bW, emptyW); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + reader_value(reader, "value b"); + + hr = IXmlReader_MoveToAttributeByName(reader, cW, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + reader_value(reader, "value c2"); + + hr = IXmlReader_MoveToAttributeByName(reader, cW, nsuriW); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + reader_value(reader, "value c"); IXmlReader_Release(reader); } @@ -2648,4 +2687,5 @@ test_max_element_depth(); test_reader_position(); test_string_pointers(); -} + test_attribute_by_name(); +} Modified: trunk/rostests/winetests/xmllite/writer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/xmllite/writer.… ============================================================================== --- trunk/rostests/winetests/xmllite/writer.c [iso-8859-1] (original) +++ trunk/rostests/winetests/xmllite/writer.c [iso-8859-1] Sun Sep 24 11:18:47 2017 @@ -39,6 +39,8 @@ #include <initguid.h> DEFINE_GUID(IID_IXmlWriterOutput, 0xc1131708, 0x0f59, 0x477f, 0x93, 0x59, 0x7d, 0x33, 0x24, 0x51, 0xbc, 0x1a); +static const WCHAR aW[] = {'a',0}; + #define EXPECT_REF(obj, ref) _expect_ref((IUnknown *)obj, ref, __LINE__) static void _expect_ref(IUnknown *obj, ULONG ref, int line) { @@ -46,6 +48,25 @@ IUnknown_AddRef(obj); refcount = IUnknown_Release(obj); ok_(__FILE__, line)(refcount == ref, "expected refcount %d, got %d\n", ref, refcount); +} + +static void check_output_raw(IStream *stream, const void *expected, SIZE_T size, int line) +{ + SIZE_T content_size; + HGLOBAL hglobal; + HRESULT hr; + char *ptr; + + hr = GetHGlobalFromStream(stream, &hglobal); + ok_(__FILE__, line)(hr == S_OK, "Failed to get the stream handle, hr %#x.\n", hr); + + content_size = GlobalSize(hglobal); + ok_(__FILE__, line)(size <= content_size, "Unexpected test output size.\n"); + ptr = GlobalLock(hglobal); + if (size <= content_size) + ok_(__FILE__, line)(!memcmp(expected, ptr, size), "Unexpected output content.\n"); + + GlobalUnlock(hglobal); } static void check_output(IStream *stream, const char *expected, BOOL todo, int line) @@ -74,6 +95,15 @@ } #define CHECK_OUTPUT(stream, expected) check_output(stream, expected, FALSE, __LINE__) #define CHECK_OUTPUT_TODO(stream, expected) check_output(stream, expected, TRUE, __LINE__) +#define CHECK_OUTPUT_RAW(stream, expected, size) check_output_raw(stream, expected, size, __LINE__) + +static void writer_set_property(IXmlWriter *writer, XmlWriterProperty property) +{ + HRESULT hr; + + hr = IXmlWriter_SetProperty(writer, property, TRUE); + ok(hr == S_OK, "Failed to set writer property, hr %#x.\n", hr); +} /* used to test all Write* methods for consistent error state */ static void check_writer_state(IXmlWriter *writer, HRESULT exp_hr) @@ -292,11 +322,93 @@ IXmlWriter_Release(writer); } +static void test_invalid_output_encoding(IXmlWriter *writer, IUnknown *output) +{ + HRESULT hr; + + hr = IXmlWriter_SetOutput(writer, output); + ok(hr == S_OK, "Failed to set output, hr %#x.\n", hr); + + /* TODO: WriteAttributes */ + + hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, aW); + ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + + hr = IXmlWriter_WriteCData(writer, aW); + ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + + hr = IXmlWriter_WriteCharEntity(writer, 0x100); + ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + + hr = IXmlWriter_WriteChars(writer, aW, 1); + ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + + hr = IXmlWriter_WriteComment(writer, aW); + ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + + /* TODO: WriteDocType */ + + hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, NULL); + ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + + hr = IXmlWriter_WriteEndElement(writer); + ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + + hr = IXmlWriter_WriteEntityRef(writer, aW); + ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + + hr = IXmlWriter_WriteFullEndElement(writer); + ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + + hr = IXmlWriter_WriteName(writer, aW); + ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + + hr = IXmlWriter_WriteNmToken(writer, aW); + ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + + /* TODO: WriteNode */ + /* TODO: WriteNodeShallow */ + + hr = IXmlWriter_WriteProcessingInstruction(writer, aW, aW); + ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + + hr = IXmlWriter_WriteQualifiedName(writer, aW, NULL); + ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + + hr = IXmlWriter_WriteRaw(writer, aW); + ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + + hr = IXmlWriter_WriteRawChars(writer, aW, 1); + ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); + ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + + hr = IXmlWriter_WriteString(writer, aW); + ok(hr == MX_E_ENCODING, "Unexpected hr %#x.\n", hr); + + /* TODO: WriteSurrogateCharEntity */ + /* ???TODO: WriteWhitespace */ + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); +} + static void test_writeroutput(void) { static const WCHAR utf16W[] = {'u','t','f','-','1','6',0}; static const WCHAR usasciiW[] = {'u','s','-','a','s','c','i','i',0}; + static const WCHAR dummyW[] = {'d','u','m','m','y',0}; + static const WCHAR utf16_outputW[] = {0xfeff,'<','a'}; IXmlWriterOutput *output; + IXmlWriter *writer; + IStream *stream; IUnknown *unk; HRESULT hr; @@ -339,6 +451,59 @@ hr = CreateXmlWriterOutputWithEncodingName(&testoutput, NULL, usasciiW, &output); ok(hr == S_OK, "got %08x\n", hr); IUnknown_Release(output); + + /* Output with codepage 1200. */ + hr = CreateXmlWriter(&IID_IXmlWriter, (void **)&writer, NULL); + ok(hr == S_OK, "Failed to create writer, hr %#x.\n", hr); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "Failed to create stream, hr %#x.\n", hr); + + hr = CreateXmlWriterOutputWithEncodingCodePage((IUnknown *)stream, NULL, 1200, &output); + ok(hr == S_OK, "Failed to create writer output, hr %#x.\n", hr); + + hr = IXmlWriter_SetOutput(writer, output); + ok(hr == S_OK, "Failed to set writer output, hr %#x.\n", hr); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "Write failed, hr %#x.\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + + CHECK_OUTPUT_RAW(stream, utf16_outputW, sizeof(utf16_outputW)); + + IStream_Release(stream); + + /* Create output with meaningless code page value. */ + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "Failed to create stream, hr %#x.\n", hr); + + output = NULL; + hr = CreateXmlWriterOutputWithEncodingCodePage((IUnknown *)stream, NULL, ~0u, &output); + ok(hr == S_OK, "Failed to create writer output, hr %#x.\n", hr); + + test_invalid_output_encoding(writer, output); + CHECK_OUTPUT(stream, ""); + + IStream_Release(stream); + IUnknown_Release(output); + + /* Same, with invalid encoding name. */ + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + output = NULL; + hr = CreateXmlWriterOutputWithEncodingName((IUnknown *)stream, NULL, dummyW, &output); + ok(hr == S_OK, "got %08x\n", hr); + + test_invalid_output_encoding(writer, output); + CHECK_OUTPUT(stream, ""); + + IStream_Release(stream); + IUnknown_Release(output); + + IXmlWriter_Release(writer); } static void test_writestartdocument(void) @@ -483,8 +648,7 @@ stream = writer_set_output(writer); - hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -548,7 +712,6 @@ static const WCHAR versionW[] = {'v','e','r','s','i','o','n','=','"','1','.','0','"',0}; static const WCHAR utf16W[] = {'u','t','f','-','1','6',0}; static const WCHAR xmlW[] = {'x','m','l',0}; - static const WCHAR aW[] = {'a',0}; IXmlWriterOutput *output; unsigned char *ptr; IXmlWriter *writer; @@ -565,8 +728,7 @@ hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); hr = IXmlWriter_SetOutput(writer, output); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -650,6 +812,8 @@ hr = IXmlWriter_SetOutput(writer, output); ok(hr == S_OK, "got 0x%08x\n", hr); + writer_set_property(writer, XmlWriterProperty_Indent); + hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -660,7 +824,8 @@ ok(hr == S_OK, "got 0x%08x\n", hr); ptr = GlobalLock(hglobal); - ok(ptr[0] == 0xff && ptr[1] == 0xfe, "got %x,%x\n", ptr[0], ptr[1]); + ok(ptr[0] == 0xff && ptr[1] == 0xfe && ptr[2] == '<', "Unexpected output: %#x,%#x,%#x\n", + ptr[0], ptr[1], ptr[2]); GlobalUnlock(hglobal); IUnknown_Release(output); @@ -672,7 +837,6 @@ static void test_writestartelement(void) { static const WCHAR valueW[] = {'v','a','l','u','e',0}; - static const char *str = "<a>value"; static const WCHAR aW[] = {'a',0}; static const WCHAR bW[] = {'b',0}; IXmlWriter *writer; @@ -734,10 +898,14 @@ hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, valueW); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); - - CHECK_OUTPUT(stream, str); + hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + CHECK_OUTPUT(stream, + "<a>value"); IStream_Release(stream); IXmlWriter_Release(writer); @@ -848,8 +1016,7 @@ hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); hr = IXmlWriter_WriteComment(writer, aW); ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); @@ -896,8 +1063,7 @@ hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); hr = IXmlWriter_WriteCData(writer, aW); ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); @@ -1095,11 +1261,8 @@ stream = writer_set_output(writer); - hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_Indent, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); + writer_set_property(writer, XmlWriterProperty_Indent); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1125,8 +1288,35 @@ " \r\n" "</a>"); - IXmlWriter_Release(writer); - IStream_Release(stream); + IStream_Release(stream); + + /* WriteElementString */ + stream = writer_set_output(writer); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXmlWriter_WriteEndElement(writer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + CHECK_OUTPUT(stream, + "<a>\r\n" + " \r\n" + " \r\n" + "</a>"); + + IStream_Release(stream); + + IXmlWriter_Release(writer); } static void test_WriteAttributeString(void) @@ -1147,8 +1337,7 @@ stream = writer_set_output(writer); - hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1227,11 +1416,8 @@ /* standalone element */ stream = writer_set_output(writer); - hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_Indent, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); + writer_set_property(writer, XmlWriterProperty_Indent); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1255,11 +1441,8 @@ /* nested elements */ stream = writer_set_output(writer); - hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_Indent, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); + writer_set_property(writer, XmlWriterProperty_Indent); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1301,8 +1484,7 @@ /* without indentation */ stream = writer_set_output(writer); - hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1342,8 +1524,7 @@ hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - hr = IXmlWriter_SetProperty(writer, XmlWriterProperty_OmitXmlDeclaration, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); + writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); hr = IXmlWriter_WriteString(writer, aW); ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr);

1 0

[akhaldi] 75950: [XMLLITE] Sync with Wine Staging 2.16. CORE-13762 49a57bc xmllite/writer: Improve handling of the output with invalid encoding. a6d6beb xmllite/writer: Do not indent after just BOM...
by akhaldi＠svn.reactos.org 24 Sep '17

24 Sep '17

Author: akhaldi Date: Sun Sep 24 11:18:39 2017 New Revision: 75950 URL: http://svn.reactos.org/svn/reactos?rev=75950&view=rev Log: [XMLLITE] Sync with Wine Staging 2.16. CORE-13762 49a57bc xmllite/writer: Improve handling of the output with invalid encoding. a6d6beb xmllite/writer: Do not indent after just BOM has been written. 5773a5d xmllite/writer: Fix indentation on WriteElementString(). 5f4ed88 xmllite/writer: Fix empty element and state handling in WriteElementString(). b06dd7d xmllite/reader: Added a helper for setting current attribute cursor. be56791 xmllite/reader: Implement MoveToAttributeByName(). Modified: trunk/reactos/dll/win32/xmllite/reader.c trunk/reactos/dll/win32/xmllite/writer.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/xmllite/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/reader.c… ============================================================================== --- trunk/reactos/dll/win32/xmllite/reader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/reader.c [iso-8859-1] Sun Sep 24 11:18:39 2017 @@ -146,7 +146,7 @@ static const struct xml_encoding_data xml_encoding_map[] = { { usasciiW, XmlEncoding_USASCII, 20127 }, - { utf16W, XmlEncoding_UTF16, ~0 }, + { utf16W, XmlEncoding_UTF16, 1200 }, { utf8W, XmlEncoding_UTF8, CP_UTF8 }, }; @@ -511,6 +511,19 @@ reader->is_empty_element = FALSE; } +static struct ns *reader_lookup_ns(xmlreader *reader, const strval *prefix) +{ + struct list *nslist = prefix ? &reader->ns : &reader->nsdef; + struct ns *ns; + + LIST_FOR_EACH_ENTRY_REV(ns, nslist, struct ns, entry) { + if (strval_eq(reader, prefix, &ns->prefix)) + return ns; + } + + return NULL; +} + static HRESULT reader_inc_depth(xmlreader *reader) { return (++reader->depth >= reader->max_depth && reader->max_depth) ? SC_E_MAXELEMENTDEPTH : S_OK; @@ -1061,7 +1074,7 @@ prev_len = dest->written / sizeof(WCHAR); /* just copy for UTF-16 case */ - if (cp == ~0) + if (cp == 1200) { readerinput_grow(readerinput, len); memcpy(dest->data + dest->written, src->data + src->cur, len); @@ -2928,6 +2941,15 @@ return This->state == XmlReadState_Closed ? S_FALSE : S_OK; } +static void reader_set_current_attribute(xmlreader *reader, struct attribute *attr) +{ + reader->attr = attr; + reader->chunk_read_off = 0; + reader_set_strvalue(reader, StringValue_Prefix, &attr->prefix); + reader_set_strvalue(reader, StringValue_QualifiedName, &attr->qname); + reader_set_strvalue(reader, StringValue_Value, &attr->value); +} + static HRESULT reader_move_to_first_attribute(xmlreader *reader) { if (!reader->attr_count) @@ -2936,11 +2958,7 @@ if (!reader->attr) reader_inc_depth(reader); - reader->attr = LIST_ENTRY(list_head(&reader->attrs), struct attribute, entry); - reader->chunk_read_off = 0; - reader_set_strvalue(reader, StringValue_Prefix, &reader->attr->prefix); - reader_set_strvalue(reader, StringValue_QualifiedName, &reader->attr->qname); - reader_set_strvalue(reader, StringValue_Value, &reader->attr->value); + reader_set_current_attribute(reader, LIST_ENTRY(list_head(&reader->attrs), struct attribute, entry)); return S_OK; } @@ -2968,23 +2986,111 @@ next = list_next(&This->attrs, &This->attr->entry); if (next) - { - This->attr = LIST_ENTRY(next, struct attribute, entry); - This->chunk_read_off = 0; - reader_set_strvalue(This, StringValue_Prefix, &This->attr->prefix); - reader_set_strvalue(This, StringValue_QualifiedName, &This->attr->qname); - reader_set_strvalue(This, StringValue_Value, &This->attr->value); - } + reader_set_current_attribute(This, LIST_ENTRY(next, struct attribute, entry)); return next ? S_OK : S_FALSE; } +static void reader_get_attribute_ns_uri(xmlreader *reader, struct attribute *attr, const WCHAR **uri, UINT *len) +{ + static const WCHAR xmlns_uriW[] = {'h','t','t','p',':','/','/','w','w','w','.','w','3','.','o','r','g','/', + '2','0','0','0','/','x','m','l','n','s','/',0}; + static const WCHAR xml_uriW[] = {'h','t','t','p',':','/','/','w','w','w','.','w','3','.','o','r','g','/', + 'X','M','L','/','1','9','9','8','/','n','a','m','e','s','p','a','c','e',0}; + + /* Check for reserved prefixes first */ + if ((strval_eq(reader, &attr->prefix, &strval_empty) && strval_eq(reader, &attr->localname, &strval_xmlns)) || + strval_eq(reader, &attr->prefix, &strval_xmlns)) + { + *uri = xmlns_uriW; + *len = sizeof(xmlns_uriW)/sizeof(xmlns_uriW[0]) - 1; + } + else if (strval_eq(reader, &attr->prefix, &strval_xml)) + { + *uri = xml_uriW; + *len = sizeof(xml_uriW)/sizeof(xml_uriW[0]) - 1; + } + else + { + *uri = NULL; + *len = 0; + } + + if (!*uri) + { + struct ns *ns; + + if ((ns = reader_lookup_ns(reader, &attr->prefix))) + { + *uri = ns->uri.str; + *len = ns->uri.len; + } + else + { + *uri = emptyW; + *len = 0; + } + } +} + +static void reader_get_attribute_local_name(xmlreader *reader, struct attribute *attr, const WCHAR **name, UINT *len) +{ + if (attr->flags & ATTRIBUTE_DEFAULT_NS_DEFINITION) + { + *name = xmlnsW; + *len = 5; + } + else if (attr->flags & ATTRIBUTE_NS_DEFINITION) + { + const struct ns *ns = reader_lookup_ns(reader, &attr->localname); + *name = ns->prefix.str; + *len = ns->prefix.len; + } + else + { + *name = attr->localname.str; + *len = attr->localname.len; + } +} + static HRESULT WINAPI xmlreader_MoveToAttributeByName(IXmlReader* iface, - LPCWSTR local_name, - LPCWSTR namespaceUri) -{ - FIXME("(%p %p %p): stub\n", iface, local_name, namespaceUri); - return E_NOTIMPL; + const WCHAR *local_name, const WCHAR *namespace_uri) +{ + xmlreader *This = impl_from_IXmlReader(iface); + UINT target_name_len, target_uri_len; + struct attribute *attr; + + TRACE("(%p)->(%s %s)\n", This, debugstr_w(local_name), debugstr_w(namespace_uri)); + + if (!local_name) + return E_INVALIDARG; + + if (!This->attr_count) + return S_FALSE; + + if (!namespace_uri) + namespace_uri = emptyW; + + target_name_len = strlenW(local_name); + target_uri_len = strlenW(namespace_uri); + + LIST_FOR_EACH_ENTRY(attr, &This->attrs, struct attribute, entry) + { + UINT name_len, uri_len; + const WCHAR *name, *uri; + + reader_get_attribute_local_name(This, attr, &name, &name_len); + reader_get_attribute_ns_uri(This, attr, &uri, &uri_len); + + if (name_len == target_name_len && uri_len == target_uri_len && + !strcmpW(name, local_name) && !strcmpW(uri, namespace_uri)) + { + reader_set_current_attribute(This, attr); + return S_OK; + } + } + + return S_FALSE; } static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) @@ -3078,19 +3184,6 @@ return S_OK; } -static struct ns *reader_lookup_ns(xmlreader *reader, const strval *prefix) -{ - struct list *nslist = prefix ? &reader->ns : &reader->nsdef; - struct ns *ns; - - LIST_FOR_EACH_ENTRY_REV(ns, nslist, struct ns, entry) { - if (strval_eq(reader, prefix, &ns->prefix)) - return ns; - } - - return NULL; -} - static struct ns *reader_lookup_nsdef(xmlreader *reader) { if (list_empty(&reader->nsdef)) @@ -3112,42 +3205,10 @@ if (!len) len = &length; - *uri = NULL; - *len = 0; - switch ((nodetype = reader_get_nodetype(This))) { case XmlNodeType_Attribute: - { - static const WCHAR xmlns_uriW[] = {'h','t','t','p',':','/','/','w','w','w','.','w','3','.','o','r','g','/', - '2','0','0','0','/','x','m','l','n','s','/',0}; - static const WCHAR xml_uriW[] = {'h','t','t','p',':','/','/','w','w','w','.','w','3','.','o','r','g','/', - 'X','M','L','/','1','9','9','8','/','n','a','m','e','s','p','a','c','e',0}; - - /* check for reserved prefixes first */ - if ((strval_eq(This, prefix, &strval_empty) && strval_eq(This, &This->attr->localname, &strval_xmlns)) || - strval_eq(This, prefix, &strval_xmlns)) - { - *uri = xmlns_uriW; - *len = sizeof(xmlns_uriW)/sizeof(xmlns_uriW[0]) - 1; - } - else if (strval_eq(This, prefix, &strval_xml)) { - *uri = xml_uriW; - *len = sizeof(xml_uriW)/sizeof(xml_uriW[0]) - 1; - } - - if (!*uri) { - ns = reader_lookup_ns(This, prefix); - if (ns) { - *uri = ns->uri.str; - *len = ns->uri.len; - } - else { - *uri = emptyW; - *len = 0; - } - } - } + reader_get_attribute_ns_uri(This, This->attr, uri, len); break; case XmlNodeType_Element: case XmlNodeType_EndElement: @@ -3179,6 +3240,8 @@ break; default: FIXME("Unhandled node type %d\n", nodetype); + *uri = NULL; + *len = 0; return E_NOTIMPL; } @@ -3212,22 +3275,7 @@ *len = element->localname.len; break; case XmlNodeType_Attribute: - if (This->attr->flags & ATTRIBUTE_DEFAULT_NS_DEFINITION) - { - *name = xmlnsW; - *len = 5; - } - else if (This->attr->flags & ATTRIBUTE_NS_DEFINITION) - { - const struct ns *ns = reader_lookup_ns(This, &This->attr->localname); - *name = ns->prefix.str; - *len = ns->prefix.len; - } - else - { - *name = This->attr->localname.str; - *len = This->attr->localname.len; - } + reader_get_attribute_local_name(This, This->attr, name, len); break; default: *name = This->strvalues[StringValue_LocalName].str; Modified: trunk/reactos/dll/win32/xmllite/writer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/writer.c… ============================================================================== --- trunk/reactos/dll/win32/xmllite/writer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/writer.c [iso-8859-1] Sun Sep 24 11:18:39 2017 @@ -30,6 +30,7 @@ #define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0])) static const WCHAR closeelementW[] = {'<','/'}; +static const WCHAR closetagW[] = {' ','/','>'}; static const WCHAR closepiW[] = {'?','>'}; static const WCHAR ltW[] = {'<'}; static const WCHAR gtW[] = {'>'}; @@ -46,13 +47,14 @@ typedef enum { - XmlWriterState_Initial, /* output is not set yet */ - XmlWriterState_Ready, /* SetOutput() was called, ready to start */ - XmlWriterState_PIDocStarted, /* document was started with manually added 'xml' PI */ - XmlWriterState_DocStarted, /* document was started with WriteStartDocument() */ - XmlWriterState_ElemStarted, /* writing element */ - XmlWriterState_Content, /* content is accepted at this point */ - XmlWriterState_DocClosed /* WriteEndDocument was called */ + XmlWriterState_Initial, /* output is not set yet */ + XmlWriterState_Ready, /* SetOutput() was called, ready to start */ + XmlWriterState_InvalidEncoding, /* SetOutput() was called, but output had invalid encoding */ + XmlWriterState_PIDocStarted, /* document was started with manually added 'xml' PI */ + XmlWriterState_DocStarted, /* document was started with WriteStartDocument() */ + XmlWriterState_ElemStarted, /* writing element */ + XmlWriterState_Content, /* content is accepted at this point */ + XmlWriterState_DocClosed /* WriteEndDocument was called */ } XmlWriterState; typedef struct @@ -197,11 +199,11 @@ { struct output_buffer *buffer = &output->buffer; const int initial_len = 0x2000; + UINT cp = ~0u; HRESULT hr; - UINT cp; - - hr = get_code_page(output->encoding, &cp); - if (FAILED(hr)) return hr; + + if (FAILED(hr = get_code_page(output->encoding, &cp))) + WARN("Failed to get code page for specified encoding.\n"); buffer->data = writeroutput_alloc(output, initial_len); if (!buffer->data) return E_OUTOFMEMORY; @@ -245,30 +247,30 @@ HRESULT hr; char *ptr; - if (buffer->codepage != ~0) { + if (buffer->codepage == 1200) { + /* For UTF-16 encoding just copy. */ + length = len == -1 ? strlenW(data) : len; + if (length) { + length *= sizeof(WCHAR); + + hr = grow_output_buffer(output, length); + if (FAILED(hr)) return hr; + ptr = buffer->data + buffer->written; + + memcpy(ptr, data, length); + buffer->written += length; + ptr += length; + /* null termination */ + *(WCHAR*)ptr = 0; + } + } + else { length = WideCharToMultiByte(buffer->codepage, 0, data, len, NULL, 0, NULL, NULL); hr = grow_output_buffer(output, length); if (FAILED(hr)) return hr; ptr = buffer->data + buffer->written; length = WideCharToMultiByte(buffer->codepage, 0, data, len, ptr, length, NULL, NULL); buffer->written += len == -1 ? length-1 : length; - } - else { - /* WCHAR data just copied */ - length = len == -1 ? strlenW(data) : len; - if (length) { - length *= sizeof(WCHAR); - - hr = grow_output_buffer(output, length); - if (FAILED(hr)) return hr; - ptr = buffer->data + buffer->written; - - memcpy(ptr, data, length); - buffer->written += length; - ptr += length; - /* null termination */ - *(WCHAR*)ptr = 0; - } } return S_OK; @@ -436,7 +438,9 @@ if (!writer->indent) return; - if (writer->output->buffer.written) + /* Do state check to prevent newline inserted after BOM. It is assumed that + state does not change between writing BOM and inserting indentation. */ + if (writer->output->buffer.written && writer->state != XmlWriterState_Ready) write_output_buffer(writer->output, crlfW, ARRAY_SIZE(crlfW)); while (indent_level--) write_output_buffer(writer->output, dblspaceW, ARRAY_SIZE(dblspaceW)); @@ -533,7 +537,6 @@ writeroutput, writeroutput->lpVtbl); IUnknown_Release(writeroutput); return E_FAIL; - } } @@ -544,7 +547,10 @@ This->output = impl_from_IXmlWriterOutput(writeroutput); } - This->state = XmlWriterState_Ready; + if (This->output->encoding == XmlEncoding_Unknown) + This->state = XmlWriterState_InvalidEncoding; + else + This->state = XmlWriterState_Ready; return writeroutput_query_for_stream(This->output); } @@ -630,6 +636,8 @@ case XmlWriterState_DocClosed: This->state = XmlWriterState_DocClosed; return WR_E_INVALIDACTION; + case XmlWriterState_InvalidEncoding: + return MX_E_ENCODING; default: ; } @@ -677,6 +685,8 @@ case XmlWriterState_DocClosed: This->state = XmlWriterState_DocClosed; return WR_E_INVALIDACTION; + case XmlWriterState_InvalidEncoding: + return MX_E_ENCODING; default: ; } @@ -718,6 +728,8 @@ { case XmlWriterState_Initial: return E_UNEXPECTED; + case XmlWriterState_InvalidEncoding: + return MX_E_ENCODING; case XmlWriterState_ElemStarted: writer_close_starttag(This); break; @@ -743,6 +755,8 @@ { case XmlWriterState_Initial: return E_UNEXPECTED; + case XmlWriterState_InvalidEncoding: + return MX_E_ENCODING; case XmlWriterState_DocClosed: return WR_E_INVALIDACTION; default: @@ -765,6 +779,8 @@ { case XmlWriterState_Initial: return E_UNEXPECTED; + case XmlWriterState_InvalidEncoding: + return MX_E_ENCODING; case XmlWriterState_ElemStarted: writer_close_starttag(This); break; @@ -822,29 +838,33 @@ { case XmlWriterState_Initial: return E_UNEXPECTED; + case XmlWriterState_InvalidEncoding: + return MX_E_ENCODING; case XmlWriterState_ElemStarted: writer_close_starttag(This); break; - case XmlWriterState_Ready: - case XmlWriterState_DocStarted: - case XmlWriterState_PIDocStarted: - break; - default: - This->state = XmlWriterState_DocClosed; - return WR_E_INVALIDACTION; + case XmlWriterState_DocClosed: + return WR_E_INVALIDACTION; + default: + ; } write_encoding_bom(This); + write_node_indent(This); write_output_buffer(This->output, ltW, ARRAY_SIZE(ltW)); write_output_qname(This->output, prefix, local_name); - write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW)); if (value) + { + write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW)); write_output_buffer(This->output, value, -1); - - write_output_buffer(This->output, closeelementW, ARRAY_SIZE(closeelementW)); - write_output_qname(This->output, prefix, local_name); - write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW)); + write_output_buffer(This->output, closeelementW, ARRAY_SIZE(closeelementW)); + write_output_qname(This->output, prefix, local_name); + write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW)); + } + else + write_output_buffer(This->output, closetagW, ARRAY_SIZE(closetagW)); + This->state = XmlWriterState_Content; return S_OK; @@ -864,6 +884,8 @@ case XmlWriterState_DocClosed: This->state = XmlWriterState_DocClosed; return WR_E_INVALIDACTION; + case XmlWriterState_InvalidEncoding: + return MX_E_ENCODING; default: ; } @@ -891,6 +913,8 @@ case XmlWriterState_DocClosed: This->state = XmlWriterState_DocClosed; return WR_E_INVALIDACTION; + case XmlWriterState_InvalidEncoding: + return MX_E_ENCODING; default: ; } @@ -901,8 +925,8 @@ writer_dec_indent(This); - if (This->starttagopen) { - static WCHAR closetagW[] = {' ','/','>'}; + if (This->starttagopen) + { write_output_buffer(This->output, closetagW, ARRAY_SIZE(closetagW)); This->starttagopen = FALSE; } @@ -927,6 +951,8 @@ { case XmlWriterState_Initial: return E_UNEXPECTED; + case XmlWriterState_InvalidEncoding: + return MX_E_ENCODING; case XmlWriterState_DocClosed: return WR_E_INVALIDACTION; default: @@ -951,6 +977,8 @@ case XmlWriterState_DocClosed: This->state = XmlWriterState_DocClosed; return WR_E_INVALIDACTION; + case XmlWriterState_InvalidEncoding: + return MX_E_ENCODING; default: ; } @@ -990,6 +1018,8 @@ case XmlWriterState_DocClosed: This->state = XmlWriterState_DocClosed; return WR_E_INVALIDACTION; + case XmlWriterState_InvalidEncoding: + return MX_E_ENCODING; default: ; } @@ -1011,6 +1041,8 @@ case XmlWriterState_DocClosed: This->state = XmlWriterState_DocClosed; return WR_E_INVALIDACTION; + case XmlWriterState_InvalidEncoding: + return MX_E_ENCODING; default: ; } @@ -1051,6 +1083,8 @@ { case XmlWriterState_Initial: return E_UNEXPECTED; + case XmlWriterState_InvalidEncoding: + return MX_E_ENCODING; case XmlWriterState_DocStarted: if (!strcmpW(name, xmlW)) return WR_E_INVALIDACTION; @@ -1087,6 +1121,8 @@ { case XmlWriterState_Initial: return E_UNEXPECTED; + case XmlWriterState_InvalidEncoding: + return MX_E_ENCODING; case XmlWriterState_DocClosed: return WR_E_INVALIDACTION; default: @@ -1115,6 +1151,8 @@ case XmlWriterState_DocStarted: case XmlWriterState_PIDocStarted: break; + case XmlWriterState_InvalidEncoding: + return MX_E_ENCODING; default: This->state = XmlWriterState_DocClosed; return WR_E_INVALIDACTION; @@ -1134,6 +1172,8 @@ { case XmlWriterState_Initial: return E_UNEXPECTED; + case XmlWriterState_InvalidEncoding: + return MX_E_ENCODING; case XmlWriterState_DocClosed: return WR_E_INVALIDACTION; default: @@ -1158,6 +1198,8 @@ return S_OK; case XmlWriterState_Ready: break; + case XmlWriterState_InvalidEncoding: + return MX_E_ENCODING; default: This->state = XmlWriterState_DocClosed; return WR_E_INVALIDACTION; @@ -1180,6 +1222,8 @@ { case XmlWriterState_Initial: return E_UNEXPECTED; + case XmlWriterState_InvalidEncoding: + return MX_E_ENCODING; case XmlWriterState_DocClosed: return WR_E_INVALIDACTION; default: @@ -1195,12 +1239,13 @@ return E_OUTOFMEMORY; write_encoding_bom(This); + write_node_indent(This); + This->state = XmlWriterState_ElemStarted; This->starttagopen = TRUE; push_element(This, element); - write_node_indent(This); write_output_buffer(This->output, ltW, ARRAY_SIZE(ltW)); write_output_qname(This->output, prefix, local_name); writer_inc_indent(This); @@ -1255,6 +1300,8 @@ case XmlWriterState_DocClosed: This->state = XmlWriterState_DocClosed; return WR_E_INVALIDACTION; + case XmlWriterState_InvalidEncoding: + return MX_E_ENCODING; default: ; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 24 11:18:39 2017 @@ -218,7 +218,7 @@ reactos/dll/win32/xinput1_2 # Synced to WineStaging-2.9 reactos/dll/win32/xinput1_3 # Synced to WineStaging-2.9 reactos/dll/win32/xinput9_1_0 # Synced to WineStaging-2.9 -reactos/dll/win32/xmllite # Synced to WineStaging-2.9 +reactos/dll/win32/xmllite # Synced to WineStaging-2.16 reactos/dll/cpl/inetcpl # Synced to WineStaging-2.9

1 0

[akhaldi] 75949: [WINTRUST] Sync with Wine Staging 2.16. CORE-13762 59a476e wintrust: use enhanced crypto provider in VerifyImageHash 9369e80 wintrust: Increase buffer size to silence a gcc warning.
by akhaldi＠svn.reactos.org 24 Sep '17

24 Sep '17

Author: akhaldi Date: Sun Sep 24 11:18:27 2017 New Revision: 75949 URL: http://svn.reactos.org/svn/reactos?rev=75949&view=rev Log: [WINTRUST] Sync with Wine Staging 2.16. CORE-13762 59a476e wintrust: use enhanced crypto provider in VerifyImageHash 9369e80 wintrust: Increase buffer size to silence a gcc warning. Modified: trunk/reactos/dll/win32/wintrust/asn.c trunk/reactos/dll/win32/wintrust/softpub.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wintrust/asn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/asn.c?r… ============================================================================== --- trunk/reactos/dll/win32/wintrust/asn.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/asn.c [iso-8859-1] Sun Sep 24 11:18:27 2017 @@ -1830,10 +1830,10 @@ /* The largest possible string for the first two components * is 2.175 (= 2 * 40 + 175 = 255), so this is big enough. */ - char firstTwo[6]; + char firstTwo[8]; const BYTE *ptr; - snprintf(firstTwo, sizeof(firstTwo), "%d.%d", + sprintf(firstTwo, "%d.%d", pbEncoded[1 + lenBytes] / 40, pbEncoded[1 + lenBytes] - (pbEncoded[1 + lenBytes] / 40) * 40); Modified: trunk/reactos/dll/win32/wintrust/softpub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/softpub… ============================================================================== --- trunk/reactos/dll/win32/wintrust/softpub.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/softpub.c [iso-8859-1] Sun Sep 24 11:18:27 2017 @@ -339,7 +339,7 @@ if (!prov) { - if (!CryptAcquireContextW(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) + if (!CryptAcquireContextW(&prov, NULL, MS_ENH_RSA_AES_PROV_W, PROV_RSA_AES, CRYPT_VERIFYCONTEXT)) return GetLastError(); release_prov = TRUE; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 24 11:18:27 2017 @@ -206,7 +206,7 @@ reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 reactos/dll/win32/winscard # Synced to WineStaging-2.9 -reactos/dll/win32/wintrust # Synced to WineStaging-2.9 +reactos/dll/win32/wintrust # Synced to WineStaging-2.16 reactos/dll/win32/wldap32 # Synced to WineStaging-2.9 reactos/dll/win32/wmi # Synced to WineStaging-2.9 reactos/dll/win32/wmiutils # Synced to WineStaging-2.9

1 0

[akhaldi] 75948: [WINMINE] Sync with Wine Staging 2.16. CORE-13762 ca8f056 winemine: Added Shift+LClick hotkey to uncover multiple cells. 9b90266 winemine: Mine random placing fix.
by akhaldi＠svn.reactos.org 24 Sep '17

24 Sep '17

Author: akhaldi Date: Sun Sep 24 11:18:18 2017 New Revision: 75948 URL: http://svn.reactos.org/svn/reactos?rev=75948&view=rev Log: [WINMINE] Sync with Wine Staging 2.16. CORE-13762 ca8f056 winemine: Added Shift+LClick hotkey to uncover multiple cells. 9b90266 winemine: Mine random placing fix. Modified: trunk/reactos/base/applications/games/winmine/main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/applications/games/winmine/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/main.c [iso-8859-1] Sun Sep 24 11:18:18 2017 @@ -342,8 +342,8 @@ /* create mines */ i = 0; while( (unsigned) i < p_board->mines ) { - col = (int) (p_board->cols * (float) rand() / RAND_MAX + 1); - row = (int) (p_board->rows * (float) rand() / RAND_MAX + 1); + col = rand() % p_board->cols + 1; + row = rand() % p_board->rows + 1; if( !p_board->box[col][row].IsMine ) { i++; @@ -883,7 +883,7 @@ case WM_LBUTTONDOWN: WINE_TRACE("WM_LBUTTONDOWN\n"); - if( wParam & MK_RBUTTON ) + if( wParam & ( MK_RBUTTON | MK_SHIFT ) ) msg = WM_MBUTTONDOWN; TestBoard( hWnd, &board, (short)LOWORD(lParam), (short)HIWORD(lParam), msg ); SetCapture( hWnd ); @@ -891,7 +891,7 @@ case WM_LBUTTONUP: WINE_TRACE("WM_LBUTTONUP\n"); - if( wParam & MK_RBUTTON ) + if( wParam & ( MK_RBUTTON | MK_SHIFT ) ) msg = WM_MBUTTONUP; TestBoard( hWnd, &board, (short)LOWORD(lParam), (short)HIWORD(lParam), msg ); ReleaseCapture(); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 24 11:18:18 2017 @@ -233,7 +233,7 @@ reactos/base/applications/cmdutils/wmic # Synced to WineStaging-2.9 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-2.9 reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-2.9 -reactos/base/applications/games/winmine # Synced to WineStaging-1.9.16 with our own resources. +reactos/base/applications/games/winmine # Synced to WineStaging-2.16 with our own resources. reactos/base/applications/extrac32 # Synced to WineStaging-2.9 reactos/base/applications/iexplore # Synced to WineStaging-2.9 reactos/base/applications/notepad # Forked at Wine-20041201

1 0

[akhaldi] 75947: [WININET_WINETEST] Sync with Wine Staging 2.16. CORE-13762
by akhaldi＠svn.reactos.org 24 Sep '17

24 Sep '17

Author: akhaldi Date: Sun Sep 24 11:18:11 2017 New Revision: 75947 URL: http://svn.reactos.org/svn/reactos?rev=75947&view=rev Log: [WININET_WINETEST] Sync with Wine Staging 2.16. CORE-13762 Modified: trunk/rostests/winetests/wininet/http.c Modified: trunk/rostests/winetests/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/http.c?… ============================================================================== --- trunk/rostests/winetests/wininet/http.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wininet/http.c [iso-8859-1] Sun Sep 24 11:18:11 2017 @@ -114,7 +114,7 @@ wine_allow[MAX_INTERNET_STATUS], notified[MAX_INTERNET_STATUS]; static const char *status_string[MAX_INTERNET_STATUS]; -static HANDLE hCompleteEvent, conn_close_event, conn_wait_event, server_req_rec_event; +static HANDLE complete_event, conn_close_event, conn_wait_event, server_req_rec_event, request_sent_event; static DWORD req_error; static BOOL is_ie7plus = TRUE; @@ -200,6 +200,33 @@ return proxy_enable != 0; } +static void init_events(void) +{ + complete_event = CreateEventW(NULL, FALSE, FALSE, NULL); + conn_close_event = CreateEventW(NULL, FALSE, FALSE, NULL); + conn_wait_event = CreateEventW(NULL, FALSE, FALSE, NULL); + server_req_rec_event = CreateEventW(NULL, FALSE, FALSE, NULL); + request_sent_event = CreateEventW(NULL, FALSE, FALSE, NULL); +} + +static void free_events(void) +{ + CloseHandle(complete_event); + CloseHandle(conn_close_event); + CloseHandle(conn_wait_event); + CloseHandle(server_req_rec_event); + CloseHandle(request_sent_event); +} + +static void reset_events(void) +{ + ResetEvent(complete_event); + ResetEvent(conn_close_event); + ResetEvent(conn_wait_event); + ResetEvent(server_req_rec_event); + ResetEvent(request_sent_event); +} + #define test_status_code(a,b) _test_status_code(__LINE__,a,b, FALSE) #define test_status_code_todo(a,b) _test_status_code(__LINE__,a,b, TRUE) static void _test_status_code(unsigned line, HINTERNET req, DWORD excode, BOOL is_todo) @@ -292,6 +319,19 @@ ok_(__FILE__,line)(flags == exflags, "flags = %x, expected %x\n", flags, exflags); } +#define test_request_url(a,b) _test_request_url(__LINE__,a,b) +static void _test_request_url(unsigned line, HINTERNET req, const char *expected_url) +{ + char buf[INTERNET_MAX_URL_LENGTH]; + DWORD size = sizeof(buf); + BOOL res; + + res = InternetQueryOptionA(req, INTERNET_OPTION_URL, buf, &size); + ok_(__FILE__,line)(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed: %u\n", GetLastError()); + ok_(__FILE__,line)(size == strlen(expected_url), "size = %u\n", size); + ok_(__FILE__,line)(!strcmp(buf, expected_url), "unexpected URL %s, expected %s\n", buf, expected_url); +} + #define test_http_version(a) _test_http_version(__LINE__,a) static void _test_http_version(unsigned line, HINTERNET req) { @@ -320,86 +360,99 @@ switch (dwInternetStatus) { case INTERNET_STATUS_RESOLVING_NAME: - trace("%04x:Callback %p 0x%lx INTERNET_STATUS_RESOLVING_NAME \"%s\" %d\n", - GetCurrentThreadId(), hInternet, dwContext, - (LPCSTR)lpvStatusInformation,dwStatusInformationLength); + if(winetest_debug > 1) + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_RESOLVING_NAME \"%s\" %d\n", + GetCurrentThreadId(), hInternet, dwContext, + (LPCSTR)lpvStatusInformation,dwStatusInformationLength); *(LPSTR)lpvStatusInformation = '\0'; break; case INTERNET_STATUS_NAME_RESOLVED: - trace("%04x:Callback %p 0x%lx INTERNET_STATUS_NAME_RESOLVED \"%s\" %d\n", - GetCurrentThreadId(), hInternet, dwContext, - (LPCSTR)lpvStatusInformation,dwStatusInformationLength); + if(winetest_debug > 1) + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_NAME_RESOLVED \"%s\" %d\n", + GetCurrentThreadId(), hInternet, dwContext, + (LPCSTR)lpvStatusInformation,dwStatusInformationLength); *(LPSTR)lpvStatusInformation = '\0'; break; case INTERNET_STATUS_CONNECTING_TO_SERVER: - trace("%04x:Callback %p 0x%lx INTERNET_STATUS_CONNECTING_TO_SERVER \"%s\" %d\n", - GetCurrentThreadId(), hInternet, dwContext, - (LPCSTR)lpvStatusInformation,dwStatusInformationLength); + if(winetest_debug > 1) + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_CONNECTING_TO_SERVER \"%s\" %d\n", + GetCurrentThreadId(), hInternet, dwContext, + (LPCSTR)lpvStatusInformation,dwStatusInformationLength); ok(dwStatusInformationLength == strlen(lpvStatusInformation)+1, "unexpected size %u\n", dwStatusInformationLength); *(LPSTR)lpvStatusInformation = '\0'; break; case INTERNET_STATUS_CONNECTED_TO_SERVER: - trace("%04x:Callback %p 0x%lx INTERNET_STATUS_CONNECTED_TO_SERVER \"%s\" %d\n", - GetCurrentThreadId(), hInternet, dwContext, - (LPCSTR)lpvStatusInformation,dwStatusInformationLength); + if(winetest_debug > 1) + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_CONNECTED_TO_SERVER \"%s\" %d\n", + GetCurrentThreadId(), hInternet, dwContext, + (LPCSTR)lpvStatusInformation,dwStatusInformationLength); ok(dwStatusInformationLength == strlen(lpvStatusInformation)+1, "unexpected size %u\n", dwStatusInformationLength); *(LPSTR)lpvStatusInformation = '\0'; break; case INTERNET_STATUS_SENDING_REQUEST: - trace("%04x:Callback %p 0x%lx INTERNET_STATUS_SENDING_REQUEST %p %d\n", - GetCurrentThreadId(), hInternet, dwContext, - lpvStatusInformation,dwStatusInformationLength); + if(winetest_debug > 1) + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_SENDING_REQUEST %p %d\n", + GetCurrentThreadId(), hInternet, dwContext, + lpvStatusInformation,dwStatusInformationLength); break; case INTERNET_STATUS_REQUEST_SENT: ok(dwStatusInformationLength == sizeof(DWORD), "info length should be sizeof(DWORD) instead of %d\n", dwStatusInformationLength); - trace("%04x:Callback %p 0x%lx INTERNET_STATUS_REQUEST_SENT 0x%x %d\n", - GetCurrentThreadId(), hInternet, dwContext, - *(DWORD *)lpvStatusInformation,dwStatusInformationLength); + if(winetest_debug > 1) + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_REQUEST_SENT 0x%x %d\n", + GetCurrentThreadId(), hInternet, dwContext, + *(DWORD *)lpvStatusInformation,dwStatusInformationLength); break; case INTERNET_STATUS_RECEIVING_RESPONSE: - trace("%04x:Callback %p 0x%lx INTERNET_STATUS_RECEIVING_RESPONSE %p %d\n", - GetCurrentThreadId(), hInternet, dwContext, - lpvStatusInformation,dwStatusInformationLength); + if(winetest_debug > 1) + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_RECEIVING_RESPONSE %p %d\n", + GetCurrentThreadId(), hInternet, dwContext, + lpvStatusInformation,dwStatusInformationLength); break; case INTERNET_STATUS_RESPONSE_RECEIVED: ok(dwStatusInformationLength == sizeof(DWORD), "info length should be sizeof(DWORD) instead of %d\n", dwStatusInformationLength); - trace("%04x:Callback %p 0x%lx INTERNET_STATUS_RESPONSE_RECEIVED 0x%x %d\n", - GetCurrentThreadId(), hInternet, dwContext, - *(DWORD *)lpvStatusInformation,dwStatusInformationLength); + if(winetest_debug > 1) + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_RESPONSE_RECEIVED 0x%x %d\n", + GetCurrentThreadId(), hInternet, dwContext, + *(DWORD *)lpvStatusInformation,dwStatusInformationLength); break; case INTERNET_STATUS_CTL_RESPONSE_RECEIVED: - trace("%04x:Callback %p 0x%lx INTERNET_STATUS_CTL_RESPONSE_RECEIVED %p %d\n", - GetCurrentThreadId(), hInternet,dwContext, - lpvStatusInformation,dwStatusInformationLength); + if(winetest_debug > 1) + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_CTL_RESPONSE_RECEIVED %p %d\n", + GetCurrentThreadId(), hInternet,dwContext, + lpvStatusInformation,dwStatusInformationLength); break; case INTERNET_STATUS_PREFETCH: - trace("%04x:Callback %p 0x%lx INTERNET_STATUS_PREFETCH %p %d\n", - GetCurrentThreadId(), hInternet, dwContext, - lpvStatusInformation,dwStatusInformationLength); + if(winetest_debug > 1) + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_PREFETCH %p %d\n", + GetCurrentThreadId(), hInternet, dwContext, + lpvStatusInformation,dwStatusInformationLength); break; case INTERNET_STATUS_CLOSING_CONNECTION: - trace("%04x:Callback %p 0x%lx INTERNET_STATUS_CLOSING_CONNECTION %p %d\n", - GetCurrentThreadId(), hInternet, dwContext, - lpvStatusInformation,dwStatusInformationLength); + if(winetest_debug > 1) + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_CLOSING_CONNECTION %p %d\n", + GetCurrentThreadId(), hInternet, dwContext, + lpvStatusInformation,dwStatusInformationLength); break; case INTERNET_STATUS_CONNECTION_CLOSED: - trace("%04x:Callback %p 0x%lx INTERNET_STATUS_CONNECTION_CLOSED %p %d\n", - GetCurrentThreadId(), hInternet, dwContext, - lpvStatusInformation,dwStatusInformationLength); + if(winetest_debug > 1) + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_CONNECTION_CLOSED %p %d\n", + GetCurrentThreadId(), hInternet, dwContext, + lpvStatusInformation,dwStatusInformationLength); break; case INTERNET_STATUS_HANDLE_CREATED: ok(dwStatusInformationLength == sizeof(HINTERNET), "info length should be sizeof(HINTERNET) instead of %d\n", dwStatusInformationLength); - trace("%04x:Callback %p 0x%lx INTERNET_STATUS_HANDLE_CREATED %p %d\n", - GetCurrentThreadId(), hInternet, dwContext, - *(HINTERNET *)lpvStatusInformation,dwStatusInformationLength); + if(winetest_debug > 1) + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_HANDLE_CREATED %p %d\n", + GetCurrentThreadId(), hInternet, dwContext, + *(HINTERNET *)lpvStatusInformation,dwStatusInformationLength); CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); SET_EXPECT(INTERNET_STATUS_DETECTING_PROXY); break; @@ -407,11 +460,12 @@ ok(dwStatusInformationLength == sizeof(HINTERNET), "info length should be sizeof(HINTERNET) instead of %d\n", dwStatusInformationLength); - trace("%04x:Callback %p 0x%lx INTERNET_STATUS_HANDLE_CLOSING %p %d\n", - GetCurrentThreadId(), hInternet, dwContext, - *(HINTERNET *)lpvStatusInformation, dwStatusInformationLength); + if(winetest_debug > 1) + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_HANDLE_CLOSING %p %d\n", + GetCurrentThreadId(), hInternet, dwContext, + *(HINTERNET *)lpvStatusInformation, dwStatusInformationLength); if(!InterlockedDecrement(&close_handle_cnt)) - SetEvent(hCompleteEvent); + SetEvent(complete_event); break; case INTERNET_STATUS_REQUEST_COMPLETE: { @@ -420,31 +474,35 @@ "info length should be sizeof(INTERNET_ASYNC_RESULT) instead of %d\n", dwStatusInformationLength); ok(iar->dwResult == 1 || iar->dwResult == 0, "iar->dwResult = %ld\n", iar->dwResult); - trace("%04x:Callback %p 0x%lx INTERNET_STATUS_REQUEST_COMPLETE {%ld,%d} %d\n", - GetCurrentThreadId(), hInternet, dwContext, - iar->dwResult,iar->dwError,dwStatusInformationLength); + if(winetest_debug > 1) + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_REQUEST_COMPLETE {%ld,%d} %d\n", + GetCurrentThreadId(), hInternet, dwContext, + iar->dwResult,iar->dwError,dwStatusInformationLength); req_error = iar->dwError; if(!close_handle_cnt) - SetEvent(hCompleteEvent); + SetEvent(complete_event); break; } case INTERNET_STATUS_REDIRECT: - trace("%04x:Callback %p 0x%lx INTERNET_STATUS_REDIRECT \"%s\" %d\n", - GetCurrentThreadId(), hInternet, dwContext, - (LPCSTR)lpvStatusInformation, dwStatusInformationLength); + if(winetest_debug > 1) + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_REDIRECT \"%s\" %d\n", + GetCurrentThreadId(), hInternet, dwContext, + (LPCSTR)lpvStatusInformation, dwStatusInformationLength); *(LPSTR)lpvStatusInformation = '\0'; CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); SET_EXPECT(INTERNET_STATUS_DETECTING_PROXY); break; case INTERNET_STATUS_INTERMEDIATE_RESPONSE: - trace("%04x:Callback %p 0x%lx INTERNET_STATUS_INTERMEDIATE_RESPONSE %p %d\n", - GetCurrentThreadId(), hInternet, dwContext, - lpvStatusInformation, dwStatusInformationLength); + if(winetest_debug > 1) + trace("%04x:Callback %p 0x%lx INTERNET_STATUS_INTERMEDIATE_RESPONSE %p %d\n", + GetCurrentThreadId(), hInternet, dwContext, + lpvStatusInformation, dwStatusInformationLength); break; default: - trace("%04x:Callback %p 0x%lx %d %p %d\n", - GetCurrentThreadId(), hInternet, dwContext, dwInternetStatus, - lpvStatusInformation, dwStatusInformationLength); + if(winetest_debug > 1) + trace("%04x:Callback %p 0x%lx %d %p %d\n", + GetCurrentThreadId(), hInternet, dwContext, dwInternetStatus, + lpvStatusInformation, dwStatusInformationLength); } } @@ -493,7 +551,7 @@ return read; } -static void close_async_handle(HINTERNET handle, HANDLE complete_event, int handle_cnt) +static void close_async_handle(HINTERNET handle, int handle_cnt) { BOOL res; @@ -502,7 +560,7 @@ SET_EXPECT2(INTERNET_STATUS_HANDLE_CLOSING, handle_cnt); res = InternetCloseHandle(handle); ok(res, "InternetCloseHandle failed: %u\n", GetLastError()); - WaitForSingleObject(hCompleteEvent, INFINITE); + WaitForSingleObject(complete_event, INFINITE); CHECK_NOTIFIED2(INTERNET_STATUS_HANDLE_CLOSING, handle_cnt); } @@ -516,9 +574,8 @@ const char *types[2] = { "*", NULL }; HINTERNET hi, hic = 0, hor = 0; - hCompleteEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - trace("Starting InternetReadFile test with flags 0x%x on url %s\n",flags,test->url); + reset_events(); trace("InternetOpenA <--\n"); hi = InternetOpenA((test->flags & TESTF_COMPRESSED) ? "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0)" : "", @@ -562,11 +619,7 @@ if (hor == 0x0) goto abort; test_request_flags(hor, INTERNET_REQFLAG_NO_HEADERS); - - length = sizeof(buffer); - res = InternetQueryOptionA(hor, INTERNET_OPTION_URL, buffer, &length); - ok(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed: %u\n", GetLastError()); - ok(!strcmp(buffer, test->url), "Wrong URL %s, expected %s\n", buffer, test->url); + test_request_url(hor, test->url); length = sizeof(buffer); res = HttpQueryInfoA(hor, HTTP_QUERY_RAW_HEADERS, buffer, &length, 0x0); @@ -629,7 +682,7 @@ trace("HttpSendRequestA <--\n"); if (flags & INTERNET_FLAG_ASYNC) { - WaitForSingleObject(hCompleteEvent, INFINITE); + WaitForSingleObject(complete_event, INFINITE); ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); } HeapFree(GetProcessHeap(), 0, post_data); @@ -727,10 +780,7 @@ ok(wbuffer[length2+1] == 0x7777, "Expected 0x7777, got %04X\n", wbuffer[length2+1]); ok(length2 == length, "Value should not have changed: %d != %d\n", length2, length); - length = sizeof(buffer); - res = InternetQueryOptionA(hor, INTERNET_OPTION_URL, buffer, &length); - ok(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed: %u\n", GetLastError()); - ok(!strcmp(buffer, test->redirected_url), "Wrong URL %s\n", buffer); + test_request_url(hor, test->redirected_url); index = 0; length = 0; @@ -768,7 +818,8 @@ GetLastError()); length = 100; - trace("Entering Query loop\n"); + if(winetest_debug > 1) + trace("Entering Query loop\n"); while (TRUE) { @@ -796,11 +847,12 @@ } else if (GetLastError() == ERROR_IO_PENDING) { - trace("PENDING\n"); + if(winetest_debug > 1) + trace("pending\n"); /* on some tests, InternetQueryDataAvailable returns non-zero length and ERROR_IO_PENDING */ if(!(test->flags & TESTF_CHUNKED)) ok(!length, "InternetQueryDataAvailable returned ERROR_IO_PENDING and %u length\n", length); - WaitForSingleObject(hCompleteEvent, INFINITE); + WaitForSingleObject(complete_event, INFINITE); exlen = length; ok(exlen, "length = 0\n"); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); @@ -815,7 +867,8 @@ } CLEAR_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); - trace("LENGTH %d\n", length); + if(winetest_debug > 1) + trace("length %u\n", length); if(test->flags & TESTF_CHUNKED) ok(length <= 8192, "length = %d, expected <= 8192\n", length); if (length) @@ -827,7 +880,8 @@ buffer[length]=0; - trace("ReadFile -> %s %i\n",res?"TRUE":"FALSE",length); + if(winetest_debug > 1) + trace("ReadFile -> %s %i\n", res ? "TRUE" : "FALSE", length); if(test->content) ok(!strcmp(buffer, test->content), "buffer = '%s', expected '%s'\n", buffer, test->content); @@ -843,9 +897,9 @@ CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTION_CLOSED, 2); } abort: - trace("aborting\n"); - close_async_handle(hi, hCompleteEvent, 2); - CloseHandle(hCompleteEvent); + if(winetest_debug > 1) + trace("aborting\n"); + close_async_handle(hi, 2); first_connection_to_test_url = FALSE; } @@ -974,9 +1028,8 @@ HINTERNET hi, hic = 0, hor = 0; INTERNET_BUFFERSA inetbuffers; - hCompleteEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - trace("Starting InternetReadFileExA test with flags 0x%x\n",flags); + reset_events(); trace("InternetOpenA <--\n"); hi = InternetOpenA("", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, flags); @@ -1055,7 +1108,7 @@ trace("HttpSendRequestA <--\n"); if (!rc && (GetLastError() == ERROR_IO_PENDING)) { - WaitForSingleObject(hCompleteEvent, INFINITE); + WaitForSingleObject(complete_event, INFINITE); ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); } @@ -1148,7 +1201,7 @@ ok(flags & INTERNET_FLAG_ASYNC, "Should not get ERROR_IO_PENDING without INTERNET_FLAG_ASYNC\n"); CHECK_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); - WaitForSingleObject(hCompleteEvent, INFINITE); + WaitForSingleObject(complete_event, INFINITE); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); CHECK_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); @@ -1194,8 +1247,7 @@ trace("Finished. Read %d bytes\n", length); abort: - close_async_handle(hi, hCompleteEvent, 2); - CloseHandle(hCompleteEvent); + close_async_handle(hi, 2); first_connection_to_test_url = FALSE; } @@ -1376,8 +1428,7 @@ BYTE cache_headers[] = "HTTP/1.1 200 OK\r\n\r\n"; trace("Testing cache read...\n"); - - hCompleteEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + reset_events(); for(i = 0; i < sizeof(content); i++) content[i] = '0' + (i%10); @@ -1446,7 +1497,7 @@ ok(!memcmp(content, buf, sizeof(content)), "unexpected content\n"); } - close_async_handle(session, hCompleteEvent, 2); + close_async_handle(session, 2); CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); @@ -1458,8 +1509,6 @@ res = DeleteUrlCacheEntryA(cache_only_url); ok(res, "DeleteUrlCacheEntryA failed: %u\n", GetLastError()); - - CloseHandle(hCompleteEvent); } static void test_http_cache(void) @@ -2368,13 +2417,13 @@ send(c, msg, sizeof msg-1, 0); } else send(c, notokmsg, sizeof notokmsg-1, 0); - WaitForSingleObject(hCompleteEvent, 5000); + WaitForSingleObject(complete_event, 5000); } else { if (strstr(buffer, "Content-Length: 0")) send(c, msg, sizeof msg-1, 0); else send(c, notokmsg, sizeof notokmsg-1, 0); - WaitForSingleObject(hCompleteEvent, 5000); + WaitForSingleObject(complete_event, 5000); } } if (strstr(buffer, "GET /test_premature_disconnect")) @@ -3113,11 +3162,7 @@ ok(!ret, "HttpQueryInfo succeeded\n"); ok(err == ERROR_HTTP_HEADER_NOT_FOUND, "Expected error ERROR_HTTP_HEADER_NOT_FOUND, got %d\n", err); - size = sizeof(buffer) - 1; - memset(buffer, 0, sizeof(buffer)); - ret = InternetQueryOptionA(req, INTERNET_OPTION_URL, buffer, &size); - ok(ret, "InternetQueryOption failed\n"); - ok(!strcmp(full_url, buffer), "Expected %s, got %s\n", full_url, buffer); + test_request_url(req, full_url); ret = HttpAddRequestHeadersA(req, host_header_override, ~0u, HTTP_ADDREQ_FLAG_COALESCE); ok(ret, "HttpAddRequestHeaders failed\n"); @@ -3128,11 +3173,7 @@ ret = HttpQueryInfoA(req, HTTP_QUERY_HOST | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, &count); ok(ret, "HttpQueryInfo failed\n"); - size = sizeof(buffer) - 1; - memset(buffer, 0, sizeof(buffer)); - ret = InternetQueryOptionA(req, INTERNET_OPTION_URL, buffer, &size); - ok(ret, "InternetQueryOption failed\n"); - ok(!strcmp(full_url, buffer), "Expected %s, got %s\n", full_url, buffer); + test_request_url(req, full_url); ret = HttpSendRequestA(req, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed\n"); @@ -3346,7 +3387,7 @@ HINTERNET session, connection, req; DWORD res; - hCompleteEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + reset_events(); session = InternetOpenA("", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, INTERNET_FLAG_ASYNC); ok(session != NULL,"InternetOpen failed with error %u\n", GetLastError()); @@ -3378,7 +3419,7 @@ res = HttpSendRequestA(req, NULL, 0, NULL, 0); ok(!res && (GetLastError() == ERROR_IO_PENDING), "Asynchronous HttpSendRequest NOT returning 0 with error ERROR_IO_PENDING\n"); - WaitForSingleObject(hCompleteEvent, INFINITE); + WaitForSingleObject(complete_event, INFINITE); ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); @@ -3408,7 +3449,7 @@ res = HttpSendRequestA(req, NULL, 0, NULL, 0); ok(!res && (GetLastError() == ERROR_IO_PENDING), "Asynchronous HttpSendRequest NOT returning 0 with error ERROR_IO_PENDING\n"); - WaitForSingleObject(hCompleteEvent, INFINITE); + WaitForSingleObject(complete_event, INFINITE); ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); @@ -3438,7 +3479,7 @@ res = HttpSendRequestA(req, NULL, 0, NULL, 0); ok(!res && (GetLastError() == ERROR_IO_PENDING), "Asynchronous HttpSendRequest NOT returning 0 with error ERROR_IO_PENDING\n"); - WaitForSingleObject(hCompleteEvent, INFINITE); + WaitForSingleObject(complete_event, INFINITE); ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); @@ -3458,8 +3499,7 @@ SET_WINE_ALLOW(INTERNET_STATUS_CLOSING_CONNECTION); SET_WINE_ALLOW(INTERNET_STATUS_CONNECTION_CLOSED); - close_async_handle(session, hCompleteEvent, 2); - CloseHandle(hCompleteEvent); + close_async_handle(session, 2); } static void test_successive_HttpSendRequest(int port) @@ -3467,7 +3507,7 @@ HINTERNET session, connection, req; DWORD res; - hCompleteEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + reset_events(); session = InternetOpenA("", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, INTERNET_FLAG_ASYNC); ok(session != NULL,"InternetOpen failed with error %u\n", GetLastError()); @@ -3497,7 +3537,7 @@ res = HttpSendRequestA(req, NULL, 0, NULL, 0); ok(!res && (GetLastError() == ERROR_IO_PENDING), "Asynchronous HttpSendRequest NOT returning 0 with error ERROR_IO_PENDING\n"); - WaitForSingleObject(hCompleteEvent, INFINITE); + WaitForSingleObject(complete_event, INFINITE); ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); @@ -3525,7 +3565,7 @@ res = HttpSendRequestA(req, NULL, 0, NULL, 0); ok(!res && (GetLastError() == ERROR_IO_PENDING), "Asynchronous HttpSendRequest NOT returning 0 with error ERROR_IO_PENDING\n"); - WaitForSingleObject(hCompleteEvent, INFINITE); + WaitForSingleObject(complete_event, INFINITE); ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); @@ -3543,8 +3583,7 @@ SET_WINE_ALLOW(INTERNET_STATUS_CLOSING_CONNECTION); SET_WINE_ALLOW(INTERNET_STATUS_CONNECTION_CLOSED); - close_async_handle(session, hCompleteEvent, 2); - CloseHandle(hCompleteEvent); + close_async_handle(session, 2); } static void test_no_content(int port) @@ -3554,7 +3593,7 @@ trace("Testing 204 no content response...\n"); - hCompleteEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + reset_events(); session = InternetOpenA("", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, INTERNET_FLAG_ASYNC); ok(session != NULL,"InternetOpen failed with error %u\n", GetLastError()); @@ -3587,7 +3626,7 @@ res = HttpSendRequestA(req, NULL, -1, NULL, 0); ok(!res && (GetLastError() == ERROR_IO_PENDING), "Asynchronous HttpSendRequest NOT returning 0 with error ERROR_IO_PENDING\n"); - WaitForSingleObject(hCompleteEvent, INFINITE); + WaitForSingleObject(complete_event, INFINITE); ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); @@ -3599,8 +3638,7 @@ CHECK_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); - close_async_handle(session, hCompleteEvent, 2); - CloseHandle(hCompleteEvent); + close_async_handle(session, 2); /* * The connection should be closed before closing handle. This is true for most @@ -3618,8 +3656,7 @@ trace("Testing connection close connection...\n"); - hCompleteEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - conn_close_event = CreateEventW(NULL, FALSE, FALSE, NULL); + reset_events(); session = InternetOpenA("", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, INTERNET_FLAG_ASYNC); ok(session != NULL,"InternetOpen failed with error %u\n", GetLastError()); @@ -3650,7 +3687,7 @@ res = HttpSendRequestA(req, NULL, -1, NULL, 0); ok(!res && (GetLastError() == ERROR_IO_PENDING), "Asynchronous HttpSendRequest NOT returning 0 with error ERROR_IO_PENDING\n"); - WaitForSingleObject(hCompleteEvent, INFINITE); + WaitForSingleObject(complete_event, INFINITE); ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); @@ -3687,9 +3724,9 @@ SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); SetEvent(conn_close_event); #ifdef ROSTESTS_73_FIXED - WaitForSingleObject(hCompleteEvent, INFINITE); + WaitForSingleObject(complete_event, INFINITE); #else /* ROSTESTS_73_FIXED */ - ok(WaitForSingleObject(hCompleteEvent, 5000) == WAIT_OBJECT_0, "Wait timed out\n"); + ok(WaitForSingleObject(complete_event, 5000) == WAIT_OBJECT_0, "Wait timed out\n"); #endif /* ROSTESTS_73_FIXED */ ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); CLEAR_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); @@ -3697,8 +3734,7 @@ CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); - close_async_handle(session, hCompleteEvent, 2); - CloseHandle(hCompleteEvent); + close_async_handle(session, 2); } static void test_no_cache(int port) @@ -4595,24 +4631,21 @@ test_request_t req; BOOL ret; - hCompleteEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - + reset_events(); open_simple_request(&req, "localhost", port, "POST", "/test_request_content_length"); ret = HttpSendRequestA(req.request, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed %u\n", GetLastError()); test_status_code(req.request, 200); - SetEvent(hCompleteEvent); + SetEvent(complete_event); ret = HttpSendRequestA(req.request, NULL, 0, data, sizeof(data)); ok(ret, "HttpSendRequest failed %u\n", GetLastError()); test_status_code(req.request, 200); - SetEvent(hCompleteEvent); - + SetEvent(complete_event); close_request(&req); - CloseHandle(hCompleteEvent); } static void test_accept_encoding(int port) @@ -4719,8 +4752,7 @@ DWORD res, count, bytes; BOOL ret; - hCompleteEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - conn_wait_event = CreateEventW(NULL, FALSE, FALSE, NULL); + reset_events(); /* test asynchronous InternetReadFileEx */ ses = InternetOpenA( "winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, INTERNET_FLAG_ASYNC ); @@ -4753,7 +4785,7 @@ ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); ok( !ret, "HttpSendRequestA unexpectedly succeeded\n" ); ok( GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %u\n", GetLastError() ); - WaitForSingleObject( hCompleteEvent, INFINITE ); + WaitForSingleObject( complete_event, INFINITE ); ok( req_error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", req_error ); CLEAR_NOTIFIED( INTERNET_STATUS_COOKIE_SENT ); @@ -4790,11 +4822,11 @@ SET_EXPECT( INTERNET_STATUS_REQUEST_COMPLETE ); if (!pending_reads++) { - res = WaitForSingleObject( hCompleteEvent, 0 ); + res = WaitForSingleObject( complete_event, 0 ); ok( res == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %u\n", res ); SetEvent( conn_wait_event ); } - res = WaitForSingleObject( hCompleteEvent, INFINITE ); + res = WaitForSingleObject( complete_event, INFINITE ); ok( res == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", res ); ok( req_error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", req_error ); todo_wine_if( pending_reads > 1 ) @@ -4810,7 +4842,7 @@ ok( pending_reads == 1, "expected 1 pending read, got %u\n", pending_reads ); ok( !strcmp(buffer, page1), "unexpected buffer content\n" ); - close_async_handle( ses, hCompleteEvent, 2 ); + close_async_handle( ses, 2 ); ResetEvent( conn_wait_event ); /* test asynchronous InternetReadFile */ @@ -4844,7 +4876,7 @@ ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); ok( !ret, "HttpSendRequestA unexpectedly succeeded\n" ); ok( GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %u\n", GetLastError() ); - WaitForSingleObject( hCompleteEvent, INFINITE ); + WaitForSingleObject( complete_event, INFINITE ); ok( req_error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", req_error ); CLEAR_NOTIFIED( INTERNET_STATUS_COOKIE_SENT ); @@ -4878,11 +4910,11 @@ SET_EXPECT( INTERNET_STATUS_REQUEST_COMPLETE ); if (!pending_reads++) { - res = WaitForSingleObject( hCompleteEvent, 0 ); + res = WaitForSingleObject( complete_event, 0 ); ok( res == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %u\n", res ); SetEvent( conn_wait_event ); } - res = WaitForSingleObject( hCompleteEvent, INFINITE ); + res = WaitForSingleObject( complete_event, INFINITE ); ok( res == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", res ); ok( req_error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", req_error ); todo_wine_if( pending_reads > 1 ) @@ -4898,15 +4930,30 @@ ok( pending_reads == 1, "expected 1 pending read, got %u\n", pending_reads ); ok( !strcmp(buffer, page1), "unexpected buffer content\n" ); - close_async_handle( ses, hCompleteEvent, 2 ); - - CloseHandle( hCompleteEvent ); - CloseHandle( conn_wait_event ); + close_async_handle( ses, 2 ); } static void server_send_string(const char *msg) { send(server_socket, msg, strlen(msg), 0); +} + +static size_t server_read_data(char *buf, size_t buf_size) +{ + return recv(server_socket, buf, buf_size, 0); +} + +#define server_read_request(a) _server_read_request(__LINE__,a) +static void _server_read_request(unsigned line, const char *expected_request) +{ + char buf[4000], *p; + size_t size; + + size = server_read_data(buf, sizeof(buf) - 1); + buf[size] = 0; + p = strstr(buf, "\r\n"); + if(p) *p = 0; + ok_(__FILE__,line)(p && !strcmp(buf, expected_request), "unexpected request %s\n", buf); } static BOOL skip_receive_notification_tests; @@ -4924,14 +4971,54 @@ callback(handle, context, status, info, info_size); received_response_size = *(DWORD*)info; break; + case INTERNET_STATUS_REQUEST_SENT: + callback(handle, context, status, info, info_size); + SetEvent(request_sent_event); + break; default: callback(handle, context, status, info, info_size); } } -static void open_read_test_request(int port, test_request_t *req, const char *response) +static void send_socket_request(test_request_t *req, BOOL new_connection) { BOOL ret; + + SET_OPTIONAL(INTERNET_STATUS_COOKIE_SENT); + SET_OPTIONAL(INTERNET_STATUS_DETECTING_PROXY); + if(new_connection) { + SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); + SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER); + } + SET_EXPECT(INTERNET_STATUS_SENDING_REQUEST); + SET_EXPECT(INTERNET_STATUS_REQUEST_SENT); + if(!skip_receive_notification_tests) + SET_EXPECT(INTERNET_STATUS_RECEIVING_RESPONSE); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestA(req->request, NULL, 0, NULL, 0); + ok(!ret, "HttpSendRequestA unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %u\n", GetLastError()); + + if(new_connection) + WaitForSingleObject(server_req_rec_event, INFINITE); + WaitForSingleObject(request_sent_event, INFINITE); + + CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); + CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); + if(new_connection) { + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); + } + CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_SENT); +} + +static void open_socket_request(int port, test_request_t *req, const char *verb) +{ + /* We're connecting to new socket */ + if(!verb) + reset_events(); req->session = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, INTERNET_FLAG_ASYNC); ok(req->session != NULL, "InternetOpenA failed\n"); @@ -4943,31 +5030,20 @@ CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED ); SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); - req->request = HttpOpenRequestA(req->connection, "GET", "/socket", NULL, NULL, NULL, INTERNET_FLAG_RELOAD, 0xdeadbeef); + req->request = HttpOpenRequestA(req->connection, "GET", verb ? verb : "/socket", + NULL, NULL, NULL, INTERNET_FLAG_RELOAD, 0xdeadbeef); ok(req->request != NULL, "HttpOpenRequestA failed %u\n", GetLastError()); CHECK_NOTIFIED( INTERNET_STATUS_HANDLE_CREATED ); - SET_OPTIONAL(INTERNET_STATUS_COOKIE_SENT); - SET_OPTIONAL(INTERNET_STATUS_DETECTING_PROXY); - SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); - SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER); - SET_EXPECT(INTERNET_STATUS_SENDING_REQUEST); - SET_EXPECT(INTERNET_STATUS_REQUEST_SENT); + send_socket_request(req, !verb); +} + +static void open_read_test_request(int port, test_request_t *req, const char *response) +{ if(!skip_receive_notification_tests) SET_EXPECT(INTERNET_STATUS_RECEIVING_RESPONSE); - SetLastError(0xdeadbeef); - ret = HttpSendRequestA(req->request, NULL, 0, NULL, 0); - ok(!ret, "HttpSendRequestA unexpectedly succeeded\n"); - ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %u\n", GetLastError()); - - WaitForSingleObject(server_req_rec_event, INFINITE); - - CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); - CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); - CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); - CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); - CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); + open_socket_request(port, req, NULL); if(!skip_receive_notification_tests) { SET_EXPECT(INTERNET_STATUS_RESPONSE_RECEIVED); @@ -4976,7 +5052,7 @@ SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); server_send_string(response); - WaitForSingleObject(hCompleteEvent, INFINITE); + WaitForSingleObject(complete_event, INFINITE); if(!skip_receive_notification_tests) { CHECK_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); @@ -4984,14 +5060,13 @@ todo_wine ok(received_response_size == strlen(response), "received_response_size = %u\n", received_response_size); } - CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_SENT); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); ok(req_error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", req_error); } #define readex_expect_sync_data_len(a,b,c,d,e,f,g) _readex_expect_sync_data_len(__LINE__,a,b,c,d,e,f,g) static void _readex_expect_sync_data_len(unsigned line, HINTERNET req, DWORD flags, INTERNET_BUFFERSW *buf, - DWORD buf_size, const char *exdata, DWORD len, BOOL expect_receive) + DWORD buf_size, const char *exdata, DWORD len, DWORD expect_receive) { BOOL ret; @@ -5078,7 +5153,7 @@ if(do_close_connection) close_connection(); - WaitForSingleObject(hCompleteEvent, INFINITE); + WaitForSingleObject(complete_event, INFINITE); if(!skip_receive_notification_tests) CHECK_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); @@ -5128,7 +5203,7 @@ if(!skip_receive_notification_tests) SET_EXPECT(INTERNET_STATUS_RECEIVING_RESPONSE); - memset(buf->lpvBuffer, 0, buf_size); + memset(buf->lpvBuffer, 0, max(buf_size, sizeof(DWORD))); buf->dwBufferLength = buf_size; ret = InternetReadFileExW(req, buf, flags, 0xdeadbeef); ok_(__FILE__,line)(!ret && GetLastError() == ERROR_IO_PENDING, "InternetReadFileExW returned %x (%u)\n", ret, GetLastError()); @@ -5212,10 +5287,6 @@ if(!is_ie7plus) return; - hCompleteEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - conn_wait_event = CreateEventW(NULL, FALSE, FALSE, NULL); - server_req_rec_event = CreateEventW(NULL, FALSE, FALSE, NULL); - memset(&ib, 0, sizeof(ib)); ib.dwStructSize = sizeof(ib); ib.lpvBuffer = buf; @@ -5237,7 +5308,7 @@ readex_expect_async(req.request, IRF_ASYNC, &ib, sizeof(buf), "0"); send_response_ex_and_wait("123", TRUE, &ib, "0123", 0, 4); - close_async_handle(req.session, hCompleteEvent, 2); + close_async_handle(req.session, 2); trace("Testing InternetReadFileExW with no flags...\n"); @@ -5256,7 +5327,7 @@ readex_expect_async(req.request, 0, &ib, sizeof(buf), "0"); send_response_ex_and_wait("123", TRUE, &ib, "0123", 0, 4); - close_async_handle(req.session, hCompleteEvent, 2); + close_async_handle(req.session, 2); trace("Testing InternetReadFile...\n"); @@ -5275,7 +5346,7 @@ read_expect_async(req.request, buf, sizeof(buf), &read_size, "0"); send_response_and_wait("123", TRUE, buf, &read_size, "0123", 4, 0, 4); - close_async_handle(req.session, hCompleteEvent, 2); + close_async_handle(req.session, 2); trace("Testing InternetReadFileExW with IRF_NO_WAIT flag...\n"); @@ -5306,7 +5377,7 @@ readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), "12345", 0); readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), "", TRUE); - close_async_handle(req.session, hCompleteEvent, 2); + close_async_handle(req.session, 2); open_read_test_request(port, &req, "HTTP/1.1 200 OK\r\n" @@ -5333,7 +5404,7 @@ readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), "x", 0); readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), "", 0); - close_async_handle(req.session, hCompleteEvent, 2); + close_async_handle(req.session, 2); open_read_test_request(port, &req, "HTTP/1.1 200 OK\r\n" @@ -5347,7 +5418,7 @@ send_response_ex_and_wait("0\r\n\r\n", TRUE, &ib, NULL, 0, 5); readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), "", 0); - close_async_handle(req.session, hCompleteEvent, 2); + close_async_handle(req.session, 2); open_read_test_request(port, &req, "HTTP/1.1 200 OK\r\n" @@ -5360,7 +5431,7 @@ SET_EXPECT(INTERNET_STATUS_CLOSING_CONNECTION); SET_EXPECT(INTERNET_STATUS_CONNECTION_CLOSED); - close_async_handle(req.session, hCompleteEvent, 2); + close_async_handle(req.session, 2); CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); @@ -5381,7 +5452,7 @@ SET_WINE_ALLOW(INTERNET_STATUS_CLOSING_CONNECTION); SET_WINE_ALLOW(INTERNET_STATUS_CONNECTION_CLOSED); - close_async_handle(req.session, hCompleteEvent, 2); + close_async_handle(req.session, 2); todo_wine CHECK_NOT_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); todo_wine CHECK_NOT_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); @@ -5419,11 +5490,7 @@ CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); - close_async_handle(req.session, hCompleteEvent, 2); - - CloseHandle(hCompleteEvent); - CloseHandle(conn_wait_event); - CloseHandle(server_req_rec_event); + close_async_handle(req.session, 2); skip_receive_notification_tests = FALSE; } @@ -5436,10 +5503,6 @@ if(!is_ie7plus) return; - - hCompleteEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - conn_wait_event = CreateEventW(NULL, FALSE, FALSE, NULL); - server_req_rec_event = CreateEventW(NULL, FALSE, FALSE, NULL); memset(&ib, 0, sizeof(ib)); ib.dwStructSize = sizeof(ib); @@ -5458,7 +5521,7 @@ close_connection(); SET_EXPECT(INTERNET_STATUS_CLOSING_CONNECTION); SET_EXPECT(INTERNET_STATUS_CONNECTION_CLOSED); - close_async_handle(req.session, hCompleteEvent, 2); + close_async_handle(req.session, 2); CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); } @@ -5497,6 +5560,230 @@ close_request(&req); } +static void test_persistent_connection(int port) +{ + INTERNET_BUFFERSW ib; + test_request_t req; + char buf[24000]; + + if(!is_ie7plus) + return; + + memset(&ib, 0, sizeof(ib)); + ib.dwStructSize = sizeof(ib); + ib.lpvBuffer = buf; + + skip_receive_notification_tests = TRUE; + + trace("Testing persistent connection...\n"); + + open_read_test_request(port, &req, + "HTTP/1.1 200 OK\r\n" + "Server: winetest\r\n" + "Content-Length: 2\r\n" + "\r\n" + "xx"); + readex_expect_sync_data(req.request, IRF_ASYNC, &ib, 4, "xx", 0); + close_async_handle(req.session, 2); + + open_socket_request(port, &req, "/test_simple_chunked"); + server_read_request("GET /test_simple_chunked HTTP/1.1"); + + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + server_send_string("HTTP/1.1 200 OK\r\n" + "Server: winetest\r\n" + "Transfer-Encoding: chunked\r\n" + "\r\n" + "2\r\nab\r\n"); + WaitForSingleObject(complete_event, INFINITE); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + ok(req_error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", req_error); + + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), "ab", 0); + readex_expect_async(req.request, IRF_ASYNC, &ib, sizeof(buf), NULL); + send_response_ex_and_wait("3\r\nabc\r\n0\r\n\r\n", FALSE, &ib, "abc", 0, 13); + close_async_handle(req.session, 2); + + open_socket_request(port, &req, "/chunked"); + server_read_request("GET /chunked HTTP/1.1"); + + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + server_send_string("HTTP/1.1 200 OK\r\n" + "Server: winetest\r\n" + "Transfer-Encoding: chunked\r\n" + "\r\n" + "2\r\nab\r\n"); + WaitForSingleObject(complete_event, INFINITE); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + ok(req_error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", req_error); + + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, 3, "ab", 0); + readex_expect_async(req.request, IRF_ASYNC, &ib, 3, NULL); + send_response_ex_and_wait("3\r\nabc\r\n", FALSE, &ib, "abc", 0, 13); + + /* send another request on the same request handle, it must drain remaining last chunk marker */ + server_send_string("0\r\n\r\n"); + + send_socket_request(&req, FALSE); + server_read_request("GET /chunked HTTP/1.1"); + + ResetEvent(complete_event); + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + server_send_string("HTTP/1.1 201 OK\r\n" + "Server: winetest\r\n" + "Content-Length: 0\r\n" + "Connection: keep-alive\r\n" + "\r\n"); + WaitForSingleObject(complete_event, INFINITE); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + ok(req_error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", req_error); + + test_status_code(req.request, 201); + close_async_handle(req.session, 2); + + /* the connection is still valid */ + open_socket_request(port, &req, "/another_chunked"); + server_read_request("GET /another_chunked HTTP/1.1"); + + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + server_send_string("HTTP/1.1 200 OK\r\n" + "Server: winetest\r\n" + "Transfer-Encoding: chunked\r\n" + "\r\n" + "2\r\nab\r\n"); + WaitForSingleObject(complete_event, INFINITE); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + ok(req_error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", req_error); + + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), "ab", 0); + readex_expect_async(req.request, IRF_ASYNC, &ib, sizeof(buf), NULL); + + /* we're missing trailing '\n'; the connection can't be drained without blocking, + * so it will be closed */ + send_response_ex_and_wait("3\r\nabc\r\n0\r\n\r", FALSE, &ib, "abc", 0, 13); + + SET_EXPECT(INTERNET_STATUS_CLOSING_CONNECTION); + SET_EXPECT(INTERNET_STATUS_CONNECTION_CLOSED); + close_async_handle(req.session, 2); + CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); + + close_connection(); + skip_receive_notification_tests = FALSE; +} + +static void test_redirect(int port) +{ + char buf[4000], expect_url[INTERNET_MAX_URL_LENGTH]; + INTERNET_BUFFERSW ib; + test_request_t req; + + if(!is_ie7plus) + return; + + skip_receive_notification_tests = TRUE; + + memset(&ib, 0, sizeof(ib)); + ib.dwStructSize = sizeof(ib); + ib.lpvBuffer = buf; + + trace("Testing redirection...\n"); + + open_socket_request(port, &req, NULL); + + SET_OPTIONAL(INTERNET_STATUS_COOKIE_SENT); + SET_EXPECT(INTERNET_STATUS_REDIRECT); + SET_EXPECT(INTERNET_STATUS_SENDING_REQUEST); + SET_EXPECT(INTERNET_STATUS_REQUEST_SENT); + + server_send_string("HTTP/1.1 302 Found\r\n" + "Server: winetest\r\n" + "Location: test_redirection\r\n" + "Connection: keep-alive\r\n" + "Content-Length: 0\r\n" + "\r\n"); + + server_read_request("GET /test_redirection HTTP/1.1"); + + CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); + + sprintf(expect_url, "http://localhost:%u/test_redirection", port); + test_request_url(req.request, expect_url); + + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + + server_send_string("HTTP/1.1 200 OK\r\n" + "Server: winetest\r\n" + "Content-Length: 3\r\n" + "\r\n" + "xxx"); + + WaitForSingleObject(complete_event, INFINITE); + + CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_SENT); + CHECK_NOTIFIED(INTERNET_STATUS_REDIRECT); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + ok(req_error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", req_error); + + test_status_code(req.request, 200); + + close_connection(); + close_async_handle(req.session, 2); + + trace("Test redirect to non-http URL...\n"); + + open_socket_request(port, &req, NULL); + + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + + server_send_string("HTTP/1.1 302 Found\r\n" + "Server: winetest\r\n" + "Location: test:non:http/url\r\n" + "Connection: keep-alive\r\n" + "Content-Length: 0\r\n" + "\r\n"); + + WaitForSingleObject(complete_event, INFINITE); + + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + ok(req_error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", req_error); + + sprintf(expect_url, "http://localhost:%u/socket", port); + test_request_url(req.request, expect_url); + test_status_code(req.request, 302); + + close_connection(); + close_async_handle(req.session, 2); + + trace("Test redirect to http URL with no host name...\n"); + + open_socket_request(port, &req, NULL); + + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + + server_send_string("HTTP/1.1 302 Found\r\n" + "Server: winetest\r\n" + "Location: http:///nohost\r\n" + "Connection: keep-alive\r\n" + "Content-Length: 0\r\n" + "\r\n"); + + WaitForSingleObject(complete_event, INFINITE); + + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + ok(req_error == ERROR_INTERNET_INVALID_URL, "expected ERROR_INTERNET_INVALID_URL, got %u\n", req_error); + + sprintf(expect_url, "http://localhost:%u/socket", port); + test_request_url(req.request, expect_url); + test_status_code(req.request, 302); + + close_connection(); + close_async_handle(req.session, 2); + + skip_receive_notification_tests = FALSE; +} + static void test_remove_dot_segments(int port) { test_request_t req; @@ -5511,7 +5798,7 @@ close_request(&req); } -static void test_redirect(int port) +static void test_redirect_no_host(int port) { test_request_t req; BOOL ret; @@ -5584,8 +5871,10 @@ test_http_read(si.port); test_connection_break(si.port); test_long_url(si.port); + test_redirect(si.port); + test_persistent_connection(si.port); test_remove_dot_segments(si.port); - test_redirect(si.port); + test_redirect_no_host(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit"); @@ -5723,8 +6012,7 @@ BOOL res; trace("Testing security flags...\n"); - - hCompleteEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + reset_events(); ses = InternetOpenA("WineTest", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, INTERNET_FLAG_ASYNC); ok(ses != NULL, "InternetOpen failed\n"); @@ -5750,8 +6038,7 @@ if(!res && GetLastError() == ERROR_INVALID_PARAMETER) { win_skip("Incomplete security flags support, skipping\n"); - close_async_handle(ses, hCompleteEvent, 2); - CloseHandle(hCompleteEvent); + close_async_handle(ses, 2); return; } @@ -5790,7 +6077,7 @@ res = HttpSendRequestA(req, NULL, 0, NULL, 0); ok(!res && GetLastError() == ERROR_IO_PENDING, "HttpSendRequest failed: %u\n", GetLastError()); - WaitForSingleObject(hCompleteEvent, INFINITE); + WaitForSingleObject(complete_event, INFINITE); ok(req_error == ERROR_SUCCESS, "req_error = %d\n", req_error); CHECK_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); @@ -5845,7 +6132,7 @@ res = HttpSendRequestA(req, NULL, 0, NULL, 0); ok(!res && GetLastError() == ERROR_IO_PENDING, "HttpSendRequest failed: %u\n", GetLastError()); - WaitForSingleObject(hCompleteEvent, INFINITE); + WaitForSingleObject(complete_event, INFINITE); ok(req_error == ERROR_INTERNET_SEC_CERT_REV_FAILED || broken(req_error == ERROR_INTERNET_SEC_CERT_ERRORS), "req_error = %d\n", req_error); @@ -5884,8 +6171,7 @@ if(req_error != ERROR_INTERNET_SEC_CERT_REV_FAILED) { win_skip("Unexpected cert errors %u, skipping security flags tests\n", req_error); - close_async_handle(ses, hCompleteEvent, 3); - CloseHandle(hCompleteEvent); + close_async_handle(ses, 3); return; } @@ -5912,7 +6198,7 @@ res = HttpSendRequestA(req, NULL, 0, NULL, 0); ok(!res && GetLastError() == ERROR_IO_PENDING, "HttpSendRequest failed: %u\n", GetLastError()); - WaitForSingleObject(hCompleteEvent, INFINITE); + WaitForSingleObject(complete_event, INFINITE); ok(req_error == ERROR_INTERNET_SEC_CERT_ERRORS, "req_error = %d\n", req_error); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); @@ -5949,7 +6235,7 @@ res = HttpSendRequestA(req, NULL, 0, NULL, 0); ok(!res && GetLastError() == ERROR_IO_PENDING, "HttpSendRequest failed: %u\n", GetLastError()); - WaitForSingleObject(hCompleteEvent, INFINITE); + WaitForSingleObject(complete_event, INFINITE); ok(req_error == ERROR_SUCCESS, "req_error = %d\n", req_error); CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTING_TO_SERVER, 2); @@ -5976,7 +6262,7 @@ ok(res, "InternetReadFile failed: %u\n", GetLastError()); ok(size, "size = 0\n"); - close_async_handle(ses, hCompleteEvent, 3); + close_async_handle(ses, 3); /* Collect all existing persistent connections */ res = InternetSetOptionA(NULL, INTERNET_OPTION_SETTINGS_CHANGED, NULL, 0); @@ -6022,7 +6308,7 @@ res = HttpSendRequestA(req, NULL, 0, NULL, 0); ok(!res && GetLastError() == ERROR_IO_PENDING, "HttpSendRequest failed: %u\n", GetLastError()); - WaitForSingleObject(hCompleteEvent, INFINITE); + WaitForSingleObject(complete_event, INFINITE); ok(req_error == ERROR_SUCCESS, "req_error = %d\n", req_error); CHECK_NOTIFIED2(INTERNET_STATUS_CONNECTING_TO_SERVER, 2); @@ -6044,9 +6330,7 @@ ok(res, "InternetReadFile failed: %u\n", GetLastError()); ok(size, "size = 0\n"); - close_async_handle(ses, hCompleteEvent, 2); - - CloseHandle(hCompleteEvent); + close_async_handle(ses, 2); test_security_info("http://test.winehq.com/data/some_file.html?q", ERROR_INTERNET_ITEM_NOT_FOUND, 0); test_security_info("file:///c:/dir/file.txt", ERROR_INTERNET_ITEM_NOT_FOUND, 0); @@ -6311,7 +6595,8 @@ INTERNET_ASYNC_RESULT *result = info; struct context *ctx = (struct context *)context; - trace("%p 0x%08lx %u %p 0x%08x\n", handle, context, status, info, size); + if(winetest_debug > 1) + trace("%p 0x%08lx %u %p 0x%08x\n", handle, context, status, info, size); switch(status) { case INTERNET_STATUS_REQUEST_COMPLETE: @@ -6759,7 +7044,8 @@ DWORD len, type; BOOL res; - trace("closetest_callback %p: %d\n", hInternet, dwInternetStatus); + if(winetest_debug > 1) + trace("closetest_callback %p: %d\n", hInternet, dwInternetStatus); ok(hInternet == closetest_session || hInternet == closetest_conn || hInternet == closetest_req, "Unexpected hInternet %p\n", hInternet); @@ -6812,7 +7098,7 @@ len = sizeof(flags); res = InternetQueryOptionA(closetest_req, INTERNET_OPTION_REQUEST_FLAGS, &flags, &len); ok(!res && GetLastError() == ERROR_INVALID_HANDLE, - "InternetQueryOptionA(%p INTERNET_OPTION_URL) failed: %x %u, expected TRUE ERROR_INVALID_HANDLE\n", + "InternetQueryOptionA(%p INTERNET_OPTION_REQUEST_FLAGS) failed: %x %u, expected TRUE ERROR_INVALID_HANDLE\n", closetest_req, res, GetLastError()); } @@ -7024,6 +7310,7 @@ win_skip("IE6 found. It's too old for some tests.\n"); } + init_events(); init_status_tests(); test_InternetCloseHandle(); InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[0]); @@ -7053,4 +7340,5 @@ test_connection_failure(); test_default_service_port(); test_concurrent_header_access(); -} + free_events(); +}

1 0

[akhaldi] 75946: [WININET] Sync with Wine Staging 2.16. CORE-13762 43deec9 wininet: Use standard wine_dbgstr_longlong. 085ce26 wininet: Drain content before reusing connection in open_http_connecti...
by akhaldi＠svn.reactos.org 24 Sep '17

24 Sep '17

Author: akhaldi Date: Sun Sep 24 11:17:59 2017 New Revision: 75946 URL: http://svn.reactos.org/svn/reactos?rev=75946&view=rev Log: [WININET] Sync with Wine Staging 2.16. CORE-13762 43deec9 wininet: Use standard wine_dbgstr_longlong. 085ce26 wininet: Drain content before reusing connection in open_http_connection. 59395d8 wininet: Never do blocking reads in chunked_read if zero chunk size is aready read. 4f40039 wininet: Release connection in HTTPREQ_Read only if remaining control data may be drainad without blocking. 8090d16 wininet: Store error state separately from end of stream in chunked stream. 752d078 wininet: Always use drain_content specific to stream type. 90b936f wininet: Try to read reamaining data in chunked_drain_content. 2ecdac8 wininet: Return error codes from HTTP streams. 7949a22 wininet: Correctly pass URL length to InternetCrackUrlW in get_redirect_url. a24b826 wininet: Improved cookie debug traces. f55a116 wininet: Fix potential use-after-free (Coverity). 89f1d8c wininet: Fixed connection_pool_cs declaration. cee9982 wininet: Return an error on redirect with no host name specified. 61e28c0 wininet: Moved INTERNET_STATUS_REDIRECT notification to HTTP_HandleRedirect. 9c95915 wininet: Correctly handle redirects to non-http URLs. Modified: trunk/reactos/dll/win32/wininet/cookie.c trunk/reactos/dll/win32/wininet/http.c trunk/reactos/dll/win32/wininet/urlcache.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wininet/cookie.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/cookie.c… ============================================================================== --- trunk/reactos/dll/win32/wininet/cookie.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/cookie.c [iso-8859-1] Sun Sep 24 11:17:59 2017 @@ -544,17 +544,11 @@ } for(domain = get_cookie_domain(host, FALSE); domain; domain = domain->parent) { - TRACE("Trying %s domain...\n", debugstr_w(domain->domain)); - LIST_FOR_EACH_ENTRY(container, &domain->path_list, cookie_container_t, entry) { struct list *cursor, *cursor2; - TRACE("path %s\n", debugstr_wn(container->path.str, container->path.len)); - if(!cookie_match_path(container, path)) continue; - - TRACE("found domain %p\n", domain->domain); LIST_FOR_EACH_SAFE(cursor, cursor2, &container->cookie_list) { cookie_t *cookie_iter = LIST_ENTRY(cursor, cookie_t, entry); @@ -569,7 +563,6 @@ if((cookie_iter->flags & INTERNET_COOKIE_HTTPONLY) && !(flags & INTERNET_COOKIE_HTTPONLY)) continue; - if(!res->size) { res->cookies = heap_alloc(4*sizeof(*res->cookies)); @@ -584,6 +577,9 @@ res->size *= 2; } + TRACE("%s = %s domain %s path %s\n", debugstr_w(cookie_iter->name), debugstr_w(cookie_iter->data), + debugstr_w(domain->domain), debugstr_wn(container->path.str, container->path.len)); + if(res->cnt) res->string_len += 2; /* '; ' */ res->cookies[res->cnt++] = cookie_iter; Modified: trunk/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/http.c?r… ============================================================================== --- trunk/reactos/dll/win32/wininet/http.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/http.c [iso-8859-1] Sun Sep 24 11:17:59 2017 @@ -180,13 +180,13 @@ static LPWSTR HTTP_build_req( LPCWSTR *list, int len ); static DWORD HTTP_HttpQueryInfoW(http_request_t*, DWORD, LPVOID, LPDWORD, LPDWORD); static UINT HTTP_DecodeBase64(LPCWSTR base64, LPSTR bin); -static BOOL drain_content(http_request_t*,BOOL); +static DWORD drain_content(http_request_t*,BOOL); static CRITICAL_SECTION connection_pool_cs; static CRITICAL_SECTION_DEBUG connection_pool_debug = { 0, 0, &connection_pool_cs, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + { &connection_pool_debug.ProcessLocksList, &connection_pool_debug.ProcessLocksList }, 0, 0, { (DWORD_PTR)(__FILE__ ": connection_pool_cs") } }; static CRITICAL_SECTION connection_pool_cs = { &connection_pool_debug, -1, 0, 0, 0, 0 }; @@ -367,7 +367,7 @@ struct data_stream_vtbl_t { BOOL (*end_of_data)(data_stream_t*,http_request_t*); DWORD (*read)(data_stream_t*,http_request_t*,BYTE*,DWORD,DWORD*,BOOL); - BOOL (*drain_content)(data_stream_t*,http_request_t*); + DWORD (*drain_content)(data_stream_t*,http_request_t*,BOOL); void (*destroy)(data_stream_t*); }; @@ -385,7 +385,8 @@ CHUNKED_STREAM_STATE_READING_CHUNK, CHUNKED_STREAM_STATE_DISCARD_EOL_AFTER_DATA, CHUNKED_STREAM_STATE_DISCARD_EOL_AT_END, - CHUNKED_STREAM_STATE_END_OF_STREAM + CHUNKED_STREAM_STATE_END_OF_STREAM, + CHUNKED_STREAM_STATE_ERROR } state; } chunked_stream_t; @@ -493,10 +494,10 @@ return res; } -static BOOL gzip_drain_content(data_stream_t *stream, http_request_t *req) +static DWORD gzip_drain_content(data_stream_t *stream, http_request_t *req, BOOL allow_blocking) { gzip_stream_t *gzip_stream = (gzip_stream_t*)stream; - return gzip_stream->parent_stream->vtbl->drain_content(gzip_stream->parent_stream, req); + return gzip_stream->parent_stream->vtbl->drain_content(gzip_stream->parent_stream, req, allow_blocking); } static void gzip_destroy(data_stream_t *stream) @@ -2005,7 +2006,7 @@ { http_request_t *req = (http_request_t*)hdr; - http_release_netconn(req, drain_content(req, FALSE)); + http_release_netconn(req, drain_content(req, FALSE) == ERROR_SUCCESS); } static DWORD str_to_buffer(const WCHAR *str, void *buffer, DWORD *size, BOOL unicode) @@ -2628,7 +2629,7 @@ return res; } -static BOOL netconn_drain_content(data_stream_t *stream, http_request_t *req) +static DWORD netconn_drain_content(data_stream_t *stream, http_request_t *req, BOOL allow_blocking) { netconn_stream_t *netconn_stream = (netconn_stream_t*)stream; BYTE buf[1024]; @@ -2636,18 +2637,20 @@ size_t size; if(netconn_stream->content_length == ~0u) - return FALSE; + return WSAEISCONN; while(netconn_stream->content_read < netconn_stream->content_length) { size = min(sizeof(buf), netconn_stream->content_length-netconn_stream->content_read); - res = NETCON_recv(req->netconn, buf, size, FALSE, &len); - if(res || !len) - return FALSE; + res = NETCON_recv(req->netconn, buf, size, allow_blocking, &len); + if(res) + return res; + if(!len) + return WSAECONNABORTED; netconn_stream->content_read += len; } - return TRUE; + return ERROR_SUCCESS; } static void netconn_destroy(data_stream_t *stream) @@ -2672,7 +2675,14 @@ static BOOL chunked_end_of_data(data_stream_t *stream, http_request_t *req) { chunked_stream_t *chunked_stream = (chunked_stream_t*)stream; - return chunked_stream->state == CHUNKED_STREAM_STATE_END_OF_STREAM; + switch(chunked_stream->state) { + case CHUNKED_STREAM_STATE_DISCARD_EOL_AT_END: + case CHUNKED_STREAM_STATE_END_OF_STREAM: + case CHUNKED_STREAM_STATE_ERROR: + return TRUE; + default: + return FALSE; + } } static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DWORD size, @@ -2689,22 +2699,28 @@ /* Ensure that we have data in the buffer for states that need it. */ if(!chunked_stream->buf_size) { + BOOL blocking_read = allow_blocking; + switch(chunked_stream->state) { + case CHUNKED_STREAM_STATE_DISCARD_EOL_AT_END: + case CHUNKED_STREAM_STATE_DISCARD_EOL_AFTER_SIZE: + /* never allow blocking after 0 chunk size */ + if(!chunked_stream->chunk_size) + blocking_read = FALSE; + /* fall through */ case CHUNKED_STREAM_STATE_READING_CHUNK_SIZE: - case CHUNKED_STREAM_STATE_DISCARD_EOL_AFTER_SIZE: case CHUNKED_STREAM_STATE_DISCARD_EOL_AFTER_DATA: - case CHUNKED_STREAM_STATE_DISCARD_EOL_AT_END: chunked_stream->buf_pos = 0; - res = NETCON_recv(req->netconn, chunked_stream->buf, sizeof(chunked_stream->buf), allow_blocking, &read_bytes); + res = NETCON_recv(req->netconn, chunked_stream->buf, sizeof(chunked_stream->buf), blocking_read, &read_bytes); if(res == ERROR_SUCCESS && read_bytes) { chunked_stream->buf_size += read_bytes; }else if(res == WSAEWOULDBLOCK) { - if(ret_read) + if(ret_read || allow_blocking) res = ERROR_SUCCESS; continue_read = FALSE; continue; }else { - chunked_stream->state = CHUNKED_STREAM_STATE_END_OF_STREAM; + chunked_stream->state = CHUNKED_STREAM_STATE_ERROR; } break; default: @@ -2766,7 +2782,7 @@ } if(!read_bytes) { - chunked_stream->state = CHUNKED_STREAM_STATE_END_OF_STREAM; + chunked_stream->state = CHUNKED_STREAM_STATE_ERROR; continue; } } @@ -2796,6 +2812,7 @@ break; case CHUNKED_STREAM_STATE_END_OF_STREAM: + case CHUNKED_STREAM_STATE_ERROR: continue_read = FALSE; break; } @@ -2811,10 +2828,22 @@ return ERROR_SUCCESS; } -static BOOL chunked_drain_content(data_stream_t *stream, http_request_t *req) +static DWORD chunked_drain_content(data_stream_t *stream, http_request_t *req, BOOL allow_blocking) { chunked_stream_t *chunked_stream = (chunked_stream_t*)stream; - return chunked_stream->state == CHUNKED_STREAM_STATE_END_OF_STREAM; + BYTE buf[1024]; + DWORD size, res; + + while(chunked_stream->state != CHUNKED_STREAM_STATE_END_OF_STREAM + && chunked_stream->state != CHUNKED_STREAM_STATE_ERROR) { + res = chunked_read(stream, req, buf, sizeof(buf), &size, allow_blocking); + if(res != ERROR_SUCCESS) + return res; + } + + if(chunked_stream->state != CHUNKED_STREAM_STATE_END_OF_STREAM) + return ERROR_NO_DATA; + return ERROR_SUCCESS; } static void chunked_destroy(data_stream_t *stream) @@ -2968,46 +2997,34 @@ LeaveCriticalSection( &req->read_section ); *read = ret_read; - TRACE( "retrieved %u bytes (%u)\n", ret_read, req->contentLength ); - - if(res != WSAEWOULDBLOCK && (!ret_read || res != ERROR_SUCCESS)) - http_release_netconn(req, res == ERROR_SUCCESS); + TRACE( "retrieved %u bytes (res %u)\n", ret_read, res ); + + if(res != WSAEWOULDBLOCK) { + if(res != ERROR_SUCCESS) + http_release_netconn(req, FALSE); + else if(!ret_read && drain_content(req, FALSE) == ERROR_SUCCESS) + http_release_netconn(req, TRUE); + } return res; } -static BOOL drain_content(http_request_t *req, BOOL blocking) -{ - BOOL ret; - - if(!is_valid_netconn(req->netconn) || req->contentLength == -1) - return FALSE; +static DWORD drain_content(http_request_t *req, BOOL blocking) +{ + DWORD res; + + TRACE("%p\n", req->netconn); + + if(!is_valid_netconn(req->netconn)) + return ERROR_NO_DATA; if(!strcmpW(req->verb, szHEAD)) - return TRUE; - - if(!blocking) - return req->data_stream->vtbl->drain_content(req->data_stream, req); + return ERROR_SUCCESS; EnterCriticalSection( &req->read_section ); - - while(1) { - DWORD bytes_read, res; - BYTE buf[4096]; - - res = HTTPREQ_Read(req, buf, sizeof(buf), &bytes_read, TRUE); - if(res != ERROR_SUCCESS) { - ret = FALSE; - break; - } - if(!bytes_read) { - ret = TRUE; - break; - } - } - + res = req->data_stream->vtbl->drain_content(req->data_stream, req, blocking); LeaveCriticalSection( &req->read_section ); - return ret; + return res; } typedef struct { @@ -3042,7 +3059,7 @@ if(task->ret_read) complete_arg = read; /* QueryDataAvailable reports read bytes in request complete notification */ if(res != ERROR_SUCCESS || !read) - http_release_netconn(req, drain_content(req, FALSE)); + http_release_netconn(req, drain_content(req, FALSE) == ERROR_SUCCESS); } TRACE("res %u read %u\n", res, read); @@ -3987,7 +4004,16 @@ return NULL; } + urlComponents.dwSchemeLength = 1; + b = InternetCrackUrlW(redirect_url, url_length / sizeof(WCHAR), 0, &urlComponents); + if(b && urlComponents.dwSchemeLength && + urlComponents.nScheme != INTERNET_SCHEME_HTTP && urlComponents.nScheme != INTERNET_SCHEME_HTTPS) { + TRACE("redirect to non-http URL\n"); + return NULL; + } + urlComponents.lpszScheme = (request->hdr.dwFlags & INTERNET_FLAG_SECURE) ? szHttps : szHttp; + urlComponents.dwSchemeLength = 0; urlComponents.lpszHostName = request->server->name; urlComponents.nPort = request->server->port; urlComponents.lpszUserName = session->userName; @@ -4024,30 +4050,36 @@ /*********************************************************************** * HTTP_HandleRedirect (internal) */ -static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) -{ +static DWORD HTTP_HandleRedirect(http_request_t *request, WCHAR *url) +{ + URL_COMPONENTSW urlComponents = { sizeof(urlComponents) }; http_session_t *session = request->session; - WCHAR *path; - - if(lpszUrl[0]=='/') + size_t url_len = strlenW(url); + + if(url[0] == '/') { /* if it's an absolute path, keep the same session info */ - path = heap_strdupW(lpszUrl); + urlComponents.lpszUrlPath = url; + urlComponents.dwUrlPathLength = url_len; } else { - URL_COMPONENTSW urlComponents = { sizeof(urlComponents) }; - BOOL custom_port = FALSE; - substr_t host; - urlComponents.dwHostNameLength = 1; urlComponents.dwUserNameLength = 1; urlComponents.dwUrlPathLength = 1; - if(!InternetCrackUrlW(lpszUrl, strlenW(lpszUrl), 0, &urlComponents)) + if(!InternetCrackUrlW(url, url_len, 0, &urlComponents)) return INTERNET_GetLastError(); - if (!urlComponents.dwHostNameLength) + if(!urlComponents.dwHostNameLength) return ERROR_INTERNET_INVALID_URL; + } + + INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REDIRECT, + url, (url_len + 1) * sizeof(WCHAR)); + + if(urlComponents.dwHostNameLength) { + BOOL custom_port = FALSE; + substr_t host; if(urlComponents.nScheme == INTERNET_SCHEME_HTTP) { if(request->hdr.dwFlags & INTERNET_FLAG_SECURE) { @@ -4094,17 +4126,18 @@ HTTP_ProcessHeader(request, hostW, request->server->host_port, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); else HTTP_ProcessHeader(request, hostW, request->server->name, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); - - path = heap_strndupW(urlComponents.lpszUrlPath, urlComponents.dwUrlPathLength); - } + } + heap_free(request->path); request->path = NULL; - if (*path) + if(urlComponents.dwUrlPathLength) { DWORD needed = 1; HRESULT rc; WCHAR dummy = 0; - + WCHAR *path; + + path = heap_strndupW(urlComponents.lpszUrlPath, urlComponents.dwUrlPathLength); rc = UrlEscapeW(path, &dummy, &needed, URL_ESCAPE_SPACES_ONLY); if (rc != E_POINTER) ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(path),rc); @@ -4116,9 +4149,8 @@ ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(path),rc); strcpyW(request->path, path); } - } - - heap_free(path); + heap_free(path); + } /* Remove custom content-type/length headers on redirects. */ remove_header(request, szContent_Type, TRUE); @@ -4707,21 +4739,21 @@ netconn_t *netconn = NULL; DWORD res; - reset_data_stream(request); - if (request->netconn) { - if (is_valid_netconn(request->netconn) && NETCON_is_alive(request->netconn)) - { + if (NETCON_is_alive(request->netconn) && drain_content(request, TRUE) == ERROR_SUCCESS) + { + reset_data_stream(request); *reusing = TRUE; return ERROR_SUCCESS; } - else - { - free_netconn(request->netconn); - request->netconn = NULL; - } - } + + TRACE("freeing netconn\n"); + free_netconn(request->netconn); + request->netconn = NULL; + } + + reset_data_stream(request); res = HTTP_ResolveName(request); if(res != ERROR_SUCCESS) @@ -5027,9 +5059,7 @@ heap_free(request->verb); request->verb = heap_strdupW(szGET); } - http_release_netconn(request, drain_content(request, FALSE)); - INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REDIRECT, - new_url, (strlenW(new_url) + 1) * sizeof(WCHAR)); + http_release_netconn(request, drain_content(request, FALSE) == ERROR_SUCCESS); res = HTTP_HandleRedirect(request, new_url); heap_free(new_url); if (res == ERROR_SUCCESS) { @@ -5055,7 +5085,7 @@ request->session->password, host)) { heap_free(requestString); - if(!drain_content(request, TRUE)) { + if(!drain_content(request, TRUE) == ERROR_SUCCESS) { FIXME("Could not drain content\n"); http_release_netconn(request, FALSE); } @@ -5083,7 +5113,7 @@ NULL)) { heap_free(requestString); - if(!drain_content(request, TRUE)) { + if(!drain_content(request, TRUE) == ERROR_SUCCESS) { FIXME("Could not drain content\n"); http_release_netconn(request, FALSE); } @@ -5225,9 +5255,7 @@ heap_free(request->verb); request->verb = heap_strdupW(szGET); } - http_release_netconn(request, drain_content(request, FALSE)); - INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REDIRECT, - new_url, (strlenW(new_url) + 1) * sizeof(WCHAR)); + http_release_netconn(request, drain_content(request, FALSE) == ERROR_SUCCESS); res = HTTP_HandleRedirect(request, new_url); heap_free(new_url); if (res == ERROR_SUCCESS) Modified: trunk/reactos/dll/win32/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/urlcache… ============================================================================== --- trunk/reactos/dll/win32/wininet/urlcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/urlcache.c [iso-8859-1] Sun Sep 24 11:17:59 2017 @@ -3424,8 +3424,8 @@ LPVOID lpReserved3 ) { - FIXME("(%s, 0x%08x, 0x%08x, 0x%08x%08x, %p, %p, %p, %p, %p) stub\n", debugstr_a(lpszUrlSearchPattern), - dwFlags, dwFilter, (ULONG)(GroupId >> 32), (ULONG)GroupId, lpFirstCacheEntryInfo, + FIXME("(%s, 0x%08x, 0x%08x, 0x%s, %p, %p, %p, %p, %p) stub\n", debugstr_a(lpszUrlSearchPattern), + dwFlags, dwFilter, wine_dbgstr_longlong(GroupId), lpFirstCacheEntryInfo, lpdwFirstCacheEntryInfoBufferSize, lpReserved, pcbReserved2,lpReserved3); SetLastError(ERROR_FILE_NOT_FOUND); return NULL; @@ -3443,8 +3443,8 @@ LPVOID lpReserved3 ) { - FIXME("(%s, 0x%08x, 0x%08x, 0x%08x%08x, %p, %p, %p, %p, %p) stub\n", debugstr_w(lpszUrlSearchPattern), - dwFlags, dwFilter, (ULONG)(GroupId >> 32), (ULONG)GroupId, lpFirstCacheEntryInfo, + FIXME("(%s, 0x%08x, 0x%08x, 0x%s, %p, %p, %p, %p, %p) stub\n", debugstr_w(lpszUrlSearchPattern), + dwFlags, dwFilter, wine_dbgstr_longlong(GroupId), lpFirstCacheEntryInfo, lpdwFirstCacheEntryInfoBufferSize, lpReserved, pcbReserved2,lpReserved3); SetLastError(ERROR_FILE_NOT_FOUND); return NULL; @@ -3720,8 +3720,8 @@ */ BOOL WINAPI DeleteUrlCacheGroup(GROUPID GroupId, DWORD dwFlags, LPVOID lpReserved) { - FIXME("(0x%08x%08x, 0x%08x, %p) stub\n", - (ULONG)(GroupId >> 32), (ULONG)GroupId, dwFlags, lpReserved); + FIXME("(0x%s, 0x%08x, %p) stub\n", + wine_dbgstr_longlong(GroupId), dwFlags, lpReserved); return FALSE; } @@ -3743,8 +3743,8 @@ GROUPID GroupId, LPBYTE pbGroupAttributes, DWORD cbGroupAttributes, LPVOID lpReserved) { - FIXME("(%s, 0x%08x, 0x%08x%08x, %p, 0x%08x, %p) stub\n", - debugstr_a(lpszUrlName), dwFlags, (ULONG)(GroupId >> 32), (ULONG)GroupId, + FIXME("(%s, 0x%08x, 0x%s, %p, 0x%08x, %p) stub\n", + debugstr_a(lpszUrlName), dwFlags, wine_dbgstr_longlong(GroupId), pbGroupAttributes, cbGroupAttributes, lpReserved); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; @@ -3758,8 +3758,8 @@ GROUPID GroupId, LPBYTE pbGroupAttributes, DWORD cbGroupAttributes, LPVOID lpReserved) { - FIXME("(%s, 0x%08x, 0x%08x%08x, %p, 0x%08x, %p) stub\n", - debugstr_w(lpszUrlName), dwFlags, (ULONG)(GroupId >> 32), (ULONG)GroupId, + FIXME("(%s, 0x%08x, 0x%s, %p, 0x%08x, %p) stub\n", + debugstr_w(lpszUrlName), dwFlags, wine_dbgstr_longlong(GroupId), pbGroupAttributes, cbGroupAttributes, lpReserved); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; @@ -3789,8 +3789,8 @@ LPINTERNET_CACHE_GROUP_INFOA lpGroupInfo, LPDWORD lpdwGroupInfo, LPVOID lpReserved ) { - FIXME("(0x%08x%08x, 0x%08x, 0x%08x, %p, %p, %p) stub\n", - (ULONG)(gid >> 32), (ULONG)gid, dwFlags, dwAttributes, lpGroupInfo, + FIXME("(0x%s, 0x%08x, 0x%08x, %p, %p, %p) stub\n", + wine_dbgstr_longlong(gid), dwFlags, dwAttributes, lpGroupInfo, lpdwGroupInfo, lpReserved); return FALSE; } @@ -3799,8 +3799,8 @@ LPINTERNET_CACHE_GROUP_INFOW lpGroupInfo, LPDWORD lpdwGroupInfo, LPVOID lpReserved ) { - FIXME("(0x%08x%08x, 0x%08x, 0x%08x, %p, %p, %p) stub\n", - (ULONG)(gid >> 32), (ULONG)gid, dwFlags, dwAttributes, lpGroupInfo, + FIXME("(0x%s, 0x%08x, 0x%08x, %p, %p, %p) stub\n", + wine_dbgstr_longlong(gid), dwFlags, dwAttributes, lpGroupInfo, lpdwGroupInfo, lpReserved); return FALSE; } @@ -3808,16 +3808,16 @@ BOOL WINAPI SetUrlCacheGroupAttributeA( GROUPID gid, DWORD dwFlags, DWORD dwAttributes, LPINTERNET_CACHE_GROUP_INFOA lpGroupInfo, LPVOID lpReserved ) { - FIXME("(0x%08x%08x, 0x%08x, 0x%08x, %p, %p) stub\n", - (ULONG)(gid >> 32), (ULONG)gid, dwFlags, dwAttributes, lpGroupInfo, lpReserved); + FIXME("(0x%s, 0x%08x, 0x%08x, %p, %p) stub\n", + wine_dbgstr_longlong(gid), dwFlags, dwAttributes, lpGroupInfo, lpReserved); return TRUE; } BOOL WINAPI SetUrlCacheGroupAttributeW( GROUPID gid, DWORD dwFlags, DWORD dwAttributes, LPINTERNET_CACHE_GROUP_INFOW lpGroupInfo, LPVOID lpReserved ) { - FIXME("(0x%08x%08x, 0x%08x, 0x%08x, %p, %p) stub\n", - (ULONG)(gid >> 32), (ULONG)gid, dwFlags, dwAttributes, lpGroupInfo, lpReserved); + FIXME("(0x%s, 0x%08x, 0x%08x, %p, %p) stub\n", + wine_dbgstr_longlong(gid), dwFlags, dwAttributes, lpGroupInfo, lpReserved); return TRUE; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 24 11:17:59 2017 @@ -201,7 +201,7 @@ reactos/dll/win32/winemp3.acm # Synced to WineStaging-2.16 reactos/dll/win32/wing32 # Synced to WineStaging-2.9 reactos/dll/win32/winhttp # Synced to WineStaging-2.16 -reactos/dll/win32/wininet # Synced to WineStaging-2.9 +reactos/dll/win32/wininet # Synced to WineStaging-2.16 reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628

1 0

[akhaldi] 75945: [WINHTTP_WINETEST] Sync with Wine Staging 2.16. CORE-13762
by akhaldi＠svn.reactos.org 24 Sep '17

24 Sep '17

Author: akhaldi Date: Sun Sep 24 11:17:51 2017 New Revision: 75945 URL: http://svn.reactos.org/svn/reactos?rev=75945&view=rev Log: [WINHTTP_WINETEST] Sync with Wine Staging 2.16. CORE-13762 Modified: trunk/rostests/winetests/winhttp/notification.c Modified: trunk/rostests/winetests/winhttp/notification.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winhttp/notific… ============================================================================== --- trunk/rostests/winetests/winhttp/notification.c [iso-8859-1] (original) +++ trunk/rostests/winetests/winhttp/notification.c [iso-8859-1] Sun Sep 24 11:17:51 2017 @@ -22,12 +22,17 @@ #include <stdlib.h> #include <windef.h> #include <winbase.h> +#include <winsock2.h> +#include <ws2tcpip.h> #include <winhttp.h> #include "wine/test.h" static const WCHAR user_agent[] = {'w','i','n','e','t','e','s','t',0}; static const WCHAR test_winehq[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; +static const WCHAR tests_hello_html[] = {'/','t','e','s','t','s','/','h','e','l','l','o','.','h','t','m','l',0}; +static const WCHAR tests_redirect[] = {'/','t','e','s','t','s','/','r','e','d','i','r','e','c','t',0}; +static const WCHAR localhostW[] = {'l','o','c','a','l','h','o','s','t',0}; enum api { @@ -45,10 +50,12 @@ { enum api function; /* api responsible for notification */ unsigned int status; /* status received */ - BOOL todo; - BOOL ignore; - BOOL skipped_for_proxy; -}; + DWORD flags; /* a combination of NF_* flags */ +}; + +#define NF_ALLOW 0x0001 /* notification may or may not happen */ +#define NF_WINE_ALLOW 0x0002 /* wine sends notification when it should not */ +#define NF_SIGNAL 0x0004 /* signal wait handle when notified */ struct info { @@ -60,62 +67,40 @@ unsigned int line; }; -static BOOL proxy_active(void) -{ - WINHTTP_PROXY_INFO proxy_info; - BOOL active = FALSE; - - if (WinHttpGetDefaultProxyConfiguration(&proxy_info)) - { - active = (proxy_info.lpszProxy != NULL); - if (active) - GlobalFree(proxy_info.lpszProxy); - if (proxy_info.lpszProxyBypass != NULL) - GlobalFree(proxy_info.lpszProxyBypass); - } - else - active = FALSE; - - return active; -} +struct test_request +{ + HINTERNET session; + HINTERNET connection; + HINTERNET request; +}; static void CALLBACK check_notification( HINTERNET handle, DWORD_PTR context, DWORD status, LPVOID buffer, DWORD buflen ) { BOOL status_ok, function_ok; struct info *info = (struct info *)context; - unsigned int i = info->index; if (status == WINHTTP_CALLBACK_STATUS_HANDLE_CREATED) { DWORD size = sizeof(struct info *); WinHttpQueryOption( handle, WINHTTP_OPTION_CONTEXT_VALUE, &info, &size ); } - ok(i < info->count, "%u: unexpected notification 0x%08x\n", info->line, status); - if (i >= info->count) return; - - status_ok = (info->test[i].status == status); - function_ok = (info->test[i].function == info->function); - if (!info->test[i].ignore && !info->test[i].todo) - { - ok(status_ok, "%u: expected status 0x%08x got 0x%08x\n", info->line, info->test[i].status, status); - ok(function_ok, "%u: expected function %u got %u\n", info->line, info->test[i].function, info->function); - } - else if (!info->test[i].ignore) - { - todo_wine ok(status_ok, "%u: expected status 0x%08x got 0x%08x\n", info->line, info->test[i].status, status); - if (status_ok) - { - todo_wine ok(function_ok, "%u: expected function %u got %u\n", info->line, info->test[i].function, info->function); - } - } - if (status_ok && function_ok) info->index++; - if (proxy_active()) - { - while (info->test[info->index].skipped_for_proxy) - info->index++; - } - - if (status & (WINHTTP_CALLBACK_FLAG_ALL_COMPLETIONS | WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING)) + while (info->index < info->count && info->test[info->index].status != status && (info->test[info->index].flags & NF_ALLOW)) + info->index++; + while (info->index < info->count && (info->test[info->index].flags & NF_WINE_ALLOW)) + { + todo_wine ok(info->test[info->index].status != status, "unexpected %x notification\n", status); + if (info->test[info->index].status == status) break; + info->index++; + } + ok(info->index < info->count, "%u: unexpected notification 0x%08x\n", info->line, status); + if (info->index >= info->count) return; + + status_ok = (info->test[info->index].status == status); + function_ok = (info->test[info->index].function == info->function); + ok(status_ok, "%u: expected status 0x%08x got 0x%08x\n", info->line, info->test[info->index].status, status); + ok(function_ok, "%u: expected function %u got %u\n", info->line, info->test[info->index].function, info->function); + + if (status_ok && function_ok && info->test[info->index++].flags & NF_SIGNAL) { SetEvent( info->wait ); } @@ -133,27 +118,65 @@ { winhttp_send_request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, FALSE, TRUE }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, FALSE, TRUE }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, NF_WINE_ALLOW }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, NF_WINE_ALLOW }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, NF_SIGNAL }, { winhttp_open_request, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, NF_WINE_ALLOW }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, NF_WINE_ALLOW }, { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST }, { winhttp_send_request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, FALSE, TRUE }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, FALSE, TRUE }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, FALSE, TRUE }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, TRUE, TRUE }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, TRUE, TRUE } + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, NF_WINE_ALLOW }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, NF_WINE_ALLOW }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, NF_SIGNAL }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, NF_SIGNAL }, + { winhttp_connect, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, + { winhttp_open_request, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, NF_WINE_ALLOW }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, NF_WINE_ALLOW }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, NF_WINE_ALLOW }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, NF_WINE_ALLOW }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, NF_WINE_ALLOW }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, NF_WINE_ALLOW }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, NF_SIGNAL }, + { winhttp_open_request, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, NF_WINE_ALLOW }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, NF_WINE_ALLOW }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, NF_WINE_ALLOW }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, NF_WINE_ALLOW }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, NF_SIGNAL }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, NF_SIGNAL } }; static void setup_test( struct info *info, enum api function, unsigned int line ) { + if (info->wait) ResetEvent( info->wait ); info->function = function; info->line = line; + while (info->index < info->count && info->test[info->index].function != function + && (info->test[info->index].flags & (NF_ALLOW | NF_WINE_ALLOW))) + info->index++; + ok_(__FILE__,line)(info->test[info->index].function == function, + "unexpected function %u, expected %u. probably some notifications were missing\n", + info->test[info->index].function, function); +} + +static void end_test( struct info *info, unsigned int line ) +{ + ok_(__FILE__,line)(info->index == info->count, "some notifications were missing: %x\n", + info->test[info->index].status); } static void test_connection_cache( void ) @@ -166,7 +189,7 @@ info.test = cache_test; info.count = sizeof(cache_test) / sizeof(cache_test[0]); info.index = 0; - info.wait = NULL; + info.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); ses = WinHttpOpen( user_agent, 0, NULL, NULL, 0 ); ok(ses != NULL, "failed to open session %u\n", GetLastError()); @@ -189,7 +212,7 @@ ok(con != NULL, "failed to open a connection %u\n", GetLastError()); setup_test( &info, winhttp_open_request, __LINE__ ); - req = WinHttpOpenRequest( con, NULL, NULL, NULL, NULL, NULL, 0 ); + req = WinHttpOpenRequest( con, NULL, tests_hello_html, NULL, NULL, NULL, 0 ); ok(req != NULL, "failed to open a request %u\n", GetLastError()); setup_test( &info, winhttp_send_request, __LINE__ ); @@ -211,11 +234,13 @@ ok(ret, "failed unexpectedly %u\n", GetLastError()); ok(status == 200, "request failed unexpectedly %u\n", status); + ResetEvent( info.wait ); setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( req ); + WaitForSingleObject( info.wait, INFINITE ); setup_test( &info, winhttp_open_request, __LINE__ ); - req = WinHttpOpenRequest( con, NULL, NULL, NULL, NULL, NULL, 0 ); + req = WinHttpOpenRequest( con, NULL, tests_hello_html, NULL, NULL, NULL, 0 ); ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSetOption( req, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); @@ -240,12 +265,12 @@ ok(ret, "failed unexpectedly %u\n", GetLastError()); ok(status == 200, "request failed unexpectedly %u\n", status); + ResetEvent( info.wait ); setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( req ); - - setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); + WaitForSingleObject( info.wait, INFINITE ); if (unload) { @@ -253,16 +278,16 @@ ok(status == WAIT_TIMEOUT, "got %08x\n", status); } + setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( ses ); - - Sleep(2000); /* make sure connection is evicted from cache */ + WaitForSingleObject( info.wait, INFINITE ); + if (unload) { - status = WaitForSingleObject( event, 0 ); + status = WaitForSingleObject( event, 100 ); ok(status == WAIT_OBJECT_0, "got %08x\n", status); } - info.index = 0; ses = WinHttpOpen( user_agent, 0, NULL, NULL, 0 ); ok(ses != NULL, "failed to open session %u\n", GetLastError()); @@ -283,7 +308,7 @@ ok(con != NULL, "failed to open a connection %u\n", GetLastError()); setup_test( &info, winhttp_open_request, __LINE__ ); - req = WinHttpOpenRequest( con, NULL, NULL, NULL, NULL, NULL, 0 ); + req = WinHttpOpenRequest( con, NULL, tests_hello_html, NULL, NULL, NULL, 0 ); ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSetOption( req, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); @@ -308,11 +333,13 @@ ok(ret, "failed unexpectedly %u\n", GetLastError()); ok(status == 200, "request failed unexpectedly %u\n", status); + ResetEvent( info.wait ); setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( req ); + WaitForSingleObject( info.wait, INFINITE ); setup_test( &info, winhttp_open_request, __LINE__ ); - req = WinHttpOpenRequest( con, NULL, NULL, NULL, NULL, NULL, 0 ); + req = WinHttpOpenRequest( con, NULL, tests_hello_html, NULL, NULL, NULL, 0 ); ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSetOption( req, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); @@ -341,6 +368,7 @@ done: WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); + WaitForSingleObject( info.wait, INFINITE ); if (unload) { @@ -348,12 +376,15 @@ ok(status == WAIT_TIMEOUT, "got %08x\n", status); } + setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( ses ); - - Sleep(2000); /* make sure connection is evicted from cache */ + WaitForSingleObject( info.wait, INFINITE ); + CloseHandle( info.wait ); + end_test( &info, __LINE__ ); + if (unload) { - status = WaitForSingleObject( event, 0 ); + status = WaitForSingleObject( event, 100 ); ok(status == WAIT_OBJECT_0, "got %08x\n", status); } @@ -364,28 +395,28 @@ { { winhttp_connect, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, { winhttp_open_request, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, FALSE, TRUE }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, FALSE, TRUE }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, NF_WINE_ALLOW }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, NF_WINE_ALLOW }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, NF_WINE_ALLOW }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, NF_WINE_ALLOW }, { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST }, { winhttp_send_request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REDIRECT }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, FALSE, TRUE, TRUE }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, FALSE, TRUE, TRUE }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, FALSE, FALSE, TRUE }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, FALSE, FALSE, TRUE }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, NF_ALLOW }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, NF_ALLOW }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, NF_ALLOW }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, NF_ALLOW }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REQUEST_SENT }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, FALSE, TRUE }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, FALSE, TRUE }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, FALSE, TRUE }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, TRUE, TRUE }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, TRUE, TRUE } + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, NF_WINE_ALLOW }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, NF_WINE_ALLOW }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, NF_SIGNAL } }; static void test_redirect( void ) @@ -398,7 +429,7 @@ info.test = redirect_test; info.count = sizeof(redirect_test) / sizeof(redirect_test[0]); info.index = 0; - info.wait = NULL; + info.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); ses = WinHttpOpen( user_agent, 0, NULL, NULL, 0 ); ok(ses != NULL, "failed to open session %u\n", GetLastError()); @@ -413,7 +444,7 @@ ok(con != NULL, "failed to open a connection %u\n", GetLastError()); setup_test( &info, winhttp_open_request, __LINE__ ); - req = WinHttpOpenRequest( con, NULL, NULL, NULL, NULL, NULL, 0 ); + req = WinHttpOpenRequest( con, NULL, tests_redirect, NULL, NULL, NULL, 0 ); ok(req != NULL, "failed to open a request %u\n", GetLastError()); setup_test( &info, winhttp_send_request, __LINE__ ); @@ -440,40 +471,32 @@ WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); + WaitForSingleObject( info.wait, INFINITE ); + CloseHandle( info.wait ); + end_test( &info, __LINE__ ); } static const struct notification async_test[] = { { winhttp_connect, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, { winhttp_open_request, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, FALSE, TRUE }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, FALSE, TRUE }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, NF_WINE_ALLOW }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, NF_WINE_ALLOW }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, NF_WINE_ALLOW }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, NF_WINE_ALLOW }, { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST }, { winhttp_send_request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE, NF_SIGNAL }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REDIRECT }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, FALSE, TRUE, TRUE }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, FALSE, TRUE, TRUE }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, FALSE, FALSE, TRUE }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, FALSE, FALSE, TRUE }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REQUEST_SENT }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE }, - { winhttp_query_data, WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE }, - { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, FALSE, TRUE }, - { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, FALSE, TRUE }, - { winhttp_read_data, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, FALSE, TRUE }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, FALSE, TRUE }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, FALSE, TRUE }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, FALSE, TRUE }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, TRUE, TRUE }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, TRUE, TRUE } + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE, NF_SIGNAL }, + { winhttp_query_data, WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE, NF_SIGNAL }, + { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NF_ALLOW }, + { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, NF_ALLOW }, + { winhttp_read_data, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, NF_SIGNAL }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, NF_SIGNAL } }; static void test_async( void ) @@ -520,7 +543,7 @@ setup_test( &info, winhttp_open_request, __LINE__ ); SetLastError( 0xdeadbeef ); - req = WinHttpOpenRequest( con, NULL, NULL, NULL, NULL, NULL, 0 ); + req = WinHttpOpenRequest( con, NULL, tests_hello_html, NULL, NULL, NULL, 0 ); err = GetLastError(); ok(req != NULL, "failed to open a request %u\n", err); ok(err == ERROR_SUCCESS, "got %u\n", err); @@ -570,11 +593,8 @@ WaitForSingleObject( info.wait, INFINITE ); setup_test( &info, winhttp_read_data, __LINE__ ); - SetLastError( 0xdeadbeef ); ret = WinHttpReadData( req, buffer, sizeof(buffer), NULL ); - err = GetLastError(); ok(ret, "failed to read data %u\n", err); - ok(err == ERROR_SUCCESS, "got %u\n", err); WaitForSingleObject( info.wait, INFINITE ); @@ -588,8 +608,8 @@ ok(status == WAIT_TIMEOUT, "got %08x\n", status); } WinHttpCloseHandle( ses ); - - WaitForSingleObject( info.wait, INFINITE ); + WaitForSingleObject( info.wait, INFINITE ); + end_test( &info, __LINE__ ); if (unload) { @@ -598,12 +618,430 @@ } CloseHandle( event ); CloseHandle( info.wait ); + end_test( &info, __LINE__ ); +} + +static const char okmsg[] = +"HTTP/1.1 200 OK\r\n" +"Server: winetest\r\n" +"\r\n"; + +static const char page1[] = +"<HTML>\r\n" +"<HEAD><TITLE>winhttp test page</TITLE></HEAD>\r\n" +"<BODY>The quick brown fox jumped over the lazy dog</BODY>\r\n" +"</HTML>\r\n\r\n"; + +struct server_info +{ + HANDLE event; + int port; +}; + +static int server_socket; +static HANDLE server_socket_available, server_socket_done; + +static DWORD CALLBACK server_thread(LPVOID param) +{ + struct server_info *si = param; + int r, c = -1, i, on; + SOCKET s; + struct sockaddr_in sa; + char buffer[0x100]; + WSADATA wsaData; + int last_request = 0; + + WSAStartup(MAKEWORD(1,1), &wsaData); + + s = socket(AF_INET, SOCK_STREAM, 0); + if (s == INVALID_SOCKET) + return 1; + + on = 1; + setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char*)&on, sizeof on); + + memset(&sa, 0, sizeof sa); + sa.sin_family = AF_INET; + sa.sin_port = htons(si->port); + sa.sin_addr.S_un.S_addr = inet_addr("127.0.0.1"); + + r = bind(s, (struct sockaddr *)&sa, sizeof(sa)); + if (r < 0) + return 1; + + listen(s, 0); + SetEvent(si->event); + do + { + if (c == -1) c = accept(s, NULL, NULL); + + memset(buffer, 0, sizeof buffer); + for(i = 0; i < sizeof buffer - 1; i++) + { + r = recv(c, &buffer[i], 1, 0); + if (r != 1) + break; + if (i < 4) continue; + if (buffer[i - 2] == '\n' && buffer[i] == '\n' && + buffer[i - 3] == '\r' && buffer[i - 1] == '\r') + break; + } + if (strstr(buffer, "GET /quit")) + { + send(c, okmsg, sizeof okmsg - 1, 0); + send(c, page1, sizeof page1 - 1, 0); + last_request = 1; + } + else if(strstr(buffer, "GET /socket")) + { + server_socket = c; + SetEvent(server_socket_available); + WaitForSingleObject(server_socket_done, INFINITE); + ResetEvent(server_socket_available); + } + shutdown(c, 2); + closesocket(c); + c = -1; + } while (!last_request); + + closesocket(s); + return 0; +} + +static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) +{ + HINTERNET ses, con, req; + char buffer[0x100]; + DWORD count, status, size; + BOOL ret; + + ses = WinHttpOpen(NULL, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); + ok(ses != NULL, "failed to open session %u\n", GetLastError()); + + con = WinHttpConnect(ses, localhostW, port, 0); + ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + + req = WinHttpOpenRequest(con, verb, path, NULL, NULL, NULL, 0); + ok(req != NULL, "failed to open a request %u\n", GetLastError()); + + ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); + ok(ret, "failed to send request %u\n", GetLastError()); + + ret = WinHttpReceiveResponse(req, NULL); + ok(ret, "failed to receive response %u\n", GetLastError()); + + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); + ok(ret, "failed to query status code %u\n", GetLastError()); + ok(status == HTTP_STATUS_OK, "request failed unexpectedly %u\n", status); + + count = 0; + memset(buffer, 0, sizeof(buffer)); + ret = WinHttpReadData(req, buffer, sizeof buffer, &count); + ok(ret, "failed to read data %u\n", GetLastError()); + ok(count == sizeof page1 - 1, "count was wrong\n"); + ok(!memcmp(buffer, page1, sizeof page1), "http data wrong\n"); + + WinHttpCloseHandle(req); + WinHttpCloseHandle(con); + WinHttpCloseHandle(ses); +} + +static const struct notification open_socket_request_test[] = +{ + { winhttp_connect, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, + { winhttp_open_request, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, NF_ALLOW }, /* some versions call it twice. why? */ + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE, NF_SIGNAL } +}; + +static const struct notification reuse_socket_request_test[] = +{ + { winhttp_connect, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, + { winhttp_open_request, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE, NF_SIGNAL }, +}; + +static void open_async_request(int port, struct test_request *req, struct info *info, const WCHAR *path, BOOL reuse_connection) +{ + BOOL ret; + + info->index = 0; + if (reuse_connection) + { + info->test = reuse_socket_request_test; + info->count = sizeof(reuse_socket_request_test) / sizeof(reuse_socket_request_test[0]); + } + else + { + info->test = open_socket_request_test; + info->count = sizeof(open_socket_request_test) / sizeof(open_socket_request_test[0]); + } + + req->session = WinHttpOpen( user_agent, 0, NULL, NULL, WINHTTP_FLAG_ASYNC ); + ok(req->session != NULL, "failed to open session %u\n", GetLastError()); + + WinHttpSetOption( req->session, WINHTTP_OPTION_CONTEXT_VALUE, &info, sizeof(struct info *) ); + WinHttpSetStatusCallback( req->session, check_notification, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); + + setup_test( info, winhttp_connect, __LINE__ ); + req->connection = WinHttpConnect( req->session, localhostW, port, 0 ); + ok(req->connection != NULL, "failed to open a connection %u\n", GetLastError()); + + setup_test( info, winhttp_open_request, __LINE__ ); + req->request = WinHttpOpenRequest( req->connection, NULL, path, NULL, NULL, NULL, 0 ); + ok(req->request != NULL, "failed to open a request %u\n", GetLastError()); + + setup_test( info, winhttp_send_request, __LINE__ ); + ret = WinHttpSendRequest( req->request, NULL, 0, NULL, 0, 0, 0 ); + ok(ret, "failed to send request %u\n", GetLastError()); +} + +static void open_socket_request(int port, struct test_request *req, struct info *info) +{ + static const WCHAR socketW[] = {'/','s','o','c','k','e','t',0}; + + ResetEvent( server_socket_done ); + open_async_request( port, req, info, socketW, FALSE ); + WaitForSingleObject( server_socket_available, INFINITE ); +} + +static const struct notification server_reply_test[] = +{ + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NF_ALLOW }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, NF_ALLOW }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE, NF_SIGNAL } +}; + +static void server_send_reply(struct test_request *req, struct info *info, const char *msg) +{ + BOOL ret; + + send( server_socket, msg, strlen( msg ), 0 ); + WaitForSingleObject( info->wait, INFINITE ); + + info->test = server_reply_test; + info->count = sizeof(server_reply_test) / sizeof(server_reply_test[0]); + info->index = 0; + setup_test( info, winhttp_send_request, __LINE__ ); + ret = WinHttpReceiveResponse( req->request, NULL ); + ok(ret, "failed to receive response %u\n", GetLastError()); + + WaitForSingleObject( info->wait, INFINITE ); + end_test( info, __LINE__ ); +} + +#define server_read_data(a) _server_read_data(a,__LINE__) +static void _server_read_data(const char *expect_prefix, unsigned int line) +{ + char buf[1024]; + DWORD size, len; + + size = recv( server_socket, buf, sizeof(buf), 0 ); + len = strlen( expect_prefix ); + ok_(__FILE__,line)(size > len, "data too short\n"); + if (size >= len) + { + buf[len] = 0; + ok_(__FILE__,line)(!strcmp( buf, expect_prefix ), "unexpected data \"%s\"\n", buf); + } +} + +static const struct notification close_request_test[] = +{ + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, NF_SIGNAL } +}; + +static const struct notification close_allow_connection_close_request_test[] = +{ + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, NF_ALLOW }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, NF_ALLOW }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, NF_SIGNAL } +}; + +static void close_request(struct test_request *req, struct info *info, BOOL allow_closing_connection) +{ + BOOL ret; + + if (allow_closing_connection) + { + info->test = close_allow_connection_close_request_test; + info->count = sizeof(close_allow_connection_close_request_test)/sizeof(*close_allow_connection_close_request_test); + } + else + { + info->test = close_request_test; + info->count = sizeof(close_request_test)/sizeof(*close_request_test); + } + info->index = 0; + setup_test( info, winhttp_close_handle, __LINE__ ); + + ret = WinHttpCloseHandle( req->request ); + ok(ret, "WinHttpCloseHandle failed: %u\n", GetLastError()); + ret = WinHttpCloseHandle( req->connection ); + ok(ret, "WinHttpCloseHandle failed: %u\n", GetLastError()); + ret = WinHttpCloseHandle( req->session ); + ok(ret, "WinHttpCloseHandle failed: %u\n", GetLastError()); + + WaitForSingleObject( info->wait, INFINITE ); + end_test( info, __LINE__ ); +} + +static const struct notification read_test[] = +{ + { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NF_ALLOW }, + { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, NF_ALLOW }, + { winhttp_read_data, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, NF_SIGNAL } +}; + +static const struct notification read_allow_close_test[] = +{ + { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, NF_ALLOW }, + { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, NF_ALLOW }, + { winhttp_read_data, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, NF_ALLOW }, + { winhttp_read_data, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, NF_ALLOW }, + { winhttp_read_data, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, NF_SIGNAL } +}; + +#define read_request_data(a,b,c,d) _read_request_data(a,b,c,d,__LINE__) +static void _read_request_data(struct test_request *req, struct info *info, const char *expected_data, BOOL closing_connection, unsigned line) +{ + char buffer[1024]; + DWORD read, len; + BOOL ret; + + if (closing_connection) + { + info->test = read_allow_close_test; + info->count = sizeof(read_allow_close_test)/sizeof(*read_allow_close_test); + } + else + { + info->test = read_test; + info->count = sizeof(read_test)/sizeof(*read_test); + } + info->index = 0; + + setup_test( info, winhttp_read_data, line ); + memset(buffer, '?', sizeof(buffer)); + read = 0xdeadbeef; + ret = WinHttpReadData( req->request, buffer, sizeof(buffer), &read ); + ok(ret, "failed to read data %u\n", GetLastError()); + + WaitForSingleObject( info->wait, INFINITE ); + + len = strlen(expected_data); + ok(!memcmp(buffer, expected_data, len), "unexpeceted data\n"); +} + +static void test_persistent_connection(int port) +{ + struct test_request req; + struct info info; + + static const WCHAR testW[] = {'/','t','e','s','t',0}; + + trace("Testing persistent connection...\n"); + + info.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); + + open_socket_request( port, &req, &info ); + server_send_reply( &req, &info, + "HTTP/1.1 200 OK\r\n" + "Server: winetest\r\n" + "Connection: keep-alive\r\n" + "Content-Length: 1\r\n" + "\r\n" + "X" ); + read_request_data( &req, &info, "X", FALSE ); + close_request( &req, &info, FALSE ); + + /* chunked connection test */ + open_async_request( port, &req, &info, testW, TRUE ); + server_read_data( "GET /test HTTP/1.1\r\n" ); + server_send_reply( &req, &info, + "HTTP/1.1 200 OK\r\n" + "Server: winetest\r\n" + "Transfer-Encoding: chunked\r\n" + "Connection: keep-alive\r\n" + "\r\n" + "9\r\n123456789\r\n" + "0\r\n\r\n" ); + read_request_data( &req, &info, "123456789", FALSE ); + close_request( &req, &info, FALSE ); + + /* HTTP/1.1 connections are persistent by default, no additional header is needed */ + open_async_request( port, &req, &info, testW, TRUE ); + server_read_data( "GET /test HTTP/1.1\r\n" ); + server_send_reply( &req, &info, + "HTTP/1.1 200 OK\r\n" + "Server: winetest\r\n" + "Content-Length: 2\r\n" + "\r\n" + "xx" ); + read_request_data( &req, &info, "xx", FALSE ); + close_request( &req, &info, FALSE ); + + open_async_request( port, &req, &info, testW, TRUE ); + server_read_data( "GET /test HTTP/1.1\r\n" ); + server_send_reply( &req, &info, + "HTTP/1.1 200 OK\r\n" + "Server: winetest\r\n" + "Content-Length: 2\r\n" + "Connection: close\r\n" + "\r\n" + "yy" ); + close_request( &req, &info, TRUE ); + + SetEvent( server_socket_done ); + CloseHandle( info.wait ); } START_TEST (notification) { + static const WCHAR quitW[] = {'/','q','u','i','t',0}; + struct server_info si; + HANDLE thread; + DWORD ret; + test_connection_cache(); test_redirect(); - Sleep(2000); /* make sure previous connection is evicted from cache */ test_async(); -} + + si.event = CreateEventW( NULL, 0, 0, NULL ); + si.port = 7533; + + thread = CreateThread( NULL, 0, server_thread, (LPVOID)&si, 0, NULL ); + ok(thread != NULL, "failed to create thread %u\n", GetLastError()); + + server_socket_available = CreateEventW( NULL, 0, 0, NULL ); + server_socket_done = CreateEventW( NULL, 0, 0, NULL ); + + ret = WaitForSingleObject( si.event, 10000 ); + ok(ret == WAIT_OBJECT_0, "failed to start winhttp test server %u\n", GetLastError()); + if (ret != WAIT_OBJECT_0) + return; + + test_persistent_connection( si.port ); + + /* send the basic request again to shutdown the server thread */ + test_basic_request( si.port, NULL, quitW ); + + WaitForSingleObject( thread, 3000 ); + CloseHandle( thread ); + CloseHandle( server_socket_available ); + CloseHandle( server_socket_done ); +}

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs