September 2008 - Wine-commits

Juan Lang : cabinet: Use helper function to remove duplicate code.
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: 70cfa0c36eeb873a5326e6153a9ae3dfa57bfd18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70cfa0c36eeb873a5326e6153… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 6 14:09:19 2008 -0700 cabinet: Use helper function to remove duplicate code. --- dlls/cabinet/fdi.c | 51 +++++++++++++++++++++------------------------------ 1 files changed, 21 insertions(+), 30 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 454776a..806a978 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2258,6 +2258,25 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state return DECR_OK; } +static void free_decompression_temps(HFDI hfdi, struct fdi_folder *fol, + fdi_decomp_state *decomp_state) +{ + switch (fol->comp_type & cffoldCOMPTYPE_MASK) { + case cffoldCOMPTYPE_LZX: + if (LZX(window)) { + PFDI_FREE(hfdi, LZX(window)); + LZX(window) = NULL; + } + break; + case cffoldCOMPTYPE_QUANTUM: + if (QTM(window)) { + PFDI_FREE(hfdi, QTM(window)); + QTM(window) = NULL; + } + break; + } +} + /*********************************************************************** * FDICopy (CABINET.22) * @@ -2839,21 +2858,7 @@ BOOL __cdecl FDICopy( } } - /* free decompression temps */ - switch (fol->comp_type & cffoldCOMPTYPE_MASK) { - case cffoldCOMPTYPE_LZX: - if (LZX(window)) { - PFDI_FREE(hfdi, LZX(window)); - LZX(window) = NULL; - } - break; - case cffoldCOMPTYPE_QUANTUM: - if (QTM(window)) { - PFDI_FREE(hfdi, QTM(window)); - QTM(window) = NULL; - } - break; - } + free_decompression_temps(hfdi, fol, decomp_state); while (decomp_state) { fdi_decomp_state *prev_fds; @@ -2887,21 +2892,7 @@ BOOL __cdecl FDICopy( bail_and_fail: /* here we free ram before error returns */ - /* free decompression temps */ - switch (fol->comp_type & cffoldCOMPTYPE_MASK) { - case cffoldCOMPTYPE_LZX: - if (LZX(window)) { - PFDI_FREE(hfdi, LZX(window)); - LZX(window) = NULL; - } - break; - case cffoldCOMPTYPE_QUANTUM: - if (QTM(window)) { - PFDI_FREE(hfdi, QTM(window)); - QTM(window) = NULL; - } - break; - } + free_decompression_temps(hfdi, fol, decomp_state); if (filehf) PFDI_CLOSE(hfdi, filehf);

1 0

Aric Stewart : mlang: Expand stub of fnIMLangFontLink2_GetStrCodePages.
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: 38901f08c66904430d5a7546c2bf7a48c6210c5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=38901f08c66904430d5a7546c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Sep 9 07:12:36 2008 -0500 mlang: Expand stub of fnIMLangFontLink2_GetStrCodePages. --- dlls/mlang/mlang.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 0170631..e2f0970 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3049,7 +3049,9 @@ static HRESULT WINAPI fnIMLangFontLink2_GetStrCodePages( IMLangFontLink2* This, DWORD *pdwCodePages, long *pcchCodePages) { FIXME("(%p)->%s %li %x %p %p\n",This, debugstr_wn(pszSrc,cchSrc),cchSrc,dwPriorityCodePages,pdwCodePages,pcchCodePages); - return E_NOTIMPL; + *pdwCodePages = 0; + *pcchCodePages = 1; + return S_OK; } static HRESULT WINAPI fnIMLangFontLink2_CodePageToCodePages(IMLangFontLink2* This,

1 0

Huw Davies : winex11.drv: Fix SetDIBits optimization to work with top-down dib sections.
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: 165b21dd2d27f88496c4fffe4b5b14bac118d549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=165b21dd2d27f88496c4fffe4… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 9 12:33:37 2008 +0100 winex11.drv: Fix SetDIBits optimization to work with top-down dib sections. --- dlls/winex11.drv/dib.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 461da16..f017943 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -3922,7 +3922,7 @@ INT X11DRV_SetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan, { X_PHYSBITMAP *physBitmap = X11DRV_get_phys_bitmap( hbitmap ); X11DRV_DIB_IMAGEBITS_DESCR descr; - BITMAP bitmap; + DIBSECTION ds; LONG width, height, tmpheight; INT result; @@ -3939,7 +3939,7 @@ INT X11DRV_SetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan, if (!lines || (startscan >= height)) return 0; - if (!GetObjectW( hbitmap, sizeof(bitmap), &bitmap )) return 0; + if (!GetObjectW( hbitmap, sizeof(ds), &ds )) return 0; if (startscan + lines > height) lines = height - startscan; @@ -3986,7 +3986,7 @@ INT X11DRV_SetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan, descr.ySrc = 0; descr.xDest = 0; descr.yDest = height - startscan - lines; - descr.width = bitmap.bmWidth; + descr.width = ds.dsBm.bmWidth; descr.height = lines; descr.useShm = FALSE; descr.dibpitch = ((descr.infoWidth * descr.infoBpp + 31) &~31) / 8; @@ -3998,27 +3998,27 @@ INT X11DRV_SetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan, * cheap - saves a round trip to the X server */ if (descr.compression == BI_RGB && coloruse == DIB_RGB_COLORS && - descr.infoBpp == bitmap.bmBitsPixel && + descr.infoBpp == ds.dsBm.bmBitsPixel && physBitmap->base && physBitmap->size < 65536) { - unsigned int srcwidthb = bitmap.bmWidthBytes; + unsigned int srcwidthb = ds.dsBm.bmWidthBytes; int dstwidthb = X11DRV_DIB_GetDIBWidthBytes( width, descr.infoBpp ); LPBYTE dbits = physBitmap->base, sbits = (LPBYTE)bits + (startscan * srcwidthb); int widthb; UINT y; TRACE("syncing compatible set bits to app bits\n"); - if ((tmpheight < 0) ^ (bitmap.bmHeight < 0)) + if ((tmpheight < 0) ^ (ds.dsBmih.biHeight < 0)) { dbits += dstwidthb * (lines-1); dstwidthb = -dstwidthb; } - X11DRV_DIB_DoProtectDIBSection( physBitmap, PAGE_READWRITE ); + X11DRV_DIB_DoProtectDIBSection( physBitmap, PAGE_READWRITE ); widthb = min(srcwidthb, abs(dstwidthb)); for (y = 0; y < lines; y++, dbits += dstwidthb, sbits += srcwidthb) memcpy(dbits, sbits, widthb); - X11DRV_DIB_DoProtectDIBSection( physBitmap, PAGE_READONLY ); - physBitmap->status = DIB_Status_InSync; + X11DRV_DIB_DoProtectDIBSection( physBitmap, PAGE_READONLY ); + physBitmap->status = DIB_Status_InSync; } X11DRV_DIB_Unlock( physBitmap, TRUE );

1 0

Hans Leidekker : winhttp: Don' t loop on response codes other than 301 and 302.
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: f8f9c4cb9cc45075b829e3ffbdeb88a6c00c0ece URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8f9c4cb9cc45075b829e3ffb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 9 16:42:11 2008 +0200 winhttp: Don't loop on response codes other than 301 and 302. --- dlls/winhttp/request.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index b11c426..ada8ae6 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1267,14 +1267,16 @@ static BOOL receive_response( request_t *request, BOOL async ) if (!query_headers( request, query, NULL, &request->content_length, &size, NULL )) request->content_length = ~0UL; - if (status == 200) break; if (status == 301 || status == 302) { if (request->hdr.disable_flags & WINHTTP_DISABLE_REDIRECTS) break; drain_content( request ); if (!(ret = handle_redirect( request ))) break; + ret = send_request( request, NULL, 0, NULL, 0, 0, 0, FALSE ); /* recurse synchronously */ + continue; } - ret = send_request( request, NULL, 0, NULL, 0, 0, 0, FALSE ); /* recurse synchronously */ + if (status == 401) FIXME("authentication not supported\n"); + break; } if (async)

1 0

Hans Leidekker : winhttp: Increase sleep between two tests that connect to the same host.
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: ddbe713e6bdfedd0da03523f91ee3ecde59ad8ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddbe713e6bdfedd0da03523f9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 9 16:43:57 2008 +0200 winhttp: Increase sleep between two tests that connect to the same host. --- dlls/winhttp/tests/notification.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 784e350..049e7ca 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -152,7 +152,7 @@ static void test_connection_cache( void ) WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); - Sleep(1500); /* make sure connection is evicted from cache */ + Sleep(2000); /* make sure connection is evicted from cache */ info.index = 0; @@ -375,6 +375,6 @@ START_TEST (notification) { test_connection_cache(); test_redirect(); - Sleep(1500); /* make sure previous connection is evicted from cache */ + Sleep(2000); /* make sure previous connection is evicted from cache */ test_async(); }

1 0

Hans Leidekker : winhttp: Better diagnostics in the notification test.
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: 3cfa9c626f92f24f0f7e893bb5c079571fc493ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cfa9c626f92f24f0f7e893bb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 9 16:45:04 2008 +0200 winhttp: Better diagnostics in the notification test. --- dlls/winhttp/tests/notification.c | 67 +++++++++++++++++++++--------------- 1 files changed, 39 insertions(+), 28 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 049e7ca..64adaea 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -54,10 +54,12 @@ struct info unsigned int count; unsigned int index; HANDLE wait; + unsigned int line; }; static void CALLBACK check_notification( HINTERNET handle, DWORD_PTR context, DWORD status, LPVOID buffer, DWORD buflen ) { + BOOL status_ok, function_ok; struct info *info = (struct info *)context; unsigned int i = info->index; @@ -68,20 +70,23 @@ static void CALLBACK check_notification( HINTERNET handle, DWORD_PTR context, DW } ok(i < info->count, "unexpected notification 0x%08x\n", status); if (i >= info->count) return; + + status_ok = (info->test[i].status == status); + function_ok = (info->test[i].function == info->function); if (!info->test[i].todo) { - ok(info->test[i].status == status, "expected status 0x%08x got 0x%08x\n", info->test[i].status, status); - ok(info->test[i].function == info->function, "expected function %u got %u\n", info->test[i].function, info->function); + ok(status_ok, "%u: expected status 0x%08x got 0x%08x\n", info->line, info->test[i].status, status); + ok(function_ok, "%u: expected function %u got %u\n", info->line, info->test[i].function, info->function); } else { - todo_wine ok(info->test[i].status == status, "expected status 0x%08x got 0x%08x\n", info->test[i].status, status); - if (info->test[i].status == status) + todo_wine ok(status_ok, "%u: expected status 0x%08x got 0x%08x\n", info->line, info->test[i].status, status); + if (status_ok) { - todo_wine ok(info->test[i].function == info->function, "expected function %u got %u\n", info->test[i].function, info->function); + todo_wine ok(function_ok, "%u: expected function %u got %u\n", info->line, info->test[i].function, info->function); } } - if (info->test[i].status == status) info->index++; + if (status_ok) info->index++; if (status & WINHTTP_CALLBACK_FLAG_ALL_COMPLETIONS) SetEvent( info->wait ); } @@ -104,6 +109,12 @@ static const struct notification cache_test[] = { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1 } }; +static void setup_test( struct info *info, enum api function, unsigned int line ) +{ + info->function = function; + info->line = line; +} + static void test_connection_cache( void ) { static const WCHAR codeweavers[] = {'w','w','w','.','c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0}; @@ -126,19 +137,19 @@ static void test_connection_cache( void ) ret = WinHttpSetOption( ses, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); ok(ret, "failed to set context value %u\n", GetLastError()); - info.function = winhttp_connect; + setup_test( &info, winhttp_connect, __LINE__ ); con = WinHttpConnect( ses, codeweavers, 0, 0 ); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); - info.function = winhttp_open_request; + setup_test( &info, winhttp_open_request, __LINE__ ); req = WinHttpOpenRequest( con, NULL, NULL, NULL, NULL, NULL, 0 ); ok(req != NULL, "failed to open a request %u\n", GetLastError()); - info.function = winhttp_send_request; + setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); ok(ret, "failed to send request %u\n", GetLastError()); - info.function = winhttp_receive_response; + setup_test( &info, winhttp_receive_response, __LINE__ ); ret = WinHttpReceiveResponse( req, NULL ); ok(ret, "failed to receive response %u\n", GetLastError()); @@ -147,7 +158,7 @@ static void test_connection_cache( void ) ok(ret, "failed unexpectedly %u\n", GetLastError()); ok(status == 200, "request failed unexpectedly %u\n", status); - info.function = winhttp_close_handle; + setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); @@ -164,22 +175,22 @@ static void test_connection_cache( void ) ret = WinHttpSetOption( ses, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); ok(ret, "failed to set context value %u\n", GetLastError()); - info.function = winhttp_connect; + setup_test( &info, winhttp_connect, __LINE__ ); con = WinHttpConnect( ses, codeweavers, 0, 0 ); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); - info.function = winhttp_open_request; + setup_test( &info, winhttp_open_request, __LINE__ ); req = WinHttpOpenRequest( con, NULL, NULL, NULL, NULL, NULL, 0 ); ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSetOption( req, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); ok(ret, "failed to set context value %u\n", GetLastError()); - info.function = winhttp_send_request; + setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); ok(ret, "failed to send request %u\n", GetLastError()); - info.function = winhttp_receive_response; + setup_test( &info, winhttp_receive_response, __LINE__ ); ret = WinHttpReceiveResponse( req, NULL ); ok(ret, "failed to receive response %u\n", GetLastError()); @@ -188,7 +199,7 @@ static void test_connection_cache( void ) ok(ret, "failed unexpectedly %u\n", GetLastError()); ok(status == 200, "request failed unexpectedly %u\n", status); - info.function = winhttp_close_handle; + setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); @@ -244,18 +255,18 @@ static void test_redirect( void ) ret = WinHttpSetOption( ses, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); ok(ret, "failed to set context value %u\n", GetLastError()); - info.function = winhttp_connect; + setup_test( &info, winhttp_connect, __LINE__ ); con = WinHttpConnect( ses, codeweavers, 0, 0 ); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); - info.function = winhttp_open_request; + setup_test( &info, winhttp_open_request, __LINE__ ); req = WinHttpOpenRequest( con, NULL, NULL, NULL, NULL, NULL, 0 ); ok(req != NULL, "failed to open a request %u\n", GetLastError()); - info.function = winhttp_send_request; + setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); - info.function = winhttp_receive_response; + setup_test( &info, winhttp_receive_response, __LINE__ ); ret = WinHttpReceiveResponse( req, NULL ); ok(ret, "failed to receive response %u\n", GetLastError()); @@ -264,7 +275,7 @@ static void test_redirect( void ) ok(ret, "failed unexpectedly %u\n", GetLastError()); ok(status == 200, "request failed unexpectedly %u\n", status); - info.function = winhttp_close_handle; + setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); @@ -327,21 +338,21 @@ static void test_async( void ) ret = WinHttpSetOption( ses, WINHTTP_OPTION_CONTEXT_VALUE, &context, sizeof(struct info *) ); ok(ret, "failed to set context value %u\n", GetLastError()); - info.function = winhttp_connect; + setup_test( &info, winhttp_connect, __LINE__ ); con = WinHttpConnect( ses, codeweavers, 0, 0 ); ok(con != NULL, "failed to open a connection %u\n", GetLastError()); - info.function = winhttp_open_request; + setup_test( &info, winhttp_open_request, __LINE__ ); req = WinHttpOpenRequest( con, NULL, NULL, NULL, NULL, NULL, 0 ); ok(req != NULL, "failed to open a request %u\n", GetLastError()); - info.function = winhttp_send_request; + setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); ok(ret, "failed to send request %u\n", GetLastError()); WaitForSingleObject( info.wait, INFINITE ); - info.function = winhttp_receive_response; + setup_test( &info, winhttp_receive_response, __LINE__ ); ret = WinHttpReceiveResponse( req, NULL ); ok(ret, "failed to receive response %u\n", GetLastError()); @@ -352,19 +363,19 @@ static void test_async( void ) ok(ret, "failed unexpectedly %u\n", GetLastError()); ok(status == 200, "request failed unexpectedly %u\n", status); - info.function = winhttp_query_data; + setup_test( &info, winhttp_query_data, __LINE__ ); ret = WinHttpQueryDataAvailable( req, NULL ); ok(ret, "failed to query data available %u\n", GetLastError()); WaitForSingleObject( info.wait, INFINITE ); - info.function = winhttp_read_data; + setup_test( &info, winhttp_read_data, __LINE__ ); ret = WinHttpReadData( req, buffer, sizeof(buffer), NULL ); ok(ret, "failed to query data available %u\n", GetLastError()); WaitForSingleObject( info.wait, INFINITE ); - info.function = winhttp_close_handle; + setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses );

1 0

Alexandre Julliard : configure: Fixed the check for sigset_t on mingw.
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: 43048397d66d99305fc08d41b1fa4206175cad20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43048397d66d99305fc08d41b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 9 14:47:47 2008 +0200 configure: Fixed the check for sigset_t on mingw. --- configure | 1 + configure.ac | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 7be7427..e898943 100755 --- a/configure +++ b/configure @@ -18729,6 +18729,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include <sys/types.h> #include <signal.h> typedef sigset_t ac__type_new_; diff --git a/configure.ac b/configure.ac index 46d071e..27ae9ef 100644 --- a/configure.ac +++ b/configure.ac @@ -1487,7 +1487,8 @@ dnl **** Check for types **** AC_C_CONST AC_C_INLINE AC_CHECK_TYPES([mode_t, off_t, pid_t, size_t, ssize_t, long long, fsblkcnt_t, fsfilcnt_t]) -AC_CHECK_TYPES([sigset_t],,,[#include <signal.h>]) +AC_CHECK_TYPES([sigset_t],,,[#include <sys/types.h> +#include <signal.h>]) AC_CHECK_TYPES([request_sense],,,[#include <linux/cdrom.h>]) AC_CHECK_MEMBERS([struct ff_effect.direction],,,

1 0

Paul Vriens : ws2_32/tests: Remove redundant NULL check before HeapFree.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: c8aba692af267f25ce5f43e0747e6c67fa7ab216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8aba692af267f25ce5f43e07… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Sep 9 11:45:40 2008 +0200 ws2_32/tests: Remove redundant NULL check before HeapFree. --- dlls/ws2_32/tests/sock.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5883078..4b8c57f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2187,8 +2187,7 @@ static void test_write_events(void) } end: - if (buffer != NULL) - HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, buffer); if (src != INVALID_SOCKET) closesocket(src); if (dst != INVALID_SOCKET)

1 0

Rob Shearman : include: Fix function names in IVBSAXXMLReader interface in msxml2.idl.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: 60b4feedca740f7f8c4ed484dca87b90845f6c0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=60b4feedca740f7f8c4ed484d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Sep 9 10:26:51 2008 +0100 include: Fix function names in IVBSAXXMLReader interface in msxml2.idl. --- dlls/msxml3/saxreader.c | 56 +++++++++++++++++++++++----------------------- include/msxml2.idl | 28 +++++++++++----------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 4821a60..d0ba6b5 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2172,7 +2172,7 @@ static HRESULT WINAPI saxxmlreader_putProperty( return E_NOTIMPL; } -static HRESULT WINAPI saxxmlreader_getEntityResolver( +static HRESULT WINAPI saxxmlreader_get_entityResolver( IVBSAXXMLReader* iface, IVBSAXEntityResolver **pEntityResolver) { @@ -2180,7 +2180,7 @@ static HRESULT WINAPI saxxmlreader_getEntityResolver( return internal_getEntityResolver(This, pEntityResolver, TRUE); } -static HRESULT WINAPI saxxmlreader_putEntityResolver( +static HRESULT WINAPI saxxmlreader_put_entityResolver( IVBSAXXMLReader* iface, IVBSAXEntityResolver *pEntityResolver) { @@ -2188,7 +2188,7 @@ static HRESULT WINAPI saxxmlreader_putEntityResolver( return internal_putEntityResolver(This, pEntityResolver, TRUE); } -static HRESULT WINAPI saxxmlreader_getContentHandler( +static HRESULT WINAPI saxxmlreader_get_contentHandler( IVBSAXXMLReader* iface, IVBSAXContentHandler **ppContentHandler) { @@ -2196,7 +2196,7 @@ static HRESULT WINAPI saxxmlreader_getContentHandler( return internal_getContentHandler(This, ppContentHandler, TRUE); } -static HRESULT WINAPI saxxmlreader_putContentHandler( +static HRESULT WINAPI saxxmlreader_put_contentHandler( IVBSAXXMLReader* iface, IVBSAXContentHandler *contentHandler) { @@ -2204,7 +2204,7 @@ static HRESULT WINAPI saxxmlreader_putContentHandler( return internal_putContentHandler(This, contentHandler, TRUE); } -static HRESULT WINAPI saxxmlreader_getDTDHandler( +static HRESULT WINAPI saxxmlreader_get_dtdHandler( IVBSAXXMLReader* iface, IVBSAXDTDHandler **pDTDHandler) { @@ -2212,7 +2212,7 @@ static HRESULT WINAPI saxxmlreader_getDTDHandler( return internal_getDTDHandler(This, pDTDHandler, TRUE); } -static HRESULT WINAPI saxxmlreader_putDTDHandler( +static HRESULT WINAPI saxxmlreader_put_dtdHandler( IVBSAXXMLReader* iface, IVBSAXDTDHandler *pDTDHandler) { @@ -2220,7 +2220,7 @@ static HRESULT WINAPI saxxmlreader_putDTDHandler( return internal_putDTDHandler(This, pDTDHandler, TRUE); } -static HRESULT WINAPI saxxmlreader_getErrorHandler( +static HRESULT WINAPI saxxmlreader_get_errorHandler( IVBSAXXMLReader* iface, IVBSAXErrorHandler **pErrorHandler) { @@ -2228,7 +2228,7 @@ static HRESULT WINAPI saxxmlreader_getErrorHandler( return internal_getErrorHandler(This, pErrorHandler, TRUE); } -static HRESULT WINAPI saxxmlreader_putErrorHandler( +static HRESULT WINAPI saxxmlreader_put_errorHandler( IVBSAXXMLReader* iface, IVBSAXErrorHandler *errorHandler) { @@ -2236,7 +2236,7 @@ static HRESULT WINAPI saxxmlreader_putErrorHandler( return internal_putErrorHandler(This, errorHandler, TRUE); } -static HRESULT WINAPI saxxmlreader_getBaseURL( +static HRESULT WINAPI saxxmlreader_get_baseURL( IVBSAXXMLReader* iface, const WCHAR **pBaseUrl) { @@ -2246,7 +2246,7 @@ static HRESULT WINAPI saxxmlreader_getBaseURL( return E_NOTIMPL; } -static HRESULT WINAPI saxxmlreader_putBaseURL( +static HRESULT WINAPI saxxmlreader_put_baseURL( IVBSAXXMLReader* iface, const WCHAR *pBaseUrl) { @@ -2256,7 +2256,7 @@ static HRESULT WINAPI saxxmlreader_putBaseURL( return E_NOTIMPL; } -static HRESULT WINAPI saxxmlreader_getSecureBaseURL( +static HRESULT WINAPI saxxmlreader_get_secureBaseURL( IVBSAXXMLReader* iface, const WCHAR **pSecureBaseUrl) { @@ -2267,7 +2267,7 @@ static HRESULT WINAPI saxxmlreader_getSecureBaseURL( } -static HRESULT WINAPI saxxmlreader_putSecureBaseURL( +static HRESULT WINAPI saxxmlreader_put_secureBaseURL( IVBSAXXMLReader* iface, const WCHAR *secureBaseUrl) { @@ -2306,18 +2306,18 @@ static const struct IVBSAXXMLReaderVtbl saxreader_vtbl = saxxmlreader_putFeature, saxxmlreader_getProperty, saxxmlreader_putProperty, - saxxmlreader_getEntityResolver, - saxxmlreader_putEntityResolver, - saxxmlreader_getContentHandler, - saxxmlreader_putContentHandler, - saxxmlreader_getDTDHandler, - saxxmlreader_putDTDHandler, - saxxmlreader_getErrorHandler, - saxxmlreader_putErrorHandler, - saxxmlreader_getBaseURL, - saxxmlreader_putBaseURL, - saxxmlreader_getSecureBaseURL, - saxxmlreader_putSecureBaseURL, + saxxmlreader_get_entityResolver, + saxxmlreader_put_entityResolver, + saxxmlreader_get_contentHandler, + saxxmlreader_put_contentHandler, + saxxmlreader_get_dtdHandler, + saxxmlreader_put_dtdHandler, + saxxmlreader_get_errorHandler, + saxxmlreader_put_errorHandler, + saxxmlreader_get_baseURL, + saxxmlreader_put_baseURL, + saxxmlreader_get_secureBaseURL, + saxxmlreader_put_secureBaseURL, saxxmlreader_parse, saxxmlreader_parseURL }; @@ -2456,7 +2456,7 @@ static HRESULT WINAPI isaxxmlreader_getBaseURL( const WCHAR **pBaseUrl) { saxreader *This = impl_from_ISAXXMLReader( iface ); - return IVBSAXXMLReader_get_getBaseURL( + return IVBSAXXMLReader_get_baseURL( (IVBSAXXMLReader*)&This->lpVBSAXXMLReaderVtbl, pBaseUrl); } @@ -2466,7 +2466,7 @@ static HRESULT WINAPI isaxxmlreader_putBaseURL( const WCHAR *pBaseUrl) { saxreader *This = impl_from_ISAXXMLReader( iface ); - return IVBSAXXMLReader_put_putBaseURL( + return IVBSAXXMLReader_put_baseURL( (IVBSAXXMLReader*)&This->lpVBSAXXMLReaderVtbl, pBaseUrl); } @@ -2476,7 +2476,7 @@ static HRESULT WINAPI isaxxmlreader_getSecureBaseURL( const WCHAR **pSecureBaseUrl) { saxreader *This = impl_from_ISAXXMLReader( iface ); - return IVBSAXXMLReader_get_getSecureBaseURL( + return IVBSAXXMLReader_get_secureBaseURL( (IVBSAXXMLReader*)&This->lpVBSAXXMLReaderVtbl, pSecureBaseUrl); } @@ -2486,7 +2486,7 @@ static HRESULT WINAPI isaxxmlreader_putSecureBaseURL( const WCHAR *secureBaseUrl) { saxreader *This = impl_from_ISAXXMLReader( iface ); - return IVBSAXXMLReader_put_putSecureBaseURL( + return IVBSAXXMLReader_put_secureBaseURL( (IVBSAXXMLReader*)&This->lpVBSAXXMLReaderVtbl, secureBaseUrl); } diff --git a/include/msxml2.idl b/include/msxml2.idl index ab10f14..eae84c4 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -1736,40 +1736,40 @@ interface IVBSAXXMLReader : IDispatch HRESULT putProperty( [in] const WCHAR * pProp, [in] VARIANT value); [propget, id(DISPID_SAX_XMLREADER_ENTITYRESOLVER)] - HRESULT getEntityResolver( + HRESULT entityResolver( [out, retval] IVBSAXEntityResolver ** ppEntityResolver); [propputref, id(DISPID_SAX_XMLREADER_ENTITYRESOLVER)] - HRESULT putEntityResolver( [in] IVBSAXEntityResolver * pEntityResolver); + HRESULT entityResolver( [in] IVBSAXEntityResolver * pEntityResolver); [propget, id(DISPID_SAX_XMLREADER_CONTENTHANDLER)] - HRESULT getContentHandler( + HRESULT contentHandler( [out, retval] IVBSAXContentHandler ** pContentHandler); [propputref, id(DISPID_SAX_XMLREADER_CONTENTHANDLER)] - HRESULT putContentHandler([in] IVBSAXContentHandler * contentHandler); + HRESULT contentHandler([in] IVBSAXContentHandler * contentHandler); [propget, id(DISPID_SAX_XMLREADER_DTDHANDLER)] - HRESULT getDTDHandler([out, retval] IVBSAXDTDHandler ** pDTDHandler); + HRESULT dtdHandler([out, retval] IVBSAXDTDHandler ** pDTDHandler); [propputref, id(DISPID_SAX_XMLREADER_DTDHANDLER)] - HRESULT putDTDHandler([in] IVBSAXDTDHandler * pDTDHandler); + HRESULT dtdHandler([in] IVBSAXDTDHandler * pDTDHandler); [propget, id(DISPID_SAX_XMLREADER_ERRORHANDLER)] - HRESULT getErrorHandler([out, retval] IVBSAXErrorHandler ** pErrorHandler); + HRESULT errorHandler([out, retval] IVBSAXErrorHandler ** pErrorHandler); [propputref, id(DISPID_SAX_XMLREADER_ERRORHANDLER)] - HRESULT putErrorHandler([in] IVBSAXErrorHandler * errorHandler); + HRESULT errorHandler([in] IVBSAXErrorHandler * errorHandler); [propget, id(DISPID_SAX_XMLREADER_BASEURL)] - HRESULT getBaseURL([out, retval] const WCHAR ** pBaseUrl); + HRESULT baseURL([out, retval] const WCHAR ** pBaseUrl); [propput, id(DISPID_SAX_XMLREADER_BASEURL)] - HRESULT putBaseURL([in] const WCHAR * pBaseUrl); + HRESULT baseURL([in] const WCHAR * pBaseUrl); [propget, id(DISPID_SAX_XMLREADER_SECUREBASEURL)] - HRESULT getSecureBaseURL([out, retval] const WCHAR ** pSecureBaseUrl); + HRESULT secureBaseURL([out, retval] const WCHAR ** pSecureBaseUrl); [propput, id(DISPID_SAX_XMLREADER_SECUREBASEURL)] - HRESULT putSecureBaseURL([in] const WCHAR * secureBaseUrl); + HRESULT secureBaseURL([in] const WCHAR * secureBaseUrl); - [propget, id(DISPID_SAX_XMLREADER_PARSE)] + [id(DISPID_SAX_XMLREADER_PARSE)] HRESULT parse( [in] VARIANT varInput); - [propput, id(DISPID_SAX_XMLREADER_PARSE)] + [id(DISPID_SAX_XMLREADER_PARSEURL)] HRESULT parseURL([in] const WCHAR * url); }

1 0

Paul Vriens : quartz/tests: Fix the tests on several platforms.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: ee14852ea9d064fe8249edce602239cf528d6575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee14852ea9d064fe8249edce6… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Sep 9 10:50:51 2008 +0200 quartz/tests: Fix the tests on several platforms. --- dlls/quartz/tests/avisplitter.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index 82fd4cf..f4c8157 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -206,11 +206,8 @@ static void test_threads() return; } - /* Before doing anything */ + /* Before doing anything (number of threads at the start differs per OS) */ baselevel = count_threads(); - expected = 1; - ok(baselevel == expected, - "Basic amount of threads should be %d, not %d!\n", expected, baselevel); file = CreateFileW(wfile, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); @@ -374,11 +371,7 @@ static void test_threads() IBaseFilter_GetState(pavi, INFINITE, &state); curlevel = count_threads(); - /* On a 2 stream filter, there are 4 or 5 threads (seems to be 5) - * One is the thread we are in. That leaves 3 or 4 for other dark purposes - * Wine is 1 thread short! - */ - ok(curlevel == expected || curlevel == expected + 1, + ok(curlevel == expected, "Amount of threads should be %d not %d\n", expected, curlevel); IBaseFilter_Pause(pavi); @@ -452,8 +445,10 @@ fail: if (pfile) IUnknown_Release(pfile); - ok(baselevel == 1, - "Basic amount of threads should be %d, not %d!\n", 1, baselevel); + curlevel = count_threads(); + todo_wine + ok(curlevel == baselevel, + "Amount of threads should be %d not %d\n", baselevel, curlevel); } START_TEST(avisplitter)

1 0