aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason Rumney2007-11-19 09:14:38 +0000
committerJason Rumney2007-11-19 09:14:38 +0000
commit5f42a7eba296b36aa62f9a6019928fd313020ec3 (patch)
tree4988be5614aa040845642fa1424137d89ceeff4a /src
parent1030a7b3f86fe3b4dbe4f6d30bd0dc7a8ccb33c8 (diff)
downloademacs-5f42a7eba296b36aa62f9a6019928fd313020ec3.tar.gz
emacs-5f42a7eba296b36aa62f9a6019928fd313020ec3.zip
(w32_init_bdf_font, w32_BDF_to_x_font): CreateFileMapping
returns NULL on failure.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/w32bdf.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0fb4f189fb9..5d3fdf4b9af 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12007-11-19 Jason Rumney <jasonr@gnu.org>
2
3 * w32bdf.c (w32_init_bdf_font, w32_BDF_to_x_font): CreateFileMapping
4 returns NULL on failure.
5
12007-11-16 Stefan Monnier <monnier@iro.umontreal.ca> 62007-11-16 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * search.c (Fset_match_data): Remove the `evaporate' feature. 8 * search.c (Fset_match_data): Remove the `evaporate' feature.
diff --git a/src/w32bdf.c b/src/w32bdf.c
index 80ef098d8de..4a12b1f0190 100644
--- a/src/w32bdf.c
+++ b/src/w32bdf.c
@@ -261,7 +261,7 @@ w32_init_bdf_font(char *filename)
261 error("Fail to open BDF file"); 261 error("Fail to open BDF file");
262 } 262 }
263 hfilemap = CreateFileMapping(hfile, NULL, PAGE_READONLY, 0, 0, NULL); 263 hfilemap = CreateFileMapping(hfile, NULL, PAGE_READONLY, 0, 0, NULL);
264 if (hfilemap == INVALID_HANDLE_VALUE) 264 if (!hfilemap)
265 { 265 {
266 CloseHandle(hfile); 266 CloseHandle(hfile);
267 error("Can't map font"); 267 error("Can't map font");
@@ -828,7 +828,7 @@ int w32_BDF_to_x_font (char *file, char* xstr, int len)
828 size = fileinfo.nFileSizeLow; 828 size = fileinfo.nFileSizeLow;
829 829
830 hfilemap = CreateFileMapping (hfile, NULL, PAGE_READONLY, 0, 0, NULL); 830 hfilemap = CreateFileMapping (hfile, NULL, PAGE_READONLY, 0, 0, NULL);
831 if (hfilemap == INVALID_HANDLE_VALUE) 831 if (!hfilemap)
832 { 832 {
833 CloseHandle (hfile); 833 CloseHandle (hfile);
834 return 0; 834 return 0;