October 2011 - Wine-Commits

Jacek Caban : vbscript: Added remaining week day constants implementations.
by Alexandre Julliard Oct. 21, 2011

Oct. 21, 2011

Module: wine Branch: master Commit: d0740365ffa8edc04b839bc75e24cfcab35f7f8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0740365ffa8edc04b839bc75… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 21 12:42:48 2011 +0200 vbscript: Added remaining week day constants implementations. --- dlls/vbscript/global.c | 24 ++++++++++++------------ dlls/vbscript/tests/api.vbs | 12 ++++++++++++ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index d3c4c0c..e3c7161 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -913,38 +913,38 @@ static HRESULT Global_vbSunday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, static HRESULT Global_vbMonday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, 2); } static HRESULT Global_vbTuesday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, 3); } static HRESULT Global_vbWednesday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, 4); } static HRESULT Global_vbThursday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, 5); } static HRESULT Global_vbFriday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, 6); } static HRESULT Global_vbSaturday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return return_short(res, 7); } static HRESULT Global_vbFirstJan1(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 c201bea..ae1e73b 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -25,6 +25,18 @@ End Class Call ok(vbSunday = 1, "vbSunday = " & vbSunday) Call ok(getVT(vbSunday) = "VT_I2", "getVT(vbSunday) = " & getVT(vbSunday)) +Call ok(vbMonday = 2, "vbMonday = " & vbMonday) +Call ok(getVT(vbMonday) = "VT_I2", "getVT(vbMonday) = " & getVT(vbMonday)) +Call ok(vbTuesday = 3, "vbTuesday = " & vbTuesday) +Call ok(getVT(vbTuesday) = "VT_I2", "getVT(vbTuesday) = " & getVT(vbTuesday)) +Call ok(vbWednesday = 4, "vbWednesday = " & vbWednesday) +Call ok(getVT(vbWednesday) = "VT_I2", "getVT(vbWednesday) = " & getVT(vbWednesday)) +Call ok(vbThursday = 5, "vbThursday = " & vbThursday) +Call ok(getVT(vbThursday) = "VT_I2", "getVT(vbThursday) = " & getVT(vbThursday)) +Call ok(vbFriday = 6, "vbFriday = " & vbFriday) +Call ok(getVT(vbFriday) = "VT_I2", "getVT(vbFriday) = " & getVT(vbFriday)) +Call ok(vbSaturday = 7, "vbSaturday = " & vbSaturday) +Call ok(getVT(vbSaturday) = "VT_I2", "getVT(vbSaturday) = " & getVT(vbSaturday)) Call ok(isObject(new EmptyClass), "isObject(new EmptyClass) is not true?") Set x = new EmptyClass

1 0

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

Oct. 21, 2011

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 : cmd: Constify WCMD_pushd parameter.
by Alexandre Julliard Oct. 21, 2011

Oct. 21, 2011

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 : dinput: Avoid casting return value of HeapAlloc calls.
by Alexandre Julliard Oct. 21, 2011

Oct. 21, 2011

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

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

Oct. 21, 2011

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

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

Oct. 21, 2011

1 0

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

Oct. 21, 2011

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

Andrew Talbot : ws2_32: Mark a fall-through in a switch statement.
by Alexandre Julliard Oct. 21, 2011

Oct. 21, 2011

Module: wine Branch: master Commit: 4bebe6287c88a87e32fe401243e9ea5303503d77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bebe6287c88a87e32fe40124… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Oct 20 21:37:04 2011 +0100 ws2_32: Mark a fall-through in a switch statement. --- dlls/ws2_32/socket.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7a1947f..e8f781f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4345,6 +4345,7 @@ int WINAPI WS_shutdown(SOCKET s, int how) break; case 2: /* drop all */ clear_flags |= FD_READ|FD_WRITE; + /*fall through */ default: clear_flags |= FD_WINE_LISTENING; }

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_surface_from_dc() const.
by Alexandre Julliard Oct. 21, 2011

Oct. 21, 2011

Module: wine Branch: master Commit: a2c754dde80477d74e86e49675ab8837046ac93d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2c754dde80477d74e86e4967… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 20 21:42:58 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_surface_from_dc() 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 6f43715..cffe5f7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5981,7 +5981,7 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso TRACE("Resource released.\n"); } -HRESULT CDECL wined3d_device_get_surface_from_dc(struct wined3d_device *device, +HRESULT CDECL wined3d_device_get_surface_from_dc(const struct wined3d_device *device, HDC dc, struct wined3d_surface **surface) { struct wined3d_resource *resource; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 97df749..e4ca4c4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2249,7 +2249,7 @@ HRESULT __cdecl wined3d_device_get_stream_source(const struct wined3d_device *de UINT stream_idx, struct wined3d_buffer **buffer, UINT *offset, UINT *stride); HRESULT __cdecl wined3d_device_get_stream_source_freq(const struct wined3d_device *device, UINT stream_idx, UINT *divider); -HRESULT __cdecl wined3d_device_get_surface_from_dc(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_get_surface_from_dc(const struct wined3d_device *device, HDC dc, struct wined3d_surface **surface); HRESULT __cdecl wined3d_device_get_swapchain(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_swapchain **swapchain);

1 0

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

Oct. 21, 2011

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