some check with vs2019

Signed-off-by: SergeySlice <[email protected]>
CloverHackyColor · Aug 17, 2022 · 616dbbe · 616dbbe
1 parent d5a6928
commit 616dbbe
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/Include/Guid/AppleApfsInfo.h b/Include/Guid/AppleApfsInfo.h
@@ -130,7 +130,19 @@ For example, to store the build number 18A391:
  */
 typedef uint16_t cp_key_revision_t;
 typedef uint32_t crypto_flags_t;
+#if !defined(_MSC_VER)
+struct wrapped_meta_crypto_state {
+  uint16_t         major_version;
+  uint16_t          minor_version;
+  crypto_flags_t    cpflags;
+  cp_key_class_t    persistent_class;
+  cp_key_os_version_t key_os_version;
+  cp_key_revision_t   key_revision;
+  uint16_t            unused;
+} __attribute__((aligned(2), packed));
+#else
 
+# pragma pack(push,2)
 struct wrapped_meta_crypto_state {
     uint16_t         major_version;
     uint16_t          minor_version;
@@ -139,7 +151,9 @@ struct wrapped_meta_crypto_state {
     cp_key_os_version_t key_os_version;
     cp_key_revision_t   key_revision;
     uint16_t            unused;
-} __attribute__((aligned(2), packed));
+};
+#pragma pack(pop)
+#endif // !msc_ver
 typedef struct wrapped_meta_crypto_state wrapped_meta_crypto_state_t;
 
 #define APFS_MODIFIED_NAMELEN 32

diff --git a/cbuild.bat b/cbuild.bat
@@ -29,7 +29,8 @@ set MSG=
 set DEVSTAGE=
 set IASL_PREFIX=c:\ASL\
 
-set DEFAULT_CYGWIN_HOME=c:\cygwin
+set DEFAULT_CYGWIN_HOME=c:\cygwin 
+rem %WORKSPACE_TOOLS_PATH%\Bin\CYGWIN_NT-5.1-i686\
 rem set DEFAULT_PYTHONHOME=d:\Program File\Python38
 rem set DEFAULT_PYTHONPATH=d:\Program File\Python38\Lib
 rem set DEFAULT_PYTHON_FREEZER_PATH=%PYTHON_HOME%\Scripts
@@ -45,6 +46,8 @@ set DEFAULT_THREADNUMBER=%NUMBER_OF_PROCESSORS%
 set WIN_IASL_BIN=c:\ASL
 set WIN_ASL_BIN=c:\ASL
 
+rem set CYGWIN_HOME=%WORKSPACE_TOOLS_PATH%\Bin\CYGWIN_NT-5.1-i686\
+
 call:parseArguments %*
 if errorlevel 1 (
   set MSG=Unknown error
@@ -110,6 +113,7 @@ rem # initialize
   if ["%SHOW_USAGE%"] == ["1"] goto usage
 
   if not defined CYGWIN_HOME (
+    echo No cygwin_home....
     set CYGWIN_HOME=%DEFAULT_CYGWIN_HOME%
   )
  rem  if not defined PYTHONHOME (
@@ -155,6 +159,7 @@ rem # setup build
 
   rem # fix any parameters not set
   set "BASETOOLS_DIR=%WORKSPACE_TOOLS_PATH%\Bin\Win32"
+  set "CYGWIN_HOME=%WORKSPACE_TOOLS_PATH%\Bin\CYGWIN_NT-5.1-i686"
   if defined EDK_TOOLS_BIN (
     set "BASETOOLS_DIR=%EDK_TOOLS_BIN%"
   )