Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 38863: user32: sync DIALOG_DlgDirSelect to wine 1.1.13: Fixes crash of user32 winetest listbox
by tkreuzer＠svn.reactos.org 18 Jan '09

18 Jan '09

Author: tkreuzer Date: Sat Jan 17 19:17:47 2009 New Revision: 38863 URL: http://svn.reactos.org/svn/reactos?rev=38863&view=rev Log: user32: sync DIALOG_DlgDirSelect to wine 1.1.13: Fixes crash of user32 winetest listbox Modified: trunk/reactos/dll/win32/user32/windows/dialog.c Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Sat Jan 17 19:17:47 2009 @@ -1354,12 +1354,13 @@ BOOL ret; HWND listbox = GetDlgItem( hwnd, id ); - TRACE("%p '%s' %d\n", hwnd, str, id ); + TRACE("%p %s %d\n", hwnd, unicode ? debugstr_w(str) : debugstr_a((LPSTR)str), id ); if (!listbox) return FALSE; item = SendMessageW(listbox, combo ? CB_GETCURSEL : LB_GETCURSEL, 0, 0 ); if (item == LB_ERR) return FALSE; - size = SendMessageW(listbox, combo ? CB_GETLBTEXTLEN : LB_GETTEXTLEN, 0, 0 ); + + size = SendMessageW(listbox, combo ? CB_GETLBTEXTLEN : LB_GETTEXTLEN, item, 0 ); if (size == LB_ERR) return FALSE; if (!(buffer = HeapAlloc( GetProcessHeap(), 0, (size+2) * sizeof(WCHAR) ))) return FALSE; @@ -1396,11 +1397,9 @@ if (len > 0 && !WideCharToMultiByte( CP_ACP, 0, ptr, -1, (LPSTR)str, len, 0, 0 )) ((LPSTR)str)[len-1] = 0; } - else - lstrcpynW( str, ptr, len ); - + else lstrcpynW( str, ptr, len ); HeapFree( GetProcessHeap(), 0, buffer ); - TRACE("Returning %d '%s'\n", ret, str ); + TRACE("Returning %d %s\n", ret, unicode ? debugstr_w(str) : debugstr_a((LPSTR)str) ); return ret; }

1 0

[janderwald] 38862: - Implement IPortEvents interface to IPortWavePci
by janderwald＠svn.reactos.org 18 Jan '09

18 Jan '09

Author: janderwald Date: Sat Jan 17 18:44:54 2009 New Revision: 38862 URL: http://svn.reactos.org/svn/reactos?rev=38862&view=rev Log: - Implement IPortEvents interface to IPortWavePci Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c [iso-8859-1] Sat Jan 17 18:44:54 2009 @@ -39,6 +39,8 @@ const GUID IID_IServiceSink = {0x22C6AC64L, 0x851B, 0x11D0, {0x9A, 0x7F, 0x00, 0xAA, 0x00, 0x38, 0xAC, 0xFE}}; const GUID IID_IPortClsVersion = {0x7D89A7BBL, 0x869B, 0x4567, {0x8D, 0xBE, 0x1E, 0x16, 0x8C, 0xC8, 0x53, 0xDE}}; const GUID IID_IUnknown = {0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x46}}; +const GUID IID_IPortEvents = {0xA80F29C4L, 0x5498, 0x11D2, {0x95, 0xD9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3}}; + /// /// undocumented guids Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] Sat Jan 17 18:44:54 2009 @@ -4,6 +4,7 @@ { IPortWavePciVtbl *lpVtbl; IServiceSinkVtbl *lpVtblServiceSink; + IPortEventsVtbl *lpVtblPortEvents; #if 0 IUnregisterSubdevice *lpVtblUnregisterSubDevice; @@ -19,7 +20,96 @@ }IPortWavePciImpl; - +//--------------------------------------------------------------- +// IPortEvents +// + +static +NTSTATUS +NTAPI +IPortEvents_fnQueryInterface( + IPortEvents* iface, + IN REFIID refiid, + OUT PVOID* Output) +{ + IPortWavePciImpl * This = (IPortWavePciImpl*)CONTAINING_RECORD(iface, IPortWavePciImpl, lpVtblPortEvents); + + DPRINT1("IServiceSink_fnQueryInterface entered\n"); + + if (IsEqualGUIDAligned(refiid, &IID_IPortEvents) || + IsEqualGUIDAligned(refiid, &IID_IUnknown)) + { + *Output = &This->lpVtblServiceSink; + InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } + return STATUS_UNSUCCESSFUL; +} + +static +ULONG +NTAPI +IPortEvents_fnAddRef( + IPortEvents* iface) +{ + IPortWavePciImpl * This = (IPortWavePciImpl*)CONTAINING_RECORD(iface, IPortWavePciImpl, lpVtblPortEvents); + DPRINT1("IServiceSink_fnAddRef entered\n"); + return InterlockedIncrement(&This->ref); +} + +static +ULONG +NTAPI +IPortEvents_fnRelease( + IPortEvents* iface) +{ + IPortWavePciImpl * This = (IPortWavePciImpl*)CONTAINING_RECORD(iface, IPortWavePciImpl, lpVtblPortEvents); + DPRINT1("IServiceSink_fnRelease entered\n"); + InterlockedDecrement(&This->ref); + + if (This->ref == 0) + { + FreeItem(This, TAG_PORTCLASS); + return 0; + } + /* Return new reference count */ + return This->ref; +} + +static +void +NTAPI +IPortEvents_fnAddEventToEventList( + IPortEvents* iface, + IN PKSEVENT_ENTRY EventEntry) +{ + DPRINT1("IPortEvents_fnAddEventToEventList stub\n"); +} + + +static +void +NTAPI +IPortEvents_fnGenerateEventList( + IPortEvents* iface, + IN GUID* Set OPTIONAL, + IN ULONG EventId, + IN BOOL PinEvent, + IN ULONG PinId, + IN BOOL NodeEvent, + IN ULONG NodeId) +{ + DPRINT1("IPortEvents_fnGenerateEventList stub\n"); +} + +static IPortEventsVtbl vt_IPortEvents = +{ + IPortEvents_fnQueryInterface, + IPortEvents_fnAddRef, + IPortEvents_fnRelease, + IPortEvents_fnAddEventToEventList, + IPortEvents_fnGenerateEventList +}; //--------------------------------------------------------------- // IServiceSink @@ -111,6 +201,7 @@ IN REFIID refiid, OUT PVOID* Output) { + WCHAR Buffer[100]; IPortWavePciImpl * This = (IPortWavePciImpl*)iface; DPRINT1("IPortWavePci_fnQueryInterface entered\n"); @@ -128,13 +219,20 @@ InterlockedIncrement(&This->ref); return STATUS_SUCCESS; } + else if (IsEqualGUIDAligned(refiid, &IID_IPortEvents)) + { + *Output = &This->lpVtblPortEvents; + InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } else if (IsEqualGUIDAligned(refiid, &IID_IPortClsVersion)) { return NewPortClsVersion((PPORTCLSVERSION*)Output); } - DPRINT1("IPortWavePci_fnQueryInterface no interface!!!\n"); - + StringFromCLSID(refiid, Buffer); + DPRINT1("IPortWavePci_fnQueryInterface no interface!!! iface %S\n", Buffer); + KeBugCheckEx(0, 0, 0, 0, 0); return STATUS_UNSUCCESSFUL; } @@ -180,11 +278,12 @@ IN PVOID SystemArgument1, IN PVOID SystemArgument2) { - DPRINT1("ServiceNotifyRoutine entered\n"); + DPRINT1("ServiceNotifyRoutine entered %p %p %p\n", DeferredContext, SystemArgument1, SystemArgument2); IPortWavePciImpl * This = (IPortWavePciImpl*)DeferredContext; if (This->ServiceGroup && This->bInitialized) { + DPRINT1("ServiceGroup %p\n", This->ServiceGroup); This->ServiceGroup->lpVtbl->RequestService(This->ServiceGroup); } } @@ -352,9 +451,14 @@ IPortWavePciImpl * This = (IPortWavePciImpl*)iface; - DPRINT1("IPortWavePci_fnNotify entered\n"); - - KeInsertQueueDpc(&This->Dpc, NULL, NULL); + DPRINT1("IPortWavePci_fnNotify entered %p, ServiceGroup %p\n", This, This->ServiceGroup); + + if (This->ServiceGroup) + { + This->ServiceGroup->lpVtbl->RequestService (This->ServiceGroup); + } + + // KeInsertQueueDpc(&This->Dpc, NULL, NULL); } static IPortWavePciVtbl vt_IPortWavePci = @@ -385,6 +489,7 @@ This->lpVtblServiceSink = &vt_IServiceSink; This->lpVtbl = &vt_IPortWavePci; + This->lpVtblPortEvents = &vt_IPortEvents; This->ref = 1; *OutPort = (PPORT)&This->lpVtbl;

1 0

[janderwald] 38861: - Add interface IPortEvents
by janderwald＠svn.reactos.org 18 Jan '09

18 Jan '09

Author: janderwald Date: Sat Jan 17 18:39:15 2009 New Revision: 38861 URL: http://svn.reactos.org/svn/reactos?rev=38861&view=rev Log: - Add interface IPortEvents Modified: trunk/reactos/include/ddk/portcls.h Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Sat Jan 17 18:39:15 2009 @@ -1606,10 +1606,24 @@ IPortEvents Interface */ +#undef INTERFACE +#define INTERFACE IPortEvents + +DEFINE_GUID(IID_IPortEvents, 0xA80F29C4L, 0x5498, 0x11D2, 0x95, 0xD9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3); DECLARE_INTERFACE_(IPortEvents, IUnknown) { DEFINE_ABSTRACT_UNKNOWN() - /* TODO */ + + STDMETHOD_(void,AddEventToEventList)(THIS_ + IN PKSEVENT_ENTRY EventEntry)PURE; + + STDMETHOD_(void,GenerateEventList)(THIS_ + IN GUID* Set OPTIONAL, + IN ULONG EventId, + IN BOOL PinEvent, + IN ULONG PinId, + IN BOOL NodeEvent, + IN ULONG NodeId)PURE; }; typedef IPortEvents *PPORTEVENTS;

1 0

[dgorbachev] 38860: Czech (QWERTZ) keyboard layout by Radek Liska. Bug #4031.
by dgorbachev＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: dgorbachev Date: Sat Jan 17 17:18:32 2009 New Revision: 38860 URL: http://svn.reactos.org/svn/reactos?rev=38860&view=rev Log: Czech (QWERTZ) keyboard layout by Radek Liska. Bug #4031. Added: trunk/reactos/dll/keyboard/kbdcz/ (with props) trunk/reactos/dll/keyboard/kbdcz/kbdcz.c (with props) trunk/reactos/dll/keyboard/kbdcz/kbdcz.rbuild (with props) trunk/reactos/dll/keyboard/kbdcz/kbdcz.rc (with props) trunk/reactos/dll/keyboard/kbdcz/kbdcz.spec (with props) Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.rc trunk/reactos/dll/keyboard/keyboard.rbuild Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Sat Jan 17 17:18:32 2009 @@ -10,6 +10,7 @@ MUI_LAYOUTS csCZLayouts[] = { { L"0405", L"00000405" }, + { L"0405", L"00010405" }, { L"0409", L"00000409" }, { NULL, NULL } }; Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Sat Jan 17 17:18:32 2009 @@ -336,9 +336,13 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000414","Layout Text",0x00000000,"Norwegian" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000414","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5018" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000405","Layout File",0x00000000,"kbdcz1.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000405","Layout Text",0x00000000,"Czech (QWERTY)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000405","Layout File",0x00000000,"kbdcz.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000405","Layout Text",0x00000000,"Czech" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000405","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5031" + +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010405","Layout File",0x00000000,"kbdcz1.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010405","Layout Text",0x00000000,"Czech (QWERTY)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010405","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5032" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00011009","Layout File",0x00000000,"kbdcan.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00011009","Layout Id", 0x00000000,"0020" Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Sat Jan 17 17:18:32 2009 @@ -336,9 +336,13 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000414","Layout Text",0x00000000,"Norwegian" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000414","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5018" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000405","Layout File",0x00000000,"kbdcz1.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000405","Layout Text",0x00000000,"Czech (QWERTY)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000405","Layout File",0x00000000,"kbdcz.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000405","Layout Text",0x00000000,"Czech" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000405","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5031" + +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010405","Layout File",0x00000000,"kbdcz1.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010405","Layout Text",0x00000000,"Czech (QWERTY)" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010405","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5032" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00011009","Layout File",0x00000000,"kbdcan.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00011009","Layout Id", 0x00000000,"0020" 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] Sat Jan 17 17:18:32 2009 @@ -161,6 +161,7 @@ dll\keyboard\kbdbur\kbdbur.dll 1 dll\keyboard\kbdcan\kbdcan.dll 1 dll\keyboard\kbdcr\kbdcr.dll 1 +dll\keyboard\kbdcz\kbdcz.dll 1 dll\keyboard\kbdcz1\kbdcz1.dll 1 dll\keyboard\kbdda\kbdda.dll 1 dll\keyboard\kbddv\kbddv.dll 1 Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Sat Jan 17 17:18:32 2009 @@ -262,7 +262,8 @@ 00000C0C = "Canadian French (Legacy)" 00011009 = "Canadian Multilingual Standard" 0000041A = "Croatian" -00000405 = "Czech (QWERTY)" +00000405 = "Czech" +00010405 = "Czech (QWERTY)" 00000406 = "Danish (Denmark)" 00000439 = "Devanagari - INSCRIPT" 00000413 = "Dutch" @@ -335,7 +336,8 @@ 0000080C = kbdbe.dll 00000813 = kbdbe.dll 00000455 = kbdbur.dll -00000405 = kbdcz1.dll +00000405 = kbdcz.dll +00010405 = kbdcz1.dll 00000406 = kbdda.dll 00000409 = kbdus.dll 00010409 = kbddv.dll Propchange: trunk/reactos/dll/keyboard/kbdcz/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Jan 17 17:18:32 2009 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Added: trunk/reactos/dll/keyboard/kbdcz/kbdcz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcz/kbdcz.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdcz/kbdcz.c (added) +++ trunk/reactos/dll/keyboard/kbdcz/kbdcz.c [iso-8859-1] Sat Jan 17 17:18:32 2009 @@ -1,0 +1,422 @@ +/* + * ReactOS Czech ASCII Keyboard layout + * Copyright (C) 2008 ReactOS + * License: LGPL, see: LGPL.txt + * + * Based on kbdcz1.dll + * modified by Radek Liska (radekliska att gmail ddot com) + */ + +#include <windows.h> +#include <internal/kbd.h> + +#ifdef _M_IA64 +#define ROSDATA static __declspec(allocate(".data")) +#else +#ifdef _MSC_VER +#pragma data_seg(".data") +#define ROSDATA static +#else +#define ROSDATA static __attribute__((section(".data"))) +#endif +#endif + +#define VK_EMPTY 0xff /* The non-existent VK */ +#define KSHIFT 0x001 /* Shift modifier */ +#define KCTRL 0x002 /* Ctrl modifier */ +#define KALT 0x004 /* Alt modifier */ +#define KEXT 0x100 /* Extended key code */ +#define KMULTI 0x200 /* Multi-key */ +#define KSPEC 0x400 /* Special key */ +#define KNUMP 0x800 /* Number-pad */ +#define KNUMS 0xc00 /* Special + number pad */ +#define KMEXT 0x300 /* Multi + ext */ + +#define SHFT_INVALID 0x0F + +ROSDATA USHORT scancode_to_vk[] = { + /* Numbers Row */ + /* - 00 - */ + /* 1 ... 2 ... 3 ... 4 ... */ + VK_EMPTY, VK_ESCAPE, '1', '2', + '3', '4', '5', '6', + '7', '8', '9', '0', + VK_OEM_MINUS, VK_OEM_PLUS, VK_BACK, + /* - 0f - */ + /* First Letters Row */ + VK_TAB, 'Q', 'W', 'E', + 'R', 'T', 'Z', 'U', + 'I', 'O', 'P', + VK_OEM_4, VK_OEM_6, VK_RETURN, + /* - 1d - */ + /* Second Letters Row */ + VK_LCONTROL, + 'A', 'S', 'D', 'F', + 'G', 'H', 'J', 'K', + 'L', VK_OEM_1, VK_OEM_7, VK_OEM_3, + VK_LSHIFT, VK_OEM_5, + /* - 2c - */ + /* Third letters row */ + 'Y', 'X', 'C', 'V', + 'B', 'N', 'M', VK_OEM_COMMA, + VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT, + /* - 37 - */ + /* Bottom Row */ + VK_MULTIPLY, VK_LMENU, VK_SPACE, VK_CAPITAL, + + /* - 3b - */ + /* F-Keys */ + VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6, + VK_F7, VK_F8, VK_F9, VK_F10, + /* - 45 - */ + /* Locks */ + VK_NUMLOCK | KMEXT, + VK_SCROLL | KMULTI, + /* - 47 - */ + /* Number-Pad */ + VK_HOME | KNUMS, VK_UP | KNUMS, VK_PRIOR | KNUMS, VK_SUBTRACT, + VK_LEFT | KNUMS, VK_CLEAR | KNUMS, VK_RIGHT | KNUMS, VK_ADD, + VK_END | KNUMS, VK_DOWN | KNUMS, VK_NEXT | KNUMS, + VK_INSERT | KNUMS, VK_DELETE | KNUMS, + /* - 54 - */ + /* Presumably PrtSc */ + VK_SNAPSHOT, + /* - 55 - */ + /* Oddities, and the remaining standard F-Keys */ + VK_EMPTY, VK_OEM_102, VK_F11, VK_F12, + /* - 59 - */ + VK_CLEAR, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* EREOF */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* ZOOM */ + VK_HELP, + /* - 64 - */ + /* Even more F-Keys (for example, NCR keyboards from the early 90's) */ + VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20, + VK_F21, VK_F22, VK_F23, + /* - 6f - */ + /* Not sure who uses these codes */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, + /* - 72 - */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + /* - 76 - */ + /* One more f-key */ + VK_F24, + /* - 77 - */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */ + VK_EMPTY, + /* - 80 - */ + 0 +}; + +ROSDATA VSC_VK extcode0_to_vk[] = { + { 0, 0 }, +}; + +ROSDATA VSC_VK extcode1_to_vk[] = { + { 0, 0 }, +}; + +ROSDATA VK_TO_BIT modifier_keys[] = { + { VK_SHIFT, KSHIFT }, + { VK_CONTROL, KCTRL }, + { VK_MENU, KALT }, + { 0, 0 } +}; + +ROSDATA MODIFIERS modifier_bits = { + modifier_keys, + 7, + { 0, 1, 2, 0, 0, 0, 3, 0 } + /* Modifier bit order: NONE, SHIFT, CTRL, SHIFT-CTRL, ALT (not used), SHIFT-ALT (not used), CTRL-ALT, SHIFT-CTRL-ALT */ +}; + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + /* Keys that do not have shift states */ + { VK_TAB, NOCAPS, {'\t','\t'} }, + { VK_ADD, NOCAPS, {'+', '+'} }, + { VK_SUBTRACT, NOCAPS, {'-', '-'} }, + { VK_MULTIPLY, NOCAPS, {'*', '*'} }, + { VK_DIVIDE, NOCAPS, {'/', '/'} }, + { VK_ESCAPE, NOCAPS, {'\x1b','\x1b'} }, + { VK_SPACE, NOCAPS, {' ', ' '} }, + { 0, 0 } +}; + + +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + /* normal - shift - ctrl */ + /* The alphabet */ + { 'A', CAPS, {'a', 'A', 0x01} }, + { 'C', CAPS, {'c', 'C', 0x03} }, + { 'D', CAPS, {'d', 'D', 0x04} }, + { 'F', CAPS, {'f', 'F', 0x06} }, + { 'G', CAPS, {'g', 'G', 0x07} }, + { 'H', CAPS, {'h', 'H', 0x08} }, + { 'I', CAPS, {'i', 'I', 0x09} }, + { 'J', CAPS, {'j', 'J', 0x0a} }, + { 'K', CAPS, {'k', 'K', 0x0b} }, + { 'L', CAPS, {'l', 'L', 0x0c} }, + { 'M', CAPS, {'m', 'M', 0x0d} }, + { 'O', CAPS, {'o', 'O', 0x0f} }, + { 'P', CAPS, {'p', 'P', 0x10} }, + { 'Q', CAPS, {'q', 'Q', 0x11} }, + { 'R', CAPS, {'r', 'R', 0x12} }, + { 'S', CAPS, {'s', 'S', 0x13} }, + { 'T', CAPS, {'t', 'T', 0x14} }, + { 'U', CAPS, {'u', 'U', 0x15} }, + { 'V', CAPS, {'v', 'V', 0x16} }, + { 'W', CAPS, {'w', 'W', 0x17} }, + { 'X', CAPS, {'x', 'X', 0x18} }, + { 'Y', CAPS, {'y', 'Y', 0x19} }, + { 'Z', CAPS, {'z', 'Z', 0x1a} }, + + /* Legacy (telnet-style) ascii escapes */ + { VK_RETURN, NOCAPS, {'\r', '\r', '\n'} }, + { 0,0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { +/* Normal, shifted, control, Alt+Gr */ + { '1', NOCAPS, {'+', '1', WCH_NONE, '!' } }, + { '2', NOCAPS, {0x011b, '2', 0, '@' } }, // e with caron + { '3', NOCAPS, {0x0161, '3', WCH_NONE, '#' } }, // s with caron + { '4', NOCAPS, {0x010d, '4', WCH_NONE, '$' } }, // c with caron + { '5', NOCAPS, {0x0159, '5', WCH_NONE, '%' } }, // r with caron + { '6', NOCAPS, {0x017e, '6', 0x1e, '^' } }, // z with caron + { '7', NOCAPS, {0x00fd, '7', WCH_NONE, '&' } }, // y with acute + { '8', NOCAPS, {0x00e1, '8', WCH_NONE, '*' } }, // a with acute + { '9', NOCAPS, {0x00ed, '9', WCH_NONE, '(' } }, // i with acute + { '0', NOCAPS, {0x00e9, '0', WCH_NONE, ')' } }, // e with acute + { VK_OEM_PLUS, NOCAPS, {WCH_DEAD, WCH_DEAD, WCH_NONE, '=' } }, // dead letters - acute, caron + { VK_EMPTY, 0, {0x00b4, 0x02c7, WCH_NONE, WCH_NONE } }, // VK_OEM_PLUS death + { VK_OEM_MINUS, NOCAPS, {'=', '%', 0x1f, '-' } }, + { VK_OEM_1, NOCAPS, {0x016f, '\"', WCH_NONE, ';' } }, // u with ring + { VK_OEM_7, NOCAPS, {0x00a7, '!', WCH_NONE, 0x00a4 } }, // section sign + { VK_OEM_4, NOCAPS, {0x00fa, '/', WCH_NONE, '[' } }, // u with acute + { VK_OEM_5, NOCAPS, {WCH_DEAD, 0x2018, WCH_NONE, '\\' } }, // diaeresis, left single quotation mark + { VK_EMPTY, 0, {0x00a8, WCH_NONE, WCH_NONE, WCH_NONE } }, // VK_OEM_5 death + { VK_OEM_6, NOCAPS, {')', '(', WCH_NONE, ']' } }, + { VK_OEM_3, NOCAPS, {';', WCH_DEAD, WCH_NONE, '`' } }, // ring + { VK_EMPTY, 0, {WCH_NONE, 0x00b0, WCH_NONE, WCH_NONE } }, // VK_OEM_3 death + { VK_OEM_COMMA, NOCAPS, {',', '?', WCH_NONE, '<' } }, + { VK_OEM_PERIOD, NOCAPS, {'.', ':', WCH_NONE, '>' } }, + { 'E', CAPS, {'e', 'E', 0x05, 0x20AC } }, // symbol for euro (currency) + { 'B', CAPS, {'b', 'B', 0x02, '{' } }, // left bracker + { 'N', CAPS, {'n', 'N', 0x0e, '}' } }, // right bracket + { VK_OEM_2, NOCAPS, {'-', '_', WCH_NONE, '*' } }, + { 0, 0 } +}; + + +ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { + { VK_NUMPAD0, 0, {'0'} }, + { VK_NUMPAD1, 0, {'1'} }, + { VK_NUMPAD2, 0, {'2'} }, + { VK_NUMPAD3, 0, {'3'} }, + { VK_NUMPAD4, 0, {'4'} }, + { VK_NUMPAD5, 0, {'5'} }, + { VK_NUMPAD6, 0, {'6'} }, + { VK_NUMPAD7, 0, {'7'} }, + { VK_NUMPAD8, 0, {'8'} }, + { VK_NUMPAD9, 0, {'9'} }, + { VK_DECIMAL, 0, {','} }, + { VK_BACK, 0, {'\010'} }, + { 0, 0 } +}; + +#define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } + +ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { + vk_master(1,keypad_numbers), + vk_master(2,key_to_chars_2mod), + vk_master(3,key_to_chars_3mod), + vk_master(4,key_to_chars_4mod), + { 0,0,0 } +}; + +ROSDATA VSC_LPWSTR key_names[] = { + { 0x00, L"" }, + { 0x01, L"Esc" }, + { 0x0e, L"Backspace" }, + { 0x0f, L"Tab" }, + { 0x1c, L"Enter" }, + { 0x1d, L"Ctrl" }, + { 0x2a, L"Shift" }, + { 0x36, L"Right Shift" }, + { 0x37, L"Num *" }, + { 0x38, L"Alt" }, + { 0x39, L"Space" }, + { 0x3a, L"Caps Lock" }, + { 0x3b, L"F1" }, + { 0x3c, L"F2" }, + { 0x3d, L"F3" }, + { 0x3e, L"F4" }, + { 0x3f, L"F5" }, + { 0x40, L"F6" }, + { 0x41, L"F7" }, + { 0x42, L"F8" }, + { 0x43, L"F9" }, + { 0x44, L"F10" }, + { 0x45, L"Pause" }, + { 0x46, L"Scroll Lock" }, + { 0x47, L"Num 7" }, + { 0x48, L"Num 8" }, + { 0x49, L"Num 9" }, + { 0x4a, L"Num -" }, + { 0x4b, L"Num 4" }, + { 0x4c, L"Num 5" }, + { 0x4d, L"Num 6" }, + { 0x4e, L"Num +" }, + { 0x4f, L"Num 1" }, + { 0x50, L"Num 2" }, + { 0x51, L"Num 3" }, + { 0x52, L"Num 0" }, + { 0x53, L"Num Del" }, + { 0x54, L"Sys Req" }, + { 0x57, L"F11" }, + { 0x58, L"F12" }, + { 0x7c, L"F13" }, + { 0x7d, L"F14" }, + { 0x7e, L"F15" }, + { 0x7f, L"F16" }, + { 0x80, L"F17" }, + { 0x81, L"F18" }, + { 0x82, L"F19" }, + { 0x83, L"F20" }, + { 0x84, L"F21" }, + { 0x85, L"F22" }, + { 0x86, L"F23" }, + { 0x87, L"F24" }, + { 0, NULL }, +}; + +ROSDATA VSC_LPWSTR extended_key_names[] = { + { 0x1c, L"Num Enter" }, + { 0x1d, L"Right Ctrl" }, + { 0x35, L"Num /" }, + { 0x37, L"Prnt Scrn" }, + { 0x38, L"Right Alt" }, + { 0x45, L"Num Lock" }, + { 0x46, L"Break" }, + { 0x47, L"Home" }, + { 0x48, L"Up" }, + { 0x49, L"Page Up" }, + { 0x4a, L"Left" }, + { 0x4c, L"Center" }, + { 0x4d, L"Right" }, + { 0x4f, L"End" }, + { 0x50, L"Down" }, + { 0x51, L"Page Down" }, + { 0x52, L"Insert" }, + { 0x53, L"Delete" }, + { 0x54, L"<ReactOS>" }, + { 0x55, L"Help" }, + { 0x56, L"Left Windows" }, + { 0x5b, L"Right Windows" }, + { 0, NULL }, +}; + +#define DEADTRANS(ch, accent, comp, flags) MAKELONG(ch, accent), comp, flags + +ROSDATA DEADKEY dead_key[] = { + { DEADTRANS(0x0043, 0x02c7, 0x010c, 0x0000) }, // C with caron + { DEADTRANS(0x0063, 0x02c7, 0x010d, 0x0000) }, // c with caron + { DEADTRANS(0x0045, 0x02c7, 0x011a, 0x0000) }, // E with caron + { DEADTRANS(0x0065, 0x02c7, 0x011b, 0x0000) }, // e with caron + { DEADTRANS(0x0044, 0x02c7, 0x010e, 0x0000) }, // D with caron + { DEADTRANS(0x0064, 0x02c7, 0x010f, 0x0000) }, // d with caron + { DEADTRANS(0x004c, 0x02c7, 0x013d, 0x0000) }, // L with caron + { DEADTRANS(0x006c, 0x02c7, 0x013e, 0x0000) }, // l with caron + { DEADTRANS(0x004e, 0x02c7, 0x0147, 0x0000) }, // N with caron + { DEADTRANS(0x006e, 0x02c7, 0x0148, 0x0000) }, // n with caron + { DEADTRANS(0x0053, 0x02c7, 0x0160, 0x0000) }, // S with caron + { DEADTRANS(0x0073, 0x02c7, 0x0161, 0x0000) }, // s with caron + { DEADTRANS(0x0052, 0x02c7, 0x0158, 0x0000) }, // R with acute + { DEADTRANS(0x0072, 0x02c7, 0x0159, 0x0000) }, // r with acute + { DEADTRANS(0x0054, 0x02c7, 0x0164, 0x0000) }, // T with caron + { DEADTRANS(0x0074, 0x02c7, 0x0165, 0x0000) }, // t with caron + { DEADTRANS(0x005a, 0x02c7, 0x017d, 0x0000) }, // Z with caron + { DEADTRANS(0x007a, 0x02c7, 0x017e, 0x0000) }, // z with caron + { DEADTRANS(0x0020, 0x02c7, 0x02c7, 0x0000) }, // space > caron + + { DEADTRANS(0x0041, 0x00b4, 0x00c1, 0x0000) }, // A with acute + { DEADTRANS(0x0061, 0x00b4, 0x00e1, 0x0000) }, // a with acute + { DEADTRANS(0x0045, 0x00b4, 0x00c9, 0x0000) }, // E with acute + { DEADTRANS(0x0065, 0x00b4, 0x00e9, 0x0000) }, // e with acute + { DEADTRANS(0x0049, 0x00b4, 0x00cd, 0x0000) }, // I with acute + { DEADTRANS(0x0069, 0x00b4, 0x00ed, 0x0000) }, // i with acute + { DEADTRANS(0x004c, 0x00b4, 0x0139, 0x0000) }, // L with acute + { DEADTRANS(0x006c, 0x00b4, 0x013a, 0x0000) }, // l with acute + { DEADTRANS(0x004f, 0x00b4, 0x00d3, 0x0000) }, // O with acute + { DEADTRANS(0x006f, 0x00b4, 0x00f3, 0x0000) }, // o with acute + { DEADTRANS(0x0052, 0x00b4, 0x0154, 0x0000) }, // R with acute + { DEADTRANS(0x0072, 0x00b4, 0x0155, 0x0000) }, // r with acute + { DEADTRANS(0x0055, 0x00b4, 0x00da, 0x0000) }, // U with acute + { DEADTRANS(0x0075, 0x00b4, 0x00fa, 0x0000) }, // u with acute + { DEADTRANS(0x0059, 0x00b4, 0x00dd, 0x0000) }, // Y with acute + { DEADTRANS(0x0079, 0x00b4, 0x00fd, 0x0000) }, // y with acute + { DEADTRANS(0x005a, 0x00b4, 0x0179, 0x0000) }, // Z with acute + { DEADTRANS(0x007a, 0x00b4, 0x017a, 0x0000) }, // z with acute + { DEADTRANS(0x0020, 0x00b4, 0x00b4, 0x0000) }, // space > acute + + { DEADTRANS(0x0041, 0x00a8, 0x00c4, 0x0000) }, // A with diaeresis + { DEADTRANS(0x0061, 0x00a8, 0x00e4, 0x0000) }, // a with diaeresis + { DEADTRANS(0x0045, 0x00a8, 0x00cb, 0x0000) }, // E with diaeresis + { DEADTRANS(0x0065, 0x00a8, 0x00eb, 0x0000) }, // e with diaeresis + { DEADTRANS(0x004f, 0x00a8, 0x00d6, 0x0000) }, // O with diaeresis + { DEADTRANS(0x006f, 0x00a8, 0x00f6, 0x0000) }, // o with diaeresis + { DEADTRANS(0x0055, 0x00a8, 0x00dc, 0x0000) }, // U with diaeresis + { DEADTRANS(0x0075, 0x00a8, 0x00fc, 0x0000) }, // u with diaeresis + { DEADTRANS(0x0020, 0x00a8, 0x00a8, 0x0000) }, // space > diaeresis + + { DEADTRANS(0x0055, 0x00b0, 0x016e, 0x0000) }, // U with round + { DEADTRANS(0x0075, 0x00b0, 0x016f, 0x0000) }, // u with round + { DEADTRANS(0x0020, 0x00b0, 0x00b0, 0x0000) }, // space > round + { 0, 0, 0 }, +}; + +ROSDATA DEADKEY_LPWSTR dead_key_names[] = { + L"\x00a1" L"hacek", // caron + L"\x00b4" L"carka", // acute + L"\x005e" L"krouzek", // round + NULL +}; + +/* Finally, the master table */ +ROSDATA KBDTABLES keyboard_layout_table = { + /* modifier assignments */ + &modifier_bits, + + /* character from vk tables */ + vk_to_wchar_master_table, + + /* diacritical marks -- */ + dead_key, + + /* Key names */ + (VSC_LPWSTR *)key_names, + (VSC_LPWSTR *)extended_key_names, + dead_key_names, /* Dead key names */ + + /* scan code to virtual key maps */ + scancode_to_vk, + sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]), + extcode0_to_vk, + extcode1_to_vk, + + + MAKELONG(1,1), /* Version 1.0 */ + + /* Ligatures -- Czech keyboard doesn't have any */ + 0, + 0, + NULL +}; + +PKBDTABLES WINAPI KbdLayerDescriptor(VOID) { + return &keyboard_layout_table; +} + Propchange: trunk/reactos/dll/keyboard/kbdcz/kbdcz.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdcz/kbdcz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcz/kbdcz.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdcz/kbdcz.rbuild (added) +++ trunk/reactos/dll/keyboard/kbdcz/kbdcz.rbuild [iso-8859-1] Sat Jan 17 17:18:32 2009 @@ -1,0 +1,9 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="kbdcz" type="keyboardlayout" entrypoint="0" installbase="system32" installname="kbdcz.dll" allowwarnings="true"> + <importlibrary definition="kbdcz.spec" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <file>kbdcz.c</file> + <file>kbdcz.rc</file> +</module> Propchange: trunk/reactos/dll/keyboard/kbdcz/kbdcz.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdcz/kbdcz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcz/kbdcz.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdcz/kbdcz.rc (added) +++ trunk/reactos/dll/keyboard/kbdcz/kbdcz.rc [iso-8859-1] Sat Jan 17 17:18:32 2009 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Czech Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdcz\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdcz.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/keyboard/kbdcz/kbdcz.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdcz/kbdcz.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcz/kbdcz.s… ============================================================================== --- trunk/reactos/dll/keyboard/kbdcz/kbdcz.spec (added) +++ trunk/reactos/dll/keyboard/kbdcz/kbdcz.spec [iso-8859-1] Sat Jan 17 17:18:32 2009 @@ -1,0 +1,1 @@ +@ stdcall KbdLayerDescriptor() Propchange: trunk/reactos/dll/keyboard/kbdcz/kbdcz.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdcz1/kbdcz1… ============================================================================== --- trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.rc [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdcz1/kbdcz1.rc [iso-8859-1] Sat Jan 17 17:18:32 2009 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Czech Keyboard Layout\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Czech Keyboard Layout (QWERTY)\0" #define REACTOS_STR_INTERNAL_NAME "kbdcz1\0" #define REACTOS_STR_ORIGINAL_FILENAME "kbdcz1.dll\0" #include <reactos/version.rc> Modified: trunk/reactos/dll/keyboard/keyboard.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/keyboard.rbui… ============================================================================== --- trunk/reactos/dll/keyboard/keyboard.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/keyboard.rbuild [iso-8859-1] Sat Jan 17 17:18:32 2009 @@ -52,6 +52,9 @@ <directory name="kbdcr"> <xi:include href="kbdcr/kbdcr.rbuild" /> </directory> + <directory name="kbdcz"> + <xi:include href="kbdcz/kbdcz.rbuild" /> + </directory> <directory name="kbdcz1"> <xi:include href="kbdcz1/kbdcz1.rbuild" /> </directory>

1 0

[janderwald] 38859: - Store DeviceObject before calling IMiniportTopology's init function
by janderwald＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: janderwald Date: Sat Jan 17 17:11:11 2009 New Revision: 38859 URL: http://svn.reactos.org/svn/reactos?rev=38859&view=rev Log: - Store DeviceObject before calling IMiniportTopology's init function Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] Sat Jan 17 17:11:11 2009 @@ -10,7 +10,6 @@ PMINIPORTTOPOLOGY pMiniport; PDEVICE_OBJECT pDeviceObject; - PRESOURCELIST pResourceList; PPINCOUNT pPinCount; PPOWERNOTIFY pPowerNotify; @@ -148,7 +147,8 @@ NTSTATUS Status; IPortTopologyImpl * This = (IPortTopologyImpl*)iface; - DPRINT1("IPortTopology_fnInit entered\n"); + DPRINT1("IPortTopology_fnInit entered This %p DeviceObject %p Irp %p UnknownMiniport %p UnknownAdapter %p ResourceList %p\n", + This, DeviceObject, Irp, UnknownMiniport, UnknownAdapter, ResourceList); if (This->bInitialized) { @@ -161,24 +161,20 @@ { DPRINT1("IPortTopology_Init called with invalid IMiniport adapter\n"); return STATUS_INVALID_PARAMETER; - } - - /* increment reference on resource list */ - //HACK - //ResourceList->lpVtbl->AddRef(ResourceList); - - Status = Miniport->lpVtbl->Init(Miniport, UnknownAdapter, ResourceList, iface); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IPortTopology_Init failed with %x\n", Status); - return Status; } /* Initialize port object */ This->pMiniport = Miniport; This->pDeviceObject = DeviceObject; This->bInitialized = TRUE; - This->pResourceList = ResourceList; + + Status = Miniport->lpVtbl->Init(Miniport, UnknownAdapter, ResourceList, iface); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IPortTopology_Init failed with %x\n", Status); + This->bInitialized = FALSE; + return Status; + } /* increment reference on miniport adapter */ Miniport->lpVtbl->AddRef(Miniport);

1 0

[janderwald] 38858: - Handle IRP_MN_QUERY_INTERFACE
by janderwald＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: janderwald Date: Sat Jan 17 16:36:58 2009 New Revision: 38858 URL: http://svn.reactos.org/svn/reactos?rev=38858&view=rev Log: - Handle IRP_MN_QUERY_INTERFACE Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] Sat Jan 17 16:36:58 2009 @@ -141,7 +141,16 @@ /* Do not complete? */ Irp->IoStatus.Status = STATUS_SUCCESS; } - + else if ( irp_stack->MinorFunction == IRP_MN_QUERY_INTERFACE ) + { + //FIXME + // call next lower device object + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + return Irp->IoStatus.Status; + } + + + DPRINT1("unhandled function %u\n", irp_stack->MinorFunction); return STATUS_SUCCESS; }

1 0

[janderwald] 38857: - Store DeviceObject before calling IMiniportWaveCyclic as the driver might immediately call port functions - Pass the PhysicalDeviceObject to IoGetDmaAdapter
by janderwald＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: janderwald Date: Sat Jan 17 16:22:09 2009 New Revision: 38857 URL: http://svn.reactos.org/svn/reactos?rev=38857&view=rev Log: - Store DeviceObject before calling IMiniportWaveCyclic as the driver might immediately call port functions - Pass the PhysicalDeviceObject to IoGetDmaAdapter Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c [iso-8859-1] Sat Jan 17 16:22:09 2009 @@ -484,8 +484,12 @@ ULONG MapRegisters; INTERFACE_TYPE BusType; ULONG ResultLength; + PCExtension* DeviceExt; IDmaChannelSlaveImpl * This; + + DPRINT1("OutDmaChannel %p OuterUnknown %p PoolType %p DeviceDescription %p DeviceObject %p\n", + OutDmaChannel, OuterUnknown, PoolType, DeviceDescription, DeviceObject); This = AllocateItem(PoolType, sizeof(IDmaChannelSlaveImpl), TAG_PORTCLASS); if (!This) @@ -493,6 +497,7 @@ return STATUS_INSUFFICIENT_RESOURCES; } + DeviceExt = (PCExtension*) DeviceObject->DeviceExtension; Status = IoGetDeviceProperty(DeviceObject, DevicePropertyLegacyBusType, sizeof(BusType), (PVOID)&BusType, &ResultLength); if (NT_SUCCESS(Status)) @@ -500,7 +505,9 @@ DeviceDescription->InterfaceType = BusType; } - Adapter = IoGetDmaAdapter(DeviceObject, DeviceDescription, &MapRegisters); + DPRINT1("Calling IoGetDmaAdapter\n"); + + Adapter = IoGetDmaAdapter(DeviceExt->PhysicalDeviceObject, DeviceDescription, &MapRegisters); if (!Adapter) { FreeItem(This, TAG_PORTCLASS); @@ -516,7 +523,7 @@ This->MaxMapRegisters = MapRegisters; *OutDmaChannel = (PVOID)(&This->lpVtbl); - + DPRINT1("PcNewDmaChannel result %p\n", *OutDmaChannel); return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c [iso-8859-1] Sat Jan 17 16:22:09 2009 @@ -139,6 +139,8 @@ PPOWERNOTIFY PowerNotify; IPortWaveCyclicImpl * This = (IPortWaveCyclicImpl*)iface; + DPRINT1("IPortWaveCyclic_Init entered\n"); + if (This->bInitialized) { DPRINT("IPortWaveCyclic_Init called again\n"); @@ -151,43 +153,6 @@ DPRINT("IPortWaveCyclic_Init called with invalid IMiniport adapter\n"); return STATUS_INVALID_PARAMETER; } - - Status = Miniport->lpVtbl->Init(Miniport, UnknownAdapter, ResourceList, iface); - if (!NT_SUCCESS(Status)) - { - DPRINT("IMiniportWaveCyclic_Init failed with %x\n", Status); - Miniport->lpVtbl->Release(Miniport); - return Status; - } - - /* check if it supports IPinCount interface */ - Status = UnknownMiniport->lpVtbl->QueryInterface(UnknownMiniport, &IID_IPinCount, (PVOID*)&PinCount); - if (NT_SUCCESS(Status)) - { - This->pPinCount = PinCount; - This->pDescriptor = NULL; - } - else - { - Status = Miniport->lpVtbl->GetDescription(Miniport, &This->pDescriptor); - if (!NT_SUCCESS(Status)) - { - Miniport->lpVtbl->Release(Miniport); - return Status; - } - This->pPinCount = NULL; - } - - Status = UnknownMiniport->lpVtbl->QueryInterface(UnknownMiniport, &IID_IPowerNotify, (PVOID*)&PowerNotify); - if (NT_SUCCESS(Status)) - { - This->pPowerNotify = PowerNotify; - } - else - { - This->pPowerNotify = NULL; - } - /* Initialize port object */ This->pMiniport = Miniport; @@ -197,9 +162,50 @@ /* increment reference on miniport adapter */ Miniport->lpVtbl->AddRef(Miniport); + + Status = Miniport->lpVtbl->Init(Miniport, UnknownAdapter, ResourceList, iface); + if (!NT_SUCCESS(Status)) + { + DPRINT("IMiniportWaveCyclic_Init failed with %x\n", Status); + Miniport->lpVtbl->Release(Miniport); + This->bInitialized = FALSE; + return Status; + } + + /* check if it supports IPinCount interface */ + Status = UnknownMiniport->lpVtbl->QueryInterface(UnknownMiniport, &IID_IPinCount, (PVOID*)&PinCount); + if (NT_SUCCESS(Status)) + { + This->pPinCount = PinCount; + This->pDescriptor = NULL; + } + else + { + Status = Miniport->lpVtbl->GetDescription(Miniport, &This->pDescriptor); + if (!NT_SUCCESS(Status)) + { + DPRINT1("failed to get description\n"); + Miniport->lpVtbl->Release(Miniport); + return Status; + } + This->pPinCount = NULL; + } + + Status = UnknownMiniport->lpVtbl->QueryInterface(UnknownMiniport, &IID_IPowerNotify, (PVOID*)&PowerNotify); + if (NT_SUCCESS(Status)) + { + This->pPowerNotify = PowerNotify; + } + else + { + This->pPowerNotify = NULL; + } + /* increment reference on resource list */ ResourceList->lpVtbl->AddRef(ResourceList); + + DPRINT1("IPortWaveCyclic successfully initialized\n"); return STATUS_SUCCESS; } @@ -314,7 +320,7 @@ ServiceGroup->lpVtbl->RequestService (ServiceGroup); } -static const IPortWaveCyclicVtbl vt_IPortWaveCyclicVtbl = +static IPortWaveCyclicVtbl vt_IPortWaveCyclicVtbl = { IPortWaveCyclic_fnQueryInterface, IPortWaveCyclic_fnAddRef, @@ -506,8 +512,8 @@ if (!This) return STATUS_INSUFFICIENT_RESOURCES; - This->lpVtbl = (IPortWaveCyclicVtbl*)&vt_IPortWaveCyclicVtbl; - This->lpVtblSubDevice = (ISubdeviceVtbl*)&vt_ISubdeviceVtbl; + This->lpVtbl = &vt_IPortWaveCyclicVtbl; + This->lpVtblSubDevice = &vt_ISubdeviceVtbl; This->ref = 1; *OutPort = (PPORT)(&This->lpVtbl);

1 0

[tkreuzer] 38856: user32: sync icontitle.c with Wine 1.1.13 Alexandre Julliard <julliard@winehq.org> user32: Store the builtin class names in Unicode. Rob Shearman <rob@codeweavers.com> user32: Fix incorrect character count passed to GetWindowTextW in ICONTITLE_Paint.
by tkreuzer＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: tkreuzer Date: Sat Jan 17 15:45:00 2009 New Revision: 38856 URL: http://svn.reactos.org/svn/reactos?rev=38856&view=rev Log: user32: sync icontitle.c with Wine 1.1.13 Alexandre Julliard <julliard(a)winehq.org> user32: Store the builtin class names in Unicode. Rob Shearman <rob(a)codeweavers.com> user32: Fix incorrect character count passed to GetWindowTextW in ICONTITLE_Paint. Modified: trunk/reactos/dll/win32/user32/controls/icontitle.c Modified: trunk/reactos/dll/win32/user32/controls/icontitle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/icontitle.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/icontitle.c [iso-8859-1] Sat Jan 17 15:45:00 2009 @@ -15,7 +15,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <user32.h> @@ -37,7 +37,7 @@ */ const struct builtin_class_descr ICONTITLE_builtin_class = { - ICONTITLE_CLASS_ATOM, /* name */ + (LPCWSTR)ICONTITLE_CLASS_ATOM, /* name */ 0, /* style */ NULL, /* procA (winproc is Unicode only) */ IconTitleWndProc, /* procW */ @@ -60,11 +60,11 @@ if (!IsWindowEnabled(owner)) style |= WS_DISABLED; if( GetWindowLongA( owner, GWL_STYLE ) & WS_CHILD ) - hWnd = CreateWindowExA( 0, ICONTITLE_CLASS_ATOM, NULL, + hWnd = CreateWindowExA( 0, (LPCSTR)ICONTITLE_CLASS_ATOM, NULL, style | WS_CHILD, 0, 0, 1, 1, GetParent(owner), 0, instance, NULL ); else - hWnd = CreateWindowExA( 0, ICONTITLE_CLASS_ATOM, NULL, + hWnd = CreateWindowExA( 0, (LPCSTR)ICONTITLE_CLASS_ATOM, NULL, style, 0, 0, 1, 1, owner, 0, instance, NULL ); WIN_SetOwner( hWnd, owner ); /* MDI depends on this */ @@ -175,7 +175,7 @@ { WCHAR buffer[80]; - INT length = GetWindowTextW( owner, buffer, sizeof(buffer) ); + INT length = GetWindowTextW( owner, buffer, sizeof(buffer)/sizeof(buffer[0]) ); SetTextColor( hDC, textColor ); SetBkMode( hDC, TRANSPARENT ); @@ -222,8 +222,8 @@ if (wParam) ICONTITLE_SetTitlePos( hWnd, owner ); return 0; case WM_ERASEBKGND: - if( GetWindowLongA( owner, GWL_STYLE ) & WS_CHILD ) - lParam = SendMessageA( owner, WM_ISACTIVEICON, 0, 0 ); + if( GetWindowLongW( owner, GWL_STYLE ) & WS_CHILD ) + lParam = SendMessageW( owner, WM_ISACTIVEICON, 0, 0 ); else lParam = (owner == GetActiveWindow()); if( ICONTITLE_Paint( hWnd, owner, (HDC)wParam, (BOOL)lParam ) )

1 0

[spetreolle] 38855: add drmk to bootcd
by spetreolle＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: spetreolle Date: Sat Jan 17 15:36:08 2009 New Revision: 38855 URL: http://svn.reactos.org/svn/reactos?rev=38855&view=rev Log: add drmk to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff 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] Sat Jan 17 15:36:08 2009 @@ -429,6 +429,7 @@ drivers\video\videoprt\videoprt.sys 2 drivers\wdm\audio\backpln\portcls\portcls.sys 2 +drivers\wdm\audio\drm\drmk\drmk.sys 2 drivers\wmi\wmilib.sys 2 ; Media

1 0

[cwittich] 38854: fix SystemFunction013
by cwittich＠svn.reactos.org 17 Jan '09

17 Jan '09

Author: cwittich Date: Sat Jan 17 15:29:13 2009 New Revision: 38854 URL: http://svn.reactos.org/svn/reactos?rev=38854&view=rev Log: fix SystemFunction013 Modified: trunk/reactos/dll/win32/advapi32/advapi32.def Modified: trunk/reactos/dll/win32/advapi32/advapi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.def [iso-8859-1] Sat Jan 17 15:29:13 2009 @@ -628,7 +628,7 @@ SystemFunction012@12 SystemFunction013@12 SystemFunction014@12=ADVAPI32.SystemFunction012@12 -SystemFunction015@12=ADVAPI32.SystemFunction013@13 +SystemFunction015@12=ADVAPI32.SystemFunction013@12 SystemFunction016@12=ADVAPI32.SystemFunction012@12 SystemFunction017@12=ADVAPI32.SystemFunction013@12 SystemFunction018@12=ADVAPI32.SystemFunction012@12

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs