Ros-diffs May 2009

ros-diffs@reactos.org

27 participants
504 discussions

[jimtabor] 40820: - Implement ReplyMessage and kernel support for InSendMessage and GetMessageTime.
by jimtabor＠svn.reactos.org 06 May '09

06 May '09

Author: jimtabor Date: Wed May 6 22:49:53 2009 New Revision: 40820 URL: http://svn.reactos.org/svn/reactos?rev=40820&view=rev Log: - Implement ReplyMessage and kernel support for InSendMessage and GetMessageTime. Modified: trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Wed May 6 22:49:53 2009 @@ -1071,6 +1071,7 @@ { PUSER32_THREAD_DATA ThreadData = User32GetThreadData(); return(ThreadData->LastMessage.time); +// return NtUserGetThreadState(THREADSTATE_GETMESSAGETIME); } @@ -1090,8 +1091,7 @@ return TRUE; } } - return FALSE; -/* return(NtUserGetThreadState(THREADSTATE_INSENDMESSAGE) != ISMEX_NOSEND);*/ + return(NtUserGetThreadState(THREADSTATE_INSENDMESSAGE) != ISMEX_NOSEND); } @@ -1105,23 +1105,22 @@ { PCLIENTTHREADINFO pcti = GetWin32ClientInfo()->pClientThreadInfo; // FIXME("ISMEX %x\n",pcti); - if (pcti && !(pcti->CTI_flags & CTI_INSENDMESSAGE)) return ISMEX_NOSEND; + if (pcti && !(pcti->CTI_flags & CTI_INSENDMESSAGE)) + return ISMEX_NOSEND; else - /* return NtUserGetThreadState(THREADSTATE_INSENDMESSAGE); */ - return 0; -} - - -/* - * @unimplemented + return NtUserGetThreadState(THREADSTATE_INSENDMESSAGE); +} + + +/* + * @implemented */ BOOL WINAPI ReplyMessage( LRESULT lResult) { - UNIMPLEMENTED; - return FALSE; + return NtUserCallOneParam(lResult, ONEPARAM_ROUTINE_REPLYMESSAGE); } Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Wed May 6 22:49:53 2009 @@ -1721,7 +1721,8 @@ THREADSTATE_ACTIVEWINDOW, THREADSTATE_CAPTUREWINDOW, THREADSTATE_PROGMANWINDOW, - THREADSTATE_TASKMANWINDOW + THREADSTATE_TASKMANWINDOW, + THREADSTATE_GETMESSAGETIME }; DWORD Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Wed May 6 22:49:53 2009 @@ -38,6 +38,7 @@ PDESKTOPINFO pDeskInfo; PCLIENTINFO pClientInfo; FLONG TIF_flags; + LONG timeLast; HANDLE hDesktop; UINT cPaintsReady; /* Count of paints pending. */ UINT cTimersReady; /* Count of timers pending. */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Wed May 6 22:49:53 2009 @@ -1359,7 +1359,7 @@ IntGetCursorLocation(pti->Desktop->WindowStation, &KernelModeMsg.pt); KeQueryTickCount(&LargeTickCount); - KernelModeMsg.time = MsqCalculateMessageTime(&LargeTickCount); + pti->timeLast = KernelModeMsg.time = MsqCalculateMessageTime(&LargeTickCount); MsqPostMessage(Window->MessageQueue, &KernelModeMsg, NULL != MsgMemoryEntry && 0 != KernelModeMsg.lParam, QS_POSTMESSAGE); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Wed May 6 22:49:53 2009 @@ -96,6 +96,28 @@ RETURN( (DWORD)GetW32ThreadInfo()->pDeskInfo->hTaskManWindow); case THREADSTATE_ACTIVEWINDOW: RETURN ( (DWORD)UserGetActiveWindow()); + case THREADSTATE_INSENDMESSAGE: + { + DWORD Ret = ISMEX_NOSEND; + PUSER_MESSAGE_QUEUE MessageQueue = + ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->MessageQueue; + DPRINT1("THREADSTATE_INSENDMESSAGE\n"); + + if (!IsListEmpty(&MessageQueue->SentMessagesListHead)) + { + Ret = ISMEX_SEND; + } + else if (!IsListEmpty(&MessageQueue->NotifyMessagesListHead)) + { + /* FIXME Need to set message flag when in callback mode with notify */ + Ret = ISMEX_NOTIFY; + } + /* FIXME Need to set message flag if replied to or ReplyMessage */ + RETURN( Ret); + } + case THREADSTATE_GETMESSAGETIME: + /* FIXME Needs more work! */ + RETURN( ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->timeLast); } RETURN( 0);

1 0

[dchapyshev] 40819: - Add xinput1_1, xinput1_2, xinput1_3, xinput9_1_0 from Wine (needed for some games)
by dchapyshev＠svn.reactos.org 06 May '09

06 May '09

Author: dchapyshev Date: Wed May 6 19:00:03 2009 New Revision: 40819 URL: http://svn.reactos.org/svn/reactos?rev=40819&view=rev Log: - Add xinput1_1, xinput1_2, xinput1_3, xinput9_1_0 from Wine (needed for some games) Added: trunk/reactos/dll/win32/xinput1_1/ (with props) trunk/reactos/dll/win32/xinput1_1/version.rc (with props) trunk/reactos/dll/win32/xinput1_1/xinput1_1.rbuild (with props) trunk/reactos/dll/win32/xinput1_1/xinput1_1.spec (with props) trunk/reactos/dll/win32/xinput1_1/xinput1_1_main.c (with props) trunk/reactos/dll/win32/xinput1_2/ (with props) trunk/reactos/dll/win32/xinput1_2/version.rc (with props) trunk/reactos/dll/win32/xinput1_2/xinput1_2.rbuild (with props) trunk/reactos/dll/win32/xinput1_2/xinput1_2.spec (with props) trunk/reactos/dll/win32/xinput1_2/xinput1_2_main.c (with props) trunk/reactos/dll/win32/xinput1_3/ (with props) trunk/reactos/dll/win32/xinput1_3/version.rc (with props) trunk/reactos/dll/win32/xinput1_3/xinput.h (with props) trunk/reactos/dll/win32/xinput1_3/xinput1_3.rbuild (with props) trunk/reactos/dll/win32/xinput1_3/xinput1_3.spec (with props) trunk/reactos/dll/win32/xinput1_3/xinput1_3_main.c (with props) trunk/reactos/dll/win32/xinput9_1_0/ (with props) trunk/reactos/dll/win32/xinput9_1_0/version.rc (with props) trunk/reactos/dll/win32/xinput9_1_0/xinput9_1_0.rbuild (with props) trunk/reactos/dll/win32/xinput9_1_0/xinput9_1_0.spec (with props) trunk/reactos/dll/win32/xinput9_1_0/xinput9_1_0_main.c (with props) Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Wed May 6 19:00:03 2009 @@ -448,6 +448,10 @@ dll\win32\wsock32\wsock32.dll 1 dll\win32\wtsapi32\wtsapi32.dll 1 dll\win32\wuapi\wuapi.dll 1 +dll\win32\xinput1_1\xinput1_1.dll 1 +dll\win32\xinput1_2\xinput1_2.dll 1 +dll\win32\xinput1_3\xinput1_3.dll 1 +dll\win32\xinput9_1_0\xinput9_1_0.dll 1 dll\win32\winmm\midimap\midimap.dll 1 dll\win32\winmm\wavemap\msacm32.drv 1 optional dll\win32\wdmaud.drv\wdmaud.drv 1 Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Wed May 6 19:00:03 2009 @@ -622,4 +622,16 @@ <directory name="wuapi"> <xi:include href="wuapi/wuapi.rbuild" /> </directory> +<directory name="xinput1_1"> + <xi:include href="xinput1_1/xinput1_1.rbuild" /> +</directory> +<directory name="xinput1_2"> + <xi:include href="xinput1_2/xinput1_2.rbuild" /> +</directory> +<directory name="xinput1_3"> + <xi:include href="xinput1_3/xinput1_3.rbuild" /> +</directory> +<directory name="xinput9_1_0"> + <xi:include href="xinput9_1_0/xinput9_1_0.rbuild" /> +</directory> </group> Propchange: trunk/reactos/dll/win32/xinput1_1/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed May 6 19:00:03 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/xinput1_1/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/xinput1_1/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/xinput1_1/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/xinput1_1/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_1/versio… ============================================================================== --- trunk/reactos/dll/win32/xinput1_1/version.rc (added) +++ trunk/reactos/dll/win32/xinput1_1/version.rc [iso-8859-1] Wed May 6 19:00:03 2009 @@ -1,0 +1,27 @@ +/* + * The Wine project - Xinput Joystick Library + * Copyright 2008 Andrew Fenn + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Common Controller API" +#define WINE_FILENAME_STR "xinput1_1.dll" +#define WINE_FILEVERSION 9,12,589,0000 +#define WINE_FILEVERSION_STR "9.12.589.0000" +#define WINE_PRODUCTVERSION 9,12,589,0000 +#define WINE_PRODUCTVERSION_STR "9.12" + +#include "wine/wine_common_ver.rc" Propchange: trunk/reactos/dll/win32/xinput1_1/version.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/xinput1_1/xinput1_1.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_1/xinput… ============================================================================== --- trunk/reactos/dll/win32/xinput1_1/xinput1_1.rbuild (added) +++ trunk/reactos/dll/win32/xinput1_1/xinput1_1.rbuild [iso-8859-1] Wed May 6 19:00:03 2009 @@ -1,0 +1,9 @@ +<module name="xinput1_1" type="win32dll" installbase="system32" installname="xinput1_1.dll"> + <importlibrary definition="xinput1_1.spec" /> + <include base="xinput1_1">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <library>kernel32</library> + <file>xinput1_1_main.c</file> + <file>version.rc</file> +</module> Propchange: trunk/reactos/dll/win32/xinput1_1/xinput1_1.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/xinput1_1/xinput1_1.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_1/xinput… ============================================================================== --- trunk/reactos/dll/win32/xinput1_1/xinput1_1.spec (added) +++ trunk/reactos/dll/win32/xinput1_1/xinput1_1.spec [iso-8859-1] Wed May 6 19:00:03 2009 @@ -1,0 +1,5 @@ +@ stdcall XInputEnable(long) xinput1_3.XInputEnable +@ stdcall XInputGetCapabilities(long long ptr) xinput1_3.XInputGetCapabilities +@ stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) xinput1_3.XInputGetDSoundAudioDeviceGuids +@ stdcall XInputSetState(long ptr) xinput1_3.XInputSetState +@ stdcall XInputGetState(long ptr) xinput1_3.XInputGetState Propchange: trunk/reactos/dll/win32/xinput1_1/xinput1_1.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/xinput1_1/xinput1_1_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_1/xinput… ============================================================================== --- trunk/reactos/dll/win32/xinput1_1/xinput1_1_main.c (added) +++ trunk/reactos/dll/win32/xinput1_1/xinput1_1_main.c [iso-8859-1] Wed May 6 19:00:03 2009 @@ -1,0 +1,39 @@ +/* + * The Wine project - Xinput Joystick Library + * Copyright 2008 Andrew Fenn + * + * 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 "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(inst); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} Propchange: trunk/reactos/dll/win32/xinput1_1/xinput1_1_main.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/xinput1_2/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed May 6 19:00:03 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/xinput1_2/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/xinput1_2/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/xinput1_2/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/xinput1_2/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_2/versio… ============================================================================== --- trunk/reactos/dll/win32/xinput1_2/version.rc (added) +++ trunk/reactos/dll/win32/xinput1_2/version.rc [iso-8859-1] Wed May 6 19:00:03 2009 @@ -1,0 +1,27 @@ +/* + * The Wine project - Xinput Joystick Library + * Copyright 2008 Andrew Fenn + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Common Controller API" +#define WINE_FILENAME_STR "xinput1_2.dll" +#define WINE_FILEVERSION 9,14,701,0000 +#define WINE_FILEVERSION_STR "9.14.701.0000" +#define WINE_PRODUCTVERSION 9,14,701,0000 +#define WINE_PRODUCTVERSION_STR "9.14" + +#include "wine/wine_common_ver.rc" Propchange: trunk/reactos/dll/win32/xinput1_2/version.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/xinput1_2/xinput1_2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_2/xinput… ============================================================================== --- trunk/reactos/dll/win32/xinput1_2/xinput1_2.rbuild (added) +++ trunk/reactos/dll/win32/xinput1_2/xinput1_2.rbuild [iso-8859-1] Wed May 6 19:00:03 2009 @@ -1,0 +1,9 @@ +<module name="xinput1_2" type="win32dll" installbase="system32" installname="xinput1_2.dll"> + <importlibrary definition="xinput1_2.spec" /> + <include base="xinput1_2">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <library>kernel32</library> + <file>xinput1_2_main.c</file> + <file>version.rc</file> +</module> Propchange: trunk/reactos/dll/win32/xinput1_2/xinput1_2.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/xinput1_2/xinput1_2.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_2/xinput… ============================================================================== --- trunk/reactos/dll/win32/xinput1_2/xinput1_2.spec (added) +++ trunk/reactos/dll/win32/xinput1_2/xinput1_2.spec [iso-8859-1] Wed May 6 19:00:03 2009 @@ -1,0 +1,5 @@ +@ stdcall XInputEnable(long) xinput1_3.XInputEnable +@ stdcall XInputGetCapabilities(long long ptr) xinput1_3.XInputGetCapabilities +@ stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) xinput1_3.XInputGetDSoundAudioDeviceGuids +@ stdcall XInputSetState(long ptr) xinput1_3.XInputSetState +@ stdcall XInputGetState(long ptr) xinput1_3.XInputGetState Propchange: trunk/reactos/dll/win32/xinput1_2/xinput1_2.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/xinput1_2/xinput1_2_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_2/xinput… ============================================================================== --- trunk/reactos/dll/win32/xinput1_2/xinput1_2_main.c (added) +++ trunk/reactos/dll/win32/xinput1_2/xinput1_2_main.c [iso-8859-1] Wed May 6 19:00:03 2009 @@ -1,0 +1,39 @@ +/* + * The Wine project - Xinput Joystick Library + * Copyright 2008 Andrew Fenn + * + * 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 "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(inst); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} Propchange: trunk/reactos/dll/win32/xinput1_2/xinput1_2_main.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/xinput1_3/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed May 6 19:00:03 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/xinput1_3/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/xinput1_3/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/xinput1_3/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/xinput1_3/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_3/versio… ============================================================================== --- trunk/reactos/dll/win32/xinput1_3/version.rc (added) +++ trunk/reactos/dll/win32/xinput1_3/version.rc [iso-8859-1] Wed May 6 19:00:03 2009 @@ -1,0 +1,27 @@ +/* + * The Wine project - Xinput Joystick Library + * Copyright 2008 Andrew Fenn + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Common Controller API" +#define WINE_FILENAME_STR "xinput1_3.dll" +#define WINE_FILEVERSION 9,15,779,0000 +#define WINE_FILEVERSION_STR "9.15.779.0000" +#define WINE_PRODUCTVERSION 9,15,779,0000 +#define WINE_PRODUCTVERSION_STR "9.15" + +#include "wine/wine_common_ver.rc" Propchange: trunk/reactos/dll/win32/xinput1_3/version.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/xinput1_3/xinput.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_3/xinput… ============================================================================== --- trunk/reactos/dll/win32/xinput1_3/xinput.h (added) +++ trunk/reactos/dll/win32/xinput1_3/xinput.h [iso-8859-1] Wed May 6 19:00:03 2009 @@ -1,0 +1,239 @@ +/* + * The Wine project - Xinput Joystick Library + * Copyright 2008 Andrew Fenn + * + * 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 + */ + +#ifndef __WINE_XINPUT_H +#define __WINE_XINPUT_H + +#include <windef.h> + +/* + * Bitmasks for the joysticks buttons, determines what has + * been pressed on the joystick, these need to be mapped + * to whatever device you're using instead of an xbox 360 + * joystick + */ + +#define XINPUT_GAMEPAD_DPAD_UP 0x0001 +#define XINPUT_GAMEPAD_DPAD_DOWN 0x0002 +#define XINPUT_GAMEPAD_DPAD_LEFT 0x0004 +#define XINPUT_GAMEPAD_DPAD_RIGHT 0x0008 +#define XINPUT_GAMEPAD_START 0x0010 +#define XINPUT_GAMEPAD_BACK 0x0020 +#define XINPUT_GAMEPAD_LEFT_THUMB 0x0040 +#define XINPUT_GAMEPAD_RIGHT_THUMB 0x0080 +#define XINPUT_GAMEPAD_LEFT_SHOULDER 0x0100 +#define XINPUT_GAMEPAD_RIGHT_SHOULDER 0x0200 +#define XINPUT_GAMEPAD_A 0x1000 +#define XINPUT_GAMEPAD_B 0x2000 +#define XINPUT_GAMEPAD_X 0x4000 +#define XINPUT_GAMEPAD_Y 0x8000 + +/* + * Defines the flags used to determine if the user is pushing + * down on a button, not holding a button, etc + */ + +#define XINPUT_KEYSTROKE_KEYDOWN 0x0001 +#define XINPUT_KEYSTROKE_KEYUP 0x0002 +#define XINPUT_KEYSTROKE_REPEAT 0x0004 + +/* + * Defines the codes which are returned by XInputGetKeystroke + */ + +#define VK_PAD_A 0x5800 +#define VK_PAD_B 0x5801 +#define VK_PAD_X 0x5802 +#define VK_PAD_Y 0x5803 +#define VK_PAD_RSHOULDER 0x5804 +#define VK_PAD_LSHOULDER 0x5805 +#define VK_PAD_LTRIGGER 0x5806 +#define VK_PAD_RTRIGGER 0x5807 +#define VK_PAD_DPAD_UP 0x5810 +#define VK_PAD_DPAD_DOWN 0x5811 +#define VK_PAD_DPAD_LEFT 0x5812 +#define VK_PAD_DPAD_RIGHT 0x5813 +#define VK_PAD_START 0x5814 +#define VK_PAD_BACK 0x5815 +#define VK_PAD_LTHUMB_PRESS 0x5816 +#define VK_PAD_RTHUMB_PRESS 0x5817 +#define VK_PAD_LTHUMB_UP 0x5820 +#define VK_PAD_LTHUMB_DOWN 0x5821 +#define VK_PAD_LTHUMB_RIGHT 0x5822 +#define VK_PAD_LTHUMB_LEFT 0x5823 +#define VK_PAD_LTHUMB_UPLEFT 0x5824 +#define VK_PAD_LTHUMB_UPRIGHT 0x5825 +#define VK_PAD_LTHUMB_DOWNRIGHT 0x5826 +#define VK_PAD_LTHUMB_DOWNLEFT 0x5827 +#define VK_PAD_RTHUMB_UP 0x5830 +#define VK_PAD_RTHUMB_DOWN 0x5831 +#define VK_PAD_RTHUMB_RIGHT 0x5832 +#define VK_PAD_RTHUMB_LEFT 0x5833 +#define VK_PAD_RTHUMB_UPLEFT 0x5834 +#define VK_PAD_RTHUMB_UPRIGHT 0x5835 +#define VK_PAD_RTHUMB_DOWNRIGHT 0x5836 +#define VK_PAD_RTHUMB_DOWNLEFT 0x5837 + +/* + * Deadzones are for analogue joystick controls on the joypad + * which determine when input should be assumed to be in the + * middle of the pad. This is a threshold to stop a joypad + * controlling the game when the player isn't touching the + * controls. + */ + +#define XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE 7849 +#define XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE 8689 +#define XINPUT_GAMEPAD_TRIGGER_THRESHOLD 30 + + +/* + * Defines what type of abilities the type of joystick has + * DEVTYPE_GAMEPAD is avaliable for all joysticks, however + * there may be more specfic identifiers for other joysticks + * which are being used. + */ + +#define XINPUT_DEVTYPE_GAMEPAD 0x01 +#define XINPUT_DEVSUBTYPE_GAMEPAD 0x01 +#define XINPUT_DEVSUBTYPE_WHEEL 0x02 +#define XINPUT_DEVSUBTYPE_ARCADE_STICK 0x03 +#define XINPUT_DEVSUBTYPE_FLIGHT_SICK 0x04 +#define XINPUT_DEVSUBTYPE_DANCE_PAD 0x05 +#define XINPUT_DEVSUBTYPE_GUITAR 0x06 +#define XINPUT_DEVSUBTYPE_DRUM_KIT 0x08 + +/* + * These are used with the XInputGetCapabilities function to + * determine the abilities to the joystick which has been + * plugged in. + */ + +#define XINPUT_CAPS_VOICE_SUPPORTED 0x0004 +#define XINPUT_FLAG_GAMEPAD 0x00000001 + +/* + * Defines the status of the battery if one is used in the + * attached joystick. The first two define if the joystick + * supports a battery. Disconnected means that the joystick + * isn't connected. Wired shows that the joystick is a wired + * joystick. + */ + +#define BATTERY_DEVTYPE_GAMEPAD 0x00 +#define BATTERY_DEVTYPE_HEADSET 0x01 +#define BATTERY_TYPE_DISCONNECTED 0x00 +#define BATTERY_TYPE_WIRED 0x01 +#define BATTERY_TYPE_ALKALINE 0x02 +#define BATTERY_TYPE_NIMH 0x03 +#define BATTERY_TYPE_UNKNOWN 0xFF +#define BATTERY_LEVEL_EMPTY 0x00 +#define BATTERY_LEVEL_LOW 0x01 +#define BATTERY_LEVEL_MEDIUM 0x02 +#define BATTERY_LEVEL_FULL 0x03 + +/* + * How many joysticks can be used with this library. Games that + * use the xinput library will not go over this number. + */ + +#define XUSER_MAX_COUNT 4 +#define XUSER_INDEX_ANY 0x000000FF + +/* + * Defines the structure of an xbox 360 joystick. + */ + +typedef struct _XINPUT_GAMEPAD { + WORD wButtons; + BYTE bLeftTrigger; + BYTE bRightTrigger; + SHORT sThumbLX; + SHORT sThumbLY; + SHORT sThumbRX; + SHORT sThumbRY; +} XINPUT_GAMEPAD, *PXINPUT_GAMEPAD; + +typedef struct _XINPUT_STATE { + DWORD dwPacketNumber; + XINPUT_GAMEPAD Gamepad; +} XINPUT_STATE, *PXINPUT_STATE; + +/* + * Defines the structure of how much vibration is set on both the + * right and left motors in a joystick. If you're not using a 360 + * joystick you will have to map these to your device. + */ + +typedef struct _XINPUT_VIBRATION { + WORD wLeftMotorSpeed; + WORD wRightMotorSpeed; +} XINPUT_VIBRATION, *PXINPUT_VIBRATION; + +/* + * Defines the structure for what kind of abilities the joystick has + * such abilites are things such as if the joystick has the ability + * to send and receive audio, if the joystick is infact a driving + * wheel or perhaps if the joystick is some kind of dance pad or + * guitar. + */ + +typedef struct _XINPUT_CAPABILITIES { + BYTE Type; + BYTE SubType; + WORD Flags; + XINPUT_GAMEPAD Gamepad; + XINPUT_VIBRATION Vibration; +} XINPUT_CAPABILITIES, *PXINPUT_CAPABILITIES; + +/* + * Defines the structure for a joystick input event which is + * retrieved using the function XInputGetKeystroke + */ +typedef struct _XINPUT_KEYSTROKE { + WORD VirtualKey; + WCHAR Unicode; + WORD Flags; + BYTE UserIndex; + BYTE HidCode; +} XINPUT_KEYSTROKE, *PXINPUT_KEYSTROKE; + +typedef struct _XINPUT_BATTERY_INFORMATION +{ + BYTE BatteryType; + BYTE BatteryLevel; +} XINPUT_BATTERY_INFORMATION, *PXINPUT_BATTERY_INFORMATION; + +#ifdef __cplusplus +extern "C" { +#endif + +void WINAPI XInputEnable(BOOL); +DWORD WINAPI XInputSetState(DWORD, XINPUT_VIBRATION*); +DWORD WINAPI XInputGetState(DWORD, XINPUT_STATE*); +DWORD WINAPI XInputGetKeystroke(DWORD, DWORD, PXINPUT_KEYSTROKE); +DWORD WINAPI XInputGetCapabilities(DWORD, DWORD, XINPUT_CAPABILITIES*); +DWORD WINAPI XInputGetDSoundAudioDeviceGuids(DWORD, GUID*, GUID*); +DWORD WINAPI XInputGetBatteryInformation(DWORD, BYTE, XINPUT_BATTERY_INFORMATION*); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_XINPUT_H */ Propchange: trunk/reactos/dll/win32/xinput1_3/xinput.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/xinput1_3/xinput1_3.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_3/xinput… ============================================================================== --- trunk/reactos/dll/win32/xinput1_3/xinput1_3.rbuild (added) +++ trunk/reactos/dll/win32/xinput1_3/xinput1_3.rbuild [iso-8859-1] Wed May 6 19:00:03 2009 @@ -1,0 +1,10 @@ +<module name="xinput1_3" type="win32dll" installbase="system32" installname="xinput1_3.dll"> + <importlibrary definition="xinput1_3.spec" /> + <include base="xinput1_3">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <library>kernel32</library> + <library>wine</library> + <file>xinput1_3_main.c</file> + <file>version.rc</file> +</module> Propchange: trunk/reactos/dll/win32/xinput1_3/xinput1_3.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/xinput1_3/xinput1_3.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_3/xinput… ============================================================================== --- trunk/reactos/dll/win32/xinput1_3/xinput1_3.spec (added) +++ trunk/reactos/dll/win32/xinput1_3/xinput1_3.spec [iso-8859-1] Wed May 6 19:00:03 2009 @@ -1,0 +1,7 @@ +@ stdcall XInputEnable(long) +@ stdcall XInputSetState(long ptr) +@ stdcall XInputGetState(long ptr) +@ stdcall XInputGetKeystroke(long long ptr) +@ stdcall XInputGetCapabilities(long long ptr) +@ stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) +@ stdcall XInputGetBatteryInformation(long ptr ptr) Propchange: trunk/reactos/dll/win32/xinput1_3/xinput1_3.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/xinput1_3/xinput1_3_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_3/xinput… ============================================================================== --- trunk/reactos/dll/win32/xinput1_3/xinput1_3_main.c (added) +++ trunk/reactos/dll/win32/xinput1_3/xinput1_3_main.c [iso-8859-1] Wed May 6 19:00:03 2009 @@ -1,0 +1,128 @@ +/* + * The Wine project - Xinput Joystick Library + * Copyright 2008 Andrew Fenn + * + * 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 "config.h" +#include <assert.h> +#include <stdarg.h> +#include <string.h> + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winerror.h" + +#include "xinput.h" + +WINE_DEFAULT_DEBUG_CHANNEL(xinput); + +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(inst); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + +void WINAPI XInputEnable(BOOL enable) +{ + /* Setting to false will stop messages from XInputSetState being sent + to the controllers. Setting to true will send the last vibration + value (sent to XInputSetState) to the controller and allow messages to + be sent */ + FIXME("(%d) Stub!\n", enable); +} + +DWORD WINAPI XInputSetState(DWORD dwUserIndex, XINPUT_VIBRATION* pVibration) +{ + FIXME("(%d %p) Stub!\n", dwUserIndex, pVibration); + + if (dwUserIndex < XUSER_MAX_COUNT) + { + return ERROR_DEVICE_NOT_CONNECTED; + /* If controller exists then return ERROR_SUCCESS */ + } + return ERROR_BAD_ARGUMENTS; +} + +DWORD WINAPI XInputGetState(DWORD dwUserIndex, XINPUT_STATE* pState) +{ + FIXME("(%u %p)\n", dwUserIndex, pState); + + if (dwUserIndex < XUSER_MAX_COUNT) + { + return ERROR_DEVICE_NOT_CONNECTED; + /* If controller exists then return ERROR_SUCCESS */ + } + return ERROR_BAD_ARGUMENTS; +} + +DWORD WINAPI XInputGetKeystroke(DWORD dwUserIndex, DWORD dwReserve, PXINPUT_KEYSTROKE pKeystroke) +{ + FIXME("(%d %d %p) Stub!\n", dwUserIndex, dwReserve, pKeystroke); + + if (dwUserIndex < XUSER_MAX_COUNT) + { + return ERROR_DEVICE_NOT_CONNECTED; + /* If controller exists then return ERROR_SUCCESS */ + } + return ERROR_BAD_ARGUMENTS; +} + +DWORD WINAPI XInputGetCapabilities(DWORD dwUserIndex, DWORD dwFlags, XINPUT_CAPABILITIES* pCapabilities) +{ + FIXME("(%d %d %p)\n", dwUserIndex, dwFlags, pCapabilities); + + if (dwUserIndex < XUSER_MAX_COUNT) + { + return ERROR_DEVICE_NOT_CONNECTED; + /* If controller exists then return ERROR_SUCCESS */ + } + return ERROR_BAD_ARGUMENTS; +} + +DWORD WINAPI XInputGetDSoundAudioDeviceGuids(DWORD dwUserIndex, GUID* pDSoundRenderGuid, GUID* pDSoundCaptureGuid) +{ + FIXME("(%d %s %s) Stub!\n", dwUserIndex, debugstr_guid(pDSoundRenderGuid), debugstr_guid(pDSoundCaptureGuid)); + + if (dwUserIndex < XUSER_MAX_COUNT) + { + return ERROR_DEVICE_NOT_CONNECTED; + /* If controller exists then return ERROR_SUCCESS */ + } + return ERROR_BAD_ARGUMENTS; +} + +DWORD WINAPI XInputGetBatteryInformation(DWORD dwUserIndex, BYTE deviceType, XINPUT_BATTERY_INFORMATION* pBatteryInfo) +{ + FIXME("(%d %u %p) Stub!\n", dwUserIndex, deviceType, pBatteryInfo); + + if (dwUserIndex < XUSER_MAX_COUNT) + { + return ERROR_DEVICE_NOT_CONNECTED; + /* If controller exists then return ERROR_SUCCESS */ + } + return ERROR_BAD_ARGUMENTS; +} Propchange: trunk/reactos/dll/win32/xinput1_3/xinput1_3_main.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/xinput9_1_0/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed May 6 19:00:03 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/xinput9_1_0/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/xinput9_1_0/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/xinput9_1_0/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/xinput9_1_0/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput9_1_0/vers… ============================================================================== --- trunk/reactos/dll/win32/xinput9_1_0/version.rc (added) +++ trunk/reactos/dll/win32/xinput9_1_0/version.rc [iso-8859-1] Wed May 6 19:00:03 2009 @@ -1,0 +1,27 @@ +/* + * The Wine project - Xinput Joystick Library + * Copyright 2008 Andrew Fenn + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Common Controller API" +#define WINE_FILENAME_STR "xinput9_1_0.dll" +#define WINE_FILEVERSION 9,10,455,0000 +#define WINE_FILEVERSION_STR "9.10.455.0000" +#define WINE_PRODUCTVERSION 9,10,455,0000 +#define WINE_PRODUCTVERSION_STR "9.10" + +#include "wine/wine_common_ver.rc" Propchange: trunk/reactos/dll/win32/xinput9_1_0/version.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/xinput9_1_0/xinput9_1_0.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput9_1_0/xinp… ============================================================================== --- trunk/reactos/dll/win32/xinput9_1_0/xinput9_1_0.rbuild (added) +++ trunk/reactos/dll/win32/xinput9_1_0/xinput9_1_0.rbuild [iso-8859-1] Wed May 6 19:00:03 2009 @@ -1,0 +1,9 @@ +<module name="xinput9_1_0" type="win32dll" installbase="system32" installname="xinput9_1_0.dll"> + <importlibrary definition="xinput9_1_0.spec" /> + <include base="xinput9_1_0">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <library>kernel32</library> + <file>xinput9_1_0_main.c</file> + <file>version.rc</file> +</module> Propchange: trunk/reactos/dll/win32/xinput9_1_0/xinput9_1_0.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/xinput9_1_0/xinput9_1_0.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput9_1_0/xinp… ============================================================================== --- trunk/reactos/dll/win32/xinput9_1_0/xinput9_1_0.spec (added) +++ trunk/reactos/dll/win32/xinput9_1_0/xinput9_1_0.spec [iso-8859-1] Wed May 6 19:00:03 2009 @@ -1,0 +1,4 @@ +@ stdcall XInputGetCapabilities(long long ptr) xinput1_3.XInputGetCapabilities +@ stdcall XInputGetDSoundAudioDeviceGuids(long ptr ptr) xinput1_3.XInputGetDSoundAudioDeviceGuids +@ stdcall XInputSetState(long ptr) xinput1_3.XInputSetState +@ stdcall XInputGetState(long ptr) xinput1_3.XInputGetState Propchange: trunk/reactos/dll/win32/xinput9_1_0/xinput9_1_0.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/xinput9_1_0/xinput9_1_0_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput9_1_0/xinp… ============================================================================== --- trunk/reactos/dll/win32/xinput9_1_0/xinput9_1_0_main.c (added) +++ trunk/reactos/dll/win32/xinput9_1_0/xinput9_1_0_main.c [iso-8859-1] Wed May 6 19:00:03 2009 @@ -1,0 +1,39 @@ +/* + * The Wine project - Xinput Joystick Library + * Copyright 2008 Andrew Fenn + * + * 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 "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(inst); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} Propchange: trunk/reactos/dll/win32/xinput9_1_0/xinput9_1_0_main.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed May 6 19:00:03 2009 @@ -170,6 +170,10 @@ reactos/dll/win32/wmi # Autosync reactos/dll/win32/wtsapi32 # Autosync reactos/dll/win32/wuapi # Autosync +reactos/dll/win32/xinput1_1 # Autosync +reactos/dll/win32/xinput1_2 # Autosync +reactos/dll/win32/xinput1_3 # Autosync +reactos/dll/win32/xinput9_1_0 # Autosync ReactOS shares the following programs with Winehq.

1 0

[janderwald] 40818: - Try fix boot
by janderwald＠svn.reactos.org 06 May '09

06 May '09

Author: janderwald Date: Wed May 6 17:53:15 2009 New Revision: 40818 URL: http://svn.reactos.org/svn/reactos?rev=40818&view=rev Log: - Try fix boot Modified: trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Wed May 6 17:53:15 2009 @@ -1626,6 +1626,7 @@ ULONG BusNumber; } PNP_BUS_INFORMATION, *PPNP_BUS_INFORMATION; +#include <pshpack1.h> /* CM_PARTIAL_RESOURCE_DESCRIPTOR.Type */ #define CmResourceTypeNull 0 @@ -1740,6 +1741,7 @@ ULONG ProtectedModeDataBaseAddress; } CM_PNP_BIOS_INSTALLATION_CHECK, *PCM_PNP_BIOS_INSTALLATION_CHECK; +#include <poppack.h> typedef struct _CM_DISK_GEOMETRY_DEVICE_DATA

1 0

[ahill] 40817: Initial checkin of some of the code to implement cabinet windows for the explorer: 1. AddressBand is the address band of the cabinet window with a combo box and go button. 2. AddressEditBox manages the state of a combo box and keeps it in sync with the shell browser state. 3. BandProxy provides an interface for the AddressEditBox to send navigation commands. 4. BaseBar contains a BaseBarSite and indirectly contains explorer bars. 5. BaseBarSite contains explorer bars. 6. BrandBand
by ahill＠svn.reactos.org 06 May '09

06 May '09

Author: ahill Date: Wed May 6 14:35:24 2009 New Revision: 40817 URL: http://svn.reactos.org/svn/reactos?rev=40817&view=rev Log: Initial checkin of some of the code to implement cabinet windows for the explorer: 1. AddressBand is the address band of the cabinet window with a combo box and go button. 2. AddressEditBox manages the state of a combo box and keeps it in sync with the shell browser state. 3. BandProxy provides an interface for the AddressEditBox to send navigation commands. 4. BaseBar contains a BaseBarSite and indirectly contains explorer bars. 5. BaseBarSite contains explorer bars. 6. BrandBand is the logo band that sometimes animates... 7. InternetToolbar is the complete upper region of a cabinet window that holds bands and supports resizing. 8. ShellBrowser is the main driver class that owns the top level frame. 9. ToolsBand holds the toolbar with shortcut commands. 10. TravelLog keeps a history of visited PIDLs and provides travel both forward and backward. The code currently compiles only with msvc and has some bugs and a lot of missing functionality. Each file has a TODO block at the beginning that provides an incomplete list of remaining work. Added: branches/Ash_Shell/dll/win32/browseui/addressband.cpp (with props) branches/Ash_Shell/dll/win32/browseui/addressband.h (with props) branches/Ash_Shell/dll/win32/browseui/addresseditbox.cpp (with props) branches/Ash_Shell/dll/win32/browseui/addresseditbox.h (with props) branches/Ash_Shell/dll/win32/browseui/bandproxy.cpp (with props) branches/Ash_Shell/dll/win32/browseui/bandproxy.h (with props) branches/Ash_Shell/dll/win32/browseui/basebar.cpp (with props) branches/Ash_Shell/dll/win32/browseui/basebarsite.cpp (with props) branches/Ash_Shell/dll/win32/browseui/brandband.cpp (with props) branches/Ash_Shell/dll/win32/browseui/brandband.h (with props) branches/Ash_Shell/dll/win32/browseui/browseui.cpp (with props) branches/Ash_Shell/dll/win32/browseui/browseui.rc (with props) branches/Ash_Shell/dll/win32/browseui/internettoolbar.cpp (with props) branches/Ash_Shell/dll/win32/browseui/internettoolbar.h (with props) branches/Ash_Shell/dll/win32/browseui/lang/ (with props) branches/Ash_Shell/dll/win32/browseui/lang/en-US.rc (with props) branches/Ash_Shell/dll/win32/browseui/newatlinterfaces.h (with props) branches/Ash_Shell/dll/win32/browseui/newinterfaces.h (with props) branches/Ash_Shell/dll/win32/browseui/res/ (with props) branches/Ash_Shell/dll/win32/browseui/res/addressband.rgs (with props) branches/Ash_Shell/dll/win32/browseui/res/addresseditbox.rgs (with props) branches/Ash_Shell/dll/win32/browseui/res/bandproxy.rgs (with props) branches/Ash_Shell/dll/win32/browseui/res/brandband.rgs (with props) branches/Ash_Shell/dll/win32/browseui/res/internettoolbar.rgs (with props) branches/Ash_Shell/dll/win32/browseui/resource.h (with props) branches/Ash_Shell/dll/win32/browseui/shellbrowser.cpp (with props) branches/Ash_Shell/dll/win32/browseui/toolsband.cpp (with props) branches/Ash_Shell/dll/win32/browseui/travellog.cpp (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: branches/Ash_Shell/dll/win32/browseui/addressband.cpp URL: http://svn.reactos.org/svn/reactos/branches/Ash_Shell/dll/win32/browseui/ad… Added: branches/Ash_Shell/dll/win32/browseui/addressband.h URL: http://svn.reactos.org/svn/reactos/branches/Ash_Shell/dll/win32/browseui/ad… Added: branches/Ash_Shell/dll/win32/browseui/addresseditbox.cpp URL: http://svn.reactos.org/svn/reactos/branches/Ash_Shell/dll/win32/browseui/ad… Added: branches/Ash_Shell/dll/win32/browseui/addresseditbox.h URL: http://svn.reactos.org/svn/reactos/branches/Ash_Shell/dll/win32/browseui/ad… Added: branches/Ash_Shell/dll/win32/browseui/bandproxy.cpp URL: http://svn.reactos.org/svn/reactos/branches/Ash_Shell/dll/win32/browseui/ba… Added: branches/Ash_Shell/dll/win32/browseui/bandproxy.h URL: http://svn.reactos.org/svn/reactos/branches/Ash_Shell/dll/win32/browseui/ba… Added: branches/Ash_Shell/dll/win32/browseui/basebar.cpp URL: http://svn.reactos.org/svn/reactos/branches/Ash_Shell/dll/win32/browseui/ba… Added: branches/Ash_Shell/dll/win32/browseui/basebarsite.cpp URL: http://svn.reactos.org/svn/reactos/branches/Ash_Shell/dll/win32/browseui/ba… Added: branches/Ash_Shell/dll/win32/browseui/brandband.cpp URL: http://svn.reactos.org/svn/reactos/branches/Ash_Shell/dll/win32/browseui/br… Added: branches/Ash_Shell/dll/win32/browseui/brandband.h URL: http://svn.reactos.org/svn/reactos/branches/Ash_Shell/dll/win32/browseui/br… Added: branches/Ash_Shell/dll/win32/browseui/browseui.cpp URL: http://svn.reactos.org/svn/reactos/branches/Ash_Shell/dll/win32/browseui/br… Added: branches/Ash_Shell/dll/win32/browseui/browseui.rc URL: http://svn.reactos.org/svn/reactos/branches/Ash_Shell/dll/win32/browseui/br… Added: branches/Ash_Shell/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/Ash_Shell/dll/win32/browseui/in… Added: branches/Ash_Shell/dll/win32/browseui/internettoolbar.h URL: http://svn.reactos.org/svn/reactos/branches/Ash_Shell/dll/win32/browseui/in… Added: branches/Ash_Shell/dll/win32/browseui/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/Ash_Shell/dll/win32/browseui/la… Added: branches/Ash_Shell/dll/win32/browseui/newatlinterfaces.h URL: http://svn.reactos.org/svn/reactos/branches/Ash_Shell/dll/win32/browseui/ne… Added: branches/Ash_Shell/dll/win32/browseui/newinterfaces.h URL: http://svn.reactos.org/svn/reactos/branches/Ash_Shell/dll/win32/browseui/ne… Added: branches/Ash_Shell/dll/win32/browseui/res/addressband.rgs URL: http://svn.reactos.org/svn/reactos/branches/Ash_Shell/dll/win32/browseui/re… Added: branches/Ash_Shell/dll/win32/browseui/res/addresseditbox.rgs URL: http://svn.reactos.org/svn/reactos/branches/Ash_Shell/dll/win32/browseui/re… Added: branches/Ash_Shell/dll/win32/browseui/res/bandproxy.rgs URL: http://svn.reactos.org/svn/reactos/branches/Ash_Shell/dll/win32/browseui/re… Added: branches/Ash_Shell/dll/win32/browseui/res/brandband.rgs URL: http://svn.reactos.org/svn/reactos/branches/Ash_Shell/dll/win32/browseui/re… Added: branches/Ash_Shell/dll/win32/browseui/res/internettoolbar.rgs URL: http://svn.reactos.org/svn/reactos/branches/Ash_Shell/dll/win32/browseui/re… Added: branches/Ash_Shell/dll/win32/browseui/resource.h URL: http://svn.reactos.org/svn/reactos/branches/Ash_Shell/dll/win32/browseui/re… Added: branches/Ash_Shell/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/Ash_Shell/dll/win32/browseui/sh… Added: branches/Ash_Shell/dll/win32/browseui/toolsband.cpp URL: http://svn.reactos.org/svn/reactos/branches/Ash_Shell/dll/win32/browseui/to… Added: branches/Ash_Shell/dll/win32/browseui/travellog.cpp URL: http://svn.reactos.org/svn/reactos/branches/Ash_Shell/dll/win32/browseui/tr…

1 0

[dreimer] 40816: sync winhlp32 and wordpad with Wine 1.1.20
by dreimer＠svn.reactos.org 06 May '09

06 May '09

Author: dreimer Date: Wed May 6 13:54:09 2009 New Revision: 40816 URL: http://svn.reactos.org/svn/reactos?rev=40816&view=rev Log: sync winhlp32 and wordpad with Wine 1.1.20 Modified: trunk/reactos/base/applications/winhlp32/winhelp.c trunk/reactos/base/applications/wordpad/Nl.rc trunk/reactos/base/applications/wordpad/Tr.rc trunk/reactos/base/applications/wordpad/print.c trunk/reactos/base/applications/wordpad/wordpad.c Modified: trunk/reactos/base/applications/winhlp32/winhelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] Wed May 6 13:54:09 2009 @@ -353,7 +353,7 @@ return 0; } - wh = (WINHELP*)cds->lpData; + wh = cds->lpData; if (wh) { @@ -1154,7 +1154,7 @@ */ static void cb_KWBTree(void *p, void **next, void *cookie) { - HWND hListWnd = (HWND)cookie; + HWND hListWnd = cookie; int count; WINE_TRACE("Adding '%s' to search list\n", (char *)p); Modified: trunk/reactos/base/applications/wordpad/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Nl.rc [iso-8859-1] Wed May 6 13:54:09 2009 @@ -241,4 +241,5 @@ STRING_OPEN_FAILED, "Bestand kon niet geopend worden." STRING_OPEN_ACCESS_DENIED, "Onvoldoende rechten om het bestand te openen." STRING_PRINTING_NOT_IMPLEMENTED, "Printen is nog niet geimplementeerd" -END + STRING_MAX_TAB_STOPS, "Onmogelijk om meer dan 32 tab stops toe te voegen." +END Modified: trunk/reactos/base/applications/wordpad/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/Tr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/Tr.rc [iso-8859-1] Wed May 6 13:54:09 2009 @@ -225,16 +225,3 @@ BEGIN STRING_UNITS_CM, "cm" END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_DEFAULT_FILENAME, "Document" - STRING_PROMPT_SAVE_CHANGES, "Save changes to '%s'?" - STRING_SEARCH_FINISHED, "Finished searching the document." - STRING_LOAD_RICHED_FAILED, "Failed to load the RichEdit library." - STRING_SAVE_LOSEFORMATTING, "You have chosen to save in plain text format, " \ - "which will cause all formatting to be lost. " \ - "Are you sure that you wish to do this?" - STRING_INVALID_NUMBER, "Invalid number format" - STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" -END Modified: trunk/reactos/base/applications/wordpad/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] Wed May 6 13:54:09 2009 @@ -489,7 +489,7 @@ return preview.page != 0; } -static void add_ruler_units(HDC hdcRuler, RECT* drawRect, BOOL NewMetrics, long EditLeftmost) +static void add_ruler_units(HDC hdcRuler, RECT* drawRect, BOOL NewMetrics, LONG EditLeftmost) { static HDC hdc; @@ -564,7 +564,7 @@ BitBlt(hdcRuler, 0, 0, drawRect->right, drawRect->bottom, hdc, 0, 0, SRCAND); } -static void paint_ruler(HWND hWnd, long EditLeftmost, BOOL NewMetrics) +static void paint_ruler(HWND hWnd, LONG EditLeftmost, BOOL NewMetrics) { PAINTSTRUCT ps; HDC hdc = BeginPaint(hWnd, &ps); @@ -603,7 +603,7 @@ LRESULT CALLBACK ruler_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { static WNDPROC pPrevRulerProc; - static long EditLeftmost; + static LONG EditLeftmost; static BOOL NewMetrics; switch(msg) Modified: trunk/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Wed May 6 13:54:09 2009 @@ -2233,7 +2233,7 @@ case ID_EDIT_READONLY: { - long nStyle = GetWindowLong(hwndEditor, GWL_STYLE); + LONG nStyle = GetWindowLong(hwndEditor, GWL_STYLE); if (nStyle & ES_READONLY) SendMessageW(hwndEditor, EM_SETREADONLY, 0, 0); else

1 0

[dchapyshev] 40815: - Sync spoolss, sxs, urlmon with Wine 1.1.20
by dchapyshev＠svn.reactos.org 06 May '09

06 May '09

Author: dchapyshev Date: Wed May 6 12:50:22 2009 New Revision: 40815 URL: http://svn.reactos.org/svn/reactos?rev=40815&view=rev Log: - Sync spoolss, sxs, urlmon with Wine 1.1.20 Added: trunk/reactos/dll/win32/urlmon/mimefilter.c (with props) trunk/reactos/dll/win32/urlmon/urlmon_local.idl (with props) Modified: trunk/reactos/dll/win32/spoolss/router.c trunk/reactos/dll/win32/sxs/sxs.c trunk/reactos/dll/win32/sxs/sxs.spec trunk/reactos/dll/win32/urlmon/binding.c trunk/reactos/dll/win32/urlmon/bindprot.c trunk/reactos/dll/win32/urlmon/file.c trunk/reactos/dll/win32/urlmon/format.c trunk/reactos/dll/win32/urlmon/ftp.c trunk/reactos/dll/win32/urlmon/gopher.c trunk/reactos/dll/win32/urlmon/http.c trunk/reactos/dll/win32/urlmon/mk.c trunk/reactos/dll/win32/urlmon/regsvr.c trunk/reactos/dll/win32/urlmon/session.c trunk/reactos/dll/win32/urlmon/umon.c trunk/reactos/dll/win32/urlmon/urlmon.inf trunk/reactos/dll/win32/urlmon/urlmon.rbuild trunk/reactos/dll/win32/urlmon/urlmon_main.c trunk/reactos/dll/win32/urlmon/urlmon_main.h Modified: trunk/reactos/dll/win32/spoolss/router.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/spoolss/router.c… ============================================================================== --- trunk/reactos/dll/win32/spoolss/router.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/spoolss/router.c [iso-8859-1] Wed May 6 12:50:22 2009 @@ -270,7 +270,7 @@ EnterCriticalSection(&backend_cs); - /* if we failed before, dont try again */ + /* if we failed before, don't try again */ if (!failed && (used_backends == 0)) { pb = backend_load(localsplW, NULL, NULL); Modified: trunk/reactos/dll/win32/sxs/sxs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/sxs.c?rev=40… ============================================================================== --- trunk/reactos/dll/win32/sxs/sxs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sxs/sxs.c [iso-8859-1] Wed May 6 12:50:22 2009 @@ -22,7 +22,9 @@ #include "windef.h" #include "winbase.h" +#include "wine/debug.h" +WINE_DEFAULT_DEBUG_CHANNEL(sxs); /*********************************************************************** * DllMain (SXS.@) @@ -40,3 +42,9 @@ } return TRUE; } + +HRESULT WINAPI CreateAssemblyCache(DWORD unimplemented, DWORD dwReserved) +{ + FIXME("%u %u stub\n", unimplemented, dwReserved); + return E_NOTIMPL; +} Modified: trunk/reactos/dll/win32/sxs/sxs.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/sxs.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/sxs/sxs.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/sxs/sxs.spec [iso-8859-1] Wed May 6 12:50:22 2009 @@ -1,2 +1,2 @@ -@ stub CreateAssemblyCache +@ stdcall CreateAssemblyCache(long long) @ stub CreateAssemblyNameObject Modified: trunk/reactos/dll/win32/urlmon/binding.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/binding.c… ============================================================================== --- trunk/reactos/dll/win32/urlmon/binding.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/binding.c [iso-8859-1] Wed May 6 12:50:22 2009 @@ -80,6 +80,7 @@ const IBindingVtbl *lpBindingVtbl; const IInternetProtocolSinkVtbl *lpInternetProtocolSinkVtbl; const IInternetBindInfoVtbl *lpInternetBindInfoVtbl; + const IWinInetHttpInfoVtbl *lpWinInetHttpInfoVtbl; const IServiceProviderVtbl *lpServiceProviderVtbl; LONG ref; @@ -117,6 +118,7 @@ #define BINDING(x) ((IBinding*) &(x)->lpBindingVtbl) #define PROTSINK(x) ((IInternetProtocolSink*) &(x)->lpInternetProtocolSinkVtbl) #define BINDINF(x) ((IInternetBindInfo*) &(x)->lpInternetBindInfoVtbl) +#define INETINFO(x) ((IWinInetHttpInfo*) &(x)->lpWinInetHttpInfoVtbl) #define SERVPROV(x) ((IServiceProvider*) &(x)->lpServiceProviderVtbl) #define STREAM(x) ((IStream*) &(x)->lpStreamVtbl) @@ -901,6 +903,31 @@ }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); *ppv = SERVPROV(This); + }else if(IsEqualGUID(&IID_IWinInetInfo, riid)) { + TRACE("(%p)->(IID_IWinInetInfo %p)\n", This, ppv); + + /* NOTE: This violidates COM rules, but tests prove that we should do it */ + if(!get_wininet_info(This->protocol)) + return E_NOINTERFACE; + + *ppv = INETINFO(This); + }else if(IsEqualGUID(&IID_IWinInetHttpInfo, riid)) { + IWinInetHttpInfo *http_info; + IWinInetInfo *info; + HRESULT hres; + + TRACE("(%p)->(IID_IWinInetHttpInfo %p)\n", This, ppv); + + info = get_wininet_info(This->protocol); + if(!info) + return E_NOINTERFACE; + + hres = IWinInetInfo_QueryInterface(info, &IID_IWinInetHttpInfo, (void**)&http_info); + if(FAILED(hres)) + return E_NOINTERFACE; + + IWinInetHttpInfo_Release(http_info); + *ppv = INETINFO(This); } if(*ppv) { @@ -1448,6 +1475,52 @@ InternetBindInfo_GetBindString }; +#define INETINFO_THIS(iface) DEFINE_THIS(Binding, WinInetHttpInfo, iface) + +static HRESULT WINAPI WinInetHttpInfo_QueryInterface(IWinInetHttpInfo *iface, REFIID riid, void **ppv) +{ + Binding *This = INETINFO_THIS(iface); + return IBinding_QueryInterface(BINDING(This), riid, ppv); +} + +static ULONG WINAPI WinInetHttpInfo_AddRef(IWinInetHttpInfo *iface) +{ + Binding *This = INETINFO_THIS(iface); + return IBinding_AddRef(BINDING(This)); +} + +static ULONG WINAPI WinInetHttpInfo_Release(IWinInetHttpInfo *iface) +{ + Binding *This = INETINFO_THIS(iface); + return IBinding_Release(BINDING(This)); +} + +static HRESULT WINAPI WinInetHttpInfo_QueryOption(IWinInetHttpInfo *iface, DWORD dwOption, + void *pBuffer, DWORD *pcbBuffer) +{ + Binding *This = INETINFO_THIS(iface); + FIXME("(%p)->(%x %p %p)\n", This, dwOption, pBuffer, pcbBuffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI WinInetHttpInfo_QueryInfo(IWinInetHttpInfo *iface, DWORD dwOption, + void *pBuffer, DWORD *pcbBuffer, DWORD *pdwFlags, DWORD *pdwReserved) +{ + Binding *This = INETINFO_THIS(iface); + FIXME("(%p)->(%x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); + return E_NOTIMPL; +} + +#undef INETINFO_THIS + +static const IWinInetHttpInfoVtbl WinInetHttpInfoVtbl = { + WinInetHttpInfo_QueryInterface, + WinInetHttpInfo_AddRef, + WinInetHttpInfo_Release, + WinInetHttpInfo_QueryOption, + WinInetHttpInfo_QueryInfo +}; + #define SERVPROV_THIS(iface) DEFINE_THIS(Binding, ServiceProvider, iface) static HRESULT WINAPI ServiceProvider_QueryInterface(IServiceProvider *iface, @@ -1559,6 +1632,7 @@ ret->lpBindingVtbl = &BindingVtbl; ret->lpInternetProtocolSinkVtbl = &InternetProtocolSinkVtbl; ret->lpInternetBindInfoVtbl = &InternetBindInfoVtbl; + ret->lpWinInetHttpInfoVtbl = &WinInetHttpInfoVtbl; ret->lpServiceProviderVtbl = &ServiceProviderVtbl; ret->ref = 1; Modified: trunk/reactos/dll/win32/urlmon/bindprot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/bindprot.… ============================================================================== --- trunk/reactos/dll/win32/urlmon/bindprot.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/bindprot.c [iso-8859-1] Wed May 6 12:50:22 2009 @@ -34,6 +34,7 @@ IInternetBindInfo *bind_info; IInternetProtocolSink *protocol_sink; IServiceProvider *service_provider; + IWinInetInfo *wininet_info; LONG priority; @@ -104,6 +105,8 @@ TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + if(This->wininet_info) + IWinInetInfo_Release(This->wininet_info); if(This->protocol) IInternetProtocol_Release(This->protocol); if(This->bind_info) @@ -120,17 +123,18 @@ static HRESULT WINAPI BindProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo, - DWORD grfPI, DWORD dwReserved) + DWORD grfPI, HANDLE_PTR dwReserved) { BindProtocol *This = PROTOCOL_THIS(iface); IInternetProtocol *protocol = NULL; IInternetPriority *priority; IServiceProvider *service_provider; + BOOL urlmon_protocol = FALSE; CLSID clsid = IID_NULL; LPOLESTR clsid_str; HRESULT hres; - TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink, + TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); if(!szUrl || !pOIProtSink || !pOIBindInfo) @@ -149,7 +153,7 @@ IClassFactory *cf; IUnknown *unk; - hres = get_protocol_handler(szUrl, &clsid, &cf); + hres = get_protocol_handler(szUrl, &clsid, &urlmon_protocol, &cf); if(FAILED(hres)) return hres; @@ -178,6 +182,9 @@ This->protocol = protocol; + if(urlmon_protocol) + IInternetProtocol_QueryInterface(protocol, &IID_IWinInetInfo, (void**)&This->wininet_info); + IInternetBindInfo_AddRef(pOIBindInfo); This->bind_info = pOIBindInfo; @@ -302,6 +309,13 @@ service_provider = InterlockedExchangePointer((void**)&This->service_provider, service_provider); if(service_provider) IServiceProvider_Release(service_provider); +} + +IWinInetInfo *get_wininet_info(IInternetProtocol *bind_protocol) +{ + BindProtocol *This = PROTOCOL_THIS(bind_protocol); + + return This->wininet_info; } #undef PROTOCOL_THIS Modified: trunk/reactos/dll/win32/urlmon/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/file.c?re… ============================================================================== --- trunk/reactos/dll/win32/urlmon/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/file.c [iso-8859-1] Wed May 6 12:50:22 2009 @@ -92,7 +92,7 @@ static HRESULT WINAPI FileProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo, - DWORD grfPI, DWORD dwReserved) + DWORD grfPI, HANDLE_PTR dwReserved) { FileProtocol *This = PROTOCOL_THIS(iface); BINDINFO bindinfo; @@ -106,7 +106,7 @@ static const WCHAR wszFile[] = {'f','i','l','e',':'}; - TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink, + TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); if(!szUrl || strlenW(szUrl) < sizeof(wszFile)/sizeof(WCHAR) Modified: trunk/reactos/dll/win32/urlmon/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/format.c?… ============================================================================== --- trunk/reactos/dll/win32/urlmon/format.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/format.c [iso-8859-1] Wed May 6 12:50:22 2009 @@ -35,11 +35,13 @@ static IEnumFORMATETC *EnumFORMATETC_Create(UINT cfmtetc, const FORMATETC *rgfmtetc, UINT it); -#define ENUMF_THIS(iface) ICOM_THIS_MULTI(EnumFORMATETC, lpEnumFORMATETCVtbl, iface) +#define ENUMF_THIS(iface) DEFINE_THIS(EnumFORMATETC, EnumFORMATETC, iface) static HRESULT WINAPI EnumFORMATETC_QueryInterface(IEnumFORMATETC *iface, REFIID riid, void **ppv) { - TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + EnumFORMATETC *This = ENUMF_THIS(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -55,7 +57,7 @@ static ULONG WINAPI EnumFORMATETC_AddRef(IEnumFORMATETC *iface) { - ENUMF_THIS(iface); + EnumFORMATETC *This = ENUMF_THIS(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); return ref; @@ -63,7 +65,7 @@ static ULONG WINAPI EnumFORMATETC_Release(IEnumFORMATETC *iface) { - ENUMF_THIS(iface); + EnumFORMATETC *This = ENUMF_THIS(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -81,7 +83,7 @@ static HRESULT WINAPI EnumFORMATETC_Next(IEnumFORMATETC *iface, ULONG celt, FORMATETC *rgelt, ULONG *pceltFetched) { - ENUMF_THIS(iface); + EnumFORMATETC *This = ENUMF_THIS(iface); ULONG cnt; TRACE("(%p)->(%d %p %p)\n", This, celt, rgelt, pceltFetched); @@ -108,7 +110,7 @@ static HRESULT WINAPI EnumFORMATETC_Skip(IEnumFORMATETC *iface, ULONG celt) { - ENUMF_THIS(iface); + EnumFORMATETC *This = ENUMF_THIS(iface); TRACE("(%p)->(%d)\n", This, celt); @@ -118,7 +120,7 @@ static HRESULT WINAPI EnumFORMATETC_Reset(IEnumFORMATETC *iface) { - ENUMF_THIS(iface); + EnumFORMATETC *This = ENUMF_THIS(iface); TRACE("(%p)\n", This); @@ -128,7 +130,7 @@ static HRESULT WINAPI EnumFORMATETC_Clone(IEnumFORMATETC *iface, IEnumFORMATETC **ppenum) { - ENUMF_THIS(iface); + EnumFORMATETC *This = ENUMF_THIS(iface); TRACE("(%p)->(%p)\n", This, ppenum); Modified: trunk/reactos/dll/win32/urlmon/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/ftp.c?rev… ============================================================================== --- trunk/reactos/dll/win32/urlmon/ftp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/ftp.c [iso-8859-1] Wed May 6 12:50:22 2009 @@ -26,12 +26,14 @@ const IInternetProtocolVtbl *lpInternetProtocolVtbl; const IInternetPriorityVtbl *lpInternetPriorityVtbl; + const IWinInetHttpInfoVtbl *lpWinInetHttpInfoVtbl; LONG ref; } FtpProtocol; -#define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) -#define PRIORITY(x) ((IInternetPriority*) &(x)->lpInternetPriorityVtbl) +#define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) +#define PRIORITY(x) ((IInternetPriority*) &(x)->lpInternetPriorityVtbl) +#define INETHTTPINFO(x) ((IWinInetHttpInfo*) &(x)->lpWinInetHttpInfoVtbl) #define ASYNCPROTOCOL_THIS(iface) DEFINE_THIS2(FtpProtocol, base, iface) @@ -97,6 +99,12 @@ }else if(IsEqualGUID(&IID_IInternetPriority, riid)) { TRACE("(%p)->(IID_IInternetPriority %p)\n", This, ppv); *ppv = PRIORITY(This); + }else if(IsEqualGUID(&IID_IWinInetInfo, riid)) { + TRACE("(%p)->(IID_IWinInetInfo %p)\n", This, ppv); + *ppv = INETHTTPINFO(This); + }else if(IsEqualGUID(&IID_IWinInetHttpInfo, riid)) { + TRACE("(%p)->(IID_IWinInetHttpInfo %p)\n", This, ppv); + *ppv = INETHTTPINFO(This); } if(*ppv) { @@ -135,13 +143,13 @@ static HRESULT WINAPI FtpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo, - DWORD grfPI, DWORD dwReserved) + DWORD grfPI, HANDLE_PTR dwReserved) { FtpProtocol *This = PROTOCOL_THIS(iface); static const WCHAR ftpW[] = {'f','t','p',':'}; - TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink, + TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); if(strncmpW(szUrl, ftpW, sizeof(ftpW)/sizeof(WCHAR))) @@ -295,6 +303,52 @@ FtpPriority_GetPriority }; +#define INETINFO_THIS(iface) DEFINE_THIS(FtpProtocol, WinInetHttpInfo, iface) + +static HRESULT WINAPI HttpInfo_QueryInterface(IWinInetHttpInfo *iface, REFIID riid, void **ppv) +{ + FtpProtocol *This = INETINFO_THIS(iface); + return IBinding_QueryInterface(PROTOCOL(This), riid, ppv); +} + +static ULONG WINAPI HttpInfo_AddRef(IWinInetHttpInfo *iface) +{ + FtpProtocol *This = INETINFO_THIS(iface); + return IBinding_AddRef(PROTOCOL(This)); +} + +static ULONG WINAPI HttpInfo_Release(IWinInetHttpInfo *iface) +{ + FtpProtocol *This = INETINFO_THIS(iface); + return IBinding_Release(PROTOCOL(This)); +} + +static HRESULT WINAPI HttpInfo_QueryOption(IWinInetHttpInfo *iface, DWORD dwOption, + void *pBuffer, DWORD *pcbBuffer) +{ + FtpProtocol *This = INETINFO_THIS(iface); + FIXME("(%p)->(%x %p %p)\n", This, dwOption, pBuffer, pcbBuffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI HttpInfo_QueryInfo(IWinInetHttpInfo *iface, DWORD dwOption, + void *pBuffer, DWORD *pcbBuffer, DWORD *pdwFlags, DWORD *pdwReserved) +{ + FtpProtocol *This = INETINFO_THIS(iface); + FIXME("(%p)->(%x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); + return E_NOTIMPL; +} + +#undef INETINFO_THIS + +static const IWinInetHttpInfoVtbl WinInetHttpInfoVtbl = { + HttpInfo_QueryInterface, + HttpInfo_AddRef, + HttpInfo_Release, + HttpInfo_QueryOption, + HttpInfo_QueryInfo +}; + HRESULT FtpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) { FtpProtocol *ret; @@ -308,6 +362,7 @@ ret->base.vtbl = &AsyncProtocolVtbl; ret->lpInternetProtocolVtbl = &FtpProtocolVtbl; ret->lpInternetPriorityVtbl = &FtpPriorityVtbl; + ret->lpWinInetHttpInfoVtbl = &WinInetHttpInfoVtbl; ret->ref = 1; *ppobj = PROTOCOL(ret); Modified: trunk/reactos/dll/win32/urlmon/gopher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/gopher.c?… ============================================================================== --- trunk/reactos/dll/win32/urlmon/gopher.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/gopher.c [iso-8859-1] Wed May 6 12:50:22 2009 @@ -123,11 +123,11 @@ static HRESULT WINAPI GopherProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo, - DWORD grfPI, DWORD dwReserved) -{ - GopherProtocol *This = PROTOCOL_THIS(iface); - - TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink, + DWORD grfPI, HANDLE_PTR dwReserved) +{ + GopherProtocol *This = PROTOCOL_THIS(iface); + + TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); return protocol_start(&This->base, PROTOCOL(This), szUrl, pOIProtSink, pOIBindInfo); Modified: trunk/reactos/dll/win32/urlmon/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/http.c?re… ============================================================================== --- trunk/reactos/dll/win32/urlmon/http.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/http.c [iso-8859-1] Wed May 6 12:50:22 2009 @@ -34,6 +34,7 @@ const IInternetProtocolVtbl *lpInternetProtocolVtbl; const IInternetPriorityVtbl *lpInternetPriorityVtbl; + const IWinInetHttpInfoVtbl *lpWinInetHttpInfoVtbl; BOOL https; IHttpNegotiate *http_negotiate; @@ -42,8 +43,9 @@ LONG ref; } HttpProtocol; -#define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) -#define PRIORITY(x) ((IInternetPriority*) &(x)->lpInternetPriorityVtbl) +#define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) +#define PRIORITY(x) ((IInternetPriority*) &(x)->lpInternetPriorityVtbl) +#define INETHTTPINFO(x) ((IWinInetHttpInfo*) &(x)->lpWinInetHttpInfoVtbl) /* Default headers from native */ static const WCHAR wszHeaders[] = {'A','c','c','e','p','t','-','E','n','c','o','d','i','n','g', @@ -326,6 +328,12 @@ }else if(IsEqualGUID(&IID_IInternetPriority, riid)) { TRACE("(%p)->(IID_IInternetPriority %p)\n", This, ppv); *ppv = PRIORITY(This); + }else if(IsEqualGUID(&IID_IWinInetInfo, riid)) { + TRACE("(%p)->(IID_IWinInetInfo %p)\n", This, ppv); + *ppv = INETHTTPINFO(This); + }else if(IsEqualGUID(&IID_IWinInetHttpInfo, riid)) { + TRACE("(%p)->(IID_IWinInetHttpInfo %p)\n", This, ppv); + *ppv = INETHTTPINFO(This); } if(*ppv) { @@ -364,14 +372,14 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo, - DWORD grfPI, DWORD dwReserved) + DWORD grfPI, HANDLE_PTR dwReserved) { HttpProtocol *This = PROTOCOL_THIS(iface); static const WCHAR httpW[] = {'h','t','t','p',':'}; static const WCHAR httpsW[] = {'h','t','t','p','s',':'}; - TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink, + TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); if(This->https @@ -527,6 +535,52 @@ HttpPriority_GetPriority }; +#define INETINFO_THIS(iface) DEFINE_THIS(HttpProtocol, WinInetHttpInfo, iface) + +static HRESULT WINAPI HttpInfo_QueryInterface(IWinInetHttpInfo *iface, REFIID riid, void **ppv) +{ + HttpProtocol *This = INETINFO_THIS(iface); + return IBinding_QueryInterface(PROTOCOL(This), riid, ppv); +} + +static ULONG WINAPI HttpInfo_AddRef(IWinInetHttpInfo *iface) +{ + HttpProtocol *This = INETINFO_THIS(iface); + return IBinding_AddRef(PROTOCOL(This)); +} + +static ULONG WINAPI HttpInfo_Release(IWinInetHttpInfo *iface) +{ + HttpProtocol *This = INETINFO_THIS(iface); + return IBinding_Release(PROTOCOL(This)); +} + +static HRESULT WINAPI HttpInfo_QueryOption(IWinInetHttpInfo *iface, DWORD dwOption, + void *pBuffer, DWORD *pcbBuffer) +{ + HttpProtocol *This = INETINFO_THIS(iface); + FIXME("(%p)->(%x %p %p)\n", This, dwOption, pBuffer, pcbBuffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI HttpInfo_QueryInfo(IWinInetHttpInfo *iface, DWORD dwOption, + void *pBuffer, DWORD *pcbBuffer, DWORD *pdwFlags, DWORD *pdwReserved) +{ + HttpProtocol *This = INETINFO_THIS(iface); + FIXME("(%p)->(%x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); + return E_NOTIMPL; +} + +#undef INETINFO_THIS + +static const IWinInetHttpInfoVtbl WinInetHttpInfoVtbl = { + HttpInfo_QueryInterface, + HttpInfo_AddRef, + HttpInfo_Release, + HttpInfo_QueryOption, + HttpInfo_QueryInfo +}; + static HRESULT create_http_protocol(BOOL https, void **ppobj) { HttpProtocol *ret; @@ -538,6 +592,7 @@ ret->base.vtbl = &AsyncProtocolVtbl; ret->lpInternetProtocolVtbl = &HttpProtocolVtbl; ret->lpInternetPriorityVtbl = &HttpPriorityVtbl; + ret->lpWinInetHttpInfoVtbl = &WinInetHttpInfoVtbl; ret->https = https; ret->ref = 1; Added: trunk/reactos/dll/win32/urlmon/mimefilter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/mimefilte… ============================================================================== --- trunk/reactos/dll/win32/urlmon/mimefilter.c (added) +++ trunk/reactos/dll/win32/urlmon/mimefilter.c [iso-8859-1] Wed May 6 12:50:22 2009 @@ -1,0 +1,263 @@ +/* + * Copyright 2009 Jacek Caban for CodeWeavers + * + * 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 "urlmon_main.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(urlmon); + +typedef struct { + const IInternetProtocolVtbl *lpIInternetProtocolVtbl; + const IInternetProtocolSinkVtbl *lpIInternetProtocolSinkVtbl; + + LONG ref; +} MimeFilter; + +#define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpIInternetProtocolVtbl) +#define PROTOCOLSINK(x) ((IInternetProtocolSink*) &(x)->lpIInternetProtocolSinkVtbl) + +#define PROTOCOL_THIS(iface) DEFINE_THIS(MimeFilter, IInternetProtocol, iface) + +static HRESULT WINAPI MimeFilterProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + + *ppv = NULL; + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = PROTOCOL(This); + }else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) { + TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv); + *ppv = PROTOCOL(This); + }else if(IsEqualGUID(&IID_IInternetProtocol, riid)) { + TRACE("(%p)->(IID_IInternetProtocol %p)\n", This, ppv); + *ppv = PROTOCOL(This); + }else if(IsEqualGUID(&IID_IInternetProtocolSink, riid)) { + TRACE("(%p)->(IID_IInternetProtocolSink %p)\n", This, ppv); + *ppv = PROTOCOLSINK(This); + } + + if(*ppv) { + IInternetProtocol_AddRef(iface); + return S_OK; + } + + WARN("not supported interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI MimeFilterProtocol_AddRef(IInternetProtocol *iface) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + LONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p) ref=%d\n", This, ref); + return ref; +} + +static ULONG WINAPI MimeFilterProtocol_Release(IInternetProtocol *iface) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + heap_free(This); + + URLMON_UnlockModule(); + } + + return ref; +} + +static HRESULT WINAPI MimeFilterProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, + IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo, + DWORD grfPI, HANDLE_PTR dwReserved) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink, + pOIBindInfo, grfPI, dwReserved); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterProtocol_Continue(IInternetProtocol *iface, PROTOCOLDATA *pProtocolData) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%p)\n", This, pProtocolData); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterProtocol_Abort(IInternetProtocol *iface, HRESULT hrReason, + DWORD dwOptions) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%08x)\n", This, dwOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterProtocol_Suspend(IInternetProtocol *iface) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterProtocol_Resume(IInternetProtocol *iface) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterProtocol_Read(IInternetProtocol *iface, void *pv, + ULONG cb, ULONG *pcbRead) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER dlibMove, + DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterProtocol_LockRequest(IInternetProtocol *iface, DWORD dwOptions) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + FIXME("(%p)->(%08x)\n", This, dwOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterProtocol_UnlockRequest(IInternetProtocol *iface) +{ + MimeFilter *This = PROTOCOL_THIS(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +#undef PROTOCOL_THIS + +static const IInternetProtocolVtbl MimeFilterProtocolVtbl = { + MimeFilterProtocol_QueryInterface, + MimeFilterProtocol_AddRef, + MimeFilterProtocol_Release, + MimeFilterProtocol_Start, + MimeFilterProtocol_Continue, + MimeFilterProtocol_Abort, + MimeFilterProtocol_Terminate, + MimeFilterProtocol_Suspend, + MimeFilterProtocol_Resume, + MimeFilterProtocol_Read, + MimeFilterProtocol_Seek, + MimeFilterProtocol_LockRequest, + MimeFilterProtocol_UnlockRequest +}; + +#define PROTSINK_THIS(iface) DEFINE_THIS(MimeFilter, IInternetProtocolSink, iface) + +static HRESULT WINAPI MimeFilterSink_QueryInterface(IInternetProtocolSink *iface, + REFIID riid, void **ppv) +{ + MimeFilter *This = PROTSINK_THIS(iface); + return IInternetProtocol_QueryInterface(PROTOCOL(This), riid, ppv); +} + +static ULONG WINAPI MimeFilterSink_AddRef(IInternetProtocolSink *iface) +{ + MimeFilter *This = PROTSINK_THIS(iface); + return IInternetProtocol_AddRef(PROTOCOL(This)); +} + +static ULONG WINAPI MimeFilterSink_Release(IInternetProtocolSink *iface) +{ + MimeFilter *This = PROTSINK_THIS(iface); + return IInternetProtocol_Release(PROTOCOL(This)); +} + +static HRESULT WINAPI MimeFilterSink_Switch(IInternetProtocolSink *iface, + PROTOCOLDATA *pProtocolData) +{ + MimeFilter *This = PROTSINK_THIS(iface); + FIXME("(%p)->(%p)\n", This, pProtocolData); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterSink_ReportProgress(IInternetProtocolSink *iface, + ULONG ulStatusCode, LPCWSTR szStatusText) +{ + MimeFilter *This = PROTSINK_THIS(iface); + FIXME("(%p)->(%u %s)\n", This, ulStatusCode, debugstr_w(szStatusText)); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterSink_ReportData(IInternetProtocolSink *iface, + DWORD grfBSCF, ULONG ulProgress, ULONG ulProgressMax) +{ + MimeFilter *This = PROTSINK_THIS(iface); + FIXME("(%p)->(%d %u %u)\n", This, grfBSCF, ulProgress, ulProgressMax); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeFilterSink_ReportResult(IInternetProtocolSink *iface, + HRESULT hrResult, DWORD dwError, LPCWSTR szResult) +{ + MimeFilter *This = PROTSINK_THIS(iface); + FIXME("(%p)->(%08x %d %s)\n", This, hrResult, dwError, debugstr_w(szResult)); + return E_NOTIMPL; +} + +#undef PROTSINK_THIS + +static const IInternetProtocolSinkVtbl InternetProtocolSinkVtbl = { + MimeFilterSink_QueryInterface, + MimeFilterSink_AddRef, + MimeFilterSink_Release, + MimeFilterSink_Switch, + MimeFilterSink_ReportProgress, + MimeFilterSink_ReportData, + MimeFilterSink_ReportResult +}; + +HRESULT MimeFilter_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) +{ + MimeFilter *ret; + + TRACE("(%p %p)\n", pUnkOuter, ppobj); + + URLMON_LockModule(); + + ret = heap_alloc_zero(sizeof(MimeFilter)); + + ret->lpIInternetProtocolVtbl = &MimeFilterProtocolVtbl; + ret->lpIInternetProtocolSinkVtbl = &InternetProtocolSinkVtbl; + ret->ref = 1; + + *ppobj = PROTOCOL(ret); + return S_OK; +} Propchange: trunk/reactos/dll/win32/urlmon/mimefilter.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/urlmon/mk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/mk.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/urlmon/mk.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/mk.c [iso-8859-1] Wed May 6 12:50:22 2009 @@ -93,7 +93,7 @@ static HRESULT WINAPI MkProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo, - DWORD grfPI, DWORD dwReserved) + DWORD grfPI, HANDLE_PTR dwReserved) { MkProtocol *This = PROTOCOL_THIS(iface); IParseDisplayName *pdn; @@ -108,7 +108,7 @@ static const WCHAR wszMK[] = {'m','k',':','@'}; - TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink, + TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); if(strncmpiW(szUrl, wszMK, sizeof(wszMK)/sizeof(WCHAR))) Modified: trunk/reactos/dll/win32/urlmon/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/regsvr.c?… ============================================================================== --- trunk/reactos/dll/win32/urlmon/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/regsvr.c [iso-8859-1] Wed May 6 12:50:22 2009 @@ -513,10 +513,10 @@ #define INF_SET_CLSID(clsid) \ do \ { \ - static CHAR name[] = "CLSID_" #clsid; \ + static CHAR name[] = #clsid; \ \ pse[i].pszName = name; \ - clsids[i++] = &CLSID_ ## clsid; \ + clsids[i++] = &clsid; \ } while (0) static HRESULT register_inf(BOOL doregister) @@ -525,19 +525,20 @@ HMODULE hAdvpack; HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); STRTABLEA strtable; - STRENTRYA pse[7]; - static CLSID const *clsids[34]; + STRENTRYA pse[8]; + static CLSID const *clsids[8]; unsigned int i = 0; static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; - INF_SET_CLSID(CdlProtocol); - INF_SET_CLSID(FileProtocol); - INF_SET_CLSID(FtpProtocol); - INF_SET_CLSID(GopherProtocol); - INF_SET_CLSID(HttpProtocol); - INF_SET_CLSID(HttpSProtocol); - INF_SET_CLSID(MkProtocol); + INF_SET_CLSID(CLSID_CdlProtocol); + INF_SET_CLSID(CLSID_FileProtocol); + INF_SET_CLSID(CLSID_FtpProtocol); + INF_SET_CLSID(CLSID_GopherProtocol); + INF_SET_CLSID(CLSID_HttpProtocol); + INF_SET_CLSID(CLSID_HttpSProtocol); + INF_SET_CLSID(CLSID_MkProtocol); + INF_SET_CLSID(CLSID_DeCompMimeFilter); for(i = 0; i < sizeof(pse)/sizeof(pse[0]); i++) { pse[i].pszValue = heap_alloc(39); Modified: trunk/reactos/dll/win32/urlmon/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/session.c… ============================================================================== --- trunk/reactos/dll/win32/urlmon/session.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/session.c [iso-8859-1] Wed May 6 12:50:22 2009 @@ -228,7 +228,7 @@ return ret; } -HRESULT get_protocol_handler(LPCWSTR url, CLSID *clsid, IClassFactory **ret) +HRESULT get_protocol_handler(LPCWSTR url, CLSID *clsid, BOOL *urlmon_protocol, IClassFactory **ret) { name_space *ns; WCHAR schema[64]; @@ -250,6 +250,8 @@ IClassFactory_AddRef(*ret); if(clsid) *clsid = ns->clsid; + if(urlmon_protocol) + *urlmon_protocol = ns->urlmon; } LeaveCriticalSection(&session_cs); @@ -257,6 +259,8 @@ if(*ret) return S_OK; + if(urlmon_protocol) + *urlmon_protocol = FALSE; return get_protocol_cf(schema, schema_len, clsid, ret); } Modified: trunk/reactos/dll/win32/urlmon/umon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/umon.c?re… ============================================================================== --- trunk/reactos/dll/win32/urlmon/umon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/umon.c [iso-8859-1] Wed May 6 12:50:22 2009 @@ -20,13 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> - #include "urlmon_main.h" #include "winreg.h" -#include "winternl.h" -#include "wininet.h" #include "shlwapi.h" #include "wine/debug.h" Modified: trunk/reactos/dll/win32/urlmon/urlmon.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon.in… ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon.inf [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon.inf [iso-8859-1] Wed May 6 12:50:22 2009 @@ -3,11 +3,19 @@ [RegisterDll] -AddReg=Protocols.Reg, ZoneMap.Reg, Zones.Reg +AddReg=Classes.Reg, Protocols.Reg, ZoneMap.Reg, Zones.Reg [UnregisterDll] -DelReg=Protocols.Reg, ZoneMap.Reg, Zones.Reg +DelReg=Classes.Reg, Protocols.Reg, ZoneMap.Reg, Zones.Reg + + +[Classes.Reg] + +;; CLSID_DeCompMimeFilter +HKCR,"CLSID\%CLSID_DeCompMimeFilter%",,,"AP lzdhtml encoding/decoding Filter" +HKCR,"CLSID\%CLSID_DeCompMimeFilter%\InProcServer32",,,"%MODULE%" +HKCR,"CLSID\%CLSID_DeCompMimeFilter%\InProcServer32","ThreadingModel",,"Apartment" [Protocols.Reg] @@ -26,7 +34,12 @@ HKCR,"PROTOCOLS\Handler\https",,,"https: Asynchronous Pluggable Protocol Handler" HKCR,"PROTOCOLS\Handler\https","CLSID",,"%CLSID_HttpsProtocol%" HKCR,"PROTOCOLS\Handler\mk",,,"mk: Asynchronous Pluggable Protocol Handler" -HKCR,"PROTOCOLS\Handler\mk","CLSID",,"%CLSID_MkProtocol%" +HKCR,"PROTOCOLS\Filter\deflate",,,"AP Deflate Encoding/Decoding Filter" +HKCR,"PROTOCOLS\Filter\deflate","CLSID",,"%CLSID_DeCompMimeFilter%" +HKCR,"PROTOCOLS\Filter\gzip",,,"AP Deflate Encoding/Decoding Filter" +HKCR,"PROTOCOLS\Filter\gzip","CLSID",,"%CLSID_DeCompMimeFilter%" +HKCR,"PROTOCOLS\Filter\lzdhtml",,,"AP Deflate Encoding/Decoding Filter" +HKCR,"PROTOCOLS\Filter\lzdhtml","CLSID",,"%CLSID_DeCompMimeFilter%" [ZoneMap.Reg] @@ -448,6 +461,8 @@ [Strings] +MODULE="urlmon.dll" + PATH_ZONEMAP="Software\Microsoft\Windows\CurrentVersion\Internet Settings\ZoneMap" PATH_ZONEMAP_PROTOCOLS="Software\Microsoft\Windows\CurrentVersion\Internet Settings\ZoneMap\ProtocolDefaults" PATH_ZONEMAP_DOMAINS="Software\Microsoft\Windows\CurrentVersion\Internet Settings\ZoneMap\Domains" Modified: trunk/reactos/dll/win32/urlmon/urlmon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon.rb… ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon.rbuild [iso-8859-1] Wed May 6 12:50:22 2009 @@ -18,6 +18,7 @@ <file>gopher.c</file> <file>http.c</file> <file>internet.c</file> + <file>mimefilter.c</file> <file>mk.c</file> <file>protocol.c</file> <file>regsvr.c</file> @@ -37,4 +38,7 @@ <library>kernel32</library> <library>ntdll</library> </module> +<module name="urlmon_local_interface" type="idlinterface"> + <file>urlmon_local.idl</file> +</module> </group> Added: trunk/reactos/dll/win32/urlmon/urlmon_local.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon_lo… ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon_local.idl (added) +++ trunk/reactos/dll/win32/urlmon/urlmon_local.idl [iso-8859-1] Wed May 6 12:50:22 2009 @@ -1,0 +1,2 @@ + +#include "urlmon.idl" Propchange: trunk/reactos/dll/win32/urlmon/urlmon_local.idl ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/urlmon/urlmon_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon_ma… ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon_main.c [iso-8859-1] Wed May 6 12:50:22 2009 @@ -187,6 +187,8 @@ { &ClassFactoryVtbl, ZoneMgrImpl_Construct}; static const ClassFactory StdURLMonikerCF = { &ClassFactoryVtbl, StdURLMoniker_Construct}; +static const ClassFactory MimeFilterCF = + { &ClassFactoryVtbl, MimeFilter_Construct}; struct object_creation_info { @@ -212,7 +214,8 @@ { &CLSID_MkProtocol, CLASSFACTORY(&MkProtocolCF), wszMk }, { &CLSID_InternetSecurityManager, CLASSFACTORY(&SecurityManagerCF), NULL }, { &CLSID_InternetZoneManager, CLASSFACTORY(&ZoneManagerCF), NULL }, - { &CLSID_StdURLMoniker, CLASSFACTORY(&StdURLMonikerCF), NULL } + { &CLSID_StdURLMoniker, CLASSFACTORY(&StdURLMonikerCF), NULL }, + { &CLSID_DeCompMimeFilter, CLASSFACTORY(&MimeFilterCF), NULL } }; static void init_session(BOOL init) Modified: trunk/reactos/dll/win32/urlmon/urlmon_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon_ma… ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon_main.h [iso-8859-1] Wed May 6 12:50:22 2009 @@ -45,6 +45,7 @@ extern HRESULT FtpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); extern HRESULT GopherProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); extern HRESULT MkProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); +extern HRESULT MimeFilter_Construct(IUnknown *pUnkOuter, LPVOID *ppobj); /********************************************************************** * Dll lifetime tracking declaration for urlmon.dll @@ -53,12 +54,11 @@ static inline void URLMON_LockModule(void) { InterlockedIncrement( &URLMON_refCount ); } static inline void URLMON_UnlockModule(void) { InterlockedDecrement( &URLMON_refCount ); } -#define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) #define DEFINE_THIS2(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,ifc))) #define DEFINE_THIS(cls,ifc,iface) DEFINE_THIS2(cls,lp ## ifc ## Vtbl,iface) -IInternetProtocolInfo *get_protocol_info(LPCWSTR url); -HRESULT get_protocol_handler(LPCWSTR url, CLSID *clsid, IClassFactory **ret); +IInternetProtocolInfo *get_protocol_info(LPCWSTR); +HRESULT get_protocol_handler(LPCWSTR,CLSID*,BOOL*,IClassFactory**); BOOL is_registered_protocol(LPCWSTR); void register_urlmon_namespace(IClassFactory*,REFIID,LPCWSTR,BOOL); @@ -67,6 +67,7 @@ HRESULT create_binding_protocol(LPCWSTR url, BOOL from_urlmon, IInternetProtocol **protocol); void set_binding_sink(IInternetProtocol *bind_protocol, IInternetProtocolSink *sink); +IWinInetInfo *get_wininet_info(IInternetProtocol*); typedef struct ProtocolVtbl ProtocolVtbl;

1 0

[dchapyshev] 40814: - Sync itss and msctf with Wine 1.1.20
by dchapyshev＠svn.reactos.org 06 May '09

06 May '09

Author: dchapyshev Date: Wed May 6 12:47:39 2009 New Revision: 40814 URL: http://svn.reactos.org/svn/reactos?rev=40814&view=rev Log: - Sync itss and msctf with Wine 1.1.20 Added: trunk/reactos/dll/win32/msctf/msctf_local.idl (with props) Modified: trunk/reactos/dll/win32/itss/itss.rbuild trunk/reactos/dll/win32/itss/protocol.c trunk/reactos/dll/win32/msctf/context.c trunk/reactos/dll/win32/msctf/documentmgr.c trunk/reactos/dll/win32/msctf/msctf.c trunk/reactos/dll/win32/msctf/msctf.rbuild trunk/reactos/dll/win32/msctf/msctf_internal.h trunk/reactos/dll/win32/msctf/threadmgr.c Modified: trunk/reactos/dll/win32/itss/itss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/itss.rbuild… ============================================================================== --- trunk/reactos/dll/win32/itss/itss.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/itss.rbuild [iso-8859-1] Wed May 6 12:47:39 2009 @@ -1,5 +1,5 @@ <group> -<module name="itss" type="win32dll" baseaddress="${BASEADDRESS_ITSS}" installbase="system32" installname="itss.dll" crt="msvcrt"> +<module name="itss" type="win32dll" baseaddress="${BASEADDRESS_ITSS}" installbase="system32" installname="itss.dll" crt="msvcrt" allowwarnings="true"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="itss.spec" /> <include base="itss">.</include> Modified: trunk/reactos/dll/win32/itss/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/protocol.c?… ============================================================================== --- trunk/reactos/dll/win32/itss/protocol.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/protocol.c [iso-8859-1] Wed May 6 12:47:39 2009 @@ -137,7 +137,7 @@ static HRESULT WINAPI ITSProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo, - DWORD grfPI, DWORD dwReserved) + DWORD grfPI, HANDLE_PTR dwReserved) { ITSProtocol *This = PROTOCOL_THIS(iface); BINDINFO bindinfo; @@ -151,7 +151,7 @@ static const WCHAR separator[] = {':',':',0}; - TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink, + TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); ptr = skip_schema(szUrl); Modified: trunk/reactos/dll/win32/msctf/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/context.c?… ============================================================================== --- trunk/reactos/dll/win32/msctf/context.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/context.c [iso-8859-1] Wed May 6 12:47:39 2009 @@ -382,7 +382,7 @@ return CONNECT_E_CANNOTCONNECT; } list_add_head(&This->pTextEditSink ,&es->entry); - *pdwCookie = (DWORD)es; + *pdwCookie = generate_Cookie(COOKIE_MAGIC_CONTEXTSINK, es); } else { @@ -396,9 +396,17 @@ static WINAPI HRESULT ContextSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { - ContextSink *sink = (ContextSink*)pdwCookie; + ContextSink *sink; Context *This = impl_from_ITfSourceVtbl(iface); + TRACE("(%p) %x\n",This,pdwCookie); + + if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_CONTEXTSINK) + return E_INVALIDARG; + + sink = (ContextSink*)remove_Cookie(pdwCookie); + if (!sink) + return CONNECT_E_NOCONNECTION; list_remove(&sink->entry); free_sink(sink); Modified: trunk/reactos/dll/win32/msctf/documentmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/documentmg… ============================================================================== --- trunk/reactos/dll/win32/msctf/documentmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/documentmgr.c [iso-8859-1] Wed May 6 12:47:39 2009 @@ -167,7 +167,7 @@ if (dwFlags) return E_INVALIDARG; - if (This->contextStack[0] == NULL) /* Cannot pop last context */ + if (This->contextStack[1] == NULL) /* Cannot pop last context */ return E_FAIL; ITfThreadMgrEventSink_OnPopContext(This->ThreadMgrSink,This->contextStack[0]); @@ -199,14 +199,21 @@ static HRESULT WINAPI DocumentMgr_GetBase(ITfDocumentMgr *iface, ITfContext **ppic) { DocumentMgr *This = (DocumentMgr *)iface; + ITfContext *tgt; + TRACE("(%p)\n",This); if (!ppic) return E_INVALIDARG; if (This->contextStack[1]) - ITfContext_AddRef(This->contextStack[1]); - - *ppic = This->contextStack[1]; + tgt = This->contextStack[1]; + else + tgt = This->contextStack[0]; + + if (tgt) + ITfContext_AddRef(tgt); + + *ppic = tgt; return S_OK; } Modified: trunk/reactos/dll/win32/msctf/msctf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf.c?re… ============================================================================== --- trunk/reactos/dll/win32/msctf/msctf.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/msctf.c [iso-8859-1] Wed May 6 12:47:39 2009 @@ -43,6 +43,17 @@ static HINSTANCE MSCTF_hinstance; +typedef struct +{ + DWORD id; + DWORD magic; + LPVOID data; +} CookieInternal; + +static CookieInternal *cookies; +static UINT id_last; +static UINT array_size; + DWORD tlsIndex = 0; const WCHAR szwSystemTIPKey[] = {'S','O','F','T','W','A','R','E','\\','M','i','c','r','o','s','o','f','t','\\','C','T','F','\\','T','I','P',0}; @@ -152,6 +163,93 @@ TRACE("Created class factory %p\n", This); MSCTF_refCount++; return S_OK; +} + +/************************************************************************* + * DWORD Cookie Management + */ +DWORD generate_Cookie(DWORD magic, LPVOID data) +{ + int i; + + /* try to reuse IDs if possible */ + for (i = 0; i < id_last; i++) + if (cookies[i].id == 0) break; + + if (i == array_size) + { + if (!array_size) + { + cookies = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(CookieInternal) * 10); + if (!cookies) + { + ERR("Out of memory, Unable to alloc cookies array\n"); + return 0; + } + array_size = 10; + } + else + { + CookieInternal *new_cookies = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cookies, + sizeof(CookieInternal) * (array_size * 2)); + if (!new_cookies) + { + ERR("Out of memory, Unable to realloc cookies array\n"); + return 0; + } + cookies = new_cookies; + array_size *= 2; + } + } + + cookies[i].id = i + 1; /* a return of 0 is used for failure */ + cookies[i].magic = magic; + cookies[i].data = data; + + if (i == id_last) + id_last++; + + return cookies[i].id; +} + +DWORD get_Cookie_magic(DWORD id) +{ + UINT index = id - 1; + + if (index >= id_last) + return 0; + + if (cookies[index].id == 0) + return 0; + + return cookies[index].magic; +} + +LPVOID get_Cookie_data(DWORD id) +{ + UINT index = id - 1; + + if (index >= id_last) + return NULL; + + if (cookies[index].id == 0) + return NULL; + + return cookies[index].data; +} + +LPVOID remove_Cookie(DWORD id) +{ + UINT index = id - 1; + + if (index >= id_last) + return NULL; + + if (cookies[index].id == 0) + return NULL; + + cookies[index].id = 0; + return cookies[index].data; } /************************************************************************* Modified: trunk/reactos/dll/win32/msctf/msctf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf.rbui… ============================================================================== --- trunk/reactos/dll/win32/msctf/msctf.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/msctf.rbuild [iso-8859-1] Wed May 6 12:47:39 2009 @@ -1,3 +1,6 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="msctf" type="win32dll" baseaddress="${BASEADDRESS_MSCTF}" installbase="system32" installname="msctf.dll" allowwarnings="true"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="msctf.spec" /> @@ -21,3 +24,7 @@ <library>kernel32</library> <library>ntdll</library> </module> +<module name="msctf_local_interface" type="idlinterface"> + <file>msctf_local.idl</file> +</module> +</group> Modified: trunk/reactos/dll/win32/msctf/msctf_internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf_inte… ============================================================================== --- trunk/reactos/dll/win32/msctf/msctf_internal.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/msctf_internal.h [iso-8859-1] Wed May 6 12:47:39 2009 @@ -20,6 +20,10 @@ #ifndef __WINE_MSCTF_I_H #define __WINE_MSCTF_I_H + +#define COOKIE_MAGIC_TMSINK 0x0010 +#define COOKIE_MAGIC_CONTEXTSINK 0x0020 + extern DWORD tlsIndex; extern HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); @@ -28,5 +32,11 @@ extern HRESULT InputProcessorProfiles_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); extern HRESULT CategoryMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); +/* cookie function */ +extern DWORD generate_Cookie(DWORD magic, LPVOID data); +extern DWORD get_Cookie_magic(DWORD id); +extern LPVOID get_Cookie_data(DWORD id); +extern LPVOID remove_Cookie(DWORD id); + extern const WCHAR szwSystemTIPKey[]; #endif /* __WINE_MSCTF_I_H */ Added: trunk/reactos/dll/win32/msctf/msctf_local.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf_loca… ============================================================================== --- trunk/reactos/dll/win32/msctf/msctf_local.idl (added) +++ trunk/reactos/dll/win32/msctf/msctf_local.idl [iso-8859-1] Wed May 6 12:47:39 2009 @@ -1,0 +1,2 @@ + +#include "msctf.idl" Propchange: trunk/reactos/dll/win32/msctf/msctf_local.idl ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msctf/threadmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/threadmgr.… ============================================================================== --- trunk/reactos/dll/win32/msctf/threadmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/threadmgr.c [iso-8859-1] Wed May 6 12:47:39 2009 @@ -59,6 +59,7 @@ typedef struct tagACLMulti { const ITfThreadMgrVtbl *ThreadMgrVtbl; const ITfSourceVtbl *SourceVtbl; + const ITfKeystrokeMgrVtbl *KeystrokeMgrVtbl; LONG refCount; const ITfThreadMgrEventSinkVtbl *ThreadMgrEventSinkVtbl; /* internal */ @@ -79,6 +80,11 @@ return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,SourceVtbl)); } +static inline ThreadMgr *impl_from_ITfKeystrokeMgrVtbl(ITfKeystrokeMgr *iface) +{ + return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,KeystrokeMgrVtbl)); +} + static inline ThreadMgr *impl_from_ITfThreadMgrEventSink(ITfThreadMgrEventSink *iface) { return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,ThreadMgrEventSinkVtbl)); @@ -153,6 +159,10 @@ { *ppvOut = &This->SourceVtbl; } + else if (IsEqualIID(iid, &IID_ITfKeystrokeMgr)) + { + *ppvOut = &This->KeystrokeMgrVtbl; + } if (*ppvOut) { @@ -196,6 +206,14 @@ { ThreadMgr *This = (ThreadMgr *)iface; FIXME("STUB:(%p)\n",This); + + if (This->focus) + { + ITfThreadMgrEventSink_OnSetFocus((ITfThreadMgrEventSink*)&This->ThreadMgrEventSinkVtbl, 0, This->focus); + ITfDocumentMgr_Release(This->focus); + This->focus = 0; + } + return E_NOTIMPL; } @@ -246,7 +264,7 @@ if (!pdimFocus || FAILED(IUnknown_QueryInterface(pdimFocus,&IID_ITfDocumentMgr,(LPVOID*) &check))) return E_INVALIDARG; - ITfThreadMgrEventSink_OnSetFocus((ITfThreadMgrEventSink*)&This->ThreadMgrEventSinkVtbl, This->focus, check); + ITfThreadMgrEventSink_OnSetFocus((ITfThreadMgrEventSink*)&This->ThreadMgrEventSinkVtbl, check, This->focus); if (This->focus) ITfDocumentMgr_Release(This->focus); @@ -357,7 +375,7 @@ return CONNECT_E_CANNOTCONNECT; } list_add_head(&This->ThreadMgrEventSink,&tms->entry); - *pdwCookie = (DWORD)tms; + *pdwCookie = generate_Cookie(COOKIE_MAGIC_TMSINK, tms); } else { @@ -372,9 +390,17 @@ static WINAPI HRESULT ThreadMgrSource_UnadviseSink(ITfSource *iface, DWORD pdwCookie) { - ThreadMgrSink *sink = (ThreadMgrSink*)pdwCookie; + ThreadMgrSink *sink; ThreadMgr *This = impl_from_ITfSourceVtbl(iface); + TRACE("(%p) %x\n",This,pdwCookie); + + if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_TMSINK) + return E_INVALIDARG; + + sink = (ThreadMgrSink*)remove_Cookie(pdwCookie); + if (!sink) + return CONNECT_E_NOCONNECTION; list_remove(&sink->entry); free_sink(sink); @@ -390,6 +416,163 @@ ThreadMgrSource_AdviseSink, ThreadMgrSource_UnadviseSink, +}; + +/***************************************************** + * ITfKeystrokeMgr functions + *****************************************************/ + +static HRESULT WINAPI KeystrokeMgr_QueryInterface(ITfKeystrokeMgr *iface, REFIID iid, LPVOID *ppvOut) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + return ThreadMgr_QueryInterface((ITfThreadMgr *)This, iid, *ppvOut); +} + +static ULONG WINAPI KeystrokeMgr_AddRef(ITfKeystrokeMgr *iface) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + return ThreadMgr_AddRef((ITfThreadMgr*)This); +} + +static ULONG WINAPI KeystrokeMgr_Release(ITfKeystrokeMgr *iface) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + return ThreadMgr_Release((ITfThreadMgr *)This); +} + +static HRESULT WINAPI KeystrokeMgr_AdviseKeyEventSink(ITfKeystrokeMgr *iface, + TfClientId tid, ITfKeyEventSink *pSink, BOOL fForeground) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_UnadviseKeyEventSink(ITfKeystrokeMgr *iface, + TfClientId tid) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_GetForeground(ITfKeystrokeMgr *iface, + CLSID *pclsid) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_TestKeyDown(ITfKeystrokeMgr *iface, + WPARAM wParam, LPARAM lParam, BOOL *pfEaten) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_TestKeyUp(ITfKeystrokeMgr *iface, + WPARAM wParam, LPARAM lParam, BOOL *pfEaten) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_KeyDown(ITfKeystrokeMgr *iface, + WPARAM wParam, LPARAM lParam, BOOL *pfEaten) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_KeyUp(ITfKeystrokeMgr *iface, + WPARAM wParam, LPARAM lParam, BOOL *pfEaten) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_GetPreservedKey(ITfKeystrokeMgr *iface, + ITfContext *pic, const TF_PRESERVEDKEY *pprekey, GUID *pguid) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_IsPreservedKey(ITfKeystrokeMgr *iface, + REFGUID rguid, const TF_PRESERVEDKEY *pprekey, BOOL *pfRegistered) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_PreserveKey(ITfKeystrokeMgr *iface, + TfClientId tid, REFGUID rguid, const TF_PRESERVEDKEY *prekey, + const WCHAR *pchDesc, ULONG cchDesc) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_UnpreserveKey(ITfKeystrokeMgr *iface, + REFGUID rguid, const TF_PRESERVEDKEY *pprekey) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_SetPreservedKeyDescription(ITfKeystrokeMgr *iface, + REFGUID rguid, const WCHAR *pchDesc, ULONG cchDesc) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_GetPreservedKeyDescription(ITfKeystrokeMgr *iface, + REFGUID rguid, BSTR *pbstrDesc) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI KeystrokeMgr_SimulatePreservedKey(ITfKeystrokeMgr *iface, + ITfContext *pic, REFGUID rguid, BOOL *pfEaten) +{ + ThreadMgr *This = impl_from_ITfKeystrokeMgrVtbl(iface); + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static const ITfKeystrokeMgrVtbl ThreadMgr_KeystrokeMgrVtbl = +{ + KeystrokeMgr_QueryInterface, + KeystrokeMgr_AddRef, + KeystrokeMgr_Release, + + KeystrokeMgr_AdviseKeyEventSink, + KeystrokeMgr_UnadviseKeyEventSink, + KeystrokeMgr_GetForeground, + KeystrokeMgr_TestKeyDown, + KeystrokeMgr_TestKeyUp, + KeystrokeMgr_KeyDown, + KeystrokeMgr_KeyUp, + KeystrokeMgr_GetPreservedKey, + KeystrokeMgr_IsPreservedKey, + KeystrokeMgr_PreserveKey, + KeystrokeMgr_UnpreserveKey, + KeystrokeMgr_SetPreservedKeyDescription, + KeystrokeMgr_GetPreservedKeyDescription, + KeystrokeMgr_SimulatePreservedKey }; /***************************************************** @@ -534,6 +717,7 @@ This->ThreadMgrVtbl= &ThreadMgr_ThreadMgrVtbl; This->SourceVtbl = &ThreadMgr_SourceVtbl; + This->KeystrokeMgrVtbl= &ThreadMgr_KeystrokeMgrVtbl; This->ThreadMgrEventSinkVtbl = &ThreadMgr_ThreadMgrEventSinkVtbl; This->refCount = 1; TlsSetValue(tlsIndex,This);

1 0

[dchapyshev] 40813: - Sync mciavi32 and mciqtz32 with Wine 1.1.20
by dchapyshev＠svn.reactos.org 06 May '09

06 May '09

Author: dchapyshev Date: Wed May 6 12:46:19 2009 New Revision: 40813 URL: http://svn.reactos.org/svn/reactos?rev=40813&view=rev Log: - Sync mciavi32 and mciqtz32 with Wine 1.1.20 Modified: trunk/reactos/dll/win32/mciavi32/info.c trunk/reactos/dll/win32/mciqtz32/mciqtz.c trunk/reactos/dll/win32/mciqtz32/mciqtz_private.h Modified: trunk/reactos/dll/win32/mciavi32/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/info.c?… ============================================================================== --- trunk/reactos/dll/win32/mciavi32/info.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciavi32/info.c [iso-8859-1] Wed May 6 12:46:19 2009 @@ -225,72 +225,73 @@ } if (dwFlags & MCI_SET_ON) { - char buffer[256]; - - strcpy(buffer, "MCI_SET_ON:"); + const char *szVideo=""; + const char *szAudio=""; + const char *szSeek=""; if (dwFlags & MCI_SET_VIDEO) { - strncat(buffer, " video", sizeof(buffer)-sizeof("MCI_SET_ON:")); + szVideo = " video"; wma->dwSet |= 4; } if (dwFlags & MCI_SET_AUDIO) { - strncat(buffer, " audio", sizeof(buffer)-sizeof("MCI_SET_ON:")); switch (lpParms->dwAudio) { case MCI_SET_AUDIO_ALL: - strncat(buffer, " all", sizeof(buffer)-sizeof("MCI_SET_ON:")); + szAudio = " audio all"; wma->dwSet |= 3; break; case MCI_SET_AUDIO_LEFT: - strncat(buffer, " left", sizeof(buffer)-sizeof("MCI_SET_ON:")); + szAudio = " audio left"; wma->dwSet |= 1; break; case MCI_SET_AUDIO_RIGHT: - strncat(buffer, " right", sizeof(buffer)-sizeof("MCI_SET_ON:")); + szAudio = " audio right"; wma->dwSet |= 2; break; default: + szAudio = " audio unknown"; WARN("Unknown audio channel %u\n", lpParms->dwAudio); break; } } if (dwFlags & MCI_DGV_SET_SEEK_EXACTLY) { - strncat(buffer, " seek_exactly", sizeof(buffer)); - } - FIXME("%s\n", buffer); + szSeek = " seek_exactly"; + } + FIXME("MCI_SET_ON:%s%s%s\n", szVideo, szAudio, szSeek); } if (dwFlags & MCI_SET_OFF) { - char buffer[256]; - - strcpy(buffer, "MCI_SET_OFF:"); + const char *szVideo=""; + const char *szAudio=""; + const char *szSeek=""; + if (dwFlags & MCI_SET_VIDEO) { - strncat(buffer, " video", sizeof(buffer)-sizeof("MCI_SET_OFF:")); + szVideo = " video"; wma->dwSet &= ~4; } if (dwFlags & MCI_SET_AUDIO) { - strncat(buffer, " audio", sizeof(buffer)-sizeof("MCI_SET_OFF:")); switch (lpParms->dwAudio) { case MCI_SET_AUDIO_ALL: - strncat(buffer, " all", sizeof(buffer)-sizeof("MCI_SET_OFF:")); + szAudio = " audio all"; wma->dwSet &= ~3; break; case MCI_SET_AUDIO_LEFT: - strncat(buffer, " left", sizeof(buffer)-sizeof("MCI_SET_OFF:")); + szAudio = " audio left"; wma->dwSet &= ~2; break; case MCI_SET_AUDIO_RIGHT: - strncat(buffer, " right", sizeof(buffer)-sizeof("MCI_SET_OFF:")); + szAudio = " audio right"; wma->dwSet &= ~2; break; default: + szAudio = " audio unknown"; WARN("Unknown audio channel %u\n", lpParms->dwAudio); break; } } if (dwFlags & MCI_DGV_SET_SEEK_EXACTLY) { - strncat(buffer, " seek_exactly", sizeof(buffer)-strlen(buffer)-1); - } - FIXME("%s\n", buffer); + szSeek = " seek_exactly"; + } + FIXME("MCI_SET_OFF:%s%s%s\n", szVideo, szAudio, szSeek); } if (dwFlags & MCI_DGV_SET_FILEFORMAT) { LPCSTR str = "save"; Modified: trunk/reactos/dll/win32/mciqtz32/mciqtz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciqtz32/mciqtz.… ============================================================================== --- trunk/reactos/dll/win32/mciqtz32/mciqtz.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciqtz32/mciqtz.c [iso-8859-1] Wed May 6 12:46:19 2009 @@ -34,23 +34,37 @@ static DWORD MCIQTZ_mciStop(UINT, DWORD, LPMCI_GENERIC_PARMS); /*======================================================================* - * MCI QTZ implementation * + * MCI QTZ implementation * *======================================================================*/ HINSTANCE MCIQTZ_hInstance = 0; /*********************************************************************** - * DllMain (MCIQTZ.0) + * DllMain (MCIQTZ.0) */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) { switch (fdwReason) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDLL); - MCIQTZ_hInstance = hInstDLL; - break; + MCIQTZ_hInstance = hInstDLL; + break; } return TRUE; +} + +/************************************************************************** + * MCIQTZ_mciGetOpenDev [internal] + */ +static WINE_MCIQTZ* MCIQTZ_mciGetOpenDev(UINT wDevID) +{ + WINE_MCIQTZ* wma = (WINE_MCIQTZ*)mciGetDriverData(wDevID); + + if (!wma) { + WARN("Invalid wDevID=%u\n", wDevID); + return NULL; + } + return wma; } /************************************************************************** @@ -60,7 +74,7 @@ { WINE_MCIQTZ* wma; - TRACE("%s, %p\n", debugstr_w(str), modp); + TRACE("(%s, %p)\n", debugstr_w(str), modp); /* session instance */ if (!modp) @@ -83,14 +97,14 @@ { WINE_MCIQTZ* wma; - TRACE("%04x\n", dwDevID); - - /* finish all outstanding things */ - MCIQTZ_mciClose(dwDevID, MCI_WAIT, NULL); - - wma = (WINE_MCIQTZ*)mciGetDriverData(dwDevID); + TRACE("(%04x)\n", dwDevID); + + wma = MCIQTZ_mciGetOpenDev(dwDevID); if (wma) { + /* finish all outstanding things */ + MCIQTZ_mciClose(dwDevID, MCI_WAIT, NULL); + HeapFree(GetProcessHeap(), 0, wma); return 1; } @@ -105,32 +119,17 @@ { WINE_MCIQTZ* wma; - TRACE("%04x\n", dwDevID); + TRACE("(%04x)\n", dwDevID); + + wma = MCIQTZ_mciGetOpenDev(dwDevID); + if (!wma) + return 0; MCIQTZ_mciStop(dwDevID, MCI_WAIT, NULL); - wma = (WINE_MCIQTZ*)mciGetDriverData(dwDevID); - - if (wma) { - MessageBoxA(0, "Sample QTZ Wine Driver !", "MM-Wine Driver", MB_OK); - return 1; - } - - return 0; -} - -/************************************************************************** - * MCIQTZ_mciGetOpenDev [internal] - */ -static WINE_MCIQTZ* MCIQTZ_mciGetOpenDev(UINT wDevID) -{ - WINE_MCIQTZ* wma = (WINE_MCIQTZ*)mciGetDriverData(wDevID); - - if (!wma) { - WARN("Invalid wDevID=%u\n", wDevID); - return 0; - } - return wma; + MessageBoxA(0, "Sample QTZ Wine Driver !", "MM-Wine Driver", MB_OK); + + return 1; } /*************************************************************************** @@ -144,14 +143,14 @@ TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpOpenParms); - MCIQTZ_mciStop(wDevID, MCI_WAIT, NULL); - if (!lpOpenParms) return MCIERR_NULL_PARAMETER_BLOCK; - wma = (WINE_MCIQTZ*)mciGetDriverData(wDevID); + wma = MCIQTZ_mciGetOpenDev(wDevID); if (!wma) return MCIERR_INVALID_DEVICE_ID; + + MCIQTZ_mciStop(wDevID, MCI_WAIT, NULL); CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -184,6 +183,8 @@ TRACE("Cannot render file (hr = %x)\n", hr); goto err; } + + wma->opened = TRUE; return 0; @@ -209,20 +210,18 @@ TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + wma = MCIQTZ_mciGetOpenDev(wDevID); + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + MCIQTZ_mciStop(wDevID, MCI_WAIT, NULL); - wma = MCIQTZ_mciGetOpenDev(wDevID); - if (!wma) - return MCIERR_INVALID_DEVICE_ID; - - if (wma->pgraph) + if (wma->opened) { IGraphBuilder_Release(wma->pgraph); - wma->pgraph = NULL; - if (wma->pmctrl) IMediaControl_Release(wma->pmctrl); - wma->pmctrl = NULL; - - CoUninitialize(); + CoUninitialize(); + wma->opened = FALSE; + } return 0; } @@ -241,6 +240,8 @@ return MCIERR_NULL_PARAMETER_BLOCK; wma = MCIQTZ_mciGetOpenDev(wDevID); + if (!wma) + return MCIERR_INVALID_DEVICE_ID; hr = IMediaControl_Run(wma->pmctrl); if (FAILED(hr)) { @@ -265,14 +266,14 @@ TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); - MCIQTZ_mciStop(wDevID, MCI_WAIT, NULL); - if (!lpParms) return MCIERR_NULL_PARAMETER_BLOCK; wma = MCIQTZ_mciGetOpenDev(wDevID); if (!wma) return MCIERR_INVALID_DEVICE_ID; + + MCIQTZ_mciStop(wDevID, MCI_WAIT, NULL); if (dwFlags & MCI_SEEK_TO_START) { newpos = 0; @@ -415,11 +416,11 @@ } /*======================================================================* - * MCI QTZ entry points * + * MCI QTZ entry points * *======================================================================*/ /************************************************************************** - * DriverProc (MCIQTZ.@) + * DriverProc (MCIQTZ.@) */ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, LPARAM dwParam1, LPARAM dwParam2) @@ -449,9 +450,9 @@ case MCI_CLOSE_DRIVER: return MCIQTZ_mciClose (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); case MCI_PLAY: return MCIQTZ_mciPlay (dwDevID, dwParam1, (LPMCI_PLAY_PARMS) dwParam2); case MCI_SEEK: return MCIQTZ_mciSeek (dwDevID, dwParam1, (LPMCI_SEEK_PARMS) dwParam2); + case MCI_STOP: return MCIQTZ_mciStop (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); case MCI_STATUS: return MCIQTZ_mciStatus (dwDevID, dwParam1, (LPMCI_DGV_STATUS_PARMSW) dwParam2); case MCI_RECORD: - case MCI_STOP: case MCI_SET: case MCI_PAUSE: case MCI_RESUME: @@ -484,18 +485,18 @@ case MCI_UNDO: case MCI_CONFIGURE: case MCI_RESTORE: - FIXME("Unimplemented command [%u]\n", wMsg); + FIXME("Unimplemented command [%08X]\n", wMsg); break; case MCI_SPIN: case MCI_ESCAPE: - WARN("Unsupported command [%u]\n", wMsg); + WARN("Unsupported command [%08X]\n", wMsg); break; case MCI_OPEN: case MCI_CLOSE: FIXME("Shouldn't receive a MCI_OPEN or CLOSE message\n"); break; default: - TRACE("Sending msg [%u] to default driver proc\n", wMsg); + TRACE("Sending msg [%08X] to default driver proc\n", wMsg); return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); } Modified: trunk/reactos/dll/win32/mciqtz32/mciqtz_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciqtz32/mciqtz_… ============================================================================== --- trunk/reactos/dll/win32/mciqtz32/mciqtz_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciqtz32/mciqtz_private.h [iso-8859-1] Wed May 6 12:46:19 2009 @@ -27,6 +27,7 @@ typedef struct { MCIDEVICEID wDevID; + BOOL opened; IGraphBuilder* pgraph; IMediaControl* pmctrl; BOOL started;

1 0

[dchapyshev] 40812: - Sync credui and crypt32 with Wine 1.1.20
by dchapyshev＠svn.reactos.org 06 May '09

06 May '09

Author: dchapyshev Date: Wed May 6 12:45:02 2009 New Revision: 40812 URL: http://svn.reactos.org/svn/reactos?rev=40812&view=rev Log: - Sync credui and crypt32 with Wine 1.1.20 Added: trunk/reactos/dll/win32/credui/credui_Lt.rc (with props) trunk/reactos/dll/win32/credui/credui_Ro.rc (with props) Modified: trunk/reactos/dll/win32/credui/credui.rc trunk/reactos/dll/win32/crypt32/crypt32_Nl.rc Modified: trunk/reactos/dll/win32/credui/credui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui.rc… ============================================================================== --- trunk/reactos/dll/win32/credui/credui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui.rc [iso-8859-1] Wed May 6 12:45:02 2009 @@ -33,10 +33,12 @@ #include "credui_Es.rc" #include "credui_Fr.rc" #include "credui_Ko.rc" +#include "credui_Lt.rc" #include "credui_Nl.rc" #include "credui_No.rc" #include "credui_Pl.rc" #include "credui_Pt.rc" +#include "credui_Ro.rc" #include "credui_Ru.rc" #include "credui_Si.rc" #include "credui_Sv.rc" Added: trunk/reactos/dll/win32/credui/credui_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Lt… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Lt.rc (added) +++ trunk/reactos/dll/win32/credui/credui_Lt.rc [iso-8859-1] Wed May 6 12:45:02 2009 @@ -1,0 +1,55 @@ +/* + * Lithuanian language resource file for Credentials UI + * + * Copyright 2009 Aurimas FiÅ¡eras <aurimas(a)gmail.com> + * + * 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 + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "&Naudotojo vardas:",-1,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "&SlaptaÅ¾odis:",-1,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "Ä®&siminti mano slaptaÅ¾odÄ¯",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "Gerai",IDOK,97,128,50,14 + PUSHBUTTON "Atsisakyti",IDCANCEL,156,128,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_TITLEFORMAT "UÅ¾megzti ryÅ¡Ä¯ su %s" + IDS_MESSAGEFORMAT "Jungiamasi prie %s" + IDS_INCORRECTPASSWORDTITLE "Prisijungimas nesÄkmingas" + IDS_INCORRECTPASSWORD "Ä®sitikinkite, kad naudotojo vardas\nir slaptaÅ¾odis yra teisingi." + IDS_CAPSLOCKONTITLE "DidÅ¾iÅ³jÅ³ raidÅ¾iÅ³ bÅ«sena Ä¯jungta" + IDS_CAPSLOCKON "Kai Ä¯jungta didÅ¾iÅ³jÅ³ raidÅ¾iÅ³ bÅ«sena, savo slaptaÅ¾odÄ¯ galite Ä¯vesti neteisingai.\n\nPaspauskite didÅ¾iÅ³jÅ³ raidÅ¾iÅ³ klaviatÅ«ros klaviÅ¡Ä didÅ¾iÅ³jÅ³ raidÅ¾iÅ³ bÅ«senai iÅ¡jungti\nprieÅ¡ rinkdami savo slaptaÅ¾odÄ¯." +} + +#pragma code_page(default) Propchange: trunk/reactos/dll/win32/credui/credui_Lt.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/credui/credui_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui_Ro… ============================================================================== --- trunk/reactos/dll/win32/credui/credui_Ro.rc (added) +++ trunk/reactos/dll/win32/credui/credui_Ro.rc [iso-8859-1] Wed May 6 12:45:02 2009 @@ -1,0 +1,53 @@ +/* + * Copyright 2007 Robert Shearman (for CodeWeavers) + * Copyright 2009 Michael Stefaniuc + * + * 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 + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "Nume &utilizator:",-1,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "&ParolÄ:",-1,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "Èine minte pa&rola",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "OK",IDOK,97,128,50,14 + PUSHBUTTON "RenunÈÄ",IDCANCEL,156,128,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_TITLEFORMAT "Conectare la %s" + IDS_MESSAGEFORMAT "Conectez la %s" + IDS_INCORRECTPASSWORDTITLE "Autentificare eÈuatÄ" + IDS_INCORRECTPASSWORD "VerificaÈi numele de utilizator Èi parola." + IDS_CAPSLOCKONTITLE "Tasta Caps Lock este activatÄ" + IDS_CAPSLOCKON "Cu tasta Caps Lock activatÄ este foarte probabil cÄ veÈi introduce parola greÈit. \n\nInainte de a introduce parola apÄsaÈi tasta Caps Lock pentru a dezactiva scrierea cu majuscule." +} + +#pragma code_page(default) Propchange: trunk/reactos/dll/win32/credui/credui_Ro.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/crypt32/crypt32_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32_Nl.rc [iso-8859-1] Wed May 6 12:45:02 2009 @@ -43,7 +43,7 @@ IDS_CONTENT_TYPE "Inhoud Type" IDS_MESSAGE_DIGEST "Boodschap Samenvatting" IDS_SIGNING_TIME "Tijd van Ondertekening" - IDS_COUNTER_SIGN "Counter Sign" + IDS_COUNTER_SIGN "Tegen handtekening" IDS_CHALLENGE_PASSWORD "Geheime Vraag Wachtwoord" IDS_UNSTRUCTURED_ADDRESS "Ongestructureerd Adres" IDS_SMIME_CAPABILITIES "SMIME Mogelijkheden" @@ -63,9 +63,9 @@ IDS_NETSCAPE_CA_POLICY_URL "Netscape CA Beleids URL" IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL Server Naam" IDS_NETSCAPE_COMMENT "Netscape Commentaar" - IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" - IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" - IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" + IDS_SPC_SP_AGENCY_INFO "SPC SP Agency Informatie" + IDS_SPC_FINANCIAL_CRITERIA "SPC Financiele Criteria" + IDS_SPC_MINIMAL_CRITERIA "SPC Minimale Criteria" IDS_COUNTRY "Land/Regio" IDS_ORGANIZATION "Organisatie" IDS_ORGANIZATIONAL_UNIT "Organisatie Onderdeel" @@ -173,6 +173,7 @@ IDS_LOCALIZEDNAME_ADDRESSBOOK "Overige Personen" IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "Vertrouwde uitgevers" } + STRINGTABLE DISCARDABLE { IDS_KEY_ID "SleutelID=" @@ -181,7 +182,7 @@ IDS_ALT_NAME_OTHER_NAME "Andere naam=" IDS_ALT_NAME_RFC822_NAME "Email Adres=" IDS_ALT_NAME_DNS_NAME "DNS naam=" - IDS_ALT_NAME_DIRECTORY_NAME "Directory adres" + IDS_ALT_NAME_DIRECTORY_NAME "Directory naam=" IDS_ALT_NAME_URL "URL=" IDS_ALT_NAME_IP_ADDRESS "IP adres=" IDS_ALT_NAME_MASK "Masker=" @@ -205,8 +206,8 @@ IDS_CRL_DIST_POINT_RDN_NAME "RDN naam" IDS_CRL_DIST_POINT_REASON "CRL reden=" IDS_CRL_DIST_POINT_ISSUER "CRL verstrekker" - IDS_REASON_KEY_COMPROMISE "Key Compromie" - IDS_REASON_CA_COMPROMISE "CA Compromie" + IDS_REASON_KEY_COMPROMISE "Sleutel besmet" + IDS_REASON_CA_COMPROMISE "CA besmet" IDS_REASON_AFFILIATION_CHANGED "Samenwerking gewijzigd" IDS_REASON_SUPERSEDED "Verouderd" IDS_REASON_CESSATION_OF_OPERATION "Werkzaamheden gestaakt"

1 0

[dchapyshev] 40811: - Sync headers with Wine 1.1.20
by dchapyshev＠svn.reactos.org 06 May '09

06 May '09

Author: dchapyshev Date: Wed May 6 12:44:13 2009 New Revision: 40811 URL: http://svn.reactos.org/svn/reactos?rev=40811&view=rev Log: - Sync headers with Wine 1.1.20 Modified: trunk/reactos/include/psdk/msctf.idl trunk/reactos/include/psdk/urlmon.idl Modified: trunk/reactos/include/psdk/msctf.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msctf.idl?rev… ============================================================================== --- trunk/reactos/include/psdk/msctf.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msctf.idl [iso-8859-1] Wed May 6 12:44:13 2009 @@ -29,6 +29,7 @@ cpp_quote("#endif") cpp_quote("#define TF_E_STACKFULL MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0501)") +cpp_quote("#define TF_E_ALREADY_EXISTS MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0506)") cpp_quote("EXTERN_C const CLSID CLSID_TF_ThreadMgr;") cpp_quote("EXTERN_C const CLSID CLSID_TF_InputProcessorProfiles;") cpp_quote("EXTERN_C const CLSID CLSID_TF_CategoryMgr;") @@ -42,6 +43,18 @@ typedef [uuid(7213778c-7bb0-4270-b050-6189ee594e97)] DWORD TfEditCookie; typedef [uuid(de403c21-89fd-4f85-8b87-64584d063fbc)] DWORD TfClientId; typedef [uuid(88a9c478-f3ec-4763-8345-cd9250443f8d)] DWORD TfGuidAtom; + +cpp_quote("#define TF_MOD_ALT 0x0001") +cpp_quote("#define TF_MOD_CONTROL 0x0002") +cpp_quote("#define TF_MOD_SHIFT 0x0004") +cpp_quote("#define TF_MOD_RALT 0x0008") +cpp_quote("#define TF_MOD_RCONTROL 0x0010") +cpp_quote("#define TF_MOD_RSHIFT 0x0020") +cpp_quote("#define TF_MOD_LALT 0x0040") +cpp_quote("#define TF_MOD_LCONTROL 0x0080") +cpp_quote("#define TF_MOD_LSHIFT 0x0100") +cpp_quote("#define TF_MOD_ON_KEYUP 0x0200") +cpp_quote("#define TF_MOD_IGNORE_ALL_MODIFIER 0x0400") interface ITfDocumentMgr; interface ITfContext; @@ -61,6 +74,7 @@ interface IEnumTfLanguageProfiles; interface ITfEditRecord; interface ITfCompositionView; +interface ITfKeyEventSink; typedef [uuid(e1b5808d-1e46-4c19-84dc-68c5f5978cc8)] struct TF_LANGUAGEPROFILE { @@ -71,6 +85,12 @@ GUID guidProfile; } TF_LANGUAGEPROFILE; +typedef [uuid(77c12f95-b783-450d-879f-1cd2362c6521)] struct TF_PRESERVEDKEY +{ + UINT uVKey; + UINT uModifiers; +} TF_PRESERVEDKEY; + [ object, uuid(aa80e801-2021-11d2-93e0-0060b067b86e), @@ -515,3 +535,119 @@ HRESULT OnPopContext( [in] ITfContext *pic); }; + +[ + object, + local, + uuid(aa80e7f0-2021-11d2-93e0-0060b067b86e), + pointer_default(unique) +] +interface ITfKeystrokeMgr : IUnknown +{ + HRESULT AdviseKeyEventSink( + [in] TfClientId tid, + [in] ITfKeyEventSink *pSink, + [in] BOOL fForeground); + + HRESULT UnadviseKeyEventSink( + [in] TfClientId tid); + + HRESULT GetForeground( + [out] CLSID *pclsid); + + HRESULT TestKeyDown( + [in] WPARAM wParam, + [in] LPARAM lParam, + [out] BOOL *pfEaten); + + HRESULT TestKeyUp( + [in] WPARAM wParam, + [in] LPARAM lParam, + [out] BOOL *pfEaten); + + HRESULT KeyDown( + [in] WPARAM wParam, + [in] LPARAM lParam, + [out] BOOL *pfEaten); + + HRESULT KeyUp( + [in] WPARAM wParam, + [in] LPARAM lParam, + [out] BOOL *pfEaten); + + HRESULT GetPreservedKey( + [in] ITfContext *pic, + [in] const TF_PRESERVEDKEY *pprekey, + [out] GUID *pguid); + + HRESULT IsPreservedKey( + [in] REFGUID rguid, + [in] const TF_PRESERVEDKEY *pprekey, + [out] BOOL *pfRegistered); + + HRESULT PreserveKey( + [in] TfClientId tid, + [in] REFGUID rguid, + [in] const TF_PRESERVEDKEY *prekey, + [in, size_is(cchDesc)] const WCHAR *pchDesc, + [in] ULONG cchDesc); + + HRESULT UnpreserveKey( + [in] REFGUID rguid, + [in] const TF_PRESERVEDKEY *pprekey); + + HRESULT SetPreservedKeyDescription( + [in] REFGUID rguid, + [in, size_is(cchDesc)] const WCHAR *pchDesc, + [in] ULONG cchDesc); + + HRESULT GetPreservedKeyDescription( + [in] REFGUID rguid, + [out] BSTR *pbstrDesc); + + HRESULT SimulatePreservedKey( + [in] ITfContext *pic, + [in] REFGUID rguid, + [out] BOOL *pfEaten); +}; + +[ + object, + local, + uuid(aa80e7f5-2021-11d2-93e0-0060b067b86e), + pointer_default(unique) +] +interface ITfKeyEventSink : IUnknown +{ + HRESULT OnSetFocus( + [in] BOOL fForeground); + + HRESULT OnTestKeyDown( + [in] ITfContext *pic, + [in] WPARAM wParam, + [in] LPARAM lParam, + [out] BOOL *pfEaten); + + HRESULT OnTestKeyUp( + [in] ITfContext *pic, + [in] WPARAM wParam, + [in] LPARAM lParam, + [out] BOOL *pfEaten); + + HRESULT OnKeyDown( + [in] ITfContext *pic, + [in] WPARAM wParam, + [in] LPARAM lParam, + [out] BOOL *pfEaten); + + HRESULT OnKeyUp( + [in] ITfContext *pic, + [in] WPARAM wParam, + [in] LPARAM lParam, + [out] BOOL *pfEaten); + + HRESULT OnPreservedKey( + [in] ITfContext *pic, + [in] REFGUID rguid, + [out] BOOL *pfEaten); +}; Modified: trunk/reactos/include/psdk/urlmon.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/urlmon.idl?re… ============================================================================== --- trunk/reactos/include/psdk/urlmon.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/urlmon.idl [iso-8859-1] Wed May 6 12:44:13 2009 @@ -703,7 +703,7 @@ [in] IInternetProtocolSink *pOIProtSink, [in] IInternetBindInfo *pOIBindInfo, [in] DWORD grfPI, - [in] DWORD dwReserved); + [in] HANDLE_PTR dwReserved); HRESULT Continue( [in] PROTOCOLDATA *pProtocolData); @@ -1367,6 +1367,14 @@ FEATURE_ENTRY_COUNT } INTERNETFEATURELIST; +typedef struct _tagPROTOCOLFILTERDATA { + DWORD cbSize; + IInternetProtocolSink *pProtocolSink; + IInternetProtocol *pProtocol; + IUnknown *pUnk; + DWORD dwFilterFlags; +} PROTOCOLFILTERDATA; + /***************************************************************************** * IUri interface */ @@ -1513,6 +1521,7 @@ cpp_quote("DEFINE_GUID(IID_IAsyncMoniker, 0x79EAC9D3, 0xBAF9, 0x11CE, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B);") cpp_quote("DEFINE_GUID(IID_IAsyncBindCtx, 0x79EAC9D4, 0xBAF9, 0x11CE, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B);") cpp_quote("DEFINE_GUID(CLSID_StdURLMoniker, 0x79EAC9E0, 0xBAF9, 0x11CE, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B);") +cpp_quote("DEFINE_GUID(CLSID_DeCompMimeFilter, 0x8f6b0360, 0xb80d, 0x11d0, 0xa9,0xb3, 0x00,0x60,0x97,0x94,0x23,0x11);") cpp_quote("DEFINE_GUID(CLSID_CdlProtocol, 0x3dd53d40, 0x7b8b, 0x11D0, 0xb0,0x13, 0x00,0xaa,0x00,0x59,0xce,0x02);") cpp_quote("DEFINE_GUID(CLSID_FileProtocol, 0x79EAC9E7, 0xBAF9, 0x11CE, 0x8C,0x82, 0x00,0xAA,0x00,0x4B,0xA9,0x0B);")

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
51
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

Ros-diffs May 2009