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

Huw Davies : gdi32: Ignore max_extent if nfit is NULL.
by Alexandre Julliard July 22, 2013

July 22, 2013

Module: wine Branch: master Commit: cf9cb6c11837910b646a33e09e45ec9f91434214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf9cb6c11837910b646a33e09… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 22 14:07:36 2013 +0100 gdi32: Ignore max_extent if nfit is NULL. --- dlls/gdi32/font.c | 4 ++-- dlls/gdi32/tests/font.c | 24 ++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index c6bd65b..cc66000 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1186,7 +1186,7 @@ BOOL WINAPI GetTextExtentExPointI( HDC hdc, const WORD *indices, INT count, INT for (i = 0; i < count; i++) { unsigned int dx = abs( INTERNAL_XDSTOWS( dc, pos[i] )) + (i + 1) * dc->charExtra; - if (dx > (unsigned int)max_ext) break; + if (nfit && dx > (unsigned int)max_ext) break; if (dxs) dxs[i] = dx; } if (nfit) *nfit = i; @@ -1323,7 +1323,7 @@ BOOL WINAPI GetTextExtentExPointW( HDC hdc, LPCWSTR str, INT count, INT max_ext, for (i = 0; i < count; i++) { unsigned int dx = abs( INTERNAL_XDSTOWS( dc, pos[i] )) + (i + 1) * dc->charExtra; - if (dx > (unsigned int)max_ext) break; + if (nfit && dx > (unsigned int)max_ext) break; if (dxs) dxs[i] = dx; } if (nfit) *nfit = i; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 6ee8db4..2fc7069 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1207,7 +1207,7 @@ static void test_text_extents(void) { static const WCHAR wt[] = {'O','n','e','\n','t','w','o',' ','3',0}; LPINT extents; - INT i, len, fit1, fit2; + INT i, len, fit1, fit2, extents2[3]; LOGFONTA lf; TEXTMETRICA tm; HDC hdc; @@ -1269,7 +1269,6 @@ static void test_text_extents(void) GetTextExtentExPointW(hdc, wt, 2, 0, NULL, NULL, &sz1); ok(sz1.cx == sz2.cx && sz1.cy == sz2.cy, "GetTextExtentExPointW with lpnFit and alpDx both NULL returns incorrect results\n"); - HeapFree(GetProcessHeap(), 0, extents); /* extents functions fail with -ve counts (the interesting case being -1) */ ret = GetTextExtentPointA(hdc, "o", -1, &sz); @@ -1314,6 +1313,27 @@ static void test_text_extents(void) hfont = SelectObject(hdc, hfont); DeleteObject(hfont); + + /* non-MM_TEXT mapping mode */ + lf.lfHeight = 2000; + hfont = CreateFontIndirectA(&lf); + hfont = SelectObject(hdc, hfont); + + SetMapMode( hdc, MM_HIMETRIC ); + ret = GetTextExtentExPointW(hdc, wt, 3, 0, NULL, extents, &sz); + ok(ret, "got %d\n", ret); + ok(sz.cx == extents[2], "got %d vs %d\n", sz.cx, extents[2]); + + ret = GetTextExtentExPointW(hdc, wt, 3, extents[1], &fit1, extents2, &sz2); + ok(ret, "got %d\n", ret); + ok(fit1 == 2, "got %d\n", fit1); + ok(sz2.cx == sz.cx, "got %d vs %d\n", sz2.cx, sz.cx); + for(i = 0; i < 2; i++) + ok(extents2[i] == extents[i], "%d: %d, %d\n", i, extents2[i], extents[i]); + + hfont = SelectObject(hdc, hfont); + DeleteObject(hfont); + HeapFree(GetProcessHeap(), 0, extents); ReleaseDC(NULL, hdc); }

1 0

Qian Hong : msvcrt/tests: Added setlocale test for Chinese_China.936.
by Alexandre Julliard July 22, 2013

July 22, 2013

Module: wine Branch: master Commit: ff7746a0c8cdf4c94f724e398bc619146d929427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff7746a0c8cdf4c94f724e398… Author: Qian Hong <qhong(a)codeweavers.com> Date: Mon Jul 22 16:57:12 2013 +0800 msvcrt/tests: Added setlocale test for Chinese_China.936. --- dlls/msvcrt/tests/locale.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 63f8a59..d8a1876 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -146,6 +146,18 @@ static void test_setlocale(void) ok(!strcmp(ret, "Chinese (Traditional)_Taiwan.950") || broken(!strcmp(ret, "Chinese_Taiwan.950")), "ret = %s\n", ret); + ret = setlocale(LC_ALL, "Chinese_China.936"); +todo_wine + ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); + if(ret) + { +todo_wine + ok(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936") + || !strcmp(ret, "Chinese (Simplified)_China.936") + || broken(!strcmp(ret, "Chinese_People's Republic of China.936")), "ret = %s\n", ret); + trace("ret is %s\n", ret); + } + ret = setlocale(LC_ALL, "csy"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret)

1 0

Christian Costa : d3dx9_36: Add trace to D3DAssembleShader and D3DCompileShader.
by Alexandre Julliard July 22, 2013

July 22, 2013

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

Dmitry Timoshkov : kernel32: GetShortPathName for a non-existent short file name should fail.
by Alexandre Julliard July 22, 2013

July 22, 2013

Module: wine Branch: master Commit: 4cc482bc0df758bec76ad1466abcba7f85e3cc5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cc482bc0df758bec76ad1466… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 19 14:02:38 2013 +0900 kernel32: GetShortPathName for a non-existent short file name should fail. --- dlls/kernel32/path.c | 30 ++++++++---------------------- dlls/kernel32/tests/path.c | 2 -- 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 63d977b..5cd3c4b 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -441,8 +441,6 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl DWORD tmplen; WIN32_FIND_DATAW wfd; HANDLE goit; - UNICODE_STRING ustr; - WCHAR ustr_buf[8+1+3+1]; TRACE("%s\n", debugstr_w(longpath)); @@ -465,10 +463,6 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl sp = lp = 2; } - ustr.Buffer = ustr_buf; - ustr.Length = 0; - ustr.MaximumLength = sizeof(ustr_buf); - while (longpath[lp]) { /* check for path delimiters and reproduce them */ @@ -485,29 +479,21 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl continue; } - for (p = longpath + lp; *p && *p != '/' && *p != '\\'; p++); - tmplen = p - (longpath + lp); - lstrcpynW(tmpshortpath + sp, longpath + lp, tmplen + 1); - /* Check, if the current element is a valid dos name */ - if (tmplen <= 8+1+3) + p = longpath + lp; + if (lp == 0 && p[0] == '.' && (p[1] == '/' || p[1] == '\\')) { - BOOLEAN spaces; - memcpy(ustr_buf, longpath + lp, tmplen * sizeof(WCHAR)); - ustr_buf[tmplen] = '\0'; - ustr.Length = tmplen * sizeof(WCHAR); - if (RtlIsNameLegalDOS8Dot3(&ustr, NULL, &spaces) && !spaces) - { - sp += tmplen; - lp += tmplen; - continue; - } + tmpshortpath[sp++] = *p++; + tmpshortpath[sp++] = *p++; } + for (; *p && *p != '/' && *p != '\\'; p++); + tmplen = p - (longpath + lp); + lstrcpynW(tmpshortpath + sp, longpath + lp, tmplen + 1); /* Check if the file exists and use the existing short file name */ goit = FindFirstFileW(tmpshortpath, &wfd); if (goit == INVALID_HANDLE_VALUE) goto notfound; FindClose(goit); - strcpyW(tmpshortpath + sp, wfd.cAlternateFileName); + strcpyW(tmpshortpath + sp, wfd.cAlternateFileName[0] ? wfd.cAlternateFileName : wfd.cFileName); sp += strlenW(tmpshortpath + sp); lp += tmplen; } diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index d703aa9..c49a76f 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1281,9 +1281,7 @@ static void test_GetShortPathNameW(void) /* GetShortPathName for a non-existent short file name should fail */ SetLastError(0xdeadbeef); length = GetShortPathNameW( short_path, path, 0 ); -todo_wine ok(!length, "GetShortPathNameW should fail\n"); -todo_wine ok(GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); file = CreateFileW( short_path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL );

1 0

Nikolay Sivov : windowscodecs: Implement CopyPixels() for clipper.
by Alexandre Julliard July 22, 2013

July 22, 2013

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 July 22, 2013

July 22, 2013

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: Show object number in traces.
by Alexandre Julliard July 22, 2013

July 22, 2013

Module: wine Branch: master Commit: 61bf3d45dc75f5824babb589d2fd47aa4be17955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61bf3d45dc75f5824babb589d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Jul 22 08:48:24 2013 +0200 d3dx9_36: Show object number in traces. --- dlls/d3dx9_36/effect.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 8ab1067..30ed36c 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4496,7 +4496,7 @@ static HRESULT d3dx9_parse_sampler(struct d3dx_sampler *sampler, const char *dat hr = d3dx9_parse_state(&states[i], data, ptr, objects); if (hr != D3D_OK) { - WARN("Failed to parse state\n"); + WARN("Failed to parse state %u\n", i); goto err_out; } } @@ -4535,7 +4535,7 @@ static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value, cons hr = d3dx9_parse_value(member, value ? (char *)value + old_size : NULL, data, ptr, objects); if (hr != D3D_OK) { - WARN("Failed to parse value\n"); + WARN("Failed to parse value %u\n", i); return hr; } @@ -4564,7 +4564,7 @@ static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value, cons hr = d3dx9_parse_value(member, (char *)value + old_size, data, ptr, objects); if (hr != D3D_OK) { - WARN("Failed to parse value\n"); + WARN("Failed to parse value %u\n", i); return hr; } @@ -4910,7 +4910,7 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch hr = d3dx9_parse_effect_typedef(member, data, ptr, param, flags); if (hr != D3D_OK) { - WARN("Failed to parse member\n"); + WARN("Failed to parse member %u\n", i); goto err_out; } @@ -4945,7 +4945,7 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch hr = d3dx9_parse_effect_typedef(member, data, ptr, NULL, flags); if (hr != D3D_OK) { - WARN("Failed to parse member\n"); + WARN("Failed to parse member %u\n", i); goto err_out; } @@ -5198,7 +5198,7 @@ static HRESULT d3dx9_parse_effect_pass(struct d3dx_pass *pass, const char *data, hr = d3dx9_parse_effect_annotation(annotation, data, ptr, objects); if (hr != D3D_OK) { - WARN("Failed to parse annotations\n"); + WARN("Failed to parse annotation %u\n", i); goto err_out; } } @@ -5219,7 +5219,7 @@ static HRESULT d3dx9_parse_effect_pass(struct d3dx_pass *pass, const char *data, hr = d3dx9_parse_state(&states[i], data, ptr, objects); if (hr != D3D_OK) { - WARN("Failed to parse annotations\n"); + WARN("Failed to parse annotation %u\n", i); goto err_out; } } @@ -5306,7 +5306,7 @@ static HRESULT d3dx9_parse_effect_technique(struct d3dx_technique *technique, co hr = d3dx9_parse_effect_annotation(annotation, data, ptr, objects); if (hr != D3D_OK) { - WARN("Failed to parse annotations\n"); + WARN("Failed to parse annotation %u\n", i); goto err_out; } } @@ -5338,7 +5338,7 @@ static HRESULT d3dx9_parse_effect_technique(struct d3dx_technique *technique, co hr = d3dx9_parse_effect_pass(pass, data, ptr, objects); if (hr != D3D_OK) { - WARN("Failed to parse passes\n"); + WARN("Failed to parse pass %u\n", i); goto err_out; } } @@ -5558,7 +5558,7 @@ static HRESULT d3dx9_parse_effect(struct ID3DXBaseEffectImpl *base, const char * hr = d3dx9_parse_effect_parameter(parameter, data, &ptr, objects); if (hr != D3D_OK) { - WARN("Failed to parse parameter\n"); + WARN("Failed to parse parameter %u\n", i); goto err_out; } } @@ -5590,7 +5590,7 @@ static HRESULT d3dx9_parse_effect(struct ID3DXBaseEffectImpl *base, const char * hr = d3dx9_parse_effect_technique(technique, data, &ptr, objects); if (hr != D3D_OK) { - WARN("Failed to parse technique\n"); + WARN("Failed to parse technique %u\n", i); goto err_out; } } @@ -5619,7 +5619,7 @@ static HRESULT d3dx9_parse_effect(struct ID3DXBaseEffectImpl *base, const char * hr = d3dx9_parse_data(param, &ptr, base->effect->device); if (hr != D3D_OK) { - WARN("Failed to parse data\n"); + WARN("Failed to parse data %u\n", i); goto err_out; } } @@ -5631,7 +5631,7 @@ static HRESULT d3dx9_parse_effect(struct ID3DXBaseEffectImpl *base, const char * hr = d3dx9_parse_resource(base, data, &ptr); if (hr != D3D_OK) { - WARN("Failed to parse resource\n"); + WARN("Failed to parse resource %u\n", i); goto err_out; } }

1 0

Marcus Meissner : gdiplus/tests: Check return code of GdipGetClipBounds ( Coverity).
by Alexandre Julliard July 22, 2013

July 22, 2013

Module: wine Branch: master Commit: 716f1152932717cabe030ed39ccf3d9dfdafd7b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=716f1152932717cabe030ed39… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jul 20 09:09:08 2013 +0200 gdiplus/tests: Check return code of GdipGetClipBounds (Coverity). --- dlls/gdiplus/tests/graphics.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 15c5e43..27c2c13 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -707,7 +707,9 @@ static void test_BeginContainer2(void) status = GdipEndContainer(graphics, cont2); expect(Ok, status); - GdipGetClipBounds(graphics, &clip); + status = GdipGetClipBounds(graphics, &clip); + expect(Ok, status); + ok(fabs(defClip[0] - clip.X) < 0.0001 && fabs(defClip[1] - clip.Y) < 0.0001 && fabs(defClip[2] - clip.Width) < 0.0001 &&

1 0

Frédéric Delanoy : server: Make wineserver manpage conform to common manpages conventions.
by Alexandre Julliard July 22, 2013

July 22, 2013

Module: wine Branch: master Commit: c350ae14da251e3162f119a2098fd98f9a32275b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c350ae14da251e3162f119a20… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 20 16:54:10 2013 +0200 server: Make wineserver manpage conform to common manpages conventions. --- server/wineserver.man.in | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server/wineserver.man.in b/server/wineserver.man.in index 0837bac..82136a3 100644 --- a/server/wineserver.man.in +++ b/server/wineserver.man.in @@ -25,7 +25,7 @@ extra verbose debugging. If is not specified, the default is 1. The debug output will be sent to stderr. \fBwine\fR(1) will automatically enable normal level debugging when starting \fBwineserver\fR if the +server option is set in the -WINEDEBUG variable. +\fBWINEDEBUG\fR variable. .TP .BR \-f ", " --foreground Make the server remain in the foreground for easier debugging, for @@ -38,8 +38,8 @@ Display a help message. Kill the currently running .BR wineserver , optionally by sending signal \fIn\fR. If no signal is specified, sends -a SIGINT first and then a SIGKILL. The instance of \fBwineserver\fR -that is killed is selected based on the WINEPREFIX environment +a \fBSIGINT\fR first and then a \fBSIGKILL\fR. The instance of \fBwineserver\fR +that is killed is selected based on the \fBWINEPREFIX\fR environment variable. .TP \fB\-p\fR[\fIn\fR], \fB--persistent\fR[\fB=\fIn\fR] @@ -57,9 +57,9 @@ Display version information and exit. Wait until the currently running .B wineserver terminates. -.SH ENVIRONMENT VARIABLES +.SH ENVIRONMENT .TP -.I WINEPREFIX +.B WINEPREFIX If set, the content of this variable is taken as the name of the directory where .B wineserver stores its data (the default is \fI$HOME/.wine\fR). All @@ -69,11 +69,11 @@ processes using the same (i.e.: same user) share certain things like registry, shared memory and kernel objects. By setting -.I WINEPREFIX +.B WINEPREFIX to different values for different Wine processes, it is possible to run a number of truly independent Wine sessions. .TP -.I WINESERVER +.B WINESERVER Specifies the path and name of the .B wineserver binary that will be launched automatically by \fBwine\fR. If not set, @@ -90,7 +90,7 @@ Directory containing user specific data managed by .BI /tmp/.wine- uid Directory containing the server Unix socket and the lock file. These files are created in a subdirectory generated from the -WINEPREFIX directory device and inode numbers. +\fBWINEPREFIX\fR directory device and inode numbers. .SH AUTHORS The original author of .B wineserver

1 0

Frédéric Delanoy : server: Update French translation of manpage.
by Alexandre Julliard July 22, 2013

July 22, 2013

Module: wine Branch: master Commit: 91cb426ca7b7279c3dc40077f46b3e6fa05fe383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91cb426ca7b7279c3dc40077f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 20 16:54:11 2013 +0200 server: Update French translation of manpage. --- server/wineserver.fr.man.in | 42 +++++++++++++++++++++++------------------- 1 files changed, 23 insertions(+), 19 deletions(-) diff --git a/server/wineserver.fr.man.in b/server/wineserver.fr.man.in index c3ed295..22893b2 100644 --- a/server/wineserver.fr.man.in +++ b/server/wineserver.fr.man.in @@ -2,7 +2,8 @@ .SH NOM wineserver \- le serveur Wine .SH SYNOPSIS -.BI wineserver\ [options] +.B wineserver +.RI [ options ] .SH DESCRIPTION .B wineserver est un démon qui fournit à Wine à peu près les mêmes services @@ -14,7 +15,7 @@ il peut être utile de le démarrer explicitement avec certaines options, détaillées ci-après. .SH OPTIONS .TP -\fB\-d\fI[n]\fR, \fB--debug\fI[=n] +\fB\-d\fR[\fIn\fR], \fB--debug\fR[\fB=\fIn\fR] Définit le niveau de débogage à .IR n . 0 signifie aucune information de débogage, 1 est le niveau normal et 2 indique @@ -23,7 +24,7 @@ un débogage plus important. Si n'est pas spécifié, la valeur par défaut est 1. La sortie de débogage sera stderr. \fBwine\fR(1) active automatiquement le débogage au niveau normal lorsqu'il démarre \fBwineserver\fR si l'option +server est indiquée dans la variable -WINEDEBUG. +\fBWINEDEBUG\fR. .TP .BR \-f ", " --foreground Laisse le serveur au premier plan pour un débogage plus aisé, par @@ -32,15 +33,15 @@ exemple lorsqu'il est exécuté dans un débogueur. .BR \-h ", " --help Affiche un message d'aide. .TP -\fB\-k\fI[n]\fR, \fB--kill\fI[=n] +\fB\-k\fR[\fIn\fR], \fB--kill\fR[\fB=\fIn\fR] Termine le .B wineserver actuellement exécuté en lui envoyant facultativement le signal \fIn\fR. Si -aucun signal n'est spécifié, un signal SIGINT est envoyé en premier, -puis un signal SIGKILL. L'instance de \fBwineserver\fR à arrêter -est déterminée par la variable d'environnement WINEPREFIX. +aucun signal n'est spécifié, un signal \fBSIGINT\fR est envoyé en premier, +puis un signal \fBSIGKILL\fR. L'instance de \fBwineserver\fR à arrêter +est déterminée par la variable d'environnement \fBWINEPREFIX\fR. .TP -\fB\-p\fI[n]\fR, \fB--persistent\fI[=n] +\fB\-p\fR[\fIn\fR], \fB--persistent\fR[\fB=\fIn\fR] Spécifie le délai de persistance de \fBwineserver\fR, c'est-à-dire le temps pendant lequel le serveur continuera à tourner après que tous les processus clients se sont terminés. Ceci évite le coût inhérent à l'arrêt @@ -56,9 +57,9 @@ Affiche les informations sur la version et se termine. Attend que le .B wineserver actuellement exécuté se termine. -.SH VARIABLES D'ENVIRONNEMENT +.SH ENVIRONNEMENT .TP -.I WINEPREFIX +.B WINEPREFIX Si définie, cette variable indique le nom du répertoire où .B wineserver stocke ses données (\fI$HOME/.wine\fR par défaut). Tous les processus @@ -68,11 +69,11 @@ utilisant le même (c'est-à-dire pour un même utilisateur) partagent certains éléments comme la base de registre, la mémoire partagée et les objets du noyau. En donnant à -.I WINEPREFIX +.B WINEPREFIX une valeur spécifique pour différents processus Wine, il est possible d'exécuter plusieurs sessions de Wine totalement indépendantes. .TP -.I WINESERVER +.B WINESERVER Spécifie le chemin et le nom de l'exécutable .B wineserver qui sera lancé automatiquement par \fBwine\fR. @@ -89,17 +90,16 @@ Répertoire contenant les données utilisateur gérées par .BI /tmp/.wine- uid Répertoire contenant le socket de serveur Unix et le fichier de verrouillage. Ces fichiers sont créés dans un sous-répertoire dont le nom est dérivé -des périphérique et numéros d'inodes du répertoire WINEPREFIX. +des périphérique et numéros d'inodes du répertoire \fBWINEPREFIX\fR. .SH AUTEURS L'auteur originel de .B wineserver est Alexandre Julliard. Beaucoup d'autres personnes ont contribué des nouvelles fonctionnalités -et des corrections de bogues. Référez-vous au fichier Changelog dans la distribution de Wine -pour les détails complets. -.SH BOGUES -Si vous détectez un bogue, veuillez le signaler (en anglais) sur le +et des corrections de bugs. Pour une liste complète, consultez l'historique git. +.SH BUGS +Les bugs peuvent être signalés (en anglais) sur le .UR http://bugs.winehq.org -.B système de suivi de bogues de Wine +.B système de suivi des problèmes de Wine .UE . .SH DISPONIBILITÉ .B wineserver @@ -108,4 +108,8 @@ fait partie de la distribution de Wine, disponible depuis WineHQ, le .B quartier général des développeurs de Wine .UE . .SH "VOIR AUSSI" -.BR wine (1). +.BR wine (1), +.br +.UR http://www.winehq.org/help +.B Documentation et support de Wine +.UE .

1 0