March 2009 - Wine-commits - list.winehq.org

Anders Jonsson : wordpad: Update Swedish translation.
by Alexandre Julliard 27 Mar '09

27 Mar '09

Module: wine Branch: master Commit: bd1a69220a2eac41aa2a53df1dabad25a3c54168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd1a69220a2eac41aa2a53df1… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Fri Mar 27 10:42:45 2009 +0100 wordpad: Update Swedish translation. --- programs/wordpad/Sv.rc | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/Sv.rc b/programs/wordpad/Sv.rc index d56cc06..4bb2ae2 100644 --- a/programs/wordpad/Sv.rc +++ b/programs/wordpad/Sv.rc @@ -22,7 +22,7 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDM_MAINMENU MENU DISCARDABLE BEGIN - POPUP "&Fil" + POPUP "&Arkiv" BEGIN MENUITEM "&Nytt...\tCtrl+N", ID_FILE_NEW MENUITEM "&Öppna...\tCtrl+O", ID_FILE_OPEN @@ -151,7 +151,7 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU Caption "Tabulatorer" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Tabulatorstopp", -1, 10, 10, 120, 90 + GROUPBOX "Tabbstopp", -1, 10, 10, 120, 90 COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE DEFPUSHBUTTON "Lägg &till", ID_TAB_ADD, 20, 80, 45, 15 PUSHBUTTON "Ta &bort", ID_TAB_DEL, 72, 80, 45, 15 @@ -242,6 +242,7 @@ BEGIN STRING_OPEN_FAILED, "Kunde inte öppna filen." STRING_OPEN_ACCESS_DENIED, "Du har inte tillgång till att öppna filen." STRING_PRINTING_NOT_IMPLEMENTED, "Utskrift ej implementerat." + STRING_MAX_TAB_STOPS, "Kan ej lägga till mer än 32 tabbstopp." END #pragma code_page(default)

1 0

Michael Stefaniuc : crypt32: Change the encoding of the German translation to UTF8.
by Alexandre Julliard 27 Mar '09

27 Mar '09

Module: wine Branch: master Commit: 52b33a738dcb9738720fd517d3bf213cb4799fa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52b33a738dcb9738720fd517d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 27 11:04:03 2009 +0100 crypt32: Change the encoding of the German translation to UTF8. --- dlls/crypt32/crypt32_De.rc | 78 +++++++++++++++++++++++--------------------- 1 files changed, 41 insertions(+), 37 deletions(-) diff --git a/dlls/crypt32/crypt32_De.rc b/dlls/crypt32/crypt32_De.rc index 40d0719..ac234ed 100644 --- a/dlls/crypt32/crypt32_De.rc +++ b/dlls/crypt32/crypt32_De.rc @@ -20,41 +20,43 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL +#pragma code_page(65001) + STRINGTABLE DISCARDABLE { - IDS_AUTHORITY_KEY_ID "Autorit�tsschl�sselkennung" - IDS_KEY_ATTRIBUTES "Schl�sselattribute" - IDS_KEY_USAGE_RESTRICTION "Schl�sselbenutzungseinschr�nkung" + IDS_AUTHORITY_KEY_ID "Autoritätsschlüsselkennung" + IDS_KEY_ATTRIBUTES "Schlüsselattribute" + IDS_KEY_USAGE_RESTRICTION "Schlüsselbenutzungseinschränkung" IDS_SUBJECT_ALT_NAME "Alternativer Name des Antragsstellers" IDS_ISSUER_ALT_NAME "Alternativer Name des Ausgebers" - IDS_BASIC_CONSTRAINTS "Grunds�tzliche Einschr�nkungen" - IDS_KEY_USAGE "Schl�sselbenutzung" + IDS_BASIC_CONSTRAINTS "Grundsätzliche Einschränkungen" + IDS_KEY_USAGE "Schlüsselbenutzung" IDS_CERT_POLICIES "Zertifikatsrichtlinien" - IDS_SUBJECT_KEY_IDENTIFIER "Schl�sselkennung des Antragsstellers" + IDS_SUBJECT_KEY_IDENTIFIER "Schlüsselkennung des Antragsstellers" IDS_CRL_REASON_CODE "CRL Grundcode" IDS_CRL_DIST_POINTS "CRL Verteilungspunkte" - IDS_ENHANCED_KEY_USAGE "Erweiterte Schl�sselbenutzung" - IDS_AUTHORITY_INFO_ACCESS "Autorit�tsinformationszugriff" + IDS_ENHANCED_KEY_USAGE "Erweiterte Schlüsselbenutzung" + IDS_AUTHORITY_INFO_ACCESS "Autoritätsinformationszugriff" IDS_CERT_EXTENSIONS "Zertifikatserweiterung" IDS_NEXT_UPDATE_LOCATION "Next Update Location" IDS_YES_OR_NO_TRUST "Vertrauen oder nicht vertrauen" IDS_EMAIL_ADDRESS "E-Mail-Adresse" IDS_UNSTRUCTURED_NAME "Unstrukturierter Name" IDS_CONTENT_TYPE "Inhaltstyp" - IDS_MESSAGE_DIGEST "Nachrichten�bersicht" + IDS_MESSAGE_DIGEST "Nachrichtenübersicht" IDS_SIGNING_TIME "Signierungszeit" IDS_COUNTER_SIGN "Gegensignatur" IDS_CHALLENGE_PASSWORD "Challenge Password" IDS_UNSTRUCTURED_ADDRESS "Unstrukturierte Adresse" - IDS_SMIME_CAPABILITIES "SMIME M�glichkeiten" + IDS_SMIME_CAPABILITIES "SMIME Möglichkeiten" IDS_PREFER_SIGNED_DATA "Signierte Daten bevorzugen" IDS_CPS "CPS" IDS_USER_NOTICE "Benutzerbenachrichtung" IDS_OCSP "Online Zertifikationsstatusprotokoll" - IDS_CA_ISSUER "Ausgeber des Zertifikationsautorit�t" + IDS_CA_ISSUER "Ausgeber des Zertifikationsautorität" IDS_CERT_TEMPLATE_NAME "Zertifkationsvorlagenname" IDS_CERT_TYPE "Zertifikationstyp" - IDS_CERT_MANIFOLD "Zertifikationsvervielf�ltigung" + IDS_CERT_MANIFOLD "Zertifikationsvervielfältigung" IDS_NETSCAPE_CERT_TYPE "Netscape Zertifikationstyp" IDS_NETSCAPE_BASE_URL "Netscape Basis-URL" IDS_NETSCAPE_REVOCATION_URL "Netscape Sperrungs-URL" @@ -76,28 +78,28 @@ STRINGTABLE DISCARDABLE IDS_GIVEN_NAME "Vorname" IDS_INITIALS "Initialen" IDS_SUR_NAME "Nachname" - IDS_DOMAIN_COMPONENT "Dom�nkomponente" - IDS_STREET_ADDRESS "Stra�e" + IDS_DOMAIN_COMPONENT "Domänkomponente" + IDS_STREET_ADDRESS "Straße" IDS_SERIAL_NUMBER "Seriennummer" IDS_CA_VERSION "CA Version" IDS_CROSS_CA_VERSION "Kreuz CA Version" IDS_SERIALIZED_SIG_SERIAL_NUMBER "Serialisierte Signaturseriennummer" IDS_PRINCIPAL_NAME "Prinzipalname" IDS_WINDOWS_PRODUCT_UPDATE "Windows Produkt Aktualisierung" - IDS_ENROLLMENT_NAME_VALUE_PAIR "Wertepaar f�r Eintragungsname" + IDS_ENROLLMENT_NAME_VALUE_PAIR "Wertepaar für Eintragungsname" IDS_OS_VERSION "Betriebssystemversion" IDS_ENROLLMENT_CSP "Eintragungs-CSP" IDS_CRL_NUMBER "CRL Nummer" IDS_DELTA_CRL_INDICATOR "Delta CRL Indikator" IDS_ISSUING_DIST_POINT "Ausgeber des Verteilungspunktes" IDS_FRESHEST_CRL "Aktuelle CRL" - IDS_NAME_CONSTRAINTS "Namenseinschr�nkungen" + IDS_NAME_CONSTRAINTS "Namenseinschränkungen" IDS_POLICY_MAPPINGS "Richtlinienzuordnungen" - IDS_POLICY_CONSTRAINTS "Richtlinieneinschr�nkungen" - IDS_CROSS_CERT_DIST_POINTS "Verteilungspunkte f�r Kreuzzertifikate" + IDS_POLICY_CONSTRAINTS "Richtlinieneinschränkungen" + IDS_CROSS_CERT_DIST_POINTS "Verteilungspunkte für Kreuzzertifikate" IDS_APPLICATION_POLICIES "Anwendungsrichtlinien" IDS_APPLICATION_POLICY_MAPPINGS "Anwendungsrichtlinienzuordnungen" - IDS_APPLICATION_POLICY_CONSTRAINTS "Anwendungsungsrichtlinieneinschr�nkungen" + IDS_APPLICATION_POLICY_CONSTRAINTS "Anwendungsungsrichtlinieneinschränkungen" IDS_CMC_DATA "CMC Daten" IDS_CMC_RESPONSE "CMC Antwort" IDS_UNSIGNED_CMC_REQUEST "Unsignierte CMC Antwort" @@ -106,32 +108,32 @@ STRINGTABLE DISCARDABLE IDS_CMC_ATTRIBUTES "CMC Attribute" IDS_PKCS_7_DATA "PKCS 7 Daten" IDS_PKCS_7_SIGNED "PKCS 7 signiert" - IDS_PKCS_7_ENVELOPED "PKCS 7 umh�llt" - IDS_PKCS_7_SIGNED_ENVELOPED "PKCS 7 signiert und umh�llt" + IDS_PKCS_7_ENVELOPED "PKCS 7 umhüllt" + IDS_PKCS_7_SIGNED_ENVELOPED "PKCS 7 signiert und umhüllt" IDS_PKCS_7_DIGESTED "PKCS 7 Digested" - IDS_PKCS_7_ENCRYPTED "PKCS 7 verschl�sselt" + IDS_PKCS_7_ENCRYPTED "PKCS 7 verschlüsselt" IDS_PREVIOUS_CA_CERT_HASH "Vorheriger CA Zertifikatshash" IDS_CRL_VIRTUAL_BASE "Virtuelle Basis-CRL-Nummer" - IDS_CRL_NEXT_PUBLISH "N�chste CRL Ver�ffentlichung" - IDS_CA_EXCHANGE "CA Verschl�sselungszertifikat" - IDS_KEY_RECOVERY_AGENT "Agent zur Schl�sselwiederherstellung" + IDS_CRL_NEXT_PUBLISH "Nächste CRL Veröffentlichung" + IDS_CA_EXCHANGE "CA Verschlüsselungszertifikat" + IDS_KEY_RECOVERY_AGENT "Agent zur Schlüsselwiederherstellung" IDS_CERTIFICATE_TEMPLATE "Zertifikatsvorlageninformation" IDS_ENTERPRISE_ROOT_OID "Unternehmensstamm-OID" IDS_RDN_DUMMY_SIGNER "Attrapenunterzeichner" - IDS_ARCHIVED_KEY_ATTR "Verschl�sselter, privater Schl�ssel" - IDS_CRL_SELF_CDP "Ver�ffentlichte CRL Standorte" + IDS_ARCHIVED_KEY_ATTR "Verschlüsselter, privater Schlüssel" + IDS_CRL_SELF_CDP "Veröffentlichte CRL Standorte" IDS_REQUIRE_CERT_CHAIN_POLICY "Erzwinge Zertifikatskettenrichtlinie" IDS_TRANSACTION_ID "Transaktions-ID" IDS_SENDER_NONCE "Sender einstweilen" - IDS_RECIPIENT_NONCE "Empf�nger einstweilen" + IDS_RECIPIENT_NONCE "Empfänger einstweilen" IDS_REG_INFO "Registrierungsinformationen" IDS_GET_CERTIFICATE "Bekomme Zertifikat" IDS_GET_CRL "Bekomme CRL" IDS_REVOKE_REQUEST "Anfrageablehnen" IDS_QUERY_PENDING "Wartende Abfrage" IDS_SORTED_CTL "Zertifikatsvertrauensliste" - IDS_ARCHIVED_KEY_CERT_HASH "Archivierter Schl�sselzertifikatshash" - IDS_PRIVATE_KEY_USAGE_PERIOD "Private Schl�sselbenutzungsdauer" + IDS_ARCHIVED_KEY_CERT_HASH "Archivierter Schlüsselzertifikatshash" + IDS_PRIVATE_KEY_USAGE_PERIOD "Private Schlüsselbenutzungsdauer" IDS_CLIENT_INFORMATION "Client Information" IDS_SERVER_AUTHENTICATION "Server Authentifizierung" IDS_CLIENT_AUTHENTICATION "Client Authentifizierung" @@ -143,32 +145,34 @@ STRINGTABLE DISCARDABLE IDS_IPSEC_END_SYSTEM "IP Sicherheitsendsystem" IDS_IPSEC_TUNNEL "IP Sicherheitstunnelabschluss" IDS_IPSEC_USER "IP Sicherheitsbenutzer" - IDS_EFS "Verschl�sseltes Dateisystem" + IDS_EFS "Verschlüsseltes Dateisystem" IDS_WHQL_CRYPTO "Windows Hardware Treiber Verifizierung" IDS_NT5_CRYPTO "Windows System Komponenten Verifizierung" IDS_OEM_WHQL_CRYPTO "OEM Windows System Komponenten Verifizierung" IDS_EMBEDDED_NT_CRYPTO "Embedded Windows System Komponenten Verifizierung" - IDS_KEY_PACK_LICENSES "Schl�sselpaketlizenzen" + IDS_KEY_PACK_LICENSES "Schlüsselpaketlizenzen" IDS_LICENSE_SERVER "Lizenzserver Verifizierung" IDS_SMART_CARD_LOGON "Smartcard Login" IDS_DIGITAL_RIGHTS "Digitale Rechte" IDS_QUALIFIED_SUBORDINATION "Qualifizierte Unterordnung" - IDS_KEY_RECOVERY "Schl�sselwiederherstellung" + IDS_KEY_RECOVERY "Schlüsselwiederherstellung" IDS_DOCUMENT_SIGNING "Dokumentensignatur" IDS_IPSEC_IKE_INTERMEDIATE "dazwischenliegende IP Sicherheits-IKE" IDS_FILE_RECOVERY "Dateiwiederherstellung" IDS_ROOT_LIST_SIGNER "Stammlistengeber" IDS_ANY_APPLICATION_POLICIES "Alle Anwendungsrichtlinien" - IDS_DS_EMAIL_REPLICATION "Verzeichnisdienst f�r E-Mail Replikation" - IDS_ENROLLMENT_AGENT "Agent f�r Zertifikationsanforderung" + IDS_DS_EMAIL_REPLICATION "Verzeichnisdienst für E-Mail Replikation" + IDS_ENROLLMENT_AGENT "Agent für Zertifikationsanforderung" IDS_LIFETIME_SIGNING "Lebensdauersignatur" IDS_ANY_CERT_POLICY "Alle ausgegebenen Richtlinien" } STRINGTABLE DISCARDABLE { - IDS_LOCALIZEDNAME_ROOT "Vertrauensw�rdige Stammzertifizierungsstellen" - IDS_LOCALIZEDNAME_MY "Pers�nlich" + IDS_LOCALIZEDNAME_ROOT "Vertrauenswürdige Stammzertifizierungsstellen" + IDS_LOCALIZEDNAME_MY "Persönlich" IDS_LOCALIZEDNAME_CA "Zwischenzertifizierungsstellen" IDS_LOCALIZEDNAME_ADDRESSBOOK "Andere Personen" } + +#pragma code_page(default)

1 0

Michael Stefaniuc : crypt32: Update the German translation.
by Alexandre Julliard 27 Mar '09

27 Mar '09

Module: wine Branch: master Commit: 5a960ae807e443ba3b5b756d7850fcd8fe845197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a960ae807e443ba3b5b756d7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 27 11:04:34 2009 +0100 crypt32: Update the German translation. --- dlls/crypt32/crypt32_De.rc | 69 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/crypt32_De.rc b/dlls/crypt32/crypt32_De.rc index ac234ed..1d9cbb7 100644 --- a/dlls/crypt32/crypt32_De.rc +++ b/dlls/crypt32/crypt32_De.rc @@ -2,6 +2,7 @@ * crypt32 dll resources * * Copyright (C) 2006 Henning Gerhardt + * Copyright (C) 2008,2009 Michael Stefaniuc * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -46,7 +47,7 @@ STRINGTABLE DISCARDABLE IDS_MESSAGE_DIGEST "Nachrichtenübersicht" IDS_SIGNING_TIME "Signierungszeit" IDS_COUNTER_SIGN "Gegensignatur" - IDS_CHALLENGE_PASSWORD "Challenge Password" + IDS_CHALLENGE_PASSWORD "Anfragekennwort" IDS_UNSTRUCTURED_ADDRESS "Unstrukturierte Adresse" IDS_SMIME_CAPABILITIES "SMIME Möglichkeiten" IDS_PREFER_SIGNED_DATA "Signierte Daten bevorzugen" @@ -78,7 +79,7 @@ STRINGTABLE DISCARDABLE IDS_GIVEN_NAME "Vorname" IDS_INITIALS "Initialen" IDS_SUR_NAME "Nachname" - IDS_DOMAIN_COMPONENT "Domänkomponente" + IDS_DOMAIN_COMPONENT "Domänenkomponente" IDS_STREET_ADDRESS "Straße" IDS_SERIAL_NUMBER "Seriennummer" IDS_CA_VERSION "CA Version" @@ -173,6 +174,70 @@ STRINGTABLE DISCARDABLE IDS_LOCALIZEDNAME_MY "Persönlich" IDS_LOCALIZEDNAME_CA "Zwischenzertifizierungsstellen" IDS_LOCALIZEDNAME_ADDRESSBOOK "Andere Personen" + IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "Vertrauenswürdige Herausgeber" +} + +STRINGTABLE DISCARDABLE +{ + IDS_KEY_ID "Schlüsselkennung=" + IDS_CERT_ISSUER "Ausgeber des Zertifikats" + IDS_CERT_SERIAL_NUMBER "Serienummer des Zertifikats=" + IDS_ALT_NAME_OTHER_NAME "Anderer Name=" + IDS_ALT_NAME_RFC822_NAME "E-Mail Adresse=" + IDS_ALT_NAME_DNS_NAME "DNS Name=" + IDS_ALT_NAME_DIRECTORY_NAME "Verzeichnis-Adresse" + IDS_ALT_NAME_URL "URL=" + IDS_ALT_NAME_IP_ADDRESS "IP Adresse=" + IDS_ALT_NAME_MASK "Maske=" + IDS_ALT_NAME_REGISTERED_ID "Registrierte Kennung=" + IDS_USAGE_UNKNOWN "Unbekannte Verwendung des Schlüssels" + IDS_SUBJECT_TYPE "Subject Typ=" + IDS_SUBJECT_TYPE_CA "Zertifikationsautorität" + IDS_SUBJECT_TYPE_END_CERT "Endeinheit" + IDS_PATH_LENGTH "Einschränkung der Pfadlänge=" + IDS_PATH_LENGTH_NONE "Keine" + IDS_INFO_NOT_AVAILABLE "Information nicht verfügbar" + IDS_AIA "Autoritätsinformationszugriff" + IDS_ACCESS_METHOD "Zugriffsmethode=" + IDS_ACCESS_METHOD_OCSP "OCSP" + IDS_ACCESS_METHOD_CA_ISSUERS "Ausgeber des Zertifikationsautorität" + IDS_ACCESS_METHOD_UNKNOWN "Unbekannte Zugriffsmethode" + IDS_ACCESS_LOCATION "Alternativer Name" + IDS_CRL_DIST_POINT "CRL Verteilungspunkt" + IDS_CRL_DIST_POINT_NAME "Name des Verteilungspunkt" + IDS_CRL_DIST_POINT_FULL_NAME "Vollständiger Name" + IDS_CRL_DIST_POINT_RDN_NAME "RDN Name" + IDS_CRL_DIST_POINT_REASON "CRL Begründung=" + IDS_CRL_DIST_POINT_ISSUER "CRL Ausgeber" + IDS_REASON_KEY_COMPROMISE "Kompromittierung des Schlüssels" + IDS_REASON_CA_COMPROMISE "Kompromittierung der Zertifikationsautorität" + IDS_REASON_AFFILIATION_CHANGED "Zugehörigkeit verändert" + IDS_REASON_SUPERSEDED "Ersätzt" + IDS_REASON_CESSATION_OF_OPERATION "Betrieb eingestellt" + IDS_REASON_CERTIFICATE_HOLD "Zertifikat blockiert" + IDS_FINANCIAL_CRITERIA "Finanzinformationen=" + IDS_FINANCIAL_CRITERIA_AVAILABLE "Vorhanden" + IDS_FINANCIAL_CRITERIA_NOT_AVAILABLE "Nicht vorhanden" + IDS_FINANCIAL_CRITERIA_MEETS_CRITERIA "Kriterien erfüllt=" + IDS_YES "Ja" + IDS_NO "Nein" + IDS_DIGITAL_SIGNATURE "Digitale Signatur" + IDS_NON_REPUDIATION "Unleugbarkeit" + IDS_KEY_ENCIPHERMENT "Schlüsselverschlüsselung" + IDS_DATA_ENCIPHERMENT "Datenverschlüsselung" + IDS_KEY_AGREEMENT "Schlüsselvereinbarung" + IDS_CERT_SIGN "Signieren des Zertifikats" + IDS_OFFLINE_CRL_SIGN "Offline Signieren der CRL" + IDS_CRL_SIGN "Signieren der CRL" + IDS_ENCIPHER_ONLY "Nur Verschlüsseln" + IDS_DECIPHER_ONLY "Nur Entschlüsseln" + IDS_NETSCAPE_SSL_CLIENT "SSL Client-Authentifizierung" + IDS_NETSCAPE_SSL_SERVER "SSL Server-Authentifizierung" + IDS_NETSCAPE_SMIME "S/MIME" + IDS_NETSCAPE_SIGN "Signatur" + IDS_NETSCAPE_SSL_CA "SSL Zertifikationsautorität" + IDS_NETSCAPE_SMIME_CA "S/MIME Zertifikationsautorität" + IDS_NETSCAPE_SIGN_CA "Zertifikationsautorität der Signatur" } #pragma code_page(default)

1 0

Henri Verbeet : wined3d: Create a separate function for setting basic format info.
by Alexandre Julliard 27 Mar '09

27 Mar '09

Module: wine Branch: master Commit: 1407bd6b1aba4c84c0f5d8b3b5da43a029f47670 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1407bd6b1aba4c84c0f5d8b3b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 27 10:25:54 2009 +0100 wined3d: Create a separate function for setting basic format info. --- dlls/wined3d/utils.c | 21 +++++++-------------- 1 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e36b439..e63fd60 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -375,7 +375,7 @@ static inline int getFmtIdx(WINED3DFORMAT fmt) { return -1; } -BOOL initPixelFormatsNoGL(WineD3D_GL_Info *gl_info) +static BOOL init_format_base_info(WineD3D_GL_Info *gl_info) { UINT format_count = sizeof(formats) / sizeof(*formats); UINT i; @@ -404,15 +404,18 @@ BOOL initPixelFormatsNoGL(WineD3D_GL_Info *gl_info) return TRUE; } +BOOL initPixelFormatsNoGL(WineD3D_GL_Info *gl_info) +{ + return init_format_base_info(gl_info); +} + #define GLINFO_LOCATION (*gl_info) BOOL initPixelFormats(WineD3D_GL_Info *gl_info) { unsigned int src; int dst; - gl_info->gl_formats = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(formats) / sizeof(formats[0]) * sizeof(gl_info->gl_formats[0])); - if(!gl_info->gl_formats) return FALSE; + if (!init_format_base_info(gl_info)) return FALSE; /* If a format depends on some extensions, remove them from the table above and initialize them * after this loop @@ -422,16 +425,6 @@ BOOL initPixelFormats(WineD3D_GL_Info *gl_info) dst = getFmtIdx(gl_formats_template[src].fmt); desc = &gl_info->gl_formats[dst]; - desc->format = formats[dst].format; - desc->red_mask = formats[dst].redMask; - desc->green_mask = formats[dst].greenMask; - desc->blue_mask = formats[dst].blueMask; - desc->alpha_mask = formats[dst].alphaMask; - desc->byte_count = formats[dst].bpp; - desc->depth_size = formats[dst].depthSize; - desc->stencil_size = formats[dst].stencilSize; - if (formats[dst].isFourcc) desc->Flags |= WINED3DFMT_FLAG_FOURCC; - desc->glInternal = gl_formats_template[src].glInternal; desc->glGammaInternal = gl_formats_template[src].glGammaInternal; desc->glFormat = gl_formats_template[src].glFormat;

1 0

Henri Verbeet : wined3d: Create a separate function for checking a format' s FBO compatibility.
by Alexandre Julliard 27 Mar '09

27 Mar '09

Module: wine Branch: master Commit: 7874a6b74b3e4f77e45044eef4b4377fc7bdf568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7874a6b74b3e4f77e45044eef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 27 15:15:17 2009 +0100 wined3d: Create a separate function for checking a format's FBO compatibility. --- dlls/wined3d/utils.c | 58 ++++++++++++++++++++++++++----------------------- 1 files changed, 31 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e63fd60..7753888 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -404,12 +404,36 @@ static BOOL init_format_base_info(WineD3D_GL_Info *gl_info) return TRUE; } +#define GLINFO_LOCATION (*gl_info) + +static BOOL check_fbo_compat(const WineD3D_GL_Info *gl_info, GLint internal_format) +{ + GLuint tex, fb; + GLenum status; + + while(glGetError()); + glGenTextures(1, &tex); + glBindTexture(GL_TEXTURE_2D, tex); + glTexImage2D(GL_TEXTURE_2D, 0, internal_format, 16, 16, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); + + GL_EXTCALL(glGenFramebuffersEXT(1, &fb)); + GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fb)); + GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, tex, 0)); + + status = GL_EXTCALL(glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT)); + GL_EXTCALL(glDeleteFramebuffersEXT(1, &fb)); + glDeleteTextures(1, &tex); + + checkGLcall("Framebuffer format check"); + + return status == GL_FRAMEBUFFER_COMPLETE_EXT; +} + BOOL initPixelFormatsNoGL(WineD3D_GL_Info *gl_info) { return init_format_base_info(gl_info); } -#define GLINFO_LOCATION (*gl_info) BOOL initPixelFormats(WineD3D_GL_Info *gl_info) { unsigned int src; @@ -433,42 +457,22 @@ BOOL initPixelFormats(WineD3D_GL_Info *gl_info) desc->Flags |= gl_formats_template[src].Flags; desc->heightscale = 1.0; - if(wined3d_settings.offscreen_rendering_mode == ORM_FBO && - gl_formats_template[src].rtInternal != 0) { - GLuint tex, fb; - GLenum status; - + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && gl_formats_template[src].rtInternal) + { /* Check if the default internal format is supported as a frame buffer target, otherwise * fall back to the render target internal. * * Try to stick to the standard format if possible, this limits precision differences */ - while(glGetError()); - glGenTextures(1, &tex); - glBindTexture(GL_TEXTURE_2D, tex); - glTexImage2D(GL_TEXTURE_2D, 0, gl_formats_template[src].glInternal, 16, 16, 0, - GL_RGBA, GL_UNSIGNED_BYTE, NULL); - - GL_EXTCALL(glGenFramebuffersEXT(1, &fb)); - GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fb)); - GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, - GL_TEXTURE_2D, tex, 0)); - - status = GL_EXTCALL(glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT)); - GL_EXTCALL(glDeleteFramebuffersEXT(1, &fb)); - glDeleteTextures(1, &tex); - - checkGLcall("Framebuffer format check"); - - if(status != GL_FRAMEBUFFER_COMPLETE_EXT) { - TRACE("Internal format of %s not supported as frame buffer target, using render target internal instead\n", - debug_d3dformat(gl_formats_template[src].fmt)); + if (!check_fbo_compat(gl_info, gl_formats_template[src].glInternal)) + { + TRACE("Internal format of %s not supported as FBO target, using render target internal instead\n", + debug_d3dformat(gl_formats_template[src].fmt)); gl_info->gl_formats[dst].rtInternal = gl_formats_template[src].rtInternal; } else { TRACE("Format %s is supported as fbo target\n", debug_d3dformat(gl_formats_template[src].fmt)); gl_info->gl_formats[dst].rtInternal = gl_formats_template[src].glInternal; } - } else { gl_info->gl_formats[dst].rtInternal = gl_formats_template[src].glInternal; }

1 0

Henri Verbeet : wined3d: Create a separate function for setting format fixups.
by Alexandre Julliard 27 Mar '09

27 Mar '09

Module: wine Branch: master Commit: b8f25ef6f231ce6efeba357c9a09de22e808c2a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8f25ef6f231ce6efeba357c9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 27 15:15:17 2009 +0100 wined3d: Create a separate function for setting format fixups. --- dlls/wined3d/utils.c | 228 +++++++++++++++++++++++++++----------------------- 1 files changed, 122 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8f25ef6f231ce6efeba3…

1 0

Henri Verbeet : wined3d: Create a separate function for setting a format' s GL texture info.
by Alexandre Julliard 27 Mar '09

27 Mar '09

Module: wine Branch: master Commit: 837f1636627b7adb1fc2568268e4f332ecc9dae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=837f1636627b7adb1fc256826… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 27 15:15:17 2009 +0100 wined3d: Create a separate function for setting a format's GL texture info. --- dlls/wined3d/utils.c | 85 ++++++++++++++++++++++++++------------------------ 1 files changed, 44 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index c4dad45..059c021 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -429,6 +429,49 @@ static BOOL check_fbo_compat(const WineD3D_GL_Info *gl_info, GLint internal_form return status == GL_FRAMEBUFFER_COMPLETE_EXT; } +static void init_format_texture_info(WineD3D_GL_Info *gl_info) +{ + unsigned int i; + + for (i = 0; i < sizeof(gl_formats_template) / sizeof(gl_formats_template[0]); ++i) + { + int fmt_idx = getFmtIdx(gl_formats_template[i].fmt); + struct GlPixelFormatDesc *desc; + + desc = &gl_info->gl_formats[fmt_idx]; + desc->glInternal = gl_formats_template[i].glInternal; + desc->glGammaInternal = gl_formats_template[i].glGammaInternal; + desc->glFormat = gl_formats_template[i].glFormat; + desc->glType = gl_formats_template[i].glType; + desc->color_fixup = COLOR_FIXUP_IDENTITY; + desc->Flags |= gl_formats_template[i].Flags; + desc->heightscale = 1.0; + + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && gl_formats_template[i].rtInternal) + { + /* Check if the default internal format is supported as a frame buffer target, otherwise + * fall back to the render target internal. + * + * Try to stick to the standard format if possible, this limits precision differences */ + if (!check_fbo_compat(gl_info, gl_formats_template[i].glInternal)) + { + TRACE("Internal format of %s not supported as FBO target, using render target internal instead\n", + debug_d3dformat(gl_formats_template[i].fmt)); + desc->rtInternal = gl_formats_template[i].rtInternal; + } + else + { + TRACE("Format %s is supported as fbo target\n", debug_d3dformat(gl_formats_template[i].fmt)); + desc->rtInternal = gl_formats_template[i].glInternal; + } + } + else + { + desc->rtInternal = gl_formats_template[i].glInternal; + } + } +} + static void apply_format_fixups(WineD3D_GL_Info *gl_info) { int idx; @@ -563,49 +606,9 @@ BOOL initPixelFormatsNoGL(WineD3D_GL_Info *gl_info) BOOL initPixelFormats(WineD3D_GL_Info *gl_info) { - unsigned int src; - if (!init_format_base_info(gl_info)) return FALSE; - /* If a format depends on some extensions, remove them from the table above and initialize them - * after this loop */ - for (src = 0; src < sizeof(gl_formats_template) / sizeof(gl_formats_template[0]); ++src) - { - struct GlPixelFormatDesc *desc; - int dst = getFmtIdx(gl_formats_template[src].fmt); - desc = &gl_info->gl_formats[dst]; - - desc->glInternal = gl_formats_template[src].glInternal; - desc->glGammaInternal = gl_formats_template[src].glGammaInternal; - desc->glFormat = gl_formats_template[src].glFormat; - desc->glType = gl_formats_template[src].glType; - desc->color_fixup = COLOR_FIXUP_IDENTITY; - desc->Flags |= gl_formats_template[src].Flags; - desc->heightscale = 1.0; - - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && gl_formats_template[src].rtInternal) - { - /* Check if the default internal format is supported as a frame buffer target, otherwise - * fall back to the render target internal. - * - * Try to stick to the standard format if possible, this limits precision differences */ - if (!check_fbo_compat(gl_info, gl_formats_template[src].glInternal)) - { - TRACE("Internal format of %s not supported as FBO target, using render target internal instead\n", - debug_d3dformat(gl_formats_template[src].fmt)); - gl_info->gl_formats[dst].rtInternal = gl_formats_template[src].rtInternal; - } - else - { - TRACE("Format %s is supported as fbo target\n", debug_d3dformat(gl_formats_template[src].fmt)); - gl_info->gl_formats[dst].rtInternal = gl_formats_template[src].glInternal; - } - } - else - { - gl_info->gl_formats[dst].rtInternal = gl_formats_template[src].glInternal; - } - } + init_format_texture_info(gl_info); apply_format_fixups(gl_info);

1 0

Henri Verbeet : wined3d: Make sure the format actually exists in init_format_texture_info().
by Alexandre Julliard 27 Mar '09

27 Mar '09

Module: wine Branch: master Commit: 5390628e6f3a0b7ea52f107a164651468af5e449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5390628e6f3a0b7ea52f107a1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 27 10:25:55 2009 +0100 wined3d: Make sure the format actually exists in init_format_texture_info(). --- dlls/wined3d/utils.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 059c021..0d51701 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -429,7 +429,7 @@ static BOOL check_fbo_compat(const WineD3D_GL_Info *gl_info, GLint internal_form return status == GL_FRAMEBUFFER_COMPLETE_EXT; } -static void init_format_texture_info(WineD3D_GL_Info *gl_info) +static BOOL init_format_texture_info(WineD3D_GL_Info *gl_info) { unsigned int i; @@ -438,6 +438,13 @@ static void init_format_texture_info(WineD3D_GL_Info *gl_info) int fmt_idx = getFmtIdx(gl_formats_template[i].fmt); struct GlPixelFormatDesc *desc; + if (fmt_idx == -1) + { + ERR("Format %s (%#x) not found.\n", + debug_d3dformat(gl_formats_template[i].fmt), gl_formats_template[i].fmt); + return FALSE; + } + desc = &gl_info->gl_formats[fmt_idx]; desc->glInternal = gl_formats_template[i].glInternal; desc->glGammaInternal = gl_formats_template[i].glGammaInternal; @@ -470,6 +477,8 @@ static void init_format_texture_info(WineD3D_GL_Info *gl_info) desc->rtInternal = gl_formats_template[i].glInternal; } } + + return TRUE; } static void apply_format_fixups(WineD3D_GL_Info *gl_info) @@ -608,7 +617,11 @@ BOOL initPixelFormats(WineD3D_GL_Info *gl_info) { if (!init_format_base_info(gl_info)) return FALSE; - init_format_texture_info(gl_info); + if (!init_format_texture_info(gl_info)) + { + HeapFree(GetProcessHeap(), 0, gl_info->gl_formats); + return FALSE; + } apply_format_fixups(gl_info);

1 0

Andrew Talbot : advapi32: Constify some variables.
by Alexandre Julliard 27 Mar '09

27 Mar '09

Module: wine Branch: master Commit: 301cfd141b7cb64fabb0488cbb4cc7fb924cd8dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=301cfd141b7cb64fabb0488cb… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Mar 26 21:23:50 2009 +0000 advapi32: Constify some variables. --- dlls/advapi32/crypt.c | 2 +- dlls/advapi32/crypt.h | 2 +- dlls/advapi32/crypt_arc4.c | 2 +- dlls/advapi32/tests/crypt_lmhash.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index cae03d8..d1fc25d 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -2243,7 +2243,7 @@ BOOL WINAPI CryptVerifySignatureA (HCRYPTHASH hHash, CONST BYTE *pbSignature, DW * TRUE if blocks are the same * FALSE if blocks are different */ -BOOL WINAPI SystemFunction030(PVOID b1, PVOID b2) +BOOL WINAPI SystemFunction030(LPCVOID b1, LPCVOID b2) { return !memcmp(b1, b2, 0x10); } diff --git a/dlls/advapi32/crypt.h b/dlls/advapi32/crypt.h index 3d630da..d9018f4 100644 --- a/dlls/advapi32/crypt.h +++ b/dlls/advapi32/crypt.h @@ -93,6 +93,6 @@ struct ustring { unsigned char *Buffer; }; -NTSTATUS WINAPI SystemFunction032(struct ustring *data, struct ustring *key); +NTSTATUS WINAPI SystemFunction032(struct ustring *data, const struct ustring *key); #endif /* __WINE_CRYPT_H_ */ diff --git a/dlls/advapi32/crypt_arc4.c b/dlls/advapi32/crypt_arc4.c index ebe4058..523cda2 100644 --- a/dlls/advapi32/crypt_arc4.c +++ b/dlls/advapi32/crypt_arc4.c @@ -94,7 +94,7 @@ static void arc4_ProcessString(arc4_info *a4i, BYTE *inoutString, unsigned int l * NOTES * see http://web.it.kth.se/~rom/ntsec.html#crypto-strongavail */ -NTSTATUS WINAPI SystemFunction032(struct ustring *data, struct ustring *key) +NTSTATUS WINAPI SystemFunction032(struct ustring *data, const struct ustring *key) { arc4_info a4i; diff --git a/dlls/advapi32/tests/crypt_lmhash.c b/dlls/advapi32/tests/crypt_lmhash.c index 66ebe82..253090a 100644 --- a/dlls/advapi32/tests/crypt_lmhash.c +++ b/dlls/advapi32/tests/crypt_lmhash.c @@ -43,8 +43,8 @@ typedef VOID (WINAPI *fnSystemFunction006)( PCSTR passwd, PSTR lmhash ); typedef NTSTATUS (WINAPI *fnSystemFunction008)(const BYTE *, const BYTE *, LPBYTE); typedef NTSTATUS (WINAPI *fnSystemFunction009)(const BYTE *, const BYTE *, LPBYTE); typedef int (WINAPI *descrypt)(unsigned char *, unsigned char *, unsigned char *); -typedef NTSTATUS (WINAPI *fnSystemFunction030)(void*, void*); -typedef NTSTATUS (WINAPI *fnSystemFunction032)(struct ustring *, struct ustring *); +typedef NTSTATUS (WINAPI *fnSystemFunction030)(const void*, const void*); +typedef NTSTATUS (WINAPI *fnSystemFunction032)(struct ustring *, const struct ustring *); fnSystemFunction001 pSystemFunction001; fnSystemFunction002 pSystemFunction002;

1 0

Andrew Talbot : advapi32: Constify some variables.
by Alexandre Julliard 27 Mar '09

27 Mar '09

Module: wine Branch: master Commit: c17cfbdc51b88643ef1eedd0a562da57e4c18266 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c17cfbdc51b88643ef1eedd0a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Mar 26 21:23:55 2009 +0000 advapi32: Constify some variables. --- dlls/advapi32/service.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 51a41e7..7fea937 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -340,7 +340,7 @@ static DWORD service_handle_start(service_data *service, const WCHAR *data, DWOR /****************************************************************************** * service_handle_control */ -static DWORD service_handle_control(service_data *service, DWORD dwControl) +static DWORD service_handle_control(const service_data *service, DWORD dwControl) { DWORD ret = ERROR_INVALID_SERVICE_CONTROL; @@ -1264,7 +1264,7 @@ static DWORD move_string_to_buffer(BYTE **buf, LPWSTR *string_ptr) return cb; } -static DWORD size_string(LPWSTR string) +static DWORD size_string(LPCWSTR string) { return (string ? (strlenW(string) + 1)*sizeof(WCHAR) : sizeof(WCHAR)); }

1 0