September 2011 - Wine-Commits

Lucas Fialho Zawacki : dinput: Added possibility to change the action mapping in the ConfigureDevices dialog .
by Alexandre Julliard Sept. 6, 2011

Sept. 6, 2011

Module: wine Branch: master Commit: 67682c244c9e105b0abed61573f75892f4770a6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=67682c244c9e105b0abed6157… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Thu Sep 1 15:34:39 2011 -0300 dinput: Added possibility to change the action mapping in the ConfigureDevices dialog. --- dlls/dinput/config.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 76 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index d3c604a..b2aa3ab 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -41,6 +41,7 @@ typedef struct { IDirectInput8W *lpDI; LPDIACTIONFORMATW lpdiaf; DIDevicesData devices_data; + int display_only; } ConfigureDevicesData; /* @@ -115,6 +116,21 @@ static int lv_get_cur_item(HWND dialog) return SendDlgItemMessageW(dialog, IDC_DEVICEOBJECTSLIST, LVM_GETNEXTITEM, -1, LVNI_SELECTED); } +static int lv_get_item_data(HWND dialog, int index) +{ + LVITEMW item; + + if (index < 0) return -1; + + item.mask = LVIF_PARAM; + item.iItem = index; + item.iSubItem = 0; + + SendDlgItemMessageW(dialog, IDC_DEVICEOBJECTSLIST, LVM_GETITEMW , 0, (LPARAM)&item); + + return item.lParam; +} + static void lv_set_action(HWND dialog, int item, int action, LPDIACTIONFORMATW lpdiaf) { static const WCHAR no_action[] = {'-','\0'}; @@ -161,6 +177,12 @@ static LPDIACTIONFORMATW get_cur_lpdiaf(HWND dialog) return data->lpdiaf; } +static int dialog_display_only(HWND dialog) +{ + ConfigureDevicesData *data = (ConfigureDevicesData*) GetWindowLongPtrW(dialog, DWLP_USER); + return data->display_only; +} + static void init_devices(HWND dialog, IDirectInput8W *lpDI, DIDevicesData *data, LPDIACTIONFORMATW lpdiaf) { int i; @@ -261,6 +283,46 @@ static void show_suitable_actions(HWND dialog) } } +static void assign_action(HWND dialog) +{ + DeviceData *device = get_cur_device(dialog); + LPDIACTIONFORMATW lpdiaf = get_cur_lpdiaf(dialog); + LVFINDINFOW lvFind; + int sel = SendDlgItemMessageW(dialog, IDC_ACTIONLIST, LB_GETCURSEL, 0, 0); + int action = SendDlgItemMessageW(dialog, IDC_ACTIONLIST, LB_GETITEMDATA, sel, 0); + int obj = lv_get_cur_item(dialog); + int old_action = lv_get_item_data(dialog, obj); + int used_obj; + + DIDEVICEOBJECTINSTANCEW ddo = device->ddo[obj]; + + if (old_action == action) return; + + /* Clear old action */ + if (old_action != -1) + { + lpdiaf->rgoAction[old_action].dwObjID = 0; + lpdiaf->rgoAction[old_action].guidInstance = GUID_NULL; + lpdiaf->rgoAction[old_action].dwHow = DIAH_UNMAPPED; + } + + /* Find if action text is already set for other object and unset it */ + lvFind.flags = LVFI_PARAM; + lvFind.lParam = action; + + used_obj = SendDlgItemMessageW(dialog, IDC_DEVICEOBJECTSLIST, LVM_FINDITEMW, -1, (LPARAM) &lvFind); + + lv_set_action(dialog, used_obj, -1, lpdiaf); + + /* Set new action */ + lpdiaf->rgoAction[action].dwObjID = ddo.dwType; + lpdiaf->rgoAction[action].guidInstance = device->ddi.guidInstance; + lpdiaf->rgoAction[action].dwHow = DIAH_USERCONFIG; + + /* Set new action in the list */ + lv_set_action(dialog, obj, action, lpdiaf); +} + static INT_PTR CALLBACK ConfigureDevicesDlgProc(HWND dialog, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch(uMsg) @@ -296,6 +358,19 @@ static INT_PTR CALLBACK ConfigureDevicesDlgProc(HWND dialog, UINT uMsg, WPARAM w switch(LOWORD(wParam)) { + case IDC_ACTIONLIST: + + switch (HIWORD(wParam)) + { + case LBN_DBLCLK: + /* Ignore this if app did not ask for editing */ + if (dialog_display_only(dialog)) break; + + assign_action(dialog); + break; + } + break; + case IDC_CONTROLLERCOMBO: switch (HIWORD(wParam)) @@ -335,6 +410,7 @@ HRESULT _configure_devices(IDirectInput8W *iface, ConfigureDevicesData data; data.lpDI = iface; data.lpdiaf = lpdiCDParams->lprgFormats; + data.display_only = !(dwFlags & DICD_EDIT); InitCommonControls();

1 0

Lucas Fialho Zawacki : dinput: Working CANCEL and RESET buttons in ConfigureDevices dialog.
by Alexandre Julliard Sept. 6, 2011

Sept. 6, 2011

Module: wine Branch: master Commit: b0dfa932b6b36e6a2beed33f6fd428ccc75c92cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0dfa932b6b36e6a2beed33f6… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Thu Sep 1 15:34:40 2011 -0300 dinput: Working CANCEL and RESET buttons in ConfigureDevices dialog. --- dlls/dinput/config.c | 41 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index b2aa3ab..1c6da6c 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -40,6 +40,7 @@ typedef struct { typedef struct { IDirectInput8W *lpDI; LPDIACTIONFORMATW lpdiaf; + LPDIACTIONFORMATW original_lpdiaf; DIDevicesData devices_data; int display_only; } ConfigureDevicesData; @@ -201,16 +202,21 @@ static void init_devices(HWND dialog, IDirectInput8W *lpDI, DIDevicesData *data, SendDlgItemMessageW(dialog, IDC_CONTROLLERCOMBO, CB_ADDSTRING, 0, (LPARAM) data->devices[i].ddi.tszProductName ); } -static void destroy_devices(HWND dialog) +static void destroy_data(HWND dialog) { int i; ConfigureDevicesData *data = (ConfigureDevicesData*) GetWindowLongPtrW(dialog, DWLP_USER); DIDevicesData *devices_data = &data->devices_data; + /* Free the devices */ for (i=0; i < devices_data->ndevices; i++) IDirectInputDevice8_Release(devices_data->devices[i].lpdid); HeapFree(GetProcessHeap(), 0, devices_data->devices); + + /* Free the backup LPDIACTIONFORMATW */ + HeapFree(GetProcessHeap(), 0, data->original_lpdiaf->rgoAction); + HeapFree(GetProcessHeap(), 0, data->original_lpdiaf); } static void fill_device_object_list(HWND dialog) @@ -323,6 +329,26 @@ static void assign_action(HWND dialog) lv_set_action(dialog, obj, action, lpdiaf); } +static void copy_actions(LPDIACTIONFORMATW to, LPDIACTIONFORMATW from) +{ + int i; + for (i=0; i < from->dwNumActions; i++) + { + to->rgoAction[i].guidInstance = from->rgoAction[i].guidInstance; + to->rgoAction[i].dwObjID = from->rgoAction[i].dwObjID; + to->rgoAction[i].dwHow = from->rgoAction[i].dwHow; + to->rgoAction[i].lptszActionName = from->rgoAction[i].lptszActionName; + } +} + +static void reset_actions(HWND dialog) +{ + ConfigureDevicesData *data = (ConfigureDevicesData*) GetWindowLongPtrW(dialog, DWLP_USER); + LPDIACTIONFORMATW to = data->lpdiaf, from = data->original_lpdiaf; + + copy_actions(to, from); +} + static INT_PTR CALLBACK ConfigureDevicesDlgProc(HWND dialog, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch(uMsg) @@ -339,6 +365,12 @@ static INT_PTR CALLBACK ConfigureDevicesDlgProc(HWND dialog, UINT uMsg, WPARAM w init_listview_columns(dialog); + /* Create a backup action format for CANCEL and RESET operations */ + data->original_lpdiaf = HeapAlloc(GetProcessHeap(), 0, sizeof(LPDIACTIONFORMATW)); + data->original_lpdiaf->dwNumActions = data->lpdiaf->dwNumActions; + data->original_lpdiaf->rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*data->lpdiaf->dwNumActions); + copy_actions(data->original_lpdiaf, data->lpdiaf); + break; } @@ -383,15 +415,18 @@ static INT_PTR CALLBACK ConfigureDevicesDlgProc(HWND dialog, UINT uMsg, WPARAM w case IDOK: EndDialog(dialog, 0); - destroy_devices(dialog); + destroy_data(dialog); break; case IDCANCEL: + reset_actions(dialog); EndDialog(dialog, 0); - destroy_devices(dialog); + destroy_data(dialog); break; case IDC_RESET: + reset_actions(dialog); + fill_device_object_list(dialog); break; } break;

1 0

Bruno Jesus : ws2_32: Avoid an unhandled exception in WSAIoctl.
by Alexandre Julliard Sept. 6, 2011

Sept. 6, 2011

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

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_index_buffer() const.
by Alexandre Julliard Sept. 6, 2011

Sept. 6, 2011

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

Henri Verbeet : wined3d: Try doing a present in wined3d_surface_blt() instead of IWineD3DSurfaceImpl_BltOverride().
by Alexandre Julliard Sept. 6, 2011

Sept. 6, 2011

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: Don' t override the swapchain present interval in IWineD3DSurfaceImpl_BltOverride ().
by Alexandre Julliard Sept. 6, 2011

Sept. 6, 2011

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

Piotr Caban : msvcrt: Fix _vswprintf* arguments.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

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

André Hentschel : configure: Install view.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: 31f0f09a17624eeafcc9fbedf38fd06d0090dbd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31f0f09a17624eeafcc9fbedf… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Sep 1 21:04:14 2011 +0200 configure: Install view. (better subject, maybe) I still think "view" should be available to users, so the only thing between the user and "view" is they have to compile Wine theirselves and that should change. It's very hard to find good wmf/emf viewers for Linux(and most likely other OS), but "view" is a great program for people who need to take a look at wmf/emf files. --- configure | 2 +- configure.ac | 2 +- tools/make_makefiles | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 7c1af08..dfc540f 100755 --- a/configure +++ b/configure @@ -15256,7 +15256,7 @@ wine_fn_config_program taskmgr enable_taskmgr install,po wine_fn_config_program termsv enable_termsv install wine_fn_config_program uninstaller enable_uninstaller install,po wine_fn_config_program unlodctr enable_unlodctr install -wine_fn_config_program view enable_view po +wine_fn_config_program view enable_view install,po wine_fn_config_program wineboot enable_wineboot install,installbin,manpage wine_fn_config_program winebrowser enable_winebrowser install wine_fn_config_program winecfg enable_winecfg install,installbin,manpage,po diff --git a/configure.ac b/configure.ac index 0421c74..a2c3efe 100644 --- a/configure.ac +++ b/configure.ac @@ -2949,7 +2949,7 @@ WINE_CONFIG_PROGRAM(taskmgr,,[install,po]) WINE_CONFIG_PROGRAM(termsv,,[install]) WINE_CONFIG_PROGRAM(uninstaller,,[install,po]) WINE_CONFIG_PROGRAM(unlodctr,,[install]) -WINE_CONFIG_PROGRAM(view,,[po]) +WINE_CONFIG_PROGRAM(view,,[install,po]) WINE_CONFIG_PROGRAM(wineboot,,[install,installbin,manpage]) WINE_CONFIG_PROGRAM(winebrowser,,[install]) WINE_CONFIG_PROGRAM(winecfg,,[install,installbin,manpage,po]) diff --git a/tools/make_makefiles b/tools/make_makefiles index 3a27cf0..d94880a 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -51,7 +51,6 @@ my %bin_install = my %dont_install = ( "cmdlgtst" => 1, - "view" => 1, "winetest" => 1, );

1 0

Alexandre Julliard : sane.ds: Include system headers before Windows headers .
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

Module: wine Branch: master Commit: 37e358404ff71794bbb2ce76a8f42c756ba057c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37e358404ff71794bbb2ce76a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 5 17:22:50 2011 +0200 sane.ds: Include system headers before Windows headers. --- dlls/sane.ds/capability.c | 3 --- dlls/sane.ds/ds_ctrl.c | 1 - dlls/sane.ds/ds_image.c | 5 +---- dlls/sane.ds/options.c | 1 - dlls/sane.ds/sane_i.h | 16 +++++++++------- dlls/sane.ds/sane_main.c | 3 --- dlls/sane.ds/ui.c | 5 +---- 7 files changed, 11 insertions(+), 23 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 20fd2c3..1381220 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -25,9 +25,6 @@ #include <stdio.h> #include <math.h> -#include "windef.h" -#include "winbase.h" -#include "twain.h" #include "sane_i.h" #include "winnls.h" #include "wine/debug.h" diff --git a/dlls/sane.ds/ds_ctrl.c b/dlls/sane.ds/ds_ctrl.c index 9901fff..713f311 100644 --- a/dlls/sane.ds/ds_ctrl.c +++ b/dlls/sane.ds/ds_ctrl.c @@ -22,7 +22,6 @@ # include <unistd.h> #endif #include <stdlib.h> -#include "twain.h" #include "sane_i.h" #include "wine/debug.h" diff --git a/dlls/sane.ds/ds_image.c b/dlls/sane.ds/ds_image.c index 4945e55..77826b0 100644 --- a/dlls/sane.ds/ds_image.c +++ b/dlls/sane.ds/ds_image.c @@ -21,12 +21,9 @@ #include <stdarg.h> -#include "windef.h" -#include "winbase.h" +#include "sane_i.h" #include "wingdi.h" #include "winuser.h" -#include "twain.h" -#include "sane_i.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(twain); diff --git a/dlls/sane.ds/options.c b/dlls/sane.ds/options.c index 67cb1dc..7b792b2 100644 --- a/dlls/sane.ds/options.c +++ b/dlls/sane.ds/options.c @@ -19,7 +19,6 @@ #include "config.h" #include <stdlib.h> -#include "twain.h" #include "sane_i.h" #include "wine/debug.h" diff --git a/dlls/sane.ds/sane_i.h b/dlls/sane.ds/sane_i.h index 17826d2..ae58159 100644 --- a/dlls/sane.ds/sane_i.h +++ b/dlls/sane.ds/sane_i.h @@ -23,10 +23,19 @@ # error You must include config.h first #endif +#include <stdarg.h> + #ifdef SONAME_LIBSANE # include <sane/sane.h> # include <sane/saneopts.h> +#endif + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "twain.h" +#ifdef SONAME_LIBSANE #define MAKE_FUNCPTR(f) typeof(f) * p##f DECLSPEC_HIDDEN; MAKE_FUNCPTR(sane_init) MAKE_FUNCPTR(sane_exit) @@ -43,14 +52,7 @@ MAKE_FUNCPTR(sane_set_io_mode) MAKE_FUNCPTR(sane_get_select_fd) MAKE_FUNCPTR(sane_strstatus) #undef MAKE_FUNCPTR - #endif -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "twain.h" extern HINSTANCE SANE_instance DECLSPEC_HIDDEN; diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index f482098..1c73252 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -24,9 +24,6 @@ #include <stdarg.h> #include <stdio.h> -#include "windef.h" -#include "winbase.h" -#include "twain.h" #include "sane_i.h" #include "wine/debug.h" #include "wine/library.h" diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index 147c759..5d4cd83 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -26,14 +26,11 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "windef.h" -#include "winbase.h" +#include "sane_i.h" #include "winuser.h" #include "winnls.h" #include "wingdi.h" #include "prsht.h" -#include "twain.h" -#include "sane_i.h" #include "wine/debug.h" #include "resource.h" #include "wine/unicode.h"

1 0

Hans Leidekker : winhttp/tests: Initialize a variant with a known value.
by Alexandre Julliard Sept. 5, 2011

Sept. 5, 2011

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