Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 67191: [CHARMAP] use RegCreateKeyEx instead of RegCreateKey/RegOpenKeyEx
by cwittich＠svn.reactos.org 14 Apr '15

14 Apr '15

Author: cwittich Date: Tue Apr 14 08:04:18 2015 New Revision: 67191 URL: http://svn.reactos.org/svn/reactos?rev=67191&view=rev Log: [CHARMAP] use RegCreateKeyEx instead of RegCreateKey/RegOpenKeyEx Modified: trunk/reactos/base/applications/charmap/settings.c Modified: trunk/reactos/base/applications/charmap/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/settings.c [iso-8859-1] Tue Apr 14 08:04:18 2015 @@ -114,28 +114,24 @@ { HKEY hKey = NULL; - if (RegCreateKey(HKEY_CURRENT_USER, g_szGeneralRegKey, &hKey) == ERROR_SUCCESS) + if (RegCreateKeyEx(HKEY_CURRENT_USER, g_szGeneralRegKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hKey, NULL) == ERROR_SUCCESS) { + TCHAR szBuffer[MAX_PATH]; + + hWnd = GetDlgItem(hCharmapDlg, IDC_FONTCOMBO); + ComboBox_GetText(hWnd, szBuffer, MAX_PATH); + + if(*szBuffer != '\0') + RegSetValueEx(hKey, _T("Font"), 0, REG_SZ, (LPBYTE) szBuffer, (DWORD) MAX_PATH); + + hWnd = GetDlgItem(hCharmapDlg, IDC_COMBO_CHARSET); + ComboBox_GetText(hWnd, szBuffer, MAX_PATH); + + if(*szBuffer != '\0') + RegSetValueEx(hKey, _T("CodePage"), 0, REG_SZ, (LPBYTE) szBuffer, (DWORD) MAX_PATH); + + RegSetValueEx(hKey, _T("Advanced"), 0, REG_DWORD, (LPBYTE)&Settings.IsAdvancedView, (DWORD) sizeof(DWORD)); + RegCloseKey(hKey); - if (RegOpenKeyEx(HKEY_CURRENT_USER, g_szGeneralRegKey, 0, KEY_SET_VALUE, &hKey) == ERROR_SUCCESS) - { - TCHAR szBuffer[MAX_PATH]; - - hWnd = GetDlgItem(hCharmapDlg, IDC_FONTCOMBO); - ComboBox_GetText(hWnd, szBuffer, MAX_PATH); - - if(*szBuffer != '\0') - RegSetValueEx(hKey, _T("Font"), 0, REG_SZ, (LPBYTE) szBuffer, (DWORD) MAX_PATH); - - hWnd = GetDlgItem(hCharmapDlg, IDC_COMBO_CHARSET); - ComboBox_GetText(hWnd, szBuffer, MAX_PATH); - - if(*szBuffer != '\0') - RegSetValueEx(hKey, _T("CodePage"), 0, REG_SZ, (LPBYTE) szBuffer, (DWORD) MAX_PATH); - - RegSetValueEx(hKey, _T("Advanced"), 0, REG_DWORD, (LPBYTE)&Settings.IsAdvancedView, (DWORD) sizeof(DWORD)); - - RegCloseKey(hKey); - } } }

1 0

[cwittich] 67190: [CHARMAP] fix a resource leak
by cwittich＠svn.reactos.org 14 Apr '15

14 Apr '15

Author: cwittich Date: Tue Apr 14 07:47:43 2015 New Revision: 67190 URL: http://svn.reactos.org/svn/reactos?rev=67190&view=rev Log: [CHARMAP] fix a resource leak Modified: trunk/reactos/base/applications/charmap/settings.c Modified: trunk/reactos/base/applications/charmap/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/settings.c [iso-8859-1] Tue Apr 14 07:47:43 2015 @@ -116,6 +116,7 @@ if (RegCreateKey(HKEY_CURRENT_USER, g_szGeneralRegKey, &hKey) == ERROR_SUCCESS) { + RegCloseKey(hKey); if (RegOpenKeyEx(HKEY_CURRENT_USER, g_szGeneralRegKey, 0, KEY_SET_VALUE, &hKey) == ERROR_SUCCESS) { TCHAR szBuffer[MAX_PATH];

1 0

[cwittich] 67189: [DXDIAG] fix some memory leaks
by cwittich＠svn.reactos.org 14 Apr '15

14 Apr '15

Author: cwittich Date: Tue Apr 14 07:41:24 2015 New Revision: 67189 URL: http://svn.reactos.org/svn/reactos?rev=67189&view=rev Log: [DXDIAG] fix some memory leaks Modified: trunk/reactos/base/applications/dxdiag/dxdiag.c Modified: trunk/reactos/base/applications/dxdiag/dxdiag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] Tue Apr 14 07:41:24 2015 @@ -288,6 +288,11 @@ break; case WM_DESTROY: DestroyTabCtrlDialogs(pContext); + if (pContext->hDisplayWnd) + HeapFree(GetProcessHeap(), 0, pContext->hDisplayWnd); + if (pContext->hSoundWnd) + HeapFree(GetProcessHeap(), 0, pContext->hSoundWnd); + HeapFree(GetProcessHeap(), 0, pContext); return DefWindowProc(hwndDlg, message, wParam, lParam); } return 0;

1 0

[cwittich] 67188: [sndvol32] fix some memory leaks
by cwittich＠svn.reactos.org 14 Apr '15

14 Apr '15

Author: cwittich Date: Tue Apr 14 07:30:26 2015 New Revision: 67188 URL: http://svn.reactos.org/svn/reactos?rev=67188&view=rev Log: [sndvol32] fix some memory leaks Modified: trunk/reactos/base/applications/sndvol32/mixer.c trunk/reactos/base/applications/sndvol32/sndvol32.c Modified: trunk/reactos/base/applications/sndvol32/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/mixer.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/mixer.c [iso-8859-1] Tue Apr 14 07:30:26 2015 @@ -90,6 +90,7 @@ VOID SndMixerDestroy(PSND_MIXER Mixer) { + ClearMixerCache(Mixer); SndMixerClose(Mixer); HeapFree(GetProcessHeap(), 0, Modified: trunk/reactos/base/applications/sndvol32/sndvol32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/sndvol32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/sndvol32.c [iso-8859-1] Tue Apr 14 07:30:26 2015 @@ -1018,9 +1018,13 @@ { MixerWindow = GetWindowData(hwnd, MIXER_WINDOW); - if (MixerWindow->Mixer != NULL) - { - SndMixerDestroy(MixerWindow->Mixer); + if (MixerWindow != NULL) + { + if (MixerWindow->Mixer != NULL) + { + SndMixerDestroy(MixerWindow->Mixer); + } + HeapFree(hAppHeap, 0, MixerWindow); } break; }

1 0

[cwittich] 67187: [FONTVIEW] fix a leak
by cwittich＠svn.reactos.org 13 Apr '15

13 Apr '15

Author: cwittich Date: Mon Apr 13 13:44:02 2015 New Revision: 67187 URL: http://svn.reactos.org/svn/reactos?rev=67187&view=rev Log: [FONTVIEW] fix a leak Modified: trunk/reactos/base/applications/fontview/fontview.c Modified: trunk/reactos/base/applications/fontview/fontview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/fontview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/fontview.c [iso-8859-1] Mon Apr 13 13:44:02 2015 @@ -145,6 +145,7 @@ } else { /* If the user decides to close out of the open dialog effectively exiting the program altogether */ + LocalFree(dialogTitle); return 0; }

1 0

[aandrejevic] 67186: [NTVDM] Initialize the list of hooks before the call to NtAllocateVirtualMemory, to prevent crashes in MemCleanup in case it fails.
by aandrejevic＠svn.reactos.org 13 Apr '15

13 Apr '15

Author: aandrejevic Date: Mon Apr 13 12:50:34 2015 New Revision: 67186 URL: http://svn.reactos.org/svn/reactos?rev=67186&view=rev Log: [NTVDM] Initialize the list of hooks before the call to NtAllocateVirtualMemory, to prevent crashes in MemCleanup in case it fails. Modified: trunk/reactos/subsystems/mvdm/ntvdm/memory.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/memo… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/memory.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/memory.c [iso-8859-1] Mon Apr 13 12:50:34 2015 @@ -583,6 +583,8 @@ NTSTATUS Status; SIZE_T MemorySize = MAX_ADDRESS; // See: kernel32/client/vdm.c!BaseGetVdmConfigInfo + InitializeListHead(&HookList); + #ifndef STANDALONE /* @@ -626,8 +628,6 @@ ASSERT(BaseAddress == NULL); #endif - InitializeListHead(&HookList); - /* * For diagnostics purposes, we fill the memory with INT 0x03 codes * so that if a program wants to execute random code in memory, we can

1 0

[cwittich] 67185: [CALC] only update the layout when necessary
by cwittich＠svn.reactos.org 13 Apr '15

13 Apr '15

Author: cwittich Date: Mon Apr 13 09:53:35 2015 New Revision: 67185 URL: http://svn.reactos.org/svn/reactos?rev=67185&view=rev Log: [CALC] only update the layout when necessary Modified: trunk/reactos/base/applications/calc/winmain.c Modified: trunk/reactos/base/applications/calc/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/win… ============================================================================== --- trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] Mon Apr 13 09:53:35 2015 @@ -1346,40 +1346,49 @@ #endif return TRUE; case IDM_VIEW_STANDARD: - calc.layout = CALC_LAYOUT_STANDARD; - calc.action = IDM_VIEW_STANDARD; - DestroyWindow(hWnd); - save_config(); - - CheckMenuRadioItem(GetMenu(hWnd), - IDM_VIEW_STANDARD, - IDM_VIEW_CONVERSION, - IDM_VIEW_STANDARD, - MF_BYCOMMAND); + if (calc.layout != CALC_LAYOUT_STANDARD) + { + calc.layout = CALC_LAYOUT_STANDARD; + calc.action = IDM_VIEW_STANDARD; + DestroyWindow(hWnd); + save_config(); + + CheckMenuRadioItem(GetMenu(hWnd), + IDM_VIEW_STANDARD, + IDM_VIEW_CONVERSION, + IDM_VIEW_STANDARD, + MF_BYCOMMAND); + } return TRUE; case IDM_VIEW_SCIENTIFIC: - calc.layout = CALC_LAYOUT_SCIENTIFIC; - calc.action = IDM_VIEW_SCIENTIFIC; - DestroyWindow(hWnd); - save_config(); - - CheckMenuRadioItem(GetMenu(hWnd), - IDM_VIEW_STANDARD, - IDM_VIEW_CONVERSION, - IDM_VIEW_SCIENTIFIC, - MF_BYCOMMAND); + if (calc.layout != CALC_LAYOUT_SCIENTIFIC) + { + calc.layout = CALC_LAYOUT_SCIENTIFIC; + calc.action = IDM_VIEW_SCIENTIFIC; + DestroyWindow(hWnd); + save_config(); + + CheckMenuRadioItem(GetMenu(hWnd), + IDM_VIEW_STANDARD, + IDM_VIEW_CONVERSION, + IDM_VIEW_SCIENTIFIC, + MF_BYCOMMAND); + } return TRUE; case IDM_VIEW_CONVERSION: - calc.layout = CALC_LAYOUT_CONVERSION; - calc.action = IDM_VIEW_CONVERSION; - DestroyWindow(hWnd); - save_config(); - - CheckMenuRadioItem(GetMenu(hWnd), - IDM_VIEW_STANDARD, - IDM_VIEW_CONVERSION, - IDM_VIEW_CONVERSION, - MF_BYCOMMAND); + if (calc.layout != CALC_LAYOUT_CONVERSION) + { + calc.layout = CALC_LAYOUT_CONVERSION; + calc.action = IDM_VIEW_CONVERSION; + DestroyWindow(hWnd); + save_config(); + + CheckMenuRadioItem(GetMenu(hWnd), + IDM_VIEW_STANDARD, + IDM_VIEW_CONVERSION, + IDM_VIEW_CONVERSION, + MF_BYCOMMAND); + } return TRUE; case IDM_VIEW_HEX: case IDM_VIEW_DEC:

1 0

[cwittich] 67184: [RAPPS] disable the call to FreeAvailableAppList until caching is fixes
by cwittich＠svn.reactos.org 13 Apr '15

13 Apr '15

Author: cwittich Date: Mon Apr 13 09:16:23 2015 New Revision: 67184 URL: http://svn.reactos.org/svn/reactos?rev=67184&view=rev Log: [RAPPS] disable the call to FreeAvailableAppList until caching is fixes Modified: trunk/reactos/base/applications/rapps/winmain.c Modified: trunk/reactos/base/applications/rapps/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/wi… ============================================================================== --- trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] Mon Apr 13 09:16:23 2015 @@ -202,8 +202,9 @@ if (IS_INSTALLED_ENUM(SelectedEnumType)) FreeInstalledAppList(); - else if (IS_AVAILABLE_ENUM(SelectedEnumType)) - FreeAvailableAppList(); + /* FIXME: reenable when caching is fixed */ + /* else if (IS_AVAILABLE_ENUM(SelectedEnumType)) + FreeAvailableAppList(); */ (VOID) ListView_DeleteAllItems(hListView);

1 0

[cwittich] 67183: [RAPPS] fix a big memory leak
by cwittich＠svn.reactos.org 13 Apr '15

13 Apr '15

Author: cwittich Date: Mon Apr 13 08:10:54 2015 New Revision: 67183 URL: http://svn.reactos.org/svn/reactos?rev=67183&view=rev Log: [RAPPS] fix a big memory leak Modified: trunk/reactos/base/applications/rapps/winmain.c Modified: trunk/reactos/base/applications/rapps/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/wi… ============================================================================== --- trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] Mon Apr 13 08:10:54 2015 @@ -198,6 +198,13 @@ SendMessage(hListView, WM_SETREDRAW, FALSE, 0); + if (EnumType == -1) EnumType = SelectedEnumType; + + if (IS_INSTALLED_ENUM(SelectedEnumType)) + FreeInstalledAppList(); + else if (IS_AVAILABLE_ENUM(SelectedEnumType)) + FreeAvailableAppList(); + (VOID) ListView_DeleteAllItems(hListView); /* Create image list */ @@ -215,13 +222,6 @@ ImageList_AddIcon(hImageListView, hIcon); DestroyIcon(hIcon); - - if (EnumType == -1) EnumType = SelectedEnumType; - - if (IS_INSTALLED_ENUM(SelectedEnumType)) - FreeInstalledAppList(); - else if (IS_AVAILABLE_ENUM(SelectedEnumType)) - FreeAvailableAppList(); if (IS_INSTALLED_ENUM(EnumType)) {

1 0

[ekohl] 67182: [NETAPI32] Disable some functions in wksta_new.c and re-enable their counterparts in wksta.c. For some reason I cannot get the wine dummy code working in the workstation service. Per...
by ekohl＠svn.reactos.org 12 Apr '15

12 Apr '15

Author: ekohl Date: Sun Apr 12 22:07:22 2015 New Revision: 67182 URL: http://svn.reactos.org/svn/reactos?rev=67182&view=rev Log: [NETAPI32] Disable some functions in wksta_new.c and re-enable their counterparts in wksta.c. For some reason I cannot get the wine dummy code working in the workstation service. Perhaps it is yet another RPC bug. CORE-9415 Modified: trunk/reactos/dll/win32/netapi32/wksta.c trunk/reactos/dll/win32/netapi32/wksta_new.c Modified: trunk/reactos/dll/win32/netapi32/wksta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/wksta.c… ============================================================================== --- trunk/reactos/dll/win32/netapi32/wksta.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/wksta.c [iso-8859-1] Sun Apr 12 22:07:22 2015 @@ -43,7 +43,6 @@ return ret && !strcmpiW( name, buf ); } -#if 0 static void wprint_mac(WCHAR* buffer, int len, const MIB_IFROW *ifRow) { int i; @@ -73,7 +72,6 @@ } buffer[2*i]=0; } -#endif /* Theoretically this could be too short, except that MS defines * MAX_ADAPTER_NAME as 128, and MAX_INTERFACE_NAME_LEN as 256, and both @@ -86,7 +84,6 @@ #define NBT_TRANSPORT_NAME_HEADER "\\Device\\NetBT_Tcpip_" #define UNKNOWN_TRANSPORT_NAME_HEADER "\\Device\\UnknownTransport_" -#if 0 static void wprint_name(WCHAR *buffer, int len, ULONG transport, PMIB_IFROW ifRow) { @@ -112,7 +109,6 @@ *ptr1 = *ptr2; *ptr1 = '\0'; } -#endif /*********************************************************************** * NetWkstaTransportEnum (NETAPI32.@) @@ -129,7 +125,6 @@ /**********************************************************************/ -#if 0 static BOOL WkstaEnumAdaptersCallback(UCHAR totalLANAs, UCHAR lanaIndex, ULONG transport, const NetBIOSAdapterImpl *data, void *closure) { @@ -219,11 +214,9 @@ ret = FALSE; return ret; } -#endif /**********************************************************************/ -#if 0 NET_API_STATUS WINAPI NetWkstaTransportEnum(LMSTR ServerName, DWORD level, PBYTE* pbuf, DWORD prefmaxlen, LPDWORD read_entries, @@ -278,13 +271,11 @@ } return ret; } -#endif /************************************************************ * NetWkstaUserGetInfo (NETAPI32.@) */ -#if 0 NET_API_STATUS WINAPI NetWkstaUserGetInfo(LMSTR reserved, DWORD level, PBYTE* bufptr) { @@ -422,12 +413,10 @@ } return NERR_Success; } -#endif /************************************************************ * NetWkstaUserEnum (NETAPI32.@) */ -#if 0 NET_API_STATUS WINAPI NetWkstaUserEnum(LMSTR servername, DWORD level, LPBYTE* bufptr, DWORD prefmaxlen, LPDWORD entriesread, @@ -437,7 +426,6 @@ level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle); return ERROR_INVALID_PARAMETER; } -#endif /************************************************************ * NetpGetComputerName (NETAPI32.@) @@ -476,7 +464,6 @@ return ERROR_INVALID_PARAMETER; } -#if 0 NET_API_STATUS WINAPI NetWkstaGetInfo( LMSTR servername, DWORD level, LPBYTE* bufptr) { @@ -579,4 +566,3 @@ return NERR_Success; } -#endif Modified: trunk/reactos/dll/win32/netapi32/wksta_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/wksta_n… ============================================================================== --- trunk/reactos/dll/win32/netapi32/wksta_new.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/wksta_new.c [iso-8859-1] Sun Apr 12 22:07:22 2015 @@ -138,6 +138,7 @@ } +#if 0 NET_API_STATUS NET_API_FUNCTION NetGetJoinInformation( @@ -167,6 +168,7 @@ return status; } +#endif NET_API_STATUS @@ -342,6 +344,7 @@ } +#if 0 NET_API_STATUS WINAPI NetWkstaGetInfo( @@ -354,6 +357,9 @@ TRACE("NetWkstaGetInfo(%s, %d, %p)\n", debugstr_w(servername), level, bufptr); + if (bufptr == NULL) + return ERROR_INVALID_PARAMETER; + *bufptr = NULL; RpcTryExcept @@ -370,6 +376,7 @@ return status; } +#endif NET_API_STATUS @@ -460,6 +467,7 @@ } +#if 0 NET_API_STATUS WINAPI NetWkstaTransportEnum( @@ -621,6 +629,7 @@ return status; } +#endif NET_API_STATUS

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