Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 31702: Christoph Brill <egore@gmx.de> - Sync msvcrt20.c with Wine. See issue #2947 for more details.
by fireball＠svn.reactos.org 10 Jan '08

10 Jan '08

Author: fireball Date: Thu Jan 10 16:50:32 2008 New Revision: 31702 URL: http://svn.reactos.org/svn/reactos?rev=31702&view=rev Log: Christoph Brill <egore(a)gmx.de> - Sync msvcrt20.c with Wine. See issue #2947 for more details. Modified: trunk/reactos/dll/win32/msvcrt20/msvcrt20.c Modified: trunk/reactos/dll/win32/msvcrt20/msvcrt20.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt20/msvcrt2… ============================================================================== --- trunk/reactos/dll/win32/msvcrt20/msvcrt20.c (original) +++ trunk/reactos/dll/win32/msvcrt20/msvcrt20.c Thu Jan 10 16:50:32 2008 @@ -15,17 +15,16 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdarg.h> #include "windef.h" -#include "winbase.h" -extern void __getmainargs(int *argc, char** *argv, char** *envp, +extern void CDECL __getmainargs(int *argc, char** *argv, char** *envp, int expand_wildcards, int *new_mode); -extern void __wgetmainargs(int *argc, WCHAR** *wargv, WCHAR** *wenvp, +extern void CDECL __wgetmainargs(int *argc, WCHAR** *wargv, WCHAR** *wenvp, int expand_wildcards, int *new_mode); /********************************************************************* @@ -33,7 +32,7 @@ * * new_mode is not a pointer in msvcrt20. */ -void MSVCRT20__getmainargs( int *argc, char** *argv, char** *envp, +void CDECL MSVCRT20__getmainargs( int *argc, char** *argv, char** *envp, int expand_wildcards, int new_mode ) { __getmainargs( argc, argv, envp, expand_wildcards, &new_mode ); @@ -44,7 +43,7 @@ * * new_mode is not a pointer in msvcrt20. */ -void MSVCRT20__wgetmainargs( int *argc, WCHAR** *wargv, WCHAR** *wenvp, +void CDECL MSVCRT20__wgetmainargs( int *argc, WCHAR** *wargv, WCHAR** *wenvp, int expand_wildcards, int new_mode ) { __wgetmainargs( argc, wargv, wenvp, expand_wildcards, &new_mode );

1 0

[fireball] 31701: Christoph Brill <egore@gmx.de> - Sync msiexec to Wine-20080105. See issue #2948 for more details.
by fireball＠svn.reactos.org 10 Jan '08

10 Jan '08

Author: fireball Date: Thu Jan 10 16:33:25 2008 New Revision: 31701 URL: http://svn.reactos.org/svn/reactos?rev=31701&view=rev Log: Christoph Brill <egore(a)gmx.de> - Sync msiexec to Wine-20080105. See issue #2948 for more details. Added: trunk/reactos/base/system/msiexec/msiexec.ico (with props) trunk/reactos/base/system/msiexec/rsrc.rc (with props) trunk/reactos/base/system/msiexec/service.c (with props) Modified: trunk/reactos/base/system/msiexec/msiexec.c trunk/reactos/base/system/msiexec/msiexec.rbuild trunk/reactos/base/system/msiexec/version.rc trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/system/msiexec/msiexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/msiexe… ============================================================================== --- trunk/reactos/base/system/msiexec/msiexec.c (original) +++ trunk/reactos/base/system/msiexec/msiexec.c Thu Jan 10 16:33:25 2008 @@ -16,8 +16,10 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#define WIN32_LEAN_AND_MEAN #include <windows.h> #include <msi.h> @@ -31,6 +33,8 @@ typedef HRESULT (WINAPI *DLLREGISTERSERVER)(void); typedef HRESULT (WINAPI *DLLUNREGISTERSERVER)(void); + +DWORD DoService(void); struct string_list { @@ -205,7 +209,7 @@ ret += (*str - '0'); str++; } - return 0; + return ret; } static LPWSTR msi_strdup(LPCWSTR str) @@ -224,32 +228,52 @@ len = MultiByteToWideChar( CP_ACP, 0, str2, -1, NULL, 0); if( !len ) - return TRUE; + return FALSE; if( lstrlenW(str1) != (len-1) ) - return TRUE; + return FALSE; strW = (WCHAR*) HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); MultiByteToWideChar( CP_ACP, 0, str2, -1, strW, len); ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, str1, len, strW, len); HeapFree(GetProcessHeap(), 0, strW); - return (ret != CSTR_EQUAL); + return (ret == CSTR_EQUAL); +} + +/* prefix is hyphen or dash, and str1 is the same as str2, ignoring case */ +static BOOL msi_option_equal(LPCWSTR str1, LPCSTR str2) +{ + if (str1[0] != '/' && str1[0] != '-') + return FALSE; + + /* skip over the hyphen or slash */ + return msi_strequal(str1 + 1, str2); } /* str2 is at the beginning of str1, ignoring case */ static BOOL msi_strprefix(LPCWSTR str1, LPCSTR str2) { - int len, ret; + DWORD len, ret; LPWSTR strW; len = MultiByteToWideChar( CP_ACP, 0, str2, -1, NULL, 0); if( !len ) - return TRUE; + return FALSE; if( lstrlenW(str1) < (len-1) ) - return TRUE; + return FALSE; strW = (WCHAR*) HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); MultiByteToWideChar( CP_ACP, 0, str2, -1, strW, len); ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, str1, len-1, strW, len-1); HeapFree(GetProcessHeap(), 0, strW); - return (ret != CSTR_EQUAL); + return (ret == CSTR_EQUAL); +} + +/* prefix is hyphen or dash, and str2 is at the beginning of str1, ignoring case */ +static BOOL msi_option_prefix(LPCWSTR str1, LPCSTR str2) +{ + if (str1[0] != '/' && str1[0] != '-') + return FALSE; + + /* skip over the hyphen or slash */ + return msi_strprefix(str1 + 1, str2); } static VOID *LoadProc(LPCWSTR DllName, LPCSTR ProcName, HMODULE* DllHandle) @@ -312,6 +336,43 @@ if(DllHandle) FreeLibrary(DllHandle); return 0; +} + +static DWORD DoRegServer(void) +{ + SC_HANDLE scm, service; + CHAR path[MAX_PATH+12]; + DWORD ret = 0; + + scm = OpenSCManager(NULL, SERVICES_ACTIVE_DATABASE, SC_MANAGER_CREATE_SERVICE); + if (!scm) + { + fprintf(stderr, "Failed to open the service control manager.\n"); + return 1; + } + + GetSystemDirectory(path, MAX_PATH); + lstrcatA(path, "\\msiexec.exe /V"); + + service = CreateServiceA(scm, "MSIServer", "MSIServer", GENERIC_ALL, + SERVICE_WIN32_SHARE_PROCESS, SERVICE_DEMAND_START, + SERVICE_ERROR_NORMAL, path, NULL, NULL, + NULL, NULL, NULL); + + if (service) CloseServiceHandle(service); + else if (GetLastError() != ERROR_SERVICE_EXISTS) + { + fprintf(stderr, "Failed to create MSI service\n"); + ret = 1; + } + CloseServiceHandle(scm); + return ret; +} + +static INT DoEmbedding( LPWSTR key ) +{ + printf("Remote custom actions are not supported yet\n"); + return 1; } /* @@ -426,6 +487,7 @@ process_args(buf, pargc, pargv); ret = TRUE; } + HeapFree(GetProcessHeap(), 0, buf); } RegCloseKey(hkeyArgs); return ret; @@ -443,6 +505,7 @@ BOOL FunctionDllUnregisterServer = FALSE; BOOL FunctionRegServer = FALSE; BOOL FunctionUnregServer = FALSE; + BOOL FunctionServer = FALSE; BOOL FunctionUnknown = FALSE; LPWSTR PackageName = NULL; @@ -451,7 +514,7 @@ DWORD RepairMode = 0; - DWORD AdvertiseMode = 0; + DWORD_PTR AdvertiseMode = 0; struct string_list *transform_list = NULL; LANGID Language = 0; @@ -477,25 +540,28 @@ * We do that before starting to process the real commandline, * then overwrite the commandline again. */ - if(!msi_strequal(argvW[1], "/@")) + if(argc>1 && msi_option_equal(argvW[1], "@")) { if(!process_args_from_reg( argvW[2], &argc, &argvW )) return 1; } + if (argc == 3 && msi_option_equal(argvW[1], "Embedding")) + return DoEmbedding( argvW[2] ); + for(i = 1; i < argc; i++) { WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); - if (!msi_strequal(argvW[i], "/regserver")) + if (msi_option_equal(argvW[i], "regserver")) { FunctionRegServer = TRUE; } - else if (!msi_strequal(argvW[i], "/unregserver") || !msi_strequal(argvW[i], "/unregister")) + else if (msi_option_equal(argvW[i], "unregserver") || msi_option_equal(argvW[i], "unregister")) { FunctionUnregServer = TRUE; } - else if(!msi_strprefix(argvW[i], "/i")) + else if(msi_option_prefix(argvW[i], "i")) { LPWSTR argvWi = argvW[i]; FunctionInstall = TRUE; @@ -511,7 +577,7 @@ } PackageName = argvWi; } - else if(!msi_strequal(argvW[i], "/a")) + else if(msi_option_equal(argvW[i], "a")) { FunctionInstall = TRUE; FunctionInstallAdmin = TRUE; @@ -523,7 +589,7 @@ PackageName = argvW[i]; StringListAppend(&property_list, ActionAdmin); } - else if(!msi_strprefix(argvW[i], "/f")) + else if(msi_option_prefix(argvW[i], "f")) { int j; int len = lstrlenW(argvW[i]); @@ -591,17 +657,21 @@ WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PackageName = argvW[i]; } - else if(!msi_strequal(argvW[i], "/x")) + else if(msi_option_prefix(argvW[i], "x")) { FunctionInstall = TRUE; - i++; - if(i >= argc) - ShowUsage(1); - WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); + PackageName = argvW[i]+2; + if (!PackageName[0]) + { + i++; + if(i >= argc) + ShowUsage(1); PackageName = argvW[i]; + } + WINE_TRACE("PackageName = %s\n", wine_dbgstr_w(PackageName)); StringListAppend(&property_list, RemoveAll); } - else if(!msi_strprefix(argvW[i], "/j")) + else if(msi_option_prefix(argvW[i], "j")) { int j; int len = lstrlenW(argvW[i]); @@ -629,7 +699,7 @@ WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PackageName = argvW[i]; } - else if(!msi_strequal(argvW[i], "u")) + else if(msi_strequal(argvW[i], "u")) { FunctionAdvertise = TRUE; AdvertiseMode = ADVERTISEFLAGS_USERASSIGN; @@ -639,7 +709,7 @@ WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PackageName = argvW[i]; } - else if(!msi_strequal(argvW[i], "m")) + else if(msi_strequal(argvW[i], "m")) { FunctionAdvertise = TRUE; AdvertiseMode = ADVERTISEFLAGS_MACHINEASSIGN; @@ -649,7 +719,7 @@ WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PackageName = argvW[i]; } - else if(!msi_strequal(argvW[i], "/t")) + else if(msi_option_equal(argvW[i], "t")) { i++; if(i >= argc) @@ -657,7 +727,7 @@ WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); StringListAppend(&transform_list, argvW[i]); } - else if(!msi_strequal(argvW[i], "/g")) + else if(msi_option_equal(argvW[i], "g")) { i++; if(i >= argc) @@ -665,7 +735,7 @@ WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); Language = msi_atou(argvW[i]); } - else if(!msi_strprefix(argvW[i], "/l")) + else if(msi_option_prefix(argvW[i], "l")) { int j; int len = lstrlenW(argvW[i]); @@ -756,7 +826,7 @@ ExitProcess(1); } } - else if(!msi_strequal(argvW[i], "/p")) + else if(msi_option_equal(argvW[i], "p")) { FunctionPatch = TRUE; i++; @@ -765,37 +835,38 @@ WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PatchFileName = argvW[i]; } - else if(!msi_strprefix(argvW[i], "/q")) - { - if(lstrlenW(argvW[i]) == 2 || !msi_strequal(argvW[i]+2, "n")) + else if(msi_option_prefix(argvW[i], "q")) + { + if(lstrlenW(argvW[i]) == 2 || msi_strequal(argvW[i]+2, "n") || + msi_strequal(argvW[i] + 2, "uiet")) { InstallUILevel = INSTALLUILEVEL_NONE; } - else if(!msi_strequal(argvW[i]+2, "b")) + else if(msi_strequal(argvW[i]+2, "b")) { InstallUILevel = INSTALLUILEVEL_BASIC; } - else if(!msi_strequal(argvW[i]+2, "r")) + else if(msi_strequal(argvW[i]+2, "r")) { InstallUILevel = INSTALLUILEVEL_REDUCED; } - else if(!msi_strequal(argvW[i]+2, "f")) + else if(msi_strequal(argvW[i]+2, "f")) { InstallUILevel = (INSTALLUILEVEL) (INSTALLUILEVEL_FULL|INSTALLUILEVEL_ENDDIALOG); } - else if(!msi_strequal(argvW[i]+2, "n+")) + else if(msi_strequal(argvW[i]+2, "n+")) { InstallUILevel = (INSTALLUILEVEL) (INSTALLUILEVEL_NONE|INSTALLUILEVEL_ENDDIALOG); } - else if(!msi_strequal(argvW[i]+2, "b+")) + else if(msi_strequal(argvW[i]+2, "b+")) { InstallUILevel = (INSTALLUILEVEL) (INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG); } - else if(!msi_strequal(argvW[i]+2, "b-")) + else if(msi_strequal(argvW[i]+2, "b-")) { InstallUILevel = (INSTALLUILEVEL) (INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY); } - else if(!msi_strequal(argvW[i]+2, "b+!")) + else if(msi_strequal(argvW[i]+2, "b+!")) { InstallUILevel = (INSTALLUILEVEL) (INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG); WINE_FIXME("Unknown modifier: !\n"); @@ -806,7 +877,7 @@ wine_dbgstr_w(argvW[i]+2)); } } - else if(!msi_strequal(argvW[i], "/y")) + else if(msi_option_equal(argvW[i], "y")) { FunctionDllRegisterServer = TRUE; i++; @@ -815,7 +886,7 @@ WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); DllName = argvW[i]; } - else if(!msi_strequal(argvW[i], "/z")) + else if(msi_option_equal(argvW[i], "z")) { FunctionDllUnregisterServer = TRUE; i++; @@ -824,29 +895,26 @@ WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); DllName = argvW[i]; } - else if(!msi_strequal(argvW[i], "/h") || !msi_strequal(argvW[i], "/?")) + else if(msi_option_equal(argvW[i], "h") || msi_option_equal(argvW[i], "?")) { ShowUsage(0); } - else if(!msi_strequal(argvW[i], "/m")) + else if(msi_option_equal(argvW[i], "m")) { FunctionUnknown = TRUE; WINE_FIXME("Unknown parameter /m\n"); } - else if(!msi_strequal(argvW[i], "/D")) + else if(msi_option_equal(argvW[i], "D")) { FunctionUnknown = TRUE; WINE_FIXME("Unknown parameter /D\n"); } - else if(strchrW(argvW[i], '=')) - { + else if (msi_option_equal(argvW[i], "V")) + { + FunctionServer = TRUE; + } + else StringListAppend(&property_list, argvW[i]); - } - else - { - FunctionInstall = TRUE; - PackageName = argvW[i]; - } } /* start the GUI */ @@ -891,11 +959,15 @@ } else if (FunctionRegServer) { - WINE_FIXME( "/regserver not implemented yet, ignoring\n" ); + ReturnCode = DoRegServer(); } else if (FunctionUnregServer) { WINE_FIXME( "/unregserver not implemented yet, ignoring\n" ); + } + else if (FunctionServer) + { + ReturnCode = DoService(); } else if (FunctionUnknown) { Added: trunk/reactos/base/system/msiexec/msiexec.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/msiexe… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/system/msiexec/msiexec.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/base/system/msiexec/msiexec.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/msiexe… ============================================================================== --- trunk/reactos/base/system/msiexec/msiexec.rbuild (original) +++ trunk/reactos/base/system/msiexec/msiexec.rbuild Thu Jan 10 16:33:25 2008 @@ -15,5 +15,7 @@ <library>ole32</library> <library>msi</library> <file>msiexec.c</file> + <file>rsrc.rc</file> + <file>service.c</file> <file>version.rc</file> </module> Added: trunk/reactos/base/system/msiexec/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/rsrc.r… ============================================================================== --- trunk/reactos/base/system/msiexec/rsrc.rc (added) +++ trunk/reactos/base/system/msiexec/rsrc.rc Thu Jan 10 16:33:25 2008 @@ -1,0 +1,26 @@ +/* + * Copyright (c) 2006 Mike McCormack + * + * 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 <windows.h> + +#include "version.rc" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +/* @makedep: msiexec.ico */ +1 ICON DISCARDABLE msiexec.ico Propchange: trunk/reactos/base/system/msiexec/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/system/msiexec/service.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/servic… ============================================================================== --- trunk/reactos/base/system/msiexec/service.c (added) +++ trunk/reactos/base/system/msiexec/service.c Thu Jan 10 16:33:25 2008 @@ -1,0 +1,174 @@ +/* + * msiexec.exe implementation + * + * Copyright 2007 Google (James Hawkins) + * + * 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 + */ + +#define WIN32_LEAN_AND_MEAN + +#include <windows.h> +#include <stdio.h> + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msiexec); + +static SERVICE_STATUS_HANDLE hstatus; + +static HANDLE thread; +static HANDLE kill_event; + +void KillService(void) +{ + WINE_TRACE("Killing service\n"); + SetEvent(kill_event); +} + +static BOOL UpdateSCMStatus(DWORD dwCurrentState, DWORD dwWin32ExitCode, + DWORD dwServiceSpecificExitCode) +{ + SERVICE_STATUS status; + + status.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + status.dwCurrentState = dwCurrentState; + + if (dwCurrentState == SERVICE_START_PENDING) + status.dwControlsAccepted = 0; + else + { + status.dwControlsAccepted = SERVICE_ACCEPT_STOP | + SERVICE_ACCEPT_PAUSE_CONTINUE | + SERVICE_ACCEPT_SHUTDOWN; + } + + if (dwServiceSpecificExitCode == 0) + { + status.dwWin32ExitCode = dwWin32ExitCode; + } + else + { + status.dwWin32ExitCode = ERROR_SERVICE_SPECIFIC_ERROR; + } + + status.dwServiceSpecificExitCode = dwServiceSpecificExitCode; + status.dwCheckPoint = 0; + status.dwWaitHint = 0; + + if (!SetServiceStatus(hstatus, &status)) + { + fprintf(stderr, "Failed to set service status\n"); + KillService(); + return FALSE; + } + + return TRUE; +} + +static void WINAPI ServiceCtrlHandler(DWORD code) +{ + WINE_TRACE("%d\n", code); + + switch (code) + { + case SERVICE_CONTROL_SHUTDOWN: + case SERVICE_CONTROL_STOP: + UpdateSCMStatus(SERVICE_STOP_PENDING, NO_ERROR, 0); + KillService(); + return; + default: + fprintf(stderr, "Unhandled service control code: %d\n", code); + break; + } + + UpdateSCMStatus(SERVICE_RUNNING, NO_ERROR, 0); +} + +static DWORD WINAPI ServiceExecutionThread(LPVOID param) +{ + while (TRUE) + { + /* do nothing */ + } + + return 0; +} + +static BOOL StartServiceThread(void) +{ + DWORD id; + + thread = CreateThread(0, 0, ServiceExecutionThread, 0, 0, &id); + if (!thread) + { + fprintf(stderr, "Failed to create thread\n"); + return FALSE; + } + + return TRUE; +} + +static void WINAPI ServiceMain(DWORD argc, LPSTR *argv) +{ + hstatus = RegisterServiceCtrlHandlerA("MSIServer", ServiceCtrlHandler); + if (!hstatus) + { + fprintf(stderr, "Failed to register service ctrl handler\n"); + return; + } + + UpdateSCMStatus(SERVICE_START_PENDING, NO_ERROR, 0); + + kill_event = CreateEvent(0, TRUE, FALSE, 0); + if (!kill_event) + { + fprintf(stderr, "Failed to create event\n"); + KillService(); + return; + } + + if (!StartServiceThread()) + { + KillService(); + return; + } + + UpdateSCMStatus(SERVICE_RUNNING, NO_ERROR, 0); + + WaitForSingleObject(kill_event, INFINITE); + KillService(); +} + +DWORD DoService(void) +{ + char service_name[] = "MSIServer"; + + const SERVICE_TABLE_ENTRY service[] = + { + {service_name, ServiceMain}, + {NULL, NULL}, + }; + + WINE_TRACE("Starting MSIServer service\n"); + + if (!StartServiceCtrlDispatcher(service)) + { + fprintf(stderr, "Failed to start MSIServer service\n"); + return 1; + } + + return 0; +} Propchange: trunk/reactos/base/system/msiexec/service.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/msiexec/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/versio… ============================================================================== --- trunk/reactos/base/system/msiexec/version.rc (original) +++ trunk/reactos/base/system/msiexec/version.rc Thu Jan 10 16:33:25 2008 @@ -13,7 +13,7 @@ * * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #define WINE_FILEDESCRIPTION_STR "Wine Installer" Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Thu Jan 10 16:33:25 2008 @@ -103,7 +103,7 @@ reactos/base/applications/games/winemine # Out of sync reactos/base/applications/regedit # Out of sync reactos/base/system/expand # Out of sync -reactos/base/system/msiexec # Synced to Wine-0_9_3 +reactos/base/system/msiexec # Synced to Wine-20080105 In addition the following libs, dlls and source files are mostly based on code ported from Winehq CVS. If you are looking to update something in these files

1 0

[cfinck] 31700: - Add an "architecture.h" file, which includes architecture-dependent constants. Currently, I only added the root architecture path on the CD (ARCH_CD_ROOT), which is needed in some components. - Make freeldr and usetup use this path, so the Boot-CD and Live-CD become bootable again. - Change the boot sectors to search for the loader in the "I386" directory. - Rename GetArch() to GetArchName(), also add GetArchCdPath() for getting the root architecture path on the CD in rbuild. -
by cfinck＠svn.reactos.org 10 Jan '08

10 Jan '08

Author: cfinck Date: Thu Jan 10 14:48:52 2008 New Revision: 31700 URL: http://svn.reactos.org/svn/reactos?rev=31700&view=rev Log: - Add an "architecture.h" file, which includes architecture-dependent constants. Currently, I only added the root architecture path on the CD (ARCH_CD_ROOT), which is needed in some components. - Make freeldr and usetup use this path, so the Boot-CD and Live-CD become bootable again. - Change the boot sectors to search for the loader in the "I386" directory. - Rename GetArch() to GetArchName(), also add GetArchCdPath() for getting the root architecture path on the CD in rbuild. - Skip creating the "Profiles" directory and its subdirectories. The Live-CD works flawlessy without it and its content is completely ignored by Explorer anyway. - Create the "CREDITS" file in the root "reactos" directory, people expect it there. Remove our current "CREDITS" file. - Fix indentation of "creditsgenerator.cpp" Added: branches/rbuild/reactos/include/reactos/architecture.h (with props) Removed: branches/rbuild/reactos/CREDITS Modified: branches/rbuild/reactos/ (props changed) branches/rbuild/reactos/base/setup/usetup/bootsup.c branches/rbuild/reactos/base/setup/usetup/interface/usetup.c branches/rbuild/reactos/base/setup/usetup/partlist.c branches/rbuild/reactos/base/setup/usetup/usetup.h branches/rbuild/reactos/boot/freeldr/bootsect/isoboot.asm branches/rbuild/reactos/boot/freeldr/bootsect/isobtrt.asm branches/rbuild/reactos/boot/freeldr/freeldr/reactos/reactos.c branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.h branches/rbuild/reactos/tools/rbuild/creditsgenerator.cpp branches/rbuild/reactos/tools/rbuild/project.cpp branches/rbuild/reactos/tools/rbuild/rbuild.h Propchange: branches/rbuild/reactos/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Jan 10 14:48:52 2008 @@ -12,3 +12,4 @@ *.suo versionreport.xml config.rbuild +CREDITS Removed: branches/rbuild/reactos/CREDITS URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/CREDITS?rev=3169… ============================================================================== --- branches/rbuild/reactos/CREDITS (original) +++ branches/rbuild/reactos/CREDITS (removed) @@ -1,69 +1,0 @@ -ReactOS is available thanks to the work of: - -Aleksey Bragin <aleksey at reactos org> -Alex Ionescu <alex.ionescu(a)reactos.org> -Andrew Greenwood <lists(a)silverblade.co.uk> -Andrew Munger <waxdragon(a)gmail.com> -Arindam Das -Art Yerkes <ayerkes(a)speakeasy.net> -Ariadne -Brandon Turner (turnerb7(a)msu.edu) -Brian Palmer <brianp(a)sginet.com> -Casper S. Hornstrup <chorns(a)users.sourceforge.net> -Christoph von Wittich (christoph_vw(a)reactos.org) -David Welch <welch(a)cwcom.net> -Emanuele Aliberti <ea(a)iol.it> -Eric Kohl <ekohl(a)rz-online.de> -Eugene Ingerman <geneing(a)myrealbox.com> -Filip Navara <xnavara(a)volny.cz> -Frederik Leemans -Ge van Geldorp <ge(a)gse.nl> -Ged Murphy <gedmurphy(a)reactos.org> -Guido de Jong -Gunnar Andre' Dalsnes <hardon(a)online.no> -Hans Kremer -Hartmut Birr <hartmut.birr(a)gmx.de> -Hernan Ochoa -Herve Poussineau <hpoussin(a)reactos.com> -Iwan Fatahi <i_fatahi(a)hotmail.com> -James B. Tabor <jimtabor(a)adsl-64-217-116-74.dsl.hstntx.swbell.net> -Jason Eager -Jason Filby <jasonfilby(a)yahoo.com> -Jason Weiler -Jean Michault -Jim Noeth -Johannes Anderwald <johannes.anderwald(a)student.tugraz.at> -Jonathan Wilson <jonwil(a)tpgi.com.au> -Jurgen van Gael <jurgen.vangael(a)student.kuleuven.ac.be> -KJK::Hyperion <noog(a)libero.it> -Klemens R. Friedl <klemens_friedl(a)gmx.net> -Maarten Bosma <maarten.paul(a)bosma.de> -Magnus Olsen (magnus(a)greatlord.com) -Mark Tempel <mtempel(a)visi.com> -Mark Weaver <mark(a)npsl.co.uk> -Martin Fuchs <martin-fuchs(a)gmx.net> -Marty Dill <mdill(a)uvic.ca> -Matt Pyne -Mike Nordell ("tamlin") -Nathan Woods <npwoods(a)mess.org> -Pablo Borobia <pborobia(a)gmail.com> -Paolo Pantaleo <paolopan(a)freemail.it> -Phillip Susi <phreak(a)iag.net> -Rex Jolliff <rex(a)lvcablemodem.com> -Richard Campbell <betam4x(a)gmail.com> -Robert Bergkvist <fragdance(a)hotmail.com> -Robert Dickenson <robd(a)reactos.org> -Royce Mitchell III <royce3(a)ev1.net> -Saveliy Tretiakov <saveliyt(a)mail.ru> -Steven Edwards <steven_ed4153(a)yahoo.com> -Thomas Weidenmueller <w3seek(a)users.sourceforge.net> -Timo Kreuzer <timo.kreuzer(a)reactos.org> -Victor Kirhenshtein <sauros(a)iname.com> -Vizzini <vizzini(a)plasmic.com> - - -Graphic Design from - -Mindflyer <mf(a)mufunyo.net> -Tango Desktop Project (http://tango-project.org) -Everaldo (http://everaldo.com) Modified: branches/rbuild/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/base/setup/usetu… ============================================================================== --- branches/rbuild/reactos/base/setup/usetup/bootsup.c (original) +++ branches/rbuild/reactos/base/setup/usetup/bootsup.c Thu Jan 10 14:48:52 2008 @@ -1836,7 +1836,7 @@ /* Copy FreeLoader to the boot partition */ wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\freeldr.sys"); + wcscat(SrcPath, L"\\" ARCH_CD_ROOT "\\loader\\freeldr.sys"); wcscpy(DstPath, SystemRootPath->Buffer); wcscat(DstPath, L"\\freeldr.sys"); @@ -1870,7 +1870,7 @@ { /* Install FAT32 bootcode */ wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\fat32.bin"); + wcscat(SrcPath, L"\\" ARCH_CD_ROOT "\\loader\\fat32.bin"); wcscpy(DstPath, SystemRootPath->Buffer); wcscat(DstPath, L"\\bootsect.ros"); @@ -1888,7 +1888,7 @@ { /* Install FAT16 bootcode */ wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\fat.bin"); + wcscat(SrcPath, L"\\" ARCH_CD_ROOT "\\loader\\fat.bin"); wcscpy(DstPath, SystemRootPath->Buffer); wcscat(DstPath, L"\\bootsect.ros"); @@ -1941,7 +1941,7 @@ /* Copy FreeLoader to the boot partition */ wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\freeldr.sys"); + wcscat(SrcPath, L"\\" ARCH_CD_ROOT "\\loader\\freeldr.sys"); wcscpy(DstPath, SystemRootPath->Buffer); wcscat(DstPath, L"\\freeldr.sys"); @@ -1988,7 +1988,7 @@ PartitionType == PARTITION_FAT32_XINT13) { wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\fat32.bin"); + wcscat(SrcPath, L"\\" ARCH_CD_ROOT "\\loader\\fat32.bin"); DPRINT1("Install FAT32 bootcode: %S ==> %S\n", SrcPath, SystemRootPath->Buffer); Status = InstallFat32BootCodeToDisk(SrcPath, @@ -2002,7 +2002,7 @@ else { wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\fat.bin"); + wcscat(SrcPath, L"\\" ARCH_CD_ROOT "\\loader\\fat.bin"); DPRINT1("Install FAT bootcode: %S ==> %S\n", SrcPath, SystemRootPath->Buffer); Status = InstallFat16BootCodeToDisk(SrcPath, @@ -2036,7 +2036,7 @@ /* Copy FreeLoader to the boot partition */ wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\freeldr.sys"); + wcscat(SrcPath, L"\\" ARCH_CD_ROOT "\\loader\\freeldr.sys"); wcscpy(DstPath, SystemRootPath->Buffer); wcscat(DstPath, L"\\freeldr.sys"); @@ -2083,7 +2083,7 @@ PartitionType == PARTITION_FAT32_XINT13) { wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\fat32.bin"); + wcscat(SrcPath, L"\\" ARCH_CD_ROOT "\\loader\\fat32.bin"); DPRINT("Install FAT32 bootcode: %S ==> %S\n", SrcPath, SystemRootPath->Buffer); Status = InstallFat32BootCodeToDisk(SrcPath, @@ -2097,7 +2097,7 @@ else { wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\fat.bin"); + wcscat(SrcPath, L"\\" ARCH_CD_ROOT "\\loader\\fat.bin"); DPRINT("Install FAT bootcode: %S ==> %S\n", SrcPath, SystemRootPath->Buffer); Status = InstallFat16BootCodeToDisk(SrcPath, @@ -2143,7 +2143,7 @@ /* Copy FreeLoader to the boot partition */ wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\freeldr.sys"); + wcscat(SrcPath, L"\\" ARCH_CD_ROOT "\\loader\\freeldr.sys"); wcscpy(DstPath, L"\\Device\\Floppy0\\freeldr.sys"); @@ -2169,7 +2169,7 @@ /* Install FAT12/16 boosector */ wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\fat.bin"); + wcscat(SrcPath, L"\\" ARCH_CD_ROOT "\\loader\\fat.bin"); wcscpy(DstPath, L"\\Device\\Floppy0"); Modified: branches/rbuild/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/base/setup/usetu… ============================================================================== --- branches/rbuild/reactos/base/setup/usetup/interface/usetup.c (original) +++ branches/rbuild/reactos/base/setup/usetup/interface/usetup.c Thu Jan 10 14:48:52 2008 @@ -2359,7 +2359,7 @@ || (PartEntry->PartInfo[0].PartitionType == PARTITION_FAT32)) { wcscpy(PathBuffer, SourceRootPath.Buffer); - wcscat(PathBuffer, L"\\loader\\fat32.bin"); + wcscat(PathBuffer, L"\\" ARCH_CD_ROOT "\\loader\\fat32.bin"); DPRINT("Install FAT32 bootcode: %S ==> %S\n", PathBuffer, DestinationRootPath.Buffer); @@ -2377,7 +2377,7 @@ else { wcscpy(PathBuffer, SourceRootPath.Buffer); - wcscat(PathBuffer, L"\\loader\\fat.bin"); + wcscat(PathBuffer, L"\\" ARCH_CD_ROOT "\\loader\\fat.bin"); DPRINT("Install FAT bootcode: %S ==> %S\n", PathBuffer, DestinationRootPath.Buffer); Modified: branches/rbuild/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/base/setup/usetu… ============================================================================== --- branches/rbuild/reactos/base/setup/usetup/partlist.c (original) +++ branches/rbuild/reactos/base/setup/usetup/partlist.c Thu Jan 10 14:48:52 2008 @@ -2504,7 +2504,7 @@ DiskEntry1->BiosDiskNumber == 0) { wcscpy (SrcPath, SourceRootPath.Buffer); - wcscat (SrcPath, L"\\loader\\dosmbr.bin"); + wcscat (SrcPath, L"\\" ARCH_CD_ROOT "\\loader\\dosmbr.bin"); DPRINT ("Install MBR bootcode: %S ==> %S\n", SrcPath, DstPath); Modified: branches/rbuild/reactos/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/base/setup/usetu… ============================================================================== --- branches/rbuild/reactos/base/setup/usetup/usetup.h (original) +++ branches/rbuild/reactos/base/setup/usetup/usetup.h Thu Jan 10 14:48:52 2008 @@ -51,6 +51,9 @@ /* ReactOS Version */ #include <reactos/buildno.h> +/* Architecture header */ +#include <reactos/architecture.h> + /* Internal Headers */ #include "interface/consup.h" #include "partlist.h" Modified: branches/rbuild/reactos/boot/freeldr/bootsect/isoboot.asm URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/boot/freeldr/boo… ============================================================================== --- branches/rbuild/reactos/boot/freeldr/bootsect/isoboot.asm (original) +++ branches/rbuild/reactos/boot/freeldr/bootsect/isoboot.asm Thu Jan 10 14:48:52 2008 @@ -961,7 +961,7 @@ diskerr_msg: db 'Disk error ', 0 ondrive_str: db ', drive ', 0 err_bootfailed db CR, LF, 'Boot failed: press a key to retry...' -isolinux_dir db '\LOADER', 0 +isolinux_dir db '\I386\LOADER', 0 no_dir_msg db 'Could not find the LOADER directory.', CR, LF, 0 isolinux_bin db 'SETUPLDR.SYS', 0 no_isolinux_msg db 'Could not find SETUPLDR.SYS.', CR, LF, 0 Modified: branches/rbuild/reactos/boot/freeldr/bootsect/isobtrt.asm URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/boot/freeldr/boo… ============================================================================== --- branches/rbuild/reactos/boot/freeldr/bootsect/isobtrt.asm (original) +++ branches/rbuild/reactos/boot/freeldr/bootsect/isobtrt.asm Thu Jan 10 14:48:52 2008 @@ -928,7 +928,7 @@ diskerr_msg: db 'Disk error ', 0 ondrive_str: db ', drive ', 0 err_bootfailed db CR, LF, 'Boot failed: press a key to retry...' -isolinux_dir db '\LOADER', 0 +isolinux_dir db '\I386\LOADER', 0 no_dir_msg db 'Could not find the LOADER directory.', CR, LF, 0 isolinux_bin db 'SETUPLDR.SYS', 0 no_isolinux_msg db 'Could not find SETUPLDR.SYS.', CR, LF, 0 Modified: branches/rbuild/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/boot/freeldr/fre… ============================================================================== --- branches/rbuild/reactos/boot/freeldr/freeldr/reactos/reactos.c (original) +++ branches/rbuild/reactos/boot/freeldr/freeldr/reactos/reactos.c Thu Jan 10 14:48:52 2008 @@ -21,6 +21,7 @@ #include <freeldr.h> #include <debug.h> +#include <reactos/architecture.h> extern ULONG PageDirectoryStart; extern ULONG PageDirectoryEnd; @@ -648,7 +649,7 @@ { /* Normalize */ MachDiskGetBootPath(SystemPath, sizeof(SystemPath)); - strcat(SystemPath, "\\reactos"); + strcat(SystemPath, "\\" ARCH_CD_ROOT "\\reactos"); strcat(strcpy(reactos_kernel_cmdline, SystemPath), " /MININT"); } Added: branches/rbuild/reactos/include/reactos/architecture.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/include/reactos/… ============================================================================== --- branches/rbuild/reactos/include/reactos/architecture.h (added) +++ branches/rbuild/reactos/include/reactos/architecture.h Thu Jan 10 14:48:52 2008 @@ -1,0 +1,14 @@ +// Simple header for defining architecture-dependent settings + +#ifndef _REACTOS_ARCHITECTURE_H +#define _REACTOS_ARCHITECTURE_H + +#if defined(_M_IX86) +# define ARCH_CD_ROOT "I386" +#elif defined(_M_PPC) +# define ARCH_CD_ROOT "PPC" +#else +# error Unsupported architecture +#endif + +#endif Propchange: branches/rbuild/reactos/include/reactos/architecture.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/bac… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Thu Jan 10 14:48:52 2008 @@ -3502,7 +3502,7 @@ MingwIsoModuleHandler::GenerateIsoModuleTarget () { string bootcdDirectory = "cd"; - string bootcdStrapDirectory = bootcdDirectory + sSep + Environment::GetBootstrapCdOutputPath(); + string bootcdStrapDirectory = bootcdDirectory + sSep + Environment::GetBootstrapCdOutputPath( module.project ); FileLocation bootcd ( OutputDirectory, bootcdDirectory, @@ -3620,8 +3620,7 @@ } void -MingwLiveIsoModuleHandler::OutputModuleCopyCommands ( string& livecdDirectory, - string& reactosDirectory ) +MingwLiveIsoModuleHandler::OutputModuleCopyCommands ( string& livecdReactosDirectory ) { for ( size_t i = 0; i < module.project.modules.size (); i++ ) { @@ -3633,8 +3632,8 @@ const Module& aliasedModule = backend->GetAliasedModuleOrModule ( m ); FileLocation destination ( OutputDirectory, m.install->relative_path.length () > 0 - ? livecdDirectory + sSep + reactosDirectory + sSep + m.install->relative_path - : livecdDirectory + sSep + reactosDirectory, + ? livecdReactosDirectory + sSep + m.install->relative_path + : livecdReactosDirectory, m.install->name ); OutputCopyCommand ( *aliasedModule.output, destination); @@ -3643,59 +3642,49 @@ } void -MingwLiveIsoModuleHandler::OutputNonModuleCopyCommands ( string& livecdDirectory, - string& reactosDirectory ) +MingwLiveIsoModuleHandler::OutputNonModuleCopyCommands ( string& livecdReactosDirectory ) { for ( size_t i = 0; i < module.project.installfiles.size (); i++ ) { const InstallFile& installfile = *module.project.installfiles[i]; FileLocation target ( OutputDirectory, installfile.target->relative_path.length () > 0 - ? livecdDirectory + sSep + reactosDirectory + sSep + installfile.target->relative_path - : livecdDirectory + sSep + reactosDirectory, + ? livecdReactosDirectory + sSep + installfile.target->relative_path + : livecdReactosDirectory, installfile.target->name ); OutputCopyCommand ( *installfile.source, target ); } } void -MingwLiveIsoModuleHandler::OutputProfilesDirectoryCommands ( string& livecdDirectory ) -{ - CreateDirectory ( livecdDirectory + sSep + "Profiles" ); - CreateDirectory ( livecdDirectory + sSep + "Profiles" + sSep + "All Users") ; - CreateDirectory ( livecdDirectory + sSep + "Profiles" + sSep + "All Users" + sSep + "Desktop" ); - CreateDirectory ( livecdDirectory + sSep + "Profiles" + sSep + "Default User" ); - CreateDirectory ( livecdDirectory + sSep + "Profiles" + sSep + "Default User" + sSep + "Desktop" ); - CreateDirectory ( livecdDirectory + sSep + "Profiles" + sSep + "Default User" + sSep + "My Documents" ); - +MingwLiveIsoModuleHandler::OutputLoaderCommands ( string& livecdRootDirectory, string& livecdArchDirectory ) +{ FileLocation livecdIni ( SourceDirectory, "boot" + sSep + "bootdata", "livecd.ini" ); - FileLocation destination ( OutputDirectory, - livecdDirectory, - "freeldr.ini" ); + + FileLocation livecdIniDestination ( OutputDirectory, + livecdRootDirectory, + "freeldr.ini" ); OutputCopyCommand ( livecdIni, - destination ); -} - -void -MingwLiveIsoModuleHandler::OutputLoaderCommands ( string& livecdDirectory ) -{ + livecdIniDestination ); + + FileLocation freeldr ( OutputDirectory, "boot" + sSep + "freeldr" + sSep + "freeldr", "freeldr.sys" ); - FileLocation destination ( OutputDirectory, - livecdDirectory + sSep + "loader", - "setupldr.sys" ); + FileLocation freeldrDestination ( OutputDirectory, + livecdArchDirectory + sSep + "loader", + "setupldr.sys" ); OutputCopyCommand ( freeldr, - destination ); -} - -void -MingwLiveIsoModuleHandler::OutputRegistryCommands ( string& livecdDirectory ) + freeldrDestination ); +} + +void +MingwLiveIsoModuleHandler::OutputRegistryCommands ( string& livecdReactosDirectory ) { FileLocation reactosSystem32ConfigDirectory ( OutputDirectory, - livecdDirectory + sSep + "reactos" + sSep + "system32" + sSep + "config", + livecdReactosDirectory + sSep + "system32" + sSep + "config", "" ); fprintf ( fMakefile, "\t$(ECHO_MKHIVE)\n" ); @@ -3708,8 +3697,9 @@ void MingwLiveIsoModuleHandler::GenerateLiveIsoModuleTarget () { - string livecdDirectory = module.name; - FileLocation livecd ( OutputDirectory, livecdDirectory, "" ); + string livecdRootDirectory = module.name; + string livecdArchDirectory = module.name + sSep + Environment::GetArchCdPath( module.project ); + FileLocation livecd ( OutputDirectory, livecdRootDirectory, "" ); string bootloader; string IsoName; @@ -3727,10 +3717,9 @@ FileLocation isoboot ( OutputDirectory, "boot" + sSep + "freeldr" + sSep + "bootsect", bootloader ); - string reactosDirectory = Environment::GetArch();// "reactos"; - string livecdReactosNoFixup = livecdDirectory + sSep + reactosDirectory; + string livecdReactosDirectory = livecdArchDirectory + sSep + "reactos"; FileLocation livecdReactos ( OutputDirectory, - livecdReactosNoFixup, + livecdReactosDirectory, "" ); CLEAN_FILE ( livecdReactos ); @@ -3741,13 +3730,10 @@ module.name.c_str (), backend->GetFullName ( isoboot) .c_str (), backend->GetFullPath ( livecdReactos ).c_str () ); - OutputModuleCopyCommands ( livecdDirectory, - reactosDirectory ); - OutputNonModuleCopyCommands ( livecdDirectory, - reactosDirectory ); - OutputProfilesDirectoryCommands ( livecdDirectory ); - OutputLoaderCommands ( livecdDirectory ); - OutputRegistryCommands ( livecdDirectory ); + OutputModuleCopyCommands ( livecdReactosDirectory ); + OutputNonModuleCopyCommands ( livecdReactosDirectory ); + OutputLoaderCommands ( livecdRootDirectory, livecdArchDirectory ); + OutputRegistryCommands ( livecdReactosDirectory ); fprintf ( fMakefile, "\t$(ECHO_CDMAKE)\n" ); fprintf ( fMakefile, "\t$(Q)$(CDMAKE_TARGET) -v -m -j -b %s %s REACTOS %s\n", Modified: branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/bac… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.h (original) +++ branches/rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.h Thu Jan 10 14:48:52 2008 @@ -450,13 +450,10 @@ private: void GenerateLiveIsoModuleTarget (); void CreateDirectory ( const std::string& directory ); - void OutputModuleCopyCommands ( std::string& livecdDirectory, - std::string& livecdReactos ); - void OutputNonModuleCopyCommands ( std::string& livecdDirectory, - std::string& livecdReactos ); - void OutputProfilesDirectoryCommands ( std::string& livecdDirectory ); - void OutputLoaderCommands ( std::string& livecdDirectory ); - void OutputRegistryCommands ( std::string& livecdDirectory ); + void OutputModuleCopyCommands ( std::string& livecdReactosDirectory ); + void OutputNonModuleCopyCommands ( std::string& livecdReactosDirectory ); + void OutputLoaderCommands ( std::string& livecdRootDirectory, std::string& livecdArchDirectory ); + void OutputRegistryCommands ( std::string& livecdReactosDirectory ); }; Modified: branches/rbuild/reactos/tools/rbuild/creditsgenerator.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/cre… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/creditsgenerator.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/creditsgenerator.cpp Thu Jan 10 14:48:52 2008 @@ -86,7 +86,7 @@ } - FileSupportCode::WriteIfChanged ( buf, NormalizeFilename ( Environment::GetIntermediatePath () + sSep + "CREDITS" ) ); + FileSupportCode::WriteIfChanged (buf, "CREDITS"); free ( buf ); } @@ -105,8 +105,8 @@ s = s + sprintf ( s, "/* Auto generated */\n"); s = s + sprintf ( s, "/* Edit contributors.rbuild to add or remove developers */\n" ); s = s + sprintf ( s, "\n" ); - s = s + sprintf ( s, "#ifndef __INCLUDE_AUTOCONTRIBUTORS_H\n" ); - s = s + sprintf ( s, "#define __INCLUDE_AUTOCONTRIBUTORS_H\n" ); + s = s + sprintf ( s, "#ifndef __INCLUDE_AUTOCONTRIBUTORS_H\n" ); + s = s + sprintf ( s, "#define __INCLUDE_AUTOCONTRIBUTORS_H\n" ); s = s + sprintf ( s, "\n" ); s = s + sprintf ( s, "const char* szAutoContributors[]= \n" ); s = s + sprintf ( s, "{\n" ); Modified: branches/rbuild/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/pro… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/project.cpp (original) +++ branches/rbuild/reactos/tools/rbuild/project.cpp Thu Jan 10 14:48:52 2008 @@ -72,9 +72,21 @@ } string -Environment::GetArch () -{ - return GetEnvironmentVariablePathOrDefault ( "ROS_ARCH", "i386" ); +Environment::GetArchName () +{ + return GetEnvironmentVariablePathOrDefault("ROS_ARCH", "i386"); +} + +string +Environment::GetArchCdPath ( const Project& project ) +{ + switch( project.architectureType ) + { + case I386: return "I386"; + case PowerPC: return "PPC"; + } + + throw MissingArgumentException("architectureType"); } /* static */ string @@ -92,7 +104,7 @@ Environment::GetIntermediatePath () { string defaultIntermediate = - string( "obj-" ) + GetArch (); + string( "obj-" ) + GetArchName (); return GetEnvironmentVariablePathOrDefault ( "ROS_INTERMEDIATE", defaultIntermediate ); } @@ -113,7 +125,7 @@ Environment::GetOutputPath () { string defaultOutput = - string( "output-" ) + GetArch (); + string( "output-" ) + GetArchName (); return GetEnvironmentVariablePathOrDefault ( "ROS_OUTPUT", defaultOutput ); } @@ -134,10 +146,10 @@ } /* static */ string -Environment::GetBootstrapCdOutputPath () +Environment::GetBootstrapCdOutputPath ( const Project& project ) { return GetEnvironmentVariablePathOrDefault ( "ROS_CDBOOTSTRAPOUTPUT", - GetArch()); + GetArchCdPath(project) ); } /* static */ string Modified: branches/rbuild/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu… ============================================================================== --- branches/rbuild/reactos/tools/rbuild/rbuild.h (original) +++ branches/rbuild/reactos/tools/rbuild/rbuild.h Thu Jan 10 14:48:52 2008 @@ -123,6 +123,7 @@ class BuildFamily; class Family; class PlatformLanguage; +class Project; typedef std::map<std::string,Directory*> directory_map; @@ -209,11 +210,12 @@ { public: static std::string GetVariable ( const std::string& name ); - static std::string GetArch (); + static std::string GetArchName (); + static std::string GetArchCdPath ( const Project& project ); static std::string GetIntermediatePath (); static std::string GetOutputPath (); static std::string GetCdOutputPath (); - static std::string GetBootstrapCdOutputPath (); + static std::string GetBootstrapCdOutputPath ( const Project& project ); static std::string GetInstallPath (); static std::string GetAutomakeFile ( const std::string& defaultFile ); static std::string GetEnvironmentVariablePathOrDefault ( const std::string& name,

1 0

[cwittich] 31699: fix some text strings
by cwittich＠svn.reactos.org 10 Jan '08

10 Jan '08

Author: cwittich Date: Thu Jan 10 10:45:12 2008 New Revision: 31699 URL: http://svn.reactos.org/svn/reactos?rev=31699&view=rev Log: fix some text strings Modified: trunk/rosapps/roscalc/lang/de-DE.rc trunk/rosapps/roscalc/lang/en-US.rc Modified: trunk/rosapps/roscalc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/roscalc/lang/de-DE.rc?rev=… ============================================================================== --- trunk/rosapps/roscalc/lang/de-DE.rc (original) +++ trunk/rosapps/roscalc/lang/de-DE.rc Thu Jan 10 10:45:12 2008 @@ -149,7 +149,7 @@ 42,10 CONTROL "Radian",IDC_RADIO_RAD,"Button",BS_AUTORADIOBUTTON,192, 24,42,10 - CONTROL "Gradian",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON, + CONTROL "Grad",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON, 236,24,44,10 PUSHBUTTON "C",IDC_BUTTON_CANC,272,40,40,17,BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP @@ -284,9 +284,9 @@ MENUITEM "Oktal\tF7", IDM_VIEW_OCT, CHECKED MENUITEM "Binär\tF8", IDM_VIEW_BIN, CHECKED MENUITEM SEPARATOR - MENUITEM "Degree\tF2", IDM_VIEW_DEG, CHECKED - MENUITEM "Radian\tF3", IDM_VIEW_RAD, CHECKED - MENUITEM "Gradias\tF4", IDM_VIEW_GRAD, CHECKED + MENUITEM "Degree\tF2", IDM_VIEW_DEG, CHECKED + MENUITEM "Radian\tF3", IDM_VIEW_RAD, CHECKED + MENUITEM "Grad\tF4", IDM_VIEW_GRAD, CHECKED MENUITEM SEPARATOR MENUITEM "Zifferngruppierung", IDM_VIEW_GROUP, CHECKED END @@ -294,7 +294,7 @@ BEGIN MENUITEM "Hilfethemen", IDM_HELP_HELP MENUITEM SEPARATOR - MENUITEM "Über ReactOS Rechner", IDM_HELP_ABOUT + MENUITEM "Info", IDM_HELP_ABOUT END END Modified: trunk/rosapps/roscalc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/roscalc/lang/en-US.rc?rev=… ============================================================================== --- trunk/rosapps/roscalc/lang/en-US.rc (original) +++ trunk/rosapps/roscalc/lang/en-US.rc Thu Jan 10 10:45:12 2008 @@ -145,11 +145,11 @@ WS_VISIBLE,232,24,33,10 CONTROL "Byte",IDC_RADIO_BYTE,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,272,24,30,10 - CONTROL "Degrees",IDC_RADIO_DEG,"Button",BS_AUTORADIOBUTTON,148,24, + CONTROL "Degree",IDC_RADIO_DEG,"Button",BS_AUTORADIOBUTTON,148,24, 42,10 - CONTROL "Radians",IDC_RADIO_RAD,"Button",BS_AUTORADIOBUTTON,192, + CONTROL "Radian",IDC_RADIO_RAD,"Button",BS_AUTORADIOBUTTON,192, 24,42,10 - CONTROL "Gradians",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON, + CONTROL "Grad",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON, 236,24,44,10 PUSHBUTTON "C",IDC_BUTTON_CANC,272,40,40,17,BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP @@ -284,9 +284,9 @@ MENUITEM "Octal\tF7", IDM_VIEW_OCT, CHECKED MENUITEM "Binary\tF8", IDM_VIEW_BIN, CHECKED MENUITEM SEPARATOR - MENUITEM "Degrees\tF2", IDM_VIEW_DEG, CHECKED - MENUITEM "Radians\tF3", IDM_VIEW_RAD, CHECKED - MENUITEM "Gradians\tF4", IDM_VIEW_GRAD, CHECKED + MENUITEM "Degree\tF2", IDM_VIEW_DEG, CHECKED + MENUITEM "Radian\tF3", IDM_VIEW_RAD, CHECKED + MENUITEM "Grad\tF4", IDM_VIEW_GRAD, CHECKED MENUITEM SEPARATOR MENUITEM "Group digits", IDM_VIEW_GROUP, CHECKED END

1 0

[jimtabor] 31698: Removed Enhmeta code from win32k.
by jimtabor＠svn.reactos.org 10 Jan '08

10 Jan '08

Author: jimtabor Date: Thu Jan 10 10:42:32 2008 New Revision: 31698 URL: http://svn.reactos.org/svn/reactos?rev=31698&view=rev Log: Removed Enhmeta code from win32k. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Thu Jan 10 10:42:32 2008 @@ -404,9 +404,6 @@ HPALETTE PalIndexed; UNICODE_STRING DriverName; - - HANDLE hFile; - LPENHMETAHEADER emh; } DC, *PDC; #endif Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Thu Jan 10 10:42:32 2008 @@ -1001,11 +1001,6 @@ #if 0 /* FIXME */ PATH_DestroyGdiPath (&DCToDelete->w.path); #endif - - if (DCToDelete->emh) - { - EngFreeMem(DCToDelete->emh); - } DC_UnlockDc( DCToDelete ); DC_FreeDC ( hDC );

1 0

[cwittich] 31697: add cpu.inf
by cwittich＠svn.reactos.org 10 Jan '08

10 Jan '08

Author: cwittich Date: Thu Jan 10 10:37:55 2008 New Revision: 31697 URL: http://svn.reactos.org/svn/reactos?rev=31697&view=rev Log: add cpu.inf Added: trunk/reactos/media/inf/cpu.inf Added: trunk/reactos/media/inf/cpu.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cpu.inf?rev=3169… ============================================================================== --- trunk/reactos/media/inf/cpu.inf (added) +++ trunk/reactos/media/inf/cpu.inf Thu Jan 10 10:37:55 2008 @@ -1,0 +1,46 @@ +[Version] +Signature = "$Windows NT$" +;Signature = "$ReactOS$" +LayoutFile = layout.inf +Class = Processor +ClassGUID = {50127DC3-0F36-415e-A6CC-4CB3BE910B65} +Provider = %ReactOS% +DriverVer = 09/27/2007,1.00 + +[ControlFlags] +ExcludeFromSelect = * + +[DestinationDirs] +DefaultDestDir = 12 + +[Manufacturer] +%Intel%=Intel +%Standard%=Standard + +[Standard] +%Processor.DeviceDesc% = NO_DRV,ACPI\Processor + +[Intel] +%IntelProcessor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86 + + +;---------------------------- NO DRIVER REQ ----------------------------- + +[NO_DRV] +AddReg=NO_DRV.AddReg + +[NO_DRV.Services] +AddService = , 0x00000002 + +[NO_DRV.HW] + +[NO_DRV.AddReg] +HKR,,EnumPropPages32,,"devcpux.dll,PropSheetExtProc" + +;-------------------------------- STRINGS ------------------------------- + +[Strings] +IntelMfg = "Intel" +Processor.DeviceDesc = "Processor" +IntelProcessor.DeviceDesc = "Intel Processor" +Standard = "Standard processor"

1 0

[jimtabor] 31696: Add member items for meta clipping region and bounding rectangle support.
by jimtabor＠svn.reactos.org 10 Jan '08

10 Jan '08

Author: jimtabor Date: Thu Jan 10 10:21:02 2008 New Revision: 31696 URL: http://svn.reactos.org/svn/reactos?rev=31696&view=rev Log: Add member items for meta clipping region and bounding rectangle support. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Thu Jan 10 10:21:02 2008 @@ -339,15 +339,18 @@ typedef struct _WIN_DC_INFO { - int flags; - HRGN hClipRgn; /* Clip region (may be 0) */ - HRGN hVisRgn; /* Visible region (must never be 0) */ - HRGN hGCClipRgn; /* GC clip region (ClipRgn AND VisRgn) */ + int flags; + + HRGN hClipRgn; /* Clip region (may be 0) */ + HRGN hrgnMeta; /* Meta region (may be 0) */ + HRGN hMetaClipRgn; /* Intersection of meta and clip regions (may be 0) */ + HRGN hVisRgn; /* Should me to DC. Visible region (must never be 0) */ + + HRGN hGCClipRgn; /* GC clip region (ClipRgn AND VisRgn) */ HBITMAP hBitmap; HBITMAP hFirstBitmap; /* Bitmap selected at creation of the DC */ /* #if 0 */ - HANDLE hDevice; HPALETTE hPalette; GdiPath path; @@ -381,12 +384,15 @@ FLONG flGraphics; FLONG flGraphics2; PDC_ATTR pDc_Attr; + WIN_DC_INFO w; DC_ATTR Dc_Attr; HDC hNext; HDC hPrev; - + RECTL erclClip; RECTL erclWindow; RECTL erclBounds; + HRGN hprgnAPI; + HRGN hprgnVis; CLIPOBJ *CombinedClip; XLATEOBJ *XlateBrush; @@ -398,7 +404,6 @@ HPALETTE PalIndexed; UNICODE_STRING DriverName; - WIN_DC_INFO w; HANDLE hFile; LPENHMETAHEADER emh; Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Thu Jan 10 10:21:02 2008 @@ -1213,9 +1213,6 @@ nDc_Attr->hlfntNew = Dc_Attr->hlfntNew; newdc->w.hBitmap = dc->w.hBitmap; newdc->w.hFirstBitmap = dc->w.hFirstBitmap; -#if 0 - newdc->w.hDevice = dc->w.hDevice; -#endif newdc->PalIndexed = dc->PalIndexed; newdc->w.hPalette = dc->w.hPalette; newdc->w.totalExtent = dc->w.totalExtent; @@ -1287,10 +1284,6 @@ dc->w.hFirstBitmap = dcs->w.hFirstBitmap; -#if 0 - dc->w.hDevice = dcs->w.hDevice; -#endif - Dc_Attr->dwLayout = sDc_Attr->dwLayout; dc->w.totalExtent = dcs->w.totalExtent; Dc_Attr->jROP2 = sDc_Attr->jROP2;

1 0

[weiden] 31695: Stop abusing WM_SETCURSOR and use tooltips instead
by weiden＠svn.reactos.org 10 Jan '08

10 Jan '08

Author: weiden Date: Thu Jan 10 09:34:46 2008 New Revision: 31695 URL: http://svn.reactos.org/svn/reactos?rev=31695&view=rev Log: Stop abusing WM_SETCURSOR and use tooltips instead Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Thu Jan 10 09:34:46 2008 @@ -10,6 +10,15 @@ #include "options.h" +typedef struct _OPTIONS_DLG +{ + HWND hwndDlg; + HWND hwndToolTip; + HICON hIcon; + HFONT hFont; + SETTINGS Settings; +} OPTIONS_DLG, *POPTIONS_DLG; + HINSTANCE hInstance; BOOL CreateDir(HWND hwnd, WCHAR* dir) @@ -29,7 +38,7 @@ } INT -WriteSettings(HWND hwnd) +WriteSettings(POPTIONS_DLG infoPtr) { INT foreground, background; BOOL showtime, writelog, useccache, strip, objstate, outstate; @@ -38,29 +47,29 @@ HANDLE hFile; FILE *pFile; - showtime = (SendDlgItemMessage(hwnd, ID_SHOWBUILDTIME, BM_GETCHECK, 0, 0) == BST_CHECKED); - writelog = (SendDlgItemMessage(hwnd, ID_SAVELOGS, BM_GETCHECK, 0, 0) == BST_CHECKED); - useccache = (SendDlgItemMessage(hwnd, ID_USECCACHE, BM_GETCHECK, 0, 0) == BST_CHECKED); - strip = (SendDlgItemMessageW(hwnd, ID_STRIP, BM_GETCHECK, 0, 0) == BST_CHECKED); - objstate = (SendDlgItemMessage(hwnd, ID_OTHEROBJ, BM_GETCHECK, 0, 0) == BST_CHECKED); - outstate = (SendDlgItemMessageW(hwnd, ID_OTHEROUT, BM_GETCHECK, 0, 0) == BST_CHECKED); - foreground = SendDlgItemMessageW(hwnd, IDC_FONT, CB_GETCURSEL, 0, 0); - background = SendDlgItemMessageW(hwnd, IDC_BACK, CB_GETCURSEL, 0, 0); - GetDlgItemTextW(hwnd, ID_LOGDIR, logdir, MAX_PATH); - GetDlgItemTextW(hwnd, ID_MGWDIR, mingwpath, MAX_PATH); - GetDlgItemTextW(hwnd, ID_OBJDIR, objdir, MAX_PATH); - GetDlgItemTextW(hwnd, ID_OUTDIR, outdir, MAX_PATH); + showtime = (SendDlgItemMessage(infoPtr->hwndDlg, ID_SHOWBUILDTIME, BM_GETCHECK, 0, 0) == BST_CHECKED); + writelog = (SendDlgItemMessage(infoPtr->hwndDlg, ID_SAVELOGS, BM_GETCHECK, 0, 0) == BST_CHECKED); + useccache = (SendDlgItemMessage(infoPtr->hwndDlg, ID_USECCACHE, BM_GETCHECK, 0, 0) == BST_CHECKED); + strip = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_STRIP, BM_GETCHECK, 0, 0) == BST_CHECKED); + objstate = (SendDlgItemMessage(infoPtr->hwndDlg, ID_OTHEROBJ, BM_GETCHECK, 0, 0) == BST_CHECKED); + outstate = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_OTHEROUT, BM_GETCHECK, 0, 0) == BST_CHECKED); + foreground = SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, CB_GETCURSEL, 0, 0); + background = SendDlgItemMessageW(infoPtr->hwndDlg, IDC_BACK, CB_GETCURSEL, 0, 0); + GetDlgItemTextW(infoPtr->hwndDlg, ID_LOGDIR, logdir, MAX_PATH); + GetDlgItemTextW(infoPtr->hwndDlg, ID_MGWDIR, mingwpath, MAX_PATH); + GetDlgItemTextW(infoPtr->hwndDlg, ID_OBJDIR, objdir, MAX_PATH); + GetDlgItemTextW(infoPtr->hwndDlg, ID_OUTDIR, outdir, MAX_PATH); if (writelog && (logdir[0] != 0)) - if (!CreateDir(hwnd, logdir)) + if (!CreateDir(infoPtr->hwndDlg, logdir)) return FALSE; if (objstate && (objdir[0] != 0)) - if (!CreateDir(hwnd, objdir)) + if (!CreateDir(infoPtr->hwndDlg, objdir)) return FALSE; if (outstate && (outdir[0] != 0)) - if (!CreateDir(hwnd, outdir)) + if (!CreateDir(infoPtr->hwndDlg, outdir)) return FALSE; wcscpy(checkmgw, mingwpath); @@ -70,7 +79,7 @@ if (hFile == INVALID_HANDLE_VALUE) { LoadString(hInstance, MSG_NOGCCFOUND, msgerror, 256); - MessageBox(hwnd, msgerror, NULL, MB_ICONERROR); + MessageBox(infoPtr->hwndDlg, msgerror, NULL, MB_ICONERROR); return FALSE; } CloseHandle(hFile); @@ -98,17 +107,18 @@ return TRUE; } LoadString(hInstance, MSG_FILEFAILED, msgerror, 256); - MessageBox(hwnd, msgerror, NULL, MB_ICONERROR); + MessageBox(infoPtr->hwndDlg, msgerror, NULL, MB_ICONERROR); return FALSE; } -VOID LoadSettings(HWND hwnd, PSETTINGS LoadedSettings) +VOID LoadSettings(POPTIONS_DLG infoPtr) { FILE *pFile; WCHAR optionsfile[MAX_PATH]; WCHAR *ptr, *ptr2; WCHAR WTempLine[25+MAX_PATH]; WCHAR SBTitle[256]; + PSETTINGS LoadedSettings = &infoPtr->Settings; wcscpy(optionsfile, _wgetenv(L"APPDATA")); if ((wcslen(optionsfile) + wcslen(L"\\RosBE\\rosbe-options.cmd")) < MAX_PATH) @@ -154,7 +164,7 @@ fclose(pFile); free(WTempLine); LoadString(hInstance, MSG_SETLOADSUC, SBTitle, 256); - SetDlgItemText(hwnd, ID_STATUSBAR, SBTitle); + SetDlgItemText(infoPtr->hwndDlg, ID_STATUSBAR, SBTitle); } else { @@ -163,57 +173,61 @@ GetCurrentDirectory(MAX_PATH, LoadedSettings->mingwpath); if ((wcslen(LoadedSettings->mingwpath) + wcslen(MINGWVERSION)) < MAX_PATH) wcscat(LoadedSettings->mingwpath, MINGWVERSION); - } - SendDlgItemMessageW(hwnd, IDC_FONT, CB_SETCURSEL, LoadedSettings->foreground, 0); - SendDlgItemMessageW(hwnd, IDC_BACK, CB_SETCURSEL, LoadedSettings->background, 0); - SendDlgItemMessage(hwnd, ID_SHOWBUILDTIME, BM_SETCHECK, LoadedSettings->showtime, 0); - SendDlgItemMessage(hwnd, ID_SAVELOGS, BM_SETCHECK, LoadedSettings->writelog, 0); + + LoadString(hInstance, HLP_DEFAULTMSG, SBTitle, 256); + SetDlgItemText(infoPtr->hwndDlg, ID_STATUSBAR, SBTitle); + } + SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, CB_SETCURSEL, LoadedSettings->foreground, 0); + SendDlgItemMessageW(infoPtr->hwndDlg, IDC_BACK, CB_SETCURSEL, LoadedSettings->background, 0); + SendDlgItemMessage(infoPtr->hwndDlg, ID_SHOWBUILDTIME, BM_SETCHECK, LoadedSettings->showtime, 0); + SendDlgItemMessage(infoPtr->hwndDlg, ID_SAVELOGS, BM_SETCHECK, LoadedSettings->writelog, 0); if (LoadedSettings->writelog) { - EnableWindow(GetDlgItem(hwnd, ID_BROWSE), TRUE); - EnableWindow(GetDlgItem(hwnd, ID_LOGDIR), TRUE); - } - SendDlgItemMessage(hwnd, ID_USECCACHE, BM_SETCHECK, LoadedSettings->useccache, 0); - SendDlgItemMessageW(hwnd, ID_STRIP, BM_SETCHECK, LoadedSettings->strip, 0); - SetDlgItemText(hwnd, ID_MGWDIR, LoadedSettings->mingwpath); - SetDlgItemText(hwnd, ID_LOGDIR, LoadedSettings->logdir); + EnableWindow(GetDlgItem(infoPtr->hwndDlg, ID_BROWSE), TRUE); + EnableWindow(GetDlgItem(infoPtr->hwndDlg, ID_LOGDIR), TRUE); + } + SendDlgItemMessage(infoPtr->hwndDlg, ID_USECCACHE, BM_SETCHECK, LoadedSettings->useccache, 0); + SendDlgItemMessageW(infoPtr->hwndDlg, ID_STRIP, BM_SETCHECK, LoadedSettings->strip, 0); + SetDlgItemText(infoPtr->hwndDlg, ID_MGWDIR, LoadedSettings->mingwpath); + SetDlgItemText(infoPtr->hwndDlg, ID_LOGDIR, LoadedSettings->logdir); if (LoadedSettings->objdir[0] != 0) { LoadedSettings->objstate = 1; - SetDlgItemText(hwnd, ID_OBJDIR, LoadedSettings->objdir); - SendDlgItemMessage(hwnd, ID_OTHEROBJ, BM_SETCHECK, BST_CHECKED, 0); - EnableWindow(GetDlgItem(hwnd, ID_BROWSEOBJ), TRUE); - EnableWindow(GetDlgItem(hwnd, ID_OBJDIR), TRUE); + SetDlgItemText(infoPtr->hwndDlg, ID_OBJDIR, LoadedSettings->objdir); + SendDlgItemMessage(infoPtr->hwndDlg, ID_OTHEROBJ, BM_SETCHECK, BST_CHECKED, 0); + EnableWindow(GetDlgItem(infoPtr->hwndDlg, ID_BROWSEOBJ), TRUE); + EnableWindow(GetDlgItem(infoPtr->hwndDlg, ID_OBJDIR), TRUE); } if (LoadedSettings->outdir[0] != 0) { LoadedSettings->outstate = 1; - SetDlgItemText(hwnd, ID_OUTDIR, LoadedSettings->outdir); - SendDlgItemMessage(hwnd, ID_OTHEROUT, BM_SETCHECK, BST_CHECKED, 0); - EnableWindow(GetDlgItem(hwnd, ID_BROWSEOUT), TRUE); - EnableWindow(GetDlgItem(hwnd, ID_OUTDIR), TRUE); - } -} - -VOID SetSaveState(HWND hwnd, PSETTINGS DefaultSettings) + SetDlgItemText(infoPtr->hwndDlg, ID_OUTDIR, LoadedSettings->outdir); + SendDlgItemMessage(infoPtr->hwndDlg, ID_OTHEROUT, BM_SETCHECK, BST_CHECKED, 0); + EnableWindow(GetDlgItem(infoPtr->hwndDlg, ID_BROWSEOUT), TRUE); + EnableWindow(GetDlgItem(infoPtr->hwndDlg, ID_OUTDIR), TRUE); + } +} + +VOID SetSaveState(POPTIONS_DLG infoPtr) { INT foreground, background; BOOL showtime, writelog, useccache, strip, objstate, outstate; WCHAR logdir[MAX_PATH], objdir[MAX_PATH], outdir[MAX_PATH], mingwpath[MAX_PATH]; BOOL StateObj = TRUE, StateOut = TRUE, StateLog = TRUE, State = TRUE; - - showtime = (SendDlgItemMessage(hwnd, ID_SHOWBUILDTIME, BM_GETCHECK, 0, 0) == BST_CHECKED); - writelog = (SendDlgItemMessage(hwnd, ID_SAVELOGS, BM_GETCHECK, 0, 0) == BST_CHECKED); - useccache = (SendDlgItemMessage(hwnd, ID_USECCACHE, BM_GETCHECK, 0, 0) == BST_CHECKED); - strip = (SendDlgItemMessageW(hwnd, ID_STRIP, BM_GETCHECK, 0, 0) == BST_CHECKED); - objstate = (SendDlgItemMessageW(hwnd, ID_OTHEROBJ, BM_GETCHECK, 0, 0) == BST_CHECKED); - outstate = (SendDlgItemMessageW(hwnd, ID_OTHEROUT, BM_GETCHECK, 0, 0) == BST_CHECKED); - foreground = SendDlgItemMessageW(hwnd, IDC_FONT, CB_GETCURSEL, 0, 0); - background = SendDlgItemMessageW(hwnd, IDC_BACK, CB_GETCURSEL, 0, 0); - GetDlgItemTextW(hwnd, ID_LOGDIR, logdir, MAX_PATH); - GetDlgItemTextW(hwnd, ID_MGWDIR, mingwpath, MAX_PATH); - GetDlgItemTextW(hwnd, ID_OBJDIR, objdir, MAX_PATH); - GetDlgItemTextW(hwnd, ID_OUTDIR, outdir, MAX_PATH); + PSETTINGS DefaultSettings = &infoPtr->Settings; + + showtime = (SendDlgItemMessage(infoPtr->hwndDlg, ID_SHOWBUILDTIME, BM_GETCHECK, 0, 0) == BST_CHECKED); + writelog = (SendDlgItemMessage(infoPtr->hwndDlg, ID_SAVELOGS, BM_GETCHECK, 0, 0) == BST_CHECKED); + useccache = (SendDlgItemMessage(infoPtr->hwndDlg, ID_USECCACHE, BM_GETCHECK, 0, 0) == BST_CHECKED); + strip = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_STRIP, BM_GETCHECK, 0, 0) == BST_CHECKED); + objstate = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_OTHEROBJ, BM_GETCHECK, 0, 0) == BST_CHECKED); + outstate = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_OTHEROUT, BM_GETCHECK, 0, 0) == BST_CHECKED); + foreground = SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, CB_GETCURSEL, 0, 0); + background = SendDlgItemMessageW(infoPtr->hwndDlg, IDC_BACK, CB_GETCURSEL, 0, 0); + GetDlgItemTextW(infoPtr->hwndDlg, ID_LOGDIR, logdir, MAX_PATH); + GetDlgItemTextW(infoPtr->hwndDlg, ID_MGWDIR, mingwpath, MAX_PATH); + GetDlgItemTextW(infoPtr->hwndDlg, ID_OBJDIR, objdir, MAX_PATH); + GetDlgItemTextW(infoPtr->hwndDlg, ID_OUTDIR, outdir, MAX_PATH); if (objstate) if ((wcscmp(objdir, DefaultSettings->objdir) != 0) && (wcslen(objdir) > 0)) @@ -232,45 +246,7 @@ (StateLog) && (wcscmp(mingwpath, DefaultSettings->mingwpath) == 0) && (StateObj) && (StateOut)); - EnableWindow(GetDlgItem(hwnd, ID_OK), State); -} - -BOOL CALLBACK EnumChildProc(HWND hwndChild, LPARAM lParam) -{ - if (hwndChild == (HWND)lParam) - { - HWND hwndParent; - LONG WindowID; - INT TextID = HLP_DEFAULTMSG; - WCHAR HelpTxt[256]; - hwndParent = GetParent(hwndChild); - WindowID = GetWindowLong(hwndChild, GWL_ID); - switch(WindowID) - { - case IDC_BACK: TextID = HLP_BACKCOLORC; break; - case IDC_FONT: TextID = HLP_FONTCOLORC; break; - case ID_SHOWBUILDTIME: TextID = HLP_SBUILDTIME; break; - case ID_USECCACHE: TextID = HLP_CCACHEUSED; break; - case ID_STRIP: TextID = HLP_STRIPEDEXE; break; - case ID_MGWDIR: - case ID_BROWSEMGW: TextID = HLP_FINDMGWDIR; break; - case ID_LOGDIR: - case ID_BROWSE: - case ID_SAVELOGS: TextID = HLP_FINDLOGDIR; break; - case ID_OBJDIR: - case ID_BROWSEOBJ: - case ID_OTHEROBJ: TextID = HLP_FINDOBJDIR; break; - case ID_OUTDIR: - case ID_BROWSEOUT: - case ID_OTHEROUT: TextID = HLP_FINDOUTDIR; break; - case ID_OK: TextID = HLP_SAVEBUTTON; break; - case ID_CANCEL: TextID = HLP_QUITBUTTON; break; - } - LoadString(hInstance, TextID, HelpTxt, 256); - SetDlgItemText(hwndParent, ID_STATUSBAR, HelpTxt); - return FALSE; - } - return TRUE; + EnableWindow(GetDlgItem(infoPtr->hwndDlg, ID_OK), State); } INT CALLBACK @@ -317,32 +293,103 @@ return FALSE; } +static VOID +AssociateToolWithControl(POPTIONS_DLG infoPtr, int ControlId, UINT StringId) +{ + HWND hwndControl; + TOOLINFO ti; + + hwndControl = GetDlgItem(infoPtr->hwndDlg, ControlId); + if (infoPtr->hwndToolTip && hwndControl) + { + ZeroMemory(&ti, sizeof(ti)); + ti.cbSize = sizeof(ti); + ti.uFlags = TTF_IDISHWND | TTF_SUBCLASS; + ti.hwnd = infoPtr->hwndDlg; + ti.uId = (UINT_PTR)hwndControl; + ti.hinst = hInstance; + ti.lpszText = MAKEINTRESOURCE(StringId); + + SendMessage(infoPtr->hwndToolTip, TTM_ADDTOOL, 0, (LPARAM)&ti); + } +} + INT_PTR CALLBACK DlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) { - static HICON hIcon; - static HFONT hFont; - static SETTINGS Settings; + POPTIONS_DLG infoPtr = NULL; + + if (Msg != WM_INITDIALOG) + { + infoPtr = (POPTIONS_DLG)GetWindowLongPtr(Dlg, DWLP_USER); + if (infoPtr == NULL) + return FALSE; + } switch (Msg) { case WM_INITDIALOG: { + static const struct { + int ControlId; + UINT StringId; + } ToolTipAssociations[] = { + {IDC_BACK, HLP_BACKCOLORC}, + {IDC_FONT, HLP_FONTCOLORC}, + {ID_SHOWBUILDTIME, HLP_SBUILDTIME}, + {ID_USECCACHE, HLP_CCACHEUSED}, + {ID_STRIP, HLP_STRIPEDEXE}, + {ID_MGWDIR, HLP_FINDMGWDIR}, + {ID_BROWSEMGW, HLP_FINDMGWDIR}, + {ID_LOGDIR, HLP_FINDLOGDIR}, + {ID_BROWSE, HLP_FINDLOGDIR}, + {ID_SAVELOGS, HLP_FINDLOGDIR}, + {ID_OBJDIR, HLP_FINDOBJDIR}, + {ID_BROWSEOBJ, HLP_FINDOBJDIR}, + {ID_OTHEROBJ, HLP_FINDOBJDIR}, + {ID_OUTDIR, HLP_FINDOUTDIR}, + {ID_BROWSEOUT, HLP_FINDOUTDIR}, + {ID_OTHEROUT, HLP_FINDOUTDIR}, + {ID_OK, HLP_SAVEBUTTON}, + {ID_CANCEL, HLP_QUITBUTTON}, + }; + int i; LOGFONT lf; WCHAR TempColor[256]; - hIcon = LoadImage( hInstance, - MAKEINTRESOURCE(ID_OPTICON), - IMAGE_ICON, - GetSystemMetrics(SM_CXSMICON), - GetSystemMetrics(SM_CYSMICON), - 0); - if(hIcon) - SendMessage(Dlg, WM_SETICON, ICON_SMALL, (LPARAM)hIcon); + infoPtr = (POPTIONS_DLG)lParam; + infoPtr->hwndDlg = Dlg; + + SetWindowLongPtr(Dlg, DWLP_USER, (LONG_PTR)infoPtr); + + infoPtr->hwndToolTip = CreateWindowEx(0, + TOOLTIPS_CLASS, + NULL, + WS_POPUP | TTS_ALWAYSTIP, + CW_USEDEFAULT, + CW_USEDEFAULT, + CW_USEDEFAULT, + CW_USEDEFAULT, + infoPtr->hwndDlg, + NULL, + hInstance, + NULL); + + for (i = 0; i < sizeof(ToolTipAssociations) / sizeof(ToolTipAssociations[0]); i++) + AssociateToolWithControl(infoPtr, ToolTipAssociations[i].ControlId, ToolTipAssociations[i].StringId); + + infoPtr->hIcon = LoadImage( hInstance, + MAKEINTRESOURCE(ID_OPTICON), + IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), + 0); + if(infoPtr->hIcon) + SendMessage(Dlg, WM_SETICON, ICON_SMALL, (LPARAM)infoPtr->hIcon); GetObject(GetStockObject(ANSI_FIXED_FONT), sizeof(LOGFONT), &lf); lf.lfWeight = FW_BOLD; - hFont = CreateFont(lf.lfHeight, lf.lfWidth, lf.lfEscapement, lf.lfOrientation, lf.lfWeight, + infoPtr->hFont = CreateFont(lf.lfHeight, lf.lfWidth, lf.lfEscapement, lf.lfOrientation, lf.lfWeight, lf.lfItalic, lf.lfUnderline, lf.lfStrikeOut, lf.lfCharSet, lf.lfOutPrecision, lf.lfClipPrecision, lf.lfQuality, lf.lfPitchAndFamily, lf.lfFaceName); @@ -352,7 +399,7 @@ SendDlgItemMessageW(Dlg, IDC_BACK, CB_ADDSTRING, 0, (LPARAM) TempColor); SendDlgItemMessageW(Dlg, IDC_FONT, CB_ADDSTRING, 0, (LPARAM) TempColor); } - LoadSettings(Dlg, &Settings); + LoadSettings(infoPtr); return TRUE; } @@ -360,9 +407,7 @@ { if ((HIWORD(wParam) == CBN_SELCHANGE) && ((LOWORD(wParam) == IDC_FONT) || (LOWORD(wParam) == IDC_BACK))) { - RECT rcWnd; - GetClientRect(GetDlgItem(Dlg, ID_EXAMPLE), &rcWnd); - InvalidateRect(GetDlgItem(Dlg, ID_EXAMPLE), &rcWnd, FALSE); + InvalidateRect(GetDlgItem(Dlg, ID_EXAMPLE), NULL, FALSE); } else { @@ -370,7 +415,7 @@ { case ID_OK: { - if (!WriteSettings(Dlg)) + if (!WriteSettings(infoPtr)) break; } case ID_CANCEL: @@ -460,7 +505,7 @@ } } - SetSaveState(Dlg, &Settings); + SetSaveState(infoPtr); return FALSE; } @@ -468,14 +513,14 @@ { HFONT hFontOld; // note: do not change the order - it matches to previous order - COLORREF ColorsRGB[] = { 0x00000000, 0x00800000, 0x00008000, 0x00808000, 0x00000080, 0x00800080, + static const COLORREF ColorsRGB[] = { 0x00000000, 0x00800000, 0x00008000, 0x00808000, 0x00000080, 0x00800080, 0x00008080, 0x00c0c0c0, 0x00808080, 0x00ff0000, 0x0000ff00, 0x00ffff00, 0x000000ff, 0x00ff00ff, 0x0000ffff, 0x00ffffff }; if((HWND)lParam == GetDlgItem(Dlg, ID_EXAMPLE)) { - hFontOld = SelectObject((HDC)wParam, hFont); + hFontOld = SelectObject((HDC)wParam, infoPtr->hFont); SetTextColor((HDC)wParam, ColorsRGB[SendDlgItemMessageW(Dlg, IDC_FONT, CB_GETCURSEL, 0, 0)]); SetBkColor((HDC)wParam, ColorsRGB[SendDlgItemMessageW(Dlg, IDC_BACK, CB_GETCURSEL, 0, 0)]); return (LONG)CreateSolidBrush(ColorsRGB[SendDlgItemMessageW(Dlg, IDC_BACK, CB_GETCURSEL, 0, 0)]); @@ -483,16 +528,10 @@ break; } - case WM_SETCURSOR: - { - EnumChildWindows(Dlg, EnumChildProc, (LPARAM)wParam); - return FALSE; - } - case WM_DESTROY: { - if (hIcon) - DestroyIcon(hIcon); + if (infoPtr->hIcon) + DestroyIcon(infoPtr->hIcon); } case WM_CLOSE: @@ -507,8 +546,15 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR cmdline, int cmdshow) { + POPTIONS_DLG OptionsDlgInfo; hInstance = hInst; - DialogBox(hInst, MAKEINTRESOURCE(ID_DIALOG), 0, DlgProc); + OptionsDlgInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*OptionsDlgInfo)); + if (OptionsDlgInfo != NULL) + { + ZeroMemory(OptionsDlgInfo, sizeof(*OptionsDlgInfo)); + DialogBoxParam(hInst, MAKEINTRESOURCE(ID_DIALOG), 0, DlgProc, (LPARAM)OptionsDlgInfo); + HeapFree(GetProcessHeap(), 0, OptionsDlgInfo); + } return 0; }

1 0

[jimtabor] 31694: See http://msdn2.microsoft.com/en-us/library/aa293810(VS.60).aspx for details.
by jimtabor＠svn.reactos.org 10 Jan '08

10 Jan '08

Author: jimtabor Date: Thu Jan 10 09:34:37 2008 New Revision: 31694 URL: http://svn.reactos.org/svn/reactos?rev=31694&view=rev Log: See http://msdn2.microsoft.com/en-us/library/aa293810(VS.60).aspx for details. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Thu Jan 10 09:34:37 2008 @@ -3,6 +3,9 @@ #define __WIN32K_DC_H #include "driver.h" + +// Get/SetBounds/Rect support. +#define DCB_WINDOWMGR 0x8000 // Queries the Windows bounding rectangle instead of the application's /* DC flags */ #define DC_SAVED 0x0002 /* It is a saved DC */

1 0

[weiden] 31693: Add the ability to determine the cpu count based on the inherited process affinity mask (only for win32 hosts)
by weiden＠svn.reactos.org 10 Jan '08

10 Jan '08

Author: weiden Date: Thu Jan 10 08:18:53 2008 New Revision: 31693 URL: http://svn.reactos.org/svn/reactos?rev=31693&view=rev Log: Add the ability to determine the cpu count based on the inherited process affinity mask (only for win32 hosts) Modified: trunk/tools/RosBE/Tools/cpucount.c Modified: trunk/tools/RosBE/Tools/cpucount.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Tools/cpucount.c?rev=3… ============================================================================== --- trunk/tools/RosBE/Tools/cpucount.c (original) +++ trunk/tools/RosBE/Tools/cpucount.c Thu Jan 10 08:18:53 2008 @@ -24,17 +24,41 @@ { int cpuCount = 0; +#if defined(WIN32) + if(argc > 3) +#else if(argc > 2) +#endif { fprintf(stderr, "%s: Error too many parameters specified.\n", argv[0]); return -1; } #if defined(WIN32) - SYSTEM_INFO SystemInformation; + if (argc != 1 && !strncmp(argv[argc - 1], "-a", 2)) + { + DWORD_PTR ProcessAffinityMask, SystemAffinityMask; - GetSystemInfo(&SystemInformation); - cpuCount = SystemInformation.dwNumberOfProcessors; + if (GetProcessAffinityMask(GetCurrentProcess(), &ProcessAffinityMask, &SystemAffinityMask)) + { + while (ProcessAffinityMask != 0) + { + if (ProcessAffinityMask & 0x1) + cpuCount++; + + ProcessAffinityMask >>= 1; + } + } + + argc--; /* don't look at this argument again */ + } + else + { + SYSTEM_INFO SystemInformation; + + GetSystemInfo(&SystemInformation); + cpuCount = SystemInformation.dwNumberOfProcessors; + } #elif defined(__APPLE__) size_t countSize = sizeof(cpuCount); @@ -43,7 +67,7 @@ cpuCount = sysconf(_SC_NPROCESSORS_ONLN); #endif - if(argc != 1) + if (argc != 1) { if(!strncmp(argv[1], "-x1", 3)) { @@ -55,11 +79,18 @@ } else { - printf("Usage: %s [OPTIONS]\n", argv[0]); +#if defined(WIN32) + printf("Usage: %s [-x1|-x2] [-a]\n", argv[0]); +#else + printf("Usage: %s [-x1|-x2]\n", argv[0]); +#endif printf("Running cpucount without options returns the number of\n"); printf("processors in the system.\n"); printf("-x1 - Number of processors in the system, plus 1.\n"); printf("-x2 - Number of processors in the system, doubled.\n"); +#if defined(WIN32) + printf("-a - Use the affinity mask to determine number of processors\n"); +#endif return 0; } }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs