December 2007 - Wine-commits

Hans Leidekker : gdi32: GetCharABCWidthsI does not require a scalable font.
by Alexandre Julliard 10 Dec '07

10 Dec '07

Module: wine Branch: master Commit: 0dc765809c602cf62a87e28451e4eea81eeca0cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dc765809c602cf62a87e2845… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Dec 8 22:55:01 2007 +0100 gdi32: GetCharABCWidthsI does not require a scalable font. --- dlls/gdi32/font.c | 12 +++++++++++ dlls/gdi32/freetype.c | 2 +- dlls/gdi32/tests/font.c | 51 +++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 60 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 9fba58e..645ac19 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2510,6 +2510,12 @@ BOOL WINAPI GetCharABCWidthsW( HDC hdc, UINT firstChar, UINT lastChar, if (!dc) return FALSE; + if (!abc) + { + DC_ReleaseDCPtr( dc ); + return FALSE; + } + if(dc->gdiFont) ret = WineEngGetCharABCWidths( dc->gdiFont, firstChar, lastChar, abc ); else @@ -2559,6 +2565,12 @@ BOOL WINAPI GetCharABCWidthsI( HDC hdc, UINT firstChar, UINT count, if (!dc) return FALSE; + if (!abc) + { + DC_ReleaseDCPtr( dc ); + return FALSE; + } + if(dc->gdiFont) ret = WineEngGetCharABCWidthsI( dc->gdiFont, firstChar, count, pgi, abc ); else diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e9fb663..b6a9344 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4512,7 +4512,7 @@ BOOL WineEngGetCharABCWidthsI(GdiFont *font, UINT firstChar, UINT count, LPWORD FT_UInt glyph_index; GdiFont *linked_font; - if(!FT_IS_SCALABLE(font->ft_face)) + if(!FT_HAS_HORIZONTAL(font->ft_face)) return FALSE; get_glyph_index_linked(font, 'a', &linked_font, &glyph_index); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 66d97b7..0893b87 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -33,6 +33,7 @@ #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) LONG (WINAPI *pGdiGetCharDimensions)(HDC hdc, LPTEXTMETRICW lptm, LONG *height); +BOOL (WINAPI *pGetCharABCWidthsI)(HDC hdc, UINT first, UINT count, LPWORD glyphs, LPABC abc); BOOL (WINAPI *pGetCharABCWidthsW)(HDC hdc, UINT first, UINT last, LPABC abc); DWORD (WINAPI *pGetFontUnicodeRanges)(HDC hdc, LPGLYPHSET lpgs); DWORD (WINAPI *pGetGlyphIndicesA)(HDC hdc, LPCSTR lpstr, INT count, LPWORD pgi, DWORD flags); @@ -45,6 +46,7 @@ static void init(void) hgdi32 = GetModuleHandleA("gdi32.dll"); pGdiGetCharDimensions = (void *)GetProcAddress(hgdi32, "GdiGetCharDimensions"); + pGetCharABCWidthsI = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsI"); pGetCharABCWidthsW = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsW"); pGetFontUnicodeRanges = (void *)GetProcAddress(hgdi32, "GetFontUnicodeRanges"); pGetGlyphIndicesA = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesA"); @@ -450,14 +452,55 @@ static void test_GdiGetCharDimensions(void) DeleteDC(hdc); } -static void test_GetCharABCWidthsW(void) +static void test_GetCharABCWidths(void) { + static const WCHAR str[] = {'a',0}; BOOL ret; + HDC hdc; + LOGFONTA lf; + HFONT hfont; ABC abc[1]; - if (!pGetCharABCWidthsW) return; + WORD glyphs[1]; + DWORD nb; + + if (!pGetCharABCWidthsW || !pGetCharABCWidthsI) + { + skip("GetCharABCWidthsW/I not available on this platform\n"); + return; + } + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "System"); + lf.lfHeight = 20; + + hfont = CreateFontIndirectA(&lf); + hdc = GetDC(0); + hfont = SelectObject(hdc, hfont); + + nb = pGetGlyphIndicesW(hdc, str, 1, glyphs, 0); + ok(nb == 1, "pGetGlyphIndicesW should have returned 1\n"); + + ret = pGetCharABCWidthsI(NULL, 0, 1, glyphs, abc); + ok(!ret, "GetCharABCWidthsI should have failed\n"); + + ret = pGetCharABCWidthsI(hdc, 0, 1, glyphs, NULL); + ok(!ret, "GetCharABCWidthsI should have failed\n"); + + ret = pGetCharABCWidthsI(hdc, 0, 1, glyphs, abc); + ok(ret, "GetCharABCWidthsI should have succeeded\n"); ret = pGetCharABCWidthsW(NULL, 'a', 'a', abc); - ok(!ret, "GetCharABCWidthsW should have returned FALSE\n"); + ok(!ret, "GetCharABCWidthsW should have failed\n"); + + ret = pGetCharABCWidthsW(hdc, 'a', 'a', NULL); + ok(!ret, "GetCharABCWidthsW should have failed\n"); + + ret = pGetCharABCWidthsW(hdc, 'a', 'a', abc); + ok(!ret, "GetCharABCWidthsW should have failed\n"); + + hfont = SelectObject(hdc, hfont); + DeleteObject(hfont); + ReleaseDC(NULL, hdc); } static void test_text_extents(void) @@ -1702,7 +1745,7 @@ START_TEST(font) test_bitmap_font(); test_bitmap_font_metrics(); test_GdiGetCharDimensions(); - test_GetCharABCWidthsW(); + test_GetCharABCWidths(); test_text_extents(); test_GetGlyphIndices(); test_GetKerningPairs();

1 0

Andrew Riedi : user32: Uncomment and explain a test in test_DestroyCursor() .
by Alexandre Julliard 10 Dec '07

10 Dec '07

Module: wine Branch: master Commit: 573fcad0b4beaeb8287f0b4156562ecd6baf2aef URL: http://source.winehq.org/git/wine.git/?a=commit;h=573fcad0b4beaeb8287f0b415… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Sun Dec 9 23:05:29 2007 -0800 user32: Uncomment and explain a test in test_DestroyCursor(). --- dlls/user32/tests/cursoricon.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 9858e32..6be44c9 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -411,9 +411,16 @@ static void test_DestroyCursor(void) SetCursor(NULL); - /* Trying to destroy the cursor properly fails now for some reason with ERROR_INVALID_CURSOR_HANDLE */ + /* Trying to destroy the cursor properly fails now with + * ERROR_INVALID_CURSOR_HANDLE. This happens because we called + * DestroyCursor() 2+ times after calling SetCursor(). The calls to + * GetCursor() and SetCursor(NULL) in between make no difference. */ ret = DestroyCursor(cursor); - /* ok(ret, "DestroyCursor failed, GetLastError=%d\n", GetLastError()); */ + todo_wine { + ok(!ret, "DestroyCursor succeeded.\n"); + error = GetLastError(); + ok(error == ERROR_INVALID_CURSOR_HANDLE, "Last error: 0x%08x\n", error); + } DeleteObject(cursorInfo.hbmMask); DeleteObject(cursorInfo.hbmColor);

1 0

Andrew Riedi : user32: Improve test_DestroyCursor().
by Alexandre Julliard 10 Dec '07

10 Dec '07

Module: wine Branch: master Commit: d296c185876348fc997e708018fafe41a32fb71b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d296c185876348fc997e70801… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Sun Dec 9 23:06:43 2007 -0800 user32: Improve test_DestroyCursor(). --- dlls/user32/tests/cursoricon.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 6be44c9..d7d5fa6 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -3,6 +3,7 @@ * * Copyright 2006 Michael Kaufmann * Copyright 2007 Dmitry Timoshkov + * Copyright 2007 Andrew Riedi * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -424,6 +425,31 @@ static void test_DestroyCursor(void) DeleteObject(cursorInfo.hbmMask); DeleteObject(cursorInfo.hbmColor); + + /* Try testing DestroyCursor() now using LoadCursor() cursors. */ + cursor = LoadCursor(NULL, IDC_ARROW); + + SetLastError(0xdeadbeef); + ret = DestroyCursor(cursor); + ok(ret, "DestroyCursor on the active cursor failed.\n"); + error = GetLastError(); + ok(error == 0xdeadbeef, "Last error: 0x%08x\n", error); + + /* Try setting the cursor to a destroyed OEM cursor. */ + SetLastError(0xdeadbeef); + SetCursor(cursor); + error = GetLastError(); + todo_wine { + ok(error == 0xdeadbeef, "Last error: 0x%08x\n", error); + } + + /* Check if LoadCursor() returns the same handle with the same icon. */ + cursor2 = LoadCursor(NULL, IDC_ARROW); + ok(cursor2 == cursor, "cursor == %p, cursor2 == %p\n", cursor, cursor2); + + /* Check if LoadCursor() returns the same handle with a different icon. */ + cursor2 = LoadCursor(NULL, IDC_WAIT); + ok(cursor2 != cursor, "cursor == %p, cursor2 == %p\n", cursor, cursor2); } START_TEST(cursoricon)

1 0

Hans Leidekker : kernel32: GetConsoleInputExeNameW returns TRUE even when it fails.
by Alexandre Julliard 10 Dec '07

10 Dec '07

Module: wine Branch: master Commit: c6dd1f1599974c4c2cacb17c4cd5ff589cfb343b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6dd1f1599974c4c2cacb17c4… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Dec 8 22:54:27 2007 +0100 kernel32: GetConsoleInputExeNameW returns TRUE even when it fails. --- dlls/kernel32/console.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 1f24614..65312d2 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1013,14 +1013,15 @@ BOOL WINAPI GetConsoleInputExeNameW(DWORD buflen, LPWSTR buffer) */ BOOL WINAPI GetConsoleInputExeNameA(DWORD buflen, LPSTR buffer) { - WCHAR *bufferW; - BOOL ret; + TRACE("%u %p\n", buflen, buffer); - if (!(bufferW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * buflen))) return FALSE; - if ((ret = GetConsoleInputExeNameW(buflen, bufferW))) - WideCharToMultiByte(CP_ACP, 0, bufferW, -1, buffer, buflen, NULL, NULL); - HeapFree(GetProcessHeap(), 0, bufferW); - return ret; + RtlEnterCriticalSection(&CONSOLE_CritSect); + if (WideCharToMultiByte(CP_ACP, 0, input_exe, -1, NULL, 0, NULL, NULL) <= buflen) + WideCharToMultiByte(CP_ACP, 0, input_exe, -1, buffer, buflen, NULL, NULL); + else SetLastError(ERROR_BUFFER_OVERFLOW); + RtlLeaveCriticalSection(&CONSOLE_CritSect); + + return TRUE; } /***********************************************************************

1 0

Hans Leidekker : wininet: Make FtpGetCurrentDirectoryA pass all todo_wine tests.
by Alexandre Julliard 10 Dec '07

10 Dec '07

Module: wine Branch: master Commit: b529b3bb3264aa270bb1f6b176b8d12f2f572ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b529b3bb3264aa270bb1f6b17… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Dec 8 22:54:43 2007 +0100 wininet: Make FtpGetCurrentDirectoryA pass all todo_wine tests. --- dlls/wininet/ftp.c | 32 +++++++++++++++++--------------- dlls/wininet/tests/ftp.c | 11 +++-------- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index ce60fa0..ed3fbea 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -844,13 +844,12 @@ BOOL WINAPI FtpGetCurrentDirectoryA(HINTERNET hFtpSession, LPSTR lpszCurrentDire } } ret = FtpGetCurrentDirectoryW(hFtpSession, lpszCurrentDirectory?dir:NULL, lpdwCurrentDirectory?&len:NULL); - if(lpdwCurrentDirectory) { - *lpdwCurrentDirectory = len; - if(lpszCurrentDirectory) { - WideCharToMultiByte(CP_ACP, 0, dir, len, lpszCurrentDirectory, *lpdwCurrentDirectory, NULL, NULL); - HeapFree(GetProcessHeap(), 0, dir); - } - } + + if (ret && lpszCurrentDirectory) + WideCharToMultiByte(CP_ACP, 0, dir, -1, lpszCurrentDirectory, len, NULL, NULL); + + if (lpdwCurrentDirectory) *lpdwCurrentDirectory = len; + HeapFree(GetProcessHeap(), 0, dir); return ret; } @@ -965,8 +964,6 @@ BOOL WINAPI FTP_FtpGetCurrentDirectoryW(LPWININETFTPSESSIONW lpwfs, LPWSTR lpszC /* Clear any error information */ INTERNET_SetLastError(0); - ZeroMemory(lpszCurrentDirectory, *lpdwCurrentDirectory); - hIC = lpwfs->lpAppInfo; if (!FTP_SendCommand(lpwfs->sndSocket, FTP_CMD_PWD, NULL, lpwfs->hdr.lpfnStatusCB, &lpwfs->hdr, lpwfs->hdr.dwContext)) @@ -978,7 +975,7 @@ BOOL WINAPI FTP_FtpGetCurrentDirectoryW(LPWININETFTPSESSIONW lpwfs, LPWSTR lpszC if (nResCode == 257) /* Extract directory name */ { DWORD firstpos, lastpos, len; - LPWSTR lpszResponseBuffer = WININET_strdup_AtoW(INTERNET_GetResponseBuffer()); + LPWSTR lpszResponseBuffer = WININET_strdup_AtoW(INTERNET_GetResponseBuffer()); for (firstpos = 0, lastpos = 0; lpszResponseBuffer[lastpos]; lastpos++) { @@ -988,14 +985,19 @@ BOOL WINAPI FTP_FtpGetCurrentDirectoryW(LPWININETFTPSESSIONW lpwfs, LPWSTR lpszC firstpos = lastpos; else break; - } + } } + len = lastpos - firstpos; + if (*lpdwCurrentDirectory >= len) + { + memcpy(lpszCurrentDirectory, &lpszResponseBuffer[firstpos + 1], len * sizeof(WCHAR)); + lpszCurrentDirectory[len - 1] = 0; + *lpdwCurrentDirectory = len; + bSuccess = TRUE; + } + else INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); - len = lastpos - firstpos - 1; - lstrcpynW(lpszCurrentDirectory, &lpszResponseBuffer[firstpos+1], *lpdwCurrentDirectory); HeapFree(GetProcessHeap(), 0, lpszResponseBuffer); - *lpdwCurrentDirectory = len; - bSuccess = TRUE; } else FTP_SetResponseError(nResCode); diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 06bcc0b..985b23b 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -746,21 +746,17 @@ static void test_get_current_dir(HINTERNET hFtp, HINTERNET hConnect) SetLastError(0xdeadbeef); bRet = FtpGetCurrentDirectoryA( hFtp, lpszCurrentDirectory, &dwCurrentDirectoryLen ); ok ( bRet == TRUE, "Expected FtpGetCurrentDirectoryA to pass\n" ); -todo_wine - ok ( lstrcmp(lpszCurrentDirectory, "/pub") == 0, "Expected returned value \"%s\" to match \"%s\"\n", (char*)lpszCurrentDirectory, "/pub"); + ok ( !strcmp(lpszCurrentDirectory, "/pub"), "Expected returned value \"%s\" to match \"/pub\"\n", lpszCurrentDirectory); ok ( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got: %d\n", GetLastError()); - /* test for the current directory with a size only large enough to * fit the string and not the null terminating character */ SetLastError(0xdeadbeef); dwCurrentDirectoryLen = 4; lpszCurrentDirectory[4] = 'a'; /* set position 4 of the array to something else to make sure a leftover \0 isn't fooling the test */ bRet = FtpGetCurrentDirectoryA( hFtp, lpszCurrentDirectory, &dwCurrentDirectoryLen ); -todo_wine ok ( bRet == FALSE, "Expected FtpGetCurrentDirectoryA to fail\n"); - ok ( lstrcmp(lpszCurrentDirectory, "/pub") != 0, "Expected returned value \"%s\" to not match \"%s\"\n", (char*)lpszCurrentDirectory, "/pub"); -todo_wine + ok ( strcmp(lpszCurrentDirectory, "/pub"), "Expected returned value \"%s\" to not match \"/pub\"\n", lpszCurrentDirectory); ok ( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got: %d\n", GetLastError()); /* test for the current directory with a size large enough to store @@ -769,8 +765,7 @@ todo_wine dwCurrentDirectoryLen = 5; bRet = FtpGetCurrentDirectoryA( hFtp, lpszCurrentDirectory, &dwCurrentDirectoryLen ); ok ( bRet == TRUE, "Expected FtpGetCurrentDirectoryA to pass\n"); -todo_wine - ok ( lstrcmp(lpszCurrentDirectory, "/pub") == 0, "Expected returned value \"%s\" to match \"%s\"\n", (char*)lpszCurrentDirectory, "/pub"); + ok ( !strcmp(lpszCurrentDirectory, "/pub"), "Expected returned value \"%s\" to match \"/pub\"\n", lpszCurrentDirectory); ok ( GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got: %d\n", GetLastError()); }

1 0

Luis C. Busquets Pérez : msvfw32: Add Spanish resource.
by Alexandre Julliard 10 Dec '07

10 Dec '07

Module: wine Branch: master Commit: e50543dbe141c1d3f71b1d91b83e30f5e5010054 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e50543dbe141c1d3f71b1d91b… Author: Luis C. Busquets Pérez <luis.busquets(a)ilidium.com> Date: Fri Dec 7 19:07:25 2007 +0100 msvfw32: Add Spanish resource. --- dlls/msvfw32/msvfw32_Es.rc | 51 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvfw32/rsrc.rc | 1 + 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/msvfw32/msvfw32_Es.rc b/dlls/msvfw32/msvfw32_Es.rc new file mode 100644 index 0000000..0f3803b --- /dev/null +++ b/dlls/msvfw32/msvfw32_Es.rc @@ -0,0 +1,51 @@ +/* + * Copyright 2007 Luis Carlos Busquets Pérez + * + * 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 + */ + +LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Compresión de vídeo" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "Aceptar",IDOK,129,2,49,14 + PUSHBUTTON "Cancelar",IDCANCEL,129,18,49,14 + + LTEXT "&Compresor:",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "C&onfigurar...",882,129,36,49,14 + PUSHBUTTON "&Acerca de...",883,129,52,49,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "C&alidad de compresión:",886,9,34,80,8 + + CONTROL "C&uadro clave cada",887,"Botón",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "cuadros",889,103,62,26,10 + + CONTROL "&Velocidad de datos",894,"Botón",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "KB/s",896,102,78,26,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "Cuadros completos (no comprimidos)" +} diff --git a/dlls/msvfw32/rsrc.rc b/dlls/msvfw32/rsrc.rc index 089c0b2..802ffb3 100644 --- a/dlls/msvfw32/rsrc.rc +++ b/dlls/msvfw32/rsrc.rc @@ -22,6 +22,7 @@ #include "msvfw32_De.rc" #include "msvfw32_En.rc" +#include "msvfw32_Es.rc" #include "msvfw32_Fr.rc" #include "msvfw32_Hu.rc" #include "msvfw32_Ko.rc"

1 0

Luis C. Busquets Pérez : sane: Add Spanish Resource.
by Alexandre Julliard 10 Dec '07

10 Dec '07

Module: wine Branch: master Commit: 192d9e9811f4a96926a0a8d7fb682382b058c0a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=192d9e9811f4a96926a0a8d7f… Author: Luis C. Busquets Pérez <luis.busquets(a)ilidium.com> Date: Fri Dec 7 19:11:59 2007 +0100 sane: Add Spanish Resource. --- dlls/sane.ds/rsrc.rc | 1 + dlls/sane.ds/sane_Es.rc | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/rsrc.rc b/dlls/sane.ds/rsrc.rc index c022575..ec0d7ac 100644 --- a/dlls/sane.ds/rsrc.rc +++ b/dlls/sane.ds/rsrc.rc @@ -27,6 +27,7 @@ #include "sane_De.rc" #include "sane_En.rc" +#include "sane_Es.rc" #include "sane_Fi.rc" #include "sane_Fr.rc" #include "sane_Ko.rc" diff --git a/dlls/sane.ds/sane_Es.rc b/dlls/sane.ds/sane_Es.rc new file mode 100644 index 0000000..e6e0ab3 --- /dev/null +++ b/dlls/sane.ds/sane_Es.rc @@ -0,0 +1,40 @@ +/* + * Spanish resources for Twain + * + * Copyright 2007 Luis Carlos Busquets Pérez + * + * 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 + */ + +LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "Escaneando" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Escaneando... Por favor espere",IDC_STATIC,5,19,176,8, SS_CENTER +END + +STRINGTABLE DISCARDABLE +{ + 0 "" + 1 "px" + 2 "b" + 3 "mm" + 4 "dpi" + 5 "%" + 6 "ns" +}

1 0

Luis C. Busquets Pérez : shell32: Update Spanish resource.
by Alexandre Julliard 10 Dec '07

10 Dec '07

Module: wine Branch: master Commit: e46751f531c201e96c0f20d56d7cfa640af4030c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e46751f531c201e96c0f20d56… Author: Luis C. Busquets Pérez <luis.busquets(a)ilidium.com> Date: Sat Dec 8 07:45:07 2007 +0100 shell32: Update Spanish resource. --- dlls/shell32/shell32_Es.rc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shell32_Es.rc b/dlls/shell32/shell32_Es.rc index 6d13a30..1feb8d2 100644 --- a/dlls/shell32/shell32_Es.rc +++ b/dlls/shell32/shell32_Es.rc @@ -108,7 +108,7 @@ FONT 8, "MS Shell Dlg" SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Message" +CAPTION "Mensaje" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "&S�", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP @@ -205,16 +205,16 @@ STRINGTABLE DISCARDABLE IDS_PERSONAL "Mis documentos" IDS_FAVORITES "Favoritos" IDS_STARTUP "Men� Inicio\\Programas\\Inicio" - IDS_RECENT "Recent" - IDS_SENDTO "SendTo" + IDS_RECENT "Recientes" + IDS_SENDTO "Enviar a" IDS_STARTMENU "Men� Inicio" IDS_MYMUSIC "Mi m�sica" IDS_MYVIDEO "Mis v�deos" IDS_DESKTOPDIRECTORY "Escritorio" IDS_NETHOOD "Entorno de red" - IDS_TEMPLATES "Templates" + IDS_TEMPLATES "Plantillas" IDS_APPDATA "Application Data" - IDS_PRINTHOOD "PrintHood" + IDS_PRINTHOOD "Vencindario de impresi�n" IDS_LOCAL_APPDATA "Configuraci�n local\\Datos de programa" IDS_INTERNET_CACHE "Configuraci�n local\\Archivos temporales de Internet" IDS_COOKIES "Cookies" @@ -229,5 +229,5 @@ STRINGTABLE DISCARDABLE IDS_COMMON_VIDEO "Documentos\\Mis v�deos" IDS_CDBURN_AREA "Configuraci�n local\\Datos de programa\\Microsoft\\CD Burning" - IDS_NEWFOLDER "New Folder" + IDS_NEWFOLDER "Nueva carpeta" }

1 0

Luis C. Busquets Pérez : gphoto2: Add Spanish resource.
by Alexandre Julliard 10 Dec '07

10 Dec '07

Module: wine Branch: master Commit: 4d30038c73666e551d13655a65c002c827fb8e26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d30038c73666e551d13655a6… Author: Luis C. Busquets Pérez <luis.busquets(a)ilidium.com> Date: Fri Dec 7 18:59:26 2007 +0100 gphoto2: Add Spanish resource. --- dlls/gphoto2.ds/gphoto2_Es.rc | 55 +++++++++++++++++++++++++++++++++++++++++ dlls/gphoto2.ds/rsrc.rc | 1 + 2 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_Es.rc b/dlls/gphoto2.ds/gphoto2_Es.rc new file mode 100644 index 0000000..2a29e9a --- /dev/null +++ b/dlls/gphoto2.ds/gphoto2_Es.rc @@ -0,0 +1,55 @@ +/* + * Spanish resources for Twain + * + * Copyright 2007 Luis Carlos Busquets Pérez + * + * 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 + */ + +LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT + +IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 +STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU +CAPTION "Ficheros de la cámara" +MENU 20545 +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | +WS_TABSTOP,7,7,358,229 + DEFPUSHBUTTON "Importar la selección",IDC_IMPORT,152,252,72,14 + PUSHBUTTON "Previsualización",IDC_FETCH,7,252,64,14 + PUSHBUTTON "Importar todo",IDC_IMPORTALL,80,252,64,14 + CONTROL "Saltarse este diálogo",IDC_SKIP,"Botón", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14 + PUSHBUTTON "Salir",IDC_EXIT,315,252,50,14 +END + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "Transfiriendo" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Transfiriendo.... Por favor espere",IDC_STATIC,5,19,176,8, SS_CENTER +END + +IDD_CONNECTING DIALOG DISCARDABLE 0, 0, 280, 116 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER +CAPTION "Conectando a la cámara" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 + LTEXT "Conectando a la cámara... Por favor espere",IDC_STATIC,128,58, + 116,8 +END diff --git a/dlls/gphoto2.ds/rsrc.rc b/dlls/gphoto2.ds/rsrc.rc index 10cc63f..4b44d73 100644 --- a/dlls/gphoto2.ds/rsrc.rc +++ b/dlls/gphoto2.ds/rsrc.rc @@ -28,6 +28,7 @@ #include "gphoto2_De.rc" #include "gphoto2_En.rc" +#include "gphoto2_Es.rc" #include "gphoto2_Fr.rc" #include "gphoto2_Ko.rc" #include "gphoto2_Nl.rc"

1 0

Aric Stewart : gdi32: Font tests with Japanese font data. Thanks to Dmitry Timoshkov for the data and tests.
by Alexandre Julliard 10 Dec '07

10 Dec '07

Module: wine Branch: master Commit: 0433883ec129072ccce4e77eef032e3c2e8ea7c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0433883ec129072ccce4e77ee… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Dec 10 16:32:19 2007 +0900 gdi32: Font tests with Japanese font data. Thanks to Dmitry Timoshkov for the data and tests. --- dlls/gdi32/tests/font.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 41ead71..66d97b7 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -324,19 +324,32 @@ static void test_bitmap_font_metrics(void) { "Courier", FW_NORMAL, 20, 16, 4, 0, 0, 12, 12, CP1252_BIT | CP1250_BIT | CP1251_BIT }, { "System", FW_BOLD, 16, 13, 3, 3, 0, 7, 14, CP1252_BIT }, { "System", FW_BOLD, 16, 13, 3, 3, 0, 7, 15, CP1250_BIT | CP1251_BIT }, - { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 1, 2, CP1252_BIT}, +/* + * TODO: the system for CP932 should be NORMAL, not BOLD. However that would + * require a new system.sfd for that font + */ + { "System", FW_BOLD, 18, 16, 2, 0, 2, 8, 16, CP932_BIT }, + { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 1, 2, CP1252_BIT }, { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 1, 8, CP1250_BIT | CP1251_BIT }, + { "Small Fonts", FW_NORMAL, 3, 2, 1, 0, 0, 2, 4, CP932_BIT }, { "Small Fonts", FW_NORMAL, 5, 4, 1, 1, 0, 3, 4, CP1252_BIT }, { "Small Fonts", FW_NORMAL, 5, 4, 1, 1, 0, 2, 8, CP1250_BIT | CP1251_BIT }, + { "Small Fonts", FW_NORMAL, 5, 4, 1, 0, 0, 3, 6, CP932_BIT }, { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 13, CP1252_BIT }, { "Small Fonts", FW_NORMAL, 6, 5, 1, 1, 0, 3, 8, CP1250_BIT | CP1251_BIT }, + { "Small Fonts", FW_NORMAL, 6, 5, 1, 0, 0, 4, 8, CP932_BIT }, { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 7, CP1252_BIT }, { "Small Fonts", FW_NORMAL, 8, 7, 1, 1, 0, 4, 8, CP1250_BIT | CP1251_BIT }, + { "Small Fonts", FW_NORMAL, 8, 7, 1, 0, 0, 5, 10, CP932_BIT }, { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 4, 8, CP1252_BIT | CP1250_BIT }, { "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 5, 8, CP1251_BIT }, + { "Small Fonts", FW_NORMAL, 10, 8, 2, 0, 0, 6, 12, CP932_BIT }, { "Small Fonts", FW_NORMAL, 11, 9, 2, 2, 0, 5, 9, CP1252_BIT | CP1250_BIT | CP1251_BIT }, +/* No proper small font for Japanese yet */ +/* { "Small Fonts", FW_NORMAL, 11, 9, 2, 0, 0, 7, 14, CP932_BIT }, */ { "Fixedsys", FW_NORMAL, 15, 12, 3, 3, 0, 8, 8, CP1252_BIT | CP1250_BIT }, - { "Fixedsys", FW_NORMAL, 16, 12, 4, 3, 0, 8, 8, CP1251_BIT } + { "Fixedsys", FW_NORMAL, 16, 12, 4, 3, 0, 8, 8, CP1251_BIT }, + { "FixedSys", FW_NORMAL, 18, 16, 2, 0, 0, 8, 16, CP932_BIT } /* FIXME: add "Terminal" */ };

1 0