October 2006 - Wine-commits

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

05 Oct '06

Module: wine Branch: master Commit: ffa4e572eebeb68ddea9e2329b6c198e968941ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffa4e572eebeb68ddea9e2329… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Oct 4 22:45:14 2006 +0100 user/tests: Cast-qual warnings fix. --- dlls/user/tests/dde.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user/tests/dde.c b/dlls/user/tests/dde.c index 6a1c2cf..2022e63 100644 --- a/dlls/user/tests/dde.c +++ b/dlls/user/tests/dde.c @@ -29,8 +29,8 @@ #include "winerror.h" static const WCHAR TEST_DDE_SERVICE[] = {'T','e','s','t','D','D','E','S','e','r','v','i','c','e',0}; -static const char exec_cmdA[] = "ANSI dde command"; -static const WCHAR exec_cmdW[] = {'u','n','i','c','o','d','e',' ','d','d','e',' ','c','o','m','m','a','n','d',0}; +static char exec_cmdA[] = "ANSI dde command"; +static WCHAR exec_cmdW[] = {'u','n','i','c','o','d','e',' ','d','d','e',' ','c','o','m','m','a','n','d',0}; static WNDPROC old_dde_client_wndproc; @@ -220,7 +220,7 @@ static void test_dde_transaction(void) HWND hwnd_client, hwnd_server; CONVINFO info; HDDEDATA hdata; - static const char test_cmd[] = "test dde command"; + static char test_cmd[] = "test dde command"; /* server: unicode, client: ansi */ if (!create_dde_windows(&hwnd_client, &hwnd_server)) return;

1 0

Michael Stefaniuc : msxml3: Win64 printf format warning fixes.
by Alexandre Julliard 05 Oct '06

05 Oct '06

Module: wine Branch: master Commit: 7ff24491d9214deb2389784ec5327e05823e3c98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ff24491d9214deb2389784ec… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 5 00:58:11 2006 +0200 msxml3: Win64 printf format warning fixes. --- dlls/msxml3/Makefile.in | 2 +- dlls/msxml3/domdoc.c | 4 ++-- dlls/msxml3/node.c | 2 +- dlls/msxml3/parseerror.c | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in index e7dc2ee..fed6633 100644 --- a/dlls/msxml3/Makefile.in +++ b/dlls/msxml3/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DCOM_NO_WINDOWS_H -DWINE_NO_LONG_AS_INT +EXTRADEFS = -DCOM_NO_WINDOWS_H TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index c617fb7..35ff59e 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -174,14 +174,14 @@ typedef struct _domdoc LONG xmldoc_add_ref(xmlDocPtr doc) { LONG ref = InterlockedIncrement((LONG*)&doc->_private); - TRACE("%ld\n", ref); + TRACE("%d\n", ref); return ref; } LONG xmldoc_release(xmlDocPtr doc) { LONG ref = InterlockedDecrement((LONG*)&doc->_private); - TRACE("%ld\n", ref); + TRACE("%d\n", ref); if(ref == 0) { TRACE("freeing docptr %p\n", doc); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 1109a98..094af5b 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -743,7 +743,7 @@ static HRESULT WINAPI xmlnode_get_baseNa break; } - TRACE("returning %08lx str = %s\n", r, debugstr_w( str ) ); + TRACE("returning %08x str = %s\n", r, debugstr_w( str ) ); *nameString = str; return r; diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c index 6f29498..0680103 100644 --- a/dlls/msxml3/parseerror.c +++ b/dlls/msxml3/parseerror.c @@ -78,7 +78,7 @@ static ULONG WINAPI parseError_AddRef( { parse_error_t *This = impl_from_IXMLDOMParseError( iface ); ULONG ref = InterlockedIncrement( &This->ref ); - TRACE("(%p) ref now %ld\n", This, ref); + TRACE("(%p) ref now %d\n", This, ref); return ref; } @@ -89,7 +89,7 @@ static ULONG WINAPI parseError_Release( ULONG ref; ref = InterlockedDecrement( &This->ref ); - TRACE("(%p) ref now %ld\n", This, ref); + TRACE("(%p) ref now %d\n", This, ref); if ( ref == 0 ) { SysFreeString(This->url); @@ -148,7 +148,7 @@ static HRESULT WINAPI parseError_Invoke( static HRESULT WINAPI parseError_get_errorCode( IXMLDOMParseError *iface, - LONG *code ) + long *code ) { parse_error_t *This = impl_from_IXMLDOMParseError( iface ); TRACE("(%p)->(%p)\n", This, code); @@ -195,7 +195,7 @@ static HRESULT WINAPI parseError_get_src static HRESULT WINAPI parseError_get_line( IXMLDOMParseError *iface, - LONG *line ) + long *line ) { FIXME("\n"); return E_NOTIMPL; @@ -203,7 +203,7 @@ static HRESULT WINAPI parseError_get_lin static HRESULT WINAPI parseError_get_linepos( IXMLDOMParseError *iface, - LONG *linepos ) + long *linepos ) { FIXME("\n"); return E_NOTIMPL; @@ -211,7 +211,7 @@ static HRESULT WINAPI parseError_get_lin static HRESULT WINAPI parseError_get_filepos( IXMLDOMParseError *iface, - LONG *filepos ) + long *filepos ) { FIXME("\n"); return E_NOTIMPL;

1 0

Michael Stefaniuc : midimap: Win64 printf format warning fixes.
by Alexandre Julliard 05 Oct '06

05 Oct '06

Module: wine Branch: master Commit: 36063b7dc1c72ffa496f903342398edba756a50c URL: http://source.winehq.org/git/wine.git/?a=commit;h=36063b7dc1c72ffa496f90334… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 5 00:59:49 2006 +0200 midimap: Win64 printf format warning fixes. --- dlls/midimap/Makefile.in | 1 - dlls/midimap/midimap.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/midimap/Makefile.in b/dlls/midimap/Makefile.in index 6688e84..5c66484 100644 --- a/dlls/midimap/Makefile.in +++ b/dlls/midimap/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = midimap.dll IMPORTS = winmm user32 advapi32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ midimap.c diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index a51dd76..299bb19 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -262,7 +262,7 @@ static DWORD modOpen(LPDWORD lpdwUser, L { MIDIMAPDATA* mom = HeapAlloc(GetProcessHeap(), 0, sizeof(MIDIMAPDATA)); - TRACE("(%p %p %08lx)\n", lpdwUser, lpDesc, dwFlags); + TRACE("(%p %p %08x)\n", lpdwUser, lpDesc, dwFlags); if (!mom) return MMSYSERR_NOMEM; @@ -385,7 +385,7 @@ static DWORD modData(MIDIMAPDATA* mom, D } break; default: - FIXME("ooch %lu\n", dwParam); + FIXME("ooch %u\n", dwParam); } return ret; @@ -452,7 +452,7 @@ static DWORD modReset(MIDIMAPDATA* mom) DWORD WINAPI MIDIMAP_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2) { - TRACE("(%u, %04X, %08lX, %08lX, %08lX);\n", + TRACE("(%u, %04X, %08X, %08X, %08X);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg)

1 0

Michael Stefaniuc : imaadp32.acm: Win64 printf format warning fixes.
by Alexandre Julliard 05 Oct '06

05 Oct '06

Module: wine Branch: master Commit: 2fe86613e0b0c53506b499746e883f45cb1af228 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fe86613e0b0c53506b499746… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 5 00:59:14 2006 +0200 imaadp32.acm: Win64 printf format warning fixes. --- dlls/imaadp32.acm/Makefile.in | 1 - dlls/imaadp32.acm/imaadp32.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/imaadp32.acm/Makefile.in b/dlls/imaadp32.acm/Makefile.in index 0f582dd..29c06f5 100644 --- a/dlls/imaadp32.acm/Makefile.in +++ b/dlls/imaadp32.acm/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = imaadp32.acm IMPORTS = winmm user32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = imaadp32.c diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index 2e5eab1..180c664 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -523,7 +523,7 @@ static LRESULT ADPCM_FormatTagDetails(PA } break; default: - WARN("Unsupported query %08lx\n", dwQuery); + WARN("Unsupported query %08x\n", dwQuery); return MMSYSERR_NOTSUPPORTED; } @@ -589,12 +589,12 @@ static LRESULT ADPCM_FormatDetails(PACMF ((IMAADPCMWAVEFORMAT*)afd->pwfx)->wSamplesPerBlock = (1024 - 4 * afd->pwfx->nChannels) * (2 / afd->pwfx->nChannels) + 1; break; default: - WARN("Unsupported tag %08lx\n", afd->dwFormatTag); + WARN("Unsupported tag %08x\n", afd->dwFormatTag); return MMSYSERR_INVALPARAM; } break; default: - WARN("Unsupported query %08lx\n", dwQuery); + WARN("Unsupported query %08x\n", dwQuery); return MMSYSERR_NOTSUPPORTED; } afd->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC; @@ -827,7 +827,7 @@ static LRESULT ADPCM_StreamSize(PACMDRVS } break; default: - WARN("Unsupported query %08lx\n", adss->fdwSize); + WARN("Unsupported query %08x\n", adss->fdwSize); return MMSYSERR_NOTSUPPORTED; } return MMSYSERR_NOERROR; @@ -848,7 +848,7 @@ static LRESULT ADPCM_StreamConvert(PACMD ACM_STREAMCONVERTF_END| ACM_STREAMCONVERTF_START)) { - FIXME("Unsupported fdwConvert (%08lx), ignoring it\n", adsh->fdwConvert); + FIXME("Unsupported fdwConvert (%08x), ignoring it\n", adsh->fdwConvert); } /* ACM_STREAMCONVERTF_BLOCKALIGN * currently all conversions are block aligned, so do nothing for this flag

1 0

Michael Stefaniuc : msg711.acm: Win64 printf format warning fixes.
by Alexandre Julliard 05 Oct '06

05 Oct '06

Module: wine Branch: master Commit: 85db0937d0ddf115e175927c116bfe7200c7abea URL: http://source.winehq.org/git/wine.git/?a=commit;h=85db0937d0ddf115e175927c1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 5 00:59:28 2006 +0200 msg711.acm: Win64 printf format warning fixes. --- dlls/msg711.acm/Makefile.in | 1 - dlls/msg711.acm/msg711.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/msg711.acm/Makefile.in b/dlls/msg711.acm/Makefile.in index e5cacad..0579d37 100644 --- a/dlls/msg711.acm/Makefile.in +++ b/dlls/msg711.acm/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msg711.acm IMPORTS = winmm user32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = msg711.c diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c index 1c24781..90080f9 100644 --- a/dlls/msg711.acm/msg711.c +++ b/dlls/msg711.acm/msg711.c @@ -708,7 +708,7 @@ static LRESULT G711_FormatTagDetails(PAC } break; default: - WARN("Unsupported query %08lx\n", dwQuery); + WARN("Unsupported query %08x\n", dwQuery); return MMSYSERR_NOTSUPPORTED; } @@ -779,12 +779,12 @@ static LRESULT G711_FormatDetails(PACMFO afd->pwfx->cbSize = 0; break; default: - WARN("Unsupported tag %08lx\n", afd->dwFormatTag); + WARN("Unsupported tag %08x\n", afd->dwFormatTag); return MMSYSERR_INVALPARAM; } break; default: - WARN("Unsupported query %08lx\n", dwQuery); + WARN("Unsupported query %08x\n", dwQuery); return MMSYSERR_NOTSUPPORTED; } afd->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC; @@ -1053,7 +1053,7 @@ static LRESULT G711_StreamSize(PACMDRVST } break; default: - WARN("Unsupported query %08lx\n", adss->fdwSize); + WARN("Unsupported query %08x\n", adss->fdwSize); return MMSYSERR_NOTSUPPORTED; } FIXME("\n"); @@ -1075,7 +1075,7 @@ static LRESULT G711_StreamConvert(PACMDR ACM_STREAMCONVERTF_END| ACM_STREAMCONVERTF_START)) { - FIXME("Unsupported fdwConvert (%08lx), ignoring it\n", adsh->fdwConvert); + FIXME("Unsupported fdwConvert (%08x), ignoring it\n", adsh->fdwConvert); } /* ACM_STREAMCONVERTF_BLOCKALIGN * currently all conversions are block aligned, so do nothing for this flag

1 0

Michael Stefaniuc : cfgmgr32: Win64 printf format warning fixes.
by Alexandre Julliard 05 Oct '06

05 Oct '06

Module: wine Branch: master Commit: 702aafe3c0e5d8313c4e031c99b78bd8bb26219c URL: http://source.winehq.org/git/wine.git/?a=commit;h=702aafe3c0e5d8313c4e031c9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 5 00:59:38 2006 +0200 cfgmgr32: Win64 printf format warning fixes. --- dlls/cfgmgr32/Makefile.in | 1 - dlls/cfgmgr32/main.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/cfgmgr32/Makefile.in b/dlls/cfgmgr32/Makefile.in index 352ff16..33360db 100644 --- a/dlls/cfgmgr32/Makefile.in +++ b/dlls/cfgmgr32/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = cfgmgr32.dll IMPORTLIB = libcfgmgr32.$(IMPLIBEXT) IMPORTS = setupapi kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ main.c diff --git a/dlls/cfgmgr32/main.c b/dlls/cfgmgr32/main.c index f8e6d9e..8f44961 100644 --- a/dlls/cfgmgr32/main.c +++ b/dlls/cfgmgr32/main.c @@ -51,7 +51,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWO CONFIGRET WINAPI CM_Get_Device_ID_ListA( PCSTR pszFilter, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags ) { - FIXME("%p %p %ld %ld\n", pszFilter, Buffer, BufferLen, ulFlags ); + FIXME("%p %p %d %d\n", pszFilter, Buffer, BufferLen, ulFlags ); memset(Buffer,0,2); return CR_SUCCESS; } @@ -62,7 +62,7 @@ CONFIGRET WINAPI CM_Get_Device_ID_ListA( CONFIGRET WINAPI CM_Get_Device_ID_Size( ULONG* pulLen, LPVOID dnDevInst, ULONG ulFlags) { - FIXME("%p %p %lu\n",pulLen, dnDevInst, ulFlags); + FIXME("%p %p %u\n",pulLen, dnDevInst, ulFlags); *pulLen = 1; return CR_SUCCESS; } @@ -73,7 +73,7 @@ CONFIGRET WINAPI CM_Get_Device_ID_Size( CONFIGRET WINAPI CM_Get_Device_IDA( LPVOID dnDevInst, LPSTR Buffer, ULONG BufferLen, ULONG ulFlags) { - FIXME("%p, %p, %lu %lu\n",dnDevInst, Buffer, BufferLen, ulFlags); + FIXME("%p, %p, %u %u\n",dnDevInst, Buffer, BufferLen, ulFlags); Buffer[0] = 0; return CR_SUCCESS; }

1 0

Michael Stefaniuc : opengl32: Win64 printf format warning fixes.
by Alexandre Julliard 05 Oct '06

05 Oct '06

Module: wine Branch: master Commit: d421935df782613a07cd58b87c568f3c1ad9ffee URL: http://source.winehq.org/git/wine.git/?a=commit;h=d421935df782613a07cd58b87… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 5 00:58:22 2006 +0200 opengl32: Win64 printf format warning fixes. --- dlls/opengl32/Makefile.in | 1 - dlls/opengl32/wgl.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/Makefile.in b/dlls/opengl32/Makefile.in index 76ec40b..7c06f5e 100644 --- a/dlls/opengl32/Makefile.in +++ b/dlls/opengl32/Makefile.in @@ -7,7 +7,6 @@ IMPORTLIB = libopengl32.$(IMPLIBEXT) IMPORTS = user32 gdi32 advapi32 kernel32 ntdll EXTRAINCL = @X_CFLAGS@ EXTRALIBS = @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@ -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ opengl_ext.c \ diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 516e096..1c3973c 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -374,7 +374,7 @@ BOOL WINAPI wglUseFontOutlines_common(HD UINT em_size = 1024; RECT rc; - TRACE("(%p, %ld, %ld, %ld, %f, %f, %d, %p, %s)\n", hdc, first, count, + TRACE("(%p, %d, %d, %d, %f, %f, %d, %p, %s)\n", hdc, first, count, listBase, deviation, extrusion, format, lpgmf, unicode ? "W" : "A");

1 0

Michael Stefaniuc : usp10: Win64 printf format warning fixes.
by Alexandre Julliard 05 Oct '06

05 Oct '06

Module: wine Branch: master Commit: f3cfb89b89e601de9d39f9072d850f587dfd9310 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3cfb89b89e601de9d39f9072… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 5 00:58:37 2006 +0200 usp10: Win64 printf format warning fixes. --- dlls/usp10/Makefile.in | 1 - dlls/usp10/usp10.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/Makefile.in b/dlls/usp10/Makefile.in index 9394beb..9d716d5 100644 --- a/dlls/usp10/Makefile.in +++ b/dlls/usp10/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = usp10.dll IMPORTLIB = libusp10.$(IMPLIBEXT) IMPORTS = gdi32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ usp10.c diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 7fca547..3a226e3 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -187,7 +187,7 @@ HRESULT WINAPI ScriptRecordDigitSubstitu { DWORD plgid, sub; - TRACE("0x%lx, %p\n", locale, sds); + TRACE("0x%x, %p\n", locale, sds); /* This implementation appears to be correct for all languages, but it's * not clear if sds->DigitSubstitute is ever set to anything except @@ -447,7 +447,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC h const BYTE *pbInClass, SCRIPT_STRING_ANALYSIS *pssa) { - FIXME("(%p,%p,%d,%d,%d,0x%lx,%d,%p,%p,%p,%p,%p,%p): stub\n", + FIXME("(%p,%p,%d,%d,%d,0x%x,%d,%p,%p,%p,%p,%p,%p): stub\n", hdc, pString, cString, cGlyphs, iCharset, dwFlags, iReqWidth, psControl, psState, piDx, pTabdef, pbInClass, pssa); if (1 > cString || NULL == pString) { @@ -784,7 +784,7 @@ HRESULT WINAPI ScriptIsComplex(const WCH { unsigned int i, j; - TRACE("(%s,%d,0x%lx)\n", debugstr_wn(chars, len), len, flag); + TRACE("(%s,%d,0x%x)\n", debugstr_wn(chars, len), len, flag); for (i = 0; i < len; i++) { @@ -958,7 +958,7 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SC int cnt; DWORD hr; Scriptcache *pScriptcache; - FIXME("(%p,%p,%s,%d,0x%lx,%p): semi-stub\n", hdc, psc, debugstr_wn(pwcInChars,cChars), + FIXME("(%p,%p,%s,%d,0x%x,%p): semi-stub\n", hdc, psc, debugstr_wn(pwcInChars,cChars), cChars, dwFlags, pwOutGlyphs); if (!psc) @@ -1031,7 +1031,7 @@ HRESULT WINAPI ScriptTextOut(const HDC h if (hr) return S_OK; else { - FIXME("ExtTextOut returned:=%ld\n", hr); + FIXME("ExtTextOut returned:=%d\n", hr); return hr; } }

1 0

Michael Stefaniuc : msadp32.acm: Win64 printf format warning fixes.
by Alexandre Julliard 05 Oct '06

05 Oct '06

Module: wine Branch: master Commit: c6e27f8f81e91a14942c3cb36619528db75b48ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6e27f8f81e91a14942c3cb36… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 5 00:58:53 2006 +0200 msadp32.acm: Win64 printf format warning fixes. --- dlls/msadp32.acm/Makefile.in | 1 - dlls/msadp32.acm/msadp32.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/msadp32.acm/Makefile.in b/dlls/msadp32.acm/Makefile.in index 1d2bbb1..d1f4f23 100644 --- a/dlls/msadp32.acm/Makefile.in +++ b/dlls/msadp32.acm/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msadp32.acm IMPORTS = winmm user32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = msadp32.c diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index ed85d77..6840364 100644 --- a/dlls/msadp32.acm/msadp32.c +++ b/dlls/msadp32.acm/msadp32.c @@ -369,7 +369,7 @@ static LRESULT ADPCM_FormatTagDetails(PA } break; default: - WARN("Unsupported query %08lx\n", dwQuery); + WARN("Unsupported query %08x\n", dwQuery); return MMSYSERR_NOTSUPPORTED; } @@ -430,12 +430,12 @@ static LRESULT ADPCM_FormatDetails(PACMF init_wfx_adpcm((ADPCMWAVEFORMAT*)afd->pwfx); break; default: - WARN("Unsupported tag %08lx\n", afd->dwFormatTag); + WARN("Unsupported tag %08x\n", afd->dwFormatTag); return MMSYSERR_INVALPARAM; } break; default: - WARN("Unsupported query %08lx\n", dwQuery); + WARN("Unsupported query %08x\n", dwQuery); return MMSYSERR_NOTSUPPORTED; } afd->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC; @@ -670,7 +670,7 @@ static LRESULT ADPCM_StreamSize(PACMDRVS } break; default: - WARN("Unsupported query %08lx\n", adss->fdwSize); + WARN("Unsupported query %08x\n", adss->fdwSize); return MMSYSERR_NOTSUPPORTED; } return MMSYSERR_NOERROR; @@ -691,7 +691,7 @@ static LRESULT ADPCM_StreamConvert(PACMD ACM_STREAMCONVERTF_END| ACM_STREAMCONVERTF_START)) { - FIXME("Unsupported fdwConvert (%08lx), ignoring it\n", adsh->fdwConvert); + FIXME("Unsupported fdwConvert (%08x), ignoring it\n", adsh->fdwConvert); } /* ACM_STREAMCONVERTF_BLOCKALIGN * currently all conversions are block aligned, so do nothing for this flag

1 0

Mike McCormack : msi: Only ignore the StringPool and StringData in a transform.
by Alexandre Julliard 05 Oct '06

05 Oct '06

Module: wine Branch: master Commit: 59edd7d8a8e6ef4ea166cf611068015a3121772a URL: http://source.winehq.org/git/wine.git/?a=commit;h=59edd7d8a8e6ef4ea166cf611… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Oct 5 17:00:46 2006 +0900 msi: Only ignore the StringPool and StringData in a transform. --- dlls/msi/table.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index ef54c76..0a228dc 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1966,11 +1966,17 @@ UINT msi_table_apply_transform( MSIDATAB r = IEnumSTATSTG_Next( stgenum, 1, &stat, &count ); if( FAILED( r ) || !count ) break; + decode_streamname( stat.pwcsName, name ); - if( ( name[0] == 0x4840 ) && ( name[1] != '_' ) ) - ret = msi_table_load_transform( db, stg, strings, name+1 ); - else - TRACE("transform contains stream %s\n", debugstr_w(name)); + TRACE("transform contains stream %s\n", debugstr_w(name)); + + if ( name[0] != 0x4840 ) + continue; + + if ( !lstrcmpW(name+1, szStringPool ) || !lstrcmpW(name+1, szStringData) ) + continue; + + ret = msi_table_load_transform( db, stg, strings, name+1 ); } if ( ret == ERROR_SUCCESS )

1 0