Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 33443: Synced urlmon.dll with Wine HEAD. This *does not* fix Downloader
by pschweitzer＠svn.reactos.org 11 May '08

11 May '08

Author: pschweitzer Date: Sun May 11 08:57:45 2008 New Revision: 33443 URL: http://svn.reactos.org/svn/reactos?rev=33443&view=rev Log: Synced urlmon.dll with Wine HEAD. This *does not* fix Downloader Modified: trunk/reactos/dll/win32/urlmon/file.c trunk/reactos/dll/win32/urlmon/internet.c trunk/reactos/dll/win32/urlmon/urlmon.spec trunk/reactos/include/psdk/urlmon.idl Modified: trunk/reactos/dll/win32/urlmon/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/file.c?re… ============================================================================== --- trunk/reactos/dll/win32/urlmon/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/file.c [iso-8859-1] Sun May 11 08:57:45 2008 @@ -99,8 +99,7 @@ DWORD grfBINDF = 0; LARGE_INTEGER size; DWORD len; - LPWSTR url, mime = NULL; - LPCWSTR file_name; + LPWSTR url, mime = NULL, file_name; WCHAR null_char = 0; BOOL first_call = FALSE; HRESULT hres; @@ -136,6 +135,8 @@ IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_DIRECTBIND, NULL); if(!This->file) { + WCHAR *ptr; + first_call = TRUE; IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_SENDINGREQUEST, &null_char); @@ -145,6 +146,13 @@ file_name += 2; if(*file_name == '/') file_name++; + + for(ptr = file_name; *ptr; ptr++) { + if(*ptr == '?' || *ptr == '#') { + *ptr = 0; + break; + } + } This->file = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); Modified: trunk/reactos/dll/win32/urlmon/internet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/internet.… ============================================================================== --- trunk/reactos/dll/win32/urlmon/internet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/internet.c [iso-8859-1] Sun May 11 08:57:45 2008 @@ -298,3 +298,12 @@ return S_OK; } + +/*********************************************************************** + * CoInternetSetFeatureEnabled (URLMON.@) + */ +HRESULT WINAPI CoInternetSetFeatureEnabled(INTERNETFEATURELIST feature, DWORD flags, BOOL enable) +{ + FIXME("%d, 0x%08x, %x, stub\n", feature, flags, enable); + return E_NOTIMPL; +} Modified: trunk/reactos/dll/win32/urlmon/urlmon.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon.sp… ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon.spec [iso-8859-1] Sun May 11 08:57:45 2008 @@ -19,6 +19,7 @@ @ stdcall CoInternetGetSession(long ptr long) @ stdcall CoInternetParseUrl(wstr long long wstr long ptr long) @ stdcall CoInternetQueryInfo(ptr long long ptr long ptr long) +@ stdcall CoInternetSetFeatureEnabled(long long long) @ stub CompareSecurityIds @ stub CopyBindInfo @ stdcall CopyStgMedium(ptr ptr) Modified: trunk/reactos/include/psdk/urlmon.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/urlmon.idl?re… ============================================================================== --- trunk/reactos/include/psdk/urlmon.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/urlmon.idl [iso-8859-1] Sun May 11 08:57:45 2008 @@ -1325,6 +1325,43 @@ [in] LPCODEBASEHOLD lpcbh); } +typedef enum _tagINTERNETFEATURELIST +{ + FEATURE_OBJECT_CACHING, + FEATURE_ZONE_ELEVATION, + FEATURE_MIME_HANDLING, + FEATURE_MIME_SNIFFING, + FEATURE_WINDOW_RESTRICTIONS, + FEATURE_WEBOC_POPUPMANAGEMENT, + FEATURE_BEHAVIORS, + FEATURE_DISABLE_MK_PROTOCOL, + FEATURE_LOCALMACHINE_LOCKDOWN, + FEATURE_SECURITYBAND, + FEATURE_RESTRICT_ACTIVEXINSTALL, + FEATURE_VALIDATE_NAVIGATE_URL, + FEATURE_RESTRICT_FILEDOWNLOAD, + FEATURE_ADDON_MANAGEMENT, + FEATURE_PROTOCOL_LOCKDOWN, + FEATURE_HTTP_USERNAME_PASSWORD_DISABLE, + FEATURE_SAFE_BINDTOOBJECT, + FEATURE_UNC_SAVEDFILECHECK, + FEATURE_GET_URL_DOM_FILEPATH_UNENCODED, + FEATURE_TABBED_BROWSING, + FEATURE_SSLUX, + FEATURE_DISABLE_NAVIGATION_SOUNDS, + FEATURE_DISABLE_LEGACY_COMPRESSION, + FEATURE_FORCE_ADDR_AND_STATUS, + FEATURE_XMLHTTP, + FEATURE_DISABLE_TELNET_PROTOCOL, + FEATURE_FEEDS, + FEATURE_BLOCK_INPUT_PROMPTS, + FEATURE_DOMSTORAGE, + FEATURE_XDOMAINREQUEST, + FEATURE_DATAURI, + FEATURE_AJAX_CONNECTIONSERVICES, + FEATURE_ENTRY_COUNT +} INTERNETFEATURELIST; + cpp_quote("DEFINE_GUID(CLSID_InternetSecurityManager, 0x7b8a2d94, 0x0ac9, 0x11d1, 0x89, 0x6c, 0x00, 0xc0, 0x4f, 0xB6, 0xbf, 0xc4);") cpp_quote("DEFINE_GUID(CLSID_InternetZoneManager, 0x7B8A2D95, 0x0AC9, 0x11D1, 0x89, 0x6C, 0x00, 0xC0, 0x4F, 0xB6, 0xBF, 0xC4);") cpp_quote("DEFINE_GUID(IID_IAsyncMoniker, 0x79EAC9D3, 0xBAF9, 0x11CE, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B);") @@ -1391,6 +1428,7 @@ cpp_quote("HRESULT WINAPI CoInternetCreateZoneManager(IServiceProvider*, IInternetZoneManager**, DWORD);") cpp_quote("HRESULT WINAPI CoInternetParseUrl(LPCWSTR,PARSEACTION,DWORD,LPWSTR,DWORD,DWORD*,DWORD);") cpp_quote("HRESULT WINAPI CoInternetQueryInfo(LPCWSTR,QUERYOPTION,DWORD,LPVOID,DWORD,DWORD*,DWORD);") +cpp_quote("HRESULT WINAPI CoInternetSetFeatureEnabled(INTERNETFEATURELIST,DWORD,BOOL);") cpp_quote("HRESULT WINAPI CreateFormatEnumerator(UINT,FORMATETC*,IEnumFORMATETC**);") cpp_quote("HRESULT WINAPI GetSoftwareUpdateInfo( LPCWSTR szDistUnit, LPSOFTDISTINFO psdi);") cpp_quote("HRESULT WINAPI FaultInIEFeature(HWND,uCLSSPEC*,QUERYCONTEXT*,DWORD);")

1 0

[gbrunmar] 33442: Made 17 listbox winetests pass in user32.dll (some of the changes were taken from wine)
by gbrunmar＠svn.reactos.org 11 May '08

11 May '08

Author: gbrunmar Date: Sun May 11 08:46:47 2008 New Revision: 33442 URL: http://svn.reactos.org/svn/reactos?rev=33442&view=rev Log: Made 17 listbox winetests pass in user32.dll (some of the changes were taken from wine) Modified: trunk/reactos/dll/win32/user32/controls/listbox.c Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] Sun May 11 08:46:47 2008 @@ -1879,13 +1879,14 @@ LRESULT ret = LB_OKAY; WIN32_FIND_DATAW entry; int pos; + LRESULT maxinsert = LB_ERR; /* don't scan directory if we just want drives exclusively */ if (attrib != (DDL_DRIVES | DDL_EXCLUSIVE)) { /* scan directory */ if ((handle = FindFirstFileW(filespec, &entry)) == INVALID_HANDLE_VALUE) { - int le = GetLastError(); + int le = GetLastError(); if ((le != ERROR_NO_MORE_FILES) && (le != ERROR_FILE_NOT_FOUND)) return LB_ERR; } else @@ -1909,7 +1910,8 @@ else /* not a directory */ { #define ATTRIBS (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | \ - FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_ARCHIVE) + FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_ARCHIVE | \ + FILE_ATTRIBUTE_DIRECTORY) if ((attrib & DDL_EXCLUSIVE) && ((attrib & ATTRIBS) != (entry.dwFileAttributes & ATTRIBS))) @@ -1924,22 +1926,33 @@ pos = LISTBOX_FindFileStrPos( descr, buffer ); if ((ret = LISTBOX_InsertString( descr, pos, buffer )) < 0) break; + + if (ret <= maxinsert) + maxinsert++; + else + maxinsert = ret; + } while (FindNextFileW( handle, &entry )); FindClose( handle ); } } - /* scan drives */ - if ((ret >= 0) && (attrib & DDL_DRIVES)) - { - WCHAR buffer[] = {'[','-','a','-',']',0}; - WCHAR root[] = {'A',':','\\',0}; - int drive; - for (drive = 0; drive < 26; drive++, buffer[2]++, root[0]++) - { - if (GetDriveTypeW(root) <= DRIVE_NO_ROOT_DIR) continue; - if ((ret = LISTBOX_InsertString( descr, -1, buffer )) < 0) - break; + if (ret >= 0) + { + ret = maxinsert; + + /* scan drives */ + if (attrib & DDL_DRIVES) + { + WCHAR buffer[] = {'[','-','a','-',']',0}; + WCHAR root[] = {'A',':','\\',0}; + int drive; + for (drive = 0; drive < 26; drive++, buffer[2]++, root[0]++) + { + if (GetDriveTypeW(root) <= DRIVE_NO_ROOT_DIR) continue; + if ((ret = LISTBOX_InsertString( descr, -1, buffer )) < 0) + break; + } } } return ret;

1 0

[pschweitzer] 33441: No need for a shortcut to kbswitch.exe on the desktop
by pschweitzer＠svn.reactos.org 11 May '08

11 May '08

Author: pschweitzer Date: Sun May 11 08:11:30 2008 New Revision: 33441 URL: http://svn.reactos.org/svn/reactos?rev=33441&view=rev Log: No need for a shortcut to kbswitch.exe on the desktop Modified: trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Sun May 11 08:11:30 2008 @@ -741,7 +741,6 @@ /* Create desktop shortcuts */ CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, FALSE); - CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_KBSWITCH, _T("%SystemRoot%\\system32\\kbswitch.exe"), IDS_CMT_KBSWITCH, FALSE); /* Create program startmenu shortcuts */ CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("%SystemRoot%\\explorer.exe"), IDS_CMT_EXPLORER, FALSE);

1 0

[cfinck] 33440: Recreate the branch from /reactos
by cfinck＠svn.reactos.org 11 May '08

11 May '08

Author: cfinck Date: Sun May 11 07:40:10 2008 New Revision: 33440 URL: http://svn.reactos.org/svn/reactos?rev=33440&view=rev Log: Recreate the branch from /reactos Added: branches/win32k-gdi-dx/ - copied from r33439, trunk/reactos/

1 0

[cfinck] 33439: Delete win32k-gdi-dx branch on Fireball's request
by cfinck＠svn.reactos.org 11 May '08

11 May '08

Author: cfinck Date: Sun May 11 07:38:07 2008 New Revision: 33439 URL: http://svn.reactos.org/svn/reactos?rev=33439&view=rev Log: Delete win32k-gdi-dx branch on Fireball's request Removed: branches/win32k-gdi-dx/

1 0

[navaraf] 33438: Temporary disable part of the SEH code in NtReplyWaitReceivePortEx to get trunk working again.
by navaraf＠svn.reactos.org 11 May '08

11 May '08

Author: navaraf Date: Sun May 11 07:22:51 2008 New Revision: 33438 URL: http://svn.reactos.org/svn/reactos?rev=33438&view=rev Log: Temporary disable part of the SEH code in NtReplyWaitReceivePortEx to get trunk working again. Modified: trunk/reactos/ntoskrnl/lpc/reply.c Modified: trunk/reactos/ntoskrnl/lpc/reply.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/reply.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/reply.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/reply.c [iso-8859-1] Sun May 11 07:22:51 2008 @@ -165,7 +165,7 @@ PETHREAD Thread = PsGetCurrentThread(), WakeupThread; PLPCP_CONNECTION_MESSAGE ConnectMessage; ULONG ConnectionInfoLength; - PORT_MESSAGE CapturedReplyMessage; + //PORT_MESSAGE CapturedReplyMessage; LARGE_INTEGER CapturedTimeout; PAGED_CODE(); @@ -183,8 +183,8 @@ if (ReplyMessage != NULL) { ProbeForRead(ReplyMessage, sizeof(PORT_MESSAGE), sizeof(ULONG)); - RtlCopyMemory(&CapturedReplyMessage, ReplyMessage, sizeof(PORT_MESSAGE)); - ReplyMessage = &CapturedReplyMessage; + /*RtlCopyMemory(&CapturedReplyMessage, ReplyMessage, sizeof(PORT_MESSAGE)); + ReplyMessage = &CapturedReplyMessage;*/ } if (Timeout != NULL) @@ -199,6 +199,8 @@ } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { + DPRINT1("SEH crash [1]\n"); + DbgBreakPoint(); Status = _SEH_GetExceptionCode(); } _SEH_END; @@ -492,6 +494,8 @@ } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { + DPRINT1("SEH crash [2]\n"); + DbgBreakPoint(); Status = _SEH_GetExceptionCode(); } _SEH_END;

1 0

[hpoussin] 33437: Use LONG BreakPointNr, as in other breakpoint-related functions
by hpoussin＠svn.reactos.org 11 May '08

11 May '08

Author: hpoussin Date: Sun May 11 06:44:55 2008 New Revision: 33437 URL: http://svn.reactos.org/svn/reactos?rev=33437&view=rev Log: Use LONG BreakPointNr, as in other breakpoint-related functions Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c trunk/reactos/ntoskrnl/kdbg/kdb.h Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=33… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Sun May 11 06:44:55 2008 @@ -540,7 +540,7 @@ IN KDB_ACCESS_TYPE AccessType OPTIONAL, IN PCHAR ConditionExpression OPTIONAL, IN BOOLEAN Global, - OUT PULONG BreakPointNumber OPTIONAL) + OUT PLONG BreakPointNr OPTIONAL) { LONG i; PVOID Condition; @@ -636,8 +636,8 @@ KdbpEnableBreakPoint(i, NULL); /* Return the breakpoint number */ - if (BreakPointNumber != NULL) - *BreakPointNumber = i; + if (BreakPointNr != NULL) + *BreakPointNr = i; return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/kdbg/kdb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.h?rev=33… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.h [iso-8859-1] Sun May 11 06:44:55 2008 @@ -196,7 +196,7 @@ IN KDB_ACCESS_TYPE AccessType OPTIONAL, IN PCHAR ConditionExpression OPTIONAL, IN BOOLEAN Global, - OUT PULONG BreakPointNumber OPTIONAL); + OUT PLONG BreakPointNr OPTIONAL); BOOLEAN KdbpDeleteBreakPoint(

1 0

[hpoussin] 33436: Implement SHGetFolderPathAndSubDirA/W, taken from Wine See issue #3238 for more details.
by hpoussin＠svn.reactos.org 11 May '08

11 May '08

Author: hpoussin Date: Sun May 11 06:33:49 2008 New Revision: 33436 URL: http://svn.reactos.org/svn/reactos?rev=33436&view=rev Log: Implement SHGetFolderPathAndSubDirA/W, taken from Wine See issue #3238 for more details. Modified: trunk/reactos/dll/win32/shell32/shell32.spec trunk/reactos/dll/win32/shell32/shellpath.c trunk/reactos/include/psdk/shlobj.h Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] Sun May 11 06:33:49 2008 @@ -349,6 +349,8 @@ @ stdcall SHGetFileInfoW(ptr long ptr long long) @ stdcall SHGetFolderLocation(long long long long ptr) @ stdcall SHGetFolderPathA(long long long long ptr) +@ stdcall SHGetFolderPathAndSubDirA(long long long long str ptr) +@ stdcall SHGetFolderPathAndSubDirW(long long long long wstr ptr) @ stdcall SHGetFolderPathW(long long long long ptr) @ stub SHGetFreeDiskSpace @ stub SHGetIconOverlayIndexA @@ -376,7 +378,7 @@ @ stdcall SHQueryRecycleBinA(str ptr) @ stdcall SHQueryRecycleBinW(wstr ptr) @ stdcall SHSetLocalizedName(wstr wstr long) -@ stub SHUpdateRecycleBinIcon +@ stdcall SHUpdateRecycleBinIcon() @ stdcall SheChangeDirA(str) @ stub SheChangeDirExA @ stub SheChangeDirExW Modified: trunk/reactos/dll/win32/shell32/shellpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellpat… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellpath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellpath.c [iso-8859-1] Sun May 11 06:33:49 2008 @@ -1625,17 +1625,12 @@ * Most values can be overridden in either * HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders * or in the same location in HKLM. - * The registry usage is explained by the following tech note: - * http://www.microsoft.com/windows2000/techinfo/reskit/en-us/default.asp?url=… * The "Shell Folders" registry key was used in NT4 and earlier systems. * Beginning with Windows 2000, the "User Shell Folders" key is used, so * changes made to it are made to the former key too. This synchronization is * done on-demand: not until someone requests the value of one of these paths * (by calling one of the SHGet functions) is the value synchronized. - * Furthermore, as explained here: - * http://www.microsoft.com/windows2000/techinfo/reskit/en-us/default.asp?url=… - * the HKCU paths take precedence over the HKLM paths. - * + * Furthermore, the HKCU paths take precedence over the HKLM paths. */ HRESULT WINAPI SHGetFolderPathW( HWND hwndOwner, /* [I] owner window */ @@ -1644,20 +1639,85 @@ DWORD dwFlags, /* [I] which path to return */ LPWSTR pszPath) /* [O] converted path */ { + HRESULT hr = SHGetFolderPathAndSubDirW(hwndOwner, nFolder, hToken, dwFlags, NULL, pszPath); + if(HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) == hr) + hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + return hr; +} + +HRESULT WINAPI SHGetFolderPathAndSubDirA( + HWND hwndOwner, /* [I] owner window */ + int nFolder, /* [I] CSIDL identifying the folder */ + HANDLE hToken, /* [I] access token */ + DWORD dwFlags, /* [I] which path to return */ + LPCSTR pszSubPath, /* [I] sub directory of the specified folder */ + LPSTR pszPath) /* [O] converted path */ +{ + int length; + HRESULT hr = S_OK; + LPWSTR pszSubPathW = NULL; + LPWSTR pszPathW = NULL; + TRACE("%08x,%08x,%s\n",nFolder, dwFlags, debugstr_w(pszSubPathW)); + + if(pszPath) { + pszPathW = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); + if(!pszPathW) { + hr = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + } + TRACE("%08x,%08x,%s\n",nFolder, dwFlags, debugstr_w(pszSubPathW)); + + /* SHGetFolderPathAndSubDirW does not distinguish if pszSubPath isn't + * set (null), or an empty string.therefore call it without the parameter set + * if pszSubPath is an empty string + */ + if (pszSubPath && pszSubPath[0]) { + length = MultiByteToWideChar(CP_ACP, 0, pszSubPath, -1, NULL, 0); + pszSubPathW = HeapAlloc(GetProcessHeap(), 0, length * sizeof(WCHAR)); + if(!pszSubPathW) { + hr = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, pszSubPath, -1, pszSubPathW, length); + } + + hr = SHGetFolderPathAndSubDirW(hwndOwner, nFolder, hToken, dwFlags, pszSubPathW, pszPathW); + + if (SUCCEEDED(hr) && pszPath) + WideCharToMultiByte(CP_ACP, 0, pszPathW, -1, pszPath, MAX_PATH, NULL, NULL); + +cleanup: + HeapFree(GetProcessHeap(), 0, pszPathW); + HeapFree(GetProcessHeap(), 0, pszSubPathW); + return hr; +} + +HRESULT WINAPI SHGetFolderPathAndSubDirW( + HWND hwndOwner, /* [I] owner window */ + int nFolder, /* [I] CSIDL identifying the folder */ + HANDLE hToken, /* [I] access token */ + DWORD dwFlags, /* [I] which path to return */ + LPCWSTR pszSubPath,/* [I] sub directory of the specified folder */ + LPWSTR pszPath) /* [O] converted path */ +{ HRESULT hr; WCHAR szBuildPath[MAX_PATH], szTemp[MAX_PATH]; DWORD folder = nFolder & CSIDL_FOLDER_MASK; CSIDL_Type type; int ret; - TRACE("%p,%p,nFolder=0x%04x\n", hwndOwner,pszPath,nFolder); + TRACE("%p,%p,nFolder=0x%04x,%s\n", hwndOwner,pszPath,nFolder,debugstr_w(pszSubPath)); /* Windows always NULL-terminates the resulting path regardless of success * or failure, so do so first */ if (pszPath) *pszPath = '\0'; + if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0])) + return E_INVALIDARG; + if ((SHGFP_TYPE_CURRENT != dwFlags) && (SHGFP_TYPE_DEFAULT != dwFlags)) return E_INVALIDARG; szTemp[0] = 0; type = CSIDL_Data[folder].type; @@ -1711,11 +1771,22 @@ hr = _SHExpandEnvironmentStrings(szTemp, szBuildPath); else strcpyW(szBuildPath, szTemp); + + if (FAILED(hr)) goto end; + + if(pszSubPath) { + /* make sure the new path does not exceed th bufferlength + * rememebr to backslash and the termination */ + if(MAX_PATH < (lstrlenW(szBuildPath) + lstrlenW(pszSubPath) + 2)) { + hr = HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE); + goto end; + } + PathAppendW(szBuildPath, pszSubPath); + PathRemoveBackslashW(szBuildPath); + } /* Copy the path if it's available before we might return */ if (SUCCEEDED(hr) && pszPath) strcpyW(pszPath, szBuildPath); - - if (FAILED(hr)) goto end; /* if we don't care about existing directories we are ready */ if(nFolder & CSIDL_FLAG_DONT_VERIFY) goto end; @@ -1727,7 +1798,7 @@ */ if (!(nFolder & CSIDL_FLAG_CREATE)) { - hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + hr = HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND); goto end; } Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Sun May 11 06:33:49 2008 @@ -53,6 +53,9 @@ void WINAPI SHFree(LPVOID); BOOL WINAPI GetFileNameFromBrowse(HWND,LPSTR,DWORD,LPCSTR,LPCSTR,LPCSTR,LPCSTR); HRESULT WINAPI SHGetInstanceExplorer(IUnknown**); +HRESULT WINAPI SHGetFolderPathAndSubDirA(HWND,int,HANDLE,DWORD,LPCSTR,LPSTR); +HRESULT WINAPI SHGetFolderPathAndSubDirW(HWND,int,HANDLE,DWORD,LPCWSTR,LPWSTR); +#define SHGetFolderPathAndSubDir WINELIB_NAME_AW(SHGetFolderPathAndSubDir); BOOL WINAPI SHGetPathFromIDListA(LPCITEMIDLIST,LPSTR); BOOL WINAPI SHGetPathFromIDListW(LPCITEMIDLIST,LPWSTR); #define SHGetPathFromIDList WINELIB_NAME_AW(SHGetPathFromIDList)

1 0

[fireball] 33435: Creating a branch for Magnus Olsen's work in win32k, GDI and DirectX area. Finished parts will be merged back to trunk.
by fireball＠svn.reactos.org 11 May '08

11 May '08

Author: fireball Date: Sun May 11 06:03:57 2008 New Revision: 33435 URL: http://svn.reactos.org/svn/reactos?rev=33435&view=rev Log: Creating a branch for Magnus Olsen's work in win32k, GDI and DirectX area. Finished parts will be merged back to trunk. Added: branches/win32k-gdi-dx/ - copied from r33434, /

1 0

[greatlrd] 33434: adding SetLastError(ERROR_INVALID_PARAMETER) when CreateBitmapIndirect fail, sugestion from filip we should do that as well. thx filip.
by greatlrd＠svn.reactos.org 11 May '08

11 May '08

Author: greatlrd Date: Sun May 11 05:41:06 2008 New Revision: 33434 URL: http://svn.reactos.org/svn/reactos?rev=33434&view=rev Log: adding SetLastError(ERROR_INVALID_PARAMETER) when CreateBitmapIndirect fail, sugestion from filip we should do that as well. thx filip. Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Sun May 11 05:41:06 2008 @@ -200,6 +200,10 @@ pbm->bmPlanes, pbm->bmBitsPixel, pbm->bmBits); + } + else + { + SetLastError(ERROR_INVALID_PARAMETER); } return bitmap;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs