wine-commits November 2010

wine-commits@winehq.org

2 participants
866 discussions

Eric Pouech : msvcrt: Implemented _itow_s.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: af2bc15eddfea046a0b283bc7cd73fd4ba9bef78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af2bc15eddfea046a0b283bc7… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Nov 2 22:02:52 2010 +0100 msvcrt: Implemented _itow_s. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 77 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 81 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 2f23ff0..d4e5c38 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -836,7 +836,7 @@ @ cdecl _itoa(long ptr long) msvcrt._itoa @ cdecl _itoa_s(long ptr long long) msvcrt._itoa_s @ cdecl _itow(long ptr long) msvcrt._itow -@ stub _itow_s +@ cdecl _itow_s(long ptr long long) msvcrt._itow_s @ cdecl _j0(double) msvcrt._j0 @ cdecl _j1(double) msvcrt._j1 @ cdecl _jn(long double) msvcrt._jn diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 5f0198c..7fb8eca 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -682,7 +682,7 @@ @ cdecl _itoa(long ptr long) msvcrt._itoa @ cdecl _itoa_s(long ptr long long) msvcrt._itoa_s @ cdecl _itow(long ptr long) msvcrt._itow -@ stub _itow_s +@ cdecl _itow_s(long ptr long long) msvcrt._itow_s @ cdecl _j0(double) msvcrt._j0 @ cdecl _j1(double) msvcrt._j1 @ cdecl _jn(long double) msvcrt._jn diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 7a53b7b..c38e5f9 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -670,7 +670,7 @@ @ cdecl _itoa(long ptr long) msvcrt._itoa @ cdecl _itoa_s(long ptr long long) msvcrt._itoa_s @ cdecl _itow(long ptr long) msvcrt._itow -@ stub _itow_s +@ cdecl _itow_s(long ptr long long) msvcrt._itow_s @ cdecl _j0(double) msvcrt._j0 @ cdecl _j1(double) msvcrt._j1 @ cdecl _jn(long double) msvcrt._jn diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index eb0d8ec..a1cd124 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -611,7 +611,7 @@ @ cdecl _itoa(long ptr long) ntdll._itoa @ cdecl _itoa_s(long ptr long long) @ cdecl _itow(long ptr long) ntdll._itow -# stub _itow_s +@ cdecl _itow_s(long ptr long long) @ cdecl _j0(double) @ cdecl _j1(double) @ cdecl _jn(long double) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 6b3725f..3c4b53c 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -746,6 +746,83 @@ int CDECL _itoa_s(int value, char *str, MSVCRT_size_t size, int radix) } /********************************************************************* + * _itow_s (MSVCRT.@) + */ +int CDECL _itow_s(int value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix) +{ + unsigned int val, digit; + int is_negative; + MSVCRT_wchar_t buffer[33], *pos; + size_t len; + + if (!MSVCRT_CHECK_PMT(str != NULL) || !MSVCRT_CHECK_PMT(size > 0) || + !MSVCRT_CHECK_PMT(radix >= 2) || !MSVCRT_CHECK_PMT(radix <= 36)) + { + if (str && size) + str[0] = '\0'; + + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + if (value < 0 && radix == 10) + { + is_negative = 1; + val = -value; + } + else + { + is_negative = 0; + val = value; + } + + pos = buffer + 32; + *pos = '\0'; + + do + { + digit = val % radix; + val /= radix; + + if (digit < 10) + *--pos = '0' + digit; + else + *--pos = 'a' + digit - 10; + } + while (val != 0); + + if (is_negative) + *--pos = '-'; + + len = buffer + 33 - pos; + if (len > size) + { + size_t i; + MSVCRT_wchar_t *p = str; + + /* Copy the temporary buffer backwards up to the available number of + * characters. Don't copy the negative sign if present. */ + + if (is_negative) + { + p++; + size--; + } + + for (pos = buffer + 31, i = 0; i < size; i++) + *p++ = *pos--; + + MSVCRT_INVALID_PMT("str[size] is too small"); + str[0] = '\0'; + *MSVCRT__errno() = MSVCRT_ERANGE; + return MSVCRT_ERANGE; + } + + memcpy(str, pos, len * sizeof(MSVCRT_wchar_t)); + return 0; +} + +/********************************************************************* * _ui64toa_s (MSVCRT.@) */ int CDECL MSVCRT__ui64toa_s(unsigned __int64 value, char *str,

1 0

André Hentschel : wordpad: Replace obsolete styles.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: 347049bca8bfbe62026809cdda9a2228fd8d1500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=347049bca8bfbe62026809cdd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 2 19:56:20 2010 +0100 wordpad: Replace obsolete styles. --- programs/wordpad/wordpad.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 187aef0..db7546b 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -162,7 +162,7 @@ static void AddButton(HWND hwndToolBar, int nImage, int nCommand) button.iBitmap = nImage; button.idCommand = nCommand; button.fsState = TBSTATE_ENABLED; - button.fsStyle = TBSTYLE_BUTTON; + button.fsStyle = BTNS_BUTTON; button.dwData = 0; button.iString = -1; SendMessageW(hwndToolBar, TB_ADDBUTTONSW, 1, (LPARAM)&button); @@ -176,7 +176,7 @@ static void AddSeparator(HWND hwndToolBar) button.iBitmap = -1; button.idCommand = 0; button.fsState = 0; - button.fsStyle = TBSTYLE_SEP; + button.fsStyle = BTNS_SEP; button.dwData = 0; button.iString = -1; SendMessageW(hwndToolBar, TB_ADDBUTTONSW, 1, (LPARAM)&button); @@ -1818,7 +1818,7 @@ static LRESULT OnCreate( HWND hWnd ) if(!SendMessageW(hReBarWnd, RB_SETBARINFO, 0, (LPARAM)&rbi)) return -1; - hToolBarWnd = CreateToolbarEx(hReBarWnd, CCS_NOPARENTALIGN|CCS_NOMOVEY|WS_VISIBLE|WS_CHILD|TBSTYLE_TOOLTIPS|TBSTYLE_BUTTON, + hToolBarWnd = CreateToolbarEx(hReBarWnd, CCS_NOPARENTALIGN|CCS_NOMOVEY|WS_VISIBLE|WS_CHILD|TBSTYLE_TOOLTIPS|BTNS_BUTTON, IDC_TOOLBAR, 1, hInstance, IDB_TOOLBAR, NULL, 0, @@ -1880,7 +1880,7 @@ static LRESULT OnCreate( HWND hWnd ) SendMessageW(hReBarWnd, RB_INSERTBAND, -1, (LPARAM)&rbb); hFormatBarWnd = CreateToolbarEx(hReBarWnd, - CCS_NOPARENTALIGN | CCS_NOMOVEY | WS_VISIBLE | TBSTYLE_TOOLTIPS | TBSTYLE_BUTTON, + CCS_NOPARENTALIGN | CCS_NOMOVEY | WS_VISIBLE | TBSTYLE_TOOLTIPS | BTNS_BUTTON, IDC_FORMATBAR, 8, hInstance, IDB_FORMATBAR, NULL, 0, 16, 16, 16, 16, sizeof(TBBUTTON)); AddButton(hFormatBarWnd, 0, ID_FORMAT_BOLD);

1 0

André Hentschel : include: Add new button control styles.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: 61d237225f26b4eb33d8ecd2b17e75fc6e75ccbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=61d237225f26b4eb33d8ecd2b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 2 19:53:26 2010 +0100 include: Add new button control styles. --- include/commctrl.h | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 2261485..558591b 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -199,7 +199,6 @@ typedef struct tagNMCHAR #endif -/* This is only for Winelib applications. DON't use it wine itself!!! */ #ifndef SNDMSG #ifdef __cplusplus #define SNDMSG ::SendMessage @@ -1059,6 +1058,12 @@ typedef struct tagNMBCHOTITEM #define BST_HOT 0x0200 +/* Button control styles for _WIN32_WINNT >= 0x600 */ +#define BS_SPLITBUTTON 0x0000000C +#define BS_DEFSPLITBUTTON 0x0000000D +#define BS_COMMANDLINK 0x0000000E +#define BS_DEFCOMMANDLINK 0x0000000F + /* Toolbar */ #define TOOLBARCLASSNAMEA "ToolbarWindow32"

1 0

André Hentschel : include: Add BS_PUSHBOX.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: b2e1c2defebfd8cdb66bbadb207a1e0267d4dd10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2e1c2defebfd8cdb66bbadb2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 2 19:52:39 2010 +0100 include: Add BS_PUSHBOX. --- include/winuser.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index 9d07ef6..154c8da 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -710,6 +710,7 @@ typedef struct tagWINDOWPLACEMENT #define BS_GROUPBOX 0x00000007L #define BS_USERBUTTON 0x00000008L #define BS_AUTORADIOBUTTON 0x00000009L +#define BS_PUSHBOX 0x0000000AL #define BS_OWNERDRAW 0x0000000BL #define BS_TYPEMASK 0x0000000FL #define BS_LEFTTEXT 0x00000020L

1 0

Michael Stefaniuc : strmbase: Remove duplicate 'const' in strmbase.h.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: ac45ab3d8f5268252342bba53db2ca78c5ba796f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac45ab3d8f5268252342bba53… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 3 00:59:04 2010 +0100 strmbase: Remove duplicate 'const' in strmbase.h. --- dlls/strmbase/dllfunc.c | 2 +- include/wine/strmbase.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/strmbase/dllfunc.c b/dlls/strmbase/dllfunc.c index 35e373f..adb5655 100644 --- a/dlls/strmbase/dllfunc.c +++ b/dlls/strmbase/dllfunc.c @@ -136,7 +136,7 @@ static HRESULT SetupRegisterAllClasses(const FactoryTemplate * pList, int num, return hr; } -HRESULT WINAPI AMovieSetupRegisterFilter2( const AMOVIESETUP_FILTER const * pFilter, IFilterMapper2 *pIFM2, BOOL bRegister) +HRESULT WINAPI AMovieSetupRegisterFilter2(const AMOVIESETUP_FILTER *pFilter, IFilterMapper2 *pIFM2, BOOL bRegister) { if (!pFilter) return S_OK; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 21b6dfc..e79ab37 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -311,7 +311,7 @@ typedef struct tagFactoryTemplate { } FactoryTemplate; HRESULT WINAPI AMovieDllRegisterServer2(BOOL bRegister); -HRESULT WINAPI AMovieSetupRegisterFilter2( const AMOVIESETUP_FILTER const * pFilter, IFilterMapper2 *pIFM2, BOOL bRegister); +HRESULT WINAPI AMovieSetupRegisterFilter2(const AMOVIESETUP_FILTER *pFilter, IFilterMapper2 *pIFM2, BOOL bRegister); /* Dll Functions */ BOOL WINAPI STRMBASE_DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv);

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

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

Yaron Shahrabani : progman: Added Hebrew translation.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: 16047ebc391b3312c0ecef8045b7dc0087d69112 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16047ebc391b3312c0ecef804… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Mon Nov 1 23:17:07 2010 +0200 progman: Added Hebrew translation. --- programs/progman/He.rc | 223 ++++++++++++++++++++++++++++++++++++++++++ programs/progman/Makefile.in | 1 + 2 files changed, 224 insertions(+), 0 deletions(-) diff --git a/programs/progman/He.rc b/programs/progman/He.rc new file mode 100644 index 0000000..3311acd --- /dev/null +++ b/programs/progman/He.rc @@ -0,0 +1,223 @@ +/* + * Program Manager + * + * Copyright 1996 Ulrich Schmid + * Copyright 2002 Sylvain Petreolle + * Copyright 2010 Yaron Shahrabani <sh.yaron(a)gmail.com> + * + * 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 "progman.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +/* Menu */ + +MAIN_MENU MENU +{ + POPUP "&קובץ" { + MENUITEM "&חדש...", PM_NEW + MENUITEM "&פתיחה\tEnter", PM_OPEN + MENUITEM "ה&עברה...\tF7", PM_MOVE, GRAYED + MENUITEM "הע&תקה...\tF8", PM_COPY, GRAYED + MENUITEM "&מחיקה\tEntf", PM_DELETE + MENUITEM "מא&פיינים...\tAlt+Enter", PM_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "הפע&לה...", PM_EXECUTE + MENUITEM SEPARATOR + MENUITEM "י&ציאה מ־Windows...", PM_EXIT + } + POPUP "&אפשרויות" { + MENUITEM "&סידור אוטומטי", PM_AUTO_ARRANGE + MENUITEM "מ&זעור עם ההפעלה", PM_MIN_ON_RUN + MENUITEM "&שמירת ההגדרות עם היציאה", PM_SAVE_SETTINGS + } + POPUP "&חלונות" { + MENUITEM "&חופפים\tShift+F5", PM_OVERLAP + MENUITEM "&זה לצד זה\tShift+F4", PM_SIDE_BY_SIDE + MENUITEM "&סידור סמלים", PM_ARRANGE + } + +POPUP "ע&זרה" { + MENUITEM "&תכנים", PM_CONTENTS + MENUITEM "&חיפוש...", PM_SEARCH + MENUITEM SEPARATOR + MENUITEM "&עזרה על העזרה", PM_HELPONHELP + MENUITEM "&מדריך", PM_TUTORIAL + MENUITEM SEPARATOR + MENUITEM "על &אודות Wine", PM_ABOUT_WINE + } +} + +/* Dialog `New' */ + +DIALOG_NEW DIALOG 0, 0, 170, 65 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "חדשה" +{ +RADIOBUTTON "", PM_NEW_GROUP, 10, 15, 10, 15 +LTEXT "&קבוצת תכניות", -1, 20, 18, 80, 15 +RADIOBUTTON "", PM_NEW_PROGRAM, 10, 35, 10, 15 +LTEXT "&תכנית", -1, 20, 38, 80, 15 +DEFPUSHBUTTON "אישור", IDOK, 105, 5, 60, 15, WS_TABSTOP +PUSHBUTTON "ביטול", IDCANCEL, 105, 25, 60, 15, WS_TABSTOP +PUSHBUTTON "ע&זרה", PM_HELP, 105, 45, 60, 15, WS_TABSTOP +} + +/* Dialog `Move' */ + +DIALOG_MOVE DIALOG 0, 0, 250, 65 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "העברת תכנית" +{ +LTEXT "העברת תכנית:", -1, 5, 5, 90, 15 +LTEXT "", PM_PROGRAM, 95, 5, 90, 15 +LTEXT "מהקבוצה:", -1, 5, 13, 90, 15 +LTEXT "", PM_FROM_GROUP, 95, 13, 90, 15 +LTEXT "&אל הקבוצה:", PM_TO_GROUP_TXT, 5, 28, 140, 15 +COMBOBOX PM_TO_GROUP, 5, 38, 140, 50, WS_TABSTOP | CBS_DROPDOWNLIST +DEFPUSHBUTTON "אישור", IDOK, 185, 5, 60, 15, WS_TABSTOP +PUSHBUTTON "ביטול", IDCANCEL, 185, 25, 60, 15, WS_TABSTOP +PUSHBUTTON "ע&זרה", PM_HELP, 185, 45, 60, 15, WS_TABSTOP +} + +/* Dialog `Copy' */ + +DIALOG_COPY DIALOG 0, 0, 250, 65 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "העתקת תכנית" +{ +LTEXT "העתקת תכנית:", -1, 5, 5, 90, 15 +LTEXT "", PM_PROGRAM, 95, 5, 90, 15 +LTEXT "מהקבוצה:", -1, 5, 13, 90, 15 +LTEXT "", PM_FROM_GROUP, 95, 13, 90, 15 +LTEXT "&אל הקבוצה:", PM_TO_GROUP_TXT, 5, 28, 140, 15 +COMBOBOX PM_TO_GROUP, 5, 38, 140, 50, WS_TABSTOP | CBS_DROPDOWNLIST +DEFPUSHBUTTON "אישור", IDOK, 185, 5, 60, 15, WS_TABSTOP +PUSHBUTTON "ביטול", IDCANCEL, 185, 25, 60, 15, WS_TABSTOP +PUSHBUTTON "ע&זרה", PM_HELP, 185, 45, 60, 15, WS_TABSTOP +} + +/* Dialog `Group attributes' */ + +DIALOG_GROUP DIALOG 0, 0, 230, 65 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "מאפייני קבוצת תכניות" +{ +LTEXT "&תיאור:", PM_DESCRIPTION_TXT, 05, 18, 50, 10 +EDITTEXT PM_DESCRIPTION, 60, 18, 90, 15, WS_TABSTOP +LTEXT "&קובץ קבוצה:", PM_FILE_TXT, 05, 38, 50, 10 +EDITTEXT PM_FILE, 60, 38, 90, 15, WS_TABSTOP +DEFPUSHBUTTON "אישור", IDOK, 155, 5, 60, 15, WS_TABSTOP +PUSHBUTTON "ביטול", IDCANCEL, 155, 25, 60, 15, WS_TABSTOP +PUSHBUTTON "ע&זרה", PM_HELP, 155, 45, 60, 15, WS_TABSTOP +} + +/* Dialog `Program attributes' */ + +DIALOG_PROGRAM DIALOG 0, 0, 250, 105 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "מאפייני התכנית" +{ +LTEXT "&תיאור:", PM_DESCRIPTION_TXT, 05, 10, 60, 10 +EDITTEXT PM_DESCRIPTION, 80, 10, 90, 15, WS_TABSTOP +LTEXT "&שורת הפקודה:", PM_COMMAND_LINE_TXT, 05, 25, 60, 10 +EDITTEXT PM_COMMAND_LINE, 80, 25, 90, 15, WS_TABSTOP +LTEXT "&תיקיית ההפעלה:", PM_DIRECTORY_TXT, 05, 40, 60, 10 +EDITTEXT PM_DIRECTORY, 80, 40, 90, 15, WS_TABSTOP +LTEXT "&צירוף מקשים:", PM_HOT_KEY_TXT, 05, 55, 60, 10 +EDITTEXT PM_HOT_KEY, 80, 55, 90, 15, WS_TABSTOP +ICON "", PM_ICON, 20, 70 +CHECKBOX "", PM_SYMBOL, 80, 75, 10, 10, WS_TABSTOP +LTEXT "מ&זעור בעת ההפעלה", -1, 95, 75, 75, 10 +DEFPUSHBUTTON "אישור", IDOK, 185, 5, 60, 15, WS_TABSTOP +PUSHBUTTON "ביטול", IDCANCEL, 185, 25, 60, 15, WS_TABSTOP +PUSHBUTTON "&עיון...", PM_BROWSE, 185, 45, 60, 15, WS_TABSTOP +PUSHBUTTON "החלפת ה&סמל...", PM_OTHER_SYMBOL, 185, 65, 60, 15, WS_TABSTOP +PUSHBUTTON "ע&זרה", PM_HELP, 185, 85, 60, 15, WS_TABSTOP +} + +/* Dialog `Symbol' */ + +DIALOG_SYMBOL DIALOG 0, 0, 200, 85 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "שינוי הסמל" +{ +LTEXT "&שם הקובץ:", PM_ICON_FILE_TXT, 5, 15, 40, 10 +EDITTEXT PM_ICON_FILE, 45, 15, 85, 15, WS_TABSTOP +LTEXT "הסמל ה&נוכחי:", PM_SYMBOL_LIST_TXT, 5, 30, 125, 10 +COMBOBOX PM_SYMBOL_LIST, 5, 40, 125, 50, + CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_OWNERDRAWFIXED | WS_TABSTOP +DEFPUSHBUTTON "אישור", IDOK, 135, 5, 60, 15, WS_TABSTOP +PUSHBUTTON "ביטול", IDCANCEL, 135, 25, 60, 15, WS_TABSTOP +PUSHBUTTON "&עיון...", PM_BROWSE, 135, 45, 60, 15, WS_TABSTOP +PUSHBUTTON "ע&זרה", PM_HELP, 135, 65, 60, 15, WS_TABSTOP +} + +/* Dialog `Execute' */ + +DIALOG_EXECUTE DIALOG 0, 0, 200, 85 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "הפעלת תכנית" +{ +LTEXT "&שורת הפקודה:", -1, 05, 15, 120, 10 +EDITTEXT PM_COMMAND, 05, 25, 120, 15, WS_TABSTOP +CHECKBOX "", PM_SYMBOL, 05, 45, 10, 10, WS_TABSTOP +LTEXT "מ&זעור בעת ההפעלה", -1, 20, 45, 120, 10 +DEFPUSHBUTTON "אישור", IDOK, 135, 5, 60, 15, WS_TABSTOP +PUSHBUTTON "ביטול", IDCANCEL, 135, 25, 60, 15, WS_TABSTOP +PUSHBUTTON "&עיון...", PM_BROWSE, 135, 45, 60, 15, WS_TABSTOP +PUSHBUTTON "ע&זרה", PM_HELP, 135, 65, 60, 15, WS_TABSTOP +} + +/* Strings */ + +STRINGTABLE +{ +IDS_PROGRAM_MANAGER, "Program Manager" +IDS_ERROR, "ERROR" +IDS_WARNING, "WARNING" +IDS_INFO, "Information" +IDS_DELETE, "Delete" +IDS_DELETE_GROUP_s, "Delete group `%s' ?" +IDS_DELETE_PROGRAM_s, "Delete program `%s' ?" +IDS_NOT_IMPLEMENTED, "Not implemented" +IDS_FILE_READ_ERROR_s, "Error reading `%s'." +IDS_FILE_WRITE_ERROR_s, "Error writing `%s'." +IDS_GRPFILE_READ_ERROR_s, "\ +The group file `%s' cannot be opened.\n\ +Should it be tried further on?" +IDS_OUT_OF_MEMORY, "Out of memory." +IDS_WINHELP_ERROR, "Help not available." +IDS_UNKNOWN_FEATURE_s, "Unknown feature in %s" +IDS_FILE_NOT_OVERWRITTEN_s, "File `%s' exists. Not overwritten." +IDS_SAVE_GROUP_AS_s, "Save group as `%s to prevent overwriting original files." +IDS_NO_HOT_KEY, "None" +IDS_ALL_FILES, "All files (*.*)" +IDS_PROGRAMS, "Programs" +IDS_LIBRARIES_DLL, "Libraries (*.dll)" +IDS_SYMBOL_FILES, "Icon files" +IDS_SYMBOLS_ICO, "Icons (*.ico)" +} diff --git a/programs/progman/Makefile.in b/programs/progman/Makefile.in index 6ee9f81..a6c6a32 100644 --- a/programs/progman/Makefile.in +++ b/programs/progman/Makefile.in @@ -17,6 +17,7 @@ RC_SRCS = \ En.rc \ Es.rc \ Fr.rc \ + He.rc \ Hu.rc \ It.rc \ Ko.rc \

1 0

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

03 Nov '10

Module: wine Branch: master Commit: b1316b4de9e99ad08a8a8340d9fe87de8752fce6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1316b4de9e99ad08a8a8340d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 2 22:07:50 2010 +0100 serialui: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/serialui/Makefile.in | 1 + dlls/serialui/Sr.rc | 70 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 0 deletions(-) diff --git a/dlls/serialui/Makefile.in b/dlls/serialui/Makefile.in index 12956c7..1812296 100644 --- a/dlls/serialui/Makefile.in +++ b/dlls/serialui/Makefile.in @@ -27,6 +27,7 @@ RC_SRCS = \ Ro.rc \ Ru.rc \ Si.rc \ + Sr.rc \ Sv.rc \ Tr.rc \ Uk.rc \ diff --git a/dlls/serialui/Sr.rc b/dlls/serialui/Sr.rc new file mode 100644 index 0000000..d087247 --- /dev/null +++ b/dlls/serialui/Sr.rc @@ -0,0 +1,70 @@ +/* + * Copyright 2000 Mike McCormack + * 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 "serialui.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +IDD_SERIALUICONFIG DIALOG 0, 0, 160, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Својства за " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Број бауда", -1,5,20,55,10 + COMBOBOX IDC_BAUD, 60, 20, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Једнакост", -1,5,40,55,10 + COMBOBOX IDC_PARITY, 60, 40, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Контрола протока", -1,5,60,55,10 + COMBOBOX IDC_FLOW, 60, 60, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Битови података", -1,5,80,55,10 + COMBOBOX IDC_DATA, 60, 80, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Зауставно време", -1,5,100,55,10 + COMBOBOX IDC_STOP, 60, 100, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "У реду", IDOK,30,138,50,14 + PUSHBUTTON "Откажи", IDCANCEL,85,138,50,14 + /* these two buttons are for testing Get/SetDefaultCommConfig */ + /* PUSHBUTTON "GetDefault", ID_GETDEFAULT,30,115,50,14 */ + /* PUSHBUTTON "SetDefault", ID_SETDEFAULT,85,115,50,14 */ +END + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +IDD_SERIALUICONFIG DIALOG 0, 0, 160, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Svojstva za " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Broj bauda", -1,5,20,55,10 + COMBOBOX IDC_BAUD, 60, 20, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Jednakost", -1,5,40,55,10 + COMBOBOX IDC_PARITY, 60, 40, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Kontrola protoka", -1,5,60,55,10 + COMBOBOX IDC_FLOW, 60, 60, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Bitovi podataka", -1,5,80,55,10 + COMBOBOX IDC_DATA, 60, 80, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Zaustavno vreme", -1,5,100,55,10 + COMBOBOX IDC_STOP, 60, 100, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "U redu", IDOK,30,138,50,14 + PUSHBUTTON "Otkaži", IDCANCEL,85,138,50,14 + /* these two buttons are for testing Get/SetDefaultCommConfig */ + /* PUSHBUTTON "GetDefault", ID_GETDEFAULT,30,115,50,14 */ + /* PUSHBUTTON "SetDefault", ID_SETDEFAULT,85,115,50,14 */ +END

1 0

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

03 Nov '10

Module: wine Branch: master Commit: f0b6e56cc2f762c5555ec03d45c1f90215fc3f87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0b6e56cc2f762c5555ec03d4… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 2 22:05:59 2010 +0100 sane.ds: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/sane.ds/Makefile.in | 1 + dlls/sane.ds/sane_Sr.rc | 66 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/Makefile.in b/dlls/sane.ds/Makefile.in index c2d0c29..30ae8b6 100644 --- a/dlls/sane.ds/Makefile.in +++ b/dlls/sane.ds/Makefile.in @@ -29,6 +29,7 @@ RC_SRCS = \ sane_Ro.rc \ sane_Ru.rc \ sane_Si.rc \ + sane_Sr.rc \ sane_Sv.rc \ sane_Uk.rc \ sane_Zh.rc diff --git a/dlls/sane.ds/sane_Sr.rc b/dlls/sane.ds/sane_Sr.rc new file mode 100644 index 0000000..5657c13 --- /dev/null +++ b/dlls/sane.ds/sane_Sr.rc @@ -0,0 +1,66 @@ +/* + * Serbian resources for Twain + * + * Copyright 2006 CodeWeavers, Aric Stewart + * 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 "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +IDD_DIALOG1 DIALOG 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "Претрага" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Претраживање...",IDC_STATIC,5,19,176,8, SS_CENTER +END + +STRINGTABLE +{ + 0 "" + 1 "px" + 2 "b" + 3 "мм" + 4 "тпи" + 5 "%" + 6 "нс" +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +IDD_DIALOG1 DIALOG 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "Pretraga" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Pretraživanje...",IDC_STATIC,5,19,176,8, SS_CENTER +END + +STRINGTABLE +{ + 0 "" + 1 "px" + 2 "b" + 3 "mm" + 4 "tpi" + 5 "%" + 6 "ns" +}

1 0

← Newer
1
...
71
72
73
74
75
76
77
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2010