Ros-diffs December 2012

ros-diffs@reactos.org

12 participants
287 discussions

[ekohl] 57972: [NETAPI32] - Fork netapi32.dll because most of its exported functions are interfaces to services that wine will not implement. - Move user and group functions to separate files and a...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Dec 22 20:11:43 2012 New Revision: 57972 URL: http://svn.reactos.org/svn/reactos?rev=57972&view=rev Log: [NETAPI32] - Fork netapi32.dll because most of its exported functions are interfaces to services that wine will not implement. - Move user and group functions to separate files and add some stubs. - Update README.WINE. Added: trunk/reactos/dll/win32/netapi32/group.c (with props) trunk/reactos/dll/win32/netapi32/user.c (with props) Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt trunk/reactos/dll/win32/netapi32/access.c trunk/reactos/dll/win32/netapi32/netapi32.spec trunk/reactos/dll/win32/netapi32/wksta.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] Sat Dec 22 20:11:43 2012 @@ -9,6 +9,7 @@ apibuf.c browsr.c ds.c + group.c local_group.c nbcmdqueue.c nbnamecache.c @@ -16,6 +17,7 @@ netapi32.c netbios.c share.c + user.c wksta.c ${CMAKE_CURRENT_BINARY_DIR}/netapi32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/netapi32.def) Modified: trunk/reactos/dll/win32/netapi32/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/access.… ============================================================================== --- trunk/reactos/dll/win32/netapi32/access.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/access.c [iso-8859-1] Sat Dec 22 20:11:43 2012 @@ -37,447 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(netapi32); -/* NOTE: So far, this is implemented to support tests that require user logins, - * but not designed to handle real user databases. Those should probably - * be synced with either the host's user database or with Samba. - * - * FIXME: The user database should hold all the information the USER_INFO_4 struct - * needs, but for the first try, I will just implement the USER_INFO_1 fields. - */ - -struct sam_user -{ - struct list entry; - WCHAR user_name[LM20_UNLEN+1]; - WCHAR user_password[PWLEN + 1]; - DWORD sec_since_passwd_change; - DWORD user_priv; - LPWSTR home_dir; - LPWSTR user_comment; - DWORD user_flags; - LPWSTR user_logon_script_path; -}; - -static struct list user_list = LIST_INIT( user_list ); - BOOL NETAPI_IsLocalComputer(LPCWSTR ServerName); - -/************************************************************ - * NETAPI_ValidateServername - * - * Validates server name - */ -static NET_API_STATUS NETAPI_ValidateServername(LPCWSTR ServerName) -{ - if (ServerName) - { - if (ServerName[0] == 0) - return ERROR_BAD_NETPATH; - else if ( - ((ServerName[0] == '\\') && - (ServerName[1] != '\\')) - || - ((ServerName[0] == '\\') && - (ServerName[1] == '\\') && - (ServerName[2] == 0)) - ) - return ERROR_INVALID_NAME; - } - return NERR_Success; -} - -/************************************************************ - * NETAPI_FindUser - * - * Looks for a user in the user database. - * Returns a pointer to the entry in the user list when the user - * is found, NULL otherwise. - */ -static struct sam_user* NETAPI_FindUser(LPCWSTR UserName) -{ - struct sam_user *user; - - LIST_FOR_EACH_ENTRY(user, &user_list, struct sam_user, entry) - { - if(lstrcmpW(user->user_name, UserName) == 0) - return user; - } - return NULL; -} - -static BOOL NETAPI_IsCurrentUser(LPCWSTR username) -{ - LPWSTR curr_user = NULL; - DWORD dwSize; - BOOL ret = FALSE; - - dwSize = LM20_UNLEN+1; - curr_user = HeapAlloc(GetProcessHeap(), 0, dwSize * sizeof(WCHAR)); - if(!curr_user) - { - ERR("Failed to allocate memory for user name.\n"); - goto end; - } - if(!GetUserNameW(curr_user, &dwSize)) - { - ERR("Failed to get current user's user name.\n"); - goto end; - } - if (!lstrcmpW(curr_user, username)) - { - ret = TRUE; - } - -end: - HeapFree(GetProcessHeap(), 0, curr_user); - return ret; -} - -/************************************************************ - * NetUserAdd (NETAPI32.@) - */ -NET_API_STATUS WINAPI NetUserAdd(LPCWSTR servername, - DWORD level, LPBYTE bufptr, LPDWORD parm_err) -{ - NET_API_STATUS status; - struct sam_user * su = NULL; - - FIXME("(%s, %d, %p, %p) stub!\n", debugstr_w(servername), level, bufptr, parm_err); - - if((status = NETAPI_ValidateServername(servername)) != NERR_Success) - return status; - - switch(level) - { - /* Level 3 and 4 are identical for the purposes of NetUserAdd */ - case 4: - case 3: - FIXME("Level 3 and 4 not implemented.\n"); - /* Fall through */ - case 2: - FIXME("Level 2 not implemented.\n"); - /* Fall through */ - case 1: - { - PUSER_INFO_1 ui = (PUSER_INFO_1) bufptr; - su = HeapAlloc(GetProcessHeap(), 0, sizeof(struct sam_user)); - if(!su) - { - status = NERR_InternalError; - break; - } - - if(lstrlenW(ui->usri1_name) > LM20_UNLEN) - { - status = NERR_BadUsername; - break; - } - - /*FIXME: do other checks for a valid username */ - lstrcpyW(su->user_name, ui->usri1_name); - - if(lstrlenW(ui->usri1_password) > PWLEN) - { - /* Always return PasswordTooShort on invalid passwords. */ - status = NERR_PasswordTooShort; - break; - } - lstrcpyW(su->user_password, ui->usri1_password); - - su->sec_since_passwd_change = ui->usri1_password_age; - su->user_priv = ui->usri1_priv; - su->user_flags = ui->usri1_flags; - - /*FIXME: set the other LPWSTRs to NULL for now */ - su->home_dir = NULL; - su->user_comment = NULL; - su->user_logon_script_path = NULL; - - list_add_head(&user_list, &su->entry); - return NERR_Success; - } - default: - TRACE("Invalid level %d specified.\n", level); - status = ERROR_INVALID_LEVEL; - break; - } - - HeapFree(GetProcessHeap(), 0, su); - - return status; -} - -/************************************************************ - * NetUserDel (NETAPI32.@) - */ -NET_API_STATUS WINAPI NetUserDel(LPCWSTR servername, LPCWSTR username) -{ - NET_API_STATUS status; - struct sam_user *user; - - TRACE("(%s, %s)\n", debugstr_w(servername), debugstr_w(username)); - - if((status = NETAPI_ValidateServername(servername))!= NERR_Success) - return status; - - if ((user = NETAPI_FindUser(username)) == NULL) - return NERR_UserNotFound; - - list_remove(&user->entry); - - HeapFree(GetProcessHeap(), 0, user->home_dir); - HeapFree(GetProcessHeap(), 0, user->user_comment); - HeapFree(GetProcessHeap(), 0, user->user_logon_script_path); - HeapFree(GetProcessHeap(), 0, user); - - return NERR_Success; -} - -/************************************************************ - * NetUserGetInfo (NETAPI32.@) - */ -NET_API_STATUS WINAPI -NetUserGetInfo(LPCWSTR servername, LPCWSTR username, DWORD level, - LPBYTE* bufptr) -{ - NET_API_STATUS status; - TRACE("(%s, %s, %d, %p)\n", debugstr_w(servername), debugstr_w(username), - level, bufptr); - status = NETAPI_ValidateServername(servername); - if (status != NERR_Success) - return status; - - if(!NETAPI_IsLocalComputer(servername)) - { - FIXME("Only implemented for local computer, but remote server" - "%s was requested.\n", debugstr_w(servername)); - return NERR_InvalidComputer; - } - - if(!NETAPI_FindUser(username) && !NETAPI_IsCurrentUser(username)) - { - TRACE("User %s is unknown.\n", debugstr_w(username)); - return NERR_UserNotFound; - } - - switch (level) - { - case 0: - { - PUSER_INFO_0 ui; - int name_sz; - - name_sz = lstrlenW(username) + 1; - - /* set up buffer */ - NetApiBufferAllocate(sizeof(USER_INFO_0) + name_sz * sizeof(WCHAR), - (LPVOID *) bufptr); - - ui = (PUSER_INFO_0) *bufptr; - ui->usri0_name = (LPWSTR) (*bufptr + sizeof(USER_INFO_0)); - - /* get data */ - lstrcpyW(ui->usri0_name, username); - break; - } - - case 10: - { - PUSER_INFO_10 ui; - PUSER_INFO_0 ui0; - NET_API_STATUS status; - /* sizes of the field buffers in WCHARS */ - int name_sz, comment_sz, usr_comment_sz, full_name_sz; - - comment_sz = 1; - usr_comment_sz = 1; - full_name_sz = 1; - - /* get data */ - status = NetUserGetInfo(servername, username, 0, (LPBYTE *) &ui0); - if (status != NERR_Success) - { - NetApiBufferFree(ui0); - return status; - } - name_sz = lstrlenW(ui0->usri0_name) + 1; - - /* set up buffer */ - NetApiBufferAllocate(sizeof(USER_INFO_10) + - (name_sz + comment_sz + usr_comment_sz + - full_name_sz) * sizeof(WCHAR), - (LPVOID *) bufptr); - ui = (PUSER_INFO_10) *bufptr; - ui->usri10_name = (LPWSTR) (*bufptr + sizeof(USER_INFO_10)); - ui->usri10_comment = (LPWSTR) ( - ((PBYTE) ui->usri10_name) + name_sz * sizeof(WCHAR)); - ui->usri10_usr_comment = (LPWSTR) ( - ((PBYTE) ui->usri10_comment) + comment_sz * sizeof(WCHAR)); - ui->usri10_full_name = (LPWSTR) ( - ((PBYTE) ui->usri10_usr_comment) + usr_comment_sz * sizeof(WCHAR)); - - /* set data */ - lstrcpyW(ui->usri10_name, ui0->usri0_name); - NetApiBufferFree(ui0); - ui->usri10_comment[0] = 0; - ui->usri10_usr_comment[0] = 0; - ui->usri10_full_name[0] = 0; - break; - } - - case 1: - { - static const WCHAR homedirW[] = {'H','O','M','E',0}; - PUSER_INFO_1 ui; - PUSER_INFO_0 ui0; - NET_API_STATUS status; - /* sizes of the field buffers in WCHARS */ - int name_sz, password_sz, home_dir_sz, comment_sz, script_path_sz; - - password_sz = 1; /* not filled out for security reasons for NetUserGetInfo*/ - comment_sz = 1; - script_path_sz = 1; - - /* get data */ - status = NetUserGetInfo(servername, username, 0, (LPBYTE *) &ui0); - if (status != NERR_Success) - { - NetApiBufferFree(ui0); - return status; - } - name_sz = lstrlenW(ui0->usri0_name) + 1; - home_dir_sz = GetEnvironmentVariableW(homedirW, NULL,0); - /* set up buffer */ - NetApiBufferAllocate(sizeof(USER_INFO_1) + - (name_sz + password_sz + home_dir_sz + - comment_sz + script_path_sz) * sizeof(WCHAR), - (LPVOID *) bufptr); - - ui = (PUSER_INFO_1) *bufptr; - ui->usri1_name = (LPWSTR) (ui + 1); - ui->usri1_password = ui->usri1_name + name_sz; - ui->usri1_home_dir = ui->usri1_password + password_sz; - ui->usri1_comment = ui->usri1_home_dir + home_dir_sz; - ui->usri1_script_path = ui->usri1_comment + comment_sz; - /* set data */ - lstrcpyW(ui->usri1_name, ui0->usri0_name); - NetApiBufferFree(ui0); - ui->usri1_password[0] = 0; - ui->usri1_password_age = 0; - ui->usri1_priv = 0; - GetEnvironmentVariableW(homedirW, ui->usri1_home_dir,home_dir_sz); - ui->usri1_comment[0] = 0; - ui->usri1_flags = 0; - ui->usri1_script_path[0] = 0; - break; - } - case 2: - case 3: - case 4: - case 11: - case 20: - case 23: - case 1003: - case 1005: - case 1006: - case 1007: - case 1008: - case 1009: - case 1010: - case 1011: - case 1012: - case 1013: - case 1014: - case 1017: - case 1018: - case 1020: - case 1023: - case 1024: - case 1025: - case 1051: - case 1052: - case 1053: - { - FIXME("Level %d is not implemented\n", level); - return NERR_InternalError; - } - default: - TRACE("Invalid level %d is specified\n", level); - return ERROR_INVALID_LEVEL; - } - return NERR_Success; -} - -/************************************************************ - * NetUserGetLocalGroups (NETAPI32.@) - */ -NET_API_STATUS WINAPI -NetUserGetLocalGroups(LPCWSTR servername, LPCWSTR username, DWORD level, - DWORD flags, LPBYTE* bufptr, DWORD prefmaxlen, - LPDWORD entriesread, LPDWORD totalentries) -{ - NET_API_STATUS status; - const WCHAR admins[] = {'A','d','m','i','n','i','s','t','r','a','t','o','r','s',0}; - LPWSTR currentuser; - LOCALGROUP_USERS_INFO_0* info; - DWORD size; - - FIXME("(%s, %s, %d, %08x, %p %d, %p, %p) stub!\n", - debugstr_w(servername), debugstr_w(username), level, flags, bufptr, - prefmaxlen, entriesread, totalentries); - - status = NETAPI_ValidateServername(servername); - if (status != NERR_Success) - return status; - - size = UNLEN + 1; - NetApiBufferAllocate(size * sizeof(WCHAR), (LPVOID*)&currentuser); - GetUserNameW(currentuser, &size); - - if (lstrcmpiW(username, currentuser) && NETAPI_FindUser(username)) - { - NetApiBufferFree(currentuser); - return NERR_UserNotFound; - } - - NetApiBufferFree(currentuser); - *totalentries = 1; - size = sizeof(*info) + sizeof(admins); - - if(prefmaxlen < size) - status = ERROR_MORE_DATA; - else - status = NetApiBufferAllocate(size, (LPVOID*)&info); - - if(status != NERR_Success) - { - *bufptr = NULL; - *entriesread = 0; - return status; - } - - info->lgrui0_name = (LPWSTR)((LPBYTE)info + sizeof(*info)); - lstrcpyW(info->lgrui0_name, admins); - - *bufptr = (LPBYTE)info; - *entriesread = 1; - - return NERR_Success; -} - -/************************************************************ - * NetUserEnum (NETAPI32.@) - */ -NET_API_STATUS WINAPI -NetUserEnum(LPCWSTR servername, DWORD level, DWORD filter, LPBYTE* bufptr, - DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries, - LPDWORD resume_handle) -{ - FIXME("(%s,%d, 0x%d,%p,%d,%p,%p,%p) stub!\n", debugstr_w(servername), level, - filter, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); - - return ERROR_ACCESS_DENIED; -} /************************************************************ * ACCESS_QueryAdminDisplayInformation @@ -716,29 +276,6 @@ FIXME("(%s, %s, %p) stub!\n", debugstr_w(servername), debugstr_w(domainname), bufptr); return NERR_DCNotFound; /* say we can't find a domain controller */ -} - -/************************************************************ - * NetGroupEnum (NETAPI32.@) - * - */ -NET_API_STATUS WINAPI -NetGroupEnum(LPCWSTR servername, DWORD level, LPBYTE *bufptr, DWORD prefmaxlen, - LPDWORD entriesread, LPDWORD totalentries, LPDWORD resume_handle) -{ - FIXME("(%s, %d, %p, %d, %p, %p, %p) stub!\n", debugstr_w(servername), - level, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); - return ERROR_ACCESS_DENIED; -} - -/************************************************************ - * NetGroupGetInfo (NETAPI32.@) - * - */ -NET_API_STATUS WINAPI NetGroupGetInfo(LPCWSTR servername, LPCWSTR groupname, DWORD level, LPBYTE *bufptr) -{ - FIXME("(%s, %s, %d, %p) stub!\n", debugstr_w(servername), debugstr_w(groupname), level, bufptr); - return ERROR_ACCESS_DENIED; } /****************************************************************************** @@ -866,45 +403,6 @@ return NERR_Success; } -/****************************************************************************** - * NetUserChangePassword (NETAPI32.@) - * PARAMS - * domainname [I] Optional. Domain on which the user resides or the logon - * domain of the current user if NULL. - * username [I] Optional. Username to change the password for or the name - * of the current user if NULL. - * oldpassword [I] The user's current password. - * newpassword [I] The password that the user will be changed to using. - * - * RETURNS - * Success: NERR_Success. - * Failure: NERR_* failure code or win error code. - * - */ -NET_API_STATUS WINAPI NetUserChangePassword(LPCWSTR domainname, LPCWSTR username, - LPCWSTR oldpassword, LPCWSTR newpassword) -{ - struct sam_user *user; - - TRACE("(%s, %s, ..., ...)\n", debugstr_w(domainname), debugstr_w(username)); - - if(domainname) - FIXME("Ignoring domainname %s.\n", debugstr_w(domainname)); - - if((user = NETAPI_FindUser(username)) == NULL) - return NERR_UserNotFound; - - if(lstrcmpW(user->user_password, oldpassword) != 0) - return ERROR_INVALID_PASSWORD; - - if(lstrlenW(newpassword) > PWLEN) - return ERROR_PASSWORD_RESTRICTION; - - lstrcpyW(user->user_password, newpassword); - - return NERR_Success; -} - NET_API_STATUS WINAPI NetUseAdd(LMSTR servername, DWORD level, LPBYTE bufptr, LPDWORD parm_err) { FIXME("%s %d %p %p stub\n", debugstr_w(servername), level, bufptr, parm_err); Added: trunk/reactos/dll/win32/netapi32/group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/group.c… ============================================================================== --- trunk/reactos/dll/win32/netapi32/group.c (added) +++ trunk/reactos/dll/win32/netapi32/group.c [iso-8859-1] Sat Dec 22 20:11:43 2012 @@ -1,0 +1,85 @@ +/* + * Copyright 2002 Andriy Palamarchuk + * + * netapi32 access functions + * + * 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 <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "lmcons.h" +#include "lmaccess.h" +#include "lmapibuf.h" +#include "lmerr.h" +#include "lmuse.h" +#include "ntsecapi.h" +#include "wine/debug.h" +#include "wine/unicode.h" +#include "wine/list.h" + +WINE_DEFAULT_DEBUG_CHANNEL(netapi32); + +/* +@ stub NetGroupAdd +@ stub NetGroupAddUser +@ stub NetGroupDel +@ stub NetGroupDelUser +*/ + +/************************************************************ + * NetGroupEnum (NETAPI32.@) + * + */ +NET_API_STATUS +WINAPI +NetGroupEnum(LPCWSTR servername, + DWORD level, + LPBYTE *bufptr, + DWORD prefmaxlen, + LPDWORD entriesread, + LPDWORD totalentries, + LPDWORD resume_handle) +{ + FIXME("(%s, %d, %p, %d, %p, %p, %p) stub!\n", debugstr_w(servername), + level, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); + return ERROR_ACCESS_DENIED; +} + +/************************************************************ + * NetGroupGetInfo (NETAPI32.@) + * + */ +NET_API_STATUS +WINAPI +NetGroupGetInfo(LPCWSTR servername, + LPCWSTR groupname, + DWORD level, + LPBYTE *bufptr) +{ + FIXME("(%s, %s, %d, %p) stub!\n", debugstr_w(servername), debugstr_w(groupname), level, bufptr); + return ERROR_ACCESS_DENIED; +} + +/* +@ stub NetGroupGetUsers +@ stub NetGroupSetInfo +@ stub NetGroupSetUsers +*/ Propchange: trunk/reactos/dll/win32/netapi32/group.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/netapi32/group.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] Sat Dec 22 20:11:43 2012 @@ -210,8 +210,8 @@ @ stdcall NetUserGetLocalGroups(wstr wstr long long ptr long ptr ptr) @ stdcall NetUserModalsGet(wstr long ptr) @ stub NetUserModalsSet -@ stub NetUserSetGroups -@ stub NetUserSetInfo +@ stdcall NetUserSetGroups(wstr wstr long ptr long) +@ stdcall NetUserSetInfo(wstr wstr long ptr ptr) @ stdcall NetWkstaGetInfo(wstr long ptr) @ stub NetWkstaSetInfo @ stub NetWkstaTransportAdd Added: trunk/reactos/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/user.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/user.c (added) +++ trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] Sat Dec 22 20:11:43 2012 @@ -1,0 +1,612 @@ +/* + * Copyright 2002 Andriy Palamarchuk + * + * netapi32 user functions + * + * 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 <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "lmcons.h" +#include "lmaccess.h" +#include "lmapibuf.h" +#include "lmerr.h" +#include "lmuse.h" +#include "ntsecapi.h" +#include "wine/debug.h" +#include "wine/unicode.h" +#include "wine/list.h" + +WINE_DEFAULT_DEBUG_CHANNEL(netapi32); + +/* NOTE: So far, this is implemented to support tests that require user logins, + * but not designed to handle real user databases. Those should probably + * be synced with either the host's user database or with Samba. + * + * FIXME: The user database should hold all the information the USER_INFO_4 struct + * needs, but for the first try, I will just implement the USER_INFO_1 fields. + */ + +struct sam_user +{ + struct list entry; + WCHAR user_name[LM20_UNLEN+1]; + WCHAR user_password[PWLEN + 1]; + DWORD sec_since_passwd_change; + DWORD user_priv; + LPWSTR home_dir; + LPWSTR user_comment; + DWORD user_flags; + LPWSTR user_logon_script_path; +}; + +static struct list user_list = LIST_INIT( user_list ); + +BOOL NETAPI_IsLocalComputer(LPCWSTR ServerName); + +/************************************************************ + * NETAPI_ValidateServername + * + * Validates server name + */ +static NET_API_STATUS NETAPI_ValidateServername(LPCWSTR ServerName) +{ + if (ServerName) + { + if (ServerName[0] == 0) + return ERROR_BAD_NETPATH; + else if ( + ((ServerName[0] == '\\') && + (ServerName[1] != '\\')) + || + ((ServerName[0] == '\\') && + (ServerName[1] == '\\') && + (ServerName[2] == 0)) + ) + return ERROR_INVALID_NAME; + } + return NERR_Success; +} + +/************************************************************ + * NETAPI_FindUser + * + * Looks for a user in the user database. + * Returns a pointer to the entry in the user list when the user + * is found, NULL otherwise. + */ +static struct sam_user* NETAPI_FindUser(LPCWSTR UserName) +{ + struct sam_user *user; + + LIST_FOR_EACH_ENTRY(user, &user_list, struct sam_user, entry) + { + if(lstrcmpW(user->user_name, UserName) == 0) + return user; + } + return NULL; +} + +static BOOL NETAPI_IsCurrentUser(LPCWSTR username) +{ + LPWSTR curr_user = NULL; + DWORD dwSize; + BOOL ret = FALSE; + + dwSize = LM20_UNLEN+1; + curr_user = HeapAlloc(GetProcessHeap(), 0, dwSize * sizeof(WCHAR)); + if(!curr_user) + { + ERR("Failed to allocate memory for user name.\n"); + goto end; + } + if(!GetUserNameW(curr_user, &dwSize)) + { + ERR("Failed to get current user's user name.\n"); + goto end; + } + if (!lstrcmpW(curr_user, username)) + { + ret = TRUE; + } + +end: + HeapFree(GetProcessHeap(), 0, curr_user); + return ret; +} + +/************************************************************ + * NetUserAdd (NETAPI32.@) + */ +NET_API_STATUS +WINAPI +NetUserAdd(LPCWSTR servername, + DWORD level, + LPBYTE bufptr, + LPDWORD parm_err) +{ + NET_API_STATUS status; + struct sam_user * su = NULL; + + FIXME("(%s, %d, %p, %p) stub!\n", debugstr_w(servername), level, bufptr, parm_err); + + if((status = NETAPI_ValidateServername(servername)) != NERR_Success) + return status; + + switch(level) + { + /* Level 3 and 4 are identical for the purposes of NetUserAdd */ + case 4: + case 3: + FIXME("Level 3 and 4 not implemented.\n"); + /* Fall through */ + case 2: + FIXME("Level 2 not implemented.\n"); + /* Fall through */ + case 1: + { + PUSER_INFO_1 ui = (PUSER_INFO_1) bufptr; + su = HeapAlloc(GetProcessHeap(), 0, sizeof(struct sam_user)); + if(!su) + { + status = NERR_InternalError; + break; + } + + if(lstrlenW(ui->usri1_name) > LM20_UNLEN) + { + status = NERR_BadUsername; + break; + } + + /*FIXME: do other checks for a valid username */ + lstrcpyW(su->user_name, ui->usri1_name); + + if(lstrlenW(ui->usri1_password) > PWLEN) + { + /* Always return PasswordTooShort on invalid passwords. */ + status = NERR_PasswordTooShort; + break; + } + lstrcpyW(su->user_password, ui->usri1_password); + + su->sec_since_passwd_change = ui->usri1_password_age; + su->user_priv = ui->usri1_priv; + su->user_flags = ui->usri1_flags; + + /*FIXME: set the other LPWSTRs to NULL for now */ + su->home_dir = NULL; + su->user_comment = NULL; + su->user_logon_script_path = NULL; + + list_add_head(&user_list, &su->entry); + return NERR_Success; + } + default: + TRACE("Invalid level %d specified.\n", level); + status = ERROR_INVALID_LEVEL; + break; + } + + HeapFree(GetProcessHeap(), 0, su); + + return status; +} + + +/****************************************************************************** + * NetUserChangePassword (NETAPI32.@) + * PARAMS + * domainname [I] Optional. Domain on which the user resides or the logon + * domain of the current user if NULL. + * username [I] Optional. Username to change the password for or the name + * of the current user if NULL. + * oldpassword [I] The user's current password. + * newpassword [I] The password that the user will be changed to using. + * + * RETURNS + * Success: NERR_Success. + * Failure: NERR_* failure code or win error code. + * + */ +NET_API_STATUS +WINAPI +NetUserChangePassword(LPCWSTR domainname, + LPCWSTR username, + LPCWSTR oldpassword, + LPCWSTR newpassword) +{ + struct sam_user *user; + + TRACE("(%s, %s, ..., ...)\n", debugstr_w(domainname), debugstr_w(username)); + + if(domainname) + FIXME("Ignoring domainname %s.\n", debugstr_w(domainname)); + + if((user = NETAPI_FindUser(username)) == NULL) + return NERR_UserNotFound; + + if(lstrcmpW(user->user_password, oldpassword) != 0) + return ERROR_INVALID_PASSWORD; + + if(lstrlenW(newpassword) > PWLEN) + return ERROR_PASSWORD_RESTRICTION; + + lstrcpyW(user->user_password, newpassword); + + return NERR_Success; +} + + +/************************************************************ + * NetUserDel (NETAPI32.@) + */ +NET_API_STATUS +WINAPI +NetUserDel(LPCWSTR servername, + LPCWSTR username) +{ + NET_API_STATUS status; + struct sam_user *user; + + TRACE("(%s, %s)\n", debugstr_w(servername), debugstr_w(username)); + + if((status = NETAPI_ValidateServername(servername))!= NERR_Success) + return status; + + if ((user = NETAPI_FindUser(username)) == NULL) + return NERR_UserNotFound; + + list_remove(&user->entry); + + HeapFree(GetProcessHeap(), 0, user->home_dir); + HeapFree(GetProcessHeap(), 0, user->user_comment); + HeapFree(GetProcessHeap(), 0, user->user_logon_script_path); + HeapFree(GetProcessHeap(), 0, user); + + return NERR_Success; +} + + +/************************************************************ + * NetUserEnum (NETAPI32.@) + */ +NET_API_STATUS +WINAPI +NetUserEnum(LPCWSTR servername, + DWORD level, + DWORD filter, + LPBYTE* bufptr, + DWORD prefmaxlen, + LPDWORD entriesread, + LPDWORD totalentries, + LPDWORD resume_handle) +{ + FIXME("(%s,%d, 0x%d,%p,%d,%p,%p,%p) stub!\n", debugstr_w(servername), level, + filter, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); + + return ERROR_ACCESS_DENIED; +} + + +/************************************************************ + * NetUserGetGroups (NETAPI32.@) + */ +NET_API_STATUS +WINAPI +NetUserGetGroups(LPCWSTR servername, + LPCWSTR username, + DWORD level, + LPBYTE *bufptr, + DWORD prefixmaxlen, + LPDWORD entriesread, + LPDWORD totalentries) +{ + FIXME("%s %s %d %p %d %p %p stub\n", debugstr_w(servername), + debugstr_w(username), level, bufptr, prefixmaxlen, entriesread, + totalentries); + + *bufptr = NULL; + *entriesread = 0; + *totalentries = 0; + + return ERROR_INVALID_LEVEL; +} + + +/************************************************************ + * NetUserGetInfo (NETAPI32.@) + */ +NET_API_STATUS +WINAPI +NetUserGetInfo(LPCWSTR servername, + LPCWSTR username, + DWORD level, + LPBYTE* bufptr) +{ + NET_API_STATUS status; + TRACE("(%s, %s, %d, %p)\n", debugstr_w(servername), debugstr_w(username), + level, bufptr); + status = NETAPI_ValidateServername(servername); + if (status != NERR_Success) + return status; + + if(!NETAPI_IsLocalComputer(servername)) + { + FIXME("Only implemented for local computer, but remote server" + "%s was requested.\n", debugstr_w(servername)); + return NERR_InvalidComputer; + } + + if(!NETAPI_FindUser(username) && !NETAPI_IsCurrentUser(username)) + { + TRACE("User %s is unknown.\n", debugstr_w(username)); + return NERR_UserNotFound; + } + + switch (level) + { + case 0: + { + PUSER_INFO_0 ui; + int name_sz; + + name_sz = lstrlenW(username) + 1; + + /* set up buffer */ + NetApiBufferAllocate(sizeof(USER_INFO_0) + name_sz * sizeof(WCHAR), + (LPVOID *) bufptr); + + ui = (PUSER_INFO_0) *bufptr; + ui->usri0_name = (LPWSTR) (*bufptr + sizeof(USER_INFO_0)); + + /* get data */ + lstrcpyW(ui->usri0_name, username); + break; + } + + case 10: + { + PUSER_INFO_10 ui; + PUSER_INFO_0 ui0; + NET_API_STATUS status; + /* sizes of the field buffers in WCHARS */ + int name_sz, comment_sz, usr_comment_sz, full_name_sz; + + comment_sz = 1; + usr_comment_sz = 1; + full_name_sz = 1; + + /* get data */ + status = NetUserGetInfo(servername, username, 0, (LPBYTE *) &ui0); + if (status != NERR_Success) + { + NetApiBufferFree(ui0); + return status; + } + name_sz = lstrlenW(ui0->usri0_name) + 1; + + /* set up buffer */ + NetApiBufferAllocate(sizeof(USER_INFO_10) + + (name_sz + comment_sz + usr_comment_sz + + full_name_sz) * sizeof(WCHAR), + (LPVOID *) bufptr); + ui = (PUSER_INFO_10) *bufptr; + ui->usri10_name = (LPWSTR) (*bufptr + sizeof(USER_INFO_10)); + ui->usri10_comment = (LPWSTR) ( + ((PBYTE) ui->usri10_name) + name_sz * sizeof(WCHAR)); + ui->usri10_usr_comment = (LPWSTR) ( + ((PBYTE) ui->usri10_comment) + comment_sz * sizeof(WCHAR)); + ui->usri10_full_name = (LPWSTR) ( + ((PBYTE) ui->usri10_usr_comment) + usr_comment_sz * sizeof(WCHAR)); + + /* set data */ + lstrcpyW(ui->usri10_name, ui0->usri0_name); + NetApiBufferFree(ui0); + ui->usri10_comment[0] = 0; + ui->usri10_usr_comment[0] = 0; + ui->usri10_full_name[0] = 0; + break; + } + + case 1: + { + static const WCHAR homedirW[] = {'H','O','M','E',0}; + PUSER_INFO_1 ui; + PUSER_INFO_0 ui0; + NET_API_STATUS status; + /* sizes of the field buffers in WCHARS */ + int name_sz, password_sz, home_dir_sz, comment_sz, script_path_sz; + + password_sz = 1; /* not filled out for security reasons for NetUserGetInfo*/ + comment_sz = 1; + script_path_sz = 1; + + /* get data */ + status = NetUserGetInfo(servername, username, 0, (LPBYTE *) &ui0); + if (status != NERR_Success) + { + NetApiBufferFree(ui0); + return status; + } + name_sz = lstrlenW(ui0->usri0_name) + 1; + home_dir_sz = GetEnvironmentVariableW(homedirW, NULL,0); + /* set up buffer */ + NetApiBufferAllocate(sizeof(USER_INFO_1) + + (name_sz + password_sz + home_dir_sz + + comment_sz + script_path_sz) * sizeof(WCHAR), + (LPVOID *) bufptr); + + ui = (PUSER_INFO_1) *bufptr; + ui->usri1_name = (LPWSTR) (ui + 1); + ui->usri1_password = ui->usri1_name + name_sz; + ui->usri1_home_dir = ui->usri1_password + password_sz; + ui->usri1_comment = ui->usri1_home_dir + home_dir_sz; + ui->usri1_script_path = ui->usri1_comment + comment_sz; + /* set data */ + lstrcpyW(ui->usri1_name, ui0->usri0_name); + NetApiBufferFree(ui0); + ui->usri1_password[0] = 0; + ui->usri1_password_age = 0; + ui->usri1_priv = 0; + GetEnvironmentVariableW(homedirW, ui->usri1_home_dir,home_dir_sz); + ui->usri1_comment[0] = 0; + ui->usri1_flags = 0; + ui->usri1_script_path[0] = 0; + break; + } + case 2: + case 3: + case 4: + case 11: + case 20: + case 23: + case 1003: + case 1005: + case 1006: + case 1007: + case 1008: + case 1009: + case 1010: + case 1011: + case 1012: + case 1013: + case 1014: + case 1017: + case 1018: + case 1020: + case 1023: + case 1024: + case 1025: + case 1051: + case 1052: + case 1053: + { + FIXME("Level %d is not implemented\n", level); + return NERR_InternalError; + } + default: + TRACE("Invalid level %d is specified\n", level); + return ERROR_INVALID_LEVEL; + } + return NERR_Success; +} + + +/************************************************************ + * NetUserGetLocalGroups (NETAPI32.@) + */ +NET_API_STATUS +WINAPI +NetUserGetLocalGroups(LPCWSTR servername, + LPCWSTR username, + DWORD level, + DWORD flags, + LPBYTE* bufptr, + DWORD prefmaxlen, + LPDWORD entriesread, + LPDWORD totalentries) +{ + NET_API_STATUS status; + const WCHAR admins[] = {'A','d','m','i','n','i','s','t','r','a','t','o','r','s',0}; + LPWSTR currentuser; + LOCALGROUP_USERS_INFO_0* info; + DWORD size; + + FIXME("(%s, %s, %d, %08x, %p %d, %p, %p) stub!\n", + debugstr_w(servername), debugstr_w(username), level, flags, bufptr, + prefmaxlen, entriesread, totalentries); + + status = NETAPI_ValidateServername(servername); + if (status != NERR_Success) + return status; + + size = UNLEN + 1; + NetApiBufferAllocate(size * sizeof(WCHAR), (LPVOID*)&currentuser); + GetUserNameW(currentuser, &size); + + if (lstrcmpiW(username, currentuser) && NETAPI_FindUser(username)) + { + NetApiBufferFree(currentuser); + return NERR_UserNotFound; + } + + NetApiBufferFree(currentuser); + *totalentries = 1; + size = sizeof(*info) + sizeof(admins); + + if(prefmaxlen < size) + status = ERROR_MORE_DATA; + else + status = NetApiBufferAllocate(size, (LPVOID*)&info); + + if(status != NERR_Success) + { + *bufptr = NULL; + *entriesread = 0; + return status; + } + + info->lgrui0_name = (LPWSTR)((LPBYTE)info + sizeof(*info)); + lstrcpyW(info->lgrui0_name, admins); + + *bufptr = (LPBYTE)info; + *entriesread = 1; + + return NERR_Success; +} + + +/****************************************************************************** + * NetUserSetGroups (NETAPI32.@) + */ +NET_API_STATUS +WINAPI +NetUserSetGroups(LPCWSTR servername, + LPCWSTR username, + DWORD level, + LPBYTE buf, + DWORD num_entries) +{ + FIXME("(%s %s %lu %p %lu)\n", + debugstr_w(servername), debugstr_w(username), level, buf, num_entries); + return ERROR_ACCESS_DENIED; +} + + + +/****************************************************************************** + * NetUserSetInfo (NETAPI32.@) + */ +NET_API_STATUS +WINAPI +NetUserSetInfo(LPCWSTR servername, + LPCWSTR username, + DWORD level, + LPBYTE buf, + LPDWORD parm_err) +{ + FIXME("(%s %s %lu %p %p)\n", + debugstr_w(servername), debugstr_w(username), level, buf, parm_err); + return ERROR_ACCESS_DENIED; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/netapi32/user.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/netapi32/user.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/dll/win32/netapi32/wksta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/wksta.c… ============================================================================== --- trunk/reactos/dll/win32/netapi32/wksta.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/wksta.c [iso-8859-1] Sat Dec 22 20:11:43 2012 @@ -592,25 +592,3 @@ return NERR_Success; } -/************************************************************ - * NetUserGetGroups (NETAPI32.@) - */ -NET_API_STATUS NET_API_FUNCTION NetUserGetGroups( - LPCWSTR servername, - LPCWSTR username, - DWORD level, - LPBYTE *bufptr, - DWORD prefixmaxlen, - LPDWORD entriesread, - LPDWORD totalentries) -{ - FIXME("%s %s %d %p %d %p %p stub\n", debugstr_w(servername), - debugstr_w(username), level, bufptr, prefixmaxlen, entriesread, - totalentries); - - *bufptr = NULL; - *entriesread = 0; - *totalentries = 0; - - return ERROR_INVALID_LEVEL; -} 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 [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Dec 22 20:11:43 2012 @@ -124,7 +124,7 @@ reactos/dll/win32/msxml4 # Synced to Wine-1.5.19 reactos/dll/win32/msxml6 # Synced to Wine-1.5.19 reactos/dll/win32/nddeapi # Synced to Wine-1.5.19 -reactos/dll/win32/netapi32 # Autosync +reactos/dll/win32/netapi32 # Forked at Wine-1.3.34 reactos/dll/win32/ntdsapi # Synced to Wine-1.5.19 reactos/dll/win32/ntprint # Synced to Wine-1.5.4 reactos/dll/win32/objsel # Synced to Wine-1.5.19

11 years, 9 months

[tkreuzer] 57971: [WIN32K] - Move some files to more appropriate locations - Remove an empty file

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Dec 22 17:58:53 2012 New Revision: 57971 URL: http://svn.reactos.org/svn/reactos?rev=57971&view=rev Log: [WIN32K] - Move some files to more appropriate locations - Remove an empty file Added: trunk/reactos/win32ss/gdi/eng/math.c - copied unchanged from r57947, trunk/reactos/win32ss/user/ntuser/misc/math.c trunk/reactos/win32ss/user/ntuser/usrheap.c - copied unchanged from r57947, trunk/reactos/win32ss/user/ntuser/misc/usrheap.c Removed: trunk/reactos/win32ss/user/ntuser/misc/driver.c trunk/reactos/win32ss/user/ntuser/misc/math.c trunk/reactos/win32ss/user/ntuser/misc/usrheap.c Modified: trunk/reactos/win32ss/CMakeLists.txt Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Sat Dec 22 17:58:53 2012 @@ -70,6 +70,7 @@ gdi/eng/lineto.c gdi/eng/ldevobj.c gdi/eng/mapping.c + gdi/eng/math.c gdi/eng/mem.c gdi/eng/engmisc.c gdi/eng/mouse.c @@ -87,11 +88,9 @@ gdi/eng/xlateobj.c user/ntuser/main.c user/ntuser/misc/file.c - user/ntuser/misc/math.c user/ntuser/misc/rtlstr.c user/ntuser/misc/copy.c user/ntuser/misc/registry.c - user/ntuser/misc/usrheap.c reactx/ntddraw/ddraw.c reactx/ntddraw/dd.c reactx/ntddraw/ddsurf.c @@ -135,6 +134,7 @@ user/ntuser/sysparams.c user/ntuser/timer.c user/ntuser/useratom.c + user/ntuser/usrheap.c user/ntuser/vis.c user/ntuser/windc.c user/ntuser/window.c Removed: trunk/reactos/win32ss/user/ntuser/misc/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/misc/driver.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/misc/driver.c (removed) @@ -1,1 +1,0 @@ - Removed: trunk/reactos/win32ss/user/ntuser/misc/math.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/misc/m… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/misc/math.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/misc/math.c (removed) @@ -1,73 +1,0 @@ -/* Math functions for i387. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by John C. Bowman <bowman(a)ipp-garching.mpg.de>, 1995. - - The GNU C 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. - - The GNU C 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 the GNU C Library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include <win32k.h> - -/* - * FIXME: Is there a better algorithm, like FT_MulDiv? - * - * @implemented - */ -INT APIENTRY EngMulDiv( - INT nMultiplicand, - INT nMultiplier, - INT nDivisor) -{ -#if SIZEOF_LONG_LONG >= 8 - long long ret; - - if (!nDivisor) return -1; - - /* We want to deal with a positive divisor to simplify the logic. */ - if (nDivisor < 0) - { - nMultiplicand = - nMultiplicand; - nDivisor = -nDivisor; - } - - /* If the result is positive, we "add" to round. else, we subtract to round. */ - if ( ( (nMultiplicand < 0) && (nMultiplier < 0) ) || - ( (nMultiplicand >= 0) && (nMultiplier >= 0) ) ) - ret = (((long long)nMultiplicand * nMultiplier) + (nDivisor/2)) / nDivisor; - else - ret = (((long long)nMultiplicand * nMultiplier) - (nDivisor/2)) / nDivisor; - - if ((ret > 2147483647) || (ret < -2147483647)) return -1; - return ret; -#else - if (!nDivisor) return -1; - - /* We want to deal with a positive divisor to simplify the logic. */ - if (nDivisor < 0) - { - nMultiplicand = - nMultiplicand; - nDivisor = -nDivisor; - } - - /* If the result is positive, we "add" to round. else, we subtract to round. */ - if ( ( (nMultiplicand < 0) && (nMultiplier < 0) ) || - ( (nMultiplicand >= 0) && (nMultiplier >= 0) ) ) - return ((nMultiplicand * nMultiplier) + (nDivisor/2)) / nDivisor; - - return ((nMultiplicand * nMultiplier) - (nDivisor/2)) / nDivisor; - -#endif -} Removed: trunk/reactos/win32ss/user/ntuser/misc/usrheap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/misc/u… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/misc/usrheap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/misc/usrheap.c (removed) @@ -1,227 +1,0 @@ -/* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include <win32k.h> - -#define NDEBUG -#include <debug.h> - - -_Function_class_(RTL_HEAP_COMMIT_ROUTINE) -_IRQL_requires_same_ -static -NTSTATUS -NTAPI -IntUserHeapCommitRoutine( - _In_ PVOID Base, - _Inout_ PVOID *CommitAddress, - _Inout_ PSIZE_T CommitSize) -{ - PPROCESSINFO W32Process; - PW32HEAP_USER_MAPPING Mapping; - PVOID UserBase = NULL; - NTSTATUS Status; - SIZE_T Delta; - PVOID UserCommitAddress; - - W32Process = PsGetCurrentProcessWin32Process(); - - if (W32Process != NULL) - { - /* Search for the mapping */ - Mapping = &W32Process->HeapMappings; - while (Mapping != NULL) - { - if (Mapping->KernelMapping == Base) - { - UserBase = Mapping->UserMapping; - break; - } - - Mapping = Mapping->Next; - } - - ASSERT(UserBase != NULL); - } - else - { - SIZE_T ViewSize = 0; - LARGE_INTEGER Offset; - extern PSECTION_OBJECT GlobalUserHeapSection; - - /* HACK: This needs to be handled during startup only... */ - ASSERT(Base == (PVOID)GlobalUserHeap); - - /* Temporarily map it into user space */ - Offset.QuadPart = 0; - Status = MmMapViewOfSection(GlobalUserHeapSection, - PsGetCurrentProcess(), - &UserBase, - 0, - 0, - &Offset, - &ViewSize, - ViewUnmap, - SEC_NO_CHANGE, - PAGE_EXECUTE_READ); /* Would prefer PAGE_READONLY, but thanks to RTL heaps... */ - - if (!NT_SUCCESS(Status)) - return Status; - } - - /* Apply the commit address offset to the user base address */ - Delta = (SIZE_T) ((ULONG_PTR) (*CommitAddress) - (ULONG_PTR) (Base)); - UserCommitAddress = (PVOID) ((ULONG_PTR) (UserBase) + Delta); - - /* Perform the actual commit */ - Status = ZwAllocateVirtualMemory(NtCurrentProcess(), - &UserCommitAddress, - 0, - CommitSize, - MEM_COMMIT, - PAGE_EXECUTE_READ); - - if (NT_SUCCESS(Status)) - { - /* Determine the address to return */ - Delta = (SIZE_T) ((ULONG_PTR) (UserCommitAddress) - (ULONG_PTR) (UserBase)); - *CommitAddress = (PVOID) ((ULONG_PTR) (Base) + Delta); - } - - if (W32Process == NULL) - { - MmUnmapViewOfSection(PsGetCurrentProcess(), - UserBase); - } - - return Status; -} - -static PWIN32HEAP -IntUserHeapCreate(IN PSECTION_OBJECT SectionObject, - IN PVOID *SystemMappedBase, - IN ULONG HeapSize) -{ - PVOID MappedView = NULL; - LARGE_INTEGER Offset; - SIZE_T ViewSize = PAGE_SIZE; - RTL_HEAP_PARAMETERS Parameters = {0}; - PVOID pHeap; - NTSTATUS Status; - - Offset.QuadPart = 0; - - /* Commit the first page before creating the heap! */ - Status = MmMapViewOfSection(SectionObject, - PsGetCurrentProcess(), - &MappedView, - 0, - 0, - &Offset, - &ViewSize, - ViewUnmap, - SEC_NO_CHANGE, - PAGE_EXECUTE_READ); /* Would prefer PAGE_READONLY, but thanks to RTL heaps... */ - if (!NT_SUCCESS(Status)) - return NULL; - - Status = ZwAllocateVirtualMemory(NtCurrentProcess(), - &MappedView, - 0, - &ViewSize, - MEM_COMMIT, - PAGE_EXECUTE_READ); /* Would prefer PAGE_READONLY, but thanks to RTL heaps... */ - - MmUnmapViewOfSection(PsGetCurrentProcess(), - MappedView); - - if (!NT_SUCCESS(Status)) - return NULL; - - /* Create the heap, don't serialize in kmode! The caller is responsible - to synchronize the heap! */ - Parameters.Length = sizeof(Parameters); - Parameters.InitialCommit = ViewSize; - Parameters.InitialReserve = (SIZE_T)HeapSize; - Parameters.CommitRoutine = IntUserHeapCommitRoutine; - - pHeap = RtlCreateHeap(HEAP_ZERO_MEMORY | HEAP_NO_SERIALIZE, - *SystemMappedBase, - (SIZE_T)HeapSize, - ViewSize, - NULL, - &Parameters); - - return pHeap; -} - -PWIN32HEAP -UserCreateHeap(OUT PSECTION_OBJECT *SectionObject, - IN OUT PVOID *SystemBase, - IN SIZE_T HeapSize) -{ - LARGE_INTEGER SizeHeap; - PWIN32HEAP pHeap = NULL; - NTSTATUS Status; - - SizeHeap.QuadPart = HeapSize; - - /* Create the section and map it into session space */ - Status = MmCreateSection((PVOID*)SectionObject, - SECTION_ALL_ACCESS, - NULL, - &SizeHeap, - PAGE_EXECUTE_READWRITE, /* Would prefer PAGE_READWRITE, but thanks to RTL heaps... */ - SEC_RESERVE | 1, - NULL, - NULL); - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return FALSE; - } - - Status = MmMapViewInSessionSpace(*SectionObject, - SystemBase, - &HeapSize); - if (!NT_SUCCESS(Status)) - { - ObDereferenceObject(*SectionObject); - *SectionObject = NULL; - - SetLastNtError(Status); - return FALSE; - } - - /* Create the heap */ - pHeap = IntUserHeapCreate(*SectionObject, - SystemBase, - HeapSize); - - if (pHeap == NULL) - { - ObDereferenceObject(*SectionObject); - *SectionObject = NULL; - - SetLastNtError(STATUS_UNSUCCESSFUL); - } - - return pHeap; -}

11 years, 9 months

[tkreuzer] 57970: [WIN32K] - Rewrite NtUserGetAtomName, make it return the length in WCHARs instead of bytes, as it is supposed to be. Fix a buffer overrun, when the caller passes a too large UNICO...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Dec 22 17:43:20 2012 New Revision: 57970 URL: http://svn.reactos.org/svn/reactos?rev=57970&view=rev Log: [WIN32K] - Rewrite NtUserGetAtomName, make it return the length in WCHARs instead of bytes, as it is supposed to be. Fix a buffer overrun, when the caller passes a too large UNICODE_STRING buffer. Probe the output buffers before accessing them. Makes sure the target string is always NULL terminated, even if the buffer is too small for the whole name. - Remove NULL termination code from IntGetAtomName, since that is already done by RtlQueryAtomInAtomTable Modified: trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/useratom.c Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Sat Dec 22 17:43:20 2012 @@ -1893,11 +1893,13 @@ NtUserGetAsyncKeyState( INT Key); -DWORD -NTAPI +_Success_(return!=0) +_At_(pustrName->Buffer, _Out_z_bytecap_post_bytecount_(pustrName->MaximumLength, return*2+2)) +ULONG +APIENTRY NtUserGetAtomName( - ATOM nAtom, - PUNICODE_STRING pBuffer); + _In_ ATOM atom, + _Inout_ PUNICODE_STRING pustrName); UINT NTAPI Modified: trunk/reactos/win32ss/user/ntuser/useratom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/userat… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/useratom.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/useratom.c [iso-8859-1] Sat Dec 22 17:43:20 2012 @@ -34,11 +34,11 @@ } ULONG FASTCALL -IntGetAtomName(RTL_ATOM nAtom, LPWSTR lpBuffer, ULONG nSize) +IntGetAtomName(RTL_ATOM nAtom, LPWSTR lpBuffer, ULONG cjBufSize) { NTSTATUS Status = STATUS_SUCCESS; PTHREADINFO pti; - ULONG Size = nSize; + ULONG Size = cjBufSize; pti = PsGetCurrentThreadWin32Thread(); if (pti->rpdesk == NULL) @@ -49,13 +49,12 @@ Status = RtlQueryAtomInAtomTable(gAtomTable, nAtom, NULL, NULL, lpBuffer, &Size); - if (Size < nSize) - *(lpBuffer + Size/sizeof(WCHAR)) = 0; if (!NT_SUCCESS(Status)) { SetLastNtError(Status); return 0; } + return Size; } @@ -78,30 +77,67 @@ return Atom; } -DWORD +/*! + * \brief Returns the name of an atom. + * + * \param atom - The atom to be queried. + * \param pustrName - Pointer to an initialized UNICODE_STRING that receives + * the name of the atom. The function does not update the + Length member. The string is always NULL-terminated. + * + * \return The length of the name in characters, or 0 if the function fails. + * + * \note The function does not aquire any global lock, since synchronisation is + * handled by the RtlAtom function. + */ +_Success_(return!=0) +_At_(pustrName->Buffer, _Out_z_bytecap_post_bytecount_(pustrName->MaximumLength, return*2+2)) +ULONG APIENTRY NtUserGetAtomName( - ATOM nAtom, - PUNICODE_STRING pBuffer) + _In_ ATOM atom, + _Inout_ PUNICODE_STRING pustrName) { - DWORD Ret; - WCHAR Buffer[256]; - UNICODE_STRING CapturedName = {0}; - UserEnterShared(); - CapturedName.Buffer = (LPWSTR)&Buffer; - CapturedName.MaximumLength = sizeof(Buffer); - Ret = IntGetAtomName((RTL_ATOM)nAtom, CapturedName.Buffer, (ULONG)CapturedName.Length); - _SEH2_TRY - { - RtlCopyMemory(pBuffer->Buffer, &Buffer, pBuffer->MaximumLength); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Ret = 0; - } - _SEH2_END - UserLeave(); - return Ret; + WCHAR awcBuffer[256]; + ULONG cjLength; + + /* Retrieve the atom name into a local buffer (max length is 255 chars) */ + cjLength = IntGetAtomName((RTL_ATOM)atom, awcBuffer, sizeof(awcBuffer)); + if (cjLength != 0) + { + _SEH2_TRY + { + /* Probe the unicode string and the buffer */ + ProbeForRead(pustrName, sizeof(*pustrName), 1); + ProbeForWrite(pustrName->Buffer, pustrName->MaximumLength, 1); + + /* Check if we have enough space to write the NULL termination */ + if (pustrName->MaximumLength >= sizeof(UNICODE_NULL)) + { + /* Limit the length to the buffer size */ + cjLength = min(pustrName->MaximumLength - sizeof(UNICODE_NULL), + cjLength); + + /* Copy the string and NULL terminate it */ + RtlCopyMemory(pustrName->Buffer, awcBuffer, cjLength); + pustrName->Buffer[cjLength / sizeof(WCHAR)] = L'\0'; + } + else + { + cjLength = 0; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* On exception, set last error and fail */ + SetLastNtError(_SEH2_GetExceptionCode()); + cjLength = 0; + } + _SEH2_END + } + + /* Return the length in characters */ + return cjLength / sizeof(WCHAR); } /* EOF */

11 years, 9 months

[akhaldi] 57969: [CMAKE] * Remove unneeded set_rc_compiler. ROSAPPS-255 #resolve #comment Fixed in r57968.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Dec 22 15:45:00 2012 New Revision: 57969 URL: http://svn.reactos.org/svn/reactos?rev=57969&view=rev Log: [CMAKE] * Remove unneeded set_rc_compiler. ROSAPPS-255 #resolve #comment Fixed in r57968. Modified: trunk/rosapps/applications/devutils/vgafontedit/CMakeLists.txt trunk/rosapps/applications/imagesoft/CMakeLists.txt trunk/rosapps/applications/screensavers/blankscr/CMakeLists.txt trunk/rosapps/applications/screensavers/butterflies/CMakeLists.txt trunk/rosapps/applications/screensavers/circles/CMakeLists.txt trunk/rosapps/applications/screensavers/cylfrac/CMakeLists.txt trunk/rosapps/applications/screensavers/matrix/CMakeLists.txt trunk/rosapps/applications/screensavers/mazescr/CMakeLists.txt trunk/rosapps/applications/screensavers/ssstars/CMakeLists.txt trunk/rosapps/applications/screensavers/starfield/CMakeLists.txt trunk/rosapps/demos/maze/CMakeLists.txt trunk/rosapps/drivers/green/CMakeLists.txt Modified: trunk/rosapps/applications/devutils/vgafontedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf… ============================================================================== --- trunk/rosapps/applications/devutils/vgafontedit/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/vgafontedit/CMakeLists.txt [iso-8859-1] Sat Dec 22 15:45:00 2012 @@ -1,5 +1,3 @@ - -set_rc_compiler() list(APPEND SOURCE aboutdlg.c @@ -16,5 +14,4 @@ add_executable(vgafontedit ${SOURCE}) set_module_type(vgafontedit win32gui UNICODE) add_importlibs(vgafontedit user32 gdi32 comdlg32 msvcrt kernel32) - add_cd_file(TARGET vgafontedit DESTINATION reactos/system32 FOR all) Modified: trunk/rosapps/applications/imagesoft/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/CMa… ============================================================================== --- trunk/rosapps/applications/imagesoft/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/imagesoft/CMakeLists.txt [iso-8859-1] Sat Dec 22 15:45:00 2012 @@ -1,5 +1,3 @@ - -set_rc_compiler() list(APPEND SOURCE about.c @@ -21,5 +19,4 @@ add_executable(imagesoft ${SOURCE}) set_module_type(imagesoft win32gui UNICODE) add_importlibs(imagesoft gdi32 user32 advapi32 version comctl32 shell32 comdlg32 msvcrt kernel32) - add_cd_file(TARGET imagesoft DESTINATION reactos/system32 FOR all) Modified: trunk/rosapps/applications/screensavers/blankscr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/blankscr/CMakeLists.txt [iso-8859-1] Sat Dec 22 15:45:00 2012 @@ -1,14 +1,7 @@ -set_rc_compiler() - -add_executable(blankscr - scrnsave.c - scrnsave.rc) - +add_executable(blankscr scrnsave.c scrnsave.rc) set_module_type(blankscr win32gui UNICODE) set_target_properties(blankscr PROPERTIES SUFFIX ".scr") - target_link_libraries(blankscr scrnsave) add_importlibs(blankscr user32 gdi32 msvcrt kernel32) - add_cd_file(TARGET blankscr DESTINATION reactos/system32 FOR all) Modified: trunk/rosapps/applications/screensavers/butterflies/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/butterflies/CMakeLists.txt [iso-8859-1] Sat Dec 22 15:45:00 2012 @@ -1,14 +1,7 @@ -set_rc_compiler() - -add_executable(butterflies - butterflies.c - butterflies.rc) - +add_executable(butterflies butterflies.c butterflies.rc) set_module_type(butterflies win32gui UNICODE) set_target_properties(butterflies PROPERTIES SUFFIX ".scr") - target_link_libraries(butterflies scrnsave) add_importlibs(butterflies user32 gdi32 opengl32 glu32 advapi32 shell32 msvcrt kernel32) - add_cd_file(TARGET butterflies DESTINATION reactos/system32 FOR all) Modified: trunk/rosapps/applications/screensavers/circles/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/circles/CMakeLists.txt [iso-8859-1] Sat Dec 22 15:45:00 2012 @@ -1,14 +1,7 @@ -set_rc_compiler() - -add_executable(circles - circles.c - circles.rc) - +add_executable(circles circles.c circles.rc) set_module_type(circles win32gui UNICODE) set_target_properties(circles PROPERTIES SUFFIX ".scr") - target_link_libraries(circles scrnsave) add_importlibs(circles user32 gdi32 msvcrt kernel32) - add_cd_file(TARGET circles DESTINATION reactos/system32 FOR all) Modified: trunk/rosapps/applications/screensavers/cylfrac/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/cylfrac/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/cylfrac/CMakeLists.txt [iso-8859-1] Sat Dec 22 15:45:00 2012 @@ -1,13 +1,6 @@ -set_rc_compiler() - -add_executable(cylfrac - cylfrac.c - cylfrac.rc) - +add_executable(cylfrac cylfrac.c cylfrac.rc) set_module_type(cylfrac win32gui UNICODE) set_target_properties(cylfrac PROPERTIES SUFFIX ".scr") - add_importlibs(cylfrac user32 gdi32 opengl32 glu32 winmm msvcrt kernel32) - add_cd_file(TARGET cylfrac DESTINATION reactos/system32 FOR all) Modified: trunk/rosapps/applications/screensavers/matrix/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/matrix/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/matrix/CMakeLists.txt [iso-8859-1] Sat Dec 22 15:45:00 2012 @@ -1,5 +1,3 @@ - -set_rc_compiler() add_executable(matrix config.c @@ -12,7 +10,5 @@ set_module_type(matrix win32gui UNICODE) set_target_properties(matrix PROPERTIES SUFFIX ".scr") - add_importlibs(matrix user32 gdi32 winspool advapi32 comctl32 comdlg32 shell32 msvcrt kernel32) - add_cd_file(TARGET matrix DESTINATION reactos/system32 FOR all) Modified: trunk/rosapps/applications/screensavers/mazescr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/mazescr/CMakeLists.txt [iso-8859-1] Sat Dec 22 15:45:00 2012 @@ -1,5 +1,3 @@ - -set_rc_compiler() add_executable(mazescr scrnsave.c @@ -8,7 +6,5 @@ set_module_type(mazescr win32gui) set_target_properties(mazescr PROPERTIES SUFFIX ".scr") - add_importlibs(mazescr user32 gdi32 msvcrt kernel32) - add_cd_file(TARGET mazescr DESTINATION reactos/system32 FOR all) Modified: trunk/rosapps/applications/screensavers/ssstars/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/ssstars/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/ssstars/CMakeLists.txt [iso-8859-1] Sat Dec 22 15:45:00 2012 @@ -1,5 +1,3 @@ - -set_rc_compiler() add_executable(ssstars ssstars.c @@ -8,8 +6,6 @@ set_module_type(ssstars win32gui UNICODE) set_target_properties(ssstars PROPERTIES SUFFIX ".scr") - target_link_libraries(ssstars scrnsave) add_importlibs(ssstars user32 gdi32 opengl32 glu32 advapi32 comctl32 shell32 msvcrt kernel32) - add_cd_file(TARGET ssstars DESTINATION reactos/system32 FOR all) Modified: trunk/rosapps/applications/screensavers/starfield/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/starfield/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/starfield/CMakeLists.txt [iso-8859-1] Sat Dec 22 15:45:00 2012 @@ -1,13 +1,6 @@ -set_rc_compiler() - -add_executable(starfield - screensaver.c - starfield.rc) - +add_executable(starfield screensaver.c starfield.rc) set_module_type(starfield win32gui UNICODE) set_target_properties(starfield PROPERTIES SUFFIX ".scr") - add_importlibs(starfield user32 gdi32 msvcrt kernel32) - add_cd_file(TARGET starfield DESTINATION reactos/system32 FOR all) Modified: trunk/rosapps/demos/maze/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/demos/maze/CMakeLists.txt?… ============================================================================== --- trunk/rosapps/demos/maze/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/demos/maze/CMakeLists.txt [iso-8859-1] Sat Dec 22 15:45:00 2012 @@ -1,12 +1,5 @@ -set_rc_compiler() - -add_executable(maze - maze.c - maze.rc) - +add_executable(maze maze.c maze.rc) set_module_type(maze win32gui) - add_importlibs(maze user32 gdi32 msvcrt kernel32) - add_cd_file(TARGET maze DESTINATION reactos/system32 FOR all) Modified: trunk/rosapps/drivers/green/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/drivers/green/CMakeLists.t… ============================================================================== --- trunk/rosapps/drivers/green/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/drivers/green/CMakeLists.txt [iso-8859-1] Sat Dec 22 15:45:00 2012 @@ -1,5 +1,3 @@ - -set_rc_compiler() add_library(green SHARED createclose.c @@ -13,7 +11,6 @@ green.rc) add_pch(green green.h) - set_module_type(green kernelmodedriver) add_importlibs(green ntoskrnl hal) add_cd_file(TARGET green DESTINATION reactos/system32/drivers NO_CAB FOR all)

11 years, 9 months

[tkreuzer] 57968: [WIN32K] Don't access the PROCESSINFO after freeing it.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Dec 22 12:22:53 2012 New Revision: 57968 URL: http://svn.reactos.org/svn/reactos?rev=57968&view=rev Log: [WIN32K] Don't access the PROCESSINFO after freeing it. Modified: trunk/reactos/win32ss/user/ntuser/main.c Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Sat Dec 22 12:22:53 2012 @@ -226,16 +226,16 @@ *pppi = ppiCurrent->ppiNext; TRACE_CH(UserProcess,"Freeing ppi 0x%p\n", ppiCurrent); - - /* Ftee the PROCESSINFO */ +#if DBG + if (DBG_IS_CHANNEL_ENABLED(ppiCurrent, DbgChUserObj, WARN_LEVEL)) + { + DbgUserDumpHandleTable(); + } +#endif + + /* Free the PROCESSINFO */ PsSetProcessWin32Process(Process, NULL); ExFreePoolWithTag(ppiCurrent, USERTAG_PROCESSINFO); -#if DBG - if (DBG_IS_CHANNEL_ENABLED(ppiCurrent, DbgChUserObj, WARN_LEVEL)) - { - DbgUserDumpHandleTable(); - } -#endif } RETURN( STATUS_SUCCESS);

11 years, 9 months

[tkreuzer] 57967: [PSEH3] Fix a typo, add a comment

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Dec 22 10:51:30 2012 New Revision: 57967 URL: http://svn.reactos.org/svn/reactos?rev=57967&view=rev Log: [PSEH3] Fix a typo, add a comment Modified: trunk/reactos/lib/pseh/i386/pseh3.c Modified: trunk/reactos/lib/pseh/i386/pseh3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/pseh3.c?rev=… ============================================================================== --- trunk/reactos/lib/pseh/i386/pseh3.c [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/pseh3.c [iso-8859-1] Sat Dec 22 10:51:30 2012 @@ -95,6 +95,7 @@ PVOID Filter = Record->ScopeTable->Filter; LONG Result; + /* Check for __finally frames */ if (Record->ScopeTable->Target == NULL) { return EXCEPTION_CONTINUE_SEARCH; @@ -189,7 +190,7 @@ asm volatile ("cld\n" : : : "memory"); /* Check if this is an unwind */ - if (ExceptionRecord->ExceptionFlags & EXCEPTION_UNWIND) + if (ExceptionRecord->ExceptionFlags & EXCEPTION_UNWINDING) { /* Unwind all local frames */ TargetFrame = EstablisherFrame->Next;

11 years, 9 months

[akhaldi] 57966: [CMAKE] * Remove unneeded set_rc_compiler.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Dec 22 10:47:06 2012 New Revision: 57966 URL: http://svn.reactos.org/svn/reactos?rev=57966&view=rev Log: [CMAKE] * Remove unneeded set_rc_compiler. Modified: trunk/reactos/base/applications/cacls/CMakeLists.txt trunk/reactos/base/applications/calc/CMakeLists.txt trunk/reactos/base/applications/charmap/CMakeLists.txt trunk/reactos/base/applications/cmdutils/doskey/CMakeLists.txt trunk/reactos/base/applications/cmdutils/find/CMakeLists.txt trunk/reactos/base/applications/cmdutils/more/CMakeLists.txt trunk/reactos/base/applications/cmdutils/reg/CMakeLists.txt trunk/reactos/base/applications/cmdutils/xcopy/CMakeLists.txt trunk/reactos/base/applications/control/CMakeLists.txt trunk/reactos/base/applications/dxdiag/CMakeLists.txt trunk/reactos/base/applications/findstr/CMakeLists.txt trunk/reactos/base/applications/fontview/CMakeLists.txt trunk/reactos/base/applications/games/solitaire/CMakeLists.txt trunk/reactos/base/applications/games/spider/CMakeLists.txt trunk/reactos/base/applications/games/winmine/CMakeLists.txt trunk/reactos/base/applications/hh/CMakeLists.txt trunk/reactos/base/applications/iexplore/CMakeLists.txt trunk/reactos/base/applications/kbswitch/CMakeLists.txt trunk/reactos/base/applications/logoff/CMakeLists.txt trunk/reactos/base/applications/magnify/CMakeLists.txt trunk/reactos/base/applications/mmc/CMakeLists.txt trunk/reactos/base/applications/mplay32/CMakeLists.txt trunk/reactos/base/applications/msconfig/CMakeLists.txt trunk/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt trunk/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt trunk/reactos/base/applications/mspaint/CMakeLists.txt trunk/reactos/base/applications/mstsc/CMakeLists.txt trunk/reactos/base/applications/network/ipconfig/CMakeLists.txt trunk/reactos/base/applications/network/ping/CMakeLists.txt trunk/reactos/base/applications/notepad/CMakeLists.txt trunk/reactos/base/applications/rapps/CMakeLists.txt trunk/reactos/base/applications/regedit/CMakeLists.txt trunk/reactos/base/applications/regedit/clb/CMakeLists.txt trunk/reactos/base/applications/regedt32/CMakeLists.txt trunk/reactos/base/applications/screensavers/3dtext/CMakeLists.txt trunk/reactos/base/applications/screensavers/logon/CMakeLists.txt trunk/reactos/base/applications/setup16/CMakeLists.txt trunk/reactos/base/applications/shutdown/CMakeLists.txt trunk/reactos/base/applications/sndrec32/CMakeLists.txt trunk/reactos/base/applications/sndvol32/CMakeLists.txt trunk/reactos/base/applications/taskmgr/CMakeLists.txt trunk/reactos/base/setup/reactos/CMakeLists.txt trunk/reactos/base/setup/vmwinst/CMakeLists.txt trunk/reactos/base/setup/welcome/CMakeLists.txt trunk/reactos/base/shell/cmd/CMakeLists.txt trunk/reactos/base/shell/explorer-new/CMakeLists.txt trunk/reactos/base/shell/explorer/CMakeLists.txt trunk/reactos/base/system/diskpart/CMakeLists.txt trunk/reactos/base/system/format/CMakeLists.txt trunk/reactos/base/system/regsvr32/CMakeLists.txt trunk/reactos/base/system/rundll32/CMakeLists.txt trunk/reactos/base/system/runonce/CMakeLists.txt trunk/reactos/base/system/subst/CMakeLists.txt trunk/reactos/cmake/gcc.cmake trunk/reactos/cmake/msvc.cmake trunk/reactos/dll/cpl/access/CMakeLists.txt trunk/reactos/dll/cpl/appwiz/CMakeLists.txt trunk/reactos/dll/cpl/desk/CMakeLists.txt trunk/reactos/dll/cpl/hdwwiz/CMakeLists.txt trunk/reactos/dll/cpl/inetcpl/CMakeLists.txt trunk/reactos/dll/cpl/input/CMakeLists.txt trunk/reactos/dll/cpl/intl/CMakeLists.txt trunk/reactos/dll/cpl/joy/CMakeLists.txt trunk/reactos/dll/cpl/mmsys/CMakeLists.txt trunk/reactos/dll/cpl/powercfg/CMakeLists.txt trunk/reactos/dll/cpl/sysdm/CMakeLists.txt trunk/reactos/dll/cpl/telephon/CMakeLists.txt trunk/reactos/dll/cpl/timedate/CMakeLists.txt trunk/reactos/dll/cpl/usrmgr/CMakeLists.txt trunk/reactos/dll/cpl/wined3dcfg/CMakeLists.txt trunk/reactos/dll/directx/dplayx/CMakeLists.txt trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_26/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_27/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_28/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_29/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_30/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_31/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_32/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_33/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_34/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_35/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_37/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_38/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_39/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_40/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_41/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_42/CMakeLists.txt trunk/reactos/dll/shellext/deskadp/CMakeLists.txt trunk/reactos/dll/shellext/deskmon/CMakeLists.txt trunk/reactos/dll/shellext/devcpux/CMakeLists.txt trunk/reactos/dll/shellext/fontext/CMakeLists.txt trunk/reactos/dll/shellext/slayer/CMakeLists.txt trunk/reactos/dll/win32/acledit/CMakeLists.txt trunk/reactos/dll/win32/aclui/CMakeLists.txt trunk/reactos/dll/win32/avifil32/CMakeLists.txt trunk/reactos/dll/win32/batt/CMakeLists.txt trunk/reactos/dll/win32/bcrypt/CMakeLists.txt trunk/reactos/dll/win32/cards/CMakeLists.txt trunk/reactos/dll/win32/clusapi/CMakeLists.txt trunk/reactos/dll/win32/comctl32/CMakeLists.txt trunk/reactos/dll/win32/comdlg32/CMakeLists.txt trunk/reactos/dll/win32/credui/CMakeLists.txt trunk/reactos/dll/win32/crypt32/CMakeLists.txt trunk/reactos/dll/win32/cryptdlg/CMakeLists.txt trunk/reactos/dll/win32/dbghelp/CMakeLists.txt trunk/reactos/dll/win32/dciman32/CMakeLists.txt trunk/reactos/dll/win32/devmgr/CMakeLists.txt trunk/reactos/dll/win32/dwmapi/CMakeLists.txt trunk/reactos/dll/win32/faultrep/CMakeLists.txt trunk/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt trunk/reactos/dll/win32/hnetcfg/CMakeLists.txt trunk/reactos/dll/win32/iccvid/CMakeLists.txt trunk/reactos/dll/win32/icmp/CMakeLists.txt trunk/reactos/dll/win32/inetcomm/CMakeLists.txt trunk/reactos/dll/win32/inseng/CMakeLists.txt trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/localspl/CMakeLists.txt trunk/reactos/dll/win32/localui/CMakeLists.txt trunk/reactos/dll/win32/lsasrv/CMakeLists.txt trunk/reactos/dll/win32/mapi32/CMakeLists.txt trunk/reactos/dll/win32/modemui/CMakeLists.txt trunk/reactos/dll/win32/mpr/CMakeLists.txt trunk/reactos/dll/win32/msacm32/CMakeLists.txt trunk/reactos/dll/win32/msftedit/CMakeLists.txt trunk/reactos/dll/win32/msgina/CMakeLists.txt trunk/reactos/dll/win32/mshtml/CMakeLists.txt trunk/reactos/dll/win32/msimtf/CMakeLists.txt trunk/reactos/dll/win32/msrle32/CMakeLists.txt trunk/reactos/dll/win32/mstask/CMakeLists.txt trunk/reactos/dll/win32/msvcrt/CMakeLists.txt trunk/reactos/dll/win32/msvfw32/CMakeLists.txt trunk/reactos/dll/win32/netcfgx/CMakeLists.txt trunk/reactos/dll/win32/netid/CMakeLists.txt trunk/reactos/dll/win32/netshell/CMakeLists.txt trunk/reactos/dll/win32/ntprint/CMakeLists.txt trunk/reactos/dll/win32/oleacc/CMakeLists.txt trunk/reactos/dll/win32/olecli32/CMakeLists.txt trunk/reactos/dll/win32/olethk32/CMakeLists.txt trunk/reactos/dll/win32/pidgen/CMakeLists.txt trunk/reactos/dll/win32/pstorec/CMakeLists.txt trunk/reactos/dll/win32/qmgr/CMakeLists.txt trunk/reactos/dll/win32/rasapi32/CMakeLists.txt trunk/reactos/dll/win32/rasdlg/CMakeLists.txt trunk/reactos/dll/win32/rasman/CMakeLists.txt trunk/reactos/dll/win32/samlib/CMakeLists.txt trunk/reactos/dll/win32/schannel/CMakeLists.txt trunk/reactos/dll/win32/security/CMakeLists.txt trunk/reactos/dll/win32/serialui/CMakeLists.txt trunk/reactos/dll/win32/setupapi/CMakeLists.txt trunk/reactos/dll/win32/shdoclc/CMakeLists.txt trunk/reactos/dll/win32/shimgvw/CMakeLists.txt trunk/reactos/dll/win32/snmpapi/CMakeLists.txt trunk/reactos/dll/win32/stdole2.tlb/CMakeLists.txt trunk/reactos/dll/win32/syssetup/CMakeLists.txt trunk/reactos/dll/win32/tapiui/CMakeLists.txt trunk/reactos/dll/win32/userenv/CMakeLists.txt trunk/reactos/dll/win32/uxtheme/CMakeLists.txt trunk/reactos/dll/win32/winspool/CMakeLists.txt trunk/reactos/dll/win32/wldap32/CMakeLists.txt trunk/reactos/drivers/input/i8042prt/CMakeLists.txt trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt trunk/reactos/drivers/storage/port/buslogic/CMakeLists.txt trunk/reactos/ntoskrnl/CMakeLists.txt trunk/reactos/subsystems/ntvdm/CMakeLists.txt trunk/reactos/win32ss/user/user32/CMakeLists.txt trunk/reactos/win32ss/user/win32csr/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/cacls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/CM… Modified: trunk/reactos/base/applications/calc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/CMa… Modified: trunk/reactos/base/applications/charmap/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/cmdutils/doskey/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/more/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/reg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/xcopy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/control/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… Modified: trunk/reactos/base/applications/dxdiag/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/C… Modified: trunk/reactos/base/applications/findstr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/fontview/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… Modified: trunk/reactos/base/applications/games/solitaire/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/spider/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/games/winmine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/hh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/hh/CMake… Modified: trunk/reactos/base/applications/iexplore/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/iexplore… Modified: trunk/reactos/base/applications/kbswitch/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… Modified: trunk/reactos/base/applications/logoff/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/C… Modified: trunk/reactos/base/applications/magnify/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… Modified: trunk/reactos/base/applications/mmc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/CMak… Modified: trunk/reactos/base/applications/mplay32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… Modified: trunk/reactos/base/applications/msconfig/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mspaint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mstsc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/CM… Modified: trunk/reactos/base/applications/network/ipconfig/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/notepad/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/rapps/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/CM… Modified: trunk/reactos/base/applications/regedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/clb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedt32… Modified: trunk/reactos/base/applications/screensavers/3dtext/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/screensavers/logon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/setup16/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/setup16/… Modified: trunk/reactos/base/applications/shutdown/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… Modified: trunk/reactos/base/applications/sndrec32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndvol32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/taskmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/setup/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/CMakeLi… Modified: trunk/reactos/base/setup/vmwinst/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/CMakeLi… Modified: trunk/reactos/base/setup/welcome/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/CMakeLi… Modified: trunk/reactos/base/shell/cmd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/CMakeLists.… Modified: trunk/reactos/base/shell/explorer-new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/CM… Modified: trunk/reactos/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/CMakeL… Modified: trunk/reactos/base/system/diskpart/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/CMake… Modified: trunk/reactos/base/system/format/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/CMakeLi… Modified: trunk/reactos/base/system/regsvr32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/CMake… Modified: trunk/reactos/base/system/rundll32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/CMake… Modified: trunk/reactos/base/system/runonce/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/CMakeL… Modified: trunk/reactos/base/system/subst/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/CMakeLis… Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=57966&… Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=57966… Modified: trunk/reactos/dll/cpl/access/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/CMakeLists.… Modified: trunk/reactos/dll/cpl/appwiz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/CMakeLists.… Modified: trunk/reactos/dll/cpl/desk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/CMakeLists.tx… Modified: trunk/reactos/dll/cpl/hdwwiz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/CMakeLists.… Modified: trunk/reactos/dll/cpl/inetcpl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/CMakeLists… Modified: trunk/reactos/dll/cpl/input/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/CMakeLists.t… Modified: trunk/reactos/dll/cpl/intl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/CMakeLists.tx… Modified: trunk/reactos/dll/cpl/joy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/CMakeLists.txt… Modified: trunk/reactos/dll/cpl/mmsys/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/CMakeLists.t… Modified: trunk/reactos/dll/cpl/powercfg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/CMakeList… Modified: trunk/reactos/dll/cpl/sysdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/CMakeLists.t… Modified: trunk/reactos/dll/cpl/telephon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/CMakeList… Modified: trunk/reactos/dll/cpl/timedate/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/CMakeList… Modified: trunk/reactos/dll/cpl/usrmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/CMakeLists.… Modified: trunk/reactos/dll/cpl/wined3dcfg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/CMakeLi… Modified: trunk/reactos/dll/directx/dplayx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/CMakeLi… Modified: trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/CMak… Modified: trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/CMak… Modified: trunk/reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_24/… Modified: trunk/reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_25/… Modified: trunk/reactos/dll/directx/wine/d3dx9_26/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_26/… Modified: trunk/reactos/dll/directx/wine/d3dx9_27/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_27/… Modified: trunk/reactos/dll/directx/wine/d3dx9_28/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_28/… Modified: trunk/reactos/dll/directx/wine/d3dx9_29/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_29/… Modified: trunk/reactos/dll/directx/wine/d3dx9_30/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_30/… Modified: trunk/reactos/dll/directx/wine/d3dx9_31/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_31/… Modified: trunk/reactos/dll/directx/wine/d3dx9_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_32/… Modified: trunk/reactos/dll/directx/wine/d3dx9_33/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_33/… Modified: trunk/reactos/dll/directx/wine/d3dx9_34/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_34/… Modified: trunk/reactos/dll/directx/wine/d3dx9_35/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_35/… Modified: trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… Modified: trunk/reactos/dll/directx/wine/d3dx9_37/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_37/… Modified: trunk/reactos/dll/directx/wine/d3dx9_38/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_38/… Modified: trunk/reactos/dll/directx/wine/d3dx9_39/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_39/… Modified: trunk/reactos/dll/directx/wine/d3dx9_40/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_40/… Modified: trunk/reactos/dll/directx/wine/d3dx9_41/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_41/… Modified: trunk/reactos/dll/directx/wine/d3dx9_42/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_42/… Modified: trunk/reactos/dll/shellext/deskadp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/CMake… Modified: trunk/reactos/dll/shellext/deskmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/CMake… Modified: trunk/reactos/dll/shellext/devcpux/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/devcpux/CMake… Modified: trunk/reactos/dll/shellext/fontext/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/fontext/CMake… Modified: trunk/reactos/dll/shellext/slayer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/CMakeL… Modified: trunk/reactos/dll/win32/acledit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/acledit/CMakeLis… Modified: trunk/reactos/dll/win32/aclui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/CMakeLists… Modified: trunk/reactos/dll/win32/avifil32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/CMakeLi… Modified: trunk/reactos/dll/win32/batt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/batt/CMakeLists.… Modified: trunk/reactos/dll/win32/bcrypt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/bcrypt/CMakeList… Modified: trunk/reactos/dll/win32/cards/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/CMakeLists… Modified: trunk/reactos/dll/win32/clusapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/clusapi/CMakeLis… Modified: trunk/reactos/dll/win32/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/CMakeLi… Modified: trunk/reactos/dll/win32/comdlg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/CMakeLi… Modified: trunk/reactos/dll/win32/credui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/CMakeList… Modified: trunk/reactos/dll/win32/crypt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/CMakeLis… Modified: trunk/reactos/dll/win32/cryptdlg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/CMakeLi… Modified: trunk/reactos/dll/win32/dbghelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/CMakeLis… Modified: trunk/reactos/dll/win32/dciman32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dciman32/CMakeLi… Modified: trunk/reactos/dll/win32/devmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/CMakeList… Modified: trunk/reactos/dll/win32/dwmapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dwmapi/CMakeList… Modified: trunk/reactos/dll/win32/faultrep/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/faultrep/CMakeLi… Modified: trunk/reactos/dll/win32/hhctrl.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/CMake… Modified: trunk/reactos/dll/win32/hnetcfg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/CMakeLis… Modified: trunk/reactos/dll/win32/iccvid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/CMakeList… Modified: trunk/reactos/dll/win32/icmp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/icmp/CMakeLists.… Modified: trunk/reactos/dll/win32/inetcomm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/CMakeLi… Modified: trunk/reactos/dll/win32/inseng/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inseng/CMakeList… Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… Modified: trunk/reactos/dll/win32/localspl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/CMakeLi… Modified: trunk/reactos/dll/win32/localui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/CMakeLis… Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/CMakeList… Modified: trunk/reactos/dll/win32/mapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/CMakeList… Modified: trunk/reactos/dll/win32/modemui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/CMakeLis… Modified: trunk/reactos/dll/win32/mpr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/CMakeLists.t… Modified: trunk/reactos/dll/win32/msacm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/CMakeLis… Modified: trunk/reactos/dll/win32/msftedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msftedit/CMakeLi… Modified: trunk/reactos/dll/win32/msgina/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/CMakeList… Modified: trunk/reactos/dll/win32/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/CMakeList… Modified: trunk/reactos/dll/win32/msimtf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/CMakeList… Modified: trunk/reactos/dll/win32/msrle32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/CMakeLis… Modified: trunk/reactos/dll/win32/mstask/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mstask/CMakeList… Modified: trunk/reactos/dll/win32/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/CMakeList… Modified: trunk/reactos/dll/win32/msvfw32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/CMakeLis… Modified: trunk/reactos/dll/win32/netcfgx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/CMakeLis… Modified: trunk/reactos/dll/win32/netid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/CMakeLists… Modified: trunk/reactos/dll/win32/netshell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/CMakeLi… Modified: trunk/reactos/dll/win32/ntprint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntprint/CMakeLis… Modified: trunk/reactos/dll/win32/oleacc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/CMakeList… Modified: trunk/reactos/dll/win32/olecli32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olecli32/CMakeLi… Modified: trunk/reactos/dll/win32/olethk32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olethk32/CMakeLi… Modified: trunk/reactos/dll/win32/pidgen/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pidgen/CMakeList… Modified: trunk/reactos/dll/win32/pstorec/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/CMakeLis… Modified: trunk/reactos/dll/win32/qmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgr/CMakeLists.… Modified: trunk/reactos/dll/win32/rasapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasapi32/CMakeLi… Modified: trunk/reactos/dll/win32/rasdlg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/CMakeList… Modified: trunk/reactos/dll/win32/rasman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasman/CMakeList… Modified: trunk/reactos/dll/win32/samlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/CMakeList… Modified: trunk/reactos/dll/win32/schannel/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/CMakeLi… Modified: trunk/reactos/dll/win32/security/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/security/CMakeLi… Modified: trunk/reactos/dll/win32/serialui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/CMakeLi… Modified: trunk/reactos/dll/win32/setupapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/CMakeLi… Modified: trunk/reactos/dll/win32/shdoclc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/CMakeLis… Modified: trunk/reactos/dll/win32/shimgvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/CMakeLis… Modified: trunk/reactos/dll/win32/snmpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/snmpapi/CMakeLis… Modified: trunk/reactos/dll/win32/stdole2.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole2.tlb/CMak… Modified: trunk/reactos/dll/win32/syssetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/CMakeLi… Modified: trunk/reactos/dll/win32/tapiui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/CMakeList… Modified: trunk/reactos/dll/win32/userenv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/CMakeLis… Modified: trunk/reactos/dll/win32/uxtheme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/CMakeLis… Modified: trunk/reactos/dll/win32/winspool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winspool/CMakeLi… Modified: trunk/reactos/dll/win32/wldap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/CMakeLis… Modified: trunk/reactos/drivers/input/i8042prt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/CMa… Modified: trunk/reactos/drivers/storage/ide/uniata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/port/buslogic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/port/buslo… Modified: trunk/reactos/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/CMakeLists.txt?re… Modified: trunk/reactos/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/CMakeList… Modified: trunk/reactos/win32ss/user/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/CMakeL… Modified: trunk/reactos/win32ss/user/win32csr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/win32csr/CMak…

11 years, 9 months

[akhaldi] 57965: [CMAKE] * Remove unneeded set_rc_compiler.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Dec 22 10:46:37 2012 New Revision: 57965 URL: http://svn.reactos.org/svn/reactos?rev=57965&view=rev Log: [CMAKE] * Remove unneeded set_rc_compiler. Modified: trunk/rostests/kmtests/CMakeLists.txt Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Sat Dec 22 10:46:37 2012 @@ -79,7 +79,6 @@ # # kmtest.exe loader application # -set_rc_compiler() list(APPEND KMTEST_SOURCE kmtest/kmtest.c

11 years, 9 months

[tkreuzer] 57964: [INCLUDE] Update annotations

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Dec 22 10:09:25 2012 New Revision: 57964 URL: http://svn.reactos.org/svn/reactos?rev=57964&view=rev Log: [INCLUDE] Update annotations Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/wdm.h trunk/reactos/include/psdk/driverspecs.h trunk/reactos/include/psdk/ntgdi.h trunk/reactos/include/psdk/sal.h trunk/reactos/include/psdk/winuser.h trunk/reactos/include/xdk/ccfuncs.h trunk/reactos/include/xdk/exfuncs.h trunk/reactos/include/xdk/rtlfuncs.h Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=57… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Sat Dec 22 10:09:25 2012 @@ -8889,6 +8889,7 @@ #endif #if (NTDDI_VERSION >= NTDDI_WINXP) +_Success_(return!=FALSE) NTKERNELAPI BOOLEAN NTAPI Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=5796… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sat Dec 22 10:09:25 2012 @@ -8119,7 +8119,7 @@ _IRQL_requires_max_(DISPATCH_LEVEL) _At_(DestinationString->Buffer, _Post_equal_to_(SourceString)) -//_At_(DestinationString->Length, _Post_equal_to_(_String_length_(SourceString) * sizeof(WCHAR))) +_At_(DestinationString->Length, _Post_equal_to_(_String_length_(SourceString) * sizeof(WCHAR))) _At_(DestinationString->MaximumLength, _Post_equal_to_(DestinationString->Length + sizeof(WCHAR))) NTSYSAPI VOID @@ -14461,6 +14461,7 @@ _When_((PoolType & (NonPagedPoolMustSucceed | POOL_RAISE_IF_ALLOCATION_FAILURE)) != 0, _Post_notnull_) _Post_writable_byte_size_(NumberOfBytes) +_Function_class_(ALLOCATE_FUNCTION) NTKERNELAPI PVOID NTAPI @@ -14531,6 +14532,7 @@ _Inout_ PERESOURCE Resource); _IRQL_requires_max_(DISPATCH_LEVEL) +_Function_class_(FREE_FUNCTION) NTKERNELAPI VOID NTAPI Modified: trunk/reactos/include/psdk/driverspecs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/driverspecs.h… ============================================================================== --- trunk/reactos/include/psdk/driverspecs.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/driverspecs.h [iso-8859-1] Sat Dec 22 10:09:25 2012 @@ -15,9 +15,140 @@ #include <concurrencysal.h> -// +#ifdef _PREFAST_ + // Stubs -// +#define ___drv_unit_internal_kernel_driver +#define ___drv_unit_kernel_code +#define ___drv_unit_kernel_driver +#define ___drv_unit_user_code +#define ___drv_unit_user_driver +#define __drv_acquiresCancelSpinLock +#define __drv_acquiresCriticalRegion +#define __drv_acquiresExclusiveResource(kind) +#define __drv_acquiresExclusiveResourceGlobal(kind,param) +#define __drv_acquiresPriorityRegion +#define __drv_acquiresResource(kind) +#define __drv_acquiresResourceGlobal(kind,param) +#define __drv_aliasesMem _Post_ _SA_annotes0(SAL_IsAliased) +#define __drv_allocatesMem(kind) _Post_ _SA_annotes1(SAL_NeedsRelease,__yes) +#define __drv_arg(expr,annotes) +#define __drv_at(expr,annotes) +#define __drv_callbackType(kind) +#define __drv_clearDoInit +#define __drv_completionType(kindlist) +#define __drv_constant +#define __drv_defined(x) +#define __drv_deref(annotes) +#define __drv_dispatchType_other +#define __drv_dispatchType(x) +#define __drv_floatRestored +#define __drv_floatSaved +#define __drv_floatUsed +#define __drv_formatString(kind) +#define __drv_freesMem(kind) _Post_ _SA_annotes1(SAL_NeedsRelease,__no) +#define __drv_fun(annotes) +#define __drv_functionClass +#define __drv_holdsCancelSpinLock() +#define __drv_holdsCriticalRegion() +#define __drv_holdsPriorityRegion() +#define __drv_in_deref(annotes) +#define __drv_in(annotes) +#define __drv_innerAcquiresGlobal(kind,param) +#define __drv_innerMustHoldGlobal(kind,param) +#define __drv_innerNeverHoldGlobal(kind,param) +#define __drv_innerReleasesGlobal(kind,param) +#define __drv_interlocked +#define __drv_IoGetDmaAdapter +#define __drv_isCancelIRQL +#define __drv_isObjectPointer +#define __drv_KMDF +#define __drv_maxFunctionIRQL +#define __drv_maxIRQL +#define __drv_minFunctionIRQL +#define __drv_minIRQL +#define __drv_Mode_impl(x) +#define __drv_mustHold(kind) +#define __drv_mustHoldCancelSpinLock +#define __drv_mustHoldCriticalRegion +#define __drv_mustHoldGlobal(kind,param) +#define __drv_mustHoldPriorityRegion +#define __drv_NDIS +#define __drv_neverHold(kind) +#define __drv_neverHoldCancelSpinLock +#define __drv_neverHoldCriticalRegion +#define __drv_neverHoldGlobal(kind,param) +#define __drv_neverHoldPriorityRegion +#define __drv_nonConstant +#define __drv_notInTry +#define __drv_notPointer +#define __drv_out_deref(annotes) +#define __drv_out(annotes) +#define __drv_preferredFunction(func,why) +#define __drv_raisesIRQL +#define __drv_releasesCancelSpinLock +#define __drv_releasesCriticalRegion +#define __drv_releasesExclusiveResource(kind) +#define __drv_releasesExclusiveResourceGlobal(kind,param) +#define __drv_releasesPriorityRegion +#define __drv_releasesResource(kind) +#define __drv_releasesResourceGlobal(kind,param) +#define __drv_reportError(why) +#define __drv_requiresIRQL +#define __drv_restoresIRQL +#define __drv_restoresIRQLGlobal +#define __drv_ret(annotes) +#define __drv_sameIRQL +#define __drv_savesIRQL +#define __drv_savesIRQLGlobal +#define __drv_setsIRQL(irql) +#define __drv_strictType(typename,mode) +#define __drv_strictTypeMatch(mode) +#define __drv_unit(p) +#define __drv_useCancelIRQL +#define __drv_valueIs(arglist) +#define __drv_WDM +#define __drv_when(cond,annotes) +#define __internal_kernel_driver +#define __kernel_code +#define __kernel_driver +#define __prefast_operator_new_null +#define __prefast_operator_new_throws +#define __user_code +#define __user_driver +#define _Dispatch_type_ +#define _IRQL_always_function_max_(irql) +#define _IRQL_always_function_min_(irql) +#define _IRQL_is_cancel_ +#define _IRQL_raises_(irql) +#define _IRQL_requires_(irql) +#define _IRQL_requires_max_(irql) _Pre_ _SA_annotes1(SAL_maxIRQL,irql) +#define _IRQL_requires_min_(irql) +#define _IRQL_requires_same_ +#define _IRQL_restores_ +#define _IRQL_restores_global_(kind,param) +#define _IRQL_saves_ +#define _IRQL_saves_global_(kind,param) +#define _IRQL_uses_cancel_ +#define _Kernel_clear_do_init_(yesNo) +#define _Kernel_float_restored_ +#define _Kernel_float_saved_ +#define _Kernel_float_used_ +#define _Kernel_IoGetDmaAdapter_ +#define _Kernel_releases_resource_(kind) +#define _Kernel_requires_resource_held_(kind) +#define _Kernel_requires_resource_not_held_(kind) _Pre_ _SA_annotes1(SAL_neverHold, #kind) +#define _Kernel_acquires_resource_(kind) _Post_ _SA_annotes1(SAL_acquire, #kind) + +__ANNOTATION(SAL_maxIRQL(__int64);) +__ANNOTATION(SAL_IsAliased(void);) +__ANNOTATION(SAL_NeedsRelease(enum __SAL_YesNo);) +__ANNOTATION(SAL_neverHold(__In_impl_ char *);) +__ANNOTATION(SAL_acquire(__In_impl_ char *);) + +#else + +/* Dummys */ #define ___drv_unit_internal_kernel_driver #define ___drv_unit_kernel_code #define ___drv_unit_kernel_driver @@ -140,3 +271,5 @@ #define _Kernel_requires_resource_not_held_(kind) #define _Kernel_acquires_resource_(kind) +#endif + Modified: trunk/reactos/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntgdi.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/ntgdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntgdi.h [iso-8859-1] Sat Dec 22 10:09:25 2012 @@ -95,8 +95,8 @@ _In_ INT ySrc, _In_ DWORD iStartScan, _In_ DWORD cNumScan, - IN LPBYTE pInitBits, - IN LPBITMAPINFO pbmi, + _In_reads_bytes_(cjMaxBits) LPBYTE pInitBits, + _In_reads_bytes_(cjMaxInfo) LPBITMAPINFO pbmi, _In_ DWORD iUsage, _In_ UINT cjMaxBits, _In_ UINT cjMaxInfo, @@ -108,12 +108,12 @@ BOOL APIENTRY NtGdiGetFontResourceInfoInternalW( - IN LPWSTR pwszFiles, + _In_reads_z_(cwc) LPWSTR pwszFiles, _In_ ULONG cwc, _In_ ULONG cFiles, - _In_ UINT cjIn, - OUT LPDWORD pdwBytes, - OUT LPVOID pvBuf, + _In_ UINT cjBuf, + _Out_ LPDWORD pdwBytes, + _Out_writes_bytes_(cjBuf) LPVOID pvBuf, _In_ DWORD iType ); Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=579… ============================================================================== --- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Sat Dec 22 10:09:25 2012 @@ -647,7 +647,7 @@ //#define _In_reads_to_ptr_opt_(ptr) //#define _In_reads_to_ptr_opt_z_(ptr) //#define _In_reads_to_ptr_z_(ptr) -//#define _In_reads_z_(size) +#define _In_reads_z_(size) #define _In_z_ #define _In_z_bytecount_(size) //#define _In_z_bytecount_c_(size) @@ -796,7 +796,7 @@ //#define _Out_writes_z_(size) #define _Out_z_bytecap_(size) //#define _Out_z_bytecap_c_(size) -//#define _Out_z_bytecap_post_bytecount_(cap,count) +#define _Out_z_bytecap_post_bytecount_(cap,count) _SAL11_Name(_Out_z_bytecap_post_bytecount_) _Group_(_Pre_bytecap_(cap) [SA_Post(Valid=SA_Yes)] _Post_z_bytecount_(count)) //#define _Out_z_bytecap_x_(size) //#define _Out_z_bytecapcount_(capcount) //#define _Out_z_cap_(size) @@ -868,7 +868,7 @@ #define _Post_invalid_ _SAL2_Name(_Post_invalid_) _Group_([SA_Post(Deref=1,Valid=SA_No)]) #define _Post_maybenull_ _SAL2_Name(_Post_maybenull_) _Group_([SA_Post(Null=SA_Maybe)]) //#define _Post_maybez_ -#define _Post_notnull_ +#define _Post_notnull_ _SAL2_Name(_Post_notnull_) _Group_([SA_Post(Null=SA_No)]) //#define _Post_null_ #define _Post_ptr_invalid_ _SAL2_Name(_Post_ptr_invalid_) _Group_([SA_Post(Valid=SA_No)]) //#define _Post_readable_byte_size_(size) @@ -878,19 +878,19 @@ #define _Post_writable_byte_size_(size) //#define _Post_writable_size_(size) #define _Post_z_ _SAL2_Name(_Post_z_) _Group_([SA_Post(NullTerminated=SA_Yes)] [SA_Post(Valid=SA_Yes)]) -//#define _Post_z_bytecount_(size) +#define _Post_z_bytecount_(size) _SAL11_Name(_Post_z_bytecount_) _Group_([SA_Post(NullTerminated=SA_Yes,ValidBytes="\n" _SA_SPECSTRIZE(size) )] [SA_Post(Valid=SA_Yes)]) //#define _Post_z_bytecount_c_(size) //#define _Post_z_bytecount_x_(size) //#define _Post_z_count_(size) //#define _Post_z_count_c_(size) //#define _Post_z_count_x_(size) -//#define _Pre_bytecap_(size) +#define _Pre_bytecap_(size) _SAL11_Name(_Pre_bytecap_) _Group_([SA_Pre(Null=SA_No,Notref=1)] [SA_Pre(WritableBytes="\n" _SA_SPECSTRIZE(size) )]) //#define _Pre_bytecap_c_(size) //#define _Pre_bytecap_x_(size) #define _Pre_bytecount_(size) //#define _Pre_bytecount_c_(size) //#define _Pre_bytecount_x_(size) -#define _Pre_cap_(size) _SAL11_Name(_Pre_cap_) _Group_([SA_Pre(Null=SA_No,Notref=1)] [SA_Pre(WritableElements="\n" #size )]) +#define _Pre_cap_(size) _SAL11_Name(_Pre_cap_) _Group_([SA_Pre(Null=SA_No,Notref=1)] [SA_Pre(WritableElements="\n" _SA_SPECSTRIZE(size) )]) //#define _Pre_cap_c_(size) //#define _Pre_cap_c_one_ //#define _Pre_cap_for_(param) @@ -1003,7 +1003,7 @@ //#define _Ret_notnull_ //#define _Ret_null_ //#define _Ret_opt_ -#define _Ret_opt_bytecap_(size) +#define _Ret_opt_bytecap_(size) _SAL11_Name(_Ret_opt_bytecap_) _Group_([SA_Post(Null=SA_Maybe,Notref=1)] [SA_Post(WritableBytes="\n" _SA_SPECSTRIZE(size))]) //#define _Ret_opt_bytecap_c_(size) //#define _Ret_opt_bytecap_x_(size) #define _Ret_opt_bytecount_(size) @@ -1038,7 +1038,7 @@ //#define _Ret_z_bytecount_(size) //#define _Ret_z_cap_(size) //#define _Ret_z_count_(size) -#define _Return_type_success_(expr) +#define _Return_type_success_(expr) _SAL2_Name(_Return_type_success_) _Group_([SA_Success(Condition=_SA_SPECSTRIZE(expr))]) //#define _Scanf_format_string_ //#define _Scanf_s_format_string_ #define _Struct_size_bytes_(size) Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Sat Dec 22 10:09:25 2012 @@ -4270,20 +4270,22 @@ BOOL WINAPI DrawStateA(_In_ HDC, _In_opt_ HBRUSH, _In_opt_ DRAWSTATEPROC, _In_ LPARAM, _In_ WPARAM, _In_ int, _In_ int, _In_ int, _In_ int, _In_ UINT); BOOL WINAPI DrawStateW(_In_ HDC, _In_opt_ HBRUSH, _In_opt_ DRAWSTATEPROC, _In_ LPARAM, _In_ WPARAM, _In_ int, _In_ int, _In_ int, _In_ int, _In_ UINT); +_Success_(return) int WINAPI DrawTextA( _In_ HDC hdc, - _Inout_updates_opt_(cchText) LPCSTR lpchText, + _At_((LPSTR)lpchText, _Inout_updates_opt_(cchText)) LPCSTR lpchText, _In_ int cchText, _Inout_ LPRECT lprc, _In_ UINT format); +_Success_(return) int WINAPI DrawTextW( _In_ HDC hdc, - _Inout_updates_opt_(cchText) LPCWSTR lpchText, + _At_((LPWSTR)lpchText, _Inout_updates_opt_(cchText)) LPCWSTR lpchText, _In_ int cchText, _Inout_ LPRECT lprc, _In_ UINT format); Modified: trunk/reactos/include/xdk/ccfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ccfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/ccfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/ccfuncs.h [iso-8859-1] Sat Dec 22 10:09:25 2012 @@ -320,6 +320,7 @@ #endif #if (NTDDI_VERSION >= NTDDI_WINXP) +_Success_(return!=FALSE) NTKERNELAPI BOOLEAN NTAPI Modified: trunk/reactos/include/xdk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/exfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/exfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/exfuncs.h [iso-8859-1] Sat Dec 22 10:09:25 2012 @@ -528,6 +528,7 @@ _When_((PoolType & (NonPagedPoolMustSucceed | POOL_RAISE_IF_ALLOCATION_FAILURE)) != 0, _Post_notnull_) _Post_writable_byte_size_(NumberOfBytes) +_Function_class_(ALLOCATE_FUNCTION) NTKERNELAPI PVOID NTAPI @@ -598,6 +599,7 @@ _Inout_ PERESOURCE Resource); _IRQL_requires_max_(DISPATCH_LEVEL) +_Function_class_(FREE_FUNCTION) NTKERNELAPI VOID NTAPI Modified: trunk/reactos/include/xdk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/xdk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/rtlfuncs.h [iso-8859-1] Sat Dec 22 10:09:25 2012 @@ -217,7 +217,7 @@ _IRQL_requires_max_(DISPATCH_LEVEL) _At_(DestinationString->Buffer, _Post_equal_to_(SourceString)) -//_At_(DestinationString->Length, _Post_equal_to_(_String_length_(SourceString) * sizeof(WCHAR))) +_At_(DestinationString->Length, _Post_equal_to_(_String_length_(SourceString) * sizeof(WCHAR))) _At_(DestinationString->MaximumLength, _Post_equal_to_(DestinationString->Length + sizeof(WCHAR))) NTSYSAPI VOID

11 years, 9 months

[hbelusca] 57963: [REG] - Upgrade the files architecture to the classic one : lang-directory for language resource files, rsrc.rc and <app_name>.rc for main resource files. - Convert remaining lang...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Dec 21 23:48:23 2012 New Revision: 57963 URL: http://svn.reactos.org/svn/reactos?rev=57963&view=rev Log: [REG] - Upgrade the files architecture to the classic one : lang-directory for language resource files, rsrc.rc and <app_name>.rc for main resource files. - Convert remaining language resource files to UTF-8 without BOM. - Add version information to the program - Patch by Lee Schroeder. CORE-6821 #resolve #comment Committed in r57963. Thanks :) Added: trunk/reactos/base/applications/cmdutils/reg/lang/ (with props) trunk/reactos/base/applications/cmdutils/reg/lang/bg-BG.rc - copied unchanged from r57952, trunk/reactos/base/applications/cmdutils/reg/Bg.rc trunk/reactos/base/applications/cmdutils/reg/lang/da-DK.rc - copied unchanged from r57952, trunk/reactos/base/applications/cmdutils/reg/Da.rc trunk/reactos/base/applications/cmdutils/reg/lang/de-DE.rc - copied unchanged from r57952, trunk/reactos/base/applications/cmdutils/reg/De.rc trunk/reactos/base/applications/cmdutils/reg/lang/en-US.rc - copied unchanged from r57952, trunk/reactos/base/applications/cmdutils/reg/En.rc trunk/reactos/base/applications/cmdutils/reg/lang/es-ES.rc - copied unchanged from r57952, trunk/reactos/base/applications/cmdutils/reg/Es.rc trunk/reactos/base/applications/cmdutils/reg/lang/fr-FR.rc - copied unchanged from r57952, trunk/reactos/base/applications/cmdutils/reg/Fr.rc trunk/reactos/base/applications/cmdutils/reg/lang/it-IT.rc - copied unchanged from r57952, trunk/reactos/base/applications/cmdutils/reg/It.rc trunk/reactos/base/applications/cmdutils/reg/lang/ja-JP.rc - copied unchanged from r57952, trunk/reactos/base/applications/cmdutils/reg/Ja.rc trunk/reactos/base/applications/cmdutils/reg/lang/ko-KR.rc - copied, changed from r57952, trunk/reactos/base/applications/cmdutils/reg/Ko.rc trunk/reactos/base/applications/cmdutils/reg/lang/lt-LT.rc - copied unchanged from r57952, trunk/reactos/base/applications/cmdutils/reg/Lt.rc trunk/reactos/base/applications/cmdutils/reg/lang/nl-NL.rc - copied unchanged from r57952, trunk/reactos/base/applications/cmdutils/reg/Nl.rc trunk/reactos/base/applications/cmdutils/reg/lang/no-NO.rc - copied unchanged from r57952, trunk/reactos/base/applications/cmdutils/reg/No.rc trunk/reactos/base/applications/cmdutils/reg/lang/pl-PL.rc - copied, changed from r57952, trunk/reactos/base/applications/cmdutils/reg/Pl.rc trunk/reactos/base/applications/cmdutils/reg/lang/pt-PT.rc - copied unchanged from r57952, trunk/reactos/base/applications/cmdutils/reg/Pt.rc trunk/reactos/base/applications/cmdutils/reg/lang/ro-RO.rc - copied unchanged from r57952, trunk/reactos/base/applications/cmdutils/reg/Ro.rc trunk/reactos/base/applications/cmdutils/reg/lang/ru-RU.rc - copied unchanged from r57952, trunk/reactos/base/applications/cmdutils/reg/Ru.rc trunk/reactos/base/applications/cmdutils/reg/lang/sl-SI.rc - copied unchanged from r57952, trunk/reactos/base/applications/cmdutils/reg/Si.rc trunk/reactos/base/applications/cmdutils/reg/lang/sv-SE.rc - copied unchanged from r57952, trunk/reactos/base/applications/cmdutils/reg/Sv.rc trunk/reactos/base/applications/cmdutils/reg/lang/uk-UA.rc - copied unchanged from r57952, trunk/reactos/base/applications/cmdutils/reg/Uk.rc trunk/reactos/base/applications/cmdutils/reg/reg.rc (with props) trunk/reactos/base/applications/cmdutils/reg/rsrc.rc - copied, changed from r57952, trunk/reactos/base/applications/cmdutils/reg/rsrc.rc Removed: trunk/reactos/base/applications/cmdutils/reg/Bg.rc trunk/reactos/base/applications/cmdutils/reg/Da.rc trunk/reactos/base/applications/cmdutils/reg/De.rc trunk/reactos/base/applications/cmdutils/reg/En.rc trunk/reactos/base/applications/cmdutils/reg/Es.rc trunk/reactos/base/applications/cmdutils/reg/Fr.rc trunk/reactos/base/applications/cmdutils/reg/It.rc trunk/reactos/base/applications/cmdutils/reg/Ja.rc trunk/reactos/base/applications/cmdutils/reg/Ko.rc trunk/reactos/base/applications/cmdutils/reg/Lt.rc trunk/reactos/base/applications/cmdutils/reg/Nl.rc trunk/reactos/base/applications/cmdutils/reg/No.rc trunk/reactos/base/applications/cmdutils/reg/Pl.rc trunk/reactos/base/applications/cmdutils/reg/Pt.rc trunk/reactos/base/applications/cmdutils/reg/Ro.rc trunk/reactos/base/applications/cmdutils/reg/Ru.rc trunk/reactos/base/applications/cmdutils/reg/Si.rc trunk/reactos/base/applications/cmdutils/reg/Sv.rc trunk/reactos/base/applications/cmdutils/reg/Uk.rc Modified: trunk/reactos/base/applications/cmdutils/reg/CMakeLists.txt Removed: trunk/reactos/base/applications/cmdutils/reg/Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/Bg.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/Bg.rc (removed) @@ -1,40 +1,0 @@ -/* - * REG.EXE - Wine-compatible reg program. - * Bulgarian language support - * - * Copyright 2008 Andrew Riedi - * - * 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 "reg.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - STRING_USAGE, "Ð¡Ð¸Ð½ÑÐ°ÐºÑÐ¸ÑÑÑ Ð½Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°ÑÐ° Ðµ:\n\nREG [ ADD | DELETE | QUERY ]\nREG ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° /?\n" - STRING_ADD_USAGE, "REG ADD ÐºÐ»ÑÑ_Ð¸Ð¼Ðµ [/v ÑÑÐ¾Ð¹Ð½Ð¾ÑÑ_Ð¸Ð¼Ðµ | /ve] [/t Ð²Ð¸Ð´] [/s ÑÐ°Ð·Ð´ÐµÐ»Ð¸ÑÐµÐ»] [/d Ð´Ð°Ð½Ð½Ð¸] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE ÐºÐ»ÑÑ_Ð¸Ð¼Ðµ [/v ÑÑÐ¾Ð¹Ð½Ð¾ÑÑ_Ð¸Ð¼Ðµ | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY ÐºÐ»ÑÑ_Ð¸Ð¼Ðµ [/v ÑÑÐ¾Ð¹Ð½Ð¾ÑÑ_Ð¸Ð¼Ðµ | /ve] [/s]\n" - STRING_SUCCESS, "ÐÐµÑÐ¹ÑÑÐ²Ð¸ÐµÑÐ¾ Ðµ Ð¿ÑÐ¸ÐºÐ»ÑÑÐµÐ½Ð¾ ÑÑÐ¿ÐµÑÐ½Ð¾\n" - STRING_INVALID_KEY, "ÐÑÐµÑÐºÐ°: ÐÐµÐ´Ð¾Ð¿ÑÑÑÐ¸Ð¼Ð¾ Ð¸Ð¼Ðµ Ð·Ð° ÐºÐ»ÑÑ\n" - STRING_INVALID_CMDLINE, "ÐÑÐµÑÐºÐ°: ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»Ð½Ð¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¸ Ð½Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸Ñ ÑÐµÐ´\n" - STRING_NO_REMOTE, "ÐÑÐµÑÐºÐ°: ÐÐµÑÑÐ¿ÐµÑÐ½Ð¾ Ð´Ð¾Ð±Ð°Ð²ÑÐ½Ðµ Ð½Ð° ÐºÐ»ÑÑÐ¾Ð²Ðµ Ð² Ð¾ÑÐ´Ð°Ð»ÐµÑÐµÐ½Ð°ÑÐ° Ð¼Ð°ÑÐ¸Ð½Ð°\n" - STRING_CANNOT_FIND, "ÐÑÐµÑÐºÐ°: Ð£ÑÐµÐ´Ð±Ð°ÑÐ° Ð½Ðµ Ð¾ÑÐºÑÐ¸ ÑÐºÐ°Ð·Ð°Ð½Ð¸Ñ ÑÐµÐ³Ð¸ÑÑÑÑÐµÐ½ ÐºÐ»ÑÑ Ð¸Ð»Ð¸ ÑÑÐ¾Ð¹Ð½Ð¾ÑÑ\n" -} Modified: trunk/reactos/base/applications/cmdutils/reg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/CMakeLists.txt [iso-8859-1] Fri Dec 21 23:48:23 2012 @@ -4,7 +4,7 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -add_executable(reg reg.c rsrc.rc) +add_executable(reg reg.c reg.rc) set_module_type(reg win32cui UNICODE) add_importlibs(reg advapi32 user32 msvcrt kernel32) Removed: trunk/reactos/base/applications/cmdutils/reg/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/Da.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/Da.rc (removed) @@ -1,40 +1,0 @@ -/* - * REG.EXE - Wine-compatible reg program. - * Danish language support - * - * Copyright 2008 Jens Albretsen <jens(a)albretsen.dk> - * 2010 Thomas Larsen - * - * 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 "reg.h" - -#pragma code_page(65001) - -LANGUAGE LANG_DANISH, SUBLANG_DEFAULT - -STRINGTABLE -{ - STRING_USAGE, "Syntaksen for dette kommando er:\n\nREG [ ADD | DELETE | QUERY ]\nREG kommando /?\n" - STRING_ADD_USAGE, "REG ADD nÃ¸gle_navn [/v vÃ¦rdi | /ve] [/t type] [/s separator] [/d data] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE nÃ¸gle_navn [/v vÃ¦rdi | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY nÃ¸gle_navn [/v vÃ¦rdi | /ve] [/s]\n" - STRING_SUCCESS, "Operationen blev afsluttet med succes\n" - STRING_INVALID_KEY, "Fejl: Ugyldigt nÃ¸gle navn\n" - STRING_INVALID_CMDLINE, "Fejl: Ugyldige kommando linje parametre\n" - STRING_NO_REMOTE, "Fejl: Kunne ikke tilfÃ¸je nÃ¸gler til fjern maskinen\n" - STRING_CANNOT_FIND, "Fejl: Systemet kunne ikke finde, den angivet registrerings nÃ¸gle eller vÃ¦rdi\n" -} Removed: trunk/reactos/base/applications/cmdutils/reg/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/De.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/De.rc (removed) @@ -1,40 +1,0 @@ -/* - * REG.EXE - Wine-compatible reg program. - * German language support - * - * Copyright 2008 Andrej Sinicyn - * Copyright 2009 Michael Stefaniuc - * - * 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 "reg.h" - -LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL - -#pragma code_page(65001) - -STRINGTABLE -{ - STRING_USAGE, "Die Syntax von diesem Befehl ist:\n\nREG [ ADD | DELETE | QUERY ]\nREG Befehl /?\n" - STRING_ADD_USAGE, "REG ADD SchlÃ¼ssel [/v Wert | /ve] [/t Typ] [/s Trenner] [/d Daten] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE SchlÃ¼ssel [/v Wert | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY SchlÃ¼ssel [/v Wert | /ve] [/s]\n" - STRING_SUCCESS, "Der Vorgang wurde erfolgreich abgeschlossen\n" - STRING_INVALID_KEY, "Fehler: UngÃ¼ltiger SchlÃ¼ssel\n" - STRING_INVALID_CMDLINE, "Fehler: UngÃ¼ltige Befehlszeilenargumente\n" - STRING_NO_REMOTE, "Fehler: Konnte SchlÃ¼ssel nicht zum remote Rechner hinzufÃ¼gen\n" - STRING_CANNOT_FIND, "Fehler: Der angegebene SchlÃ¼ssel oder Wert konnte nicht gefunden werden\n" -} Removed: trunk/reactos/base/applications/cmdutils/reg/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/En.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/En.rc (removed) @@ -1,37 +1,0 @@ -/* - * REG.EXE - Wine-compatible reg program. - * English language support - * - * Copyright 2008 Andrew Riedi - * - * 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 "reg.h" - -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT - -STRINGTABLE -{ - STRING_USAGE, "The syntax of this command is:\n\nREG [ ADD | DELETE | QUERY ]\nREG command /?\n" - STRING_ADD_USAGE, "REG ADD key_name [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE key_name [/v value_name | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY key_name [/v value_name | /ve] [/s]\n" - STRING_SUCCESS, "The operation completed successfully\n" - STRING_INVALID_KEY, "Error: Invalid key name\n" - STRING_INVALID_CMDLINE, "Error: Invalid command line parameters\n" - STRING_NO_REMOTE, "Error: Unable to add keys to remote machine\n" - STRING_CANNOT_FIND, "Error: The system was unable to find the specified registry key or value\n" -} Removed: trunk/reactos/base/applications/cmdutils/reg/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/Es.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/Es.rc (removed) @@ -1,40 +1,0 @@ -/* - * REG.EXE - Wine-compatible reg program. - * Spanish language support - * - * Copyright 2010 JosÃ© Rostagno - * - * 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 "reg.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL - -STRINGTABLE -{ - STRING_USAGE, "La sintaxis de este comando es:\n\nREG [ ADD | DELETE | QUERY ]\nREG comando /?\n" - STRING_ADD_USAGE, "REG ADD nombre_clave [/v nombre_valor | /ve] [/t tipo] [/s separador] [/d datos] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE nombre_clave [/v nombre_valor | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY nombre_clave [/v nombre_valor | /ve] [/s]\n" - STRING_SUCCESS, "La operaciÃ³n finalizÃ³ con Ã©xito\n" - STRING_INVALID_KEY, "Error: nombre de clave no vÃ¡lido\n" - STRING_INVALID_CMDLINE, "Error: parÃ¡metros de lÃnea de comandos invÃ¡lidos\n" - STRING_NO_REMOTE, "Error: No se puede agregar claves al equipo remoto\n" - STRING_CANNOT_FIND, "Error: El sistema no pudo encontrar la clave o el valor del Registro especificado\n" -} Removed: trunk/reactos/base/applications/cmdutils/reg/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/Fr.rc (removed) @@ -1,41 +1,0 @@ -/* - * REG.EXE - Wine-compatible reg program. - * French language support - * - * Copyright 2008 Francois Gouget - * Copyright 2009 Jonathan Ernst - * - * 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 "reg.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL - -STRINGTABLE -{ - STRING_USAGE, "La syntaxe de cette commande est :\n\nREG [ ADD | DELETE | QUERY ]\nREG commande /?\n" - STRING_ADD_USAGE, "REG ADD nom_de_clÃ© [/v nom_de_valeur | /ve] [/t type] [/s sÃ©parateur] [/d donnÃ©es] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE nom_de_clÃ© [/v nom_de_valeur | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY nom_de_clÃ© [/v nom_de_valeur | /ve] [/s]\n" - STRING_SUCCESS, "L'opÃ©ration s'est terminÃ©e avec succÃ¨s\n" - STRING_INVALID_KEY, "ErreurÂ : nom de clÃ© non valable\n" - STRING_INVALID_CMDLINE, "ErreurÂ : paramÃ¨tre de ligne de commande non valable\n" - STRING_NO_REMOTE, "ErreurÂ : impossible d'ajouter des clÃ©s Ã une machine distante\n" - STRING_CANNOT_FIND, "ErreurÂ : le systÃ¨me n'a pas pu trouver la clÃ© ou la valeur de registre spÃ©cifiÃ©e\n" -} Removed: trunk/reactos/base/applications/cmdutils/reg/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/It.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/It.rc (removed) @@ -1,40 +1,0 @@ -/* - * REG.EXE - Wine-compatible reg program. - * Italian language support - * - * Copyright 2010 Luca Bennati - * - * 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 "reg.h" - -/*UTF-8*/ -#pragma code_page(65001) - -LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL - -STRINGTABLE -{ - STRING_USAGE, "La sintassi di questo comando Ã¨:\n\nREG [ ADD | DELETE | QUERY ]\nREG comando /?\n" - STRING_ADD_USAGE, "REG ADD nome_della_chiave [/v nome_del_valore | /ve] [/t tipo] [/s separatore] [/d dati] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE nome_della_chiave [/v nome_del_valore | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY nome_della_chiave [/v nome_del_valore | /ve] [/s]\n" - STRING_SUCCESS, "Operazione completata con successo\n" - STRING_INVALID_KEY, "Errore: nome della chiave non valido\n" - STRING_INVALID_CMDLINE, "Errore: parametri della linea di comando non validi\n" - STRING_NO_REMOTE, "Errore: impossibile aggiungere chiavi alla macchina remota\n" - STRING_CANNOT_FIND, "Errore: il sistema non Ã¨ riuscito a trovare la chiave di registro o il valore specificati\n" -} Removed: trunk/reactos/base/applications/cmdutils/reg/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/Ja.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/Ja.rc (removed) @@ -1,40 +1,0 @@ -/* - * REG.EXE - Wine-compatible reg program. - * Japanese language support - * - * Copyright 2008 Andrew Riedi - * - * 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 "reg.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT - -STRINGTABLE -{ - STRING_USAGE, "ãã®ã³ãã³ãã®æ§æã¯æ¬¡ã®ã¨ããã§ã:\n\nREG [ ADD | DELETE | QUERY ]\nREG ã³ãã³ã /?\n" - STRING_ADD_USAGE, "REG ADD ãã¼å [/v å¤å | /ve] [/t type] [/s ã»ãã¬ã¼ã¿] [/d ãã¼ã¿] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE ãã¼å [/v å¤å | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY ãã¼å [/v å¤å | /ve] [/s]\n" - STRING_SUCCESS, "æä½ã¯æ£å¸¸ã«å®äºãã¾ãã\n" - STRING_INVALID_KEY, "ã¨ã©ã¼: ãã¼åãç¡å¹ã§ã\n" - STRING_INVALID_CMDLINE, "ã¨ã©ã¼: ã³ãã³ã ã©ã¤ã³å¼æ°ãç¡å¹ã§ã\n" - STRING_NO_REMOTE, "ã¨ã©ã¼: ãªã¢ã¼ã ãã·ã³ã«ãã¼ãè¿½å ã§ãã¾ããã§ãã\n" - STRING_CANNOT_FIND, "ã¨ã©ã¼: ã·ã¹ãã ã¯æå®ããããã¼ã¾ãã¯å¤ãè¦ã¤ãããã¾ããã§ãã\n" -} Removed: trunk/reactos/base/applications/cmdutils/reg/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/Ko.rc (removed) @@ -1,38 +1,0 @@ -/* - * REG.EXE - Wine-compatible reg program. - * Korean language support - * - * Copyright 2008 Andrew Riedi - * Copyright 2008 YunSong Hwang - * - * 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 "reg.h" - -LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - STRING_USAGE, "¸í·É¾î Çü½Ä:\n\nREG [ ADD | DELETE | QUERY ]\nREG ¸í·É¾î /?\n" - STRING_ADD_USAGE, "REG ADD °ª [/v °ª | /ve] [/t Çü½Ä] [/s ºÐ¸®±âÈ£] [/d µ¥ÀÌÅ¸] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE Å° ÀÌ¸§ [/v °ª | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY Å° ÀÌ¸§ [/v °ª| /ve] [/s]\n" - STRING_SUCCESS, "ÀÛ¾÷ÀÌ ¼º°øÀûÀ¸·Î ³¡³µ½À´Ï´Ù\n" - STRING_INVALID_KEY, "¿¡·¯: ¿Ã¹Ù¸£Áö ¾ÊÀº Å° ÀÌ¸§\n" - STRING_INVALID_CMDLINE, "¿¡·¯:¿Ã¹Ù¸£Áö ¾ÊÀº ¸í·É¶óÀÎ ¸Å°³º¯¼ö\n" - STRING_NO_REMOTE, "¿¡·¯: ¿ø°Ý ¸Ó½Å¿¡ Å°¸¦ ´õÇÏ´Â °ÍÀº °¡´ÉÇÏÁö ¾Ê½À´Ï´Ù\n" - STRING_CANNOT_FIND, "¿¡·¯: ÀÌ ½Ã½ºÅÛ¿¡¼ ÁöÁ¤µÈ ·¹Áö½ºÆ®¸® Å°³ª °ªÀ» Ã£À»¼ö ¾ø½À´Ï´Ù\n" -} Removed: trunk/reactos/base/applications/cmdutils/reg/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/Lt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/Lt.rc (removed) @@ -1,40 +1,0 @@ -/* - * REG.EXE - Wine-compatible reg program. - * Lithuanian language support - * - * Copyright 2009 Aurimas FiÅ¡eras <aurimas(a)gmail.com> - * - * 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 "reg.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL - -STRINGTABLE -{ - STRING_USAGE, "Å ios komandos sintaksÄ yra:\n\nREG [ ADD | DELETE | QUERY ]\nREG komanda /?\n" - STRING_ADD_USAGE, "REG ADD rakto_vardas [/v reikÅ¡mÄs_vardas | /ve] [/t tipas] [/s skirtukas] [/d duomenys] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE rakto_vardas [/v reikÅ¡mÄs_vardas | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY rakto_vardas [/v reikÅ¡mÄs_vardas | /ve] [/s]\n" - STRING_SUCCESS, "Operacija sÄkmingai Ä¯vykdyta\n" - STRING_INVALID_KEY, "Klaida: Netinkamas rakto vardas\n" - STRING_INVALID_CMDLINE, "Klaida: Netinkami komandos eilutÄs parametrai\n" - STRING_NO_REMOTE, "Klaida: Negalima pridÄti raktÅ³ nuotoliniame kompiuteryje\n" - STRING_CANNOT_FIND, "Klaida: Sistemai nepavyko rasti nurodyto registro rakto ar reikÅ¡mÄs\n" -} Removed: trunk/reactos/base/applications/cmdutils/reg/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/Nl.rc (removed) @@ -1,37 +1,0 @@ -/* - * REG.EXE - Wine-compatible reg program. - * Dutch language support - * - * Copyright 2008 Frans Kool - * - * 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 "reg.h" - -LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL - -STRINGTABLE -{ - STRING_USAGE, "Gebruik van dit commando is:\n\nREG [ ADD | DELETE | QUERY ]\nREG commando /?\n" - STRING_ADD_USAGE, "REG ADD sleutel_naam [/v waarde_naam | /ve] [/t type] [/s scheidingsteken] [/d data] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE sleutel_naam [/v waarde_naam | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY sleutel_naam [/v waarde_naam | /ve] [/s]\n" - STRING_SUCCESS, "De bewerking is succesvol voltooid\n" - STRING_INVALID_KEY, "Fout: Foutieve sleutelnaam\n" - STRING_INVALID_CMDLINE, "Fout: Foutieve commandoregel-parameters\n" - STRING_NO_REMOTE, "Fout: Sleutels konden niet toegevoegd worden aan de remote machine\n" - STRING_CANNOT_FIND, "Fout: Het systeem kon de gespecificeerde registersleutel of waarde niet vinden\n" -} Removed: trunk/reactos/base/applications/cmdutils/reg/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/No.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/No.rc (removed) @@ -1,39 +1,0 @@ -/* - * REG.EXE - Wine-compatible reg program. - * Norwegian (BokmÃ¥l) language support - * - * Copyright 2008-2009 Alexander N. SÃ¸rnes <alex(a)thehandofagony.com> - * - * 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 "reg.h" - -#pragma code_page(65001) - -LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL - -STRINGTABLE -{ - STRING_USAGE, "Programmer kjÃ¸res som fÃ¸lger:\n\nREG [ ADD | DELETE | QUERY ]\nREG kommando /?\n" - STRING_ADD_USAGE, "REG ADD nÃ¸kkelnavn [/v verdi | /ve] [/t type] [/s separator] [/d data] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE nÃ¸kkelnavn [/v verdi | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY nÃ¸kkelnavn [/v verdi | /ve] [/s]\n" - STRING_SUCCESS, "Operasjonen ble utfÃ¸rt\n" - STRING_INVALID_KEY, "Feil: Ugyldig nÃ¸kkelnavn\n" - STRING_INVALID_CMDLINE, "Feil: Ugyldige parametere pÃ¥ kommandolinjen\n" - STRING_NO_REMOTE, "Feil: Kan ikke legge til nÃ¸kler pÃ¥ ekstern maskin\n" - STRING_CANNOT_FIND, "Feil: Systemet klarte ikke finne den angitte registernÃ¸kkelen eller -verdien\n" -} Removed: trunk/reactos/base/applications/cmdutils/reg/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/Pl.rc (removed) @@ -1,39 +1,0 @@ -/* - * REG.EXE - Wine-compatible reg program. - * Polish language support - * - * Copyright 2008 Andrew Riedi - * Copyright 2008 Mikolaj Zalewski - * Copyright 2010 £ukasz Wojni³owicz - * - * 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 "reg.h" - -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT - -STRINGTABLE -{ - STRING_USAGE, "Sk³adnia tego polecenia:\n\nREG [ ADD | DELETE | QUERY ]\nREG polecenie /?\n" - STRING_ADD_USAGE, "REG ADD nazwa_klucza [/v nazwa_wartoci | /ve] [/t typ] [/s separator] [/d dane] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE nazwa_klucza [/v nazwa_wartoci | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY nazwa_klucza [/v nazwa_wartoci | /ve] [/s]\n" - STRING_SUCCESS, "Operacja zakoñczona pomylnie\n" - STRING_INVALID_KEY, "B³¹d: Niew³aciwa nazwa klucza\n" - STRING_INVALID_CMDLINE, "B³¹d: Niew³aciwe parametry wiersza poleceñ\n" - STRING_NO_REMOTE, "B³¹d: Nie mo¿na dodaæ kluczy do zdalnej maszyny\n" - STRING_CANNOT_FIND, "B³¹d: System nie móg³ znaleæ podanej wartoci lub klucza rejestru\n" -} Removed: trunk/reactos/base/applications/cmdutils/reg/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/Pt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/Pt.rc (removed) @@ -1,40 +1,0 @@ -/* - * REG.EXE - Wine-compatible reg program. - * Portuguese language support - * - * Copyright 2008 Andrew Riedi - * Copyright 2008 Ricardo Filipe - * - * 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 "reg.h" - -#pragma code_page(65001) - -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL - -STRINGTABLE -{ - STRING_USAGE, "A sintaxe deste comando Ã©:\n\nREG [ ADD | DELETE | QUERY ]\nREG comando /?\n" - STRING_ADD_USAGE, "REG ADD nome_chave [/v nome_valor | /ve] [/t tipo] [/s separador] [/d dados] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE nome_chave [/v nome_valor | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY nome_chave [/v nome_valor | /ve] [/s]\n" - STRING_SUCCESS, "A operaÃ§Ã£o foi completada com sucesso\n" - STRING_INVALID_KEY, "Erro: Nome de chave invÃ¡lido\n" - STRING_INVALID_CMDLINE, "Erro: ParÃ¢metros da linha de comandos invÃ¡lidos\n" - STRING_NO_REMOTE, "Erro: Incapaz de adicionar chaves Ã mÃ¡quina remota\n" - STRING_CANNOT_FIND, "Erro: O sistema foi incapaz de encontrar a chave de registo ou valor especificado\n" -} Removed: trunk/reactos/base/applications/cmdutils/reg/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/Ro.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/Ro.rc (removed) @@ -1,40 +1,0 @@ -/* - * REG.EXE - Wine-compatible reg program. - * - * Copyright 2008 Andrew Riedi - * Copyright 2010 Claudia CotunÄ - * Michael Stefaniuc - * - * 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 "reg.h" - -LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL - -#pragma code_page(65001) - -STRINGTABLE -{ - STRING_USAGE, "Sintaxa acestei comenzi este:\n\nREG [ ADD | DELETE | QUERY ]\nREG comandÄ /?\n" - STRING_ADD_USAGE, "REG ADD nume_cheie [/v nume_valoare | /ve] [/t tip] [/s separator] [/d date] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE nume_cheie [/v nume_valoare | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY nume_cheie [/v nume_valoare | /ve] [/s]\n" - STRING_SUCCESS, "OperaÈiunea a fost finalizatÄ cu succes\n" - STRING_INVALID_KEY, "Eroare: Nume de cheie nevalid\n" - STRING_INVALID_CMDLINE, "Eroare: Parametri nevalizi pentru linia de comandÄ\n" - STRING_NO_REMOTE, "Eroare: Nu se pot adÄuga chei pe calculatorul de la distanÈÄ\n" - STRING_CANNOT_FIND, "Eroare: Sistemul nu a putut gÄsi cheia sau valoarea de registru specificatÄ\n" -} Removed: trunk/reactos/base/applications/cmdutils/reg/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/Ru.rc (removed) @@ -1,39 +1,0 @@ -/* - * Russian language support - * - * Copyright 2008 Vitaliy Margolen - * - * 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 "reg.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - STRING_USAGE, "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ:\n\nREG [ ADD | DELETE | QUERY ]\nREG <ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°> /?\n" - STRING_ADD_USAGE, "REG ADD <ÐºÐ»ÑÑ> [/v <Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ> | /ve] [/t <ÑÐ¸Ð¿>] [/s <ÑÐ°Ð·Ð´ÐµÐ»Ð¸ÑÐµÐ»Ñ>] [/d Ð´Ð°Ð½Ð½ÑÐµ] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE <ÐºÐ»ÑÑ> [/v <Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ> | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY <ÐºÐ»ÑÑ> [/v <Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ> | /ve] [/s]\n" - STRING_SUCCESS, "ÐÐ¿ÐµÑÐ°ÑÐ¸Ñ ÑÑÐ¿ÐµÑÐ½Ð¾ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð°\n" - STRING_INVALID_KEY, "ÐÑÐ¸Ð±ÐºÐ°: Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾Ðµ Ð¸Ð¼Ñ ÐºÐ»ÑÑÐ°\n" - STRING_INVALID_CMDLINE, "ÐÑÐ¸Ð±ÐºÐ°: Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½ÑÐµ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ ÑÑÑÐ¾ÐºÐ¸\n" - STRING_NO_REMOTE, "ÐÑÐ¸Ð±ÐºÐ°: Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ ÐºÐ»ÑÑÐ¸ Ð½Ð° ÑÐ´Ð°Ð»ÐµÐ½Ð½Ð¾Ð¹ Ð¼Ð°ÑÐ¸Ð½Ðµ\n" - STRING_CANNOT_FIND, "ÐÑÐ¸Ð±ÐºÐ°: Ð½Ðµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð½Ð°Ð¹ÑÐ¸ ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÐ¹ ÐºÐ»ÑÑ ÑÐµÐµÑÑÑÐ° Ð¸Ð»Ð¸ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ\n" -} Removed: trunk/reactos/base/applications/cmdutils/reg/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/Si.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/Si.rc (removed) @@ -1,39 +1,0 @@ -/* - * REG.EXE - Wine-compatible reg program. - * Slovenian language support - * - * Copyright 2008 Rok Mandeljc - * - * 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 "reg.h" - -#pragma code_page(65001) - -LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - STRING_USAGE, "Sintaksa ukaza:\n\nREG [ ADD | DELETE | QUERY ]\nREG ukaz /?\n" - STRING_ADD_USAGE, "REG ADD ime_kljuÄa [/v ime_vrednosti | /ve] [/t vrsta] [/s loÄilo] [/d podatki] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE ime_kljuÄa [/v ime_vrednosti | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY ime_kljuÄa [/v ime_vrednosti | /ve] [/s]\n" - STRING_SUCCESS, "Operacija se je uspeÅ¡no izvedla\n" - STRING_INVALID_KEY, "Napaka: NapaÄno ime kljuÄa\n" - STRING_INVALID_CMDLINE, "Napaka: NapaÄen parameter v ukazni vrstici\n" - STRING_NO_REMOTE, "Napaka: Na morem dodati kljuÄa na oddaljen raÄunalnik\n" - STRING_CANNOT_FIND, "Napaka: Sistem ni naÅ¡el zahtevanega kljuÄa ali vrednosti\n" -} Removed: trunk/reactos/base/applications/cmdutils/reg/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/Sv.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/Sv.rc (removed) @@ -1,39 +1,0 @@ -/* - * REG.EXE - Wine-compatible reg program. - * Swedish language support - * - * Copyright 2010 Anders Jonsson - * - * 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 "reg.h" - -#pragma code_page(65001) - -LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL - -STRINGTABLE -{ - STRING_USAGE, "Syntax fÃ¶r detta kommando Ã¤r:\n\nREG [ ADD | DELETE | QUERY ]\nREG kommando /?\n" - STRING_ADD_USAGE, "REG ADD nyckelnamn [/v vÃ¤rdenamn | /ve] [/t typ] [/s separator] [/d data] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE nyckelnamn [/v vÃ¤rdenamn | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY nyckelnamn [/v vÃ¤rdenamn | /ve] [/s]\n" - STRING_SUCCESS, "Operation slutfÃ¶rdes utan problem\n" - STRING_INVALID_KEY, "Fel: ogiltigt nyckelnamn\n" - STRING_INVALID_CMDLINE, "Fel: ogiltiga kommandoradsparametrar\n" - STRING_NO_REMOTE, "Fel: Kan inte lÃ¤gga till nycklar till fjÃ¤rrmaskin\n" - STRING_CANNOT_FIND, "Fel: Systemet kunde inte hitta angiven nyckel eller vÃ¤rde i registret\n" -} Removed: trunk/reactos/base/applications/cmdutils/reg/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/Uk.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/Uk.rc (removed) @@ -1,43 +1,0 @@ -/* - * REG.EXE - Wine-compatible reg program. - * - * Copyright 2008 Andrew Riedi - * - * Ukrainian language support - * - * Copyright 2010 Igor Paliychuk - * - * 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 "reg.h" - -/* UTF-8 */ -#pragma code_page(65001) - -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT - -STRINGTABLE -{ - STRING_USAGE, "Ð¡Ð¸Ð½ÑÐ°ÐºÑÐ¸Ñ ÑÑÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ Ð½Ð°ÑÑÑÐ¿Ð½Ð¸Ð¹:\n\nREG [ ADD | DELETE | QUERY ]\nREG <ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°> /?\n" - STRING_ADD_USAGE, "REG ADD <ÐºÐ»ÑÑ> [/v <Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ> | /ve] [/t <ÑÐ¸Ð¿>] [/s <ÑÐ¾Ð·Ð´ÑÐ»ÑÐ²Ð°Ñ>] [/d Ð´Ð°Ð½Ñ] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE <ÐºÐ»ÑÑ> [/v <Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ> | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY <ÐºÐ»ÑÑ> [/v <Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ> | /ve] [/s]\n" - STRING_SUCCESS, "ÐÐ¿ÐµÑÐ°ÑÑÑ ÑÑÐ¿ÑÑÐ½Ð¾ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð°\n" - STRING_INVALID_KEY, "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ°: Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ðµ ÑÐ¼'Ñ ÐºÐ»ÑÑÐ°\n" - STRING_INVALID_CMDLINE, "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ°: Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¸ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð³Ð¾ ÑÑÐ´ÐºÐ°\n" - STRING_NO_REMOTE, "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ°: Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð´Ð¾Ð´Ð°ÑÐ¸ ÐºÐ»ÑÑÑ Ð½Ð° Ð²ÑÐ´Ð´Ð°Ð»ÐµÐ½ÑÐ¹ Ð¼Ð°ÑÐ¸Ð½Ñ\n" - STRING_CANNOT_FIND, "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ°: Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð½Ð°Ð¹ÑÐ¸ Ð²ÐºÐ°Ð·Ð°Ð½Ð¸Ð¹ ÐºÐ»ÑÑ ÑÐµÑÑÑÑÑ ÑÐ¸ Ð·Ð½Ð°ÑÐµÐ½Ð½Ñ\n" -} Propchange: trunk/reactos/base/applications/cmdutils/reg/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Dec 21 23:48:23 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/base/applications/cmdutils/reg/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/base/applications/cmdutils/reg/lang/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/base/applications/cmdutils/reg/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Copied: trunk/reactos/base/applications/cmdutils/reg/lang/ko-KR.rc (from r57952, trunk/reactos/base/applications/cmdutils/reg/Ko.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/ko-KR.rc [iso-8859-1] Fri Dec 21 23:48:23 2012 @@ -26,13 +26,13 @@ STRINGTABLE { - STRING_USAGE, "¸í·É¾î Çü½Ä:\n\nREG [ ADD | DELETE | QUERY ]\nREG ¸í·É¾î /?\n" - STRING_ADD_USAGE, "REG ADD °ª [/v °ª | /ve] [/t Çü½Ä] [/s ºÐ¸®±âÈ£] [/d µ¥ÀÌÅ¸] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE Å° ÀÌ¸§ [/v °ª | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY Å° ÀÌ¸§ [/v °ª| /ve] [/s]\n" - STRING_SUCCESS, "ÀÛ¾÷ÀÌ ¼º°øÀûÀ¸·Î ³¡³µ½À´Ï´Ù\n" - STRING_INVALID_KEY, "¿¡·¯: ¿Ã¹Ù¸£Áö ¾ÊÀº Å° ÀÌ¸§\n" - STRING_INVALID_CMDLINE, "¿¡·¯:¿Ã¹Ù¸£Áö ¾ÊÀº ¸í·É¶óÀÎ ¸Å°³º¯¼ö\n" - STRING_NO_REMOTE, "¿¡·¯: ¿ø°Ý ¸Ó½Å¿¡ Å°¸¦ ´õÇÏ´Â °ÍÀº °¡´ÉÇÏÁö ¾Ê½À´Ï´Ù\n" - STRING_CANNOT_FIND, "¿¡·¯: ÀÌ ½Ã½ºÅÛ¿¡¼ ÁöÁ¤µÈ ·¹Áö½ºÆ®¸® Å°³ª °ªÀ» Ã£À»¼ö ¾ø½À´Ï´Ù\n" + STRING_USAGE, "ëªë ¹ì´ íì:\n\nREG [ ADD | DELETE | QUERY ]\nREG ëªë ¹ì´ /?\n" + STRING_ADD_USAGE, "REG ADD ê° [/v ê° | /ve] [/t íì] [/s ë¶ë¦¬ê¸°í¸] [/d ë°ì´í] [/f]\n" + STRING_DELETE_USAGE, "REG DELETE í¤ ì´ë¦ [/v ê° | /ve | /va] [/f]\n" + STRING_QUERY_USAGE, "REG QUERY í¤ ì´ë¦ [/v ê°| /ve] [/s]\n" + STRING_SUCCESS, "ììì´ ì±ê³µì ì¼ë¡ ëë¬ìµëë¤\n" + STRING_INVALID_KEY, "ìë¬: ì¬ë°ë¥´ì§ ìì í¤ ì´ë¦\n" + STRING_INVALID_CMDLINE, "ìë¬:ì¬ë°ë¥´ì§ ìì ëªë ¹ë¼ì¸ ë§¤ê°ë³ì\n" + STRING_NO_REMOTE, "ìë¬: ìê²© ë¨¸ì ì í¤ë¥¼ ëíë ê²ì ê°ë¥íì§ ììµëë¤\n" + STRING_CANNOT_FIND, "ìë¬: ì´ ìì¤íìì ì§ì ë ë ì§ì¤í¸ë¦¬ í¤ë ê°ì ì°¾ìì ììµëë¤\n" } Copied: trunk/reactos/base/applications/cmdutils/reg/lang/pl-PL.rc (from r57952, trunk/reactos/base/applications/cmdutils/reg/Pl.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/lang/pl-PL.rc [iso-8859-1] Fri Dec 21 23:48:23 2012 @@ -4,7 +4,7 @@ * * Copyright 2008 Andrew Riedi * Copyright 2008 Mikolaj Zalewski - * Copyright 2010 £ukasz Wojni³owicz + * Copyright 2010 Åukasz WojniÅowicz * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,13 +27,13 @@ STRINGTABLE { - STRING_USAGE, "Sk³adnia tego polecenia:\n\nREG [ ADD | DELETE | QUERY ]\nREG polecenie /?\n" - STRING_ADD_USAGE, "REG ADD nazwa_klucza [/v nazwa_wartoci | /ve] [/t typ] [/s separator] [/d dane] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE nazwa_klucza [/v nazwa_wartoci | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY nazwa_klucza [/v nazwa_wartoci | /ve] [/s]\n" - STRING_SUCCESS, "Operacja zakoñczona pomylnie\n" - STRING_INVALID_KEY, "B³¹d: Niew³aciwa nazwa klucza\n" - STRING_INVALID_CMDLINE, "B³¹d: Niew³aciwe parametry wiersza poleceñ\n" - STRING_NO_REMOTE, "B³¹d: Nie mo¿na dodaæ kluczy do zdalnej maszyny\n" - STRING_CANNOT_FIND, "B³¹d: System nie móg³ znaleæ podanej wartoci lub klucza rejestru\n" + STRING_USAGE, "SkÅadnia tego polecenia:\n\nREG [ ADD | DELETE | QUERY ]\nREG polecenie /?\n" + STRING_ADD_USAGE, "REG ADD nazwa_klucza [/v nazwa_wartoÅci | /ve] [/t typ] [/s separator] [/d dane] [/f]\n" + STRING_DELETE_USAGE, "REG DELETE nazwa_klucza [/v nazwa_wartoÅci | /ve | /va] [/f]\n" + STRING_QUERY_USAGE, "REG QUERY nazwa_klucza [/v nazwa_wartoÅci | /ve] [/s]\n" + STRING_SUCCESS, "Operacja zakoÅczona pomyÅlnie\n" + STRING_INVALID_KEY, "BÅÄd: NiewÅaÅciwa nazwa klucza\n" + STRING_INVALID_CMDLINE, "BÅÄd: NiewÅaÅciwe parametry wiersza poleceÅ\n" + STRING_NO_REMOTE, "BÅÄd: Nie moÅ¼na dodaÄ kluczy do zdalnej maszyny\n" + STRING_CANNOT_FIND, "BÅÄd: System nie mÃ³gÅ znaleÅºÄ podanej wartoÅci lub klucza rejestru\n" } Added: trunk/reactos/base/applications/cmdutils/reg/reg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/reg.rc (added) +++ trunk/reactos/base/applications/cmdutils/reg/reg.rc [iso-8859-1] Fri Dec 21 23:48:23 2012 @@ -1,0 +1,13 @@ +#include <windows.h> +#include <commctrl.h> +#include "reg.h" + +/* Define language neutral resources */ +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Registry Console Tool" +#define REACTOS_STR_INTERNAL_NAME "reg" +#define REACTOS_STR_ORIGINAL_FILENAME "reg.exe" +#include <reactos/version.rc> + +#include "rsrc.rc" Propchange: trunk/reactos/base/applications/cmdutils/reg/reg.rc ------------------------------------------------------------------------------ svn:eol-style = native Copied: trunk/reactos/base/applications/cmdutils/reg/rsrc.rc (from r57952, trunk/reactos/base/applications/cmdutils/reg/rsrc.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/reg/rsrc.rc [iso-8859-1] Fri Dec 21 23:48:23 2012 @@ -1,59 +1,63 @@ +#include <windows.h> +#include "reg.h" + +/* Include localised resources */ +// UTF-8 +#pragma code_page(65001) +#ifdef LANGUAGE_BG_BG + #include "lang/bg-BG.rc" +#endif +#ifdef LANGUAGE_DA_DK + #include "lang/da-DK.rc" +#endif +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif #ifdef LANGUAGE_EN_US - #include "En.rc" + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_ES_ES + #include "lang/es-ES.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" #endif #ifdef LANGUAGE_KO_KR - #include "Ko.rc" + #include "lang/ko-KR.rc" +#endif +#ifdef LANGUAGE_LT_LT + #include "lang/lt-LT.rc" #endif #ifdef LANGUAGE_NL_NL - #include "Nl.rc" + #include "lang/nl-NL.rc" +#endif +#ifdef LANGUAGE_NO_NO + #include "lang/no-NO.rc" #endif #ifdef LANGUAGE_PL_PL - #include "Pl.rc" -#endif - -/* UTF-8 */ -#ifdef LANGUAGE_BG_BG - #include "Bg.rc" -#endif -#ifdef LANGUAGE_DA_DK - #include "Da.rc" -#endif -#ifdef LANGUAGE_DE_DE - #include "De.rc" -#endif -#ifdef LANGUAGE_ES_ES - #include "Es.rc" -#endif -#ifdef LANGUAGE_FR_FR - #include "Fr.rc" -#endif -#ifdef LANGUAGE_IT_IT - #include "It.rc" -#endif -#ifdef LANGUAGE_JA_JP - #include "Ja.rc" -#endif -#ifdef LANGUAGE_LT_LT - #include "Lt.rc" -#endif -#ifdef LANGUAGE_NO_NO - #include "No.rc" + #include "lang/pl-PL.rc" #endif #ifdef LANGUAGE_PT_PT - #include "Pt.rc" + #include "lang/pt-PT.rc" #endif #ifdef LANGUAGE_RO_RO - #include "Ro.rc" + #include "lang/ro-RO.rc" #endif #ifdef LANGUAGE_RU_RU - #include "Ru.rc" + #include "lang/ru-RU.rc" #endif #ifdef LANGUAGE_SL_SI - #include "Si.rc" + #include "lang/sl-SI.rc" #endif #ifdef LANGUAGE_SV_SE - #include "Sv.rc" + #include "lang/sv-SE.rc" #endif #ifdef LANGUAGE_UK_UA - #include "Uk.rc" + #include "lang/uk-UA.rc" #endif

11 years, 9 months

← Newer
1
...
8
9
10
11
12
13
14
...
29
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 December 2012