November 2015 - Wine-commits

Nikolay Sivov : winmm: Initialize AUXCAPSA.wReserved1 returned from auxGetDevCapsA() (Coverity).
by Alexandre Julliard 16 Nov '15

16 Nov '15

Module: wine Branch: master Commit: 349f834976770baf6646ff812a807706d6e0c534 URL: http://source.winehq.org/git/wine.git/?a=commit;h=349f834976770baf6646ff812… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 16 02:42:40 2015 +0300 winmm: Initialize AUXCAPSA.wReserved1 returned from auxGetDevCapsA() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/winmm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 43f7268..a626a79 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -229,6 +229,7 @@ UINT WINAPI auxGetDevCapsA(UINT_PTR uDeviceID, LPAUXCAPSA lpCaps, UINT uSize) WideCharToMultiByte( CP_ACP, 0, acW.szPname, -1, acA.szPname, sizeof(acA.szPname), NULL, NULL ); acA.wTechnology = acW.wTechnology; + acA.wReserved1 = 0; acA.dwSupport = acW.dwSupport; memcpy(lpCaps, &acA, min(uSize, sizeof(acA))); }

1 0

Vincent Povirk : setupapi: Add a manifest to indicate the tests don' t need elevation.
by Alexandre Julliard 16 Nov '15

16 Nov '15

Module: wine Branch: master Commit: 295346f81d05e7669c512aec278fa9ea25b0f983 URL: http://source.winehq.org/git/wine.git/?a=commit;h=295346f81d05e7669c512aec2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Nov 15 20:23:28 2015 -0600 setupapi: Add a manifest to indicate the tests don't need elevation. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/Makefile.in | 2 ++ dlls/setupapi/tests/setupapi.manifest | 11 +++++++++++ dlls/setupapi/tests/setupapi.rc | 25 +++++++++++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/dlls/setupapi/tests/Makefile.in b/dlls/setupapi/tests/Makefile.in index 30902e7..083e576 100644 --- a/dlls/setupapi/tests/Makefile.in +++ b/dlls/setupapi/tests/Makefile.in @@ -10,3 +10,5 @@ C_SRCS = \ query.c \ setupcab.c \ stringtable.c + +RC_SRCS = setupapi.rc diff --git a/dlls/setupapi/tests/setupapi.manifest b/dlls/setupapi/tests/setupapi.manifest new file mode 100644 index 0000000..d0e3692 --- /dev/null +++ b/dlls/setupapi/tests/setupapi.manifest @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="Wine.SetupapiTest" version="0.0.0.0"/> + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> + <security> + <requestedPrivileges> + <requestedExecutionLevel level="asInvoker" uiAccess="false"/> + </requestedPrivileges> + </security> + </trustInfo> +</assembly> diff --git a/dlls/setupapi/tests/setupapi.rc b/dlls/setupapi/tests/setupapi.rc new file mode 100644 index 0000000..3af9a20 --- /dev/null +++ b/dlls/setupapi/tests/setupapi.rc @@ -0,0 +1,25 @@ +/* + * setupapi test resources + * + * Copyright 2015 Vincent Povirk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include <winuser.rh> + +/* @makedep: setupapi.manifest */ +1 RT_MANIFEST setupapi.manifest

1 0

Andrew Nguyen : dinput: Allow EnumDevices callback functions with broken calling conventions.
by Alexandre Julliard 16 Nov '15

16 Nov '15

Module: wine Branch: master Commit: 6566cd76ce56cc2cfca16123b16a286f02d27327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6566cd76ce56cc2cfca16123b… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon Nov 16 08:25:45 2015 +0100 dinput: Allow EnumDevices callback functions with broken calling conventions. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index aef9d10..24e7951 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -339,6 +339,25 @@ static DWORD diactionformat_priorityW(LPDIACTIONFORMATW lpdiaf, DWORD genre) return priorityFlags; } +#ifdef __i386__ +extern BOOL enum_callback_wrapper(void *callback, const void *instance, void *ref); +__ASM_GLOBAL_FUNC( enum_callback_wrapper, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ) +#else +#define enum_callback_wrapper(callback, instance, ref) (callback)((instance), (ref)) +#endif + /****************************************************************************** * IDirectInputA_EnumDevices */ @@ -371,7 +390,7 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices( TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); r = dinput_devices[i]->enum_deviceA(dwDevType, dwFlags, &devInstance, This->dwVersion, j); if (r == S_OK) - if (lpCallback(&devInstance,pvRef) == DIENUM_STOP) + if (enum_callback_wrapper(lpCallback, &devInstance, pvRef) == DIENUM_STOP) return S_OK; } } @@ -411,7 +430,7 @@ static HRESULT WINAPI IDirectInputWImpl_EnumDevices( TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); r = dinput_devices[i]->enum_deviceW(dwDevType, dwFlags, &devInstance, This->dwVersion, j); if (r == S_OK) - if (lpCallback(&devInstance,pvRef) == DIENUM_STOP) + if (enum_callback_wrapper(lpCallback, &devInstance, pvRef) == DIENUM_STOP) return S_OK; } }

1 0

Sebastian Lackner : server: Do not require SeBackupPrivilege in load_registry and unload_registry.
by Alexandre Julliard 16 Nov '15

16 Nov '15

Module: wine Branch: master Commit: 96f4f53937915955063865d2949265d8d1576794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96f4f53937915955063865d29… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Nov 16 08:32:29 2015 +0100 server: Do not require SeBackupPrivilege in load_registry and unload_registry. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 109 ++++++++++++++++++++++++----------------- server/registry.c | 20 +------- 2 files changed, 65 insertions(+), 64 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 8808822..254a8b6 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1513,39 +1513,6 @@ static void test_reg_delete_key(void) RegCloseKey(key); } -static void test_reg_save_key(void) -{ - DWORD ret; - - ret = RegSaveKeyA(hkey_main, "saved_key", NULL); - ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); -} - -static void test_reg_load_key(void) -{ - DWORD ret; - HKEY hkHandle; - - ret = RegLoadKeyA(HKEY_LOCAL_MACHINE, "Test", "saved_key"); - ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); - - ret = RegOpenKeyA(HKEY_LOCAL_MACHINE, "Test", &hkHandle); - ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); - - RegCloseKey(hkHandle); -} - -static void test_reg_unload_key(void) -{ - DWORD ret; - - ret = RegUnLoadKeyA(HKEY_LOCAL_MACHINE, "Test"); - ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); - - DeleteFileA("saved_key"); - DeleteFileA("saved_key.LOG"); -} - static BOOL set_privileges(LPCSTR privilege, BOOL set) { TOKEN_PRIVILEGES tp; @@ -1580,6 +1547,66 @@ static BOOL set_privileges(LPCSTR privilege, BOOL set) return TRUE; } +static void test_reg_save_key(void) +{ + DWORD ret; + + if (!set_privileges(SE_BACKUP_NAME, TRUE) || + !set_privileges(SE_RESTORE_NAME, FALSE)) + { + win_skip("Failed to set SE_BACKUP_NAME privileges, skipping tests\n"); + return; + } + + ret = RegSaveKeyA(hkey_main, "saved_key", NULL); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + + set_privileges(SE_BACKUP_NAME, FALSE); +} + +static void test_reg_load_key(void) +{ + DWORD ret; + HKEY hkHandle; + + if (!set_privileges(SE_RESTORE_NAME, TRUE) || + !set_privileges(SE_BACKUP_NAME, FALSE)) + { + win_skip("Failed to set SE_RESTORE_NAME privileges, skipping tests\n"); + return; + } + + ret = RegLoadKeyA(HKEY_LOCAL_MACHINE, "Test", "saved_key"); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + + set_privileges(SE_RESTORE_NAME, FALSE); + + ret = RegOpenKeyA(HKEY_LOCAL_MACHINE, "Test", &hkHandle); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + + RegCloseKey(hkHandle); +} + +static void test_reg_unload_key(void) +{ + DWORD ret; + + if (!set_privileges(SE_RESTORE_NAME, TRUE) || + !set_privileges(SE_BACKUP_NAME, FALSE)) + { + win_skip("Failed to set SE_RESTORE_NAME privileges, skipping tests\n"); + return; + } + + ret = RegUnLoadKeyA(HKEY_LOCAL_MACHINE, "Test"); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + + set_privileges(SE_RESTORE_NAME, FALSE); + + DeleteFileA("saved_key"); + DeleteFileA("saved_key.LOG"); +} + /* tests that show that RegConnectRegistry and OpenSCManager accept computer names without the \\ prefix (what MSDN says). */ @@ -3275,19 +3302,9 @@ START_TEST(registry) test_classesroot(); test_classesroot_enum(); test_classesroot_mask(); - - /* SaveKey/LoadKey require the SE_BACKUP_NAME privilege to be set */ - if (set_privileges(SE_BACKUP_NAME, TRUE) && - set_privileges(SE_RESTORE_NAME, TRUE)) - { - test_reg_save_key(); - test_reg_load_key(); - test_reg_unload_key(); - - set_privileges(SE_BACKUP_NAME, FALSE); - set_privileges(SE_RESTORE_NAME, FALSE); - } - + test_reg_save_key(); + test_reg_load_key(); + test_reg_unload_key(); test_reg_delete_tree(); test_rw_order(); test_deleted_key(); diff --git a/server/registry.c b/server/registry.c index c95e103..a3c1390 100644 --- a/server/registry.c +++ b/server/registry.c @@ -2182,17 +2182,9 @@ DECL_HANDLER(delete_key_value) DECL_HANDLER(load_registry) { struct key *key, *parent; - struct token *token = thread_get_impersonation_token( current ); struct unicode_str name; - const LUID_AND_ATTRIBUTES privs[] = - { - { SeBackupPrivilege, 0 }, - { SeRestorePrivilege, 0 }, - }; - - if (!token || !token_check_privileges( token, TRUE, privs, - sizeof(privs)/sizeof(privs[0]), NULL )) + if (!thread_single_check_privilege( current, &SeRestorePrivilege )) { set_error( STATUS_PRIVILEGE_NOT_HELD ); return; @@ -2214,16 +2206,8 @@ DECL_HANDLER(load_registry) DECL_HANDLER(unload_registry) { struct key *key; - struct token *token = thread_get_impersonation_token( current ); - - const LUID_AND_ATTRIBUTES privs[] = - { - { SeBackupPrivilege, 0 }, - { SeRestorePrivilege, 0 }, - }; - if (!token || !token_check_privileges( token, TRUE, privs, - sizeof(privs)/sizeof(privs[0]), NULL )) + if (!thread_single_check_privilege( current, &SeRestorePrivilege )) { set_error( STATUS_PRIVILEGE_NOT_HELD ); return;

1 0

Hugh McMaster : reg/tests: Fix the add empty type test.
by Alexandre Julliard 16 Nov '15

16 Nov '15

Module: wine Branch: master Commit: 9e4e1cf9be9dd1f71879bb85eb003b021c652096 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e4e1cf9be9dd1f71879bb85e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Nov 16 11:53:07 2015 +1100 reg/tests: Fix the add empty type test. The exit code of this test will always be REG_EXIT_FAILURE, so the return code is neither broken nor todo_wine. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 2880d37..4981bdd 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -110,12 +110,7 @@ static void test_add(void) /* Test empty type */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v emptyType /t \"\" /d WineTest /f", &r); - todo_wine ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), - "got exit code %u\n", r); - if (r == REG_EXIT_SUCCESS) - todo_wine verify_reg(hkey, "emptyType", REG_SZ, "", 1, 0); - else - todo_wine win_skip("broken reg.exe detected\n"); + ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); /* Test input key formats */ run_reg_exe("reg add \\HKCU\\" KEY_BASE "\\keytest0 /f", &r);

1 0

Hugh McMaster : cmd: Set colour attributes when clearing the screen with ' cls'.
by Alexandre Julliard 16 Nov '15

16 Nov '15

Module: wine Branch: master Commit: ca8b3843abc7407212ec83c2d70d7a09bbb70ba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca8b3843abc7407212ec83c2d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Nov 16 11:53:06 2015 +1100 cmd: Set colour attributes when clearing the screen with 'cls'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index e9b9ddd..22f0580 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -236,13 +236,14 @@ void WCMD_clear_screen (void) { if (GetConsoleScreenBufferInfo(hStdOut, &consoleInfo)) { COORD topLeft; - DWORD screenSize; + DWORD screenSize, written; screenSize = consoleInfo.dwSize.X * (consoleInfo.dwSize.Y + 1); topLeft.X = 0; topLeft.Y = 0; - FillConsoleOutputCharacterW(hStdOut, ' ', screenSize, topLeft, &screenSize); + FillConsoleOutputCharacterW(hStdOut, ' ', screenSize, topLeft, &written); + FillConsoleOutputAttribute(hStdOut, consoleInfo.wAttributes, screenSize, topLeft, &written); SetConsoleCursorPosition(hStdOut, topLeft); } }

1 0

Andrey Gusev : wine.inf: Add HKLM\Software\Microsoft\MediaPlayer\Installation DirectoryLFN key.
by Alexandre Julliard 16 Nov '15

16 Nov '15

Module: wine Branch: master Commit: 6b97ce5bf00756f2a6835512e6e496b26c0dd043 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b97ce5bf00756f2a6835512e… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Nov 16 12:54:37 2015 +0200 wine.inf: Add HKLM\Software\Microsoft\MediaPlayer\Installation DirectoryLFN key. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index e091727..c8de5f9 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -635,6 +635,7 @@ HKLM,Software\Microsoft\DFS,,16 HKLM,Software\Microsoft\Driver Signing,,16 HKLM,Software\Microsoft\EnterpriseCertificates,,16 HKLM,Software\Microsoft\EventSystem,,16 +HKLM,Software\Microsoft\MediaPlayer,"Installation DirectoryLFN",2,"%16422%\Windows Media Player" HKLM,Software\Microsoft\MediaPlayer\PlayerUpgrade,"PlayerVersion",2,"12,0,7601,18840" HKLM,Software\Microsoft\MSMQ,,16 HKLM,Software\Microsoft\Non-Driver Signing,,16

1 0

Andrew Eikum : user32: Use font default height if GetTextExtentPoint returns empty rectangle.
by Alexandre Julliard 16 Nov '15

16 Nov '15

Module: wine Branch: master Commit: c465209cc1578cf39074b4a8574f7444a0a03891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c465209cc1578cf39074b4a85… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Nov 13 14:52:10 2015 -0600 user32: Use font default height if GetTextExtentPoint returns empty rectangle. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/text.c | 48 +++++++++++++++++++++++------------------------- dlls/user32/text.c | 9 +++++++-- 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 06705a7..df8d3ee 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -604,15 +604,13 @@ static void strfmt( const char *str, char *strout) #define TABTEST( tabval, tabcount, string, _exp) \ -{ int i,x_act, x_exp; char strdisp[64];\ +{ int i; char strdisp[64];\ for(i=0;i<8;i++) tabs[i]=(i+1)*(tabval); \ extent = GetTabbedTextExtentA( hdc, string, strlen( string), (tabcount), tabs); \ strfmt( string, strdisp); \ /* trace( "Extent is %08lx\n", extent); */\ - x_act = LOWORD( extent); \ - x_exp = (_exp); \ - ok( x_act == x_exp, "Test case \"%s\". Text extent is %d, expected %d tab %d tabcount %d\n", \ - strdisp, x_act, x_exp, tabval, tabcount); \ + ok( extent == _exp, "Test case \"%s\". Text extent is 0x%x, expected 0x%x tab %d tabcount %d\n", \ + strdisp, extent, _exp, tabval, tabcount); \ } \ @@ -649,16 +647,16 @@ static void test_TabbedText(void) tab = (cx *4 + t); /* test the special case tabcount =1 and the general array (80 of tabs */ for( tabcount = 1; tabcount <= 8; tabcount +=7) { - TABTEST( align * tab, tabcount, "\t", tab) - TABTEST( align * tab, tabcount, "xxx\t", tab) - TABTEST( align * tab, tabcount, "\tx", tab+cx) - TABTEST( align * tab, tabcount, "\t\t", tab*2) - TABTEST( align * tab, tabcount, "\tx\t", tab*2) - TABTEST( align * tab, tabcount, "x\tx", tab+cx) - TABTEST( align * tab, tabcount, "xx\tx", tab+cx) - TABTEST( align * tab, tabcount, "xxx\tx", tab+cx) - TABTEST( align * tab, tabcount, "xxxx\tx", t>0 ? tab + cx : 2*tab+cx) - TABTEST( align * tab, tabcount, "xxxxx\tx", 2*tab+cx) + TABTEST( align * tab, tabcount, "\t", MAKELONG(tab, cy)) + TABTEST( align * tab, tabcount, "xxx\t", MAKELONG(tab, cy)) + TABTEST( align * tab, tabcount, "\tx", MAKELONG(tab+cx, cy)) + TABTEST( align * tab, tabcount, "\t\t", MAKELONG(tab*2, cy)) + TABTEST( align * tab, tabcount, "\tx\t", MAKELONG(tab*2, cy)) + TABTEST( align * tab, tabcount, "x\tx", MAKELONG(tab+cx, cy)) + TABTEST( align * tab, tabcount, "xx\tx", MAKELONG(tab+cx, cy)) + TABTEST( align * tab, tabcount, "xxx\tx", MAKELONG(tab+cx, cy)) + TABTEST( align * tab, tabcount, "xxxx\tx", MAKELONG(t>0 ? tab + cx : 2*tab+cx, cy)) + TABTEST( align * tab, tabcount, "xxxxx\tx", MAKELONG(2*tab+cx, cy)) } } align=-1; @@ -667,16 +665,16 @@ static void test_TabbedText(void) tab = (cx *4 + t); /* test the special case tabcount =1 and the general array (8) of tabs */ for( tabcount = 1; tabcount <= 8; tabcount +=7) { - TABTEST( align * tab, tabcount, "\t", tab) - TABTEST( align * tab, tabcount, "xxx\t", tab) - TABTEST( align * tab, tabcount, "\tx", tab) - TABTEST( align * tab, tabcount, "\t\t", tab*2) - TABTEST( align * tab, tabcount, "\tx\t", tab*2) - TABTEST( align * tab, tabcount, "x\tx", tab) - TABTEST( align * tab, tabcount, "xx\tx", tab) - TABTEST( align * tab, tabcount, "xxx\tx", 4 * cx >= tab ? 2*tab :tab) - TABTEST( align * tab, tabcount, "xxxx\tx", 2*tab) - TABTEST( align * tab, tabcount, "xxxxx\tx", 2*tab) + TABTEST( align * tab, tabcount, "\t", MAKELONG(tab, cy)) + TABTEST( align * tab, tabcount, "xxx\t", MAKELONG(tab, cy)) + TABTEST( align * tab, tabcount, "\tx", MAKELONG(tab, cy)) + TABTEST( align * tab, tabcount, "\t\t", MAKELONG(tab*2, cy)) + TABTEST( align * tab, tabcount, "\tx\t", MAKELONG(tab*2, cy)) + TABTEST( align * tab, tabcount, "x\tx", MAKELONG(tab, cy)) + TABTEST( align * tab, tabcount, "xx\tx", MAKELONG(tab, cy)) + TABTEST( align * tab, tabcount, "xxx\tx", MAKELONG(4 * cx >= tab ? 2*tab :tab, cy)) + TABTEST( align * tab, tabcount, "xxxx\tx", MAKELONG(2*tab, cy)) + TABTEST( align * tab, tabcount, "xxxxx\tx", MAKELONG(2*tab, cy)) } } diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 642da57..7b0302e 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -1316,12 +1316,15 @@ static LONG TEXT_TabbedTextOut( HDC hdc, INT x, INT y, LPCWSTR lpstr, SIZE extent; int i, j; int start = x; + TEXTMETRICW tm; if (!lpstr || count == 0) return 0; if (!lpTabPos) cTabStops=0; + GetTextMetricsW( hdc, &tm ); + if (cTabStops == 1) { defWidth = *lpTabPos; @@ -1329,8 +1332,6 @@ static LONG TEXT_TabbedTextOut( HDC hdc, INT x, INT y, LPCWSTR lpstr, } else { - TEXTMETRICW tm; - GetTextMetricsW( hdc, &tm ); defWidth = 8 * tm.tmAveCharWidth; } @@ -1398,6 +1399,10 @@ static LONG TEXT_TabbedTextOut( HDC hdc, INT x, INT y, LPCWSTR lpstr, count -= j; lpstr += j; } + + if(!extent.cy) + extent.cy = tm.tmHeight; + return MAKELONG(x - start, extent.cy); }

1 0

Aric Stewart : hidclass.sys: Break the report descriptor into multiple lines.
by Alexandre Julliard 16 Nov '15

16 Nov '15

Module: wine Branch: master Commit: 91d46cb3a14219dcdb0ddd3af45e1ae1fae8491e URL: http://source.winehq.org/git/wine.git/?a=commit;h=91d46cb3a14219dcdb0ddd3af… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 16 07:08:46 2015 -0600 hidclass.sys: Break the report descriptor into multiple lines. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 822de3d..eb0b42a 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -1028,7 +1028,11 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) { TRACE("Descriptor[%i]: ", length); for (cidx = 0; cidx < length; cidx++) + { TRACE("%x ",descriptor[cidx]); + if (cidx % 80 == 0) + TRACE("\n"); + } TRACE("\n"); }

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_RSGetViewports().
by Alexandre Julliard 16 Nov '15

16 Nov '15

Module: wine Branch: master Commit: cd525dda2a1ba40530149ee938bf9ec85f7e8d88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd525dda2a1ba40530149ee93… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 13 15:16:26 2015 +0100 d3d11: Implement d3d11_immediate_context_RSGetViewports(). 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/device.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 0c146e4..f9d7c9e 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1556,7 +1556,33 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetState(ID3D11DeviceCon static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetViewports(ID3D11DeviceContext *iface, UINT *viewport_count, D3D11_VIEWPORT *viewports) { - FIXME("iface %p, viewport_count %p, viewports %p stub!\n", iface, viewport_count, viewports); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct wined3d_viewport wined3d_vp; + + TRACE("iface %p, viewport_count %p, viewports %p.\n", iface, viewport_count, viewports); + + if (!viewports) + { + *viewport_count = 1; + return; + } + + if (!*viewport_count) + return; + + wined3d_mutex_lock(); + wined3d_device_get_viewport(device->wined3d_device, &wined3d_vp); + wined3d_mutex_unlock(); + + viewports[0].TopLeftX = wined3d_vp.x; + viewports[0].TopLeftY = wined3d_vp.y; + viewports[0].Width = wined3d_vp.width; + viewports[0].Height = wined3d_vp.height; + viewports[0].MinDepth = wined3d_vp.min_z; + viewports[0].MaxDepth = wined3d_vp.max_z; + + if (*viewport_count > 1) + memset(&viewports[1], 0, (*viewport_count - 1) * sizeof(*viewports)); } static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetScissorRects(ID3D11DeviceContext *iface,

1 0