Stage 3 in dismantling _WIN32_WCE ... cleanup code

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1895508 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 1 insertions, 32 deletions

diff --git a/user/win32/groupinfo.c b/user/win32/groupinfo.c
index b53656962..115e8e956 100644
--- a/user/win32/groupinfo.c
+++ b/user/win32/groupinfo.c
@@ -25,9 +25,6 @@
 APR_DECLARE(apr_status_t) apr_gid_get(apr_gid_t *gid, 
                                       const char *groupname, apr_pool_t *p)
 {
-#ifdef _WIN32_WCE
-    return APR_ENOTIMPL;
-#else
     SID_NAME_USE sidtype;
     char anydomain[256];
     char *domain;
@@ -63,14 +60,10 @@ APR_DECLARE(apr_status_t) apr_gid_get(apr_gid_t *gid,
         return apr_get_os_error();
     }
     return APR_SUCCESS;
-#endif
 }
 
 APR_DECLARE(apr_status_t) apr_gid_name_get(char **groupname, apr_gid_t groupid, apr_pool_t *p)
 {
-#ifdef _WIN32_WCE
-    *groupname = apr_pstrdup(p, "Administrators");
-#else
     SID_NAME_USE type;
     char name[MAX_PATH], domain[MAX_PATH];
     DWORD cbname = sizeof(name), cbdomain = sizeof(domain);
@@ -82,7 +75,6 @@ APR_DECLARE(apr_status_t) apr_gid_name_get(char **groupname, apr_gid_t groupid,
                              && type != SidTypeAlias)
         return APR_EINVAL;
     *groupname = apr_pstrdup(p, name);
-#endif
     return APR_SUCCESS;
 }
   
@@ -90,11 +82,9 @@ APR_DECLARE(apr_status_t) apr_gid_compare(apr_gid_t left, apr_gid_t right)
 {
     if (!left || !right)
         return APR_EINVAL;
-#ifndef _WIN32_WCE
     if (!IsValidSid(left) || !IsValidSid(right))
         return APR_EINVAL;
     if (!EqualSid(left, right))
         return APR_EMISMATCH;
-#endif
     return APR_SUCCESS;
 }
diff --git a/user/win32/userinfo.c b/user/win32/userinfo.c
index 89f9b8cf0..ad8d85952 100644
--- a/user/win32/userinfo.c
+++ b/user/win32/userinfo.c
@@ -23,7 +23,6 @@
 #include <sys/types.h>
 #endif
 
-#ifndef _WIN32_WCE
 /* Internal sid binary to string translation, see MSKB Q131320.
  * Several user related operations require our SID to access
  * the registry, but in a string format.  All error handling
@@ -60,7 +59,7 @@ static void get_sid_string(char *buf, apr_size_t blen, apr_uid_t id)
                              *GetSidSubAuthority(id, sa));
     }
 } 
-#endif
+
 /* Query the ProfileImagePath from the version-specific branch, where the
  * regkey uses the user's name on 9x, and user's sid string on NT.
  */
@@ -68,10 +67,6 @@ APR_DECLARE(apr_status_t) apr_uid_homepath_get(char **dirname,
                                                const char *username, 
                                                apr_pool_t *p)
 {
-#ifdef _WIN32_WCE
-    *dirname = apr_pstrdup(p, "/My Documents");
-    return APR_SUCCESS;
-#else
     apr_status_t rv;
     char regkey[MAX_PATH * 2];
     char *fixch;
@@ -157,16 +152,12 @@ APR_DECLARE(apr_status_t) apr_uid_homepath_get(char **dirname,
         if (*fixch == '\\')
             *fixch = '/';
     return APR_SUCCESS;
-#endif /* _WIN32_WCE */
 }
 
 APR_DECLARE(apr_status_t) apr_uid_current(apr_uid_t *uid,
                                           apr_gid_t *gid,
                                           apr_pool_t *p)
 {
-#ifdef _WIN32_WCE
-    return APR_ENOTIMPL;
-#else
     HANDLE threadtok;
     DWORD needed;
     TOKEN_USER *usr;
@@ -205,15 +196,11 @@ APR_DECLARE(apr_status_t) apr_uid_current(apr_uid_t *uid,
     CloseHandle(threadtok);
 
     return APR_SUCCESS;
-#endif 
 }
 
 APR_DECLARE(apr_status_t) apr_uid_get(apr_uid_t *uid, apr_gid_t *gid,
                                       const char *username, apr_pool_t *p)
 {
-#ifdef _WIN32_WCE
-    return APR_ENOTIMPL;
-#else
     SID_NAME_USE sidtype;
     char anydomain[256];
     char *domain;
@@ -252,16 +239,11 @@ APR_DECLARE(apr_status_t) apr_uid_get(apr_uid_t *uid, apr_gid_t *gid,
      */
     *gid = NULL;
     return APR_SUCCESS;
-#endif
 }
 
 APR_DECLARE(apr_status_t) apr_uid_name_get(char **username, apr_uid_t userid,
                                            apr_pool_t *p)
 {
-#ifdef _WIN32_WCE
-    *username = apr_pstrdup(p, "Administrator");
-    return APR_SUCCESS;
-#else
     SID_NAME_USE type;
     char name[MAX_PATH], domain[MAX_PATH];
     DWORD cbname = sizeof(name), cbdomain = sizeof(domain);
@@ -273,19 +255,16 @@ APR_DECLARE(apr_status_t) apr_uid_name_get(char **username, apr_uid_t userid,
         return APR_EINVAL;
     *username = apr_pstrdup(p, name);
     return APR_SUCCESS;
-#endif
 }
   
 APR_DECLARE(apr_status_t) apr_uid_compare(apr_uid_t left, apr_uid_t right)
 {
     if (!left || !right)
         return APR_EINVAL;
-#ifndef _WIN32_WCE
     if (!IsValidSid(left) || !IsValidSid(right))
         return APR_EINVAL;
     if (!EqualSid(left, right))
         return APR_EMISMATCH;
-#endif
     return APR_SUCCESS;
 }