March 2014 - Wine-commits - list.winehq.org

Francois Gouget : user32/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 31 Mar '14

31 Mar '14

Module: wine Branch: master Commit: ebd99188302b27351cdf72d5296fde8ff82922ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebd99188302b27351cdf72d52… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 31 12:30:43 2014 +0200 user32/tests: Fix compilation on systems that don't support nameless unions. --- dlls/user32/tests/win.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 5206642..0966bad 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7548,13 +7548,13 @@ START_TEST(win) memset(input, 0, sizeof(input)); input[0].type = INPUT_MOUSE; - input[0].mi.dx = 101; - input[0].mi.dy = 101; - input[0].mi.dwFlags = MOUSEEVENTF_LEFTDOWN; + U(input[0]).mi.dx = 101; + U(input[0]).mi.dy = 101; + U(input[0]).mi.dwFlags = MOUSEEVENTF_LEFTDOWN; input[0].type = INPUT_MOUSE; - input[0].mi.dx = 101; - input[0].mi.dy = 101; - input[0].mi.dwFlags = MOUSEEVENTF_LEFTUP; + U(input[0]).mi.dx = 101; + U(input[0]).mi.dy = 101; + U(input[0]).mi.dwFlags = MOUSEEVENTF_LEFTUP; events_no = SendInput(2, input, sizeof(input[0])); ok(events_no == 2, "SendInput returned %d\n", events_no); ok(SetForegroundWindow(hwndMain), "SetForegroundWindow failed\n");

1 0

André Hentschel : Add WWN 366
by Jeremy Newman 30 Mar '14

30 Mar '14

Module: website Branch: master Commit: 8e310384aaf5187c307256a4890352981faf712e URL: http://source.winehq.org/git/website.git/?a=commit;h=8e310384aaf5187c307256… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 29 15:46:01 2014 +0100 Add WWN 366 --- news/de/2014031401.xml | 2 +- news/de/2014032801.xml | 15 + news/en/2014032801.xml | 15 + wwn/en/wn20140328_366.xml | 735 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 766 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=8e310384aaf5187c30…

1 0

Jacek Caban : ntdll: Reserve TLS slot 0 for broken apps that compare index to 0 instead of TLS_OUT_OF_INDEXES.
by Alexandre Julliard 28 Mar '14

28 Mar '14

Module: wine Branch: master Commit: 93920c3893709d0e8f9b96eaf05e9333df89a7e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93920c3893709d0e8f9b96eaf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 28 13:46:17 2014 +0100 ntdll: Reserve TLS slot 0 for broken apps that compare index to 0 instead of TLS_OUT_OF_INDEXES. --- dlls/kernel32/tests/thread.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/ntdll/thread.c | 1 + 2 files changed, 39 insertions(+) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index ae60d88..36414ec 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1638,6 +1638,43 @@ static void test_threadpool(void) todo_wine ok (pool != NULL, "CreateThreadpool failed\n"); } +static void test_reserved_tls(void) +{ + void *val; + DWORD tls; + BOOL ret; + + /* This seems to be a WinXP+ feature. */ + if(!pCreateActCtxW) { + win_skip("Skipping reserved TLS slot on too old Windows.\n"); + return; + } + + val = TlsGetValue(0); + ok(!val, "TlsGetValue(0) = %p\n", val); + + /* Also make sure that there is a TLS allocated. */ + tls = TlsAlloc(); + ok(tls && tls != TLS_OUT_OF_INDEXES, "tls = %x\n", tls); + TlsSetValue(tls, (void*)1); + + val = TlsGetValue(0); + ok(!val, "TlsGetValue(0) = %p\n", val); + + TlsFree(tls); + + /* The following is too ugly to be run by default */ + if(0) { + /* Set TLS index 0 value and see that this works and doesn't cause problems + * for remaining tests. */ + ret = TlsSetValue(0, (void*)1); + ok(ret, "TlsSetValue(0, 1) failed: %u\n", GetLastError()); + + val = TlsGetValue(0); + ok(val == (void*)1, "TlsGetValue(0) = %p\n", val); + } +} + static void init_funcs(void) { HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); @@ -1711,6 +1748,7 @@ START_TEST(thread) return; } + test_reserved_tls(); test_CreateRemoteThread(); test_CreateThread_basic(); test_CreateThread_suspended(); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 9f0dfc0..28cb42b 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -256,6 +256,7 @@ HANDLE thread_init(void) RtlInitializeBitMap( &tls_expansion_bitmap, peb->TlsExpansionBitmapBits, sizeof(peb->TlsExpansionBitmapBits) * 8 ); RtlInitializeBitMap( &fls_bitmap, peb->FlsBitmapBits, sizeof(peb->FlsBitmapBits) * 8 ); + RtlSetBits( peb->TlsBitmap, 0, 1 ); /* TLS index 0 is reserved and should be initialized to NULL. */ InitializeListHead( &peb->FlsListHead ); InitializeListHead( &ldr.InLoadOrderModuleList ); InitializeListHead( &ldr.InMemoryOrderModuleList );

1 0

Alexandre Julliard : kernel32: Don't allocate FLS index 0.
by Alexandre Julliard 28 Mar '14

28 Mar '14

Module: wine Branch: master Commit: 598c5816d92d84e579b7554c4ce24050f89d1571 URL: http://source.winehq.org/git/wine.git/?a=commit;h=598c5816d92d84e579b7554c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 28 16:20:21 2014 +0100 kernel32: Don't allocate FLS index 0. --- dlls/kernel32/fiber.c | 6 +++--- dlls/kernel32/process.c | 2 +- dlls/kernel32/tests/fiber.c | 29 +++++++++++++++++++++++++++++ dlls/ntdll/thread.c | 1 + 4 files changed, 34 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/fiber.c b/dlls/kernel32/fiber.c index ca4c8f9..151a676 100644 --- a/dlls/kernel32/fiber.c +++ b/dlls/kernel32/fiber.c @@ -230,7 +230,7 @@ DWORD WINAPI FlsAlloc( PFLS_CALLBACK_FUNCTION callback ) } else { - index = RtlFindClearBitsAndSet( peb->FlsBitmap, 1, 0 ); + index = RtlFindClearBitsAndSet( peb->FlsBitmap, 1, 1 ); if (index != ~0U) { if (!NtCurrentTeb()->FlsSlots && @@ -279,7 +279,7 @@ BOOL WINAPI FlsFree( DWORD index ) */ PVOID WINAPI FlsGetValue( DWORD index ) { - if (index >= 8 * sizeof(NtCurrentTeb()->Peb->FlsBitmapBits) || !NtCurrentTeb()->FlsSlots) + if (!index || index >= 8 * sizeof(NtCurrentTeb()->Peb->FlsBitmapBits) || !NtCurrentTeb()->FlsSlots) { SetLastError( ERROR_INVALID_PARAMETER ); return NULL; @@ -293,7 +293,7 @@ PVOID WINAPI FlsGetValue( DWORD index ) */ BOOL WINAPI FlsSetValue( DWORD index, PVOID data ) { - if (index >= 8 * sizeof(NtCurrentTeb()->Peb->FlsBitmapBits)) + if (!index || index >= 8 * sizeof(NtCurrentTeb()->Peb->FlsBitmapBits)) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 3ff47e1..0b70a55 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2768,7 +2768,7 @@ DWORD WINAPI TlsAlloc( void ) PEB * const peb = NtCurrentTeb()->Peb; RtlAcquirePebLock(); - index = RtlFindClearBitsAndSet( peb->TlsBitmap, 1, 0 ); + index = RtlFindClearBitsAndSet( peb->TlsBitmap, 1, 1 ); if (index != ~0U) NtCurrentTeb()->TlsSlots[index] = 0; /* clear the value */ else { diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index 96f60d0..1e4ca66 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -181,6 +181,35 @@ static void test_FiberLocalStorage(PFLS_CALLBACK_FUNCTION cbfunc) ok(ret, "FlsFree failed\n"); if (cbfunc) todo_wine ok(cbCount == 1, "Wrong callback count: %d\n", cbCount); + + /* test index 0 */ + SetLastError( 0xdeadbeef ); + val = pFlsGetValue( 0 ); + ok( !val, "fls index 0 set to %p\n", val ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "setting fls index wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = pFlsSetValue( 0, (void *)0xdeadbeef ); + ok( !ret, "setting fls index 0 succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "setting fls index wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + val = pFlsGetValue( 0 ); + ok( !val, "fls index 0 wrong value %p\n", val ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "setting fls index wrong error %u\n", GetLastError() ); + + fls = pFlsAlloc( NULL ); + ok( fls != FLS_OUT_OF_INDEXES, "FlsAlloc failed\n" ); + ok( fls != 0, "fls index 0 allocated\n" ); + val = pFlsGetValue( fls ); + ok( !val, "fls index %u wrong value %p\n", fls, val ); + ret = pFlsSetValue( fls, (void *)0xdeadbeef ); + ok( ret, "setting fls index %u failed\n", fls ); + val = pFlsGetValue( fls ); + ok( val == (void *)0xdeadbeef, "fls index %u wrong value %p\n", fls, val ); + pFlsFree( fls ); + ret = pFlsSetValue( fls, (void *)0xdeadbabe ); + ok( ret, "setting fls index %u failed\n", fls ); + val = pFlsGetValue( fls ); + ok( val == (void *)0xdeadbabe, "fls index %u wrong value %p\n", fls, val ); } START_TEST(fiber) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 28cb42b..56ea033 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -257,6 +257,7 @@ HANDLE thread_init(void) sizeof(peb->TlsExpansionBitmapBits) * 8 ); RtlInitializeBitMap( &fls_bitmap, peb->FlsBitmapBits, sizeof(peb->FlsBitmapBits) * 8 ); RtlSetBits( peb->TlsBitmap, 0, 1 ); /* TLS index 0 is reserved and should be initialized to NULL. */ + RtlSetBits( peb->FlsBitmap, 0, 1 ); InitializeListHead( &peb->FlsListHead ); InitializeListHead( &ldr.InLoadOrderModuleList ); InitializeListHead( &ldr.InMemoryOrderModuleList );

1 0

Erich E. Hoover : ws2_32: Ask the server to process unsupported WSAIoctl operations.
by Alexandre Julliard 28 Mar '14

28 Mar '14

Module: wine Branch: master Commit: 5963d7f09c0b83e01dec6787dd0aceb6ee610d81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5963d7f09c0b83e01dec6787d… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Tue Mar 18 19:45:17 2014 +0100 ws2_32: Ask the server to process unsupported WSAIoctl operations. --- dlls/ws2_32/socket.c | 60 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 53 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index cdcbb11..fe85356 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3673,6 +3673,40 @@ static const char *debugstr_wsaioctl(DWORD ioctl) (USHORT)(ioctl & 0xffff)); } +/* do an ioctl call through the server */ +static DWORD server_ioctl_sock( SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, + LPVOID out_buff, DWORD out_size, LPDWORD ret_size, + LPWSAOVERLAPPED overlapped, + LPWSAOVERLAPPED_COMPLETION_ROUTINE completion ) +{ + HANDLE event = overlapped ? overlapped->hEvent : 0; + HANDLE handle = SOCKET2HANDLE( s ); + struct ws2_async *wsa; + NTSTATUS status; + PIO_STATUS_BLOCK io; + + if (!(wsa = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*wsa) ))) + return WSA_NOT_ENOUGH_MEMORY; + wsa->hSocket = handle; + wsa->user_overlapped = overlapped; + wsa->completion_func = completion; + io = (overlapped ? (PIO_STATUS_BLOCK)overlapped : &wsa->local_iosb); + + status = NtDeviceIoControlFile( handle, event, (PIO_APC_ROUTINE)ws2_async_apc, wsa, io, code, + in_buff, in_size, out_buff, out_size ); + if (status == STATUS_NOT_SUPPORTED) + { + FIXME("Unsupported ioctl %x (device=%x access=%x func=%x method=%x)\n", + code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3); + } + else if (status == STATUS_SUCCESS) + *ret_size = io->Information; /* "Information" is the size written to the output buffer */ + + if (status != STATUS_PENDING) RtlFreeHeap( GetProcessHeap(), 0, wsa ); + + return NtStatusToWSAError( status ); +} + /********************************************************************** * WSAIoctl (WS2_32.50) * @@ -3865,12 +3899,6 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID break; } - case WS_SIO_ADDRESS_LIST_CHANGE: - FIXME("-> SIO_ADDRESS_LIST_CHANGE request: stub\n"); - /* FIXME: error and return code depend on whether socket was created - * with WSA_FLAG_OVERLAPPED, but there is no easy way to get this */ - break; - case WS_SIO_ADDRESS_LIST_QUERY: { DWORD size; @@ -4106,11 +4134,29 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID WSASetLastError(WSAEOPNOTSUPP); return SOCKET_ERROR; default: - FIXME("unsupported WS_IOCTL cmd (%s)\n", debugstr_wsaioctl(code)); status = WSAEOPNOTSUPP; break; } + if (status == WSAEOPNOTSUPP) + { + status = server_ioctl_sock(s, code, in_buff, in_size, out_buff, out_size, &total, + overlapped, completion); + if (status != WSAEOPNOTSUPP) + { + if (status == 0 || status == WSA_IO_PENDING) + TRACE("-> %s request\n", debugstr_wsaioctl(code)); + else + ERR("-> %s request failed with status 0x%x\n", debugstr_wsaioctl(code), status); + + /* overlapped and completion operations will be handled by the server */ + completion = NULL; + overlapped = NULL; + } + else + FIXME("unsupported WS_IOCTL cmd (%s)\n", debugstr_wsaioctl(code)); + } + if (completion) { FIXME( "completion routine %p not supported\n", completion );

1 0

Hans Leidekker : riched20: Don' t return DLGC_HASSETSEL from WM_GETDLGCODE if the control style includes ES_SAVESEL.
by Alexandre Julliard 28 Mar '14

28 Mar '14

Module: wine Branch: master Commit: db094db851292280670042d25bdc7caad6958936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db094db851292280670042d25… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 28 17:41:52 2014 +0100 riched20: Don't return DLGC_HASSETSEL from WM_GETDLGCODE if the control style includes ES_SAVESEL. --- dlls/riched20/editor.c | 5 ++++- dlls/riched20/tests/editor.c | 10 ++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d38d28e..1d17ef0 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3142,11 +3142,14 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return ME_StreamOut(editor, wParam, (EDITSTREAM *)lParam); case WM_GETDLGCODE: { - UINT code = DLGC_WANTCHARS|DLGC_WANTTAB|DLGC_WANTARROWS|DLGC_HASSETSEL; + UINT code = DLGC_WANTCHARS|DLGC_WANTTAB|DLGC_WANTARROWS; + if (lParam) editor->bDialogMode = TRUE; if (editor->styleFlags & ES_MULTILINE) code |= DLGC_WANTMESSAGE; + if (!(editor->styleFlags & ES_SAVESEL)) + code |= DLGC_HASSETSEL; return code; } case EM_EMPTYUNDOBUFFER: diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 2efee9a..309de7a 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -6729,6 +6729,16 @@ static void test_WM_GETDLGCODE(void) ok(res == expected, "WM_GETDLGCODE returned %x but expected %x\n", res, expected); DestroyWindow(hwnd); + + hwnd = CreateWindowExA(0, RICHEDIT_CLASS20A, NULL, + WS_POPUP|ES_SAVESEL, + 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS20A, (int) GetLastError()); + res = SendMessageA(hwnd, WM_GETDLGCODE, 0, 0); + expected = DLGC_WANTCHARS|DLGC_WANTTAB|DLGC_WANTARROWS; + ok(res == expected, "WM_GETDLGCODE returned %x but expected %x\n", + res, expected); + DestroyWindow(hwnd); } static void test_zoom(void)

1 0

Hugh McMaster : regsvr32: Fix filename in version definition.
by Alexandre Julliard 28 Mar '14

28 Mar '14

Module: wine Branch: master Commit: 2aad5d7cafa3bdcfe5fa993f9c0ff7b7c62601e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aad5d7cafa3bdcfe5fa993f9… Author: Hugh McMaster <hugh.mcmaster(a)masterindexing.com> Date: Fri Mar 28 15:57:05 2014 +1100 regsvr32: Fix filename in version definition. --- programs/regsvr32/regsvr32.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regsvr32/regsvr32.rc b/programs/regsvr32/regsvr32.rc index ba6d799..b415ede 100644 --- a/programs/regsvr32/regsvr32.rc +++ b/programs/regsvr32/regsvr32.rc @@ -51,7 +51,7 @@ Options:\n\ } #define WINE_FILEDESCRIPTION_STR "Wine Register Server" -#define WINE_FILENAME_STR "REGSVR32" +#define WINE_FILENAME_STR "REGSVR32.EXE" #define WINE_FILETYPE VFT_APP #define WINE_FILEVERSION 5,0,1586,1 #define WINE_FILEVERSION_STR "5.0.1586.1"

1 0

Stefan Dösinger : wined3d: Select the component by editing the swizzle.
by Alexandre Julliard 27 Mar '14

27 Mar '14

Module: wine Branch: master Commit: f20173e51b38fa4dc2bc416e23f5a9c471a22800 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f20173e51b38fa4dc2bc416e2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 27 11:46:10 2014 +0100 wined3d: Select the component by editing the swizzle. --- dlls/wined3d/arb_program_shader.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1eab0eb..fdad2d0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1792,6 +1792,11 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) static void shader_hw_nop(const struct wined3d_shader_instruction *ins) {} +static DWORD shader_arb_select_component(DWORD swizzle, DWORD component) +{ + return ((swizzle >> 2 * component) & 0x3) * 0x55; +} + static void shader_hw_mov(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader *shader = ins->ctx->shader; @@ -1862,7 +1867,7 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) * with more than one component. Thus replicate the first source argument over all * 4 components. For example, .xyzw -> .x (or better: .xxxx), .zwxy -> .z, etc) */ struct wined3d_shader_src_param tmp_src = ins->src[0]; - tmp_src.swizzle = (tmp_src.swizzle & 0x3) * 0x55; + tmp_src.swizzle = shader_arb_select_component(tmp_src.swizzle, 0); shader_arb_get_src_param(ins, &tmp_src, 0, src0_param); shader_addline(buffer, "ARL A0.x, %s;\n", src0_param); } @@ -2496,6 +2501,7 @@ static void shader_hw_scalar_op(const struct wined3d_shader_instruction *ins) { struct wined3d_shader_buffer *buffer = ins->ctx->buffer; const char *instruction; + struct wined3d_shader_src_param src0_copy = ins->src[0]; char dst[50]; char src[50]; @@ -2511,15 +2517,12 @@ static void shader_hw_scalar_op(const struct wined3d_shader_instruction *ins) break; } + /* Dx sdk says .x is used if no swizzle is given, but our test shows that + * .w is used. */ + src0_copy.swizzle = shader_arb_select_component(src0_copy.swizzle, 3); + shader_arb_get_dst_param(ins, &ins->dst[0], dst); /* Destination */ - shader_arb_get_src_param(ins, &ins->src[0], 0, src); - if (ins->src[0].swizzle == WINED3DSP_NOSWIZZLE) - { - /* Dx sdk says .x is used if no swizzle is given, but our test shows that - * .w is used - */ - strcat(src, ".w"); - } + shader_arb_get_src_param(ins, &src0_copy, 0, src); shader_addline(buffer, "%s%s %s, %s;\n", instruction, shader_arb_get_modifier(ins), dst, src); }

1 0

Stefan Dösinger : wined3d: Handle LOG and LOGP in shader_hw_scalar_op.
by Alexandre Julliard 27 Mar '14

27 Mar '14

Module: wine Branch: master Commit: 5114507f199ac715849cab0c2c1667aa4e2f5721 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5114507f199ac715849cab0c2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 27 11:46:11 2014 +0100 wined3d: Handle LOG and LOGP in shader_hw_scalar_op. --- dlls/wined3d/arb_program_shader.c | 106 ++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 61 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index fdad2d0..0a669df 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2497,11 +2497,36 @@ static void shader_hw_rcp(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "RCP%s %s, %s;\n", shader_arb_get_modifier(ins), dst, src); } +static DWORD abs_modifier(DWORD mod, BOOL *need_abs) +{ + *need_abs = FALSE; + + switch(mod) + { + case WINED3DSPSM_NONE: return WINED3DSPSM_ABS; + case WINED3DSPSM_NEG: return WINED3DSPSM_ABS; + case WINED3DSPSM_BIAS: *need_abs = TRUE; return WINED3DSPSM_BIAS; + case WINED3DSPSM_BIASNEG: *need_abs = TRUE; return WINED3DSPSM_BIASNEG; + case WINED3DSPSM_SIGN: *need_abs = TRUE; return WINED3DSPSM_SIGN; + case WINED3DSPSM_SIGNNEG: *need_abs = TRUE; return WINED3DSPSM_SIGNNEG; + case WINED3DSPSM_COMP: *need_abs = TRUE; return WINED3DSPSM_COMP; + case WINED3DSPSM_X2: *need_abs = TRUE; return WINED3DSPSM_X2; + case WINED3DSPSM_X2NEG: *need_abs = TRUE; return WINED3DSPSM_X2NEG; + case WINED3DSPSM_DZ: *need_abs = TRUE; return WINED3DSPSM_DZ; + case WINED3DSPSM_DW: *need_abs = TRUE; return WINED3DSPSM_DW; + case WINED3DSPSM_ABS: return WINED3DSPSM_ABS; + case WINED3DSPSM_ABSNEG: return WINED3DSPSM_ABS; + } + FIXME("Unknown modifier %u\n", mod); + return mod; +} + static void shader_hw_scalar_op(const struct wined3d_shader_instruction *ins) { struct wined3d_shader_buffer *buffer = ins->ctx->buffer; const char *instruction; struct wined3d_shader_src_param src0_copy = ins->src[0]; + BOOL need_abs = FALSE; char dst[50]; char src[50]; @@ -2512,6 +2537,14 @@ static void shader_hw_scalar_op(const struct wined3d_shader_instruction *ins) case WINED3DSIH_RCP: instruction = "RCP"; break; case WINED3DSIH_EXP: instruction = "EX2"; break; case WINED3DSIH_EXPP: instruction = "EXP"; break; + case WINED3DSIH_LOG: + src0_copy.modifiers = abs_modifier(src0_copy.modifiers, &need_abs); + instruction = "LG2"; + break; + case WINED3DSIH_LOGP: + src0_copy.modifiers = abs_modifier(src0_copy.modifiers, &need_abs); + instruction = "LOG"; + break; default: instruction = ""; FIXME("Unhandled opcode %#x\n", ins->handler_idx); break; @@ -2524,7 +2557,16 @@ static void shader_hw_scalar_op(const struct wined3d_shader_instruction *ins) shader_arb_get_dst_param(ins, &ins->dst[0], dst); /* Destination */ shader_arb_get_src_param(ins, &src0_copy, 0, src); - shader_addline(buffer, "%s%s %s, %s;\n", instruction, shader_arb_get_modifier(ins), dst, src); + if(need_abs) + { + shader_addline(buffer, "ABS TA.w, %s;\n", src); + shader_addline(buffer, "%s%s %s, TA.w;\n", instruction, shader_arb_get_modifier(ins), dst); + } + else + { + shader_addline(buffer, "%s%s %s, %s;\n", instruction, shader_arb_get_modifier(ins), dst, src); + } + } static void shader_hw_nrm(const struct wined3d_shader_instruction *ins) @@ -2764,64 +2806,6 @@ static void shader_hw_dsy(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "MUL%s %s, %s, ycorrection.y;\n", shader_arb_get_modifier(ins), dst, dst_name); } -static DWORD abs_modifier(DWORD mod, BOOL *need_abs) -{ - *need_abs = FALSE; - - switch(mod) - { - case WINED3DSPSM_NONE: return WINED3DSPSM_ABS; - case WINED3DSPSM_NEG: return WINED3DSPSM_ABS; - case WINED3DSPSM_BIAS: *need_abs = TRUE; return WINED3DSPSM_BIAS; - case WINED3DSPSM_BIASNEG: *need_abs = TRUE; return WINED3DSPSM_BIASNEG; - case WINED3DSPSM_SIGN: *need_abs = TRUE; return WINED3DSPSM_SIGN; - case WINED3DSPSM_SIGNNEG: *need_abs = TRUE; return WINED3DSPSM_SIGNNEG; - case WINED3DSPSM_COMP: *need_abs = TRUE; return WINED3DSPSM_COMP; - case WINED3DSPSM_X2: *need_abs = TRUE; return WINED3DSPSM_X2; - case WINED3DSPSM_X2NEG: *need_abs = TRUE; return WINED3DSPSM_X2NEG; - case WINED3DSPSM_DZ: *need_abs = TRUE; return WINED3DSPSM_DZ; - case WINED3DSPSM_DW: *need_abs = TRUE; return WINED3DSPSM_DW; - case WINED3DSPSM_ABS: return WINED3DSPSM_ABS; - case WINED3DSPSM_ABSNEG: return WINED3DSPSM_ABS; - } - FIXME("Unknown modifier %u\n", mod); - return mod; -} - -static void shader_hw_log(const struct wined3d_shader_instruction *ins) -{ - struct wined3d_shader_buffer *buffer = ins->ctx->buffer; - char src0[50], dst[50]; - struct wined3d_shader_src_param src0_copy = ins->src[0]; - BOOL need_abs = FALSE; - const char *instr; - - switch(ins->handler_idx) - { - case WINED3DSIH_LOG: instr = "LG2"; break; - case WINED3DSIH_LOGP: instr = "LOG"; break; - default: - ERR("Unexpected instruction %d\n", ins->handler_idx); - return; - } - - /* LOG and LOGP operate on the absolute value of the input */ - src0_copy.modifiers = abs_modifier(src0_copy.modifiers, &need_abs); - - shader_arb_get_dst_param(ins, &ins->dst[0], dst); - shader_arb_get_src_param(ins, &src0_copy, 0, src0); - - if(need_abs) - { - shader_addline(buffer, "ABS TA, %s;\n", src0); - shader_addline(buffer, "%s%s %s, TA;\n", instr, shader_arb_get_modifier(ins), dst); - } - else - { - shader_addline(buffer, "%s%s %s, %s;\n", instr, shader_arb_get_modifier(ins), dst, src0); - } -} - static void shader_hw_pow(const struct wined3d_shader_instruction *ins) { struct wined3d_shader_buffer *buffer = ins->ctx->buffer; @@ -5246,8 +5230,8 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_LABEL */ shader_hw_label, /* WINED3DSIH_LD */ NULL, /* WINED3DSIH_LIT */ shader_hw_map2gl, - /* WINED3DSIH_LOG */ shader_hw_log, - /* WINED3DSIH_LOGP */ shader_hw_log, + /* WINED3DSIH_LOG */ shader_hw_scalar_op, + /* WINED3DSIH_LOGP */ shader_hw_scalar_op, /* WINED3DSIH_LOOP */ shader_hw_loop, /* WINED3DSIH_LRP */ shader_hw_lrp, /* WINED3DSIH_LT */ NULL,

1 0

Stefan Dösinger : wined3d: Handle RCP in shader_hw_scalar_op.
by Alexandre Julliard 27 Mar '14

27 Mar '14

Module: wine Branch: master Commit: c2541a588781e8e7d2b494e55285fd3809dba916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2541a588781e8e7d2b494e55… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 27 11:46:12 2014 +0100 wined3d: Handle RCP in shader_hw_scalar_op. --- dlls/wined3d/arb_program_shader.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0a669df..5a76332 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2477,26 +2477,6 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) } } -static void shader_hw_rcp(const struct wined3d_shader_instruction *ins) -{ - struct wined3d_shader_buffer *buffer = ins->ctx->buffer; - - char dst[50]; - char src[50]; - - shader_arb_get_dst_param(ins, &ins->dst[0], dst); /* Destination */ - shader_arb_get_src_param(ins, &ins->src[0], 0, src); - if (ins->src[0].swizzle == WINED3DSP_NOSWIZZLE) - { - /* Dx sdk says .x is used if no swizzle is given, but our test shows that - * .w is used - */ - strcat(src, ".w"); - } - - shader_addline(buffer, "RCP%s %s, %s;\n", shader_arb_get_modifier(ins), dst, src); -} - static DWORD abs_modifier(DWORD mod, BOOL *need_abs) { *need_abs = FALSE; @@ -5251,7 +5231,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_NRM */ shader_hw_nrm, /* WINED3DSIH_PHASE */ shader_hw_nop, /* WINED3DSIH_POW */ shader_hw_pow, - /* WINED3DSIH_RCP */ shader_hw_rcp, + /* WINED3DSIH_RCP */ shader_hw_scalar_op, /* WINED3DSIH_REP */ shader_hw_rep, /* WINED3DSIH_RET */ shader_hw_ret, /* WINED3DSIH_ROUND_NI */ NULL,

1 0