wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

Alexandre Julliard : winex11: Move X11 locking inside the cursor creation functions.
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: 45b7eb6858f8da0721101a19a9fcd46d53c08e94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45b7eb6858f8da0721101a19a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 20 14:40:06 2010 +0200 winex11: Move X11 locking inside the cursor creation functions. --- dlls/winex11.drv/mouse.c | 54 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 42 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index b044182..9581945 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -176,6 +176,7 @@ static Cursor get_empty_cursor(void) static Cursor cursor; static const char data[] = { 0 }; + wine_tsx11_lock(); if (!cursor) { XColor bg; @@ -189,6 +190,7 @@ static Cursor get_empty_cursor(void) XFreePixmap( gdi_display, pixmap ); } } + wine_tsx11_unlock(); return cursor; } @@ -682,7 +684,7 @@ static Cursor create_xcursor_cursor( Display *display, CURSORICONINFO *ptr ) * * Create an X cursor from a Windows one. */ -static Cursor create_cursor( Display *display, CURSORICONINFO *ptr ) +static Cursor create_xlib_cursor( Display *display, CURSORICONINFO *ptr ) { Pixmap pixmapBits, pixmapMask, pixmapMaskInv = 0, pixmapAll; XColor fg, bg; @@ -691,12 +693,6 @@ static Cursor create_cursor( Display *display, CURSORICONINFO *ptr ) char *bitMask32 = NULL; BOOL alpha_zero = TRUE; - if (!ptr) return get_empty_cursor(); - -#ifdef SONAME_LIBXCURSOR - if (pXcursorImageLoadCursor) return create_xcursor_cursor( display, ptr ); -#endif - /* Create the X cursor from the bits */ { XImage *image; @@ -992,26 +988,60 @@ static Cursor create_cursor( Display *display, CURSORICONINFO *ptr ) } /*********************************************************************** + * create_cursor + * + * Create an X cursor from a Windows one. + */ +static Cursor create_cursor( HANDLE handle, CURSORICONINFO *ptr ) +{ + Cursor cursor; + + if (!handle) return get_empty_cursor(); + +#ifdef SONAME_LIBXCURSOR + if (pXcursorImageLoadCursor) + { + wine_tsx11_lock(); + cursor = create_xcursor_cursor( gdi_display, ptr ); + wine_tsx11_unlock(); + if (cursor) return cursor; + } +#endif + + wine_tsx11_lock(); + cursor = create_xlib_cursor( gdi_display, ptr ); + wine_tsx11_unlock(); + return cursor; +} + +/*********************************************************************** * CreateCursorIcon (X11DRV.@) */ void CDECL X11DRV_CreateCursorIcon( HCURSOR handle, CURSORICONINFO *info ) { static const WORD ICON_HOTSPOT = 0x4242; - Cursor cursor; + Cursor cursor, prev; /* ignore icons (FIXME: shouldn't use magic hotspot value) */ if (info->ptHotSpot.x == ICON_HOTSPOT && info->ptHotSpot.y == ICON_HOTSPOT) return; - wine_tsx11_lock(); - cursor = create_cursor( gdi_display, info ); + cursor = create_cursor( handle, info ); if (cursor) { + wine_tsx11_lock(); if (!cursor_context) cursor_context = XUniqueContext(); - XSaveContext( gdi_display, (XID)handle, cursor_context, (char *)cursor ); + if (!XFindContext( gdi_display, (XID)handle, cursor_context, (char **)&prev )) + { + /* someone else was here first */ + XFreeCursor( gdi_display, cursor ); + cursor = prev; + } + else + XSaveContext( gdi_display, (XID)handle, cursor_context, (char *)cursor ); + wine_tsx11_unlock(); TRACE( "cursor %p %ux%u, planes %u, bpp %u -> xid %lx\n", handle, info->nWidth, info->nHeight, info->bPlanes, info->bBitsPerPixel, cursor ); } - wine_tsx11_unlock(); } /***********************************************************************

1 0

Alexandre Julliard : winex11: Fix a bitmap leak when setting the small icon hints.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 0d84ccbfa1d542e333a2f706414420d05af07587 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d84ccbfa1d542e333a2f7064… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 20 17:37:28 2010 +0200 winex11: Fix a bitmap leak when setting the small icon hints. --- dlls/winex11.drv/window.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 28d5ae6..fa72ada 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -928,12 +928,12 @@ static void set_icon_hints( Display *display, struct x11drv_win_data *data, HBITMAP hbmOrig; RECT rcMask; BITMAP bm; - ICONINFO ii; + ICONINFO ii, ii_small; HDC hDC; unsigned int size; unsigned long *bits; - GetIconInfo(icon_big, &ii); + if (!GetIconInfo(icon_big, &ii)) return; GetObjectW(ii.hbmMask, sizeof(bm), &bm); rcMask.top = 0; @@ -943,12 +943,12 @@ static void set_icon_hints( Display *display, struct x11drv_win_data *data, hDC = CreateCompatibleDC(0); bits = get_bitmap_argb( hDC, ii.hbmColor, ii.hbmMask, &size ); - if (GetIconInfo( icon_small, &ii )) + if (bits && GetIconInfo( icon_small, &ii_small )) { unsigned int size_small; unsigned long *bits_small, *new; - if ((bits_small = get_bitmap_argb( hDC, ii.hbmColor, ii.hbmMask, &size_small )) && + if ((bits_small = get_bitmap_argb( hDC, ii_small.hbmColor, ii_small.hbmMask, &size_small )) && (bits_small[0] != bits[0] || bits_small[1] != bits[1])) /* size must be different */ { if ((new = HeapReAlloc( GetProcessHeap(), 0, bits, @@ -960,8 +960,8 @@ static void set_icon_hints( Display *display, struct x11drv_win_data *data, } } HeapFree( GetProcessHeap(), 0, bits_small ); - DeleteObject( ii.hbmColor ); - DeleteObject( ii.hbmMask ); + DeleteObject( ii_small.hbmColor ); + DeleteObject( ii_small.hbmMask ); } wine_tsx11_lock(); if (bits)

1 0

Piotr Caban : wininet: Fix variables values after redirection in HTTP_HttpSendRequestW.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 224af0d0e7a936e9a88b8124e98a9a2ae6a56ebf URL: http://source.winehq.org/git/wine.git/?a=commit;h=224af0d0e7a936e9a88b8124e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 20 02:35:38 2010 +0200 wininet: Fix variables values after redirection in HTTP_HttpSendRequestW. Moved dwContentLength reset after HTTP_DrainContent (this function disconnects when dwContentLength is set to ~0u). --- dlls/wininet/http.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index dc6533b..ac0edea 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3462,6 +3462,10 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *lpwhr, LPCWSTR lpszHeaders, * for all the data */ HTTP_DrainContent(lpwhr); lpwhr->dwContentRead = 0; + if(redirected) { + lpwhr->dwContentLength = ~0u; + lpwhr->dwBytesToWrite = 0; + } if (TRACE_ON(wininet)) {

1 0

Mike Kaplinskiy : server: Move async activation into separate function.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: ee5ee5c538db0622283886988e66641c5536a0b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee5ee5c538db0622283886988… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Wed May 19 16:14:08 2010 -0400 server: Move async activation into separate function. --- server/sock.c | 33 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) diff --git a/server/sock.c b/server/sock.c index 0a1bb40..0c8cb54 100644 --- a/server/sock.c +++ b/server/sock.c @@ -295,6 +295,23 @@ static inline int sock_error( struct fd *fd ) return optval; } +static void sock_dispatch_asyncs( struct sock *sock, int event ) +{ + if ( sock->flags & WSA_FLAG_OVERLAPPED ) + { + if ( event & (POLLIN|POLLPRI|POLLERR|POLLHUP) && async_waiting( sock->read_q )) + { + if (debug_level) fprintf( stderr, "activating read queue for socket %p\n", sock ); + async_wake_up( sock->read_q, STATUS_ALERTED ); + } + if ( event & (POLLOUT|POLLERR|POLLHUP) && async_waiting( sock->write_q )) + { + if (debug_level) fprintf( stderr, "activating write queue for socket %p\n", sock ); + async_wake_up( sock->write_q, STATUS_ALERTED ); + } + } +} + static void sock_poll_event( struct fd *fd, int event ) { struct sock *sock = get_fd_user( fd ); @@ -422,23 +439,11 @@ static void sock_poll_event( struct fd *fd, int event ) event |= POLLHUP; } + sock_dispatch_asyncs( sock, event ); + /* wake up anyone waiting for whatever just happened */ sock_wake_up( sock ); - if ( sock->flags & WSA_FLAG_OVERLAPPED ) - { - if ( event & (POLLIN|POLLPRI|POLLERR|POLLHUP) && async_waiting( sock->read_q )) - { - if (debug_level) fprintf( stderr, "activating read queue for socket %p\n", sock ); - async_wake_up( sock->read_q, STATUS_ALERTED ); - } - if ( event & (POLLOUT|POLLERR|POLLHUP) && async_waiting( sock->write_q )) - { - if (debug_level) fprintf( stderr, "activating write queue for socket %p\n", sock ); - async_wake_up( sock->write_q, STATUS_ALERTED ); - } - } - /* if anyone is stupid enough to wait on the socket object itself, * maybe we should wake them up too, just in case? */ wake_up( &sock->obj, 0 );

1 0

Andrew Nguyen : oleaut32/tests: Update a comment about PNG support in OLE picture tests.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: b8fb1c97a1d9fc62af0c95c4f32d5612396ce3d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8fb1c97a1d9fc62af0c95c4f… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed May 19 22:26:25 2010 -0500 oleaut32/tests: Update a comment about PNG support in OLE picture tests. --- dlls/oleaut32/tests/olepicture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 8ea1a2a..3208368 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -889,7 +889,7 @@ START_TEST(olepicture) test_pic(jpgimage, sizeof(jpgimage)); test_pic(bmpimage, sizeof(bmpimage)); test_pic(gif4pixel, sizeof(gif4pixel)); - /* FIXME: No PNG support yet in Wine or in older Windows... */ + /* FIXME: No PNG support in Windows... */ if (0) test_pic(pngimage, sizeof(pngimage)); test_empty_image(); test_empty_image_2();

1 0

Andrew Nguyen : oleaut32: Implicitly initialize COM in OleLoadPicturePath.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 96dbdcb8c9a8f028d1d1e40191a75db5a84bedfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=96dbdcb8c9a8f028d1d1e4019… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed May 19 22:26:22 2010 -0500 oleaut32: Implicitly initialize COM in OleLoadPicturePath. --- dlls/oleaut32/olepicture.c | 43 ++++++++++++++++++------------------- dlls/oleaut32/tests/olepicture.c | 3 -- 2 files changed, 21 insertions(+), 25 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 07d4dde..b8e949d 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -2273,6 +2273,7 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, BOOL bRead; IPersistStream *pStream; HRESULT hRes; + HRESULT init_res; WCHAR *file_candidate; WCHAR path_buf[MAX_PATH]; @@ -2349,34 +2350,32 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, return hRes; } - hRes = CoCreateInstance(&CLSID_StdPicture, punkCaller, CLSCTX_INPROC_SERVER, - &IID_IPicture, (LPVOID*)&ipicture); - if (hRes != S_OK) { - IStream_Release(stream); - return hRes; - } - - hRes = IPicture_QueryInterface(ipicture, &IID_IPersistStream, (LPVOID*)&pStream); - if (hRes) { - IStream_Release(stream); + init_res = CoInitialize(NULL); + + hRes = CoCreateInstance(&CLSID_StdPicture, punkCaller, CLSCTX_INPROC_SERVER, + &IID_IPicture, (LPVOID*)&ipicture); + if (SUCCEEDED(hRes)) { + hRes = IPicture_QueryInterface(ipicture, &IID_IPersistStream, (LPVOID*)&pStream); + + if (SUCCEEDED(hRes)) { + hRes = IPersistStream_Load(pStream, stream); + + if (SUCCEEDED(hRes)) { + hRes = IPicture_QueryInterface(ipicture, riid, ppvRet); + + if (FAILED(hRes)) + ERR("Failed to get interface %s from IPicture.\n", debugstr_guid(riid)); + } + IPersistStream_Release(pStream); + } IPicture_Release(ipicture); - return hRes; } - hRes = IPersistStream_Load(pStream, stream); - IPersistStream_Release(pStream); IStream_Release(stream); - if (hRes) { - IPicture_Release(ipicture); - return hRes; - } + if (SUCCEEDED(init_res)) + CoUninitialize(); - hRes = IPicture_QueryInterface(ipicture,riid,ppvRet); - if (hRes) - ERR("Failed to get interface %s from IPicture.\n",debugstr_guid(riid)); - - IPicture_Release(ipicture); return hRes; } diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 6bf3c44..8ea1a2a 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -813,7 +813,6 @@ static void test_OleLoadPicturePath(void) /* Try a normal DOS path. */ hres = OleLoadPicturePath(temp_fileW + 8, NULL, 0, 0, &IID_IPicture, (void **)&pic); - todo_wine ok(hres == S_OK || broken(hres == E_UNEXPECTED), /* NT4/Win95 */ "Expected OleLoadPicturePath to return S_OK, got 0x%08x\n", hres); @@ -822,7 +821,6 @@ static void test_OleLoadPicturePath(void) /* Try a DOS path with tacked on "file:". */ hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic); - todo_wine ok(hres == S_OK || broken(hres == E_UNEXPECTED), /* NT4/Win95 */ "Expected OleLoadPicturePath to return S_OK, got 0x%08x\n", hres); @@ -859,7 +857,6 @@ static void test_OleLoadPicturePath(void) } hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic); - todo_wine ok(hres == S_OK || broken(hres == E_UNEXPECTED), /* NT4/Win95 */ "Expected OleLoadPicturePath to return S_OK, got 0x%08x\n", hres);

1 0

Andrew Nguyen : oleaut32: Convert file URLs to DOS paths for special handling in OleLoadPicturePath.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 61f7f77636c621e576da229f74b70c234cbb612b URL: http://source.winehq.org/git/wine.git/?a=commit;h=61f7f77636c621e576da229f7… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed May 19 22:29:42 2010 -0500 oleaut32: Convert file URLs to DOS paths for special handling in OleLoadPicturePath. File URLs cannot be used in the moniker code path, as binding to the IStream interface is not possible. --- dlls/oleaut32/olepicture.c | 28 ++++++++++--- dlls/oleaut32/tests/olepicture.c | 80 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index d9d488f..07d4dde 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -2263,7 +2263,7 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, DWORD dwReserved, OLE_COLOR clrReserved, REFIID riid, LPVOID *ppvRet ) { - static const WCHAR file[] = { 'f','i','l','e',':','/','/',0 }; + static const WCHAR file[] = { 'f','i','l','e',':',0 }; IPicture *ipicture; HANDLE hFile; DWORD dwFileSize; @@ -2273,6 +2273,8 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, BOOL bRead; IPersistStream *pStream; HRESULT hRes; + WCHAR *file_candidate; + WCHAR path_buf[MAX_PATH]; TRACE("(%s,%p,%d,%08x,%s,%p): stub\n", debugstr_w(szURLorPath), punkCaller, dwReserved, clrReserved, @@ -2283,13 +2285,25 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, *ppvRet = NULL; - if (strncmpW(szURLorPath, file, 7) == 0) { - szURLorPath += 7; - - hFile = CreateFileW(szURLorPath, GENERIC_READ, 0, NULL, OPEN_EXISTING, - 0, NULL); + /* Convert file URLs to DOS paths. */ + if (strncmpW(szURLorPath, file, 5) == 0) { + DWORD size; + hRes = CoInternetParseUrl(szURLorPath, PARSE_PATH_FROM_URL, 0, path_buf, + sizeof(path_buf)/sizeof(WCHAR), &size, 0); + if (FAILED(hRes)) + return hRes; + + file_candidate = path_buf; + } + else + file_candidate = szURLorPath; + + /* Handle candidate DOS paths separately. */ + if (file_candidate[1] == ':') { + hFile = CreateFileW(file_candidate, GENERIC_READ, 0, NULL, OPEN_EXISTING, + 0, NULL); if (hFile == INVALID_HANDLE_VALUE) - return E_UNEXPECTED; + return E_UNEXPECTED; dwFileSize = GetFileSize(hFile, NULL); if (dwFileSize != INVALID_FILE_SIZE ) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 2874804..6bf3c44 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -745,6 +745,12 @@ static void test_OleLoadPicturePath(void) IPicture *pic; HRESULT hres; int i; + char temp_path[MAX_PATH]; + char temp_file[MAX_PATH]; + WCHAR temp_fileW[MAX_PATH + 5] = {'f','i','l','e',':','/','/','/'}; + HANDLE file; + DWORD size; + WCHAR *ptr; const struct { @@ -794,6 +800,80 @@ static void test_OleLoadPicturePath(void) "Expected OleLoadPicturePath to return INET_E_UNKNOWN_PROTOCOL, got 0x%08x\n", hres); ok(pic == NULL, "Expected the output interface pointer to be NULL, got %p\n", pic); + + /* Create a local temporary image file for testing. */ + GetTempPathA(sizeof(temp_path), temp_path); + GetTempFileNameA(temp_path, "bmp", 0, temp_file); + file = CreateFileA(temp_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + WriteFile(file, bmpimage, sizeof(bmpimage), &size, NULL); + CloseHandle(file); + + MultiByteToWideChar(CP_ACP, 0, temp_file, -1, temp_fileW + 8, sizeof(temp_fileW)/sizeof(WCHAR) - 8); + + /* Try a normal DOS path. */ + hres = OleLoadPicturePath(temp_fileW + 8, NULL, 0, 0, &IID_IPicture, (void **)&pic); + todo_wine + ok(hres == S_OK || + broken(hres == E_UNEXPECTED), /* NT4/Win95 */ + "Expected OleLoadPicturePath to return S_OK, got 0x%08x\n", hres); + if (pic) + IPicture_Release(pic); + + /* Try a DOS path with tacked on "file:". */ + hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic); + todo_wine + ok(hres == S_OK || + broken(hres == E_UNEXPECTED), /* NT4/Win95 */ + "Expected OleLoadPicturePath to return S_OK, got 0x%08x\n", hres); + if (pic) + IPicture_Release(pic); + + DeleteFileA(temp_file); + + /* Try with a non-existent file. */ + hres = OleLoadPicturePath(temp_fileW + 8, NULL, 0, 0, &IID_IPicture, (void **)&pic); + ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ + hres == E_UNEXPECTED || /* NT4/Win95 */ + hres == E_FAIL, /* Win9x/Win2k */ + "Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08x\n", hres); + + hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic); + ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ + hres == E_UNEXPECTED || /* NT4/Win95 */ + hres == E_FAIL, /* Win9x/Win2k */ + "Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08x\n", hres); + + file = CreateFileA(temp_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + WriteFile(file, bmpimage, sizeof(bmpimage), &size, NULL); + CloseHandle(file); + + /* Try a "file:" URL with slash separators. */ + ptr = temp_fileW + 8; + while (*ptr) + { + if (*ptr == '\\') + *ptr = '/'; + ptr++; + } + + hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic); + todo_wine + ok(hres == S_OK || + broken(hres == E_UNEXPECTED), /* NT4/Win95 */ + "Expected OleLoadPicturePath to return S_OK, got 0x%08x\n", hres); + if (pic) + IPicture_Release(pic); + + DeleteFileA(temp_file); + + /* Try with a non-existent file. */ + hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic); + ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ + hres == E_UNEXPECTED || /* NT4/Win95 */ + hres == E_FAIL, /* Win9x/Win2k */ + "Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08x\n", hres); } START_TEST(olepicture)

1 0

Andrew Nguyen : oleaut32: Improve parameter validation in OleLoadPicturePath.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: dc13339988523e06148037b06b90ffb8070316ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc13339988523e06148037b06… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed May 19 22:26:15 2010 -0500 oleaut32: Improve parameter validation in OleLoadPicturePath. --- dlls/oleaut32/olepicture.c | 5 ++- dlls/oleaut32/tests/olepicture.c | 72 ++++++++++++++++++++++++++++++++++--- 2 files changed, 70 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 3f431fd..d9d488f 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -2278,7 +2278,10 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, debugstr_w(szURLorPath), punkCaller, dwReserved, clrReserved, debugstr_guid(riid), ppvRet); - if (!ppvRet) return E_POINTER; + if (!szURLorPath || !ppvRet) + return E_INVALIDARG; + + *ppvRet = NULL; if (strncmpW(szURLorPath, file, 7) == 0) { szURLorPath += 7; diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index c8ddc8a..2874804 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -36,6 +36,7 @@ #include <winerror.h> #include <winnt.h> +#include <urlmon.h> #include <wtypes.h> #include <olectl.h> #include <objidl.h> @@ -737,6 +738,64 @@ static void test_get_Type(void) IPicture_Release(pic); } +static void test_OleLoadPicturePath(void) +{ + static WCHAR emptyW[] = {0}; + + IPicture *pic; + HRESULT hres; + int i; + + const struct + { + LPOLESTR szURLorPath; + REFIID riid; + IPicture **pic; + } invalid_parameters[] = + { + {NULL, NULL, NULL}, + {NULL, NULL, &pic}, + {NULL, &IID_IPicture, NULL}, + {NULL, &IID_IPicture, &pic}, + {emptyW, NULL, NULL}, + {emptyW, &IID_IPicture, NULL}, + }; + + for (i = 0; i < sizeof(invalid_parameters)/sizeof(invalid_parameters[0]); i++) + { + pic = (IPicture *)0xdeadbeef; + hres = OleLoadPicturePath(invalid_parameters[i].szURLorPath, NULL, 0, 0, + invalid_parameters[i].riid, + (void **)invalid_parameters[i].pic); + ok(hres == E_INVALIDARG, + "[%d] Expected OleLoadPicturePath to return E_INVALIDARG, got 0x%08x\n", i, hres); + ok(pic == (IPicture *)0xdeadbeef, + "[%d] Expected output pointer to be 0xdeadbeef, got %p\n", i, pic); + } + + pic = (IPicture *)0xdeadbeef; + hres = OleLoadPicturePath(emptyW, NULL, 0, 0, NULL, (void **)&pic); + todo_wine + ok(hres == INET_E_UNKNOWN_PROTOCOL || /* XP/Vista+ */ + hres == E_UNEXPECTED || /* NT4/Win95 */ + hres == E_FAIL || /* Win95 OSR2 */ + hres == E_OUTOFMEMORY, /* Win98/Win2k/Win2k3 */ + "Expected OleLoadPicturePath to return INET_E_UNKNOWN_PROTOCOL, got 0x%08x\n", hres); + ok(pic == NULL, + "Expected the output interface pointer to be NULL, got %p\n", pic); + + pic = (IPicture *)0xdeadbeef; + hres = OleLoadPicturePath(emptyW, NULL, 0, 0, &IID_IPicture, (void **)&pic); + todo_wine + ok(hres == INET_E_UNKNOWN_PROTOCOL || /* XP/Vista+ */ + hres == E_UNEXPECTED || /* NT4/Win95 */ + hres == E_FAIL || /* Win95 OSR2 */ + hres == E_OUTOFMEMORY, /* Win98/Win2k/Win2k3 */ + "Expected OleLoadPicturePath to return INET_E_UNKNOWN_PROTOCOL, got 0x%08x\n", hres); + ok(pic == NULL, + "Expected the output interface pointer to be NULL, got %p\n", pic); +} + START_TEST(olepicture) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -761,12 +820,13 @@ START_TEST(olepicture) test_metafile(); test_enhmetafile(); - test_Invoke(); - test_OleCreatePictureIndirect(); - test_Render(); - test_get_Attributes(); - test_get_Handle(); - test_get_Type(); + test_Invoke(); + test_OleCreatePictureIndirect(); + test_Render(); + test_get_Attributes(); + test_get_Handle(); + test_get_Type(); + test_OleLoadPicturePath(); }

1 0

Andrew Nguyen : urlmon/tests: Fix CoInternetCompareUrl failure message typos.
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: 0b3eac9227c8cb664962cf10624fef0ce3c54137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b3eac9227c8cb664962cf106… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed May 19 22:26:02 2010 -0500 urlmon/tests: Fix CoInternetCompareUrl failure message typos. --- dlls/urlmon/tests/misc.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index f9c14a4..66d2c7e 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -385,13 +385,13 @@ static void test_CoInternetCompareUrl(void) } hres = pCoInternetCompareUrl(url1, url1, 0); - ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); + ok(hres == S_OK, "CoInternetCompareUrl failed: %08x\n", hres); hres = pCoInternetCompareUrl(url1, url3, 0); - ok(hres == S_FALSE, "CoInternetParseUrl failed: %08x\n", hres); + ok(hres == S_FALSE, "CoInternetCompareUrl failed: %08x\n", hres); hres = pCoInternetCompareUrl(url3, url1, 0); - ok(hres == S_FALSE, "CoInternetParseUrl failed: %08x\n", hres); + ok(hres == S_FALSE, "CoInternetCompareUrl failed: %08x\n", hres); } static const struct {

1 0

Andrew Nguyen : urlmon: Validate URL and output pointer in CreateURLMoniker .
by Alexandre Julliard 20 May '10

20 May '10

Module: wine Branch: master Commit: e92cca8df654109110c8e82a24b9c892c78b157a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e92cca8df654109110c8e82a2… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed May 19 22:25:54 2010 -0500 urlmon: Validate URL and output pointer in CreateURLMoniker. --- dlls/urlmon/tests/url.c | 20 ++++++++++++++++++++ dlls/urlmon/umon.c | 6 ++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 661bf6e..bf5e9fe 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -242,6 +242,26 @@ static void test_CreateURLMoniker(LPCWSTR url1, LPCWSTR url2) IMoniker *mon1 = NULL; IMoniker *mon2 = NULL; + hr = CreateURLMoniker(NULL, NULL, NULL); + ok(hr == E_INVALIDARG, + "Expected CreateURLMoniker to return E_INVALIDARG, got 0x%08x\n", hr); + + mon1 = (IMoniker *)0xdeadbeef; + hr = CreateURLMoniker(NULL, NULL, &mon1); + ok(hr == E_INVALIDARG, + "Expected CreateURLMoniker to return E_INVALIDARG, got 0x%08x\n", hr); + ok(mon1 == NULL, "Expected the output pointer to be NULL, got %p\n", mon1); + + hr = CreateURLMoniker(NULL, emptyW, NULL); + ok(hr == E_INVALIDARG, + "Expected CreateURLMoniker to return E_INVALIDARG, got 0x%08x\n", hr); + + hr = CreateURLMoniker(NULL, emptyW, &mon1); + ok(hr == S_OK || + broken(hr == MK_E_SYNTAX), /* IE5/IE5.01/IE6 SP2 */ + "Expected CreateURLMoniker to return S_OK, got 0x%08x\n", hr); + if(mon1) IMoniker_Release(mon1); + hr = CreateURLMoniker(NULL, url1, &mon1); ok(SUCCEEDED(hr), "failed to create moniker: 0x%08x\n", hr); if(SUCCEEDED(hr)) { diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 5e6a8f6..92e902f 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -513,6 +513,12 @@ HRESULT WINAPI CreateURLMonikerEx(IMoniker *pmkContext, LPCWSTR szURL, IMoniker TRACE("(%p, %s, %p, %08x)\n", pmkContext, debugstr_w(szURL), ppmk, dwFlags); + if (ppmk) + *ppmk = NULL; + + if (!szURL || !ppmk) + return E_INVALIDARG; + if (dwFlags & URL_MK_UNIFORM) FIXME("ignoring flag URL_MK_UNIFORM\n"); if(!(obj = alloc_moniker()))

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2010