Ros-diffs May 2013

ros-diffs@reactos.org

16 participants
234 discussions

[akhaldi] 58930: [PSDK] * Add NT_CONSOLE_PROPS and NT_FE_CONSOLE_PROPS and fix EXP_SZ_LINK. * Add SHELL_LINK_INFO_* and some Shell Link Extra Data structures (for IShellLinkDataList). [USERINIT][CP...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat May 4 20:43:16 2013 New Revision: 58930 URL: http://svn.reactos.org/svn/reactos?rev=58930&view=rev Log: [PSDK] * Add NT_CONSOLE_PROPS and NT_FE_CONSOLE_PROPS and fix EXP_SZ_LINK. * Add SHELL_LINK_INFO_* and some Shell Link Extra Data structures (for IShellLinkDataList). [USERINIT][CPLS][DLLS] * Add the now necessary wincon.h inclusion. * Brought to you by Dominik Hornung. CORE-7162 #resolve #comment Committed in r58930. Danke ! Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mstsc/precomp.h trunk/reactos/base/applications/rapps/rapps.h trunk/reactos/base/shell/explorer-new/precomp.h trunk/reactos/base/shell/explorer/precomp.h trunk/reactos/base/system/userinit/userinit.c trunk/reactos/dll/cpl/desk/desk.h trunk/reactos/dll/cpl/main/main.h trunk/reactos/dll/cpl/sysdm/precomp.h trunk/reactos/dll/shellext/deskadp/precomp.h trunk/reactos/dll/shellext/deskmon/precomp.h trunk/reactos/dll/shellext/slayer/precomp.h trunk/reactos/dll/win32/browseui/precomp.h trunk/reactos/dll/win32/comdlg32/cdlg.h trunk/reactos/dll/win32/comdlg32/filedlgbrowser.h trunk/reactos/dll/win32/ieframe/ieframe.h trunk/reactos/dll/win32/msi/package.c trunk/reactos/dll/win32/newdev/newdev_private.h trunk/reactos/dll/win32/setupapi/setupapi_private.h trunk/reactos/dll/win32/shell32/precomp.h trunk/reactos/dll/win32/shlwapi/ordinal.c trunk/reactos/dll/win32/syssetup/precomp.h trunk/reactos/include/psdk/shlobj.h trunk/reactos/include/psdk/shlobj_undoc.h Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] Sat May 4 20:43:16 2013 @@ -11,6 +11,7 @@ #include <winsvc.h> #include <winuser.h> #include <windowsx.h> /* GET_X/Y_LPARAM */ +#include <wincon.h> #include <tchar.h> #include <commdlg.h> #include <cderr.h> Modified: trunk/reactos/base/applications/mstsc/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/pr… ============================================================================== --- trunk/reactos/base/applications/mstsc/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/precomp.h [iso-8859-1] Sat May 4 20:43:16 2013 @@ -7,6 +7,7 @@ #include <winreg.h> #include <wingdi.h> #include <winuser.h> +#include <wincon.h> #include <commdlg.h> #include <shlobj.h> #include <stdio.h> Modified: trunk/reactos/base/applications/rapps/rapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] Sat May 4 20:43:16 2013 @@ -8,6 +8,7 @@ #include <wingdi.h> #include <winnls.h> #include <winuser.h> +#include <wincon.h> #include <richedit.h> #include <shellapi.h> #include <shlwapi.h> Modified: trunk/reactos/base/shell/explorer-new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/pr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] Sat May 4 20:43:16 2013 @@ -12,6 +12,7 @@ #include <wingdi.h> #include <winnls.h> #include <winver.h> +#include <wincon.h> #include <shellapi.h> #include <shlobj.h> #include <shlobj_undoc.h> Modified: trunk/reactos/base/shell/explorer/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/precom… ============================================================================== --- trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] Sat May 4 20:43:16 2013 @@ -37,6 +37,7 @@ #include <winreg.h> #include <wingdi.h> #include <winnls.h> +#include <wincon.h> #include <ole2.h> #include <shlwapi.h> Modified: trunk/reactos/base/system/userinit/userinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] Sat May 4 20:43:16 2013 @@ -32,6 +32,7 @@ #include <winbase.h> #include <winreg.h> #include <wingdi.h> +#include <wincon.h> #include <shellapi.h> #include <regstr.h> #include <shlobj.h> Modified: trunk/reactos/dll/cpl/desk/desk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.h?rev=58… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/desk.h [iso-8859-1] Sat May 4 20:43:16 2013 @@ -9,6 +9,7 @@ #include <winreg.h> #include <wingdi.h> #include <winuser.h> +#include <wincon.h> #include <shellapi.h> #include <commdlg.h> #include <cpl.h> Modified: trunk/reactos/dll/cpl/main/main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/main.h?rev=58… ============================================================================== --- trunk/reactos/dll/cpl/main/main.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/main.h [iso-8859-1] Sat May 4 20:43:16 2013 @@ -7,6 +7,7 @@ #include <winreg.h> #include <wingdi.h> #include <winuser.h> +#include <wincon.h> #include <commdlg.h> #include <cplext.h> #include <tchar.h> Modified: trunk/reactos/dll/cpl/sysdm/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/precomp.h?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/precomp.h [iso-8859-1] Sat May 4 20:43:16 2013 @@ -11,6 +11,7 @@ #include <winreg.h> #include <wingdi.h> #include <winnls.h> +#include <wincon.h> #include <powrprof.h> #include <tchar.h> #include <cpl.h> Modified: trunk/reactos/dll/shellext/deskadp/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/preco… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/precomp.h [iso-8859-1] Sat May 4 20:43:16 2013 @@ -9,6 +9,7 @@ #include <windef.h> #include <winbase.h> #include <wingdi.h> +#include <wincon.h> #include <tchar.h> #include <shlobj.h> #include <dll/desk/deskcplx.h> Modified: trunk/reactos/dll/shellext/deskmon/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/preco… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/precomp.h [iso-8859-1] Sat May 4 20:43:16 2013 @@ -9,6 +9,7 @@ #include <windef.h> #include <winbase.h> #include <wingdi.h> +#include <wincon.h> #include <tchar.h> #include <shlobj.h> #include <dll/desk/deskcplx.h> Modified: trunk/reactos/dll/shellext/slayer/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/precom… ============================================================================== --- trunk/reactos/dll/shellext/slayer/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/slayer/precomp.h [iso-8859-1] Sat May 4 20:43:16 2013 @@ -5,6 +5,7 @@ #include <windef.h> #include <winbase.h> #include <winreg.h> +#include <wincon.h> #include <shellapi.h> #include <shlobj.h> #include <tchar.h> Modified: trunk/reactos/dll/win32/browseui/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/precomp… ============================================================================== --- trunk/reactos/dll/win32/browseui/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/precomp.h [iso-8859-1] Sat May 4 20:43:16 2013 @@ -7,6 +7,7 @@ #include <winreg.h> #include <wingdi.h> #include <winnls.h> +#include <wincon.h> #include <shellapi.h> #include <shlobj.h> #include <shlobj_undoc.h> Modified: trunk/reactos/dll/win32/comdlg32/cdlg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg.h?… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg.h [iso-8859-1] Sat May 4 20:43:16 2013 @@ -165,6 +165,7 @@ #include "wingdi.h" #include "winuser.h" #include "winnls.h" +#include "wincon.h" #include "commctrl.h" #include "shlobj.h" #include "shellapi.h" Modified: trunk/reactos/dll/win32/comdlg32/filedlgbrowser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/filedlgbrowser.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/filedlgbrowser.h [iso-8859-1] Sat May 4 20:43:16 2013 @@ -33,6 +33,7 @@ //#include "windef.h" //#include "winbase.h" //#include "winuser.h" +#include "wincon.h" #include <shlobj.h> //#include "objbase.h" //#include "commdlg.h" Modified: trunk/reactos/dll/win32/ieframe/ieframe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe.… ============================================================================== --- trunk/reactos/dll/win32/ieframe/ieframe.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/ieframe.h [iso-8859-1] Sat May 4 20:43:16 2013 @@ -31,6 +31,7 @@ #include <winbase.h> #include <wingdi.h> //#include "winuser.h" +#include <wincon.h> //#include "ole2.h" //#include "olectl.h" Modified: trunk/reactos/dll/win32/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/package.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/package.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/package.c [iso-8859-1] Sat May 4 20:43:16 2013 @@ -33,6 +33,7 @@ //#include "winnls.h" #include <shlwapi.h> #include <wingdi.h> +#include <wincon.h> #include <wine/debug.h> //#include "msi.h" //#include "msiquery.h" Modified: trunk/reactos/dll/win32/newdev/newdev_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev_pr… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/newdev_private.h [iso-8859-1] Sat May 4 20:43:16 2013 @@ -15,6 +15,7 @@ #include <winuser.h> #include <winnls.h> #include <windowsx.h> +#include <wincon.h> #include <newdev.h> #include <regstr.h> #include <cfgmgr32.h> Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] Sat May 4 20:43:16 2013 @@ -34,6 +34,7 @@ #include <winsvc.h> #include <winver.h> #include <wingdi.h> +#include <wincon.h> #include <objbase.h> #include <lzexpand.h> #include <cfgmgr32.h> Modified: trunk/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.… ============================================================================== --- trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] Sat May 4 20:43:16 2013 @@ -15,6 +15,7 @@ #include <wingdi.h> #include <winreg.h> #include <winuser.h> +#include <wincon.h> #include <shellapi.h> #include <commdlg.h> #include <ddeml.h> Modified: trunk/reactos/dll/win32/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/ordinal.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/ordinal.c [iso-8859-1] Sat May 4 20:43:16 2013 @@ -43,6 +43,7 @@ //#include "winuser.h" #include <winver.h> #include <winnetwk.h> +#include <wincon.h> #include <mmsystem.h> //#include "objbase.h" //#include "exdisp.h" Modified: trunk/reactos/dll/win32/syssetup/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/precomp… ============================================================================== --- trunk/reactos/dll/win32/syssetup/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/precomp.h [iso-8859-1] Sat May 4 20:43:16 2013 @@ -12,6 +12,7 @@ #include <winnls.h> #include <winuser.h> #include <windowsx.h> +#include <wincon.h> #define NTOS_MODE_USER #include <ndk/cmfuncs.h> #include <ndk/rtlfuncs.h> Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Sat May 4 20:43:16 2013 @@ -1449,7 +1449,7 @@ typedef struct { DWORD cbSize; - DWORD cbSignature; + DWORD dwSignature; CHAR szTarget[MAX_PATH]; WCHAR szwTarget[MAX_PATH]; } EXP_SZ_LINK, *LPEXP_SZ_LINK; @@ -1467,14 +1467,45 @@ BYTE abPropertyStorage[1]; } EXP_PROPERTYSTORAGE; -#define EXP_SZ_LINK_SIG 0xa0000001 -#define NT_CONSOLE_PROPS_SIG 0xa0000002 -#define NT_FE_CONSOLE_PROPS_SIG 0xa0000004 -#define EXP_SPECIAL_FOLDER_SIG 0xa0000005 -#define EXP_DARWIN_ID_SIG 0xa0000006 -#define EXP_SZ_ICON_SIG 0xa0000007 +#ifdef LF_FACESIZE +typedef struct { + DATABLOCK_HEADER dbh; + WORD wFillAttribute; + WORD wPopupFillAttribute; + COORD dwScreenBufferSize; + COORD dwWindowSize; + COORD dwWindowOrigin; + DWORD nFont; + DWORD nInputBufferSize; + COORD dwFontSize; + UINT uFontFamily; + UINT uFontWeight; + WCHAR FaceName[LF_FACESIZE]; + UINT uCursorSize; + BOOL bFullScreen; + BOOL bQuickEdit; + BOOL bInsertMode; + BOOL bAutoPosition; + UINT uHistoryBufferSize; + UINT uNumberOfHistoryBuffers; + BOOL bHistoryNoDup; + COLORREF ColorTable[16]; +} NT_CONSOLE_PROPS, *LPNT_CONSOLE_PROPS; +#endif + +typedef struct { + DATABLOCK_HEADER dbh; + UINT uCodePage; +} NT_FE_CONSOLE_PROPS, *LPNT_FE_CONSOLE_PROPS; + +#define EXP_SZ_LINK_SIG 0xa0000001 /* EXP_SZ_LINK */ +#define NT_CONSOLE_PROPS_SIG 0xa0000002 /* NT_CONSOLE_PROPS */ +#define NT_FE_CONSOLE_PROPS_SIG 0xa0000004 /* NT_FE_CONSOLE_PROPS */ +#define EXP_SPECIAL_FOLDER_SIG 0xa0000005 /* EXP_SPECIAL_FOLDER */ +#define EXP_DARWIN_ID_SIG 0xa0000006 /* EXP_DARWIN_LINK */ +#define EXP_SZ_ICON_SIG 0xa0000007 /* EXP_SZ_LINK */ #define EXP_LOGO3_ID_SIG EXP_SZ_ICON_SIG /* Old SDKs only */ -#define EXP_PROPERTYSTORAGE_SIG 0xa0000009 +#define EXP_PROPERTYSTORAGE_SIG 0xa0000009 /* EXP_PROPERTYSTORAGE */ typedef struct _SHChangeDWORDAsIDList { USHORT cb; Modified: trunk/reactos/include/psdk/shlobj_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj_undoc.… ============================================================================== --- trunk/reactos/include/psdk/shlobj_undoc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj_undoc.h [iso-8859-1] Sat May 4 20:43:16 2013 @@ -2,6 +2,7 @@ * ReactOS undocumented shell interface * * Copyright 2009 Andrew Hill <ash77 at domain reactos.org> + * Copyright 2013 Dominik Hornung * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -867,6 +868,188 @@ DWORD dwReserved3; } SHELL_LINK_HEADER, *LPSHELL_LINK_HEADER; +/***************************************************************************** + * SHELL_LINK_INFOA/W + * If cbHeaderSize == 0x0000001C then use SHELL_LINK_INFOA + * If cbHeaderSize >= 0x00000024 then use SHELL_LINK_INFOW + */ +typedef struct tagSHELL_LINK_INFOA +{ + /* Size of the link info data */ + DWORD cbSize; + /* Size of this structure (ANSI: = 0x0000001C) */ + DWORD cbHeaderSize; + /* Specifies which fields are present/populated (SLI_*) */ + DWORD dwFlags; + /* Offset of the VolumeID field (SHELL_LINK_INFO_VOLUME_ID) */ + DWORD cbVolumeIDOffset; + /* Offset of the LocalBasePath field (ANSI, NULL-terminated string) */ + DWORD cbLocalBasePathOffset; + /* Offset of the CommonNetworkRelativeLink field (SHELL_LINK_INFO_CNR_LINK) */ + DWORD cbCommonNetworkRelativeLinkOffset; + /* Offset of the CommonPathSuffix field (ANSI, NULL-terminated string) */ + DWORD cbCommonPathSuffixOffset; +} SHELL_LINK_INFOA, *LPSHELL_LINK_INFOA; + +typedef struct tagSHELL_LINK_INFOW +{ + /* Size of the link info data */ + DWORD cbSize; + /* Size of this structure (Unicode: >= 0x00000024) */ + DWORD cbHeaderSize; + /* Specifies which fields are present/populated (SLI_*) */ + DWORD dwFlags; + /* Offset of the VolumeID field (SHELL_LINK_INFO_VOLUME_ID) */ + DWORD cbVolumeIDOffset; + /* Offset of the LocalBasePath field (ANSI, NULL-terminated string) */ + DWORD cbLocalBasePathOffset; + /* Offset of the CommonNetworkRelativeLink field (SHELL_LINK_INFO_CNR_LINK) */ + DWORD cbCommonNetworkRelativeLinkOffset; + /* Offset of the CommonPathSuffix field (ANSI, NULL-terminated string) */ + DWORD cbCommonPathSuffixOffset; + /* Offset of the LocalBasePathUnicode field (Unicode, NULL-terminated string) */ + DWORD cbLocalBasePathUnicodeOffset; + /* Offset of the CommonPathSuffixUnicode field (Unicode, NULL-terminated string) */ + DWORD cbCommonPathSuffixUnicodeOffset; +} SHELL_LINK_INFOW, *LPSHELL_LINK_INFOW; + +/* VolumeID, LocalBasePath, LocalBasePathUnicode(cbHeaderSize >= 0x24) are present */ +#define SLI_VALID_LOCAL 0x00000001 +/* CommonNetworkRelativeLink is present */ +#define SLI_VALID_NETWORK 0x00000002 + +/***************************************************************************** + * SHELL_LINK_INFO_VOLUME_IDA/W + * If cbVolumeLabelOffset != 0x00000014 (should be 0x00000010) then use + * SHELL_LINK_INFO_VOLUME_IDA + * If cbVolumeLabelOffset == 0x00000014 then use SHELL_LINK_INFO_VOLUME_IDW + */ +typedef struct tagSHELL_LINK_INFO_VOLUME_IDA +{ + /* Size of the VolumeID field (> 0x00000010) */ + DWORD cbSize; + /* Drive type of the drive the link target is stored on (DRIVE_*) */ + DWORD dwDriveType; + /* Serial number of the volume the link target is stored on */ + DWORD nDriveSerialNumber; + /* Offset of the volume label (ANSI, NULL-terminated string). + Must be != 0x00000014 (see tagSHELL_LINK_INFO_VOLUME_IDW) */ + DWORD cbVolumeLabelOffset; +} SHELL_LINK_INFO_VOLUME_IDA, *LPSHELL_LINK_INFO_VOLUME_IDA; + +typedef struct tagSHELL_LINK_INFO_VOLUME_IDW +{ + /* Size of the VolumeID field (> 0x00000010) */ + DWORD cbSize; + /* Drive type of the drive the link target is stored on (DRIVE_*) */ + DWORD dwDriveType; + /* Serial number of the volume the link target is stored on */ + DWORD nDriveSerialNumber; + /* Offset of the volume label (ANSI, NULL-terminated string). + If the value of this field is 0x00000014, ignore it and use + cbVolumeLabelUnicodeOffset! */ + DWORD cbVolumeLabelOffset; + /* Offset of the volume label (Unicode, NULL-terminated string). + If the value of the VolumeLabelOffset field is not 0x00000014, + this field must be ignored (==> it doesn't exists ==> ANSI). */ + DWORD cbVolumeLabelUnicodeOffset; +} SHELL_LINK_INFO_VOLUME_IDW, *LPSHELL_LINK_INFO_VOLUME_IDW; + +/***************************************************************************** + * SHELL_LINK_INFO_CNR_LINKA/W (CNR = Common Network Relative) + * If cbNetNameOffset == 0x00000014 then use SHELL_LINK_INFO_CNR_LINKA + * If cbNetNameOffset > 0x00000014 then use SHELL_LINK_INFO_CNR_LINKW + */ +typedef struct tagSHELL_LINK_INFO_CNR_LINKA +{ + /* Size of the CommonNetworkRelativeLink field (>= 0x00000014) */ + DWORD cbSize; + /* Specifies which fields are present/populated (SLI_CNR_*) */ + DWORD dwFlags; + /* Offset of the NetName field (ANSI, NULLterminated string) */ + DWORD cbNetNameOffset; + /* Offset of the DeviceName field (ANSI, NULLterminated string) */ + DWORD cbDeviceNameOffset; + /* Type of the network provider (WNNC_NET_* defined in winnetwk.h) */ + DWORD dwNetworkProviderType; +} SHELL_LINK_INFO_CNR_LINKA, *LPSHELL_LINK_INFO_CNR_LINKA; + +typedef struct tagSHELL_LINK_INFO_CNR_LINKW +{ + /* Size of the CommonNetworkRelativeLink field (>= 0x00000014) */ + DWORD cbSize; + /* Specifies which fields are present/populated (SLI_CNR_*) */ + DWORD dwFlags; + /* Offset of the NetName field (ANSI, NULLterminated string) */ + DWORD cbNetNameOffset; + /* Offset of the DeviceName field (ANSI, NULLterminated string) */ + DWORD cbDeviceNameOffset; + /* Type of the network provider (WNNC_NET_* defined in winnetwk.h) */ + DWORD dwNetworkProviderType; + /* Offset of the NetNameUnicode field (Unicode, NULLterminated string) */ + DWORD cbNetNameUnicodeOffset; + /* Offset of the DeviceNameUnicode field (Unicode, NULLterminated string) */ + DWORD cbDeviceNameUnicodeOffset; +} SHELL_LINK_INFO_CNR_LINKW, *LPSHELL_LINK_INFO_CNR_LINKW; + +/* DeviceName is present */ +#define SLI_CNR_VALID_DEVICE 0x00000001 +/* NetworkProviderType is present */ +#define SLI_CNR_VALID_NET_TYPE 0x00000002 + +/***************************************************************************** + * Shell Link Extra Data (IShellLinkDataList) + */ +typedef struct tagEXP_TRACKER +{ + /* .cbSize = 0x00000060, .dwSignature = 0xa0000003 */ + DATABLOCK_HEADER dbh; + /* Length >= 0x00000058 */ + DWORD nLength; + /* Must be 0x00000000 */ + DWORD nVersion; + /* NetBIOS name (ANSI, unused bytes are set to zero) */ + CHAR szMachineID[16]; /* "variable" >= 16 (?) */ + /* Some GUIDs for the Link Tracking service (from the FS?) */ + GUID guidDroidVolume; + GUID guidDroidObject; + GUID guidDroidBirthVolume; + GUID guidDroidBirthObject; +} EXP_TRACKER, *LPEXP_TRACKER; + +typedef struct tagEXP_SHIM +{ + /* .cbSize >= 0x00000088, .dwSignature = 0xa0000008 */ + DATABLOCK_HEADER dbh; + /* Name of a shim layer to apply (Unicode, unused bytes are set to zero) */ + WCHAR szwLayerName[64]; /* "variable" >= 64 */ +} EXP_SHIM, *LPEXP_SHIM; + +typedef struct tagEXP_KNOWN_FOLDER +{ + /* .cbSize = 0x0000001c, .dwSignature = 0xa000000b */ + DATABLOCK_HEADER dbh; + /* A GUID value that identifies a known folder */ + GUID guidKnownFolder; + /* Specifies the location of the ItemID of the first child + segment of the IDList specified by guidKnownFolder */ + DWORD cbOffset; +} EXP_KNOWN_FOLDER, *LPEXP_KNOWN_FOLDER; + +typedef struct tagEXP_VISTA_ID_LIST +{ + /* .cbSize >= 0x0000000a, .dwSignature = 0xa000000c */ + DATABLOCK_HEADER dbh; + /* Specifies an alternate IDList that can be used instead + of the "normal" IDList (SLDF_HAS_ID_LIST) */ + /* LPITEMIDLIST pIDList; (variable) */ +} EXP_VISTA_ID_LIST, *LPEXP_VISTA_ID_LIST; + +#define EXP_TRACKER_SIG 0xa0000003 +#define EXP_SHIM_SIG 0xa0000008 +#define EXP_KNOWN_FOLDER_SIG 0xa000000b +#define EXP_VISTA_ID_LIST_SIG 0xa000000c + #include <poppack.h> #ifdef __cplusplus

11 years, 4 months

[akhaldi] 58929: [CRT] * Annotate sys/utime.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat May 4 20:42:43 2013 New Revision: 58929 URL: http://svn.reactos.org/svn/reactos?rev=58929&view=rev Log: [CRT] * Annotate sys/utime.h. Modified: trunk/reactos/include/crt/sys/utime.h Modified: trunk/reactos/include/crt/sys/utime.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/utime.h?re… ============================================================================== --- trunk/reactos/include/crt/sys/utime.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sys/utime.h [iso-8859-1] Sat May 4 20:42:43 2013 @@ -38,7 +38,7 @@ }; #endif -#ifndef NO_OLDNAMES +#ifndef NO_OLDNAMES struct utimbuf { time_t actime; time_t modtime; @@ -49,19 +49,75 @@ __time32_t modtime; }; #endif + #endif /* !_UTIMBUF_DEFINED */ - _CRTIMP int __cdecl _utime(const char *_Filename,struct _utimbuf *_Time); - _CRTIMP int __cdecl _utime32(const char *_Filename,struct __utimbuf32 *_Time); - _CRTIMP int __cdecl _futime(int _FileDes,struct _utimbuf *_Time); - _CRTIMP int __cdecl _futime32(int _FileDes,struct __utimbuf32 *_Time); - _CRTIMP int __cdecl _wutime(const wchar_t *_Filename,struct _utimbuf *_Time); - _CRTIMP int __cdecl _wutime32(const wchar_t *_Filename,struct __utimbuf32 *_Time); + _CRTIMP + int + __cdecl + _utime( + _In_z_ const char *_Filename, + _In_opt_ struct _utimbuf *_Time); + + _CRTIMP + int + __cdecl + _utime32( + _In_z_ const char *_Filename, + _In_opt_ struct __utimbuf32 *_Time); + + _CRTIMP + int + __cdecl + _futime( + _In_ int _FileDes, + _In_opt_ struct _utimbuf *_Time); + + _CRTIMP + int + __cdecl + _futime32( + _In_ int _FileDes, + _In_opt_ struct __utimbuf32 *_Time); + + _CRTIMP + int + __cdecl + _wutime( + _In_z_ const wchar_t *_Filename, + _In_opt_ struct _utimbuf *_Time); + + _CRTIMP + int + __cdecl + _wutime32( + _In_z_ const wchar_t *_Filename, + _In_opt_ struct __utimbuf32 *_Time); + #if _INTEGRAL_MAX_BITS >= 64 - _CRTIMP int __cdecl _utime64(const char *_Filename,struct __utimbuf64 *_Time); - _CRTIMP int __cdecl _futime64(int _FileDes,struct __utimbuf64 *_Time); - _CRTIMP int __cdecl _wutime64(const wchar_t *_Filename,struct __utimbuf64 *_Time); -#endif + + _CRTIMP + int + __cdecl + _utime64( + _In_z_ const char *_Filename, + _In_opt_ struct __utimbuf64 *_Time); + + _CRTIMP + int + __cdecl + _futime64( + _In_ int _FileDes, + _In_opt_ struct __utimbuf64 *_Time); + + _CRTIMP + int + __cdecl + _wutime64( + _In_z_ const wchar_t *_Filename, + _In_opt_ struct __utimbuf64 *_Time); + +#endif /* _INTEGRAL_MAX_BITS >= 64 */ #ifndef RC_INVOKED #ifdef _USE_32BIT_TIME_T @@ -76,7 +132,7 @@ } #endif -#ifndef NO_OLDNAMES +#ifndef NO_OLDNAMES __CRT_INLINE int __cdecl utime(const char *_Filename,struct utimbuf *_Utimbuf) { return _utime(_Filename,(struct _utimbuf *)_Utimbuf); }

11 years, 4 months

[akhaldi] 58928: [FUSION_WINETEST] * Sync with Wine 1.5.26.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat May 4 20:21:53 2013 New Revision: 58928 URL: http://svn.reactos.org/svn/reactos?rev=58928&view=rev Log: [FUSION_WINETEST] * Sync with Wine 1.5.26. Modified: trunk/rostests/winetests/fusion/CMakeLists.txt trunk/rostests/winetests/fusion/asmcache.c trunk/rostests/winetests/fusion/asmenum.c trunk/rostests/winetests/fusion/asmname.c trunk/rostests/winetests/fusion/fusion.c trunk/rostests/winetests/fusion/testlist.c Modified: trunk/rostests/winetests/fusion/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/fusion/CMakeLis… ============================================================================== --- trunk/rostests/winetests/fusion/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/fusion/CMakeLists.txt [iso-8859-1] Sat May 4 20:21:53 2013 @@ -1,7 +1,5 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE asmcache.c Modified: trunk/rostests/winetests/fusion/asmcache.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/fusion/asmcache… ============================================================================== --- trunk/rostests/winetests/fusion/asmcache.c [iso-8859-1] (original) +++ trunk/rostests/winetests/fusion/asmcache.c [iso-8859-1] Sat May 4 20:21:53 2013 @@ -16,17 +16,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS #define INITGUID #include <stdio.h> -#include <windows.h> -#include <mscoree.h> +//#include <windows.h> +#include <windef.h> +#include <winbase.h> +#include <winver.h> +#include <objbase.h> +//#include <mscoree.h> #include <fusion.h> #include <corerror.h> -#include "wine/test.h" +#include <wine/test.h> typedef struct _tagASSEMBLY ASSEMBLY; @@ -1011,6 +1019,18 @@ '_','M','S','I','L','\\','w','i','n','e','\\', '1','.','0','.','0','.','0','_','_','2','d','0','3','6','1','7','b', '1','c','3','1','e','2','f','5','\\',0}; + static const WCHAR wine2[] = { + 'w','i','n','e',',','v','e','r','s','i','o','n','=','1','.','0','.','0','.','1',',', + 'p','u','b','l','i','c','K','e','y','T','o','k','e','n','=', + '2','d','0','3','6','1','7','b','1','c','3','1','e','2','f','5',',', + 'c','u','l','t','u','r','e','=','n','e','u','t','r','a','l',0}; + static const WCHAR nullpublickey[] = { + 'm','s','c','o','r','l','i','b','.','d','l','l',',','v','e','r','s','i','o','n','=','0','.','0','.', + '0','.','0',',','c','u','l','t','u','r','e','=','n','e','u','t','r','a','l',',', + 'p','u','b','l','i','c','K','e','y','T','o','k','e','n','=','n','u','l','l',0}; + static const WCHAR nullpublickey1[] = { + 'm','s','c','o','r','l','i','b','.','d','l','l',',', + 'p','u','b','l','i','c','K','e','y','T','o','k','e','n','=','n','u','L','l',0}; size = MAX_PATH; hr = pGetCachePath(ASM_CACHE_GAC, asmpath, &size); @@ -1363,6 +1383,36 @@ "Assembly path was changed\n"); ok(info.cchBuf == MAX_PATH, "Expected MAX_PATH, got %d\n", info.cchBuf); + /* display name is "wine,version=1.0.0.1,publicKeyToken=2d03617b1c31e2f5,culture=neutral" */ + INIT_ASM_INFO(); + lstrcpyW(name, wine2); + hr = IAssemblyCache_QueryAssemblyInfo(cache, QUERYASMINFO_FLAG_GETSIZE, + name, &info); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), + "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %08x\n", hr); + ok(info.cbAssemblyInfo == sizeof(ASSEMBLY_INFO), + "Expected sizeof(ASSEMBLY_INFO), got %d\n", info.cbAssemblyInfo); + ok(info.dwAssemblyFlags == 0, "Expected 0, got %08x\n", info.dwAssemblyFlags); + ok(info.uliAssemblySizeInKB.u.HighPart == 0, + "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); + ok(info.uliAssemblySizeInKB.u.LowPart == 0, + "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.LowPart); + ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, empty), + "Assembly path was changed\n"); + ok(info.cchBuf == MAX_PATH, "Expected MAX_PATH, got %d\n", info.cchBuf); + + /* display name is "mscorlib.dll,version=0.0.0.0,culture=neutral,publicKeyToken=null" */ + INIT_ASM_INFO(); + lstrcpyW(name, nullpublickey); + hr = IAssemblyCache_QueryAssemblyInfo(cache, 0, name, &info); + ok(hr == FUSION_E_PRIVATE_ASM_DISALLOWED, "got %08x\n", hr); + + /* display name is "mscorlib.dll,publicKeyToken=nuLl" */ + INIT_ASM_INFO(); + lstrcpyW(name, nullpublickey1); + hr = IAssemblyCache_QueryAssemblyInfo(cache, 0, name, &info); + ok(hr == FUSION_E_PRIVATE_ASM_DISALLOWED, "got %08x\n", hr); + /* display name is "wine, Culture=neutral" */ INIT_ASM_INFO(); lstrcpyW(name, wine); @@ -1394,24 +1444,18 @@ lstrcatW(name, badculture); hr = IAssemblyCache_QueryAssemblyInfo(cache, QUERYASMINFO_FLAG_GETSIZE, name, &info); - todo_wine - { - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), - "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %08x\n", hr); - ok(info.dwAssemblyFlags == 0, "Expected 0, got %08x\n", info.dwAssemblyFlags); - } + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), + "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %08x\n", hr); + ok(info.dwAssemblyFlags == 0, "Expected 0, got %08x\n", info.dwAssemblyFlags); ok(info.cbAssemblyInfo == sizeof(ASSEMBLY_INFO), "Expected sizeof(ASSEMBLY_INFO), got %d\n", info.cbAssemblyInfo); ok(info.uliAssemblySizeInKB.u.HighPart == 0, "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); ok(info.uliAssemblySizeInKB.u.LowPart == 0, "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.LowPart); - todo_wine - { - ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, empty), - "Assembly path was changed\n"); - ok(info.cchBuf == MAX_PATH, "Expected MAX_PATH, got %d\n", info.cchBuf); - } + ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, empty), + "Assembly path was changed\n"); + ok(info.cchBuf == MAX_PATH, "Expected MAX_PATH, got %d\n", info.cchBuf); /* display name is "wine, PublicKeyTokens=2d03617b1c31e2f5" */ INIT_ASM_INFO(); Modified: trunk/rostests/winetests/fusion/asmenum.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/fusion/asmenum.… ============================================================================== --- trunk/rostests/winetests/fusion/asmenum.c [iso-8859-1] (original) +++ trunk/rostests/winetests/fusion/asmenum.c [iso-8859-1] Sat May 4 20:21:53 2013 @@ -16,18 +16,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS #include <stdio.h> -#include <windows.h> +//#include <windows.h> +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <winnls.h> #include <shlwapi.h> -#include <mscoree.h> +//#include <mscoree.h> #include <fusion.h> -#include <corerror.h> - -#include "wine/test.h" -#include "wine/list.h" +//#include <corerror.h> + +#include <wine/test.h> +#include <wine/list.h> static HRESULT (WINAPI *pCreateAssemblyEnum)(IAssemblyEnum **pEnum, IUnknown *pUnkReserved, Modified: trunk/rostests/winetests/fusion/asmname.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/fusion/asmname.… ============================================================================== --- trunk/rostests/winetests/fusion/asmname.c [iso-8859-1] (original) +++ trunk/rostests/winetests/fusion/asmname.c [iso-8859-1] Sat May 4 20:21:53 2013 @@ -16,16 +16,25 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #define COBJMACROS -#include <stdio.h> - -#include <windows.h> -#include <mscoree.h> +//#include <stdio.h> +#include <stdarg.h> + +//#include <windows.h> +#include <windef.h> +#include <winbase.h> +#include <winnls.h> +#include <objbase.h> +//#include <mscoree.h> #include <fusion.h> #include <corerror.h> -#include "wine/test.h" +#include <wine/test.h> /* ok-like statement which takes two unicode strings or one unicode and one ANSI string as arguments */ static CHAR string1[MAX_PATH]; @@ -891,6 +900,107 @@ ok(hr == FUSION_E_INVALID_NAME, "Expected FUSION_E_INVALID_NAME, got %08x\n", hr); ok(name == (IAssemblyName *)0xdeadbeef, "Expected 0xdeadbeef, got %p\n", name); + + /* no spaces */ + to_widechar(namestr, "wine,version=1.0.0.0"); + name = (IAssemblyName *)0xdeadbeef; + hr = pCreateAssemblyNameObject(&name, namestr, CANOF_PARSE_DISPLAY_NAME, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(name != NULL, "Expected non-NULL name\n"); + hi = lo = 0xdeadbeef; + hr = IAssemblyName_GetVersion(name, &hi, &lo); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hi == 65536, "Expected 536, got %u\n", hi); + ok(lo == 0, "Expected 0, got %u\n", lo); + IAssemblyName_Release(name); + + /* quoted values */ + to_widechar(namestr, "wine, version=\"1.0.0.0\",culture=\"en\""); + name = (IAssemblyName *)0xdeadbeef; + hr = pCreateAssemblyNameObject(&name, namestr, CANOF_PARSE_DISPLAY_NAME, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(name != NULL, "Expected non-NULL name\n"); + hi = lo = 0xdeadbeef; + hr = IAssemblyName_GetVersion(name, &hi, &lo); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hi == 65536, "Expected 65536, got %u\n", hi); + ok(lo == 0, "Expected 0, got %u\n", lo); + IAssemblyName_Release(name); +} + +static void test_IAssemblyName_IsEqual(void) +{ + static const WCHAR wine1[] = + {'w','i','n','e',0}; + static const WCHAR wine2[] = + {'w','i','n','e',',','v','e','r','s','i','o','n','=','1','.','0','.','0','.','0',0}; + static const WCHAR wine3[] = + {'w','i','n','e',',','v','e','r','s','i','o','n','=','1','.','0','.','0','.','0',',', + 'c','u','l','t','u','r','e','=','n','e','u','t','r','a','l',0}; + static const WCHAR wine4[] = + {'w','i','n','e',',','v','e','r','s','i','o','n','=','1','.','0','.','0','.','0',',', + 'c','u','l','t','u','r','e','=','e','n',0}; + static const WCHAR wine5[] = + {'w','i','n','e',',','v','e','r','s','i','o','n','=','1','.','0','.','0','.','0',',', + 'p','u','b','l','i','c','K','e','y','T','o','k','e','n','=','1','2','3','4','5','6', + '7','8','9','0','a','b','c','d','e','f',0}; + HRESULT hr; + IAssemblyName *name1, *name2; + + hr = pCreateAssemblyNameObject( &name1, wine1, CANOF_PARSE_DISPLAY_NAME, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = pCreateAssemblyNameObject( &name2, wine1, CANOF_PARSE_DISPLAY_NAME, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + if (0) { /* crashes on some old version */ + hr = IAssemblyName_IsEqual( name1, NULL, 0 ); + ok( hr == S_FALSE, "got %08x\n", hr ); + + hr = IAssemblyName_IsEqual( name1, NULL, ASM_CMPF_IL_ALL ); + ok( hr == S_FALSE, "got %08x\n", hr ); + } + + hr = IAssemblyName_IsEqual( name1, name1, ASM_CMPF_IL_ALL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IAssemblyName_IsEqual( name1, name2, ASM_CMPF_IL_ALL ); + ok( hr == S_OK, "got %08x\n", hr ); + + IAssemblyName_Release( name2 ); + hr = pCreateAssemblyNameObject( &name2, wine2, CANOF_PARSE_DISPLAY_NAME, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IAssemblyName_IsEqual( name1, name2, ASM_CMPF_IL_ALL ); + ok( hr == S_OK, "got %08x\n", hr ); + + IAssemblyName_Release( name2 ); + hr = pCreateAssemblyNameObject( &name2, wine3, CANOF_PARSE_DISPLAY_NAME, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IAssemblyName_IsEqual( name1, name2, ASM_CMPF_IL_ALL ); + ok( hr == S_OK, "got %08x\n", hr ); + + IAssemblyName_Release( name1 ); + hr = pCreateAssemblyNameObject( &name1, wine4, CANOF_PARSE_DISPLAY_NAME, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IAssemblyName_IsEqual( name1, name2, ASM_CMPF_IL_ALL ); + ok( hr == S_FALSE, "got %08x\n", hr ); + + IAssemblyName_Release( name1 ); + hr = pCreateAssemblyNameObject( &name1, wine1, CANOF_PARSE_DISPLAY_NAME, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + IAssemblyName_Release( name2 ); + hr = pCreateAssemblyNameObject( &name2, wine5, CANOF_PARSE_DISPLAY_NAME, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = IAssemblyName_IsEqual( name1, name2, ASM_CMPF_IL_ALL ); + ok( hr == S_OK, "got %08x\n", hr ); + + IAssemblyName_Release( name1 ); + IAssemblyName_Release( name2 ); } START_TEST(asmname) @@ -902,4 +1012,5 @@ } test_CreateAssemblyNameObject(); + test_IAssemblyName_IsEqual(); } Modified: trunk/rostests/winetests/fusion/fusion.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/fusion/fusion.c… ============================================================================== --- trunk/rostests/winetests/fusion/fusion.c [iso-8859-1] (original) +++ trunk/rostests/winetests/fusion/fusion.c [iso-8859-1] Sat May 4 20:21:53 2013 @@ -16,10 +16,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +//#include <windows.h> +#include <windef.h> +#include <winbase.h> +#include <winnls.h> +#include <objbase.h> #include <fusion.h> -#include "wine/test.h" +#include <wine/test.h> static HMODULE hmscoree; @@ -29,14 +39,6 @@ LPVOID pvReserved, HMODULE *phModDll); static HRESULT (WINAPI *pGetCORVersion)(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwLength); - -static CHAR string1[MAX_PATH], string2[MAX_PATH]; - -#define ok_w2(format, szString1, szString2) \ -\ - WideCharToMultiByte(CP_ACP, 0, szString1, -1, string1, MAX_PATH, NULL, NULL); \ - WideCharToMultiByte(CP_ACP, 0, szString2, -1, string2, MAX_PATH, NULL, NULL); \ - ok(!lstrcmpA(string1, string2), format, string1, string2) static BOOL init_functionpointers(void) { @@ -127,14 +129,14 @@ lstrcpyW(path, nochange); hr = pGetCachePath(ASM_CACHE_GAC, path, NULL); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); - ok_w2("Expected \"%s\", got \"%s\"\n", nochange, path); + ok( !lstrcmpW( nochange, path ), "Expected %s, got %s\n", wine_dbgstr_w(nochange), wine_dbgstr_w(path)); /* get the cache path */ lstrcpyW(path, nochange); size = MAX_PATH; hr = pGetCachePath(ASM_CACHE_GAC, path, &size); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok_w2("Expected \"%s\", got \"%s\"\n", cachepath, path); + ok( !lstrcmpW( cachepath, path ), "Expected %s, got %s\n", wine_dbgstr_w(cachepath), wine_dbgstr_w(path)); /* pcchPath has no room for NULL terminator */ lstrcpyW(path, nochange); @@ -142,7 +144,7 @@ hr = pGetCachePath(ASM_CACHE_GAC, path, &size); ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); - ok_w2("Expected \"%s\", got \"%s\"\n", nochange, path); + ok( !lstrcmpW( nochange, path ), "Expected %s, got %s\n", wine_dbgstr_w(nochange), wine_dbgstr_w(path)); lstrcpyW(cachepath, windir); lstrcatW(cachepath, backslash); @@ -156,7 +158,7 @@ broken(hr == E_INVALIDARG), /* .NET 1.1 */ "Expected S_OK, got %08x\n", hr); if (hr == S_OK) - ok_w2("Expected \"%s\", got \"%s\"\n", cachepath, path); + ok( !lstrcmpW( cachepath, path ), "Expected %s, got %s\n", wine_dbgstr_w(cachepath), wine_dbgstr_w(path)); if (pGetCORVersion) { @@ -191,7 +193,7 @@ size = MAX_PATH; hr = pGetCachePath(ASM_CACHE_ZAP, path, &size); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok_w2("Expected \"%s\", got \"%s\"\n", cachepath, path); + ok( !lstrcmpW( cachepath, path ), "Expected %s, got %s\n", wine_dbgstr_w(cachepath), wine_dbgstr_w(path)); } /* two flags at once */ @@ -199,7 +201,7 @@ size = MAX_PATH; hr = pGetCachePath(ASM_CACHE_GAC | ASM_CACHE_ROOT, path, &size); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); - ok_w2("Expected \"%s\", got \"%s\"\n", nochange, path); + ok( !lstrcmpW( nochange, path ), "Expected %s, got %s\n", wine_dbgstr_w(nochange), wine_dbgstr_w(path)); } START_TEST(fusion) Modified: trunk/rostests/winetests/fusion/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/fusion/testlist… ============================================================================== --- trunk/rostests/winetests/fusion/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/fusion/testlist.c [iso-8859-1] Sat May 4 20:21:53 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_fusion(void); extern void func_asmname(void);

11 years, 4 months

[akhaldi] 58927: [FUSION] * Sync with Wine 1.5.26.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat May 4 20:21:39 2013 New Revision: 58927 URL: http://svn.reactos.org/svn/reactos?rev=58927&view=rev Log: [FUSION] * Sync with Wine 1.5.26. Removed: trunk/reactos/dll/win32/fusion/fusion_main.c Modified: trunk/reactos/dll/win32/fusion/CMakeLists.txt trunk/reactos/dll/win32/fusion/asmcache.c trunk/reactos/dll/win32/fusion/asmenum.c trunk/reactos/dll/win32/fusion/asmname.c trunk/reactos/dll/win32/fusion/assembly.c trunk/reactos/dll/win32/fusion/fusion.c trunk/reactos/dll/win32/fusion/fusion.spec trunk/reactos/dll/win32/fusion/fusionpriv.h trunk/reactos/include/psdk/corerror.h trunk/reactos/include/psdk/fusion.idl trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/fusion/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/CMakeLists.txt [iso-8859-1] Sat May 4 20:21:39 2013 @@ -10,7 +10,6 @@ asmname.c assembly.c fusion.c - fusion_main.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/fusion_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/fusion.def) @@ -18,7 +17,7 @@ add_library(fusion SHARED ${SOURCE}) set_module_type(fusion win32dll) target_link_libraries(fusion wine uuid) -add_importlibs(fusion shlwapi advapi32 dbghelp user32 msvcrt kernel32 ntdll) +add_importlibs(fusion advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll) add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.0.3705 FOR all) add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.1.4322 FOR all) add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v2.0.50727 FOR all) Modified: trunk/reactos/dll/win32/fusion/asmcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmcache.… ============================================================================== --- trunk/reactos/dll/win32/fusion/asmcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/asmcache.c [iso-8859-1] Sat May 4 20:21:39 2013 @@ -98,32 +98,48 @@ return ret; } -static BOOL get_assembly_directory(LPWSTR dir, DWORD size, BYTE architecture) -{ +static BOOL get_assembly_directory(LPWSTR dir, DWORD size, const char *version, PEKIND architecture) +{ + static const WCHAR dotnet[] = {'\\','M','i','c','r','o','s','o','f','t','.','N','E','T','\\',0}; static const WCHAR gac[] = {'\\','a','s','s','e','m','b','l','y','\\','G','A','C',0}; - static const WCHAR msil[] = {'_','M','S','I','L',0}; static const WCHAR x86[] = {'_','3','2',0}; static const WCHAR amd64[] = {'_','6','4',0}; - - GetWindowsDirectoryW(dir, size); - strcatW(dir, gac); - + DWORD len = GetWindowsDirectoryW(dir, size); + + if (!strcmp(version, "v4.0.30319")) + { + strcpyW(dir + len, dotnet); + len += sizeof(dotnet)/sizeof(WCHAR) -1; + strcpyW(dir + len, gac + 1); + len += sizeof(gac)/sizeof(WCHAR) - 2; + } + else + { + strcpyW(dir + len, gac); + len += sizeof(gac)/sizeof(WCHAR) - 1; + } switch (architecture) { + case peNone: + break; + case peMSIL: - strcatW(dir, msil); + strcpyW(dir + len, msil); break; case peI386: - strcatW(dir, x86); + strcpyW(dir + len, x86); break; case peAMD64: - strcatW(dir, amd64); - break; - } - + strcpyW(dir + len, amd64); + break; + + default: + WARN("unhandled architecture %u\n", architecture); + return FALSE; + } return TRUE; } @@ -153,7 +169,7 @@ if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAssemblyCache)) { - IUnknown_AddRef(iface); + IAssemblyCache_AddRef(iface); *ppobj = This; return S_OK; } @@ -312,11 +328,16 @@ if (FAILED(hr)) goto done; - hr = IAssemblyEnum_GetNextAssembly(asmenum, NULL, &next, 0); - if (hr == S_FALSE) - { - hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); - goto done; + for (;;) + { + hr = IAssemblyEnum_GetNextAssembly(asmenum, NULL, &next, 0); + if (hr != S_OK) + { + hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + goto done; + } + hr = IAssemblyName_IsEqual(asmname, next, ASM_CMPF_IL_ALL); + if (hr == S_OK) break; } if (!pAsmInfo) @@ -353,24 +374,51 @@ return E_NOTIMPL; } +static HRESULT copy_file( const WCHAR *src_dir, DWORD src_len, const WCHAR *dst_dir, DWORD dst_len, + const WCHAR *filename ) +{ + WCHAR *src_file, *dst_file; + DWORD len = strlenW( filename ); + HRESULT hr = S_OK; + + if (!(src_file = HeapAlloc( GetProcessHeap(), 0, (src_len + len + 1) * sizeof(WCHAR) ))) + return E_OUTOFMEMORY; + memcpy( src_file, src_dir, src_len * sizeof(WCHAR) ); + strcpyW( src_file + src_len, filename ); + + if (!(dst_file = HeapAlloc( GetProcessHeap(), 0, (dst_len + len + 1) * sizeof(WCHAR) ))) + { + HeapFree( GetProcessHeap(), 0, src_file ); + return E_OUTOFMEMORY; + } + memcpy( dst_file, dst_dir, dst_len * sizeof(WCHAR) ); + strcpyW( dst_file + dst_len, filename ); + + if (!CopyFileW( src_file, dst_file, FALSE )) hr = HRESULT_FROM_WIN32( GetLastError() ); + HeapFree( GetProcessHeap(), 0, src_file ); + HeapFree( GetProcessHeap(), 0, dst_file ); + return hr; +} + static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, DWORD dwFlags, LPCWSTR pszManifestFilePath, LPCFUSION_INSTALL_REFERENCE pRefData) { - static const WCHAR format[] = {'%','s','\\','%','s','\\','%','s','_','_','%','s','\\',0}; + static const WCHAR format[] = + {'%','s','\\','%','s','\\','%','s','_','_','%','s','\\',0}; + static const WCHAR format_v40[] = + {'%','s','\\','%','s','\\','v','4','.','0','_','%','s','_','_','%','s','\\',0}; static const WCHAR ext_exe[] = {'.','e','x','e',0}; static const WCHAR ext_dll[] = {'.','d','l','l',0}; IAssemblyCacheImpl *cache = impl_from_IAssemblyCache(iface); ASSEMBLY *assembly; - LPWSTR filename; - LPWSTR name = NULL; - LPWSTR token = NULL; - LPWSTR version = NULL; - LPWSTR asmpath = NULL; - WCHAR path[MAX_PATH]; - WCHAR asmdir[MAX_PATH]; - LPWSTR ext; + const WCHAR *extension, *filename, *src_dir; + WCHAR *name = NULL, *token = NULL, *version = NULL, *asmpath = NULL; + WCHAR asmdir[MAX_PATH], *p, **external_files = NULL, *dst_dir = NULL; + PEKIND architecture; + char *clr_version; + DWORD i, count = 0, src_len, dst_len = sizeof(format_v40)/sizeof(format_v40[0]); HRESULT hr; TRACE("(%p, %d, %s, %p)\n", iface, dwFlags, @@ -379,10 +427,10 @@ if (!pszManifestFilePath || !*pszManifestFilePath) return E_INVALIDARG; - if (!(ext = strrchrW(pszManifestFilePath, '.'))) + if (!(extension = strrchrW(pszManifestFilePath, '.'))) return HRESULT_FROM_WIN32(ERROR_INVALID_NAME); - if (lstrcmpiW(ext, ext_exe) && lstrcmpiW(ext, ext_dll)) + if (lstrcmpiW(extension, ext_exe) && lstrcmpiW(extension, ext_dll)) return HRESULT_FROM_WIN32(ERROR_INVALID_NAME); if (GetFileAttributesW(pszManifestFilePath) == INVALID_FILE_ATTRIBUTES) @@ -407,29 +455,67 @@ if (FAILED(hr)) goto done; + hr = assembly_get_runtime_version(assembly, &clr_version); + if (FAILED(hr)) + goto done; + + hr = assembly_get_external_files(assembly, &external_files, &count); + if (FAILED(hr)) + goto done; + cache_lock( cache ); - get_assembly_directory(asmdir, MAX_PATH, assembly_get_architecture(assembly)); - - sprintfW(path, format, asmdir, name, version, token); - - create_full_path(path); + architecture = assembly_get_architecture(assembly); + get_assembly_directory(asmdir, MAX_PATH, clr_version, architecture); + + dst_len += strlenW(asmdir) + strlenW(name) + strlenW(version) + strlenW(token); + if (!(dst_dir = HeapAlloc(GetProcessHeap(), 0, dst_len * sizeof(WCHAR)))) + { + hr = E_OUTOFMEMORY; + goto done; + } + if (!strcmp(clr_version, "v4.0.30319")) + dst_len = sprintfW(dst_dir, format_v40, asmdir, name, version, token); + else + dst_len = sprintfW(dst_dir, format, asmdir, name, version, token); + + create_full_path(dst_dir); hr = assembly_get_path(assembly, &asmpath); if (FAILED(hr)) goto done; - filename = PathFindFileNameW(asmpath); - - strcatW(path, filename); - if (!CopyFileW(asmpath, path, FALSE)) - hr = HRESULT_FROM_WIN32(GetLastError()); + if ((p = strrchrW(asmpath, '\\'))) + { + filename = p + 1; + src_dir = asmpath; + src_len = filename - asmpath; + } + else + { + filename = asmpath; + src_dir = NULL; + src_len = 0; + } + hr = copy_file(src_dir, src_len, dst_dir, dst_len, filename); + if (FAILED(hr)) + goto done; + + for (i = 0; i < count; i++) + { + hr = copy_file(src_dir, src_len, dst_dir, dst_len, external_files[i]); + if (FAILED(hr)) + break; + } done: HeapFree(GetProcessHeap(), 0, name); HeapFree(GetProcessHeap(), 0, token); HeapFree(GetProcessHeap(), 0, version); HeapFree(GetProcessHeap(), 0, asmpath); + HeapFree(GetProcessHeap(), 0, dst_dir); + for (i = 0; i < count; i++) HeapFree(GetProcessHeap(), 0, external_files[i]); + HeapFree(GetProcessHeap(), 0, external_files); assembly_release(assembly); cache_unlock( cache ); return hr; @@ -501,7 +587,7 @@ if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAssemblyCacheItem)) { - IUnknown_AddRef(iface); + IAssemblyCacheItem_AddRef(iface); *ppobj = This; return S_OK; } Modified: trunk/reactos/dll/win32/fusion/asmenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmenum.c… ============================================================================== --- trunk/reactos/dll/win32/fusion/asmenum.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/asmenum.c [iso-8859-1] Sat May 4 20:21:39 2013 @@ -25,6 +25,8 @@ #include <stdarg.h> #define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #include <windef.h> #include <winbase.h> @@ -73,7 +75,7 @@ if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAssemblyEnum)) { - IUnknown_AddRef(iface); + IAssemblyEnum_AddRef(iface); *ppobj = This; return S_OK; } @@ -168,23 +170,32 @@ IAssemblyEnumImpl_Clone }; -static void parse_name(IAssemblyName *name, int depth, LPWSTR path, LPWSTR buf) -{ - WCHAR disp[MAX_PATH]; +static void build_file_mask(IAssemblyName *name, int depth, const WCHAR *path, + const WCHAR *prefix, WCHAR *buf) +{ + static const WCHAR star[] = {'*',0}; + static const WCHAR ss_fmt[] = {'%','s','\\','%','s',0}; + static const WCHAR sss_fmt[] = {'%','s','\\','%','s','_','_','%','s',0}; + static const WCHAR ssss_fmt[] = {'%','s','\\','%','s','%','s','_','_','%','s',0}; + static const WCHAR ver_fmt[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; + static const WCHAR star_fmt[] = {'%','s','\\','*',0}; + static const WCHAR star_prefix_fmt[] = {'%','s','\\','%','s','*',0}; + WCHAR disp[MAX_PATH], version[24]; /* strlen("65535") * 4 + 3 + 1 */ LPCWSTR verptr, pubkeyptr; HRESULT hr; DWORD size, major_size, minor_size, build_size, revision_size; WORD major, minor, build, revision; - - static const WCHAR star[] = {'*',0}; - static const WCHAR ss_fmt[] = {'%','s','\\','%','s',0}; - static const WCHAR verpubkey[] = {'%','s','\\','%','s','_','_','%','s',0}; - static const WCHAR ver_fmt[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; - - WCHAR version[24]; /* strlen("65535") * 4 + 3 + 1 */ WCHAR token_str[TOKEN_LENGTH + 1]; BYTE token[BYTES_PER_TOKEN]; + if (!name) + { + if (prefix && depth == 1) + sprintfW(buf, star_prefix_fmt, path, prefix); + else + sprintfW(buf, star_fmt, path); + return; + } if (depth == 0) { size = MAX_PATH; @@ -226,7 +237,10 @@ pubkeyptr = token_str; } - sprintfW(buf, verpubkey, path, verptr, pubkeyptr); + if (prefix) + sprintfW(buf, ssss_fmt, path, prefix, verptr, pubkeyptr); + else + sprintfW(buf, sss_fmt, path, verptr, pubkeyptr); } } @@ -291,34 +305,24 @@ } static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, - int depth, LPWSTR path) -{ - WIN32_FIND_DATAW ffd; - WCHAR buf[MAX_PATH]; - WCHAR disp[MAX_PATH]; - WCHAR asmpath[MAX_PATH]; - ASMNAME *asmname; - HANDLE hfind; - LPWSTR ptr; - HRESULT hr = S_OK; - - static WCHAR parent[MAX_PATH]; - + int depth, const WCHAR *prefix, LPWSTR path) +{ static const WCHAR dot[] = {'.',0}; static const WCHAR dotdot[] = {'.','.',0}; - static const WCHAR search_fmt[] = {'%','s','\\','*',0}; static const WCHAR dblunder[] = {'_','_',0}; static const WCHAR path_fmt[] = {'%','s','\\','%','s','\\','%','s','.','d','l','l',0}; - static const WCHAR fmt[] = {'%','s',',',' ','V','e','r','s','i','o','n','=','%','s',',',' ', + static const WCHAR name_fmt[] = {'%','s',',',' ','V','e','r','s','i','o','n','=','%','s',',',' ', 'C','u','l','t','u','r','e','=','n','e','u','t','r','a','l',',',' ', 'P','u','b','l','i','c','K','e','y','T','o','k','e','n','=','%','s',0}; static const WCHAR ss_fmt[] = {'%','s','\\','%','s',0}; - - if (name) - parse_name(name, depth, path, buf); - else - sprintfW(buf, search_fmt, path); - + WIN32_FIND_DATAW ffd; + WCHAR buf[MAX_PATH], disp[MAX_PATH], asmpath[MAX_PATH], *ptr; + static WCHAR parent[MAX_PATH]; + ASMNAME *asmname; + HANDLE hfind; + HRESULT hr = S_OK; + + build_file_mask(name, depth, path, prefix, buf); hfind = FindFirstFileW(buf, &ffd); if (hfind == INVALID_HANDLE_VALUE) return S_OK; @@ -339,13 +343,21 @@ } else if (depth == 1) { + const WCHAR *token, *version = ffd.cFileName; + sprintfW(asmpath, path_fmt, path, ffd.cFileName, parent); - ptr = strstrW(ffd.cFileName, dblunder); *ptr = '\0'; - ptr += 2; - - sprintfW(disp, fmt, parent, ffd.cFileName, ptr); + token = ptr + 2; + + if (prefix) + { + unsigned int prefix_len = strlenW(prefix); + if (strlenW(ffd.cFileName) >= prefix_len && + !memicmpW(ffd.cFileName, prefix, prefix_len)) + version += prefix_len; + } + sprintfW(disp, name_fmt, parent, version, token); asmname = HeapAlloc(GetProcessHeap(), 0, sizeof(ASMNAME)); if (!asmname) @@ -375,7 +387,7 @@ } sprintfW(buf, ss_fmt, path, ffd.cFileName); - hr = enum_gac_assemblies(assemblies, name, depth + 1, buf); + hr = enum_gac_assemblies(assemblies, name, depth + 1, prefix, buf); if (FAILED(hr)) break; } while (FindNextFileW(hfind, &ffd) != 0); @@ -386,32 +398,65 @@ static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName) { - WCHAR path[MAX_PATH]; - WCHAR buf[MAX_PATH]; + static const WCHAR gac[] = {'\\','G','A','C',0}; + static const WCHAR gac_32[] = {'\\','G','A','C','_','3','2',0}; + static const WCHAR gac_64[] = {'\\','G','A','C','_','6','4',0}; + static const WCHAR gac_msil[] = {'\\','G','A','C','_','M','S','I','L',0}; + static const WCHAR v40[] = {'v','4','.','0','_',0}; + WCHAR path[MAX_PATH], buf[MAX_PATH]; + SYSTEM_INFO info; HRESULT hr; DWORD size; - static WCHAR under32[] = {'_','3','2',0}; - static WCHAR msil[] = {'_','M','S','I','L',0}; - size = MAX_PATH; - hr = GetCachePath(ASM_CACHE_GAC, buf, &size); - if (FAILED(hr)) - return hr; - - lstrcpyW(path, buf); - lstrcatW(path, under32); - hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); - if (FAILED(hr)) - return hr; - - lstrcpyW(path, buf); - lstrcatW(path, msil); - hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); - if (FAILED(hr)) - return hr; - - hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, buf); + hr = GetCachePath(ASM_CACHE_ROOT_EX, buf, &size); + if (FAILED(hr)) + return hr; + + strcpyW(path, buf); + GetNativeSystemInfo(&info); + if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) + { + strcpyW(path + size - 1, gac_64); + hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, v40, path); + if (FAILED(hr)) + return hr; + } + strcpyW(path + size - 1, gac_32); + hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, v40, path); + if (FAILED(hr)) + return hr; + + strcpyW(path + size - 1, gac_msil); + hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, v40, path); + if (FAILED(hr)) + return hr; + + size = MAX_PATH; + hr = GetCachePath(ASM_CACHE_ROOT, buf, &size); + if (FAILED(hr)) + return hr; + + strcpyW(path, buf); + if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) + { + strcpyW(path + size - 1, gac_64); + hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, NULL, path); + if (FAILED(hr)) + return hr; + } + strcpyW(path + size - 1, gac_32); + hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, NULL, path); + if (FAILED(hr)) + return hr; + + strcpyW(path + size - 1, gac_msil); + hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, NULL, path); + if (FAILED(hr)) + return hr; + + strcpyW(path + size - 1, gac); + hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, NULL, path); if (FAILED(hr)) return hr; Modified: trunk/reactos/dll/win32/fusion/asmname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmname.c… ============================================================================== --- trunk/reactos/dll/win32/fusion/asmname.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/asmname.c [iso-8859-1] Sat May 4 20:21:39 2013 @@ -88,7 +88,7 @@ if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAssemblyName)) { - IUnknown_AddRef(iface); + IAssemblyName_AddRef(iface); *ppobj = This; return S_OK; } @@ -265,7 +265,7 @@ { static const WCHAR spec[] = {'%','d',0}; static const WCHAR period[] = {'.',0}; - int i; + DWORD i; wsprintfW(verstr, spec, name->version[0]); @@ -411,10 +411,37 @@ static HRESULT WINAPI IAssemblyNameImpl_IsEqual(IAssemblyName *iface, IAssemblyName *pName, - DWORD dwCmpFlags) -{ - FIXME("(%p, %p, %d) stub!\n", iface, pName, dwCmpFlags); - return E_NOTIMPL; + DWORD flags) +{ + IAssemblyNameImpl *name1 = impl_from_IAssemblyName(iface); + IAssemblyNameImpl *name2 = impl_from_IAssemblyName(pName); + + TRACE("(%p, %p, 0x%08x)\n", iface, pName, flags); + + if (!pName) return S_FALSE; + if (flags & ~ASM_CMPF_IL_ALL) FIXME("unsupported flags\n"); + + if ((flags & ASM_CMPF_NAME) && strcmpW(name1->name, name2->name)) return S_FALSE; + if (name1->versize && name2->versize) + { + if ((flags & ASM_CMPF_MAJOR_VERSION) && + name1->version[0] != name2->version[0]) return S_FALSE; + if ((flags & ASM_CMPF_MINOR_VERSION) && + name1->version[1] != name2->version[1]) return S_FALSE; + if ((flags & ASM_CMPF_BUILD_NUMBER) && + name1->version[2] != name2->version[2]) return S_FALSE; + if ((flags & ASM_CMPF_REVISION_NUMBER) && + name1->version[3] != name2->version[3]) return S_FALSE; + } + if ((flags & ASM_CMPF_PUBLIC_KEY_TOKEN) && + name1->haspubkey && name2->haspubkey && + memcmp(name1->pubkey, name2->pubkey, sizeof(name1->pubkey))) return S_FALSE; + + if ((flags & ASM_CMPF_CULTURE) && + name1->culture && name2->culture && + strcmpW(name1->culture, name2->culture)) return S_FALSE; + + return S_OK; } static HRESULT WINAPI IAssemblyNameImpl_Clone(IAssemblyName *iface, @@ -538,6 +565,10 @@ { int i; BYTE val; + static const WCHAR nullstr[] = {'n','u','l','l',0}; + + if(lstrcmpiW(pubkey, nullstr) == 0) + return FUSION_E_PRIVATE_ASM_DISALLOWED; if (lstrlenW(pubkey) < CHARS_PER_PUBKEY) return FUSION_E_INVALID_NAME; @@ -557,10 +588,32 @@ return S_OK; } +static WCHAR *parse_value( const WCHAR *str, unsigned int len ) +{ + WCHAR *ret; + const WCHAR *p = str; + BOOL quoted = FALSE; + unsigned int i = 0; + + if (!(ret = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) return NULL; + if (*p == '\"') + { + quoted = TRUE; + p++; + } + while (*p && *p != '\"') ret[i++] = *p++; + if ((quoted && *p != '\"') || (!quoted && *p == '\"')) + { + HeapFree( GetProcessHeap(), 0, ret ); + return NULL; + } + ret[i] = 0; + return ret; +} + static HRESULT parse_display_name(IAssemblyNameImpl *name, LPCWSTR szAssemblyName) { - LPWSTR str, save; - LPWSTR ptr, ptr2; + LPWSTR str, save, ptr, ptr2, value; HRESULT hr = S_OK; BOOL done = FALSE; @@ -599,7 +652,7 @@ if (!ptr) goto done; - str = ptr + 2; + str = ptr + 1; while (!done) { ptr = strchrW(str, '='); @@ -616,7 +669,7 @@ goto done; } - if (!(ptr2 = strstrW(ptr, separator))) + if (!(ptr2 = strchrW(ptr, ','))) { if (!(ptr2 = strchrW(ptr, '\0'))) { @@ -628,21 +681,25 @@ } *ptr2 = '\0'; - + if (!(value = parse_value( ptr, ptr2 - ptr ))) + { + hr = FUSION_E_INVALID_NAME; + goto done; + } while (*str == ' ') str++; - if (!lstrcmpW(str, version)) - hr = parse_version(name, ptr); - else if (!lstrcmpW(str, culture)) - hr = parse_culture(name, ptr); - else if (!lstrcmpW(str, pubkey)) - hr = parse_pubkey(name, ptr); - else if (!lstrcmpW(str, procarch)) + if (!lstrcmpiW(str, version)) + hr = parse_version( name, value ); + else if (!lstrcmpiW(str, culture)) + hr = parse_culture( name, value ); + else if (!lstrcmpiW(str, pubkey)) + hr = parse_pubkey( name, value ); + else if (!lstrcmpiW(str, procarch)) { - name->procarch = strdupW(ptr); - if (!name->procarch) - hr = E_OUTOFMEMORY; + name->procarch = value; + value = NULL; } + HeapFree( GetProcessHeap(), 0, value ); if (FAILED(hr)) goto done; Modified: trunk/reactos/dll/win32/fusion/assembly.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/assembly.… ============================================================================== --- trunk/reactos/dll/win32/fusion/assembly.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/assembly.c [iso-8859-1] Sat May 4 20:21:39 2013 @@ -486,8 +486,9 @@ static HRESULT parse_clr_tables(ASSEMBLY *assembly, ULONG offset) { - DWORD i, previ, offidx; + DWORD i, count; ULONG currofs; + ULONGLONG mask; currofs = offset; assembly->tableshdr = assembly_data_offset(assembly, currofs); @@ -506,44 +507,22 @@ if (!assembly->numrows) return E_FAIL; - assembly->numtables = 0; - for (i = 0; i < MAX_CLR_TABLES; i++) - { - if ((i < 32 && (assembly->tableshdr->MaskValid.u.LowPart >> i) & 1) || - (i >= 32 && (assembly->tableshdr->MaskValid.u.HighPart >> i) & 1)) - { - assembly->numtables++; - } - } - + memset(assembly->tables, -1, MAX_CLR_TABLES * sizeof(CLRTABLE)); + + for (i = count = 0, mask = 1; i < MAX_CLR_TABLES; i++, mask <<= 1) + { + if (assembly->tableshdr->MaskValid.QuadPart & mask) + assembly->tables[i].rows = assembly->numrows[count++]; + } + assembly->numtables = count; currofs += assembly->numtables * sizeof(DWORD); - memset(assembly->tables, -1, MAX_CLR_TABLES * sizeof(CLRTABLE)); - - if (assembly->tableshdr->MaskValid.u.LowPart & 1) - assembly->tables[0].offset = currofs; - - offidx = 0; - for (i = 0; i < MAX_CLR_TABLES; i++) - { - if ((i < 32 && (assembly->tableshdr->MaskValid.u.LowPart >> i) & 1) || - (i >= 32 && (assembly->tableshdr->MaskValid.u.HighPart >> i) & 1)) - { - assembly->tables[i].rows = assembly->numrows[offidx]; - offidx++; - } - } - - previ = 0; - offidx = 1; - for (i = 1; i < MAX_CLR_TABLES; i++) - { - if ((i < 32 && (assembly->tableshdr->MaskValid.u.LowPart >> i) & 1) || - (i >= 32 && (assembly->tableshdr->MaskValid.u.HighPart >> i) & 1)) - { - currofs += get_table_size(assembly, previ) * assembly->numrows[offidx - 1]; + + for (i = 0, mask = 1; i < MAX_CLR_TABLES; i++, mask <<= 1) + { + if (assembly->tableshdr->MaskValid.QuadPart & mask) + { assembly->tables[i].offset = currofs; - offidx++; - previ = i; + currofs += get_table_size(assembly, i) * assembly->tables[i].rows; } } @@ -571,7 +550,7 @@ size = FIELD_OFFSET(METADATAHDR, Version); memcpy(assembly->metadatahdr, metadatahdr, size); - /* we don't care about the version string */ + assembly->metadatahdr->Version = (LPSTR)&metadatahdr->Version; ofs = FIELD_OFFSET(METADATAHDR, Flags); ptr += FIELD_OFFSET(METADATAHDR, Version) + metadatahdr->VersionLength + 1; @@ -765,9 +744,9 @@ ptr += FIELD_OFFSET(ASSEMBLYTABLE, PublicKey) + assembly->blobsz; if (assembly->stringsz == sizeof(DWORD)) - stridx = *((DWORD *)ptr); + stridx = *(DWORD *)ptr; else - stridx = *((WORD *)ptr); + stridx = *(WORD *)ptr; *name = assembly_dup_str(assembly, stridx); if (!*name) @@ -815,10 +794,10 @@ return S_OK; } -BYTE assembly_get_architecture(ASSEMBLY *assembly) +PEKIND assembly_get_architecture(ASSEMBLY *assembly) { if ((assembly->corhdr->MajorRuntimeVersion == 2) && (assembly->corhdr->MinorRuntimeVersion == 0)) - return 0; /* .NET 1.x assembly */ + return peNone; /* .NET 1.x assembly */ if (assembly->nthdr->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) return peAMD64; /* AMD64/IA64 assembly */ @@ -829,23 +808,22 @@ return peI386; /* x86 assembly */ } -static BYTE *assembly_get_blob(ASSEMBLY *assembly, WORD index, ULONG *size) +static BYTE *assembly_get_blob(ASSEMBLY *assembly, DWORD index, ULONG *size) { return GetData(&assembly->blobs[index], size); } HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) { - ASSEMBLYTABLE *asmtbl; ULONG i, size; LONG offset; - BYTE *hashdata; + BYTE *hashdata, *pubkey, *ptr; HCRYPTPROV crypt; HCRYPTHASH hash; - BYTE *pubkey; BYTE tokbytes[BYTES_PER_TOKEN]; HRESULT hr = E_FAIL; LPWSTR tok; + DWORD idx; *token = NULL; @@ -853,11 +831,17 @@ if (offset == -1) return E_FAIL; - asmtbl = assembly_data_offset(assembly, offset); - if (!asmtbl) - return E_FAIL; - - pubkey = assembly_get_blob(assembly, asmtbl->PublicKey, &size); + ptr = assembly_data_offset(assembly, offset); + if (!ptr) + return E_FAIL; + + ptr += FIELD_OFFSET(ASSEMBLYTABLE, PublicKey); + if (assembly->blobsz == sizeof(DWORD)) + idx = *(DWORD *)ptr; + else + idx = *(WORD *)ptr; + + pubkey = assembly_get_blob(assembly, idx, &size); if (!CryptAcquireContextA(&crypt, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) @@ -905,3 +889,58 @@ return hr; } + +HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) +{ + *version = assembly->metadatahdr->Version; + return S_OK; +} + +HRESULT assembly_get_external_files(ASSEMBLY *assembly, LPWSTR **files, DWORD *count) +{ + LONG offset; + INT i, num_rows; + WCHAR **ret; + BYTE *ptr; + DWORD idx; + + *count = 0; + + offset = assembly->tables[TableFromToken(mdtFile)].offset; + if (offset == -1) + return S_OK; + + ptr = assembly_data_offset(assembly, offset); + if (!ptr) + return S_OK; + + num_rows = assembly->tables[TableFromToken(mdtFile)].rows; + if (num_rows <= 0) + return S_OK; + + ret = HeapAlloc(GetProcessHeap(), 0, num_rows * sizeof(WCHAR *)); + if (!ret) + return E_OUTOFMEMORY; + + for (i = 0; i < num_rows; i++) + { + ptr += sizeof(DWORD); /* skip Flags field */ + if (assembly->stringsz == sizeof(DWORD)) + idx = *(DWORD *)ptr; + else + idx = *(WORD *)ptr; + + ret[i] = assembly_dup_str(assembly, idx); + if (!ret[i]) + { + for (; i >= 0; i--) HeapFree(GetProcessHeap(), 0, ret[i]); + HeapFree(GetProcessHeap(), 0, ret); + return E_OUTOFMEMORY; + } + ptr += assembly->stringsz; /* skip Name field */ + ptr += assembly->blobsz; /* skip Hash field */ + } + *count = num_rows; + *files = ret; + return S_OK; +} Modified: trunk/reactos/dll/win32/fusion/fusion.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusion.c?… ============================================================================== --- trunk/reactos/dll/win32/fusion/fusion.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/fusion.c [iso-8859-1] Sat May 4 20:21:39 2013 @@ -35,6 +35,16 @@ #include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(fusion); + + +/****************************************************************** + * InitializeFusion (FUSION.@) + */ +HRESULT WINAPI InitializeFusion(void) +{ + FIXME("\n"); + return E_NOTIMPL; +} /****************************************************************** * ClearDownloadCache (FUSION.@) @@ -80,9 +90,9 @@ pGetCORVersion = (void *)GetProcAddress(hmscoree, "GetCORVersion"); if (!pGetCORVersion) - return E_FAIL; - - hr = pGetCORVersion(version, size, &len); + hr = E_FAIL; + else + hr = pGetCORVersion(version, size, &len); FreeLibrary(hmscoree); return hr; @@ -94,32 +104,26 @@ HRESULT WINAPI GetCachePath(ASM_CACHE_FLAGS dwCacheFlags, LPWSTR pwzCachePath, PDWORD pcchPath) { - WCHAR path[MAX_PATH]; - WCHAR windir[MAX_PATH]; - WCHAR version[MAX_PATH]; - DWORD len; - HRESULT hr = S_OK; - - static const WCHAR backslash[] = {'\\',0}; - static const WCHAR assembly[] = {'a','s','s','e','m','b','l','y',0}; - static const WCHAR gac[] = {'G','A','C',0}; - static const WCHAR nativeimg[] = { - 'N','a','t','i','v','e','I','m','a','g','e','s','_',0}; + static const WCHAR assembly[] = {'\\','a','s','s','e','m','b','l','y',0}; + static const WCHAR gac[] = {'\\','G','A','C',0}; + static const WCHAR nativeimg[] = {'N','a','t','i','v','e','I','m','a','g','e','s','_',0}; + static const WCHAR dotnet[] = {'\\','M','i','c','r','o','s','o','f','t','.','N','E','T',0}; #ifdef _WIN64 static const WCHAR zapfmt[] = {'%','s','\\','%','s','\\','%','s','%','s','_','6','4',0}; #else static const WCHAR zapfmt[] = {'%','s','\\','%','s','\\','%','s','%','s','_','3','2',0}; #endif + WCHAR path[MAX_PATH], windir[MAX_PATH], version[MAX_PATH]; + DWORD len; + HRESULT hr = S_OK; TRACE("(%08x, %p, %p)\n", dwCacheFlags, pwzCachePath, pcchPath); if (!pcchPath) return E_INVALIDARG; - GetWindowsDirectoryW(windir, MAX_PATH); - lstrcpyW(path, windir); - lstrcatW(path, backslash); - lstrcatW(path, assembly); + len = GetWindowsDirectoryW(windir, MAX_PATH); + strcpyW(path, windir); switch (dwCacheFlags) { @@ -129,37 +133,42 @@ if (FAILED(hr)) return hr; - sprintfW(path, zapfmt, windir, assembly, nativeimg, version); + len = sprintfW(path, zapfmt, windir, assembly + 1, nativeimg, version); break; } - case ASM_CACHE_GAC: { - lstrcatW(path, backslash); - lstrcatW(path, gac); + strcpyW(path + len, assembly); + len += sizeof(assembly)/sizeof(WCHAR) - 1; + strcpyW(path + len, gac); + len += sizeof(gac)/sizeof(WCHAR) - 1; break; } - case ASM_CACHE_DOWNLOAD: { FIXME("Download cache not implemented\n"); return E_FAIL; } - case ASM_CACHE_ROOT: - break; /* already set */ - + strcpyW(path + len, assembly); + len += sizeof(assembly)/sizeof(WCHAR) - 1; + break; + case ASM_CACHE_ROOT_EX: + strcpyW(path + len, dotnet); + len += sizeof(dotnet)/sizeof(WCHAR) - 1; + strcpyW(path + len, assembly); + len += sizeof(assembly)/sizeof(WCHAR) - 1; + break; default: return E_INVALIDARG; } - len = lstrlenW(path) + 1; + len++; if (*pcchPath <= len || !pwzCachePath) hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); else if (pwzCachePath) - lstrcpyW(pwzCachePath, path); + strcpyW(pwzCachePath, path); *pcchPath = len; - return hr; } Modified: trunk/reactos/dll/win32/fusion/fusion.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusion.sp… ============================================================================== --- trunk/reactos/dll/win32/fusion/fusion.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/fusion.spec [iso-8859-1] Sat May 4 20:21:39 2013 @@ -8,7 +8,7 @@ @ stdcall CreateInstallReferenceEnum(ptr ptr long ptr) @ stdcall GetCachePath(long wstr ptr) @ stub GetHistoryFileDirectory -@ stub InitializeFusion +@ stdcall InitializeFusion() @ stub InstallCustomAssembly @ stub InstallCustomModule @ stub LookupHistoryAssembly Removed: trunk/reactos/dll/win32/fusion/fusion_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusion_ma… ============================================================================== --- trunk/reactos/dll/win32/fusion/fusion_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/fusion_main.c (removed) @@ -1,51 +0,0 @@ -/* - * fusion main - * - * Copyright 2008 James Hawkins - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#define WIN32_NO_STATUS - -#include <config.h> - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(fusion); - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - case DLL_PROCESS_DETACH: - break; - default: - break; - } - - return TRUE; -} Modified: trunk/reactos/dll/win32/fusion/fusionpriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusionpri… ============================================================================== --- trunk/reactos/dll/win32/fusion/fusionpriv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/fusionpriv.h [iso-8859-1] Sat May 4 20:21:39 2013 @@ -433,8 +433,10 @@ HRESULT assembly_get_name(ASSEMBLY *assembly, LPWSTR *name) DECLSPEC_HIDDEN; HRESULT assembly_get_path(const ASSEMBLY *assembly, LPWSTR *path) DECLSPEC_HIDDEN; HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version) DECLSPEC_HIDDEN; -BYTE assembly_get_architecture(ASSEMBLY *assembly) DECLSPEC_HIDDEN; +PEKIND assembly_get_architecture(ASSEMBLY *assembly) DECLSPEC_HIDDEN; HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) DECLSPEC_HIDDEN; +HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) DECLSPEC_HIDDEN; +HRESULT assembly_get_external_files(ASSEMBLY *assembly, LPWSTR **files, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT IAssemblyName_SetPath(IAssemblyName *iface, LPCWSTR path) DECLSPEC_HIDDEN; extern HRESULT IAssemblyName_GetPath(IAssemblyName *iface, LPWSTR buf, ULONG *len) DECLSPEC_HIDDEN; Modified: trunk/reactos/include/psdk/corerror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/corerror.h?re… ============================================================================== --- trunk/reactos/include/psdk/corerror.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/corerror.h [iso-8859-1] Sat May 4 20:21:39 2013 @@ -119,6 +119,7 @@ #define COR_E_HOSTPROTECTION EMAKEHR(0x1640) #define COR_E_ILLEGAL_REENTRANCY EMAKEHR(0x1641) +#define FUSION_E_PRIVATE_ASM_DISALLOWED EMAKEHR(0x1044) #define FUSION_E_INVALID_NAME EMAKEHR(0x1047) #define CLDB_E_FILE_OLDVER EMAKEHR(0x1107) Modified: trunk/reactos/include/psdk/fusion.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/fusion.idl?re… ============================================================================== --- trunk/reactos/include/psdk/fusion.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/fusion.idl [iso-8859-1] Sat May 4 20:21:39 2013 @@ -28,7 +28,8 @@ ASM_CACHE_ZAP = 0x1, ASM_CACHE_GAC = 0x2, ASM_CACHE_DOWNLOAD = 0x4, - ASM_CACHE_ROOT = 0x8 + ASM_CACHE_ROOT = 0x8, + ASM_CACHE_ROOT_EX = 0x80 } ASM_CACHE_FLAGS; typedef enum @@ -38,6 +39,7 @@ peI386 = 0x00000002, peIA64 = 0x00000003, peAMD64 = 0x00000004, + peARM = 0x00000005, peInvalid = 0xffffffff } PEKIND; 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 May 4 20:21:39 2013 @@ -62,7 +62,7 @@ reactos/dll/win32/dciman32 # Synced to Wine-1.5.19 reactos/dll/win32/dwmapi # Synced to Wine-1.5.19 reactos/dll/win32/faultrep # Synced to Wine-1.5.4 -reactos/dll/win32/fusion # Synced to Wine-1.5.4 +reactos/dll/win32/fusion # Synced to Wine-1.5.26 reactos/dll/win32/gdiplus # Synced to Wine-1.5.4 reactos/dll/win32/hhctrl.ocx # Synced to Wine-1.5.26 reactos/dll/win32/hlink # Synced to Wine-1.5.4

11 years, 4 months

[hbelusca] 58926: [CONSRV] Hack: To try to uncover a heap corruption in CONSRV, use our own heap instead of the (default) CSR heap, so that we won't corrupt it and obtain strange bugs thrown by mem...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat May 4 19:28:36 2013 New Revision: 58926 URL: http://svn.reactos.org/svn/reactos?rev=58926&view=rev Log: [CONSRV] Hack: To try to uncover a heap corruption in CONSRV, use our own heap instead of the (default) CSR heap, so that we won't corrupt it and obtain strange bugs thrown by memory allocation in csrsrv. Thanks to Aleksandar Andrejevic, aka. [TheFlash] for having seen that. See CORE-7157 for more information. Modified: trunk/reactos/win32ss/user/consrv/init.c Modified: trunk/reactos/win32ss/user/consrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/init.c… ============================================================================== --- trunk/reactos/win32ss/user/consrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/init.c [iso-8859-1] Sat May 4 19:28:36 2013 @@ -481,7 +481,11 @@ CSR_SERVER_DLL_INIT(ConServerDllInitialization) { /* Initialize the memory */ - ConSrvHeap = RtlGetProcessHeap(); + // HACK: To try to uncover a heap corruption in CONSRV, use our own heap + // instead of the CSR heap, so that we won't corrupt it. + // ConSrvHeap = RtlGetProcessHeap(); + ConSrvHeap = RtlCreateHeap(HEAP_GROWABLE, NULL, 0, 0, NULL, NULL); + if (!ConSrvHeap) return STATUS_NO_MEMORY; ConSrvInitConsoleSupport();

11 years, 4 months

[hbelusca] 58925: [CONSRV] Be sure to use our local heap instead of the current application heap, to store the console title. To simplify the code, I introduced helper functions based on well-known...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat May 4 15:31:19 2013 New Revision: 58925 URL: http://svn.reactos.org/svn/reactos?rev=58925&view=rev Log: [CONSRV] Be sure to use our local heap instead of the current application heap, to store the console title. To simplify the code, I introduced helper functions based on well-known Rtl functions. Modified: trunk/reactos/win32ss/user/consrv/console.c Modified: trunk/reactos/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/consol… ============================================================================== --- trunk/reactos/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/console.c [iso-8859-1] Sat May 4 15:31:19 2013 @@ -50,6 +50,35 @@ #define ConSrvUnlockConsoleList() \ RtlReleaseResource(&ListLock) + +// Adapted from reactos/lib/rtl/unicode.c, RtlCreateUnicodeString line 2180 +BOOLEAN +ConsoleCreateUnicodeString(IN OUT PUNICODE_STRING UniDest, + IN PCWSTR Source) +{ + SIZE_T Size = (wcslen(Source) + 1) * sizeof(WCHAR); + if (Size > MAXUSHORT) return FALSE; + + UniDest->Buffer = RtlAllocateHeap(ConSrvHeap, HEAP_ZERO_MEMORY, Size); + if (UniDest->Buffer == NULL) return FALSE; + + RtlCopyMemory(UniDest->Buffer, Source, Size); + UniDest->MaximumLength = (USHORT)Size; + UniDest->Length = (USHORT)Size - sizeof(WCHAR); + + return TRUE; +} + +// Adapted from reactos/lib/rtl/unicode.c, RtlFreeUnicodeString line 431 +VOID +ConsoleFreeUnicodeString(IN PUNICODE_STRING UnicodeString) +{ + if (UnicodeString->Buffer) + { + RtlFreeHeap(ConSrvHeap, 0, UnicodeString->Buffer); + RtlZeroMemory(UnicodeString, sizeof(UNICODE_STRING)); + } +} /* PRIVATE FUNCTIONS **********************************************************/ @@ -612,21 +641,21 @@ Console->HistoryNoDup = ConsoleInfo.HistoryNoDup; /* Initialize the console title */ - RtlCreateUnicodeString(&Console->OriginalTitle, ConsoleInfo.ConsoleTitle); + ConsoleCreateUnicodeString(&Console->OriginalTitle, ConsoleInfo.ConsoleTitle); if (ConsoleInfo.ConsoleTitle[0] == L'\0') { if (LoadStringW(ConSrvDllInstance, IDS_CONSOLE_TITLE, Title, sizeof(Title) / sizeof(Title[0]))) { - RtlCreateUnicodeString(&Console->Title, Title); + ConsoleCreateUnicodeString(&Console->Title, Title); } else { - RtlCreateUnicodeString(&Console->Title, L"ReactOS Console"); + ConsoleCreateUnicodeString(&Console->Title, L"ReactOS Console"); } } else { - RtlCreateUnicodeString(&Console->Title, ConsoleInfo.ConsoleTitle); + ConsoleCreateUnicodeString(&Console->Title, ConsoleInfo.ConsoleTitle); } /* Lock the console until its initialization is finished */ @@ -674,8 +703,8 @@ if (!NT_SUCCESS(Status)) { DPRINT1("GuiInitConsole: failed, Status = 0x%08lx\n", Status); - RtlFreeUnicodeString(&Console->Title); - RtlFreeUnicodeString(&Console->OriginalTitle); + ConsoleFreeUnicodeString(&Console->OriginalTitle); + ConsoleFreeUnicodeString(&Console->Title); ConioDeleteScreenBuffer(NewBuffer); CloseHandle(Console->InputBuffer.ActiveEvent); // LeaveCriticalSection(&Console->Lock); @@ -812,8 +841,8 @@ // CloseHandle(Console->InputBuffer.ActiveEvent); if (Console->UnpauseEvent) CloseHandle(Console->UnpauseEvent); - RtlFreeUnicodeString(&Console->OriginalTitle); - RtlFreeUnicodeString(&Console->Title); + ConsoleFreeUnicodeString(&Console->OriginalTitle); + ConsoleFreeUnicodeString(&Console->Title); DPRINT("ConSrvDeleteConsole - Unlocking\n"); LeaveCriticalSection(&Console->Lock); @@ -1183,11 +1212,11 @@ } /* Allocate a new buffer to hold the new title (NULL-terminated) */ - Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, TitleRequest->Length + sizeof(WCHAR)); + Buffer = RtlAllocateHeap(ConSrvHeap, 0, TitleRequest->Length + sizeof(WCHAR)); if (Buffer) { /* Free the old title */ - RtlFreeUnicodeString(&Console->Title); + ConsoleFreeUnicodeString(&Console->Title); /* Copy title to console */ Console->Title.Buffer = Buffer;

11 years, 4 months

[jgardou] 58924: [NTDLL_APITEST] * Add tests for NtProtectVirtualMemory

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat May 4 15:26:48 2013 New Revision: 58924 URL: http://svn.reactos.org/svn/reactos?rev=58924&view=rev Log: [NTDLL_APITEST] * Add tests for NtProtectVirtualMemory Added: trunk/rostests/apitests/ntdll/NtProtectVirtualMemory.c (with props) Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Sat May 4 15:26:48 2013 @@ -4,6 +4,7 @@ NtAllocateVirtualMemory.c NtFreeVirtualMemory.c NtMapViewOfSection.c + NtProtectVirtualMemory.c NtQuerySystemEnvironmentValue.c RtlBitmap.c RtlDetermineDosPathNameType.c Added: trunk/rostests/apitests/ntdll/NtProtectVirtualMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtProtectV… ============================================================================== --- trunk/rostests/apitests/ntdll/NtProtectVirtualMemory.c (added) +++ trunk/rostests/apitests/ntdll/NtProtectVirtualMemory.c [iso-8859-1] Sat May 4 15:26:48 2013 @@ -0,0 +1,102 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for the NtProtectVirtualMemory API + */ + +#define WIN32_NO_STATUS +#include <wine/test.h> +#include <ndk/rtlfuncs.h> +#include <ndk/mmfuncs.h> +#include <pseh/pseh2.h> + +#define StartSeh status = STATUS_SUCCESS; _SEH2_TRY +#define EndSeh(ExpectedStatus) _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { status = _SEH2_GetExceptionCode(); } _SEH2_END; ok(status == ExpectedStatus, "Exception %lx, expected %lx\n", status, ExpectedStatus) + +START_TEST(NtProtectVirtualMemory) +{ + ULONG* allocationStart = NULL; + NTSTATUS status; + SIZE_T allocationSize; + ULONG oldProtection; + + /* Reserve a page */ + allocationSize = PAGE_SIZE; + status = NtAllocateVirtualMemory(NtCurrentProcess(), + (void**)&allocationStart, + 0, + &allocationSize, + MEM_RESERVE, + PAGE_NOACCESS); + ok(NT_SUCCESS(status), "Reserving memory failed\n"); + + /* Commit the page (RW) */ + status = NtAllocateVirtualMemory(NtCurrentProcess(), + (void**)&allocationStart, + 0, + &allocationSize, + MEM_COMMIT, + PAGE_READWRITE); + ok(NT_SUCCESS(status), "Commiting memory failed\n"); + + /* Try writing it */ + StartSeh + { + *allocationStart = 0xFF; + } EndSeh(STATUS_SUCCESS); + + /* Try reading it */ + StartSeh + { + ok(*allocationStart == 0xFF, "Memory was not written\n"); + } EndSeh(STATUS_SUCCESS); + + /* Set it as read only */ + status = NtProtectVirtualMemory(NtCurrentProcess(), + (void**)&allocationStart, + &allocationSize, + PAGE_READONLY, + &oldProtection); + ok(NT_SUCCESS(status), "NtProtectVirtualMemory failed.\n"); + ok(oldProtection == PAGE_READWRITE, "Expected PAGE_READWRITE, got %08x.\n", oldProtection); + + /* Try writing it */ + StartSeh + { + *allocationStart = 0xAA; + } EndSeh(STATUS_ACCESS_VIOLATION); + + /* Try reading it */ + StartSeh + { + ok(*allocationStart == 0xFF, "read-only memory were changed.\n"); + } EndSeh(STATUS_SUCCESS); + + /* Set it as no access */ + status = NtProtectVirtualMemory(NtCurrentProcess(), + (void**)&allocationStart, + &allocationSize, + PAGE_NOACCESS, + &oldProtection); + ok(NT_SUCCESS(status), "NtProtectVirtualMemory failed.\n"); + ok(oldProtection == PAGE_READONLY, "Expected PAGE_READONLY, got %08x.\n", oldProtection); + + /* Try writing it */ + StartSeh + { + *allocationStart = 0xAA; + } EndSeh(STATUS_ACCESS_VIOLATION); + + /* Try reading it */ + StartSeh + { + ok(*allocationStart == 0, "Test should not go as far as this.\n"); + } EndSeh(STATUS_ACCESS_VIOLATION); + + /* Free memory */ + status = NtFreeVirtualMemory(NtCurrentProcess(), + (void**)&allocationStart, + &allocationSize, + MEM_RELEASE); + ok(NT_SUCCESS(status), "Failed freeing memory.\n"); +} Propchange: trunk/rostests/apitests/ntdll/NtProtectVirtualMemory.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Sat May 4 15:26:48 2013 @@ -7,6 +7,7 @@ extern void func_NtAllocateVirtualMemory(void); extern void func_NtFreeVirtualMemory(void); extern void func_NtMapViewOfSection(void); +extern void func_NtProtectVirtualMemory(void); extern void func_NtQuerySystemEnvironmentValue(void); extern void func_NtSystemInformation(void); extern void func_RtlBitmap(void); @@ -28,6 +29,7 @@ { "NtAllocateVirtualMemory", func_NtAllocateVirtualMemory }, { "NtFreeVirtualMemory", func_NtFreeVirtualMemory }, { "NtMapViewOfSection", func_NtMapViewOfSection }, + { "NtProtectVirtualMemory", func_NtProtectVirtualMemory }, { "NtQuerySystemEnvironmentValue", func_NtQuerySystemEnvironmentValue }, { "NtSystemInformation", func_NtSystemInformation }, { "RtlBitmapApi", func_RtlBitmap },

11 years, 4 months

[hbelusca] 58923: Code formatting only

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat May 4 14:29:51 2013 New Revision: 58923 URL: http://svn.reactos.org/svn/reactos?rev=58923&view=rev Log: Code formatting only Modified: trunk/reactos/subsystems/win/basesrv/dosdev.c Modified: trunk/reactos/subsystems/win/basesrv/dosdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/dos… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/dosdev.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/dosdev.c [iso-8859-1] Sat May 4 14:29:51 2013 @@ -137,9 +137,9 @@ _SEH2_LEAVE; RequestLinkTarget = &DefineDosDeviceRequest->TargetName; - lpBuffer = (PWSTR) RtlAllocateHeap(BaseSrvHeap, - HEAP_ZERO_MEMORY, - RequestDeviceName.MaximumLength + 5 * sizeof(WCHAR)); + lpBuffer = (PWSTR)RtlAllocateHeap(BaseSrvHeap, + HEAP_ZERO_MEMORY, + RequestDeviceName.MaximumLength + 5 * sizeof(WCHAR)); if (!lpBuffer) { DPRINT1("Failed to allocate memory\n");

11 years, 4 months

[hbelusca] 58922: [CSRSRV] - Code simplification. - Remove unneeded casts. - Fix comments.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat May 4 14:27:09 2013 New Revision: 58922 URL: http://svn.reactos.org/svn/reactos?rev=58922&view=rev Log: [CSRSRV] - Code simplification. - Remove unneeded casts. - Fix comments. Modified: trunk/reactos/subsystems/win32/csrsrv/api.c trunk/reactos/subsystems/win32/csrsrv/thredsup.c Modified: trunk/reactos/subsystems/win32/csrsrv/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/ap… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/api.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/api.c [iso-8859-1] Sat May 4 14:27:09 2013 @@ -63,7 +63,7 @@ { /* We are beyond the Maximum Server ID */ DPRINT1("CSRSS: %lx is invalid ServerDllIndex (%08x)\n", ServerId, ServerDll); - ReplyMsg->Status = (ULONG)STATUS_ILLEGAL_FUNCTION; + ReplyMsg->Status = STATUS_ILLEGAL_FUNCTION; return STATUS_ILLEGAL_FUNCTION; } else @@ -82,7 +82,7 @@ ((ServerDll->NameTable) && (ServerDll->NameTable[ApiId])) ? ServerDll->NameTable[ApiId] : "*** UNKNOWN ***", &ServerDll->Name); // DbgBreakPoint(); - ReplyMsg->Status = (ULONG)STATUS_ILLEGAL_FUNCTION; + ReplyMsg->Status = STATUS_ILLEGAL_FUNCTION; return STATUS_ILLEGAL_FUNCTION; } } @@ -155,7 +155,7 @@ if (CsrProcess) { /* Reference the Process */ - CsrLockedReferenceProcess(CsrThread->Process); + CsrLockedReferenceProcess(CsrProcess); /* Release the lock */ CsrReleaseProcessLock(); @@ -432,7 +432,7 @@ } else { - /* A bizare "success" code, just try again */ + /* A strange "success" code, just try again */ DPRINT1("NtReplyWaitReceivePort returned \"success\" status 0x%x\n", Status); continue; } Modified: trunk/reactos/subsystems/win32/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/th… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] Sat May 4 14:27:09 2013 @@ -958,10 +958,10 @@ /* Start Loop */ while (NextEntry != &CsrThreadHashTable[i]) { - /* Get the Process */ + /* Get the Thread */ CurrentThread = CONTAINING_RECORD(NextEntry, CSR_THREAD, HashLinks); - /* Check for PID Match */ + /* Check for TID Match */ if ((CurrentThread->ClientId.UniqueThread == Tid) && (CurrentThread->Flags & CsrThreadTerminated) == 0) {

11 years, 4 months

[osiejka] 58921: [TRANSLATION] - turkish translation update by Erdem Ersoy: CORE-7133; - czech translation update by Radek Liska: CORE-6953; - added polish translation of hostname;

by osiejka＠svn.reactos.org

Author: osiejka Date: Sat May 4 14:18:45 2013 New Revision: 58921 URL: http://svn.reactos.org/svn/reactos?rev=58921&view=rev Log: [TRANSLATION] - turkish translation update by Erdem Ersoy: CORE-7133; - czech translation update by Radek Liska: CORE-6953; - added polish translation of hostname; Added: trunk/reactos/base/applications/cmdutils/hostname/lang/cs-CZ.rc (with props) trunk/reactos/base/applications/cmdutils/hostname/lang/pl-PL.rc (with props) trunk/reactos/base/applications/cmdutils/reg/lang/cs-CZ.rc (with props) trunk/reactos/base/applications/kbswitch/lang/tr-TR.rc (with props) trunk/reactos/base/applications/network/wlanconf/lang/cs-CZ.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/hostname/rsrc.rc trunk/reactos/base/applications/cmdutils/reg/rsrc.rc trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc trunk/reactos/base/applications/kbswitch/rsrc.rc trunk/reactos/base/applications/network/wlanconf/wlanconf.rc trunk/reactos/base/applications/regedit/lang/cs-CZ.rc trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc Added: trunk/reactos/base/applications/cmdutils/hostname/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/hostname/lang/cs-CZ.rc (added) +++ trunk/reactos/base/applications/cmdutils/hostname/lang/cs-CZ.rc [iso-8859-1] Sat May 4 14:18:45 2013 @@ -0,0 +1,13 @@ +/* FILE: base/applications/cmdutils/hostname/lang/cs-CZ.rc + * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) + * UPDATED: 2013-05-01 + */ + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_USAGE, "VypÃÅ¡e souÄasnÃ½ nÃ¡zev hostitele.\n\nhostname" + IDS_NOSET, "hostname -s nenÃ podporovÃ¡no." + IDS_ERROR, "Win32 chyba" +END Propchange: trunk/reactos/base/applications/cmdutils/hostname/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/applications/cmdutils/hostname/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/reactos/base/applications/cmdutils/hostname/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/hostname/lang/pl-PL.rc (added) +++ trunk/reactos/base/applications/cmdutils/hostname/lang/pl-PL.rc [iso-8859-1] Sat May 4 14:18:45 2013 @@ -0,0 +1,8 @@ +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_USAGE, "Wywietla obecn¹ nazwê komputera.\n\nhostname" + IDS_NOSET, "Opcja hostname -s nie jest wspierana." + IDS_ERROR, "B³¹d Win32" +END Propchange: trunk/reactos/base/applications/cmdutils/hostname/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/applications/cmdutils/hostname/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/base/applications/cmdutils/hostname/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/hostname/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/hostname/rsrc.rc [iso-8859-1] Sat May 4 14:18:45 2013 @@ -3,9 +3,15 @@ // UTF-8 #pragma code_page(65001) +#ifdef LANGUAGE_CS_CZ + #include "lang/cs-CZ.rc" +#endif #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif Added: trunk/reactos/base/applications/cmdutils/reg/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/reg/lang/cs-CZ.rc (added) +++ trunk/reactos/base/applications/cmdutils/reg/lang/cs-CZ.rc [iso-8859-1] Sat May 4 14:18:45 2013 @@ -0,0 +1,21 @@ +/* FILE: base/applications/cmdutils/reg/lang/cs-CZ.rc + * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) + * UPDATED: 2013-05-01 + */ + +#include "reg.h" + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_USAGE, "Syntaxe tohoto pÅÃkazu:\n\nREG [ ADD | DELETE | QUERY ]\nREG operace /?\n" + STRING_ADD_USAGE, "REG ADD nÃ¡zev_klÃÄe [/v nÃ¡zev_hodnoty | /ve] [/t type] [/s oddÄlovaÄ] [/d data] [/f]\n" + STRING_DELETE_USAGE, "REG DELETE nÃ¡zev_klÃÄe [/v nÃ¡zev_hodnoty | /ve | /va] [/f]\n" + STRING_QUERY_USAGE, "REG QUERY nÃ¡zev_klÃÄe [/v nÃ¡zev_hodnoty | /ve] [/s]\n" + STRING_SUCCESS, "Operace byla ÃºspÄÅ¡nÄ dokonÄena\n" + STRING_INVALID_KEY, "Chyba: NeplatnÃ½ nÃ¡zev klÃÄe\n" + STRING_INVALID_CMDLINE, "Chyba: NeplatnÃ© parametry pÅÃkazovÃ© ÅÃ¡dky\n" + STRING_NO_REMOTE, "Chyba: Nelze pÅidat klÃÄe na vzdÃ¡lenÃ½ stroj\n" + STRING_CANNOT_FIND, "Chyba: SystÃ©m nenalezl zadanÃ½ klÃÄ nebo hodnotu registru\n" +} Propchange: trunk/reactos/base/applications/cmdutils/reg/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/applications/cmdutils/reg/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: 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] Sat May 4 14:18:45 2013 @@ -2,6 +2,9 @@ #pragma code_page(65001) #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" +#endif +#ifdef LANGUAGE_CS_CZ + #include "lang/cs-CZ.rc" #endif #ifdef LANGUAGE_DA_DK #include "lang/da-DK.rc" Modified: trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc [iso-8859-1] Sat May 4 14:18:45 2013 @@ -1,5 +1,5 @@ /* - * Ãeviri: Arda TanrÄ±kulu <ardatanrikulu(a)gmail.com> + * Ãeviri: Arda TanrÄ±kulu (ardatanrikulu(a)gmail.com), Erdem Ersoy (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -12,7 +12,7 @@ BEGIN CONTROL "Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,474,250 PUSHBUTTON "&YardÄ±m", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - DEFPUSHBUTTON "S&onraki Sayfa", IDC_BUTTON_NEXT, 257, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "&Sonraki BÃ¶lÃ¼m", IDC_BUTTON_NEXT, 257, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&TÃ¼m Bilgileri Kaydet...", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&ÃÄ±kÄ±Å", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -21,19 +21,19 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Bu araÃ§, sisteminizde yÃ¼klÃ¼ ReactX bileÅenleri ve sÃ¼rÃ¼cÃ¼leri hakkÄ±nda detaylÄ± bilgi raporlar. Ä°ÅlevselliÄi sÄ±namanÄ±zÄ±, sorunlarÄ± tanÄ±manÄ±zÄ± en iyi Åekilde Ã§alÄ±Åmak iÃ§in sistem yapÄ±landÄ±rmanÄ±zÄ± deÄiÅtirmenizi saÄlar.", -1, 10, 10, 443, 17 - LTEXT "Hangi alanÄ±n soruna neden olduÄunu biliyorsanÄ±z, yukarÄ±da uygun sekmeyi tÄ±klatÄ±n. Aksi halde, sÄ±rayla her sayfaya gitmek iÃ§in aÅaÄÄ±daki ""Sonraki Sayfa"" dÃ¼Ämesini kullanabilirsiniz.", -1, 10, 30, 443, 25 - GROUPBOX "Sistem Bilgisi", -1, 10, 55, 443, 130, SS_RIGHT - LTEXT "GeÃ§erli Tarih/Saat:", -1, 70, 70, 80, 10, SS_RIGHT - LTEXT "Bilgisayar AdÄ±:", -1, 70, 80, 80, 10, SS_RIGHT - LTEXT "Ä°Åletim Sistemi:", -1, 70, 90, 80, 10, SS_RIGHT + LTEXT "Bu araÃ§, dizgenizde yÃ¼klÃ¼ ReactX bileÅenleri ve sÃ¼rÃ¼cÃ¼leri hakkÄ±nda ayrÄ±ntÄ±lÄ± bilgi yazanaklar.", -1, 10, 10, 443, 17 + LTEXT "Soruna hangi bÃ¶lÃ¼mÃ¼n neden olduÄunu biliyorsanÄ±z, yukarÄ±daki uygun sekmeyi tÄ±klatÄ±nÄ±z. BilmiyorsanÄ±z sÄ±rayla her bÃ¶lÃ¼me gitmek iÃ§in aÅaÄÄ±daki ""Sonraki BÃ¶lÃ¼m"" dÃ¼Ämesini kullanabilirsiniz.", -1, 10, 30, 443, 25 + GROUPBOX "Bilgisayar Bilgisi", -1, 10, 55, 443, 130, SS_RIGHT + LTEXT "GeÃ§erli Zaman:", -1, 70, 70, 80, 10, SS_RIGHT + LTEXT "Ad:", -1, 70, 80, 80, 10, SS_RIGHT + LTEXT "Ä°Åletim Dizgesi:", -1, 70, 90, 80, 10, SS_RIGHT LTEXT "Dil:", -1, 70, 100, 80, 10, SS_RIGHT - LTEXT "Sistem Ãreticisi:", -1, 70, 110, 80, 10, SS_RIGHT - LTEXT "Sistem Modeli:", -1, 70, 120, 80, 10, SS_RIGHT + LTEXT "Ãretici:", -1, 70, 110, 80, 10, SS_RIGHT + LTEXT "BiÃ§im:", -1, 70, 120, 80, 10, SS_RIGHT LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT LTEXT "Ä°Ålemci:", -1, 70, 140, 80, 10, SS_RIGHT LTEXT "Bellek:", -1, 70, 150, 80, 10, SS_RIGHT - LTEXT "Sayfa DosyasÄ±:", -1, 70, 160, 80, 10, SS_RIGHT + LTEXT "Disk BelleÄi:", -1, 70, 160, 80, 10, SS_RIGHT LTEXT "ReactX SÃ¼rÃ¼mÃ¼:", -1, 70, 170, 80, 10, SS_RIGHT LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT @@ -55,11 +55,11 @@ GROUPBOX "AygÄ±t", -1, 10, 10, 250, 100 RTEXT "Ad:", -1, 20, 25, 70, 10 RTEXT "Ãretici:", -1, 20, 35, 70, 10 - RTEXT "Yonga tÃ¼rÃ¼:", -1, 20, 45, 70, 10 - RTEXT "DAC tÃ¼rÃ¼:", -1, 20, 55, 70, 10 - RTEXT "YaklaÅÄ±k Top. Bellek:", -1, 20, 65, 70, 10 - RTEXT "GeÃ§erli GÃ¶rÃ¼ntÃ¼ Modu:", -1, 20, 75, 70, 10 - RTEXT "MonitÃ¶r:", -1, 20, 85, 70, 10 + RTEXT "Yonga TÃ¼rÃ¼:", -1, 20, 45, 70, 10 + RTEXT "DAC TÃ¼rÃ¼:", -1, 20, 55, 70, 10 + RTEXT "YaklaÅÄ±k Toplam Bellek:", -1, 20, 65, 70, 10 + RTEXT "GeÃ§erli GÃ¶rÃ¼ntÃ¼ SeÃ§eneÄi:", -1, 20, 75, 70, 10 + RTEXT "GÃ¶stergeÃ§:", -1, 20, 85, 70, 10 LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10 LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10 LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10 @@ -71,8 +71,8 @@ GROUPBOX "SÃ¼rÃ¼cÃ¼ler", -1, 270, 10, 190, 100 RTEXT "Ana SÃ¼rÃ¼cÃ¼:", -1, 275, 25, 55, 10 RTEXT "SÃ¼rÃ¼m:", -1, 275, 35, 55, 10 - RTEXT "Tarih:", -1, 275, 45, 55, 10 - RTEXT "WHQL Logolu:", -1, 275, 55, 55, 10 + RTEXT "Zaman:", -1, 275, 45, 55, 10 + RTEXT "WHQL Ä°mleÄi:", -1, 275, 55, 55, 10 RTEXT "Mini VDD:", -1, 275, 65, 55, 10 RTEXT " vvdddVDD:", -1, 275, 75, 55, 10 RTEXT "DDI SÃ¼rÃ¼mÃ¼:", -1, 275, 85, 55, 10 @@ -85,17 +85,17 @@ LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10 GROUPBOX "ReactX Ãzellikleri", -1, 10, 115, 450, 60 - RTEXT "DirectDraw HÄ±zlandÄ±rmasÄ±:", -1, 15, 130, 110, 12 - RTEXT "Direct3D HÄ±zlandÄ±rmasÄ±:", -1, 15, 145, 110, 12 + RTEXT "ReactDraw HÄ±zlandÄ±rmasÄ±:", -1, 15, 130, 110, 12 + RTEXT "React3D HÄ±zlandÄ±rmasÄ±:", -1, 15, 145, 110, 12 RTEXT "AGP Doku HÄ±zlandÄ±rmasÄ±:", -1, 15, 160, 110, 12 LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10 LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10 LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10 - PUSHBUTTON "Enable", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED - PUSHBUTTON "Enable", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED - PUSHBUTTON "Enable", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED - PUSHBUTTON "DirectDra&w SÄ±namasÄ± Yap", IDC_BUTTON_TESTDD, 250, 124, 80, 14 - PUSHBUTTON "Dire&ct3D SÄ±namasÄ± Yap", IDC_BUTTON_TEST3D, 250, 140, 80, 14 + PUSHBUTTON "EtkinleÅtir", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED + PUSHBUTTON "EtkinleÅtir", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED + PUSHBUTTON "EtkinleÅtir", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED + PUSHBUTTON "&ReactDraw'Ä± SÄ±na", IDC_BUTTON_TESTDD, 250, 124, 80, 14 + PUSHBUTTON "R&eact3D'yi SÄ±na", IDC_BUTTON_TEST3D, 250, 140, 80, 14 GROUPBOX "Notlar", -1, 10, 180, 450, 40 EDITTEXT IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP @@ -108,11 +108,11 @@ BEGIN GROUPBOX "AygÄ±t", -1, 10, 10, 250, 100 RTEXT "Ad:", -1, 20, 25, 70, 10 - RTEXT "AygÄ±t tanÄ±tÄ±cÄ±:", -1, 20, 35, 70, 10 + RTEXT "AygÄ±t KimliÄi:", -1, 20, 35, 70, 10 RTEXT "Ãretici KimliÄi:", -1, 20, 45, 70, 10 RTEXT "ÃrÃ¼n KimliÄi:", -1, 20, 55, 70, 10 RTEXT "TÃ¼r:", -1, 20, 65, 70, 10 - RTEXT "VarsayÄ±lan aygÄ±t:", -1, 20, 75, 70, 10 + RTEXT "VarsayÄ±lan AygÄ±t:", -1, 20, 75, 70, 10 LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10 LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10 LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10 @@ -122,9 +122,9 @@ GROUPBOX "SÃ¼rÃ¼cÃ¼", -1, 270, 10, 190, 100 RTEXT "Ad:", -1, 275, 25, 55, 10 RTEXT "SÃ¼rÃ¼m:", -1, 275, 35, 55, 10 - RTEXT "Tarih:", -1, 275, 45, 55, 10 - RTEXT "WHQL Logolu:", -1, 275, 55, 55, 10 - RTEXT "DiÄer Dosyalar:", -1, 275, 65, 55, 10 + RTEXT "Zaman:", -1, 275, 45, 55, 10 + RTEXT "WHQL Ä°mleÄi:", -1, 275, 55, 55, 10 + RTEXT "DiÄer KÃ¼tÃ¼kler:", -1, 275, 65, 55, 10 RTEXT "SaÄlayÄ±cÄ±:", -1, 275, 75, 55, 10 LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10 LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10 @@ -134,8 +134,8 @@ LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10 GROUPBOX "ReactX Ãzellikleri", -1, 10, 115, 450, 60 CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17 - RTEXT "DonanÄ±m Ses\nHÄ±zlandÄ±rma DÃ¼zeyi:", -1, 20, 135, 90, 20 - PUSHBUTTON "DirectSo&und'u SÄ±na", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14 + RTEXT "DonanÄ±m Ä°vmesi:", -1, 20, 135, 90, 20 + PUSHBUTTON "&ReactSound'u SÄ±na", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14 GROUPBOX "Notlar", -1, 10, 180, 450, 40 EDITTEXT IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP END @@ -151,7 +151,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "DirectInput AygÄ±tlarÄ±", -1, 10, 10, 452, 80 + GROUPBOX "ReactInput AygÄ±tlarÄ±", -1, 10, 10, 452, 80 CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60 GROUPBOX "GiriÅle Ä°lgili AygÄ±tlar", -1, 10, 100, 452, 60 CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200 @@ -163,7 +163,7 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "KayÄ±tlÄ± DirectPlay Hizmet SaÄlayÄ±cÄ±larÄ±", -1, 10, 10, 452, 80 + GROUPBOX "KayÄ±tlÄ± ReactPlay Hizmet SaÄlayÄ±cÄ±larÄ±", -1, 10, 10, 452, 80 CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60 END @@ -176,54 +176,54 @@ STRINGTABLE DISCARDABLE BEGIN IDS_MAIN_DIALOG "ReactX TanÄ± AracÄ±" - IDS_SYSTEM_DIALOG "Sistem" + IDS_SYSTEM_DIALOG "Dizge" IDS_DISPLAY_DIALOG "GÃ¶rÃ¼ntÃ¼" IDS_SOUND_DIALOG "Ses" - IDS_MUSIC_DIALOG "MÃ¼zik" + IDS_MUSIC_DIALOG "MÃ»siki" IDS_INPUT_DIALOG "GiriÅ" IDS_NETWORK_DIALOG "AÄ" IDS_HELP_DIALOG "YardÄ±m" - IDS_FORMAT_MB "%I64uMB RAM" - IDS_FORMAT_SWAP "%I64u MB kullanÄ±lan, %I64u MB kullanÄ±labilir" + IDS_FORMAT_MB "%I64u MB RAM" + IDS_FORMAT_SWAP "%I64u MB kullanÄ±ldÄ±, %I64u MB kullanÄ±labilir" IDS_FORMAT_UNIPROC "%s (%u CPU)" - IDS_FORMAT_MPPROC "%s (%u CPUlar)" + IDS_FORMAT_MPPROC "%s (%u CPU)" IDS_VERSION_UNKNOWN "Bilinmeyen SÃ¼rÃ¼m" IDS_DEVICE_STATUS_ATTACHED "BaÄlÄ±" IDS_DEVICE_STATUS_MISSING "BaÄlÄ± deÄil" IDS_DEVICE_STATUS_UNKNOWN "Bilinmiyor" - IDS_DEVICE_NAME "AygÄ±t adÄ±" + IDS_DEVICE_NAME "AygÄ±t AdÄ±" IDS_DEVICE_STATUS "Durum" IDS_DEVICE_CONTROLLER "Denetleyici KimliÄi" IDS_DEVICE_MANUFACTURER "Ãretici KimliÄi" - IDS_DEVICE_PRODUCT "ÃrÃ¼m KimliÄi" - IDS_DEVICE_FORCEFEEDBACK "Force Feedback SÃ¼rÃ¼cÃ¼" - IDS_NOT_APPLICABLE "KullanÄ±lamaz" + IDS_DEVICE_PRODUCT "ÃrÃ¼n KimliÄi" + IDS_DEVICE_FORCEFEEDBACK "GÃ¼Ã§ Geribildirimli SÃ¼rÃ¼cÃ¼sÃ¼" + IDS_NOT_APPLICABLE "Uygulanamaz" IDS_OPTION_YES "Evet" IDS_DIRECTPLAY_COL_NAME1 "Ad" - IDS_DIRECTPLAY_COL_NAME2 "KayÄ±t" - IDS_DIRECTPLAY_COL_NAME3 "Dosya" + IDS_DIRECTPLAY_COL_NAME2 "DeÄer" + IDS_DIRECTPLAY_COL_NAME3 "KÃ¼tÃ¼k" IDS_DIRECTPLAY_COL_NAME4 "SÃ¼rÃ¼m" - IDS_DIRECTPLAY8_MODEMSP "DirectPlay8-Modem Servis SaÄlayÄ±cÄ±sÄ±" - IDS_DIRECTPLAY8_SERIALSP "DirectPlay8 Seri Servis SaÄlayÄ±cÄ±sÄ±" - IDS_DIRECTPLAY8_IPXSP "DirectPlay8 IPX Servis SaÄlayÄ±cÄ±sÄ±" - IDS_DIRECTPLAY8_TCPSP "DirectPlay8-TCP/IP Servis SaÄlayÄ±cÄ±sÄ±" - IDS_DIRECTPLAY_TCPCONN "DirectPlay iÃ§in Internet TCP/IP BaÄlantÄ±sÄ±" - IDS_DIRECTPLAY_IPXCONN "DirectPlay iÃ§in IPX BaÄlantÄ±sÄ±" - IDS_DIRECTPLAY_MODEMCONN "DirectPlay iÃ§in Modem BaÄlantÄ±sÄ±" - IDS_DIRECTPLAY_SERIALCONN "DirectPlay iÃ§in Seri BaÄlantÄ±" + IDS_DIRECTPLAY8_MODEMSP "ReactPlay8 Ãevirge Hizmeti SaÄlayÄ±cÄ±sÄ±" + IDS_DIRECTPLAY8_SERIALSP "ReactPlay8 Dizi Hizmeti SaÄlayÄ±cÄ±sÄ±" + IDS_DIRECTPLAY8_IPXSP "ReactPlay8 IPX Hizmeti SaÄlayÄ±cÄ±sÄ±" + IDS_DIRECTPLAY8_TCPSP "ReactPlay8 TCP/IP Hizmeti SaÄlayÄ±cÄ±sÄ±" + IDS_DIRECTPLAY_TCPCONN "ReactPlay iÃ§in GenelaÄ TCP/IP BaÄlantÄ±sÄ±" + IDS_DIRECTPLAY_IPXCONN "ReactPlay iÃ§in IPX BaÄlantÄ±sÄ±" + IDS_DIRECTPLAY_MODEMCONN "ReactPlay iÃ§in Ãeivrge BaÄlantÄ±sÄ±" + IDS_DIRECTPLAY_SERIALCONN "ReactPlay iÃ§in Dizi BaÄlantÄ±sÄ±" IDS_REG_SUCCESS "Tamam" IDS_REG_FAIL "Hata" - IDS_DDTEST_ERROR "Test baÅarÄ±sÄ±z oldu!" - IDS_DDTEST_DESCRIPTION "DirectDraw arayÃ¼z sÄ±namasÄ± baÅlatÄ±lacak. Devam?" - IDS_DDPRIMARY_DESCRIPTION "Bu sÄ±nama DirectDraw'u birincil yÃ¼zeye yazmak iÃ§in kullanacak. Siyah ve beyaz dikdÃ¶rtgenler Ã§izilecek. Devam?" - IDS_DDPRIMARY_RESULT "Siyah ve beyaz dikdÃ¶rtgenler gÃ¶rdÃ¼nÃ¼z mÃ¼?" - IDS_DDOFFSCREEN_DESCRIPTION "Bu sÄ±nama DirectDraw'u ekranÃ¼stÃ¼ arabelleÄi kullanacak. Hareket eden beyaz dikdÃ¶rtgen gÃ¶receksiniz. Devam?" - IDS_DDOFFSCREEN_RESULT "Hareket eden beyaz dikdÃ¶rtgen gÃ¶rdÃ¼nÃ¼z mÃ¼?" - IDS_DDFULLSCREEN_DESCRIPTION "Bu sÄ±nama DirectDraw ile tam ekran yazÄ±m yapacak. Hareket eden beyaz dikdÃ¶rtgen gÃ¶receksiniz. Devam?" - IDS_DDFULLSCREEN_RESULT "Tam ekran modunda hareket eden beyaz dikdÃ¶rtgen gÃ¶rdÃ¼nÃ¼z mÃ¼?" + IDS_DDTEST_ERROR "SÄ±nama baÅarÄ±sÄ±z oldu." + IDS_DDTEST_DESCRIPTION "ReactDraw arayÃ¼z sÄ±namasÄ± baÅlatÄ±lacak. SÃ¼rdÃ¼rÃ¼lsÃ¼n mÃ¼?" + IDS_DDPRIMARY_DESCRIPTION "Bu sÄ±nama, ReactDraw'Ä± birincil yÃ¼zeye Ã§izmek iÃ§in kullanacak. Ekrana ak ve kara dikdÃ¶rtgenler Ã§izilecek. SÃ¼rdÃ¼rÃ¼lsÃ¼n mÃ¼?" + IDS_DDPRIMARY_RESULT "Ekranda ak ve kara dikdÃ¶rtgenler gÃ¶rdÃ¼nÃ¼z mÃ¼?" + IDS_DDOFFSCREEN_DESCRIPTION "Bu sÄ±nama, ReactDraw'Ä± ekran dÄ±ÅÄ± arabelleÄe Ã§izmek iÃ§in kullanacak. Ekranda devinen bir ak dikdÃ¶rtgen gÃ¶receksiniz. SÃ¼rdÃ¼rÃ¼lsÃ¼n mÃ¼?" + IDS_DDOFFSCREEN_RESULT "Ekranda devinen bir ak dikdÃ¶rtgen gÃ¶rdÃ¼nÃ¼z mÃ¼?" + IDS_DDFULLSCREEN_DESCRIPTION "Bu sÄ±nama, ReactDraw'Ä± tam ekranda Ã§izmek iÃ§in kullanacak. Tam ekranda devinen bir ak dikdÃ¶rtgen gÃ¶receksiniz. SÃ¼rdÃ¼rÃ¼lsÃ¼n mÃ¼?" + IDS_DDFULLSCREEN_RESULT "Tam ekranda devinen bir ak dikdÃ¶rtgen gÃ¶rdÃ¼nÃ¼z mÃ¼?" IDS_FORMAT_ADAPTER_MEM "%u MB" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" + IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u ikillik) (%uHz)" IDS_OPTION_NO "HayÄ±r" - IDS_D3DTEST_DESCRIPTION "Direct3D arayÃ¼z sÄ±namasÄ± baÅlatÄ±lacak. Devam?" - IDS_D3DTEST_D3Dx "Bu sÄ±nama donanÄ±m hÄ±zlandÄ±rmalÄ± Direct3D %u arayÃ¼zÃ¼nÃ¼ kullanacak." -END + IDS_D3DTEST_DESCRIPTION "React3D arayÃ¼z sÄ±namasÄ± baÅlatÄ±lacak. SÃ¼rdÃ¼rÃ¼lsÃ¼n mÃ¼?" + IDS_D3DTEST_D3Dx "Bu sÄ±nama, donanÄ±m hÄ±zlandÄ±rmalÄ± React3D %u arayÃ¼zÃ¼nÃ¼ kullanacak." +END Added: trunk/reactos/base/applications/kbswitch/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/tr-TR.rc (added) +++ trunk/reactos/base/applications/kbswitch/lang/tr-TR.rc [iso-8859-1] Sat May 4 14:18:45 2013 @@ -0,0 +1,11 @@ +LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&YeÄlemeler...", ID_PREFERENCES + MENUITEM SEPARATOR + MENUITEM "&ÃÄ±kÄ±Å", ID_EXIT + END +END Propchange: trunk/reactos/base/applications/kbswitch/lang/tr-TR.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/applications/kbswitch/lang/tr-TR.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/base/applications/kbswitch/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/rsrc.rc [iso-8859-1] Sat May 4 14:18:45 2013 @@ -52,6 +52,9 @@ #ifdef LANGUAGE_SV_SE #include "lang/sv-SE.rc" #endif +#ifdef LANGUAGE_TR_TR + #include "lang/tr-TR.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif Added: trunk/reactos/base/applications/network/wlanconf/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/wlanconf/lang/cs-CZ.rc (added) +++ trunk/reactos/base/applications/network/wlanconf/lang/cs-CZ.rc [iso-8859-1] Sat May 4 14:18:45 2013 @@ -0,0 +1,44 @@ +/* FILE: base/applications/network/wlanconf/lang/cs-CZ.rc + * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) + * UPDATED: 2013-02-15 + */ + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN +IDS_USAGE, "\nNakonfiguruje bezdrÃ¡tovÃ½ sÃÅ¥ovÃ½ adaptÃ©r (WLAN).\n\n\ +WLANCONF [-c SSID [-w WEP] [-a]] [-d] [-s]\n\n\ +\t-c SSID\t\tPÅipojÃ se k zadanÃ©mu SSID.\n\ +\t-w WEP\t\tSpecifikuje pouÅ¾itÃ½ WEP klÃÄ.\n\ +\t-a\t\tSpecifikuje, Å¾e cÃlovÃ¡ sÃÅ¥ je v reÅ¾imu ad hoc.\n\ +\t-d\t\tOdpojÃ se od souÄasnÃ©ho AP (pÅÃstupovÃ©ho bodu).\n\ +\t-s\t\tProhledÃ¡ a zobrazÃ seznam pÅÃstupovÃ½ch bodÅ¯ v dosahu.\n\ +SpuÅ¡tÄnÃ bez parametrÅ¯ vypÃÅ¡e informace o souÄasnÃ©m bezdrÃ¡tovÃ©m pÅipojenÃ.\n" +/* === */ +IDS_NO_NETWORK, "Nebyly nalezeny Å¾Ã¡dnÃ© sÃtÄ\n" +IDS_NO_WLAN_ADAPTER, "V systÃ©mu nebyl nalezen WLAN adaptÃ©r\n" +IDS_SUCCESS, "Operace byla ÃºspÄÅ¡nÄ dokonÄena.\n" +IDS_WLAN_DISCONNECT, "\nWLAN odpojen\n" +/* === */ +IDS_MSG_WEP_ENABLED, "WEP zapnuto: %s\n" +IDS_MSG_NETWORK_MODE, "ReÅ¾im sÃtÄ: %s\n" +IDS_MSG_CURRENT_WIRELESS, "\nAktuÃ¡lnÃ informace o bezdrÃ¡tovÃ© konfiguraci:\n\n" +IDS_MSG_ENCRYPTED, "ZaÅ¡ifrovÃ¡no: %s\n" +IDS_MSG_NETWORK_TYPE, "Typ sÃtÄ: %s\n" +IDS_MSG_RSSI, "RSSI: %i dBm\n" +IDS_MSG_SUPPORT_RATE, "PodporovanÃ© rychlosti (Mbps): " +IDS_MSG_TRANSMISSION_POWER, "PÅenosovÃ½ vÃ½kon: %d mW\n" +IDS_MSG_ANTENNA_COUNT, "PoÄet antÃ©n: %d\n" +IDS_MSG_TRANSMIT_ANTENNA, "VysÃlacÃ antÃ©na: %d\n" +IDS_MSG_TRANSMIT_ANTENNA_ANY, "VysÃlacÃ antÃ©na: jakÃ¡koliv\n" +IDS_MSG_RECEIVE_ANTENNA, "PÅijÃmacÃ antÃ©na: %d\n" +IDS_MSG_RECEIVE_ANTENNA_ANY, "PÅijÃmacÃ antÃ©na: jakÃ¡koliv\n" +IDS_MSG_FRAGMENT_THRESHOLD, "Hranice fragmentace: %d bajtÅ¯\n" +IDS_MSG_RTS_THRESHOLD, "Hranice RTS: %d bajtÅ¯\n" +/* === */ +IDS_YES, "Ano" +IDS_NO, "Ne" +IDS_ADHOC, "Ad hoc" +IDS_INFRASTRUCTURE, "Infrastruktura" +END Propchange: trunk/reactos/base/applications/network/wlanconf/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/applications/network/wlanconf/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/base/applications/network/wlanconf/wlanconf.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/wlanconf/wlanconf.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/wlanconf/wlanconf.rc [iso-8859-1] Sat May 4 14:18:45 2013 @@ -19,6 +19,9 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_CS_CZ + #include "lang/cs-CZ.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif Modified: trunk/reactos/base/applications/regedit/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/cs-CZ.rc [iso-8859-1] Sat May 4 14:18:45 2013 @@ -376,7 +376,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_BINARY_EMPTY "(binÃ¡rnÃ poloÅ¾ka nulovÃ© hodnoty)" + IDS_BINARY_EMPTY "(binÃ¡rnÃ poloÅ¾ka nulovÃ© hodnoty)" IDS_DEFAULT_VALUE_NAME "(VÃ½chozÃ)" IDS_VALUE_NOT_SET "(Hodnota nezadÃ¡na)" IDS_UNKNOWN_TYPE "NeznÃ¡mÃ½ typ: (0x%lx)" @@ -434,10 +434,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly.\nIf you do not trust the source of this information in '%s', do not add it to registry.\n\nAre you sure you want to continue?" - IDS_IMPORT_OK "The keys and values contained in '%s' have been successfully added to the registry." - IDS_IMPORT_ERROR "Cannot import '%s': Error opening the file. There may be a disk, file system error or file may not exist." - IDS_EXPORT_ERROR "Cannot export '%s': Error creating or writing to the file. There may be a disk or file system error." + IDS_IMPORT_PROMPT "PÅidÃ¡vÃ¡nÃm informacÃ mÅ¯Å¾ete neÃºmyslnÄ zmÄnit nebo odstranit hodnoty a zpÅ¯sobit, Å¾e komponenty pÅestanou sprÃ¡vnÄ fungovat\nPokud nevÄÅÃte zdroji tÄchto informacÃ v '%s', nepÅidÃ¡vejte je do registru.\n\nOpravdu chcete pokraÄovat?" + IDS_IMPORT_OK "KlÃÄe a hodnoty z '%s' byly ÃºspÄÅ¡nÄ pÅidÃ¡ny do registru." + IDS_IMPORT_ERROR "Nelze importovat '%s': Chyba pÅi otevÃrÃ¡nÃ souboru. DoÅ¡lo k chybÄ disku nebo souborovÃ©ho systÃ©mu, nebo soubor neexistuje." + IDS_EXPORT_ERROR "Nelze exportovat '%s': Chyba pÅi vytvÃ¡ÅenÃ Äi psanÃ do souboru. DoÅ¡lo k chybÄ disku nebo souborovÃ©ho systÃ©mu." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc [iso-8859-1] Sat May 4 14:18:45 2013 @@ -61,7 +61,7 @@ COMBOBOX IDC_APPEARANCE_VISUAL_STYLE, 7, 140, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "SchÃ©ma", IDC_STATIC, 7, 160, 64, 7 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 170, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Size", IDC_STATIC, 7, 190, 64, 7 + LTEXT "Velikost", IDC_STATIC, 7, 190, 64, 7 COMBOBOX IDC_APPEARANCE_SIZE, 7, 200, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Efekty...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "UpÅesnit", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 @@ -239,7 +239,7 @@ IDS_MESSBOX "Okno zprÃ¡vy" IDS_MESSTEXT "Text zprÃ¡vy" IDS_BUTTEXT "OK" - IDS_CLASSIC_THEME "Classic Theme" + IDS_CLASSIC_THEME "KlasickÃ© tÃ©ma" END STRINGTABLE DISCARDABLE Modified: trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/cs-C… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] Sat May 4 14:18:45 2013 @@ -1,7 +1,6 @@ -/* - * FILE: dll/win32/msgina/lang/cs-CZ.rc +/* FILE: dll/win32/msgina/lang/cs-CZ.rc * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) - * UPDATED: 2008-06-24 + * UPDATED: 2013-02-17 */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT @@ -45,9 +44,9 @@ FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 - GROUPBOX "Logon Information",IDC_STATIC,7,61,261,52 - LTEXT "<Message>",IDC_LOGONMSG,15,73,245,18 - LTEXT "<Logon date>",IDC_LOGONDATE,15,94,245,8 + GROUPBOX "PÅihlaÅ¡ovacÃ Ãºdaje",IDC_STATIC,7,61,261,52 + LTEXT "<ZprÃ¡va>",IDC_LOGONMSG,15,73,245,18 + LTEXT "<Datum pÅihlÃ¡Å¡enÃ>",IDC_LOGONDATE,15,94,245,8 CTEXT "Co chcete udÄlat?",IDC_STATIC,10,119,255,8 PUSHBUTTON "Uzamknout poÄÃtaÄ",IDC_LOCK,10,135,70,14 PUSHBUTTON "OdhlÃ¡sit",IDC_LOGOFF,90,135,70,14 @@ -58,31 +57,31 @@ IDD_LOCKED_DLG DIALOGEX 0,0,275,121 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Computer Locked" +CAPTION "PoÄÃtaÄ je uzamÄen" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 ICON IDI_LOCKICON,-1,7,59,20,20 - LTEXT "This computer is in use and has been locked.",IDC_STATIC,37,61,231,8 - LTEXT "Message",IDC_LOCKMSG,37,75,231,26 - LTEXT "Press Ctrl-Alt-Del to unlock this computer.",IDC_STATIC,37,106,231,8 + LTEXT "Tento poÄÃtaÄ je momentÃ¡lnÄ pouÅ¾ÃvÃ¡n a byl uzamÄen.",IDC_STATIC,37,61,231,8 + LTEXT "ZprÃ¡va",IDC_LOCKMSG,37,75,231,26 + LTEXT "StisknutÃm klÃ¡ves Ctrl-Alt-Del odemknete poÄÃtaÄ.",IDC_STATIC,37,106,231,8 END IDD_UNLOCK_DLG DIALOGEX 0,0,275,179 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Unlock Computer" +CAPTION "Odemknout poÄÃtaÄ" FONT 8,"MS Shell Dlg",400,0,1 BEGIN CONTROL IDI_ROSLOGO,IDC_ROSLOGO,"Static",SS_BITMAP,0,0,275,54 ICON IDI_LOCKICON,-1,7,59,20,20 - LTEXT "This computer is in use and has been locked.",IDC_STATIC,36,61,232,8 - LTEXT "Message",IDC_LOCKMSG,36,75,232,26 - LTEXT "Username:",IDC_STATIC,36,107,40,8 + LTEXT "Tento poÄÃtaÄ je momentÃ¡lnÄ pouÅ¾ÃvÃ¡n a byl uzamÄen.",IDC_STATIC,36,61,232,8 + LTEXT "ZprÃ¡va",IDC_LOCKMSG,36,75,232,26 + LTEXT "UÅ¾ivatelskÃ© jmÃ©no:",IDC_STATIC,36,107,40,8 EDITTEXT IDC_USERNAME,84,104,119,14,ES_AUTOHSCROLL - LTEXT "Password:",IDC_STATIC,36,125,42,8 + LTEXT "Heslo:",IDC_STATIC,36,125,42,8 EDITTEXT IDC_PASSWORD,84,123,119,14,ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK",IDOK,80,154,50,14,BS_DEFPUSHBUTTON - PUSHBUTTON "Cancel",IDCANCEL,144,154,50,14 + PUSHBUTTON "Storno",IDCANCEL,144,154,50,14 END STRINGTABLE @@ -93,6 +92,7 @@ IDS_ASKFORUSER "UÅ¾ivatelskÃ© jmÃ©no: " IDS_ASKFORPASSWORD "Heslo: " IDS_FORCELOGOFF "SouÄasnÃ½ uÅ¾ivatel bude odhlÃ¡Å¡en a vÅ¡echna jeho neuloÅ¾enÃ¡ data ztracena. PokraÄovat?" - IDS_LOCKMSG "Only %s or an Administrator can unlock this computer." - IDS_LOGONDATE "Logon date: %s %s" + IDS_LOCKMSG "Pouze %s nebo AdministrÃ¡tor mÅ¯Å¾e odemknout tento poÄÃtaÄ." + IDS_LOGONMSG "Jste pÅihlÃ¡Å¡eni jako %s." + IDS_LOGONDATE "Datum pÅihlÃ¡Å¡enÃ: %s %s" END

11 years, 4 months

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 May 2013