Ros-diffs June 2006

ros-diffs@reactos.org

19 participants
595 discussions

[jimtabor] 22493: Missed one line for sync to Wine.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Jun 22 01:31:53 2006 New Revision: 22493 URL: http://svn.reactos.ru/svn/reactos?rev=22493&view=rev Log: Missed one line for sync to Wine. Modified: trunk/reactos/dll/win32/user32/controls/combo.c Modified: trunk/reactos/dll/win32/user32/controls/combo.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/controls/c… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/combo.c (original) +++ trunk/reactos/dll/win32/user32/controls/combo.c Thu Jun 22 01:31:53 2006 @@ -148,7 +148,7 @@ if (COMBO_Init() && (lphc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(HEADCOMBO))) ) { lphc->self = hwnd; - SetWindowLongW( hwnd, 0, (LONG)lphc ); + SetWindowLongPtrW( hwnd, 0, (LONG_PTR)lphc ); /* some braindead apps do try to use scrollbar/border flags */

18 years, 4 months

[gedmurphy] 22492: header changes for r22491

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Jun 22 01:20:28 2006 New Revision: 22492 URL: http://svn.reactos.ru/svn/reactos?rev=22492&view=rev Log: header changes for r22491 Modified: trunk/reactos/include/winreg.h Modified: trunk/reactos/include/winreg.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/winreg.h?rev=22492&… ============================================================================== --- trunk/reactos/include/winreg.h (original) +++ trunk/reactos/include/winreg.h Thu Jun 22 01:20:28 2006 @@ -37,6 +37,20 @@ #define REG_NOTIFY_CHANGE_LAST_SET 4 #define REG_NOTIFY_CHANGE_SECURITY 8 +#if (_WIN32_WINNT >= 0x0600) +#define RRF_RT_REG_NONE (1 << 0) +#define RRF_RT_REG_SZ (1 << 1) +#define RRF_RT_REG_EXPAND_SZ (1 << 2) +#define RRF_RT_REG_BINARY (1 << 3) +#define RRF_RT_REG_DWORD (1 << 4) +#define RRF_RT_REG_MULTI_SZ (1 << 5) +#define RRF_RT_REG_QWORD (1 << 6) +#define RRF_RT_DWORD (RRF_RT_REG_BINARY | RRF_RT_REG_DWORD) +#define RRF_RT_QWORD (RRF_RT_REG_BINARY | RRF_RT_REG_QWORD) +#define RRF_NOEXPAND (1 << 28) +#define RRF_ZEROONFAILURE (1 << 29) +#endif + #ifndef RC_INVOKED typedef ACCESS_MASK REGSAM; typedef struct value_entA { @@ -92,6 +106,10 @@ LONG WINAPI RegEnumKeyExW(HKEY,DWORD,LPWSTR,PDWORD,PDWORD,LPWSTR,PDWORD,PFILETIME); LONG WINAPI RegEnumValueA(HKEY,DWORD,LPSTR,PDWORD,PDWORD,PDWORD,LPBYTE,PDWORD); LONG WINAPI RegEnumValueW(HKEY,DWORD,LPWSTR,PDWORD,PDWORD,PDWORD,LPBYTE,PDWORD); +#if (_WIN32_WINNT >= 0x0600) +LONG WINAPI RegGetValueA(HKEY,LPCSTR,LPCSTR,DWORD,LPDWORD,PVOID,LPDWORD); +LONG WINAPI RegGetValueW(HKEY,LPCWSTR,LPCWSTR,DWORD,LPDWORD,PVOID,LPDWORD); +#endif LONG WINAPI RegFlushKey(HKEY); LONG WINAPI RegGetKeySecurity(HKEY,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,PDWORD); LONG WINAPI RegLoadKeyA(HKEY,LPCSTR,LPCSTR); @@ -154,6 +172,9 @@ #define RegEnumKey RegEnumKeyW #define RegEnumKeyEx RegEnumKeyExW #define RegEnumValue RegEnumValueW +#if (_WIN32_WINNT >= 0x0600) +#define RegGetValue RegGetValueW +#endif #define RegLoadKey RegLoadKeyW #if (_WIN32_WINNT >= 0x0600) #define RegLoadMUIString RegLoadMUIStringW @@ -192,6 +213,9 @@ #define RegEnumKey RegEnumKeyA #define RegEnumKeyEx RegEnumKeyExA #define RegEnumValue RegEnumValueA +#if (_WIN32_WINNT >= 0x0600) +#define RegGetValue RegGetValueA +#endif #define RegLoadKey RegLoadKeyA #if (_WIN32_WINNT >= 0x0600) #define RegLoadMUIString RegLoadMUIStringA

18 years, 4 months

[gedmurphy] 22491: Port RegGetValue() from WINE patch by Thomas Weidenmueller

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Jun 22 01:19:47 2006 New Revision: 22491 URL: http://svn.reactos.ru/svn/reactos?rev=22491&view=rev Log: Port RegGetValue() from WINE patch by Thomas Weidenmueller Modified: trunk/reactos/dll/win32/advapi32/advapi32.def trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/advapi32.def URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi32… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.def (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.def Thu Jun 22 01:19:47 2006 @@ -494,6 +494,8 @@ RegEnumValueW@32 RegFlushKey@4 RegGetKeySecurity@16 +RegGetValueA@28 +RegGetValueW@28 RegLoadKeyA@12 RegLoadKeyW@12 RegLoadMUIStringA@24 Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg.… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c Thu Jun 22 01:19:47 2006 @@ -1680,6 +1680,258 @@ return ERROR_CALL_NOT_IMPLEMENTED; } +/****************************************************************************** + * RegpApplyRestrictions [internal] + * + * Helper function for RegGetValueA/W. + */ +static VOID +RegpApplyRestrictions( DWORD dwFlags, DWORD dwType, DWORD cbData, + PLONG ret ) +{ + /* Check if the type is restricted by the passed flags */ + if (*ret == ERROR_SUCCESS || *ret == ERROR_MORE_DATA) + { + DWORD dwMask = 0; + + switch (dwType) + { + case REG_NONE: dwMask = RRF_RT_REG_NONE; break; + case REG_SZ: dwMask = RRF_RT_REG_SZ; break; + case REG_EXPAND_SZ: dwMask = RRF_RT_REG_EXPAND_SZ; break; + case REG_MULTI_SZ: dwMask = RRF_RT_REG_MULTI_SZ; break; + case REG_BINARY: dwMask = RRF_RT_REG_BINARY; break; + case REG_DWORD: dwMask = RRF_RT_REG_DWORD; break; + case REG_QWORD: dwMask = RRF_RT_REG_QWORD; break; + } + + if (dwFlags & dwMask) + { + /* Type is not restricted, check for size mismatch */ + if (dwType == REG_BINARY) + { + DWORD cbExpect = 0; + + if ((dwFlags & RRF_RT_DWORD) == RRF_RT_DWORD) + cbExpect = 4; + else if ((dwFlags & RRF_RT_DWORD) == RRF_RT_QWORD) + cbExpect = 8; + + if (cbExpect && cbData != cbExpect) + *ret = ERROR_DATATYPE_MISMATCH; + } + } + else *ret = ERROR_UNSUPPORTED_TYPE; + } +} + + +/****************************************************************************** + * RegGetValueW [ADVAPI32.@] + * + * Retrieves the type and data for a value name associated with a key + * optionally expanding it's content and restricting it's type. + * + * PARAMS + * hKey [I] Handle to an open key. + * pszSubKey [I] Name of the subkey of hKey. + * pszValue [I] Name of value under hKey/szSubKey to query. + * dwFlags [I] Flags restricting the value type to retrieve. + * pdwType [O] Destination for the values type, may be NULL. + * pvData [O] Destination for the values content, may be NULL. + * pcbData [I/O] Size of pvData, updated with the size required to + * retrieve the whole content. + * + * RETURNS + * Success: ERROR_SUCCESS + * Failure: nonzero error code from Winerror.h + * + * NOTES + * - Unless RRF_NOEXPAND is specified REG_EXPAND_SZ is automatically expanded + * and REG_SZ is retrieved instead. + * - Restrictions are applied after expanding, using RRF_RT_REG_EXPAND_SZ + * without RRF_NOEXPAND is thus not allowed. + */ +LONG WINAPI +RegGetValueW( HKEY hKey, LPCWSTR pszSubKey, LPCWSTR pszValue, + DWORD dwFlags, LPDWORD pdwType, PVOID pvData, + LPDWORD pcbData ) +{ + DWORD dwType, cbData = pcbData ? *pcbData : 0; + PVOID pvBuf = NULL; + LONG ret; + + TRACE("(%p,%s,%s,%ld,%p,%p,%p=%ld)\n", + hKey, debugstr_w(pszSubKey), debugstr_w(pszValue), dwFlags, pdwType, + pvData, pcbData, cbData); + + if ((dwFlags & RRF_RT_REG_EXPAND_SZ) && !(dwFlags & RRF_NOEXPAND)) + return ERROR_INVALID_PARAMETER; + + if (pszSubKey && pszSubKey[0]) + { + ret = RegOpenKeyExW(hKey, pszSubKey, 0, KEY_QUERY_VALUE, &hKey); + if (ret != ERROR_SUCCESS) return ret; + } + + ret = RegQueryValueExW(hKey, pszValue, NULL, &dwType, pvData, &cbData); + + /* If we are going to expand we need to read in the whole the value even + * if the passed buffer was too small as the expanded string might be + * smaller than the unexpanded one and could fit into cbData bytes. */ + if ((ret == ERROR_SUCCESS || ret == ERROR_MORE_DATA) && + (dwType == REG_EXPAND_SZ && !(dwFlags & RRF_NOEXPAND))) + { + do { + if (pvBuf) HeapFree(GetProcessHeap(), 0, pvBuf); + + pvBuf = HeapAlloc(GetProcessHeap(), 0, cbData); + if (!pvBuf) + { + ret = ERROR_NOT_ENOUGH_MEMORY; + break; + } + + if (ret == ERROR_MORE_DATA) + ret = RegQueryValueExW(hKey, pszValue, NULL, + &dwType, pvBuf, &cbData); + else + { + /* Even if cbData was large enough we have to copy the + * string since ExpandEnvironmentStrings can't handle + * overlapping buffers. */ + CopyMemory(pvBuf, pvData, cbData); + } + + /* Both the type or the value itself could have been modified in + * between so we have to keep retrying until the buffer is large + * enough or we no longer have to expand the value. */ + } while (dwType == REG_EXPAND_SZ && ret == ERROR_MORE_DATA); + + if (ret == ERROR_SUCCESS) + { + if (dwType == REG_EXPAND_SZ) + { + cbData = ExpandEnvironmentStringsW(pvBuf, pvData, + pcbData ? *pcbData : 0); + dwType = REG_SZ; + if(pcbData && cbData > *pcbData) + ret = ERROR_MORE_DATA; + } + else if (pcbData) + CopyMemory(pvData, pvBuf, *pcbData); + } + + if (pvBuf) HeapFree(GetProcessHeap(), 0, pvBuf); + } + + if (pszSubKey && pszSubKey[0]) + RegCloseKey(hKey); + + RegpApplyRestrictions(dwFlags, dwType, cbData, &ret); + + if (pcbData && ret != ERROR_SUCCESS && (dwFlags & RRF_ZEROONFAILURE)) + ZeroMemory(pvData, *pcbData); + + if (pdwType) *pdwType = dwType; + if (pcbData) *pcbData = cbData; + + return ret; +} + + +/****************************************************************************** + * RegGetValueA [ADVAPI32.@] + * + * See RegGetValueW. + */ +LONG WINAPI +RegGetValueA( HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, + DWORD dwFlags, LPDWORD pdwType, PVOID pvData, + LPDWORD pcbData ) +{ + DWORD dwType, cbData = pcbData ? *pcbData : 0; + PVOID pvBuf = NULL; + LONG ret; + + TRACE("(%p,%s,%s,%ld,%p,%p,%p=%ld)\n", + hKey, pszSubKey, pszValue, dwFlags, pdwType, pvData, pcbData, + cbData); + + if ((dwFlags & RRF_RT_REG_EXPAND_SZ) && !(dwFlags & RRF_NOEXPAND)) + return ERROR_INVALID_PARAMETER; + + if (pszSubKey && pszSubKey[0]) + { + ret = RegOpenKeyExA(hKey, pszSubKey, 0, KEY_QUERY_VALUE, &hKey); + if (ret != ERROR_SUCCESS) return ret; + } + + ret = RegQueryValueExA(hKey, pszValue, NULL, &dwType, pvData, &cbData); + + /* If we are going to expand we need to read in the whole the value even + * if the passed buffer was too small as the expanded string might be + * smaller than the unexpanded one and could fit into cbData bytes. */ + if ((ret == ERROR_SUCCESS || ret == ERROR_MORE_DATA) && + (dwType == REG_EXPAND_SZ && !(dwFlags & RRF_NOEXPAND))) + { + do { + if (pvBuf) HeapFree(GetProcessHeap(), 0, pvBuf); + + pvBuf = HeapAlloc(GetProcessHeap(), 0, cbData); + if (!pvBuf) + { + ret = ERROR_NOT_ENOUGH_MEMORY; + break; + } + + if (ret == ERROR_MORE_DATA) + ret = RegQueryValueExA(hKey, pszValue, NULL, + &dwType, pvBuf, &cbData); + else + { + /* Even if cbData was large enough we have to copy the + * string since ExpandEnvironmentStrings can't handle + * overlapping buffers. */ + CopyMemory(pvBuf, pvData, cbData); + } + + /* Both the type or the value itself could have been modified in + * between so we have to keep retrying until the buffer is large + * enough or we no longer have to expand the value. */ + } while (dwType == REG_EXPAND_SZ && ret == ERROR_MORE_DATA); + + if (ret == ERROR_SUCCESS) + { + if (dwType == REG_EXPAND_SZ) + { + cbData = ExpandEnvironmentStringsA(pvBuf, pvData, + pcbData ? *pcbData : 0); + dwType = REG_SZ; + if(pcbData && cbData > *pcbData) + ret = ERROR_MORE_DATA; + } + else if (pcbData) + CopyMemory(pvData, pvBuf, *pcbData); + } + + if (pvBuf) HeapFree(GetProcessHeap(), 0, pvBuf); + } + + if (pszSubKey && pszSubKey[0]) + RegCloseKey(hKey); + + RegpApplyRestrictions(dwFlags, dwType, cbData, &ret); + + if (pcbData && ret != ERROR_SUCCESS && (dwFlags & RRF_ZEROONFAILURE)) + ZeroMemory(pvData, *pcbData); + + if (pdwType) *pdwType = dwType; + if (pcbData) *pcbData = cbData; + + return ret; +} + /************************************************************************ * RegSetKeyValueW

18 years, 4 months

[greatlrd] 22490: Start adding qemu-system-ppc support.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Jun 22 01:03:36 2006 New Revision: 22490 URL: http://svn.reactos.ru/svn/reactos?rev=22490&view=rev Log: Start adding qemu-system-ppc support. Modified: trunk/tools/Qemu GUI/QEmu.cs trunk/tools/Qemu GUI/bin/Release/Qemu GUI.exe trunk/tools/Qemu GUI/frmMain.cs Modified: trunk/tools/Qemu GUI/QEmu.cs URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/QEmu.cs?rev=22490&… ============================================================================== --- trunk/tools/Qemu GUI/QEmu.cs (original) +++ trunk/tools/Qemu GUI/QEmu.cs Thu Jun 22 01:03:36 2006 @@ -18,7 +18,10 @@ ARM_integratorcp926, ARM_integratorcp1026, ARM_versatilepb, - ARM_versatileab + ARM_versatileab, + PPC_g3bw, + PPC_mac99, + PPC_prep } [XmlRoot("Settings")] @@ -149,6 +152,11 @@ case Platforms.ARM_versatilepb: case Platforms.ARM_versatileab: p.StartInfo.FileName = this.Paths.QEmu + "\\qemu-system-arm.exe"; + break; + case Platforms.PPC_g3bw: + case Platforms.PPC_mac99: + case Platforms.PPC_prep: + p.StartInfo.FileName = this.Paths.QEmu + "\\qemu-system-ppc.exe"; break; } @@ -407,6 +415,17 @@ case Platforms.ARM_versatileab: buffer += "-M versatileab "; break; + case Platforms.PPC_g3bw: + buffer += "-M g3bw "; + break; + case Platforms.PPC_mac99: + buffer += "-M mac99 "; + break; + case Platforms.PPC_prep: + buffer += "-M prep "; + break; + + } /* Boot options */ Modified: trunk/tools/Qemu GUI/bin/Release/Qemu GUI.exe URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/bin/Release/Qemu%2… ============================================================================== Binary files - no diff available. Modified: trunk/tools/Qemu GUI/frmMain.cs URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/frmMain.cs?rev=224… ============================================================================== --- trunk/tools/Qemu GUI/frmMain.cs (original) +++ trunk/tools/Qemu GUI/frmMain.cs Thu Jun 22 01:03:36 2006 @@ -331,7 +331,10 @@ "ARM Integrator/CP (ARM926EJ-S) ", "ARM Integrator/CP (ARM1026EJ-S)", "ARM Versatile/PB (ARM926EJ-S)", - "ARM Versatile/AB (ARM926EJ-S)"}); + "ARM Versatile/AB (ARM926EJ-S)", + "PPC Heathrow based PowerMAC", + "PPC Mac99 based PowerMAC", + "PPC PowerPC PREP platform"}); this.cboMachine.Location = new System.Drawing.Point(19, 19); this.cboMachine.Name = "cboMachine"; this.cboMachine.Size = new System.Drawing.Size(239, 21);

18 years, 4 months

[gedmurphy] 22489: load correct entry from registry

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Jun 22 00:46:37 2006 New Revision: 22489 URL: http://svn.reactos.ru/svn/reactos?rev=22489&view=rev Log: load correct entry from registry Modified: trunk/reactos/dll/cpl/timedate/timedate.c Modified: trunk/reactos/dll/cpl/timedate/timedate.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.c… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.c (original) +++ trunk/reactos/dll/cpl/timedate/timedate.c Thu Jun 22 00:46:37 2006 @@ -962,7 +962,7 @@ SendMessage(hList, CB_SETCURSEL, - --Default, + --Default, /* reg entries count from 1 */ 0); RegCloseKey(hKey); @@ -987,7 +987,8 @@ 0, 0); - _itow(Sel, szSel, 10); + /* reg entries count from 1 */ + _itow(++Sel, szSel, 10); Ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\DateTime\\Servers",

18 years, 4 months

[greatlrd] 22488: Start adding qemu-system-arm support.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Jun 22 00:36:59 2006 New Revision: 22488 URL: http://svn.reactos.ru/svn/reactos?rev=22488&view=rev Log: Start adding qemu-system-arm support. Modified: trunk/tools/Qemu GUI/QEmu.cs trunk/tools/Qemu GUI/bin/Release/Qemu GUI.exe trunk/tools/Qemu GUI/frmMain.cs Modified: trunk/tools/Qemu GUI/QEmu.cs URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/QEmu.cs?rev=22488&… ============================================================================== --- trunk/tools/Qemu GUI/QEmu.cs (original) +++ trunk/tools/Qemu GUI/QEmu.cs Thu Jun 22 00:36:59 2006 @@ -14,7 +14,11 @@ x86 = 0, x86_ISA, x64, - x64_ISA + x64_ISA, + ARM_integratorcp926, + ARM_integratorcp1026, + ARM_versatilepb, + ARM_versatileab } [XmlRoot("Settings")] @@ -72,6 +76,7 @@ return m_LastError; } + public bool MountImage() { Process p = new Process(); @@ -138,7 +143,14 @@ break; case Platforms.x64_ISA: p.StartInfo.FileName = this.Paths.QEmu + "\\qemu-system-x86_64.exe"; - break; + break; + case Platforms.ARM_integratorcp926: + case Platforms.ARM_integratorcp1026: + case Platforms.ARM_versatilepb: + case Platforms.ARM_versatileab: + p.StartInfo.FileName = this.Paths.QEmu + "\\qemu-system-arm.exe"; + break; + } p.StartInfo.WorkingDirectory = this.Paths.QEmu; @@ -381,6 +393,20 @@ case Platforms.x64_ISA: buffer += "-M isapc "; break; + case Platforms.ARM_integratorcp926: + buffer += "-M integratorcp926 "; + break; + + case Platforms.ARM_integratorcp1026: + buffer += "-M integratorcp1026 "; + break; + + case Platforms.ARM_versatilepb: + buffer += "-M versatilepb "; + break; + case Platforms.ARM_versatileab: + buffer += "-M versatileab "; + break; } /* Boot options */ Modified: trunk/tools/Qemu GUI/bin/Release/Qemu GUI.exe URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/bin/Release/Qemu%2… ============================================================================== Binary files - no diff available. Modified: trunk/tools/Qemu GUI/frmMain.cs URL: http://svn.reactos.ru/svn/reactos/trunk/tools/Qemu%20GUI/frmMain.cs?rev=224… ============================================================================== --- trunk/tools/Qemu GUI/frmMain.cs (original) +++ trunk/tools/Qemu GUI/frmMain.cs Thu Jun 22 00:36:59 2006 @@ -223,6 +223,7 @@ this.btnMount = new System.Windows.Forms.Button(); this.lblImage = new System.Windows.Forms.Label(); this.groupBox9 = new System.Windows.Forms.GroupBox(); + this.lblImageSizeMB = new System.Windows.Forms.Label(); this.label11 = new System.Windows.Forms.Label(); this.txtImageSize = new System.Windows.Forms.TextBox(); this.lblImageSize = new System.Windows.Forms.Label(); @@ -273,7 +274,6 @@ this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog(); this.btnLoad = new System.Windows.Forms.Button(); this.btnSave = new System.Windows.Forms.Button(); - this.lblImageSizeMB = new System.Windows.Forms.Label(); this.grpMachine.SuspendLayout(); this.HardDisk2.SuspendLayout(); this.tabMisc.SuspendLayout(); @@ -327,7 +327,11 @@ "Standard PC 32Bit", "ISA only PC 32Bit", "Standard PC 64Bit", - "ISA only PC 64Bit"}); + "ISA only PC 64Bit", + "ARM Integrator/CP (ARM926EJ-S) ", + "ARM Integrator/CP (ARM1026EJ-S)", + "ARM Versatile/PB (ARM926EJ-S)", + "ARM Versatile/AB (ARM926EJ-S)"}); this.cboMachine.Location = new System.Drawing.Point(19, 19); this.cboMachine.Name = "cboMachine"; this.cboMachine.Size = new System.Drawing.Size(239, 21); @@ -952,6 +956,15 @@ this.groupBox9.TabStop = false; this.groupBox9.Text = "Harddisk Tools"; // + // lblImageSizeMB + // + this.lblImageSizeMB.AutoSize = true; + this.lblImageSizeMB.Location = new System.Drawing.Point(83, 42); + this.lblImageSizeMB.Name = "lblImageSizeMB"; + this.lblImageSizeMB.Size = new System.Drawing.Size(23, 13); + this.lblImageSizeMB.TabIndex = 8; + this.lblImageSizeMB.Text = "MB"; + // // label11 // this.label11.Location = new System.Drawing.Point(125, 24); @@ -1414,15 +1427,6 @@ this.btnSave.TabIndex = 6; this.btnSave.Text = "Save"; this.btnSave.Click += new System.EventHandler(this.btnSave_Click); - // - // lblImageSizeMB - // - this.lblImageSizeMB.AutoSize = true; - this.lblImageSizeMB.Location = new System.Drawing.Point(83, 42); - this.lblImageSizeMB.Name = "lblImageSizeMB"; - this.lblImageSizeMB.Size = new System.Drawing.Size(23, 13); - this.lblImageSizeMB.TabIndex = 8; - this.lblImageSizeMB.Text = "MB"; // // frmMain //

18 years, 4 months

[gedmurphy] 22487: oops, I can be so selfish sometimes ; )

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Jun 22 00:14:11 2006 New Revision: 22487 URL: http://svn.reactos.ru/svn/reactos?rev=22487&view=rev Log: oops, I can be so selfish sometimes ;) Modified: trunk/reactos/dll/cpl/timedate/Cz.rc trunk/reactos/dll/cpl/timedate/De.rc trunk/reactos/dll/cpl/timedate/Dk.rc trunk/reactos/dll/cpl/timedate/Es.rc trunk/reactos/dll/cpl/timedate/Fr.rc trunk/reactos/dll/cpl/timedate/Gr.rc trunk/reactos/dll/cpl/timedate/Hu.rc trunk/reactos/dll/cpl/timedate/It.rc trunk/reactos/dll/cpl/timedate/Ja.rc trunk/reactos/dll/cpl/timedate/Nl.rc trunk/reactos/dll/cpl/timedate/Pl.rc trunk/reactos/dll/cpl/timedate/Ru.rc trunk/reactos/dll/cpl/timedate/Sv.rc Modified: trunk/reactos/dll/cpl/timedate/Cz.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Cz.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Cz.rc (original) +++ trunk/reactos/dll/cpl/timedate/Cz.rc Thu Jun 22 00:14:11 2006 @@ -19,6 +19,8 @@ DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 144, 105, 90, 12 LTEXT "", IDC_TIMEZONE, 4, 136, 241, 8 + CONTROL "", IDC_CLOCKWND, "ClockWndClass", + WS_CHILD | WS_VISIBLE, 138, 12, 102, 89 END Modified: trunk/reactos/dll/cpl/timedate/De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/De.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/timedate/De.rc (original) +++ trunk/reactos/dll/cpl/timedate/De.rc Thu Jun 22 00:14:11 2006 @@ -20,6 +20,8 @@ DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 144, 105, 90, 12 LTEXT "Aktuelle Zeitzone: %s", IDC_TIMEZONE, 4, 136, 241, 8 + CONTROL "", IDC_CLOCKWND, "ClockWndClass", + WS_CHILD | WS_VISIBLE, 138, 12, 102, 89 END Modified: trunk/reactos/dll/cpl/timedate/Dk.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Dk.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Dk.rc (original) +++ trunk/reactos/dll/cpl/timedate/Dk.rc Thu Jun 22 00:14:11 2006 @@ -20,6 +20,8 @@ DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 144, 105, 90, 12 LTEXT "Nuværende Tidszone:", IDC_TIMEZONE, 4, 138, 241, 8 + CONTROL "", IDC_CLOCKWND, "ClockWndClass", + WS_CHILD | WS_VISIBLE, 138, 12, 102, 89 END Modified: trunk/reactos/dll/cpl/timedate/Es.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Es.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Es.rc (original) +++ trunk/reactos/dll/cpl/timedate/Es.rc Thu Jun 22 00:14:11 2006 @@ -19,6 +19,8 @@ DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 144, 105, 90, 12 LTEXT "", IDC_TIMEZONE, 4, 136, 241, 8 + CONTROL "", IDC_CLOCKWND, "ClockWndClass", + WS_CHILD | WS_VISIBLE, 138, 12, 102, 89 END Modified: trunk/reactos/dll/cpl/timedate/Fr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Fr.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Fr.rc (original) +++ trunk/reactos/dll/cpl/timedate/Fr.rc Thu Jun 22 00:14:11 2006 @@ -19,6 +19,8 @@ DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 144, 105, 90, 12 LTEXT "", IDC_TIMEZONE, 4, 136, 241, 8 + CONTROL "", IDC_CLOCKWND, "ClockWndClass", + WS_CHILD | WS_VISIBLE, 138, 12, 102, 89 END Modified: trunk/reactos/dll/cpl/timedate/Gr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Gr.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Gr.rc (original) +++ trunk/reactos/dll/cpl/timedate/Gr.rc Thu Jun 22 00:14:11 2006 @@ -20,6 +20,8 @@ DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 144, 105, 90, 12 LTEXT "", IDC_TIMEZONE, 4, 136, 241, 8 + CONTROL "", IDC_CLOCKWND, "ClockWndClass", + WS_CHILD | WS_VISIBLE, 138, 12, 102, 89 END Modified: trunk/reactos/dll/cpl/timedate/Hu.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Hu.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Hu.rc (original) +++ trunk/reactos/dll/cpl/timedate/Hu.rc Thu Jun 22 00:14:11 2006 @@ -21,6 +21,8 @@ DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 144, 105, 90, 12 LTEXT "", IDC_TIMEZONE, 4, 136, 241, 8 + CONTROL "", IDC_CLOCKWND, "ClockWndClass", + WS_CHILD | WS_VISIBLE, 138, 12, 102, 89 END Modified: trunk/reactos/dll/cpl/timedate/It.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/It.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/timedate/It.rc (original) +++ trunk/reactos/dll/cpl/timedate/It.rc Thu Jun 22 00:14:11 2006 @@ -20,6 +20,8 @@ DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 144, 105, 90, 12 LTEXT "", IDC_TIMEZONE, 4, 136, 241, 8 + CONTROL "", IDC_CLOCKWND, "ClockWndClass", + WS_CHILD | WS_VISIBLE, 138, 12, 102, 89 END Modified: trunk/reactos/dll/cpl/timedate/Ja.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Ja.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Ja.rc (original) +++ trunk/reactos/dll/cpl/timedate/Ja.rc Thu Jun 22 00:14:11 2006 @@ -20,6 +20,8 @@ DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 144, 105, 90, 12 LTEXT "", IDC_TIMEZONE, 4, 136, 241, 8 + CONTROL "", IDC_CLOCKWND, "ClockWndClass", + WS_CHILD | WS_VISIBLE, 138, 12, 102, 89 END Modified: trunk/reactos/dll/cpl/timedate/Nl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Nl.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Nl.rc (original) +++ trunk/reactos/dll/cpl/timedate/Nl.rc Thu Jun 22 00:14:11 2006 @@ -19,6 +19,8 @@ DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 144, 105, 90, 12 LTEXT "", IDC_TIMEZONE, 4, 136, 241, 8 + CONTROL "", IDC_CLOCKWND, "ClockWndClass", + WS_CHILD | WS_VISIBLE, 138, 12, 102, 89 END Modified: trunk/reactos/dll/cpl/timedate/Pl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Pl.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Pl.rc (original) +++ trunk/reactos/dll/cpl/timedate/Pl.rc Thu Jun 22 00:14:11 2006 @@ -21,6 +21,8 @@ DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 144, 105, 90, 12 LTEXT "", IDC_TIMEZONE, 4, 136, 241, 8 + CONTROL "", IDC_CLOCKWND, "ClockWndClass", + WS_CHILD | WS_VISIBLE, 138, 12, 102, 89 END Modified: trunk/reactos/dll/cpl/timedate/Ru.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Ru.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Ru.rc (original) +++ trunk/reactos/dll/cpl/timedate/Ru.rc Thu Jun 22 00:14:11 2006 @@ -19,6 +19,8 @@ DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 144, 105, 90, 12 LTEXT "", IDC_TIMEZONE, 4, 136, 241, 8 + CONTROL "", IDC_CLOCKWND, "ClockWndClass", + WS_CHILD | WS_VISIBLE, 138, 12, 102, 89 END Modified: trunk/reactos/dll/cpl/timedate/Sv.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/Sv.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Sv.rc (original) +++ trunk/reactos/dll/cpl/timedate/Sv.rc Thu Jun 22 00:14:11 2006 @@ -24,6 +24,8 @@ DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 144, 105, 90, 12 LTEXT "", IDC_TIMEZONE, 4, 136, 241, 8 + CONTROL "", IDC_CLOCKWND, "ClockWndClass", + WS_CHILD | WS_VISIBLE, 138, 12, 102, 89 END

18 years, 4 months

[gedmurphy] 22486: - Add more code for NTP server selection. - draw clock window from resource file to fix dialog unit / pixel anomaly ; ) - Do a bit of work on the NTP client. Still untested and may change to tcp. All untested and I'm no where near finished yet, but there are a few bug fixes in here, and I'm running short on time ; )

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Jun 21 23:57:58 2006 New Revision: 22486 URL: http://svn.reactos.ru/svn/reactos?rev=22486&view=rev Log: - Add more code for NTP server selection. - draw clock window from resource file to fix dialog unit / pixel anomaly ;) - Do a bit of work on the NTP client. Still untested and may change to tcp. All untested and I'm no where near finished yet, but there are a few bug fixes in here, and I'm running short on time ;) Modified: trunk/reactos/dll/cpl/timedate/En.rc trunk/reactos/dll/cpl/timedate/clock.c trunk/reactos/dll/cpl/timedate/monthcal.c trunk/reactos/dll/cpl/timedate/ntpclient.c trunk/reactos/dll/cpl/timedate/resource.h trunk/reactos/dll/cpl/timedate/timedate.c trunk/reactos/dll/cpl/timedate/timedate.h trunk/reactos/dll/cpl/timedate/timedate.rbuild Modified: trunk/reactos/dll/cpl/timedate/En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/En.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/timedate/En.rc (original) +++ trunk/reactos/dll/cpl/timedate/En.rc Wed Jun 21 23:57:58 2006 @@ -20,6 +20,8 @@ DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 144, 105, 90, 12 LTEXT "", IDC_TIMEZONE, 4, 136, 241, 8 + CONTROL "", IDC_CLOCKWND, "ClockWndClass", + WS_CHILD | WS_VISIBLE, 138, 12, 102, 89 END Modified: trunk/reactos/dll/cpl/timedate/clock.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/clock.c?re… ============================================================================== --- trunk/reactos/dll/cpl/timedate/clock.c (original) +++ trunk/reactos/dll/cpl/timedate/clock.c Wed Jun 21 23:57:58 2006 @@ -5,10 +5,11 @@ #define TWOPI (2 * 3.14159) static const TCHAR szClockWndClass[] = TEXT("ClockWndClass"); + static HBRUSH hGreyBrush = NULL; static HPEN hGreyPen = NULL; -static VOID +static VOID SetIsotropic(HDC hdc, INT cxClient, INT cyClient) { /* set isotropic mode */ @@ -17,25 +18,25 @@ SetViewportOrgEx(hdc, cxClient / 2, cyClient / 2, NULL); } -static VOID +static VOID RotatePoint(POINT pt[], INT iNum, INT iAngle) { INT i; POINT ptTemp; - + for (i = 0 ; i < iNum ; i++) { ptTemp.x = (INT) (pt[i].x * cos (TWOPI * iAngle / 360) + pt[i].y * sin (TWOPI * iAngle / 360)); - + ptTemp.y = (INT) (pt[i].y * cos (TWOPI * iAngle / 360) - pt[i].x * sin (TWOPI * iAngle / 360)); - + pt[i] = ptTemp; } } -static VOID +static VOID DrawClock(HDC hdc) { INT iAngle; @@ -43,7 +44,7 @@ HBRUSH hBrushOld; HPEN hPenOld = NULL; - /* grey brush to fill the dots */ + /* grey brush to fill the dots */ hBrushOld = SelectObject(hdc, hGreyBrush); hPenOld = GetCurrentObject(hdc, OBJ_PEN); @@ -61,7 +62,7 @@ * i.e. 1-4 or 5, 6-9 or 10, 11-14 or 15 */ if (iAngle % 5) { - pt[2].x = pt[2].y = 7; + pt[2].x = pt[2].y = 7; SelectObject(hdc, hGreyPen); } else @@ -79,12 +80,12 @@ Ellipse(hdc, pt[0].x, pt[0].y, pt[1].x, pt[1].y); } - + SelectObject(hdc, hBrushOld); SelectObject(hdc, hPenOld); } -static VOID +static VOID DrawHands(HDC hdc, SYSTEMTIME * pst, BOOL fChange) { static POINT pt[3][5] = { {{0, -30}, {20, 0}, {0, 100}, {-20, 0}, {0, -30}}, @@ -101,7 +102,7 @@ iAngle[1] = pst->wMinute * 6; iAngle[2] = pst->wSecond * 6; - memcpy(ptTemp, pt, sizeof(pt)); + CopyMemory(ptTemp, pt, sizeof(pt)); for(i = fChange ? 0 : 2; i < 3; i++) { @@ -118,7 +119,7 @@ WPARAM wParam, LPARAM lParam) { - + static INT cxClient, cyClient; static SYSTEMTIME stPrevious; HDC hdc; @@ -166,9 +167,9 @@ break; default: - DefWindowProc(hwnd, - uMsg, - wParam, + DefWindowProc(hwnd, + uMsg, + wParam, lParam); } @@ -176,21 +177,25 @@ } - BOOL -InitClockWindowClass(VOID) +RegisterClockControl(VOID) { WNDCLASSEX wc = {0}; wc.cbSize = sizeof(WNDCLASSEX); - wc.style = CS_HREDRAW | CS_VREDRAW; wc.lpfnWndProc = ClockWndProc; wc.hInstance = hApplet; - wc.hIcon = NULL; wc.hCursor = LoadCursor(NULL, IDC_ARROW); wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); wc.lpszClassName = szClockWndClass; - wc.hIconSm = NULL; return RegisterClassEx(&wc) != (ATOM)0; } + + +VOID +UnregisterClockControl(VOID) +{ + UnregisterClass(szClockWndClass, + hApplet); +} Modified: trunk/reactos/dll/cpl/timedate/monthcal.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/monthcal.c… ============================================================================== --- trunk/reactos/dll/cpl/timedate/monthcal.c (original) +++ trunk/reactos/dll/cpl/timedate/monthcal.c Wed Jun 21 23:57:58 2006 @@ -80,7 +80,7 @@ (WPARAM)pnmh->idFrom, (LPARAM)pnmh); } - + return Ret; } @@ -163,7 +163,7 @@ NewCellSize.cy = infoPtr->ClientSize.cy / 7; if (infoPtr->CellSize.cx != NewCellSize.cx || - infoPtr->CellSize.cy != NewCellSize.cy); + infoPtr->CellSize.cy != NewCellSize.cy) { infoPtr->CellSize = NewCellSize; RepaintHeader = TRUE; @@ -668,15 +668,15 @@ { PMONTHCALWND infoPtr; LRESULT Ret = 0; - + infoPtr = (PMONTHCALWND)GetWindowLongPtr(hwnd, 0); - + if (infoPtr == NULL && uMsg != WM_CREATE) { goto HandleDefaultMessage; } - + switch (uMsg) { #if MONTHCAL_CTRLBG != MONTHCAL_DISABLED_CTRLBG @@ -815,7 +815,7 @@ case WM_GETDLGCODE: { INT virtKey; - + virtKey = (lParam != 0 ? (INT)((LPMSG)lParam)->wParam : 0); switch (virtKey) { Modified: trunk/reactos/dll/cpl/timedate/ntpclient.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/ntpclient.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/ntpclient.c (original) +++ trunk/reactos/dll/cpl/timedate/ntpclient.c Wed Jun 21 23:57:58 2006 @@ -3,7 +3,7 @@ SOCKET Sock; SOCKADDR_IN myAddr, ntpAddr; -BOOL InitialiseConnection() +BOOL InitialiseConnection(CHAR *szIpAddr) { WSADATA wsaData; INT Ret; @@ -12,7 +12,6 @@ &wsaData); if (Ret != 0) return FALSE; - Sock = WSASocket(AF_INET, SOCK_DGRAM, @@ -27,7 +26,7 @@ ZeroMemory(&myAddr, sizeof(myAddr)); myAddr.sin_family = AF_INET; myAddr.sin_port = htons(IPPORT_TIMESERVER); - myAddr.sin_addr.s_addr = INADDR_ANY; + myAddr.sin_addr.s_addr = inet_addr(szIpAddr); Ret = bind(Sock, (SOCKADDR *)&myAddr, @@ -69,19 +68,22 @@ } -BOOL RecieveData(CHAR *Buf) +ULONG RecieveData(ULONG ulTime) { INT Ret; INT Size = sizeof(SOCKADDR_IN); Ret = recvfrom(Sock, - Buf, - BUFSIZE, + (char *)&ulTime, + 4, 0, (SOCKADDR *)&ntpAddr, &Size); - if (Ret == SOCKET_ERROR) - return FALSE; + if (Ret != SOCKET_ERROR) + ulTime = ntohl(ulTime); + else + ulTime = 0; - return TRUE; + + return ulTime; } Modified: trunk/reactos/dll/cpl/timedate/resource.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/resource.h… ============================================================================== --- trunk/reactos/dll/cpl/timedate/resource.h (original) +++ trunk/reactos/dll/cpl/timedate/resource.h Wed Jun 21 23:57:58 2006 @@ -8,6 +8,7 @@ #define IDC_MONTHCB 101 #define IDC_YEAREDIT 102 #define IDC_MONTHCALENDAR 103 +#define IDC_CLOCKWND 104 #define IDC_TIMEZONE 106 #define IDC_TIMEPICKER 107 #define IDC_YEAR 108 Modified: trunk/reactos/dll/cpl/timedate/timedate.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.c… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.c (original) +++ trunk/reactos/dll/cpl/timedate/timedate.c Wed Jun 21 23:57:58 2006 @@ -59,6 +59,25 @@ { {IDC_CPLICON, IDS_CPLNAME, IDS_CPLDESCRIPTION, Applet} }; + +VOID GetError(VOID) +{ + LPVOID lpMsgBuf; + + FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + GetLastError(), + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR) &lpMsgBuf, + 0, + NULL ); + + MessageBox(NULL, lpMsgBuf, _T("Error!"), MB_OK | MB_ICONERROR); + + LocalFree(lpMsgBuf); +} static BOOL SystemSetLocalTime(LPSYSTEMTIME lpSystemTime) @@ -284,6 +303,8 @@ AutoUpdateMonthCal(HWND hwndDlg, PNMMCCAUTOUPDATE lpAutoUpdate) { + UNREFERENCED_PARAMETER(lpAutoUpdate); + /* update the controls */ FillMonthsComboBox(GetDlgItem(hwndDlg, IDC_MONTHCB)); @@ -292,9 +313,9 @@ INT_PTR CALLBACK DTPProc(HWND hwnd, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) + UINT uMsg, + WPARAM wParam, + LPARAM lParam) { switch (uMsg) { @@ -302,11 +323,11 @@ /* stop the timer when the user is about to change the time */ if ((wParam != VK_LEFT) & (wParam != VK_RIGHT)) KillTimer(GetParent(hwnd), ID_TIMER); - return CallWindowProc(pOldWndProc, hwnd, uMsg, wParam, lParam); - break; - default: - return CallWindowProc(pOldWndProc, hwnd, uMsg, wParam, lParam); + break; + } + + return CallWindowProc(pOldWndProc, hwnd, uMsg, wParam, lParam); } /* Property page dialog callback */ @@ -331,23 +352,13 @@ SendMessage(GetDlgItem(hwndDlg, IDC_YEAR), UDM_SETRANGE, 0, MAKELONG ((short) 9999, (short) 1900)); SendMessage(GetDlgItem(hwndDlg, IDC_YEAR), UDM_SETPOS, 0, MAKELONG( (short) st.wYear, 0)); - InitClockWindowClass(); - CreateWindowExW(0, - L"ClockWndClass", - L"Clock", - WS_CHILD | WS_VISIBLE, - 208, 14, 150, 150, - hwndDlg, - NULL, - hApplet, - NULL); - pOldWndProc = (WNDPROC) SetWindowLong(GetDlgItem(hwndDlg, IDC_TIMEPICKER), GWL_WNDPROC, (INT_PTR) DTPProc); + break; case WM_TIMER: { - SendMessage(GetDlgItem(hwndDlg, IDC_TIMEPICKER), DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM) &st); + SendMessage(GetDlgItem(hwndDlg, IDC_TIMEPICKER), DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM) &st); break; } case WM_COMMAND: @@ -387,7 +398,7 @@ case UDN_DELTAPOS: { short wYear; - LPNMUPDOWN updown = (LPNMUPDOWN) lpnm; + LPNMUPDOWN updown = (LPNMUPDOWN) lpnm; wYear = SendMessage(GetDlgItem(hwndDlg, IDC_YEAR), UDM_GETPOS, 0, 0); /* Enable the 'Apply' button */ PropSheet_Changed(GetParent(hwndDlg), hwndDlg); @@ -461,8 +472,6 @@ return FALSE; } - - static PTIMEZONE_ENTRY @@ -841,15 +850,15 @@ hdc = BeginPaint(hwndDlg, &ps); hdcMem = CreateCompatibleDC(hdc); SelectObject(hdcMem, hBitmap); - StretchBlt(lpDrawItem->hDC, lpDrawItem->rcItem.left, lpDrawItem->rcItem.top, + StretchBlt(lpDrawItem->hDC, lpDrawItem->rcItem.left, lpDrawItem->rcItem.top, lpDrawItem->rcItem.right - lpDrawItem->rcItem.left, - lpDrawItem->rcItem.bottom - lpDrawItem->rcItem.top, + lpDrawItem->rcItem.bottom - lpDrawItem->rcItem.top, hdcMem, 0, 0, cxSource, cySource, SRCCOPY); DeleteDC(hdcMem); EndPaint(hwndDlg, &ps); } break; - } + } case WM_COMMAND: if ((LOWORD(wParam) == IDC_TIMEZONELIST && HIWORD(wParam) == CBN_SELCHANGE) || (LOWORD(wParam) == IDC_AUTODAYLIGHT && HIWORD(wParam) == BN_CLICKED)) @@ -960,22 +969,23 @@ } - -VOID SetNTPServer(HWND hwnd) +/* Set the selected server in the registry */ +static VOID +SetNTPServer(HWND hwnd) { HKEY hKey; HWND hList; - INT Sel; + UINT Sel; WCHAR szSel[4]; LONG Ret; -//DebugBreak(); + hList = GetDlgItem(hwnd, IDC_SERVERLIST); - Sel = (INT)SendMessage(hList, - CB_GETCURSEL, - 0, - 0); + Sel = (UINT)SendMessage(hList, + CB_GETCURSEL, + 0, + 0); _itow(Sel, szSel, 10); @@ -985,7 +995,10 @@ KEY_SET_VALUE, &hKey); if (Ret != ERROR_SUCCESS) + { + GetError(); return; + } Ret = RegSetValueExW(hKey, L"", @@ -993,34 +1006,142 @@ REG_SZ, (LPBYTE)szSel, sizeof(szSel)); - if (Ret == ERROR_SUCCESS) - MessageBoxW(NULL, szSel, NULL, 0); - else - { - WCHAR Buff[20]; - _itow(Ret, Buff, 10); - //MessageBoxW(NULL, Buff, NULL, 0); - } + if (Ret != ERROR_SUCCESS) + GetError(); RegCloseKey(hKey); - - -} - - -VOID UpdateSystemTime(HWND hwndDlg) -{ - //SYSTEMTIME systime; - CHAR Buf[BUFSIZE]; - - InitialiseConnection(); - SendData(); - RecieveData(Buf); +} + + +/* get the dotted decimal address from the registry */ +static BOOL +GetNTPServerAddress(CHAR *szIpAddr) +{ + HKEY hKey; + WCHAR szSel[4]; + WCHAR buf[32]; + DWORD dwSize; + LONG Ret; + + Ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\DateTime\\Servers", + 0, + KEY_QUERY_VALUE, + &hKey); + if (Ret != ERROR_SUCCESS) + { + GetError(); + return FALSE; + } + + dwSize = sizeof(szSel); + Ret = RegQueryValueExW(hKey, + L"", + NULL, + NULL, + (LPBYTE)szSel, + &dwSize); + if (Ret != ERROR_SUCCESS) + { + GetError(); + return FALSE; + } + + dwSize = sizeof(szSel); + Ret = RegQueryValueExW(hKey, + szSel, + NULL, + NULL, + (LPBYTE)buf, + &dwSize); + if (Ret != ERROR_SUCCESS) + { + GetError(); + return FALSE; + } + + if (WideCharToMultiByte(CP_ACP, + 0, + buf, + sizeof(buf), + szIpAddr, + sizeof(szIpAddr), + NULL, + NULL) == 0) + { + GetError(); + return FALSE; + } + + /* safety check */ + if (inet_addr(szIpAddr) == INADDR_NONE) + return FALSE; + + return TRUE; +} + + +/* request the time from the current NTP server */ +static ULONG +GetTimeFromServer(VOID) +{ + CHAR szIpAddr[32]; + ULONG ulTime = 0; + + if (! GetNTPServerAddress(szIpAddr)) + return 0; + + if (InitialiseConnection(szIpAddr)) + { + if (SendData()) + { + RecieveData(ulTime); + } + } + DestroyConnection(); - //DateTime_SetSystemtime(hwndDlg, 0, systime); -} + return ulTime; +} + +/* + * NTP servers state the number of seconds passed since + * 1st Jan, 1900. The time returned from the server + * needs adding to that date to get the current Gregorian time + */ +static VOID +UpdateSystemTime(ULONG ulTime) +{ + FILETIME ftNew; + LARGE_INTEGER li; + SYSTEMTIME stNew; + + /* time at 1st Jan 1900 */ + stNew.wYear = 1900; + stNew.wMonth = 1; + stNew.wDay = 1; + stNew.wHour = 0; + stNew.wMinute = 0; + stNew.wSecond = 0; + stNew.wMilliseconds = 0; + + /* convert to a file time */ + SystemTimeToFileTime(&stNew, &ftNew); + + /* add on the time passed since 1st Jan 1900 */ + li = *(LARGE_INTEGER *)&ftNew; + li.QuadPart += (LONGLONG)10000000 * ulTime; + ftNew = * (FILETIME *)&li; + + /* convert back to a system time */ + FileTimeToSystemTime(&ftNew, &stNew); + + if (! SetSystemTime(&stNew)) + GetError(); + +} + /* Property page dialog callback */ INT_PTR CALLBACK @@ -1040,36 +1161,46 @@ switch(LOWORD(wParam)) { case IDC_UPDATEBUTTON: + { + ULONG ulTime; + SetNTPServer(hwndDlg); - //UpdateSystemTime(hwndDlg); - MessageBox(NULL, L"Not yet implemented", NULL, 0); + + ulTime = GetTimeFromServer(); + if (ulTime != 0) + UpdateSystemTime(ulTime); + + } break; case IDC_SERVERLIST: + { if (HIWORD(wParam) == CBN_SELCHANGE) /* Enable the 'Apply' button */ PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } break; case IDC_AUTOSYNC: + { if (HIWORD(wParam) == BN_CLICKED) { + BOOL bChecked; HWND hCheck = GetDlgItem(hwndDlg, IDC_AUTOSYNC); - //HWND hSerText = GetDlgItem(hwndDlg, IDC_SERVERTEXT); - //HWND hSerList = GetDlgItem(hwndDlg, IDC_SERVERLIST); - //HWND hUpdateBut = GetDlgItem(hwndDlg, IDC_UPDATEBUTTON); - //HWND hSucSync = GetDlgItem(hwndDlg, IDC_SUCSYNC); - //HWND hNextSync = GetDlgItem(hwndDlg, IDC_NEXTSYNC); - - INT Check = (INT)SendMessageW(hCheck, BM_GETCHECK, 0, 0); - if (Check) - ;//show all data - else - ;//hide all data + UINT Check = (UINT)SendMessageW(hCheck, BM_GETCHECK, 0, 0); + + bChecked = (Check == BST_CHECKED) ? TRUE : FALSE; + + EnableWindow(GetDlgItem(hwndDlg, IDC_SERVERTEXT), bChecked); + EnableWindow(GetDlgItem(hwndDlg, IDC_SERVERLIST), bChecked); + EnableWindow(GetDlgItem(hwndDlg, IDC_UPDATEBUTTON), bChecked); + EnableWindow(GetDlgItem(hwndDlg, IDC_SUCSYNC), bChecked); + EnableWindow(GetDlgItem(hwndDlg, IDC_NEXTSYNC), bChecked); /* Enable the 'Apply' button */ PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } + } break; } break; @@ -1084,7 +1215,7 @@ switch (lpnm->code) { case PSN_APPLY: - //DebugBreak(); + SetNTPServer(hwndDlg); return TRUE; @@ -1120,7 +1251,8 @@ TCHAR Caption[256]; LONG Ret = 0; - if (RegisterMonthCalControl(hApplet)) + if (RegisterMonthCalControl(hApplet) && + RegisterClockControl()) { LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); @@ -1142,6 +1274,7 @@ Ret = (LONG)(PropertySheet(&psh) != -1); UnregisterMonthCalControl(hApplet); + UnregisterClockControl(); } return Ret; @@ -1193,16 +1326,16 @@ switch (dwReason) { case DLL_PROCESS_ATTACH: - { - INITCOMMONCONTROLSEX InitControls; - - InitControls.dwSize = sizeof(INITCOMMONCONTROLSEX); - InitControls.dwICC = ICC_DATE_CLASSES | ICC_PROGRESS_CLASS | ICC_UPDOWN_CLASS; - InitCommonControlsEx(&InitControls); - - hApplet = hinstDLL; - } - break; + { + INITCOMMONCONTROLSEX InitControls; + + InitControls.dwSize = sizeof(INITCOMMONCONTROLSEX); + InitControls.dwICC = ICC_DATE_CLASSES | ICC_PROGRESS_CLASS | ICC_UPDOWN_CLASS; + InitCommonControlsEx(&InitControls); + + hApplet = hinstDLL; + } + break; } return TRUE; Modified: trunk/reactos/dll/cpl/timedate/timedate.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.h… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.h (original) +++ trunk/reactos/dll/cpl/timedate/timedate.h Wed Jun 21 23:57:58 2006 @@ -28,12 +28,18 @@ extern HINSTANCE hApplet; -BOOL InitClockWindowClass(); +/* timedate.c */ +VOID GetError(VOID); -BOOL InitialiseConnection(VOID); +/* clock.c */ +BOOL RegisterClockControl(VOID); +VOID UnregisterClockControl(VOID); + +/* ntpclient.c */ +BOOL InitialiseConnection(CHAR *szIpAddr); VOID DestroyConnection(VOID); BOOL SendData(VOID); -BOOL RecieveData(CHAR *); +ULONG RecieveData(ULONG ulTime); /* monthcal.c */ #define MCCM_SETDATE (WM_USER + 1) Modified: trunk/reactos/dll/cpl/timedate/timedate.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.r… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.rbuild (original) +++ trunk/reactos/dll/cpl/timedate/timedate.rbuild Wed Jun 21 23:57:58 2006 @@ -13,7 +13,6 @@ <library>comctl32</library> <library>ws2_32</library> <library>iphlpapi</library> - <library>ntdll</library> <file>clock.c</file> <file>ntpclient.c</file> <file>monthcal.c</file>

18 years, 4 months

[gedmurphy] 22485: missed this little blighter when fixing the DateTime.. macro

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Jun 21 23:44:06 2006 New Revision: 22485 URL: http://svn.reactos.ru/svn/reactos?rev=22485&view=rev Log: missed this little blighter when fixing the DateTime.. macro Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.c… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c Wed Jun 21 23:44:06 2006 @@ -1128,7 +1128,7 @@ SYSTEMTIME Date; SYSTEMTIME Time; - if (DateTime_GetSystemTime(GetDlgItem(hwnd, IDC_DATEPICKER), &Date) != GDT_VALID) + if (DateTime_GetSystemtime(GetDlgItem(hwnd, IDC_DATEPICKER), &Date) != GDT_VALID) { return FALSE; }

18 years, 4 months

[jimtabor] 22484: I've synced most of the User32 control files. Edit, I looked at and saw very little needing synced in. Scrollbar has custom code and Static sync needs more testing.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Jun 21 23:43:02 2006 New Revision: 22484 URL: http://svn.reactos.ru/svn/reactos?rev=22484&view=rev Log: I've synced most of the User32 control files. Edit, I looked at and saw very little needing synced in. Scrollbar has custom code and Static sync needs more testing. Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=2… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Wed Jun 21 23:43:02 2006 @@ -115,10 +115,10 @@ User32 - reactos/dll/win32/user32/controls/button.c # Synced at 20060621 - reactos/dll/win32/user32/controls/combo.c # Last sync date unknown - reactos/dll/win32/user32/controls/edit.c # Out of sync - reactos/dll/win32/user32/controls/icontitle.c # Last sync date unknown - reactos/dll/win32/user32/controls/listbox.c # Out of sync + reactos/dll/win32/user32/controls/combo.c # Synced at 20060617 + reactos/dll/win32/user32/controls/edit.c # Synced at 20051210 + reactos/dll/win32/user32/controls/icontitle.c # Synced at 20060617 + reactos/dll/win32/user32/controls/listbox.c # Synced at 20060616 reactos/dll/win32/user32/controls/scrollbar.c # Forked (?) reactos/dll/win32/user32/controls/static.c # Out of sync @@ -132,7 +132,7 @@ reactos/dll/win32/user32/windows/draw.c # Forked at Wine-20020904 (uitools.c) reactos/dll/win32/user32/windows/mdi.c # Out of sync - reactos/dll/win32/user32/windows/menu.c # Last sync date unknown + reactos/dll/win32/user32/windows/menu.c # Forked reactos/dll/win32/user32/windows/messagebox.c # Forked reactos/dll/win32/user32/windows/rect.c # Forked (uitools.c) reactos/dll/win32/user32/windows/text.c # Forked (lstr.c)

18 years, 4 months

← Newer
1
...
22
23
24
25
26
27
28
...
60
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2006