October 2006 - Wine-commits

Michael Stefaniuc : devenum: Win64 printf format warning fixes.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: 36d88d929f55d09353a1c3c150bd1ba1b4d300fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=36d88d929f55d09353a1c3c15… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 8 18:58:22 2006 +0200 devenum: Win64 printf format warning fixes. --- dlls/devenum/Makefile.in | 1 - dlls/devenum/createdevenum.c | 4 ++-- dlls/devenum/devenum_main.c | 4 ++-- dlls/devenum/mediacatenum.c | 28 ++++++++++++++-------------- dlls/devenum/parsedisplayname.c | 2 +- 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/devenum/Makefile.in b/dlls/devenum/Makefile.in index 398d13b..257c0fb 100644 --- a/dlls/devenum/Makefile.in +++ b/dlls/devenum/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = devenum.dll IMPORTS = ole32 oleaut32 avicap32 winmm user32 advapi32 kernel32 EXTRALIBS = -lstrmiids -luuid -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ createdevenum.c \ diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 086240c..b9c1605 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -110,7 +110,7 @@ HRESULT WINAPI DEVENUM_ICreateDevEnum_Cr HKEY hbasekey; CreateDevEnumImpl *This = (CreateDevEnumImpl *)iface; - TRACE("(%p)->(%s, %p, %lx)\n\tDeviceClass:\t%s\n", This, debugstr_guid(clsidDeviceClass), ppEnumMoniker, dwFlags, debugstr_guid(clsidDeviceClass)); + TRACE("(%p)->(%s, %p, %x)\n\tDeviceClass:\t%s\n", This, debugstr_guid(clsidDeviceClass), ppEnumMoniker, dwFlags, debugstr_guid(clsidDeviceClass)); if (!ppEnumMoniker) return E_POINTER; @@ -243,7 +243,7 @@ static HRESULT DEVENUM_CreateSpecialCate if (!LoadStringW(DEVENUM_hInstance, IDS_DEVENUM_DS, szDSoundNameFormat, sizeof(szDSoundNameFormat)/sizeof(szDSoundNameFormat[0])-1)) { - ERR("Couldn't get string resource (GetLastError() is %ld)\n", GetLastError()); + ERR("Couldn't get string resource (GetLastError() is %d)\n", GetLastError()); return HRESULT_FROM_WIN32(GetLastError()); } diff --git a/dlls/devenum/devenum_main.c b/dlls/devenum/devenum_main.c index 4a45971..3d8566d 100644 --- a/dlls/devenum/devenum_main.c +++ b/dlls/devenum/devenum_main.c @@ -48,7 +48,7 @@ const WCHAR clsid_keyname[6] = { 'C', 'L */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) { - TRACE("%p 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad); + TRACE("%p 0x%x %p\n", hinstDLL, fdwReason, fImpLoad); switch(fdwReason) { case DLL_PROCESS_ATTACH: @@ -382,6 +382,6 @@ static void DEVENUM_RegisterQuartz() { HRESULT hr = pDllRegisterServer(); if (FAILED(hr)) - ERR("Failed to register Quartz. Error was 0x%lx)\n", hr); + ERR("Failed to register Quartz. Error was 0x%x)\n", hr); } } diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index efe08c1..93e9328 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -129,7 +129,7 @@ static HRESULT WINAPI DEVENUM_IPropertyB { res = E_INVALIDARG; /* assume we cannot coerce into right type */ - TRACE("Read %ld bytes (%s)\n", received, type == REG_SZ ? debugstr_w((LPWSTR)pData) : "binary data"); + TRACE("Read %d bytes (%s)\n", received, type == REG_SZ ? debugstr_w((LPWSTR)pData) : "binary data"); switch (type) { @@ -151,7 +151,7 @@ static HRESULT WINAPI DEVENUM_IPropertyB } break; case REG_DWORD: - TRACE("REG_DWORD: %lx\n", *(DWORD *)pData); + TRACE("REG_DWORD: %x\n", *(DWORD *)pData); switch (V_VT(pVar)) { case VT_EMPTY: @@ -170,7 +170,7 @@ static HRESULT WINAPI DEVENUM_IPropertyB void * pArrayElements; bound.lLbound = 0; bound.cElements = received; - TRACE("REG_BINARY: len = %ld\n", received); + TRACE("REG_BINARY: len = %d\n", received); switch (V_VT(pVar)) { case VT_EMPTY: @@ -194,12 +194,12 @@ static HRESULT WINAPI DEVENUM_IPropertyB } } if (res == E_INVALIDARG) - FIXME("Variant type %x not supported for regtype %lx\n", V_VT(pVar), type); + FIXME("Variant type %x not supported for regtype %x\n", V_VT(pVar), type); } HeapFree(GetProcessHeap(), 0, pData); - TRACE("<- %lx\n", res); + TRACE("<- %x\n", res); return res; } @@ -226,7 +226,7 @@ static HRESULT WINAPI DEVENUM_IPropertyB break; case VT_I4: case VT_UI4: - TRACE("writing %lu\n", V_UNION(pVar, ulVal)); + TRACE("writing %u\n", V_UNION(pVar, ulVal)); lpData = (LPVOID)&V_UNION(pVar, ulVal); dwType = REG_DWORD; cbData = sizeof(DWORD); @@ -239,7 +239,7 @@ static HRESULT WINAPI DEVENUM_IPropertyB res = SafeArrayGetLBound(V_UNION(pVar, parray), 1, &lLbound); res = SafeArrayGetUBound(V_UNION(pVar, parray), 1, &lUbound); cbData = (lUbound - lLbound + 1) /* * sizeof(BYTE)*/; - TRACE("cbData: %ld\n", cbData); + TRACE("cbData: %d\n", cbData); res = SafeArrayAccessData(V_UNION(pVar, parray), &lpData); break; } @@ -449,7 +449,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatM IPropertyBag_Release(pProp); } - TRACE("<- 0x%lx\n", res); + TRACE("<- 0x%x\n", res); return res; } @@ -486,7 +486,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatM IMoniker** ppmkToLeft, IMoniker** ppmkReduced) { - TRACE("(%p, %ld, %p, %p)\n", pbc, dwReduceHowFar, ppmkToLeft, ppmkReduced); + TRACE("(%p, %d, %p, %p)\n", pbc, dwReduceHowFar, ppmkToLeft, ppmkReduced); if (ppmkToLeft) *ppmkToLeft = NULL; @@ -730,7 +730,7 @@ static ULONG WINAPI DEVENUM_IEnumMoniker EnumMonikerImpl *This = (EnumMonikerImpl *)iface; ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->() AddRef from %ld\n", iface, ref - 1); + TRACE("(%p)->() AddRef from %d\n", iface, ref - 1); return ref; } @@ -743,7 +743,7 @@ static ULONG WINAPI DEVENUM_IEnumMoniker EnumMonikerImpl *This = (EnumMonikerImpl *)iface; ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->() Release from %ld\n", iface, ref + 1); + TRACE("(%p)->() Release from %d\n", iface, ref + 1); if (!ref) { @@ -763,7 +763,7 @@ static HRESULT WINAPI DEVENUM_IEnumMonik MediaCatMoniker * pMoniker; EnumMonikerImpl *This = (EnumMonikerImpl *)iface; - TRACE("(%p)->(%ld, %p, %p)\n", iface, celt, rgelt, pceltFetched); + TRACE("(%p)->(%d, %p, %p)\n", iface, celt, rgelt, pceltFetched); while (fetched < celt) { @@ -787,7 +787,7 @@ static HRESULT WINAPI DEVENUM_IEnumMonik This->index += fetched; - TRACE("-- fetched %ld\n", fetched); + TRACE("-- fetched %d\n", fetched); if (pceltFetched) *pceltFetched = fetched; @@ -802,7 +802,7 @@ static HRESULT WINAPI DEVENUM_IEnumMonik { EnumMonikerImpl *This = (EnumMonikerImpl *)iface; - TRACE("(%p)->(%ld)\n", iface, celt); + TRACE("(%p)->(%d)\n", iface, celt); This->index += celt; diff --git a/dlls/devenum/parsedisplayname.c b/dlls/devenum/parsedisplayname.c index 091ad08..0305c98 100644 --- a/dlls/devenum/parsedisplayname.c +++ b/dlls/devenum/parsedisplayname.c @@ -149,7 +149,7 @@ static HRESULT WINAPI DEVENUM_IParseDisp CoTaskMemFree(pszClass); - TRACE("-- returning: %lx\n", res); + TRACE("-- returning: %x\n", res); return res; }

1 0

Michael Stefaniuc : msrle32: Win64 printf format warning fixes.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: 4407218329048972f5efc0242eab8ecd07da76a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4407218329048972f5efc0242… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 8 18:58:10 2006 +0200 msrle32: Win64 printf format warning fixes. --- dlls/msrle32/Makefile.in | 1 - dlls/msrle32/msrle32.c | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/msrle32/Makefile.in b/dlls/msrle32/Makefile.in index 14687c6..eef540b 100644 --- a/dlls/msrle32/Makefile.in +++ b/dlls/msrle32/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msrle32.dll IMPORTS = winmm user32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = msrle32.c diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 28da739..c1e5463 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1024,7 +1024,7 @@ static LRESULT MSRLE32_DecompressRLE8(Co break; default: /* absolute mode */ if (pixel_ptr/bytes_per_pixel + code1 > lpbi->biWidth) { - WARN("aborted absolute: (%d=%d/%d+%d) > %ld\n",pixel_ptr/bytes_per_pixel + code1,pixel_ptr,bytes_per_pixel,code1,lpbi->biWidth); + WARN("aborted absolute: (%d=%d/%d+%d) > %d\n",pixel_ptr/bytes_per_pixel + code1,pixel_ptr,bytes_per_pixel,code1,lpbi->biWidth); return ICERR_ERROR; } extra_byte = code1 & 0x01; @@ -1052,7 +1052,7 @@ static LRESULT MSRLE32_DecompressRLE8(Co } else { /* coded mode */ if (pixel_ptr/bytes_per_pixel + code0 > lpbi->biWidth) { - WARN("aborted coded: (%d=%d/%d+%d) > %ld\n",pixel_ptr/bytes_per_pixel + code1,pixel_ptr,bytes_per_pixel,code1,lpbi->biWidth); + WARN("aborted coded: (%d=%d/%d+%d) > %d\n",pixel_ptr/bytes_per_pixel + code1,pixel_ptr,bytes_per_pixel,code1,lpbi->biWidth); return ICERR_ERROR; } @@ -1100,7 +1100,7 @@ static CodecInfo* Open(LPICOPEN icinfo) if (icinfo->fccType != ICTYPE_VIDEO) return NULL; - TRACE("(%p = {%lu,0x%08lX(%4.4s),0x%08lX(%4.4s),0x%lX,0x%lX,...})\n", icinfo, + TRACE("(%p = {%u,0x%08X(%4.4s),0x%08X(%4.4s),0x%X,0x%X,...})\n", icinfo, icinfo->dwSize, icinfo->fccType, (char*)&icinfo->fccType, icinfo->fccHandler, (char*)&icinfo->fccHandler, icinfo->dwVersion,icinfo->dwFlags); @@ -1115,7 +1115,7 @@ static CodecInfo* Open(LPICOPEN icinfo) icinfo->fccHandler = FOURCC_MRLE; break; default: - WARN("unknown FOURCC = 0x%08lX(%4.4s) !\n", + WARN("unknown FOURCC = 0x%08X(%4.4s) !\n", icinfo->fccHandler,(char*)&icinfo->fccHandler); return NULL; } @@ -1422,7 +1422,7 @@ static LRESULT Compress(CodecInfo *pi, I { int i; - TRACE("(%p,%p,%lu)\n",pi,lpic,dwSize); + TRACE("(%p,%p,%u)\n",pi,lpic,dwSize); /* pre-condition */ assert(pi != NULL); @@ -1434,7 +1434,7 @@ static LRESULT Compress(CodecInfo *pi, I !lpic->lpbiInput || !lpic->lpInput) return ICERR_BADPARAM; - TRACE("lpic={0x%lX,%p,%p,%p,%p,%p,%p,%ld,%lu,%lu,%p,%p}\n",lpic->dwFlags,lpic->lpbiOutput,lpic->lpOutput,lpic->lpbiInput,lpic->lpInput,lpic->lpckid,lpic->lpdwFlags,lpic->lFrameNum,lpic->dwFrameSize,lpic->dwQuality,lpic->lpbiPrev,lpic->lpPrev); + TRACE("lpic={0x%X,%p,%p,%p,%p,%p,%p,%d,%u,%u,%p,%p}\n",lpic->dwFlags,lpic->lpbiOutput,lpic->lpOutput,lpic->lpbiInput,lpic->lpInput,lpic->lpckid,lpic->lpdwFlags,lpic->lFrameNum,lpic->dwFrameSize,lpic->dwQuality,lpic->lpbiPrev,lpic->lpPrev); if (! pi->bCompress) { LRESULT hr = CompressBegin(pi, lpic->lpbiInput, lpic->lpbiOutput); @@ -1458,13 +1458,13 @@ static LRESULT Compress(CodecInfo *pi, I } else if ((lpic->dwFlags & ICCOMPRESS_KEYFRAME) == 0) { LPWORD pTmp; - WARN(": prev=%ld cur=%ld gone back? -- untested\n",pi->nPrevFrame,lpic->lFrameNum); + WARN(": prev=%d cur=%d gone back? -- untested\n",pi->nPrevFrame,lpic->lFrameNum); if (lpic->lpbiPrev == NULL || lpic->lpPrev == NULL) return ICERR_GOTOKEYFRAME; /* Need a keyframe if you go back */ if (CompressQuery(pi, lpic->lpbiPrev, lpic->lpbiOutput) != ICERR_OK) return ICERR_BADFORMAT; - WARN(": prev=%ld cur=%ld compute swapped -- untested\n",pi->nPrevFrame,lpic->lFrameNum); + WARN(": prev=%d cur=%d compute swapped -- untested\n",pi->nPrevFrame,lpic->lFrameNum); computeInternalFrame(pi, lpic->lpbiPrev, lpic->lpPrev); /* swap buffers for current and previous frame */ @@ -1697,7 +1697,7 @@ static LRESULT DecompressBegin(CodecInfo static LRESULT Decompress(CodecInfo *pi, ICDECOMPRESS *pic, DWORD dwSize) { - TRACE("(%p,%p,%lu)\n",pi,pic,dwSize); + TRACE("(%p,%p,%u)\n",pi,pic,dwSize); /* pre-condition */ assert(pi != NULL); @@ -1892,7 +1892,7 @@ LRESULT CALLBACK MSRLE32_DriverProc(DWOR /* DllMain - library initialization code */ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved) { - TRACE("(%p,%ld,%p)\n",(LPVOID)hModule,dwReason,lpReserved); + TRACE("(%p,%d,%p)\n",(LPVOID)hModule,dwReason,lpReserved); switch (dwReason) { case DLL_PROCESS_ATTACH:

1 0

Michael Stefaniuc : imagehlp: Win64 printf format warning fixes.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: 56c90105b7732f0550a7d74c46e1cca6381efb6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=56c90105b7732f0550a7d74c4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 8 18:58:00 2006 +0200 imagehlp: Win64 printf format warning fixes. --- dlls/imagehlp/Makefile.in | 2 +- dlls/imagehlp/access.c | 4 ++-- dlls/imagehlp/integrity.c | 16 ++++++++-------- dlls/imagehlp/modify.c | 10 +++++----- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/imagehlp/Makefile.in b/dlls/imagehlp/Makefile.in index c6ec3cd..7315af7 100644 --- a/dlls/imagehlp/Makefile.in +++ b/dlls/imagehlp/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DWINE_NO_LONG_AS_INT +EXTRADEFS = -D_IMAGEHLP_SOURCE_ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c index 48649d5..aa87e67 100644 --- a/dlls/imagehlp/access.c +++ b/dlls/imagehlp/access.c @@ -174,7 +174,7 @@ BOOL WINAPI MapAndLoad( hFile, NULL, PAGE_READONLY | SEC_COMMIT, 0, 0, NULL))) { DWORD dwLastError = GetLastError(); - WARN("CreateFileMapping: Error = %ld\n", dwLastError); + WARN("CreateFileMapping: Error = %d\n", dwLastError); SetLastError(dwLastError); goto Error; } @@ -185,7 +185,7 @@ BOOL WINAPI MapAndLoad( hFileMapping, FILE_MAP_READ, 0, 0, 0))) { DWORD dwLastError = GetLastError(); - WARN("MapViewOfFile: Error = %ld\n", dwLastError); + WARN("MapViewOfFile: Error = %d\n", dwLastError); SetLastError(dwLastError); goto Error; } diff --git a/dlls/imagehlp/integrity.c b/dlls/imagehlp/integrity.c index b69e4f0..25720e6 100644 --- a/dlls/imagehlp/integrity.c +++ b/dlls/imagehlp/integrity.c @@ -79,7 +79,7 @@ static BOOL IMAGEHLP_GetSecurityDirOffse sd = &nt_hdr.OptionalHeader. DataDirectory[IMAGE_FILE_SECURITY_DIRECTORY]; - TRACE("size = %lx addr = %lx\n", sd->Size, sd->VirtualAddress); + TRACE("size = %x addr = %x\n", sd->Size, sd->VirtualAddress); *pdwSize = sd->Size; *pdwOfs = sd->VirtualAddress; @@ -134,7 +134,7 @@ static BOOL IMAGEHLP_GetCertificateOffse *pdwOfs = sd_VirtualAddr + offset; *pdwSize = len; - TRACE("len = %lx addr = %lx\n", len, sd_VirtualAddr + offset); + TRACE("len = %x addr = %x\n", len, sd_VirtualAddr + offset); return TRUE; } @@ -166,7 +166,7 @@ BOOL WINAPI ImageEnumerateCertificates( const size_t cert_hdr_size = sizeof hdr - sizeof hdr.bCertificate; BOOL r; - TRACE("%p %hd %p %p %ld\n", + TRACE("%p %hd %p %p %d\n", handle, TypeFilter, CertificateCount, Indices, IndexCount); if( Indices ) @@ -194,7 +194,7 @@ BOOL WINAPI ImageEnumerateCertificates( if( count != cert_hdr_size ) return FALSE; - TRACE("Size = %08lx id = %08hx\n", + TRACE("Size = %08x id = %08hx\n", hdr.dwLength, hdr.wCertificateType ); /* check the certificate is not too big or too small */ @@ -227,7 +227,7 @@ BOOL WINAPI ImageGetCertificateData( { DWORD r, offset, ofs, size, count; - TRACE("%p %ld %p %p\n", handle, Index, Certificate, RequiredLength); + TRACE("%p %d %p %p\n", handle, Index, Certificate, RequiredLength); if( !IMAGEHLP_GetCertificateOffset( handle, Index, &ofs, &size ) ) return FALSE; @@ -271,7 +271,7 @@ BOOL WINAPI ImageGetCertificateHeader( DWORD r, offset, ofs, size, count; const size_t cert_hdr_size = sizeof *pCert - sizeof pCert->bCertificate; - TRACE("%p %ld %p\n", handle, index, pCert); + TRACE("%p %d %p\n", handle, index, pCert); if( !IMAGEHLP_GetCertificateOffset( handle, index, &ofs, &size ) ) return FALSE; @@ -301,7 +301,7 @@ BOOL WINAPI ImageGetDigestStream( HANDLE FileHandle, DWORD DigestLevel, DIGEST_FUNCTION DigestFunction, DIGEST_HANDLE DigestHandle) { - FIXME("(%p, %ld, %p, %p): stub\n", + FIXME("(%p, %d, %p, %p): stub\n", FileHandle, DigestLevel, DigestFunction, DigestHandle ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -313,7 +313,7 @@ BOOL WINAPI ImageGetDigestStream( */ BOOL WINAPI ImageRemoveCertificate(HANDLE FileHandle, DWORD Index) { - FIXME("(%p, %ld): stub\n", FileHandle, Index); + FIXME("(%p, %d): stub\n", FileHandle, Index); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } diff --git a/dlls/imagehlp/modify.c b/dlls/imagehlp/modify.c index 035c6ef..a858ad9 100644 --- a/dlls/imagehlp/modify.c +++ b/dlls/imagehlp/modify.c @@ -49,7 +49,7 @@ BOOL WINAPI BindImageEx( DWORD Flags, LPSTR ImageName, LPSTR DllPath, LPSTR SymbolPath, PIMAGEHLP_STATUS_ROUTINE StatusRoutine) { - FIXME("(%ld, %s, %s, %s, %p): stub\n", + FIXME("(%d, %s, %s, %s, %p): stub\n", Flags, debugstr_a(ImageName), debugstr_a(DllPath), debugstr_a(SymbolPath), StatusRoutine ); @@ -95,7 +95,7 @@ PIMAGE_NT_HEADERS WINAPI CheckSumMappedF DWORD CalcSum; DWORD HdrSum; - FIXME("(%p, %ld, %p, %p): stub\n", + FIXME("(%p, %d, %p, %p): stub\n", BaseAddress, FileLength, HeaderSum, CheckSum ); @@ -278,7 +278,7 @@ BOOL WINAPI ReBaseImage( ULONG *NewImageBase, ULONG TimeStamp) { FIXME( - "(%s, %s, %d, %d, %d, %ld, %p, %p, %p, %p, %ld): stub\n", + "(%s, %s, %d, %d, %d, %d, %p, %p, %p, %p, %d): stub\n", debugstr_a(CurrentImageName),debugstr_a(SymbolPath), fReBase, fRebaseSysfileOk, fGoingDown, CheckImageSize, OldImageSize, OldImageBase, NewImageSize, NewImageBase, TimeStamp @@ -316,7 +316,7 @@ BOOL WINAPI SplitSymbols( LPSTR ImageName, LPSTR SymbolsPath, LPSTR SymbolFilePath, DWORD Flags) { - FIXME("(%s, %s, %s, %ld): stub\n", + FIXME("(%s, %s, %s, %d): stub\n", debugstr_a(ImageName), debugstr_a(SymbolsPath), debugstr_a(SymbolFilePath), Flags ); @@ -346,7 +346,7 @@ BOOL WINAPI UpdateDebugInfoFileEx( LPSTR ImageFileName, LPSTR SymbolPath, LPSTR DebugFilePath, PIMAGE_NT_HEADERS NtHeaders, DWORD OldChecksum) { - FIXME("(%s, %s, %s, %p, %ld): stub\n", + FIXME("(%s, %s, %s, %p, %d): stub\n", debugstr_a(ImageFileName), debugstr_a(SymbolPath), debugstr_a(DebugFilePath), NtHeaders, OldChecksum );

1 0

Michael Stefaniuc : riched20/tests: Win64 printf format warning fixes.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: 86bb053cf81ce2c93bdc134cddf59508b50763d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86bb053cf81ce2c93bdc134cd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Oct 8 18:57:48 2006 +0200 riched20/tests: Win64 printf format warning fixes. --- dlls/riched20/tests/Makefile.in | 1 - dlls/riched20/tests/editor.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/tests/Makefile.in b/dlls/riched20/tests/Makefile.in index 03e4d83..a744940 100644 --- a/dlls/riched20/tests/Makefile.in +++ b/dlls/riched20/tests/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = riched20.dll IMPORTS = riched20 user32 gdi32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT CTESTS = \ editor.c diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 5dc136e..98aa32c 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -147,11 +147,11 @@ static void check_EM_FINDTEXTEX(HWND hwn "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, start at %d\n", name, id, f->needle, f->start, f->end, f->flags, findloc); ok(ft.chrgText.cpMin == f->expected_loc, - "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, start at %ld\n", + "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, start at %d\n", name, id, f->needle, f->start, f->end, f->flags, ft.chrgText.cpMin); ok(ft.chrgText.cpMax == ((f->expected_loc == -1) ? -1 : f->expected_loc + strlen(f->needle)), - "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, end at %ld\n", + "EM_FINDTEXTEX(%s,%d) '%s' in range(%d,%d), flags %08x, end at %d\n", name, id, f->needle, f->start, f->end, f->flags, ft.chrgText.cpMax); } @@ -256,7 +256,7 @@ static int get_scroll_pos_y(HWND hwnd) { POINT p = {-1, -1}; SendMessage(hwnd, EM_GETSCROLLPOS, 0, (LPARAM) &p); - ok(p.x != -1 && p.y != -1, "p.x:%ld p.y:%ld\n", p.x, p.y); + ok(p.x != -1 && p.y != -1, "p.x:%d p.y:%d\n", p.x, p.y); return p.y; } @@ -406,7 +406,7 @@ static void test_EM_SETTEXTMODE(void) /*Compare the two formattings*/ ok((cf2.dwMask == cf2test.dwMask) && (cf2.dwEffects == cf2test.dwEffects), - "two formats found in plain text mode - cf2.dwEffects: %lx cf2test.dwEffects: %lx\n", + "two formats found in plain text mode - cf2.dwEffects: %x cf2test.dwEffects: %x\n", cf2.dwEffects, cf2test.dwEffects); /*Test TM_RICHTEXT by: switching back to Rich Text mode printing "wine" in the current format(normal) @@ -450,7 +450,7 @@ static void test_EM_SETTEXTMODE(void) /*Test that the two formattings are not the same*/ todo_wine ok((cf2.dwMask == cf2test.dwMask) && (cf2.dwEffects != cf2test.dwEffects), - "expected different formats - cf2.dwMask: %lx, cf2test.dwMask: %lx, cf2.dwEffects: %lx, cf2test.dwEffects: %lx\n", + "expected different formats - cf2.dwMask: %x, cf2test.dwMask: %x, cf2.dwEffects: %x, cf2test.dwEffects: %x\n", cf2.dwMask, cf2test.dwMask, cf2.dwEffects, cf2test.dwEffects); DestroyWindow(hwndRichEdit); @@ -501,7 +501,7 @@ static void test_TM_PLAINTEXT(void) /*Test that they are the same as plain text allows only one formatting*/ ok((cf2.dwMask == cf2test.dwMask) && (cf2.dwEffects == cf2test.dwEffects), - "two selections' formats differ - cf2.dwMask: %lx, cf2test.dwMask %lx, cf2.dwEffects: %lx, cf2test.dwEffects: %lx\n", + "two selections' formats differ - cf2.dwMask: %x, cf2test.dwMask %x, cf2.dwEffects: %x, cf2test.dwEffects: %x\n", cf2.dwMask, cf2test.dwMask, cf2.dwEffects, cf2test.dwEffects); /*Fill the control with a "wine" string, which when inserted will be bold*/ @@ -553,7 +553,7 @@ static void test_TM_PLAINTEXT(void) /*Compare the two formattings. They should be the same.*/ ok((cf2.dwMask == cf2test.dwMask) && (cf2.dwEffects == cf2test.dwEffects), - "Copied text retained formatting - cf2.dwMask: %lx, cf2test.dwMask: %lx, cf2.dwEffects: %lx, cf2test.dwEffects: %lx\n", + "Copied text retained formatting - cf2.dwMask: %x, cf2test.dwMask: %x, cf2.dwEffects: %x, cf2test.dwEffects: %x\n", cf2.dwMask, cf2test.dwMask, cf2.dwEffects, cf2test.dwEffects); DestroyWindow(hwndRichEdit); }

1 0

Stefan Dösinger : ddraw: Set the DDSCAPS2_MIPMAPSUBLEVEL flag on sublevels.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: 48b550c9db5fe98be7b632c91a4b2a7235a53938 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48b550c9db5fe98be7b632c91… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Oct 9 00:29:10 2006 +0200 ddraw: Set the DDSCAPS2_MIPMAPSUBLEVEL flag on sublevels. --- dlls/ddraw/ddraw.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 594f434..a2177d2 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2155,6 +2155,9 @@ IDirectDrawImpl_CreateSurface(IDirectDra return E_POINTER; /* unchecked */ } + /* According to the msdn this flag is ignored by CreateSurface */ + DDSD->ddsCaps.dwCaps2 &= ~DDSCAPS2_MIPMAPSUBLEVEL; + /* Modify some flags */ memset(&desc2, 0, sizeof(desc2)); desc2.dwSize = sizeof(desc2); /* For the struct copy */ @@ -2330,6 +2333,11 @@ IDirectDrawImpl_CreateSurface(IDirectDra desc2.ddsCaps.dwCaps &= ~DDSCAPS_FRONTBUFFER; /* It's not a front buffer */ desc2.ddsCaps.dwCaps |= DDSCAPS_BACKBUFFER; } + /* Set the DDSCAPS2_MIPMAPSUBLEVEL flag on mipmap sublevels according to the msdn */ + if(DDSD->ddsCaps.dwCaps & DDSCAPS_MIPMAP) + { + desc2.ddsCaps.dwCaps2 |= DDSCAPS2_MIPMAPSUBLEVEL; + } for(i = 0; i < extra_surfaces; i++) {

1 0

Paul Vriens : rsaenh: Make hmac test run on all windows versions.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: 038ede615efb3f424729cda105bb9aa3a0cc170b URL: http://source.winehq.org/git/wine.git/?a=commit;h=038ede615efb3f424729cda10… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Sun Oct 8 14:41:56 2006 +0200 rsaenh: Make hmac test run on all windows versions. --- dlls/rsaenh/tests/rsaenh.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 25467d7..13468b9 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -626,12 +626,13 @@ static void test_hmac(void) { HCRYPTKEY hKey; HCRYPTHASH hHash; BOOL result; - HMAC_INFO hmacInfo = { CALG_MD2, NULL, 0, NULL, 0 }; + /* Using CALG_MD2 here fails on Windows 2003, why ? */ + HMAC_INFO hmacInfo = { CALG_MD5, NULL, 0, NULL, 0 }; DWORD dwLen; BYTE abData[256]; static const BYTE hmac[16] = { - 0xfd, 0x16, 0xb5, 0xb6, 0x13, 0x1c, 0x2b, 0xd6, - 0x0a, 0xc7, 0xae, 0x92, 0x76, 0xa3, 0x05, 0x71 }; + 0x1a, 0x7d, 0x49, 0xc5, 0x9b, 0x2d, 0x0b, 0x9c, + 0xcf, 0x10, 0x6b, 0xb6, 0x7d, 0x0f, 0x13, 0x32 }; int i; for (i=0; i<sizeof(abData)/sizeof(BYTE); i++) abData[i] = (BYTE)i;

1 0

Paul Vriens : rsaenh: Win64 printf format warning fixes.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: 283fc8a8ad7cde022b26d916611996c7acf383b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=283fc8a8ad7cde022b26d9166… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Sun Oct 8 14:42:37 2006 +0200 rsaenh: Win64 printf format warning fixes. --- dlls/rsaenh/tests/Makefile.in | 1 dlls/rsaenh/tests/rsaenh.c | 382 +++++++++++++++++++++-------------------- 2 files changed, 191 insertions(+), 192 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=283fc8a8ad7cde022b26d…

1 0

Paul Vriens : msi: Make tests run on Win98 again.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: feb7990b49e567e52c19e13932f7bfb3c564ae39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feb7990b49e567e52c19e1393… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Sun Oct 8 14:29:08 2006 +0200 msi: Make tests run on Win98 again. --- dlls/msi/tests/install.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 4e611da..94925dc 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -250,7 +250,8 @@ static INT_PTR fci_open(char *pszFile, i DWORD dwCreateDisposition = OPEN_EXISTING; dwAccess = GENERIC_READ | GENERIC_WRITE; - dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; + /* FILE_SHARE_DELETE is not supported by Windows Me/98/95 */ + dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE; if (GetFileAttributesA(pszFile) != INVALID_FILE_ATTRIBUTES) dwCreateDisposition = OPEN_EXISTING;

1 0

Louis. Lenders : wine.inf: Add ddeml.dll to fake dlls.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: 70e3bf15cb91a7d6b818d09792af2de284475409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70e3bf15cb91a7d6b818d0979… Author: Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Oct 8 09:17:08 2006 +0100 wine.inf: Add ddeml.dll 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 925577b..11cfe3b 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2148,6 +2148,7 @@ HKLM,%CurrentVersion%\Telephony\Country 11,,d3d8.dll 11,,d3d9.dll 11,,dbghelp.dll +11,,ddeml.dll 11,,ddhelp.exe 11,,ddraw.dll 11,,dsound.dll

1 0

Vitaliy Margolen : dinput: Win64 printf format warning fixes.
by Alexandre Julliard 09 Oct '06

09 Oct '06

Module: wine Branch: master Commit: 7123f3e80e4e7a1cc1644115f8421cf927104a01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7123f3e80e4e7a1cc1644115f… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sat Oct 7 17:55:40 2006 -0600 dinput: Win64 printf format warning fixes. --- dlls/dinput/Makefile.in | 1 dlls/dinput/device.c | 84 +++++++++++++++++++------------------ dlls/dinput/dinput_main.c | 22 +++++----- dlls/dinput/effect_linuxinput.c | 50 +++++++++++----------- dlls/dinput/joystick_linux.c | 72 ++++++++++++++++---------------- dlls/dinput/joystick_linuxinput.c | 39 +++++++++-------- dlls/dinput/keyboard.c | 28 ++++++------ dlls/dinput/mouse.c | 36 ++++++++-------- 8 files changed, 166 insertions(+), 166 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7123f3e80e4e7a1cc1644…

1 0