From 6d0bf9181121b4c117c80d05a7f097363c531774 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sun, 7 Jun 2009 00:56:23 +0000 Subject: Add Windows CE implementations of some ANSI C functions that are missing. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1553 --- wince/env.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 wince/env.c (limited to 'wince/env.c') diff --git a/wince/env.c b/wince/env.c new file mode 100644 index 00000000..ceba6402 --- /dev/null +++ b/wince/env.c @@ -0,0 +1,77 @@ +// +// "Extension" implementation of getenv for Windows CE. +// +// I (Simon Howard) release this file to the public domain. +// + +#include +#include + +#include +#include +#include + +#include "env.h" + +static int buffers_loaded = 0; +static char username_buf[UNLEN + 1]; +static char temp_buf[MAX_PATH + 1]; +static char home_buf[MAX_PATH + 1]; + +static void WCharToChar(wchar_t *src, char *dest, int buf_len) +{ + unsigned int len; + + len = wcslen(src); + + WideCharToMultiByte(CP_OEMCP, 0, src, len, dest, buf_len, NULL, NULL); +} + +static void LoadBuffers(void) +{ + wchar_t temp[MAX_PATH]; + DWORD buf_len; + + // Username: + + buf_len = UNLEN; + GetUserNameW(temp, &buf_len); + WCharToChar(temp, temp_buf, MAX_PATH); + + // Temp dir: + + GetTempPathW(MAX_PATH, temp); + WCharToChar(temp, temp_buf, MAX_PATH); + + // Use My Documents dir as home: + + SHGetSpecialFolderPath(NULL, temp, CSIDL_PERSONAL, 0); + WCharToChar(temp, home_buf, MAX_PATH); +} + +char *getenv(const char *name) +{ + if (!buffers_loaded) + { + LoadBuffers(); + buffers_loaded = 1; + } + + if (!strcmp(name, "USER") || !strcmp(name, "USERNAME")) + { + return username_buf; + } + else if (!strcmp(name, "TEMP")) + { + return temp_buf; + } + else if (!strcmp(name, "HOME")) + { + return home_buf; + } + else + { + return NULL; + } +} + -- cgit v1.2.3 From 52c831999bddb7b68b855d0fec644240863cbee2 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sun, 7 Jun 2009 01:27:30 +0000 Subject: Use GetUserNameExW, not GetUserName (doesn't exist on WinCE) Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1556 --- wince/env.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'wince/env.c') diff --git a/wince/env.c b/wince/env.c index ceba6402..a678de2d 100644 --- a/wince/env.c +++ b/wince/env.c @@ -9,6 +9,7 @@ #include #include +#include #include #include "env.h" @@ -35,7 +36,7 @@ static void LoadBuffers(void) // Username: buf_len = UNLEN; - GetUserNameW(temp, &buf_len); + GetUserNameExW(NameDisplay, temp, &buf_len); WCharToChar(temp, temp_buf, MAX_PATH); // Temp dir: -- cgit v1.2.3 From a91a1c60f544d26195c2df9dd9cd1ef042deacf9 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Mon, 8 Jun 2009 18:15:57 +0000 Subject: Use SDL's getenv/putenv implementation, and populate at startup. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1577 --- wince/env.c | 60 ++++++++++++++++++++++++++++-------------------------------- 1 file changed, 28 insertions(+), 32 deletions(-) (limited to 'wince/env.c') diff --git a/wince/env.c b/wince/env.c index a678de2d..bedeb434 100644 --- a/wince/env.c +++ b/wince/env.c @@ -14,21 +14,33 @@ #include "env.h" -static int buffers_loaded = 0; -static char username_buf[UNLEN + 1]; -static char temp_buf[MAX_PATH + 1]; -static char home_buf[MAX_PATH + 1]; - static void WCharToChar(wchar_t *src, char *dest, int buf_len) { unsigned int len; - len = wcslen(src); + len = wcslen(src) + 1; WideCharToMultiByte(CP_OEMCP, 0, src, len, dest, buf_len, NULL, NULL); } -static void LoadBuffers(void) +static void SetEnvironment(char *env_string, wchar_t *wvalue) +{ + char value[MAX_PATH + 10]; + int env_len; + + // Construct the string for putenv: NAME=value + + env_len = strlen(env_string); + strcpy(value, env_string); + + WCharToChar(wvalue, value + env_len, sizeof(value) - env_len); + + // Set the environment variable: + + putenv(value); +} + +void PopulateEnvironment(void) { wchar_t temp[MAX_PATH]; DWORD buf_len; @@ -37,42 +49,26 @@ static void LoadBuffers(void) buf_len = UNLEN; GetUserNameExW(NameDisplay, temp, &buf_len); - WCharToChar(temp, temp_buf, MAX_PATH); + SetEnvironment("USER=", temp); + SetEnvironment("USERNAME=", temp); // Temp dir: GetTempPathW(MAX_PATH, temp); - WCharToChar(temp, temp_buf, MAX_PATH); + SetEnvironment("TEMP=", temp); // Use My Documents dir as home: SHGetSpecialFolderPath(NULL, temp, CSIDL_PERSONAL, 0); - WCharToChar(temp, home_buf, MAX_PATH); -} + SetEnvironment("HOME=", temp); -char *getenv(const char *name) -{ - if (!buffers_loaded) { - LoadBuffers(); - buffers_loaded = 1; - } + char *home = getenv("HOME"); - if (!strcmp(name, "USER") || !strcmp(name, "USERNAME")) - { - return username_buf; - } - else if (!strcmp(name, "TEMP")) - { - return temp_buf; - } - else if (!strcmp(name, "HOME")) - { - return home_buf; - } - else - { - return NULL; + MultiByteToWideChar(CP_ACP, 0, + home, strlen(home) + 1, + temp, sizeof(temp)); + MessageBoxW(NULL, temp, L"Home", MB_OK); } } -- cgit v1.2.3 From b6491fa4aefc073a760d4bad51f55c2d6c0f5f35 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Mon, 8 Jun 2009 19:26:29 +0000 Subject: Remove debugging code. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1578 --- wince/env.c | 9 --------- 1 file changed, 9 deletions(-) (limited to 'wince/env.c') diff --git a/wince/env.c b/wince/env.c index bedeb434..72af2212 100644 --- a/wince/env.c +++ b/wince/env.c @@ -61,14 +61,5 @@ void PopulateEnvironment(void) SHGetSpecialFolderPath(NULL, temp, CSIDL_PERSONAL, 0); SetEnvironment("HOME=", temp); - - { - char *home = getenv("HOME"); - - MultiByteToWideChar(CP_ACP, 0, - home, strlen(home) + 1, - temp, sizeof(temp)); - MessageBoxW(NULL, temp, L"Home", MB_OK); - } } -- cgit v1.2.3 From 9fc871cdc51ddc335db803abae91eda42efdb2ed Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Fri, 12 Jun 2009 17:35:39 +0000 Subject: Set the USER environment variable based on the owner information from the registry. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1598 --- wince/env.c | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) (limited to 'wince/env.c') diff --git a/wince/env.c b/wince/env.c index 72af2212..b3400627 100644 --- a/wince/env.c +++ b/wince/env.c @@ -40,17 +40,48 @@ static void SetEnvironment(char *env_string, wchar_t *wvalue) putenv(value); } +static int ReadOwnerName(wchar_t *value, DWORD len) +{ + HKEY key; + DWORD valtype; + + if (RegOpenKeyExW(HKEY_CURRENT_USER, + L"\\ControlPanel\\Owner", 0, + KEY_READ, &key) != ERROR_SUCCESS) + { + MessageBoxW(NULL, L"Can't open owner", L"Error", MB_OK); + return 0; + } + + valtype = REG_SZ; + + if (RegQueryValueExW(key, L"Name", NULL, &valtype, + (LPBYTE) value, &len) != ERROR_SUCCESS) + { + MessageBoxW(NULL, L"Can't read owner", L"Error", MB_OK); + return 0; + } + + MessageBoxW(NULL, value, L"Error", MB_OK); + + // Close the key + + RegCloseKey(key); + + return 1; +} + void PopulateEnvironment(void) { wchar_t temp[MAX_PATH]; - DWORD buf_len; // Username: - buf_len = UNLEN; - GetUserNameExW(NameDisplay, temp, &buf_len); - SetEnvironment("USER=", temp); - SetEnvironment("USERNAME=", temp); + if (ReadOwnerName(temp, MAX_PATH)) + { + SetEnvironment("USER=", temp); + SetEnvironment("USERNAME=", temp); + } // Temp dir: -- cgit v1.2.3 From a3b1c4e95cf3d8196858f5c98a92565eedbc1e48 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Fri, 12 Jun 2009 17:58:42 +0000 Subject: Remove debug messages. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1599 --- wince/env.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'wince/env.c') diff --git a/wince/env.c b/wince/env.c index b3400627..c90b4c8d 100644 --- a/wince/env.c +++ b/wince/env.c @@ -49,7 +49,6 @@ static int ReadOwnerName(wchar_t *value, DWORD len) L"\\ControlPanel\\Owner", 0, KEY_READ, &key) != ERROR_SUCCESS) { - MessageBoxW(NULL, L"Can't open owner", L"Error", MB_OK); return 0; } @@ -58,12 +57,9 @@ static int ReadOwnerName(wchar_t *value, DWORD len) if (RegQueryValueExW(key, L"Name", NULL, &valtype, (LPBYTE) value, &len) != ERROR_SUCCESS) { - MessageBoxW(NULL, L"Can't read owner", L"Error", MB_OK); return 0; } - MessageBoxW(NULL, value, L"Error", MB_OK); - // Close the key RegCloseKey(key); -- cgit v1.2.3