> > This series contains the latest patches to support Windows 10. > > Visual Studio 2015 with Win10 WDK is required to compile this code, > Current patches may be compiled and will work for Windows 10. > > To ease the process of the reviews, those patches are avilable on: > https://github.com/daynix/qxl-wddm-dod branch: gitlab_win10_v2 > > The patches were applied on the master branch of > https://gitlab.com/spice/qxl-wddm-dod > Hi Sameeh. I have some issues applying this patchset and also I saw lot of changes in the different patches trying to fix spaces/end of line. I wrote a small script (attached) to check line ending and got this result: $ ./mismatch.pl UNIX .gitignore UNIX LICENSE NONE README UNIX README.md DOS qxldod Package/qxldod Package.vcxproj DOS qxldod Package/qxldod Package.vcxproj.filters DOS qxldod.sln DOS qxldod/BaseObject.cpp DOS qxldod/BaseObject.h ?? qxldod/QxlDod.cpp DOS 4631 UNIX 26 ?? qxldod/QxlDod.h DOS 750 UNIX 1 DOS qxldod/buildAll.bat UNIX qxldod/callVisualStudio.bat UNIX qxldod/checkWin8Tools.bat DOS qxldod/clean.bat DOS qxldod/driver.cpp ?? qxldod/driver.h DOS 252 UNIX 1 UNIX qxldod/getVisualStudioCmdLine.vbs UNIX qxldod/include/barrier.h UNIX qxldod/include/end-packed.h UNIX qxldod/include/enums.h UNIX qxldod/include/ipc_ring.h UNIX qxldod/include/qxl_dev.h UNIX qxldod/include/qxl_windows.h UNIX qxldod/include/start-packed.h UNIX qxldod/include/stdint.h UNIX qxldod/include/types.h UNIX qxldod/mspace.c UNIX qxldod/mspace.h DOS qxldod/qxldod.inf DOS qxldod/qxldod.inx DOS qxldod/qxldod.rc ?? qxldod/qxldod.vcxproj DOS 338 UNIX 1 UNIX qxldod/qxldod.vcxproj.filters DOS qxldod/resource.h so some files have different line termination. Also they are not coherent (for instance some .bat are UNIX format while others DOS). I had to apply your patches with --ignore-space-change option but I think the final results is not the same you have. I would suggest: - we fix current master line ending converting to the most used EOL format, that is converting qxldod/QxlDod.cpp, qxldod/QxlDod.h, qxldod/driver.h and qxldod/qxldod.vcxproj to DOS format; - define which files should be DOS and which ones should be UNIX and add new files using that format. Is not clear why your patches do not apply cleanly, could be you have some settings for crlf like core.eol or core.safecrlf or perhaps it's just the the email program that send everything using unix format. In any case the diffs from the email (even looking at the sources) do not contains DOS line terminations. Frediano > Dmitry Fleytman (2): > Fixing framebuffer usage logic > Support future Qxl revisions > > Sameeh Jubran (16): > Upgrade to Windows 10 WDK > Add delete operator > Add debug print macro to dump debug print statements to kernel > debugger output > Add type enum to qxl/vga device > On power wake call the init functions before setting the vidpn to > black. Otherwise, BSOD. > Fix interrupt mask > Remove unused notify present display only interrupt > Add arbitrary resolution and monitors_config Escape > Rename mspace.c to mspace.cpp > Code Analysis clean up > Replacing tabs with spaces > Fixing Move rectangles implementation > Reserved must be set to 0 > Fixing monitor flicker on resolution change > Removing unnecessary call to BlackOutScreen > Fixing possible BSOD > > Sandy Stutsman (7): > Set DriverStarted flag at the begining of the StartDriver function > Fix Code Integrity error generated by the Drive Verifier > Use SrcPitch when calculating size of memory to map PresentDisplayOnly > Use the second bar (VRAM) for qxl command buffer. > Enable HW cursor support and fix handling of monochrome cursors. > Remove minimum size restrict for custom resolution. > Use frame buffer in VGA mode only > > Tools/vs_cmdline.vbs | 23 + > Tools/vs_run.bat | 26 + > buildAll.bat | 15 + > buildAll_NoSign.bat | 19 + > qxldod Package/qxldod Package.vcxproj | 173 +- > qxldod Package/qxldod Package.vcxproj.user | 15 + > qxldod.sln | 106 +- > qxldod/BaseObject.cpp | 11 + > qxldod/BaseObject.h | 1 + > qxldod/QxlDod.cpp | 1167 +++++++------ > qxldod/QxlDod.h | 44 +- > qxldod/buildAll.bat | 31 - > qxldod/callVisualStudio.bat | 28 - > qxldod/checkWin8Tools.bat | 8 - > qxldod/clean.bat | 12 - > qxldod/driver.cpp | 16 +- > qxldod/driver.h | 12 +- > qxldod/include/qxl_windows.h | 9 + > qxldod/mspace.c | 2437 > ---------------------------- > qxldod/mspace.cpp | 2437 > ++++++++++++++++++++++++++++ > qxldod/qxldod.vcxproj | 247 ++- > qxldod/qxldod.vcxproj.filters | 2 +- > qxldod/qxldod.vcxproj.user | 15 + > 23 files changed, 3498 insertions(+), 3356 deletions(-) > create mode 100644 Tools/vs_cmdline.vbs > create mode 100644 Tools/vs_run.bat > create mode 100644 buildAll.bat > create mode 100644 buildAll_NoSign.bat > create mode 100644 qxldod Package/qxldod Package.vcxproj.user > delete mode 100755 qxldod/buildAll.bat > delete mode 100755 qxldod/callVisualStudio.bat > delete mode 100755 qxldod/checkWin8Tools.bat > delete mode 100755 qxldod/clean.bat > delete mode 100755 qxldod/mspace.c > create mode 100755 qxldod/mspace.cpp > create mode 100644 qxldod/qxldod.vcxproj.user >
Attachment:
mismatch.pl
Description: Perl program
_______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/spice-devel