Ros-diffs November 2015

ros-diffs@reactos.org

14 participants
457 discussions

[akhaldi] 69784: [MSAFD] Improve the FILE header section. Brought to you by Adam Stachowicz. CORE-10114

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Nov 2 17:35:58 2015 New Revision: 69784 URL: http://svn.reactos.org/svn/reactos?rev=69784&view=rev Log: [MSAFD] Improve the FILE header section. Brought to you by Adam Stachowicz. CORE-10114 Modified: trunk/reactos/dll/win32/msafd/include/helpers.h trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/msafd/misc/event.c trunk/reactos/dll/win32/msafd/misc/helpers.c trunk/reactos/dll/win32/msafd/misc/sndrcv.c trunk/reactos/dll/win32/msafd/misc/stubs.c trunk/reactos/dll/win32/msafd/msafd.h Modified: trunk/reactos/dll/win32/msafd/include/helpers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/include/he… ============================================================================== --- trunk/reactos/dll/win32/msafd/include/helpers.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/include/helpers.h [iso-8859-1] Mon Nov 2 17:35:58 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Ancillary Function Driver DLL - * FILE: include/helpers.h + * FILE: dll/win32/msafd/include/helpers.h * PURPOSE: Definitions for helper DLL management */ #ifndef __HELPERS_H Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Mon Nov 2 17:35:58 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Ancillary Function Driver DLL - * FILE: misc/dllmain.c + * FILE: dll/win32/msafd/misc/dllmain.c * PURPOSE: DLL entry point * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Alex Ionescu (alex(a)relsoft.net) Modified: trunk/reactos/dll/win32/msafd/misc/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/event… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/event.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/event.c [iso-8859-1] Mon Nov 2 17:35:58 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Ancillary Function Driver DLL - * FILE: misc/event.c + * FILE: dll/win32/msafd/misc/event.c * PURPOSE: Event handling * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Alex Ionescu (alex(a)relsoft.net) Modified: trunk/reactos/dll/win32/msafd/misc/helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/helpe… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/helpers.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/helpers.c [iso-8859-1] Mon Nov 2 17:35:58 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Ancillary Function Driver DLL - * FILE: misc/helpers.c + * FILE: dll/win32/msafd/misc/helpers.c * PURPOSE: Helper DLL management * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Alex Ionescu (alex(a)relsoft.net) Modified: trunk/reactos/dll/win32/msafd/misc/sndrcv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/sndrc… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] Mon Nov 2 17:35:58 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Ancillary Function Driver DLL - * FILE: misc/sndrcv.c + * FILE: dll/win32/msafd/misc/sndrcv.c * PURPOSE: Send/receive routines * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Alex Ionescu (alex(a)relsoft.net) Modified: trunk/reactos/dll/win32/msafd/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/stubs.c [iso-8859-1] Mon Nov 2 17:35:58 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Ancillary Function Driver DLL - * FILE: misc/stubs.c + * FILE: dll/win32/msafd/misc/stubs.c * PURPOSE: Stubs * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * REVISIONS: Modified: trunk/reactos/dll/win32/msafd/msafd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/msafd.h?re… ============================================================================== --- trunk/reactos/dll/win32/msafd/msafd.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/msafd.h [iso-8859-1] Mon Nov 2 17:35:58 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Ancillary Function Driver DLL - * FILE: include/msafd.h + * FILE: dll/win32/msafd/msafd.h * PURPOSE: Ancillary Function Driver DLL header */

8 years, 10 months

[akhaldi] 69783: [MSAFD] Remove fixed CatalogEntryId. By Peter Hater. CORE-10440

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Nov 2 17:32:00 2015 New Revision: 69783 URL: http://svn.reactos.org/svn/reactos?rev=69783&view=rev Log: [MSAFD] Remove fixed CatalogEntryId. By Peter Hater. CORE-10440 Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Mon Nov 2 17:32:00 2015 @@ -19,6 +19,7 @@ HANDLE GlobalHeap; WSPUPCALLTABLE Upcalls; +DWORD CatalogEntryId; /* CatalogEntryId for upcalls */ LPWPUCOMPLETEOVERLAPPEDREQUEST lpWPUCompleteOverlappedRequest; PSOCKET_INFORMATION SocketListHead = NULL; CRITICAL_SECTION SocketListLock; @@ -289,7 +290,7 @@ CreateContext(Socket); /* Notify Winsock */ - Upcalls.lpWPUModifyIFSHandle(1, (SOCKET)Sock, lpErrno); + Upcalls.lpWPUModifyIFSHandle(CatalogEntryId, (SOCKET)Sock, lpErrno); /* Return Socket Handle */ TRACE("Success %x\n", Sock); @@ -2403,10 +2404,11 @@ lpProcTable->lpWSPStringToAddress = WSPStringToAddress; lpWSPData->wVersion = MAKEWORD(2, 2); lpWSPData->wHighVersion = MAKEWORD(2, 2); + /* Save CatalogEntryId for all upcalls */ + CatalogEntryId = lpProtocolInfo->dwCatalogEntryId; } TRACE("Status (%d).\n", Status); - return Status; }

8 years, 10 months

[tkreuzer] 69782: [WIN32K] Only scale characters with the world-to-device transform, when the graphics mode is GM_ADVANCED. Fixes Petzold's WhatSize testapp. CORE-7154 #resolve

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Nov 1 23:40:31 2015 New Revision: 69782 URL: http://svn.reactos.org/svn/reactos?rev=69782&view=rev Log: [WIN32K] Only scale characters with the world-to-device transform, when the graphics mode is GM_ADVANCED. Fixes Petzold's WhatSize testapp. CORE-7154 #resolve Modified: trunk/reactos/win32ss/gdi/ntgdi/dclife.c trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dclife.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] Sun Nov 1 23:40:31 2015 @@ -17,7 +17,7 @@ PSURFACE psurfDefaultBitmap = NULL; PBRUSH pbrDefaultBrush = NULL; -static const MATRIX gmxWorldToDeviceDefault = +const MATRIX gmxWorldToDeviceDefault = { FLOATOBJ_16, FLOATOBJ_0, FLOATOBJ_0, FLOATOBJ_16, @@ -25,7 +25,7 @@ 0, 0, 0x4b }; -static const MATRIX gmxDeviceToWorldDefault = +const MATRIX gmxDeviceToWorldDefault = { FLOATOBJ_1_16, FLOATOBJ_0, FLOATOBJ_0, FLOATOBJ_1_16, @@ -33,7 +33,7 @@ 0, 0, 0x53 }; -static const MATRIX gmxWorldToPageDefault = +const MATRIX gmxWorldToPageDefault = { FLOATOBJ_1, FLOATOBJ_0, FLOATOBJ_0, FLOATOBJ_1, Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Sun Nov 1 23:40:31 2015 @@ -29,6 +29,12 @@ ( ((DWORD)(BYTE)(ch0) << 24) | ((DWORD)(BYTE)(ch1) << 16) | \ ((DWORD)(BYTE)(ch2) << 8) | (DWORD)(BYTE)(ch3) ) #endif + +extern const MATRIX gmxWorldToDeviceDefault; +extern const MATRIX gmxWorldToPageDefault; + +// HACK!! Fix XFORMOBJ then use 1:16 / 16:1 +#define gmxWorldToDeviceDefault gmxWorldToPageDefault FT_Library library; @@ -3520,15 +3526,26 @@ goto fail; } - pmxWorldToDevice = DC_pmxWorldToDevice(dc); - FtSetCoordinateTransform(face, pmxWorldToDevice); + if (dc->dcattr.iGraphicsMode == GM_ADVANCED) + { + pmxWorldToDevice = DC_pmxWorldToDevice(dc); + FtSetCoordinateTransform(face, pmxWorldToDevice); + + fixAscender = ScaleLong(face->size->metrics.ascender, &pmxWorldToDevice->efM22); + fixDescender = ScaleLong(face->size->metrics.descender, &pmxWorldToDevice->efM22); + } + else + { + pmxWorldToDevice = (PMATRIX)&gmxWorldToDeviceDefault; + FtSetCoordinateTransform(face, pmxWorldToDevice); + + fixAscender = face->size->metrics.ascender; + fixDescender = face->size->metrics.descender; + } /* * Process the vertical alignment and determine the yoff. */ - - fixAscender = ScaleLong(face->size->metrics.ascender, &pmxWorldToDevice->efM22); - fixDescender = ScaleLong(face->size->metrics.descender, &pmxWorldToDevice->efM22); if (pdcattr->lTextAlign & TA_BASELINE) yoff = 0;

8 years, 10 months

[tkreuzer] 69781: [FORMATTING] Remove trailing whitespaces. No code change.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Nov 1 20:03:31 2015 New Revision: 69781 URL: http://svn.reactos.org/svn/reactos?rev=69781&view=rev Log: [FORMATTING] Remove trailing whitespaces. No code change. Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon.c Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/cursoricon.c [iso-8859-1] Sun Nov 1 20:03:31 2015 @@ -51,7 +51,7 @@ ULONG ArgumentLength) { BOOL *DefaultCursor = (BOOL*)Arguments; - HCURSOR hCursor; + HCURSOR hCursor; /* Load system cursors first */ LoadSystemCursors(); @@ -299,12 +299,12 @@ BITMAPINFO *info = NULL; TRACE("Creating alpha bitmap from existing bitmap.\n"); - + if (!GetObjectW( color, sizeof(bm), &bm )) goto done; if (bm.bmBitsPixel != 32) goto done; - + size = get_dib_image_size(bm.bmWidth, bm.bmHeight, 32); info = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(BITMAPINFO, bmiColors[256])); @@ -321,7 +321,7 @@ info->bmiHeader.biYPelsPerMeter = 0; info->bmiHeader.biClrUsed = 0; info->bmiHeader.biClrImportant = 0; - + bits = HeapAlloc(GetProcessHeap(), 0, size); if(!bits) { @@ -435,8 +435,8 @@ DeleteDC(hdcScreen); DeleteDC( hdc ); if(bits) HeapFree(GetProcessHeap(), 0, bits); - - TRACE("Returning 0x%08x.\n", alpha); + + TRACE("Returning 0x%08x.\n", alpha); return alpha; } @@ -485,7 +485,7 @@ if (dwFileSize < FIELD_OFFSET(CURSORICONFILEDIR, idEntries[dir->idCount])) return NULL; - /* + /* * Cute little hack: * We allocate a buffer, fake it as if it was a pointer to a resource in a module, * pass it to LookupIconIdFromDirectoryEx and get back the index we have to use @@ -534,7 +534,7 @@ fakeEntry->dwBytesInRes = entry->dwDIBSize; fakeEntry->wResId = i + 1; } - + /* Now call LookupIconIdFromResourceEx */ i = LookupIconIdFromDirectoryEx((PBYTE)fakeDir, bIcon, cxDesired, cyDesired, fuLoad & LR_MONOCHROME); /* We don't need this anymore */ @@ -575,8 +575,8 @@ return 0; } - - + + /************* IMPLEMENTATION CORE ****************/ @@ -596,20 +596,20 @@ HBITMAP hbmpOld = NULL; BOOL bResult = FALSE; const VOID *pvColor, *pvMask; - + ibmpType = DIB_GetBitmapInfo(&pbmi->bmiHeader, &width, &height, &bpp, &compr); /* Invalid data */ if(ibmpType < 0) return FALSE; - + /* No compression for icons */ if(compr != BI_RGB) return FALSE; - + /* If no dimensions were set, use the one from the icon */ if(!pdata->cx) pdata->cx = width; if(!pdata->cy) pdata->cy = height < 0 ? -height/2 : height/2; - + /* Fix the hotspot coords */ if(pdata->rt == (USHORT)((ULONG_PTR)RT_CURSOR)) { @@ -623,7 +623,7 @@ pdata->xHotspot = pdata->cx/2; pdata->yHotspot = pdata->cy/2; } - + hdcScreen = CreateDCW(DISPLAYW, NULL, NULL, NULL); if(!hdcScreen) return FALSE; @@ -633,23 +633,23 @@ DeleteDC(hdcScreen); return FALSE; } - + pbmiCopy = HeapAlloc(GetProcessHeap(), 0, max(ubmiSize, FIELD_OFFSET(BITMAPINFO, bmiColors[3]))); if(!pbmiCopy) goto done; RtlCopyMemory(pbmiCopy, pbmi, ubmiSize); - + /* In an icon/cursor, the BITMAPINFO holds twice the height */ if(pbmiCopy->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) ((BITMAPCOREHEADER*)&pbmiCopy->bmiHeader)->bcHeight /= 2; else pbmiCopy->bmiHeader.biHeight /= 2; height /= 2; - + pvColor = (const char*)pbmi + ubmiSize; pvMask = (const char*)pvColor + get_dib_image_size(width, height, bpp ); - + /* Set XOR bits */ if(monochrome) { @@ -661,7 +661,7 @@ hbmpOld = SelectObject(hdc, pdata->hbmMask); if(!hbmpOld) goto done; - + if(!StretchDIBits(hdc, 0, pdata->cy, pdata->cx, pdata->cy, 0, 0, width, height, pvColor, pbmiCopy, DIB_RGB_COLORS, SRCCOPY)) @@ -687,7 +687,7 @@ goto done; pdata->bpp = GetDeviceCaps(hdcScreen, BITSPIXEL); pdata->hbmAlpha = create_alpha_bitmap(NULL, pbmiCopy, pvColor, pdata->cx, pdata->cy); - + /* Now convert the info to monochrome for the mask bits */ if (pbmiCopy->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) { @@ -713,8 +713,8 @@ goto done; bResult = StretchDIBits(hdc, 0, 0, pdata->cx, pdata->cy, 0, 0, width, height, - pvMask, pbmiCopy, DIB_RGB_COLORS, SRCCOPY) != 0; - + pvMask, pbmiCopy, DIB_RGB_COLORS, SRCCOPY) != 0; + done: DeleteDC(hdcScreen); if(hbmpOld) SelectObject(hdc, hbmpOld); @@ -743,7 +743,7 @@ /* We must convert the color bitmap to screen format */ HDC hdcScreen, hdcMem; HBITMAP hbmpPrev; - + /* The mask dictates its dimensions */ if (!GetObject(pIconInfo->hbmMask, sizeof(bm), &bm)) return FALSE; @@ -777,7 +777,7 @@ pCursorData->hbmMask = CopyImage(pIconInfo->hbmMask, IMAGE_BITMAP, 0, 0, LR_MONOCHROME); if(!pCursorData->hbmMask) return FALSE; - + /* Now, fill some information */ pCursorData->rt = (USHORT)((ULONG_PTR)(pIconInfo->fIcon ? RT_ICON : RT_CURSOR)); if(pCursorData->hbmColor) @@ -796,7 +796,7 @@ pCursorData->cx = bm.bmWidth; pCursorData->cy = bm.bmHeight/2; } - + if(pIconInfo->fIcon) { pCursorData->xHotspot = pCursorData->cx/2; @@ -807,7 +807,7 @@ pCursorData->xHotspot = pIconInfo->xHotspot; pCursorData->yHotspot = pIconInfo->yHotspot; } - + return TRUE; } @@ -859,7 +859,7 @@ TRACE(" flags: 0x%08x\n", header->flags); } -/* Find an animated cursor chunk, given its type and ID */ +/* Find an animated cursor chunk, given its type and ID */ static void riff_find_chunk( DWORD chunk_id, DWORD chunk_type, const riff_chunk_t *parent_chunk, riff_chunk_t *chunk ) { const unsigned char *ptr = parent_chunk->data; @@ -958,7 +958,7 @@ if(pHeader->num_frames > 1) { /* Allocate frame descriptors, step indices and rates */ - pCurData->aspcur = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + pCurData->aspcur = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, pHeader->num_frames * sizeof(CURSORDATA) + pHeader->num_steps * (sizeof(DWORD) + sizeof(INT))); if(!pCurData->aspcur) { @@ -981,7 +981,7 @@ pFrameData = pCurData; pFrameData->rt = pCurData->rt; - + if (pHeader->flags & ANI_FLAG_ICON) { /* The chunks describe an icon file */ @@ -1025,8 +1025,8 @@ pFrameData->CURSORF_flags |= CURSORF_ACONFRAME; else pFrameData->CURSORF_flags &= ~CURSORF_ACON; - - + + /* Next frame */ icon_chunk += chunk_size + (2 * sizeof(DWORD)); icon_data = icon_chunk + (2 * sizeof(DWORD)); @@ -1091,7 +1091,7 @@ if(fuLoad & LR_LOADFROMFILE) { const BITMAPFILEHEADER* pbmfh; - + pvMapping = map_fileW(lpszName, NULL); if(!pvMapping) return NULL; @@ -1102,7 +1102,7 @@ goto end; } pbmi = (const BITMAPINFO*)(pbmfh + 1); - + /* Get the image bits */ if(pbmfh->bfOffBits) dwOffset = pbmfh->bfOffBits - sizeof(BITMAPFILEHEADER); @@ -1110,7 +1110,7 @@ else { HRSRC hrsrc; - + /* Caller wants an OEM bitmap */ if(!hinst) hinst = User32Instance; @@ -1124,7 +1124,7 @@ if(!pbmi) return NULL; } - + /* Fix up values */ if(DIB_GetBitmapInfo(&pbmi->bmiHeader, &width, &height, &bpp, &compr) == -1) goto end; @@ -1136,9 +1136,9 @@ cyDesired = height; else if(height < 0) cyDesired = -cyDesired; - + iBMISize = bitmap_info_size(pbmi, DIB_RGB_COLORS); - + /* Get a pointer to the image data */ pvBits = (char*)pbmi + (dwOffset ? dwOffset : iBMISize); @@ -1147,7 +1147,7 @@ if(!pbmiCopy) goto end; CopyMemory(pbmiCopy, pbmi, iBMISize); - + /* Fix it up, if needed */ if(fuLoad & (LR_LOADTRANSPARENT | LR_LOADMAP3DCOLORS)) { @@ -1157,7 +1157,7 @@ COLORREF crWindow, cr3DShadow, cr3DFace, cr3DLight; BYTE pixel = *((BYTE*)pvBits); UINT i; - + if(pbmiCopy->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { bpp = ((BITMAPCOREHEADER*)&pbmiCopy->bmiHeader)->bcBitCount; @@ -1174,18 +1174,18 @@ if(numColors > 256) numColors = 256; if (!numColors && (bpp <= 8)) numColors = 1 << bpp; } - + if(bpp > 8) goto create_bitmap; pbmiColors = (char*)pbmiCopy + pbmiCopy->bmiHeader.biSize; - + /* Get the relevant colors */ crWindow = GetSysColor(COLOR_WINDOW); cr3DShadow = GetSysColor(COLOR_3DSHADOW); cr3DFace = GetSysColor(COLOR_3DFACE); cr3DLight = GetSysColor(COLOR_3DLIGHT); - + /* Fix the transparent palette entry */ if(fuLoad & LR_LOADTRANSPARENT) { @@ -1198,16 +1198,16 @@ FIXME("Unhandled bit depth %d.\n", bpp); goto create_bitmap; } - + if(pixel >= numColors) { ERR("Wrong pixel passed in.\n"); goto create_bitmap; } - + /* If both flags are set, we must use COLOR_3DFACE */ if(fuLoad & LR_LOADMAP3DCOLORS) crWindow = cr3DFace; - + /* Define the color */ ptr = (RGBTRIPLE*)(pbmiColors + pixel*incr); ptr->rgbtBlue = GetBValue(crWindow); @@ -1215,7 +1215,7 @@ ptr->rgbtRed = GetRValue(crWindow); goto create_bitmap; } - + /* If we are here, then LR_LOADMAP3DCOLORS is set without LR_TRANSPARENT */ for(i = 0; i<numColors; i++) { @@ -1252,7 +1252,7 @@ if(!pbmiScaled) goto end; CopyMemory(pbmiScaled, pbmiCopy, iBMISize); - + /* Fix it up */ if(pbmiScaled->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { @@ -1268,10 +1268,10 @@ pbmiScaled->bmiHeader.biCompression = BI_RGB; } } - + /* Top-down image */ if(cyDesired < 0) cyDesired = -cyDesired; - + /* We need a device context */ hdcScreen = CreateDCW(DISPLAYW, NULL, NULL, NULL); if(!hdcScreen) @@ -1279,7 +1279,7 @@ hdc = CreateCompatibleDC(hdcScreen); if(!hdc) goto end; - + /* Now create the bitmap */ if(fuLoad & LR_CREATEDIBSECTION) hbmpRet = CreateDIBSection(hdc, pbmiScaled, DIB_RGB_COLORS, NULL, 0, 0); @@ -1290,10 +1290,10 @@ else hbmpRet = CreateCompatibleBitmap(hdcScreen, cxDesired, cyDesired); } - + if(!hbmpRet) goto end; - + hbmpOld = SelectObject(hdc, hbmpRet); if(!hbmpOld) goto end; @@ -1362,7 +1362,7 @@ entry = get_best_icon_file_entry(dir, filesize, cxDesired, cyDesired, bIcon, fuLoad); if(!entry) goto end; - + /* Fix dimensions */ if(!cxDesired) cxDesired = entry->bWidth; if(!cyDesired) cyDesired = entry->bHeight; @@ -1374,15 +1374,15 @@ cursorData.yHotspot = entry->yHotspot; } cursorData.rt = (USHORT)((ULONG_PTR)(bIcon ? RT_ICON : RT_CURSOR)); - + /* Do the dance */ if(!CURSORICON_GetCursorDataFromBMI(&cursorData, (BITMAPINFO*)(&bits[entry->dwDIBOffset]))) goto end; - + hCurIcon = NtUserxCreateEmptyCurObject(FALSE); if(!hCurIcon) goto end; - + /* Tell win32k */ if(!NtUserSetCursorIconData(hCurIcon, NULL, NULL, &cursorData)) { @@ -1400,7 +1400,7 @@ if(cursorData.hbmColor) DeleteObject(cursorData.hbmColor); if(cursorData.hbmAlpha) DeleteObject(cursorData.hbmAlpha); UnmapViewOfFile(bits); - + return NULL; } @@ -1589,7 +1589,7 @@ /* Tell win32k */ bStatus = NtUserSetCursorIconData(hCurIcon, hinst ? &ustrModule : NULL, lpszName ? &ustrRsrc : NULL, &cursorData); - + if(!bStatus) { NtUserDestroyCursor(hCurIcon, TRUE); @@ -1633,7 +1633,7 @@ { FIXME("The flag LR_COPYFROMRESOURCE is not implemented for bitmaps\n"); } - + if (flags & LR_COPYRETURNORG) { FIXME("The flag LR_COPYRETURNORG is not implemented for bitmaps\n"); @@ -1696,7 +1696,7 @@ { /* Look if the colors of the DIB are black and white */ - monochrome = + monochrome = (bi->bmiColors[0].rgbRed == 0xff && bi->bmiColors[0].rgbGreen == 0xff && bi->bmiColors[0].rgbBlue == 0xff @@ -1814,17 +1814,17 @@ HICON ret = NULL; ICONINFO ii; CURSORDATA CursorData; - + if (fuFlags & LR_COPYFROMRESOURCE) { /* Get the icon module/resource names */ UNICODE_STRING ustrModule; UNICODE_STRING ustrRsrc; HMODULE hModule; - + ustrModule.MaximumLength = 0; ustrRsrc.MaximumLength = 0; - + /* Get the buffer size */ if (!NtUserGetIconInfo(hicon, NULL, &ustrModule, &ustrRsrc, NULL, FALSE)) { @@ -1837,7 +1837,7 @@ SetLastError(ERROR_NOT_ENOUGH_MEMORY); return NULL; } - + if (ustrRsrc.MaximumLength) { ustrRsrc.Buffer = HeapAlloc(GetProcessHeap(), 0, ustrRsrc.MaximumLength); @@ -1856,12 +1856,12 @@ HeapFree(GetProcessHeap(), 0, ustrRsrc.Buffer); return NULL; } - + /* NULL-terminate our strings */ ustrModule.Buffer[ustrModule.Length/sizeof(WCHAR)] = UNICODE_NULL; if (!IS_INTRESOURCE(ustrRsrc.Buffer)) ustrRsrc.Buffer[ustrRsrc.Length/sizeof(WCHAR)] = UNICODE_NULL; - + TRACE("Got module %wZ, resource %p (%S).\n", &ustrModule, ustrRsrc.Buffer, IS_INTRESOURCE(ustrRsrc.Buffer) ? L"" : ustrRsrc.Buffer); @@ -1873,7 +1873,7 @@ SetLastError(ERROR_INVALID_PARAMETER); goto leave; } - + /* Call the relevant function */ ret = CURSORICON_LoadImageW( hModule, @@ -1882,24 +1882,24 @@ cyDesired, fuFlags & (LR_DEFAULTSIZE | LR_SHARED), bIcon); - + FreeLibrary(hModule); - + /* If we're here, that means that the passed icon is shared. Don't destroy it, even if LR_COPYDELETEORG is specified */ leave: HeapFree(GetProcessHeap(), 0, ustrModule.Buffer); if (!IS_INTRESOURCE(ustrRsrc.Buffer)) HeapFree(GetProcessHeap(), 0, ustrRsrc.Buffer); - + TRACE("Returning 0x%08x.\n", ret); - + return ret; } - + /* This is a regular copy */ if (fuFlags & ~(LR_COPYDELETEORG | LR_SHARED)) FIXME("Unimplemented flags: 0x%08x\n", fuFlags); - + if (!GetIconInfo(hicon, &ii)) { ERR("GetIconInfo failed.\n"); @@ -1922,14 +1922,14 @@ NtUserDestroyCursor(ret, TRUE); goto Leave; } - + Leave: DeleteObject(ii.hbmMask); if (ii.hbmColor) DeleteObject(ii.hbmColor); - + if (ret && (fuFlags & LR_COPYDELETEORG)) DestroyIcon(hicon); - + return ret; } @@ -2090,7 +2090,7 @@ ) { TRACE("%s\n", debugstr_a(lpFileName)); - + return LoadImageA(NULL, lpFileName, IMAGE_CURSOR, @@ -2104,7 +2104,7 @@ ) { TRACE("%s\n", debugstr_w(lpFileName)); - + return LoadImageW(NULL, lpFileName, IMAGE_CURSOR, @@ -2221,7 +2221,7 @@ ULONG bestScore = 0xFFFFFFFF, score; TRACE("%p, %x, %i, %i, %x.\n", presbits, fIcon, cxDesired, cyDesired, Flags); - + if(!(dir && !dir->idReserved && (dir->idType & 3))) { WARN("Invalid resource.\n"); @@ -2236,11 +2236,11 @@ icScreen = CreateICW(DISPLAYW, NULL, NULL, NULL); if(!icScreen) return FALSE; - + bppDesired = GetDeviceCaps(icScreen, BITSPIXEL); DeleteDC(icScreen); } - + if(!cxDesired) cxDesired = Flags & LR_DEFAULTSIZE ? GetSystemMetrics(fIcon ? SM_CXICON : SM_CXCURSOR) : 256; if(!cyDesired) @@ -2279,7 +2279,7 @@ bestScore = score; BitCount = entry->wBitCount; } - + if(numMatch == 1) { /* Only one entry fits the asked dimensions */ @@ -2288,8 +2288,8 @@ /* Avoid paletted icons on non-paletted device */ if (bppDesired > 8 && BitCount > 8) - notPaletted = TRUE; - + notPaletted = TRUE; + BitCount = 0; iIndex = -1; /* Now find the entry with the best depth */ @@ -2325,7 +2325,7 @@ if(iIndex >= 0) return dir->idEntries[iIndex].wResId; - + /* No inferior or equal depth available. Get the smallest bigger one */ BitCount = 0xFFFF; iIndex = -1; @@ -2356,7 +2356,7 @@ } if (iIndex >= 0) return dir->idEntries[iIndex].wResId; - + return 0; } @@ -2421,9 +2421,9 @@ CURSORDATA cursorData; HICON hIcon; BOOL isAnimated; - + TRACE("%p, %lu, %lu, %lu, %i, %i, %lu.\n", pbIconBits, cbIconBits, fIcon, dwVersion, cxDesired, cyDesired, uFlags); - + if(uFlags & LR_DEFAULTSIZE) { if(!cxDesired) cxDesired = GetSystemMetrics(fIcon ? SM_CXICON : SM_CXCURSOR); @@ -2499,7 +2499,7 @@ cursorData.yHotspot = *pt++; pbIconBits = (PBYTE)pt; } - + if (!CURSORICON_GetCursorDataFromBMI(&cursorData, (BITMAPINFO*)pbIconBits)) { ERR("Couldn't fill the CURSORDATA structure.\n"); @@ -2514,11 +2514,11 @@ if (uFlags & LR_SHARED) cursorData.CURSORF_flags |= CURSORF_LRSHARED; - + hIcon = NtUserxCreateEmptyCurObject(isAnimated); if (!hIcon) goto end_error; - + if(!NtUserSetCursorIconData(hIcon, NULL, NULL, &cursorData)) { ERR("NtUserSetCursorIconData failed.\n"); @@ -2528,7 +2528,7 @@ if(isAnimated) HeapFree(GetProcessHeap(), 0, cursorData.aspcur); - + return hIcon; /* Clean up */ @@ -2538,7 +2538,7 @@ DeleteObject(cursorData.hbmMask); if(cursorData.hbmColor) DeleteObject(cursorData.hbmColor); if(cursorData.hbmAlpha) DeleteObject(cursorData.hbmAlpha); - + return NULL; } @@ -2549,26 +2549,26 @@ /* As simple as creating a handle, and let win32k deal with the bitmaps */ HICON hiconRet; CURSORDATA cursorData; - + TRACE("%p.\n", piconinfo); ZeroMemory(&cursorData, sizeof(cursorData)); - + if(!CURSORICON_GetCursorDataFromIconInfo(&cursorData, piconinfo)) return NULL; - + hiconRet = NtUserxCreateEmptyCurObject(FALSE); if(!hiconRet) goto end_error; - + if(!NtUserSetCursorIconData(hiconRet, NULL, NULL, &cursorData)) { NtUserDestroyCursor(hiconRet, FALSE); goto end_error; } - + TRACE("Returning 0x%08x.\n", hiconRet); - + return hiconRet; end_error: @@ -2576,7 +2576,7 @@ DeleteObject(cursorData.hbmMask); if(cursorData.hbmColor) DeleteObject(cursorData.hbmColor); if(cursorData.hbmAlpha) DeleteObject(cursorData.hbmAlpha); - + return NULL; }

8 years, 10 months

[akhaldi] 69780: [PSDK] Do not compile d3d10.idl as part of d3d_idl_headers.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Nov 1 17:51:24 2015 New Revision: 69780 URL: http://svn.reactos.org/svn/reactos?rev=69780&view=rev Log: [PSDK] Do not compile d3d10.idl as part of d3d_idl_headers. Modified: trunk/reactos/include/psdk/CMakeLists.txt Modified: trunk/reactos/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/CMakeLists.tx… ============================================================================== --- trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] Sun Nov 1 17:51:24 2015 @@ -139,7 +139,7 @@ add_typelib(stdole2.idl) add_custom_target(stdole2 DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/stdole2.tlb) -add_idl_headers(d3d_idl_headers d3d10.idl d3dcommon.idl) +add_idl_headers(d3d_idl_headers d3dcommon.idl) add_iid_library(wuguid wuapi.idl) add_iid_library(xml_uuids msxml2.idl)

8 years, 10 months

[akhaldi] 69779: [DXGI] This doesn't belong to trunk. [WBEMPROX] Disable the code that depends on dxgi.dll.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Nov 1 17:41:42 2015 New Revision: 69779 URL: http://svn.reactos.org/svn/reactos?rev=69779&view=rev Log: [DXGI] This doesn't belong to trunk. [WBEMPROX] Disable the code that depends on dxgi.dll. Removed: trunk/reactos/dll/directx/wine/dxgi/ trunk/reactos/include/psdk/dxgi.idl trunk/reactos/include/psdk/dxgiformat.h trunk/reactos/include/psdk/dxgitype.h trunk/reactos/include/reactos/wine/winedxgi.idl Modified: trunk/reactos/dll/directx/wine/CMakeLists.txt trunk/reactos/dll/win32/wbemprox/CMakeLists.txt trunk/reactos/dll/win32/wbemprox/builtin.c trunk/reactos/include/psdk/CMakeLists.txt trunk/reactos/include/reactos/wine/CMakeLists.txt trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/CMakeList… ============================================================================== --- trunk/reactos/dll/directx/wine/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/CMakeLists.txt [iso-8859-1] Sun Nov 1 17:41:42 2015 @@ -34,7 +34,6 @@ add_subdirectory(dplayx) add_subdirectory(dsound) add_subdirectory(dxdiagn) -add_subdirectory(dxgi) add_subdirectory(msdmo) add_subdirectory(qedit) add_subdirectory(quartz) Modified: trunk/reactos/dll/win32/wbemprox/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/CMakeLists.txt [iso-8859-1] Sun Nov 1 17:41:42 2015 @@ -31,7 +31,7 @@ set_source_files_properties(wbemprox.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/wbemprox.rgs) set_module_type(wbemprox win32dll) target_link_libraries(wbemprox uuid wine) -add_importlibs(wbemprox iphlpapi dxgi oleaut32 advapi32 user32 gdi32 version winspool ws2_32 msvcrt kernel32 ntdll) +add_importlibs(wbemprox iphlpapi oleaut32 advapi32 user32 gdi32 version winspool ws2_32 msvcrt kernel32 ntdll) add_dependencies(wbemprox d3d_idl_headers) add_pch(wbemprox wbemprox_private.h SOURCE) add_cd_file(TARGET wbemprox DESTINATION reactos/system32/wbem FOR all) Modified: trunk/reactos/dll/win32/wbemprox/builtin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/builtin… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/builtin.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/builtin.c [iso-8859-1] Sun Nov 1 17:41:42 2015 @@ -29,9 +29,6 @@ #include <ntsecapi.h> #include <winspool.h> #include <sddl.h> - -#include <initguid.h> -#include <d3d10.h> static const WCHAR class_baseboardW[] = {'W','i','n','3','2','_','B','a','s','e','B','o','a','r','d',0}; @@ -2752,6 +2749,8 @@ return FILL_STATUS_FILTERED; } +#ifndef __REACTOS__ + static UINT32 get_bits_per_pixel( UINT *hres, UINT *vres ) { HDC hdc = GetDC( NULL ); @@ -2835,6 +2834,8 @@ if (factory) IDXGIFactory_Release( factory ); return status; } + +#endif /* !__REACTOS__ */ static struct table builtin_classes[] = { @@ -2866,7 +2867,10 @@ { class_stdregprovW, SIZEOF(col_stdregprov), col_stdregprov, SIZEOF(data_stdregprov), 0, (BYTE *)data_stdregprov }, { class_systemsecurityW, SIZEOF(col_systemsecurity), col_systemsecurity, SIZEOF(data_systemsecurity), 0, (BYTE *)data_systemsecurity }, { class_systemenclosureW, SIZEOF(col_systemenclosure), col_systemenclosure, SIZEOF(data_systemenclosure), 0, (BYTE *)data_systemenclosure }, +#ifndef __REACTOS__ + /* Requires dxgi.dll */ { class_videocontrollerW, SIZEOF(col_videocontroller), col_videocontroller, 0, 0, NULL, fill_videocontroller } +#endif }; void init_table_list( void ) Modified: trunk/reactos/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/CMakeLists.tx… ============================================================================== --- trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] Sun Nov 1 17:41:42 2015 @@ -43,7 +43,6 @@ docobj.idl docobjectservice.idl downloadmgr.idl - dxgi.idl # dyngraph.idl endpointvolume.idl exdisp.idl @@ -142,7 +141,6 @@ add_idl_headers(d3d_idl_headers d3d10.idl d3dcommon.idl) -add_iid_library(dxgi_uuids dxgi.idl) add_iid_library(wuguid wuapi.idl) add_iid_library(xml_uuids msxml2.idl) Removed: trunk/reactos/include/psdk/dxgi.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dxgi.idl?rev=… ============================================================================== --- trunk/reactos/include/psdk/dxgi.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dxgi.idl (removed) @@ -1,446 +0,0 @@ -/* - * Copyright 2007 Andras Kovacs - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -import "oaidl.idl"; -import "ocidl.idl"; -import "dxgitype.h"; - -const UINT _FACDXGI = 0x87a; - -cpp_quote("#define MAKE_DXGI_STATUS(x) MAKE_HRESULT(0, _FACDXGI, x)") -cpp_quote("#define DXGI_STATUS_OCCLUDED MAKE_DXGI_STATUS(1)") -cpp_quote("#define DXGI_STATUS_CLIPPED MAKE_DXGI_STATUS(2)") -cpp_quote("#define DXGI_STATUS_NO_REDIRECTION MAKE_DXGI_STATUS(4)") -cpp_quote("#define DXGI_STATUS_NO_DESKTOP_ACCESS MAKE_DXGI_STATUS(5)") -cpp_quote("#define DXGI_STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE MAKE_DXGI_STATUS(6)") -cpp_quote("#define DXGI_STATUS_MODE_CHANGED MAKE_DXGI_STATUS(7)") -cpp_quote("#define DXGI_STATUS_MODE_CHANGE_IN_PROGRESS MAKE_DXGI_STATUS(8)") - -cpp_quote("#define MAKE_DXGI_HRESULT(x) MAKE_HRESULT(1, _FACDXGI, x)") -cpp_quote("#define DXGI_ERROR_INVALID_CALL MAKE_DXGI_HRESULT(1)") -cpp_quote("#define DXGI_ERROR_NOT_FOUND MAKE_DXGI_HRESULT(2)") -cpp_quote("#define DXGI_ERROR_MORE_DATA MAKE_DXGI_HRESULT(3)") -cpp_quote("#define DXGI_ERROR_UNSUPPORTED MAKE_DXGI_HRESULT(4)") -cpp_quote("#define DXGI_ERROR_DEVICE_REMOVED MAKE_DXGI_HRESULT(5)") -cpp_quote("#define DXGI_ERROR_DEVICE_HUNG MAKE_DXGI_HRESULT(6)") -cpp_quote("#define DXGI_ERROR_DEVICE_RESET MAKE_DXGI_HRESULT(7)") -cpp_quote("#define DXGI_ERROR_WAS_STILL_DRAWING MAKE_DXGI_HRESULT(10)") -cpp_quote("#define DXGI_ERROR_FRAME_STATISTICS_DISJOINT MAKE_DXGI_HRESULT(11)") -cpp_quote("#define DXGI_ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE MAKE_DXGI_HRESULT(12)") -cpp_quote("#define DXGI_ERROR_DRIVER_INTERNAL_ERROR MAKE_DXGI_HRESULT(32)") -cpp_quote("#define DXGI_ERROR_NONEXCLUSIVE MAKE_DXGI_HRESULT(33)") -cpp_quote("#define DXGI_ERROR_NOT_CURRENTLY_AVAILABLE MAKE_DXGI_HRESULT(34)") - -cpp_quote("#if 0") -typedef HANDLE HMONITOR; -typedef struct _LUID { - DWORD LowPart; - LONG HighPart; -} LUID, *PLUID; -cpp_quote("#endif") - -typedef UINT DXGI_USAGE; -const DXGI_USAGE DXGI_USAGE_SHADER_INPUT = 0x10L; -const DXGI_USAGE DXGI_USAGE_RENDER_TARGET_OUTPUT = 0x20L; -const DXGI_USAGE DXGI_USAGE_BACK_BUFFER = 0x40L; -const DXGI_USAGE DXGI_USAGE_SHARED = 0x80L; -const DXGI_USAGE DXGI_USAGE_READ_ONLY = 0x100L; - -const UINT DXGI_ENUM_MODES_INTERLACED = 1; -const UINT DXGI_ENUM_MODES_SCALING = 2; - -typedef enum DXGI_SWAP_EFFECT { - DXGI_SWAP_EFFECT_DISCARD = 0, - DXGI_SWAP_EFFECT_SEQUENTIAL = 1, -} DXGI_SWAP_EFFECT; - -typedef enum DXGI_RESIDENCY { - DXGI_RESIDENCY_FULLY_RESIDENT = 1, - DXGI_RESIDENCY_RESIDENT_IN_SHARED_MEMORY = 2, - DXGI_RESIDENCY_EVICTED_TO_DISK = 3, -} DXGI_RESIDENCY; - -typedef struct DXGI_SURFACE_DESC { - UINT Width; - UINT Height; - DXGI_FORMAT Format; - DXGI_SAMPLE_DESC SampleDesc; -} DXGI_SURFACE_DESC; - -typedef struct DXGI_MAPPED_RECT { - INT Pitch; - BYTE *pBits; -} DXGI_MAPPED_RECT; - -typedef struct DXGI_OUTPUT_DESC { - WCHAR DeviceName[32]; - RECT DesktopCoordinates; - BOOL AttachedToDesktop; - DXGI_MODE_ROTATION Rotation; - HMONITOR Monitor; -} DXGI_OUTPUT_DESC; - -typedef struct DXGI_FRAME_STATISTICS { - UINT PresentCount; - UINT PresentRefreshCount; - UINT SyncRefreshCount; - LARGE_INTEGER SyncQPCTime; - LARGE_INTEGER SyncGPUTime; -} DXGI_FRAME_STATISTICS; - -typedef struct DXGI_ADAPTER_DESC { - WCHAR Description[128]; - UINT VendorId; - UINT DeviceId; - UINT SubSysId; - UINT Revision; - SIZE_T DedicatedVideoMemory; - SIZE_T DedicatedSystemMemory; - SIZE_T SharedSystemMemory; - LUID AdapterLuid; -} DXGI_ADAPTER_DESC; - -typedef enum DXGI_SWAP_CHAIN_FLAG { - DXGI_SWAP_CHAIN_FLAG_NONPREROTATED = 1, - DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH = 2, - DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE = 4 -} DXGI_SWAP_CHAIN_FLAG; - -typedef struct DXGI_SWAP_CHAIN_DESC { - DXGI_MODE_DESC BufferDesc; - DXGI_SAMPLE_DESC SampleDesc; - DXGI_USAGE BufferUsage; - UINT BufferCount; - HWND OutputWindow; - BOOL Windowed; - DXGI_SWAP_EFFECT SwapEffect; - UINT Flags; -} DXGI_SWAP_CHAIN_DESC; - -typedef struct DXGI_SHARED_RESOURCE { - HANDLE Handle; -} DXGI_SHARED_RESOURCE; - -[ - object, - local, - uuid(aec22fb8-76f3-4639-9be0-28eb43a67a2e) -] -interface IDXGIObject : IUnknown -{ - HRESULT SetPrivateData( - [in] REFGUID guid, - [in] UINT data_size, - [in] const void *data - ); - HRESULT SetPrivateDataInterface( - [in] REFGUID guid, - [in] const IUnknown *object - ); - HRESULT GetPrivateData( - [in] REFGUID guid, - [in, out] UINT *data_size, - [out] void *data - ); - HRESULT GetParent( - [in] REFIID riid, - [out] void **parent - ); -} - -[ - object, - local, - uuid(3d3e0379-f9de-4d58-bb6c-18d62992f1a6) -] -interface IDXGIDeviceSubObject : IDXGIObject -{ - HRESULT GetDevice( - [in] REFIID riid, - [out] void **device - ); -} - -[ - object, - uuid(035f3ab4-482e-4e50-b41f-8a7f8bd8960b), - local, - pointer_default(unique) -] -interface IDXGIResource : IDXGIDeviceSubObject -{ - HRESULT GetSharedHandle([out] HANDLE *pSharedHandle); - HRESULT GetUsage([out] DXGI_USAGE *pUsage); - HRESULT SetEvictionPriority([in] UINT EvictionPriority); - HRESULT GetEvictionPriority([out, retval] UINT *pEvictionPriority); -} - -[ - object, - uuid(9d8e1289-d7b3-465f-8126-250e349af85d), - local, - pointer_default(unique) -] -interface IDXGIKeyedMutex : IDXGIDeviceSubObject -{ - HRESULT AcquireSync([in] UINT64 Key, [in] DWORD dwMilliseconds); - HRESULT ReleaseSync([in] UINT64 Key); -} - -[ - object, - local, - uuid(cafcb56c-6ac3-4889-bf47-9e23bbd260ec) -] -interface IDXGISurface : IDXGIDeviceSubObject -{ - HRESULT GetDesc( - [out] DXGI_SURFACE_DESC *desc - ); - HRESULT Map( - [out] DXGI_MAPPED_RECT *mapped_rect, - [in] UINT flags - ); - HRESULT Unmap( - ); -} - -[ - object, - local, - uuid(ae02eedb-c735-4690-8d52-5a8dc20213aa) -] -interface IDXGIOutput : IDXGIObject -{ - HRESULT GetDesc( - [out] DXGI_OUTPUT_DESC *desc - ); - HRESULT GetDisplayModeList( - [in] DXGI_FORMAT format, - [in] UINT flags, - [in, out] UINT *mode_count, - [out] DXGI_MODE_DESC *desc - ); - HRESULT FindClosestMatchingMode( - [in] const DXGI_MODE_DESC *mode, - [out] DXGI_MODE_DESC *closest_match, - [in] IUnknown *device - ); - HRESULT WaitForVBlank( - ); - HRESULT TakeOwnership( - [in] IUnknown *device, - [in] BOOL exclusive - ); - void ReleaseOwnership( - ); - HRESULT GetGammaControlCapabilities( - [out] DXGI_GAMMA_CONTROL_CAPABILITIES *gamma_caps - ); - HRESULT SetGammaControl( - [in] const DXGI_GAMMA_CONTROL *gamma_control - ); - HRESULT GetGammaControl( - [out] DXGI_GAMMA_CONTROL *gamma_control - ); - HRESULT SetDisplaySurface( - [in] IDXGISurface *surface - ); - HRESULT GetDisplaySurfaceData( - [in] IDXGISurface *surface - ); - HRESULT GetFrameStatistics( - [out] DXGI_FRAME_STATISTICS *stats - ); -} - -[ - object, - local, - uuid(2411e7e1-12ac-4ccf-bd14-9798e8534dc0) -] -interface IDXGIAdapter : IDXGIObject -{ - HRESULT EnumOutputs( - [in] UINT output_idx, - [in, out] IDXGIOutput **output - ); - HRESULT GetDesc( - [out] DXGI_ADAPTER_DESC *desc - ); - HRESULT CheckInterfaceSupport( - [in] REFGUID guid, - [out] LARGE_INTEGER *umd_version - ); -} - -[ - object, - local, - uuid(310d36a0-d2e7-4c0a-aa04-6a9d23b8886a) -] -interface IDXGISwapChain : IDXGIDeviceSubObject -{ - HRESULT Present( - [in] UINT sync_interval, - [in] UINT flags - ); - HRESULT GetBuffer( - [in] UINT buffer_idx, - [in] REFIID riid, - [in, out] void **surface - ); - HRESULT SetFullscreenState( - [in] BOOL fullscreen, - [in] IDXGIOutput *target - ); - HRESULT GetFullscreenState( - [out] BOOL *fullscreen, - [out] IDXGIOutput **target - ); - HRESULT GetDesc( - [out] DXGI_SWAP_CHAIN_DESC *desc - ); - HRESULT ResizeBuffers( - [in] UINT buffer_count, - [in] UINT width, - [in] UINT height, - [in] DXGI_FORMAT format, - [in] UINT flags - ); - HRESULT ResizeTarget( - [in] const DXGI_MODE_DESC *target_mode_desc - ); - HRESULT GetContainingOutput( - [out] IDXGIOutput **output - ); - HRESULT GetFrameStatistics( - [out] DXGI_FRAME_STATISTICS *stats - ); - HRESULT GetLastPresentCount( - [out] UINT *last_present_count - ); -} - -cpp_quote("#define DXGI_MWA_NO_WINDOW_CHANGES 0x1") -cpp_quote("#define DXGI_MWA_NO_ALT_ENTER 0x2") -cpp_quote("#define DXGI_MWA_NO_PRINT_SCREEN 0x4") -cpp_quote("#define DXGI_MWA_VALID 0x7") - -[ - object, - local, - uuid(7b7166ec-21c7-44ae-b21a-c9ae321ae369) -] -interface IDXGIFactory : IDXGIObject -{ - HRESULT EnumAdapters( - [in] UINT adapter_idx, - [out] IDXGIAdapter **adapter - ); - HRESULT MakeWindowAssociation( - [in] HWND window, - [in] UINT flags - ); - HRESULT GetWindowAssociation( - [in] HWND *window - ); - HRESULT CreateSwapChain( - [in] IUnknown *device, - [in] DXGI_SWAP_CHAIN_DESC *desc, - [out] IDXGISwapChain **swapchain - ); - HRESULT CreateSoftwareAdapter( - [in] HMODULE swrast, - [out] IDXGIAdapter **adapter - ); -} - -[local] HRESULT __stdcall CreateDXGIFactory(REFIID riid, void **factory); - -[ - object, - local, - uuid(54ec77fa-1377-44e6-8c32-88fd5f44c84c) -] -interface IDXGIDevice : IDXGIObject -{ - HRESULT GetAdapter( - [out] IDXGIAdapter **adapter - ); - HRESULT CreateSurface( - [in] const DXGI_SURFACE_DESC *desc, - [in] UINT surface_count, - [in] DXGI_USAGE usage, - [in] const DXGI_SHARED_RESOURCE *shared_resource, - [out] IDXGISurface **surface - ); - HRESULT QueryResourceResidency( - [in] IUnknown *const *resources, - [out] DXGI_RESIDENCY *residency, - [in] UINT resource_count - ); - HRESULT SetGPUThreadPriority( - [in] INT priority - ); - HRESULT GetGPUThreadPriority( - [out] INT *priority - ); -} - -typedef enum DXGI_ADAPTER_FLAG { - DXGI_ADAPTER_FLAG_NONE = 0, - DXGI_ADAPTER_FLAG_REMOTE = 1, - DXGI_ADAPTER_FLAG_FORCE_DWORD = 0xFFFFFFFF -} DXGI_ADAPTER_FLAG; - -typedef struct DXGI_ADAPTER_DESC1 { - WCHAR Description[128]; - UINT VendorId; - UINT DeviceId; - UINT SubSysId; - UINT Revision; - SIZE_T DedicatedVideoMemory; - SIZE_T DedicatedSystemMemory; - SIZE_T SharedSystemMemory; - LUID AdapterLuid; - UINT Flags; -} DXGI_ADAPTER_DESC1; - -[ - object, - uuid(29038f61-3839-4626-91fd-086879011a05), - local, - pointer_default(unique) -] -interface IDXGIAdapter1 : IDXGIAdapter -{ - HRESULT GetDesc1([out] DXGI_ADAPTER_DESC1 *pDesc); -} - -[ - object, - uuid(770aae78-f26f-4dba-a829-253c83d1b387), - local, - pointer_default(unique) - ] -interface IDXGIFactory1 : IDXGIFactory -{ - HRESULT EnumAdapters1([in] UINT Adapter, [out] IDXGIAdapter1 **ppAdapter); - BOOL IsCurrent(); -} Removed: trunk/reactos/include/psdk/dxgiformat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dxgiformat.h?… ============================================================================== --- trunk/reactos/include/psdk/dxgiformat.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dxgiformat.h (removed) @@ -1,117 +0,0 @@ -/* - * Copyright 2007 Andras Kovacs - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __dxgiformat_h__ -#define __dxgiformat_h__ - -#define DXGI_FORMAT_DEFINED 1 - -typedef enum DXGI_FORMAT { - DXGI_FORMAT_UNKNOWN = 0, - DXGI_FORMAT_R32G32B32A32_TYPELESS = 1, - DXGI_FORMAT_R32G32B32A32_FLOAT = 2, - DXGI_FORMAT_R32G32B32A32_UINT = 3, - DXGI_FORMAT_R32G32B32A32_SINT = 4, - DXGI_FORMAT_R32G32B32_TYPELESS = 5, - DXGI_FORMAT_R32G32B32_FLOAT = 6, - DXGI_FORMAT_R32G32B32_UINT = 7, - DXGI_FORMAT_R32G32B32_SINT = 8, - DXGI_FORMAT_R16G16B16A16_TYPELESS = 9, - DXGI_FORMAT_R16G16B16A16_FLOAT = 10, - DXGI_FORMAT_R16G16B16A16_UNORM = 11, - DXGI_FORMAT_R16G16B16A16_UINT = 12, - DXGI_FORMAT_R16G16B16A16_SNORM = 13, - DXGI_FORMAT_R16G16B16A16_SINT = 14, - DXGI_FORMAT_R32G32_TYPELESS = 15, - DXGI_FORMAT_R32G32_FLOAT = 16, - DXGI_FORMAT_R32G32_UINT = 17, - DXGI_FORMAT_R32G32_SINT = 18, - DXGI_FORMAT_R32G8X24_TYPELESS = 19, - DXGI_FORMAT_D32_FLOAT_S8X24_UINT = 20, - DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS= 21, - DXGI_FORMAT_X32_TYPELESS_G8X24_UINT = 22, - DXGI_FORMAT_R10G10B10A2_TYPELESS = 23, - DXGI_FORMAT_R10G10B10A2_UNORM = 24, - DXGI_FORMAT_R10G10B10A2_UINT = 25, - DXGI_FORMAT_R11G11B10_FLOAT = 26, - DXGI_FORMAT_R8G8B8A8_TYPELESS = 27, - DXGI_FORMAT_R8G8B8A8_UNORM = 28, - DXGI_FORMAT_R8G8B8A8_UNORM_SRGB = 29, - DXGI_FORMAT_R8G8B8A8_UINT = 30, - DXGI_FORMAT_R8G8B8A8_SNORM = 31, - DXGI_FORMAT_R8G8B8A8_SINT = 32, - DXGI_FORMAT_R16G16_TYPELESS = 33, - DXGI_FORMAT_R16G16_FLOAT = 34, - DXGI_FORMAT_R16G16_UNORM = 35, - DXGI_FORMAT_R16G16_UINT = 36, - DXGI_FORMAT_R16G16_SNORM = 37, - DXGI_FORMAT_R16G16_SINT = 38, - DXGI_FORMAT_R32_TYPELESS = 39, - DXGI_FORMAT_D32_FLOAT = 40, - DXGI_FORMAT_R32_FLOAT = 41, - DXGI_FORMAT_R32_UINT = 42, - DXGI_FORMAT_R32_SINT = 43, - DXGI_FORMAT_R24G8_TYPELESS = 44, - DXGI_FORMAT_D24_UNORM_S8_UINT = 45, - DXGI_FORMAT_R24_UNORM_X8_TYPELESS = 46, - DXGI_FORMAT_X24_TYPELESS_G8_UINT = 47, - DXGI_FORMAT_R8G8_TYPELESS = 48, - DXGI_FORMAT_R8G8_UNORM = 49, - DXGI_FORMAT_R8G8_UINT = 50, - DXGI_FORMAT_R8G8_SNORM = 51, - DXGI_FORMAT_R8G8_SINT = 52, - DXGI_FORMAT_R16_TYPELESS = 53, - DXGI_FORMAT_R16_FLOAT = 54, - DXGI_FORMAT_D16_UNORM = 55, - DXGI_FORMAT_R16_UNORM = 56, - DXGI_FORMAT_R16_UINT = 57, - DXGI_FORMAT_R16_SNORM = 58, - DXGI_FORMAT_R16_SINT = 59, - DXGI_FORMAT_R8_TYPELESS = 60, - DXGI_FORMAT_R8_UNORM = 61, - DXGI_FORMAT_R8_UINT = 62, - DXGI_FORMAT_R8_SNORM = 63, - DXGI_FORMAT_R8_SINT = 64, - DXGI_FORMAT_A8_UNORM = 65, - DXGI_FORMAT_R1_UNORM = 66, - DXGI_FORMAT_R9G9B9E5_SHAREDEXP = 67, - DXGI_FORMAT_R8G8_B8G8_UNORM = 68, - DXGI_FORMAT_G8R8_G8B8_UNORM = 69, - DXGI_FORMAT_BC1_TYPELESS = 70, - DXGI_FORMAT_BC1_UNORM = 71, - DXGI_FORMAT_BC1_UNORM_SRGB = 72, - DXGI_FORMAT_BC2_TYPELESS = 73, - DXGI_FORMAT_BC2_UNORM = 74, - DXGI_FORMAT_BC2_UNORM_SRGB = 75, - DXGI_FORMAT_BC3_TYPELESS = 76, - DXGI_FORMAT_BC3_UNORM = 77, - DXGI_FORMAT_BC3_UNORM_SRGB = 78, - DXGI_FORMAT_BC4_TYPELESS = 79, - DXGI_FORMAT_BC4_UNORM = 80, - DXGI_FORMAT_BC4_SNORM = 81, - DXGI_FORMAT_BC5_TYPELESS = 82, - DXGI_FORMAT_BC5_UNORM = 83, - DXGI_FORMAT_BC5_SNORM = 84, - DXGI_FORMAT_B5G6R5_UNORM = 85, - DXGI_FORMAT_B5G5R5A1_UNORM = 86, - DXGI_FORMAT_B8G8R8A8_UNORM = 87, - DXGI_FORMAT_B8G8R8X8_UNORM = 88, - DXGI_FORMAT_FORCE_UINT = 0xffffffff -} DXGI_FORMAT; - -#endif Removed: trunk/reactos/include/psdk/dxgitype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dxgitype.h?re… ============================================================================== --- trunk/reactos/include/psdk/dxgitype.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dxgitype.h (removed) @@ -1,84 +0,0 @@ -/* - * Copyright 2007 Andras Kovacs - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __dxgitype_h__ -#define __dxgitype_h__ - -#include "dxgiformat.h" - -typedef struct DXGI_SAMPLE_DESC { - UINT Count; - UINT Quality; -} DXGI_SAMPLE_DESC; - -typedef enum DXGI_MODE_ROTATION { - DXGI_MODE_ROTATION_UNSPECIFIED = 0, - DXGI_MODE_ROTATION_IDENTITY = 1, - DXGI_MODE_ROTATION_ROTATE90 = 2, - DXGI_MODE_ROTATION_ROTATE180 = 3, - DXGI_MODE_ROTATION_ROTATE270 = 4, -} DXGI_MODE_ROTATION; - -typedef enum DXGI_MODE_SCANLINE_ORDER { - DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED = 0, - DXGI_MODE_SCANLINE_ORDER_PROGRESSIVE = 1, - DXGI_MODE_SCANLINE_ORDER_UPPER_FIELD_FIRST = 2, - DXGI_MODE_SCANLINE_ORDER_LOWER_FIELD_FIRST = 3, -} DXGI_MODE_SCANLINE_ORDER; - -typedef enum DXGI_MODE_SCALING { - DXGI_MODE_SCALING_UNSPECIFIED = 0, - DXGI_MODE_SCALING_CENTERED = 1, - DXGI_MODE_SCALING_STRETCHED = 2, -} DXGI_MODE_SCALING; - -typedef struct DXGI_RATIONAL { - UINT Numerator; - UINT Denominator; -} DXGI_RATIONAL; - -typedef struct DXGI_MODE_DESC { - UINT Width; - UINT Height; - DXGI_RATIONAL RefreshRate; - DXGI_FORMAT Format; - DXGI_MODE_SCANLINE_ORDER ScanlineOrdering; - DXGI_MODE_SCALING Scaling; -} DXGI_MODE_DESC; - -typedef struct DXGI_GAMMA_CONTROL_CAPABILITIES { - BOOL ScaleAndOffsetSupported; - float MaxConvertedValue; - float MinConvertedValue; - UINT NumGammaControlPoints; - float ControlPointPositions[1025]; -} DXGI_GAMMA_CONTROL_CAPABILITIES; - -typedef struct DXGI_RGB { - float Red; - float Green; - float Blue; -} DXGI_RGB; - -typedef struct DXGI_GAMMA_CONTROL { - DXGI_RGB Scale; - DXGI_RGB Offset; - DXGI_RGB GammaCurve[1025]; -} DXGI_GAMMA_CONTROL; - -#endif Modified: trunk/reactos/include/reactos/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/CMake… ============================================================================== --- trunk/reactos/include/reactos/wine/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/CMakeLists.txt [iso-8859-1] Sun Nov 1 17:41:42 2015 @@ -1,2 +1,2 @@ -add_idl_headers(wineheaders itss.idl winedxgi.idl) +add_idl_headers(wineheaders itss.idl) Removed: trunk/reactos/include/reactos/wine/winedxgi.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined… ============================================================================== --- trunk/reactos/include/reactos/wine/winedxgi.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winedxgi.idl (removed) @@ -1,49 +0,0 @@ -/* - * Copyright 2008-2009 Henri Verbeet for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -import "dxgi.idl"; - -[ - object, - local, - uuid(3e1ff30b-c951-48c3-b010-0fb49f3dca71) -] -interface IWineDXGIDevice : IDXGIDevice -{ - HRESULT create_surface( - [in] const DXGI_SURFACE_DESC *desc, - [in] DXGI_USAGE usage, - [in] const DXGI_SHARED_RESOURCE *shared_resource, - [in] IUnknown *outer, - [out] void **surface - ); - HRESULT create_swapchain( - [in] struct wined3d_swapchain_desc *desc, - [out] struct wined3d_swapchain **wined3d_swapchain - ); -} - -[ - object, - local, - uuid(f2b918f3-603f-430a-9ccd-55872b6e85df) -] -interface IWineDXGIDeviceParent : IUnknown -{ - struct wined3d_device_parent *get_wined3d_device_parent(); -} Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Nov 1 17:41:42 2015 @@ -37,7 +37,6 @@ reactos/dll/directx/wine/dplayx # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.7.47 -reactos/dll/directx/wine/dxgi # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/qedit # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/quartz # Synced to WineStaging-1.7.47

8 years, 10 months

[hbelusca] 69778: [CLIPBRD]: Comment out the #pragma once in the precompiled header, because it makes build fail on some GCC setup for some people. I don't understand why this problem happens...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Nov 1 16:40:18 2015 New Revision: 69778 URL: http://svn.reactos.org/svn/reactos?rev=69778&view=rev Log: [CLIPBRD]: Comment out the #pragma once in the precompiled header, because it makes build fail on some GCC setup for some people. I don't understand why this problem happens... Modified: trunk/reactos/base/applications/clipbrd/precomp.h Modified: trunk/reactos/base/applications/clipbrd/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/precomp.h [iso-8859-1] Sun Nov 1 16:40:18 2015 @@ -1,7 +1,7 @@ #ifndef _CLIPBRD_PCH_ #define _CLIPBRD_PCH_ -#pragma once +// #pragma once #include <windef.h> #include <winbase.h>

8 years, 10 months

[hbelusca] 69777: [CLIP] - Add source file header. - Fix english resource.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Nov 1 16:31:51 2015 New Revision: 69777 URL: http://svn.reactos.org/svn/reactos?rev=69777&view=rev Log: [CLIP] - Add source file header. - Fix english resource. Modified: trunk/reactos/base/applications/cmdutils/clip/clip.c trunk/reactos/base/applications/cmdutils/clip/lang/en-US.rc Modified: trunk/reactos/base/applications/cmdutils/clip/clip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/clip/clip.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/clip/clip.c [iso-8859-1] Sun Nov 1 16:31:51 2015 @@ -1,3 +1,11 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Clip Command + * FILE: base/applications/cmdutils/clip/clip.c + * PURPOSE: Provides clipboard management for command-line programs. + * PROGRAMMERS: Ricardo Hanke + */ + #include <stdio.h> #include <windef.h> Modified: trunk/reactos/base/applications/cmdutils/clip/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/clip/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/clip/lang/en-US.rc [iso-8859-1] Sun Nov 1 16:31:51 2015 @@ -3,7 +3,7 @@ STRINGTABLE BEGIN IDS_USAGE "\nType ""CLIP /?"" for usage information.\n" - IDS_HELP "\nRedirects the output of command line programs to the clipboard.\n\n\ + IDS_HELP "\nRedirects the output of command-line programs to the clipboard.\n\n\ CLIP [/?]\n\n\ /? Show this help message.\n" END

8 years, 10 months

[hbelusca] 69776: [CLIPBRD] Add a clipboard viewer utility to ReactOS, courtesy Ricardo Hanke. Icon by Jared Smudde. CORE-10353

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Nov 1 16:25:19 2015 New Revision: 69776 URL: http://svn.reactos.org/svn/reactos?rev=69776&view=rev Log: [CLIPBRD] Add a clipboard viewer utility to ReactOS, courtesy Ricardo Hanke. Icon by Jared Smudde. CORE-10353 Added: trunk/reactos/base/applications/clipbrd/ (with props) trunk/reactos/base/applications/clipbrd/CMakeLists.txt (with props) trunk/reactos/base/applications/clipbrd/clipbrd.c (with props) trunk/reactos/base/applications/clipbrd/clipbrd.rc (with props) trunk/reactos/base/applications/clipbrd/cliputils.c (with props) trunk/reactos/base/applications/clipbrd/cliputils.h (with props) trunk/reactos/base/applications/clipbrd/lang/ (with props) trunk/reactos/base/applications/clipbrd/lang/de-DE.rc (with props) trunk/reactos/base/applications/clipbrd/lang/en-US.rc (with props) trunk/reactos/base/applications/clipbrd/lang/fr-FR.rc (with props) trunk/reactos/base/applications/clipbrd/precomp.h (with props) trunk/reactos/base/applications/clipbrd/res/ (with props) trunk/reactos/base/applications/clipbrd/res/clipbrd.ico (with props) trunk/reactos/base/applications/clipbrd/resources.h (with props) trunk/reactos/base/applications/clipbrd/winutils.c (with props) trunk/reactos/base/applications/clipbrd/winutils.h (with props) Modified: trunk/reactos/base/applications/CMakeLists.txt Modified: trunk/reactos/base/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/CMakeLis… ============================================================================== --- trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] Sun Nov 1 16:25:19 2015 @@ -3,6 +3,7 @@ add_subdirectory(cacls) add_subdirectory(calc) add_subdirectory(charmap) +add_subdirectory(clipbrd) add_subdirectory(cmdutils) add_subdirectory(control) add_subdirectory(dxdiag) Propchange: trunk/reactos/base/applications/clipbrd/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Nov 1 16:25:19 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/base/applications/clipbrd/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/base/applications/clipbrd/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/base/applications/clipbrd/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/applications/clipbrd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/CMakeLists.txt (added) +++ trunk/reactos/base/applications/clipbrd/CMakeLists.txt [iso-8859-1] Sun Nov 1 16:25:19 2015 @@ -0,0 +1,12 @@ + +list(APPEND SOURCE + clipbrd.c + cliputils.c + winutils.c + precomp.h) + +add_executable(clipbrd ${SOURCE} clipbrd.rc) +add_pch(clipbrd precomp.h SOURCE) +set_module_type(clipbrd win32gui UNICODE) +add_importlibs(clipbrd hhctrl user32 gdi32 comctl32 comdlg32 advapi32 shell32 msvcrt kernel32) +add_cd_file(TARGET clipbrd DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/base/applications/clipbrd/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/reactos/base/applications/clipbrd/clipbrd.c [iso-8859-1] Sun Nov 1 16:25:19 2015 @@ -0,0 +1,363 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Clipboard Viewer + * FILE: base/applications/clipbrd/clipbrd.c + * PURPOSE: Provides a view of the contents of the ReactOS clipboard. + * PROGRAMMERS: Ricardo Hanke + */ + +#include "precomp.h" + +static const WCHAR szClassName[] = L"ClipBookWClass"; + +CLIPBOARD_GLOBALS Globals; + +static void SetDisplayFormat(UINT uFormat) +{ + CheckMenuItem(Globals.hMenu, Globals.uCheckedItem, MF_BYCOMMAND | MF_UNCHECKED); + Globals.uCheckedItem = uFormat + CMD_AUTOMATIC; + CheckMenuItem(Globals.hMenu, Globals.uCheckedItem, MF_BYCOMMAND | MF_CHECKED); + + if (uFormat == 0) + { + Globals.uDisplayFormat = GetAutomaticClipboardFormat(); + } + else + { + Globals.uDisplayFormat = uFormat; + } + + InvalidateRect(Globals.hMainWnd, NULL, TRUE); + UpdateWindow(Globals.hMainWnd); +} + +static void InitMenuPopup(HMENU hMenu, LPARAM index) +{ + if (GetMenuItemID(hMenu, 0) == CMD_DELETE) + { + if (CountClipboardFormats() == 0) + { + EnableMenuItem(hMenu, CMD_DELETE, MF_GRAYED); + } + else + { + EnableMenuItem(hMenu, CMD_DELETE, MF_ENABLED); + } + } + + DrawMenuBar(Globals.hMainWnd); +} + +void UpdateDisplayMenu(void) +{ + UINT uFormat; + WCHAR szFormatName[MAX_STRING_LEN]; + HMENU hMenu; + + hMenu = GetSubMenu(Globals.hMenu, DISPLAY_MENU_POS); + + while (GetMenuItemCount(hMenu) > 1) + { + DeleteMenu(hMenu, 1, MF_BYPOSITION); + } + + if (CountClipboardFormats() == 0) + return; + + if (!OpenClipboard(NULL)) + return; + + AppendMenuW(hMenu, MF_SEPARATOR, 0, NULL); + + uFormat = EnumClipboardFormats(0); + while (uFormat) + { + RetrieveClipboardFormatName(Globals.hInstance, uFormat, szFormatName, ARRAYSIZE(szFormatName)); + + if (!IsClipboardFormatSupported(uFormat)) + { + AppendMenuW(hMenu, MF_STRING | MF_GRAYED, 0, szFormatName); + } + else + { + AppendMenuW(hMenu, MF_STRING, CMD_AUTOMATIC + uFormat, szFormatName); + } + + uFormat = EnumClipboardFormats(uFormat); + } + + CloseClipboard(); +} + +static int ClipboardCommandHandler(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (LOWORD(wParam)) + { + case CMD_EXIT: + { + PostMessageW(Globals.hMainWnd, WM_CLOSE, 0, 0); + break; + } + + case CMD_DELETE: + { + if (MessageBoxRes(Globals.hMainWnd, Globals.hInstance, STRING_DELETE_MSG, STRING_DELETE_TITLE, MB_ICONWARNING | MB_YESNO) == IDYES) + { + DeleteClipboardContent(); + } + break; + } + + case CMD_AUTOMATIC: + { + SetDisplayFormat(0); + break; + } + + case CMD_HELP: + { + HtmlHelpW(Globals.hMainWnd, L"clipbrd.chm", 0, 0); + break; + } + + case CMD_ABOUT: + { + WCHAR szTitle[MAX_STRING_LEN]; + LoadStringW(Globals.hInstance, STRING_CLIPBOARD, szTitle, ARRAYSIZE(szTitle)); + ShellAboutW(Globals.hMainWnd, szTitle, 0, NULL); + break; + } + + default: + { + break; + } + } + return 0; +} + +static void ClipboardPaintHandler(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + HDC hdc; + PAINTSTRUCT ps; + RECT rc; + + hdc = BeginPaint(hWnd, &ps); + GetClientRect(hWnd, &rc); + + switch (Globals.uDisplayFormat) + { + case CF_NONE: + { + break; + } + + case CF_UNICODETEXT: + { + DrawTextFromClipboard(hdc, &rc, DT_LEFT); + break; + } + + case CF_BITMAP: + { + BitBltFromClipboard(hdc, rc.left, rc.top, rc.right, rc.bottom, 0, 0, SRCCOPY); + break; + } + + case CF_DIB: + { + SetDIBitsToDeviceFromClipboard(CF_DIB, hdc, rc.left, rc.top, 0, 0, 0, DIB_RGB_COLORS); + break; + } + + case CF_DIBV5: + { + SetDIBitsToDeviceFromClipboard(CF_DIBV5, hdc, rc.left, rc.top, 0, 0, 0, DIB_RGB_COLORS); + break; + } + + case CF_ENHMETAFILE: + { + PlayEnhMetaFileFromClipboard(hdc, &rc); + break; + } + + case CF_METAFILEPICT: + { + PlayMetaFileFromClipboard(hdc, &rc); + break; + } + + default: + { + + DrawTextFromResource(Globals.hInstance, ERROR_UNSUPPORTED_FORMAT, hdc, &rc, DT_CENTER | DT_WORDBREAK); + break; + } + } + + EndPaint(hWnd, &ps); +} + +static LRESULT WINAPI MainWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch(uMsg) + { + case WM_PAINT: + { + ClipboardPaintHandler(hWnd, uMsg, wParam, lParam); + break; + } + + case WM_SIZE: + { + InvalidateRect(hWnd, NULL, TRUE); + UpdateWindow(hWnd); + break; + } + + case WM_CREATE: + { + Globals.hMenu = GetMenu(hWnd); + Globals.hWndNext = SetClipboardViewer(hWnd); + UpdateDisplayMenu(); + SetDisplayFormat(0); + break; + } + + case WM_CLOSE: + { + DestroyWindow(hWnd); + break; + } + + case WM_DESTROY: + { + ChangeClipboardChain(hWnd, Globals.hWndNext); + PostQuitMessage(0); + break; + } + + case WM_CHANGECBCHAIN: + { + if ((HWND)wParam == Globals.hWndNext) + { + Globals.hWndNext = (HWND)lParam; + } + else if (Globals.hWndNext != NULL) + { + SendMessageW(Globals.hWndNext, uMsg, wParam, lParam); + } + + break; + } + + case WM_DRAWCLIPBOARD: + { + UpdateDisplayMenu(); + SetDisplayFormat(0); + + SendMessageW(Globals.hWndNext, uMsg, wParam, lParam); + break; + } + + case WM_COMMAND: + { + if ((LOWORD(wParam) > CMD_AUTOMATIC)) + { + SetDisplayFormat(LOWORD(wParam) - CMD_AUTOMATIC); + } + else + { + ClipboardCommandHandler(hWnd, uMsg, wParam, lParam); + } + break; + } + + case WM_INITMENUPOPUP: + { + InitMenuPopup((HMENU)wParam, lParam); + break; + } + + default: + { + return DefWindowProc(hWnd, uMsg, wParam, lParam); + } + } + return 0; +} + +int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow) +{ + MSG msg; + HACCEL hAccel; + HWND hPrevWindow; + WNDCLASSEXW wndclass; + WCHAR szBuffer[MAX_STRING_LEN]; + + hPrevWindow = FindWindowW(szClassName, NULL); + if (hPrevWindow) + { + BringWindowToFront(hPrevWindow); + return 0; + } + + ZeroMemory(&Globals, sizeof(Globals)); + Globals.hInstance = hInstance; + + ZeroMemory(&wndclass, sizeof(wndclass)); + wndclass.cbSize = sizeof(wndclass); + wndclass.lpfnWndProc = MainWndProc; + wndclass.hInstance = hInstance; + wndclass.hIcon = LoadIconW(hInstance, MAKEINTRESOURCEW(CLIP_ICON)); + wndclass.hCursor = LoadCursorW(0, IDC_ARROW); + wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + wndclass.lpszMenuName = MAKEINTRESOURCEW(MAIN_MENU); + wndclass.lpszClassName = szClassName; + + if (!RegisterClassExW(&wndclass)) + { + ShowLastWin32Error(NULL); + return 0; + } + + LoadStringW(hInstance, STRING_CLIPBOARD, szBuffer, ARRAYSIZE(szBuffer)); + Globals.hMainWnd = CreateWindowExW(WS_EX_CLIENTEDGE, + szClassName, + szBuffer, + WS_OVERLAPPEDWINDOW | WS_HSCROLL | WS_VSCROLL, + CW_USEDEFAULT, + CW_USEDEFAULT, + CW_USEDEFAULT, + CW_USEDEFAULT, + NULL, + NULL, + Globals.hInstance, + NULL); + if (!Globals.hMainWnd) + { + ShowLastWin32Error(NULL); + return 0; + } + + ShowWindow(Globals.hMainWnd, nCmdShow); + UpdateWindow(Globals.hMainWnd); + + hAccel = LoadAcceleratorsW(Globals.hInstance, MAKEINTRESOURCEW(ID_ACCEL)); + if (!hAccel) + { + ShowLastWin32Error(Globals.hMainWnd); + } + + while (GetMessageW(&msg, 0, 0, 0)) + { + if (!TranslateAcceleratorW(Globals.hMainWnd, hAccel, &msg)) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + } + + return (int)msg.wParam; +} Propchange: trunk/reactos/base/applications/clipbrd/clipbrd.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/clipbrd/clipbrd.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/clipbrd.rc (added) +++ trunk/reactos/base/applications/clipbrd/clipbrd.rc [iso-8859-1] Sun Nov 1 16:25:19 2015 @@ -0,0 +1,26 @@ +#include <windef.h> +#include <winuser.h> + +#include "resources.h" + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Clipboard Viewer" +#define REACTOS_STR_INTERNAL_NAME "clipbrd" +#define REACTOS_STR_ORIGINAL_FILENAME "clipbrd.exe" +#include <reactos/version.rc> + +CLIP_ICON ICON "res/clipbrd.ico" + +#include <reactos/manifest_exe.rc> + +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif Propchange: trunk/reactos/base/applications/clipbrd/clipbrd.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/reactos/base/applications/clipbrd/cliputils.c [iso-8859-1] Sun Nov 1 16:25:19 2015 @@ -0,0 +1,143 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Clipboard Viewer + * FILE: base/applications/clipbrd/cliputils.c + * PURPOSE: Clipboard helper functions. + * PROGRAMMERS: Ricardo Hanke + */ + +#include "precomp.h" + +int GetPredefinedClipboardFormatName(HINSTANCE hInstance, UINT uFormat, LPWSTR lpszFormat, UINT cch) +{ + switch (uFormat) + { + case CF_TEXT: + { + return LoadStringW(hInstance, STRING_CF_TEXT, lpszFormat, cch); + } + + case CF_BITMAP: + { + return LoadStringW(hInstance, STRING_CF_BITMAP, lpszFormat, cch); + } + + case CF_OEMTEXT: + { + return LoadStringW(hInstance, STRING_CF_OEMTEXT, lpszFormat, cch); + } + + case CF_UNICODETEXT: + { + return LoadStringW(hInstance, STRING_CF_UNICODETEXT, lpszFormat, cch); + } + + case CF_DIB: + { + return LoadStringW(hInstance, STRING_CF_DIB, lpszFormat, cch); + } + + case CF_LOCALE: + { + return LoadStringW(hInstance, STRING_CF_LOCALE, lpszFormat, cch); + } + + case CF_ENHMETAFILE: + { + return LoadStringW(hInstance, STRING_CF_ENHMETAFILE, lpszFormat, cch); + } + + case CF_METAFILEPICT: + { + return LoadStringW(hInstance, STRING_CF_METAFILEPICT, lpszFormat, cch); + } + + case CF_PALETTE: + { + return LoadStringW(hInstance, STRING_CF_PALETTE, lpszFormat, cch); + } + + case CF_DIBV5: + { + return LoadStringW(hInstance, STRING_CF_DIBV5, lpszFormat, cch); + } + + case CF_SYLK: + { + return LoadStringW(hInstance, STRING_CF_SYLK, lpszFormat, cch); + } + + case CF_DIF: + { + return LoadStringW(hInstance, STRING_CF_DIF, lpszFormat, cch); + } + + case CF_HDROP: + { + return LoadStringW(hInstance, STRING_CF_HDROP, lpszFormat, cch); + } + + default: + { + return 0; + } + } +} + +void RetrieveClipboardFormatName(HINSTANCE hInstance, UINT uFormat, LPWSTR lpszFormat, UINT cch) +{ + if (!GetPredefinedClipboardFormatName(hInstance, uFormat, lpszFormat, cch)) + { + if (!GetClipboardFormatName(uFormat, lpszFormat, cch)) + { + LoadStringW(hInstance, STRING_CF_UNKNOWN, lpszFormat, cch); + } + } +} + +void DeleteClipboardContent(void) +{ + if (!OpenClipboard(NULL)) + { + ShowLastWin32Error(Globals.hMainWnd); + return; + } + + if (!EmptyClipboard()) + { + ShowLastWin32Error(Globals.hMainWnd); + } + + if (!CloseClipboard()) + { + ShowLastWin32Error(Globals.hMainWnd); + } +} + +UINT GetAutomaticClipboardFormat(void) +{ + UINT uFormatList[] = {CF_UNICODETEXT, CF_ENHMETAFILE, CF_METAFILEPICT, CF_DIBV5, CF_DIB, CF_BITMAP}; + + return GetPriorityClipboardFormat(uFormatList, 6); +} + +BOOL IsClipboardFormatSupported(UINT uFormat) +{ + switch (uFormat) + { + case CF_UNICODETEXT: + case CF_BITMAP: + case CF_ENHMETAFILE: + case CF_METAFILEPICT: + case CF_DIB: + case CF_DIBV5: + { + return TRUE; + } + + default: + { + return FALSE; + } + } +} Propchange: trunk/reactos/base/applications/clipbrd/cliputils.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/clipbrd/cliputils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/cliputils.h (added) +++ trunk/reactos/base/applications/clipbrd/cliputils.h [iso-8859-1] Sun Nov 1 16:25:19 2015 @@ -0,0 +1,13 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Clipboard Viewer + * FILE: base/applications/clipbrd/cliputils.h + * PURPOSE: Clipboard helper functions. + * PROGRAMMERS: Ricardo Hanke + */ + +int GetPredefinedClipboardFormatName(HINSTANCE hInstance, UINT uFormat, LPWSTR lpszFormat, UINT cch); +void RetrieveClipboardFormatName(HINSTANCE hInstance, UINT uFormat, LPWSTR lpszFormat, UINT cch); +void DeleteClipboardContent(void); +UINT GetAutomaticClipboardFormat(void); +BOOL IsClipboardFormatSupported(UINT uFormat); Propchange: trunk/reactos/base/applications/clipbrd/cliputils.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/applications/clipbrd/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Nov 1 16:25:19 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/base/applications/clipbrd/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/base/applications/clipbrd/lang/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/base/applications/clipbrd/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: 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 (added) +++ trunk/reactos/base/applications/clipbrd/lang/de-DE.rc [iso-8859-1] Sun Nov 1 16:25:19 2015 @@ -0,0 +1,61 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +ID_ACCEL ACCELERATORS +BEGIN + VK_DELETE, CMD_DELETE, VIRTKEY +END + +MAIN_MENU MENU +BEGIN + POPUP "&Datei" + BEGIN + MENUITEM "Ã&ffnen...", CMD_OPEN, GRAYED + MENUITEM "Speichern &unter...", CMD_SAVE_AS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Beenden", CMD_EXIT + END + POPUP "&Bearbeiten" + BEGIN + MENUITEM "&LÃ¶schen\tEntf", CMD_DELETE + END + POPUP "&Anzeige" + BEGIN + MENUITEM "&Automatisch", CMD_AUTOMATIC + END + POPUP "&Hilfe" + BEGIN + MENUITEM "&Hilfethemen", CMD_HELP + MENUITEM SEPARATOR + MENUITEM "Inf&o", CMD_ABOUT + END +END + +STRINGTABLE +BEGIN + STRING_CLIPBOARD "Zwischenablage" + STRING_DELETE_MSG "Soll der Inhalt der Zwischenablage gelÃ¶scht werden?" + STRING_DELETE_TITLE "Zwischenablage lÃ¶schen" +END + +STRINGTABLE +BEGIN + STRING_CF_UNKNOWN "Unbekanntes Format" + STRING_CF_TEXT "Text" + STRING_CF_BITMAP "Bitmap" + STRING_CF_OEMTEXT "OEM-Text" + STRING_CF_UNICODETEXT "Unicodetext" + STRING_CF_DIB "DIB-Bitmap" + STRING_CF_LOCALE "Gebietsschema" + STRING_CF_ENHMETAFILE "Erweiterte Metadatei" + STRING_CF_METAFILEPICT "Metadatei" + STRING_CF_PALETTE "Farbpalette" + STRING_CF_DIBV5 "DIB-Bitmap (Version 5)" + STRING_CF_SYLK "Symbolic Link Format" + STRING_CF_DIF "Data Interchange Format" + STRING_CF_HDROP "Drop-Daten" +END + +STRINGTABLE +BEGIN + ERROR_UNSUPPORTED_FORMAT "Die Daten in der Zwischenablage liegen in einem Format vor, welches nicht angezeigt werden kann." +END Propchange: trunk/reactos/base/applications/clipbrd/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/reactos/base/applications/clipbrd/lang/en-US.rc [iso-8859-1] Sun Nov 1 16:25:19 2015 @@ -0,0 +1,61 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +ID_ACCEL ACCELERATORS +BEGIN + VK_DELETE, CMD_DELETE, VIRTKEY +END + +MAIN_MENU MENU +BEGIN + POPUP "&File" + BEGIN + MENUITEM "&Open...", CMD_OPEN, GRAYED + MENUITEM "Save &as...", CMD_SAVE_AS, GRAYED + MENUITEM SEPARATOR + MENUITEM "E&xit", CMD_EXIT + END + POPUP "&Edit" + BEGIN + MENUITEM "&Delete\tDel", CMD_DELETE + END + POPUP "&Display" + BEGIN + MENUITEM "&Automatic", CMD_AUTOMATIC + END + POPUP "&Help" + BEGIN + MENUITEM "&Help Topics", CMD_HELP + MENUITEM SEPARATOR + MENUITEM "&About", CMD_ABOUT + END +END + +STRINGTABLE +BEGIN + STRING_CLIPBOARD "Clipboard" + STRING_DELETE_MSG "Clear contents of the Clipboard?" + STRING_DELETE_TITLE "Clear Clipboard" +END + +STRINGTABLE +BEGIN + STRING_CF_UNKNOWN "Unknown Format" + STRING_CF_TEXT "Text" + STRING_CF_BITMAP "Bitmap" + STRING_CF_OEMTEXT "OEM Text" + STRING_CF_UNICODETEXT "Unicode Text" + STRING_CF_DIB "DIB Bitmap" + STRING_CF_LOCALE "Locale Data" + STRING_CF_ENHMETAFILE "Enhanced Metafile" + STRING_CF_METAFILEPICT "Metafile" + STRING_CF_PALETTE "Color Palette" + STRING_CF_DIBV5 "DIB Bitmap (Version 5)" + STRING_CF_SYLK "Symbolic Link Format" + STRING_CF_DIF "Data Interchange Format" + STRING_CF_HDROP "Drop Data" +END + +STRINGTABLE +BEGIN + ERROR_UNSUPPORTED_FORMAT "The clipboard contains data in a format, that cannot be displayed." +END Propchange: trunk/reactos/base/applications/clipbrd/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/reactos/base/applications/clipbrd/lang/fr-FR.rc [iso-8859-1] Sun Nov 1 16:25:19 2015 @@ -0,0 +1,61 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +ID_ACCEL ACCELERATORS +BEGIN + VK_DELETE, CMD_DELETE, VIRTKEY +END + +MAIN_MENU MENU +BEGIN + POPUP "&Fichier" + BEGIN + MENUITEM "&Ouvrir...", CMD_OPEN, GRAYED + MENUITEM "&Enregistrer sous...", CMD_SAVE_AS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Quitter", CMD_EXIT + END + POPUP "&Edition" + BEGIN + MENUITEM "&Supprimer\tSuppr", CMD_DELETE + END + POPUP "&Affichage" + BEGIN + MENUITEM "&Automatique", CMD_AUTOMATIC + END + POPUP "&Aide" + BEGIN + MENUITEM "&Rubriques d'aide", CMD_HELP + MENUITEM SEPARATOR + MENUITEM "&Ã propos...", CMD_ABOUT + END +END + +STRINGTABLE +BEGIN + STRING_CLIPBOARD "Presse-papiers" + STRING_DELETE_MSG "Voulez-vous effacer le contenu du Presse-papiers ?" + STRING_DELETE_TITLE "Effacer le Presse-papiers" +END + +STRINGTABLE +BEGIN + STRING_CF_UNKNOWN "Format inconnu" + STRING_CF_TEXT "Texte" + STRING_CF_BITMAP "Bitmap" + STRING_CF_OEMTEXT "Texte OEM" + STRING_CF_UNICODETEXT "Texte Unicode" + STRING_CF_DIB "DIB Bitmap" + STRING_CF_LOCALE "Locale Data" + STRING_CF_ENHMETAFILE "Enhanced Metafile" + STRING_CF_METAFILEPICT "Metafile" + STRING_CF_PALETTE "Color Palette" + STRING_CF_DIBV5 "DIB Bitmap (Version 5)" + STRING_CF_SYLK "Symbolic Link Format" + STRING_CF_DIF "Data Interchange Format" + STRING_CF_HDROP "Drop Data" +END + +STRINGTABLE +BEGIN + ERROR_UNSUPPORTED_FORMAT "Le Presse-Papiers contient des donnÃ©es dans un format qui ne peut Ãªtre affichÃ©." +END Propchange: trunk/reactos/base/applications/clipbrd/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/clipbrd/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/precomp.h (added) +++ trunk/reactos/base/applications/clipbrd/precomp.h [iso-8859-1] Sun Nov 1 16:25:19 2015 @@ -0,0 +1,33 @@ +#ifndef _CLIPBRD_PCH_ +#define _CLIPBRD_PCH_ + +#pragma once + +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <wingdi.h> +#include <shellapi.h> +#include <htmlhelp.h> + +#include "resources.h" +#include "cliputils.h" +#include "winutils.h" + +#define MAX_STRING_LEN 255 +#define DISPLAY_MENU_POS 2 +#define CF_NONE 0 + +typedef struct _CLIPBOARD_GLOBALS +{ + HINSTANCE hInstance; + HWND hMainWnd; + HWND hWndNext; + HMENU hMenu; + UINT uDisplayFormat; + UINT uCheckedItem; +} CLIPBOARD_GLOBALS; + +extern CLIPBOARD_GLOBALS Globals; + +#endif /* _CLIPBRD_PCH_ */ Propchange: trunk/reactos/base/applications/clipbrd/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/applications/clipbrd/res/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Nov 1 16:25:19 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/base/applications/clipbrd/res/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/base/applications/clipbrd/res/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/base/applications/clipbrd/res/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/applications/clipbrd/res/clipbrd.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/clipbrd/res/clipbrd.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: 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 (added) +++ trunk/reactos/base/applications/clipbrd/resources.h [iso-8859-1] Sun Nov 1 16:25:19 2015 @@ -0,0 +1,35 @@ +#pragma once + +#define MAIN_MENU 100 +#define CLIP_ICON 101 +#define ID_ACCEL 102 + +#define CMD_OPEN 100 +#define CMD_SAVE_AS 101 +#define CMD_EXIT 102 +#define CMD_DELETE 103 +#define CMD_HELP 105 +#define CMD_ABOUT 106 + +#define CMD_AUTOMATIC 1000 + +#define STRING_CLIPBOARD 100 +#define STRING_DELETE_MSG 101 +#define STRING_DELETE_TITLE 102 + +#define STRING_CF_UNKNOWN 200 +#define STRING_CF_TEXT 201 +#define STRING_CF_BITMAP 202 +#define STRING_CF_OEMTEXT 203 +#define STRING_CF_UNICODETEXT 204 +#define STRING_CF_DIB 205 +#define STRING_CF_LOCALE 206 +#define STRING_CF_ENHMETAFILE 207 +#define STRING_CF_METAFILEPICT 208 +#define STRING_CF_PALETTE 209 +#define STRING_CF_DIBV5 210 +#define STRING_CF_SYLK 211 +#define STRING_CF_DIF 212 +#define STRING_CF_HDROP 213 + +#define ERROR_UNSUPPORTED_FORMAT 300 Propchange: trunk/reactos/base/applications/clipbrd/resources.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/clipbrd/winutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/winutils.c (added) +++ trunk/reactos/base/applications/clipbrd/winutils.c [iso-8859-1] Sun Nov 1 16:25:19 2015 @@ -0,0 +1,180 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Clipboard Viewer + * FILE: base/applications/clipbrd/winutils.c + * PURPOSE: Miscellaneous helper functions. + * PROGRAMMERS: Ricardo Hanke + */ + +#include "precomp.h" + +void ShowLastWin32Error(HWND hwndParent) +{ + DWORD dwError; + LPWSTR lpMsgBuf = NULL; + + dwError = GetLastError(); + if (dwError == NO_ERROR) + return; + + FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, dwError, 0, (LPWSTR)&lpMsgBuf, 0, NULL); + MessageBoxW(hwndParent, lpMsgBuf, NULL, MB_OK | MB_ICONERROR); + LocalFree(lpMsgBuf); +} + +void BringWindowToFront(HWND hWnd) +{ + if (IsIconic(hWnd)) + { + ShowWindow(hWnd, SW_RESTORE); + SetForegroundWindow(hWnd); + } + else + { + SetForegroundWindow(hWnd); + } +} + +int DrawTextFromResource(HINSTANCE hInstance, UINT uID, HDC hDC, LPRECT lpRect, UINT uFormat) +{ + LPWSTR lpBuffer; + int nCount; + + nCount = LoadStringW(hInstance, uID, (LPWSTR)&lpBuffer, 0); + if (nCount) + { + return DrawTextW(hDC, lpBuffer, nCount, lpRect, uFormat); + } + else + { + return 0; + } +} + +int MessageBoxRes(HWND hWnd, HINSTANCE hInstance, UINT uText, UINT uCaption, UINT uType) +{ + MSGBOXPARAMSW mb; + + ZeroMemory(&mb, sizeof(mb)); + mb.cbSize = sizeof(mb); + mb.hwndOwner = hWnd; + mb.hInstance = hInstance; + mb.lpszText = MAKEINTRESOURCEW(uText); + mb.lpszCaption = MAKEINTRESOURCEW(uCaption); + mb.dwStyle = uType; + mb.dwLanguageId = MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT); + + return MessageBoxIndirectW(&mb); +} + +void DrawTextFromClipboard(HDC hDC, LPRECT lpRect, UINT uFormat) +{ + HGLOBAL hGlobal; + LPWSTR lpchText; + + if (!OpenClipboard(NULL)) + return; + + hGlobal = GetClipboardData(CF_UNICODETEXT); + if (!hGlobal) + return; + + lpchText = GlobalLock(hGlobal); + if (!lpchText) + return; + + DrawTextW(hDC, lpchText, -1, lpRect, uFormat); + GlobalUnlock(hGlobal); + CloseClipboard(); +} + +void BitBltFromClipboard(HDC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, int nXSrc, int nYSrc, DWORD dwRop) +{ + HDC hdcMem; + HBITMAP hbm; + + if (!OpenClipboard(NULL)) + return; + + hdcMem = CreateCompatibleDC(hdcDest); + if (hdcMem) + { + hbm = (HBITMAP)GetClipboardData(CF_BITMAP); + SelectObject(hdcMem, hbm); + BitBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hdcMem, nXSrc, nYSrc, dwRop); + DeleteDC(hdcMem); + } + CloseClipboard(); +} + +void SetDIBitsToDeviceFromClipboard(UINT uFormat, HDC hdc, int XDest, int YDest, int XSrc, int YSrc, UINT uStartScan, UINT fuColorUse) +{ + LPBITMAPINFOHEADER lpInfoHeader; + LPBYTE lpBits; + HGLOBAL hGlobal; + INT iPalSize; + + if (!OpenClipboard(NULL)) + return; + + hGlobal = GetClipboardData(CF_DIBV5); + if (!hGlobal) + return; + + lpInfoHeader = GlobalLock(hGlobal); + if (!lpInfoHeader) + return; + + if (lpInfoHeader->biBitCount < 16) + { + iPalSize = (1 << lpInfoHeader->biBitCount) * 4; + } + else + { + iPalSize = 0; + } + + lpBits = (LPBYTE)lpInfoHeader + lpInfoHeader->biSize + iPalSize; + + SetDIBitsToDevice(hdc, XDest, YDest, lpInfoHeader->biWidth, lpInfoHeader->biHeight, XSrc, YSrc, uStartScan, lpInfoHeader->biHeight, lpBits, (LPBITMAPINFO)lpInfoHeader, fuColorUse); + + GlobalUnlock(hGlobal); + CloseClipboard(); +} + +void PlayMetaFileFromClipboard(HDC hdc, const RECT *lpRect) +{ + LPMETAFILEPICT mp; + HGLOBAL hGlobal; + + if (!OpenClipboard(NULL)) + return; + + hGlobal = GetClipboardData(CF_METAFILEPICT); + if (!hGlobal) + return; + + mp = (LPMETAFILEPICT)GlobalLock(hGlobal); + if (!mp) + return; + + SetMapMode(hdc, mp->mm); + SetViewportExtEx(hdc, lpRect->right, lpRect->bottom, NULL); + SetViewportOrgEx(hdc, lpRect->left, lpRect->top, NULL); + PlayMetaFile(hdc, mp->hMF); + GlobalUnlock(hGlobal); + CloseClipboard(); +} + +void PlayEnhMetaFileFromClipboard(HDC hdc, const RECT *lpRect) +{ + HENHMETAFILE hEmf; + + if (!OpenClipboard(NULL)) + return; + + hEmf = GetClipboardData(CF_ENHMETAFILE); + PlayEnhMetaFile(hdc, hEmf, lpRect); + CloseClipboard(); +} Propchange: trunk/reactos/base/applications/clipbrd/winutils.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/clipbrd/winutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/winutils.h (added) +++ trunk/reactos/base/applications/clipbrd/winutils.h [iso-8859-1] Sun Nov 1 16:25:19 2015 @@ -0,0 +1,17 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Clipboard Viewer + * FILE: base/applications/clipbrd/winutils.c + * PURPOSE: Miscellaneous helper functions. + * PROGRAMMERS: Ricardo Hanke + */ + +void ShowLastWin32Error(HWND hwndParent); +void BringWindowToFront(HWND hWnd); +int DrawTextFromResource(HINSTANCE hInstance, UINT uID, HDC hDC, LPRECT lpRect, UINT uFormat); +int MessageBoxRes(HWND hWnd, HINSTANCE hInstance, UINT uText, UINT uCaption, UINT uType); +void DrawTextFromClipboard(HDC hDC, LPRECT lpRect, UINT uFormat); +void BitBltFromClipboard(HDC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, int nXSrc, int nYSrc, DWORD dwRop); +void SetDIBitsToDeviceFromClipboard(UINT uFormat, HDC hdc, int XDest, int YDest, int XSrc, int YSrc, UINT uStartScan, UINT fuColorUse); +void PlayMetaFileFromClipboard(HDC hdc, const RECT *lpRect); +void PlayEnhMetaFileFromClipboard(HDC hdc, const RECT *lpRect); Propchange: trunk/reactos/base/applications/clipbrd/winutils.h ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 10 months

[hbelusca] 69775: [CLIP] Adds a simple CLIP utility, as found on Windows, to ReactOS. Like the Windows version, it can just redirect the output of another console program or a file to the clipboard...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Nov 1 14:47:12 2015 New Revision: 69775 URL: http://svn.reactos.org/svn/reactos?rev=69775&view=rev Log: [CLIP] Adds a simple CLIP utility, as found on Windows, to ReactOS. Like the Windows version, it can just redirect the output of another console program or a file to the clipboard. By Ricardo Hanke, with minor corrections by me. CORE-10411 Added: trunk/reactos/base/applications/cmdutils/clip/ (with props) trunk/reactos/base/applications/cmdutils/clip/CMakeLists.txt (with props) trunk/reactos/base/applications/cmdutils/clip/clip.c (with props) trunk/reactos/base/applications/cmdutils/clip/clip.rc (with props) trunk/reactos/base/applications/cmdutils/clip/lang/ (with props) trunk/reactos/base/applications/cmdutils/clip/lang/de-DE.rc (with props) trunk/reactos/base/applications/cmdutils/clip/lang/en-US.rc (with props) trunk/reactos/base/applications/cmdutils/clip/lang/fr-FR.rc (with props) trunk/reactos/base/applications/cmdutils/clip/resource.h (with props) Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] Sun Nov 1 14:47:12 2015 @@ -1,3 +1,4 @@ +add_subdirectory(clip) add_subdirectory(comp) add_subdirectory(cscript) add_subdirectory(dbgprint) Propchange: trunk/reactos/base/applications/cmdutils/clip/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Nov 1 14:47:12 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/base/applications/cmdutils/clip/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/base/applications/cmdutils/clip/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/base/applications/cmdutils/clip/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/applications/cmdutils/clip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/clip/CMakeLists.txt (added) +++ trunk/reactos/base/applications/cmdutils/clip/CMakeLists.txt [iso-8859-1] Sun Nov 1 14:47:12 2015 @@ -0,0 +1,5 @@ + +add_executable(clip clip.c clip.rc) +set_module_type(clip win32cui UNICODE) +add_importlibs(clip user32 msvcrt kernel32 advapi32) +add_cd_file(TARGET clip DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/base/applications/cmdutils/clip/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/clip/clip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/clip/clip.c (added) +++ trunk/reactos/base/applications/cmdutils/clip/clip.c [iso-8859-1] Sun Nov 1 14:47:12 2015 @@ -0,0 +1,137 @@ +#include <stdio.h> + +#include <windef.h> +#include <winbase.h> +#include <winuser.h> + +#include "resource.h" + +static void PrintError(void) +{ + DWORD dwError; + LPWSTR lpMsgBuf = NULL; + + dwError = GetLastError(); + if (dwError == NO_ERROR) + return; + + FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, dwError, 0, (LPWSTR)&lpMsgBuf, 0, NULL); + wprintf(L"%s", lpMsgBuf); + LocalFree(lpMsgBuf); +} + +static void PrintResourceString(UINT uID) +{ + WCHAR buff[500]; + + if (LoadStringW(GetModuleHandle(NULL), uID, buff, ARRAYSIZE(buff))) + { + wprintf(L"%s", buff); + } +} + +static BOOL IsDataUnicode(HGLOBAL hGlobal) +{ + BOOL bReturn; + LPVOID lpBuffer; + + lpBuffer = GlobalLock(hGlobal); + bReturn = IsTextUnicode(lpBuffer, GlobalSize(hGlobal), NULL); + GlobalUnlock(hGlobal); + + return bReturn; +} + +int wmain(int argc, wchar_t** argv) +{ + HANDLE hInput; + DWORD dwBytesRead; + BOOL bStatus; + HGLOBAL hBuffer; + HGLOBAL hTemp; + LPBYTE lpBuffer; + SIZE_T dwSize = 0; + + hInput = GetStdHandle(STD_INPUT_HANDLE); + + /* Check for usage */ + if (argc > 1 && wcsncmp(argv[1], L"/?", 2) == 0) + { + PrintResourceString(IDS_HELP); + return 0; + } + + if (GetFileType(hInput) == FILE_TYPE_CHAR) + { + PrintResourceString(IDS_USAGE); + return 0; + } + + /* Initialize a growable buffer for holding clipboard data */ + hBuffer = GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, 4096); + if (!hBuffer) + { + PrintError(); + return -1; + } + + /* + * Read data from the input stream by chunks of 4096 bytes + * and resize the buffer each time when needed. + */ + do + { + lpBuffer = GlobalLock(hBuffer); + if (!lpBuffer) + goto cleanup; + + bStatus = ReadFile(hInput, lpBuffer + dwSize, 4096, &dwBytesRead, NULL); + dwSize += dwBytesRead; + GlobalUnlock(hBuffer); + + hTemp = GlobalReAlloc(hBuffer, GlobalSize(hBuffer) + 4096, GMEM_ZEROINIT); + if (!hTemp) + goto cleanup; + + hBuffer = hTemp; + } + while (dwBytesRead > 0 && bStatus); + + /* + * Resize the buffer to the total size of data read. + * Note that, if the call fails, we still have the old buffer valid. + * The old buffer would be larger than the actual size of data it contains, + * but this is not a problem for us. + */ + hTemp = GlobalReAlloc(hBuffer, dwSize + sizeof(WCHAR), GMEM_ZEROINIT); + if (hTemp) + hBuffer = hTemp; + + /* Attempt to open the clipboard */ + if (!OpenClipboard(NULL)) + goto cleanup; + + /* Empty it, copy our data, then close it */ + + EmptyClipboard(); + + if (IsDataUnicode(hBuffer)) + { + SetClipboardData(CF_UNICODETEXT, hBuffer); + } + else + { + // TODO: Convert text from current console page to standard ANSI. + // Alternatively one can use CF_OEMTEXT as done here. + SetClipboardData(CF_OEMTEXT, hBuffer); + } + + CloseClipboard(); + return 0; + +cleanup: + GlobalFree(hBuffer); + PrintError(); + return -1; +} Propchange: trunk/reactos/base/applications/cmdutils/clip/clip.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/clip/clip.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/clip/clip.rc (added) +++ trunk/reactos/base/applications/cmdutils/clip/clip.rc [iso-8859-1] Sun Nov 1 14:47:12 2015 @@ -0,0 +1,21 @@ +#include <windef.h> + +#include "resource.h" + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Clip Command" +#define REACTOS_STR_INTERNAL_NAME "clip" +#define REACTOS_STR_ORIGINAL_FILENAME "clip.exe" +#include <reactos/version.rc> + +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif Propchange: trunk/reactos/base/applications/cmdutils/clip/clip.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/applications/cmdutils/clip/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Nov 1 14:47:12 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/base/applications/cmdutils/clip/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/base/applications/cmdutils/clip/lang/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/base/applications/cmdutils/clip/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/applications/cmdutils/clip/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/clip/lang/de-DE.rc (added) +++ trunk/reactos/base/applications/cmdutils/clip/lang/de-DE.rc [iso-8859-1] Sun Nov 1 14:47:12 2015 @@ -0,0 +1,9 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "\nGeben Sie ""CLIP /?"" ein, um die Syntax anzuzeigen.\n" + IDS_HELP "\nLeitet die Ausgabe von Befehlszeilenprogrammen in die Zwischenablage um.\n\n\ +CLIP [/?]\n\n\ + /? Zeigt diese Hilfe an.\n" +END Propchange: trunk/reactos/base/applications/cmdutils/clip/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/clip/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/clip/lang/en-US.rc (added) +++ trunk/reactos/base/applications/cmdutils/clip/lang/en-US.rc [iso-8859-1] Sun Nov 1 14:47:12 2015 @@ -0,0 +1,9 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_USAGE "\nType ""CLIP /?"" for usage information.\n" + IDS_HELP "\nRedirects the output of command line programs to the clipboard.\n\n\ +CLIP [/?]\n\n\ + /? Show this help message.\n" +END Propchange: trunk/reactos/base/applications/cmdutils/clip/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/clip/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/clip/lang/fr-FR.rc (added) +++ trunk/reactos/base/applications/cmdutils/clip/lang/fr-FR.rc [iso-8859-1] Sun Nov 1 14:47:12 2015 @@ -0,0 +1,9 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "\nEntrez ""CLIP /?"" pour afficher la syntaxe.\n" + IDS_HELP "\nRedirige la sortie des programmes en ligne de commande vers le Presse-Papiers.\n\n\ +CLIP [/?]\n\n\ + /? Affiche ce message d'aide.\n" +END Propchange: trunk/reactos/base/applications/cmdutils/clip/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/clip/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/clip/resource.h (added) +++ trunk/reactos/base/applications/cmdutils/clip/resource.h [iso-8859-1] Sun Nov 1 14:47:12 2015 @@ -0,0 +1,4 @@ +#pragma once + +#define IDS_USAGE 100 +#define IDS_HELP 101 Propchange: trunk/reactos/base/applications/cmdutils/clip/resource.h ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 10 months

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