NATIVE_IMAGE_API="yes (w32)"
W32_OBJ="$W32_OBJ w32image.o"
fi
- W32_LIBS="$W32_LIBS -lwinmm -lusp10 -lgdi32 -lcomdlg32"
+ W32_LIBS="$W32_LIBS -lwinmm -lgdi32 -lcomdlg32"
W32_LIBS="$W32_LIBS -lmpr -lwinspool -lole32 -lcomctl32"
W32_RES_LINK="\$(EMACSRES)"
CLIENTRES="emacsclient.res"
the additional call here is harmless.) */
cache_system_info ();
#ifdef WINDOWSNT
+ /* This must be called to initialize w32_unicode_filenames and
+ is_windows_9x prior to w32_init_current_directory. */
+ globals_of_w32 ();
+
/* On Windows 9X, we have to load UNICOWS.DLL as early as possible,
to have non-stub implementations of APIs we need to convert file
names between UTF-8 and the system's ANSI codepage. */
}
}
#endif
-
emacs_wd = emacs_get_current_dir_name ();
#ifdef WINDOWSNT
initial_wd = emacs_wd;
-#endif
+#endif /* WINDOWSNT */
#ifdef HAVE_PDUMPER
if (dumped_with_pdumper_p ())
pdumper_record_wd (emacs_wd);
init_atimer ();
#ifdef WINDOWSNT
- globals_of_w32 ();
#ifdef HAVE_W32NOTIFY
globals_of_w32notify ();
#endif
pWideCharToMultiByte = (WideCharToMultiByte_Proc)
get_proc_addr (ret, "WideCharToMultiByte");
multiByteToWideCharFlags = MB_ERR_INVALID_CHARS;
+ load_unicows_dll_for_w32fns (ret);
return ret;
}
else
multiByteToWideCharFlags = 0;
else
multiByteToWideCharFlags = MB_ERR_INVALID_CHARS;
+ load_unicows_dll_for_w32fns (NULL);
return LoadLibrary ("Gdi32.dll");
}
}
extern void init_ntproc (int);
extern void term_ntproc (int);
extern HANDLE maybe_load_unicows_dll (void);
+extern void load_unicows_dll_for_w32fns (HMODULE);
extern void globals_of_w32 (void);
extern void term_timers (void);
}
#ifdef WINDOWSNT
+
/* The Windows keyboard hook callback. */
static LRESULT CALLBACK
funhook (int code, WPARAM w, LPARAM l)
can prevent this by setting the
w32-pass-[lr]window-to-system variable to
NIL. */
- if ((hs->vkCode == VK_LWIN && !NILP (Vw32_pass_lwindow_to_system)) ||
- (hs->vkCode == VK_RWIN && !NILP (Vw32_pass_rwindow_to_system)))
+ if ((hs->vkCode == VK_LWIN && !NILP (Vw32_pass_lwindow_to_system))
+ || (hs->vkCode == VK_RWIN && !NILP (Vw32_pass_rwindow_to_system)))
{
/* Not prevented - Simulate the keypress to the system. */
memset (inputs, 0, sizeof (inputs));
inputs[1].ki.dwFlags
= KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP;
inputs[1].ki.time = 0;
- SendInput (2, inputs, sizeof (INPUT));
}
else if (focus != NULL)
{
if (harfbuzz_available)
register_font_driver (&harfbuzz_font_driver, f);
#endif
- register_font_driver (&uniscribe_font_driver, f);
+ if (uniscribe_available)
+ register_font_driver (&uniscribe_font_driver, f);
register_font_driver (&w32font_driver, f);
gui_default_parameter (f, parameters, Qfont_backend, Qnil,
if (harfbuzz_available)
register_font_driver (&harfbuzz_font_driver, f);
#endif
- register_font_driver (&uniscribe_font_driver, f);
+ if (uniscribe_available)
+ register_font_driver (&uniscribe_font_driver, f);
register_font_driver (&w32font_driver, f);
gui_default_parameter (f, parms, Qfont_backend, Qnil,
\f
#ifdef WINDOWSNT
+static int (WINAPI *pfnSHFileOperationW) (LPSHFILEOPSTRUCTW);
+
/* Moving files to the system recycle bin.
Used by `move-file-to-trash' instead of the default moving to ~/.Trash */
DEFUN ("system-move-file-to-trash", Fsystem_move_file_to_trash,
Lisp_Object encoded_file;
Lisp_Object operation;
+ /* Required on Windows 9X. */
+ maybe_load_unicows_dll ();
+
operation = Qdelete_file;
if (!NILP (Ffile_directory_p (filename))
&& NILP (Ffile_symlink_p (filename)))
| FOF_NOERRORUI | FOF_NO_CONNECTED_ELEMENTS;
file_op_w.fAnyOperationsAborted = FALSE;
- result = SHFileOperationW (&file_op_w);
+ /* This is stated to exist on all versions of Windows NT Emacs
+ supports. */
+ eassert (pfnSHFileOperationW);
+ result = (*pfnSHFileOperationW) (&file_op_w);
}
else
{
return Qnil;
}
+#ifndef CYGWIN
+static BOOL (WINAPI *pfnShellExecuteExW) (LPSHELLEXECUTEINFOW);
+#endif /* !CYGWIN */
+
DEFUN ("w32-shell-execute", Fw32_shell_execute, Sw32_shell_execute, 2, 4, 0,
doc: /* Get Windows to perform OPERATION on DOCUMENT.
This is a wrapper around the ShellExecute system function, which
const int file_url_len = sizeof (file_url_str) - 1;
int doclen;
+ /* Required on Windows 9X. */
+ maybe_load_unicows_dll ();
+
if (strncmp (SSDATA (document), file_url_str, file_url_len) == 0)
{
/* Passing "file:///" URLs to ShellExecute causes shlwapi.dll to
doc_w = xmalloc (doclen * sizeof (wchar_t));
pMultiByteToWideChar (CP_UTF8, multiByteToWideCharFlags,
SSDATA (document), -1, doc_w, doclen);
- if (use_unicode)
+ if (use_unicode && pfnShellExecuteExW)
{
wchar_t current_dir_w[MAX_PATH];
SHELLEXECUTEINFOW shexinfo_w;
shexinfo_w.lpDirectory = current_dir_w;
shexinfo_w.nShow =
(FIXNUMP (show_flag) ? XFIXNUM (show_flag) : SW_SHOWDEFAULT);
- success = ShellExecuteExW (&shexinfo_w);
+ success = (*pfnShellExecuteExW) (&shexinfo_w);
xfree (doc_w);
}
else
menu_bar.cbSize = sizeof (menu_bar);
menu_bar.rcBar.right = menu_bar.rcBar.left = 0;
menu_bar.rcBar.top = menu_bar.rcBar.bottom = 0;
+
GetMenuBarInfo (FRAME_W32_WINDOW (f), 0xFFFFFFFD, 0, &menu_bar);
single_menu_bar_height = GetSystemMetrics (SM_CYMENU);
wrapped_menu_bar_height = GetSystemMetrics (SM_CYMENUSIZE);
#if defined WINDOWSNT && !defined HAVE_DBUS
+static BOOL (WINAPI *pfnShell_NotifyIconW) (DWORD, PNOTIFYICONDATAW);
+
/***********************************************************************
Tray notifications
***********************************************************************/
}
}
- if (!Shell_NotifyIconW (NIM_ADD, (PNOTIFYICONDATAW)&nidw))
+ if (!(*pfnShell_NotifyIconW) (NIM_ADD, (PNOTIFYICONDATAW)&nidw))
{
/* GetLastError returns meaningless results when
Shell_NotifyIcon fails. */
nidw.hWnd = FRAME_W32_WINDOW (f);
nidw.uID = id;
- if (!Shell_NotifyIconW (NIM_DELETE, (PNOTIFYICONDATAW)&nidw))
+ if (!(*pfnShell_NotifyIconW) (NIM_DELETE, (PNOTIFYICONDATAW)&nidw))
{
/* GetLastError returns meaningless results when
Shell_NotifyIcon fails. */
characters long, and will be truncated if it's longer.
Note that versions of Windows before W2K support only `:icon' and `:tip'.
-You can pass the other parameters, but they will be ignored on those
-old systems.
+You can pass the other parameters, but they will be ignored on
+those old systems.
There can be at most one active notification at any given time. An
active notification must be removed by calling `w32-notification-close'
enum NI_Severity severity;
unsigned timeout = 0;
- if (nargs == 0)
+ /* Required on Windows 9X. */
+ maybe_load_unicows_dll ();
+
+ if (nargs == 0 || !pfnShell_NotifyIconW)
return Qnil;
arg_plist = Flist (nargs, args);
{
struct frame *f = SELECTED_FRAME ();
- if (FIXNUMP (id))
+ if (FIXNUMP (id) && !pfnShell_NotifyIconW)
delete_tray_notification (f, XFIXNUM (id));
return Qnil;
get_proc_addr (wtsapi32_lib, "WTSRegisterSessionNotification");
WTSUnRegisterSessionNotification_fn = (WTSUnRegisterSessionNotification_Proc)
get_proc_addr (wtsapi32_lib, "WTSUnRegisterSessionNotification");
-#endif
+#endif /* WINDOWSNT */
/* Support OS dark mode on Windows 10 version 1809 and higher.
See `w32_applytheme' which uses appropriate APIs per version of Windows.
syms_of_w32uniscribe ();
}
+#ifdef WINDOWSNT
+
+/* Initialize pointers to functions whose real implementations exist in
+ UNICOWS.DLL on Windows 9X. UNICOWS should be a pointer to a loaded
+ handle referencing UNICOWS.DLL, or NULL on Windows NT systems. */
+
+void
+load_unicows_dll_for_w32fns (HMODULE unicows)
+{
+ if (!unicows)
+ /* The functions following are defined by SHELL32.DLL onw Windows
+ NT. */
+ unicows = GetModuleHandle ("shell32");
+
+ pfnSHFileOperationW
+ = (void *) get_proc_addr (unicows, "SHFileOperationW");
+ pfnShellExecuteExW
+ = (void *) get_proc_addr (unicows, "ShellExecuteExW");
+#ifndef HAVE_DBUS
+ pfnShell_NotifyIconW
+ = (void *) get_proc_addr (unicows, "Shell_NotifyIconW");
+#endif /* !HAVE_DBUS */
+}
+
+#endif /* WINDOWSNT */
+
#ifdef NTGUI_UNICODE
Lisp_Object
/* Used for communicating notifications to the main thread. */
struct notifications_set *notifications_set_head;
+/* Function pointers. */
+static BOOL (WINAPI *pfnReadDirectoryChangesW) (HANDLE, PVOID, DWORD, BOOL,
+ DWORD, PDWORD, LPOVERLAPPED,
+ LPOVERLAPPED_COMPLETION_ROUTINE);
static Lisp_Object watch_list;
/* Signal to the main thread that we have file notifications for it to
/* Calling ReadDirectoryChangesW quickly to watch again for new
notifications. */
- if (!ReadDirectoryChangesW (dirwatch->dir, dirwatch->buf,
- DIRWATCH_BUFFER_SIZE, dirwatch->subtree,
- dirwatch->filter, &_bytes, dirwatch->io_info,
- watch_completion))
+ if (!(*pfnReadDirectoryChangesW) (dirwatch->dir, dirwatch->buf,
+ DIRWATCH_BUFFER_SIZE, dirwatch->subtree,
+ dirwatch->filter, &_bytes,
+ dirwatch->io_info, watch_completion))
{
DebPrint (("ReadDirectoryChangesW error: %lu\n", GetLastError ()));
/* If this call fails, it means that the directory is not
/* If we were asked to terminate the thread, then fire the event. */
if (terminate)
- SetEvent(dirwatch->terminate);
+ SetEvent (dirwatch->terminate);
}
/* Worker routine for the watch thread. */
if (dirwatch->dir)
{
- bErr = ReadDirectoryChangesW (dirwatch->dir, dirwatch->buf,
- DIRWATCH_BUFFER_SIZE, dirwatch->subtree,
- dirwatch->filter, &_bytes,
- dirwatch->io_info, watch_completion);
+ bErr = (*pfnReadDirectoryChangesW) (dirwatch->dir, dirwatch->buf,
+ DIRWATCH_BUFFER_SIZE, dirwatch->subtree,
+ dirwatch->filter, &_bytes,
+ dirwatch->io_info, watch_completion);
if (!bErr)
{
DebPrint (("ReadDirectoryChangesW: %lu\n", GetLastError ()));
DebPrint (("QueueUserAPC failed (%lu)!\n", GetLastError ()));
/* We also signal the thread that it can terminate. */
- SetEvent(dirwatch->terminate);
+ SetEvent (dirwatch->terminate);
/* Wait for the thread to exit. FIXME: is there a better method
that is not overly complex? */
CloseHandle (dirwatch->thr);
dirwatch->thr = NULL;
}
- CloseHandle(dirwatch->terminate);
+ CloseHandle (dirwatch->terminate);
xfree (dirwatch->buf);
xfree (dirwatch->io_info);
xfree (dirwatch->watchee);
report_file_notify_error ("Watching filesystem events is not supported",
Qnil);
}
+ else
+ eassert (pfnReadDirectoryChangesW);
/* filenotify.el always passes us a directory, either the parent
directory of a file to be watched, or the directory to be
if (!NILP (watch_object))
{
watch_list = Fdelete (watch_object, watch_list);
- dirwatch = (struct notification *)xmint_pointer (watch_descriptor);
+ dirwatch = (struct notification *) xmint_pointer (watch_descriptor);
if (w32_valid_pointer_p (dirwatch, sizeof(struct notification)))
status = remove_watch (dirwatch);
}
if (!NILP (watch_object))
{
struct notification *dirwatch =
- (struct notification *)xmint_pointer (watch_descriptor);
+ (struct notification *) xmint_pointer (watch_descriptor);
if (w32_valid_pointer_p (dirwatch, sizeof(struct notification))
&& dirwatch->dir != NULL)
return Qt;
void
globals_of_w32notify (void)
{
+ HANDLE kernel32 = GetModuleHandle ("kernel32");
+
+ /* Initialize pointers to IO functions that provide file
+ notifications. In the event that these are absent, no harm will be
+ done, since their absence indicates that Emacs is running on
+ Windows 9X, where file notifications are unavailable at the
+ outset. */
+ pfnReadDirectoryChangesW
+ = (void *) get_proc_addr (kernel32, "ReadDirectoryChangesW");
+
watch_list = Qnil;
}
return (CONSP (list));
}
+\f
+/* Uniscribe function pointers. */
+static HRESULT (WINAPI * pfnScriptItemize) (const WCHAR *,
+ int,
+ int,
+ const SCRIPT_CONTROL *,
+ const SCRIPT_STATE *,
+ SCRIPT_ITEM *, int *);
+static HRESULT (WINAPI * pfnScriptShape) (HDC, SCRIPT_CACHE *,
+ const WCHAR *,
+ int, int, SCRIPT_ANALYSIS *,
+ WORD *, WORD *, SCRIPT_VISATTR *,
+ int *);
+static HRESULT (WINAPI * pfnScriptPlace) (HDC, SCRIPT_CACHE *,
+ const WORD *, int,
+ const SCRIPT_VISATTR *,
+ SCRIPT_ANALYSIS *,
+ int *, GOFFSET *, ABC *);
+static HRESULT (WINAPI * pfnScriptGetGlyphABCWidth) (HDC, SCRIPT_CACHE *,
+ WORD, ABC *);
+static HRESULT (WINAPI * pfnScriptFreeCache) (SCRIPT_CACHE *);
+static HRESULT (WINAPI * pfnScriptGetCMap) (HDC, SCRIPT_CACHE *,
+ const WCHAR *,
+ int, DWORD, WORD *);
+
\f
/* Font backend interface implementation. */
static Lisp_Object
else
#endif
if (uniscribe_font->cache)
- ScriptFreeCache ((SCRIPT_CACHE) &(uniscribe_font->cache));
+ (*pfnScriptFreeCache) ((SCRIPT_CACHE) &(uniscribe_font->cache));
uniscribe_font->cache = NULL;
max_items = 2;
items = xmalloc (sizeof (SCRIPT_ITEM) * max_items + 1);
- while ((result = ScriptItemize (chars, nchars, max_items, NULL, NULL,
- items, &nitems)) == E_OUTOFMEMORY)
+ while ((result = (*pfnScriptItemize) (chars, nchars, max_items, NULL, NULL,
+ items, &nitems)) == E_OUTOFMEMORY)
{
/* If that wasn't enough, keep trying with one more run. */
max_items++;
{
int nglyphs, nchars_in_run;
nchars_in_run = items[i+1].iCharPos - items[i].iCharPos;
- /* Force ScriptShape to generate glyphs in the same order as
+ /* Force (*pfnScriptShape) to generate glyphs in the same order as
they are in the input LGSTRING, which is in the logical
order. */
items[i].a.fLogicalOrder = 1;
/* Context may be NULL here, in which case the cache should be
used without needing to select the font. */
- result = ScriptShape (context, (SCRIPT_CACHE) &(uniscribe_font->cache),
- chars + items[i].iCharPos, nchars_in_run,
- max_glyphs - done_glyphs, &(items[i].a),
- glyphs, clusters, attributes, &nglyphs);
+ result
+ = (*pfnScriptShape) (context, (SCRIPT_CACHE) &(uniscribe_font->cache),
+ chars + items[i].iCharPos, nchars_in_run,
+ max_glyphs - done_glyphs, &(items[i].a),
+ glyphs, clusters, attributes, &nglyphs);
if (result == E_PENDING && !context)
{
context = get_frame_dc (f);
old_font = SelectObject (context, FONT_HANDLE (font));
- result = ScriptShape (context, (SCRIPT_CACHE) &(uniscribe_font->cache),
- chars + items[i].iCharPos, nchars_in_run,
- max_glyphs - done_glyphs, &(items[i].a),
- glyphs, clusters, attributes, &nglyphs);
+ result
+ = (*pfnScriptShape) (context,
+ (SCRIPT_CACHE) &(uniscribe_font->cache),
+ chars + items[i].iCharPos, nchars_in_run,
+ max_glyphs - done_glyphs, &(items[i].a),
+ glyphs, clusters, attributes, &nglyphs);
}
if (result == E_OUTOFMEMORY)
}
else
{
- result = ScriptPlace (context, (SCRIPT_CACHE) &(uniscribe_font->cache),
- glyphs, nglyphs, attributes, &(items[i].a),
- advances, offsets, &overall_metrics);
+ result
+ = (*pfnScriptPlace) (context,
+ (SCRIPT_CACHE) &(uniscribe_font->cache),
+ glyphs, nglyphs, attributes, &(items[i].a),
+ advances, offsets, &overall_metrics);
if (result == E_PENDING && !context)
{
/* Cache not complete... */
context = get_frame_dc (f);
old_font = SelectObject (context, FONT_HANDLE (font));
- result = ScriptPlace (context,
- (SCRIPT_CACHE) &(uniscribe_font->cache),
- glyphs, nglyphs, attributes, &(items[i].a),
- advances, offsets, &overall_metrics);
+ result
+ = (*pfnScriptPlace) (context,
+ (SCRIPT_CACHE) &(uniscribe_font->cache),
+ glyphs, nglyphs, attributes, &(items[i].a),
+ advances, offsets, &overall_metrics);
}
if (SUCCEEDED (result))
{
then updated for each successive glyph in the
grapheme cluster. */
/* FIXME: Should we use DIRECTION here instead
- of what ScriptItemize guessed? */
+ of what (*pfnScriptItemize) guessed? */
if (items[i].a.fRTL)
{
int j1 = j;
LGLYPH_SET_ASCENT (lglyph, font->ascent);
LGLYPH_SET_DESCENT (lglyph, font->descent);
- result = ScriptGetGlyphABCWidth
+ result = (*pfnScriptGetGlyphABCWidth)
(context, (SCRIPT_CACHE) &(uniscribe_font->cache),
glyphs[j], &char_metric);
if (result == E_PENDING && !context)
f = XFRAME (selected_frame);
context = get_frame_dc (f);
old_font = SelectObject (context, FONT_HANDLE (font));
- result = ScriptGetGlyphABCWidth
+ result = (*pfnScriptGetGlyphABCWidth)
(context, (SCRIPT_CACHE) &(uniscribe_font->cache),
glyphs[j], &char_metric);
}
convert surrogate pairs to glyph indexes correctly. */
{
items = (SCRIPT_ITEM *) alloca (sizeof (SCRIPT_ITEM) * 2 + 1);
- if (SUCCEEDED (ScriptItemize (ch, len, 2, NULL, NULL, items, &nitems)))
+ if (SUCCEEDED ((*pfnScriptItemize) (ch, len, 2, NULL, NULL, items,
+ &nitems)))
{
HRESULT result;
/* Surrogates seem to need 2 here, even though only one glyph is
SCRIPT_VISATTR attrs[2];
int nglyphs;
- /* Force ScriptShape to generate glyphs in the logical
+ /* Force (*pfnScriptShape) to generate glyphs in the logical
order. */
items[0].a.fLogicalOrder = 1;
- result = ScriptShape (context,
- (SCRIPT_CACHE) &(uniscribe_font->cache),
- ch, len, 2, &(items[0].a),
- glyphs, clusters, attrs, &nglyphs);
+ result = (*pfnScriptShape) (context,
+ (SCRIPT_CACHE) &(uniscribe_font->cache),
+ ch, len, 2, &(items[0].a),
+ glyphs, clusters, attrs, &nglyphs);
if (result == E_PENDING)
{
f = XFRAME (selected_frame);
context = get_frame_dc (f);
old_font = SelectObject (context, FONT_HANDLE (font));
- result = ScriptShape (context,
- (SCRIPT_CACHE) &(uniscribe_font->cache),
- ch, len, 2, &(items[0].a),
- glyphs, clusters, attrs, &nglyphs);
+ result
+ = (*pfnScriptShape) (context,
+ (SCRIPT_CACHE) &(uniscribe_font->cache),
+ ch, len, 2, &(items[0].a),
+ glyphs, clusters, attrs, &nglyphs);
}
if (SUCCEEDED (result) && nglyphs == 1)
when shaped. But we still need the return from here
to be valid for the shaping engine to be invoked
later. */
- result = ScriptGetCMap (context,
- (SCRIPT_CACHE) &(uniscribe_font->cache),
- ch, len, 0, glyphs);
+ result
+ = (*pfnScriptGetCMap) (context,
+ (SCRIPT_CACHE) &(uniscribe_font->cache),
+ ch, len, 0, glyphs);
if (SUCCEEDED (result) && glyphs[0])
code = glyphs[0];
}
no_support:
if (cache)
- ScriptFreeCache (&cache);
+ (*pfnScriptFreeCache) (&cache);
return ret;
}
if (!initialized)
return;
+#ifdef WINDOWSNT
/* Don't register if Uniscribe is not available. */
- HMODULE uniscribe = GetModuleHandle ("usp10");
+ HMODULE uniscribe = LoadLibrary ("usp10.dll");
if (!uniscribe)
return;
+ pfnScriptItemize = (void *) get_proc_addr (uniscribe, "ScriptItemize");
+ pfnScriptShape = (void *) get_proc_addr (uniscribe, "ScriptShape");
+ pfnScriptPlace = (void *) get_proc_addr (uniscribe, "ScriptPlace");
+ pfnScriptGetGlyphABCWidth
+ = (void *) get_proc_addr (uniscribe, "ScriptGetGlyphABCWidth");
+ pfnScriptFreeCache
+ = (void *) get_proc_addr (uniscribe, "ScriptFreeCache");
+ pfnScriptGetCMap
+ = (void *) get_proc_addr (uniscribe, "ScriptGetCMap");
+ if (!pfnScriptItemize || !pfnScriptShape || !pfnScriptPlace
+ || !pfnScriptGetGlyphABCWidth || !pfnScriptFreeCache
+ || !pfnScriptGetCMap)
+ {
+ FreeLibrary (uniscribe);
+ return;
+ }
+#else /* Cygwin */
+ pfnScriptItemize = &ScriptItemize;
+ pfnScriptShape = &ScriptShape;
+ pfnScriptPlace = &ScriptPlace;
+ pfnScriptGetGlyphABCWidth = &ScriptGetGlyphABCWidth;
+ pfnScriptFreeCache = &ScriptFreeCache;
+ pfnScriptGetCMap = &ScriptGetCMap;
+#endif /* Cygwin */
+
uniscribe_available = 1;
register_font_driver (&uniscribe_font_driver, NULL);
projects / emacs.git / commitdiff