Ros-diffs May 2016

ros-diffs@reactos.org

18 participants
260 discussions

[hbelusca] 71359: [SDK/INCLUDE]: Fix a typo in ntstatus.mc (Debuger --> Debugger).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu May 19 22:18:11 2016 New Revision: 71359 URL: http://svn.reactos.org/svn/reactos?rev=71359&view=rev Log: [SDK/INCLUDE]: Fix a typo in ntstatus.mc (Debuger --> Debugger). Modified: trunk/reactos/sdk/include/reactos/mc/ntstatus.mc Modified: trunk/reactos/sdk/include/reactos/mc/ntstatus.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/mc/nts… ============================================================================== --- trunk/reactos/sdk/include/reactos/mc/ntstatus.mc [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/mc/ntstatus.mc [iso-8859-1] Thu May 19 22:18:11 2016 @@ -6,7 +6,7 @@ ) FacilityNames=(System=0x0 -Debuger=0x1:FACILITY_DEBUGGER +Debugger=0x1:FACILITY_DEBUGGER RpcRuntime=0x2:FACILITY_RPC_RUNTIME RpcStubs=0x3:FACILITY_RPC_STUBS Io=0x4:FACILITY_IO_ERROR_CODE @@ -305,7 +305,7 @@ MessageId=0x1 Severity=Success -Facility=Debuger +Facility=Debugger SymbolicName=DBG_EXCEPTION_HANDLED Language=English Debugger handled exception @@ -313,7 +313,7 @@ MessageId=0x2 Severity=Success -Facility=Debuger +Facility=Debugger SymbolicName=DBG_CONTINUE Language=English Debugger continued @@ -665,7 +665,7 @@ MessageId=0x1 Severity=Informational -Facility=Debuger +Facility=Debugger SymbolicName=DBG_REPLY_LATER Language=English Debugger will reply later. @@ -673,7 +673,7 @@ MessageId=0x2 Severity=Informational -Facility=Debuger +Facility=Debugger SymbolicName=DBG_UNABLE_TO_PROVIDE_HANDLE Language=English Debugger can not provide handle. @@ -681,7 +681,7 @@ MessageId=0x3 Severity=Informational -Facility=Debuger +Facility=Debugger SymbolicName=DBG_TERMINATE_THREAD Language=English Debugger terminated thread. @@ -689,7 +689,7 @@ MessageId=0x4 Severity=Informational -Facility=Debuger +Facility=Debugger SymbolicName=DBG_TERMINATE_PROCESS Language=English Debugger terminated process. @@ -697,7 +697,7 @@ MessageId=0x5 Severity=Informational -Facility=Debuger +Facility=Debugger SymbolicName=DBG_CONTROL_C Language=English Debugger got control C. @@ -705,7 +705,7 @@ MessageId=0x6 Severity=Informational -Facility=Debuger +Facility=Debugger SymbolicName=DBG_PRINTEXCEPTION_C Language=English Debugger printed exception on control C. @@ -713,7 +713,7 @@ MessageId=0x7 Severity=Informational -Facility=Debuger +Facility=Debugger SymbolicName=DBG_RIPEXCEPTION Language=English Debugger received RIP exception. @@ -721,7 +721,7 @@ MessageId=0x8 Severity=Informational -Facility=Debuger +Facility=Debugger SymbolicName=DBG_CONTROL_BREAK Language=English Debugger received control break. @@ -729,7 +729,7 @@ MessageId=0x9 Severity=Informational -Facility=Debuger +Facility=Debugger SymbolicName=DBG_COMMAND_EXCEPTION Language=English Debugger command communication exception. @@ -1010,7 +1010,7 @@ MessageId=0x1 Severity=Warning -Facility=Debuger +Facility=Debugger SymbolicName=DBG_EXCEPTION_NOT_HANDLED Language=English Debugger did not handle the exception. @@ -4621,7 +4621,7 @@ MessageId=0x1 Severity=Error -Facility=Debuger +Facility=Debugger SymbolicName=DBG_NO_STATE_CHANGE Language=English Debugger did not perform a state change. @@ -4629,7 +4629,7 @@ MessageId=0x2 Severity=Error -Facility=Debuger +Facility=Debugger SymbolicName=DBG_APP_NOT_IDLE Language=English Debugger has found the application is not idle.

8 years, 7 months

[hbelusca] 71358: [SDK/INCLUDE]: Fix ntstatus.mc: extra end-line whitespace and erroneous newlines at the end of the messages.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu May 19 21:22:41 2016 New Revision: 71358 URL: http://svn.reactos.org/svn/reactos?rev=71358&view=rev Log: [SDK/INCLUDE]: Fix ntstatus.mc: extra end-line whitespace and erroneous newlines at the end of the messages. Modified: trunk/reactos/sdk/include/reactos/mc/ntstatus.mc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/sdk/include/reactos/mc/ntstatus.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/mc/nts…

8 years, 7 months

[tfaber] 71357: [AFD] - Don't overwrite values in a completed IRP in ReceiveActivity CORE-11276 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu May 19 21:17:18 2016 New Revision: 71357 URL: http://svn.reactos.org/svn/reactos?rev=71357&view=rev Log: [AFD] - Don't overwrite values in a completed IRP in ReceiveActivity CORE-11276 #resolve Modified: trunk/reactos/drivers/network/afd/afd/read.c Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Thu May 19 21:17:18 2016 @@ -153,7 +153,7 @@ PIRP NextIrp; PIO_STACK_LOCATION NextIrpSp; PAFD_RECV_INFO RecvReq; - UINT TotalBytesCopied = 0, RetBytesCopied = 0; + UINT TotalBytesCopied = 0; NTSTATUS Status = STATUS_SUCCESS, RetStatus = STATUS_PENDING; AFD_DbgPrint(MID_TRACE,("%p %p\n", FCB, Irp)); @@ -227,7 +227,6 @@ NextIrp->IoStatus.Information = TotalBytesCopied; if( NextIrp == Irp ) { RetStatus = Status; - RetBytesCopied = TotalBytesCopied; } if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); (void)IoSetCancelRoutine(NextIrp, NULL); @@ -263,12 +262,6 @@ } AFD_DbgPrint(MID_TRACE,("RetStatus for irp %p is %x\n", Irp, RetStatus)); - - /* Sometimes we're called with a NULL Irp */ - if( Irp ) { - Irp->IoStatus.Status = RetStatus; - Irp->IoStatus.Information = RetBytesCopied; - } return RetStatus; }

8 years, 7 months

[ekohl] 71356: [NETSHELL] - Provide a common struct for the network setup data. - Remember the typical/custom setup decision in order to return to the proper previous page when we click the 'Back' ...

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu May 19 13:42:37 2016 New Revision: 71356 URL: http://svn.reactos.org/svn/reactos?rev=71356&view=rev Log: [NETSHELL] - Provide a common struct for the network setup data. - Remember the typical/custom setup decision in order to return to the proper previous page when we click the 'Back' button on the domain page. - Rename network setup page functions in a consistent way. CORE-10955 Modified: trunk/reactos/dll/shellext/netshell/setup.cpp Modified: trunk/reactos/dll/shellext/netshell/setup.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/setu… ============================================================================== --- trunk/reactos/dll/shellext/netshell/setup.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/setup.cpp [iso-8859-1] Thu May 19 13:42:37 2016 @@ -1,6 +1,19 @@ #include "precomp.h" #include <syssetup/syssetup.h> + + +#define NETWORK_SETUP_MAGIC 0x50515253 + +typedef struct _NETWORKSETUPDATA +{ + DWORD dwMagic; + BOOL bTypicalNetworkSetup; + + + PSETUPDATA pSetupData; +} NETWORKSETUPDATA, *PNETWORKSETUPDATA; + extern "C" { @@ -24,33 +37,39 @@ WPARAM wParam, LPARAM lParam) { - PSETUPDATA SetupData; + PNETWORKSETUPDATA pNetworkSetupData; + PSETUPDATA pSetupData; LPNMHDR lpnm; /* Retrieve pointer to the global setup data */ - SetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + pNetworkSetupData = (PNETWORKSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + if ((pNetworkSetupData != NULL) && + (pNetworkSetupData->dwMagic == NETWORK_SETUP_MAGIC)) + pSetupData = pNetworkSetupData->pSetupData; switch (uMsg) { case WM_INITDIALOG: /* Save pointer to the global setup data */ - SetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)SetupData); + pNetworkSetupData = (PNETWORKSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pNetworkSetupData); + pSetupData = pNetworkSetupData->pSetupData; /* Set the fonts of both the options to bold */ - SetBoldText(hwndDlg, IDC_NETWORK_TYPICAL, SetupData); - SetBoldText(hwndDlg, IDC_NETWORK_CUSTOM, SetupData); + SetBoldText(hwndDlg, IDC_NETWORK_TYPICAL, pSetupData); + SetBoldText(hwndDlg, IDC_NETWORK_CUSTOM, pSetupData); /* Set the typical settings option as the default */ SendDlgItemMessage(hwndDlg, IDC_NETWORK_TYPICAL, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); - if (SetupData->UnattendSetup) + if (pSetupData->UnattendSetup) { //... } break; case WM_DESTROY: + /* ATTENTION: Free pNetworkSetupData only in one of the page functions!!! */ //... break; @@ -62,7 +81,7 @@ case PSN_SETACTIVE: /* Enable the Back and Next buttons */ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); - if (SetupData->UnattendSetup) + if (pSetupData->UnattendSetup) { SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_NETWORKCOMPONENTPAGE); return TRUE; @@ -70,16 +89,19 @@ break; case PSN_WIZNEXT: + pNetworkSetupData->bTypicalNetworkSetup = FALSE; + /* If the Typical Settings button is chosen, then skip to the Domain Page */ if (IsDlgButtonChecked(hwndDlg, IDC_NETWORK_TYPICAL) == BST_CHECKED) { + pNetworkSetupData->bTypicalNetworkSetup = TRUE; SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_NETWORKDOMAINPAGE); return TRUE; } break; case PSN_WIZBACK: - SetupData->UnattendSetup = FALSE; + pSetupData->UnattendSetup = FALSE; break; } break; @@ -94,34 +116,40 @@ static INT_PTR CALLBACK -NetworkPageDlgProc( +NetworkComponentPageDlgProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { - PSETUPDATA SetupData; + PNETWORKSETUPDATA pNetworkSetupData; + PSETUPDATA pSetupData; LPNMHDR lpnm; /* Retrieve pointer to the global setup data */ - SetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + pNetworkSetupData = (PNETWORKSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + if ((pNetworkSetupData != NULL) && + (pNetworkSetupData->dwMagic == NETWORK_SETUP_MAGIC)) + pSetupData = pNetworkSetupData->pSetupData; switch (uMsg) { case WM_INITDIALOG: /* Save pointer to the global setup data */ - SetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)SetupData); - - SetBoldText(hwndDlg, IDC_NETWORK_DEVICE, SetupData); - - if (SetupData->UnattendSetup) + pNetworkSetupData = (PNETWORKSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pNetworkSetupData); + pSetupData = pNetworkSetupData->pSetupData; + + SetBoldText(hwndDlg, IDC_NETWORK_DEVICE, pSetupData); + + if (pSetupData->UnattendSetup) { //... } break; case WM_DESTROY: + /* ATTENTION: Free pNetworkSetupData only in one of the page functions!!! */ //... break; @@ -133,7 +161,7 @@ case PSN_SETACTIVE: /* Enable the Back and Next buttons */ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); - if (SetupData->UnattendSetup) + if (pSetupData->UnattendSetup) { SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_NETWORKDOMAINPAGE); return TRUE; @@ -141,7 +169,7 @@ break; case PSN_WIZBACK: - SetupData->UnattendSetup = FALSE; + pSetupData->UnattendSetup = FALSE; break; } break; @@ -156,27 +184,32 @@ static INT_PTR CALLBACK -DomainPageDlgProc( +NetworkDomainPageDlgProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { + PNETWORKSETUPDATA pNetworkSetupData; + PSETUPDATA pSetupData; WCHAR DomainName[51]; WCHAR Title[64]; WCHAR ErrorName[256]; LPNMHDR lpnm; - PSETUPDATA SetupData; /* Retrieve pointer to the global setup data */ - SetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + pNetworkSetupData = (PNETWORKSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + if ((pNetworkSetupData != NULL) && + (pNetworkSetupData->dwMagic == NETWORK_SETUP_MAGIC)) + pSetupData = pNetworkSetupData->pSetupData; switch (uMsg) { case WM_INITDIALOG: /* Save pointer to the global setup data */ - SetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)SetupData); + pNetworkSetupData = (PNETWORKSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pNetworkSetupData); + pSetupData = pNetworkSetupData->pSetupData; /* Set the workgroup option as the default */ SendDlgItemMessage(hwndDlg, IDC_SELECT_WORKGROUP, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); @@ -189,7 +222,7 @@ /* Set focus to owner name */ SetFocus(GetDlgItem(hwndDlg, IDC_DOMAIN_NAME)); - if (SetupData->UnattendSetup) + if (pSetupData->UnattendSetup) { //... } @@ -197,6 +230,15 @@ case WM_DESTROY: //... + /* ATTENTION: Free pNetworkSetupData only in one of the page functions!!! */ + if (pNetworkSetupData != NULL) + { + if ((!IsBadReadPtr(pNetworkSetupData, sizeof(NETWORKSETUPDATA))) && + (pNetworkSetupData->dwMagic == NETWORK_SETUP_MAGIC)) + HeapFree(GetProcessHeap(), 0, pNetworkSetupData); + + SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)NULL); + } break; case WM_NOTIFY: @@ -207,9 +249,9 @@ case PSN_SETACTIVE: /* Enable the Back and Next buttons */ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); - if (SetupData->UnattendSetup) - { - SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, SetupData->uPostNetworkWizardPage); + if (pSetupData->UnattendSetup) + { + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, pSetupData->uPostNetworkWizardPage); return TRUE; } break; @@ -238,7 +280,14 @@ break; case PSN_WIZBACK: - SetupData->UnattendSetup = FALSE; + pSetupData->UnattendSetup = FALSE; + + /* If the Typical setup chosen, then skip back to the Settings Page */ + if (pNetworkSetupData->bTypicalNetworkSetup == TRUE) + { + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_NETWORKSETTINGSPAGE); + return TRUE; + } break; } break; @@ -258,6 +307,7 @@ HPROPSHEETPAGE *pPages, PSETUPDATA pSetupData) { + PNETWORKSETUPDATA pNetworkSetupData; PROPSHEETPAGE psp = {0}; DWORD dwPageCount = 3; INT nPage = 0; @@ -276,10 +326,18 @@ pSetupData->uFirstNetworkWizardPage = IDD_NETWORKSETTINGSPAGE; + pNetworkSetupData = (PNETWORKSETUPDATA)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(NETWORKSETUPDATA)); + if (pNetworkSetupData == NULL) + return ERROR_OUTOFMEMORY; + + pNetworkSetupData->dwMagic = NETWORK_SETUP_MAGIC; + pNetworkSetupData->pSetupData = pSetupData; + + /* Create the Network Settings page */ psp.dwSize = sizeof(PROPSHEETPAGE); psp.hInstance = netshell_hInstance; - psp.lParam = (LPARAM)pSetupData; + psp.lParam = (LPARAM)pNetworkSetupData; psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_NETWORKSETTINGSTITLE); @@ -292,7 +350,7 @@ psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_NETWORKCOMPONENTTITLE); psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_NETWORKCOMPONENTSUBTITLE); - psp.pfnDlgProc = NetworkPageDlgProc; + psp.pfnDlgProc = NetworkComponentPageDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_NETWORKCOMPONENTPAGE); pPages[nPage++] = CreatePropertySheetPage(&psp); @@ -300,7 +358,7 @@ psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_NETWORKDOMAINTITLE); psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_NETWORKDOMAINSUBTITLE); - psp.pfnDlgProc = DomainPageDlgProc; + psp.pfnDlgProc = NetworkDomainPageDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_NETWORKDOMAINPAGE); pPages[nPage++] = CreatePropertySheetPage(&psp);

8 years, 7 months

[tfaber] 71355: [SERVICES] - On service stop, set Service->lpImage to NULL after calling ScmDereferenceServiceImage, so the same image is not dereferenced again on service deletion - Do not call Sc...

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu May 19 13:01:04 2016 New Revision: 71355 URL: http://svn.reactos.org/svn/reactos?rev=71355&view=rev Log: [SERVICES] - On service stop, set Service->lpImage to NULL after calling ScmDereferenceServiceImage, so the same image is not dereferenced again on service deletion - Do not call ScmDereferenceServiceImage in CreateServiceListEntry, as the service should never have an image there CORE-11273 #resolve Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Thu May 19 13:01:04 2016 @@ -566,8 +566,7 @@ if (lpService != NULL) { - if (lpService->lpImage != NULL) - ScmDereferenceServiceImage(lpService->lpImage); + ASSERT(lpService->lpImage == NULL); } return dwError; @@ -1085,6 +1084,7 @@ dwControl == SERVICE_CONTROL_STOP) { ScmDereferenceServiceImage(Service->lpImage); + Service->lpImage = NULL; } LeaveCriticalSection(&ControlServiceCriticalSection);

8 years, 7 months

[tfaber] 71354: [ACPI] - Correctly double-null-terminate hardware IDs CORE-11271 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu May 19 10:15:15 2016 New Revision: 71354 URL: http://svn.reactos.org/svn/reactos?rev=71354&view=rev Log: [ACPI] - Correctly double-null-terminate hardware IDs CORE-11271 #resolve Modified: trunk/reactos/drivers/bus/acpi/acpienum.c Modified: trunk/reactos/drivers/bus/acpi/acpienum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpienum.… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpienum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpienum.c [iso-8859-1] Thu May 19 10:15:15 2016 @@ -29,7 +29,7 @@ NTSTATUS status; ULONG index; WCHAR temp[256]; - PLIST_ENTRY entry; + PLIST_ENTRY entry; PAGED_CODE (); @@ -110,13 +110,13 @@ index += swprintf(&temp[index], L"ACPI\\%hs", Device->pnp.hardware_id); - index++; + temp[index++] = UNICODE_NULL; index += swprintf(&temp[index], L"*%hs", Device->pnp.hardware_id); - index++; - temp[++index] = UNICODE_NULL; + temp[index++] = UNICODE_NULL; + temp[index++] = UNICODE_NULL; pdoData->HardwareIDs = ExAllocatePoolWithTag(NonPagedPool, index*sizeof(WCHAR), 'DpcA');

8 years, 7 months

[hbelusca] 71353: [NETSHELL] Addendum to r71348: Fix MSVC build: "netshell\lang/de-DE.rc(87) : warning RC2182 : duplicate dialog control ID 3501" . Both IDC_NETWORK_TYPICAL and IDC_NETWORK_CUSTOM s...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed May 18 21:49:31 2016 New Revision: 71353 URL: http://svn.reactos.org/svn/reactos?rev=71353&view=rev Log: [NETSHELL] Addendum to r71348: Fix MSVC build: "netshell\lang/de-DE.rc(87) : warning RC2182 : duplicate dialog control ID 3501" . Both IDC_NETWORK_TYPICAL and IDC_NETWORK_CUSTOM setup wizard pages had this same ID. Obviously, GCC didn't catch this error. But the generated code would not have worked as expected. CORE-10955 #comment [~milawynsrealm], please retest with r71353. Modified: trunk/reactos/dll/shellext/netshell/resource.h Modified: trunk/reactos/dll/shellext/netshell/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/reso… ============================================================================== --- trunk/reactos/dll/shellext/netshell/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/resource.h [iso-8859-1] Wed May 18 21:49:31 2016 @@ -54,7 +54,7 @@ /* Network setup wizard pages */ #define IDD_NETWORKSETTINGSPAGE 3500 #define IDC_NETWORK_TYPICAL 3501 -#define IDC_NETWORK_CUSTOM 3501 +#define IDC_NETWORK_CUSTOM 3502 #define IDD_NETWORKCOMPONENTPAGE 3600 #define IDC_COMPONENT_LIST 3601

8 years, 7 months

[cfinck] 71352: Test commit to fix the nightmare caused by "previous" r71352. See https://reactos.org/archives/public/ros-dev/2016-May/017845.html

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed May 18 17:01:01 2016 New Revision: 71352 URL: http://svn.reactos.org/svn/reactos?rev=71352&view=rev Log: Test commit to fix the nightmare caused by "previous" r71352. See https://reactos.org/archives/public/ros-dev/2016-May/017845.html Modified: trunk/reactos/configure.cmd Modified: trunk/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=71352&r1… ============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Wed May 18 17:01:01 2016 @@ -26,7 +26,7 @@ REM This launches %VSINSTALLDIR%VS\vcvarsall.bat call %2 x86 - REM Configure host tools for x86 + REM Configure host tools for x86. cmake -G %3 -DARCH:STRING=i386 %~dp0 exit )

8 years, 7 months

[hbelusca] 71352: Branch '/trunk' replaced from /trunk:71349

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed May 18 15:16:54 2016 New Revision: 71352 URL: http://svn.reactos.org/svn/reactos?rev=71352&view=rev Log: Branch '/trunk' replaced from /trunk:71349 Added: trunk/ (props changed) - copied from r71349, trunk/

8 years, 7 months

[rnaumann] 71351: [SHELL32] Addendum to r71343: Remove some unneeded checks. The handles are initialized as NULL so they will never be true

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Wed May 18 10:12:13 2016 New Revision: 71351 URL: http://svn.reactos.org/svn/reactos?rev=71351&view=rev Log: [SHELL32] Addendum to r71343: Remove some unneeded checks. The handles are initialized as NULL so they will never be true Modified: trunk/reactos/dll/win32/shell32/dialogs/folder_options.cpp Modified: trunk/reactos/dll/win32/shell32/dialogs/folder_options.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/folder_options.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/folder_options.cpp [iso-8859-1] Wed May 18 10:12:13 2016 @@ -99,11 +99,6 @@ if (lpTaskIconName) { - if (hTaskIcon) - { - DeleteObject(hTaskIcon); - } - hTaskIcon = (HICON)LoadImage(shell32_hInstance, lpTaskIconName, IMAGE_ICON, @@ -132,11 +127,6 @@ if (lpFolderIconName) { - if (hFolderIcon) - { - DeleteObject(hFolderIcon); - } - hFolderIcon = (HICON)LoadImage(shell32_hInstance, lpFolderIconName, IMAGE_ICON, @@ -165,11 +155,6 @@ if (lpClickIconName) { - if (hClickIcon) - { - DeleteObject(hClickIcon); - } - hClickIcon = (HICON)LoadImage(shell32_hInstance, lpClickIconName, IMAGE_ICON,

8 years, 7 months

← Newer
1
...
10
11
12
13
14
15
16
...
26
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 May 2016