Ros-diffs December 2009

ros-diffs@reactos.org

22 participants
501 discussions

[cwittich] 44732: [kernel32] fix typos in comments (as in wine 1.1.35)

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Dec 23 13:10:58 2009 New Revision: 44732 URL: http://svn.reactos.org/svn/reactos?rev=44732&view=rev Log: [kernel32] fix typos in comments (as in wine 1.1.35) Modified: trunk/reactos/dll/win32/kernel32/misc/actctx.c Modified: trunk/reactos/dll/win32/kernel32/misc/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ac… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/actctx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/actctx.c [iso-8859-1] Wed Dec 23 13:10:58 2009 @@ -197,7 +197,7 @@ /*********************************************************************** * FindActCtxSectionStringA (KERNEL32.@) * - * Find information about a GUID in an activation context. + * Find information about a string in an activation context. */ BOOL WINAPI FindActCtxSectionStringA(DWORD dwFlags, const GUID* lpExtGuid, ULONG ulId, LPCSTR lpSearchStr, @@ -229,7 +229,7 @@ /*********************************************************************** * FindActCtxSectionStringW (KERNEL32.@) * - * Find information about a GUID in an activation context. + * Find information about a string in an activation context. */ BOOL WINAPI FindActCtxSectionStringW(DWORD dwFlags, const GUID* lpExtGuid, ULONG ulId, LPCWSTR lpSearchStr,

15 years

[cwittich] 44731: [netapi32] sync netapi32 with wine 1.1.35

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Dec 23 12:36:17 2009 New Revision: 44731 URL: http://svn.reactos.org/svn/reactos?rev=44731&view=rev Log: [netapi32] sync netapi32 with wine 1.1.35 Modified: trunk/reactos/dll/win32/netapi32/access.c Modified: trunk/reactos/dll/win32/netapi32/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/access.… ============================================================================== --- trunk/reactos/dll/win32/netapi32/access.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/access.c [iso-8859-1] Wed Dec 23 12:36:17 2009 @@ -494,7 +494,7 @@ PNET_DISPLAY_USER usr; /* set up buffer */ - name_sz = lstrlenW(sAdminUserName); + name_sz = lstrlenW(sAdminUserName) + 1; comment_sz = 1; full_name_sz = 1; @@ -533,7 +533,7 @@ PNET_DISPLAY_USER usr; /* set up buffer */ - name_sz = lstrlenW(sGuestUserName); + name_sz = lstrlenW(sGuestUserName) + 1; comment_sz = 1; full_name_sz = 1;

15 years

[cwittich] 44730: [inetcomm] sync inetcomm with wine 1.1.35

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Dec 23 12:32:32 2009 New Revision: 44730 URL: http://svn.reactos.org/svn/reactos?rev=44730&view=rev Log: [inetcomm] sync inetcomm with wine 1.1.35 Modified: trunk/reactos/dll/win32/inetcomm/internettransport.c trunk/reactos/dll/win32/inetcomm/mimeole.c Modified: trunk/reactos/dll/win32/inetcomm/internettransport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/interne… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/internettransport.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/internettransport.c [iso-8859-1] Wed Dec 23 12:32:32 2009 @@ -167,14 +167,12 @@ HRESULT InternetTransport_DropConnection(InternetTransport *This) { - int ret; - - if (This->Status == IXP_DISCONNECTED) - return IXP_E_NOT_CONNECTED; - - ret = shutdown(This->Socket, SD_BOTH); - - ret = closesocket(This->Socket); + if (This->Status == IXP_DISCONNECTED) + return IXP_E_NOT_CONNECTED; + + shutdown(This->Socket, SD_BOTH); + + closesocket(This->Socket); DestroyWindow(This->hwnd); This->hwnd = NULL; Modified: trunk/reactos/dll/win32/inetcomm/mimeole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/mimeole… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/mimeole.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/mimeole.c [iso-8859-1] Wed Dec 23 12:32:32 2009 @@ -1610,6 +1610,7 @@ } while(1); end: + HeapFree(GetProcessHeap(), 0, nl_boundary); HeapFree(GetProcessHeap(), 0, buf); return hr; }

15 years

[cwittich] 44729: [shell32] partial shlview winesync to wine 1.1.35

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Dec 23 12:28:12 2009 New Revision: 44729 URL: http://svn.reactos.org/svn/reactos?rev=44729&view=rev Log: [shell32] partial shlview winesync to wine 1.1.35 Modified: trunk/reactos/dll/win32/shell32/shlview.c Modified: trunk/reactos/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.c [iso-8859-1] Wed Dec 23 12:28:12 2009 @@ -3,7 +3,7 @@ * * Copyright 1998,1999 <juergen.schmied(a)debitel.net> * - * This is the view visualizing the data provied by the shellfolder. + * This is the view visualizing the data provided by the shellfolder. * No direct access to data from pidls should be done from here. * * This library is free software; you can redistribute it and/or @@ -21,9 +21,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * FIXME: The order by part of the background context menu should be - * buily according to the columns shown. + * built according to the columns shown. * - * FIXME: Load/Save the view state from/into the stream provied by + * FIXME: Load/Save the view state from/into the stream provided by * the ShellBrowser * * FIXME: CheckToolbar: handle the "new folder" and "folder up" button @@ -362,7 +362,7 @@ { for (i=0; 1; i++) { - if (!SUCCEEDED(IShellFolder2_GetDetailsOf(This->pSF2Parent, NULL, i, &sd))) + if (FAILED(IShellFolder2_GetDetailsOf(This->pSF2Parent, NULL, i, &sd))) break; lvColumn.fmt = sd.fmt; lvColumn.cx = sd.cxChar*8; /* chars->pixel */ @@ -428,8 +428,8 @@ FILETIME fd1, fd2; char strName1[MAX_PATH], strName2[MAX_PATH]; BOOL bIsFolder1, bIsFolder2,bIsBothFolder; - LPITEMIDLIST pItemIdList1 = (LPITEMIDLIST) lParam1; - LPITEMIDLIST pItemIdList2 = (LPITEMIDLIST) lParam2; + LPITEMIDLIST pItemIdList1 = lParam1; + LPITEMIDLIST pItemIdList2 = lParam2; LISTVIEW_SORT_INFO *pSortInfo = (LPLISTVIEW_SORT_INFO) lpData; @@ -1343,7 +1343,7 @@ break; case NM_RETURN: - TRACE("-- NM_DBLCLK %p\n",This); + TRACE("-- NM_RETURN %p\n",This); if (OnDefaultCommand(This) != S_OK) ShellView_OpenSelectedItems(This); break; @@ -1463,7 +1463,7 @@ DWORD dwAttr = SFGAO_CANRENAME; pidl = (LPITEMIDLIST)lpdi->item.lParam; - TRACE("-- LVN_BEGINLABELEDITA %p\n",This); + TRACE("-- LVN_BEGINLABELEDITW %p\n",This); IShellFolder_GetAttributesOf(This->pSFParent, 1, (LPCITEMIDLIST*)&pidl, &dwAttr); if (SFGAO_CANRENAME & dwAttr)

15 years

[cwittich] 44728: [shell32] partial SHGetFileInfoW winesync to wine 1.1.35 (fixes uninitialized memory access)

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Dec 23 12:21:41 2009 New Revision: 44728 URL: http://svn.reactos.org/svn/reactos?rev=44728&view=rev Log: [shell32] partial SHGetFileInfoW winesync to wine 1.1.35 (fixes uninitialized memory access) Modified: trunk/reactos/dll/win32/shell32/shell32_main.c Modified: trunk/reactos/dll/win32/shell32/shell32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.c [iso-8859-1] Wed Dec 23 12:21:41 2009 @@ -538,7 +538,7 @@ /* get icon index (or load icon)*/ if (SUCCEEDED(hr) && (flags & (SHGFI_ICON | SHGFI_SYSICONINDEX))) { - if (flags & SHGFI_USEFILEATTRIBUTES) + if (flags & SHGFI_USEFILEATTRIBUTES && !(flags & SHGFI_PIDL)) { WCHAR sTemp [MAX_PATH]; WCHAR * szExt;

15 years

[cwittich] 44727: [shell32] partial shelllink winesync to wine 1.1.35 (fixes a memory leak)

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Dec 23 12:17:00 2009 New Revision: 44727 URL: http://svn.reactos.org/svn/reactos?rev=44727&view=rev Log: [shell32] partial shelllink winesync to wine 1.1.35 (fixes a memory leak) Modified: trunk/reactos/dll/win32/shell32/shelllink.c Modified: trunk/reactos/dll/win32/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelllink.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelllink.c [iso-8859-1] Wed Dec 23 12:17:00 2009 @@ -2184,7 +2184,10 @@ /* any other quote marks are invalid */ if (wcschr(pszFile, '"')) + { + HeapFree(GetProcessHeap(), 0, unquoted); return S_FALSE; + } HeapFree(GetProcessHeap(), 0, This->sPath); This->sPath = NULL;

15 years

[cwittich] 44726: [kernel32] sync enumerate_mapped_resources and update_add_resource to wine 1.1.35

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Dec 23 12:13:35 2009 New Revision: 44726 URL: http://svn.reactos.org/svn/reactos?rev=44726&view=rev Log: [kernel32] sync enumerate_mapped_resources and update_add_resource to wine 1.1.35 Modified: trunk/reactos/dll/win32/kernel32/misc/res.c Modified: trunk/reactos/dll/win32/kernel32/misc/res.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/re… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/res.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/res.c [iso-8859-1] Wed Dec 23 12:13:35 2009 @@ -310,7 +310,7 @@ if (existing) { if (!overwrite_existing) - return TRUE; + return FALSE; list_remove( &existing->entry ); HeapFree( GetProcessHeap(), 0, existing ); } @@ -519,8 +519,11 @@ resdata = allocate_resource_data( Lang, data->CodePage, p, data->Size, FALSE ); if (resdata) - update_add_resource( updates, Type, Name, resdata, FALSE ); - } + { + if (!update_add_resource( updates, Type, Name, resdata, FALSE )) + HeapFree( GetProcessHeap(), 0, resdata ); + } + } res_free_str( Name ); } res_free_str( Type );

15 years

[cwittich] 44725: [crt] import _wcsupr_s from wine 1.1.35

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Dec 23 11:56:54 2009 New Revision: 44725 URL: http://svn.reactos.org/svn/reactos?rev=44725&view=rev Log: [crt] import _wcsupr_s from wine 1.1.35 Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def trunk/reactos/lib/sdk/crt/string/wcs.c Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.de… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.def [iso-8859-1] Wed Dec 23 11:56:54 2009 @@ -852,6 +852,7 @@ _mbsnbcpy_s wcscpy_s wcsncpy_s + _wcsupr_s _ftol2=_ftol _ftol2_sse=_ftol strcat_s Modified: trunk/reactos/lib/sdk/crt/string/wcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcs.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] Wed Dec 23 11:56:54 2009 @@ -107,6 +107,35 @@ wchar_t* ret = str; while (*str) *str++ = c; return ret; +} + +/****************************************************************** + * _wcsupr_s (MSVCRT.@) + * + */ +INT CDECL _wcsupr_s( wchar_t* str, size_t n ) +{ + wchar_t* ptr = str; + + if (!str || !n) + { + if (str) *str = '\0'; + __set_errno(EINVAL); + return EINVAL; + } + + while (n--) + { + if (!*ptr) return 0; + *ptr = toupperW(*ptr); + ptr++; + } + + /* MSDN claims that the function should return and set errno to + * ERANGE, which doesn't seem to be true based on the tests. */ + *str = '\0'; + __set_errno(EINVAL); + return EINVAL; } /*********************************************************************

15 years

[cwittich] 44724: [crt] sync wcscpy_s with wine 1.1.35

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Dec 23 11:44:24 2009 New Revision: 44724 URL: http://svn.reactos.org/svn/reactos?rev=44724&view=rev Log: [crt] sync wcscpy_s with wine 1.1.35 Modified: trunk/reactos/lib/sdk/crt/string/wcs.c Modified: trunk/reactos/lib/sdk/crt/string/wcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcs.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] Wed Dec 23 11:44:24 2009 @@ -1132,9 +1132,6 @@ return ERANGE; } - if(size > numElement) - size = numElement; - memcpy( wcDest, wcSrc, size*sizeof(WCHAR) ); return 0;

15 years

[janderwald] 44723: [WDMAUD.DRV] - Fix build

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Dec 23 11:43:17 2009 New Revision: 44723 URL: http://svn.reactos.org/svn/reactos?rev=44723&view=rev Log: [WDMAUD.DRV] - Fix build Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] Wed Dec 23 11:43:17 2009 @@ -134,10 +134,6 @@ { case DRV_LOAD : { -#ifndef USE_MMIXER_LIB - HANDLE Handle; -#endif - SND_TRACE(L"DRV_LOAD\n"); Result = InitEntrypointMutexes(); @@ -154,7 +150,7 @@ #else if (WdmAudOpenSoundDeviceByLegacy() != MMSYSERR_NOERROR) { - SND_ERR(L"Failed to open %s\n", KERNEL_DEVICE_NAME); + SND_ERR(L"Failed to open \\\\.\\wdmaud\n"); CleanupEntrypointMutexes(); //UnlistAllSoundDevices();

15 years

← Newer
1
...
9
10
11
12
13
14
15
...
51
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 December 2009