December 2007 - Wine-Commits

Alexandre Julliard : Make.rules: Process man pages in the C locale.
by Alexandre Julliard Dec. 12, 2007

Dec. 12, 2007

Module: wine Branch: master Commit: 1716f03fae25e393a735149b8df75ae848365fb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1716f03fae25e393a735149b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 12 14:39:54 2007 +0100 Make.rules: Process man pages in the C locale. --- Make.rules.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 24d34db..9178904 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -182,7 +182,7 @@ LINTS = $(C_SRCS:.c=.ln) $(FONTFORGE) -script $(TOPSRCDIR)/fonts/genttf.ff $< $@ .man.in.man: - sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' $< >$@ || ($(RM) $@ && false) + LC_ALL=C sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' $< >$@ || ($(RM) $@ && false) # 'all' target first in case the enclosing Makefile didn't define any target

1 0

Marcel Partap : include/winspool.h: Add FORM_INFO_2.
by Alexandre Julliard Dec. 12, 2007

Dec. 12, 2007

Module: wine Branch: master Commit: 3252ddc0bd7cff4208f3abc6092cdbb264c1b679 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3252ddc0bd7cff4208f3abc60… Author: Marcel Partap <mpartap(a)gmx.net> Date: Sun Dec 9 19:50:08 2007 +0100 include/winspool.h: Add FORM_INFO_2. --- include/winspool.h | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/include/winspool.h b/include/winspool.h index 9501d2d..f939a22 100644 --- a/include/winspool.h +++ b/include/winspool.h @@ -861,6 +861,36 @@ DECL_WINELIB_TYPE_AW(FORM_INFO_1) DECL_WINELIB_TYPE_AW(PFORM_INFO_1) DECL_WINELIB_TYPE_AW(LPFORM_INFO_1) +typedef struct _FORM_INFO_2A { + DWORD Flags; + LPSTR pName; + SIZEL Size; + RECTL ImageableArea; + LPCSTR pKeyword; + DWORD StringType; + LPSTR pMuiDll; + DWORD dwResourceId; + LPSTR pDisplayName; + LANGID wLangId; +} FORM_INFO_2A, *PFORM_INFO_2A, *LPFORM_INFO_2A; + +typedef struct _FORM_INFO_2W { + DWORD Flags; + LPWSTR pName; + SIZEL Size; + RECTL ImageableArea; + LPCSTR pKeyword; + DWORD StringType; + LPWSTR pMuiDll; + DWORD dwResourceId; + LPWSTR pDisplayName; + LANGID wLangId; +} FORM_INFO_2W, *PFORM_INFO_2W, *LPFORM_INFO_2W; + +DECL_WINELIB_TYPE_AW(FORM_INFO_2) +DECL_WINELIB_TYPE_AW(PFORM_INFO_2) +DECL_WINELIB_TYPE_AW(LPFORM_INFO_2) + typedef struct _PRINTPROCESSOR_INFO_1A { LPSTR pName; } PRINTPROCESSOR_INFO_1A, *PPRINTPROCESSOR_INFO_1A,

1 0

Alexandre Julliard : winecrt0: DriverEntry is a WINAPI function.
by Alexandre Julliard Dec. 12, 2007

Dec. 12, 2007

Module: wine Branch: master Commit: b6012061292e1dc2ebbf929736dd2244ae85fd3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6012061292e1dc2ebbf92973… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 12 14:39:08 2007 +0100 winecrt0: DriverEntry is a WINAPI function. --- dlls/winecrt0/drv_entry.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winecrt0/drv_entry.c b/dlls/winecrt0/drv_entry.c index 89e3fea..946a414 100644 --- a/dlls/winecrt0/drv_entry.c +++ b/dlls/winecrt0/drv_entry.c @@ -25,7 +25,7 @@ #include "crt0_private.h" struct _DRIVER_OBJECT; -extern NTSTATUS DriverEntry( struct _DRIVER_OBJECT *obj, UNICODE_STRING *path ); +extern NTSTATUS WINAPI DriverEntry( struct _DRIVER_OBJECT *obj, UNICODE_STRING *path ); NTSTATUS DECLSPEC_HIDDEN __wine_spec_drv_entry( struct _DRIVER_OBJECT *obj, UNICODE_STRING *path ) {

1 0

Hans Leidekker : usp10: Add some tests for ScriptShape/ Place and make them pass.
by Alexandre Julliard Dec. 12, 2007

Dec. 12, 2007

Module: wine Branch: master Commit: d5e76042c54e34f68e67a985cb79d88f8d73111c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5e76042c54e34f68e67a985c… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Dec 12 10:44:42 2007 +0100 usp10: Add some tests for ScriptShape/Place and make them pass. --- dlls/usp10/tests/usp10.c | 45 ++++++++++++++++++++++++++++ dlls/usp10/usp10.c | 72 ++++++++++++++++++++++++--------------------- 2 files changed, 83 insertions(+), 34 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 158f201..9bdcc33 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -34,6 +34,50 @@ #include <winnls.h> #include <usp10.h> +static void test_ScriptShape(HDC hdc) +{ + static const WCHAR test1[] = {'t', 'e', 's', 't',0}; + BOOL ret; + HRESULT hr; + SCRIPT_CACHE sc = NULL; + WORD glyphs[4]; + SCRIPT_VISATTR attrs[4]; + SCRIPT_ITEM items[2]; + int nb, widths[4]; + + hr = ScriptItemize(NULL, 4, 2, NULL, NULL, items, NULL); + ok(hr == E_INVALIDARG, "ScriptItemize should return E_INVALIDARG not %08x\n", hr); + + hr = ScriptItemize(test1, 4, 2, NULL, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "ScriptItemize should return E_INVALIDARG not %08x\n", hr); + + hr = ScriptItemize(test1, 4, 2, NULL, NULL, items, NULL); + ok(!hr, "ScriptItemize should return S_OK not %08x\n", hr); + ok(items[0].a.fNoGlyphIndex == FALSE, "fNoGlyphIndex TRUE\n"); + + hr = ScriptShape(hdc, &sc, test1, 4, 4, &items[0].a, glyphs, NULL, NULL, &nb); + ok(hr == E_INVALIDARG, "ScriptShape should return E_INVALIDARG not %08x\n", hr); + + hr = ScriptShape(hdc, &sc, test1, 4, 4, &items[0].a, glyphs, NULL, attrs, NULL); + ok(hr == E_INVALIDARG, "ScriptShape should return E_INVALIDARG not %08x\n", hr); + + hr = ScriptShape(hdc, &sc, test1, 4, 4, &items[0].a, glyphs, NULL, attrs, &nb); + ok(!hr, "ScriptShape should return S_OK not %08x\n", hr); + ok(items[0].a.fNoGlyphIndex == FALSE, "fNoGlyphIndex TRUE\n"); + + hr = ScriptPlace(hdc, &sc, glyphs, 4, NULL, &items[0].a, widths, NULL, NULL); + ok(hr == E_INVALIDARG, "ScriptPlace should return E_INVALIDARG not %08x\n", hr); + + hr = ScriptPlace(hdc, &sc, glyphs, 4, attrs, &items[0].a, widths, NULL, NULL); + ok(!hr, "ScriptPlace should return S_OK not %08x\n", hr); + ok(items[0].a.fNoGlyphIndex == FALSE, "fNoGlyphIndex TRUE\n"); + + ret = ExtTextOutW(hdc, 1, 1, 0, NULL, glyphs, 4, widths); + ok(ret, "ExtTextOutW should return TRUE\n"); + + ScriptFreeCache(&sc); +} + static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256]) { HRESULT hr; @@ -1234,6 +1278,7 @@ START_TEST(usp10) test_ScriptGetCMap(hdc, pwOutGlyphs); test_ScriptCacheGetHeight(hdc); test_ScriptGetGlyphABCWidth(hdc); + test_ScriptShape(hdc); test_ScriptGetFontProperties(hdc); test_ScriptTextOut(hdc); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 2c3b9cc..ecb9cdc 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -575,7 +575,7 @@ HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItem TRACE("index=%d cnt=%d iCharPos=%d\n", index+1, cnt, pItems[index+1].iCharPos = cnt); /* Set one SCRIPT_STATE item being returned */ - *pcItems = index + 1; + if (pcItems) *pcItems = index + 1; /* Set SCRIPT_ITEM */ pItems[index+1].iCharPos = cnt; /* the last + 1 item @@ -1229,7 +1229,7 @@ HRESULT WINAPI ScriptIsComplex(const WCHAR *chars, int len, DWORD flag) * pwcChars [I] Array of characters specifying the run. * cChars [I] Number of characters in pwcChars. * cMaxGlyphs [I] Length of pwOutGlyphs. - * psa [I/O] String analysis. + * psa [I/O] Script analysis. * pwOutGlyphs [O] Array of glyphs. * pwLogClust [O] Array of logical cluster info. * psva [O] Array of visual attributes. @@ -1247,15 +1247,17 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, int cnt; HRESULT hr; HFONT hfont; - *pcGlyphs = cChars; TRACE("(%p, %p, %p, %d, %d, %p)\n", hdc, psc, pwcChars, cChars, cMaxGlyphs, psa); if (psa) TRACE("psa values: %d, %d, %d, %d, %d, %d, %d\n", psa->eScript, psa->fRTL, psa->fLayoutRTL, psa->fLinkBefore, psa->fLinkAfter, psa->fLogicalOrder, psa->fNoGlyphIndex); + if (!psva || !pcGlyphs) return E_INVALIDARG; if (cChars > cMaxGlyphs) return E_OUTOFMEMORY; if ((hr = get_script_cache(hdc, psc))) return hr; + *pcGlyphs = cChars; + hfont = select_cached_font(psc); if (!psa->fNoGlyphIndex) { /* Glyph translate */ @@ -1267,15 +1269,19 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, pwOutGlyphs[cnt] = pwcChars[cnt]; /* copy in to out and */ } } + if (psva) + { + /* set up a valid SCRIPT_VISATTR and LogClust for each char in this run */ + for (cnt = 0; cnt < cChars; cnt++) + { + /* FIXME: set to better values */ + psva[cnt].uJustification = 2; + psva[cnt].fClusterStart = 1; + psva[cnt].fDiacritic = 0; + psva[cnt].fZeroWidth = 0; - /* Set up a valid SCRIPT_VISATTR and LogClust for each char in this run */ - for (cnt = 0; cnt < cChars; cnt++) { - /* FIXME: set to better values */ - psva[cnt].uJustification = 2; - psva[cnt].fClusterStart = 1; - psva[cnt].fDiacritic = 0; - psva[cnt].fZeroWidth = 0; - pwLogClust[cnt] = cnt; + if (pwLogClust) pwLogClust[cnt] = cnt; + } } unselect_cached_font(psc, hfont); return S_OK; @@ -1313,6 +1319,7 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, TRACE("(%p, %p, %p, %s, %d, %p, %p, %p)\n", hdc, psc, pwGlyphs, debugstr_wn(pwGlyphs, cGlyphs), cGlyphs, psva, psa, piAdvance); + if (!psva) return E_INVALIDARG; if ((hr = get_script_cache(hdc, psc))) return hr; hfont = select_cached_font(psc); @@ -1329,33 +1336,30 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, if (!GetCharABCWidthsI(get_cache_hdc(psc), 0, cGlyphs, (WORD *)pwGlyphs, lpABC)) { WARN("Could not get ABC values\n"); - for (wcnt = 0; wcnt < cGlyphs; wcnt++) { - piAdvance[wcnt] = 0; - pGoffset[wcnt].du = 0; - pGoffset[wcnt].dv = 0; + for (wcnt = 0; wcnt < cGlyphs; wcnt++) + { + if (pGoffset) pGoffset[wcnt].du = pGoffset[wcnt].dv = 0; + if (piAdvance) piAdvance[wcnt] = 0; } - } - else - { - for (wcnt = 0; wcnt < cGlyphs ; wcnt++) { /* add up the char lengths */ - TRACE(" Glyph=%04x, abcA=%d, abcB=%d, abcC=%d wcnt=%d\n", - pwGlyphs[wcnt], - lpABC[wcnt].abcA, - lpABC[wcnt].abcB, - lpABC[wcnt].abcC, wcnt); - if (pABC) - { + } + else + { + for (wcnt = 0; wcnt < cGlyphs; wcnt++) /* add up the char lengths */ + { + TRACE(" Glyph=%04x, abcA=%d, abcB=%d, abcC=%d wcnt=%d\n", + pwGlyphs[wcnt], lpABC[wcnt].abcA, lpABC[wcnt].abcB, lpABC[wcnt].abcC, wcnt); + + if (pABC) + { pABC->abcA += lpABC[wcnt].abcA; pABC->abcB += lpABC[wcnt].abcB; pABC->abcC += lpABC[wcnt].abcC; - } - piAdvance[wcnt] = lpABC[wcnt].abcA + lpABC[wcnt].abcB + lpABC[wcnt].abcC; - pGoffset[wcnt].du = 0; - pGoffset[wcnt].dv = 0; - } - } - if (pABC) - TRACE("Total for run: abcA=%d, abcB=%d, abcC=%d\n", pABC->abcA, pABC->abcB, pABC->abcC); + } + if (pGoffset) pGoffset[wcnt].du = pGoffset[wcnt].dv = 0; + if (piAdvance) piAdvance[wcnt] = lpABC[wcnt].abcA + lpABC[wcnt].abcB + lpABC[wcnt].abcC; + } + } + if (pABC) TRACE("Total for run: abcA=%d, abcB=%d, abcC=%d\n", pABC->abcA, pABC->abcB, pABC->abcC); heap_free(lpABC); unselect_cached_font(psc, hfont);

1 0

Marco Schuster : wine.man: Added small clarification for AppDB.
by Alexandre Julliard Dec. 12, 2007

Dec. 12, 2007

Module: wine Branch: master Commit: 0bd72d0a5889a3ba264b4da8182c9e6c1c385d10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bd72d0a5889a3ba264b4da81… Author: Marco Schuster <marco(a)harddisk.is-a-geek.org> Date: Tue Dec 11 17:17:45 2007 +0100 wine.man: Added small clarification for AppDB. --- loader/wine.man.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/loader/wine.man.in b/loader/wine.man.in index cc82b08..1a551f0 100644 --- a/loader/wine.man.in +++ b/loader/wine.man.in @@ -276,7 +276,8 @@ in the top-level directory of the source distribution. .PP A status report on many applications is available from .I http://appdb.winehq.org. -Please add entries to this list for applications you currently run. +Please add entries to this list for applications you currently run, if +there is no entry for this application. .PP Bug reports may be posted to Wine Bugzilla .I http://bugs.winehq.org

1 0

Marco Schuster : loader: Added de_DE.UTF-8 translated Wine man page.
by Alexandre Julliard Dec. 12, 2007

Dec. 12, 2007

Module: wine Branch: master Commit: fab0aee3880586259c039979df76cdceb7d42a74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fab0aee3880586259c039979d… Author: Marco Schuster <marco(a)harddisk.is-a-geek.org> Date: Tue Dec 11 17:18:14 2007 +0100 loader: Added de_DE.UTF-8 translated Wine man page. --- .gitignore | 1 + loader/Makefile.in | 9 +- loader/wine.de.man.in | 323 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 331 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fab0aee3880586259c039…

1 0

Alexander Nicolaysen Sørnes : wordpad: Move registry functions to a separate file.
by Alexandre Julliard Dec. 12, 2007

Dec. 12, 2007

Module: wine Branch: master Commit: 7f03c2f5bdb98feaaecc203470520018f3ea6cb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f03c2f5bdb98feaaecc20347… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Dec 12 09:36:41 2007 +0100 wordpad: Move registry functions to a separate file. --- programs/wordpad/Makefile.in | 1 + programs/wordpad/registry.c | 379 ++++++++++++++++++++++++++++++++++++++++++ programs/wordpad/wordpad.c | 372 +---------------------------------------- programs/wordpad/wordpad.h | 11 ++ 4 files changed, 399 insertions(+), 364 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f03c2f5bdb98feaaecc2…

1 0

Andrew Riedi : dsound: DPRINTF -> TRACE.
by Alexandre Julliard Dec. 12, 2007

Dec. 12, 2007

Module: wine Branch: master Commit: 68a6ddf623d3d45ee94cd4712f04c68a338cfe0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=68a6ddf623d3d45ee94cd4712… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Tue Dec 11 23:56:13 2007 -0800 dsound: DPRINTF -> TRACE. --- dlls/dsound/dsound.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 73fbd91..7b0779a 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1318,7 +1318,7 @@ HRESULT DirectSoundDevice_GetCaps( if (TRACE_ON(dsound)) { TRACE("(flags=0x%08x:\n",lpDSCaps->dwFlags); _dump_DSCAPS(lpDSCaps->dwFlags); - DPRINTF(")\n"); + TRACE(")\n"); } lpDSCaps->dwMinSecondarySampleRate = device->drvcaps.dwMinSecondarySampleRate; lpDSCaps->dwMaxSecondarySampleRate = device->drvcaps.dwMaxSecondarySampleRate; @@ -1538,7 +1538,7 @@ HRESULT DirectSoundDevice_CreateSoundBuffer( TRACE("(structsize=%d)\n",dsbd->dwSize); TRACE("(flags=0x%08x:\n",dsbd->dwFlags); _dump_DSBCAPS(dsbd->dwFlags); - DPRINTF(")\n"); + TRACE(")\n"); TRACE("(bufferbytes=%d)\n",dsbd->dwBufferBytes); TRACE("(lpwfxFormat=%p)\n",dsbd->lpwfxFormat); }

1 0

Andrew Riedi : ole32: DPRINTF -> TRACE.
by Alexandre Julliard Dec. 12, 2007

Dec. 12, 2007

Module: wine Branch: master Commit: 19888da21d8fc27ea25f0c075eea783a56437a40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19888da21d8fc27ea25f0c075… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Tue Dec 11 23:13:00 2007 -0800 ole32: DPRINTF -> TRACE. --- dlls/ole32/storage.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/storage.c b/dlls/ole32/storage.c index febdc12..7a711ae 100644 --- a/dlls/ole32/storage.c +++ b/dlls/ole32/storage.c @@ -716,24 +716,24 @@ STORAGE_dump_pps_entry(struct storage_pps_entry *stde) { WideCharToMultiByte( CP_ACP, 0, stde->pps_rawname, -1, name, sizeof(name), NULL, NULL); if (!stde->pps_sizeofname) return; - DPRINTF("name: %s\n",name); - DPRINTF("type: %d\n",stde->pps_type); - DPRINTF("prev pps: %d\n",stde->pps_prev); - DPRINTF("next pps: %d\n",stde->pps_next); - DPRINTF("dir pps: %d\n",stde->pps_dir); - DPRINTF("guid: %s\n",debugstr_guid(&(stde->pps_guid))); + TRACE("name: %s\n",name); + TRACE("type: %d\n",stde->pps_type); + TRACE("prev pps: %d\n",stde->pps_prev); + TRACE("next pps: %d\n",stde->pps_next); + TRACE("dir pps: %d\n",stde->pps_dir); + TRACE("guid: %s\n",debugstr_guid(&(stde->pps_guid))); if (stde->pps_type !=2) { time_t t; DWORD dw; RtlTimeToSecondsSince1970((LARGE_INTEGER *)&(stde->pps_ft1),&dw); t = dw; - DPRINTF("ts1: %s\n",ctime(&t)); + TRACE("ts1: %s\n",ctime(&t)); RtlTimeToSecondsSince1970((LARGE_INTEGER *)&(stde->pps_ft2),&dw); t = dw; - DPRINTF("ts2: %s\n",ctime(&t)); + TRACE("ts2: %s\n",ctime(&t)); } - DPRINTF("startblock: %d\n",stde->pps_sb); - DPRINTF("size: %d\n",stde->pps_size); + TRACE("startblock: %d\n",stde->pps_sb); + TRACE("size: %d\n",stde->pps_size); } /******************************************************************************

1 0

Andrew Riedi : dinput: DPRINTF -> TRACE.
by Alexandre Julliard Dec. 12, 2007

Dec. 12, 2007

Module: wine Branch: master Commit: e0740a7a60f60c8f292f3aa68fffe468680d4082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0740a7a60f60c8f292f3aa68… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Tue Dec 11 23:48:31 2007 -0800 dinput: DPRINTF -> TRACE. --- dlls/dinput/device.c | 40 +++++++++++++++++--------------------- dlls/dinput/dinput_main.c | 4 +- dlls/dinput/effect_linuxinput.c | 14 ++++++------ 3 files changed, 27 insertions(+), 31 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 5127aa9..d1e6ac8 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -61,8 +61,8 @@ void _dump_cooperativelevel_DI(DWORD dwFlags) { }; for (i = 0; i < (sizeof(flags) / sizeof(flags[0])); i++) if (flags[i].mask & dwFlags) - DPRINTF("%s ",flags[i].name); - DPRINTF("\n"); + TRACE("%s ",flags[i].name); + TRACE("\n"); } } @@ -92,51 +92,47 @@ void _dump_EnumObjects_flags(DWORD dwFlags) { }; type = (dwFlags & 0xFF0000FF); instance = ((dwFlags >> 8) & 0xFFFF); - DPRINTF("Type:"); + TRACE("Type:"); if (type == DIDFT_ALL) { - DPRINTF(" DIDFT_ALL"); + TRACE(" DIDFT_ALL"); } else { for (i = 0; i < (sizeof(flags) / sizeof(flags[0])); i++) { if (flags[i].mask & type) { type &= ~flags[i].mask; - DPRINTF(" %s",flags[i].name); + TRACE(" %s",flags[i].name); } } if (type) { - DPRINTF(" (unhandled: %08x)", type); + TRACE(" (unhandled: %08x)", type); } } - DPRINTF(" / Instance: "); + TRACE(" / Instance: "); if (instance == ((DIDFT_ANYINSTANCE >> 8) & 0xFFFF)) { - DPRINTF("DIDFT_ANYINSTANCE"); + TRACE("DIDFT_ANYINSTANCE"); } else { - DPRINTF("%3d", instance); + TRACE("%3d", instance); } } } void _dump_DIPROPHEADER(LPCDIPROPHEADER diph) { if (TRACE_ON(dinput)) { - DPRINTF(" - dwObj = 0x%08x\n", diph->dwObj); - DPRINTF(" - dwHow = %s\n", - ((diph->dwHow == DIPH_DEVICE) ? "DIPH_DEVICE" : - ((diph->dwHow == DIPH_BYOFFSET) ? "DIPH_BYOFFSET" : - ((diph->dwHow == DIPH_BYID)) ? "DIPH_BYID" : "unknown"))); + TRACE(" - dwObj = 0x%08x\n", diph->dwObj); + TRACE(" - dwHow = %s\n", + ((diph->dwHow == DIPH_DEVICE) ? "DIPH_DEVICE" : + ((diph->dwHow == DIPH_BYOFFSET) ? "DIPH_BYOFFSET" : + ((diph->dwHow == DIPH_BYID)) ? "DIPH_BYID" : "unknown"))); } } void _dump_OBJECTINSTANCEA(const DIDEVICEOBJECTINSTANCEA *ddoi) { - if (TRACE_ON(dinput)) { - DPRINTF(" - enumerating : %s ('%s') - %2d - 0x%08x - %s\n", - debugstr_guid(&ddoi->guidType), _dump_dinput_GUID(&ddoi->guidType), ddoi->dwOfs, ddoi->dwType, ddoi->tszName); - } + TRACE(" - enumerating : %s ('%s') - %2d - 0x%08x - %s\n", + debugstr_guid(&ddoi->guidType), _dump_dinput_GUID(&ddoi->guidType), ddoi->dwOfs, ddoi->dwType, ddoi->tszName); } void _dump_OBJECTINSTANCEW(const DIDEVICEOBJECTINSTANCEW *ddoi) { - if (TRACE_ON(dinput)) { - DPRINTF(" - enumerating : %s ('%s'), - %2d - 0x%08x - %s\n", - debugstr_guid(&ddoi->guidType), _dump_dinput_GUID(&ddoi->guidType), ddoi->dwOfs, ddoi->dwType, debugstr_w(ddoi->tszName)); - } + TRACE(" - enumerating : %s ('%s'), - %2d - 0x%08x - %s\n", + debugstr_guid(&ddoi->guidType), _dump_dinput_GUID(&ddoi->guidType), ddoi->dwOfs, ddoi->dwType, debugstr_w(ddoi->tszName)); } /* This function is a helper to convert a GUID into any possible DInput GUID out there */ diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 2e12bc1..c3d41fd 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -199,12 +199,12 @@ static void _dump_EnumDevices_dwFlags(DWORD dwFlags) { #undef FE }; if (dwFlags == 0) { - DPRINTF("DIEDFL_ALLDEVICES"); + TRACE("DIEDFL_ALLDEVICES"); return; } for (i = 0; i < (sizeof(flags) / sizeof(flags[0])); i++) if (flags[i].mask & dwFlags) - DPRINTF("%s ",flags[i].name); + TRACE("%s ",flags[i].name); } } diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 37af31f..6cc5ad2 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -113,8 +113,8 @@ static void _dump_DIEFFECT_flags(DWORD dwFlags) }; for (i = 0; i < (sizeof(flags) / sizeof(flags[0])); i++) if (flags[i].mask & dwFlags) - DPRINTF("%s ", flags[i].name); - DPRINTF("\n"); + TRACE("%s ", flags[i].name); + TRACE("\n"); } } @@ -160,11 +160,11 @@ static void _dump_DICUSTOMFORCE(LPCDICUSTOMFORCE frc) if (frc->cSamples % frc->cChannels != 0) WARN("Custom force has a non-integral samples-per-channel count!\n"); if (TRACE_ON(dinput)) { - DPRINTF("Custom force data (time aligned, axes in order):\n"); + TRACE("Custom force data (time aligned, axes in order):\n"); for (i = 1; i <= frc->cSamples; ++i) { - DPRINTF("%d ", frc->rglForceData[i]); + TRACE("%d ", frc->rglForceData[i]); if (i % frc->cChannels == 0) - DPRINTF("\n"); + TRACE("\n"); } } } @@ -194,8 +194,8 @@ static void _dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid) if (TRACE_ON(dinput)) { TRACE(" "); for (i = 0; i < eff->cAxes; ++i) - DPRINTF("%d ", eff->rgdwAxes[i]); - DPRINTF("\n"); + TRACE("%d ", eff->rgdwAxes[i]); + TRACE("\n"); } TRACE(" - rglDirection: %p\n", eff->rglDirection); TRACE(" - lpEnvelope: %p\n", eff->lpEnvelope);

1 0