Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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 28 Nov '15

28 Nov '15

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 -

1 0

[tkreuzer] 70180: [WIN32K] Fix DC reference leak in IntPolygon.
by tkreuzer＠svn.reactos.org 28 Nov '15

28 Nov '15

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; }

1 0

[tkreuzer] 70179: [WIN32K] Check for dc->dclevel.pSurface == NULL in IntGdiPolygon. CORE-10377 #resolve
by tkreuzer＠svn.reactos.org 28 Nov '15

28 Nov '15

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))

1 0

[hbelusca] 70178: [SHELL32] Use the programs folder icon in the Open-With list box. By Jared Smudde. CORE-10592
by hbelusca＠svn.reactos.org 28 Nov '15

28 Nov '15

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));

1 0

[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 28 Nov '15

28 Nov '15

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 */

1 0

[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 28 Nov '15

28 Nov '15

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); } /*

1 0

[tfaber] 70175: [GDIPLUS_WINETEST] - Fix VS2010 build
by tfaber＠svn.reactos.org 28 Nov '15

28 Nov '15

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) {

1 0

[akhaldi] 70174: [README.WINE] Mark some modules as synced with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 28 Nov '15

28 Nov '15

Author: akhaldi Date: Sat Nov 28 09:55:56 2015 New Revision: 70174 URL: http://svn.reactos.org/svn/reactos?rev=70174&view=rev Log: [README.WINE] Mark some modules as synced with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/media/doc/README.WINE 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 09:55:56 2015 @@ -17,7 +17,7 @@ reactos/tools/unicode # Synced to WineStaging-1.7.55 reactos/tools/widl # Synced to WineStaging-1.7.55 -reactos/tools/wpp # Synced to WineStaging-1.7.47 +reactos/tools/wpp # Synced to WineStaging-1.7.55 The following libraries are shared with Wine. @@ -27,23 +27,23 @@ reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/d3drm # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-1.7.55 -reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.7.47 +reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/devenum # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/dinput # Synced to WineStaging-1.7.55 -reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.7.47 -reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.7.47 -reactos/dll/directx/wine/dplay # Synced to WineStaging-1.7.47 +reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.7.55 +reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.7.55 +reactos/dll/directx/wine/dplay # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/dplayx # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.7.55 -reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.7.47 +reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/qedit # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/quartz # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.7.55 -reactos/dll/win32/activeds # Synced to WineStaging-1.7.47 -reactos/dll/win32/actxprxy # Synced to WineStaging-1.7.47 +reactos/dll/win32/activeds # Synced to WineStaging-1.7.55 +reactos/dll/win32/actxprxy # Synced to WineStaging-1.7.55 reactos/dll/win32/advpack # Synced to WineStaging-1.7.55 reactos/dll/win32/atl # Synced to WineStaging-1.7.55 reactos/dll/win32/atl80 # Synced to WineStaging-1.7.55 @@ -51,198 +51,198 @@ reactos/dll/win32/avifil32 # Synced to WineStaging-1.7.55 reactos/dll/win32/bcrypt # Synced to WineStaging-1.7.55 reactos/dll/win32/browseui # Out of sync -reactos/dll/win32/cabinet # Synced to WineStaging-1.7.47 -reactos/dll/win32/clusapi # Synced to WineStaging-1.7.47 -reactos/dll/win32/comcat # Synced to WineStaging-1.7.47 +reactos/dll/win32/cabinet # Synced to WineStaging-1.7.55 +reactos/dll/win32/clusapi # Synced to WineStaging-1.7.55 +reactos/dll/win32/comcat # Synced to WineStaging-1.7.55 reactos/dll/win32/comctl32 # Synced to WineStaging-1.7.55 reactos/dll/win32/comdlg32 # Synced to WineStaging-1.7.55 -reactos/dll/win32/compstui # Synced to WineStaging-1.7.47 +reactos/dll/win32/compstui # Synced to WineStaging-1.7.55 reactos/dll/win32/credui # Synced to WineStaging-1.7.55 reactos/dll/win32/crypt32 # Synced to WineStaging-1.7.55 -reactos/dll/win32/cryptdlg # Synced to WineStaging-1.7.47 -reactos/dll/win32/cryptdll # Synced to WineStaging-1.7.47 -reactos/dll/win32/cryptnet # Synced to WineStaging-1.7.47 -reactos/dll/win32/cryptui # Synced to WineStaging-1.7.47 +reactos/dll/win32/cryptdlg # Synced to WineStaging-1.7.55 +reactos/dll/win32/cryptdll # Synced to WineStaging-1.7.55 +reactos/dll/win32/cryptnet # Synced to WineStaging-1.7.55 +reactos/dll/win32/cryptui # Synced to WineStaging-1.7.55 reactos/dll/win32/dbghelp # Synced to WineStaging-1.7.55 -reactos/dll/win32/dciman32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/faultrep # Synced to WineStaging-1.7.47 -reactos/dll/win32/fltlib # Synced to WineStaging-1.7.47 -reactos/dll/win32/fusion # Synced to WineStaging-1.7.47 +reactos/dll/win32/dciman32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/faultrep # Synced to WineStaging-1.7.55 +reactos/dll/win32/fltlib # Synced to WineStaging-1.7.55 +reactos/dll/win32/fusion # Synced to WineStaging-1.7.55 reactos/dll/win32/gdiplus # Synced to WineStaging-1.7.55 -reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-1.7.47 -reactos/dll/win32/hlink # Synced to WineStaging-1.7.47 +reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-1.7.55 +reactos/dll/win32/hlink # Synced to WineStaging-1.7.55 reactos/dll/win32/hnetcfg # Synced to WineStaging-1.7.55 -reactos/dll/win32/httpapi # Synced to WineStaging-1.7.47 +reactos/dll/win32/httpapi # Synced to WineStaging-1.7.55 reactos/dll/win32/iccvid # Synced to WineStaging-1.7.55 reactos/dll/win32/icmp # Out of sync reactos/dll/win32/ieframe # Synced to WineStaging-1.7.55 -reactos/dll/win32/imaadp32.acm # Synced to WineStaging-1.7.47 +reactos/dll/win32/imaadp32.acm # Synced to WineStaging-1.7.55 reactos/dll/win32/imagehlp # Synced to WineStaging-1.7.55 reactos/dll/win32/imm32 # Synced to Wine-1.7.27 -reactos/dll/win32/inetcomm # Synced to WineStaging-1.7.47 -reactos/dll/win32/inetmib1 # Synced to WineStaging-1.7.47 -reactos/dll/win32/initpki # Synced to WineStaging-1.7.47 -reactos/dll/win32/inseng # Synced to WineStaging-1.7.47 +reactos/dll/win32/inetcomm # Synced to WineStaging-1.7.55 +reactos/dll/win32/inetmib1 # Synced to WineStaging-1.7.55 +reactos/dll/win32/initpki # Synced to WineStaging-1.7.55 +reactos/dll/win32/inseng # Synced to WineStaging-1.7.55 reactos/dll/win32/iphlpapi # Out of sync -reactos/dll/win32/itircl # Synced to WineStaging-1.7.47 -reactos/dll/win32/itss # Synced to WineStaging-1.7.47 +reactos/dll/win32/itircl # Synced to WineStaging-1.7.55 +reactos/dll/win32/itss # Synced to WineStaging-1.7.55 reactos/dll/win32/jscript # Synced to WineStaging-1.7.55 -reactos/dll/win32/jsproxy # Synced to WineStaging-1.7.47 -reactos/dll/win32/loadperf # Synced to WineStaging-1.7.47 +reactos/dll/win32/jsproxy # Synced to WineStaging-1.7.55 +reactos/dll/win32/loadperf # Synced to WineStaging-1.7.55 reactos/dll/win32/localspl # Synced to WineStaging-1.7.55 reactos/dll/win32/localui # Synced to WineStaging-1.7.55 -reactos/dll/win32/lz32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/mapi32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/lz32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/mapi32 # Synced to WineStaging-1.7.55 reactos/dll/win32/mciavi32 # Synced to WineStaging-1.7.55 reactos/dll/win32/mcicda # Synced to WineStaging-1.7.55 -reactos/dll/win32/mciqtz32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/mciqtz32 # Synced to WineStaging-1.7.55 reactos/dll/win32/mciseq # Synced to WineStaging-1.7.55 -reactos/dll/win32/mciwave # Synced to WineStaging-1.7.47 -reactos/dll/win32/mgmtapi # Synced to WineStaging-1.7.47 -reactos/dll/win32/mlang # Synced to WineStaging-1.7.47 -reactos/dll/win32/mmdevapi # Synced to WineStaging-1.7.47 +reactos/dll/win32/mciwave # Synced to WineStaging-1.7.55 +reactos/dll/win32/mgmtapi # Synced to WineStaging-1.7.55 +reactos/dll/win32/mlang # Synced to WineStaging-1.7.55 +reactos/dll/win32/mmdevapi # Synced to WineStaging-1.7.55 reactos/dll/win32/mpr # Synced to WineStaging-1.7.55 -reactos/dll/win32/mprapi # Synced to WineStaging-1.7.47 +reactos/dll/win32/mprapi # Synced to WineStaging-1.7.55 reactos/dll/win32/msacm32 # Synced to WineStaging-1.7.55 reactos/dll/win32/msacm32/msacm32.drv # Synced to WineStaging-1.7.55 reactos/dll/win32/msadp32.acm # Synced to WineStaging-1.7.55 -reactos/dll/win32/mscat32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/mscat32 # Synced to WineStaging-1.7.55 reactos/dll/win32/mscms # Synced to WineStaging-1.7.55 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 reactos/dll/win32/msctf # Synced to WineStaging-1.7.55 -reactos/dll/win32/msftedit # Synced to WineStaging-1.7.47 -reactos/dll/win32/msg711.acm # Synced to WineStaging-1.7.47 -reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.7.47 +reactos/dll/win32/msftedit # Synced to WineStaging-1.7.55 +reactos/dll/win32/msg711.acm # Synced to WineStaging-1.7.55 +reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.7.55 reactos/dll/win32/mshtml # Synced to WineStaging-1.7.37 reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.47 reactos/dll/win32/msi # Synced to WineStaging-1.7.55 -reactos/dll/win32/msimg32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/msimtf # Synced to WineStaging-1.7.47 -reactos/dll/win32/msisip # Synced to WineStaging-1.7.47 -reactos/dll/win32/msisys.ocx # Synced to WineStaging-1.7.47 -reactos/dll/win32/msnet32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/mspatcha # Synced to WineStaging-1.7.47 +reactos/dll/win32/msimg32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/msimtf # Synced to WineStaging-1.7.55 +reactos/dll/win32/msisip # Synced to WineStaging-1.7.55 +reactos/dll/win32/msisys.ocx # Synced to WineStaging-1.7.55 +reactos/dll/win32/msnet32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/mspatcha # Synced to WineStaging-1.7.55 reactos/dll/win32/msrle32 # Synced to WineStaging-1.7.55 -reactos/dll/win32/mssign32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/mssip32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/mstask # Synced to WineStaging-1.7.47 +reactos/dll/win32/mssign32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/mssip32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/mstask # Synced to WineStaging-1.7.55 reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/msvcrt40 # Out of sync reactos/dll/win32/msvfw32 # Synced to WineStaging-1.7.55 reactos/dll/win32/msvidc32 # Synced to WineStaging-1.7.55 -reactos/dll/win32/msxml # Synced to WineStaging-1.7.47 -reactos/dll/win32/msxml2 # Synced to WineStaging-1.7.47 +reactos/dll/win32/msxml # Synced to WineStaging-1.7.55 +reactos/dll/win32/msxml2 # Synced to WineStaging-1.7.55 reactos/dll/win32/msxml3 # Synced to WineStaging-1.7.55 -reactos/dll/win32/msxml4 # Synced to WineStaging-1.7.47 -reactos/dll/win32/msxml6 # Synced to WineStaging-1.7.47 -reactos/dll/win32/nddeapi # Synced to WineStaging-1.7.47 +reactos/dll/win32/msxml4 # Synced to WineStaging-1.7.55 +reactos/dll/win32/msxml6 # Synced to WineStaging-1.7.55 +reactos/dll/win32/nddeapi # Synced to WineStaging-1.7.55 reactos/dll/win32/netapi32 # Forked at Wine-1.3.34 -reactos/dll/win32/npptools # Synced to WineStaging-1.7.47 +reactos/dll/win32/npptools # Synced to WineStaging-1.7.55 reactos/dll/win32/ntdsapi # Synced to WineStaging-1.7.55 -reactos/dll/win32/ntprint # Synced to WineStaging-1.7.47 -reactos/dll/win32/objsel # Synced to WineStaging-1.7.47 -reactos/dll/win32/odbc32 # Synced to WineStaging-1.7.37. Depends on port of Linux ODBC. +reactos/dll/win32/ntprint # Synced to WineStaging-1.7.55 +reactos/dll/win32/objsel # Synced to WineStaging-1.7.55 +reactos/dll/win32/odbc32 # Synced to WineStaging-1.7.55. Depends on port of Linux ODBC. reactos/dll/win32/odbccp32 # Synced to WineStaging-1.7.55 reactos/dll/win32/ole32 # Synced to WineStaging-1.7.55 -reactos/dll/win32/oleacc # Synced to WineStaging-1.7.47 +reactos/dll/win32/oleacc # Synced to WineStaging-1.7.55 reactos/dll/win32/oleaut32 # Synced to WineStaging-1.7.55 -reactos/dll/win32/olecli32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/olecli32 # Synced to WineStaging-1.7.55 reactos/dll/win32/oledlg # Synced to WineStaging-1.7.55 -reactos/dll/win32/olepro32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/olesvr32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/olethk32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/pdh # Synced to WineStaging-1.7.47 -reactos/dll/win32/pidgen # Synced to WineStaging-1.7.47 +reactos/dll/win32/olepro32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/olesvr32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/olethk32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/pdh # Synced to WineStaging-1.7.55 +reactos/dll/win32/pidgen # Synced to WineStaging-1.7.55 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 -reactos/dll/win32/printui # Synced to WineStaging-1.7.47 -reactos/dll/win32/propsys # Synced to WineStaging-1.7.47 -reactos/dll/win32/pstorec # Synced to WineStaging-1.7.47 -reactos/dll/win32/qmgr # Synced to WineStaging-1.7.47 -reactos/dll/win32/qmgrprxy # Synced to WineStaging-1.7.47 -reactos/dll/win32/query # Synced to WineStaging-1.7.47 -reactos/dll/win32/rasapi32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/resutils # Synced to WineStaging-1.7.47 +reactos/dll/win32/printui # Synced to WineStaging-1.7.55 +reactos/dll/win32/propsys # Synced to WineStaging-1.7.55 +reactos/dll/win32/pstorec # Synced to WineStaging-1.7.55 +reactos/dll/win32/qmgr # Synced to WineStaging-1.7.55 +reactos/dll/win32/qmgrprxy # Synced to WineStaging-1.7.55 +reactos/dll/win32/query # Synced to WineStaging-1.7.55 +reactos/dll/win32/rasapi32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/resutils # Synced to WineStaging-1.7.55 reactos/dll/win32/riched20 # Synced to WineStaging-1.7.55 -reactos/dll/win32/riched32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/riched32 # Synced to WineStaging-1.7.55 reactos/dll/win32/rpcrt4 # Synced to WineStaging-1.7.55 -reactos/dll/win32/rsabase # Synced to WineStaging-1.7.47 -reactos/dll/win32/rsaenh # Synced to WineStaging-1.7.47 -reactos/dll/win32/sccbase # Synced to WineStaging-1.7.47 -reactos/dll/win32/schannel # Synced to WineStaging-1.7.47 -reactos/dll/win32/scrrun # Synced to WineStaging-1.7.47 +reactos/dll/win32/rsabase # Synced to WineStaging-1.7.55 +reactos/dll/win32/rsaenh # Synced to WineStaging-1.7.55 +reactos/dll/win32/sccbase # Synced to WineStaging-1.7.55 +reactos/dll/win32/schannel # Synced to WineStaging-1.7.55 +reactos/dll/win32/scrrun # Synced to WineStaging-1.7.55 reactos/dll/win32/secur32 # Forked reactos/dll/win32/security # Forked (different .spec) -reactos/dll/win32/sensapi # Synced to WineStaging-1.7.47 +reactos/dll/win32/sensapi # Synced to WineStaging-1.7.55 reactos/dll/win32/setupapi # Forked at Wine-20050524 -reactos/dll/win32/shdoclc # Synced to WineStaging-1.7.47 -reactos/dll/win32/shdocvw # Synced to WineStaging-1.7.47 +reactos/dll/win32/shdoclc # Synced to WineStaging-1.7.55 +reactos/dll/win32/shdocvw # Synced to WineStaging-1.7.55 reactos/dll/win32/shell32 # Forked at Wine-20071011 -reactos/dll/win32/shfolder # Synced to WineStaging-1.7.47 +reactos/dll/win32/shfolder # Synced to WineStaging-1.7.55 reactos/dll/win32/shlwapi # Synced to WineStaging-1.7.55 -reactos/dll/win32/slbcsp # Synced to WineStaging-1.7.47 -reactos/dll/win32/snmpapi # Synced to WineStaging-1.7.47 -reactos/dll/win32/softpub # Synced to WineStaging-1.7.47 -reactos/dll/win32/spoolss # Synced to WineStaging-1.7.47 -reactos/dll/win32/stdole2.tlb # Synced to WineStaging-1.7.47 -reactos/dll/win32/stdole32.tlb # Synced to WineStaging-1.7.47 -reactos/dll/win32/sti # Synced to WineStaging-1.7.47 +reactos/dll/win32/slbcsp # Synced to WineStaging-1.7.55 +reactos/dll/win32/snmpapi # Synced to WineStaging-1.7.55 +reactos/dll/win32/softpub # Synced to WineStaging-1.7.55 +reactos/dll/win32/spoolss # Synced to WineStaging-1.7.55 +reactos/dll/win32/stdole2.tlb # Synced to WineStaging-1.7.55 +reactos/dll/win32/stdole32.tlb # Synced to WineStaging-1.7.55 +reactos/dll/win32/sti # Synced to WineStaging-1.7.55 reactos/dll/win32/sxs # Synced to WineStaging-1.7.55 -reactos/dll/win32/tapi32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/traffic # Synced to WineStaging-1.7.47 -reactos/dll/win32/twain_32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/updspapi # Synced to WineStaging-1.7.47 -reactos/dll/win32/url # Synced to WineStaging-1.7.47 +reactos/dll/win32/tapi32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/traffic # Synced to WineStaging-1.7.55 +reactos/dll/win32/twain_32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/updspapi # Synced to WineStaging-1.7.55 +reactos/dll/win32/url # Synced to WineStaging-1.7.55 reactos/dll/win32/urlmon # Synced to WineStaging-1.7.55 reactos/dll/win32/usp10 # Synced to WineStaging-1.7.55 reactos/dll/win32/uxtheme # Forked -reactos/dll/win32/vbscript # Synced to WineStaging-1.7.47 +reactos/dll/win32/vbscript # Synced to WineStaging-1.7.55 reactos/dll/win32/version # Synced to WineStaging-1.7.55 -reactos/dll/win32/vssapi # Synced to WineStaging-1.7.47 -reactos/dll/win32/wbemdisp # Synced to WineStaging-1.7.47 +reactos/dll/win32/vssapi # Synced to WineStaging-1.7.55 +reactos/dll/win32/wbemdisp # Synced to WineStaging-1.7.55 reactos/dll/win32/wbemprox # Synced to WineStaging-1.7.55 reactos/dll/win32/windowscodecs # Synced to WineStaging-1.7.55 -reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.7.47 -reactos/dll/win32/winemp3.acm # Synced to WineStaging-1.7.47 +reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.7.55 +reactos/dll/win32/winemp3.acm # Synced to WineStaging-1.7.55 reactos/dll/win32/wing32 # Synced to WineStaging-1.7.55 reactos/dll/win32/winhttp # Synced to WineStaging-1.7.55 reactos/dll/win32/wininet # Synced to WineStaging-1.7.55 reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 -reactos/dll/win32/winscard # Synced to WineStaging-1.7.47 +reactos/dll/win32/winscard # Synced to WineStaging-1.7.55 reactos/dll/win32/wintrust # Synced to WineStaging-1.7.55 -reactos/dll/win32/wldap32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/wmi # Synced to WineStaging-1.7.47 +reactos/dll/win32/wldap32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/wmi # Synced to WineStaging-1.7.55 reactos/dll/win32/wmiutils # Synced to WineStaging-1.7.55 -reactos/dll/win32/wmvcore # Synced to WineStaging-1.7.47 +reactos/dll/win32/wmvcore # Synced to WineStaging-1.7.55 reactos/dll/win32/wshom.ocx # Synced to WineStaging-1.7.55 -reactos/dll/win32/wtsapi32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/wuapi # Synced to WineStaging-1.7.47 -reactos/dll/win32/xinput1_1 # Synced to WineStaging-1.7.47 -reactos/dll/win32/xinput1_2 # Synced to WineStaging-1.7.47 -reactos/dll/win32/xinput1_3 # Synced to WineStaging-1.7.47 -reactos/dll/win32/xinput9_1_0 # Synced to WineStaging-1.7.47 +reactos/dll/win32/wtsapi32 # Synced to WineStaging-1.7.55 +reactos/dll/win32/wuapi # Synced to WineStaging-1.7.55 +reactos/dll/win32/xinput1_1 # Synced to WineStaging-1.7.55 +reactos/dll/win32/xinput1_2 # Synced to WineStaging-1.7.55 +reactos/dll/win32/xinput1_3 # Synced to WineStaging-1.7.55 +reactos/dll/win32/xinput9_1_0 # Synced to WineStaging-1.7.55 reactos/dll/win32/xmllite # Synced to WineStaging-1.7.55 -reactos/dll/cpl/inetcpl # Synced to WineStaging-1.7.47 +reactos/dll/cpl/inetcpl # Synced to WineStaging-1.7.55 ReactOS shares the following programs with Winehq. -reactos/base/applications/cmdutils/cscript # Synced to WineStaging-1.7.47 +reactos/base/applications/cmdutils/cscript # Synced to WineStaging-1.7.55 reactos/base/applications/cmdutils/reg # Synced to WineStaging-1.7.55 -reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-1.7.47 -reactos/base/applications/cmdutils/wmic # Synced to WineStaging-1.7.47 -reactos/base/applications/cmdutils/wscript # Synced to WineStaging-1.7.37 -reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-1.7.47 +reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-1.7.55 +reactos/base/applications/cmdutils/wmic # Synced to WineStaging-1.7.55 +reactos/base/applications/cmdutils/wscript # Synced to WineStaging-1.7.55 +reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-1.7.55 reactos/base/applications/games/winmine # Synced to WineStaging-1.7.55 with our own resources. -reactos/base/applications/extrac32 # Synced to WineStaging-1.7.47 -reactos/base/applications/iexplore # Synced to WineStaging-1.7.47 +reactos/base/applications/extrac32 # Synced to WineStaging-1.7.55 +reactos/base/applications/iexplore # Synced to WineStaging-1.7.55 reactos/base/applications/notepad # Forked at Wine-20041201 reactos/base/applications/regedit # Out of sync reactos/base/applications/winhlp32 # Synced to WineStaging-1.7.55 reactos/base/applications/wordpad # Synced to WineStaging-1.7.55 reactos/base/services/rpcss # Synced to WineStaging-1.7.55 -reactos/base/system/expand # Synced to WineStaging-1.7.47 +reactos/base/system/expand # Synced to WineStaging-1.7.55 reactos/base/system/msiexec # Synced to WineStaging-1.7.55 reactos/modules/rosapps/winfile # Autosync

1 0

[hbelusca] 70173: [CLIPBRD] Implement loading the clipboard contents from a file. By Ricardo Hanke :) CORE-10550
by hbelusca＠svn.reactos.org 28 Nov '15

28 Nov '15

Author: hbelusca Date: Sat Nov 28 01:22:34 2015 New Revision: 70173 URL: http://svn.reactos.org/svn/reactos?rev=70173&view=rev Log: [CLIPBRD] Implement loading the clipboard contents from a file. By Ricardo Hanke :) CORE-10550 Modified: trunk/reactos/base/applications/clipbrd/clipbrd.c trunk/reactos/base/applications/clipbrd/cliputils.c trunk/reactos/base/applications/clipbrd/fileutils.c trunk/reactos/base/applications/clipbrd/lang/de-DE.rc trunk/reactos/base/applications/clipbrd/lang/en-US.rc trunk/reactos/base/applications/clipbrd/lang/fr-FR.rc trunk/reactos/base/applications/clipbrd/resources.h Modified: trunk/reactos/base/applications/clipbrd/clipbrd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] Sat Nov 28 01:22:34 2015 @@ -37,7 +37,7 @@ if (!GetSaveFileNameW(&sfn)) return; - if (!OpenClipboard(NULL)) + if (!OpenClipboard(Globals.hMainWnd)) { ShowLastWin32Error(Globals.hMainWnd); return; @@ -72,7 +72,7 @@ if (!GetOpenFileNameW(&ofn)) return; - if (!OpenClipboard(NULL)) + if (!OpenClipboard(Globals.hMainWnd)) { ShowLastWin32Error(Globals.hMainWnd); return; @@ -94,7 +94,7 @@ DragQueryFileW(hDrop, 0, szFileName, ARRAYSIZE(szFileName)); DragFinish(hDrop); - if (!OpenClipboard(NULL)) + if (!OpenClipboard(Globals.hMainWnd)) { ShowLastWin32Error(Globals.hMainWnd); return; @@ -163,7 +163,7 @@ if (CountClipboardFormats() == 0) return; - if (!OpenClipboard(NULL)) + if (!OpenClipboard(Globals.hMainWnd)) return; AppendMenuW(hMenu, MF_SEPARATOR, 0, NULL); Modified: trunk/reactos/base/applications/clipbrd/cliputils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/cliputils.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/cliputils.c [iso-8859-1] Sat Nov 28 01:22:34 2015 @@ -97,7 +97,7 @@ void DeleteClipboardContent(void) { - if (!OpenClipboard(NULL)) + if (!OpenClipboard(Globals.hMainWnd)) { ShowLastWin32Error(Globals.hMainWnd); return; Modified: trunk/reactos/base/applications/clipbrd/fileutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/fileutils.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/fileutils.c [iso-8859-1] Sat Nov 28 01:22:34 2015 @@ -8,14 +8,303 @@ #include "precomp.h" +static HGLOBAL ClipboardReadMemoryBlock(HANDLE hFile, DWORD dwOffset, DWORD dwLength) +{ + HGLOBAL hData; + LPVOID lpData; + DWORD dwBytesRead; + + hData = GlobalAlloc(GHND, dwLength); + if (!hData) + { + return NULL; + } + + lpData = GlobalLock(hData); + if (!lpData) + { + GlobalFree(hData); + return NULL; + } + + if (SetFilePointer(hFile, dwOffset, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) + { + GlobalUnlock(hData); + GlobalFree(hData); + return NULL; + } + + if (!ReadFile(hFile, lpData, dwLength, &dwBytesRead, NULL)) + { + GlobalUnlock(hData); + GlobalFree(hData); + return NULL; + } + + GlobalUnlock(hData); + + return hData; +} + +static BOOL ClipboardReadMemory(HANDLE hFile, DWORD dwFormat, DWORD dwOffset, DWORD dwLength, LPCWSTR lpFormatName) +{ + HGLOBAL hData; + DWORD dwTemp; + + hData = ClipboardReadMemoryBlock(hFile, dwOffset, dwLength); + if (!hData) + { + return FALSE; + } + + if ((dwFormat >= 0xC000) && (dwFormat <= 0xFFFF)) + { + dwTemp = RegisterClipboardFormatW(lpFormatName); + if (!dwTemp) + { + GlobalFree(hData); + return FALSE; + } + } + else + { + dwTemp = dwFormat; + } + + if (!SetClipboardData(dwTemp, hData)) + { + GlobalFree(hData); + return FALSE; + } + + return TRUE; +} + +static BOOL ClipboardReadPalette(HANDLE hFile, DWORD dwOffset, DWORD dwLength) +{ + LPLOGPALETTE lpPalette; + HPALETTE hPalette; + HGLOBAL hData; + + hData = ClipboardReadMemoryBlock(hFile, dwOffset, dwLength); + if (!hData) + { + return FALSE; + } + + lpPalette = GlobalLock(hData); + if (!lpPalette) + { + GlobalFree(hData); + return FALSE; + } + + hPalette = CreatePalette(lpPalette); + if (!hPalette) + { + GlobalUnlock(hData); + GlobalFree(hData); + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + + GlobalUnlock(hData); + GlobalFree(hData); + + if (!SetClipboardData(CF_PALETTE, hPalette)) + { + DeleteObject(hPalette); + return FALSE; + } + + return TRUE; +} + +static BOOL ClipboardReadEnhMetafile(HANDLE hFile, DWORD dwOffset, DWORD dwLength) +{ + HENHMETAFILE hEmf; + HGLOBAL hData; + LPVOID lpData; + + hData = ClipboardReadMemoryBlock(hFile, dwOffset, dwLength); + if (!hData) + { + return FALSE; + } + + lpData = GlobalLock(hData); + if (!lpData) + { + GlobalFree(hData); + return FALSE; + } + + hEmf = SetEnhMetaFileBits(dwLength, lpData); + + GlobalUnlock(hData); + GlobalFree(hData); + + if (!hEmf) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + + if (!SetClipboardData(CF_ENHMETAFILE, hEmf)) + { + DeleteEnhMetaFile(hEmf); + return FALSE; + } + + return TRUE; +} + +static BOOL ClipboardReadBitmap(HANDLE hFile, DWORD dwOffset, DWORD dwLength) +{ + HGLOBAL hData; + HBITMAP hBitmap; + LPBITMAP lpBitmap; + + hData = ClipboardReadMemoryBlock(hFile, dwOffset, dwLength); + if (!hData) + { + return FALSE; + } + + lpBitmap = GlobalLock(hData); + if (!lpBitmap) + { + GlobalFree(hData); + return FALSE; + } + + lpBitmap->bmBits = lpBitmap + sizeof(BITMAP) + 1; + + hBitmap = CreateBitmapIndirect(lpBitmap); + + GlobalUnlock(hData); + GlobalFree(hData); + + if (!hBitmap) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + + if (!SetClipboardData(CF_BITMAP, hBitmap)) + { + DeleteObject(hBitmap); + return FALSE; + } + + return TRUE; +} + void ReadClipboardFile(LPCWSTR lpFileName) +{ + CLIPBOARDFILEHEADER cfhFileHeader; + CLIPBOARDFORMATHEADER *cfhFormatArray = NULL; + HANDLE hFile; + DWORD dwBytesRead; + BOOL bResult; + int i; + + hFile = CreateFileW(lpFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if (hFile == INVALID_HANDLE_VALUE) + { + ShowLastWin32Error(Globals.hMainWnd); + goto done; + } + + if (!ReadFile(hFile, &cfhFileHeader, sizeof(cfhFileHeader), &dwBytesRead, NULL)) + { + ShowLastWin32Error(Globals.hMainWnd); + goto done; + } + + if ((cfhFileHeader.wFileIdentifier != CLIPBOARD_FORMAT_NT) && (cfhFileHeader.wFileIdentifier != CLIPBOARD_FORMAT_BK)) + { + MessageBoxRes(Globals.hMainWnd, Globals.hInstance, ERROR_INVALID_FILE_FORMAT, 0, MB_ICONSTOP | MB_OK); + goto done; + } + + cfhFormatArray = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cfhFileHeader.wFormatCount * sizeof(CLIPBOARDFORMATHEADER)); + if (!cfhFormatArray) + { + SetLastError(ERROR_OUTOFMEMORY); + ShowLastWin32Error(Globals.hMainWnd); + goto done; + } + + if (!ReadFile(hFile, cfhFormatArray, cfhFileHeader.wFormatCount * sizeof(CLIPBOARDFORMATHEADER), &dwBytesRead, NULL)) + { + ShowLastWin32Error(Globals.hMainWnd); + goto done; + } + + for (i = 0; i < cfhFileHeader.wFormatCount; i++) + { + switch (cfhFormatArray[i].dwFormatID) + { + case CF_OWNERDISPLAY: + case CF_DSPMETAFILEPICT: + case CF_METAFILEPICT: + { + break; + } + + case CF_BITMAP: + case CF_DSPBITMAP: + { + bResult = ClipboardReadBitmap(hFile, cfhFormatArray[i].dwOffData, cfhFormatArray[i].dwLenData); + break; + } + + case CF_DSPENHMETAFILE: + case CF_ENHMETAFILE: + { + bResult = ClipboardReadEnhMetafile(hFile, cfhFormatArray[i].dwOffData, cfhFormatArray[i].dwLenData); + break; + } + + case CF_PALETTE: + { + bResult = ClipboardReadPalette(hFile, cfhFormatArray[i].dwOffData, cfhFormatArray[i].dwLenData); + break; + } + + default: + { + if ((cfhFormatArray[i].dwFormatID < CF_PRIVATEFIRST) || (cfhFormatArray[i].dwFormatID > CF_PRIVATELAST)) + { + bResult = ClipboardReadMemory(hFile, cfhFormatArray[i].dwFormatID, cfhFormatArray[i].dwOffData, cfhFormatArray[i].dwLenData, cfhFormatArray[i].szName); + } + break; + } + } + + if (!bResult) + { + ShowLastWin32Error(Globals.hMainWnd); + } + } + +done: + if (hFile != INVALID_HANDLE_VALUE) + { + CloseHandle(hFile); + } + + if (cfhFormatArray) + { + HeapFree(GetProcessHeap(), 0, cfhFormatArray); + } + + return; +} + +void WriteClipboardFile(LPCWSTR lpFileName) { MessageBoxW(Globals.hMainWnd, L"This function is currently not implemented.", L"Clipboard", MB_OK | MB_ICONINFORMATION); return; } - -void WriteClipboardFile(LPCWSTR lpFileName) -{ - MessageBoxW(Globals.hMainWnd, L"This function is currently not implemented.", L"Clipboard", MB_OK | MB_ICONINFORMATION); - return; -} Modified: trunk/reactos/base/applications/clipbrd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/lang/de-DE.rc [iso-8859-1] Sat Nov 28 01:22:34 2015 @@ -60,4 +60,5 @@ STRINGTABLE BEGIN ERROR_UNSUPPORTED_FORMAT "Die Daten in der Zwischenablage liegen in einem Format vor, welches nicht angezeigt werden kann." + ERROR_INVALID_FILE_FORMAT "Die ausgewÃ¤hlte Datei ist keine gÃ¼ltige Zwischenablagedatei." END Modified: trunk/reactos/base/applications/clipbrd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/lang/en-US.rc [iso-8859-1] Sat Nov 28 01:22:34 2015 @@ -60,4 +60,5 @@ STRINGTABLE BEGIN ERROR_UNSUPPORTED_FORMAT "The Clipboard contains data in a format, that cannot be displayed." + ERROR_INVALID_FILE_FORMAT "The selected file is not a valid clipboard file." END Modified: trunk/reactos/base/applications/clipbrd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/lang/fr-FR.rc [iso-8859-1] Sat Nov 28 01:22:34 2015 @@ -60,4 +60,5 @@ STRINGTABLE BEGIN ERROR_UNSUPPORTED_FORMAT "Le Presse-papiers contient des donnÃ©es dans un format qui ne peut Ãªtre affichÃ©." + ERROR_INVALID_FILE_FORMAT "Le fichier sÃ©lectionnÃ© n'est pas un fichier valide du presse-papiers." END Modified: trunk/reactos/base/applications/clipbrd/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/resources.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/resources.h [iso-8859-1] Sat Nov 28 01:22:34 2015 @@ -34,4 +34,5 @@ #define STRING_CF_DIF 212 #define STRING_CF_HDROP 213 -#define ERROR_UNSUPPORTED_FORMAT 300 +#define ERROR_UNSUPPORTED_FORMAT 300 +#define ERROR_INVALID_FILE_FORMAT 301

1 0

[akhaldi] 70172: [USER32] Sync ddemisc.c with Wine Staging 1.7.55. CORE-10536
by akhaldi＠svn.reactos.org 27 Nov '15

27 Nov '15

Author: akhaldi Date: Fri Nov 27 22:52:21 2015 New Revision: 70172 URL: http://svn.reactos.org/svn/reactos?rev=70172&view=rev Log: [USER32] Sync ddemisc.c with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/win32ss/user/user32/include/dde_private.h trunk/reactos/win32ss/user/user32/misc/ddemisc.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] Fri Nov 27 22:52:21 2015 @@ -301,9 +301,9 @@ reactos/win32ss/user/user32/controls/scrollbar.c # Forked reactos/win32ss/user/user32/controls/static.c # Synced to WineStaging-1.7.55 - reactos/win32ss/user/user32/include/dde_private.h # Synced to Wine-1.1.24 - - reactos/win32ss/user/user32/misc/dde.c # Synced to Wine-1.1.24 (dde_misc.c) + reactos/win32ss/user/user32/include/dde_private.h # Synced to WineStaging-1.7.55 + + 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 Modified: trunk/reactos/win32ss/user/user32/include/dde_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ… ============================================================================== --- trunk/reactos/win32ss/user/user32/include/dde_private.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/include/dde_private.h [iso-8859-1] Fri Nov 27 22:52:21 2015 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef __WINE_DDEML_PRIVATE_H @@ -72,9 +72,9 @@ * be to provide a new protocol in the case were both partners are handled by DDEML. * * The StringHandles are in fact stored as local atoms. So an HSZ and a (local) atom - * can be used interchangably. However, in order to keep track of the allocated HSZ, + * can be used interchangeably. However, in order to keep track of the allocated HSZ, * and to free them upon instance termination, all HSZ are stored in a link list. - * When the HSZ need to be passed thru DDE messages, we need to convert them back and + * When the HSZ need to be passed through DDE messages, we need to convert them back and * forth to global atoms. */ @@ -143,9 +143,9 @@ /* DDE_LINK struct defines hot, warm, and cold links */ typedef struct tagWDML_LINK { struct tagWDML_LINK* next; /* to link all the active links */ - HCONV hConv; /* to get back to the converstaion */ + HCONV hConv; /* to get back to the conversation */ UINT transactionType;/* 0 for no link */ - HSZ hszItem; /* item targetted for (hot/warm) link */ + HSZ hszItem; /* item targeted for (hot/warm) link */ UINT uFmt; /* format for data */ } WDML_LINK; @@ -169,8 +169,6 @@ WDML_LINK* links[2]; /* active links for this instance (client and server) */ } WDML_INSTANCE; -extern CRITICAL_SECTION WDML_CritSect; /* protection for instance list */ - /* header for the DDE Data objects */ typedef struct tagDDE_DATAHANDLE_HEAD { @@ -189,66 +187,63 @@ extern HDDEDATA WDML_InvokeCallback(WDML_INSTANCE* pInst, UINT uType, UINT uFmt, HCONV hConv, HSZ hsz1, HSZ hsz2, HDDEDATA hdata, - ULONG_PTR dwData1, ULONG_PTR dwData2); -extern WDML_SERVER* WDML_AddServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic); -extern void WDML_RemoveServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic); -extern WDML_SERVER* WDML_FindServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic); + ULONG_PTR dwData1, ULONG_PTR dwData2) DECLSPEC_HIDDEN; +extern WDML_SERVER* WDML_AddServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic) DECLSPEC_HIDDEN; +extern void WDML_RemoveServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic) DECLSPEC_HIDDEN; +extern WDML_SERVER* WDML_FindServer(WDML_INSTANCE* pInstance, HSZ hszService, HSZ hszTopic) DECLSPEC_HIDDEN; /* transaction handler on the server side */ -extern WDML_QUEUE_STATE WDML_ServerHandle(WDML_CONV* pConv, WDML_XACT* pXAct); +extern WDML_QUEUE_STATE WDML_ServerHandle(WDML_CONV* pConv, WDML_XACT* pXAct) DECLSPEC_HIDDEN; /* transaction handler on the client side */ HDDEDATA WDML_ClientHandle(WDML_CONV *pConv, WDML_XACT *pXAct, DWORD dwTimeout, LPDWORD pdwResult) DECLSPEC_HIDDEN; /* called both in DdeClientTransaction and server side. */ -extern UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, - DWORD afCmd, DWORD ulRes, BOOL bUnicode); extern WDML_CONV* WDML_AddConv(WDML_INSTANCE* pInstance, WDML_SIDE side, - HSZ hszService, HSZ hszTopic, HWND hwndClient, HWND hwndServer); -extern void WDML_RemoveConv(WDML_CONV* pConv, WDML_SIDE side); -extern WDML_CONV* WDML_GetConv(HCONV hConv, BOOL checkConnected); -extern WDML_CONV* WDML_GetConvFromWnd(HWND hWnd); + HSZ hszService, HSZ hszTopic, HWND hwndClient, HWND hwndServer) DECLSPEC_HIDDEN; +extern void WDML_RemoveConv(WDML_CONV* pConv, WDML_SIDE side) DECLSPEC_HIDDEN; +extern WDML_CONV* WDML_GetConv(HCONV hConv, BOOL checkConnected) DECLSPEC_HIDDEN; +extern WDML_CONV* WDML_GetConvFromWnd(HWND hWnd) DECLSPEC_HIDDEN; extern WDML_CONV* WDML_FindConv(WDML_INSTANCE* pInstance, WDML_SIDE side, - HSZ hszService, HSZ hszTopic); + HSZ hszService, HSZ hszTopic) DECLSPEC_HIDDEN; extern BOOL WDML_PostAck(WDML_CONV* pConv, WDML_SIDE side, WORD appRetCode, - BOOL fBusy, BOOL fAck, UINT_PTR pmt, LPARAM lParam, UINT oldMsg); + BOOL fBusy, BOOL fAck, UINT_PTR pmt, LPARAM lParam, UINT oldMsg) DECLSPEC_HIDDEN; extern void WDML_AddLink(WDML_INSTANCE* pInstance, HCONV hConv, WDML_SIDE side, - UINT wType, HSZ hszItem, UINT wFmt); + UINT wType, HSZ hszItem, UINT wFmt) DECLSPEC_HIDDEN; extern WDML_LINK* WDML_FindLink(WDML_INSTANCE* pInstance, HCONV hConv, WDML_SIDE side, - HSZ hszItem, BOOL use_fmt, UINT uFmt); + HSZ hszItem, BOOL use_fmt, UINT uFmt) DECLSPEC_HIDDEN; extern void WDML_RemoveLink(WDML_INSTANCE* pInstance, HCONV hConv, WDML_SIDE side, - HSZ hszItem, UINT wFmt); -extern void WDML_RemoveAllLinks(WDML_INSTANCE* pInstance, WDML_CONV* pConv, WDML_SIDE side); + HSZ hszItem, UINT wFmt) DECLSPEC_HIDDEN; /* string internals */ -extern void WDML_FreeAllHSZ(WDML_INSTANCE* pInstance); -extern BOOL WDML_DecHSZ(WDML_INSTANCE* pInstance, HSZ hsz); -extern BOOL WDML_IncHSZ(WDML_INSTANCE* pInstance, HSZ hsz); -extern ATOM WDML_MakeAtomFromHsz(HSZ hsz); -extern HSZ WDML_MakeHszFromAtom(const WDML_INSTANCE* pInstance, ATOM atom); +extern BOOL WDML_DecHSZ(WDML_INSTANCE* pInstance, HSZ hsz) DECLSPEC_HIDDEN; +extern BOOL WDML_IncHSZ(WDML_INSTANCE* pInstance, HSZ hsz) DECLSPEC_HIDDEN; +extern ATOM WDML_MakeAtomFromHsz(HSZ hsz) DECLSPEC_HIDDEN; +extern HSZ WDML_MakeHszFromAtom(const WDML_INSTANCE* pInstance, ATOM atom) DECLSPEC_HIDDEN; /* client calls these */ -extern WDML_XACT* WDML_AllocTransaction(WDML_INSTANCE* pInstance, UINT ddeMsg, UINT wFmt, HSZ hszItem); -extern void WDML_QueueTransaction(WDML_CONV* pConv, WDML_XACT* pXAct); -extern BOOL WDML_UnQueueTransaction(WDML_CONV* pConv, WDML_XACT* pXAct); -extern void WDML_FreeTransaction(WDML_INSTANCE* pInstance, WDML_XACT* pXAct, BOOL doFreePmt); -extern WDML_XACT* WDML_FindTransaction(WDML_CONV* pConv, DWORD tid); -extern HGLOBAL WDML_DataHandle2Global(HDDEDATA hDdeData, BOOL fResponse, BOOL fRelease, - BOOL fDeferUpd, BOOL fAckReq); -extern HDDEDATA WDML_Global2DataHandle(WDML_CONV* pConv, HGLOBAL hMem, WINE_DDEHEAD* p); -extern BOOL WDML_IsAppOwned(HDDEDATA hDdeData); -extern WDML_INSTANCE* WDML_GetInstance(DWORD InstId); -extern WDML_INSTANCE* WDML_GetInstanceFromWnd(HWND hWnd); +extern WDML_XACT* WDML_AllocTransaction(WDML_INSTANCE* pInstance, UINT ddeMsg, UINT wFmt, HSZ hszItem) DECLSPEC_HIDDEN; +extern void WDML_QueueTransaction(WDML_CONV* pConv, WDML_XACT* pXAct) DECLSPEC_HIDDEN; +extern BOOL WDML_UnQueueTransaction(WDML_CONV* pConv, WDML_XACT* pXAct) DECLSPEC_HIDDEN; +extern void WDML_FreeTransaction(WDML_INSTANCE* pInstance, WDML_XACT* pXAct, BOOL doFreePmt) DECLSPEC_HIDDEN; +extern HGLOBAL WDML_DataHandle2Global(HDDEDATA hDdeData, BOOL fResponse, BOOL fRelease, + BOOL fDeferUpd, BOOL dAckReq) DECLSPEC_HIDDEN; +extern HDDEDATA WDML_Global2DataHandle(WDML_CONV* pConv, HGLOBAL hMem, WINE_DDEHEAD* da) DECLSPEC_HIDDEN; +extern BOOL WDML_IsAppOwned(HDDEDATA hDdeData) DECLSPEC_HIDDEN; +extern WDML_INSTANCE* WDML_GetInstance(DWORD InstId) DECLSPEC_HIDDEN; +extern WDML_INSTANCE* WDML_GetInstanceFromWnd(HWND hWnd) DECLSPEC_HIDDEN; /* broadcasting to DDE windows */ extern void WDML_BroadcastDDEWindows(LPCWSTR clsName, UINT uMsg, - WPARAM wParam, LPARAM lParam); -extern void WDML_NotifyThreadExit(DWORD tid); + WPARAM wParam, LPARAM lParam) DECLSPEC_HIDDEN; +extern void WDML_NotifyThreadExit(DWORD tid) DECLSPEC_HIDDEN; +extern void WDML_NotifyThreadDetach(void) DECLSPEC_HIDDEN; + static __inline void WDML_ExtractAck(WORD status, DDEACK* da) { *da = *((DDEACK*)&status); } -extern const WCHAR WDML_szEventClass[]; /* class of window for events (aka instance) */ -extern const char WDML_szServerConvClassA[]; /* ANSI class of window for server side conv */ -extern const WCHAR WDML_szServerConvClassW[]; /* unicode class of window for server side conv */ -extern const char WDML_szClientConvClassA[]; /* ANSI class of window for client side conv */ -extern const WCHAR WDML_szClientConvClassW[]; /* unicode class of window for client side conv */ +extern const WCHAR WDML_szEventClass[] DECLSPEC_HIDDEN; /* class of window for events (aka instance) */ +extern const char WDML_szServerConvClassA[] DECLSPEC_HIDDEN; /* ANSI class of window for server side conv */ +extern const WCHAR WDML_szServerConvClassW[] DECLSPEC_HIDDEN; /* unicode class of window for server side conv */ +extern const char WDML_szClientConvClassA[] DECLSPEC_HIDDEN; /* ANSI class of window for client side conv */ +extern const WCHAR WDML_szClientConvClassW[] DECLSPEC_HIDDEN; /* unicode class of window for client side conv */ #define WM_WDML_REGISTER (WM_USER + 0x200) #define WM_WDML_UNREGISTER (WM_USER + 0x201) 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] Fri Nov 27 22:52:21 2015 @@ -39,14 +39,14 @@ const WCHAR WDML_szEventClass[] = L"DDEMLEvent"; /* protection for instance list */ -CRITICAL_SECTION WDML_CritSect; +static CRITICAL_SECTION WDML_CritSect; static CRITICAL_SECTION_DEBUG critsect_debug = { 0, 0, &WDML_CritSect, { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, 0, 0, { (DWORD_PTR)(__FILE__ ": WDML_CritSect") } }; -CRITICAL_SECTION WDML_CritSect = { &critsect_debug, -1, 0, 0, 0, 0 }; +static CRITICAL_SECTION WDML_CritSect = { &critsect_debug, -1, 0, 0, 0, 0 }; /* ================================================================ * @@ -417,7 +417,7 @@ * Frees up all the strings still allocated in the list and * remove all the nodes from the list of HSZ nodes. */ -void WDML_FreeAllHSZ(WDML_INSTANCE* pInstance) +static void WDML_FreeAllHSZ(WDML_INSTANCE* pInstance) { /* Free any strings created in this instance. */ @@ -825,7 +825,7 @@ * * */ -UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, +static UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, DWORD afCmd, DWORD ulRes, BOOL bUnicode) { WDML_INSTANCE* pInstance; @@ -1820,7 +1820,7 @@ * * */ -void WDML_RemoveAllLinks(WDML_INSTANCE* pInstance, WDML_CONV* pConv, WDML_SIDE side) +static void WDML_RemoveAllLinks(WDML_INSTANCE* pInstance, WDML_CONV* pConv, WDML_SIDE side) { WDML_LINK* pPrev = NULL; WDML_LINK* pCurrent = NULL; @@ -1869,7 +1869,7 @@ WDML_LINK* WDML_FindLink(WDML_INSTANCE* pInstance, HCONV hConv, WDML_SIDE side, HSZ hszItem, BOOL use_fmt, UINT uFmt) { - WDML_LINK* pCurrent = NULL; + WDML_LINK* pCurrent; for (pCurrent = pInstance->links[side]; pCurrent != NULL; pCurrent = pCurrent->next) { @@ -1982,7 +1982,7 @@ * * */ -WDML_XACT* WDML_FindTransaction(WDML_CONV* pConv, DWORD tid) +static WDML_XACT* WDML_FindTransaction(WDML_CONV* pConv, DWORD tid) { WDML_XACT* pXAct; @@ -2049,7 +2049,7 @@ WDML_CONV* WDML_FindConv(WDML_INSTANCE* pInstance, WDML_SIDE side, HSZ hszService, HSZ hszTopic) { - WDML_CONV* pCurrent = NULL; + WDML_CONV* pCurrent; for (pCurrent = pInstance->convs[side]; pCurrent != NULL; pCurrent = pCurrent->next) {

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