Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[greatlrd] 29750: forget remove a smaller hack i the drv functions list that being pass to dxg.sys
by greatlrd＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: greatlrd Date: Sun Oct 21 22:47:16 2007 New Revision: 29750 URL: http://svn.reactos.org/svn/reactos?rev=29750&view=rev Log: forget remove a smaller hack i the drv functions list that being pass to dxg.sys Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Sun Oct 21 22:47:16 2007 @@ -18,81 +18,47 @@ { {0, (PFN) NULL}, {DXENG_INDEX_DxEngNUIsTermSrv, (PFN)DxEngNUIsTermSrv}, -// {DXENG_INDEX_DxEngScreenAccessCheck, (PFN)DxEngScreenAccessCheck}, - {0, (PFN) NULL}, // hack for now + {DXENG_INDEX_DxEngScreenAccessCheck, (PFN)DxEngScreenAccessCheck}, {DXENG_INDEX_DxEngRedrawDesktop, (PFN)DxEngRedrawDesktop}, {DXENG_INDEX_DxEngDispUniq, (PFN)DxEngDispUniq}, -// {DXENG_INDEX_DxEngIncDispUniq, (PFN)DxEngIncDispUniq}, - {0, (PFN) NULL}, // hack for now + {DXENG_INDEX_DxEngIncDispUniq, (PFN)DxEngIncDispUniq}, {DXENG_INDEX_DxEngVisRgnUniq, (PFN)DxEngVisRgnUniq}, -// {DXENG_INDEX_DxEngLockShareSem, (PFN)DxEngLockShareSem}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngUnlockShareSem, (PFN)DxEngUnlockShareSem}, - {0, (PFN) NULL}, // hack for now + {DXENG_INDEX_DxEngLockShareSem, (PFN)DxEngLockShareSem}, + {DXENG_INDEX_DxEngUnlockShareSem, (PFN)DxEngUnlockShareSem}, {DXENG_INDEX_DxEngEnumerateHdev, (PFN)DxEngEnumerateHdev}, -// {DXENG_INDEX_DxEngLockHdev, (PFN)DxEngLockHdev}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngUnlockHdev, (PFN)DxEngUnlockHdev}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngIsHdevLockedByCurrentThread, (PFN)DxEngIsHdevLockedByCurrentThread}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngReferenceHdev, (PFN)DxEngReferenceHdev}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngUnreferenceHdev, (PFN)DxEngUnreferenceHdev}, - {0, (PFN) NULL}, // hack for now + {DXENG_INDEX_DxEngLockHdev, (PFN)DxEngLockHdev}, + {DXENG_INDEX_DxEngUnlockHdev, (PFN)DxEngUnlockHdev}, + {DXENG_INDEX_DxEngIsHdevLockedByCurrentThread, (PFN)DxEngIsHdevLockedByCurrentThread}, + {DXENG_INDEX_DxEngReferenceHdev, (PFN)DxEngReferenceHdev}, + {DXENG_INDEX_DxEngUnreferenceHdev, (PFN)DxEngUnreferenceHdev}, {DXENG_INDEX_DxEngGetDeviceGammaRamp, (PFN)DxEngGetDeviceGammaRamp}, -// {DXENG_INDEX_DxEngSetDeviceGammaRamp, (PFN)DxEngSetDeviceGammaRamp}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngSpTearDownSprites, (PFN)DxEngSpTearDownSprites}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngSpUnTearDownSprites, (PFN)DxEngSpUnTearDownSprites}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngSpSpritesVisible, (PFN)DxEngSpSpritesVisible}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngGetHdevData, (PFN)DxEngGetHdevData}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngSetHdevData, (PFN)DxEngSetHdevData}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngCreateMemoryDC, (PFN)DxEngCreateMemoryDC}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngGetDesktopDC, (PFN)DxEngGetDesktopDC}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngDeleteDC, (PFN)DxEngDeleteDC}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngCleanDC, (PFN)DxEngCleanDC}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngSetDCOwner, (PFN)DxEngSetDCOwner}, - {0, (PFN) NULL}, // hack for now + {DXENG_INDEX_DxEngSetDeviceGammaRamp, (PFN)DxEngSetDeviceGammaRamp}, + {DXENG_INDEX_DxEngSpTearDownSprites, (PFN)DxEngSpTearDownSprites}, + {DXENG_INDEX_DxEngSpUnTearDownSprites, (PFN)DxEngSpUnTearDownSprites}, + {DXENG_INDEX_DxEngSpSpritesVisible, (PFN)DxEngSpSpritesVisible}, + {DXENG_INDEX_DxEngGetHdevData, (PFN)DxEngGetHdevData}, + {DXENG_INDEX_DxEngSetHdevData, (PFN)DxEngSetHdevData}, + {DXENG_INDEX_DxEngCreateMemoryDC, (PFN)DxEngCreateMemoryDC}, + {DXENG_INDEX_DxEngGetDesktopDC, (PFN)DxEngGetDesktopDC}, + {DXENG_INDEX_DxEngDeleteDC, (PFN)DxEngDeleteDC}, + {DXENG_INDEX_DxEngCleanDC, (PFN)DxEngCleanDC}, + {DXENG_INDEX_DxEngSetDCOwner, (PFN)DxEngSetDCOwner}, {DXENG_INDEX_DxEngLockDC, (PFN)DxEngLockDC}, {DXENG_INDEX_DxEngUnlockDC, (PFN)DxEngUnlockDC}, -// {DXENG_INDEX_DxEngSetDCState, (PFN)DxEngGetDCState}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngGetDCState, (PFN)DxEngGetDCState}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngSelectBitmap, (PFN)DxEngSelectBitmap}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngSetBitmapOwner, (PFN)DxEngSetBitmapOwner}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngDeleteSurface, (PFN)DxEngDeleteSurface}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngGetSurfaceData, (PFN)DxEngGetSurfaceData}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngAltLockSurface, (PFN)DxEngAltLockSurface}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngUploadPaletteEntryToSurface, (PFN)DxEngUploadPaletteEntryToSurface}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngMarkSurfaceAsDirectDraw, (PFN)DxEngMarkSurfaceAsDirectDraw}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngSelectPaletteToSurface, (PFN)DxEngSelectPaletteToSurface}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngSyncPaletteTableWithDevice, (PFN)DxEngSyncPaletteTableWithDevice}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngSetPaletteState, (PFN)DxEngSetPaletteState}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngGetRedirectionBitmap, (PFN)DxEngGetRedirectionBitmap}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngLoadImage, (PFN)DxEngLoadImage} - {0, (PFN) NULL} // hack for now + {DXENG_INDEX_DxEngSetDCState, (PFN)DxEngGetDCState}, + {DXENG_INDEX_DxEngGetDCState, (PFN)DxEngGetDCState}, + {DXENG_INDEX_DxEngSelectBitmap, (PFN)DxEngSelectBitmap}, + {DXENG_INDEX_DxEngSetBitmapOwner, (PFN)DxEngSetBitmapOwner}, + {DXENG_INDEX_DxEngDeleteSurface, (PFN)DxEngDeleteSurface}, + {DXENG_INDEX_DxEngGetSurfaceData, (PFN)DxEngGetSurfaceData}, + {DXENG_INDEX_DxEngAltLockSurface, (PFN)DxEngAltLockSurface}, + {DXENG_INDEX_DxEngUploadPaletteEntryToSurface, (PFN)DxEngUploadPaletteEntryToSurface}, + {DXENG_INDEX_DxEngMarkSurfaceAsDirectDraw, (PFN)DxEngMarkSurfaceAsDirectDraw}, + {DXENG_INDEX_DxEngSelectPaletteToSurface, (PFN)DxEngSelectPaletteToSurface}, + {DXENG_INDEX_DxEngSyncPaletteTableWithDevice, (PFN)DxEngSyncPaletteTableWithDevice}, + {DXENG_INDEX_DxEngSetPaletteState, (PFN)DxEngSetPaletteState}, + {DXENG_INDEX_DxEngGetRedirectionBitmap, (PFN)DxEngGetRedirectionBitmap}, + {DXENG_INDEX_DxEngLoadImage, (PFN)DxEngLoadImage} }; /************************************************************************/

1 0

[janderwald] 29749: - fix a few bugs
by janderwald＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: janderwald Date: Sun Oct 21 22:42:01 2007 New Revision: 29749 URL: http://svn.reactos.org/svn/reactos?rev=29749&view=rev Log: - fix a few bugs Modified: trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_bg_c… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c Sun Oct 21 22:42:01 2007 @@ -34,6 +34,8 @@ #include "shell32_main.h" #include "shellfolder.h" #include "undocshell.h" +#include "shlwapi.h" +#include "stdio.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -269,11 +271,11 @@ PROCESS_INFORMATION pi; UINT i, target; HANDLE hFile; - DWORD dwWritten; + DWORD dwWritten, dwError; static const WCHAR szNew[] = { 'N','e','w',' ',0 }; //FIXME static const WCHAR szP1[] = { '%', '1', 0 }; - static const WCHAR szFormat[] = {'%','s',' ','(','%','u',')','%','s',0 }; + static const WCHAR szFormat[] = {'%','s',' ','(','%','d',')','%','s',0 }; i = This->iIdShellNewFirst; @@ -317,7 +319,7 @@ ERR("IShellFolder_GetDisplayNameOf failed\n"); return; } - StrRetToBufW(strTemp, pidl, szPath, MAX_PATH); + StrRetToBufW(&strTemp, pidl, szPath, MAX_PATH); } switch(pCurItem->Type) { @@ -336,7 +338,7 @@ if (ptr) { ptr[1] = 's'; - swprintf(szTemp, szBuffer, szPath); + sprintfW(szTemp, szBuffer, szPath); ptr = szTemp; } else @@ -370,25 +372,35 @@ wcscat(szBuffer, pCurItem->szExt); do { - TRACE("FileName %s szBuffer %s i %d \n", debugstr_w(szBuffer), debugstr_w(szPath), i); hFile = CreateFileW(szBuffer, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); - swprintf(szBuffer, szFormat, szPath, i, pCurItem->szExt); + if (hFile != INVALID_HANDLE_VALUE) + break; + dwError = GetLastError(); + + TRACE("FileName %s szBuffer %s i %u error %x\n", debugstr_w(szBuffer), debugstr_w(szPath), i, dwError); + sprintfW(szBuffer, szFormat, szPath, i, pCurItem->szExt); i++; - }while(hFile == INVALID_HANDLE_VALUE); + }while(hFile == INVALID_HANDLE_VALUE && dwError == ERROR_FILE_EXISTS); + + if (hFile == INVALID_HANDLE_VALUE) + return; if (pCurItem->Type == SHELLNEW_TYPE_DATA) { - i = WideCharToMultiByte(CP_ACP, 0, pCurItem->szTarget, -1, (LPSTR)szBuffer, MAX_PATH*2, NULL, NULL); + i = WideCharToMultiByte(CP_ACP, 0, pCurItem->szTarget, -1, (LPSTR)szTemp, MAX_PATH*2, NULL, NULL); if (i) { - WriteFile(hFile, (LPCVOID)szBuffer, i, &dwWritten, NULL); + WriteFile(hFile, (LPCVOID)szTemp, i, &dwWritten, NULL); } } CloseHandle(hFile); if (pCurItem->Type == SHELLNEW_TYPE_FILENAME) { - CopyFileW(pCurItem->szTarget, szPath, FALSE); + if (!CopyFileW(pCurItem->szTarget, szBuffer, FALSE)) + break; } + TRACE("Notifying fs %s\n", debugstr_w(szBuffer)); + SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, (LPCVOID)szBuffer, NULL); break; } }

1 0

[hpoussin] 29748: [FORMATTING] General cleanup (indentation, headers...). No code change
by hpoussin＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: hpoussin Date: Sun Oct 21 22:35:19 2007 New Revision: 29748 URL: http://svn.reactos.org/svn/reactos?rev=29748&view=rev Log: [FORMATTING] General cleanup (indentation, headers...). No code change Modified: trunk/reactos/drivers/video/displays/vga/main/enable.c trunk/reactos/drivers/video/displays/vga/objects/bitblt.c trunk/reactos/drivers/video/displays/vga/objects/copybits.c trunk/reactos/drivers/video/displays/vga/objects/lineto.c trunk/reactos/drivers/video/displays/vga/objects/offscreen.c trunk/reactos/drivers/video/displays/vga/objects/paint.c trunk/reactos/drivers/video/displays/vga/objects/pointer.c trunk/reactos/drivers/video/displays/vga/objects/screen.c trunk/reactos/drivers/video/displays/vga/objects/transblt.c trunk/reactos/drivers/video/displays/vga/vgaddi.def trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/video/displays/vga/main/enable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… Modified: trunk/reactos/drivers/video/displays/vga/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… Modified: trunk/reactos/drivers/video/displays/vga/objects/copybits.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… Modified: trunk/reactos/drivers/video/displays/vga/objects/lineto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… Modified: trunk/reactos/drivers/video/displays/vga/objects/offscreen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… Modified: trunk/reactos/drivers/video/displays/vga/objects/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… Modified: trunk/reactos/drivers/video/displays/vga/objects/pointer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… Modified: trunk/reactos/drivers/video/displays/vga/objects/screen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… Modified: trunk/reactos/drivers/video/displays/vga/objects/transblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga…

1 0

[dreimer] 29747: Fix missing "" n build.cmd Make helpfile entries dependant on the installed optional files.
by dreimer＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: dreimer Date: Sun Oct 21 22:29:52 2007 New Revision: 29747 URL: http://svn.reactos.org/svn/reactos?rev=29747&view=rev Log: Fix missing "" n build.cmd Make helpfile entries dependant on the installed optional files. Modified: trunk/tools/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE-Windows/Root/Help.cmd Modified: trunk/tools/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build.cmd Sun Oct 21 22:29:52 2007 @@ -16,8 +16,8 @@ :: Check if the user has used the options utility and :: if so, load their options. :: -if exist %_ROSBE_BASEDIR%\rosbe-options.cmd ( - call %_ROSBE_BASEDIR%\rosbe-options.cmd +if exist "%_ROSBE_BASEDIR%\rosbe-options.cmd" ( + call "%_ROSBE_BASEDIR%\rosbe-options.cmd" ) :: @@ -29,7 +29,7 @@ if not errorlevel 1 ( echo. echo *** config.template.rbuild is newer than config.rbuild *** - echo *** aborting build. Please update your config.rbuild *** + echo *** aborting build. Please update your config.rbuild *** echo *** by typeing "config update". *** echo. goto :EOB Modified: trunk/tools/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Help.cmd Sun Oct 21 22:29:52 2007 @@ -17,32 +17,58 @@ if "%1" == "" ( echo. echo Available Commands: - echo make [OPTIONS] - Without options it does a standard build of - echo ReactOS. OPTIONS are the standard ReactOS build - echo options ie. "bootcd" - echo makex [OPTIONS] - Same as 'make' but automatically determines the - echo number of CPU Cores in the system and uses -j - echo with the appropriate number. + + if exist "%_ROSBE_BASEDIR%\build.cmd" ( + echo make [OPTIONS] - Without options it does a standard build of + echo ReactOS. OPTIONS are the standard ReactOS build + echo options ie. "bootcd" + echo makex [OPTIONS] - Same as 'make' but automatically determines the + echo number of CPU Cores in the system and uses -j + echo with the appropriate number. + ) + echo basedir - Switch back to the ReactOS source directory. echo. - echo scut - Define, Remove, Switch and Default to Shortcutted - echo Source-Directories. - echo chdefdir [OPTIONS] - Reconfigures the Default Source Folder for one - echo Session. + + if exist "%_ROSBE_BASEDIR%\scut.cmd" ( + echo scut - Define, Remove, Switch and Default to Shortcutted + echo Source-Directories. + ) + + if exist "%_ROSBE_BASEDIR%\chdefdir.cmd" ( + echo chdefdir [OPTIONS] - Reconfigures the Default Source Folder for one + echo Session. + ) + + if exist "%_ROSBE_BASEDIR%\config.cmd" ( echo config [OPTIONS] - Configures the way, ReactOS will be built. echo. + ) + + if exist "%_ROSBE_BASEDIR%\clean.cmd" ( echo clean [logs] - Fully clean the ReactOS source directory and/or echo the RosBE build logs. + ) + echo help [COMMAND] - Display the available commands or help on a echo specific command. + + if exist "%_ROSBE_BASEDIR%\options.cmd" ( echo options - Starts options.exe and reboots to make the echo changes effective at the end. + ) + + if exist "%_ROSBE_BASEDIR%\reladdr2line.cmd" ( echo raddr2line [OPTIONS] - Translates program addresses into file names and echo line numbers to assist Developers to find echo specific Bugs in ReactOS. + ) + + if exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( echo ssvn [OPTIONS] - Create, Update or Clean-up your ReactOS Source echo Tree or show the Revision Number of the Offline echo Tree and Online HEAD Revision. + ) goto :EOF )

1 0

[greatlrd] 29746: add stub for all dxeng so the dxg.sys does not crash, but we see where the problem are. now we can start play with dxg.sys in ReactX
by greatlrd＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: greatlrd Date: Sun Oct 21 22:28:31 2007 New Revision: 29746 URL: http://svn.reactos.org/svn/reactos?rev=29746&view=rev Log: add stub for all dxeng so the dxg.sys does not crash, but we see where the problem are. now we can start play with dxg.sys in ReactX Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h (original) +++ branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h Sun Oct 21 22:28:31 2007 @@ -76,119 +76,45 @@ BOOL DxEngUnlockDC(PDC pDC); + /* prototypes are not done yet, I need gather all my notes * to make them correct */ -/* -DWORD -DxEngScreenAccessCheck(); -DWORD -DxEngLockShareSem(); - -DWORD -DxEngUnlockShareSem(); - -DWORD -DxEngLockHdev(x); - -DWORD -DxEngUnlockHdev(x); - -DWORD -DxEngReferenceHdev(x); - -DWORD -DxEngIsHdevLockedByCurrentThread(x); - -DWORD -DxEngReferenceHdev(x); - -DWORD -DxEngUnreferenceHdev(x); - - - -DWORD -DxEngSetDeviceGammaRamp(x,x,x); - -DWORD -DxEngSpTearDownSprites(x,x,x); - -DWORD -DxEngSpUnTearDownSprites(x,x,x); - -DWORD -DxEngSpSpritesVisible(x); - -DWORD -DxEngGetHdevData(x,x); - -DWORD -DxEngSetHdevData(x,x,x); - -DWORD -DxEngCreateMemoryDC(x); - -DWORD -DxEngGetDesktopDC(x,x,x); - -DWORD -DxEngDeleteDC(x,x); - -DWORD -DxEngCleanDC(x); - -DWORD -DxEngSetDCOwner(x,x) - - - - - -DWORD -DxEngSetDCState(x,x,x); - -DWORD -DxEngGetDCState(x,x); - -DWORD -DxEngSelectBitmap(x,x); - -DWORD -DxEngSetBitmapOwner(x,x); - -DWORD -DxEngDeleteSurface(x); - -DWORD -DxEngGetSurfaceData(x,x); - -DWORD -DxEngAltLockSurface(x); - -DWORD -DxEngUploadPaletteEntryToSurface(x,x,x,x); - -DWORD -DxEngMarkSurfaceAsDirectDraw(x,x); - -DWORD -DxEngSelectPaletteToSurface(x,x) - -DWORD -DxEngSyncPaletteTableWithDevice(x,x) - -DWORD -DxEngSetPaletteState(x,x,x) - -DWORD -DxEngGetRedirectionBitmap(x) - -DWORD -DxEngLoadImage(x,x); -*/ +DWORD DxEngCreateMemoryDC(DWORD x1); +DWORD DxEngScreenAccessCheck(); +DWORD DxEngLockShareSem(); +DWORD DxEngUnlockShareSem(); +DWORD DxEngLockHdev(DWORD x1); +DWORD DxEngUnlockHdev(DWORD x1); +DWORD DxEngReferenceHdev(DWORD x1); +DWORD DxEngIsHdevLockedByCurrentThread(DWORD x1); +DWORD DxEngUnreferenceHdev(DWORD x1); +DWORD DxEngSetDeviceGammaRamp(DWORD x1, DWORD x2, DWORD x3); +DWORD DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3); +DWORD DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3); +DWORD DxEngSpSpritesVisible(DWORD x1); +DWORD DxEngGetHdevData(DWORD x1, DWORD x2); +DWORD DxEngSetHdevData(DWORD x1, DWORD x2, DWORD x3); +DWORD DxEngGetDesktopDC(DWORD x1, DWORD x2, DWORD x3); +DWORD DxEngDeleteDC(DWORD x1, DWORD x2); +DWORD DxEngCleanDC(DWORD x1); +DWORD DxEngSetDCOwner(DWORD x1, DWORD x2); +DWORD DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3); +DWORD DxEngGetDCState(DWORD x1, DWORD x2); +DWORD DxEngSelectBitmap(DWORD x1, DWORD x2); +DWORD DxEngSetBitmapOwner(DWORD x1, DWORD x2); +DWORD DxEngDeleteSurface(DWORD x1); +DWORD DxEngGetSurfaceData(DWORD x1, DWORD x2); +DWORD DxEngAltLockSurface(DWORD x1); +DWORD DxEngUploadPaletteEntryToSurface(DWORD x1, DWORD x2,DWORD x3, DWORD x4); +DWORD DxEngMarkSurfaceAsDirectDraw(DWORD x1, DWORD x2); +DWORD DxEngSelectPaletteToSurface(DWORD x1, DWORD x2); +DWORD DxEngSyncPaletteTableWithDevice(DWORD x1, DWORD x2); +DWORD DxEngSetPaletteState(DWORD x1, DWORD x2, DWORD x3); +DWORD DxEngGetRedirectionBitmap(DWORD x1); +DWORD DxEngLoadImage(DWORD x1,DWORD x2); @@ -199,3 +125,4 @@ + Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Sun Oct 21 22:28:31 2007 @@ -11,6 +11,8 @@ #include <w32k.h> #include <debug.h> + + ULONG gcEngFuncs = DXENG_INDEX_DxEngLoadImage + 1; DRVFN gaEngFuncs [] = { @@ -102,7 +104,7 @@ DxEngNUIsTermSrv() { /* FIXME ReactOS does not suport terminal server yet, we can not check if we got a connections or not */ - DPRINT1("We need termal server connections check"); + UNIMPLEMENTED; return FALSE; } @@ -115,7 +117,7 @@ DxEngRedrawDesktop() { /* FIXME add redraw code */ - DPRINT1("We need add code for redraw whole desktop"); + UNIMPLEMENTED; return TRUE; } @@ -129,8 +131,8 @@ DxEngDispUniq() { /* FIXME DisplayUniqVisrgn from gdishare memory */ - DPRINT1("We need DisplayUniqVisrgn from gdishare memory"); - return 0; + UNIMPLEMENTED; + return FALSE; } /************************************************************************/ @@ -141,8 +143,8 @@ DxEngVisRgnUniq() { /* FIXME DisplayUniqVisrgn from gdishare memory */ - DPRINT1("We need VisRgnUniq from win32k"); - return 0; + UNIMPLEMENTED; + return FALSE; } /************************************************************************/ @@ -153,8 +155,8 @@ DxEngEnumerateHdev(HDEV *hdev) { /* FIXME Enumate all drivers in win32k */ - DPRINT1("We do not enumate any device from win32k "); - return 0; + UNIMPLEMENTED; + return FALSE; } /************************************************************************/ @@ -165,7 +167,7 @@ DxEngGetDeviceGammaRamp(HDC hDC, LPVOID lpRamp) { /* FIXME redirect it to NtGdiEngGetDeviceGammaRamp internal call */ - DPRINT1("redirect it to NtGdiEngGetDeviceGammaRamp internal call "); + UNIMPLEMENTED; return FALSE; } @@ -181,6 +183,7 @@ * * @return * This api return PDC or NULL depns if it sussess lock the hdc or not +* * @remarks. * none * @@ -188,7 +191,7 @@ PDC DxEngLockDC(HDC hDC) { - return DC_LockDc(hdc); + return DC_LockDc(hDC); } @@ -203,7 +206,7 @@ * * @return * This api always return TRUE if it sussess or not - +* * @remarks. * none * @@ -216,5 +219,302 @@ } - - +/************************************************************************/ +/* DxEngCreateMemoryDC */ +/************************************************************************/ +DWORD DxEngCreateMemoryDC(DWORD x1) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngScreenAccessCheck */ +/************************************************************************/ +DWORD DxEngScreenAccessCheck() +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngLockShareSem */ +/************************************************************************/ +DWORD DxEngLockShareSem() +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngUnlockShareSem */ +/************************************************************************/ +DWORD DxEngUnlockShareSem() +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngLockHdev */ +/************************************************************************/ +DWORD DxEngLockHdev(DWORD x1) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngUnlockHdev */ +/************************************************************************/ +DWORD DxEngUnlockHdev(DWORD x1) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngReferenceHdev */ +/************************************************************************/ +DWORD DxEngReferenceHdev(DWORD x1) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngIsHdevLockedByCurrentThread */ +/************************************************************************/ +DWORD DxEngIsHdevLockedByCurrentThread(DWORD x1) +{ + UNIMPLEMENTED; + return FALSE; +} + + +/************************************************************************/ +/* DxEngUnreferenceHdev */ +/************************************************************************/ +DWORD DxEngUnreferenceHdev(DWORD x1) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSetDeviceGammaRamp */ +/************************************************************************/ +DWORD DxEngSetDeviceGammaRamp(DWORD x1, DWORD x2, DWORD x3) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSpTearDownSprites */ +/************************************************************************/ +DWORD DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSpUnTearDownSprites */ +/************************************************************************/ +DWORD DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSpSpritesVisible */ +/************************************************************************/ +DWORD DxEngSpSpritesVisible(DWORD x1) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngGetHdevData */ +/************************************************************************/ +DWORD DxEngGetHdevData(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSetHdevData */ +/************************************************************************/ +DWORD DxEngSetHdevData(DWORD x1, DWORD x2, DWORD x3) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngGetDesktopDC */ +/************************************************************************/ +DWORD DxEngGetDesktopDC(DWORD x1, DWORD x2, DWORD x3) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngDeleteDC */ +/************************************************************************/ +DWORD DxEngDeleteDC(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngCleanDC */ +/************************************************************************/ +DWORD DxEngCleanDC(DWORD x1) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSetDCOwner */ +/************************************************************************/ +DWORD DxEngSetDCOwner(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSetDCState */ +/************************************************************************/ +DWORD DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngGetDCState */ +/************************************************************************/ +DWORD DxEngGetDCState(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSelectBitmap */ +/************************************************************************/ +DWORD DxEngSelectBitmap(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSetBitmapOwner */ +/************************************************************************/ +DWORD DxEngSetBitmapOwner(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngDeleteSurface */ +/************************************************************************/ +DWORD DxEngDeleteSurface(DWORD x1) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngGetSurfaceData */ +/************************************************************************/ +DWORD DxEngGetSurfaceData(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngAltLockSurface */ +/************************************************************************/ +DWORD DxEngAltLockSurface(DWORD x1) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngUploadPaletteEntryToSurface */ +/************************************************************************/ +DWORD DxEngUploadPaletteEntryToSurface(DWORD x1, DWORD x2,DWORD x3, DWORD x4) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngMarkSurfaceAsDirectDraw */ +/************************************************************************/ +DWORD DxEngMarkSurfaceAsDirectDraw(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSelectPaletteToSurface */ +/************************************************************************/ +DWORD DxEngSelectPaletteToSurface(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSyncPaletteTableWithDevice */ +/************************************************************************/ +DWORD DxEngSyncPaletteTableWithDevice(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSetPaletteState */ +/************************************************************************/ +DWORD DxEngSetPaletteState(DWORD x1, DWORD x2, DWORD x3) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngGetRedirectionBitmap */ +/************************************************************************/ +DWORD DxEngGetRedirectionBitmap(DWORD x1) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngLoadImage */ +/************************************************************************/ +DWORD DxEngLoadImage(DWORD x1,DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +

1 0

[dreimer] 29745: More Code Cleanup by Pierre Schweitzer
by dreimer＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: dreimer Date: Sun Oct 21 21:19:07 2007 New Revision: 29745 URL: http://svn.reactos.org/svn/reactos?rev=29745&view=rev Log: More Code Cleanup by Pierre Schweitzer Modified: trunk/tools/RosBE-Windows/Tools/config/options.c Modified: trunk/tools/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.c Sun Oct 21 21:19:07 2007 @@ -53,12 +53,12 @@ HANDLE hFile; FILE *pFile; - showtime = SendMessage(GetDlgItem(hwnd, ID_SHOWBUILDTIME), BM_GETCHECK, 0, 0) == BST_CHECKED; - writelog = SendMessage(GetDlgItem(hwnd, ID_SAVELOGS), BM_GETCHECK, 0, 0) == BST_CHECKED; - useccache = SendMessage(GetDlgItem(hwnd, ID_USECCACHE), BM_GETCHECK, 0, 0); - strip = SendMessage(GetDlgItem(hwnd, ID_STRIP), BM_GETCHECK, 0, 0); - foreground = SendMessage(GetDlgItem(hwnd, IDC_FONT), CB_GETCURSEL, 0, 0); - background = SendMessage(GetDlgItem(hwnd, IDC_BACK), CB_GETCURSEL, 0, 0); + showtime = SendDlgItemMessage(hwnd, ID_SHOWBUILDTIME, BM_GETCHECK, 0, 0) == BST_CHECKED; + writelog = SendDlgItemMessage(hwnd, ID_SAVELOGS, BM_GETCHECK, 0, 0) == BST_CHECKED; + useccache = SendDlgItemMessage(hwnd, ID_USECCACHE, BM_GETCHECK, 0, 0); + strip = SendDlgItemMessage(hwnd, ID_STRIP, BM_GETCHECK, 0, 0); + foreground = SendDlgItemMessage(hwnd, IDC_FONT, CB_GETCURSEL, 0, 0); + background = SendDlgItemMessage(hwnd, IDC_BACK, CB_GETCURSEL, 0, 0); GetDlgItemText(hwnd, ID_LOGDIR, logdir, MAX_PATH); GetDlgItemText(hwnd, ID_MGWDIR, mingwpath, MAX_PATH); @@ -90,10 +90,7 @@ MessageBox(NULL, msgerror, NULL, MB_ICONERROR); return FALSE; } - else - { - CloseHandle(hFile); - } + CloseHandle(hFile); pFile = fopen("rosbe-options.cmd", "w"); if (pFile) @@ -112,18 +109,15 @@ fclose(pFile); return TRUE; } - else - { - LoadString(hInstance, MSG_FILEFAILED, msgerror, 256); - MessageBox(NULL, msgerror, NULL, MB_ICONERROR); - return FALSE; - } + LoadString(hInstance, MSG_FILEFAILED, msgerror, 256); + MessageBox(NULL, msgerror, NULL, MB_ICONERROR); + return FALSE; } INT_PTR CALLBACK DlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) { - WCHAR defaultmingwpath[MAX_PATH]; + WCHAR Path[MAX_PATH]; static HICON hIcon; switch (Msg) @@ -141,28 +135,26 @@ for(unsigned int i = 0; i < sizeof(Colors) / sizeof(char *); i++) { - SendMessage(GetDlgItem(Dlg, IDC_BACK), CB_ADDSTRING, 0, (LPARAM) (Colors[i])); - SendMessage(GetDlgItem(Dlg, IDC_FONT), CB_ADDSTRING, 0, (LPARAM) (Colors[i])); - } - SendMessage(GetDlgItem(Dlg, IDC_FONT), CB_SETCURSEL, 0xA, 0); - SendMessage(GetDlgItem(Dlg, IDC_BACK), CB_SETCURSEL, 0, 0); - GetCurrentDirectory(MAX_PATH, defaultmingwpath); - if ((wcslen(defaultmingwpath) + wcslen(MINGWVERSION)) < MAX_PATH) - wcscat(defaultmingwpath, MINGWVERSION); - SetDlgItemText(Dlg, ID_MGWDIR, defaultmingwpath); + SendDlgItemMessage(Dlg, IDC_BACK, CB_ADDSTRING, 0, (LPARAM) (Colors[i])); + SendDlgItemMessage(Dlg, IDC_FONT, CB_ADDSTRING, 0, (LPARAM) (Colors[i])); + } + SendDlgItemMessage(Dlg, IDC_FONT, CB_SETCURSEL, 0xa, 0); + SendDlgItemMessage(Dlg, IDC_BACK, CB_SETCURSEL, 0, 0); + GetCurrentDirectory(MAX_PATH, Path); + if ((wcslen(Path) + wcslen(MINGWVERSION)) < MAX_PATH) + wcscat(Path, MINGWVERSION); + SetDlgItemText(Dlg, ID_MGWDIR, Path); return TRUE; } case WM_COMMAND: { - if (((LOWORD(wParam) == IDC_FONT) && (HIWORD(wParam) == CBN_SELCHANGE)) || - ((LOWORD(wParam) == IDC_BACK) && (HIWORD(wParam) == CBN_SELCHANGE))) + if ((HIWORD(wParam) == CBN_SELCHANGE) && ((LOWORD(wParam) == IDC_FONT) || (LOWORD(wParam) == IDC_BACK))) { RECT rcWnd; GetClientRect(GetDlgItem(Dlg, ID_EXAMPLE), &rcWnd); InvalidateRect(GetDlgItem(Dlg, ID_EXAMPLE), &rcWnd, FALSE); - UpdateWindow(GetDlgItem(Dlg, ID_EXAMPLE)); EnableWindow(GetDlgItem(Dlg, ID_OK), TRUE); } else @@ -182,7 +174,6 @@ case ID_BROWSE: case ID_BROWSEMGW: { - WCHAR Path[MAX_PATH]; BROWSEINFO PathInfo; LPITEMIDLIST pidl; INT Control = ID_LOGDIR; @@ -208,41 +199,38 @@ } } pidl = SHBrowseForFolder(&PathInfo); - if (pidl && SHGetPathFromIDList(pidl, Path)) - { - SetDlgItemText(Dlg, Control, Path); - EnableWindow(GetDlgItem(Dlg, ID_OK), TRUE); - } + if (!pidl && !SHGetPathFromIDList(pidl, Path)) + break; + SetDlgItemText(Dlg, Control, Path); + } + case ID_STRIP: + case ID_USECCACHE: + case ID_SHOWBUILDTIME: + { + EnableWindow(GetDlgItem(Dlg, ID_OK), TRUE); break; } case ID_SAVELOGS: { - BOOL WriteLogSet = SendMessage(GetDlgItem(Dlg, ID_SAVELOGS), BM_GETCHECK, 0, - 0) == BST_CHECKED; + BOOL WriteLogSet; + WriteLogSet = SendDlgItemMessage(Dlg, ID_SAVELOGS, BM_GETCHECK, 0, 0) == BST_CHECKED; EnableWindow(GetDlgItem(Dlg, ID_BROWSE), WriteLogSet); EnableWindow(GetDlgItem(Dlg, ID_LOGDIR), WriteLogSet); break; } - case ID_STRIP: - case ID_USECCACHE: - case ID_SHOWBUILDTIME: - { - EnableWindow(GetDlgItem(Dlg, ID_OK), TRUE); - break; - } } } return FALSE; } - case WM_CTLCOLORSTATIC : + case WM_CTLCOLORSTATIC: { if((HWND)lParam == GetDlgItem(Dlg, ID_EXAMPLE)) { - SetTextColor((HDC)wParam, ColorsRGB[SendMessage(GetDlgItem(Dlg, IDC_FONT), CB_GETCURSEL, 0, 0)]); - SetBkColor((HDC)wParam, ColorsRGB[SendMessage(GetDlgItem(Dlg, IDC_BACK), CB_GETCURSEL, 0, 0)]); - return (LONG)CreateSolidBrush(ColorsRGB[SendMessage(GetDlgItem(Dlg, IDC_BACK), CB_GETCURSEL, 0, 0)]); + SetTextColor((HDC)wParam, ColorsRGB[SendDlgItemMessage(Dlg, IDC_FONT, CB_GETCURSEL, 0, 0)]); + SetBkColor((HDC)wParam, ColorsRGB[SendDlgItemMessage(Dlg, IDC_BACK, CB_GETCURSEL, 0, 0)]); + return (LONG)CreateSolidBrush(ColorsRGB[SendDlgItemMessage(Dlg, IDC_BACK, CB_GETCURSEL, 0, 0)]); } break; }

1 0

[janderwald] 29744: - use SHGetSpecialFolderPath if used on desktop when creating new file objects
by janderwald＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: janderwald Date: Sun Oct 21 21:11:43 2007 New Revision: 29744 URL: http://svn.reactos.org/svn/reactos?rev=29744&view=rev Log: - use SHGetSpecialFolderPath if used on desktop when creating new file objects Modified: trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_bg_c… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_bg_cmenu.c Sun Oct 21 21:11:43 2007 @@ -291,23 +291,34 @@ if (!pCurItem) return; - if (IShellFolder2_QueryInterface(This->pSFParent, &IID_IPersistFolder2, (LPVOID*)&psf) != S_OK) - { - ERR("Failed to get interface IID_IPersistFolder2\n"); - return; + if (This->bDesktop) + { + if (!SHGetSpecialFolderPathW(0, szPath, CSIDL_DESKTOPDIRECTORY, FALSE)) + { + ERR("Failed to get desktop folder location"); + return; + } } - if (IPersistFolder2_GetCurFolder(psf, &pidl) != S_OK) - { - ERR("IPersistFolder2_GetCurFolder failed\n"); - return; + else + { + if (IShellFolder2_QueryInterface(This->pSFParent, &IID_IPersistFolder2, (LPVOID*)&psf) != S_OK) + { + ERR("Failed to get interface IID_IPersistFolder2\n"); + return; + } + if (IPersistFolder2_GetCurFolder(psf, &pidl) != S_OK) + { + ERR("IPersistFolder2_GetCurFolder failed\n"); + return; + } + + if (IShellFolder2_GetDisplayNameOf(This->pSFParent, pidl, SHGDN_FORPARSING, &strTemp) != S_OK) + { + ERR("IShellFolder_GetDisplayNameOf failed\n"); + return; + } + StrRetToBufW(strTemp, pidl, szPath, MAX_PATH); } - - if (IShellFolder2_GetDisplayNameOf(This->pSFParent, pidl, SHGDN_FORPARSING, &strTemp) != S_OK) - { - ERR("IShellFolder_GetDisplayNameOf failed\n"); - return; - } - switch(pCurItem->Type) { case SHELLNEW_TYPE_COMMAND: @@ -325,9 +336,7 @@ if (ptr) { ptr[1] = 's'; - //StrRetToBufW(strTemp, pidl, szPath, MAX_PATH); - //TRACE("szPath %s\n", debugstr_w(szPath)); - swprintf(szTemp, szBuffer, strTemp.u.pOleStr); + swprintf(szTemp, szBuffer, szPath); ptr = szTemp; } else @@ -354,17 +363,16 @@ { i = 2; - wcscpy(szBuffer, strTemp.u.pOleStr); - PathAddBackslashW(szBuffer); - wcscat(szBuffer, szNew); - wcscat(szBuffer, pCurItem->szDesc); - wcscpy(szPath, szBuffer); - wcscat(szPath, pCurItem->szExt); + PathAddBackslashW(szPath); + wcscat(szPath, szNew); + wcscat(szPath, pCurItem->szDesc); + wcscpy(szBuffer, szPath); + wcscat(szBuffer, pCurItem->szExt); do { - TRACE("FileName %s szBuffer %s i %d \n", debugstr_w(szPath), debugstr_w(szBuffer), i); - hFile = CreateFileW(szPath, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); - swprintf(szPath, szFormat, szBuffer, i, pCurItem->szExt); + TRACE("FileName %s szBuffer %s i %d \n", debugstr_w(szBuffer), debugstr_w(szPath), i); + hFile = CreateFileW(szBuffer, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + swprintf(szBuffer, szFormat, szPath, i, pCurItem->szExt); i++; }while(hFile == INVALID_HANDLE_VALUE);

1 0

[greatlrd] 29743: implement DxEngLockDC and DxEngUnlockDC Documented DxEngLockDC and DxEngUnlockDC
by greatlrd＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: greatlrd Date: Sun Oct 21 21:08:12 2007 New Revision: 29743 URL: http://svn.reactos.org/svn/reactos?rev=29743&view=rev Log: implement DxEngLockDC and DxEngUnlockDC Documented DxEngLockDC and DxEngUnlockDC Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Sun Oct 21 21:08:12 2007 @@ -61,10 +61,8 @@ {0, (PFN) NULL}, // hack for now // {DXENG_INDEX_DxEngSetDCOwner, (PFN)DxEngSetDCOwner}, {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngLockDC, (PFN)DxEngLockDC}, - {0, (PFN) NULL}, // hack for now -// {DXENG_INDEX_DxEngUnlockDC, (PFN)DxEngUnlockDC}, - {0, (PFN) NULL}, // hack for now + {DXENG_INDEX_DxEngLockDC, (PFN)DxEngLockDC}, + {DXENG_INDEX_DxEngUnlockDC, (PFN)DxEngUnlockDC}, // {DXENG_INDEX_DxEngSetDCState, (PFN)DxEngGetDCState}, {0, (PFN) NULL}, // hack for now // {DXENG_INDEX_DxEngGetDCState, (PFN)DxEngGetDCState}, @@ -172,5 +170,51 @@ } - - +/*++ +* @name DxEngLockDC +* @implemented +* +* The function DxEngLockDC lock a hdc from dxg.sys +* +* @param HDC hDC +* The handle we need want lock +* +* @return +* This api return PDC or NULL depns if it sussess lock the hdc or not +* @remarks. +* none +* +*--*/ +PDC +DxEngLockDC(HDC hDC) +{ + return DC_LockDc(hdc); +} + + +/*++ +* @name DxEngUnlockDC +* @implemented +* +* The function DxEngUnlockDC Unlock a pDC (hdc) from dxg.sys + +* @param PDC pDC +* The handle we need unlock +* +* @return +* This api always return TRUE if it sussess or not + +* @remarks. +* none +* +*--*/ +BOOL +DxEngUnlockDC(PDC pDC) +{ + DC_UnlockDc(pDC); + return TRUE; +} + + + +

1 0

[greatlrd] 29742: add correct prototypes for DxEngLockDC and DxEngUnlockDC add comment how DxEngLockDC and DxEngUnlockDC works
by greatlrd＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: greatlrd Date: Sun Oct 21 21:06:27 2007 New Revision: 29742 URL: http://svn.reactos.org/svn/reactos?rev=29742&view=rev Log: add correct prototypes for DxEngLockDC and DxEngUnlockDC add comment how DxEngLockDC and DxEngUnlockDC works Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h Modified: branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/reactos/… ============================================================================== --- branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h (original) +++ branches/reactx/reactos/include/reactos/drivers/directx/dxeng.h Sun Oct 21 21:06:27 2007 @@ -56,19 +56,24 @@ /* Notes : it always return TRUE, and it update whole the screen (redaw current desktop) */ BOOL DxEngRedrawDesktop(); -/* Notes : return the DisplayUniqVisrgn counter from gdishare memory */ +/* Notes : return the DisplayUniqVisrgn counter from gdishare memory */ ULONG DxEngDispUniq(); /* Notes : return the VisRgnUniq counter for win32k */ ULONG DxEngVisRgnUniq(); -/* Enumate all drivers in win32k */ -HDEV * -DxEngEnumerateHdev(HDEV *hdev); - -/* same protypes NtGdiEngGetDeviceGammaRamp, diffent is we skipp the user mode checks and seh */ +/* Notes : Enumate all drivers in win32k */ +HDEV *DxEngEnumerateHdev(HDEV *hdev); + +/* Notes : same protypes NtGdiEngGetDeviceGammaRamp, diffent is we skipp the user mode checks and seh */ BOOL DxEngGetDeviceGammaRamp(HDC hDC, LPVOID lpRamp); + +/* Notes : Lock the hDC */ +PDC DxEngLockDC(HDC hDC); + +/* Notes : Unlock the hDC */ +BOOL DxEngUnlockDC(PDC pDC); /* prototypes are not done yet, I need gather all my notes @@ -138,11 +143,9 @@ DWORD DxEngSetDCOwner(x,x) -DWORD -DxEngLockDC(x); - -DWORD -DxEngUnlockDC(x); + + + DWORD DxEngSetDCState(x,x,x);

1 0

[peterw] 29741: - A little bit more cleanup.
by peterw＠svn.reactos.org 21 Oct '07

21 Oct '07

Author: peterw Date: Sun Oct 21 20:26:02 2007 New Revision: 29741 URL: http://svn.reactos.org/svn/reactos?rev=29741&view=rev Log: - A little bit more cleanup. Modified: trunk/tools/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/options.cmd trunk/tools/RosBE-Windows/Root/reladdr2line.cmd trunk/tools/RosBE-Windows/Root/sSVN.cmd trunk/tools/RosBE-Windows/Root/scut.cmd Modified: trunk/tools/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Config.cmd Sun Oct 21 20:26:02 2007 @@ -16,7 +16,7 @@ if "%1" == "delete" ( echo config.rbuild will be permanently deleted. All your settings will be gone. echo Continue? - SET /P XY="(yes), (no)" + set /P XY="(yes), (no)" if /I "%XY%"=="yes" goto :CONT if /I "%XY%"=="no" goto :NOK goto :NOK @@ -40,7 +40,7 @@ echo old config.rbuild will be deleted and will be updated with a recent, echo default one. You will need to reconfigure it to your wishes later. echo Continue? - SET /P XY="(yes), (no)" + set /P XY="(yes), (no)" if /I "%XY%"=="yes" goto :CONT2 if /I "%XY%"=="no" goto :NOK :CONT2 @@ -71,7 +71,7 @@ echo. echo DID YOU UNDERSTAND? -SET /P XY="(yes), (no)" +set /P XY="(yes), (no)" if /I "%XY%"=="yes" goto :OK if /I "%XY%"=="no" goto :NOK @@ -92,7 +92,7 @@ echo *** update to the most recent one? You need to reset all your *** echo *** previously made settings. *** echo. - SET /P XY="(yes), (no)" + set /P XY="(yes), (no)" if /I "%XY%"=="yes" del "%_ROSBE_BASEDIR%\*.rbuild" | del "config.rbuild" | copy "config.template.rbuild" "%_ROSBE_BASEDIR%\config.rbuild" | goto :OK if /I "%XY%"=="no" goto :NOK goto :NOK @@ -107,7 +107,7 @@ echo. echo Right now grep \"SARCH\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 -SET /P X="(), (xbox)" +set /P X="(), (xbox)" sed "s/\"SARCH\" value=\"\"/\"SARCH\" value=\"%X%\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%X%\"/g" "%_ROSBE_BASEDIR%\config.rbuild" > "%_ROSBE_BASEDIR%\config2.rbuild" cls @@ -120,9 +120,9 @@ echo. echo Right now grep \"OARCH\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 -SET /P XX= +set /P XX= if "%XX%" == "" ( - SET XX=pentium + set XX=pentium ) sed "s/\"OARCH\" value=\".*\"/\"OARCH\" value=\"%XX%\"/g" "%_ROSBE_BASEDIR%\config2.rbuild" > "%_ROSBE_BASEDIR%\config3.rbuild" cls @@ -136,9 +136,9 @@ echo. echo Right now grep \"OPTIMIZE\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 -SET /P Y="(0), (1), (2), (3), (4), (5)" +set /P Y="(0), (1), (2), (3), (4), (5)" if "%Y%" == "" ( - SET Y=1 + set Y=1 ) sed "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%Y%\"/g" "%_ROSBE_BASEDIR%\config3.rbuild" > "%_ROSBE_BASEDIR%\config4.rbuild" cls @@ -148,9 +148,9 @@ echo. echo Right now grep \"MP\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 -SET /P Z="(0), (1)" +set /P Z="(0), (1)" if "%Z%" == "" ( - SET Z=0 + set Z=0 ) sed "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%Z%\"/g" "%_ROSBE_BASEDIR%\config4.rbuild" > "%_ROSBE_BASEDIR%\config5.rbuild" cls @@ -160,9 +160,9 @@ echo. echo Right now grep \"KDBG\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 -SET /P A="(0), (1)" +set /P A="(0), (1)" if "%A%" == "" ( - SET A=0 + set A=0 ) sed "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%A%\"/g" "%_ROSBE_BASEDIR%\config5.rbuild" > "%_ROSBE_BASEDIR%\config6.rbuild" cls @@ -173,9 +173,9 @@ echo. echo Right now grep \"DBG\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 -SET /P B="(0), (1)" +set /P B="(0), (1)" if "%B%" == "" ( - SET B=1 + set B=1 ) sed "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%B%\"/g" "%_ROSBE_BASEDIR%\config6.rbuild" > "%_ROSBE_BASEDIR%\config7.rbuild" cls @@ -186,9 +186,9 @@ echo. echo Right now grep \"GDB\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 -SET /P C="(0), (1)" +set /P C="(0), (1)" if "%C%" == "" ( - SET C=0 + set C=0 ) sed "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%C%\"/g" "%_ROSBE_BASEDIR%\config7.rbuild" > "%_ROSBE_BASEDIR%\config8.rbuild" cls @@ -201,9 +201,9 @@ echo. echo Right now grep \"NSWPAT\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 -SET /P D="(0), (1)" +set /P D="(0), (1)" if "%D%" == "" ( - SET D=0 + set D=0 ) sed "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%D%\"/g" "%_ROSBE_BASEDIR%\config8.rbuild" > "%_ROSBE_BASEDIR%\config9.rbuild" cls @@ -218,9 +218,9 @@ echo. echo Right now grep \"_WINKD_\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d "\"" -f 4 -SET /P F="(0), (1)" +set /P F="(0), (1)" if "%F%" == "" ( - SET F=0 + set F=0 ) sed "s/\"_WINKD_\" value=\"[0-1]\"/\"_WINKD_\" value=\"%F%\"/g" "%_ROSBE_BASEDIR%\config9.rbuild" > "%_ROSBE_BASEDIR%\config10.rbuild" Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Sun Oct 21 20:26:02 2007 @@ -17,7 +17,7 @@ color 0A set _ROSBE_VERSION=0.X.X.X set _ROSBE_BASEDIR=%~dp0 -for /f "usebackq" %%i in (`"echo %_ROSBE_BASEDIR%|%_ROSBE_BASEDIR%Tools\sed s/.$//g"`) do @SET _ROSBE_BASEDIR=%%i +for /f "usebackq" %%i in (`"echo %_ROSBE_BASEDIR%|%_ROSBE_BASEDIR%Tools\sed s/.$//g"`) do set _ROSBE_BASEDIR=%%i set _ROSBE_ROSSOURCEDIR=%CD% set _ROSBE_SHOWTIME=1 set _ROSBE_WRITELOG=1 @@ -62,7 +62,7 @@ :: Source Directory and add PATH for Tools Folder. :: set PATH=%_ROSBE_BASEDIR%\Tools;%PATH% -for /f "usebackq" %%i in (`"grep base= "%_ROSBE_BASEDIR%\srclist.xml"|cutz main"`) do @SET scut=%%i +for /f "usebackq" %%i in (`"grep base= "%_ROSBE_BASEDIR%\srclist.xml"|cutz main"`) do set scut=%%i echo Used Shortcut: %scut% echo. @@ -80,6 +80,7 @@ echo. echo For a list of all included commands, type: "help" echo ------------------------------------------------- +echo. :: :: Load the doskey macros that serve as our commands. Modified: trunk/tools/RosBE-Windows/Root/options.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/options.c… ============================================================================== --- trunk/tools/RosBE-Windows/Root/options.cmd (original) +++ trunk/tools/RosBE-Windows/Root/options.cmd Sun Oct 21 20:26:02 2007 @@ -11,6 +11,6 @@ title Options "%_ROSBE_BASEDIR%\options.exe" -ECHO Press any Button to reset RosBE with the new Settings. +echo Press any Button to reset RosBE with the new Settings. pause "%_ROSBE_BASEDIR%\RosBE.cmd" Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/reladdr2l… ============================================================================== --- trunk/tools/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Sun Oct 21 20:26:02 2007 @@ -45,7 +45,7 @@ :: adress and can be given directly to raddr2line. If not, add it and :: give the result to raddr2line. :: -for /f "tokens=2" %%i in ('"objdump -p %_1% 2>NUL | findstr ImageBase"') do SET baseaddr=0x%%i +for /f "tokens=2" %%i in ('"objdump -p %_1% 2>NUL | findstr ImageBase"') do set baseaddr=0x%%i if %%i LSS %_2% ( raddr2line "%_1%" "%_2%" 2>NUL ) else ( Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVN.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/sSVN.cmd (original) +++ trunk/tools/RosBE-Windows/Root/sSVN.cmd Sun Oct 21 20:26:02 2007 @@ -56,8 +56,8 @@ :: if "%1" == "status" ( title Status - for /f "usebackq" %%i IN (`svnversion .`) DO @set OFFSVN=%%i - for /f "usebackq" %%j IN (`"svn info svn://svn.reactos.org/reactos/trunk/reactos|find "Revision:"|cutz svn"`) DO @set ONSVN=%%j + for /f "usebackq" %%i in (`svnversion .`) do set OFFSVN=%%i + for /f "usebackq" %%j in (`"svn info svn://svn.reactos.org/reactos/trunk/reactos|find "Revision:"|cutz svn"`) do set ONSVN=%%j call :UP goto :ExitSVN ) @@ -71,17 +71,17 @@ echo Recent Offline Revision: %OFFSVN% echo Online HEAD Revision: %ONSVN% echo. -if %OFFSVN% LSS %ONSVN% ( +if %OFFSVN% lss %ONSVN% ( echo Your Tree is not Up to date. Do you want to update it? goto :UP2 ) -if %OFFSVN% EQU %ONSVN% ( +if %OFFSVN% equ %ONSVN% ( echo Your Tree is Up to date. goto :ExitSVN ) :UP2 -SET /P XY="(yes), (no)" +set /P XY="(yes), (no)" if /I "%XY%"=="yes" %_ROSBE_BASEDIR%\ssvn update if /I "%XY%"=="no" goto :ExitSVN Modified: trunk/tools/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/scut.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/scut.cmd (original) +++ trunk/tools/RosBE-Windows/Root/scut.cmd Sun Oct 21 20:26:02 2007 @@ -35,7 +35,7 @@ :: :DEF echo Choose your Source Folder: -SET /P XY= +set /P XY= :RUN grep name=\"%XY%\" "%_ROSBE_BASEDIR%\srclist.xml"|cutz dir > "%_ROSBE_BASEDIR%\aaa.tmp" test -s "%_ROSBE_BASEDIR%\aaa.tmp" @@ -69,10 +69,10 @@ :ADD1 echo Choose your Shortcut: -SET /P CUT= +set /P CUT= :ADD2 echo Choose your Source Folder: -SET /P DIR= +set /P DIR= :ADD23 echo ^<property name="%CUT%" value="%DIR%" /^> > "%_ROSBE_BASEDIR%\aaa.tmp" copy "%_ROSBE_BASEDIR%\srclist.xml" + "%_ROSBE_BASEDIR%\aaa.tmp" "%_ROSBE_BASEDIR%\srclist2.xml" @@ -90,7 +90,7 @@ goto :REM1 ) echo Choose your Shortcut: -SET /P CUTREM= +set /P CUTREM= :REM1 grep name=\"%CUTREM%\" "%_ROSBE_BASEDIR%\srclist.xml"|cutz dir > "%_ROSBE_BASEDIR%\aaa.tmp" test -s "%_ROSBE_BASEDIR%\aaa.tmp" @@ -115,7 +115,7 @@ goto :DEF1 ) echo Choose your new Default Shortcut: -SET /P DEF= +set /P DEF= :DEF1 grep name=\"%DEF%\" "%_ROSBE_BASEDIR%\srclist.xml"|cutz dir > "%_ROSBE_BASEDIR%\aaa.tmp" test -s "%_ROSBE_BASEDIR%\aaa.tmp"

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2007