October 2006 - Wine-commits

Jonathan Ernst : cmdlgtst: Updated French translation.
by Alexandre Julliard 03 Oct '06

03 Oct '06

Module: wine Branch: master Commit: 8d8837595de040966a90b64b46b6ddb10ca7fa08 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8d8837595de040966a90b64… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Tue Oct 3 10:00:25 2006 +0200 cmdlgtst: Updated French translation. --- programs/cmdlgtst/Fr.rc | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 insertions(+), 2 deletions(-) diff --git a/programs/cmdlgtst/Fr.rc b/programs/cmdlgtst/Fr.rc index 03610a6..a41e766 100644 --- a/programs/cmdlgtst/Fr.rc +++ b/programs/cmdlgtst/Fr.rc @@ -4,6 +4,7 @@ * * Copyright (c) 1999 Eric Williams. * Copyright (c) 2003 Vincent B�ron. + * Copyright (c) 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 @@ -213,7 +214,7 @@ FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 72, 96, 50, 14 LTEXT "Gabarit de test des bo�tes de dialogue standards, version 1.20", -1, 13, 36, 168, 12 - LTEXT "(c) 1999-2000, Eric Williams. Droits tels qu'accord�s par la licence de Wine. N'accumulez pas du code tout seul... partagez-le!", -1, 18, 60, 157, 24 + LTEXT "(c) 1999-2000, Eric Williams. Droits tels qu'accord�s par la licence de Wine. N'accumulez pas du code tout seul... partagez-le�!", -1, 18, 60, 157, 24 ICON "AboutIcon", -1, 84, 12, 18, 20 } @@ -229,7 +230,38 @@ FONT 8, "MS Shell Dlg" LTEXT "La bo�te de dialogue de choix de la couleur change la couleur de l'arri�re-plan.", -1, 12, 120, 168, 12 LTEXT "La bo�te de dialogue de choix de la police change toutes les polices, et la couleur de la police si CF_EFFECTS est s�lectionn�.", -1, 12, 144, 168, 24 LTEXT "Le nom complet et le titre de la derni�re op�ration r�ussie d'ouverture ou d'enregistrement se trouvent dans le coin en haut � gauche.", -1, 12, 180, 168, 24 - LTEXT "(c) 1999-2000, Eric Williams. Droits tels qu'accord�s par la licence de Wine. N'accumulez pas du code tout seul... partagez-le!", -1, 12, 228, 168, 36 + LTEXT "(c) 1999-2000, Eric Williams. Droits tels qu'accord�s par la licence de Wine. N'accumulez pas du code tout seul... partagez-le�!", -1, 12, 228, 168, 36 ICON "AboutIcon", -1, 86, 12, 18, 20 CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 12, 216, 168, 2 } + +PAGESETUPDLGORD_CSTM DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "TFT test dialog" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 + CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80 + CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4 + GROUPBOX "Papier", grp2, 8, 96, 224, 56, BS_GROUPBOX + LTEXT "&Taille�:", stc2, 16, 112, 36, 8 + COMBOBOX cmb2, 64, 110, 80, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + COMBOBOX cmb1, 150, 110, 80, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + LTEXT "&Bac�:", stc3, 16, 132, 36, 8 + COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL + GROUPBOX "Orientation", grp1, 8, 156, 64, 56, BS_GROUPBOX + AUTORADIOBUTTON "&Portrait", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "&Paysage", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "Bordures", grp4, 80, 156, 152, 56, BS_GROUPBOX + LTEXT "&Gauche�:", stc15, 88, 172, 21, 8 + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "&Droite�:", stc16, 159, 172, 27, 8 + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "&Haut�:", stc17, 88, 192, 21, 8 + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + LTEXT "&Bas�:", stc18, 159, 192, 23, 8 + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER + DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON + PUSHBUTTON "Annuler", IDCANCEL, 126, 220, 50, 14 + PUSHBUTTON "&Imprimante...", psh3, 184, 220, 48, 14 +END

1 0

Juan Lang : crypt32/tests: Win64 printf format warning fixes.
by Alexandre Julliard 03 Oct '06

03 Oct '06

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

Andrew Talbot : user: Cast-qual warnings fix.
by Alexandre Julliard 03 Oct '06

03 Oct '06

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

Michael Stefaniuc : winemenubuilder: Win64 printf format warning fixes.
by Alexandre Julliard 03 Oct '06

03 Oct '06

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

Juan Lang : msi: Implement msidbLocatorTypeFileName in RegLocator searches.
by Alexandre Julliard 03 Oct '06

03 Oct '06

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 : rpcss: Win64 printf format warning fixes.
by Alexandre Julliard 03 Oct '06

03 Oct '06

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 : wineconsole: Win64 printf format warning fixes.
by Alexandre Julliard 03 Oct '06

03 Oct '06

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 : icinfo: Win64 printf format warning fixes.
by Alexandre Julliard 03 Oct '06

03 Oct '06

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 : oleview: Win64 'incompatible pointer type' warning fix.
by Alexandre Julliard 03 Oct '06

03 Oct '06

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 : wineboot: Win64 printf format warning fixes.
by Alexandre Julliard 03 Oct '06

03 Oct '06

Module: wine Branch: master Commit: 6c1ac02631cbf0b0d95cfaab52344bbccb69d2fe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6c1ac02631cbf0b0d95cfaa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 2 23:18:35 2006 +0200 wineboot: Win64 printf format warning fixes. --- programs/wineboot/Makefile.in | 1 - programs/wineboot/shutdown.c | 8 ++++---- programs/wineboot/wineboot.c | 42 +++++++++++++++++++++-------------------- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in index bab7e35..08c27a5 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = wineboot.exe APPMODE = -mconsole IMPORTS = version user32 advapi32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ shutdown.c \ diff --git a/programs/wineboot/shutdown.c b/programs/wineboot/shutdown.c index c03823b..5f8dadf 100644 --- a/programs/wineboot/shutdown.c +++ b/programs/wineboot/shutdown.c @@ -94,7 +94,7 @@ static DWORD_PTR send_end_session_messag { if (SendMessageTimeoutW( win[i].hwnd, WM_QUERYENDSESSION, 0, 0, flags, 0, &result )) { - WINE_TRACE( "sent MW_QUERYENDSESSION hwnd %p pid %04lx result %ld\n", + WINE_TRACE( "sent MW_QUERYENDSESSION hwnd %p pid %04x result %ld\n", win[i].hwnd, win[i].pid, result ); ret = result; } @@ -104,7 +104,7 @@ static DWORD_PTR send_end_session_messag for (i = 0; i < count; i++) { if (!win[i].hwnd) continue; - WINE_TRACE( "sending WM_ENDSESSION hwnd %p pid %04lx wp %ld\n", win[i].hwnd, win[i].pid, ret ); + WINE_TRACE( "sending WM_ENDSESSION hwnd %p pid %04x wp %ld\n", win[i].hwnd, win[i].pid, ret ); SendMessageTimeoutW( win[i].hwnd, WM_ENDSESSION, ret, 0, flags, 0, &result ); } @@ -113,7 +113,7 @@ static DWORD_PTR send_end_session_messag HANDLE handle = OpenProcess( PROCESS_TERMINATE, FALSE, win[0].pid ); if (handle) { - WINE_TRACE( "terminating process %04lx\n", win[0].pid ); + WINE_TRACE( "terminating process %04x\n", win[0].pid ); TerminateProcess( handle, 0 ); CloseHandle( handle ); } @@ -168,7 +168,7 @@ void kill_processes( BOOL kill_desktop ) { if (process.th32ProcessID == GetCurrentProcessId()) continue; if (process.th32ProcessID == desktop_pid) continue; - WINE_TRACE("killing process %04lx %s\n", + WINE_TRACE("killing process %04x %s\n", process.th32ProcessID, wine_dbgstr_w(process.szExeFile) ); if (!(handle = OpenProcess( PROCESS_TERMINATE, FALSE, process.th32ProcessID ))) continue; diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 6f2f155..d074533 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -134,7 +134,7 @@ static BOOL wininit(void) return TRUE; } - WINE_ERR("There was an error in reading wininit.ini file - %ld\n", + WINE_ERR("There was an error in reading wininit.ini file - %d\n", GetLastError() ); return FALSE; @@ -191,7 +191,7 @@ static BOOL wininit(void) if( !MoveFileExA( RENAME_FILE, RENAME_FILE_TO, MOVEFILE_REPLACE_EXISTING) ) { - WINE_ERR("Couldn't rename wininit.ini, error %ld\n", GetLastError() ); + WINE_ERR("Couldn't rename wininit.ini, error %d\n", GetLastError() ); return FALSE; } @@ -226,7 +226,7 @@ static BOOL pendingRename(void) } else { - WINE_ERR("Couldn't open key, error %ld\n", res ); + WINE_ERR("Couldn't open key, error %d\n", res ); res=FALSE; } @@ -246,7 +246,7 @@ static BOOL pendingRename(void) if( res!=ERROR_SUCCESS ) { - WINE_ERR("Couldn't query value's length (%ld)\n", res ); + WINE_ERR("Couldn't query value's length (%d)\n", res ); res=FALSE; goto end; } @@ -254,7 +254,7 @@ static BOOL pendingRename(void) buffer=HeapAlloc( GetProcessHeap(),0,dataLength ); if( buffer==NULL ) { - WINE_ERR("Couldn't allocate %lu bytes for the value\n", dataLength ); + WINE_ERR("Couldn't allocate %u bytes for the value\n", dataLength ); res=FALSE; goto end; } @@ -262,7 +262,7 @@ static BOOL pendingRename(void) res=RegQueryValueExW( hSession, ValueName, NULL, NULL, (LPBYTE)buffer, &dataLength ); if( res!=ERROR_SUCCESS ) { - WINE_ERR("Couldn't query value after successfully querying before (%lu),\n" + WINE_ERR("Couldn't query value after successfully querying before (%u),\n" "please report to wine-devel(a)winehq.org\n", res); res=FALSE; goto end; @@ -322,14 +322,14 @@ static BOOL pendingRename(void) } } else { - WINE_ERR("couldn't get file attributes (%ld)\n", GetLastError() ); + WINE_ERR("couldn't get file attributes (%d)\n", GetLastError() ); } } } if((res=RegDeleteValueW(hSession, ValueName))!=ERROR_SUCCESS ) { - WINE_ERR("Error deleting the value (%lu)\n", GetLastError() ); + WINE_ERR("Error deleting the value (%u)\n", GetLastError() ); res=FALSE; } else res=TRUE; @@ -385,7 +385,7 @@ static DWORD runCmd(LPWSTR cmdline, LPCW if( !CreateProcessW(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, dir, &si, &info) ) { - WINE_ERR("Failed to run command %s (%ld)\n", wine_dbgstr_w(cmdline), + WINE_ERR("Failed to run command %s (%d)\n", wine_dbgstr_w(cmdline), GetLastError() ); return INVALID_RUNCMD_RETURN; @@ -433,7 +433,7 @@ static BOOL ProcessRunKeys( HKEY hkRoot, if( (res=RegOpenKeyExW( hkRoot, WINKEY_NAME, 0, KEY_READ, &hkWin ))!=ERROR_SUCCESS ) { - WINE_ERR("RegOpenKey failed on Software\\Microsoft\\Windows\\CurrentVersion (%ld)\n", + WINE_ERR("RegOpenKey failed on Software\\Microsoft\\Windows\\CurrentVersion (%d)\n", res); goto end; @@ -449,7 +449,7 @@ static BOOL ProcessRunKeys( HKEY hkRoot, res=ERROR_SUCCESS; } else - WINE_ERR("RegOpenKey failed on run key (%ld)\n", res); + WINE_ERR("RegOpenKey failed on run key (%d)\n", res); goto end; } @@ -457,7 +457,7 @@ static BOOL ProcessRunKeys( HKEY hkRoot, if( (res=RegQueryInfoKeyW( hkRun, NULL, NULL, NULL, NULL, NULL, NULL, &i, &nMaxValue, &nMaxCmdLine, NULL, NULL ))!=ERROR_SUCCESS ) { - WINE_ERR("Couldn't query key info (%ld)\n", res ); + WINE_ERR("Couldn't query key info (%d)\n", res ); goto end; } @@ -496,29 +496,29 @@ static BOOL ProcessRunKeys( HKEY hkRoot, if( (res=RegEnumValueW( hkRun, i, szValue, &nValLength, 0, &type, (LPBYTE)szCmdLine, &nDataLength ))!=ERROR_SUCCESS ) { - WINE_ERR("Couldn't read in value %ld - %ld\n", i, res ); + WINE_ERR("Couldn't read in value %d - %d\n", i, res ); continue; } if( bDelete && (res=RegDeleteValueW( hkRun, szValue ))!=ERROR_SUCCESS ) { - WINE_ERR("Couldn't delete value - %ld, %ld. Running command anyways.\n", i, res ); + WINE_ERR("Couldn't delete value - %d, %d. Running command anyways.\n", i, res ); } if( type!=REG_SZ ) { - WINE_ERR("Incorrect type of value #%ld (%ld)\n", i, type ); + WINE_ERR("Incorrect type of value #%d (%d)\n", i, type ); continue; } if( (res=runCmd(szCmdLine, NULL, bSynchronous, FALSE ))==INVALID_RUNCMD_RETURN ) { - WINE_ERR("Error running cmd #%ld (%ld)\n", i, GetLastError() ); + WINE_ERR("Error running cmd #%d (%d)\n", i, GetLastError() ); } - WINE_TRACE("Done processing cmd #%ld\n", i); + WINE_TRACE("Done processing cmd #%d\n", i); } res=ERROR_SUCCESS; @@ -606,7 +606,7 @@ static int ProcessWindowsFileProtection( (LPSTR) dllcache, targetpath, currentpath, tempfile,&sz); if (rc != ERROR_SUCCESS) { - WINE_ERR("WFP: %s error 0x%lx\n",finddata.cFileName,rc); + WINE_ERR("WFP: %s error 0x%x\n",finddata.cFileName,rc); DeleteFile(tempfile); } find_rc = FindNextFile(find_handle,&finddata); @@ -666,7 +666,7 @@ int main( int argc, char *argv[] ) if( res==0 ) { - WINE_ERR("Couldn't get the windows directory - error %ld\n", + WINE_ERR("Couldn't get the windows directory - error %d\n", GetLastError() ); return 100; @@ -674,14 +674,14 @@ int main( int argc, char *argv[] ) if( res>=sizeof(gen_path) ) { - WINE_ERR("Windows path too long (%ld)\n", res ); + WINE_ERR("Windows path too long (%d)\n", res ); return 100; } if( !SetCurrentDirectory( gen_path ) ) { - WINE_ERR("Cannot set the dir to %s (%ld)\n", gen_path, GetLastError() ); + WINE_ERR("Cannot set the dir to %s (%d)\n", gen_path, GetLastError() ); return 100; }

1 0