April 2011 - Wine-Commits - list.winehq.org

Christian Inci : crypt32: Fix a string test.
by Alexandre Julliard April 11, 2011

April 11, 2011

Module: wine Branch: master Commit: a0207c88a7668e07b2b69ce951393422209e59fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0207c88a7668e07b2b69ce95… Author: Christian Inci <chris.pcguy.inci(a)gmail.com> Date: Sat Apr 9 21:34:47 2011 +0200 crypt32: Fix a string test. --- dlls/crypt32/str.c | 5 ++++- dlls/crypt32/tests/str.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index ae90eb0..24f7c55 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -1074,7 +1074,8 @@ BOOL WINAPI CertStrToNameW(DWORD dwCertEncodingType, LPCWSTR pszX500, static const WCHAR commaSep[] = { ',',0 }; static const WCHAR semiSep[] = { ';',0 }; static const WCHAR crlfSep[] = { '\r','\n',0 }; - static const WCHAR allSeps[] = { ',',';','\r','\n',0 }; + static const WCHAR allSepsWithoutPlus[] = { ',',';','\r','\n',0 }; + static const WCHAR allSeps[] = { '+',',',';','\r','\n',0 }; LPCWSTR sep; str++; @@ -1084,6 +1085,8 @@ BOOL WINAPI CertStrToNameW(DWORD dwCertEncodingType, LPCWSTR pszX500, sep = semiSep; else if (dwStrType & CERT_NAME_STR_CRLF_FLAG) sep = crlfSep; + else if (dwStrType & CERT_NAME_STR_NO_PLUS_FLAG) + sep = allSepsWithoutPlus; else sep = allSeps; ret = CRYPT_GetNextValueW(str, dwStrType, sep, &token, diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index 1846ec6..4d69e5c 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -800,8 +800,36 @@ static void test_CertStrToNameA(void) "Expected CRYPT_E_INVALID_X500_STRING, got %08x\n", GetLastError()); ret = pCertStrToNameA(X509_ASN_ENCODING, "CN=1+2", 0, NULL, buf, &size, NULL); - todo_wine ok(!ret && GetLastError() == CRYPT_E_INVALID_X500_STRING, + ok(!ret && GetLastError() == CRYPT_E_INVALID_X500_STRING, "Expected CRYPT_E_INVALID_X500_STRING, got %08x\n", GetLastError()); + ret = pCertStrToNameA(X509_ASN_ENCODING, "CN=1+2", CERT_NAME_STR_NO_PLUS_FLAG, NULL, buf, + &size, NULL); + ok(ret && GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got %08x\n", GetLastError()); + ret = pCertStrToNameA(X509_ASN_ENCODING, "CN=1,2", CERT_NAME_STR_NO_QUOTING_FLAG, NULL, buf, + &size, NULL); + ok(!ret && GetLastError() == CRYPT_E_INVALID_X500_STRING, + "Expected CRYPT_E_INVALID_X500_STRING, got %08x\n", GetLastError()); + ret = pCertStrToNameA(X509_ASN_ENCODING, "CN=\"1,2;3,4\"", CERT_NAME_STR_NO_QUOTING_FLAG, NULL, buf, + &size, NULL); + ok(!ret && GetLastError() == CRYPT_E_INVALID_X500_STRING, + "Expected CRYPT_E_INVALID_X500_STRING, got %08x\n", GetLastError()); + ret = pCertStrToNameA(X509_ASN_ENCODING, "CN=abc", 0, NULL, buf, + &size, NULL); + ok(ret && GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got %08x\n", GetLastError()); + ret = pCertStrToNameA(X509_ASN_ENCODING, "CN=abc", CERT_NAME_STR_NO_QUOTING_FLAG, NULL, buf, + &size, NULL); + ok(ret && GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got %08x\n", GetLastError()); + ret = pCertStrToNameA(X509_ASN_ENCODING, "CN=\"abc\"", 0, NULL, buf, + &size, NULL); + ok(ret && GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got %08x\n", GetLastError()); + ret = pCertStrToNameA(X509_ASN_ENCODING, "CN=\"abc\"", CERT_NAME_STR_NO_QUOTING_FLAG, NULL, buf, + &size, NULL); + todo_wine ok(!ret && GetLastError() == ERROR_MORE_DATA, + "Expected ERROR_MORE_DATA, got %08x\n", GetLastError()); for (i = 0; i < sizeof(namesA) / sizeof(namesA[0]); i++) { size = sizeof(buf);

1 0

Vincent Povirk : windowscodecs: Add test for multi-frame TIFF encoding.
by Alexandre Julliard April 11, 2011

April 11, 2011

Module: wine Branch: master Commit: 974e875309d1ae90778c3ceaf0bfbc83d0dc4547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=974e875309d1ae90778c3ceaf… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 29 15:55:36 2011 -0500 windowscodecs: Add test for multi-frame TIFF encoding. --- dlls/windowscodecs/tests/converter.c | 96 +++++++++++++++++++++++---------- 1 files changed, 67 insertions(+), 29 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 1fd7afc..de44709 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -361,8 +361,8 @@ static void test_default_converter(void) DeleteTestBitmap(src_obj); } -static void test_encoder(const struct bitmap_data *src, const CLSID* clsid_encoder, - const struct bitmap_data *dst, const CLSID *clsid_decoder, const char *name) +static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* clsid_encoder, + const struct bitmap_data **dsts, const CLSID *clsid_decoder, const char *name) { HRESULT hr; IWICBitmapEncoder *encoder; @@ -374,8 +374,7 @@ static void test_encoder(const struct bitmap_data *src, const CLSID* clsid_encod IWICBitmapDecoder *decoder; IWICBitmapFrameDecode *framedecode; WICPixelFormatGUID pixelformat; - - CreateTestBitmap(src, &src_obj); + int i; hr = CoCreateInstance(clsid_encoder, NULL, CLSCTX_INPROC_SERVER, &IID_IWICBitmapEncoder, (void**)&encoder); @@ -395,32 +394,45 @@ static void test_encoder(const struct bitmap_data *src, const CLSID* clsid_encod hr = IWICBitmapEncoder_Initialize(encoder, stream, WICBitmapEncoderNoCache); ok(SUCCEEDED(hr), "Initialize failed, hr=%x\n", hr); - hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frameencode, &options); - ok(SUCCEEDED(hr), "CreateFrame failed, hr=%x\n", hr); - if (SUCCEEDED(hr)) + i=0; + while (SUCCEEDED(hr) && srcs[i]) { - hr = IWICBitmapFrameEncode_Initialize(frameencode, options); - ok(SUCCEEDED(hr), "Initialize failed, hr=%x\n", hr); + CreateTestBitmap(srcs[i], &src_obj); + + hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frameencode, &options); + ok(SUCCEEDED(hr), "CreateFrame failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapFrameEncode_Initialize(frameencode, options); + ok(SUCCEEDED(hr), "Initialize failed, hr=%x\n", hr); - memcpy(&pixelformat, src->format, sizeof(GUID)); - hr = IWICBitmapFrameEncode_SetPixelFormat(frameencode, &pixelformat); - ok(SUCCEEDED(hr), "SetPixelFormat failed, hr=%x\n", hr); - ok(IsEqualGUID(&pixelformat, src->format), "SetPixelFormat changed the format\n"); + memcpy(&pixelformat, srcs[i]->format, sizeof(GUID)); + hr = IWICBitmapFrameEncode_SetPixelFormat(frameencode, &pixelformat); + ok(SUCCEEDED(hr), "SetPixelFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&pixelformat, srcs[i]->format), "SetPixelFormat changed the format\n"); - hr = IWICBitmapFrameEncode_SetSize(frameencode, src->width, src->height); - ok(SUCCEEDED(hr), "SetSize failed, hr=%x\n", hr); + hr = IWICBitmapFrameEncode_SetSize(frameencode, srcs[i]->width, srcs[i]->height); + ok(SUCCEEDED(hr), "SetSize failed, hr=%x\n", hr); - hr = IWICBitmapFrameEncode_WriteSource(frameencode, &src_obj->IWICBitmapSource_iface, NULL); - ok(SUCCEEDED(hr), "WriteSource failed, hr=%x\n", hr); + hr = IWICBitmapFrameEncode_WriteSource(frameencode, &src_obj->IWICBitmapSource_iface, NULL); + ok(SUCCEEDED(hr), "WriteSource failed, hr=%x\n", hr); - hr = IWICBitmapFrameEncode_Commit(frameencode); - ok(SUCCEEDED(hr), "Commit failed, hr=%x\n", hr); + hr = IWICBitmapFrameEncode_Commit(frameencode); + ok(SUCCEEDED(hr), "Commit failed, hr=%x\n", hr); + + IWICBitmapFrameEncode_Release(frameencode); + IPropertyBag2_Release(options); + } + DeleteTestBitmap(src_obj); + + i++; + } + + if (SUCCEEDED(hr)) + { hr = IWICBitmapEncoder_Commit(encoder); ok(SUCCEEDED(hr), "Commit failed, hr=%x\n", hr); - - IWICBitmapFrameEncode_Release(frameencode); - IPropertyBag2_Release(options); } if (SUCCEEDED(hr)) @@ -435,14 +447,20 @@ static void test_encoder(const struct bitmap_data *src, const CLSID* clsid_encod hr = IWICBitmapDecoder_Initialize(decoder, stream, WICDecodeMetadataCacheOnDemand); ok(SUCCEEDED(hr), "Initialize failed, hr=%x\n", hr); - hr = IWICBitmapDecoder_GetFrame(decoder, 0, &framedecode); - ok(SUCCEEDED(hr), "GetFrame failed, hr=%x\n", hr); - - if (SUCCEEDED(hr)) + i=0; + while (SUCCEEDED(hr) && dsts[i]) { - compare_bitmap_data(dst, (IWICBitmapSource*)framedecode, name); + hr = IWICBitmapDecoder_GetFrame(decoder, i, &framedecode); + ok(SUCCEEDED(hr), "GetFrame failed, hr=%x\n", hr); - IWICBitmapFrameDecode_Release(framedecode); + if (SUCCEEDED(hr)) + { + compare_bitmap_data(dsts[i], (IWICBitmapSource*)framedecode, name); + + IWICBitmapFrameDecode_Release(framedecode); + } + + i++; } IWICBitmapDecoder_Release(decoder); @@ -453,10 +471,27 @@ static void test_encoder(const struct bitmap_data *src, const CLSID* clsid_encod IWICBitmapEncoder_Release(encoder); } +} - DeleteTestBitmap(src_obj); +static void test_encoder(const struct bitmap_data *src, const CLSID* clsid_encoder, + const struct bitmap_data *dst, const CLSID *clsid_decoder, const char *name) +{ + const struct bitmap_data *srcs[2]; + const struct bitmap_data *dsts[2]; + + srcs[0] = src; + srcs[1] = NULL; + dsts[0] = dst; + dsts[1] = NULL; + + test_multi_encoder(srcs, clsid_encoder, dsts, clsid_decoder, name); } +static const struct bitmap_data *multiple_frames[3] = { + &testdata_24bppBGR, + &testdata_24bppBGR, + NULL}; + START_TEST(converter) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -476,5 +511,8 @@ START_TEST(converter) test_encoder(&testdata_24bppBGR, &CLSID_WICTiffEncoder, &testdata_24bppBGR, &CLSID_WICTiffDecoder, "TIFF encoder 24bppBGR"); + test_multi_encoder(multiple_frames, &CLSID_WICTiffEncoder, + multiple_frames, &CLSID_WICTiffDecoder, "TIFF encoder multi-frame"); + CoUninitialize(); }

1 0

Vincent Povirk : gdiplus: Add support for encoding TIFF images.
by Alexandre Julliard April 11, 2011

April 11, 2011

Module: wine Branch: master Commit: 1544640763062e0ad8617fbdf2e1ff99771b78b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1544640763062e0ad8617fbdf… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 5 16:48:55 2011 -0500 gdiplus: Add support for encoding TIFF images. --- dlls/gdiplus/image.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 35ebd29..c0ea4a4 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3085,6 +3085,12 @@ static GpStatus encode_image_BMP(GpImage *image, IStream* stream, return encode_image_WIC(image, stream, &CLSID_WICBmpEncoder, params); } +static GpStatus encode_image_tiff(GpImage *image, IStream* stream, + GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) +{ + return encode_image_WIC(image, stream, &CLSID_WICTiffEncoder, params); +} + static GpStatus encode_image_png(GpImage *image, IStream* stream, GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) { @@ -3303,14 +3309,14 @@ static const struct image_codec codecs[NUM_CODECS] = { /* FormatDescription */ tiff_format, /* FilenameExtension */ tiff_extension, /* MimeType */ tiff_mimetype, - /* Flags */ ImageCodecFlagsDecoder | ImageCodecFlagsSupportBitmap | ImageCodecFlagsBuiltin, + /* Flags */ ImageCodecFlagsDecoder | ImageCodecFlagsEncoder | ImageCodecFlagsSupportBitmap | ImageCodecFlagsBuiltin, /* Version */ 1, /* SigCount */ 2, /* SigSize */ 4, /* SigPattern */ tiff_sig_pattern, /* SigMask */ tiff_sig_mask, }, - NULL, + encode_image_tiff, decode_image_tiff }, {

1 0

Vincent Povirk : windowscodecs: Implement TiffEncoder_Commit.
by Alexandre Julliard April 11, 2011

April 11, 2011

Module: wine Branch: master Commit: 0b75067c029862aa8163ec68d20a4013949c14ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b75067c029862aa8163ec68d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 5 16:27:28 2011 -0500 windowscodecs: Implement TiffEncoder_Commit. --- dlls/windowscodecs/tiffformat.c | 34 ++++++++++++++++++++++++++++++---- 1 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index d2d9d45..5bce3ad 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1151,6 +1151,7 @@ typedef struct TiffEncoder { CRITICAL_SECTION lock; /* Must be held when tiff is used or fields below are set */ TIFF *tiff; BOOL initialized; + BOOL committed; ULONG num_frames; ULONG num_frames_committed; } TiffEncoder; @@ -1623,7 +1624,7 @@ static HRESULT WINAPI TiffEncoder_Initialize(IWICBitmapEncoder *iface, EnterCriticalSection(&This->lock); - if (This->initialized) + if (This->initialized || This->committed) { hr = WINCODEC_ERR_WRONGSTATE; goto exit; @@ -1698,7 +1699,11 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, EnterCriticalSection(&This->lock); - if (This->num_frames != This->num_frames_committed) + if (!This->initialized || This->committed) + { + hr = WINCODEC_ERR_WRONGSTATE; + } + else if (This->num_frames != This->num_frames_committed) { FIXME("New frame created before previous frame was committed\n"); hr = E_FAIL; @@ -1753,8 +1758,28 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, static HRESULT WINAPI TiffEncoder_Commit(IWICBitmapEncoder *iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + TiffEncoder *This = impl_from_IWICBitmapEncoder(iface); + + TRACE("(%p)\n", iface); + + EnterCriticalSection(&This->lock); + + if (!This->initialized || This->committed) + { + LeaveCriticalSection(&This->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + pTIFFClose(This->tiff); + IStream_Release(This->stream); + This->stream = NULL; + This->tiff = NULL; + + This->committed = TRUE; + + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI TiffEncoder_GetMetadataQueryWriter(IWICBitmapEncoder *iface, @@ -1809,6 +1834,7 @@ HRESULT TiffEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->initialized = FALSE; This->num_frames = 0; This->num_frames_committed = 0; + This->committed = FALSE; ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); IUnknown_Release((IUnknown*)This);

1 0

Vincent Povirk : windowscodecs: Add test for TIFF encoder.
by Alexandre Julliard April 11, 2011

April 11, 2011

Module: wine Branch: master Commit: 0a5b513d8099ded1406438ff13c28fb5011e8056 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a5b513d8099ded1406438ff1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 29 14:56:21 2011 -0500 windowscodecs: Add test for TIFF encoder. --- dlls/windowscodecs/tests/converter.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 969dc16..1fd7afc 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -473,5 +473,8 @@ START_TEST(converter) test_encoder(&testdata_24bppBGR, &CLSID_WICPngEncoder, &testdata_24bppBGR, &CLSID_WICPngDecoder, "PNG encoder 24bppBGR"); + test_encoder(&testdata_24bppBGR, &CLSID_WICTiffEncoder, + &testdata_24bppBGR, &CLSID_WICTiffDecoder, "TIFF encoder 24bppBGR"); + CoUninitialize(); }

1 0

Vincent Povirk : windowscodecs: Implement TiffFrameEncode_Commit.
by Alexandre Julliard April 11, 2011

April 11, 2011

Module: wine Branch: master Commit: e4986fc994074aa8bf74bb341012b232ae3bef57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4986fc994074aa8bf74bb341… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 5 16:06:54 2011 -0500 windowscodecs: Implement TiffFrameEncode_Commit. --- dlls/windowscodecs/tiffformat.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 78b3146..d2d9d45 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1167,6 +1167,7 @@ typedef struct TiffFrameEncode { /* fields below are protected by parent->lock */ BOOL initialized; BOOL info_written; + BOOL committed; const struct tiff_encode_format *format; UINT width, height; double xres, yres; @@ -1513,8 +1514,26 @@ static HRESULT WINAPI TiffFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, static HRESULT WINAPI TiffFrameEncode_Commit(IWICBitmapFrameEncode *iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + + TRACE("(%p)\n", iface); + + EnterCriticalSection(&This->parent->lock); + + if (!This->info_written || This->lines_written != This->height || This->committed) + { + LeaveCriticalSection(&This->parent->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + /* libtiff will commit the data when creating a new frame or closing the file */ + + This->committed = TRUE; + This->parent->num_frames_committed++; + + LeaveCriticalSection(&This->parent->lock); + + return S_OK; } static HRESULT WINAPI TiffFrameEncode_GetMetadataQueryWriter(IWICBitmapFrameEncode *iface, @@ -1701,6 +1720,7 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, result->parent = This; result->initialized = FALSE; result->info_written = FALSE; + result->committed = FALSE; result->format = NULL; result->width = 0; result->height = 0;

1 0

Michael Curran : d3dxof: Changed is_string function to accept spaces.
by Alexandre Julliard April 11, 2011

April 11, 2011

Module: wine Branch: master Commit: 7d5099e4fc221d2a309605ecc95d66e685d193a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d5099e4fc221d2a309605ecc… Author: Michael Curran <curran.michaelp(a)gmail.com> Date: Sun Apr 10 16:31:45 2011 -0400 d3dxof: Changed is_string function to accept spaces. --- dlls/d3dxof/parsing.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index dcef96b..0acb7d6 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -475,7 +475,7 @@ static BOOL is_string(parse_buffer* buf) if (*buf->buffer != '"') return FALSE; - while (!is_separator(c = *(buf->buffer+pos+1)) && (pos < 99)) + while (!is_operator(c = *(buf->buffer+pos+1)) && (pos < 99)) { if (c == '"') {

1 0

Thomas Mullaly : urlmon/tests: Added FeatureControl registry key tests.
by Alexandre Julliard April 11, 2011

April 11, 2011

Module: wine Branch: master Commit: 985aebd59ed02cd8ed35d60a77c690d8fc6294fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=985aebd59ed02cd8ed35d60a7… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Thu Apr 7 12:35:28 2011 -0400 urlmon/tests: Added FeatureControl registry key tests. --- dlls/urlmon/tests/misc.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/urlmon.spec | 1 + 2 files changed, 112 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 4811ab0..bc0f40b 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -77,6 +77,7 @@ static HRESULT (WINAPI *pUrlMkGetSessionOption)(DWORD, LPVOID, DWORD, DWORD *, D static HRESULT (WINAPI *pCompareSecurityIds)(BYTE*,DWORD,BYTE*,DWORD,DWORD); static HRESULT (WINAPI *pCoInternetIsFeatureEnabled)(INTERNETFEATURELIST,DWORD); static HRESULT (WINAPI *pCoInternetSetFeatureEnabled)(INTERNETFEATURELIST,DWORD,BOOL); +static HRESULT (WINAPI *pIEInstallScope)(DWORD*); static void test_CreateFormatEnum(void) { @@ -1476,6 +1477,114 @@ static void test_IsValidURL(void) IBindCtx_Release(bctx); } +/* With older versions of IE (IE 7 and earlier), urlmon caches + * the FeatureControl values from the registry when it's loaded + * into memory. Newer versions of IE conditionally cache the + * the FeatureControl registry values (i.e. When a call to + * CoInternetIsFeatureEnabled and a corresponding CoInternetSetFeatureEnabled + * call hasn't already been made for the specified Feature). Because of + * this we skip these tests on IE 7 and earlier. + */ +static void test_internet_features_registry(void) { + HRESULT hres; + DWORD res; + char module[MAX_PATH]; + char *name; + HKEY feature_control; + HKEY feature; + DWORD value; + BOOL delete_feature_key = TRUE; + BOOL delete_feature_control_key = FALSE; + + static const char* szFeatureControlKey = "Software\\Microsoft\\Internet Explorer\\Main\\FeatureControl"; + static const char* szFeatureBehaviorsKey = "FEATURE_BEHAVIORS"; + static const char* szFeatureZoneElevationKey = "FEATURE_ZONE_ELEVATION"; + + if(!pIEInstallScope) { + win_skip("Skipping internet feature registry tests, IE is too old...\n"); + return; + } + + res = GetModuleFileNameA(NULL, module, sizeof(module)); + ok(res, "GetModuleFileName failed: %d\n", GetLastError()); + + name = strrchr(module, '\\')+1; + + /* Some Windows machines don't have a FeatureControl key in HKCU. */ + res = RegOpenKeyA(HKEY_CURRENT_USER, szFeatureControlKey, &feature_control); + if(res != ERROR_SUCCESS) { + res = RegCreateKeyA(HKEY_CURRENT_USER, szFeatureControlKey, &feature_control); + ok(res == ERROR_SUCCESS, "RegCreateKey failed: %d\n", res); + delete_feature_control_key = TRUE; + } + + res = RegOpenKeyA(feature_control, szFeatureBehaviorsKey, &feature); + if(res == ERROR_SUCCESS) + /* FEATURE_BEHAVIORS already existed, so don't delete it when we're done. */ + delete_feature_key = FALSE; + else { + res = RegCreateKeyA(feature_control, szFeatureBehaviorsKey, &feature); + ok(res == ERROR_SUCCESS, "RegCreateKey failed: %d\n", res); + } + + value = 0; + res = RegSetValueExA(feature, name, 0, REG_DWORD, (BYTE*)&value, sizeof(DWORD)); + ok(res == ERROR_SUCCESS, "RegSetValueEx failed: %d\n", res); + + hres = pCoInternetIsFeatureEnabled(FEATURE_BEHAVIORS, GET_FEATURE_FROM_PROCESS); + todo_wine + ok(hres == S_FALSE, "CoInternetIsFeatureEnabled returned %08x, expected S_FALSE\n", hres); + + if(delete_feature_key) { + RegCloseKey(feature); + RegDeleteKeyA(feature_control, szFeatureBehaviorsKey); + } else { + RegDeleteValue(feature, name); + RegCloseKey(feature); + } + + /* IE's feature control cached the value it got from the registry earlier. */ + hres = pCoInternetIsFeatureEnabled(FEATURE_BEHAVIORS, GET_FEATURE_FROM_PROCESS); + todo_wine + ok(hres == S_FALSE, "CoInternetIsFeatureEnabled returned %08x, expected S_FALSE\n", hres); + + /* Restore this feature back to its default value. */ + hres = pCoInternetSetFeatureEnabled(FEATURE_BEHAVIORS, SET_FEATURE_ON_PROCESS, TRUE); + todo_wine + ok(hres == S_OK, "CoInternetSetFeatureEnabled failed: %08x\n", hres); + + RegCloseKey(feature_control); + if(delete_feature_control_key) + RegDeleteKeyA(HKEY_CURRENT_USER, szFeatureControlKey); + + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, szFeatureControlKey, &feature_control); + ok(res == ERROR_SUCCESS, "RegOpenKey failed: %d\n", res); + + res = RegOpenKeyA(feature_control, szFeatureZoneElevationKey, &feature); + ok(res == ERROR_SUCCESS, "RegOpenKey failed: %d\n", res); + + value = 1; + res = RegSetValueExA(feature, "*", 0, REG_DWORD, (BYTE*)&value, sizeof(DWORD)); + ok(res == ERROR_SUCCESS, "RegSetValueEx failed: %d\n", res); + + hres = pCoInternetIsFeatureEnabled(FEATURE_ZONE_ELEVATION, GET_FEATURE_FROM_PROCESS); + todo_wine + ok(hres == S_OK, "CoInternetIsFeatureEnabled returned %08x, expected S_OK\n", hres); + + RegDeleteValueA(feature, "*"); + RegCloseKey(feature); + RegCloseKey(feature_control); + + /* Value is still cached from last time. */ + hres = pCoInternetIsFeatureEnabled(FEATURE_ZONE_ELEVATION, GET_FEATURE_FROM_PROCESS); + todo_wine + ok(hres == S_OK, "CoInternetIsFeatureEnabled returned %08x, expected S_OK\n", hres); + + hres = pCoInternetSetFeatureEnabled(FEATURE_ZONE_ELEVATION, SET_FEATURE_ON_PROCESS, FALSE); + todo_wine + ok(hres == S_OK, "CoInternetSetFeatureEnabled failed: %08x\n", hres); +} + static const struct { INTERNETFEATURELIST feature; DWORD get_flags; @@ -1592,6 +1701,7 @@ static void test_internet_features(void) { return; } + test_internet_features_registry(); test_CoInternetIsFeatureEnabled(); test_CoInternetSetFeatureEnabled(); } @@ -1614,6 +1724,7 @@ START_TEST(misc) pCompareSecurityIds = (void*) GetProcAddress(hurlmon, "CompareSecurityIds"); pCoInternetIsFeatureEnabled = (void*) GetProcAddress(hurlmon, "CoInternetIsFeatureEnabled"); pCoInternetSetFeatureEnabled = (void*) GetProcAddress(hurlmon, "CoInternetSetFeatureEnabled"); + pIEInstallScope = (void*) GetProcAddress(hurlmon, "IEInstallScope"); if (!pCoInternetCompareUrl || !pCoInternetGetSecurityUrl || !pCoInternetGetSession || !pCoInternetParseUrl || !pCompareSecurityIds) { diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index a2081ed..58b3f33 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -58,6 +58,7 @@ @ stdcall HlinkNavigateString(ptr wstr) @ stdcall HlinkSimpleNavigateToMoniker(ptr wstr wstr ptr ptr ptr long long) @ stdcall HlinkSimpleNavigateToString(wstr wstr wstr ptr ptr ptr long long) +@ stub IEInstallScope @ stdcall IsAsyncMoniker(ptr) @ stdcall IsLoggingEnabledA(str) @ stdcall IsLoggingEnabledW(wstr)

1 0

Thomas Mullaly : urlmon/tests: Added tests for CoInternetSetFeatureEnabled.
by Alexandre Julliard April 11, 2011

April 11, 2011

Module: wine Branch: master Commit: b83967ce6b5d98a2df61cd573f16f8cca1055f7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b83967ce6b5d98a2df61cd573… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Wed Apr 6 19:37:19 2011 -0400 urlmon/tests: Added tests for CoInternetSetFeatureEnabled. --- dlls/urlmon/tests/misc.c | 52 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 51 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 446721a..4811ab0 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -76,6 +76,7 @@ static HRESULT (WINAPI *pReleaseBindInfo)(BINDINFO*); static HRESULT (WINAPI *pUrlMkGetSessionOption)(DWORD, LPVOID, DWORD, DWORD *, DWORD); static HRESULT (WINAPI *pCompareSecurityIds)(BYTE*,DWORD,BYTE*,DWORD,DWORD); static HRESULT (WINAPI *pCoInternetIsFeatureEnabled)(INTERNETFEATURELIST,DWORD); +static HRESULT (WINAPI *pCoInternetSetFeatureEnabled)(INTERNETFEATURELIST,DWORD,BOOL); static void test_CreateFormatEnum(void) { @@ -1538,13 +1539,61 @@ static void test_CoInternetIsFeatureEnabled(void) { ok(hres == E_FAIL, "CoInternetIsFeatureEnabled returned %08x, expected E_FAIL\n", hres); } +static const struct { + INTERNETFEATURELIST feature; + DWORD set_flags; + BOOL enable; + HRESULT set_expected; + BOOL set_todo; + DWORD get_flags; + HRESULT get_expected; + BOOL get_todo; +} internet_feature_tests[] = { + {FEATURE_OBJECT_CACHING,SET_FEATURE_ON_PROCESS,FALSE,S_OK,TRUE,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_WEBOC_POPUPMANAGEMENT,SET_FEATURE_ON_PROCESS,TRUE,S_OK,TRUE,GET_FEATURE_FROM_PROCESS,S_OK,TRUE}, + {FEATURE_LOCALMACHINE_LOCKDOWN,SET_FEATURE_ON_PROCESS,TRUE,S_OK,TRUE,GET_FEATURE_FROM_PROCESS,S_OK,TRUE} +}; + +static void test_CoInternetSetFeatureEnabled(void) { + HRESULT hres; + DWORD i; + + hres = pCoInternetSetFeatureEnabled(FEATURE_ENTRY_COUNT,SET_FEATURE_ON_PROCESS,TRUE); + todo_wine + ok(hres == E_FAIL, "CoInternetSetFeatureEnabled returned %08x, expected E_FAIL\n", hres); + + for(i = 0; i < sizeof(internet_feature_tests)/sizeof(internet_feature_tests[0]); ++i) { + hres = pCoInternetSetFeatureEnabled(internet_feature_tests[i].feature, internet_feature_tests[i].set_flags, + internet_feature_tests[i].enable); + if(internet_feature_tests[i].set_todo) { + todo_wine + ok(hres == internet_feature_tests[i].set_expected, "CoInternetSetFeatureEnabled returned %08x, expected %08x on test %d\n", + hres, internet_feature_tests[i].set_expected, i); + } else { + ok(hres == internet_feature_tests[i].set_expected, "CoInternetSetFeatureEnabled returned %08x, expected %08x on test %d\n", + hres, internet_feature_tests[i].set_expected, i); + } + + hres = pCoInternetIsFeatureEnabled(internet_feature_tests[i].feature, internet_feature_tests[i].set_flags); + if(internet_feature_tests[i].get_todo) { + todo_wine + ok(hres == internet_feature_tests[i].get_expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", + hres, internet_feature_tests[i].get_expected, i); + } else { + ok(hres == internet_feature_tests[i].get_expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", + hres, internet_feature_tests[i].get_expected, i); + } + } +} + static void test_internet_features(void) { - if(!pCoInternetIsFeatureEnabled) { + if(!pCoInternetIsFeatureEnabled || !pCoInternetSetFeatureEnabled) { win_skip("Skipping internet feature tests, IE is too old\n"); return; } test_CoInternetIsFeatureEnabled(); + test_CoInternetSetFeatureEnabled(); } START_TEST(misc) @@ -1564,6 +1613,7 @@ START_TEST(misc) pUrlMkGetSessionOption = (void*) GetProcAddress(hurlmon, "UrlMkGetSessionOption"); pCompareSecurityIds = (void*) GetProcAddress(hurlmon, "CompareSecurityIds"); pCoInternetIsFeatureEnabled = (void*) GetProcAddress(hurlmon, "CoInternetIsFeatureEnabled"); + pCoInternetSetFeatureEnabled = (void*) GetProcAddress(hurlmon, "CoInternetSetFeatureEnabled"); if (!pCoInternetCompareUrl || !pCoInternetGetSecurityUrl || !pCoInternetGetSession || !pCoInternetParseUrl || !pCompareSecurityIds) {

1 0

Michael Curran : d3dxof: Adjusted to allow for parsing of optional template elements.
by Alexandre Julliard April 11, 2011

April 11, 2011

Module: wine Branch: master Commit: 3d9ea480a0efbeabb4d2a7681390dbf279f9308f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d9ea480a0efbeabb4d2a7681… Author: Michael Curran <curran.michaelp(a)gmail.com> Date: Sun Apr 10 16:30:40 2011 -0400 d3dxof: Adjusted to allow for parsing of optional template elements. --- dlls/d3dxof/parsing.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index c45fcd0..dcef96b 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1161,7 +1161,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) } } - if (nb_elems && buf->txt && (check_TOKEN(buf) != TOKEN_CBRACE)) + if (nb_elems && buf->txt && (check_TOKEN(buf) != TOKEN_CBRACE) && (check_TOKEN(buf) != TOKEN_NAME)) { token = get_TOKEN(buf); if ((token != TOKEN_SEMICOLON) && (token != TOKEN_COMMA))

1 0