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

Christian Inci : crypt32: Fix a string test.
by Alexandre Julliard 11 Apr '11

11 Apr '11

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: Implement TiffFrameEncode_Commit.
by Alexandre Julliard 11 Apr '11

11 Apr '11

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

Vincent Povirk : windowscodecs: Implement TiffEncoder_Commit.
by Alexandre Julliard 11 Apr '11

11 Apr '11

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 : gdiplus: Add support for encoding TIFF images.
by Alexandre Julliard 11 Apr '11

11 Apr '11

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: Add test for TIFF encoder.
by Alexandre Julliard 11 Apr '11

11 Apr '11

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: Add test for multi-frame TIFF encoding.
by Alexandre Julliard 11 Apr '11

11 Apr '11

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

Jörg Höhle : winmm: DriverCallback returns TRUE iff there is notification.
by Alexandre Julliard 11 Apr '11

11 Apr '11

Module: wine Branch: master Commit: a174713f82e7cdbf833257aeb23d6ef68ef0dbec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a174713f82e7cdbf833257aeb… Author: Jörg Höhle <Joerg-Cyril.Hoehle(a)t-systems.com> Date: Mon Apr 11 14:57:30 2011 +0200 winmm: DriverCallback returns TRUE iff there is notification. --- dlls/winmm/driver.c | 25 ++++++++++++++++--------- dlls/winmm/tests/midi.c | 13 +++++++++++++ 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dlls/winmm/driver.c b/dlls/winmm/driver.c index 8620fe6..feecc92 100644 --- a/dlls/winmm/driver.c +++ b/dlls/winmm/driver.c @@ -129,7 +129,7 @@ LPWINE_DRIVER DRIVER_FindFromHDrvr(HDRVR hDrvr) static inline LRESULT DRIVER_SendMessage(LPWINE_DRIVER lpDrv, UINT msg, LPARAM lParam1, LPARAM lParam2) { - LRESULT ret = 0; + LRESULT ret; TRACE("Before call32 proc=%p drvrID=%08lx hDrv=%p wMsg=%04x p1=%08lx p2=%08lx\n", lpDrv->lpDrvProc, lpDrv->dwDriverID, lpDrv, msg, lParam1, lParam2); @@ -552,24 +552,28 @@ BOOL WINAPI DriverCallback(DWORD_PTR dwCallBack, DWORD uFlags, HDRVR hDev, DWORD wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { + BOOL ret = FALSE; TRACE("(%08lX, %s %04X, %p, %04X, %08lX, %08lX, %08lX)\n", dwCallBack, DRIVER_getCallback(uFlags), uFlags, hDev, wMsg, dwUser, dwParam1, dwParam2); + if (!dwCallBack) + return ret; switch (uFlags & DCB_TYPEMASK) { case DCB_NULL: - break; + /* Native returns FALSE = no notification, not TRUE */ + return ret; case DCB_WINDOW: - PostMessageA((HWND)dwCallBack, wMsg, (WPARAM)hDev, dwParam1); + ret = PostMessageA((HWND)dwCallBack, wMsg, (WPARAM)hDev, dwParam1); break; case DCB_TASK: /* aka DCB_THREAD */ - PostThreadMessageA(dwCallBack, wMsg, (WPARAM)hDev, dwParam1); + ret = PostThreadMessageA(dwCallBack, wMsg, (WPARAM)hDev, dwParam1); break; case DCB_FUNCTION: - if (dwCallBack) - ((LPDRVCALLBACK)dwCallBack)(hDev, wMsg, dwUser, dwParam1, dwParam2); + ((LPDRVCALLBACK)dwCallBack)(hDev, wMsg, dwUser, dwParam1, dwParam2); + ret = TRUE; break; case DCB_EVENT: - SetEvent((HANDLE)dwCallBack); + ret = SetEvent((HANDLE)dwCallBack); break; #if 0 /* FIXME: for now only usable in mmsystem.dll16 @@ -601,8 +605,11 @@ BOOL WINAPI DriverCallback(DWORD_PTR dwCallBack, DWORD uFlags, HDRVR hDev, WARN("Unknown callback type %d\n", uFlags & DCB_TYPEMASK); return FALSE; } - TRACE("Done\n"); - return TRUE; + if (ret) + TRACE("Done\n"); + else + WARN("Notification failure\n"); + return ret; } /****************************************************************** diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index e40e1d7..f02c4f0 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -325,6 +325,19 @@ static void test_midiOut_device(UINT udev, HWND hwnd) rc = midiOutClose(hm); ok(!rc, "midiOutClose rc=%s\n", mmsys_error(rc)); test_notification(hwnd, "midiOutClose", MOM_CLOSE, 0); + + rc = midiOutOpen(&hm, udev, 0, (DWORD_PTR)MYCBINST, CALLBACK_WINDOW); + ok(!rc, "midiOutOpen(dev=%d) 0 CALLBACK_WINDOW rc=%s\n", udev, mmsys_error(rc)); + /* PostMessage(hwnd=0) redirects to PostThreadMessage(GetCurrentThreadId()) + * which PeekMessage((HWND)-1) queries. */ + test_notification((HWND)-1, "midiOutOpen WINDOW->THREAD", 0, WHATEVER); + test_notification(hwnd, "midiOutOpen WINDOW", 0, WHATEVER); + if (!rc) { + rc = midiOutClose(hm); + ok(!rc, "midiOutClose rc=%s\n", mmsys_error(rc)); + test_notification((HWND)-1, "midiOutClose WINDOW->THREAD", 0, WHATEVER); + test_notification(hwnd, "midiOutClose", 0, WHATEVER); + } test_notification(hwnd, "midiOut over", 0, WHATEVER); }

1 0

Jörg Höhle : winmm: Audio drivers unconditionally invoke DriverCallback.
by Alexandre Julliard 11 Apr '11

11 Apr '11

Module: wine Branch: master Commit: 75dbd1162eb0c1fd756475cdb11522f75926f54b URL: http://source.winehq.org/git/wine.git/?a=commit;h=75dbd1162eb0c1fd756475cdb… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Mar 8 09:28:58 2011 +0100 winmm: Audio drivers unconditionally invoke DriverCallback. --- dlls/winealsa.drv/wavein.c | 7 ++----- dlls/winealsa.drv/waveout.c | 7 ++----- dlls/winecoreaudio.drv/audio.c | 20 ++++++-------------- dlls/wineoss.drv/audio.c | 18 ++++++------------ 4 files changed, 16 insertions(+), 36 deletions(-) diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index 3a2fad8..67759a6 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -74,11 +74,8 @@ static void widNotifyClient(WINE_WAVEDEV* wwi, WORD wMsg, DWORD_PTR dwParam1, DW case WIM_OPEN: case WIM_CLOSE: case WIM_DATA: - if (wwi->wFlags != DCB_NULL && - !DriverCallback(wwi->waveDesc.dwCallback, wwi->wFlags, (HDRVR)wwi->waveDesc.hWave, - wMsg, wwi->waveDesc.dwInstance, dwParam1, dwParam2)) { - WARN("can't notify client !\n"); - } + DriverCallback(wwi->waveDesc.dwCallback, wwi->wFlags, (HDRVR)wwi->waveDesc.hWave, + wMsg, wwi->waveDesc.dwInstance, dwParam1, dwParam2); break; default: FIXME("Unknown callback message %u\n", wMsg); diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 127e50e..9290778 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -75,11 +75,8 @@ static void wodNotifyClient(WINE_WAVEDEV* wwo, WORD wMsg, DWORD_PTR dwParam1, DW case WOM_OPEN: case WOM_CLOSE: case WOM_DONE: - if (wwo->wFlags != DCB_NULL && - !DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags, (HDRVR)wwo->waveDesc.hWave, - wMsg, wwo->waveDesc.dwInstance, dwParam1, dwParam2)) { - WARN("can't notify client !\n"); - } + DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags, (HDRVR)wwo->waveDesc.hWave, + wMsg, wwo->waveDesc.dwInstance, dwParam1, dwParam2); break; default: FIXME("Unknown callback message %u\n", wMsg); diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index faf4f54..43420b1 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -792,13 +792,9 @@ static void wodNotifyClient(WINE_WAVEOUT_INSTANCE* wwo, WORD wMsg, DWORD_PTR dwP case WOM_OPEN: case WOM_CLOSE: case WOM_DONE: - if (wwo->wFlags != DCB_NULL && - !DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags, - (HDRVR)wwo->waveDesc.hWave, wMsg, wwo->waveDesc.dwInstance, - dwParam1, dwParam2)) - { - WARN("can't notify client !\n"); - } + DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags, + (HDRVR)wwo->waveDesc.hWave, wMsg, wwo->waveDesc.dwInstance, + dwParam1, dwParam2); break; default: FIXME("Unknown callback message %u\n", wMsg); @@ -1752,13 +1748,9 @@ static void widNotifyClient(WINE_WAVEIN* wwi, WORD wMsg, DWORD_PTR dwParam1, DWO case WIM_OPEN: case WIM_CLOSE: case WIM_DATA: - if (wwi->wFlags != DCB_NULL && - !DriverCallback(wwi->waveDesc.dwCallback, wwi->wFlags, - (HDRVR)wwi->waveDesc.hWave, wMsg, wwi->waveDesc.dwInstance, - dwParam1, dwParam2)) - { - WARN("can't notify client !\n"); - } + DriverCallback(wwi->waveDesc.dwCallback, wwi->wFlags, + (HDRVR)wwi->waveDesc.hWave, wMsg, wwi->waveDesc.dwInstance, + dwParam1, dwParam2); break; default: FIXME("Unknown callback message %u\n", wMsg); diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c index 7e1ca43..0e27e21 100644 --- a/dlls/wineoss.drv/audio.c +++ b/dlls/wineoss.drv/audio.c @@ -1444,12 +1444,9 @@ static void wodNotifyClient(WINE_WAVEOUT* wwo, WORD wMsg, DWORD_PTR dwParam1, DW case WOM_OPEN: case WOM_CLOSE: case WOM_DONE: - if (wwo->wFlags != DCB_NULL && - !DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags, - (HDRVR)wwo->waveDesc.hWave, wMsg, - wwo->waveDesc.dwInstance, dwParam1, dwParam2)) { - WARN("can't notify client !\n"); - } + DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags, + (HDRVR)wwo->waveDesc.hWave, wMsg, + wwo->waveDesc.dwInstance, dwParam1, dwParam2); break; default: FIXME("Unknown callback message %u\n", wMsg); @@ -2478,12 +2475,9 @@ static void widNotifyClient(WINE_WAVEIN* wwi, WORD wMsg, DWORD_PTR dwParam1, DWO case WIM_OPEN: case WIM_CLOSE: case WIM_DATA: - if (wwi->wFlags != DCB_NULL && - !DriverCallback(wwi->waveDesc.dwCallback, wwi->wFlags, - (HDRVR)wwi->waveDesc.hWave, wMsg, - wwi->waveDesc.dwInstance, dwParam1, dwParam2)) { - WARN("can't notify client !\n"); - } + DriverCallback(wwi->waveDesc.dwCallback, wwi->wFlags, + (HDRVR)wwi->waveDesc.hWave, wMsg, + wwi->waveDesc.dwInstance, dwParam1, dwParam2); break; default: FIXME("Unknown callback message %u\n", wMsg);

1 0

Thomas Mullaly : include: Updated INTERNETFEATURELIST enum and flags.
by Alexandre Julliard 11 Apr '11

11 Apr '11

Module: wine Branch: master Commit: 342906d7b3fb8e13ff1ca4cd574d5437d69a4d1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=342906d7b3fb8e13ff1ca4cd5… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Tue Apr 5 23:09:18 2011 -0400 include: Updated INTERNETFEATURELIST enum and flags. --- include/urlmon.idl | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index cdcb4c8..2ea4063 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1511,13 +1511,27 @@ typedef enum _tagINTERNETFEATURELIST FEATURE_DISABLE_TELNET_PROTOCOL, FEATURE_FEEDS, FEATURE_BLOCK_INPUT_PROMPTS, - FEATURE_DOMSTORAGE, - FEATURE_XDOMAINREQUEST, - FEATURE_DATAURI, - FEATURE_AJAX_CONNECTIONSERVICES, FEATURE_ENTRY_COUNT } INTERNETFEATURELIST; +cpp_quote("#define SET_FEATURE_ON_THREAD 0x00000001") +cpp_quote("#define SET_FEATURE_ON_PROCESS 0x00000002") +cpp_quote("#define SET_FEATURE_IN_REGISTRY 0x00000004") +cpp_quote("#define SET_FEATURE_ON_THREAD_LOCALMACHINE 0x00000008") +cpp_quote("#define SET_FEATURE_ON_THREAD_INTRANET 0x00000010") +cpp_quote("#define SET_FEATURE_ON_THREAD_TRUSTED 0x00000020") +cpp_quote("#define SET_FEATURE_ON_THREAD_INTERNET 0x00000040") +cpp_quote("#define SET_FEATURE_ON_THREAD_RESTRICTED 0x00000080") + +cpp_quote("#define GET_FEATURE_FROM_THREAD 0x00000001") +cpp_quote("#define GET_FEATURE_FROM_PROCESS 0x00000002") +cpp_quote("#define GET_FEATURE_FROM_REGISTRY 0x00000004") +cpp_quote("#define GET_FEATURE_FROM_THREAD_LOCALMACHINE 0x00000008") +cpp_quote("#define GET_FEATURE_FROM_THREAD_INTRANET 0x00000010") +cpp_quote("#define GET_FEATURE_FROM_THREAD_TRUSTED 0x00000020") +cpp_quote("#define GET_FEATURE_FROM_THREAD_INTERNET 0x00000040") +cpp_quote("#define GET_FEATURE_FROM_THREAD_RESTRICTED 0x00000080") + typedef struct _tagPROTOCOLFILTERDATA { DWORD cbSize; IInternetProtocolSink *pProtocolSink;

1 0

Thomas Mullaly : urlmon/tests: Added tests for CoInternetIsFeatureEnabled.
by Alexandre Julliard 11 Apr '11

11 Apr '11

Module: wine Branch: master Commit: 99480b0dc8c55c72eec7e20065f7de2dcc69d974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99480b0dc8c55c72eec7e2006… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Tue Apr 5 23:30:53 2011 -0400 urlmon/tests: Added tests for CoInternetIsFeatureEnabled. --- dlls/urlmon/tests/misc.c | 76 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 75 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 47ab4f8..446721a 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -75,7 +75,7 @@ static HRESULT (WINAPI *pObtainUserAgentString)(DWORD, LPSTR, DWORD*); 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 void test_CreateFormatEnum(void) { @@ -1475,6 +1475,78 @@ static void test_IsValidURL(void) IBindCtx_Release(bctx); } +static const struct { + INTERNETFEATURELIST feature; + DWORD get_flags; + HRESULT expected; + BOOL todo; +} default_feature_tests[] = { + {FEATURE_OBJECT_CACHING,GET_FEATURE_FROM_PROCESS,S_OK,TRUE}, + {FEATURE_ZONE_ELEVATION,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_MIME_HANDLING,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_MIME_SNIFFING,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_WINDOW_RESTRICTIONS,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_WEBOC_POPUPMANAGEMENT,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_BEHAVIORS,GET_FEATURE_FROM_PROCESS,S_OK,TRUE}, + {FEATURE_DISABLE_MK_PROTOCOL,GET_FEATURE_FROM_PROCESS,S_OK,TRUE}, + {FEATURE_LOCALMACHINE_LOCKDOWN,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_SECURITYBAND,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_RESTRICT_ACTIVEXINSTALL,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_VALIDATE_NAVIGATE_URL,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_RESTRICT_FILEDOWNLOAD,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_ADDON_MANAGEMENT,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_PROTOCOL_LOCKDOWN,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_HTTP_USERNAME_PASSWORD_DISABLE,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_SAFE_BINDTOOBJECT,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_UNC_SAVEDFILECHECK,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_GET_URL_DOM_FILEPATH_UNENCODED,GET_FEATURE_FROM_PROCESS,S_OK,TRUE}, + {FEATURE_TABBED_BROWSING,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_SSLUX,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_DISABLE_NAVIGATION_SOUNDS,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_DISABLE_LEGACY_COMPRESSION,GET_FEATURE_FROM_PROCESS,S_OK,TRUE}, + {FEATURE_FORCE_ADDR_AND_STATUS,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_XMLHTTP,GET_FEATURE_FROM_PROCESS,S_OK,TRUE}, + {FEATURE_DISABLE_TELNET_PROTOCOL,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_FEEDS,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE}, + {FEATURE_BLOCK_INPUT_PROMPTS,GET_FEATURE_FROM_PROCESS,S_FALSE,TRUE} +}; + +static void test_internet_feature_defaults(void) { + HRESULT hres; + DWORD i; + + for(i = 0; i < sizeof(default_feature_tests)/sizeof(default_feature_tests[0]); ++i) { + hres = pCoInternetIsFeatureEnabled(default_feature_tests[i].feature, default_feature_tests[i].get_flags); + if(default_feature_tests[i].todo) { + todo_wine + ok(hres == default_feature_tests[i].expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", + hres, default_feature_tests[i].expected, i); + } else { + ok(hres == default_feature_tests[i].expected, "CoInternetIsFeatureEnabled returned %08x, expected %08x on test %d\n", + hres, default_feature_tests[i].expected, i); + } + } +} + +static void test_CoInternetIsFeatureEnabled(void) { + HRESULT hres; + + test_internet_feature_defaults(); + + hres = pCoInternetIsFeatureEnabled(FEATURE_ENTRY_COUNT, GET_FEATURE_FROM_PROCESS); + todo_wine + ok(hres == E_FAIL, "CoInternetIsFeatureEnabled returned %08x, expected E_FAIL\n", hres); +} + +static void test_internet_features(void) { + if(!pCoInternetIsFeatureEnabled) { + win_skip("Skipping internet feature tests, IE is too old\n"); + return; + } + + test_CoInternetIsFeatureEnabled(); +} + START_TEST(misc) { HMODULE hurlmon; @@ -1491,6 +1563,7 @@ START_TEST(misc) pReleaseBindInfo = (void*) GetProcAddress(hurlmon, "ReleaseBindInfo"); pUrlMkGetSessionOption = (void*) GetProcAddress(hurlmon, "UrlMkGetSessionOption"); pCompareSecurityIds = (void*) GetProcAddress(hurlmon, "CompareSecurityIds"); + pCoInternetIsFeatureEnabled = (void*) GetProcAddress(hurlmon, "CoInternetIsFeatureEnabled"); if (!pCoInternetCompareUrl || !pCoInternetGetSecurityUrl || !pCoInternetGetSession || !pCoInternetParseUrl || !pCompareSecurityIds) { @@ -1516,6 +1589,7 @@ START_TEST(misc) test_user_agent(); test_MkParseDisplayNameEx(); test_IsValidURL(); + test_internet_features(); OleUninitialize(); }

1 0