September 2011 - Wine-commits

Francois Gouget : comctl32: Property sheets must be able to redraw themselves even if no page is selected .
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: 6deccab6c9c585f739fa4b4c4b071ad4fdbeb064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6deccab6c9c585f739fa4b4c4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 6 00:13:38 2011 +0200 comctl32: Property sheets must be able to redraw themselves even if no page is selected. --- dlls/comctl32/propsheet.c | 11 +++++++---- dlls/comctl32/tests/propsheet.c | 28 +++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 3dd0713..e6d2d30 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -3201,17 +3201,20 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam) WCHAR szBuffer[256]; int nLength; - if (psInfo->active_page < 0) return 1; hdc = hdcParam ? hdcParam : BeginPaint(hwnd, &ps); if (!hdc) return 1; hdcSrc = CreateCompatibleDC(0); - ppshpage = (LPCPROPSHEETPAGEW)psInfo->proppage[psInfo->active_page].hpage; if (psInfo->ppshheader.dwFlags & PSH_USEHPLWATERMARK) hOldPal = SelectPalette(hdc, psInfo->ppshheader.hplWatermark, FALSE); - if ( (!(ppshpage->dwFlags & PSP_HIDEHEADER)) && + if (psInfo->active_page < 0) + ppshpage = NULL; + else + ppshpage = (LPCPROPSHEETPAGEW)psInfo->proppage[psInfo->active_page].hpage; + + if ( (ppshpage && !(ppshpage->dwFlags & PSP_HIDEHEADER)) && (psInfo->ppshheader.dwFlags & (PSH_WIZARD97_OLD | PSH_WIZARD97_NEW)) && (psInfo->ppshheader.dwFlags & PSH_HEADER) ) { @@ -3318,7 +3321,7 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam) SelectObject(hdcSrc, hbmp); } - if ( (ppshpage->dwFlags & PSP_HIDEHEADER) && + if ( (ppshpage && (ppshpage->dwFlags & PSP_HIDEHEADER)) && (psInfo->ppshheader.dwFlags & (PSH_WIZARD97_OLD | PSH_WIZARD97_NEW)) && (psInfo->ppshheader.dwFlags & PSH_WATERMARK) ) { diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 89c548f..e6c2bb5 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -33,6 +33,24 @@ static LONG active_page = -1; #define IDC_APPLY_BUTTON 12321 + +/* try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + MSG msg; + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + diff = time - GetTickCount(); + } +} + + static int CALLBACK sheet_callback(HWND hwnd, UINT msg, LPARAM lparam) { switch(msg) @@ -121,7 +139,8 @@ static void test_nopage(void) HPROPSHEETPAGE hpsp[1]; PROPSHEETPAGEA psp; PROPSHEETHEADERA psh; - HWND hdlg; + HWND hdlg, hpage; + MSG msg; memset(&psp, 0, sizeof(psp)); psp.dwSize = sizeof(psp); @@ -148,7 +167,14 @@ static void test_nopage(void) ShowWindow(hdlg,SW_NORMAL); SendMessage(hdlg, PSM_REMOVEPAGE, 0, 0); + hpage = PropSheet_GetCurrentPageHwnd(hdlg); + ok(hpage == NULL, "expected no current page, got %p, index=%d\n", hpage, PropSheet_HwndToIndex(hdlg, hpage)); + flush_events(); RedrawWindow(hdlg,NULL,NULL,RDW_UPDATENOW|RDW_ERASENOW); + + /* Check that the property sheet was fully redrawn */ + ok(!PeekMessage(&msg, 0, WM_PAINT, WM_PAINT, PM_NOREMOVE), + "expected no pending WM_PAINT messages\n"); DestroyWindow(hdlg); }

1 0

Bruno Jesus : ws2_32: Avoid an unhandled exception in WSAIoctl.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: 312f50a26f1c027488d188801f2574eb559d6521 URL: http://source.winehq.org/git/wine.git/?a=commit;h=312f50a26f1c027488d188801… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Sep 5 23:04:23 2011 -0300 ws2_32: Avoid an unhandled exception in WSAIoctl. --- dlls/ws2_32/socket.c | 15 +++++++++------ dlls/ws2_32/tests/sock.c | 13 +++++++++++++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 64abd93..ff3c282 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3365,17 +3365,20 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID } case WS_SIO_KEEPALIVE_VALS: { - struct tcp_keepalive *k = in_buff; - int keepalive = k->onoff ? 1 : 0; - int keepidle = k->keepalivetime / 1000; - int keepintvl = k->keepaliveinterval / 1000; + struct tcp_keepalive *k; + int keepalive, keepidle, keepintvl; - if (!in_buff) + if (!in_buff || in_size < sizeof(struct tcp_keepalive)) { - WSASetLastError(WSAEINVAL); + WSASetLastError(WSAEFAULT); return SOCKET_ERROR; } + k = in_buff; + keepalive = k->onoff ? 1 : 0; + keepidle = k->keepalivetime / 1000; + keepintvl = k->keepaliveinterval / 1000; + TRACE("onoff: %d, keepalivetime: %d, keepaliveinterval: %d\n", keepalive, keepidle, keepintvl); fd = get_sock_fd(s, 0, NULL); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9e6912c..fd6b8c2 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -26,6 +26,7 @@ #include <windows.h> #include <ws2tcpip.h> #include <mswsock.h> +#include <mstcpip.h> #include <stdio.h> #include "wine/test.h" @@ -2960,6 +2961,18 @@ static void test_ioctlsocket(void) ret = ioctlsocket(sock, SIOCATMARK, &arg); if(ret != SOCKET_ERROR) todo_wine ok(arg, "expected a non-zero value\n"); + + ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &arg, 0, NULL, 0, &arg, NULL, NULL); + ok(ret == SOCKET_ERROR, "WSAIoctl succeeded unexpectedly\n"); + ret = WSAGetLastError(); + ok(ret == WSAEFAULT || broken(ret == WSAEINVAL), "expected WSAEFAULT, got %d instead\n", ret); + + ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, NULL, sizeof(struct tcp_keepalive), NULL, 0, &arg, NULL, NULL); + ok(ret == SOCKET_ERROR, "WSAIoctl succeeded unexpectedly\n"); + ret = WSAGetLastError(); + ok(ret == WSAEFAULT || broken(ret == WSAEINVAL), "expected WSAEFAULT, got %d instead\n", ret); + + closesocket(sock); } static int drain_pause=0;

1 0

Frédéric Delanoy : cmd: Associate comments with their respective descripted structures in header file .
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: df699a89faaa30ccd6d8ec90b2b0ec4f3e4762eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=df699a89faaa30ccd6d8ec90b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Sep 5 17:57:54 2011 +0200 cmd: Associate comments with their respective descripted structures in header file. --- programs/cmd/wcmd.h | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 27d9d9a..462ecd9 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -30,7 +30,7 @@ #include <ctype.h> #include <wine/unicode.h> -/* Data structure to hold commands to be processed */ +/* Data structure to hold commands delimitors/separators */ typedef enum _CMDdelimiters { CMD_NONE, /* End of line or single & */ @@ -39,6 +39,8 @@ typedef enum _CMDdelimiters { CMD_PIPE /* Single | */ } CMD_DELIMITERS; +/* Data structure to hold commands to be processed */ + typedef struct _CMD_LIST { WCHAR *command; /* Command string to execute */ WCHAR *redirects; /* Redirects in place */ @@ -117,7 +119,7 @@ void WCMD_execute (const WCHAR *orig_command, const WCHAR *redirects, const WCHAR *parameter, const WCHAR *substitution, CMD_LIST **cmdList); -/* Data structure to hold context when executing batch files */ +/* Data structure to hold context when executing batch files */ typedef struct { WCHAR *command; /* The command which invoked the batch file */ @@ -129,7 +131,7 @@ typedef struct { CMD_LIST *toExecute; /* Commands left to be executed */ } BATCH_CONTEXT; -/* Data structure to save setlocal and pushd information */ +/* Data structure to handle building lists during recursive calls */ struct env_stack { @@ -141,7 +143,7 @@ struct env_stack WCHAR *strings; }; -/* Data structure to handle building lists during recursive calls */ +/* Data structure to save setlocal and pushd information */ typedef struct _DIRECTORY_STACK {

1 0

Henri Verbeet : wined3d: Don' t override the swapchain present interval in IWineD3DSurfaceImpl_BltOverride ().
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: b86d69de16a42abe2648215e609dcf36f5d0f462 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b86d69de16a42abe2648215e6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 5 21:15:51 2011 +0200 wined3d: Don't override the swapchain present interval in IWineD3DSurfaceImpl_BltOverride(). --- dlls/wined3d/surface.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index de97735..3c88668 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5346,7 +5346,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa */ dstSwapchain->presentParms.SwapEffect = WINED3DSWAPEFFECT_COPY; - dstSwapchain->presentParms.PresentationInterval = WINED3DPRESENT_INTERVAL_IMMEDIATE; TRACE("Full screen back buffer -> front buffer blt, performing a flip instead.\n"); wined3d_swapchain_present(dstSwapchain, NULL, NULL, dstSwapchain->win_handle, NULL, 0);

1 0

Henri Verbeet : wined3d: Try doing a present in wined3d_surface_blt() instead of IWineD3DSurfaceImpl_BltOverride().
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: 1b9bc1a950294cd0b038975c8517655807c959ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b9bc1a950294cd0b038975c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 5 21:15:52 2011 +0200 wined3d: Try doing a present in wined3d_surface_blt() instead of IWineD3DSurfaceImpl_BltOverride(). --- dlls/wined3d/surface.c | 74 +++++++++++++++-------------------------------- 1 files changed, 24 insertions(+), 50 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3c88668..706c70a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1462,7 +1462,7 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC struct wined3d_surface *src_surface, const RECT *src_rect_in, DWORD flags, const WINEDDBLTFX *fx, WINED3DTEXTUREFILTERTYPE filter) { - const struct wined3d_swapchain *src_swapchain, *dst_swapchain; + struct wined3d_swapchain *src_swapchain, *dst_swapchain; struct wined3d_device *device = dst_surface->resource.device; DWORD src_ds_flags, dst_ds_flags; RECT src_rect, dst_rect; @@ -1661,6 +1661,29 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC { TRACE("Color blit.\n"); + /* Use present for back -> front blits. The idea behind this is + * that present is potentially faster than a blit, in particular + * when FBO blits aren't available. Some ddraw applications like + * Half-Life and Prince of Persia 3D use Blt() from the backbuffer + * to the frontbuffer instead of doing a Flip(). D3D8 and D3D9 + * applications can't blit directly to the frontbuffer. */ + if (dst_swapchain && dst_swapchain->back_buffers + && dst_surface == dst_swapchain->front_buffer + && src_surface == dst_swapchain->back_buffers[0]) + { + WINED3DSWAPEFFECT swap_effect = dst_swapchain->presentParms.SwapEffect; + + TRACE("Using present for backbuffer -> frontbuffer blit.\n"); + + /* Set the swap effect to COPY, we don't want the backbuffer + * to become undefined. */ + dst_swapchain->presentParms.SwapEffect = WINED3DSWAPEFFECT_COPY; + wined3d_swapchain_present(dst_swapchain, NULL, NULL, dst_swapchain->win_handle, NULL, 0); + dst_swapchain->presentParms.SwapEffect = swap_effect; + + return WINED3D_OK; + } + if (fbo_blit_supported(&device->adapter->gl_info, WINED3D_BLIT_OP_COLOR_BLIT, &src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format, &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) @@ -5312,55 +5335,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa return WINED3DERR_INVALIDCALL; } - /* The only case where both surfaces on a swapchain are supported is a - * back buffer -> front buffer blit on the same swapchain. */ - if (dstSwapchain && dstSwapchain->back_buffers - && dst_surface == dstSwapchain->front_buffer - && src_surface == dstSwapchain->back_buffers[0]) - { - /* Half-Life does a Blt from the back buffer to the front buffer, - * Full surface size, no flags... Use present instead - * - * This path will only be entered for d3d7 and ddraw apps, because - * d3d8/9 offer no way to blit to the front buffer. */ - for (;;) - { - /* These flags are unimportant for the flag check, remove them */ - if (!(flags & ~(WINEDDBLT_DONOTWAIT | WINEDDBLT_WAIT))) - { - WINED3DSWAPEFFECT orig_swap = dstSwapchain->presentParms.SwapEffect; - - /* The idea behind this is that a glReadPixels and a glDrawPixels call - * take very long, while a flip is fast. - * This applies to Half-Life, which does such Blts every time it finished - * a frame, and to Prince of Persia 3D, which uses this to draw at least the main - * menu. This is also used by all apps when they do windowed rendering - * - * The problem is that flipping is not really the same as copying. After a - * Blt the front buffer is a copy of the back buffer, and the back buffer is - * untouched. Therefore it's necessary to override the swap effect - * and to set it back after the flip. - * - * Windowed Direct3D < 7 apps do the same. The D3D7 sdk demos are nice - * testcases. - */ - - dstSwapchain->presentParms.SwapEffect = WINED3DSWAPEFFECT_COPY; - - TRACE("Full screen back buffer -> front buffer blt, performing a flip instead.\n"); - wined3d_swapchain_present(dstSwapchain, NULL, NULL, dstSwapchain->win_handle, NULL, 0); - - dstSwapchain->presentParms.SwapEffect = orig_swap; - - return WINED3D_OK; - } - break; - } - - TRACE("Unsupported blit between buffers on the same swapchain\n"); - return WINED3DERR_INVALIDCALL; - } - if (dstSwapchain && dstSwapchain == srcSwapchain) { FIXME("Implement hardware blit between two surfaces on the same swapchain\n");

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_index_buffer() const.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: cb82e57290e982c1fd04d9d906e72d34a32b6d61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb82e57290e982c1fd04d9d90… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 5 21:15:53 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_index_buffer() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 966beb5..b7bb19f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2402,7 +2402,7 @@ HRESULT CDECL wined3d_device_set_index_buffer(struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_index_buffer(struct wined3d_device *device, struct wined3d_buffer **buffer) +HRESULT CDECL wined3d_device_get_index_buffer(const struct wined3d_device *device, struct wined3d_buffer **buffer) { TRACE("device %p, buffer %p.\n", device, buffer); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f25a0f5..223812b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2221,7 +2221,8 @@ HRESULT __cdecl wined3d_device_get_display_mode(struct wined3d_device *device, HRESULT __cdecl wined3d_device_get_front_buffer_data(struct wined3d_device *device, UINT swapchain_idx, struct wined3d_surface *dst_surface); void __cdecl wined3d_device_get_gamma_ramp(struct wined3d_device *device, UINT swapchain_idx, WINED3DGAMMARAMP *ramp); -HRESULT __cdecl wined3d_device_get_index_buffer(struct wined3d_device *device, struct wined3d_buffer **index_buffer); +HRESULT __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device, + struct wined3d_buffer **index_buffer); HRESULT __cdecl wined3d_device_get_light(const struct wined3d_device *device, UINT light_idx, WINED3DLIGHT *light); HRESULT __cdecl wined3d_device_get_light_enable(const struct wined3d_device *device, UINT light_idx, BOOL *enable); HRESULT __cdecl wined3d_device_get_material(const struct wined3d_device *device, WINED3DMATERIAL *material);

1 0

Piotr Caban : msvcrt: Fix _vswprintf* arguments.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: b7ea63118ae1036b2a28ccbfafb43295362dd92e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7ea63118ae1036b2a28ccbfa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 5 19:32:53 2011 +0200 msvcrt: Fix _vswprintf* arguments. --- dlls/msvcrt/msvcrt.spec | 8 ++-- dlls/msvcrt/tests/printf.c | 123 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 127 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 2186904..b293e5e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1047,10 +1047,10 @@ @ cdecl _vsprintf_p(ptr long str ptr) MSVCRT_vsprintf_p @ cdecl _vsprintf_p_l(ptr long str ptr ptr) MSVCRT_vsprintf_p_l # stub _vsprintf_s_l(ptr long str ptr ptr) -@ cdecl _vswprintf(ptr long wstr ptr) MSVCRT_vswprintf -@ cdecl _vswprintf_c(ptr long wstr ptr) MSVCRT_vswprintf -@ cdecl _vswprintf_c_l(ptr long wstr ptr ptr) MSVCRT_vswprintf_l -@ cdecl _vswprintf_l(ptr long wstr ptr ptr) MSVCRT_vswprintf_l +@ cdecl _vswprintf(ptr wstr ptr) MSVCRT_vswprintf +@ cdecl _vswprintf_c(ptr long wstr ptr) MSVCRT_vsnwprintf +@ cdecl _vswprintf_c_l(ptr long wstr ptr ptr) MSVCRT_vsnwprintf_l +@ cdecl _vswprintf_l(ptr wstr ptr ptr) MSVCRT_vswprintf_l @ cdecl _vswprintf_p_l(ptr long wstr ptr ptr) MSVCRT_vswprintf_p_l @ cdecl _vswprintf_s_l(ptr long wstr ptr ptr) MSVCRT_vswprintf_s_l # stub _vwprintf_l(wstr ptr ptr) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index eb34ad8..978b512 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -45,6 +45,16 @@ static int (__cdecl *p__fcvt_s)(char *buffer, size_t length, double number, int ndigits, int *decpt, int *sign); static unsigned int (__cdecl *p__get_output_format)(void); static int (__cdecl *p__vsprintf_p)(char*, size_t, const char*, __ms_va_list); +static int (__cdecl *p_vswprintf)(wchar_t *str, const wchar_t *format, __ms_va_list valist); +static int (__cdecl *p__vswprintf)(wchar_t *str, const wchar_t *format, __ms_va_list valist); +static int (__cdecl *p__vswprintf_l)(wchar_t *str, const wchar_t *format, + void *locale, __ms_va_list valist); +static int (__cdecl *p__vswprintf_c)(wchar_t *str, size_t size, const wchar_t *format, + __ms_va_list valist); +static int (__cdecl *p__vswprintf_c_l)(wchar_t *str, size_t size, const wchar_t *format, + void *locale, __ms_va_list valist); +static int (__cdecl *p__vswprintf_p_l)(wchar_t *str, size_t size, const wchar_t *format, + void *locale, __ms_va_list valist); static void init( void ) { @@ -57,6 +67,12 @@ static void init( void ) p__fcvt_s = (void *)GetProcAddress(hmod, "_fcvt_s"); p__get_output_format = (void *)GetProcAddress(hmod, "_get_output_format"); p__vsprintf_p = (void*)GetProcAddress(hmod, "_vsprintf_p"); + p_vswprintf = (void*)GetProcAddress(hmod, "vswprintf"); + p__vswprintf = (void*)GetProcAddress(hmod, "_vswprintf"); + p__vswprintf_l = (void*)GetProcAddress(hmod, "_vswprintf_l"); + p__vswprintf_c = (void*)GetProcAddress(hmod, "_vswprintf_c"); + p__vswprintf_c_l = (void*)GetProcAddress(hmod, "_vswprintf_c_l"); + p__vswprintf_p_l = (void*)GetProcAddress(hmod, "_vswprintf_p_l"); } static void test_sprintf( void ) @@ -943,6 +959,112 @@ static void test_vsnwprintf(void) ok( !strcmp(buf, "onetwothree"), "got %s expected 'onetwothree'\n", buf ); } +static int __cdecl vswprintf_wrapper(wchar_t *str, const wchar_t *format, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, format); + ret = p_vswprintf(str, format, valist); + __ms_va_end(valist); + return ret; +} + +static int __cdecl _vswprintf_wrapper(wchar_t *str, const wchar_t *format, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, format); + ret = p__vswprintf(str, format, valist); + __ms_va_end(valist); + return ret; +} + +static int __cdecl _vswprintf_l_wrapper(wchar_t *str, const wchar_t *format, void *locale, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, locale); + ret = p__vswprintf_l(str, format, locale, valist); + __ms_va_end(valist); + return ret; +} + +static int __cdecl _vswprintf_c_wrapper(wchar_t *str, size_t size, const wchar_t *format, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, format); + ret = p__vswprintf_c(str, size, format, valist); + __ms_va_end(valist); + return ret; +} + +static int __cdecl _vswprintf_c_l_wrapper(wchar_t *str, size_t size, const wchar_t *format, void *locale, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, locale); + ret = p__vswprintf_c_l(str, size, format, locale, valist); + __ms_va_end(valist); + return ret; +} + +static int __cdecl _vswprintf_p_l_wrapper(wchar_t *str, size_t size, const wchar_t *format, void *locale, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, locale); + ret = p__vswprintf_p_l(str, size, format, locale, valist); + __ms_va_end(valist); + return ret; +} + +static void test_vswprintf(void) +{ + const wchar_t format[] = {'%','s',' ','%','d',0}; + const wchar_t number[] = {'n','u','m','b','e','r',0}; + const wchar_t out[] = {'n','u','m','b','e','r',' ','1','2','3',0}; + wchar_t buf[20]; + + int ret; + + if (!p_vswprintf || !p__vswprintf || !p__vswprintf_l ||!p__vswprintf_c + || !p__vswprintf_c_l || !p__vswprintf_p_l) + { + win_skip("_vswprintf or vswprintf not available\n"); + return; + } + + ret = vswprintf_wrapper(buf, format, number, 123); + ok(ret == 10, "got %d, expected 10\n", ret); + ok(!memcmp(buf, out, sizeof(out)), "buf = %s\n", wine_dbgstr_w(buf)); + + memset(buf, 0, sizeof(buf)); + ret = _vswprintf_wrapper(buf, format, number, 123); + ok(ret == 10, "got %d, expected 10\n", ret); + ok(!memcmp(buf, out, sizeof(out)), "buf = %s\n", wine_dbgstr_w(buf)); + + memset(buf, 0, sizeof(buf)); + ret = _vswprintf_l_wrapper(buf, format, NULL, number, 123); + ok(ret == 10, "got %d, expected 10\n", ret); + ok(!memcmp(buf, out, sizeof(out)), "buf = %s\n", wine_dbgstr_w(buf)); + + memset(buf, 0, sizeof(buf)); + ret = _vswprintf_c_wrapper(buf, 20, format, number, 123); + ok(ret == 10, "got %d, expected 10\n", ret); + ok(!memcmp(buf, out, sizeof(out)), "buf = %s\n", wine_dbgstr_w(buf)); + + memset(buf, 0, sizeof(buf)); + ret = _vswprintf_c_l_wrapper(buf, 20, format, NULL, number, 123); + ok(ret == 10, "got %d, expected 10\n", ret); + ok(!memcmp(buf, out, sizeof(out)), "buf = %s\n", wine_dbgstr_w(buf)); + + memset(buf, 0, sizeof(buf)); + ret = _vswprintf_p_l_wrapper(buf, 20, format, NULL, number, 123); + ok(ret == 10, "got %d, expected 10\n", ret); + ok(!memcmp(buf, out, sizeof(out)), "buf = %s\n", wine_dbgstr_w(buf)); +} + static int __cdecl _vscprintf_wrapper(const char *format, ...) { int ret; @@ -1120,6 +1242,7 @@ START_TEST(printf) test_vsnwprintf(); test_vscprintf(); test_vscwprintf(); + test_vswprintf(); test_vsnwprintf_s(); test_vsprintf_p(); test__get_output_format();

1 0

Hans Leidekker : winhttp: Properly test a boolean variant.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: 82f76510055461f4a4706feed300b2db5479ca63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f76510055461f4a4706feed… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 5 11:45:45 2011 +0200 winhttp: Properly test a boolean variant. --- dlls/winhttp/request.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index a3c2207..c46ce21 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2541,7 +2541,7 @@ static HRESULT WINAPI winhttp_request_Open( path[uc.dwUrlPathLength + uc.dwExtraInfoLength] = 0; if (!(verb = strdupW( method ))) goto error; - if (V_BOOL( &async ) == VARIANT_TRUE) flags |= WINHTTP_FLAG_ASYNC; + if (V_BOOL( &async )) flags |= WINHTTP_FLAG_ASYNC; if (!(hsession = WinHttpOpen( user_agentW, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, NULL, NULL, flags ))) { err = get_last_error();

1 0

Hans Leidekker : winhttp/tests: Initialize a variant with a known value.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: 3762de9d8c2edc791f07fa6c919ef1c38d8ac55a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3762de9d8c2edc791f07fa6c9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 5 11:46:15 2011 +0200 winhttp/tests: Initialize a variant with a known value. --- dlls/winhttp/tests/winhttp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index a662ef8..24478ad 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2131,8 +2131,8 @@ static void test_IWinHttpRequest(void) hr = CoCreateInstance( &CLSID_WinHttpRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IWinHttpRequest, (void **)&req ); ok( hr == S_OK, "got %08x\n", hr ); - VariantInit( &empty ); V_VT( &empty ) = VT_ERROR; + V_ERROR( &empty ) = 0xdeadbeef; V_VT( &async ) = VT_BOOL; V_BOOL( &async ) = VARIANT_FALSE;

1 0

Hans Leidekker : winhttp: Fix some memory leaks.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: d5a98e5d85090dbc28c1795033048470a122496e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5a98e5d85090dbc28c179503… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 5 11:46:51 2011 +0200 winhttp: Fix some memory leaks. --- dlls/winhttp/request.c | 18 ++++++++++++++++-- dlls/winhttp/session.c | 11 ++++++----- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index c46ce21..0d9e60a 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2403,20 +2403,32 @@ static HRESULT WINAPI winhttp_request_SetProxy( { case HTTPREQUEST_PROXYSETTING_DEFAULT: request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_DEFAULT_PROXY; + heap_free( (WCHAR *)request->proxy.lpszProxy ); + heap_free( (WCHAR *)request->proxy.lpszProxyBypass ); request->proxy.lpszProxy = NULL; request->proxy.lpszProxyBypass = NULL; break; case HTTPREQUEST_PROXYSETTING_DIRECT: request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_NO_PROXY; + heap_free( (WCHAR *)request->proxy.lpszProxy ); + heap_free( (WCHAR *)request->proxy.lpszProxyBypass ); request->proxy.lpszProxy = NULL; request->proxy.lpszProxyBypass = NULL; break; case HTTPREQUEST_PROXYSETTING_PROXY: request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; - if (V_VT( &proxy_server ) == VT_BSTR) request->proxy.lpszProxy = strdupW( V_BSTR( &proxy_server ) ); - if (V_VT( &bypass_list ) == VT_BSTR) request->proxy.lpszProxyBypass = strdupW( V_BSTR( &bypass_list ) ); + if (V_VT( &proxy_server ) == VT_BSTR) + { + heap_free( (WCHAR *)request->proxy.lpszProxy ); + request->proxy.lpszProxy = strdupW( V_BSTR( &proxy_server ) ); + } + if (V_VT( &bypass_list ) == VT_BSTR) + { + heap_free( (WCHAR *)request->proxy.lpszProxyBypass ); + request->proxy.lpszProxyBypass = strdupW( V_BSTR( &bypass_list ) ); + } break; default: @@ -3334,6 +3346,8 @@ HRESULT WinHttpRequest_create( IUnknown *unknown, void **obj ) request->IWinHttpRequest_iface.lpVtbl = &winhttp_request_vtbl; request->refs = 1; request->state = REQUEST_STATE_UNINITIALIZED; + request->proxy.lpszProxy = NULL; + request->proxy.lpszProxyBypass = NULL; InitializeCriticalSection( &request->cs ); *obj = &request->IWinHttpRequest_iface; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 1fe1889..b7cc31b 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -206,6 +206,7 @@ HINTERNET WINAPI WinHttpOpen( LPCWSTR agent, DWORD access, LPCWSTR proxy, LPCWST session->hdr.flags = flags; session->hdr.refs = 1; session->hdr.redirect_policy = WINHTTP_OPTION_REDIRECT_POLICY_DISALLOW_HTTPS_TO_HTTP; + list_init( &session->hdr.children ); session->resolve_timeout = DEFAULT_RESOLVE_TIMEOUT; session->connect_timeout = DEFAULT_CONNECT_TIMEOUT; session->send_timeout = DEFAULT_SEND_TIMEOUT; @@ -498,6 +499,7 @@ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PO connect->hdr.callback = session->hdr.callback; connect->hdr.notify_mask = session->hdr.notify_mask; connect->hdr.context = session->hdr.context; + list_init( &connect->hdr.children ); addref_object( &session->hdr ); connect->session = session; @@ -505,9 +507,7 @@ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PO if (!(connect->hostname = strdupW( server ))) goto end; connect->hostport = port; - - if (!set_server_for_hostname( connect, server, port )) - goto end; + if (!set_server_for_hostname( connect, server, port )) goto end; if (!(hconnect = alloc_handle( &connect->hdr ))) goto end; connect->hdr.handle = hconnect; @@ -516,7 +516,7 @@ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PO end: release_object( &connect->hdr ); - + release_object( &session->hdr ); TRACE("returning %p\n", hconnect); return hconnect; } @@ -930,6 +930,7 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o request->hdr.callback = connect->hdr.callback; request->hdr.notify_mask = connect->hdr.notify_mask; request->hdr.context = connect->hdr.context; + list_init( &request->hdr.children ); addref_object( &connect->hdr ); request->connect = connect; @@ -970,7 +971,7 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o end: release_object( &request->hdr ); - + release_object( &connect->hdr ); TRACE("returning %p\n", hrequest); return hrequest; }

1 0