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

Jacek Caban : wininet: Rename WININETAPPINFOW to appinfo_t.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 6d1601a850d15d8f2da229c0247c29a3d456f025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d1601a850d15d8f2da229c02… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 13 01:45:06 2009 +0200 wininet: Rename WININETAPPINFOW to appinfo_t. --- dlls/wininet/dialogs.c | 4 ++-- dlls/wininet/ftp.c | 44 ++++++++++++++++++++++---------------------- dlls/wininet/http.c | 15 +++++++-------- dlls/wininet/internet.c | 27 +++++++++++++-------------- dlls/wininet/internet.h | 8 ++++---- 5 files changed, 48 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d1601a850d15d8f2da22…

1 0

Jacek Caban : wininet: Rename WININETHTTPREQW to http_request_t.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 34abacde71097339a4d876f3c8634b45250d64b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34abacde71097339a4d876f3c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 13 01:41:50 2009 +0200 wininet: Rename WININETHTTPREQW to http_request_t. --- dlls/wininet/dialogs.c | 8 +- dlls/wininet/http.c | 163 +++++++++++++++++++++++------------------------ dlls/wininet/internet.h | 4 +- 3 files changed, 87 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=34abacde71097339a4d87…

1 0

Jacek Caban : wininet: Rename WININETHTTPSESSIONW to http_session_t.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: e9f4a4058414b8445a81ee74523af9438ac59e23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9f4a4058414b8445a81ee745… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 13 01:41:18 2009 +0200 wininet: Rename WININETHTTPSESSIONW to http_session_t. --- dlls/wininet/dialogs.c | 4 ++-- dlls/wininet/http.c | 34 +++++++++++++++++----------------- dlls/wininet/internet.h | 6 +++--- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 41494a6..a8d071e 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -63,7 +63,7 @@ struct WININET_ErrorDlgParams static BOOL WININET_GetProxyServer( HINTERNET hRequest, LPWSTR szBuf, DWORD sz ) { LPWININETHTTPREQW lpwhr; - LPWININETHTTPSESSIONW lpwhs = NULL; + http_session_t *lpwhs = NULL; LPWININETAPPINFOW hIC = NULL; LPWSTR p; @@ -204,7 +204,7 @@ static BOOL WININET_SetProxyAuthorization( HINTERNET hRequest, LPWSTR username, LPWSTR password ) { LPWININETHTTPREQW lpwhr; - LPWININETHTTPSESSIONW lpwhs; + http_session_t *lpwhs; LPWININETAPPINFOW hIC; LPWSTR p; diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 5832a5c..d35784e 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1018,7 +1018,7 @@ HINTERNET WINAPI HttpOpenRequestW(HINTERNET hHttpSession, LPCWSTR lpszReferrer , LPCWSTR *lpszAcceptTypes, DWORD dwFlags, DWORD_PTR dwContext) { - LPWININETHTTPSESSIONW lpwhs; + http_session_t *lpwhs; HINTERNET handle = NULL; TRACE("(%p, %s, %s, %s, %s, %p, %08x, %08lx)\n", hHttpSession, @@ -1032,7 +1032,7 @@ HINTERNET WINAPI HttpOpenRequestW(HINTERNET hHttpSession, TRACE("\taccept type: %s\n",debugstr_w(lpszAcceptTypes[i])); } - lpwhs = (LPWININETHTTPSESSIONW) WININET_GetObject( hHttpSession ); + lpwhs = (http_session_t*) WININET_GetObject( hHttpSession ); if (NULL == lpwhs || lpwhs->hdr.htype != WH_HHTTPSESSION) { INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); @@ -1388,7 +1388,7 @@ static WCHAR *HTTP_BuildProxyRequestUrl(WININETHTTPREQW *req) static const WCHAR slash[] = { '/',0 }; static const WCHAR format[] = { 'h','t','t','p',':','/','/','%','s',':','%','d',0 }; static const WCHAR formatSSL[] = { 'h','t','t','p','s',':','/','/','%','s',':','%','d',0 }; - WININETHTTPSESSIONW *session = req->lpHttpSession; + http_session_t *session = req->lpHttpSession; size = 16; /* "https://" + sizeof(port#) + ":/\0" */ size += strlenW( session->lpszHostName ) + strlenW( req->lpszPath ); @@ -1410,7 +1410,7 @@ static WCHAR *HTTP_BuildProxyRequestUrl(WININETHTTPREQW *req) * HTTP_DealWithProxy */ static BOOL HTTP_DealWithProxy( LPWININETAPPINFOW hIC, - LPWININETHTTPSESSIONW lpwhs, LPWININETHTTPREQW lpwhr) + http_session_t *lpwhs, LPWININETHTTPREQW lpwhr) { WCHAR buf[MAXHOSTNAME]; WCHAR proxy[MAXHOSTNAME + 15]; /* 15 == "http://" + sizeof(port#) + ":/\0" */ @@ -1455,7 +1455,7 @@ static BOOL HTTP_DealWithProxy( LPWININETAPPINFOW hIC, static BOOL HTTP_ResolveName(LPWININETHTTPREQW lpwhr) { char szaddr[INET6_ADDRSTRLEN]; - LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession; + http_session_t *lpwhs = lpwhr->lpHttpSession; const void *addr; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, @@ -1604,7 +1604,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe switch(option) { case INTERNET_OPTION_SECURITY_FLAGS: { - LPWININETHTTPSESSIONW lpwhs; + http_session_t *lpwhs; lpwhs = req->lpHttpSession; if (*size < sizeof(ULONG)) @@ -2392,7 +2392,7 @@ static const object_vtbl_t HTTPREQVtbl = { * NULL on failure * */ -HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs, +HINTERNET WINAPI HTTP_HttpOpenRequestW(http_session_t *lpwhs, LPCWSTR lpszVerb, LPCWSTR lpszObjectName, LPCWSTR lpszVersion, LPCWSTR lpszReferrer , LPCWSTR *lpszAcceptTypes, DWORD dwFlags, DWORD_PTR dwContext) @@ -3134,7 +3134,7 @@ BOOL WINAPI HttpSendRequestExW(HINTERNET hRequest, { BOOL ret = FALSE; LPWININETHTTPREQW lpwhr; - LPWININETHTTPSESSIONW lpwhs; + http_session_t *lpwhs; LPWININETAPPINFOW hIC; TRACE("(%p, %p, %p, %08x, %08lx)\n", hRequest, lpBuffersIn, @@ -3222,7 +3222,7 @@ BOOL WINAPI HttpSendRequestW(HINTERNET hHttpRequest, LPCWSTR lpszHeaders, DWORD dwHeaderLength, LPVOID lpOptional ,DWORD dwOptionalLength) { LPWININETHTTPREQW lpwhr; - LPWININETHTTPSESSIONW lpwhs = NULL; + http_session_t *lpwhs = NULL; LPWININETAPPINFOW hIC = NULL; BOOL r; @@ -3332,7 +3332,7 @@ static LPWSTR HTTP_GetRedirectURL(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl) { static WCHAR szHttp[] = {'h','t','t','p',0}; static WCHAR szHttps[] = {'h','t','t','p','s',0}; - LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession; + http_session_t *lpwhs = lpwhr->lpHttpSession; URL_COMPONENTSW urlComponents; DWORD url_length = 0; LPWSTR orig_url; @@ -3392,7 +3392,7 @@ static LPWSTR HTTP_GetRedirectURL(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl) */ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl) { - LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession; + http_session_t *lpwhs = lpwhr->lpHttpSession; LPWININETAPPINFOW hIC = lpwhs->lpAppInfo; BOOL using_proxy = hIC->lpszProxy && hIC->lpszProxy[0]; WCHAR path[INTERNET_MAX_URL_LENGTH]; @@ -3575,7 +3575,7 @@ static BOOL HTTP_SecureProxyConnect(LPWININETHTTPREQW lpwhr) BOOL ret; static const WCHAR szConnect[] = {'C','O','N','N','E','C','T',0}; static const WCHAR szFormat[] = {'%','s',':','%','d',0}; - LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession; + http_session_t *lpwhs = lpwhr->lpHttpSession; TRACE("\n"); @@ -3944,7 +3944,7 @@ lend: */ static void HTTPSESSION_Destroy(object_header_t *hdr) { - LPWININETHTTPSESSIONW lpwhs = (LPWININETHTTPSESSIONW) hdr; + http_session_t *lpwhs = (http_session_t*) hdr; TRACE("%p\n", lpwhs); @@ -3976,7 +3976,7 @@ static DWORD HTTPSESSION_QueryOption(object_header_t *hdr, DWORD option, void *b static DWORD HTTPSESSION_SetOption(object_header_t *hdr, DWORD option, void *buffer, DWORD size) { - WININETHTTPSESSIONW *ses = (WININETHTTPSESSIONW*)hdr; + http_session_t *ses = (http_session_t*)hdr; switch(option) { case INTERNET_OPTION_USERNAME: @@ -4025,7 +4025,7 @@ HINTERNET HTTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, LPCWSTR lpszPassword, DWORD dwFlags, DWORD_PTR dwContext, DWORD dwInternalFlags) { - LPWININETHTTPSESSIONW lpwhs = NULL; + http_session_t *lpwhs = NULL; HINTERNET handle = NULL; TRACE("-->\n"); @@ -4038,7 +4038,7 @@ HINTERNET HTTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, assert( hIC->hdr.htype == WH_HINIT ); - lpwhs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WININETHTTPSESSIONW)); + lpwhs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(http_session_t)); if (NULL == lpwhs) { INTERNET_SetLastError(ERROR_OUTOFMEMORY); @@ -4122,7 +4122,7 @@ lerror: static BOOL HTTP_OpenConnection(LPWININETHTTPREQW lpwhr) { BOOL bSuccess = FALSE; - LPWININETHTTPSESSIONW lpwhs; + http_session_t *lpwhs; LPWININETAPPINFOW hIC = NULL; char szaddr[INET6_ADDRSTRLEN]; const void *addr; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 4cd22d6..527e785 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -167,7 +167,7 @@ typedef struct INTERNET_PORT nServerPort; /* the port of the server we directly connect to */ struct sockaddr_storage socketAddress; socklen_t sa_len; -} WININETHTTPSESSIONW, *LPWININETHTTPSESSIONW; +} http_session_t; #define HDR_ISREQUEST 0x0001 #define HDR_COMMADELIMITED 0x0002 @@ -189,7 +189,7 @@ typedef struct gzip_stream_t gzip_stream_t; typedef struct { object_header_t hdr; - WININETHTTPSESSIONW *lpHttpSession; + http_session_t *lpHttpSession; LPWSTR lpszPath; LPWSTR lpszVerb; LPWSTR lpszRawHeaders; @@ -393,7 +393,7 @@ LPSTR INTERNET_GetNextLine(INT nSocket, LPDWORD dwLen); BOOLAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, DWORD dwHeaderLength, LPVOID lpOptional, DWORD dwOptionalLength, DWORD dwContentLength, BOOL bEndRequest); -INTERNETAPI HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs, +INTERNETAPI HINTERNET WINAPI HTTP_HttpOpenRequestW(http_session_t *session, LPCWSTR lpszVerb, LPCWSTR lpszObjectName, LPCWSTR lpszVersion, LPCWSTR lpszReferrer , LPCWSTR *lpszAcceptTypes, DWORD dwFlags, DWORD_PTR dwContext);

1 0

Alexander Nicolaysen Sørnes : taskmgr: Update Norwegian Bokmål translation.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 0e85dec8b6ceacc9eebf29a1d8d85ec2f15be621 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e85dec8b6ceacc9eebf29a1d… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jul 12 17:48:47 2009 +0200 taskmgr: Update Norwegian Bokmål translation. --- programs/taskmgr/No.rc | 172 ++++++++++++++++++++++++++++++++++++------------ 1 files changed, 130 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e85dec8b6ceacc9eebf2…

1 0

Alexander Nicolaysen Sørnes : crypt32: Update Norwegian Bokmål translation.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: de8099fcc37241f5ea2efe23dc509c1c3755763d URL: http://source.winehq.org/git/wine.git/?a=commit;h=de8099fcc37241f5ea2efe23d… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jul 12 17:24:19 2009 +0200 crypt32: Update Norwegian Bokmål translation. --- dlls/crypt32/crypt32_No.rc | 123 ++++++++++++++++++++++++++++++++++---------- 1 files changed, 95 insertions(+), 28 deletions(-) diff --git a/dlls/crypt32/crypt32_No.rc b/dlls/crypt32/crypt32_No.rc index 2665286..b9edbff 100644 --- a/dlls/crypt32/crypt32_No.rc +++ b/dlls/crypt32/crypt32_No.rc @@ -1,7 +1,7 @@ /* * crypt32 dll resources * - * Copyright (C) 2006 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright (C) 2006-2009 Alexander N. Sørnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,22 +20,24 @@ #include "cryptres.h" +#pragma code_page(65001) + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE DISCARDABLE { - IDS_AUTHORITY_KEY_ID "Identifiserer for autentiseringsn�kkel" - IDS_KEY_ATTRIBUTES "N�kkelegenskaper" - IDS_KEY_USAGE_RESTRICTION "Begrensning av n�kkelbruk" + IDS_AUTHORITY_KEY_ID "Identifiserer for autentiseringsnøkkel" + IDS_KEY_ATTRIBUTES "Nøkkelegenskaper" + IDS_KEY_USAGE_RESTRICTION "Begrensning av nøkkelbruk" IDS_SUBJECT_ALT_NAME "Alternativt navn for emne" IDS_ISSUER_ALT_NAME "Alternativt navn for utsteder" IDS_BASIC_CONSTRAINTS "Basisbegrensninger" - IDS_KEY_USAGE "N�kkelbruk" + IDS_KEY_USAGE "Nøkkelbruk" IDS_CERT_POLICIES "Sertifikatholdninger" - IDS_SUBJECT_KEY_IDENTIFIER "Identifiserer for emnen�kkel" + IDS_SUBJECT_KEY_IDENTIFIER "Identifiserer for emnenøkkel" IDS_CRL_REASON_CODE "CRL-grunnkode" IDS_CRL_DIST_POINTS "CRL-distribusjonspunkter" - IDS_ENHANCED_KEY_USAGE "Forbedret n�kkelbruk" + IDS_ENHANCED_KEY_USAGE "Forbedret nøkkelbruk" IDS_AUTHORITY_INFO_ACCESS "Myndighet-informasjonstilgang" IDS_CERT_EXTENSIONS "Sertifikatutvidelser" IDS_NEXT_UPDATE_LOCATION "Neste oppdateringsplassering" @@ -54,7 +56,7 @@ STRINGTABLE DISCARDABLE IDS_USER_NOTICE "Brukervarsel" IDS_OCSP "On-line Certificate Status Protocol" IDS_CA_ISSUER "Utsteder for sertifiseringsautoritet" - IDS_CERT_TEMPLATE_NAME "Navn p� sertifiseringsmal" + IDS_CERT_TEMPLATE_NAME "Navn på sertifiseringsmal" IDS_CERT_TYPE "Sertifikattype" IDS_CERT_MANIFOLD "Sertifikatmangfold" IDS_NETSCAPE_CERT_TYPE "Netscape-sertifikattype" @@ -94,15 +96,15 @@ STRINGTABLE DISCARDABLE IDS_ISSUING_DIST_POINT "Utsteder distribusjonspunkt" IDS_FRESHEST_CRL "Nyeste CRL" IDS_NAME_CONSTRAINTS "Navnebegrensninger" - IDS_POLICY_MAPPINGS "Framgangsm�tekartlegginger" - IDS_POLICY_CONSTRAINTS "Framgangsm�tebegresninger" + IDS_POLICY_MAPPINGS "Framgangsmåtekartlegginger" + IDS_POLICY_CONSTRAINTS "Framgangsmåtebegresninger" IDS_CROSS_CERT_DIST_POINTS "Distribusjonspunkter for kryss-sertifikat" - IDS_APPLICATION_POLICIES "Framgangsm�ter for programmers" - IDS_APPLICATION_POLICY_MAPPINGS "Framgangsm�tekartlegginger for programmer" - IDS_APPLICATION_POLICY_CONSTRAINTS "Framgangsm�tebegrensninger for programmer" + IDS_APPLICATION_POLICIES "Framgangsmåter for programmers" + IDS_APPLICATION_POLICY_MAPPINGS "Framgangsmåtekartlegginger for programmer" + IDS_APPLICATION_POLICY_CONSTRAINTS "Framgangsmåtebegrensninger for programmer" IDS_CMC_DATA "CMC-data" IDS_CMC_RESPONSE "CMS-svar" - IDS_UNSIGNED_CMC_REQUEST "Usignert CMC-foresp�rsel" + IDS_UNSIGNED_CMC_REQUEST "Usignert CMC-forespørsel" IDS_CMC_STATUS_INFO "CMC-statusinformasjon" IDS_CMC_EXTENSIONS "CMC-utvidelser" IDS_CMC_ATTRIBUTES "CMC-egenskaper" @@ -110,30 +112,30 @@ STRINGTABLE DISCARDABLE IDS_PKCS_7_SIGNED "PKCS 7 Signert" IDS_PKCS_7_ENVELOPED "PKCS 7 Innpakket" IDS_PKCS_7_SIGNED_ENVELOPED "PKCS 7 Signert Innpakket" - IDS_PKCS_7_DIGESTED "PKCS 7 Ford�yet" + IDS_PKCS_7_DIGESTED "PKCS 7 Fordøyet" IDS_PKCS_7_ENCRYPTED "PKCS 7 Kryptert" IDS_PREVIOUS_CA_CERT_HASH "Forrige CA-sertifikatlappskaus" IDS_CRL_VIRTUAL_BASE "Virtuelt basis-CRL-nummer" IDS_CRL_NEXT_PUBLISH "Neste CRL-utgiving" IDS_CA_EXCHANGE "CA-krypteringssertifikat" - IDS_KEY_RECOVERY_AGENT "Agent for n�kkelgjenoppretting" + IDS_KEY_RECOVERY_AGENT "Agent for nøkkelgjenoppretting" IDS_CERTIFICATE_TEMPLATE "Informasjon om sertifikatmal" IDS_ENTERPRISE_ROOT_OID "Storselskap-rot-OID" IDS_RDN_DUMMY_SIGNER "Tullesignerer" - IDS_ARCHIVED_KEY_ATTR "Kryptert privat n�kkel" + IDS_ARCHIVED_KEY_ATTR "Kryptert privat nøkkel" IDS_CRL_SELF_CDP "Publisert CRL-plasseringer" - IDS_REQUIRE_CERT_CHAIN_POLICY "H�ndhev sertifikatlenkepolitikk" + IDS_REQUIRE_CERT_CHAIN_POLICY "Håndhev sertifikatlenkepolitikk" IDS_TRANSACTION_ID "Transaksjons-id" IDS_SENDER_NONCE "Gjeldende sender" IDS_RECIPIENT_NONCE "Gjeldende mottaker" IDS_REG_INFO "Reg info" IDS_GET_CERTIFICATE "Hent sertifikat" IDS_GET_CRL "Hent CRL" - IDS_REVOKE_REQUEST "Gjenoppliv foresp�rsel" - IDS_QUERY_PENDING "Sp�rring venter" + IDS_REVOKE_REQUEST "Gjenoppliv forespørsel" + IDS_QUERY_PENDING "Spørring venter" IDS_SORTED_CTL "Tillitsliste for sertifikater" - IDS_ARCHIVED_KEY_CERT_HASH "Arkivert n�kkelsertifikatlappskaus" - IDS_PRIVATE_KEY_USAGE_PERIOD "Privat n�kkelbrukperiode" + IDS_ARCHIVED_KEY_CERT_HASH "Arkivert nøkkelsertifikatlappskaus" + IDS_PRIVATE_KEY_USAGE_PERIOD "Privat nøkkelbrukperiode" IDS_CLIENT_INFORMATION "Klientinformasjon" IDS_SERVER_AUTHENTICATION "Tjenerautentisering" IDS_CLIENT_AUTHENTICATION "Klientautentisering" @@ -150,21 +152,21 @@ STRINGTABLE DISCARDABLE IDS_NT5_CRYPTO "Windows sytemkomponent-godkjenning" IDS_OEM_WHQL_CRYPTO "OEM Windows systemkomponent-godkjenning" IDS_EMBEDDED_NT_CRYPTO "Innebygget Windows systemkomponent-godkjenning" - IDS_KEY_PACK_LICENSES "N�kkelpakkelisenser" + IDS_KEY_PACK_LICENSES "Nøkkelpakkelisenser" IDS_LICENSE_SERVER "Lisenstjener-verifisering" - IDS_SMART_CARD_LOGON "Smart Card-p�logging" + IDS_SMART_CARD_LOGON "Smart Card-pålogging" IDS_DIGITAL_RIGHTS "Digitale rettigheter" IDS_QUALIFIED_SUBORDINATION "Kvalifisert underordinering" - IDS_KEY_RECOVERY "N�kkelgjenoppretting" + IDS_KEY_RECOVERY "Nøkkelgjenoppretting" IDS_DOCUMENT_SIGNING "Dokumentsignering" IDS_IPSEC_IKE_INTERMEDIATE "IP-sikkerhet IKE viderekommen" IDS_FILE_RECOVERY "Filgjenoppretting" IDS_ROOT_LIST_SIGNER "Rotlistesignerer" - IDS_ANY_APPLICATION_POLICIES "Alle framgangsm�ter for programmer" + IDS_ANY_APPLICATION_POLICIES "Alle framgangsmåter for programmer" IDS_DS_EMAIL_REPLICATION "Katalogtjeneste e-postreplikering" - IDS_ENROLLMENT_AGENT "Agent for sertifikatforesp�rsler" + IDS_ENROLLMENT_AGENT "Agent for sertifikatforespørsler" IDS_LIFETIME_SIGNING "Livstidsignering" - IDS_ANY_CERT_POLICY "Alle framgangsm�ter for utsteding" + IDS_ANY_CERT_POLICY "Alle framgangsmåter for utsteding" } STRINGTABLE DISCARDABLE @@ -173,4 +175,69 @@ STRINGTABLE DISCARDABLE IDS_LOCALIZEDNAME_MY "Personlig" IDS_LOCALIZEDNAME_CA "Mellomliggende sertifiseringsinstanser" IDS_LOCALIZEDNAME_ADDRESSBOOK "Andre personer" + IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "Betrodde utgivere" + IDS_LOCALIZEDNAME_DISALLOWED "Mistrodde sertifikater" +} + +STRINGTABLE DISCARDABLE +{ + IDS_KEY_ID "NøkkelID=" + IDS_CERT_ISSUER "Utsteder" + IDS_CERT_SERIAL_NUMBER "Serienummer=" + IDS_ALT_NAME_OTHER_NAME "Annet navn=" + IDS_ALT_NAME_RFC822_NAME "E-postadresse=" + IDS_ALT_NAME_DNS_NAME "DNS-navn=" + IDS_ALT_NAME_DIRECTORY_NAME "Katalogadresse" + IDS_ALT_NAME_URL "URL=" + IDS_ALT_NAME_IP_ADDRESS "IP-adresse=" + IDS_ALT_NAME_MASK "Mask=" + IDS_ALT_NAME_REGISTERED_ID "Registrert ID=" + IDS_USAGE_UNKNOWN "Ukjent nøkkelbruk" + IDS_SUBJECT_TYPE "Emnetype=" + IDS_SUBJECT_TYPE_CA "CA" + IDS_SUBJECT_TYPE_END_CERT "Sluttenhet" + IDS_PATH_LENGTH "Begrensning på stilengde=" + IDS_PATH_LENGTH_NONE "Ingen" + IDS_INFO_NOT_AVAILABLE "Informasjonen er utilgjengelig" + IDS_AIA "Tilgang til autoritetsinfo" + IDS_ACCESS_METHOD "Tilgangsmetode=" + IDS_ACCESS_METHOD_OCSP "OCSP" + IDS_ACCESS_METHOD_CA_ISSUERS "CA-utstedere" + IDS_ACCESS_METHOD_UNKNOWN "Ukjent tilgangsmetode" + IDS_ACCESS_LOCATION "Alternativt navn" + IDS_CRL_DIST_POINT "Distribusjonspunkt for CRL" + IDS_CRL_DIST_POINT_NAME "Navn på distribusjonspunkt" + IDS_CRL_DIST_POINT_FULL_NAME "Fult navn" + IDS_CRL_DIST_POINT_RDN_NAME "RDN-navn" + IDS_CRL_DIST_POINT_REASON "CRL-årsak=" + IDS_CRL_DIST_POINT_ISSUER "CRL-utsteder" + IDS_REASON_KEY_COMPROMISE "Nøkellkompromiss" + IDS_REASON_CA_COMPROMISE "CA-kompromiss" + IDS_REASON_AFFILIATION_CHANGED "Tilslutning endret" + IDS_REASON_SUPERSEDED "Erstattet" + IDS_REASON_CESSATION_OF_OPERATION "Operasjonen opphørte" + IDS_REASON_CERTIFICATE_HOLD "Sertifikatet er holdt tilbake" + IDS_FINANCIAL_CRITERIA "Finansiell informasjon=" + IDS_FINANCIAL_CRITERIA_AVAILABLE "Tilgjengelig" + IDS_FINANCIAL_CRITERIA_NOT_AVAILABLE "Ikke tilgjengelig" + IDS_FINANCIAL_CRITERIA_MEETS_CRITERIA "Møter kriterier=" + IDS_YES "Ja" + IDS_NO "Nei" + IDS_DIGITAL_SIGNATURE "Digital signatur" + IDS_NON_REPUDIATION "Kan ikke tilbakekalles" + IDS_KEY_ENCIPHERMENT "Nøkkelkryptering" + IDS_DATA_ENCIPHERMENT "Datakryptering" + IDS_KEY_AGREEMENT "Nøkkel-avtale" + IDS_CERT_SIGN "Sertifikatsignering" + IDS_OFFLINE_CRL_SIGN "Lokal CRL-signering" + IDS_CRL_SIGN "CRL-signering" + IDS_ENCIPHER_ONLY "Kun kryptering" + IDS_DECIPHER_ONLY "Kun dekryptering" + IDS_NETSCAPE_SSL_CLIENT "Autentisering av SSL-klient" + IDS_NETSCAPE_SSL_SERVER "Autentisering av SSL-tjener" + IDS_NETSCAPE_SMIME "S/MIME" + IDS_NETSCAPE_SIGN "Signatur" + IDS_NETSCAPE_SSL_CA "SSL CA" + IDS_NETSCAPE_SMIME_CA "S/MIME CA" + IDS_NETSCAPE_SIGN_CA "Signatur CA" }

1 0

Rein Klazes : comdlg32/tests: Remove file dialog resize tests that rely on CDN_SELCHANGE notifications.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 36d5265aee92837d217fdc3d6fbf315ba05a4b62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36d5265aee92837d217fdc3d6… Author: Rein Klazes <wijn(a)online.nl> Date: Sun Jul 12 14:36:10 2009 +0200 comdlg32/tests: Remove file dialog resize tests that rely on CDN_SELCHANGE notifications. These notifications are not always sent on some (but not all) win2k3/vista/win2k8 machines. --- dlls/comdlg32/tests/filedlg.c | 35 +++++++++++++---------------------- 1 files changed, 13 insertions(+), 22 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 63375bb..2bef8ce 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -273,23 +273,20 @@ static void test_create_view_template(void) /* test cases for resizing of the file dialog */ struct { DWORD flags; - int resize_folderchange; /* change in CDN_FOLDERCHANGE handler */ - int resize_selchange; /* change in CDN_SELCHANGE handler */ - int resize_timer1; /* change in first WM_TIMER handler */ - int resize_check; /* expected change (in second WM_TIMER handler) */ - BOOL todo; /* mark that test todo_wine */ - BOOL testcontrols; /* test resizing and moving of the controls */ + int resize_folderchange;/* change in CDN_FOLDERCHANGE handler */ + int resize_timer1; /* change in first WM_TIMER handler */ + int resize_check; /* expected change (in second WM_TIMER handler) */ + BOOL todo; /* mark that test todo_wine */ + BOOL testcontrols; /* test resizing and moving of the controls */ } resize_testcases[] = { - { 0 , 10, 10, 10, 30,FALSE,FALSE}, /* 0 */ - { 0 ,-10,-10,-10,-30,FALSE,FALSE}, - { OFN_ENABLESIZING , 0, 0, 0, 0,FALSE,FALSE}, - { OFN_ENABLESIZING , 0, 0,-10, 0,FALSE,FALSE}, - { OFN_ENABLESIZING , 0, 0, 10, 10,FALSE, TRUE}, - { OFN_ENABLESIZING , 0,-10, 0, 0,FALSE,FALSE}, /* 5 */ - { OFN_ENABLESIZING , 0, 10, 0, 10,FALSE,FALSE}, - { OFN_ENABLESIZING ,-10, 0, 0, 10,FALSE,FALSE}, - { OFN_ENABLESIZING , 10, 0, 0, 10,FALSE,FALSE}, - { OFN_ENABLESIZING , 0, 0, 10, 20,FALSE,FALSE}, + { 0 , 10, 10, 20,FALSE,FALSE}, /* 0 */ + { 0 ,-10,-10,-20,FALSE,FALSE}, + { OFN_ENABLESIZING , 0, 0, 0,FALSE,FALSE}, + { OFN_ENABLESIZING , 0,-10, 0,FALSE,FALSE}, + { OFN_ENABLESIZING , 0, 10, 10,FALSE, TRUE}, + { OFN_ENABLESIZING ,-10, 0, 10,FALSE,FALSE}, /* 5 */ + { OFN_ENABLESIZING , 10, 0, 10,FALSE,FALSE}, + { OFN_ENABLESIZING , 0, 10, 20,FALSE,FALSE}, /* mark the end */ { 0xffffffff } }; @@ -338,12 +335,6 @@ static LONG_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, L MoveWindow( parent, initrc.left,initrc.top, initrc.right - initrc.left + resize, initrc.bottom - initrc.top + resize, TRUE); } - } else if(( (LPNMHDR)lParam)->code == CDN_SELCHANGE){ - if( (resize = resize_testcases[index].resize_selchange)){ - GetWindowRect( parent, &rc); - MoveWindow( parent, rc.left,rc.top, rc.right - rc.left + resize, - rc.bottom - rc.top + resize, TRUE); - } SetTimer( dlg, 0, 100, 0); } break;

1 0

Nikolay Sivov : comctl32/header: Update item bounds on WM_SIZE.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: fdb7412725d492442d02de70637eadc0314ecfa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdb7412725d492442d02de706… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jul 12 04:40:58 2009 +0400 comctl32/header: Update item bounds on WM_SIZE. --- dlls/comctl32/header.c | 3 +-- dlls/comctl32/tests/header.c | 32 ++++++++++---------------------- 2 files changed, 11 insertions(+), 24 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index aa68102..1ee58cd 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -247,8 +247,7 @@ HEADER_SetItemBounds (HEADER_INFO *infoPtr) static LRESULT HEADER_Size (HEADER_INFO *infoPtr) { - infoPtr->bRectsValid = FALSE; - + HEADER_SetItemBounds(infoPtr); return 0; } diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 3b6aa30..bf3960e 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -819,10 +819,8 @@ static void test_hdm_getitemrect(HWND hParent) expect(80, rect.left); expect(0, rect.top); expect(160, rect.right); - todo_wine - { - expect(g_customheight, rect.bottom); - } + expect(g_customheight, rect.bottom); + retVal = SendMessage(hChild, HDM_GETITEMRECT, 0, (LPARAM) &rect); ok(retVal == TRUE, "Getting item rect should TRUE, got %d\n", retVal); @@ -831,10 +829,8 @@ static void test_hdm_getitemrect(HWND hParent) expect(0, rect.top); expect(80, rect.right); - todo_wine - { - expect(g_customheight, rect.bottom); - } + expect(g_customheight, rect.bottom); + retVal = SendMessage(hChild, HDM_GETITEMRECT, 10, (LPARAM) &rect); ok(retVal == 0, "Getting rect of nonexistent item should return 0, got %d\n", retVal); @@ -906,20 +902,14 @@ static void test_hdm_hittest(HWND hParent) flush_sequences(sequences, NUM_MSG_SEQUENCES); retVal = SendMessage(hChild, HDM_HITTEST, 0, (LPARAM) &hdHitTestInfo); - todo_wine - { - expect(0, retVal); - expect(0, hdHitTestInfo.iItem); - } + expect(0, retVal); + expect(0, hdHitTestInfo.iItem); pt.x = secondItemRightBoundary - 1; pt.y = bottomBoundary - 1; hdHitTestInfo.pt = pt; retVal = SendMessage(hChild, HDM_HITTEST, 1, (LPARAM) &hdHitTestInfo); - todo_wine - { - expect(1, retVal); - } + expect(1, retVal); expect(1, hdHitTestInfo.iItem); pt.x = secondItemRightBoundary; @@ -950,11 +940,9 @@ static void test_hdm_sethotdivider(HWND hParent) "adder header control to parent", FALSE); flush_sequences(sequences, NUM_MSG_SEQUENCES); - todo_wine - { - retVal = SendMessage(hChild, HDM_SETHOTDIVIDER, TRUE, MAKELPARAM(5, 5)); - expect(0, retVal); - } + retVal = SendMessage(hChild, HDM_SETHOTDIVIDER, TRUE, MAKELPARAM(5, 5)); + expect(0, retVal); + retVal = SendMessage(hChild, HDM_SETHOTDIVIDER, FALSE, 100); expect(100, retVal); retVal = SendMessage(hChild, HDM_SETHOTDIVIDER, FALSE, 1);

1 0

Nikolay Sivov : comctl32/header: Use macro to define LPARAM value.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: fac7daf098398bd0d73142e1bc6595a9482d7d9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fac7daf098398bd0d73142e1b… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jul 12 02:48:38 2009 +0400 comctl32/header: Use macro to define LPARAM value. --- dlls/comctl32/tests/header.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index e357f9d..3b6aa30 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -952,7 +952,7 @@ static void test_hdm_sethotdivider(HWND hParent) flush_sequences(sequences, NUM_MSG_SEQUENCES); todo_wine { - retVal = SendMessage(hChild, HDM_SETHOTDIVIDER, TRUE, 0X00050005); + retVal = SendMessage(hChild, HDM_SETHOTDIVIDER, TRUE, MAKELPARAM(5, 5)); expect(0, retVal); } retVal = SendMessage(hChild, HDM_SETHOTDIVIDER, FALSE, 100);

1 0

Eric Pouech : winedbg: 'Int XX' is not a function call, so don' t try to handle it as such on i386.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 28dd48227978d7aabfad018c6d9a428a08cba240 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28dd48227978d7aabfad018c6… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jul 11 21:19:05 2009 +0200 winedbg: 'Int XX' is not a function call, so don't try to handle it as such on i386. --- programs/winedbg/be_i386.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index ce2076c..c22ef14 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -543,9 +543,6 @@ static unsigned be_i386_is_func_call(const void* insn, ADDRESS64* callee) } return TRUE; - case 0xCD: - WINE_FIXME("Unsupported yet call insn (0x%02x) at %p\n", ch, insn); - /* fall through */ default: return FALSE; }

1 0

Vincent Povirk : gdiplus: Implement GdipSetLineLinearBlend.
by Alexandre Julliard 13 Jul '09

13 Jul '09

Module: wine Branch: master Commit: 2cdc48a4e5e532ae46d7951908b61d63cf2842f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cdc48a4e5e532ae46d795190… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Sat Jul 11 11:49:44 2009 -0500 gdiplus: Implement GdipSetLineLinearBlend. --- dlls/gdiplus/brush.c | 29 ++++++++++++++++-- dlls/gdiplus/tests/brush.c | 66 ++++++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 92 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 824ece0..bb19e43 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1531,12 +1531,33 @@ GpStatus WINGDIPAPI GdipRotateTextureTransform(GpTexture* brush, REAL angle, GpStatus WINGDIPAPI GdipSetLineLinearBlend(GpLineGradient *brush, REAL focus, REAL scale) { - static int calls; + REAL factors[3]; + REAL positions[3]; + int num_points = 0; - if(!(calls++)) - FIXME("not implemented\n"); + TRACE("(%p,%.2f,%.2f)\n", brush, focus, scale); - return NotImplemented; + if (!brush) return InvalidParameter; + + if (focus != 0.0) + { + factors[num_points] = 0.0; + positions[num_points] = 0.0; + num_points++; + } + + factors[num_points] = scale; + positions[num_points] = focus; + num_points++; + + if (focus != 1.0) + { + factors[num_points] = 0.0; + positions[num_points] = 1.0; + num_points++; + } + + return GdipSetLineBlend(brush, factors, positions, num_points); } GpStatus WINGDIPAPI GdipSetLinePresetBlend(GpLineGradient *brush, diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index b6fbe30..7993d60 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -493,6 +493,71 @@ static void test_lineblend(void) expect(Ok, status); } +static void test_linelinearblend(void) +{ + GpLineGradient *brush; + GpStatus status; + GpPointF pt1, pt2; + INT count=10; + REAL res_factors[3] = {0.3f}; + REAL res_positions[3] = {0.3f}; + + status = GdipSetLineLinearBlend(NULL, 0.6, 0.8); + expect(InvalidParameter, status); + + pt1.X = pt1.Y = 1.0; + pt2.X = pt2.Y = 100.0; + status = GdipCreateLineBrush(&pt1, &pt2, 0, 0, WrapModeTile, &brush); + expect(Ok, status); + + + status = GdipSetLineLinearBlend(brush, 0.6, 0.8); + expect(Ok, status); + + status = GdipGetLineBlendCount(brush, &count); + expect(Ok, status); + expect(3, count); + + status = GdipGetLineBlend(brush, res_factors, res_positions, 3); + expect(Ok, status); + expectf(0.0, res_factors[0]); + expectf(0.0, res_positions[0]); + expectf(0.8, res_factors[1]); + expectf(0.6, res_positions[1]); + expectf(0.0, res_factors[2]); + expectf(1.0, res_positions[2]); + + + status = GdipSetLineLinearBlend(brush, 0.0, 0.8); + expect(Ok, status); + + status = GdipGetLineBlendCount(brush, &count); + expect(Ok, status); + expect(2, count); + + status = GdipGetLineBlend(brush, res_factors, res_positions, 3); + expect(Ok, status); + expectf(0.8, res_factors[0]); + expectf(0.0, res_positions[0]); + expectf(0.0, res_factors[1]); + expectf(1.0, res_positions[1]); + + + status = GdipSetLineLinearBlend(brush, 1.0, 0.8); + expect(Ok, status); + + status = GdipGetLineBlendCount(brush, &count); + expect(Ok, status); + expect(2, count); + + status = GdipGetLineBlend(brush, res_factors, res_positions, 3); + expect(Ok, status); + expectf(0.0, res_factors[0]); + expectf(0.0, res_positions[0]); + expectf(0.8, res_factors[1]); + expectf(1.0, res_positions[1]); +} + START_TEST(brush) { struct GdiplusStartupInput gdiplusStartupInput; @@ -515,6 +580,7 @@ START_TEST(brush) test_texturewrap(); test_gradientgetrect(); test_lineblend(); + test_linelinearblend(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 0c1e54f..2ee24bd 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -409,6 +409,7 @@ GpStatus WINGDIPAPI GdipGetLineBlendCount(GpLineGradient*,INT*); GpStatus WINGDIPAPI GdipSetLineColors(GpLineGradient*,ARGB,ARGB); GpStatus WINGDIPAPI GdipSetLineGammaCorrection(GpLineGradient*,BOOL); GpStatus WINGDIPAPI GdipSetLineSigmaBlend(GpLineGradient*,REAL,REAL); +GpStatus WINGDIPAPI GdipSetLineLinearBlend(GpLineGradient*,REAL,REAL); GpStatus WINGDIPAPI GdipSetLineWrapMode(GpLineGradient*,GpWrapMode); /* Matrix */

1 0