Ros-diffs

ros-diffs@reactos.org

81390 discussions

[winesync] 30507: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 16 Nov '07

16 Nov '07

Author: winesync Date: Fri Nov 16 17:07:03 2007 New Revision: 30507 URL: http://svn.reactos.org/svn/reactos?rev=30507&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/rsaenh/ (with props) trunk/reactos/dll/win32/rsaenh/des.c (with props) trunk/reactos/dll/win32/rsaenh/handle.c (with props) trunk/reactos/dll/win32/rsaenh/handle.h (with props) trunk/reactos/dll/win32/rsaenh/implglue.c (with props) trunk/reactos/dll/win32/rsaenh/implglue.h (with props) trunk/reactos/dll/win32/rsaenh/md2.c (with props) trunk/reactos/dll/win32/rsaenh/mpi.c (with props) trunk/reactos/dll/win32/rsaenh/rc2.c (with props) trunk/reactos/dll/win32/rsaenh/rc4.c (with props) trunk/reactos/dll/win32/rsaenh/rsa.c (with props) trunk/reactos/dll/win32/rsaenh/rsaenh.c (with props) trunk/reactos/dll/win32/rsaenh/rsaenh.rbuild (with props) trunk/reactos/dll/win32/rsaenh/rsaenh.spec (with props) trunk/reactos/dll/win32/rsaenh/rsaenh_ros.diff (with props) trunk/reactos/dll/win32/rsaenh/tomcrypt.h (with props) trunk/reactos/dll/win32/rsaenh/version.rc (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/win32/rsaenh/des.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/des.c?rev… Added: trunk/reactos/dll/win32/rsaenh/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/handle.c?… Added: trunk/reactos/dll/win32/rsaenh/handle.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/handle.h?… Added: trunk/reactos/dll/win32/rsaenh/implglue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/implglue.… Added: trunk/reactos/dll/win32/rsaenh/implglue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/implglue.… Added: trunk/reactos/dll/win32/rsaenh/md2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/md2.c?rev… Added: trunk/reactos/dll/win32/rsaenh/mpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/mpi.c?rev… Added: trunk/reactos/dll/win32/rsaenh/rc2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/rc2.c?rev… Added: trunk/reactos/dll/win32/rsaenh/rc4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/rc4.c?rev… Added: trunk/reactos/dll/win32/rsaenh/rsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/rsa.c?rev… Added: trunk/reactos/dll/win32/rsaenh/rsaenh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/rsaenh.c?… Added: trunk/reactos/dll/win32/rsaenh/rsaenh.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/rsaenh.rb… Added: trunk/reactos/dll/win32/rsaenh/rsaenh.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/rsaenh.sp… Added: trunk/reactos/dll/win32/rsaenh/rsaenh_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/rsaenh_ro… Added: trunk/reactos/dll/win32/rsaenh/tomcrypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/tomcrypt.… Added: trunk/reactos/dll/win32/rsaenh/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/version.r…

1 0

[winesync] 30506: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 16 Nov '07

16 Nov '07

Author: winesync Date: Fri Nov 16 17:06:39 2007 New Revision: 30506 URL: http://svn.reactos.org/svn/reactos?rev=30506&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/rsabase/ (with props) trunk/reactos/dll/win32/rsabase/rsabase.rbuild (with props) trunk/reactos/dll/win32/rsabase/rsabase.spec (with props) Propchange: trunk/reactos/dll/win32/rsabase/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Nov 16 17:06:39 2007 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Added: trunk/reactos/dll/win32/rsabase/rsabase.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsabase/rsabase.… ============================================================================== --- trunk/reactos/dll/win32/rsabase/rsabase.rbuild (added) +++ trunk/reactos/dll/win32/rsabase/rsabase.rbuild Fri Nov 16 17:06:39 2007 @@ -1,0 +1,13 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="rsabase" type="win32dll" baseaddress="${BASEADDRESS_RSABASE}" installbase="system32" installname="rsabase.dll" allowwarnings="true" entrypoint="0"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> + <importlibrary definition="rsabase.spec.def" /> + <include base="rsabase">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <library>wine</library> + <library>rsaenh</library> + <library>kernel32</library> + <file>rsabase.spec</file> +</module> Propchange: trunk/reactos/dll/win32/rsabase/rsabase.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/rsabase/rsabase.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsabase/rsabase.… ============================================================================== --- trunk/reactos/dll/win32/rsabase/rsabase.spec (added) +++ trunk/reactos/dll/win32/rsabase/rsabase.spec Fri Nov 16 17:06:39 2007 @@ -1,0 +1,27 @@ +@ stdcall CPAcquireContext(ptr str long ptr) rsaenh.CPAcquireContext +@ stdcall CPCreateHash(long long ptr long ptr) rsaenh.CPCreateHash +@ stdcall CPDecrypt(long long long long long ptr ptr) rsaenh.CPDecrypt +@ stdcall CPDeriveKey(long long long long ptr) rsaenh.CPDeriveKey +@ stdcall CPDestroyHash(long long) rsaenh.CPDestroyHash +@ stdcall CPDestroyKey(long long) rsaenh.CPDestroyKey +@ stdcall CPDuplicateHash(long long ptr long ptr) rsaenh.CPDuplicateHash +@ stdcall CPDuplicateKey(long long ptr long ptr) rsaenh.CPDuplicateKey +@ stdcall CPEncrypt(long long long long long ptr ptr long) rsaenh.CPEncrypt +@ stdcall CPExportKey(long long long long long ptr ptr) rsaenh.CPExportKey +@ stdcall CPGenKey(long long long ptr) rsaenh.CPGenKey +@ stdcall CPGenRandom(long long ptr) rsaenh.CPGenRandom +@ stdcall CPGetHashParam(long long long ptr ptr long) rsaenh.CPGetHashParam +@ stdcall CPGetKeyParam(long long long ptr ptr long) rsaenh.CPGetKeyParam +@ stdcall CPGetProvParam(long long ptr ptr long) rsaenh.CPGetProvParam +@ stdcall CPGetUserKey(long long ptr) rsaenh.CPGetUserKey +@ stdcall CPHashData(long long ptr long long) rsaenh.CPHashData +@ stdcall CPHashSessionKey(long long long long) rsaenh.CPHashSessionKey +@ stdcall CPImportKey(long ptr long long long ptr) rsaenh.CPImportKey +@ stdcall CPReleaseContext(long long) rsaenh.CPReleaseContext +@ stdcall CPSetHashParam(long long long ptr long) rsaenh.CPSetHashParam +@ stdcall CPSetKeyParam(long long long ptr long) rsaenh.CPSetKeyParam +@ stdcall CPSetProvParam(long long ptr long) rsaenh.CPSetProvParam +@ stdcall CPSignHash(long long long wstr long ptr ptr) rsaenh.CPSignHash +@ stdcall CPVerifySignature(long long ptr long long wstr long) rsaenh.CPVerifySignature +@ stdcall -private DllRegisterServer() rsaenh.DllRegisterServer +@ stdcall -private DllUnregisterServer() rsaenh.DllUnregisterServer Propchange: trunk/reactos/dll/win32/rsabase/rsabase.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hpoussin] 30505: Prepare import of rsabase.dll and rsaenh.dll from Wine
by hpoussin＠svn.reactos.org 16 Nov '07

16 Nov '07

Author: hpoussin Date: Fri Nov 16 17:04:32 2007 New Revision: 30505 URL: http://svn.reactos.org/svn/reactos?rev=30505&view=rev Log: Prepare import of rsabase.dll and rsaenh.dll from Wine Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=305… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Fri Nov 16 17:04:32 2007 @@ -5,6 +5,8 @@ <property name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" /> <property name="BASEADDRESS_COMCAT" value="0x20A50000" /> <property name="BASEADDRESS_DEVENUM" value="0x35680000" /> + <property name="BASEADDRESS_RSABASE" value="0x35700000" /> + <property name="BASEADDRESS_RSAENH" value="0x35780000" /> <property name="BASEADDRESS_TELEPHON" value="0x58750000" /> <property name="BASEADDRESS_PWRCFG" value="0x587e0000" /> <property name="BASEADDRESS_MMSYS" value="0x588a0000" /> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Fri Nov 16 17:04:32 2007 @@ -226,6 +226,8 @@ dll\win32\riched20\riched20.dll 1 dll\win32\riched32\riched32.dll 1 dll\win32\rpcrt4\rpcrt4.dll 1 +dll\win32\rsabase\rsabase.dll 1 +dll\win32\rsaenh\rsaenh.dll 1 dll\win32\samlib\samlib.dll 1 dll\win32\samsrv\samsrv.dll 1 dll\win32\secur32\secur32.dll 1 Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Fri Nov 16 17:04:32 2007 @@ -211,6 +211,12 @@ <directory name="rpcrt4"> <xi:include href="rpcrt4/rpcrt4.rbuild" /> </directory> +<directory name="rsabase"> + <xi:include href="rsabase/rsabase.rbuild" /> +</directory> +<directory name="rsaenh"> + <xi:include href="rsaenh/rsaenh.rbuild" /> +</directory> <directory name="samlib"> <xi:include href="samlib/samlib.rbuild" /> </directory> Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Fri Nov 16 17:04:32 2007 @@ -70,6 +70,8 @@ reactos/dll/win32/riched20 # Autosync reactos/dll/win32/riched32 # Autosync reactos/dll/win32/rpcrt4 # Synced to Wine-0_9_10 +reactos/dll/win32/rsabase # Autosync +reactos/dll/win32/rsaenh # Autosync reactos/dll/win32/sensapi # Autosync reactos/dll/win32/setupapi # Forked at Wine-20050524 reactos/dll/win32/shell32 # Synced to Wine-0_9_46

1 0

[gedmurphy] 30504: bump up the _WIN32_IE number to make various PSDK interfaces available
by gedmurphy＠svn.reactos.org 16 Nov '07

16 Nov '07

Author: gedmurphy Date: Fri Nov 16 16:45:21 2007 New Revision: 30504 URL: http://svn.reactos.org/svn/reactos?rev=30504&view=rev Log: bump up the _WIN32_IE number to make various PSDK interfaces available Modified: trunk/reactos/base/shell/explorer-new/explorer.rbuild Modified: trunk/reactos/base/shell/explorer-new/explorer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.rbuild (original) +++ trunk/reactos/base/shell/explorer-new/explorer.rbuild Fri Nov 16 16:45:21 2007 @@ -3,7 +3,7 @@ <module name="explorer_new" type="win32gui" installname="explorer_new.exe" unicode="true"> <include base="explorer_new">.</include> <define name="WIN32" /> - <define name="_WIN32_IE">0x0600</define> + <define name="_WIN32_IE">0x0601</define> <define name="_WIN32_WINNT">0x0600</define> <define name="WINVER">0x0600</define> <library>advapi32</library>

1 0

[gedmurphy] 30503: remove from todo.h
by gedmurphy＠svn.reactos.org 16 Nov '07

16 Nov '07

Author: gedmurphy Date: Fri Nov 16 16:30:44 2007 New Revision: 30503 URL: http://svn.reactos.org/svn/reactos?rev=30503&view=rev Log: remove from todo.h Modified: trunk/reactos/base/shell/explorer-new/todo.h Modified: trunk/reactos/base/shell/explorer-new/todo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/to… ============================================================================== --- trunk/reactos/base/shell/explorer-new/todo.h (original) +++ trunk/reactos/base/shell/explorer-new/todo.h Fri Nov 16 16:30:44 2007 @@ -44,23 +44,6 @@ #define IDockingWindow_ResizeBorderDW(T,a,b,c) (T)->lpVtbl->ResizeBorderDW(T,a,b,c) #endif -#define INTERFACE IDeskBarClient -DECLARE_INTERFACE_(IDeskBarClient,IUnknown) -{ - /*** IUnknown methods ***/ - STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; - STDMETHOD_(ULONG,Release)(THIS) PURE; - /*** IOleWindow methods ***/ - STDMETHOD_(HRESULT,GetWindow)(THIS_ HWND*) PURE; - STDMETHOD_(HRESULT,ContextSensitiveHelp)(THIS_ BOOL) PURE; - /*** IDeskBarClient methods ***/ - STDMETHOD_(HRESULT,SetDeskBarSite)(THIS_ IUnknown*) PURE; - STDMETHOD_(HRESULT,SetModeDBC)(THIS_ DWORD) PURE; - STDMETHOD_(HRESULT,UIActivateDBC)(THIS_ DWORD) PURE; - STDMETHOD_(HRESULT,GetSize)(THIS_ DWORD,LPRECT) PURE; -}; -#undef INTERFACE #ifdef COBJMACROS #define IDeskBarClient_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b)

1 0

[gedmurphy] 30502: add IDeskBarClient interface to shlobj
by gedmurphy＠svn.reactos.org 16 Nov '07

16 Nov '07

Author: gedmurphy Date: Fri Nov 16 16:28:02 2007 New Revision: 30502 URL: http://svn.reactos.org/svn/reactos?rev=30502&view=rev Log: add IDeskBarClient interface to shlobj Modified: trunk/reactos/include/psdk/shlobj.h Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h (original) +++ trunk/reactos/include/psdk/shlobj.h Fri Nov 16 16:28:02 2007 @@ -386,6 +386,26 @@ STDMETHOD_(HRESULT,ShowDW)(THIS_ BOOL) PURE; STDMETHOD_(HRESULT,CloseDW)(THIS_ DWORD) PURE; STDMETHOD_(HRESULT,ResizeBoderDW)(THIS_ LPCRECT,IUnknown*,BOOL) PURE; +}; +#undef INTERFACE + + +/* IDeskBarClient interface */ +#define INTERFACE IDeskBarClient +DECLARE_INTERFACE_(IDeskBarClient,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IOleWindow methods ***/ + STDMETHOD_(HRESULT,GetWindow)(THIS_ HWND*) PURE; + STDMETHOD_(HRESULT,ContextSensitiveHelp)(THIS_ BOOL) PURE; + /*** IDeskBarClient methods ***/ + STDMETHOD_(HRESULT,SetDeskBarSite)(THIS_ IUnknown*) PURE; + STDMETHOD_(HRESULT,SetModeDBC)(THIS_ DWORD) PURE; + STDMETHOD_(HRESULT,UIActivateDBC)(THIS_ DWORD) PURE; + STDMETHOD_(HRESULT,GetSize)(THIS_ DWORD,LPRECT) PURE; }; #undef INTERFACE

1 0

[hpoussin] 30501: Fix race condition
by hpoussin＠svn.reactos.org 16 Nov '07

16 Nov '07

Author: hpoussin Date: Fri Nov 16 16:16:43 2007 New Revision: 30501 URL: http://svn.reactos.org/svn/reactos?rev=30501&view=rev Log: Fix race condition Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/misc.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/misc.c Fri Nov 16 16:16:43 2007 @@ -69,7 +69,9 @@ { DWORD ErrorCode; - if (NtMarta == NULL) + if (InterlockedCompareExchangePointer(&NtMarta, + NULL, + NULL) == NULL) { /* we're the first one trying to use ntmarta, initialize it and change the pointer after initialization */

1 0

[jimtabor] 30500: This helps FF 1.5.03 Restore from Maximize. Anyone open to a full rewrite of winpos and support?
by jimtabor＠svn.reactos.org 16 Nov '07

16 Nov '07

Author: jimtabor Date: Fri Nov 16 15:57:01 2007 New Revision: 30500 URL: http://svn.reactos.org/svn/reactos?rev=30500&view=rev Log: This helps FF 1.5.03 Restore from Maximize. Anyone open to a full rewrite of winpos and support? Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Fri Nov 16 15:57:01 2007 @@ -1415,6 +1415,7 @@ Swp |= SWP_NOACTIVATE | SWP_NOZORDER; /* Fall through. */ case SW_SHOW: + if (WasVisible) return(TRUE); // Nothing to do! Swp |= SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE; /* Don't activate the topmost window. */ break;

1 0

[hpoussin] 30499: Enable mouse before resetting it
by hpoussin＠svn.reactos.org 16 Nov '07

16 Nov '07

Author: hpoussin Date: Fri Nov 16 14:05:22 2007 New Revision: 30499 URL: http://svn.reactos.org/svn/reactos?rev=30499&view=rev Log: Enable mouse before resetting it Modified: trunk/reactos/drivers/input/i8042prt/pnp.c Modified: trunk/reactos/drivers/input/i8042prt/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/pnp… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/pnp.c (original) +++ trunk/reactos/drivers/input/i8042prt/pnp.c Fri Nov 16 14:05:22 2007 @@ -333,7 +333,21 @@ i8042Flush(DeviceExtension); - /* First, reset the mouse (if any) to start the detection */ + /* Select the devices we have */ + if (DeviceExtension->Flags & KEYBOARD_PRESENT) + { + FlagsToDisable |= CCB_KBD_DISAB; + FlagsToEnable |= CCB_KBD_INT_ENAB; + } + if (DeviceExtension->Flags & MOUSE_PRESENT) + { + FlagsToDisable |= CCB_MOUSE_DISAB; + FlagsToEnable |= CCB_MOUSE_INT_ENAB; + } + if (!i8042ChangeMode(DeviceExtension, FlagsToDisable, FlagsToEnable)) + return STATUS_UNSUCCESSFUL; + + /* Reset the mouse (if any) to start the detection */ if (DeviceExtension->Flags & MOUSE_PRESENT) { KIRQL Irql; @@ -345,20 +359,6 @@ KeReleaseInterruptSpinLock(DeviceExtension->HighestDIRQLInterrupt, Irql); } - - /* Select the devices we have */ - if (DeviceExtension->Flags & KEYBOARD_PRESENT) - { - FlagsToDisable |= CCB_KBD_DISAB; - FlagsToEnable |= CCB_KBD_INT_ENAB; - } - if (DeviceExtension->Flags & MOUSE_PRESENT) - { - FlagsToDisable |= CCB_MOUSE_DISAB; - FlagsToEnable |= CCB_MOUSE_INT_ENAB; - } - if (!i8042ChangeMode(DeviceExtension, FlagsToDisable, FlagsToEnable)) - return STATUS_UNSUCCESSFUL; return STATUS_SUCCESS; }

1 0

[cwittich] 30498: fix some bugs in GetTimeZoneListIndex
by cwittich＠svn.reactos.org 16 Nov '07

16 Nov '07

Author: cwittich Date: Fri Nov 16 13:22:01 2007 New Revision: 30498 URL: http://svn.reactos.org/svn/reactos?rev=30498&view=rev Log: fix some bugs in GetTimeZoneListIndex Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c Fri Nov 16 13:22:01 2007 @@ -1116,7 +1116,8 @@ LPTSTR Buffer; LPTSTR Ptr; LPTSTR End; - BOOL bFound; + BOOL bFound = FALSE; + int iLanguageID; if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\Control\\NLS\\Language"), @@ -1137,6 +1138,7 @@ return FALSE; } + iLanguageID = _ttoi(szLanguageIdString); RegCloseKey(hKey); if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, @@ -1183,22 +1185,21 @@ while (*Ptr != 0) { Length = _tcslen(Ptr); - if (_tcsicmp(Ptr, szLanguageIdString) == 0) + if (_ttoi(Ptr) == iLanguageID) bFound = TRUE; Ptr = Ptr + Length + 1; if (*Ptr == 0) break; - Length = _tcslen(Ptr); - if (bFound) { *lpIndex = _tcstoul(Ptr, &End, 10); HeapFree(GetProcessHeap(), 0, Buffer); - return FALSE; - } - + return TRUE; + } + + Length = _tcslen(Ptr); Ptr = Ptr + Length + 1; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs