[PATCH v2 2/2] winedbg: Replace magic number

[Alistair Leslie-Hughes]

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
---
 programs/winedbg/info.c       | 2 +-
 programs/winedbg/symbol.c     | 6 +++---
 programs/winedbg/tgt_module.c | 4 ++--
 programs/winedbg/winedbg.c    | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c
index 72c57a29b4..11c141314a 100644
--- a/programs/winedbg/info.c
+++ b/programs/winedbg/info.c
@@ -228,7 +228,7 @@ void info_win32_module(DWORD64 base)
     /* this is a wine specific options to return also ELF modules in the
      * enumeration
      */
-    SymSetOptions((opt = SymGetOptions()) | 0x40000000);
+    SymSetOptions((opt = SymGetOptions()) | SYMOPT_DISABLE_SRVSTAR_ON_STARTUP);
     SymEnumerateModules64(dbg_curr_process->handle, info_mod_cb, &im);
     SymSetOptions(opt);
 
diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c
index aa88ffcbc7..81fad51b64 100644
--- a/programs/winedbg/symbol.c
+++ b/programs/winedbg/symbol.c
@@ -394,7 +394,7 @@ enum sym_get_lval symbol_get_lvalue(const char* name, const int lineno,
     /* this is a wine specific options to return also ELF modules in the
      * enumeration
      */
-    SymSetOptions((opt = SymGetOptions()) | 0x40000000);
+    SymSetOptions((opt = SymGetOptions()) | SYMOPT_DISABLE_SRVSTAR_ON_STARTUP);
     SymEnumSymbols(dbg_curr_process->handle, 0, buffer, sgv_cb, (void*)&sgv);
 
     if (!sgv.num)
@@ -655,7 +655,7 @@ BOOL symbol_get_line(const char* filename, const char* name,
     /* this is a wine specific options to return also ELF modules in the
      * enumeration
      */
-    SymSetOptions((opt = SymGetOptions()) | 0x40000000);
+    SymSetOptions((opt = SymGetOptions()) | SYMOPT_DISABLE_SRVSTAR_ON_STARTUP);
     if (!SymEnumSymbols(dbg_curr_process->handle, 0, buffer, sgv_cb, (void*)&sgv))
     {
         SymSetOptions(opt);
@@ -808,7 +808,7 @@ void symbol_info(const char* str)
     /* this is a wine specific options to return also ELF modules in the
      * enumeration
      */
-    SymSetOptions((opt = SymGetOptions()) | 0x40000000);
+    SymSetOptions((opt = SymGetOptions()) | SYMOPT_DISABLE_SRVSTAR_ON_STARTUP);
     SymEnumSymbols(dbg_curr_process->handle, 0, buffer, symbols_info_cb, NULL);
     SymSetOptions(opt);
 }
diff --git a/programs/winedbg/tgt_module.c b/programs/winedbg/tgt_module.c
index 58c4282689..7230658e25 100644
--- a/programs/winedbg/tgt_module.c
+++ b/programs/winedbg/tgt_module.c
@@ -51,7 +51,7 @@ enum dbg_start tgt_module_load(const char* name, BOOL keep)
     unsigned len;
 
     SymSetOptions((opts & ~(SYMOPT_UNDNAME|SYMOPT_DEFERRED_LOADS)) |
-                  SYMOPT_LOAD_LINES | SYMOPT_AUTO_PUBLICS | 0x40000000);
+                  SYMOPT_LOAD_LINES | SYMOPT_AUTO_PUBLICS | SYMOPT_DISABLE_SRVSTAR_ON_STARTUP);
     if (!dbg_init(hDummy, NULL, FALSE))
         return start_error_init;
     len = MultiByteToWideChar(CP_ACP, 0, name, -1, NULL, 0);
@@ -76,7 +76,7 @@ enum dbg_start tgt_module_load(const char* name, BOOL keep)
     {
         dbg_printf("Non supported mode... errors may occur\n"
                    "Use at your own risks\n");
-        SymSetOptions(SymGetOptions() | 0x40000000);
+        SymSetOptions(SymGetOptions() | SYMOPT_DISABLE_SRVSTAR_ON_STARTUP);
         dbg_curr_process = dbg_add_process(&be_process_module_io, 1, hDummy);
         dbg_curr_pid = 1;
         dbg_curr_thread = dbg_add_thread(dbg_curr_process, 2, NULL, NULL);
diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c
index 5aeaa0d4a2..cb34684277 100644
--- a/programs/winedbg/winedbg.c
+++ b/programs/winedbg/winedbg.c
@@ -447,7 +447,7 @@ BOOL dbg_get_debuggee_info(HANDLE hProcess, IMAGEHLP_MODULE64* imh_mod)
     /* this is a wine specific options to return also ELF modules in the
      * enumeration
      */
-    SymSetOptions((opt = SymGetOptions()) | 0x40000000);
+    SymSetOptions((opt = SymGetOptions()) | SYMOPT_DISABLE_SRVSTAR_ON_STARTUP);
     SymEnumerateModules64(hProcess, mod_loader_cb, &mli);
     SymSetOptions(opt);
 
-- 
2.17.1