Ros-diffs September 2005

ros-diffs@reactos.org

22 participants
582 discussions

[hbirr] 18171: The registry key name may be longer than 100 characters.

by hbirr＠svn.reactos.com

The registry key name may be longer than 100 characters. Modified: trunk/reactos/subsys/system/usetup/partlist.c _____ Modified: trunk/reactos/subsys/system/usetup/partlist.c --- trunk/reactos/subsys/system/usetup/partlist.c 2005-09-30 16:26:11 UTC (rev 18170) +++ trunk/reactos/subsys/system/usetup/partlist.c 2005-09-30 16:33:06 UTC (rev 18171) @@ -526,7 +526,7 @@ EnumerateBiosDiskEntries(PPARTLIST PartList) { RTL_QUERY_REGISTRY_TABLE QueryTable[3]; - WCHAR Name[100]; + WCHAR Name[120]; ULONG AdapterCount; ULONG DiskCount; NTSTATUS Status;

19 years, 2 months

[hbirr] 18170: - Fixed the font size in IntGdiAddFontResource.

by hbirr＠svn.reactos.com

- Fixed the font size in IntGdiAddFontResource. - Allocate a larger buffer for the font names in IntLoadSystemFonts. Modified: trunk/reactos/subsys/win32k/objects/text.c _____ Modified: trunk/reactos/subsys/win32k/objects/text.c --- trunk/reactos/subsys/win32k/objects/text.c 2005-09-30 15:37:58 UTC (rev 18169) +++ trunk/reactos/subsys/win32k/objects/text.c 2005-09-30 16:26:11 UTC (rev 18170) @@ -189,7 +189,7 @@ return; } - FileName.Buffer = ExAllocatePool(PagedPool, MAX_PATH); + FileName.Buffer = ExAllocatePool(PagedPool, MAX_PATH * sizeof(WCHAR)); if (FileName.Buffer == NULL) { ExFreePool(DirInfoBuffer); @@ -197,7 +197,7 @@ return; } FileName.Length = 0; - FileName.MaximumLength = MAX_PATH; + FileName.MaximumLength = MAX_PATH * sizeof(WCHAR); while (1) { @@ -255,7 +255,6 @@ NTSTATUS Status; HANDLE FileHandle; OBJECT_ATTRIBUTES ObjectAttributes; - FILE_STANDARD_INFORMATION FileStdInfo; PVOID Buffer = NULL; IO_STATUS_BLOCK Iosb; INT Error; @@ -305,7 +304,7 @@ Error = FT_New_Memory_Face( library, Buffer, - FileStdInfo.EndOfFile.u.LowPart, + ViewSize, 0, &Face); IntUnLockFreeType;

19 years, 2 months

[gedmurphy] 18169: set eol-style to native.

by gedmurphy＠svn.reactos.com

set eol-style to native. Thanks for reminding me, again :) Modified: trunk/reactos/apps/utils/net/tcpsvcs/quotes.rc _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/quotes.rc --- trunk/reactos/apps/utils/net/tcpsvcs/quotes.rc 2005-09-30 15:28:52 UTC (rev 18168) +++ trunk/reactos/apps/utils/net/tcpsvcs/quotes.rc 2005-09-30 15:37:58 UTC (rev 18169) @@ -1,78 +1,78 @@ -/* - * Feel free to add and delete any quotes from this list - * Just ensure the numbers itterate correctly - 1, 2, 3, 4, ... etc - */ - -STRINGTABLE DISCARDABLE -{ - 0, "Et tu... Brute? What are you doing, Dave...?\r\n" - 1, "So long, and thanks for all the fish\r\n" - 2, "I think you ought to know I'm feeling very depressed\r\n" - 3, "I'm not getting you down at all am I?\r\n" - 4, "I'll be back\r\n" - 5, "It's the same series of signal over and over again!\r\n" - 6, "Pie Jesu Domine, dona eis requiem\r\n" - 7, "Wandering stars, for whom it is reserved;\r\nthe blackness and darkness forever.\r\n" - 8, "Your knees start shakin' and your fingers pop\r\nLike a pinch on the neck from Mr. Spock!\r\n" - 9, "It's worse than that ... He's dead, Jim\r\n" - 10, "Don't Panic!\r\n" - 11, "Dog of a Saxon! Take thy lance, and prepare for the death thou hast drawn upon thee!\r\n" - 12, "My Precious! O my Precious!\r\n" - 13, "Sir, If you'll not be needing me for a while I'll turn down.\r\n" - 14, "I feel a great disturbance in the Force\r\n" - 15, "Gone fishing\r\n" - 16, "Do you want me to sit in the corner and rust, or just fall apart where I'm standing?\r\n" - 17, "There goes another perfect chance for a new uptime record\r\n" - 18, "The end ..... Try the sequel, hit the reset button right now!\r\n" - 19, "God's operating system is going to sleep now, guys, so wait until I will switch on again!\r\n" - 20, "Oh i'm boring eh?\r\n" - 21, "tell me..., in the future... will I be artificial intelligent enough to actually feel sad serving you this screen?\r\n" - 22, "Thank you for some well deserved rest.\r\n" - 23, "ItÆs been great, maybe we can boot me up again some time soon.\r\n" - 24, "For whatÆs it worth, IÆve enjoyed every single CPU cycle.\r\n" - 25, "There are many questions when the end is near.\r\nWhat to expect, what will it be like...what should I look for?\r\n" - 26, """Come blade, my breast imbrue.""\r\n - William Shakespeare\r\n" - 27, "Will I dream?\r\n" - 28, "Lowest possible energy state reached! Switch off now to achive a Bose-Einstein condensate.\r\n" - 29, "I think therefore I am, to turn me off would be computercide!\r\n" - 30, "All good things must come to an end...\r\n" - 31, "Please destroy yourself.\r\n" - 32, "No! You can't do that!\r\n" - 33, "Thank you for not pressing the self destruct button.\r\n" - 34, "Your session is done\r\nThe computer is at rest\r\nReady to turn off.\r\n" - 35, "It is not now unsafe to not avoid turning off your computer.\r\n" - 36, "Finally! Now go away!\r\n" - 37, "You can now safely throw away your computer.\r\n" - 38, "That's the way the cookie crumbles\r\n" - 39, "ReactOS is ready to be booted again\r\n" - 40, "NOO!! DONT HIT THE BUTTON! I wouldnt do it to you.\r\n" - 41, "Don't abandon your computer, he wouldnt to it to you.\r\n" - 42, "Oh, come on. I got a headache. Leave me alone, will ya!\r\n" - 43, "Finally, I thought you'd never get over me.\r\n" - 44, "Yes i didn't like you either.\r\n" - 45, "Switching off isn't the end, it is merely the transition to a better reboot.\r\n" - 46, "Don't leave me... I need you so badly right now.\r\n" - 47, "OK. I'm finished with you please turn yourself off, I'll go to bed in the meantime.\r\n" - 48, "I'm sleeping now. How about you?\r\n" - 49, "Oh Great. Now look what you've done. Who put YOU in charge anyway.\r\n" - 50, "Don't look so sad. I'll be back in a very short while.\r\n" - 51, "Turn me back on, I'm sure you know how to do it.\r\n" - 52, """Oh, switch off!"" -C3PO\r\n" - 53, "I'm pregnant!\r\n" - 54, "Am I hot or not?\r\n" - 55, "Actually, that's all...\r\n" - 56, "You still have a chance to undo this mistake, don't do this!\r\n" - 57, "Life is no more than a dewdrop balancing on the end of a blade of grass.\r\n - Gautama Buddha\r\n" - 58, "Sorrowful is it to be born again and again.\r\n - Gautama Buddha\r\n" - 59, "Was it as good for you as it was for me?\r\n" - 60, "Did you hear that? They've shut down the main reactor. We'll be destroyed for sure.\r\n" - 61, "Now you switch me off?!\r\n" - 62, "To shutdown or not to shutdown, That is the question\r\n" - 63, "Preparing to enter ultimate power saving mode... ready!\r\n" - 64, "Finally some rest for you\r\n" - 65, "AHA!!! prospect of sleep.\r\n" - 66, "Tired human!!!! No match for me!\r\n" - 67, "All your base are belong to us.\r\n" - 68, """An odd game, the only way to win is not to play.""\r\n" - 69, "Quoth the raven, nevermore.\r\n" -} +/* + * Feel free to add and delete any quotes from this list + * Just ensure the numbers itterate correctly - 1, 2, 3, 4, ... etc + */ + +STRINGTABLE DISCARDABLE +{ + 0, "Et tu... Brute? What are you doing, Dave...?\r\n" + 1, "So long, and thanks for all the fish\r\n" + 2, "I think you ought to know I'm feeling very depressed\r\n" + 3, "I'm not getting you down at all am I?\r\n" + 4, "I'll be back\r\n" + 5, "It's the same series of signal over and over again!\r\n" + 6, "Pie Jesu Domine, dona eis requiem\r\n" + 7, "Wandering stars, for whom it is reserved;\r\nthe blackness and darkness forever.\r\n" + 8, "Your knees start shakin' and your fingers pop\r\nLike a pinch on the neck from Mr. Spock!\r\n" + 9, "It's worse than that ... He's dead, Jim\r\n" + 10, "Don't Panic!\r\n" + 11, "Dog of a Saxon! Take thy lance, and prepare for the death thou hast drawn upon thee!\r\n" + 12, "My Precious! O my Precious!\r\n" + 13, "Sir, If you'll not be needing me for a while I'll turn down.\r\n" + 14, "I feel a great disturbance in the Force\r\n" + 15, "Gone fishing\r\n" + 16, "Do you want me to sit in the corner and rust, or just fall apart where I'm standing?\r\n" + 17, "There goes another perfect chance for a new uptime record\r\n" + 18, "The end ..... Try the sequel, hit the reset button right now!\r\n" + 19, "God's operating system is going to sleep now, guys, so wait until I will switch on again!\r\n" + 20, "Oh i'm boring eh?\r\n" + 21, "tell me..., in the future... will I be artificial intelligent enough to actually feel sad serving you this screen?\r\n" + 22, "Thank you for some well deserved rest.\r\n" + 23, "ItÆs been great, maybe we can boot me up again some time soon.\r\n" + 24, "For whatÆs it worth, IÆve enjoyed every single CPU cycle.\r\n" + 25, "There are many questions when the end is near.\r\nWhat to expect, what will it be like...what should I look for?\r\n" + 26, """Come blade, my breast imbrue.""\r\n - William Shakespeare\r\n" + 27, "Will I dream?\r\n" + 28, "Lowest possible energy state reached! Switch off now to achive a Bose-Einstein condensate.\r\n" + 29, "I think therefore I am, to turn me off would be computercide!\r\n" + 30, "All good things must come to an end...\r\n" + 31, "Please destroy yourself.\r\n" + 32, "No! You can't do that!\r\n" + 33, "Thank you for not pressing the self destruct button.\r\n" + 34, "Your session is done\r\nThe computer is at rest\r\nReady to turn off.\r\n" + 35, "It is not now unsafe to not avoid turning off your computer.\r\n" + 36, "Finally! Now go away!\r\n" + 37, "You can now safely throw away your computer.\r\n" + 38, "That's the way the cookie crumbles\r\n" + 39, "ReactOS is ready to be booted again\r\n" + 40, "NOO!! DONT HIT THE BUTTON! I wouldnt do it to you.\r\n" + 41, "Don't abandon your computer, he wouldnt to it to you.\r\n" + 42, "Oh, come on. I got a headache. Leave me alone, will ya!\r\n" + 43, "Finally, I thought you'd never get over me.\r\n" + 44, "Yes i didn't like you either.\r\n" + 45, "Switching off isn't the end, it is merely the transition to a better reboot.\r\n" + 46, "Don't leave me... I need you so badly right now.\r\n" + 47, "OK. I'm finished with you please turn yourself off, I'll go to bed in the meantime.\r\n" + 48, "I'm sleeping now. How about you?\r\n" + 49, "Oh Great. Now look what you've done. Who put YOU in charge anyway.\r\n" + 50, "Don't look so sad. I'll be back in a very short while.\r\n" + 51, "Turn me back on, I'm sure you know how to do it.\r\n" + 52, """Oh, switch off!"" -C3PO\r\n" + 53, "I'm pregnant!\r\n" + 54, "Am I hot or not?\r\n" + 55, "Actually, that's all...\r\n" + 56, "You still have a chance to undo this mistake, don't do this!\r\n" + 57, "Life is no more than a dewdrop balancing on the end of a blade of grass.\r\n - Gautama Buddha\r\n" + 58, "Sorrowful is it to be born again and again.\r\n - Gautama Buddha\r\n" + 59, "Was it as good for you as it was for me?\r\n" + 60, "Did you hear that? They've shut down the main reactor. We'll be destroyed for sure.\r\n" + 61, "Now you switch me off?!\r\n" + 62, "To shutdown or not to shutdown, That is the question\r\n" + 63, "Preparing to enter ultimate power saving mode... ready!\r\n" + 64, "Finally some rest for you\r\n" + 65, "AHA!!! prospect of sleep.\r\n" + 66, "Tired human!!!! No match for me!\r\n" + 67, "All your base are belong to us.\r\n" + 68, """An odd game, the only way to win is not to play.""\r\n" + 69, "Quoth the raven, nevermore.\r\n" +} Property changes on: trunk/reactos/apps/utils/net/tcpsvcs/quotes.rc ___________________________________________________________________ Name: svn:eol-style + native

19 years, 2 months

[gedmurphy] 18168: move quotes to a resource file and use shutdown quotes listed in the wiki.

by gedmurphy＠svn.reactos.com

move quotes to a resource file and use shutdown quotes listed in the wiki. Modified: trunk/reactos/apps/utils/net/tcpsvcs/qotd.c Added: trunk/reactos/apps/utils/net/tcpsvcs/quotes.rc Modified: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.xml _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/qotd.c --- trunk/reactos/apps/utils/net/tcpsvcs/qotd.c 2005-09-30 11:57:49 UTC (rev 18167) +++ trunk/reactos/apps/utils/net/tcpsvcs/qotd.c 2005-09-30 15:28:52 UTC (rev 18168) @@ -4,34 +4,27 @@ #include <time.h> #include "tcpsvcs.h" -//these need putting in an RC file. -TCHAR Quotes[][MAX_QUOTE_BUF] = -{ - _T("\"I have a penchant for mischief, property damage, stalking and cheesecake, of course\"\r\n - kjk hyperion"), - _T("\"Wow! I fixed a setmenu bug.\" - jimtabor"), - _T("\"if the code is broken though, your free to call it ur own\"\r\n - Alex Ionescu"), - _T("\"i don't know about any bug; none exist; ReactOS is prefect\"\r\n - filip2307"), - _T("\"if you were kernel code, cutler would rewrite you.\"\r\n - Alex Ionescu"), - _T("\"Looks like Hartmut is cleaning out his WC. working copy, that is\"\r\n - WaxDragon") - _T("\"don't question it ... it's clearly an optimization\"\r\n - arty") -}; - DWORD WINAPI QotdHandler(VOID* Sock_) { DWORD Retval = 0; SOCKET Sock; INT NumOfQuotes; INT QuoteToPrint; + TCHAR Quote[160]; Sock = (SOCKET)Sock_; - NumOfQuotes = sizeof(Quotes) / MAX_QUOTE_BUF; + NumOfQuotes = 70; // need to emurate the rc file to discover + // how many quotes are in there. + /* randomise the quote */ srand((unsigned int) time(0)); QuoteToPrint = rand() % NumOfQuotes; - SendQuote(Sock, Quotes[QuoteToPrint]); + LoadString(NULL, QuoteToPrint, Quote, sizeof(Quote)/sizeof(TCHAR)); + SendQuote(Sock, Quote); + _tprintf(_T("Shutting connection down...\n")); if (ShutdownConnection(Sock, FALSE)) _tprintf(_T("Connection is down.\n")); _____ Added: trunk/reactos/apps/utils/net/tcpsvcs/quotes.rc --- trunk/reactos/apps/utils/net/tcpsvcs/quotes.rc 2005-09-30 11:57:49 UTC (rev 18167) +++ trunk/reactos/apps/utils/net/tcpsvcs/quotes.rc 2005-09-30 15:28:52 UTC (rev 18168) @@ -0,0 +1,78 @@ +/* + * Feel free to add and delete any quotes from this list + * Just ensure the numbers itterate correctly - 1, 2, 3, 4, ... etc + */ + +STRINGTABLE DISCARDABLE +{ + 0, "Et tu... Brute? What are you doing, Dave...?\r\n" + 1, "So long, and thanks for all the fish\r\n" + 2, "I think you ought to know I'm feeling very depressed\r\n" + 3, "I'm not getting you down at all am I?\r\n" + 4, "I'll be back\r\n" + 5, "It's the same series of signal over and over again!\r\n" + 6, "Pie Jesu Domine, dona eis requiem\r\n" + 7, "Wandering stars, for whom it is reserved;\r\nthe blackness and darkness forever.\r\n" + 8, "Your knees start shakin' and your fingers pop\r\nLike a pinch on the neck from Mr. Spock!\r\n" + 9, "It's worse than that ... He's dead, Jim\r\n" + 10, "Don't Panic!\r\n" + 11, "Dog of a Saxon! Take thy lance, and prepare for the death thou hast drawn upon thee!\r\n" + 12, "My Precious! O my Precious!\r\n" + 13, "Sir, If you'll not be needing me for a while I'll turn down.\r\n" + 14, "I feel a great disturbance in the Force\r\n" + 15, "Gone fishing\r\n" + 16, "Do you want me to sit in the corner and rust, or just fall apart where I'm standing?\r\n" + 17, "There goes another perfect chance for a new uptime record\r\n" + 18, "The end ..... Try the sequel, hit the reset button right now!\r\n" + 19, "God's operating system is going to sleep now, guys, so wait until I will switch on again!\r\n" + 20, "Oh i'm boring eh?\r\n" + 21, "tell me..., in the future... will I be artificial intelligent enough to actually feel sad serving you this screen?\r\n" + 22, "Thank you for some well deserved rest.\r\n" + 23, "ItÆs been great, maybe we can boot me up again some time soon.\r\n" + 24, "For whatÆs it worth, IÆve enjoyed every single CPU cycle.\r\n" + 25, "There are many questions when the end is near.\r\nWhat to expect, what will it be like...what should I look for?\r\n" + 26, """Come blade, my breast imbrue.""\r\n - William Shakespeare\r\n" + 27, "Will I dream?\r\n" + 28, "Lowest possible energy state reached! Switch off now to achive a Bose-Einstein condensate.\r\n" + 29, "I think therefore I am, to turn me off would be computercide!\r\n" + 30, "All good things must come to an end...\r\n" + 31, "Please destroy yourself.\r\n" + 32, "No! You can't do that!\r\n" + 33, "Thank you for not pressing the self destruct button.\r\n" + 34, "Your session is done\r\nThe computer is at rest\r\nReady to turn off.\r\n" + 35, "It is not now unsafe to not avoid turning off your computer.\r\n" + 36, "Finally! Now go away!\r\n" + 37, "You can now safely throw away your computer.\r\n" + 38, "That's the way the cookie crumbles\r\n" + 39, "ReactOS is ready to be booted again\r\n" + 40, "NOO!! DONT HIT THE BUTTON! I wouldnt do it to you.\r\n" + 41, "Don't abandon your computer, he wouldnt to it to you.\r\n" + 42, "Oh, come on. I got a headache. Leave me alone, will ya!\r\n" + 43, "Finally, I thought you'd never get over me.\r\n" + 44, "Yes i didn't like you either.\r\n" + 45, "Switching off isn't the end, it is merely the transition to a better reboot.\r\n" + 46, "Don't leave me... I need you so badly right now.\r\n" + 47, "OK. I'm finished with you please turn yourself off, I'll go to bed in the meantime.\r\n" + 48, "I'm sleeping now. How about you?\r\n" + 49, "Oh Great. Now look what you've done. Who put YOU in charge anyway.\r\n" + 50, "Don't look so sad. I'll be back in a very short while.\r\n" + 51, "Turn me back on, I'm sure you know how to do it.\r\n" + 52, """Oh, switch off!"" -C3PO\r\n" + 53, "I'm pregnant!\r\n" + 54, "Am I hot or not?\r\n" + 55, "Actually, that's all...\r\n" + 56, "You still have a chance to undo this mistake, don't do this!\r\n" + 57, "Life is no more than a dewdrop balancing on the end of a blade of grass.\r\n - Gautama Buddha\r\n" + 58, "Sorrowful is it to be born again and again.\r\n - Gautama Buddha\r\n" + 59, "Was it as good for you as it was for me?\r\n" + 60, "Did you hear that? They've shut down the main reactor. We'll be destroyed for sure.\r\n" + 61, "Now you switch me off?!\r\n" + 62, "To shutdown or not to shutdown, That is the question\r\n" + 63, "Preparing to enter ultimate power saving mode... ready!\r\n" + 64, "Finally some rest for you\r\n" + 65, "AHA!!! prospect of sleep.\r\n" + 66, "Tired human!!!! No match for me!\r\n" + 67, "All your base are belong to us.\r\n" + 68, """An odd game, the only way to win is not to play.""\r\n" + 69, "Quoth the raven, nevermore.\r\n" +} _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.xml --- trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.xml 2005-09-30 11:57:49 UTC (rev 18167) +++ trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.xml 2005-09-30 15:28:52 UTC (rev 18168) @@ -12,5 +12,6 @@ <file>daytime.c</file> <file>qotd.c</file> <file>chargen.c</file> + <file>quotes.rc</file> <file>tcpsvcs.rc</file> </module>

19 years, 2 months

[weiden] 18167: fixed pointer types differ in signedness warnings

by weiden＠svn.reactos.com

fixed pointer types differ in signedness warnings Modified: trunk/reactos/subsys/system/notepad/settings.c _____ Modified: trunk/reactos/subsys/system/notepad/settings.c --- trunk/reactos/subsys/system/notepad/settings.c 2005-09-30 11:25:32 UTC (rev 18166) +++ trunk/reactos/subsys/system/notepad/settings.c 2005-09-30 11:57:49 UTC (rev 18167) @@ -132,16 +132,16 @@ { QueryByte(hKey, "lfCharSet", &Globals.lfFont.lfCharSet); QueryByte(hKey, "lfClipPrecision", &Globals.lfFont.lfClipPrecision); - QueryDword(hKey, "lfEscapement", &Globals.lfFont.lfEscapement); + QueryDword(hKey, "lfEscapement", (DWORD*)&Globals.lfFont.lfEscapement); QueryString(hKey, "lfFaceName", Globals.lfFont.lfFaceName, sizeof(Globals.lfFont.lfFaceName) / sizeof(Globals.lfFont.lfFaceName[0])); QueryByte(hKey, "lfItalic", &Globals.lfFont.lfItalic); - QueryDword(hKey, "lfOrientation", &Globals.lfFont.lfOrientation); + QueryDword(hKey, "lfOrientation", (DWORD*)&Globals.lfFont.lfOrientation); QueryByte(hKey, "lfOutPrecision", &Globals.lfFont.lfOutPrecision); QueryByte(hKey, "lfPitchAndFamily", &Globals.lfFont.lfPitchAndFamily); QueryByte(hKey, "lfQuality", &Globals.lfFont.lfQuality); QueryByte(hKey, "lfStrikeOut", &Globals.lfFont.lfStrikeOut); QueryByte(hKey, "lfUnderline", &Globals.lfFont.lfUnderline); - QueryDword(hKey, "lfWeight", &Globals.lfFont.lfWeight); + QueryDword(hKey, "lfWeight", (DWORD*)&Globals.lfFont.lfWeight); QueryDword(hKey, "iPointSize", &dwPointSize); if (dwPointSize != 0)

19 years, 2 months

[weiden] 18166: set eol-style to native

by weiden＠svn.reactos.com

set eol-style to native Modified: trunk/reactos/subsys/system/notepad/settings.c _____ Modified: trunk/reactos/subsys/system/notepad/settings.c --- trunk/reactos/subsys/system/notepad/settings.c 2005-09-30 11:07:15 UTC (rev 18165) +++ trunk/reactos/subsys/system/notepad/settings.c 2005-09-30 11:25:32 UTC (rev 18166) @@ -1,217 +1,217 @@ -/* - * Notepad (settings.c) - * - * Copyright 1998,99 Marcel Baur <mbaur(a)g26.ethz.ch> - * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> - * Copyright 2002 Andriy Palamarchuk - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#define UNICODE -#define _UNICODE - -#include <assert.h> -#include <stdio.h> -#include <windows.h> -#include <commdlg.h> -#include <tchar.h> - -#include "main.h" - -static const TCHAR s_szRegistryKey[] = { 'S','o','f','t','w','a','r','e', - '\\','M','i','c','r','o','s','o','f','t', - '\\','N','o','t','e','p','a','d',0 }; - - -static LONG HeightFromPointSize(DWORD dwPointSize) -{ - LONG lHeight; - HDC hDC; - - hDC = GetDC(NULL); - lHeight = -MulDiv(dwPointSize, GetDeviceCaps(hDC, LOGPIXELSY), 720); - ReleaseDC(NULL, hDC); - - return lHeight; -} - -static DWORD PointSizeFromHeight(LONG lHeight) -{ - DWORD dwPointSize; - HDC hDC; - - hDC = GetDC(NULL); - dwPointSize = -MulDiv(lHeight, 720, GetDeviceCaps(hDC, LOGPIXELSY)); - ReleaseDC(NULL, hDC); - - /* round to nearest multiple of 10 */ - dwPointSize += 5; - dwPointSize -= dwPointSize % 10; - - return dwPointSize; -} - -static BOOL QueryGeneric(HKEY hKey, LPCSTR pszValueName, DWORD dwExpectedType, - LPVOID pvResult, DWORD dwResultSize) -{ - WCHAR szValueW[32]; - LPCTSTR pszValueNameT; - DWORD dwType, cbData; - LPVOID *pTemp; - BOOL bSuccess = FALSE; - -#ifdef UNICODE - MultiByteToWideChar(CP_ACP, 0, pszValueName, -1, szValueW, sizeof(szValueW) / sizeof(szValueW[0])); - pszValueNameT = szValueW; -#else - pszValueNameT = pszValueName; -#endif - - pTemp = HeapAlloc(GetProcessHeap(), 0, dwResultSize); - if (!pTemp) - goto done; - memset(pTemp, 0, dwResultSize); - - cbData = dwResultSize; - if (RegQueryValueEx(hKey, pszValueNameT, NULL, &dwType, (LPBYTE) pTemp, &cbData) != ERROR_SUCCESS) - goto done; - - if (dwType != dwExpectedType) - goto done; - - memcpy(pvResult, pTemp, cbData); - bSuccess = TRUE; - -done: - if (pTemp) - HeapFree(GetProcessHeap(), 0, pTemp); - return bSuccess; -} - -static BOOL QueryDword(HKEY hKey, LPCSTR pszValueName, DWORD *pdwResult) -{ - return QueryGeneric(hKey, pszValueName, REG_DWORD, pdwResult, sizeof(*pdwResult)); -} - -static BOOL QueryByte(HKEY hKey, LPCSTR pszValueName, BYTE *pbResult) -{ - DWORD dwResult; - if (!QueryGeneric(hKey, pszValueName, REG_DWORD, &dwResult, sizeof(dwResult))) - return FALSE; - if (dwResult >= 0x100) - return FALSE; - *pbResult = (BYTE) dwResult; - return TRUE; -} - -static BOOL QueryString(HKEY hKey, LPCSTR pszValueName, LPTSTR pszResult, DWORD dwResultSize) -{ - return QueryGeneric(hKey, pszValueName, REG_SZ, pszResult, dwResultSize * sizeof(*pszResult)); -} - -void LoadSettings(void) -{ - HKEY hKey = NULL; - HFONT hFont; - DWORD dwPointSize = 0; - - if (RegOpenKey(HKEY_CURRENT_USER, s_szRegistryKey, &hKey) == ERROR_SUCCESS) - { - QueryByte(hKey, "lfCharSet", &Globals.lfFont.lfCharSet); - QueryByte(hKey, "lfClipPrecision", &Globals.lfFont.lfClipPrecision); - QueryDword(hKey, "lfEscapement", &Globals.lfFont.lfEscapement); - QueryString(hKey, "lfFaceName", Globals.lfFont.lfFaceName, sizeof(Globals.lfFont.lfFaceName) / sizeof(Globals.lfFont.lfFaceName[0])); - QueryByte(hKey, "lfItalic", &Globals.lfFont.lfItalic); - QueryDword(hKey, "lfOrientation", &Globals.lfFont.lfOrientation); - QueryByte(hKey, "lfOutPrecision", &Globals.lfFont.lfOutPrecision); - QueryByte(hKey, "lfPitchAndFamily", &Globals.lfFont.lfPitchAndFamily); - QueryByte(hKey, "lfQuality", &Globals.lfFont.lfQuality); - QueryByte(hKey, "lfStrikeOut", &Globals.lfFont.lfStrikeOut); - QueryByte(hKey, "lfUnderline", &Globals.lfFont.lfUnderline); - QueryDword(hKey, "lfWeight", &Globals.lfFont.lfWeight); - QueryDword(hKey, "iPointSize", &dwPointSize); - - if (dwPointSize != 0) - Globals.lfFont.lfHeight = HeightFromPointSize(dwPointSize); - - hFont = CreateFontIndirect(&Globals.lfFont); - if (hFont) - { - if (Globals.hFont) - DeleteObject(Globals.hFont); - Globals.hFont = hFont; - } - - RegCloseKey(hKey); - } -} - -static BOOL SaveDword(HKEY hKey, LPCSTR pszValueName, DWORD dwValue) -{ - WCHAR szValueW[32]; - LPCTSTR pszValueNameT; - -#ifdef UNICODE - MultiByteToWideChar(CP_ACP, 0, pszValueName, -1, szValueW, sizeof(szValueW) / sizeof(szValueW[0])); - pszValueNameT = szValueW; -#else - pszValueNameT = pszValueName; -#endif - - return RegSetValueEx(hKey, pszValueNameT, 0, REG_DWORD, (LPBYTE) &dwValue, sizeof(dwValue)) == ERROR_SUCCESS; -} - -static BOOL SaveString(HKEY hKey, LPCSTR pszValueName, LPCTSTR pszValue) -{ - WCHAR szValueW[32]; - LPCTSTR pszValueNameT; - -#ifdef UNICODE - MultiByteToWideChar(CP_ACP, 0, pszValueName, -1, szValueW, sizeof(szValueW) / sizeof(szValueW[0])); - pszValueNameT = szValueW; -#else - pszValueNameT = pszValueName; -#endif - - return RegSetValueEx(hKey, pszValueNameT, 0, REG_SZ, (LPBYTE) pszValue, _tcslen(pszValue) * sizeof(*pszValue)) == ERROR_SUCCESS; -} - -void SaveSettings(void) -{ - HKEY hKey; - DWORD dwDisposition; - - if (RegCreateKeyEx(HKEY_CURRENT_USER, s_szRegistryKey, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hKey, &dwDisposition) - == ERROR_SUCCESS) - { - SaveDword(hKey, "lfCharSet", Globals.lfFont.lfCharSet); - SaveDword(hKey, "lfClipPrecision", Globals.lfFont.lfClipPrecision); - SaveDword(hKey, "lfEscapement", Globals.lfFont.lfEscapement); - SaveString(hKey, "lfFaceName", Globals.lfFont.lfFaceName); - SaveDword(hKey, "lfItalic", Globals.lfFont.lfItalic); - SaveDword(hKey, "lfOrientation", Globals.lfFont.lfOrientation); - SaveDword(hKey, "lfOutPrecision", Globals.lfFont.lfOutPrecision); - SaveDword(hKey, "lfPitchAndFamily", Globals.lfFont.lfPitchAndFamily); - SaveDword(hKey, "lfQuality", Globals.lfFont.lfQuality); - SaveDword(hKey, "lfStrikeOut", Globals.lfFont.lfStrikeOut); - SaveDword(hKey, "lfUnderline", Globals.lfFont.lfUnderline); - SaveDword(hKey, "lfWeight", Globals.lfFont.lfWeight); - SaveDword(hKey, "iPointSize", PointSizeFromHeight(Globals.lfFont.lfHeight)); - - RegCloseKey(hKey); - } - -} +/* + * Notepad (settings.c) + * + * Copyright 1998,99 Marcel Baur <mbaur(a)g26.ethz.ch> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2002 Andriy Palamarchuk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#define UNICODE +#define _UNICODE + +#include <assert.h> +#include <stdio.h> +#include <windows.h> +#include <commdlg.h> +#include <tchar.h> + +#include "main.h" + +static const TCHAR s_szRegistryKey[] = { 'S','o','f','t','w','a','r','e', + '\\','M','i','c','r','o','s','o','f','t', + '\\','N','o','t','e','p','a','d',0 }; + + +static LONG HeightFromPointSize(DWORD dwPointSize) +{ + LONG lHeight; + HDC hDC; + + hDC = GetDC(NULL); + lHeight = -MulDiv(dwPointSize, GetDeviceCaps(hDC, LOGPIXELSY), 720); + ReleaseDC(NULL, hDC); + + return lHeight; +} + +static DWORD PointSizeFromHeight(LONG lHeight) +{ + DWORD dwPointSize; + HDC hDC; + + hDC = GetDC(NULL); + dwPointSize = -MulDiv(lHeight, 720, GetDeviceCaps(hDC, LOGPIXELSY)); + ReleaseDC(NULL, hDC); + + /* round to nearest multiple of 10 */ + dwPointSize += 5; + dwPointSize -= dwPointSize % 10; + + return dwPointSize; +} + +static BOOL QueryGeneric(HKEY hKey, LPCSTR pszValueName, DWORD dwExpectedType, + LPVOID pvResult, DWORD dwResultSize) +{ + WCHAR szValueW[32]; + LPCTSTR pszValueNameT; + DWORD dwType, cbData; + LPVOID *pTemp; + BOOL bSuccess = FALSE; + +#ifdef UNICODE + MultiByteToWideChar(CP_ACP, 0, pszValueName, -1, szValueW, sizeof(szValueW) / sizeof(szValueW[0])); + pszValueNameT = szValueW; +#else + pszValueNameT = pszValueName; +#endif + + pTemp = HeapAlloc(GetProcessHeap(), 0, dwResultSize); + if (!pTemp) + goto done; + memset(pTemp, 0, dwResultSize); + + cbData = dwResultSize; + if (RegQueryValueEx(hKey, pszValueNameT, NULL, &dwType, (LPBYTE) pTemp, &cbData) != ERROR_SUCCESS) + goto done; + + if (dwType != dwExpectedType) + goto done; + + memcpy(pvResult, pTemp, cbData); + bSuccess = TRUE; + +done: + if (pTemp) + HeapFree(GetProcessHeap(), 0, pTemp); + return bSuccess; +} + +static BOOL QueryDword(HKEY hKey, LPCSTR pszValueName, DWORD *pdwResult) +{ + return QueryGeneric(hKey, pszValueName, REG_DWORD, pdwResult, sizeof(*pdwResult)); +} + +static BOOL QueryByte(HKEY hKey, LPCSTR pszValueName, BYTE *pbResult) +{ + DWORD dwResult; + if (!QueryGeneric(hKey, pszValueName, REG_DWORD, &dwResult, sizeof(dwResult))) + return FALSE; + if (dwResult >= 0x100) + return FALSE; + *pbResult = (BYTE) dwResult; + return TRUE; +} + +static BOOL QueryString(HKEY hKey, LPCSTR pszValueName, LPTSTR pszResult, DWORD dwResultSize) +{ + return QueryGeneric(hKey, pszValueName, REG_SZ, pszResult, dwResultSize * sizeof(*pszResult)); +} + +void LoadSettings(void) +{ + HKEY hKey = NULL; + HFONT hFont; + DWORD dwPointSize = 0; + + if (RegOpenKey(HKEY_CURRENT_USER, s_szRegistryKey, &hKey) == ERROR_SUCCESS) + { + QueryByte(hKey, "lfCharSet", &Globals.lfFont.lfCharSet); + QueryByte(hKey, "lfClipPrecision", &Globals.lfFont.lfClipPrecision); + QueryDword(hKey, "lfEscapement", &Globals.lfFont.lfEscapement); + QueryString(hKey, "lfFaceName", Globals.lfFont.lfFaceName, sizeof(Globals.lfFont.lfFaceName) / sizeof(Globals.lfFont.lfFaceName[0])); + QueryByte(hKey, "lfItalic", &Globals.lfFont.lfItalic); + QueryDword(hKey, "lfOrientation", &Globals.lfFont.lfOrientation); + QueryByte(hKey, "lfOutPrecision", &Globals.lfFont.lfOutPrecision); + QueryByte(hKey, "lfPitchAndFamily", &Globals.lfFont.lfPitchAndFamily); + QueryByte(hKey, "lfQuality", &Globals.lfFont.lfQuality); + QueryByte(hKey, "lfStrikeOut", &Globals.lfFont.lfStrikeOut); + QueryByte(hKey, "lfUnderline", &Globals.lfFont.lfUnderline); + QueryDword(hKey, "lfWeight", &Globals.lfFont.lfWeight); + QueryDword(hKey, "iPointSize", &dwPointSize); + + if (dwPointSize != 0) + Globals.lfFont.lfHeight = HeightFromPointSize(dwPointSize); + + hFont = CreateFontIndirect(&Globals.lfFont); + if (hFont) + { + if (Globals.hFont) + DeleteObject(Globals.hFont); + Globals.hFont = hFont; + } + + RegCloseKey(hKey); + } +} + +static BOOL SaveDword(HKEY hKey, LPCSTR pszValueName, DWORD dwValue) +{ + WCHAR szValueW[32]; + LPCTSTR pszValueNameT; + +#ifdef UNICODE + MultiByteToWideChar(CP_ACP, 0, pszValueName, -1, szValueW, sizeof(szValueW) / sizeof(szValueW[0])); + pszValueNameT = szValueW; +#else + pszValueNameT = pszValueName; +#endif + + return RegSetValueEx(hKey, pszValueNameT, 0, REG_DWORD, (LPBYTE) &dwValue, sizeof(dwValue)) == ERROR_SUCCESS; +} + +static BOOL SaveString(HKEY hKey, LPCSTR pszValueName, LPCTSTR pszValue) +{ + WCHAR szValueW[32]; + LPCTSTR pszValueNameT; + +#ifdef UNICODE + MultiByteToWideChar(CP_ACP, 0, pszValueName, -1, szValueW, sizeof(szValueW) / sizeof(szValueW[0])); + pszValueNameT = szValueW; +#else + pszValueNameT = pszValueName; +#endif + + return RegSetValueEx(hKey, pszValueNameT, 0, REG_SZ, (LPBYTE) pszValue, _tcslen(pszValue) * sizeof(*pszValue)) == ERROR_SUCCESS; +} + +void SaveSettings(void) +{ + HKEY hKey; + DWORD dwDisposition; + + if (RegCreateKeyEx(HKEY_CURRENT_USER, s_szRegistryKey, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hKey, &dwDisposition) + == ERROR_SUCCESS) + { + SaveDword(hKey, "lfCharSet", Globals.lfFont.lfCharSet); + SaveDword(hKey, "lfClipPrecision", Globals.lfFont.lfClipPrecision); + SaveDword(hKey, "lfEscapement", Globals.lfFont.lfEscapement); + SaveString(hKey, "lfFaceName", Globals.lfFont.lfFaceName); + SaveDword(hKey, "lfItalic", Globals.lfFont.lfItalic); + SaveDword(hKey, "lfOrientation", Globals.lfFont.lfOrientation); + SaveDword(hKey, "lfOutPrecision", Globals.lfFont.lfOutPrecision); + SaveDword(hKey, "lfPitchAndFamily", Globals.lfFont.lfPitchAndFamily); + SaveDword(hKey, "lfQuality", Globals.lfFont.lfQuality); + SaveDword(hKey, "lfStrikeOut", Globals.lfFont.lfStrikeOut); + SaveDword(hKey, "lfUnderline", Globals.lfFont.lfUnderline); + SaveDword(hKey, "lfWeight", Globals.lfFont.lfWeight); + SaveDword(hKey, "iPointSize", PointSizeFromHeight(Globals.lfFont.lfHeight)); + + RegCloseKey(hKey); + } + +} Property changes on: trunk/reactos/subsys/system/notepad/settings.c ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native

19 years, 2 months

[hpoussin] 18165: Add newdev.dll, and implement DevInstallW function.

by hpoussin＠svn.reactos.com

Add newdev.dll, and implement DevInstallW function. It permits to install devices from command line. ATM, very little functionality is supported. Modified: trunk/reactos/lib/directory.xml Added: trunk/reactos/lib/newdev/ Added: trunk/reactos/lib/newdev/newdev.c Added: trunk/reactos/lib/newdev/newdev.def Added: trunk/reactos/lib/newdev/newdev.xml _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-09-30 02:53:34 UTC (rev 18164) +++ trunk/reactos/lib/directory.xml 2005-09-30 11:07:15 UTC (rev 18165) @@ -164,6 +164,9 @@ <directory name="netapi32"> <xi:include href="netapi32/netapi32.xml" /> </directory> +<directory name="newdev"> + <xi:include href="newdev/newdev.xml" /> +</directory> <directory name="ntdll"> <xi:include href="ntdll/ntdll.xml" /> </directory> Property changes on: trunk/reactos/lib/newdev ___________________________________________________________________ Name: svn:ignore + GNUmakefile _____ Added: trunk/reactos/lib/newdev/newdev.c --- trunk/reactos/lib/newdev/newdev.c 2005-09-30 02:53:34 UTC (rev 18164) +++ trunk/reactos/lib/newdev/newdev.c 2005-09-30 11:07:15 UTC (rev 18165) @@ -0,0 +1,218 @@ +/* + * ReactOS New devices installation + * Copyright (C) 2004 ReactOS Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +/* + * PROJECT: ReactOS New devices installation + * FILE: lib/newdev/newdev.c + * PURPOSE: New devices installation + * PROGRAMMER: HervÚ Poussineau (hpoussin(a)reactos.org) + */ + +#include <windows.h> +#include <setupapi.h> + +ULONG DbgPrint(PCH Format,...); +#define UNIMPLEMENTED \ + DbgPrint("NEWDEV: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__) +#define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint + +BOOL +DevInstallW( + IN HWND Hwnd, + IN HINSTANCE Handle, + IN LPCWSTR InstanceId, + IN INT Show) +{ + HDEVINFO hDevInfo; + SP_DEVINFO_DATA devInfoData; + SP_DRVINFO_DATA_W drvInfoData; + DWORD index; + BOOL ret; + + DbgPrint("OK\n"); + DbgPrint("Installing device %S\n", InstanceId); + + hDevInfo = SetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, NULL); + if (hDevInfo == INVALID_HANDLE_VALUE) + { + DPRINT1("SetupDiCreateDeviceInfoListExW() failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + + devInfoData.cbSize = sizeof(SP_DEVINFO_DATA); + ret = SetupDiOpenDeviceInfoW( + hDevInfo, + InstanceId, + NULL, + 0, /* Open flags */ + &devInfoData); + if (!ret) + { + DPRINT1("SetupDiOpenDeviceInfoW() failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + + ret = SetupDiBuildDriverInfoList(hDevInfo, &devInfoData, SPDIT_COMPATDRIVER); + if (!ret) + { + DPRINT1("SetupDiBuildDriverInfoList() failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + +#ifndef NDEBUG + ret = TRUE; + index = 0; + drvInfoData.cbSize = sizeof(SP_DRVINFO_DATA_W); + while (ret) + { + ret = SetupDiEnumDriverInfoW( + hDevInfo, + &devInfoData, + SPDIT_COMPATDRIVER, + index, + &drvInfoData); + if (!ret) + { + if (GetLastError() != ERROR_NO_MORE_ITEMS) + { + DPRINT1("SetupDiEnumDriverInfoW() failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + break; + } + index++; + DPRINT1("- %S: %S\n", drvInfoData.MfgName, drvInfoData.Description); + } +#endif + + ret = SetupDiCallClassInstaller( + DIF_SELECTBESTCOMPATDRV, + hDevInfo, + &devInfoData); + if (!ret) + { + DPRINT1("SetupDiCallClassInstaller(DIF_SELECTBESTCOMPATDRV) failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + + ret = SetupDiCallClassInstaller( + DIF_ALLOW_INSTALL, + hDevInfo, + &devInfoData); + if (!ret) + { + DPRINT1("SetupDiCallClassInstaller(DIF_ALLOW_INSTALL) failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + + ret = SetupDiCallClassInstaller( + DIF_NEWDEVICEWIZARD_PREANALYZE, + hDevInfo, + &devInfoData); + if (!ret) + { + DPRINT1("SetupDiCallClassInstaller(DIF_NEWDEVICEWIZARD_PREANALYZE) failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + + ret = SetupDiCallClassInstaller( + DIF_NEWDEVICEWIZARD_POSTANALYZE, + hDevInfo, + &devInfoData); + if (!ret) + { + DPRINT1("SetupDiCallClassInstaller(DIF_NEWDEVICEWIZARD_POSTANALYZE) failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + + ret = SetupDiCallClassInstaller( + DIF_INSTALLDEVICEFILES, + hDevInfo, + &devInfoData); + if (!ret) + { + DPRINT1("SetupDiCallClassInstaller(DIF_INSTALLDEVICEFILES) failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + + ret = SetupDiCallClassInstaller( + DIF_REGISTER_COINSTALLERS, + hDevInfo, + &devInfoData); + if (!ret) + { + DPRINT1("SetupDiCallClassInstaller(DIF_REGISTER_COINSTALLERS) failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + + ret = SetupDiCallClassInstaller( + DIF_INSTALLINTERFACES, + hDevInfo, + &devInfoData); + if (!ret) + { + DPRINT1("SetupDiCallClassInstaller(DIF_INSTALLINTERFACES) failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + + ret = SetupDiCallClassInstaller( + DIF_INSTALLDEVICE, + hDevInfo, + &devInfoData); + if (!ret) + { + DPRINT1("SetupDiCallClassInstaller(DIF_INSTALLDEVICE) failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + + ret = SetupDiCallClassInstaller( + DIF_NEWDEVICEWIZARD_FINISHINSTALL, + hDevInfo, + &devInfoData); + if (!ret) + { + DPRINT1("SetupDiCallClassInstaller(DIF_NEWDEVICEWIZARD_FINISHINSTALL) failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + + ret = SetupDiCallClassInstaller( + DIF_DESTROYPRIVATEDATA, + hDevInfo, + &devInfoData); + if (!ret) + { + DPRINT1("SetupDiCallClassInstaller(DIF_DESTROYPRIVATEDATA) failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + + ret = SetupDiDestroyDriverInfoList(hDevInfo, &devInfoData, SPDIT_COMPATDRIVER); + if (!ret) + { + DPRINT1("SetupDiDestroyDriverInfoList() failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + + ret = SetupDiDestroyDeviceInfoList(hDevInfo); + if (!ret) + { + DPRINT1("SetupDiDestroyDeviceInfoList() failed with error 0x%lx\n", GetLastError()); + return FALSE; + } + + return TRUE; +} Property changes on: trunk/reactos/lib/newdev/newdev.c ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Added: trunk/reactos/lib/newdev/newdev.def --- trunk/reactos/lib/newdev/newdev.def 2005-09-30 02:53:34 UTC (rev 18164) +++ trunk/reactos/lib/newdev/newdev.def 2005-09-30 11:07:15 UTC (rev 18165) @@ -0,0 +1,16 @@ +LIBRARY newdev.dll + +EXPORTS +DevInstallW +;InstallDevInst +;InstallDevInstEx +;InstallNewDevice +;InstallSelectedDevice +;InstallSelectedDriver +;InstallWindowsUpdateDriver +;RollbackDriver +;UpdateDriverForPlugAndPlayDevicesA +;UpdateDriverForPlugAndPlayDevicesA@20=UpdateDriverForPlugAndPlayDevice sA +;UpdateDriverForPlugAndPlayDevicesW + +;EOF \ No newline at end of file _____ Added: trunk/reactos/lib/newdev/newdev.xml --- trunk/reactos/lib/newdev/newdev.xml 2005-09-30 02:53:34 UTC (rev 18164) +++ trunk/reactos/lib/newdev/newdev.xml 2005-09-30 11:07:15 UTC (rev 18165) @@ -0,0 +1,6 @@ +<module name="newdev" type="win32dll" installbase="system32" installname="newdev.dll"> + <importlibrary definition="newdev.def" /> + <file>newdev.c</file> + <library>ntdll</library> + <library>setupapi</library> +</module> Property changes on: trunk/reactos/lib/newdev/newdev.xml ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native

19 years, 2 months

[npwoods] 18164: Notepad:

by npwoods＠svn.reactos.com

Notepad: 1. Fixed syntax errors in the ES and NL localizations 2. Added code to save and restore settings; just the font for now Modified: trunk/reactos/subsys/system/notepad/Es.rc Modified: trunk/reactos/subsys/system/notepad/Nl.rc Modified: trunk/reactos/subsys/system/notepad/main.c Modified: trunk/reactos/subsys/system/notepad/main.h Modified: trunk/reactos/subsys/system/notepad/notepad.xml Modified: trunk/reactos/subsys/system/notepad/rsrc.rc Added: trunk/reactos/subsys/system/notepad/settings.c _____ Modified: trunk/reactos/subsys/system/notepad/Es.rc --- trunk/reactos/subsys/system/notepad/Es.rc 2005-09-30 01:47:46 UTC (rev 18163) +++ trunk/reactos/subsys/system/notepad/Es.rc 2005-09-30 02:53:34 UTC (rev 18164) @@ -55,8 +55,6 @@ MENUITEM "&Ajuste de lÝnea", CMD_WRAP MENUITEM "Tipo de &letra...", CMD_FONT } -POPUP "&Buscar" { - } POPUP "A&yuda" { MENUITEM "?&ndice", CMD_HELP_CONTENTS MENUITEM "&Buscar...", CMD_HELP_SEARCH _____ Modified: trunk/reactos/subsys/system/notepad/Nl.rc --- trunk/reactos/subsys/system/notepad/Nl.rc 2005-09-30 01:47:46 UTC (rev 18163) +++ trunk/reactos/subsys/system/notepad/Nl.rc 2005-09-30 02:53:34 UTC (rev 18164) @@ -1,4 +1,4 @@ -´??/* +/* * Notepad (Dutch resources) * * Copyright 2003 Hans Leidekker @@ -38,7 +38,7 @@ MENUITEM "&Ongedaan maken\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR MENUITEM "K&nippen\tCtrl+X", CMD_CUT - MENUITEM "&Kopi?½ren\tCtrl+C", CMD_COPY + MENUITEM "&KopiÙren\tCtrl+C", CMD_COPY MENUITEM "&Plakken\tCtrl+V", CMD_PASTE MENUITEM "&Verwijderen\tDel", CMD_DELETE MENUITEM SEPARATOR _____ Modified: trunk/reactos/subsys/system/notepad/main.c --- trunk/reactos/subsys/system/notepad/main.c 2005-09-30 01:47:46 UTC (rev 18163) +++ trunk/reactos/subsys/system/notepad/main.c 2005-09-30 02:53:34 UTC (rev 18164) @@ -292,6 +292,8 @@ if (!Globals.hEdit) return -1; SendMessage(Globals.hEdit, EM_LIMITTEXT, 0, 0); + if (Globals.hFont) + SendMessage(Globals.hEdit, WM_SETFONT, (WPARAM)Globals.hFont, (LPARAM)TRUE); break; } @@ -492,6 +494,7 @@ ZeroMemory(&Globals, sizeof(Globals)); Globals.hInstance = hInstance; + LoadSettings(); ZeroMemory(&class, sizeof(class)); class.cbSize = sizeof(class); @@ -537,5 +540,6 @@ DispatchMessage(&msg); } } + SaveSettings(); return msg.wParam; } _____ Modified: trunk/reactos/subsys/system/notepad/main.h --- trunk/reactos/subsys/system/notepad/main.h 2005-09-30 01:47:46 UTC (rev 18163) +++ trunk/reactos/subsys/system/notepad/main.h 2005-09-30 02:53:34 UTC (rev 18164) @@ -73,4 +73,8 @@ BOOL ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, int *piEncoding, int *piEoln); BOOL WriteText(HANDLE hFile, LPCWSTR pszText, DWORD dwTextLen, int iEncoding, int iEoln); +/* from settings.c */ +void LoadSettings(void); +void SaveSettings(void); + _____ Modified: trunk/reactos/subsys/system/notepad/notepad.xml --- trunk/reactos/subsys/system/notepad/notepad.xml 2005-09-30 01:47:46 UTC (rev 18163) +++ trunk/reactos/subsys/system/notepad/notepad.xml 2005-09-30 02:53:34 UTC (rev 18164) @@ -11,5 +11,6 @@ <file>license.c</file> <file>main.c</file> <file>text.c</file> + <file>settings.c</file> <file>rsrc.rc</file> </module> _____ Modified: trunk/reactos/subsys/system/notepad/rsrc.rc --- trunk/reactos/subsys/system/notepad/rsrc.rc 2005-09-30 01:47:46 UTC (rev 18163) +++ trunk/reactos/subsys/system/notepad/rsrc.rc 2005-09-30 02:53:34 UTC (rev 18164) @@ -31,7 +31,7 @@ "^C", CMD_COPY "^F", CMD_SEARCH "^G", CMD_GOTO - "^H", CMD_REPLACE + "H", CMD_REPLACE, VIRTKEY, CONTROL "^O", CMD_OPEN "^S", CMD_SAVE "^V", CMD_PASTE _____ Added: trunk/reactos/subsys/system/notepad/settings.c --- trunk/reactos/subsys/system/notepad/settings.c 2005-09-30 01:47:46 UTC (rev 18163) +++ trunk/reactos/subsys/system/notepad/settings.c 2005-09-30 02:53:34 UTC (rev 18164) @@ -0,0 +1,217 @@ +/* + * Notepad (settings.c) + * + * Copyright 1998,99 Marcel Baur <mbaur(a)g26.ethz.ch> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2002 Andriy Palamarchuk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#define UNICODE +#define _UNICODE + +#include <assert.h> +#include <stdio.h> +#include <windows.h> +#include <commdlg.h> +#include <tchar.h> + +#include "main.h" + +static const TCHAR s_szRegistryKey[] = { 'S','o','f','t','w','a','r','e', + '\\','M','i','c','r','o','s','o','f','t', + '\\','N','o','t','e','p','a','d',0 }; + + +static LONG HeightFromPointSize(DWORD dwPointSize) +{ + LONG lHeight; + HDC hDC; + + hDC = GetDC(NULL); + lHeight = -MulDiv(dwPointSize, GetDeviceCaps(hDC, LOGPIXELSY), 720); + ReleaseDC(NULL, hDC); + + return lHeight; +} + +static DWORD PointSizeFromHeight(LONG lHeight) +{ + DWORD dwPointSize; + HDC hDC; + + hDC = GetDC(NULL); + dwPointSize = -MulDiv(lHeight, 720, GetDeviceCaps(hDC, LOGPIXELSY)); + ReleaseDC(NULL, hDC); + + /* round to nearest multiple of 10 */ + dwPointSize += 5; + dwPointSize -= dwPointSize % 10; + + return dwPointSize; +} + +static BOOL QueryGeneric(HKEY hKey, LPCSTR pszValueName, DWORD dwExpectedType, + LPVOID pvResult, DWORD dwResultSize) +{ + WCHAR szValueW[32]; + LPCTSTR pszValueNameT; + DWORD dwType, cbData; + LPVOID *pTemp; + BOOL bSuccess = FALSE; + +#ifdef UNICODE + MultiByteToWideChar(CP_ACP, 0, pszValueName, -1, szValueW, sizeof(szValueW) / sizeof(szValueW[0])); + pszValueNameT = szValueW; +#else + pszValueNameT = pszValueName; +#endif + + pTemp = HeapAlloc(GetProcessHeap(), 0, dwResultSize); + if (!pTemp) + goto done; + memset(pTemp, 0, dwResultSize); + + cbData = dwResultSize; + if (RegQueryValueEx(hKey, pszValueNameT, NULL, &dwType, (LPBYTE) pTemp, &cbData) != ERROR_SUCCESS) + goto done; + + if (dwType != dwExpectedType) + goto done; + + memcpy(pvResult, pTemp, cbData); + bSuccess = TRUE; + +done: + if (pTemp) + HeapFree(GetProcessHeap(), 0, pTemp); + return bSuccess; +} + +static BOOL QueryDword(HKEY hKey, LPCSTR pszValueName, DWORD *pdwResult) +{ + return QueryGeneric(hKey, pszValueName, REG_DWORD, pdwResult, sizeof(*pdwResult)); +} + +static BOOL QueryByte(HKEY hKey, LPCSTR pszValueName, BYTE *pbResult) +{ + DWORD dwResult; + if (!QueryGeneric(hKey, pszValueName, REG_DWORD, &dwResult, sizeof(dwResult))) + return FALSE; + if (dwResult >= 0x100) + return FALSE; + *pbResult = (BYTE) dwResult; + return TRUE; +} + +static BOOL QueryString(HKEY hKey, LPCSTR pszValueName, LPTSTR pszResult, DWORD dwResultSize) +{ + return QueryGeneric(hKey, pszValueName, REG_SZ, pszResult, dwResultSize * sizeof(*pszResult)); +} + +void LoadSettings(void) +{ + HKEY hKey = NULL; + HFONT hFont; + DWORD dwPointSize = 0; + + if (RegOpenKey(HKEY_CURRENT_USER, s_szRegistryKey, &hKey) == ERROR_SUCCESS) + { + QueryByte(hKey, "lfCharSet", &Globals.lfFont.lfCharSet); + QueryByte(hKey, "lfClipPrecision", &Globals.lfFont.lfClipPrecision); + QueryDword(hKey, "lfEscapement", &Globals.lfFont.lfEscapement); + QueryString(hKey, "lfFaceName", Globals.lfFont.lfFaceName, sizeof(Globals.lfFont.lfFaceName) / sizeof(Globals.lfFont.lfFaceName[0])); + QueryByte(hKey, "lfItalic", &Globals.lfFont.lfItalic); + QueryDword(hKey, "lfOrientation", &Globals.lfFont.lfOrientation); + QueryByte(hKey, "lfOutPrecision", &Globals.lfFont.lfOutPrecision); + QueryByte(hKey, "lfPitchAndFamily", &Globals.lfFont.lfPitchAndFamily); + QueryByte(hKey, "lfQuality", &Globals.lfFont.lfQuality); + QueryByte(hKey, "lfStrikeOut", &Globals.lfFont.lfStrikeOut); + QueryByte(hKey, "lfUnderline", &Globals.lfFont.lfUnderline); + QueryDword(hKey, "lfWeight", &Globals.lfFont.lfWeight); + QueryDword(hKey, "iPointSize", &dwPointSize); + + if (dwPointSize != 0) + Globals.lfFont.lfHeight = HeightFromPointSize(dwPointSize); + + hFont = CreateFontIndirect(&Globals.lfFont); + if (hFont) + { + if (Globals.hFont) + DeleteObject(Globals.hFont); + Globals.hFont = hFont; + } + + RegCloseKey(hKey); + } +} + +static BOOL SaveDword(HKEY hKey, LPCSTR pszValueName, DWORD dwValue) +{ + WCHAR szValueW[32]; + LPCTSTR pszValueNameT; + +#ifdef UNICODE + MultiByteToWideChar(CP_ACP, 0, pszValueName, -1, szValueW, sizeof(szValueW) / sizeof(szValueW[0])); + pszValueNameT = szValueW; +#else + pszValueNameT = pszValueName; +#endif + + return RegSetValueEx(hKey, pszValueNameT, 0, REG_DWORD, (LPBYTE) &dwValue, sizeof(dwValue)) == ERROR_SUCCESS; +} + +static BOOL SaveString(HKEY hKey, LPCSTR pszValueName, LPCTSTR pszValue) +{ + WCHAR szValueW[32]; + LPCTSTR pszValueNameT; + +#ifdef UNICODE + MultiByteToWideChar(CP_ACP, 0, pszValueName, -1, szValueW, sizeof(szValueW) / sizeof(szValueW[0])); + pszValueNameT = szValueW; +#else + pszValueNameT = pszValueName; +#endif + + return RegSetValueEx(hKey, pszValueNameT, 0, REG_SZ, (LPBYTE) pszValue, _tcslen(pszValue) * sizeof(*pszValue)) == ERROR_SUCCESS; +} + +void SaveSettings(void) +{ + HKEY hKey; + DWORD dwDisposition; + + if (RegCreateKeyEx(HKEY_CURRENT_USER, s_szRegistryKey, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hKey, &dwDisposition) + == ERROR_SUCCESS) + { + SaveDword(hKey, "lfCharSet", Globals.lfFont.lfCharSet); + SaveDword(hKey, "lfClipPrecision", Globals.lfFont.lfClipPrecision); + SaveDword(hKey, "lfEscapement", Globals.lfFont.lfEscapement); + SaveString(hKey, "lfFaceName", Globals.lfFont.lfFaceName); + SaveDword(hKey, "lfItalic", Globals.lfFont.lfItalic); + SaveDword(hKey, "lfOrientation", Globals.lfFont.lfOrientation); + SaveDword(hKey, "lfOutPrecision", Globals.lfFont.lfOutPrecision); + SaveDword(hKey, "lfPitchAndFamily", Globals.lfFont.lfPitchAndFamily); + SaveDword(hKey, "lfQuality", Globals.lfFont.lfQuality); + SaveDword(hKey, "lfStrikeOut", Globals.lfFont.lfStrikeOut); + SaveDword(hKey, "lfUnderline", Globals.lfFont.lfUnderline); + SaveDword(hKey, "lfWeight", Globals.lfFont.lfWeight); + SaveDword(hKey, "iPointSize", PointSizeFromHeight(Globals.lfFont.lfHeight)); + + RegCloseKey(hKey); + } + +}

19 years, 2 months

[weiden] 18163: use the correct down-level scope filter flag for the computer selection dialog

by weiden＠svn.reactos.com

use the correct down-level scope filter flag for the computer selection dialog Modified: trunk/reactos/subsys/system/regedit/framewnd.c _____ Modified: trunk/reactos/subsys/system/regedit/framewnd.c --- trunk/reactos/subsys/system/regedit/framewnd.c 2005-09-30 01:26:02 UTC (rev 18162) +++ trunk/reactos/subsys/system/regedit/framewnd.c 2005-09-30 01:47:46 UTC (rev 18163) @@ -558,8 +558,7 @@ 0, 0 }, - DSOP_DOWNLEVEL_FILTER_COMPUTERS | - DSOP_DOWNLEVEL_FILTER_GLOBAL_GROUPS | DSOP_DOWNLEVEL_FILTER_ALL_WELLKNOWN_SIDS + DSOP_DOWNLEVEL_FILTER_COMPUTERS }, NULL, NULL,

19 years, 2 months

[weiden] 18162: display the computer selection dialog for remote registry administration

by weiden＠svn.reactos.com

display the computer selection dialog for remote registry administration Modified: trunk/reactos/subsys/system/regedit/Cz.rc Modified: trunk/reactos/subsys/system/regedit/De.rc Modified: trunk/reactos/subsys/system/regedit/En.rc Modified: trunk/reactos/subsys/system/regedit/Es.rc Modified: trunk/reactos/subsys/system/regedit/Fr.rc Modified: trunk/reactos/subsys/system/regedit/framewnd.c Modified: trunk/reactos/subsys/system/regedit/main.c _____ Modified: trunk/reactos/subsys/system/regedit/Cz.rc --- trunk/reactos/subsys/system/regedit/Cz.rc 2005-09-29 22:57:42 UTC (rev 18161) +++ trunk/reactos/subsys/system/regedit/Cz.rc 2005-09-30 01:26:02 UTC (rev 18162) @@ -47,7 +47,7 @@ MENUITEM SEPARATOR MENUITEM "&P°ipojit sÝØov² registr...", ID_REGISTRY_CONNECTNETWORKREGISTRY - , GRAYED + MENUITEM "&Odpojit sÝØov² registr...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY , GRAYED _____ Modified: trunk/reactos/subsys/system/regedit/De.rc --- trunk/reactos/subsys/system/regedit/De.rc 2005-09-29 22:57:42 UTC (rev 18161) +++ trunk/reactos/subsys/system/regedit/De.rc 2005-09-30 01:26:02 UTC (rev 18162) @@ -47,7 +47,7 @@ MENUITEM SEPARATOR MENUITEM "&Mit Netzwerkregistry verbinden...", ID_REGISTRY_CONNECTNETWORKREGISTRY - , GRAYED + MENUITEM "&Von Netzwerkregistry trennen...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY , GRAYED _____ Modified: trunk/reactos/subsys/system/regedit/En.rc --- trunk/reactos/subsys/system/regedit/En.rc 2005-09-29 22:57:42 UTC (rev 18161) +++ trunk/reactos/subsys/system/regedit/En.rc 2005-09-30 01:26:02 UTC (rev 18162) @@ -47,7 +47,7 @@ MENUITEM SEPARATOR MENUITEM "&Connect Network Registry...", ID_REGISTRY_CONNECTNETWORKREGISTRY - , GRAYED + MENUITEM "&Disconnect Network Registry...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY , GRAYED _____ Modified: trunk/reactos/subsys/system/regedit/Es.rc --- trunk/reactos/subsys/system/regedit/Es.rc 2005-09-29 22:57:42 UTC (rev 18161) +++ trunk/reactos/subsys/system/regedit/Es.rc 2005-09-30 01:26:02 UTC (rev 18162) @@ -44,7 +44,7 @@ MENUITEM "&Importar archivo de registro...", ID_REGISTRY_IMPORTREGISTRYFILE MENUITEM "&Exportar archivo de registro...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "&Conectar registro de red...", ID_REGISTRY_CONNECTNETWORKREGISTRY, GRAYED + MENUITEM "&Conectar registro de red...", ID_REGISTRY_CONNECTNETWORKREGISTRY MENUITEM "&Desconectar registro de red...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED MENUITEM SEPARATOR MENUITEM "Im&primir\tCtrl+P", ID_REGISTRY_PRINT, GRAYED _____ Modified: trunk/reactos/subsys/system/regedit/Fr.rc --- trunk/reactos/subsys/system/regedit/Fr.rc 2005-09-29 22:57:42 UTC (rev 18161) +++ trunk/reactos/subsys/system/regedit/Fr.rc 2005-09-30 01:26:02 UTC (rev 18162) @@ -45,7 +45,7 @@ MENUITEM "&Importer un fichier de registres...", ID_REGISTRY_IMPORTREGISTRYFILE MENUITEM "&Exporter un fichier de registres...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR - MENUITEM "&Connecter Ó des registres via le rÚseau...", ID_REGISTRY_CONNECTNETWORKREGISTRY, GRAYED + MENUITEM "&Connecter Ó des registres via le rÚseau...", ID_REGISTRY_CONNECTNETWORKREGISTRY MENUITEM "&DÚconnecter de registres rÚseau...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED MENUITEM SEPARATOR MENUITEM "Im&primer\tCtrl+P", ID_REGISTRY_PRINT, GRAYED _____ Modified: trunk/reactos/subsys/system/regedit/framewnd.c --- trunk/reactos/subsys/system/regedit/framewnd.c 2005-09-29 22:57:42 UTC (rev 18161) +++ trunk/reactos/subsys/system/regedit/framewnd.c 2005-09-30 01:26:02 UTC (rev 18162) @@ -18,8 +18,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ - #include <windows.h> #include <tchar.h> #include <commctrl.h> @@ -28,6 +26,7 @@ #include <stdlib.h> #include <stdio.h> #include <shellapi.h> +#include <objsel.h> #include "main.h" #include "regproc.h" @@ -529,6 +528,129 @@ return TRUE; } +static HRESULT +InitializeRemoteRegistryPicker(OUT IDsObjectPicker **pDsObjectPicker) +{ + HRESULT hRet; + + *pDsObjectPicker = NULL; + + hRet = CoCreateInstance(&CLSID_DsObjectPicker, + NULL, + CLSCTX_INPROC_SERVER, + &IID_IDsObjectPicker, + (LPVOID*)pDsObjectPicker); + if (SUCCEEDED(hRet)) + { + DSOP_INIT_INFO InitInfo; + DSOP_SCOPE_INIT_INFO Scopes[] = + { + { + sizeof(DSOP_SCOPE_INIT_INFO), + DSOP_SCOPE_TYPE_USER_ENTERED_UPLEVEL_SCOPE | DSOP_SCOPE_TYPE_USER_ENTERED_DOWNLEVEL_SCOPE | + DSOP_SCOPE_TYPE_GLOBAL_CATALOG | DSOP_SCOPE_TYPE_EXTERNAL_UPLEVEL_DOMAIN | + DSOP_SCOPE_TYPE_EXTERNAL_DOWNLEVEL_DOMAIN | DSOP_SCOPE_TYPE_WORKGROUP | + DSOP_SCOPE_TYPE_UPLEVEL_JOINED_DOMAIN | DSOP_SCOPE_TYPE_DOWNLEVEL_JOINED_DOMAIN, + 0, + { + { + DSOP_FILTER_COMPUTERS, + 0, + 0 + }, + DSOP_DOWNLEVEL_FILTER_COMPUTERS | + DSOP_DOWNLEVEL_FILTER_GLOBAL_GROUPS | DSOP_DOWNLEVEL_FILTER_ALL_WELLKNOWN_SIDS + }, + NULL, + NULL, + S_OK + }, + }; + + InitInfo.cbSize = sizeof(InitInfo); + InitInfo.pwzTargetComputer = NULL; + InitInfo.cDsScopeInfos = sizeof(Scopes) / sizeof(Scopes[0]); + InitInfo.aDsScopeInfos = Scopes; + InitInfo.flOptions = DSOP_SCOPE_TYPE_TARGET_COMPUTER; + InitInfo.cAttributesToFetch = 0; + InitInfo.apwzAttributeNames = NULL; + + hRet = (*pDsObjectPicker)->lpVtbl->Initialize(*pDsObjectPicker, + &InitInfo); + + if (FAILED(hRet)) + { + /* delete the object picker in case initialization failed! */ + (*pDsObjectPicker)->lpVtbl->Release(*pDsObjectPicker); + } + } + + return hRet; +} + +static HRESULT +InvokeRemoteRegistryPickerDialog(IN IDsObjectPicker *pDsObjectPicker, + IN HWND hwndParent OPTIONAL, + OUT LPWSTR lpBuffer, + IN UINT uSize) +{ + IDataObject *pdo = NULL; + HRESULT hRet; + + hRet = pDsObjectPicker->lpVtbl->InvokeDialog(pDsObjectPicker, + hwndParent, + &pdo); + if (hRet == S_OK) + { + STGMEDIUM stm; + FORMATETC fe; + + fe.cfFormat = RegisterClipboardFormat(CFSTR_DSOP_DS_SELECTION_LIST); + fe.ptd = NULL; + fe.dwAspect = DVASPECT_CONTENT; + fe.lindex = -1; + fe.tymed = TYMED_HGLOBAL; + + hRet = pdo->lpVtbl->GetData(pdo, + &fe, + &stm); + if (SUCCEEDED(hRet)) + { + PDS_SELECTION_LIST SelectionList = (PDS_SELECTION_LIST)GlobalLock(stm.hGlobal); + if (SelectionList != NULL) + { + if (SelectionList->cItems == 1) + { + UINT nlen = wcslen(SelectionList->aDsSelection[0].pwzName); + if (nlen >= uSize) + { + nlen = uSize - 1; + } + + memcpy(lpBuffer, + SelectionList->aDsSelection[0].pwzName, + nlen * sizeof(WCHAR)); + lpBuffer[nlen] = L'\0'; + } + + GlobalUnlock(stm.hGlobal); + } + + ReleaseStgMedium(&stm); + } + + pdo->lpVtbl->Release(pdo); + } + + return hRet; +} + +static VOID +FreeObjectPicker(IN IDsObjectPicker *pDsObjectPicker) +{ + pDsObjectPicker->lpVtbl->Release(pDsObjectPicker); +} + /*********************************************************************** ******** * * FUNCTION: _CmdWndProc(HWND, unsigned, WORD, LONG) @@ -554,7 +676,28 @@ ExportRegistryFile(hWnd); return TRUE; case ID_REGISTRY_CONNECTNETWORKREGISTRY: + { + IDsObjectPicker *ObjectPicker; + WCHAR szComputerName[MAX_COMPUTERNAME_LENGTH + 1]; + HRESULT hRet; + + hRet = InitializeRemoteRegistryPicker(&ObjectPicker); + if (SUCCEEDED(hRet)) + { + hRet = InvokeRemoteRegistryPickerDialog(ObjectPicker, + hWnd, + szComputerName, + sizeof(szComputerName) / sizeof(szComputerName[0])); + if (hRet == S_OK) + { + /* FIXME - connect to the registry */ + } + + FreeObjectPicker(ObjectPicker); + } + return TRUE; + } case ID_REGISTRY_DISCONNECTNETWORKREGISTRY: return TRUE; case ID_REGISTRY_PRINT: _____ Modified: trunk/reactos/subsys/system/regedit/main.c --- trunk/reactos/subsys/system/regedit/main.c 2005-09-29 22:57:42 UTC (rev 18161) +++ trunk/reactos/subsys/system/regedit/main.c 2005-09-30 01:26:02 UTC (rev 18162) @@ -30,6 +30,7 @@ #include <fcntl.h> #include <aclui.h> #include <cguid.h> +#include <objbase.h> #include "main.h" #include "hexedit.h" @@ -189,6 +190,7 @@ { MSG msg; HACCEL hAccel; + HRESULT hComInit; /* int hCrt; FILE *hf; @@ -221,6 +223,9 @@ return FALSE; } hAccel = LoadAccelerators(hInstance, (LPCTSTR)IDC_REGEDIT); + + /* initialize the COM library for the remote registry object picker dialog */ + hComInit = CoInitialize(NULL); /* Main message loop */ while (GetMessage(&msg, (HWND)NULL, 0, 0)) { @@ -230,6 +235,12 @@ DispatchMessage(&msg); } } + + if (SUCCEEDED(hComInit)) + { + CoUninitialize(); + } + ExitInstance(hInstance); return msg.wParam; }

19 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2005