June 2010 - Wine-Commits - list.winehq.org

Marcus Meissner : mshtml: Add check for doc_obj being NULL (Coverity).
by Alexandre Julliard June 7, 2010

June 7, 2010

Module: wine Branch: master Commit: 4169d4dfb89cf2c69fdd2050f43e2491f08be6b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4169d4dfb89cf2c69fdd2050f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jun 5 09:21:36 2010 +0200 mshtml: Add check for doc_obj being NULL (Coverity). --- dlls/mshtml/htmlwindow.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 1701b53..1ba1101 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -58,7 +58,7 @@ static void window_set_docnode(HTMLWindow *window, HTMLDocumentNode *doc_node) htmldoc_addref(&doc_node->basedoc); } - if(doc_node && window->doc_obj->usermode == EDITMODE) { + if(doc_node && window->doc_obj && window->doc_obj->usermode == EDITMODE) { nsIDOMNSHTMLDocument *nshtmldoc; nsAString mode_str; nsresult nsres;

1 0

Vincent Povirk : include: Add definitions for IWICColorContext.
by Alexandre Julliard June 7, 2010

June 7, 2010

Module: wine Branch: master Commit: 7862205d3ecbd2dc14351b11fbf1787d46032755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7862205d3ecbd2dc14351b11f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jun 5 13:04:52 2010 -0500 include: Add definitions for IWICColorContext. --- include/wincodec.idl | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 9d3fee1..97fd4ac 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -108,6 +108,12 @@ typedef enum WICBitmapTransformOptions { WICBITMAPTRANSFORMOPTIONS_FORCE_DWORD = CODEC_FORCE_DWORD } WICBitmapTransformOptions; +typedef enum WICColorContextType { + WICColorContextUninitialized = 0x00000000, + WICColorContextProfile = 0x00000001, + WICColorContextExifColorSpace = 0x00000002 +} WICColorContextType; + typedef enum WICComponentType { WICDecoder = 0x00000001, WICEncoder = 0x00000002, @@ -188,7 +194,6 @@ cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDOPERATION 0x88982f81") cpp_quote("#define WINCODEC_ERR_INSUFFICIENTBUFFER 0x88982f8c") interface IWICPalette; -interface IWICColorContext; interface IWICColorTransform; interface IWICFastMetadataEncoder; interface IWICMetadataQueryReader; @@ -196,6 +201,34 @@ interface IWICMetadataQueryWriter; [ object, + uuid(3c613a02-34b2-44ea-9a7c-45aea9c6fd6d) +] +interface IWICColorContext : IUnknown +{ + HRESULT InitializeFromFilename( + [in] LPCWSTR wzFilename); + + HRESULT InitializeFromMemory( + [in, size_is(cbBufferSize)] const BYTE *pbBuffer, + [in] UINT cbBufferSize); + + HRESULT InitializeFromExifColorSpace( + [in] UINT value); + + HRESULT GetType( + [out] WICColorContextType *pType); + + HRESULT GetProfileBytes( + [in] UINT cbBuffer, + [in, out, unique, size_is(cbBuffer)] BYTE *pbBuffer, + [out] UINT *pcbActual); + + HRESULT GetExifColorSpace( + [out] UINT *pValue); +} + +[ + object, uuid(00000120-a8f2-4877-ba0a-fd2b6645fb94) ] interface IWICBitmapSource : IUnknown

1 0

Nikolay Sivov : comctl32/rebar: Use defined constants as parameters.
by Alexandre Julliard June 7, 2010

June 7, 2010

Module: wine Branch: master Commit: fb1d5310ad22af0f01f5ce26fd648b0ccb643571 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb1d5310ad22af0f01f5ce26f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 7 12:44:38 2010 +0400 comctl32/rebar: Use defined constants as parameters. --- dlls/comctl32/rebar.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 7a2995c..c254e34 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2452,7 +2452,7 @@ REBAR_InsertBandT(REBAR_INFO *infoPtr, INT iIndex, LPREBARBANDINFOW lprbbi, BOOL REBAR_DumpBand (infoPtr); REBAR_Layout(infoPtr); - InvalidateRect(infoPtr->hwndSelf, 0, TRUE); + InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); return TRUE; } @@ -2653,7 +2653,7 @@ REBAR_SetBandInfoT(REBAR_INFO *infoPtr, INT iBand, LPREBARBANDINFOW lprbbi, BOOL if (uChanged & (RBBIM_CHILDSIZE | RBBIM_SIZE | RBBIM_STYLE | RBBIM_IMAGE)) { REBAR_Layout(infoPtr); - InvalidateRect(infoPtr->hwndSelf, 0, 1); + InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); } return TRUE; @@ -2798,7 +2798,7 @@ REBAR_ShowBand (REBAR_INFO *infoPtr, INT iBand, BOOL show) } REBAR_Layout(infoPtr); - InvalidateRect(infoPtr->hwndSelf, 0, 1); + InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); return TRUE; } @@ -3399,7 +3399,7 @@ REBAR_SetRedraw (REBAR_INFO *infoPtr, BOOL redraw) if (infoPtr->fStatus & BAND_NEEDS_REDRAW) { REBAR_MoveChildWindows (infoPtr, 0, infoPtr->uNumBands); REBAR_ForceResize (infoPtr); - InvalidateRect (infoPtr->hwndSelf, 0, TRUE); + InvalidateRect (infoPtr->hwndSelf, NULL, TRUE); } infoPtr->fStatus &= ~BAND_NEEDS_REDRAW; }

1 0

Alexander Scott-Johns : msvcrt/test: Add some simple _vsnwprintf_s tests.
by Alexandre Julliard June 7, 2010

June 7, 2010

Module: wine Branch: master Commit: d313c0b98285fa43fd679dc4d6f9d3d1ab60eafd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d313c0b98285fa43fd679dc4d… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Mon Jun 7 03:04:53 2010 +0100 msvcrt/test: Add some simple _vsnwprintf_s tests. --- dlls/msvcrt/tests/printf.c | 61 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index eaf248b..b48db51 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -812,6 +812,9 @@ static void test_vsnwprintf(void) static int (__cdecl *p__vscprintf)(const char *format, __ms_va_list valist); static int (__cdecl *p__vscwprintf)(const wchar_t *format, __ms_va_list valist); +static int (__cdecl *p__vsnwprintf_s)(wchar_t *str, size_t sizeOfBuffer, + size_t count, const wchar_t *format, + __ms_va_list valist); static int __cdecl _vscprintf_wrapper(const char *format, ...) { @@ -852,6 +855,58 @@ static void test_vscwprintf(void) ok( ret == 8, "got %d expected 8\n", ret ); } +static int __cdecl _vsnwprintf_s_wrapper(wchar_t *str, size_t sizeOfBuffer, + size_t count, const wchar_t *format, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, format); + ret = p__vsnwprintf_s(str, sizeOfBuffer, count, format, valist); + __ms_va_end(valist); + return ret; +} + +static void test_vsnwprintf_s(void) +{ + const wchar_t format[] = { 'A','B','%','u','C',0 }; + const wchar_t out7[] = { 'A','B','1','2','3','C',0 }; + const wchar_t out6[] = { 'A','B','1','2','3',0 }; + const wchar_t out2[] = { 'A',0 }; + const wchar_t out1[] = { 0 }; + wchar_t buffer[14] = { 0 }; + int exp, got; + + /* Enough room. */ + exp = wcslen(out7); + + got = _vsnwprintf_s_wrapper(buffer, 14, _TRUNCATE, format, 123); + ok( exp == got, "length wrong, expect=%d, got=%d\n", exp, got); + ok( !wcscmp(out7, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer)); + + got = _vsnwprintf_s_wrapper(buffer, 12, _TRUNCATE, format, 123); + ok( exp == got, "length wrong, expect=%d, got=%d\n", exp, got); + ok( !wcscmp(out7, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer)); + + got = _vsnwprintf_s_wrapper(buffer, 7, _TRUNCATE, format, 123); + ok( exp == got, "length wrong, expect=%d, got=%d\n", exp, got); + ok( !wcscmp(out7, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer)); + + /* Not enough room. */ + exp = -1; + + got = _vsnwprintf_s_wrapper(buffer, 6, _TRUNCATE, format, 123); + ok( exp == got, "length wrong, expect=%d, got=%d\n", exp, got); + ok( !wcscmp(out6, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer)); + + got = _vsnwprintf_s_wrapper(buffer, 2, _TRUNCATE, format, 123); + ok( exp == got, "length wrong, expect=%d, got=%d\n", exp, got); + ok( !wcscmp(out2, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer)); + + got = _vsnwprintf_s_wrapper(buffer, 1, _TRUNCATE, format, 123); + ok( exp == got, "length wrong, expect=%d, got=%d\n", exp, got); + ok( !wcscmp(out1, buffer), "buffer wrong, got=%s\n", wine_dbgstr_w(buffer)); +} + START_TEST(printf) { test_sprintf(); @@ -863,6 +918,7 @@ START_TEST(printf) p__vscprintf = (void *)GetProcAddress(GetModuleHandle("msvcrt.dll"), "_vscprintf"); p__vscwprintf = (void *)GetProcAddress(GetModuleHandle("msvcrt.dll"), "_vscwprintf"); + p__vsnwprintf_s = (void *)GetProcAddress(GetModuleHandle("msvcrt.dll"), "_vsnwprintf_s"); if (p__vscprintf) test_vscprintf(); @@ -873,4 +929,9 @@ START_TEST(printf) test_vscwprintf(); else win_skip("_vscwprintf not available\n"); + + if (p__vsnwprintf_s) + test_vsnwprintf_s(); + else + win_skip("_vsnwprintf_s not available\n"); }

1 0

Alexander Scott-Johns : msvcrt: Fix spec file.
by Alexandre Julliard June 7, 2010

June 7, 2010

Module: wine Branch: master Commit: d3c00aab839e4042095f86f5079906bb9d611bb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c00aab839e4042095f86f50… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Sun Jun 6 15:51:45 2010 +0100 msvcrt: Fix spec file. --- dlls/msvcrt/msvcrt.spec | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 0cc51f5..604a5ce 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -986,9 +986,9 @@ @ cdecl _vsnprintf_s(ptr long long str ptr) MSVCRT_vsnprintf_s @ cdecl _vsnprintf_s_l(ptr long long str ptr ptr) MSVCRT_vsnprintf_s_l @ cdecl _vsnwprintf(ptr long wstr ptr) MSVCRT_vsnwprintf -@ cdecl _vsnwprintf_l(ptr long wstr ptr ptr) MSVCRT_vsnprintf_l -@ cdecl _vsnwprintf_s(ptr long long wstr ptr) MSVCRT_vsnprintf_s -@ cdecl _vsnwprintf_s_l(ptr long long wstr ptr ptr) MSVCRT_vsnprintf_s_l +@ cdecl _vsnwprintf_l(ptr long wstr ptr ptr) MSVCRT_vsnwprintf_l +@ cdecl _vsnwprintf_s(ptr long long wstr ptr) MSVCRT_vsnwprintf_s +@ cdecl _vsnwprintf_s_l(ptr long long wstr ptr ptr) MSVCRT_vsnwprintf_s_l # stub _vsprintf_l # stub _vsprintf_p # stub _vsprintf_p_l

1 0

Alexander Scott-Johns : msvcrt: The sizeOfBuffer argument of _vsnwprintf_s is measured in wide characters, not bytes.
by Alexandre Julliard June 7, 2010

June 7, 2010

Module: wine Branch: master Commit: d56113cd4fba1822984dc5204cb22875ba2eb2e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d56113cd4fba1822984dc5204… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Mon Jun 7 02:54:14 2010 +0100 msvcrt: The sizeOfBuffer argument of _vsnwprintf_s is measured in wide characters, not bytes. --- dlls/msvcrt/wcs.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 90bc3b8..78e42b2 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1147,17 +1147,17 @@ int CDECL MSVCRT_vsnwprintf_s_l( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer { int len, ret; - len = sizeOfBuffer/sizeof(MSVCRT_wchar_t); + len = sizeOfBuffer; if(count!=-1 && len>count+1) len = count+1; ret = vsnwprintf_internal(str, len, format, locale, TRUE, valist); if(ret<0 || ret==len) { - if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer/sizeof(MSVCRT_wchar_t)) { + if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer) { MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 ); *MSVCRT__errno() = MSVCRT_ERANGE; - memset(str, 0, sizeOfBuffer); + memset(str, 0, sizeOfBuffer*sizeof(MSVCRT_wchar_t)); } else str[len-1] = '\0'; @@ -1242,8 +1242,7 @@ int CDECL MSVCRT_swprintf_s(MSVCRT_wchar_t *str, MSVCRT_size_t numberOfElements, int r; __ms_va_start(ap, format); - r = MSVCRT_vsnwprintf_s(str, numberOfElements*sizeof(MSVCRT_wchar_t), - INT_MAX, format, ap); + r = MSVCRT_vsnwprintf_s(str, numberOfElements, INT_MAX, format, ap); __ms_va_end(ap); return r; @@ -1271,8 +1270,7 @@ int CDECL _vscwprintf( const MSVCRT_wchar_t *format, __ms_va_list args ) int CDECL MSVCRT_vswprintf_s(MSVCRT_wchar_t* str, MSVCRT_size_t numberOfElements, const MSVCRT_wchar_t* format, __ms_va_list args) { - return MSVCRT_vsnwprintf_s(str, numberOfElements*sizeof(MSVCRT_wchar_t), - INT_MAX, format, args); + return MSVCRT_vsnwprintf_s(str, numberOfElements, INT_MAX, format, args ); } /********************************************************************* @@ -1281,8 +1279,8 @@ int CDECL MSVCRT_vswprintf_s(MSVCRT_wchar_t* str, MSVCRT_size_t numberOfElements int CDECL MSVCRT_vswprintf_s_l(MSVCRT_wchar_t* str, MSVCRT_size_t numberOfElements, const MSVCRT_wchar_t* format, MSVCRT__locale_t locale, __ms_va_list args) { - return MSVCRT_vsnwprintf_s_l(str, numberOfElements*sizeof(MSVCRT_wchar_t), - INT_MAX, format, locale, args ); + return MSVCRT_vsnwprintf_s_l(str, numberOfElements, INT_MAX, + format, locale, args ); } /*********************************************************************

1 0

Nikolay Sivov : comctl32/rebar: Fix index check condition for RB_SHOWBAND.
by Alexandre Julliard June 7, 2010

June 7, 2010

Module: wine Branch: master Commit: 60e467a6cd1f1f0936e0979d925495d6bde23981 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60e467a6cd1f1f0936e0979d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 7 01:15:43 2010 +0400 comctl32/rebar: Fix index check condition for RB_SHOWBAND. --- dlls/comctl32/rebar.c | 2 +- dlls/comctl32/tests/rebar.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index cd3abad..7a2995c 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2779,7 +2779,7 @@ REBAR_ShowBand (REBAR_INFO *infoPtr, INT iBand, BOOL show) { REBAR_BAND *lpBand; - if (iBand < 0 || iBand > infoPtr->uNumBands) + if (iBand < 0 || iBand >= infoPtr->uNumBands) return FALSE; lpBand = REBAR_GetBand(infoPtr, iBand); diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index a75a064..d5f27b9 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -925,6 +925,36 @@ static HWND create_parent_window(void) return hwnd; } +static void test_showband(void) +{ + HWND hRebar; + REBARBANDINFOA rbi; + BOOL ret; + + hRebar = create_rebar_control(); + + /* no bands */ + ret = SendMessageA(hRebar, RB_SHOWBAND, 0, TRUE); + ok(ret == FALSE, "got %d\n", ret); + + rbi.cbSize = REBARBANDINFOA_V6_SIZE; + rbi.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_CHILD; + rbi.cx = 200; + rbi.cxMinChild = 100; + rbi.cyMinChild = 30; + rbi.hwndChild = NULL; + SendMessageA(hRebar, RB_INSERTBAND, -1, (LPARAM)&rbi); + + /* index out of range */ + ret = SendMessageA(hRebar, RB_SHOWBAND, 1, TRUE); + ok(ret == FALSE, "got %d\n", ret); + + ret = SendMessageA(hRebar, RB_SHOWBAND, 0, TRUE); + ok(ret == TRUE, "got %d\n", ret); + + DestroyWindow(hRebar); +} + START_TEST(rebar) { HMODULE hComctl32; @@ -948,6 +978,7 @@ START_TEST(rebar) test_bandinfo(); test_colors(); + test_showband(); if(!is_font_installed("System") || !is_font_installed("Tahoma")) {

1 0

Alexander Scott-Johns : msvcrt: Fix comments.
by Alexandre Julliard June 7, 2010

June 7, 2010

Module: wine Branch: master Commit: 19bff6bda561a14766cd95a6d632dccef4aaf781 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19bff6bda561a14766cd95a6d… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Sun Jun 6 15:19:14 2010 +0100 msvcrt: Fix comments. --- dlls/msvcrt/wcs.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index c26809c..b9ac8f7 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1103,7 +1103,7 @@ int CDECL MSVCRT__snprintf(char *str, unsigned int len, const char *format, ...) } /********************************************************************* - * vsnwsprintf_internal (INTERNAL) + * vsnwprintf_internal (INTERNAL) */ static inline int vsnwprintf_internal(MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, BOOL valid, @@ -1120,7 +1120,7 @@ static inline int vsnwprintf_internal(MSVCRT_wchar_t *str, MSVCRT_size_t len, } /********************************************************************* - * _vsnwsprintf (MSVCRT.@) + * _vsnwprintf (MSVCRT.@) */ int CDECL MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format, __ms_va_list valist) @@ -1129,7 +1129,7 @@ int CDECL MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, MSVCRT_size_t len, } /********************************************************************* - * _vsnwsprintf_l (MSVCRT.@) + * _vsnwprintf_l (MSVCRT.@) */ int CDECL MSVCRT_vsnwprintf_l(MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, @@ -1139,7 +1139,7 @@ int CDECL MSVCRT_vsnwprintf_l(MSVCRT_wchar_t *str, MSVCRT_size_t len, } /********************************************************************* - * _vsnwsprintf_s_l (MSVCRT.@) + * _vsnwprintf_s_l (MSVCRT.@) */ int CDECL MSVCRT_vsnwprintf_s_l( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer, MSVCRT_size_t count, const MSVCRT_wchar_t *format, @@ -1168,7 +1168,7 @@ int CDECL MSVCRT_vsnwprintf_s_l( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer } /********************************************************************* - * _vsnwsprintf_s (MSVCRT.@) + * _vsnwprintf_s (MSVCRT.@) */ int CDECL MSVCRT_vsnwprintf_s(MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer, MSVCRT_size_t count, const MSVCRT_wchar_t *format, __ms_va_list valist) @@ -1520,7 +1520,7 @@ INT CDECL MSVCRT_wcscat_s(MSVCRT_wchar_t* dst, MSVCRT_size_t elem, const MSVCRT_ } /********************************************************************* - * _wctoi64_l (MSVCRT.@) + * _wcstoi64_l (MSVCRT.@) * * FIXME: locale parameter is ignored */

1 0

Alexander Scott-Johns : msvcrt: Rename _TRUNCATE to MSVCRT__TRUNCATE.
by Alexandre Julliard June 7, 2010

June 7, 2010

Module: wine Branch: master Commit: 2663079c6036f07053f4627f4dbf1193b579e148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2663079c6036f07053f4627f4… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Sun Jun 6 16:11:09 2010 +0100 msvcrt: Rename _TRUNCATE to MSVCRT__TRUNCATE. --- dlls/msvcrt/heap.c | 4 ++-- dlls/msvcrt/mbcs.c | 4 ++-- dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/wcs.c | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index ad6bb37..b1d4076 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -578,7 +578,7 @@ int CDECL strncpy_s(char *dest, MSVCRT_size_t numberOfElements, return MSVCRT_EINVAL; } - if(count!=_TRUNCATE && count<numberOfElements) + if(count!=MSVCRT__TRUNCATE && count<numberOfElements) end = count; else end = numberOfElements-1; @@ -586,7 +586,7 @@ int CDECL strncpy_s(char *dest, MSVCRT_size_t numberOfElements, for(i=0; i<end && src[i]; i++) dest[i] = src[i]; - if(!src[i] || end==count || count==_TRUNCATE) { + if(!src[i] || end==count || count==MSVCRT__TRUNCATE) { dest[i] = '\0'; return 0; } diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 8fca06d..76d562c 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1783,7 +1783,7 @@ int CDECL MSVCRT__mbstowcs_s_l(MSVCRT_size_t *ret, MSVCRT_wchar_t *wcstr, return MSVCRT_EINVAL; } - if(count==_TRUNCATE || size<count) + if(count==MSVCRT__TRUNCATE || size<count) conv = size; else conv = count; @@ -1791,7 +1791,7 @@ int CDECL MSVCRT__mbstowcs_s_l(MSVCRT_size_t *ret, MSVCRT_wchar_t *wcstr, conv = MSVCRT__mbstowcs_l(wcstr, mbstr, conv, locale); if(conv<size) wcstr[conv++] = '\0'; - else if(conv==size && (count==_TRUNCATE || wcstr[conv-1]=='\0')) + else if(conv==size && (count==MSVCRT__TRUNCATE || wcstr[conv-1]=='\0')) wcstr[conv-1] = '\0'; else { MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 8dd8881..f68790b 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -709,7 +709,7 @@ typedef void (__cdecl *MSVCRT___sighandler_t)(int); #define _MB_CP_ANSI -3 #define _MB_CP_LOCALE -4 -#define _TRUNCATE ((MSVCRT_size_t)-1) +#define MSVCRT__TRUNCATE ((MSVCRT_size_t)-1) void __cdecl MSVCRT_free(void*); void* __cdecl MSVCRT_malloc(MSVCRT_size_t); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index b9ac8f7..90bc3b8 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -304,7 +304,7 @@ MSVCRT_size_t CDECL MSVCRT__wcstombs_s_l(MSVCRT_size_t *ret, char *mbstr, return MSVCRT_EINVAL; } - if(count==_TRUNCATE || size<count) + if(count==MSVCRT__TRUNCATE || size<count) conv = size; else conv = count; @@ -312,7 +312,7 @@ MSVCRT_size_t CDECL MSVCRT__wcstombs_s_l(MSVCRT_size_t *ret, char *mbstr, conv = MSVCRT__wcstombs_l(mbstr, wcstr, conv, locale); if(conv<size) mbstr[conv++] = '\0'; - else if(conv==size && (count==_TRUNCATE || mbstr[conv-1]=='\0')) + else if(conv==size && (count==MSVCRT__TRUNCATE || mbstr[conv-1]=='\0')) mbstr[conv-1] = '\0'; else { MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); @@ -1043,7 +1043,7 @@ int CDECL MSVCRT_vsnprintf_s_l( char *str, MSVCRT_size_t sizeOfBuffer, ret = vsnprintf_internal(str, len, format, locale, TRUE, valist); if(ret<0 || ret==len) { - if(count!=_TRUNCATE && count>sizeOfBuffer) { + if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer) { MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 ); *MSVCRT__errno() = MSVCRT_ERANGE; memset(str, 0, sizeOfBuffer); @@ -1154,7 +1154,7 @@ int CDECL MSVCRT_vsnwprintf_s_l( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer ret = vsnwprintf_internal(str, len, format, locale, TRUE, valist); if(ret<0 || ret==len) { - if(count!=_TRUNCATE && count>sizeOfBuffer/sizeof(MSVCRT_wchar_t)) { + if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer/sizeof(MSVCRT_wchar_t)) { MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 ); *MSVCRT__errno() = MSVCRT_ERANGE; memset(str, 0, sizeOfBuffer);

1 0

Jose Rostagno : shell32: Update Spanish translation.
by Alexandre Julliard June 7, 2010

June 7, 2010

Module: wine Branch: master Commit: 26e4154629f297c4469bc1824cdb24fda5c58db6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26e4154629f297c4469bc1824… Author: Jose Rostagno <joserostagno(a)hotmail.com> Date: Sun Jun 6 13:36:58 2010 -0300 shell32: Update Spanish translation. --- dlls/shell32/shell32_Es.rc | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shell32_Es.rc b/dlls/shell32/shell32_Es.rc index 06580d1..176c677 100644 --- a/dlls/shell32/shell32_Es.rc +++ b/dlls/shell32/shell32_Es.rc @@ -1,6 +1,7 @@ /* * Copyright 1998 Juergen Schmied * Copyright 2003,2004,2007,2008 Jos� Manuel Ferrer Ortiz + * Copyright 2010 Jos� Rostagno * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -95,13 +96,13 @@ END MENU_CPANEL MENU BEGIN - POPUP "&File" + POPUP "&Archivo" BEGIN MENUITEM SEPARATOR - MENUITEM "E&xit", IDM_CPANEL_EXIT + MENUITEM "S&alir", IDM_CPANEL_EXIT END - POPUP "&View" + POPUP "&Ver" BEGIN MENUITEM "Iconos &grandes", FCIDM_SHVIEW_BIGICON MENUITEM "Iconos &peque�os", FCIDM_SHVIEW_SMALLICON @@ -109,9 +110,9 @@ BEGIN MENUITEM "&Detalles", FCIDM_SHVIEW_REPORTVIEW END - POPUP "&Help" + POPUP "&Ayuda" BEGIN - MENUITEM "&About Control Panel...", IDM_CPANEL_ABOUT + MENUITEM "&Acerca de Panel de Control...", IDM_CPANEL_ABOUT END END @@ -206,12 +207,16 @@ STRINGTABLE IDS_SHV_COLUMN11 "Grupo" IDS_SHV_COLUMN_DELFROM "Lugar original" IDS_SHV_COLUMN_DELDATE "Fecha de borrado" + IDS_SHV_COL_DOCS "Documentos" + IDS_SHV_COL_STATUS "Estado" + IDS_SHV_COL_LOCATION "Ubicaci�n" + IDS_SHV_COL_MODEL "Modelo" /* special folders */ IDS_DESKTOP "Escritorio" IDS_MYCOMPUTER "Mi PC" IDS_RECYCLEBIN_FOLDER_NAME "Papelera de reciclaje" - IDS_CONTROLPANEL "Control Panel" + IDS_CONTROLPANEL "Panel de Control" /* context menus */ IDS_VIEW_LARGE "Iconos &grandes" @@ -245,6 +250,12 @@ STRINGTABLE IDS_SHUTDOWN_TITLE "Apagar" IDS_SHUTDOWN_PROMPT "�Desea terminar su sesi�n de Wine?" + /* Run File dialog */ + IDS_RUNDLG_ERROR "No se puede mostrar el cuadro de di�logo ejecutar archivo (error interno)" + IDS_RUNDLG_BROWSE_ERROR "No se puede mostrar el cuadro de di�logo Examinar (error interno)" + IDS_RUNDLG_BROWSE_CAPTION "Examinar" + IDS_RUNDLG_BROWSE_FILTER "Archivos ejecutables\0*.exe\0Todos los archivos\0*.*\0\0" + /* shell folder path default values */ IDS_PROGRAMS "Men� Inicio\\Programas" IDS_PERSONAL "Mis documentos"

1 0