November 2010 - Wine-commits

Detlef Riekenberg : crypt32/tests: CertAddCertificateLinkToStore is not present on W98.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: 5e17fe9a51ec14f37534bca77e2aee1fdb0dfb37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e17fe9a51ec14f37534bca77… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 2 23:41:58 2010 +0100 crypt32/tests: CertAddCertificateLinkToStore is not present on W98. --- dlls/crypt32/tests/store.c | 32 ++++++++++++++++++++------------ 1 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 10a85a3..c9103e9 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -102,6 +102,7 @@ static BOOL (WINAPI *pCertEnumSystemStore)(DWORD,void*,void*,PFN_CERT_ENUM_SYSTE static BOOL (WINAPI *pCertGetStoreProperty)(HCERTSTORE,DWORD,void*,DWORD*); static void (WINAPI *pCertRemoveStoreFromCollection)(HCERTSTORE,HCERTSTORE); static BOOL (WINAPI *pCertSetStoreProperty)(HCERTSTORE,DWORD,DWORD,const void*); +static BOOL (WINAPI *pCertAddCertificateLinkToStore)(HCERTSTORE,PCCERT_CONTEXT,DWORD,PCCERT_CONTEXT*); static void testMemStore(void) { @@ -633,7 +634,7 @@ static void testCollectionStore(void) ok(ret, "CertAddEncodedCertificateToStore failed: %08x\n", GetLastError()); CertDeleteCertificateFromStore(context); - CertAddStoreToCollection(collection, store1, + pCertAddStoreToCollection(collection, store1, CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0); ret = CertAddEncodedCertificateToStore(collection, X509_ASN_ENCODING, @@ -2189,26 +2190,32 @@ static void testAddCertificateLink(void) WCHAR filename1[MAX_PATH], filename2[MAX_PATH]; HANDLE file; + if (!pCertAddCertificateLinkToStore) + { + win_skip("CertAddCertificateLinkToStore not found\n"); + return; + } + if (0) { /* Crashes, i.e. the store is dereferenced without checking. */ - ret = CertAddCertificateLinkToStore(NULL, NULL, 0, NULL); + ret = pCertAddCertificateLinkToStore(NULL, NULL, 0, NULL); } /* Adding a certificate link to a store requires a valid add disposition */ store1 = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); SetLastError(0xdeadbeef); - ret = CertAddCertificateLinkToStore(store1, NULL, 0, NULL); + ret = pCertAddCertificateLinkToStore(store1, NULL, 0, NULL); ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); source = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert, sizeof(bigCert)); SetLastError(0xdeadbeef); - ret = CertAddCertificateLinkToStore(store1, source, 0, NULL); + ret = pCertAddCertificateLinkToStore(store1, source, 0, NULL); ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); - ret = CertAddCertificateLinkToStore(store1, source, CERT_STORE_ADD_ALWAYS, + ret = pCertAddCertificateLinkToStore(store1, source, CERT_STORE_ADD_ALWAYS, NULL); ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError()); if (0) @@ -2216,14 +2223,14 @@ static void testAddCertificateLink(void) /* Crashes, i.e. the source certificate is dereferenced without * checking when a valid add disposition is given. */ - ret = CertAddCertificateLinkToStore(store1, NULL, CERT_STORE_ADD_ALWAYS, + ret = pCertAddCertificateLinkToStore(store1, NULL, CERT_STORE_ADD_ALWAYS, NULL); } CertCloseStore(store1, 0); store1 = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); - ret = CertAddCertificateLinkToStore(store1, source, CERT_STORE_ADD_ALWAYS, + ret = pCertAddCertificateLinkToStore(store1, source, CERT_STORE_ADD_ALWAYS, &linked); ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError()); if (ret) @@ -2295,7 +2302,7 @@ static void testAddCertificateLink(void) /* Test adding a link to a memory store. */ store2 = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); - ret = CertAddCertificateLinkToStore(store2, source, CERT_STORE_ADD_ALWAYS, + ret = pCertAddCertificateLinkToStore(store2, source, CERT_STORE_ADD_ALWAYS, &linked); ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError()); if (ret) @@ -2355,7 +2362,7 @@ static void testAddCertificateLink(void) ok(store2 != NULL, "CertOpenStore failed: %08x\n", GetLastError()); CloseHandle(file); /* Test adding a link to a file store. */ - ret = CertAddCertificateLinkToStore(store2, source, CERT_STORE_ADD_ALWAYS, + ret = pCertAddCertificateLinkToStore(store2, source, CERT_STORE_ADD_ALWAYS, &linked); ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError()); if (ret) @@ -2397,7 +2404,7 @@ static void testAddCertificateLink(void) source = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert, sizeof(bigCert)); SetLastError(0xdeadbeef); - ret = CertAddCertificateLinkToStore(store1, source, CERT_STORE_ADD_ALWAYS, + ret = pCertAddCertificateLinkToStore(store1, source, CERT_STORE_ADD_ALWAYS, &linked); ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); @@ -2424,7 +2431,7 @@ static void testAddCertificateLink(void) ok(store2 != NULL, "CertOpenStore failed: %08x\n", GetLastError()); CloseHandle(file); - ret = CertAddCertificateLinkToStore(store2, source, CERT_STORE_ADD_ALWAYS, + ret = pCertAddCertificateLinkToStore(store2, source, CERT_STORE_ADD_ALWAYS, &linked); ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError()); if (ret) @@ -2447,7 +2454,7 @@ static void testAddCertificateLink(void) store2 = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY, 0, 0, CERT_SYSTEM_STORE_CURRENT_USER, WineTestW); ok(store2 != NULL, "CertOpenStore failed: %08x\n", GetLastError()); - ret = CertAddCertificateLinkToStore(store2, source, CERT_STORE_ADD_ALWAYS, + ret = pCertAddCertificateLinkToStore(store2, source, CERT_STORE_ADD_ALWAYS, &linked); ok(ret, "CertAddCertificateLinkToStore failed: %08x\n", GetLastError()); if (ret) @@ -2573,6 +2580,7 @@ START_TEST(store) pCertGetStoreProperty = (void*)GetProcAddress(hdll, "CertGetStoreProperty"); pCertRemoveStoreFromCollection = (void*)GetProcAddress(hdll, "CertRemoveStoreFromCollection"); pCertSetStoreProperty = (void*)GetProcAddress(hdll, "CertSetStoreProperty"); + pCertAddCertificateLinkToStore = (void*)GetProcAddress(hdll, "CertAddCertificateLinkToStore"); /* various combinations of CertOpenStore */ testMemStore();

1 0

Detlef Riekenberg : crypt32/test: When using dynamic binding for functions, do it in all locations.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: 661a8f3787682c6ff134e4c315cc755667af7530 URL: http://source.winehq.org/git/wine.git/?a=commit;h=661a8f3787682c6ff134e4c31… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 2 23:41:59 2010 +0100 crypt32/test: When using dynamic binding for functions, do it in all locations. --- dlls/crypt32/tests/chain.c | 16 ++++++++-------- dlls/crypt32/tests/crl.c | 24 ++++++++++++------------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index c172fe5..11f297c 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3695,7 +3695,7 @@ static void testGetCertChain(void) { ok(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_VALID_FOR_USAGE, "expected CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n"); - CertFreeCertificateChain(chain); + pCertFreeCertificateChain(chain); } oids[0] = oid_server_auth; ret = pCertGetCertificateChain(NULL, cert, &fileTime, store, &para, @@ -3706,7 +3706,7 @@ static void testGetCertChain(void) ok(!(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_VALID_FOR_USAGE), "didn't expect CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n"); - CertFreeCertificateChain(chain); + pCertFreeCertificateChain(chain); } oids[1] = one_two_three; para.RequestedUsage.Usage.cUsageIdentifier = 2; @@ -3718,7 +3718,7 @@ static void testGetCertChain(void) { ok(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_VALID_FOR_USAGE, "expected CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n"); - CertFreeCertificateChain(chain); + pCertFreeCertificateChain(chain); } para.RequestedUsage.dwType = USAGE_MATCH_TYPE_OR; ret = pCertGetCertificateChain(NULL, cert, &fileTime, store, &para, @@ -3729,7 +3729,7 @@ static void testGetCertChain(void) ok(!(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_VALID_FOR_USAGE), "didn't expect CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n"); - CertFreeCertificateChain(chain); + pCertFreeCertificateChain(chain); } CertCloseStore(store, 0); CertFreeCertificateContext(cert); @@ -4443,7 +4443,7 @@ static void check_ssl_policy(void) CertAddEncodedCertificateToStore(testRoot, X509_ASN_ENCODING, chain0_0, sizeof(chain0_0), CERT_STORE_ADD_ALWAYS, NULL); engineConfig.hExclusiveRoot = testRoot; - if (!CertCreateCertificateChainEngine(&engineConfig, &engine)) + if (!pCertCreateCertificateChainEngine(&engineConfig, &engine)) { skip("Couldn't create chain engine\n"); return; @@ -4464,7 +4464,7 @@ static void check_ssl_policy(void) sslPolicyPara.fdwChecks |= SECURITY_FLAG_IGNORE_CERT_CN_INVALID; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_SSL, engine, winehqPolicyCheckWithMatchingName, &oct2007, &policyPara); - CertFreeCertificateChainEngine(engine); + pCertFreeCertificateChainEngine(engine); CertCloseStore(testRoot, 0); /* Test chain30, which has an invalid critical extension in an intermediate * cert, against the SSL policy. @@ -4553,9 +4553,9 @@ START_TEST(chain) pCertVerifyCertificateChainPolicy = (void*)GetProcAddress(hCrypt32, "CertVerifyCertificateChainPolicy"); testCreateCertChainEngine(); - if (!pCertGetCertificateChain) + if (!pCertGetCertificateChain || !pCertFreeCertificateChain) { - win_skip("CertGetCertificateChain() is not available\n"); + win_skip("Cert*CertificateChain functions not available\n"); } else { diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index bb62219..214d612 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -408,9 +408,9 @@ static void testFindCRL(void) BOOL ret; if (!store) return; - if (!pCertFindCRLInStore) + if (!pCertFindCRLInStore || !pCertFindCertificateInCRL) { - win_skip("CertFindCRLInStore() is not available\n"); + win_skip("CertFindCRLInStore or CertFindCertificateInCRL not available\n"); return; } @@ -521,7 +521,7 @@ static void testFindCRL(void) PCRL_ENTRY entry; count++; - if (CertFindCertificateInCRL(cert, context, 0, NULL, &entry) && + if (pCertFindCertificateInCRL(cert, context, 0, NULL, &entry) && entry) revoked_count++; } @@ -557,7 +557,7 @@ static void testFindCRL(void) PCRL_ENTRY entry; count++; - if (CertFindCertificateInCRL(cert, context, 0, NULL, &entry) && + if (pCertFindCertificateInCRL(cert, context, 0, NULL, &entry) && entry) revoked_count++; } @@ -586,7 +586,7 @@ static void testFindCRL(void) PCRL_ENTRY entry; count++; - if (CertFindCertificateInCRL(cert, context, 0, NULL, &entry) && + if (pCertFindCertificateInCRL(cert, context, 0, NULL, &entry) && entry) revoked_count++; } @@ -626,7 +626,7 @@ static void testFindCRL(void) PCRL_ENTRY entry; count++; - if (CertFindCertificateInCRL(endCert, context, 0, NULL, &entry) && + if (pCertFindCertificateInCRL(endCert, context, 0, NULL, &entry) && entry) revoked_count++; } @@ -646,7 +646,7 @@ static void testFindCRL(void) PCRL_ENTRY entry; count++; - if (CertFindCertificateInCRL(endCert, context, 0, NULL, &entry) && + if (pCertFindCertificateInCRL(endCert, context, 0, NULL, &entry) && entry) revoked_count++; } @@ -663,7 +663,7 @@ static void testFindCRL(void) PCRL_ENTRY entry; count++; - if (CertFindCertificateInCRL(endCert, context, 0, NULL, &entry) && + if (pCertFindCertificateInCRL(endCert, context, 0, NULL, &entry) && entry) revoked_count++; } @@ -680,7 +680,7 @@ static void testFindCRL(void) PCRL_ENTRY entry; count++; - if (CertFindCertificateInCRL(endCert, context, 0, NULL, &entry) && + if (pCertFindCertificateInCRL(endCert, context, 0, NULL, &entry) && entry) revoked_count++; } @@ -697,7 +697,7 @@ static void testFindCRL(void) PCRL_ENTRY entry; count++; - if (CertFindCertificateInCRL(rootCert, context, 0, NULL, &entry) && + if (pCertFindCertificateInCRL(rootCert, context, 0, NULL, &entry) && entry) revoked_count++; } @@ -716,7 +716,7 @@ static void testFindCRL(void) PCRL_ENTRY entry; count++; - if (CertFindCertificateInCRL(endCert, context, 0, NULL, &entry) && + if (pCertFindCertificateInCRL(endCert, context, 0, NULL, &entry) && entry) revoked_count++; } @@ -734,7 +734,7 @@ static void testFindCRL(void) PCRL_ENTRY entry; count++; - if (CertFindCertificateInCRL(endCert, context, 0, NULL, &entry) && + if (pCertFindCertificateInCRL(endCert, context, 0, NULL, &entry) && entry) revoked_count++; }

1 0

Paul Vriens : winedbg: Update Serbian (Latin) translations.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: 9d5fc41ef695ed1ec7c6e06820b8ffe2e84e4ceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d5fc41ef695ed1ec7c6e0682… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 2 21:10:18 2010 +0100 winedbg: Update Serbian (Latin) translations. Translation by Đorđe Vasiljević. --- programs/winedbg/rsrc_Sr.rc | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/programs/winedbg/rsrc_Sr.rc b/programs/winedbg/rsrc_Sr.rc index be8b308..a329ba2 100644 --- a/programs/winedbg/rsrc_Sr.rc +++ b/programs/winedbg/rsrc_Sr.rc @@ -3,6 +3,7 @@ * * Copyright 2010 Nenad Vujic * Paul Vriens + * Copyright 2010 Đorđe Vasiljević * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,7 +22,6 @@ #include "resource.h" -/* UTF-8 */ #pragma code_page(65001) LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN @@ -30,28 +30,30 @@ IDM_DEBUG_POPUP MENU BEGIN POPUP "" BEGIN - MENUITEM "&Debagovanje", ID_DEBUG + MENUITEM "&Otklanjač grešaka", ID_DEBUG END END IDD_CRASH_DLG DIALOGEX 100, 100, 273, 175 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Greška programa" +CAPTION "Programska greška" FONT 8, "Tahoma" BEGIN LTEXT "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0 - LTEXT "Program %s ima ozbiljan problem i mora biti zatvoren. Izvinjavamo se zbog neudobnosti.", + LTEXT "Program %s je naišao na ozbiljan problem i mora \ + biti zatvoren. Izvinjavamo se zbog neprijatnosti.", IDC_STATIC_TXT1,27,10,224,30 - LTEXT "Ovo može biti problem programa ili disfunkcije u Wine-u. \ - Pogledajte http://appdb.winehq.org za savete za pokretanje ove aplikacije.\n\n\ - Ako nemate ovaj problem pod Windows i nije prijavljen \ - još, možete prijaviti na http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100 + LTEXT "Uzrok ovome može biti problem u programu ili nedostatak u Wine-u. \ + Proverite http://appdb.winehq.org za savete o pokretanju \ + ovog programa.\n\n\ + Ako ovaj problem nije prisutan pod Windows-om i još uvek nije \ + prijavljen, prijavite ga na http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100 DEFPUSHBUTTON "Zatvori", IDOK, 205, 151, 60, 16, WS_TABSTOP END STRINGTABLE BEGIN - IDS_AUTO_CAPTION "Wine program greška" - IDS_INVALID_PARAMS "Interna greška - loši parametri programa" - IDS_UNIDENTIFIED "(Nedefinisano)" + IDS_AUTO_CAPTION "Pad Wine programa" + IDS_INVALID_PARAMS "Unutrašnje greške — primljeni su neispravni parametri" + IDS_UNIDENTIFIED "(neidentifikovano)" END

1 0

Paul Vriens : winedbg: Add the Serbian (Cyrillic) translation.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: 1987b0d748a0fb3efd551a18c01b67ed9e04692f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1987b0d748a0fb3efd551a18c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 2 21:17:04 2010 +0100 winedbg: Add the Serbian (Cyrillic) translation. Translation by Đorđe Vasiljević. --- programs/winedbg/rsrc_Sr.rc | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/rsrc_Sr.rc b/programs/winedbg/rsrc_Sr.rc index a329ba2..5692e58 100644 --- a/programs/winedbg/rsrc_Sr.rc +++ b/programs/winedbg/rsrc_Sr.rc @@ -24,6 +24,40 @@ #pragma code_page(65001) +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +IDM_DEBUG_POPUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Отклањач грешака", ID_DEBUG + END +END + +IDD_CRASH_DLG DIALOGEX 100, 100, 273, 175 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Програмска грешка" +FONT 8, "Tahoma" +BEGIN + LTEXT "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0 + LTEXT "Програм %s је наишао на озбиљан проблем и мора \ + бити затворен. Извињавамо се због непријатности.", + IDC_STATIC_TXT1,27,10,224,30 + LTEXT "Узрок овоме може бити проблем у програму или недостатак у Wine-у. \ + Проверите http://appdb.winehq.org за савете о покретању \ + овог програма.\n\n\ + Ако овај проблем није присутан под Windows-ом и још увек није \ + пријављен, пријавите га на http://bugs.winehq.org.",IDC_STATIC_TXT2,27,60,224,100 + DEFPUSHBUTTON "Затвори", IDOK, 205, 151, 60, 16, WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_AUTO_CAPTION "Пад Wine програма" + IDS_INVALID_PARAMS "Унутрашње грешке — примљени су неисправни параметри" + IDS_UNIDENTIFIED "(неидентификовано)" +END + LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN IDM_DEBUG_POPUP MENU

1 0

Paul Vriens : mapi32: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: 60356ffe63649961419b632bd4abeb02187fbd3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=60356ffe63649961419b632bd… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 2 21:19:50 2010 +0100 mapi32: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/mapi32/Makefile.in | 1 + dlls/mapi32/Sr.rc | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index 4ef119f..31ec356 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -30,6 +30,7 @@ RC_SRCS = \ Ro.rc \ Ru.rc \ Si.rc \ + Sr.rc \ Sv.rc \ Uk.rc \ version.rc diff --git a/dlls/mapi32/Sr.rc b/dlls/mapi32/Sr.rc new file mode 100644 index 0000000..7e83e4f --- /dev/null +++ b/dlls/mapi32/Sr.rc @@ -0,0 +1,41 @@ +/* +* MAPI32 Serbian resources +* +* Copyright 2009 Owen Rudge for CodeWeavers +* Copyright 2010 Đorđe Vasiljević +* +* 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 +* +*/ + +#include "res.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +STRINGTABLE +{ + IDS_NO_MAPI_CLIENT, "Слање поруке није успело јер MAPI поштански клијент није инсталиран." + IDS_SEND_MAIL, "Пошаљи поруку" +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +STRINGTABLE +{ + IDS_NO_MAPI_CLIENT, "Slanje poruke nije uspelo jer MAPI poštanski klijent nije instaliran." + IDS_SEND_MAIL, "Pošalji poruku" +}

1 0

Paul Vriens : mpr: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: 60c9d468b15512efc834c3f481c509179245b38c URL: http://source.winehq.org/git/wine.git/?a=commit;h=60c9d468b15512efc834c3f48… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 2 21:21:35 2010 +0100 mpr: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/mpr/Makefile.in | 1 + dlls/mpr/mpr_Sr.rc | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 0 deletions(-) diff --git a/dlls/mpr/Makefile.in b/dlls/mpr/Makefile.in index 17e9ec1..83e78b7 100644 --- a/dlls/mpr/Makefile.in +++ b/dlls/mpr/Makefile.in @@ -32,6 +32,7 @@ RC_SRCS = \ mpr_Ro.rc \ mpr_Ru.rc \ mpr_Si.rc \ + mpr_Sr.rc \ mpr_Sv.rc \ mpr_Tr.rc \ mpr_Uk.rc \ diff --git a/dlls/mpr/mpr_Sr.rc b/dlls/mpr/mpr_Sr.rc new file mode 100644 index 0000000..e50729e --- /dev/null +++ b/dlls/mpr/mpr_Sr.rc @@ -0,0 +1,78 @@ +/* + * MPR dll Serbian resources + * + * Copyright 2004 Juan Lang + * Copyright 2010 Đorđe Vasiljević + * + * 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 + */ + +#include "mprres.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +STRINGTABLE +{ + IDS_ENTIRENETWORK "Цела мрежа" +} + +IDD_PROXYDLG DIALOG 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Унос мрежне лозинке" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Унесите своје корисничко име и лозинку:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Посредник", -1, 40, 26, 50, 10 +/* LTEXT "Област", -1, 40, 46, 50, 10 */ + LTEXT "Корисничко име", -1, 40, 66, 50, 10 + LTEXT "Лозинка", -1, 40, 86, 50, 10 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Сачувај ову лозинку (несигурно)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "У реду", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Откажи", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +STRINGTABLE +{ + IDS_ENTIRENETWORK "Cela mreža" +} + +IDD_PROXYDLG DIALOG 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Unos mrežne lozinke" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Unesite svoje korisničko ime i lozinku:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Posrednik", -1, 40, 26, 50, 10 +/* LTEXT "Oblast", -1, 40, 46, 50, 10 */ + LTEXT "Korisničko ime", -1, 40, 66, 50, 10 + LTEXT "Lozinka", -1, 40, 86, 50, 10 + LTEXT "", IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "", IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Sačuvaj ovu lozinku (nesigurno)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "U redu", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Otkaži", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +}

1 0

Rico Schüller : include: Add ID3D10ShaderReflection1 interface.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: 5fb34ab4e2a17bcbf1e24a40ad1eca2a0eacc782 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb34ab4e2a17bcbf1e24a40a… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Nov 1 22:18:49 2010 +0100 include: Add ID3D10ShaderReflection1 interface. --- include/Makefile.in | 1 + include/d3d10_1shader.h | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 70fa9f0..d112efa 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -151,6 +151,7 @@ SRCDIR_INCLUDES = \ custcntl.h \ cvconst.h \ d3d.h \ + d3d10_1shader.h \ d3d10effect.h \ d3d10misc.h \ d3d10shader.h \ diff --git a/include/d3d10_1shader.h b/include/d3d10_1shader.h new file mode 100644 index 0000000..6eda20c --- /dev/null +++ b/include/d3d10_1shader.h @@ -0,0 +1,52 @@ +/* + * Copyright 2010 Rico Schüller + * + * 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 + */ + +#ifndef __D3D10_1SHADER_H__ +#define __D3D10_1SHADER_H__ + +#include "d3d10shader.h" + +DEFINE_GUID(IID_ID3D10ShaderReflection1, 0xc3457783, 0xa846, 0x47ce, 0x95, 0x20, 0xce, 0xa6, 0xf6, 0x6e, 0x74, 0x47); + +#define INTERFACE ID3D10ShaderReflection1 +DECLARE_INTERFACE_(ID3D10ShaderReflection1, IUnknown) +{ + /* IUnknown methods */ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *object) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /* ID3D10ShaderReflection1 methods */ + STDMETHOD(GetDesc)(THIS_ D3D10_SHADER_DESC *desc) PURE; + STDMETHOD_(struct ID3D10ShaderReflectionConstantBuffer *, GetConstantBufferByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10ShaderReflectionConstantBuffer *, GetConstantBufferByName)(THIS_ LPCSTR name) PURE; + STDMETHOD(GetResourceBindingDesc)(THIS_ UINT index, D3D10_SHADER_INPUT_BIND_DESC *desc) PURE; + STDMETHOD(GetInputParameterDesc)(THIS_ UINT index, D3D10_SIGNATURE_PARAMETER_DESC *desc) PURE; + STDMETHOD(GetOutputParameterDesc)(THIS_ UINT index, D3D10_SIGNATURE_PARAMETER_DESC *desc) PURE; + STDMETHOD_(struct ID3D10ShaderReflectionVariable *, GetVariableByName)(THIS_ LPCSTR name) PURE; + STDMETHOD(GetResourceBindingDescByName)(THIS_ LPCSTR name, D3D10_SHADER_INPUT_BIND_DESC *desc) PURE; + STDMETHOD(GetMovInstructionCount)(THIS_ UINT *count) PURE; + STDMETHOD(GetMovcInstructionCount)(THIS_ UINT *count) PURE; + STDMETHOD(GetConversionInstructionCount)(THIS_ UINT *count) PURE; + STDMETHOD(GetBitwiseInstructionCount)(THIS_ UINT *count) PURE; + STDMETHOD(GetGSInputPrimitive)(THIS_ D3D10_PRIMITIVE *prim) PURE; + STDMETHOD(IsLevel9Shader)(THIS_ BOOL *level9shader) PURE; + STDMETHOD(IsSampleFrequencyShader)(THIS_ BOOL *samplefrequency) PURE; +}; +#undef INTERFACE + +#endif

1 0

Rico Schüller : dxguid: Add shader and dx11 includes to dx10guid.c.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: 257c4b687a37f99c12fdc160bf15edcfd58a96bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=257c4b687a37f99c12fdc160b… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Nov 1 22:18:53 2010 +0100 dxguid: Add shader and dx11 includes to dx10guid.c. --- dlls/dxguid/dx10guid.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/dxguid/dx10guid.c b/dlls/dxguid/dx10guid.c index de6490f..1d07a4d 100644 --- a/dlls/dxguid/dx10guid.c +++ b/dlls/dxguid/dx10guid.c @@ -31,4 +31,7 @@ #include "olectl.h" #include "initguid.h" -#include "d3d10.h" +#include "d3d10_1.h" +#include "d3d11.h" +#include "d3d10_1shader.h" +#include "d3d11shader.h"

1 0

Rico Schüller : d3dcompiler: Add stub ID3D11ShaderReflection interface.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: a7cf4d16fada5d76ba3c570e2eb21543f7249794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7cf4d16fada5d76ba3c570e2… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Nov 1 22:18:56 2010 +0100 d3dcompiler: Add stub ID3D11ShaderReflection interface. --- dlls/d3dcompiler_43/Makefile.in | 1 + dlls/d3dcompiler_43/d3dcompiler_43_main.c | 18 ++- dlls/d3dcompiler_43/d3dcompiler_private.h | 8 + dlls/d3dcompiler_43/reflection.c | 243 +++++++++++++++++++++++++++++ 4 files changed, 269 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a7cf4d16fada5d76ba3c5…

1 0

Eryk Wieliczko : comdlg32: GetSaveFileName: Don't append .* extension.
by Alexandre Julliard 02 Nov '10

02 Nov '10

Module: wine Branch: master Commit: bd0fe7d26bafebc2e51ec54d354bf1e41bc3892e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd0fe7d26bafebc2e51ec54d3… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Mon Nov 1 12:35:43 2010 +0100 comdlg32: GetSaveFileName: Don't append .* extension. --- dlls/comdlg32/filedlg.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 2687029..f36d3a5 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2474,14 +2474,11 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) /* if no extension is specified with file name, then */ /* attach the extension from file filter or default one */ - WCHAR *filterExt = NULL; + const WCHAR *filterExt = NULL; LPWSTR lpstrFilter = NULL; static const WCHAR szwDot[] = {'.',0}; int PathLength = lstrlenW(lpstrPathAndFile); - /* Attach the dot*/ - lstrcatW(lpstrPathAndFile, szwDot); - /*Get the file extension from file type filter*/ lpstrFilter = (LPWSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, fodInfos->ofnInfos->nFilterIndex-1); @@ -2490,9 +2487,18 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) filterExt = PathFindExtensionW(lpstrFilter); if ( filterExt && *filterExt ) /* attach the file extension from file type filter*/ - lstrcatW(lpstrPathAndFile, filterExt + 1); + filterExt = filterExt + 1; else if ( fodInfos->defext ) /* attach the default file extension*/ - lstrcatW(lpstrPathAndFile, fodInfos->defext); + filterExt = fodInfos->defext; + + /* If extension is .*, ignore it */ + if (filterExt[0] != '*') + { + /* Attach the dot*/ + lstrcatW(lpstrPathAndFile, szwDot); + /* Attach the extension */ + lstrcatW(lpstrPathAndFile, filterExt ); + } /* In Open dialog: if file does not exist try without extension */ if (!(fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) && !PathFileExistsW(lpstrPathAndFile))

1 0