October 2006 - Wine-Commits

Louis. Lenders : wine.inf: Add d3d9 to fake dlls.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: 1bc7983ef9bd1d386bbdf81296f4f17064961449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bc7983ef9bd1d386bbdf8129… Author: Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Oct 6 09:19:54 2006 +0100 wine.inf: Add d3d9 to fake dlls. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 8487a6b..925577b 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2146,6 +2146,7 @@ HKLM,%CurrentVersion%\Telephony\Country 11,,control.exe 11,,crypt32.dll 11,,d3d8.dll +11,,d3d9.dll 11,,dbghelp.dll 11,,ddhelp.exe 11,,ddraw.dll

1 0

Michael Stefaniuc : cabinet/tests: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: dec4332a1e21934aacf768c34536387cdeb668b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dec4332a1e21934aacf768c34… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 5 22:07:06 2006 +0200 cabinet/tests: Win64 printf format warning fixes. --- dlls/cabinet/tests/Makefile.in | 1 - dlls/cabinet/tests/extract.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/cabinet/tests/Makefile.in b/dlls/cabinet/tests/Makefile.in index 6ab6bca..7a4f69c 100644 --- a/dlls/cabinet/tests/Makefile.in +++ b/dlls/cabinet/tests/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = cabinet.dll IMPORTS = cabinet user32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT CTESTS = \ extract.c diff --git a/dlls/cabinet/tests/extract.c b/dlls/cabinet/tests/extract.c index 8352f1b..a0139e5 100644 --- a/dlls/cabinet/tests/extract.c +++ b/dlls/cabinet/tests/extract.c @@ -342,7 +342,7 @@ static void test_Extract(void) lstrcpyA(extractDest.directory, "dest"); extractDest.flags = EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES; res = pExtract(&extractDest, "extract.cab"); - ok(res == S_OK, "Expected S_OK, got %ld\n", res); + ok(res == S_OK, "Expected S_OK, got %d\n", res); ok(DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to exist\n"); ok(DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to exist\n"); ok(DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to exist\n"); @@ -354,7 +354,7 @@ static void test_Extract(void) lstrcpyA(extractDest.directory, "dest"); extractDest.flags = EXTRACT_FILLFILELIST; res = pExtract(&extractDest, "extract.cab"); - ok(res == S_OK, "Expected S_OK, got %ld\n", res); + ok(res == S_OK, "Expected S_OK, got %d\n", res); ok(!DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to not exist\n"); ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to not exist\n"); ok(extractDest.filecount == 4, "Expected 4 files, got %ld\n", extractDest.filecount); @@ -364,7 +364,7 @@ static void test_Extract(void) /* try extract files operation once file list is filled */ extractDest.flags = EXTRACT_EXTRACTFILES; res = pExtract(&extractDest, "extract.cab"); - ok(res == S_OK, "Expected S_OK, got %ld\n", res); + ok(res == S_OK, "Expected S_OK, got %d\n", res); ok(DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to exist\n"); ok(DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to exist\n"); ok(DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to exist\n"); @@ -374,7 +374,7 @@ static void test_Extract(void) /* Extract does not extract files if the dest dir does not exist */ res = pExtract(&extractDest, "extract.cab"); - ok(res == S_OK, "Expected S_OK, got %ld\n", res); + ok(res == S_OK, "Expected S_OK, got %d\n", res); ok(!DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to not exist\n"); ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to not exist\n"); @@ -389,7 +389,7 @@ static void test_Extract(void) extractDest.filterlist = NULL; CreateDirectoryA("dest", NULL); res = pExtract(&extractDest, "extract.cab"); - ok(res == S_OK, "Expected S_OK, got %ld\n", res); + ok(res == S_OK, "Expected S_OK, got %d\n", res); ok(DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to exist\n"); ok(DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to exist\n"); ok(!DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to not exist\n"); @@ -405,7 +405,7 @@ static void test_Extract(void) extractDest.flags = 1; extractDest.filelist = NULL; res = pExtract(&extractDest, "extract.cab"); - ok(res == S_OK, "Expected S_OK, got %ld\n", res); + ok(res == S_OK, "Expected S_OK, got %d\n", res); ok(!DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to not exist\n"); ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to not exist\n"); ok(!DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to not exist\n"); @@ -420,7 +420,7 @@ static void test_Extract(void) extractDest.flags = 0; res = pExtract(&extractDest, "extract.cab"); - ok(res == S_OK, "Expected S_OK, got %ld\n", res); + ok(res == S_OK, "Expected S_OK, got %d\n", res); ok(!DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to exist\n"); ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to exist\n"); ok(!DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to exist\n"); @@ -436,7 +436,7 @@ static void test_Extract(void) extractDest.flags = 0; extractDest.filterlist = extractDest.filelist; res = pExtract(&extractDest, "extract.cab"); - ok(res == S_OK, "Expected S_OK, got %ld\n", res); + ok(res == S_OK, "Expected S_OK, got %d\n", res); ok(DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to exist\n"); ok(DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to exist\n"); ok(DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to exist\n");

1 0

Michael Stefaniuc : iccvid: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: 47f822eeaabe850dc893269afc54419db49a80e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47f822eeaabe850dc893269af… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 5 22:06:51 2006 +0200 iccvid: Win64 printf format warning fixes. --- dlls/iccvid/Makefile.in | 1 - dlls/iccvid/iccvid.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/iccvid/Makefile.in b/dlls/iccvid/Makefile.in index 3bd7053..c81a913 100644 --- a/dlls/iccvid/Makefile.in +++ b/dlls/iccvid/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = iccvid.dll IMPORTS = user32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ iccvid.c diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index 9db21a7..1bb9b1d 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -728,8 +728,8 @@ static void ICCVID_dump_BITMAPINFO(const TRACE( "planes = %d\n" "bpp = %d\n" - "height = %ld\n" - "width = %ld\n" + "height = %d\n" + "width = %d\n" "compr = %s\n", bmi->bmiHeader.biPlanes, bmi->bmiHeader.biBitCount, @@ -744,7 +744,7 @@ static inline int ICCVID_CheckMask(RGBQU COLORREF realBlueMask = MAKECOLOUR32(bmiColors[1].rgbRed, bmiColors[1].rgbGreen, bmiColors[1].rgbBlue); COLORREF realGreenMask = MAKECOLOUR32(bmiColors[2].rgbRed, bmiColors[2].rgbGreen, bmiColors[2].rgbBlue); - TRACE("\nbmiColors[0] = 0x%08lx\nbmiColors[1] = 0x%08lx\nbmiColors[2] = 0x%08lx\n", + TRACE("\nbmiColors[0] = 0x%08x\nbmiColors[1] = 0x%08x\nbmiColors[2] = 0x%08x\n", realRedMask, realBlueMask, realGreenMask); if ((realRedMask == redMask) && @@ -868,7 +868,7 @@ static LRESULT ICCVID_Decompress( ICCVID { LONG width, height; - TRACE("ICM_DECOMPRESS %p %p %ld\n", info, icd, size); + TRACE("ICM_DECOMPRESS %p %p %d\n", info, icd, size); if( (info==NULL) || (info->dwMagic!=ICCVID_MAGIC) ) return ICERR_BADPARAM; @@ -886,7 +886,7 @@ static LRESULT ICCVID_DecompressEx( ICCV { LONG width, height; - TRACE("ICM_DECOMPRESSEX %p %p %ld\n", info, icd, size); + TRACE("ICM_DECOMPRESSEX %p %p %d\n", info, icd, size); if( (info==NULL) || (info->dwMagic!=ICCVID_MAGIC) ) return ICERR_BADPARAM; @@ -1017,7 +1017,7 @@ LRESULT WINAPI ICCVID_DriverProc( DWORD_ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved) { - TRACE("(%p,%ld,%p)\n", hModule, dwReason, lpReserved); + TRACE("(%p,%d,%p)\n", hModule, dwReason, lpReserved); switch (dwReason) {

1 0

Michael Stefaniuc : msvcrt/tests: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: 223b92fc6719164df111be290fb4256c0d0afb11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=223b92fc6719164df111be290… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 5 22:06:37 2006 +0200 msvcrt/tests: Win64 printf format warning fixes. --- dlls/msvcrt/tests/Makefile.in | 1 - dlls/msvcrt/tests/time.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/tests/Makefile.in b/dlls/msvcrt/tests/Makefile.in index 552d413..04ac448 100644 --- a/dlls/msvcrt/tests/Makefile.in +++ b/dlls/msvcrt/tests/Makefile.in @@ -6,7 +6,6 @@ TESTDLL = msvcrt.dll IMPORTS = msvcrt kernel32 MODCFLAGS = @BUILTINFLAG@ EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt -I$(SRCDIR)/.. -EXTRADEFS = -DWINE_NO_LONG_AS_INT CTESTS = \ cpp.c \ diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index f058a38..441bf01 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -75,13 +75,13 @@ static void test_mktime(void) sav_tm = my_tm; local_time = mktime(&my_tm); - ok(((DWORD)local_time == SECSPERDAY), "mktime returned 0x%08lx\n",(DWORD)local_time); + ok(((DWORD)local_time == SECSPERDAY), "mktime returned 0x%08x\n",(DWORD)local_time); /* now test some unnormalized struct tm's */ my_tm = sav_tm; my_tm.tm_sec += 60; my_tm.tm_min -= 1; local_time = mktime(&my_tm); - ok(((DWORD)local_time == SECSPERDAY), "Unnormalized mktime returned 0x%08lx\n",(DWORD)local_time); + ok(((DWORD)local_time == SECSPERDAY), "Unnormalized mktime returned 0x%08x\n",(DWORD)local_time); ok( my_tm.tm_year == sav_tm.tm_year && my_tm.tm_mon == sav_tm.tm_mon && my_tm.tm_mday == sav_tm.tm_mday && my_tm.tm_hour == sav_tm.tm_hour && my_tm.tm_sec == sav_tm.tm_sec @@ -94,7 +94,7 @@ static void test_mktime(void) my_tm.tm_min -= 60; my_tm.tm_hour += 1; local_time = mktime(&my_tm); - ok(((DWORD)local_time == SECSPERDAY), "Unnormalized mktime returned 0x%08lx\n",(DWORD)local_time); + ok(((DWORD)local_time == SECSPERDAY), "Unnormalized mktime returned 0x%08x\n",(DWORD)local_time); ok( my_tm.tm_year == sav_tm.tm_year && my_tm.tm_mon == sav_tm.tm_mon && my_tm.tm_mday == sav_tm.tm_mday && my_tm.tm_hour == sav_tm.tm_hour && my_tm.tm_sec == sav_tm.tm_sec @@ -107,7 +107,7 @@ static void test_mktime(void) my_tm.tm_mon -= 12; my_tm.tm_year += 1; local_time = mktime(&my_tm); - ok(((DWORD)local_time == SECSPERDAY), "Unnormalized mktime returned 0x%08lx\n",(DWORD)local_time); + ok(((DWORD)local_time == SECSPERDAY), "Unnormalized mktime returned 0x%08x\n",(DWORD)local_time); ok( my_tm.tm_year == sav_tm.tm_year && my_tm.tm_mon == sav_tm.tm_mon && my_tm.tm_mday == sav_tm.tm_mday && my_tm.tm_hour == sav_tm.tm_hour && my_tm.tm_sec == sav_tm.tm_sec @@ -120,7 +120,7 @@ static void test_mktime(void) my_tm.tm_mon += 12; my_tm.tm_year -= 1; local_time = mktime(&my_tm); - ok(((DWORD)local_time == SECSPERDAY), "Unnormalized mktime returned 0x%08lx\n",(DWORD)local_time); + ok(((DWORD)local_time == SECSPERDAY), "Unnormalized mktime returned 0x%08x\n",(DWORD)local_time); ok( my_tm.tm_year == sav_tm.tm_year && my_tm.tm_mon == sav_tm.tm_mon && my_tm.tm_mday == sav_tm.tm_mday && my_tm.tm_hour == sav_tm.tm_hour && my_tm.tm_sec == sav_tm.tm_sec @@ -133,7 +133,7 @@ static void test_mktime(void) my_tm = sav_tm; my_tm.tm_year -= 1; local_time = mktime(&my_tm); - ok((local_time == -1), "(bad time) mktime returned 0x%08lx\n",(DWORD)local_time); + ok((local_time == -1), "(bad time) mktime returned 0x%08x\n",(DWORD)local_time); my_tm = sav_tm; /* TEST that we are independent from the TZ variable */ @@ -141,7 +141,7 @@ static void test_mktime(void) _snprintf(TZ_env,255,"TZ=%s",(getenv("TZ")?getenv("TZ"):"")); putenv("TZ=GMT"); nulltime = mktime(&my_tm); - ok(((DWORD)nulltime == SECSPERDAY),"mktime returned 0x%08lx\n",(DWORD)nulltime); + ok(((DWORD)nulltime == SECSPERDAY),"mktime returned 0x%08x\n",(DWORD)nulltime); putenv(TZ_env); } static void test_localtime(void)

1 0

Michael Stefaniuc : msdmo: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: 426d27cbe60835fd6d7e2a21bdc7842b1a308435 URL: http://source.winehq.org/git/wine.git/?a=commit;h=426d27cbe60835fd6d7e2a21b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 5 22:06:24 2006 +0200 msdmo: Win64 printf format warning fixes. --- dlls/msdmo/Makefile.in | 1 - dlls/msdmo/dmoreg.c | 6 +++--- dlls/msdmo/dmort.c | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/msdmo/Makefile.in b/dlls/msdmo/Makefile.in index cc2cb7c..57addcf 100644 --- a/dlls/msdmo/Makefile.in +++ b/dlls/msdmo/Makefile.in @@ -6,7 +6,6 @@ MODULE = msdmo.dll IMPORTLIB = libmsdmo.$(IMPLIBEXT) IMPORTS = ole32 user32 advapi32 kernel32 EXTRALIBS = -luuid -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ dmoreg.c \ diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 9d2f436..d5617c2 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -194,7 +194,7 @@ lend: if (hrkey) RegCloseKey(hrkey); - TRACE(" hresult=0x%08lx\n", hres); + TRACE(" hresult=0x%08x\n", hres); return hres; } @@ -448,7 +448,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( IEnumDMOImpl *This = (IEnumDMOImpl *)iface; - TRACE("%ld\n", cItemsToFetch); + TRACE("%d\n", cItemsToFetch); if (!pCLSID || !Names || !pcItemsFetched) return E_POINTER; @@ -627,7 +627,7 @@ HRESULT WINAPI DMOEnum( { HRESULT hres = E_FAIL; - TRACE("guidCategory=%p dwFlags=0x%08lx cInTypes=%ld cOutTypes=%ld\n", + TRACE("guidCategory=%p dwFlags=0x%08x cInTypes=%d cOutTypes=%d\n", guidCategory, dwFlags, cInTypes, cOutTypes); *ppEnum = IEnumDMO_Constructor(guidCategory, dwFlags, cInTypes, diff --git a/dlls/msdmo/dmort.c b/dlls/msdmo/dmort.c index fb7afcb..bf788a5 100644 --- a/dlls/msdmo/dmort.c +++ b/dlls/msdmo/dmort.c @@ -40,7 +40,7 @@ HRESULT WINAPI MoCreateMediaType(DMO_MED { HRESULT r; - TRACE("%p %lu\n", ppmedia, cbFormat); + TRACE("%p %u\n", ppmedia, cbFormat); if (!ppmedia) return E_POINTER; @@ -66,7 +66,7 @@ HRESULT WINAPI MoCreateMediaType(DMO_MED */ HRESULT WINAPI MoInitMediaType(DMO_MEDIA_TYPE* pmedia, DWORD cbFormat) { - TRACE("%p %lu\n", pmedia, cbFormat); + TRACE("%p %u\n", pmedia, cbFormat); if (!pmedia) return E_POINTER;

1 0

Michael Stefaniuc : comcat/tests: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: 860d40b1e879b3c93d88b3cbe8da32e40780c39c URL: http://source.winehq.org/git/wine.git/?a=commit;h=860d40b1e879b3c93d88b3cbe… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 5 22:06:10 2006 +0200 comcat/tests: Win64 printf format warning fixes. --- dlls/comcat/tests/Makefile.in | 1 - dlls/comcat/tests/comcat.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/comcat/tests/Makefile.in b/dlls/comcat/tests/Makefile.in index b5d1595..c0e5b0c 100644 --- a/dlls/comcat/tests/Makefile.in +++ b/dlls/comcat/tests/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ TESTDLL = comcat.dll IMPORTS = ole32 advapi32 kernel32 EXTRALIBS = -luuid -EXTRADEFS = -DWINE_NO_LONG_AS_INT CTESTS = \ comcat.c diff --git a/dlls/comcat/tests/comcat.c b/dlls/comcat/tests/comcat.c index c9952e9..798d22c 100644 --- a/dlls/comcat/tests/comcat.c +++ b/dlls/comcat/tests/comcat.c @@ -28,7 +28,7 @@ #include "comcat.h" #include "wine/test.h" -#define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08lx \n", hr) +#define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x \n", hr) static void register_testentry(void) { @@ -103,7 +103,7 @@ static void do_enum(void) ok_ole_success(hr,"ICatInformation_EnumClassesOfCategories"); hr = IEnumGUID_Next(pIEnum,1,the_guid, &fetched); - ok (fetched == 0,"Fetched wrong number of guids %lu\n",fetched); + ok (fetched == 0,"Fetched wrong number of guids %u\n",fetched); IEnumGUID_Release(pIEnum); register_testentry(); @@ -112,7 +112,7 @@ static void do_enum(void) ok_ole_success(hr,"ICatInformation_EnumClassesOfCategories"); hr = IEnumGUID_Next(pIEnum,1,the_guid, &fetched); - ok (fetched == 1,"Fetched wrong number of guids %lu\n",fetched); + ok (fetched == 1,"Fetched wrong number of guids %u\n",fetched); ok (IsEqualGUID(the_guid,&wanted_guid),"Guids do not match\n"); IEnumGUID_Release(pIEnum);

1 0

Michael Stefaniuc : msacm32/tests: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: 723b884b2696c50c9d6556436c9f46a4d494e74b URL: http://source.winehq.org/git/wine.git/?a=commit;h=723b884b2696c50c9d6556436… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 5 22:05:58 2006 +0200 msacm32/tests: Win64 printf format warning fixes. --- dlls/msacm32/tests/Makefile.in | 1 - dlls/msacm32/tests/msacm.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/msacm32/tests/Makefile.in b/dlls/msacm32/tests/Makefile.in index 7310562..00d2ed3 100644 --- a/dlls/msacm32/tests/Makefile.in +++ b/dlls/msacm32/tests/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = msacm32.dll IMPORTS = msacm32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT CTESTS = \ msacm.c diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 3b98d58..c3b866c 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -38,7 +38,7 @@ static BOOL CALLBACK FormatTagEnumProc(H DWORD fdwSupport) { if (winetest_interactive) - trace(" Format 0x%04lx: %s\n", paftd->dwFormatTag, paftd->szFormatTag); + trace(" Format 0x%04x: %s\n", paftd->dwFormatTag, paftd->szFormatTag); return TRUE; } @@ -49,7 +49,7 @@ static BOOL CALLBACK FormatEnumProc(HACM DWORD fd) { if (winetest_interactive) - trace(" 0x%04lx, %s\n", pafd->dwFormatTag, pafd->szFormat); + trace(" 0x%04x, %s\n", pafd->dwFormatTag, pafd->szFormat); return TRUE; } @@ -128,7 +128,7 @@ static BOOL CALLBACK DriverEnumProc(HACM */ if (rc == MMSYSERR_NOERROR) { ok(dd.cbStruct == sizeof(dd), - "acmDriverDetails(): cbStruct = %08lx, should be %08lx\n", + "acmDriverDetails(): cbStruct = %08x, should be %08lx\n", dd.cbStruct, (unsigned long)sizeof(dd)); } @@ -138,8 +138,8 @@ static BOOL CALLBACK DriverEnumProc(HACM trace(" Copyright: %s\n", dd.szCopyright); trace(" Licensing: %s\n", dd.szLicensing); trace(" Features: %s\n", dd.szFeatures); - trace(" Supports %lu formats\n", dd.cFormatTags); - trace(" Supports %lu filter formats\n", dd.cFilterTags); + trace(" Supports %u formats\n", dd.cFormatTags); + trace(" Supports %u filter formats\n", dd.cFilterTags); } /* try bad pointer */ @@ -453,7 +453,7 @@ static DWORD check_count(UINT uMetric) ok(rc == MMSYSERR_NOERROR, "acmMetrics() failed: rc = 0x%08x\n", rc); if (rc == MMSYSERR_NOERROR && winetest_interactive) - trace("%s: %lu\n", get_metric(uMetric), dwMetric); + trace("%s: %u\n", get_metric(uMetric), dwMetric); return dwMetric; }

1 0

Michael Stefaniuc : powrprof: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: a3a12dff89c400a29797d3239c6adc1a0afc8489 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3a12dff89c400a29797d3239… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 5 22:05:43 2006 +0200 powrprof: Win64 printf format warning fixes. --- dlls/powrprof/Makefile.in | 1 - dlls/powrprof/powrprof.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/powrprof/Makefile.in b/dlls/powrprof/Makefile.in index 3a861b2..76fd679 100644 --- a/dlls/powrprof/Makefile.in +++ b/dlls/powrprof/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = powrprof.dll IMPORTLIB = libpowrprof.$(IMPLIBEXT) IMPORTS = advapi32 kernel32 ntdll -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = powrprof.c diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index 6005bee..e17acc9 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -81,7 +81,7 @@ BOOLEAN WINAPI CanUserWritePwrScheme(VOI r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szPowerCfgSubKey, 0, KEY_READ | KEY_WRITE, &hKey); if (r != ERROR_SUCCESS) { - TRACE("RegOpenKeyEx failed: %ld\n", r); + TRACE("RegOpenKeyEx failed: %d\n", r); bSuccess = FALSE; } @@ -164,7 +164,7 @@ BOOLEAN WINAPI GetPwrDiskSpindownRange(P r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szPowerCfgSubKey, 0, KEY_READ, &hKey); if (r != ERROR_SUCCESS) { - TRACE("RegOpenKeyEx failed: %ld\n", r); + TRACE("RegOpenKeyEx failed: %d\n", r); TRACE("Using defaults: 3600, 3\n"); *RangeMax = 3600; *RangeMin = 3; @@ -174,7 +174,7 @@ BOOLEAN WINAPI GetPwrDiskSpindownRange(P r = RegQueryValueExW(hKey, szDiskMax, 0, 0, lpValue, &cbValue); if (r != ERROR_SUCCESS) { - TRACE("Couldn't open DiskSpinDownMax: %ld\n", r); + TRACE("Couldn't open DiskSpinDownMax: %d\n", r); TRACE("Using default: 3600\n"); *RangeMax = 3600; } else { @@ -185,7 +185,7 @@ BOOLEAN WINAPI GetPwrDiskSpindownRange(P r = RegQueryValueExW(hKey, szDiskMin, 0, 0, lpValue, &cbValue); if (r != ERROR_SUCCESS) { - TRACE("Couldn't open DiskSpinDownMin: %ld\n", r); + TRACE("Couldn't open DiskSpinDownMin: %d\n", r); TRACE("Using default: 3\n"); *RangeMin = 3; } else { @@ -305,7 +305,7 @@ BOOLEAN WINAPI WritePwrScheme(PUINT puiI BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - FIXME("(%p, %ld, %p) not fully implemented\n", hinstDLL, fdwReason, lpvReserved); + FIXME("(%p, %d, %p) not fully implemented\n", hinstDLL, fdwReason, lpvReserved); switch(fdwReason) { case DLL_PROCESS_ATTACH: { @@ -331,7 +331,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, PPRegSemaphore = CreateSemaphoreW(NULL, 1, 1, szSemaphoreName); if (PPRegSemaphore == NULL) { - ERR("Couldn't create Semaphore: %ld\n", GetLastError()); + ERR("Couldn't create Semaphore: %d\n", GetLastError()); return FALSE; } break;

1 0

Michael Stefaniuc : comdlg32/tests: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: 6ef43211b2064f13f66b42fd7d42a865be147e8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ef43211b2064f13f66b42fd7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 5 22:05:21 2006 +0200 comdlg32/tests: Win64 printf format warning fixes. --- dlls/comdlg32/tests/Makefile.in | 1 - dlls/comdlg32/tests/printdlg.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/tests/Makefile.in b/dlls/comdlg32/tests/Makefile.in index fd258e4..aa1ec87 100644 --- a/dlls/comdlg32/tests/Makefile.in +++ b/dlls/comdlg32/tests/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = comdlg32.dll IMPORTS = comdlg32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT CTESTS = \ printdlg.c diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index ce78415..bd3ddf1 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -61,7 +61,7 @@ #endif SetLastError(0xdeadbeef); res = PrintDlgA(pDlg); ok( !res && (CommDlgExtendedError() == CDERR_STRUCTSIZE), - "returned %ld with 0x%lx and 0x%lx (expected '0' and " \ + "returned %d with 0x%x and 0x%x (expected '0' and " \ "CDERR_STRUCTSIZE)\n", res, GetLastError(), CommDlgExtendedError()); @@ -71,7 +71,7 @@ #endif SetLastError(0xdeadbeef); res = PrintDlgA(pDlg); ok( res || (CommDlgExtendedError() == PDERR_NODEFAULTPRN), - "returned %ld with 0x%lx and 0x%lx (expected '!= 0' or '0' and " \ + "returned %d with 0x%x and 0x%x (expected '!= 0' or '0' and " \ "PDERR_NODEFAULTPRN)\n", res, GetLastError(), CommDlgExtendedError()); HeapFree(GetProcessHeap(), 0, pDlg);

1 0

Michael Stefaniuc : msvidc32: Win64 printf format warning fixes.
by Alexandre Julliard Oct. 6, 2006

Oct. 6, 2006

Module: wine Branch: master Commit: 8fac9960b85c615299614c7828aea7031f6b3b6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fac9960b85c615299614c782… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 5 22:05:02 2006 +0200 msvidc32: Win64 printf format warning fixes. --- dlls/msvidc32/Makefile.in | 1 - dlls/msvidc32/msvideo1.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/msvidc32/Makefile.in b/dlls/msvidc32/Makefile.in index 89bc127..3f9be06 100644 --- a/dlls/msvidc32/Makefile.in +++ b/dlls/msvidc32/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msvidc32.dll IMPORTS = user32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ msvideo1.c diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index de6ff9c..d49b35a 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -311,9 +311,9 @@ CRAM_DecompressQuery( Msvideo1Context *i TRACE("planes = %d\n", in->bmiHeader.biPlanes ); TRACE("bpp = %d\n", in->bmiHeader.biBitCount ); - TRACE("height = %ld\n", in->bmiHeader.biHeight ); - TRACE("width = %ld\n", in->bmiHeader.biWidth ); - TRACE("compr = %lx\n", in->bmiHeader.biCompression ); + TRACE("height = %d\n", in->bmiHeader.biHeight ); + TRACE("width = %d\n", in->bmiHeader.biWidth ); + TRACE("compr = %x\n", in->bmiHeader.biCompression ); if( ( in->bmiHeader.biCompression != CRAM_MAGIC ) && ( in->bmiHeader.biCompression != MSVC_MAGIC ) && @@ -397,7 +397,7 @@ static LRESULT CRAM_Decompress( Msvideo1 LONG width, height, stride, sz; WORD bit_per_pixel; - TRACE("ICM_DECOMPRESS %p %p %ld\n", info, icd, size); + TRACE("ICM_DECOMPRESS %p %p %d\n", info, icd, size); if( (info==NULL) || (info->dwMagic!=CRAM_MAGIC) ) return ICERR_BADPARAM; @@ -429,7 +429,7 @@ static LRESULT CRAM_DecompressEx( Msvide LONG width, height, stride, sz; WORD bit_per_pixel; - TRACE("ICM_DECOMPRESSEX %p %p %ld\n", info, icd, size); + TRACE("ICM_DECOMPRESSEX %p %p %d\n", info, icd, size); if( (info==NULL) || (info->dwMagic!=CRAM_MAGIC) ) return ICERR_BADPARAM; @@ -582,7 +582,7 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PT */ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved) { - TRACE("(%p,%ld,%p)\n", hModule, dwReason, lpReserved); + TRACE("(%p,%d,%p)\n", hModule, dwReason, lpReserved); switch (dwReason) {

1 0