win: Use RegOpenKeyExW() instead of RegOpenKeyEx() [crashpad/crashpad : main]

Ben Hamilton (Gerrit)

unread,

Mar 10, 2022, 5:34:17 PM3/10/22

to Mark Mentovai, Joshua Peraza, Bruce Dawson, crashp...@chromium.org

Attention is currently required from: Joshua Peraza.

View Change

2 comments:

Commit Message:
- Patch Set #1, Line 7: win: Use `RegOpenKeyExW()` instead of `RegOpenKeyEx()`
  Nothing interprets markdown here.
  Done
Patchset:
- Patch Set #1:
  LGTM if it's just these two others. […]
  Yep, looks like it's just these two.
  There's definitely two conflicting axes here:
  1) Chromium as an application always builds with `-DUNICODE`
  2) Crashpad is a shared library that supports non-Chromium applications for which it doesn't control the build environment
  This specific scenario is tricky because the very very large CI environment I'm integrating Crashpad into does *not* set `-DUNICODE` universally for Windows applications.
  Doing so for specific applications isn't impossible, but the CI team pushes back very hard against it, since it means the cache cannot be shared between apps with and without the preprocessor define.
  I'm asking around now to see if we can change it globally for our CI environment, but until then, it might make sense to have Crashpad for Windows configure its CI to build with and without `-DUNICODE`.

To view, visit change 3516538. To unsubscribe, or for help writing mail filters, visit settings.

Ben Hamilton (Gerrit)

unread,

Mar 10, 2022, 5:36:30 PM3/10/22

to Mark Mentovai, Joshua Peraza, Bruce Dawson, crashp...@chromium.org

Attention is currently required from: Joshua Peraza.

Patch set 2:Commit-Queue +2

View Change

To view, visit change 3516538. To unsubscribe, or for help writing mail filters, visit settings.

Mark Mentovai (Gerrit)

unread,

Mar 10, 2022, 5:36:34 PM3/10/22

to Ben Hamilton, Joshua Peraza, Bruce Dawson, crashp...@chromium.org

Attention is currently required from: Ben Hamilton, Joshua Peraza.

Patch set 2:Code-Review +1Commit-Queue +2

View Change

1 comment:

Patchset:
- Patch Set #2:
  Thanks. If it's just these few, it's fine.

To view, visit change 3516538. To unsubscribe, or for help writing mail filters, visit settings.

Mark Mentovai (Gerrit)

unread,

Mar 10, 2022, 5:38:25 PM3/10/22

to Ben Hamilton, Crashpad LUCI CQ, Joshua Peraza, Bruce Dawson, crashp...@chromium.org

Attention is currently required from: Ben Hamilton, Joshua Peraza.

Patch set 2:Commit-Queue +2

View Change

1 comment:

Patchset:
- Patch Set #2:
  Weird thing to tell me, luci-cv.

To view, visit change 3516538. To unsubscribe, or for help writing mail filters, visit settings.

Mark Mentovai (Gerrit)

unread,

Mar 10, 2022, 5:57:55 PM3/10/22

to Ben Hamilton, Justin Cohen, Crashpad LUCI CQ, Joshua Peraza, Bruce Dawson, crashp...@chromium.org

Attention is currently required from: Ben Hamilton, Joshua Peraza.

Patch set 2:Commit-Queue +2

View Change

1 comment:

Patchset:
- Patch Set #2:
  +Justin for iOS test failure.

To view, visit change 3516538. To unsubscribe, or for help writing mail filters, visit settings.

Justin Cohen (Gerrit)

unread,

Mar 10, 2022, 6:09:13 PM3/10/22

to Ben Hamilton, Crashpad LUCI CQ, Mark Mentovai, Joshua Peraza, Bruce Dawson, crashp...@chromium.org

Attention is currently required from: Ben Hamilton, Joshua Peraza.

View Change

1 comment:

Patchset:

- Patch Set #2:
  +Justin for iOS test failure.

- Yeah, investigating failures now, not sure what's up yet.

To view, visit change 3516538. To unsubscribe, or for help writing mail filters, visit settings.

Crashpad LUCI CQ (Gerrit)

unread,

Mar 10, 2022, 6:10:40 PM3/10/22

to Ben Hamilton, Justin Cohen, Mark Mentovai, Joshua Peraza, Bruce Dawson, crashp...@chromium.org

Crashpad LUCI CQ submitted this change.

View Change

Approvals:
  Mark Mentovai: Looks good to me; Commit

win: Use RegOpenKeyExW() instead of RegOpenKeyEx()

Similar to crrev.com/c/3516536, this CL fixes the Windows build
when the UNICODE preprocessor macro is not defined where
code passes Unicode string literals with L"..." to non-Unicode
APIs like RegOpenKeyEx().

This fixes the build by explicitly using RegOpenKeyExW() instead.

Change-Id: I14a827357b9cbd42452e0e5eb13a3430569559a5
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3516538
Reviewed-by: Mark Mentovai <ma...@chromium.org>
Commit-Queue: Mark Mentovai <ma...@chromium.org>
---
M snapshot/win/system_snapshot_win.cc
1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/snapshot/win/system_snapshot_win.cc b/snapshot/win/system_snapshot_win.cc
index 6fc6945..a19253f 100644
--- a/snapshot/win/system_snapshot_win.cc
+++ b/snapshot/win/system_snapshot_win.cc
@@ -158,11 +158,11 @@
   bool version_data_found = false;
   int os_version_build = 0;
   HKEY key;
-  if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
-                   L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion",
-                   0,
-                   KEY_QUERY_VALUE,
-                   &key) == ERROR_SUCCESS) {
+  if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+                    L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion",
+                    0,
+                    KEY_QUERY_VALUE,
+                    &key) == ERROR_SUCCESS) {
     ScopedRegistryKey scoped_key(key);
 
     // Read the four components of the version from the registry.
@@ -282,11 +282,11 @@
 #elif defined(ARCH_CPU_ARM64)
   HKEY key;
 
-  if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
-                   L"HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0",
-                   0,
-                   KEY_QUERY_VALUE,
-                   &key) != ERROR_SUCCESS) {
+  if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+                    L"HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0",
+                    0,
+                    KEY_QUERY_VALUE,
+                    &key) != ERROR_SUCCESS) {
     return std::string();
   }

To view, visit change 3516538. To unsubscribe, or for help writing mail filters, visit settings.

Reply all

Reply to author

Forward