wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Alex Henrie : kernel32: Make TERM_dbkey_init const.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 1eef1299f595703acc7fe01a5a834d2eae3923bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eef1299f595703acc7fe01a5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 6 21:06:21 2015 -0600 kernel32: Make TERM_dbkey_init const. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/kernel32/term.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/term.c b/dlls/kernel32/term.c index 814b937..171476a 100644 --- a/dlls/kernel32/term.c +++ b/dlls/kernel32/term.c @@ -227,7 +227,7 @@ struct dbkey_init struct dbkey_descr descr; }; -static struct dbkey_init TERM_dbkey_init[] = { +static const struct dbkey_init TERM_dbkey_init[] = { {"kcud1", "kDN", {dbk_complex, 0x50, 0x28, 0}}, {"kcuu1", "kUP", {dbk_complex, 0x48, 0x26, 0}}, {"kcub1", "kLFT", {dbk_complex, 0x4b, 0x25, 0}}, @@ -342,7 +342,7 @@ static int TERM_dbkey_cmp(const void* p1, const void* p2) return strcmp(kp1->string, kp2->string); } -static BOOL TERM_AddKeyDescr(const char* string, struct dbkey_descr* descr) +static BOOL TERM_AddKeyDescr(const char* string, const struct dbkey_descr* descr) { if (!string || string == (const char*)-1) return TRUE; if (!TERM_dbkey)

1 0

Sebastian Lackner : vcomp: Implement _vcomp_get_thread_num.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 0410cf9cbe143720f12c0f8f48e7526a4769cae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0410cf9cbe143720f12c0f8f4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 7 05:46:25 2015 +0200 vcomp: Implement _vcomp_get_thread_num. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/vcomp/main.c | 6 ++++++ dlls/vcomp/tests/vcomp.c | 7 +++++++ dlls/vcomp/vcomp.spec | 2 +- dlls/vcomp100/vcomp100.spec | 2 +- dlls/vcomp110/vcomp110.spec | 2 +- dlls/vcomp90/vcomp90.spec | 2 +- 6 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index d442155..5aa0343 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -480,6 +480,12 @@ int CDECL omp_get_thread_num(void) return vcomp_init_thread_data()->thread_num; } +int CDECL _vcomp_get_thread_num(void) +{ + TRACE("()\n"); + return vcomp_init_thread_data()->thread_num; +} + /* Time in seconds since "some time in the past" */ double CDECL omp_get_wtime(void) { diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 83125e1..4f030d3 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -65,6 +65,7 @@ static void (CDECL *p_vcomp_for_static_init)(int first, int last, int step, i static void (CDECL *p_vcomp_for_static_simple_init)(unsigned int first, unsigned int last, int step, BOOL increment, unsigned int *begin, unsigned int *end); static void (WINAPIV *p_vcomp_fork)(BOOL ifval, int nargs, void *wrapper, ...); +static int (CDECL *p_vcomp_get_thread_num)(void); static void (CDECL *p_vcomp_leave_critsect)(CRITICAL_SECTION *critsect); static int (CDECL *p_vcomp_master_begin)(void); static void (CDECL *p_vcomp_master_end)(void); @@ -254,6 +255,7 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(_vcomp_for_static_init); VCOMP_GET_PROC(_vcomp_for_static_simple_init); VCOMP_GET_PROC(_vcomp_fork); + VCOMP_GET_PROC(_vcomp_get_thread_num); VCOMP_GET_PROC(_vcomp_leave_critsect); VCOMP_GET_PROC(_vcomp_master_begin); VCOMP_GET_PROC(_vcomp_master_end); @@ -306,6 +308,8 @@ static void CDECL num_threads_cb(BOOL nested, int parallel, int nested_threads, thread_num = pomp_get_thread_num(); ok(thread_num >= 0 && thread_num < num_threads, "expected thread_num in range [0, %d], got %d\n", num_threads - 1, thread_num); + ok(thread_num == p_vcomp_get_thread_num(), + "expected _vcomp_get_thread_num to return the same value\n"); is_parallel = pomp_in_parallel(); ok(is_parallel == parallel, "expected %d, got %d\n", parallel, is_parallel); @@ -344,6 +348,9 @@ static void test_omp_get_num_threads(BOOL nested) int is_nested, is_parallel, max_threads, num_threads, thread_num; LONG thread_count; + ok(pomp_get_thread_num != p_vcomp_get_thread_num, + "expected omp_get_thread_num != _vcomp_get_thread_num\n"); + pomp_set_nested(nested); is_nested = pomp_get_nested(); ok(is_nested == nested, "expected %d, got %d\n", nested, is_nested); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 52b929f..7703e2e 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -65,7 +65,7 @@ @ cdecl _vcomp_for_static_simple_init(long long long long ptr ptr) @ stub _vcomp_for_static_simple_init_i8 @ varargs _vcomp_fork(long long ptr) -@ stub _vcomp_get_thread_num +@ cdecl _vcomp_get_thread_num() @ cdecl _vcomp_leave_critsect(ptr) @ stub _vcomp_master_barrier @ cdecl _vcomp_master_begin() diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index 4b646eb..849125f 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -65,7 +65,7 @@ @ cdecl _vcomp_for_static_simple_init(long long long long ptr ptr) vcomp._vcomp_for_static_simple_init @ stub _vcomp_for_static_simple_init_i8 @ varargs _vcomp_fork(long long ptr) vcomp._vcomp_fork -@ stub _vcomp_get_thread_num +@ cdecl _vcomp_get_thread_num() vcomp._vcomp_get_thread_num @ cdecl _vcomp_leave_critsect(ptr) vcomp._vcomp_leave_critsect @ stub _vcomp_master_barrier @ cdecl _vcomp_master_begin() vcomp._vcomp_master_begin diff --git a/dlls/vcomp110/vcomp110.spec b/dlls/vcomp110/vcomp110.spec index 1ee7fba..87a7205 100644 --- a/dlls/vcomp110/vcomp110.spec +++ b/dlls/vcomp110/vcomp110.spec @@ -66,7 +66,7 @@ @ cdecl _vcomp_for_static_simple_init(long long long long ptr ptr) vcomp._vcomp_for_static_simple_init @ stub _vcomp_for_static_simple_init_i8 @ varargs _vcomp_fork(long long ptr) vcomp._vcomp_fork -@ stub _vcomp_get_thread_num +@ cdecl _vcomp_get_thread_num() vcomp._vcomp_get_thread_num @ cdecl _vcomp_leave_critsect(ptr) vcomp._vcomp_leave_critsect @ stub _vcomp_master_barrier @ cdecl _vcomp_master_begin() vcomp._vcomp_master_begin diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index 4b646eb..849125f 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -65,7 +65,7 @@ @ cdecl _vcomp_for_static_simple_init(long long long long ptr ptr) vcomp._vcomp_for_static_simple_init @ stub _vcomp_for_static_simple_init_i8 @ varargs _vcomp_fork(long long ptr) vcomp._vcomp_fork -@ stub _vcomp_get_thread_num +@ cdecl _vcomp_get_thread_num() vcomp._vcomp_get_thread_num @ cdecl _vcomp_leave_critsect(ptr) vcomp._vcomp_leave_critsect @ stub _vcomp_master_barrier @ cdecl _vcomp_master_begin() vcomp._vcomp_master_begin

1 0

Piotr Caban : comctl32: Test TrackMouseEvent flags when LVS_EX_ONECLICKACTIVATE style is used.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: aa39614e77ebdb21aeb97714c634fbbacc687b85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa39614e77ebdb21aeb97714c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 6 16:25:15 2015 +0200 comctl32: Test TrackMouseEvent flags when LVS_EX_ONECLICKACTIVATE style is used. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/comctl32/tests/listview.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 8573318..118b4a2 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -5745,11 +5745,28 @@ static void test_header_proc(void) DestroyWindow(hwnd); } +static void flush_events(void) +{ + MSG msg; + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; + while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); + diff = time - GetTickCount(); + } +} + static void test_oneclickactivate(void) { + TRACKMOUSEEVENT track; char item1[] = "item1"; LVITEMA item; HWND hwnd, fg; + RECT rect; INT r; hwnd = CreateWindowExA(0, "SysListView32", "foo", WS_VISIBLE|WS_CHILD|LVS_LIST, @@ -5775,6 +5792,18 @@ static void test_oneclickactivate(void) r = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item); ok(r == 0, "should not fail\n"); + GetWindowRect(hwnd, &rect); + SetCursorPos(rect.left+5, rect.top+5); + flush_events(); + r = SendMessageA(hwnd, WM_MOUSEMOVE, MAKELONG(1, 1), 0); + expect(0, r); + + track.cbSize = sizeof(track); + track.dwFlags = TME_QUERY; + _TrackMouseEvent(&track); + ok(track.hwndTrack == hwnd, "hwndTrack != hwnd\n"); + ok(track.dwFlags == TME_LEAVE, "dwFlags = %x\n", track.dwFlags); + r = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); expect(0, r); r = SendMessageA(hwnd, WM_MOUSEHOVER, MAKELONG(1, 1), 0);

1 0

Piotr Caban : comctl32: Don' t ask for WM_MOUSEHOVER messages when LVS_EX_TRACKSELECT was not specified.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 4dd26ee814abb66731d075eb871f6367994f2682 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dd26ee814abb66731d075eb8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 6 16:19:42 2015 +0200 comctl32: Don't ask for WM_MOUSEHOVER messages when LVS_EX_TRACKSELECT was not specified. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/comctl32/listview.c | 9 +++++++-- dlls/comctl32/tests/listview.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index e3fad51..c0956ad 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4122,6 +4122,7 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN /* see if we are supposed to be tracking mouse hovering */ if (LISTVIEW_IsHotTracking(infoPtr)) { TRACKMOUSEEVENT trackinfo; + DWORD flags; trackinfo.cbSize = sizeof(TRACKMOUSEEVENT); trackinfo.dwFlags = TME_QUERY; @@ -4129,8 +4130,12 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN /* see if we are already tracking this hwnd */ _TrackMouseEvent(&trackinfo); - if(!(trackinfo.dwFlags & TME_HOVER) || trackinfo.hwndTrack != infoPtr->hwndSelf) { - trackinfo.dwFlags = TME_HOVER; + flags = TME_LEAVE; + if(infoPtr->dwLvExStyle & LVS_EX_TRACKSELECT) + flags |= TME_HOVER; + + if((trackinfo.dwFlags & flags) != flags || trackinfo.hwndTrack != infoPtr->hwndSelf) { + trackinfo.dwFlags = flags; trackinfo.dwHoverTime = infoPtr->dwHoverTime; trackinfo.hwndTrack = infoPtr->hwndSelf; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 3edb25a..8573318 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -5745,6 +5745,46 @@ static void test_header_proc(void) DestroyWindow(hwnd); } +static void test_oneclickactivate(void) +{ + char item1[] = "item1"; + LVITEMA item; + HWND hwnd, fg; + INT r; + + hwnd = CreateWindowExA(0, "SysListView32", "foo", WS_VISIBLE|WS_CHILD|LVS_LIST, + 10, 10, 100, 200, hwndparent, NULL, NULL, NULL); + ok(hwnd != NULL, "failed to create listview window\n"); + r = SendMessageA(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_ONECLICKACTIVATE); + ok(r == 0, "should return zero\n"); + + SetForegroundWindow(hwndparent); + fg = GetForegroundWindow(); + if (fg != hwndparent) + { + skip("Window is not in the foreground. Skipping oneclickactivate tests.\n"); + DestroyWindow(hwnd); + return; + } + + item.mask = LVIF_TEXT; + item.iItem = 0; + item.iSubItem = 0; + item.iImage = 0; + item.pszText = item1; + r = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item); + ok(r == 0, "should not fail\n"); + + r = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); + expect(0, r); + r = SendMessageA(hwnd, WM_MOUSEHOVER, MAKELONG(1, 1), 0); + expect(0, r); + r = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); + expect(1, r); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -5814,6 +5854,7 @@ START_TEST(listview) test_deleteitem(); test_insertitem(); test_header_proc(); + test_oneclickactivate(); if (!load_v6_module(&ctx_cookie, &hCtx)) {

1 0

Sebastian Lackner : ntdll/tests: Add tests for RtlRegisterWait.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 0b1204d8704880bdb9440d485c13a3430e383cc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b1204d8704880bdb9440d485… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 7 01:24:50 2015 +0200 ntdll/tests: Add tests for RtlRegisterWait. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/ntdll/tests/threadpool.c | 253 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 253 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b1204d8704880bdb9440…

1 0

Sebastian Lackner : ntdll/tests: Limit number of pool threads to avoid random test failures.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: f97a18f8c033a4c4080e5a7aae5b28b3a41079b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f97a18f8c033a4c4080e5a7aa… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 7 01:23:54 2015 +0200 ntdll/tests: Limit number of pool threads to avoid random test failures. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/ntdll/tests/threadpool.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 9197660..a262ecb 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -228,6 +228,7 @@ static void test_tp_simple(void) /* test cancellation of pending simple callbacks */ userdata = 0; + pTpSetPoolMaxThreads(pool, 10); memset(&environment, 0, sizeof(environment)); environment.Version = 1; environment.Pool = pool;

1 0

Sebastian Lackner : ntdll/tests: Fix test failures on Windows 10.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 53c8345c6dc8e8ac013790a7268a0e3f87a15290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53c8345c6dc8e8ac013790a72… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 7 01:23:27 2015 +0200 ntdll/tests: Fix test failures on Windows 10. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/ntdll/tests/threadpool.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 7be3f0d..9197660 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -867,6 +867,7 @@ static void test_tp_window_length(void) NTSTATUS status; TP_POOL *pool; DWORD result; + BOOL merged; semaphore = CreateSemaphoreA(NULL, 0, 2, NULL); ok(semaphore != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); @@ -929,8 +930,8 @@ static void test_tp_window_length(void) result = WaitForSingleObject(semaphore, 1000); ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); ok(info1.ticks != 0 && info2.ticks != 0, "expected that ticks are nonzero\n"); - ok(info2.ticks >= info1.ticks - 50 && info2.ticks <= info1.ticks + 50, - "expected that timers are merged\n"); + merged = info2.ticks >= info1.ticks - 50 && info2.ticks <= info1.ticks + 50; + ok(merged || broken(!merged) /* Win 10 */, "expected that timers are merged\n"); /* on Windows the timers also get merged in this case */ info1.ticks = 0; @@ -948,9 +949,9 @@ static void test_tp_window_length(void) result = WaitForSingleObject(semaphore, 1000); ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); ok(info1.ticks != 0 && info2.ticks != 0, "expected that ticks are nonzero\n"); + merged = info2.ticks >= info1.ticks - 50 && info2.ticks <= info1.ticks + 50; todo_wine - ok(info2.ticks >= info1.ticks - 50 && info2.ticks <= info1.ticks + 50, - "expected that timers are merged\n"); + ok(merged || broken(!merged) /* Win 10 */, "expected that timers are merged\n"); /* cleanup */ pTpReleaseTimer(timer1);

1 0

Aric Stewart : hidclass.sys: Make sure we pass in the index not a pointer to the index.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 76d8b4ca02ff39e766b6a87abbaaa1e17f0aa63d URL: http://source.winehq.org/git/wine.git/?a=commit;h=76d8b4ca02ff39e766b6a87ab… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 6 16:22:23 2015 -0500 hidclass.sys: Make sure we pass in the index not a pointer to the index. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/hidclass.sys/device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 46bd010..b0982f0 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -233,13 +233,15 @@ static NTSTATUS handle_IOCTL_HID_GET_COLLECTION_DESCRIPTOR(IRP *irp, BASE_DEVICE return STATUS_SUCCESS; } -static NTSTATUS handle_minidriver_string(DEVICE_OBJECT *device, IRP *irp, DWORD index) +static NTSTATUS handle_minidriver_string(DEVICE_OBJECT *device, IRP *irp, SHORT index) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); WCHAR buffer[127]; NTSTATUS status; + ULONG InputBuffer; - status = call_minidriver(IOCTL_HID_GET_STRING, device, &index, sizeof(index), buffer, sizeof(buffer)); + InputBuffer = MAKELONG(index, 0); + status = call_minidriver(IOCTL_HID_GET_STRING, device, ULongToPtr(InputBuffer), sizeof(InputBuffer), buffer, sizeof(buffer)); if (status == STATUS_SUCCESS) {

1 0

Aric Stewart : hidclass.sys: Help make the logic around feature input flags more apparent.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 2183b8ac2153912a0d30d7ca3942dea7a55d4554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2183b8ac2153912a0d30d7ca3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 6 16:20:51 2015 -0500 hidclass.sys: Help make the logic around feature input flags more apparent. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/hidclass.sys/descriptor.c | 65 +++++++++++++----------------------------- 1 file changed, 20 insertions(+), 45 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 35057f1..ac9b047 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -33,16 +33,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); #define USAGE_MAX 10 +/* Flags that are defined in the document + "Device Class Definition for Human Interface Devices" */ enum { - INPUT_DATA = 0x01, - INPUT_ARRAY = 0x02, - INPUT_ABS = 0x04, - INPUT_WRAP = 0x08, - INPUT_LINEAR = 0x10, - INPUT_PREFSTATE = 0x20, - INPUT_NULL = 0x40, - INPUT_VOLATILE = 0x80, - INPUT_BITFIELD = 0x100 + INPUT_DATA_CONST = 0x01, /* Data (0) | Constant (1) */ + INPUT_ARRAY_VAR = 0x02, /* Array (0) | Variable (1) */ + INPUT_ABS_REL = 0x04, /* Absolute (0) | Relative (1) */ + INPUT_WRAP = 0x08, /* No Wrap (0) | Wrap (1) */ + INPUT_LINEAR = 0x10, /* Linear (0) | Non Linear (1) */ + INPUT_PREFSTATE = 0x20, /* Preferred State (0) | No Preferred (1) */ + INPUT_NULL = 0x40, /* No Null position (0) | Null state(1) */ + INPUT_VOLATILE = 0x80, /* Non Volatile (0) | Volatile (1) */ + INPUT_BITFIELD = 0x100 /* Bit Field (0) | Buffered Bytes (1) */ }; enum { @@ -407,48 +409,21 @@ void parse_io_feature(unsigned int bSize, int itemVal, int bTag, unsigned int *f } else { - if ((itemVal & INPUT_DATA) == 0) - feature->isData = TRUE; - else - feature->isData = FALSE; /* Const */ - if ((itemVal & INPUT_ARRAY) == 0) - feature->isArray= TRUE; - else - feature->isArray= FALSE; /* Var */ - if ((itemVal & INPUT_ABS) == 0) - feature->IsAbsolute = TRUE; - else - feature->IsAbsolute = FALSE; /* Rel */ - if ((itemVal & INPUT_WRAP) == 0) - feature->Wrap = FALSE; - else - feature->Wrap = TRUE; - if ((itemVal & INPUT_LINEAR) == 0) - feature->Linear = TRUE; - else - feature->Linear = FALSE; - if ((itemVal & INPUT_PREFSTATE) == 0) - feature->prefState = TRUE; - else - feature->prefState = FALSE; - if ((itemVal & INPUT_NULL) == 0) - feature->HasNull = FALSE; - else - feature->HasNull = TRUE; + feature->isData = ((itemVal & INPUT_DATA_CONST) == 0); + feature->isArray = ((itemVal & INPUT_ARRAY_VAR) == 0); + feature->IsAbsolute = ((itemVal & INPUT_ABS_REL) == 0); + feature->Wrap = ((itemVal & INPUT_WRAP) != 0); + feature->Linear = ((itemVal & INPUT_LINEAR) == 0); + feature->prefState = ((itemVal & INPUT_PREFSTATE) == 0); + feature->HasNull = ((itemVal & INPUT_NULL) != 0); if (bTag != TAG_MAIN_INPUT) { - if ((itemVal & INPUT_VOLATILE) == 0) - feature->Volatile = FALSE; - else - feature->Volatile = TRUE; + feature->Volatile = ((itemVal & INPUT_VOLATILE) != 0); } if (bSize > 1) { - if ((itemVal & INPUT_BITFIELD) == 0) - feature->BitField = TRUE; - else - feature->BitField = FALSE; /* Buffered Bytes */ + feature->BitField = ((itemVal & INPUT_BITFIELD) == 0); } feature->index = *feature_index; *feature_index = *feature_index + 1;

1 0

Aric Stewart : maintainers: Add uniscribe maintainer section.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 87eedf419683aed6fa6e176b3a73e3cf02bb33a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87eedf419683aed6fa6e176b3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 6 16:13:41 2015 -0500 maintainers: Add uniscribe maintainer section. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- MAINTAINERS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index e7aa7e2..50999e7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -115,6 +115,10 @@ OLE Typelibs P: Andrew Eikum <aeikum(a)codeweavers.com> F: dlls/oleaut32/typelib.c +Uniscribe +M: Aric Stewart <aric(a)codeweavers.com> +F: dlls/usp10/ + Wine server, IPC M: Alexandre Julliard <julliard(a)winehq.org> F: server/

1 0

← Newer
1
...
54
55
56
57
58
59
60
...
75
Older →

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 2015