October 2006 - Wine-Commits

Jonathan Ernst : crypt32: Initial French translation.
by Alexandre Julliard Oct. 3, 2006

Oct. 3, 2006

Module: wine Branch: master Commit: 5b1b4c817521ee56c5457ebfa33a16990536e2fd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5b1b4c817521ee56c5457eb… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Tue Oct 3 09:50:48 2006 +0200 crypt32: Initial French translation. --- dlls/crypt32/crypt32.rc | 1 dlls/crypt32/crypt32_Fr.rc | 166 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 167 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32.rc b/dlls/crypt32/crypt32.rc index 00d723a..e1ed992 100644 --- a/dlls/crypt32/crypt32.rc +++ b/dlls/crypt32/crypt32.rc @@ -26,5 +26,6 @@ #include "version.rc" #include "crypt32_De.rc" #include "crypt32_En.rc" +#include "crypt32_Fr.rc" #include "crypt32_Ko.rc" #include "crypt32_No.rc" diff --git a/dlls/crypt32/crypt32_Fr.rc b/dlls/crypt32/crypt32_Fr.rc new file mode 100644 index 0000000..e058cb2 --- /dev/null +++ b/dlls/crypt32/crypt32_Fr.rc @@ -0,0 +1,166 @@ +/* + * crypt32 dll French resources + * + * Copyright 2006 Jonathan Ernst + * + * 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 + */ + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_AUTHORITY_KEY_ID "Authority Key Identifier" + IDS_KEY_ATTRIBUTES "Key Attributes" + IDS_KEY_USAGE_RESTRICTION "Key Usage Restriction" + IDS_SUBJECT_ALT_NAME "Subject Alternative Name" + IDS_ISSUER_ALT_NAME "Issuer Alternative Name" + IDS_BASIC_CONSTRAINTS "Basic Constraints" + IDS_KEY_USAGE "Key Usage" + IDS_CERT_POLICIES "Certificate Policies" + IDS_SUBJECT_KEY_IDENTIFIER "Subject Key Identifier" + IDS_CRL_REASON_CODE "CRL Reason Code" + IDS_CRL_DIST_POINTS "CRL Distribution Points" + IDS_ENHANCED_KEY_USAGE "Enhanced Key Usage" + IDS_AUTHORITY_INFO_ACCESS "Authority Information Access" + IDS_CERT_EXTENSIONS "Certificate Extensions" + IDS_NEXT_UPDATE_LOCATION "Next Update Location" + IDS_YES_OR_NO_TRUST "Yes or No Trust" + IDS_EMAIL_ADDRESS "Email Address" + IDS_UNSTRUCTURED_NAME "Unstructured Name" + IDS_CONTENT_TYPE "Content Type" + IDS_MESSAGE_DIGEST "Message Digest" + IDS_SIGNING_TIME "Signing Time" + IDS_COUNTER_SIGN "Counter Sign" + IDS_CHALLENGE_PASSWORD "Challenge Password" + IDS_UNSTRUCTURED_ADDRESS "Unstructured Address" + IDS_SMIME_CAPABILITIES "SMIME Capabilities" + IDS_PREFER_SIGNED_DATA "Prefer Signed Data" + IDS_CPS "CPS" + IDS_USER_NOTICE "User Notice" + IDS_OCSP "On-line Certificate Status Protocol" + IDS_CA_ISSUER "Certification Authority Issuer" + IDS_CERT_TEMPLATE_NAME "Certification Template Name" + IDS_CERT_TYPE "Certificate Type" + IDS_CERT_MANIFOLD "Certificate Manifold" + IDS_NETSCAPE_CERT_TYPE "Type de certificat Netscape" + IDS_NETSCAPE_BASE_URL "URL Netscape de base" + IDS_NETSCAPE_REVOCATION_URL "URL Netscape de révocation" + IDS_NETSCAPE_CA_REVOCATION_URL "URL Netscape de révocation du certificat" + IDS_NETSCAPE_CERT_RENEWAL_URL "URL Netscape de renouvellement du certificat" + IDS_NETSCAPE_CA_POLICY_URL "Netscape CA Policy URL" + IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL ServerName" + IDS_NETSCAPE_COMMENT "Commentaire Netscape" + IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" + IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" + IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" + IDS_COUNTRY "Pays/Région" + IDS_ORGANIZATION "Organisation" + IDS_ORGANIZATIONAL_UNIT "Unité d'organisation" + IDS_COMMON_NAME "Nom commun" + IDS_LOCALITY "Locality" + IDS_STATE_OR_PROVINCE "État ou province" + IDS_TITLE "Titre" + IDS_GIVEN_NAME "Nom donné" + IDS_INITIALS "Initiales" + IDS_SUR_NAME "Nom de famille" + IDS_DOMAIN_COMPONENT "Domain Component" + IDS_STREET_ADDRESS "Adresse" + IDS_SERIAL_NUMBER "Numéro de série" + IDS_CA_VERSION "Version du CA" + IDS_CROSS_CA_VERSION "Cross CA Version" + IDS_SERIALIZED_SIG_SERIAL_NUMBER "Serialized Signature Serial Number" + IDS_PRINCIPAL_NAME "Nom principal" + IDS_WINDOWS_PRODUCT_UPDATE "Mise à jour de Windows" + IDS_ENROLLMENT_NAME_VALUE_PAIR "Enrollment Name Value Pair" + IDS_OS_VERSION "Version du système d'exploitation" + IDS_ENROLLMENT_CSP "Enrollment CSP" + IDS_CRL_NUMBER "CRL Number" + IDS_DELTA_CRL_INDICATOR "Delta CRL Indicator" + IDS_ISSUING_DIST_POINT "Issuing Distribution Point" + IDS_FRESHEST_CRL "Freshest CRL" + IDS_NAME_CONSTRAINTS "Contraintes de nom" + IDS_POLICY_MAPPINGS "Policy Mappings" + IDS_POLICY_CONSTRAINTS "Policy Constraints" + IDS_CROSS_CERT_DIST_POINTS "Cross-Certificate Distribution Points" + IDS_APPLICATION_POLICIES "Application Policies" + IDS_APPLICATION_POLICY_MAPPINGS "Application Policy Mappings" + IDS_APPLICATION_POLICY_CONSTRAINTS "Application Policy Constraints" + IDS_CMC_DATA "CMC Data" + IDS_CMC_RESPONSE "CMC Response" + IDS_UNSIGNED_CMC_REQUEST "Unsigned CMC Request" + IDS_CMC_STATUS_INFO "CMC Status Info" + IDS_CMC_EXTENSIONS "CMC Extensions" + IDS_CMC_ATTRIBUTES "CMC Attributes" + IDS_PKCS_7_DATA "Données PKCS 7" + IDS_PKCS_7_SIGNED "Signé avec PKCS 7" + IDS_PKCS_7_ENVELOPED "Enveloppé avec PKCS 7" + IDS_PKCS_7_SIGNED_ENVELOPED "Enveloppé et signé avec PKCS 7" + IDS_PKCS_7_DIGESTED "Haché avec PKCS 7" + IDS_PKCS_7_ENCRYPTED "Chiffré avec PKCS 7" + IDS_PREVIOUS_CA_CERT_HASH "Previous CA Certificate Hash" + IDS_CRL_VIRTUAL_BASE "Virtual Base CRL Number" + IDS_CRL_NEXT_PUBLISH "Next CRL Publish" + IDS_CA_EXCHANGE "Certificat de chiffrement CA" + IDS_KEY_RECOVERY_AGENT "Key Recovery Agent" + IDS_CERTIFICATE_TEMPLATE "Certificate Template Information" + IDS_ENTERPRISE_ROOT_OID "Enterprise Root OID" + IDS_RDN_DUMMY_SIGNER "Signataire factice" + IDS_ARCHIVED_KEY_ATTR "Clé de chiffrement privée" + IDS_CRL_SELF_CDP "Published CRL Locations" + IDS_REQUIRE_CERT_CHAIN_POLICY "Enforce Certificate Chain Policy" + IDS_TRANSACTION_ID "Transaction Id" + IDS_SENDER_NONCE "Sender Nonce" + IDS_RECIPIENT_NONCE "Recipient Nonce" + IDS_REG_INFO "Reg Info" + IDS_GET_CERTIFICATE "Get Certificate" + IDS_GET_CRL "Get CRL" + IDS_REVOKE_REQUEST "Revoke Request" + IDS_QUERY_PENDING "Query Pending" + IDS_SORTED_CTL "Certificate Trust List" + IDS_ARCHIVED_KEY_CERT_HASH "Archived Key Certificate Hash" + IDS_PRIVATE_KEY_USAGE_PERIOD "Private Key Usage Period" + IDS_CLIENT_INFORMATION "Client Information" + IDS_SERVER_AUTHENTICATION "Server Authentication" + IDS_CLIENT_AUTHENTICATION "Client Authentication" + IDS_CODE_SIGNING "Code Signing" + IDS_SECURE_EMAIL "Secure Email" + IDS_TIME_STAMPING "Time Stamping" + IDS_MICROSOFT_TRUST_LIST_SIGNING "Microsoft Trust List Signing" + IDS_MICROSOFT_TIME_STAMPING "Microsoft Time Stamping" + IDS_IPSEC_END_SYSTEM "IP security end system" + IDS_IPSEC_TUNNEL "IP security tunnel termination" + IDS_IPSEC_USER "IP security user" + IDS_EFS "Encrypting File System" + IDS_WHQL_CRYPTO "Windows Hardware Driver Verification" + IDS_NT5_CRYPTO "Windows System Component Verification" + IDS_OEM_WHQL_CRYPTO "OEM Windows System Component Verification" + IDS_EMBEDDED_NT_CRYPTO "Embedded Windows System Component Verification" + IDS_KEY_PACK_LICENSES "Key Pack Licenses" + IDS_LICENSE_SERVER "License Server Verification" + IDS_SMART_CARD_LOGON "Smart Card Logon" + IDS_DIGITAL_RIGHTS "Digital Rights" + IDS_QUALIFIED_SUBORDINATION "Qualified Subordination" + IDS_KEY_RECOVERY "Récupération de clé" + IDS_DOCUMENT_SIGNING "Signature de document" + IDS_IPSEC_IKE_INTERMEDIATE "IP security IKE intermediate" + IDS_FILE_RECOVERY "Récupération de fichier" + IDS_ROOT_LIST_SIGNER "Root List Signer" + IDS_ANY_APPLICATION_POLICIES "All application policies" + IDS_DS_EMAIL_REPLICATION "Directory Service Email Replication" + IDS_ENROLLMENT_AGENT "Certificate Request Agent" + IDS_LIFETIME_SIGNING "Lifetime Signing" + IDS_ANY_CERT_POLICY "All issuance policies" +}

1 0

Andrew Talbot : user: Cast-qual warnings fix.
by Alexandre Julliard Oct. 3, 2006

Oct. 3, 2006

Module: wine Branch: master Commit: 3878ebcd7c1507b6495ff9ea5c678a9d098f4b6b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3878ebcd7c1507b6495ff9e… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Oct 2 21:14:11 2006 +0100 user: Cast-qual warnings fix. --- dlls/user/cursoricon.c | 8 ++++---- dlls/user/exticon.c | 2 +- dlls/user/spy.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user/cursoricon.c b/dlls/user/cursoricon.c index 1a43ebd..e056366 100644 --- a/dlls/user/cursoricon.c +++ b/dlls/user/cursoricon.c @@ -269,7 +269,7 @@ static BOOL is_dib_monochrome( const BIT if (info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { - RGBTRIPLE *rgb = ((BITMAPCOREINFO *) info)->bmciColors; + const RGBTRIPLE *rgb = ((const BITMAPCOREINFO*)info)->bmciColors; /* Check if the first color is black */ if ((rgb->rgbtRed == 0) && (rgb->rgbtGreen == 0) && (rgb->rgbtBlue == 0)) @@ -320,7 +320,7 @@ static int DIB_GetBitmapInfo( const BITM } if (header->biSize == sizeof(BITMAPCOREHEADER)) { - BITMAPCOREHEADER *core = (BITMAPCOREHEADER *)header; + const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)header; *width = core->bcWidth; *height = core->bcHeight; *bpp = core->bcBitCount; @@ -329,7 +329,7 @@ static int DIB_GetBitmapInfo( const BITM } if (header->biSize == sizeof(BITMAPV4HEADER)) { - BITMAPV4HEADER *v4hdr = (BITMAPV4HEADER *)header; + const BITMAPV4HEADER *v4hdr = (const BITMAPV4HEADER *)header; *width = v4hdr->bV4Width; *height = v4hdr->bV4Height; *bpp = v4hdr->bV4BitCount; @@ -338,7 +338,7 @@ static int DIB_GetBitmapInfo( const BITM } if (header->biSize == sizeof(BITMAPV5HEADER)) { - BITMAPV5HEADER *v5hdr = (BITMAPV5HEADER *)header; + const BITMAPV5HEADER *v5hdr = (const BITMAPV5HEADER *)header; *width = v5hdr->bV5Width; *height = v5hdr->bV5Height; *bpp = v5hdr->bV5BitCount; diff --git a/dlls/user/exticon.c b/dlls/user/exticon.c index 7961124..71390e7 100644 --- a/dlls/user/exticon.c +++ b/dlls/user/exticon.c @@ -607,7 +607,7 @@ static UINT ICO_ExtractIconExW( const IMAGE_RESOURCE_DIRECTORY *resdir; /* go down this resource entry, name */ - resdir = (PIMAGE_RESOURCE_DIRECTORY)((char *)rootresdir + xresent->u2.s3.OffsetToDirectory); + resdir = (const IMAGE_RESOURCE_DIRECTORY *)((const char *)rootresdir + xresent->u2.s3.OffsetToDirectory); /* default language (0) */ resdir = find_entry_default(resdir,rootresdir); diff --git a/dlls/user/spy.c b/dlls/user/spy.c index bd84508..e1c3d0b 100644 --- a/dlls/user/spy.c +++ b/dlls/user/spy.c @@ -2659,7 +2659,7 @@ int SPY_Init(void) q++; } q--; - cc_array[i].lastmsg = (USER_MSG *)q; + cc_array[i].lastmsg = q; i++; }

1 0

Juan Lang : crypt32/tests: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 3, 2006

Oct. 3, 2006

Module: wine Branch: master Commit: 57e7e2b3c8784eaa3c3bcc15dfc985f11a6335f6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=57e7e2b3c8784eaa3c3bcc1… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Oct 2 14:27:27 2006 -0700 crypt32/tests: Win64 printf format warning fixes. --- dlls/crypt32/tests/sip.c | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=57e7e2b3c8784eaa3c3…

1 0

Juan Lang : msi: Implement msidbLocatorTypeFileName in RegLocator searches.
by Alexandre Julliard Oct. 3, 2006

Oct. 3, 2006

Module: wine Branch: master Commit: 4b99bf02c018bec9f9104a93b3ec1cda3310cff6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4b99bf02c018bec9f9104a9… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Oct 2 14:19:42 2006 -0700 msi: Implement msidbLocatorTypeFileName in RegLocator searches. --- dlls/msi/appsearch.c | 3 +++ dlls/msi/tests/package.c | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 9e65d6d..063f65d 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -397,6 +397,9 @@ static UINT ACTION_AppSearchReg(MSIPACKA rc = ACTION_SearchDirectory(package, sig, (LPCWSTR)value, 0, appValue); break; + case msidbLocatorTypeFileName: + *appValue = (LPWSTR)value; + break; case msidbLocatorTypeRawValue: ACTION_ConvertRegValue(regType, value, sz, appValue); break; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 6542a25..40cf6d8 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2285,10 +2285,7 @@ static void test_appsearch(void) r = MsiGetPropertyA( hpkg, "WEBBROWSERPROG", prop, &size ); ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); - todo_wine - { - ok( lstrlenA(prop) != 0, "Expected non-zero length\n"); - } + ok( lstrlenA(prop) != 0, "Expected non-zero length\n"); MsiCloseHandle( hpkg ); DeleteFileA(msifile);

1 0

Michael Stefaniuc : winemenubuilder: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 3, 2006

Oct. 3, 2006

Module: wine Branch: master Commit: 8c2cdf7b6fd29cd5465b4d846e30e03d7729a029 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8c2cdf7b6fd29cd5465b4d8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 2 23:22:58 2006 +0200 winemenubuilder: Win64 printf format warning fixes. --- programs/winemenubuilder/Makefile.in | 1 - programs/winemenubuilder/winemenubuilder.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/winemenubuilder/Makefile.in b/programs/winemenubuilder/Makefile.in index 1cdbe0f..8eeca86 100644 --- a/programs/winemenubuilder/Makefile.in +++ b/programs/winemenubuilder/Makefile.in @@ -6,7 +6,6 @@ MODULE = winemenubuilder.exe APPMODE = -mwindows IMPORTS = shell32 ole32 user32 advapi32 kernel32 EXTRALIBS = -luuid -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ winemenubuilder.c diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index c15f435..8ada876 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -278,7 +278,7 @@ static BOOL extract_icon32(LPCWSTR szFil hModule = LoadLibraryExW(szFileName, 0, LOAD_LIBRARY_AS_DATAFILE); if (!hModule) { - WINE_ERR("LoadLibraryExW (%s) failed, error %ld\n", + WINE_ERR("LoadLibraryExW (%s) failed, error %d\n", wine_dbgstr_w(szFileName), GetLastError()); return FALSE; } @@ -286,7 +286,7 @@ static BOOL extract_icon32(LPCWSTR szFil if (nIndex < 0) { hResInfo = FindResourceW(hModule, MAKEINTRESOURCEW(-nIndex), (LPCWSTR)RT_GROUP_ICON); - WINE_TRACE("FindResourceW (%s) called, return %p, error %ld\n", + WINE_TRACE("FindResourceW (%s) called, return %p, error %d\n", wine_dbgstr_w(szFileName), hResInfo, GetLastError()); } else @@ -297,7 +297,7 @@ static BOOL extract_icon32(LPCWSTR szFil if (!EnumResourceNamesW(hModule, (LPCWSTR)RT_GROUP_ICON, EnumResNameProc, (LONG_PTR)&sEnumRes)) { - WINE_TRACE("EnumResourceNamesW failed, error %ld\n", GetLastError()); + WINE_TRACE("EnumResourceNamesW failed, error %d\n", GetLastError()); } }

1 0

Michael Stefaniuc : wineconsole: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 3, 2006

Oct. 3, 2006

Module: wine Branch: master Commit: ae48a519476544979934afe973abfa79bfb099f0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ae48a519476544979934afe… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 2 23:22:34 2006 +0200 wineconsole: Win64 printf format warning fixes. --- programs/wineconsole/Makefile.in | 2 +- programs/wineconsole/registry.c | 2 +- programs/wineconsole/user.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/wineconsole/Makefile.in b/programs/wineconsole/Makefile.in index 28a036b..335dd4b 100644 --- a/programs/wineconsole/Makefile.in +++ b/programs/wineconsole/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DUNICODE -DWINE_NO_LONG_AS_INT +EXTRADEFS = -DUNICODE TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/programs/wineconsole/registry.c b/programs/wineconsole/registry.c index ed8a607..67f7577 100644 --- a/programs/wineconsole/registry.c +++ b/programs/wineconsole/registry.c @@ -48,7 +48,7 @@ static const WCHAR wszWindowSize[] void WINECON_DumpConfig(const char* pfx, const struct config_data* cfg) { - WINE_TRACE("%s cell=(%u,%u) cursor=(%d,%d) attr=%02lx font=%s/%lu hist=%lu/%d flags=%c%c msk=%08lx sb=(%u,%u) win=(%u,%u)x(%u,%u) edit=%u registry=%s\n", + WINE_TRACE("%s cell=(%u,%u) cursor=(%d,%d) attr=%02x font=%s/%u hist=%u/%d flags=%c%c msk=%08x sb=(%u,%u) win=(%u,%u)x(%u,%u) edit=%u registry=%s\n", pfx, cfg->cell_width, cfg->cell_height, cfg->cursor_size, cfg->cursor_visible, cfg->def_attr, wine_dbgstr_w(cfg->face_name), cfg->font_weight, cfg->history_size, cfg->history_nodup ? 1 : 2, cfg->quick_edit ? 'Q' : 'q', cfg->exit_on_die ? 'X' : 'x', diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 9053055..2afd47a 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -277,8 +277,8 @@ static void WCUSER_SetTitle(const struct void WCUSER_DumpLogFont(const char* pfx, const LOGFONT* lf, DWORD ft) { WINE_TRACE_(wc_font)("%s %s%s%s%s\n" - "\tlf.lfHeight=%ld lf.lfWidth=%ld lf.lfEscapement=%ld lf.lfOrientation=%ld\n" - "\tlf.lfWeight=%ld lf.lfItalic=%u lf.lfUnderline=%u lf.lfStrikeOut=%u\n" + "\tlf.lfHeight=%d lf.lfWidth=%d lf.lfEscapement=%d lf.lfOrientation=%d\n" + "\tlf.lfWeight=%d lf.lfItalic=%u lf.lfUnderline=%u lf.lfStrikeOut=%u\n" "\tlf.lfCharSet=%u lf.lfOutPrecision=%u lf.lfClipPrecision=%u lf.lfQuality=%u\n" "\tlf->lfPitchAndFamily=%u lf.lfFaceName=%s\n", pfx, @@ -295,9 +295,9 @@ void WCUSER_DumpLogFont(const char* pfx, void WCUSER_DumpTextMetric(const TEXTMETRIC* tm, DWORD ft) { WINE_TRACE_(wc_font)("%s%s%s%s\n" - "\ttmHeight=%ld tmAscent=%ld tmDescent=%ld tmInternalLeading=%ld tmExternalLeading=%ld\n" - "\ttmAveCharWidth=%ld tmMaxCharWidth=%ld tmWeight=%ld tmOverhang=%ld\n" - "\ttmDigitizedAspectX=%ld tmDigitizedAspectY=%ld\n" + "\ttmHeight=%d tmAscent=%d tmDescent=%d tmInternalLeading=%d tmExternalLeading=%d\n" + "\ttmAveCharWidth=%d tmMaxCharWidth=%d tmWeight=%d tmOverhang=%d\n" + "\ttmDigitizedAspectX=%d tmDigitizedAspectY=%d\n" "\ttmFirstChar=%d tmLastChar=%d tmDefaultChar=%d tmBreakChar=%d\n" "\ttmItalic=%u tmUnderlined=%u tmStruckOut=%u tmPitchAndFamily=%u tmCharSet=%u\n", (ft & RASTER_FONTTYPE) ? "raster" : "",

1 0

Michael Stefaniuc : rpcss: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 3, 2006

Oct. 3, 2006

Module: wine Branch: master Commit: 7460b042148ac3d9281708917ca5693fd117df50 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7460b042148ac3d92817089… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 2 23:22:19 2006 +0200 rpcss: Win64 printf format warning fixes. --- programs/rpcss/Makefile.in | 1 - programs/rpcss/np_server.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/rpcss/Makefile.in b/programs/rpcss/Makefile.in index 68246e4..aeb1c33 100644 --- a/programs/rpcss/Makefile.in +++ b/programs/rpcss/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = rpcss.exe APPMODE = -mconsole IMPORTS = kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ epmap_server.c \ diff --git a/programs/rpcss/np_server.c b/programs/rpcss/np_server.c index 47fa348..729f156 100644 --- a/programs/rpcss/np_server.c +++ b/programs/rpcss/np_server.c @@ -204,7 +204,7 @@ static VOID HandlerThread(LPVOID lpvPipe ); if ( (!success) || (bytesread != sizeof(RPCSS_NP_MESSAGE)) || (vardata_payload_msg.message_type != RPCSS_NP_MESSAGE_TYPEID_VARDATAPAYLOADMSG) ) { - WINE_ERR("vardata payload read failure! (s=%s,br=%ld,mt=%u,mt_exp=%u\n", + WINE_ERR("vardata payload read failure! (s=%s,br=%d,mt=%u,mt_exp=%u\n", success ? "TRUE" : "FALSE", bytesread, vardata_payload_msg.message_type, RPCSS_NP_MESSAGE_TYPEID_VARDATAPAYLOADMSG); success = FALSE; @@ -237,7 +237,7 @@ static VOID HandlerThread(LPVOID lpvPipe ); if ( (!success) || (written != sizeof(RPCSS_NP_REPLY)) ) - WINE_WARN("Message reply failed. (success=%d, br=%ld)\n", success, written); + WINE_WARN("Message reply failed. (success=%d, br=%d)\n", success, written); else WINE_TRACE("Reply sent successfully.\n"); } else @@ -425,7 +425,7 @@ static BOOL RPCSS_SendReceiveNPMsg(HANDL } if (count != sizeof(RPCSS_NP_REPLY)) { - WINE_ERR("read count mismatch, got %ld.\n", count); + WINE_ERR("read count mismatch, got %d.\n", count); return FALSE; }

1 0

Michael Stefaniuc : oleview: Win64 'incompatible pointer type' warning fix.
by Alexandre Julliard Oct. 3, 2006

Oct. 3, 2006

Module: wine Branch: master Commit: cdc01c753e1b4d40d980847ea33fc0fd1b3d66fb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cdc01c753e1b4d40d980847… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 2 23:22:01 2006 +0200 oleview: Win64 'incompatible pointer type' warning fix. --- programs/oleview/Makefile.in | 2 +- programs/oleview/typelib.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/oleview/Makefile.in b/programs/oleview/Makefile.in index 7049085..3a393a5 100644 --- a/programs/oleview/Makefile.in +++ b/programs/oleview/Makefile.in @@ -6,7 +6,7 @@ MODULE = oleview.exe APPMODE = -mwindows -municode IMPORTS = comdlg32 comctl32 shell32 oleaut32 ole32 user32 advapi32 kernel32 EXTRALIBS = -luuid -EXTRADEFS = -DUNICODE -DWINE_NO_LONG_AS_INT +EXTRADEFS = -DUNICODE C_SRCS = \ details.c \ diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 0059f77..35e5fc1 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -867,7 +867,7 @@ int PopulateTree(void) HREFTYPE hRefType; TYPEATTR *pTypeAttr; INT count, i; - unsigned long ulHelpContext; + ULONG ulHelpContext; BSTR bstrName; BSTR bstrData; WCHAR wszText[MAX_LOAD_STRING];

1 0

Michael Stefaniuc : icinfo: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 3, 2006

Oct. 3, 2006

Module: wine Branch: master Commit: a156820609779ee701060f39db92fd52dae32c02 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a156820609779ee701060f3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 2 23:21:36 2006 +0200 icinfo: Win64 printf format warning fixes. --- programs/icinfo/Makefile.in | 1 - programs/icinfo/icinfo.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/icinfo/Makefile.in b/programs/icinfo/Makefile.in index c4409fd..01c7701 100644 --- a/programs/icinfo/Makefile.in +++ b/programs/icinfo/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = icinfo.exe APPMODE = -mwindows IMPORTS = msvfw32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = icinfo.c diff --git a/programs/icinfo/icinfo.c b/programs/icinfo/icinfo.c index 96240e2..3b882ac 100644 --- a/programs/icinfo/icinfo.c +++ b/programs/icinfo/icinfo.c @@ -53,7 +53,7 @@ #define w2s(w,s) WideCharToMultiByte(0,0 memcpy(type,&(ii.fccType),4);type[4]='\0'; memcpy(handler,&(ii.fccHandler),4);handler[4]='\0'; printf("%s.%s: %s\n",type,handler,buf); - printf("\tdwFlags: 0x%08lx (",ii.dwFlags); + printf("\tdwFlags: 0x%08x (",ii.dwFlags); #define XX(x) if (ii.dwFlags & x) printf(#x" "); XX(VIDCF_QUALITY); XX(VIDCF_CRUNCH); @@ -65,8 +65,8 @@ #define XX(x) if (ii.dwFlags & x) printf XX(VIDCF_QUALITYTIME); #undef XX printf(")\n"); - printf("\tdwVersion: 0x%08lx\n",ii.dwVersion); - printf("\tdwVersionICM: 0x%08lx\n",ii.dwVersionICM); + printf("\tdwVersion: 0x%08x\n",ii.dwVersion); + printf("\tdwVersionICM: 0x%08x\n",ii.dwVersionICM); w2s(ii.szDescription,buf); printf("\tszDescription: %s\n",buf); if (doabout) ICAbout(hic,0);

1 0

Michael Stefaniuc : winhelp: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 3, 2006

Oct. 3, 2006

Module: wine Branch: master Commit: 3dbe7152cdbc285e78e766725d3b814095adc8b3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3dbe7152cdbc285e78e7667… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 2 23:20:26 2006 +0200 winhelp: Win64 printf format warning fixes. --- programs/winhelp/Makefile.in | 1 - programs/winhelp/hlpfile.c | 20 ++++++++-------- programs/winhelp/macro.c | 52 +++++++++++++++++++++--------------------- programs/winhelp/winhelp.c | 6 ++--- 4 files changed, 39 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=3dbe7152cdbc285e78e…

1 0