Changeset 21535 for trunk/tools

Timestamp:

Dec 23, 2010, 6:54:11 AM (15 years ago)

Author:

dmik

Message:

Deduce Windows Time Zone information from the TZ environment variable.

Location:

trunk/tools

Files:

• install/makefile (modified) (1 diff)
• install/odininst.cpp (modified) (1 diff)
• install/regapi.c (added)
• install/tz.c (added)
• regedit/regapi.c (modified) (13 diffs)

trunk/tools/install/makefile

@@ -29 +29 @@
 #
 OBJS = \
-$(OBJDIR)\odininst.obj
-
+$(OBJDIR)\odininst.obj \
+$(OBJDIR)\regapi.obj \
+$(OBJDIR)\tz.obj
 
 #

trunk/tools/install/odininst.cpp

@@ -1088 +1088 @@
 }
 //******************************************************************************
-//[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\TimeZoneInformation]
-//"Bias"=dword:ffffffc4
-//"StandardName"="Romance Standard Time"
-//"StandardBias"=dword:00000000
-//"StandardStart"=hex:00,00,0a,00,05,00,03,00,00,00,00,00,00,00,00,00
-// typedef struct _SYSTEMTIME {
-//  WORD wYear;
-//  WORD wMonth;
-//  WORD wDayOfWeek;
-//  WORD wDay;
-//  WORD wHour;
-//  WORD wMinute;
-//  WORD wSecond;
-//  WORD wMilliseconds;
-//} SYSTEMTIME, *PSYSTEMTIME;
-//"DaylightName"="Romance Daylight Time"
-//"DaylightBias"=dword:ffffffc4
-//"DaylightStart"=hex:00,00,03,00,05,00,02,00,00,00,00,00,00,00,00,00
-//"ActiveTimeBias"=dword:ffffffc4
-//******************************************************************************
+//******************************************************************************
+extern "C" const char *TimeZones;
+extern "C" int ProcessEmbeddedFile(const char *data, BOOL force);
 void SetupTimeZoneInfo()
 {
-    HKEY hkey;
-    DWORD val = 0;
-    char szTimeZoneStd[4];
-    char szTimeZoneDay[4];
-    int  sign = FALSE;
-    int  bias;
-    char *pszTZ = NULL;
-    SYSTEMTIME stime = {0};
-    SYSTEMTIME dtime = {0};
-
-    if (RegCreateKey(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Control\\TimeZoneInformation", &hkey) != ERROR_SUCCESS)
-    {
-        dprintf(("SetupTimeZoneInfo: Unable to create key"));
-        return;
-    }
-    //Little bit difficult to map the 3 letter timezone to a name
-    //(duplicate values for different regions)
-    //So we just copy that timezone string and hope the apps don't really
-    //on hardcoded timezone names.
-
-    //parse TZ environment variable
-    pszTZ = getenv("TZ");
-    if(pszTZ == NULL) {
-        //default is Central European Time
-        pszTZ = "CET-1CDT";
-    }
-    strncpy(szTimeZoneStd, pszTZ, 3);
-    szTimeZoneStd[3] = 0;
-    if(pszTZ[3] == '-') {
-         sign   = TRUE;
-         pszTZ += 4;
-    }
-    else pszTZ += 3;
-
-    if(isdigit(*pszTZ)) {
-        bias = (int)(*pszTZ - '0') * 60;
-        pszTZ++;
-        if(isdigit(*pszTZ)) {//double digit hour difference
-            bias *= 10;
-            bias += (int)(*pszTZ - '0') * 60;
-            pszTZ++;
-        }
-    }
-    else bias = 0;
-
-    if(sign) bias = -bias;
-
-    if(isalpha(*pszTZ)) {//daylight timezone name follows
-         strncpy(szTimeZoneDay, pszTZ, 3);
-         szTimeZoneDay[3] = 0;
-    }
-    else szTimeZoneDay[0] = 0;
-
-    RegSetValueEx(hkey, "Bias",0,REG_DWORD, (LPBYTE)&bias, sizeof(bias));
-    RegSetValueEx(hkey, "ActiveTimeBias",0,REG_DWORD, (LPBYTE)&bias, sizeof(bias));
-
-    RegSetValueEx(hkey, "StandardName", 0, REG_SZ, (LPBYTE)szTimeZoneStd, strlen(szTimeZoneStd));
-    RegSetValueEx(hkey, "StandardBias",0,REG_DWORD, (LPBYTE)&bias, sizeof(bias));
-    RegSetValueEx(hkey, "StandardStart",0,REG_BINARY, (LPBYTE)&stime, sizeof(stime));
-    RegSetValueEx(hkey, "DaylightName", 0, REG_SZ, (LPBYTE)szTimeZoneDay, strlen(szTimeZoneDay));
-    RegSetValueEx(hkey, "DaylightBias",0,REG_DWORD, (LPBYTE)&bias, sizeof(bias));
-    RegSetValueEx(hkey, "DaylightStart",0,REG_BINARY, (LPBYTE)&dtime, sizeof(dtime));
-    RegCloseKey(hkey);
-
-    TIME_ZONE_INFORMATION tzinfo;
-
-    tzinfo.Bias         = bias;
-    lstrcpynAtoW(tzinfo.StandardName, szTimeZoneStd, sizeof(tzinfo.StandardName)/sizeof(WCHAR));
-    tzinfo.StandardDate = stime;
-    tzinfo.StandardBias = bias;
-    lstrcpynAtoW(tzinfo.DaylightName, szTimeZoneDay, sizeof(tzinfo.StandardName)/sizeof(WCHAR));
-    tzinfo.DaylightDate = dtime;
-    tzinfo.DaylightBias = bias;
-
-    SetTimeZoneInformation(&tzinfo);
+        ProcessEmbeddedFile(TimeZones, TRUE);
 }
 //******************************************************************************

trunk/tools/regedit/regapi.c

@@ -475 +475 @@
   memset(buf, 0, bufLen);
 
+#ifndef ODININST
   /*
    * warn the user if we are here with a string longer than 2 bytes that does
@@ -482 +483 @@
     printf("regapi: WARNING converting CSV hex stream with no comma, "
            "input data seems invalid.\n");
+#endif
 
   while (strPos < strLen)
@@ -681 +683 @@
 
   hRes = setValue(argv);
+#ifndef ODININST
   if ( hRes == ERROR_SUCCESS )
     printf(
@@ -700 +703 @@
       argv[0],
       argv[1]);
+#endif
 }
 
@@ -814 +818 @@
 
 
+#ifndef ODININST
   if ( hRes == ERROR_SUCCESS )
     printf(
@@ -825 +830 @@
       keyValue,
       currentKeyName);
+#endif
 
   /*
@@ -878 +884 @@
       closeKey();                    /* Close the previous key before */
 
-    if ( openKey(stdInput) != ERROR_SUCCESS )
+    if ( openKey(stdInput) != ERROR_SUCCESS ) {
+#ifndef ODININST
       printf ("regapi: doSetValue failed to open key %s\n", stdInput);
+#endif
+    }
   }
   else if( ( bTheKeyIsOpen ) &&
@@ -918 +927 @@
       closeKey();                    /* Close the previous key before */
 
-    if ( openKey(stdInput) != ERROR_SUCCESS )
+    if ( openKey(stdInput) != ERROR_SUCCESS ) {
+#ifndef ODININST
       printf ("regapi: doSetValue failed to open key %s\n", stdInput);
+#endif
+    }
   }
   else if( ( bTheKeyIsOpen ) &&
@@ -978 +990 @@
     if (lpfnDLLRegProc)
       retVal = lpfnDLLRegProc();
+#ifndef ODININST
     else
       printf("regapi: Couldn't find DllRegisterServer proc in '%s'.\n", stdInput);
@@ -983 +996 @@
     if (retVal != S_OK)
       printf("regapi: DLLRegisterServer error 0x%x in '%s'.\n", retVal, stdInput);
+#endif
 
     FreeLibrary(theLib);
   }
+#ifndef ODININST
   else
   {
     printf("regapi: Could not load DLL '%s'.\n", stdInput);
   }
+#endif
 }
 
@@ -1011 +1027 @@
     if (lpfnDLLRegProc)
       retVal = lpfnDLLRegProc();
+#ifndef ODININST
     else
       printf("regapi: Couldn't find DllUnregisterServer proc in '%s'.\n", stdInput);
@@ -1016 +1033 @@
     if (retVal != S_OK)
       printf("regapi: DLLUnregisterServer error 0x%x in '%s'.\n", retVal, stdInput);
+#endif
 
     FreeLibrary(theLib);
   }
+#ifndef ODININST
   else
   {
     printf("regapi: Could not load DLL '%s'.\n", stdInput);
   }
-}
+#endif
+}
+
+#ifndef ODININST
 
 /******************************************************************************
@@ -1144 +1166 @@
   return SUCCESS;
 }
+
+#else /* !ODININST */
+
+/******************************************************************************
+ * Treats the given data string as an embedded text file and executes the
+ * setValue command on it. The function expects '\n' as line separators.
+ */
+int ProcessEmbeddedFile(const char *data, BOOL force)
+{
+    LPSTR  curLine      = NULL;  /* line read from data */
+    ULONG  curSize      = STDIN_MAX_LEN;
+    const char *curData = data;
+    INT cmdIndex;
+
+    bForce = force;
+
+    curLine = HeapAlloc(GetProcessHeap(), 0, STDIN_MAX_LEN);
+    if (curLine == NULL)
+      return NOT_ENOUGH_MEMORY;
+
+    cmdIndex = getCommand("setValue");
+
+    while (TRUE)
+    {
+        /*
+         * read a line
+         */
+        const char *eol;
+        int len, lastLen = 0;
+
+        while (TRUE)
+        {
+
+            eol = strchr(curData, '\n');
+            if (!eol)
+                eol = curData + strlen(curData);
+            if (!*eol)
+                break; // EOF
+
+            len = eol - curData + 1;
+            if (lastLen + len > curSize) {
+                curSize = lastLen + len;
+                curLine = HeapReAlloc(GetProcessHeap(), 0, curLine, curSize);
+                if (curLine == NULL)
+                    return NOT_ENOUGH_MEMORY;
+            }
+
+            memcpy(curLine + lastLen, curData, len - 1);
+            curLine[lastLen+len-1] = '\0';
+            lastLen += len;
+            curData += len;
+
+            if (curLine[lastLen-2] == '\\') {
+                // concatenate with the next string
+                curLine[lastLen-2] == '\0';
+                lastLen -= 2;
+            } else {
+                break;
+            }
+        }
+
+        /*
+         * Make some handy generic stuff here...
+         */
+        if (curLine[0] == '#')
+            continue;
+
+        /*
+         * We process every lines even the NULL (last) line, to indicate the
+         * end of the processing to the specific process.
+         */
+        if (!*eol) { /* EOF? */
+            commandAPIs[cmdIndex](NULL);
+            break;
+        } else {
+            commandAPIs[cmdIndex](curLine);
+        }
+    }
+
+    HeapFree(GetProcessHeap(), 0, curLine);
+
+    return SUCCESS;
+}
+
+#endif /* !ODININST */