Ros-diffs June 2008

ros-diffs@reactos.org

23 participants
435 discussions

[fireball] 34046: SVN Maintenance: set eol-style:native for lib/sdk/crt.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Jun 22 07:08:15 2008 New Revision: 34046 URL: http://svn.reactos.org/svn/reactos?rev=34046&view=rev Log: SVN Maintenance: set eol-style:native for lib/sdk/crt. Modified: trunk/reactos/lib/sdk/crt/except/powerpc/chkstk_asm.s (props changed) trunk/reactos/lib/sdk/crt/except/powerpc/seh.s (contents, props changed) trunk/reactos/lib/sdk/crt/process/thread.c (contents, props changed) Propchange: trunk/reactos/lib/sdk/crt/except/powerpc/chkstk_asm.s ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/sdk/crt/except/powerpc/seh.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/powerpc… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/powerpc/seh.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/powerpc/seh.s [iso-8859-1] Sun Jun 22 07:08:15 2008 @@ -1,75 +1,75 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS CRT - * FILE: lib/crt/misc/i386/seh.S - * PURPOSE: SEH Support for the CRT - * PROGRAMMERS: arty - */ - -/* INCLUDES ******************************************************************/ - -#include <ndk/asm.h> - -#define DISPOSITION_DISMISS 0 -#define DISPOSITION_CONTINUE_SEARCH 1 -#define DISPOSITION_COLLIDED_UNWIND 3 - -/* GLOBALS *******************************************************************/ - -.globl _global_unwind2 -.globl _local_unwind2 -.globl _abnormal_termination -.globl _except_handler2 -.globl _except_handler3 - -/* FUNCTIONS *****************************************************************/ - -unwind_handler: - blr - -_global_unwind2: - blr - -_local_unwind2: - blr - -_except_handler2: - blr - -_except_handler3: - blr - -// -// -// REMOVE ME REMOVE ME REMOVE ME REMOVE ME REMOVE ME REMOVE ME REMOVE ME -// sorry -// -// -.globl RtlpGetStackLimits -RtlpGetStackLimits: - stwu 1,16(1) - mflr 0 - - stw 0,4(1) - stw 3,8(1) - stw 4,12(1) - - /* Get the current thread */ - lwz 3,KPCR_CURRENT_THREAD(13) - - /* Get the stack limits */ - lwz 4,KTHREAD_STACK_LIMIT(3) - lwz 5,KTHREAD_INITIAL_STACK(3) - subi 5,5,SIZEOF_FX_SAVE_AREA - - /* Return them */ - lwz 3,8(1) - stw 4,0(3) - - lwz 3,12(1) - stw 5,0(3) - - addi 1,1,16 - - /* return */ - blr +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT + * FILE: lib/crt/misc/i386/seh.S + * PURPOSE: SEH Support for the CRT + * PROGRAMMERS: arty + */ + +/* INCLUDES ******************************************************************/ + +#include <ndk/asm.h> + +#define DISPOSITION_DISMISS 0 +#define DISPOSITION_CONTINUE_SEARCH 1 +#define DISPOSITION_COLLIDED_UNWIND 3 + +/* GLOBALS *******************************************************************/ + +.globl _global_unwind2 +.globl _local_unwind2 +.globl _abnormal_termination +.globl _except_handler2 +.globl _except_handler3 + +/* FUNCTIONS *****************************************************************/ + +unwind_handler: + blr + +_global_unwind2: + blr + +_local_unwind2: + blr + +_except_handler2: + blr + +_except_handler3: + blr + +// +// +// REMOVE ME REMOVE ME REMOVE ME REMOVE ME REMOVE ME REMOVE ME REMOVE ME +// sorry +// +// +.globl RtlpGetStackLimits +RtlpGetStackLimits: + stwu 1,16(1) + mflr 0 + + stw 0,4(1) + stw 3,8(1) + stw 4,12(1) + + /* Get the current thread */ + lwz 3,KPCR_CURRENT_THREAD(13) + + /* Get the stack limits */ + lwz 4,KTHREAD_STACK_LIMIT(3) + lwz 5,KTHREAD_INITIAL_STACK(3) + subi 5,5,SIZEOF_FX_SAVE_AREA + + /* Return them */ + lwz 3,8(1) + stw 4,0(3) + + lwz 3,12(1) + stw 5,0(3) + + addi 1,1,16 + + /* return */ + blr Propchange: trunk/reactos/lib/sdk/crt/except/powerpc/seh.s ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/sdk/crt/process/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/process/thread… ============================================================================== --- trunk/reactos/lib/sdk/crt/process/thread.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/process/thread.c [iso-8859-1] Sun Jun 22 07:08:15 2008 @@ -1,115 +1,115 @@ -/* - * msvcrt.dll thread functions - * - * Copyright 2000 Jon Griffiths - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <precomp.h> -#include <internal/wine/msvcrt.h> - -#include <malloc.h> -#include <process.h> - -void _amsg_exit (int errnum); -/* Index to TLS */ -DWORD MSVCRT_tls_index; - -typedef void (*_beginthread_start_routine_t)(void *); -typedef unsigned int (__stdcall *_beginthreadex_start_routine_t)(void *); - -/********************************************************************/ - -typedef struct { - _beginthread_start_routine_t start_address; - void *arglist; -} _beginthread_trampoline_t; - -/********************************************************************* - * msvcrt_get_thread_data - * - * Return the thread local storage structure. - */ -MSVCRT_thread_data *msvcrt_get_thread_data(void) -{ - MSVCRT_thread_data *ptr; - DWORD err = GetLastError(); /* need to preserve last error */ - - if (!(ptr = TlsGetValue( MSVCRT_tls_index ))) - { - if (!(ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ptr) ))) - _amsg_exit( _RT_THREAD ); - if (!TlsSetValue( MSVCRT_tls_index, ptr )) _amsg_exit( _RT_THREAD ); - ptr->random_seed = 1; - } - SetLastError( err ); - return ptr; -} - - -/********************************************************************* - * _beginthread_trampoline - */ -static DWORD CALLBACK _beginthread_trampoline(LPVOID arg) -{ - _beginthread_trampoline_t local_trampoline; - - /* Maybe it's just being paranoid, but freeing arg right - * away seems safer. - */ - memcpy(&local_trampoline,arg,sizeof(local_trampoline)); - free(arg); - - local_trampoline.start_address(local_trampoline.arglist); - return 0; -} - -/********************************************************************* - * _beginthread (MSVCRT.@) - */ -unsigned long _beginthread( - _beginthread_start_routine_t start_address, /* [in] Start address of routine that begins execution of new thread */ - unsigned int stack_size, /* [in] Stack size for new thread or 0 */ - void *arglist) /* [in] Argument list to be passed to new thread or NULL */ -{ - _beginthread_trampoline_t* trampoline; - - TRACE("(%p, %d, %p)\n", start_address, stack_size, arglist); - - /* Allocate the trampoline here so that it is still valid when the thread - * starts... typically after this function has returned. - * _beginthread_trampoline is responsible for freeing the trampoline - */ - trampoline=malloc(sizeof(*trampoline)); - trampoline->start_address = start_address; - trampoline->arglist = arglist; - - /* FIXME */ - return (unsigned long)CreateThread(NULL, stack_size, _beginthread_trampoline, - trampoline, 0, NULL); -} - -/********************************************************************* - * _endthread (MSVCRT.@) - */ -void CDECL _endthread(void) -{ - TRACE("(void)\n"); - - /* FIXME */ - ExitThread(0); -} - +/* + * msvcrt.dll thread functions + * + * Copyright 2000 Jon Griffiths + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <precomp.h> +#include <internal/wine/msvcrt.h> + +#include <malloc.h> +#include <process.h> + +void _amsg_exit (int errnum); +/* Index to TLS */ +DWORD MSVCRT_tls_index; + +typedef void (*_beginthread_start_routine_t)(void *); +typedef unsigned int (__stdcall *_beginthreadex_start_routine_t)(void *); + +/********************************************************************/ + +typedef struct { + _beginthread_start_routine_t start_address; + void *arglist; +} _beginthread_trampoline_t; + +/********************************************************************* + * msvcrt_get_thread_data + * + * Return the thread local storage structure. + */ +MSVCRT_thread_data *msvcrt_get_thread_data(void) +{ + MSVCRT_thread_data *ptr; + DWORD err = GetLastError(); /* need to preserve last error */ + + if (!(ptr = TlsGetValue( MSVCRT_tls_index ))) + { + if (!(ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ptr) ))) + _amsg_exit( _RT_THREAD ); + if (!TlsSetValue( MSVCRT_tls_index, ptr )) _amsg_exit( _RT_THREAD ); + ptr->random_seed = 1; + } + SetLastError( err ); + return ptr; +} + + +/********************************************************************* + * _beginthread_trampoline + */ +static DWORD CALLBACK _beginthread_trampoline(LPVOID arg) +{ + _beginthread_trampoline_t local_trampoline; + + /* Maybe it's just being paranoid, but freeing arg right + * away seems safer. + */ + memcpy(&local_trampoline,arg,sizeof(local_trampoline)); + free(arg); + + local_trampoline.start_address(local_trampoline.arglist); + return 0; +} + +/********************************************************************* + * _beginthread (MSVCRT.@) + */ +unsigned long _beginthread( + _beginthread_start_routine_t start_address, /* [in] Start address of routine that begins execution of new thread */ + unsigned int stack_size, /* [in] Stack size for new thread or 0 */ + void *arglist) /* [in] Argument list to be passed to new thread or NULL */ +{ + _beginthread_trampoline_t* trampoline; + + TRACE("(%p, %d, %p)\n", start_address, stack_size, arglist); + + /* Allocate the trampoline here so that it is still valid when the thread + * starts... typically after this function has returned. + * _beginthread_trampoline is responsible for freeing the trampoline + */ + trampoline=malloc(sizeof(*trampoline)); + trampoline->start_address = start_address; + trampoline->arglist = arglist; + + /* FIXME */ + return (unsigned long)CreateThread(NULL, stack_size, _beginthread_trampoline, + trampoline, 0, NULL); +} + +/********************************************************************* + * _endthread (MSVCRT.@) + */ +void CDECL _endthread(void) +{ + TRACE("(void)\n"); + + /* FIXME */ + ExitThread(0); +} +

16 years, 3 months

[mkupfer] 34045: - Seungju Kim <admin AT manateeshome DOT com> - Korean translation of explorer-new added - See issue #3368 for more details. - Alexander Wurzinger <<Lohnegrim At gmx DOT net> - Patch for the "CreateEnergyList failed"-Error added. - See issue #2469 for more details.

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Sun Jun 22 05:01:59 2008 New Revision: 34045 URL: http://svn.reactos.org/svn/reactos?rev=34045&view=rev Log: - Seungju Kim <admin AT manateeshome DOT com> - Korean translation of explorer-new added - See issue #3368 for more details. - Alexander Wurzinger <<Lohnegrim At gmx DOT net> - Patch for the "CreateEnergyList failed"-Error added. - See issue #2469 for more details. Added: trunk/reactos/base/shell/explorer-new/lang/ko-KO.rc (with props) Modified: trunk/reactos/base/shell/explorer-new/explorer.rc trunk/reactos/dll/win32/powrprof/powrprof.c Modified: trunk/reactos/base/shell/explorer-new/explorer.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/explorer.rc [iso-8859-1] Sun Jun 22 05:01:59 2008 @@ -22,3 +22,4 @@ #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" +#include "lang/ko-KO.rc" Added: trunk/reactos/base/shell/explorer-new/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/ko-KO.rc (added) +++ trunk/reactos/base/shell/explorer-new/lang/ko-KO.rc [iso-8859-1] Sun Jun 22 05:01:59 2008 @@ -1,0 +1,63 @@ +/* + *Korean translation by manatails007(www.manatails007.org) + *Seungju Kim + */ +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +IDM_TRAYWND MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "ÀÛ¾÷ Ç¥½ÃÁÙ Àá±×±â(&L)", ID_LOCKTASKBAR + MENUITEM "¼Ó¼º(&R)", ID_SHELL_CMD_PROPERTIES + END +END + +IDM_STARTMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + POPUP "ÇÁ·Î±×·¥(&P)", IDM_PROGRAMS + BEGIN + MENUITEM "(ºñ¾î ÀÖÀ½)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "Áñ°ÜÃ£±â(&A)", IDM_FAVORITES + BEGIN + MENUITEM "(ºñ¾î ÀÖÀ½)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "¹®¼(&D)", IDM_DOCUMENTS + BEGIN + MENUITEM "(ºñ¾î ÀÖÀ½)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "¼³Á¤(&S)", IDM_SETTINGS + BEGIN + MENUITEM "Á¦¾îÆÇ(&C)", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "º¸¾È(&S)...", IDM_SECURITY, MFT_STRING, MFS_ENABLED + MENUITEM "³×Æ®¿öÅ© ¿¬°á(&N)", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED + MENUITEM "ÇÁ¸°ÅÍ¿Í ÆÑ½º(&P)", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED + MENUITEM "ÀÛ¾÷ Ç¥½ÃÁÙ°ú ½ÃÀÛ ¸Þ´º(&T)", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED + END + POPUP "°Ë»ö(&C)", IDM_SEARCH + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + END + MENUITEM "µµ¿ò¸»(&H)", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED + MENUITEM "½ÇÇà(&R)...", IDM_RUN, MFT_STRING, MFS_ENABLED + MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED + MENUITEM "½ÌÅ©·Î³ªÀÌÁî(&Y)", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED + MENUITEM "%s ·Î±× ¿ÀÇÁ(&L)...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED + MENUITEM "¿¬°á ²÷±â(&I)...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED + MENUITEM "ÄÄÇ»ÅÍ µµÅ· ÇØÁ¦(&E)", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED + MENUITEM "ÄÔÇ»ÅÍ ²ô±â(&U)...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_START "½ÃÀÛ" + IDS_PROPERTIES "¼Ó¼º(&R)" + IDS_OPEN_ALL_USERS "¿±â - All Users(&P)" + IDS_EXPLORE_ALL_USERS "Å½»ö - All Users(&X)" +END Propchange: trunk/reactos/base/shell/explorer-new/lang/ko-KO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/powrprof/powrprof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/powrprof/powrpro… ============================================================================== --- trunk/reactos/dll/win32/powrprof/powrprof.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/powrprof/powrprof.c [iso-8859-1] Sun Jun 22 05:01:59 2008 @@ -35,6 +35,7 @@ static const WCHAR szPowerCfgSubKey[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\PowerCfg"; +static const WCHAR szPolicies[] = L"Policies"; static const WCHAR szSemaphoreName[] = L"PowerProfileRegistrySemaphore"; static const WCHAR szDiskMax[] = L"DiskSpindownMax"; static const WCHAR szDiskMin[] = L"DiskSpindownMin"; @@ -119,7 +120,7 @@ static BOOLEAN POWRPROF_GetUserPowerPolicy(LPWSTR szNum, - USER_POWER_POLICY userPwrPolicy, + PUSER_POWER_POLICY puserPwrPolicy, DWORD dwName, LPWSTR szName, DWORD dwDesc, LPWSTR szDesc) { @@ -156,8 +157,8 @@ return FALSE; } - dwSize = sizeof(userPwrPolicy); - Err = RegQueryValueExW(hSubKey, L"Policies", NULL, NULL, (LPBYTE)&userPwrPolicy, &dwSize); + dwSize = sizeof(USER_POWER_POLICY); + Err = RegQueryValueExW(hSubKey, L"Policies", NULL, NULL, (LPBYTE)puserPwrPolicy, &dwSize); if (Err != ERROR_SUCCESS) { ERR("RegQueryValueExW failed: %d\n", Err); @@ -169,7 +170,7 @@ } static BOOLEAN -POWRPROF_GetMachinePowerPolicy(LPWSTR szNum, MACHINE_POWER_POLICY machinePwrPolicy) +POWRPROF_GetMachinePowerPolicy(LPWSTR szNum, PMACHINE_POWER_POLICY pmachinePwrPolicy) { HKEY hKey; LONG Err; @@ -186,8 +187,8 @@ return FALSE; } - dwSize = sizeof(machinePwrPolicy); - Err = RegQueryValueExW(hKey, L"Policies", NULL, NULL, (LPBYTE)&machinePwrPolicy, &dwSize); + dwSize = sizeof(MACHINE_POWER_POLICY); + Err = RegQueryValueExW(hKey, L"Policies", NULL, NULL, (LPBYTE)pmachinePwrPolicy, &dwSize); if (Err != ERROR_SUCCESS) { ERR("RegQueryValueExW failed: %d\n", Err); @@ -204,11 +205,12 @@ { HKEY hKey; LONG Err; - DWORD dwSize, dwNameSize = 0, dwDescSize = 0, dwIndex = 0; + DWORD dwSize, dwNameSize = MAX_PATH, dwDescSize = MAX_PATH, dwIndex = 0; WCHAR szNum[3 + 1], szName[MAX_PATH], szDesc[MAX_PATH]; - PPOWER_POLICY pPwrPolicy = NULL; + POWER_POLICY PwrPolicy; USER_POWER_POLICY userPwrPolicy; MACHINE_POWER_POLICY machinePwrPolicy; + BOOLEAN ret = FALSE; if (!lpfnPwrSchemesEnumProc) { @@ -230,7 +232,7 @@ while (RegEnumKeyExW(hKey, dwIndex, szNum, &dwSize, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) { - if (!POWRPROF_GetUserPowerPolicy(szNum, userPwrPolicy, + if (!POWRPROF_GetUserPowerPolicy(szNum, &userPwrPolicy, dwNameSize, szName, dwDescSize, szDesc)) { @@ -239,18 +241,26 @@ return FALSE; } - if (!POWRPROF_GetMachinePowerPolicy(szNum, machinePwrPolicy)) + if (!POWRPROF_GetMachinePowerPolicy(szNum, &machinePwrPolicy)) { RegCloseKey(hKey); ReleaseSemaphore(PPRegSemaphore, 1, NULL); return FALSE; } - memcpy(&pPwrPolicy->user, &userPwrPolicy, sizeof(USER_POWER_POLICY)); - memcpy(&pPwrPolicy->mach, &machinePwrPolicy, sizeof(MACHINE_POWER_POLICY)); - - if (!lpfnPwrSchemesEnumProc(_wtoi(szNum), dwNameSize, szName, dwDescSize, szDesc, pPwrPolicy, lParam)) - break; + memcpy(&PwrPolicy.user, &userPwrPolicy, sizeof(USER_POWER_POLICY)); + memcpy(&PwrPolicy.mach, &machinePwrPolicy, sizeof(MACHINE_POWER_POLICY)); + + if (!lpfnPwrSchemesEnumProc(_wtoi(szNum), dwNameSize, szName, dwDescSize, szDesc, &PwrPolicy, lParam)) + { + RegCloseKey(hKey); + ReleaseSemaphore(PPRegSemaphore, 1, NULL); + return ret; + } + else + { + ret=TRUE; + } dwSize = sizeof(szNum) / sizeof(WCHAR); dwIndex++; @@ -306,6 +316,7 @@ GetCurrentPowerPolicies(PGLOBAL_POWER_POLICY pGlobalPowerPolicy, PPOWER_POLICY pPowerPolicy) { + /* SYSTEM_POWER_POLICY ACPower, DCPower; FIXME("(%p, %p) stub!\n", pGlobalPowerPolicy, pPowerPolicy); @@ -314,6 +325,36 @@ NtPowerInformation(SystemPowerPolicyDc, 0, 0, &DCPower, sizeof(SYSTEM_POWER_POLICY)); return FALSE; + */ +/* + Lohnegrim: I dont know why this Function shoud call NtPowerInformation, becouse as far as i know, + it simply returns the GlobalPowerPolicy and the AktivPowerScheme! + */ + BOOLEAN ret; + UINT uiID; + + if (pGlobalPowerPolicy != NULL) + { + ret = ReadGlobalPwrPolicy(pGlobalPowerPolicy); + if (!ret) + { + return FALSE; + } + } + if (pPowerPolicy != NULL) + { + ret = GetActivePwrScheme(&uiID); + if (!ret) + { + return FALSE; + } + ret = ReadPwrScheme(uiID,pPowerPolicy); + if (!ret) + { + return FALSE; + } + } + return TRUE; } @@ -532,13 +573,13 @@ swprintf(szNum, L"%d", uiID); - if (!POWRPROF_GetUserPowerPolicy(szNum, userPwrPolicy, 0, NULL, 0, NULL)) + if (!POWRPROF_GetUserPowerPolicy(szNum, &userPwrPolicy, 0, NULL, 0, NULL)) { ReleaseSemaphore(PPRegSemaphore, 1, NULL); return FALSE; } - if (!POWRPROF_GetMachinePowerPolicy(szNum, machinePwrPolicy)) + if (!POWRPROF_GetMachinePowerPolicy(szNum, &machinePwrPolicy)) { ReleaseSemaphore(PPRegSemaphore, 1, NULL); return FALSE; @@ -578,9 +619,46 @@ BOOLEAN WINAPI WriteGlobalPwrPolicy(PGLOBAL_POWER_POLICY pGlobalPowerPolicy) { - FIXME("(%p) stub!\n", pGlobalPowerPolicy); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + HKEY hKey; + GLOBAL_USER_POWER_POLICY gupp; + GLOBAL_MACHINE_POWER_POLICY gmpp; + + gupp = pGlobalPowerPolicy->user; + gmpp = pGlobalPowerPolicy->mach; + + if (RegOpenKeyEx(HKEY_CURRENT_USER, + L"Control Panel\\PowerCfg\\GlobalPowerPolicy", + 0, + KEY_ALL_ACCESS, + &hKey)) + return FALSE; + + if (RegSetValueExW(hKey,szPolicies,(DWORD)NULL,REG_BINARY,(const unsigned char *)&gupp,sizeof(GLOBAL_USER_POWER_POLICY)) == ERROR_SUCCESS) + { + RegCloseKey(hKey); + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\PowerCfg\\GlobalPowerPolicy", + 0, + KEY_ALL_ACCESS, + &hKey)) + return FALSE; + + if (RegSetValueExW(hKey,szPolicies,(DWORD)NULL,REG_BINARY,(const unsigned char *)&gmpp,sizeof(GLOBAL_MACHINE_POWER_POLICY)) == ERROR_SUCCESS) + { + RegCloseKey(hKey); + return TRUE; + } + else + { + return FALSE; + } + } + else + { + RegCloseKey(hKey); + return FALSE; + } } @@ -620,20 +698,19 @@ return FALSE; } - if (!pGPP) - { - memcpy(&pGPP, &pGlobalPowerPolicy, sizeof(GLOBAL_POWER_POLICY)); - } - - if (!pPP) - { - memcpy(&pPP, &pPowerPolicy, sizeof(POWER_POLICY)); + if (pGPP) + { + //memcpy(&pGPP, &pGlobalPowerPolicy, sizeof(GLOBAL_POWER_POLICY)); + } + + if (pPP) + { + //memcpy(&pPP, &pPowerPolicy, sizeof(POWER_POLICY)); } SetLastError(ERROR_SUCCESS); return TRUE; } - BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

16 years, 3 months

[gedmurphy] 34044: Don't link to libs we don't need

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Sat Jun 21 18:27:23 2008 New Revision: 34044 URL: http://svn.reactos.org/svn/reactos?rev=34044&view=rev Log: Don't link to libs we don't need Modified: trunk/reactos/base/services/tcpsvcs/tcpsvcs.rbuild Modified: trunk/reactos/base/services/tcpsvcs/tcpsvcs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/tcps… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/tcpsvcs.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/tcpsvcs/tcpsvcs.rbuild [iso-8859-1] Sat Jun 21 18:27:23 2008 @@ -3,11 +3,8 @@ <module name="tcpsvcs" type="win32cui" installbase="system32" installname="tcpsvcs.exe" unicode="yes"> <include base="arp">.</include> <library>kernel32</library> - <library>iphlpapi</library> <library>ws2_32</library> - <library>shlwapi</library> <library>advapi32</library> - <library>user32</library> <file>tcpsvcs.c</file> <file>skelserver.c</file> <file>echo.c</file>

16 years, 3 months

[gedmurphy] 34043: - Auto expand the list of available tests - Add the selected test to the main combo - Tag the dll path to each combo item - Run the test when the 'run' button is hit. We can now run all Wine tests from the GUI, but we get no feedback yet.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Sat Jun 21 14:19:22 2008 New Revision: 34043 URL: http://svn.reactos.org/svn/reactos?rev=34043&view=rev Log: - Auto expand the list of available tests - Add the selected test to the main combo - Tag the dll path to each combo item - Run the test when the 'run' button is hit. We can now run all Wine tests from the GUI, but we get no feedback yet. Modified: trunk/rostests/winetests/GUI/browsewnd.c trunk/rostests/winetests/GUI/mainwnd.c trunk/rostests/winetests/GUI/misc.c trunk/rostests/winetests/GUI/precomp.h Modified: trunk/rostests/winetests/GUI/browsewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/browsewnd.c… ============================================================================== --- trunk/rostests/winetests/GUI/browsewnd.c [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/browsewnd.c [iso-8859-1] Sat Jun 21 14:19:22 2008 @@ -63,7 +63,9 @@ numFiles = GetNumberOfDllsInFolder(szDllPath); if (!numFiles) return 0; - pInfo->lpDllList = HeapAlloc(GetProcessHeap(), 0, numFiles * (MAX_PATH * sizeof(WCHAR))); + pInfo->lpDllList = HeapAlloc(GetProcessHeap(), + 0, + numFiles * (MAX_PATH * sizeof(WCHAR))); if (!pInfo->lpDllList) return 0; @@ -329,6 +331,13 @@ FreeLibrary(hDll); } } + + if (hRoot) + { + TreeView_Expand(pInfo->hBrowseTV, + hRoot, + TVE_EXPAND); + } } static VOID @@ -340,7 +349,6 @@ PopulateTreeView(pInfo); } } - static BOOL OnInitBrowseDialog(HWND hDlg, @@ -360,7 +368,6 @@ return TRUE; } - BOOL CALLBACK BrowseDlgProc(HWND hDlg, @@ -433,6 +440,8 @@ TraverseTreeView(pInfo, hItem); + pInfo->hBrowseDlg = NULL; + break; } @@ -442,4 +451,4 @@ } return FALSE; -} +} Modified: trunk/rostests/winetests/GUI/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/mainwnd.c?r… ============================================================================== --- trunk/rostests/winetests/GUI/mainwnd.c [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/mainwnd.c [iso-8859-1] Sat Jun 21 14:19:22 2008 @@ -11,15 +11,13 @@ HINSTANCE hInstance; - - +typedef int (_cdecl *RUNTEST)(char **); static BOOL OnInitMainDialog(HWND hDlg, LPARAM lParam) { PMAIN_WND_INFO pInfo; - //HMENU hSysMenu; LPWSTR lpAboutText; pInfo = (PMAIN_WND_INFO)lParam; @@ -32,11 +30,11 @@ (LONG_PTR)pInfo); pInfo->hSmIcon = LoadImageW(hInstance, - MAKEINTRESOURCEW(IDI_ICON), - IMAGE_ICON, - 16, - 16, - 0); + MAKEINTRESOURCEW(IDI_ICON), + IMAGE_ICON, + 16, + 16, + 0); if (pInfo->hSmIcon) { SendMessageW(hDlg, @@ -46,11 +44,11 @@ } pInfo->hBgIcon = LoadImageW(hInstance, - MAKEINTRESOURCEW(IDI_ICON), - IMAGE_ICON, - 32, - 32, - 0); + MAKEINTRESOURCEW(IDI_ICON), + IMAGE_ICON, + 32, + 32, + 0); if (pInfo->hBgIcon) { SendMessageW(hDlg, @@ -62,6 +60,132 @@ return TRUE; } +static VOID +RunSelectedTest(PMAIN_WND_INFO pInfo) +{ + HWND hRunCmd; + WCHAR szTextCmd[MAX_RUN_CMD]; + LPWSTR lpDllPath; + INT sel, len; + + hRunCmd = GetDlgItem(pInfo->hMainWnd, IDC_TESTSELECTION); + + sel = SendMessageW(hRunCmd, + CB_GETCURSEL, + 0, + 0); + if (sel != CB_ERR) + { + if (SendMessageW(hRunCmd, + CB_GETLBTEXT, + sel, + szTextCmd) != CB_ERR) + { + lpDllPath = SendMessage(hRunCmd, + CB_GETITEMDATA, + 0, + 0); + if (lpDllPath) + { + LPWSTR module = szTextCmd; + LPSTR lpTest; + + while (*(module++) != L':' && *module != L'\0') + ; + + if (*module) + { + if (UnicodeToAnsi(module, &lpTest)) + { + HMODULE hDll; + RUNTEST RunTest; + + hDll = LoadLibraryW(lpDllPath); + if (hDll) + { + RunTest = (RUNTEST)GetProcAddress(hDll, "RunTest"); + if (RunTest) + { + RunTest(lpTest); + } + + FreeLibrary(hDll); + } + DisplayError(GetLastError()); + + HeapFree(GetProcessHeap(), 0, lpTest); + } + } + + } + } + } +} + +static VOID +AddTestToCombo(PMAIN_WND_INFO pInfo) +{ + HWND hRunCmd; + LPWSTR lpDllPath; + INT len; + + hRunCmd = GetDlgItem(pInfo->hMainWnd, IDC_TESTSELECTION); + if (hRunCmd) + { + SendMessageW(hRunCmd, + CB_INSERTSTRING, + 0, + pInfo->SelectedTest.szRunString); + + len = (wcslen(pInfo->SelectedTest.szSelectedDll) + 1) * sizeof(WCHAR); + lpDllPath = HeapAlloc(GetProcessHeap(), 0, len); + if (lpDllPath) + { + wcsncpy(lpDllPath, + pInfo->SelectedTest.szSelectedDll, + len / sizeof(WCHAR)); + } + + SendMessageW(hRunCmd, + CB_SETITEMDATA, + 0, + lpDllPath); + SendMessageW(hRunCmd, + CB_SETCURSEL, + 0, + 0); + } +} + +static VOID +FreeTestCmdStrings(PMAIN_WND_INFO pInfo) +{ + HWND hRunCmd; + WCHAR szTextCmd[MAX_RUN_CMD]; + LPWSTR lpDllPath; + INT cnt, i; + + hRunCmd = GetDlgItem(pInfo->hMainWnd, IDC_TESTSELECTION); + + cnt = SendMessageW(hRunCmd, + CB_GETCOUNT, + 0, + 0); + if (cnt != CB_ERR) + { + for (i = 0; i < cnt; i++) + { + lpDllPath = SendMessage(hRunCmd, + CB_GETITEMDATA, + i, + 0); + if (lpDllPath) + { + HeapFree(GetProcessHeap(), 0, lpDllPath); + } + } + } +} static BOOL CALLBACK MainDlgProc(HWND hDlg, @@ -89,27 +213,45 @@ switch(LOWORD(wParam)) { case IDC_BROWSE: - DialogBoxParamW(hInstance, - MAKEINTRESOURCEW(IDD_TESTBROWSER), - hDlg, - (DLGPROC)BrowseDlgProc, - (LPARAM)pInfo); - + { + INT_PTR ret; + + ret = DialogBoxParamW(hInstance, + MAKEINTRESOURCEW(IDD_TESTBROWSER), + hDlg, + (DLGPROC)BrowseDlgProc, + (LPARAM)pInfo); + if (ret == IDOK) + { + AddTestToCombo(pInfo); + } + + break; + } + + case IDC_RUN: + RunSelectedTest(pInfo); break; case IDOK: EndDialog(hDlg, 0); - break; + break; } } break; case WM_CLOSE: - if (pInfo->hSmIcon) + EndDialog(hDlg, 0); + break; + + case WM_DESTROY: + if (pInfo->hSmIcon) DestroyIcon(pInfo->hSmIcon); if (pInfo->hBgIcon) DestroyIcon(pInfo->hBgIcon); - EndDialog(hDlg, 0); + + FreeTestCmdStrings(pInfo); + break; HandleDefaultMessage: Modified: trunk/rostests/winetests/GUI/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/misc.c?rev=… ============================================================================== --- trunk/rostests/winetests/GUI/misc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/misc.c [iso-8859-1] Sat Jun 21 14:19:22 2008 @@ -274,8 +274,38 @@ *lpDstStr = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, length * sizeof(WCHAR)); if (*lpDstStr) { - ret = MultiByteToWideChar(CP_ACP, 0, lpSrcStr, -1, *lpDstStr, length); + ret = MultiByteToWideChar(CP_ACP, + 0, + lpSrcStr, + -1, + *lpDstStr, + length); } return ret; -} +} + +DWORD +UnicodeToAnsi(LPCWSTR lpSrcStr, + LPSTR *lpDstStr) +{ + INT length; + INT ret = 0; + + length = wcslen(lpSrcStr) + 1; + + *lpDstStr = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, length); + if (*lpDstStr) + { + ret = WideCharToMultiByte(CP_ACP, + 0, + lpSrcStr, + -1, + *lpDstStr, + length, + NULL, + NULL); + } + + return ret; +} Modified: trunk/rostests/winetests/GUI/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/GUI/precomp.h?r… ============================================================================== --- trunk/rostests/winetests/GUI/precomp.h [iso-8859-1] (original) +++ trunk/rostests/winetests/GUI/precomp.h [iso-8859-1] Sat Jun 21 14:19:22 2008 @@ -39,6 +39,7 @@ /* dll exports */ wchar_t *GetTestName(); int GetModulesInTest(char **modules); +int RunTest(const char *lpTest); /* browsewnd.c */ @@ -49,5 +50,6 @@ VOID DisplayMessage(LPWSTR lpMsg); VOID DisplayError(INT err); DWORD AnsiToUnicode(LPCSTR lpSrcStr, LPWSTR *lpDstStr); +DWORD UnicodeToAnsi(LPCWSTR lpSrcStr, LPSTR *lpDstStr); #endif /* __WINETESTGUI_PRECOMP_H */

16 years, 3 months

[fireball] 34042: - Provide a real fix for fwprintf and fputwc in case the output stream is in TEXT mode by doing a widechar to multibyte conversion. - This should be submitted to Wine to close their bug. See issue #3353 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jun 21 10:58:00 2008 New Revision: 34042 URL: http://svn.reactos.org/svn/reactos?rev=34042&view=rev Log: - Provide a real fix for fwprintf and fputwc in case the output stream is in TEXT mode by doing a widechar to multibyte conversion. - This should be submitted to Wine to close their bug. See issue #3353 for more details. Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Sat Jun 21 10:58:00 2008 @@ -2473,8 +2473,25 @@ wint_t CDECL fputwc(wint_t wc, FILE* file) { wchar_t mwc=wc; - if (fwrite( &mwc, sizeof(mwc), 1, file) != 1) - return WEOF; + char mbchar[10]; // MB_CUR_MAX_CONST + int mb_return; + + if (file->_flag & _IOBINARY) + { + if (fwrite( &mwc, sizeof(mwc), 1, file) != 1) + return WEOF; + } + else + { + /* Convert to multibyte in text mode */ + mb_return = wctomb(mbchar, mwc); + if (mb_return == -1) return WEOF; + + /* Output all characters */ + if (fwrite( mbchar, 1, mb_return, file) != 1) + return WEOF; + } + return wc; } @@ -3105,6 +3122,7 @@ int CDECL vfwprintf(FILE* file, const wchar_t *format, va_list valist) { wchar_t buf[2048], *mem = buf; + char mbbuf[2048], *mbmem = mbbuf; int written, resize = sizeof(buf) / sizeof(wchar_t), retval; /* See vfprintf comments */ while ((written = _vsnwprintf(mem, resize, format, valist)) == -1 || @@ -3116,9 +3134,30 @@ if (!(mem = malloc(resize*sizeof(*mem)))) return EOF; } - retval = fwrite(mem, sizeof(*mem), written, file); + + /* Check if outputting to a text-file */ + if (fdesc[file->_file].wxflag & WX_TEXT) + { + /* Convert to multibyte then */ + written = wcstombs(NULL, mem, 0); + + if (written >= sizeof(mbbuf) && (written != (int)-1)) + mbmem = malloc(written + 1); + + wcstombs(mbmem, mem, written); + retval = fwrite(mbmem, 1, written, file); + + if (mbmem != mbbuf) + free(mbmem); + } + else + { + retval = fwrite(mem, sizeof(*mem), written, file); + } + if (mem != buf) free (mem); + return retval; }

16 years, 3 months

[pschweitzer] 34041: Ext2 and NTFS: - Remove FCB from the linked list when it's released NTFS: - Check we have a FCB before releasing it

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Jun 21 06:20:48 2008 New Revision: 34041 URL: http://svn.reactos.org/svn/reactos?rev=34041&view=rev Log: Ext2 and NTFS: - Remove FCB from the linked list when it's released NTFS: - Check we have a FCB before releasing it Modified: trunk/reactos/drivers/filesystems/ext2/src/misc.c trunk/reactos/drivers/filesystems/ntfs/fcb.c Modified: trunk/reactos/drivers/filesystems/ext2/src/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/misc.c [iso-8859-1] Sat Jun 21 06:20:48 2008 @@ -895,6 +895,8 @@ ExDeleteResourceLite( &PtrFCB->NTRequiredFCB.MainResource ); ExDeleteResourceLite( &PtrFCB->NTRequiredFCB.PagingIoResource ); + RemoveEntryList(&(PtrFCB->NextFCB)); + if( PtrFCB->FCBName ) { Ext2ReleaseObjectName( PtrFCB->FCBName ); Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Sat Jun 21 06:20:48 2008 @@ -109,7 +109,12 @@ VOID NtfsDestroyFCB(PNTFS_FCB Fcb) { + ASSERT(Fcb); + ASSERT(Fcb->Identifier.Type == NTFS_TYPE_FCB); + ExDeleteResourceLite(&Fcb->MainResource); + + RemoveEntryList(&(Fcb->FcbListEntry)); ExFreePool(Fcb); }

16 years, 3 months

[mkupfer] 34040: - fix hive for korean keyboard layout Alexander Wurzinger <Lohnegrim At gmx DOT net> - Patch to fix the "Pos InitData failed"-Error in power options. - See issue #2469 for more details.

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Sat Jun 21 05:08:09 2008 New Revision: 34040 URL: http://svn.reactos.org/svn/reactos?rev=34040&view=rev Log: - fix hive for korean keyboard layout Alexander Wurzinger <Lohnegrim At gmx DOT net> - Patch to fix the "Pos InitData failed"-Error in power options. - See issue #2469 for more details. Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sat Jun 21 05:08:09 2008 @@ -565,7 +565,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000410",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000810",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000411",0x00000000,"" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000412",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000412",0x00000000,"8" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000413",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000813",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000414",0x00000000,"1" Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=34… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Sat Jun 21 05:08:09 2008 @@ -440,6 +440,22 @@ Status = STATUS_SUCCESS; break; } + case SystemPowerCapabilities: + { + PSYSTEM_POWER_CAPABILITIES PowerCapabilities = (PSYSTEM_POWER_CAPABILITIES)OutputBuffer; + + if (InputBuffer != NULL) + return STATUS_INVALID_PARAMETER; + if (OutputBufferLength < sizeof(SYSTEM_POWER_CAPABILITIES)) + return STATUS_BUFFER_TOO_SMALL; + + /* Just zero the struct (and thus set BatteryState->BatteryPresent = FALSE) */ + RtlZeroMemory(PowerCapabilities, sizeof(SYSTEM_POWER_CAPABILITIES)); + //PowerCapabilities->SystemBatteriesPresent = 0; + + Status = STATUS_SUCCESS; + break; + } default: Status = STATUS_NOT_IMPLEMENTED;

16 years, 3 months

[pschweitzer] 34039: Bugfixes: - Check whether we have a valid VCB before creating FCB - Initialize FCBs list before using it...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Jun 21 05:04:14 2008 New Revision: 34039 URL: http://svn.reactos.org/svn/reactos?rev=34039&view=rev Log: Bugfixes: - Check whether we have a valid VCB before creating FCB - Initialize FCBs list before using it... Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Sat Jun 21 05:04:14 2008 @@ -72,6 +72,9 @@ { PNTFS_FCB Fcb; + ASSERT(Vcb); + ASSERT(Vcb->Identifier.Type == NTFS_TYPE_VCB); + Fcb = ExAllocatePoolWithTag(NonPagedPool, sizeof(NTFS_FCB), TAG_FCB); RtlZeroMemory(Fcb, sizeof(NTFS_FCB)); Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Sat Jun 21 05:04:14 2008 @@ -378,6 +378,7 @@ Vcb->StreamFileObject = IoCreateStreamFileObject(NULL, Vcb->StorageDevice); + InitializeListHead(&Vcb->FcbListHead); Fcb = NtfsCreateFCB(NULL, Vcb); if (Fcb == NULL) @@ -426,7 +427,6 @@ ExInitializeResourceLite(&Vcb->DirResource); KeInitializeSpinLock(&Vcb->FcbListLock); - InitializeListHead(&Vcb->FcbListHead); /* Get serial number */ NewDeviceObject->Vpb->SerialNumber = Vcb->NtfsInfo.SerialNumber;

16 years, 3 months

[fireball] 34038: - vsn[w]printf -> _vsn[w]printf.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jun 21 05:00:59 2008 New Revision: 34038 URL: http://svn.reactos.org/svn/reactos?rev=34038&view=rev Log: - vsn[w]printf -> _vsn[w]printf. Modified: trunk/reactos/lib/sdk/crt/stdio/file.c trunk/reactos/lib/sdk/crt/string/wcs.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Sat Jun 21 05:00:59 2008 @@ -3081,7 +3081,7 @@ * Return the number of bytes that would have been written * The code below handles both cases */ - while ((written = vsnprintf(mem, resize, format, valist)) == -1 || + while ((written = _vsnprintf(mem, resize, format, valist)) == -1 || written > resize) { resize = (written == -1 ? resize * 2 : written + 1); @@ -3107,7 +3107,7 @@ wchar_t buf[2048], *mem = buf; int written, resize = sizeof(buf) / sizeof(wchar_t), retval; /* See vfprintf comments */ - while ((written = vsnwprintf(mem, resize, format, valist)) == -1 || + while ((written = _vsnwprintf(mem, resize, format, valist)) == -1 || written > resize) { resize = (written == -1 ? resize * 2 : written + sizeof(wchar_t)); Modified: trunk/reactos/lib/sdk/crt/string/wcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcs.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] Sat Jun 21 05:00:59 2008 @@ -774,7 +774,7 @@ */ int CDECL vsprintf( char *str, const char *format, va_list valist) { - return vsnprintf(str, INT_MAX, format, valist); + return _vsnprintf(str, INT_MAX, format, valist); } /********************************************************************* @@ -785,7 +785,7 @@ int retval; va_list valist; va_start(valist, format); - retval = vsnprintf(str, len, format, valist); + retval = _vsnprintf(str, len, format, valist); va_end(valist); return retval; } @@ -814,7 +814,7 @@ int retval; va_list valist; va_start(valist, format); - retval = vsnwprintf(str, len, format, valist); + retval = _vsnwprintf(str, len, format, valist); va_end(valist); return retval; } @@ -828,7 +828,7 @@ int r; va_start( ap, format ); - r = vsnprintf( str, INT_MAX, format, ap ); + r = _vsnprintf( str, INT_MAX, format, ap ); va_end( ap ); return r; } @@ -842,7 +842,7 @@ int r; va_start( ap, format ); - r = vsnwprintf( str, INT_MAX, format, ap ); + r = _vsnwprintf( str, INT_MAX, format, ap ); va_end( ap ); return r; } @@ -852,7 +852,7 @@ */ int CDECL vswprintf( wchar_t* str, const wchar_t* format, va_list args ) { - return vsnwprintf( str, INT_MAX, format, args ); + return _vsnwprintf( str, INT_MAX, format, args ); } #endif /*********************************************************************

16 years, 3 months

[fireball] 34037: Jeffrey Morlan <mrnobo1024@yahoo.com> - Wrap libwine's memory allocations, avoiding msvcrt imports in kernel32 - The cause is that libwine/debug.c uses functions (malloc, free, realloc, _strdup) which are only present in a complete CRT, creating imports from msvcrt.dll in any module that uses it, including kernel32.dll. Since kernel32 is currently importing from msvcrt, kernel32 gets DLL_PROCESS_DETACHed first, creating a problem for msvcrt's DLL_PROCESS_DETACH which, as a resu

by fireball＠svn.reactos.org

Author: fireball Date: Fri Jun 20 14:00:37 2008 New Revision: 34037 URL: http://svn.reactos.org/svn/reactos?rev=34037&view=rev Log: Jeffrey Morlan <mrnobo1024(a)yahoo.com> - Wrap libwine's memory allocations, avoiding msvcrt imports in kernel32 - The cause is that libwine/debug.c uses functions (malloc, free, realloc, _strdup) which are only present in a complete CRT, creating imports from msvcrt.dll in any module that uses it, including kernel32.dll. Since kernel32 is currently importing from msvcrt, kernel32 gets DLL_PROCESS_DETACHed first, creating a problem for msvcrt's DLL_PROCESS_DETACH which, as a result of a recent bugfix, now uses kernel32 functions that depend on the resources that were freed. - Fix this by implementing those 4 functions as wrappers around the Local* APIs, in order to avoid the problematic imports. See issue #3373 for more details. Added: trunk/reactos/lib/3rdparty/libwine/debug_ros.c (with props) Modified: trunk/reactos/lib/3rdparty/libwine/libwine.rbuild Added: trunk/reactos/lib/3rdparty/libwine/debug_ros.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/debug… ============================================================================== --- trunk/reactos/lib/3rdparty/libwine/debug_ros.c (added) +++ trunk/reactos/lib/3rdparty/libwine/debug_ros.c [iso-8859-1] Fri Jun 20 14:00:37 2008 @@ -1,0 +1,32 @@ +/* The use of these four functions was creating unwanted imports + * from msvcrt.dll in kernel32.dll. */ + +#define malloc libwine_malloc +#define free libwine_free +#define realloc libwine_realloc +#define _strdup libwine__strdup + +#include "debug.c" + +void *malloc(size_t size) +{ + return LocalAlloc(0, size); +} + +void free(void *ptr) +{ + LocalFree(ptr); +} + +void *realloc(void *ptr, size_t size) +{ + if (ptr == NULL) return malloc(size); + return LocalReAlloc(ptr, size, LMEM_MOVEABLE); +} + +char *_strdup(const char *str) +{ + char *newstr = malloc(strlen(str) + 1); + if (newstr) strcpy(newstr, str); + return newstr; +} Propchange: trunk/reactos/lib/3rdparty/libwine/debug_ros.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/3rdparty/libwine/libwine.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/libwi… ============================================================================== --- trunk/reactos/lib/3rdparty/libwine/libwine.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libwine/libwine.rbuild [iso-8859-1] Fri Jun 20 14:00:37 2008 @@ -3,6 +3,6 @@ <module name="wine" type="staticlibrary"> <define name="_DISABLE_TIDENTS" /> <file>config.c</file> - <file>debug.c</file> + <file>debug_ros.c</file> <file>string.c</file> </module>

16 years, 3 months

← Newer
1
...
16
17
18
19
20
21
22
...
44
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 2008