authorgravatar for emekankurumeh@outlook.comemekoi <emekankurumeh@outlook.com> 2018-10-26 22:53:55-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-10-27 11:35:01-04:00
log395f3d946ad62eb881796044819194f649742a65
tree6a93edd21e3ec9257260c452d833e2ef7d644ba0
parent2b395d4ede2d8ef356c54e1c7c09da88c634be11

fixed mingw compilation

1 files changed, 5 insertions(+), 4 deletions(-)

src/windows_sdk.cpp+5-4
...@@ -181,8 +181,9 @@ com_done:;...@@ -181,8 +181,9 @@ com_done:;
181}181}
182182
183static ZigFindWindowsSdkError find_10_version(ZigWindowsSDKPrivate *priv) {183static ZigFindWindowsSdkError find_10_version(ZigWindowsSDKPrivate *priv) {
184 if (priv->base.path10_ptr == nullptr)184 if (priv->base.path10_ptr == nullptr) {
185 return ZigFindWindowsSdkErrorNone;185 return ZigFindWindowsSdkErrorNone;
186 }
186187
187 char reg_query[MAX_PATH] = { 0 };188 char reg_query[MAX_PATH] = { 0 };
188 int n = snprintf(reg_query, MAX_PATH, "%s\\%s.0\\Installed Options", ZIG_WINDOWS_KIT_REG_KEY, priv->base.version10_ptr);189 int n = snprintf(reg_query, MAX_PATH, "%s\\%s.0\\Installed Options", ZIG_WINDOWS_KIT_REG_KEY, priv->base.version10_ptr);
...@@ -198,7 +199,7 @@ static ZigFindWindowsSdkError find_10_version(ZigWindowsSDKPrivate *priv) {...@@ -198,7 +199,7 @@ static ZigFindWindowsSdkError find_10_version(ZigWindowsSDKPrivate *priv) {
198 return ZigFindWindowsSdkErrorNotFound;199 return ZigFindWindowsSdkErrorNotFound;
199 }200 }
200201
201 char *option_name = nullptr;202 const char *option_name = nullptr;
202 switch (native_arch) {203 switch (native_arch) {
203 case NativeArchArm:204 case NativeArchArm:
204 option_name = "OptionId.DesktopCPParm";205 option_name = "OptionId.DesktopCPParm";
...@@ -224,8 +225,9 @@ static ZigFindWindowsSdkError find_10_version(ZigWindowsSDKPrivate *priv) {...@@ -224,8 +225,9 @@ static ZigFindWindowsSdkError find_10_version(ZigWindowsSDKPrivate *priv) {
224}225}
225226
226static ZigFindWindowsSdkError find_81_version(ZigWindowsSDKPrivate *priv) {227static ZigFindWindowsSdkError find_81_version(ZigWindowsSDKPrivate *priv) {
227 if (priv->base.path81_ptr == nullptr)228 if (priv->base.path81_ptr == nullptr) {
228 return ZigFindWindowsSdkErrorNone;229 return ZigFindWindowsSdkErrorNone;
230 }
229231
230 char sdk_lib_dir[4096];232 char sdk_lib_dir[4096];
231 int n = snprintf(sdk_lib_dir, 4096, "%s\\Lib\\winv*", priv->base.path81_ptr);233 int n = snprintf(sdk_lib_dir, 4096, "%s\\Lib\\winv*", priv->base.path81_ptr);
...@@ -309,7 +311,6 @@ ZigFindWindowsSdkError zig_find_windows_sdk(struct ZigWindowsSDK **out_sdk) {...@@ -309,7 +311,6 @@ ZigFindWindowsSdkError zig_find_windows_sdk(struct ZigWindowsSDK **out_sdk) {
309 priv->base.version10_ptr = (const char*)calloc(tmp_buf_len, 1);311 priv->base.version10_ptr = (const char*)calloc(tmp_buf_len, 1);
310 rc = RegQueryValueEx(v10_key, "ProductVersion", NULL, NULL, (LPBYTE)priv->base.version10_ptr, &tmp_buf_len);312 rc = RegQueryValueEx(v10_key, "ProductVersion", NULL, NULL, (LPBYTE)priv->base.version10_ptr, &tmp_buf_len);
311 if (rc == ERROR_SUCCESS) {313 if (rc == ERROR_SUCCESS) {
312 size_t orig_len = priv->base.version10_len;
313 snprintf((char*)priv->base.version10_ptr, MAX_PATH, "%s.0", priv->base.version10_ptr);314 snprintf((char*)priv->base.version10_ptr, MAX_PATH, "%s.0", priv->base.version10_ptr);
314 priv->base.version10_len = tmp_buf_len - 1 + 2; // note(dimenus): Microsoft doesn't include the .0 in the ProductVersion key....315 priv->base.version10_len = tmp_buf_len - 1 + 2; // note(dimenus): Microsoft doesn't include the .0 in the ProductVersion key....
315 } else {316 } else {