February 2006 - Wine-commits

Eric Pouech : winedbg: Rewrite auto mode.
by Alexandre Julliard 28 Feb '06

28 Feb '06

Module: wine Branch: refs/heads/master Commit: 67001a1d8b4ab6d981055a7cc0f797be0721a31e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=67001a1d8b4ab6d981055a7… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Feb 27 21:50:36 2006 +0100 winedbg: Rewrite auto mode. - rewrote auto mode as a specific set of commands to be run in regular parser, instead of hard coding those commands - added a new function to store a set of commands to be executed in a file - added 'echo' command to the parser functions - got rid of dbg_action_mode - added support of '--' on command line --- programs/winedbg/dbg.y | 32 ++++++++++++++++ programs/winedbg/debug.l | 1 + programs/winedbg/debugger.h | 2 + programs/winedbg/tgt_active.c | 36 +++++++----------- programs/winedbg/winedbg.c | 80 +++++++++++++++++++---------------------- 5 files changed, 84 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=67001a1d8b4ab6d9810…

1 0

Eric Pouech : winedbg: Fixed regression in gdb handling.
by Alexandre Julliard 28 Feb '06

28 Feb '06

Module: wine Branch: refs/heads/master Commit: 22ff9464091c231d7a6dd4d19d0b40732e2cd4de URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=22ff9464091c231d7a6dd4d… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Feb 27 21:50:33 2006 +0100 winedbg: Fixed regression in gdb handling. --- programs/winedbg/gdbproxy.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 3d5a9cc..ade801c 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -2273,7 +2273,8 @@ int gdb_main(int argc, char* argv[]) } return -1; } - if (dbg_active_attach(argc, argv) || dbg_active_launch(argc, argv)) + if (dbg_active_attach(argc, argv) == start_ok || + dbg_active_launch(argc, argv) == start_ok) return gdb_remote(gdb_flags); return -1; }

1 0

James Hawkins : advpack: Factor out loading the program files directory.
by Alexandre Julliard 28 Feb '06

28 Feb '06

Module: wine Branch: refs/heads/master Commit: 1f3028563d70a6e991e996be6eddfd8be37b81cc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1f3028563d70a6e991e996b… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Feb 27 13:50:25 2006 -0600 advpack: Factor out loading the program files directory. --- dlls/advpack/tests/advpack.c | 45 +++++++++++++++++++++--------------------- 1 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index a377210..857458b 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -35,6 +35,22 @@ static HRESULT (WINAPI *pOpenINFEngine)( static HRESULT (WINAPI *pTranslateInfString)(LPSTR,LPSTR,LPSTR,LPSTR,LPSTR,DWORD,LPDWORD,LPVOID); static HRESULT (WINAPI *pTranslateInfStringEx)(HINF,PCSTR,PCSTR,PCSTR,PSTR,DWORD,PDWORD,PVOID); +static CHAR PROG_FILES[MAX_PATH]; +static DWORD PROG_FILES_LEN; + +static void get_progfiles_dir(void) +{ + HKEY hkey; + DWORD size = MAX_PATH; + + RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", &hkey); + RegQueryValueExA(hkey, "ProgramFilesDir", NULL, NULL, (LPBYTE)PROG_FILES, &size); + RegCloseKey(hkey); + + lstrcatA(PROG_FILES, TEST_STRING1); + PROG_FILES_LEN = lstrlenA(PROG_FILES) + 1; +} + static BOOL init_function_pointers(void) { HMODULE hAdvPack = LoadLibraryA("advpack.dll"); @@ -247,20 +263,8 @@ static void translateinfstring_test() if(hr == ERROR_SUCCESS) { - HKEY key; - DWORD len = MAX_PATH; - char cmpbuffer[MAX_PATH]; - LONG res = RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", &key); - if(res == ERROR_SUCCESS) { - res = RegQueryValueExA(key, "ProgramFilesDir", NULL, NULL, (LPBYTE)cmpbuffer, &len); - if(res == ERROR_SUCCESS) { - strcat(cmpbuffer, TEST_STRING1); - ok(!strcmp(buffer, cmpbuffer), "Expected '%s', got '%s'\n", cmpbuffer, buffer); - ok(dwSize == (strlen(cmpbuffer)+1), "Expected size %d, got %ld\n", - strlen(cmpbuffer)+1, dwSize); - } - RegCloseKey(key); - } + ok(!strcmp(buffer, PROG_FILES), "Expected '%s', got '%s'\n", PROG_FILES, buffer); + ok(dwSize == PROG_FILES_LEN, "Expected size %ld, got %ld\n", PROG_FILES_LEN, dwSize); } buffer[0] = 0; @@ -281,17 +285,11 @@ static void translateinfstring_test() static void translateinfstringex_test(void) { HINF hinf; - HKEY hkey; HRESULT hr; char buffer[MAX_PATH]; - char progfiles[MAX_PATH]; DWORD size = MAX_PATH; create_inf_file(); - - RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", &hkey); - RegQueryValueExA(hkey, "ProgramFilesDir", NULL, NULL, (LPBYTE)progfiles, &size); - lstrcatA(progfiles, TEST_STRING1); /* need to see if there are any flags */ @@ -381,9 +379,8 @@ static void translateinfstringex_test(vo hr = pTranslateInfStringEx(hinf, "c:\\test.inf", "Options.NTx86", "InstallDir", buffer, size, &size, NULL); ok(hr == S_OK, "Expected S_OK, got %ld\n", hr); - ok(!strcmp(buffer, progfiles), "Expected %s, got %s\n", progfiles, buffer); - ok(size == lstrlenA(progfiles) + 1, "Expected size %i, got %ld\n", - lstrlenA(progfiles) + 1, size); + ok(!strcmp(buffer, PROG_FILES), "Expected %s, got %s\n", PROG_FILES, buffer); + ok(size == PROG_FILES_LEN, "Expected size %ld, got %ld\n", PROG_FILES_LEN, size); /* close the INF again */ hr = pCloseINFEngine(hinf); @@ -397,6 +394,8 @@ START_TEST(advpack) if (!init_function_pointers()) return; + get_progfiles_dir(); + version_test(); delnode_test(); translateinfstring_test();

1 0

James Hawkins : advpack: Add tests for the TranslateInfStringEx trio of functions and
by Alexandre Julliard 28 Feb '06

28 Feb '06

Module: wine Branch: refs/heads/master Commit: 7787ca6134595ca2f5d8ff2afdafcec6cada1699 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7787ca6134595ca2f5d8ff2… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Feb 27 13:50:03 2006 -0600 advpack: Add tests for the TranslateInfStringEx trio of functions and fix the errors. --- dlls/advpack/advpack.c | 10 +++ dlls/advpack/tests/advpack.c | 124 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+), 3 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 5573181..0fa362f 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -123,6 +123,9 @@ HRESULT WINAPI CloseINFEngine(HINF hInf) { TRACE("(%p)\n", hInf); + if (!hInf) + return E_INVALIDARG; + SetupCloseInfFile(hInf); return S_OK; } @@ -270,7 +273,7 @@ HRESULT WINAPI OpenINFEngineA(LPCSTR psz TRACE("(%p, %p, %ld, %p, %p)\n", pszInfFilename, pszInstallSection, dwFlags, phInf, pvReserved); - if (!phInf) + if (!pszInfFilename || !phInf) return E_INVALIDARG; *phInf = SetupOpenInfFileA(pszInfFilename, NULL, INF_STYLE_WIN4, NULL); @@ -472,6 +475,9 @@ HRESULT WINAPI TranslateInfStringExA(HIN pszTranslateSection, pszTranslateKey, pszBuffer, dwBufferSize, pdwRequiredSize, pvReserved); + if (!hInf || !pszInfFilename || !pszTranslateSection || !pszTranslateKey) + return E_INVALIDARG; + if (!SetupGetLineTextA(NULL, hInf, pszTranslateSection, pszTranslateKey, pszBuffer, dwBufferSize, pdwRequiredSize)) { @@ -481,7 +487,7 @@ HRESULT WINAPI TranslateInfStringExA(HIN return SPAPI_E_LINE_NOT_FOUND; } - return E_FAIL; + return S_OK; } /*********************************************************************** diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index a382ef8..a377210 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -28,9 +28,12 @@ #define TEST_STRING1 "\\Application Name" #define TEST_STRING2 "%49001%\\Application Name" +static HRESULT (WINAPI *pCloseINFEngine)(HINF); static HRESULT (WINAPI *pDelNode)(LPCSTR,DWORD); static HRESULT (WINAPI *pGetVersionFromFile)(LPSTR,LPDWORD,LPDWORD,BOOL); +static HRESULT (WINAPI *pOpenINFEngine)(PCSTR,PCSTR,DWORD,HINF*,PVOID); static HRESULT (WINAPI *pTranslateInfString)(LPSTR,LPSTR,LPSTR,LPSTR,LPSTR,DWORD,LPDWORD,LPVOID); +static HRESULT (WINAPI *pTranslateInfStringEx)(HINF,PCSTR,PCSTR,PCSTR,PSTR,DWORD,PDWORD,PVOID); static BOOL init_function_pointers(void) { @@ -39,11 +42,15 @@ static BOOL init_function_pointers(void) if (!hAdvPack) return FALSE; + pCloseINFEngine = (void*)GetProcAddress(hAdvPack, "CloseINFEngine"); pDelNode = (void *)GetProcAddress(hAdvPack, "DelNode"); pGetVersionFromFile = (void *)GetProcAddress(hAdvPack, "GetVersionFromFile"); + pOpenINFEngine = (void*)GetProcAddress(hAdvPack, "OpenINFEngine"); pTranslateInfString = (void *)GetProcAddress(hAdvPack, "TranslateInfString"); + pTranslateInfStringEx = (void*)GetProcAddress(hAdvPack, "TranslateInfStringEx"); - if (!pDelNode || !pGetVersionFromFile || !pTranslateInfString) + if (!pCloseINFEngine || !pDelNode || !pGetVersionFromFile || + !pOpenINFEngine || !pTranslateInfString) return FALSE; return TRUE; @@ -271,6 +278,120 @@ static void translateinfstring_test() DeleteFile("c:\\test.inf"); } +static void translateinfstringex_test(void) +{ + HINF hinf; + HKEY hkey; + HRESULT hr; + char buffer[MAX_PATH]; + char progfiles[MAX_PATH]; + DWORD size = MAX_PATH; + + create_inf_file(); + + RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", &hkey); + RegQueryValueExA(hkey, "ProgramFilesDir", NULL, NULL, (LPBYTE)progfiles, &size); + lstrcatA(progfiles, TEST_STRING1); + + /* need to see if there are any flags */ + + /* try a NULL filename */ + hr = pOpenINFEngine(NULL, "Options.NTx86", 0, &hinf, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %ld\n", hr); + + /* try an empty filename */ + hr = pOpenINFEngine("", "Options.NTx86", 0, &hinf, NULL); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), + "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %ld\n", hr); + + /* try a NULL hinf */ + hr = pOpenINFEngine("c:\\test.inf", "Options.NTx86", 0, NULL, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %ld\n", hr); + + /* open the INF without the Install section specified */ + hr = pOpenINFEngine("c:\\test.inf", NULL, 0, &hinf, NULL); + ok(hr == S_OK, "Expected S_OK, got %ld\n", hr); + + /* try a NULL hinf */ + hr = pTranslateInfStringEx(NULL, "c:\\test.inf", "Options.NTx86", "InstallDir", + buffer, size, &size, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %ld\n", hr); + + /* try a NULL filename */ + hr = pTranslateInfStringEx(hinf, NULL, "Options.NTx86", "InstallDir", + buffer, size, &size, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %ld\n", hr); + + /* try an empty filename */ + size = MAX_PATH; + hr = pTranslateInfStringEx(hinf, "", "Options.NTx86", "InstallDir", + buffer, size, &size, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", (UINT)hr); + todo_wine + { + ok(!strcmp(buffer, TEST_STRING2), "Expected %s, got %s\n", TEST_STRING2, buffer); + ok(size == 25, "Expected size 25, got %ld\n", size); + } + + /* try a NULL translate section */ + hr = pTranslateInfStringEx(hinf, "c:\\test.inf", NULL, "InstallDir", + buffer, size, &size, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %ld\n", hr); + + /* try an empty translate section */ + hr = pTranslateInfStringEx(hinf, "c:\\test.inf", "", "InstallDir", + buffer, size, &size, NULL); + ok(hr == SPAPI_E_LINE_NOT_FOUND, "Expected SPAPI_E_LINE_NOT_FOUND, got %ld\n", hr); + + /* try a NULL translate key */ + hr = pTranslateInfStringEx(hinf, "c:\\test.inf", "Options.NTx86", NULL, + buffer, size, &size, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %ld\n", hr); + + /* try an empty translate key */ + hr = pTranslateInfStringEx(hinf, "c:\\test.inf", "Options.NTx86", "", + buffer, size, &size, NULL); + ok(hr == SPAPI_E_LINE_NOT_FOUND, "Expected SPAPI_E_LINE_NOT_FOUND, got %ld\n", hr); + + /* successfully translate the string */ + size = MAX_PATH; + hr = pTranslateInfStringEx(hinf, "c:\\test.inf", "Options.NTx86", "InstallDir", + buffer, size, &size, NULL); + ok(hr == S_OK, "Expected S_OK, got %ld\n", hr); + todo_wine + { + ok(!strcmp(buffer, TEST_STRING2), "Expected %s, got %s\n", TEST_STRING2, buffer); + ok(size == 25, "Expected size 25, got %ld\n", size); + } + + /* try a NULL hinf */ + hr = pCloseINFEngine(NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %ld\n", hr); + + /* successfully close the hinf */ + hr = pCloseINFEngine(hinf); + ok(hr == S_OK, "Expected S_OK, got %ld\n", hr); + + /* open the inf with the install section */ + hr = pOpenINFEngine("c:\\test.inf", "section", 0, &hinf, NULL); + ok(hr == S_OK, "Expected S_OK, got %ld\n", hr); + + /* translate the string with the install section specified */ + size = MAX_PATH; + hr = pTranslateInfStringEx(hinf, "c:\\test.inf", "Options.NTx86", "InstallDir", + buffer, size, &size, NULL); + ok(hr == S_OK, "Expected S_OK, got %ld\n", hr); + ok(!strcmp(buffer, progfiles), "Expected %s, got %s\n", progfiles, buffer); + ok(size == lstrlenA(progfiles) + 1, "Expected size %i, got %ld\n", + lstrlenA(progfiles) + 1, size); + + /* close the INF again */ + hr = pCloseINFEngine(hinf); + ok(hr == S_OK, "Expected S_OK, got %ld\n", hr); + + DeleteFileA("c:\\test.inf"); +} + START_TEST(advpack) { if (!init_function_pointers()) @@ -279,4 +400,5 @@ START_TEST(advpack) version_test(); delnode_test(); translateinfstring_test(); + translateinfstringex_test(); }

1 0

James Hawkins : advpack: Factor out the API loading of advpack tests.
by Alexandre Julliard 28 Feb '06

28 Feb '06

Module: wine Branch: refs/heads/master Commit: 790f4523d272ab5b7d56ab6d34e82da2c522e05c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=790f4523d272ab5b7d56ab6… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Feb 27 13:49:50 2006 -0600 advpack: Factor out the API loading of advpack tests. --- dlls/advpack/tests/advpack.c | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index b678797..a382ef8 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -28,10 +28,27 @@ #define TEST_STRING1 "\\Application Name" #define TEST_STRING2 "%49001%\\Application Name" -static HRESULT (WINAPI *pGetVersionFromFile)(LPSTR,LPDWORD,LPDWORD,BOOL); static HRESULT (WINAPI *pDelNode)(LPCSTR,DWORD); +static HRESULT (WINAPI *pGetVersionFromFile)(LPSTR,LPDWORD,LPDWORD,BOOL); static HRESULT (WINAPI *pTranslateInfString)(LPSTR,LPSTR,LPSTR,LPSTR,LPSTR,DWORD,LPDWORD,LPVOID); +static BOOL init_function_pointers(void) +{ + HMODULE hAdvPack = LoadLibraryA("advpack.dll"); + + if (!hAdvPack) + return FALSE; + + pDelNode = (void *)GetProcAddress(hAdvPack, "DelNode"); + pGetVersionFromFile = (void *)GetProcAddress(hAdvPack, "GetVersionFromFile"); + pTranslateInfString = (void *)GetProcAddress(hAdvPack, "TranslateInfString"); + + if (!pDelNode || !pGetVersionFromFile || !pTranslateInfString) + return FALSE; + + return TRUE; +} + static void version_test(void) { HRESULT hr; @@ -256,21 +273,10 @@ static void translateinfstring_test() START_TEST(advpack) { - HMODULE hdll; - - hdll = LoadLibraryA("advpack.dll"); - if (!hdll) - return; - - pGetVersionFromFile = (void*)GetProcAddress(hdll, "GetVersionFromFile"); - pDelNode = (void*)GetProcAddress(hdll, "DelNode"); - pTranslateInfString = (void*)GetProcAddress(hdll, "TranslateInfString"); - if (!pGetVersionFromFile || !pDelNode || !pTranslateInfString) + if (!init_function_pointers()) return; version_test(); delnode_test(); translateinfstring_test(); - - FreeLibrary(hdll); }

1 0

Juan Lang : crypt32: Correct compile problem on gcc 2.95.
by Alexandre Julliard 28 Feb '06

28 Feb '06

Module: wine Branch: refs/heads/master Commit: c109e2a33ec6c0bc7ceb5b8913f1d2f35e730d70 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c109e2a33ec6c0bc7ceb5b8… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Feb 27 09:23:07 2006 -0800 crypt32: Correct compile problem on gcc 2.95. --- dlls/crypt32/oid.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 6067bdf..d823649 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -18,6 +18,7 @@ */ #include <stdio.h> #include <stdarg.h> +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "wincrypt.h" @@ -937,7 +938,7 @@ static void init_oid_info(HINSTANCE hins info->info.pszOID = oidInfoConstructors[i].pszOID; info->info.pwszName = oidInfoConstructors[i].pwszName; info->info.dwGroupId = oidInfoConstructors[i].dwGroupId; - info->info.Algid = oidInfoConstructors[i].Algid; + info->info.u.Algid = oidInfoConstructors[i].Algid; if (oidInfoConstructors[i].blob) { info->info.ExtraInfo.cbData = @@ -966,7 +967,7 @@ static void init_oid_info(HINSTANCE hins info->info.pwszName = (LPWSTR)((LPBYTE)info + sizeof(struct OIDInfo)); info->info.dwGroupId = oidInfoConstructors[i].dwGroupId; - info->info.Algid = oidInfoConstructors[i].Algid; + info->info.u.Algid = oidInfoConstructors[i].Algid; LoadStringW(hinst, (UINT)oidInfoConstructors[i].pwszName, (LPWSTR)info->info.pwszName, len + 1); if (oidInfoConstructors[i].blob) @@ -1034,7 +1035,7 @@ PCCRYPT_OID_INFO WINAPI CryptFindOIDInfo EnterCriticalSection(&oidInfoCS); LIST_FOR_EACH_ENTRY(info, &oidInfo, struct OIDInfo, entry) { - if (info->info.Algid == *(DWORD *)pvKey && + if (info->info.u.Algid == *(DWORD *)pvKey && (!dwGroupId || info->info.dwGroupId == dwGroupId)) { ret = &info->info; @@ -1086,7 +1087,7 @@ PCCRYPT_OID_INFO WINAPI CryptFindOIDInfo EnterCriticalSection(&oidInfoCS); LIST_FOR_EACH_ENTRY(info, &oidInfo, struct OIDInfo, entry) { - if (info->info.Algid == *(DWORD *)pvKey && + if (info->info.u.Algid == *(DWORD *)pvKey && info->info.ExtraInfo.cbData >= sizeof(DWORD) && *(DWORD *)info->info.ExtraInfo.pbData == *(DWORD *)((LPBYTE)pvKey + sizeof(DWORD)) && @@ -1123,7 +1124,7 @@ DWORD WINAPI CertOIDToAlgId(LPCSTR pszOb (void *)pszObjId, 0); if (info) - ret = info->Algid; + ret = info->u.Algid; else ret = 0; return ret;

1 0

YunSong Hwang : crypt32: Add Korean translation.
by Alexandre Julliard 28 Feb '06

28 Feb '06

Module: wine Branch: refs/heads/master Commit: b97c880cb5973bf418ed3297dc58eece3df4bf5a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b97c880cb5973bf418ed329… Author: YunSong Hwang <hys545(a)dreamwiz.com> Date: Tue Feb 28 13:16:17 2006 +0900 crypt32: Add Korean translation. --- dlls/crypt32/crypt32.rc | 1 dlls/crypt32/crypt32_Ko.rc | 167 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 168 insertions(+), 0 deletions(-) create mode 100644 dlls/crypt32/crypt32_Ko.rc diff --git a/dlls/crypt32/crypt32.rc b/dlls/crypt32/crypt32.rc index a453415..61565a4 100644 --- a/dlls/crypt32/crypt32.rc +++ b/dlls/crypt32/crypt32.rc @@ -26,4 +26,5 @@ #include "crypt32_De.rc" #include "crypt32_En.rc" +#include "crypt32_Ko.rc" #include "crypt32_No.rc" diff --git a/dlls/crypt32/crypt32_Ko.rc b/dlls/crypt32/crypt32_Ko.rc new file mode 100644 index 0000000..e0df4a5 --- /dev/null +++ b/dlls/crypt32/crypt32_Ko.rc @@ -0,0 +1,167 @@ +/* + * crypt32 dll resources + * + * Copyright (C) 2006 Juan Lang + * Copyright (C) 2006 YunSong Hwang + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_AUTHORITY_KEY_ID "�� Ű �ĺ��" + IDS_KEY_ATTRIBUTES "Ű �Ӽ�" + IDS_KEY_USAGE_RESTRICTION "Ű �� " + IDS_SUBJECT_ALT_NAME "��(subject) ��ü �̸�" + IDS_ISSUER_ALT_NAME "�� ü �̸�" + IDS_BASIC_CONSTRAINTS "�⺻ ��" + IDS_KEY_USAGE "Ű ��" + IDS_CERT_POLICIES "�� ħ" + IDS_SUBJECT_KEY_IDENTIFIER "��(Subject)Ű �ĺ��" + IDS_CRL_REASON_CODE "CRL �к� �ڵ�" + IDS_CRL_DIST_POINTS "CRL �� " + IDS_ENHANCED_KEY_USAGE "Ȯ�� Ű ��" + IDS_AUTHORITY_INFO_ACCESS "�� " + IDS_CERT_EXTENSIONS "�� Ȯ��(Certificate Extensions)" + IDS_NEXT_UPDATE_LOCATION "�� Ʈ ��ġ" + IDS_YES_OR_NO_TRUST "�ŷ�(�� ƴϿ�)" + IDS_EMAIL_ADDRESS "�̸�� ּ�" + IDS_UNSTRUCTURED_NAME "��ȭ �̸�" + IDS_CONTENT_TYPE "�� " + IDS_MESSAGE_DIGEST "�� " + IDS_SIGNING_TIME "�� ð�" + IDS_COUNTER_SIGN "�� (Counter Sign)" + IDS_CHALLENGE_PASSWORD "��ȣ �ٲٱ�" + IDS_UNSTRUCTURED_ADDRESS "��ȭ �ּ�" + IDS_SMIME_CAPABILITIES "SMIME Ư��" + IDS_PREFER_SIGNED_DATA "��ȣ�ϴ� ��ε� ��Ÿ(Prefer Signed Data)" + IDS_CPS "CPS" + IDS_USER_NOTICE "�� " + IDS_OCSP "�¶�� " + IDS_CA_ISSUER "�� " + IDS_CERT_TEMPLATE_NAME "�� ̸�" + IDS_CERT_TYPE "�� " + IDS_CERT_MANIFOLD "�� 纻" + IDS_NETSCAPE_CERT_TYPE "�ݽ�� " + IDS_NETSCAPE_BASE_URL "�ݽ�� ⺻ ��ּ�" + IDS_NETSCAPE_REVOCATION_URL "�ݽ�� ּ�" + IDS_NETSCAPE_CA_REVOCATION_URL "�ݽ�� CA �� ּ�" + IDS_NETSCAPE_CERT_RENEWAL_URL "�ݽ�� 簳 ��ּ�" + IDS_NETSCAPE_CA_POLICY_URL "�ݽ�� CA ��ħ URL" + IDS_NETSCAPE_SSL_SERVER_NAME "�ݽ�� SSL ��̸�" + IDS_NETSCAPE_COMMENT "�ݽ�� " + IDS_SPC_SP_AGENCY_INFO "SpcSp�� " + IDS_SPC_FINANCIAL_CRITERIA "Spc�� Ģ" + IDS_SPC_MINIMAL_CRITERIA "Spc�ּ� ��Ģ" + IDS_COUNTRY "��/��" + IDS_ORGANIZATION "��ü" + IDS_ORGANIZATIONAL_UNIT "��ü(Organizational Unit)" + IDS_COMMON_NAME "��Ī" + IDS_LOCALITY "��" + IDS_STATE_OR_PROVINCE "�ֳ� ��" + IDS_TITLE "��" + IDS_GIVEN_NAME "�־�� ̸�" + IDS_INITIALS "�Ӹ��" + IDS_SUR_NAME "��" + IDS_DOMAIN_COMPONENT "�ּ� ��" + IDS_STREET_ADDRESS "�Ÿ� �ּ�" + IDS_SERIAL_NUMBER "�ø�� ȣ" + IDS_CA_VERSION "CA ��" + IDS_CROSS_CA_VERSION "�� CA ��" + IDS_SERIALIZED_SIG_SERIAL_NUMBER "��ӵ�(Serialized) �� ø�� ѹ�" + IDS_PRINCIPAL_NAME "�ֿ�� ̸�" + IDS_WINDOWS_PRODUCT_UPDATE "�� ǰ ��Ʈ" + IDS_ENROLLMENT_NAME_VALUE_PAIR "�� ̸� �� " + IDS_OS_VERSION "OS ��" + IDS_ENROLLMENT_CSP "CSP ��" + IDS_CRL_NUMBER "CRL ��ȣ" + IDS_DELTA_CRL_INDICATOR "��Ÿ CRL ǥ�ñ�" + IDS_ISSUING_DIST_POINT "�� ġ" + IDS_FRESHEST_CRL "�ֽ� CRL" + IDS_NAME_CONSTRAINTS "�̸� ��" + IDS_POLICY_MAPPINGS "��å ��" + IDS_POLICY_CONSTRAINTS "��å ��" + IDS_CROSS_CERT_DIST_POINTS "��ȣ �� й� ��ġ" + IDS_APPLICATION_POLICIES "Ǯ�׸� ��ħ" + IDS_APPLICATION_POLICY_MAPPINGS "Ǯ�׸� ��å ��(Mappings)" + IDS_APPLICATION_POLICY_CONSTRAINTS "Ǯ�׸� ��å ��" + IDS_CMC_DATA "CMC ��Ÿ" + IDS_CMC_RESPONSE "CMC ��" + IDS_UNSIGNED_CMC_REQUEST "�� CMC ��û" + IDS_CMC_STATUS_INFO "CMC �� " + IDS_CMC_EXTENSIONS "CMC Ȯ��" + IDS_CMC_ATTRIBUTES "CMC �Ӽ�" + IDS_PKCS_7_DATA "PKCS 7 ��Ÿ" + IDS_PKCS_7_SIGNED "PKCS 7 ��" + IDS_PKCS_7_ENVELOPED "PKCS 7 �ΰ�" + IDS_PKCS_7_SIGNED_ENVELOPED "PKCS 7 �� ΰ�" + IDS_PKCS_7_DIGESTED "PKCS 7 ��" + IDS_PKCS_7_ENCRYPTED "PKCS 7 ��ȣȭ" + IDS_PREVIOUS_CA_CERT_HASH "�� CA �� ؽ�" + IDS_CRL_VIRTUAL_BASE "�� CRL ��(Virtual Base CRL Number)" + IDS_CRL_NEXT_PUBLISH "�� CRL ��" + IDS_CA_EXCHANGE "CA ��ȣ ��" + IDS_KEY_RECOVERY_AGENT "Ű �� " + IDS_CERTIFICATE_TEMPLATE "�� (Template) ��" + IDS_ENTERPRISE_ROOT_OID "�� Ʈ OID" + IDS_RDN_DUMMY_SIGNER "��¥ ��(Dummy Signer)" + IDS_ARCHIVED_KEY_ATTR "��ȣȭ�� Ű" + IDS_CRL_SELF_CDP "�� CRL ��ġ" + IDS_REQUIRE_CERT_CHAIN_POLICY "�� ü�� å(Enforce Certificate Chain Policy)" + IDS_TRANSACTION_ID "ó�� Id" + IDS_SENDER_NONCE "�ӽ� �߼��" + IDS_RECIPIENT_NONCE "�ӽ� ��" + IDS_REG_INFO "�� " + IDS_GET_CERTIFICATE "�� " + IDS_GET_CRL "CRL ��" + IDS_REVOKE_REQUEST "�� û" + IDS_QUERY_PENDING "��ϴ� ��" + IDS_SORTED_CTL "�� ŷ� ��" + IDS_ARCHIVED_KEY_CERT_HASH "�� Ű �� ؽ�" + IDS_PRIVATE_KEY_USAGE_PERIOD "�� Ű �� Ⱓ" + IDS_CLIENT_INFORMATION "Ŭ��̾�Ʈ ��" + IDS_SERVER_AUTHENTICATION "�� " + IDS_CLIENT_AUTHENTICATION "Ŭ��̾�Ʈ ��" + IDS_CODE_SIGNING "�ڵ� ��" + IDS_SECURE_EMAIL "�� ̸��" + IDS_TIME_STAMPING "�ð� ��" + IDS_MICROSOFT_TRUST_LIST_SIGNING "��ũ�μ��Ʈ �ŷ� �� " + IDS_MICROSOFT_TIME_STAMPING "��ũ�μ��Ʈ �ð� ��" + IDS_IPSEC_END_SYSTEM "IP �� ý��" + IDS_IPSEC_TUNNEL "IP �� ͳ� ��(tunnel termination)" + IDS_IPSEC_USER "IP �� " + IDS_EFS "��ȣȭ�� ý��" + IDS_WHQL_CRYPTO "�� ϵ�� ̹� ��" + IDS_NT5_CRYPTO "�� ý�� " + IDS_OEM_WHQL_CRYPTO "OEM �� ý�� " + IDS_EMBEDDED_NT_CRYPTO "�� ý�� " + IDS_KEY_PACK_LICENSES "Ű �� ̼��" + IDS_LICENSE_SERVER "��̼�� " + IDS_SMART_CARD_LOGON "��Ʈ ī�� α��" + IDS_DIGITAL_RIGHTS "�� ۱�" + IDS_QUALIFIED_SUBORDINATION "�ڰ��ִ� ��Ӱ��" + IDS_KEY_RECOVERY "Ű ��" + IDS_DOCUMENT_SIGNING "�� " + IDS_IPSEC_IKE_INTERMEDIATE "IP �� IKE ��(intermediate)" + IDS_FILE_RECOVERY "�� " + IDS_ROOT_LIST_SIGNER "��Ʈ �� " + IDS_ANY_APPLICATION_POLICIES "�� Ǯ�׸�� ħ" + IDS_DS_EMAIL_REPLICATION "��丮 �� ̸�� " + IDS_ENROLLMENT_AGENT "�� 䱸 ��" + IDS_LIFETIME_SIGNING "�� " + IDS_ANY_CERT_POLICY "�� ħ" +}

1 0

Mike McCormack : msvcrt: Add a stub for _wsetlocale.
by Alexandre Julliard 28 Feb '06

28 Feb '06

Module: wine Branch: refs/heads/master Commit: d16c72dea57e783b76137bdb885df28d0dd36678 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d16c72dea57e783b76137bd… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Feb 28 13:15:50 2006 +0900 msvcrt: Add a stub for _wsetlocale. --- dlls/msvcrt/locale.c | 13 +++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index d62ae1d..b3cef2d 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -464,6 +464,19 @@ char* MSVCRT_setlocale(int category, con return MSVCRT_current_lc_all; } +/********************************************************************* + * setlocale (MSVCRT.@) + */ +MSVCRT_wchar_t* MSVCRT__wsetlocale(int category, const MSVCRT_wchar_t* locale) +{ + static MSVCRT_wchar_t fake[] = { + 'E','n','g','l','i','s','h','_','U','n','i','t','e','d',' ', + 'S','t','a','t','e','s','.','1','2','5','2',0 }; + + FIXME("%d %s\n", category, debugstr_w(locale)); + + return fake; +} /********************************************************************* * _Getdays (MSVCRT.@) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 9f68417..117014e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -541,7 +541,7 @@ @ cdecl _write(long ptr long) @ cdecl _wrmdir(wstr) @ stub _wsearchenv #(wstr wstr ptr) -@ stub _wsetlocale #(long wstr) +@ cdecl _wsetlocale(long wstr) MSVCRT__wsetlocale @ varargs _wsopen (wstr long long) MSVCRT__wsopen @ stub _wspawnl #(long wstr wstr) varargs @ stub _wspawnle #(long wstr wstr) varargs

1 0

Kovács András : winecfg: New Hungarian language resource.
by Alexandre Julliard 28 Feb '06

28 Feb '06

Module: wine Branch: refs/heads/master Commit: 20d5741fd19093342a0c1d03a5948b5118a9393c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=20d5741fd19093342a0c1d0… Author: Kovács András <andras(a)csevego.net> Date: Mon Feb 27 20:33:05 2006 +0100 winecfg: New Hungarian language resource. --- programs/winecfg/Hu.rc | 224 +++++++++++++++++++++++++++++++++++++++++++ programs/winecfg/winecfg.rc | 1 2 files changed, 225 insertions(+), 0 deletions(-) create mode 100644 programs/winecfg/Hu.rc Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=20d5741fd19093342a0…

1 0

Francois Gouget : d3d8: Remove spaces before '\n'.
by Alexandre Julliard 28 Feb '06

28 Feb '06

Module: wine Branch: refs/heads/master Commit: 555a06075f5f88a2a343f1a35eef2b5461a2e0ce URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=555a06075f5f88a2a343f1a… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 27 20:59:20 2006 +0100 d3d8: Remove spaces before '\n'. --- dlls/d3d8/device.c | 16 ++++++++-------- dlls/d3d8/directx.c | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index ac3b39e..fc3e8b9 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -125,7 +125,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_GetD HRESULT hrc = D3D_OK; WINED3DCAPS *pWineCaps; - TRACE("(%p) : Relay pCaps %p \n", This, pCaps); + TRACE("(%p) : Relay pCaps %p\n", This, pCaps); if(NULL == pCaps){ return D3DERR_INVALIDCALL; } @@ -771,7 +771,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_Appl IDirect3DStateBlock8Impl *pSB = (IDirect3DStateBlock8Impl*) Token; IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; - TRACE("(%p) %p Relay \n", This, pSB); + TRACE("(%p) %p Relay\n", This, pSB); return IWineD3DStateBlock_Apply(pSB->wineD3DStateBlock); } @@ -780,7 +780,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_Capt IDirect3DStateBlock8Impl* pSB = (IDirect3DStateBlock8Impl *)Token; IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; - TRACE("(%p) %p Relay \n", This, pSB); + TRACE("(%p) %p Relay\n", This, pSB); return IWineD3DStateBlock_Capture(pSB->wineD3DStateBlock); } @@ -789,7 +789,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_Dele IDirect3DStateBlock8Impl* pSB = (IDirect3DStateBlock8Impl *)Token; IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; - TRACE("(%p) Relay \n", This); + TRACE("(%p) Relay\n", This); while(IUnknown_Release((IUnknown *)pSB)); @@ -855,7 +855,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_GetT IWineD3DBaseTexture_GetParent(retTexture, (IUnknown **)ppTexture); IWineD3DBaseTexture_Release(retTexture); } else { - FIXME("Call to get texture (%ld) failed (%p) \n", Stage, retTexture); + FIXME("Call to get texture (%ld) failed (%p)\n", Stage, retTexture); *ppTexture = NULL; } @@ -1080,7 +1080,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetV IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hrc = D3D_OK; - TRACE("(%p) : Relay \n", This); + TRACE("(%p) : Relay\n", This); if (VS_HIGHESTFIXEDFXF >= pShader) { TRACE("Setting FVF, %d %ld\n", VS_HIGHESTFIXEDFXF, pShader); IWineD3DDevice_SetFVF(This->WineD3DDevice, pShader); @@ -1094,7 +1094,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetV /* hrc = IWineD3DDevice_SetVertexShader(This->WineD3DDevice, 0 == shader ? NULL : shader->wineD3DVertexShader); */ } } - TRACE("(%p) : returning hr(%lu) \n", This, hrc); + TRACE("(%p) : returning hr(%lu)\n", This, hrc); return hrc; } @@ -1104,7 +1104,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_GetV IWineD3DVertexShader *pShader; HRESULT hrc = D3D_OK; - TRACE("(%p) : Relay device@%p \n", This, This->WineD3DDevice); + TRACE("(%p) : Relay device@%p\n", This, This->WineD3DDevice); hrc = IWineD3DDevice_GetVertexShader(This->WineD3DDevice, &pShader); if (D3D_OK == hrc) { if(0 != pShader) { diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 1366fc6..b0b0971 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -286,7 +286,7 @@ HRESULT WINAPI IDirect3D8Impl_CreateDe IDirect3DDevice8Impl *object = NULL; WINED3DPRESENT_PARAMETERS localParameters; HRESULT hr; - TRACE("(%p) Relay \n", This); + TRACE("(%p) Relay\n", This); /* Check the validity range of the adapter parameter */ if (Adapter >= IDirect3D8Impl_GetAdapterCount(iface)) {

1 0