Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 65849: [FRAMEDYN] Partly implement the Provider class from WMI. This allows VMware Tools installer to complain a bit less about imports not found. The installation still fails and sti...
by pschweitzer＠svn.reactos.org 27 Dec '14

27 Dec '14

Author: pschweitzer Date: Sat Dec 27 13:33:14 2014 New Revision: 65849 URL: http://svn.reactos.org/svn/reactos?rev=65849&view=rev Log: [FRAMEDYN] Partly implement the Provider class from WMI. This allows VMware Tools installer to complain a bit less about imports not found. The installation still fails and still ends with a BSOD though. CORE-7991 Added: trunk/reactos/dll/win32/framedyn/provider.cpp (with props) trunk/reactos/include/psdk/provider.h (with props) Modified: trunk/reactos/dll/win32/framedyn/CMakeLists.txt trunk/reactos/dll/win32/framedyn/alias_gcc.s trunk/reactos/dll/win32/framedyn/framedyn.spec Modified: trunk/reactos/dll/win32/framedyn/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/framedyn/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/CMakeLists.txt [iso-8859-1] Sat Dec 27 13:33:14 2014 @@ -5,6 +5,7 @@ list(APPEND SOURCE main.c chstring.cpp + provider.cpp ${CMAKE_CURRENT_BINARY_DIR}/framedyn.def) if(MSVC) Modified: trunk/reactos/dll/win32/framedyn/alias_gcc.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/alias_g… ============================================================================== --- trunk/reactos/dll/win32/framedyn/alias_gcc.s [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/alias_gcc.s [iso-8859-1] Sat Dec 27 13:33:14 2014 @@ -90,5 +90,9 @@ DEFINE_ALIAS(__ZplRK8CHStringPKw, ??H@YG?AVCHString@@ABV0@PBG@Z) DEFINE_ALIAS(__ZplPKwRK8CHString, ??H@YG?AVCHString@@PBGABV0@@Z) DEFINE_ALIAS(__ZplRK8CHStringS1_, ??H@YG?AVCHString@@ABV0@0@Z) +DEFINE_ALIAS(__ZN8Provider5FlushEv, ?Flush@Provider@@MAEXXZ) +DEFINE_ALIAS(__ZN8Provider21ValidateDeletionFlagsEl, ?ValidateDeletionFlags@Provider@@MAEJJ@Z) +DEFINE_ALIAS(__ZN8Provider19ValidateMethodFlagsEl, ?ValidateMethodFlags@Provider@@MAEJJ@Z) +DEFINE_ALIAS(__ZN8Provider18ValidateQueryFlagsEl, ?ValidateQueryFlags@Provider@@MAEJJ@Z) END Modified: trunk/reactos/dll/win32/framedyn/framedyn.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/framedy… ============================================================================== --- trunk/reactos/dll/win32/framedyn/framedyn.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/framedyn.spec [iso-8859-1] Sat Dec 27 13:33:14 2014 @@ -74,3 +74,7 @@ @ stdcall ??H@YG?AVCHString@@ABV0@PBG@Z(ptr wstr) _ZplRK8CHStringPKw @ stdcall ??H@YG?AVCHString@@PBGABV0@@Z(wstr ptr) _ZplPKwRK8CHString @ stdcall ??H@YG?AVCHString@@ABV0@0@Z(ptr ptr) _ZplRK8CHStringS1_ +@ thiscall ?Flush@Provider@@MAEXXZ() _ZN8Provider5FlushEv +@ thiscall ?ValidateDeletionFlags@Provider@@MAEJJ@Z(long) _ZN8Provider21ValidateDeletionFlagsEl +@ thiscall ?ValidateMethodFlags@Provider@@MAEJJ@Z(long) _ZN8Provider19ValidateMethodFlagsEl +@ thiscall ?ValidateQueryFlags@Provider@@MAEJJ@Z(long) _ZN8Provider18ValidateQueryFlagsEl Added: trunk/reactos/dll/win32/framedyn/provider.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/provide… ============================================================================== --- trunk/reactos/dll/win32/framedyn/provider.cpp (added) +++ trunk/reactos/dll/win32/framedyn/provider.cpp [iso-8859-1] Sat Dec 27 13:33:14 2014 @@ -0,0 +1,57 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: dll/win32/framedyn/provider.cpp + * PURPOSE: Provider class implementation + * PROGRAMMERS: Pierre Schweitzer (pierre(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <provider.h> +#include <wbemcli.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @unimplemented + */ +void Provider::Flush() +{ + return; +} + +/* + * @implemented + */ +HRESULT Provider::ValidateDeletionFlags(long lFlags) +{ + if (lFlags == 0) + return WBEM_S_NO_ERROR; + + return WBEM_E_UNSUPPORTED_PARAMETER; +} + +/* + * @implemented + */ +HRESULT Provider::ValidateMethodFlags(long lFlags) +{ + if (lFlags == 0) + return WBEM_S_NO_ERROR; + + return WBEM_E_UNSUPPORTED_PARAMETER; +} + +/* + * @implemented + */ +HRESULT Provider::ValidateQueryFlags(long lFlags) +{ + if (lFlags == 0) + return WBEM_S_NO_ERROR; + + return WBEM_E_UNSUPPORTED_PARAMETER; +} Propchange: trunk/reactos/dll/win32/framedyn/provider.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/provider.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/provider.h?re… ============================================================================== --- trunk/reactos/include/psdk/provider.h (added) +++ trunk/reactos/include/psdk/provider.h [iso-8859-1] Sat Dec 27 13:33:14 2014 @@ -0,0 +1,18 @@ +#pragma once + +#ifndef _PROVIDER_H +#define _PROVIDER_H + +#include <windows.h> +#include <provexce.h> + +class Provider +{ +public: + void Flush(); + HRESULT ValidateDeletionFlags(long lFlags); + HRESULT ValidateMethodFlags(long lFlags); + HRESULT ValidateQueryFlags(long lFlags); +}; + +#endif Propchange: trunk/reactos/include/psdk/provider.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dreimer] 65848: [RAPPS] Add WINE Mono to RAPPS CORE-8871 #resolve #comment Added to RApps DB.
by dreimer＠svn.reactos.org 27 Dec '14

27 Dec '14

Author: dreimer Date: Sat Dec 27 13:00:03 2014 New Revision: 65848 URL: http://svn.reactos.org/svn/reactos?rev=65848&view=rev Log: [RAPPS] Add WINE Mono to RAPPS CORE-8871 #resolve #comment Added to RApps DB. Added: trunk/reactos/base/applications/rapps/rapps/winemono.txt (with props) Added: trunk/reactos/base/applications/rapps/rapps/winemono.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/winemono.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/winemono.txt [iso-8859-1] Sat Dec 27 13:00:03 2014 @@ -0,0 +1,35 @@ +[Section] +Name = Wine Mono .NET Framework +Version = 4.5.4 +License = GPLv2, LGPLv2, MIT, BSD, MS-PL, MPLv1.1 +Description = Wine Mono .NET Framework +Size = 53.7 MB +Category = 14 +URLSite = http://sourceforge.net/projects/wine/files/Wine Mono +URLDownload = http://download.sourceforge.net/wine/Wine%20Mono/4.5.4/wine-mono-4.5.4.msi +CDPath = none + +[Section.0407] +Description = Wine Mono .NET Framework + +[Section.040a] +Description = Wine Mono .NET Framework + +[Section.040c] +Description = Wine Mono .NET Framework +Size = 53,7 Mo + +[Section.0410] +Description = Wine Mono .NET Framework + +[Section.0415] +Description = Wine Mono .NET Framework + +[Section.0418] +Description = Platforma Wine Mono .NET +Size = 53,7 Mo + +[Section.041f] +Name = Wine Mono .NET ÃatÄ±sÄ± +Description = Wine Mono .NET ÃatÄ±sÄ± +Size = 53,7 MB Propchange: trunk/reactos/base/applications/rapps/rapps/winemono.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ekohl] 65847: [USETUP] - Re-enable the partition size check and display a warning if the install partition is too small. - Update the required install partition size to 550MB.
by ekohl＠svn.reactos.org 27 Dec '14

27 Dec '14

Author: ekohl Date: Sat Dec 27 12:33:59 2014 New Revision: 65847 URL: http://svn.reactos.org/svn/reactos?rev=65847&view=rev Log: [USETUP] - Re-enable the partition size check and display a warning if the install partition is too small. - Update the required install partition size to 550MB. Modified: trunk/reactos/base/setup/usetup/errorcode.h trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/bn-BD.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/et-EE.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/he-IL.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ja-JP.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/nl-NL.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/pt-BR.h trunk/reactos/base/setup/usetup/lang/ro-RO.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sq-AL.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/tr-TR.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/setup/usetup/mui.h trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/base/setup/usetup/errorcode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/errorcod… ============================================================================== --- trunk/reactos/base/setup/usetup/errorcode.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/errorcode.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -66,7 +66,7 @@ ERROR_UPDATE_LOCALESETTINGS, ERROR_ADDING_KBLAYOUTS, ERROR_UPDATE_GEOID, - ERROR_INSUFFICIENT_DISKSPACE, + ERROR_INSUFFICIENT_PARTITION_SIZE, ERROR_PARTITION_TABLE_FULL, ERROR_ONLY_ONE_EXTENDED, Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1425,36 +1425,25 @@ } -#if 0 static BOOL IsDiskSizeValid(PPARTENTRY PartEntry) { - ULONGLONG m1, m2; - - /* check for unpartitioned space */ - m1 = PartEntry->UnpartitionedLength; - m1 = (m1 + (1 << 19)) >> 20; /* in MBytes (rounded) */ - - if( m1 > RequiredPartitionDiskSpace) + ULONGLONG size; + + size = PartEntry->SectorCount.QuadPart * PartEntry->DiskEntry->BytesPerSector; + size = (size + 524288) / 1048576; /* in MBytes */ + + if (size < RequiredPartitionDiskSpace) + { + /* partition is too small so ask for another partion */ + DPRINT1("Partition is too small (size: %I64u MB), required disk space is %lu MB\n", size, RequiredPartitionDiskSpace); + return FALSE; + } + else { return TRUE; } - - /* check for partitioned space */ - m2 = PartEntry->PartInfo[0].PartitionLength.QuadPart; - m2 = (m2 + (1 << 19)) >> 20; /* in MBytes (rounded) */ - if (m2 < RequiredPartitionDiskSpace) - { - /* partition is too small so ask for another partion */ - DPRINT1("Partition is too small(unpartitioned: %I64u MB, partitioned: %I64u MB), required disk space is %lu MB\n", m1, m2, RequiredPartitionDiskSpace); - return FALSE; - } - else - { - return TRUE; - } -} -#endif +} static PAGE_NUMBER @@ -1513,17 +1502,17 @@ { if (AutoPartition) { -#if 0 - if (!IsDiskSizeValid(PartitionList->CurrentPartition)) - { - MUIDisplayError(ERROR_INSUFFICIENT_DISKSPACE, Ir, POPUP_WAIT_ANY_KEY); - return SELECT_PARTITION_PAGE; /* let the user select another partition */ - } -#endif CreatePrimaryPartition(PartitionList, PartitionList->CurrentPartition->SectorCount.QuadPart, TRUE); + if (!IsDiskSizeValid(PartitionList->CurrentPartition)) + { + MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY, + RequiredPartitionDiskSpace); + return SELECT_PARTITION_PAGE; /* let the user select another partition */ + } + DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter; return SELECT_FILE_SYSTEM_PAGE; @@ -1531,13 +1520,13 @@ } else { -#if 0 if (!IsDiskSizeValid(PartitionList->CurrentPartition)) { - MUIDisplayError(ERROR_INSUFFICIENT_DISKSPACE, Ir, POPUP_WAIT_ANY_KEY); + MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY, + RequiredPartitionDiskSpace); return SELECT_PARTITION_PAGE; /* let the user select another partition */ } -#endif + DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter; return SELECT_FILE_SYSTEM_PAGE; @@ -1609,13 +1598,6 @@ } else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RETURN) /* ENTER */ { -#if 0 - if (!IsDiskSizeValid(PartitionList->CurrentPartition)) - { - MUIDisplayError(ERROR_INSUFFICIENT_DISKSPACE, Ir, POPUP_WAIT_ANY_KEY); - return SELECT_PARTITION_PAGE; /* let the user select another partition */ - } -#endif if (IsContainerPartition(PartitionList->CurrentPartition->PartitionType)) continue; //return SELECT_PARTITION_PAGE; @@ -1625,6 +1607,13 @@ CreatePrimaryPartition(PartitionList, 0ULL, TRUE); + } + + if (!IsDiskSizeValid(PartitionList->CurrentPartition)) + { + MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY, + RequiredPartitionDiskSpace); + return SELECT_PARTITION_PAGE; /* let the user select another partition */ } DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter; Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1506,8 +1506,10 @@ "ENTER = à¥§ ¯ãáª ¥ ª®¬¯îâêà " }, { - //ERROR_INSUFFICIENT_DISKSPACE, - " ¨§¡à ¨ï ¤ï« ï¬ ¤®áâ âêç® á¢®¡®¤® ¯à®áâà áâ¢®.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * â¨á¥â¥ ª« ¢¨è, § ¤ ¯à®¤ê«¦¨â¥.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/bn-BD.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bn-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1493,8 +1493,10 @@ "ENTER = Reboot computer" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Not enough free space in the selected partition.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Press any key to continue.", NULL }, 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 Dec 27 12:33:59 2014 @@ -1501,8 +1501,10 @@ "ENTER = Restartovat po¡ta" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Na zvolenm odd¡lu nen¡ dost volnho m¡sta.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Pokraujte stisknut¡m libovoln kl vesy.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1497,9 +1497,10 @@ "EINGABETASTE = Computer neu starten" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Es ist nicht gengend Speicherplatz auf der\n" - "gewhlten Partition vorhanden.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "Die gewhlten Partition ist nicht groá genug, um ReactOS zu installieren.\n" + "Die Installationspartition muss mindestens %lu MB groá sein.\n" + "\n" " * Eine beliebige Taste zum Fortsetzen drcken.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1493,8 +1493,10 @@ "ENTER = Reboot computer" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Not enough free space in the selected partition.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Press any key to continue.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1501,8 +1501,10 @@ "ENTER = Reiniciar el equipo" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "No hay suficiente espacio disponible en la partici¢n seleccionada.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Presione una tecla para continuar.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1491,8 +1491,10 @@ "ENTER = Taaskivita arvuti" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Valitud partitsioonil pole piisavalt ruumi.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Vajuta suvalist klahvi, et jtkata.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1506,8 +1506,10 @@ "ENTRE = Redmarrer l'ordinateur" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Pas assez d'espace libre dans la partition slectionne.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Appuyer sur une touche pour continuer.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/he-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1494,8 +1494,10 @@ "ENTER = Reboot computer" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Not enough free space in the selected partition.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Press any key to continue.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1495,8 +1495,10 @@ "INVIO = Riavviare il computer" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Lo spazio disponibile nella partizione selezionata insufficiente.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Premere un tasto qualsiasi per continuare.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1495,8 +1495,10 @@ "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Not enough free space in the selected partition.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Press any key to continue.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1503,8 +1503,10 @@ "ENTER = Reboot computer" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Not enough free space in the selected partition.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Press any key to continue.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1539,8 +1539,10 @@ "ENTER = Computer opnieuw opstarten" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Onvoldoende vrije ruimte in de geselecteerde partitie.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Druk op een toets om door te gaan.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1503,8 +1503,10 @@ "ENTER = Restart komputera" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Brak wystarczaj¥cej wolnej przestrzeni w wybranej partycji.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Nacinij dowolny klawisz, aby kontynuowa.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/pt-BR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1531,8 +1531,10 @@ "ENTER=Reiniciar" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "NÆo h espao suficiente na partiÆo selecionada.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Pressione qualquer tecla para continuar.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ro-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1570,9 +1570,10 @@ "ENTER = Repornire calculator" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Pe partiîia selectatÇ nu existÇ suficient\n" - "spaîiu liber." + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Tastaîi pentru a continua.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1495,8 +1495,10 @@ "ENTER = Reboot computer" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Not enough free space in the selected partition.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Press any key to continue.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1505,8 +1505,10 @@ "ENTER = Reçtart po¡taa" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Na zvolenej part¡cii nie je dostatok vonho miesta.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Pokraujte stlaen¡m ubovonho kl vesu.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/sq-AL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sq-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1498,8 +1498,10 @@ "ENTER = Ristarto kompjuterin" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Jo mjaft hapesir e lir n particionin e przgjedhur.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Shtypni nj tast cfardo pr t vazhduar.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1501,8 +1501,10 @@ "ENTER = Starta om datorn" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Inte tillrckligt mycket fritt utrymme p den valda partitionen.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Tryck valfri tangent fr att fortstta.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/tr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1481,8 +1481,10 @@ "Giri = Bilgisayar Yeniden Balat" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "Seili blmde yeterli bo alan yok.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * Srdrmek iin bir d§meye basnz.", NULL }, Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -1501,8 +1501,10 @@ "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { - //ERROR_INSUFFICIENT_DISKSPACE, - "¥¤®áâ âì® ¢i«ì®£® ¬iáæï ®¡à ®¬ã à®§¤i«i.\n" + //ERROR_INSUFFICIENT_PARTITION_SIZE, + "The selected partition is not large enough to install ReactOS.\n" + "The install partition must have a size of at least %lu MB.\n" + "\n" " * â¨áiâì ¡ã¤ì-ïªã ª« ¢ièã ¤«ï ¯à®¤®¢¦¥ï.", NULL }, Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -213,9 +213,12 @@ MUIDisplayError( IN ULONG ErrorNum, OUT PINPUT_RECORD Ir, - IN ULONG WaitEvent) + IN ULONG WaitEvent, + ...) { const MUI_ERROR * entry; + CHAR Buffer[2048]; + va_list ap; if (ErrorNum >= ERROR_LAST_ERROR_CODE) { @@ -237,7 +240,11 @@ return; } - PopupError(entry[ErrorNum].ErrorText, + va_start(ap, WaitEvent); + vsprintf(Buffer, entry[ErrorNum].ErrorText, ap); + va_end(ap); + + PopupError(Buffer, entry[ErrorNum].ErrorStatus, Ir, WaitEvent); Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] Sat Dec 27 12:33:59 2014 @@ -69,7 +69,8 @@ MUIDisplayError( ULONG ErrorNum, PINPUT_RECORD Ir, - ULONG WaitEvent); + ULONG WaitEvent, + ...); LPCWSTR MUIDefaultKeyboardLayout(VOID); 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 Dec 27 12:33:59 2014 @@ -13,7 +13,7 @@ [DiskSpaceRequirements] ; Required free system partition disk space in MB -FreeSysPartDiskSpace=350 +FreeSysPartDiskSpace=550 [SourceDisksFiles] acpi.sys=,,,,,,,,,,,,4

1 0

[ekohl] 65846: [USETUP] AddPartitionToDisk: Initialize DiskEntry pointer for existing partition entries.
by ekohl＠svn.reactos.org 27 Dec '14

27 Dec '14

Author: ekohl Date: Sat Dec 27 10:15:32 2014 New Revision: 65846 URL: http://svn.reactos.org/svn/reactos?rev=65846&view=rev Log: [USETUP] AddPartitionToDisk: Initialize DiskEntry pointer for existing partition entries. Modified: trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sat Dec 27 10:15:32 2014 @@ -542,6 +542,8 @@ return; } + PartEntry->DiskEntry = DiskEntry; + PartEntry->StartSector.QuadPart = (ULONGLONG)PartitionInfo->StartingOffset.QuadPart / DiskEntry->BytesPerSector; PartEntry->SectorCount.QuadPart = (ULONGLONG)PartitionInfo->PartitionLength.QuadPart / DiskEntry->BytesPerSector;

1 0

[jimtabor] 65845: [Win32ss] - Add header for Ime information. Setup support for Ime types and hot keys. - Finish keyboard processing changes and call Imm process key for callback to user mode.
by jimtabor＠svn.reactos.org 27 Dec '14

27 Dec '14

Author: jimtabor Date: Sat Dec 27 06:59:29 2014 New Revision: 65845 URL: http://svn.reactos.org/svn/reactos?rev=65845&view=rev Log: [Win32ss] - Add header for Ime information. Setup support for Ime types and hot keys. - Finish keyboard processing changes and call Imm process key for callback to user mode. Modified: trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/pch.h trunk/reactos/win32ss/user/ntuser/ime.c trunk/reactos/win32ss/user/ntuser/input.h trunk/reactos/win32ss/user/ntuser/kbdlayout.c trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/win32.h trunk/reactos/win32ss/user/winsrv/winsrv.h Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Sat Dec 27 06:59:29 2014 @@ -1097,6 +1097,26 @@ #define CURSORF_SECRET 0x0080 #define CURSORF_LINKED 0x0100 #define CURSORF_CURRENT 0x0200 + +typedef struct tagIMEINFOEX +{ + HKL hkl; + IMEINFO ImeInfo; + WCHAR wszUIClass[16]; + ULONG fdwInitConvMode; + INT fInitOpen; + INT fLoadFlag; + DWORD dwProdVersion; + DWORD dwImeWinVersion; + WCHAR wszImeDescription[50]; + WCHAR wszImeFile[80]; + struct + { + INT fSysWow64Only:1; + INT fCUASLayer:1; + }; +} IMEINFOEX, *PIMEINFOEX; + DWORD NTAPI @@ -2149,7 +2169,7 @@ DWORD NTAPI NtUserGetImeInfoEx( - DWORD dwUnknown1, + PIMEINFOEX pImeInfoEx, DWORD dwUnknown2); DWORD @@ -2929,7 +2949,7 @@ DWORD NTAPI NtUserSetImeInfoEx( - DWORD dwUnknown1); + PIMEINFOEX pImeInfoEx); DWORD NTAPI Modified: trunk/reactos/win32ss/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/pch.h?rev=65845&r1… ============================================================================== --- trunk/reactos/win32ss/pch.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/pch.h [iso-8859-1] Sat Dec 27 06:59:29 2014 @@ -59,6 +59,7 @@ #include <prntfont.h> #define _NOCSECT_TYPE #include <ddrawi.h> +#include <imm.h> /* SEH support with PSEH */ #include <pseh/pseh2.h> Modified: trunk/reactos/win32ss/user/ntuser/ime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ime.c?… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ime.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ime.c [iso-8859-1] Sat Dec 27 06:59:29 2014 @@ -7,7 +7,34 @@ */ #include <win32k.h> -//DBG_DEFAULT_CHANNEL(UserMisc); +DBG_DEFAULT_CHANNEL(UserMisc); + + +UINT FASTCALL +IntImmProcessKey(PUSER_MESSAGE_QUEUE MessageQueue, PWND pWnd, UINT Msg, WPARAM wParam, LPARAM lParam) +{ + PKL pKbdLayout; + + ASSERT_REFS_CO(pWnd); + + if ( Msg == WM_KEYDOWN || + Msg == WM_SYSKEYDOWN || + Msg == WM_KEYUP || + Msg == WM_SYSKEYUP ) + { + //Vk = wParam & 0xff; + pKbdLayout = pWnd->head.pti->KeyboardLayout; + if (pKbdLayout == NULL) return 0; + // + if (!(gpsi->dwSRVIFlags & SRVINFO_IMM32)) return 0; + // need ime.h! + } + // Call User32: + // Anything but BOOL! + //ImmRet = co_IntImmProcessKey(UserHMGetHandle(pWnd), pKbdLayout->hkl, Vk, lParam, HotKey); + FIXME(" is UNIMPLEMENTED.\n"); + return 0; +} DWORD @@ -82,7 +109,7 @@ DWORD APIENTRY NtUserGetImeInfoEx( - DWORD dwUnknown1, + PIMEINFOEX pImeInfoEx, DWORD dwUnknown2) { STUB; @@ -103,7 +130,7 @@ DWORD APIENTRY NtUserSetImeInfoEx( - DWORD dwUnknown1) + PIMEINFOEX pImeInfoEx) { STUB; return 0; Modified: trunk/reactos/win32ss/user/ntuser/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/input.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/input.h [iso-8859-1] Sat Dec 27 06:59:29 2014 @@ -35,7 +35,7 @@ UINT iBaseCharset; USHORT CodePage; WCHAR wchDiacritic; - //PIMEINFOEX piiex; + PIMEINFOEX piiex; } KL, *PKL; typedef struct _ATTACHINFO @@ -81,6 +81,11 @@ VOID NTAPI UserProcessMouseInput(PMOUSE_INPUT_DATA pMouseInputData); BOOL NTAPI UserSendMouseInput(MOUSEINPUT *pMouseInput, BOOL bInjected); +/* IMM */ +UINT FASTCALL IntImmProcessKey(PUSER_MESSAGE_QUEUE, PWND, UINT, WPARAM, LPARAM); + +extern DWORD gSystemFS; +extern UINT gSystemCPCharSet; extern HANDLE ghKeyboardDevice; extern PTHREADINFO ptiRawInput; extern BYTE gafAsyncKeyState[256 * 2 / 8]; // 2 bits per key Modified: trunk/reactos/win32ss/user/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/kbdlay… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/kbdlayout.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/kbdlayout.c [iso-8859-1] Sat Dec 27 06:59:29 2014 @@ -16,6 +16,8 @@ PKL gspklBaseLayout = NULL; PKBDFILE gpkfList = NULL; +DWORD gSystemFS = 0; +UINT gSystemCPCharSet = 0; typedef PVOID (*PFN_KBDLAYERDESCRIPTOR)(VOID); @@ -247,6 +249,13 @@ pKl->CodePage = CP_ACP; } + // Set initial system character set and font signature. + if (gSystemFS == 0) + { + gSystemCPCharSet = pKl->iBaseCharset; + gSystemFS = pKl->dwFontSigs; + } + return pKl; } Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Sat Dec 27 06:59:29 2014 @@ -1028,8 +1028,13 @@ NTSTATUS FASTCALL co_MsqSendMessage(PTHREADINFO ptirec, - HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam, - UINT uTimeout, BOOL Block, INT HookMessage, + HWND Wnd, + UINT Msg, + WPARAM wParam, + LPARAM lParam, + UINT uTimeout, + BOOL Block, + INT HookMessage, ULONG_PTR *uResult) { PTHREADINFO pti; @@ -1790,8 +1795,14 @@ EVENTMSG Event; USER_REFERENCE_ENTRY Ref; PWND pWnd; + UINT ImmRet; BOOL Ret = TRUE; PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); + + if (Msg->message == VK_PACKET) + { + pti->wchInjected = HIWORD(Msg->wParam); + } if (Msg->message == WM_KEYDOWN || Msg->message == WM_SYSKEYDOWN || Msg->message == WM_KEYUP || Msg->message == WM_SYSKEYUP) @@ -1863,6 +1874,22 @@ Ret = FALSE; } + + if ( pWnd && Ret && *RemoveMessages && Msg->message == WM_KEYDOWN && !(pti->TIF_flags & TIF_DISABLEIME)) + { + if ( (ImmRet = IntImmProcessKey(pti->MessageQueue, pWnd, Msg->message, Msg->wParam, Msg->lParam)) ) + { + if ( ImmRet & (IPHK_HOTKEY|IPHK_SKIPTHISKEY) ) + { + ImmRet = 0; + } + if ( ImmRet & IPHK_PROCESSBYIME ) + { + Msg->wParam = VK_PROCESSKEY; + } + } + } + if (pWnd) UserDerefObjectCo(pWnd); return Ret; } Modified: trunk/reactos/win32ss/user/ntuser/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/win32.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] Sat Dec 27 06:59:29 2014 @@ -53,6 +53,7 @@ extern BOOL RegisteredSysClasses; typedef struct _WIN32HEAP WIN32HEAP, *PWIN32HEAP; +typedef struct tagMENUSTATE MENUSTATE, *PMENUSTATE; #include <pshpack1.h> // FIXME: Move to ntuser.h @@ -105,6 +106,7 @@ HDESK hdesk; UINT cPaintsReady; /* Count of paints pending. */ UINT cTimersReady; /* Count of timers pending. */ + PMENUSTATE pMenuState; DWORD dwExpWinVer; DWORD dwCompatFlags; DWORD dwCompatFlags2; @@ -125,7 +127,8 @@ /* Queue of messages posted to the queue. */ LIST_ENTRY PostedMessagesListHead; // mlPost - UINT fsChangeBitsRemoved; + WORD fsChangeBitsRemoved; + WCHAR wchInjected; UINT cWindows; UINT cVisWindows; LIST_ENTRY aphkStart[NB_HOOKS]; Modified: trunk/reactos/win32ss/user/winsrv/winsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/winsrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/winsrv.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/winsrv.h [iso-8859-1] Sat Dec 27 06:59:29 2014 @@ -21,6 +21,7 @@ #include <winbase.h> #include <wingdi.h> #include <winuser.h> +#include <imm.h> /* Undocumented user definitions */ #include <undocuser.h>

1 0

[jimtabor] 65844: [w32knapi] - Add Imm.h.
by jimtabor＠svn.reactos.org 27 Dec '14

27 Dec '14

Author: jimtabor Date: Sat Dec 27 06:33:48 2014 New Revision: 65844 URL: http://svn.reactos.org/svn/reactos?rev=65844&view=rev Log: [w32knapi] - Add Imm.h. Modified: trunk/rostests/apitests/w32knapi/w32knapi.h Modified: trunk/rostests/apitests/w32knapi/w32knapi.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.h [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.h [iso-8859-1] Sat Dec 27 06:33:48 2014 @@ -16,6 +16,7 @@ #include <winddi.h> #include <ddrawi.h> #include <prntfont.h> +#include <imm.h> /* Public Win32K Headers */ #include <ntusrtyp.h>

1 0

[jimtabor] 65843: [Include] - Add mod switch for SAS hotkey support. - Add ImmProcessKey return flags, works the same as ImmProcessHotKey for WinCE.
by jimtabor＠svn.reactos.org 27 Dec '14

27 Dec '14

Author: jimtabor Date: Sat Dec 27 04:18:17 2014 New Revision: 65843 URL: http://svn.reactos.org/svn/reactos?rev=65843&view=rev Log: [Include] - Add mod switch for SAS hotkey support. - Add ImmProcessKey return flags, works the same as ImmProcessHotKey for WinCE. Modified: trunk/reactos/include/reactos/undocuser.h Modified: trunk/reactos/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocuser.… ============================================================================== --- trunk/reactos/include/reactos/undocuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/undocuser.h [iso-8859-1] Sat Dec 27 04:18:17 2014 @@ -107,12 +107,21 @@ #define LN_MESSAGE_BEEP 0x9 #define LN_START_SCREENSAVE 0xA +// From WinCE 6.0 Imm.h SDK +// Returns for ImmProcessHotKey +#define IPHK_HOTKEY 0x0001 +#define IPHK_PROCESSBYIME 0x0002 +#define IPHK_CHECKCTRL 0x0004 +#define IPHK_SKIPTHISKEY 0x0010 + // // Undocumented flags for DrawCaptionTemp // #define DC_NOSENDMSG 0x2000 #define STARTF_SCRNSAVER 0x80000000 + +#define MOD_WINLOGON_SAS 0x8000 #define CW_USEDEFAULT16 ((short)0x8000)

1 0

[jimtabor] 65842: [Win32k] - Move IME from stubs into its own file. Add flags and types to main header. - Later, how to add Ime.h from mingw (tested it and works) and not effect VC++ ? VC SDK has I...
by jimtabor＠svn.reactos.org 27 Dec '14

27 Dec '14

Author: jimtabor Date: Sat Dec 27 03:00:09 2014 New Revision: 65842 URL: http://svn.reactos.org/svn/reactos?rev=65842&view=rev Log: [Win32k] - Move IME from stubs into its own file. Add flags and types to main header. - Later, how to add Ime.h from mingw (tested it and works) and not effect VC++ ? VC SDK has Ime.h. - Getting ready for Window Class update based on current wine tests. Added: trunk/reactos/win32ss/user/ntuser/ime.c - copied, changed from r65841, trunk/reactos/win32ss/user/ntuser/ntstubs.c Modified: trunk/reactos/win32ss/CMakeLists.txt trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/ntstubs.c Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Sat Dec 27 03:00:09 2014 @@ -116,6 +116,7 @@ user/ntuser/hook.c user/ntuser/hotkey.c user/ntuser/input.c + user/ntuser/ime.c user/ntuser/keyboard.c user/ntuser/kbdlayout.c user/ntuser/menu.c Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Sat Dec 27 03:00:09 2014 @@ -6,6 +6,9 @@ struct _DESKTOP; struct _WND; struct tagPOPUPMENU; +#ifndef HIMC +typedef HANDLE HIMC; +#endif #define FIRST_USER_HANDLE 0x0020 /* first possible value for low word of user handle */ #define LAST_USER_HANDLE 0xffef /* last possible value for low word of user handle */ @@ -679,7 +682,7 @@ /* Size of the extra data associated with the window. */ ULONG cbwndExtra; struct _WND *spwndLastActive; - //HIMC hImc; // Input context associated with this window. + HIMC hImc; // Input context associated with this window. LONG dwUserData; PVOID pActCtx; //PD3DMATRIX pTransForm; @@ -863,6 +866,8 @@ #define COLOR_LAST COLOR_MENUBAR #define MAX_MB_STRINGS 11 +#define SRVINFO_DBCSENABLED 0x0002 +#define SRVINFO_IMM32 0x0004 #define SRVINFO_APIHOOK 0x0010 #define SRVINFO_METRICS 0x0020 #define SRVINFO_KBDPREF 0x0080 @@ -1613,7 +1618,7 @@ NTAPI NtUserCheckImeHotKey( DWORD dwUnknown1, - DWORD dwUnknown2); + LPARAM dwUnknown2); HWND NTAPI NtUserChildWindowFromPointEx( Copied: trunk/reactos/win32ss/user/ntuser/ime.c (from r65841, trunk/reactos/win32ss/user/ntuser/ntstubs.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ime.c?… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ime.c [iso-8859-1] Sat Dec 27 03:00:09 2014 @@ -1,172 +1,14 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Win32k subsystem - * PURPOSE: Native User stubs - * FILE: subsystems/win32/win32k/ntuser/ntstubs.c + * PURPOSE: Input Method Editor and Input Method Manager support + * FILE: win32ss/user/ntuser/ime.c * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ #include <win32k.h> -DBG_DEFAULT_CHANNEL(UserMisc); +//DBG_DEFAULT_CHANNEL(UserMisc); -DWORD -APIENTRY -NtUserAssociateInputContext( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3) -{ - STUB - return 0; -} - -// -// Works like BitBlt, http://msdn.microsoft.com/en-us/library/ms532278(VS.85).aspx -// -BOOL -APIENTRY -NtUserBitBltSysBmp( - HDC hdc, - INT nXDest, - INT nYDest, - INT nWidth, - INT nHeight, - INT nXSrc, - INT nYSrc, - DWORD dwRop ) -{ - BOOL Ret = FALSE; - UserEnterExclusive(); - - Ret = NtGdiBitBlt( hdc, - nXDest, - nYDest, - nWidth, - nHeight, - hSystemBM, - nXSrc, - nYSrc, - dwRop, - 0, - 0); - - UserLeave(); - return Ret; -} - -DWORD -APIENTRY -NtUserBuildHimcList( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4) -{ - STUB; - return 0; -} - -BOOL -APIENTRY -NtUserDdeGetQualityOfService( - IN HWND hwndClient, - IN HWND hWndServer, - OUT PSECURITY_QUALITY_OF_SERVICE pqosPrev) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserDdeInitialize( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4) -{ - STUB - - return 0; -} - -BOOL -APIENTRY -NtUserDdeSetQualityOfService( - IN HWND hwndClient, - IN PSECURITY_QUALITY_OF_SERVICE pqosNew, - OUT PSECURITY_QUALITY_OF_SERVICE pqosPrev) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserDragObject( - HWND hwnd1, - HWND hwnd2, - UINT u1, - DWORD dw1, - HCURSOR hc1 -) -{ - STUB - - return 0; -} - -BOOL -APIENTRY -NtUserDrawAnimatedRects( - HWND hwnd, - INT idAni, - RECT *lprcFrom, - RECT *lprcTo) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserEvent( - DWORD Unknown0) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserExcludeUpdateRgn( - HDC hDC, - HWND hWnd) -{ - STUB - - return 0; -} - -BOOL -APIENTRY -NtUserGetAltTabInfo( - HWND hwnd, - INT iItem, - PALTTABINFO pati, - LPWSTR pszItemText, - UINT cchItemText, - BOOL Ansi) -{ - STUB - - return 0; -} DWORD APIENTRY @@ -175,116 +17,6 @@ DWORD Unknown1, DWORD Unknown2, DWORD Unknown3) -{ - STUB - - return 0; -} - -BOOL -APIENTRY -NtUserImpersonateDdeClientWindow( - HWND hWndClient, - HWND hWndServer) -{ - STUB - - return 0; -} - -NTSTATUS -APIENTRY -NtUserInitializeClientPfnArrays( - PPFNCLIENT pfnClientA, - PPFNCLIENT pfnClientW, - PPFNCLIENTWORKER pfnClientWorker, - HINSTANCE hmodUser) -{ - NTSTATUS Status = STATUS_SUCCESS; - TRACE("Enter NtUserInitializeClientPfnArrays User32 0x%p\n", hmodUser); - - if (ClientPfnInit) return Status; - - UserEnterExclusive(); - - _SEH2_TRY - { - ProbeForRead( pfnClientA, sizeof(PFNCLIENT), 1); - ProbeForRead( pfnClientW, sizeof(PFNCLIENT), 1); - ProbeForRead( pfnClientWorker, sizeof(PFNCLIENTWORKER), 1); - RtlCopyMemory(&gpsi->apfnClientA, pfnClientA, sizeof(PFNCLIENT)); - RtlCopyMemory(&gpsi->apfnClientW, pfnClientW, sizeof(PFNCLIENT)); - RtlCopyMemory(&gpsi->apfnClientWorker, pfnClientWorker, sizeof(PFNCLIENTWORKER)); - - //// FIXME: HAX! Temporary until server side is finished. - //// Copy the client side procs for now. - RtlCopyMemory(&gpsi->aStoCidPfn, pfnClientW, sizeof(gpsi->aStoCidPfn)); - - hModClient = hmodUser; - ClientPfnInit = TRUE; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status =_SEH2_GetExceptionCode(); - } - _SEH2_END - - if (!NT_SUCCESS(Status)) - { - ERR("Failed reading Client Pfns from user space.\n"); - SetLastNtError(Status); - } - - UserLeave(); - return Status; -} - -DWORD -APIENTRY -NtUserInitTask( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5, - DWORD Unknown6, - DWORD Unknown7, - DWORD Unknown8, - DWORD Unknown9, - DWORD Unknown10, - DWORD Unknown11) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserMNDragLeave(VOID) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserMNDragOver( - DWORD Unknown0, - DWORD Unknown1) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserModifyUserStartupInfoFlags( - DWORD Unknown0, - DWORD Unknown1) { STUB @@ -303,51 +35,6 @@ return 0; } -DWORD -APIENTRY -NtUserQueryUserCounters( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserRegisterTasklist( - DWORD Unknown0) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserSetConsoleReserveKeys( - DWORD Unknown0, - DWORD Unknown1) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserSetDbgTag( - DWORD Unknown0, - DWORD Unknown1) -{ - STUB - - return 0; -} DWORD APIENTRY @@ -363,249 +50,16 @@ return 0; } - -DWORD -APIENTRY -NtUserSetRipFlags( - DWORD Unknown0, - DWORD Unknown1) -{ - STUB - - return 0; -} - -BOOL -APIENTRY -NtUserSetSysColors( - int cElements, - IN CONST INT *lpaElements, - IN CONST COLORREF *lpaRgbValues, - FLONG Flags) -{ - DWORD Ret = TRUE; - - if (cElements == 0) - return TRUE; - - /* We need this check to prevent overflow later */ - if ((ULONG)cElements >= 0x40000000) - { - EngSetLastError(ERROR_NOACCESS); - return FALSE; - } - - UserEnterExclusive(); - - _SEH2_TRY - { - ProbeForRead(lpaElements, cElements * sizeof(INT), 1); - ProbeForRead(lpaRgbValues, cElements * sizeof(COLORREF), 1); - - IntSetSysColors(cElements, lpaElements, lpaRgbValues); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - SetLastNtError(_SEH2_GetExceptionCode()); - Ret = FALSE; - } - _SEH2_END; - - if (Ret) - { - UserSendNotifyMessage(HWND_BROADCAST, WM_SYSCOLORCHANGE, 0, 0); - - UserRedrawDesktop(); - } - - UserLeave(); - return Ret; -} - -DWORD -APIENTRY -NtUserUpdateInputContext( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserUpdateInstance( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - STUB - - return 0; -} - -BOOL -APIENTRY -NtUserUserHandleGrantAccess( - IN HANDLE hUserHandle, - IN HANDLE hJob, - IN BOOL bGrant) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserWaitForMsgAndEvent( - DWORD Unknown0) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserWin32PoolAllocationStats( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserYieldTask(VOID) -{ - STUB - - return 0; -} - - DWORD APIENTRY NtUserCheckImeHotKey( - DWORD dwUnknown1, - DWORD dwUnknown2) + DWORD VirtualKey, + LPARAM lParam) { STUB; return 0; } -NTSTATUS -APIENTRY -NtUserConsoleControl( - IN CONSOLECONTROL ConsoleCtrl, - IN PVOID ConsoleCtrlInfo, - IN ULONG ConsoleCtrlInfoLength) -{ - NTSTATUS Status = STATUS_SUCCESS; - - /* Allow only Console Server to perform this operation (via CSRSS) */ - if (PsGetCurrentProcess() != gpepCSRSS) - return STATUS_ACCESS_DENIED; - - UserEnterExclusive(); - - switch (ConsoleCtrl) - { - case GuiConsoleWndClassAtom: - { - if (ConsoleCtrlInfoLength != sizeof(ATOM)) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } - - _SEH2_TRY - { - ProbeForRead(ConsoleCtrlInfo, ConsoleCtrlInfoLength, 1); - gaGuiConsoleWndClass = *(ATOM*)ConsoleCtrlInfo; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - break; - } - - case ConsoleMakePalettePublic: - { - HPALETTE hPalette; - - if (ConsoleCtrlInfoLength != sizeof(HPALETTE)) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } - - _SEH2_TRY - { - ProbeForRead(ConsoleCtrlInfo, ConsoleCtrlInfoLength, 1); - hPalette = *(HPALETTE*)ConsoleCtrlInfo; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - /* Make the palette handle public */ - GreSetObjectOwnerEx(hPalette, - GDI_OBJ_HMGR_PUBLIC, - GDIOBJFLAG_IGNOREPID); - - break; - } - - case ConsoleAcquireDisplayOwnership: - { - ERR("NtUserConsoleControl - ConsoleAcquireDisplayOwnership is UNIMPLEMENTED\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - - default: - ERR("Calling invalid control %lu in NtUserConsoleControl\n", ConsoleCtrl); - Status = STATUS_INVALID_INFO_CLASS; - break; - } - - UserLeave(); - - return Status; -} - -DWORD -APIENTRY -NtUserCreateInputContext( - DWORD dwUnknown1) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserDestroyInputContext( - DWORD dwUnknown1) -{ - STUB; - return 0; -} DWORD APIENTRY @@ -635,247 +89,6 @@ return 0; } -DWORD -APIENTRY -NtUserGetRawInputBuffer( - PRAWINPUT pData, - PUINT pcbSize, - UINT cbSizeHeader) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserGetRawInputData( - HRAWINPUT hRawInput, - UINT uiCommand, - LPVOID pData, - PUINT pcbSize, - UINT cbSizeHeader) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserGetRawInputDeviceInfo( - HANDLE hDevice, - UINT uiCommand, - LPVOID pData, - PUINT pcbSize -) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserGetRawInputDeviceList( - PRAWINPUTDEVICELIST pRawInputDeviceList, - PUINT puiNumDevices, - UINT cbSize) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserGetRegisteredRawInputDevices( - PRAWINPUTDEVICE pRawInputDevices, - PUINT puiNumDevices, - UINT cbSize) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserHardErrorControl( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3) -{ - STUB; - return 0; -} - -BOOL -NTAPI -NtUserNotifyProcessCreate( - HANDLE NewProcessId, - HANDLE ParentThreadId, - ULONG dwUnknown, - ULONG CreateFlags) -{ - STUB; - return FALSE; -} - -NTSTATUS -APIENTRY -NtUserProcessConnect( - IN HANDLE ProcessHandle, - OUT PUSERCONNECT pUserConnect, - IN ULONG Size) -{ - NTSTATUS Status; - PEPROCESS Process = NULL; - PPROCESSINFO W32Process; - - TRACE("NtUserProcessConnect\n"); - - if ( pUserConnect == NULL || - Size != sizeof(*pUserConnect) ) - { - return STATUS_UNSUCCESSFUL; - } - - /* Get the process object the user handle was referencing */ - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_OPERATION, - *PsProcessType, - UserMode, - (PVOID*)&Process, - NULL); - if (!NT_SUCCESS(Status)) return Status; - - UserEnterShared(); - - /* Get Win32 process information */ - W32Process = PsGetProcessWin32Process(Process); - - _SEH2_TRY - { - // FIXME: Check that pUserConnect->ulVersion == USER_VERSION; - - ProbeForWrite(pUserConnect, sizeof(*pUserConnect), sizeof(PVOID)); - pUserConnect->siClient.psi = gpsi; - pUserConnect->siClient.aheList = gHandleTable; - pUserConnect->siClient.ulSharedDelta = - (ULONG_PTR)W32Process->HeapMappings.KernelMapping - - (ULONG_PTR)W32Process->HeapMappings.UserMapping; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) - SetLastNtError(Status); - - UserLeave(); - - /* Dereference the process object */ - ObDereferenceObject(Process); - - return Status; -} - -NTSTATUS -APIENTRY -NtUserQueryInformationThread(IN HANDLE ThreadHandle, - IN USERTHREADINFOCLASS ThreadInformationClass, - OUT PVOID ThreadInformation, - IN ULONG ThreadInformationLength) -{ - NTSTATUS Status = STATUS_SUCCESS; - PETHREAD Thread; - - /* Allow only CSRSS to perform this operation */ - if (PsGetCurrentProcess() != gpepCSRSS) - return STATUS_ACCESS_DENIED; - - UserEnterExclusive(); - - /* Get the Thread */ - Status = ObReferenceObjectByHandle(ThreadHandle, - THREAD_QUERY_INFORMATION, - *PsThreadType, - UserMode, - (PVOID)&Thread, - NULL); - if (!NT_SUCCESS(Status)) goto Quit; - - switch (ThreadInformationClass) - { - default: - { - STUB; - Status = STATUS_NOT_IMPLEMENTED; - break; - } - } - - ObDereferenceObject(Thread); - -Quit: - UserLeave(); - return Status; -} - -DWORD -APIENTRY -NtUserQueryInputContext( - DWORD dwUnknown1, - DWORD dwUnknown2) -{ - STUB; - return 0; -} - -BOOL -APIENTRY -NtUserRealInternalGetMessage( - LPMSG lpMsg, - HWND hWnd, - UINT wMsgFilterMin, - UINT wMsgFilterMax, - UINT wRemoveMsg, - BOOL bGMSG) -{ - STUB; - return 0; -} - -BOOL -APIENTRY -NtUserRealWaitMessageEx( - DWORD dwWakeMask, - UINT uTimeout) -{ - STUB; - return 0; -} - -BOOL -APIENTRY -NtUserRegisterRawInputDevices( - IN PCRAWINPUTDEVICE pRawInputDevices, - IN UINT uiNumDevices, - IN UINT cbSize) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserResolveDesktop( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4) -{ - STUB; - return 0; -} DWORD APIENTRY @@ -896,260 +109,6 @@ return 0; } -DWORD -APIENTRY -NtUserSetInformationProcess( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4) -{ - STUB; - return 0; -} - -NTSTATUS -APIENTRY -NtUserSetInformationThread(IN HANDLE ThreadHandle, - IN USERTHREADINFOCLASS ThreadInformationClass, - IN PVOID ThreadInformation, - IN ULONG ThreadInformationLength) -{ - NTSTATUS Status = STATUS_SUCCESS; - PETHREAD Thread; - HANDLE CsrPortHandle; - - /* Allow only CSRSS to perform this operation */ - if (PsGetCurrentProcess() != gpepCSRSS) - return STATUS_ACCESS_DENIED; - - UserEnterExclusive(); - - /* Get the Thread */ - Status = ObReferenceObjectByHandle(ThreadHandle, - THREAD_SET_INFORMATION, - *PsThreadType, - UserMode, - (PVOID)&Thread, - NULL); - if (!NT_SUCCESS(Status)) goto Quit; - - switch (ThreadInformationClass) - { - case UserThreadInitiateShutdown: - { - ERR("Shutdown initiated\n"); - STUB; - Status = STATUS_NOT_IMPLEMENTED; - break; - } - - case UserThreadEndShutdown: - { - ERR("Shutdown ended\n"); - STUB; - Status = STATUS_NOT_IMPLEMENTED; - break; - } - - case UserThreadCsrApiPort: - { - ERR("Set CSR API Port for Win32k\n"); - - if (ThreadInformationLength != sizeof(HANDLE)) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - break; - } - - Status = STATUS_SUCCESS; - _SEH2_TRY - { - ProbeForRead(ThreadInformation, sizeof(HANDLE), sizeof(PVOID)); - CsrPortHandle = *(PHANDLE)ThreadInformation; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (NT_SUCCESS(Status)) - { - Status = InitCsrApiPort(CsrPortHandle); - } - break; - } - - default: - { - STUB; - Status = STATUS_NOT_IMPLEMENTED; - break; - } - } - - ObDereferenceObject(Thread); - -Quit: - UserLeave(); - return Status; -} - -DWORD -APIENTRY -NtUserSetThreadLayoutHandles( - DWORD dwUnknown1, - DWORD dwUnknown2) -{ - STUB; - return 0; -} - -BOOL -APIENTRY -NtUserSoundSentry(VOID) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserTestForInteractiveUser( - DWORD dwUnknown1) -{ - STUB; - return 0; -} - -/* http://www.cyber-ta.org/releases/malware-analysis/public/SOURCES/b47155634c… */ -DWORD -APIENTRY -NtUserCalcMenuBar( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4, - DWORD dwUnknown5) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserPaintMenuBar( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4, - DWORD dwUnknown5, - DWORD dwUnknown6) -{ - STUB; - return 0; -} - - -DWORD -APIENTRY -NtUserRemoteConnect( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserRemoteRedrawRectangle( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserRemoteRedrawScreen(VOID) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserRemoteStopScreenUpdates(VOID) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserCtxDisplayIOCtl( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -DWORD -APIENTRY -NtUserDrawMenuBarTemp( - HWND hWnd, - HDC hDC, - PRECT hRect, - HMENU hMenu, - HFONT hFont) -{ - /* We'll use this function just for caching the menu bar */ - STUB - return 0; -} - -/* - * FillWindow: Called from User; Dialog, Edit and ListBox procs during a WM_ERASEBKGND. - */ -/* - * @unimplemented - */ -BOOL APIENTRY -NtUserFillWindow(HWND hWndPaint, - HWND hWndPaint1, - HDC hDC, - HBRUSH hBrush) -{ - STUB - - return 0; -} - -/* - * @unimplemented - */ -BOOL APIENTRY -NtUserLockWindowUpdate(HWND hWnd) -{ - STUB - - return 0; -} - -/* - * @unimplemented - */ DWORD APIENTRY NtUserSetImeOwnerWindow(DWORD Unknown0, DWORD Unknown1) @@ -1159,172 +118,5 @@ return 0; } -BOOL -APIENTRY -NtUserGetLayeredWindowAttributes( - HWND hwnd, - COLORREF *pcrKey, - BYTE *pbAlpha, - DWORD *pdwFlags) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -BOOL APIENTRY -NtUserSetLayeredWindowAttributes(HWND hwnd, - COLORREF crKey, - BYTE bAlpha, - DWORD dwFlags) -{ - STUB; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -APIENTRY -NtUserUpdateLayeredWindow( - HWND hwnd, - HDC hdcDst, - POINT *pptDst, - SIZE *psize, - HDC hdcSrc, - POINT *pptSrc, - COLORREF crKey, - BLENDFUNCTION *pblend, - DWORD dwFlags, - RECT *prcDirty) -{ - STUB - - return 0; -} - -/* - * NtUserResolveDesktopForWOW - * - * Status - * @unimplemented - */ - -DWORD APIENTRY -NtUserResolveDesktopForWOW(DWORD Unknown0) -{ - STUB - return 0; -} - -/* - * @unimplemented - */ -BOOL APIENTRY -NtUserEndMenu(VOID) -{ - STUB - - return 0; -} - -/* - * @implemented - */ -/* NOTE: unused function */ -BOOL APIENTRY -NtUserTrackPopupMenuEx( - HMENU hMenu, - UINT fuFlags, - int x, - int y, - HWND hWnd, - LPTPMPARAMS lptpm) -{ - STUB - - return FALSE; -} - -DWORD APIENTRY -NtUserQuerySendMessage(DWORD Unknown0) -{ - STUB; - - return 0; -} - -/* - * @unimplemented - */ -DWORD APIENTRY -NtUserAlterWindowStyle(DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - STUB - - return(0); -} - -/* - * NtUserSetWindowStationUser - * - * Status - * @unimplemented - */ - -DWORD APIENTRY -NtUserSetWindowStationUser( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) -{ - STUB - - return 0; -} - -BOOL APIENTRY NtUserAddClipboardFormatListener( - HWND hwnd -) -{ - STUB; - return FALSE; -} - -BOOL APIENTRY NtUserRemoveClipboardFormatListener( - HWND hwnd -) -{ - STUB; - return FALSE; -} - -BOOL APIENTRY NtUserGetUpdatedClipboardFormats( - PUINT lpuiFormats, - UINT cFormats, - PUINT pcFormatsOut -) -{ - STUB; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -APIENTRY -NtUserSetSystemCursor( - HCURSOR hcur, - DWORD id) -{ - return FALSE; -} /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Sat Dec 27 03:00:09 2014 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Win32k subsystem * PURPOSE: Native User stubs - * FILE: subsystems/win32/win32k/ntuser/ntstubs.c + * FILE: win32ss/user/ntuser/ntstubs.c * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ @@ -162,19 +162,6 @@ LPWSTR pszItemText, UINT cchItemText, BOOL Ansi) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserGetImeHotKey( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) { STUB @@ -293,18 +280,6 @@ DWORD APIENTRY -NtUserNotifyIMEStatus( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) -{ - STUB - - return 0; -} - -DWORD -APIENTRY NtUserQueryUserCounters( DWORD Unknown0, DWORD Unknown1, @@ -348,21 +323,6 @@ return 0; } - -DWORD -APIENTRY -NtUserSetImeHotKey( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4) -{ - STUB - - return 0; -} - DWORD APIENTRY @@ -490,17 +450,6 @@ STUB return 0; -} - - -DWORD -APIENTRY -NtUserCheckImeHotKey( - DWORD dwUnknown1, - DWORD dwUnknown2) -{ - STUB; - return 0; } NTSTATUS @@ -602,34 +551,6 @@ APIENTRY NtUserDestroyInputContext( DWORD dwUnknown1) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserDisableThreadIme( - DWORD dwUnknown1) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserGetAppImeLevel( - DWORD dwUnknown1) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserGetImeInfoEx( - DWORD dwUnknown1, - DWORD dwUnknown2) { STUB; return 0; @@ -879,25 +800,6 @@ DWORD APIENTRY -NtUserSetAppImeLevel( - DWORD dwUnknown1, - DWORD dwUnknown2) -{ - STUB; - return 0; -} - -DWORD -APIENTRY -NtUserSetImeInfoEx( - DWORD dwUnknown1) -{ - STUB; - return 0; -} - -DWORD -APIENTRY NtUserSetInformationProcess( DWORD dwUnknown1, DWORD dwUnknown2, @@ -1141,18 +1043,6 @@ */ BOOL APIENTRY NtUserLockWindowUpdate(HWND hWnd) -{ - STUB - - return 0; -} - -/* - * @unimplemented - */ -DWORD APIENTRY -NtUserSetImeOwnerWindow(DWORD Unknown0, - DWORD Unknown1) { STUB

1 0

[hbelusca] 65841: Whitespace fix.
by hbelusca＠svn.reactos.org 26 Dec '14

26 Dec '14

Author: hbelusca Date: Fri Dec 26 20:55:30 2014 New Revision: 65841 URL: http://svn.reactos.org/svn/reactos?rev=65841&view=rev Log: Whitespace fix. Modified: trunk/reactos/win32ss/user/ntuser/win32.h Modified: trunk/reactos/win32ss/user/ntuser/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/win32.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] Fri Dec 26 20:55:30 2014 @@ -44,7 +44,7 @@ QSRosSendMessage, QSRosHotKey, QSRosEvent, -}QS_ROS_TYPES,*PQS_ROS_TYPES; +} QS_ROS_TYPES, *PQS_ROS_TYPES; extern BOOL ClientPfnInit; extern HINSTANCE hModClient; @@ -156,37 +156,37 @@ #define IntReferenceThreadInfo(pti) \ - InterlockedIncrement(&(pti)->RefCount) + InterlockedIncrement(&(pti)->RefCount) VOID UserDeleteW32Thread(PTHREADINFO); #define IntDereferenceThreadInfo(pti) \ - do { \ - if(InterlockedDecrement(&(pti)->RefCount) == 0) \ +do { \ + if (InterlockedDecrement(&(pti)->RefCount) == 0) \ { \ - ASSERT(((pti)->TIF_flags & (TIF_INCLEANUP|TIF_DONTATTACHQUEUE)) == (TIF_INCLEANUP|TIF_DONTATTACHQUEUE)); \ - UserDeleteW32Thread(pti); \ + ASSERT(((pti)->TIF_flags & (TIF_INCLEANUP|TIF_DONTATTACHQUEUE)) == (TIF_INCLEANUP|TIF_DONTATTACHQUEUE)); \ + UserDeleteW32Thread(pti); \ } \ - } while(0) +} while(0) #define IntReferenceProcessInfo(ppi) \ - InterlockedIncrement((volatile LONG*)(&(ppi)->RefCount)) + InterlockedIncrement((volatile LONG*)(&(ppi)->RefCount)) VOID UserDeleteW32Process(PPROCESSINFO); #define IntDereferenceProcessInfo(ppi) \ - do { \ - if(InterlockedDecrement((volatile LONG*)(&(ppi)->RefCount)) == 0) \ +do { \ + if (InterlockedDecrement((volatile LONG*)(&(ppi)->RefCount)) == 0) \ { \ - ASSERT(((ppi)->W32PF_flags & W32PF_TERMINATED) != 0); \ - UserDeleteW32Process(ppi); \ + ASSERT(((ppi)->W32PF_flags & W32PF_TERMINATED) != 0); \ + UserDeleteW32Process(ppi); \ } \ - } while(0) +} while(0) typedef struct _W32HEAP_USER_MAPPING { - struct _W32HEAP_USER_MAPPING *Next; + struct _W32HEAP_USER_MAPPING* Next; PVOID KernelMapping; PVOID UserMapping; ULONG_PTR Limit; @@ -212,63 +212,64 @@ typedef struct _W32PROCESS { - PEPROCESS peProcess; - DWORD RefCount; - ULONG W32PF_flags; - PKEVENT InputIdleEvent; - DWORD StartCursorHideTime; - struct _W32PROCESS * NextStart; - PVOID pDCAttrList; - PVOID pBrushAttrList; - DWORD W32Pid; - LONG GDIHandleCount; - LONG UserHandleCount; - PEX_PUSH_LOCK GDIPushLock; /* Locking Process during access to structure. */ - RTL_AVL_TABLE GDIEngUserMemAllocTable; /* Process AVL Table. */ - LIST_ENTRY GDIDcAttrFreeList; - LIST_ENTRY GDIBrushAttrFreeList; + PEPROCESS peProcess; + DWORD RefCount; + ULONG W32PF_flags; + PKEVENT InputIdleEvent; + DWORD StartCursorHideTime; + struct _W32PROCESS* NextStart; + PVOID pDCAttrList; + PVOID pBrushAttrList; + DWORD W32Pid; + LONG GDIHandleCount; + LONG UserHandleCount; + PEX_PUSH_LOCK GDIPushLock; /* Locking Process during access to structure. */ + RTL_AVL_TABLE GDIEngUserMemAllocTable; /* Process AVL Table. */ + LIST_ENTRY GDIDcAttrFreeList; + LIST_ENTRY GDIBrushAttrFreeList; } W32PROCESS, *PW32PROCESS; #define CLIBS 32 typedef struct _PROCESSINFO { - W32PROCESS; - PTHREADINFO ptiList; - PTHREADINFO ptiMainThread; - struct _DESKTOP* rpdeskStartup; - PCLS pclsPrivateList; - PCLS pclsPublicList; - PPROCESSINFO ppiNext; - INT cThreads; - HDESK hdeskStartup; - DWORD dwhmodLibLoadedMask; - HANDLE ahmodLibLoaded[CLIBS]; - struct _WINSTATION_OBJECT *prpwinsta; - HWINSTA hwinsta; - ACCESS_MASK amwinsta; - DWORD dwHotkey; - HMONITOR hMonitor; - struct _CURICON_OBJECT* pCursorCache; - LUID luidSession; - USERSTARTUPINFO usi; - PVOID pW32Job; - DWORD dwLayout; - DWORD dwRegisteredClasses; - /* ReactOS */ - FAST_MUTEX PrivateFontListLock; - LIST_ENTRY PrivateFontListHead; - FAST_MUTEX DriverObjListLock; - LIST_ENTRY DriverObjListHead; - struct tagKL* KeyboardLayout; // THREADINFO only - W32HEAP_USER_MAPPING HeapMappings; - struct _GDI_POOL *pPoolDcAttr; - struct _GDI_POOL *pPoolBrushAttr; - struct _GDI_POOL *pPoolRgnAttr; + W32PROCESS; + PTHREADINFO ptiList; + PTHREADINFO ptiMainThread; + struct _DESKTOP* rpdeskStartup; + PCLS pclsPrivateList; + PCLS pclsPublicList; + PPROCESSINFO ppiNext; + INT cThreads; + HDESK hdeskStartup; + DWORD dwhmodLibLoadedMask; + HANDLE ahmodLibLoaded[CLIBS]; + struct _WINSTATION_OBJECT* prpwinsta; + HWINSTA hwinsta; + ACCESS_MASK amwinsta; + DWORD dwHotkey; + HMONITOR hMonitor; + struct _CURICON_OBJECT* pCursorCache; + LUID luidSession; + USERSTARTUPINFO usi; + PVOID pW32Job; + DWORD dwLayout; + DWORD dwRegisteredClasses; + + /* ReactOS */ + FAST_MUTEX PrivateFontListLock; + LIST_ENTRY PrivateFontListHead; + FAST_MUTEX DriverObjListLock; + LIST_ENTRY DriverObjListHead; + struct tagKL* KeyboardLayout; // THREADINFO only + W32HEAP_USER_MAPPING HeapMappings; + struct _GDI_POOL* pPoolDcAttr; + struct _GDI_POOL* pPoolBrushAttr; + struct _GDI_POOL* pPoolRgnAttr; #if DBG - BYTE DbgChannelLevel[DbgChCount]; - DWORD DbgHandleCount[TYPE_CTYPES]; + BYTE DbgChannelLevel[DbgChCount]; + DWORD DbgHandleCount[TYPE_CTYPES]; #endif } PROCESSINFO; @@ -276,4 +277,3 @@ void NTAPI UserDbgPreServiceHook(ULONG ulSyscallId, PULONG_PTR pulArguments); ULONG_PTR NTAPI UserDbgPostServiceHook(ULONG ulSyscallId, ULONG_PTR ulResult); #endif -

1 0

[akhaldi] 65840: [DXDIAG] Fix tab content redraw problem. By Lee Schroeder. CORE-8734
by akhaldi＠svn.reactos.org 26 Dec '14

26 Dec '14

Author: akhaldi Date: Fri Dec 26 14:33:14 2014 New Revision: 65840 URL: http://svn.reactos.org/svn/reactos?rev=65840&view=rev Log: [DXDIAG] Fix tab content redraw problem. By Lee Schroeder. CORE-8734 Modified: trunk/reactos/base/applications/dxdiag/dxdiag.c Modified: trunk/reactos/base/applications/dxdiag/dxdiag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] Fri Dec 26 14:33:14 2014 @@ -174,11 +174,11 @@ pContext->hTabCtrl = hTabCtrlWnd; /* create the dialogs */ - pContext->hDialogs[0] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_SYSTEM_DIALOG), pContext->hMainDialog, SystemPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[0]); - pContext->hDialogs[1] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_MUSIC_DIALOG), pContext->hMainDialog, MusicPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[1]); - pContext->hDialogs[2] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_INPUT_DIALOG), pContext->hMainDialog, InputPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[2]); - pContext->hDialogs[3] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_NETWORK_DIALOG), pContext->hMainDialog, NetworkPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[3]); - pContext->hDialogs[4] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_HELP_DIALOG), pContext->hMainDialog, HelpPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[4]); + pContext->hDialogs[0] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_SYSTEM_DIALOG), pContext->hTabCtrl, SystemPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[0]); + pContext->hDialogs[1] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_MUSIC_DIALOG), pContext->hTabCtrl, MusicPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[1]); + pContext->hDialogs[2] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_INPUT_DIALOG), pContext->hTabCtrl, InputPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[2]); + pContext->hDialogs[3] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_NETWORK_DIALOG), pContext->hTabCtrl, NetworkPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[3]); + pContext->hDialogs[4] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_HELP_DIALOG), pContext->hTabCtrl, HelpPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[4]); /* insert tab ctrl items */ InsertTabCtrlItem(hTabCtrlWnd, 0, MAKEINTRESOURCEW(IDS_SYSTEM_DIALOG)); @@ -311,7 +311,7 @@ hInst = hInstance; - DialogBox(hInst, MAKEINTRESOURCE(IDD_MAIN_DIALOG), NULL, DxDiagWndProc); + DialogBox(hInst, MAKEINTRESOURCE(IDD_MAIN_DIALOG), NULL, DxDiagWndProc); return 0; }

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