July 2013 - Wine-commits - list.winehq.org

Frédéric Delanoy : wineusr: Use double quotes around SGML attribute values.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: docs Branch: master Commit: 21d506ee9ad000619004b464408ab0e92e028b33 URL: http://source.winehq.org/git/docs.git/?a=commit;h=21d506ee9ad000619004b4644… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 20 01:22:33 2013 +0200 wineusr: Use double quotes around SGML attribute values. --- en/wineusr-introduction.sgml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/en/wineusr-introduction.sgml b/en/wineusr-introduction.sgml index bb578e4..070bb00 100644 --- a/en/wineusr-introduction.sgml +++ b/en/wineusr-introduction.sgml @@ -286,7 +286,7 @@ purchasing these products. </para> <table><title>Various Wine offerings</title> - <tgroup cols=3 align="left"> + <tgroup cols="3" align="left"> <thead> <row> <entry>Product</entry>

1 0

Frédéric Delanoy : winelib: Standardize on " winelib" spelling.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: docs Branch: master Commit: 8bdd595486c00f63f31484af192718f36253bee6 URL: http://source.winehq.org/git/docs.git/?a=commit;h=8bdd595486c00f63f31484af1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 20 12:02:37 2013 +0200 winelib: Standardize on "winelib" spelling. --- en/winelib-bindlls.sgml | 6 +++--- en/winelib-mfc.sgml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/en/winelib-bindlls.sgml b/en/winelib-bindlls.sgml index e72cae8..596c112 100644 --- a/en/winelib-bindlls.sgml +++ b/en/winelib-bindlls.sgml @@ -1,6 +1,6 @@ <chapter id="bindlls">  - <title id="bindlls.title">Building WineLib DLLs</title> + <title id="bindlls.title">Building Winelib DLLs</title> <sect1 id="bindlls-intro"> <title id="binary-dlls-intro.title">Introduction</title> <para> @@ -136,8 +136,8 @@ signed short MyLinuxFunc (unsigned short a, void *b, void *c, * Note that this is a Unix file; please don't go converting it to DOS format * (e.g. converting line feeds to Carriage return/Line feed). * - * This file should be built in a Wine environment as a WineLib library, - * linked to the Linux <3rd party> libraries (currently libxxxx.so and + * This file should be built in a Wine environment as a Winelib library, + * linked to the Linux <3rd party> libraries (currently libxxxx.so and * libyyyy.so) */ diff --git a/en/winelib-mfc.sgml b/en/winelib-mfc.sgml index 3583b19..5d38105 100644 --- a/en/winelib-mfc.sgml +++ b/en/winelib-mfc.sgml @@ -133,7 +133,7 @@ <title id="mfc-compiling.title">Compiling the MFC</title> <para> Here is a set of recommendations for getting the MFC compiled with - WineLib: + Winelib: </para> <para> We recommend running winemaker in

1 0

Frédéric Delanoy : winelib: Use valid values for 'filename' tag attributes.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: docs Branch: master Commit: f4f1d0ef4d4963520a06bbf73bb85d0a5b60edcb URL: http://source.winehq.org/git/docs.git/?a=commit;h=f4f1d0ef4d4963520a06bbf73… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 22 14:20:19 2013 +0200 winelib: Use valid values for 'filename' tag attributes. --- en/winelib-bindlls.sgml | 4 ++-- en/winelib-intro.sgml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/en/winelib-bindlls.sgml b/en/winelib-bindlls.sgml index 596c112..304a3fe 100644 --- a/en/winelib-bindlls.sgml +++ b/en/winelib-bindlls.sgml @@ -45,7 +45,7 @@ extremely simple and leads into the subject in "baby steps". The second example is the ODBC interface proxy in Wine. The files to which we will refer for the ODBC example are currently in the - <filename class="Directory">dlls/odbc32</filename> directory of the + <filename class="directory">dlls/odbc32</filename> directory of the Wine source. </para> <para> @@ -170,7 +170,7 @@ signed short WINAPI MyProxyWinFunc (unsigned short a, void *b, void *c, <para> For a more extensive case we can use the ODBC example. This is implemented as a header file - (<filename class="HeaderFile">proxyodbc.h</filename>) and the actual + (<filename class="headerfile">proxyodbc.h</filename>) and the actual C source file (<filename>proxyodbc.c</filename>). Although the file is quite long it is extremely simple in structure. </para> diff --git a/en/winelib-intro.sgml b/en/winelib-intro.sgml index 8a6fe38..0f85543 100644 --- a/en/winelib-intro.sgml +++ b/en/winelib-intro.sgml @@ -208,8 +208,8 @@ can help it guess what it is that your project is trying to build. Otherwise, it is able to understand Visual C++ projects. Usually the executables and libraries are - in a <filename class="Directory">Release</filename> or - <filename class="Directory">Debug</filename> subdirectory of the + in a <filename class="directory">Release</filename> or + <filename class="directory">Debug</filename> subdirectory of the directory where the sources are. So it's best if you can transfer the source files and either of these directories to Linux. Note that you don't need to transfer the

1 0

Frédéric Delanoy : winedev: Use double quotes around SGML attribute values.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: docs Branch: master Commit: bd93071030c8f4ae6d30b341feb2c78b3501c00f URL: http://source.winehq.org/git/docs.git/?a=commit;h=bd93071030c8f4ae6d30b341f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 20 01:22:32 2013 +0200 winedev: Use double quotes around SGML attribute values. --- en/winedev-debugger.sgml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/en/winedev-debugger.sgml b/en/winedev-debugger.sgml index 6bec08b..c727985 100644 --- a/en/winedev-debugger.sgml +++ b/en/winedev-debugger.sgml @@ -2608,7 +2608,7 @@ $ gdb wine <sect2> <title>Main differences between winedbg and regular Unix debuggers</title> <table><title>Debuggers comparison</title> - <tgroup cols=2 align="left"> + <tgroup cols="2" align="left"> <tbody> <row> <entry>WineDbg</entry><entry>gdb</entry>

1 0

Nikolay Sivov : ntdll/tests: Properly skip on missing functions.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: 7e136d68f7625b61afeb61b003b9602124a4c74d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e136d68f7625b61afeb61b00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 22 13:02:04 2013 +0400 ntdll/tests: Properly skip on missing functions. --- dlls/ntdll/tests/rtlstr.c | 54 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 42 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 69f2586..e8524da 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -196,6 +196,12 @@ static void test_RtlInitUnicodeStringEx(void) UNICODE_STRING uni; NTSTATUS result; + if (!pRtlInitUnicodeStringEx) + { + win_skip("RtlInitUnicodeStringEx is not available\n"); + return; + } + teststring2 = HeapAlloc(GetProcessHeap(), 0, (TESTSTRING2_LEN + 1) * sizeof(WCHAR)); memset(teststring2, 'X', TESTSTRING2_LEN * sizeof(WCHAR)); teststring2[TESTSTRING2_LEN] = '\0'; @@ -410,6 +416,12 @@ static void test_RtlDuplicateUnicodeString(void) NTSTATUS result; unsigned int test_num; + if (!pRtlDuplicateUnicodeString) + { + win_skip("RtlDuplicateUnicodeString is not available\n"); + return; + } + for (test_num = 0; test_num < NB_DUPL_USTR; test_num++) { source_str.Length = dupl_ustr[test_num].source_Length; source_str.MaximumLength = dupl_ustr[test_num].source_MaximumLength; @@ -1184,6 +1196,12 @@ static void test_RtlFindCharInUnicodeString(void) unsigned int idx; unsigned int test_num; + if (!pRtlFindCharInUnicodeString) + { + win_skip("RtlFindCharInUnicodeString is not available\n"); + return; + } + for (test_num = 0; test_num < NB_FIND_CH_IN_USTR; test_num++) { if (find_ch_in_ustr[test_num].main_str != NULL) { main_str.Length = strlen(find_ch_in_ustr[test_num].main_str) * sizeof(WCHAR); @@ -1714,6 +1732,12 @@ static void test_RtlIsTextUnicode(void) int flags; int i; + if (!pRtlIsTextUnicode) + { + win_skip("RtlIsTextUnicode is not available\n"); + return; + } + ok(!pRtlIsTextUnicode(ascii, sizeof(ascii), NULL), "ASCII text detected as Unicode\n"); res = pRtlIsTextUnicode(unicode, sizeof(unicode), NULL); @@ -1843,6 +1867,12 @@ static void test_RtlGUIDFromString(void) UNICODE_STRING str; NTSTATUS ret; + if (!pRtlGUIDFromString) + { + win_skip("RtlGUIDFromString is not available\n"); + return; + } + str.Length = str.MaximumLength = sizeof(szGuid) - sizeof(WCHAR); str.Buffer = (LPWSTR)szGuid; @@ -1862,6 +1892,12 @@ static void test_RtlStringFromGUID(void) UNICODE_STRING str; NTSTATUS ret; + if (!pRtlStringFromGUID) + { + win_skip("RtlStringFromGUID is not available\n"); + return; + } + str.Length = str.MaximumLength = 0; str.Buffer = NULL; @@ -1955,18 +1991,12 @@ START_TEST(rtlstr) test_RtlAppendUnicodeStringToString(); } - if (pRtlInitUnicodeStringEx) - test_RtlInitUnicodeStringEx(); - if (pRtlDuplicateUnicodeString) - test_RtlDuplicateUnicodeString(); - if (pRtlFindCharInUnicodeString) - test_RtlFindCharInUnicodeString(); - if (pRtlGUIDFromString) - test_RtlGUIDFromString(); - if (pRtlStringFromGUID) - test_RtlStringFromGUID(); - if (pRtlIsTextUnicode) - test_RtlIsTextUnicode(); + test_RtlInitUnicodeStringEx(); + test_RtlDuplicateUnicodeString(); + test_RtlFindCharInUnicodeString(); + test_RtlGUIDFromString(); + test_RtlStringFromGUID(); + test_RtlIsTextUnicode(); if(0) { test_RtlUpcaseUnicodeChar();

1 0

Alexandre Julliard : libwine: Compress code page tables by merging identical sequences.
by Alexandre Julliard 22 Jul '13

22 Jul '13

1 0

Nikolay Sivov : windowscodecs: Implement GetPalette() for clipper.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: cbf51069e43ee5ad5876ecdfc7b8b909ed35137e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbf51069e43ee5ad5876ecdfc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 21 23:42:48 2013 +0400 windowscodecs: Implement GetPalette() for clipper. --- dlls/windowscodecs/clipper.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/clipper.c b/dlls/windowscodecs/clipper.c index d8f4b32..668d144 100644 --- a/dlls/windowscodecs/clipper.c +++ b/dlls/windowscodecs/clipper.c @@ -149,8 +149,17 @@ static HRESULT WINAPI BitmapClipper_GetResolution(IWICBitmapClipper *iface, static HRESULT WINAPI BitmapClipper_CopyPalette(IWICBitmapClipper *iface, IWICPalette *palette) { - FIXME("(%p,%p): stub\n", iface, palette); - return E_NOTIMPL; + BitmapClipper *This = impl_from_IWICBitmapClipper(iface); + + TRACE("(%p,%p)\n", iface, palette); + + if (!palette) + return E_INVALIDARG; + + if (!This->source) + return WINCODEC_ERR_WRONGSTATE; + + return IWICBitmapSource_CopyPalette(This->source, palette); } static HRESULT WINAPI BitmapClipper_CopyPixels(IWICBitmapClipper *iface,

1 0

Nikolay Sivov : windowscodecs: Implement CopyPixels() for clipper.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: 98be36698c02fb71ae72b90f6eebc3cf6ee8c966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98be36698c02fb71ae72b90f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 22 09:19:26 2013 +0400 windowscodecs: Implement CopyPixels() for clipper. --- dlls/windowscodecs/clipper.c | 28 +++++++- dlls/windowscodecs/tests/bitmap.c | 141 +++++++++++++++++++++++++++++++++++++ 2 files changed, 167 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/clipper.c b/dlls/windowscodecs/clipper.c index 668d144..6f8a05b 100644 --- a/dlls/windowscodecs/clipper.c +++ b/dlls/windowscodecs/clipper.c @@ -165,8 +165,32 @@ static HRESULT WINAPI BitmapClipper_CopyPalette(IWICBitmapClipper *iface, static HRESULT WINAPI BitmapClipper_CopyPixels(IWICBitmapClipper *iface, const WICRect *rc, UINT stride, UINT buffer_size, BYTE *buffer) { - FIXME("(%p,%p,%u,%u,%p): stub\n", iface, rc, stride, buffer_size, buffer); - return E_NOTIMPL; + BitmapClipper *This = impl_from_IWICBitmapClipper(iface); + WICRect rect; + + TRACE("(%p,%p,%u,%u,%p)\n", iface, rc, stride, buffer_size, buffer); + + if (!This->source) + return WINCODEC_ERR_WRONGSTATE; + + if (rc) + { + rect = *rc; + + /* transform to source coordinates */ + rect.X += This->rect.X; + rect.Y += This->rect.Y; + + if ((rect.X + rect.Width > This->rect.X + This->rect.Width) || + (rect.Y + rect.Height > This->rect.Y + This->rect.Height)) + return E_INVALIDARG; + + rc = &rect; + } + else + rc = &This->rect; + + return IWICBitmapSource_CopyPixels(This->source, rc, stride, buffer_size, buffer); } static HRESULT WINAPI BitmapClipper_Initialize(IWICBitmapClipper *iface, diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 0437c7d..8795048 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -23,6 +23,7 @@ #include <math.h> #define COBJMACROS +#define CONST_VTABLE #include "windef.h" #include "objbase.h" @@ -43,6 +44,80 @@ static const char *debugstr_guid(const GUID *guid) return buf; } +static HRESULT WINAPI bitmapsource_QueryInterface(IWICBitmapSource *iface, REFIID iid, void **ppv) +{ + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapSource, iid)) + { + *ppv = iface; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + return S_OK; +} + +static ULONG WINAPI bitmapsource_AddRef(IWICBitmapSource *iface) +{ + return 2; +} + +static ULONG WINAPI bitmapsource_Release(IWICBitmapSource *iface) +{ + return 1; +} + +static HRESULT WINAPI bitmapsource_GetSize(IWICBitmapSource *iface, UINT *width, UINT *height) +{ + *width = *height = 10; + return S_OK; +} + +static HRESULT WINAPI bitmapsource_GetPixelFormat(IWICBitmapSource *iface, + WICPixelFormatGUID *format) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI bitmapsource_GetResolution(IWICBitmapSource *iface, + double *dpiX, double *dpiY) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI bitmapsource_CopyPalette(IWICBitmapSource *iface, + IWICPalette *palette) +{ + return E_NOTIMPL; +} + +static WICRect g_rect; +static BOOL called_CopyPixels; + +static HRESULT WINAPI bitmapsource_CopyPixels(IWICBitmapSource *iface, + const WICRect *rc, UINT stride, UINT buffer_size, BYTE *buffer) +{ + if (rc) g_rect = *rc; + called_CopyPixels = TRUE; + return S_OK; +} + +static const IWICBitmapSourceVtbl sourcevtbl = { + bitmapsource_QueryInterface, + bitmapsource_AddRef, + bitmapsource_Release, + bitmapsource_GetSize, + bitmapsource_GetPixelFormat, + bitmapsource_GetResolution, + bitmapsource_CopyPalette, + bitmapsource_CopyPixels +}; + +static IWICBitmapSource bitmapsource = { &sourcevtbl }; + static HBITMAP create_dib(int width, int height, int bpp, LOGPALETTE *pal, const void *data) { char bmibuf[sizeof(BITMAPINFO) + sizeof(RGBQUAD) * 255]; @@ -774,6 +849,7 @@ static void test_clipper(void) IWICBitmapClipper *clipper; UINT height, width; IWICBitmap *bitmap; + BYTE buffer[500]; WICRect rect; HRESULT hr; @@ -807,6 +883,71 @@ static void test_clipper(void) IWICBitmapClipper_Release(clipper); IWICBitmap_Release(bitmap); + + /* CopyPixels */ + hr = IWICImagingFactory_CreateBitmapClipper(factory, &clipper); + ok(hr == S_OK, "got 0x%08x\n", hr); + + rect.X = rect.Y = 5; + rect.Width = rect.Height = 5; + hr = IWICBitmapClipper_Initialize(clipper, &bitmapsource, &rect); + ok(hr == S_OK, "got 0x%08x\n", hr); + + rect.X = rect.Y = 0; + rect.Width = rect.Height = 2; + + /* passed rectangle is relative to clipper rectangle, underlying source gets intersected + rectangle */ + memset(&g_rect, 0, sizeof(g_rect)); + called_CopyPixels = FALSE; + hr = IWICBitmapClipper_CopyPixels(clipper, &rect, 0, sizeof(buffer), buffer); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(called_CopyPixels, "CopyPixels not called\n"); + ok(g_rect.X == 5 && g_rect.Y == 5 && g_rect.Width == 2 && g_rect.Height == 2, + "got wrong rectangle (%d,%d)-(%d,%d)\n", g_rect.X, g_rect.Y, g_rect.Width, g_rect.Height); + + /* whole clipping rectangle */ + memset(&g_rect, 0, sizeof(g_rect)); + called_CopyPixels = FALSE; + + rect.X = rect.Y = 0; + rect.Width = rect.Height = 5; + + hr = IWICBitmapClipper_CopyPixels(clipper, &rect, 0, sizeof(buffer), buffer); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(called_CopyPixels, "CopyPixels not called\n"); + ok(g_rect.X == 5 && g_rect.Y == 5 && g_rect.Width == 5 && g_rect.Height == 5, + "got wrong rectangle (%d,%d)-(%d,%d)\n", g_rect.X, g_rect.Y, g_rect.Width, g_rect.Height); + + /* larger than clipping rectangle */ + memset(&g_rect, 0, sizeof(g_rect)); + called_CopyPixels = FALSE; + + rect.X = rect.Y = 0; + rect.Width = rect.Height = 20; + + hr = IWICBitmapClipper_CopyPixels(clipper, &rect, 0, sizeof(buffer), buffer); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(!called_CopyPixels, "CopyPixels called\n"); + + rect.X = rect.Y = 5; + rect.Width = rect.Height = 5; + + hr = IWICBitmapClipper_CopyPixels(clipper, &rect, 0, sizeof(buffer), buffer); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(!called_CopyPixels, "CopyPixels called\n"); + + /* null rectangle */ + memset(&g_rect, 0, sizeof(g_rect)); + called_CopyPixels = FALSE; + + hr = IWICBitmapClipper_CopyPixels(clipper, NULL, 0, sizeof(buffer), buffer); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(called_CopyPixels, "CopyPixels not called\n"); + ok(g_rect.X == 5 && g_rect.Y == 5 && g_rect.Width == 5 && g_rect.Height == 5, + "got wrong rectangle (%d,%d)-(%d,%d)\n", g_rect.X, g_rect.Y, g_rect.Width, g_rect.Height); + + IWICBitmapClipper_Release(clipper); } START_TEST(bitmap)

1 0

Christian Costa : d3dx9_36: Display bpp in decimal in traces.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: 582945faac8b0f52217af035ebe7822e5089eb35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=582945faac8b0f52217af035e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Jul 22 08:48:07 2013 +0200 d3dx9_36: Display bpp in decimal in traces. --- dlls/d3dx9_36/surface.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 1df0cf2..f5c954f 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -231,7 +231,7 @@ static D3DFORMAT dds_luminance_to_d3dformat(const struct dds_pixel_format *pixel return D3DFMT_A8L8; } - WARN("Unknown luminance pixel format (bpp %#x, l %#x, a %#x)\n", + WARN("Unknown luminance pixel format (bpp %u, l %#x, a %#x)\n", pixel_format->bpp, pixel_format->rmask, pixel_format->amask); return D3DFMT_UNKNOWN; } @@ -241,7 +241,7 @@ static D3DFORMAT dds_alpha_to_d3dformat(const struct dds_pixel_format *pixel_for if (pixel_format->bpp == 8 && pixel_format->amask == 0xff) return D3DFMT_A8; - WARN("Unknown Alpha pixel format (%#x, %#x)\n", pixel_format->bpp, pixel_format->rmask); + WARN("Unknown Alpha pixel format (%u, %#x)\n", pixel_format->bpp, pixel_format->rmask); return D3DFMT_UNKNOWN; } @@ -252,7 +252,7 @@ static D3DFORMAT dds_bump_to_d3dformat(const struct dds_pixel_format *pixel_form if (pixel_format->bpp == 32 && pixel_format->rmask == 0x0000ffff && pixel_format->gmask == 0xffff0000) return D3DFMT_V16U16; - WARN("Unknown bump pixel format (%#x, %#x, %#x, %#x, %#x)\n", pixel_format->bpp, + WARN("Unknown bump pixel format (%u, %#x, %#x, %#x, %#x)\n", pixel_format->bpp, pixel_format->rmask, pixel_format->gmask, pixel_format->bmask, pixel_format->amask); return D3DFMT_UNKNOWN; } @@ -270,7 +270,7 @@ static D3DFORMAT dds_pixel_format_to_d3dformat(const struct dds_pixel_format *pi if (pixel_format->flags & DDS_PF_BUMPDUDV) return dds_bump_to_d3dformat(pixel_format); - WARN("Unknown pixel format (flags %#x, fourcc %#x, bpp %#x, r %#x, g %#x, b %#x, a %#x)\n", + WARN("Unknown pixel format (flags %#x, fourcc %#x, bpp %u, r %#x, g %#x, b %#x, a %#x)\n", pixel_format->flags, pixel_format->fourcc, pixel_format->bpp, pixel_format->rmask, pixel_format->gmask, pixel_format->bmask, pixel_format->amask); return D3DFMT_UNKNOWN;

1 0

Christian Costa : d3dx9_36: Add trace to D3DAssembleShader and D3DCompileShader.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: a119f2666aa02b59b3a828b094cc20ed48828449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a119f2666aa02b59b3a828b09… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Jul 22 08:48:17 2013 +0200 d3dx9_36: Add trace to D3DAssembleShader and D3DCompileShader. --- dlls/d3dx9_36/shader.c | 36 ++++++++++++++++++++++-------------- 1 files changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 75bc9b5..1d6a677 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -193,11 +193,16 @@ HRESULT WINAPI D3DXFindShaderComment(const DWORD *byte_code, DWORD fourcc, const HRESULT WINAPI D3DXAssembleShader(const char *data, UINT data_len, const D3DXMACRO *defines, ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages) { + HRESULT hr; + + TRACE("data %p, data_len %u, defines %p, include %p, flags %#x, shader %p, error_messages %p\n", + data, data_len, defines, include, flags, shader, error_messages); + /* Forward to d3dcompiler: the parameter types aren't really different, the actual data types are equivalent */ - HRESULT hr = D3DAssemble(data, data_len, NULL, (D3D_SHADER_MACRO *)defines, - (ID3DInclude *)include, flags, (ID3DBlob **)shader, - (ID3DBlob **)error_messages); + hr = D3DAssemble(data, data_len, NULL, (D3D_SHADER_MACRO *)defines, + (ID3DInclude *)include, flags, (ID3DBlob **)shader, + (ID3DBlob **)error_messages); if(hr == E_FAIL) hr = D3DXERR_INVALIDDATA; return hr; @@ -350,18 +355,21 @@ HRESULT WINAPI D3DXAssembleShaderFromResourceW(HMODULE module, const WCHAR *reso shader, error_messages); } -HRESULT WINAPI D3DXCompileShader(const char *pSrcData, UINT srcDataLen, const D3DXMACRO *pDefines, - ID3DXInclude *pInclude, const char *pFunctionName, const char *pProfile, DWORD Flags, - ID3DXBuffer **ppShader, ID3DXBuffer **ppErrorMsgs, ID3DXConstantTable **ppConstantTable) +HRESULT WINAPI D3DXCompileShader(const char *data, UINT length, const D3DXMACRO *defines, + ID3DXInclude *include, const char *function, const char *profile, DWORD flags, + ID3DXBuffer **shader, ID3DXBuffer **error_msgs, ID3DXConstantTable **constant_table) { - HRESULT hr = D3DCompile(pSrcData, srcDataLen, NULL, - (D3D_SHADER_MACRO *)pDefines, (ID3DInclude *)pInclude, - pFunctionName, pProfile, Flags, 0, - (ID3DBlob **)ppShader, (ID3DBlob **)ppErrorMsgs); + HRESULT hr; + + TRACE("data %p, length %u, defines %p, include %p, function %s, profile %s, flags %#x, shader %p, error_msgs %p, constant_table %p\n", + data, length, defines, include, function, profile, flags, shader, error_msgs, constant_table); + + hr = D3DCompile(data, length, NULL, (D3D_SHADER_MACRO *)defines, (ID3DInclude *)include, + function, profile, flags, 0, (ID3DBlob **)shader, (ID3DBlob **)error_msgs); + + if (SUCCEEDED(hr) && constant_table) + hr = D3DXGetShaderConstantTable(ID3DXBuffer_GetBufferPointer(*shader), constant_table); - if(SUCCEEDED(hr) && ppConstantTable) - return D3DXGetShaderConstantTable(ID3DXBuffer_GetBufferPointer(*ppShader), - ppConstantTable); return hr; }

1 0