Author: mturk
Date: Thu Jan 7 06:46:05 2010
New Revision: 896763
URL: http://svn.apache.org/viewvc?rev=896763&view=rev
Log:
Fix typos
Modified:
commons/sandbox/runtime/trunk/src/main/native/include/acr_args.h
commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h
commons/sandbox/runtime/trunk/src/main/native/os/win32/dhtml.c
commons/sandbox/runtime/trunk/src/main/native/os/win32/dtc.cpp
commons/sandbox/runtime/trunk/src/main/native/os/win32/pipe.c
commons/sandbox/runtime/trunk/src/main/native/os/win32/platform.c
Modified: commons/sandbox/runtime/trunk/src/main/native/include/acr_args.h
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/acr_args.h?rev=896763&r1=896762&r2=896763&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/acr_args.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/acr_args.h Thu Jan 7
06:46:05 2010
@@ -55,7 +55,7 @@
* Unicode version of ACR_StringToArgvA
*/
ACR_DECLARE(int) ACR_StringToArgvW(const wchar_t *cmdline,
- wchar_t ***argv)
+ wchar_t ***argv);
#endif
Modified:
commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h?rev=896763&r1=896762&r2=896763&view=diff
==============================================================================
---
commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h
(original)
+++
commons/sandbox/runtime/trunk/src/main/native/include/arch/windows/acr_arch.h
Thu Jan 7 06:46:05 2010
@@ -520,6 +520,7 @@
#define SIG_SETMASK 3
typedef volatile LONG sigset_t;
+typedef volatile LONG sigmask_t;
typedef union sigval {
/* Members as suggested by Annex C of POSIX 1003.1b. */
@@ -589,10 +590,10 @@
current |= *set;
break;
case SIG_UNBLOCK:
- current &= ~*mask;
+ current &= ~*set;
break;
case SIG_SETMASK:
- current = *mask;
+ current = *set;
break;
}
sigsetmask(current);
Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/dhtml.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/dhtml.c?rev=896763&r1=896762&r2=896763&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/dhtml.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/dhtml.c Thu Jan 7
06:46:05 2010
@@ -177,9 +177,9 @@
return FALSE;
pD.hParent = hParent;
pD.hHtmlDlg = hHtmlDlg;
- swprintf(pD.szOptions, ACR_SBUFF_SIZ,
- L"scroll: no; status: no; help: no; dialogHeight: %dpx;
dialogWidth: %dpx",
- dwHeight, dwWidth);
+ _snwprintf(pD.szOptions, ACR_SBUFF_SIZ,
+ L"scroll: no; status: no; help: no; dialogHeight: %dpx;
dialogWidth: %dpx",
+ dwHeight, dwWidth);
if (dwFlags == 1)
wcscat(pD.szOptions, L"; unadorned:yes");
if (szArguments)
Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/dtc.cpp
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/dtc.cpp?rev=896763&r1=896762&r2=896763&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/dtc.cpp (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/dtc.cpp Thu Jan 7
06:46:05 2010
@@ -25,6 +25,7 @@
#include "acr_tlsd.h"
#include "acr_vm.h"
+#if 0
#include <comdef.h>
#include <xolehlp.h>
#include <txdtc.h>
@@ -134,3 +135,4 @@
x_free(ts);
return NULL;
}
+#endif
Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/pipe.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/pipe.c?rev=896763&r1=896762&r2=896763&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/pipe.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/pipe.c Thu Jan 7
06:46:05 2010
@@ -225,30 +225,31 @@
sa.bInheritHandle = FALSE;
sa.lpSecurityDescriptor = NULL;
- hr = CreateNamedPipeW(name,
- dwOpenMode,
- dwPipeMode,
- 1,
- 0,
- 65536,
- 1,
- &sa);
- if (IS_INVALID_HANDLE(hr))
+ *rd = CreateNamedPipeW(name,
+ dwOpenMode,
+ dwPipeMode,
+ 1,
+ 0,
+ 65536,
+ 1,
+ &sa);
+ if (IS_INVALID_HANDLE(*rd))
return ACR_GET_OS_ERROR();
dwOpenMode = FILE_ATTRIBUTE_NORMAL;
if (flags == ACR_PIPE_READ_BLOCK ||
flags == ACR_PIPE_FULL_NONBLOCK)
dwOpenMode |= FILE_FLAG_OVERLAPPED;
- *er = CreateFileW(name,
+ *wr = CreateFileW(name,
GENERIC_WRITE,
0,
&sa,
OPEN_EXISTING,
dwOpenMode,
NULL);
- if (IS_INVALID_HANDLE(hw)) {
+ if (IS_INVALID_HANDLE(*wr)) {
rc = ACR_GET_OS_ERROR();
- CloseHandle(hr);
+ CloseHandle(*rd);
+ *rd = NULL;
return rc;
}
if (pname)
Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/platform.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/platform.c?rev=896763&r1=896762&r2=896763&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/platform.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/platform.c Thu Jan
7 06:46:05 2010
@@ -84,7 +84,7 @@
if (!acr_comspec) {
/* Hope the PATH is set correctly
*/
- acr_comspec = x_wcsdup("CMD.EXE");
+ acr_comspec = x_wcsdup(L"CMD.EXE");
}
return acr_ioh_init(ios);
}
