December 2013 - Wine-commits

Henri Verbeet : wined3d: Fix the source swizzle for WINED3DSIH_EXPP.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: c8852c3ee337a7ed22a51105dc4c466ca2c8e0b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8852c3ee337a7ed22a51105d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 11 14:32:07 2013 +0100 wined3d: Fix the source swizzle for WINED3DSIH_EXPP. --- dlls/d3d8/tests/visual.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 66bf241..f7afd74 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -1781,7 +1781,7 @@ static void test_scalar_instructions(IDirect3DDevice8 *device) {"rcp_test", rcp_test, D3DCOLOR_ARGB(0x00, 0x80, 0x80, 0x80), FALSE}, {"rsq_test", rsq_test, D3DCOLOR_ARGB(0x00, 0xb4, 0xb4, 0xb4), FALSE}, {"exp_test", exp_test, D3DCOLOR_ARGB(0x00, 0x40, 0x40, 0x40), FALSE}, - {"expp_test", expp_test, D3DCOLOR_ARGB(0x00, 0x40, 0x40, 0x40), TRUE}, + {"expp_test", expp_test, D3DCOLOR_ARGB(0x00, 0x40, 0x40, 0x40), FALSE}, {"log_test", log_test, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0xff), TRUE}, {"logp_test", logp_test, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0xff), TRUE}, }; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f4d6499..f778217 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2719,7 +2719,7 @@ static void shader_glsl_expp(const struct wined3d_shader_instruction *ins) { struct glsl_src_param src_param; - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src_param); + shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &src_param); if (ins->ctx->reg_maps->shader_version.major < 2) {

1 0

Huw Davies : wbemprox: Add a partial implementation of Win32_PhysicalMedia.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: 710e3bc5ec813ff76809c9446f8dddee3264fad5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=710e3bc5ec813ff76809c9446… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 11 13:36:34 2013 +0000 wbemprox: Add a partial implementation of Win32_PhysicalMedia. --- dlls/wbemprox/builtin.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 4efb17b..2db27c0 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -73,6 +73,8 @@ static const WCHAR class_osW[] = {'W','i','n','3','2','_','O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; static const WCHAR class_paramsW[] = {'_','_','P','A','R','A','M','E','T','E','R','S',0}; +static const WCHAR class_physicalmediaW[] = + {'W','i','n','3','2','_','P','h','y','s','i','c','a','l','M','e','d','i','a',0}; static const WCHAR class_qualifiersW[] = {'_','_','Q','U','A','L','I','F','I','E','R','S',0}; static const WCHAR class_process_getowner_outW[] = @@ -382,6 +384,10 @@ static const struct column col_param[] = { prop_varianttypeW, CIM_UINT32 }, { prop_defaultvalueW, CIM_UINT32 } }; +static const struct column col_physicalmedia[] = +{ + { prop_serialnumberW, CIM_STRING } +}; static const struct column col_process[] = { { prop_captionW, CIM_STRING|COL_FLAG_DYNAMIC }, @@ -647,6 +653,10 @@ struct record_param UINT32 varianttype; UINT32 defaultvalue; }; +struct record_physicalmedia +{ + const WCHAR *serialnumber; +}; struct record_process { const WCHAR *caption; @@ -767,6 +777,10 @@ static const struct record_param data_param[] = #define FLAVOR_ID (WBEM_FLAVOR_FLAG_PROPAGATE_TO_INSTANCE | WBEM_FLAVOR_NOT_OVERRIDABLE |\ WBEM_FLAVOR_ORIGIN_PROPAGATED) +static const struct record_physicalmedia data_physicalmedia[] = +{ + { diskdrive_serialW } +}; static const struct record_qualifier data_qualifier[] = { { class_process_getowner_outW, param_userW, CIM_SINT32, FLAVOR_ID, prop_idW, 0 }, @@ -2195,6 +2209,7 @@ static struct table builtin_classes[] = fill_networkadapterconfig }, { class_osW, SIZEOF(col_os), col_os, 0, 0, NULL, fill_os }, { class_paramsW, SIZEOF(col_param), col_param, SIZEOF(data_param), 0, (BYTE *)data_param }, + { class_physicalmediaW, SIZEOF(col_physicalmedia), col_physicalmedia, SIZEOF(data_physicalmedia), 0, (BYTE *)data_physicalmedia }, { class_processW, SIZEOF(col_process), col_process, 0, 0, NULL, fill_process }, { class_processorW, SIZEOF(col_processor), col_processor, 0, 0, NULL, fill_processor }, { class_qualifiersW, SIZEOF(col_qualifier), col_qualifier, SIZEOF(data_qualifier), 0, (BYTE *)data_qualifier },

1 0

Austin English : dinput: Consistently use GetCurrentTime().
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: bfafb1ffc5a102966025b5b9f3acb81fea5435d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfafb1ffc5a102966025b5b9f… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 10 16:45:28 2013 -0800 dinput: Consistently use GetCurrentTime(). --- dlls/dinput/joystick_linux.c | 3 +-- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/keyboard.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 669db42..ce04986 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -689,8 +689,7 @@ static void joy_polldev(LPDIRECTINPUTDEVICE8A iface) } } if (inst_id >= 0) - queue_event(iface, inst_id, - value, jse.time, This->generic.base.dinput->evsequence++); + queue_event(iface, inst_id, value, GetCurrentTime(), This->generic.base.dinput->evsequence++); } } diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 951690d..3bf922f 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -873,7 +873,7 @@ static void joy_polldev(LPDIRECTINPUTDEVICE8A iface) } if (inst_id >= 0) queue_event(iface, inst_id, - value, ie.time.tv_usec, This->generic.base.dinput->evsequence++); + value, GetCurrentTime(), This->generic.base.dinput->evsequence++); } } diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index e8e7515..a5967d7 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -126,7 +126,7 @@ static int KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM EnterCriticalSection(&This->base.crit); queue_event(iface, DIDFT_MAKEINSTANCE(dik_code) | DIDFT_PSHBUTTON, - new_diks, hook->time, This->base.dinput->evsequence++); + new_diks, GetCurrentTime(), This->base.dinput->evsequence++); LeaveCriticalSection(&This->base.crit); return ret;

1 0

Akihiro Sagawa : gdi32: Return ANSI character code as glyph index for bitmap fonts.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: 882398b0a9f4bae83a2ca1cdf576289c8938fc79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=882398b0a9f4bae83a2ca1cdf… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Dec 11 21:11:15 2013 +0900 gdi32: Return ANSI character code as glyph index for bitmap fonts. --- dlls/gdi32/freetype.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index cbaddd2..716c74d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5998,7 +5998,7 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) } else ret = pFT_Get_Char_Index(font->ft_face, (unsigned char)buf); - TRACE("%04x (%02x) -> ret %d def_used %d\n", glyph, buf, ret, default_used); + TRACE("%04x (%02x) -> ret %d def_used %d\n", glyph, (unsigned char)buf, ret, default_used); return ret; } @@ -6015,6 +6015,34 @@ static FT_UInt get_glyph_index(const GdiFont *font, UINT glyph) return glyphId; } +/* helper for freetype_GetGlyphIndices */ +static FT_UInt get_gdi_glyph_index(const GdiFont *font, UINT glyph) +{ + WCHAR wc = (WCHAR)glyph; + BOOL default_used = FALSE; + BOOL *default_used_pointer = NULL; + FT_UInt ret; + char buf; + + if(font->ft_face->charmap->encoding != FT_ENCODING_NONE) + return get_glyph_index(font, glyph); + + if (codepage_sets_default_used(font->codepage)) + default_used_pointer = &default_used; + if(!WideCharToMultiByte(font->codepage, 0, &wc, 1, &buf, sizeof(buf), NULL, default_used_pointer) + || default_used) + { + if (font->codepage == CP_SYMBOL && wc < 0x100) + ret = (unsigned char)wc; + else + ret = 0; + } + else + ret = (unsigned char)buf; + TRACE("%04x (%02x) -> ret %d def_used %d\n", glyph, (unsigned char)buf, ret, default_used); + return ret; +} + static FT_UInt get_default_char_index(GdiFont *font) { FT_UInt default_char; @@ -6061,7 +6089,7 @@ static DWORD freetype_GetGlyphIndices( PHYSDEV dev, LPCWSTR lpstr, INT count, LP for(i = 0; i < count; i++) { - pgi[i] = get_glyph_index(physdev->font, lpstr[i]); + pgi[i] = get_gdi_glyph_index(physdev->font, lpstr[i]); if (pgi[i] == 0) { if (!got_default)

1 0

Akihiro Sagawa : gdi32: Use ANSI character code as glyph index for bitmap fonts.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: a88a121059a51f6370daa85c2990c202b4e93ac9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a88a121059a51f6370daa85c2… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Dec 11 21:11:17 2013 +0900 gdi32: Use ANSI character code as glyph index for bitmap fonts. --- dlls/gdi32/freetype.c | 10 +++- dlls/gdi32/tests/font.c | 129 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 137 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 716c74d..bbf5847 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6216,8 +6216,14 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, font->font_desc.matrix.eM21, font->font_desc.matrix.eM22); if(format & GGO_GLYPH_INDEX) { - glyph_index = glyph; - original_index = glyph; + if(font->ft_face->charmap->encoding == FT_ENCODING_NONE) { + /* Windows bitmap font, e.g. Small Fonts, uses ANSI character code + as glyph index. "Tresure Adventure Game" depends on this. */ + glyph_index = pFT_Get_Char_Index(font->ft_face, glyph); + TRACE("translate glyph index %04x -> %04x\n", glyph, glyph_index); + } else + glyph_index = glyph; + original_index = glyph_index; format &= ~GGO_GLYPH_INDEX; /* TODO: Window also turns off tategaki for glyphs passed in by index if their unicode code points fall outside of the range that is diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index a629b10..cbeb9c3 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5704,6 +5704,134 @@ static void test_fake_bold_font(void) } +static void test_bitmap_font_glyph_index(void) +{ + const WCHAR text[] = {'#','!','/','b','i','n','/','s','h',0}; + const struct { + LPCSTR face; + BYTE charset; + } bitmap_font_list[] = { + { "Courier", ANSI_CHARSET }, + { "Small Fonts", ANSI_CHARSET }, + { "Fixedsys", DEFAULT_CHARSET }, + { "System", DEFAULT_CHARSET } + }; + HDC hdc; + LOGFONTA lf; + HFONT hFont; + CHAR facename[LF_FACESIZE]; + BITMAPINFO bmi; + HBITMAP hBmp[2]; + void *pixels[2]; + int i, j; + DWORD ret; + BITMAP bmp; + TEXTMETRICA tm; + CHARSETINFO ci; + BYTE chr = '\xA9'; + + hdc = CreateCompatibleDC(0); + ok(hdc != NULL, "CreateCompatibleDC failed\n"); + + memset(&bmi, 0, sizeof(bmi)); + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi.bmiHeader.biBitCount = 32; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biWidth = 128; + bmi.bmiHeader.biHeight = 32; + bmi.bmiHeader.biCompression = BI_RGB; + + for (i = 0; i < sizeof(bitmap_font_list)/sizeof(bitmap_font_list[0]); i++) { + memset(&lf, 0, sizeof(lf)); + lf.lfCharSet = bitmap_font_list[i].charset; + strcpy(lf.lfFaceName, bitmap_font_list[i].face); + hFont = CreateFontIndirectA(&lf); + ok(hFont != NULL, "Can't create font (%s:%d)\n", lf.lfFaceName, lf.lfCharSet); + hFont = SelectObject(hdc, hFont); + ret = GetTextMetricsA(hdc, &tm); + ok(ret, "GetTextMetric failed\n"); + ret = GetTextFaceA(hdc, sizeof(facename), facename); + ok(ret, "GetTextFace failed\n"); + if (tm.tmPitchAndFamily & TMPF_TRUETYPE) { + skip("TrueType font (%s) was selected for \"%s\"\n", facename, bitmap_font_list[i].face); + continue; + } + if (lstrcmpiA(facename, lf.lfFaceName) != 0) { + skip("expected %s, got %s\n", lf.lfFaceName, facename); + continue; + } + + for (j = 0; j < 2; j++) { + HBITMAP hBmpPrev; + hBmp[j] = CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, &pixels[j], NULL, 0); + ok(hBmp[j] != NULL, "Can't create DIB\n"); + hBmpPrev = SelectObject(hdc, hBmp[j]); + switch (j) { + case 0: + ret = ExtTextOutW(hdc, 0, 0, 0, NULL, text, lstrlenW(text), NULL); + break; + case 1: + { + int len = lstrlenW(text); + LPWORD indices = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WORD)); + ret = GetGlyphIndicesW(hdc, text, len, indices, 0); + ok(ret, "GetGlyphIndices failed\n"); + ok(memcmp(indices, text, sizeof(WORD) * len) == 0, + "Glyph indices and text are different for %s:%d\n", lf.lfFaceName, tm.tmCharSet); + ret = ExtTextOutW(hdc, 0, 0, ETO_GLYPH_INDEX, NULL, indices, len, NULL); + HeapFree(GetProcessHeap(), 0, indices); + break; + } + } + ok(ret, "ExtTextOutW failed\n"); + SelectObject(hdc, hBmpPrev); + } + + GetObjectA(hBmp[0], sizeof(bmp), &bmp); + ok(memcmp(pixels[0], pixels[1], bmp.bmHeight * bmp.bmWidthBytes) == 0, + "Images are different (%s:%d)\n", lf.lfFaceName, tm.tmCharSet); + + ret = TranslateCharsetInfo((LPDWORD)(DWORD_PTR)tm.tmCharSet, &ci, TCI_SRCCHARSET); + if (!ret) { + skip("Can't get charset info for (%s:%d)\n", lf.lfFaceName, tm.tmCharSet); + goto next; + } + if (IsDBCSLeadByteEx(ci.ciACP, chr)) { + skip("High-ascii character is not defined in codepage %d\n", ci.ciACP); + goto next; + } + + for (j = 0; j < 2; j++) { + HBITMAP hBmpPrev; + WORD code; + hBmpPrev = SelectObject(hdc, hBmp[j]); + switch (j) { + case 0: + ret = ExtTextOutA(hdc, 100, 0, 0, NULL, (LPCSTR)&chr, 1, NULL); + break; + case 1: + ret = GetGlyphIndicesA(hdc, (LPCSTR)&chr, 1, &code, 0); + ok(ret, "GetGlyphIndices failed\n"); + ok(code == chr, "expected %02x, got %02x (%s:%d)\n", chr, code, lf.lfFaceName, tm.tmCharSet); + ret = ExtTextOutA(hdc, 100, 0, ETO_GLYPH_INDEX, NULL, (LPCSTR)&code, 1, NULL); + break; + } + ok(ret, "ExtTextOutA failed\n"); + SelectObject(hdc, hBmpPrev); + } + + ok(memcmp(pixels[0], pixels[1], bmp.bmHeight * bmp.bmWidthBytes) == 0, + "Images are different (%s:%d)\n", lf.lfFaceName, tm.tmCharSet); + next: + for (j = 0; j < 2; j++) + DeleteObject(hBmp[j]); + hFont = SelectObject(hdc, hFont); + DeleteObject(hFont); + } + + DeleteDC(hdc); +} + START_TEST(font) { init(); @@ -5764,6 +5892,7 @@ START_TEST(font) test_vertical_order(); test_GetCharWidth32(); test_fake_bold_font(); + test_bitmap_font_glyph_index(); /* These tests should be last test until RemoveFontResource * is properly implemented.

1 0

Stefan Dösinger : wined3d: Support getdc with user memory.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: 9b67b1b8a135f2855a38782acb60783bba9b215c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b67b1b8a135f2855a38782ac… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 11 12:22:16 2013 +0100 wined3d: Support getdc with user memory. --- dlls/wined3d/surface.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a613059..6270d0a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3309,12 +3309,6 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) TRACE("surface %p, dc %p.\n", surface, dc); - if (surface->flags & SFLAG_USERPTR) - { - ERR("Not supported on surfaces with application-provided memory.\n"); - return WINEDDERR_NODC; - } - /* Give more detailed info for ddraw. */ if (surface->flags & SFLAG_DCINUSE) return WINEDDERR_DCALREADYCREATED; @@ -3335,8 +3329,8 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) if (FAILED(hr)) return WINED3DERR_INVALIDCALL; - /* Use the DIB section from now on if we are not using a PBO. */ - if (!(surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM))) + /* Use the DIB section from now on if we are not using a PBO or user memory. */ + if (!(surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM | SFLAG_USERPTR))) { wined3d_resource_free_sysmem(&surface->resource); surface->resource.allocatedMemory = surface->dib.bitmap_data;

1 0

Stefan Dösinger : ddraw/tests: Test user memory and getdc interaction.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: 5a656dead64915e3221f393d238db8a574424b64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a656dead64915e3221f393d2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 11 12:22:17 2013 +0100 ddraw/tests: Test user memory and getdc interaction. Some Windows Media Player 9 visualization plugins used ddraw in this way to get a dc for their custom memory allocations. --- dlls/ddraw/tests/ddraw2.c | 66 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 61 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 61 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 188 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 3728723..ccf228e 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4862,6 +4862,71 @@ done: DestroyWindow(window); } +static void test_user_memory_getdc(void) +{ + IDirectDraw2 *ddraw; + HWND window; + HRESULT hr; + DDSURFACEDESC ddsd; + IDirectDrawSurface *surface; + IDirectDrawSurface3 *surface3; + DWORD data[16][16]; + ULONG ref; + HDC dc; + + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + return; + } + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_PIXELFORMAT; + ddsd.dwWidth = 16; + ddsd.dwHeight = 16; + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 32; + U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; + hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface3, (void **)&surface3); + ok(SUCCEEDED(hr), "Failed to get IDirectDrawSurface3 interface, hr %#x.\n", hr); + IDirectDrawSurface_Release(surface); + + memset(data, 0xaa, sizeof(data)); + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_LPSURFACE; + ddsd.lpSurface = data; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(SUCCEEDED(hr), "Failed to set surface desc, hr %#x.\n", hr); + + hr = IDirectDrawSurface3_GetDC(surface3, &dc); + ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); + BitBlt(dc, 0, 0, 16, 8, NULL, 0, 0, WHITENESS); + BitBlt(dc, 0, 8, 16, 8, NULL, 0, 0, BLACKNESS); + hr = IDirectDrawSurface3_ReleaseDC(surface3, dc); + ok(SUCCEEDED(hr), "Failed to release DC, hr %#x.\n", hr); + + ok(data[0][0] == 0xffffffff, "Expected color 0xffffffff, got %#x.\n", data[0][0]); + ok(data[15][15] == 0x00000000, "Expected color 0x00000000, got %#x.\n", data[15][15]); + + IDirectDrawSurface3_Release(surface3); + ref = IDirectDraw2_Release(ddraw); + ok(ref == 0, "Ddraw object not properly released, refcount %u.\n", ref); + DestroyWindow(window); +} + START_TEST(ddraw2) { test_coop_level_create_device_window(); @@ -4896,4 +4961,5 @@ START_TEST(ddraw2) test_surface_discard(); test_flip(); test_set_surface_desc(); + test_user_memory_getdc(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 1793052..1689562 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -5464,6 +5464,66 @@ done: DestroyWindow(window); } +static void test_user_memory_getdc(void) +{ + IDirectDraw4 *ddraw; + HWND window; + HRESULT hr; + DDSURFACEDESC2 ddsd; + IDirectDrawSurface4 *surface; + DWORD data[16][16]; + ULONG ref; + HDC dc; + + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + return; + } + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_PIXELFORMAT; + ddsd.dwWidth = 16; + ddsd.dwHeight = 16; + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 32; + U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; + hr = IDirectDraw4_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + memset(data, 0xaa, sizeof(data)); + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_LPSURFACE; + ddsd.lpSurface = data; + hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 0); + ok(SUCCEEDED(hr), "Failed to set surface desc, hr %#x.\n", hr); + + hr = IDirectDrawSurface4_GetDC(surface, &dc); + ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); + BitBlt(dc, 0, 0, 16, 8, NULL, 0, 0, WHITENESS); + BitBlt(dc, 0, 8, 16, 8, NULL, 0, 0, BLACKNESS); + hr = IDirectDrawSurface4_ReleaseDC(surface, dc); + ok(SUCCEEDED(hr), "Failed to release DC, hr %#x.\n", hr); + + ok(data[0][0] == 0xffffffff, "Expected color 0xffffffff, got %#x.\n", data[0][0]); + ok(data[15][15] == 0x00000000, "Expected color 0x00000000, got %#x.\n", data[15][15]); + + IDirectDrawSurface4_Release(surface); + ref = IDirectDraw4_Release(ddraw); + ok(ref == 0, "Ddraw object not properly released, refcount %u.\n", ref); + DestroyWindow(window); +} + START_TEST(ddraw4) { test_process_vertices(); @@ -5503,4 +5563,5 @@ START_TEST(ddraw4) test_surface_discard(); test_flip(); test_set_surface_desc(); + test_user_memory_getdc(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 0a7eb7d..41f1b9b 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -5352,6 +5352,66 @@ done: DestroyWindow(window); } +static void test_user_memory_getdc(void) +{ + IDirectDraw7 *ddraw; + HWND window; + HRESULT hr; + DDSURFACEDESC2 ddsd; + IDirectDrawSurface7 *surface; + DWORD data[16][16]; + ULONG ref; + HDC dc; + + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + return; + } + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_PIXELFORMAT; + ddsd.dwWidth = 16; + ddsd.dwHeight = 16; + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 32; + U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000ff; + ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + memset(data, 0xaa, sizeof(data)); + reset_ddsd(&ddsd); + ddsd.dwFlags = DDSD_LPSURFACE; + ddsd.lpSurface = data; + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(SUCCEEDED(hr), "Failed to set surface desc, hr %#x.\n", hr); + + hr = IDirectDrawSurface7_GetDC(surface, &dc); + ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); + BitBlt(dc, 0, 0, 16, 8, NULL, 0, 0, WHITENESS); + BitBlt(dc, 0, 8, 16, 8, NULL, 0, 0, BLACKNESS); + hr = IDirectDrawSurface7_ReleaseDC(surface, dc); + ok(SUCCEEDED(hr), "Failed to release DC, hr %#x.\n", hr); + + ok(data[0][0] == 0xffffffff, "Expected color 0xffffffff, got %#x.\n", data[0][0]); + ok(data[15][15] == 0x00000000, "Expected color 0x00000000, got %#x.\n", data[15][15]); + + IDirectDrawSurface7_Release(surface); + ref = IDirectDraw7_Release(ddraw); + ok(ref == 0, "Ddraw object not properly released, refcount %u.\n", ref); + DestroyWindow(window); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -5399,4 +5459,5 @@ START_TEST(ddraw7) test_surface_discard(); test_flip(); test_set_surface_desc(); + test_user_memory_getdc(); }

1 0

Stefan Dösinger : wined3d: Use surface_get_memory in surface_download_data.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: 800571c015ae02d8d5854ee56116f6b2b3975b79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=800571c015ae02d8d5854ee56… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 11 12:22:19 2013 +0100 wined3d: Use surface_get_memory in surface_download_data. --- dlls/wined3d/surface.c | 50 ++++++++++++++++++++++++----------------------- 1 files changed, 26 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6270d0a..c65d7c1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -517,6 +517,20 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface) return WINED3D_OK; } +static void surface_get_memory(const struct wined3d_surface *surface, struct wined3d_bo_address *data) +{ + if (surface->flags & SFLAG_PBO) + { + data->addr = NULL; + data->buffer_object = surface->pbo; + } + else + { + data->addr = surface->resource.allocatedMemory; + data->buffer_object = 0; + } +} + static BOOL surface_need_pbo(const struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) { if (surface->resource.pool == WINED3D_POOL_SYSTEM_MEM) @@ -1523,6 +1537,7 @@ void surface_set_texture_target(struct wined3d_surface *surface, GLenum target, static void surface_download_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) { const struct wined3d_format *format = surface->resource.format; + struct wined3d_bo_address data; /* Only support read back of converted P8 surfaces. */ if (surface->flags & SFLAG_CONVERTED && format->id != WINED3DFMT_P8_UINT) @@ -1531,15 +1546,16 @@ static void surface_download_data(struct wined3d_surface *surface, const struct return; } + surface_get_memory(surface, &data); + if (format->flags & WINED3DFMT_FLAG_COMPRESSED) { TRACE("(%p) : Calling glGetCompressedTexImageARB level %d, format %#x, type %#x, data %p.\n", - surface, surface->texture_level, format->glFormat, format->glType, - surface->resource.allocatedMemory); + surface, surface->texture_level, format->glFormat, format->glType, data.addr); - if (surface->flags & SFLAG_PBO) + if (data.buffer_object) { - GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, surface->pbo)); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, data.buffer_object)); checkGLcall("glBindBufferARB"); GL_EXTCALL(glGetCompressedTexImageARB(surface->texture_target, surface->texture_level, NULL)); checkGLcall("glGetCompressedTexImageARB"); @@ -1549,7 +1565,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct else { GL_EXTCALL(glGetCompressedTexImageARB(surface->texture_target, - surface->texture_level, surface->resource.allocatedMemory)); + surface->texture_level, data.addr)); checkGLcall("glGetCompressedTexImageARB"); } } @@ -1578,15 +1594,15 @@ static void surface_download_data(struct wined3d_surface *surface, const struct } else { - mem = surface->resource.allocatedMemory; + mem = data.addr; } TRACE("(%p) : Calling glGetTexImage level %d, format %#x, type %#x, data %p\n", surface, surface->texture_level, gl_format, gl_type, mem); - if (surface->flags & SFLAG_PBO) + if (data.buffer_object) { - GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, surface->pbo)); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, data.buffer_object)); checkGLcall("glBindBufferARB"); gl_info->gl_ops.gl.p_glGetTexImage(surface->texture_target, surface->texture_level, @@ -1648,7 +1664,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct * |444444444444444444| \/ * -------------------- * - * this also means that any references to allocatedMemory should work with the data as if were a + * this also means that any references to surface memory should work with the data as if were a * standard texture with a non-power2 width instead of texture boxed up to be a power2 texture. * * internally the texture is still stored in a boxed format so any references to textureName will @@ -1658,7 +1674,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct * rendering. If an app does, the SFLAG_DYNLOCK flag will kick in and the memory copy won't be released, * and doesn't have to be re-read. */ src_data = mem; - dst_data = surface->resource.allocatedMemory; + dst_data = data.addr; TRACE("(%p) : Repacking the surface data from pitch %d to pitch %d\n", surface, src_pitch, dst_pitch); for (y = 0; y < surface->resource.height; ++y) { @@ -1934,20 +1950,6 @@ static BOOL surface_check_block_align(struct wined3d_surface *surface, const REC return FALSE; } -static void surface_get_memory(const struct wined3d_surface *surface, struct wined3d_bo_address *data) -{ - if (surface->flags & SFLAG_PBO) - { - data->addr = NULL; - data->buffer_object = surface->pbo; - } - else - { - data->addr = surface->resource.allocatedMemory; - data->buffer_object = 0; - } -} - HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) {

1 0

Stefan Dösinger : wined3d: Call buffer_get_memory in surface_load_pbo.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: 4de7249d2303a23cb803a6e05ee8b5a2d6ba2cc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4de7249d2303a23cb803a6e05… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 11 12:22:20 2013 +0100 wined3d: Call buffer_get_memory in surface_load_pbo. --- dlls/wined3d/surface.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c65d7c1..0c3df16 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -549,6 +549,8 @@ static void surface_load_pbo(struct wined3d_surface *surface, const struct wined { struct wined3d_context *context; GLenum error; + struct wined3d_bo_address data; + surface_get_memory(surface, &data); context = context_acquire(surface->resource.device, NULL); @@ -563,7 +565,7 @@ static void surface_load_pbo(struct wined3d_surface *surface, const struct wined checkGLcall("glBindBufferARB"); GL_EXTCALL(glBufferDataARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->resource.size + 4, - surface->resource.allocatedMemory, GL_STREAM_DRAW_ARB)); + data.addr, GL_STREAM_DRAW_ARB)); checkGLcall("glBufferDataARB"); GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0));

1 0

Stefan Dösinger : wined3d: Rename surface_load_pbo to surface_create_pbo.
by Alexandre Julliard 11 Dec '13

11 Dec '13

Module: wine Branch: master Commit: 78fda5cea083ce62c28fceb873f4372863ca0fa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78fda5cea083ce62c28fceb87… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 11 12:22:21 2013 +0100 wined3d: Rename surface_load_pbo to surface_create_pbo. --- dlls/wined3d/surface.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0c3df16..ec9ac6c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -545,7 +545,7 @@ static BOOL surface_need_pbo(const struct wined3d_surface *surface, const struct return TRUE; } -static void surface_load_pbo(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) +static void surface_create_pbo(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) { struct wined3d_context *context; GLenum error; @@ -586,7 +586,7 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) TRACE("surface %p.\n", surface); if (!(surface->flags & SFLAG_PBO) && surface_need_pbo(surface, gl_info)) - surface_load_pbo(surface, gl_info); + surface_create_pbo(surface, gl_info); else if (!(surface->resource.allocatedMemory || surface->flags & SFLAG_PBO)) { /* Whatever surface we have, make sure that there is memory allocated @@ -5244,7 +5244,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location) if (location == SFLAG_INSYSMEM && !(surface->flags & SFLAG_PBO) && surface_need_pbo(surface, gl_info)) - surface_load_pbo(surface, gl_info); + surface_create_pbo(surface, gl_info); return WINED3D_OK; }

1 0