November 2010 - Wine-Commits

André Hentschel : include: Add new button control styles.
by Alexandre Julliard Nov. 3, 2010

Nov. 3, 2010

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

Eric Pouech : msvcrt: Implemented _wputenv_s.
by Alexandre Julliard Nov. 3, 2010

Nov. 3, 2010

Module: wine Branch: master Commit: 356b2d2bc07aabf771908eb4d217d42fb4cb949e URL: http://source.winehq.org/git/wine.git/?a=commit;h=356b2d2bc07aabf771908eb4d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Nov 2 22:02:59 2010 +0100 msvcrt: Implemented _wputenv_s. --- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/environ.c | 52 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 4 +- 5 files changed, 60 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index d4e5c38..6035f70 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1035,7 +1035,7 @@ @ cdecl _putch(long) msvcrt._putch @ stub _putch_nolock @ cdecl _putenv(str) msvcrt._putenv -@ stub _putenv_s +@ cdecl _putenv_s(str str) msvcrt._putenv_s @ cdecl _putw(long ptr) msvcrt._putw @ stub _putwch @ stub _putwch_nolock @@ -1371,7 +1371,7 @@ @ stub _wprintf_p_l @ stub _wprintf_s_l @ cdecl _wputenv(wstr) msvcrt._wputenv -@ stub _wputenv_s +@ cdecl _wputenv_s(wstr wstr) msvcrt._wputenv_s @ cdecl _wremove(wstr) msvcrt._wremove @ cdecl _wrename(wstr wstr) msvcrt._wrename @ cdecl _write(long ptr long) msvcrt._write diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 7fb8eca..ce58a11 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -883,7 +883,7 @@ @ cdecl _putch(long) msvcrt._putch @ stub _putch_nolock @ cdecl _putenv(str) msvcrt._putenv -@ stub _putenv_s +@ cdecl _putenv_s(str str) msvcrt._putenv_s @ cdecl _putw(long ptr) msvcrt._putw @ stub _putwch @ stub _putwch_nolock @@ -1227,7 +1227,7 @@ @ stub _wprintf_p_l @ stub _wprintf_s_l @ cdecl _wputenv(wstr) msvcrt._wputenv -@ stub _wputenv_s +@ cdecl _wputenv_s(wstr wstr) msvcrt._wputenv_s @ cdecl _wremove(wstr) msvcrt._wremove @ cdecl _wrename(wstr wstr) msvcrt._wrename @ cdecl _write(long ptr long) msvcrt._write diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index c38e5f9..d9f6fb4 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -869,7 +869,7 @@ @ cdecl _putch(long) msvcrt._putch @ stub _putch_nolock @ cdecl _putenv(str) msvcrt._putenv -@ stub _putenv_s +@ cdecl _putenv_s(str str) msvcrt._putenv_s @ cdecl _putw(long ptr) msvcrt._putw @ stub _putwch @ stub _putwch_nolock @@ -1211,7 +1211,7 @@ @ stub _wprintf_p_l @ stub _wprintf_s_l @ cdecl _wputenv(wstr) msvcrt._wputenv -@ stub _wputenv_s +@ cdecl _wputenv_s(wstr wstr) msvcrt._wputenv_s @ cdecl _wremove(wstr) msvcrt._wremove @ cdecl _wrename(wstr wstr) msvcrt._wrename @ cdecl _write(long ptr long) msvcrt._write diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index add5905..75178bd 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -160,3 +160,55 @@ finish: HeapFree(GetProcessHeap(), 0, name); return ret; } + +/********************************************************************* + * _putenv_s (MSVCRT.@) + */ +int CDECL _putenv_s(const char *name, const char *value) +{ + int ret; + + TRACE("%s %s\n", debugstr_a(name), debugstr_a(value)); + + if (!MSVCRT_CHECK_PMT(name != NULL) || !MSVCRT_CHECK_PMT(value != NULL)) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return -1; + } + + ret = SetEnvironmentVariableA(name, value[0] ? value : NULL) ? 0 : -1; + + /* _putenv returns success on deletion of nonexistent variable, unlike [Rtl]SetEnvironmentVariable */ + if ((ret == -1) && (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) ret = 0; + + MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(MSVCRT__environ); + MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(MSVCRT__wenviron); + + return ret; +} + +/********************************************************************* + * _wputenv_s (MSVCRT.@) + */ +int CDECL _wputenv_s(const MSVCRT_wchar_t *name, const MSVCRT_wchar_t *value) +{ + int ret; + + TRACE("%s %s\n", debugstr_w(name), debugstr_w(value)); + + if (!MSVCRT_CHECK_PMT(name != NULL) || !MSVCRT_CHECK_PMT(value != NULL)) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return -1; + } + + ret = SetEnvironmentVariableW(name, value[0] ? value : NULL) ? 0 : -1; + + /* _putenv returns success on deletion of nonexistent variable, unlike [Rtl]SetEnvironmentVariable */ + if ((ret == -1) && (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) ret = 0; + + MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(MSVCRT__environ); + MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(MSVCRT__wenviron); + + return ret; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a1cd124..af86f2e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -817,7 +817,7 @@ @ cdecl _purecall() @ cdecl _putch(long) @ cdecl _putenv(str) -# stub _putenv_s +@ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw # stub _putwch @ cdecl _putws(wstr) @@ -1146,7 +1146,7 @@ # stub _wprintf_p_l # stub _wprintf_s_l @ cdecl _wputenv(wstr) -# stub _wputenv_s +@ cdecl _wputenv_s(wstr wstr) @ cdecl _wremove(wstr) @ cdecl _wrename(wstr wstr) @ cdecl _write(long ptr long) MSVCRT__write

1 0

Michael Stefaniuc : strmbase: Remove duplicate 'const' in strmbase.h.
by Alexandre Julliard Nov. 3, 2010

Nov. 3, 2010

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

Eric Pouech : msvcrt: Implemented _putwch.
by Alexandre Julliard Nov. 3, 2010

Nov. 3, 2010

Module: wine Branch: master Commit: d36cfcf48a788c389e6b5df984db95e5f06394db URL: http://source.winehq.org/git/wine.git/?a=commit;h=d36cfcf48a788c389e6b5df98… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Nov 2 22:03:22 2010 +0100 msvcrt: Implemented _putwch. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 8 ++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index cace374..28f261e 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1037,7 +1037,7 @@ @ cdecl _putenv(str) msvcrt._putenv @ cdecl _putenv_s(str str) msvcrt._putenv_s @ cdecl _putw(long ptr) msvcrt._putw -@ stub _putwch +@ cdecl _putwch(long) msvcrt._putwch @ stub _putwch_nolock @ cdecl _putws(wstr) msvcrt._putws @ stub _pwctype diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 9ac3094..2fda832 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -885,7 +885,7 @@ @ cdecl _putenv(str) msvcrt._putenv @ cdecl _putenv_s(str str) msvcrt._putenv_s @ cdecl _putw(long ptr) msvcrt._putw -@ stub _putwch +@ cdecl _putwch(long) msvcrt._putwch @ stub _putwch_nolock @ cdecl _putws(wstr) msvcrt._putws @ stub _pwctype diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index a307afe..51aa66c 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -871,7 +871,7 @@ @ cdecl _putenv(str) msvcrt._putenv @ cdecl _putenv_s(str str) msvcrt._putenv_s @ cdecl _putw(long ptr) msvcrt._putw -@ stub _putwch +@ cdecl _putwch(long) msvcrt._putwch @ stub _putwch_nolock @ cdecl _putws(wstr) msvcrt._putws @ stub _pwctype diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 8902bdd..7074120 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3130,6 +3130,14 @@ int CDECL MSVCRT_putchar(int c) } /********************************************************************* + * _putwch (MSVCRT.@) + */ +int CDECL MSVCRT__putwch(int c) +{ + return MSVCRT_fputwc(c, MSVCRT_stdout); +} + +/********************************************************************* * puts (MSVCRT.@) */ int CDECL MSVCRT_puts(const char *s) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 0f9fdb4..07c1981 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -819,7 +819,7 @@ @ cdecl _putenv(str) @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw -# stub _putwch +@ cdecl _putwch(long) MSVCRT__putwch @ cdecl _putws(wstr) # extern _pwctype @ cdecl _read(long ptr long) MSVCRT__read

1 0

Eric Pouech : msvcrt: Implemented _itow_s.
by Alexandre Julliard Nov. 3, 2010

Nov. 3, 2010

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

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

Nov. 3, 2010

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 : serialui: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard Nov. 3, 2010

Nov. 3, 2010

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 Nov. 3, 2010

Nov. 3, 2010

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

Paul Vriens : msacm32: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard Nov. 3, 2010

Nov. 3, 2010

Module: wine Branch: master Commit: c99e151bc0a6b33f818cb442529e8a003fb72f8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c99e151bc0a6b33f818cb4425… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 2 21:22:45 2010 +0100 msacm32: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/msacm32/Makefile.in | 1 + dlls/msacm32/msacm_Sr.rc | 88 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 0 deletions(-) diff --git a/dlls/msacm32/Makefile.in b/dlls/msacm32/Makefile.in index c86c3fe..a8e51e1 100644 --- a/dlls/msacm32/Makefile.in +++ b/dlls/msacm32/Makefile.in @@ -31,6 +31,7 @@ RC_SRCS = \ msacm_Ro.rc \ msacm_Ru.rc \ msacm_Si.rc \ + msacm_Sr.rc \ msacm_Sv.rc \ msacm_Tr.rc \ msacm_Uk.rc \ diff --git a/dlls/msacm32/msacm_Sr.rc b/dlls/msacm32/msacm_Sr.rc new file mode 100644 index 0000000..d402555 --- /dev/null +++ b/dlls/msacm32/msacm_Sr.rc @@ -0,0 +1,88 @@ +/* + * Serbian resource file for MS ACM + * + * Copyright 2000 Eric Pouech + * 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 "wineacm.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Избор звука" +FONT 8, "MS Shell Dlg" +BEGIN + + LTEXT "&Назив:", -1, 5, 5, 115, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + PUSHBUTTON "&Сачувај као...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 + PUSHBUTTON "&Уклони", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + + LTEXT "&Формат:", -1, 5, 41, 44, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Особине:", -1, 5, 59, 44, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + + DEFPUSHBUTTON "У реду", IDOK, 48, 80, 40, 14 + PUSHBUTTON "Откажи", IDCANCEL, 92, 80, 40, 14 + PUSHBUTTON "&Помоћ", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + +END + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Izbor zvuka" +FONT 8, "MS Shell Dlg" +BEGIN + + LTEXT "&Naziv:", -1, 5, 5, 115, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + PUSHBUTTON "&Sačuvaj kao...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 + PUSHBUTTON "&Ukloni", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + + LTEXT "&Format:", -1, 5, 41, 44, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Osobine:", -1, 5, 59, 44, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + + DEFPUSHBUTTON "U redu", IDOK, 48, 80, 40, 14 + PUSHBUTTON "Otkaži", IDCANCEL, 92, 80, 40, 14 + PUSHBUTTON "&Pomoć", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + +END

1 0

Paul Vriens : msrle32: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard Nov. 3, 2010

Nov. 3, 2010

Module: wine Branch: master Commit: 138a5d678f7323f1b04a4dfbea3bba32df3b4c14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=138a5d678f7323f1b04a4dfbe… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 2 21:24:34 2010 +0100 msrle32: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/msrle32/Makefile.in | 1 + dlls/msrle32/msrle_Sr.rc | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/msrle32/Makefile.in b/dlls/msrle32/Makefile.in index e4ed7db..51deb33 100644 --- a/dlls/msrle32/Makefile.in +++ b/dlls/msrle32/Makefile.in @@ -25,6 +25,7 @@ RC_SRCS = \ msrle_Ro.rc \ msrle_Ru.rc \ msrle_Si.rc \ + msrle_Sr.rc \ msrle_Sv.rc \ msrle_Tr.rc \ msrle_Uk.rc diff --git a/dlls/msrle32/msrle_Sr.rc b/dlls/msrle32/msrle_Sr.rc new file mode 100644 index 0000000..b9d4b0c --- /dev/null +++ b/dlls/msrle32/msrle_Sr.rc @@ -0,0 +1,42 @@ +/* + * Serbian resource file for MS-RLE + * + * Copyright 2002 Michael Günnewig + * 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 "msrle_private.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +STRINGTABLE +{ + IDS_NAME "WINE-MS-RLE" + IDS_DESCRIPTION "Wine MS-RLE видео кодек" + IDS_ABOUT "Wine MS-RLE видео кодек\nCopyright ©2002 by Michael Günnewig" +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +STRINGTABLE +{ + IDS_NAME "WINE-MS-RLE" + IDS_DESCRIPTION "Wine MS-RLE video kodek" + IDS_ABOUT "Wine MS-RLE video kodek\nCopyright ©2002 by Michael Günnewig" +}

1 0