Ros-diffs March 2015

ros-diffs@reactos.org

18 participants
496 discussions

[hbelusca] 66943: [CAT]: io.h appears to be useless, and seems to not be part of all C setups.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 29 00:16:53 2015 New Revision: 66943 URL: http://svn.reactos.org/svn/reactos?rev=66943&view=rev Log: [CAT]: io.h appears to be useless, and seems to not be part of all C setups. Modified: trunk/reactos/tools/cat.c Modified: trunk/reactos/tools/cat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cat.c?rev=66943&r1=6… ============================================================================== --- trunk/reactos/tools/cat.c [iso-8859-1] (original) +++ trunk/reactos/tools/cat.c [iso-8859-1] Sun Mar 29 00:16:53 2015 @@ -8,7 +8,6 @@ * Hermès Bélusca - Maïto */ -#include <io.h> #include <fcntl.h> #include <stdio.h>

9 years, 9 months

[hbelusca] 66942: [ROSAPPS][HOST-TOOLS]: - Take the best of the two CAT rosapps and turn them into a host-tool. Will be used later on in the build process. - Few comment cleaning in bin2c tool.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 29 00:13:25 2015 New Revision: 66942 URL: http://svn.reactos.org/svn/reactos?rev=66942&view=rev Log: [ROSAPPS][HOST-TOOLS]: - Take the best of the two CAT rosapps and turn them into a host-tool. Will be used later on in the build process. - Few comment cleaning in bin2c tool. Added: trunk/reactos/tools/cat.c - copied, changed from r66923, trunk/rosapps/applications/sysutils/utils/cat/cat.c Removed: trunk/rosapps/applications/sysutils/tcat/ trunk/rosapps/applications/sysutils/utils/cat/ Modified: trunk/reactos/CMakeLists.txt trunk/reactos/tools/CMakeLists.txt trunk/reactos/tools/bin2c.c trunk/rosapps/applications/sysutils/CMakeLists.txt trunk/rosapps/applications/sysutils/utils/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=66942&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Sun Mar 29 00:13:25 2015 @@ -85,9 +85,9 @@ add_subdirectory(lib) if(NOT MSVC) - export(TARGETS bin2c widl gendib cabman cdmake mkhive obj2bin spec2def geninc rsym mkshelllink utf16le FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) - else() - export(TARGETS bin2c widl gendib cabman cdmake mkhive obj2bin spec2def geninc mkshelllink utf16le FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) + export(TARGETS bin2c cat widl gendib cabman cdmake mkhive obj2bin spec2def geninc rsym mkshelllink utf16le FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) + else() + export(TARGETS bin2c cat widl gendib cabman cdmake mkhive obj2bin spec2def geninc mkshelllink utf16le FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) endif() else() Modified: trunk/reactos/tools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/CMakeLists.txt?rev=6… ============================================================================== --- trunk/reactos/tools/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/CMakeLists.txt [iso-8859-1] Sun Mar 29 00:13:25 2015 @@ -6,6 +6,7 @@ endif() add_executable(bin2c bin2c.c) +add_executable(cat cat.c) add_executable(gendib gendib/gendib.c) add_executable(geninc geninc/geninc.c) add_executable(mkshelllink mkshelllink/mkshelllink.c) Modified: trunk/reactos/tools/bin2c.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/bin2c.c?rev=66942&r1… ============================================================================== --- trunk/reactos/tools/bin2c.c [iso-8859-1] (original) +++ trunk/reactos/tools/bin2c.c [iso-8859-1] Sun Mar 29 00:13:25 2015 @@ -16,18 +16,14 @@ unsigned char ch; unsigned char cnt; - /* - * Validate the arguments. - */ + /* Validate the arguments */ if (argc < 5) { printf("Usage: bin2c infile.bin outfile.c outfile.h array_name [array_attribute [header_for_attribute]]\n"); return -1; } - /* - * Open the input and the output files. - */ + /* Open the input and output files */ inFile = fopen(argv[1], "rb"); if (!inFile) { @@ -50,9 +46,7 @@ return -1; } - /* - * Generate the header file and close it. - */ + /* Generate the header file and close it */ fprintf(outHFile, "/* This file is autogenerated, do not edit. */\n\n"); fprintf(outHFile, "#ifndef CHAR\n" "#define CHAR char\n" @@ -60,21 +54,19 @@ fprintf(outHFile, "extern CHAR %s[];\n", argv[4]); fclose(outHFile); - /* - * Generate the source file and close it. - */ + /* Generate the source file and close it */ fprintf(outCFile, "/* This file is autogenerated, do not edit. */\n\n"); if (argc >= 7) { - /* There is a header to be included for defining the array attribute. */ + /* Include needed header for defining the array attribute */ fprintf(outCFile, "#include \"%s\"\n", argv[6]); } fprintf(outCFile, "#include \"%s\"\n\n", argv[3]); - /* Generate the array. */ + /* Generate the data array */ if (argc >= 6) { - /* There is an array attribute. */ + /* Add the array attribute */ fprintf(outCFile, "%s ", argv[5]); } fprintf(outCFile, "CHAR %s[] =\n{", argv[4]); @@ -92,12 +84,12 @@ ++cnt; ch = fgetc(inFile); } - /* Put a final NULL terminator. */ + /* Put a final NULL terminator */ fprintf(outCFile, "\n 0x00"); fprintf(outCFile, "\n};\n"); fclose(outCFile); - /* Close the input file. */ + /* Close the input file */ fclose(inFile); return 0; Copied: trunk/reactos/tools/cat.c (from r66923, trunk/rosapps/applications/sysutils/utils/cat/cat.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cat.c?p2=trunk/react… ============================================================================== --- trunk/rosapps/applications/sysutils/utils/cat/cat.c [iso-8859-1] (original) +++ trunk/reactos/tools/cat.c [iso-8859-1] Sun Mar 29 00:13:25 2015 @@ -1,26 +1,120 @@ -#include <stdlib.h> +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS conCATenation tool + * FILE: tools/cat.c + * PURPOSE: Concatenates STDIN or an arbitrary number of files to STDOUT + * PROGRAMMERS: David Welch + * Semyon Novikov (tappak) + * Hermès Bélusca - Maïto + */ + +#include <io.h> +#include <fcntl.h> #include <stdio.h> + +#define ARRAYSIZE(a) (sizeof(a) / sizeof((a)[0])) + +void help(void) +{ + printf("\n" + "ReactOS File Concatenation Tool\n" + "\n" + "Usage: cat [options] [file [...]]\n" + "options - Currently ignored\n"); +} int main(int argc, char* argv[]) { - int i; - FILE* in; - char ch; + int i; + FILE* in; + unsigned char buff[512]; + size_t cnt, readcnt; - for (i=1; i<argc; i++) - { - in = fopen(argv[i],"r"); - if (in == NULL) - { - printf("Failed to open file %s\n", argv[i]); - return(0); - } + if (argc >= 2) + { + if (stricmp(argv[1], "-h" ) == 0 || + stricmp(argv[1], "--help") == 0 || + stricmp(argv[1], "/?" ) == 0 || + stricmp(argv[1], "/help" ) == 0) + { + help(); + return 0; + } + } - while ((ch = fgetc(in)) != EOF) - { - putchar(ch); - } - fclose(in); - } - return 0; + /* Set STDOUT to binary */ + setmode(fileno(stdout), O_BINARY); + + /* Special case where we run 'cat' without any argument: we use STDIN */ + if (argc <= 1) + { + unsigned int ch; + + /* Set STDIN to binary */ + setmode(fileno(stdin), O_BINARY); + +#if 0 // Version using feof() + ch = fgetc(stdin); + while (!feof(stdin)) + { + putchar(ch); + ch = fgetc(stdin); + } +#else + while ((ch = fgetc(stdin)) != EOF) + { + putchar(ch); + } +#endif + + return 0; + } + + /* We have files: read them and output them to STDOUT */ + for (i = 1; i < argc; i++) + { + /* Open the file in binary read mode */ + in = fopen(argv[i], "rb"); + if (in == NULL) + { + printf("Failed to open file '%s'\n", argv[i]); + return -1; + } + + /* Dump the file to STDOUT */ + cnt = 0; readcnt = 0; + while (readcnt == cnt) + { + /* Read data from the input file */ + cnt = ARRAYSIZE(buff); + readcnt = fread(&buff, sizeof(buff[0]), cnt, in); + if (readcnt != cnt) + { + /* + * The real number of read bytes differs from the number of bytes + * we wanted to read, so either a reading error occurred, or EOF + * was reached while reading. Bail out if it is a reading error. + */ + if (!feof(in)) + { + printf("Error while reading file '%s'\n", argv[i]); + fclose(in); + return -1; + } + } + + /* Nothing to be read anymore, so we can gracefully break */ + if (readcnt == 0) break; + + /* Write data to STDOUT */ + fwrite(&buff, sizeof(buff[0]), readcnt, stdout); + } + + /* Finally close the file */ + fclose(in); + } + + return 0; } + +/* EOF */ Modified: trunk/rosapps/applications/sysutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/CMak… ============================================================================== --- trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] Sun Mar 29 00:13:25 2015 @@ -12,6 +12,5 @@ #add_subdirectory(rosddt) #add_subdirectory(screenshot) #add_subdirectory(systeminfo) -#add_subdirectory(tcat) add_subdirectory(tlist) add_subdirectory(utils) Modified: trunk/rosapps/applications/sysutils/utils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util… ============================================================================== --- trunk/rosapps/applications/sysutils/utils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/utils/CMakeLists.txt [iso-8859-1] Sun Mar 29 00:13:25 2015 @@ -1,5 +1,4 @@ #add_subdirectory(binpatch) -add_subdirectory(cat) #add_subdirectory(driver) #add_subdirectory(infinst) #add_subdirectory(nts2w32err)

9 years, 9 months

[dquintana] 66941: Forgot this file.

by dquintana＠svn.reactos.org

Author: dquintana Date: Sat Mar 28 23:37:36 2015 New Revision: 66941 URL: http://svn.reactos.org/svn/reactos?rev=66941&view=rev Log: Forgot this file. Added: trunk/reactos/dll/win32/shell32/res/rgs/queryassociations.rgs (with props) Added: trunk/reactos/dll/win32/shell32/res/rgs/queryassociations.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/rgs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/res/rgs/queryassociations.rgs (added) +++ trunk/reactos/dll/win32/shell32/res/rgs/queryassociations.rgs [iso-8859-1] Sat Mar 28 23:37:36 2015 @@ -0,0 +1,13 @@ +HKCR +{ + NoRemove CLSID + { + ForceRemove {a07034fd-6caa-4954-ac3f-97a27216f98a} = s 'Query file associations' + { + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Apartment' + } + } + } +} Propchange: trunk/reactos/dll/win32/shell32/res/rgs/queryassociations.rgs ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 9 months

[dquintana] 66940: [SHELL32] * Implement CLSID_QueryAssociations class. Patch by Ivan Rodionov, with some unrotting by me. CORE-8188 #resolve

by dquintana＠svn.reactos.org

Author: dquintana Date: Sat Mar 28 23:27:10 2015 New Revision: 66940 URL: http://svn.reactos.org/svn/reactos?rev=66940&view=rev Log: [SHELL32] * Implement CLSID_QueryAssociations class. Patch by Ivan Rodionov, with some unrotting by me. CORE-8188 #resolve Added: trunk/reactos/dll/win32/shell32/CQueryAssociations.cpp (with props) trunk/reactos/dll/win32/shell32/CQueryAssociations.h (with props) Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/shell32/precomp.h trunk/reactos/dll/win32/shell32/rgs_res.rc trunk/reactos/dll/win32/shell32/shell32.cpp trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Sat Mar 28 23:27:10 2015 @@ -19,6 +19,7 @@ CMenuBand.cpp CMenuDeskBar.cpp CIDLDataObj.cpp + CQueryAssociations.cpp dde.cpp debughlp.cpp CDesktopBrowser.cpp Added: trunk/reactos/dll/win32/shell32/CQueryAssociations.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CQueryAs… ============================================================================== --- trunk/reactos/dll/win32/shell32/CQueryAssociations.cpp (added) +++ trunk/reactos/dll/win32/shell32/CQueryAssociations.cpp [iso-8859-1] Sat Mar 28 23:27:10 2015 @@ -0,0 +1,771 @@ +/* + * IQueryAssociations object and helper functions + * + * Copyright 2002 Jon Griffiths + * + * 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 + */ + +#include "precomp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(shell); + +/************************************************************************** + * IQueryAssociations + * + * DESCRIPTION + * This object provides a layer of abstraction over the system registry in + * order to simplify the process of parsing associations between files. + * Associations in this context means the registry entries that link (for + * example) the extension of a file with its description, list of + * applications to open the file with, and actions that can be performed on it + * (the shell displays such information in the context menu of explorer + * when you right-click on a file). + * + * HELPERS + * You can use this object transparently by calling the helper functions + * AssocQueryKeyA(), AssocQueryStringA() and AssocQueryStringByKeyA(). These + * create an IQueryAssociations object, perform the requested actions + * and then dispose of the object. Alternatively, you can create an instance + * of the object using AssocCreate() and call the following methods on it: + * + * METHODS + */ + +CQueryAssociations::CQueryAssociations() : hkeySource(0), hkeyProgID(0) +{ +} + +CQueryAssociations::~CQueryAssociations() +{ +} + +/************************************************************************** + * IQueryAssociations_Init + * + * Initialise an IQueryAssociations object. + * + * PARAMS + * cfFlags [I] ASSOCF_ flags from "shlwapi.h" + * pszAssoc [I] String for the root key name, or NULL if hkeyProgid is given + * hkeyProgid [I] Handle for the root key, or NULL if pszAssoc is given + * hWnd [I] Reserved, must be NULL. + * + * RETURNS + * Success: S_OK. iface is initialised with the parameters given. + * Failure: An HRESULT error code indicating the error. + */ +HRESULT STDMETHODCALLTYPE CQueryAssociations::Init( + ASSOCF cfFlags, + LPCWSTR pszAssoc, + HKEY hkeyProgid, + HWND hWnd) +{ + static const WCHAR szProgID[] = L"ProgID"; + + TRACE("(%p)->(%d,%s,%p,%p)\n", this, + cfFlags, + debugstr_w(pszAssoc), + hkeyProgid, + hWnd); + + if (hWnd != NULL) + { + FIXME("hwnd != NULL not supported\n"); + } + + if (cfFlags != 0) + { + FIXME("unsupported flags: %x\n", cfFlags); + } + + RegCloseKey(this->hkeySource); + RegCloseKey(this->hkeyProgID); + this->hkeySource = this->hkeyProgID = NULL; + if (pszAssoc != NULL) + { + LONG ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, + pszAssoc, + 0, + KEY_READ, + &this->hkeySource); + if (ret) + { + return S_OK; + } + /* if this is not a prog id */ + if ((*pszAssoc == '.') || (*pszAssoc == '{')) + { + RegOpenKeyExW(this->hkeySource, + szProgID, + 0, + KEY_READ, + &this->hkeyProgID); + } + else + { + this->hkeyProgID = this->hkeySource; + } + + return S_OK; + } + else if (hkeyProgid != NULL) + { + this->hkeyProgID = hkeyProgid; + return S_OK; + } + + return E_INVALIDARG; +} + +/************************************************************************** + * IQueryAssociations_GetString + * + * Get a file association string from the registry. + * + * PARAMS + * cfFlags [I] ASSOCF_ flags from "shlwapi.h" + * str [I] Type of string to get (ASSOCSTR enum from "shlwapi.h") + * pszExtra [I] Extra information about the string location + * pszOut [O] Destination for the association string + * pcchOut [I/O] Length of pszOut + * + * RETURNS + * Success: S_OK. pszOut contains the string, pcchOut contains its length. + * Failure: An HRESULT error code indicating the error. + */ +HRESULT STDMETHODCALLTYPE CQueryAssociations::GetString( + ASSOCF flags, + ASSOCSTR str, + LPCWSTR pszExtra, + LPWSTR pszOut, + DWORD *pcchOut) +{ + const ASSOCF unimplemented_flags = ~ASSOCF_NOTRUNCATE; + DWORD len = 0; + HRESULT hr; + WCHAR path[MAX_PATH]; + + TRACE("(%p)->(0x%08x, %u, %s, %p, %p)\n", this, flags, str, debugstr_w(pszExtra), pszOut, pcchOut); + if (flags & unimplemented_flags) + { + FIXME("%08x: unimplemented flags\n", flags & unimplemented_flags); + } + + if (!pcchOut) + { + return E_UNEXPECTED; + } + + if (!this->hkeySource && !this->hkeyProgID) + { + return HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION); + } + + switch (str) + { + case ASSOCSTR_COMMAND: + { + WCHAR *command; + hr = this->GetCommand(pszExtra, &command); + if (SUCCEEDED(hr)) + { + hr = this->ReturnString(flags, pszOut, pcchOut, command, strlenW(command) + 1); + HeapFree(GetProcessHeap(), 0, command); + } + return hr; + } + case ASSOCSTR_EXECUTABLE: + { + hr = this->GetExecutable(pszExtra, path, MAX_PATH, &len); + if (FAILED(hr)) + { + return hr; + } + len++; + return this->ReturnString(flags, pszOut, pcchOut, path, len); + } + case ASSOCSTR_FRIENDLYDOCNAME: + { + WCHAR *pszFileType; + + hr = this->GetValue(this->hkeySource, NULL, (void**)&pszFileType, NULL); + if (FAILED(hr)) + { + return hr; + } + DWORD size = 0; + DWORD ret = RegGetValueW(HKEY_CLASSES_ROOT, pszFileType, NULL, RRF_RT_REG_SZ, NULL, NULL, &size); + if (ret == ERROR_SUCCESS) + { + WCHAR *docName = static_cast<WCHAR *>(HeapAlloc(GetProcessHeap(), 0, size)); + if (docName) + { + ret = RegGetValueW(HKEY_CLASSES_ROOT, pszFileType, NULL, RRF_RT_REG_SZ, NULL, docName, &size); + if (ret == ERROR_SUCCESS) + { + hr = this->ReturnString(flags, pszOut, pcchOut, docName, strlenW(docName) + 1); + } + else + { + hr = HRESULT_FROM_WIN32(ret); + } + HeapFree(GetProcessHeap(), 0, docName); + } + else + { + hr = E_OUTOFMEMORY; + } + } + else + { + hr = HRESULT_FROM_WIN32(ret); + } + HeapFree(GetProcessHeap(), 0, pszFileType); + return hr; + } + case ASSOCSTR_FRIENDLYAPPNAME: + { + PVOID verinfoW = NULL; + DWORD size, retval = 0; + UINT flen; + WCHAR *bufW; + static const WCHAR translationW[] = L"\\VarFileInfo\\Translation"; + static const WCHAR fileDescFmtW[] = L"\\StringFileInfo\\%04x%04x\\FileDescription"; + WCHAR fileDescW[41]; + + hr = this->GetExecutable(pszExtra, path, MAX_PATH, &len); + if (FAILED(hr)) + { + return hr; + } + retval = GetFileVersionInfoSizeW(path, &size); + if (!retval) + { + goto get_friendly_name_fail; + } + verinfoW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, retval); + if (!verinfoW) + { + return E_OUTOFMEMORY; + } + if (!GetFileVersionInfoW(path, 0, retval, verinfoW)) + { + goto get_friendly_name_fail; + } + if (VerQueryValueW(verinfoW, translationW, (LPVOID *)&bufW, &flen)) + { + UINT i; + DWORD *langCodeDesc = (DWORD *)bufW; + for (i = 0; i < flen / sizeof(DWORD); i++) + { + sprintfW(fileDescW, fileDescFmtW, LOWORD(langCodeDesc[i]), HIWORD(langCodeDesc[i])); + if (VerQueryValueW(verinfoW, fileDescW, (LPVOID *)&bufW, &flen)) + { + /* Does strlenW(bufW) == 0 mean we use the filename? */ + len = strlenW(bufW) + 1; + TRACE("found FileDescription: %s\n", debugstr_w(bufW)); + hr = this->ReturnString(flags, pszOut, pcchOut, bufW, len); + HeapFree(GetProcessHeap(), 0, verinfoW); + return hr; + } + } + } + get_friendly_name_fail: + PathRemoveExtensionW(path); + PathStripPathW(path); + TRACE("using filename: %s\n", debugstr_w(path)); + hr = this->ReturnString(flags, pszOut, pcchOut, path, strlenW(path) + 1); + HeapFree(GetProcessHeap(), 0, verinfoW); + return hr; + } + case ASSOCSTR_CONTENTTYPE: + { + static const WCHAR Content_TypeW[] = L"Content Type"; + + DWORD size = 0; + DWORD ret = RegGetValueW(this->hkeySource, NULL, Content_TypeW, RRF_RT_REG_SZ, NULL, NULL, &size); + if (ret != ERROR_SUCCESS) + { + return HRESULT_FROM_WIN32(ret); + } + WCHAR *contentType = static_cast<WCHAR *>(HeapAlloc(GetProcessHeap(), 0, size)); + if (contentType != NULL) + { + ret = RegGetValueW(this->hkeySource, NULL, Content_TypeW, RRF_RT_REG_SZ, NULL, contentType, &size); + if (ret == ERROR_SUCCESS) + { + hr = this->ReturnString(flags, pszOut, pcchOut, contentType, strlenW(contentType) + 1); + } + else + { + hr = HRESULT_FROM_WIN32(ret); + } + HeapFree(GetProcessHeap(), 0, contentType); + } + else + { + hr = E_OUTOFMEMORY; + } + return hr; + } + case ASSOCSTR_DEFAULTICON: + { + static const WCHAR DefaultIconW[] = L"DefaultIcon"; + WCHAR *pszFileType; + HKEY hkeyFile; + + hr = this->GetValue(this->hkeySource, NULL, (void**)&pszFileType, NULL); + if (FAILED(hr)) + { + return hr; + } + DWORD ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, pszFileType, 0, KEY_READ, &hkeyFile); + if (ret == ERROR_SUCCESS) + { + DWORD size = 0; + ret = RegGetValueW(hkeyFile, DefaultIconW, NULL, RRF_RT_REG_SZ, NULL, NULL, &size); + if (ret == ERROR_SUCCESS) + { + WCHAR *icon = static_cast<WCHAR *>(HeapAlloc(GetProcessHeap(), 0, size)); + if (icon) + { + ret = RegGetValueW(hkeyFile, DefaultIconW, NULL, RRF_RT_REG_SZ, NULL, icon, &size); + if (ret == ERROR_SUCCESS) + { + hr = this->ReturnString(flags, pszOut, pcchOut, icon, strlenW(icon) + 1); + } + else + { + hr = HRESULT_FROM_WIN32(ret); + } + HeapFree(GetProcessHeap(), 0, icon); + } + else + { + hr = E_OUTOFMEMORY; + } + } + else + { + hr = HRESULT_FROM_WIN32(ret); + } + RegCloseKey(hkeyFile); + } + else + { + hr = HRESULT_FROM_WIN32(ret); + } + HeapFree(GetProcessHeap(), 0, pszFileType); + return hr; + } + case ASSOCSTR_SHELLEXTENSION: + { + static const WCHAR shellexW[] = L"ShellEx\\"; + WCHAR keypath[sizeof(shellexW) / sizeof(shellexW[0]) + 39], guid[39]; + CLSID clsid; + HKEY hkey; + + hr = CLSIDFromString(pszExtra, &clsid); + if (FAILED(hr)) + { + return hr; + } + strcpyW(keypath, shellexW); + strcatW(keypath, pszExtra); + LONG ret = RegOpenKeyExW(this->hkeySource, keypath, 0, KEY_READ, &hkey); + if (ret) + { + return HRESULT_FROM_WIN32(ret); + } + DWORD size = sizeof(guid); + ret = RegGetValueW(hkey, NULL, NULL, RRF_RT_REG_SZ, NULL, guid, &size); + RegCloseKey(hkey); + if (ret) + { + return HRESULT_FROM_WIN32(ret); + } + return this->ReturnString(flags, pszOut, pcchOut, guid, size / sizeof(WCHAR)); + } + + default: + { + FIXME("assocstr %d unimplemented!\n", str); + return E_NOTIMPL; + } + } +} + +/************************************************************************** + * IQueryAssociations_GetKey + * + * Get a file association key from the registry. + * + * PARAMS + * cfFlags [I] ASSOCF_ flags from "shlwapi.h" + * assockey [I] Type of key to get (ASSOCKEY enum from "shlwapi.h") + * pszExtra [I] Extra information about the key location + * phkeyOut [O] Destination for the association key + * + * RETURNS + * Success: S_OK. phkeyOut contains a handle to the key. + * Failure: An HRESULT error code indicating the error. + */ +HRESULT STDMETHODCALLTYPE CQueryAssociations::GetKey( + ASSOCF cfFlags, + ASSOCKEY assockey, + LPCWSTR pszExtra, + HKEY *phkeyOut) +{ + FIXME("(%p,0x%8x,0x%8x,%s,%p)-stub!\n", this, cfFlags, assockey, + debugstr_w(pszExtra), phkeyOut); + return E_NOTIMPL; +} + +/************************************************************************** + * IQueryAssociations_GetData + * + * Get the data for a file association key from the registry. + * + * PARAMS + * cfFlags [I] ASSOCF_ flags from "shlwapi.h" + * assocdata [I] Type of data to get (ASSOCDATA enum from "shlwapi.h") + * pszExtra [I] Extra information about the data location + * pvOut [O] Destination for the association key + * pcbOut [I/O] Size of pvOut + * + * RETURNS + * Success: S_OK. pszOut contains the data, pcbOut contains its length. + * Failure: An HRESULT error code indicating the error. + */ +HRESULT STDMETHODCALLTYPE CQueryAssociations::GetData(ASSOCF cfFlags, ASSOCDATA assocdata, LPCWSTR pszExtra, LPVOID pvOut, DWORD *pcbOut) +{ + static const WCHAR edit_flags[] = L"EditFlags"; + + TRACE("(%p,0x%8x,0x%8x,%s,%p,%p)\n", this, cfFlags, assocdata, + debugstr_w(pszExtra), pvOut, pcbOut); + + if(cfFlags) + { + FIXME("Unsupported flags: %x\n", cfFlags); + } + + switch(assocdata) + { + case ASSOCDATA_EDITFLAGS: + { + if(!this->hkeyProgID) + { + return HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION); + } + + void *data; + DWORD size; + HRESULT hres = this->GetValue(this->hkeyProgID, edit_flags, &data, &size); + if(FAILED(hres) || !pcbOut) + { + return hres; + } + + hres = this->ReturnData(pvOut, pcbOut, data, size); + HeapFree(GetProcessHeap(), 0, data); + return hres; + } + default: + { + FIXME("Unsupported ASSOCDATA value: %d\n", assocdata); + return E_NOTIMPL; + } + } +} + +/************************************************************************** + * IQueryAssociations_GetEnum + * + * Not yet implemented in native Win32. + * + * PARAMS + * cfFlags [I] ASSOCF_ flags from "shlwapi.h" + * assocenum [I] Type of enum to get (ASSOCENUM enum from "shlwapi.h") + * pszExtra [I] Extra information about the enum location + * riid [I] REFIID to look for + * ppvOut [O] Destination for the interface. + * + * RETURNS + * Success: S_OK. + * Failure: An HRESULT error code indicating the error. + * + * NOTES + * Presumably this function returns an enumerator object. + */ +HRESULT STDMETHODCALLTYPE CQueryAssociations::GetEnum( + ASSOCF cfFlags, + ASSOCENUM assocenum, + LPCWSTR pszExtra, + REFIID riid, + LPVOID *ppvOut) +{ + return E_NOTIMPL; +} + +HRESULT CQueryAssociations::GetValue(HKEY hkey, const WCHAR *name, void **data, DWORD *data_size) +{ + DWORD size; + LONG ret; + + ret = RegQueryValueExW(hkey, name, 0, NULL, NULL, &size); + if (ret != ERROR_SUCCESS) + { + return HRESULT_FROM_WIN32(ret); + } + if (!size) + { + return E_FAIL; + } + *data = HeapAlloc(GetProcessHeap(), 0, size); + if (!*data) + { + return E_OUTOFMEMORY; + } + ret = RegQueryValueExW(hkey, name, 0, NULL, (LPBYTE)*data, &size); + if (ret != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, *data); + return HRESULT_FROM_WIN32(ret); + } + if(data_size) + { + *data_size = size; + } + return S_OK; +} + +HRESULT CQueryAssociations::GetCommand(const WCHAR *extra, WCHAR **command) +{ + HKEY hkeyCommand; + HKEY hkeyShell; + HKEY hkeyVerb; + HRESULT hr; + LONG ret; + WCHAR *extra_from_reg = NULL; + WCHAR *filetype; + static const WCHAR commandW[] = L"command"; + static const WCHAR shellW[] = L"shell"; + + /* When looking for file extension it's possible to have a default value + that points to another key that contains 'shell/<verb>/command' subtree. */ + hr = this->GetValue(this->hkeySource, NULL, (void**)&filetype, NULL); + if (hr == S_OK) + { + HKEY hkeyFile; + + ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, filetype, 0, KEY_READ, &hkeyFile); + HeapFree(GetProcessHeap(), 0, filetype); + + if (ret == ERROR_SUCCESS) + { + ret = RegOpenKeyExW(hkeyFile, shellW, 0, KEY_READ, &hkeyShell); + RegCloseKey(hkeyFile); + } + else + { + ret = RegOpenKeyExW(this->hkeySource, shellW, 0, KEY_READ, &hkeyShell); + } + } + else + { + ret = RegOpenKeyExW(this->hkeySource, shellW, 0, KEY_READ, &hkeyShell); + } + + if (ret) + { + return HRESULT_FROM_WIN32(ret); + } + + if (!extra) + { + /* check for default verb */ + hr = this->GetValue(hkeyShell, NULL, (void**)&extra_from_reg, NULL); + if (FAILED(hr)) + { + /* no default verb, try first subkey */ + DWORD max_subkey_len; + + ret = RegQueryInfoKeyW(hkeyShell, NULL, NULL, NULL, NULL, &max_subkey_len, NULL, NULL, NULL, NULL, NULL, NULL); + if (ret) + { + RegCloseKey(hkeyShell); + return HRESULT_FROM_WIN32(ret); + } + + max_subkey_len++; + extra_from_reg = static_cast<WCHAR*>(HeapAlloc(GetProcessHeap(), 0, max_subkey_len * sizeof(WCHAR))); + if (!extra_from_reg) + { + RegCloseKey(hkeyShell); + return E_OUTOFMEMORY; + } + + ret = RegEnumKeyExW(hkeyShell, 0, extra_from_reg, &max_subkey_len, NULL, NULL, NULL, NULL); + if (ret) + { + HeapFree(GetProcessHeap(), 0, extra_from_reg); + RegCloseKey(hkeyShell); + return HRESULT_FROM_WIN32(ret); + } + } + extra = extra_from_reg; + } + + /* open verb subkey */ + ret = RegOpenKeyExW(hkeyShell, extra, 0, KEY_READ, &hkeyVerb); + HeapFree(GetProcessHeap(), 0, extra_from_reg); + RegCloseKey(hkeyShell); + if (ret) + { + return HRESULT_FROM_WIN32(ret); + } + /* open command subkey */ + ret = RegOpenKeyExW(hkeyVerb, commandW, 0, KEY_READ, &hkeyCommand); + RegCloseKey(hkeyVerb); + if (ret) + { + return HRESULT_FROM_WIN32(ret); + } + hr = this->GetValue(hkeyCommand, NULL, (void**)command, NULL); + RegCloseKey(hkeyCommand); + return hr; +} + +HRESULT CQueryAssociations::GetExecutable(LPCWSTR pszExtra, LPWSTR path, DWORD pathlen, DWORD *len) +{ + WCHAR *pszCommand; + WCHAR *pszStart; + WCHAR *pszEnd; + + HRESULT hr = this->GetCommand(pszExtra, &pszCommand); + if (FAILED(hr)) + { + return hr; + } + + DWORD expLen = ExpandEnvironmentStringsW(pszCommand, NULL, 0); + if (expLen > 0) + { + expLen++; + WCHAR *buf = static_cast<WCHAR *>(HeapAlloc(GetProcessHeap(), 0, expLen * sizeof(WCHAR))); + ExpandEnvironmentStringsW(pszCommand, buf, expLen); + HeapFree(GetProcessHeap(), 0, pszCommand); + pszCommand = buf; + } + + /* cleanup pszCommand */ + if (pszCommand[0] == '"') + { + pszStart = pszCommand + 1; + pszEnd = strchrW(pszStart, '"'); + if (pszEnd) + { + *pszEnd = 0; + } + *len = SearchPathW(NULL, pszStart, NULL, pathlen, path, NULL); + } + else + { + pszStart = pszCommand; + for (pszEnd = pszStart; (pszEnd = strchrW(pszEnd, ' ')); pszEnd++) + { + WCHAR c = *pszEnd; + *pszEnd = 0; + if ((*len = SearchPathW(NULL, pszStart, NULL, pathlen, path, NULL))) + { + break; + } + *pszEnd = c; + } + if (!pszEnd) + { + *len = SearchPathW(NULL, pszStart, NULL, pathlen, path, NULL); + } + } + + HeapFree(GetProcessHeap(), 0, pszCommand); + if (!*len) + { + return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + } + return S_OK; +} + +HRESULT CQueryAssociations::ReturnData(void *out, DWORD *outlen, const void *data, DWORD datalen) +{ + if (out) + { + if (*outlen < datalen) + { + *outlen = datalen; + return E_POINTER; + } + *outlen = datalen; + memcpy(out, data, datalen); + return S_OK; + } + else + { + *outlen = datalen; + return S_FALSE; + } +} + +HRESULT CQueryAssociations::ReturnString(ASSOCF flags, LPWSTR out, DWORD *outlen, LPCWSTR data, DWORD datalen) +{ + HRESULT hr = S_OK; + DWORD len; + + TRACE("flags=0x%08x, data=%s\n", flags, debugstr_w(data)); + + if (!out) + { + *outlen = datalen; + return S_FALSE; + } + + if (*outlen < datalen) + { + if (flags & ASSOCF_NOTRUNCATE) + { + len = 0; + if (*outlen > 0) out[0] = 0; + hr = E_POINTER; + } + else + { + len = min(*outlen, datalen); + hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } + *outlen = datalen; + } + else + { + len = datalen; + } + + if (len) + { + memcpy(out, data, len*sizeof(WCHAR)); + } + + return hr; +} Propchange: trunk/reactos/dll/win32/shell32/CQueryAssociations.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shell32/CQueryAssociations.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CQueryAs… ============================================================================== --- trunk/reactos/dll/win32/shell32/CQueryAssociations.h (added) +++ trunk/reactos/dll/win32/shell32/CQueryAssociations.h [iso-8859-1] Sat Mar 28 23:27:10 2015 @@ -0,0 +1,36 @@ +#pragma once + +class CQueryAssociations : + public CComCoClass<CQueryAssociations, &CLSID_QueryAssociations>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IQueryAssociations +{ +private: + HKEY hkeySource; + HKEY hkeyProgID; + + HRESULT GetValue(HKEY hkey, const WCHAR *name, void **data, DWORD *data_size); + HRESULT GetCommand(const WCHAR *extra, WCHAR **command); + HRESULT GetExecutable(LPCWSTR pszExtra, LPWSTR path, DWORD pathlen, DWORD *len); + HRESULT ReturnData(void *out, DWORD *outlen, const void *data, DWORD datalen); + HRESULT ReturnString(ASSOCF flags, LPWSTR out, DWORD *outlen, LPCWSTR data, DWORD datalen); + +public: + CQueryAssociations(); + ~CQueryAssociations(); + + // *** IQueryAssociations methods *** + virtual HRESULT STDMETHODCALLTYPE Init(ASSOCF flags, LPCWSTR pwszAssoc, HKEY hkProgid, HWND hwnd); + virtual HRESULT STDMETHODCALLTYPE GetString(ASSOCF flags, ASSOCSTR str, LPCWSTR pwszExtra, LPWSTR pwszOut, DWORD *pcchOut); + virtual HRESULT STDMETHODCALLTYPE GetKey(ASSOCF flags, ASSOCKEY key, LPCWSTR pwszExtra, HKEY *phkeyOut); + virtual HRESULT STDMETHODCALLTYPE GetData(ASSOCF flags, ASSOCDATA data, LPCWSTR pwszExtra, void *pvOut, DWORD *pcbOut); + virtual HRESULT STDMETHODCALLTYPE GetEnum(ASSOCF cfFlags, ASSOCENUM assocenum, LPCWSTR pszExtra, REFIID riid, LPVOID *ppvOut); + +DECLARE_REGISTRY_RESOURCEID(IDR_QUERYASSOCIATIONS) +DECLARE_NOT_AGGREGATABLE(CQueryAssociations) +DECLARE_PROTECT_FINAL_CONSTRUCT() + +BEGIN_COM_MAP(CQueryAssociations) + COM_INTERFACE_ENTRY_IID(IID_IQueryAssociations, IQueryAssociations) +END_COM_MAP() +}; Propchange: trunk/reactos/dll/win32/shell32/CQueryAssociations.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.… ============================================================================== --- trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] Sat Mar 28 23:27:10 2015 @@ -66,6 +66,7 @@ #include "drvdefext.h" #include "CMenuBand.h" #include "CMenuDeskBar.h" +#include "CQueryAssociations.h" #include <wine/debug.h> #include <wine/unicode.h> Modified: trunk/reactos/dll/win32/shell32/rgs_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/rgs_res.… ============================================================================== --- trunk/reactos/dll/win32/shell32/rgs_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/rgs_res.rc [iso-8859-1] Sat Mar 28 23:27:10 2015 @@ -14,6 +14,7 @@ IDR_NETWORKPLACES REGISTRY "res/rgs/networkplaces.rgs" IDR_NEWMENU REGISTRY "res/rgs/newmenu.rgs" IDR_PRINTERS REGISTRY "res/rgs/printers.rgs" +IDR_QUERYASSOCIATIONS REGISTRY "res/rgs/queryassociations.rgs" IDR_RECYCLEBIN REGISTRY "res/rgs/recyclebin.rgs" IDR_SHELLDESKTOP REGISTRY "res/rgs/shelldesktop.rgs" IDR_SHELLFSFOLDER REGISTRY "res/rgs/shellfsfolder.rgs" Modified: trunk/reactos/dll/win32/shell32/shell32.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.cpp [iso-8859-1] Sat Mar 28 23:27:10 2015 @@ -173,6 +173,7 @@ OBJECT_ENTRY(CLSID_MenuBand, CMenuBand) OBJECT_ENTRY(CLSID_MenuDeskBar, CMenuDeskBar) OBJECT_ENTRY(CLSID_ExeDropHandler, CExeDropHandler) + OBJECT_ENTRY(CLSID_QueryAssociations, CQueryAssociations) END_OBJECT_MAP() CShell32Module gModule; Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Sat Mar 28 23:27:10 2015 @@ -565,3 +565,4 @@ #define IDR_MENUBAND 149 #define IDR_MENUDESKBAR 150 #define IDR_EXEDROPHANDLER 151 +#define IDR_QUERYASSOCIATIONS 152

9 years, 9 months

[spetreolle] 66939: [REACTOS.DFF] Show the cornich^W user what to NOT do before losing hair, hours, and hope into mankind.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sat Mar 28 21:36:37 2015 New Revision: 66939 URL: http://svn.reactos.org/svn/reactos?rev=66939&view=rev Log: [REACTOS.DFF] Show the cornich^W user what to NOT do before losing hair, hours, and hope into mankind. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] Sat Mar 28 21:36:37 2015 @@ -116,3 +116,4 @@ "modules/optional/gnutls/libp11-kit-0.dll" 53 optional "modules/optional/gnutls/libwinpthread-1.dll" 53 optional "modules/optional/gnutls/zlib1.dll" 53 optional +; DON'T REMOVE THE FOLLOWING NEW LINE ! THIS MEANS YOU !

9 years, 9 months

[gadamopoulos] 66938: [PSDK] - Make IsEqualGUID typesafe for c++ [SHELL32] - Properly call IsEqualIID in _ILIsControlPanel. Should fix CORE-8891.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Mar 28 21:11:42 2015 New Revision: 66938 URL: http://svn.reactos.org/svn/reactos?rev=66938&view=rev Log: [PSDK] - Make IsEqualGUID typesafe for c++ [SHELL32] - Properly call IsEqualIID in _ILIsControlPanel. Should fix CORE-8891. Modified: trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp trunk/reactos/include/psdk/guiddef.h Modified: trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] Sat Mar 28 21:11:42 2015 @@ -332,12 +332,12 @@ static BOOL _ILIsControlPanel(LPCITEMIDLIST pidl) { - IID *iid = _ILGetGUIDPointer(pidl); + GUID *guid = _ILGetGUIDPointer(pidl); TRACE("(%p)\n", pidl); - if (iid) - return IsEqualIID(iid, CLSID_ControlPanel); + if (guid) + return IsEqualIID(*guid, CLSID_ControlPanel); return FALSE; } Modified: trunk/reactos/include/psdk/guiddef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/guiddef.h?rev… ============================================================================== --- trunk/reactos/include/psdk/guiddef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/guiddef.h [iso-8859-1] Sat Mar 28 21:11:42 2015 @@ -126,7 +126,11 @@ ((unsigned long *) &rguid1)[2] == ((unsigned long *) &rguid2)[2] && ((unsigned long *) &rguid1)[3] == ((unsigned long *) &rguid2)[3]); } -#define IsEqualGUID(rguid1, rguid2) (!memcmp(&(rguid1), &(rguid2), sizeof(GUID))) + +__inline int IsEqualGUID(REFGUID rguid1, REFGUID rguid2) +{ + return !memcmp(&rguid1, &rguid2, sizeof(GUID)); +} #else /* defined(__cplusplus) && !defined(CINTERFACE) */

9 years, 9 months

[tfaber] 66937: [TCPIP] - Free transport context in TiCloseFileObject CORE-9437 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Mar 28 20:49:13 2015 New Revision: 66937 URL: http://svn.reactos.org/svn/reactos?rev=66937&view=rev Log: [TCPIP] - Free transport context in TiCloseFileObject CORE-9437 #resolve Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Sat Mar 28 20:49:13 2015 @@ -319,6 +319,9 @@ break; } + if (NT_SUCCESS(Status)) + ExFreePoolWithTag(Context, TRANS_CONTEXT_TAG); + Irp->IoStatus.Status = Status; return Irp->IoStatus.Status;

9 years, 9 months

[gadamopoulos] 66936: [SHELL32] - CDefaultContextMenu: Reduce relying on the type of the pidl. Query the attributes of the item from the folder instead. CORE-8973

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Mar 28 19:45:27 2015 New Revision: 66936 URL: http://svn.reactos.org/svn/reactos?rev=66936&view=rev Log: [SHELL32] - CDefaultContextMenu: Reduce relying on the type of the pidl. Query the attributes of the item from the folder instead. CORE-8973 Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefault… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] Sat Mar 28 19:45:27 2015 @@ -514,6 +514,14 @@ TRACE("BuildBackgroundContextMenu entered\n"); + SFGAOF rfg = SFGAO_FILESYSTEM | SFGAO_FOLDER; + HRESULT hr = m_psf->GetAttributesOf(0, NULL, &rfg); + if (FAILED(hr)) + { + ERR("GetAttributesOf failed: %x\n", hr); + rfg = 0; + } + if (!_ILIsDesktop(m_pidlFolder)) { WCHAR wszBuf[MAX_PATH]; @@ -554,8 +562,7 @@ } /* Directory is progid of filesystem folders only */ - LPITEMIDLIST pidlFolderLast = ILFindLastID(m_pidlFolder); - if (_ILIsDesktop(pidlFolderLast) || _ILIsDrive(pidlFolderLast) || _ILIsFolder(pidlFolderLast)) + if (rfg == (SFGAO_FILESYSTEM|SFGAO_FOLDER)) { /* Load context menu handlers */ TRACE("Add background handlers: %p\n", m_pidlFolder); @@ -818,7 +825,7 @@ } /* Directory is only loaded for real filesystem directories */ - if (_ILIsFolder(m_apidl[0])) + if (rfg & SFGAO_FILESYSTEM) { AddStaticEntryForFileClass(L"Directory"); if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"Directory", 0, KEY_READ, &hKey) == ERROR_SUCCESS) @@ -830,7 +837,7 @@ } /* AllFilesystemObjects class is loaded only for files and directories */ - if (_ILIsFolder(m_apidl[0]) || _ILIsValue(m_apidl[0])) + if (rfg & SFGAO_FILESYSTEM) { if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"AllFilesystemObjects", 0, KEY_READ, &hKey) == ERROR_SUCCESS) {

9 years, 9 months

[gadamopoulos] 66935: [SHELL32] - Fix CControlPanelFolder to report its attributes.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Mar 28 19:42:08 2015 New Revision: 66935 URL: http://svn.reactos.org/svn/reactos?rev=66935&view=rev Log: [SHELL32] - Fix CControlPanelFolder to report its attributes. Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] Sat Mar 28 19:42:08 2015 @@ -455,6 +455,8 @@ HRESULT WINAPI CControlPanelFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD * rgfInOut) { HRESULT hr = S_OK; + static const DWORD dwControlPanelAttributes = + SFGAO_HASSUBFOLDER | SFGAO_FOLDER | SFGAO_CANLINK; TRACE("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n", this, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0); @@ -467,12 +469,19 @@ if (*rgfInOut == 0) *rgfInOut = ~0; - while(cidl > 0 && *apidl) - { - pdump(*apidl); - SHELL32_GetItemAttributes(this, *apidl, rgfInOut); - apidl++; - cidl--; + if (!cidl) + { + *rgfInOut &= dwControlPanelAttributes; + } + else + { + while(cidl > 0 && *apidl) + { + pdump(*apidl); + SHELL32_GetItemAttributes(this, *apidl, rgfInOut); + apidl++; + cidl--; + } } /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ *rgfInOut &= ~SFGAO_VALIDATE;

9 years, 9 months

[akhaldi] 66934: [MCISEQ] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Mar 28 19:12:22 2015 New Revision: 66934 URL: http://svn.reactos.org/svn/reactos?rev=66934&view=rev Log: [MCISEQ] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/mciseq/mcimidi.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mciseq/mcimidi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciseq/mcimidi.c… ============================================================================== --- trunk/reactos/dll/win32/mciseq/mcimidi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciseq/mcimidi.c [iso-8859-1] Sat Mar 28 19:12:22 2015 @@ -685,7 +685,7 @@ if (dwFlags & MCI_OPEN_ELEMENT) { TRACE("MCI_OPEN_ELEMENT %s!\n", debugstr_w(lpParms->lpstrElementName)); - if (lpParms->lpstrElementName && strlenW(lpParms->lpstrElementName) > 0) { + if (lpParms->lpstrElementName && lpParms->lpstrElementName[0]) { wmm->hFile = mmioOpenW((LPWSTR)lpParms->lpstrElementName, NULL, MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE); if (wmm->hFile == 0) { Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Mar 28 19:12:22 2015 @@ -104,7 +104,7 @@ reactos/dll/win32/mciavi32 # Synced to WineStaging-1.7.37 reactos/dll/win32/mcicda # Synced to Wine-1.7.27 reactos/dll/win32/mciqtz32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/mciseq # Synced to Wine-1.7.27 +reactos/dll/win32/mciseq # Synced to WineStaging-1.7.37 reactos/dll/win32/mciwave # Synced to Wine-1.7.27 reactos/dll/win32/mgmtapi # Synced to Wine-1.7.27 reactos/dll/win32/mlang # Synced to Wine-1.7.27

9 years, 9 months

← Newer
1
...
4
5
6
7
8
9
10
...
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