Ros-diffs March 2015

ros-diffs@reactos.org

18 participants
496 discussions

[akhaldi] 66973: [SORT] Addendum to r66972. Since we're still playing the "Guess what the real changes are" game despite talking about it over and over, I just decided to join you guys. Fix the an ...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Mar 30 09:25:59 2015 New Revision: 66973 URL: http://svn.reactos.org/svn/reactos?rev=66973&view=rev Log: [SORT] Addendum to r66972. Since we're still playing the "Guess what the real changes are" game despite talking about it over and over, I just decided to join you guys. Fix the an IRP leak. Also tabs => spaces. More will come as long as the game does not stop. No svn history was unnecessarily changed (further) while making this commit. Modified: trunk/reactos/base/applications/cmdutils/sort/sort.c Modified: trunk/reactos/base/applications/cmdutils/sort/sort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/sort/sort.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/sort/sort.c [iso-8859-1] Mon Mar 30 09:25:59 2015 @@ -1,39 +1,31 @@ /* - * SORT - reads line of a file and sorts them in order - * Copyright 1995 Jim Lynch + * PROJECT: SORT - Adapted for ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Reads line of a file and sorts them in order + * COPYRIGHT: Copyright 1995 Jim Lynch * - * Adapted for ReactOS - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <stdlib.h> #include <stdio.h> -#include <stdlib.h> #include <string.h> -#include <malloc.h> - -#define MAXRECORDS 65536 /* maximum number of records that can be sorted */ -#define MAXLEN 4095 /* maximum record length */ - -int rev; /* reverse flag */ -int help; /* help flag */ -int sortcol; /* sort column */ -int err = 0; /* error counter */ - -int -cmpr(const void *a, const void *b) + +#define MAXRECORDS 65536 /* maximum number of records that can be sorted */ +#define MAXLEN 4095 /* maximum record length */ + +/* Reverse flag */ +int rev; + +/* Help flag */ +int help; + +/* Sort column */ +int sortcol; + +/* Error counter */ +int err = 0; + +int cmpr(const void *a, const void *b) { char *A, *B; @@ -43,31 +35,47 @@ if (sortcol > 0) { if (strlen(A) > sortcol) + { A += sortcol; + } else + { A = ""; + } if (strlen(B) > sortcol) + { B += sortcol; + } else + { B = ""; + } } if (!rev) + { return strcmp(A, B); + } else + { return strcmp(B, A); + } } -void -usage(void) +void usage(void) { fputs("SORT\n", stderr); - fputs("Sorts input and writes output to a file, console or a device.\n", stderr); + fputs("Sorts input and writes output to a file, console or a device.\n", + stderr); if (err) + { fputs("Invalid parameter\n", stderr); - - fputs(" SORT [options] < [drive:1][path1]file1 > [drive2:][path2]file2\n", stderr); + } + + fputs(" SORT [options] < [drive:1][path1]file1 > [drive2:][path2]file2\n", + stderr); + fputs(" Command | SORT [options] > [drive:][path]file\n", stderr); fputs(" Options:\n", stderr); fputs(" /R Reverse order\n", stderr); @@ -79,9 +87,10 @@ { char temp[MAXLEN + 1]; char **list; - char *cp; /* option character pointer */ - int nr; - int i; + + /* Option character pointer */ + char *cp; + int i, nr; sortcol = 0; rev = 0; @@ -105,7 +114,9 @@ case '+': sortcol = atoi(cp + 1); if (sortcol) + { sortcol--; + } break; default: @@ -130,10 +141,14 @@ for (nr = 0; nr < MAXRECORDS; nr++) { if (fgets(temp, MAXLEN, stdin) == NULL) + { break; + } if(strlen(temp)) - temp[strlen(temp)-1]='\0'; + { + temp[strlen(temp) - 1] = '\0'; + } list[nr] = (char *) malloc(strlen(temp) + 1); if (list[nr] == NULL) @@ -146,7 +161,6 @@ free(list[i]); } free(list); - exit(3); } @@ -168,12 +182,12 @@ exit(4); } - qsort((void *) list, nr, sizeof(char *), cmpr); + qsort((void *)list, nr, sizeof(char *), cmpr); for (i = 0; i < nr; i++) { fputs(list[i], stdout); - fputs("\n",stdout); + fputs("\n", stdout); } /* Cleanup memory */ @@ -182,8 +196,6 @@ free(list[i]); } free(list); - return 0; } - /* EOF */

9 years, 8 months

[hbelusca] 66972: [SORT] - Don't leak memory, see CORE-8205 for more details. - Replace tabs with spaces.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 29 22:26:24 2015 New Revision: 66972 URL: http://svn.reactos.org/svn/reactos?rev=66972&view=rev Log: [SORT] - Don't leak memory, see CORE-8205 for more details. - Replace tabs with spaces. Modified: trunk/reactos/base/applications/cmdutils/sort/sort.c Modified: trunk/reactos/base/applications/cmdutils/sort/sort.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/sort/sort.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/sort/sort.c [iso-8859-1] Sun Mar 29 22:26:24 2015 @@ -1,60 +1,61 @@ /* -* SORT - reads line of a file and sorts them in order -* Copyright 1995 Jim Lynch -* -* Adapted for ReactOS -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program 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 General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ + * SORT - reads line of a file and sorts them in order + * Copyright 1995 Jim Lynch + * + * Adapted for ReactOS + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#include <stdio.h> #include <stdlib.h> -#include <stdio.h> #include <string.h> #include <malloc.h> -#define MAXRECORDS 65536 /* maximum number of records that can be - * sorted */ -#define MAXLEN 4095 /* maximum record length */ +#define MAXRECORDS 65536 /* maximum number of records that can be sorted */ +#define MAXLEN 4095 /* maximum record length */ -int rev; /* reverse flag */ -int help; /* help flag */ -int sortcol; /* sort column */ -int err = 0; /* error counter */ +int rev; /* reverse flag */ +int help; /* help flag */ +int sortcol; /* sort column */ +int err = 0; /* error counter */ int cmpr(const void *a, const void *b) { - char *A, *B; + char *A, *B; A = *(char **) a; B = *(char **) b; - if (sortcol > 0) { - if (strlen(A) > sortcol) - A += sortcol; - else - A = ""; - if (strlen(B) > sortcol) - B += sortcol; - else - B = ""; + if (sortcol > 0) + { + if (strlen(A) > sortcol) + A += sortcol; + else + A = ""; + if (strlen(B) > sortcol) + B += sortcol; + else + B = ""; } + if (!rev) - return strcmp(A, B); + return strcmp(A, B); else - return strcmp(B, A); + return strcmp(B, A); } void @@ -62,79 +63,126 @@ { fputs("SORT\n", stderr); fputs("Sorts input and writes output to a file, console or a device.\n", stderr); + if (err) - fputs("Invalid parameter\n", stderr); + fputs("Invalid parameter\n", stderr); + fputs(" SORT [options] < [drive:1][path1]file1 > [drive2:][path2]file2\n", stderr); fputs(" Command | SORT [options] > [drive:][path]file\n", stderr); fputs(" Options:\n", stderr); - fputs(" /R Reverse order\n", stderr); - fputs(" /+n Start sorting with column n\n", stderr); - fputs(" /? Help\n", stderr); + fputs(" /R Reverse order\n", stderr); + fputs(" /+n Start sorting with column n\n", stderr); + fputs(" /? Help\n", stderr); } int main(int argc, char **argv) { - char temp[MAXLEN + 1]; - char **list; - char *cp; /* option character pointer */ - int nr; - int i; - + char temp[MAXLEN + 1]; + char **list; + char *cp; /* option character pointer */ + int nr; + int i; sortcol = 0; rev = 0; - while (--argc) { - if (*(cp = *++argv) == '/') { - switch (cp[1]) { - case 'R': - case 'r': - rev = 1; - break; - case '?': - case 'h': - case 'H': - help = 1; - break; - case '+': - sortcol = atoi(cp + 1); - if (sortcol) - sortcol--; - break; - default: - err++; - } - } + while (--argc) + { + if (*(cp = *++argv) == '/') + { + switch (cp[1]) + { + case 'R': + case 'r': + rev = 1; + break; + + case '?': + case 'h': + case 'H': + help = 1; + break; + + case '+': + sortcol = atoi(cp + 1); + if (sortcol) + sortcol--; + break; + + default: + err++; + } + } } - if (err || help) { - usage(); - exit(1); + + if (err || help) + { + usage(); + exit(1); } + list = (char **) malloc(MAXRECORDS * sizeof(char *)); - if (list == NULL) { + if (list == NULL) + { fputs("SORT: Insufficient memory\n", stderr); exit(3); } - for (nr = 0; nr < MAXRECORDS; nr++) { - if (fgets(temp, MAXLEN, stdin) == NULL) - break; - if(strlen(temp)) - temp[strlen(temp)-1]='\0'; - list[nr] = (char *) malloc(strlen(temp) + 1); - if (list[nr] == NULL) { - fputs("SORT: Insufficient memory\n", stderr); - exit(3); - } - strcpy(list[nr], temp); + + for (nr = 0; nr < MAXRECORDS; nr++) + { + if (fgets(temp, MAXLEN, stdin) == NULL) + break; + + if(strlen(temp)) + temp[strlen(temp)-1]='\0'; + + list[nr] = (char *) malloc(strlen(temp) + 1); + if (list[nr] == NULL) + { + fputs("SORT: Insufficient memory\n", stderr); + + /* Cleanup memory */ + for (i = 0; i < nr; i++) + { + free(list[i]); + } + free(list); + + exit(3); + } + + strcpy(list[nr], temp); } - if (nr == MAXRECORDS) { - fputs("SORT: number of records exceeds maximum\n", stderr); - exit(4); + + if (nr == MAXRECORDS) + { + fputs("SORT: number of records exceeds maximum\n", stderr); + + /* Cleanup memory */ + for (i = 0; i < nr; i++) + { + free(list[i]); + } + free(list); + + /* Bail out */ + exit(4); } + qsort((void *) list, nr, sizeof(char *), cmpr); - for (i = 0; i < nr; i++) { - fputs(list[i], stdout); - fputs("\n",stdout); + + for (i = 0; i < nr; i++) + { + fputs(list[i], stdout); + fputs("\n",stdout); } + + /* Cleanup memory */ + for (i = 0; i < nr; i++) + { + free(list[i]); + } + free(list); + return 0; }

9 years, 8 months

[spetreolle] 66971: [PCNET] MiTestCard: Fix traces. Display BCR4 value (physical link state.)

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun Mar 29 17:46:44 2015 New Revision: 66971 URL: http://svn.reactos.org/svn/reactos?rev=66971&view=rev Log: [PCNET] MiTestCard: Fix traces. Display BCR4 value (physical link state.) Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.c Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/p… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] Sun Mar 29 17:46:44 2015 @@ -797,13 +797,13 @@ /* see if we can read/write now */ NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR0); NdisRawReadPortUshort(Adapter->PortOffset + RDP, &Data); - DPRINT("Port 0x%x RAP 0x%x CSR0 0x%x RDP 0x%x, Interupt status register is 0x%x\n", Adapter->PortOffset, RAP, CSR0, RDP, Data); + DPRINT("Port 0x%x RAP 0x%x CSR0 0x%x RDP 0x%x, Interrupt status register is 0x%x\n", Adapter->PortOffset, RAP, CSR0, RDP, Data); /* read the BIA */ for(i = 0; i < 6; i++) NdisRawReadPortUchar(Adapter->PortOffset + i, &address[i]); - DPRINT("burned-in address: %x:%x:%x:%x:%x:%x\n", address[0], address[1], address[2], address[3], address[4], address[5]); + DPRINT("burned-in address: %02x:%02x:%02x:%02x:%02x:%02x\n", address[0], address[1], address[2], address[3], address[4], address[5]); /* Read status flags from CSR0 */ NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR0); NdisRawReadPortUshort(Adapter->PortOffset + RDP, &Data); @@ -812,8 +812,8 @@ /* Read status flags from CSR3 */ NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR3); NdisRawReadPortUshort(Adapter->PortOffset + RDP, &Data); - DPRINT("CSR3: 0x%x\n", Data); + /* Read status flags from CSR4 */ NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR4); NdisRawReadPortUshort(Adapter->PortOffset + RDP, &Data); @@ -828,6 +828,11 @@ NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR6); NdisRawReadPortUshort(Adapter->PortOffset + RDP, &Data); DPRINT("CSR6: 0x%x\n", Data); + + /* Read status flags from BCR4 */ + NdisRawWritePortUshort(Adapter->PortOffset + RAP, BCR4); + NdisRawReadPortUshort(Adapter->PortOffset + BDP, &Data); + DPRINT("BCR4: 0x%x\n", Data); return TRUE; }

9 years, 9 months

[akhaldi] 66970: * Back down r66964 for now.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 29 17:22:16 2015 New Revision: 66970 URL: http://svn.reactos.org/svn/reactos?rev=66970&view=rev Log: * Back down r66964 for now. Modified: trunk/reactos/dll/win32/setupapi/parser.c Modified: trunk/reactos/dll/win32/setupapi/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/parser.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/parser.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/parser.c [iso-8859-1] Sun Mar 29 17:22:16 2015 @@ -2120,143 +2120,137 @@ return field->text; } - -/*********************************************************************** - * SetupGetInfFileListW (SETUPAPI.@) - */ -BOOL WINAPI SetupGetInfFileListW(PCWSTR dir, DWORD style, PWSTR buffer, - DWORD insize, PDWORD outsize) -{ - static const WCHAR inf[] = {'\\','*','.','i','n','f',0 }; - WCHAR *filter, *fullname = NULL, *ptr = buffer; - DWORD dir_len, name_len = 20, size ; - WIN32_FIND_DATAW finddata; - HANDLE hdl; - if (style & ~( INF_STYLE_OLDNT | INF_STYLE_WIN4 | - INF_STYLE_CACHE_ENABLE | INF_STYLE_CACHE_DISABLE )) - { - FIXME( "unknown inf_style(s) 0x%x\n", - style & ~( INF_STYLE_OLDNT | INF_STYLE_WIN4 | - INF_STYLE_CACHE_ENABLE | INF_STYLE_CACHE_DISABLE )); - if( outsize ) *outsize = 1; - return TRUE; - } - if ((style & ( INF_STYLE_OLDNT | INF_STYLE_WIN4 )) == INF_STYLE_NONE) - { - FIXME( "inf_style INF_STYLE_NONE not handled\n" ); - if( outsize ) *outsize = 1; - return TRUE; - } - if (style & ( INF_STYLE_CACHE_ENABLE | INF_STYLE_CACHE_DISABLE )) - FIXME("ignored inf_style(s) %s %s\n", - ( style & INF_STYLE_CACHE_ENABLE ) ? "INF_STYLE_CACHE_ENABLE" : "", - ( style & INF_STYLE_CACHE_DISABLE ) ? "INF_STYLE_CACHE_DISABLE" : ""); - if( dir ) - { - DWORD att; - DWORD msize; - dir_len = strlenW( dir ); - if ( !dir_len ) return FALSE; - msize = ( 7 + dir_len ) * sizeof( WCHAR ); /* \\*.inf\0 */ - filter = HeapAlloc( GetProcessHeap(), 0, msize ); - if( !filter ) - { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - return FALSE; - } - strcpyW( filter, dir ); - if ( '\\' == filter[dir_len - 1] ) - filter[--dir_len] = 0; - - att = GetFileAttributesW( filter ); - if (att != INVALID_FILE_ATTRIBUTES && !(att & FILE_ATTRIBUTE_DIRECTORY)) - { - HeapFree( GetProcessHeap(), 0, filter ); - SetLastError( ERROR_DIRECTORY ); - return FALSE; - } - } +/*********************************************************************** + * SetupGetInfFileListW (SETUPAPI.@) + */ +BOOL WINAPI +SetupGetInfFileListW( + IN PCWSTR DirectoryPath OPTIONAL, + IN DWORD InfStyle, + IN OUT PWSTR ReturnBuffer OPTIONAL, + IN DWORD ReturnBufferSize OPTIONAL, + OUT PDWORD RequiredSize OPTIONAL) +{ + HANDLE hSearch; + LPWSTR pFullFileName = NULL; + LPWSTR pFileName; /* Pointer into pFullFileName buffer */ + LPWSTR pBuffer = ReturnBuffer; + WIN32_FIND_DATAW wfdFileInfo; + size_t len; + DWORD requiredSize = 0; + BOOL ret = FALSE; + + TRACE("%s %lx %p %ld %p\n", debugstr_w(DirectoryPath), InfStyle, + ReturnBuffer, ReturnBufferSize, RequiredSize); + + if (InfStyle & ~(INF_STYLE_OLDNT | INF_STYLE_WIN4)) + { + TRACE("Unknown flags: 0x%08lx\n", InfStyle & ~(INF_STYLE_OLDNT | INF_STYLE_WIN4)); + SetLastError(ERROR_INVALID_PARAMETER); + goto cleanup; + } + else if (ReturnBufferSize == 0 && ReturnBuffer != NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + goto cleanup; + } + else if (ReturnBufferSize > 0 && ReturnBuffer == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + goto cleanup; + } + + /* Allocate memory for file filter */ + if (DirectoryPath != NULL) + /* "DirectoryPath\" form */ + len = strlenW(DirectoryPath) + 1 + 1; else - { - WCHAR infdir[] = {'\\','i','n','f',0 }; - DWORD msize; - dir_len = GetWindowsDirectoryW( NULL, 0 ); - msize = ( 7 + 4 + dir_len ) * sizeof( WCHAR ); - filter = HeapAlloc( GetProcessHeap(), 0, msize ); - if( !filter ) - { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - return FALSE; - } - GetWindowsDirectoryW( filter, msize ); - strcatW( filter, infdir ); - } - strcatW( filter, inf ); - - hdl = FindFirstFileW( filter , &finddata ); - if ( hdl == INVALID_HANDLE_VALUE ) - { - if( outsize ) *outsize = 1; - HeapFree( GetProcessHeap(), 0, filter ); - return TRUE; - } - size = 1; + /* "%SYSTEMROOT%\Inf\" form */ + len = MAX_PATH + 1 + strlenW(InfDirectory) + 1; + len += MAX_PATH; /* To contain file name or "*.inf" string */ + pFullFileName = MyMalloc(len * sizeof(WCHAR)); + if (pFullFileName == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + + /* Fill file filter buffer */ + if (DirectoryPath) + { + strcpyW(pFullFileName, DirectoryPath); + if (*pFullFileName && pFullFileName[strlenW(pFullFileName) - 1] != '\\') + strcatW(pFullFileName, BackSlash); + } + else + { + len = GetSystemWindowsDirectoryW(pFullFileName, MAX_PATH); + if (len == 0 || len > MAX_PATH) + goto cleanup; + if (pFullFileName[strlenW(pFullFileName) - 1] != '\\') + strcatW(pFullFileName, BackSlash); + strcatW(pFullFileName, InfDirectory); + } + pFileName = &pFullFileName[strlenW(pFullFileName)]; + + /* Search for the first file */ + strcpyW(pFileName, InfFileSpecification); + hSearch = FindFirstFileW(pFullFileName, &wfdFileInfo); + if (hSearch == INVALID_HANDLE_VALUE) + { + TRACE("No file returned by %s\n", debugstr_w(pFullFileName)); + goto cleanup; + } + do { - static const WCHAR key[] = - {'S','i','g','n','a','t','u','r','e',0 }; - static const WCHAR section[] = - {'V','e','r','s','i','o','n',0 }; - static const WCHAR sig_win4_1[] = - {'$','C','h','i','c','a','g','o','$',0 }; - static const WCHAR sig_win4_2[] = - {'$','W','I','N','D','O','W','S',' ','N','T','$',0 }; - WCHAR signature[ MAX_PATH ]; - BOOL valid = FALSE; - DWORD len = strlenW( finddata.cFileName ); - if (!fullname || ( name_len < len )) - { - name_len = ( name_len < len ) ? len : name_len; - HeapFree( GetProcessHeap(), 0, fullname ); - fullname = HeapAlloc( GetProcessHeap(), 0, - ( 2 + dir_len + name_len) * sizeof( WCHAR )); - if( !fullname ) + HINF hInf; + + strcpyW(pFileName, wfdFileInfo.cFileName); + hInf = SetupOpenInfFileW( + pFullFileName, + NULL, /* Inf class */ + InfStyle, + NULL /* Error line */); + if (hInf == INVALID_HANDLE_VALUE) + { + if (GetLastError() == ERROR_CLASS_MISMATCH) { - FindClose( hdl ); - HeapFree( GetProcessHeap(), 0, filter ); - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - return FALSE; + /* InfStyle was not correct. Skip this file */ + continue; } - strcpyW( fullname, filter ); - } - fullname[ dir_len + 1] = 0; /* keep '\\' */ - strcatW( fullname, finddata.cFileName ); - if (!GetPrivateProfileStringW( section, key, NULL, signature, MAX_PATH, fullname )) - signature[0] = 0; - if( INF_STYLE_OLDNT & style ) - valid = strcmpiW( sig_win4_1, signature ) && - strcmpiW( sig_win4_2, signature ); - if( INF_STYLE_WIN4 & style ) - valid = valid || !strcmpiW( sig_win4_1, signature ) || - !strcmpiW( sig_win4_2, signature ); - if( valid ) - { - size += 1 + strlenW( finddata.cFileName ); - if( ptr && insize >= size ) - { - strcpyW( ptr, finddata.cFileName ); - ptr += 1 + strlenW( finddata.cFileName ); - *ptr = 0; - } - } - } - while( FindNextFileW( hdl, &finddata )); - FindClose( hdl ); - - HeapFree( GetProcessHeap(), 0, fullname ); - HeapFree( GetProcessHeap(), 0, filter ); - if( outsize ) *outsize = size; - return TRUE; + TRACE("Invalid .inf file %s\n", debugstr_w(pFullFileName)); + continue; + } + + len = strlenW(wfdFileInfo.cFileName) + 1; + requiredSize += (DWORD)(len * sizeof(WCHAR)); + if (requiredSize <= ReturnBufferSize) + { + strcpyW(pBuffer, wfdFileInfo.cFileName); + pBuffer = &pBuffer[len]; + } + SetupCloseInfFile(hInf); + } while (FindNextFileW(hSearch, &wfdFileInfo)); + FindClose(hSearch); + + requiredSize += sizeof(WCHAR); /* Final NULL char */ + if (requiredSize <= ReturnBufferSize) + { + *pBuffer = '\0'; + ret = TRUE; + } + else + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = FALSE; + } + if (RequiredSize) + *RequiredSize = requiredSize; + +cleanup: + MyFree(pFullFileName); + return ret; } /***********************************************************************

9 years, 9 months

[tkreuzer] 66969: [I8042PRT] Silence debug prints

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Mar 29 17:06:40 2015 New Revision: 66969 URL: http://svn.reactos.org/svn/reactos?rev=66969&view=rev Log: [I8042PRT] Silence debug prints Modified: trunk/reactos/drivers/input/i8042prt/hwhacks.c Modified: trunk/reactos/drivers/input/i8042prt/hwhacks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/hwh… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/hwhacks.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/hwhacks.c [iso-8859-1] Sun Mar 29 17:06:40 2015 @@ -173,7 +173,7 @@ Header = (PDMI_HEADER)((PUCHAR)Data + 2); } -#if DBG +#if 0 // DBG DbgPrint("i8042prt: Dumping DMI data:\n"); DbgPrint("BIOS_VENDOR: %s\n", Strings[BIOS_VENDOR]); DbgPrint("BIOS_VERSION: %s\n", Strings[BIOS_VERSION]);

9 years, 9 months

[jimtabor] 66968: [NtUser] - Fix the transfer of a global cursor while using ATI. See CORE-9436.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Mar 29 16:25:50 2015 New Revision: 66968 URL: http://svn.reactos.org/svn/reactos?rev=66968&view=rev Log: [NtUser] - Fix the transfer of a global cursor while using ATI. See CORE-9436. Modified: trunk/reactos/win32ss/user/ntuser/input.c Modified: trunk/reactos/win32ss/user/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] Sun Mar 29 16:25:50 2015 @@ -523,8 +523,15 @@ MsqDestroyMessageQueue(ptiFrom); + if (CurIcon) + { + // Could be global. Keep it above the water line! + UserReferenceObject(CurIcon); + } + if (CurIcon && UserObjectInDestroy(UserHMGetHandle(CurIcon))) { + UserDereferenceObject(CurIcon); CurIcon = NULL; } @@ -533,8 +540,8 @@ // Pass cursor From if To is null. Pass test_SetCursor parent_id == current pti ID. if (CurIcon && ptiTo->MessageQueue->CursorObject == NULL) { + ERR("ptiTo receiving ptiFrom Cursor\n"); ptiTo->MessageQueue->CursorObject = CurIcon; - UserReferenceObject(CurIcon); } ptiFrom->MessageQueue->cThreads++;

9 years, 9 months

[janderwald] 66967: - silence traces

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Mar 29 16:08:14 2015 New Revision: 66967 URL: http://svn.reactos.org/svn/reactos?rev=66967&view=rev Log: - silence traces Modified: trunk/reactos/drivers/ksfilter/ks/swenum.c Modified: trunk/reactos/drivers/ksfilter/ks/swenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/swenum… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/swenum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/swenum.c [iso-8859-1] Sun Mar 29 16:08:14 2015 @@ -122,7 +122,7 @@ return Status; } - DPRINT1("Registered DeviceInterface %wZ\n", &BusInstanceEntry->SymbolicLink); + DPRINT("Registered DeviceInterface %wZ\n", &BusInstanceEntry->SymbolicLink); /* done */ @@ -276,8 +276,8 @@ /* check if the device is already present */ Entry = DeviceEntry->DeviceInterfaceList.Flink; - DPRINT1("KspCreateDeviceAssociation ReferenceString %S\n", ReferenceString); - DPRINT1("KspCreateDeviceAssociation InterfaceString %S\n", InterfaceString); + DPRINT("KspCreateDeviceAssociation ReferenceString %S\n", ReferenceString); + DPRINT("KspCreateDeviceAssociation InterfaceString %S\n", InterfaceString); while(Entry != &DeviceEntry->DeviceInterfaceList) { @@ -649,7 +649,7 @@ { /* get bus instance entry */ InstanceEntry = (PBUS_INSTANCE_ENTRY)CONTAINING_RECORD(Entry, BUS_INSTANCE_ENTRY, Entry); - DPRINT1("Enabling %u %wZ Irql %u\n", bEnable, &InstanceEntry->SymbolicLink, KeGetCurrentIrql()); + DPRINT("Enabling %u %wZ Irql %u\n", bEnable, &InstanceEntry->SymbolicLink, KeGetCurrentIrql()); /* set interface state */ Status = IoSetDeviceInterfaceState(&InstanceEntry->SymbolicLink, bEnable); @@ -746,7 +746,7 @@ /* store result code */ Irp->IoStatus.Status = Status; - DPRINT1("Completing IRP %p Status %x\n", Irp, Status); + DPRINT("Completing IRP %p Status %x\n", Irp, Status); /* complete the request */ CompleteRequest(Irp, IO_NO_INCREMENT); @@ -1402,7 +1402,7 @@ NTSTATUS Status; LPWSTR Buffer; - DPRINT1("KsGetBusEnumIdentifier\n"); + DPRINT("KsGetBusEnumIdentifier\n"); /* get stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -1484,7 +1484,7 @@ { PDEV_EXTENSION DeviceExtension; - DPRINT1("KsGetBusEnumParentFDOFromChildPDO\n"); + DPRINT("KsGetBusEnumParentFDOFromChildPDO\n"); /* get device extension */ DeviceExtension = (PDEV_EXTENSION)DeviceObject->DeviceExtension; @@ -1547,7 +1547,7 @@ /* store bus device extension */ DeviceExtension->Ext = (PCOMMON_DEVICE_EXTENSION)BusDeviceExtension; - DPRINT1("DeviceExtension %p BusDeviceExtension %p\n", DeviceExtension, DeviceExtension->Ext); + DPRINT("DeviceExtension %p BusDeviceExtension %p\n", DeviceExtension, DeviceExtension->Ext); /* zero device extension */ @@ -1802,7 +1802,7 @@ PDEV_EXTENSION DeviceExtension; PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; - DPRINT1("KsInstallBusEnumInterface\n"); + DPRINT("KsInstallBusEnumInterface\n"); /* get current irp stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -1913,7 +1913,7 @@ ASSERT(IoStack->FileObject); if (IoStack->FileObject->FileName.Buffer == NULL) { - DPRINT1("KsServiceBusEnumCreateRequest PNP Hack\n"); + DPRINT("KsServiceBusEnumCreateRequest PNP Hack\n"); Irp->IoStatus.Status = STATUS_SUCCESS; return STATUS_SUCCESS; } @@ -1991,7 +1991,7 @@ DPRINT1("KsServiceBusEnumCreateRequest failed to create PDO with %x\n", Status); return Status; } - DPRINT1("PENDING CREATE Irp %p %wZ\n", Irp, &IoStack->FileObject->FileName); + DPRINT("PENDING CREATE Irp %p %wZ\n", Irp, &IoStack->FileObject->FileName); /* delay processing until pnp is finished with enumeration */ IoMarkIrpPending(Irp); @@ -2208,7 +2208,7 @@ PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; PIO_STACK_LOCATION IoStack; - DPRINT1("KsRemoveBusEnumInterface\n"); + DPRINT("KsRemoveBusEnumInterface\n"); /* get io stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp);

9 years, 9 months

[janderwald] 66966: - silence traces

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Mar 29 16:02:40 2015 New Revision: 66966 URL: http://svn.reactos.org/svn/reactos?rev=66966&view=rev Log: - silence traces Modified: trunk/reactos/drivers/ksfilter/swenum/swenum.c Modified: trunk/reactos/drivers/ksfilter/swenum/swenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/swenum/sw… ============================================================================== --- trunk/reactos/drivers/ksfilter/swenum/swenum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/swenum/swenum.c [iso-8859-1] Sun Mar 29 16:02:40 2015 @@ -311,7 +311,7 @@ /* check if the device object is a child device */ Status = KsIsBusEnumChildDevice(DeviceObject, &ChildDevice); - DPRINT1("SwDispatchCreate %x\n", Status); + DPRINT("SwDispatchCreate %x\n", Status); /* check for success */ if (NT_SUCCESS(Status)) @@ -325,7 +325,7 @@ } /* perform the create request */ Status = KsServiceBusEnumCreateRequest(DeviceObject, Irp); - DPRINT1("SwDispatchCreate %x\n", Status); + DPRINT("SwDispatchCreate %x\n", Status); } /* check the irp is pending */

9 years, 9 months

[hbelusca] 66965: [ACPI:BUS]: Fix dereferencing NULL pointers in acpi_bus_notify. By Victor Martinez with small adaptation by me. CORE-8271

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 29 15:49:03 2015 New Revision: 66965 URL: http://svn.reactos.org/svn/reactos?rev=66965&view=rev Log: [ACPI:BUS]: Fix dereferencing NULL pointers in acpi_bus_notify. By Victor Martinez with small adaptation by me. CORE-8271 Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/bu… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] Sun Mar 29 15:49:03 2015 @@ -721,11 +721,13 @@ //blocking_notifier_call_chain(&acpi_bus_notify_list, // type, (void *)handle); + acpi_bus_get_device(handle, &device); + switch (type) { case ACPI_NOTIFY_BUS_CHECK: DPRINT("Received BUS CHECK notification for device [%s]\n", - device->pnp.bus_id); + device ? device->pnp.bus_id : "n/a"); acpi_bus_check_scope(handle); /* * TBD: We'll need to outsource certain events to non-ACPI @@ -735,7 +737,7 @@ case ACPI_NOTIFY_DEVICE_CHECK: DPRINT("Received DEVICE CHECK notification for device [%s]\n", - device->pnp.bus_id); + device ? device->pnp.bus_id : "n/a"); acpi_bus_check_device(handle); /* * TBD: We'll need to outsource certain events to non-ACPI @@ -745,7 +747,7 @@ case ACPI_NOTIFY_DEVICE_WAKE: DPRINT("Received DEVICE WAKE notification for device [%s]\n", - device->pnp.bus_id); + device ? device->pnp.bus_id : "n/a"); acpi_bus_check_device(handle); /* * TBD: We'll need to outsource certain events to non-ACPI @@ -755,41 +757,40 @@ case ACPI_NOTIFY_EJECT_REQUEST: DPRINT1("Received EJECT REQUEST notification for device [%s]\n", - device->pnp.bus_id); + device ? device->pnp.bus_id : "n/a"); /* TBD */ break; case ACPI_NOTIFY_DEVICE_CHECK_LIGHT: DPRINT1("Received DEVICE CHECK LIGHT notification for device [%s]\n", - device->pnp.bus_id); + device ? device->pnp.bus_id : "n/a"); /* TBD: Exactly what does 'light' mean? */ break; case ACPI_NOTIFY_FREQUENCY_MISMATCH: DPRINT1("Received FREQUENCY MISMATCH notification for device [%s]\n", - device->pnp.bus_id); + device ? device->pnp.bus_id : "n/a"); /* TBD */ break; case ACPI_NOTIFY_BUS_MODE_MISMATCH: DPRINT1("Received BUS MODE MISMATCH notification for device [%s]\n", - device->pnp.bus_id); + device ? device->pnp.bus_id : "n/a"); /* TBD */ break; case ACPI_NOTIFY_POWER_FAULT: DPRINT1("Received POWER FAULT notification for device [%s]\n", - device->pnp.bus_id); + device ? device->pnp.bus_id : "n/a"); /* TBD */ break; default: - DPRINT1("Received unknown/unsupported notification [%08x]\n", - type); - break; - } - - acpi_bus_get_device(handle, &device); + DPRINT1("Received unknown/unsupported notification [%08x] for device [%s]\n", + type, device ? device->pnp.bus_id : "n/a"); + break; + } + if (device) { driver = device->driver; if (driver && driver->ops.notify && @@ -1672,7 +1673,7 @@ /* * Register the for all standard device notifications. */ - status = AcpiInstallNotifyHandler(ACPI_ROOT_OBJECT, ACPI_SYSTEM_NOTIFY, &acpi_bus_notify, NULL); + status = AcpiInstallNotifyHandler(ACPI_ROOT_OBJECT, ACPI_SYSTEM_NOTIFY, acpi_bus_notify, NULL); if (ACPI_FAILURE(status)) { DPRINT1("Unable to register for device notifications\n"); result = AE_NOT_FOUND; @@ -1703,7 +1704,7 @@ /* Mimic structured exception handling */ error2: AcpiRemoveNotifyHandler(ACPI_ROOT_OBJECT, - ACPI_SYSTEM_NOTIFY, &acpi_bus_notify); + ACPI_SYSTEM_NOTIFY, acpi_bus_notify); error1: AcpiTerminate(); return_VALUE(AE_NOT_FOUND); @@ -1752,7 +1753,7 @@ DPRINT("Subsystem revision %08x\n",ACPI_CA_VERSION); - KeInitializeSpinLock(&acpi_bus_event_lock); + KeInitializeSpinLock(&acpi_bus_event_lock); KeInitializeEvent(&AcpiEventQueue, NotificationEvent, FALSE); ExInitializeFastMutex(&acpi_bus_drivers_lock);

9 years, 9 months

[akhaldi] 66964: [SETUPAPI] Adopt SetupGetInfFileListW() from Wine Staging 1.7.37. Based on the work of Victor Martinez with my updates. CORE-9431 CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 29 15:07:27 2015 New Revision: 66964 URL: http://svn.reactos.org/svn/reactos?rev=66964&view=rev Log: [SETUPAPI] Adopt SetupGetInfFileListW() from Wine Staging 1.7.37. Based on the work of Victor Martinez with my updates. CORE-9431 CORE-9246 Modified: trunk/reactos/dll/win32/setupapi/parser.c Modified: trunk/reactos/dll/win32/setupapi/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/parser.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/parser.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/parser.c [iso-8859-1] Sun Mar 29 15:07:27 2015 @@ -2120,137 +2120,143 @@ return field->text; } -/*********************************************************************** - * SetupGetInfFileListW (SETUPAPI.@) - */ -BOOL WINAPI -SetupGetInfFileListW( - IN PCWSTR DirectoryPath OPTIONAL, - IN DWORD InfStyle, - IN OUT PWSTR ReturnBuffer OPTIONAL, - IN DWORD ReturnBufferSize OPTIONAL, - OUT PDWORD RequiredSize OPTIONAL) -{ - HANDLE hSearch; - LPWSTR pFullFileName = NULL; - LPWSTR pFileName; /* Pointer into pFullFileName buffer */ - LPWSTR pBuffer = ReturnBuffer; - WIN32_FIND_DATAW wfdFileInfo; - size_t len; - DWORD requiredSize = 0; - BOOL ret = FALSE; - - TRACE("%s %lx %p %ld %p\n", debugstr_w(DirectoryPath), InfStyle, - ReturnBuffer, ReturnBufferSize, RequiredSize); - - if (InfStyle & ~(INF_STYLE_OLDNT | INF_STYLE_WIN4)) - { - TRACE("Unknown flags: 0x%08lx\n", InfStyle & ~(INF_STYLE_OLDNT | INF_STYLE_WIN4)); - SetLastError(ERROR_INVALID_PARAMETER); - goto cleanup; - } - else if (ReturnBufferSize == 0 && ReturnBuffer != NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - goto cleanup; - } - else if (ReturnBufferSize > 0 && ReturnBuffer == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - goto cleanup; - } - - /* Allocate memory for file filter */ - if (DirectoryPath != NULL) - /* "DirectoryPath\" form */ - len = strlenW(DirectoryPath) + 1 + 1; + +/*********************************************************************** + * SetupGetInfFileListW (SETUPAPI.@) + */ +BOOL WINAPI SetupGetInfFileListW(PCWSTR dir, DWORD style, PWSTR buffer, + DWORD insize, PDWORD outsize) +{ + static const WCHAR inf[] = {'\\','*','.','i','n','f',0 }; + WCHAR *filter, *fullname = NULL, *ptr = buffer; + DWORD dir_len, name_len = 20, size ; + WIN32_FIND_DATAW finddata; + HANDLE hdl; + if (style & ~( INF_STYLE_OLDNT | INF_STYLE_WIN4 | + INF_STYLE_CACHE_ENABLE | INF_STYLE_CACHE_DISABLE )) + { + FIXME( "unknown inf_style(s) 0x%x\n", + style & ~( INF_STYLE_OLDNT | INF_STYLE_WIN4 | + INF_STYLE_CACHE_ENABLE | INF_STYLE_CACHE_DISABLE )); + if( outsize ) *outsize = 1; + return TRUE; + } + if ((style & ( INF_STYLE_OLDNT | INF_STYLE_WIN4 )) == INF_STYLE_NONE) + { + FIXME( "inf_style INF_STYLE_NONE not handled\n" ); + if( outsize ) *outsize = 1; + return TRUE; + } + if (style & ( INF_STYLE_CACHE_ENABLE | INF_STYLE_CACHE_DISABLE )) + FIXME("ignored inf_style(s) %s %s\n", + ( style & INF_STYLE_CACHE_ENABLE ) ? "INF_STYLE_CACHE_ENABLE" : "", + ( style & INF_STYLE_CACHE_DISABLE ) ? "INF_STYLE_CACHE_DISABLE" : ""); + if( dir ) + { + DWORD att; + DWORD msize; + dir_len = strlenW( dir ); + if ( !dir_len ) return FALSE; + msize = ( 7 + dir_len ) * sizeof( WCHAR ); /* \\*.inf\0 */ + filter = HeapAlloc( GetProcessHeap(), 0, msize ); + if( !filter ) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + strcpyW( filter, dir ); + if ( '\\' == filter[dir_len - 1] ) + filter[--dir_len] = 0; + + att = GetFileAttributesW( filter ); + if (att != INVALID_FILE_ATTRIBUTES && !(att & FILE_ATTRIBUTE_DIRECTORY)) + { + HeapFree( GetProcessHeap(), 0, filter ); + SetLastError( ERROR_DIRECTORY ); + return FALSE; + } + } else - /* "%SYSTEMROOT%\Inf\" form */ - len = MAX_PATH + 1 + strlenW(InfDirectory) + 1; - len += MAX_PATH; /* To contain file name or "*.inf" string */ - pFullFileName = MyMalloc(len * sizeof(WCHAR)); - if (pFullFileName == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - - /* Fill file filter buffer */ - if (DirectoryPath) - { - strcpyW(pFullFileName, DirectoryPath); - if (*pFullFileName && pFullFileName[strlenW(pFullFileName) - 1] != '\\') - strcatW(pFullFileName, BackSlash); - } - else - { - len = GetSystemWindowsDirectoryW(pFullFileName, MAX_PATH); - if (len == 0 || len > MAX_PATH) - goto cleanup; - if (pFullFileName[strlenW(pFullFileName) - 1] != '\\') - strcatW(pFullFileName, BackSlash); - strcatW(pFullFileName, InfDirectory); - } - pFileName = &pFullFileName[strlenW(pFullFileName)]; - - /* Search for the first file */ - strcpyW(pFileName, InfFileSpecification); - hSearch = FindFirstFileW(pFullFileName, &wfdFileInfo); - if (hSearch == INVALID_HANDLE_VALUE) - { - TRACE("No file returned by %s\n", debugstr_w(pFullFileName)); - goto cleanup; - } - + { + WCHAR infdir[] = {'\\','i','n','f',0 }; + DWORD msize; + dir_len = GetWindowsDirectoryW( NULL, 0 ); + msize = ( 7 + 4 + dir_len ) * sizeof( WCHAR ); + filter = HeapAlloc( GetProcessHeap(), 0, msize ); + if( !filter ) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + GetWindowsDirectoryW( filter, msize ); + strcatW( filter, infdir ); + } + strcatW( filter, inf ); + + hdl = FindFirstFileW( filter , &finddata ); + if ( hdl == INVALID_HANDLE_VALUE ) + { + if( outsize ) *outsize = 1; + HeapFree( GetProcessHeap(), 0, filter ); + return TRUE; + } + size = 1; do { - HINF hInf; - - strcpyW(pFileName, wfdFileInfo.cFileName); - hInf = SetupOpenInfFileW( - pFullFileName, - NULL, /* Inf class */ - InfStyle, - NULL /* Error line */); - if (hInf == INVALID_HANDLE_VALUE) - { - if (GetLastError() == ERROR_CLASS_MISMATCH) + static const WCHAR key[] = + {'S','i','g','n','a','t','u','r','e',0 }; + static const WCHAR section[] = + {'V','e','r','s','i','o','n',0 }; + static const WCHAR sig_win4_1[] = + {'$','C','h','i','c','a','g','o','$',0 }; + static const WCHAR sig_win4_2[] = + {'$','W','I','N','D','O','W','S',' ','N','T','$',0 }; + WCHAR signature[ MAX_PATH ]; + BOOL valid = FALSE; + DWORD len = strlenW( finddata.cFileName ); + if (!fullname || ( name_len < len )) + { + name_len = ( name_len < len ) ? len : name_len; + HeapFree( GetProcessHeap(), 0, fullname ); + fullname = HeapAlloc( GetProcessHeap(), 0, + ( 2 + dir_len + name_len) * sizeof( WCHAR )); + if( !fullname ) { - /* InfStyle was not correct. Skip this file */ - continue; + FindClose( hdl ); + HeapFree( GetProcessHeap(), 0, filter ); + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; } - TRACE("Invalid .inf file %s\n", debugstr_w(pFullFileName)); - continue; - } - - len = strlenW(wfdFileInfo.cFileName) + 1; - requiredSize += (DWORD)(len * sizeof(WCHAR)); - if (requiredSize <= ReturnBufferSize) - { - strcpyW(pBuffer, wfdFileInfo.cFileName); - pBuffer = &pBuffer[len]; - } - SetupCloseInfFile(hInf); - } while (FindNextFileW(hSearch, &wfdFileInfo)); - FindClose(hSearch); - - requiredSize += sizeof(WCHAR); /* Final NULL char */ - if (requiredSize <= ReturnBufferSize) - { - *pBuffer = '\0'; - ret = TRUE; - } - else - { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - ret = FALSE; - } - if (RequiredSize) - *RequiredSize = requiredSize; - -cleanup: - MyFree(pFullFileName); - return ret; + strcpyW( fullname, filter ); + } + fullname[ dir_len + 1] = 0; /* keep '\\' */ + strcatW( fullname, finddata.cFileName ); + if (!GetPrivateProfileStringW( section, key, NULL, signature, MAX_PATH, fullname )) + signature[0] = 0; + if( INF_STYLE_OLDNT & style ) + valid = strcmpiW( sig_win4_1, signature ) && + strcmpiW( sig_win4_2, signature ); + if( INF_STYLE_WIN4 & style ) + valid = valid || !strcmpiW( sig_win4_1, signature ) || + !strcmpiW( sig_win4_2, signature ); + if( valid ) + { + size += 1 + strlenW( finddata.cFileName ); + if( ptr && insize >= size ) + { + strcpyW( ptr, finddata.cFileName ); + ptr += 1 + strlenW( finddata.cFileName ); + *ptr = 0; + } + } + } + while( FindNextFileW( hdl, &finddata )); + FindClose( hdl ); + + HeapFree( GetProcessHeap(), 0, fullname ); + HeapFree( GetProcessHeap(), 0, filter ); + if( outsize ) *outsize = size; + return TRUE; } /***********************************************************************

9 years, 9 months

← Newer
1
2
3
4
5
6
7
...
50
Older →

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 March 2015