wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

Alexandre Julliard : winmm/tests: Fix some tests that fail on Windows with no input device.
by Alexandre Julliard 22 Sep '10

22 Sep '10

Module: wine Branch: master Commit: ddac146e7dcb75c1a1a34a119f91fefa72ceccab URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddac146e7dcb75c1a1a34a119… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 22 13:30:31 2010 +0200 winmm/tests: Fix some tests that fail on Windows with no input device. --- dlls/winmm/tests/capture.c | 25 +++++-------------------- 1 files changed, 5 insertions(+), 20 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index 81d6281..d0d5df9 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -666,14 +666,8 @@ static void wave_in_tests(void) dev_name(ndev+1),wave_in_error(rc)); rc=waveInGetDevCapsA(WAVE_MAPPER,&capsA,sizeof(capsA)); - if (ndev>0) - ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_NODRIVER, - "waveInGetDevCapsA(%s): MMSYSERR_NOERROR or MMSYSERR_NODRIVER " - "expected, got %s\n",dev_name(WAVE_MAPPER),wave_in_error(rc)); - else - ok(rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NODRIVER, - "waveInGetDevCapsA(%s): MMSYSERR_BADDEVICEID or MMSYSERR_NODRIVER " - "expected, got %s\n",dev_name(WAVE_MAPPER),wave_in_error(rc)); + ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_NODRIVER || (!ndev && (rc==MMSYSERR_BADDEVICEID)), + "waveInGetDevCapsA(%s): got %s\n",dev_name(WAVE_MAPPER),wave_in_error(rc)); rc=waveInGetDevCapsW(ndev+1,&capsW,sizeof(capsW)); ok(rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NOTSUPPORTED, @@ -681,18 +675,9 @@ static void wave_in_tests(void) "expected, got %s\n",dev_name(ndev+1),wave_in_error(rc)); rc=waveInGetDevCapsW(WAVE_MAPPER,&capsW,sizeof(capsW)); - if (ndev>0) - ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_NODRIVER || - rc==MMSYSERR_NOTSUPPORTED, - "waveInGetDevCapsW(%s): MMSYSERR_NOERROR or MMSYSERR_NODRIVER or " - "MMSYSERR_NOTSUPPORTED expected, got %s\n", - dev_name(ndev+1),wave_in_error(rc)); - else - ok(rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NODRIVER || - rc==MMSYSERR_NOTSUPPORTED, - "waveInGetDevCapsW(%s): MMSYSERR_BADDEVICEID or MMSYSERR_NODRIVER or" - "MMSYSERR_NOTSUPPORTED expected, got %s\n", - dev_name(ndev+1),wave_in_error(rc)); + ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_NODRIVER || + rc==MMSYSERR_NOTSUPPORTED || (!ndev && (rc==MMSYSERR_BADDEVICEID)), + "waveInGetDevCapsW(%s): got %s\n", dev_name(ndev+1),wave_in_error(rc)); format.wFormatTag=WAVE_FORMAT_PCM; format.nChannels=2;

1 0

Austin English : kernel32: Add a stub for GetSystemDEPPolicy.
by Alexandre Julliard 22 Sep '10

22 Sep '10

Module: wine Branch: master Commit: e99612c4c843ac28c6e29ec3dd0bf78546d92646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e99612c4c843ac28c6e29ec3d… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Sep 21 21:17:29 2010 -0700 kernel32: Add a stub for GetSystemDEPPolicy. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 9 +++++++++ include/winbase.h | 7 +++++++ 3 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 8a33013..43e339b 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -624,6 +624,7 @@ @ stdcall GetSystemDefaultLCID() @ stdcall GetSystemDefaultLangID() @ stdcall GetSystemDefaultUILanguage() +@ stdcall GetSystemDEPPolicy() @ stdcall GetSystemDirectoryA(ptr long) @ stdcall GetSystemDirectoryW(ptr long) @ stdcall GetSystemInfo(ptr) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index c1816a8..d4c2063 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3385,3 +3385,12 @@ DWORD WINAPI WTSGetActiveConsoleSessionId(void) FIXME("stub\n"); return 0; } + +/********************************************************************** + * GetSystemDEPPolicy (KERNEL32.@) + */ +DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void) +{ + FIXME("stub\n"); + return OptIn; +} diff --git a/include/winbase.h b/include/winbase.h index 2c4b5d5..24f6f33 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1234,6 +1234,13 @@ typedef struct tagHW_PROFILE_INFOW { DECL_WINELIB_TYPE_AW(HW_PROFILE_INFO) DECL_WINELIB_TYPE_AW(LPHW_PROFILE_INFO) +typedef enum _DEP_SYSTEM_POLICY_TYPE { + AlwaysOff = 0, + AlwaysOn = 1, + OptIn = 2, + OptOut = 3 +} DEP_SYSTEM_POLICY_TYPE; + /* Event Logging */ #define EVENTLOG_FULL_INFO 0

1 0

Austin English : ntoskrnl.exe: Add stub for READ_REGISTER_BUFFER_UCHAR.
by Alexandre Julliard 22 Sep '10

22 Sep '10

Module: wine Branch: master Commit: 7bc0484c890f45dcd3b4d01e95caa2c7db50f92d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bc0484c890f45dcd3b4d01e9… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Sep 22 00:07:03 2010 -0700 ntoskrnl.exe: Add stub for READ_REGISTER_BUFFER_UCHAR. --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 17990e0..18317e2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1532,6 +1532,14 @@ VOID WINAPI KeInitializeDpc(PRKDPC Dpc, PKDEFERRED_ROUTINE DeferredRoutine, PVOI FIXME("stub\n"); } +/*********************************************************************** + * READ_REGISTER_BUFFER_UCHAR (NTOSKRNL.EXE.@) + */ +VOID WINAPI READ_REGISTER_BUFFER_UCHAR(PUCHAR Register, PUCHAR Buffer, ULONG Count) +{ + FIXME("stub\n"); +} + /***************************************************** * DllMain */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 31af18b..f9eb721 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -921,7 +921,7 @@ @ stub PsSetThreadWin32Thread @ stdcall PsTerminateSystemThread(long) @ stub PsThreadType -@ stub READ_REGISTER_BUFFER_UCHAR +@ stdcall READ_REGISTER_BUFFER_UCHAR(ptr ptr long) @ stub READ_REGISTER_BUFFER_ULONG @ stub READ_REGISTER_BUFFER_USHORT @ stub READ_REGISTER_UCHAR

1 0

Austin English : ntoskrnl.exe: Add stub for KeInitializeDpc.
by Alexandre Julliard 22 Sep '10

22 Sep '10

Module: wine Branch: master Commit: cf6fa1a0365978d9f94ca651eaab972599df5712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf6fa1a0365978d9f94ca651e… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Sep 22 00:06:07 2010 -0700 ntoskrnl.exe: Add stub for KeInitializeDpc. --- dlls/ntoskrnl.exe/ntoskrnl.c | 7 +++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index ab113b0..17990e0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1524,6 +1524,13 @@ MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void) return MmLargeSystem; } +/*********************************************************************** + * KeInitializeDpc (NTOSKRNL.EXE.@) + */ +VOID WINAPI KeInitializeDpc(PRKDPC Dpc, PKDEFERRED_ROUTINE DeferredRoutine, PVOID DeferredContext) +{ + FIXME("stub\n"); +} /***************************************************** * DllMain diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 776fbab..31af18b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -545,7 +545,7 @@ @ stub KeIcacheFlushCount @ stub KeInitializeApc @ stub KeInitializeDeviceQueue -@ stub KeInitializeDpc +@ stdcall KeInitializeDpc(ptr ptr ptr) @ stdcall KeInitializeEvent(ptr long long) @ stub KeInitializeInterrupt @ stub KeInitializeMutant

1 0

Dmitry Timoshkov : user32: Make sure that SendInput always initializes the time field.
by Alexandre Julliard 22 Sep '10

22 Sep '10

Module: wine Branch: master Commit: 88900f429a9c2cf7e2c00d085f694a89ff8da77b URL: http://source.winehq.org/git/wine.git/?a=commit;h=88900f429a9c2cf7e2c00d085… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Sep 22 15:49:45 2010 +0900 user32: Make sure that SendInput always initializes the time field. --- dlls/user32/input.c | 4 ++-- dlls/winex11.drv/keyboard.c | 2 ++ dlls/winex11.drv/mouse.c | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 0dccf21..6e1e459 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -167,7 +167,7 @@ void WINAPI keybd_event( BYTE bVk, BYTE bScan, input.u.ki.wVk = bVk; input.u.ki.wScan = bScan; input.u.ki.dwFlags = dwFlags; - input.u.ki.time = GetTickCount(); + input.u.ki.time = 0; input.u.ki.dwExtraInfo = dwExtraInfo; SendInput( 1, &input, sizeof(input) ); } @@ -186,7 +186,7 @@ void WINAPI mouse_event( DWORD dwFlags, DWORD dx, DWORD dy, input.u.mi.dy = dy; input.u.mi.mouseData = dwData; input.u.mi.dwFlags = dwFlags; - input.u.mi.time = GetCurrentTime(); + input.u.mi.time = 0; input.u.mi.dwExtraInfo = dwExtraInfo; SendInput( 1, &input, sizeof(input) ); } diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 02fd6bb..d6054d6 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1158,6 +1158,8 @@ void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD event_flags, DWORD WORD flags, wVkStripped, wVkL, wVkR, vk_hook = wVk; LPARAM lParam = 0; + if (!time) time = GetTickCount(); + wVk = LOBYTE(wVk); flags = LOBYTE(wScan); diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index cf988c9..922df65 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -345,6 +345,8 @@ void X11DRV_send_mouse_input( HWND hwnd, DWORD flags, DWORD x, DWORD y, { POINT pt; + if (!time) time = GetTickCount(); + if (flags & MOUSEEVENTF_MOVE && flags & MOUSEEVENTF_ABSOLUTE) { if (injected_flags & LLMHF_INJECTED)

1 0

Austin English : userenv: Add a stub for GetDefaultUserProfileDirectoryA/W.
by Alexandre Julliard 22 Sep '10

22 Sep '10

Module: wine Branch: master Commit: 84972be4aa9a136148e7e57ffccf1414b0a1b52f URL: http://source.winehq.org/git/wine.git/?a=commit;h=84972be4aa9a136148e7e57ff… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Sep 21 21:53:08 2010 -0700 userenv: Add a stub for GetDefaultUserProfileDirectoryA/W. --- dlls/userenv/userenv.spec | 2 ++ dlls/userenv/userenv_main.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/userenv/userenv.spec b/dlls/userenv/userenv.spec index bde8c07..6b1e8a7 100644 --- a/dlls/userenv/userenv.spec +++ b/dlls/userenv/userenv.spec @@ -6,6 +6,8 @@ @ stdcall ExpandEnvironmentStringsForUserW(ptr wstr ptr long) @ stdcall GetAllUsersProfileDirectoryA(ptr ptr) @ stdcall GetAllUsersProfileDirectoryW(ptr ptr) +@ stdcall GetDefaultUserProfileDirectoryA(ptr ptr) +@ stdcall GetDefaultUserProfileDirectoryW(ptr ptr) @ stdcall GetProfilesDirectoryA(ptr ptr) @ stdcall GetProfilesDirectoryW(ptr ptr) @ stdcall GetProfileType(ptr) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 9247f44..59b3b1f 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -100,6 +100,18 @@ BOOL WINAPI ExpandEnvironmentStringsForUserW( HANDLE hToken, LPCWSTR lpSrc, return ret; } +BOOL WINAPI GetDefaultUserProfileDirectoryA( LPSTR lpProfileDir, LPDWORD lpcchSize ) +{ + FIXME("%p %p\n", lpProfileDir, lpcchSize ); + return FALSE; +} + +BOOL WINAPI GetDefaultUserProfileDirectoryW( LPWSTR lpProfileDir, LPDWORD lpcchSize ) +{ + FIXME("%p %p\n", lpProfileDir, lpcchSize ); + return FALSE; +} + BOOL WINAPI GetUserProfileDirectoryA( HANDLE hToken, LPSTR lpProfileDir, LPDWORD lpcchSize ) {

1 0

Jacek Caban : mshtml: Added PrintHTML stub.
by Alexandre Julliard 22 Sep '10

22 Sep '10

Module: wine Branch: master Commit: 60827da9d5e5a0dc708cf1f1f34192663158f117 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60827da9d5e5a0dc708cf1f1f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 22 12:18:43 2010 +0200 mshtml: Added PrintHTML stub. --- dlls/mshtml/main.c | 8 ++++++++ dlls/mshtml/mshtml.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index a8bfb5e..679c206 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -334,6 +334,14 @@ HRESULT WINAPI ShowHTMLDialog(HWND hwndParent, IMoniker *pMk, VARIANT *pvarArgIn return E_NOTIMPL; } +/*********************************************************************** + * PrintHTML (MSHTML.@) + */ +void WINAPI PrintHTML(HWND hwnd, HINSTANCE handle, LPCSTR cmdline, INT show) +{ + FIXME("(%p %p %s %x)\n", hwnd, handle, debugstr_a(cmdline), show); +} + DEFINE_GUID(CLSID_CBackgroundPropertyPage, 0x3050F232, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_CCDAnchorPropertyPage, 0x3050F1FC, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_CCDGenericPropertyPage, 0x3050F17F, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); diff --git a/dlls/mshtml/mshtml.spec b/dlls/mshtml/mshtml.spec index c8e1be5..5dfcdcd 100644 --- a/dlls/mshtml/mshtml.spec +++ b/dlls/mshtml/mshtml.spec @@ -6,7 +6,7 @@ @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() @ stub MatchExactGetIDsOfNames -@ stub PrintHTML +@ stdcall PrintHTML(ptr ptr str long) @ stdcall RNIGetCompatibleVersion() @ stdcall RunHTMLApplication(long long str long) @ stdcall ShowHTMLDialog(ptr ptr ptr wstr ptr)

1 0

Dmitry Timoshkov : user32: Uncomment the GetWindowPlacement() test, fill the test data with real values.
by Alexandre Julliard 22 Sep '10

22 Sep '10

Module: wine Branch: master Commit: 6cccf51645e17bd09aacae47bbfe492d9571b74b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cccf51645e17bd09aacae47b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Sep 22 17:50:27 2010 +0900 user32: Uncomment the GetWindowPlacement() test, fill the test data with real values. --- dlls/user32/tests/msg.c | 140 ++++++++++++++++++++++++++--------------------- 1 files changed, 77 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6cccf51645e17bd09aaca…

1 0

Austin Lund : comctl32/tests: LVM_GETRECTITEM should return TRUE.
by Alexandre Julliard 22 Sep '10

22 Sep '10

Module: wine Branch: master Commit: 3836e62ed8d44e73892bb30cb80a2d9bd9f6a7d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3836e62ed8d44e73892bb30cb… Author: Austin Lund <austin.lund(a)gmail.com> Date: Wed Sep 22 16:28:30 2010 +1000 comctl32/tests: LVM_GETRECTITEM should return TRUE. --- dlls/comctl32/tests/listview.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6ef82bb..4297e0b 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3278,7 +3278,8 @@ static void test_getitemrect(void) r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); expect(0, r); rect.left = LVIR_LABEL; - SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); + r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); + expect(TRUE, r); expect(0, rect.left); expect(0, rect.top); todo_wine expect(96, rect.right);

1 0

Eric Pouech : server: Fix console creation logic.
by Alexandre Julliard 22 Sep '10

22 Sep '10

Module: wine Branch: master Commit: 04607ca6320289b64fa7dc7abd67ff5a45141ff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04607ca6320289b64fa7dc7ab… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Sep 21 22:09:06 2010 +0200 server: Fix console creation logic. --- server/console.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/server/console.c b/server/console.c index d256ae8..4441163 100644 --- a/server/console.c +++ b/server/console.c @@ -1386,6 +1386,7 @@ DECL_HANDLER(alloc_console) struct thread *renderer; struct console_input *console; int fd; + int attach = 0; switch (req->pid) { @@ -1398,12 +1399,14 @@ DECL_HANDLER(alloc_console) return; } grab_object( process ); + attach = 1; break; case 0xffffffff: /* no renderer, console to be attached to current process */ renderer = NULL; process = current->process; grab_object( process ); + attach = 1; break; default: /* renderer is current, console to be attached to req->pid */ @@ -1411,7 +1414,7 @@ DECL_HANDLER(alloc_console) if (!(process = get_process_from_id( req->pid ))) return; } - if (process != current->process && process->console) + if (attach && process->console) { set_error( STATUS_ACCESS_DENIED ); goto the_end; @@ -1433,8 +1436,11 @@ DECL_HANDLER(alloc_console) if (!console->evt || (evt = alloc_handle( current->process, console->evt, SYNCHRONIZE|GENERIC_READ|GENERIC_WRITE, 0 ))) { - process->console = (struct console_input*)grab_object( console ); - console->num_proc++; + if (attach) + { + process->console = (struct console_input*)grab_object( console ); + console->num_proc++; + } reply->handle_in = in; reply->event = evt; release_object( console );

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
86
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 September 2010