Ros-diffs November 2015

ros-diffs@reactos.org

14 participants
457 discussions

[akhaldi] 70184: [USER32] Sync spy.c with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Nov 28 16:29:14 2015 New Revision: 70184 URL: http://svn.reactos.org/svn/reactos?rev=70184&view=rev Log: [USER32] Sync spy.c with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/win32ss/user/user32/windows/spy.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 Nov 28 16:29:14 2015 @@ -318,7 +318,7 @@ reactos/win32ss/user/user32/windows/menu.c # Forked reactos/win32ss/user/user32/windows/messagebox.c # Forked reactos/win32ss/user/user32/windows/rect.c # Forked (uitools.c) - reactos/win32ss/user/user32/windows/spy.c # Synced to WineStaging-1.7.37 + reactos/win32ss/user/user32/windows/spy.c # Synced to WineStaging-1.7.55 reactos/win32ss/user/user32/windows/text.c # Forked (lstr.c) reactos/win32ss/user/user32/windows/winpos.c # Forked Modified: trunk/reactos/win32ss/user/user32/windows/spy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/spy.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/spy.c [iso-8859-1] Sat Nov 28 16:29:14 2015 @@ -1555,8 +1555,9 @@ USM(TB_MAPACCELERATORW ,0), USM(TB_GETSTRINGW ,0), USM(TB_GETSTRINGA ,0), - USM(TB_UNKWN45D ,8), + USM(TB_SETBOUNDINGSIZE ,8), USM(TB_SETHOTITEM2 ,0), + USM(TB_HASACCELERATOR ,0), USM(TB_SETLISTGAP ,0), USM(TB_GETIMAGELISTCOUNT ,0), USM(TB_GETIDEALSIZE ,8), @@ -2099,7 +2100,7 @@ { INT index; if (offset < 0 && offset % 2 == 0 && ((index = -(offset + 8) / 2) < - sizeof(ClassLongOffsetNames) / sizeof(*ClassLongOffsetNames))) + sizeof(ClassLongOffsetNames) / sizeof(*ClassLongOffsetNames))) { return ClassLongOffsetNames[index]; } @@ -2516,10 +2517,10 @@ TRACE("NMHDR hwndFrom=%p idFrom=0x%08lx code=0x%08x\n", pnmh->hwndFrom, pnmh->idFrom, pnmh->code); } + break; default: if (sp_e->data_len > 0) SPY_DumpMem ("MSG lParam", (UINT *)sp_e->lParam, sp_e->data_len); - break; } }

9 years

[akhaldi] 70183: [USER32] Sync exticon.c with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Nov 28 16:27:34 2015 New Revision: 70183 URL: http://svn.reactos.org/svn/reactos?rev=70183&view=rev Log: [USER32] Sync exticon.c with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/win32ss/user/user32/misc/exticon.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 Nov 28 16:27:34 2015 @@ -306,7 +306,7 @@ reactos/win32ss/user/user32/misc/dde.c # Synced to WineStaging-1.7.55 (dde_misc.c) reactos/win32ss/user/user32/misc/ddeclient.c # Synced to WineStaging-1.7.55 reactos/win32ss/user/user32/misc/ddeserver.c # Synced to WineStaging-1.7.55 - reactos/win32ss/user/user32/misc/exticon.c # Synced to Wine-1_1_22 + reactos/win32ss/user/user32/misc/exticon.c # Synced to WineStaging-1.7.55 reactos/win32ss/user/user32/misc/resources.c # Partially synced to WineStaging-1.7.55 reactos/win32ss/user/user32/misc/winhelp.c # Last sync date unknown reactos/win32ss/user/user32/misc/wsprintf.c # Synced to Wine-1_1_23 Modified: trunk/reactos/win32ss/user/user32/misc/exticon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/e… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/exticon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/exticon.c [iso-8859-1] Sat Nov 28 16:27:34 2015 @@ -231,7 +231,7 @@ LPBYTE pData; DWORD sig; HANDLE hFile; - UINT16 iconDirCount = 0, iconCount = 0; + UINT16 iconDirCount = 0,iconCount = 0; LPBYTE peimage; HANDLE fmapping; DWORD fsizeh,fsizel; @@ -256,13 +256,13 @@ CloseHandle(hFile); if (!fmapping) { - WARN("CreateFileMapping error %ld\n", GetLastError() ); + WARN("CreateFileMapping error %ld\n", GetLastError() ); return 0xFFFFFFFF; } if (!(peimage = MapViewOfFile(fmapping, FILE_MAP_READ, 0, 0, 0))) { - WARN("MapViewOfFile error %ld\n", GetLastError() ); + WARN("MapViewOfFile error %ld\n", GetLastError() ); CloseHandle(fmapping); return 0xFFFFFFFF; } @@ -617,8 +617,10 @@ UINT ret; INT len = MultiByteToWideChar(CP_ACP, 0, lpstrFile, -1, NULL, 0); LPWSTR lpwstrFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); +#ifdef __REACTOS__ if (lpwstrFile == NULL) return 0; +#endif MultiByteToWideChar(CP_ACP, 0, lpstrFile, -1, lpwstrFile, len); ret = PrivateExtractIconsW(lpwstrFile, nIndex, sizeX, sizeY, phicon, piconid, nIcons, flags); @@ -696,8 +698,10 @@ UINT ret; INT len = MultiByteToWideChar(CP_ACP, 0, lpstrFile, -1, NULL, 0); LPWSTR lpwstrFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); +#ifdef __REACTOS__ if (lpwstrFile == NULL) return 0; +#endif TRACE("%s %d %p %p %d\n", lpstrFile, nIndex, phIconLarge, phIconSmall, nIcons);

9 years

[akhaldi] 70182: [PSDK] Add missing TB_HASACCELERATOR.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Nov 28 16:25:17 2015 New Revision: 70182 URL: http://svn.reactos.org/svn/reactos?rev=70182&view=rev Log: [PSDK] Add missing TB_HASACCELERATOR. Modified: trunk/reactos/include/psdk/commctrl.h Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re… ============================================================================== --- trunk/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/commctrl.h [iso-8859-1] Sat Nov 28 16:25:17 2015 @@ -1246,6 +1246,7 @@ #define TB_GETSTRING __MINGW_NAME_AW(TB_GETSTRING) #define TB_SETHOTITEM2 (WM_USER+94) +#define TB_HASACCELERATOR (WM_USER+95) #define TB_SETLISTGAP (WM_USER+96) #define TB_GETIMAGELISTCOUNT (WM_USER+98) #define TB_GETIDEALSIZE (WM_USER+99)

9 years

[akhaldi] 70181: [RTL] Partially sync actctx.c with Wine Staging 1.7.55. Fixes 3 kernel32:actctx failures. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Nov 28 16:24:53 2015 New Revision: 70181 URL: http://svn.reactos.org/svn/reactos?rev=70181&view=rev Log: [RTL] Partially sync actctx.c with Wine Staging 1.7.55. Fixes 3 kernel32:actctx failures. CORE-10536 Modified: trunk/reactos/lib/rtl/actctx.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=70181… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Sat Nov 28 16:24:53 2015 @@ -3486,7 +3486,7 @@ { const WCHAR *nameW = (WCHAR*)((BYTE*)actctx->wndclass_section + iter->name_offset); - if (!strcmpW(nameW, name->Buffer)) + if (!strcmpiW(nameW, name->Buffer)) { index = iter; break; @@ -4585,6 +4585,9 @@ switch (section_kind) { + case ACTIVATION_CONTEXT_SECTION_ASSEMBLY_INFORMATION: + DPRINT1("Unsupported yet section_kind %x\n", section_kind); + return STATUS_SXS_KEY_NOT_FOUND; case ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION: status = find_dll_redirection(actctx, section_name, data); break; 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 Nov 28 16:24:53 2015 @@ -252,7 +252,7 @@ reactos/lib/3rdparty/strmbase # Synced to WineStaging-1.7.55 -reactos/lib/rtl/actctx.c # Partly synced with WineStaging-1.7.37 +reactos/lib/rtl/actctx.c # Partly synced with WineStaging-1.7.55 reactos/lib/rtl/timerqueue.c # Partly synced with WineStaging-1.7.55 advapi32 -

9 years

[tkreuzer] 70180: [WIN32K] Fix DC reference leak in IntPolygon.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Nov 28 15:52:20 2015 New Revision: 70180 URL: http://svn.reactos.org/svn/reactos?rev=70180&view=rev Log: [WIN32K] Fix DC reference leak in IntPolygon. Modified: trunk/reactos/win32ss/gdi/ntgdi/fillshap.c Modified: trunk/reactos/win32ss/gdi/ntgdi/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/fillshap… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] Sat Nov 28 15:52:20 2015 @@ -165,13 +165,20 @@ BOOL FASTCALL IntPolygon(HDC hdc, POINT *Point, int Count) { - PDC dc; - if (!(dc = DC_LockDc(hdc))) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - return IntGdiPolygon(dc, Point, Count); + BOOL bResult; + PDC pdc; + + pdc = DC_LockDc(hdc); + if (pdc == NULL) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + bResult = IntGdiPolygon(pdc, Point, Count); + + DC_UnlockDc(pdc); + return bResult; }

9 years

[tkreuzer] 70179: [WIN32K] Check for dc->dclevel.pSurface == NULL in IntGdiPolygon. CORE-10377 #resolve

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Nov 28 15:48:57 2015 New Revision: 70179 URL: http://svn.reactos.org/svn/reactos?rev=70179&view=rev Log: [WIN32K] Check for dc->dclevel.pSurface == NULL in IntGdiPolygon. CORE-10377 #resolve Modified: trunk/reactos/win32ss/gdi/ntgdi/fillshap.c Modified: trunk/reactos/win32ss/gdi/ntgdi/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/fillshap… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] Sat Nov 28 15:48:57 2015 @@ -81,8 +81,11 @@ pbrFill = dc->dclevel.pbrFill; pbrLine = dc->dclevel.pbrLine; psurf = dc->dclevel.pSurface; - /* FIXME: psurf can be NULL!!!! don't assert but handle this case gracefully! */ - ASSERT(psurf); + if (psurf == NULL) + { + /* Memory DC without a bitmap selected, nothing to do. */ + return TRUE; + } /* Now fill the polygon with the current fill brush. */ if (!(pbrFill->flAttrs & BR_IS_NULL))

9 years

[hbelusca] 70178: [SHELL32] Use the programs folder icon in the Open-With list box. By Jared Smudde. CORE-10592

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Nov 28 15:35:33 2015 New Revision: 70178 URL: http://svn.reactos.org/svn/reactos?rev=70178&view=rev Log: [SHELL32] Use the programs folder icon in the Open-With list box. By Jared Smudde. CORE-10592 Modified: trunk/reactos/dll/win32/shell32/COpenWithMenu.cpp Modified: trunk/reactos/dll/win32/shell32/COpenWithMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/COpenWit… ============================================================================== --- trunk/reactos/dll/win32/shell32/COpenWithMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/COpenWithMenu.cpp [iso-8859-1] Sat Nov 28 15:35:33 2015 @@ -995,7 +995,7 @@ tvins.item.mask = TVIF_TEXT|TVIF_STATE|TVIF_IMAGE|TVIF_SELECTEDIMAGE; tvins.item.pszText = (LPWSTR)wszBuf; tvins.item.state = tvins.item.stateMask = TVIS_EXPANDED; - hFolderIcon = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_FOLDER), IMAGE_ICON, 0, 0, 0); + hFolderIcon = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_PROGRAMS_FOLDER), IMAGE_ICON, 0, 0, 0); tvins.item.iImage = tvins.item.iSelectedImage = ImageList_AddIcon(m_hImgList, hFolderIcon); LoadStringW(shell32_hInstance, IDS_OPEN_WITH_RECOMMENDED, wszBuf, _countof(wszBuf));

9 years

[tfaber] 70177: [NTOS:PS] - Properly acquire process rundown - Reference job object when assigning a process to it - Don't assert when creating a child process whose parent is in a job Fixes crashe...

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Nov 28 12:45:16 2015 New Revision: 70177 URL: http://svn.reactos.org/svn/reactos?rev=70177&view=rev Log: [NTOS:PS] - Properly acquire process rundown - Reference job object when assigning a process to it - Don't assert when creating a child process whose parent is in a job Fixes crashes in kernel32_winetest:process Modified: trunk/reactos/ntoskrnl/ps/job.c trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/ps/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/job.c?rev=7017… ============================================================================== --- trunk/reactos/ntoskrnl/ps/job.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/job.c [iso-8859-1] Sat Nov 28 12:45:16 2015 @@ -166,8 +166,7 @@ /* lock the process so we can safely assign the process. Note that in the meanwhile another thread could have assigned this process to a job! */ - ExAcquireRundownProtection(&Process->RundownProtect); - if(NT_SUCCESS(Status)) + if(ExAcquireRundownProtection(&Process->RundownProtect)) { if(Process->Job == NULL && PsGetProcessSessionId(Process) == Job->SessionId) { @@ -176,6 +175,7 @@ the job object might require it to wait, which is a bad thing while holding the process lock! */ Process->Job = Job; + ObReferenceObject(Job); } else { Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] Sat Nov 28 12:45:16 2015 @@ -714,7 +714,6 @@ { /* FIXME: We need to insert this process */ DPRINT1("Jobs not yet supported\n"); - ASSERT(FALSE); } /* Create PEB only for User-Mode Processes */

9 years

[tfaber] 70176: [KERNEL32] - Use JOB_OBJECT_ALL_ACCESS for job objects instead of JOB_ALL_ACCESS (which is for print jobs). Dedicated to Samuel

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Nov 28 10:21:38 2015 New Revision: 70176 URL: http://svn.reactos.org/svn/reactos?rev=70176&view=rev Log: [KERNEL32] - Use JOB_OBJECT_ALL_ACCESS for job objects instead of JOB_ALL_ACCESS (which is for print jobs). Dedicated to Samuel Modified: trunk/reactos/dll/win32/kernel32/client/job.c Modified: trunk/reactos/dll/win32/kernel32/client/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/job.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/job.c [iso-8859-1] Sat Nov 28 10:21:38 2015 @@ -39,7 +39,7 @@ IN LPCWSTR lpName) { /* Create the NT object */ - CreateNtObjectFromWin32Api(JobObject, JobObject, JOB, lpJobAttributes, lpName); + CreateNtObjectFromWin32Api(JobObject, JobObject, JOB_OBJECT, lpJobAttributes, lpName); } /*

9 years

[tfaber] 70175: [GDIPLUS_WINETEST] - Fix VS2010 build

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Nov 28 10:00:40 2015 New Revision: 70175 URL: http://svn.reactos.org/svn/reactos?rev=70175&view=rev Log: [GDIPLUS_WINETEST] - Fix VS2010 build Modified: trunk/rostests/winetests/gdiplus/image.c Modified: trunk/rostests/winetests/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/image.c… ============================================================================== --- trunk/rostests/winetests/gdiplus/image.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/image.c [iso-8859-1] Sat Nov 28 10:00:40 2015 @@ -4719,10 +4719,10 @@ CGpEffect *effect; HMODULE mod = GetModuleHandleA("gdiplus.dll"); int i; - const GUID effectlist[] = - {BlurEffectGuid, SharpenEffectGuid, ColorMatrixEffectGuid, ColorLUTEffectGuid, - BrightnessContrastEffectGuid, HueSaturationLightnessEffectGuid, LevelsEffectGuid, - TintEffectGuid, ColorBalanceEffectGuid, RedEyeCorrectionEffectGuid, ColorCurveEffectGuid}; + const GUID * const effectlist[] = + {&BlurEffectGuid, &SharpenEffectGuid, &ColorMatrixEffectGuid, &ColorLUTEffectGuid, + &BrightnessContrastEffectGuid, &HueSaturationLightnessEffectGuid, &LevelsEffectGuid, + &TintEffectGuid, &ColorBalanceEffectGuid, &RedEyeCorrectionEffectGuid, &ColorCurveEffectGuid}; pGdipCreateEffect = (void*)GetProcAddress( mod, "GdipCreateEffect"); pGdipDeleteEffect = (void*)GetProcAddress( mod, "GdipDeleteEffect"); @@ -4739,9 +4739,9 @@ stat = pGdipCreateEffect(noneffect, &effect); todo_wine expect(Win32Error, stat); - for(i=0; i < sizeof(effectlist) / sizeof(GUID); i++) - { - stat = pGdipCreateEffect(effectlist[i], &effect); + for(i=0; i < sizeof(effectlist) / sizeof(effectlist[0]); i++) + { + stat = pGdipCreateEffect(*effectlist[i], &effect); todo_wine expect(Ok, stat); if(stat == Ok) {

9 years

← Newer
1
2
3
4
5
6
7
8
...
46
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 November 2015