November 2015 - Wine-commits

Józef Kucia : d3d8: Use wined3d_resource_{map, unmap} () instead of wined3d_texture_{map, unmap}().
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: b8dc15da58aeae1d06a38b322879bedff54e6197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8dc15da58aeae1d06a38b322… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 5 00:13:38 2015 +0100 d3d8: Use wined3d_resource_{map, unmap}() instead of wined3d_texture_{map, unmap}(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/surface.c | 4 ++-- dlls/d3d8/volume.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 317b2a6..679f094 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -234,7 +234,7 @@ static HRESULT WINAPI d3d8_surface_LockRect(IDirect3DSurface8 *iface, box.back = 1; } - hr = wined3d_texture_map(surface->wined3d_texture, surface->sub_resource_idx, + hr = wined3d_resource_map(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx, &map_desc, rect ? &box : NULL, flags); wined3d_mutex_unlock(); @@ -260,7 +260,7 @@ static HRESULT WINAPI d3d8_surface_UnlockRect(IDirect3DSurface8 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_texture_unmap(surface->wined3d_texture, surface->sub_resource_idx); + hr = wined3d_resource_unmap(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx); wined3d_mutex_unlock(); switch(hr) diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index e37330c..f26e424 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -148,7 +148,7 @@ static HRESULT WINAPI d3d8_volume_LockBox(IDirect3DVolume8 *iface, iface, locked_box, box, flags); wined3d_mutex_lock(); - hr = wined3d_texture_map(volume->wined3d_texture, volume->sub_resource_idx, + hr = wined3d_resource_map(wined3d_texture_get_resource(volume->wined3d_texture), volume->sub_resource_idx, &map_desc, (const struct wined3d_box *)box, flags); wined3d_mutex_unlock(); @@ -167,7 +167,7 @@ static HRESULT WINAPI d3d8_volume_UnlockBox(IDirect3DVolume8 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_texture_unmap(volume->wined3d_texture, volume->sub_resource_idx); + hr = wined3d_resource_unmap(wined3d_texture_get_resource(volume->wined3d_texture), volume->sub_resource_idx); wined3d_mutex_unlock(); return hr;

1 0

Józef Kucia : d3d9: Use wined3d_resource_{map, unmap} () instead of wined3d_texture_{map, unmap}().
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: b83beb18a22d0e2623dfb4148a951e21df8ce962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b83beb18a22d0e2623dfb4148… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 5 00:13:39 2015 +0100 d3d9: Use wined3d_resource_{map, unmap}() instead of wined3d_texture_{map, unmap}(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/surface.c | 4 ++-- dlls/d3d9/volume.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 58d2309..833c1f4 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -251,7 +251,7 @@ static HRESULT WINAPI d3d9_surface_LockRect(IDirect3DSurface9 *iface, } wined3d_mutex_lock(); - hr = wined3d_texture_map(surface->wined3d_texture, surface->sub_resource_idx, + hr = wined3d_resource_map(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx, &map_desc, rect ? &box : NULL, flags); wined3d_mutex_unlock(); @@ -272,7 +272,7 @@ static HRESULT WINAPI d3d9_surface_UnlockRect(IDirect3DSurface9 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_texture_unmap(surface->wined3d_texture, surface->sub_resource_idx); + hr = wined3d_resource_unmap(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx); wined3d_mutex_unlock(); switch(hr) diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index ca72f99..52502bf 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -148,7 +148,7 @@ static HRESULT WINAPI d3d9_volume_LockBox(IDirect3DVolume9 *iface, iface, locked_box, box, flags); wined3d_mutex_lock(); - hr = wined3d_texture_map(volume->wined3d_texture, volume->sub_resource_idx, + hr = wined3d_resource_map(wined3d_texture_get_resource(volume->wined3d_texture), volume->sub_resource_idx, &map_desc, (const struct wined3d_box *)box, flags); wined3d_mutex_unlock(); @@ -167,7 +167,7 @@ static HRESULT WINAPI d3d9_volume_UnlockBox(IDirect3DVolume9 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_texture_unmap(volume->wined3d_texture, volume->sub_resource_idx); + hr = wined3d_resource_unmap(wined3d_texture_get_resource(volume->wined3d_texture), volume->sub_resource_idx); wined3d_mutex_unlock(); return hr;

1 0

Józef Kucia : d3d11: Use wined3d_resource_{map, unmap}() instead of wined3d_texture_{map, unmap}().
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: bcb809ce590e41f29a4b4167566834444ccfb8bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcb809ce590e41f29a4b41675… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 5 00:13:40 2015 +0100 d3d11: Use wined3d_resource_{map, unmap}() instead of wined3d_texture_{map, unmap}(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/texture.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 9c7f299..011a5f7 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -366,7 +366,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture2d_Map(ID3D10Texture2D *iface, UIN FIXME("Ignoring map_flags %#x.\n", map_flags); wined3d_mutex_lock(); - if (SUCCEEDED(hr = wined3d_texture_map(texture->wined3d_texture, sub_resource_idx, + if (SUCCEEDED(hr = wined3d_resource_map(wined3d_texture_get_resource(texture->wined3d_texture), sub_resource_idx, &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d11_map_type(map_type)))) { mapped_texture->pData = wined3d_map_desc.data; @@ -384,7 +384,7 @@ static void STDMETHODCALLTYPE d3d10_texture2d_Unmap(ID3D10Texture2D *iface, UINT TRACE("iface %p, sub_resource_idx %u.\n", iface, sub_resource_idx); wined3d_mutex_lock(); - wined3d_texture_unmap(texture->wined3d_texture, sub_resource_idx); + wined3d_resource_unmap(wined3d_texture_get_resource(texture->wined3d_texture), sub_resource_idx); wined3d_mutex_unlock(); } @@ -823,7 +823,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UIN FIXME("Ignoring map_flags %#x.\n", map_flags); wined3d_mutex_lock(); - if (SUCCEEDED(hr = wined3d_texture_map(texture->wined3d_texture, sub_resource_idx, + if (SUCCEEDED(hr = wined3d_resource_map(wined3d_texture_get_resource(texture->wined3d_texture), sub_resource_idx, &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d11_map_type(map_type)))) { mapped_texture->pData = wined3d_map_desc.data; @@ -842,7 +842,7 @@ static void STDMETHODCALLTYPE d3d10_texture3d_Unmap(ID3D10Texture3D *iface, UINT TRACE("iface %p, sub_resource_idx %u.\n", iface, sub_resource_idx); wined3d_mutex_lock(); - wined3d_texture_unmap(texture->wined3d_texture, sub_resource_idx); + wined3d_resource_unmap(wined3d_texture_get_resource(texture->wined3d_texture), sub_resource_idx); wined3d_mutex_unlock(); }

1 0

Józef Kucia : wined3d: Remove wined3d_texture_{map, unmap}().
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: 01c3fac140fbb78dde42ad1a344d0618783b285d URL: http://source.winehq.org/git/wine.git/?a=commit;h=01c3fac140fbb78dde42ad1a3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 5 00:13:41 2015 +0100 wined3d: Remove wined3d_texture_{map,unmap}(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 17 ----------------- dlls/wined3d/wined3d.spec | 2 -- include/wine/wined3d.h | 3 --- 3 files changed, 22 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4380e5f..1d5bec7 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1547,23 +1547,6 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct return WINED3D_OK; } -HRESULT CDECL wined3d_texture_map(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) -{ - TRACE("texture %p, sub_resource_idx %u, map_desc %p, box %p, flags %#x.\n", - texture, sub_resource_idx, map_desc, box, flags); - - return texture->resource.resource_ops->resource_sub_resource_map(&texture->resource, sub_resource_idx, - map_desc, box, flags); -} - -HRESULT CDECL wined3d_texture_unmap(struct wined3d_texture *texture, unsigned int sub_resource_idx) -{ - TRACE("texture %p, sub_resource_idx %u.\n", texture, sub_resource_idx); - - return texture->resource.resource_ops->resource_sub_resource_unmap(&texture->resource, sub_resource_idx); -} - HRESULT CDECL wined3d_texture_get_dc(struct wined3d_texture *texture, unsigned int sub_resource_idx, HDC *dc) { struct wined3d_resource *sub_resource; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 7067e08..a7e625d 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -276,8 +276,6 @@ @ cdecl wined3d_texture_set_autogen_filter_type(ptr long) @ cdecl wined3d_texture_set_color_key(ptr long ptr) @ cdecl wined3d_texture_set_lod(ptr long) -@ cdecl wined3d_texture_map(ptr long ptr ptr long) -@ cdecl wined3d_texture_unmap(ptr long) @ cdecl wined3d_texture_update_desc(ptr long long long long long ptr long) @ cdecl wined3d_vertex_declaration_create(ptr ptr long ptr ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9c9258a..2deb450 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2554,10 +2554,7 @@ HRESULT __cdecl wined3d_texture_set_autogen_filter_type(struct wined3d_texture * HRESULT __cdecl wined3d_texture_set_color_key(struct wined3d_texture *texture, DWORD flags, const struct wined3d_color_key *color_key); DWORD __cdecl wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod); -HRESULT __cdecl wined3d_texture_map(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags); HRESULT __cdecl wined3d_texture_release_dc(struct wined3d_texture *texture, unsigned int sub_resource_idx, HDC dc); -HRESULT __cdecl wined3d_texture_unmap(struct wined3d_texture *texture, unsigned int sub_resource_idx); HRESULT __cdecl wined3d_texture_update_desc(struct wined3d_texture *texture, UINT width, UINT height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, UINT multisample_quality,

1 0

Alexandre Julliard : widl: Disable a noisy warning.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: 87dacc4e11d4c6976add0754fa1b3afcd3a8fa20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87dacc4e11d4c6976add0754f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 5 23:21:50 2015 +0900 widl: Disable a noisy warning. This could be re-enabled once there's a mechanism to avoid the warning when building the corresponding test case. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 7396944..8b65ead 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -504,10 +504,11 @@ static int ctl2_alloc_guid( offset = ctl2_find_guid(typelib, hash_key, &guid->guid); if (offset != -1) { - warning("duplicate uuid {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", - guid->guid.Data1, guid->guid.Data2, guid->guid.Data3, - guid->guid.Data4[0], guid->guid.Data4[1], guid->guid.Data4[2], guid->guid.Data4[3], - guid->guid.Data4[4], guid->guid.Data4[5], guid->guid.Data4[6], guid->guid.Data4[7]); + if (pedantic) + warning("duplicate uuid {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", + guid->guid.Data1, guid->guid.Data2, guid->guid.Data3, + guid->guid.Data4[0], guid->guid.Data4[1], guid->guid.Data4[2], guid->guid.Data4[3], + guid->guid.Data4[4], guid->guid.Data4[5], guid->guid.Data4[6], guid->guid.Data4[7]); return -1; }

1 0

Bruno Jesus : msrle32/tests: Add uncompressed frame decompressing test.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: fa506e45bf28905061e26f1ed9b945addd0c93f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa506e45bf28905061e26f1ed… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Nov 5 21:01:22 2015 +0800 msrle32/tests: Add uncompressed frame decompressing test. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msrle32/tests/msrle.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/dlls/msrle32/tests/msrle.c b/dlls/msrle32/tests/msrle.c index 5ab0b6a..654a38e 100644 --- a/dlls/msrle32/tests/msrle.c +++ b/dlls/msrle32/tests/msrle.c @@ -99,7 +99,69 @@ static void test_encode(void) ICClose(hic); } +static void test_raw_decompress(void) +{ + DWORD codecs[] = {FCC('D', 'I', 'B', ' '), FCC('R', 'A', 'W', ' '), + FCC('M', 'R', 'L', 'E'), BI_RGB}, i, hr; + BITMAPINFO bi; + BITMAPINFOHEADER *bih, biho; + HIC hic; + ICINFO codec_info; + void *bits, *outbits; + + /* Create an uncompressed 200x200 bitmap */ + bih = &bi.bmiHeader; + bih->biSize = sizeof(*bih); + bih->biWidth = 200; + bih->biHeight = 200; + bih->biPlanes = 1; + bih->biBitCount = 24; + bih->biCompression = BI_RGB; + bih->biSizeImage = bih->biWidth * (bih->biBitCount / 8) * bih->biHeight; + bih->biXPelsPerMeter = 10000; + bih->biYPelsPerMeter = 10000; + bih->biClrUsed = 0; + bih->biClrImportant = 0; + biho = *bih; + + bits = HeapAlloc(GetProcessHeap(), 0, bih->biSizeImage); + ok(bits != NULL, "Expected non-NULL value\n"); + outbits = HeapAlloc(GetProcessHeap(), 0, bih->biSizeImage); + ok(outbits != NULL, "Expected non-NULL value\n"); + + for (i = 0; i < sizeof(codecs) / sizeof(codecs[0]); i++) + { + memset(bits, i + 0xAF, bih->biSizeImage); +todo_wine { + /* Check which codec is able to decompress uncompressed data */ + hic = ICLocate(FCC('V', 'I', 'D', 'C'), codecs[i], bih, NULL, ICMODE_DECOMPRESS); + ok(hic != NULL, "Test[%d]: Expected non-NULL return\n", i); + + /* Now wich is this codec? Windows returns MRLE for uncompressed cases */ + memset(&codec_info, 0, sizeof(codec_info)); + hr = ICGetInfo(hic, &codec_info, sizeof(codec_info)); + ok(hr == sizeof(codec_info), "Test[%d]: Incorrect amount of data returned\n", i); + ok(codec_info.fccType == FCC('v', 'i', 'd', 'c'), + "Test[%d]: Expected a video type, got 0x%x\n", i, codec_info.fccType); + ok(codec_info.fccHandler == FCC('M', 'R', 'L', 'E'), + "Test[%d]: Expected MRLE, got 0x%x\n", i, codec_info.fccHandler); + + /* Decompress the frame and check if we get the same output */ + memset(outbits, 0, bih->biSizeImage); + hr = ICDecompress(hic, 0, bih, bits, &biho, outbits); + ok(hr == ICERR_OK, "Test[%d]: Expected ICERR_OK, got %d\n", i, hr); + ok(!memcmp(bits, outbits, bih->biSizeImage), "Test[%d]: Image contents do not match!\n", i); + + hr = ICClose(hic); + ok(hr == ICERR_OK, "Test[%d]: Expected ICERR_OK, got %d\n", i, hr); +} + } + HeapFree(GetProcessHeap(), 0, bits); + HeapFree(GetProcessHeap(), 0, outbits); +} + START_TEST(msrle) { test_encode(); + test_raw_decompress(); }

1 0

Bruno Jesus : msrle32: Add support to decompress uncompressed frames.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: 30136b322eb510cc7da62d11bc5e6a56afb6ff58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30136b322eb510cc7da62d11b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Nov 5 21:01:39 2015 +0800 msrle32: Add support to decompress uncompressed frames. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msrle32/msrle32.c | 98 +++++++++++++++++++++++++--------------------- dlls/msrle32/tests/msrle.c | 3 +- dlls/msvfw32/tests/msvfw.c | 2 +- 3 files changed, 56 insertions(+), 47 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index bd02ae6..2682812 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1596,7 +1596,7 @@ static LRESULT DecompressQuery(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, /* check input format if given */ if (lpbiIn != NULL) { - if (!isSupportedMRLE(lpbiIn)) + if (!isSupportedMRLE(lpbiIn) && !isSupportedDIB(lpbiIn)) return ICERR_BADFORMAT; } @@ -1607,11 +1607,11 @@ static LRESULT DecompressQuery(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, if (lpbiIn != NULL) { if (lpbiIn->biWidth != lpbiOut->biWidth) - hr = ICERR_UNSUPPORTED; + hr = ICERR_UNSUPPORTED; if (lpbiIn->biHeight != lpbiOut->biHeight) - hr = ICERR_UNSUPPORTED; + hr = ICERR_UNSUPPORTED; if (lpbiIn->biBitCount > lpbiOut->biBitCount) - hr = ICERR_UNSUPPORTED; + hr = ICERR_UNSUPPORTED; } } @@ -1645,49 +1645,51 @@ static LRESULT DecompressBegin(CodecInfo *pi, LPCBITMAPINFOHEADER lpbiIn, if (pi->bDecompress) DecompressEnd(pi); - rgbIn = (const RGBQUAD*)((const BYTE*)lpbiIn + lpbiIn->biSize); - rgbOut = (const RGBQUAD*)((const BYTE*)lpbiOut + lpbiOut->biSize); - - switch (lpbiOut->biBitCount) { - case 4: - case 8: - pi->palette_map = LocalAlloc(LPTR, lpbiIn->biClrUsed); - if (pi->palette_map == NULL) - return ICERR_MEMORY; - - for (i = 0; i < lpbiIn->biClrUsed; i++) { - pi->palette_map[i] = MSRLE32_GetNearestPaletteIndex(lpbiOut->biClrUsed, rgbOut, rgbIn[i]); - } - break; - case 15: - case 16: - pi->palette_map = LocalAlloc(LPTR, lpbiIn->biClrUsed * 2); - if (pi->palette_map == NULL) - return ICERR_MEMORY; - - for (i = 0; i < lpbiIn->biClrUsed; i++) { - WORD color; + if (lpbiIn->biCompression != BI_RGB) + { + rgbIn = (const RGBQUAD*)((const BYTE*)lpbiIn + lpbiIn->biSize); + rgbOut = (const RGBQUAD*)((const BYTE*)lpbiOut + lpbiOut->biSize); - if (lpbiOut->biBitCount == 15) - color = ((rgbIn[i].rgbRed >> 3) << 10) - | ((rgbIn[i].rgbGreen >> 3) << 5) | (rgbIn[i].rgbBlue >> 3); - else - color = ((rgbIn[i].rgbRed >> 3) << 11) - | ((rgbIn[i].rgbGreen >> 3) << 5) | (rgbIn[i].rgbBlue >> 3); + switch (lpbiOut->biBitCount) { + case 4: + case 8: + pi->palette_map = LocalAlloc(LPTR, lpbiIn->biClrUsed); + if (pi->palette_map == NULL) + return ICERR_MEMORY; - pi->palette_map[i * 2 + 1] = color >> 8; - pi->palette_map[i * 2 + 0] = color & 0xFF; + for (i = 0; i < lpbiIn->biClrUsed; i++) { + pi->palette_map[i] = MSRLE32_GetNearestPaletteIndex(lpbiOut->biClrUsed, rgbOut, rgbIn[i]); + } + break; + case 15: + case 16: + pi->palette_map = LocalAlloc(LPTR, lpbiIn->biClrUsed * 2); + if (pi->palette_map == NULL) + return ICERR_MEMORY; + + for (i = 0; i < lpbiIn->biClrUsed; i++) { + WORD color; + + if (lpbiOut->biBitCount == 15) + color = ((rgbIn[i].rgbRed >> 3) << 10) + | ((rgbIn[i].rgbGreen >> 3) << 5) | (rgbIn[i].rgbBlue >> 3); + else + color = ((rgbIn[i].rgbRed >> 3) << 11) + | ((rgbIn[i].rgbGreen >> 3) << 5) | (rgbIn[i].rgbBlue >> 3); + + pi->palette_map[i * 2 + 1] = color >> 8; + pi->palette_map[i * 2 + 0] = color & 0xFF; + }; + break; + case 24: + case 32: + pi->palette_map = LocalAlloc(LPTR, lpbiIn->biClrUsed * sizeof(RGBQUAD)); + if (pi->palette_map == NULL) + return ICERR_MEMORY; + memcpy(pi->palette_map, rgbIn, lpbiIn->biClrUsed * sizeof(RGBQUAD)); + break; }; - break; - case 24: - case 32: - pi->palette_map = LocalAlloc(LPTR, lpbiIn->biClrUsed * sizeof(RGBQUAD)); - if (pi->palette_map == NULL) - return ICERR_MEMORY; - memcpy(pi->palette_map, rgbIn, lpbiIn->biClrUsed * sizeof(RGBQUAD)); - break; - }; - + } pi->bDecompress = TRUE; return ICERR_OK; @@ -1718,6 +1720,14 @@ static LRESULT Decompress(CodecInfo *pi, ICDECOMPRESS *pic, DWORD dwSize) assert(pic->lpbiInput->biWidth == pic->lpbiOutput->biWidth); assert(pic->lpbiInput->biHeight == pic->lpbiOutput->biHeight); + /* Uncompressed frame? */ + if (pic->lpbiInput->biCompression == BI_RGB) + { + pic->lpbiOutput->biSizeImage = pic->lpbiInput->biSizeImage; + memcpy(pic->lpOutput, pic->lpInput, pic->lpbiOutput->biSizeImage); + return ICERR_OK; + } + pic->lpbiOutput->biSizeImage = DIBWIDTHBYTES(*pic->lpbiOutput) * pic->lpbiOutput->biHeight; if (pic->lpbiInput->biBitCount == 4) return MSRLE32_DecompressRLE4(pi, pic->lpbiOutput, pic->lpInput, pic->lpOutput); diff --git a/dlls/msrle32/tests/msrle.c b/dlls/msrle32/tests/msrle.c index 654a38e..38e74a6 100644 --- a/dlls/msrle32/tests/msrle.c +++ b/dlls/msrle32/tests/msrle.c @@ -132,7 +132,7 @@ static void test_raw_decompress(void) for (i = 0; i < sizeof(codecs) / sizeof(codecs[0]); i++) { memset(bits, i + 0xAF, bih->biSizeImage); -todo_wine { + /* Check which codec is able to decompress uncompressed data */ hic = ICLocate(FCC('V', 'I', 'D', 'C'), codecs[i], bih, NULL, ICMODE_DECOMPRESS); ok(hic != NULL, "Test[%d]: Expected non-NULL return\n", i); @@ -154,7 +154,6 @@ todo_wine { hr = ICClose(hic); ok(hr == ICERR_OK, "Test[%d]: Expected ICERR_OK, got %d\n", i, hr); -} } HeapFree(GetProcessHeap(), 0, bits); HeapFree(GetProcessHeap(), 0, outbits); diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index b3e7b19..125cac5 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -212,7 +212,7 @@ static void test_Locate(void) bi.biCompression = BI_RGB; bo.biBitCount = bi.biBitCount = 8; h = ICLocate(ICTYPE_VIDEO, 0, &bi, &bo, ICMODE_DECOMPRESS); - todo_wine ok(h != 0, "RGB8->RGB identity failed\n"); + ok(h != 0, "RGB8->RGB identity failed\n"); if (h) ok(ICClose(h) == ICERR_OK,"ICClose failed\n"); bi.biCompression = BI_RLE8;

1 0

Sebastian Lackner : dinput: Print TRACE at the beginning of SysMouseWImpl_GetDeviceState function.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: eca5ee9a49fab652ae87a25c534e88fc4f6edca0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eca5ee9a49fab652ae87a25c5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Nov 5 15:57:19 2015 +0100 dinput: Print TRACE at the beginning of SysMouseWImpl_GetDeviceState function. Also move the _dump_mouse_state() call inside of the lock. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/mouse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 132efce..3e63a34 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -549,13 +549,13 @@ static HRESULT WINAPI SysMouseAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface) static HRESULT WINAPI SysMouseWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W iface, DWORD len, LPVOID ptr) { SysMouseImpl *This = impl_from_IDirectInputDevice8W(iface); + TRACE("(%p)->(%u,%p)\n", This, len, ptr); if(This->base.acquired == 0) return DIERR_NOTACQUIRED; - TRACE("(this=%p,0x%08x,%p):\n", This, len, ptr); + EnterCriticalSection(&This->base.crit); _dump_mouse_state(&This->m_state); - EnterCriticalSection(&This->base.crit); /* Copy the current mouse state */ fill_DataFormat(ptr, len, &This->m_state, &This->base.data_format);

1 0

Sebastian Lackner : dinput: Ensure X11 input events are forwarded to wineserver even without message loop.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: bfb845f9fccb2ff5bff0b0ba3238fec7f9f7b710 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfb845f9fccb2ff5bff0b0ba3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Nov 5 15:57:29 2015 +0100 dinput: Ensure X11 input events are forwarded to wineserver even without message loop. This commit basically reverts b22ff8018aca7c365e505f1db7732f7050ae259b. Windows does not do that, but our current implementation of winex11 requires periodic event polling to forward events to the wineserver. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 5 +++-- dlls/dinput/dinput_main.c | 14 ++++++++++++++ dlls/dinput/dinput_private.h | 1 + dlls/dinput/keyboard.c | 2 ++ dlls/dinput/mouse.c | 2 ++ dlls/dinput/tests/mouse.c | 3 +++ 6 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index ab43029..1ba6ffc 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1631,8 +1631,9 @@ HRESULT WINAPI IDirectInputDevice2WImpl_Poll(LPDIRECTINPUTDEVICE8W iface) IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); if (!This->acquired) return DIERR_NOTACQUIRED; - /* Because wine devices do not need to be polled, just return DI_NOEFFECT */ - return DI_NOEFFECT; + + check_dinput_events(); + return DI_OK; } HRESULT WINAPI IDirectInputDevice2AImpl_Poll(LPDIRECTINPUTDEVICE8A iface) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 18840b2..aef9d10 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1632,6 +1632,20 @@ void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface) LeaveCriticalSection(&dinput_hook_crit); } +void check_dinput_events(void) +{ + /* Windows does not do that, but our current implementation of winex11 + * requires periodic event polling to forward events to the wineserver. + * + * We have to call this function from multiple places, because: + * - some games do not explicitly poll for mouse events + * (for example Culpa Innata) + * - some games only poll the device, and neither keyboard nor mouse + * (for example Civilization: Call to Power 2) + */ + MsgWaitForMultipleObjectsEx(0, NULL, 0, QS_ALLINPUT, 0); +} + BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved) { switch(reason) diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index 022a7a9..176c0e0 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -63,6 +63,7 @@ extern const struct dinput_device joystick_linuxinput_device DECLSPEC_HIDDEN; extern const struct dinput_device joystick_osx_device DECLSPEC_HIDDEN; extern void check_dinput_hooks(LPDIRECTINPUTDEVICE8W) DECLSPEC_HIDDEN; +extern void check_dinput_events(void) DECLSPEC_HIDDEN; typedef int (*DI_EVENT_PROC)(LPDIRECTINPUTDEVICE8A, WPARAM, LPARAM); extern void _copy_diactionformatAtoW(LPDIACTIONFORMATW, LPDIACTIONFORMATA) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index f3ac30e..4c3c38e 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -335,6 +335,8 @@ static HRESULT WINAPI SysKeyboardWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W ifac if (len != This->base.data_format.user_df->dwDataSize ) return DIERR_INVALIDPARAM; + check_dinput_events(); + EnterCriticalSection(&This->base.crit); if (TRACE_ON(dinput)) { diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 3e63a34..eaec6b1 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -553,6 +553,8 @@ static HRESULT WINAPI SysMouseWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W iface, if(This->base.acquired == 0) return DIERR_NOTACQUIRED; + check_dinput_events(); + EnterCriticalSection(&This->base.crit); _dump_mouse_state(&This->m_state); diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index 1a5f4bc..34940e4 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -93,6 +93,7 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) DIPROPDWORD di_op; DIDEVICEOBJECTDATA mouse_state; DWORD cnt; + MSG msg; int i; if (! SetForegroundWindow(hwnd)) @@ -130,6 +131,8 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) * loose mouse input */ hwnd2 = CreateWindowA("static", "Temporary", WS_VISIBLE, 10, 210, 200, 200, NULL, NULL, NULL, NULL); + ok(hwnd2 != NULL, "CreateWindowA failed with %u\n", GetLastError()); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); hr = IDirectInputDevice_GetDeviceState(pMouse, sizeof(m_state), &m_state); ok(hr == DIERR_NOTACQUIRED, "GetDeviceState() should have failed: %08x\n", hr);

1 0

Alexandre Julliard : makefiles: Generate correct dependencies for included typelib files.
by Alexandre Julliard 05 Nov '15

05 Nov '15

Module: wine Branch: master Commit: 8e81f6d58234c17f5de6d2219ef47c6d01a4a4a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e81f6d58234c17f5de6d2219… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 5 14:25:35 2015 +0900 makefiles: Generate correct dependencies for included typelib files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/xmlparser.idl | 2 +- dlls/msxml3/xmlparser.idl | 2 +- tools/makedep.c | 133 ++++++++++++++++++++++++++++------------ 3 files changed, 96 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e81f6d58234c17f5de6d…

1 0