December 2013 - Wine-Commits

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

Dec. 11, 2013

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 : ddraw/tests: Test user memory and getdc interaction.
by Alexandre Julliard Dec. 11, 2013

Dec. 11, 2013

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

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

Dec. 11, 2013

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

Henri Verbeet : d3d8/tests: Add a test for instructions taking a scalar source.
by Alexandre Julliard Dec. 11, 2013

Dec. 11, 2013

Module: wine Branch: master Commit: b5742fb95010bd5621ef63ba3120be1b195ed03d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5742fb95010bd5621ef63ba3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 11 14:32:05 2013 +0100 d3d8/tests: Add a test for instructions taking a scalar source. --- dlls/d3d8/tests/visual.c | 189 +++++++++++++++++++++++++++------------------- 1 files changed, 110 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b5742fb95010bd5621ef6…

1 0

Frédéric Delanoy : krnl386.exe16: Make VGA_[Set/ Get]Mode return TRUE on success.
by Alexandre Julliard Dec. 11, 2013

Dec. 11, 2013

Module: wine Branch: master Commit: f24a5bc824e474165af7e4883a0c1cbcfe8956be URL: http://source.winehq.org/git/wine.git/?a=commit;h=f24a5bc824e474165af7e4883… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 11 11:38:49 2013 +0100 krnl386.exe16: Make VGA_[Set/Get]Mode return TRUE on success. --- dlls/krnl386.exe16/int10.c | 2 +- dlls/krnl386.exe16/int33.c | 2 +- dlls/krnl386.exe16/vga.c | 20 ++++++++++---------- dlls/krnl386.exe16/vga.h | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/krnl386.exe16/int10.c b/dlls/krnl386.exe16/int10.c index dfba761..2ac9703 100644 --- a/dlls/krnl386.exe16/int10.c +++ b/dlls/krnl386.exe16/int10.c @@ -750,7 +750,7 @@ static BOOL INT10_SetVideoMode( BIOSDATA *data, WORD mode ) ptr->Width, ptr->Height, ptr->Depth, clearScreen ? "cleared" : "preserved" ); - if ( VGA_SetMode(mode) ) + if (!VGA_SetMode(mode)) return FALSE; } diff --git a/dlls/krnl386.exe16/int33.c b/dlls/krnl386.exe16/int33.c index 7226816..0f03ac7 100644 --- a/dlls/krnl386.exe16/int33.c +++ b/dlls/krnl386.exe16/int33.c @@ -295,7 +295,7 @@ void DOSVM_Int33Message(UINT message,WPARAM wParam,LPARAM lParam) WORD mask = 0; unsigned Height, Width, SX=1, SY=1; - if (!VGA_GetMode(&Height,&Width,NULL)) { + if (VGA_GetMode(&Height, &Width, NULL)) { /* may need to do some coordinate scaling */ if (Width) SX = 640/Width; diff --git a/dlls/krnl386.exe16/vga.c b/dlls/krnl386.exe16/vga.c index f1b632e..ade19f7 100644 --- a/dlls/krnl386.exe16/vga.c +++ b/dlls/krnl386.exe16/vga.c @@ -735,7 +735,7 @@ static char*VGA_AlphaBuffer(void) typedef struct { unsigned Xres, Yres, Depth; - int ret; + BOOL ret; } ModeSet; @@ -780,7 +780,7 @@ static void WINAPI VGA_DoSetMode(ULONG_PTR arg) { HRESULT res; ModeSet *par = (ModeSet *)arg; - par->ret=1; + par->ret = FALSE; if (lpddraw) VGA_DoExit(0); if (!lpddraw) { @@ -845,7 +845,7 @@ static void WINAPI VGA_DoSetMode(ULONG_PTR arg) /* poll every 20ms (50fps should provide adequate responsiveness) */ VGA_InstallTimer(20); } - par->ret=0; + par->ret = TRUE; return; } @@ -872,7 +872,7 @@ const VGA_MODE *VGA_GetModeInfo(WORD mode) return NULL; } -static int VGA_SetGraphicMode(WORD mode) +static BOOL VGA_SetGraphicMode(WORD mode) { ModeSet par; int newSize; @@ -954,7 +954,7 @@ static int VGA_SetGraphicMode(WORD mode) return par.ret; } -int VGA_SetMode(WORD mode) +BOOL VGA_SetMode(WORD mode) { const VGA_MODE *ModeInfo; /* get info on VGA mode & set appropriately */ @@ -980,17 +980,17 @@ int VGA_SetMode(WORD mode) { return VGA_SetGraphicMode(mode); } - return 0; /* assume all good & return zero */ + return TRUE; /* assume all good & return TRUE */ } -int VGA_GetMode(unsigned*Height,unsigned*Width,unsigned*Depth) +BOOL VGA_GetMode(unsigned *Height, unsigned *Width, unsigned *Depth) { - if (!lpddraw) return 1; - if (!lpddsurf) return 1; + if (!lpddraw) return FALSE; + if (!lpddsurf) return FALSE; if (Height) *Height=sdesc.dwHeight; if (Width) *Width=sdesc.dwWidth; if (Depth) *Depth=sdesc.ddpfPixelFormat.u1.dwRGBBitCount; - return 0; + return TRUE; } static void VGA_Exit(void) diff --git a/dlls/krnl386.exe16/vga.h b/dlls/krnl386.exe16/vga.h index 5d79567..b4976f6 100644 --- a/dlls/krnl386.exe16/vga.h +++ b/dlls/krnl386.exe16/vga.h @@ -52,10 +52,10 @@ extern const VGA_MODE VGA_modelist[]; /* all vga modes */ const VGA_MODE *VGA_GetModeInfo(WORD mode); -int VGA_SetMode(WORD mode); +BOOL VGA_SetMode(WORD mode); /* graphics mode */ -int VGA_GetMode(unsigned*Height,unsigned*Width,unsigned*Depth); +BOOL VGA_GetMode(unsigned *Height, unsigned *Width, unsigned *Depth); void VGA_SetPalette(PALETTEENTRY*pal,int start,int len); void VGA_SetColor16(int reg,int color); char VGA_GetColor16(int reg);

1 0

Dmitry Timoshkov : msiexec: Make service thread do nothing by waiting for the kill event instead of using an empty loop .
by Alexandre Julliard Dec. 11, 2013

Dec. 11, 2013

Module: wine Branch: master Commit: 957f7013d2edba8d6928bfe725666073fdf94689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=957f7013d2edba8d6928bfe72… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 11 17:16:01 2013 +0900 msiexec: Make service thread do nothing by waiting for the kill event instead of using an empty loop. --- programs/msiexec/service.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/programs/msiexec/service.c b/programs/msiexec/service.c index ab419ca..4b72fe0 100644 --- a/programs/msiexec/service.c +++ b/programs/msiexec/service.c @@ -100,10 +100,7 @@ static void WINAPI ServiceCtrlHandler(DWORD code) static DWORD WINAPI ServiceExecutionThread(LPVOID param) { - while (TRUE) - { - /* do nothing */ - } + WaitForSingleObject(kill_event, INFINITE); return 0; }

1 0

Hans Leidekker : wininet: Always store the SSL context.
by Alexandre Julliard Dec. 11, 2013

Dec. 11, 2013

Module: wine Branch: master Commit: 7ba776532d73a180130a33aee46e6182b535ce8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ba776532d73a180130a33aee… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 11 10:49:34 2013 +0100 wininet: Always store the SSL context. This allows applications to query certificate properties when verification has failed. --- dlls/wininet/netconnection.c | 18 ++++++++---------- dlls/wininet/tests/http.c | 25 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index c90ef69..86c9b08 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -369,6 +369,7 @@ DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, BOOL m netconn->security_flags = security_flags | server->security_flags; netconn->mask_errors = mask_errors; list_init(&netconn->pool_entry); + SecInvalidateHandle(&netconn->ssl_ctx); result = create_netconn_socket(server, netconn, timeout); if (result != ERROR_SUCCESS) { @@ -407,7 +408,8 @@ void free_netconn(netconn_t *netconn) heap_free(netconn->extra_buf); netconn->extra_buf = NULL; netconn->extra_len = 0; - DeleteSecurityContext(&netconn->ssl_ctx); + if (SecIsValidHandle(&netconn->ssl_ctx)) + DeleteSecurityContext(&netconn->ssl_ctx); } heap_free(netconn); @@ -586,6 +588,10 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode TRACE("InitializeSecurityContext ret %08x\n", status); if(status == SEC_E_OK) { + if(SecIsValidHandle(&connection->ssl_ctx)) + DeleteSecurityContext(&connection->ssl_ctx); + connection->ssl_ctx = ctx; + if(in_bufs[1].BufferType == SECBUFFER_EXTRA) FIXME("SECBUFFER_EXTRA not supported\n"); @@ -617,19 +623,14 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode } } - if(status != SEC_E_OK || res != ERROR_SUCCESS) { - WARN("Failed to initialize security context failed: %08x\n", status); + WARN("Failed to establish SSL connection: %08x (%u)\n", status, res); heap_free(connection->ssl_buf); connection->ssl_buf = NULL; - DeleteSecurityContext(&ctx); return res ? res : ERROR_INTERNET_SECURITY_CHANNEL_ERROR; } - TRACE("established SSL connection\n"); - connection->ssl_ctx = ctx; - connection->secure = TRUE; connection->security_flags |= SECURITY_FLAG_SECURE; @@ -963,9 +964,6 @@ LPCVOID NETCON_GetCert(netconn_t *connection) const CERT_CONTEXT *ret; SECURITY_STATUS res; - if (!connection->secure) - return NULL; - res = QueryContextAttributesW(&connection->ssl_ctx, SECPKG_ATTR_REMOTE_CERT_CONTEXT, (void*)&ret); return res == SEC_E_OK ? ret : NULL; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index eb09bc7..951460f 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4137,6 +4137,7 @@ static void _set_secflags(unsigned line, HINTERNET req, BOOL use_undoc, DWORD fl static void test_security_flags(void) { + INTERNET_CERTIFICATE_INFOA *cert; HINTERNET ses, conn, req; DWORD size, flags; char buf[100]; @@ -4259,6 +4260,30 @@ static void test_security_flags(void) ok(req_error == ERROR_INTERNET_SEC_CERT_REV_FAILED || broken(req_error == ERROR_INTERNET_SEC_CERT_ERRORS), "req_error = %d\n", req_error); + size = 0; + res = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, NULL, &size); + ok(res || GetLastError() == ERROR_INSUFFICIENT_BUFFER, "InternetQueryOption failed: %d\n", GetLastError()); + ok(size == sizeof(INTERNET_CERTIFICATE_INFOA), "size = %u\n", size); + cert = HeapAlloc(GetProcessHeap(), 0, size); + cert->lpszSubjectInfo = NULL; + cert->lpszIssuerInfo = NULL; + cert->lpszSignatureAlgName = (char *)0xdeadbeef; + cert->lpszEncryptionAlgName = (char *)0xdeadbeef; + cert->lpszProtocolName = (char *)0xdeadbeef; + cert->dwKeySize = 0xdeadbeef; + res = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, cert, &size); + ok(res, "InternetQueryOption failed: %u\n", GetLastError()); + if (res) + { + ok(cert->lpszSubjectInfo && strlen(cert->lpszSubjectInfo) > 1, "expected a non-empty subject name\n"); + ok(cert->lpszIssuerInfo && strlen(cert->lpszIssuerInfo) > 1, "expected a non-empty issuer name\n"); + ok(!cert->lpszSignatureAlgName, "unexpected signature algorithm name\n"); + ok(!cert->lpszEncryptionAlgName, "unexpected encryption algorithm name\n"); + ok(!cert->lpszProtocolName, "unexpected protocol name\n"); + ok(cert->dwKeySize != 0xdeadbeef, "unexpected key size\n"); + } + HeapFree(GetProcessHeap(), 0, cert); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION);

1 0

Hans Leidekker : wininet: Separate socket destruction from destruction of the connection object.
by Alexandre Julliard Dec. 11, 2013

Dec. 11, 2013

Module: wine Branch: master Commit: 6c7c15059a5407769a9edefb88e18f5463897c7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c7c15059a5407769a9edefb8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 11 10:48:41 2013 +0100 wininet: Separate socket destruction from destruction of the connection object. --- dlls/wininet/dialogs.c | 2 +- dlls/wininet/http.c | 29 ++++++++++++++--------------- dlls/wininet/internet.h | 3 +++ dlls/wininet/netconnection.c | 16 +++++++++++++++- 4 files changed, 33 insertions(+), 17 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 4acda13..52a18f3 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -457,7 +457,7 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog( /* FIXME: Use helper function */ flags |= SECURITY_FLAG_SECURE; req->security_flags |= flags; - if(req->netconn) + if(is_valid_netconn(req->netconn)) req->netconn->security_flags |= flags; } diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 09a43f8..817fea1 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1947,7 +1947,7 @@ static void http_release_netconn(http_request_t *req, BOOL reuse) { TRACE("%p %p\n",req, req->netconn); - if(!req->netconn) + if(!is_valid_netconn(req->netconn)) return; if(reuse && req->netconn->keep_alive) { @@ -1988,8 +1988,7 @@ static void http_release_netconn(http_request_t *req, BOOL reuse) INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_CLOSING_CONNECTION, 0, 0); - free_netconn(req->netconn); - req->netconn = NULL; + close_netconn(req->netconn); INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_CONNECTION_CLOSED, 0, 0); @@ -2092,7 +2091,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe info->Flags |= IDSI_FLAG_KEEP_ALIVE; if (req->proxy) info->Flags |= IDSI_FLAG_PROXY; - if (req->netconn && req->netconn->secure) + if (is_valid_netconn(req->netconn) && req->netconn->secure) info->Flags |= IDSI_FLAG_SECURE; return ERROR_SUCCESS; @@ -2109,7 +2108,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe return ERROR_INSUFFICIENT_BUFFER; *size = sizeof(DWORD); - flags = req->netconn ? req->netconn->security_flags : req->security_flags | req->server->security_flags; + flags = is_valid_netconn(req->netconn) ? req->netconn->security_flags : req->security_flags | req->server->security_flags; *(DWORD *)buffer = flags; TRACE("INTERNET_OPTION_SECURITY_FLAGS %x\n", flags); @@ -2314,7 +2313,7 @@ static DWORD HTTPREQ_SetOption(object_header_t *hdr, DWORD option, void *buffer, TRACE("INTERNET_OPTION_SECURITY_FLAGS %08x\n", flags); flags &= SECURITY_SET_MASK; req->security_flags |= flags; - if(req->netconn) + if(is_valid_netconn(req->netconn)) req->netconn->security_flags |= flags; return ERROR_SUCCESS; } @@ -2626,7 +2625,7 @@ static DWORD netconn_get_avail_data(data_stream_t *stream, http_request_t *req) netconn_stream_t *netconn_stream = (netconn_stream_t*)stream; DWORD avail = 0; - if(req->netconn) + if(is_valid_netconn(req->netconn)) NETCON_query_data_available(req->netconn, &avail); return netconn_stream->content_length == ~0u ? avail @@ -2636,7 +2635,7 @@ static DWORD netconn_get_avail_data(data_stream_t *stream, http_request_t *req) static BOOL netconn_end_of_data(data_stream_t *stream, http_request_t *req) { netconn_stream_t *netconn_stream = (netconn_stream_t*)stream; - return netconn_stream->content_read == netconn_stream->content_length || !req->netconn; + return netconn_stream->content_read == netconn_stream->content_length || !is_valid_netconn(req->netconn); } static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DWORD size, @@ -2654,7 +2653,7 @@ static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf, size = avail; } - if(size && req->netconn) { + if(size && is_valid_netconn(req->netconn)) { if((res = NETCON_recv(req->netconn, buf, size, read_mode == READMODE_SYNC ? MSG_WAITALL : 0, &len))) len = 0; if(!len) @@ -2836,7 +2835,7 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, if(read_mode == READMODE_NOBLOCK) { DWORD avail; - if(!req->netconn || !NETCON_query_data_available(req->netconn, &avail) || !avail) + if(!is_valid_netconn(req->netconn) || !NETCON_query_data_available(req->netconn, &avail) || !avail) break; if(read_bytes > avail) read_bytes = avail; @@ -3037,7 +3036,7 @@ static BOOL drain_content(http_request_t *req, BOOL blocking) { BOOL ret; - if(!req->netconn || req->contentLength == -1) + if(!is_valid_netconn(req->netconn) || req->contentLength == -1) return FALSE; if(!strcmpW(req->verb, szHEAD)) @@ -4790,7 +4789,7 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) if (request->netconn) { - if (NETCON_is_alive(request->netconn)) + if (is_valid_netconn(request->netconn) && NETCON_is_alive(request->netconn)) { *reusing = TRUE; return ERROR_SUCCESS; @@ -4812,7 +4811,7 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) netconn = LIST_ENTRY(list_head(&request->server->conn_pool), netconn_t, pool_entry); list_remove(&netconn->pool_entry); - if(NETCON_is_alive(netconn)) + if(is_valid_netconn(netconn) && NETCON_is_alive(netconn)) break; TRACE("connection %p closed during idle\n", netconn); @@ -5219,7 +5218,7 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ INT responseLen; DWORD res = ERROR_SUCCESS; - if(!request->netconn) { + if(!is_valid_netconn(request->netconn)) { WARN("Not connected\n"); send_request_complete(request, 0, ERROR_INTERNET_OPERATION_CANCELLED); return ERROR_INTERNET_OPERATION_CANCELLED; @@ -5891,7 +5890,7 @@ static DWORD HTTP_GetResponseHeaders(http_request_t *request, INT *len) TRACE("-->\n"); - if(!request->netconn) + if(!is_valid_netconn(request->netconn)) goto lend; /* clear old response headers (eg. from a redirect response) */ diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 3d948cf..28af0f7 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -108,6 +108,9 @@ typedef struct struct list pool_entry; } netconn_t; +BOOL is_valid_netconn(netconn_t *) DECLSPEC_HIDDEN; +void close_netconn(netconn_t *) DECLSPEC_HIDDEN; + static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index c8879b6..c90ef69 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -321,6 +321,7 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t if (!res) { closesocket(netconn->socket); + netconn->socket = -1; return ERROR_INTERNET_CANNOT_CONNECT; } else if (res > 0) @@ -333,7 +334,10 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t } } if(result == -1) + { closesocket(netconn->socket); + netconn->socket = -1; + } else { flag = 0; ioctlsocket(netconn->socket, FIONBIO, &flag); @@ -378,6 +382,17 @@ DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, BOOL m return result; } +BOOL is_valid_netconn(netconn_t *netconn) +{ + return netconn && netconn->socket != -1; +} + +void close_netconn(netconn_t *netconn) +{ + closesocket(netconn->socket); + netconn->socket = -1; +} + void free_netconn(netconn_t *netconn) { server_release(netconn->server); @@ -395,7 +410,6 @@ void free_netconn(netconn_t *netconn) DeleteSecurityContext(&netconn->ssl_ctx); } - closesocket(netconn->socket); heap_free(netconn); }

1 0

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

Dec. 11, 2013

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

Frédéric Delanoy : krnl386.exe16: Use BOOL type where appropriate.
by Alexandre Julliard Dec. 11, 2013

Dec. 11, 2013

Module: wine Branch: master Commit: aaa0c692f1f283188b1dcff9a47f2ef285fe320d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa0c692f1f283188b1dcff9a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 11 11:38:50 2013 +0100 krnl386.exe16: Use BOOL type where appropriate. --- dlls/krnl386.exe16/dosmem.c | 8 ++++---- dlls/krnl386.exe16/global.c | 2 +- dlls/krnl386.exe16/int2f.c | 4 ++-- dlls/krnl386.exe16/ioports.c | 6 +++--- dlls/krnl386.exe16/kernel.c | 17 ++++++++--------- dlls/krnl386.exe16/kernel16_private.h | 2 +- dlls/krnl386.exe16/ne_module.c | 4 ++-- dlls/krnl386.exe16/relay.c | 2 +- dlls/krnl386.exe16/resource.c | 2 +- dlls/krnl386.exe16/soundblaster.c | 12 ++++++------ dlls/krnl386.exe16/task.c | 2 +- dlls/krnl386.exe16/thunk.c | 2 +- dlls/krnl386.exe16/utthunk.c | 2 +- 13 files changed, 32 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aaa0c692f1f283188b1dc…

1 0