April 2019 - Wine-commits - list.winehq.org

Nikolay Sivov : dbgeng: Add IDebugSymbols3 definition.
by Alexandre Julliard 08 Apr '19

08 Apr '19

Module: wine Branch: master Commit: b562484d9cb96ad0290e036890cbf00d29ed3604 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b562484d9cb96ad0290e0368… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 8 09:35:40 2019 +0300 dbgeng: Add IDebugSymbols3 definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 12 +- include/dbgeng.h | 358 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 367 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b562484d9cb96ad0290e…

1 0

Alexandre Julliard : d3dxof: Avoid using DPRINTF().
by Alexandre Julliard 08 Apr '19

08 Apr '19

Module: wine Branch: master Commit: 776fae4c60def4dfbd60faa285671cefe9f03e1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=776fae4c60def4dfbd60faa2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 8 19:33:30 2019 +0200 d3dxof: Avoid using DPRINTF(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dxof/d3dxof.c | 4 ++-- dlls/d3dxof/parsing.c | 30 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 5499551..90c9192 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -264,7 +264,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV ULONG i; TRACE("Registered templates (%d):\n", This->nb_xtemplates); for (i = 1; i < This->nb_xtemplates; i++) - DPRINTF("%s - %s\n", This->xtemplates[i].name, debugstr_guid(&This->xtemplates[i].class_id)); + TRACE("%s - %s\n", This->xtemplates[i].name, debugstr_guid(&This->xtemplates[i].class_id)); } *ppEnumObj = &object->IDirectXFileEnumObject_iface; @@ -343,7 +343,7 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP ULONG i; TRACE("Registered templates (%d):\n", This->nb_xtemplates); for (i = 1; i < This->nb_xtemplates; i++) - DPRINTF("%s - %s\n", This->xtemplates[i].name, debugstr_guid(&This->xtemplates[i].class_id)); + TRACE("%s - %s\n", This->xtemplates[i].name, debugstr_guid(&This->xtemplates[i].class_id)); } hr = DXFILE_OK; diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 82cb186..f1e0982 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -133,38 +133,38 @@ static void dump_template(xtemplate* templates_array, xtemplate* ptemplate) clsid = &ptemplate->class_id; - DPRINTF("template %s\n", ptemplate->name); - DPRINTF("{\n"); - DPRINTF(CLSIDFMT "\n", clsid->Data1, clsid->Data2, clsid->Data3, clsid->Data4[0], + wine_dbg_printf("template %s\n", ptemplate->name); + wine_dbg_printf("{\n"); + wine_dbg_printf(CLSIDFMT "\n", clsid->Data1, clsid->Data2, clsid->Data3, clsid->Data4[0], clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], clsid->Data4[4], clsid->Data4[5], clsid->Data4[6], clsid->Data4[7]); for (j = 0; j < ptemplate->nb_members; j++) { if (ptemplate->members[j].nb_dims) - DPRINTF("array "); + wine_dbg_printf("array "); if (ptemplate->members[j].type == TOKEN_NAME) - DPRINTF("%s ", templates_array[ptemplate->members[j].idx_template].name); + wine_dbg_printf("%s ", templates_array[ptemplate->members[j].idx_template].name); else - DPRINTF("%s ", get_primitive_string(ptemplate->members[j].type)); - DPRINTF("%s", ptemplate->members[j].name); + wine_dbg_printf("%s ", get_primitive_string(ptemplate->members[j].type)); + wine_dbg_printf("%s", ptemplate->members[j].name); for (k = 0; k < ptemplate->members[j].nb_dims; k++) { if (ptemplate->members[j].dim_fixed[k]) - DPRINTF("[%d]", ptemplate->members[j].dim_value[k]); + wine_dbg_printf("[%d]", ptemplate->members[j].dim_value[k]); else - DPRINTF("[%s]", ptemplate->members[ptemplate->members[j].dim_value[k]].name); + wine_dbg_printf("[%s]", ptemplate->members[ptemplate->members[j].dim_value[k]].name); } - DPRINTF(";\n"); + wine_dbg_printf(";\n"); } if (ptemplate->open) - DPRINTF("[...]\n"); + wine_dbg_printf("[...]\n"); else if (ptemplate->nb_children) { - DPRINTF("[%s", ptemplate->children[0]); + wine_dbg_printf("[%s", ptemplate->children[0]); for (j = 1; j < ptemplate->nb_children; j++) - DPRINTF(",%s", ptemplate->children[j]); - DPRINTF("]\n"); + wine_dbg_printf(",%s", ptemplate->children[j]); + wine_dbg_printf("]\n"); } - DPRINTF("}\n"); + wine_dbg_printf("}\n"); } static BOOL read_bytes(parse_buffer * buf, LPVOID data, DWORD size)

1 0

Alexandre Julliard : krnl386.exe: Avoid using DPRINTF().
by Alexandre Julliard 08 Apr '19

08 Apr '19

Module: wine Branch: master Commit: d708d9e611c4240b3521ebddf24100399761cf41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d708d9e611c4240b3521ebdd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 8 19:33:48 2019 +0200 krnl386.exe: Avoid using DPRINTF(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/global.c | 14 -------------- dlls/krnl386.exe16/thunk.c | 14 +++++--------- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/dlls/krnl386.exe16/global.c b/dlls/krnl386.exe16/global.c index 8f9ac02..c7ccd2d 100644 --- a/dlls/krnl386.exe16/global.c +++ b/dlls/krnl386.exe16/global.c @@ -109,20 +109,6 @@ static GLOBALARENA *GLOBAL_GetArena( WORD sel, WORD selcount ) return pGlobalArena + (sel >> __AHSHIFT); } -void debug_handles(void) -{ - int printed=0; - int i; - for (i = globalArenaSize-1 ; i>=0 ; i--) { - if (pGlobalArena[i].size!=0 && (pGlobalArena[i].handle & 0x8000)){ - printed=1; - DPRINTF("0x%08x, ",pGlobalArena[i].handle); - } - } - if (printed) - DPRINTF("\n"); -} - /*********************************************************************** * GLOBAL_CreateBlock diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c index 737f6a8..f3ca174 100644 --- a/dlls/krnl386.exe16/thunk.c +++ b/dlls/krnl386.exe16/thunk.c @@ -1011,13 +1011,9 @@ DWORD WINAPIV SSCall( DWORD i,ret; DWORD *args = ((DWORD *)&fun) + 1; - if(TRACE_ON(thunk)) - { - DPRINTF("(%d,0x%08x,%p,[",nr,flags,fun); - for (i=0;i<nr/4;i++) - DPRINTF("0x%08x,",args[i]); - DPRINTF("])\n"); - } + TRACE("(%d,0x%08x,%p,[",nr,flags,fun); + for (i = 0; i < nr/4; i++) TRACE("0x%08x,",args[i]); + TRACE("])\n"); ret = call_entry_point( fun, nr / sizeof(DWORD), args ); TRACE(" returning %d ...\n",ret); return ret; @@ -2525,10 +2521,10 @@ DWORD WINAPIV WOW16Call(WORD x, WORD y, WORD z, VA_LIST16 args) for (i=0;i<x/2;i++) { WORD a = VA_ARG16(args,WORD); - DPRINTF("%04x ",a); + FIXME("%04x ",a); } calladdr = VA_ARG16(args,DWORD); stack16_pop( 3*sizeof(WORD) + x + sizeof(DWORD) ); - DPRINTF(") calling address was 0x%08x\n",calladdr); + FIXME(") calling address was 0x%08x\n",calladdr); return 0; }

1 0

Alexandre Julliard : ntdll: Avoid using DPRINTF().
by Alexandre Julliard 08 Apr '19

08 Apr '19

Module: wine Branch: master Commit: a184ce483bfe70e9fa8fb95f6a6f2a2062842ab7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a184ce483bfe70e9fa8fb95f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 8 19:34:09 2019 +0200 ntdll: Avoid using DPRINTF(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index bdadc79..cccaaee 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -340,13 +340,13 @@ static void HEAP_Dump( HEAP *heap ) SUBHEAP *subheap; char *ptr; - DPRINTF( "Heap: %p\n", heap ); - DPRINTF( "Next: %p Sub-heaps:", LIST_ENTRY( heap->entry.next, HEAP, entry ) ); - LIST_FOR_EACH_ENTRY( subheap, &heap->subheap_list, SUBHEAP, entry ) DPRINTF( " %p", subheap ); + TRACE( "Heap: %p\n", heap ); + TRACE( "Next: %p Sub-heaps:", LIST_ENTRY( heap->entry.next, HEAP, entry ) ); + LIST_FOR_EACH_ENTRY( subheap, &heap->subheap_list, SUBHEAP, entry ) TRACE( " %p", subheap ); - DPRINTF( "\nFree lists:\n Block Stat Size Id\n" ); + TRACE( "\nFree lists:\n Block Stat Size Id\n" ); for (i = 0; i < HEAP_NB_FREE_LISTS; i++) - DPRINTF( "%p free %08lx prev=%p next=%p\n", + TRACE( "%p free %08lx prev=%p next=%p\n", &heap->freeList[i].arena, i < HEAP_NB_SMALL_FREE_LISTS ? HEAP_MIN_ARENA_SIZE + i * ALIGNMENT : HEAP_freeListSizes[i - HEAP_NB_SMALL_FREE_LISTS], LIST_ENTRY( heap->freeList[i].arena.entry.prev, ARENA_FREE, entry ), @@ -355,17 +355,17 @@ static void HEAP_Dump( HEAP *heap ) LIST_FOR_EACH_ENTRY( subheap, &heap->subheap_list, SUBHEAP, entry ) { SIZE_T freeSize = 0, usedSize = 0, arenaSize = subheap->headerSize; - DPRINTF( "\n\nSub-heap %p: base=%p size=%08lx committed=%08lx\n", + TRACE( "\n\nSub-heap %p: base=%p size=%08lx committed=%08lx\n", subheap, subheap->base, subheap->size, subheap->commitSize ); - DPRINTF( "\n Block Arena Stat Size Id\n" ); + TRACE( "\n Block Arena Stat Size Id\n" ); ptr = (char *)subheap->base + subheap->headerSize; while (ptr < (char *)subheap->base + subheap->size) { if (*(DWORD *)ptr & ARENA_FLAG_FREE) { ARENA_FREE *pArena = (ARENA_FREE *)ptr; - DPRINTF( "%p %08x free %08x prev=%p next=%p\n", + TRACE( "%p %08x free %08x prev=%p next=%p\n", pArena, pArena->magic, pArena->size & ARENA_SIZE_MASK, LIST_ENTRY( pArena->entry.prev, ARENA_FREE, entry ), @@ -377,7 +377,7 @@ static void HEAP_Dump( HEAP *heap ) else if (*(DWORD *)ptr & ARENA_FLAG_PREV_FREE) { ARENA_INUSE *pArena = (ARENA_INUSE *)ptr; - DPRINTF( "%p %08x Used %08x back=%p\n", + TRACE( "%p %08x Used %08x back=%p\n", pArena, pArena->magic, pArena->size & ARENA_SIZE_MASK, *((ARENA_FREE **)pArena - 1) ); ptr += sizeof(*pArena) + (pArena->size & ARENA_SIZE_MASK); arenaSize += sizeof(ARENA_INUSE); @@ -386,7 +386,7 @@ static void HEAP_Dump( HEAP *heap ) else { ARENA_INUSE *pArena = (ARENA_INUSE *)ptr; - DPRINTF( "%p %08x %s %08x\n", + TRACE( "%p %08x %s %08x\n", pArena, pArena->magic, pArena->magic == ARENA_INUSE_MAGIC ? "used" : "pend", pArena->size & ARENA_SIZE_MASK ); ptr += sizeof(*pArena) + (pArena->size & ARENA_SIZE_MASK); @@ -394,7 +394,7 @@ static void HEAP_Dump( HEAP *heap ) usedSize += pArena->size & ARENA_SIZE_MASK; } } - DPRINTF( "\nTotal: Size=%08lx Committed=%08lx Free=%08lx Used=%08lx Arenas=%08lx (%ld%%)\n\n", + TRACE( "\nTotal: Size=%08lx Committed=%08lx Free=%08lx Used=%08lx Arenas=%08lx (%ld%%)\n\n", subheap->size, subheap->commitSize, freeSize, usedSize, arenaSize, (arenaSize * 100) / subheap->size ); }

1 0

Alexandre Julliard : wineps: Avoid using DPRINTF().
by Alexandre Julliard 08 Apr '19

08 Apr '19

Module: wine Branch: master Commit: 49ab8b1bbf86a222c55827fee9975f9df3ff69c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49ab8b1bbf86a222c55827fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 8 19:34:29 2019 +0200 wineps: Avoid using DPRINTF(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 2eb03b8..8a1353c 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -158,7 +158,7 @@ do \ { \ if (fields & flag) \ { \ - if (add_space++) DPRINTF(" "); \ + if (add_space++) TRACE(" "); \ TRACE(#flag); \ fields &= ~flag; \ } \

1 0

Alexandre Julliard : include: Get rid of the DPRINTF() macro.
by Alexandre Julliard 08 Apr '19

08 Apr '19

Module: wine Branch: master Commit: 3d6febc997c808e7c91289c34f7bb48b8b1fe2bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d6febc997c808e7c91289c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 8 19:34:44 2019 +0200 include: Get rid of the DPRINTF() macro. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/macho_module.c | 1 - dlls/gdi32/freetype.c | 1 - dlls/secur32/schannel_macosx.c | 1 - dlls/windowscodecs/icnsformat.c | 1 - dlls/winecoreaudio.drv/audiounit.c | 2 -- dlls/winecoreaudio.drv/mmdevdrv.c | 1 - dlls/winemac.drv/macdrv_cocoa.h | 1 - dlls/wineqtdecoder/qtdatahandler.c | 2 -- dlls/wineqtdecoder/qtsplitter.c | 2 -- dlls/wineqtdecoder/qtutils.c | 2 -- dlls/wineqtdecoder/qtvdecoder.c | 2 -- dlls/winhttp/session.c | 1 - dlls/wininet/internet.c | 1 - dlls/winspool.drv/info.c | 1 - include/wine/debug.h | 2 -- 15 files changed, 21 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index a062335..9d83b00 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -31,7 +31,6 @@ #include <CoreServices/CoreServices.h> #undef LoadResource #undef GetCurrentThread -#undef DPRINTF #endif #include <stdio.h> diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 333856e..3e4a876 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -61,7 +61,6 @@ #undef CompareString #undef GetCurrentThread #undef _CDECL -#undef DPRINTF #undef GetCurrentProcess #undef AnimatePalette #undef EqualRgn diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 981e4fb..050e8c5 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -30,7 +30,6 @@ #include <CoreServices/CoreServices.h> #undef GetCurrentThread #undef LoadResource -#undef DPRINTF #endif #include "windef.h" diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c index 02e8ee9..8194bc5 100644 --- a/dlls/windowscodecs/icnsformat.c +++ b/dlls/windowscodecs/icnsformat.c @@ -75,7 +75,6 @@ #undef SetRect #undef ShowCursor #undef UnionRect -#undef DPRINTF #endif #define COBJMACROS diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index b49d214..5f20b3d 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -29,8 +29,6 @@ #include <AudioToolbox/AudioToolbox.h> #undef ULONG #undef HRESULT - -#undef DPRINTF #undef STDMETHODCALLTYPE #include "coreaudio.h" #include "wine/debug.h" diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 28ada43..2f4683a 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -50,7 +50,6 @@ #undef GetCurrentThread #undef GetCurrentProcess #undef _CDECL -#undef DPRINTF #include "windef.h" #include "winbase.h" diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 011b1ff..6165dc5 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -83,7 +83,6 @@ #undef SetRect #undef ShowCursor #undef UnionRect -#undef DPRINTF #include <pthread.h> diff --git a/dlls/wineqtdecoder/qtdatahandler.c b/dlls/wineqtdecoder/qtdatahandler.c index c88b354..30b5161 100644 --- a/dlls/wineqtdecoder/qtdatahandler.c +++ b/dlls/wineqtdecoder/qtdatahandler.c @@ -66,7 +66,6 @@ #undef CompareString #undef GetCurrentThread #undef _CDECL -#undef DPRINTF #undef GetCurrentProcess #undef AnimatePalette #undef EqualRgn @@ -102,7 +101,6 @@ #undef ULONG #undef HRESULT -#undef DPRINTF #undef STDMETHODCALLTYPE #include <assert.h> diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index c0a9b93..d2255b1 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -67,7 +67,6 @@ #undef CompareString #undef GetCurrentThread #undef _CDECL -#undef DPRINTF #undef GetCurrentProcess #undef AnimatePalette #undef EqualRgn @@ -103,7 +102,6 @@ #undef ULONG #undef HRESULT -#undef DPRINTF #undef STDMETHODCALLTYPE #include <assert.h> diff --git a/dlls/wineqtdecoder/qtutils.c b/dlls/wineqtdecoder/qtutils.c index 19ba90c..4c88656 100644 --- a/dlls/wineqtdecoder/qtutils.c +++ b/dlls/wineqtdecoder/qtutils.c @@ -66,7 +66,6 @@ #undef CompareString #undef GetCurrentThread #undef _CDECL -#undef DPRINTF #undef GetCurrentProcess #undef AnimatePalette #undef EqualRgn @@ -102,7 +101,6 @@ #undef ULONG #undef HRESULT -#undef DPRINTF #undef STDMETHODCALLTYPE #include "windef.h" diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index 9091da1..46a8ac0 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -67,7 +67,6 @@ #undef CompareString #undef GetCurrentThread #undef _CDECL -#undef DPRINTF #undef GetCurrentProcess #undef AnimatePalette #undef EqualRgn @@ -103,7 +102,6 @@ #undef ULONG #undef HRESULT -#undef DPRINTF #undef STDMETHODCALLTYPE #define COBJMACROS diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index f4f7e41..239b86b 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -26,7 +26,6 @@ #include <CoreServices/CoreServices.h> #undef GetCurrentThread #undef LoadResource -#undef DPRINTF #endif #include "windef.h" diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 6db42d6..b9f9f91 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -34,7 +34,6 @@ #include <CoreServices/CoreServices.h> #undef GetCurrentThread #undef LoadResource -#undef DPRINTF #endif #include "winsock2.h" diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 763d244..d7e2211 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -102,7 +102,6 @@ #undef SetRect #undef ShowCursor #undef UnionRect -#undef DPRINTF #endif #include "wine/library.h" diff --git a/include/wine/debug.h b/include/wine/debug.h index bb72827..6a981d6 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -496,7 +496,6 @@ static inline const char *wine_dbgstr_variant( const VARIANT *v ) static struct __wine_debug_channel __wine_dbch_##ch = { 0xff, #ch }; \ static struct __wine_debug_channel * const __wine_dbch___default = &__wine_dbch_##ch -#define WINE_DPRINTF wine_dbg_printf #define WINE_MESSAGE wine_dbg_printf #ifdef __WINESRC__ @@ -530,7 +529,6 @@ static inline const char *debugstr_variant( const VARIANT *v ) { return wine_dbg #define ERR_(ch) WINE_ERR_(ch) #define ERR_ON(ch) WINE_ERR_ON(ch) -#define DPRINTF WINE_DPRINTF #define MESSAGE WINE_MESSAGE #endif /* __WINESRC__ */

1 0

Michael Stefaniuc : msg711.acm: Remove useless casts to self.
by Alexandre Julliard 08 Apr '19

08 Apr '19

Module: wine Branch: master Commit: 9afa1308c7b1d59deae2fd3e1fc9897bd235f0bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=9afa1308c7b1d59deae2fd3e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Apr 5 21:03:58 2019 +0200 msg711.acm: Remove useless casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msg711.acm/msg711.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c index d20c89b..9c44c65 100644 --- a/dlls/msg711.acm/msg711.c +++ b/dlls/msg711.acm/msg711.c @@ -542,8 +542,7 @@ static inline unsigned char ulaw2alaw(unsigned char uval) { uval &= 0xff; - return (unsigned char) ((uval & 0x80) ? (0xD5 ^ (_u2a[0xFF ^ uval] - 1)) : - (unsigned char) (0x55 ^ (_u2a[0x7F ^ uval] - 1))); + return (uval & 0x80) ? (0xD5 ^ (_u2a[0xFF ^ uval] - 1)) : (0x55 ^ (_u2a[0x7F ^ uval] - 1)); } /* -------------------------------------------------------------------------------*/

1 0

Józef Kucia : wined3d: Map GL_EXT_texture_swizzle to GL_ARB_texture_swizzle.
by Alexandre Julliard 08 Apr '19

08 Apr '19

Module: wine Branch: master Commit: a8f37cf684f9d7184597535041817cdff277b0b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8f37cf684f9d71845975350… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Apr 6 11:37:31 2019 +0200 wined3d: Map GL_EXT_texture_swizzle to GL_ARB_texture_swizzle. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 3157c49..3ffbbaf 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -204,6 +204,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_texture_snorm", EXT_TEXTURE_SNORM }, {"GL_EXT_texture_sRGB", EXT_TEXTURE_SRGB }, {"GL_EXT_texture_sRGB_decode", EXT_TEXTURE_SRGB_DECODE }, + {"GL_EXT_texture_swizzle", ARB_TEXTURE_SWIZZLE }, {"GL_EXT_vertex_array_bgra", EXT_VERTEX_ARRAY_BGRA }, /* NV */

1 0

Józef Kucia : wined3d: Handle GL_EXT_vertex_array_bgra directly in gl_extension_map.
by Alexandre Julliard 08 Apr '19

08 Apr '19

Module: wine Branch: master Commit: 61937c310306cb2e3c64a3eb5feb8c3c0ea0505a URL: https://source.winehq.org/git/wine.git/?a=commit;h=61937c310306cb2e3c64a3eb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Apr 6 11:37:32 2019 +0200 wined3d: Handle GL_EXT_vertex_array_bgra directly in gl_extension_map. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 7 +------ dlls/wined3d/wined3d_gl.h | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 3ffbbaf..c195bf4 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -205,7 +205,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_texture_sRGB", EXT_TEXTURE_SRGB }, {"GL_EXT_texture_sRGB_decode", EXT_TEXTURE_SRGB_DECODE }, {"GL_EXT_texture_swizzle", ARB_TEXTURE_SWIZZLE }, - {"GL_EXT_vertex_array_bgra", EXT_VERTEX_ARRAY_BGRA }, + {"GL_EXT_vertex_array_bgra", ARB_VERTEX_ARRAY_BGRA }, /* NV */ {"GL_NV_fence", NV_FENCE }, @@ -3530,11 +3530,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, TRACE(" IMPLIED: NVIDIA (NV) Texture Gen Reflection support.\n"); gl_info->supported[NV_TEXGEN_REFLECTION] = TRUE; } - if (!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] && gl_info->supported[EXT_VERTEX_ARRAY_BGRA]) - { - TRACE(" IMPLIED: ARB_vertex_array_bgra support (by EXT_vertex_array_bgra).\n"); - gl_info->supported[ARB_VERTEX_ARRAY_BGRA] = TRUE; - } if (!gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC] && gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC]) { TRACE(" IMPLIED: EXT_texture_compression_rgtc support (by ARB_texture_compression_rgtc).\n"); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index ae067e6..5241b6c 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -186,7 +186,6 @@ enum wined3d_gl_extension EXT_TEXTURE_SNORM, EXT_TEXTURE_SRGB, EXT_TEXTURE_SRGB_DECODE, - EXT_VERTEX_ARRAY_BGRA, /* NVIDIA */ NV_FENCE, NV_FOG_DISTANCE,

1 0

Józef Kucia : wined3d: Implement adapter_vk_get_wined3d_caps().
by Alexandre Julliard 08 Apr '19

08 Apr '19

Module: wine Branch: master Commit: f32ea05821a34602aa2b9398becccfe50b7e7ab0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f32ea05821a34602aa2b9398… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Apr 6 11:37:33 2019 +0200 wined3d: Implement adapter_vk_get_wined3d_caps(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 125 ++++++++++++++++++++++++++++++++++++----- dlls/wined3d/directx.c | 6 +- dlls/wined3d/wined3d_private.h | 2 + 3 files changed, 117 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f32ea05821a34602aa2b…

1 0