aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii <[email protected]>2008-02-23 13:38:12 +0000
committerEli Zaretskii <[email protected]>2008-02-23 13:38:12 +0000
commit9d95a291825060fc7a7448ae1edf2fc322a1703b (patch)
tree662ca3819d9a3ed822f3c52ef2a826551f370a8f
parent2872062129ea4b0b33136a5b48c8c51dcd820311 (diff)
(globals_of_w32): Add initializations for g_b_init_get_sid_sub_authority and
g_b_init_get_sid_sub_authority_count.
-rw-r--r--src/ChangeLog6
-rw-r--r--src/w32.c14
2 files changed, 17 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 16ff26c18e..ac33e998cc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-23 Eli Zaretskii <[email protected]>
+
+ * w32.c (globals_of_w32): Add initializations for
+ g_b_init_get_sid_sub_authority and
+ g_b_init_get_sid_sub_authority_count.
+
2008-02-22 Stefan Monnier <[email protected]>
* font.c (font_match_xlfd, font_check_xlfd_parse): New funs.
diff --git a/src/w32.c b/src/w32.c
index 4873311e86..15ecda69f5 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -113,9 +113,15 @@ extern Lisp_Object Vw32_get_true_file_attributes;
extern int w32_num_mouse_buttons;
-/*
- Initialization states
- */
+/* Initialization states.
+
+ WARNING: If you add any more such variables for additional APIs,
+ you MUST add initialization for them to globals_of_w32
+ below. This is because these variables might get set
+ to non-NULL values during dumping, but the dumped Emacs
+ cannot reuse those values, because it could be run on a
+ different version of the OS, where API addresses are
+ different. */
static BOOL g_b_init_is_windows_9x;
static BOOL g_b_init_open_process_token;
static BOOL g_b_init_get_token_information;
@@ -4294,6 +4300,8 @@ globals_of_w32 ()
g_b_init_get_token_information = 0;
g_b_init_lookup_account_sid = 0;
g_b_init_get_sid_identifier_authority = 0;
+ g_b_init_get_sid_sub_authority = 0;
+ g_b_init_get_sid_sub_authority_count = 0;
/* The following sets a handler for shutdown notifications for
console apps. This actually applies to Emacs in both console and
GUI modes, since we had to fool windows into thinking emacs is a