summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--winsup/cygwin/ChangeLog9
-rw-r--r--winsup/cygwin/pinfo.cc2
-rw-r--r--winsup/cygwin/shared.cc31
-rw-r--r--winsup/cygwin/shared_info.h8
4 files changed, 34 insertions, 16 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index c63b89fc1..59876c61a 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,14 @@
2009-01-26 Corinna Vinschen <corinna@vinschen.de>
+ * shared.cc (shared_name): New function for WCHAR names.
+ (open_shared): Take name parameter as WCHAR. Accommodate throughout.
+ * shared_info.h ((CURR_SHARED_MAGIC): Redefine.
+ (shared_name): Add declaration for function taking a WCHAR name.
+ (open_shared): Change declaration according to above change.
+ * pinfo.cc (pinfo::init) : Accommodate above change.
+
+2009-01-26 Corinna Vinschen <corinna@vinschen.de>
+
* grp.cc (getgrgid_r): Simplify code by using stpcpy.
(getgrnam_r): Ditto.
* passwd.cc (getpwuid_r32): Simplify code by using stpcpy.
diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc
index f5062b8d6..00e4db7ea 100644
--- a/winsup/cygwin/pinfo.cc
+++ b/winsup/cygwin/pinfo.cc
@@ -227,7 +227,7 @@ pinfo::init (pid_t n, DWORD flag, HANDLE h0)
else
mapsize = sizeof (_pinfo);
- procinfo = (_pinfo *) open_shared ("cygpid", n, h0, mapsize, shloc,
+ procinfo = (_pinfo *) open_shared (L"cygpid", n, h0, mapsize, shloc,
sec_attribs, access);
if (!h0)
{
diff --git a/winsup/cygwin/shared.cc b/winsup/cygwin/shared.cc
index 20e3821a7..20f61456f 100644
--- a/winsup/cygwin/shared.cc
+++ b/winsup/cygwin/shared.cc
@@ -100,6 +100,13 @@ shared_name (char *ret_buf, const char *str, int num)
return ret_buf;
}
+WCHAR * __stdcall
+shared_name (WCHAR *ret_buf, const WCHAR *str, int num)
+{
+ __small_swprintf (ret_buf, L"%W.%d", str, num);
+ return ret_buf;
+}
+
#define page_const (65535)
#define pround(n) (((size_t) (n) + page_const) & ~page_const)
@@ -121,7 +128,7 @@ static ptrdiff_t offsets[] =
#define off_addr(x) ((void *)((caddr_t) cygwin_hmodule + offsets[x]))
void * __stdcall
-open_shared (const char *name, int n, HANDLE& shared_h, DWORD size,
+open_shared (const WCHAR *name, int n, HANDLE& shared_h, DWORD size,
shared_locations& m, PSECURITY_ATTRIBUTES psa, DWORD access)
{
void *shared;
@@ -135,8 +142,8 @@ open_shared (const char *name, int n, HANDLE& shared_h, DWORD size,
VirtualFree (addr, 0, MEM_RELEASE);
}
- char map_buf[MAX_PATH];
- char *mapname = NULL;
+ WCHAR map_buf[MAX_PATH];
+ WCHAR *mapname = NULL;
if (shared_h)
m = SH_JUSTOPEN;
@@ -145,10 +152,10 @@ open_shared (const char *name, int n, HANDLE& shared_h, DWORD size,
if (name)
mapname = shared_name (map_buf, name, n);
if (m == SH_JUSTOPEN)
- shared_h = OpenFileMapping (access, FALSE, mapname);
+ shared_h = OpenFileMappingW (access, FALSE, mapname);
else
{
- shared_h = CreateFileMapping (INVALID_HANDLE_VALUE, psa,
+ shared_h = CreateFileMappingW (INVALID_HANDLE_VALUE, psa,
PAGE_READWRITE, 0, size, mapname);
if (GetLastError () == ERROR_ALREADY_EXISTS)
m = SH_JUSTOPEN;
@@ -156,7 +163,7 @@ open_shared (const char *name, int n, HANDLE& shared_h, DWORD size,
if (shared_h)
/* ok! */;
else if (m != SH_JUSTOPEN)
- api_fatal ("CreateFileMapping %s, %E. Terminating.", mapname);
+ api_fatal ("CreateFileMapping %W, %E. Terminating.", mapname);
else
return NULL;
}
@@ -170,13 +177,13 @@ open_shared (const char *name, int n, HANDLE& shared_h, DWORD size,
FILE_MAP_READ|FILE_MAP_WRITE,
0, 0, 0, NULL);
#ifdef DEBUGGING
- system_printf ("relocating shared object %s(%d) from %p to %p", name, n, addr, shared);
+ system_printf ("relocating shared object %W(%d) from %p to %p", name, n, addr, shared);
#endif
offsets[0] = 0;
}
if (!shared)
- api_fatal ("MapViewOfFileEx '%s'(%p), %E. Terminating.", mapname, shared_h);
+ api_fatal ("MapViewOfFileEx '%W'(%p), %E. Terminating.", mapname, shared_h);
if (m == SH_CYGWIN_SHARED && offsets[0])
{
@@ -192,7 +199,7 @@ open_shared (const char *name, int n, HANDLE& shared_h, DWORD size,
offsets[SH_TOTAL_SIZE] += delta;
}
- debug_printf ("name %s, n %d, shared %p (wanted %p), h %p", mapname, n, shared, addr, shared_h);
+ debug_printf ("name %W, n %d, shared %p (wanted %p), h %p", mapname, n, shared, addr, shared_h);
return shared;
}
@@ -229,7 +236,7 @@ user_shared_initialize ()
void
user_shared_create (bool reinit)
{
- char name[UNLEN + 1] = ""; /* Large enough for SID */
+ WCHAR name[UNLEN + 1] = L""; /* Large enough for SID */
if (reinit)
{
@@ -247,7 +254,7 @@ user_shared_create (bool reinit)
user_shared = (user_info *) open_shared (name, USER_VERSION,
cygwin_user_h, sizeof (user_info),
sh_user_shared, &sec_none);
- debug_printf ("opening user shared for '%s' at %p", name, user_shared);
+ debug_printf ("opening user shared for '%W' at %p", name, user_shared);
ProtectHandleINH (cygwin_user_h);
debug_printf ("user shared version %x", user_shared->version);
if (reinit)
@@ -368,7 +375,7 @@ memory_init ()
/* Initialize general shared memory */
shared_locations sh_cygwin_shared;
- cygwin_shared = (shared_info *) open_shared ("shared",
+ cygwin_shared = (shared_info *) open_shared (L"shared",
CYGWIN_VERSION_SHARED_DATA,
cygwin_shared_h,
sizeof (*cygwin_shared),
diff --git a/winsup/cygwin/shared_info.h b/winsup/cygwin/shared_info.h
index 668557ff7..e332829df 100644
--- a/winsup/cygwin/shared_info.h
+++ b/winsup/cygwin/shared_info.h
@@ -31,7 +31,7 @@ public:
#define SHARED_INFO_CB 39328
-#define CURR_SHARED_MAGIC 0x398d8baU
+#define CURR_SHARED_MAGIC 0x22f9ff0bU
#define USER_VERSION 1 // increment when mount table changes and
#define USER_VERSION_MAGIC CYGWIN_VERSION_MAGIC (USER_MAGIC, USER_VERSION)
@@ -98,8 +98,10 @@ struct console_state
HANDLE get_shared_parent_dir ();
HANDLE get_session_parent_dir ();
char *__stdcall shared_name (char *, const char *, int);
-void *__stdcall open_shared (const char *name, int n, HANDLE &shared_h, DWORD size,
- shared_locations&, PSECURITY_ATTRIBUTES psa = &sec_all,
+WCHAR *__stdcall shared_name (WCHAR *, const WCHAR *, int);
+void *__stdcall open_shared (const WCHAR *name, int n, HANDLE &shared_h,
+ DWORD size, shared_locations&,
+ PSECURITY_ATTRIBUTES psa = &sec_all,
DWORD access = FILE_MAP_READ | FILE_MAP_WRITE);
extern void user_shared_create (bool reinit);
extern void user_shared_initialize ();
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-30 18:14:36 +0000