May 2010 - Wine-commits - list.winehq.org

Alexandre Julliard : krnl386.exe: Call the 32-bit string functions that contain exception handlers.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: 2f614e6081be616f4068a48df42266fd929e1502 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f614e6081be616f4068a48df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 18 16:02:11 2010 +0200 krnl386.exe: Call the 32-bit string functions that contain exception handlers. --- dlls/krnl386.exe16/kernel.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/krnl386.exe16/kernel.c b/dlls/krnl386.exe16/kernel.c index 7658549..437eed1 100644 --- a/dlls/krnl386.exe16/kernel.c +++ b/dlls/krnl386.exe16/kernel.c @@ -21,6 +21,7 @@ #include <stdarg.h> #include <stdio.h> +#define WINE_NO_INLINE_STRING #include "windef.h" #include "winbase.h" #include "winternl.h" @@ -397,7 +398,7 @@ void WINAPI hmemcpy16( LPVOID dst, LPCVOID src, LONG count ) */ SEGPTR WINAPI lstrcpyn16( SEGPTR dst, LPCSTR src, INT16 n ) { - lstrcpynA( MapSL(dst), src, n ); + if (!lstrcpynA( MapSL(dst), src, n )) return 0; return dst; }

1 0

Juan Lang : winhttp: Store security flags in netconn_t.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: 7c7d00a12f60e704eb9937ebcfe694f6c8dd6a06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c7d00a12f60e704eb9937ebc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon May 17 10:04:18 2010 -0700 winhttp: Store security flags in netconn_t. --- dlls/winhttp/session.c | 2 +- dlls/winhttp/winhttp_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index acf7eb9..490da05 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -741,7 +741,7 @@ static BOOL request_set_option( object_header_t *hdr, DWORD option, LPVOID buffe set_last_error( ERROR_INVALID_PARAMETER ); return FALSE; } - request->security_flags = flags; + request->netconn.security_flags = flags; return TRUE; } case WINHTTP_OPTION_RESOLVE_TIMEOUT: diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 43961fe..c2dfdbe 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -128,6 +128,7 @@ typedef struct char *peek_msg; char *peek_msg_mem; size_t peek_len; + DWORD security_flags; } netconn_t; typedef struct @@ -155,7 +156,6 @@ typedef struct DWORD content_read; /* bytes read so far */ header_t *headers; DWORD num_headers; - DWORD security_flags; } request_t; typedef struct _task_header_t task_header_t;

1 0

Juan Lang : winhttp: Store a pointer to the netconn_t in the SSL context.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: 2a569a9e892749e19b42d5b2b838cb9efd9b604a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a569a9e892749e19b42d5b2b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon May 17 10:29:23 2010 -0700 winhttp: Store a pointer to the netconn_t in the SSL context. --- dlls/winhttp/net.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 5890c06..da57f8c 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -95,6 +95,7 @@ static SSL_METHOD *method; static SSL_CTX *ctx; static int hostname_idx; static int error_idx; +static int conn_idx; #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -485,6 +486,14 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LeaveCriticalSection( &init_ssl_cs ); return FALSE; } + conn_idx = pSSL_get_ex_new_index( 0, (void *)"netconn index", NULL, NULL, NULL ); + if (conn_idx == -1) + { + ERR("SSL_get_ex_new_index failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); + set_last_error( ERROR_OUTOFMEMORY ); + LeaveCriticalSection( &init_ssl_cs ); + return FALSE; + } pSSL_CTX_set_verify( ctx, SSL_VERIFY_PEER, netconn_secure_verify ); pCRYPTO_set_id_callback(ssl_thread_id); @@ -631,6 +640,12 @@ BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname ) set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR ); goto fail; } + if (!pSSL_set_ex_data( conn->ssl_conn, conn_idx, conn )) + { + ERR("SSL_set_ex_data failed: %s\n", pERR_error_string( pERR_get_error(), 0 )); + set_last_error( ERROR_WINHTTP_SECURE_CHANNEL_ERROR ); + return FALSE; + } if (!pSSL_set_fd( conn->ssl_conn, conn->socket )) { ERR("SSL_set_fd failed: %s\n", pERR_error_string( pERR_get_error(), 0 ));

1 0

Juan Lang : winhttp: Honor security flags when verifying a certificate.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: b659dee9999e4db272ccdc5b5ab14dac9d47fc02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b659dee9999e4db272ccdc5b5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon May 17 10:13:13 2010 -0700 winhttp: Honor security flags when verifying a certificate. --- dlls/winhttp/net.c | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index da57f8c..ab7a4a7 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -254,7 +254,7 @@ static PCCERT_CONTEXT X509_to_cert_context(X509 *cert) } static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, HCERTSTORE store, - WCHAR *server ) + WCHAR *server, DWORD security_flags ) { BOOL ret; CERT_CHAIN_PARA chainPara = { sizeof(chainPara), { 0 } }; @@ -272,7 +272,10 @@ static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, HCERTSTORE store, if (chain->TrustStatus.dwErrorStatus) { if (chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_TIME_VALID) - err = ERROR_WINHTTP_SECURE_CERT_DATE_INVALID; + { + if (!(security_flags & SECURITY_FLAG_IGNORE_CERT_DATE_INVALID)) + err = ERROR_WINHTTP_SECURE_CERT_DATE_INVALID; + } else if (chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_UNTRUSTED_ROOT) err = ERROR_WINHTTP_SECURE_INVALID_CA; @@ -285,7 +288,10 @@ static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, HCERTSTORE store, err = ERROR_WINHTTP_SECURE_CERT_REVOKED; else if (chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_NOT_VALID_FOR_USAGE) - err = ERROR_WINHTTP_SECURE_CERT_WRONG_USAGE; + { + if (!(security_flags & SECURITY_FLAG_IGNORE_CERT_WRONG_USAGE)) + err = ERROR_WINHTTP_SECURE_CERT_WRONG_USAGE; + } else err = ERROR_WINHTTP_SECURE_INVALID_CERT; } @@ -310,7 +316,10 @@ static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, HCERTSTORE store, if (ret && policyStatus.dwError) { if (policyStatus.dwError == CERT_E_CN_NO_MATCH) - err = ERROR_WINHTTP_SECURE_CERT_CN_INVALID; + { + if (!(security_flags & SECURITY_FLAG_IGNORE_CERT_CN_INVALID)) + err = ERROR_WINHTTP_SECURE_CERT_CN_INVALID; + } else err = ERROR_WINHTTP_SECURE_INVALID_CERT; } @@ -328,9 +337,11 @@ static int netconn_secure_verify( int preverify_ok, X509_STORE_CTX *ctx ) SSL *ssl; WCHAR *server; BOOL ret = FALSE; + netconn_t *conn; ssl = pX509_STORE_CTX_get_ex_data( ctx, pSSL_get_ex_data_X509_STORE_CTX_idx() ); server = pSSL_get_ex_data( ssl, hostname_idx ); + conn = pSSL_get_ex_data( ssl, conn_idx ); if (preverify_ok) { HCERTSTORE store = CertOpenStore( CERT_STORE_PROV_MEMORY, 0, 0, @@ -362,7 +373,8 @@ static int netconn_secure_verify( int preverify_ok, X509_STORE_CTX *ctx ) if (!endCert) ret = FALSE; if (ret) { - DWORD_PTR err = netconn_verify_cert( endCert, store, server ); + DWORD_PTR err = netconn_verify_cert( endCert, store, server, + conn->security_flags ); if (err) {

1 0

Juan Lang : wintrust/tests: Fix test failures when not running as administrator.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: 0b7711e545e2aa8d43049114b8a823112212486c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b7711e545e2aa8d43049114b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon May 17 10:44:11 2010 -0700 wintrust/tests: Fix test failures when not running as administrator. --- dlls/wintrust/tests/crypt.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 64a91b7..68a9ebc 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -233,7 +233,12 @@ static void test_context(void) */ ret = pCryptCATAdminAcquireContext(&hca, &dummy, 0); - ok(ret, "Expected success\n"); + ok(ret || GetLastError() == ERROR_ACCESS_DENIED, "CryptCATAdminAcquireContext failed %u\n", GetLastError()); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + win_skip("Not running as administrator\n"); + return; + } ok(hca != NULL, "Expected a context handle, got NULL\n"); attrs = GetFileAttributes(catroot); @@ -492,7 +497,12 @@ static void test_CryptCATAdminAddRemoveCatalog(void) CloseHandle(file); ret = pCryptCATAdminAcquireContext(&hcatadmin, &dummy, 0); - ok(ret, "CryptCATAdminAcquireContext failed %u\n", GetLastError()); + ok(ret || GetLastError() == ERROR_ACCESS_DENIED, "CryptCATAdminAcquireContext failed %u\n", GetLastError()); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + win_skip("Not running as administrator\n"); + return; + } SetLastError(0xdeadbeef); hcatinfo = pCryptCATAdminAddCatalog(NULL, NULL, NULL, 0);

1 0

Jacek Caban : exdisp.idl: Added missing DWebBrowserEvents2 methods.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: c38c3d5aaa20765c83d5b01f8e92f7748535b89f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c38c3d5aaa20765c83d5b01f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 17 20:15:42 2010 +0200 exdisp.idl: Added missing DWebBrowserEvents2 methods. --- include/exdisp.idl | 35 +++++++++++++++++++++++++++++++++++ include/exdispid.h | 7 +++++++ 2 files changed, 42 insertions(+), 0 deletions(-) diff --git a/include/exdisp.idl b/include/exdisp.idl index 363e61a..808663e 100644 --- a/include/exdisp.idl +++ b/include/exdisp.idl @@ -433,6 +433,41 @@ dispinterface DWebBrowserEvents2 [id(DISPID_PRIVACYIMPACTEDSTATECHANGE)] void PrivacyImpactedStateChange([in] VARIANT_BOOL bImpacted); + + [id(DISPID_NEWWINDOW3)] + void NewWindow3( + [in, out] IDispatch **ppDisp, + [in, out] VARIANT_BOOL *Cancel, + [in] DWORD dwFlags, + [in] BSTR bstrUrlContext, + [in] BSTR bstrUrl); + + [id(DISPID_SETPHISHINGFILTERSTATUS)] + void SetPhishingFilterStatus([in] long PhishingFilterStatus); + + [id(DISPID_WINDOWSTATECHANGED)] + void WindowStateChanged( + [in] DWORD dwWindowStateFlags, + [in] DWORD dwValidFlagsMask); + + [id(DISPID_NEWPROCESS)] + void NewProcess( + [in] long lCauseFlag, + [in] IDispatch *pWB2, + [in, out] VARIANT_BOOL *Cancel); + + [id(DISPID_THIRDPARTYURLBLOCKED)] + void ThirdPartyUrlBlocked( + [in] VARIANT *URL, + [in] DWORD dwCount); + + [id(DISPID_REDIRECTXDOMAINBLOCKED)] + void RedirectXDomainBlocked( + [in] IDispatch *pDisp, + [in] VARIANT *StartURL, + [in] VARIANT *RedirectURL, + [in] VARIANT *Frame, + [in] VARIANT *StatusCode); } [ diff --git a/include/exdispid.h b/include/exdispid.h index 2f02f8a..232cee6 100644 --- a/include/exdispid.h +++ b/include/exdispid.h @@ -63,6 +63,13 @@ #define DISPID_FILEDOWNLOAD 270 #define DISPID_NAVIGATEERROR 271 #define DISPID_PRIVACYIMPACTEDSTATECHANGE 272 +#define DISPID_NEWWINDOW3 273 +#define DISPID_VIEWUPDATE 281 +#define DISPID_SETPHISHINGFILTERSTATUS 282 +#define DISPID_WINDOWSTATECHANGED 283 +#define DISPID_NEWPROCESS 284 +#define DISPID_THIRDPARTYURLBLOCKED 285 +#define DISPID_REDIRECTXDOMAINBLOCKED 286 #define DISPID_PRINTTEMPLATEINSTANTIATION 225 #define DISPID_PRINTTEMPLATETEARDOWN 226

1 0

Jacek Caban : shobjidl.idl: Added NWMF declaration.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: 9795e7a57052d55abd1d62f07ae8941f2cc9e781 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9795e7a57052d55abd1d62f07… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 17 20:16:30 2010 +0200 shobjidl.idl: Added NWMF declaration. --- include/shobjidl.idl | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 7c4fb78..a106248 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -372,7 +372,17 @@ interface IShellItem : IUnknown [out] int *piOrder); } - +typedef enum tagNWMF { + NWMF_UNLOADING = 0x0001, + NWMF_USERINITED = 0x0002, + NWMF_FIRST = 0x0004, + NWMF_OVERRIDEKEY = 0x0008, + NWMF_SHOWHELP = 0x0010, + NWMF_HTMLDIALOG = 0x0020, + NWMF_FROMDIALOGCHILD = 0x0040, + NWMF_USERREQUESTED = 0x0080, + NWMF_USERALLOWED = 0x0100 +} NWMF; /***************************************************************************** * FOLDERSETTINGS

1 0

Matej Špindler : wininet: Update Slovenian translation .
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: 4ed5079b676550765eb5f4885afd2ea1cb49f553 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ed5079b676550765eb5f4885… Author: Matej Špindler <spindler.matej(a)gmail.com> Date: Mon May 17 18:40:15 2010 +0200 wininet: Update Slovenian translation. --- dlls/wininet/wininet_Si.rc | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/wininet_Si.rc b/dlls/wininet/wininet_Si.rc index b5bf291..488104e 100644 --- a/dlls/wininet/wininet_Si.rc +++ b/dlls/wininet/wininet_Si.rc @@ -27,11 +27,11 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Vnos omrežnega gesla" FONT 8, "MS Shell Dlg" { - LTEXT "Vnesite uporabniško ime in geslo:", -1, 40, 6, 150, 15 - LTEXT "Proksi", -1, 40, 26, 50, 10 - LTEXT "Kraljestvo", -1, 40, 46, 50, 10 - LTEXT "Uporabniško ime", -1, 40, 66, 50, 10 - LTEXT "Geslo", -1, 40, 86, 50, 10 + LTEXT "Vnesite uporabniško ime in geslo:", -1, 20, 6, 150, 15 + LTEXT "Proksi", -1, 20, 26, 50, 10 + LTEXT "Področje", -1, 20, 46, 50, 10 + LTEXT "Uporabniško ime", -1, 20, 66, 55, 10 + LTEXT "Geslo", -1, 20, 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 @@ -42,6 +42,26 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Prekliči", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_AUTHDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Authentication Required" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Vnesite uporabniško ime in geslo:", -1, 20, 6, 150, 15 + LTEXT "Server", -1, 20, 26, 50, 10 + LTEXT "Področje", -1, 20, 46, 50, 10 + LTEXT "Uporabniško ime", -1, 20, 66, 55, 10 + LTEXT "Geslo", -1, 20, 86, 50, 10 + LTEXT "" IDC_SERVER, 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 "&Shrani geslo (nezaščiteno)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "V redu", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Prekliči", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE DISCARDABLE { IDS_LANCONNECTION "LAN povezava"

1 0

Matej Špindler : jscript: Add Slovenian translation.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: 515b15233ea05ef54d86082f2b646594c5cf770a URL: http://source.winehq.org/git/wine.git/?a=commit;h=515b15233ea05ef54d86082f2… Author: Matej Špindler <spindler.matej(a)gmail.com> Date: Mon May 17 20:02:31 2010 +0200 jscript: Add Slovenian translation. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/jscript_Si.rc | 49 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 3d3ffff..932dabe 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -14,6 +14,7 @@ RC_SRCS = \ jscript_Nl.rc \ jscript_Pt.rc \ jscript_Ru.rc \ + jscript_Si.rc \ rsrc.rc C_SRCS = \ diff --git a/dlls/jscript/jscript_Si.rc b/dlls/jscript/jscript_Si.rc new file mode 100644 index 0000000..0ddeab1 --- /dev/null +++ b/dlls/jscript/jscript_Si.rc @@ -0,0 +1,49 @@ +/* + * Copyright 2010 Matej Spindler + * + * 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_SLOVENIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TO_PRIMITIVE "Napaka med spreminjanjem v primitivni tip" + IDS_INVALID_CALL_ARG "Napačen klic postopka ali argument" + IDS_CREATE_OBJ_ERROR "Avtomatizacijski server ne more ustvariti objekta" + IDS_NO_PROPERTY "Objekt ne podpira atributa ali metode" + IDS_ARG_NOT_OPT "Argument je obvezen" + IDS_SYNTAX_ERROR "Napačna sintaksa" + IDS_SEMICOLON "Pričakujem ';'" + IDS_LBRACKET "Pričakujem '('" + IDS_RBRACKET "Pričakujem ')'" + IDS_UNTERMINATED_STR "Nezaključen niz" + IDS_NOT_FUNC "Pričakujem funkcijo" + IDS_NOT_DATE "'[object]' ni date objekt" + IDS_NOT_NUM "Pričakujem število" + IDS_OBJECT_EXPECTED "Pričakujem objekt" + IDS_ILLEGAL_ASSIGN "Napačna prireditev" + IDS_UNDEFINED "'|' je nedifiniran" + IDS_NOT_BOOL "Pričakujem Boolean objekt" + IDS_JSCRIPT_EXPECTED "Pričakujem JScript objekt" + IDS_REGEXP_SYNTAX_ERROR "Napačna sintaksa v regularnem izrazu" + IDS_URI_INVALID_CHAR "URI vsebuje neveljavne znake" + IDS_INVALID_LENGTH "Dožina polja mora bit pozitivno celo število" + IDS_ARRAY_EXPECTED "Pričakujem Array objekt" +}

1 0

Maarten Lankhorst : includes: Fix typo.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: a0152bb161527bb0f79228140f6e4bed17e18090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0152bb161527bb0f79228140… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri May 14 23:19:35 2010 +0200 includes: Fix typo. --- include/ksmedia.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/ksmedia.h b/include/ksmedia.h index c78aa91..da69b31 100644 --- a/include/ksmedia.h +++ b/include/ksmedia.h @@ -31,7 +31,7 @@ DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0 #define KSAUDIO_SPEAKER_STEREO (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT) #define KSAUDIO_SPEAKER_QUAD (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT) #define KSAUDIO_SPEAKER_SURROUND (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_BACK_CENTER) -#define KSAUDIO_SPEAKER_5POINT1 (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOWFREQUENCY | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT) +#define KSAUDIO_SPEAKER_5POINT1 (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT) #define KSAUDIO_SPEAKER_7POINT1 (KSAUDIO_SPEAKER_5POINT1 | SPEAKER_FRONT_LEFT_OF_CENTER | SPEAKER_FRONT_RIGHT_OF_CENTER) #ifndef REFERENCE_TIME_DEFINED

1 0