October 2013 - Wine-Commits

Frédéric Delanoy : windowscodecs/tests: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: 98757d12cf58f55f8d9c09c01c915c63b30e046b URL: http://source.winehq.org/git/wine.git/?a=commit;h=98757d12cf58f55f8d9c09c01… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Oct 19 15:28:48 2013 +0200 windowscodecs/tests: Use BOOL type where appropriate. --- dlls/windowscodecs/tests/converter.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index b77e455..6c3d232 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -338,7 +338,7 @@ static void test_default_converter(void) { BitmapTestSrc *src_obj; IWICFormatConverter *converter; - BOOL can_convert=1; + BOOL can_convert = TRUE; HRESULT hr; CreateTestBitmap(&testdata_32bppBGRA, &src_obj); @@ -647,18 +647,18 @@ START_TEST(converter) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - test_conversion(&testdata_32bppBGRA, &testdata_32bppBGR, "BGRA -> BGR", 0); - test_conversion(&testdata_32bppBGR, &testdata_32bppBGRA, "BGR -> BGRA", 0); - test_conversion(&testdata_32bppBGRA, &testdata_32bppBGRA, "BGRA -> BGRA", 0); + test_conversion(&testdata_32bppBGRA, &testdata_32bppBGR, "BGRA -> BGR", FALSE); + test_conversion(&testdata_32bppBGR, &testdata_32bppBGRA, "BGR -> BGRA", FALSE); + test_conversion(&testdata_32bppBGRA, &testdata_32bppBGRA, "BGRA -> BGRA", FALSE); - test_conversion(&testdata_24bppBGR, &testdata_24bppBGR, "24bppBGR -> 24bppBGR", 0); - test_conversion(&testdata_24bppBGR, &testdata_24bppRGB, "24bppBGR -> 24bppRGB", 0); + test_conversion(&testdata_24bppBGR, &testdata_24bppBGR, "24bppBGR -> 24bppBGR", FALSE); + test_conversion(&testdata_24bppBGR, &testdata_24bppRGB, "24bppBGR -> 24bppRGB", FALSE); - test_conversion(&testdata_24bppRGB, &testdata_24bppRGB, "24bppRGB -> 24bppRGB", 0); - test_conversion(&testdata_24bppRGB, &testdata_24bppBGR, "24bppRGB -> 24bppBGR", 0); + test_conversion(&testdata_24bppRGB, &testdata_24bppRGB, "24bppRGB -> 24bppRGB", FALSE); + test_conversion(&testdata_24bppRGB, &testdata_24bppBGR, "24bppRGB -> 24bppBGR", FALSE); - test_conversion(&testdata_32bppBGR, &testdata_24bppRGB, "32bppBGR -> 24bppRGB", 0); - test_conversion(&testdata_24bppRGB, &testdata_32bppBGR, "24bppRGB -> 32bppBGR", 0); + test_conversion(&testdata_32bppBGR, &testdata_24bppRGB, "32bppBGR -> 24bppRGB", FALSE); + test_conversion(&testdata_24bppRGB, &testdata_32bppBGR, "24bppRGB -> 32bppBGR", FALSE); test_invalid_conversion(); test_default_converter();

1 0

Francois Gouget : oleaut32/tests: Make the uk_*() methods static.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: 5098cd62467ced28d15a1380a6420401f0308ee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5098cd62467ced28d15a1380a… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Oct 19 13:29:26 2013 +0200 oleaut32/tests: Make the uk_*() methods static. --- dlls/oleaut32/tests/typelib.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 9f6fa1f..613a27d 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -5052,17 +5052,17 @@ static void test_GetLibAttr(void) ITypeLib_Release(tl); } -HRESULT WINAPI uk_QueryInterface(IUnknown *obj, REFIID iid, void **out) +static HRESULT WINAPI uk_QueryInterface(IUnknown *obj, REFIID iid, void **out) { return E_NOINTERFACE; } -ULONG WINAPI uk_AddRef(IUnknown *obj) +static ULONG WINAPI uk_AddRef(IUnknown *obj) { return 2; } -ULONG WINAPI uk_Release(IUnknown *obj) +static ULONG WINAPI uk_Release(IUnknown *obj) { return 1; }

1 0

Ken Thomases : winecoreaudio: Fix a potential leak. (Clang).
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: 9a7993045e968ce33fdc51cccef0b3fa5bff1a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a7993045e968ce33fdc51ccc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 20 23:55:39 2013 -0500 winecoreaudio: Fix a potential leak. (Clang). --- dlls/winecoreaudio.drv/midi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 491fc7e..8593e9c 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -810,8 +810,8 @@ void MIDIIn_SendMessage(MIDIMessage msg) { CFMessagePortSendRequest(messagePort, 0, data, 0.0, 0.0, NULL, NULL); CFRelease(data); - CFRelease(messagePort); } + CFRelease(messagePort); } static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFDataRef data, void *info)

1 0

Ken Thomases : winemac: Fix some bytes-vs-WCHARs length computation bugs in the UTF-16 clipboard support .
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: c7f8e71ab6e766003faaf0bde9edee64c1f1b3e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7f8e71ab6e766003faaf0bde… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Oct 20 23:54:49 2013 -0500 winemac: Fix some bytes-vs-WCHARs length computation bugs in the UTF-16 clipboard support. --- dlls/winemac.drv/clipboard.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 80fd689..9cfe283 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1007,7 +1007,7 @@ static HANDLE import_utf16_to_unicodetext(CFDataRef data) HANDLE unicode_handle; src = (const WCHAR *)CFDataGetBytePtr(data); - data_len = CFDataGetLength(data); + data_len = CFDataGetLength(data) / sizeof(WCHAR); for (i = 0; i < data_len; i++) { if (src[i] == '\n') @@ -1358,13 +1358,13 @@ static CFDataRef export_unicodetext_to_utf16(HANDLE data) dst_len = GlobalSize(data) / sizeof(WCHAR); if (dst_len) dst_len--; /* Leave off null terminator. */ - ret = CFDataCreateMutable(NULL, dst_len); + ret = CFDataCreateMutable(NULL, dst_len * sizeof(WCHAR)); if (ret) { LPWSTR dst; int i, j; - CFDataSetLength(ret, dst_len); + CFDataSetLength(ret, dst_len * sizeof(WCHAR)); dst = (LPWSTR)CFDataGetMutableBytePtr(ret); /* Remove carriage returns */ @@ -1375,7 +1375,7 @@ static CFDataRef export_unicodetext_to_utf16(HANDLE data) continue; dst[j++] = src[i]; } - CFDataSetLength(ret, j); + CFDataSetLength(ret, j * sizeof(WCHAR)); } GlobalUnlock(data);

1 0

Frédéric Delanoy : windowscodecs: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 21, 2013

Oct. 21, 2013

Module: wine Branch: master Commit: 0153a962f617c9f7530f3e859eeed5e2e26be88a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0153a962f617c9f7530f3e859… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Oct 19 15:28:50 2013 +0200 windowscodecs: Use BOOL type where appropriate. --- dlls/windowscodecs/jpegformat.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index c742f78..5ce8fa0 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -773,13 +773,13 @@ typedef struct JpegEncoder { struct jpeg_compress_struct cinfo; struct jpeg_error_mgr jerr; struct jpeg_destination_mgr dest_mgr; - int initialized; + BOOL initialized; int frame_count; - int frame_initialized; - int started_compress; + BOOL frame_initialized; + BOOL started_compress; int lines_written; - int frame_committed; - int committed; + BOOL frame_committed; + BOOL committed; UINT width, height; double xres, yres; const jpeg_compress_format *format; @@ -1050,7 +1050,7 @@ static HRESULT WINAPI JpegEncoder_Frame_WritePixels(IWICBitmapFrameEncode *iface pjpeg_start_compress(&This->cinfo, TRUE); - This->started_compress = 1; + This->started_compress = TRUE; } row_size = This->format->bpp / 8 * This->width; @@ -1480,13 +1480,13 @@ HRESULT JpegEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->IWICBitmapEncoder_iface.lpVtbl = &JpegEncoder_Vtbl; This->IWICBitmapFrameEncode_iface.lpVtbl = &JpegEncoder_FrameVtbl; This->ref = 1; - This->initialized = 0; + This->initialized = FALSE; This->frame_count = 0; - This->frame_initialized = 0; - This->started_compress = 0; + This->frame_initialized = FALSE; + This->started_compress = FALSE; This->lines_written = 0; - This->frame_committed = 0; - This->committed = 0; + This->frame_committed = FALSE; + This->committed = FALSE; This->width = This->height = 0; This->xres = This->yres = 0.0; This->format = NULL;

1 0

Huw Davies : ole32/tests: Add tests to show that CoLockObjectExternal() calls ReleaseConnection() with the appropriate value for fLastReleaseCloses.
by Alexandre Julliard Oct. 18, 2013

Oct. 18, 2013

Module: wine Branch: master Commit: 29c6e10fd8a25ed413d1b6cc5794a80c4b001e16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c6e10fd8a25ed413d1b6cc5… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 18 12:52:46 2013 +0100 ole32/tests: Add tests to show that CoLockObjectExternal() calls ReleaseConnection() with the appropriate value for fLastReleaseCloses. --- dlls/ole32/tests/marshal.c | 59 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 09ba030..95dae0a 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -106,6 +106,52 @@ static void UnlockModule(void) InterlockedDecrement(&cLocks); } +static BOOL with_external_conn; +static DWORD external_connections; +static BOOL last_release_closes; + +static HRESULT WINAPI ExternalConnection_QueryInterface(IExternalConnection *iface, REFIID riid, void **ppv) +{ + ok(0, "unxpected call\n"); + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI ExternalConnection_AddRef(IExternalConnection *iface) +{ + return 2; +} + +static ULONG WINAPI ExternalConnection_Release(IExternalConnection *iface) +{ + return 1; +} + +static DWORD WINAPI ExternalConnection_AddConnection(IExternalConnection *iface, DWORD extconn, DWORD reserved) +{ + trace("add connection\n"); + return ++external_connections; +} + + +static DWORD WINAPI ExternalConnection_ReleaseConnection(IExternalConnection *iface, DWORD extconn, + DWORD reserved, BOOL fLastReleaseCloses) +{ + trace("release connection %d\n", fLastReleaseCloses); + last_release_closes = fLastReleaseCloses; + return --external_connections; +} + +static const IExternalConnectionVtbl ExternalConnectionVtbl = { + ExternalConnection_QueryInterface, + ExternalConnection_AddRef, + ExternalConnection_Release, + ExternalConnection_AddConnection, + ExternalConnection_ReleaseConnection +}; + +static IExternalConnection ExternalConnection = { &ExternalConnectionVtbl }; + static HRESULT WINAPI Test_IUnknown_QueryInterface( LPUNKNOWN iface, @@ -164,6 +210,12 @@ static HRESULT WINAPI Test_IClassFactory_QueryInterface( return S_OK; } + if (with_external_conn && IsEqualGUID(riid, &IID_IExternalConnection)) + { + *ppvObj = &ExternalConnection; + return S_OK; + } + *ppvObj = NULL; return E_NOINTERFACE; } @@ -1232,6 +1284,7 @@ static void test_lock_object_external(void) IStream *pStream = NULL; cLocks = 0; + with_external_conn = TRUE; /* test the stub manager creation aspect of CoLockObjectExternal when the * object hasn't been marshaled yet */ @@ -1270,6 +1323,7 @@ static void test_lock_object_external(void) CoLockObjectExternal((IUnknown*)&Test_ClassFactory, FALSE, TRUE); ok_no_locks(); + ok(last_release_closes, "last_release_closes FALSE\n"); /* test CoLockObjectExternal releases reference to object with * fLastUnlockReleases as TRUE and there are only strong references on @@ -1281,6 +1335,8 @@ static void test_lock_object_external(void) CoLockObjectExternal((IUnknown*)&Test_ClassFactory, FALSE, FALSE); ok_no_locks(); +todo_wine + ok(!last_release_closes, "last_release_closes TRUE\n"); /* test CoLockObjectExternal doesn't release the last reference to an * object with fLastUnlockReleases as TRUE and there is a weak reference @@ -1301,8 +1357,11 @@ static void test_lock_object_external(void) CoDisconnectObject((IUnknown*)&Test_ClassFactory, 0); ok_no_locks(); +todo_wine + ok(!last_release_closes, "last_release_closes TRUE\n"); IStream_Release(pStream); + with_external_conn = FALSE; } /* tests disconnecting stubs */

1 0

Dmitry Timoshkov : windowscodecs: Add support for IMILBitmapSource interface.
by Alexandre Julliard Oct. 18, 2013

Oct. 18, 2013

Module: wine Branch: master Commit: 5e78e0b695c91041d2f034b8cc9409bf4bd37144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e78e0b695c91041d2f034b8c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 14 12:07:06 2013 +0900 windowscodecs: Add support for IMILBitmapSource interface. --- dlls/windowscodecs/bitmap.c | 253 +++++++++++++++++++++++++++++++- dlls/windowscodecs/wincodecs_private.h | 40 +++++ 2 files changed, 292 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5e78e0b695c91041d2f03…

1 0

Alexandre Julliard : explorer: Make sure the graphics driver module is always set.
by Alexandre Julliard Oct. 18, 2013

Oct. 18, 2013

Module: wine Branch: master Commit: 040bd407c722e3c073c7cac4df9c1a7d89a64b98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=040bd407c722e3c073c7cac4d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 18 11:38:42 2013 +0200 explorer: Make sure the graphics driver module is always set. --- programs/explorer/desktop.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 694f3f6..4c38edb 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -40,7 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(explorer); #define DESKTOP_CLASS_ATOM ((LPCWSTR)MAKEINTATOM(32769)) #define DESKTOP_ALL_ACCESS 0x01ff -static HMODULE graphics_driver; static BOOL using_root; struct launcher @@ -549,16 +548,16 @@ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPAR } /* create the desktop and the associated driver window, and make it the current desktop */ -static BOOL create_desktop( const WCHAR *name, unsigned int width, unsigned int height ) +static BOOL create_desktop( HMODULE driver, const WCHAR *name, unsigned int width, unsigned int height ) { static const WCHAR rootW[] = {'r','o','o','t',0}; BOOL ret = FALSE; BOOL (CDECL *create_desktop_func)(unsigned int, unsigned int); /* magic: desktop "root" means use the root window */ - if (graphics_driver && strcmpiW( name, rootW )) + if (driver && strcmpiW( name, rootW )) { - create_desktop_func = (void *)GetProcAddress( graphics_driver, "wine_create_desktop" ); + create_desktop_func = (void *)GetProcAddress( driver, "wine_create_desktop" ); if (create_desktop_func) ret = create_desktop_func( width, height ); } return ret; @@ -749,16 +748,14 @@ void manage_desktop( WCHAR *arg ) if (hwnd == GetDesktopWindow()) { - HMODULE shell32; + HMODULE shell32, graphics_driver; void (WINAPI *pShellDDEInit)( BOOL ); - if (desktop) - { - hdc = GetDC( hwnd ); - graphics_driver = __wine_get_driver_module( hdc ); - using_root = !create_desktop( name, width, height ); - ReleaseDC( hwnd, hdc ); - } + hdc = GetDC( hwnd ); + graphics_driver = __wine_get_driver_module( hdc ); + using_root = !desktop || !create_desktop( graphics_driver, name, width, height ); + ReleaseDC( hwnd, hdc ); + SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc ); SendMessageW( hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW( 0, MAKEINTRESOURCEW(OIC_WINLOGO))); if (name) set_desktop_window_title( hwnd, name );

1 0

Frédéric Delanoy : d3dxof: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 18, 2013

Oct. 18, 2013

Module: wine Branch: master Commit: 497f088715f00eeb5076afe8f035886a843361da URL: http://source.winehq.org/git/wine.git/?a=commit;h=497f088715f00eeb5076afe8f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 18 12:35:08 2013 +0200 d3dxof: Use BOOL type where appropriate. --- dlls/d3dxof/parsing.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index f7f67c5..49ff964 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -542,7 +542,7 @@ static BOOL is_float(parse_buffer* buf) DWORD pos = 0; char c; float decimal; - BOOL dot = 0; + BOOL dot = FALSE; while (pos < buf->rem_bytes && !is_separator(c = *(buf->buffer+pos))) { @@ -899,10 +899,10 @@ static inline BOOL is_primitive_type(WORD token) case TOKEN_LPSTR: case TOKEN_UNICODE: case TOKEN_CSTRING: - ret = 1; + ret = TRUE; break; default: - ret = 0; + ret = FALSE; break; } return ret; @@ -948,14 +948,14 @@ static BOOL parse_template_members_list(parse_buffer * buf) while (1) { - BOOL array = 0; + BOOL array = FALSE; int nb_dims = 0; cur_member = &buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates].members[idx_member]; if (check_TOKEN(buf) == TOKEN_ARRAY) { get_TOKEN(buf); - array = 1; + array = TRUE; } if (check_TOKEN(buf) == TOKEN_NAME)

1 0

Jacek Caban : crypt32: Use empty_store for new CTL contexts.
by Alexandre Julliard Oct. 18, 2013

Oct. 18, 2013

Module: wine Branch: master Commit: eae8f4eda125693ec6467ffaca1be051845b6881 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eae8f4eda125693ec6467ffac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 18 10:51:05 2013 +0200 crypt32: Use empty_store for new CTL contexts. --- dlls/crypt32/ctl.c | 2 +- dlls/crypt32/tests/store.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index ef5410a..7a8c21f 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -453,7 +453,7 @@ PCCTL_CONTEXT WINAPI CertCreateCTLContext(DWORD dwMsgAndCertEncodingType, ctl->pbCtlEncoded = data; ctl->cbCtlEncoded = cbCtlEncoded; ctl->pCtlInfo = ctlInfo; - ctl->hCertStore = NULL; + ctl->hCertStore = &empty_store; ctl->hCryptMsg = msg; ctl->pbCtlContext = content; ctl->cbCtlContext = contentSize; diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index ea85dbf..1fa3ffa 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -2531,6 +2531,7 @@ static void testEmptyStore(void) { const CERT_CONTEXT *cert, *cert2, *cert3; const CRL_CONTEXT *crl; + const CTL_CONTEXT *ctl; HCERTSTORE store; BOOL res; @@ -2594,6 +2595,12 @@ static void testEmptyStore(void) CertFreeCRLContext(crl); + ctl = CertCreateCTLContext(X509_ASN_ENCODING, signedCTLWithCTLInnerContent, sizeof(signedCTLWithCTLInnerContent)); + ok(ctl != NULL, "CertCreateCTLContext failed\n"); + ok(ctl->hCertStore == cert->hCertStore, "unexpected hCertStore\n"); + + CertFreeCTLContext(ctl); + CertFreeCertificateContext(cert); }

1 0