Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mjansen] 72572: [MSGINA] Implement ShellDimScreen. CORE-11422
by mjansen＠svn.reactos.org 04 Sep '16

04 Sep '16

Author: mjansen Date: Sun Sep 4 14:17:22 2016 New Revision: 72572 URL: http://svn.reactos.org/svn/reactos?rev=72572&view=rev Log: [MSGINA] Implement ShellDimScreen. CORE-11422 Added: trunk/reactos/dll/win32/msgina/dimmedwindow.cpp (with props) Modified: trunk/reactos/dll/win32/msgina/CMakeLists.txt trunk/reactos/dll/win32/msgina/msgina.h trunk/reactos/dll/win32/msgina/stubs.c Modified: trunk/reactos/dll/win32/msgina/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/msgina/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/CMakeLists.txt [iso-8859-1] Sun Sep 4 14:17:22 2016 @@ -1,11 +1,13 @@ + +set_cpp(WITH_RUNTIME) include_directories( - include + ${REACTOS_SOURCE_DIR}/sdk/lib/atl ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(msgina.dll msgina.spec) -list(APPEND SOURCE +list(APPEND C_SOURCE gui.c lsa.c msgina.c @@ -14,15 +16,19 @@ tui.c msgina.h) +list(APPEND CPP_SOURCE + dimmedwindow.cpp) + add_library(msgina SHARED - ${SOURCE} + ${C_SOURCE} + ${CPP_SOURCE} msgina.rc ${CMAKE_CURRENT_BINARY_DIR}/msgina_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/msgina.def) -set_module_type(msgina win32dll) -target_link_libraries(msgina wine) +set_module_type(msgina win32dll UNICODE) +target_link_libraries(msgina atlnew wine uuid ${PSEH_LIB}) add_delay_importlibs(msgina secur32) add_importlibs(msgina advapi32 user32 gdi32 powrprof userenv msvcrt kernel32 ntdll) -add_pch(msgina msgina.h SOURCE) +add_pch(msgina msgina.h CPP_SOURCE) add_cd_file(TARGET msgina DESTINATION reactos/system32 FOR all) Added: trunk/reactos/dll/win32/msgina/dimmedwindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/dimmedwin… ============================================================================== --- trunk/reactos/dll/win32/msgina/dimmedwindow.cpp (added) +++ trunk/reactos/dll/win32/msgina/dimmedwindow.cpp [iso-8859-1] Sun Sep 4 14:17:22 2016 @@ -0,0 +1,269 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS msgina.dll + * FILE: dll/win32/msgina/dimmedwindow.cpp + * PURPOSE: Implementation of ShellDimScreen + * PROGRAMMER: Mark Jansen + */ + +#define COM_NO_WINDOWS_H +#include "msgina.h" +#include <wingdi.h> +#include <atlbase.h> +#include <atlcom.h> +#include <pseh/pseh2.h> + +CComModule gModule; + +// Please note: The INIT_TIMER is a workaround because ReactOS does not redraw the desktop in time, +// so the start menu is still visible on the dimmed screen. +#define INIT_TIMER_ID 0x112233 +#define FADE_TIMER_ID 0x12345 + +class CDimmedWindow : + public CComObjectRootEx<CComMultiThreadModelNoCS>, + IUnknown +{ +private: + HWND m_hwnd; + HDC m_hdc; + HBITMAP m_hbitmap; + HGDIOBJ m_oldbitmap; + LONG m_width; + LONG m_height; + BITMAPINFO m_bi; + UCHAR* m_bytes; + int m_step; + + static LRESULT WINAPI Proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + +public: + CDimmedWindow() + : m_hwnd(NULL) + , m_hdc(NULL) + , m_hbitmap(NULL) + , m_oldbitmap(NULL) + , m_width(0) + , m_height(0) + , m_bytes(NULL) + , m_step(0) + { + WNDCLASSEXW wndclass = {sizeof(wndclass)}; + wndclass.lpfnWndProc = Proc; + wndclass.hInstance = hDllInstance; + wndclass.hCursor = LoadCursor(0, IDC_ARROW); + wndclass.lpszClassName = L"DimmedWindowClass"; + + if (!RegisterClassExW(&wndclass)) + return; + + m_width = GetSystemMetrics(SM_CXVIRTUALSCREEN); + m_height = GetSystemMetrics(SM_CYVIRTUALSCREEN); + + memset(&m_bi, 0, sizeof(m_bi)); + m_bi.bmiHeader.biSize = sizeof(m_bi); + m_bi.bmiHeader.biWidth = m_width; + m_bi.bmiHeader.biHeight = m_height; + m_bi.bmiHeader.biPlanes = 1; + m_bi.bmiHeader.biBitCount = 32; + m_bi.bmiHeader.biCompression = BI_RGB; + m_bi.bmiHeader.biSizeImage = m_width * 4 * m_height; + m_bytes = new UCHAR[m_width * 4 * m_height]; + + LONG x = GetSystemMetrics(SM_XVIRTUALSCREEN); + LONG y = GetSystemMetrics(SM_YVIRTUALSCREEN); + + m_hwnd = CreateWindowExW(WS_EX_TOPMOST, L"DimmedWindowClass", NULL, WS_POPUP, + x, y, m_width, m_height, + NULL, NULL, hDllInstance, (LPVOID)this); + } + + ~CDimmedWindow() + { + if (m_hwnd) + DestroyWindow(m_hwnd); + UnregisterClassW(L"DimmedWindowClass", hDllInstance); + if (m_oldbitmap) + SelectObject(m_hdc, m_oldbitmap); + if (m_hbitmap) + DeleteObject(m_hbitmap); + if (m_hdc) + DeleteObject(m_hdc); + if (m_bytes) + delete[] m_bytes; + } + + // This is needed so that we do not capture the start menu while it's closing. + void WaitForInit() + { + MSG msg; + + while (!IsWindowVisible(m_hwnd)) + { + while (::PeekMessage(&msg, m_hwnd, 0, 0, PM_REMOVE)) + { + ::TranslateMessage(&msg); + ::DispatchMessage(&msg); + + if (IsWindowVisible(m_hwnd)) + break; + } + } + } + + void Init() + { + Capture(); + + ShowWindow(m_hwnd, SW_SHOWNA); + EnableWindow(m_hwnd, FALSE); + + SetTimer(m_hwnd, FADE_TIMER_ID, 200, NULL); + } + + void Capture() + { + HWND desktopWnd = GetDesktopWindow(); + HDC desktopDC = GetDC(desktopWnd); + + m_hdc = CreateCompatibleDC(desktopDC); + + m_hbitmap = CreateCompatibleBitmap(desktopDC, m_width, m_height); + m_oldbitmap = SelectObject(m_hdc, m_hbitmap); + BitBlt(m_hdc, 0, 0, m_width, m_height, desktopDC, 0, 0, SRCCOPY); + + ReleaseDC(desktopWnd, desktopDC); + } + + bool Step() + { + // Stop after 10 steps + if (m_step++ > 10 || !m_bytes) + return false; + + int lines = GetDIBits(m_hdc, m_hbitmap, 0, m_height, m_bytes, &m_bi, DIB_RGB_COLORS); + if (lines) + { + for (int xh = 0; xh < m_height; ++xh) + { + int h = m_width * 4 * xh; + for (int w = 0; w < m_width; ++w) + { + UCHAR b = m_bytes[(h + w * 4) + 0]; + UCHAR g = m_bytes[(h + w * 4) + 1]; + UCHAR r = m_bytes[(h + w * 4) + 2]; + + // Standard formula to convert a color. + int gray = (r * 30 + g * 59 + b * 11) / 100; + if (gray < 0) + gray = 0; + + // Do not fade too fast. + r = (r*2 + gray) / 3; + g = (g*2 + gray) / 3; + b = (b*2 + gray) / 3; + + m_bytes[(h + w * 4) + 0] = b; + m_bytes[(h + w * 4) + 1] = g; + m_bytes[(h + w * 4) + 2] = r; + } + } + SetDIBits(m_hdc, m_hbitmap, 0, lines, m_bytes, &m_bi, DIB_RGB_COLORS); + } + return true; + } + + void Blt(HDC hdc) + { + BitBlt(hdc, 0, 0, m_width, m_height, m_hdc, 0, 0, SRCCOPY); + } + + HWND Wnd() + { + return m_hwnd; + } + + + BEGIN_COM_MAP(CDimmedWindow) + COM_INTERFACE_ENTRY_IID(IID_IUnknown, IUnknown) + END_COM_MAP() + +}; + + +LRESULT WINAPI CDimmedWindow::Proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch(uMsg) + { + case WM_NCCREATE: + { + LPCREATESTRUCT lpcs = reinterpret_cast<LPCREATESTRUCT>(lParam); + CDimmedWindow* info = static_cast<CDimmedWindow*>(lpcs->lpCreateParams); + SetWindowLongPtr(hWnd, GWLP_USERDATA, (LONG)info); + SetTimer(hWnd, INIT_TIMER_ID, 50, NULL); + break; + } + case WM_PAINT: + { + CDimmedWindow* info = reinterpret_cast<CDimmedWindow*>(GetWindowLongPtr(hWnd, GWLP_USERDATA)); + if (info) + { + PAINTSTRUCT paint; + HDC hdc = BeginPaint(hWnd, &paint); + info->Blt(hdc); + EndPaint(hWnd, &paint); + } + return 0; + } + case WM_TIMER: + if (wParam == INIT_TIMER_ID) + { + CDimmedWindow* info = reinterpret_cast<CDimmedWindow*>(GetWindowLongPtr(hWnd, GWLP_USERDATA)); + KillTimer(hWnd, INIT_TIMER_ID); + info->Init(); + return 0; + } + if (wParam == FADE_TIMER_ID) + { + CDimmedWindow* info = reinterpret_cast<CDimmedWindow*>(GetWindowLongPtr(hWnd, GWLP_USERDATA)); + if (info && info->Step()) + InvalidateRect(hWnd, NULL, TRUE); + else + KillTimer(hWnd, FADE_TIMER_ID); + return 0; + } + break; + default: + break; + } + return DefWindowProc(hWnd, uMsg, wParam, lParam); +} + + +extern "C" +HRESULT WINAPI +ShellDimScreen (void** pUnknown, HWND* hWindow) +{ + CComObject<CDimmedWindow> *pWindow; + HRESULT hr = CComObject<CDimmedWindow>::CreateInstance(&pWindow); + ULONG refcount; + + pWindow->WaitForInit(); + + _SEH2_TRY + { + hr = pWindow->QueryInterface(IID_IUnknown, pUnknown); + *hWindow = pWindow->Wnd(); + hr = S_OK; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + hr = E_INVALIDARG; + refcount = pWindow->AddRef(); + while (refcount) + refcount = pWindow->Release(); + } + _SEH2_END + + return hr; +} Propchange: trunk/reactos/dll/win32/msgina/dimmedwindow.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.h?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] Sun Sep 4 14:17:22 2016 @@ -1,5 +1,9 @@ #ifndef _MSGINA_H #define _MSGINA_H + +#ifdef __cplusplus +extern "C" { +#endif #include <stdarg.h> @@ -125,4 +129,8 @@ IN PWSTR Domain, IN PWSTR Password); +#ifdef __cplusplus +} // extern "C" +#endif + #endif /* _MSGINA_H */ Modified: trunk/reactos/dll/win32/msgina/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/msgina/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/stubs.c [iso-8859-1] Sun Sep 4 14:17:22 2016 @@ -116,10 +116,3 @@ UNIMPLEMENTED; return FALSE; } - -HRESULT WINAPI -ShellDimScreen (void* Unknown, HWND* hWindow) -{ - UNIMPLEMENTED; - return E_FAIL; -}

1 0

[hbelusca] 72571: [NTVDM]: Improve a bit the WOW16 "unsupported" warning message. See CORE-10323
by hbelusca＠svn.reactos.org 04 Sep '16

04 Sep '16

Author: hbelusca Date: Sun Sep 4 11:46:08 2016 New Revision: 72571 URL: http://svn.reactos.org/svn/reactos?rev=72571&view=rev Log: [NTVDM]: Improve a bit the WOW16 "unsupported" warning message. See CORE-10323 Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] Sun Sep 4 11:46:08 2016 @@ -796,7 +796,9 @@ /* Those are handled by NTVDM */ case SCS_WOW_BINARY: { - DisplayMessage(L"Trying to load '%S'. WOW16 applications are not supported at the moment.", + DisplayMessage(L"Trying to load '%S'.\n" + L"WOW16 applications are not supported internally by NTVDM at the moment.\n" + L"Press 'OK' to continue.", ProgramName); // Fall through }

1 0

[akhaldi] 72570: [CRT] Sync undname.c with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 04 Sep '16

04 Sep '16

Author: akhaldi Date: Sun Sep 4 09:04:00 2016 New Revision: 72570 URL: http://svn.reactos.org/svn/reactos?rev=72570&view=rev Log: [CRT] Sync undname.c with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/sdk/lib/crt/wine/undname.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] Sun Sep 4 09:04:00 2016 @@ -299,7 +299,7 @@ reactos/sdk/lib/crt/string/wcs.c # Synced at 20080611 reactos/sdk/lib/crt/string/wctype.c # Synced at WineStaging-1.9.16 reactos/sdk/lib/crt/wine/heap.c # Synced at 20080529 - reactos/sdk/lib/crt/wine/undname.c # Synced to WineStaging-1.7.55 + reactos/sdk/lib/crt/wine/undname.c # Synced to WineStaging-1.9.16 reactos/sdk/lib/crt/process/thread.c # Synced to WineStaging-1.7.55 User32 - Modified: trunk/reactos/sdk/lib/crt/wine/undname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/wine/undname.c… ============================================================================== --- trunk/reactos/sdk/lib/crt/wine/undname.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/wine/undname.c [iso-8859-1] Sun Sep 4 09:04:00 2016 @@ -184,7 +184,7 @@ a->alloc *= 2; a->elts = new; } - if (len == -1) len = (int)strlen(ptr); + if (len == -1) len = strlen(ptr); a->elts[a->num] = und_alloc(sym, len + 1); assert(a->elts[a->num]); memcpy(a->elts[a->num], ptr, len); @@ -197,10 +197,10 @@ for (i = a->max - 1; i >= 0; i--) { c = '>'; - if ((unsigned)i < a->start) c = '-'; - else if ((unsigned)i >= a->num) c = '}'; + if (i < a->start) c = '-'; + else if (i >= a->num) c = '}'; /* This check is as useless as the unused-but-set gcc warning that we want to silence here */ - if (c != 0) TRACE("%p\t%d%c %s\n", a, i, c, a->elts[i]); + if (c != 0) TRACE("%p\t%d%c %s\n", a, i, c, debugstr_a(a->elts[i])); } } @@ -222,7 +222,7 @@ return NULL; } TRACE("Returning %p[%d] => %s\n", - cref, idx, cref->elts[cref->start + idx]); + cref, idx, debugstr_a(cref->elts[cref->start + idx])); return cref->elts[cref->start + idx]; } @@ -246,7 +246,7 @@ { switch (format[++i]) { - case 's': t = va_arg(args, char*); if (t) len += (int)strlen(t); break; + case 's': t = va_arg(args, char*); if (t) len += strlen(t); break; case 'c': (void)va_arg(args, int); len++; break; default: i--; /* fall through */ case '%': len++; break; @@ -267,7 +267,7 @@ t = va_arg(args, char*); if (t) { - sz = (int)strlen(t); + sz = strlen(t); memcpy(p, t, sz); p += sz; } @@ -518,12 +518,12 @@ (*sym->current >= 'a' && *sym->current <= 'z') || (*sym->current >= '0' && *sym->current <= '9') || *sym->current == '_' || *sym->current == '$')) { - TRACE("Failed at '%c' in %s\n", *sym->current, ptr); + TRACE("Failed at '%c' in %s\n", *sym->current, debugstr_a(ptr)); return NULL; } } while (*++sym->current != '@'); sym->current++; - if (!str_array_push(sym, ptr, (int)(sym->current - 1 - ptr), &sym->names)) + if (!str_array_push(sym, ptr, sym->current - 1 - ptr, &sym->names)) return NULL; return str_array_get_ref(&sym->names, sym->names.num - sym->names.start - 1); @@ -641,15 +641,15 @@ char* ret; struct array *a = &sym->stack; - for (len = 0, i = start; i < (int)a->num; i++) + for (len = 0, i = start; i < a->num; i++) { assert(a->elts[i]); - len += 2 + (int)strlen(a->elts[i]); + len += 2 + strlen(a->elts[i]); } if (!(ret = und_alloc(sym, len - 1))) return NULL; for (len = 0, i = a->num - 1; i >= start; i--) { - sz = (int)strlen(a->elts[i]); + sz = strlen(a->elts[i]); memcpy(ret + len, a->elts[i], sz); len += sz; if (i > start) @@ -855,7 +855,7 @@ if (!get_modified_type(ct, sym, pmt_ref, in_args ? dt : 'P', in_args)) goto done; break; case 'P': /* Pointer */ - if (isdigit((unsigned char)*sym->current)) + if (isdigit(*sym->current)) { /* FIXME: * P6 = Function pointer @@ -1572,7 +1572,7 @@ else ret = FALSE; done: if (ret) assert(sym->result); - else WARN("Failed at %s\n", sym->current); + else WARN("Failed at %s\n", debugstr_a(sym->current)); return ret; } @@ -1603,7 +1603,7 @@ const char* result; TRACE("(%p,%s,%d,%p,%p,%p,%x)\n", - buffer, mangled, buflen, memget, memfree, unknown, flags); + buffer, debugstr_a(mangled), buflen, memget, memfree, unknown, flags); /* The flags details is not documented by MS. However, it looks exactly * like the UNDNAME_ manifest constants from imagehlp.h and dbghelp.h

1 0

[cwittich] 72569: [USER32] Fix use-after-free. wine patch by Thomas Faller
by cwittich＠svn.reactos.org 04 Sep '16

04 Sep '16

Author: cwittich Date: Sun Sep 4 08:57:52 2016 New Revision: 72569 URL: http://svn.reactos.org/svn/reactos?rev=72569&view=rev Log: [USER32] Fix use-after-free. wine patch by Thomas Faller Modified: trunk/reactos/win32ss/user/user32/misc/ddeclient.c Modified: trunk/reactos/win32ss/user/user32/misc/ddeclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/ddeclient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/ddeclient.c [iso-8859-1] Sun Sep 4 08:57:52 2016 @@ -769,7 +769,7 @@ GlobalDeleteAtom(uiHi); if (ack) *ack = uiLo; - GlobalFree(pXAct->hMem); + pXAct->hMem = GlobalFree(pXAct->hMem); pXAct->hDdeData = (HDDEDATA)TRUE; return TRUE;

1 0

[akhaldi] 72568: [SHELL32] Partially sync shlmenu.c with Wine Staging 1.9.16. CORE-11866
by akhaldi＠svn.reactos.org 04 Sep '16

04 Sep '16

Author: akhaldi Date: Sun Sep 4 08:57:08 2016 New Revision: 72568 URL: http://svn.reactos.org/svn/reactos?rev=72568&view=rev Log: [SHELL32] Partially sync shlmenu.c with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/dll/win32/shell32/wine/shlmenu.c Modified: trunk/reactos/dll/win32/shell32/wine/shlmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/shl… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shlmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shlmenu.c [iso-8859-1] Sun Sep 4 08:57:08 2016 @@ -608,7 +608,7 @@ clrPrevBkgnd = SetBkColor(lpdis->hDC, GetSysColor (COLOR_MENU)); } - CopyRect(&TextRect, &(lpdis->rcItem)); + TextRect = lpdis->rcItem; /* add the menubitmap */ menuinfo = FM_GetMenuInfo(pMyItem->hMenu); @@ -628,7 +628,7 @@ Shell_GetImageLists(0, &hImageList); ImageList_Draw(hImageList, pMyItem->iIconIndex, lpdis->hDC, xi, yi, ILD_NORMAL); - TRACE("-- 0x%04x 0x%04x 0x%04x 0x%04x\n", TextRect.left, TextRect.top, TextRect.right, TextRect.bottom); + TRACE("-- %s\n", wine_dbgstr_rect(&TextRect)); SetTextColor(lpdis->hDC, clrPrevText); SetBkColor(lpdis->hDC, clrPrevBkgnd); @@ -789,8 +789,8 @@ FIXME("%p 0x%08x\n", hMenu, uPos); if (GetMenuItemRect(0, hMenu, uPos, &rect)) - { FIXME("0x%04x 0x%04x 0x%04x 0x%04x\n", - rect.right, rect.left, rect.top, rect.bottom); + { + FIXME("%s\n", wine_dbgstr_rect(&rect)); return ((rect.right-rect.left)<<16) + (rect.top-rect.bottom); } return 0x00100010; /*FIXME*/

1 0

[cwittich] 72567: [SDK] sync undname.c to wine 1.9.16
by cwittich＠svn.reactos.org 04 Sep '16

04 Sep '16

Author: cwittich Date: Sun Sep 4 08:54:06 2016 New Revision: 72567 URL: http://svn.reactos.org/svn/reactos?rev=72567&view=rev Log: [SDK] sync undname.c to wine 1.9.16 Modified: trunk/reactos/sdk/lib/crt/wine/undname.c Modified: trunk/reactos/sdk/lib/crt/wine/undname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/wine/undname.c… ============================================================================== --- trunk/reactos/sdk/lib/crt/wine/undname.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/wine/undname.c [iso-8859-1] Sun Sep 4 08:54:06 2016 @@ -857,14 +857,55 @@ case 'P': /* Pointer */ if (isdigit((unsigned char)*sym->current)) { - /* FIXME: P6 = Function pointer, others who knows.. */ - if (*sym->current++ == '6') + /* FIXME: + * P6 = Function pointer + * P8 = Member function pointer + * others who knows.. */ + if (*sym->current == '8') { char* args = NULL; const char* call_conv; const char* exported; struct datatype_t sub_ct; unsigned mark = sym->stack.num; + const char* class; + const char* modifier; + const char* ptr_modif; + + sym->current++; + + if (!(class = get_class_name(sym))) + goto done; + if (!get_modifier(sym, &modifier, &ptr_modif)) + goto done; + if (modifier) + modifier = str_printf(sym, "%s %s", modifier, ptr_modif); + else if(ptr_modif[0]) + modifier = str_printf(sym, " %s", ptr_modif); + if (!get_calling_convention(*sym->current++, + &call_conv, &exported, + sym->flags & ~UNDNAME_NO_ALLOCATION_LANGUAGE)) + goto done; + if (!demangle_datatype(sym, &sub_ct, pmt_ref, FALSE)) + goto done; + + args = get_args(sym, pmt_ref, TRUE, '(', ')'); + if (!args) goto done; + sym->stack.num = mark; + + ct->left = str_printf(sym, "%s%s (%s %s::*", + sub_ct.left, sub_ct.right, call_conv, class); + ct->right = str_printf(sym, ")%s%s", args, modifier); + } + else if (*sym->current == '6') + { + char* args = NULL; + const char* call_conv; + const char* exported; + struct datatype_t sub_ct; + unsigned mark = sym->stack.num; + + sym->current++; if (!get_calling_convention(*sym->current++, &call_conv, &exported, @@ -902,6 +943,7 @@ case '5': case '6': case '7': case '8': case '9': /* Referring back to previously parsed type */ /* left and right are pushed as two separate strings */ + if (!pmt_ref) goto done; ct->left = str_array_get_ref(pmt_ref, (dt - '0') * 2); ct->right = str_array_get_ref(pmt_ref, (dt - '0') * 2 + 1); if (!ct->left) goto done; @@ -948,7 +990,37 @@ } break; case '$': - if (*sym->current == 'C') + if (*sym->current == 'B') + { + unsigned mark = sym->stack.num; + struct datatype_t sub_ct; + const char* arr = NULL; + sym->current++; + + /* multidimensional arrays */ + if (*sym->current == 'Y') + { + const char* n1; + int num; + + sym->current++; + if (!(n1 = get_number(sym))) goto done; + num = atoi(n1); + + while (num--) + arr = str_printf(sym, "%s[%s]", arr, get_number(sym)); + } + + if (!demangle_datatype(sym, &sub_ct, pmt_ref, FALSE)) goto done; + + if (arr) + ct->left = str_printf(sym, "%s %s", sub_ct.left, arr); + else + ct->left = sub_ct.left; + ct->right = sub_ct.right; + sym->stack.num = mark; + } + else if (*sym->current == 'C') { const char *ptr, *ptr_modif; @@ -1377,6 +1449,8 @@ sym->current++; str_array_init(&pmt); demangle_datatype(sym, &ct, &pmt, FALSE); + if (!demangle_datatype(sym, &ct, NULL, FALSE)) + goto done; function_name = str_printf(sym, "%s%s `RTTI Type Descriptor'", ct.left, ct.right); sym->current--;

1 0

[cwittich] 72566: [SHELL32] some minor wine syncs
by cwittich＠svn.reactos.org 04 Sep '16

04 Sep '16

Author: cwittich Date: Sun Sep 4 08:44:20 2016 New Revision: 72566 URL: http://svn.reactos.org/svn/reactos?rev=72566&view=rev Log: [SHELL32] some minor wine syncs Modified: trunk/reactos/dll/win32/shell32/wine/brsfolder.c trunk/reactos/dll/win32/shell32/wine/shellord.c Modified: trunk/reactos/dll/win32/shell32/wine/brsfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/brs… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/brsfolder.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/brsfolder.c [iso-8859-1] Sun Sep 4 08:44:20 2016 @@ -782,10 +782,11 @@ if(FAILED(hr)) return hr; - hr = SHGetPathFromIDListW(info->pidlRet, name); - if(FAILED(hr)) + if(!SHGetPathFromIDListW(info->pidlRet, name)) { + hr = E_FAIL; goto cleanup; - + } + len = strlenW(name); if(len<MAX_PATH) name[len++] = '\\'; Modified: trunk/reactos/dll/win32/shell32/wine/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shellord.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shellord.c [iso-8859-1] Sun Sep 4 08:44:20 2016 @@ -900,7 +900,7 @@ /* buffer size looks good */ ptr += 12; /* get to string */ len = bufused - (ptr-buffer); /* get length of buf remaining */ - if ((lstrlenA(ptr) > 0) && (lstrlenA(ptr) <= len-1)) { + if (ptr[0] && (lstrlenA(ptr) <= len-1)) { /* appears to be good string */ lstrcpyA(old_lnk_name, link_dir); PathAppendA(old_lnk_name, ptr);

1 0

[cwittich] 72565: [SETUPAPI] Remove dead code. wine patch by André Hentschel
by cwittich＠svn.reactos.org 04 Sep '16

04 Sep '16

Author: cwittich Date: Sun Sep 4 08:17:41 2016 New Revision: 72565 URL: http://svn.reactos.org/svn/reactos?rev=72565&view=rev Log: [SETUPAPI] Remove dead code. wine patch by André Hentschel Modified: trunk/reactos/dll/win32/setupapi/queue.c Modified: trunk/reactos/dll/win32/setupapi/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/queue.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/queue.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/queue.c [iso-8859-1] Sun Sep 4 08:17:41 2016 @@ -136,11 +136,9 @@ if (buffer[-1] != '\\') *buffer++ = '\\'; if (src3) while (*src3 == '\\') src3++; } + if (src3) - { strcpyW( buffer, src3 ); - buffer += strlenW(buffer ); - } }

1 0

[cwittich] 72564: [ADVAPI32] Use proper enum member to initialize SECURITY_IMPERSONATION_LEVEL variable wine patch by Nikolay Sivov
by cwittich＠svn.reactos.org 04 Sep '16

04 Sep '16

Author: cwittich Date: Sun Sep 4 08:11:52 2016 New Revision: 72564 URL: http://svn.reactos.org/svn/reactos?rev=72564&view=rev Log: [ADVAPI32] Use proper enum member to initialize SECURITY_IMPERSONATION_LEVEL variable wine patch by Nikolay Sivov Modified: trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Sun Sep 4 08:11:52 2016 @@ -503,7 +503,7 @@ PHANDLE newToken) { TOKEN_TYPE type; - SECURITY_IMPERSONATION_LEVEL level = TokenImpersonationLevel; + SECURITY_IMPERSONATION_LEVEL level = SecurityAnonymous; DWORD size; FIXME("(%p, 0x%x, %u, %p, %u, %p, %u, %p, %p): stub\n",

1 0

[cwittich] 72563: [USER32] on't overwrite 'cb' field with uninitialized data in DdeQueryConvInfo() patch by Nikolay Sivov
by cwittich＠svn.reactos.org 04 Sep '16

04 Sep '16

Author: cwittich Date: Sun Sep 4 08:03:23 2016 New Revision: 72563 URL: http://svn.reactos.org/svn/reactos?rev=72563&view=rev Log: [USER32] on't overwrite 'cb' field with uninitialized data in DdeQueryConvInfo() patch by Nikolay Sivov Modified: trunk/reactos/win32ss/user/user32/misc/ddemisc.c Modified: trunk/reactos/win32ss/user/user32/misc/ddemisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/ddemisc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/ddemisc.c [iso-8859-1] Sun Sep 4 08:03:23 2016 @@ -2456,7 +2456,10 @@ } if (ret != 0) + { + ci.cb = lpConvInfo->cb; memcpy(lpConvInfo, &ci, min((size_t)lpConvInfo->cb, sizeof(ci))); + } return ret; }

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