Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 57101: [NtUser] - Stop spurious window handle errors and code fixes.
by jimtabor＠svn.reactos.org 18 Aug '12

18 Aug '12

Author: jimtabor Date: Sat Aug 18 21:40:49 2012 New Revision: 57101 URL: http://svn.reactos.org/svn/reactos?rev=57101&view=rev Log: [NtUser] - Stop spurious window handle errors and code fixes. Modified: trunk/reactos/win32ss/user/ntuser/caret.c Modified: trunk/reactos/win32ss/user/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/caret.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/caret.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/caret.c [iso-8859-1] Sat Aug 18 21:40:49 2012 @@ -42,14 +42,17 @@ if(!ThreadQueue || !ThreadQueue->CaretInfo) return FALSE; - pWnd = UserGetWindowObject(ThreadQueue->CaretInfo->hWnd); co_IntHideCaret(ThreadQueue->CaretInfo); ThreadQueue->CaretInfo->Bitmap = (HBITMAP)0; ThreadQueue->CaretInfo->hWnd = (HWND)0; ThreadQueue->CaretInfo->Size.cx = ThreadQueue->CaretInfo->Size.cy = 0; ThreadQueue->CaretInfo->Showing = 0; ThreadQueue->CaretInfo->Visible = 0; - IntNotifyWinEvent(EVENT_OBJECT_DESTROY, pWnd, OBJID_CARET, CHILDID_SELF, 0); + if (ThreadQueue->CaretInfo->hWnd) + { + pWnd = UserGetWindowObject(ThreadQueue->CaretInfo->hWnd); + IntNotifyWinEvent(EVENT_OBJECT_DESTROY, pWnd, OBJID_CARET, CHILDID_SELF, 0); + } return TRUE; } @@ -90,7 +93,7 @@ ThreadQueue->CaretInfo->Pos.x = X; ThreadQueue->CaretInfo->Pos.y = Y; co_IntSendMessage(ThreadQueue->CaretInfo->hWnd, WM_SYSTIMER, IDCARETTIMER, 0); - IntSetTimer(UserGetWindowObject(ThreadQueue->CaretInfo->hWnd), IDCARETTIMER, gpsi->dtCaretBlink, NULL, TMRF_SYSTEM); + IntSetTimer(pWnd, IDCARETTIMER, gpsi->dtCaretBlink, NULL, TMRF_SYSTEM); IntNotifyWinEvent(EVENT_OBJECT_LOCATIONCHANGE, pWnd, OBJID_CARET, CHILDID_SELF, 0); } return TRUE; @@ -179,8 +182,8 @@ BOOL FASTCALL co_UserShowCaret(PWND Window OPTIONAL) { PTHREADINFO pti; - PWND pWnd; - PUSER_MESSAGE_QUEUE ThreadQueue; + PUSER_MESSAGE_QUEUE ThreadQueue; + PWND pWnd = NULL; if (Window) ASSERT_REFS_CO(Window); @@ -199,16 +202,16 @@ return FALSE; } - if(!ThreadQueue->CaretInfo->Visible) + if(!ThreadQueue->CaretInfo->Visible && ThreadQueue->CaretInfo->hWnd) { ThreadQueue->CaretInfo->Visible = 1; - if(!ThreadQueue->CaretInfo->Showing) + pWnd = UserGetWindowObject(ThreadQueue->CaretInfo->hWnd); + if (!ThreadQueue->CaretInfo->Showing) { - pWnd = UserGetWindowObject(ThreadQueue->CaretInfo->hWnd); co_IntSendMessage(ThreadQueue->CaretInfo->hWnd, WM_SYSTIMER, IDCARETTIMER, 0); IntNotifyWinEvent(EVENT_OBJECT_SHOW, pWnd, OBJID_CARET, OBJID_CARET, 0); } - IntSetTimer(UserGetWindowObject(ThreadQueue->CaretInfo->hWnd), IDCARETTIMER, gpsi->dtCaretBlink, NULL, TMRF_SYSTEM); + IntSetTimer(pWnd, IDCARETTIMER, gpsi->dtCaretBlink, NULL, TMRF_SYSTEM); } return TRUE; } @@ -248,8 +251,7 @@ if (ThreadQueue->CaretInfo->Visible) { - PWND pwnd = UserGetWindowObject(hWnd); - IntKillTimer(pwnd, IDCARETTIMER, TRUE); + IntKillTimer(Window, IDCARETTIMER, TRUE); co_IntHideCaret(ThreadQueue->CaretInfo); }

1 0

[jimtabor] 57100: [Win32SS] - Do not register classes in case of errors at startup. - Fix desktop background.
by jimtabor＠svn.reactos.org 18 Aug '12

18 Aug '12

Author: jimtabor Date: Sat Aug 18 21:35:35 2012 New Revision: 57100 URL: http://svn.reactos.org/svn/reactos?rev=57100&view=rev Log: [Win32SS] - Do not register classes in case of errors at startup. - Fix desktop background. Modified: trunk/reactos/win32ss/user/ntuser/class.c trunk/reactos/win32ss/user/user32/windows/class.c Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Sat Aug 18 21:35:35 2012 @@ -13,10 +13,10 @@ { { ((PWSTR)((ULONG_PTR)(WORD)(0x8001))), CS_GLOBALCLASS|CS_DBLCLKS, - NULL, - 0, + NULL, // Use User32 procs + sizeof(ULONG)*2, (HICON)IDC_ARROW, - (HBRUSH)(COLOR_BACKGROUND + 1), + (HBRUSH)(COLOR_BACKGROUND), FNID_DESKTOP, ICLS_DESKTOP }, @@ -47,6 +47,17 @@ FNID_SCROLLBAR, ICLS_SCROLLBAR }, +#if 0 + { ((PWSTR)((ULONG_PTR)(WORD)(0x8006))), // Tooltips + CS_PARENTDC|CS_DBLCLKS, + NULL, // Use User32 procs + 0, + (HICON)IDC_ARROW, + 0, + FNID_TOOLTIPS, + ICLS_TOOLTIPS + }, +#endif { ((PWSTR)((ULONG_PTR)(WORD)(0x8004))), // IconTitle is here for now... 0, NULL, // Use User32 procs @@ -1948,6 +1959,7 @@ WNDCLASSEXW wc; PCLS Class; BOOL Ret = TRUE; + HBRUSH hBrush; DWORD Flags = 0; if (ppi->W32PF_flags & W32PF_CLASSESREGISTERED) @@ -1992,7 +2004,12 @@ wc.cbWndExtra = DefaultServerClasses[i].ExtraBytes; wc.hIcon = NULL; wc.hCursor = DefaultServerClasses[i].hCursor; - wc.hbrBackground = DefaultServerClasses[i].hBrush; + hBrush = DefaultServerClasses[i].hBrush; + if (hBrush <= (HBRUSH)COLOR_MENUBAR) + { + hBrush = IntGetSysColorBrush((INT)hBrush); + } + wc.hbrBackground = hBrush; wc.lpszMenuName = NULL; wc.lpszClassName = ClassName.Buffer; wc.hIconSm = NULL; Modified: trunk/reactos/win32ss/user/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] Sat Aug 18 21:35:35 2012 @@ -210,24 +210,24 @@ return FALSE; } + if (IS_ATOM(lpszClass)) + { + ClassName.Buffer = (PWSTR)((ULONG_PTR)lpszClass); + } + else + { + if (!RtlCreateUnicodeStringFromAsciiz(&ClassName, + lpszClass)) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + } + if (!RegisterDefaultClasses) { ERR("GetClassInfoExA RegisterSystemControls\n"); RegisterSystemControls(); - } - - if (IS_ATOM(lpszClass)) - { - ClassName.Buffer = (PWSTR)((ULONG_PTR)lpszClass); - } - else - { - if (!RtlCreateUnicodeStringFromAsciiz(&ClassName, - lpszClass)) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } } Ret = NtUserGetClassInfo(hInstance, @@ -289,20 +289,20 @@ return FALSE; } + if (IS_ATOM(lpszClass)) + { + ClassName.Buffer = (PWSTR)((ULONG_PTR)lpszClass); + } + else + { + RtlInitUnicodeString(&ClassName, + lpszClass); + } + if (!RegisterDefaultClasses) { ERR("GetClassInfoExW RegisterSystemControls\n"); RegisterSystemControls(); - } - - if (IS_ATOM(lpszClass)) - { - ClassName.Buffer = (PWSTR)((ULONG_PTR)lpszClass); - } - else - { - RtlInitUnicodeString(&ClassName, - lpszClass); } Ret = NtUserGetClassInfo( hInstance,

1 0

[tkreuzer] 57099: [NDK] Fix a typo
by tkreuzer＠svn.reactos.org 18 Aug '12

18 Aug '12

Author: tkreuzer Date: Sat Aug 18 19:24:38 2012 New Revision: 57099 URL: http://svn.reactos.org/svn/reactos?rev=57099&view=rev Log: [NDK] Fix a typo Modified: trunk/reactos/include/ndk/umtypes.h Modified: trunk/reactos/include/ndk/umtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/umtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/umtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/umtypes.h [iso-8859-1] Sat Aug 18 19:24:38 2012 @@ -54,7 +54,7 @@ #ifndef _MANAGED #if defined(_M_IX86) #ifndef FASTCALL -#define FASTCALL _fastcall +#define FASTCALL __fastcall #endif #else #define FASTCALL @@ -159,8 +159,8 @@ USHORT Length; USHORT MaximumLength; ULONG Buffer; -} STRING32, *PSTRING32, - UNICODE_STRING32, *PUNICODE_STRING32, +} STRING32, *PSTRING32, + UNICODE_STRING32, *PUNICODE_STRING32, ANSI_STRING32, *PANSI_STRING32; typedef struct _STRING64 { @@ -168,7 +168,7 @@ USHORT MaximumLength; ULONGLONG Buffer; } STRING64, *PSTRING64, - UNICODE_STRING64, *PUNICODE_STRING64, + UNICODE_STRING64, *PUNICODE_STRING64, ANSI_STRING64, *PANSI_STRING64;

1 0

[ekohl] 57098: [WIDL] Sync WIDL to Wine 1.5.11. Part 2 of 2.
by ekohl＠svn.reactos.org 18 Aug '12

18 Aug '12

Author: ekohl Date: Sat Aug 18 18:37:39 2012 New Revision: 57098 URL: http://svn.reactos.org/svn/reactos?rev=57098&view=rev Log: [WIDL] Sync WIDL to Wine 1.5.11. Part 2 of 2. Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/tools/widl/header.c trunk/reactos/tools/widl/server.c trunk/reactos/tools/widl/typegen.c Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Aug 18 18:37:39 2012 @@ -22,7 +22,7 @@ The following build tools are shared with Wine. reactos/tools/unicode # Synced to Wine-1.5.4 -reactos/tools/widl # Synced to Wine-1.3.26 +reactos/tools/widl # Synced to Wine-1.5.11 reactos/tools/wpp # Synced to Wine-1.3.26 The following libraries are shared with Wine. Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=57… ============================================================================== --- trunk/reactos/tools/widl/header.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/header.c [iso-8859-1] Sat Aug 18 18:37:39 2012 @@ -816,6 +816,28 @@ return get_attrp(a, ATTR_CALLAS); } +static int is_inherited_method(const type_t *iface, const var_t *func) +{ + while ((iface = type_iface_get_inherit(iface))) + { + const statement_t *stmt; + STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) + { + const var_t *funccmp = stmt->u.var; + + if (!is_callas(func->attrs)) + { + char inherit_name[256]; + /* compare full name including property prefix */ + strcpy(inherit_name, get_name(funccmp)); + if (!strcmp(inherit_name, get_name(func))) return 1; + } + } + } + + return 0; +} + static void write_method_macro(FILE *header, const type_t *iface, const char *name) { const statement_t *stmt; @@ -834,7 +856,7 @@ first_iface = 0; } - if (!is_callas(func->attrs)) { + if (!is_callas(func->attrs) && !is_inherited_method(iface, func)) { const var_t *arg; fprintf(header, "#define %s_%s(This", name, get_name(func)); @@ -876,6 +898,13 @@ else fprintf(h, ","); } write_type_decl(h, arg->type, arg->name); + if (method == 2) { + const expr_t *expr = get_attrp(arg->attrs, ATTR_DEFAULTVALUE); + if (expr) { + fprintf(h, " = "); + write_expr( h, expr, 0, 1, NULL, NULL, "" ); + } + } count++; } if (do_indent) indentation--; @@ -902,6 +931,43 @@ } } +static void write_inline_wrappers(FILE *header, const type_t *iface, const char *name) +{ + const statement_t *stmt; + int first_iface = 1; + + if (type_iface_get_inherit(iface)) + write_inline_wrappers(header, type_iface_get_inherit(iface), name); + + STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) + { + const var_t *func = stmt->u.var; + + if (first_iface) + { + fprintf(header, "/*** %s methods ***/\n", iface->name); + first_iface = 0; + } + + if (!is_callas(func->attrs) && !is_inherited_method(iface, func)) { + const var_t *arg; + + fprintf(header, "static FORCEINLINE "); + write_type_decl_left(header, type_function_get_rettype(func->type)); + fprintf(header, " %s_%s(", name, get_name(func)); + write_args(header, type_get_function_args(func->type), name, 1, FALSE); + fprintf(header, ") {\n"); + fprintf(header, " %s", is_void(type_function_get_rettype(func->type)) ? "" : "return "); + fprintf(header, "This->lpVtbl->%s(This", get_name(func)); + if (type_get_function_args(func->type)) + LIST_FOR_EACH_ENTRY( arg, type_get_function_args(func->type), const var_t, entry ) + fprintf(header, ",%s", arg->name); + fprintf(header, ");\n"); + fprintf(header, "}\n"); + } + } +} + static void do_write_c_method_def(FILE *header, const type_t *iface, const char *name) { const statement_t *stmt; @@ -923,7 +989,10 @@ if (!callconv) callconv = "STDMETHODCALLTYPE"; indent(header, 0); write_type_decl_left(header, type_function_get_rettype(func->type)); - fprintf(header, " (%s *%s)(\n", callconv, get_name(func)); + if (is_inherited_method(iface, func)) + fprintf(header, " (%s *%s_%s)(\n", callconv, iface->name, func->name); + else + fprintf(header, " (%s *%s)(\n", callconv, get_name(func)); write_args(header, type_get_function_args(func->type), name, 1, TRUE); fprintf(header, ");\n"); fprintf(header, "\n"); @@ -1150,8 +1219,11 @@ fprintf(header, "#ifdef COBJMACROS\n"); /* dispinterfaces don't have real functions, so don't write macros for them, * only for the interface this interface inherits from, i.e. IDispatch */ + fprintf(header, "#ifndef WIDL_C_INLINE_WRAPPERS\n"); write_method_macro(header, dispinterface ? type_iface_get_inherit(iface) : iface, iface->name); - fprintf(header, "#endif\n"); + fprintf(header, "#else\n"); + write_inline_wrappers(header, dispinterface ? type_iface_get_inherit(iface) : iface, iface->name); + fprintf(header, "#endif\n"); fprintf(header, "#endif\n"); fprintf(header, "\n"); fprintf(header, "#endif\n"); fprintf(header, "\n"); Modified: trunk/reactos/tools/widl/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/server.c?rev=57… ============================================================================== --- trunk/reactos/tools/widl/server.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/server.c [iso-8859-1] Sat Aug 18 18:37:39 2012 @@ -175,11 +175,10 @@ /* if the context_handle attribute appears in the chain of types * without pointers being followed, then the context handle must * be direct, otherwise it is a pointer */ - int is_ch_ptr = is_aliaschain_attr(var->type, ATTR_CONTEXTHANDLE) ? FALSE : TRUE; + const char *ch_ptr = is_aliaschain_attr(var->type, ATTR_CONTEXTHANDLE) ? "*" : ""; print_server("("); write_type_decl_left(server, var->type); - fprintf(server, ")%sNDRSContextValue(__frame->%s)", - is_ch_ptr ? "" : "*", var->name); + fprintf(server, ")%sNDRSContextValue(__frame->%s)", ch_ptr, var->name); } else { Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=5… ============================================================================== --- trunk/reactos/tools/widl/typegen.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typegen.c [iso-8859-1] Sat Aug 18 18:37:39 2012 @@ -4147,10 +4147,11 @@ /* if the context_handle attribute appears in the chain of types * without pointers being followed, then the context handle must * be direct, otherwise it is a pointer */ - int is_ch_ptr = is_aliaschain_attr(type, ATTR_CONTEXTHANDLE) ? FALSE : TRUE; + const char *ch_ptr = is_aliaschain_attr(type, ATTR_CONTEXTHANDLE) ? "" : "*"; print_file(file, indent, "NdrClientContextMarshall(\n"); print_file(file, indent + 1, "&__frame->_StubMsg,\n"); - print_file(file, indent + 1, "(NDR_CCONTEXT)%s%s%s,\n", is_ch_ptr ? "*" : "", local_var_prefix, var->name); + print_file(file, indent + 1, "(NDR_CCONTEXT)%s%s%s,\n", ch_ptr, local_var_prefix, + var->name); print_file(file, indent + 1, "%s);\n", in_attr && out_attr ? "1" : "0"); } else

1 0

[cgutman] 57097: [MSAFD] - Fix a memory leak in the failure path of WSPGetSockName and WSPGetPeerName - Fix a broken debug print in WSPGetPeerName
by cgutman＠svn.reactos.org 18 Aug '12

18 Aug '12

Author: cgutman Date: Sat Aug 18 16:36:05 2012 New Revision: 57097 URL: http://svn.reactos.org/svn/reactos?rev=57097&view=rev Log: [MSAFD] - Fix a memory leak in the failure path of WSPGetSockName and WSPGetPeerName - Fix a broken debug print in WSPGetPeerName Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sat Aug 18 16:36:05 2012 @@ -1842,6 +1842,8 @@ } } + HeapFree(GlobalHeap, 0, TdiAddress); + return MsafdReturnWithErrno ( Status, lpErrno, 0, NULL ); } @@ -1933,7 +1935,7 @@ SocketAddress->Address[0].Address, SocketAddress->Address[0].AddressLength); *NameLength = Socket->SharedData.SizeOfRemoteAddress; - AFD_DbgPrint (MID_TRACE, ("NameLength %d Address: %s Port %x\n", + AFD_DbgPrint (MID_TRACE, ("NameLength %d Address: %x Port %x\n", *NameLength, ((struct sockaddr_in *)Name)->sin_addr.s_addr, ((struct sockaddr_in *)Name)->sin_port)); HeapFree(GlobalHeap, 0, SocketAddress); @@ -1946,6 +1948,8 @@ return SOCKET_ERROR; } } + + HeapFree(GlobalHeap, 0, SocketAddress); return MsafdReturnWithErrno ( Status, lpErrno, 0, NULL ); }

1 0

[ekohl] 57096: [WIDL] - Missed one old header guard.
by ekohl＠svn.reactos.org 18 Aug '12

18 Aug '12

Author: ekohl Date: Sat Aug 18 13:25:24 2012 New Revision: 57096 URL: http://svn.reactos.org/svn/reactos?rev=57096&view=rev Log: [WIDL] - Missed one old header guard. Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Sat Aug 18 13:25:24 2012 @@ -2579,7 +2579,7 @@ { return E_NOTIMPL; } -#ifdef __WIDL_EXDISP_H +#ifdef __exdisp_h__ #undef long #endif HRESULT STDMETHODCALLTYPE CShellBrowser::get_LocationName(BSTR *LocationName)

1 0

[ekohl] 57095: [WIDL] - Sync WIDL to Wine 1.5.10. Part 1 of 2. - Adjust files to use MIDL compatible header guards. - Add support for nameless structs and unions.
by ekohl＠svn.reactos.org 18 Aug '12

18 Aug '12

Author: ekohl Date: Sat Aug 18 13:11:56 2012 New Revision: 57095 URL: http://svn.reactos.org/svn/reactos?rev=57095&view=rev Log: [WIDL] - Sync WIDL to Wine 1.5.10. Part 1 of 2. - Adjust files to use MIDL compatible header guards. - Add support for nameless structs and unions. Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp trunk/reactos/include/psdk/htmlhelp.h trunk/reactos/include/psdk/winnt.h trunk/reactos/tools/widl/header.c trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.y trunk/reactos/tools/widl/widl.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… Modified: trunk/reactos/include/psdk/htmlhelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/htmlhelp.h?re… Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5… Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=57… Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=57… Modified: trunk/reactos/tools/widl/widl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.c?rev=5709…

1 0

[cgutman] 57094: [MSAFD] - Add more option support to WSPGetSockOpt and WSPSetSockOpt - Return the correct error code for an unsupported option in WSPGetSockOpt - Hack a SO_ERROR get handler togeth...
by cgutman＠svn.reactos.org 18 Aug '12

18 Aug '12

Author: cgutman Date: Sat Aug 18 09:57:27 2012 New Revision: 57094 URL: http://svn.reactos.org/svn/reactos?rev=57094&view=rev Log: [MSAFD] - Add more option support to WSPGetSockOpt and WSPSetSockOpt - Return the correct error code for an unsupported option in WSPGetSockOpt - Hack a SO_ERROR get handler together for apps that need it - Add better unsupported protoopts debugging (particularly for getsockopt) - SMPlayer can now stream media from the Internet :) Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sat Aug 18 09:57:27 2012 @@ -2052,6 +2052,7 @@ PVOID Buffer; INT BufferSize; BOOL BoolBuffer; + INT IntBuffer; /* Get the Socket Structure associate to this Socket*/ Socket = GetSocketStructure(Handle); @@ -2112,21 +2113,46 @@ BufferSize = sizeof(struct linger); break; - /* case SO_CONDITIONAL_ACCEPT: */ + case SO_OOBINLINE: + BoolBuffer = (Socket->SharedData.OobInline != 0); + Buffer = &BoolBuffer; + BufferSize = sizeof(BOOL); + break; + + case SO_KEEPALIVE: case SO_DONTROUTE: + /* These guys go directly to the helper */ + goto SendToHelper; + + case SO_CONDITIONAL_ACCEPT: + BoolBuffer = (Socket->SharedData.UseDelayedAcceptance != 0); + Buffer = &BoolBuffer; + BufferSize = sizeof(BOOL); + break; + + case SO_REUSEADDR: + BoolBuffer = (Socket->SharedData.ReuseAddresses != 0); + Buffer = &BoolBuffer; + BufferSize = sizeof(BOOL); + break; + case SO_ERROR: + /* HACK: This needs to be properly tracked */ + IntBuffer = 0; + DbgPrint("MSAFD: Hacked SO_ERROR returning error %d\n", IntBuffer); + + Buffer = &IntBuffer; + BufferSize = sizeof(INT); + break; + case SO_GROUP_ID: case SO_GROUP_PRIORITY: - case SO_KEEPALIVE: case SO_MAX_MSG_SIZE: - case SO_OOBINLINE: case SO_PROTOCOL_INFO: - case SO_REUSEADDR: - AFD_DbgPrint(MID_TRACE, ("Unimplemented option (%x)\n", - OptionName)); default: - *lpErrno = WSAEINVAL; + DbgPrint("MSAFD: Get unknown optname %x\n", OptionName); + *lpErrno = WSAENOPROTOOPT; return SOCKET_ERROR; } @@ -2140,18 +2166,20 @@ return 0; - case IPPROTO_TCP: /* FIXME */ default: - *lpErrno = Socket->HelperData->WSHGetSocketInformation(Socket->HelperContext, - Handle, - Socket->TdiAddressHandle, - Socket->TdiConnectionHandle, - Level, - OptionName, - OptionValue, - (LPINT)OptionLength); - return (*lpErrno == 0) ? 0 : SOCKET_ERROR; - } + break; + } + +SendToHelper: + *lpErrno = Socket->HelperData->WSHGetSocketInformation(Socket->HelperContext, + Handle, + Socket->TdiAddressHandle, + Socket->TdiConnectionHandle, + Level, + OptionName, + OptionValue, + (LPINT)OptionLength); + return (*lpErrno == 0) ? 0 : SOCKET_ERROR; } INT @@ -2220,13 +2248,43 @@ AFD_DbgPrint(MIN_TRACE,("Setting send buf to %x is not implemented yet\n", optval)); return 0; + case SO_SNDTIMEO: + if (optlen < sizeof(DWORD)) + { + *lpErrno = WSAEFAULT; + return SOCKET_ERROR; + } + + RtlCopyMemory(&Socket->SharedData.SendTimeout, + optval, + sizeof(DWORD)); + return 0; + + case SO_RCVTIMEO: + if (optlen < sizeof(DWORD)) + { + *lpErrno = WSAEFAULT; + return SOCKET_ERROR; + } + + RtlCopyMemory(&Socket->SharedData.RecvTimeout, + optval, + sizeof(DWORD)); + return 0; + + case SO_KEEPALIVE: + case SO_DONTROUTE: + /* These go directly to the helper dll */ + goto SendToHelper; + default: - AFD_DbgPrint(MIN_TRACE,("Unknown optname %x\n", optname)); - break; - } - } - - + /* Obviously this is a hack */ + DbgPrint("MSAFD: Set unknown optname %x\n", optname); + return 0; + } + } + +SendToHelper: *lpErrno = Socket->HelperData->WSHSetSocketInformation(Socket->HelperContext, s, Socket->TdiAddressHandle,

1 0

[tfaber] 57093: [NTDLL:LDR] - Code cleanup in LdrpLoadDll
by tfaber＠svn.reactos.org 18 Aug '12

18 Aug '12

Author: tfaber Date: Sat Aug 18 08:19:48 2012 New Revision: 57093 URL: http://svn.reactos.org/svn/reactos?rev=57093&view=rev Log: [NTDLL:LDR] - Code cleanup in LdrpLoadDll Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Sat Aug 18 08:19:48 2012 @@ -1985,7 +1985,7 @@ /* FIXME: Warning, "Flag" is used as magic instead of "Static" */ /* FIXME: Warning, code does not support redirection at all */ - + /* Look in the hash table if flag was set */ lookinhash: if (Flag) @@ -2077,7 +2077,7 @@ Flag = TRUE; goto lookinhash; } - + /* FIXME: Warning, activation context missing */ /* NOTE: From here on down, everything looks good */ @@ -2192,7 +2192,7 @@ /* Check if it's in the process of being unloaded */ if (!CurEntry->InMemoryOrderModuleList.Flink) continue; - + /* The header is untrusted, use SEH */ _SEH2_TRY { @@ -2415,28 +2415,28 @@ { PPEB Peb = NtCurrentPeb(); NTSTATUS Status = STATUS_SUCCESS; - PWCHAR p1, p2, p1min; + const WCHAR *p; + BOOLEAN GotExtension; WCHAR c; - WCHAR NameBuffer[MAX_PATH+6]; - LPWSTR RawDllName; - UNICODE_STRING RawDllNameString; + WCHAR NameBuffer[MAX_PATH + 6]; + UNICODE_STRING RawDllName; PLDR_DATA_TABLE_ENTRY LdrEntry; BOOLEAN InInit = LdrpInLdrInit; /* Save the Raw DLL Name */ - RawDllName = NameBuffer; if (DllName->Length >= sizeof(NameBuffer)) return STATUS_NAME_TOO_LONG; - RtlMoveMemory(RawDllName, DllName->Buffer, DllName->Length); - - /* Find the name without the extension */ - p1 = DllName->Buffer + DllName->Length / sizeof(WCHAR) - 1; - p2 = NULL; - for (p1min = DllName->Buffer; p1 >= p1min; p1--) - { - c = *p1; + RtlInitEmptyUnicodeString(&RawDllName, NameBuffer, sizeof(NameBuffer)); + RtlCopyUnicodeString(&RawDllName, DllName); + + /* Find the extension, if present */ + p = DllName->Buffer + DllName->Length / sizeof(WCHAR) - 1; + GotExtension = FALSE; + while (p >= DllName->Buffer) + { + c = *p--; if (c == L'.') { - p2 = p1; + GotExtension = TRUE; break; } else if (c == L'\\') @@ -2445,8 +2445,8 @@ } } - /* Check if no extension was found */ - if (!p2) + /* If no extension was found, add the default extension */ + if (!GotExtension) { /* Check that we have space to add one */ if ((DllName->Length + LdrApiDefaultExtension.Length + sizeof(UNICODE_NULL)) >= @@ -2466,30 +2466,10 @@ return STATUS_NAME_TOO_LONG; } - /* FIXME: CLEAN THIS UP WITH Rtl String Functions */ - /* Add it */ - RtlMoveMemory((PVOID)((ULONG_PTR)RawDllName + DllName->Length), - LdrApiDefaultExtension.Buffer, - LdrApiDefaultExtension.Length); - - /* Save the length to a unicode string */ - RawDllNameString.Length = DllName->Length + LdrApiDefaultExtension.Length; - - /* Null terminate it */ - RawDllName[RawDllNameString.Length / sizeof(WCHAR)] = 0; - } - else - { - /* Null terminate it */ - RawDllName[DllName->Length / sizeof(WCHAR)] = 0; - - /* Save the length to a unicode string */ - RawDllNameString.Length = DllName->Length; - } - - /* Now create a unicode string for the DLL's name */ - RawDllNameString.MaximumLength = sizeof(NameBuffer); - RawDllNameString.Buffer = NameBuffer; + /* Add it. Needs to be null terminated, thus the length check above */ + (VOID)RtlAppendUnicodeStringToString(&RawDllName, + &LdrApiDefaultExtension); + } /* Check for init flag and acquire lock */ if (!InInit) RtlEnterCriticalSection(&LdrpLoaderLock); @@ -2497,14 +2477,14 @@ /* Show debug message */ if (ShowSnaps) { - DPRINT1("LDR: LdrLoadDll, loading %ws from %ws\n", - RawDllName, + DPRINT1("LDR: LdrLoadDll, loading %wZ from %ws\n", + &RawDllName, DllPath ? DllPath : L""); } /* Check if the DLL is already loaded */ if (!LdrpCheckForLoadedDll(DllPath, - &RawDllNameString, + &RawDllName, FALSE, Redirected, &LdrEntry)) @@ -2518,7 +2498,7 @@ Redirected, &LdrEntry); if (!NT_SUCCESS(Status)) goto Quickie; - + /* FIXME: Need to mark the DLL range for the stack DB */ //RtlpStkMarkDllRange(LdrEntry); @@ -2555,7 +2535,7 @@ /* Cancel the load */ LdrpClearLoadInProgress(); - + /* Unload the DLL */ if (ShowSnaps) { @@ -2590,7 +2570,7 @@ //ShimLoadCallback = RtlDecodeSystemPointer(g_pfnSE_DllLoaded); //ShimLoadCallback(LdrEntry); } - + /* Run the init routine */ Status = LdrpRunInitializeRoutines(NULL); if (!NT_SUCCESS(Status))

1 0

[tfaber] 57092: [NTDLL:LDR] - Do not assume null termination of DllName and optimize extension search in LdrpLoadDll. Patch by Alexander Yastrebov (menone7 at gmail dot com). See issue #7251 for mo...
by tfaber＠svn.reactos.org 18 Aug '12

18 Aug '12

Author: tfaber Date: Sat Aug 18 07:56:45 2012 New Revision: 57092 URL: http://svn.reactos.org/svn/reactos?rev=57092&view=rev Log: [NTDLL:LDR] - Do not assume null termination of DllName and optimize extension search in LdrpLoadDll. Patch by Alexander Yastrebov (menone7 at gmail dot com). See issue #7251 for more details. Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Sat Aug 18 07:56:45 2012 @@ -2415,37 +2415,38 @@ { PPEB Peb = NtCurrentPeb(); NTSTATUS Status = STATUS_SUCCESS; - PWCHAR p1, p2; + PWCHAR p1, p2, p1min; WCHAR c; - WCHAR NameBuffer[266]; + WCHAR NameBuffer[MAX_PATH+6]; LPWSTR RawDllName; UNICODE_STRING RawDllNameString; PLDR_DATA_TABLE_ENTRY LdrEntry; BOOLEAN InInit = LdrpInLdrInit; - /* Find the name without the extension */ - p1 = DllName->Buffer; - p2 = NULL; - while (*p1) - { - c = *p1++; - if (c == L'.') - { - p2 = p1; - } - else if (c == L'\\') - { - p2 = NULL; - } - } - /* Save the Raw DLL Name */ RawDllName = NameBuffer; if (DllName->Length >= sizeof(NameBuffer)) return STATUS_NAME_TOO_LONG; RtlMoveMemory(RawDllName, DllName->Buffer, DllName->Length); - /* Check if no extension was found or if we got a slash */ - if (!(p2) || (*p2 == '\\')) + /* Find the name without the extension */ + p1 = DllName->Buffer + DllName->Length / sizeof(WCHAR) - 1; + p2 = NULL; + for (p1min = DllName->Buffer; p1 >= p1min; p1--) + { + c = *p1; + if (c == L'.') + { + p2 = p1; + break; + } + else if (c == L'\\') + { + break; + } + } + + /* Check if no extension was found */ + if (!p2) { /* Check that we have space to add one */ if ((DllName->Length + LdrApiDefaultExtension.Length + sizeof(UNICODE_NULL)) >=

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