May 2012 - Wine-commits - list.winehq.org

Owen Rudge : user32: Return Unicode length instead of ANSI in GetUserObjectInformationA.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: fecde1ead8260ddb89b74c00b367721cccd76173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fecde1ead8260ddb89b74c00b… Author: Owen Rudge <owen(a)owenrudge.net> Date: Mon May 14 15:25:03 2012 +0100 user32: Return Unicode length instead of ANSI in GetUserObjectInformationA. --- dlls/user32/tests/winstation.c | 4 ++-- dlls/user32/winstation.c | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index bd042f2..23a4311 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -397,7 +397,7 @@ static void test_getuserobjectinformation(void) ok(!ret, "GetUserObjectInformationA returned %x", ret); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "LastError is set to %08x\n", GetLastError()); - todo_wine ok(size == 22, "size is set to %d\n", size); /* Windows returns Unicode length (11*2) */ + ok(size == 22, "size is set to %d\n", size); /* Windows returns Unicode length (11*2) */ /* Get string */ SetLastError(0xdeadbeef); @@ -439,7 +439,7 @@ static void test_getuserobjectinformation(void) ok(!ret, "GetUserObjectInformationA returned %x", ret); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "LastError is set to %08x\n", GetLastError()); - todo_wine ok(size == 16, "size is set to %d\n", size); /* Windows returns Unicode length (8*2) */ + ok(size == 16, "size is set to %d\n", size); /* Windows returns Unicode length (8*2) */ /* Get string */ SetLastError(0xdeadbeef); diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index 770245d..96b51179 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -477,13 +477,17 @@ BOOL WINAPI GetUserObjectInformationA( HANDLE handle, INT index, LPVOID info, DW if (index == UOI_TYPE || index == UOI_NAME) { WCHAR buffer[MAX_PATH]; - DWORD lenA; + DWORD lenA, lenW; - if (!GetUserObjectInformationW( handle, index, buffer, sizeof(buffer), NULL )) return FALSE; + if (!GetUserObjectInformationW( handle, index, buffer, sizeof(buffer), &lenW )) return FALSE; lenA = WideCharToMultiByte( CP_ACP, 0, buffer, -1, NULL, 0, NULL, NULL ); if (needed) *needed = lenA; if (lenA > len) { + /* If the buffer length supplied by the caller is insufficient, Windows returns a + 'needed' length based upon the Unicode byte length, so we should do similarly. */ + if (needed) *needed = lenW; + SetLastError( ERROR_INSUFFICIENT_BUFFER ); return FALSE; }

1 0

Dmitry Timoshkov : gdiplus: Create 'const' friendly internal entries for font APIs.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: 5e4d64d18ed02639d4fec534f5d9cf6f1425b9f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e4d64d18ed02639d4fec534f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat May 12 15:23:12 2012 +0900 gdiplus: Create 'const' friendly internal entries for font APIs. --- dlls/gdiplus/font.c | 102 +++++++++++++++++++++++++-------------- dlls/gdiplus/gdiplus_private.h | 2 + dlls/gdiplus/graphics.c | 5 +- dlls/gdiplus/graphicspath.c | 3 +- 4 files changed, 70 insertions(+), 42 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 4b059a0..70ddef6 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -116,6 +116,8 @@ typedef struct #define MS_OS2_TAG MS_MAKE_TAG('O','S','/','2') #define MS_HHEA_TAG MS_MAKE_TAG('h','h','e','a') +static GpStatus clone_font_family(const GpFontFamily *, GpFontFamily **); + static const REAL mm_per_inch = 25.4; static const REAL inch_per_point = 1.0/72.0; @@ -216,7 +218,7 @@ GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily, (*font)->emSize = emSize; (*font)->otm = otm; - stat = GdipCloneFontFamily((GpFontFamily *)fontFamily, &(*font)->family); + stat = clone_font_family(fontFamily, &(*font)->family); if (stat != Ok) { GdipFree(*font); @@ -355,6 +357,11 @@ GpStatus WINGDIPAPI GdipGetFamily(GpFont *font, GpFontFamily **family) return GdipCloneFontFamily(font->family, family); } +static REAL get_font_size(const GpFont *font) +{ + return font->emSize; +} + /****************************************************************************** * GdipGetFontSize [GDIPLUS.@] * @@ -377,12 +384,30 @@ GpStatus WINGDIPAPI GdipGetFontSize(GpFont *font, REAL *size) if (!(font && size)) return InvalidParameter; - *size = font->emSize; + *size = get_font_size(font); TRACE("%s,%d => %f\n", debugstr_w(font->family->FamilyName), font->otm.otmTextMetrics.tmHeight, *size); return Ok; } +static INT get_font_style(const GpFont *font) +{ + INT style; + + if (font->otm.otmTextMetrics.tmWeight > FW_REGULAR) + style = FontStyleBold; + else + style = FontStyleRegular; + if (font->otm.otmTextMetrics.tmItalic) + style |= FontStyleItalic; + if (font->otm.otmTextMetrics.tmUnderlined) + style |= FontStyleUnderline; + if (font->otm.otmTextMetrics.tmStruckOut) + style |= FontStyleStrikeout; + + return style; +} + /******************************************************************************* * GdipGetFontStyle [GDIPLUS.@] * @@ -403,16 +428,8 @@ GpStatus WINGDIPAPI GdipGetFontStyle(GpFont *font, INT *style) if (!(font && style)) return InvalidParameter; - if (font->otm.otmTextMetrics.tmWeight > FW_REGULAR) - *style = FontStyleBold; - else - *style = FontStyleRegular; - if (font->otm.otmTextMetrics.tmItalic) - *style |= FontStyleItalic; - if (font->otm.otmTextMetrics.tmUnderlined) - *style |= FontStyleUnderline; - if (font->otm.otmTextMetrics.tmStruckOut) - *style |= FontStyleStrikeout; + *style = get_font_style(font); + TRACE("%s,%d => %d\n", debugstr_w(font->family->FamilyName), font->otm.otmTextMetrics.tmHeight, *style); return Ok; } @@ -463,6 +480,25 @@ GpStatus WINGDIPAPI GdipGetLogFontA(GpFont *font, GpGraphics *graphics, return Ok; } +void get_log_fontW(const GpFont *font, GpGraphics *graphics, LOGFONTW *lf) +{ + /* FIXME: use graphics */ + lf->lfHeight = -font->otm.otmTextMetrics.tmAscent; + lf->lfWidth = 0; + lf->lfEscapement = 0; + lf->lfOrientation = 0; + lf->lfWeight = font->otm.otmTextMetrics.tmWeight; + lf->lfItalic = font->otm.otmTextMetrics.tmItalic ? 1 : 0; + lf->lfUnderline = font->otm.otmTextMetrics.tmUnderlined ? 1 : 0; + lf->lfStrikeOut = font->otm.otmTextMetrics.tmStruckOut ? 1 : 0; + lf->lfCharSet = font->otm.otmTextMetrics.tmCharSet; + lf->lfOutPrecision = OUT_DEFAULT_PRECIS; + lf->lfClipPrecision = CLIP_DEFAULT_PRECIS; + lf->lfQuality = DEFAULT_QUALITY; + lf->lfPitchAndFamily = 0; + strcpyW(lf->lfFaceName, font->family->FamilyName); +} + /******************************************************************************* * GdipGetLogFontW [GDIPLUS.@] */ @@ -471,25 +507,10 @@ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, { TRACE("(%p, %p, %p)\n", font, graphics, lfw); - /* FIXME: use graphics */ if(!font || !graphics || !lfw) return InvalidParameter; - lfw->lfHeight = -font->otm.otmTextMetrics.tmAscent; - lfw->lfWidth = 0; - lfw->lfEscapement = 0; - lfw->lfOrientation = 0; - lfw->lfWeight = font->otm.otmTextMetrics.tmWeight; - lfw->lfItalic = font->otm.otmTextMetrics.tmItalic ? 1 : 0; - lfw->lfUnderline = font->otm.otmTextMetrics.tmUnderlined ? 1 : 0; - lfw->lfStrikeOut = font->otm.otmTextMetrics.tmStruckOut ? 1 : 0; - lfw->lfCharSet = font->otm.otmTextMetrics.tmCharSet; - lfw->lfOutPrecision = OUT_DEFAULT_PRECIS; - lfw->lfClipPrecision = CLIP_DEFAULT_PRECIS; - lfw->lfQuality = DEFAULT_QUALITY; - lfw->lfPitchAndFamily = 0; - strcpyW(lfw->lfFaceName, font->family->FamilyName); - + get_log_fontW(font, graphics, lfw); TRACE("=> %s,%d\n", debugstr_w(lfw->lfFaceName), lfw->lfHeight); return Ok; @@ -576,10 +597,8 @@ GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont *font, REAL dpi, TRACE("%p (%s), %f, %p\n", font, debugstr_w(font->family->FamilyName), dpi, height); - stat = GdipGetFontSize((GpFont *)font, &font_size); - if (stat != Ok) return stat; - stat = GdipGetFontStyle((GpFont *)font, &style); - if (stat != Ok) return stat; + font_size = get_font_size(font); + style = get_font_style(font); stat = GdipGetLineSpacing(font->family, style, &line_spacing); if (stat != Ok) return stat; stat = GdipGetEmHeight(font->family, style, &em_height); @@ -764,6 +783,16 @@ GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR *name, return Ok; } +static GpStatus clone_font_family(const GpFontFamily *family, GpFontFamily **clone) +{ + *clone = GdipAlloc(sizeof(GpFontFamily)); + if (!*clone) return OutOfMemory; + + **clone = *family; + + return Ok; +} + /******************************************************************************* * GdipCloneFontFamily [GDIPLUS.@] * @@ -778,16 +807,15 @@ GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR *name, */ GpStatus WINGDIPAPI GdipCloneFontFamily(GpFontFamily* FontFamily, GpFontFamily** clonedFontFamily) { + GpStatus status; + if (!(FontFamily && clonedFontFamily)) return InvalidParameter; TRACE("%p (%s), %p\n", FontFamily, debugstr_w(FontFamily->FamilyName), clonedFontFamily); - *clonedFontFamily = GdipAlloc(sizeof(GpFontFamily)); - if (!*clonedFontFamily) return OutOfMemory; - - **clonedFontFamily = *FontFamily; - lstrcpyW((*clonedFontFamily)->FamilyName, FontFamily->FamilyName); + status = clone_font_family(FontFamily, clonedFontFamily); + if (status != Ok) return status; TRACE("<-- %p\n", *clonedFontFamily); diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 1adfe09..df66903 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -436,4 +436,6 @@ GpStatus gdip_format_string(HDC hdc, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, gdip_format_string_callback callback, void *user_data) DECLSPEC_HIDDEN; +void get_log_fontW(const GpFont *, GpGraphics *, LOGFONTW *) DECLSPEC_HIDDEN; + #endif diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 38335a8..e352e42 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2136,7 +2136,7 @@ void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, HFONT *hfont) rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); - GdipGetLogFontW((GpFont *)font, graphics, &lfw); + get_log_fontW(font, graphics, &lfw); lfw.lfHeight = roundr(lfw.lfHeight * rel_height); unscaled_font = CreateFontIndirectW(&lfw); @@ -4931,8 +4931,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, if (regionCount < stringFormat->range_count) return InvalidParameter; - stat = GdipGetLogFontW((GpFont *)font, graphics, &lfw); - if (stat != Ok) return stat; + get_log_fontW(font, graphics, &lfw); if(!graphics->hdc) { diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 5da53b2..25cf6be 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -957,8 +957,7 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT if (status != Ok) return status; - status = GdipGetLogFontW((GpFont *)font, NULL, &lfw); - if (status != Ok) return status; + get_log_fontW(font, NULL, &lfw); hfont = CreateFontIndirectW(&lfw); if (!hfont) {

1 0

Józef Kucia : d3dx9: Add missing pixel formats.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: 42dd957c508fb33c6bd796696b547c4b1dd4c5b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42dd957c508fb33c6bd796696… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun May 13 23:00:03 2012 +0200 d3dx9: Add missing pixel formats. --- dlls/d3dx9_36/surface.c | 23 ++++++++++++++++++++--- dlls/d3dx9_36/tests/surface.c | 4 ++++ dlls/d3dx9_36/util.c | 1 + 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 43b58e3..7556ead 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -104,6 +104,7 @@ static const GUID *d3dformat_to_wic_guid(D3DFORMAT format) #define DDS_PF_RGB 0x40 #define DDS_PF_YUV 0x200 #define DDS_PF_LUMINANCE 0x20000 +#define DDS_PF_BUMPDUDV 0x80000 struct dds_pixel_format { @@ -217,6 +218,8 @@ static D3DFORMAT dds_luminance_to_d3dformat(const struct dds_pixel_format *pixel } if (pixel_format->bpp == 16) { + if (pixel_format->rmask == 0xffff) + return D3DFMT_L16; if ((pixel_format->flags & DDS_PF_ALPHA) && pixel_format->rmask == 0x00ff && pixel_format->amask == 0xff00) return D3DFMT_A8L8; } @@ -235,6 +238,18 @@ static D3DFORMAT dds_alpha_to_d3dformat(const struct dds_pixel_format *pixel_for return D3DFMT_UNKNOWN; } +static D3DFORMAT dds_bump_to_d3dformat(const struct dds_pixel_format *pixel_format) +{ + if (pixel_format->bpp == 16 && pixel_format->rmask == 0x00ff && pixel_format->gmask == 0xff00) + return D3DFMT_V8U8; + 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, + pixel_format->rmask, pixel_format->gmask, pixel_format->bmask, pixel_format->amask); + return D3DFMT_UNKNOWN; +} + static D3DFORMAT dds_pixel_format_to_d3dformat(const struct dds_pixel_format *pixel_format) { if (pixel_format->flags & DDS_PF_FOURCC) @@ -245,10 +260,12 @@ static D3DFORMAT dds_pixel_format_to_d3dformat(const struct dds_pixel_format *pi return dds_luminance_to_d3dformat(pixel_format); if (pixel_format->flags & DDS_PF_ALPHA_ONLY) return dds_alpha_to_d3dformat(pixel_format); + if (pixel_format->flags & DDS_PF_BUMPDUDV) + return dds_bump_to_d3dformat(pixel_format); - WARN("Unknown pixel format (fourcc %#x, bpp %#x, r %#x, g %#x, b %#x, a %#x)\n", - pixel_format->fourcc, pixel_format->bpp, pixel_format->rmask, pixel_format->gmask, - pixel_format->bmask, pixel_format->amask); + WARN("Unknown pixel format (flags %#x, fourcc %#x, bpp %#x, 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; } diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 40308e8..3d8ad24 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -150,6 +150,7 @@ static HRESULT create_file(const char *filename, const unsigned char *data, cons #define DDS_PF_FOURCC 0x00000004 #define DDS_PF_RGB 0x00000040 #define DDS_PF_LUMINANCE 0x00020000 +#define DDS_PF_BUMPDUDV 0x00080000 static void check_dds_pixel_format(DWORD flags, DWORD fourcc, DWORD bpp, DWORD rmask, DWORD gmask, DWORD bmask, DWORD amask, @@ -397,8 +398,11 @@ static void test_D3DXGetImageInfo(void) check_dds_pixel_format(DDS_PF_RGB, 0, 32, 0xff0000, 0x00ff00, 0x0000ff, 0, D3DFMT_X8R8G8B8); check_dds_pixel_format(DDS_PF_RGB, 0, 32, 0x0000ffff, 0xffff0000, 0, 0, D3DFMT_G16R16); check_dds_pixel_format(DDS_PF_LUMINANCE, 0, 8, 0xff, 0, 0, 0, D3DFMT_L8); + check_dds_pixel_format(DDS_PF_LUMINANCE, 0, 16, 0xffff, 0, 0, 0, D3DFMT_L16); check_dds_pixel_format(DDS_PF_LUMINANCE | DDS_PF_ALPHA, 0, 16, 0x00ff, 0, 0, 0xff00, D3DFMT_A8L8); check_dds_pixel_format(DDS_PF_LUMINANCE | DDS_PF_ALPHA, 0, 8, 0x0f, 0, 0, 0xf0, D3DFMT_A4L4); + check_dds_pixel_format(DDS_PF_BUMPDUDV, 0, 16, 0x00ff, 0xff00, 0, 0, D3DFMT_V8U8); + check_dds_pixel_format(DDS_PF_BUMPDUDV, 0, 32, 0x0000ffff, 0xffff0000, 0, 0, D3DFMT_V16U16); todo_wine { hr = D3DXGetImageInfoFromFileInMemory(dds_16bit, sizeof(dds_16bit) - 1, &info); diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 4dbf44c..ad8a6ea 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -62,6 +62,7 @@ static const PixelFormatDesc formats[] = {D3DFMT_G16R16, {0, 16, 16, 0}, { 0, 0, 16, 0}, 4, 1, 1, 4, FORMAT_ARGB, NULL, NULL }, {D3DFMT_A8, {8, 0, 0, 0}, { 0, 0, 0, 0}, 1, 1, 1, 1, FORMAT_ARGB, NULL, NULL }, {D3DFMT_A8L8, {8, 8, 0, 0}, { 8, 0, 0, 0}, 2, 1, 1, 2, FORMAT_ARGB, la_from_rgba, la_to_rgba}, + {D3DFMT_A4L4, {4, 4, 0, 0}, { 4, 0, 0, 0}, 1, 1, 1, 1, FORMAT_ARGB, la_from_rgba, la_to_rgba}, {D3DFMT_DXT1, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 8, FORMAT_ARGB, NULL, NULL }, {D3DFMT_DXT2, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_ARGB, NULL, NULL }, {D3DFMT_DXT3, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_ARGB, NULL, NULL },

1 0

Józef Kucia : d3dx9: Check the size of a DDS file in D3DXGetImageInfoFromFileInMemory.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: e91300a31859dd6bff624d16844d82b1e64553e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e91300a31859dd6bff624d168… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun May 13 23:00:04 2012 +0200 d3dx9: Check the size of a DDS file in D3DXGetImageInfoFromFileInMemory. --- dlls/d3dx9_36/surface.c | 53 ++++++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/tests/surface.c | 15 ++++++++--- 2 files changed, 63 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 7556ead..337b513 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -269,6 +269,29 @@ static D3DFORMAT dds_pixel_format_to_d3dformat(const struct dds_pixel_format *pi return D3DFMT_UNKNOWN; } +static HRESULT calculate_dds_surface_size(const D3DXIMAGE_INFO *img_info, + UINT width, UINT height, UINT *pitch, UINT *size) +{ + const PixelFormatDesc *format_desc = get_format_info(img_info->Format); + if (format_desc->format == D3DFMT_UNKNOWN) + return E_NOTIMPL; + + if (format_desc->block_width != 1 || format_desc->block_height != 1) + { + *pitch = format_desc->block_byte_count + * max(1, (width + format_desc->block_width - 1) / format_desc->block_width); + *size = *pitch + * max(1, (height + format_desc->block_height - 1) / format_desc->block_height); + } + else + { + *pitch = width * format_desc->bytes_per_pixel; + *size = *pitch * height; + } + + return D3D_OK; +} + /************************************************************ * get_image_info_from_dds * @@ -285,9 +308,13 @@ static D3DFORMAT dds_pixel_format_to_d3dformat(const struct dds_pixel_format *pi * Failure: D3DXERR_INVALIDDATA * */ -static HRESULT get_image_info_from_dds(const void *buffer, DWORD length, D3DXIMAGE_INFO *info) +static HRESULT get_image_info_from_dds(const void *buffer, UINT length, D3DXIMAGE_INFO *info) { + UINT i; + UINT faces = 0; + UINT width, height; const struct dds_header *header = buffer; + UINT expected_length = 0; if (length < sizeof(*header) || !info) return D3DXERR_INVALIDDATA; @@ -311,13 +338,37 @@ static HRESULT get_image_info_from_dds(const void *buffer, DWORD length, D3DXIMA } else if (header->caps2 & DDS_CAPS2_CUBEMAP) { + DWORD face; + for (face = DDS_CAPS2_CUBEMAP_POSITIVEX; face <= DDS_CAPS2_CUBEMAP_NEGATIVEZ; face <<= 1) + { + if (header->caps2 & face) + faces++; + } info->ResourceType = D3DRTYPE_CUBETEXTURE; } else { + faces = 1; info->ResourceType = D3DRTYPE_TEXTURE; } + /* calculate the expected length */ + width = info->Width; + height = info->Height; + for (i = 0; i < info->MipLevels; i++) + { + UINT pitch, size = 0; + calculate_dds_surface_size(info, width, height, &pitch, &size); + expected_length += size; + width = max(1, width / 2); + height = max(1, width / 2); + } + + expected_length *= faces; + expected_length += sizeof(*header); + if (length < expected_length) + return D3DXERR_INVALIDDATA; + info->ImageFileFormat = D3DXIFF_DDS; return D3D_OK; diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 3d8ad24..48b1c57 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -404,10 +404,17 @@ static void test_D3DXGetImageInfo(void) check_dds_pixel_format(DDS_PF_BUMPDUDV, 0, 16, 0x00ff, 0xff00, 0, 0, D3DFMT_V8U8); check_dds_pixel_format(DDS_PF_BUMPDUDV, 0, 32, 0x0000ffff, 0xffff0000, 0, 0, D3DFMT_V16U16); - todo_wine { - hr = D3DXGetImageInfoFromFileInMemory(dds_16bit, sizeof(dds_16bit) - 1, &info); - ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); - } + hr = D3DXGetImageInfoFromFileInMemory(dds_16bit, sizeof(dds_16bit) - 1, &info); + ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); + + hr = D3DXGetImageInfoFromFileInMemory(dds_24bit, sizeof(dds_24bit) - 1, &info); + ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); + + hr = D3DXGetImageInfoFromFileInMemory(dds_cube_map, sizeof(dds_cube_map) - 1, &info); + ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); + + hr = D3DXGetImageInfoFromFileInMemory(dds_volume_map, sizeof(dds_volume_map) - 1, &info); + todo_wine ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); /* cleanup */

1 0

Francois Gouget : dplayx: Use a proper plural for the repliesExpected field name.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: 2539004fe11256cc4368d53439a79fc6a0c1f93b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2539004fe11256cc4368d5343… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 14 01:02:59 2012 +0200 dplayx: Use a proper plural for the repliesExpected field name. --- dlls/dplayx/dplay.c | 2 +- dlls/dplayx/dplay_global.h | 4 ++-- dlls/dplayx/dplayx_messages.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 87eb185..1bcb386 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -278,7 +278,7 @@ static BOOL DP_CreateDirectPlay2( LPVOID lpDP ) DPQ_INIT(This->dp2->receiveMsgs); DPQ_INIT(This->dp2->sendMsgs); - DPQ_INIT(This->dp2->replysExpected); + DPQ_INIT(This->dp2->repliesExpected); if( !NS_InitializeSessionCache( &This->dp2->lpNameServerData ) ) { diff --git a/dlls/dplayx/dplay_global.h b/dlls/dplayx/dplay_global.h index 2a12389..273f09e 100644 --- a/dlls/dplayx/dplay_global.h +++ b/dlls/dplayx/dplay_global.h @@ -67,7 +67,7 @@ typedef struct tagDP_MSG_REPLY_STRUCT typedef struct tagDP_MSG_REPLY_STRUCT_LIST { - DPQ_ENTRY(tagDP_MSG_REPLY_STRUCT_LIST) replysExpected; + DPQ_ENTRY(tagDP_MSG_REPLY_STRUCT_LIST) repliesExpected; DP_MSG_REPLY_STRUCT replyExpected; } DP_MSG_REPLY_STRUCT_LIST, *LPDP_MSG_REPLY_STRUCT_LIST; @@ -193,7 +193,7 @@ typedef struct tagDirectPlay2Data enum SPSTATE connectionInitialized; /* Expected messages queue */ - DPQ_HEAD( tagDP_MSG_REPLY_STRUCT_LIST ) replysExpected; + DPQ_HEAD( tagDP_MSG_REPLY_STRUCT_LIST ) repliesExpected; } DirectPlay2Data; typedef struct tagDirectPlay3Data diff --git a/dlls/dplayx/dplayx_messages.c b/dlls/dplayx/dplayx_messages.c index 8b9320d..bc888f6 100644 --- a/dlls/dplayx/dplayx_messages.c +++ b/dlls/dplayx/dplayx_messages.c @@ -172,7 +172,7 @@ HANDLE DP_MSG_BuildAndLinkReplyStruct( IDirectPlay2Impl* This, /* Insert into the message queue while locked */ EnterCriticalSection( &This->unk->DP_lock ); - DPQ_INSERT( This->dp2->replysExpected, lpReplyStructList, replysExpected ); + DPQ_INSERT( This->dp2->repliesExpected, lpReplyStructList, repliesExpected ); LeaveCriticalSection( &This->unk->DP_lock ); return lpReplyStructList->replyExpected.hReceipt; @@ -433,7 +433,7 @@ void DP_MSG_ReplyReceived( IDirectPlay2AImpl* This, WORD wCommandId, * avoid problems. */ EnterCriticalSection( &This->unk->DP_lock ); - DPQ_REMOVE_ENTRY( This->dp2->replysExpected, replysExpected, replyExpected.wExpectedReply, + DPQ_REMOVE_ENTRY( This->dp2->repliesExpected, repliesExpected, replyExpected.wExpectedReply, ==, wCommandId, lpReplyList ); LeaveCriticalSection( &This->unk->DP_lock );

1 0

Francois Gouget : dplayx: Fix the spelling of the BuildParentalHierarchy field name and type.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: d33891784fc986a307414f7ee4c8c8e08f92190a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d33891784fc986a307414f7ee… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 14 01:03:25 2012 +0200 dplayx: Fix the spelling of the BuildParentalHierarchy field name and type. --- dlls/dplayx/lobbysp.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dplayx/lobbysp.h b/dlls/dplayx/lobbysp.h index b73e65f..f20c8e9 100644 --- a/dlls/dplayx/lobbysp.h +++ b/dlls/dplayx/lobbysp.h @@ -70,14 +70,14 @@ typedef struct SPDATA_ADDREMOTEPLAYERTOGROUP LPDPNAME lpName; } SPDATA_ADDREMOTEPLAYERTOGROUP, *LPSPDATA_ADDREMOTEPLAYERTOGROUP; -typedef struct SPDATA_BUILDPARENTALHEIRARCHY +typedef struct SPDATA_BUILDPARENTALHIERARCHY { DWORD dwSize; LPDPLOBBYSP lpISP; DWORD dwGroupID; DWORD dwMessage; DWORD dwParentID; -} SPDATA_BUILDPARENTALHEIRARCHY, *LPSPDATA_BUILDPARENTALHEIRARCHY; +} SPDATA_BUILDPARENTALHIERARCHY, *LPSPDATA_BUILDPARENTALHIERARCHY; typedef struct SPDATA_CLOSE { @@ -388,7 +388,7 @@ typedef struct SPDATA_STARTSESSIONCOMMAND /* Prototypes for callbacks returned by DPLSPInit */ typedef HRESULT (WINAPI *LPSP_ADDGROUPTOGROUP)(LPSPDATA_ADDGROUPTOGROUP); typedef HRESULT (WINAPI *LPSP_ADDPLAYERTOGROUP)(LPSPDATA_ADDPLAYERTOGROUP); -typedef HRESULT (WINAPI *LPSP_BUILDPARENTALHEIRARCHY)(LPSPDATA_BUILDPARENTALHEIRARCHY); +typedef HRESULT (WINAPI *LPSP_BUILDPARENTALHIERARCHY)(LPSPDATA_BUILDPARENTALHIERARCHY); typedef HRESULT (WINAPI *LPSP_CLOSE)(LPSPDATA_CLOSE); typedef HRESULT (WINAPI *LPSP_CREATEGROUP)(LPSPDATA_CREATEGROUP); typedef HRESULT (WINAPI *LPSP_CREATEGROUPINGROUP)(LPSPDATA_CREATEGROUPINGROUP); @@ -422,7 +422,7 @@ typedef struct SP_CALLBACKS DWORD dwFlags; LPSP_ADDGROUPTOGROUP AddGroupToGroup; LPSP_ADDPLAYERTOGROUP AddPlayerToGroup; - LPSP_BUILDPARENTALHEIRARCHY BuildParentalHeirarchy; + LPSP_BUILDPARENTALHIERARCHY BuildParentalHierarchy; LPSP_CLOSE Close; LPSP_CREATEGROUP CreateGroup; LPSP_CREATEGROUPINGROUP CreateGroupInGroup;

1 0

Francois Gouget : hlink: Fix the spelling of the Hlink::SetAdditionalParams () implementation.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: fde4e8f92ed56221d806ffc56369ba3c6ec8f357 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fde4e8f92ed56221d806ffc56… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 14 01:05:07 2012 +0200 hlink: Fix the spelling of the Hlink::SetAdditionalParams() implementation. --- dlls/hlink/link.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 2ea4e2c..72e792b 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -528,7 +528,7 @@ static HRESULT WINAPI IHlink_fnNavigate(IHlink* iface, DWORD grfHLNF, LPBC pbc, return r; } -static HRESULT WINAPI IHlink_fnSetAdditonalParams(IHlink* iface, +static HRESULT WINAPI IHlink_fnSetAdditionalParams(IHlink* iface, LPCWSTR pwzAdditionalParams) { TRACE("Not implemented in native IHlink\n"); @@ -559,7 +559,7 @@ static const IHlinkVtbl hlvt = IHlink_fnGetTargetFrameName, IHlink_fnGetMiscStatus, IHlink_fnNavigate, - IHlink_fnSetAdditonalParams, + IHlink_fnSetAdditionalParams, IHlink_fnGetAdditionalParams };

1 0

Francois Gouget : jscript/tests: Fix the spelling of the testEmbeddedFunctions() function name.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: 22fe702f7ab0d6b42a4feeb3fc7e3bec83f24a28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22fe702f7ab0d6b42a4feeb3f… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 14 01:05:24 2012 +0200 jscript/tests: Fix the spelling of the testEmbeddedFunctions() function name. --- dlls/jscript/tests/lang.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 4d2efa3..308e0c9 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1215,7 +1215,7 @@ ok(tmp === 5, "testFunc4(1) = " + tmp); tmp = function testFunc4(x) { return x+4; }; ok(testFunc4 === 1, "testFunc4 = " + testFunc4); -function testEmbededFunctions() { +function testEmbeddedFunctions() { ok(typeof(testFunc5) === "function", "typeof(testFunc5) = " + typeof(testFunc5)); tmp = testFunc5(1); ok(tmp === 3, "testFunc5(1) = " + tmp); @@ -1231,7 +1231,7 @@ function testEmbededFunctions() { ok(testFunc6 === 1, "testFunc4 = " + testFunc6); } -testEmbededFunctions(); +testEmbeddedFunctions(); date = new Date(); date.toString = function() { return "toString"; }

1 0

Francois Gouget : urlmon: Fix the spelling of the destroy_uri_obj() function.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: a188587aee7ab173636086510750cf27219bff92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a188587aee7ab173636086510… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 14 01:05:38 2012 +0200 urlmon: Fix the spelling of the destroy_uri_obj() function. --- dlls/urlmon/uri.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 3d6bf8b..20e0582 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4196,7 +4196,7 @@ static inline Uri* impl_from_IUri(IUri *iface) return CONTAINING_RECORD(iface, Uri, IUri_iface); } -static inline void destory_uri_obj(Uri *This) +static inline void destroy_uri_obj(Uri *This) { SysFreeString(This->raw_uri); heap_free(This->canon_uri); @@ -4254,7 +4254,7 @@ static ULONG WINAPI Uri_Release(IUri *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) - destory_uri_obj(This); + destroy_uri_obj(This); return ref; }

1 0

Christian Costa : dmusic: COM cleanup of IReferenceClock.
by Alexandre Julliard 14 May '12

14 May '12

Module: wine Branch: master Commit: 540ae18f69e9cd5d5be74a1c839319982a5bb0ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=540ae18f69e9cd5d5be74a1c8… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon May 14 08:06:22 2012 +0200 dmusic: COM cleanup of IReferenceClock. --- dlls/dmusic/clock.c | 74 +++++++++++++++++++++++++++--------------- dlls/dmusic/dmusic_private.h | 12 +++--- 2 files changed, 54 insertions(+), 32 deletions(-) diff --git a/dlls/dmusic/clock.c b/dlls/dmusic/clock.c index c54992c..4d9a1b4 100644 --- a/dlls/dmusic/clock.c +++ b/dlls/dmusic/clock.c @@ -1,4 +1,5 @@ -/* IReferenceClock Implementation +/* + * IReferenceClock Implementation * * Copyright (C) 2003-2004 Rok Mandeljc * @@ -21,9 +22,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic); +static inline IReferenceClockImpl *impl_from_IReferenceClock(IReferenceClock *iface) +{ + return CONTAINING_RECORD(iface, IReferenceClockImpl, IReferenceClock_iface); +} + /* IReferenceClockImpl IUnknown part: */ -static HRESULT WINAPI IReferenceClockImpl_QueryInterface (IReferenceClock *iface, REFIID riid, LPVOID *ppobj) { - IReferenceClockImpl *This = (IReferenceClockImpl *)iface; +static HRESULT WINAPI IReferenceClockImpl_QueryInterface(IReferenceClock *iface, REFIID riid, LPVOID *ppobj) +{ + IReferenceClockImpl *This = impl_from_IReferenceClock(iface); TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown) || @@ -36,8 +43,9 @@ static HRESULT WINAPI IReferenceClockImpl_QueryInterface (IReferenceClock *iface return E_NOINTERFACE; } -static ULONG WINAPI IReferenceClockImpl_AddRef (IReferenceClock *iface) { - IReferenceClockImpl *This = (IReferenceClockImpl *)iface; +static ULONG WINAPI IReferenceClockImpl_AddRef(IReferenceClock *iface) +{ + IReferenceClockImpl *This = impl_from_IReferenceClock(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); @@ -47,8 +55,9 @@ static ULONG WINAPI IReferenceClockImpl_AddRef (IReferenceClock *iface) { return refCount; } -static ULONG WINAPI IReferenceClockImpl_Release (IReferenceClock *iface) { - IReferenceClockImpl *This = (IReferenceClockImpl *)iface; +static ULONG WINAPI IReferenceClockImpl_Release(IReferenceClock *iface) +{ + IReferenceClockImpl *This = impl_from_IReferenceClock(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); @@ -63,29 +72,42 @@ static ULONG WINAPI IReferenceClockImpl_Release (IReferenceClock *iface) { } /* IReferenceClockImpl IReferenceClock part: */ -static HRESULT WINAPI IReferenceClockImpl_GetTime (IReferenceClock *iface, REFERENCE_TIME* pTime) { - IReferenceClockImpl *This = (IReferenceClockImpl *)iface; - TRACE("(%p, %p)\n", This, pTime); - *pTime = This->rtTime; - return S_OK; +static HRESULT WINAPI IReferenceClockImpl_GetTime(IReferenceClock *iface, REFERENCE_TIME* pTime) +{ + IReferenceClockImpl *This = impl_from_IReferenceClock(iface); + + TRACE("(%p)->(%p)\n", This, pTime); + + *pTime = This->rtTime; + + return S_OK; } -static HRESULT WINAPI IReferenceClockImpl_AdviseTime (IReferenceClock *iface, REFERENCE_TIME baseTime, REFERENCE_TIME streamTime, HANDLE hEvent, DWORD* pdwAdviseCookie) { - IReferenceClockImpl *This = (IReferenceClockImpl *)iface; - FIXME("(%p, 0x%s, 0x%s, %p, %p): stub\n", This, wine_dbgstr_longlong(baseTime), wine_dbgstr_longlong(streamTime), hEvent, pdwAdviseCookie); - return S_OK; +static HRESULT WINAPI IReferenceClockImpl_AdviseTime(IReferenceClock *iface, REFERENCE_TIME baseTime, REFERENCE_TIME streamTime, HANDLE hEvent, DWORD* pdwAdviseCookie) +{ + IReferenceClockImpl *This = impl_from_IReferenceClock(iface); + + FIXME("(%p)->(0x%s, 0x%s, %p, %p): stub\n", This, wine_dbgstr_longlong(baseTime), wine_dbgstr_longlong(streamTime), hEvent, pdwAdviseCookie); + + return S_OK; } -static HRESULT WINAPI IReferenceClockImpl_AdvisePeriodic (IReferenceClock *iface, REFERENCE_TIME startTime, REFERENCE_TIME periodTime, HANDLE hSemaphore, DWORD* pdwAdviseCookie) { - IReferenceClockImpl *This = (IReferenceClockImpl *)iface; - FIXME("(%p, 0x%s, 0x%s, %p, %p): stub\n", This, wine_dbgstr_longlong(startTime), wine_dbgstr_longlong(periodTime), hSemaphore, pdwAdviseCookie); - return S_OK; +static HRESULT WINAPI IReferenceClockImpl_AdvisePeriodic(IReferenceClock *iface, REFERENCE_TIME startTime, REFERENCE_TIME periodTime, HANDLE hSemaphore, DWORD* pdwAdviseCookie) +{ + IReferenceClockImpl *This = impl_from_IReferenceClock(iface); + + FIXME("(%p)->(0x%s, 0x%s, %p, %p): stub\n", This, wine_dbgstr_longlong(startTime), wine_dbgstr_longlong(periodTime), hSemaphore, pdwAdviseCookie); + + return S_OK; } -static HRESULT WINAPI IReferenceClockImpl_Unadvise (IReferenceClock *iface, DWORD dwAdviseCookie) { - IReferenceClockImpl *This = (IReferenceClockImpl *)iface; - FIXME("(%p, %d): stub\n", This, dwAdviseCookie); - return S_OK; +static HRESULT WINAPI IReferenceClockImpl_Unadvise(IReferenceClock *iface, DWORD dwAdviseCookie) +{ + IReferenceClockImpl *This = impl_from_IReferenceClock(iface); + + FIXME("(%p)->(%d): stub\n", This, dwAdviseCookie); + + return S_OK; } static const IReferenceClockVtbl ReferenceClock_Vtbl = { @@ -111,8 +133,8 @@ HRESULT DMUSIC_CreateReferenceClockImpl(LPCGUID riid, LPVOID* ret_iface, LPUNKNO return E_OUTOFMEMORY; } - clock->lpVtbl = &ReferenceClock_Vtbl; - clock->ref = 0; /* will be inited by QueryInterface */ + clock->IReferenceClock_iface.lpVtbl = &ReferenceClock_Vtbl; + clock->ref = 0; /* Will be inited by QueryInterface */ clock->rtTime = 0; clock->pClockInfo.dwSize = sizeof (DMUS_CLOCKINFO); diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 4f2247e..3cfffba 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -166,13 +166,13 @@ extern HRESULT DMUSIC_CreateDirectMusicPortImpl (LPCGUID lpcGUID, LPVOID *ppobj, * IReferenceClockImpl implementation structure */ struct IReferenceClockImpl { - /* IUnknown fields */ - const IReferenceClockVtbl *lpVtbl; - LONG ref; + /* IUnknown fields */ + IReferenceClock IReferenceClock_iface; + LONG ref; - /* IReferenceClockImpl fields */ - REFERENCE_TIME rtTime; - DMUS_CLOCKINFO pClockInfo; + /* IReferenceClockImpl fields */ + REFERENCE_TIME rtTime; + DMUS_CLOCKINFO pClockInfo; }; typedef struct _DMUS_PRIVATE_INSTRUMENT_ENTRY {

1 0