Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[tkreuzer] 38690: silence TRACEs for libcntpr, too
by tkreuzer＠svn.reactos.org 10 Jan '09

10 Jan '09

Author: tkreuzer Date: Sat Jan 10 16:44:32 2009 New Revision: 38690 URL: http://svn.reactos.org/svn/reactos?rev=38690&view=rev Log: silence TRACEs for libcntpr, too Modified: trunk/reactos/lib/sdk/crt/precomp.h Modified: trunk/reactos/lib/sdk/crt/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/precomp.h?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/precomp.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/precomp.h [iso-8859-1] Sat Jan 10 16:44:32 2009 @@ -44,6 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #endif #else +#define NDEBUG #include <debug.h> #define TRACE DPRINT #define WARN DPRINT1

1 0

[dgorbachev] 38689: Czech patch from Radek Liska. Bug #4014.
by dgorbachev＠svn.reactos.org 10 Jan '09

10 Jan '09

Author: dgorbachev Date: Sat Jan 10 15:28:18 2009 New Revision: 38689 URL: http://svn.reactos.org/svn/reactos?rev=38689&view=rev Log: Czech patch from Radek Liska. Bug #4014. Modified: trunk/reactos/base/applications/sndvol32/lang/cs-CZ.rc trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.rc trunk/reactos/dll/cpl/joy/lang/cs-CZ.rc Modified: trunk/reactos/base/applications/sndvol32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/cs-CZ.rc [iso-8859-1] Sat Jan 10 15:28:18 2009 @@ -20,7 +20,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_SNDVOL32 "Ovládání hlasitosti" - IDS_NOMIXERDEVICES "Nejsou dostupné ádné smìovací zaøízení! Aplikace se nyní ukonèí." + IDS_NOMIXERDEVICES "Nejsou dostupná ádná smìovací zaøízení! Aplikace se nyní ukonèí." END IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 Modified: trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/cs-CZ.rc [iso-8859-1] Sat Jan 10 15:28:18 2009 @@ -1,22 +1,27 @@ +/* FILE: dll/cpl/hdwwiz/lang/cs-CZ.rc + * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) + * UPDATED: 2009-01-10 + */ + LANGUAGE LANG_CZECH, SUBLANG_DEFAULT IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Prùvodce pøidáním hardwaru" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Welcome to the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "This wizard helps you:", -1, 114, 40, 182, 8 - LTEXT "1) Install software to support the hardware you add to your computer.", -1, 121, 56, 184, 16 - LTEXT "2) Troubleshoot problems you may be having with your hardware.", -1, 121, 78, 185, 16 + LTEXT "Vítejte v Prùvodci pøidáním hardwaru", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "Tento prùvodce vám pomùe:", -1, 114, 40, 182, 8 + LTEXT "1) Nainstalovat software pro podporu hardwaru pøidaného do poèítaèe.", -1, 121, 56, 184, 16 + LTEXT "2) Vyøeit problémy, které mùete s vaím hardwarem mít.", -1, 121, 78, 185, 16 ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 - LTEXT "If your hardware came with an installation CD, it is recommended that you click Cancel to close this wizard and use the manufacturer's CD to install this hardware.", 503, 150, 106, 155, 50 - LTEXT "To continue, click Next.", -1, 114, 166, 193, 8 + LTEXT "Pokud bylo k hardwaru pøibaleno instalaèní CD, doporuèuje se ukonèit tohoto prùvodce klepnutím na tlaèítko Storno a pouít k instalaci hardwaru toto CD.", 503, 150, 106, 155, 50 + LTEXT "Pokraèujte klepnutím na tlaèítko Dalí.", -1, 114, 166, 193, 8 END IDD_SEARCHPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Prùvodce pøidáním hardwaru" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 @@ -25,63 +30,63 @@ IDD_ISCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Prùvodce pøidáním hardwaru" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Have you already connected this hardware to your computer?", -1, 20, 11, 275, 8 - AUTORADIOBUTTON "&Yes, I have already connected the hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP - AUTORADIOBUTTON "&No, I have not added the hardware yet", IDC_NOTCONNECTED, 29, 35, 266, 8 + LTEXT "Byl ji tento hardware pøipojen k tomuto poèítaèi?", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "&Ano, ji byl pøipojen", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "&Ne, jetì nebyl pøidán", IDC_NOTCONNECTED, 29, 35, 266, 8 END IDD_PROBELISTPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Prùvodce pøidáním hardwaru" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "From the list below, select an installed hardware device, then click Next to check properties or troubleshoot a problem you might be having.", -1, 21, 8, 275, 22 - LTEXT "To add hardware not shown in the list, click ""Add a new hardware device.""", -1, 21, 32, 275, 24 - LTEXT "I&nstalled hardware:", -1, 21, 62, 140, 8 + LTEXT "Vyberte nainstalované zaøízení ze seznamu níe, poté lze klepnutím na tlaèítko Dalí zkontrolovat jeho vlastnosti nebo zjistit øeení moných problémù.", -1, 21, 8, 275, 22 + LTEXT "Klepnutím na ""Pøidat nové zaøízení."" pøidáte hardware, který se v tomto seznamu nenachází.", -1, 21, 32, 275, 24 + LTEXT "Nai&nstalovaný hardware:", -1, 21, 62, 140, 8 CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 END IDD_SELECTWAYPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Prùvodce pøidáním hardwaru" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "The wizard can search for other hardware and automatically install it for you. Or, if you know exactly which hardware model you want to install, you can select it from a list.", -1, 21, 8, 280, 24 - LTEXT "What do you want the wizard to do?", -1, 23, 40, 275, 8 - AUTORADIOBUTTON "&Search for and install the hardware automatically (Recommended)", IDC_AUTOINSTALL, 30, 55, 266, 8, WS_GROUP | NOT WS_TABSTOP - AUTORADIOBUTTON "Install the hardware that I &manually select from a list (Advanced)", IDC_MANUALLYINST, 30, 70, 266, 8, NOT WS_TABSTOP + LTEXT "Prùvodce mùe vyhledat dalí hardware a automaticky ho nainstalovat, nebo jej mùete vybrat ze seznamu, pokud víte o který model se jedná.", -1, 21, 8, 280, 24 + LTEXT "Co má prùvodce udìlat?", -1, 23, 40, 275, 8 + AUTORADIOBUTTON "&Vyhledat a automaticky nainstalovat hardware (doporuèeno)", IDC_AUTOINSTALL, 30, 55, 266, 8, WS_GROUP | NOT WS_TABSTOP + AUTORADIOBUTTON "Nainstalovat hardware, který si &ruènì zvolím ze seznamu (pokroèilé)", IDC_MANUALLYINST, 30, 70, 266, 8, NOT WS_TABSTOP END IDD_DETECTEDHWPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Prùvodce pøidáním hardwaru" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 - LTEXT "Detected hardware:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 + LTEXT "Detekovaný hardware:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Prùvodce pøidáním hardwaru" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "If you do not see the hardware category you want, click Show All Devices.", IDC_STATUSTEXT, 21, 9, 275, 18 - LTEXT "Common &hardware types:", IDC_HWTYPESTEXT, 21, 31, 180, 8 + LTEXT "Pokud nevidíte vámi hledaný typ hardwaru, klepnìte na Zobrazit vechna zaøízení.", IDC_STATUSTEXT, 21, 9, 275, 18 + LTEXT "Bìné typy &hardwaru:", IDC_HWTYPESTEXT, 21, 31, 180, 8 CONTROL "", IDC_HWTYPESLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 21, 42, 275, 92 END IDD_PROGRESSPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Prùvodce pøidáním hardwaru" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "It may take several minutes to search for hardware.", -1, 21, 8, 275, 15 - LTEXT "Total progress:", IDC_TPROGRESSTEXT, 21, 25, 275, 8 + LTEXT "Vyhledávání hardwaru mùe trvat nìkolik minut.", -1, 21, 8, 275, 15 + LTEXT "Celkový postup:", IDC_TPROGRESSTEXT, 21, 25, 275, 8 CONTROL "", IDC_TPROGRESSBAR, "msctls_progress32", 0, 21, 37, 275, 14 LTEXT "", IDC_PROGRESSTEXT, 58, 58, 200, 8, SS_NOPREFIX CONTROL "", IDC_PROGRESSBAR, "msctls_progress32", 0, 58, 70, 200, 8 @@ -89,58 +94,58 @@ IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Prùvodce pøidáním hardwaru" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "You have successfully completed the Add Hardware wizard.", -1, 114, 32, 193, 19 + LTEXT "Dokonèení Prùvodce pøidáním hardwaru", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "Prùvodce pøidáním hardwaru byl úspìnì dokonèen.", -1, 114, 32, 193, 19 LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 - LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 + LTEXT "Klepnutím na Dokonèit uzavøete prùvodce.", -1, 114, 166, 132, 8 END IDD_ISFOUNDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Prùvodce pøidáním hardwaru" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "The wizard found the following hardware connected to your computer:", -1, 114, 32, 193, 19 - LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 + LTEXT "Dokonèení Prùvodce pøidáním hardwaru", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "Prùvodce nael následující hardware pøipojený k tomuto poèítaèi:", -1, 114, 32, 193, 19 + LTEXT "Klepnutím na Dokonèit uzavøete prùvodce.", -1, 114, 166, 132, 8 CONTROL "", IDC_FOUNDHARDWARELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 114, 56, 193, 78 END IDD_HWSTATUSPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Prùvodce pøidáním hardwaru" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 195, 28 - LTEXT "Here is the current status of the hardware you selected:", -1, 114, 40, 193, 19 + LTEXT "Dokonèení Prùvodce pøidáním hardwaru", IDC_FINISHTITLE, 114, 8, 195, 28 + LTEXT "Souèasný stav zvoleného hardwaru:", -1, 114, 40, 193, 19 EDITTEXT IDC_HWSTATUSEDIT, 114, 60, 193, 70, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "To start a troubleshooter that can help you resolve any problems you might be having, click Finish.", -1, 114, 136, 193, 16 - LTEXT "To exit this wizard, click Cancel.", IDC_STATUSTEXT, 114, 166, 132, 8 + LTEXT "Klepnutím na Dokonèit lze zaèít øeit moné problémy.", -1, 114, 136, 193, 16 + LTEXT "Klepnutím na Storno ukonèíte prùvodce.", IDC_STATUSTEXT, 114, 166, 132, 8 END IDD_NOTCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Prùvodce pøidáním hardwaru" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Cannot Continue the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 28 - LTEXT "To continue, connect this hardware to your computer.", -1, 114, 40, 193, 16 - AUTOCHECKBOX "&Turn off the computer when I click Finish so that I can open the computer and connect the hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE - LTEXT "In most cases ReactOS will automatically install your hardware after you connect it. If ReactOS does not find it, you can reopen this wizard to install the supporting software.", -1, 114, 98, 193, 32 - LTEXT "To close this wizard, click Finish.", IDC_STATUSTEXT, 114, 166, 193, 8 + LTEXT "Nelze pokraèovat v Prùvodci pøidáním hardwaru", IDC_FINISHTITLE, 114, 8, 203, 28 + LTEXT "Pokraèovat lze po pøipojení hardwaru k poèítaèi.", -1, 114, 40, 193, 16 + AUTOCHECKBOX "Vypnou&t poèítaè po klepnutí na tlaèítko Dokonèit, aby mohl být hardware pøipojen.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE + LTEXT "Ve vìtinì pøípadù ReactOS automaticky nainstaluje hardware po jeho pøipojení. Pokud jej ReactOS nenajde, lze tohoto prùvodce znovu spustit a nainstalovat podpùrný software.", -1, 114, 98, 193, 32 + LTEXT "Klepnutím na tlaèítko Dokonèit ukonèíte prùvodce.", IDC_STATUSTEXT, 114, 166, 193, 8 END STRINGTABLE BEGIN IDS_CPLNAME "Pøidat hardware" - IDS_CPLDESCRIPTION "Pøidat hardware do tohoto poèítaèe." - IDS_SEARCHTITLE "Please wait while the wizard searches..." - IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." - IDS_ISCONNECTED "Is the hardware connected?" - IDS_PROBELISTTITLE "The following hardware is already installed on your computer" - IDS_ADDNEWDEVICE "Add a new hardware device" - IDS_SELECTWAYTITLE "The wizard can help you install other hardware" + IDS_CPLDESCRIPTION "Pøidá hardware do tohoto poèítaèe." + IDS_SEARCHTITLE "Èekejte, prosím, prùvodce hledá..." + IDS_SEARCHTEXT "Tento prùvodce hledá hardware, který byl nedávno pøipojen k tomuto poèítaèi, ale jetì nebyl nainstalován." + IDS_ISCONNECTED "Je hardware pøipojen?" + IDS_PROBELISTTITLE "Následující hardware ji je nainstalován na tomto poèítaèi" + IDS_ADDNEWDEVICE "Pøidat nové hardwarové zaøízení" + IDS_SELECTWAYTITLE "Prùvodce vám mùe pomoci nainstalovat jiný hardware" END Modified: trunk/reactos/dll/cpl/joy/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/cs-CZ.rc?… ============================================================================== --- trunk/reactos/dll/cpl/joy/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/joy/lang/cs-CZ.rc [iso-8859-1] Sat Jan 10 15:28:18 2009 @@ -1,6 +1,6 @@ /* FILE: dll/cpl/joy/lang/cs-CZ.rc * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) - * UPDATED: 2008-07-27 + * UPDATED: 2009-01-10 */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT @@ -13,7 +13,7 @@ BEGIN ICON IDI_CPLSYSTEM, -1, 7, 7, 20, 20 LTEXT "Tato nastavení pomáhají konfigurovat herní ovladaèe nainstalované na tomto poèítaèi.", -1, 33, 7, 214, 20, NOT WS_GROUP - GROUPBOX "Nai&nstalované ovladaèe her", -1, 7, 34, 238, 117 + GROUPBOX "Nai&nstalované herní ovladaèe", -1, 7, 34, 238, 117 CONTROL "List1", IDC_CONTROLLER_LIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000808D, 14, 44, 224, 80 PUSHBUTTON "&Pøidat...", IDC_ADD_BUTTON, 35, 129, 65, 14 PUSHBUTTON "&Odebrat", IDC_REMOVE_BUTTON, 104, 129, 65, 14, WS_DISABLED

1 0

[dchapyshev] 38688: - Formatting fix. No code change
by dchapyshev＠svn.reactos.org 10 Jan '09

10 Jan '09

Author: dchapyshev Date: Sat Jan 10 13:09:37 2009 New Revision: 38688 URL: http://svn.reactos.org/svn/reactos?rev=38688&view=rev Log: - Formatting fix. No code change Modified: trunk/reactos/dll/win32/kernel32/misc/computername.c Modified: trunk/reactos/dll/win32/kernel32/misc/computername.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/computername.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/computername.c [iso-8859-1] Sat Jan 10 13:09:37 2009 @@ -34,10 +34,13 @@ /* FUNCTIONS *****************************************************************/ -static BOOL GetComputerNameFromRegistry( LPWSTR RegistryKey, - LPWSTR ValueNameStr, - LPWSTR lpBuffer, - LPDWORD nSize ) { +static +BOOL +GetComputerNameFromRegistry(LPWSTR RegistryKey, + LPWSTR ValueNameStr, + LPWSTR lpBuffer, + LPDWORD nSize ) +{ PKEY_VALUE_PARTIAL_INFORMATION KeyInfo; OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName; @@ -47,65 +50,58 @@ ULONG ReturnSize; NTSTATUS Status; - RtlInitUnicodeString (&KeyName,RegistryKey); - InitializeObjectAttributes (&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ZwOpenKey (&KeyHandle, - KEY_READ, - &ObjectAttributes); + RtlInitUnicodeString(&KeyName,RegistryKey); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = ZwOpenKey(&KeyHandle, + KEY_READ, + &ObjectAttributes); if (!NT_SUCCESS(Status)) { SetLastErrorByStatus (Status); return FALSE; } - KeyInfoSize = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + - *nSize * sizeof(WCHAR); - KeyInfo = RtlAllocateHeap (RtlGetProcessHeap (), - 0, - KeyInfoSize); + KeyInfoSize = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + *nSize * sizeof(WCHAR); + KeyInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, KeyInfoSize); if (KeyInfo == NULL) { - ZwClose (KeyHandle); - SetLastError (ERROR_OUTOFMEMORY); - return FALSE; - } - - RtlInitUnicodeString (&ValueName,ValueNameStr); - - Status = ZwQueryValueKey (KeyHandle, - &ValueName, - KeyValuePartialInformation, - KeyInfo, - KeyInfoSize, - &ReturnSize); + ZwClose(KeyHandle); + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + + RtlInitUnicodeString(&ValueName,ValueNameStr); + + Status = ZwQueryValueKey(KeyHandle, + &ValueName, + KeyValuePartialInformation, + KeyInfo, + KeyInfoSize, + &ReturnSize); if (!NT_SUCCESS(Status)) { - RtlFreeHeap (RtlGetProcessHeap (), - 0, - KeyInfo); - ZwClose (KeyHandle); + RtlFreeHeap(RtlGetProcessHeap(), 0, KeyInfo); + ZwClose(KeyHandle); *nSize = ReturnSize; - SetLastErrorByStatus (Status); - return FALSE; - } - - if( *nSize > (KeyInfo->DataLength / sizeof(WCHAR)) ) { + SetLastErrorByStatus(Status); + return FALSE; + } + + if (*nSize > (KeyInfo->DataLength / sizeof(WCHAR))) + { *nSize = KeyInfo->DataLength / sizeof(WCHAR) - 1; lpBuffer[*nSize] = 0; } - RtlCopyMemory (lpBuffer, - KeyInfo->Data, - *nSize * sizeof(WCHAR)); - - RtlFreeHeap (RtlGetProcessHeap (), - 0, - KeyInfo); - ZwClose (KeyHandle); + RtlCopyMemory(lpBuffer, KeyInfo->Data, *nSize * sizeof(WCHAR)); + + RtlFreeHeap(RtlGetProcessHeap(), 0, KeyInfo); + ZwClose(KeyHandle); return TRUE; } @@ -113,12 +109,11 @@ /* * @implemented */ -BOOL WINAPI -GetComputerNameExW ( - COMPUTER_NAME_FORMAT NameType, - LPWSTR lpBuffer, - LPDWORD nSize - ) +BOOL +WINAPI +GetComputerNameExW(COMPUTER_NAME_FORMAT NameType, + LPWSTR lpBuffer, + LPDWORD nSize) { UNICODE_STRING ResultString; UNICODE_STRING DomainPart; @@ -127,51 +122,31 @@ BOOL ret = TRUE; DWORD HostSize; - switch( NameType ) { - case ComputerNameNetBIOS: - return GetComputerNameFromRegistry - ( L"\\Registry\\Machine\\System\\CurrentControlSet" - L"\\Control\\ComputerName\\ComputerName", - L"ComputerName", - lpBuffer, - nSize ); - - case ComputerNameDnsDomain: - return GetComputerNameFromRegistry - ( L"\\Registry\\Machine\\System\\CurrentControlSet" - L"\\Services\\Tcpip\\Parameters", - L"Domain", - lpBuffer, - nSize ); - - case ComputerNameDnsFullyQualified: - ResultString.Length = 0; - ResultString.MaximumLength = (USHORT)*nSize * sizeof(WCHAR); - ResultString.Buffer = lpBuffer; - - RtlZeroMemory(QueryTable, sizeof(QueryTable)); - RtlInitUnicodeString(&DomainPart, NULL); - QueryTable[0].Name = L"HostName"; - QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; - QueryTable[0].EntryContext = &DomainPart; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, - L"\\Registry\\Machine\\System" - L"\\CurrentControlSet\\Services\\Tcpip" - L"\\Parameters", - QueryTable, NULL, NULL); - - if( NT_SUCCESS(Status) ) { - Status = RtlAppendUnicodeStringToString(&ResultString, &DomainPart); - HostSize = DomainPart.Length; - if (!NT_SUCCESS(Status)) { - ret = FALSE; - } - RtlAppendUnicodeToString(&ResultString, L"."); - RtlFreeUnicodeString(&DomainPart); - + switch (NameType) + { + case ComputerNameNetBIOS: + return GetComputerNameFromRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" + L"\\Control\\ComputerName\\ComputerName", + L"ComputerName", + lpBuffer, + nSize); + + case ComputerNameDnsDomain: + return GetComputerNameFromRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" + L"\\Services\\Tcpip\\Parameters", + L"Domain", + lpBuffer, + nSize); + + case ComputerNameDnsFullyQualified: + ResultString.Length = 0; + ResultString.MaximumLength = (USHORT)*nSize * sizeof(WCHAR); + ResultString.Buffer = lpBuffer; + + RtlZeroMemory(QueryTable, sizeof(QueryTable)); RtlInitUnicodeString(&DomainPart, NULL); - QueryTable[0].Name = L"Domain"; + + QueryTable[0].Name = L"HostName"; QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; QueryTable[0].EntryContext = &DomainPart; @@ -179,52 +154,85 @@ L"\\Registry\\Machine\\System" L"\\CurrentControlSet\\Services\\Tcpip" L"\\Parameters", - QueryTable, NULL, NULL); - - if( NT_SUCCESS(Status) ) { + QueryTable, + NULL, + NULL); + + if (NT_SUCCESS(Status)) + { Status = RtlAppendUnicodeStringToString(&ResultString, &DomainPart); - if ( (!NT_SUCCESS(Status)) || (!ret)) { - *nSize = HostSize + DomainPart.Length; - SetLastError(ERROR_MORE_DATA); + HostSize = DomainPart.Length; + + if (!NT_SUCCESS(Status)) + { + ret = FALSE; + } + + RtlAppendUnicodeToString(&ResultString, L"."); + RtlFreeUnicodeString(&DomainPart); + + RtlInitUnicodeString(&DomainPart, NULL); + QueryTable[0].Name = L"Domain"; + QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; + QueryTable[0].EntryContext = &DomainPart; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, + L"\\Registry\\Machine\\System" + L"\\CurrentControlSet\\Services\\Tcpip" + L"\\Parameters", + QueryTable, + NULL, + NULL); + + if (NT_SUCCESS(Status)) + { + Status = RtlAppendUnicodeStringToString(&ResultString, &DomainPart); + if ((!NT_SUCCESS(Status)) || (!ret)) + { + *nSize = HostSize + DomainPart.Length; + SetLastError(ERROR_MORE_DATA); + RtlFreeUnicodeString(&DomainPart); + return FALSE; + } RtlFreeUnicodeString(&DomainPart); - return FALSE; + *nSize = ResultString.Length / sizeof(WCHAR) - 1; + return TRUE; } - RtlFreeUnicodeString(&DomainPart); - *nSize = ResultString.Length / sizeof(WCHAR) - 1; - return TRUE; } - } - return FALSE; - - case ComputerNameDnsHostname: - return GetComputerNameFromRegistry - ( L"\\Registry\\Machine\\System\\CurrentControlSet" - L"\\Services\\Tcpip\\Parameters", - L"Hostname", - lpBuffer, - nSize ); - - case ComputerNamePhysicalDnsDomain: - return GetComputerNameFromRegistry - ( L"\\Registry\\Machine\\System\\CurrentControlSet" - L"\\Services\\Tcpip\\Parameters", - L"Domain", - lpBuffer, - nSize ); - - /* XXX Redo these */ - case ComputerNamePhysicalDnsFullyQualified: - return GetComputerNameExW( ComputerNameDnsFullyQualified, - lpBuffer, nSize ); - case ComputerNamePhysicalDnsHostname: - return GetComputerNameExW( ComputerNameDnsHostname, - lpBuffer, nSize ); - case ComputerNamePhysicalNetBIOS: - return GetComputerNameExW( ComputerNameNetBIOS, - lpBuffer, nSize ); - - case ComputerNameMax: - return FALSE; + return FALSE; + + case ComputerNameDnsHostname: + return GetComputerNameFromRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" + L"\\Services\\Tcpip\\Parameters", + L"Hostname", + lpBuffer, + nSize); + + case ComputerNamePhysicalDnsDomain: + return GetComputerNameFromRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" + L"\\Services\\Tcpip\\Parameters", + L"Domain", + lpBuffer, + nSize); + + /* XXX Redo these */ + case ComputerNamePhysicalDnsFullyQualified: + return GetComputerNameExW(ComputerNameDnsFullyQualified, + lpBuffer, + nSize); + + case ComputerNamePhysicalDnsHostname: + return GetComputerNameExW(ComputerNameDnsHostname, + lpBuffer, + nSize); + + case ComputerNamePhysicalNetBIOS: + return GetComputerNameExW(ComputerNameNetBIOS, + lpBuffer, + nSize); + + case ComputerNameMax: + return FALSE; } return FALSE; @@ -235,18 +243,17 @@ */ BOOL WINAPI -GetComputerNameExA ( - COMPUTER_NAME_FORMAT NameType, - LPSTR lpBuffer, - LPDWORD nSize - ) +GetComputerNameExA(COMPUTER_NAME_FORMAT NameType, + LPSTR lpBuffer, + LPDWORD nSize) { UNICODE_STRING UnicodeString; ANSI_STRING AnsiString; BOOL Result; PWCHAR TempBuffer = RtlAllocateHeap( RtlGetProcessHeap(), 0, *nSize * sizeof(WCHAR) ); - if( !TempBuffer ) { + if (!TempBuffer) + { return ERROR_OUTOFMEMORY; } @@ -254,19 +261,20 @@ AnsiString.Length = 0; AnsiString.Buffer = lpBuffer; - Result = GetComputerNameExW( NameType, TempBuffer, nSize ); - - if( Result ) { + Result = GetComputerNameExW(NameType, TempBuffer, nSize); + + if (Result) + { UnicodeString.MaximumLength = (USHORT)*nSize * sizeof(WCHAR) + sizeof(WCHAR); UnicodeString.Length = (USHORT)*nSize * sizeof(WCHAR) + sizeof(WCHAR); UnicodeString.Buffer = TempBuffer; - RtlUnicodeStringToAnsiString (&AnsiString, - &UnicodeString, - FALSE); - } - - RtlFreeHeap( RtlGetProcessHeap(), 0, TempBuffer ); + RtlUnicodeStringToAnsiString(&AnsiString, + &UnicodeString, + FALSE); + } + + RtlFreeHeap(RtlGetProcessHeap(), 0, TempBuffer); return Result; } @@ -274,64 +282,65 @@ /* * @implemented */ -BOOL WINAPI -GetComputerNameA (LPSTR lpBuffer, - LPDWORD lpnSize) -{ - return GetComputerNameExA( ComputerNameNetBIOS, lpBuffer, lpnSize ); -} - - -/* - * @implemented - */ -BOOL WINAPI -GetComputerNameW (LPWSTR lpBuffer, - LPDWORD lpnSize) -{ - return GetComputerNameExW( ComputerNameNetBIOS, lpBuffer, lpnSize ); -} - - -/* - * @implemented - */ -static BOOL -IsValidComputerName ( - COMPUTER_NAME_FORMAT NameType, - LPCWSTR lpComputerName) -{ - PWCHAR p; - ULONG Length; - - /* FIXME: do verification according to NameType */ - - Length = 0; - p = (PWCHAR)lpComputerName; - while (*p != 0) - { - if (!(iswctype(*p, _ALPHA | _DIGIT) || *p == L'!' || *p == L'@' || *p == L'#' || - *p == L'$' || *p == L'%' || *p == L'^' || *p == L'&' || *p == L'\'' || - *p == L')' || *p == L'(' || *p == L'.' || *p == L'-' || *p == L'_' || - *p == L'{' || *p == L'}' || *p == L'~')) - return FALSE; - - Length++; - p++; - } - - if (Length == 0 || - Length > MAX_COMPUTERNAME_LENGTH) - return FALSE; - - return TRUE; -} - - -static BOOL SetComputerNameToRegistry( - LPCWSTR RegistryKey, - LPCWSTR ValueNameStr, - LPCWSTR lpBuffer) +BOOL +WINAPI +GetComputerNameA(LPSTR lpBuffer, LPDWORD lpnSize) +{ + return GetComputerNameExA(ComputerNameNetBIOS, lpBuffer, lpnSize); +} + + +/* + * @implemented + */ +BOOL +WINAPI +GetComputerNameW(LPWSTR lpBuffer, LPDWORD lpnSize) +{ + return GetComputerNameExW(ComputerNameNetBIOS, lpBuffer, lpnSize); +} + + +/* + * @implemented + */ +static +BOOL +IsValidComputerName(COMPUTER_NAME_FORMAT NameType, + LPCWSTR lpComputerName) +{ + PWCHAR p; + ULONG Length; + + /* FIXME: do verification according to NameType */ + + Length = 0; + p = (PWCHAR)lpComputerName; + + while (*p != 0) + { + if (!(iswctype(*p, _ALPHA | _DIGIT) || *p == L'!' || *p == L'@' || *p == L'#' || + *p == L'$' || *p == L'%' || *p == L'^' || *p == L'&' || *p == L'\'' || + *p == L')' || *p == L'(' || *p == L'.' || *p == L'-' || *p == L'_' || + *p == L'{' || *p == L'}' || *p == L'~')) + return FALSE; + + Length++; + p++; + } + + if (Length == 0 || Length > MAX_COMPUTERNAME_LENGTH) + return FALSE; + + return TRUE; +} + + +static +BOOL +SetComputerNameToRegistry(LPCWSTR RegistryKey, + LPCWSTR ValueNameStr, + LPCWSTR lpBuffer) { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName; @@ -339,39 +348,39 @@ HANDLE KeyHandle; NTSTATUS Status; - RtlInitUnicodeString (&KeyName, RegistryKey); - InitializeObjectAttributes (&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL ); - - Status = NtOpenKey (&KeyHandle, - KEY_WRITE, - &ObjectAttributes); + RtlInitUnicodeString(&KeyName, RegistryKey); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenKey(&KeyHandle, + KEY_WRITE, + &ObjectAttributes); if (!NT_SUCCESS(Status)) { - SetLastErrorByStatus (Status); - return FALSE; - } - - RtlInitUnicodeString (&ValueName, ValueNameStr); - - Status = NtSetValueKey (KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)lpBuffer, - (wcslen (lpBuffer) + 1) * sizeof(WCHAR)); + SetLastErrorByStatus(Status); + return FALSE; + } + + RtlInitUnicodeString(&ValueName, ValueNameStr); + + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)lpBuffer, + (wcslen (lpBuffer) + 1) * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) { - ZwClose (KeyHandle); - SetLastErrorByStatus (Status); - return FALSE; - } - - NtFlushKey (KeyHandle); - ZwClose (KeyHandle); + ZwClose(KeyHandle); + SetLastErrorByStatus(Status); + return FALSE; + } + + NtFlushKey(KeyHandle); + ZwClose(KeyHandle); return TRUE; } @@ -380,40 +389,41 @@ /* * @implemented */ -BOOL WINAPI -SetComputerNameA (LPCSTR lpComputerName) -{ - return SetComputerNameExA( ComputerNamePhysicalNetBIOS, lpComputerName ); -} - - -/* - * @implemented - */ -BOOL WINAPI -SetComputerNameW (LPCWSTR lpComputerName) -{ - return SetComputerNameExW( ComputerNamePhysicalNetBIOS, lpComputerName ); -} - - -/* - * @implemented - */ -BOOL WINAPI -SetComputerNameExA ( - COMPUTER_NAME_FORMAT NameType, - LPCSTR lpBuffer) +BOOL +WINAPI +SetComputerNameA(LPCSTR lpComputerName) +{ + return SetComputerNameExA(ComputerNamePhysicalNetBIOS, lpComputerName); +} + + +/* + * @implemented + */ +BOOL +WINAPI +SetComputerNameW(LPCWSTR lpComputerName) +{ + return SetComputerNameExW(ComputerNamePhysicalNetBIOS, lpComputerName); +} + + +/* + * @implemented + */ +BOOL +WINAPI +SetComputerNameExA(COMPUTER_NAME_FORMAT NameType, + LPCSTR lpBuffer) { UNICODE_STRING Buffer; BOOL bResult; - RtlCreateUnicodeStringFromAsciiz (&Buffer, - (LPSTR)lpBuffer); - - bResult = SetComputerNameExW (NameType, Buffer.Buffer); - - RtlFreeUnicodeString (&Buffer); + RtlCreateUnicodeStringFromAsciiz(&Buffer, (LPSTR)lpBuffer); + + bResult = SetComputerNameExW(NameType, Buffer.Buffer); + + RtlFreeUnicodeString(&Buffer); return bResult; } @@ -422,43 +432,41 @@ /* * @implemented */ -BOOL WINAPI -SetComputerNameExW ( - COMPUTER_NAME_FORMAT NameType, - LPCWSTR lpBuffer) -{ - if (!IsValidComputerName (NameType, lpBuffer)) - { - SetLastError (ERROR_INVALID_PARAMETER); - return FALSE; - } - - switch( NameType ) { - case ComputerNamePhysicalDnsDomain: - return SetComputerNameToRegistry - ( L"\\Registry\\Machine\\System\\CurrentControlSet" - L"\\Services\\Tcpip\\Parameters", - L"Domain", - lpBuffer ); - - case ComputerNamePhysicalDnsHostname: - return SetComputerNameToRegistry - ( L"\\Registry\\Machine\\System\\CurrentControlSet" - L"\\Services\\Tcpip\\Parameters", - L"Hostname", - lpBuffer ); - - case ComputerNamePhysicalNetBIOS: - return SetComputerNameToRegistry - ( L"\\Registry\\Machine\\System\\CurrentControlSet" - L"\\Control\\ComputerName\\ComputerName", - L"ComputerName", - lpBuffer ); - - default: - SetLastError (ERROR_INVALID_PARAMETER); - return FALSE; - } +BOOL +WINAPI +SetComputerNameExW(COMPUTER_NAME_FORMAT NameType, + LPCWSTR lpBuffer) +{ + if (!IsValidComputerName(NameType, lpBuffer)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + switch( NameType ) + { + case ComputerNamePhysicalDnsDomain: + return SetComputerNameToRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" + L"\\Services\\Tcpip\\Parameters", + L"Domain", + lpBuffer); + + case ComputerNamePhysicalDnsHostname: + return SetComputerNameToRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" + L"\\Services\\Tcpip\\Parameters", + L"Hostname", + lpBuffer); + + case ComputerNamePhysicalNetBIOS: + return SetComputerNameToRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" + L"\\Control\\ComputerName\\ComputerName", + L"ComputerName", + lpBuffer); + + default: + SetLastError (ERROR_INVALID_PARAMETER); + return FALSE; + } } @@ -491,7 +499,7 @@ if (!ComputerName) return FALSE; - memcpy( ComputerName, Hostname, len ); + memcpy(ComputerName, Hostname, len); ComputerName[len + 1] = 0; return TRUE; } @@ -502,11 +510,9 @@ */ BOOL WINAPI -DnsHostnameToComputerNameW ( - LPCWSTR hostname, - LPWSTR computername, - LPDWORD size - ) +DnsHostnameToComputerNameW(LPCWSTR hostname, + LPWSTR computername, + LPDWORD size) { DWORD len; @@ -525,7 +531,7 @@ } if (!computername) return FALSE; - memcpy( computername, hostname, len * sizeof(WCHAR) ); + memcpy(computername, hostname, len * sizeof(WCHAR)); computername[len + 1] = 0; return TRUE; }

1 0

[cwittich] 38687: sync mlang with wine 1.1.12
by cwittich＠svn.reactos.org 10 Jan '09

10 Jan '09

Author: cwittich Date: Sat Jan 10 12:49:19 2009 New Revision: 38687 URL: http://svn.reactos.org/svn/reactos?rev=38687&view=rev Log: sync mlang with wine 1.1.12 Modified: trunk/reactos/dll/win32/mlang/regsvr.c Modified: trunk/reactos/dll/win32/mlang/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/regsvr.c?r… ============================================================================== --- trunk/reactos/dll/win32/mlang/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mlang/regsvr.c [iso-8859-1] Sat Jan 10 12:49:19 2009 @@ -33,6 +33,8 @@ #include "mlang.h" #include "wine/debug.h" +#include "wine/unicode.h" + #include "initguid.h" WINE_DEFAULT_DEBUG_CHANNEL(mlang); @@ -163,7 +165,7 @@ KEY_READ | KEY_WRITE, NULL, &key, NULL); if (res != ERROR_SUCCESS) goto error_close_iid_key; - wsprintfW(buf, fmt, list->num_methods); + sprintfW(buf, fmt, list->num_methods); res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)buf, (lstrlenW(buf) + 1) * sizeof(WCHAR));

1 0

[cwittich] 38686: sync mapi32 with wine 1.1.12
by cwittich＠svn.reactos.org 10 Jan '09

10 Jan '09

Author: cwittich Date: Sat Jan 10 12:48:19 2009 New Revision: 38686 URL: http://svn.reactos.org/svn/reactos?rev=38686&view=rev Log: sync mapi32 with wine 1.1.12 Modified: trunk/reactos/dll/win32/mapi32/prop.c Modified: trunk/reactos/dll/win32/mapi32/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/prop.c?re… ============================================================================== --- trunk/reactos/dll/win32/mapi32/prop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/prop.c [iso-8859-1] Sat Jan 10 12:48:19 2009 @@ -1485,8 +1485,7 @@ * - IUnknown() : The default interface for all COM-Objects. * - IMAPIProp() : The default Mapi interface for manipulating object properties. */ -static inline HRESULT WINAPI -IMAPIProp_fnQueryInterface(LPMAPIPROP iface, REFIID riid, LPVOID *ppvObj) +static inline HRESULT IMAPIProp_fnQueryInterface(LPMAPIPROP iface, REFIID riid, LPVOID *ppvObj) { IPropDataImpl *This = (IPropDataImpl*)iface; @@ -1517,7 +1516,7 @@ * Inherited method from the IUnknown Interface. * See IUnknown_AddRef. */ -static inline ULONG WINAPI IMAPIProp_fnAddRef(LPMAPIPROP iface) +static inline ULONG IMAPIProp_fnAddRef(LPMAPIPROP iface) { IPropDataImpl *This = (IPropDataImpl*)iface; @@ -1532,7 +1531,7 @@ * Inherited method from the IUnknown Interface. * See IUnknown_Release. */ -static inline ULONG WINAPI IMAPIProp_fnRelease(LPMAPIPROP iface) +static inline ULONG IMAPIProp_fnRelease(LPMAPIPROP iface) { IPropDataImpl *This = (IPropDataImpl*)iface; LONG lRef; @@ -1582,7 +1581,7 @@ * - It is possible for this function to succeed and set *lppError to NULL, * if there is no further information to report about hRes. */ -static inline HRESULT WINAPI +static inline HRESULT IMAPIProp_fnGetLastError(LPMAPIPROP iface, HRESULT hRes, ULONG ulFlags, LPMAPIERROR *lppError) { @@ -1608,7 +1607,7 @@ * Success: S_OK. Any outstanding changes are committed to the object. * Failure: An HRESULT error code describing the error. */ -static inline HRESULT WINAPI +static inline HRESULT IMAPIProp_fnSaveChanges(LPMAPIPROP iface, ULONG ulFlags) { TRACE("(%p,0x%08X)\n", iface, ulFlags); @@ -1642,7 +1641,7 @@ * retrieved from iface are present in lppProps with their type * changed to PT_ERROR and Id unchanged. */ -static inline HRESULT WINAPI +static inline HRESULT IMAPIProp_fnGetProps(LPMAPIPROP iface, LPSPropTagArray lpTags, ULONG ulFlags, ULONG *lpCount, LPSPropValue *lppProps) { @@ -1709,7 +1708,7 @@ * MAPI_E_BAD_CHARWIDTH, if Ascii or Unicode strings are requested * and that type of string is not supported. */ -static inline HRESULT WINAPI +static inline HRESULT IMAPIProp_fnGetPropList(LPMAPIPROP iface, ULONG ulFlags, LPSPropTagArray *lppTags) { @@ -1756,7 +1755,7 @@ * RETURNS * An HRESULT success/failure code. */ -static inline HRESULT WINAPI +static inline HRESULT IMAPIProp_fnOpenProperty(LPMAPIPROP iface, ULONG ulPropTag, LPCIID iid, ULONG ulOpts, ULONG ulFlags, LPUNKNOWN *lpUnk) { @@ -1782,7 +1781,7 @@ * exist, or changed to the values in lpProps if they do * Failure: An HRESULT error code describing the error */ -static inline HRESULT WINAPI +static inline HRESULT IMAPIProp_fnSetProps(LPMAPIPROP iface, ULONG ulValues, LPSPropValue lpProps, LPSPropProblemArray *lppProbs) { @@ -1869,7 +1868,7 @@ * in lpTags but not in iface. * - lppProbs should be deleted with MAPIFreeBuffer() if returned. */ -static inline HRESULT WINAPI +static inline HRESULT IMAPIProp_fnDeleteProps(LPMAPIPROP iface, LPSPropTagArray lpTags, LPSPropProblemArray *lppProbs) { @@ -1953,7 +1952,7 @@ * RETURNS * An HRESULT success/failure code. */ -static inline HRESULT WINAPI +static inline HRESULT IMAPIProp_fnCopyTo(LPMAPIPROP iface, ULONG niids, LPCIID lpiidExcl, LPSPropTagArray lpPropsExcl, ULONG ulParam, LPMAPIPROGRESS lpIProgress, LPCIID lpIfaceIid, LPVOID lpDstObj, @@ -1973,7 +1972,7 @@ * RETURNS * An HRESULT success/failure code. */ -static inline HRESULT WINAPI +static inline HRESULT IMAPIProp_fnCopyProps(LPMAPIPROP iface, LPSPropTagArray lpInclProps, ULONG ulParam, LPMAPIPROGRESS lpIProgress, LPCIID lpIface, LPVOID lpDstObj, ULONG ulFlags, @@ -2008,7 +2007,7 @@ * MAPI_W_ERRORS_RETURNED if not all properties were retrieved * successfully. */ -static inline HRESULT WINAPI +static inline HRESULT IMAPIProp_fnGetNamesFromIDs(LPMAPIPROP iface, LPSPropTagArray *lppPropTags, LPGUID iid, ULONG ulFlags, ULONG *lpCount, LPMAPINAMEID **lpppNames) @@ -2039,7 +2038,7 @@ * MAPI_W_ERRORS_RETURNED if not all properties were retrieved * successfully. */ -static inline HRESULT WINAPI +static inline HRESULT IMAPIProp_fnGetIDsFromNames(LPMAPIPROP iface, ULONG ulNames, LPMAPINAMEID *lppNames, ULONG ulFlags, LPSPropTagArray *lppPropTags)

1 0

[cwittich] 38685: sync localui with wine 1.1.12
by cwittich＠svn.reactos.org 10 Jan '09

10 Jan '09

Author: cwittich Date: Sat Jan 10 12:46:10 2009 New Revision: 38685 URL: http://svn.reactos.org/svn/reactos?rev=38685&view=rev Log: sync localui with wine 1.1.12 Modified: trunk/reactos/dll/win32/localui/ui_Ko.rc trunk/reactos/dll/win32/localui/ui_Zh.rc Modified: trunk/reactos/dll/win32/localui/ui_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Ko.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Ko.rc [iso-8859-1] Sat Jan 10 12:46:10 2009 @@ -24,7 +24,7 @@ ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Áö¿ª Æ÷Æ® ´õÇÏ±â" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "´õÇÒ Æ÷Æ® ÀÌ¸§ ÀÔ·Â(&E):", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL @@ -36,7 +36,7 @@ LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "LPT Æ÷Æ® ¼³Á¤" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" BEGIN GROUPBOX "½Ã°£ÃÊ°ú(ÃÊ)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX LTEXT "Àç Àü¼Û È½¼ö(&T):", -1, 14, 22, 90, 13, WS_VISIBLE Modified: trunk/reactos/dll/win32/localui/ui_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/ui_Zh.rc… ============================================================================== --- trunk/reactos/dll/win32/localui/ui_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localui/ui_Zh.rc [iso-8859-1] Sat Jan 10 12:46:10 2009 @@ -26,7 +26,7 @@ ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "æ·»å æ¬å°ç«¯å£" -FONT 9, "MS Song" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "æ·»å æ¬å°ç«¯å£åç§°(&E):", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL @@ -38,7 +38,7 @@ LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "è®¾ç½®æå°ç«¯å£" -FONT 9, "MS Song" +FONT 9, "MS Shell Dlg" BEGIN GROUPBOX "è¶æ¶(ç§)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX LTEXT "éè¯éè®¯(&T):", -1, 14, 22, 90, 13, WS_VISIBLE @@ -61,7 +61,7 @@ ADDPORT_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "æ·»å æ¬å°ç«¯å£" -FONT 8, "PMingLiu" +FONT 9, "MS Shell Dlg" BEGIN LTEXT "æ·»å æ¬å°ç«¯å£åç¨±(&E):", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT ADDPORT_EDIT, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL @@ -73,7 +73,7 @@ LPTCONFIG_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 220, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "è¨å®åå°ç«¯å£" -FONT 8, "PMingLiu" +FONT 9, "MS Shell Dlg" BEGIN GROUPBOX "è¶æ(ç§)", LPTCONFIG_GROUP, 6, 6, 150, 35, BS_GROUPBOX LTEXT "éè©¦éè¨(&T):", -1, 14, 22, 90, 13, WS_VISIBLE

1 0

[cwittich] 38684: sync inetcomm with wine 1.1.12
by cwittich＠svn.reactos.org 10 Jan '09

10 Jan '09

Author: cwittich Date: Sat Jan 10 12:44:33 2009 New Revision: 38684 URL: http://svn.reactos.org/svn/reactos?rev=38684&view=rev Log: sync inetcomm with wine 1.1.12 Modified: trunk/reactos/dll/win32/inetcomm/pop3transport.c trunk/reactos/dll/win32/inetcomm/regsvr.c Modified: trunk/reactos/dll/win32/inetcomm/pop3transport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/pop3tra… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/pop3transport.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/pop3transport.c [iso-8859-1] Sat Jan 10 12:44:33 2009 @@ -460,7 +460,7 @@ InternetTransport_ReadLine(&This->InetTransport, POP3Transport_CallbackProcessRSETResp); } -void POP3Transport_CallbackProcessRETRResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) +static void POP3Transport_CallbackProcessRETRResp(IInternetTransport *iface, char *pBuffer, int cbBuffer) { POP3Transport *This = (POP3Transport *)iface; POP3RESPONSE response; Modified: trunk/reactos/dll/win32/inetcomm/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/regsvr.… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/regsvr.c [iso-8859-1] Sat Jan 10 12:44:33 2009 @@ -35,6 +35,7 @@ #include "inetcomm_private.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); @@ -151,7 +152,7 @@ KEY_READ | KEY_WRITE, NULL, &key, NULL); if (res != ERROR_SUCCESS) goto error_close_iid_key; - wsprintfW(buf, fmt, list->num_methods); + sprintfW(buf, fmt, list->num_methods); res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)buf, (lstrlenW(buf) + 1) * sizeof(WCHAR));

1 0

[sginsberg] 38683: - Remove broken definitions of SEH macros
by sginsberg＠svn.reactos.org 10 Jan '09

10 Jan '09

Author: sginsberg Date: Sat Jan 10 12:25:20 2009 New Revision: 38683 URL: http://svn.reactos.org/svn/reactos?rev=38683&view=rev Log: - Remove broken definitions of SEH macros Modified: trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/windef.h Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Sat Jan 10 12:25:20 2009 @@ -1106,9 +1106,6 @@ HFILE WINAPI _lopen(LPCSTR,int); UINT WINAPI _lread(HFILE,LPVOID,UINT); UINT WINAPI _lwrite(HFILE,LPCSTR,UINT); -#ifndef AbnormalTermination -#define AbnormalTermination() FALSE -#endif BOOL WINAPI AccessCheck(PSECURITY_DESCRIPTOR,HANDLE,DWORD,PGENERIC_MAPPING,PPRIVILEGE_SET,PDWORD,PDWORD,PBOOL); BOOL WINAPI AccessCheckAndAuditAlarmA(LPCSTR,LPVOID,LPSTR,LPSTR,PSECURITY_DESCRIPTOR,DWORD,PGENERIC_MAPPING,BOOL,PDWORD,PBOOL,PBOOL); BOOL WINAPI AccessCheckAndAuditAlarmW(LPCWSTR,LPVOID,LPWSTR,LPWSTR,PSECURITY_DESCRIPTOR,DWORD,PGENERIC_MAPPING,BOOL,PDWORD,PBOOL,PBOOL); Modified: trunk/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/windef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windef.h [iso-8859-1] Sat Jan 10 12:25:20 2009 @@ -254,19 +254,6 @@ #ifndef STRICT #define STRICT 1 #endif -#endif - -/* FIXME: This will make some code compile. The programs will most - likely crash when an exception is raised, but at least they will - compile. */ -#if defined (__GNUC__) && defined (__SEH_NOOP) -#define __try -#define __except(x) if (0) /* don't execute handler */ -#define __finally - -#define _try __try -#define _except __except -#define _finally __finally #endif #ifndef DWORD_DEFINED

1 0

[dchapyshev] 38682: - Fix GetEnvironmentVariableW. This fixed also 4 wine tests for OpenFile and SearchPathA/W
by dchapyshev＠svn.reactos.org 10 Jan '09

10 Jan '09

Author: dchapyshev Date: Sat Jan 10 11:50:03 2009 New Revision: 38682 URL: http://svn.reactos.org/svn/reactos?rev=38682&view=rev Log: - Fix GetEnvironmentVariableW. This fixed also 4 wine tests for OpenFile and SearchPathA/W Modified: trunk/reactos/dll/win32/kernel32/misc/env.c Modified: trunk/reactos/dll/win32/kernel32/misc/env.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/en… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/env.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/env.c [iso-8859-1] Sat Jan 10 11:50:03 2009 @@ -139,7 +139,7 @@ lpName); VarValue.Length = 0; - VarValue.MaximumLength = (USHORT)(nSize != 0 ? (nSize - 1) * sizeof(WCHAR) : 0); + VarValue.MaximumLength = (USHORT) (nSize ? nSize - 1 : 0) * sizeof(WCHAR); VarValue.Buffer = lpBuffer; Status = RtlQueryEnvironmentVariable_U (NULL, @@ -147,13 +147,13 @@ &VarValue); if (!NT_SUCCESS(Status)) { - SetLastErrorByStatus (Status); if (Status == STATUS_BUFFER_TOO_SMALL) { return (VarValue.Length / sizeof(WCHAR)) + 1; } else { + SetLastErrorByStatus (Status); return 0; } } @@ -162,7 +162,7 @@ { /* make sure the string is NULL-terminated! RtlQueryEnvironmentVariable_U only terminates it if MaximumLength < Length */ - VarValue.Buffer[VarValue.Length / sizeof(WCHAR)] = L'\0'; + lpBuffer[VarValue.Length / sizeof(WCHAR)] = L'\0'; } return (VarValue.Length / sizeof(WCHAR));

1 0

[weiden] 38681: SetShellWindow wants the Progman window and the list view window... Thx Timo
by weiden＠svn.reactos.org 10 Jan '09

10 Jan '09

Author: weiden Date: Sat Jan 10 10:16:25 2009 New Revision: 38681 URL: http://svn.reactos.org/svn/reactos?rev=38681&view=rev Log: SetShellWindow wants the Progman window and the list view window... Thx Timo Modified: trunk/reactos/dll/win32/shell32/desktop.c Modified: trunk/reactos/dll/win32/shell32/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/desktop.… ============================================================================== --- trunk/reactos/dll/win32/shell32/desktop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/desktop.c [iso-8859-1] Sat Jan 10 10:16:25 2009 @@ -255,13 +255,21 @@ return This; } +static HWND +SHDESK_FindDesktopListView (SHDESK *This) +{ + return FindWindowEx (This->hWndShellView, + NULL, + WC_LISTVIEW, + NULL); +} + static BOOL SHDESK_CreateDeskWnd(SHDESK *This) { IShellBrowser *ShellBrowser; FOLDERSETTINGS fs; RECT rcClient; - HWND hwndTray; HRESULT hRet; if (!GetClientRect(This->hWnd, @@ -278,12 +286,9 @@ if (!SUCCEEDED(hRet)) return FALSE; - if (SUCCEEDED (IShellDesktop_GetTrayWindow(This->ShellDesk, - &hwndTray))) - { - SetShellWindowEx (This->hWnd, - hwndTray); // FIXME: Shouldn't this be the desktop listview? - } + SetShellWindowEx (This->hWnd, + SHDESK_FindDesktopListView (This)); + return TRUE; }

1 0

← Newer
1
...
54
55
56
57
58
59
60
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2009