Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

[cfinck] 27716: As somehow the "ajax-getfiles-provider.php" script file gets deleted in the "iso" directory on the SVN Server, I give up now and move it to a separate "scripts" directory. Also updated the configuration file.
by cfinck＠svn.reactos.org 18 Jul '07

18 Jul '07

Author: cfinck Date: Wed Jul 18 14:52:54 2007 New Revision: 27716 URL: http://svn.reactos.org/svn/reactos?rev=27716&view=rev Log: As somehow the "ajax-getfiles-provider.php" script file gets deleted in the "iso" directory on the SVN Server, I give up now and move it to a separate "scripts" directory. Also updated the configuration file. Modified: trunk/web/reactos.org/htdocs/getbuilds/ajax-getfiles-provider.php trunk/web/reactos.org/htdocs/getbuilds/config.inc.php Modified: trunk/web/reactos.org/htdocs/getbuilds/ajax-getfiles-provider.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/a… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/ajax-getfiles-provider.php (original) +++ trunk/web/reactos.org/htdocs/getbuilds/ajax-getfiles-provider.php Wed Jul 18 14:52:54 2007 @@ -11,7 +11,7 @@ // Therefore it has an own configuration and doesn't use "config.inc.php". // Configuration - $ISO_DIR = "."; + $ISO_DIR = "../iso"; $MAX_FILES_PER_PAGE = 100; // The same value has to be set in "config.inc.php" $REV_RANGE_LIMIT = 3000; Modified: trunk/web/reactos.org/htdocs/getbuilds/config.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/c… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/config.inc.php (original) +++ trunk/web/reactos.org/htdocs/getbuilds/config.inc.php Wed Jul 18 14:52:54 2007 @@ -8,7 +8,7 @@ */ // Configuration - $AJAX_GETFILES_PROVIDER_URL = "http://svn.reactos.org/iso/ajax-getfiles-provider.php"; + $AJAX_GETFILES_PROVIDER_URL = "http://svn.reactos.org/scripts/ajax-getfiles-provider.php"; $ISO_DOWNLOAD_URL = "http://svn.reactos.org/iso/"; $MAX_FILES_PER_PAGE = 100; // The same value has to be set in "ajax-getfiles-provider.php" $SVN_ACTIVITY_URL = "http://svn.reactos.org/svnact/svn_activity.xml";

1 0

[weiden] 27715: Make use of Set/QuerySecurityAccessMask
by weiden＠svn.reactos.org 18 Jul '07

18 Jul '07

Author: weiden Date: Wed Jul 18 14:50:55 2007 New Revision: 27715 URL: http://svn.reactos.org/svn/reactos?rev=27715&view=rev Log: Make use of Set/QuerySecurityAccessMask Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntmarta/ntmarta.… ============================================================================== --- trunk/reactos/dll/win32/ntmarta/ntmarta.c (original) +++ trunk/reactos/dll/win32/ntmarta/ntmarta.c Wed Jul 18 14:50:55 2007 @@ -581,20 +581,13 @@ case SE_WINDOW_OBJECT: if (Write) { - if (SecurityInfo & (OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION)) - DesiredAccess |= WRITE_OWNER; - if (SecurityInfo & DACL_SECURITY_INFORMATION) - DesiredAccess |= WRITE_DAC; - if (SecurityInfo & SACL_SECURITY_INFORMATION) - DesiredAccess |= ACCESS_SYSTEM_SECURITY; + SetSecurityAccessMask(SecurityInfo, + (PDWORD)&DesiredAccess); } else { - if (SecurityInfo & (OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | - DACL_SECURITY_INFORMATION)) - DesiredAccess |= READ_CONTROL; - if (SecurityInfo & SACL_SECURITY_INFORMATION) - DesiredAccess |= ACCESS_SYSTEM_SECURITY; + QuerySecurityAccessMask(SecurityInfo, + (PDWORD)&DesiredAccess); } break;

1 0

[weiden] 27714: Implement SetSecurityAccessMask
by weiden＠svn.reactos.org 18 Jul '07

18 Jul '07

Author: weiden Date: Wed Jul 18 14:50:48 2007 New Revision: 27714 URL: http://svn.reactos.org/svn/reactos?rev=27714&view=rev Log: Implement SetSecurityAccessMask Modified: trunk/reactos/dll/win32/advapi32/advapi32.def trunk/reactos/dll/win32/advapi32/sec/sec.c trunk/reactos/include/psdk/winbase.h 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 (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.def Wed Jul 18 14:50:48 2007 @@ -585,6 +585,7 @@ SetNamedSecurityInfoW@28 SetPrivateObjectSecurity@20 ;SetPrivateObjectSecurityEx +SetSecurityAccessMask@8 SetSecurityDescriptorControl@12 SetSecurityDescriptorDacl@16 SetSecurityDescriptorGroup@12 Modified: trunk/reactos/dll/win32/advapi32/sec/sec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sec… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sec.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/sec.c Wed Jul 18 14:50:48 2007 @@ -482,10 +482,30 @@ } if (SecurityInformation & SACL_SECURITY_INFORMATION) - { *DesiredAccess |= ACCESS_SYSTEM_SECURITY; - } -} +} + + +/* + * @implemented + */ +VOID +WINAPI +SetSecurityAccessMask(IN SECURITY_INFORMATION SecurityInformation, + OUT LPDWORD DesiredAccess) +{ + *DesiredAccess = 0; + + if (SecurityInformation & (OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION)) + *DesiredAccess |= WRITE_OWNER; + + if (SecurityInformation & DACL_SECURITY_INFORMATION) + *DesiredAccess |= WRITE_DAC; + + if (SecurityInformation & SACL_SECURITY_INFORMATION) + *DesiredAccess |= ACCESS_SYSTEM_SECURITY; +} + /* * @unimplemented Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h (original) +++ trunk/reactos/include/psdk/winbase.h Wed Jul 18 14:50:48 2007 @@ -1963,6 +1963,9 @@ BOOL WINAPI SetProcessPriorityBoost(HANDLE,BOOL); BOOL WINAPI SetProcessShutdownParameters(DWORD,DWORD); BOOL WINAPI SetProcessWorkingSetSize(HANDLE,DWORD,DWORD); +#if (_WIN32_WINNT >= 0x0600) +VOID WINAPI SetSecurityAccessMask(SECURITY_INFORMATION,LPDWORD); +#endif BOOL WINAPI SetSecurityDescriptorControl(PSECURITY_DESCRIPTOR,SECURITY_DESCRIPTOR_CONTROL,SECURITY_DESCRIPTOR_CONTROL); BOOL WINAPI SetSecurityDescriptorDacl(PSECURITY_DESCRIPTOR,BOOL,PACL,BOOL); BOOL WINAPI SetSecurityDescriptorGroup(PSECURITY_DESCRIPTOR,PSID,BOOL);

1 0

[weiden] 27713: Implement the ANSI stub EncryptFileA
by weiden＠svn.reactos.org 18 Jul '07

18 Jul '07

Author: weiden Date: Wed Jul 18 14:40:58 2007 New Revision: 27713 URL: http://svn.reactos.org/svn/reactos?rev=27713&view=rev Log: Implement the ANSI stub EncryptFileA Modified: trunk/reactos/dll/win32/advapi32/sec/sec.c Modified: trunk/reactos/dll/win32/advapi32/sec/sec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sec… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sec.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/sec.c Wed Jul 18 14:40:58 2007 @@ -561,19 +561,17 @@ { UNICODE_STRING FileName; NTSTATUS Status; - BOOL ret = FALSE; - - FileName.Buffer = NULL; + BOOL ret; Status = RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName); if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); - goto cleanup; + return FALSE; } + ret = DecryptFileW(FileName.Buffer, dwReserved); -cleanup: if (FileName.Buffer != NULL) RtlFreeUnicodeString(&FileName); return ret; @@ -590,13 +588,26 @@ } /* - * @unimplemented + * @implemented */ BOOL WINAPI EncryptFileA(LPCSTR lpFileName) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + UNICODE_STRING FileName; + NTSTATUS Status; + BOOL ret; + + Status = RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + ret = EncryptFileW(FileName.Buffer); + + if (FileName.Buffer != NULL) + RtlFreeUnicodeString(&FileName); + return ret; } BOOL WINAPI ConvertSecurityDescriptorToStringSecurityDescriptorW(

1 0

[weiden] 27712: Implement QuerySecurityAccessMask
by weiden＠svn.reactos.org 18 Jul '07

18 Jul '07

Author: weiden Date: Wed Jul 18 13:47:05 2007 New Revision: 27712 URL: http://svn.reactos.org/svn/reactos?rev=27712&view=rev Log: Implement QuerySecurityAccessMask Modified: trunk/reactos/dll/win32/advapi32/advapi32.def trunk/reactos/dll/win32/advapi32/sec/sec.c trunk/reactos/include/psdk/winbase.h 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 (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.def Wed Jul 18 13:47:05 2007 @@ -451,6 +451,7 @@ ;QueryAllTracesA ;QueryAllTracesW QueryRecoveryAgentsOnEncryptedFile@8 +QuerySecurityAccessMask@8 QueryServiceConfig2A@20 QueryServiceConfig2W@20 QueryServiceConfigA@16 Modified: trunk/reactos/dll/win32/advapi32/sec/sec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sec… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sec.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/sec.c Wed Jul 18 13:47:05 2007 @@ -466,6 +466,28 @@ /* + * @implemented + */ +VOID +WINAPI +QuerySecurityAccessMask(IN SECURITY_INFORMATION SecurityInformation, + OUT LPDWORD DesiredAccess) +{ + *DesiredAccess = 0; + + if (SecurityInformation & (OWNER_SECURITY_INFORMATION | + GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION)) + { + *DesiredAccess |= READ_CONTROL; + } + + if (SecurityInformation & SACL_SECURITY_INFORMATION) + { + *DesiredAccess |= ACCESS_SYSTEM_SECURITY; + } +} + +/* * @unimplemented */ BOOL Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h (original) +++ trunk/reactos/include/psdk/winbase.h Wed Jul 18 13:47:05 2007 @@ -1841,6 +1841,9 @@ #endif BOOL WINAPI QueryPerformanceCounter(PLARGE_INTEGER); BOOL WINAPI QueryPerformanceFrequency(PLARGE_INTEGER); +#if (_WIN32_WINNT >= 0x0600) +VOID WINAPI QuerySecurityAccessMask(SECURITY_INFORMATION,LPDWORD); +#endif DWORD WINAPI QueueUserAPC(PAPCFUNC,HANDLE,ULONG_PTR); #if (_WIN32_WINNT >= 0x0500) BOOL WINAPI QueueUserWorkItem(LPTHREAD_START_ROUTINE,PVOID,ULONG);

1 0

[fireball] 27711: - Fix an obvious bug in the code (patch by Thomas).
by fireball＠svn.reactos.org 18 Jul '07

18 Jul '07

Author: fireball Date: Wed Jul 18 11:17:25 2007 New Revision: 27711 URL: http://svn.reactos.org/svn/reactos?rev=27711&view=rev Log: - Fix an obvious bug in the code (patch by Thomas). Modified: trunk/reactos/ntoskrnl/config/cmvalue.c Modified: trunk/reactos/ntoskrnl/config/cmvalue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalue.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmvalue.c (original) +++ trunk/reactos/ntoskrnl/config/cmvalue.c Wed Jul 18 11:17:25 2007 @@ -248,14 +248,14 @@ } /* Fail if we couldn't get a cell */ - if (!ListCell) return STATUS_INSUFFICIENT_RESOURCES; + if (ListCell == HCELL_NULL) return STATUS_INSUFFICIENT_RESOURCES; /* Set this cell as the child list's list cell */ ChildList->List = ListCell; /* Get the actual key list memory */ CellData = HvGetCell(Hive, ListCell); - if (!CellData) ASSERT(FALSE); + ASSERT(CellData != NULL); /* Loop all the children */ for (i = ChildCount - 1; i > Index; i--)

1 0

[weiden] 27710: Fix warnings I introduced, forgot typecasts...
by weiden＠svn.reactos.org 17 Jul '07

17 Jul '07

Author: weiden Date: Tue Jul 17 18:56:02 2007 New Revision: 27710 URL: http://svn.reactos.org/svn/reactos?rev=27710&view=rev Log: Fix warnings I introduced, forgot typecasts... 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 (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c Tue Jul 17 18:56:02 2007 @@ -734,7 +734,7 @@ if (unicode) { - hwnd = User32CreateWindowEx(template.exStyle, template.className, template.caption, + hwnd = User32CreateWindowEx(template.exStyle, (LPCSTR)template.className, (LPCSTR)template.caption, template.style & ~WS_VISIBLE, rect.left, rect.top, rect.right, rect.bottom, owner, hMenu, hInst, NULL,

1 0

[weiden] 27709: Patch by Frode Lillerud <frode@enkelt.no> - Norwegian keyboard layout See issue #2419 for more details.
by weiden＠svn.reactos.org 17 Jul '07

17 Jul '07

Author: weiden Date: Tue Jul 17 18:28:49 2007 New Revision: 27709 URL: http://svn.reactos.org/svn/reactos?rev=27709&view=rev Log: Patch by Frode Lillerud <frode(a)enkelt.no> - Norwegian keyboard layout See issue #2419 for more details. Added: trunk/reactos/dll/keyboard/kbdno/ (with props) trunk/reactos/dll/keyboard/kbdno/kbdno.c (with props) trunk/reactos/dll/keyboard/kbdno/kbdno.def (with props) trunk/reactos/dll/keyboard/kbdno/kbdno.rbuild (with props) trunk/reactos/dll/keyboard/kbdno/kbdno.rc (with props) Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/dll/keyboard/keyboard.rbuild Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Tue Jul 17 18:28:49 2007 @@ -88,6 +88,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000422","Layout Text",0x00000000,"Ukrainian" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000455","Layout File",0x00000000,"kbdbur.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000455","Layout Text",0x00000000,"Burmese" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000414","Layout File",0x00000000,"kbdno.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000414","Layout Text",0x00000000,"Norwegian" ; Network HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Network Adapters" @@ -216,6 +218,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0411",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0412",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0413",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0414",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0813",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0414",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0814",0x00000000,"l_intl.nls" 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 (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Tue Jul 17 18:28:49 2007 @@ -130,6 +130,7 @@ dll\keyboard\kbdhu\kbdhu.dll 1 dll\keyboard\kbdit\kbdit.dll 1 dll\keyboard\kbdja\kbdja.dll 1 +dll\keyboard\kbdno\kbdno.dll 1 dll\keyboard\kbdpl1\kbdpl1.dll 1 dll\keyboard\kbdpo\kbdpo.dll 1 dll\keyboard\kbdru\kbdru.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 (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif Tue Jul 17 18:28:49 2007 @@ -110,6 +110,7 @@ 0000040E = "Hungarian" 00000410 = "Italian" 00000411 = "Japanese" +00000414 = "Norwegian" 00000415 = "Polish (programmer's)" 00000816 = "Portuguese (Portugal)" 00000419 = "Russian" @@ -135,6 +136,7 @@ 0000040E = kbdhu.dll 00000410 = kbdit.dll 00000411 = kbdja.dll +00000414 = kbdno.dll 00000415 = kbdpl1.dll 00000816 = kbdpo.dll 00000419 = kbdru.dll Propchange: trunk/reactos/dll/keyboard/kbdno/ ------------------------------------------------------------------------------ --- bugtraq:url (added) +++ bugtraq:url Tue Jul 17 18:28:49 2007 @@ -1,0 +1,3 @@ +*.cbp +*.user +*.vcproj Added: trunk/reactos/dll/keyboard/kbdno/kbdno.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdno/kbdno.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdno/kbdno.c (added) +++ trunk/reactos/dll/keyboard/kbdno/kbdno.c Tue Jul 17 18:28:49 2007 @@ -1,0 +1,497 @@ +/* + * Norwegian Keyboard layout + * Copyright (C) 2004 ReactOS Development Team + */ +#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_PLUS, VK_OEM_4, VK_BACK, + /* - 0f - */ + /* First Letters Row */ + VK_TAB, 'Q', 'W', 'E', + 'R', 'T', 'Y', 'U', + 'I', 'O', 'P', + VK_OEM_6, VK_OEM_1, VK_RETURN, + /* - 1d - */ + /* Second Letters Row */ + VK_LCONTROL, + 'A', 'S', 'D', 'F', + 'G', 'H', 'J', 'K', + 'L', VK_OEM_3, VK_OEM_7, VK_OEM_5, + VK_LSHIFT, VK_OEM_2, + /* - 2c - */ + /* Third letters row */ + 'Z', 'X', 'C', 'V', + 'B', 'N', 'M', VK_OEM_COMMA, + VK_OEM_PERIOD,VK_OEM_MINUS, 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[] = { + { 0x10, VK_MEDIA_PREV_TRACK | KEXT }, + { 0x19, VK_MEDIA_NEXT_TRACK | KEXT }, + { 0x1D, VK_RCONTROL | KEXT }, + { 0x20, VK_VOLUME_MUTE | KEXT }, + { 0x21, VK_LAUNCH_APP2 | KEXT }, + { 0x22, VK_MEDIA_PLAY_PAUSE | KEXT }, + { 0x24, VK_MEDIA_STOP | KEXT }, + { 0x2E, VK_VOLUME_DOWN | KEXT }, + { 0x30, VK_VOLUME_UP | KEXT }, + { 0x32, VK_BROWSER_HOME | KEXT }, + { 0x35, VK_DIVIDE | KEXT }, + { 0x37, VK_SNAPSHOT | KEXT }, + { 0x38, VK_RMENU | KEXT }, + { 0x47, VK_HOME | KEXT }, + { 0x48, VK_UP | KEXT }, + { 0x49, VK_PRIOR | KEXT }, + { 0x4B, VK_LEFT | KEXT }, + { 0x4D, VK_RIGHT | KEXT }, + { 0x4F, VK_END | KEXT }, + { 0x50, VK_DOWN | KEXT }, + { 0x51, VK_NEXT | KEXT }, + { 0x52, VK_INSERT | KEXT }, + { 0x53, VK_DELETE | KEXT }, + { 0x5B, VK_LWIN | KEXT }, + { 0x5C, VK_RWIN | KEXT }, + { 0x5D, VK_APPS | KEXT }, + { 0x5F, VK_SLEEP | KEXT }, + { 0x65, VK_BROWSER_SEARCH | KEXT }, + { 0x66, VK_BROWSER_FAVORITES | KEXT }, + { 0x67, VK_BROWSER_REFRESH | KEXT }, + { 0x68, VK_BROWSER_STOP | KEXT }, + { 0x69, VK_BROWSER_FORWARD | KEXT }, + { 0x6A, VK_BROWSER_BACK | KEXT }, + { 0x6B, VK_LAUNCH_APP1 | KEXT }, + { 0x6C, VK_LAUNCH_MAIL | KEXT }, + { 0x6D, VK_LAUNCH_MEDIA_SELECT | KEXT }, + { 0x1C, VK_RETURN | KEXT }, + { 0x46, VK_CANCEL | KEXT }, + { 0, 0 }, +}; + +ROSDATA VSC_VK extcode1_to_vk[] = { + { 0x1d, VK_PAUSE}, + { 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, + 6, + { 0, 1, 2, 4, SHFT_INVALID, SHFT_INVALID, 3 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ +}; + +#define NOCAPS 0 +#define CAPS KSHIFT /* Caps -> shift */ + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + /* Normal vs Shifted */ + /* The numbers */ + { VK_OEM_5, NOCAPS, {0xbd, 0xa7} }, + { '1', NOCAPS, {'1', '!'} }, + /* Ctrl-2 generates NUL */ + { VK_OEM_PLUS, NOCAPS, {'+', '?'} }, + { VK_OEM_6, CAPS, {0xe5, 0xc5} }, /* Å */ + + /* Specials */ + { VK_OEM_7, CAPS, {0xf8, 0xd8} }, /* Ø */ + { VK_OEM_3, CAPS, {0xe6, 0xc6} }, /* Æ */ + + { VK_OEM_COMMA, CAPS, {',', ';'} }, + { VK_OEM_PERIOD, CAPS, {'.', ':'} }, + { VK_OEM_2, NOCAPS, {'\'', '*'} }, + + { VK_DECIMAL, NOCAPS, {',', ','} }, + { VK_TAB, NOCAPS, {'\t', '\t'} }, + { VK_ADD, NOCAPS, {'+', '+'} }, + { VK_DIVIDE, NOCAPS, {'/', '/'} }, + { VK_MULTIPLY, NOCAPS, {'*', '*'} }, + { VK_SUBTRACT, NOCAPS, {'-', '-'} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + /* Normal, Shifted, Ctrl */ + + /* The alphabet */ + { 'A', CAPS, {'a', 'A', 0x01} }, + { 'B', CAPS, {'b', 'B', 0x02} }, + { '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} }, + { 'N', CAPS, {'n', 'N', 0x0e} }, + { '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_OEM_MINUS, NOCAPS, {'-', '_', 0x1f /* US */} }, + { VK_RETURN, NOCAPS, {'\r', '\r', '\n'} }, + + { VK_BACK, NOCAPS, {'\b', '\b', 0x7f} }, + { VK_ESCAPE, NOCAPS, {0x1b, 0x1b, 0x1b} }, + { VK_SPACE, NOCAPS, {' ', ' ', ' '} }, + { VK_CANCEL, NOCAPS, {0x03, 0x03, 0x03} }, + + { 0,0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + /* Normal, Shifted, Ctrl, Ctrl-Alt */ + /* Legacy Ascii generators */ + { '2', NOCAPS, {'2', '\"', WCH_NONE, '@'} }, + { '3', NOCAPS, {'3', '#', WCH_NONE, 0x00a3} }, + { '4', NOCAPS, {'4', 0xa4, WCH_NONE, '$'} }, + { '5', NOCAPS, {'5', '%', WCH_NONE, 0x20ac} }, + { '7', NOCAPS, {'7', '/', WCH_NONE, '{'} }, + { '8', NOCAPS, {'8', '(', WCH_NONE, '['} }, + { '9', NOCAPS, {'9', ')', WCH_NONE, ']'} }, + { '0', NOCAPS, {'0', '=', WCH_NONE, '}'} }, + { VK_OEM_4, NOCAPS, {WCH_DEAD, WCH_DEAD, WCH_DEAD, '|'} }, + { VK_EMPTY , NOCAPS, {0xb4, '`', '|', WCH_NONE} }, + + { 'E', CAPS, {'e', 'E', 0x05, 0x20ac} }, + { VK_OEM_1, NOCAPS, {WCH_DEAD, WCH_DEAD, WCH_NONE, WCH_DEAD} }, + { VK_EMPTY , NOCAPS, {0xa8, '^', WCH_NONE, '~'} }, + + { 'M', CAPS, {'m', 'M', 0x0d, 0x00b5} }, + { VK_OEM_102, NOCAPS, {'<', '>', 0x001c, '\\'} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { + /* Normal, Shifted, Ctrl, Ctrl-Alt, C-S-x */ + { '6', NOCAPS, {'6', '&', WCH_NONE, WCH_NONE, 0x1e /* RS */} }, + { 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, {'.'} }, + { 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(3, key_to_chars_3mod), + vk_master(4, key_to_chars_4mod), + vk_master(5, key_to_chars_5mod), + vk_master(2, key_to_chars_2mod), + vk_master(1, keypad_numbers), + { 0,0,0 } +}; + +ROSDATA VSC_LPWSTR key_names[] = { + { 0x00, L"" }, + { 0x01, L"ESC" }, + { 0x0e, L"TILBAKE" }, + { 0x0f, L"TAB" }, + { 0x1c, L"ENTER" }, + { 0x1d, L"CTRL" }, + { 0x2a, L"SHIFT" }, + { 0x36, L"H\x00D8JRE SHIFT" }, + { 0x37, L"NUM * (Numerisk del)" }, + { 0x38, L"ALT" }, + { 0x39, L"MELLOMRUM" }, + { 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"7 (Numerisk del)" }, + { 0x48, L"8 (Numerisk del)" }, + { 0x49, L"9 (Numerisk del)" }, + { 0x4a, L"- (Numerisk del)" }, + { 0x4b, L"4 (Numerisk del)" }, + { 0x4c, L"5 (Numerisk del)" }, + { 0x4d, L"6 (Numerisk del)" }, + { 0x4e, L"+ (Numerisk del)" }, + { 0x4f, L"1 (Numerisk del)" }, + { 0x50, L"2 (Numerisk del)" }, + { 0x51, L"3 (Numerisk del)" }, + { 0x52, L"0 (Numerisk del)" }, + { 0x53, L"DESIMAL (Numerisk 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"ENTER (Numerisk del)" }, + { 0x1d, L"H\x00D8JRE CTRL" }, + { 0x35, L"DIVISION (Numerisk del)" }, + { 0x37, L"PRINT SCREEN" }, + { 0x38, L"H\x00D8JRE ALT" }, + { 0x45, L"NUM LOCK" }, + { 0x46, L"BREAK" }, + { 0x47, L"HOME" }, + { 0x48, L"PIL OPP" }, + { 0x49, L"PAGE UP" }, + { 0x4b, L"VENSTRE PIL" }, +//{ 0x4c, L"Center" }, + { 0x4d, L"H\x00D8JRE PIL" }, + { 0x4f, L"END" }, + { 0x50, L"PIL NED" }, + { 0x51, L"PAGE DOWN" }, + { 0x52, L"INS" }, + { 0x53, L"DEL" }, + { 0x54, L"<ReactOS>" }, + { 0x56, L"HJELP" }, + { 0x5b, L"VENSTRE <ReactOS>" }, + { 0x5c, L"H\x00D8JRE <ReactOS>" }, + { 0x5d, L"Program" }, + { 0, NULL } +}; + +ROSDATA DEADKEY_LPWSTR dead_key_names[] = { + L"\x00a8" L"Omlyd", + L"\x005e" L"Cirkumfleks", + L"\x007e" L"Tilde", + L"\x00b4" L"Akut", + L"\x0060" L"Grave", + NULL +}; + +#define DEADTRANS(ch, accent, comp, flags) MAKELONG(ch, accent), comp, flags + +ROSDATA DEADKEY dead_key[] = { + /* ¨ */ + { DEADTRANS(0x0061, 0x00a8, 0x00e4, 0x0000) }, + { DEADTRANS(0x0065, 0x00a8, 0x00eb, 0x0000) }, + { DEADTRANS(0x0069, 0x00a8, 0x00ef, 0x0000) }, + { DEADTRANS(0x006f, 0x00a8, 0x00f6, 0x0000) }, + { DEADTRANS(0x0075, 0x00a8, 0x00fc, 0x0000) }, + { DEADTRANS(0x0079, 0x00a8, 0x00ff, 0x0000) }, + { DEADTRANS(0x0041, 0x00a8, 0x00c4, 0x0000) }, + { DEADTRANS(0x0045, 0x00a8, 0x00cb, 0x0000) }, + { DEADTRANS(0x0049, 0x00a8, 0x00cf, 0x0000) }, + { DEADTRANS(0x004f, 0x00a8, 0x00d6, 0x0000) }, + { DEADTRANS(0x0055, 0x00a8, 0x00dc, 0x0000) }, + { DEADTRANS(0x0020, 0x00a8, 0x00a8, 0x0000) }, + + /* ^ */ + { DEADTRANS(0x0061, 0x005e, 0x00e2, 0x0000) }, + { DEADTRANS(0x0065, 0x005e, 0x00ea, 0x0000) }, + { DEADTRANS(0x0069, 0x005e, 0x00ee, 0x0000) }, + { DEADTRANS(0x006f, 0x005e, 0x00f4, 0x0000) }, + { DEADTRANS(0x0075, 0x005e, 0x00fb, 0x0000) }, + { DEADTRANS(0x0041, 0x005e, 0x00c2, 0x0000) }, + { DEADTRANS(0x0045, 0x005e, 0x00ca, 0x0000) }, + { DEADTRANS(0x0049, 0x005e, 0x00ce, 0x0000) }, + { DEADTRANS(0x004f, 0x005e, 0x00d4, 0x0000) }, + { DEADTRANS(0x0055, 0x005e, 0x00db, 0x0000) }, + { DEADTRANS(0x0020, 0x005e, 0x005e, 0x0000) }, + + /* ~ */ + { DEADTRANS(0x0061, 0x007e, 0x00e3, 0x0000) }, + { DEADTRANS(0x006f, 0x007e, 0x00f5, 0x0000) }, + { DEADTRANS(0x006e, 0x007e, 0x00f1, 0x0000) }, + { DEADTRANS(0x0041, 0x007e, 0x00c3, 0x0000) }, + { DEADTRANS(0x004f, 0x007e, 0x00d5, 0x0000) }, + { DEADTRANS(0x004e, 0x007e, 0x00d1, 0x0000) }, + { DEADTRANS(0x0020, 0x007e, 0x007e, 0x0000) }, + + /* ´ */ + { DEADTRANS(0x0061, 0x00b4, 0x00e1, 0x0000) }, + { DEADTRANS(0x0065, 0x00b4, 0x00e9, 0x0000) }, + { DEADTRANS(0x0069, 0x00b4, 0x00ed, 0x0000) }, + { DEADTRANS(0x006f, 0x00b4, 0x00f3, 0x0000) }, + { DEADTRANS(0x0075, 0x00b4, 0x00fa, 0x0000) }, + { DEADTRANS(0x0079, 0x00b4, 0x00fd, 0x0000) }, + { DEADTRANS(0x0041, 0x00b4, 0x00c1, 0x0000) }, + { DEADTRANS(0x0045, 0x00b4, 0x00c9, 0x0000) }, + { DEADTRANS(0x0049, 0x00b4, 0x00cd, 0x0000) }, + { DEADTRANS(0x004f, 0x00b4, 0x00d3, 0x0000) }, + { DEADTRANS(0x0055, 0x00b4, 0x00da, 0x0000) }, + { DEADTRANS(0x0059, 0x00b4, 0x00dd, 0x0000) }, + { DEADTRANS(0x0020, 0x00b4, 0x00b4, 0x0000) }, + + /* ` */ + { DEADTRANS(0x0061, 0x0060, 0x00e0, 0x0000) }, + { DEADTRANS(0x0065, 0x0060, 0x00e8, 0x0000) }, + { DEADTRANS(0x0069, 0x0060, 0x00ec, 0x0000) }, + { DEADTRANS(0x006f, 0x0060, 0x00f2, 0x0000) }, + { DEADTRANS(0x0075, 0x0060, 0x00f9, 0x0000) }, + { DEADTRANS(0x0041, 0x0060, 0x00c0, 0x0000) }, + { DEADTRANS(0x0045, 0x0060, 0x00c8, 0x0000) }, + { DEADTRANS(0x0049, 0x0060, 0x00cc, 0x0000) }, + { DEADTRANS(0x004f, 0x0060, 0x00d2, 0x0000) }, + { DEADTRANS(0x0055, 0x0060, 0x00d9, 0x0000) }, + { DEADTRANS(0x0020, 0x0060, 0x0060, 0x0000) }, + { 0, 0 } +}; + +/* Finally, the master table */ +ROSDATA KBDTABLES keyboard_layout_table = { + /* modifier assignments */ + &modifier_bits, + + /* character from vk tables */ + vk_to_wchar_master_table, + + /* diacritical marks -- currently implemented by wine code */ + 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 -- Norwegian doesn't have any (æ is not a ligature!)*/ + 0, + 0, + NULL +}; + +PKBDTABLES STDCALL KbdLayerDescriptor(VOID) { + return &keyboard_layout_table; +} + +INT STDCALL +DllMain( + PVOID hinstDll, + ULONG dwReason, + PVOID reserved) +{ + UNREFERENCED_PARAMETER(hinstDll); + UNREFERENCED_PARAMETER(dwReason); + UNREFERENCED_PARAMETER(reserved); + return 1; +} Propchange: trunk/reactos/dll/keyboard/kbdno/kbdno.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdno/kbdno.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdno/kbdno.d… ============================================================================== --- trunk/reactos/dll/keyboard/kbdno/kbdno.def (added) +++ trunk/reactos/dll/keyboard/kbdno/kbdno.def Tue Jul 17 18:28:49 2007 @@ -1,0 +1,3 @@ +LIBRARY kbdno.dll +EXPORTS +KbdLayerDescriptor Propchange: trunk/reactos/dll/keyboard/kbdno/kbdno.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdno/kbdno.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdno/kbdno.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdno/kbdno.rbuild (added) +++ trunk/reactos/dll/keyboard/kbdno/kbdno.rbuild Tue Jul 17 18:28:49 2007 @@ -1,0 +1,9 @@ +<module name="kbdno" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdno.dll" allowwarnings="true"> + <importlibrary definition="kbdno.def" /> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <define name="_WIN32_WINNT">0x0500</define> + <file>kbdno.c</file> + <file>kbdno.rc</file> +</module> Propchange: trunk/reactos/dll/keyboard/kbdno/kbdno.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdno/kbdno.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdno/kbdno.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdno/kbdno.rc (added) +++ trunk/reactos/dll/keyboard/kbdno/kbdno.rc Tue Jul 17 18:28:49 2007 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS NOAscii Keyboard Layout\0" +#define REACTOS_STR_INTERNAL_NAME "kbdno\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdno.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/keyboard/kbdno/kbdno.rc ------------------------------------------------------------------------------ svn:eol-style = native 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 (original) +++ trunk/reactos/dll/keyboard/keyboard.rbuild Tue Jul 17 18:28:49 2007 @@ -38,6 +38,9 @@ <directory name="kbdja"> <xi:include href="kbdja/kbdja.rbuild" /> </directory> + <directory name="kbdno"> + <xi:include href="kbdno/kbdno.rbuild" /> + </directory> <directory name="kbdpl1"> <xi:include href="kbdpl1/kbdpl1.rbuild" /> </directory>

1 0

[weiden] 27708: Fix remaining incorrect dialog definitions using DS_SHELLFONT as an extended style.
by weiden＠svn.reactos.org 17 Jul '07

17 Jul '07

Author: weiden Date: Tue Jul 17 18:18:38 2007 New Revision: 27708 URL: http://svn.reactos.org/svn/reactos?rev=27708&view=rev Log: Fix remaining incorrect dialog definitions using DS_SHELLFONT as an extended style. Modified: trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc trunk/reactos/base/applications/games/solitaire/lang/en-US.rc trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc trunk/reactos/dll/cpl/timedate/lang/uk-UA.rc Modified: trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc Tue Jul 17 18:18:38 2007 @@ -13,10 +13,9 @@ /* Dialogs */ IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT CAPTION "Íàñòðîéêè" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT BEGIN GROUPBOX "Êàðòè", -1, 7, 7, 65, 40 AUTORADIOBUTTON "Èçòåãëè &åäíà", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc Tue Jul 17 18:18:38 2007 @@ -13,10 +13,9 @@ /* Dialogs */ IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT CAPTION "Optionen" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT BEGIN GROUPBOX "Karten", -1, 7, 7, 65, 40 AUTORADIOBUTTON "&Eine ziehen", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/base/applications/games/solitaire/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/en-US.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/en-US.rc Tue Jul 17 18:18:38 2007 @@ -13,10 +13,9 @@ /* Dialogs */ IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT CAPTION "Options" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT BEGIN GROUPBOX "Cards", -1, 7, 7, 65, 40 AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc Tue Jul 17 18:18:38 2007 @@ -13,10 +13,9 @@ /* Dialogs */ IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT CAPTION "Options" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT BEGIN GROUPBOX "Cards", -1, 7, 7, 65, 40 AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc Tue Jul 17 18:18:38 2007 @@ -13,10 +13,9 @@ /* Dialogs */ IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT CAPTION "Options" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT BEGIN GROUPBOX "Cartes", -1, 7, 7, 65, 40 AUTORADIOBUTTON "En tirer une", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc Tue Jul 17 18:18:38 2007 @@ -14,10 +14,9 @@ /* Dialogs */ IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT CAPTION "Options" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT BEGIN GROUPBOX "Cards", -1, 7, 7, 65, 40 AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc Tue Jul 17 18:18:38 2007 @@ -14,10 +14,9 @@ /* Dialogs */ IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT CAPTION "Options" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT BEGIN GROUPBOX "Carte", -1, 7, 7, 65, 40 AUTORADIOBUTTON "Girane &Una", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc Tue Jul 17 18:18:38 2007 @@ -14,10 +14,9 @@ /* Dialogs */ IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT CAPTION "Options" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT BEGIN GROUPBOX "Cards", -1, 7, 7, 65, 40 AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc Tue Jul 17 18:18:38 2007 @@ -12,10 +12,9 @@ /* Dialogs */ IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT CAPTION "Opcje" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT BEGIN GROUPBOX "Karty", -1, 7, 7, 65, 40 AUTORADIOBUTTON "Rozdaj &jedn¹", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc Tue Jul 17 18:18:38 2007 @@ -8,10 +8,9 @@ /* Äèàëîãè */ IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT CAPTION "Íàñòðîéêè" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT BEGIN GROUPBOX "Êàðòû", -1, 7, 7, 65, 40 AUTORADIOBUTTON "Ïî &îäíîé", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc Tue Jul 17 18:18:38 2007 @@ -15,10 +15,9 @@ /* Dialogs */ IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT CAPTION "Monosti" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT BEGIN GROUPBOX "Karty", -1, 7, 7, 65, 40 AUTORADIOBUTTON "aha &jednu", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc Tue Jul 17 18:18:38 2007 @@ -14,10 +14,9 @@ /* Dialogs */ IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT CAPTION "Options" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT BEGIN GROUPBOX "Cards", -1, 7, 7, 65, 40 AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc Tue Jul 17 18:18:38 2007 @@ -13,10 +13,9 @@ /* Dialogs */ IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT CAPTION "Ïàðàìåòðè" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT BEGIN GROUPBOX "Êàðòè", -1, 7, 7, 65, 40 AUTORADIOBUTTON "&Ïî îäí³é", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc Tue Jul 17 18:18:38 2007 @@ -14,10 +14,9 @@ /* Dialogs */ IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT CAPTION "Options" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT BEGIN GROUPBOX "Cards", -1, 7, 7, 65, 40 AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP Modified: trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc Tue Jul 17 18:18:38 2007 @@ -12,7 +12,6 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Óñòàòêóâàííÿ" FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT BEGIN END Modified: trunk/reactos/dll/cpl/timedate/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/uk-U… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/uk-UA.rc Tue Jul 17 18:18:38 2007 @@ -12,7 +12,6 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Äàòà é ÷àñ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 -EXSTYLE DS_SHELLFONT BEGIN GROUPBOX "&Äàòà", -1, 4, 2, 122, 125 COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -36,7 +35,6 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "×àñîâèé ïîÿñ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 -EXSTYLE DS_SHELLFONT BEGIN COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP @@ -49,7 +47,6 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "×àñ ²íòåðíåòó" FONT 8, "MS Shell Dlg", 0, 0, 0x0 -EXSTYLE DS_SHELLFONT BEGIN COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP AUTOCHECKBOX "Àâòîìàòè÷íî ñèíõðîí³çóâàòè ç ñåðâåðîì ÷àñó â ²íòåðíåò³", IDC_AUTOSYNC,

1 0

[weiden] 27707: Fix the dialog manager to ignore WS_EX_MDICHILD. See issue #2289 for more details.
by weiden＠svn.reactos.org 17 Jul '07

17 Jul '07

Author: weiden Date: Tue Jul 17 17:52:36 2007 New Revision: 27707 URL: http://svn.reactos.org/svn/reactos?rev=27707&view=rev Log: Fix the dialog manager to ignore WS_EX_MDICHILD. See issue #2289 for more details. Modified: trunk/reactos/dll/win32/user32/include/window.h trunk/reactos/dll/win32/user32/windows/dialog.c trunk/reactos/dll/win32/user32/windows/window.c Modified: trunk/reactos/dll/win32/user32/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/w… ============================================================================== --- trunk/reactos/dll/win32/user32/include/window.h (original) +++ trunk/reactos/dll/win32/user32/include/window.h Tue Jul 17 17:52:36 2007 @@ -48,3 +48,18 @@ LRESULT FASTCALL IntCallWindowProcW(BOOL IsAnsiProc, WNDPROC WndProc, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam); + +HWND STDCALL +User32CreateWindowEx(DWORD dwExStyle, + LPCSTR lpClassName, + LPCSTR lpWindowName, + DWORD dwStyle, + int x, + int y, + int nWidth, + int nHeight, + HWND hWndParent, + HMENU hMenu, + HINSTANCE hInstance, + LPVOID lpParam, + BOOL Unicode); 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 (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c Tue Jul 17 17:52:36 2007 @@ -734,10 +734,11 @@ if (unicode) { - hwnd = CreateWindowExW(template.exStyle, template.className, template.caption, - template.style & ~WS_VISIBLE, - rect.left, rect.top, rect.right, rect.bottom, - owner, hMenu, hInst, NULL ); + hwnd = User32CreateWindowEx(template.exStyle, template.className, template.caption, + template.style & ~WS_VISIBLE, + rect.left, rect.top, rect.right, rect.bottom, + owner, hMenu, hInst, NULL, + TRUE); } else { @@ -756,10 +757,11 @@ caption = HeapAlloc( GetProcessHeap(), 0, len ); WideCharToMultiByte( CP_ACP, 0, template.caption, -1, caption, len, NULL, NULL ); } - hwnd = CreateWindowExA(template.exStyle, class, caption, - template.style & ~WS_VISIBLE, - rect.left, rect.top, rect.right, rect.bottom, - owner, hMenu, hInst, NULL ); + hwnd = User32CreateWindowEx(template.exStyle, class, caption, + template.style & ~WS_VISIBLE, + rect.left, rect.top, rect.right, rect.bottom, + owner, hMenu, hInst, NULL, + FALSE); if (HIWORD(class)) HeapFree( GetProcessHeap(), 0, class ); if (HIWORD(caption)) HeapFree( GetProcessHeap(), 0, caption ); } Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c (original) +++ trunk/reactos/dll/win32/user32/windows/window.c Tue Jul 17 17:52:36 2007 @@ -162,7 +162,6 @@ WNDCLASSEXA wceA; WNDCLASSEXW wceW; HWND Handle; - MDICREATESTRUCTA mdi; #if 0 DbgPrint("[window] User32CreateWindowEx style %d, exstyle %d, parent %d\n", dwStyle, dwExStyle, hWndParent); @@ -192,76 +191,6 @@ { ControlsInitialized = ControlsInit(ClassName.Buffer); } - - if (dwExStyle & WS_EX_MDICHILD) - { - POINT mPos[2]; - UINT id = 0; - /* lpParams of WM_[NC]CREATE is different for MDI children. - * MDICREATESTRUCT members have the originally passed values. - * - * Note: we rely on the fact that MDICREATESTRUCTA and MDICREATESTRUCTW - * have the same layout. - */ - mdi.szClass = (LPCSTR)lpClassName; - mdi.szTitle = (LPCSTR)lpWindowName; - mdi.hOwner = hInstance; - mdi.x = x; - mdi.y = y; - mdi.cx = nWidth; - mdi.cy = nHeight; - mdi.style = dwStyle; - mdi.lParam = (LPARAM)lpParam; - - lpParam = (LPVOID)&mdi; - - if (GetWindowLongW(hWndParent, GWL_STYLE) & MDIS_ALLCHILDSTYLES) - { - if (dwStyle & WS_POPUP) - { - DPRINT1("WS_POPUP with MDIS_ALLCHILDSTYLES is not allowed\n"); - return(0); - } - dwStyle |= (WS_CHILD | WS_CLIPSIBLINGS); - } - else - { - dwStyle &= ~WS_POPUP; - dwStyle |= (WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION | - WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX); - } - - HWND top_child = GetWindow(hWndParent, GW_CHILD); - - if (top_child) - { - /* Restore current maximized child */ - if((dwStyle & WS_VISIBLE) && IsZoomed(top_child)) - { - DPRINT("Restoring current maximized child %p\n", top_child); - SendMessageW( top_child, WM_SETREDRAW, FALSE, 0 ); - ShowWindow(top_child, SW_RESTORE); - SendMessageW( top_child, WM_SETREDRAW, TRUE, 0 ); - } - } - - MDI_CalcDefaultChildPos(hWndParent, -1, mPos, 0, &id); - - if (!(dwStyle & WS_POPUP)) hMenu = (HMENU)id; - - if (dwStyle & (WS_CHILD | WS_POPUP)) - { - if (x == CW_USEDEFAULT || x == CW_USEDEFAULT16) - { - x = mPos[0].x; - y = mPos[0].y; - } - if (nWidth == CW_USEDEFAULT || nWidth == CW_USEDEFAULT16 || !nWidth) - nWidth = mPos[1].x; - if (nHeight == CW_USEDEFAULT || nHeight == CW_USEDEFAULT16 || !nHeight) - nHeight = mPos[1].y; - } - } if (Unicode) RtlInitUnicodeString(&WindowName, (PCWSTR)lpWindowName); @@ -284,8 +213,8 @@ { wceW.cbSize = sizeof(WNDCLASSEXW); if(GetClassInfoExW(hInstance, (LPCWSTR)lpClassName, &wceW) && wceW.lpszMenuName) - {DbgPrint("LoadingMenu 0x%p %d\n", wceW.lpszMenuName, IS_INTRESOURCE(wceW.lpszMenuName)); - hMenu = LoadMenuW(hInstance, wceW.lpszMenuName);DbgPrint("Loaded menu: 0x%p\n", hMenu); + { + hMenu = LoadMenuW(hInstance, wceW.lpszMenuName); } } else @@ -317,13 +246,6 @@ DbgPrint("[window] NtUserCreateWindowEx() == %d\n", Handle); #endif - if ((dwStyle & WS_VISIBLE) && (dwExStyle & WS_EX_MDICHILD) && Handle != (HWND)0) - { - SendMessageW(hWndParent, WM_MDIREFRESHMENU, 0, 0); - SetWindowPos(Handle, HWND_TOP, 0, 0, 0, 0, SWP_SHOWWINDOW | - SWP_NOMOVE | SWP_NOSIZE); - } - if(!Unicode) { RtlFreeUnicodeString(&WindowName); @@ -354,19 +276,98 @@ HINSTANCE hInstance, LPVOID lpParam) { - return User32CreateWindowEx(dwExStyle, - lpClassName, - lpWindowName, - dwStyle, - x, - y, - nWidth, - nHeight, - hWndParent, - hMenu, - hInstance, - lpParam, - FALSE); + MDICREATESTRUCTA mdi; + HWND hwnd; + + if (dwExStyle & WS_EX_MDICHILD) + { + POINT mPos[2]; + UINT id = 0; + + /* lpParams of WM_[NC]CREATE is different for MDI children. + * MDICREATESTRUCT members have the originally passed values. + */ + mdi.szClass = lpClassName; + mdi.szTitle = lpWindowName; + mdi.hOwner = hInstance; + mdi.x = x; + mdi.y = y; + mdi.cx = nWidth; + mdi.cy = nHeight; + mdi.style = dwStyle; + mdi.lParam = (LPARAM)lpParam; + + lpParam = (LPVOID)&mdi; + + if (GetWindowLongW(hWndParent, GWL_STYLE) & MDIS_ALLCHILDSTYLES) + { + if (dwStyle & WS_POPUP) + { + DPRINT1("WS_POPUP with MDIS_ALLCHILDSTYLES is not allowed\n"); + return(0); + } + dwStyle |= (WS_CHILD | WS_CLIPSIBLINGS); + } + else + { + dwStyle &= ~WS_POPUP; + dwStyle |= (WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX); + } + + HWND top_child = GetWindow(hWndParent, GW_CHILD); + + if (top_child) + { + /* Restore current maximized child */ + if((dwStyle & WS_VISIBLE) && IsZoomed(top_child)) + { + DPRINT("Restoring current maximized child %p\n", top_child); + SendMessageW( top_child, WM_SETREDRAW, FALSE, 0 ); + ShowWindow(top_child, SW_RESTORE); + SendMessageW( top_child, WM_SETREDRAW, TRUE, 0 ); + } + } + + MDI_CalcDefaultChildPos(hWndParent, -1, mPos, 0, &id); + + if (!(dwStyle & WS_POPUP)) hMenu = (HMENU)id; + + if (dwStyle & (WS_CHILD | WS_POPUP)) + { + if (x == CW_USEDEFAULT || x == CW_USEDEFAULT16) + { + x = mPos[0].x; + y = mPos[0].y; + } + if (nWidth == CW_USEDEFAULT || nWidth == CW_USEDEFAULT16 || !nWidth) + nWidth = mPos[1].x; + if (nHeight == CW_USEDEFAULT || nHeight == CW_USEDEFAULT16 || !nHeight) + nHeight = mPos[1].y; + } + } + + hwnd = User32CreateWindowEx(dwExStyle, + lpClassName, + lpWindowName, + dwStyle, + x, + y, + nWidth, + nHeight, + hWndParent, + hMenu, + hInstance, + lpParam, + FALSE); + + if ((dwStyle & WS_VISIBLE) && (dwExStyle & WS_EX_MDICHILD) && hwnd != (HWND)0) + { + SendMessageW(hWndParent, WM_MDIREFRESHMENU, 0, 0); + SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE); + } + + return hwnd; } @@ -387,19 +388,98 @@ HINSTANCE hInstance, LPVOID lpParam) { - return User32CreateWindowEx(dwExStyle, - (LPCSTR) lpClassName, - (LPCSTR) lpWindowName, - dwStyle, - x, - y, - nWidth, - nHeight, - hWndParent, - hMenu, - hInstance, - lpParam, - TRUE); + MDICREATESTRUCTW mdi; + HWND hwnd; + + if (dwExStyle & WS_EX_MDICHILD) + { + POINT mPos[2]; + UINT id = 0; + + /* lpParams of WM_[NC]CREATE is different for MDI children. + * MDICREATESTRUCT members have the originally passed values. + */ + mdi.szClass = lpClassName; + mdi.szTitle = lpWindowName; + mdi.hOwner = hInstance; + mdi.x = x; + mdi.y = y; + mdi.cx = nWidth; + mdi.cy = nHeight; + mdi.style = dwStyle; + mdi.lParam = (LPARAM)lpParam; + + lpParam = (LPVOID)&mdi; + + if (GetWindowLongW(hWndParent, GWL_STYLE) & MDIS_ALLCHILDSTYLES) + { + if (dwStyle & WS_POPUP) + { + DPRINT1("WS_POPUP with MDIS_ALLCHILDSTYLES is not allowed\n"); + return(0); + } + dwStyle |= (WS_CHILD | WS_CLIPSIBLINGS); + } + else + { + dwStyle &= ~WS_POPUP; + dwStyle |= (WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX); + } + + HWND top_child = GetWindow(hWndParent, GW_CHILD); + + if (top_child) + { + /* Restore current maximized child */ + if((dwStyle & WS_VISIBLE) && IsZoomed(top_child)) + { + DPRINT("Restoring current maximized child %p\n", top_child); + SendMessageW( top_child, WM_SETREDRAW, FALSE, 0 ); + ShowWindow(top_child, SW_RESTORE); + SendMessageW( top_child, WM_SETREDRAW, TRUE, 0 ); + } + } + + MDI_CalcDefaultChildPos(hWndParent, -1, mPos, 0, &id); + + if (!(dwStyle & WS_POPUP)) hMenu = (HMENU)id; + + if (dwStyle & (WS_CHILD | WS_POPUP)) + { + if (x == CW_USEDEFAULT || x == CW_USEDEFAULT16) + { + x = mPos[0].x; + y = mPos[0].y; + } + if (nWidth == CW_USEDEFAULT || nWidth == CW_USEDEFAULT16 || !nWidth) + nWidth = mPos[1].x; + if (nHeight == CW_USEDEFAULT || nHeight == CW_USEDEFAULT16 || !nHeight) + nHeight = mPos[1].y; + } + } + + hwnd = User32CreateWindowEx(dwExStyle, + (LPCSTR) lpClassName, + (LPCSTR) lpWindowName, + dwStyle, + x, + y, + nWidth, + nHeight, + hWndParent, + hMenu, + hInstance, + lpParam, + TRUE); + + if ((dwStyle & WS_VISIBLE) && (dwExStyle & WS_EX_MDICHILD) && hwnd != (HWND)0) + { + SendMessageW(hWndParent, WM_MDIREFRESHMENU, 0, 0); + SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE); + } + + return hwnd; } /*

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
71
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 July 2007