February 2006 - Wine-Commits

Michael Jung : shell32: Query for localized string in HCR_GetClassName.
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: bbeeb4b5adda184e9776a6405700e1e780d185a4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bbeeb4b5adda184e9776a64… Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Tue Feb 14 10:41:29 2006 +0100 shell32: Query for localized string in HCR_GetClassName. --- dlls/shell32/classes.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c index 3029625..440809c 100644 --- a/dlls/shell32/classes.c +++ b/dlls/shell32/classes.c @@ -287,8 +287,11 @@ BOOL HCR_GetClassNameW(REFIID riid, LPWS szDest[0] = 0; if (HCR_RegOpenClassIDKey(riid, &hkey)) { - if (!RegQueryValueExW(hkey, swEmpty, 0, NULL, (LPBYTE)szDest, &len)) - { + static const WCHAR wszLocalizedString[] = + { 'L','o','c','a','l','i','z','e','d','S','t','r','i','n','g', 0 }; + if (!RegLoadMUIStringW(hkey, wszLocalizedString, szDest, len, NULL, 0, NULL) || + !RegQueryValueExW(hkey, swEmpty, 0, NULL, (LPBYTE)szDest, &len)) + { ret = TRUE; } RegCloseKey(hkey); @@ -319,8 +322,9 @@ BOOL HCR_GetClassNameA(REFIID riid, LPST szDest[0] = 0; if (HCR_RegOpenClassIDKey(riid, &hkey)) { - if (!RegQueryValueExA(hkey,"",0,NULL,(LPBYTE)szDest,&len)) - { + if (!RegLoadMUIStringA(hkey,"LocalizedString",szDest,len,NULL,0,NULL) || + !RegQueryValueExA(hkey,"",0,NULL,(LPBYTE)szDest,&len)) + { ret = TRUE; } RegCloseKey(hkey);

1 0

Michael Jung : advapi32: Implemented RegLoadMUIString[AW].
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: ac615ce5a05299523899da5b7fd790c724691d2a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac615ce5a05299523899da5… Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Tue Feb 14 10:41:18 2006 +0100 advapi32: Implemented RegLoadMUIString[AW]. --- dlls/advapi32/advapi32.spec | 2 dlls/advapi32/registry.c | 187 +++++++++++++++++++++++++++++++++++++++++++ include/winreg.h | 3 + 3 files changed, 192 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 61eb2c9..8fb6592 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -486,6 +486,8 @@ @ stdcall RegGetValueW(long wstr wstr long ptr ptr ptr) @ stdcall RegLoadKeyA(long str str) @ stdcall RegLoadKeyW(long wstr wstr) +@ stdcall RegLoadMUIStringA(long str str long ptr long str) +@ stdcall RegLoadMUIStringW(long wstr wstr long ptr long wstr) @ stdcall RegNotifyChangeKeyValue(long long long long long) @ stdcall RegOpenCurrentUser(long ptr) @ stdcall RegOpenKeyA(long str ptr) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index df56997..a51e8e9 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -37,6 +37,7 @@ #include "winreg.h" #include "winerror.h" #include "winternl.h" +#include "winuser.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -2378,3 +2379,189 @@ LONG WINAPI RegOpenUserClassesRoot( *phkResult = HKEY_CLASSES_ROOT; return ERROR_SUCCESS; } + +/****************************************************************************** + * load_string [Internal] + * + * This is basically a copy of user32/resource.c's LoadStringW. Necessary to + * avoid importing user32, which is higher level than advapi32. Helper for + * RegLoadMUIString. + */ +static int load_string(HINSTANCE hModule, UINT resId, LPWSTR pwszBuffer, INT cMaxChars) +{ + HGLOBAL hMemory; + HRSRC hResource; + WCHAR *pString; + int idxString; + + /* Negative values have to be inverted. */ + if (HIWORD(resId) == 0xffff) + resId = (UINT)(-((INT)resId)); + + /* Load the resource into memory and get a pointer to it. */ + hResource = FindResourceW(hModule, MAKEINTRESOURCEW(LOWORD(resId >> 4) + 1), (LPWSTR)RT_STRING); + if (!hResource) return 0; + hMemory = LoadResource(hModule, hResource); + if (!hMemory) return 0; + pString = LockResource(hMemory); + + /* Strings are length-prefixed. Lowest nibble of resId is an index. */ + idxString = resId & 0xf; + while (idxString--) pString += *pString + 1; + + /* If no buffer is given, return length of the string. */ + if (!pwszBuffer) return *pString; + + /* Else copy over the string, respecting the buffer size. */ + cMaxChars = (*pString < cMaxChars) ? *pString : (cMaxChars - 1); + if (cMaxChars >= 0) { + memcpy(pwszBuffer, pString+1, cMaxChars * sizeof(WCHAR)); + pwszBuffer[cMaxChars] = '\0'; + } + + return cMaxChars; +} + +/****************************************************************************** + * RegLoadMUIStringW [ADVAPI32.@] + * + * Load the localized version of a string resource from some PE, respective + * id and path of which are given in the registry value in the format + * @[path]\dllname,-resourceId + * + * PARAMS + * hKey [I] Key, of which to load the string value from. + * pszValue [I] The value to be loaded (Has to be of REG_EXPAND_SZ or REG_SZ type). + * pszBuffer [O] Buffer to store the localized string in. + * cbBuffer [I] Size of the destination buffer in bytes. + * pcbData [O] Number of bytes written to pszBuffer (optional, may be NULL). + * dwFlags [I] None supported yet. + * pszBaseDir [I] Not supported yet. + * + * RETURNS + * Success: ERROR_SUCCESS, + * Failure: nonzero error code from winerror.h + * + * NOTES + * This is an API of Windows Vista, which wasn't available at the time this code + * was written. We have to check for the correct behaviour once it's available. + */ +LONG WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer, DWORD cbBuffer, + LPDWORD pcbData, DWORD dwFlags, LPCWSTR pwszBaseDir) +{ + DWORD dwValueType, cbData; + LPWSTR pwszTempBuffer = NULL, pwszExpandedBuffer = NULL; + LONG result; + + TRACE("(hKey = %p, pwszValue = %s, pwszBuffer = %p, cbBuffer = %ld, pcbData = %p, " + "dwFlags = %ld, pwszBaseDir = %s) stub\n", hKey, debugstr_w(pwszValue), pwszBuffer, + cbBuffer, pcbData, dwFlags, debugstr_w(pwszBaseDir)); + + /* Parameter sanity checks. */ + if (!hKey || !pwszBuffer) + return ERROR_INVALID_PARAMETER; + + if (pwszBaseDir && *pwszBaseDir) { + FIXME("BaseDir parameter not yet supported!\n"); + return ERROR_INVALID_PARAMETER; + } + + /* Check for value existence and correctness of it's type, allocate a buffer and load it. */ + result = RegQueryValueExW(hKey, pwszValue, NULL, &dwValueType, NULL, &cbData); + if (result != ERROR_SUCCESS) goto cleanup; + if (!(dwValueType == REG_SZ || dwValueType == REG_EXPAND_SZ) || !cbData) { + result = ERROR_FILE_NOT_FOUND; + goto cleanup; + } + pwszTempBuffer = HeapAlloc(GetProcessHeap(), 0, cbData); + if (!pwszTempBuffer) { + result = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + result = RegQueryValueExW(hKey, pwszValue, NULL, &dwValueType, (LPBYTE)pwszTempBuffer, &cbData); + if (result != ERROR_SUCCESS) goto cleanup; + + /* Expand environment variables, if appropriate, or copy the original string over. */ + if (dwValueType == REG_EXPAND_SZ) { + cbData = ExpandEnvironmentStringsW(pwszTempBuffer, NULL, 0) * sizeof(WCHAR); + if (!cbData) goto cleanup; + pwszExpandedBuffer = HeapAlloc(GetProcessHeap(), 0, cbData); + if (!pwszExpandedBuffer) { + result = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + ExpandEnvironmentStringsW(pwszTempBuffer, pwszExpandedBuffer, cbData); + } else { + pwszExpandedBuffer = HeapAlloc(GetProcessHeap(), 0, cbData); + memcpy(pwszExpandedBuffer, pwszTempBuffer, cbData); + } + + /* If the value references a resource based string, parse the value and load the string. + * Else just copy over the original value. */ + result = ERROR_SUCCESS; + if (*pwszExpandedBuffer != '@') { /* '@' is the prefix for resource based string entries. */ + lstrcpynW(pwszBuffer, pwszExpandedBuffer, cbBuffer / sizeof(WCHAR)); + } else { + WCHAR *pComma = strrchrW(pwszExpandedBuffer, ','); + UINT uiStringId; + HMODULE hModule; + + /* Format of the expanded value is 'path_to_dll,-resId' */ + if (!pComma || pComma[1] != '-') { + result = ERROR_BADKEY; + goto cleanup; + } + + uiStringId = atoiW(pComma+2); + *pComma = '\0'; + + hModule = LoadLibraryW(pwszExpandedBuffer + 1); + if (!hModule || !load_string(hModule, uiStringId, pwszBuffer, cbBuffer/sizeof(WCHAR))) + result = ERROR_BADKEY; + FreeLibrary(hModule); + } + +cleanup: + HeapFree(GetProcessHeap(), 0, pwszTempBuffer); + HeapFree(GetProcessHeap(), 0, pwszExpandedBuffer); + return result; +} + +/****************************************************************************** + * RegLoadMUIStringA [ADVAPI32.@] + * + * See RegLoadMUIStringW + */ +LONG WINAPI RegLoadMUIStringA(HKEY hKey, LPCSTR pszValue, LPSTR pszBuffer, DWORD cbBuffer, + LPDWORD pcbData, DWORD dwFlags, LPCSTR pszBaseDir) +{ + UNICODE_STRING valueW, baseDirW; + WCHAR *pwszBuffer; + DWORD cbData = cbBuffer * sizeof(WCHAR); + LONG result; + + valueW.Buffer = baseDirW.Buffer = pwszBuffer = NULL; + if (!RtlCreateUnicodeStringFromAsciiz(&valueW, pszValue) || + !RtlCreateUnicodeStringFromAsciiz(&baseDirW, pszBaseDir) || + !(pwszBuffer = HeapAlloc(GetProcessHeap(), 0, cbData))) + { + result = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + + result = RegLoadMUIStringW(hKey, valueW.Buffer, pwszBuffer, cbData, NULL, dwFlags, + baseDirW.Buffer); + + if (result == ERROR_SUCCESS) { + cbData = WideCharToMultiByte(CP_ACP, 0, pwszBuffer, -1, pszBuffer, cbBuffer, NULL, NULL); + if (pcbData) + *pcbData = cbData; + } + +cleanup: + HeapFree(GetProcessHeap(), 0, pwszBuffer); + RtlFreeUnicodeString(&baseDirW); + RtlFreeUnicodeString(&valueW); + + return result; +} diff --git a/include/winreg.h b/include/winreg.h index 85fa2ea..7147150 100644 --- a/include/winreg.h +++ b/include/winreg.h @@ -113,6 +113,9 @@ LONG WINAPI RegGetValueW(HKEY,LPC LONG WINAPI RegLoadKeyA(HKEY,LPCSTR,LPCSTR); LONG WINAPI RegLoadKeyW(HKEY,LPCWSTR,LPCWSTR); #define RegLoadKey WINELIB_NAME_AW(RegLoadKey) +LONG WINAPI RegLoadMUIStringA(HKEY,LPCSTR,LPSTR,DWORD,LPDWORD,DWORD,LPCSTR); +LONG WINAPI RegLoadMUIStringW(HKEY,LPCWSTR,LPWSTR,DWORD,LPDWORD,DWORD,LPCWSTR); +#define RegLoadMUIString WINELIB_NAME_AW(RegLoadMUIString) LONG WINAPI RegNotifyChangeKeyValue(HKEY,BOOL,DWORD,HANDLE,BOOL); DWORD WINAPI RegOpenCurrentUser(REGSAM,PHKEY); DWORD WINAPI RegOpenKeyExW(HKEY,LPCWSTR,DWORD,REGSAM,PHKEY);

1 0

Phil Lodwick : winsock/tests: select wakeup on closesocket.
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: 53b93af3b97aff32719a4e015810b04d471a36b6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=53b93af3b97aff32719a4e0… Author: Phil Lodwick <Phil.Lodwick(a)EFI.COM> Date: Tue Feb 14 10:38:49 2006 +0100 winsock/tests: select wakeup on closesocket. - Change select timeout from 2 seconds to 500 microseconds. - Add test to make sure select wakes up after a closesocket. - Add test to make sure listen fails without bind. --- dlls/winsock/tests/sock.c | 60 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 55 insertions(+), 5 deletions(-) diff --git a/dlls/winsock/tests/sock.c b/dlls/winsock/tests/sock.c index ae9184e..005c34e 100644 --- a/dlls/winsock/tests/sock.c +++ b/dlls/winsock/tests/sock.c @@ -128,6 +128,13 @@ typedef struct client_memory char *recv_buf; } client_memory; +/* SelectReadThread thread parameters */ +typedef struct select_thread_params +{ + SOCKET s; + BOOL ReadKilled; +} select_thread_params; + /**************** Static variables ***************/ static DWORD tls; /* Thread local storage index */ @@ -1317,13 +1324,38 @@ static void test_WSAStringToAddressW(voi "WSAStringToAddressW() failed unexpectedly: %d\n", GLE ); } +static VOID WINAPI SelectReadThread(select_thread_params *par) +{ + fd_set readfds; + int ret; + struct sockaddr_in addr; + struct timeval select_timeout; + + FD_ZERO(&readfds); + FD_SET(par->s, &readfds); + select_timeout.tv_sec=5; + select_timeout.tv_usec=0; + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = inet_addr(SERVERIP); + addr.sin_port = htons(SERVERPORT); + + do_bind(par->s, (struct sockaddr *)&addr, sizeof(addr)); + wsa_ok(listen(par->s, SOMAXCONN ), 0 ==, "SelectReadThread (%lx): listen failed: %d\n"); + + SetEvent(server_ready); + ret = select(par->s+1, &readfds, NULL, NULL, &select_timeout); + par->ReadKilled = (ret == 1); +} + static void test_select(void) { SOCKET fdRead, fdWrite; fd_set readfds, writefds, exceptfds; - int maxfd; + unsigned int maxfd; int ret; struct timeval select_timeout; + select_thread_params thread_params; + HANDLE thread_handle; fdRead = socket(AF_INET, SOCK_STREAM, 0); ok( (fdRead != INVALID_SOCKET), "socket failed unexpectedly: %d\n", WSAGetLastError() ); @@ -1337,8 +1369,8 @@ static void test_select(void) FD_SET(fdWrite, &writefds); FD_SET(fdRead, &exceptfds); FD_SET(fdWrite, &exceptfds); - select_timeout.tv_sec=2; - select_timeout.tv_usec=0; + select_timeout.tv_sec=0; + select_timeout.tv_usec=500; maxfd = fdRead; if (fdWrite > maxfd) @@ -1354,10 +1386,28 @@ static void test_select(void) ok ( !FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); ok ( !FD_ISSET(fdWrite, &exceptfds), "FD should not be set\n"); - ret = closesocket(fdRead); - ok ( (ret == 0), "closesocket failed unexpectedly: %d\n", ret); + todo_wine { + ok ((listen(fdWrite, SOMAXCONN) == SOCKET_ERROR), "listen did not fail\n"); + } ret = closesocket(fdWrite); ok ( (ret == 0), "closesocket failed unexpectedly: %d\n", ret); + + thread_params.s = fdRead; + thread_params.ReadKilled = FALSE; + server_ready = CreateEventW(NULL, TRUE, FALSE, NULL); + thread_handle = CreateThread (NULL, 0, (LPTHREAD_START_ROUTINE) &SelectReadThread, &thread_params, 0, NULL ); + ok ( (thread_handle != NULL), "CreateThread failed unexpectedly: %ld\n", GetLastError()); + + WaitForSingleObject (server_ready, INFINITE); + Sleep(2000); + ret = closesocket(fdRead); + ok ( (ret == 0), "closesocket failed unexpectedly: %d\n", ret); + + WaitForSingleObject (thread_handle, TEST_TIMEOUT * 1000); + todo_wine { + ok ( (thread_params.ReadKilled), "closesocket did not wakeup select\n"); + } + } /**************** Main program ***************/

1 0

Huw Davies : msxml: Implement getElementsByTagName.
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: 1c3daceb00d55901d826032f726a98b4a416fa55 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1c3daceb00d55901d826032… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 14 10:38:21 2006 +0100 msxml: Implement getElementsByTagName. --- dlls/msxml3/domdoc.c | 12 +++++- dlls/msxml3/msxml_private.h | 2 + dlls/msxml3/node.c | 6 ++- dlls/msxml3/nodelist.c | 81 +++++++++++++++++++++++++++++++++++-------- dlls/msxml3/tests/domdoc.c | 60 ++++++++++++++++++++++++++++++++ 5 files changed, 139 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=1c3daceb00d55901d82…

1 0

Hans Leidekker : msxml3: Implement DllUnregisterServer.
by Alexandre Julliard Feb. 14, 2006

Feb. 14, 2006

Module: wine Branch: refs/heads/master Commit: 964ef89f09f262bfb769e97b51f86edf9881c1eb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=964ef89f09f262bfb769e97… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Tue Feb 14 10:38:05 2006 +0100 msxml3: Implement DllUnregisterServer. --- dlls/msxml3/main.c | 7 +++++++ dlls/msxml3/msxml3.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 037ff79..2865eff 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -82,3 +82,10 @@ HRESULT WINAPI DllRegisterServer(void) "msxml3.dll" ); return r; } + +HRESULT WINAPI DllUnregisterServer(void) +{ + RegDeleteKeyA( HKEY_CLASSES_ROOT, "CLSID\\{2933BF90-7B36-11D2-B20E-00C04F983E60}\\InProcServer32" ); + RegDeleteKeyA( HKEY_CLASSES_ROOT, "CLSID\\{2933BF90-7B36-11D2-B20E-00C04F983E60}" ); + return S_OK; +} diff --git a/dlls/msxml3/msxml3.spec b/dlls/msxml3/msxml3.spec index 77bf086..15b763e 100644 --- a/dlls/msxml3/msxml3.spec +++ b/dlls/msxml3/msxml3.spec @@ -9,4 +9,4 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() -@ stub DllUnregisterServer +@ stdcall -private DllUnregisterServer()

1 0

Petr Tesarik : winhelp: Czech language resources encoding fix.
by Alexandre Julliard Feb. 13, 2006

Feb. 13, 2006

Module: wine Branch: refs/heads/master Commit: 0dec5281d13a13557add05ab8c390dbb1464f4a7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0dec5281d13a13557add05a… Author: Petr Tesarik <hat(a)tesarici.cz> Date: Mon Feb 13 13:30:01 2006 +0100 winhelp: Czech language resources encoding fix. --- programs/winhelp/Cs.rc | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/programs/winhelp/Cs.rc b/programs/winhelp/Cs.rc index f6b96e2..a4fc733 100644 --- a/programs/winhelp/Cs.rc +++ b/programs/winhelp/Cs.rc @@ -1,4 +1,5 @@ -/* +/* Hey, Emacs, open this file with -*- coding: cp1250 -*- + * * Help Viewer Czech resources * * Copyright 1996 Ulrich Schmid @@ -20,12 +21,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +/* Czech strings in CP1250 */ + /* Menu */ MAIN_MENU MENU LANGUAGE LANG_CZECH, SUBLANG_DEFAULT { POPUP "&Soubor" { - MENUITEM "&Otev59t", MNID_FILE_OPEN + MENUITEM "&Otev��t", MNID_FILE_OPEN MENUITEM SEPARATOR MENUITEM "&Tisk", MNID_FILE_PRINT MENUITEM "Na&staven� tisku...", MNID_FILE_SETUP @@ -37,12 +40,12 @@ MAIN_MENU MENU LANGUAGE LANG_CZECH, SUBL MENUITEM SEPARATOR MENUITEM "P&oznamenat si...", MNID_EDIT_ANNOTATE } - POPUP "&Z�lo�ka" { + POPUP "&Z�lo�ka" { MENUITEM "P�i&dat...", MNID_BKMK_DEFINE } POPUP "&N�pov�da" { MENUITEM "N�p&ov�da k n�pov�d�", MNID_HELP_HELPON - MENUITEM "V�dy na &vrchu", MNID_HELP_HELPTOP + MENUITEM "V�dy na &vrchu", MNID_HELP_HELPTOP MENUITEM SEPARATOR MENUITEM "&Informace...", MNID_HELP_ABOUT #ifdef WINELIB @@ -65,6 +68,6 @@ STID_SEARCH, "&Hledat" STID_BACK, "&Zp�t" STID_HISTORY, "&Historie" STID_TOPICS, "&T�mata" -STID_ALL_FILES, "V�echny soubory (*.*)" +STID_ALL_FILES, "V�echny soubory (*.*)" STID_HELP_FILES_HLP, "Soubory n�pov�dy (*.hlp)" }

1 0

Petr Tesarik : winemine: Czech language resources encoding fix.
by Alexandre Julliard Feb. 13, 2006

Feb. 13, 2006

Module: wine Branch: refs/heads/master Commit: 42a1c74e17dc0f2de65e89514f8da4bb2d1c67de URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=42a1c74e17dc0f2de65e895… Author: Petr Tesarik <hat(a)tesarici.cz> Date: Mon Feb 13 13:29:55 2006 +0100 winemine: Czech language resources encoding fix. --- programs/winemine/Cs.rc | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/programs/winemine/Cs.rc b/programs/winemine/Cs.rc index fc3cd43..97c03c6 100644 --- a/programs/winemine/Cs.rc +++ b/programs/winemine/Cs.rc @@ -1,4 +1,5 @@ -/* +/* Hey, Emacs, open this file with -*- coding: cp1250 -*- + * * WineMine * Czech Language Support * @@ -23,6 +24,8 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +/* Czech strings in CP1250 */ + STRINGTABLE { IDS_APPNAME, "WineMine" IDS_NOBODY, "Nikdo" @@ -43,7 +46,7 @@ MENU_WINEMINE MENU DISCARDABLE MENUITEM "&Konec\tAlt+K", IDM_EXIT } POPUP "&Informace" { - MENUITEM "Ne&jlep�� asy", IDM_TIMES + MENUITEM "Ne&jlep�� asy", IDM_TIMES MENUITEM "&O aplikaci", IDM_ABOUT } } @@ -51,9 +54,9 @@ MENU_WINEMINE MENU DISCARDABLE DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "Nejlep�� asy" +CAPTION "Nejlep�� asy" { - GROUPBOX "Nejlep�� asy", IDIGNORE, 10, 10, 140, 45 + GROUPBOX "Nejlep�� asy", IDIGNORE, 10, 10, 140, 45 LTEXT "Za��te�n�k", IDIGNORE, 20, 20, 40, 8 LTEXT "Pokro�il�", IDIGNORE, 20, 30, 40, 8 LTEXT "Expert", IDIGNORE, 20, 40, 40, 8

1 0

Petr Tesarik : winefile: Czech language resources encoding fix.
by Alexandre Julliard Feb. 13, 2006

Feb. 13, 2006

Module: wine Branch: refs/heads/master Commit: 39a4fa4348b9ef28427e2587fe3c2a6d3e3f213c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=39a4fa4348b9ef28427e258… Author: Petr Tesarik <hat(a)tesarici.cz> Date: Mon Feb 13 13:29:49 2006 +0100 winefile: Czech language resources encoding fix. --- programs/winefile/Cs.rc | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/winefile/Cs.rc b/programs/winefile/Cs.rc index ba95f76..e3eed75 100644 --- a/programs/winefile/Cs.rc +++ b/programs/winefile/Cs.rc @@ -1,4 +1,5 @@ -/* +/* Hey, Emacs, open this file with -*- coding: cp1250 -*- + * * WineFile * Czech Language Support * @@ -24,6 +25,8 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +/* Czech strings in CP1250 */ + /* Menu */ IDM_WINEFILE MENU FIXED IMPURE

1 0

Petr Tesarik : wineconsole: Czech language resources encoding fix.
by Alexandre Julliard Feb. 13, 2006

Feb. 13, 2006

Module: wine Branch: refs/heads/master Commit: bc5c5b52b1cae6f029e98c2cf7f0d36273fd8fae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bc5c5b52b1cae6f029e98c2… Author: Petr Tesarik <hat(a)tesarici.cz> Date: Mon Feb 13 13:29:44 2006 +0100 wineconsole: Czech language resources encoding fix. --- programs/wineconsole/wineconsole_Cs.rc | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/programs/wineconsole/wineconsole_Cs.rc b/programs/wineconsole/wineconsole_Cs.rc index a407024..b13472f 100644 --- a/programs/wineconsole/wineconsole_Cs.rc +++ b/programs/wineconsole/wineconsole_Cs.rc @@ -1,4 +1,5 @@ -/* +/* Hey, Emacs, open this file with -*- coding: cp1250 -*- + * * Czech resources for wineconsole * Copyright 2001 Eric Pouech * Copyright 2004 David Kredba @@ -20,6 +21,8 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +/* Czech strings in CP1250 */ + STRINGTABLE BEGIN IDS_EDIT, "�&pravy" @@ -27,17 +30,17 @@ IDS_DEFAULT, "Nastavit &v�choz�" IDS_PROPERTIES, "V&lastnosti" IDS_MARK, "V&ybrat" IDS_COPY, "&Kop�rovat" -IDS_PASTE, "Vl&o�it" -IDS_SELECTALL, "Vy&brat v�e" +IDS_PASTE, "Vl&o�it" +IDS_SELECTALL, "Vy&brat v�e" IDS_SCROLL, "Rolova&t" IDS_SEARCH, "Hl&edat" -IDS_FNT_DISPLAY, "Ka�d� znak je %ld pixel� �irok� a %ld pixel� vysok�" +IDS_FNT_DISPLAY, "Ka�d� znak je %ld pixel� �irok� a %ld pixel� vysok�" IDS_FNT_PREVIEW_1, "Toto je test" IDS_FNT_PREVIEW_2, "" IDS_DLG_TIT_DEFAULT, "Setup - Defaultn� nastaven�" IDS_DLG_TIT_CURRENT, "Setup - Sou�asn� nastaven�" IDS_DLG_TIT_ERROR, "Chyba nastaven�" -IDS_DLG_ERR_SBWINSIZE, "Z�sobn�k obrazovky mus� b�t v�t�� nebo stejn� velk� jakz�sobn�k okna." +IDS_DLG_ERR_SBWINSIZE, "Z�sobn�k obrazovky mus� b�t v�t�� nebo stejn� velk� jakz�sobn�k okna." END IDD_OPTION DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 @@ -86,18 +89,18 @@ CAPTION " Nastaven� " FONT 8, "MS Shell Dlg" { GROUPBOX "Oblast z�sobn�ku", -1, 10, 11, 100, 42, BS_GROUPBOX - LTEXT "��&ka :", -1, 14, 25, 54, 9 + LTEXT "��&ka :", -1, 14, 25, 54, 9 EDITTEXT IDC_CNF_SB_WIDTH, 68, 23, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_SB_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - LTEXT "&V��ka :", -1, 14, 39, 54, 9 + LTEXT "&V��ka :", -1, 14, 39, 54, 9 EDITTEXT IDC_CNF_SB_HEIGHT, 68, 37, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_SB_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 GROUPBOX "Velikost okna", -1, 10, 55, 100, 42 - LTEXT "��&ka :", -1, 14, 69, 54, 9 + LTEXT "��&ka :", -1, 14, 69, 54, 9 EDITTEXT IDC_CNF_WIN_WIDTH, 68, 67, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_WIN_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - LTEXT "V��k&a :", -1, 14, 83, 54, 9 + LTEXT "V��k&a :", -1, 14, 83, 54, 9 EDITTEXT IDC_CNF_WIN_HEIGHT, 68, 81, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_WIN_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 @@ -114,7 +117,7 @@ CAPTION "Parametry konzole" FONT 8, "MS Shell Dlg" { GROUPBOX "", -1, 10, 10, 120, 31, BS_GROUPBOX - AUTORADIOBUTTON "Zachovat tyto zm�ny pro dal�� sezen�", IDC_SAV_SAVE, 14, 15, 110, 10, WS_TABSTOP + AUTORADIOBUTTON "Zachovat tyto zm�ny pro dal�� sezen�", IDC_SAV_SAVE, 14, 15, 110, 10, WS_TABSTOP AUTORADIOBUTTON "Upravit pouze sou�asn� sezen�", IDC_SAV_SESSION, 14, 27, 110, 10, WS_TABSTOP PUSHBUTTON "OK", IDOK, 20, 45, 35, 12

1 0

Petr Tesarik : winecfg: Czech language resources encoding fix.
by Alexandre Julliard Feb. 13, 2006

Feb. 13, 2006

Module: wine Branch: refs/heads/master Commit: 49eae42f22a3d78c4afbcc154c1958ca811a9e5d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=49eae42f22a3d78c4afbcc1… Author: Petr Tesarik <hat(a)tesarici.cz> Date: Mon Feb 13 13:29:37 2006 +0100 winecfg: Czech language resources encoding fix. --- programs/winecfg/Cs.rc | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/programs/winecfg/Cs.rc b/programs/winecfg/Cs.rc index a4707fb..78f75b5 100644 --- a/programs/winecfg/Cs.rc +++ b/programs/winecfg/Cs.rc @@ -1,4 +1,5 @@ -/* +/* Hey, Emacs, open this file with -*- coding: cp1250 -*- + * * WineCfg resources * English Language Support * @@ -25,6 +26,8 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT +/* Czech strings in CP1250 */ + IDD_ABOUTCFG DIALOGEX 0, 0, 260, 250 STYLE WS_CHILD FONT 8, "MS Shell Dlg" @@ -44,7 +47,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Nastaven� aplikac�",IDC_STATIC, 8,4,244,240 - LTEXT "Wine um� p�edst�rat r�zn� verze Windows pro ka�dou jednu applikaci.", + LTEXT "Wine um� p�edst�rat r�zn� verze Windows pro ka�dou jednu applikaci.", IDC_STATIC,15,20,227,20 CONTROL "Aplikace",IDC_APP_LISTVIEW,"SysListView32",WS_BORDER | WS_TABSTOP | LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS, 15,40,230,140 @@ -60,13 +63,13 @@ IDD_GRAPHCFG DIALOG DISCARDABLE 0, 0, 2 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Povolit aplikac�m DirectX dr�et ukazatel my�i ve sv�m okn� ?",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8 + CONTROL "Povolit aplikac�m DirectX dr�et ukazatel my�i ve sv�m okn� ?",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8 CONTROL "Povolit double buffering plochy",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8 GROUPBOX " Nastaven� oken ",IDC_STATIC,8,25,244,120 /* FIXME: the wording of this explanation could be a lot better */ - LTEXT "M��ete si vybrat emulaci plochy windows, kde jsou okna aplikac� uzav�ena v jedn� 'virtu�ln� obrazovce' nebo mohou b�t um�st�na na standardn�m desktopu.", + LTEXT "M��ete si vybrat emulaci plochy windows, kde jsou okna aplikac� uzav�ena v jedn� 'virtu�ln� obrazovce' nebo mohou b�t um�st�na na standardn�m desktopu.", IDC_STATIC,15,73,228,28 LTEXT "Velikost desktopu:",IDC_DESKTOP_SIZE,15,115,44,8,WS_DISABLED LTEXT "X",IDC_DESKTOP_BY,108,115,8,8,WS_DISABLED @@ -82,7 +85,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "N�hrady DLL",IDC_STATIC,8,4,244,240 - LTEXT "M��ete vybrat zda budou pou�ity dynamicky linkovan� knihovny vestav�n� ve Wine nebo nativn� (vzat� z Windows nebo poskytnut� aplikac�)." + LTEXT "M��ete vybrat zda budou pou�ity dynamicky linkovan� knihovny vestav�n� ve Wine nebo nativn� (vzat� z Windows nebo poskytnut� aplikac�)." , IDC_STATIC,15,17,228,32 LISTBOX IDC_DLLS_LIST,15,50,142,187,WS_BORDER | WS_TABSTOP | WS_VSCROLL LTEXT "Po�ad� nahrav�n�:",IDC_STATIC,163,50,37,8 @@ -117,7 +120,7 @@ BEGIN PUSHBUTTON "Odebrat",IDC_BUTTON_REMOVE,55,199,37,14 PUSHBUTTON "Upravit...",IDC_BUTTON_EDIT,97,199,37,14 PUSHBUTTON "Autodetekovat...",IDC_BUTTON_AUTODETECT,197,199,49,14 - LTEXT "Varov�n�: Vypad� to, �e disk C nen� definov�n. Klikn�te na 'P�idat...' a vytvo�te ho.", IDS_DRIVE_NO_C, 7,223,250,110 + LTEXT "Varov�n�: Vypad� to, �e disk C nen� definov�n. Klikn�te na 'P�idat...' a vytvo�te ho.", IDS_DRIVE_NO_C, 7,223,250,110 END IDD_DRIVE_EDIT DIALOG DISCARDABLE 0, 0, 203, 169 @@ -161,7 +164,7 @@ END STRINGTABLE DISCARDABLE BEGIN IDS_WINE_VERSION "CVS" - IDS_TAB_GENERAL "V�eobecn�" + IDS_TAB_GENERAL "V�eobecn�" IDS_TAB_DLLS "Knihovny" IDS_TAB_DRIVES "Disky" END

1 0