Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[gschneider] 42936: - The browser view's document doesn't always exist (bug #4816) - Suppress website script errors

by gschneider＠svn.reactos.org

Author: gschneider Date: Wed Aug 26 15:17:02 2009 New Revision: 42936 URL: http://svn.reactos.org/svn/reactos?rev=42936&view=rev Log: - The browser view's document doesn't always exist (bug #4816) - Suppress website script errors Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.cs [iso-8859-1] Wed Aug 26 15:17:02 2009 @@ -19,7 +19,8 @@ InitializeComponent(); BrowserView.CanGoBackChanged += BrowserView_CanGoBackChanged; BrowserView.CanGoForwardChanged += BrowserView_CanGoForwardChanged; - BrowserView.GoHome(); + BrowserView.GoHome(); + BrowserView.ScriptErrorsSuppressed = true; } public ReactOSWeb(string Title, string URL) @@ -28,7 +29,8 @@ this.Text = Title; BrowserView.CanGoBackChanged += BrowserView_CanGoBackChanged; BrowserView.CanGoForwardChanged += BrowserView_CanGoForwardChanged; - BrowserView.Navigate(URL); + BrowserView.Navigate(URL); + BrowserView.ScriptErrorsSuppressed = true; } private void BrowserView_Navigating(object sender, WebBrowserNavigatingEventArgs e) @@ -85,9 +87,12 @@ private bool pIsCmdEnabled(string Cmd) { - IHTMLDocument2 doc2 = BrowserView.Document.DomDocument as IHTMLDocument2; - if (doc2 != null) - return doc2.queryCommandEnabled(Cmd); + if (BrowserView.Document != null) + { + IHTMLDocument2 doc2 = (mshtml.IHTMLDocument2)BrowserView.Document.DomDocument; + if (doc2 != null) + return doc2.queryCommandEnabled(Cmd); + } return false; } @@ -107,14 +112,20 @@ private void copyToolStripMenuItem_Click(object sender, EventArgs e) { - IHTMLDocument2 htmlDocument = (mshtml.IHTMLDocument2)BrowserView.Document.DomDocument; - htmlDocument.execCommand("copy", true, null); + if (BrowserView.Document != null) + { + IHTMLDocument2 htmlDocument = (mshtml.IHTMLDocument2)BrowserView.Document.DomDocument; + htmlDocument.execCommand("copy", true, null); + } } private void selectAllToolStripMenuItem_Click(object sender, EventArgs e) { - IHTMLDocument2 htmlDocument = (mshtml.IHTMLDocument2)BrowserView.Document.DomDocument; - htmlDocument.execCommand("selectall", true, null); + if (BrowserView.Document != null) + { + IHTMLDocument2 htmlDocument = (mshtml.IHTMLDocument2)BrowserView.Document.DomDocument; + htmlDocument.execCommand("selectall", true, null); + } } private void editToolStripMenuItem_Click(object sender, EventArgs e) @@ -129,8 +140,11 @@ public override void SaveAs(string FileName) { - IHTMLDocument2 htmlDocument = (mshtml.IHTMLDocument2)BrowserView.Document.DomDocument; - htmlDocument.execCommand("saveas", true, FileName); + if (BrowserView.Document != null) + { + IHTMLDocument2 htmlDocument = (mshtml.IHTMLDocument2)BrowserView.Document.DomDocument; + htmlDocument.execCommand("saveas", true, FileName); + } } public override string GetDocumentName() @@ -140,9 +154,11 @@ public override void Print(bool ShowDialog) { - IHTMLDocument2 htmlDocument = (mshtml.IHTMLDocument2)BrowserView.Document.DomDocument; - htmlDocument.execCommand("print", ShowDialog, null); + if (BrowserView.Document != null) + { + IHTMLDocument2 htmlDocument = (mshtml.IHTMLDocument2)BrowserView.Document.DomDocument; + htmlDocument.execCommand("print", ShowDialog, null); + } } - } } Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Wed Aug 26 15:17:02 2009 @@ -39,5 +39,5 @@ // will be increased as well. MSI installers must not be generated with the same Build Number // otherwise they won't upgrade the old installation! -[assembly: AssemblyVersion("1.0.2.73")] -[assembly: AssemblyFileVersion("1.0.2.73")] +[assembly: AssemblyVersion("1.0.2.74")] +[assembly: AssemblyFileVersion("1.0.2.74")]

15 years, 4 months

[fireball] 42935: - Own the bitmap before freeing it, fixes a crash when trying to free a global bitmap. - Don't free NULL pointers.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Aug 26 12:56:11 2009 New Revision: 42935 URL: http://svn.reactos.org/svn/reactos?rev=42935&view=rev Log: - Own the bitmap before freeing it, fixes a crash when trying to free a global bitmap. - Don't free NULL pointers. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c [iso-8859-1] Wed Aug 26 12:56:11 2009 @@ -226,6 +226,10 @@ VOID FASTCALL GreDeleteBitmap(HGDIOBJ hBitmap) { + /* Get ownership */ + GDIOBJ_SetOwnership(hBitmap, PsGetCurrentProcess()); + + /* Free it */ GDIOBJ_FreeObjByHandle(hBitmap, GDI_OBJECT_TYPE_BITMAP); } Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c [iso-8859-1] Wed Aug 26 12:56:11 2009 @@ -145,7 +145,7 @@ static void free_hook( struct hook *hook ) { free_user_handle( hook->handle ); - ExFreePool( hook->module ); + if (hook->module) ExFreePool( hook->module ); if (hook->thread) { assert( hook->thread->desktop_users > 0 ); Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c [iso-8859-1] Wed Aug 26 12:56:11 2009 @@ -1701,7 +1701,7 @@ if (win->win_region) free_region( win->win_region ); if (win->update_region) free_region( win->update_region ); if (win->class) release_class( win->class ); - ExFreePool( win->text ); + if (win->text) ExFreePool( win->text ); memset( win, 0x55, sizeof(*win) + win->nb_extra_bytes - 1 ); ExFreePool( win ); } @@ -1993,7 +1993,7 @@ reply->count = array.count; len = min( get_reply_max_size((void*)req), array.count * sizeof(user_handle_t) ); if (len) set_reply_data_ptr( (void*)req, array.handles, len ); - else ExFreePool( array.handles ); + else if (array.handles) ExFreePool( array.handles ); }

15 years, 4 months

[jimtabor] 42934: - Fix a crash in SetMenuInfo.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Aug 26 03:07:32 2009 New Revision: 42934 URL: http://svn.reactos.org/svn/reactos?rev=42934&view=rev Log: - Fix a crash in SetMenuInfo. Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Wed Aug 26 03:07:32 2009 @@ -4993,8 +4993,12 @@ { ROSMENUINFO mi; BOOL res = FALSE; - if(lpcmi->cbSize != sizeof(MENUINFO)) + + if (!lpcmi || (lpcmi->cbSize != sizeof(MENUINFO))) + { + SetLastError(ERROR_INVALID_PARAMETER); return res; + } memcpy(&mi, lpcmi, sizeof(MENUINFO)); return NtUserMenuInfo(hmenu, &mi, TRUE);

15 years, 4 months

[dchapyshev] 42933: - Use iswspace instead isspace. Patch by Alexander Yastrebov (menone7[at]gmail[dot]com)

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue Aug 25 11:45:07 2009 New Revision: 42933 URL: http://svn.reactos.org/svn/reactos?rev=42933&view=rev Log: - Use iswspace instead isspace. Patch by Alexander Yastrebov (menone7[at]gmail[dot]com) Modified: trunk/reactos/base/applications/rapps/parser.c Modified: trunk/reactos/base/applications/rapps/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/pa… ============================================================================== --- trunk/reactos/base/applications/rapps/parser.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/parser.c [iso-8859-1] Tue Aug 25 11:45:07 2009 @@ -56,7 +56,7 @@ static ITEMS *ItemsArray[N_CACHED_ITEMS] = {NULL}; #define CurProfile (ItemsArray[0]) #define IS_ENTRY_COMMENT(str) ((str)[0] == ';') -#define ParserIsSpace(c) (isspace(c) || c == 0x1a) +#define ParserIsSpace(c) (iswspace(c) || c == 0x1a) static

15 years, 4 months

[gschneider] 42932: chklib: print function pointer as a pointer, gcc 4.4 warning

by gschneider＠svn.reactos.org

Author: gschneider Date: Tue Aug 25 02:31:45 2009 New Revision: 42932 URL: http://svn.reactos.org/svn/reactos?rev=42932&view=rev Log: chklib: print function pointer as a pointer, gcc 4.4 warning Modified: trunk/rosapps/applications/sysutils/chklib/chklib.c Modified: trunk/rosapps/applications/sysutils/chklib/chklib.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/chkl… ============================================================================== --- trunk/rosapps/applications/sysutils/chklib/chklib.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/chklib/chklib.c [iso-8859-1] Tue Aug 25 02:31:45 2009 @@ -117,7 +117,7 @@ return; } printf( - "%08X %s\n", + "0x%p %s\n", EntryPoint, SymbolName );

15 years, 4 months

[gschneider] 42931: tftpd: add parenthesis around AND statements embedded in OR statements, use const char* for string constants (gcc 4.4 warnings)

by gschneider＠svn.reactos.org

Author: gschneider Date: Tue Aug 25 02:13:15 2009 New Revision: 42931 URL: http://svn.reactos.org/svn/reactos?rev=42931&view=rev Log: tftpd: add parenthesis around AND statements embedded in OR statements, use const char* for string constants (gcc 4.4 warnings) Modified: trunk/reactos/base/services/tftpd/tftpd.cpp trunk/reactos/base/services/tftpd/tftpd.h Modified: trunk/reactos/base/services/tftpd/tftpd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tftpd/tftpd.… ============================================================================== --- trunk/reactos/base/services/tftpd/tftpd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/services/tftpd/tftpd.cpp [iso-8859-1] Tue Aug 25 02:13:15 2009 @@ -1568,7 +1568,7 @@ //printf("%s %s\n", name, value); } -bool getSection(char *sectionName, char *buffer, BYTE serial, char *fileName) +bool getSection(const char *sectionName, char *buffer, BYTE serial, char *fileName) { //printf("%s=%s\n",fileName,sectionName); char section[128]; @@ -1598,7 +1598,7 @@ if (strstr(buff, "[") == buff) break; - if ((*buff) >= '0' && (*buff) <= '9' || (*buff) >= 'A' && (*buff) <= 'Z' || (*buff) >= 'a' && (*buff) <= 'z' || ((*buff) && strchr("/\\?*", (*buff)))) + if (((*buff) >= '0' && (*buff) <= '9') || ((*buff) >= 'A' && (*buff) <= 'Z') || ((*buff) >= 'a' && (*buff) <= 'z') || (((*buff) && strchr("/\\?*", (*buff))))) { buffer += sprintf(buffer, "%s", buff); buffer++; Modified: trunk/reactos/base/services/tftpd/tftpd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tftpd/tftpd.… ============================================================================== --- trunk/reactos/base/services/tftpd/tftpd.h [iso-8859-1] (original) +++ trunk/reactos/base/services/tftpd/tftpd.h [iso-8859-1] Tue Aug 25 02:13:15 2009 @@ -151,7 +151,7 @@ char* myGetToken(char*, BYTE); void init(); bool cleanReq(request*); -bool getSection(char*, char*, BYTE, char*); +bool getSection(const char*, char*, BYTE, char*); bool isIP(char*s); char* myLower(char*); char* myUpper(char*);

15 years, 4 months

[gschneider] 42930: systeminfo: use strcmp to compare strings, gcc 4.4 warning

by gschneider＠svn.reactos.org

Author: gschneider Date: Tue Aug 25 01:48:57 2009 New Revision: 42930 URL: http://svn.reactos.org/svn/reactos?rev=42930&view=rev Log: systeminfo: use strcmp to compare strings, gcc 4.4 warning Modified: trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c Modified: trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c [iso-8859-1] Tue Aug 25 01:48:57 2009 @@ -356,9 +356,9 @@ /* Main program */ int -main(int argc,char *argv[]) -{ - if (argc > 1 && argv[1] == "/?") +main(int argc, char *argv[]) +{ + if (argc > 1 && !strcmp(argv[1], "/?")) { Usage(); return 0;

15 years, 4 months

[sginsberg] 42929: - Make use of _SEH2_YIELD in Mm

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Mon Aug 24 22:39:23 2009 New Revision: 42929 URL: http://svn.reactos.org/svn/reactos?rev=42929&view=rev Log: - Make use of _SEH2_YIELD in Mm Modified: trunk/reactos/ntoskrnl/mm/anonmem.c trunk/reactos/ntoskrnl/mm/pagefile.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/mm/virtual.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Mon Aug 24 22:39:23 2009 @@ -659,9 +659,8 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Get the exception code */ - Status = _SEH2_GetExceptionCode(); - _SEH2_YIELD(return Status); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; @@ -949,7 +948,7 @@ */ { MEMORY_AREA* MemoryArea; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; PEPROCESS Process; PMMSUPPORT AddressSpace; PVOID BaseAddress; @@ -967,7 +966,7 @@ return STATUS_INVALID_PARAMETER_4; } - if(ExGetPreviousMode() != KernelMode) + if (ExGetPreviousMode() != KernelMode) { _SEH2_TRY { @@ -977,11 +976,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Get exception code */ - Status = _SEH2_GetExceptionCode(); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - if (!NT_SUCCESS(Status)) return Status; } BaseAddress = (PVOID)PAGE_ROUND_DOWN((*PBaseAddress)); Modified: trunk/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] Mon Aug 24 22:39:23 2009 @@ -519,7 +519,7 @@ IN PLARGE_INTEGER MaximumSize, IN ULONG Reserved) { - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; HANDLE FileHandle; IO_STATUS_BLOCK IoStatus; @@ -560,14 +560,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - - if (!NT_SUCCESS(Status)) - { - return Status; - } } else { Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Mon Aug 24 22:39:23 2009 @@ -3496,7 +3496,7 @@ LARGE_INTEGER SafeMaximumSize; PVOID SectionObject; KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; PreviousMode = ExGetPreviousMode(); @@ -3514,14 +3514,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } } Status = MmCreateSection(&SectionObject, @@ -3570,7 +3566,7 @@ { HANDLE hSection; KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; PreviousMode = ExGetPreviousMode(); @@ -3582,14 +3578,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } } Status = ObOpenObjectByName(ObjectAttributes, @@ -3729,7 +3721,7 @@ PEPROCESS Process; KPROCESSOR_MODE PreviousMode; PMMSUPPORT AddressSpace; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; ULONG tmpProtect; ACCESS_MASK DesiredAccess; @@ -3779,14 +3771,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } } else { @@ -4263,7 +4251,7 @@ { PROS_SECTION_OBJECT Section; KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; PAGED_CODE(); PreviousMode = ExGetPreviousMode(); @@ -4392,7 +4380,7 @@ LARGE_INTEGER SafeNewMaximumSize; PROS_SECTION_OBJECT Section; KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; PreviousMode = ExGetPreviousMode(); @@ -4406,14 +4394,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } } Status = ObReferenceObjectByHandle(SectionHandle, Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] Mon Aug 24 22:39:23 2009 @@ -70,7 +70,6 @@ KAPC_STATE ApcState; BOOLEAN HaveBadAddress; ULONG_PTR BadAddress; - NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); /* Calculate the maximum amount of data to move */ @@ -165,8 +164,7 @@ if ((FailedInProbe) || (FailedInMapping)) { /* Exit */ - Status = _SEH2_GetExceptionCode(); - _SEH2_YIELD(return Status); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } /* Otherwise, we failed probably during the move */ @@ -182,12 +180,9 @@ } /* Return partial copy */ - Status = STATUS_PARTIAL_COPY; + _SEH2_YIELD(return STATUS_PARTIAL_COPY); } _SEH2_END; - - /* Check for SEH status */ - if (Status != STATUS_SUCCESS) return Status; /* Detach from target */ KeUnstackDetachProcess(&ApcState); @@ -225,7 +220,6 @@ KAPC_STATE ApcState; BOOLEAN HaveBadAddress; ULONG_PTR BadAddress; - NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); /* Calculate the maximum amount of data to move */ @@ -313,8 +307,7 @@ if (FailedInProbe) { /* Exit */ - Status = _SEH2_GetExceptionCode(); - _SEH2_YIELD(return Status); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } /* Otherwise, we failed probably during the move */ @@ -330,12 +323,9 @@ } /* Return partial copy */ - Status = STATUS_PARTIAL_COPY; + _SEH2_YIELD(return STATUS_PARTIAL_COPY); } _SEH2_END; - - /* Check for SEH status */ - if (Status != STATUS_SUCCESS) return Status; /* Detach from target */ KeUnstackDetachProcess(&ApcState); @@ -779,7 +769,7 @@ { KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PEPROCESS Process; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; SIZE_T BytesRead = 0; PAGED_CODE(); @@ -804,13 +794,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Get exception code */ - Status = _SEH2_GetExceptionCode(); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - - /* Return if we failed */ - if (!NT_SUCCESS(Status)) return Status; } /* Reference the process */ @@ -866,7 +853,7 @@ { KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PEPROCESS Process; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; ULONG BytesWritten = 0; PAGED_CODE(); @@ -891,13 +878,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Get exception code */ - Status = _SEH2_GetExceptionCode(); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - - /* Return if we failed */ - if (!NT_SUCCESS(Status)) return Status; } /* Reference the process */ @@ -957,7 +941,7 @@ PVOID BaseAddress = NULL; SIZE_T NumberOfBytesToProtect = 0; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; PAGED_CODE(); /* Check for valid protection flags */ @@ -991,13 +975,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Get exception code */ - Status = _SEH2_GetExceptionCode(); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - - /* Return on exception */ - if (!NT_SUCCESS(Status)) return Status; } else { @@ -1065,7 +1046,7 @@ IN SIZE_T Length, OUT PSIZE_T UnsafeResultLength) { - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; SIZE_T ResultLength = 0; KPROCESSOR_MODE PreviousMode; WCHAR ModuleFileNameBuffer[MAX_PATH] = {0}; @@ -1098,14 +1079,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - - if (!NT_SUCCESS(Status)) - { - return Status; - } } if (Address >= MmSystemRangeStart)

15 years, 4 months

[dgorbachev] 42928: ... and kernel32, too.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Mon Aug 24 22:10:05 2009 New Revision: 42928 URL: http://svn.reactos.org/svn/reactos?rev=42928&view=rev Log: ... and kernel32, too. Modified: trunk/reactos/dll/win32/kernel32/misc/dllmain.c trunk/reactos/dll/win32/kernel32/misc/nls.c trunk/reactos/dll/win32/kernel32/misc/stubs.c Modified: trunk/reactos/dll/win32/kernel32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/dl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/dllmain.c [iso-8859-1] Mon Aug 24 22:10:05 2009 @@ -42,8 +42,8 @@ extern BOOL WINAPI DefaultConsoleCtrlHandler(DWORD Event); extern __declspec(noreturn) VOID CALLBACK ConsoleControlDispatcher(DWORD CodeAndFlag); -extern BOOL FASTCALL NlsInit(); -extern VOID FASTCALL NlsUninit(); +extern BOOL FASTCALL NlsInit(VOID); +extern VOID FASTCALL NlsUninit(VOID); BOOLEAN InWindows = FALSE; HANDLE Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/nl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/nls.c [iso-8859-1] Mon Aug 24 22:10:05 2009 @@ -61,7 +61,7 @@ BOOL FASTCALL -NlsInit() +NlsInit(VOID) { UNICODE_STRING DirName; OBJECT_ATTRIBUTES ObjectAttributes; @@ -117,7 +117,7 @@ VOID FASTCALL -NlsUninit() +NlsUninit(VOID) { PCODEPAGE_ENTRY Current; Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] Mon Aug 24 22:10:05 2009 @@ -1047,7 +1047,7 @@ NTSTATUS WINAPI -BaseCleanupAppcompatCache() +BaseCleanupAppcompatCache(VOID) { STUB; return STATUS_NOT_IMPLEMENTED;

15 years, 4 months

[dgorbachev] 42927: ... and dxg,

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Mon Aug 24 22:10:03 2009 New Revision: 42927 URL: http://svn.reactos.org/svn/reactos?rev=42927&view=rev Log: ... and dxg, Modified: trunk/reactos/drivers/directx/dxg/ddhmg.c trunk/reactos/drivers/directx/dxg/dxg_int.h trunk/reactos/drivers/directx/dxg/main.c Modified: trunk/reactos/drivers/directx/dxg/ddhmg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/ddhmg.… ============================================================================== --- trunk/reactos/drivers/directx/dxg/ddhmg.c [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxg/ddhmg.c [iso-8859-1] Mon Aug 24 22:10:03 2009 @@ -1,5 +1,3 @@ - - /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -46,7 +44,7 @@ *--*/ BOOL FASTCALL -DdHmgCreate() +DdHmgCreate(VOID) { gpentDdHmgr = EngAllocMem(FL_ZERO_MEMORY, gcSizeDdHmgr, TAG_THDD); ghFreeDdHmgr = 0; @@ -92,7 +90,7 @@ *--*/ BOOL FASTCALL -DdHmgDestroy() +DdHmgDestroy(VOID) { gcMaxDdHmgr = 0; gcSizeDdHmgr = 0; @@ -144,7 +142,7 @@ *--*/ PVOID FASTCALL -DdHmgLock( HANDLE DdHandle, UCHAR ObjectType, BOOLEAN LockOwned) +DdHmgLock(HANDLE DdHandle, UCHAR ObjectType, BOOLEAN LockOwned) { DWORD Index = (DWORD)DdHandle & 0x1FFFFF; Modified: trunk/reactos/drivers/directx/dxg/dxg_int.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/dxg_in… ============================================================================== --- trunk/reactos/drivers/directx/dxg/dxg_int.h [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxg/dxg_int.h [iso-8859-1] Mon Aug 24 22:10:03 2009 @@ -1,4 +1,3 @@ - /* DDK/NDK/SDK Headers */ #include <ddk/ntddk.h> #include <ddk/ntddmou.h> @@ -76,7 +75,7 @@ /* exported functions */ NTSTATUS NTAPI DriverEntry(IN PVOID Context1, IN PVOID Context2); NTSTATUS NTAPI GsDriverEntry(IN PVOID Context1, IN PVOID Context2); -NTSTATUS APIENTRY DxDdCleanupDxGraphics(); +NTSTATUS APIENTRY DxDdCleanupDxGraphics(VOID); /* Global pointers */ extern ULONG gcSizeDdHmgr; @@ -99,9 +98,9 @@ /* Internal functions */ BOOL FASTCALL VerifyObjectOwner(PDD_ENTRY pEntry); -BOOL FASTCALL DdHmgCreate(); -BOOL FASTCALL DdHmgDestroy(); -PVOID FASTCALL DdHmgLock( HANDLE DdHandle, UCHAR ObjectType, BOOLEAN LockOwned); +BOOL FASTCALL DdHmgCreate(VOID); +BOOL FASTCALL DdHmgDestroy(VOID); +PVOID FASTCALL DdHmgLock(HANDLE DdHandle, UCHAR ObjectType, BOOLEAN LockOwned); /* define stuff */ #define drvDxEngLockDC gpEngFuncs[DXENG_INDEX_DxEngLockDC] Modified: trunk/reactos/drivers/directx/dxg/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/main.c… ============================================================================== --- trunk/reactos/drivers/directx/dxg/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxg/main.c [iso-8859-1] Mon Aug 24 22:10:03 2009 @@ -1,4 +1,3 @@ - /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -118,7 +117,7 @@ NTSTATUS APIENTRY -DxDdCleanupDxGraphics() +DxDdCleanupDxGraphics(VOID) { DdHmgDestroy(); @@ -137,10 +136,3 @@ return 0; } - - - - - - -

15 years, 4 months

← Newer
1
2
3
4
5
6
7
8
...
66
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 August 2009