December 2019 - Wine-Commits

Michael Stefaniuc : dmband: Move debugstr_fourcc() to dmobject.h.
by Alexandre Julliard Dec. 12, 2019

Dec. 12, 2019

Module: wine Branch: master Commit: bc3d4b5d76ab251ff22b7dd263c54c185a327985 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc3d4b5d76ab251ff22b7dd2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Dec 12 01:10:55 2019 +0100 dmband: Move debugstr_fourcc() to dmobject.h. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/dmobject.c | 7 ------- dlls/dmband/dmobject.h | 12 ++++++++++-- dlls/dmband/dmutils.c | 9 +-------- dlls/dmband/dmutils.h | 2 -- 4 files changed, 11 insertions(+), 19 deletions(-) diff --git a/dlls/dmband/dmobject.c b/dlls/dmband/dmobject.c index 25f3198d2b..3b71a2719c 100644 --- a/dlls/dmband/dmobject.c +++ b/dlls/dmband/dmobject.c @@ -34,13 +34,6 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); /* RIFF format parsing */ #define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) -static inline const char *debugstr_fourcc(DWORD fourcc) -{ - if (!fourcc) return "''"; - return wine_dbg_sprintf("'%c%c%c%c'", (char)(fourcc), (char)(fourcc >> 8), - (char)(fourcc >> 16), (char)(fourcc >> 24)); -} - const char *debugstr_chunk(const struct chunk_entry *chunk) { const char *type = ""; diff --git a/dlls/dmband/dmobject.h b/dlls/dmband/dmobject.h index 4a721cc152..9e287a4126 100644 --- a/dlls/dmband/dmobject.h +++ b/dlls/dmband/dmobject.h @@ -60,8 +60,6 @@ static inline HRESULT stream_reset_chunk_start(IStream *stream, const struct chu return IStream_Seek(stream, offset, STREAM_SEEK_SET, NULL); } -const char *debugstr_chunk(const struct chunk_entry *chunk) DECLSPEC_HIDDEN; - /* IDirectMusicObject base object */ struct dmobject { @@ -106,3 +104,13 @@ HRESULT WINAPI unimpl_IPersistStream_Save(IPersistStream *iface, IStream *stream BOOL clear_dirty) DECLSPEC_HIDDEN; HRESULT WINAPI unimpl_IPersistStream_GetSizeMax(IPersistStream *iface, ULARGE_INTEGER *size) DECLSPEC_HIDDEN; + +/* Debugging helpers */ +const char *debugstr_chunk(const struct chunk_entry *chunk) DECLSPEC_HIDDEN; + +static inline const char *debugstr_fourcc(DWORD fourcc) +{ + if (!fourcc) return "''"; + return wine_dbg_sprintf("'%c%c%c%c'", (char)(fourcc), (char)(fourcc >> 8), + (char)(fourcc >> 16), (char)(fourcc >> 24)); +} diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index af24054bf4..2401b20a60 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -40,6 +40,7 @@ #include "dmusics.h" #include "dmutils.h" +#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmusic); WINE_DECLARE_DEBUG_CHANNEL(dmfile); @@ -296,14 +297,6 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, return hr; } -/* FOURCC to string conversion for debug messages */ -const char *debugstr_fourcc (DWORD fourcc) { - if (!fourcc) return "'null'"; - return wine_dbg_sprintf ("\'%c%c%c%c\'", - (char)(fourcc), (char)(fourcc >> 8), - (char)(fourcc >> 16), (char)(fourcc >> 24)); -} - /* returns name of given GUID */ const char *debugstr_dmguid (const GUID *id) { static const guid_info guids[] = { diff --git a/dlls/dmband/dmutils.h b/dlls/dmband/dmutils.h index bb93e05c2b..5a845a81a8 100644 --- a/dlls/dmband/dmutils.h +++ b/dlls/dmband/dmutils.h @@ -52,8 +52,6 @@ typedef struct { #define FE(x) { x, #x } #define GE(x) { &x, #x } -/* FOURCC to string conversion for debug messages */ -extern const char *debugstr_fourcc (DWORD fourcc) DECLSPEC_HIDDEN; /* returns name of given GUID */ extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN;

1 0

Michael Stefaniuc : dmloader: Get rid of the 'dmdump' debug channel.
by Alexandre Julliard Dec. 12, 2019

Dec. 12, 2019

Module: wine Branch: master Commit: 92749c2694a69776b6d538f9e23caf06ac92ef07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92749c2694a69776b6d538f9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Dec 12 01:11:00 2019 +0100 dmloader: Get rid of the 'dmdump' debug channel. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/container.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index f7c7f3e951..075843ad32 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -22,7 +22,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmloader); WINE_DECLARE_DEBUG_CHANNEL(dmfile); -WINE_DECLARE_DEBUG_CHANNEL(dmdump); #define DMUS_MAX_CATEGORY_SIZE DMUS_MAX_CATEGORY*sizeof(WCHAR) #define DMUS_MAX_NAME_SIZE DMUS_MAX_NAME*sizeof(WCHAR) @@ -298,9 +297,8 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS TRACE_(dmfile)(": %s chunk (size = 0x%08X)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_CONTAINER_CHUNK: { - TRACE_(dmfile)(": container header chunk\n"); IStream_Read (pStm, &This->Header, Chunk.dwSize, NULL); - TRACE_(dmdump)(": container header chunk:\n%s\n", debugstr_DMUS_IO_CONTAINER_HEADER(&This->Header)); + TRACE_(dmfile)(": container header chunk:\n%s\n", debugstr_DMUS_IO_CONTAINER_HEADER(&This->Header)); break; } case DMUS_FOURCC_GUID_CHUNK: { @@ -403,14 +401,13 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS TRACE_(dmfile)(": alias chunk\n"); pNewEntry->wszAlias = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, Chunk.dwSize); IStream_Read (pStm, pNewEntry->wszAlias, Chunk.dwSize, NULL); - TRACE_(dmdump)(": alias: %s\n", debugstr_w(pNewEntry->wszAlias)); + TRACE_(dmfile)(": alias: %s\n", debugstr_w(pNewEntry->wszAlias)); break; } case DMUS_FOURCC_CONTAINED_OBJECT_CHUNK: { DMUS_IO_CONTAINED_OBJECT_HEADER tmpObjectHeader; - TRACE_(dmfile)(": contained object header chunk\n"); IStream_Read (pStm, &tmpObjectHeader, Chunk.dwSize, NULL); - TRACE_(dmdump)(": contained object header:\n%s\n", debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER(&tmpObjectHeader)); + TRACE_(dmfile)(": contained object header:\n%s\n", debugstr_DMUS_IO_CONTAINED_OBJECT_HEADER(&tmpObjectHeader)); /* copy guidClass */ pNewEntry->Desc.dwValidData |= DMUS_OBJ_CLASS; pNewEntry->Desc.guidClass = tmpObjectHeader.guidClassID;

1 0

Michael Stefaniuc : dmloader: Use the debug functions provided by dmobject.[ch].
by Alexandre Julliard Dec. 12, 2019

Dec. 12, 2019

Module: wine Branch: master Commit: dccedd4761b7081199a242c564ba9fb433fc4eba URL: https://source.winehq.org/git/wine.git/?a=commit;h=dccedd4761b7081199a242c5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Dec 12 01:11:01 2019 +0100 dmloader: Use the debug functions provided by dmobject.[ch]. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/container.c | 1 - dlls/dmloader/debug.c | 270 --------------------------------------- dlls/dmloader/debug.h | 16 --- dlls/dmloader/dmloader_private.h | 1 + dlls/dmloader/dmobject.c | 247 ++++++++++++++++++++++++++++++++++- dlls/dmloader/dmobject.h | 14 +- 6 files changed, 254 insertions(+), 295 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dccedd4761b7081199a2…

1 0

Alexandre Julliard : makefiles: Install only exe files in the bin directory.
by Alexandre Julliard Dec. 12, 2019

Dec. 12, 2019

Module: wine Branch: master Commit: ef2475b4f041eab84b4f9f9a61d86b6b09c53550 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef2475b4f041eab84b4f9f9a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 09:23:05 2019 +0100 makefiles: Install only exe files in the bin directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 825c83aed4..7451ee4433 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3364,7 +3364,7 @@ static void output_module( struct makefile *make ) if (spec_file) output_man_pages( make ); - else if (*dll_ext && !make->is_win16) + else if (*dll_ext && !make->is_win16 && strendswith( make->module, ".exe" )) { char *binary = replace_extension( make->module, ".exe", "" ); add_install_rule( make, binary, "wineapploader", strmake( "t$(bindir)/%s", binary ));

1 0

Erich E. Hoover : chcp: Set the global codepage when called with an argument.
by Alexandre Julliard Dec. 12, 2019

Dec. 12, 2019

Module: wine Branch: master Commit: 329a1c247a8eed2228b8e2911012426e52c4116f URL: https://source.winehq.org/git/wine.git/?a=commit;h=329a1c247a8eed2228b8e291… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Thu Nov 7 15:31:34 2019 -0700 chcp: Set the global codepage when called with an argument. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/chcp.com/main.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/programs/chcp.com/main.c b/programs/chcp.com/main.c index b943c227c9..6ace10cf93 100644 --- a/programs/chcp.com/main.c +++ b/programs/chcp.com/main.c @@ -19,6 +19,7 @@ #include "wine/debug.h" #include "wincon.h" +#include "stdlib.h" WINE_DEFAULT_DEBUG_CHANNEL(chcp); @@ -31,8 +32,19 @@ int __cdecl wmain(int argc, WCHAR *argv[]) printf("Active code page: %d\n", GetConsoleCP()); return 0; } + else if (argc == 2) + { + int codepage = _wtoi(argv[1]); + int success = SetConsoleCP(codepage) && SetConsoleOutputCP(codepage); + + if (!success) + { + printf("Invalid code page\n"); + } + return !success; + } - WINE_FIXME("stub:"); + WINE_FIXME("unexpected arguments:"); for (i = 0; i < argc; i++) WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); WINE_FIXME("\n");

1 0

Erich E. Hoover : chcp: Return the active code page when called without arguments.
by Alexandre Julliard Dec. 12, 2019

Dec. 12, 2019

Module: wine Branch: master Commit: 658d2e6133e7158330e52a43daff80e9355a429f URL: https://source.winehq.org/git/wine.git/?a=commit;h=658d2e6133e7158330e52a43… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Thu Nov 7 15:15:09 2019 -0700 chcp: Return the active code page when called without arguments. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/chcp.com/main.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/programs/chcp.com/main.c b/programs/chcp.com/main.c index 0a38b7a8f3..b943c227c9 100644 --- a/programs/chcp.com/main.c +++ b/programs/chcp.com/main.c @@ -18,12 +18,20 @@ #include "wine/debug.h" +#include "wincon.h" + WINE_DEFAULT_DEBUG_CHANNEL(chcp); int __cdecl wmain(int argc, WCHAR *argv[]) { int i; + if (argc == 1) + { + printf("Active code page: %d\n", GetConsoleCP()); + return 0; + } + WINE_FIXME("stub:"); for (i = 0; i < argc; i++) WINE_FIXME(" %s", wine_dbgstr_w(argv[i]));

1 0

Erich E. Hoover : chcp: Add a stub application for changing the codepage.
by Alexandre Julliard Dec. 12, 2019

Dec. 12, 2019

Module: wine Branch: master Commit: 3a01d356f9d21c0a4c409422a1d198511f62b985 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a01d356f9d21c0a4c409422… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Fri Oct 18 12:09:25 2019 -0600 chcp: Add a stub application for changing the codepage. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47960 Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + programs/chcp.com/Makefile.in | 6 ++++++ programs/chcp.com/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+) diff --git a/configure b/configure index 3af68ca71c..032ba6811c 100755 --- a/configure +++ b/configure @@ -1716,6 +1716,7 @@ enable_aspnet_regiis enable_attrib enable_cabarc enable_cacls +enable_chcp_com enable_clock enable_cmd enable_conhost @@ -21089,6 +21090,7 @@ wine_fn_config_makefile programs/aspnet_regiis enable_aspnet_regiis wine_fn_config_makefile programs/attrib enable_attrib wine_fn_config_makefile programs/cabarc enable_cabarc wine_fn_config_makefile programs/cacls enable_cacls +wine_fn_config_makefile programs/chcp.com enable_chcp_com wine_fn_config_makefile programs/clock enable_clock wine_fn_config_makefile programs/cmd enable_cmd wine_fn_config_makefile programs/cmd/tests enable_tests diff --git a/configure.ac b/configure.ac index a3bece9e8a..7fc85841ca 100644 --- a/configure.ac +++ b/configure.ac @@ -3891,6 +3891,7 @@ WINE_CONFIG_MAKEFILE(programs/aspnet_regiis) WINE_CONFIG_MAKEFILE(programs/attrib) WINE_CONFIG_MAKEFILE(programs/cabarc) WINE_CONFIG_MAKEFILE(programs/cacls) +WINE_CONFIG_MAKEFILE(programs/chcp.com) WINE_CONFIG_MAKEFILE(programs/clock) WINE_CONFIG_MAKEFILE(programs/cmd) WINE_CONFIG_MAKEFILE(programs/cmd/tests) diff --git a/programs/chcp.com/Makefile.in b/programs/chcp.com/Makefile.in new file mode 100644 index 0000000000..3f763bbcd7 --- /dev/null +++ b/programs/chcp.com/Makefile.in @@ -0,0 +1,6 @@ +MODULE = chcp.com + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + +C_SRCS = \ + main.c diff --git a/programs/chcp.com/main.c b/programs/chcp.com/main.c new file mode 100644 index 0000000000..0a38b7a8f3 --- /dev/null +++ b/programs/chcp.com/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2019 Erich E. Hoover + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(chcp); + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Michael Stefaniuc : dmcompos: Use the debug functions provided by dmobject.[ch].
by Alexandre Julliard Dec. 12, 2019

Dec. 12, 2019

Module: wine Branch: master Commit: feac0e4ad9d48db798e740f7ab67ec729faf0763 URL: https://source.winehq.org/git/wine.git/?a=commit;h=feac0e4ad9d48db798e740f7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Dec 12 01:11:03 2019 +0100 dmcompos: Use the debug functions provided by dmobject.[ch]. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmcompos/chordmap.c | 4 +- dlls/dmcompos/composer.c | 1 + dlls/dmcompos/dmcompos_main.c | 265 +-------------------------------------- dlls/dmcompos/dmcompos_private.h | 22 ---- dlls/dmcompos/dmobject.c | 247 +++++++++++++++++++++++++++++++++++- dlls/dmcompos/dmobject.h | 14 ++- 6 files changed, 258 insertions(+), 295 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=feac0e4ad9d48db798e7…

1 0

Michael Stefaniuc : dmime: Use the debug functions provided by dmobject.[ch].
by Alexandre Julliard Dec. 12, 2019

Dec. 12, 2019

Module: wine Branch: master Commit: adb1a3f54c884d3fc8cbffa87e00ef15a3db8f63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adb1a3f54c884d3fc8cbffa8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Dec 12 01:11:02 2019 +0100 dmime: Use the debug functions provided by dmobject.[ch]. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/dmime_main.c | 1 + dlls/dmime/dmobject.c | 247 ++++++++++++++++++++++++++++++++++++- dlls/dmime/dmobject.h | 14 ++- dlls/dmime/dmutils.c | 302 +--------------------------------------------- dlls/dmime/dmutils.h | 26 ---- dlls/dmime/performance.c | 1 + dlls/dmime/segmentstate.c | 1 + 7 files changed, 257 insertions(+), 335 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=adb1a3f54c884d3fc8cb…

1 0

Michael Stefaniuc : dmband: Simplify dump_DMUS_OBJECTDESC() and move it to dmobject.c.
by Alexandre Julliard Dec. 12, 2019

Dec. 12, 2019

Module: wine Branch: master Commit: c538d4ad3ec69e60c444944deec299f98b1b3b50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c538d4ad3ec69e60c444944d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Dec 12 01:10:58 2019 +0100 dmband: Simplify dump_DMUS_OBJECTDESC() and move it to dmobject.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/band.c | 2 +- dlls/dmband/dmobject.c | 53 ++++++++++++++++++++++++++ dlls/dmband/dmobject.h | 1 + dlls/dmband/dmutils.c | 100 +------------------------------------------------ dlls/dmband/dmutils.h | 14 ------- 5 files changed, 56 insertions(+), 114 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 53f407c1a4..901f5a69ee 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -158,7 +158,7 @@ static HRESULT WINAPI band_IDirectMusicObject_ParseDescriptor(IDirectMusicObject } TRACE("returning descriptor:\n"); - debug_DMUS_OBJECTDESC(desc); + dump_DMUS_OBJECTDESC(desc); return S_OK; } diff --git a/dlls/dmband/dmobject.c b/dlls/dmband/dmobject.c index e0b7eafe25..9ea31ab32a 100644 --- a/dlls/dmband/dmobject.c +++ b/dlls/dmband/dmobject.c @@ -219,6 +219,59 @@ const char *debugstr_dmguid(const GUID *id) { return debugstr_guid(id); } +void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc) +{ + if (!desc || !TRACE_ON(dmfile)) + return; + + TRACE_(dmfile)("DMUS_OBJECTDESC (%p):", desc); + TRACE_(dmfile)(" - dwSize = %u\n", desc->dwSize); + +#define X(flag) if (desc->dwValidData & flag) TRACE_(dmfile)(#flag " ") + TRACE_(dmfile)(" - dwValidData = %#08x ( ", desc->dwValidData); + X(DMUS_OBJ_OBJECT); + X(DMUS_OBJ_CLASS); + X(DMUS_OBJ_NAME); + X(DMUS_OBJ_CATEGORY); + X(DMUS_OBJ_FILENAME); + X(DMUS_OBJ_FULLPATH); + X(DMUS_OBJ_URL); + X(DMUS_OBJ_VERSION); + X(DMUS_OBJ_DATE); + X(DMUS_OBJ_LOADED); + X(DMUS_OBJ_MEMORY); + X(DMUS_OBJ_STREAM); + TRACE_(dmfile)(")\n"); +#undef X + + if (desc->dwValidData & DMUS_OBJ_CLASS) + TRACE_(dmfile)(" - guidClass = %s\n", debugstr_dmguid(&desc->guidClass)); + if (desc->dwValidData & DMUS_OBJ_OBJECT) + TRACE_(dmfile)(" - guidObject = %s\n", debugstr_guid(&desc->guidObject)); + + if (desc->dwValidData & DMUS_OBJ_DATE) { + SYSTEMTIME time; + FileTimeToSystemTime(&desc->ftDate, &time); + TRACE_(dmfile)(" - ftDate = \'%04u-%02u-%02u %02u:%02u:%02u\'\n", + time.wYear, time.wMonth, time.wDay, time.wHour, time.wMinute, time.wSecond); + } + if (desc->dwValidData & DMUS_OBJ_VERSION) + TRACE_(dmfile)(" - vVersion = \'%u,%u,%u,%u\'\n", + HIWORD(desc->vVersion.dwVersionMS), LOWORD(desc->vVersion.dwVersionMS), + HIWORD(desc->vVersion.dwVersionLS), LOWORD(desc->vVersion.dwVersionLS)); + if (desc->dwValidData & DMUS_OBJ_NAME) + TRACE_(dmfile)(" - wszName = %s\n", debugstr_w(desc->wszName)); + if (desc->dwValidData & DMUS_OBJ_CATEGORY) + TRACE_(dmfile)(" - wszCategory = %s\n", debugstr_w(desc->wszCategory)); + if (desc->dwValidData & DMUS_OBJ_FILENAME) + TRACE_(dmfile)(" - wszFileName = %s\n", debugstr_w(desc->wszFileName)); + if (desc->dwValidData & DMUS_OBJ_MEMORY) + TRACE_(dmfile)(" - llMemLength = 0x%s - pbMemData = %p\n", + wine_dbgstr_longlong(desc->llMemLength), desc->pbMemData); + if (desc->dwValidData & DMUS_OBJ_STREAM) + TRACE_(dmfile)(" - pStream = %p\n", desc->pStream); +} + /* RIFF format parsing */ #define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) diff --git a/dlls/dmband/dmobject.h b/dlls/dmband/dmobject.h index 1354553665..d347020691 100644 --- a/dlls/dmband/dmobject.h +++ b/dlls/dmband/dmobject.h @@ -108,6 +108,7 @@ HRESULT WINAPI unimpl_IPersistStream_GetSizeMax(IPersistStream *iface, /* Debugging helpers */ const char *debugstr_chunk(const struct chunk_entry *chunk) DECLSPEC_HIDDEN; const char *debugstr_dmguid(const GUID *id) DECLSPEC_HIDDEN; +void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc) DECLSPEC_HIDDEN; static inline const char *debugstr_fourcc(DWORD fourcc) { diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index 39d6358211..c676775d35 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -44,84 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmfile); -/* generic flag-dumping function */ -static const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_names){ - static char buffer[128] = "", *ptr = &buffer[0]; - unsigned int i; - int size = sizeof(buffer); - - for (i=0; i < num_names; i++) { - if ((flags & names[i].val)) { - int cnt = snprintf(ptr, size, "%s ", names[i].name); - if (cnt < 0 || cnt >= size) break; - size -= cnt; - ptr += cnt; - } - } - - ptr = &buffer[0]; - return ptr; -} - -/* dump DMUS_OBJ flags */ -static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { - static const flag_info flags[] = { - FE(DMUS_OBJ_OBJECT), - FE(DMUS_OBJ_CLASS), - FE(DMUS_OBJ_NAME), - FE(DMUS_OBJ_CATEGORY), - FE(DMUS_OBJ_FILENAME), - FE(DMUS_OBJ_FULLPATH), - FE(DMUS_OBJ_URL), - FE(DMUS_OBJ_VERSION), - FE(DMUS_OBJ_DATE), - FE(DMUS_OBJ_LOADED), - FE(DMUS_OBJ_MEMORY), - FE(DMUS_OBJ_STREAM) - }; - return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); -} - -/* month number into month name (for debugstr_filetime) */ -static const char *debugstr_month (DWORD dwMonth) { - switch (dwMonth) { - case 1: return "January"; - case 2: return "February"; - case 3: return "March"; - case 4: return "April"; - case 5: return "May"; - case 6: return "June"; - case 7: return "July"; - case 8: return "August"; - case 9: return "September"; - case 10: return "October"; - case 11: return "November"; - case 12: return "December"; - default: return "Invalid"; - } -} - -/* FILETIME struct to string conversion for debug messages */ -static const char *debugstr_filetime (const FILETIME *time) { - SYSTEMTIME sysTime; - - if (!time) return "'null'"; - - FileTimeToSystemTime (time, &sysTime); - - return wine_dbg_sprintf ("\'%02i. %s %04i %02i:%02i:%02i\'", - sysTime.wDay, debugstr_month(sysTime.wMonth), sysTime.wYear, - sysTime.wHour, sysTime.wMinute, sysTime.wSecond); -} - -/* DMUS_VERSION struct to string conversion for debug messages */ -static const char *debugstr_dmversion (const DMUS_VERSION *version) { - if (!version) return "'null'"; - return wine_dbg_sprintf ("\'%i,%i,%i,%i\'", - HIWORD(version->dwVersionMS),LOWORD(version->dwVersionMS), - HIWORD(version->dwVersionLS), LOWORD(version->dwVersionLS)); -} - HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) { switch (pChunk->fccID) { @@ -278,7 +200,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, TRACE("** DM Reference Begin of Load ***\n"); TRACE("With Desc:\n"); - debug_DMUS_OBJECTDESC(&ref_desc); + dump_DMUS_OBJECTDESC(&ref_desc); { LPDIRECTMUSICGETLOADER pGetLoader = NULL; @@ -295,23 +217,3 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, return hr; } - -void debug_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { - if (pDesc) { - TRACE("DMUS_OBJECTDESC (%p):\n", pDesc); - TRACE(" - dwSize = %d\n", pDesc->dwSize); - TRACE(" - dwValidData = %s\n", debugstr_DMUS_OBJ_FLAGS (pDesc->dwValidData)); - if (pDesc->dwValidData & DMUS_OBJ_NAME) TRACE(" - wszName = %s\n", debugstr_w(pDesc->wszName)); - if (pDesc->dwValidData & DMUS_OBJ_CLASS) TRACE(" - guidClass = %s\n", debugstr_dmguid(&pDesc->guidClass)); - if (pDesc->dwValidData & DMUS_OBJ_OBJECT) TRACE(" - guidObject = %s\n", debugstr_guid(&pDesc->guidObject)); - if (pDesc->dwValidData & DMUS_OBJ_DATE) TRACE(" - ftDate = %s\n", debugstr_filetime(&pDesc->ftDate)); - if (pDesc->dwValidData & DMUS_OBJ_VERSION) TRACE(" - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion)); - if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) TRACE(" - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); - if (pDesc->dwValidData & DMUS_OBJ_FILENAME) TRACE(" - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) TRACE(" - llMemLength = 0x%s - pbMemData = %p\n", - wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); - if (pDesc->dwValidData & DMUS_OBJ_STREAM) TRACE(" - pStream = %p\n", pDesc->pStream); - } else { - TRACE("(NULL)\n"); - } -} diff --git a/dlls/dmband/dmutils.h b/dlls/dmband/dmutils.h index dfa8ac46d6..2f13c4b1f4 100644 --- a/dlls/dmband/dmutils.h +++ b/dlls/dmband/dmutils.h @@ -34,18 +34,4 @@ extern HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_C extern HRESULT IDirectMusicUtils_IPersistStream_ParseUNFOGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; extern HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, IDirectMusicObject** ppObject) DECLSPEC_HIDDEN; -/** - * Debug utilities - */ -/* used for generic dumping (copied from ddraw) */ -typedef struct { - DWORD val; - const char* name; -} flag_info; - -/* used for initialising structs */ -#define FE(x) { x, #x } - -extern void debug_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; - #endif /* __WINE_DMUTILS_H */

1 0