Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dquintana] 63623: [EXPLORER-NEW] * Use a struct like the comment suggested. May not fix anything, but it's one FIXME less in ReactOS.
by dquintana＠svn.reactos.org 19 Jun '14

19 Jun '14

Author: dquintana Date: Thu Jun 19 23:38:39 2014 New Revision: 63623 URL: http://svn.reactos.org/svn/reactos?rev=63623&view=rev Log: [EXPLORER-NEW] * Use a struct like the comment suggested. May not fix anything, but it's one FIXME less in ReactOS. Modified: branches/shell-experiments/base/shell/explorer-new/trayntfy.c Modified: branches/shell-experiments/base/shell/explorer-new/trayntfy.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/trayntfy.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/trayntfy.c [iso-8859-1] Thu Jun 19 23:38:39 2014 @@ -44,6 +44,13 @@ INT VisibleButtonCount; } SYS_PAGER_WND_DATA, *PSYS_PAGER_WND_DATA; +// Data comes from shell32/systray.cpp -> TrayNotifyCDS_Dummy +typedef struct _SYS_PAGER_COPY_DATA +{ + DWORD cookie; + DWORD notify_code; + NOTIFYICONDATA nicon_data; +} SYS_PAGER_COPY_DATA, *PSYS_PAGER_COPY_DATA; static PNOTIFY_ITEM SysPagerWnd_CreateNotifyItemData(IN OUT PSYS_PAGER_WND_DATA This) @@ -418,7 +425,7 @@ PCOPYDATASTRUCT cpData = (PCOPYDATASTRUCT)lParam; if (cpData->dwData == 1) { - DWORD trayCommand; + SYS_PAGER_COPY_DATA data; NOTIFYICONDATA *iconData; HWND parentHWND; RECT windowRect; @@ -426,15 +433,21 @@ parentHWND = GetParent(parentHWND); GetClientRect(parentHWND, &windowRect); - /* FIXME: ever heard of "struct"? */ - trayCommand = *(DWORD *) (((BYTE *)cpData->lpData) + 4); - iconData = (NOTIFYICONDATA *) (((BYTE *)cpData->lpData) + 8); - - switch (trayCommand) + ZeroMemory(&data, sizeof(data)); + CopyMemory( + &data, + (PSYS_PAGER_COPY_DATA) cpData->lpData, + cpData->dwData); + iconData = &data.nicon_data; + + switch (data.notify_code) { case NIM_ADD: { PPNOTIFY_ITEM NotifyPointer; + + DbgPrint("NotifyMessage received with NIM_ADD\n"); + NotifyPointer = SysPagerWnd_FindPPNotifyItemByIconData(This, iconData); if (!NotifyPointer) @@ -446,6 +459,9 @@ case NIM_MODIFY: { PPNOTIFY_ITEM NotifyPointer; + + DbgPrint("NotifyMessage received with NIM_MODIFY\n"); + NotifyPointer = SysPagerWnd_FindPPNotifyItemByIconData(This, iconData); if (!NotifyPointer) @@ -460,9 +476,14 @@ } case NIM_DELETE: { + DbgPrint("NotifyMessage received with NIM_DELETE\n"); + SysPagerWnd_RemoveButton(This, iconData); break; } + default: + DbgPrint("NotifyMessage received with unknown code %d.\n", data.notify_code); + break; } SendMessage(parentHWND, WM_SIZE,

1 0

[dquintana] 63622: [FILEBROWSER] * Copy basic path parsing from explorer-new, so filebrowser.exe can load with a different folder active.
by dquintana＠svn.reactos.org 19 Jun '14

19 Jun '14

Author: dquintana Date: Thu Jun 19 23:24:09 2014 New Revision: 63622 URL: http://svn.reactos.org/svn/reactos?rev=63622&view=rev Log: [FILEBROWSER] * Copy basic path parsing from explorer-new, so filebrowser.exe can load with a different folder active. Modified: branches/shell-experiments/base/shell/filebrowser/filebrowser.c Modified: branches/shell-experiments/base/shell/filebrowser/filebrowser.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/fi… ============================================================================== --- branches/shell-experiments/base/shell/filebrowser/filebrowser.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/filebrowser/filebrowser.c [iso-8859-1] Thu Jun 19 23:24:09 2014 @@ -28,18 +28,110 @@ int _tmain(int argc, _TCHAR* argv[]) { + WCHAR root[MAX_PATH]; + HRESULT hr; + LPSHELLFOLDER pDesktopFolder = NULL; + LPITEMIDLIST pidlRoot = NULL; + typedef HRESULT(WINAPI *SH_OPEN_NEW_FRAME)(LPITEMIDLIST pidl, IUnknown *paramC, long param10, long param14); + SH_OPEN_NEW_FRAME SHOpenNewFrame; + HMODULE hBrowseui = LoadLibraryW(L"browseui.dll"); - if (hBrowseui) + + if (!hBrowseui) + return 1; + + + if (argc < 2) { - SH_OPEN_NEW_FRAME SHOpenNewFrame = (SH_OPEN_NEW_FRAME)GetProcAddress(hBrowseui, (LPCSTR)103); + SH_OPEN_NEW_FRAME SHOpenNewFrame = (SH_OPEN_NEW_FRAME) GetProcAddress(hBrowseui, (LPCSTR) 103); LPITEMIDLIST pidlDrives; SHGetSpecialFolderLocation(NULL, CSIDL_DRIVES, &pidlDrives); - SHOpenNewFrame((LPITEMIDLIST)pidlDrives, NULL, 0, 0); + SHOpenNewFrame((LPITEMIDLIST) pidlDrives, NULL, 0, 0); + } + else + { + /* A shell is already loaded. Parse the command line arguments + and unless we need to do something specific simply display + the desktop in a separate explorer window */ + /* FIXME */ + + /* Commandline switches: + * + * /n Open a new window, even if an existing one still exists. + * /e Start with the explorer sidebar shown. + * /root,<object> Open a window for the given object path. + * /select,<object> Open a window with the given object selected. + */ + + /* FIXME: Do it right */ + WCHAR* tmp = wcsstr(argv[1], L"/root,"); + if (tmp) + { + WCHAR* tmp2; + + tmp += 6; // skip to beginning of path + tmp2 = wcschr(tmp, L','); + + if (tmp2) + { + wcsncpy(root, tmp, tmp2 - tmp); + } + else + { + wcscpy(root, tmp); + } + } + else + { + wcscpy(root, argv[1]); + } + + if (root[0] == L'"') + { + int len = wcslen(root) - 2; + wcsncpy(root, root + 1, len); + root[len] = 0; + } + + if (wcslen(root) > 0) + { + LPITEMIDLIST pidl; + ULONG chEaten; + ULONG dwAttributes; + + if (SUCCEEDED(SHGetDesktopFolder(&pDesktopFolder))) + { + hr = pDesktopFolder->lpVtbl->ParseDisplayName(pDesktopFolder, + NULL, + NULL, + root, + &chEaten, + &pidl, + &dwAttributes); + if (SUCCEEDED(hr)) + { + pidlRoot = pidl; + } + } + } + + if (!pidlRoot) + { + hr = SHGetSpecialFolderLocation(NULL, CSIDL_DRIVES, &pidlRoot); + if (FAILED(hr)) + return 0; + } + + SHOpenNewFrame = (SH_OPEN_NEW_FRAME) GetProcAddress(hBrowseui, (LPCSTR) 103); + + hr = SHOpenNewFrame(pidlRoot, (IUnknown*) pDesktopFolder, 0, 0); + if (FAILED(hr)) + return 0; } - /* FIXME: we should wait a bit here and see if a window was created. If not we should exit this process */ + /* FIXME: we should wait a bit here and see if a window was created. If not we should exit this process. */ + Sleep(1000); + ExitThread(0); - - return 0; }

1 0

[dquintana] 63621: [BROWSEUI] * Process ParseNow on the CBEN_ENDEDIT notification. * Call SHAutoComplete to ask the edit control to have autocomplete functionality. I need to figure out the flag or...
by dquintana＠svn.reactos.org 19 Jun '14

19 Jun '14

Author: dquintana Date: Thu Jun 19 23:23:04 2014 New Revision: 63621 URL: http://svn.reactos.org/svn/reactos?rev=63621&view=rev Log: [BROWSEUI] * Process ParseNow on the CBEN_ENDEDIT notification. * Call SHAutoComplete to ask the edit control to have autocomplete functionality. I need to figure out the flag or whatever is needed to make it show "Search 'string'" when entering something that's not a valid path. Modified: branches/shell-experiments/dll/win32/browseui/addressband.cpp branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp Modified: branches/shell-experiments/dll/win32/browseui/addressband.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/addressband.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/addressband.cpp [iso-8859-1] Thu Jun 19 23:23:04 2014 @@ -347,6 +347,8 @@ CComPtr<IWinEventHandler> winEventHandler; HRESULT hResult; + *theResult = 0; + switch (uMsg) { case WM_WININICHANGE: @@ -544,7 +546,6 @@ { if (notifyHeader->hwndFrom == fGoButton) { - fAddressEditBox->ParseNow(0); fAddressEditBox->Execute(0); } return 0; Modified: branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] Thu Jun 19 23:23:04 2014 @@ -74,6 +74,8 @@ fEditWindow.SubclassWindow(editControl); fSite = param18; + SHAutoComplete(fEditWindow.m_hWnd, SHACF_FILESYSTEM | SHACF_URLALL | SHACF_USETAB); + // take advice to watch events HRESULT hResult = IUnknown_QueryService(param18, SID_SShellBrowser, IID_PPV_ARG(IBrowserService, &browserService)); if (SUCCEEDED(hResult)) @@ -98,8 +100,12 @@ CComPtr<IShellBrowser> pisb; hr = IUnknown_QueryService(fSite, SID_SShellBrowser, IID_PPV_ARG(IShellBrowser, &pisb)); - - IUnknown_GetWindow(pisb, &topLevelWindow); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = IUnknown_GetWindow(pisb, &topLevelWindow); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; LPWSTR input; int inputLength = GetWindowTextLength(fCombobox.m_hWnd) + 2; @@ -118,12 +124,19 @@ { addressLength += 2; address = new WCHAR[addressLength]; - ExpandEnvironmentStrings(input, address, 0); + if (!ExpandEnvironmentStrings(input, address, addressLength)) + { + delete[] address; + address = input; + } } CComPtr<IShellFolder> psfDesktop; hr = SHGetDesktopFolder(&psfDesktop); - hr = psfDesktop->ParseDisplayName(topLevelWindow, NULL, address, &eaten, &pidlLastParsed, &attributes); + if (SUCCEEDED(hr)) + { + hr = psfDesktop->ParseDisplayName(topLevelWindow, NULL, address, &eaten, &pidlLastParsed, &attributes); + } if (address != input) delete [] address; @@ -171,8 +184,21 @@ HRESULT STDMETHODCALLTYPE CAddressEditBox::OnWinEvent( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) { - // handle fill of listbox here - return E_NOTIMPL; + LPNMHDR hdr; + + *theResult = 0; + + switch (uMsg) + { + case WM_NOTIFY: + hdr = (LPNMHDR) lParam; + if (hdr->code == CBEN_ENDEDIT) + { + ParseNow(0); + } + break; + } + return S_OK; } HRESULT STDMETHODCALLTYPE CAddressEditBox::IsWindowOwner(HWND hWnd)

1 0

[dquintana] 63620: [RSHELL] * Turn off spammy log. * A small themeing tweak for the menubar. [BROWSEUI] * Turn off spammy log. * A small tweak to a function.
by dquintana＠svn.reactos.org 19 Jun '14

19 Jun '14

Author: dquintana Date: Thu Jun 19 23:14:39 2014 New Revision: 63620 URL: http://svn.reactos.org/svn/reactos?rev=63620&view=rev Log: [RSHELL] * Turn off spammy log. * A small themeing tweak for the menubar. [BROWSEUI] * Turn off spammy log. * A small tweak to a function. Modified: branches/shell-experiments/base/shell/rshell/CMakeLists.txt branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp Modified: branches/shell-experiments/base/shell/rshell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMakeLists.txt [iso-8859-1] Thu Jun 19 23:14:39 2014 @@ -28,6 +28,7 @@ wine) add_importlibs(rshell + uxtheme shlwapi shell32 gdi32 Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Thu Jun 19 23:14:39 2014 @@ -44,7 +44,7 @@ #else *ppv = NULL; - CMenuBand * site = new CComDebugObject<CMenuBand>(); + CMenuBand * site = new CComObject<CMenuBand>(); if (!site) return E_OUTOFMEMORY; Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Thu Jun 19 23:14:39 2014 @@ -21,6 +21,7 @@ #include <windowsx.h> #include <commoncontrols.h> #include <shlwapi_undoc.h> +#include <uxtheme.h> #include "CMenuBand.h" #include "CMenuToolbars.h" @@ -195,7 +196,7 @@ isHot = m_hotBar == this && (int) cdraw->nmcd.dwItemSpec == m_hotItem; isPopup = m_popupBar == this && (int) cdraw->nmcd.dwItemSpec == m_popupItem; - if (m_initFlags & SMINIT_VERTICAL) + if (m_initFlags & SMINIT_VERTICAL || IsAppThemed()) { // Remove HOT and CHECKED flags (will restore HOT if necessary) cdraw->nmcd.uItemState &= ~(CDIS_HOT | CDIS_CHECKED); @@ -829,7 +830,7 @@ HRESULT CMenuToolbarBase::ExecuteItem(INT iItem) { - m_menuBand->_KillPopupTimers(); + this->m_menuBand->_KillPopupTimers(); INT index; DWORD_PTR data; Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Thu Jun 19 23:14:39 2014 @@ -547,7 +547,7 @@ fLocked = false; fMenuBandWindow = NULL; fNavigationWindow = NULL; - fMenuCallback = new CComDebugObject<CMenuCallback>(); + fMenuCallback = new CComObject<CMenuCallback>(); fToolbarWindow = NULL; fAdviseCookie = 0; Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Thu Jun 19 23:14:39 2014 @@ -1093,12 +1093,17 @@ CComPtr<IDeskBand> deskBand; HRESULT hResult; + if (!fClientBars[BIInternetToolbar].clientBar) + return E_FAIL; + hResult = IUnknown_QueryService(fClientBars[BIInternetToolbar].clientBar, SID_IBandSite, IID_PPV_ARG(IBandSite, &bandSite)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; + hResult = bandSite->QueryBand(1, &deskBand, NULL, NULL, 0); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; + return deskBand->QueryInterface(riid, shellMenu); }

1 0

[jgardou] 63619: [KSECDD] - Really export symbols - Properly stub InitSecurityInterfaceW - Install the driver
by jgardou＠svn.reactos.org 19 Jun '14

19 Jun '14

Author: jgardou Date: Thu Jun 19 11:24:48 2014 New Revision: 63619 URL: http://svn.reactos.org/svn/reactos?rev=63619&view=rev Log: [KSECDD] - Really export symbols - Properly stub InitSecurityInterfaceW - Install the driver Modified: trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/drivers/crypto/ksecdd/CMakeLists.txt trunk/reactos/drivers/crypto/ksecdd/stubs.c Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Thu Jun 19 11:24:48 2014 @@ -60,6 +60,7 @@ swenum.sys=,,,,,,,,,,,,4 ntdll.dll=,,,,,,,,,,,,2 wmilib.sys=,,,,,,,,,,,,4 +ksecdd.sys=,,,,,,,,,,,,4 [HardwareIdsDatabase] ;*PNP0A00 = isapnp Modified: trunk/reactos/drivers/crypto/ksecdd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/CMak… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/crypto/ksecdd/CMakeLists.txt [iso-8859-1] Thu Jun 19 11:24:48 2014 @@ -1,6 +1,5 @@ spec2def(ksecdd.sys ksecdd.spec) - include_directories( ${REACTOS_SOURCE_DIR}/include/reactos/drivers/ksecdd @@ -11,7 +10,8 @@ dispatch.c random.c stubs.c - ksecdd.rc) + ksecdd.rc + ${CMAKE_CURRENT_BINARY_DIR}/ksecdd.def) add_library(ksecdd SHARED ${SOURCE}) target_link_libraries(ksecdd cryptlib pseh) Modified: trunk/reactos/drivers/crypto/ksecdd/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/crypto/ksecdd/stub… ============================================================================== --- trunk/reactos/drivers/crypto/ksecdd/stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/crypto/ksecdd/stubs.c [iso-8859-1] Thu Jun 19 11:24:48 2014 @@ -208,6 +208,15 @@ return 0; } +PSecurityFunctionTableW +SEC_ENTRY +InitSecurityInterfaceW(void) +{ + + UNIMPLEMENTED_DBGBREAK(); + return NULL; +} + VOID SEC_ENTRY KSecRegisterSecurityProvider(VOID)

1 0

[jgardou] 63618: [NTOS/MM] - Do not mark VAD as private memory when creating a MEMORY_AREA, as this is never the case (only used for sections) - Add a few DPRINTS. CORE-8140 #resolve fixed with r63618
by jgardou＠svn.reactos.org 19 Jun '14

19 Jun '14

Author: jgardou Date: Thu Jun 19 10:50:47 2014 New Revision: 63618 URL: http://svn.reactos.org/svn/reactos?rev=63618&view=rev Log: [NTOS/MM] - Do not mark VAD as private memory when creating a MEMORY_AREA, as this is never the case (only used for sections) - Add a few DPRINTS. CORE-8140 #resolve fixed with r63618 Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Thu Jun 19 10:50:47 2014 @@ -4398,6 +4398,9 @@ } } + DPRINT("NtAllocateVirtualMemory: Process 0x%p, Address 0x%p, Zerobits %lu , RegionSize 0x%x, Allocation type 0x%x, Protect 0x%x.\n", + Process, PBaseAddress, ZeroBits, PRegionSize, AllocationType, Protect); + // // Check for large page allocations and make sure that the required privilege // is being held, before attempting to handle them. @@ -4656,6 +4659,7 @@ // } _SEH2_END; + DPRINT("Reserved %x bytes at %p.\n", PRegionSize, StartingAddress); return STATUS_SUCCESS; } @@ -5152,6 +5156,9 @@ Attached = TRUE; } } + + DPRINT("NtFreeVirtualMemory: Process 0x%p, Adress 0x%p, size 0x%x, FreeType %x.\n", + Process, PBaseAddress, PRegionSize, FreeType); // // Lock the address space Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=63… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Thu Jun 19 10:50:47 2014 @@ -399,7 +399,6 @@ Vad->EndingVpn = Vad->StartingVpn; } Vad->u.VadFlags.Spare = 1; - Vad->u.VadFlags.PrivateMemory = 1; Vad->u.VadFlags.Protection = MiMakeProtectionMask(marea->Protect); /* Insert the VAD */

1 0

[jgardou] 63617: [OPENGL32/MESA] - Report OpenGL version 1.1
by jgardou＠svn.reactos.org 19 Jun '14

19 Jun '14

Author: jgardou Date: Thu Jun 19 08:18:25 2014 New Revision: 63617 URL: http://svn.reactos.org/svn/reactos?rev=63617&view=rev Log: [OPENGL32/MESA] - Report OpenGL version 1.1 Modified: trunk/reactos/dll/opengl/mesa/main/version.c Modified: trunk/reactos/dll/opengl/mesa/main/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/versi… ============================================================================== --- trunk/reactos/dll/opengl/mesa/main/version.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/main/version.c [iso-8859-1] Thu Jun 19 08:18:25 2014 @@ -56,75 +56,22 @@ static void compute_version(struct gl_context *ctx) { - GLuint major, minor; - static const int max = 100; + /* report openGL 1.1 */ + ctx->VersionMajor = 1; + ctx->VersionMinor = 1; - const GLboolean ver_1_3 = (ctx->Extensions.ARB_texture_cube_map && - ctx->Extensions.ARB_texture_env_combine && - ctx->Extensions.ARB_texture_env_dot3); - const GLboolean ver_1_4 = (ver_1_3 && - ctx->Extensions.ARB_texture_env_crossbar && - ctx->Extensions.ARB_window_pos && - ctx->Extensions.EXT_blend_color && - ctx->Extensions.EXT_blend_func_separate && - ctx->Extensions.EXT_blend_minmax && - ctx->Extensions.EXT_fog_coord && - ctx->Extensions.EXT_point_parameters && - ctx->Extensions.EXT_secondary_color); - const GLboolean ver_1_5 = (ver_1_4 && - ctx->Extensions.EXT_shadow_funcs); - const GLboolean ver_2_0 = (ver_1_5 && - ctx->Extensions.ARB_point_sprite && - ctx->Extensions.EXT_blend_equation_separate); - const GLboolean ver_2_1 = (ver_2_0); - const GLboolean ver_3_0 = (ver_2_1 && - ctx->Extensions.ARB_map_buffer_range); + override_version(ctx, &ctx->VersionMajor, &ctx->VersionMinor); - - if (ver_3_0) { - major = 3; - minor = 0; - } - else if (ver_2_1) { - major = 2; - minor = 1; - } - else if (ver_2_0) { - major = 2; - minor = 0; - } - else if (ver_1_5) { - major = 1; - minor = 5; - } - else if (ver_1_4) { - major = 1; - minor = 4; - } - else if (ver_1_3) { - major = 1; - minor = 3; - } - else { - major = 1; - minor = 2; - } - - ctx->VersionMajor = major; - ctx->VersionMinor = minor; - - override_version(ctx, &ctx->VersionMajor, &ctx->VersionMinor); - - ctx->VersionString = (char *) malloc(max); - if (ctx->VersionString) { - _mesa_snprintf(ctx->VersionString, max, - "%u.%u Mesa " MESA_VERSION_STRING + ctx->VersionString = (char *) malloc(20); + if (ctx->VersionString) { + _mesa_snprintf(ctx->VersionString, 20, + "%u.%u Mesa " MESA_VERSION_STRING #ifdef MESA_GIT_SHA1 - " (" MESA_GIT_SHA1 ")" + " (" MESA_GIT_SHA1 ")" #endif - , - ctx->VersionMajor, ctx->VersionMinor); - } + , + ctx->VersionMajor, ctx->VersionMinor); + } } /**

1 0

[jgardou] 63616: [NTOS/MM] - When freeing virtual memory, correctly set the ending address of the shrunk memory area. CORE-7467
by jgardou＠svn.reactos.org 18 Jun '14

18 Jun '14

Author: jgardou Date: Wed Jun 18 18:32:46 2014 New Revision: 63616 URL: http://svn.reactos.org/svn/reactos?rev=63616&view=rev Log: [NTOS/MM] - When freeing virtual memory, correctly set the ending address of the shrunk memory area. CORE-7467 Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Wed Jun 18 18:32:46 2014 @@ -5336,7 +5336,7 @@ ASSERT(Vad->StartingVpn << PAGE_SHIFT == (ULONG_PTR)MemoryArea->StartingAddress); ASSERT((Vad->EndingVpn + 1) << PAGE_SHIFT == (ULONG_PTR)MemoryArea->EndingAddress); Vad->EndingVpn = ((ULONG_PTR)StartingAddress - 1) >> PAGE_SHIFT; - MemoryArea->EndingAddress = (PVOID)(((Vad->EndingVpn + 1) << PAGE_SHIFT) - 1); + MemoryArea->EndingAddress = (PVOID)(StartingAddress); } else {

1 0

[jgardou] 63615: [OPENGL32] - fix an off-by-one error
by jgardou＠svn.reactos.org 18 Jun '14

18 Jun '14

Author: jgardou Date: Wed Jun 18 17:28:14 2014 New Revision: 63615 URL: http://svn.reactos.org/svn/reactos?rev=63615&view=rev Log: [OPENGL32] - fix an off-by-one error Modified: trunk/reactos/dll/opengl/opengl32/swimpl.c Modified: trunk/reactos/dll/opengl/opengl32/swimpl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/swimpl… ============================================================================== --- trunk/reactos/dll/opengl/opengl32/swimpl.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/opengl32/swimpl.c [iso-8859-1] Wed Jun 18 17:28:14 2014 @@ -439,7 +439,7 @@ TRACE("OpenGL software implementation START!\n"); /* allocate our structure */ - fb = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET(struct sw_framebuffer, bmi.bmiColors[2])); + fb = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET(struct sw_framebuffer, bmi.bmiColors[3])); if(!fb) { ERR("HeapAlloc FAILED!\n");

1 0

[jgardou] 63614: [OPENGL32] - Fix bitfields for 16-bits pixel format
by jgardou＠svn.reactos.org 18 Jun '14

18 Jun '14

Author: jgardou Date: Wed Jun 18 17:24:18 2014 New Revision: 63614 URL: http://svn.reactos.org/svn/reactos?rev=63614&view=rev Log: [OPENGL32] - Fix bitfields for 16-bits pixel format Modified: trunk/reactos/dll/opengl/opengl32/swimpl.c Modified: trunk/reactos/dll/opengl/opengl32/swimpl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/swimpl… ============================================================================== --- trunk/reactos/dll/opengl/opengl32/swimpl.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/opengl32/swimpl.c [iso-8859-1] Wed Jun 18 17:24:18 2014 @@ -51,7 +51,7 @@ { MESA_FORMAT_RGB888, 24, 8, 0, 0x00000000, 8, 8, 0x00000000, 8, 16, 0x00000000, 0, 0, 0x00000000, 16, 16, 8, BI_RGB }, // { MESA_FORMAT_BGR888, 24, 8, 16, 8, 8, 8, 0, 0, 0, 16, 32, 8 }, // { MESA_FORMAT_BGR888, 24, 8, 16, 8, 8, 8, 0, 0, 0, 16, 16, 8 }, - { MESA_FORMAT_RGB565, 16, 5, 0, 0x00000000, 6, 5, 0x00000000, 5, 11, 0x00000000, 0, 0, 0x00000000, 16, 32, 8, BI_BITFIELDS }, + { MESA_FORMAT_RGB565, 16, 5, 0, 0x0000F800, 6, 5, 0x000007E0, 5, 11, 0x0000001F, 0, 0, 0x00000000, 16, 32, 8, BI_BITFIELDS }, { MESA_FORMAT_RGB565, 16, 5, 0, 0x0000F800, 6, 5, 0x000007E0, 5, 11, 0x0000001F, 0, 0, 0x00000000, 16, 16, 8, BI_BITFIELDS }, }; @@ -361,15 +361,15 @@ INT nb_win_compat = 0, start_win_compat = 0; INT ret = sizeof(pixel_formats)/sizeof(pixel_formats[0]); - if(GetObjectType(hdc) == OBJ_DC) + if (GetObjectType(hdc) == OBJ_DC) { /* Find the window compatible formats */ INT bpp = GetDeviceCaps(hdc, BITSPIXEL); - for(index = 0; index<sizeof(pixel_formats)/sizeof(pixel_formats[0]); index++) - { - if(pixel_formats[index].color_bits == bpp) + for (index = 0; index < sizeof(pixel_formats)/sizeof(pixel_formats[0]); index++) + { + if (pixel_formats[index].color_bits == bpp) { - if(!start_win_compat) + if (!start_win_compat) start_win_compat = index+1; nb_win_compat++; } @@ -441,9 +441,13 @@ /* allocate our structure */ fb = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET(struct sw_framebuffer, bmi.bmiColors[2])); if(!fb) + { + ERR("HeapAlloc FAILED!\n"); return FALSE; + } /* Get the format index */ fb->format_index = index_from_format(dc_data, format, &doubleBuffered); + TRACE("Using format %u - double buffered: %x.\n", fb->format_index, doubleBuffered); fb->flags = doubleBuffered ? SW_FB_DOUBLEBUFFERED : 0; /* Set the bitmap info describing the framebuffer */ fb->bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); @@ -663,6 +667,9 @@ * of the client area via GetClientRect. */ RECT client_rect; UINT width, height; + + TRACE("Got WM_WINDOWPOSCHANGED\n"); + GetClientRect(pParams->hwnd, &client_rect); width = client_rect.right - client_rect.left; height = client_rect.bottom - client_rect.top;

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