Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

[winesync] 27899: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Fri Jul 27 13:12:45 2007 New Revision: 27899 URL: http://svn.reactos.org/svn/reactos?rev=27899&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/cabinet/fci.c trunk/reactos/dll/win32/cabinet/fdi.c Modified: trunk/reactos/dll/win32/cabinet/fci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fci.c?re… ============================================================================== --- trunk/reactos/dll/win32/cabinet/fci.c (original) +++ trunk/reactos/dll/win32/cabinet/fci.c Fri Jul 27 13:12:45 2007 @@ -173,7 +173,11 @@ int err; PFCI_Int p_fci_internal; - if ((!perf) || (!pfnalloc) || (!pfnfree) || (!pfnopen) || (!pfnread) || + if (!perf) { + SetLastError(ERROR_BAD_ARGUMENTS); + return NULL; + } + if ((!pfnalloc) || (!pfnfree) || (!pfnopen) || (!pfnread) || (!pfnwrite) || (!pfnclose) || (!pfnseek) || (!pfndelete) || (!pfnfcigtf) || (!pccab)) { perf->erfOper = FCIERR_NONE; Modified: trunk/reactos/dll/win32/cabinet/fdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fdi.c?re… ============================================================================== --- trunk/reactos/dll/win32/cabinet/fdi.c (original) +++ trunk/reactos/dll/win32/cabinet/fdi.c Fri Jul 27 13:12:45 2007 @@ -446,7 +446,7 @@ unsigned int i; cab_UBYTE *buf = NULL; - TRACE("(hfdi == ^%p, hf == %d)\n", hfdi, hf); + TRACE("(hfdi == ^%p, hf == %ld)\n", hfdi, hf); do { if (len > maxlen) len = maxlen; @@ -501,7 +501,7 @@ cab_UBYTE buf[64], block_resv; char *prevname = NULL, *previnfo = NULL, *nextname = NULL, *nextinfo = NULL; - TRACE("(hfdi == ^%p, hf == %d, pfdici == ^%p)\n", hfdi, hf, pfdici); + TRACE("(hfdi == ^%p, hf == %ld, pfdici == ^%p)\n", hfdi, hf, pfdici); /* * FIXME: I just noticed that I am memorizing the initial file pointer @@ -757,7 +757,7 @@ { BOOL rv; - TRACE("(hfdi == ^%p, hf == ^%d, pfdici == ^%p)\n", hfdi, hf, pfdici); + TRACE("(hfdi == ^%p, hf == ^%ld, pfdici == ^%p)\n", hfdi, hf, pfdici); if (!REALLY_IS_FDI(hfdi)) { ERR("REALLY_IS_FDI failed on ^%p\n", hfdi); @@ -2690,6 +2690,7 @@ PFDI_INT(hfdi)->perf->erfOper = FDIERROR_USER_ABORT; PFDI_INT(hfdi)->perf->erfType = 0; PFDI_INT(hfdi)->perf->fError = TRUE; + filehf = 0; goto bail_and_fail; } }

17 years, 5 months

[winesync] 27898: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Fri Jul 27 13:10:10 2007 New Revision: 27898 URL: http://svn.reactos.org/svn/reactos?rev=27898&view=rev Log: Autosyncing with Wine HEAD Removed: trunk/reactos/dll/win32/avifil32/avifile_Bg.rc Modified: trunk/reactos/dll/win32/avifil32/avifile_En.rc trunk/reactos/dll/win32/avifil32/avifile_Ko.rc trunk/reactos/dll/win32/avifil32/avifile_No.rc trunk/reactos/dll/win32/avifil32/rsrc.rc Removed: trunk/reactos/dll/win32/avifil32/avifile_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Bg.rc (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Bg.rc (removed) @@ -1,50 +1,0 @@ -/* - * Copyright 2002 Michael Günnewig - * - * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT - -IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Íàñòðîéêè íà óïëúòíÿâàíåòî" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Èçáîð íà ïîòîê:",-1,2,5,114,10 - COMBOBOX IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP - PUSHBUTTON "&Íàñòðîéêè...",IDC_OPTIONS,145,17,45,14 - AUTOCHECKBOX "&Êëþ÷îâ êàäúð ïðåç",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP - EDITTEXT IDC_INTERLEAVEEVERY,66,41,32,12,ES_AUTOHSCROLL - LTEXT "êàäúðà",-1,104,43,36,9 - LTEXT "Òåêóù ôîðìàò:",-1,3,56,53,9 - LTEXT "Ìÿñòîòî ñå äàâà ïîä íàåì",IDC_FORMATTEXT,55,56,90,26 - DEFPUSHBUTTON "Äîáðå",IDOK,145,42,45,14 - PUSHBUTTON "Îòêàç",IDCANCEL,145,61,45,14 -END - -STRINGTABLE DISCARDABLE -{ - IDS_WAVESTREAMFORMAT "Âúëíà: %s" - IDS_WAVEFILETYPE "Âúëíà" - IDS_ALLMULTIMEDIA "Âñè÷êè ìóëòèìåäèéíè ôàéëîâå" - IDS_ALLFILES "Âñè÷êè ôàéëîâå (*.*)(a)*.*" - IDS_VIDEO "âèäåî" - IDS_AUDIO "çâóê" - IDS_AVISTREAMFORMAT "%s %s #%d" - IDS_AVIFILETYPE "Ïîäðàçáðàí çà ÐåàêòÎÑ âèäîîáðàáîò÷èê" - IDS_UNCOMPRESSED "íåóïëúòíåíî" -} Modified: trunk/reactos/dll/win32/avifil32/avifile_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_En.rc (original) +++ trunk/reactos/dll/win32/avifil32/avifile_En.rc Fri Jul 27 13:10:10 2007 @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU Modified: trunk/reactos/dll/win32/avifil32/avifile_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Ko.rc (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Ko.rc Fri Jul 27 13:10:10 2007 @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT +LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU Modified: trunk/reactos/dll/win32/avifil32/avifile_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_No.rc (original) +++ trunk/reactos/dll/win32/avifil32/avifile_No.rc Fri Jul 27 13:10:10 2007 @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU Modified: trunk/reactos/dll/win32/avifil32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/rsrc.rc… ============================================================================== --- trunk/reactos/dll/win32/avifil32/rsrc.rc (original) +++ trunk/reactos/dll/win32/avifil32/rsrc.rc Fri Jul 27 13:10:10 2007 @@ -38,7 +38,6 @@ * Everything specific to any language goes * in one of the specific files. */ -#include "avifile_Bg.rc" #include "avifile_Cs.rc" #include "avifile_De.rc" #include "avifile_En.rc"

17 years, 5 months

[winesync] 27897: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Fri Jul 27 13:03:12 2007 New Revision: 27897 URL: http://svn.reactos.org/svn/reactos?rev=27897&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/advpack/files.c trunk/reactos/dll/win32/advpack/install.c Modified: trunk/reactos/dll/win32/advpack/files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/files.c?… ============================================================================== --- trunk/reactos/dll/win32/advpack/files.c (original) +++ trunk/reactos/dll/win32/advpack/files.c Fri Jul 27 13:03:12 2007 @@ -331,7 +331,6 @@ DWORD fattrs = GetFileAttributesW(fname); HRESULT ret = E_FAIL; - static const WCHAR backslash[] = {'\\',0}; static const WCHAR asterisk[] = {'*',0}; static const WCHAR dot[] = {'.',0}; static const WCHAR dotdot[] = {'.','.',0}; @@ -344,11 +343,7 @@ int fname_len = lstrlenW(fname); /* Generate a path with wildcard suitable for iterating */ - if (lstrcmpW(CharPrevW(fname, fname + fname_len), backslash)) - { - lstrcpyW(fname + fname_len, backslash); - ++fname_len; - } + if (fname_len && fname[fname_len-1] != '\\') fname[fname_len++] = '\\'; lstrcpyW(fname + fname_len, asterisk); if ((hFindFile = FindFirstFileW(fname, &w32fd)) != INVALID_HANDLE_VALUE) Modified: trunk/reactos/dll/win32/advpack/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/install.… ============================================================================== --- trunk/reactos/dll/win32/advpack/install.c (original) +++ trunk/reactos/dll/win32/advpack/install.c Fri Jul 27 13:03:12 2007 @@ -512,8 +512,7 @@ /* release the install instance information */ static void install_release(const ADVInfo *info) { - if (info->hinf && info->hinf != INVALID_HANDLE_VALUE) - SetupCloseInfFile(info->hinf); + SetupCloseInfFile(info->hinf); HeapFree(GetProcessHeap(), 0, info->inf_path); HeapFree(GetProcessHeap(), 0, info->inf_filename);

17 years, 5 months

[hpoussin] 27896: Merge SetupGetFileCompressionInfo[Ex]A/W, SetupDecompressOrCopyFileA/W, SetupGetSourceFileLocationA/W, SetupGetSourceInfoA/W, SetupGetTargetPathA/W, SetupQueryInfOriginalFileInformationA/W from Wine Misc fixes by me and Wine team

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Jul 27 13:02:18 2007 New Revision: 27896 URL: http://svn.reactos.org/svn/reactos?rev=27896&view=rev Log: Merge SetupGetFileCompressionInfo[Ex]A/W, SetupDecompressOrCopyFileA/W, SetupGetSourceFileLocationA/W, SetupGetSourceInfoA/W, SetupGetTargetPathA/W, SetupQueryInfOriginalFileInformationA/W from Wine Misc fixes by me and Wine team Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/devclass.c trunk/reactos/dll/win32/setupapi/devinst.c trunk/reactos/dll/win32/setupapi/install.c trunk/reactos/dll/win32/setupapi/misc.c trunk/reactos/dll/win32/setupapi/parser.c trunk/reactos/dll/win32/setupapi/query.c trunk/reactos/dll/win32/setupapi/queue.c trunk/reactos/dll/win32/setupapi/setupapi.rbuild trunk/reactos/dll/win32/setupapi/setupapi.spec trunk/reactos/dll/win32/setupapi/setupapi_private.h trunk/reactos/dll/win32/setupapi/stubs.c trunk/reactos/include/psdk/setupapi.h Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c Fri Jul 27 13:02:18 2007 @@ -66,9 +66,9 @@ lstrcpyW(&String[1], lpString); - String[0] = L'{'; - String[MAX_GUID_STRING_LEN - 2] = L'}'; - String[MAX_GUID_STRING_LEN - 1] = 0; + String[0] = '{'; + String[MAX_GUID_STRING_LEN - 2] = '}'; + String[MAX_GUID_STRING_LEN - 1] = UNICODE_NULL; RpcStringFreeW(&lpString); Modified: trunk/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devclas… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devclass.c (original) +++ trunk/reactos/dll/win32/setupapi/devclass.c Fri Jul 27 13:02:18 2007 @@ -276,7 +276,7 @@ TRACE("Guid: %s\n", debugstr_w(szKeyName)); if (dwGuidListIndex < ClassGuidListSize) { - if (szKeyName[0] == L'{' && szKeyName[37] == L'}') + if (szKeyName[0] == '{' && szKeyName[37] == '}') szKeyName[37] = 0; UuidFromStringW(&szKeyName[1], @@ -472,7 +472,7 @@ TRACE("Guid: %s\n", debugstr_w(szKeyName)); if (dwGuidListIndex < ClassGuidListSize) { - if (szKeyName[0] == L'{' && szKeyName[37] == L'}') + if (szKeyName[0] == '{' && szKeyName[37] == '}') szKeyName[37] = 0; UuidFromStringW(&szKeyName[1], Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c Fri Jul 27 13:02:18 2007 @@ -172,7 +172,7 @@ IN PCWSTR MachineName OPTIONAL, IN PVOID Reserved) { - struct DeviceInfoSet *list; + struct DeviceInfoSet *list = NULL; DWORD size; DWORD rc; CONFIGRET cr; @@ -180,6 +180,12 @@ TRACE("%s %p %s %p\n", debugstr_guid(ClassGuid), hwndParent, debugstr_w(MachineName), Reserved); + + if (Reserved != NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + goto cleanup; + } size = FIELD_OFFSET(struct DeviceInfoSet, szData); if (MachineName) @@ -205,7 +211,7 @@ rc = RegConnectRegistryW(MachineName, HKEY_LOCAL_MACHINE, &list->HKLM); if (rc != ERROR_SUCCESS) { - SetLastError(rc); + SetLastError(ERROR_INVALID_MACHINENAME); goto cleanup; } @@ -493,7 +499,7 @@ if (Fields[i]) { Fields[i]++; - *(Fields[i] - 1) = L'\0'; + *(Fields[i] - 1) = UNICODE_NULL; } } /* Take care of first 2 fields */ @@ -3422,7 +3428,7 @@ TRACE("Write information to driver key\n"); TRACE("DriverDate : '%u-%u-%u'\n", DriverDate.wMonth, DriverDate.wDay, DriverDate.wYear); TRACE("DriverDesc : '%s'\n", debugstr_w(SelectedDriver->Info.Description)); - TRACE("DriverVersion : '%u.%u.%u.%u'\n", fullVersion.HighPart >> 16, fullVersion.HighPart & 0xffff, fullVersion.LowPart >> 16, fullVersion.LowPart & 0xffff); + TRACE("DriverVersion : '%ld.%ld.%lu.%ld'\n", fullVersion.HighPart >> 16, fullVersion.HighPart & 0xffff, fullVersion.LowPart >> 16, fullVersion.LowPart & 0xffff); TRACE("InfPath : '%s'\n", debugstr_w(SelectedDriver->InfFileDetails->FileName)); TRACE("InfSection : '%s'\n", debugstr_w(SelectedDriver->Details.SectionName)); TRACE("InfSectionExt : '%s'\n", debugstr_w(&SectionName[strlenW(SelectedDriver->Details.SectionName)])); Modified: trunk/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/install… ============================================================================== --- trunk/reactos/dll/win32/setupapi/install.c (original) +++ trunk/reactos/dll/win32/setupapi/install.c Fri Jul 27 13:02:18 2007 @@ -981,7 +981,7 @@ return SetupInstallServicesFromInfSectionExW(*(HINF*)hinf, field, info->flags, info->devinfo, info->devinfo_data, info->reserved1, info->reserved2); default: - ERR("Unknown info type %ld\n", info->type); + ERR("Unknown info type %u\n", info->type); return FALSE; } } @@ -1689,7 +1689,7 @@ SetLastError(ERROR_INVALID_PARAMETER); else if (!(SourceInfFileNameW = MultiByteToUnicode(SourceInfFileName, CP_ACP))) SetLastError(ERROR_INVALID_PARAMETER); - else if (!(OEMSourceMediaLocationW = MultiByteToUnicode(OEMSourceMediaLocation, CP_ACP))) + else if (OEMSourceMediaType != SPOST_NONE && !(OEMSourceMediaLocationW = MultiByteToUnicode(OEMSourceMediaLocation, CP_ACP))) SetLastError(ERROR_INVALID_PARAMETER); else { @@ -1743,6 +1743,29 @@ return ret; } +static int compare_files( HANDLE file1, HANDLE file2 ) +{ + char buffer1[2048]; + char buffer2[2048]; + DWORD size1; + DWORD size2; + + while( ReadFile(file1, buffer1, sizeof(buffer1), &size1, NULL) && + ReadFile(file2, buffer2, sizeof(buffer2), &size2, NULL) ) + { + int ret; + if (size1 != size2) + return size1 > size2 ? 1 : -1; + if (!size1) + return 0; + ret = memcmp( buffer1, buffer2, size1 ); + if (ret) + return ret; + } + + return 0; +} + /*********************************************************************** * SetupCopyOEMInfW (SETUPAPI.@) */ @@ -1767,6 +1790,8 @@ SetLastError(ERROR_INVALID_PARAMETER); else if (OEMSourceMediaType != SPOST_NONE && OEMSourceMediaType != SPOST_PATH && OEMSourceMediaType != SPOST_URL) SetLastError(ERROR_INVALID_PARAMETER); + else if (OEMSourceMediaType != SPOST_NONE && !OEMSourceMediaLocation) + SetLastError(ERROR_INVALID_PARAMETER); else if (CopyStyle & ~(SP_COPY_DELETESOURCE | SP_COPY_REPLACEONLY | SP_COPY_NOOVERWRITE | SP_COPY_OEMINF_CATALOG_ONLY)) { TRACE("Unknown flags: 0x%08lx\n", CopyStyle & ~(SP_COPY_DELETESOURCE | SP_COPY_REPLACEONLY | SP_COPY_NOOVERWRITE | SP_COPY_OEMINF_CATALOG_ONLY)); @@ -1776,7 +1801,7 @@ SetLastError(ERROR_INVALID_PARAMETER); else if (CopyStyle & SP_COPY_OEMINF_CATALOG_ONLY) { - FIXME("CopyStyle 0x%lx not supported\n", SP_COPY_OEMINF_CATALOG_ONLY); + FIXME("CopyStyle 0x%x not supported\n", SP_COPY_OEMINF_CATALOG_ONLY); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); } else @@ -1788,29 +1813,68 @@ SIZE_T len; LPWSTR pFullFileName = NULL; LPWSTR pFileName; /* Pointer into pFullFileName buffer */ + HANDLE hSourceFile = INVALID_HANDLE_VALUE; if (OEMSourceMediaType == SPOST_PATH || OEMSourceMediaType == SPOST_URL) FIXME("OEMSourceMediaType 0x%lx ignored\n", OEMSourceMediaType); - /* Search if the specified .inf file already exists in %WINDIR%\Inf */ - AlreadyExists = FALSE; /* FIXME */ - - if (!AlreadyExists && CopyStyle & SP_COPY_REPLACEONLY) - { - /* FIXME: set DestinationInfFileName, RequiredSize, DestinationInfFileNameComponent */ + /* Check if source file exists, and open it */ + if (strchrW(SourceInfFileName, '\\' ) || strchrW(SourceInfFileName, '/' )) + { + WCHAR *path; + + if (!(len = GetFullPathNameW(SourceInfFileName, 0, NULL, NULL))) + return FALSE; + if (!(path = MyMalloc(len * sizeof(WCHAR)))) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + GetFullPathNameW(SourceInfFileName, len, path, NULL); + hSourceFile = CreateFileW( + path, FILE_READ_DATA | FILE_READ_ATTRIBUTES, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, 0, NULL); + MyFree(path); + } + else /* try Windows directory */ + { + WCHAR *path, *p; + static const WCHAR Inf[] = {'\\','i','n','f','\\',0}; + static const WCHAR System32[] = {'\\','s','y','s','t','e','m','3','2','\\',0}; + + len = GetWindowsDirectoryW(NULL, 0) + strlenW(SourceInfFileName) + 12; + if (!(path = MyMalloc(len * sizeof(WCHAR)))) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + GetWindowsDirectoryW(path, len); + p = path + strlenW(path); + strcpyW(p, Inf); + strcatW(p, SourceInfFileName); + hSourceFile = CreateFileW( + path, FILE_READ_DATA | FILE_READ_ATTRIBUTES, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, 0, NULL); + if (hSourceFile == INVALID_HANDLE_VALUE) + { + strcpyW(p, System32); + strcatW(p, SourceInfFileName); + hSourceFile = CreateFileW( + path, FILE_READ_DATA | FILE_READ_ATTRIBUTES, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, 0, NULL); + } + MyFree(path); + } + if (hSourceFile == INVALID_HANDLE_VALUE) + { SetLastError(ERROR_FILE_NOT_FOUND); goto cleanup; } - else if (AlreadyExists && (CopyStyle & SP_COPY_NOOVERWRITE)) - { - //SetLastError(ERROR_FILE_EXISTS); - /* FIXME: set return fields */ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - FIXME("File already exists. Need to return its name!\n"); - goto cleanup; - } - - /* Search the number to give to OEM??.INF */ + + /* Prepare .inf file specification */ len = MAX_PATH + 1 + strlenW(InfDirectory) + 13; pFullFileName = MyMalloc(len * sizeof(WCHAR)); if (!pFullFileName) @@ -1825,7 +1889,70 @@ strcatW(pFullFileName, BackSlash); strcatW(pFullFileName, InfDirectory); pFileName = &pFullFileName[strlenW(pFullFileName)]; - sprintfW(pFileName, OemFileMask, NextFreeNumber); + + /* Search if the specified .inf file already exists in %WINDIR%\Inf */ + AlreadyExists = FALSE; + strcpyW(pFileName, OemFileMask); + hSearch = FindFirstFileW(pFullFileName, &FindFileData); + if (hSearch != INVALID_HANDLE_VALUE) + { + LARGE_INTEGER SourceFileSize; + + if (GetFileSizeEx(hSourceFile, &SourceFileSize)) + { + do + { + LARGE_INTEGER DestFileSize; + HANDLE hDestFile; + + strcpyW(pFileName, FindFileData.cFileName); + hDestFile = CreateFileW( + pFullFileName, FILE_READ_DATA | FILE_READ_ATTRIBUTES, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, 0, NULL); + if (hDestFile != INVALID_HANDLE_VALUE) + { + if (GetFileSizeEx(hDestFile, &DestFileSize) + && DestFileSize.QuadPart == SourceFileSize.QuadPart + && compare_files(hSourceFile, hDestFile)) + { + TRACE("%s already exists as %s\n", + debugstr_w(SourceInfFileName), debugstr_w(pFileName)); + AlreadyExists = TRUE; + } + } + } while (!AlreadyExists && FindNextFileW(hSearch, &FindFileData)); + } + FindClose(hSearch); + hSearch = INVALID_HANDLE_VALUE; + } + + if (!AlreadyExists && CopyStyle & SP_COPY_REPLACEONLY) + { + /* FIXME: set DestinationInfFileName, RequiredSize, DestinationInfFileNameComponent */ + SetLastError(ERROR_FILE_NOT_FOUND); + goto cleanup; + } + else if (AlreadyExists && (CopyStyle & SP_COPY_NOOVERWRITE)) + { + DWORD Size = strlenW(pFileName) + 1; + + if (RequiredSize) + *RequiredSize = Size; + if (DestinationInfFileNameSize == 0) + SetLastError(ERROR_FILE_EXISTS); + else if (DestinationInfFileNameSize < Size) + SetLastError(ERROR_INSUFFICIENT_BUFFER); + else + { + SetLastError(ERROR_FILE_EXISTS); + strcpyW(DestinationInfFileName, pFileName); + } + goto cleanup; + } + + /* Search the number to give to OEM??.INF */ + strcpyW(pFileName, OemFileMask); hSearch = FindFirstFileW(pFullFileName, &FindFileData); if (hSearch == INVALID_HANDLE_VALUE) { @@ -1840,7 +1967,8 @@ if (swscanf(FindFileData.cFileName, OemFileSpecification, &CurrentNumber) == 1 && CurrentNumber <= 99999) { - NextFreeNumber = CurrentNumber + 1; + if (CurrentNumber >= NextFreeNumber) + NextFreeNumber = CurrentNumber + 1; } } while (FindNextFileW(hSearch, &FindFileData)); } @@ -1856,24 +1984,28 @@ sprintfW(pFileName, OemFileSpecification, NextFreeNumber); TRACE("Next available file is %s\n", debugstr_w(pFileName)); + if (!CopyFileW(SourceInfFileName, pFullFileName, TRUE)) + { + TRACE("CopyFileW() failed with error 0x%lx\n", GetLastError()); + goto cleanup; + } + + len = strlenW(pFullFileName) + 1; if (RequiredSize) *RequiredSize = len; if (DestinationInfFileName) { - if (DestinationInfFileNameSize < len) + if (DestinationInfFileNameSize >= len) + { + strcpyW(DestinationInfFileName, pFullFileName); + if (DestinationInfFileNameComponent) + *DestinationInfFileNameComponent = &DestinationInfFileName[pFileName - pFullFileName]; + } + else { SetLastError(ERROR_INSUFFICIENT_BUFFER); goto cleanup; } - strcpyW(DestinationInfFileName, pFullFileName); - if (DestinationInfFileNameComponent) - *DestinationInfFileNameComponent = &DestinationInfFileName[pFileName - pFullFileName]; - } - - if (!CopyFileW(SourceInfFileName, pFullFileName, TRUE)) - { - TRACE("CopyFileW() failed with error 0x%lx\n", GetLastError()); - goto cleanup; } if (CopyStyle & SP_COPY_DELETESOURCE) @@ -1888,6 +2020,8 @@ ret = TRUE; cleanup: + if (hSourceFile != INVALID_HANDLE_VALUE) + CloseHandle(hSourceFile); if (hSearch != INVALID_HANDLE_VALUE) FindClose(hSearch); MyFree(pFullFileName); Modified: trunk/reactos/dll/win32/setupapi/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/misc.c?… ============================================================================== --- trunk/reactos/dll/win32/setupapi/misc.c (original) +++ trunk/reactos/dll/win32/setupapi/misc.c Fri Jul 27 13:02:18 2007 @@ -2,6 +2,7 @@ * Setupapi miscellaneous functions * * Copyright 2005 Eric Kohl + * Copyright 2007 Hans Leidekker * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1221,3 +1222,437 @@ return TRUE; } + +/*********************************************************************** + * InstallCatalog (SETUPAPI.@) + */ +DWORD WINAPI InstallCatalog( LPCSTR catalog, LPCSTR basename, LPSTR fullname ) +{ + FIXME("%s, %s, %p\n", debugstr_a(catalog), debugstr_a(basename), fullname); + return 0; +} + +static UINT detect_compression_type( LPCWSTR file ) +{ + DWORD size; + HANDLE handle; + UINT type = FILE_COMPRESSION_NONE; + static const BYTE LZ_MAGIC[] = { 0x53, 0x5a, 0x44, 0x44, 0x88, 0xf0, 0x27, 0x33 }; + static const BYTE MSZIP_MAGIC[] = { 0x4b, 0x57, 0x41, 0x4a }; + static const BYTE NTCAB_MAGIC[] = { 0x4d, 0x53, 0x43, 0x46 }; + BYTE buffer[8]; + + handle = CreateFileW( file, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL ); + if (handle == INVALID_HANDLE_VALUE) + { + ERR("cannot open file %s\n", debugstr_w(file)); + return FILE_COMPRESSION_NONE; + } + if (!ReadFile( handle, buffer, sizeof(buffer), &size, NULL ) || size != sizeof(buffer)) + { + CloseHandle( handle ); + return FILE_COMPRESSION_NONE; + } + if (!memcmp( buffer, LZ_MAGIC, sizeof(LZ_MAGIC) )) type = FILE_COMPRESSION_WINLZA; + else if (!memcmp( buffer, MSZIP_MAGIC, sizeof(MSZIP_MAGIC) )) type = FILE_COMPRESSION_MSZIP; + else if (!memcmp( buffer, NTCAB_MAGIC, sizeof(NTCAB_MAGIC) )) type = FILE_COMPRESSION_MSZIP; /* not a typo */ + + CloseHandle( handle ); + return type; +} + +static BOOL get_file_size( LPCWSTR file, DWORD *size ) +{ + HANDLE handle; + + handle = CreateFileW( file, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL ); + if (handle == INVALID_HANDLE_VALUE) + { + ERR("cannot open file %s\n", debugstr_w(file)); + return FALSE; + } + *size = GetFileSize( handle, NULL ); + CloseHandle( handle ); + return TRUE; +} + +static BOOL get_file_sizes_none( LPCWSTR source, DWORD *source_size, DWORD *target_size ) +{ + DWORD size; + + if (!get_file_size( source, &size )) return FALSE; + if (source_size) *source_size = size; + if (target_size) *target_size = size; + return TRUE; +} + +static BOOL get_file_sizes_lz( LPCWSTR source, DWORD *source_size, DWORD *target_size ) +{ + DWORD size; + BOOL ret = TRUE; + + if (source_size) + { + if (!get_file_size( source, &size )) ret = FALSE; + else *source_size = size; + } + if (target_size) + { + INT file; + OFSTRUCT of; + + if ((file = LZOpenFileW( (LPWSTR)source, &of, OF_READ )) < 0) + { + ERR("cannot open source file for reading\n"); + return FALSE; + } + *target_size = LZSeek( file, 0, 2 ); + LZClose( file ); + } + return ret; +} + +static UINT CALLBACK file_compression_info_callback( PVOID context, UINT notification, UINT_PTR param1, UINT_PTR param2 ) +{ + DWORD *size = context; + FILE_IN_CABINET_INFO_W *info = (FILE_IN_CABINET_INFO_W *)param1; + + switch (notification) + { + case SPFILENOTIFY_FILEINCABINET: + { + *size = info->FileSize; + return FILEOP_SKIP; + } + default: return NO_ERROR; + } +} + +static BOOL get_file_sizes_cab( LPCWSTR source, DWORD *source_size, DWORD *target_size ) +{ + DWORD size; + BOOL ret = TRUE; + + if (source_size) + { + if (!get_file_size( source, &size )) ret = FALSE; + else *source_size = size; + } + if (target_size) + { + ret = SetupIterateCabinetW( source, 0, file_compression_info_callback, target_size ); + } + return ret; +} + +/*********************************************************************** + * SetupGetFileCompressionInfoExA (SETUPAPI.@) + * + * See SetupGetFileCompressionInfoExW. + */ +BOOL WINAPI SetupGetFileCompressionInfoExA( PCSTR source, PSTR name, DWORD len, PDWORD required, + PDWORD source_size, PDWORD target_size, PUINT type ) +{ + BOOL ret; + WCHAR *nameW = NULL, *sourceW = NULL; + DWORD nb_chars = 0; + LPSTR nameA; + + TRACE("%s, %p, %lu, %p, %p, %p, %p\n", debugstr_a(source), name, len, required, + source_size, target_size, type); + + if (!source || !(sourceW = MultiByteToUnicode( source, CP_ACP ))) return FALSE; + + if (name) + { + ret = SetupGetFileCompressionInfoExW( sourceW, NULL, 0, &nb_chars, NULL, NULL, NULL ); + if (!(nameW = HeapAlloc( GetProcessHeap(), 0, nb_chars * sizeof(WCHAR) ))) + { + MyFree( sourceW ); + return FALSE; + } + } + ret = SetupGetFileCompressionInfoExW( sourceW, nameW, nb_chars, &nb_chars, source_size, target_size, type ); + if (ret) + { + if ((nameA = UnicodeToMultiByte( nameW, CP_ACP ))) + { + if (name && len >= nb_chars) lstrcpyA( name, nameA ); + else + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + ret = FALSE; + } + MyFree( nameA ); + } + } + if (required) *required = nb_chars; + HeapFree( GetProcessHeap(), 0, nameW ); + MyFree( sourceW ); + + return ret; +} + +/*********************************************************************** + * SetupGetFileCompressionInfoExW (SETUPAPI.@) + * + * Get compression type and compressed/uncompressed sizes of a given file. + * + * PARAMS + * source [I] File to examine. + * name [O] Actual filename used. + * len [I] Length in characters of 'name' buffer. + * required [O] Number of characters written to 'name'. + * source_size [O] Size of compressed file. + * target_size [O] Size of uncompressed file. + * type [O] Compression type. + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ +BOOL WINAPI SetupGetFileCompressionInfoExW( PCWSTR source, PWSTR name, DWORD len, PDWORD required, + PDWORD source_size, PDWORD target_size, PUINT type ) +{ + UINT comp; + BOOL ret = FALSE; + DWORD source_len; + + TRACE("%s, %p, %lu, %p, %p, %p, %p\n", debugstr_w(source), name, len, required, + source_size, target_size, type); + + if (!source) return FALSE; + + source_len = lstrlenW( source ) + 1; + if (required) *required = source_len; + if (name && len >= source_len) + { + lstrcpyW( name, source ); + ret = TRUE; + } + else return FALSE; + + comp = detect_compression_type( source ); + if (type) *type = comp; + + switch (comp) + { + case FILE_COMPRESSION_MSZIP: + case FILE_COMPRESSION_NTCAB: ret = get_file_sizes_cab( source, source_size, target_size ); break; + case FILE_COMPRESSION_NONE: ret = get_file_sizes_none( source, source_size, target_size ); break; + case FILE_COMPRESSION_WINLZA: ret = get_file_sizes_lz( source, source_size, target_size ); break; + default: break; + } + return ret; +} + +/*********************************************************************** + * SetupGetFileCompressionInfoA (SETUPAPI.@) + * + * See SetupGetFileCompressionInfoW. + */ +DWORD WINAPI SetupGetFileCompressionInfoA( PCSTR source, PSTR *name, PDWORD source_size, + PDWORD target_size, PUINT type ) +{ + BOOL ret; + DWORD error, required; + LPSTR actual_name; + + TRACE("%s, %p, %p, %p, %p\n", debugstr_a(source), name, source_size, target_size, type); + + if (!source || !name || !source_size || !target_size || !type) + return ERROR_INVALID_PARAMETER; + + ret = SetupGetFileCompressionInfoExA( source, NULL, 0, &required, NULL, NULL, NULL ); + if (!(actual_name = MyMalloc( required ))) return ERROR_NOT_ENOUGH_MEMORY; + + ret = SetupGetFileCompressionInfoExA( source, actual_name, required, &required, + source_size, target_size, type ); + if (!ret) + { + error = GetLastError(); + MyFree( actual_name ); + return error; + } + *name = actual_name; + return ERROR_SUCCESS; +} + +/*********************************************************************** + * SetupGetFileCompressionInfoW (SETUPAPI.@) + * + * Get compression type and compressed/uncompressed sizes of a given file. + * + * PARAMS + * source [I] File to examine. + * name [O] Actual filename used. + * source_size [O] Size of compressed file. + * target_size [O] Size of uncompressed file. + * type [O] Compression type. + * + * RETURNS + * Success: ERROR_SUCCESS + * Failure: Win32 error code. + */ +DWORD WINAPI SetupGetFileCompressionInfoW( PCWSTR source, PWSTR *name, PDWORD source_size, + PDWORD target_size, PUINT type ) +{ + BOOL ret; + DWORD error, required; + LPWSTR actual_name; + + TRACE("%s, %p, %p, %p, %p\n", debugstr_w(source), name, source_size, target_size, type); + + if (!source || !name || !source_size || !target_size || !type) + return ERROR_INVALID_PARAMETER; + + ret = SetupGetFileCompressionInfoExW( source, NULL, 0, &required, NULL, NULL, NULL ); + if (!(actual_name = MyMalloc( required ))) return ERROR_NOT_ENOUGH_MEMORY; + + ret = SetupGetFileCompressionInfoExW( source, actual_name, required, &required, + source_size, target_size, type ); + if (!ret) + { + error = GetLastError(); + MyFree( actual_name ); + return error; + } + *name = actual_name; + return ERROR_SUCCESS; +} + +static DWORD decompress_file_lz( LPCWSTR source, LPCWSTR target ) +{ + DWORD ret; + LONG error; + INT src, dst; + OFSTRUCT sof, dof; + + if ((src = LZOpenFileW( (LPWSTR)source, &sof, OF_READ )) < 0) + { + ERR("cannot open source file for reading\n"); + return ERROR_FILE_NOT_FOUND; + } + if ((dst = LZOpenFileW( (LPWSTR)target, &dof, OF_CREATE )) < 0) + { + ERR("cannot open target file for writing\n"); + LZClose( src ); + return ERROR_FILE_NOT_FOUND; + } + if ((error = LZCopy( src, dst )) >= 0) ret = ERROR_SUCCESS; + else + { + WARN("failed to decompress file %ld\n", error); + ret = ERROR_INVALID_DATA; + } + + LZClose( src ); + LZClose( dst ); + return ret; +} + +static UINT CALLBACK decompress_or_copy_callback( PVOID context, UINT notification, UINT_PTR param1, UINT_PTR param2 ) +{ + FILE_IN_CABINET_INFO_W *info = (FILE_IN_CABINET_INFO_W *)param1; + + switch (notification) + { + case SPFILENOTIFY_FILEINCABINET: + { + LPCWSTR filename, targetname = context; + WCHAR *p; + + if ((p = strrchrW( targetname, '\\' ))) filename = p + 1; + else filename = targetname; + + if (!lstrcmpiW( filename, info->NameInCabinet )) + { + strcpyW( info->FullTargetName, targetname ); + return FILEOP_DOIT; + } + return FILEOP_SKIP; + } + default: return NO_ERROR; + } +} + +static DWORD decompress_file_cab( LPCWSTR source, LPCWSTR target ) +{ + BOOL ret; + + ret = SetupIterateCabinetW( source, 0, decompress_or_copy_callback, (PVOID)target ); + + if (ret) return ERROR_SUCCESS; + else return GetLastError(); +} + +/*********************************************************************** + * SetupDecompressOrCopyFileA (SETUPAPI.@) + * + * See SetupDecompressOrCopyFileW. + */ +DWORD WINAPI SetupDecompressOrCopyFileA( PCSTR source, PCSTR target, PUINT type ) +{ + DWORD ret = FALSE; + WCHAR *sourceW = NULL, *targetW = NULL; + + if (source && !(sourceW = MultiByteToUnicode( source, CP_ACP ))) return FALSE; + if (target && !(targetW = MultiByteToUnicode( target, CP_ACP ))) + { + MyFree( sourceW ); + return ERROR_NOT_ENOUGH_MEMORY; + } + + ret = SetupDecompressOrCopyFileW( sourceW, targetW, type ); + + MyFree( sourceW ); + MyFree( targetW ); + + return ret; +} + +/*********************************************************************** + * SetupDecompressOrCopyFileW (SETUPAPI.@) + * + * Copy a file and decompress it if needed. + * + * PARAMS + * source [I] File to copy. + * target [I] Filename of the copy. + * type [I] Compression type. + * + * RETURNS + * Success: ERROR_SUCCESS + * Failure: Win32 error code. + */ +DWORD WINAPI SetupDecompressOrCopyFileW( PCWSTR source, PCWSTR target, PUINT type ) +{ + UINT comp; + DWORD ret = ERROR_INVALID_PARAMETER; + + if (!source || !target) return ERROR_INVALID_PARAMETER; + + if (!type) comp = detect_compression_type( source ); + else comp = *type; + + switch (comp) + { + case FILE_COMPRESSION_NONE: + if (CopyFileW( source, target, FALSE )) ret = ERROR_SUCCESS; + else ret = GetLastError(); + break; + case FILE_COMPRESSION_WINLZA: + ret = decompress_file_lz( source, target ); + break; + case FILE_COMPRESSION_NTCAB: + case FILE_COMPRESSION_MSZIP: + ret = decompress_file_cab( source, target ); + break; + default: + WARN("unknown compression type %d\n", comp); + break; + } + + TRACE("%s -> %s %d\n", debugstr_w(source), debugstr_w(target), comp); + return ret; +} 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 (original) +++ trunk/reactos/dll/win32/setupapi/parser.c Fri Jul 27 13:02:18 2007 @@ -944,10 +944,21 @@ if (!RtlIsTextUnicode( buffer, size, NULL )) { - WCHAR *new_buff = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ); - if (new_buff) - { - DWORD len = MultiByteToWideChar( CP_ACP, 0, buffer, size, new_buff, size ); + static const BYTE utf8_bom[3] = { 0xef, 0xbb, 0xbf }; + WCHAR *new_buff; + UINT codepage = CP_ACP; + UINT offset = 0; + + if (size > sizeof(utf8_bom) && !memcmp( buffer, utf8_bom, sizeof(utf8_bom) )) + { + codepage = CP_UTF8; + offset = sizeof(utf8_bom); + } + + if ((new_buff = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ))) + { + DWORD len = MultiByteToWideChar( codepage, 0, (char *)buffer + offset, + size - offset, new_buff, size ); err = parse_buffer( file, new_buff, new_buff + len, error_line ); HeapFree( GetProcessHeap(), 0, new_buff ); } @@ -964,8 +975,6 @@ if (!err) /* now check signature */ { int version_index = find_section( file, Version ); - if (version_index == -1 && (style & INF_STYLE_OLDNT)) - goto done; if (version_index != -1) { struct line *line = find_line( file, version_index, Signature ); @@ -978,7 +987,7 @@ } } if (error_line) *error_line = 0; - err = ERROR_WRONG_INF_STYLE; + if (style & INF_STYLE_WIN4) err = ERROR_WRONG_INF_STYLE; } done: @@ -1215,7 +1224,7 @@ /* Not enough memory */ SetLastError(ERROR_NOT_ENOUGH_MEMORY); SetupCloseInfFile((HINF)file); - return NULL; + return (HINF)INVALID_HANDLE_VALUE; } else if (!PARSER_GetInfClassW((HINF)file, &ClassGuid, ClassName, strlenW(class) + 1, NULL)) { @@ -1223,7 +1232,7 @@ HeapFree(GetProcessHeap(), 0, ClassName); SetLastError(ERROR_CLASS_MISMATCH); SetupCloseInfFile((HINF)file); - return NULL; + return (HINF)INVALID_HANDLE_VALUE; } else if (strcmpW(class, ClassName) != 0) { @@ -1231,7 +1240,7 @@ HeapFree(GetProcessHeap(), 0, ClassName); SetLastError(ERROR_CLASS_MISMATCH); SetupCloseInfFile((HINF)file); - return NULL; + return (HINF)INVALID_HANDLE_VALUE; } HeapFree(GetProcessHeap(), 0, ClassName); } @@ -1312,9 +1321,10 @@ struct inf_file *file = hinf; unsigned int i; - if (file != NULL) - { - for (i = 0; i < file->nb_sections; i++) HeapFree( GetProcessHeap(), 0, file->sections[i] ); + if (file != NULL && file != INVALID_HANDLE_VALUE) + { + for (i = 0; i < file->nb_sections; i++) + HeapFree( GetProcessHeap(), 0, file->sections[i] ); HeapFree( GetProcessHeap(), 0, file->filename ); HeapFree( GetProcessHeap(), 0, file->sections ); HeapFree( GetProcessHeap(), 0, file->fields ); Modified: trunk/reactos/dll/win32/setupapi/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/query.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/query.c (original) +++ trunk/reactos/dll/win32/setupapi/query.c Fri Jul 27 13:02:18 2007 @@ -22,6 +22,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(setupapi); +static const WCHAR source_disks_names[] = + {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s',0}; +static const WCHAR source_disks_files[] = + {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s',0}; + /* fills the PSP_INF_INFORMATION struct fill_info is TRUE * always returns the required size of the information */ @@ -270,3 +275,414 @@ lstrcpyW(ReturnBuffer, ptr); return TRUE; } + +/*********************************************************************** + * SetupGetSourceFileLocationA (SETUPAPI.@) + */ + +BOOL WINAPI SetupGetSourceFileLocationA( HINF hinf, PINFCONTEXT context, PCSTR filename, + PUINT source_id, PSTR buffer, DWORD buffer_size, + PDWORD required_size ) +{ + BOOL ret = FALSE; + WCHAR *filenameW = NULL, *bufferW = NULL; + DWORD required; + INT size; + + TRACE("%p, %p, %s, %p, %p, 0x%08lx, %p\n", hinf, context, debugstr_a(filename), source_id, + buffer, buffer_size, required_size); + + if (filename && *filename && !(filenameW = strdupAtoW( filename ))) + return FALSE; + + if (!SetupGetSourceFileLocationW( hinf, context, filenameW, source_id, NULL, 0, &required )) + goto done; + + if (!(bufferW = HeapAlloc( GetProcessHeap(), 0, required * sizeof(WCHAR) ))) + goto done; + + if (!SetupGetSourceFileLocationW( hinf, context, filenameW, source_id, bufferW, required, NULL )) + goto done; + + size = WideCharToMultiByte( CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL ); + if (required_size) *required_size = size; + + if (buffer) + { + if (buffer_size >= size) + WideCharToMultiByte( CP_ACP, 0, bufferW, -1, buffer, buffer_size, NULL, NULL ); + else + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + goto done; + } + } + ret = TRUE; + + done: + HeapFree( GetProcessHeap(), 0, filenameW ); + HeapFree( GetProcessHeap(), 0, bufferW ); + return ret; +} + +static LPWSTR get_source_id( HINF hinf, PINFCONTEXT context, PCWSTR filename ) +{ + WCHAR Section[MAX_PATH]; + DWORD size; + LPWSTR source_id; + BOOL ret; + + ret = SetupDiGetActualSectionToInstallW(hinf, source_disks_files, Section, MAX_PATH, NULL, NULL); + if (!ret) + return NULL; + + if (!SetupFindFirstLineW( hinf, Section, filename, context ) && + !SetupFindFirstLineW( hinf, source_disks_files, filename, context )) + return NULL; + + if (!SetupGetStringFieldW( context, 1, NULL, 0, &size )) + return NULL; + + if (!(source_id = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR) ))) + return NULL; + + if (!SetupGetStringFieldW( context, 1, source_id, size, NULL )) + { + HeapFree( GetProcessHeap(), 0, source_id ); + return NULL; + } + + ret = SetupDiGetActualSectionToInstallW(hinf, source_disks_names, Section, MAX_PATH, NULL, NULL); + if (!ret) + return NULL; + + if (!SetupFindFirstLineW( hinf, Section, source_id, context ) && + !SetupFindFirstLineW( hinf, source_disks_names, source_id, context )) + { + HeapFree( GetProcessHeap(), 0, source_id ); + return NULL; + } + return source_id; +} + +/*********************************************************************** + * SetupGetSourceFileLocationW (SETUPAPI.@) + */ + +BOOL WINAPI SetupGetSourceFileLocationW( HINF hinf, PINFCONTEXT context, PCWSTR filename, + PUINT source_id, PWSTR buffer, DWORD buffer_size, + PDWORD required_size ) +{ + INFCONTEXT ctx; + WCHAR *end, *source_id_str; + + TRACE("%p, %p, %s, %p, %p, 0x%08lx, %p\n", hinf, context, debugstr_w(filename), source_id, + buffer, buffer_size, required_size); + + if (!context) context = &ctx; + + if (!(source_id_str = get_source_id( hinf, context, filename ))) + return FALSE; + + *source_id = strtolW( source_id_str, &end, 10 ); + if (end == source_id_str || *end) + { + HeapFree( GetProcessHeap(), 0, source_id_str ); + return FALSE; + } + HeapFree( GetProcessHeap(), 0, source_id_str ); + + if (SetupGetStringFieldW( context, 4, buffer, buffer_size, required_size )) + return TRUE; + + if (required_size) *required_size = 1; + if (buffer) + { + if (buffer_size >= 1) buffer[0] = 0; + else + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + } + return TRUE; +} + +/*********************************************************************** + * SetupGetSourceInfoA (SETUPAPI.@) + */ + +BOOL WINAPI SetupGetSourceInfoA( HINF hinf, UINT source_id, UINT info, + PSTR buffer, DWORD buffer_size, LPDWORD required_size ) +{ + BOOL ret = FALSE; + WCHAR *bufferW = NULL; + DWORD required; + INT size; + + TRACE("%p, %d, %d, %p, %lu, %p\n", hinf, source_id, info, buffer, buffer_size, + required_size); + + if (!SetupGetSourceInfoW( hinf, source_id, info, NULL, 0, &required )) + return FALSE; + + if (!(bufferW = HeapAlloc( GetProcessHeap(), 0, required * sizeof(WCHAR) ))) + return FALSE; + + if (!SetupGetSourceInfoW( hinf, source_id, info, bufferW, required, NULL )) + goto done; + + size = WideCharToMultiByte( CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL ); + if (required_size) *required_size = size; + + if (buffer) + { + if (buffer_size >= size) + WideCharToMultiByte( CP_ACP, 0, bufferW, -1, buffer, buffer_size, NULL, NULL ); + else + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + goto done; + } + } + ret = TRUE; + + done: + HeapFree( GetProcessHeap(), 0, bufferW ); + return ret; +} + +/*********************************************************************** + * SetupGetSourceInfoW (SETUPAPI.@) + */ + +BOOL WINAPI SetupGetSourceInfoW( HINF hinf, UINT source_id, UINT info, + PWSTR buffer, DWORD buffer_size, LPDWORD required_size ) +{ + WCHAR Section[MAX_PATH]; + INFCONTEXT ctx; + WCHAR source_id_str[11]; + static const WCHAR fmt[] = {'%','d',0}; + DWORD index; + BOOL ret; + + TRACE("%p, %d, %d, %p, %lu, %p\n", hinf, source_id, info, buffer, buffer_size, + required_size); + + sprintfW( source_id_str, fmt, source_id ); + + ret = SetupDiGetActualSectionToInstallW(hinf, source_disks_names, Section, MAX_PATH, NULL, NULL); + if (!ret) + return FALSE; + + if (!SetupFindFirstLineW( hinf, Section, source_id_str, &ctx ) && + !SetupFindFirstLineW( hinf, source_disks_names, source_id_str, &ctx )) + return FALSE; + + switch (info) + { + case SRCINFO_PATH: index = 4; break; + case SRCINFO_TAGFILE: index = 2; break; + case SRCINFO_DESCRIPTION: index = 1; break; + default: + WARN("unknown info level: %d\n", info); + return FALSE; + } + + if (SetupGetStringFieldW( &ctx, index, buffer, buffer_size, required_size )) + return TRUE; + + if (required_size) *required_size = 1; + if (buffer) + { + if (buffer_size >= 1) buffer[0] = 0; + else + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + } + return TRUE; +} + +/*********************************************************************** + * SetupGetTargetPathA (SETUPAPI.@) + */ + +BOOL WINAPI SetupGetTargetPathA( HINF hinf, PINFCONTEXT context, PCSTR section, PSTR buffer, + DWORD buffer_size, PDWORD required_size ) +{ + BOOL ret = FALSE; + WCHAR *sectionW = NULL, *bufferW = NULL; + DWORD required; + INT size; + + TRACE("%p, %p, %s, %p, 0x%08lx, %p\n", hinf, context, debugstr_a(section), buffer, + buffer_size, required_size); + + if (section && !(sectionW = strdupAtoW( section ))) + return FALSE; + + if (!SetupGetTargetPathW( hinf, context, sectionW, NULL, 0, &required )) + goto done; + + if (!(bufferW = HeapAlloc( GetProcessHeap(), 0, required * sizeof(WCHAR) ))) + goto done; + + if (!SetupGetTargetPathW( hinf, context, sectionW, bufferW, required, NULL )) + goto done; + + size = WideCharToMultiByte( CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL ); + if (required_size) *required_size = size; + + if (buffer) + { + if (buffer_size >= size) + WideCharToMultiByte( CP_ACP, 0, bufferW, -1, buffer, buffer_size, NULL, NULL ); + else + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + goto done; + } + } + ret = TRUE; + + done: + HeapFree( GetProcessHeap(), 0, sectionW ); + HeapFree( GetProcessHeap(), 0, bufferW ); + return ret; +} + +/*********************************************************************** + * SetupGetTargetPathW (SETUPAPI.@) + */ + +BOOL WINAPI SetupGetTargetPathW( HINF hinf, PINFCONTEXT context, PCWSTR section, PWSTR buffer, + DWORD buffer_size, PDWORD required_size ) +{ + static const WCHAR destination_dirs[] = + {'D','e','s','t','i','n','a','t','i','o','n','D','i','r','s',0}; + static const WCHAR default_dest_dir[] = + {'D','e','f','a','u','l','t','D','e','s','t','D','i','r',0}; + + INFCONTEXT ctx; + WCHAR *dir; + INT size; + + TRACE("%p, %p, %s, %p, 0x%08lx, %p\n", hinf, context, debugstr_w(section), buffer, + buffer_size, required_size); + + if (context && !SetupFindFirstLineW( hinf, destination_dirs, NULL, context )) return FALSE; + else if (section && !SetupFindFirstLineW( hinf, section, NULL, &ctx )) return FALSE; + else if (!SetupFindFirstLineW( hinf, destination_dirs, default_dest_dir, &ctx )) return FALSE; + + if (!(dir = PARSER_get_dest_dir( context ? context : &ctx ))) return FALSE; + + size = lstrlenW( dir ) + 1; + if (required_size) *required_size = size; + + if (buffer) + { + if (buffer_size >= size) + lstrcpyW( buffer, dir ); + else + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + HeapFree( GetProcessHeap(), 0, dir ); + return FALSE; + } + } + HeapFree( GetProcessHeap(), 0, dir ); + return TRUE; +} + +/*********************************************************************** + * SetupQueryInfOriginalFileInformationA (SETUPAPI.@) + */ +BOOL WINAPI SetupQueryInfOriginalFileInformationA( + PSP_INF_INFORMATION InfInformation, UINT InfIndex, + PSP_ALTPLATFORM_INFO AlternativePlatformInfo, + PSP_ORIGINAL_FILE_INFO_A OriginalFileInfo) +{ + BOOL ret; + SP_ORIGINAL_FILE_INFO_W OriginalFileInfoW; + + TRACE("(%p, %d, %p, %p)\n", InfInformation, InfIndex, + AlternativePlatformInfo, OriginalFileInfo); + + if (OriginalFileInfo->cbSize != sizeof(*OriginalFileInfo)) + { + ERR("incorrect OriginalFileInfo->cbSize of %lu\n", OriginalFileInfo->cbSize); + SetLastError( ERROR_INVALID_USER_BUFFER ); + return FALSE; + } + + OriginalFileInfoW.cbSize = sizeof(OriginalFileInfoW); + ret = SetupQueryInfOriginalFileInformationW(InfInformation, InfIndex, + AlternativePlatformInfo, &OriginalFileInfoW); + if (ret) + { + WideCharToMultiByte(CP_ACP, 0, OriginalFileInfoW.OriginalInfName, MAX_PATH, + OriginalFileInfo->OriginalInfName, MAX_PATH, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, OriginalFileInfoW.OriginalCatalogName, MAX_PATH, + OriginalFileInfo->OriginalCatalogName, MAX_PATH, NULL, NULL); + } + + return ret; +} + +/*********************************************************************** + * SetupQueryInfOriginalFileInformationW (SETUPAPI.@) + */ +BOOL WINAPI SetupQueryInfOriginalFileInformationW( + PSP_INF_INFORMATION InfInformation, UINT InfIndex, + PSP_ALTPLATFORM_INFO AlternativePlatformInfo, + PSP_ORIGINAL_FILE_INFO_W OriginalFileInfo) +{ + LPCWSTR inf_name; + LPCWSTR inf_path; + HINF hinf; + static const WCHAR wszVersion[] = { 'V','e','r','s','i','o','n',0 }; + static const WCHAR wszCatalogFile[] = { 'C','a','t','a','l','o','g','F','i','l','e',0 }; + + //SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + //return FALSE; + + FIXME("(%p, %d, %p, %p): semi-stub\n", InfInformation, InfIndex, + AlternativePlatformInfo, OriginalFileInfo); + + if (OriginalFileInfo->cbSize != sizeof(*OriginalFileInfo)) + { + ERR("incorrect OriginalFileInfo->cbSize of %lu\n", OriginalFileInfo->cbSize); + return ERROR_INVALID_USER_BUFFER; + } + + inf_path = (LPWSTR)&InfInformation->VersionData[0]; + + /* FIXME: we should get OriginalCatalogName from CatalogFile line in + * the original inf file and cache it, but that would require building a + * .pnf file. */ + hinf = SetupOpenInfFileW(inf_path, NULL, INF_STYLE_WIN4, NULL); + if (hinf == INVALID_HANDLE_VALUE) return FALSE; + + if (!SetupGetLineTextW(NULL, hinf, wszVersion, wszCatalogFile, + OriginalFileInfo->OriginalCatalogName, + sizeof(OriginalFileInfo->OriginalCatalogName)/sizeof(OriginalFileInfo->OriginalCatalogName[0]), + NULL)) + { + OriginalFileInfo->OriginalCatalogName[0] = '\0'; + } + SetupCloseInfFile(hinf); + + /* FIXME: not quite correct as we just return the same file name as + * destination (copied) inf file, not the source (original) inf file. + * to fix it properly would require building a .pnf file */ + /* file name is stored in VersionData field of InfInformation */ + inf_name = strrchrW(inf_path, '\\'); + if (inf_name) inf_name++; + else inf_name = inf_path; + + strcpyW(OriginalFileInfo->OriginalInfName, inf_name); + + return TRUE; +} Modified: trunk/reactos/dll/win32/setupapi/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/queue.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/queue.c (original) +++ trunk/reactos/dll/win32/setupapi/queue.c Fri Jul 27 13:02:18 2007 @@ -70,19 +70,6 @@ { int len = (strlenW(str) + 1) * sizeof(WCHAR); if ((ret = HeapAlloc( GetProcessHeap(), 0, len ))) memcpy( ret, str, len ); - } - return ret; -} - - -inline static WCHAR *strdupAtoW( const char *str ) -{ - WCHAR *ret = NULL; - if (str) - { - DWORD len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); - if ((ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) - MultiByteToWideChar( CP_ACP, 0, str, -1, ret, len ); } return ret; } Modified: trunk/reactos/dll/win32/setupapi/setupapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.rbuild (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.rbuild Fri Jul 27 13:02:18 2007 @@ -1,4 +1,4 @@ -<module name="setupapi" type="win32dll" baseaddress="${BASEADDRESS_SETUPAPI}" installbase="system32" installname="setupapi.dll"> +<module name="setupapi" type="win32dll" baseaddress="${BASEADDRESS_SETUPAPI}" installbase="system32" installname="setupapi.dll" allowwarnings="true"> <importlibrary definition="setupapi.spec.def" /> <include base="setupapi">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec Fri Jul 27 13:02:18 2007 @@ -210,7 +210,7 @@ @ stdcall GetSetFileTimestamp(wstr ptr ptr ptr long) @ stdcall GetVersionInfoFromImage(wstr ptr ptr) @ stub InfIsFromOemLocation -@ stub InstallCatalog +@ stdcall InstallCatalog(str str ptr) @ stdcall InstallHinfSection(long long str long) InstallHinfSectionA @ stdcall InstallHinfSectionA(long long str long) @ stdcall InstallHinfSectionW(long long wstr long) @@ -230,7 +230,8 @@ @ stub QueryMultiSzValueToArray @ stdcall QueryRegistryValue(long wstr ptr ptr ptr) @ stub ReadAsciiOrUnicodeTextFile -@ stub RegistryDelnode +@ stdcall RegistryDelnode(long long) +# Yes, Microsoft really misspelled this one! @ stdcall RetreiveFileSecurity(wstr ptr) @ stub RetrieveServiceConfig @ stub SearchForInfFile @@ -257,8 +258,8 @@ @ stdcall SetupCopyOEMInfW(wstr wstr long long ptr long ptr ptr) @ stdcall SetupCreateDiskSpaceListA(ptr long long) @ stdcall SetupCreateDiskSpaceListW(ptr long long) -@ stub SetupDecompressOrCopyFileA -@ stub SetupDecompressOrCopyFileW +@ stdcall SetupDecompressOrCopyFileA(str str ptr) +@ stdcall SetupDecompressOrCopyFileW(wstr wstr ptr) @ stub SetupDefaultQueueCallback @ stdcall SetupDefaultQueueCallbackA(ptr long long long) @ stdcall SetupDefaultQueueCallbackW(ptr long long long) @@ -399,8 +400,10 @@ @ stub SetupGetBackupInformationW @ stdcall SetupGetBinaryField(ptr long ptr long ptr) @ stdcall SetupGetFieldCount(ptr) -@ stub SetupGetFileCompressionInfoA -@ stub SetupGetFileCompressionInfoW +@ stdcall SetupGetFileCompressionInfoA(str ptr ptr ptr ptr) +@ stdcall SetupGetFileCompressionInfoExA(str ptr long ptr ptr ptr ptr) +@ stdcall SetupGetFileCompressionInfoExW(wstr ptr long ptr ptr ptr ptr) +@ stdcall SetupGetFileCompressionInfoW(wstr ptr ptr ptr ptr) @ stdcall SetupGetFileQueueCount(long long ptr) @ stdcall SetupGetFileQueueFlags(long ptr) @ stdcall SetupGetInfFileListA(str long str long ptr) @@ -417,16 +420,16 @@ @ stdcall SetupGetLineTextW(ptr long wstr wstr ptr long ptr) @ stdcall SetupGetMultiSzFieldA(ptr long ptr long ptr) @ stdcall SetupGetMultiSzFieldW(ptr long ptr long ptr) -@ stub SetupGetSourceFileLocationA -@ stub SetupGetSourceFileLocationW +@ stdcall SetupGetSourceFileLocationA(ptr ptr str ptr ptr long ptr) +@ stdcall SetupGetSourceFileLocationW(ptr ptr wstr ptr ptr long ptr) @ stub SetupGetSourceFileSizeA @ stub SetupGetSourceFileSizeW -@ stub SetupGetSourceInfoA -@ stub SetupGetSourceInfoW +@ stdcall SetupGetSourceInfoA(ptr long long ptr long ptr) +@ stdcall SetupGetSourceInfoW(ptr long long ptr long ptr) @ stdcall SetupGetStringFieldA(ptr long ptr long ptr) @ stdcall SetupGetStringFieldW(ptr long ptr long ptr) -@ stub SetupGetTargetPathA -@ stub SetupGetTargetPathW +@ stdcall SetupGetTargetPathA(ptr ptr str ptr long ptr) +@ stdcall SetupGetTargetPathW(ptr ptr wstr ptr long ptr) @ stdcall SetupInitDefaultQueueCallback(long) @ stdcall SetupInitDefaultQueueCallbackEx(long long long long ptr) @ stdcall SetupInitializeFileLogA(str long) @@ -465,8 +468,8 @@ @ stub SetupQueryFileLogW @ stdcall SetupQueryInfFileInformationA(ptr long str long ptr) @ stdcall SetupQueryInfFileInformationW(ptr long wstr long ptr) -@ stub SetupQueryInfOriginalFileInformationA -@ stub SetupQueryInfOriginalFileInformationW +@ stdcall SetupQueryInfOriginalFileInformationA(ptr long ptr ptr) +@ stdcall SetupQueryInfOriginalFileInformationW(ptr long ptr ptr) @ stub SetupQueryInfVersionInformationA @ stub SetupQueryInfVersionInformationW @ stub SetupQuerySourceListA @@ -513,8 +516,8 @@ @ stdcall SetupSetFileQueueFlags(long long long) @ stub SetupSetPlatformPathOverrideA @ stub SetupSetPlatformPathOverrideW -@ stub SetupSetSourceListA -@ stub SetupSetSourceListW +@ stdcall SetupSetSourceListA(long ptr long) +@ stdcall SetupSetSourceListW(long ptr long) @ stdcall SetupTermDefaultQueueCallback(ptr) @ stdcall SetupTerminateFileLog(long) @ stub ShouldDeviceBeExcluded Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h Fri Jul 27 13:02:18 2007 @@ -221,6 +221,18 @@ #define REGPART_RENAME "\\Rename" #define REG_VERSIONCONFLICT "Software\\Microsoft\\VersionConflictManager" +inline static WCHAR *strdupAtoW( const char *str ) +{ + WCHAR *ret = NULL; + if (str) + { + DWORD len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); + if ((ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + MultiByteToWideChar( CP_ACP, 0, str, -1, ret, len ); + } + return ret; +} + /* string substitutions */ struct inf_file; Modified: trunk/reactos/dll/win32/setupapi/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/stubs.c (original) +++ trunk/reactos/dll/win32/setupapi/stubs.c Fri Jul 27 13:02:18 2007 @@ -118,6 +118,23 @@ return -1; } +/*********************************************************************** + * SetupSetSourceListA (SETUPAPI.@) + */ +BOOL WINAPI SetupSetSourceListA(DWORD flags, PCSTR *list, UINT count) +{ + FIXME("0x%08lx %p %d\n", flags, list, count); + return FALSE; +} + +/*********************************************************************** + * SetupSetSourceListW (SETUPAPI.@) + */ +BOOL WINAPI SetupSetSourceListW(DWORD flags, PCWSTR *list, UINT count) +{ + FIXME("0x%08lx %p %d\n", flags, list, count); + return FALSE; +} /*********************************************************************** * SetupTerminateFileLog(SETUPAPI.@) @@ -128,6 +145,14 @@ return TRUE; } +/*********************************************************************** + * RegistryDelnode(SETUPAPI.@) + */ +BOOL WINAPI RegistryDelnode(DWORD x, DWORD y) +{ + FIXME("%08lx %08lx: stub\n", x, y); + return FALSE; +} /*********************************************************************** * SetupCloseLog(SETUPAPI.@) Modified: trunk/reactos/include/psdk/setupapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/setupapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/setupapi.h (original) +++ trunk/reactos/include/psdk/setupapi.h Fri Jul 27 13:02:18 2007 @@ -1312,6 +1312,8 @@ WINSETUPAPI DWORD WINAPI SetupGetFieldCount(PINFCONTEXT); WINSETUPAPI DWORD WINAPI SetupGetFileCompressionInfoA(PCSTR,PSTR*,PDWORD,PDWORD,PUINT); WINSETUPAPI DWORD WINAPI SetupGetFileCompressionInfoW(PCWSTR,PWSTR*,PDWORD,PDWORD,PUINT); +WINSETUPAPI BOOL WINAPI SetupGetFileCompressionInfoExA(PCSTR,PSTR,DWORD,PDWORD,PDWORD,PDWORD,PUINT); +WINSETUPAPI BOOL WINAPI SetupGetFileCompressionInfoExW(PCWSTR,PWSTR,DWORD,PDWORD,PDWORD,PDWORD,PUINT); WINSETUPAPI BOOL WINAPI SetupGetInfFileListA(PCSTR,DWORD,PSTR,DWORD,PDWORD); WINSETUPAPI BOOL WINAPI SetupGetInfFileListW(PCWSTR,DWORD,PWSTR,DWORD,PDWORD); WINSETUPAPI BOOL WINAPI SetupGetInfInformationA(LPCVOID,DWORD,PSP_INF_INFORMATION,DWORD,PDWORD); @@ -1524,6 +1526,7 @@ #define SetupFreeSourceList SetupFreeSourceListW #define SetupGetBackupInformation SetupGetBackupInformationW #define SetupGetFileCompressionInfo SetupGetFileCompressionInfoW +#define SetupGetFileCompressionInfoEx SetupGetFileCompressionInfoExW #define SetupGetInfFileList SetupGetInfFileListW #define SetupGetInfInformation SetupGetInfInformationW #define SetupGetLineByIndex SetupGetLineByIndexW @@ -1645,6 +1648,7 @@ #define SetupFreeSourceList SetupFreeSourceListA #define SetupGetBackupInformation SetupGetBackupInformationA #define SetupGetFileCompressionInfo SetupGetFileCompressionInfoA +#define SetupGetFileCompressionInfoEx SetupGetFileCompressionInfoExA #define SetupGetInfFileList SetupGetInfFileListA #define SetupGetInfInformation SetupGetInfInformationA #define SetupGetLineByIndex SetupGetLineByIndexA

17 years, 5 months

[hpoussin] 27895: Revert r27863, and add the correct fix

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Jul 27 11:23:34 2007 New Revision: 27895 URL: http://svn.reactos.org/svn/reactos?rev=27895&view=rev Log: Revert r27863, and add the correct fix Modified: trunk/reactos/base/applications/winhelp/lex.yy.c trunk/reactos/base/applications/winhelp/winhelp.h trunk/reactos/include/reactos/wine/debug.h Modified: trunk/reactos/base/applications/winhelp/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lex.yy.c (original) +++ trunk/reactos/base/applications/winhelp/lex.yy.c Fri Jul 27 11:23:34 2007 @@ -9,7 +9,7 @@ #define YY_FLEX_MINOR_VERSION 5 #include <stdio.h> -#define WINE_WARN DPRINT + /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ #ifdef c_plusplus Modified: trunk/reactos/base/applications/winhelp/winhelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/winhelp.h (original) +++ trunk/reactos/base/applications/winhelp/winhelp.h Fri Jul 27 11:23:34 2007 @@ -32,8 +32,6 @@ #define SHADOW_DY 10 #define BUTTON_CX 6 #define BUTTON_CY 6 - -#define WINE_WARN DPRINT #ifndef RC_INVOKED Modified: trunk/reactos/include/reactos/wine/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/debug… ============================================================================== --- trunk/reactos/include/reactos/wine/debug.h (original) +++ trunk/reactos/include/reactos/wine/debug.h Fri Jul 27 11:23:34 2007 @@ -101,6 +101,14 @@ #define WARN_ON(ch) 1 #endif +#define WINE_WARN DPRINT +#define WINE_WARN_(ch) DPRINT +#ifdef NDEBUG +#define WINE_WARN_ON(ch) 0 +#else +#define WINE_WARN_ON(ch) 1 +#endif + #ifdef FIXME #undef FIXME #endif

17 years, 5 months

[dreimer] 27894: - Commit the modified Norwegian RC Files to the autosynched Wine DLLs, too. My Plan is to edit the diffs myself and let a dev look over my modifications before I commit them then. This speeds up the stuff a bit. We could need a new sync now that 0.3.7 is almost out, but we cant...

by dreimer＠svn.reactos.org

Author: dreimer Date: Fri Jul 27 11:11:35 2007 New Revision: 27894 URL: http://svn.reactos.org/svn/reactos?rev=27894&view=rev Log: - Commit the modified Norwegian RC Files to the autosynched Wine DLLs, too. My Plan is to edit the diffs myself and let a dev look over my modifications before I commit them then. This speeds up the stuff a bit. We could need a new sync now that 0.3.7 is almost out, but we cant... Modified: trunk/reactos/dll/win32/comctl32/comctl_No.rc trunk/reactos/dll/win32/crypt32/crypt32_No.rc trunk/reactos/dll/win32/mpr/mpr_No.rc trunk/reactos/dll/win32/msi/msi_No.rc trunk/reactos/dll/win32/oledlg/oledlg_No.rc trunk/reactos/dll/win32/wldap32/wldap32_No.rc Modified: trunk/reactos/dll/win32/comctl32/comctl_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_No.rc (original) +++ trunk/reactos/dll/win32/comctl32/comctl_No.rc Fri Jul 27 11:11:35 2007 @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE Modified: trunk/reactos/dll/win32/crypt32/crypt32_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32_No.rc (original) +++ trunk/reactos/dll/win32/crypt32/crypt32_No.rc Fri Jul 27 11:11:35 2007 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { Modified: trunk/reactos/dll/win32/mpr/mpr_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_No.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_No.rc (original) +++ trunk/reactos/dll/win32/mpr/mpr_No.rc Fri Jul 27 11:11:35 2007 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { Modified: trunk/reactos/dll/win32/msi/msi_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_No.rc?re… ============================================================================== --- trunk/reactos/dll/win32/msi/msi_No.rc (original) +++ trunk/reactos/dll/win32/msi/msi_No.rc Fri Jul 27 11:11:35 2007 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { Modified: trunk/reactos/dll/win32/oledlg/oledlg_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/oledlg_No… ============================================================================== --- trunk/reactos/dll/win32/oledlg/oledlg_No.rc (original) +++ trunk/reactos/dll/win32/oledlg/oledlg_No.rc Fri Jul 27 11:11:35 2007 @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU Modified: trunk/reactos/dll/win32/wldap32/wldap32_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32_No.rc (original) +++ trunk/reactos/dll/win32/wldap32/wldap32_No.rc Fri Jul 27 11:11:35 2007 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE {

17 years, 5 months

[sedwards] 27893: - Added the "(at your option) any later version" clause to the NDK license with permission of the author. - Clarify the license requirements by breaking it to its own section and in this case requiring the NDK to still be released as LGPLv2.1 or GPLv2 even if it is released with a GPLv3 application. - Minor spelling error fix

by sedwards＠svn.reactos.org

Author: sedwards Date: Fri Jul 27 07:19:23 2007 New Revision: 27893 URL: http://svn.reactos.org/svn/reactos?rev=27893&view=rev Log: - Added the "(at your option) any later version" clause to the NDK license with permission of the author. - Clarify the license requirements by breaking it to its own section and in this case requiring the NDK to still be released as LGPLv2.1 or GPLv2 even if it is released with a GPLv3 application. - Minor spelling error fix Modified: trunk/reactos/include/ndk/readme.txt Modified: trunk/reactos/include/ndk/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/readme.txt?rev… ============================================================================== --- trunk/reactos/include/ndk/readme.txt (original) +++ trunk/reactos/include/ndk/readme.txt Fri Jul 27 07:19:23 2007 @@ -2,7 +2,7 @@ NDK 1.00 ----------------------------- -0. PREABMLE +0. PREAMBLE 0.1 COPYRIGHT @@ -20,7 +20,7 @@ 1.1 OPEN SOURCE USAGE -Open Source Projects may choose to use one of either the two following licenses: +Open Source Projects may choose to use the following licenses: GNU GENERAL PUBLIC LICENSE Version 2, June 1991 @@ -28,23 +28,35 @@ GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999 + OR + +EITHER of the aforementioned licenses AND (at your option) +any later version of the above said licenses + +1.2 LICENSE LIMITATIONS + The choice is yours to make based on the license which is most compatible with your software. You MUST read GPL.TXT or LGPL.TXT after your decision. Violating your chosen license voids your usage rights of the NDK and will lead to legal action on the part of the -author. +author. Using this software with any later version of the GNU GPL or LGPL in no way +changes your obligations under the versions listed above. You MUST still release the +NDK and its changes under the terms of the original licenses (either GPLv2 or LGPLv2.1) +as listed above. This DOES NOT AFFECT the license of a software package released under +a later version and ONLY serves to clarify that using the NDK with a later version is +permitted provided the aforementioned terms are met. If your Open Source product does not use a license which is compatible with the ones listed above, please contact the author to reach a mutual agreement to find a better solution for your product. Alternatively, you may choose to use the Proprietary Usage -license displayed below in section 1.2 +license displayed below in section 1.3 If you are unsure of whether or not your product qualifies as an Open Source product, please contact the Free Software Foundation, or visit their website at www.fsf.org. -1.2 PROPRIETARY USAGE +1.3 PROPRIETARY USAGE Because it may be undesirable or impossible to adapt this software to your commercial and/or proprietary product(s) and/or service(s) using a (L)GPL license, proprietary

17 years, 5 months

[tkreuzer] 27892: Rename NtGdiGettextFace into NtGdiGetTextFaceW and add bAliasName parameter. Change parameter names in GetTextFaceW. Update ntgdibad.h

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Jul 27 03:02:47 2007 New Revision: 27892 URL: http://svn.reactos.org/svn/reactos?rev=27892&view=rev Log: Rename NtGdiGettextFace into NtGdiGetTextFaceW and add bAliasName parameter. Change parameter names in GetTextFaceW. Update ntgdibad.h Modified: trunk/reactos/dll/win32/gdi32/objects/text.c trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/objects/text.c trunk/reactos/tools/nci/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c Fri Jul 27 03:02:47 2007 @@ -308,12 +308,12 @@ int STDCALL GetTextFaceW( - HDC a0, - int a1, - LPWSTR a2 - ) -{ - return NtGdiGetTextFace(a0, a1, a2); + HDC hDC, + int nCount, + LPWSTR lpFaceName + ) +{ + return NtGdiGetTextFaceW(hDC, nCount, lpFaceName, FALSE); } Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Fri Jul 27 03:02:47 2007 @@ -605,13 +605,6 @@ /* Needs to be done in user-mode, using shared GDI Object Attributes. */ COLORREF STDCALL NtGdiGetTextColor(HDC hDC); -/* Rename to NtGdiGetTextFaceW, add FALSE at the end. */ -int -STDCALL -NtGdiGetTextFace(HDC hDC, - int Count, - LPWSTR FaceName); - /* Use NtGdiGetTextMetricsW with 0 at the end */ BOOL STDCALL Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Fri Jul 27 03:02:47 2007 @@ -3648,13 +3648,22 @@ return TRUE; } -INT STDCALL -NtGdiGetTextFace(HDC hDC, INT Count, LPWSTR FaceName) +W32KAPI +INT +APIENTRY +NtGdiGetTextFaceW( + IN HDC hDC, + IN INT Count, + OUT OPTIONAL LPWSTR FaceName, + IN BOOL bAliasName +) { PDC Dc; HFONT hFont; PTEXTOBJ TextObj; NTSTATUS Status; + + /* FIXME: Handle bAliasName */ Dc = DC_LockDc(hDC); if (Dc == NULL) Modified: trunk/reactos/tools/nci/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/w32ksvc.db?rev=2… ============================================================================== --- trunk/reactos/tools/nci/w32ksvc.db (original) +++ trunk/reactos/tools/nci/w32ksvc.db Fri Jul 27 03:02:47 2007 @@ -152,7 +152,7 @@ NtGdiGetTextExtentExW 8 NtGdiGetTextExtent 5 NtGdiGetTextExtentPoint32 4 -NtGdiGetTextFace 3 +NtGdiGetTextFaceW 4 NtGdiGetTextMetrics 2 NtGdiGetViewportExtEx 2 NtGdiGetViewportOrgEx 2

17 years, 5 months

[tkreuzer] 27891: update ntgdibad.h

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Jul 27 02:37:20 2007 New Revision: 27891 URL: http://svn.reactos.org/svn/reactos?rev=27891&view=rev Log: update ntgdibad.h Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Fri Jul 27 02:37:20 2007 @@ -605,17 +605,6 @@ /* Needs to be done in user-mode, using shared GDI Object Attributes. */ COLORREF STDCALL NtGdiGetTextColor(HDC hDC); -/* Rename to NtGdiGetTextExtentExW. Add 0 at the end. */ -BOOL -STDCALL -NtGdiGetTextExtentExPoint(HDC hDC, - LPCWSTR String, - int Count, - int MaxExtent, - LPINT Fit, - LPINT Dx, - LPSIZE Size); - /* Rename to NtGdiGetTextFaceW, add FALSE at the end. */ int STDCALL

17 years, 5 months

[tkreuzer] 27890: - rename NtGdiGetTextExentExPoint to NtGdiGetTextExtentExW and add 8th parameter (currently unhandled)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Jul 27 02:37:08 2007 New Revision: 27890 URL: http://svn.reactos.org/svn/reactos?rev=27890&view=rev Log: - rename NtGdiGetTextExentExPoint to NtGdiGetTextExtentExW and add 8th parameter (currently unhandled) Modified: trunk/reactos/dll/win32/gdi32/objects/text.c trunk/reactos/subsystems/win32/win32k/objects/text.c trunk/reactos/tools/nci/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c Fri Jul 27 02:37:08 2007 @@ -169,8 +169,8 @@ LPSIZE lpSize ) { - return NtGdiGetTextExtentExPoint ( - hdc, lpszStr, cchString, nMaxExtent, lpnFit, alpDx, lpSize ); + return NtGdiGetTextExtentExW ( + hdc, (LPWSTR)lpszStr, cchString, nMaxExtent, (PULONG)lpnFit, (PULONG)alpDx, lpSize, 0 ); } @@ -198,8 +198,8 @@ SetLastError (RtlNtStatusToDosError(Status)); else { - rc = NtGdiGetTextExtentExPoint ( - hdc, lpszStrW, cchString, nMaxExtent, lpnFit, alpDx, lpSize ); + rc = NtGdiGetTextExtentExW ( + hdc, lpszStrW, cchString, nMaxExtent, (PULONG)lpnFit, (PULONG)alpDx, lpSize, 0 ); HEAP_free ( lpszStrW ); } Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Fri Jul 27 02:37:08 2007 @@ -3405,15 +3405,19 @@ return TRUE; } +W32KAPI BOOL -STDCALL -NtGdiGetTextExtentExPoint(HDC hDC, - LPCWSTR UnsafeString, - int Count, - int MaxExtent, - LPINT UnsafeFit, - LPINT UnsafeDx, - LPSIZE UnsafeSize) +APIENTRY +NtGdiGetTextExtentExW( + IN HDC hDC, + IN OPTIONAL LPWSTR UnsafeString, + IN ULONG Count, + IN ULONG MaxExtent, + OUT OPTIONAL PULONG UnsafeFit, + OUT OPTIONAL PULONG UnsafeDx, + OUT LPSIZE UnsafeSize, + IN FLONG fl +) { PDC dc; LPWSTR String; @@ -3423,6 +3427,8 @@ INT Fit; LPINT Dx; PTEXTOBJ TextObj; + + /* FIXME: Handle fl */ if (Count < 0) { @@ -3558,7 +3564,7 @@ LPSIZE psize, UINT flOpts) { - return NtGdiGetTextExtentExPoint(hdc, lpwsz, cwc, 0, NULL, NULL, psize); + return NtGdiGetTextExtentExW(hdc, lpwsz, cwc, 0, NULL, NULL, psize, 0); } BOOL Modified: trunk/reactos/tools/nci/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/w32ksvc.db?rev=2… ============================================================================== --- trunk/reactos/tools/nci/w32ksvc.db (original) +++ trunk/reactos/tools/nci/w32ksvc.db Fri Jul 27 02:37:08 2007 @@ -149,7 +149,7 @@ NtGdiGetTextAlign 1 NtGdiGetTextCharsetInfo 3 NtGdiGetTextColor 1 -NtGdiGetTextExtentExPoint 7 +NtGdiGetTextExtentExW 8 NtGdiGetTextExtent 5 NtGdiGetTextExtentPoint32 4 NtGdiGetTextFace 3

17 years, 5 months

← Newer
1
...
14
15
16
17
18
19
20
...
71
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 July 2007