wine-commits October 2011

wine-commits@winehq.org

3 participants
783 discussions

Jacek Caban : vbscript: Added vbSunday constant implementation.
by Alexandre Julliard 21 Oct '11

21 Oct '11

Module: wine Branch: master Commit: 89c76714038d60ee6a62e98157c2477b2d87ca27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89c76714038d60ee6a62e9815… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 21 12:42:37 2011 +0200 vbscript: Added vbSunday constant implementation. --- dlls/vbscript/global.c | 14 ++++++++++++-- dlls/vbscript/tests/api.vbs | 3 +++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 56cedf6..d3c4c0c 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -75,6 +75,16 @@ static HRESULT return_bstr(VARIANT *res, const WCHAR *str) return S_OK; } +static HRESULT return_short(VARIANT *res, short val) +{ + if(res) { + V_VT(res) = VT_I2; + V_I2(res) = val; + } + + return S_OK; +} + static IUnknown *create_object(script_ctx_t *ctx, const WCHAR *progid) { IInternetHostSecurityManager *secmgr = NULL; @@ -897,8 +907,8 @@ static HRESULT Global_vbUseSystemDayOfWeek(vbdisp_t *This, VARIANT *arg, unsigne static HRESULT Global_vbSunday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, 1); } static HRESULT Global_vbMonday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 126f1e0..c201bea 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -23,6 +23,9 @@ Dim x Class EmptyClass End Class +Call ok(vbSunday = 1, "vbSunday = " & vbSunday) +Call ok(getVT(vbSunday) = "VT_I2", "getVT(vbSunday) = " & getVT(vbSunday)) + Call ok(isObject(new EmptyClass), "isObject(new EmptyClass) is not true?") Set x = new EmptyClass Call ok(isObject(x), "isObject(x) is not true?")

1 0

Frédéric Delanoy : cmd: Constify WCMD_pushd parameter.
by Alexandre Julliard 21 Oct '11

21 Oct '11

Module: wine Branch: master Commit: 42f126e80ddd5edcc5df825e23b6c5faae1957fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=42f126e80ddd5edcc5df825e2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 21 00:56:32 2011 +0200 cmd: Constify WCMD_pushd parameter. --- programs/cmd/builtins.c | 3 ++- programs/cmd/wcmd.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 79e1ced..721fb02 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1418,7 +1418,8 @@ void WCMD_goto (CMD_LIST **cmdList) { * Push a directory onto the stack */ -void WCMD_pushd (WCHAR *command) { +void WCMD_pushd (const WCHAR *command) +{ struct env_stack *curdir; WCHAR *thisdir; static const WCHAR parmD[] = {'/','D','\0'}; diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index e025484..33ae12f 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -79,7 +79,7 @@ void WCMD_output_asis_stderr (const WCHAR *message); void WCMD_pause (void); void WCMD_popd (void); void WCMD_print_error (void); -void WCMD_pushd (WCHAR *); +void WCMD_pushd (const WCHAR *command); void WCMD_remove_dir (WCHAR *command); void WCMD_rename (void); void WCMD_run_program (WCHAR *command, int called);

1 0

Frédéric Delanoy : msvcrt: Avoid superfluous cast of MSVCRT_malloc return value.
by Alexandre Julliard 21 Oct '11

21 Oct '11

Module: wine Branch: master Commit: 7bfe648666355585b74e1f31c286ddd1d86aa894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bfe648666355585b74e1f31c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 21 01:44:45 2011 +0200 msvcrt: Avoid superfluous cast of MSVCRT_malloc return value. --- dlls/msvcrt/math.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 2e3b4fc..4f187de 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1351,7 +1351,7 @@ int CDECL _ecvt_s( char *buffer, MSVCRT_size_t length, double number, int ndigit /* handle cases with zero ndigits or less */ prec = ndigits; if( prec < 1) prec = 2; - result = (char*)MSVCRT_malloc(prec + 7); + result = MSVCRT_malloc(prec + 7); if( number < 0) { *sign = TRUE;

1 0

Frédéric Delanoy : dpnet/tests: Avoid casting return value of HeapAlloc calls.
by Alexandre Julliard 21 Oct '11

21 Oct '11

Module: wine Branch: master Commit: 9696705859150a0b42fe2a63d20051736c7729dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9696705859150a0b42fe2a63d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 21 01:35:52 2011 +0200 dpnet/tests: Avoid casting return value of HeapAlloc calls. --- dlls/dpnet/tests/peer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c index dd0b408..1756ac9 100644 --- a/dlls/dpnet/tests/peer.c +++ b/dlls/dpnet/tests/peer.c @@ -70,7 +70,7 @@ static void test_enum_service_providers(void) ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); ok(size != 0, "size is unexpectedly 0\n"); - serv_prov_info = (DPN_SERVICE_PROVIDER_INFO*) HeapAlloc(GetProcessHeap(), 0, size); + serv_prov_info = HeapAlloc(GetProcessHeap(), 0, size); hr = IDirectPlay8Peer_EnumServiceProviders(peer, NULL, NULL, serv_prov_info, &size, &items, 0); ok(hr == S_OK, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); @@ -96,7 +96,7 @@ static void test_enum_service_providers(void) ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); ok(size != 0, "size is unexpectedly 0\n"); - serv_prov_info = (DPN_SERVICE_PROVIDER_INFO*) HeapAlloc(GetProcessHeap(), 0, size); + serv_prov_info = HeapAlloc(GetProcessHeap(), 0, size); hr = IDirectPlay8Peer_EnumServiceProviders(peer, &CLSID_DP8SP_TCPIP, NULL, serv_prov_info, &size, &items, 0); ok(hr == S_OK, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr);

1 0

Frédéric Delanoy : dinput: Avoid casting return value of HeapAlloc calls.
by Alexandre Julliard 21 Oct '11

21 Oct '11

Module: wine Branch: master Commit: 3c15af301c54d82c1c588fabd819202f468165ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c15af301c54d82c1c588fabd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 21 01:35:51 2011 +0200 dinput: Avoid casting return value of HeapAlloc calls. --- dlls/dinput/config.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index 1098259..56cbdf3 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -195,7 +195,7 @@ static void init_devices(HWND dialog, IDirectInput8W *lpDI, DIDevicesData *data, IDirectInput8_EnumDevicesBySemantics(lpDI, NULL, lpdiaf, count_devices, (LPVOID) data, 0); /* Allocate devices */ - data->devices = (DeviceData*) HeapAlloc(GetProcessHeap(), 0, sizeof(DeviceData) * data->ndevices); + data->devices = HeapAlloc(GetProcessHeap(), 0, sizeof(DeviceData) * data->ndevices); /* Collect and insert */ data->ndevices = 0;

1 0

Francois Gouget : net: Use FormatMessageW() for better internationalization support.
by Alexandre Julliard 21 Oct '11

21 Oct '11

Module: wine Branch: master Commit: f3f24fb5d4b017e026333c5d00066d727741a4b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3f24fb5d4b017e026333c5d0… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Oct 21 09:43:20 2011 +0200 net: Use FormatMessageW() for better internationalization support. --- po/ar.po | 18 +++++++++--------- po/bg.po | 27 +++++++++++++++------------ po/ca.po | 27 ++++++++++++++++++--------- po/cs.po | 33 +++++++++++++++++++-------------- po/da.po | 27 ++++++++++++++++++--------- po/de.po | 27 ++++++++++++++++++--------- po/el.po | 21 +++++++++++---------- po/en.po | 36 ++++++++++++++++++------------------ po/en_US.po | 36 ++++++++++++++++++------------------ po/eo.po | 27 +++++++++++++++------------ po/es.po | 33 +++++++++++++++++++-------------- po/fa.po | 18 +++++++++--------- po/fi.po | 27 +++++++++++++++------------ po/fr.po | 27 ++++++++++++++++++--------- po/he.po | 27 ++++++++++++++++++--------- po/hi.po | 18 +++++++++--------- po/hu.po | 27 +++++++++++++++------------ po/it.po | 27 ++++++++++++++++++--------- po/ja.po | 27 ++++++++++++++++++--------- po/ko.po | 27 ++++++++++++++++++--------- po/lt.po | 27 ++++++++++++++++++--------- po/ml.po | 18 +++++++++--------- po/nb_NO.po | 27 ++++++++++++++++++--------- po/nl.po | 27 ++++++++++++++++++--------- po/or.po | 18 +++++++++--------- po/pa.po | 18 +++++++++--------- po/pl.po | 27 ++++++++++++++++++--------- po/pt_BR.po | 27 ++++++++++++++++++--------- po/pt_PT.po | 27 ++++++++++++++++++--------- po/rm.po | 18 +++++++++--------- po/ro.po | 27 ++++++++++++++++++--------- po/ru.po | 27 ++++++++++++++++++--------- po/sk.po | 33 +++++++++++++++++++-------------- po/sl.po | 27 ++++++++++++++++++--------- po/sr_RS(a)cyrillic.po | 27 +++++++++++++++------------ po/sr_RS(a)latin.po | 27 +++++++++++++++------------ po/sv.po | 27 ++++++++++++++++++--------- po/te.po | 18 +++++++++--------- po/th.po | 24 +++++++++++++----------- po/tr.po | 33 +++++++++++++++++++-------------- po/uk.po | 27 ++++++++++++++++++--------- po/wa.po | 18 +++++++++--------- po/wine.pot | 18 +++++++++--------- po/zh_CN.po | 30 +++++++++++++++++------------- po/zh_TW.po | 30 +++++++++++++++++------------- programs/net/net.c | 28 +++++++++++++++------------- programs/net/net.rc | 18 +++++++++--------- 47 files changed, 716 insertions(+), 494 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f3f24fb5d4b017e026333…

1 0

Francois Gouget : attrib: Use FormatMessageW() for better internationalization support.
by Alexandre Julliard 21 Oct '11

21 Oct '11

1 0

Ken Thomases : winecoreaudio: Improved tracing.
by Alexandre Julliard 21 Oct '11

21 Oct '11

Module: wine Branch: master Commit: 7eadf7bb9f2c9b139b483589625ec178be54fa3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eadf7bb9f2c9b139b4835896… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 20 23:24:43 2011 -0500 winecoreaudio: Improved tracing. --- dlls/winecoreaudio.drv/mmdevdrv.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 6842b7e..c45a8c6 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -417,6 +417,9 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, if(*def_index == (UINT)-1 && devices[i] == default_id) *def_index = *num; + TRACE("device %u: id %s key %u%s\n", *num, debugstr_w((*ids)[*num]), + (unsigned int)*(*keys)[*num], (*def_index == *num) ? " (default)" : ""); + (*num)++; } @@ -433,7 +436,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(AudioDeviceID *adevid, IMMDevice *dev, { ACImpl *This; - TRACE("%p %d %p\n", dev, dataflow, out); + TRACE("%u %p %d %p\n", (unsigned int)*adevid, dev, dataflow, out); This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACImpl)); if(!This)

1 0

Ken Thomases : winecoreaudio: Avoid an extra copy/conversion of a string.
by Alexandre Julliard 21 Oct '11

21 Oct '11

Module: wine Branch: master Commit: cf390232089a53bd3adcc5364e0da95599aa80ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf390232089a53bd3adcc5364… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 20 23:24:12 2011 -0500 winecoreaudio: Avoid an extra copy/conversion of a string. --- dlls/winecoreaudio.drv/mmdevdrv.c | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 8d1e046..6842b7e 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -325,7 +325,6 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, AudioBufferList *buffers; CFStringRef name; SIZE_T len; - char nameA[256]; int j; addr.mSelector = kAudioDevicePropertyStreamConfiguration; @@ -384,18 +383,10 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, continue; } - if(!CFStringGetCString(name, nameA, sizeof(nameA), - kCFStringEncodingUTF8)){ - WARN("Error converting string to UTF8\n"); - CFRelease(name); - continue; - } - - CFRelease(name); - - len = MultiByteToWideChar(CP_UNIXCP, 0, nameA, -1, NULL, 0); + len = CFStringGetLength(name) + 1; (*ids)[*num] = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if(!(*ids)[*num]){ + CFRelease(name); HeapFree(GetProcessHeap(), 0, devices); for(j = 0; j < *num; ++j){ HeapFree(GetProcessHeap(), 0, (*ids)[j]); @@ -405,7 +396,9 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, HeapFree(GetProcessHeap(), 0, *keys); return E_OUTOFMEMORY; } - MultiByteToWideChar(CP_UNIXCP, 0, nameA, -1, (*ids)[*num], len); + CFStringGetCharacters(name, CFRangeMake(0, len - 1), (UniChar*)(*ids)[*num]); + ((*ids)[*num])[len - 1] = 0; + CFRelease(name); (*keys)[*num] = HeapAlloc(GetProcessHeap(), 0, sizeof(AudioDeviceID)); if(!(*keys)[*num]){

1 0

Ken Thomases : winecoreaudio: Fix a test for allocation failure (copy/ paste error).
by Alexandre Julliard 21 Oct '11

21 Oct '11

Module: wine Branch: master Commit: 4bceee9e15f52b085131a2b2d908622100c11672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bceee9e15f52b085131a2b2d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 20 23:23:50 2011 -0500 winecoreaudio: Fix a test for allocation failure (copy/paste error). --- dlls/winecoreaudio.drv/mmdevdrv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 414aaf5..8d1e046 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -408,7 +408,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, MultiByteToWideChar(CP_UNIXCP, 0, nameA, -1, (*ids)[*num], len); (*keys)[*num] = HeapAlloc(GetProcessHeap(), 0, sizeof(AudioDeviceID)); - if(!(*ids)[*num]){ + if(!(*keys)[*num]){ HeapFree(GetProcessHeap(), 0, devices); HeapFree(GetProcessHeap(), 0, (*ids)[*num]); for(j = 0; j < *num; ++j){

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
79
Older →

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 October 2011