Ros-diffs September 2005

ros-diffs@reactos.org

22 participants
582 discussions

[gedmurphy] 18161: use carrige returns :)

by gedmurphy＠svn.reactos.com

use carrige returns :) Modified: trunk/reactos/apps/utils/net/tcpsvcs/qotd.c _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/qotd.c --- trunk/reactos/apps/utils/net/tcpsvcs/qotd.c 2005-09-29 22:36:46 UTC (rev 18160) +++ trunk/reactos/apps/utils/net/tcpsvcs/qotd.c 2005-09-29 22:57:42 UTC (rev 18161) @@ -7,13 +7,13 @@ //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\"\n - kjk hyperion"), + _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\"\n - Alex Ionescu"), - _T("\"i don't know about any bug; none exist; ReactOS is prefect\"\n - filip2307"), - _T("\"if you were kernel code, cutler would rewrite you.\"\n - Alex Ionescu"), - _T("\"Looks like Hartmut is cleaning out his WC. working copy, that is\"\n - WaxDragon") - _T("\"don't question it ... it's clearly an optimization\"\n - arty") + _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_)

18 years, 11 months

[gedmurphy] 18160: randomise the quote sent

by gedmurphy＠svn.reactos.com

randomise the quote sent Modified: trunk/reactos/apps/utils/net/tcpsvcs/qotd.c _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/qotd.c --- trunk/reactos/apps/utils/net/tcpsvcs/qotd.c 2005-09-29 20:41:12 UTC (rev 18159) +++ trunk/reactos/apps/utils/net/tcpsvcs/qotd.c 2005-09-29 22:36:46 UTC (rev 18160) @@ -7,13 +7,13 @@ //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\" - kjk hyperion"), + _T("\"I have a penchant for mischief, property damage, stalking and cheesecake, of course\"\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\" - Alex Ionescu"), - _T("\"i don't know about any bug; none exist; ReactOS is prefect\" - filip2307"), - _T("\"if you were kernel code, cutler would rewrite you.\" - Alex Ionescu"), - _T("\"Looks like Hartmut is cleaning out his WC. working copy, that is\" - WaxDragon") - _T("\"don't question it ... it's clearly an optimization\" - arty") + _T("\"if the code is broken though, your free to call it ur own\"\n - Alex Ionescu"), + _T("\"i don't know about any bug; none exist; ReactOS is prefect\"\n - filip2307"), + _T("\"if you were kernel code, cutler would rewrite you.\"\n - Alex Ionescu"), + _T("\"Looks like Hartmut is cleaning out his WC. working copy, that is\"\n - WaxDragon") + _T("\"don't question it ... it's clearly an optimization\"\n - arty") }; DWORD WINAPI QotdHandler(VOID* Sock_) @@ -21,12 +21,17 @@ DWORD Retval = 0; SOCKET Sock; INT NumOfQuotes; + INT QuoteToPrint; Sock = (SOCKET)Sock_; NumOfQuotes = sizeof(Quotes) / MAX_QUOTE_BUF; - SendQuote(Sock, Quotes[1]); + /* randomise the quote */ + srand((unsigned int) time(0)); + QuoteToPrint = rand() % NumOfQuotes; + SendQuote(Sock, Quotes[QuoteToPrint]); + _tprintf(_T("Shutting connection down...\n")); if (ShutdownConnection(Sock, FALSE)) _tprintf(_T("Connection is down.\n"));

18 years, 11 months

[gedmurphy] 18159: discard.c

by gedmurphy＠svn.reactos.com

discard.c - implemented discard. chargen.c - improve efficiency sending full line instead of singular chars. TCP will generally wait until the packet is full anyway, so it's pointless to keep calling send for each char. tcpsvcs.c - implement the beginnings of the code to start tcpsvcs as a service. #if 0'd out at the moment. Fix bug from calling non existant DiscardHandler. Surely this is enough info to satisfy lkcl this time :p Modified: trunk/reactos/apps/utils/net/tcpsvcs/chargen.c Added: trunk/reactos/apps/utils/net/tcpsvcs/discard.c Modified: trunk/reactos/apps/utils/net/tcpsvcs/echo.c Modified: trunk/reactos/apps/utils/net/tcpsvcs/qotd.c Modified: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.c Modified: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.h Modified: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.xml _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/chargen.c --- trunk/reactos/apps/utils/net/tcpsvcs/chargen.c 2005-09-29 19:34:53 UTC (rev 18158) +++ trunk/reactos/apps/utils/net/tcpsvcs/chargen.c 2005-09-29 20:41:12 UTC (rev 18159) @@ -8,15 +8,15 @@ DWORD Retval = 0; SOCKET Sock = (SOCKET)Sock_; - if (!GenerateChars(Sock)) { + if (!GenerateChars(Sock)) + { _tprintf(_T("Char generation failed\n")); Retval = 3; } _tprintf(_T("Shutting connection down...\n")); - if (ShutdownConnection(Sock, FALSE)) { + if (ShutdownConnection(Sock, FALSE)) _tprintf(_T("Connection is down.\n")); - } else { _tprintf(_T("Connection shutdown failed\n")); @@ -31,12 +31,12 @@ BOOL GenerateChars(SOCKET Sock) { - int i, - charIndex, /* internal loop */ - loopIndex; /* line loop */ + int i; + int charIndex; /* internal loop */ + int loopIndex; /* line loop */ char ring[END-START]; char *endring; - BOOL bLoop = TRUE; + char Line[LINESIZ]; /* fill ring with printable characters */ for (charIndex=0, i=START; i<=END; charIndex++, i++) @@ -46,36 +46,31 @@ /* where we will start output from */ loopIndex = 0; - - while (bLoop) + while (1) { - /* if the loop index is equal to number of chars previously - * printed, start the loop from the beginning */ + /* if the loop index is equal to the last char, + * start the loop again from the beginning */ if (loopIndex == END-START) loopIndex = 0; /* start printing from char controled by loopIndex */ charIndex = loopIndex; - for (i=0; i<LINESIZ; i++) + for (i=0; i < LINESIZ - 2; i++) { - /* FIXME: Should send lines instead of chars to improve efficiency - * TCP will wait until it fills a packet anway before putting on - * the wire, so it's pointless to keep polling send */ - if (!SendChar(Sock, ring[charIndex])) - { - return FALSE; - } - /* if current char equal last char, reset */ + Line[i] = ring[charIndex]; + if (ring[charIndex] == *endring) charIndex = 0; else charIndex++; } - if (bLoop) - if ((!SendChar(Sock, L'\r')) || (!SendChar(Sock, L'\n'))) - return FALSE; + Line[LINESIZ - 2] = L'\r'; + Line[LINESIZ - 1] = L'\n'; + if (!SendLine(Sock, Line)) + break; + /* increment loop index to start printing from next char in ring */ loopIndex++; } @@ -83,17 +78,25 @@ return TRUE; } -BOOL SendChar(SOCKET Sock, TCHAR c) +BOOL SendLine(SOCKET Sock, TCHAR* Line) { INT RetVal; INT SentBytes; + INT LineSize; + LineSize = sizeof(TCHAR) * LINESIZ; + SentBytes = 0; - RetVal = send(Sock, &c, sizeof(TCHAR), 0); + RetVal = send(Sock, Line, LineSize, 0); /*FIXME: need to establish if peer closes connection, not just report a socket error */ if (RetVal > 0) { + if (RetVal != LineSize) + { + _tprintf(("Not sent enough\n")); + return FALSE; + } SentBytes += RetVal; return TRUE; } _____ Added: trunk/reactos/apps/utils/net/tcpsvcs/discard.c --- trunk/reactos/apps/utils/net/tcpsvcs/discard.c 2005-09-29 19:34:53 UTC (rev 18158) +++ trunk/reactos/apps/utils/net/tcpsvcs/discard.c 2005-09-29 20:41:12 UTC (rev 18159) @@ -0,0 +1,54 @@ +#include <stdio.h> +#include <winsock2.h> +#include <tchar.h> +#include "tcpsvcs.h" + +DWORD WINAPI DiscardHandler(VOID* Sock_) +{ + DWORD Retval = 0; + SOCKET Sock = (SOCKET)Sock_; + + if (!RecieveIncomingPackets(Sock)) + { + _tprintf(_T("RecieveIncomingPackets failed\n")); + Retval = 3; + } + + _tprintf(_T("Shutting connection down...\n")); + if (ShutdownConnection(Sock, TRUE)) + { + _tprintf(_T("Connection is down.\n")); + } + else + { + _tprintf(_T("Connection shutdown failed\n")); + Retval = 3; + } + _tprintf(_T("Terminating thread\n")); + ExitThread(0); + + return Retval; +} + + + +BOOL RecieveIncomingPackets(SOCKET Sock) +{ + TCHAR ReadBuffer[BUF]; + INT ReadBytes; + + do + { + ReadBytes = recv(Sock, ReadBuffer, BUF, 0); + if (ReadBytes > 0) + _tprintf(_T("Received %d bytes from client\n"), ReadBytes); + else if (ReadBytes == SOCKET_ERROR) + { + _tprintf(("Socket Error: %d\n"), WSAGetLastError()); + return FALSE; + } + } while (ReadBytes > 0); + + _tprintf(("Connection closed by peer.\n")); + return TRUE; +} _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/echo.c --- trunk/reactos/apps/utils/net/tcpsvcs/echo.c 2005-09-29 19:34:53 UTC (rev 18158) +++ trunk/reactos/apps/utils/net/tcpsvcs/echo.c 2005-09-29 20:41:12 UTC (rev 18159) @@ -39,21 +39,24 @@ do { ReadBytes = recv(Sock, ReadBuffer, BUF, 0); - if (ReadBytes > 0) { + if (ReadBytes > 0) + { _tprintf(_T("Received %d bytes from client\n"), ReadBytes); SentBytes = 0; - while (SentBytes < ReadBytes) { + while (SentBytes < ReadBytes) + { Temp = send(Sock, ReadBuffer + SentBytes, ReadBytes - SentBytes, 0); - if (Temp > 0) { + if (Temp > 0) + { _tprintf(_T("Sent %d bytes back to client\n"), Temp); SentBytes += Temp; } - else if (Temp == SOCKET_ERROR) { + else if (Temp == SOCKET_ERROR) return FALSE; - } - else { + else + { /* Client closed connection before we could reply to all the data it sent, so quit early. */ _tprintf(_T("Peer unexpectedly dropped connection!\n")); @@ -61,9 +64,9 @@ } } } - else if (ReadBytes == SOCKET_ERROR) { + else if (ReadBytes == SOCKET_ERROR) return FALSE; - } + } while (ReadBytes != 0); _tprintf(("Connection closed by peer.\n")); _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/qotd.c --- trunk/reactos/apps/utils/net/tcpsvcs/qotd.c 2005-09-29 19:34:53 UTC (rev 18158) +++ trunk/reactos/apps/utils/net/tcpsvcs/qotd.c 2005-09-29 20:41:12 UTC (rev 18159) @@ -5,13 +5,15 @@ #include "tcpsvcs.h" //these need putting in an RC file. -TCHAR Quotes[][MAX_QUOTE_BUF] = { +TCHAR Quotes[][MAX_QUOTE_BUF] = +{ _T("\"I have a penchant for mischief, property damage, stalking and cheesecake, of course\" - kjk hyperion"), _T("\"Wow! I fixed a setmenu bug.\" - jimtabor"), _T("\"if the code is broken though, your free to call it ur own\" - Alex Ionescu"), _T("\"i don't know about any bug; none exist; ReactOS is prefect\" - filip2307"), _T("\"if you were kernel code, cutler would rewrite you.\" - Alex Ionescu"), _T("\"Looks like Hartmut is cleaning out his WC. working copy, that is\" - WaxDragon") + _T("\"don't question it ... it's clearly an optimization\" - arty") }; DWORD WINAPI QotdHandler(VOID* Sock_) _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.c --- trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.c 2005-09-29 19:34:53 UTC (rev 18158) +++ trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.c 2005-09-29 20:41:12 UTC (rev 18159) @@ -3,25 +3,39 @@ #include <tchar.h> #include "tcpsvcs.h" +static LPTHREAD_START_ROUTINE -ServiceHandler[NUM_SERVICES] = { +ServiceHandler[NUM_SERVICES] = +{ EchoHandler, - ChargenHandler, + DiscardHandler, DaytimeHandler, - NULL, - QotdHandler + QotdHandler, + ChargenHandler }; -INT ServicePort[NUM_SERVICES] = { +static int +ServicePort[NUM_SERVICES] = +{ ECHO_PORT, - CHARGEN_PORT, + DISCARD_PORT, DAYTIME_PORT, - DISCARD_PORT, - QOTD_PORT + QOTD_PORT, + CHARGEN_PORT }; -int main(int argc, char *argv[]) +#if 0 +static +SERVICE_TABLE_ENTRY +ServiceTable[2] = { + {TEXT("tcpsvcs"), ServiceMain}, + {NULL, NULL} +}; +#endif + +int main(void) +{ PSERVICES pServices[NUM_SERVICES]; DWORD dwThreadId[NUM_SERVICES]; HANDLE hThread[NUM_SERVICES]; @@ -32,7 +46,7 @@ { /* Allocate memory for thread data. */ pServices[i] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SERVICES)); - + if( pServices[i] == NULL ) ExitProcess(2); @@ -63,6 +77,68 @@ { CloseHandle(hThread[i]); } + return 0; +} +#if 0 +static VOID CALLBACK +ServiceMain(DWORD argc, LPTSTR *argv) +{ + PSERVICES pServices[NUM_SERVICES]; + DWORD dwThreadId[NUM_SERVICES]; + HANDLE hThread[NUM_SERVICES]; + INT i; + + /* Create MAX_THREADS worker threads. */ + for( i=0; i<NUM_SERVICES; i++ ) + { + /* Allocate memory for thread data. */ + pServices[i] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SERVICES)); + + if( pServices[i] == NULL ) + ExitProcess(2); + + /* Generate unique data for each thread. */ + pServices[i]->Service = ServiceHandler[i]; + pServices[i]->Port = ServicePort[i]; + + hThread[i] = CreateThread( + NULL, // default security attributes + 0, // use default stack size + StartServer, // thread function + pServices[i], // argument to thread function + 0, // use default creation flags + &dwThreadId[i]); // returns the thread identifier + + /* Check the return value for success. */ + if (hThread[i] == NULL) + { + ExitProcess(i); + } + } + + /* Wait until all threads have terminated. */ + WaitForMultipleObjects(NUM_SERVICES, hThread, TRUE, INFINITE); + + /* Close all thread handles upon completion. */ + for(i=0; i<NUM_SERVICES; i++) + { + CloseHandle(hThread[i]); + } + +} + +int +main(int argc, char *argv[]) +{ + DPRINT("tcpsvcs: main() started\n"); + + StartServiceCtrlDispatcher(ServiceTable); + + DPRINT("Umpnpmgr: main() done\n"); + + ExitThread(0); + return 0; } +#endif _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.h --- trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.h 2005-09-29 19:34:53 UTC (rev 18158) +++ trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.h 2005-09-29 20:41:12 UTC (rev 18159) @@ -1,9 +1,9 @@ /* default port numbers */ #define ECHO_PORT 7 -#define CHARGEN_PORT 19 +#define DISCARD_PORT 9 #define DAYTIME_PORT 13 -#define DISCARD_PORT 9 #define QOTD_PORT 17 +#define CHARGEN_PORT 19 #define NUM_SERVICES 6 #define BUF_SIZE 255 @@ -17,7 +17,7 @@ #define END 126 /* number of chars to put on a line */ -#define LINESIZ 72 +#define LINESIZ 74 // 72 + /r and /n /* data structure to pass to threads */ typedef struct _Services { @@ -25,6 +25,9 @@ LPTHREAD_START_ROUTINE Service; } SERVICES, *PSERVICES; +/* tcpsvcs functions */ +//static VOID CALLBACK ServiceMain(DWORD argc, LPTSTR *argv); + /* skelserver functions */ DWORD WINAPI StartServer(LPVOID lpParam); SOCKET SetUpListener(const char* ServAddr, int Port); @@ -35,7 +38,7 @@ /* chargen functions */ DWORD WINAPI ChargenHandler(VOID* Sock_); BOOL GenerateChars(SOCKET Sock); -BOOL SendChar(SOCKET Sock, CHAR c); +BOOL SendLine(SOCKET Sock, TCHAR* Line); /* daytime functions */ DWORD WINAPI DaytimeHandler(VOID* Sock_); @@ -46,8 +49,9 @@ BOOL EchoIncomingPackets(SOCKET Sock); /* discard functions */ +DWORD WINAPI DiscardHandler(VOID* Sock_); +BOOL RecieveIncomingPackets(SOCKET Sock); - /* qotd functions */ DWORD WINAPI QotdHandler(VOID* Sock_); BOOL SendQuote(SOCKET Sock, TCHAR* Quote); _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.xml --- trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.xml 2005-09-29 19:34:53 UTC (rev 18158) +++ trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.xml 2005-09-29 20:41:12 UTC (rev 18159) @@ -8,8 +8,9 @@ <file>tcpsvcs.c</file> <file>skelserver.c</file> <file>echo.c</file> - <file>chargen.c</file> + <file>discard.c</file> <file>daytime.c</file> <file>qotd.c</file> + <file>chargen.c</file> + <file>tcpsvcs.rc</file> </module> -

18 years, 11 months

[weiden] 18158: Some fixes to CreateDirectoryEx:

by weiden＠svn.reactos.com

Some fixes to CreateDirectoryEx: - properly copy the directory attributes - add basic support to handle reparse points and add fallback code if the file system doesn't support them Modified: trunk/reactos/lib/kernel32/file/dir.c _____ Modified: trunk/reactos/lib/kernel32/file/dir.c --- trunk/reactos/lib/kernel32/file/dir.c 2005-09-29 16:55:59 UTC (rev 18157) +++ trunk/reactos/lib/kernel32/file/dir.c 2005-09-29 19:34:53 UTC (rev 18158) @@ -116,7 +116,8 @@ (lpSecurityAttributes ? lpSecurityAttributes->lpSecurityDescriptor : NULL)); Status = NtCreateFile (&DirectoryHandle, - GENERIC_READ, + FILE_LIST_DIRECTORY | SYNCHRONIZE | + FILE_OPEN_FOR_BACKUP_INTENT, &ObjectAttributes, &IoStatusBlock, NULL, @@ -157,17 +158,28 @@ OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; UNICODE_STRING NtPathU, NtTemplatePathU; - HANDLE DirectoryHandle, TemplateHandle; + HANDLE DirectoryHandle = NULL; + HANDLE TemplateHandle = NULL; FILE_EA_INFORMATION EaInformation; + FILE_BASIC_INFORMATION FileBasicInfo; NTSTATUS Status; + ULONG OpenOptions, CreateOptions; + ACCESS_MASK DesiredAccess; + BOOLEAN ReparsePoint = FALSE; PVOID EaBuffer = NULL; ULONG EaLength = 0; + + OpenOptions = FILE_DIRECTORY_FILE | FILE_OPEN_REPARSE_POINT | + FILE_OPEN_FOR_BACKUP_INTENT; + CreateOptions = FILE_DIRECTORY_FILE | FILE_OPEN_FOR_BACKUP_INTENT; + DesiredAccess = FILE_LIST_DIRECTORY | SYNCHRONIZE | FILE_WRITE_ATTRIBUTES | + FILE_READ_ATTRIBUTES; - DPRINT ("lpTemplateDirectory %S lpNewDirectory %S lpSecurityAttributes %p\n", + DPRINT ("lpTemplateDirectory %ws lpNewDirectory %ws lpSecurityAttributes %p\n", lpTemplateDirectory, lpNewDirectory, lpSecurityAttributes); /* - * Read the extended attributes from the template directory + * Translate the template directory path */ if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpTemplateDirectory, @@ -180,31 +192,107 @@ } InitializeObjectAttributes(&ObjectAttributes, + &NtPathU, + OBJ_CASE_INSENSITIVE, + NULL, + (lpSecurityAttributes ? lpSecurityAttributes->lpSecurityDescriptor : NULL)); + + InitializeObjectAttributes(&ObjectAttributes, &NtTemplatePathU, OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtCreateFile (&TemplateHandle, - GENERIC_READ, - &ObjectAttributes, - &IoStatusBlock, - NULL, - 0, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_OPEN, - FILE_DIRECTORY_FILE, - NULL, - 0); + /* + * Open the template directory + */ + +OpenTemplateDir: + Status = NtOpenFile (&TemplateHandle, + FILE_LIST_DIRECTORY | FILE_READ_ATTRIBUTES | FILE_READ_EA, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + OpenOptions); if (!NT_SUCCESS(Status)) { - RtlFreeHeap (RtlGetProcessHeap (), - 0, - NtTemplatePathU.Buffer); - SetLastErrorByStatus (Status); - return FALSE; + if (Status == STATUS_INVALID_PARAMETER && + (OpenOptions & FILE_OPEN_REPARSE_POINT)) + { + /* Some FSs (FAT) don't support reparse points, try opening + the directory without FILE_OPEN_REPARSE_POINT */ + OpenOptions &= ~FILE_OPEN_REPARSE_POINT; + + DPRINT("Reparse points not supported, try with less options\n"); + + /* try again */ + goto OpenTemplateDir; + } + else + { + DPRINT1("Failed to open the template directory: 0x%x\n", Status); + goto CleanupNoNtPath; + } } + + /* + * Translate the new directory path and check if they're the same + */ + + if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpNewDirectory, + &NtPathU, + NULL, + NULL)) + { + Status = STATUS_OBJECT_PATH_NOT_FOUND; + goto CleanupNoNtPath; + } + + if (RtlEqualUnicodeString(&NtPathU, + &NtTemplatePathU, + TRUE)) + { + DPRINT1("Both directory paths are the same!\n"); + Status = STATUS_OBJECT_NAME_INVALID; + goto Cleanup; + } + + /* + * Query the basic file attributes from the template directory + */ + /* Make sure FILE_ATTRIBUTE_NORMAL is used in case the information + isn't set by the FS */ + FileBasicInfo.FileAttributes = FILE_ATTRIBUTE_NORMAL; + Status = NtQueryInformationFile(TemplateHandle, + &IoStatusBlock, + &FileBasicInfo, + sizeof(FILE_BASIC_INFORMATION), + FileBasicInformation); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to query the basic directory attributes\n"); + goto Cleanup; + } + + /* clear the reparse point attribute if present. We're going to set the + reparse point later which will cause the attribute to be set */ + if (FileBasicInfo.FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) + { + FileBasicInfo.FileAttributes &= ~FILE_ATTRIBUTE_REPARSE_POINT; + + /* writing the extended attributes requires the FILE_WRITE_DATA + access right */ + DesiredAccess |= FILE_WRITE_DATA; + + CreateOptions |= FILE_OPEN_REPARSE_POINT; + ReparsePoint = TRUE; + } + + /* + * Read the Extended Attributes if present + */ + for (;;) { Status = NtQueryInformationFile(TemplateHandle, @@ -261,66 +349,122 @@ } } - NtClose(TemplateHandle); - - RtlFreeHeap (RtlGetProcessHeap (), - 0, - NtTemplatePathU.Buffer); - if (!NT_SUCCESS(Status)) { - /* free the he extended attributes buffer */ - if (EaBuffer != NULL) - { - RtlFreeHeap (RtlGetProcessHeap (), - 0, - EaBuffer); - } - - SetLastErrorByStatus (Status); - return FALSE; + DPRINT1("Querying the EA data failed: 0x%x\n", Status); + goto Cleanup; } /* - * Create the new directory and copy over the extended attributes if - * needed + * Create the new directory */ - - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpNewDirectory, - &NtPathU, - NULL, - NULL)) - { - /* free the he extended attributes buffer */ - if (EaBuffer != NULL) - { - RtlFreeHeap (RtlGetProcessHeap (), - 0, - EaBuffer); - } - - SetLastError(ERROR_PATH_NOT_FOUND); - return FALSE; - } - - InitializeObjectAttributes(&ObjectAttributes, - &NtPathU, - OBJ_CASE_INSENSITIVE, - NULL, - (lpSecurityAttributes ? lpSecurityAttributes->lpSecurityDescriptor : NULL)); - Status = NtCreateFile (&DirectoryHandle, - GENERIC_READ, + DesiredAccess, &ObjectAttributes, &IoStatusBlock, NULL, - FILE_ATTRIBUTE_NORMAL, + FileBasicInfo.FileAttributes, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_CREATE, - FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, + CreateOptions, EaBuffer, EaLength); + if (!NT_SUCCESS(Status)) + { + if (ReparsePoint && + (Status == STATUS_INVALID_PARAMETER || Status == STATUS_ACCESS_DENIED)) + { + /* The FS doesn't seem to support reparse points... */ + DPRINT1("Cannot copy the hardlink, destination doesn\'t support reparse points!\n"); + } + goto Cleanup; + } + + if (ReparsePoint) + { + /* + * Copy the reparse point + */ + + PREPARSE_GUID_DATA_BUFFER ReparseDataBuffer = + (PREPARSE_GUID_DATA_BUFFER)RtlAllocateHeap(RtlGetProcessHeap(), + 0, + MAXIMUM_REPARSE_DATA_BUFFER_SIZE); + + if (ReparseDataBuffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; + } + + /* query the size of the reparse data buffer structure */ + Status = NtFsControlFile(TemplateHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FSCTL_GET_REPARSE_POINT, + NULL, + 0, + ReparseDataBuffer, + MAXIMUM_REPARSE_DATA_BUFFER_SIZE); + if (NT_SUCCESS(Status)) + { + /* write the reparse point */ + Status = NtFsControlFile(DirectoryHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FSCTL_SET_REPARSE_POINT, + ReparseDataBuffer, + MAXIMUM_REPARSE_DATA_BUFFER_SIZE, + NULL, + 0); + } + + RtlFreeHeap(RtlGetProcessHeap(), + 0, + ReparseDataBuffer); + + if (!NT_SUCCESS(Status)) + { + /* fail, we were unable to read the reparse point data! */ + DPRINT1("Querying or setting the reparse point failed: 0x%x\n", Status); + goto Cleanup; + } + } + else + { + /* + * Copy alternate file streams, if existing + */ + + /* FIXME - enumerate and copy the file streams */ + } + + /* + * We successfully created the directory and copied all information + * from the template directory + */ + Status = STATUS_SUCCESS; + +Cleanup: + RtlFreeHeap (RtlGetProcessHeap (), + 0, + NtPathU.Buffer); + +CleanupNoNtPath: + if (TemplateHandle != NULL) + { + NtClose(TemplateHandle); + } + + RtlFreeHeap (RtlGetProcessHeap (), + 0, + NtTemplatePathU.Buffer); + /* free the he extended attributes buffer */ if (EaBuffer != NULL) { @@ -329,9 +473,10 @@ EaBuffer); } - RtlFreeHeap (RtlGetProcessHeap (), - 0, - NtPathU.Buffer); + if (DirectoryHandle != NULL) + { + NtClose(DirectoryHandle); + } if (!NT_SUCCESS(Status)) { @@ -339,8 +484,6 @@ return FALSE; } - NtClose (DirectoryHandle); - return TRUE; }

18 years, 11 months

[weiden] 18157: added clb.dll (mostly just stubs) which is required by MS regedit for it's REG_FULL_RESOURCE_DESCRIPTOR editor. As there doesn't seem to be another application that uses it, this place is probably the best for it.

by weiden＠svn.reactos.com

added clb.dll (mostly just stubs) which is required by MS regedit for it's REG_FULL_RESOURCE_DESCRIPTOR editor. As there doesn't seem to be another application that uses it, this place is probably the best for it. Modified: trunk/reactos/baseaddress.xml Modified: trunk/reactos/bootdata/packages/reactos.dff Added: trunk/reactos/subsys/system/regedit/clb/ Added: trunk/reactos/subsys/system/regedit/clb/clb.c Added: trunk/reactos/subsys/system/regedit/clb/clb.def Added: trunk/reactos/subsys/system/regedit/clb/clb.rc Added: trunk/reactos/subsys/system/regedit/clb/clb.xml Added: trunk/reactos/subsys/system/regedit/clb/clb_En.rc Added: trunk/reactos/subsys/system/regedit/clb/clbdll.h Added: trunk/reactos/subsys/system/regedit/clb/precomp.h Added: trunk/reactos/subsys/system/regedit/clb/resource.h Modified: trunk/reactos/subsys/system/regedit/regedit.xml _____ Modified: trunk/reactos/baseaddress.xml --- trunk/reactos/baseaddress.xml 2005-09-29 16:55:01 UTC (rev 18156) +++ trunk/reactos/baseaddress.xml 2005-09-29 16:55:59 UTC (rev 18157) @@ -29,6 +29,7 @@ <property name="BASEADDRESS_SMDLL" value="0x6b3B0000" /> <property name="BASEADDRESS_URLMON" value="0x6b3C0000" /> <property name="BASEADDRESS_SERIALUI" value="0x6b3D0000" /> +<property name="BASEADDRESS_CLB" value="0x6f2b0000" /> <property name="BASEADDRESS_CARDS" value="0x701a0000" /> <property name="BASEADDRESS_WININET" value="0x70200000" /> <property name="BASEADDRESS_ACLUI" value="0x71550000" /> _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-09-29 16:55:01 UTC (rev 18156) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-09-29 16:55:59 UTC (rev 18157) @@ -174,6 +174,7 @@ subsys\system\msiexec\msiexec.exe 1 subsys\system\notepad\notepad.exe 1 subsys\system\regedit\regedit.exe 4 +subsys\system\regedit\clb\clb.dll 1 subsys\system\regsvr32\regsvr32.exe 1 subsys\system\reporterror\reporterror.exe 1 subsys\system\rundll32\rundll32.exe 1 _____ Added: trunk/reactos/subsys/system/regedit/clb/clb.c --- trunk/reactos/subsys/system/regedit/clb/clb.c 2005-09-29 16:55:01 UTC (rev 18156) +++ trunk/reactos/subsys/system/regedit/clb/clb.c 2005-09-29 16:55:59 UTC (rev 18157) @@ -0,0 +1,310 @@ +/* + * ReactOS Column List Box + * Copyright (C) 2005 Thomas Weidenmueller + * + * 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 Column List Box + * FILE: lib/clb/clb.c + * PURPOSE: Column List Box + * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> + * + * UPDATE HISTORY: + * 10/29/2005 Created + */ +#include <precomp.h> + +static HINSTANCE hDllInstance; + +static const WCHAR ClbClassName[] = L"ColumnListBox"; +static const WCHAR ClbColumns[] = L"Column1;Column2;Column3"; + +typedef struct _CLB_PRIVATEDATA +{ + HWND hwnd; +} CLB_PRIVATEDATA, *PCLB_PRIVATEDATA; + +static const CLBS_INFO ClbsSupportedStyles[] = +{ + { + CLBS_NOTIFY, + 0x0, + L"CLBS_NOTIFY" + }, + { + CLBS_SORT, + 0x0, + L"CLBS_SORT" + }, + { + CLBS_DISABLENOSCROLL, + 0x0, + L"CLBS_DISABLENOSCROLL" + }, + { + CLBS_VSCROLL, + 0x0, + L"CLBS_VSCROLL" + }, + { + CLBS_BORDER, + 0x0, + L"CLBS_BORDER" + }, + { + CLBS_POPOUT_HEADINGS, + 0x0, + L"CLBS_POPOUT_HEADINGS" + }, + { + CLBS_SPRINGLY_COLUMNS, + 0x0, + L"CLBS_SPRINGLY_COLUMNS" + }, + { + LBS_OWNERDRAWFIXED, + 0x0, + L"LBS_OWNERDRAWFIXED" + } +}; + +/* + * @unimplemented + */ +DWORD +WINAPI +ClbAddData(IN DWORD Unknown1, + IN DWORD Unknown2, + IN DWORD Unknown3) +{ + DPRINT1("ClbAddData(0x%x, 0x%x, 0x%x)\n", Unknown1, Unknown2, Unknown3); + return 0; +} + + +/* + * @unimplemented + */ +DWORD +WINAPI +ClbSetColumnWidths(IN DWORD Unknown1, + IN DWORD Unknown2, + IN DWORD Unknown3) +{ + DPRINT1("ClbSetColumnWidths(0x%x, 0x%x, 0x%x)\n", Unknown1, Unknown2, Unknown3); + return 0; +} + + +/* + * @unimplemented + */ +LRESULT +CALLBACK +ClbWndProc(IN HWND hwnd, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + PCLB_PRIVATEDATA PrivData; + LRESULT Ret = 0; + + DPRINT1("ClbWndProc(0x%p, 0x%x, 0x%p, 0x%p)\n", hwnd, uMsg, wParam, lParam); + + PrivData = (PCLB_PRIVATEDATA)GetWindowLongPtr(hwnd, + 0); + if (PrivData == NULL && uMsg != WM_CREATE) + { + goto HandleDefMsg; + } + + switch (uMsg) + { + case WM_CREATE: + PrivData = HeapAlloc(GetProcessHeap(), + 0, + sizeof(CLB_PRIVATEDATA)); + if (PrivData == NULL) + { + Ret = (LRESULT)-1; + break; + } + PrivData->hwnd = hwnd; + break; + + case WM_DESTROY: + HeapFree(GetProcessHeap(), + 0, + PrivData); + break; + + default: +HandleDefMsg: + Ret = DefWindowProc(hwnd, + uMsg, + wParam, + lParam); + break; + } + + return Ret; +} + + +static INT_PTR CALLBACK +ClbpStyleDlgProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + INT_PTR Ret = FALSE; + + DPRINT1("ClbpStyleDlgProc(0x%p, 0x%x, 0x%p, 0x%p)\n", hwndDlg, uMsg, wParam, lParam); + + switch (uMsg) + { + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + case IDCANCEL: + EndDialog(hwndDlg, + (INT_PTR)LOWORD(wParam)); + break; + } + break; + + case WM_CLOSE: + EndDialog(hwndDlg, + IDCANCEL); + break; + + case WM_INITDIALOG: + Ret = TRUE; + break; + } + + return Ret; +} + + +/* + * @implemented + */ +INT_PTR +WINAPI +ClbStyleW(IN HWND hWndParent, + IN LPARAM dwInitParam) +{ + return DialogBoxParam(hDllInstance, + MAKEINTRESOURCE(IDD_COLUMNLISTBOXSTYLES), + hWndParent, + ClbpStyleDlgProc, + dwInitParam); +} + + +/* + * @implemented + */ +BOOL +WINAPI +CustomControlInfoW(OUT LPCUSTOM_CONTROL_INFO CustomControlInfo OPTIONAL) +{ + if (CustomControlInfo != NULL) + { + wcscpy(CustomControlInfo->ClassName, + ClbClassName); + + CustomControlInfo->Zero1 = 0; + + wcscpy(CustomControlInfo->ClassName2, + ClbClassName); + + CustomControlInfo->Unknown1 = 0x60; /* FIXME - ??? */ + CustomControlInfo->Unknown2 = 0x50; /* FIXME - ??? */ + CustomControlInfo->Unknown3 = 0x50A10013; /* FIXME - ??? */ + + CustomControlInfo->Zero2 = 0; + CustomControlInfo->Zero3 = 0; + + CustomControlInfo->StylesCount = sizeof(ClbsSupportedStyles) / sizeof(ClbsSupportedStyles[0]); + CustomControlInfo->SupportedStyles = ClbsSupportedStyles; + + wcscpy(CustomControlInfo->Columns, + ClbColumns); + + CustomControlInfo->ClbStyleW = ClbStyleW; + + CustomControlInfo->Zero4 = 0; + CustomControlInfo->Zero5 = 0; + CustomControlInfo->Zero6 = 0; + } + + return TRUE; +} + +BOOL +WINAPI +DllMain(IN HINSTANCE hinstDLL, + IN DWORD dwReason, + IN LPVOID lpvReserved) +{ + BOOL Ret = TRUE; + + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + { + WNDCLASS ClbWndClass; + + hDllInstance = hinstDLL; + + InitCommonControls(); + + /* register the control's window class */ + ClbWndClass.style = CS_GLOBALCLASS | CS_OWNDC; + ClbWndClass.lpfnWndProc = ClbWndProc; + ClbWndClass.cbClsExtra = 0; + ClbWndClass.cbWndExtra = sizeof(PCLB_PRIVATEDATA); + ClbWndClass.hInstance = hinstDLL, + ClbWndClass.hIcon = NULL; + ClbWndClass.hCursor = LoadCursor(NULL, + (LPWSTR)IDC_ARROW); + ClbWndClass.hbrBackground = NULL; + ClbWndClass.lpszMenuName = NULL; + ClbWndClass.lpszClassName = ClbClassName; + + if (!RegisterClass(&ClbWndClass)) + { + Ret = FALSE; + break; + } + break; + } + + case DLL_THREAD_ATTACH: + case DLL_THREAD_DETACH: + break; + + case DLL_PROCESS_DETACH: + UnregisterClass(ClbClassName, + hinstDLL); + break; + } + return Ret; +} + Property changes on: trunk/reactos/subsys/system/regedit/clb/clb.c ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/regedit/clb/clb.def --- trunk/reactos/subsys/system/regedit/clb/clb.def 2005-09-29 16:55:01 UTC (rev 18156) +++ trunk/reactos/subsys/system/regedit/clb/clb.def 2005-09-29 16:55:59 UTC (rev 18157) @@ -0,0 +1,10 @@ +LIBRARY clb.dll + +EXPORTS +ClbAddData@12 @1 +ClbSetColumnWidths@12 @2 +ClbStyleW@8 @3 +ClbWndProc@16 @4 +CustomControlInfoW@4 @5 + +; EOF Property changes on: trunk/reactos/subsys/system/regedit/clb/clb.def ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/regedit/clb/clb.rc --- trunk/reactos/subsys/system/regedit/clb/clb.rc 2005-09-29 16:55:01 UTC (rev 18156) +++ trunk/reactos/subsys/system/regedit/clb/clb.rc 2005-09-29 16:55:59 UTC (rev 18157) @@ -0,0 +1,12 @@ +#include <windows.h> +#include <reactos/resource.h> +#include "resource.h" + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Column List Box\0" +#define REACTOS_STR_INTERNAL_NAME "clb\0" +#define REACTOS_STR_ORIGINAL_FILENAME "clb.dll\0" +#include <reactos/version.rc> + +#include "clb_En.rc" + Property changes on: trunk/reactos/subsys/system/regedit/clb/clb.rc ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/regedit/clb/clb.xml --- trunk/reactos/subsys/system/regedit/clb/clb.xml 2005-09-29 16:55:01 UTC (rev 18156) +++ trunk/reactos/subsys/system/regedit/clb/clb.xml 2005-09-29 16:55:59 UTC (rev 18157) @@ -0,0 +1,18 @@ +<module name="clb" type="win32dll" baseaddress="${BASEADDRESS_CLB}" installbase="system32" installname="clb.dll"> + <importlibrary definition="clb.def" /> + <include base="clb">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0500</define> + <define name="_WIN32_WINNT">0x0600</define> + <define name="WINVER">0x0600</define> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>comctl32</library> + <file>clb.c</file> + <file>clb.rc</file> + <pch>precomp.h</pch> +</module> Property changes on: trunk/reactos/subsys/system/regedit/clb/clb.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/regedit/clb/clb_En.rc --- trunk/reactos/subsys/system/regedit/clb/clb_En.rc 2005-09-29 16:55:01 UTC (rev 18156) +++ trunk/reactos/subsys/system/regedit/clb/clb_En.rc 2005-09-29 16:55:59 UTC (rev 18157) @@ -0,0 +1,28 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +IDD_COLUMNLISTBOXSTYLES DIALOGEX 0, 0, 227, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Column List Box Styles" +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Column List Box Styles", -1, 6, 7, 158, 71 + CHECKBOX "&Standard", 1710, 10, 20, 42, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Border", 1713, 10, 30, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "S&ort", 1705, 10, 40, 26, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Notif&y", 1706, 10, 50, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "V&ert. Scroll Bar", 1707, 10, 60, 64, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Multiple Selection", -1, 79, 20, 72, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | WS_DISABLED + CHECKBOX "E&xtended Selection", -1, 79, 30, 77, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | WS_DISABLED + CHECKBOX "&Popout Headings", 1714, 79, 40, 68, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Springy Columns", 1715, 79, 50, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + GROUPBOX "Basic Styles", -1, 6, 80, 158, 34 + CHECKBOX "&Visible", 1701, 10, 92, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Disabled", 1702, 10, 102, 41, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Group", 1703, 79, 92, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "&Tab Stop", 1704, 79, 102, 44, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 37, 125, 40, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 93, 125, 40, 14, BS_PUSHBUTTON | WS_GROUP | WS_TABSTOP + CHECKBOX "&Disable No-Scroll", 1708, 79, 60, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP +END + Property changes on: trunk/reactos/subsys/system/regedit/clb/clb_En.rc ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/regedit/clb/clbdll.h --- trunk/reactos/subsys/system/regedit/clb/clbdll.h 2005-09-29 16:55:01 UTC (rev 18156) +++ trunk/reactos/subsys/system/regedit/clb/clbdll.h 2005-09-29 16:55:59 UTC (rev 18157) @@ -0,0 +1,43 @@ +#ifndef __CLBDLL_H +#define __CLBDLL_H + +#define CLBS_NOTIFY 0x1 +#define CLBS_SORT 0x2 +#define CLBS_DISABLENOSCROLL 0x1000 +#define CLBS_VSCROLL 0x200000 +#define CLBS_BORDER 0x800000 +#define CLBS_POPOUT_HEADINGS 0x200 +#define CLBS_SPRINGLY_COLUMNS 0x0 + +typedef struct _CLBS_INFO +{ + DWORD Style; + DWORD Unknown; /* FIXME - ExStyle??? */ + LPCWSTR StyleName; +} CLBS_INFO, *LPCLBS_INFO; + +typedef struct _CUSTOM_CONTROL_INFO +{ + WCHAR ClassName[32]; + DWORD Zero1; /* sizeof(DWORD) or sizeof(PVOID)? */ + WCHAR ClassName2[32]; + DWORD Unknown1; /* FIXME - size correct? */ + DWORD Unknown2; /* FIXME - size correct? */ + DWORD Unknown3; /* FIXME - size correct? */ + DWORD Zero2; /* FIXME - size correct? */ + DWORD Zero3; /* FIXME - size correct? */ + DWORD StylesCount; + const CLBS_INFO *SupportedStyles; + WCHAR Columns[256]; + INT_PTR (WINAPI *ClbStyleW)(IN HWND hWndParent, + IN LPARAM dwInitParam); + DWORD Zero4; /* FIXME - size correct? */ + DWORD Zero5; /* FIXME - size correct? */ + DWORD Zero6; /* FIXME - size correct? */ +} CUSTOM_CONTROL_INFO, *LPCUSTOM_CONTROL_INFO; + +LRESULT CALLBACK ClbWndProc(HWND,UINT,WPARAM,LPARAM); +INT_PTR WINAPI ClbStyleW(HWND,LPARAM); +BOOL WINAPI CustomControlInfoW(LPCUSTOM_CONTROL_INFO); + +#endif /* __CLBDLL_H */ Property changes on: trunk/reactos/subsys/system/regedit/clb/clbdll.h ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/regedit/clb/precomp.h --- trunk/reactos/subsys/system/regedit/clb/precomp.h 2005-09-29 16:55:01 UTC (rev 18156) +++ trunk/reactos/subsys/system/regedit/clb/precomp.h 2005-09-29 16:55:59 UTC (rev 18157) @@ -0,0 +1,10 @@ +#include <windows.h> +#include <commctrl.h> +#include <clbdll.h> + +#include "resource.h" + +ULONG DbgPrint(PCH Format,...); +#define DPRINT1 DbgPrint + +/* EOF */ Property changes on: trunk/reactos/subsys/system/regedit/clb/precomp.h ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/regedit/clb/resource.h --- trunk/reactos/subsys/system/regedit/clb/resource.h 2005-09-29 16:55:01 UTC (rev 18156) +++ trunk/reactos/subsys/system/regedit/clb/resource.h 2005-09-29 16:55:59 UTC (rev 18157) @@ -0,0 +1,6 @@ +#ifndef __CLB_RESOURCE_H +#define __CLB_RESOURCE_H + +#define IDD_COLUMNLISTBOXSTYLES 1700 + +#endif /* __CLB_RESOURCE_H */ Property changes on: trunk/reactos/subsys/system/regedit/clb/resource.h ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/regedit/regedit.xml --- trunk/reactos/subsys/system/regedit/regedit.xml 2005-09-29 16:55:01 UTC (rev 18156) +++ trunk/reactos/subsys/system/regedit/regedit.xml 2005-09-29 16:55:59 UTC (rev 18157) @@ -26,3 +26,6 @@ <file>treeview.c</file> <file>regedit.rc</file> </module> +<directory name="clb"> + <xi:include href="clb/clb.xml" /> +</directory> \ No newline at end of file

18 years, 11 months

[greatlrd] 18156: sorry createDirectoryExW fails to create folder why ? change back to CreateDirectoryW sorry

by greatlrd＠svn.reactos.com

sorry createDirectoryExW fails to create folder why ? change back to CreateDirectoryW sorry Modified: trunk/reactos/lib/kernel32/file/move.c _____ Modified: trunk/reactos/lib/kernel32/file/move.c --- trunk/reactos/lib/kernel32/file/move.c 2005-09-29 16:33:08 UTC (rev 18155) +++ trunk/reactos/lib/kernel32/file/move.c 2005-09-29 16:55:01 UTC (rev 18156) @@ -346,7 +346,8 @@ */ RemoveReadOnlyAttributeW(lpExistingFileName); RemoveReadOnlyAttributeW(lpNewFileName); - CreateDirectoryExW(lpExistingFileName,lpNewFileName,NULL); + //CreateDirectoryExW(lpExistingFileName,lpNewFileName,NULL); + CreateDirectoryW(lpNewFileName, NULL); /* search the files/folders and move them */ while (loop==TRUE) @@ -479,7 +480,8 @@ RemoveReadOnlyAttributeW(lpDeleteFile); RemoveReadOnlyAttributeW(lpNewFileName2); - CreateDirectoryExW(lpDeleteFile, lpNewFileName2,NULL); + CreateDirectoryW(lpNewFileName2,NULL); + //CreateDirectoryExW(lpDeleteFile, lpNewFileName2,NULL); /* set new search path from src string */

18 years, 11 months

[greatlrd] 18155: MoveFileWithProgressW for movefolder

by greatlrd＠svn.reactos.com

MoveFileWithProgressW for movefolder - change from CreateDirectoryW to CreateDirectoryExW - fix close handle bug - overwrite readonly file - make sure both dest and src are not set to readonly - Source cleanup - Remove goto Modified: trunk/reactos/lib/kernel32/file/move.c _____ Modified: trunk/reactos/lib/kernel32/file/move.c --- trunk/reactos/lib/kernel32/file/move.c 2005-09-29 12:06:02 UTC (rev 18154) +++ trunk/reactos/lib/kernel32/file/move.c 2005-09-29 16:33:08 UTC (rev 18155) @@ -35,132 +35,7 @@ return FALSE; } -static BOOL -AdjustFileAttributes ( - LPCWSTR ExistingFileName, - LPCWSTR NewFileName - ) -{ - IO_STATUS_BLOCK IoStatusBlock; - FILE_BASIC_INFORMATION ExistingInfo, - NewInfo; - HANDLE hFile; - DWORD Attributes; - NTSTATUS errCode; - BOOL Result = FALSE; - hFile = CreateFileW (ExistingFileName, - FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES, - FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, - NULL); - if (INVALID_HANDLE_VALUE != hFile) - { - errCode = NtQueryInformationFile (hFile, - &IoStatusBlock, - &ExistingInfo, - sizeof(FILE_BASIC_INFORMATION), - FileBasicInformation); - if (NT_SUCCESS (errCode)) - { - if (0 != (ExistingInfo.FileAttributes & FILE_ATTRIBUTE_READONLY)) - { - Attributes = ExistingInfo.FileAttributes; - ExistingInfo.FileAttributes &= ~ FILE_ATTRIBUTE_READONLY; - if (0 == (ExistingInfo.FileAttributes & - (FILE_ATTRIBUTE_HIDDEN | - FILE_ATTRIBUTE_SYSTEM | - FILE_ATTRIBUTE_ARCHIVE))) - { - ExistingInfo.FileAttributes |= FILE_ATTRIBUTE_NORMAL; - } - errCode = NtSetInformationFile (hFile, - &IoStatusBlock, - &ExistingInfo, - sizeof(FILE_BASIC_INFORMATION), - FileBasicInformation); - if (!NT_SUCCESS(errCode)) - { - DPRINT("Removing READONLY attribute from source failed with status 0x%08x\n", errCode); - } - ExistingInfo.FileAttributes = Attributes; - } - CloseHandle(hFile); - - if (NT_SUCCESS(errCode)) - { - hFile = CreateFileW (NewFileName, - FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES, - FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, - NULL); - if (INVALID_HANDLE_VALUE != hFile) - { - errCode = NtQueryInformationFile(hFile, - &IoStatusBlock, - &NewInfo, - sizeof(FILE_BASIC_INFORMATION), - FileBasicInformation); - if (NT_SUCCESS(errCode)) - { - NewInfo.FileAttributes = (NewInfo.FileAttributes & - ~ (FILE_ATTRIBUTE_HIDDEN | - FILE_ATTRIBUTE_SYSTEM | - FILE_ATTRIBUTE_READONLY | - FILE_ATTRIBUTE_NORMAL)) | - (ExistingInfo.FileAttributes & - (FILE_ATTRIBUTE_HIDDEN | - FILE_ATTRIBUTE_SYSTEM | - FILE_ATTRIBUTE_READONLY | - FILE_ATTRIBUTE_NORMAL)) | - FILE_ATTRIBUTE_ARCHIVE; - NewInfo.CreationTime = ExistingInfo.CreationTime; - NewInfo.LastAccessTime = ExistingInfo.LastAccessTime; - NewInfo.LastWriteTime = ExistingInfo.LastWriteTime; - errCode = NtSetInformationFile (hFile, - &IoStatusBlock, - &NewInfo, - sizeof(FILE_BASIC_INFORMATION), - FileBasicInformation); - if (NT_SUCCESS(errCode)) - { - Result = TRUE; - } - else - { - DPRINT("Setting attributes on dest file failed with status 0x%08x\n", errCode); - } - } - else - { - DPRINT("Obtaining attributes from dest file failed with status 0x%08x\n", errCode); - } - CloseHandle(hFile); - } - else - { - DPRINT("Opening dest file to set attributes failed with code %d\n", GetLastError()); - } - } - } - else - { - DPRINT("Obtaining attributes from source file failed with status 0x%08x\n", errCode); - CloseHandle(hFile); - } - } - else - { - DPRINT("Opening source file to obtain attributes failed with code %d\n", GetLastError()); - } - - return Result; -} - /*********************************************************************** * add_boot_rename_entry * @@ -411,8 +286,7 @@ FileRename->ReplaceIfExists ? 0 : COPY_FILE_FAIL_IF_EXISTS); if (Result) { - /* Cleanup the source file */ - AdjustFileAttributes(lpExistingFileName, lpNewFileName); + /* Cleanup the source file */ Result = DeleteFileW (lpExistingFileName); } } @@ -420,36 +294,40 @@ { /* move folder code start */ WIN32_FIND_DATAW findBuffer; - LPCWSTR lpExistingFileName2 = NULL; - LPCWSTR lpNewFileName2 = NULL; - LPCWSTR lpDeleteFile = NULL; + LPWSTR lpExistingFileName2 = NULL; + LPWSTR lpNewFileName2 = NULL; + LPWSTR lpDeleteFile = NULL; INT size; INT size2; BOOL loop = TRUE; BOOL Result = FALSE; + INT max_size = MAX_PATH; - /* Build the string */ + + /* Build the string */ size = wcslen(lpExistingFileName); + if (size+6> max_size) + max_size = size + 6; - lpDeleteFile = (LPCWSTR) HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,MAX_PATH * sizeof(WCHAR)); - if (lpDeleteFile == NULL) - goto FreeMemAndExit; + lpDeleteFile = (LPWSTR) HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,max_size * sizeof(WCHAR)); + if (lpDeleteFile == NULL) + return FALSE; - lpNewFileName2 = (LPCWSTR) HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,MAX_PATH * sizeof(WCHAR)); + lpNewFileName2 = (LPWSTR) HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,max_size * sizeof(WCHAR)); if (lpNewFileName2 == NULL) - goto FreeMemAndExit; - - lpExistingFileName2 = (LPCWSTR) HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,MAX_PATH * sizeof(WCHAR)); - if (lpExistingFileName2 == NULL) - goto FreeMemAndExit; - - if ((size+6)*sizeof(WCHAR)>MAX_PATH) - { - HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,(VOID *) lpExistingFileName2,(size+6)*sizeof(WCHAR)); - if (lpExistingFileName2 == NULL) - goto FreeMemAndExit; + { + HeapFree(GetProcessHeap(),0,(VOID *) lpDeleteFile); + return FALSE; } - + + lpExistingFileName2 = (LPWSTR) HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,max_size * sizeof(WCHAR)); + if (lpNewFileName2 == NULL) + { + HeapFree(GetProcessHeap(),0,(VOID *) lpNewFileName2); + HeapFree(GetProcessHeap(),0,(VOID *) lpDeleteFile); + return FALSE; + } + wcscpy( (WCHAR *)lpExistingFileName2,lpExistingFileName); wcscpy( (WCHAR *)&lpExistingFileName2[size],L"\\*.*\0"); @@ -461,18 +339,16 @@ if (findBuffer.cFileName[0] == L'\0') loop=FALSE; - - DPRINT("MoveFileWithProgressW : lpExistingFileName1 = %S\n",lpExistingFileName); - DPRINT("MoveFileWithProgressW : lpExistingFileName2 = %S\n",lpExistingFileName2); - DPRINT("MoveFileWithProgressW : lpNewFileName = %S\n",lpNewFileName); + - DPRINT("MoveFileWithProgressW : loop = %d %d %d\n",TRUE, FALSE, loop); - - - CreateDirectoryW(lpNewFileName,NULL); - - - /* search the file */ + /* FIXME + * remove readonly flag from source folder and do not set the readonly flag to dest folder + */ + RemoveReadOnlyAttributeW(lpExistingFileName); + RemoveReadOnlyAttributeW(lpNewFileName); + CreateDirectoryExW(lpExistingFileName,lpNewFileName,NULL); + + /* search the files/folders and move them */ while (loop==TRUE) { Result = TRUE; @@ -485,20 +361,26 @@ { size = wcslen(lpExistingFileName2)-4; FindClose(hFile); - wcscpy( (WCHAR *)&lpExistingFileName2[size],L"\0"); + wcscpy( &lpExistingFileName2[size],L"\0"); if (wcsncmp(lpExistingFileName,lpExistingFileName2,size)) { + DWORD Attributes; + FindClose(hFile); /* delete folder */ - DPRINT("MoveFileWithProgressW : folder : %s\n",lpDeleteFile); + DPRINT("MoveFileWithProgressW : Delete folder : %S\n",lpDeleteFile); - - Result = RemoveReadOnlyAttributeW(lpExistingFileName2); - if (Result == FALSE) - break; - + /* remove system folder flag other wise we can not delete the folder */ + Attributes = GetFileAttributesW(lpExistingFileName2); + if (Attributes != INVALID_FILE_ATTRIBUTES) + { + SetFileAttributesW(lpExistingFileName2,(Attributes & ~FILE_ATTRIBUTE_SYSTEM)); + } + + RemoveReadOnlyAttributeW(lpExistingFileName2); + Result = RemoveDirectoryW(lpExistingFileName2); if (Result == FALSE) break; @@ -506,20 +388,22 @@ loop=TRUE; size = wcslen(lpExistingFileName); - if ((size+6)*sizeof(WCHAR)>MAX_PATH) - { - lpExistingFileName2 = (LPCWSTR) HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, - (VOID *)lpExistingFileName2,(size+6)*sizeof(WCHAR)); - - if (lpExistingFileName2 == NULL) - { - Result = FALSE; - goto FreeMemAndExit; - } + if (size+6>max_size) + { + if (lpNewFileName2 != NULL) + HeapFree(GetProcessHeap(),0,(VOID *) lpNewFileName2); + + if (lpExistingFileName2 != NULL) + HeapFree(GetProcessHeap(),0,(VOID *) lpExistingFileName2); + + if (lpDeleteFile != NULL) + HeapFree(GetProcessHeap(),0,(VOID *) lpDeleteFile); + + return FALSE; } - wcscpy( (WCHAR *)lpExistingFileName2,lpExistingFileName); - wcscpy( (WCHAR *)&lpExistingFileName2[size],L"\\*.*\0"); + wcscpy( lpExistingFileName2,lpExistingFileName); + wcscpy( &lpExistingFileName2[size],L"\\*.*\0"); /* Get the file name */ memset(&findBuffer,0,sizeof(WIN32_FIND_DATAW)); @@ -530,89 +414,75 @@ } if (findBuffer.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - { - DPRINT("MoveFileWithProgressW : 1: %S %S\n",lpExistingFileName2,findBuffer.cFileName); + { - /* Build the new string */ + /* Build the new src string */ size = wcslen(findBuffer.cFileName); size2= wcslen(lpExistingFileName2); - if ((size2+size+6)*sizeof(WCHAR)>MAX_PATH) + if (size2+size+6>max_size) { - lpExistingFileName2 = (LPCWSTR) HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, - (VOID *)lpExistingFileName2, (size2+size+6)*sizeof(WCHAR)); + FindClose(hFile); - if (lpExistingFileName2 == NULL) - { - Result = FALSE; - goto FreeMemAndExit; - } + if (lpNewFileName2 != NULL) + HeapFree(GetProcessHeap(),0,(VOID *) lpNewFileName2); + + if (lpExistingFileName2 != NULL) + HeapFree(GetProcessHeap(),0,(VOID *) lpExistingFileName2); + + if (lpDeleteFile != NULL) + HeapFree(GetProcessHeap(),0,(VOID *) lpDeleteFile); + + return FALSE; } - wcscpy( (WCHAR *)&lpExistingFileName2[size2-3],findBuffer.cFileName); - + wcscpy( &lpExistingFileName2[size2-3],findBuffer.cFileName); + wcscpy( &lpExistingFileName2[size2+size-3],L"\0"); - /* FIXME - * RemoveReadOnlyAttributeW(lpExistingFileName2); is a hack - * for to move readonly folders - */ - wcscpy( (WCHAR *)&lpExistingFileName2[size2+size-3],L"\0"); - RemoveReadOnlyAttributeW(lpExistingFileName2); - /* Continue */ - wcscpy( (WCHAR *)&lpExistingFileName2[size2+size-3],L"\\*.*\0"); + wcscpy( lpDeleteFile,lpExistingFileName2); + wcscpy( &lpExistingFileName2[size2+size-3],L"\\*.*\0"); /* Build the new dst string */ size = wcslen(lpExistingFileName2) + wcslen(lpNewFileName); size2 = wcslen(lpExistingFileName); - if (size>MAX_PATH) + if (size>max_size) { - lpNewFileName2 = (LPCWSTR) HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, - (VOID *) lpNewFileName2, size*sizeof(WCHAR)); + FindClose(hFile); - if (lpNewFileName2 == NULL) - { - Result = FALSE; - goto FreeMemAndExit; - } + if (lpNewFileName2 != NULL) + HeapFree(GetProcessHeap(),0,(VOID *) lpNewFileName2); + + if (lpExistingFileName2 != NULL) + HeapFree(GetProcessHeap(),0,(VOID *) lpExistingFileName2); + + if (lpDeleteFile != NULL) + HeapFree(GetProcessHeap(),0,(VOID *) lpDeleteFile); + + return FALSE; } - wcscpy((WCHAR *) lpNewFileName2,lpNewFileName); + wcscpy( lpNewFileName2,lpNewFileName); size = wcslen(lpNewFileName); - wcscpy((WCHAR *)&lpNewFileName2[size], (WCHAR *)&lpExistingFileName2[size2]); + wcscpy( &lpNewFileName2[size], &lpExistingFileName2[size2]); size = wcslen(lpNewFileName2); - wcscpy( (WCHAR *)&lpNewFileName2[size-4],L"\0"); + wcscpy( &lpNewFileName2[size-4],L"\0"); + + /* Create Folder */ - /* build dest path */ - /* remove this code when it will be out into kernel32.dll ? */ + /* FIXME + * remove readonly flag from source folder and do not set the readonly flag to dest folder + */ + RemoveReadOnlyAttributeW(lpDeleteFile); + RemoveReadOnlyAttributeW(lpNewFileName2); - size = GetFullPathNameW(lpNewFileName2, MAX_PATH,(LPWSTR) lpDeleteFile, NULL); - if (MAX_PATH>size2) - { - lpDeleteFile = (LPCWSTR) HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, - (VOID *) lpDeleteFile,size) ; + CreateDirectoryExW(lpDeleteFile, lpNewFileName2,NULL); + - if (lpDeleteFile == NULL) - { - Result = FALSE; - goto FreeMemAndExit; - } - - GetFullPathNameW(lpNewFileName2, size,(LPWSTR) lpDeleteFile, NULL); - } - - /* Create Folder */ - - DPRINT("MoveFileWithProgressW : CreateDirectoryW lpNewFileName2 : %S\n",lpNewFileName2); - DPRINT("MoveFileWithProgressW : CreateDirectoryW : %S\n",lpDeleteFile); - - CreateDirectoryW(lpDeleteFile,NULL); - - DPRINT("MoveFileWithProgressW : 1x: %S : %S \n",lpExistingFileName2, lpNewFileName2); - + /* set new search path from src string */ FindClose(hFile); memset(&findBuffer,0,sizeof(WIN32_FIND_DATAW)); hFile = FindFirstFileW(lpExistingFileName2, &findBuffer); @@ -623,30 +493,44 @@ /* Build the new string */ size = wcslen(findBuffer.cFileName); size2= wcslen(lpExistingFileName2); - wcscpy( (WCHAR *)lpDeleteFile,lpExistingFileName2); - wcscpy( (WCHAR *)&lpDeleteFile[size2-3],findBuffer.cFileName); + wcscpy( lpDeleteFile,lpExistingFileName2); + wcscpy( &lpDeleteFile[size2-3],findBuffer.cFileName); /* Build dest string */ size = wcslen(lpDeleteFile) + wcslen(lpNewFileName); size2 = wcslen(lpExistingFileName); - if (size*sizeof(WCHAR)>MAX_PATH) - { - lpNewFileName2 = (LPCWSTR) HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, - (VOID *) lpNewFileName2, size*sizeof(WCHAR)); + if (size>max_size) + { + FindClose(hFile); - if (lpNewFileName2 == NULL) - { - Result = FALSE; - goto FreeMemAndExit; - } - } + if (lpNewFileName2 != NULL) + HeapFree(GetProcessHeap(),0,(VOID *) lpNewFileName2); + + if (lpExistingFileName2 != NULL) + HeapFree(GetProcessHeap(),0,(VOID *) lpExistingFileName2); + + if (lpDeleteFile != NULL) + HeapFree(GetProcessHeap(),0,(VOID *) lpDeleteFile); + + return FALSE; + } - wcscpy((WCHAR *) lpNewFileName2,lpNewFileName); + wcscpy( lpNewFileName2,lpNewFileName); size = wcslen(lpNewFileName); - wcscpy((WCHAR *)&lpNewFileName2[size], (WCHAR *)&lpDeleteFile[size2]); + wcscpy(&lpNewFileName2[size],&lpDeleteFile[size2]); - /* copy file */ + + /* overrite existsen file, if the file got the flag have readonly + * we need reomve that flag + */ + + /* copy file */ + + DPRINT("MoveFileWithProgressW : Copy file : %S to %S\n",lpDeleteFile, lpNewFileName2); + RemoveReadOnlyAttributeW(lpDeleteFile); + RemoveReadOnlyAttributeW(lpNewFileName2); + Result = CopyFileExW (lpDeleteFile, lpNewFileName2, lpProgressRoutine, @@ -654,50 +538,43 @@ NULL, 0); - if (Result == FALSE) - { - DPRINT("MoveFileWithProgressW : Fails\n"); - break; - } - - /* delete file */ - DPRINT("MoveFileWithProgressW : Delete file : %S : %S\n",lpDeleteFile, lpNewFileName2); - - + if (Result == FALSE) + break; + + /* delete file */ + DPRINT("MoveFileWithProgressW : remove readonly flag from file : %S\n",lpNewFileName2); Result = RemoveReadOnlyAttributeW(lpDeleteFile); if (Result == FALSE) break; - Result = DeleteFileW(lpDeleteFile); - if (Result == FALSE) - { - DPRINT("MoveFileWithProgressW : Fails\n"); - break; - } - } - DPRINT("MoveFileWithProgressW : 2 : %S : %S \n",lpExistingFileName2,findBuffer.cFileName); + DPRINT("MoveFileWithProgressW : Delete file : %S\n",lpDeleteFile); + Result = DeleteFileW(lpDeleteFile); + if (Result == FALSE) + break; + + } loop = FindNextFileW(hFile, &findBuffer); } - FindClose(hFile); - memset(&findBuffer,0,sizeof(WIN32_FIND_DATAW)); - hFile = FindFirstFileW(lpExistingFileName2, &findBuffer); - if (hFile == NULL) - loop=TRUE; - - if (findBuffer.cFileName[0] == L'\0') - loop=TRUE; - - if (loop == FALSE) + + /* Remove last folder */ + if ((loop == FALSE) && (Result != FALSE)) { + DWORD Attributes; + FindClose(hFile); - Result = RemoveDirectoryW(lpExistingFileName); - DPRINT("MoveFileWithProgressW RemoveDirectoryW :%S",lpExistingFileName); + Attributes = GetFileAttributesW(lpDeleteFile); + if (Attributes != INVALID_FILE_ATTRIBUTES) + { + SetFileAttributesW(lpDeleteFile,(Attributes & ~FILE_ATTRIBUTE_SYSTEM)); + } + + Result = RemoveDirectoryW(lpExistingFileName); } - -FreeMemAndExit: - DPRINT("MoveFileWithProgressW : result : r=%d, T=%d, F=%d",Result,TRUE,FALSE); - + + /* Cleanup */ + FindClose(hFile); + if (lpNewFileName2 != NULL) { HeapFree(GetProcessHeap(),0,(VOID *) lpNewFileName2); @@ -716,7 +593,8 @@ lpDeleteFile = NULL; } - return Result; + return Result; + // end move folder code } }

18 years, 11 months

[hpoussin] 18154: Set eol-style for new resources files

by hpoussin＠svn.reactos.com

Set eol-style for new resources files Add back Da.rc resources Modified: trunk/reactos/lib/setupapi/Bg.rc Modified: trunk/reactos/lib/setupapi/No.rc Modified: trunk/reactos/lib/setupapi/setupapi.rc _____ Modified: trunk/reactos/lib/setupapi/Bg.rc --- trunk/reactos/lib/setupapi/Bg.rc 2005-09-29 11:58:31 UTC (rev 18153) +++ trunk/reactos/lib/setupapi/Bg.rc 2005-09-29 12:06:02 UTC (rev 18154) @@ -1,34 +1,34 @@ -/* - * Bulgarian resources for SETUPAPI - * - * Copyright 2005 Milko Krachounov - * - * 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 - */ - -LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT - -COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 -STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "?¯´ÞÓÝÕ ÝÓ ¶ÓÚÙ¯ÔÕ..." -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "??ýÕÝÞ", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "?þ?¯¸ÝÞÛ:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "ÍÕÙ:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END +/* + * Bulgarian resources for SETUPAPI + * + * Copyright 2005 Milko Krachounov + * + * 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 + */ + +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "?¯´ÞÓÝÕ ÝÓ ¶ÓÚÙ¯ÔÕ..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "??ýÕÝÞ", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "?þ?¯¸ÝÞÛ:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "ÍÕÙ:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END Property changes on: trunk/reactos/lib/setupapi/Bg.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/setupapi/No.rc --- trunk/reactos/lib/setupapi/No.rc 2005-09-29 11:58:31 UTC (rev 18153) +++ trunk/reactos/lib/setupapi/No.rc 2005-09-29 12:06:02 UTC (rev 18154) @@ -1,34 +1,34 @@ -/* - * Norwegian BokmÕl resources for SETUPAPI - * - * Copyright 2005 Alexander N. S°rnes <alex(a)thehandofagony.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL - -COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 -STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Kopierer filer . . ." -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "Cancel", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Kilde:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "MÕl:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP -END +/* + * Norwegian BokmÕl resources for SETUPAPI + * + * Copyright 2005 Alexander N. S°rnes <alex(a)thehandofagony.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Kopierer filer . . ." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Cancel", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Kilde:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "MÕl:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END Property changes on: trunk/reactos/lib/setupapi/No.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/setupapi/setupapi.rc --- trunk/reactos/lib/setupapi/setupapi.rc 2005-09-29 11:58:31 UTC (rev 18153) +++ trunk/reactos/lib/setupapi/setupapi.rc 2005-09-29 12:06:02 UTC (rev 18154) @@ -26,6 +26,7 @@ #include "Bg.rc" #include "Cs.rc" +#include "Da.rc" #include "De.rc" #include "En.rc" #include "Es.rc"

18 years, 11 months

[hpoussin] 18153: - Milko Krachounov <milko@3mhz.net>

by hpoussin＠svn.reactos.com

- Milko Krachounov <milko(a)3mhz.net> Added Bulgarian translations. - Alexander N. Sørnes <alex(a)thehandofagony.com> Added Norwegian translations. Added: trunk/reactos/lib/setupapi/Bg.rc Added: trunk/reactos/lib/setupapi/No.rc Modified: trunk/reactos/lib/setupapi/setupapi.rc _____ Added: trunk/reactos/lib/setupapi/Bg.rc --- trunk/reactos/lib/setupapi/Bg.rc 2005-09-29 09:46:35 UTC (rev 18152) +++ trunk/reactos/lib/setupapi/Bg.rc 2005-09-29 11:58:31 UTC (rev 18153) @@ -0,0 +1,34 @@ +/* + * Bulgarian resources for SETUPAPI + * + * Copyright 2005 Milko Krachounov + * + * 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 + */ + +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "?¯´ÞÓÝÕ ÝÓ ¶ÓÚÙ¯ÔÕ..." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "??ýÕÝÞ", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "?þ?¯¸ÝÞÛ:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "ÍÕÙ:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END _____ Added: trunk/reactos/lib/setupapi/No.rc --- trunk/reactos/lib/setupapi/No.rc 2005-09-29 09:46:35 UTC (rev 18152) +++ trunk/reactos/lib/setupapi/No.rc 2005-09-29 11:58:31 UTC (rev 18153) @@ -0,0 +1,34 @@ +/* + * Norwegian BokmÕl resources for SETUPAPI + * + * Copyright 2005 Alexander N. S°rnes <alex(a)thehandofagony.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION +CAPTION "Kopierer filer . . ." +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Cancel", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Kilde:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "MÕl:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END _____ Modified: trunk/reactos/lib/setupapi/setupapi.rc --- trunk/reactos/lib/setupapi/setupapi.rc 2005-09-29 09:46:35 UTC (rev 18152) +++ trunk/reactos/lib/setupapi/setupapi.rc 2005-09-29 11:58:31 UTC (rev 18153) @@ -24,8 +24,8 @@ #include "winnls.h" #include "setupapi_private.h" +#include "Bg.rc" #include "Cs.rc" -#include "Da.rc" #include "De.rc" #include "En.rc" #include "Es.rc" @@ -34,6 +34,7 @@ #include "It.rc" #include "Ja.rc" #include "Nl.rc" +#include "No.rc" #include "Pl.rc" #include "Pt.rc" #include "Ru.rc"

18 years, 11 months

[hpoussin] 18152: Don't tell to MultiByteToWideChar that buffer is bigger than its real size. The size is in characters, not in bytes.

by hpoussin＠svn.reactos.com

Don't tell to MultiByteToWideChar that buffer is bigger than its real size. The size is in characters, not in bytes. Spotted by Robert Shearman <rob(a)codeweavers.com> Modified: trunk/reactos/lib/setupapi/parser.c _____ Modified: trunk/reactos/lib/setupapi/parser.c --- trunk/reactos/lib/setupapi/parser.c 2005-09-29 03:39:38 UTC (rev 18151) +++ trunk/reactos/lib/setupapi/parser.c 2005-09-29 09:46:35 UTC (rev 18152) @@ -956,8 +956,7 @@ WCHAR *new_buff = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ); if (new_buff) { - DWORD len = MultiByteToWideChar( CP_ACP, 0, buffer, size, new_buff, - size * sizeof(WCHAR) ); + DWORD len = MultiByteToWideChar( CP_ACP, 0, buffer, size, new_buff, size ); err = parse_buffer( file, new_buff, new_buff + len, error_line ); HeapFree( GetProcessHeap(), 0, new_buff ); }

18 years, 11 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