July 2011 - Wine-Commits - list.winehq.org

Ričardas Barkauskas : ddraw: Use unsafe_impl_from_IDirect3DTexture() for application provided interfaces.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: 0a3582865e72d9a8c06540f163ff8b96a6acd0c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a3582865e72d9a8c06540f16… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Wed Jul 27 17:43:24 2011 +0300 ddraw: Use unsafe_impl_from_IDirect3DTexture() for application provided interfaces. --- dlls/ddraw/ddraw_private.h | 2 ++ dlls/ddraw/device.c | 4 ++-- dlls/ddraw/surface.c | 10 +++++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 7bce353..6f17912 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -253,6 +253,8 @@ IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface(IDirectDrawSurface * IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface4(IDirectDrawSurface4 *iface) DECLSPEC_HIDDEN; IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface7(IDirectDrawSurface7 *iface) DECLSPEC_HIDDEN; +IDirectDrawSurfaceImpl *unsafe_impl_from_IDirect3DTexture(IDirect3DTexture *iface) DECLSPEC_HIDDEN; + /* Get the number of bytes per pixel for a given surface */ #define PFGET_BPP(pf) (pf.dwFlags&DDPF_PALETTEINDEXED8?1:((pf.dwRGBBitCount+7)/8)) #define GET_BPP(desc) PFGET_BPP(desc.ddpfPixelFormat) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index af6ac27..eb45099 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -568,8 +568,8 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_SwapTextureHandles(IDirect3DDevice * IDirect3DTexture *D3DTex1, IDirect3DTexture *D3DTex2) { IDirect3DDeviceImpl *This = device_from_device1(iface); - IDirectDrawSurfaceImpl *surf1 = surface_from_texture1(D3DTex1); - IDirectDrawSurfaceImpl *surf2 = surface_from_texture1(D3DTex2); + IDirectDrawSurfaceImpl *surf1 = unsafe_impl_from_IDirect3DTexture(D3DTex1); + IDirectDrawSurfaceImpl *surf2 = unsafe_impl_from_IDirect3DTexture(D3DTex2); IDirect3DTexture2 *t1 = surf1 ? (IDirect3DTexture2 *)&surf1->IDirect3DTexture2_vtbl : NULL; IDirect3DTexture2 *t2 = surf2 ? (IDirect3DTexture2 *)&surf2->IDirect3DTexture2_vtbl : NULL; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index ffda68c..d0e0ab2 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4703,10 +4703,11 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu static HRESULT WINAPI d3d_texture1_Load(IDirect3DTexture *iface, IDirect3DTexture *src_texture) { + IDirectDrawSurfaceImpl* src_surface = unsafe_impl_from_IDirect3DTexture(src_texture); TRACE("iface %p, src_texture %p.\n", iface, src_texture); return d3d_texture2_Load((IDirect3DTexture2 *)&surface_from_texture1(iface)->IDirect3DTexture2_vtbl, - src_texture ? (IDirect3DTexture2 *)&surface_from_texture1(src_texture)->IDirect3DTexture2_vtbl : NULL); + src_surface ? (IDirect3DTexture2 *)&src_surface->IDirect3DTexture2_vtbl : NULL); } /***************************************************************************** @@ -5028,6 +5029,13 @@ IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface(IDirectDrawSurface * return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawSurface_iface); } +IDirectDrawSurfaceImpl *unsafe_impl_from_IDirect3DTexture(IDirect3DTexture *iface) +{ + if (!iface) return NULL; + assert(iface->lpVtbl == &d3d_texture1_vtbl); + return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirect3DTexture_vtbl); +} + static void STDMETHODCALLTYPE ddraw_surface_wined3d_object_destroyed(void *parent) { IDirectDrawSurfaceImpl *surface = parent;

1 0

Jacek Caban : winetest: Include language settings in OS info.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: b06358ecd40cd2687fddc77c363a4e79d98b6b64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b06358ecd40cd2687fddc77c3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 29 14:59:45 2011 +0200 winetest: Include language settings in OS info. --- programs/winetest/main.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 376b542..4846344 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -389,6 +389,13 @@ static void print_version (void) } } +static void print_language(void) +{ + xprintf (" SystemDefaultLCID=%x\n", GetSystemDefaultLCID()); + xprintf (" UserDefaultLCID=%x\n", GetUserDefaultLCID()); + xprintf (" ThreadLocale=%x\n", GetThreadLocale()); +} + static inline int is_dot_dir(const char* x) { return ((x[0] == '.') && ((x[1] == 0) || ((x[1] == '.') && (x[2] == 0)))); @@ -987,6 +994,7 @@ run_tests (char *logname, char *outdir) } xprintf ("Operating system version:\n"); print_version (); + print_language (); xprintf ("Dll info:\n" ); report (R_STATUS, "Counting tests");

1 0

Nowres Rafed : iphlpapi: Implemented IcmpSendEcho2Ex().
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: 1013f70a1fe402690f69f1c6df90c51ed14603ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=1013f70a1fe402690f69f1c6d… Author: Nowres Rafed <nowres.rafed(a)gmail.com> Date: Thu Jul 28 14:22:42 2011 +0100 iphlpapi: Implemented IcmpSendEcho2Ex(). --- dlls/iphlpapi/icmp.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/iphlpapi/iphlpapi.spec | 1 + 2 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index 50f5bf0..78b91c6 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -516,6 +516,48 @@ DWORD WINAPI IcmpSendEcho2( RequestSize, RequestOptions, ReplyBuffer, ReplySize, Timeout); } +/*********************************************************************** + * IcmpSendEcho2Ex (IPHLPAPI.@) + */ +DWORD WINAPI IcmpSendEcho2Ex( + HANDLE IcmpHandle, + HANDLE Event, + PIO_APC_ROUTINE ApcRoutine, + PVOID ApcContext, + IPAddr SourceAddress, + IPAddr DestinationAddress, + LPVOID RequestData, + WORD RequestSize, + PIP_OPTION_INFORMATION RequestOptions, + LPVOID ReplyBuffer, + DWORD ReplySize, + DWORD Timeout + ) +{ + TRACE("(%p, %p, %p, %p, %08x, %08x, %p, %d, %p, %p, %d, %d): stub\n", IcmpHandle, + Event, ApcRoutine, ApcContext, SourceAddress, DestinationAddress, RequestData, + RequestSize, RequestOptions, ReplyBuffer, ReplySize, Timeout); + + if (Event) + { + FIXME("unsupported for events\n"); + return 0; + } + if (ApcRoutine) + { + FIXME("unsupported for APCs\n"); + return 0; + } + if (SourceAddress) + { + FIXME("unsupported for source addresses\n"); + return 0; + } + + return IcmpSendEcho(IcmpHandle, DestinationAddress, RequestData, + RequestSize, RequestOptions, ReplyBuffer, ReplySize, Timeout); +} + /* * Copyright (c) 1989 The Regents of the University of California. * All rights reserved. diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index e53a641..1c33625 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -59,6 +59,7 @@ @ stdcall IcmpCloseHandle(ptr) @ stdcall IcmpCreateFile() @ stub IcmpParseReplies +@ stdcall IcmpSendEcho2Ex(ptr ptr ptr ptr long long ptr long ptr ptr long long) @ stdcall IcmpSendEcho2(ptr ptr ptr ptr long ptr long ptr ptr long long) @ stdcall IcmpSendEcho(ptr long ptr long ptr ptr long long) @ stub InternalCreateIpForwardEntry

1 0

Piotr Caban : msvcp90: Added wctype implementation.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: 7eb800f1854f1b856144059d09f1989774c52b29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eb800f1854f1b856144059d0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 29 16:35:00 2011 +0200 msvcp90: Added wctype implementation. --- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp60/msvcp60.spec | 2 +- dlls/msvcp70/msvcp70.spec | 2 +- dlls/msvcp71/msvcp71.spec | 2 +- dlls/msvcp80/msvcp80.spec | 2 +- dlls/msvcp90/misc.c | 28 ++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 2 +- dlls/msvcp90/tests/misc.c | 33 +++++++++++++++++++++++++++++++++ 8 files changed, 67 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 260da66..c4b7ffa 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2867,4 +2867,4 @@ @ stub __Wcrtomb_lk @ stub towctrans @ stub wctrans -@ stub wctype +@ cdecl wctype(str) msvcp90.wctype diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 1e6898e..e63636d 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -4317,4 +4317,4 @@ @ cdecl wcsrtombs(ptr ptr long ptr) msvcrt.wcsrtombs @ cdecl wctob(long) msvcrt.wctob @ stub wctrans -@ stub wctype +@ cdecl wctype(str) msvcp90.wctype diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index 9cb9a2a..fa74b0c 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -5106,4 +5106,4 @@ @ cdecl wcsrtombs(ptr ptr long ptr) msvcrt.wcsrtombs @ cdecl wctob(long) msvcrt.wctob @ stub wctrans -@ stub wctype +@ cdecl wctype(str) msvcp90.wctype diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 891d0e5..b21b549 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -5166,4 +5166,4 @@ @ cdecl wcsrtombs(ptr ptr long ptr) msvcrt.wcsrtombs @ cdecl wctob(long) msvcrt.wctob @ stub wctrans -@ stub wctype +@ cdecl wctype(str) msvcp90.wctype diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 2c477db..c81a711 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5787,4 +5787,4 @@ @ stub __Wcrtomb_lk @ stub towctrans @ stub wctrans -@ stub wctype +@ cdecl wctype(str) msvcp90.wctype diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index f0d1923..3ce1784 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -172,3 +172,31 @@ void __thiscall _Lockit_dtor(_Lockit *this) { _Lockit__Lockit_dtor(this); } + +/* wctype */ +unsigned short __cdecl wctype(const char *property) +{ + static const struct { + const char *name; + unsigned short mask; + } properties[] = { + { "alnum", _DIGIT|_ALPHA }, + { "alpha", _ALPHA }, + { "cntrl", _CONTROL }, + { "digit", _DIGIT }, + { "graph", _DIGIT|_PUNCT|_ALPHA }, + { "lower", _LOWER }, + { "print", _DIGIT|_PUNCT|_BLANK|_ALPHA }, + { "punct", _PUNCT }, + { "space", _SPACE }, + { "upper", _UPPER }, + { "xdigit", _HEX } + }; + int i; + + for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) + if(!strcmp(property, properties[i].name)) + return properties[i].mask; + + return 0; +} diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index c0c1490..4b94f08 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5809,7 +5809,7 @@ @ stub __Wcrtomb_lk @ stub towctrans @ stub wctrans -@ stub wctype +@ cdecl wctype(str) #Functions not exported in native dll: @ thiscall -arch=win32 ?_Tidy@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AAEX_N(a)Z(ptr long) basic_string_char_tidy_built diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 179f9a2..069c935 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -34,6 +34,8 @@ static BYTE (__cdecl *p_short_eq)(const void*, const void*); static char* (__cdecl *p_Copy_s)(char*, size_t, const char*, size_t); +static unsigned short (__cdecl *p_wctype)(const char*); + #ifdef __i386__ #define __thiscall __stdcall #else @@ -124,6 +126,7 @@ static BOOL init(void) p_set_invalid_parameter_handler(test_invalid_parameter_handler); + SET(p_wctype, "wctype"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_char_assign, "?assign@?$char_traits(a)D@std@@SAXAEADAEBD(a)Z"); SET(p_wchar_assign, "?assign@?$char_traits(a)_W@std@@SAXAEA_WAEB_W(a)Z"); @@ -259,6 +262,35 @@ static void test_Copy_s(void) ok(errno == 0xdeadbeef, "errno = %d\n", errno); } +static void test_wctype(void) +{ + static const struct { + const char *name; + unsigned short mask; + } properties[] = { + { "alnum", 0x107 }, + { "alpha", 0x103 }, + { "cntrl", 0x020 }, + { "digit", 0x004 }, + { "graph", 0x117 }, + { "lower", 0x002 }, + { "print", 0x157 }, + { "punct", 0x010 }, + { "space", 0x008 }, + { "upper", 0x001 }, + { "xdigit", 0x080 }, + { "ALNUM", 0x000 }, + { "Alnum", 0x000 }, + { "", 0x000 } + }; + int i, ret; + + for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) { + ret = p_wctype(properties[i].name); + ok(properties[i].mask == ret, "%d - Expected %x, got %x\n", i, properties[i].mask, ret); + } +} + static void test_allocator_char(void) { void *allocator = (void*)0xdeadbeef; @@ -298,6 +330,7 @@ START_TEST(misc) test_assign(); test_equal(); test_Copy_s(); + test_wctype(); test_allocator_char();

1 0

Piotr Caban : msvcrt: Fixed vswprintf* exports.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: 62a55402596bc40119920935f434f38202f55bbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=62a55402596bc40119920935f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 29 15:10:10 2011 +0200 msvcrt: Fixed vswprintf* exports. --- dlls/msvcrt/msvcrt.spec | 8 ++++---- dlls/msvcrt/wcs.c | 11 ++++++++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 7d65642..289ea46 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_vsnwprintf -@ 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 long wstr ptr ptr) MSVCRT_vsnwprintf_l +@ 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_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/wcs.c b/dlls/msvcrt/wcs.c index 04d3ee2..dbcee85 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -835,7 +835,7 @@ int CDECL MSVCRT_swprintf_s(MSVCRT_wchar_t *str, MSVCRT_size_t numberOfElements, } /********************************************************************* - * vswprintf (MSVCRT.@) + * _vswprintf (MSVCRT.@) */ int CDECL MSVCRT_vswprintf( MSVCRT_wchar_t* str, const MSVCRT_wchar_t* format, __ms_va_list args ) { @@ -843,6 +843,15 @@ int CDECL MSVCRT_vswprintf( MSVCRT_wchar_t* str, const MSVCRT_wchar_t* format, _ } /********************************************************************* + * _vswprintf (MSVCRT.@) + */ +int CDECL MSVCRT_vswprintf_l( MSVCRT_wchar_t* str, const MSVCRT_wchar_t* format, + MSVCRT__locale_t locale, __ms_va_list args ) +{ + return MSVCRT_vsnwprintf_l( str, INT_MAX, format, locale, args ); +} + +/********************************************************************* * _vscwprintf (MSVCRT.@) */ int CDECL MSVCRT__vscwprintf( const MSVCRT_wchar_t *format, __ms_va_list args )

1 0

Hans Leidekker : winhttp: Factor out request initialization.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: 36014639eac90e7cd99d2de5a6807dcdbef57544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36014639eac90e7cd99d2de5a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 29 13:25:39 2011 +0200 winhttp: Factor out request initialization. --- dlls/winhttp/request.c | 44 +++++++++++++++++++++++++------------------- 1 files changed, 25 insertions(+), 19 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 3efa8a3..8effad5 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2985,21 +2985,8 @@ static HRESULT WINAPI winhttp_request_WaitForResponse( } } -static HRESULT WINAPI winhttp_request_Abort( - IWinHttpRequest *iface ) +static void initialize_request( struct winhttp_request *request ) { - struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); - - TRACE("%p\n", request); - - SetEvent( request->cancel ); - WinHttpCloseHandle( request->hrequest ); - WinHttpCloseHandle( request->hconnect ); - WinHttpCloseHandle( request->hsession ); - CloseHandle( request->wait ); - CloseHandle( request->cancel ); - heap_free( request->buffer ); - heap_free( request->verb ); request->state = REQUEST_STATE_INVALID; request->hrequest = NULL; request->hconnect = NULL; @@ -3015,6 +3002,28 @@ static HRESULT WINAPI winhttp_request_Abort( request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_DEFAULT_PROXY; request->proxy.lpszProxy = NULL; request->proxy.lpszProxyBypass = NULL; + request->resolve_timeout = 0; + request->connect_timeout = 60000; + request->send_timeout = 30000; + request->receive_timeout = 30000; +} + +static HRESULT WINAPI winhttp_request_Abort( + IWinHttpRequest *iface ) +{ + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + + TRACE("%p\n", request); + + SetEvent( request->cancel ); + WinHttpCloseHandle( request->hrequest ); + WinHttpCloseHandle( request->hconnect ); + WinHttpCloseHandle( request->hsession ); + CloseHandle( request->wait ); + CloseHandle( request->cancel ); + heap_free( request->buffer ); + heap_free( request->verb ); + initialize_request( request ); return S_OK; } @@ -3088,13 +3097,10 @@ HRESULT WinHttpRequest_create( IUnknown *unknown, void **obj ) TRACE("%p, %p\n", unknown, obj); - if (!(request = heap_alloc_zero( sizeof(*request) ))) return E_OUTOFMEMORY; + if (!(request = heap_alloc( sizeof(*request) ))) return E_OUTOFMEMORY; request->IWinHttpRequest_iface.lpVtbl = &winhttp_request_vtbl; request->refs = 1; - request->resolve_timeout = 0; - request->connect_timeout = 60000; - request->send_timeout = 30000; - request->receive_timeout = 30000; + initialize_request( request ); *obj = &request->IWinHttpRequest_iface; TRACE("returning iface %p\n", *obj);

1 0

Jacek Caban : mshtml: Improved handling empty dispex_data_t in preprocess_dispex_data.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: 8cbc34e40fc3ae6d65f3ced298cbe509eaaa5210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cbc34e40fc3ae6d65f3ced29… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 29 14:31:22 2011 +0200 mshtml: Improved handling empty dispex_data_t in preprocess_dispex_data. --- dlls/mshtml/dispex.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 09de654..98f73b6 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -248,21 +248,19 @@ static dispex_data_t *preprocess_dispex_data(DispatchEx *This) if(!data->func_cnt) { heap_free(data->funcs); + data->name_table = NULL; data->funcs = NULL; - }else if(data->func_cnt != size) { - data->funcs = heap_realloc(data->funcs, data->func_cnt * sizeof(func_info_t)); + return data; } + + data->funcs = heap_realloc(data->funcs, data->func_cnt * sizeof(func_info_t)); qsort(data->funcs, data->func_cnt, sizeof(func_info_t), dispid_cmp); - if(data->funcs) { - data->name_table = heap_alloc(data->func_cnt * sizeof(func_info_t*)); - for(i=0; i < data->func_cnt; i++) - data->name_table[i] = data->funcs+i; - qsort(data->name_table, data->func_cnt, sizeof(func_info_t*), func_name_cmp); - }else { - data->name_table = NULL; - } + data->name_table = heap_alloc(data->func_cnt * sizeof(func_info_t*)); + for(i=0; i < data->func_cnt; i++) + data->name_table[i] = data->funcs+i; + qsort(data->name_table, data->func_cnt, sizeof(func_info_t*), func_name_cmp); return data; }

1 0

Frédéric Delanoy : cmd/tests: Add FOR /L tests.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: 7fb790f8a7e38c10d08da4847f455b3ecc31d688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fb790f8a7e38c10d08da4847… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 29 13:59:52 2011 +0200 cmd/tests: Add FOR /L tests. --- programs/cmd/tests/test_builtins.cmd | 19 +++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 13 +++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 94ec6e0..f3b1fc5 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -317,6 +317,25 @@ rem sort < tmp rem del tmp cd .. rd /s/Q foobar +echo ...for /L +rem Some cases loop forever writing 0s, like e.g. (1,0,1), (1,a,3) or (a,b,c); those can't be tested here +for /L %%i in (1,2,0) do echo %%i +for /L %%i in (1,2,6) do echo %%i +for /l %%i in (1 ,2,6) do echo %%i +for /L %%i in (a,2,3) do echo %%i +for /L %%i in (1,2,-1) do echo %%i +for /L %%i in (-4,-1,-1) do echo %%i +for /L %%i in (1,-2,-2) do echo %%i +for /L %%i in (1,2,a) do echo %%i +echo ErrorLevel %ErrorLevel% +for /L %%i in (1,a,b) do echo %%i +echo ErrorLevel %ErrorLevel% +rem FIXME: following test cases cannot be currently tested due to an inconsistent/buggy 'for /L' parsing. +rem for /L %%i in (a,2,b) do echo %%i +rem for /L %%i in (1,1,1) do echo %%i +rem for /L %%i in (1,-2,-1) do echo %%i +rem for /L %%i in (-1,-1,-1) do echo %%i +rem for /L %%i in (1,2, 3) do echo %%i echo -----------Testing del /a----------- del /f/q *.test > nul diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 7abfb21..51239b0 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -220,6 +220,19 @@ bazbaz baz foo bar +...for /L +1 +3 +5 +1 +3 +5 +0 +2 +1 +-1 +(a)todo_wine@ErrorLevel 0 +(a)todo_wine@ErrorLevel 0 -----------Testing del /a----------- not-r.test not found after delete, good r.test found before delete, good

1 0

Frédéric Delanoy : cmd/tests: Additional CALL tests.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: ce57ebe32dfcad4556d1e0db1958067ce8326e4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce57ebe32dfcad4556d1e0db1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 29 13:59:51 2011 +0200 cmd/tests: Additional CALL tests. --- programs/cmd/tests/test_builtins.cmd | 20 ++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 12 ++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index f3b1fc5..04d8fdd 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -542,6 +542,13 @@ rem External script echo echo foo %%1> foo.cmd call foo call foo.cmd 8 +echo echo %%1 %%2 > foo.cmd +call foo.cmd foo +call foo.cmd foo bar +call foo.cmd foo "" +call foo.cmd "" bar +call foo.cmd foo '' +call foo.cmd '' bar del foo.cmd rem Internal routines call :testRoutine :testRoutine @@ -550,6 +557,19 @@ goto :endTestRoutine echo bar %1 goto :eof :endTestRoutine + +call :testRoutineArgs foo +call :testRoutineArgs foo bar +call :testRoutineArgs foo "" +call :testRoutineArgs "" bar +call :testRoutineArgs foo '' +call :testRoutineArgs '' bar +goto :endTestRoutineArgs +:testRoutineArgs +echo %1 %2 +goto :eof +:endTestRoutineArgs + rem Should work for builtins... call mkdir foo echo %ErrorLevel% diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 51239b0..d7ac58a 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -288,7 +288,19 @@ bar\baz removed ------------ Testing CALL -------------- foo(a)space@ @todo_wine(a)foo 8 +foo(a)space@@space@ +foo bar(a)space@ +(a)todo_wine@foo ""@space@ +(a)todo_wine@"" bar(a)space@ +foo ''@space@ +'' bar(a)space@ bar :testRoutine +foo(a)space@ +foo bar +(a)todo_wine@foo "" +(a)todo_wine@"" bar +foo '' +'' bar @todo_wine(a)0 @todo_wine(a)foo created @todo_wine(a)Should expand foobaz

1 0

Hans Leidekker : winhttp: Store a copy of the proxy server name and bypass list.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: 87487c14c7bd57daa3e5755c84103f47229fb3de URL: http://source.winehq.org/git/wine.git/?a=commit;h=87487c14c7bd57daa3e5755c8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 29 13:26:02 2011 +0200 winhttp: Store a copy of the proxy server name and bypass list. --- dlls/winhttp/request.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 8effad5..0130cd4 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2202,6 +2202,8 @@ static ULONG WINAPI winhttp_request_Release( WinHttpCloseHandle( request->hsession ); CloseHandle( request->wait ); CloseHandle( request->cancel ); + heap_free( (WCHAR *)request->proxy.lpszProxy ); + heap_free( (WCHAR *)request->proxy.lpszProxyBypass ); heap_free( request->buffer ); heap_free( request->verb ); heap_free( request ); @@ -2384,8 +2386,8 @@ static HRESULT WINAPI winhttp_request_SetProxy( case HTTPREQUEST_PROXYSETTING_PROXY: request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; - request->proxy.lpszProxy = V_BSTR( &proxy_server ); - request->proxy.lpszProxyBypass = V_BSTR( &bypass_list ); + request->proxy.lpszProxy = strdupW( V_BSTR( &proxy_server ) ); + request->proxy.lpszProxyBypass = strdupW( V_BSTR( &bypass_list ) ); break; default: return E_INVALIDARG; @@ -3021,6 +3023,8 @@ static HRESULT WINAPI winhttp_request_Abort( WinHttpCloseHandle( request->hsession ); CloseHandle( request->wait ); CloseHandle( request->cancel ); + heap_free( (WCHAR *)request->proxy.lpszProxy ); + heap_free( (WCHAR *)request->proxy.lpszProxyBypass ); heap_free( request->buffer ); heap_free( request->verb ); initialize_request( request );

1 0