You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2009/08/13 19:21:38 UTC
svn commit: r803952 - in
/commons/sandbox/runtime/trunk/src/main/native/os/win32: shm.c wutil.c
Author: mturk
Date: Thu Aug 13 17:21:37 2009
New Revision: 803952
URL: http://svn.apache.org/viewvc?rev=803952&view=rev
Log:
Use shared:: instead pagefile: as prefix
Modified:
commons/sandbox/runtime/trunk/src/main/native/os/win32/shm.c
commons/sandbox/runtime/trunk/src/main/native/os/win32/wutil.c
Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/shm.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/shm.c?rev=803952&r1=803951&r2=803952&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/shm.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/shm.c Thu Aug 13 17:21:37 2009
@@ -136,10 +136,10 @@
hfile = INVALID_HANDLE_VALUE;
reskey = NULL;
}
- else if (_wcsnicmp(filename, L"PAGEFILE:", 9) == 0) {
+ else if (_wcsnicmp(filename, L"shared::", 8) == 0) {
/* Use pagefile instead real file */
hfile = INVALID_HANDLE_VALUE;
- reskey = res_name_from_filenamew(ACR_DT_SHM, keybuf, filename);
+ reskey = res_name_from_filenamew(ACR_DT_SHM, keybuf, filename + 8);
}
/* Name-based shared memory */
else {
@@ -178,6 +178,8 @@
rc = GetLastError();
if (hfile != INVALID_HANDLE_VALUE)
CloseHandle(hfile);
+ else
+ filename = NULL;
if (hmap && rc == ERROR_ALREADY_EXISTS) {
CloseHandle(hmap);
rc = ACR_EEXIST;
@@ -252,6 +254,8 @@
shm = ACR_Calloc(_E, THROW_FMARK, sizeof(acr_shm_t));
if (!shm)
return -1;
+ if (_wcsnicmp(filename, L"shared::", 8) == 0)
+ filename += 8;
res_name_from_filenamew(ACR_DT_SHM, reskey, filename);
hmap = OpenFileMappingW(FILE_MAP_READ | FILE_MAP_WRITE, FALSE, reskey);
if (!hmap) {
Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/wutil.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/wutil.c?rev=803952&r1=803951&r2=803952&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/wutil.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/wutil.c Thu Aug 13 17:21:37 2009
@@ -50,6 +50,7 @@
wcscpy(rname, L"Global\\");
wcscat(rname, dtnames[type]);
+
rc = GetFullPathNameW(fname, ACR_HBUFF_LEN, pname, NULL);
if (rc == 0 || rc > ACR_HBUFF_LEN)
ACR_SHA1EncodeW(fname, wcslen(fname), rname + 10);