wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Lucas Fialho Zawacki : dinput: Added ConfigureDevices dialog.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: 0ae471092617493baafbfcba115fcd51ccfcbd6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ae471092617493baafbfcba1… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Thu Sep 1 15:34:35 2011 -0300 dinput: Added ConfigureDevices dialog. --- configure | 2 +- configure.ac | 2 +- dlls/dinput/Makefile.in | 9 +++++- dlls/dinput/{version.rc => config.c} | 30 ++++++++++++++++++------ dlls/dinput/{version.rc => dinput.rc} | 10 ++++++++ dlls/dinput/dinput_En.rc | 40 +++++++++++++++++++++++++++++++++ dlls/dinput/dinput_main.c | 3 +- dlls/dinput/dinput_private.h | 2 + dlls/dinput/resource.h | 35 ++++++++++++++++++++++++++++ po/ar.po | 9 +++++++ po/bg.po | 9 +++++++ po/ca.po | 8 ++++++ po/cs.po | 9 +++++++ po/da.po | 10 ++++++++ po/de.po | 10 ++++++++ po/el.po | 9 +++++++ po/en.po | 8 ++++++ po/en_US.po | 8 ++++++ po/eo.po | 9 +++++++ po/es.po | 10 ++++++++ po/fa.po | 9 +++++++ po/fi.po | 9 +++++++ po/fr.po | 10 ++++++++ po/he.po | 10 ++++++++ po/hi.po | 8 ++++++ po/hu.po | 10 ++++++++ po/it.po | 10 ++++++++ po/ja.po | 10 ++++++++ po/ko.po | 10 ++++++++ po/lt.po | 10 ++++++++ po/ml.po | 8 ++++++ po/nb_NO.po | 10 ++++++++ po/nl.po | 10 ++++++++ po/or.po | 8 ++++++ po/pa.po | 8 ++++++ po/pl.po | 10 ++++++++ po/pt_BR.po | 10 ++++++++ po/pt_PT.po | 10 ++++++++ po/rm.po | 9 +++++++ po/ro.po | 10 ++++++++ po/ru.po | 10 ++++++++ po/sk.po | 9 +++++++ po/sl.po | 10 ++++++++ po/sr_RS(a)cyrillic.po | 10 ++++++++ po/sr_RS(a)latin.po | 10 ++++++++ po/sv.po | 10 ++++++++ po/te.po | 8 ++++++ po/th.po | 9 +++++++ po/tr.po | 10 ++++++++ po/uk.po | 10 ++++++++ po/wa.po | 9 +++++++ po/wine.pot | 8 ++++++ po/zh_CN.po | 10 ++++++++ po/zh_TW.po | 10 ++++++++ 54 files changed, 541 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0ae471092617493baafbf…

1 0

Michael Stefaniuc : quartz: Use an IDL file to define the IAMFilterData iface.
by Alexandre Julliard 06 Sep '11

06 Sep '11

Module: wine Branch: master Commit: 27e1d5adb704371469d1eef32e593c43d5206126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27e1d5adb704371469d1eef32… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 6 00:40:28 2011 +0200 quartz: Use an IDL file to define the IAMFilterData iface. --- .gitignore | 1 + dlls/quartz/Makefile.in | 1 + dlls/quartz/fil_data.idl | 50 ++++++++++++++++++++++++++++++++++++++++++++ dlls/quartz/filtermapper.c | 45 +------------------------------------- 4 files changed, 54 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index 8ce12fe..416de9a 100644 --- a/.gitignore +++ b/.gitignore @@ -108,6 +108,7 @@ dlls/qmgr/qmgr_local_i.c dlls/qmgrprxy/qmgrprxy.h dlls/qmgrprxy/qmgrprxy_i.c dlls/qmgrprxy/qmgrprxy_p.c +dlls/quartz/fil_data.h dlls/quartz/quartz_strmif.h dlls/quartz/quartz_strmif_p.c dlls/rpcrt4/epm.h diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index 9a4e511..5827d65 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -29,6 +29,7 @@ C_SRCS = \ RC_SRCS = version.rc +IDL_H_SRCS = fil_data.idl IDL_P_SRCS = quartz_strmif.idl IDL_R_SRCS = quartz_strmif.idl diff --git a/dlls/quartz/fil_data.idl b/dlls/quartz/fil_data.idl new file mode 100644 index 0000000..93cdf1e --- /dev/null +++ b/dlls/quartz/fil_data.idl @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2009 Vitaliy Margolen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "objidl.idl"; +import "strmif.idl"; +import "unknwn.idl"; + + +/***************************************************************************** + * IAMFilterData interface + * + * Notes: + * - This interface is deprecated and IFilterMapper2 should be used instead. + * - There is no full replacement for IAMFilterData::ParseFilterData short of manually + * parsing out the REGFILTER2 struct from the binary blob. + */ +[ + object, + uuid(97f7c4d4-547b-4a5f-8332-536430ad2e4d), + pointer_default(unique) +] +interface IAMFilterData : IUnknown +{ + typedef [unique] IAMFilterData *LPIAMFILTERDATA; + + HRESULT ParseFilterData( + [in] BYTE * rgbFilterData, + [in] ULONG cb, + [out] BYTE ** prgbRegFilter2); + + HRESULT CreateFilterData( + [in] REGFILTER2 * prf2, + [out] BYTE ** prgbFilterData, + [out] ULONG * pcb); +} diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 78b6699..7d7599f 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -36,6 +36,8 @@ #include "strmif.h" #include "wine/unicode.h" #include "uuids.h" +#include "initguid.h" +#include "fil_data.h" #include "wine/debug.h" @@ -43,49 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); #define ARRAYSIZE(array) (sizeof(array)/sizeof((array)[0])) -/* Unexposed IAMFilterData interface */ -typedef struct IAMFilterData IAMFilterData; - -typedef struct IAMFilterDataVtbl -{ - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAMFilterData *This, - REFIID riid, - void **ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IAMFilterData *This); - - ULONG (STDMETHODCALLTYPE *Release)( - IAMFilterData *This); - - /*** IAMFilterData methods ***/ - HRESULT (STDMETHODCALLTYPE *ParseFilterData)( - IAMFilterData *This, - BYTE *pData, - ULONG cb, - BYTE **ppRegFilter2); - - HRESULT (STDMETHODCALLTYPE *CreateFilterData)( - IAMFilterData* This, - REGFILTER2 *prf2, - BYTE **pRegFilterData, - ULONG *pcb); - - END_INTERFACE -} IAMFilterDataVtbl; -struct IAMFilterData -{ - const IAMFilterDataVtbl *lpVtbl; -}; -static const GUID IID_IAMFilterData = { - 0x97f7c4d4, 0x547b, 0x4a5f, { 0x83,0x32, 0x53,0x64,0x30,0xad,0x2e,0x4d } -}; - - typedef struct FilterMapper3Impl { IFilterMapper3 IFilterMapper3_iface;

1 0

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

06 Sep '11

Module: wine Branch: master Commit: cf010c563c1d05358527c496b86d04bfa4dcdf11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf010c563c1d05358527c496b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 5 21:15:54 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_base_vertex_index() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b7bb19f..2660ee8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2437,7 +2437,7 @@ HRESULT CDECL wined3d_device_set_base_vertex_index(struct wined3d_device *device return WINED3D_OK; } -INT CDECL wined3d_device_get_base_vertex_index(struct wined3d_device *device) +INT CDECL wined3d_device_get_base_vertex_index(const struct wined3d_device *device) { TRACE("device %p.\n", device); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 223812b..c9f9edf 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2207,7 +2207,7 @@ void __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *devic UINT __cdecl wined3d_device_get_available_texture_mem(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_back_buffer(struct wined3d_device *device, UINT swapchain_idx, UINT backbuffer_idx, WINED3DBACKBUFFER_TYPE backbuffer_type, struct wined3d_surface **backbuffer); -INT __cdecl wined3d_device_get_base_vertex_index(struct wined3d_device *device); +INT __cdecl wined3d_device_get_base_vertex_index(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_clip_plane(const struct wined3d_device *device, UINT plane_idx, float *plane); HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device, WINED3DCLIPSTATUS *clip_status); HRESULT __cdecl wined3d_device_get_creation_parameters(struct wined3d_device *device,

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

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: 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

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

Alistair Leslie-Hughes : ntdsapi: Add stubs DsServerRegisterSpnA, DsServerRegisterSpnW.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: 5b49e228aebe8d373a9fe7f35c04454a08b4a53b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b49e228aebe8d373a9fe7f35… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 31 15:34:07 2011 +1000 ntdsapi: Add stubs DsServerRegisterSpnA, DsServerRegisterSpnW. --- dlls/ntdsapi/ntdsapi.c | 20 ++++++++++++++++++++ dlls/ntdsapi/ntdsapi.spec | 4 ++-- include/ntdsapi.h | 11 +++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/ntdsapi/ntdsapi.c b/dlls/ntdsapi/ntdsapi.c index 76565fb..1ffbd9d 100644 --- a/dlls/ntdsapi/ntdsapi.c +++ b/dlls/ntdsapi/ntdsapi.c @@ -165,3 +165,23 @@ DWORD WINAPI DsGetSpnA(DS_SPN_NAME_TYPE ServType, LPCSTR Servlass, LPCSTR ServNa return ERROR_CALL_NOT_IMPLEMENTED; } + +/*********************************************************************** + * DsServerRegisterSpnA (NTDSAPI.@) + */ +DWORD WINAPI DsServerRegisterSpnA(DS_SPN_WRITE_OP operation, LPCSTR ServiceClass, LPCSTR UserObjectDN) +{ + FIXME("(%d,%s,%s): stub!\n", operation, + debugstr_a(ServiceClass), debugstr_a(UserObjectDN)); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * DsServerRegisterSpnW (NTDSAPI.@) + */ +DWORD WINAPI DsServerRegisterSpnW(DS_SPN_WRITE_OP operation, LPCWSTR ServiceClass, LPCWSTR UserObjectDN) +{ + FIXME("(%d,%s,%s): stub!\n", operation, + debugstr_w(ServiceClass), debugstr_w(UserObjectDN)); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/ntdsapi/ntdsapi.spec b/dlls/ntdsapi/ntdsapi.spec index 8a4758a..f4ae6f8 100644 --- a/dlls/ntdsapi/ntdsapi.spec +++ b/dlls/ntdsapi/ntdsapi.spec @@ -80,8 +80,8 @@ @ stub DsReplicaUpdateRefsW @ stub DsReplicaVerifyObjectsA @ stub DsReplicaVerifyObjectsW -@ stub DsServerRegisterSpnA -@ stub DsServerRegisterSpnW +@ stdcall DsServerRegisterSpnA(long str str) +@ stdcall DsServerRegisterSpnW(long wstr wstr) @ stub DsUnBindA @ stub DsUnBindW @ stub DsUnquoteRdnValueA diff --git a/include/ntdsapi.h b/include/ntdsapi.h index 9fecdab..6d2902f 100644 --- a/include/ntdsapi.h +++ b/include/ntdsapi.h @@ -39,6 +39,17 @@ typedef enum DS_SPN_SERVICE = 5 } DS_SPN_NAME_TYPE; +typedef enum +{ + DS_SPN_ADD_SPN_OP = 0, + DS_SPN_REPLACE_SPN_OP = 1, + DS_SPN_DELETE_SPN_OP = 2 +} DS_SPN_WRITE_OP; + +DWORD WINAPI DsServerRegisterSpnA(DS_SPN_WRITE_OP operation, LPCSTR ServiceClass, LPCSTR UserObjectDN); +DWORD WINAPI DsServerRegisterSpnW(DS_SPN_WRITE_OP operation, LPCWSTR ServiceClass, LPCWSTR UserObjectDN); +#define DsServerRegisterSpn WINELIB_NAME_AW(DsServerRegisterSpn) + #ifdef __cplusplus } #endif

1 0

Alexandre Julliard : secur32: Avoid size_t and fix some printf formats.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: 52fa3bf42d193d17e24dc41ab66d84b4bed07391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52fa3bf42d193d17e24dc41ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 5 19:32:06 2011 +0200 secur32: Avoid size_t and fix some printf formats. --- dlls/secur32/schannel.c | 30 +++++++++++++++--------------- dlls/secur32/schannel_gnutls.c | 4 ++-- dlls/secur32/schannel_macosx.c | 32 +++++++++++++++----------------- dlls/secur32/secur32_priv.h | 4 ++-- 4 files changed, 34 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52fa3bf42d193d17e24dc…

1 0

Frédéric Delanoy : cmd/tests: Add tests for IF '= =' operator.
by Alexandre Julliard 05 Sep '11

05 Sep '11

Module: wine Branch: master Commit: f35d52e20ee4b494636ec8e88b96ee9e2b6722b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f35d52e20ee4b494636ec8e88… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Sep 4 16:33:29 2011 +0200 cmd/tests: Add tests for IF '==' operator. --- programs/cmd/tests/test_builtins.cmd | 6 ++++++ programs/cmd/tests/test_builtins.cmd.exp | 6 ++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 5bd375e..9a5f786 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -576,6 +576,12 @@ if /i foo==FOO echo if /i seems to work if /i not foo==FOO echo if /i seems to be broken if /I foo==FOO echo if /I seems to work if /I not foo==FOO echo if /I seems to be broken +echo Testing string comparisons +if abc == abc (echo equal) else echo non equal +if abc =="abc" (echo equal) else echo non equal +if "abc"== abc (echo equal) else echo non equal +if "abc"== "abc" (echo equal) else echo non equal +echo Testing tabs handling if@tab@1==1 echo doom if @tab@1==1 echo doom if 1==1 (echo doom) else@tab@echo quake diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index c67b10f..514a635 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -387,6 +387,12 @@ Testing case sensitivity with and without /i option if seems to default to case sensitivity if /i seems to work if /I seems to work +Testing string comparisons +equal +@todo_wine@non equal +@todo_wine@non equal +equal +Testing tabs handling doom doom doom

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2011