wine-commits October 2014

wine-commits@winehq.org

2 participants
397 discussions

Henri Verbeet : wined3d: Convert to WINED3DFMT_B8G8R8A8_UNORM for WINED3D_CT_P8.
by Alexandre Julliard 01 Oct '14

01 Oct '14

Module: wine Branch: master Commit: 6f8cb77ea968ebd671fae17bddccf939b995bd3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f8cb77ea968ebd671fae17bd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 1 09:18:57 2014 +0200 wined3d: Convert to WINED3DFMT_B8G8R8A8_UNORM for WINED3D_CT_P8. --- dlls/wined3d/surface.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6672525..b24504e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1638,9 +1638,9 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp && texture == texture->swapchain->front_buffer)) || colorkey_active) { *conversion_type = WINED3D_CT_P8; - format->glInternal = GL_RGBA; - format->glFormat = GL_RGBA; - format->glType = GL_UNSIGNED_BYTE; + format->glInternal = GL_RGBA8; + format->glFormat = GL_BGRA; + format->glType = GL_UNSIGNED_INT_8_8_8_8_REV; format->conv_byte_count = 4; } } @@ -3180,9 +3180,9 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; x++) { BYTE color = *source++; - *dest++ = palette->colors[color].rgbRed; - *dest++ = palette->colors[color].rgbGreen; *dest++ = palette->colors[color].rgbBlue; + *dest++ = palette->colors[color].rgbGreen; + *dest++ = palette->colors[color].rgbRed; *dest++ = 0; } }

1 0

Henri Verbeet : wined3d: Fix the pitch handling in the no-palette WINED3D_CT_P8 case.
by Alexandre Julliard 01 Oct '14

01 Oct '14

Module: wine Branch: master Commit: 632d2fca6e27b4498002f98c88add9559e3abed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=632d2fca6e27b4498002f98c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 1 09:18:56 2014 +0200 wined3d: Fix the pitch handling in the no-palette WINED3D_CT_P8 case. --- dlls/wined3d/surface.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 272b5de..6672525 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3161,6 +3161,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI UINT outpitch, enum wined3d_conversion_type conversion_type, struct wined3d_surface *surface) { const BYTE *source; + unsigned int x, y; BYTE *dest; TRACE("src %p, dst %p, pitch %u, width %u, height %u, outpitch %u, conversion_type %#x, surface %p.\n", @@ -3171,7 +3172,6 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI case WINED3D_CT_P8: if (surface->container->swapchain && surface->container->swapchain->palette) { - unsigned int x, y; const struct wined3d_palette *palette = surface->container->swapchain->palette; for (y = 0; y < height; y++) { @@ -3199,9 +3199,11 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI * starting and we don't want the screen to flash in an ugly * color. */ FIXME("P8 surface loaded without a palette.\n"); - memset(dst, 0, height * outpitch); + for (y = 0; y < height; ++y) + { + memset(&dst[outpitch * y], 0, width * 4); + } } - break; case WINED3D_CT_CK_B5G6R5: @@ -3216,7 +3218,6 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI Note2: Nvidia documents say that their driver does not support alpha + color keying on the same surface and disables color keying in such a case */ - unsigned int x, y; const WORD *Source; WORD *Dest; @@ -3239,7 +3240,6 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI case WINED3D_CT_CK_B5G5R5X1: { /* Converting X1R5G5B5 format to R5G5B5A1 to emulate color-keying. */ - unsigned int x, y; const WORD *Source; WORD *Dest; TRACE("Color keyed 5551\n"); @@ -3260,9 +3260,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; case WINED3D_CT_CK_B8G8R8: - { /* Converting R8G8B8 format to R8G8B8A8 with color-keying. */ - unsigned int x, y; for (y = 0; y < height; y++) { source = src + pitch * y; @@ -3277,13 +3275,10 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI dest += 4; } } - } - break; + break; case WINED3D_CT_CK_B8G8R8X8: - { /* Converting X8R8G8B8 format to R8G8B8A8 with color-keying. */ - unsigned int x, y; for (y = 0; y < height; y++) { source = src + pitch * y; @@ -3298,12 +3293,9 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI dest += 4; } } - } - break; + break; case WINED3D_CT_CK_B8G8R8A8: - { - unsigned int x, y; for (y = 0; y < height; ++y) { source = src + pitch * y; @@ -3318,8 +3310,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI dest += 4; } } - } - break; + break; default: ERR("Unsupported conversion type %#x.\n", conversion_type);

1 0

Henri Verbeet : wined3d: Get rid of the WINED3D_CT_NONE case in d3dfmt_convert_surface().
by Alexandre Julliard 01 Oct '14

01 Oct '14

Module: wine Branch: master Commit: c5d917777a564219d455224f6234dcaae8b4df1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5d917777a564219d455224f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 1 09:18:55 2014 +0200 wined3d: Get rid of the WINED3D_CT_NONE case in d3dfmt_convert_surface(). This is never used. --- dlls/wined3d/surface.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index acf3f46..272b5de 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3168,12 +3168,6 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI switch (conversion_type) { - case WINED3D_CT_NONE: - { - memcpy(dst, src, pitch * height); - break; - } - case WINED3D_CT_P8: if (surface->container->swapchain && surface->container->swapchain->palette) {

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 01 Oct '14

01 Oct '14

Module: wine Branch: master Commit: fcf4f1c697f775679b09ef19d69c575fa98d7b55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcf4f1c697f775679b09ef19d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 1 07:47:09 2014 +0400 po: Update Russian translation. --- po/ru.po | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/po/ru.po b/po/ru.po index 818c087..2edc019 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3546,16 +3546,12 @@ msgid "Expected ')'" msgstr "Ожидается «)»" #: jscript.rc:40 -#, fuzzy -#| msgid "Subject Key Identifier" msgid "Expected identifier" -msgstr "Идентификатор ключа субъекта" +msgstr "Ожидается идентификатор" #: jscript.rc:41 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '='" -msgstr "Ожидается «;»" +msgstr "Ожидается «=»" #: jscript.rc:42 msgid "Invalid character" @@ -3586,20 +3582,16 @@ msgid "Label not found" msgstr "Метка не найдена" #: jscript.rc:49 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@end'" -msgstr "Ожидается «;»" +msgstr "Ожидается «@end»" #: jscript.rc:50 msgid "Conditional compilation is turned off" msgstr "Условная компиляция отключена" #: jscript.rc:51 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@'" -msgstr "Ожидается «;»" +msgstr "Ожидается «@»" #: jscript.rc:54 msgid "Number expected"

1 0

Sebastian Lackner : shlwapi: Fixed swapped argument order in SHLWAPI_DupSharedHandle command.
by Alexandre Julliard 01 Oct '14

01 Oct '14

Module: wine Branch: master Commit: 5e4f15db1f8cf6de4a6ef8ad0aa073b9488293d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e4f15db1f8cf6de4a6ef8ad0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 1 02:39:49 2014 +0200 shlwapi: Fixed swapped argument order in SHLWAPI_DupSharedHandle command. --- dlls/shlwapi/ordinal.c | 6 +++--- dlls/shlwapi/tests/ordinal.c | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 303c63a..e5da1cf 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -106,7 +106,7 @@ static HANDLE SHLWAPI_DupSharedHandle(HANDLE hShared, DWORD dwDstProcId, if (hSrc) { /* Make handle available to dest process */ - if (!DuplicateHandle(hDst, hShared, hSrc, &hRet, + if (!DuplicateHandle(hSrc, hShared, hDst, &hRet, dwAccess, 0, dwOptions | DUPLICATE_SAME_ACCESS)) hRet = NULL; @@ -201,7 +201,7 @@ PVOID WINAPI SHLockShared(HANDLE hShared, DWORD dwProcId) TRACE("(%p %d)\n", hShared, dwProcId); /* Get handle to shared memory for current process */ - hDup = SHLWAPI_DupSharedHandle(hShared, dwProcId, GetCurrentProcessId(), + hDup = SHLWAPI_DupSharedHandle(hShared, GetCurrentProcessId(), dwProcId, FILE_MAP_ALL_ACCESS, 0); /* Get View */ pMapped = MapViewOfFile(hDup, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 0); @@ -252,7 +252,7 @@ BOOL WINAPI SHFreeShared(HANDLE hShared, DWORD dwProcId) TRACE("(%p %d)\n", hShared, dwProcId); /* Get a copy of the handle for our process, closing the source handle */ - hClose = SHLWAPI_DupSharedHandle(hShared, dwProcId, GetCurrentProcessId(), + hClose = SHLWAPI_DupSharedHandle(hShared, GetCurrentProcessId(), dwProcId, FILE_MAP_ALL_ACCESS,DUPLICATE_CLOSE_SOURCE); /* Close local copy */ return CloseHandle(hClose); diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 481a771..64b07f3 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -505,16 +505,13 @@ static void test_alloc_shared(int argc, char **argv) if (hmem2) { p = pSHLockShared(hmem2, procid); - todo_wine ok(p != NULL,"SHLockShared failed: %u\n", GetLastError()); if (p != NULL) ok(p->value == 0xDEADBEEF, "Wrong value in shared memory: %d instead of %d\n", p->value, 0xDEADBEEF); ret = pSHUnlockShared(p); - todo_wine ok(ret, "SHUnlockShared failed: %u\n", GetLastError()); ret = pSHFreeShared(hmem2, procid); - todo_wine ok(ret, "SHFreeShared failed: %u\n", GetLastError()); } }

1 0

Sebastian Lackner : shlwapi/tests: Add SH*Shared inter-process tests.
by Alexandre Julliard 01 Oct '14

01 Oct '14

Module: wine Branch: master Commit: cad3e3e5dcd65a946a1234d7645f797628d94409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cad3e3e5dcd65a946a1234d76… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 1 02:36:47 2014 +0200 shlwapi/tests: Add SH*Shared inter-process tests. --- dlls/shlwapi/tests/ordinal.c | 101 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 93 insertions(+), 8 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index cb90d31..481a771 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -444,12 +444,20 @@ static void test_SHSearchMapInt(void) ok(i == values[0], "Len 3, expected %d, got %d\n", values[0], i); } -static void test_alloc_shared(void) +struct shared_struct { + DWORD value; + HANDLE handle; +}; + +static void test_alloc_shared(int argc, char **argv) +{ + char cmdline[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOA si = { 0 }; DWORD procid; - HANDLE hmem; - int val; - int* p; + HANDLE hmem, hmem2 = 0; + struct shared_struct val, *p; BOOL ret; procid=GetCurrentProcessId(); @@ -458,19 +466,82 @@ static void test_alloc_shared(void) ret = pSHFreeShared(hmem, procid); ok( ret, "SHFreeShared failed: %u\n", GetLastError()); - val=0x12345678; - hmem=pSHAllocShared(&val,4,procid); + val.value = 0x12345678; + val.handle = 0; + hmem = pSHAllocShared(&val, sizeof(val), procid); ok(hmem!=NULL,"SHAllocShared(NULL...) failed: %u\n", GetLastError()); p=pSHLockShared(hmem,procid); ok(p!=NULL,"SHLockShared failed: %u\n", GetLastError()); if (p!=NULL) - ok(*p==val,"Wrong value in shared memory: %d instead of %d\n",*p,val); + ok(p->value == 0x12345678, "Wrong value in shared memory: %d instead of %d\n", p->value, 0x12345678); ret = pSHUnlockShared(p); ok( ret, "SHUnlockShared failed: %u\n", GetLastError()); + sprintf(cmdline, "%s %s %d %p", argv[0], argv[1], procid, hmem); + ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "could not create child process error: %u\n", GetLastError()); + if (ret) + { + winetest_wait_child_process(pi.hProcess); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + p = pSHLockShared(hmem, procid); + ok(p != NULL,"SHLockShared failed: %u\n", GetLastError()); + if (p != NULL && p->value != 0x12345678) + { + ok(p->value == 0x12345679, "Wrong value in shared memory: %d instead of %d\n", p->value, 0x12345679); + hmem2 = p->handle; + ok(hmem2 != NULL, "Expected handle in shared memory\n"); + } + ret = pSHUnlockShared(p); + ok(ret, "SHUnlockShared failed: %u\n", GetLastError()); + } + ret = pSHFreeShared(hmem, procid); ok( ret, "SHFreeShared failed: %u\n", GetLastError()); + + if (hmem2) + { + p = pSHLockShared(hmem2, procid); + todo_wine + ok(p != NULL,"SHLockShared failed: %u\n", GetLastError()); + if (p != NULL) + ok(p->value == 0xDEADBEEF, "Wrong value in shared memory: %d instead of %d\n", p->value, 0xDEADBEEF); + ret = pSHUnlockShared(p); + todo_wine + ok(ret, "SHUnlockShared failed: %u\n", GetLastError()); + + ret = pSHFreeShared(hmem2, procid); + todo_wine + ok(ret, "SHFreeShared failed: %u\n", GetLastError()); + } +} + +static void test_alloc_shared_remote(DWORD procid, HANDLE hmem) +{ + struct shared_struct val, *p; + BOOL ret; + + p = pSHLockShared(hmem, procid); + ok(p != NULL || broken(p == NULL) /* Windows 7/8 */, "SHLockShared failed: %u\n", GetLastError()); + if (p == NULL) + { + win_skip("Subprocess failed to modify shared memory, skipping test\n"); + return; + } + + ok(p->value == 0x12345678, "Wrong value in shared memory: %d instead of %d\n", p->value, 0x12345678); + p->value++; + + val.value = 0xDEADBEEF; + val.handle = 0; + p->handle = pSHAllocShared(&val, sizeof(val), procid); + ok(p->handle != NULL, "SHAllocShared failed: %u\n", GetLastError()); + + ret = pSHUnlockShared(p); + ok(ret, "SHUnlockShared failed: %u\n", GetLastError()); } static void test_fdsa(void) @@ -3057,6 +3128,9 @@ static void test_SHSetParentHwnd(void) START_TEST(ordinal) { + char **argv; + int argc; + hShlwapi = GetModuleHandleA("shlwapi.dll"); is_win2k_and_lower = GetProcAddress(hShlwapi, "StrChrNW") == 0; is_win9x = GetProcAddress(hShlwapi, (LPSTR)99) == 0; /* StrCpyNXA */ @@ -3069,6 +3143,17 @@ START_TEST(ordinal) init_pointers(); + argc = winetest_get_mainargs(&argv); + if (argc >= 4) + { + DWORD procid; + HANDLE hmem; + sscanf(argv[2], "%d", &procid); + sscanf(argv[3], "%p", &hmem); + test_alloc_shared_remote(procid, hmem); + return; + } + hmlang = LoadLibraryA("mlang.dll"); pLcidToRfc1766A = (void *)GetProcAddress(hmlang, "LcidToRfc1766A"); @@ -3077,7 +3162,7 @@ START_TEST(ordinal) test_GetAcceptLanguagesA(); test_SHSearchMapInt(); - test_alloc_shared(); + test_alloc_shared(argc, argv); test_fdsa(); test_GetShellSecurityDescriptor(); test_SHPackDispParams();

1 0

Sebastian Lackner : msvcp110: Export ? _BADOFF@std@@3_JB on both i386 and win64.
by Alexandre Julliard 01 Oct '14

01 Oct '14

Module: wine Branch: master Commit: a95a50925b7d7ebfe88f8d57d326b75565e74305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a95a50925b7d7ebfe88f8d57d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Sep 29 00:21:28 2014 +0200 msvcp110: Export ?_BADOFF@std@@3_JB on both i386 and win64. --- dlls/msvcp110/msvcp110.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 593976e..6d3118a 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1148,7 +1148,7 @@ @ stub -arch=i386 ?_Assign@_Concurrent_queue_iterator_base_v4@details@Concurrency@@IAEXABV123@@Z @ stub -arch=win64 ?_Assign@_Concurrent_queue_iterator_base_v4@details@Concurrency@@IEAAXAEBV123@@Z @ stub ?_Atexit@@YAXP6AXXZ@Z -@ extern -arch=win64 ?_BADOFF@std@@3_JB std_BADOFF +@ extern ?_BADOFF@std@@3_JB std_BADOFF @ stub ?_Byte_reverse_table@details@Concurrency@@3QBEB @ cdecl -arch=arm ?_C_str@?$_Yarn@D@std@@QBAPBDXZ(ptr) _Yarn_char_c_str @ thiscall -arch=i386 ?_C_str@?$_Yarn@D@std@@QBEPBDXZ(ptr) _Yarn_char_c_str

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2014