diff --git a/builds/posix/Makefile.in.client.util b/builds/posix/Makefile.in.client.util
index 1d04773f1a..89b2287ccb 100644
--- a/builds/posix/Makefile.in.client.util
+++ b/builds/posix/Makefile.in.client.util
@@ -27,7 +27,7 @@
# Contributor(s):
#
#
-# $Id: Makefile.in.client.util,v 1.9 2003-03-31 10:29:14 aafemt Exp $
+# $Id: Makefile.in.client.util,v 1.10 2003-07-14 23:21:39 brodsom Exp $
#
ROOT=..
ObjModuleName=client.util
@@ -66,7 +66,7 @@ FBGUARD_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(FBGUARD_Sour
IBGUARD_A_Files = cntl_guard.cpp iscguard.cpp
IBGUARD_A_Sources = $(addprefix iscguard/, $(IBGUARD_A_Files))
IBGUARD_A_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(IBGUARD_A_Sources))))
-IBGUARD_B_Files = chop.cpp
+IBGUARD_B_Files = os/win32/chop.cpp
IBGUARD_B_Sources = $(addprefix remote/, $(IBGUARD_B_Files))
IBGUARD_B_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(IBGUARD_B_Sources))))
diff --git a/builds/posix/make.shared.targets b/builds/posix/make.shared.targets
index b74cd9eb5c..cfa402c325 100644
--- a/builds/posix/make.shared.targets
+++ b/builds/posix/make.shared.targets
@@ -27,7 +27,7 @@
# Contributor(s):
#
#
-# $Id: make.shared.targets,v 1.14 2003-07-11 02:23:58 brodsom Exp $
+# $Id: make.shared.targets,v 1.15 2003-07-14 23:21:39 brodsom Exp $
#
@@ -93,12 +93,12 @@ $(BLRTABLE): $(BLRTABLE_Objects)
# Adding resources as prerequisite for some files
$(FilesToAddVersionInfo): $(GEN_ROOT)/jrd/version.res
-$(FilesToAddDialog): $(GEN_ROOT)/remote/window.res
+$(FilesToAddDialog): $(GEN_ROOT)/remote/os/win32/window.res
# Explicit dependence of resource script
-$(GEN_ROOT)/remote/window.res: $(SRC_ROOT)/remote/window.rc $(SRC_ROOT)/remote/window.rh \
- $(SRC_ROOT)/jrd/version.rc $(SRC_ROOT)/jrd/build_no.h $(SRC_ROOT)/remote/property.rc \
- $(SRC_ROOT)/remote/property.rh $(SRC_ROOT)/remote/ibconfig.rc
+$(GEN_ROOT)/remote/os/win32/window.res: $(SRC_ROOT)/remote/os/win32/window.rc $(SRC_ROOT)/remote/os/win32/window.rh \
+ $(SRC_ROOT)/jrd/version.rc $(SRC_ROOT)/jrd/build_no.h $(SRC_ROOT)/remote/os/win32/property.rc \
+ $(SRC_ROOT)/remote/os/win32/property.rh $(SRC_ROOT)/remote/os/win32/ibconfig.rc
.PHONY: clean FORCE
diff --git a/builds/posix/make.shared.variables b/builds/posix/make.shared.variables
index 8a058a243f..4682ebcfc0 100644
--- a/builds/posix/make.shared.variables
+++ b/builds/posix/make.shared.variables
@@ -99,7 +99,7 @@ REMOTE_ClientFiles = allr.cpp inet.cpp interface.cpp merge.cpp \
parser.cpp protocol.cpp remote.cpp xdr.cpp
ifeq ($(PLATFORM),win32)
-REMOTE_ClientFiles += wnet.cpp xnet.cpp
+REMOTE_ClientFiles += os/win32/wnet.cpp xnet.cpp
endif
INTERFACE_Files= $(REMOTE_ClientFiles)
diff --git a/builds/posix/prefix.mingw b/builds/posix/prefix.mingw
index 95ecb46179..a5f979eab0 100644
--- a/builds/posix/prefix.mingw
+++ b/builds/posix/prefix.mingw
@@ -25,7 +25,7 @@ JRDBOOT_Extra_Files=isc_sync.cpp thd.cpp
OS_SPECIFIC_Files=thd_priority.cpp
-OS_ServerFiles=srvr_w32 window.cpp chop.cpp property.cpp ibconfig.cpp cntl.cpp
+OS_ServerFiles= os/win32/srvr_w32 os/win32/window.cpp os/win32/chop.cpp os/win32/property.cpp os/win32/ibconfig.cpp os/win32/cntl.cpp
LIB_LINK_OPTIONS:=-shared -Wl,--add-stdcall-alias
LIB_LINK_RPATH:=-Wl,-rpath,
diff --git a/builds/win32/msvc6/fb_inet_server.dsp b/builds/win32/msvc6/fb_inet_server.dsp
index 7f18c098e3..c285e67c49 100644
--- a/builds/win32/msvc6/fb_inet_server.dsp
+++ b/builds/win32/msvc6/fb_inet_server.dsp
@@ -109,15 +109,15 @@ SOURCE=..\..\..\src\utilities\ppg.cpp
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# Begin Source File
-SOURCE=..\..\..\src\remote\caution.ico
+SOURCE=..\..\..\src\remote\os\win32\caution.ico
# End Source File
# Begin Source File
-SOURCE=..\..\..\src\remote\server.ico
+SOURCE=..\..\..\src\remote\os\win32\server.ico
# End Source File
# Begin Source File
-SOURCE=..\..\..\src\remote\window.rc
+SOURCE=..\..\..\src\remote\os\win32\window.rc
# End Source File
# End Group
# End Target
diff --git a/builds/win32/msvc6/fbclient.dsp b/builds/win32/msvc6/fbclient.dsp
index e719e12c71..994c4512f4 100644
--- a/builds/win32/msvc6/fbclient.dsp
+++ b/builds/win32/msvc6/fbclient.dsp
@@ -272,7 +272,7 @@ SOURCE=..\..\..\src\remote\remote.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\src\remote\wnet.cpp
+SOURCE=..\..\..\src\remote\os\win32\wnet.cpp
# End Source File
# Begin Source File
diff --git a/builds/win32/msvc6/fbclient_static.dsp b/builds/win32/msvc6/fbclient_static.dsp
index af66724dba..d20a54b177 100644
--- a/builds/win32/msvc6/fbclient_static.dsp
+++ b/builds/win32/msvc6/fbclient_static.dsp
@@ -205,7 +205,7 @@ SOURCE=..\..\..\src\remote\remote.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\src\remote\wnet.cpp
+SOURCE=..\..\..\src\remote\os\win32\wnet.cpp
# End Source File
# Begin Source File
diff --git a/builds/win32/msvc6/fbembed.dsp b/builds/win32/msvc6/fbembed.dsp
index 7ade2d82c7..69ec885b6d 100644
--- a/builds/win32/msvc6/fbembed.dsp
+++ b/builds/win32/msvc6/fbembed.dsp
@@ -229,7 +229,7 @@ SOURCE=..\..\..\src\remote\remote.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\src\remote\wnet.cpp
+SOURCE=..\..\..\src\remote\os\win32\wnet.cpp
!IF "$(CFG)" == "fbembed - Win32 Release"
diff --git a/builds/win32/msvc6/fbguard.dsp b/builds/win32/msvc6/fbguard.dsp
index b90efb34b4..9c5a775b43 100644
--- a/builds/win32/msvc6/fbguard.dsp
+++ b/builds/win32/msvc6/fbguard.dsp
@@ -109,7 +109,7 @@ SOURCE=..\..\..\src\iscguard\iscguard.cpp
# PROP Default_Filter ""
# Begin Source File
-SOURCE=..\..\..\src\remote\chop.cpp
+SOURCE=..\..\..\src\remote\os\win32\chop.cpp
# End Source File
# End Group
# Begin Group "Header files"
diff --git a/builds/win32/msvc6/fbserver.dsp b/builds/win32/msvc6/fbserver.dsp
index da3d6bfa41..7b8ca62c72 100644
--- a/builds/win32/msvc6/fbserver.dsp
+++ b/builds/win32/msvc6/fbserver.dsp
@@ -109,15 +109,15 @@ SOURCE=..\..\..\src\utilities\ppg.cpp
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# Begin Source File
-SOURCE=..\..\..\src\remote\caution.ico
+SOURCE=..\..\..\src\remote\os\win32\caution.ico
# End Source File
# Begin Source File
-SOURCE=..\..\..\src\remote\server.ico
+SOURCE=..\..\..\src\remote\os\win32\server.ico
# End Source File
# Begin Source File
-SOURCE=..\..\..\src\remote\window.rc
+SOURCE=..\..\..\src\remote\os\win32\window.rc
# End Source File
# End Group
# End Target
diff --git a/builds/win32/msvc6/remote.dsp b/builds/win32/msvc6/remote.dsp
index 9101c53001..89eb852bbb 100644
--- a/builds/win32/msvc6/remote.dsp
+++ b/builds/win32/msvc6/remote.dsp
@@ -90,15 +90,15 @@ SOURCE=..\..\..\src\remote\allr.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\src\remote\chop.cpp
+SOURCE=..\..\..\src\remote\os\win32\chop.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\src\remote\cntl.cpp
+SOURCE=..\..\..\src\remote\os\win32\cntl.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\src\remote\ibconfig.cpp
+SOURCE=..\..\..\src\remote\os\win32\ibconfig.cpp
# End Source File
# Begin Source File
@@ -118,7 +118,7 @@ SOURCE=..\..\..\src\remote\parser.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\src\remote\property.cpp
+SOURCE=..\..\..\src\remote\os\win32\property.cpp
# End Source File
# Begin Source File
@@ -134,15 +134,15 @@ SOURCE=..\..\..\src\remote\server.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\src\remote\srvr_w32.cpp
+SOURCE=..\..\..\src\remote\os\win32\srvr_w32.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\src\remote\window.cpp
+SOURCE=..\..\..\src\remote\os\win32\window.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\src\remote\wnet.cpp
+SOURCE=..\..\..\src\remote\os\win32\wnet.cpp
# End Source File
# Begin Source File
@@ -190,7 +190,7 @@ SOURCE=..\..\..\src\remote\spxnet32_proto.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\src\remote\wnet_proto.h
+SOURCE=..\..\..\src\remote\os\win32\wnet_proto.h
# End Source File
# Begin Source File
diff --git a/builds/win32/msvc6/remote_classic.dsp b/builds/win32/msvc6/remote_classic.dsp
index ca75f84d32..1e18582b55 100644
--- a/builds/win32/msvc6/remote_classic.dsp
+++ b/builds/win32/msvc6/remote_classic.dsp
@@ -90,15 +90,15 @@ SOURCE=..\..\..\src\remote\allr.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\src\remote\chop.cpp
+SOURCE=..\..\..\src\remote\os\win32\chop.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\src\remote\cntl.cpp
+SOURCE=..\..\..\src\remote\os\win32\cntl.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\src\remote\ibconfig.cpp
+SOURCE=..\..\..\src\remote\os\win32\ibconfig.cpp
# End Source File
# Begin Source File
@@ -118,7 +118,7 @@ SOURCE=..\..\..\src\remote\parser.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\src\remote\property.cpp
+SOURCE=..\..\..\src\remote\os\win32\property.cpp
# End Source File
# Begin Source File
@@ -134,15 +134,15 @@ SOURCE=..\..\..\src\remote\server.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\src\remote\srvr_w32.cpp
+SOURCE=..\..\..\src\remote\os\win32\srvr_w32.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\src\remote\window.cpp
+SOURCE=..\..\..\src\remote\os\win32\window.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\src\remote\wnet.cpp
+SOURCE=..\..\..\src\remote\os\win32\wnet.cpp
# End Source File
# Begin Source File
@@ -186,7 +186,7 @@ SOURCE=..\..\..\src\remote\spxnet32_proto.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\src\remote\wnet_proto.h
+SOURCE=..\..\..\src\remote\os\win32\wnet_proto.h
# End Source File
# Begin Source File
diff --git a/builds/win32/msvc7/fb_inet_server.vcproj b/builds/win32/msvc7/fb_inet_server.vcproj
index 1652770529..f718eff101 100644
--- a/builds/win32/msvc7/fb_inet_server.vcproj
+++ b/builds/win32/msvc7/fb_inet_server.vcproj
@@ -148,13 +148,13 @@
Name="Resource files"
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+ RelativePath="..\..\..\src\remote\os\win32\caution.ico">
+ RelativePath="..\..\..\src\remote\os\win32\server.ico">
+ RelativePath="..\..\..\src\remote\os\win32\window.rc">
+ RelativePath="..\..\..\src\remote\os\win32\wnet.cpp">
diff --git a/builds/win32/msvc7/fbclient_static.vcproj b/builds/win32/msvc7/fbclient_static.vcproj
index a91003d8b9..1e5e937aed 100644
--- a/builds/win32/msvc7/fbclient_static.vcproj
+++ b/builds/win32/msvc7/fbclient_static.vcproj
@@ -210,7 +210,7 @@
RelativePath="..\..\..\src\remote\remote.cpp">
+ RelativePath="..\..\..\src\remote\os\win32\wnet.cpp">
diff --git a/builds/win32/msvc7/fbembed.vcproj b/builds/win32/msvc7/fbembed.vcproj
index 2851e60497..a7f871cea7 100644
--- a/builds/win32/msvc7/fbembed.vcproj
+++ b/builds/win32/msvc7/fbembed.vcproj
@@ -262,7 +262,7 @@
+ RelativePath="..\..\..\src\remote\os\win32\wnet.cpp">
+ RelativePath="..\..\..\src\remote\os\win32\caution.ico">
+ RelativePath="..\..\..\src\remote\os\win32\server.ico">
+ RelativePath="..\..\..\src\remote\os\win32\window.rc">
+ RelativePath="..\..\..\src\remote\os\win32\chop.cpp">
+ RelativePath="..\..\..\src\remote\os\win32\cntl.cpp">
+ RelativePath="..\..\..\src\remote\os\win32\ibconfig.cpp">
@@ -133,7 +133,7 @@
RelativePath="..\..\..\src\remote\parser.cpp">
+ RelativePath="..\..\..\src\remote\os\win32\property.cpp">
@@ -145,13 +145,13 @@
RelativePath="..\..\..\src\remote\server.cpp">
+ RelativePath="..\..\..\src\remote\os\win32\srvr_w32.cpp">
+ RelativePath="..\..\..\src\remote\os\win32\window.cpp">
+ RelativePath="..\..\..\src\remote\os\win32\wnet.cpp">
@@ -188,7 +188,7 @@
RelativePath="..\..\..\src\remote\spxnet32_proto.h">
+ RelativePath="..\..\..\src\remote\os\win32\wnet_proto.h">
diff --git a/builds/win32/msvc7/remote_classic.vcproj b/builds/win32/msvc7/remote_classic.vcproj
index 0b8a78e3e0..4ee5a1a911 100644
--- a/builds/win32/msvc7/remote_classic.vcproj
+++ b/builds/win32/msvc7/remote_classic.vcproj
@@ -112,13 +112,13 @@
RelativePath="..\..\..\src\remote\allr.cpp">
+ RelativePath="..\..\..\src\remote\os\win32\chop.cpp">
+ RelativePath="..\..\..\src\remote\os\win32\cntl.cpp">
+ RelativePath="..\..\..\src\remote\os\win32\ibconfig.cpp">
@@ -133,7 +133,7 @@
RelativePath="..\..\..\src\remote\parser.cpp">
+ RelativePath="..\..\..\src\remote\os\win32\property.cpp">
@@ -145,13 +145,13 @@
RelativePath="..\..\..\src\remote\server.cpp">
+ RelativePath="..\..\..\src\remote\os\win32\srvr_w32.cpp">
+ RelativePath="..\..\..\src\remote\os\win32\window.cpp">
+ RelativePath="..\..\..\src\remote\os\win32\wnet.cpp">
@@ -185,7 +185,7 @@
RelativePath="..\..\..\src\remote\spxnet32_proto.h">
+ RelativePath="..\..\..\src\remote\os\win32\wnet_proto.h">
diff --git a/configure.in b/configure.in
index 9395ffb7ee..e6b7ae6e12 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.147 2003-07-14 09:45:18 brodsom Exp $
+dnl $Id: configure.in,v 1.148 2003-07-14 23:20:24 brodsom Exp $
dnl ############################# INITIALISATION ###############################
@@ -544,7 +544,7 @@ mkdir -p gen/utilities
mkdir -p gen/examples
dnl # some .o and .d in this directory (to be removed)
-mkdir -p gen/remote
+mkdir -p gen/remote/os/win32
dnl # databases and output
mkdir -p gen/refDatabases
@@ -574,7 +574,7 @@ mkdir -p temp/libfbserver/jrd
mkdir -p temp/libfbserver/dsql
mkdir -p temp/libfbserver/lock
mkdir -p temp/libfbserver/misc
-mkdir -p temp/libfbserver/remote
+mkdir -p temp/libfbserver/remote/os/win32
mkdir -p temp/libfbserver/pipe
mkdir -p temp/libfbserver/gpre
mkdir -p temp/libfbserver/alice
@@ -586,12 +586,12 @@ mkdir -p temp/libfbserver/common/classes
mkdir -p temp/libfbserver/common/config
mkdir -p temp/libfbserver/jrd/os/posix
mkdir -p temp/libfbserver/jrd/os/win32
-mkdir -p temp/fbserver/remote
+mkdir -p temp/fbserver/remote/os/win32
mkdir -p temp/fbserver/ipserver
mkdir -p temp/libfbclient/jrd
mkdir -p temp/libfbclient/dsql
mkdir -p temp/libfbclient/gpre
-mkdir -p temp/libfbclient/remote
+mkdir -p temp/libfbclient/remote/os/win32
mkdir -p temp/libfbclient/utilities
mkdir -p temp/libfbclient/common/classes
mkdir -p temp/libfbclient/common/config
@@ -604,7 +604,7 @@ mkdir -p temp/client.gdef/dudley
mkdir -p temp/client.isql/isql
mkdir -p temp/client.util/utilities
mkdir -p temp/client.util/iscguard
-mkdir -p temp/client.util/remote
+mkdir -p temp/client.util/remote/os/win32
mkdir -p temp/client.util/jrd/os/win32
mkdir -p temp/intl/intl
@@ -622,7 +622,7 @@ mkdir -p temp/libfbstatic/jrd
mkdir -p temp/libfbstatic/dsql
mkdir -p temp/libfbstatic/lock
mkdir -p temp/libfbstatic/misc
-mkdir -p temp/libfbstatic/remote
+mkdir -p temp/libfbstatic/remote/os/win32
mkdir -p temp/libfbstatic/gpre
mkdir -p temp/libfbstatic/jrd/os/posix
mkdir -p temp/libfbstatic/jrd/os/darwin
@@ -638,7 +638,7 @@ mkdir -p temp/embed.isql/isql
mkdir -p temp/embed.gdef/dudley
mkdir -p temp/embed.qli/qli
mkdir -p temp/embed.gpre/gpre
-mkdir -p temp/inet_server/remote
+mkdir -p temp/inet_server/remote/os/win32
mkdir -p temp/inet_server/ipserver
mkdir -p temp/msgs/msgs
mkdir -p temp/extlib/extlib
@@ -649,7 +649,7 @@ mkdir -p temp/libfbembed/jrd
mkdir -p temp/libfbembed/dsql
mkdir -p temp/libfbembed/lock
mkdir -p temp/libfbembed/misc
-mkdir -p temp/libfbembed/remote
+mkdir -p temp/libfbembed/remote/os/win32
mkdir -p temp/libfbembed/pipe
mkdir -p temp/libfbembed/gpre
mkdir -p temp/libfbembed/alice
diff --git a/src/ipserver/ipclient.cpp b/src/ipserver/ipclient.cpp
index 4e9403ee67..3695a86fb5 100644
--- a/src/ipserver/ipclient.cpp
+++ b/src/ipserver/ipclient.cpp
@@ -48,7 +48,7 @@
#include "../jrd/isc_proto.h"
#include "../jrd/isc_f_proto.h"
#include "../jrd/sch_proto.h"
-#include "../remote/window.h"
+#include "../remote/os/win32/window.h"
#include "../common/config/config.h"
#define NO_PORT
#include "../remote/xnet_proto.h"
diff --git a/src/iscguard/iscguard.cpp b/src/iscguard/iscguard.cpp
index 1fc8071f68..5f8c7cdc29 100644
--- a/src/iscguard/iscguard.cpp
+++ b/src/iscguard/iscguard.cpp
@@ -38,8 +38,8 @@
#include "../iscguard/iscguard.h"
#include "../iscguard/cntlg_proto.h"
#include "../utilities/install_nt.h"
-#include "../remote/window.h"
-#include "../remote/chop_proto.h"
+#include "../remote/os/win32/window.h"
+#include "../remote/os/win32/chop_proto.h"
#include "../common/config/config.h"
#ifdef WIN_NT
diff --git a/src/remote/interface.cpp b/src/remote/interface.cpp
index 87c127e85c..88848af47d 100644
--- a/src/remote/interface.cpp
+++ b/src/remote/interface.cpp
@@ -71,7 +71,7 @@
#if defined(WIN_NT)
#define XNET
#include "../jrd/isc_proto.h"
-#include "../remote/wnet_proto.h"
+#include "../remote/os/win32/wnet_proto.h"
#include "../remote/xnet_proto.h"
#endif
diff --git a/src/remote/chuser.cpp b/src/remote/os/vms/chuser.cpp
similarity index 100%
rename from src/remote/chuser.cpp
rename to src/remote/os/vms/chuser.cpp
diff --git a/src/remote/caution.ico b/src/remote/os/win32/caution.ico
similarity index 100%
rename from src/remote/caution.ico
rename to src/remote/os/win32/caution.ico
diff --git a/src/remote/chop.cpp b/src/remote/os/win32/chop.cpp
similarity index 100%
rename from src/remote/chop.cpp
rename to src/remote/os/win32/chop.cpp
diff --git a/src/remote/chop_proto.h b/src/remote/os/win32/chop_proto.h
similarity index 100%
rename from src/remote/chop_proto.h
rename to src/remote/os/win32/chop_proto.h
diff --git a/src/remote/cntl.cpp b/src/remote/os/win32/cntl.cpp
similarity index 99%
rename from src/remote/cntl.cpp
rename to src/remote/os/win32/cntl.cpp
index 9f81f21913..283fe8c29a 100644
--- a/src/remote/cntl.cpp
+++ b/src/remote/os/win32/cntl.cpp
@@ -28,7 +28,7 @@
#include "../jrd/os/thd_priority.h"
#include "../jrd/thd.h"
#include "../utilities/install_nt.h"
-#include "../remote/cntl_proto.h"
+#include "../remote/os/win32/cntl_proto.h"
#include "../jrd/gds_proto.h"
#include "../jrd/isc_proto.h"
#include "../jrd/sch_proto.h"
diff --git a/src/remote/cntl_proto.h b/src/remote/os/win32/cntl_proto.h
similarity index 100%
rename from src/remote/cntl_proto.h
rename to src/remote/os/win32/cntl_proto.h
diff --git a/src/remote/dllshell.cpp b/src/remote/os/win32/dllshell.cpp
similarity index 100%
rename from src/remote/dllshell.cpp
rename to src/remote/os/win32/dllshell.cpp
diff --git a/src/remote/ibconfig.cpp b/src/remote/os/win32/ibconfig.cpp
similarity index 96%
rename from src/remote/ibconfig.cpp
rename to src/remote/os/win32/ibconfig.cpp
index 0007fe5560..894e099e12 100644
--- a/src/remote/ibconfig.cpp
+++ b/src/remote/os/win32/ibconfig.cpp
@@ -38,16 +38,16 @@
#include "../jrd/svc_undoc.h"
#include "../jrd/svc_proto.h"
#include "../jrd/ods.h" // to get MAX_PAGE_SIZE
-#include "../remote/window_proto.h"
+#include "../remote/os/win32/window_proto.h"
#include "../ipserver/ipsrv_proto.h"
-#include "../remote/ibconfig.h"
-#include "../remote/property.rh"
+#include "../remote/os/win32/ibconfig.h"
+#include "../remote/os/win32/property.rh"
#include "../jrd/y_ref.h"
#include "../jrd/ibase.h"
-#include "../remote/ibsvrhlp.h"
+#include "../remote/os/win32/ibsvrhlp.h"
#include "../common/config/config.h"
@@ -90,22 +90,22 @@ static void FillSysdbaSPB(char *, char *);
// where the first of each pair is the control ID,
// and the second is the context ID for a help topic,
// which is used in the help file.
-static DWORD aMenuHelpIDs1[] = {
- IDC_MODRES, ibs_modify, // This has to be the first entry because
+static DWORD aMenuHelpIDs1[][2] = {
+ {IDC_MODRES, ibs_modify}, // This has to be the first entry because
// we modify the value of ibs_modify to
// ibs_reset when the button text changes.
- IDC_MINSIZETEXT, ibs_min_process_work_set,
- IDC_MAXSIZETEXT, ibs_min_process_work_set,
- IDC_CACHETEXT, ibs_db_cache,
- IDC_DBPAGES, ibs_db_cache,
- IDC_MAPSIZE, ibs_client_map_size,
- IDC_MAPTEXT, ibs_client_map_size,
- IDC_MINSIZE, ibs_min_process_work_set,
- IDC_MAXSIZE, ibs_min_process_work_set,
- IDC_PRIORITYHIGH, ibs_process_priority,
- IDC_PRIORITYNORM, ibs_process_priority,
- 0, 0
+ {IDC_MINSIZETEXT, ibs_min_process_work_set},
+ {IDC_MAXSIZETEXT, ibs_min_process_work_set},
+ {IDC_CACHETEXT, ibs_db_cache},
+ {IDC_DBPAGES, ibs_db_cache},
+ {IDC_MAPSIZE, ibs_client_map_size},
+ {IDC_MAPTEXT, ibs_client_map_size},
+ {IDC_MINSIZE, ibs_min_process_work_set},
+ {IDC_MAXSIZE, ibs_min_process_work_set},
+ {IDC_PRIORITYHIGH, ibs_process_priority},
+ {IDC_PRIORITYNORM, ibs_process_priority},
+ {0, 0}
};
// IB Parameters to get/set
@@ -272,7 +272,7 @@ LRESULT CALLBACK InterbasePage(HWND hDlg, UINT unMsg, WPARAM wParam,
// the appropriate help topic based on whether the text
// is "Modify..." or "Reset". It assumes that the first
// entry is the first one.
- aMenuHelpIDs1[0, 1] = bModifyMode ? ibs_reset : ibs_modify;
+ aMenuHelpIDs1[0][1] = bModifyMode ? ibs_reset : ibs_modify;
break;
}
case PSN_APPLY: // When 'OK' or 'Apply Now' are clicked
@@ -382,7 +382,7 @@ BOOL ReadIBSettings(HWND hDlg)
// Select the right Map Size, inserting it if necessary
wsprintf(pchTmp, "%d", lMapSize);
- if (SendDlgItemMessage(hDlg, IDC_MAPSIZE, CB_SELECTSTRING, -1,
+ if (SendDlgItemMessage(hDlg, IDC_MAPSIZE, CB_SELECTSTRING, (unsigned int) -1,
(LPARAM) pchTmp) == CB_ERR) {
SendDlgItemMessage(hDlg, IDC_MAPSIZE, CB_ADDSTRING, 0,
(LPARAM) pchTmp);
@@ -436,7 +436,7 @@ void RefreshIBControls(HWND hDlg, BOOL bEnable)
// This modifies the bubble help table to bring up the appropriate help
// topic based on whether the text is "Modify..." or "Reset". It assumes
// that the first entry is the first one.
- aMenuHelpIDs1[0, 1] = bEnable ? ibs_reset : ibs_modify;
+ aMenuHelpIDs1[0][1] = bEnable ? ibs_reset : ibs_modify;
}
diff --git a/src/remote/ibconfig.h b/src/remote/os/win32/ibconfig.h
similarity index 100%
rename from src/remote/ibconfig.h
rename to src/remote/os/win32/ibconfig.h
diff --git a/src/remote/ibconfig.rc b/src/remote/os/win32/ibconfig.rc
similarity index 100%
rename from src/remote/ibconfig.rc
rename to src/remote/os/win32/ibconfig.rc
diff --git a/src/remote/ibsvrhlp.h b/src/remote/os/win32/ibsvrhlp.h
similarity index 100%
rename from src/remote/ibsvrhlp.h
rename to src/remote/os/win32/ibsvrhlp.h
diff --git a/src/remote/property.cpp b/src/remote/os/win32/property.cpp
similarity index 97%
rename from src/remote/property.cpp
rename to src/remote/os/win32/property.cpp
index ed25dcc49a..2a49de6643 100644
--- a/src/remote/property.cpp
+++ b/src/remote/os/win32/property.cpp
@@ -47,21 +47,21 @@
#include "../jrd/isc.h"
#include "../jrd/file_params.h"
#include "../remote/remote_def.h"
-#include "../remote/window.rh"
-#include "../remote/property.rh"
+#include "../remote/os/win32/window.rh"
+#include "../remote/os/win32/property.rh"
#include "../ipserver/ips.h"
#include "../jrd/svc_proto.h"
-#include "../remote/window_proto.h"
-#include "../remote/propty_proto.h"
+#include "../remote/os/win32/window_proto.h"
+#include "../remote/os/win32/propty_proto.h"
#include "../ipserver/ipsrv_proto.h"
-#include "../remote/ibconfig.h"
+#include "../remote/os/win32/ibconfig.h"
#include "../jrd/y_ref.h"
#include "../jrd/ibase.h"
-#include "../remote/ibsvrhlp.h"
-#include "../remote/chop_proto.h"
+#include "../remote/os/win32/ibsvrhlp.h"
+#include "../remote/os/win32/chop_proto.h"
#include "../jrd/thd.h" /* get jrd_proto.h to declare the function */
#include "../jrd/jrd_proto.h" /* JRD_num_attachments() */
diff --git a/src/remote/property.rc b/src/remote/os/win32/property.rc
similarity index 100%
rename from src/remote/property.rc
rename to src/remote/os/win32/property.rc
diff --git a/src/remote/property.rh b/src/remote/os/win32/property.rh
similarity index 100%
rename from src/remote/property.rh
rename to src/remote/os/win32/property.rh
diff --git a/src/remote/propty_proto.h b/src/remote/os/win32/propty_proto.h
similarity index 100%
rename from src/remote/propty_proto.h
rename to src/remote/os/win32/propty_proto.h
diff --git a/src/remote/server.ico b/src/remote/os/win32/server.ico
similarity index 100%
rename from src/remote/server.ico
rename to src/remote/os/win32/server.ico
diff --git a/src/remote/srvr_w32.cpp b/src/remote/os/win32/srvr_w32.cpp
similarity index 98%
rename from src/remote/srvr_w32.cpp
rename to src/remote/os/win32/srvr_w32.cpp
index e5da853990..aadbdf9a48 100644
--- a/src/remote/srvr_w32.cpp
+++ b/src/remote/os/win32/srvr_w32.cpp
@@ -90,12 +90,12 @@
#include "../jrd/thd.h"
#include "../jrd/license.h"
#include "../utilities/install_nt.h"
-#include "../remote/cntl_proto.h"
+#include "../remote/os/win32/cntl_proto.h"
#include "../remote/inet_proto.h"
#include "../remote/serve_proto.h"
-#include "../remote/window_proto.h"
-#include "../remote/wnet_proto.h"
-#include "../remote/window.rh"
+#include "../remote/os/win32/window_proto.h"
+#include "../remote/os/win32/wnet_proto.h"
+#include "../remote/os/win32/window.rh"
#include "../remote/xnet_proto.h"
#include "../jrd/gds_proto.h"
#include "../jrd/license.h"
diff --git a/src/remote/window.cpp b/src/remote/os/win32/window.cpp
similarity index 98%
rename from src/remote/window.cpp
rename to src/remote/os/win32/window.cpp
index b7d8717844..e1407ac118 100644
--- a/src/remote/window.cpp
+++ b/src/remote/os/win32/window.cpp
@@ -31,8 +31,8 @@
#include "../jrd/isc.h"
#include "../jrd/file_params.h"
#include "../remote/remote_def.h"
-#include "../remote/window.rh"
-#include "../remote/property.rh"
+#include "../remote/os/win32/window.rh"
+#include "../remote/os/win32/property.rh"
#include "../remote/xnet.h"
#ifdef IPSERVER
#include "../ipserver/ips.h"
@@ -41,14 +41,14 @@
#include "../jrd/sch_proto.h"
#include "../jrd/thd.h"
#include "../jrd/jrd_proto.h"
-#include "../remote/window_proto.h"
-#include "../remote/propty_proto.h"
+#include "../remote/os/win32/window_proto.h"
+#include "../remote/os/win32/propty_proto.h"
#ifdef IPSERVER
#include "../ipserver/ipsrv_proto.h"
#endif
#include "../jrd/gds_proto.h"
-#include "../remote/window.h"
+#include "../remote/os/win32/window.h"
#include "../jrd/isc_proto.h"
#define NO_PORT
diff --git a/src/remote/window.h b/src/remote/os/win32/window.h
similarity index 100%
rename from src/remote/window.h
rename to src/remote/os/win32/window.h
diff --git a/src/remote/window.rc b/src/remote/os/win32/window.rc
similarity index 98%
rename from src/remote/window.rc
rename to src/remote/os/win32/window.rc
index 57d8eccbc6..1ebffa377d 100644
--- a/src/remote/window.rc
+++ b/src/remote/os/win32/window.rc
@@ -28,7 +28,7 @@ produced by Borland Resource Workshop
#include
#include "window.rh"
-#include "../jrd/version.rc"
+#include "../../../jrd/version.rc"
#include "property.rc"
STRINGTABLE
diff --git a/src/remote/window.rh b/src/remote/os/win32/window.rh
similarity index 100%
rename from src/remote/window.rh
rename to src/remote/os/win32/window.rh
diff --git a/src/remote/window_proto.h b/src/remote/os/win32/window_proto.h
similarity index 100%
rename from src/remote/window_proto.h
rename to src/remote/os/win32/window_proto.h
diff --git a/src/remote/winmain.cpp b/src/remote/os/win32/winmain.cpp
similarity index 100%
rename from src/remote/winmain.cpp
rename to src/remote/os/win32/winmain.cpp
diff --git a/src/remote/wnet.cpp b/src/remote/os/win32/wnet.cpp
similarity index 99%
rename from src/remote/wnet.cpp
rename to src/remote/os/win32/wnet.cpp
index 09f30ba5b3..486613bded 100644
--- a/src/remote/wnet.cpp
+++ b/src/remote/os/win32/wnet.cpp
@@ -38,7 +38,7 @@
#include "../remote/proto_proto.h"
#include "../remote/remot_proto.h"
-#include "../remote/wnet_proto.h"
+#include "../remote/os/win32/wnet_proto.h"
#include "../jrd/gds_proto.h"
#include "../jrd/isc_proto.h"
#include "../jrd/isc_f_proto.h"
diff --git a/src/remote/wnet_proto.h b/src/remote/os/win32/wnet_proto.h
similarity index 100%
rename from src/remote/wnet_proto.h
rename to src/remote/os/win32/wnet_proto.h
diff --git a/src/remote/server.cpp b/src/remote/server.cpp
index af4a19bec0..6ff1ecce64 100644
--- a/src/remote/server.cpp
+++ b/src/remote/server.cpp
@@ -43,7 +43,7 @@
#include "../remote/remot_proto.h"
#include "../remote/serve_proto.h"
#ifdef WIN_NT
-#include "../remote/cntl_proto.h"
+#include "../remote/os/win32/cntl_proto.h"
#include
#endif
#include "../jrd/gds_proto.h"
diff --git a/src/remote/xnet.cpp b/src/remote/xnet.cpp
index bc9158c210..3b6ec69ee9 100644
--- a/src/remote/xnet.cpp
+++ b/src/remote/xnet.cpp
@@ -36,7 +36,7 @@
#include "../remote/proto_proto.h"
#include "../remote/remot_proto.h"
#include "../remote/xnet_proto.h"
-#include "../remote/window.h"
+#include "../remote/os/win32/window.h"
#include "../jrd/gds_proto.h"
#include "../jrd/isc_proto.h"
#include "../jrd/isc_f_proto.h"