September 2020 - Ros-diffs

[reactos] 01/07: [CMD] Code style and formatting fixes for assoc.c and path.c

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5d7a2cd619853eb6ad1f… commit a5d7a2cd619853eb6ad1fb1f912eb1d69e9645a9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 26 20:29:34 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Sep 23 00:22:45 2020 +0200 [CMD] Code style and formatting fixes for assoc.c and path.c --- base/shell/cmd/assoc.c | 195 +++++++++++++++++++++++++------------------------ base/shell/cmd/path.c | 26 +++---- 2 files changed, 112 insertions(+), 109 deletions(-) diff --git a/base/shell/cmd/assoc.c b/base/shell/cmd/assoc.c index 0e3d6f18f9c..a9ce5c6682a 100644 --- a/base/shell/cmd/assoc.c +++ b/base/shell/cmd/assoc.c @@ -1,20 +1,20 @@ /* - * Assoc.C - assoc internal command. + * ASSOC.C - assoc internal command. * * * History: * * 14-Mar-2009 Lee C. Baker - * - initial implementation + * - initial implementation. * * 15-Mar-2009 Lee C. Baker - * - Don't write to (or use) HKEY_CLASSES_ROOT directly - * - Externalize strings + * - Don't write to (or use) HKEY_CLASSES_ROOT directly. + * - Externalize strings. * * TODO: - * - PrintAllAssociations might could be optimized to not fetch all registry subkeys under 'Classes', just the ones that start with '.' + * - PrintAllAssociations could be optimized to not fetch all registry subkeys under 'Classes', just the ones that start with '.' * - Make sure that non-administrator users can list associations, and get appropriate error messages when they don't have sufficient - * privileges to perform an operation + * privileges to perform an operation. */ #include "precomp.h" @@ -22,37 +22,36 @@ #ifdef INCLUDE_CMD_ASSOC static INT -PrintAssociation(LPTSTR extension) +PrintAssociation( + IN LPCTSTR extension) { - DWORD return_val; - HKEY hKey = NULL, hInsideKey = NULL; - + DWORD lRet; + HKEY hKey = NULL, hSubKey = NULL; DWORD fileTypeLength = 0; LPTSTR fileType = NULL; - return_val = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, KEY_READ, &hKey); - - if (return_val != ERROR_SUCCESS) + lRet = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, KEY_READ, &hKey); + if (lRet != ERROR_SUCCESS) return -1; - return_val = RegOpenKeyEx(hKey, extension, 0, KEY_READ, &hInsideKey); + lRet = RegOpenKeyEx(hKey, extension, 0, KEY_READ, &hSubKey); RegCloseKey(hKey); - if (return_val != ERROR_SUCCESS) + if (lRet != ERROR_SUCCESS) return 0; - /* obtain string length */ - return_val = RegQueryValueEx(hInsideKey, NULL, NULL, NULL, NULL, &fileTypeLength); + /* Obtain string length */ + lRet = RegQueryValueEx(hSubKey, NULL, NULL, NULL, NULL, &fileTypeLength); - if (return_val == ERROR_FILE_NOT_FOUND) /* no default value, don't display */ + /* If there is no default value, don't display */ + if (lRet == ERROR_FILE_NOT_FOUND) { - RegCloseKey(hInsideKey); + RegCloseKey(hSubKey); return 0; } - - if (return_val != ERROR_SUCCESS) + if (lRet != ERROR_SUCCESS) { - RegCloseKey(hInsideKey); + RegCloseKey(hSubKey); return -2; } @@ -60,21 +59,22 @@ PrintAssociation(LPTSTR extension) if (!fileType) { WARN("Cannot allocate memory for fileType!\n"); - RegCloseKey(hInsideKey); + RegCloseKey(hSubKey); return -2; } - /* obtain actual file type */ - return_val = RegQueryValueEx(hInsideKey, NULL, NULL, NULL, (LPBYTE)fileType, &fileTypeLength); - RegCloseKey(hInsideKey); + /* Obtain actual file type */ + lRet = RegQueryValueEx(hSubKey, NULL, NULL, NULL, (LPBYTE)fileType, &fileTypeLength); + RegCloseKey(hSubKey); - if (return_val != ERROR_SUCCESS) + if (lRet != ERROR_SUCCESS) { cmd_free(fileType); return -2; } - if (fileTypeLength != 0) /* if there is a default key, display relevant information */ + /* If there is a default key, display relevant information */ + if (fileTypeLength != 0) { ConOutPrintf(_T("%s=%s\n"), extension, fileType); } @@ -86,7 +86,7 @@ PrintAssociation(LPTSTR extension) static INT PrintAllAssociations(VOID) { - DWORD return_val = 0; + DWORD lRet = 0; HKEY hKey = NULL; DWORD numKeys = 0; @@ -94,14 +94,13 @@ PrintAllAssociations(VOID) LPTSTR extName = NULL; DWORD keyCtr = 0; - return_val = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, KEY_READ, &hKey); - - if (return_val != ERROR_SUCCESS) + lRet = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, KEY_READ, &hKey); + if (lRet != ERROR_SUCCESS) return -1; - return_val = RegQueryInfoKey(hKey, NULL, NULL, NULL, &numKeys, &extLength, NULL, NULL, NULL, NULL, NULL, NULL); - - if (return_val != ERROR_SUCCESS) + lRet = RegQueryInfoKey(hKey, NULL, NULL, NULL, &numKeys, &extLength, + NULL, NULL, NULL, NULL, NULL, NULL); + if (lRet != ERROR_SUCCESS) { RegCloseKey(hKey); return -2; @@ -116,12 +115,13 @@ PrintAllAssociations(VOID) return -2; } - for (keyCtr = 0; keyCtr < numKeys; keyCtr++) + for (keyCtr = 0; keyCtr < numKeys; ++keyCtr) { - DWORD buffer_size = extLength; - return_val = RegEnumKeyEx(hKey, keyCtr, extName, &buffer_size, NULL, NULL, NULL, NULL); + DWORD dwBufSize = extLength; + lRet = RegEnumKeyEx(hKey, keyCtr, extName, &dwBufSize, + NULL, NULL, NULL, NULL); - if (return_val == ERROR_SUCCESS || return_val == ERROR_MORE_DATA) + if (lRet == ERROR_SUCCESS || lRet == ERROR_MORE_DATA) { if (*extName == _T('.')) PrintAssociation(extName); @@ -141,58 +141,63 @@ PrintAllAssociations(VOID) } static INT -AddAssociation(LPTSTR extension, LPTSTR type) +AddAssociation( + IN LPCTSTR extension, + IN LPCTSTR type) { - DWORD return_val; - HKEY hKey = NULL, insideKey = NULL; - - return_val = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, KEY_ALL_ACCESS, &hKey); + DWORD lRet; + HKEY hKey = NULL, hSubKey = NULL; - if (return_val != ERROR_SUCCESS) + lRet = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, KEY_ALL_ACCESS, &hKey); + if (lRet != ERROR_SUCCESS) return -1; - return_val = RegCreateKeyEx(hKey, extension, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &insideKey, NULL); + lRet = RegCreateKeyEx(hKey, extension, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, NULL, &hSubKey, NULL); RegCloseKey(hKey); - if (return_val != ERROR_SUCCESS) + if (lRet != ERROR_SUCCESS) return -1; - return_val = RegSetValueEx(insideKey, NULL, 0, REG_SZ, (LPBYTE)type, (_tcslen(type) + 1) * sizeof(TCHAR)); - RegCloseKey(insideKey); + lRet = RegSetValueEx(hSubKey, NULL, 0, REG_SZ, + (LPBYTE)type, (_tcslen(type) + 1) * sizeof(TCHAR)); + RegCloseKey(hSubKey); - if (return_val != ERROR_SUCCESS) + if (lRet != ERROR_SUCCESS) return -2; return 0; } -static int -RemoveAssociation(LPTSTR extension) +static INT +RemoveAssociation( + IN LPCTSTR extension) { - DWORD return_val; + DWORD lRet; HKEY hKey; - return_val = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, KEY_ALL_ACCESS, &hKey); - - if (return_val != ERROR_SUCCESS) + lRet = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Classes"), 0, KEY_ALL_ACCESS, &hKey); + if (lRet != ERROR_SUCCESS) return -1; - return_val = RegDeleteKey(hKey, extension); + lRet = RegDeleteKey(hKey, extension); RegCloseKey(hKey); - if (return_val != ERROR_SUCCESS) + if (lRet != ERROR_SUCCESS) return -2; return 0; } -INT CommandAssoc (LPTSTR param) +INT CommandAssoc(LPTSTR param) { - /* print help */ - if (!_tcsncmp (param, _T("/?"), 2)) + LPTSTR lpEqualSign; + + /* Print help */ + if (!_tcsncmp(param, _T("/?"), 2)) { - ConOutResPaging(TRUE,STRING_ASSOC_HELP); + ConOutResPaging(TRUE, STRING_ASSOC_HELP); return 0; } @@ -201,47 +206,45 @@ INT CommandAssoc (LPTSTR param) if (_tcslen(param) == 0) { PrintAllAssociations(); + return 0; } - else + + lpEqualSign = _tcschr(param, _T('=')); + if (lpEqualSign != NULL) { - LPTSTR lpEqualSign = _tcschr(param, _T('=')); - if (lpEqualSign != NULL) + LPTSTR fileType = lpEqualSign + 1; + LPTSTR extension = cmd_alloc((lpEqualSign - param + 1) * sizeof(TCHAR)); + if (!extension) + { + WARN("Cannot allocate memory for extension!\n"); + error_out_of_memory(); + return 1; + } + + _tcsncpy(extension, param, lpEqualSign - param); + extension[lpEqualSign - param] = _T('\0'); + + /* If the equal sign is the last character + * in the string, then delete the key. */ + if (_tcslen(fileType) == 0) { - LPTSTR fileType = lpEqualSign + 1; - LPTSTR extension = cmd_alloc((lpEqualSign - param + 1) * sizeof(TCHAR)); - if (!extension) - { - WARN("Cannot allocate memory for extension!\n"); - error_out_of_memory(); - return 1; - } - - _tcsncpy(extension, param, lpEqualSign - param); - extension[lpEqualSign - param] = _T('\0'); - - if (_tcslen(fileType) == 0) - /* if the equal sign is the last character - in the string, then delete the key */ - { - RemoveAssociation(extension); - } - else - /* otherwise, add the key and print out the association*/ - { - AddAssociation(extension, fileType); - PrintAssociation(extension); - } - - cmd_free(extension); + RemoveAssociation(extension); } else + /* Otherwise, add the key and print out the association */ { - /* no equal sign, print all associations */ - INT retval = PrintAssociation(param); - - if (retval == 0) /* if nothing printed out */ - ConOutResPrintf(STRING_ASSOC_ERROR, param); + AddAssociation(extension, fileType); + PrintAssociation(extension); } + + cmd_free(extension); + } + else + { + /* No equal sign, print all associations */ + INT retval = PrintAssociation(param); + if (retval == 0) /* If nothing printed out */ + ConOutResPrintf(STRING_ASSOC_ERROR, param); } return 0; diff --git a/base/shell/cmd/path.c b/base/shell/cmd/path.c index 1faed8ea29c..6235b459362 100644 --- a/base/shell/cmd/path.c +++ b/base/shell/cmd/path.c @@ -29,34 +29,34 @@ #ifdef INCLUDE_CMD_PATH -/* size of environment variable buffer */ +/* Size of environment variable buffer */ #define ENV_BUFFER_SIZE 1024 -INT cmd_path (LPTSTR param) +INT cmd_path(LPTSTR param) { - if (!_tcsncmp (param, _T("/?"), 2)) + if (!_tcsncmp(param, _T("/?"), 2)) { - ConOutResPaging(TRUE,STRING_PATH_HELP1); + ConOutResPaging(TRUE, STRING_PATH_HELP1); return 0; } nErrorLevel = 0; - /* if param is empty, display the PATH environment variable */ + /* If param is empty, display the PATH environment variable */ if (!param || !*param) { DWORD dwBuffer; LPTSTR pszBuffer; - pszBuffer = (LPTSTR)cmd_alloc (ENV_BUFFER_SIZE * sizeof(TCHAR)); + pszBuffer = (LPTSTR)cmd_alloc(ENV_BUFFER_SIZE * sizeof(TCHAR)); if (!pszBuffer) { WARN("Cannot allocate memory for pszBuffer!\n"); return 1; } - dwBuffer = GetEnvironmentVariable (_T("PATH"), pszBuffer, ENV_BUFFER_SIZE); + dwBuffer = GetEnvironmentVariable(_T("PATH"), pszBuffer, ENV_BUFFER_SIZE); if (dwBuffer == 0) { cmd_free(pszBuffer); @@ -66,28 +66,28 @@ INT cmd_path (LPTSTR param) else if (dwBuffer > ENV_BUFFER_SIZE) { LPTSTR pszOldBuffer = pszBuffer; - pszBuffer = (LPTSTR)cmd_realloc (pszBuffer, dwBuffer * sizeof (TCHAR)); + pszBuffer = (LPTSTR)cmd_realloc(pszBuffer, dwBuffer * sizeof (TCHAR)); if (!pszBuffer) { WARN("Cannot reallocate memory for pszBuffer!\n"); cmd_free(pszOldBuffer); return 1; } - GetEnvironmentVariable (_T("PATH"), pszBuffer, dwBuffer); + GetEnvironmentVariable(_T("PATH"), pszBuffer, dwBuffer); } ConOutPrintf(_T("PATH=%s\n"), pszBuffer); - cmd_free (pszBuffer); + cmd_free(pszBuffer); return 0; } - /* skip leading '=' */ + /* Skip leading '=' */ if (*param == _T('=')) param++; - /* set PATH environment variable */ - if (!SetEnvironmentVariable (_T("PATH"), param)) + /* Set PATH environment variable */ + if (!SetEnvironmentVariable(_T("PATH"), param)) { nErrorLevel = 1; return 1;

4 years, 7 months

1
0
0 0

[reactos] 01/01: [CMD_ROSTEST] Add tests for the FOR /F "tokens=" command. See commit 0695ecbf.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=69258973e034168a609c3… commit 69258973e034168a609c37f112c15288774fb75e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Sep 22 23:02:55 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Sep 22 23:08:13 2020 +0200 [CMD_ROSTEST] Add tests for the FOR /F "tokens=" command. See commit 0695ecbf. --- modules/rostests/win32/cmd/test_builtins.cmd | 39 ++++++++++++++++++++++++ modules/rostests/win32/cmd/test_builtins.cmd.exp | 16 ++++++++++ 2 files changed, 55 insertions(+) diff --git a/modules/rostests/win32/cmd/test_builtins.cmd b/modules/rostests/win32/cmd/test_builtins.cmd index 9d03f175dc6..7e232ca7ca6 100644 --- a/modules/rostests/win32/cmd/test_builtins.cmd +++ b/modules/rostests/win32/cmd/test_builtins.cmd @@ -33,6 +33,45 @@ N, O ) do echo %%j +echo --- FOR /F token parsing +:: This test requires extensions being enabled +setlocal enableextensions + +set TEST_STRING="_ ` a b c d e f g h i j k l m n o p q r s t u v w x y z { | } ~ ? @ [ \ ] _ ` a b c d e f g h i j k l m n o p q r s t u v w x y z { | } ~ ? @ [ \ ]" +set "ECHO_STRING=?=%%? @=%%@ A=%%A B=%%B C=%%C D=%%D E=%%E F=%%F G=%%G H=%%H I=%%I J=%%J K=%%K L=%%L M=%%M N=%%N O=%%O P=%%P Q=%%Q R=%%R S=%%S T=%%T U=%%U V=%%V W=%%W X=%%X Y=%%Y Z=%%Z [=%%[ \=%%\ ]=%%] ^^=%%^^ _=%%_ `=%%` a=%%a b=%%b c=%%c d=%%d e=%%e f=%%f g=%%g h=%%h i=%%i j=%%j k=%%k l=%%l m=%%m n=%%n o=%%o p=%%p q=%%q r=%%r s=%%s t=%%t u=%%u v=%%v w=%%w x=%%x y=%%y z=%%z {=%%{ ^|=%%^| }=%%} ^~=%%^~" + +echo. + +:: Bug 1: Ranges that are not specified in increasing order are ignored. +:: Token numbers strictly greater than 31 are just ignored, and if they +:: appear in a range, the whole range is ignored. + +for /f "tokens=30-32" %%? in (%TEST_STRING%) do echo %ECHO_STRING% +echo. +for /f "tokens=5-1" %%? in (%TEST_STRING%) do echo %ECHO_STRING% +echo. + +:: Bug 2: Ranges that partially overlap: too many variables are being allocated, +:: while only a subset is actually used. This leads to the extra variables returning +:: empty strings. + +for /f "tokens=1-31,31,31" %%? in (%TEST_STRING%) do echo %ECHO_STRING% +echo. +for /f "tokens=1-31,1-31" %%? in (%TEST_STRING%) do echo %ECHO_STRING% +echo. +for /f "tokens=1-5,3,5,6" %%? in (%TEST_STRING%) do echo %ECHO_STRING% +echo. +for /f "tokens=1-31,* tokens=1-31 tokens=1-20,*" %%? in (%TEST_STRING%) do echo %ECHO_STRING% +echo. + +:: For comparison, this works: +for /f "tokens=1-5,6" %%? in (%TEST_STRING%) do echo %ECHO_STRING% +echo. +for /f "tokens=1-5,6-10" %%? in (%TEST_STRING%) do echo %ECHO_STRING% +echo. + +endlocal + echo ---------- Testing AND operator ---------- :: Test for TRUE condition - Should be displayed diff --git a/modules/rostests/win32/cmd/test_builtins.cmd.exp b/modules/rostests/win32/cmd/test_builtins.cmd.exp index e2d609e8e03..98f084e90a4 100644 --- a/modules/rostests/win32/cmd/test_builtins.cmd.exp +++ b/modules/rostests/win32/cmd/test_builtins.cmd.exp @@ -19,6 +19,22 @@ I %j %j %j +--- FOR /F token parsing + + + +?=_ @=` A=a B=b C=c D=d E=e F=f G=g H=h I=i J=j K=k L=l M=m N=n O=o P=p Q=q R=r S=s T=t U=u V=v W=w X=x Y=y Z=z [={ \=| ]=} ^= _= `=%` a=%a b=%b c=%c d=%d e=%e f=%f g=%g h=%h i=%i j=%j k=%k l=%l m=%m n=%n o=%o p=%p q=%q r=%r s=%s t=%t u=%u v=%v w=%w x=%x y=%y z=%z {=%{ |=%| }=%} ~=%~ + +?=_ @=` A=a B=b C=c D=d E=e F=f G=g H=h I=i J=j K=k L=l M=m N=n O=o P=p Q=q R=r S=s T=t U=u V=v W=w X=x Y=y Z=z [={ \=| ]=} ^= _= `= a= b= c= d= e= f= g= h= i= j= k= l= m= n= o= p= q= r= s= t= u= v= w= x= y= z= {= |= }=%} ~=%~ + +?=_ @=` A=a B=b C=c D=d E= F= G=%G H=%H I=%I J=%J K=%K L=%L M=%M N=%N O=%O P=%P Q=%Q R=%R S=%S T=%T U=%U V=%V W=%W X=%X Y=%Y Z=%Z [=%[ \=%\ ]=%] ^=%^ _=%_ `=%` a=%a b=%b c=%c d=%d e=%e f=%f g=%g h=%h i=%i j=%j k=%k l=%l m=%m n=%n o=%o p=%p q=%q r=%r s=%s t=%t u=%u v=%v w=%w x=%x y=%y z=%z {=%{ |=%| }=%} ~=%~ + +?=_ @=` A=a B=b C=c D=d E=e F=f G=g H=h I=i J=j K=k L=l M=m N=n O=o P=p Q=q R=r S=s t u v w x y z { | } ~ ? @ [ \ ] _ ` a b c d e f g h i j k l m n o p q r s t u v w x y z { | } ~ ? @ [ \ ] T= U= V= W= X= Y= Z= [= \= ]= ^= _=%_ `=%` a=%a b=%b c=%c d=%d e=%e f=%f g=%g h=%h i=%i j=%j k=%k l=%l m=%m n=%n o=%o p=%p q=%q r=%r s=%s t=%t u=%u v=%v w=%w x=%x y=%y z=%z {=%{ |=%| }=%} ~=%~ + +?=_ @=` A=a B=b C=c D=d E=%E F=%F G=%G H=%H I=%I J=%J K=%K L=%L M=%M N=%N O=%O P=%P Q=%Q R=%R S=%S T=%T U=%U V=%V W=%W X=%X Y=%Y Z=%Z [=%[ \=%\ ]=%] ^=%^ _=%_ `=%` a=%a b=%b c=%c d=%d e=%e f=%f g=%g h=%h i=%i j=%j k=%k l=%l m=%m n=%n o=%o p=%p q=%q r=%r s=%s t=%t u=%u v=%v w=%w x=%x y=%y z=%z {=%{ |=%| }=%} ~=%~ + +?=_ @=` A=a B=b C=c D=d E=e F=f G=g H=h I=%I J=%J K=%K L=%L M=%M N=%N O=%O P=%P Q=%Q R=%R S=%S T=%T U=%U V=%V W=%W X=%X Y=%Y Z=%Z [=%[ \=%\ ]=%] ^=%^ _=%_ `=%` a=%a b=%b c=%c d=%d e=%e f=%f g=%g h=%h i=%i j=%j k=%k l=%l m=%m n=%n o=%o p=%p q=%q r=%r s=%s t=%t u=%u v=%v w=%w x=%x y=%y z=%z {=%{ |=%| }=%} ~=%~ + ---------- Testing AND operator ---------- TRUE AND condition ---------- Testing OR operator -----------

4 years, 7 months

1
0
0 0

[reactos] 01/01: [IPHLPAPI] Fix for hasArp which crashes some iphlpapi tests. (#3216)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=90be2f4e1b139daef408b… commit 90be2f4e1b139daef408ba1472532ae8bbbc4f2b Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Tue Sep 22 08:50:41 2020 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 22 15:50:41 2020 +0200 [IPHLPAPI] Fix for hasArp which crashes some iphlpapi tests. (#3216) CORE-16513 --- dll/win32/iphlpapi/ifenum_reactos.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/win32/iphlpapi/ifenum_reactos.c b/dll/win32/iphlpapi/ifenum_reactos.c index 77fe4cf73d3..cff14cdfe5c 100644 --- a/dll/win32/iphlpapi/ifenum_reactos.c +++ b/dll/win32/iphlpapi/ifenum_reactos.c @@ -149,7 +149,8 @@ BOOL hasArp( HANDLE tcpFile, TDIEntityID *arp_maybe ) { NULL ); if( !NT_SUCCESS(status) ) return FALSE; - return (type & AT_ARP); + /* AT_ARP corresponds to an individual TDI entity type */ + return (type == AT_ARP); } static NTSTATUS getInterfaceInfoSet( HANDLE tcpFile,

4 years, 7 months

1
0
0 0

[reactos] 01/01: [PORTCLS] Fix audio stutter with official AC97 driver (#3225)

by Michael Stamper

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e45bacda07bd73be9e630… commit e45bacda07bd73be9e630fcd795640ad978c2c54 Author: Michael Stamper <michaelstamper1(a)gmail.com> AuthorDate: Tue Sep 22 13:49:34 2020 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 22 15:49:34 2020 +0200 [PORTCLS] Fix audio stutter with official AC97 driver (#3225) Replace call to AllocatedBufferSize(), with BufferSize(). Indeed (quoting https://docs.microsoft.com/en-us/windows-hardware/drivers/ddi/portcls/nf-po… ): > The BufferSize() method returns the buffer size that was set by the previous call to IDmaChannel::SetBufferSize(). If SetBufferSize() has not been called since the IDmaChannel::AllocateBuffer() call, BufferSize returns the allocated buffer size. The DMA-channel object does not actually use this value internally. This value is maintained by the object to **allow its various clients to communicate the intended size of the buffer**. And this is exactly what we want to do. --- drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp b/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp index e57fbefda74..31d787d08b0 100644 --- a/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp +++ b/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp @@ -1300,7 +1300,7 @@ CPortPinWaveCyclic::Init( m_Stream->SetState(KSSTATE_STOP); m_State = KSSTATE_STOP; m_CommonBufferOffset = 0; - m_CommonBufferSize = m_DmaChannel->AllocatedBufferSize(); + m_CommonBufferSize = m_DmaChannel->BufferSize(); m_CommonBuffer = m_DmaChannel->SystemAddress(); m_Capture = Capture; // delay of 10 millisec

4 years, 7 months

1
0
0 0

[reactos] 02/02: [CMD] FOR: Additional Windows' CMD compatibility "fixes" for FOR /F token parsing command.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0695ecbfd641306f9912a… commit 0695ecbfd641306f9912af865010dbb0ccf20fbd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 26 20:15:25 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Sep 21 03:31:01 2020 +0200 [CMD] FOR: Additional Windows' CMD compatibility "fixes" for FOR /F token parsing command. This compatibility behaviour implements the buggy behaviour of FOR /F token parsing that can be observed in Windows' CMD, and that is tested by the cmd_winetests. It can be disabled at compile time via the MSCMD_FOR_QUIRKS define. It fixes additional cmd_winetests, in concert with commit cb2a9c31. Explanation of the implemented buggy behaviour ============================================== In principle, the "tokens=x,y,m-n[*]" option describes a list of token numbers (must be between 1 and 31) that will be assigned into variables. Theoretically this option does not cumulate: only the latest 'tokens=' specification should be taken into account. However things are not that simple in practice. First, not all of the "tokens=" option state is reset when more than one specification is provided. Second, when specifying a token range, e.g. "1-5", Windows' CMD just ignores without error ranges that are not specified in increasing order. Thus for example, a range "5-1" is ignored without error. Then, token numbers strictly greater than 31 are just ignored, and if they appear in a range, the whole range is ignored. Another bug is the following one: suppose that the 'tokens' specification reads: "tokens=1-5,1-30" , or: "tokens=1-5,3" , i.e. more than one range, that overlap partially. Then the actual total number of variables will not be of the larger range size, but will be the sum, instead. Thus, in the first example, a total of 5 + 30 == 35 variables (> 31) is allocated, while in the second example, a total of 5 + 1 == 6 variables is allocated, even if they won't all store data !! In the first example, only the first 30 FOR variables will be used, and the 5 others will contain an empty string. In the second example, only the first 5 FOR variables will be used, and the other one will be empty. We also see that due to that, the "Variables" buffer of fixed size cannot always be used (since it can contain at most 32 variables). Last but not least, when more than one "tokens=" specification is provided, for example: "tokens=1-31 tokens=1-20" a total number of 31 FOR variables (because 31 is the max of 31 and 20) is allocated, **but** only 20 are actually used, and the 11 others return an empty string. And in the specification: "tokens=1-31,* tokens=1-20", a total of 31 + 1 + 20 = 52 variables is initialized, but only the first 20 will be used, and no "remaining-line" token (the '*' one) is used. --- base/shell/cmd/for.c | 165 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 135 insertions(+), 30 deletions(-) diff --git a/base/shell/cmd/for.c b/base/shell/cmd/for.c index 300588bed31..151be0ca2c8 100644 --- a/base/shell/cmd/for.c +++ b/base/shell/cmd/for.c @@ -32,6 +32,10 @@ #include "precomp.h" +/* Enable this define for "buggy" Windows' CMD FOR-command compatibility. + * Currently, this enables the buggy behaviour of FOR /F token parsing. */ +#define MSCMD_FOR_QUIRKS + /* FOR is a special command, so this function is only used for showing help now */ INT cmd_for(LPTSTR param) @@ -121,23 +125,27 @@ static LPTSTR ReadFileContents(FILE *InputFile, TCHAR *Buffer) static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) { LPTSTR Delims = _T(" \t"); - LPTSTR DelimsEndPtr = NULL; + PTCHAR DelimsEndPtr = NULL; TCHAR DelimsEndChr = _T('\0'); TCHAR Eol = _T(';'); INT SkipLines = 0; - DWORD Tokens = (1 << 1); - BOOL RemainderVar = FALSE; + DWORD TokensMask = (1 << 1); +#ifdef MSCMD_FOR_QUIRKS + DWORD NumTokens = 1; + DWORD RemainderVar = 0; +#else + DWORD NumTokens = 0; +#endif TCHAR StringQuote = _T('"'); TCHAR CommandQuote = _T('\''); LPTSTR Variables[32]; - TCHAR *Start, *End; - INT i; + PTCHAR Start, End; INT Ret = 0; if (Cmd->For.Params) { TCHAR Quote = 0; - TCHAR *Param = Cmd->For.Params; + PTCHAR Param = Cmd->For.Params; if (*Param == _T('"') || *Param == _T('\'')) Quote = *Param++; @@ -161,7 +169,7 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) { if (*Param == _T(' ')) { - TCHAR *FirstSpace = Param; + PTCHAR FirstSpace = Param; Param += _tcsspn(Param, _T(" ")); /* Exclude trailing spaces if this is not the last parameter */ if (*Param && *Param != Quote) @@ -197,24 +205,59 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) } else if (_tcsnicmp(Param, _T("tokens="), 7) == 0) { +#ifdef MSCMD_FOR_QUIRKS + DWORD NumToksInSpec = 0; // Number of tokens in this specification. +#endif Param += 7; - /* tokens=x,y,m-n: List of token numbers (must be between - * 1 and 31) that will be assigned into variables. */ - Tokens = 0; + /* + * tokens=x,y,m-n: List of token numbers (must be between 1 and 31) + * that will be assigned into variables. This option does not cumulate: + * only the latest 'tokens=' specification is taken into account. + * + * NOTE: In MSCMD_FOR_QUIRKS mode, for Windows' CMD compatibility, + * not all the tokens-state is reset. This leads to subtle bugs. + */ + TokensMask = 0; +#ifdef MSCMD_FOR_QUIRKS + NumToksInSpec = 0; + // Windows' CMD compatibility: bug: the asterisk-token's position is not reset! + // RemainderVar = 0; +#else + NumTokens = 0; +#endif + while (*Param && *Param != Quote && *Param != _T('*')) { INT First = _tcstol(Param, &Param, 0); INT Last = First; +#ifdef MSCMD_FOR_QUIRKS if (First < 1) +#else + if ((First < 1) || (First > 31)) +#endif goto error; if (*Param == _T('-')) { /* It's a range of tokens */ Last = _tcstol(Param + 1, &Param, 0); - if (Last < First || Last > 31) +#ifdef MSCMD_FOR_QUIRKS + /* Ignore the range if the endpoints are not in correct order */ + if (Last < 1) +#else + if ((Last < First) || (Last > 31)) +#endif goto error; } - Tokens |= (2 << Last) - (1 << First); +#ifdef MSCMD_FOR_QUIRKS + /* Ignore the range if the endpoints are not in correct order */ + if ((First <= Last) && (Last <= 31)) + { +#endif + TokensMask |= (2 << Last) - (1 << First); +#ifdef MSCMD_FOR_QUIRKS + NumToksInSpec += (Last - First + 1); + } +#endif if (*Param != _T(',')) break; @@ -222,12 +265,19 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) } /* With an asterisk at the end, an additional variable * will be created to hold the remainder of the line - * (after the last token specified). */ + * (after the last specified token). */ if (*Param == _T('*')) { - RemainderVar = TRUE; +#ifdef MSCMD_FOR_QUIRKS + RemainderVar = ++NumToksInSpec; +#else + ++NumTokens; +#endif Param++; } +#ifdef MSCMD_FOR_QUIRKS + NumTokens = max(NumTokens, NumToksInSpec); +#endif } else if (_tcsnicmp(Param, _T("useback"), 7) == 0) { @@ -248,12 +298,31 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) } } +#ifdef MSCMD_FOR_QUIRKS + /* Windows' CMD compatibility: use the wrongly evaluated number of tokens */ + fc->varcount = NumTokens; + /* Allocate a large enough variables array if needed */ + if (NumTokens <= ARRAYSIZE(Variables)) + { + fc->values = Variables; + } + else + { + fc->values = cmd_alloc(fc->varcount * sizeof(*fc->values)); + if (!fc->values) + { + error_out_of_memory(); + return 1; + } + } +#else /* Count how many variables will be set: one for each token, - * plus maybe one for the remainder */ - fc->varcount = RemainderVar; - for (i = 1; i < 32; i++) - fc->varcount += (Tokens >> i & 1); + * plus maybe one for the remainder. */ + fc->varcount = NumTokens; + for (NumTokens = 1; NumTokens < 32; ++NumTokens) + fc->varcount += (TokensMask >> NumTokens) & 1; fc->values = Variables; +#endif if (*List == StringQuote || *List == CommandQuote) { @@ -267,7 +336,7 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) End = List; while (!ExitingOrGoto(Cmd) && GetNextElement(&Start, &End)) { - FILE *InputFile; + FILE* InputFile; LPTSTR FullInput, In, NextLine; INT Skip; single_element: @@ -280,13 +349,18 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) } else if (*Start == CommandQuote && End[-1] == CommandQuote) { - /* Read input from a command */ + /* + * Read input from a command. We let the CRT do the ANSI/UNICODE conversion. + * NOTE: Should we do that, or instead read in binary mode and + * do the conversion by ourselves, using *OUR* current codepage?? + */ End[-1] = _T('\0'); InputFile = _tpopen(Start + 1, _T("r")); if (!InputFile) { error_bad_command(Start + 1); - return 1; + Ret = 1; + goto Quit; } FullInput = ReadFileContents(InputFile, Buffer); _pclose(InputFile); @@ -302,7 +376,8 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) if (!InputFile) { error_sfile_not_found(Start); - return 1; + Ret = 1; + goto Quit; } FullInput = ReadFileContents(InputFile, Buffer); fclose(InputFile); @@ -311,7 +386,8 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) if (!FullInput) { error_out_of_memory(); - return 1; + Ret = 1; + goto Quit; } /* Patch the delimiters string */ @@ -326,8 +402,13 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) !ExitingOrGoto(Cmd) && (In != NULL); In = NextLine) { - DWORD RemainingTokens = Tokens; - LPTSTR *CurVar = Variables; + DWORD RemainingTokens = TokensMask; + LPTSTR* CurVar = fc->values; + + ZeroMemory(fc->values, fc->varcount * sizeof(*fc->values)); +#ifdef MSCMD_FOR_QUIRKS + NumTokens = fc->varcount; +#endif NextLine = _tcschr(In, _T('\n')); if (NextLine) @@ -341,11 +422,19 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) if (*In == Eol) continue; - while ((RemainingTokens >>= 1) != 0) + /* Loop as long as we have not reached the end of + * the line, and that we have tokens available. + * A maximum of 31 tokens will be enumerated. */ + while (*In && ((RemainingTokens >>= 1) != 0)) { /* Save pointer to this token in a variable if requested */ if (RemainingTokens & 1) + { +#ifdef MSCMD_FOR_QUIRKS + --NumTokens; +#endif *CurVar++ = In; + } /* Find end of token */ In += _tcscspn(In, Delims); /* NULL-terminate it and advance to next token */ @@ -355,11 +444,21 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) In += _tcsspn(In, Delims); } } - /* Save pointer to remainder of line */ - *CurVar = In; - /* Don't run unless the line had enough tokens to fill at least one variable */ - if (*Variables[0]) + /* Save pointer to remainder of the line if we need to do so */ + if (*In) +#ifdef MSCMD_FOR_QUIRKS + if (RemainderVar && (fc->varcount - NumTokens + 1 == RemainderVar)) +#endif + { + /* NOTE: This sets fc->values[0] at least, if no tokens + * were initialized so far, since CurVar is initialized + * originally to point to fc->values. */ + *CurVar = In; + } + + /* Don't run unless we have at least one variable filled */ + if (fc->values[0]) Ret = RunInstance(Cmd); } @@ -370,6 +469,12 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) cmd_free(FullInput); } +Quit: +#ifdef MSCMD_FOR_QUIRKS + if (fc->values && (fc->values != Variables)) + cmd_free(fc->values); +#endif + return Ret; }

4 years, 7 months

1
0
0 0

[reactos] 01/02: [CMD] IF: Fix x64 warning C4267.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e904471023214afbf66a0… commit e904471023214afbf66a0177700d95a670145c75 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Sep 19 20:57:35 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Sep 21 03:31:01 2020 +0200 [CMD] IF: Fix x64 warning C4267. --- base/shell/cmd/if.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/shell/cmd/if.c b/base/shell/cmd/if.c index e219a3db225..a8426e1367a 100644 --- a/base/shell/cmd/if.c +++ b/base/shell/cmd/if.c @@ -113,7 +113,7 @@ INT ExecuteIf(PARSED_COMMAND *Cmd) else if (Cmd->If.Operator == IF_EXIST) { BOOL IsDir; - INT Size; + SIZE_T Size; WIN32_FIND_DATA f; HANDLE hFind; DWORD attrs;

4 years, 7 months

1
0
0 0

[reactos] 15/15: [NTOS:PS] On x64 don't fail in NtSetInformationProcess with ProcessUserModeIOPL information class, instead just don't do anything.

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb22d5f697187d013ce85… commit cb22d5f697187d013ce85f3126ef723809aef56a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Feb 11 11:26:51 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [NTOS:PS] On x64 don't fail in NtSetInformationProcess with ProcessUserModeIOPL information class, instead just don't do anything. For NT6+ appcompat setting return STATUS_NOT_IMPLEMENTED --- ntoskrnl/include/internal/rtl.h | 5 +++++ ntoskrnl/ps/query.c | 9 +++++++++ sdk/lib/rtl/process.c | 17 +++++++++++++++++ 3 files changed, 31 insertions(+) diff --git a/ntoskrnl/include/internal/rtl.h b/ntoskrnl/include/internal/rtl.h index c38886c7cab..80e363c7acd 100644 --- a/ntoskrnl/include/internal/rtl.h +++ b/ntoskrnl/include/internal/rtl.h @@ -34,4 +34,9 @@ RtlFindCharInUnicodeString( _Out_ PUSHORT Position ); +_IRQL_requires_max_(APC_LEVEL) +ULONG +NTAPI +RtlRosGetAppcompatVersion(VOID); + /* EOF */ diff --git a/ntoskrnl/ps/query.c b/ntoskrnl/ps/query.c index 31275a5247f..5e340c7ccdf 100644 --- a/ntoskrnl/ps/query.c +++ b/ntoskrnl/ps/query.c @@ -1902,6 +1902,15 @@ NtSetInformationProcess(IN HANDLE ProcessHandle, /* Only supported on x86 */ #if defined (_X86_) Ke386SetIOPL(); +#elif defined(_M_AMD64) + /* On x64 this function isn't implemented. + On Windows 2003 it returns success. + On Vista+ it returns STATUS_NOT_IMPLEMENTED. */ + if ((ExGetPreviousMode() != KernelMode) && + (RtlRosGetAppcompatVersion() > _WIN32_WINNT_WS03)) + { + Status = STATUS_NOT_IMPLEMENTED; + } #else Status = STATUS_NOT_IMPLEMENTED; #endif diff --git a/sdk/lib/rtl/process.c b/sdk/lib/rtl/process.c index 444c6cc2018..637046ba8a9 100644 --- a/sdk/lib/rtl/process.c +++ b/sdk/lib/rtl/process.c @@ -493,3 +493,20 @@ RtlGetCurrentProcessorNumber(VOID) /* Forward to kernel */ return NtGetCurrentProcessorNumber(); } + +_IRQL_requires_max_(APC_LEVEL) +ULONG +NTAPI +RtlRosGetAppcompatVersion(VOID) +{ + /* Get the current PEB */ + PPEB Peb = RtlGetCurrentPeb(); + if (Peb == NULL) + { + /* Default to Server 2003 */ + return _WIN32_WINNT_WS03; + } + + /* Calculate OS version from PEB fields */ + return (Peb->OSMajorVersion << 8) | Peb->OSMinorVersion; +}

4 years, 8 months

1
0
0 0

[reactos] 14/15: [NTOS:MM] Fix MiSubsectionPteToSubsection

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=26484eea9fcc0a56a2c00… commit 26484eea9fcc0a56a2c004090f8b28aa4a5db96a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Sep 11 17:52:24 2020 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [NTOS:MM] Fix MiSubsectionPteToSubsection --- ntoskrnl/include/internal/amd64/mm.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/include/internal/amd64/mm.h b/ntoskrnl/include/internal/amd64/mm.h index 0131817d4cf..bfc4a4b68d1 100644 --- a/ntoskrnl/include/internal/amd64/mm.h +++ b/ntoskrnl/include/internal/amd64/mm.h @@ -252,9 +252,10 @@ MiPxeToAddress(PMMPTE PointerPxe) // // Decodes a Prototype PTE into the underlying PTE +// The 48 bit signed value gets sign-extended to 64 bits. // #define MiSubsectionPteToSubsection(x) \ - (PMMPTE)((x)->u.Subsect.SubsectionAddress >> 16) + (PMMPTE)((LONG64)(x)->u.Subsect.SubsectionAddress) FORCEINLINE VOID

4 years, 8 months

1
0
0 0

[reactos] 13/15: [NTOS:MM] Call MiSessionAddProcess() from MmCreateProcess() like on x86

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=896d090ee6537872faa0e… commit 896d090ee6537872faa0e173a4d9436773f84f0c Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Feb 12 19:25:08 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [NTOS:MM] Call MiSessionAddProcess() from MmCreateProcess() like on x86 --- ntoskrnl/mm/amd64/page.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ntoskrnl/mm/amd64/page.c b/ntoskrnl/mm/amd64/page.c index fb00e41bb96..afae9827191 100644 --- a/ntoskrnl/mm/amd64/page.c +++ b/ntoskrnl/mm/amd64/page.c @@ -713,6 +713,8 @@ MmCreateProcessAddressSpace(IN ULONG MinWs, ASSERT(Process->AddressSpaceInitialized == 0); Process->AddressSpaceInitialized = 1; + /* Add the process to the session */ + MiSessionAddProcess(Process); return TRUE; }

4 years, 8 months

1
0
0 0

[reactos] 12/15: [NTOS:MM] In the x64 version of MmCreateProcessAddressSpace() zero out all page table PFNs

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bebcda0b0b57ab1c7fe09… commit bebcda0b0b57ab1c7fe092c5157c0f627e2b009b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jan 29 12:34:45 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [NTOS:MM] In the x64 version of MmCreateProcessAddressSpace() zero out all page table PFNs --- ntoskrnl/mm/amd64/page.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/mm/amd64/page.c b/ntoskrnl/mm/amd64/page.c index c5f6158d813..fb00e41bb96 100644 --- a/ntoskrnl/mm/amd64/page.c +++ b/ntoskrnl/mm/amd64/page.c @@ -626,8 +626,11 @@ MmCreateProcessAddressSpace(IN ULONG MinWs, /* Release PFN lock */ MiReleasePfnLock(OldIrql); - /* Zero pages */ /// FIXME: + /* Zero pages */ + MiZeroPhysicalPage(TableBasePfn); MiZeroPhysicalPage(HyperPfn); + MiZeroPhysicalPage(HyperPdPfn); + MiZeroPhysicalPage(HyperPtPfn); MiZeroPhysicalPage(WorkingSetPfn); /* Set the base directory pointers */

4 years, 8 months

1
0
0 0

[reactos] 11/15: [NTOS:KE] Zero out ExceptionFrame member in Syscall handler

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=04f0c7d0d7d3d9981476c… commit 04f0c7d0d7d3d9981476cca55372bdf49d200a1e Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue May 15 12:43:37 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [NTOS:KE] Zero out ExceptionFrame member in Syscall handler --- ntoskrnl/ke/amd64/stubs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ntoskrnl/ke/amd64/stubs.c b/ntoskrnl/ke/amd64/stubs.c index ff973935d69..b5ae60a550d 100644 --- a/ntoskrnl/ke/amd64/stubs.c +++ b/ntoskrnl/ke/amd64/stubs.c @@ -330,6 +330,9 @@ KiSystemCallHandler( TrapFrame->TrapFrame = (ULONG64)Thread->TrapFrame; Thread->TrapFrame = TrapFrame; + /* We don't have an exception frame yet */ + TrapFrame->ExceptionFrame = 0; + /* Before enabling interrupts get the user rsp from the KPCR */ UserRsp = __readgsqword(FIELD_OFFSET(KIPCR, UserRsp)); TrapFrame->Rsp = UserRsp;

4 years, 8 months

1
0
0 0

[reactos] 10/15: [NTOS:KE] Disable interrupts before lowering IRQL in KiDpcInterruptHandler to avoid stacking up DPC interrupts

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=366e8a840ca8ef4484a18… commit 366e8a840ca8ef4484a183ce6a22ba410a0cafed Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Mar 9 21:07:10 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [NTOS:KE] Disable interrupts before lowering IRQL in KiDpcInterruptHandler to avoid stacking up DPC interrupts --- ntoskrnl/ke/amd64/stubs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/ke/amd64/stubs.c b/ntoskrnl/ke/amd64/stubs.c index 43117fe6868..ff973935d69 100644 --- a/ntoskrnl/ke/amd64/stubs.c +++ b/ntoskrnl/ke/amd64/stubs.c @@ -71,9 +71,9 @@ KiDpcInterruptHandler(VOID) KiSwapContext(APC_LEVEL, OldThread); } - /* Go back to old irql and disable interrupts */ - KeLowerIrql(OldIrql); + /* Disable interrupts and go back to old irql */ _disable(); + KeLowerIrql(OldIrql); }

4 years, 8 months

1
0
0 0

[reactos] 09/15: [NTOS:KE] Save and restore previous mode in KiZwSystemService and fix restoring the trap frame

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3aaee3562910cd0611356… commit 3aaee3562910cd06113569cace4eb155ee2a6050 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Feb 5 01:23:30 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [NTOS:KE] Save and restore previous mode in KiZwSystemService and fix restoring the trap frame --- ntoskrnl/ke/amd64/trap.S | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/ke/amd64/trap.S b/ntoskrnl/ke/amd64/trap.S index 15f816f756b..3bcaa1684bf 100644 --- a/ntoskrnl/ke/amd64/trap.S +++ b/ntoskrnl/ke/amd64/trap.S @@ -835,6 +835,10 @@ FUNC KiZwSystemService /* Get current thread */ mov r11, gs:[PcCurrentThread] + /* Save PreviousMode in the trap frame */ + mov dil, byte ptr [r11 + KTHREAD_PreviousMode] + mov byte ptr [rbp + KTRAP_FRAME_PreviousMode], dil + /* Save the old trap frame in TrapFrame.Rdx */ mov rdi, [r11 + KTHREAD_TrapFrame] mov [rbp + KTRAP_FRAME_Rdx], rdi @@ -865,9 +869,13 @@ FUNC KiZwSystemService /* Restore the old trap frame */ mov r11, gs:[PcCurrentThread] - mov rsi, [rsp + KTRAP_FRAME_Rdx] + mov rsi, [rbp + KTRAP_FRAME_Rdx] mov [r11 + KTHREAD_TrapFrame], rsi + /* Restore PreviousMode from the trap frame */ + mov dil, byte ptr [rbp + KTRAP_FRAME_PreviousMode] + mov byte ptr [r11 + KTHREAD_PreviousMode], dil + /* Restore rdi and rsi */ mov rsi, [rbp + KTRAP_FRAME_Rsi] mov rdi, [rbp + KTRAP_FRAME_Rdi]

4 years, 8 months

1
0
0 0

[reactos] 08/15: [NTOS:KE] Don't use FrLdrDbgPrint anymore. It served us well, but now it's time to go away.

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b2a483b9ea02020c42db0… commit b2a483b9ea02020c42db07091dc78e4f1bfcdc66 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Mar 9 22:06:03 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [NTOS:KE] Don't use FrLdrDbgPrint anymore. It served us well, but now it's time to go away. --- ntoskrnl/ke/amd64/trap.S | 89 +----------------------------------------------- 1 file changed, 1 insertion(+), 88 deletions(-) diff --git a/ntoskrnl/ke/amd64/trap.S b/ntoskrnl/ke/amd64/trap.S index 3a017b85b77..15f816f756b 100644 --- a/ntoskrnl/ke/amd64/trap.S +++ b/ntoskrnl/ke/amd64/trap.S @@ -12,7 +12,6 @@ #include <trapamd64.inc> EXTERN KiDispatchException:PROC -EXTERN FrLdrDbgPrint:DWORD EXTERN KeBugCheckWithTf:PROC EXTERN MmAccessFault:PROC EXTERN KiSystemFatalException:PROC @@ -27,64 +26,6 @@ EXTERN KdSetOwedBreakpoints:PROC #endif -/* GLOBALS *******************************************************************/ - -.data - -PUBLIC MsgUnimplemented -MsgUnimplemented: -.asciz "WARNING: %s at %s:%d is UNIMPLEMENTED!\n" - -MsgPageFault: -.asciz "Page fault! Code = 0x%x, RIP = %p, FaultingAddress = %p\n" - -MsgGeneralProtFault: -.asciz "General protection fault at %p!\n" - -MsgBreakpointTrap: -.asciz "BreakpointTrap at %p\n" - -MsgUnexpectedInterrupt: -.asciz "UnexpectedInterrupt Vector=0x%02lx\n" - -MsgInvalidOpcodeFault: -.asciz "Invalid opcode fault at %p!\n" - -MsgDoubleFault: -.asciz "Double fault at %p, rbp=%p!\n" - -MsgTrapInfo: -.asciz "Trap: %s at %p\n" - -MACRO(TRAPINFO, func) -LOCAL label1, label2 -#if 0 - jmp label2 -label1: .asciz "\func" -label2: - push rax - push rcx - push rdx - push r8 - push r9 - push r10 - push r11 - sub rsp, 32 - lea rcx, MsgTrapInfo[rip] - lea rdx, 1b[rip] - mov r8, [rbp + KTRAP_FRAME_Rip] - call qword ptr FrLdrDbgPrint[rip] - pop r11 - pop r10 - pop r9 - pop r8 - pop rdx - pop rcx - pop rax - add rsp, 32 -#endif -ENDM - /* Helper Macros *************************************************************/ MACRO(DispatchException, Status, Number, P1, P2, P3) @@ -235,8 +176,6 @@ FUNC KiDebugTrapOrFault /* Push pseudo error code */ EnterTrap TF_SAVE_ALL - TRAPINFO KiDebugTrapOrFault - /* Check if the frame was from kernelmode */ test word ptr [rbp + KTRAP_FRAME_SegCs], 3 jz KiDebugTrapOrFaultKMode @@ -332,12 +271,6 @@ FUNC KiInvalidOpcodeFault /* Push pseudo error code */ EnterTrap TF_SAVE_ALL - TRAPINFO KiInvalidOpcodeFault - - mov rdx, [rbp + KTRAP_FRAME_Rip] - lea rcx, MsgInvalidOpcodeFault[rip] - call qword ptr FrLdrDbgPrint[rip] - /* Enable interrupts */ sti @@ -385,10 +318,7 @@ FUNC KiDoubleFaultAbort /* A zero error code is pushed */ EnterTrap (TF_HAS_ERROR_CODE OR TF_SAVE_ALL) - lea rcx, MsgDoubleFault[rip] - mov rdx, [rbp + KTRAP_FRAME_FaultAddress] - mov r8, rbp - call qword ptr FrLdrDbgPrint[rip] + int 3 /* Bugcheck */ Fatal 8 // EXCEPTION_DOUBLE_FAULT @@ -446,11 +376,6 @@ FUNC KiGeneralProtectionFault /* We have an error code */ EnterTrap (TF_HAS_ERROR_CODE OR TF_SAVE_ALL) - //TRAPINFO KiGeneralProtectionFault - //mov rdx, [rbp + KTRAP_FRAME_Rip] - //lea rcx, MsgGeneralProtFault[rip] - //call qword ptr FrLdrDbgPrint[rip] - /* Call the C handler */ mov rcx, rbp call KiGeneralProtectionFaultHandler @@ -485,16 +410,6 @@ FUNC KiPageFault /* We have an error code */ EnterTrap (TF_HAS_ERROR_CODE OR TF_SAVE_ALL) - TRAPINFO KiPageFault - -#if 0 - lea rcx, MsgPageFault[rip] - mov rdx, [rbp + KTRAP_FRAME_ErrorCode] - mov r8, [rbp + KTRAP_FRAME_Rip] - mov r9, [rbp + KTRAP_FRAME_FaultAddress] - call qword ptr FrLdrDbgPrint[rip] -#endif - /* Save page fault address */ mov rdx, cr2 mov [rbp + KTRAP_FRAME_FaultAddress], rdx @@ -644,8 +559,6 @@ FUNC KiDebugServiceTrap /* No error code */ EnterTrap TF_SAVE_ALL - TRAPINFO KiDebugServiceTrap - /* Increase Rip to skip the int3 */ inc qword ptr [rbp + KTRAP_FRAME_Rip]

4 years, 8 months

1
0
0 0

[reactos] 07/15: [HAL] Use iretq instead of iret

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0343ac4f0b99b617d7d97… commit 0343ac4f0b99b617d7d975f9af6ec79fbd12ef71 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Feb 2 09:45:17 2020 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [HAL] Use iretq instead of iret --- hal/halx86/apic/apictrap.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hal/halx86/apic/apictrap.S b/hal/halx86/apic/apictrap.S index 3aa9a713ab9..52f1dabec0f 100644 --- a/hal/halx86/apic/apictrap.S +++ b/hal/halx86/apic/apictrap.S @@ -20,7 +20,7 @@ TRAP_ENTRY HalpProfileInterrupt, (TF_VOLATILES OR TF_SEND_EOI) PUBLIC ApicSpuriousService ApicSpuriousService: - iret + iretq PUBLIC HackEoi HackEoi:

4 years, 8 months

1
0
0 0

[reactos] 06/15: [HAL] Fix calculation of timer increment

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3bbcc16d8e76ecf4296bd… commit 3bbcc16d8e76ecf4296bdfc57e461a18523198a6 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Dec 31 09:39:55 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [HAL] Fix calculation of timer increment --- hal/halx86/apic/rtctimer.c | 42 +++++++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/hal/halx86/apic/rtctimer.c b/hal/halx86/apic/rtctimer.c index afd3d9dab5a..62318f724ba 100644 --- a/hal/halx86/apic/rtctimer.c +++ b/hal/halx86/apic/rtctimer.c @@ -4,7 +4,9 @@ * FILE: hal/halx86/apic/rtctimer.c * PURPOSE: HAL APIC Management and Control Code * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) - * REFERENCES: + * REFERENCES: https://wiki.osdev.org/RTC + * https://forum.osdev.org/viewtopic.php?f=13&t=20825&start=0 + * http://www.bioscentral.com/misc/cmosmap.htm */ /* INCLUDES *******************************************************************/ @@ -24,16 +26,42 @@ BOOLEAN HalpClockSetMSRate; UCHAR HalpNextMSRate; UCHAR HalpCurrentRate = 9; /* Initial rate 9: 128 Hz / 7.8 ms */ ULONG HalpCurrentTimeIncrement; -static UCHAR RtcMinimumClockRate = 6; /* Minimum rate 6: 16 Hz / 62.5 ms */ -static UCHAR RtcMaximumClockRate = 10; /* Maximum rate 10: 256 Hz / 3.9 ms */ - - +static UCHAR RtcMinimumClockRate = 8; /* Minimum rate 8: 256 Hz / 3.9 ms */ +static UCHAR RtcMaximumClockRate = 12; /* Maximum rate 12: 16 Hz / 62.5 ms */ + +/*! + \brief Converts the CMOS RTC rate into the time increment in 100ns intervals. + + Rate Freqency Interval (ms) Result + ------------------------------------- + 0 disabled + 1 32768 0.03052 305 + 2 16384 0.06103 610 + 3 8192 0.12207 1221 + 4 4096 0.24414 2441 + 5 2048 0.48828 4883 + 6 1024 0.97656 9766 + 7 512 1.95313 19531 + 8 256 3.90625 39063 + 9 128 7.8125 78125 + 10 64 15.6250 156250 + 11 32 31.25 312500 + 12 16 62.5 625000 + 13 8 125 1250000 + 14 4 250 2500000 + 15 2 500 5000000 + +*/ FORCEINLINE ULONG RtcClockRateToIncrement(UCHAR Rate) { - ULONG Freqency = ((32768 << 1) >> Rate); - return (1000000 + (Freqency/2)) / Freqency; + /* Calculate frequency */ + ULONG Freqency = 32768 >> (Rate - 1); + + /* Calculate interval in 100ns interval: Interval = (1 / Frequency) * 10000000 + This formula will round properly, instead of truncating. */ + return (10000000 + (Freqency/2)) / Freqency; } VOID

4 years, 8 months

1
0
0 0

[reactos] 05/15: [CRT] Return from fpreset()

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64d7db506c71c38e1d61a… commit 64d7db506c71c38e1d61a57da734d25abec4a070 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Feb 11 21:49:45 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [CRT] Return from fpreset() --- sdk/lib/crt/float/amd64/fpreset.S | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/lib/crt/float/amd64/fpreset.S b/sdk/lib/crt/float/amd64/fpreset.S index 8ab5f0f2a55..008da4152eb 100644 --- a/sdk/lib/crt/float/amd64/fpreset.S +++ b/sdk/lib/crt/float/amd64/fpreset.S @@ -6,6 +6,7 @@ FUNC _fpreset .endprolog fninit + ret ENDFUNC END

4 years, 8 months

1
0
0 0

[reactos] 04/15: [CRT] Use chkstk_ms.s on x64 builds

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aff33c855dbffbc0ef2e9… commit aff33c855dbffbc0ef2e96e041103a26ec54814b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jan 29 18:37:09 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [CRT] Use chkstk_ms.s on x64 builds --- sdk/lib/crt/CMakeLists.txt | 5 +---- sdk/lib/crt/except/amd64/chkstk_ms.s | 18 ++++++++++-------- sdk/lib/crt/libcntpr.cmake | 2 +- sdk/lib/crt/msvcrtex.cmake | 1 - 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/sdk/lib/crt/CMakeLists.txt b/sdk/lib/crt/CMakeLists.txt index 03a366ce372..24d4205fbd0 100644 --- a/sdk/lib/crt/CMakeLists.txt +++ b/sdk/lib/crt/CMakeLists.txt @@ -9,10 +9,7 @@ if(ARCH STREQUAL "i386") list(APPEND CHKSTK_SOURCE except/i386/chkstk_ms.s) endif() elseif(ARCH STREQUAL "amd64") - list(APPEND CHKSTK_ASM_SOURCE except/amd64/chkstk_asm.s) - if(NOT MSVC) - list(APPEND CHKSTK_SOURCE except/amd64/chkstk_ms.s) - endif() + list(APPEND CHKSTK_ASM_SOURCE except/amd64/chkstk_ms.s) elseif(ARCH STREQUAL "arm") list(APPEND CHKSTK_ASM_SOURCE except/arm/chkstk_asm.s) if(NOT MSVC) diff --git a/sdk/lib/crt/except/amd64/chkstk_ms.s b/sdk/lib/crt/except/amd64/chkstk_ms.s index dbf9eb2e691..0894720975f 100644 --- a/sdk/lib/crt/except/amd64/chkstk_ms.s +++ b/sdk/lib/crt/except/amd64/chkstk_ms.s @@ -15,14 +15,17 @@ /* CODE **********************************************************************/ .code64 -PUBLIC ___chkstk_ms +PUBLIC __chkstk +PUBLIC __alloca_probe + +__alloca_probe: +.PROC __chkstk - //cfi_startproc() -___chkstk_ms: push rcx /* save temps */ - //cfi_push(%rcx) + .pushreg rcx push rax - //cfi_push(%rax) + .pushreg rax + .endprolog cmp rax, PAGE_SIZE /* > 4k ?*/ lea rcx, [rsp + 24] /* point past return addr */ @@ -41,11 +44,10 @@ l_LessThanAPage: or byte ptr [rcx], 0 /* less than 4k, just peek here */ pop rax - //cfi_pop(%rax) pop rcx - //cfi_pop(%rcx) ret - //cfi_endproc() + +.ENDP END /* EOF */ diff --git a/sdk/lib/crt/libcntpr.cmake b/sdk/lib/crt/libcntpr.cmake index 1a49be53d75..f15f60367b1 100644 --- a/sdk/lib/crt/libcntpr.cmake +++ b/sdk/lib/crt/libcntpr.cmake @@ -112,7 +112,7 @@ if(ARCH STREQUAL "i386") endif() elseif(ARCH STREQUAL "amd64") list(APPEND LIBCNTPR_ASM_SOURCE - except/amd64/chkstk_asm.s + except/amd64/chkstk_ms.s except/amd64/seh.s setjmp/amd64/setjmp.s math/amd64/atan.S diff --git a/sdk/lib/crt/msvcrtex.cmake b/sdk/lib/crt/msvcrtex.cmake index 3d68ce5189f..66b90d47ed8 100644 --- a/sdk/lib/crt/msvcrtex.cmake +++ b/sdk/lib/crt/msvcrtex.cmake @@ -67,7 +67,6 @@ if(ARCH STREQUAL "i386") math/i386/cisqrt.c) elseif(ARCH STREQUAL "amd64") list(APPEND MSVCRTEX_ASM_SOURCE - except/amd64/chkstk_asm.s except/amd64/chkstk_ms.s) elseif(ARCH STREQUAL "arm") list(APPEND MSVCRTEX_SOURCE

4 years, 8 months

1
0
0 0

[reactos] 03/15: [ASM] Fix KUMS_CONTEXT_HEADER offsets in ksamd64.template.h

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=38be76187adb58edac247… commit 38be76187adb58edac247c4ebb92c9f529f4b14e Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Oct 26 16:14:27 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [ASM] Fix KUMS_CONTEXT_HEADER offsets in ksamd64.template.h --- sdk/include/asm/ksamd64.template.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sdk/include/asm/ksamd64.template.h b/sdk/include/asm/ksamd64.template.h index 18fcb246b2f..7ad83dc557d 100644 --- a/sdk/include/asm/ksamd64.template.h +++ b/sdk/include/asm/ksamd64.template.h @@ -801,13 +801,13 @@ SIZE(RTL_UMS_CONTEXT_LENGTH, RTL_UMS_CONTEXT), HEADER("KUMS_CONTEXT_HEADER offsets"), OFFSET(UchStackTop, KUMS_CONTEXT_HEADER, StackTop), -OFFSET(UchStackSize, KUMS_CONTEXT_HEADER, StackTop), -OFFSET(UchRspOffset, KUMS_CONTEXT_HEADER, StackTop), -OFFSET(UchRip, KUMS_CONTEXT_HEADER, StackTop), -OFFSET(UchFltSave, KUMS_CONTEXT_HEADER, StackTop), -OFFSET(UchFlags, KUMS_CONTEXT_HEADER, StackTop), -OFFSET(UchTrapFrame, KUMS_CONTEXT_HEADER, StackTop), -OFFSET(UchExceptionFrame, KUMS_CONTEXT_HEADER, StackTop), +OFFSET(UchStackSize, KUMS_CONTEXT_HEADER, StackSize), +OFFSET(UchRspOffset, KUMS_CONTEXT_HEADER, RspOffset), +OFFSET(UchRip, KUMS_CONTEXT_HEADER, Rip), +OFFSET(UchFltSave, KUMS_CONTEXT_HEADER, FltSave), +OFFSET(UchFlags, KUMS_CONTEXT_HEADER, Flags), +OFFSET(UchTrapFrame, KUMS_CONTEXT_HEADER, TrapFrame), +OFFSET(UchExceptionFrame, KUMS_CONTEXT_HEADER, ExceptionFrame), SIZE(KUMS_CONTEXT_HEADER_LENGTH, KUMS_CONTEXT_HEADER), HEADER("UMS_CONTROL_BLOCK offsets"),

4 years, 8 months

1
0
0 0

[reactos] 02/15: [BOOTDATA] Use reactos subfolder as source dir on bootcd for now

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=867820124b89982f89acb… commit 867820124b89982f89acbb4462b2b0c2d56866ba Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Jun 27 18:09:39 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [BOOTDATA] Use reactos subfolder as source dir on bootcd for now --- boot/bootdata/txtsetup.sif | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index df17100f580..5e3134d4ab4 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -19,7 +19,8 @@ _1 = %cdname%,%cdtagfile%,,"" 1 = %cdname%,%cdtagfilei%,,\reactos [SourceDisksNames.amd64] -1 = %cdname%,%cdtagfilea%,,\amd64 +;1 = %cdname%,%cdtagfilea%,,\amd64 +1 = %cdname%,%cdtagfilei%,,\reactos ; ; The directories listed in the [Directories] or [WinntDirectories] sections

4 years, 8 months

1
0
0 0

[reactos] 01/15: [CMAKE] Add baseaddress_msvc_x64.cmake

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=280aa211794eb5ab93bf5… commit 280aa211794eb5ab93bf5a955253e1480ded5720 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Feb 4 20:12:23 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [CMAKE] Add baseaddress_msvc_x64.cmake --- CMakeLists.txt | 6 +- sdk/cmake/baseaddress_msvc_x64.cmake | 391 +++++++++++++++++++++++++++++++++++ 2 files changed, 396 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4cbb6b3f190..a128b804842 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -236,7 +236,11 @@ else() if(NO_ROSSYM) include(sdk/cmake/baseaddress_dwarf.cmake) elseif(MSVC) - include(sdk/cmake/baseaddress_msvc.cmake) + if (ARCH STREQUAL "amd64") + include(sdk/cmake/baseaddress_msvc_x64.cmake) + else() + include(sdk/cmake/baseaddress_msvc.cmake) + endif() else() include(sdk/cmake/baseaddress.cmake) endif() diff --git a/sdk/cmake/baseaddress_msvc_x64.cmake b/sdk/cmake/baseaddress_msvc_x64.cmake new file mode 100644 index 00000000000..b0b32e21b93 --- /dev/null +++ b/sdk/cmake/baseaddress_msvc_x64.cmake @@ -0,0 +1,391 @@ +# +# +set(baseaddress_ntdll 0x7FFB7500000) +set(baseaddress_kernel32 0x7FFB6500000) +set(baseaddress_msvcrt 0x7FFB5500000) +set(baseaddress_advapi32 0x7FFB4500000) +set(baseaddress_gdi32 0x7FFB3500000) +set(baseaddress_user32 0x7FFB2500000) +set(baseaddress_dhcpcsvc 0x7FFB1500000) +set(baseaddress_dnsapi 0x7FFB0500000) +set(baseaddress_icmp 0x7FFAF500000) +set(baseaddress_iphlpapi 0x7FFAE500000) +set(baseaddress_ws2_32 0x7FFAD500000) +set(baseaddress_ws2help 0x7FFAC500000) +set(baseaddress_shlwapi 0x7FFAB500000) +set(baseaddress_rpcrt4 0x7FFAA500000) +set(baseaddress_comctl32 0x7FFA9500000) +set(baseaddress_ole32 0x7FFA8500000) +set(baseaddress_winspool 0x7FFA7500000) +set(baseaddress_winmm 0x7FFA6500000) +set(baseaddress_comdlg32 0x7FFA5500000) +set(baseaddress_shell32 0x7FFA4500000) +set(baseaddress_lz32 0x7FFA3500000) +set(baseaddress_version 0x7FFA2500000) +set(baseaddress_oleaut32 0x7FFA1500000) +set(baseaddress_setupapi 0x7FFA0500000) +set(baseaddress_mpr 0x7FF9F500000) +set(baseaddress_crypt32 0x7FF9E500000) +set(baseaddress_wininet 0x7FF9D500000) +set(baseaddress_urlmon 0x7FF9C500000) +set(baseaddress_psapi 0x7FF9B500000) +set(baseaddress_imm32 0x7FF9A500000) +set(baseaddress_msvfw32 0x7FF99500000) +set(baseaddress_dbghelp 0x7FF98500000) +set(baseaddress_devmgr 0x7FF97500000) +set(baseaddress_msacm32 0x7FF96500000) +set(baseaddress_netapi32 0x7FF95500000) +set(baseaddress_powrprof 0x7FF94500000) +set(baseaddress_secur32 0x7FF93500000) +set(baseaddress_wintrust 0x7FF92500000) +set(baseaddress_avicap32 0x7FF91500000) +set(baseaddress_cabinet 0x7FF90500000) +set(baseaddress_dsound 0x7FF8F500000) +set(baseaddress_glu32 0x7FF8E500000) +set(baseaddress_opengl32 0x7FF8D500000) +set(baseaddress_riched20 0x7FF8C500000) +set(baseaddress_smdll 0x7FF8B500000) +set(baseaddress_userenv 0x7FF8A500000) +set(baseaddress_uxtheme 0x7FF89500000) +set(baseaddress_cryptui 0x7FF88500000) +set(baseaddress_csrsrv 0x7FF87500000) +set(baseaddress_basesrv 0x7FF86500000) +set(baseaddress_winsrv 0x7FF85500000) +set(baseaddress_dplayx 0x7FF84500000) +set(baseaddress_gdiplus 0x7FF83500000) +set(baseaddress_msimg32 0x7FF82500000) +set(baseaddress_mswsock 0x7FF81500000) +set(baseaddress_oledlg 0x7FF80500000) +set(baseaddress_rasapi32 0x7FF7F500000) +set(baseaddress_rsaenh 0x7FF7E500000) +set(baseaddress_samlib 0x7FF7D500000) +set(baseaddress_sensapi 0x7FF7C500000) +set(baseaddress_sfc_os 0x7FF7B500000) +set(baseaddress_snmpapi 0x7FF7A500000) +set(baseaddress_spoolss 0x7FF79500000) +set(baseaddress_usp10 0x7FF78500000) +set(baseaddress_access 0x7FF78200000) +set(baseaddress_acgenral 0x7FF78000000) +set(baseaddress_aclayers 0x7FF77500000) +set(baseaddress_acledit 0x7FF76500000) +set(baseaddress_aclui 0x7FF75500000) +set(baseaddress_acppage 0x7FF74500000) +set(baseaddress_activeds 0x7FF73500000) +set(baseaddress_actxprxy 0x7FF72500000) +set(baseaddress_advapi32_vista 0x7FF71500000) +set(baseaddress_advpack 0x7FF70500000) +set(baseaddress_amstream 0x7FF6F500000) +set(baseaddress_apphelp 0x7FF6E500000) +set(baseaddress_appwiz 0x7FF6E000000) +set(baseaddress_atl 0x7FF6D500000) # 0001E000 +set(baseaddress_atl100 0x7FF6C500000) +set(baseaddress_atl80 0x7FF6B500000) +set(baseaddress_authz 0x7FF6A500000) +set(baseaddress_avifil32 0x7FF69500000) +set(baseaddress_batt 0x7FF68500000) +set(baseaddress_bcrypt 0x7FF67500000) +set(baseaddress_beepmidi 0x7FF66500000) +set(baseaddress_browseui 0x7FF65500000) +set(baseaddress_bthci 0x7FF64600000) # 0000D000 +set(baseaddress_cards 0x7FF64500000) # 000A0000 +set(baseaddress_cfgmgr32 0x7FF63500000) +set(baseaddress_clusapi 0x7FF62500000) +set(baseaddress_cmicpl 0x7FF61600000) +set(baseaddress_comcat 0x7FF61500000) # 00007000 +set(baseaddress_compstui 0x7FF60500000) +set(baseaddress_console 0x7FF5F500000) +set(baseaddress_credui 0x7FF5E500000) +set(baseaddress_crtdll 0x7FF5D500000) +set(baseaddress_cryptdlg 0x7FF5C500000) +set(baseaddress_cryptdll 0x7FF5B500000) +set(baseaddress_cryptnet 0x7FF5A500000) +set(baseaddress_custom 0x7FF5A000000) +set(baseaddress_d3d8 0x7FF59500000) +set(baseaddress_d3d8thk 0x7FF58500000) +set(baseaddress_d3d9 0x7FF57500000) +set(baseaddress_d3dcompiler_43 0x7FF56500000) +set(baseaddress_d3drm 0x7FF55500000) +set(baseaddress_d3dwine 0x7FF54500000) +set(baseaddress_d3dx9_24 0x7FF53500000) +set(baseaddress_d3dx9_25 0x7FF52500000) +set(baseaddress_d3dx9_26 0x7FF51500000) +set(baseaddress_d3dx9_27 0x7FF50500000) +set(baseaddress_d3dx9_28 0x7FF4F500000) +set(baseaddress_d3dx9_29 0x7FF4E500000) +set(baseaddress_d3dx9_30 0x7FF4D500000) +set(baseaddress_d3dx9_31 0x7FF4C500000) +set(baseaddress_d3dx9_32 0x7FF4B500000) +set(baseaddress_d3dx9_33 0x7FF4A500000) +set(baseaddress_d3dx9_34 0x7FF49500000) +set(baseaddress_d3dx9_35 0x7FF48500000) +set(baseaddress_d3dx9_36 0x7FF47500000) +set(baseaddress_d3dx9_37 0x7FF46500000) +set(baseaddress_d3dx9_38 0x7FF45500000) +set(baseaddress_d3dx9_39 0x7FF44500000) +set(baseaddress_d3dx9_40 0x7FF43500000) +set(baseaddress_d3dx9_41 0x7FF42500000) +set(baseaddress_d3dx9_42 0x7FF41500000) +set(baseaddress_d3dx9_43 0x7FF40500000) +set(baseaddress_d3dxof 0x7FF3F500000) +set(baseaddress_dciman32 0x7FF3E500000) +set(baseaddress_ddraw 0x7FF3D500000) +set(baseaddress_desk 0x7FF3D000000) +set(baseaddress_deskadp 0x7FF3C500000) +set(baseaddress_deskmon 0x7FF3B500000) +set(baseaddress_devcpux 0x7FF3A500000) +set(baseaddress_devenum 0x7FF39500000) +set(baseaddress_dinput 0x7FF38500000) +set(baseaddress_dinput8 0x7FF37500000) +set(baseaddress_dmusic 0x7FF36500000) +set(baseaddress_dplay 0x7FF35500000) +set(baseaddress_dxdiagn 0x7FF34500000) +set(baseaddress_dxtn 0x7FF34000000) +set(baseaddress_esent 0x7FF33500000) +set(baseaddress_faultrep 0x7FF32500000) +set(baseaddress_fltlib 0x7FF31500000) +set(baseaddress_fmifs 0x7FF30500000) +set(baseaddress_fontext 0x7FF2F500000) +set(baseaddress_fontsub 0x7FF2E500000) +#set(baseaddress_framebuf 0x7FF2D500000) +#set(baseaddress_framebuf_new 0x7FF2C500000) +set(baseaddress_framedyn 0x7FF2B500000) +#set(baseaddress_genincdata 0x7FF2A500000) +set(baseaddress_getuname 0x7FF29500000) +set(baseaddress_hdwwiz 0x7FF29700000) +set(baseaddress_hhctrl 0x7FF28600000) +set(baseaddress_hid 0x7FF28500000) +set(baseaddress_hlink 0x7FF27500000) +set(baseaddress_hnetcfg 0x7FF26500000) +set(baseaddress_httpapi 0x7FF25500000) +set(baseaddress_iccvid 0x7FF24500000) +set(baseaddress_ieframe 0x7FF23500000) +set(baseaddress_iernonce 0x7FF22500000) +set(baseaddress_imaadp32.acm 0x7FF22000000) +set(baseaddress_imagehlp 0x7FF21500000) +set(baseaddress_inetcomm 0x7FF20500000) +set(baseaddress_inetcpl 0x7FF20000000) +set(baseaddress_inetmib1 0x7FF1F500000) +set(baseaddress_initpki 0x7FF1E500000) +set(baseaddress_input 0x7FF1D500000) +set(baseaddress_inseng 0x7FF1C500000) +set(baseaddress_intl 0x7FF1C000000) +set(baseaddress_iologmsg 0x7FF1B500000) +set(baseaddress_itircl 0x7FF1A500000) +set(baseaddress_itss 0x7FF19500000) +set(baseaddress_joy 0x7FF19000000) +set(baseaddress_jscript 0x7FF18500000) # 000A4000 +set(baseaddress_jsproxy 0x7FF17500000) +set(baseaddress_kbdeo 0x7FF17000000) +set(baseaddress_kbsdll 0x7FF16500000) +set(baseaddress_kernel32_vista 0x7FF15500000) +set(baseaddress_ksuser 0x7FF14500000) +set(baseaddress_libjpeg 0x7FF13500000) +set(baseaddress_libpng 0x7FF12500000) +set(baseaddress_libtiff 0x7FF11500000) +set(baseaddress_libtirpc 0x7FF11000000) +set(baseaddress_libxslt 0x7FF10500000) +set(baseaddress_load_notifications 0x7FF10000000) +set(baseaddress_loadperf 0x7FF0F500000) +set(baseaddress_localmon 0x7FF0F000000) +set(baseaddress_localspl 0x7FF0E500000) +set(baseaddress_localspl_apitest 0x7FF0E000000) +set(baseaddress_localui 0x7FF0D500000) +set(baseaddress_lpk 0x7FF0C500000) +set(baseaddress_lsasrv 0x7FF0B500000) +set(baseaddress_main 0x7FF0B000000) +set(baseaddress_mapi32 0x7FF0A500000) +set(baseaddress_mbedtls 0x7FF09500000) +set(baseaddress_mciavi32 0x7FF08500000) +set(baseaddress_mcicda 0x7FF07500000) +set(baseaddress_mciqtz32 0x7FF06500000) +set(baseaddress_mciseq 0x7FF05500000) +set(baseaddress_mciwave 0x7FF04500000) +set(baseaddress_mgmtapi 0x7FF03500000) +set(baseaddress_midimap 0x7FF02500000) +set(baseaddress_mlang 0x7FF01500000) +set(baseaddress_mmdrv 0x7FF00500000) +set(baseaddress_mmsys 0x7FF00000000) +set(baseaddress_modemui 0x7FEFF500000) +set(baseaddress_mprapi 0x7FEFE500000) +set(baseaddress_msacm32.drv 0x7FEFE100000) +set(baseaddress_msadp32.acm 0x7FEFE000000) +set(baseaddress_msafd 0x7FEFD500000) +set(baseaddress_mscat32 0x7FEFC500000) +set(baseaddress_mscms 0x7FEFB500000) +set(baseaddress_mscoree 0x7FEFA500000) +set(baseaddress_msctf 0x7FEF9500000) +set(baseaddress_msdmo 0x7FEF8500000) +set(baseaddress_msftedit 0x7FEF7500000) +set(baseaddress_msg711.acm 0x7FEF7000000) +set(baseaddress_msgina 0x7FEF6500000) +set(baseaddress_msgsm32.acm 0x7FEF6000000) +set(baseaddress_mshtml 0x7FEF5500000) +set(baseaddress_msi 0x7FEF4500000) +set(baseaddress_msimtf 0x7FEF3500000) +set(baseaddress_msisip 0x7FEF2500000) +set(baseaddress_msisys 0x7FEF2000000) +set(baseaddress_mspatcha 0x7FEF1500000) +set(baseaddress_msports 0x7FEF0500000) +set(baseaddress_msrle32 0x7FEEF500000) +set(baseaddress_mssign32 0x7FEEE500000) +set(baseaddress_mssip32 0x7FEED500000) +set(baseaddress_mstask 0x7FEEC500000) +set(baseaddress_msv1_0 0x7FEEB500000) +set(baseaddress_msvcrt20 0x7FEE9500000) +set(baseaddress_msvcrt40 0x7FEE8500000) +set(baseaddress_msvcrt_crt_dll_startup 0x7FEEA500000) +set(baseaddress_msvidc32 0x7FEE7500000) +set(baseaddress_msxml 0x7FEE6500000) +set(baseaddress_msxml2 0x7FEE5500000) +set(baseaddress_msxml3 0x7FEE4500000) +set(baseaddress_msxml4 0x7FEE3500000) +set(baseaddress_msxml6 0x7FEE2500000) +set(baseaddress_mycomput 0x7FEE1500000) +set(baseaddress_ncpa 0x7FEE1000000) +set(baseaddress_nddeapi 0x7FEE0500000) +set(baseaddress_netcfgx 0x7FEDF500000) +set(baseaddress_netevent 0x7FEDE500000) +set(baseaddress_netid 0x7FEDD500000) +set(baseaddress_netshell 0x7FEDC500000) +set(baseaddress_newdev 0x7FEDB500000) +set(baseaddress_nfs41_np 0x7FEDB000000) +set(baseaddress_normaliz 0x7FEDA500000) +set(baseaddress_notifyhook 0x7FED9500000) +set(baseaddress_npptools 0x7FED8500000) +set(baseaddress_ntdll_vista 0x7FED8000000) +set(baseaddress_ntdsapi 0x7FED7500000) +set(baseaddress_ntlanman 0x7FED6500000) +set(baseaddress_ntmarta 0x7FED5500000) +set(baseaddress_ntobjshex 0x7FED4500000) +set(baseaddress_objsel 0x7FED2500000) +set(baseaddress_odbc32 0x7FED1500000) +set(baseaddress_odbccp32 0x7FED0500000) +set(baseaddress_odbccp32i 0x7FED0000000) +set(baseaddress_oleacc 0x7FECF500000) # 0003A000 +set(baseaddress_olecli32 0x7FECE500000) +set(baseaddress_olepro32 0x7FECD500000) +set(baseaddress_olesvr32 0x7FECC500000) +set(baseaddress_olethk32 0x7FECB500000) +set(baseaddress_openglcfg 0x7FECB000000) +set(baseaddress_pdh 0x7FECA500000) +set(baseaddress_pidgen 0x7FEC9500000) +set(baseaddress_pifmgr 0x7FEC8500000) +set(baseaddress_powercfg 0x7FEC8000000) +set(baseaddress_printui 0x7FEC7500000) +set(baseaddress_propsys 0x7FEC6500000) +set(baseaddress_pstorec 0x7FEC5500000) +set(baseaddress_qedit 0x7FEC4500000) +set(baseaddress_qmgr 0x7FEC3500000) +set(baseaddress_qmgrprxy 0x7FEC2500000) +set(baseaddress_quartz 0x7FEC1500000) +set(baseaddress_query 0x7FEC0500000) +set(baseaddress_rasadhlp 0x7FEBF500000) +set(baseaddress_rasdlg 0x7FEBE500000) +set(baseaddress_rasman 0x7FEBD500000) +set(baseaddress_redirtest1 0x7FEBD500000) +set(baseaddress_redirtest2 0x7FEBD000000) +set(baseaddress_resutils 0x7FEBC500000) +set(baseaddress_riched32 0x7FEBB500000) +set(baseaddress_rsabase 0x7FEBA500000) +set(baseaddress_rshell 0x7FEB9500000) +set(baseaddress_samsrv 0x7FEB8500000) +set(baseaddress_sccbase 0x7FEB7500000) +set(baseaddress_schannel 0x7FEB6500000) +set(baseaddress_schedsvc 0x7FEB5500000) +set(baseaddress_scrrun 0x7FEB4500000) +set(baseaddress_security 0x7FEB3500000) +set(baseaddress_serialui 0x7FEB2500000) +set(baseaddress_sfc 0x7FEB1500000) +set(baseaddress_shdoclc 0x7FEB0500000) +set(baseaddress_shdocvw 0x7FEAF500000) +set(baseaddress_shellbtrfs 0x7FEAF000000) +set(baseaddress_shfolder 0x7FEAE500000) +set(baseaddress_shimgvw 0x7FEAD500000) +set(baseaddress_shsvcs 0x7FEAD000000) +set(baseaddress_slbcsp 0x7FEAB500000) +set(baseaddress_sndblst 0x7FEAA500000) +set(baseaddress_softpub 0x7FEA9500000) +set(baseaddress_srclient 0x7FEA8500000) +set(baseaddress_srvsvc 0x7FEA7500000) +set(baseaddress_sti 0x7FEA6500000) +set(baseaddress_stobject 0x7FEA5500000) +set(baseaddress_streamci 0x7FEA4500000) +set(baseaddress_sxs 0x7FEA3500000) +set(baseaddress_sysdm 0x7FEA3000000) +set(baseaddress_syssetup 0x7FEA2500000) # 00101000 +set(baseaddress_t2embed 0x7FEA1500000) +set(baseaddress_tapi32 0x7FEA0500000) +set(baseaddress_tapiui 0x7FE9F500000) +set(baseaddress_telephon 0x7FE9F000000) +set(baseaddress_testvdd 0x7FE9E500000) +set(baseaddress_themeui 0x7FE9D500000) +set(baseaddress_timedate 0x7FE9D000000) +set(baseaddress_traffic 0x7FE9C500000) +set(baseaddress_twain_32 0x7FE9B500000) +set(baseaddress_ubtrfs 0x7FE9A500000) +set(baseaddress_ucdfs 0x7FE9A000000) +set(baseaddress_uext2 0x7FE99500000) +set(baseaddress_ufat 0x7FE98500000) +set(baseaddress_ufatx 0x7FE97500000) +set(baseaddress_uffs 0x7FE96500000) +set(baseaddress_umpnpmgr 0x7FE95500000) +set(baseaddress_untfs 0x7FE94500000) +set(baseaddress_updspapi 0x7FE93500000) +set(baseaddress_ureiserfs 0x7FE92500000) +set(baseaddress_url 0x7FE91500000) +set(baseaddress_usrmgr 0x7FE91000000) +set(baseaddress_vbscript 0x7FE90500000) # 00058000 +set(baseaddress_vdmdbg 0x7FE8F500000) +set(baseaddress_verifier 0x7FE8F000000) +set(baseaddress_vfd 0x7FE8EA00000) +set(baseaddress_vssapi 0x7FE8E500000) +set(baseaddress_wbemdisp 0x7FE8D500000) +set(baseaddress_wbemprox 0x7FE8C500000) +set(baseaddress_wdmaud.drv 0x7FE8C000000) +set(baseaddress_win32u 0x7FE8B500000) +set(baseaddress_win32u_2k3sp2 0x7FE8A500000) +set(baseaddress_win32u_xpsp2 0x7FE89500000) +set(baseaddress_windowscodecs 0x7FE88500000) +set(baseaddress_windowscodecsext 0x7FE87500000) +set(baseaddress_wined3dcfg 0x7FE87100000) +set(baseaddress_winemp3.acm 0x7FE87000000) +set(baseaddress_winfax 0x7FE86500000) +set(baseaddress_wing32 0x7FE85500000) +set(baseaddress_winhttp 0x7FE84500000) +set(baseaddress_winprint 0x7FE84000000) +set(baseaddress_winscard 0x7FE83500000) +set(baseaddress_winsta 0x7FE82500000) +set(baseaddress_wkssvc 0x7FE81500000) +set(baseaddress_wlanapi 0x7FE80500000) +set(baseaddress_wldap32 0x7FE7F500000) +set(baseaddress_wlnotify 0x7FE7F000000) +set(baseaddress_wmi 0x7FE7E500000) +set(baseaddress_wmisvc 0x7FE7D500000) +set(baseaddress_wmiutils 0x7FE7C500000) +set(baseaddress_wmvcore 0x7FE7B500000) +set(baseaddress_wshirda 0x7FE79500000) +set(baseaddress_wshom 0x7FE79000000) +set(baseaddress_wshtcpip 0x7FE78500000) +set(baseaddress_wsock32 0x7FE77500000) +set(baseaddress_wtsapi32 0x7FE76500000) +set(baseaddress_wuapi 0x7FE75500000) +set(baseaddress_wuauserv 0x7FE75000000) +set(baseaddress_xinput1_1 0x7FE74500000) +set(baseaddress_xinput1_2 0x7FE73500000) +set(baseaddress_xinput1_3 0x7FE72500000) +set(baseaddress_xinput9_1_0 0x7FE71500000) +set(baseaddress_xmllite 0x7FE70500000) +set(baseaddress_zipfldr 0x7FE70000000) +# Extra found files +set(baseaddress_fusion 0x7FE53500000) +set(baseaddress_fusion_1_1 0x7FE52500000) +set(baseaddress_fusion_2_0 0x7FE51500000) +# These were warned about by cmake +set(baseaddress_dcomlaunch 0x7FE51000000) +set(baseaddress_netlogon 0x7FE50500000) +set(baseaddress_w32time 0x7FE50000000) +set(baseaddress_dpnhpast 0x7FE4F500000) +set(baseaddress_cryptext 0x7FE4F000000) +set(baseaddress_netplwiz 0x7FE4E500000) +set(baseaddress_msxml3r 0x7FE4E000000) +set(baseaddress_xolehlp 0x7FE4D500000)

4 years, 8 months

1
0
0 0

[reactos] 01/01: [RTL] Add code to SxS manifest parser to parse XML namespaces (#2512)

by William Kent

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=427ea67b9c58f3647c29b… commit 427ea67b9c58f3647c29b02aa9b2ad8355928d87 Author: William Kent <wjk011(a)gmail.com> AuthorDate: Sun Sep 20 16:56:42 2020 -0400 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 20 22:56:42 2020 +0200 [RTL] Add code to SxS manifest parser to parse XML namespaces (#2512) * [XDK] Typo fix * [XDK] Add missing ACTIVATION_CONTEXT_SECTION values * [RTL] Merge changes from Wine * [ROSTESTS] Fix typo * [NTDLL] Typo fix * Add test for new functionality * [ROSTESTS] Fix path * [ROSTESTS] Add test to testlist.c --- dll/ntdll/ldr/ldrinit.c | 2 +- modules/rostests/apitests/kernel32/CMakeLists.txt | 3 +- modules/rostests/apitests/kernel32/DefaultActCtx.c | 8 + modules/rostests/apitests/kernel32/testlist.c | 2 + modules/rostests/apitests/kernel32/xmlns.manifest | 24 + modules/rostests/winetests/kernel32/actctx.c | 2 +- sdk/include/xdk/winnt_old.h | 6 +- sdk/lib/rtl/actctx.c | 1502 ++++++++++---------- 8 files changed, 778 insertions(+), 771 deletions(-) diff --git a/dll/ntdll/ldr/ldrinit.c b/dll/ntdll/ldr/ldrinit.c index f2b2116e782..0a0be84b0c4 100644 --- a/dll/ntdll/ldr/ldrinit.c +++ b/dll/ntdll/ldr/ldrinit.c @@ -1646,7 +1646,7 @@ LdrpInitializeProcessCompat(PVOID pProcessActctx, PVOID* pOldShimData) { for (n = 0; n < ContextCompatInfo->ElementCount; ++n) { - if (ContextCompatInfo->Elements[n].Type == ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS && + if (ContextCompatInfo->Elements[n].Type == ACTCTX_COMPATIBILITY_ELEMENT_TYPE_OS && RtlCompareMemory(&ContextCompatInfo->Elements[n].Id, KnownCompatGuids[cur].Guid, sizeof(GUID)) == sizeof(GUID)) { if (LdrpDisableProcessCompatGuidDetection()) diff --git a/modules/rostests/apitests/kernel32/CMakeLists.txt b/modules/rostests/apitests/kernel32/CMakeLists.txt index 9e0ca36563a..9aebaa979a5 100644 --- a/modules/rostests/apitests/kernel32/CMakeLists.txt +++ b/modules/rostests/apitests/kernel32/CMakeLists.txt @@ -58,7 +58,8 @@ list(APPEND MANIFEST_FILES classtest2.manifest comctl32dep.manifest dep1.manifest - deptest.manifest) + deptest.manifest + xmlns.manifest) foreach(item ${MANIFEST_FILES}) add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/${item}") diff --git a/modules/rostests/apitests/kernel32/DefaultActCtx.c b/modules/rostests/apitests/kernel32/DefaultActCtx.c index c5d7118e0f4..ad19fc48ed3 100644 --- a/modules/rostests/apitests/kernel32/DefaultActCtx.c +++ b/modules/rostests/apitests/kernel32/DefaultActCtx.c @@ -131,3 +131,11 @@ START_TEST(DefaultActCtx) } } + +HANDLE _CreateActCtxFromFile(LPCWSTR FileName, int line); + +START_TEST(ActCtxWithXmlNamespaces) +{ + // _CreateActCtxFromFile() contains all the assertions we need. + (void)_CreateActCtxFromFile(L"xmlns.manifest", __LINE__); +} diff --git a/modules/rostests/apitests/kernel32/testlist.c b/modules/rostests/apitests/kernel32/testlist.c index 35240ac3774..b96dfa956f0 100644 --- a/modules/rostests/apitests/kernel32/testlist.c +++ b/modules/rostests/apitests/kernel32/testlist.c @@ -3,6 +3,7 @@ #define STANDALONE #include <apitest.h> +extern void func_ActCtxWithXmlNamespaces(void); extern void func_ConsoleCP(void); extern void func_CreateProcess(void); extern void func_DefaultActCtx(void); @@ -70,5 +71,6 @@ const struct test winetest_testlist[] = { "TerminateProcess", func_TerminateProcess }, { "TunnelCache", func_TunnelCache }, { "WideCharToMultiByte", func_WideCharToMultiByte }, + { "ActCtxWithXmlNamespaces", func_ActCtxWithXmlNamespaces }, { 0, 0 } }; diff --git a/modules/rostests/apitests/kernel32/xmlns.manifest b/modules/rostests/apitests/kernel32/xmlns.manifest new file mode 100644 index 00000000000..373533af5e3 --- /dev/null +++ b/modules/rostests/apitests/kernel32/xmlns.manifest @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1"> + <ms_compatibility:compatibility xmlns:ms_compatibility="urn:schemas-microsoft-com:compatibility.v1"> + <ms_compatibility:application> +  + +  + <ms_compatibility:supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" /> + +  + <ms_compatibility:supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" /> + +  + <ms_compatibility:supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" /> + </ms_compatibility:application> + </ms_compatibility:compatibility> + <application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware> + </windowsSettings> + </application> +</assembly> diff --git a/modules/rostests/winetests/kernel32/actctx.c b/modules/rostests/winetests/kernel32/actctx.c index 6ba8e997d4c..1e7d80d93a1 100644 --- a/modules/rostests/winetests/kernel32/actctx.c +++ b/modules/rostests/winetests/kernel32/actctx.c @@ -2792,7 +2792,7 @@ static void test_with_compat(HANDLE handle, DWORD num_compat, const GUID* expect wine_dbgstr_guid(&compat_info.Elements[n].Id), wine_dbgstr_guid(expected_compat[n]), n); - ok_(__FILE__, line)(compat_info.Elements[n].Type == ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS, + ok_(__FILE__, line)(compat_info.Elements[n].Type == ACTCTX_COMPATIBILITY_ELEMENT_TYPE_OS, "Wrong type, got %u for %u\n", (DWORD)compat_info.Elements[n].Type, n); } } diff --git a/sdk/include/xdk/winnt_old.h b/sdk/include/xdk/winnt_old.h index 09b774cbfca..dff77bab5c3 100644 --- a/sdk/include/xdk/winnt_old.h +++ b/sdk/include/xdk/winnt_old.h @@ -1089,6 +1089,8 @@ typedef VOID (NTAPI *WORKERCALLBACKFUNC)(PVOID); #define ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION 6 #define ACTIVATION_CONTEXT_SECTION_COM_PROGID_REDIRECTION 7 #define ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES 9 +#define ACTIVATION_CONTEXT_SECTION_APPLICATION_SETTINGS 10 +#define ACTIVATION_CONTEXT_SECTION_COMPATIBILITY_INFO 11 #endif /* (_WIN32_WINNT >= 0x0501) */ #define BTYPE(x) ((x)&N_BTMASK) #define ISPTR(x) (((x)&N_TMASK)==(IMAGE_SYM_DTYPE_POINTER<<N_BTSHFT)) @@ -4036,8 +4038,8 @@ typedef struct _ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION { } ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION, *PACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION; typedef enum { - ACTCX_COMPATIBILITY_ELEMENT_TYPE_UNKNOWN = 0, - ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS + ACTCTX_COMPATIBILITY_ELEMENT_TYPE_UNKNOWN = 0, + ACTCTX_COMPATIBILITY_ELEMENT_TYPE_OS } ACTCTX_COMPATIBILITY_ELEMENT_TYPE; typedef struct _COMPATIBILITY_CONTEXT_ELEMENT { diff --git a/sdk/lib/rtl/actctx.c b/sdk/lib/rtl/actctx.c index e51e7c43421..0850095b2b6 100644 --- a/sdk/lib/rtl/actctx.c +++ b/sdk/lib/rtl/actctx.c @@ -9,7 +9,7 @@ * Jacek Caban for CodeWeavers * Alexandre Julliard * Stefan Ginsberg (stefan.ginsberg(a)reactos.org) - * Samuel Serapi�n + * Samuel Serapión */ /* Based on Wine 3.2-37c98396 */ @@ -43,7 +43,7 @@ BOOLEAN RtlpNotAllowingMultipleActivation; #define ACTCTX_FAKE_HANDLE ((HANDLE) 0xf00baa) #define ACTCTX_FAKE_COOKIE ((ULONG_PTR) 0xf00bad) - +#define MAX_NAMESPACES 64 typedef struct { @@ -51,10 +51,26 @@ typedef struct unsigned int len; } xmlstr_t; +struct xml_elem +{ + xmlstr_t name; + xmlstr_t ns; + int ns_pos; +}; + +struct xml_attr +{ + xmlstr_t name; + xmlstr_t value; +}; + typedef struct { const WCHAR *ptr; const WCHAR *end; + struct xml_attr namespaces[MAX_NAMESPACES]; + int ns_pos; + BOOL error; } xmlbuf_t; struct file_info @@ -416,6 +432,12 @@ struct entity WCHAR *clsid; WCHAR *version; } clrsurrogate; + struct + { + WCHAR *name; + WCHAR *value; + WCHAR *ns; + } settings; } u; }; @@ -520,8 +542,23 @@ struct actctx_loader unsigned int allocated_dependencies; }; -static const WCHAR asmv1W[] = {'a','s','m','v','1',':',0}; -static const WCHAR asmv2W[] = {'a','s','m','v','2',':',0}; +static const xmlstr_t empty_xmlstr; + +#ifdef __i386__ +static const WCHAR current_archW[] = {'x','8','6',0}; +#elif defined __x86_64__ +static const WCHAR current_archW[] = {'a','m','d','6','4',0}; +#elif defined __arm__ +static const WCHAR current_archW[] = {'a','r','m',0}; +#elif defined __aarch64__ +static const WCHAR current_archW[] = {'a','r','m','6','4',0}; +#else +static const WCHAR current_archW[] = {'n','o','n','e',0}; +#endif + +static const WCHAR asmv1W[] = {'u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','a','s','m','.','v','1',0}; +static const WCHAR asmv2W[] = {'u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','a','s','m','.','v','2',0}; +static const WCHAR asmv3W[] = {'u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','a','s','m','.','v','3',0}; typedef struct _ACTIVATION_CONTEXT_WRAPPED { @@ -666,6 +703,22 @@ static const WCHAR requestedExecutionLevelW[] = {'r','e','q','u','e','s','t','e' static const WCHAR requestedPrivilegesW[] = {'r','e','q','u','e','s','t','e','d','P','r','i','v','i','l','e','g','e','s',0}; static const WCHAR securityW[] = {'s','e','c','u','r','i','t','y',0}; static const WCHAR trustInfoW[] = {'t','r','u','s','t','I','n','f','o',0}; +static const WCHAR windowsSettingsW[] = {'w','i','n','d','o','w','s','S','e','t','t','i','n','g','s',0}; +static const WCHAR autoElevateW[] = {'a','u','t','o','E','l','e','v','a','t','e',0}; +static const WCHAR disableThemingW[] = {'d','i','s','a','b','l','e','T','h','e','m','i','n','g',0}; +static const WCHAR disableWindowFilteringW[] = {'d','i','s','a','b','l','e','W','i','n','d','o','w','F','i','l','t','e','r','i','n','g',0}; +static const WCHAR windowsSettings2005NSW[] = {'h','t','t','p',':','/','/','s','c','h','e','m','a','s','.','m','i','c','r','o','s','o','f','t','.','c','o','m','/','S','M','I','/','2','0','0','5','/','W','i','n','d','o','w','s','S','e','t','t','i','n','g','s',0}; +static const WCHAR windowsSettings2011NSW[] = {'h','t','t','p',':','/','/','s','c','h','e','m','a','s','.','m','i','c','r','o','s','o','f','t','.','c','o','m','/','S','M','I','/','2','0','1','1','/','W','i','n','d','o','w','s','S','e','t','t','i','n','g','s',0}; +static const WCHAR windowsSettings2016NSW[] = {'h','t','t','p',':','/','/','s','c','h','e','m','a','s','.','m','i','c','r','o','s','o','f','t','.','c','o','m','/','S','M','I','/','2','0','1','6','/','W','i','n','d','o','w','s','S','e','t','t','i','n','g','s',0}; +static const WCHAR windowsSettings2017NSW[] = {'h','t','t','p',':','/','/','s','c','h','e','m','a','s','.','m','i','c','r','o','s','o','f','t','.','c','o','m','/','S','M','I','/','2','0','1','7','/','W','i','n','d','o','w','s','S','e','t','t','i','n','g','s',0}; +static const WCHAR dpiAwareW[] = {'d','p','i','A','w','a','r','e',0}; +static const WCHAR dpiAwarenessW[] = {'d','p','i','A','w','a','r','e','n','e','s','s',0}; +static const WCHAR gdiScalingW[] = {'g','d','i','S','c','a','l','i','n','g',0}; +static const WCHAR highResolutionScrollingAwareW[] = {'h','i','g','h','R','e','s','o','l','u','t','i','o','n','S','c','r','o','l','l','i','n','g','A','w','a','r','e',0}; +static const WCHAR longPathAwareW[] = {'l','o','n','g','P','a','t','h','A','w','a','r','e',0}; +static const WCHAR magicFutureSettingW[] = {'m','a','g','i','c','F','u','t','u','r','e','S','e','t','t','i','n','g',0}; +static const WCHAR printerDriverIsolationW[] = {'p','r','i','n','t','e','r','D','r','i','v','e','r','I','s','o','l','a','t','i','o','n',0}; +static const WCHAR ultraHighResolutionScrollingAwareW[] = {'u','l','t','r','a','H','i','g','h','R','e','s','o','l','u','t','i','o','n','S','c','r','o','l','l','i','n','g','A','w','a','r','e',0}; struct olemisc_entry { @@ -749,23 +802,31 @@ static inline BOOL xmlstr_cmp_end(const xmlstr_t* xmlstr, const WCHAR *str) !strncmpW(xmlstr->ptr + 1, str, xmlstr->len - 1) && !str[xmlstr->len - 1]); } -static inline BOOL xml_elem_cmp(const xmlstr_t *elem, const WCHAR *str, const WCHAR *namespace) +static inline BOOL xml_attr_cmp(const struct xml_attr* attr, const WCHAR *str) { - UINT len = strlenW( namespace ); + return xmlstr_cmp(&attr->name, str); +} - if (!strncmpW(elem->ptr, str, elem->len) && !str[elem->len]) return TRUE; - return (elem->len > len && !strncmpW(elem->ptr, namespace, len) && - !strncmpW(elem->ptr + len, str, elem->len - len) && !str[elem->len - len]); +static BOOL xml_name_cmp( const struct xml_elem *elem1, const struct xml_elem *elem2 ) +{ + return (elem1->name.len == elem2->name.len && + elem1->ns.len == elem2->ns.len && + !wcsncmp( elem1->name.ptr, elem2->name.ptr, elem1->name.len ) && + !wcsncmp( elem1->ns.ptr, elem2->ns.ptr, elem1->ns.len )); } -static inline BOOL xml_elem_cmp_end(const xmlstr_t *elem, const WCHAR *str, const WCHAR *namespace) +static inline BOOL xml_elem_cmp(const struct xml_elem* elem, const WCHAR *str, const WCHAR *namespace) { - if (elem->len && elem->ptr[0] == '/') + if (!xmlstr_cmp( &elem->name, str )) return FALSE; + if (xmlstr_cmp( &elem->ns, namespace )) return TRUE; + if (!wcscmp( namespace, asmv1W )) { - xmlstr_t elem_end; - elem_end.ptr = elem->ptr + 1; - elem_end.len = elem->len - 1; - return xml_elem_cmp( &elem_end, str, namespace ); + if (xmlstr_cmp( &elem->ns, asmv2W )) return TRUE; + if (xmlstr_cmp( &elem->ns, asmv3W )) return TRUE; + } + else if (!wcscmp( namespace, asmv2W )) + { + if (xmlstr_cmp( &elem->ns, asmv3W )) return TRUE; } return FALSE; } @@ -775,16 +836,6 @@ static inline BOOL isxmlspace( WCHAR ch ) return (ch == ' ' || ch == '\r' || ch == '\n' || ch == '\t'); } -static UNICODE_STRING xmlstr2unicode(const xmlstr_t *xmlstr) -{ - UNICODE_STRING res; - - res.Buffer = (PWSTR)xmlstr->ptr; - res.Length = res.MaximumLength = (USHORT)xmlstr->len * sizeof(WCHAR); - - return res; -} - static struct assembly *add_assembly(ACTIVATION_CONTEXT *actctx, enum assembly_type at) { struct assembly *assembly; @@ -1173,89 +1224,162 @@ static void actctx_release( ACTIVATION_CONTEXT *actctx ) } } -static BOOL next_xml_attr(xmlbuf_t* xmlbuf, xmlstr_t* name, xmlstr_t* value, - BOOL* error, BOOL* end) +static BOOL set_error(xmlbuf_t* xmlbuf) +{ + xmlbuf->error = TRUE; + return FALSE; +} + +static BOOL is_xmlns_attr(const struct xml_attr *attr) +{ + const int len = wcslen( xmlnsW ); + if (attr->name.len < len) return FALSE; + if (wcsncmp( attr->name.ptr, xmlnsW, len )) return FALSE; + return (attr->name.len == len || attr->name.ptr[len] == ':'); +} + +static void push_xmlns( xmlbuf_t *xmlbuf, const struct xml_attr *attr ) +{ + const int len = wcslen( xmlnsW ); + struct xml_attr *ns; + + if (xmlbuf->ns_pos == MAX_NAMESPACES - 1) + { + // FIXME( "too many namespaces in manifest\n" ); + set_error( xmlbuf ); + return; + } + ns = &xmlbuf->namespaces[xmlbuf->ns_pos++]; + ns->value = attr->value; + if (attr->name.len > len) + { + ns->name.ptr = attr->name.ptr + len + 1; + ns->name.len = attr->name.len - len - 1; + } + else ns->name = empty_xmlstr; +} + +static xmlstr_t find_xmlns( xmlbuf_t *xmlbuf, const xmlstr_t *name ) +{ + int i; + + for (i = xmlbuf->ns_pos - 1; i >= 0; i--) + { + if (xmlbuf->namespaces[i].name.len == name->len && + !wcsncmp( xmlbuf->namespaces[i].name.ptr, name->ptr, name->len )) + return xmlbuf->namespaces[i].value; + } + + return empty_xmlstr; +} + +static BOOL next_xml_attr(xmlbuf_t* xmlbuf, struct xml_attr* attr, BOOL* end) { const WCHAR* ptr; + WCHAR quote; - *error = TRUE; + if (xmlbuf->error) return FALSE; while (xmlbuf->ptr < xmlbuf->end && isxmlspace(*xmlbuf->ptr)) xmlbuf->ptr++; - if (xmlbuf->ptr == xmlbuf->end) return FALSE; + if (xmlbuf->ptr == xmlbuf->end) return set_error( xmlbuf ); if (*xmlbuf->ptr == '/') { xmlbuf->ptr++; if (xmlbuf->ptr == xmlbuf->end || *xmlbuf->ptr != '>') - return FALSE; + return set_error( xmlbuf ); xmlbuf->ptr++; *end = TRUE; - *error = FALSE; return FALSE; } if (*xmlbuf->ptr == '>') { xmlbuf->ptr++; - *error = FALSE; return FALSE; } ptr = xmlbuf->ptr; while (ptr < xmlbuf->end && *ptr != '=' && *ptr != '>' && !isxmlspace(*ptr)) ptr++; - if (ptr == xmlbuf->end) return FALSE; + if (ptr == xmlbuf->end) return set_error( xmlbuf ); - name->ptr = xmlbuf->ptr; - name->len = ptr-xmlbuf->ptr; + attr->name.ptr = xmlbuf->ptr; + attr->name.len = ptr-xmlbuf->ptr; xmlbuf->ptr = ptr; /* skip spaces before '=' */ while (ptr < xmlbuf->end && *ptr != '=' && isxmlspace(*ptr)) ptr++; - if (ptr == xmlbuf->end || *ptr != '=') return FALSE; + if (ptr == xmlbuf->end || *ptr != '=') return set_error( xmlbuf ); /* skip '=' itself */ ptr++; - if (ptr == xmlbuf->end) return FALSE; + if (ptr == xmlbuf->end) return set_error( xmlbuf ); /* skip spaces after '=' */ while (ptr < xmlbuf->end && *ptr != '"' && *ptr != '\'' && isxmlspace(*ptr)) ptr++; - if (ptr == xmlbuf->end || (*ptr != '"' && *ptr != '\'')) return FALSE; + if (ptr == xmlbuf->end || (*ptr != '"' && *ptr != '\'')) return set_error( xmlbuf ); - value->ptr = ++ptr; - if (ptr == xmlbuf->end) return FALSE; + quote = *ptr++; + attr->value.ptr = ptr; + if (ptr == xmlbuf->end) return set_error( xmlbuf ); - ptr = memchrW(ptr, ptr[-1], xmlbuf->end - ptr); - if (!ptr) + while (ptr < xmlbuf->end && *ptr != quote) ptr++; + if (ptr == xmlbuf->end) { xmlbuf->ptr = xmlbuf->end; - return FALSE; + return set_error( xmlbuf ); } - value->len = ptr - value->ptr; + attr->value.len = ptr - attr->value.ptr; xmlbuf->ptr = ptr + 1; + if (xmlbuf->ptr != xmlbuf->end) return TRUE; - if (xmlbuf->ptr == xmlbuf->end) return FALSE; + return set_error( xmlbuf ); +} - *error = FALSE; - return TRUE; +static void read_xml_elem( xmlbuf_t *xmlbuf, struct xml_elem *elem ) +{ + const WCHAR* ptr = xmlbuf->ptr; + + elem->ns = empty_xmlstr; + elem->name.ptr = ptr; + while (ptr < xmlbuf->end && !isxmlspace(*ptr) && *ptr != '>' && *ptr != '/') + { + if (*ptr == ':') + { + elem->ns.ptr = elem->name.ptr; + elem->ns.len = ptr - elem->ns.ptr; + elem->name.ptr = ptr + 1; + } + ptr++; + } + elem->name.len = ptr - elem->name.ptr; + xmlbuf->ptr = ptr; } -static BOOL next_xml_elem(xmlbuf_t* xmlbuf, xmlstr_t* elem) +static BOOL next_xml_elem( xmlbuf_t *xmlbuf, struct xml_elem *elem, const struct xml_elem *parent ) { const WCHAR* ptr; + struct xml_attr attr; + xmlbuf_t attr_buf; + BOOL end = FALSE; + + xmlbuf->ns_pos = parent->ns_pos; /* restore namespace stack to parent state */ + + if (xmlbuf->error) return FALSE; for (;;) { - ptr = memchrW(xmlbuf->ptr, '<', xmlbuf->end - xmlbuf->ptr); - if (!ptr) + for (ptr = xmlbuf->ptr; ptr < xmlbuf->end; ptr++) if (*ptr == '<') break; + if (ptr == xmlbuf->end) { xmlbuf->ptr = xmlbuf->end; - return FALSE; + return set_error( xmlbuf ); } ptr++; if (ptr + 3 < xmlbuf->end && ptr[0] == '!' && ptr[1] == '-' && ptr[2] == '-') /* skip comment */ @@ -1266,7 +1390,7 @@ static BOOL next_xml_elem(xmlbuf_t* xmlbuf, xmlstr_t* elem) if (ptr + 3 > xmlbuf->end) { xmlbuf->ptr = xmlbuf->end; - return FALSE; + return set_error( xmlbuf ); } xmlbuf->ptr = ptr + 3; } @@ -1274,13 +1398,37 @@ static BOOL next_xml_elem(xmlbuf_t* xmlbuf, xmlstr_t* elem) } xmlbuf->ptr = ptr; - while (ptr < xmlbuf->end && !isxmlspace(*ptr) && *ptr != '>' && (*ptr != '/' || ptr == xmlbuf->ptr)) - ptr++; + /* check for element terminating the parent element */ + if (ptr < xmlbuf->end && *ptr == '/') + { + xmlbuf->ptr++; + read_xml_elem( xmlbuf, elem ); + elem->ns = find_xmlns( xmlbuf, &elem->ns ); + if (!xml_name_cmp( elem, parent )) + { + /*ERR( "wrong closing element %s for %s\n", + debugstr_xmlstr(&elem->name), debugstr_xmlstr(&parent->name ));*/ + return set_error( xmlbuf ); + } + while (xmlbuf->ptr < xmlbuf->end && isxmlspace(*xmlbuf->ptr)) xmlbuf->ptr++; + if (xmlbuf->ptr == xmlbuf->end || *xmlbuf->ptr++ != '>') return set_error( xmlbuf ); + return FALSE; + } - elem->ptr = xmlbuf->ptr; - elem->len = ptr - xmlbuf->ptr; - xmlbuf->ptr = ptr; - return xmlbuf->ptr != xmlbuf->end; + read_xml_elem( xmlbuf, elem ); + + /* parse namespace attributes */ + attr_buf = *xmlbuf; + while (next_xml_attr( &attr_buf, &attr, &end )) + { + if (is_xmlns_attr( &attr )) push_xmlns( xmlbuf, &attr ); + } + elem->ns = find_xmlns( xmlbuf, &elem->ns ); + elem->ns_pos = xmlbuf->ns_pos; + + if (xmlbuf->ptr != xmlbuf->end) return TRUE; + + return set_error( xmlbuf ); } static BOOL parse_xml_header(xmlbuf_t* xmlbuf) @@ -1317,7 +1465,6 @@ static BOOL parse_version(const xmlstr_t *str, struct assembly_version *version) unsigned int ver[4]; unsigned int pos; const WCHAR *curr; - UNICODE_STRING strU; /* major.minor.build.revision */ ver[0] = ver[1] = ver[2] = ver[3] = pos = 0; @@ -1341,123 +1488,79 @@ static BOOL parse_version(const xmlstr_t *str, struct assembly_version *version) return TRUE; error: - strU = xmlstr2unicode(str); - DPRINT1( "Wrong version definition in manifest file (%wZ)\n", &strU ); return FALSE; } -static BOOL parse_expect_elem(xmlbuf_t* xmlbuf, const WCHAR* name, const WCHAR *namespace) +static void parse_expect_no_attr(xmlbuf_t* xmlbuf, BOOL* end) { - xmlstr_t elem; - UNICODE_STRING elemU; - if (!next_xml_elem(xmlbuf, &elem)) return FALSE; - if (xml_elem_cmp(&elem, name, namespace)) return TRUE; - elemU = xmlstr2unicode(&elem); - DPRINT1( "unexpected element %wZ\n", &elemU ); - return FALSE; -} + struct xml_attr attr; -static BOOL parse_expect_no_attr(xmlbuf_t* xmlbuf, BOOL* end) -{ - xmlstr_t attr_name, attr_value; - UNICODE_STRING attr_nameU, attr_valueU; - BOOL error; - - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, end)) + while (next_xml_attr(xmlbuf, &attr, end)) { - attr_nameU = xmlstr2unicode(&attr_name); - attr_valueU = xmlstr2unicode(&attr_value); - DPRINT1( "unexpected attr %wZ=%wZ\n", &attr_nameU, - &attr_valueU); + // TODO: report error + // if (!is_xmlns_attr( &attr )) WARN("unexpected attr %s\n", debugstr_xml_attr(&attr)); } - return !error; } -static BOOL parse_end_element(xmlbuf_t *xmlbuf) +static void parse_expect_end_elem(xmlbuf_t *xmlbuf, const struct xml_elem *parent) { - BOOL end = FALSE; - return parse_expect_no_attr(xmlbuf, &end) && !end; -} + struct xml_elem elem; -static BOOL parse_expect_end_elem(xmlbuf_t *xmlbuf, const WCHAR *name, const WCHAR *namespace) -{ - xmlstr_t elem; - UNICODE_STRING elemU; - if (!next_xml_elem(xmlbuf, &elem)) return FALSE; - if (!xml_elem_cmp_end(&elem, name, namespace)) + if (next_xml_elem(xmlbuf, &elem, parent)) { - elemU = xmlstr2unicode(&elem); - DPRINT1( "unexpected element %wZ\n", &elemU ); - return FALSE; + // FIXME( "unexpected element %s\n", debugstr_xml_elem(&elem) ); + set_error( xmlbuf ); } - return parse_end_element(xmlbuf); } -static BOOL parse_unknown_elem(xmlbuf_t *xmlbuf, const xmlstr_t *unknown_elem) +static void parse_unknown_elem(xmlbuf_t *xmlbuf, const struct xml_elem *parent) { - xmlstr_t attr_name, attr_value, elem; - BOOL end = FALSE, error, ret = TRUE; + struct xml_elem elem; + struct xml_attr attr; + BOOL end = FALSE; - while(next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)); - if(error || end) return end; + while (next_xml_attr(xmlbuf, &attr, &end)); + if (end) return; - while(ret && (ret = next_xml_elem(xmlbuf, &elem))) - { - if(*elem.ptr == '/' && elem.len - 1 == unknown_elem->len && - !strncmpW(elem.ptr+1, unknown_elem->ptr, unknown_elem->len)) - break; - else - ret = parse_unknown_elem(xmlbuf, &elem); - } - - return ret && parse_end_element(xmlbuf); + while (next_xml_elem(xmlbuf, &elem, parent)) + parse_unknown_elem(xmlbuf, &elem); } -static BOOL parse_assembly_identity_elem(xmlbuf_t* xmlbuf, ACTIVATION_CONTEXT* actctx, - struct assembly_identity* ai) +static void parse_assembly_identity_elem(xmlbuf_t* xmlbuf, ACTIVATION_CONTEXT* actctx, + struct assembly_identity* ai, const struct xml_elem *parent) { - xmlstr_t attr_name, attr_value; - BOOL end = FALSE, error; - UNICODE_STRING attr_valueU, attr_nameU; + struct xml_attr attr; + BOOL end = FALSE; - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + while (next_xml_attr(xmlbuf, &attr, &end)) { - if (xmlstr_cmp(&attr_name, g_nameW)) + if (xml_attr_cmp(&attr, g_nameW)) { - if (!(ai->name = xmlstrdupW(&attr_value))) return FALSE; + if (!(ai->name = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, typeW)) + else if (xml_attr_cmp(&attr, typeW)) { - if (!(ai->type = xmlstrdupW(&attr_value))) return FALSE; + if (!(ai->type = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, versionW)) + else if (xml_attr_cmp(&attr, versionW)) { - if (!parse_version(&attr_value, &ai->version)) return FALSE; + if (!parse_version(&attr.value, &ai->version)) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, processorArchitectureW)) + else if (xml_attr_cmp(&attr, processorArchitectureW)) { - if (!(ai->arch = xmlstrdupW(&attr_value))) return FALSE; + if (!(ai->arch = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, publicKeyTokenW)) + else if (xml_attr_cmp(&attr, publicKeyTokenW)) { - if (!(ai->public_key = xmlstrdupW(&attr_value))) return FALSE; + if (!(ai->public_key = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, languageW)) + else if (xml_attr_cmp(&attr, languageW)) { - DPRINT("Unsupported yet language attribute (%.*S)\n", - attr_value.len, attr_value.ptr); - if (!(ai->language = xmlstrdupW(&attr_value))) return FALSE; - } - else - { - attr_nameU = xmlstr2unicode(&attr_name); - attr_valueU = xmlstr2unicode(&attr_value); - DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); + if (!(ai->language = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } } - if (error || end) return end; - return parse_expect_end_elem(xmlbuf, assemblyIdentityW, asmv1W); + if (!end) parse_expect_end_elem(xmlbuf, parent); } static enum comclass_threadingmodel parse_com_class_threadingmodel(xmlstr_t *value) @@ -1554,109 +1657,97 @@ static BOOL com_class_add_progid(const xmlstr_t *progid, struct entity *entity) return TRUE; } -static BOOL parse_com_class_progid(xmlbuf_t* xmlbuf, struct entity *entity) +static void parse_com_class_progid(xmlbuf_t *xmlbuf, struct entity *entity, const struct xml_elem *parent) { xmlstr_t content; BOOL end = FALSE; - if (!parse_expect_no_attr(xmlbuf, &end) || end || !parse_text_content(xmlbuf, &content)) - return FALSE; + parse_expect_no_attr(xmlbuf, &end); + if (end) set_error( xmlbuf ); + if (!parse_text_content(xmlbuf, &content)) return; - if (!com_class_add_progid(&content, entity)) return FALSE; - return parse_expect_end_elem(xmlbuf, progidW, asmv1W); + if (!com_class_add_progid(&content, entity)) set_error( xmlbuf ); + parse_expect_end_elem(xmlbuf, parent); } -static BOOL parse_com_class_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll, struct actctx_loader *acl) +static void parse_com_class_elem( xmlbuf_t *xmlbuf, struct dll_redirect *dll, struct actctx_loader *acl, + const struct xml_elem *parent ) { - xmlstr_t elem, attr_name, attr_value; - BOOL ret = TRUE, end = FALSE, error; + struct xml_elem elem; + struct xml_attr attr; + BOOL end = FALSE; struct entity* entity; - UNICODE_STRING attr_valueU, attr_nameU; if (!(entity = add_entity(&dll->entities, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION))) - return FALSE; + { + set_error( xmlbuf ); + return; + } - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + while (next_xml_attr(xmlbuf, &attr, &end)) { - if (xmlstr_cmp(&attr_name, clsidW)) + if (xml_attr_cmp(&attr, clsidW)) { - if (!(entity->u.comclass.clsid = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.comclass.clsid = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, progidW)) + else if (xml_attr_cmp(&attr, progidW)) { - if (!(entity->u.comclass.progid = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.comclass.progid = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, tlbidW)) + else if (xml_attr_cmp(&attr, tlbidW)) { - if (!(entity->u.comclass.tlbid = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.comclass.tlbid = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, threadingmodelW)) + else if (xml_attr_cmp(&attr, threadingmodelW)) { - entity->u.comclass.model = parse_com_class_threadingmodel(&attr_value); + entity->u.comclass.model = parse_com_class_threadingmodel(&attr.value); } - else if (xmlstr_cmp(&attr_name, miscstatusW)) + else if (xml_attr_cmp(&attr, miscstatusW)) { - entity->u.comclass.miscstatus = parse_com_class_misc(&attr_value); + entity->u.comclass.miscstatus = parse_com_class_misc(&attr.value); } - else if (xmlstr_cmp(&attr_name, miscstatuscontentW)) + else if (xml_attr_cmp(&attr, miscstatuscontentW)) { - entity->u.comclass.miscstatuscontent = parse_com_class_misc(&attr_value); + entity->u.comclass.miscstatuscontent = parse_com_class_misc(&attr.value); } - else if (xmlstr_cmp(&attr_name, miscstatusthumbnailW)) + else if (xml_attr_cmp(&attr, miscstatusthumbnailW)) { - entity->u.comclass.miscstatusthumbnail = parse_com_class_misc(&attr_value); + entity->u.comclass.miscstatusthumbnail = parse_com_class_misc(&attr.value); } - else if (xmlstr_cmp(&attr_name, miscstatusiconW)) + else if (xml_attr_cmp(&attr, miscstatusiconW)) { - entity->u.comclass.miscstatusicon = parse_com_class_misc(&attr_value); + entity->u.comclass.miscstatusicon = parse_com_class_misc(&attr.value); } - else if (xmlstr_cmp(&attr_name, miscstatusdocprintW)) + else if (xml_attr_cmp(&attr, miscstatusdocprintW)) { - entity->u.comclass.miscstatusdocprint = parse_com_class_misc(&attr_value); + entity->u.comclass.miscstatusdocprint = parse_com_class_misc(&attr.value); } - else if (xmlstr_cmp(&attr_name, descriptionW)) + else if (xml_attr_cmp(&attr, descriptionW)) { /* not stored */ } - else - { - attr_nameU = xmlstr2unicode(&attr_name); - attr_valueU = xmlstr2unicode(&attr_value); - DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); - } } - if (error) return FALSE; - acl->actctx->sections |= SERVERREDIRECT_SECTION; if (entity->u.comclass.progid) acl->actctx->sections |= PROGIDREDIRECT_SECTION; - if (end) return TRUE; + if (end) return; - while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + while (next_xml_elem(xmlbuf, &elem, parent)) { - if (xmlstr_cmp_end(&elem, comClassW)) + if (xml_elem_cmp(&elem, progidW, asmv1W)) { - ret = parse_end_element(xmlbuf); - break; - } - else if (xmlstr_cmp(&elem, progidW)) - { - ret = parse_com_class_progid(xmlbuf, entity); + parse_com_class_progid(xmlbuf, entity, &elem); } else { - attr_nameU = xmlstr2unicode(&elem); - DPRINT1("unknown elem %wZ\n", &attr_nameU); - ret = parse_unknown_elem(xmlbuf, &elem); + parse_unknown_elem(xmlbuf, &elem); } } if (entity->u.comclass.progids.num) acl->actctx->sections |= PROGIDREDIRECT_SECTION; - - return ret; } static BOOL parse_nummethods(const xmlstr_t *str, struct entity *entity) @@ -1670,8 +1761,7 @@ static BOOL parse_nummethods(const xmlstr_t *str, struct entity *entity) num = num * 10 + *curr - '0'; else { - UNICODE_STRING strU = xmlstr2unicode(str); - DPRINT1("wrong numeric value %wZ\n", &strU); + // DPRINT1("wrong numeric value %wZ\n", &strU); return FALSE; } } @@ -1680,57 +1770,87 @@ static BOOL parse_nummethods(const xmlstr_t *str, struct entity *entity) return TRUE; } -static BOOL parse_cominterface_proxy_stub_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll, struct actctx_loader* acl) +static void parse_add_interface_class( xmlbuf_t *xmlbuf, struct entity_array *entities, + struct actctx_loader *acl, WCHAR *clsid ) { - xmlstr_t attr_name, attr_value; - BOOL end = FALSE, error; - struct entity* entity; - UNICODE_STRING attr_valueU, attr_nameU; + struct entity *entity; + WCHAR *str; + + if (!clsid) return; + + if (!(str = strdupW(clsid))) + { + set_error( xmlbuf ); + return; + } + + if (!(entity = add_entity(entities, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION))) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, str); + set_error( xmlbuf ); + return; + } + + entity->u.comclass.clsid = str; + entity->u.comclass.model = ThreadingModel_Both; + + acl->actctx->sections |= SERVERREDIRECT_SECTION; +} + +static void parse_cominterface_proxy_stub_elem( xmlbuf_t *xmlbuf, struct dll_redirect *dll, + struct actctx_loader *acl, const struct xml_elem *parent ) +{ + WCHAR *psclsid = NULL; + struct entity *entity; + struct xml_attr attr; + BOOL end = FALSE; if (!(entity = add_entity(&dll->entities, ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION))) - return FALSE; + { + set_error( xmlbuf ); + return; + } - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + while (next_xml_attr(xmlbuf, &attr, &end)) { - if (xmlstr_cmp(&attr_name, iidW)) + if (xml_attr_cmp(&attr, iidW)) { - if (!(entity->u.ifaceps.iid = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.ifaceps.iid = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, g_nameW)) + else if (xml_attr_cmp(&attr, g_nameW)) { - if (!(entity->u.ifaceps.name = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.ifaceps.name = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, baseInterfaceW)) + else if (xml_attr_cmp(&attr, baseInterfaceW)) { - if (!(entity->u.ifaceps.base = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.ifaceps.base = xmlstrdupW(&attr.value))) set_error( xmlbuf ); entity->u.ifaceps.mask |= BaseIface; } - else if (xmlstr_cmp(&attr_name, nummethodsW)) + else if (xml_attr_cmp(&attr, nummethodsW)) { - if (!(parse_nummethods(&attr_value, entity))) return FALSE; + if (!(parse_nummethods(&attr.value, entity))) set_error( xmlbuf ); entity->u.ifaceps.mask |= NumMethods; } - else if (xmlstr_cmp(&attr_name, tlbidW)) + else if (xml_attr_cmp(&attr, tlbidW)) { - if (!(entity->u.ifaceps.tlib = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.ifaceps.tlib = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - /* not used */ - else if (xmlstr_cmp(&attr_name, proxyStubClsid32W) || xmlstr_cmp(&attr_name, threadingmodelW)) + else if (xml_attr_cmp(&attr, proxyStubClsid32W)) { + if (!(psclsid = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else + /* not used */ + else if (xml_attr_cmp(&attr, threadingmodelW)) { - attr_nameU = xmlstr2unicode(&attr_name); - attr_valueU = xmlstr2unicode(&attr_value); - DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); } } - if (error) return FALSE; acl->actctx->sections |= IFACEREDIRECT_SECTION; - if (end) return TRUE; + if (!end) parse_expect_end_elem(xmlbuf, parent); + + parse_add_interface_class(xmlbuf, &dll->entities, acl, psclsid ? psclsid : entity->u.ifaceps.iid); - return parse_expect_end_elem(xmlbuf, comInterfaceProxyStubW, asmv1W); + RtlFreeHeap(RtlGetProcessHeap(), 0, psclsid); } static BOOL parse_typelib_flags(const xmlstr_t *value, struct entity *entity) @@ -1757,8 +1877,7 @@ static BOOL parse_typelib_flags(const xmlstr_t *value, struct entity *entity) *flags |= LIBFLAG_FHASDISKIMAGE; else { - UNICODE_STRING valueU = xmlstr2unicode(value); - DPRINT1("unknown flags value %wZ\n", &valueU); + // DPRINT1("unknown flags value %wZ\n", &valueU); return FALSE; } @@ -1775,7 +1894,6 @@ static BOOL parse_typelib_version(const xmlstr_t *str, struct entity *entity) unsigned int ver[2]; unsigned int pos; const WCHAR *curr; - UNICODE_STRING strW; /* major.minor */ ver[0] = ver[1] = pos = 0; @@ -1797,54 +1915,44 @@ static BOOL parse_typelib_version(const xmlstr_t *str, struct entity *entity) return TRUE; error: - strW = xmlstr2unicode(str); - DPRINT1("FIXME: wrong typelib version value (%wZ)\n", &strW); return FALSE; } -static BOOL parse_typelib_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll, struct actctx_loader* acl) +static void parse_typelib_elem( xmlbuf_t *xmlbuf, struct dll_redirect *dll, + struct actctx_loader *acl, const struct xml_elem *parent ) { - xmlstr_t attr_name, attr_value; - BOOL end = FALSE, error; + struct xml_attr attr; + BOOL end = FALSE; struct entity* entity; - UNICODE_STRING attr_valueU, attr_nameU; if (!(entity = add_entity(&dll->entities, ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION))) - return FALSE; + { + set_error( xmlbuf ); + return; + } - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + while (next_xml_attr(xmlbuf, &attr, &end)) { - if (xmlstr_cmp(&attr_name, tlbidW)) + if (xml_attr_cmp(&attr, tlbidW)) { - if (!(entity->u.typelib.tlbid = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.typelib.tlbid = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, versionW)) + else if (xml_attr_cmp(&attr, versionW)) { - if (!parse_typelib_version(&attr_value, entity)) return FALSE; + if (!parse_typelib_version(&attr.value, entity)) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, helpdirW)) + else if (xml_attr_cmp(&attr, helpdirW)) { - if (!(entity->u.typelib.helpdir = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.typelib.helpdir = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, flagsW)) + else if (xml_attr_cmp(&attr, flagsW)) { - if (!parse_typelib_flags(&attr_value, entity)) return FALSE; - } - else - { - attr_nameU = xmlstr2unicode(&attr_name); - attr_valueU = xmlstr2unicode(&attr_value); - DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); + if (!parse_typelib_flags(&attr.value, entity)) set_error( xmlbuf ); } } - if (error) return FALSE; - acl->actctx->sections |= TLIBREDIRECT_SECTION; - - if (end) return TRUE; - - return parse_expect_end_elem(xmlbuf, typelibW, asmv1W); + if (!end) parse_expect_end_elem(xmlbuf, parent); } static inline int aligned_string_len(int len) @@ -1862,595 +1970,533 @@ static int get_assembly_version(struct assembly *assembly, WCHAR *ret) return sprintfW(ret, fmtW, ver->major, ver->minor, ver->build, ver->revision); } -static BOOL parse_window_class_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll, struct actctx_loader* acl) +static void parse_window_class_elem( xmlbuf_t *xmlbuf, struct dll_redirect *dll, + struct actctx_loader *acl, const struct xml_elem *parent ) { - xmlstr_t elem, content, attr_name, attr_value; - BOOL end = FALSE, ret = TRUE, error; + struct xml_elem elem; + struct xml_attr attr; + xmlstr_t content; + BOOL end = FALSE; struct entity* entity; - UNICODE_STRING elemU, attr_nameU, attr_valueU; if (!(entity = add_entity(&dll->entities, ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION))) - return FALSE; - + { + set_error( xmlbuf ); + return; + } entity->u.class.versioned = TRUE; - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + while (next_xml_attr(xmlbuf, &attr, &end)) { - if (xmlstr_cmp(&attr_name, versionedW)) + if (xml_attr_cmp(&attr, versionedW)) { - if (xmlstr_cmpi(&attr_value, noW)) + if (xmlstr_cmpi(&attr.value, noW)) entity->u.class.versioned = FALSE; - else if (!xmlstr_cmpi(&attr_value, yesW)) - return FALSE; - } - else - { - attr_nameU = xmlstr2unicode(&attr_name); - attr_valueU = xmlstr2unicode(&attr_value); - DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); + else if (!xmlstr_cmpi(&attr.value, yesW)) + set_error( xmlbuf ); } } - if (error || end) return end; + if (end) return; - if (!parse_text_content(xmlbuf, &content)) return FALSE; - - if (!(entity->u.class.name = xmlstrdupW(&content))) return FALSE; + if (!parse_text_content(xmlbuf, &content)) return; + if (!(entity->u.class.name = xmlstrdupW(&content))) set_error( xmlbuf ); acl->actctx->sections |= WINDOWCLASS_SECTION; - while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + while (next_xml_elem(xmlbuf, &elem, parent)) { - if (xmlstr_cmp_end(&elem, windowClassW)) - { - ret = parse_end_element(xmlbuf); - break; - } - else - { - elemU = xmlstr2unicode(&elem); - DPRINT1("unknown elem %wZ\n", &elemU); - ret = parse_unknown_elem(xmlbuf, &elem); - } + parse_unknown_elem(xmlbuf, &elem); } - - return ret; } -static BOOL parse_binding_redirect_elem(xmlbuf_t* xmlbuf) +static void parse_binding_redirect_elem( xmlbuf_t *xmlbuf, const struct xml_elem *parent ) { - xmlstr_t attr_name, attr_value; - UNICODE_STRING attr_valueU, attr_nameU; - BOOL end = FALSE, error; + struct xml_attr attr; + BOOL end = FALSE; - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + while (next_xml_attr(xmlbuf, &attr, &end)) { - attr_nameU = xmlstr2unicode(&attr_name); - attr_valueU = xmlstr2unicode(&attr_value); - - if (xmlstr_cmp(&attr_name, oldVersionW)) + if (xml_attr_cmp(&attr, oldVersionW)) { - DPRINT1("Not stored yet oldVersion=%wZ\n", &attr_valueU); + // FIXME("Not stored yet %s\n", debugstr_xml_attr(&attr)); } - else if (xmlstr_cmp(&attr_name, newVersionW)) + else if (xml_attr_cmp(&attr, newVersionW)) { - DPRINT1("Not stored yet newVersion=%wZ\n", &attr_valueU); - } - else - { - DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); + // FIXME("Not stored yet %s\n", debugstr_xml_attr(&attr)); } } - if (error || end) return end; - return parse_expect_end_elem(xmlbuf, bindingRedirectW, asmv1W); + if (!end) parse_expect_end_elem(xmlbuf, parent); } -static BOOL parse_description_elem(xmlbuf_t* xmlbuf) +static void parse_description_elem( xmlbuf_t *xmlbuf, const struct xml_elem *parent ) { - xmlstr_t elem, content, attr_name, attr_value; - BOOL end = FALSE, ret = TRUE, error = FALSE; - - UNICODE_STRING elem1U, elem2U; - - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) - { - elem1U = xmlstr2unicode(&attr_name); - elem2U = xmlstr2unicode(&attr_value); - DPRINT1("unknown attr %s=%s\n", &elem1U, &elem2U); - } - - if (error) return FALSE; - if (end) return TRUE; + struct xml_elem elem; + struct xml_attr attr; + xmlstr_t content; + BOOL end = FALSE; - if (!parse_text_content(xmlbuf, &content)) - return FALSE; + while (next_xml_attr(xmlbuf, &attr, &end)); - elem1U = xmlstr2unicode(&content); - DPRINT("Got description %wZ\n", &elem1U); + if (end) return; + if (!parse_text_content(xmlbuf, &content)) return; - while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + while (next_xml_elem(xmlbuf, &elem, parent)) { - if (xmlstr_cmp_end(&elem, descriptionW)) - { - ret = parse_end_element(xmlbuf); - break; - } - else - { - elem1U = xmlstr2unicode(&elem); - DPRINT1("unknown elem %wZ\n", &elem1U); - ret = parse_unknown_elem(xmlbuf, &elem); - } + parse_unknown_elem(xmlbuf, &elem); } - - return ret; } -static BOOL parse_com_interface_external_proxy_stub_elem(xmlbuf_t* xmlbuf, +static void parse_com_interface_external_proxy_stub_elem(xmlbuf_t *xmlbuf, struct assembly* assembly, - struct actctx_loader* acl) + struct actctx_loader* acl, + const struct xml_elem *parent) { - xmlstr_t attr_name, attr_value; - UNICODE_STRING attr_nameU, attr_valueU; - BOOL end = FALSE, error; + struct xml_attr attr; + BOOL end = FALSE; struct entity* entity; - entity = add_entity(&assembly->entities, ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION); - if (!entity) return FALSE; + if (!(entity = add_entity(&assembly->entities, ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION))) + { + set_error( xmlbuf ); + return; + } - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + while (next_xml_attr(xmlbuf, &attr, &end)) { - if (xmlstr_cmp(&attr_name, iidW)) + if (xml_attr_cmp(&attr, iidW)) { - if (!(entity->u.ifaceps.iid = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.ifaceps.iid = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, g_nameW)) + else if (xml_attr_cmp(&attr, g_nameW)) { - if (!(entity->u.ifaceps.name = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.ifaceps.name = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, baseInterfaceW)) + else if (xml_attr_cmp(&attr, baseInterfaceW)) { - if (!(entity->u.ifaceps.base = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.ifaceps.base = xmlstrdupW(&attr.value))) set_error( xmlbuf ); entity->u.ifaceps.mask |= BaseIface; } - else if (xmlstr_cmp(&attr_name, nummethodsW)) + else if (xml_attr_cmp(&attr, nummethodsW)) { - if (!(parse_nummethods(&attr_value, entity))) return FALSE; + if (!(parse_nummethods(&attr.value, entity))) set_error( xmlbuf ); entity->u.ifaceps.mask |= NumMethods; } - else if (xmlstr_cmp(&attr_name, proxyStubClsid32W)) - { - if (!(entity->u.ifaceps.ps32 = xmlstrdupW(&attr_value))) return FALSE; - } - else if (xmlstr_cmp(&attr_name, tlbidW)) + else if (xml_attr_cmp(&attr, proxyStubClsid32W)) { - if (!(entity->u.ifaceps.tlib = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.ifaceps.ps32 = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else + else if (xml_attr_cmp(&attr, tlbidW)) { - attr_nameU = xmlstr2unicode(&attr_name); - attr_valueU = xmlstr2unicode(&attr_value); - DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); + if (!(entity->u.ifaceps.tlib = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } } - if (error) return FALSE; acl->actctx->sections |= IFACEREDIRECT_SECTION; - if (end) return TRUE; - - return parse_expect_end_elem(xmlbuf, comInterfaceExternalProxyStubW, asmv1W); + if (!end) parse_expect_end_elem(xmlbuf, parent); } -static BOOL parse_clr_class_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, struct actctx_loader *acl) +static void parse_clr_class_elem( xmlbuf_t* xmlbuf, struct assembly* assembly, + struct actctx_loader *acl, const struct xml_elem *parent ) + { - xmlstr_t attr_name, attr_value, elem; - BOOL end = FALSE, error, ret = TRUE; + struct xml_elem elem; + struct xml_attr attr; + BOOL end = FALSE; struct entity* entity; - entity = add_entity(&assembly->entities, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION); - if (!entity) return FALSE; + if (!(entity = add_entity(&assembly->entities, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION))) + { + set_error( xmlbuf ); + return; + } - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + while (next_xml_attr(xmlbuf, &attr, &end)) { - if (xmlstr_cmp(&attr_name, g_nameW)) + if (xml_attr_cmp(&attr, g_nameW)) { - if (!(entity->u.comclass.name = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.comclass.name = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, clsidW)) + else if (xml_attr_cmp(&attr, clsidW)) { - if (!(entity->u.comclass.clsid = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.comclass.clsid = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, progidW)) + else if (xml_attr_cmp(&attr, progidW)) { - if (!(entity->u.comclass.progid = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.comclass.progid = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, tlbidW)) + else if (xml_attr_cmp(&attr, tlbidW)) { - if (!(entity->u.comclass.tlbid = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.comclass.tlbid = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, threadingmodelW)) + else if (xml_attr_cmp(&attr, threadingmodelW)) { - entity->u.comclass.model = parse_com_class_threadingmodel(&attr_value); + entity->u.comclass.model = parse_com_class_threadingmodel(&attr.value); } - else if (xmlstr_cmp(&attr_name, runtimeVersionW)) + else if (xml_attr_cmp(&attr, runtimeVersionW)) { - if (!(entity->u.comclass.version = xmlstrdupW(&attr_value))) return FALSE; - } - else - { - UNICODE_STRING attr_nameU, attr_valueU; - attr_nameU = xmlstr2unicode(&attr_name); - attr_valueU = xmlstr2unicode(&attr_value); - DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); + if (!(entity->u.comclass.version = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } } - if (error) return FALSE; acl->actctx->sections |= SERVERREDIRECT_SECTION; if (entity->u.comclass.progid) acl->actctx->sections |= PROGIDREDIRECT_SECTION; - if (end) return TRUE; + if (end) return; - while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + while (next_xml_elem(xmlbuf, &elem, parent)) { - if (xmlstr_cmp_end(&elem, clrClassW)) - { - ret = parse_end_element(xmlbuf); - break; - } - else if (xmlstr_cmp(&elem, progidW)) + if (xml_elem_cmp(&elem, progidW, asmv1W)) { - ret = parse_com_class_progid(xmlbuf, entity); + parse_com_class_progid(xmlbuf, entity, &elem); } else { - UNICODE_STRING elemU = xmlstr2unicode(&elem); - DPRINT1("unknown elem %wZ\n", &elemU); - ret = parse_unknown_elem(xmlbuf, &elem); + parse_unknown_elem(xmlbuf, &elem); } } if (entity->u.comclass.progids.num) acl->actctx->sections |= PROGIDREDIRECT_SECTION; - - return ret; } -static BOOL parse_clr_surrogate_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, struct actctx_loader *acl) +static void parse_clr_surrogate_elem( xmlbuf_t *xmlbuf, struct assembly *assembly, + struct actctx_loader *acl, const struct xml_elem *parent ) { - xmlstr_t attr_name, attr_value; - UNICODE_STRING attr_nameU, attr_valueU; - BOOL end = FALSE, error; + struct xml_attr attr; + BOOL end = FALSE; struct entity* entity; - entity = add_entity(&assembly->entities, ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES); - if (!entity) return FALSE; + if (!(entity = add_entity(&assembly->entities, ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES))) + { + set_error( xmlbuf ); + return; + } - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + while (next_xml_attr(xmlbuf, &attr, &end)) { - if (xmlstr_cmp(&attr_name, g_nameW)) + if (xml_attr_cmp(&attr, g_nameW)) { - if (!(entity->u.clrsurrogate.name = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.clrsurrogate.name = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, clsidW)) + else if (xml_attr_cmp(&attr, clsidW)) { - if (!(entity->u.clrsurrogate.clsid = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.clrsurrogate.clsid = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, runtimeVersionW)) + else if (xml_attr_cmp(&attr, runtimeVersionW)) { - if (!(entity->u.clrsurrogate.version = xmlstrdupW(&attr_value))) return FALSE; - } - else - { - attr_nameU = xmlstr2unicode(&attr_name); - attr_valueU = xmlstr2unicode(&attr_value); - DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); + if (!(entity->u.clrsurrogate.version = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } } - if (error) return FALSE; acl->actctx->sections |= CLRSURROGATES_SECTION; - if (end) return TRUE; - - return parse_expect_end_elem(xmlbuf, clrSurrogateW, asmv1W); + if (!end) parse_expect_end_elem(xmlbuf, parent); } -static BOOL parse_dependent_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, BOOL optional) +static void parse_dependent_assembly_elem( xmlbuf_t *xmlbuf, struct actctx_loader *acl, + const struct xml_elem *parent, BOOL optional ) { + struct xml_elem elem; + struct xml_attr attr; struct assembly_identity ai; - xmlstr_t elem, attr_name, attr_value; - BOOL end = FALSE, error = FALSE, ret = TRUE, delayed = FALSE; + BOOL end = FALSE; - UNICODE_STRING elem1U, elem2U; + memset(&ai, 0, sizeof(ai)); + ai.optional = optional; - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + while (next_xml_attr(xmlbuf, &attr, &end)) { static const WCHAR allowDelayedBindingW[] = {'a','l','l','o','w','D','e','l','a','y','e','d','B','i','n','d','i','n','g',0}; static const WCHAR trueW[] = {'t','r','u','e',0}; - if (xmlstr_cmp(&attr_name, allowDelayedBindingW)) - delayed = xmlstr_cmp(&attr_value, trueW); - else - { - elem1U = xmlstr2unicode(&attr_name); - elem2U = xmlstr2unicode(&attr_value); - DPRINT1("unknown attr %s=%s\n", &elem1U, &elem2U); - } + if (xml_attr_cmp(&attr, allowDelayedBindingW)) + ai.delayed = xmlstr_cmp(&attr.value, trueW); } - if (error || end) return end; + if (end) return; - memset(&ai, 0, sizeof(ai)); - ai.optional = optional; - ai.delayed = delayed; - - if (!parse_expect_elem(xmlbuf, assemblyIdentityW, asmv1W) || - !parse_assembly_identity_elem(xmlbuf, acl->actctx, &ai)) - return FALSE; - - //TRACE( "adding name=%s version=%s arch=%s\n", debugstr_w(ai.name), debugstr_version(&ai.version), debugstr_w(ai.arch) ); - - /* store the newly found identity for later loading */ - if (!add_dependent_assembly_id(acl, &ai)) return FALSE; - - while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + while (next_xml_elem(xmlbuf, &elem, parent)) { - if (xmlstr_cmp_end(&elem, dependentAssemblyW)) + if (xml_elem_cmp(&elem, assemblyIdentityW, asmv1W)) { - ret = parse_end_element(xmlbuf); - break; + parse_assembly_identity_elem(xmlbuf, acl->actctx, &ai, &elem); + /* store the newly found identity for later loading */ + if (ai.arch && !wcscmp(ai.arch, wildcardW)) ai.arch = strdupW( current_archW ); + if (!add_dependent_assembly_id(acl, &ai)) set_error( xmlbuf ); } - else if (xmlstr_cmp(&elem, bindingRedirectW)) + else if (xml_elem_cmp(&elem, bindingRedirectW, asmv1W)) { - ret = parse_binding_redirect_elem(xmlbuf); + parse_binding_redirect_elem(xmlbuf, &elem); } else { - DPRINT1("unknown elem %S\n", elem.ptr); - ret = parse_unknown_elem(xmlbuf, &elem); + parse_unknown_elem(xmlbuf, &elem); } } - - return ret; } -static BOOL parse_dependency_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl) +static void parse_dependency_elem( xmlbuf_t *xmlbuf, struct actctx_loader *acl, + const struct xml_elem *parent ) + { - xmlstr_t attr_name, attr_value, elem; - UNICODE_STRING attr_nameU, attr_valueU; - BOOL end = FALSE, ret = TRUE, error, optional = FALSE; + struct xml_elem elem; + struct xml_attr attr; + BOOL end = FALSE, optional = FALSE; - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + while (next_xml_attr(xmlbuf, &attr, &end)) { - attr_nameU = xmlstr2unicode(&attr_name); - attr_valueU = xmlstr2unicode(&attr_value); - - if (xmlstr_cmp(&attr_name, optionalW)) + if (xml_attr_cmp(&attr, optionalW)) { - optional = xmlstr_cmpi( &attr_value, yesW ); - DPRINT1("optional=%wZ\n", &attr_valueU); - } - else - { - DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); + optional = xmlstr_cmpi( &attr.value, yesW ); } } - while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + while (next_xml_elem(xmlbuf, &elem, parent)) { - if (xmlstr_cmp_end(&elem, dependencyW)) - { - ret = parse_end_element(xmlbuf); - break; - } - else if (xmlstr_cmp(&elem, dependentAssemblyW)) + if (xml_elem_cmp(&elem, dependentAssemblyW, asmv1W)) { - ret = parse_dependent_assembly_elem(xmlbuf, acl, optional); + parse_dependent_assembly_elem(xmlbuf, acl, &elem, optional); } else { - attr_nameU = xmlstr2unicode(&elem); - DPRINT1("unknown element %wZ\n", &attr_nameU); - ret = parse_unknown_elem(xmlbuf, &elem); + parse_unknown_elem(xmlbuf, &elem); } } - - return ret; } -static BOOL parse_noinherit_elem(xmlbuf_t* xmlbuf) +static void parse_noinherit_elem( xmlbuf_t *xmlbuf, const struct xml_elem *parent ) { BOOL end = FALSE; - if (!parse_expect_no_attr(xmlbuf, &end)) return FALSE; - return end || parse_expect_end_elem(xmlbuf, noInheritW, asmv1W); + parse_expect_no_attr(xmlbuf, &end); + if (!end) parse_expect_end_elem(xmlbuf, parent); } -static BOOL parse_noinheritable_elem(xmlbuf_t* xmlbuf) +static void parse_noinheritable_elem( xmlbuf_t *xmlbuf, const struct xml_elem *parent ) { BOOL end = FALSE; - if (!parse_expect_no_attr(xmlbuf, &end)) return FALSE; - return end || parse_expect_end_elem(xmlbuf, noInheritableW, asmv1W); + parse_expect_no_attr(xmlbuf, &end); + if (!end) parse_expect_end_elem(xmlbuf, parent); } -static BOOL parse_file_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, struct actctx_loader* acl) +static void parse_file_elem( xmlbuf_t* xmlbuf, struct assembly* assembly, + struct actctx_loader* acl, const struct xml_elem *parent ) { - xmlstr_t attr_name, attr_value, elem; - UNICODE_STRING attr_nameU, attr_valueU; - BOOL end = FALSE, error, ret = TRUE; + struct xml_elem elem; + struct xml_attr attr; + BOOL end = FALSE; struct dll_redirect* dll; - if (!(dll = add_dll_redirect(assembly))) return FALSE; - - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + if (!(dll = add_dll_redirect(assembly))) { - attr_nameU = xmlstr2unicode(&attr_name); - attr_valueU = xmlstr2unicode(&attr_value); + set_error( xmlbuf ); + return; + } - if (xmlstr_cmp(&attr_name, g_nameW)) + while (next_xml_attr(xmlbuf, &attr, &end)) + { + if (xml_attr_cmp(&attr, g_nameW)) { - if (!(dll->name = xmlstrdupW(&attr_value))) return FALSE; - DPRINT("name=%wZ\n", &attr_valueU); + if (!(dll->name = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, hashW)) + else if (xml_attr_cmp(&attr, hashW)) { - if (!(dll->hash = xmlstrdupW(&attr_value))) return FALSE; + if (!(dll->hash = xmlstrdupW(&attr.value))) set_error( xmlbuf ); } - else if (xmlstr_cmp(&attr_name, hashalgW)) + else if (xml_attr_cmp(&attr, hashalgW)) { static const WCHAR sha1W[] = {'S','H','A','1',0}; - if (!xmlstr_cmpi(&attr_value, sha1W)) - DPRINT1("hashalg should be SHA1, got %wZ\n", &attr_valueU); - } - else - { - DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); + if (!xmlstr_cmpi(&attr.value, sha1W)) { + //FIXME("hashalg should be SHA1, got %s\n", debugstr_xmlstr(&attr.value)); + } } } - if (error || !dll->name) return FALSE; + if (!dll->name) set_error( xmlbuf ); acl->actctx->sections |= DLLREDIRECT_SECTION; - if (end) return TRUE; + if (end) return; - while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + while (next_xml_elem(xmlbuf, &elem, parent)) { - if (xmlstr_cmp_end(&elem, fileW)) + if (xml_elem_cmp(&elem, comClassW, asmv1W)) { - ret = parse_end_element(xmlbuf); - break; + parse_com_class_elem(xmlbuf, dll, acl, &elem); } - else if (xmlstr_cmp(&elem, comClassW)) + else if (xml_elem_cmp(&elem, comInterfaceProxyStubW, asmv1W)) { - ret = parse_com_class_elem(xmlbuf, dll, acl); - } - else if (xmlstr_cmp(&elem, comInterfaceProxyStubW)) - { - ret = parse_cominterface_proxy_stub_elem(xmlbuf, dll, acl); + parse_cominterface_proxy_stub_elem(xmlbuf, dll, acl, &elem); } else if (xml_elem_cmp(&elem, hashW, asmv2W)) { - DPRINT1("asmv2hash (undocumented) not supported\n"); - ret = parse_unknown_elem(xmlbuf, &elem); + parse_unknown_elem(xmlbuf, &elem); } - else if (xmlstr_cmp(&elem, typelibW)) + else if (xml_elem_cmp(&elem, typelibW, asmv1W)) { - ret = parse_typelib_elem(xmlbuf, dll, acl); + parse_typelib_elem(xmlbuf, dll, acl, &elem); } - else if (xmlstr_cmp(&elem, windowClassW)) + else if (xml_elem_cmp(&elem, windowClassW, asmv1W)) { - ret = parse_window_class_elem(xmlbuf, dll, acl); + parse_window_class_elem(xmlbuf, dll, acl, &elem); } else { - attr_nameU = xmlstr2unicode(&elem); - DPRINT1("unknown elem %wZ\n", &attr_nameU); - ret = parse_unknown_elem( xmlbuf, &elem ); + parse_unknown_elem( xmlbuf, &elem ); } } - - return ret; } -static BOOL parse_supportedos_elem(xmlbuf_t *xmlbuf, struct assembly *assembly, struct actctx_loader *acl) +static void parse_supportedos_elem( xmlbuf_t *xmlbuf, struct assembly *assembly, + struct actctx_loader *acl, const struct xml_elem *parent ) { - xmlstr_t attr_name, attr_value; - BOOL end = FALSE, error; + struct xml_attr attr; + BOOL end = FALSE; - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + while (next_xml_attr(xmlbuf, &attr, &end)) { - if (xmlstr_cmp(&attr_name, IdW)) + if (xml_attr_cmp(&attr, IdW)) { COMPATIBILITY_CONTEXT_ELEMENT *compat; UNICODE_STRING str; GUID compat_id; - str.Buffer = (PWSTR)attr_value.ptr; - str.Length = str.MaximumLength = (USHORT)attr_value.len * sizeof(WCHAR); + str.Buffer = (PWSTR)attr.value.ptr; + str.Length = str.MaximumLength = (USHORT)attr.value.len * sizeof(WCHAR); if (RtlGUIDFromString(&str, &compat_id) == STATUS_SUCCESS) { - if (!(compat = add_compat_context(assembly))) return FALSE; - compat->Type = ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS; + if (!(compat = add_compat_context(assembly))) + { + set_error( xmlbuf ); + return; + } + compat->Type = ACTCTX_COMPATIBILITY_ELEMENT_TYPE_OS; compat->Id = compat_id; } - else - { - UNICODE_STRING attr_valueU = xmlstr2unicode(&attr_value); - DPRINT1("Invalid guid %wZ\n", &attr_valueU); - } - } - else - { - UNICODE_STRING attr_nameU = xmlstr2unicode(&attr_name); - UNICODE_STRING attr_valueU = xmlstr2unicode(&attr_value); - DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); } } - if (error) return FALSE; - if (end) return TRUE; - - return parse_expect_end_elem(xmlbuf, supportedOSW, asmv1W); + if (!end) parse_expect_end_elem(xmlbuf, parent); } -static BOOL parse_compatibility_application_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, - struct actctx_loader* acl) +static void parse_compatibility_application_elem(xmlbuf_t *xmlbuf, struct assembly *assembly, + struct actctx_loader* acl, const struct xml_elem *parent) { - BOOL ret = TRUE; - xmlstr_t elem; + struct xml_elem elem; - while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + while (next_xml_elem(xmlbuf, &elem, parent)) { - if (xmlstr_cmp_end(&elem, applicationW)) + if (xml_elem_cmp(&elem, supportedOSW, compatibilityNSW)) { - ret = parse_end_element(xmlbuf); - break; + parse_supportedos_elem(xmlbuf, assembly, acl, &elem); } - else if (xmlstr_cmp(&elem, supportedOSW)) + else { - ret = parse_supportedos_elem(xmlbuf, assembly, acl); + parse_unknown_elem(xmlbuf, &elem); + } + } +} + +static void parse_compatibility_elem(xmlbuf_t *xmlbuf, struct assembly *assembly, + struct actctx_loader* acl, const struct xml_elem *parent) +{ + struct xml_elem elem; + + while (next_xml_elem(xmlbuf, &elem, parent)) + { + if (xml_elem_cmp(&elem, applicationW, compatibilityNSW)) + { + parse_compatibility_application_elem(xmlbuf, assembly, acl, &elem); } else { - UNICODE_STRING elemU = xmlstr2unicode(&elem); - DPRINT1("unknown elem %wZ\n", &elemU); - ret = parse_unknown_elem(xmlbuf, &elem); + parse_unknown_elem(xmlbuf, &elem); } } +} - return ret; +static void parse_settings_elem( xmlbuf_t *xmlbuf, struct assembly *assembly, struct actctx_loader *acl, + struct xml_elem *parent ) +{ + struct xml_elem elem; + struct xml_attr attr; + xmlstr_t content; + BOOL end = FALSE; + struct entity *entity; + + while (next_xml_attr( xmlbuf, &attr, &end )) + { + } + + if (end) return; + + if (!parse_text_content( xmlbuf, &content )) return; + + entity = add_entity( &assembly->entities, ACTIVATION_CONTEXT_SECTION_APPLICATION_SETTINGS ); + if (!entity) + { + set_error( xmlbuf ); + return; + } + entity->u.settings.name = xmlstrdupW( &parent->name ); + entity->u.settings.value = xmlstrdupW( &content ); + entity->u.settings.ns = xmlstrdupW( &parent->ns ); + + while (next_xml_elem(xmlbuf, &elem, parent)) + { + parse_unknown_elem( xmlbuf, &elem ); + } } -static BOOL parse_compatibility_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, - struct actctx_loader* acl) +static void parse_windows_settings_elem( xmlbuf_t *xmlbuf, struct assembly *assembly, + struct actctx_loader *acl, const struct xml_elem *parent ) { - xmlstr_t elem; - BOOL ret = TRUE; + struct xml_elem elem; - while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + while (next_xml_elem( xmlbuf, &elem, parent )) { - if (xmlstr_cmp_end(&elem, compatibilityW)) + if (xml_elem_cmp( &elem, autoElevateW, windowsSettings2005NSW ) || + xml_elem_cmp( &elem, disableThemingW, windowsSettings2005NSW ) || + xml_elem_cmp( &elem, disableWindowFilteringW, windowsSettings2011NSW ) || + xml_elem_cmp( &elem, dpiAwareW, windowsSettings2005NSW ) || + xml_elem_cmp( &elem, dpiAwarenessW, windowsSettings2016NSW ) || + xml_elem_cmp( &elem, gdiScalingW, windowsSettings2017NSW ) || + xml_elem_cmp( &elem, highResolutionScrollingAwareW, windowsSettings2017NSW ) || + xml_elem_cmp( &elem, longPathAwareW, windowsSettings2016NSW ) || + xml_elem_cmp( &elem, magicFutureSettingW, windowsSettings2017NSW ) || + xml_elem_cmp( &elem, printerDriverIsolationW, windowsSettings2011NSW ) || + xml_elem_cmp( &elem, ultraHighResolutionScrollingAwareW, windowsSettings2017NSW )) { - ret = parse_end_element(xmlbuf); - break; + parse_settings_elem( xmlbuf, assembly, acl, &elem ); } - else if (xmlstr_cmp(&elem, applicationW)) + else { - ret = parse_compatibility_application_elem(xmlbuf, assembly, acl); + parse_unknown_elem( xmlbuf, &elem ); + } + } +} + +static void parse_application_elem( xmlbuf_t *xmlbuf, struct assembly *assembly, + struct actctx_loader *acl, const struct xml_elem *parent ) +{ + struct xml_elem elem; + + while (next_xml_elem( xmlbuf, &elem, parent )) + { + if (xml_elem_cmp( &elem, windowsSettingsW, asmv3W )) + { + parse_windows_settings_elem( xmlbuf, assembly, acl, &elem ); } else { - UNICODE_STRING elemU = xmlstr2unicode(&elem); - DPRINT1("unknown elem %wZ\n", &elemU); - ret = parse_unknown_elem(xmlbuf, &elem); + parse_unknown_elem( xmlbuf, &elem ); } } - return ret; } -static BOOL parse_requested_execution_level_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, struct actctx_loader *acl) +static void parse_requested_execution_level_elem( xmlbuf_t *xmlbuf, struct assembly *assembly, + struct actctx_loader *acl, const struct xml_elem *parent ) { static const WCHAR levelW[] = {'l','e','v','e','l',0}; static const WCHAR asInvokerW[] = {'a','s','I','n','v','o','k','e','r',0}; @@ -2460,250 +2506,172 @@ static BOOL parse_requested_execution_level_elem(xmlbuf_t* xmlbuf, struct assemb static const WCHAR falseW[] = {'f','a','l','s','e',0}; static const WCHAR trueW[] = {'t','r','u','e',0}; - xmlstr_t attr_name, attr_value, elem; - BOOL end = FALSE, ret = TRUE, error; + struct xml_elem elem; + struct xml_attr attr; + BOOL end = FALSE; /* Multiple requestedExecutionLevel elements are not supported. */ - if (assembly->run_level != ACTCTX_RUN_LEVEL_UNSPECIFIED) - return FALSE; + if (assembly->run_level != ACTCTX_RUN_LEVEL_UNSPECIFIED) set_error( xmlbuf ); - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + while (next_xml_attr(xmlbuf, &attr, &end)) { - UNICODE_STRING attr_nameU = xmlstr2unicode(&attr_name); - UNICODE_STRING attr_valueU = xmlstr2unicode(&attr_value); - if (xmlstr_cmp(&attr_name, levelW)) + if (xml_attr_cmp(&attr, levelW)) { - if (xmlstr_cmpi(&attr_value, asInvokerW)) + if (xmlstr_cmpi(&attr.value, asInvokerW)) assembly->run_level = ACTCTX_RUN_LEVEL_AS_INVOKER; - else if (xmlstr_cmpi(&attr_value, highestAvailableW)) + else if (xmlstr_cmpi(&attr.value, highestAvailableW)) assembly->run_level = ACTCTX_RUN_LEVEL_HIGHEST_AVAILABLE; - else if (xmlstr_cmpi(&attr_value, requireAdministratorW)) + else if (xmlstr_cmpi(&attr.value, requireAdministratorW)) assembly->run_level = ACTCTX_RUN_LEVEL_REQUIRE_ADMIN; - else - DPRINT1("unknown execution level: %wZ\n", &attr_valueU); } - else if (xmlstr_cmp(&attr_name, uiAccessW)) + else if (xml_attr_cmp(&attr, uiAccessW)) { - if (xmlstr_cmpi(&attr_value, falseW)) + if (xmlstr_cmpi(&attr.value, falseW)) assembly->ui_access = FALSE; - else if (xmlstr_cmpi(&attr_value, trueW)) + else if (xmlstr_cmpi(&attr.value, trueW)) assembly->ui_access = TRUE; - else - DPRINT1("unknown uiAccess value: %wZ\n", &attr_valueU); } - else - DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); } - if (error) return FALSE; - if (end) return TRUE; + if (end) return; - while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + while (next_xml_elem(xmlbuf, &elem, parent)) { - if (xml_elem_cmp_end(&elem, requestedExecutionLevelW, asmv2W)) - { - ret = parse_end_element(xmlbuf); - break; - } - else - { - UNICODE_STRING elemU = xmlstr2unicode(&elem); - DPRINT1("unknown element %wZ\n", &elemU); - ret = parse_unknown_elem(xmlbuf, &elem); - } + parse_unknown_elem(xmlbuf, &elem); } - - return ret; } -static BOOL parse_requested_privileges_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, struct actctx_loader *acl) +static void parse_requested_privileges_elem( xmlbuf_t *xmlbuf, struct assembly *assembly, + struct actctx_loader *acl, const struct xml_elem *parent ) { - xmlstr_t elem; - BOOL ret = TRUE; + struct xml_elem elem; - while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + while (next_xml_elem(xmlbuf, &elem, parent)) { - if (xml_elem_cmp_end(&elem, requestedPrivilegesW, asmv2W)) + if (xml_elem_cmp(&elem, requestedExecutionLevelW, asmv1W)) { - ret = parse_end_element(xmlbuf); - break; + parse_requested_execution_level_elem(xmlbuf, assembly, acl, &elem); } - else if (xml_elem_cmp(&elem, requestedExecutionLevelW, asmv2W)) - ret = parse_requested_execution_level_elem(xmlbuf, assembly, acl); else { - UNICODE_STRING elemU = xmlstr2unicode(&elem); - DPRINT1("unknown elem %wZ\n", &elemU); - ret = parse_unknown_elem(xmlbuf, &elem); + parse_unknown_elem(xmlbuf, &elem); } } - - return ret; } -static BOOL parse_security_elem(xmlbuf_t *xmlbuf, struct assembly *assembly, struct actctx_loader *acl) +static void parse_security_elem( xmlbuf_t *xmlbuf, struct assembly *assembly, + struct actctx_loader *acl, const struct xml_elem *parent ) { - xmlstr_t elem; - BOOL ret = TRUE; + struct xml_elem elem; - while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + while (next_xml_elem(xmlbuf, &elem, parent)) { - if (xml_elem_cmp_end(&elem, securityW, asmv2W)) + if (xml_elem_cmp(&elem, requestedPrivilegesW, asmv1W)) { - ret = parse_end_element(xmlbuf); - break; + parse_requested_privileges_elem(xmlbuf, assembly, acl, &elem); } - else if (xml_elem_cmp(&elem, requestedPrivilegesW, asmv2W)) - ret = parse_requested_privileges_elem(xmlbuf, assembly, acl); else { - UNICODE_STRING elemU = xmlstr2unicode(&elem); - DPRINT1("unknown elem %wZ\n", &elemU); - ret = parse_unknown_elem(xmlbuf, &elem); + parse_unknown_elem(xmlbuf, &elem); } } - - return ret; } -static BOOL parse_trust_info_elem(xmlbuf_t *xmlbuf, struct assembly *assembly, struct actctx_loader *acl) +static void parse_trust_info_elem( xmlbuf_t *xmlbuf, struct assembly *assembly, + struct actctx_loader *acl, const struct xml_elem *parent ) { - xmlstr_t elem; - BOOL ret = TRUE; + struct xml_elem elem; - while (ret && (ret = next_xml_elem(xmlbuf, &elem))) + while (next_xml_elem(xmlbuf, &elem, parent)) { - if (xml_elem_cmp_end(&elem, trustInfoW, asmv2W)) + if (xml_elem_cmp(&elem, securityW, asmv1W)) { - ret = parse_end_element(xmlbuf); - break; + parse_security_elem(xmlbuf, assembly, acl, &elem); } - else if (xml_elem_cmp(&elem, securityW, asmv2W)) - ret = parse_security_elem(xmlbuf, assembly, acl); else { - UNICODE_STRING elemU = xmlstr2unicode(&elem); - DPRINT1("unknown elem %wZ\n", &elemU); - ret = parse_unknown_elem(xmlbuf, &elem); + parse_unknown_elem(xmlbuf, &elem); } } - - return ret; } -static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, - struct assembly* assembly, - struct assembly_identity* expected_ai) +static void parse_assembly_elem( xmlbuf_t *xmlbuf, struct assembly* assembly, + struct actctx_loader* acl, const struct xml_elem *parent, + struct assembly_identity* expected_ai) { - xmlstr_t attr_name, attr_value, elem; - UNICODE_STRING attr_nameU, attr_valueU; - BOOL end = FALSE, error, version = FALSE, xmlns = FALSE, ret = TRUE; + struct xml_elem elem; + struct xml_attr attr; + BOOL end = FALSE, version = FALSE; - DPRINT("(%p)\n", xmlbuf); - - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + while (next_xml_attr(xmlbuf, &attr, &end)) { - attr_nameU = xmlstr2unicode(&attr_name); - attr_valueU = xmlstr2unicode(&attr_value); - - if (xmlstr_cmp(&attr_name, manifestVersionW)) + if (xml_attr_cmp(&attr, manifestVersionW)) { static const WCHAR v10W[] = {'1','.','0',0}; - if (!xmlstr_cmp(&attr_value, v10W)) + if (!xmlstr_cmp(&attr.value, v10W)) { - DPRINT1("wrong version %wZ\n", &attr_valueU); - return FALSE; + break; } version = TRUE; } - else if (xmlstr_cmp(&attr_name, xmlnsW)) - { - if (!xmlstr_cmp(&attr_value, manifestv1W) && - !xmlstr_cmp(&attr_value, manifestv2W) && - !xmlstr_cmp(&attr_value, manifestv3W)) - { - DPRINT1("wrong namespace %wZ\n", &attr_valueU); - return FALSE; - } - xmlns = TRUE; - } - else - { - DPRINT1("unknown attr %wZ=%wZ\n", &attr_nameU, &attr_valueU); - } } - if (error || end || !xmlns || !version) return FALSE; - if (!next_xml_elem(xmlbuf, &elem)) return FALSE; - - if (assembly->type == APPLICATION_MANIFEST && xmlstr_cmp(&elem, noInheritW)) + if (end || !version) { - if (!parse_noinherit_elem(xmlbuf) || !next_xml_elem(xmlbuf, &elem)) - return FALSE; - assembly->no_inherit = TRUE; + set_error( xmlbuf ); + return; } - if (xml_elem_cmp(&elem, noInheritableW, asmv1W)) + while (next_xml_elem(xmlbuf, &elem, parent)) { - if (!parse_noinheritable_elem(xmlbuf) || !next_xml_elem(xmlbuf, &elem)) - return FALSE; - } - else if ((assembly->type == ASSEMBLY_MANIFEST || assembly->type == ASSEMBLY_SHARED_MANIFEST) && - assembly->no_inherit) - return FALSE; - - while (ret) - { - if (xml_elem_cmp_end(&elem, assemblyW, asmv1W)) + if (assembly->type == APPLICATION_MANIFEST && xml_elem_cmp(&elem, noInheritW, asmv1W)) { - ret = parse_end_element(xmlbuf); - break; + parse_noinherit_elem(xmlbuf, &elem); + assembly->no_inherit = TRUE; + } + else if (xml_elem_cmp(&elem, noInheritableW, asmv1W)) + { + parse_noinheritable_elem(xmlbuf, &elem); } else if (xml_elem_cmp(&elem, descriptionW, asmv1W)) { - ret = parse_description_elem(xmlbuf); + parse_description_elem(xmlbuf, &elem); } else if (xml_elem_cmp(&elem, comInterfaceExternalProxyStubW, asmv1W)) { - ret = parse_com_interface_external_proxy_stub_elem(xmlbuf, assembly, acl); + parse_com_interface_external_proxy_stub_elem(xmlbuf, assembly, acl, &elem); } else if (xml_elem_cmp(&elem, dependencyW, asmv1W)) { - ret = parse_dependency_elem(xmlbuf, acl); + parse_dependency_elem(xmlbuf, acl, &elem); } else if (xml_elem_cmp(&elem, fileW, asmv1W)) { - ret = parse_file_elem(xmlbuf, assembly, acl); + parse_file_elem(xmlbuf, assembly, acl, &elem); } else if (xml_elem_cmp(&elem, clrClassW, asmv1W)) { - ret = parse_clr_class_elem(xmlbuf, assembly, acl); + parse_clr_class_elem(xmlbuf, assembly, acl, &elem); } else if (xml_elem_cmp(&elem, clrSurrogateW, asmv1W)) { - ret = parse_clr_surrogate_elem(xmlbuf, assembly, acl); + parse_clr_surrogate_elem(xmlbuf, assembly, acl, &elem); } - else if (xml_elem_cmp(&elem, trustInfoW, asmv2W) || - xml_elem_cmp(&elem, trustInfoW, asmv1W)) + else if (xml_elem_cmp(&elem, trustInfoW, asmv1W)) { - ret = parse_trust_info_elem(xmlbuf, assembly, acl); + parse_trust_info_elem(xmlbuf, assembly, acl, &elem); } else if (xml_elem_cmp(&elem, assemblyIdentityW, asmv1W)) { - if (!parse_assembly_identity_elem(xmlbuf, acl->actctx, &assembly->id)) return FALSE; + parse_assembly_identity_elem(xmlbuf, acl->actctx, &assembly->id, &elem); - if (expected_ai) + if (!xmlbuf->error && expected_ai) { /* FIXME: more tests */ if (assembly->type == ASSEMBLY_MANIFEST && memcmp(&assembly->id.version, &expected_ai->version, sizeof(assembly->id.version))) { - DPRINT1("wrong version for assembly manifest: %u.%u.%u.%u / %u.%u.%u.%u\n", - expected_ai->version.major, expected_ai->version.minor, - expected_ai->version.build, expected_ai->version.revision, - assembly->id.version.major, assembly->id.version.minor, - assembly->id.version.build, assembly->id.version.revision); - ret = FALSE; + set_error( xmlbuf ); } else if (assembly->type == ASSEMBLY_SHARED_MANIFEST && (assembly->id.version.major != expected_ai->version.major || @@ -2712,62 +2680,64 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, (assembly->id.version.build == expected_ai->version.build && assembly->id.version.revision < expected_ai->version.revision))) { - DPRINT1("wrong version for shared assembly manifest\n"); - ret = FALSE; + set_error( xmlbuf ); } } } else if (xml_elem_cmp(&elem, compatibilityW, compatibilityNSW)) { - ret = parse_compatibility_elem(xmlbuf, assembly, acl); + parse_compatibility_elem(xmlbuf, assembly, acl, &elem); + } + else if (xml_elem_cmp(&elem, applicationW, asmv3W)) + { + parse_application_elem(xmlbuf, assembly, acl, &elem); } else { - attr_nameU = xmlstr2unicode(&elem); - DPRINT1("unknown element %wZ\n", &attr_nameU); - ret = parse_unknown_elem(xmlbuf, &elem); + parse_unknown_elem(xmlbuf, &elem); } - if (ret) ret = next_xml_elem(xmlbuf, &elem); } - return ret; + if ((assembly->type == ASSEMBLY_MANIFEST || assembly->type == ASSEMBLY_SHARED_MANIFEST) && + assembly->no_inherit) + { + set_error( xmlbuf ); + } } static NTSTATUS parse_manifest_buffer( struct actctx_loader* acl, struct assembly *assembly, struct assembly_identity* ai, xmlbuf_t *xmlbuf ) { - xmlstr_t elem; - UNICODE_STRING elemU; + struct xml_elem elem; + struct xml_elem parent = {0}; + + xmlbuf->error = FALSE; + xmlbuf->ns_pos = 0; - if (!next_xml_elem(xmlbuf, &elem)) return STATUS_SXS_CANT_GEN_ACTCTX; + if (!next_xml_elem(xmlbuf, &elem, &parent)) return STATUS_SXS_CANT_GEN_ACTCTX; - if (xmlstr_cmp(&elem, g_xmlW) && - (!parse_xml_header(xmlbuf) || !next_xml_elem(xmlbuf, &elem))) + if (xmlstr_cmp(&elem.name, g_xmlW) && + (!parse_xml_header(xmlbuf) || !next_xml_elem(xmlbuf, &elem, &parent))) return STATUS_SXS_CANT_GEN_ACTCTX; if (!xml_elem_cmp(&elem, assemblyW, asmv1W)) { - elemU = xmlstr2unicode(&elem); - DPRINT1("root element is %wZ, not <assembly>\n", &elemU); return STATUS_SXS_CANT_GEN_ACTCTX; } - if (!parse_assembly_elem(xmlbuf, acl, assembly, ai)) + parse_assembly_elem(xmlbuf, assembly, acl, &elem, ai); + if (xmlbuf->error) { - DPRINT1("failed to parse manifest %S\n", assembly->manifest.info ); return STATUS_SXS_CANT_GEN_ACTCTX; } - if (next_xml_elem(xmlbuf, &elem)) + if (next_xml_elem(xmlbuf, &elem, &parent)) { - elemU = xmlstr2unicode(&elem); - DPRINT1("unexpected element %wZ\n", &elemU); return STATUS_SXS_CANT_GEN_ACTCTX; } if (xmlbuf->ptr != xmlbuf->end) { - DPRINT1("parse error\n"); return STATUS_SXS_CANT_GEN_ACTCTX; } return STATUS_SUCCESS; @@ -3572,7 +3542,7 @@ static struct string_index *find_string_index(const struct strsection_header *se { const WCHAR *nameW = (WCHAR*)((BYTE*)section + iter->name_offset); - if (!_wcsnicmp(nameW, name->Buffer, name->Length / sizeof(WCHAR)) && + if (!_wcsnicmp(nameW, name->Buffer, name->Length / sizeof(WCHAR)) && wcslen(nameW) == name->Length / sizeof(WCHAR)) { index = iter; @@ -5714,7 +5684,7 @@ RtlpFindActivationContextSection_CheckParameters( ULONG flags, const GUID *guid, const UNICODE_STRING *section_name, PACTCTX_SECTION_KEYED_DATA data ) { /* Check general parameter combinations */ - if (!section_name || !section_name->Buffer || + if (!section_name || !section_name->Buffer || (flags & ~FIND_ACTCTX_VALID_MASK) || ((flags & FIND_ACTCTX_VALID_MASK) && !data) || (data && data->cbSize < offsetof(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex)))

4 years, 8 months

1
0
0 0

[reactos] 01/01: [RAPPS] Use `RegDeleteKeyExW` for deleting the apps strings from registry only if it is available in advapi32 Otherwise, use `RegDeleteKeyW` instead, on Windows versions whose don't have the Ex function (XP SP3 x32, Server 2003 SP0 and earlier). It will fix regression with Rapps startup there, due to that missing function. CORE-17264

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b62948ef774538fb5066e… commit b62948ef774538fb5066e88c3b92ce2010bd842c Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Wed Sep 16 17:54:20 2020 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 20 19:23:06 2020 +0200 [RAPPS] Use `RegDeleteKeyExW` for deleting the apps strings from registry only if it is available in advapi32 Otherwise, use `RegDeleteKeyW` instead, on Windows versions whose don't have the Ex function (XP SP3 x32, Server 2003 SP0 and earlier). It will fix regression with Rapps startup there, due to that missing function. CORE-17264 --- base/applications/rapps/installed.cpp | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/base/applications/rapps/installed.cpp b/base/applications/rapps/installed.cpp index 4179334a60a..5296c3fc6ae 100644 --- a/base/applications/rapps/installed.cpp +++ b/base/applications/rapps/installed.cpp @@ -141,16 +141,34 @@ BOOL CInstalledApplicationInfo::UninstallApplication(BOOL bModify) return StartProcess(bModify ? szModifyPath : szUninstallString, TRUE); } +typedef LSTATUS (WINAPI *RegDeleteKeyExWProc)(HKEY, LPCWSTR, REGSAM, DWORD); + LSTATUS CInstalledApplicationInfo::RemoveFromRegistry() { ATL::CStringW szFullName = L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\" + szKeyName; + HMODULE hMod = GetModuleHandleW(L"advapi32.dll"); + RegDeleteKeyExWProc pRegDeleteKeyExW; - // TODO: if there are subkeys inside, simply RegDeleteKeyExW will fail + // TODO: if there are subkeys inside, simply RegDeleteKeyExW + // (or RegDeleteKeyW on Server 2003 SP0 and earlier) will fail // we don't have RegDeleteTree for ReactOS now. (It's a WinVista API) // write a function to delete all subkeys recursively to solve this // or consider letting ReactOS having this API - return RegDeleteKeyExW(IsUserKey ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, szFullName, WowKey, 0); + /* Load RegDeleteKeyExW from advapi32.dll if available */ + if (hMod) + { + pRegDeleteKeyExW = (RegDeleteKeyExWProc)GetProcAddress(hMod, "RegDeleteKeyExW"); + + if (pRegDeleteKeyExW) + { + /* Return it */ + return pRegDeleteKeyExW(IsUserKey ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, szFullName, WowKey, 0); + } + } + + /* Otherwise, return non-Ex function */ + return RegDeleteKeyW(IsUserKey ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, szFullName); } BOOL CInstalledApps::Enum(INT EnumType, APPENUMPROC lpEnumProc, PVOID param)

4 years, 8 months

1
0
0 0

[reactos] 01/01: [REACTOS] *.spec: Fix some function/parameter types (#3154)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=889b077b23490f5eeeb55… commit 889b077b23490f5eeeb5558501a8a25c637396d1 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun Sep 20 19:21:11 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 20 19:21:11 2020 +0200 [REACTOS] *.spec: Fix some function/parameter types (#3154) --- boot/freeldr/freeldr/freeldr.spec | 2 +- dll/appcompat/apphelp/apphelp.spec | 2 +- dll/ntdll/def/ntdll.spec | 4 ++-- dll/win32/advapi32/advapi32.spec | 4 ++-- dll/win32/oledlg/oledlg.spec | 4 ++-- dll/win32/shell32/shell32.spec | 4 ++-- dll/win32/shlwapi/shlwapi.spec | 2 +- drivers/storage/class/classpnp/classpnp.spec | 2 +- drivers/storage/port/scsiport/scsiport.spec | 2 +- drivers/storage/port/storport/storport.spec | 2 +- drivers/wdm/audio/legacy/stream/stream.spec | 2 +- ntoskrnl/ntoskrnl.spec | 14 +++++++------- sdk/lib/debugsup/debugsup-ntos.spec | 6 +++--- win32ss/drivers/videoprt/videoprt.spec | 2 +- win32ss/user/user32/user32.spec | 4 ++-- win32ss/win32k.spec | 2 +- 16 files changed, 29 insertions(+), 29 deletions(-) diff --git a/boot/freeldr/freeldr/freeldr.spec b/boot/freeldr/freeldr/freeldr.spec index aec37ea8457..3ffd70aac37 100644 --- a/boot/freeldr/freeldr/freeldr.spec +++ b/boot/freeldr/freeldr/freeldr.spec @@ -1,5 +1,5 @@ @ stdcall RtlAssert(ptr ptr long ptr) -@ cdecl ScsiDebugPrint() +@ varargs ScsiDebugPrint(long str) @ stdcall ScsiPortCompleteRequest(ptr long long long long) @ stdcall ScsiPortConvertPhysicalAddressToUlong(long long) @ stdcall -arch=i386 ScsiPortConvertUlongToPhysicalAddress(long) diff --git a/dll/appcompat/apphelp/apphelp.spec b/dll/appcompat/apphelp/apphelp.spec index 8f08f24d47a..b2f7ba27fa0 100644 --- a/dll/appcompat/apphelp/apphelp.spec +++ b/dll/appcompat/apphelp/apphelp.spec @@ -172,7 +172,7 @@ @ stub SE_GetShimCount @ stub SE_LdrEntryRemoved @ stub SetPermLayers -@ cdecl ShimDbgPrint(long str str) +@ varargs ShimDbgPrint(long str str) @ stdcall ShimDumpCache(ptr ptr wstr long) @ stdcall ShimFlushCache(ptr ptr wstr long) @ stdcall SetPermLayerState(wstr wstr long long long) diff --git a/dll/ntdll/def/ntdll.spec b/dll/ntdll/def/ntdll.spec index 6f3204ae897..dc9969102e2 100644 --- a/dll/ntdll/def/ntdll.spec +++ b/dll/ntdll/def/ntdll.spec @@ -108,8 +108,8 @@ @ stdcall -version=0x502 EtwStopTraceW(double wstr ptr) @ stdcall -version=0x502 EtwTraceEvent(double ptr) @ stdcall -stub EtwTraceEventInstance(double ptr ptr ptr) -@ varargs EtwTraceMessage(ptr long ptr long) -@ stdcall -stub EtwTraceMessageVa(double long ptr long ptr) +@ varargs EtwTraceMessage(int64 long ptr long) +@ stdcall -stub EtwTraceMessageVa(int64 long ptr long ptr) @ stdcall EtwUnregisterTraceGuids(double) @ stdcall -version=0x502 EtwUpdateTraceA(double str ptr) @ stdcall -version=0x502 EtwUpdateTraceW(double wstr ptr) diff --git a/dll/win32/advapi32/advapi32.spec b/dll/win32/advapi32/advapi32.spec index 543b6ca4f6b..9a580df9df6 100644 --- a/dll/win32/advapi32/advapi32.spec +++ b/dll/win32/advapi32/advapi32.spec @@ -631,8 +631,8 @@ @ stdcall SystemFunction041(ptr long long) # RtlDecryptMemory @ stdcall TraceEvent(double ptr) ntdll.EtwTraceEvent @ stdcall TraceEventInstance(double ptr ptr ptr) ntdll.EtwTraceEventInstance -@ varargs TraceMessage(ptr long ptr long) ntdll.EtwTraceMessage -@ stdcall TraceMessageVa(double long ptr long ptr) ntdll.EtwTraceMessageVa +@ varargs TraceMessage() ntdll.EtwTraceMessage +@ stdcall TraceMessageVa() ntdll.EtwTraceMessageVa @ stdcall TreeResetNamedSecurityInfoA(str ptr ptr ptr ptr ptr ptr long ptr ptr ptr) @ stdcall TreeResetNamedSecurityInfoW(wstr long long ptr ptr ptr ptr long ptr long ptr) @ stub TrusteeAccessToObjectA diff --git a/dll/win32/oledlg/oledlg.spec b/dll/win32/oledlg/oledlg.spec index c4f35fd5778..3220d070ef2 100644 --- a/dll/win32/oledlg/oledlg.spec +++ b/dll/win32/oledlg/oledlg.spec @@ -7,10 +7,10 @@ 7 stdcall OleUIConvertA(ptr) 8 stdcall OleUIBusyA(ptr) 9 stdcall OleUIUpdateLinksA(ptr long str long) - 10 varargs OleUIPromptUserA(long long) + 10 varargs OleUIPromptUserA(long ptr) 11 stdcall OleUIObjectPropertiesA(ptr) 12 stdcall OleUIChangeSourceA(ptr) - 13 varargs OleUIPromptUserW(long long) + 13 varargs OleUIPromptUserW(long ptr) 14 stdcall OleUIAddVerbMenuW(ptr wstr long long long long long long ptr) 15 stdcall OleUIBusyW(ptr) 16 stdcall OleUIChangeIconW(ptr) diff --git a/dll/win32/shell32/shell32.spec b/dll/win32/shell32/shell32.spec index f5270cc103f..b96c0f209d5 100644 --- a/dll/win32/shell32/shell32.spec +++ b/dll/win32/shell32/shell32.spec @@ -178,8 +178,8 @@ 179 stdcall SHGetNewLinkInfoA(str str ptr long long) 180 stdcall SHGetNewLinkInfoW(wstr wstr ptr long long) 181 stdcall -noname RegisterShellHook(long long) -182 varargs ShellMessageBoxW(long long wstr wstr long) ShellMessageBoxWrapW ## This is the no-named 'shlwapi.ShellMessageBoxWrapW' (i.e. 'shlwapi.#388') -183 varargs ShellMessageBoxA(long long str str long) +182 varargs ShellMessageBoxW() ShellMessageBoxWrapW ## This is the no-named 'shlwapi.ShellMessageBoxWrapW' (i.e. 'shlwapi.#388') +183 varargs ShellMessageBoxA(ptr ptr str str long) 184 stdcall -noname ArrangeWindows(long long long long long) 185 stdcall -noname SHHandleDiskFull(ptr long) 186 stdcall -noname ILGetDisplayNameEx(ptr ptr ptr long) diff --git a/dll/win32/shlwapi/shlwapi.spec b/dll/win32/shlwapi/shlwapi.spec index 9bcd21739bf..dd1e3cd7d1b 100644 --- a/dll/win32/shlwapi/shlwapi.spec +++ b/dll/win32/shlwapi/shlwapi.spec @@ -385,7 +385,7 @@ 385 stub -noname SHLoadRawAccelerators 386 stub -noname SHQueryRawAccelerator 387 stub -noname SHQueryRawAcceleratorMsg -388 varargs -noname ShellMessageBoxWrapW(long long wstr wstr long) +388 varargs -noname ShellMessageBoxWrapW(ptr ptr wstr wstr long) 389 stdcall -noname GetSaveFileNameWrapW(ptr) 390 stdcall -noname WNetRestoreConnectionWrapW(long wstr) 391 stdcall -noname WNetGetLastErrorWrapW(ptr ptr long ptr long) diff --git a/drivers/storage/class/classpnp/classpnp.spec b/drivers/storage/class/classpnp/classpnp.spec index 9ab5443db18..6662c168f33 100644 --- a/drivers/storage/class/classpnp/classpnp.spec +++ b/drivers/storage/class/classpnp/classpnp.spec @@ -30,7 +30,7 @@ @ stdcall ClassInvalidateBusRelations(ptr) @ stdcall ClassMarkChildrenMissing(ptr) @ stdcall ClassMarkChildMissing(ptr long) - @ varargs ClassDebugPrint(long long) + @ varargs ClassDebugPrint(long str) @ stdcall ClassGetDriverExtension(ptr) @ stdcall ClassCompleteRequest(ptr ptr long) @ stdcall ClassReleaseRemoveLock(ptr ptr) diff --git a/drivers/storage/port/scsiport/scsiport.spec b/drivers/storage/port/scsiport/scsiport.spec index 705ab7c3a45..f01b7a48f12 100644 --- a/drivers/storage/port/scsiport/scsiport.spec +++ b/drivers/storage/port/scsiport/scsiport.spec @@ -1,4 +1,4 @@ -@ cdecl ScsiDebugPrint() +@ varargs ScsiDebugPrint(long str) @ stdcall ScsiPortCompleteRequest(ptr long long long long) @ stdcall ScsiPortConvertPhysicalAddressToUlong(long long) @ stdcall -arch=i386,arm ScsiPortConvertUlongToPhysicalAddress(long) NTOSKRNL.RtlConvertUlongToLargeInteger diff --git a/drivers/storage/port/storport/storport.spec b/drivers/storage/port/storport/storport.spec index a36e5ed49a8..7ccc9513fd9 100644 --- a/drivers/storage/port/storport/storport.spec +++ b/drivers/storage/port/storport/storport.spec @@ -6,7 +6,7 @@ @ stdcall StorPortCompleteRequest(ptr long long long long) @ stdcall StorPortConvertPhysicalAddressToUlong(long long) @ stdcall StorPortConvertUlongToPhysicalAddress(long) -@ cdecl StorPortDebugPrint() +@ varargs StorPortDebugPrint(long str) @ stdcall StorPortDeviceBusy(ptr long long long long) @ stdcall StorPortDeviceReady(ptr long long long) @ cdecl StorPortExtendedFunction() diff --git a/drivers/wdm/audio/legacy/stream/stream.spec b/drivers/wdm/audio/legacy/stream/stream.spec index 85cb8dc4b6a..0986510c112 100644 --- a/drivers/wdm/audio/legacy/stream/stream.spec +++ b/drivers/wdm/audio/legacy/stream/stream.spec @@ -3,7 +3,7 @@ @ stdcall StreamClassRegisterAdapter(ptr ptr ptr) @ stdcall StreamClassReenumerateStreams(ptr long) @ stdcall StreamClassDebugAssert(long long ptr long) -@ cdecl StreamClassDebugPrint (long str) +@ varargs StreamClassDebugPrint(long str) @ cdecl StreamClassDeviceNotification(long ptr) @ stdcall StreamClassGetDmaBuffer(ptr) @ stdcall StreamClassReadWriteConfig(ptr long ptr long long) \ No newline at end of file diff --git a/ntoskrnl/ntoskrnl.spec b/ntoskrnl/ntoskrnl.spec index 5da7e3bf0af..2965a67ffbf 100644 --- a/ntoskrnl/ntoskrnl.spec +++ b/ntoskrnl/ntoskrnl.spec @@ -47,9 +47,9 @@ @ stdcall DbgBreakPointWithStatus(long) @ stdcall DbgCommandString(ptr ptr) @ stdcall DbgLoadImageSymbols(ptr ptr long) -@ cdecl DbgPrint(str) -@ cdecl DbgPrintEx(long long str) -@ cdecl DbgPrintReturnControlC(str) +@ varargs DbgPrint(str) +@ varargs DbgPrintEx(long long str) +@ varargs DbgPrintReturnControlC(str) @ stdcall DbgPrompt(str ptr long) @ stdcall DbgQueryDebugFilterState(long long) @ stdcall DbgSetDebugFilterState(long long long) @@ -1404,8 +1404,8 @@ @ stdcall WmiStartTrace(ptr) @ stdcall WmiStopTrace(ptr) @ fastcall WmiTraceFastEvent(ptr) -@ cdecl WmiTraceMessage() -@ stdcall WmiTraceMessageVa(double long ptr long long) +@ varargs WmiTraceMessage(int64 long ptr long) +@ stdcall WmiTraceMessageVa(int64 long ptr long ptr) @ stdcall WmiUpdateTrace(ptr) @ stdcall XIPDispatch(long ptr long) @ stdcall ZwAccessCheckAndAuditAlarm(ptr ptr ptr ptr ptr long ptr long ptr ptr ptr) @@ -1595,7 +1595,7 @@ @ cdecl memset() @ cdecl qsort() @ cdecl rand() -@ cdecl sprintf() +@ varargs sprintf(ptr str) @ cdecl srand() @ cdecl strcat() @ cdecl strchr() @@ -1615,7 +1615,7 @@ @ cdecl towupper() @ stdcall vDbgPrintEx(long long str ptr) @ stdcall vDbgPrintExWithPrefix(str long long str ptr) -@ cdecl vsprintf() +@ cdecl vsprintf(ptr str ptr) @ cdecl wcscat() @ cdecl wcschr() @ cdecl wcscmp() diff --git a/sdk/lib/debugsup/debugsup-ntos.spec b/sdk/lib/debugsup/debugsup-ntos.spec index f7ec548c629..04e5e970a59 100644 --- a/sdk/lib/debugsup/debugsup-ntos.spec +++ b/sdk/lib/debugsup/debugsup-ntos.spec @@ -1,8 +1,8 @@ @ stdcall DbgBreakPoint() @ stdcall DbgBreakPointWithStatus(long) -@ varargs DbgPrint() -@ varargs DbgPrintEx() +@ varargs DbgPrint(str) +@ varargs DbgPrintEx(long long str) @ stdcall DbgPrompt(ptr ptr long) @ stdcall RtlAssert(ptr ptr long ptr) @ stdcall RtlUnwind(ptr ptr ptr ptr) -@ stdcall vDbgPrintExWithPrefix(ptr long long ptr ptr) +@ stdcall vDbgPrintExWithPrefix(str long long str ptr) diff --git a/win32ss/drivers/videoprt/videoprt.spec b/win32ss/drivers/videoprt/videoprt.spec index ee12c0692de..2f9b065afe7 100644 --- a/win32ss/drivers/videoprt/videoprt.spec +++ b/win32ss/drivers/videoprt/videoprt.spec @@ -19,7 +19,7 @@ @ stdcall VideoPortCreateSecondaryDisplay(ptr ptr long) @ stdcall VideoPortCreateSpinLock(ptr ptr) @ stdcall VideoPortDDCMonitorHelper(ptr ptr ptr long) -@ cdecl VideoPortDebugPrint(long ptr) +@ varargs VideoPortDebugPrint(long str) @ stdcall VideoPortDeleteEvent(ptr ptr) @ stdcall VideoPortDeleteSpinLock(ptr ptr) @ stdcall VideoPortDisableInterrupt(ptr) diff --git a/win32ss/user/user32/user32.spec b/win32ss/user/user32/user32.spec index dc54a3e22e5..9e87f95c49f 100644 --- a/win32ss/user/user32/user32.spec +++ b/win32ss/user/user32/user32.spec @@ -744,7 +744,7 @@ 735 stdcall WindowFromPoint(double) 736 stdcall keybd_event(long long long long) 737 stdcall mouse_event(long long long long long) -738 varargs wsprintfA(str str) -739 varargs wsprintfW(wstr wstr) +738 varargs wsprintfA(ptr str) +739 varargs wsprintfW(ptr wstr) 740 stdcall wvsprintfA(ptr str ptr) 741 stdcall wvsprintfW(ptr wstr ptr) diff --git a/win32ss/win32k.spec b/win32ss/win32k.spec index a33552cbd74..6bf69b5f6ec 100644 --- a/win32ss/win32k.spec +++ b/win32ss/win32k.spec @@ -30,7 +30,7 @@ @ stdcall EngCreateSemaphore() @ stdcall EngCreateWnd(ptr ptr ptr long long) @ stdcall EngDebugBreak() NTOSKRNL.DbgBreakPoint -@ stdcall EngDebugPrint(ptr ptr ptr) +@ stdcall EngDebugPrint(str str ptr) @ stdcall EngDeleteClip(ptr) @ stdcall EngDeleteDriverObj(ptr long long) @ stdcall EngDeleteEvent(ptr)

4 years, 8 months

1
0
0 0

[reactos] 01/01: [RAPPS] Display custom applications icons for installed applications CORE-17257 (#3144)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7eb90143f8bd4af34f494… commit 7eb90143f8bd4af34f49437e456293cd67bd39f6 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Sun Sep 20 20:19:59 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 20 19:19:59 2020 +0200 [RAPPS] Display custom applications icons for installed applications CORE-17257 (#3144) * [RAPPS] Display custom applications icons for installed applications - Implement `RetrieveIcon` helper function in `CInstalledApplicationInfo` class, which retrueves the current app's icon from registry, same as it done for `CAvailableApplicationInfo`. - Use it for loading the icon in `CAppsListView::AddInstalledApplication` function, via `ExtractIconW`. Load default Rapps icon only when the app has no its custom icon. - Retrieve `DisplayIcon` value from registry in `CInstalledApps::Enum` function, same as other registry values (like app name, description, etc).Store it in `szDisplayIcon` string, which is used in `CInstalledApplicationInfo::RetrieveIcon` for retrieving the data of that value. - Increase `LISTVIEW_ICON_SIZE` macro from 24 to 32, so 32x32 icon size is now used instead of 24x24. This makes displayed icons more accurate, since most of apps contain 32x32 icon, so they look a bit distorted with 24x24 size. --- base/applications/rapps/appview.cpp | 22 ++++++++++++++++++++-- base/applications/rapps/include/appview.h | 2 +- base/applications/rapps/include/installed.h | 2 ++ base/applications/rapps/installed.cpp | 11 +++++++++++ 4 files changed, 34 insertions(+), 3 deletions(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index 58584fa3b72..0bdcc67cdbc 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -1382,7 +1382,26 @@ BOOL CAppsListView::AddInstalledApplication(CInstalledApplicationInfo *InstAppIn return FALSE; } - HICON hIcon = (HICON)LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)); + /* Load icon from registry */ + HICON hIcon = NULL; + ATL::CStringW szIconPath; + if (InstAppInfo->RetrieveIcon(szIconPath)) + { + PathParseIconLocationW((LPWSTR)szIconPath.GetString()); + + /* Load only the 1st icon from the application executable, + * because all apps provide the executables which have the main icon + * as 1st in the index , so we don't need other icons here */ + hIcon = ExtractIconW(hInst, + szIconPath.GetString(), + 0); + } + + if (!hIcon) + { + /* Load default icon */ + hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)); + } int IconIndex = ImageList_AddIcon(m_hImageListView, hIcon); DestroyIcon(hIcon); @@ -2024,4 +2043,3 @@ BOOL CApplicationView::ItemCheckStateChanged(BOOL bChecked, LPVOID CallbackParam return TRUE; } // **** CApplicationView **** - diff --git a/base/applications/rapps/include/appview.h b/base/applications/rapps/include/appview.h index 7e8b9da6bc0..668131245ce 100644 --- a/base/applications/rapps/include/appview.h +++ b/base/applications/rapps/include/appview.h @@ -20,7 +20,7 @@ using namespace Gdiplus; -#define LISTVIEW_ICON_SIZE 24 +#define LISTVIEW_ICON_SIZE 32 // default broken-image icon size #define BROKENIMG_ICON_SIZE 96 diff --git a/base/applications/rapps/include/installed.h b/base/applications/rapps/include/installed.h index a719ed9057f..6e950056481 100644 --- a/base/applications/rapps/include/installed.h +++ b/base/applications/rapps/include/installed.h @@ -16,9 +16,11 @@ public: CInstalledApplicationInfo(BOOL bIsUserKey, REGSAM RegWowKey, HKEY hKey); BOOL GetApplicationRegString(LPCWSTR lpKeyName, ATL::CStringW& String); BOOL GetApplicationRegDword(LPCWSTR lpKeyName, DWORD *lpValue); + BOOL RetrieveIcon(ATL::CStringW& IconLocation); BOOL UninstallApplication(BOOL bModify); LSTATUS RemoveFromRegistry(); + ATL::CStringW szDisplayIcon; ATL::CStringW szDisplayName; ATL::CStringW szDisplayVersion; ATL::CStringW szPublisher; diff --git a/base/applications/rapps/installed.cpp b/base/applications/rapps/installed.cpp index 955ba012130..4179334a60a 100644 --- a/base/applications/rapps/installed.cpp +++ b/base/applications/rapps/installed.cpp @@ -126,6 +126,16 @@ BOOL CInstalledApplicationInfo::GetApplicationRegDword(LPCWSTR lpKeyName, DWORD return TRUE; } +BOOL CInstalledApplicationInfo::RetrieveIcon(ATL::CStringW& IconLocation) +{ + if (szDisplayIcon.IsEmpty()) + { + return FALSE; + } + IconLocation = szDisplayIcon; + return TRUE; +} + BOOL CInstalledApplicationInfo::UninstallApplication(BOOL bModify) { return StartProcess(bModify ? szModifyPath : szUninstallString, TRUE); @@ -206,6 +216,7 @@ BOOL CInstalledApps::Enum(INT EnumType, APPENUMPROC lpEnumProc, PVOID param) // those items without display name are ignored if (Info->GetApplicationRegString(L"DisplayName", Info->szDisplayName)) { + Info->GetApplicationRegString(L"DisplayIcon", Info->szDisplayIcon); Info->GetApplicationRegString(L"DisplayVersion", Info->szDisplayVersion); Info->GetApplicationRegString(L"Publisher", Info->szPublisher); Info->GetApplicationRegString(L"RegOwner", Info->szRegOwner);

4 years, 8 months

1
0
0 0

[reactos] 01/01: [SDK] Add dummy import lib files for MSVC_IDE build, to work around a CMake bug generating broken dll targets ROSBE-159

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5730485a51d8bb58ff9f8… commit 5730485a51d8bb58ff9f8f2131b85c128510a6b6 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Sep 10 22:03:52 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 20 19:18:15 2020 +0200 [SDK] Add dummy import lib files for MSVC_IDE build, to work around a CMake bug generating broken dll targets ROSBE-159 --- sdk/cmake/msvc.cmake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 94847a84167..e1899089a6f 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -172,6 +172,13 @@ string(REPLACE "/implib:<TARGET_IMPLIB>" "" CMAKE_CXX_CREATE_SHARED_LIBRARY "${C string(REPLACE "/implib:<TARGET_IMPLIB>" "" CMAKE_C_CREATE_SHARED_MODULE "${CMAKE_C_CREATE_SHARED_MODULE}") string(REPLACE "/implib:<TARGET_IMPLIB>" "" CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE}") +# HACK2: CMake lacks the ability to completely remove the 'implib' argument for solution files... +# To work around this, we just let it create a dummy file +if(MSVC_IDE) + set(CMAKE_IMPORT_LIBRARY_SUFFIX ".dummy") +endif() + + if(CMAKE_DISABLE_NINJA_DEPSLOG) set(cl_includes_flag "") else()

4 years, 8 months

1
0
0 0

[reactos] 02/02: [CREATECABFILE] Update rapps example scripts for new usage

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7119b13a2881721b63c8f… commit 7119b13a2881721b63c8f7db45294fdc56631fe5 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Sep 12 21:00:38 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 20 17:30:26 2020 +0200 [CREATECABFILE] Update rapps example scripts for new usage --- base/applications/rapps/CreateCabFile.bat | 32 +++++++++++++++++++++++------ base/applications/rapps/CreateCabFile.sh | 34 ++++++++++++++++++++++++------- 2 files changed, 53 insertions(+), 13 deletions(-) diff --git a/base/applications/rapps/CreateCabFile.bat b/base/applications/rapps/CreateCabFile.bat index 4e216478c33..bccd8b356a4 100644 --- a/base/applications/rapps/CreateCabFile.bat +++ b/base/applications/rapps/CreateCabFile.bat @@ -1,12 +1,32 @@ @echo off -cd ..\..\..\media +IF "%1"=="" GOTO show_usage +IF "%2"=="" GOTO show_usage +IF "%3"=="" GOTO show_usage -mkdir rapps\utf16 +SET CABMAN_CMD=%1 +SET UTF16LE_CMD=%2 +SET RAPPSDB_PATH=%3 -for %%f in (rapps\*.txt) do ( - ..\output-MinGW-i386\host-tools\utf16le.exe "rapps\%%~nf.txt" "rapps\utf16\%%~nf.txt" +mkdir "%RAPPSDB_PATH%\utf16" + +echo Converting txt files to utf16 +for %%f in (%RAPPSDB_PATH%\*.txt) do ( + %UTF16LE_CMD% "%RAPPSDB_PATH%\%%~nf.txt" "%RAPPSDB_PATH%\utf16\%%~nf.txt" ) -..\output-MinGW-i386\host-tools\cabman.exe -M mszip -S rapps\rappmgr.cab rapps\utf16\*.txt -rmdir /s /q rapps\utf16 +echo Building rappmgr.cab +%CABMAN_CMD% -M mszip -S "%RAPPSDB_PATH%\rappmgr.cab" "%RAPPSDB_PATH%\utf16\*.txt" + +echo Building rappmgr2.cab +%CABMAN_CMD% -M mszip -S "%RAPPSDB_PATH%\rappmgr2.cab" "%RAPPSDB_PATH%\utf16\*.txt" -F icons "%RAPPSDB_PATH%\icons\*.ico" + +echo Cleaning up +rmdir /s /q "%RAPPSDB_PATH%\utf16" + +echo Done + +goto :eof + +:show_usage +echo Usage: CreateCabFile.bat path\to\cabman.exe path\to\utf16le.exe path\to\rapps-db diff --git a/base/applications/rapps/CreateCabFile.sh b/base/applications/rapps/CreateCabFile.sh index 3a31ca7235c..c7783e6d772 100644 --- a/base/applications/rapps/CreateCabFile.sh +++ b/base/applications/rapps/CreateCabFile.sh @@ -1,9 +1,29 @@ #/bin/sh -cd ../../../media -mkdir rapps/utf16 -for i in $(find -type f); do - ../../host-tools/utf16le $i utf16/$i + +if [ "$#" != "3" ]; then + echo "Usage: CreateCabFile.sh path/to/cabman path/to/utf16le path/to/rapps-db" + exit -1 +fi + +CABMAN_CMD="$1" +UTF16LE_CMD="$2" +RAPPSDB_PATH="$3" + +mkdir "$RAPPSDB_PATH/utf16" + +echo Converting txt files to utf16 +for filename in $RAPPSDB_PATH/*.txt; do + just_filename=$(basename -- "$filename") + $UTF16LE_CMD "$filename" "$RAPPSDB_PATH/utf16/$just_filename" done -cd .. -../../host-tools/cabman -M mszip -S rapps/rappmgr.cab rapps/utf16/*.txt -rm -r rapps/uft16 \ No newline at end of file + +echo Building rappmgr.cab +$CABMAN_CMD -M mszip -S "$RAPPSDB_PATH/rappmgr.cab" "$RAPPSDB_PATH/utf16/*.txt" + +echo Building rappmgr2.cab +$CABMAN_CMD -M mszip -S "$RAPPSDB_PATH/rappmgr2.cab" "$RAPPSDB_PATH/utf16/*.txt" -F icons "$RAPPSDB_PATH/icons/*.ico" + +echo Cleaning up +rm -r "$RAPPSDB_PATH/utf16" + +echo Done

4 years, 8 months

1
0
0 0

[reactos] 01/02: [CABMAN] Add commandline support for creating a cab with folders CORE-17230

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=70193adc891cd59b0379b… commit 70193adc891cd59b0379bef9dd5627ac222ba954 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Sep 12 16:21:34 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Sep 20 17:28:02 2020 +0200 [CABMAN] Add commandline support for creating a cab with folders CORE-17230 --- sdk/tools/cabman/cabinet.cxx | 77 ++++++++++++++++++++++++++------------------ sdk/tools/cabman/cabinet.h | 14 +++++--- sdk/tools/cabman/cabman.cxx | 25 +++++++++++--- sdk/tools/cabman/dfp.cxx | 8 ++--- 4 files changed, 78 insertions(+), 46 deletions(-) diff --git a/sdk/tools/cabman/cabinet.cxx b/sdk/tools/cabman/cabinet.cxx index 175efef918a..29f9975b6fe 100644 --- a/sdk/tools/cabman/cabinet.cxx +++ b/sdk/tools/cabman/cabinet.cxx @@ -155,7 +155,7 @@ void CCabinet::ConvertPath(std::string& Path) } -const char* CCabinet::GetFileName(const char* Path) +std::string CCabinet::GetFileName(const std::string& Path) /* * FUNCTION: Returns a pointer to file name * ARGUMENTS: @@ -172,7 +172,7 @@ const char* CCabinet::GetFileName(const char* Path) if (IsSeparator(Path [i - 1])) j = i; - return Path + j; + return Path.c_str() + j; } @@ -225,7 +225,7 @@ void CCabinet::SetDestinationPath(const char* DestinationPath) NormalizePath(DestPath); } -ULONG CCabinet::AddSearchCriteria(const char* SearchCriteria) +ULONG CCabinet::AddSearchCriteria(const std::string& SearchCriteria, const std::string& TargetFolder) /* * FUNCTION: Adds a criteria to the search criteria list * ARGUMENTS: @@ -248,6 +248,7 @@ ULONG CCabinet::AddSearchCriteria(const char* SearchCriteria) // Set the actual criteria string Criteria->Search = SearchCriteria; + Criteria->TargetFolder = TargetFolder; return CAB_STATUS_SUCCESS; } @@ -274,6 +275,16 @@ bool CCabinet::HasSearchCriteria() return !CriteriaList.empty(); } +std::string CCabinet::CreateCabFilename(PCFFILE_NODE Node) +{ + std::string fname = GetFileName(Node->FileName); + if (!Node->TargetFolder.empty()) + { + fname = Node->TargetFolder + fname; + } + return fname; +} + bool CCabinet::SetCompressionCodec(const char* CodecName) /* * FUNCTION: Selects the codec to use for compression @@ -591,6 +602,7 @@ ULONG CCabinet::FindNext(PCAB_SEARCH Search) for (PSEARCH_CRITERIA Criteria : CriteriaList) { + // FIXME: We could handle path\filename here if (MatchFileNamePattern((*Search->Next)->FileName.c_str(), Criteria->Search.c_str())) { bFound = true; @@ -1202,7 +1214,7 @@ ULONG CCabinet::WriteFileToScratchStorage(PCFFILE_NODE FileNode) SourceFile = fopen(FileNode->FileName.c_str(), "rb"); if (SourceFile == NULL) { - DPRINT(MID_TRACE, ("File not found (%s).\n", FileNode->FileName.c_str())); + DPRINT(MID_TRACE, ("File not found (%s).\n", FileNode->FileNameOnDisk.c_str())); return CAB_STATUS_NOFILE; } @@ -1227,7 +1239,7 @@ ULONG CCabinet::WriteFileToScratchStorage(PCFFILE_NODE FileNode) CurrentFolderNode->Commit = true; PrevCabinetNumber = CurrentDiskNumber; - Size = sizeof(CFFILE) + (ULONG)strlen(GetFileName(FileNode->FileName.c_str())) + 1; + Size = sizeof(CFFILE) + (ULONG)CreateCabFilename(FileNode).length() + 1; CABHeader.FileTableOffset += Size; TotalFileSize += Size; DiskSize += Size; @@ -1500,7 +1512,7 @@ ULONG CCabinet::CloseCabinet() } -ULONG CCabinet::AddFile(char* FileName) +ULONG CCabinet::AddFile(const std::string& FileName, const std::string& TargetFolder) /* * FUNCTION: Adds a file to the current disk * ARGUMENTS: @@ -1534,6 +1546,9 @@ ULONG CCabinet::AddFile(char* FileName) FileNode->FolderNode = CurrentFolderNode; FileNode->FileName = NewFileName; + FileNode->TargetFolder = TargetFolder; + if (FileNode->TargetFolder.length() > 0 && FileNode->TargetFolder[FileNode->TargetFolder.length() - 1] != '\\') + FileNode->TargetFolder += '\\'; /* FIXME: Check for and handle large files (>= 2GB) */ FileNode->File.FileSize = GetSizeOfFile(SrcFile); @@ -1569,9 +1584,6 @@ bool CCabinet::CreateSimpleCabinet() */ { bool bRet = false; - const char* pszFile; - char szFilePath[PATH_MAX]; - char szFile[PATH_MAX]; ULONG Status; #if defined(_WIN32) @@ -1595,26 +1607,25 @@ bool CCabinet::CreateSimpleCabinet() for (PSEARCH_CRITERIA Criteria : CriteriaList) { // Store the file path with a trailing slash in szFilePath - ConvertPath(Criteria->Search); - pszFile = strrchr(Criteria->Search.c_str(), DIR_SEPARATOR_CHAR); + std::string szSearchPath = Criteria->Search; + ConvertPath(szSearchPath); + auto sep = szSearchPath.find_last_of(DIR_SEPARATOR_CHAR); + std::string szFilePath; + std::string pszFile; - if(pszFile) + if (sep != std::string::npos) { - // Set the pointer to the start of the file name, not the slash - pszFile++; + pszFile = szSearchPath.substr(sep + 1); // We want the filename, not the dir separator! - strncpy(szFilePath, Criteria->Search.c_str(), pszFile - Criteria->Search.c_str()); - szFilePath[pszFile - Criteria->Search.c_str()] = 0; + szFilePath = szSearchPath.substr(0, sep + 1); } else { - pszFile = Criteria->Search.c_str(); + pszFile = Criteria->Search; -#if defined(_WIN32) - szFilePath[0] = 0; -#else +#if !defined(_WIN32) // needed for opendir() - strcpy(szFilePath, "./"); + szFilePath = "./"; #endif } @@ -1633,10 +1644,10 @@ bool CCabinet::CreateSimpleCabinet() { if(!(FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { - strcpy(szFile, szFilePath); - strcat(szFile, FindFileData.cFileName); + std::string szFile = szFilePath; + szFile += FindFileData.cFileName; - Status = AddFile(szFile); + Status = AddFile(szFile, Criteria->TargetFolder); if(Status != CAB_STATUS_SUCCESS) { @@ -1651,22 +1662,22 @@ bool CCabinet::CreateSimpleCabinet() FindClose(hFind); #else // Unix: Use opendir/readdir to loop through all entries, stat to check if it's a file and MatchFileNamePattern to match the file against the pattern - dirp = opendir(szFilePath); + dirp = opendir(szFilePath.c_str()); if(dirp) { while( (dp = readdir(dirp)) ) { - strcpy(szFile, szFilePath); - strcat(szFile, dp->d_name); + std::string szFile = szFilePath; + szFile += dp->d_name; - if(stat(szFile, &stbuf) == 0) + if(stat(szFile.c_str(), &stbuf) == 0) { if(stbuf.st_mode != S_IFDIR) { - if(MatchFileNamePattern(dp->d_name, pszFile)) + if(MatchFileNamePattern(dp->d_name, pszFile.c_str())) { - Status = AddFile(szFile); + Status = AddFile(szFile, Criteria->TargetFolder); if(Status != CAB_STATUS_SUCCESS) { @@ -1890,6 +1901,7 @@ ULONG CCabinet::LocateFile(const char* FileName, for (PCFFILE_NODE Node : FileList) { + // FIXME: We could handle path\filename here if (strcasecmp(FileName, Node->FileName.c_str()) == 0) { CurrentFolderNode = LocateFolderNode(Node->File.FileControlID); @@ -2011,6 +2023,7 @@ ULONG CCabinet::ReadFileTable() Status = ReadString(Buf, PATH_MAX); if (Status != CAB_STATUS_SUCCESS) return Status; + // FIXME: We could split up folder\file.txt here File->FileName = Buf; DPRINT(MAX_TRACE, ("Found file '%s' at uncompressed offset (0x%X). Size (%u bytes) ControlId (0x%X).\n", @@ -2195,7 +2208,7 @@ void CCabinet::DestroyDeletedFileNodes() DPRINT(MAX_TRACE, ("Deleting file node: '%s'\n", CurNode->FileName.c_str())); - TotalFileSize -= (sizeof(CFFILE) + (ULONG)strlen(GetFileName(CurNode->FileName.c_str())) + 1); + TotalFileSize -= (sizeof(CFFILE) + (ULONG)CreateCabFilename(CurNode).length() + 1); delete CurNode; } @@ -2669,7 +2682,7 @@ ULONG CCabinet::WriteFileEntries() return CAB_STATUS_CANNOT_WRITE; } - std::string fname = GetFileName(File->FileName.c_str()); + std::string fname = CreateCabFilename(File); if (fwrite(fname.c_str(), fname.length() + 1, 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); diff --git a/sdk/tools/cabman/cabinet.h b/sdk/tools/cabman/cabinet.h index 0940436d975..1697588bbfc 100644 --- a/sdk/tools/cabman/cabinet.h +++ b/sdk/tools/cabman/cabinet.h @@ -227,6 +227,7 @@ typedef struct _CFFILE_NODE { CFFILE File = { 0 }; std::string FileName; + std::string TargetFolder; PCFDATA_NODE DataBlock = nullptr; // First data block of file. NULL if not known bool Commit = false; // true if the file data should be committed bool Delete = false; // true if marked for deletion @@ -235,7 +236,8 @@ typedef struct _CFFILE_NODE typedef struct _SEARCH_CRITERIA { - std::string Search; // The actual search criteria + std::string Search; // The actual search criteria + std::string TargetFolder; // The filename will be TargetFolder\file } SEARCH_CRITERIA, *PSEARCH_CRITERIA; typedef struct _CAB_SEARCH @@ -311,8 +313,8 @@ public: bool IsSeparator(char Char); /* Replaces \ or / with the one used be the host environment */ void ConvertPath(std::string& Path); - /* Returns a pointer to the filename part of a fully qualified filename */ - const char* GetFileName(const char* Path); + /* Returns the filename part of a fully qualified filename */ + std::string GetFileName(const std::string& Path); /* Normalizes a path */ void NormalizePath(std::string& Path); /* Returns name of cabinet file */ @@ -342,12 +344,14 @@ public: /* Returns whether a codec engine is selected */ bool IsCodecSelected(); /* Adds a search criteria for adding files to a simple cabinet, displaying files in a cabinet or extracting them */ - ULONG AddSearchCriteria(const char* SearchCriteria); + ULONG AddSearchCriteria(const std::string& SearchCriteria, const std::string& TargetFolder); /* Destroys the search criteria list */ void DestroySearchCriteria(); /* Returns whether we have search criteria */ bool HasSearchCriteria(); + std::string CreateCabFilename(PCFFILE_NODE Node); + #ifndef CAB_READ_ONLY /* Creates a simple cabinet based on the search criteria data */ bool CreateSimpleCabinet(); @@ -370,7 +374,7 @@ public: /* Closes the current cabinet */ ULONG CloseCabinet(); /* Adds a file to the current disk */ - ULONG AddFile(char* FileName); + ULONG AddFile(const std::string& FileName, const std::string& TargetFolder); /* Sets the maximum size of the current disk */ void SetMaxDiskSize(ULONG Size); #endif /* CAB_READ_ONLY */ diff --git a/sdk/tools/cabman/cabman.cxx b/sdk/tools/cabman/cabman.cxx index 0dd0ceaab1d..d258b534e79 100644 --- a/sdk/tools/cabman/cabman.cxx +++ b/sdk/tools/cabman/cabman.cxx @@ -193,7 +193,7 @@ void CCABManager::Usage() printf("ReactOS Cabinet Manager\n\n"); printf("CABMAN [-D | -E] [-A] [-L dir] cabinet [filename ...]\n"); printf("CABMAN [-M mode] -C dirfile [-I] [-RC file] [-P dir]\n"); - printf("CABMAN [-M mode] -S cabinet filename [...]\n"); + printf("CABMAN [-M mode] -S cabinet filename [-F folder] [filename] [...]\n"); printf(" cabinet Cabinet file.\n"); printf(" filename Name of the file to add to or extract from the cabinet.\n"); printf(" Wild cards and multiple filenames\n"); @@ -206,6 +206,7 @@ void CCABManager::Usage() printf(" -C Create cabinet.\n"); printf(" -D Display cabinet directory.\n"); printf(" -E Extract files from cabinet.\n"); + printf(" -F Put the files from the next 'filename' filter in the cab in folder\filename.\n"); printf(" -I Don't create the cabinet, only the .inf file.\n"); printf(" -L dir Location to place extracted or generated files\n"); printf(" (default is current directory).\n"); @@ -233,7 +234,7 @@ bool CCABManager::ParseCmdline(int argc, char* argv[]) int i; bool ShowUsage; bool FoundCabinet = false; - + std::string NextFolder; ShowUsage = (argc < 2); for (i = 1; i < argc; i++) @@ -262,6 +263,19 @@ bool CCABManager::ParseCmdline(int argc, char* argv[]) Mode = CM_MODE_EXTRACT; break; + case 'f': + case 'F': + if (argv[i][2] == 0) + { + i++; + NextFolder = argv[i]; + } + else + { + NextFolder = argv[i] + 2; + } + break; + case 'i': case 'I': InfFileOnly = true; @@ -374,7 +388,8 @@ bool CCABManager::ParseCmdline(int argc, char* argv[]) else if(FoundCabinet) { // For creating simple cabinets, displaying or extracting them, add the argument as a search criteria - AddSearchCriteria(argv[i]); + AddSearchCriteria(argv[i], NextFolder); + NextFolder.clear(); } else { @@ -618,7 +633,7 @@ void CCABManager::OnExtract(PCFFILE File, { if (Verbose) { - printf("Extracting %s\n", GetFileName(FileName)); + printf("Extracting %s\n", GetFileName(FileName).c_str()); } } @@ -651,7 +666,7 @@ void CCABManager::OnAdd(PCFFILE File, { if (Verbose) { - printf("Adding %s\n", GetFileName(FileName)); + printf("Adding %s\n", GetFileName(FileName).c_str()); } } diff --git a/sdk/tools/cabman/dfp.cxx b/sdk/tools/cabman/dfp.cxx index b6b4335e59a..575b48f0816 100644 --- a/sdk/tools/cabman/dfp.cxx +++ b/sdk/tools/cabman/dfp.cxx @@ -6,7 +6,7 @@ * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Colin Finck <mail(a)colinfinck.de> * NOTES: The directive file format is similar to the - * directive file format used by Microsoft's MAKECAB + * directive file format used by Microsoft's MAKECAB (But not entirely compatible!) * REVISIONS: * CSH 21/03-2001 Created * CSH 15/08-2003 Made it portable @@ -1123,17 +1123,17 @@ ULONG CDFParser::PerformFileCopy() DPRINT(MID_TRACE, ("Adding file: '%s' destination: '%s'.\n", SrcName, DstName)); - Status = AddFile(SrcName); + Status = AddFile(SrcName, std::string()); if (Status == CAB_STATUS_CANNOT_OPEN) { strcpy(SrcName, FileRelativePath.c_str()); strcat(SrcName, BaseFilename); - Status = AddFile(SrcName); + Status = AddFile(SrcName, std::string()); } switch (Status) { case CAB_STATUS_SUCCESS: - sprintf(InfLine, "%s=%s", GetFileName(SrcName), DstName); + sprintf(InfLine, "%s=%s", GetFileName(SrcName).c_str(), DstName); WriteInfLine(InfLine); break;

4 years, 8 months

1
0
0 0

[reactos] 01/01: [MORE] Implement 'Q' key for 'Quit' (#3210)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a9f60321f088ebd2b02a3… commit a9f60321f088ebd2b02a334cd7241c9e1df21475 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Sep 20 07:16:21 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 20 07:16:21 2020 +0900 [MORE] Implement 'Q' key for 'Quit' (#3210) Implement 'Quit' action for keyboard key 'Q'. CORE-4019 --- base/applications/cmdutils/more/more.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/base/applications/cmdutils/more/more.c b/base/applications/cmdutils/more/more.c index 161818a5e6b..14dd0d54c32 100644 --- a/base/applications/cmdutils/more/more.c +++ b/base/applications/cmdutils/more/more.c @@ -8,6 +8,7 @@ * PROGRAMMERS: Paolo Pantaleo * Timothy Schepens * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ /* * MORE.C - external command. @@ -133,6 +134,7 @@ PagePrompt(PCON_PAGER Pager, DWORD Done, DWORD Total) */ ConClearLine(Pager->Screen->Stream); + /* Ctrl+C or Ctrl+Esc: Control Break */ if ((KeyEvent.wVirtualKeyCode == VK_ESCAPE) || ((KeyEvent.wVirtualKeyCode == L'C') && (KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)))) @@ -143,6 +145,17 @@ PagePrompt(PCON_PAGER Pager, DWORD Done, DWORD Total) return FALSE; } + /* 'Q': Quit */ + // FIXME: Available only when command extensions are enabled. + if ((KeyEvent.wVirtualKeyCode == L'Q') && + !(KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED))) + { + /* We break, output a newline */ + WCHAR ch = L'\n'; + ConStreamWrite(Pager->Screen->Stream, &ch, 1); + return FALSE; + } + return TRUE; }

4 years, 8 months

1
0
0 0

[reactos] 05/05: [CMD] FOR: Fix a bug when parsing the "delims=" option in FOR loops.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d5a1a455c9e8b158e4c6… commit 5d5a1a455c9e8b158e4c6f4c51a1ee20e0da95f0 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jul 4 22:22:07 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 19 19:44:56 2020 +0200 [CMD] FOR: Fix a bug when parsing the "delims=" option in FOR loops. Suppose the following FOR-loop command, to be run from the command-line (if using a batch file, double each percent '%' sign): FOR %l IN ("a,b,c,d,e" "f,g,h,i,j") DO ( FOR /F "delims=, tokens=1-3*" %a IN (%l) DO @echo %a-%b-%c-%d ) The outermost FOR-loop enumerates the two strings "a,b,c,d,e" and "f,g,h,i,j" (placed in %l), and parse each of these in turn, splitting them at each specified delimiter (here only one character) ',' and storing the results in consecutive tokens %a, %b, %c, %d, with the last token %d containing all the remaining string (non-split). The expected result is: a-b-c-d,e f-g-h-i,j However, due to the way the delimiters string specified by the "delims=" option is stored (no stack/heap duplication of the FOR-option substring, but reading from it directly), during the first run of the innermost FOR-loop, the option string "delims=, tokens=1-3*" was truncated to just after the ',' due to the erroneous "delims=" parsing, so that when this FOR-loop ran for a second time (to deal with the second string), the option string was already erroneously truncated, without the "tokens=..." part, so that the parsing results were not stored in the tokens and resulting in: a-b-c-d,e f-%b-%c-%d instead. The solution is to save where the "delims=" string needs to be cut, but wait until running the actual FOR-loop to terminate it (and saving the original character too), run the FOR-loop body, and then restore the original character where termination took place. This allows having the FOR-loop option string valid for the next execution of the FOR-loop. --- base/shell/cmd/for.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/base/shell/cmd/for.c b/base/shell/cmd/for.c index 67a9240c787..300588bed31 100644 --- a/base/shell/cmd/for.c +++ b/base/shell/cmd/for.c @@ -121,6 +121,8 @@ static LPTSTR ReadFileContents(FILE *InputFile, TCHAR *Buffer) static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) { LPTSTR Delims = _T(" \t"); + LPTSTR DelimsEndPtr = NULL; + TCHAR DelimsEndChr = _T('\0'); TCHAR Eol = _T(';'); INT SkipLines = 0; DWORD Tokens = (1 << 1); @@ -148,8 +150,13 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) else if (_tcsnicmp(Param, _T("delims="), 7) == 0) { Param += 7; - /* delims=xxx: Specifies the list of characters that separate tokens */ + /* + * delims=xxx: Specifies the list of characters that separate tokens. + * This option does not cumulate: only the latest 'delims=' specification + * is taken into account. + */ Delims = Param; + DelimsEndPtr = NULL; while (*Param && *Param != Quote) { if (*Param == _T(' ')) @@ -158,13 +165,19 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) Param += _tcsspn(Param, _T(" ")); /* Exclude trailing spaces if this is not the last parameter */ if (*Param && *Param != Quote) - *FirstSpace = _T('\0'); + { + /* Save where the delimiters specification string ends */ + DelimsEndPtr = FirstSpace; + } break; } Param++; } if (*Param == Quote) - *Param++ = _T('\0'); + { + /* Save where the delimiters specification string ends */ + DelimsEndPtr = Param++; + } } else if (_tcsnicmp(Param, _T("eol="), 4) == 0) { @@ -301,6 +314,13 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) return 1; } + /* Patch the delimiters string */ + if (DelimsEndPtr) + { + DelimsEndChr = *DelimsEndPtr; + *DelimsEndPtr = _T('\0'); + } + /* Loop over the input line by line */ for (In = FullInput, Skip = SkipLines; !ExitingOrGoto(Cmd) && (In != NULL); @@ -343,6 +363,10 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) Ret = RunInstance(Cmd); } + /* Restore the delimiters string */ + if (DelimsEndPtr) + *DelimsEndPtr = DelimsEndChr; + cmd_free(FullInput); }

4 years, 8 months

1
0
0 0

[reactos] 04/05: [CMD] Code formatting in SubstituteVar().

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5cf0517be1ad609838039… commit 5cf0517be1ad60983803900cd791bccc91bb1482 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Sep 19 18:48:51 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 19 19:44:55 2020 +0200 [CMD] Code formatting in SubstituteVar(). --- base/shell/cmd/cmd.c | 225 +++++++++++++++++++++++++-------------------------- 1 file changed, 111 insertions(+), 114 deletions(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index 774bc4782bc..ba4e90dd05e 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -1363,137 +1363,127 @@ do { \ if (!*Src || *Src == _T('\r') || *Src == _T('\n')) goto bad_subst; + if (bc && Delim == _T('%')) { - if (bc && Delim == _T('%')) + UINT NameLen; + Var = GetBatchVar(Src, &NameLen); + if (!Var && bParseError) { - UINT NameLen; - Var = GetBatchVar(Src, &NameLen); - if (!Var && bParseError) - { - /* Return the partially-parsed command to be - * echoed for error diagnostics purposes. */ - APPEND1(Delim); - APPEND(Src, _tcslen(Src) + 1); - return FALSE; - } - if (Var != NULL) - { - VarLength = _tcslen(Var); - APPEND(Var, VarLength); - Src += NameLen; - goto success; - } + /* Return the partially-parsed command to be + * echoed for error diagnostics purposes. */ + APPEND1(Delim); + APPEND(Src, _tcslen(Src) + 1); + return FALSE; } - - /* Find the end of the variable name. A colon (:) will usually - * end the name and begin the optional modifier, but not if it - * is immediately followed by the delimiter (%VAR:%). */ - SubstStart = Src; - while (*Src && *Src != Delim && !(*Src == _T(':') && Src[1] != Delim)) + if (Var != NULL) { - ++Src; + VarLength = _tcslen(Var); + APPEND(Var, VarLength); + Src += NameLen; + goto success; } - /* If we are either at the end of the string, or the delimiter - * has been repeated more than once, fail the substitution. */ - if (!*Src || Src == SubstStart) - goto bad_subst; + } - EndChr = *Src; - *(PTSTR)Src = _T('\0'); // FIXME: HACK! - Var = GetEnvVarOrSpecial(SubstStart); - *(PTSTR)Src++ = EndChr; - if (Var == NULL) - { - /* In a batch context, %NONEXISTENT% "expands" to an - * empty string, otherwise fail the substitution. */ - if (bc) - goto success; - goto bad_subst; - } - VarLength = _tcslen(Var); + /* Find the end of the variable name. A colon (:) will usually + * end the name and begin the optional modifier, but not if it + * is immediately followed by the delimiter (%VAR:%). */ + SubstStart = Src; + while (*Src && *Src != Delim && !(*Src == _T(':') && Src[1] != Delim)) + { + ++Src; + } + /* If we are either at the end of the string, or the delimiter + * has been repeated more than once, fail the substitution. */ + if (!*Src || Src == SubstStart) + goto bad_subst; + + EndChr = *Src; + *(PTSTR)Src = _T('\0'); // FIXME: HACK! + Var = GetEnvVarOrSpecial(SubstStart); + *(PTSTR)Src++ = EndChr; + if (Var == NULL) + { + /* In a batch context, %NONEXISTENT% "expands" to an + * empty string, otherwise fail the substitution. */ + if (bc) + goto success; + goto bad_subst; + } + VarLength = _tcslen(Var); - if (EndChr == Delim) + if (EndChr == Delim) + { + /* %VAR% - use as-is */ + APPEND(Var, VarLength); + } + else if (*Src == _T('~')) + { + /* %VAR:~[start][,length]% - substring + * Negative values are offsets from the end. + */ + size_t Start = _tcstol(Src + 1, (PTSTR*)&Src, 0); + size_t End = VarLength; + if (Start < 0) + Start += VarLength; + Start = max(Start, 0); + Start = min(Start, VarLength); + if (*Src == _T(',')) { - /* %VAR% - use as-is */ - APPEND(Var, VarLength); + End = _tcstol(Src + 1, (PTSTR*)&Src, 0); + End += (End < 0) ? VarLength : Start; + End = max(End, Start); + End = min(End, VarLength); } - else if (*Src == _T('~')) + if (*Src++ != Delim) + goto bad_subst; + APPEND(&Var[Start], End - Start); + } + else + { + /* %VAR:old=new% - Replace all occurrences of old with new. + * %VAR:*old=new% - Replace first occurrence only, + * and remove everything before it. + */ + PCTSTR Old, New; + size_t OldLength, NewLength; + BOOL Star = FALSE; + size_t LastMatch = 0, i = 0; + + if (*Src == _T('*')) { - /* %VAR:~[start][,length]% - substring - * Negative values are offsets from the end. - */ - size_t Start = _tcstol(Src + 1, (PTSTR*)&Src, 0); - size_t End = VarLength; - if (Start < 0) - Start += VarLength; - Start = max(Start, 0); - Start = min(Start, VarLength); - if (*Src == _T(',')) - { - End = _tcstol(Src + 1, (PTSTR*)&Src, 0); - End += (End < 0) ? VarLength : Start; - End = max(End, Start); - End = min(End, VarLength); - } - if (*Src++ != Delim) - goto bad_subst; - APPEND(&Var[Start], End - Start); + Star = TRUE; + Src++; } - else - { - /* %VAR:old=new% - Replace all occurrences of old with new. - * %VAR:*old=new% - Replace first occurrence only, - * and remove everything before it. - */ - PCTSTR Old, New; - size_t OldLength, NewLength; - BOOL Star = FALSE; - size_t LastMatch = 0, i = 0; - - if (*Src == _T('*')) - { - Star = TRUE; - Src++; - } - /* The string to replace may contain the delimiter */ - Src = _tcschr(Old = Src, _T('=')); - if (Src == NULL) - goto bad_subst; - OldLength = Src++ - Old; - if (OldLength == 0) - goto bad_subst; + /* The string to replace may contain the delimiter */ + Src = _tcschr(Old = Src, _T('=')); + if (Src == NULL) + goto bad_subst; + OldLength = Src++ - Old; + if (OldLength == 0) + goto bad_subst; - Src = _tcschr(New = Src, Delim); - if (Src == NULL) - goto bad_subst; - NewLength = Src++ - New; + Src = _tcschr(New = Src, Delim); + if (Src == NULL) + goto bad_subst; + NewLength = Src++ - New; - while (i < VarLength) + while (i < VarLength) + { + if (_tcsnicmp(&Var[i], Old, OldLength) == 0) { - if (_tcsnicmp(&Var[i], Old, OldLength) == 0) - { - if (!Star) - APPEND(&Var[LastMatch], i - LastMatch); - APPEND(New, NewLength); - i += OldLength; - LastMatch = i; - if (Star) - break; - continue; - } - i++; + if (!Star) + APPEND(&Var[LastMatch], i - LastMatch); + APPEND(New, NewLength); + i += OldLength; + LastMatch = i; + if (Star) + break; + continue; } - APPEND(&Var[LastMatch], VarLength - LastMatch); + i++; } - - goto success; - - bad_subst: - Src = SubstStart; - /* Only if no batch context active do we echo the delimiter */ - if (!bc) - APPEND1(Delim); + APPEND(&Var[LastMatch], VarLength - LastMatch); } success: @@ -1501,6 +1491,13 @@ success: *DestIncLen = (Dest - End); return TRUE; +bad_subst: + Src = SubstStart; + /* Only if no batch context active do we echo the delimiter */ + if (!bc) + APPEND1(Delim); + goto success; + too_long: ConOutResPrintf(STRING_ALIAS_ERROR); nErrorLevel = 9023;

4 years, 8 months

1
0
0 0

[reactos] 03/05: [CMD] Fix delayed expansion of variables. CORE-13682

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cdc8e45b4828b53039646… commit cdc8e45b4828b53039646d4c9f50241cfb5d46ee Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jun 4 02:56:18 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 19 19:44:55 2020 +0200 [CMD] Fix delayed expansion of variables. CORE-13682 - Split SubstituteVars() into its main loop and a helper SubstituteVar() that just substitutes only one variable. - Use this new helper as the basis of the proper implementation of the delayed expansion of variables. - Fix a bug introduced in commit 495c82cc, when GetBatchVar() fails. --- base/shell/cmd/cmd.c | 255 ++++++++++++++++++++++++++++++++++++++++----------- base/shell/cmd/cmd.h | 21 ++++- 2 files changed, 220 insertions(+), 56 deletions(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index c4d41d0f247..774bc4782bc 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -1318,32 +1318,52 @@ GetBatchVar( } BOOL -SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim) +SubstituteVar( + IN PCTSTR Src, + OUT size_t* SrcIncLen, // VarNameLen + OUT PTCHAR Dest, + IN PTCHAR DestEnd, + OUT size_t* DestIncLen, + IN TCHAR Delim) { -#define APPEND(From, Length) { \ +#define APPEND(From, Length) \ +do { \ if (Dest + (Length) > DestEnd) \ goto too_long; \ - memcpy(Dest, From, (Length) * sizeof(TCHAR)); \ - Dest += Length; } -#define APPEND1(Char) { \ + memcpy(Dest, (From), (Length) * sizeof(TCHAR)); \ + Dest += (Length); \ +} while (0) + +#define APPEND1(Char) \ +do { \ if (Dest >= DestEnd) \ goto too_long; \ - *Dest++ = Char; } + *Dest++ = (Char); \ +} while (0) - TCHAR *DestEnd = Dest + CMDLINE_LENGTH - 1; - const TCHAR *Var; - int VarLength; - TCHAR *SubstStart; + PCTSTR Var; + PCTSTR Start, End, SubstStart; TCHAR EndChr; - while (*Src) - { - if (*Src != Delim) - { - APPEND1(*Src++) - continue; - } + size_t VarLength; + + Start = Src; + End = Dest; + *SrcIncLen = 0; + *DestIncLen = 0; + + if (!Delim) + return FALSE; + if (*Src != Delim) + return FALSE; - Src++; + ++Src; + + /* If we are already at the end of the string, fail the substitution */ + SubstStart = Src; + if (!*Src || *Src == _T('\r') || *Src == _T('\n')) + goto bad_subst; + + { if (bc && Delim == _T('%')) { UINT NameLen; @@ -1353,15 +1373,15 @@ SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim) /* Return the partially-parsed command to be * echoed for error diagnostics purposes. */ APPEND1(Delim); - APPEND(Src, DestEnd-Dest); + APPEND(Src, _tcslen(Src) + 1); return FALSE; } if (Var != NULL) { VarLength = _tcslen(Var); - APPEND(Var, VarLength) + APPEND(Var, VarLength); Src += NameLen; - continue; + goto success; } } @@ -1369,22 +1389,25 @@ SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim) * end the name and begin the optional modifier, but not if it * is immediately followed by the delimiter (%VAR:%). */ SubstStart = Src; - while (*Src != Delim && !(*Src == _T(':') && Src[1] != Delim)) + while (*Src && *Src != Delim && !(*Src == _T(':') && Src[1] != Delim)) { - if (!*Src) - goto bad_subst; - Src++; + ++Src; } + /* If we are either at the end of the string, or the delimiter + * has been repeated more than once, fail the substitution. */ + if (!*Src || Src == SubstStart) + goto bad_subst; EndChr = *Src; - *Src = _T('\0'); + *(PTSTR)Src = _T('\0'); // FIXME: HACK! Var = GetEnvVarOrSpecial(SubstStart); - *Src++ = EndChr; + *(PTSTR)Src++ = EndChr; if (Var == NULL) { - /* In a batch file, %NONEXISTENT% "expands" to an empty string */ + /* In a batch context, %NONEXISTENT% "expands" to an + * empty string, otherwise fail the substitution. */ if (bc) - continue; + goto success; goto bad_subst; } VarLength = _tcslen(Var); @@ -1392,21 +1415,22 @@ SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim) if (EndChr == Delim) { /* %VAR% - use as-is */ - APPEND(Var, VarLength) + APPEND(Var, VarLength); } else if (*Src == _T('~')) { /* %VAR:~[start][,length]% - substring - * Negative values are offsets from the end */ - int Start = _tcstol(Src + 1, &Src, 0); - int End = VarLength; + * Negative values are offsets from the end. + */ + size_t Start = _tcstol(Src + 1, (PTSTR*)&Src, 0); + size_t End = VarLength; if (Start < 0) Start += VarLength; Start = max(Start, 0); Start = min(Start, VarLength); if (*Src == _T(',')) { - End = _tcstol(Src + 1, &Src, 0); + End = _tcstol(Src + 1, (PTSTR*)&Src, 0); End += (End < 0) ? VarLength : Start; End = max(End, Start); End = min(End, VarLength); @@ -1417,13 +1441,14 @@ SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim) } else { - /* %VAR:old=new% - replace all occurrences of old with new - * %VAR:*old=new% - replace first occurrence only, - * and remove everything before it */ - TCHAR *Old, *New; - DWORD OldLength, NewLength; + /* %VAR:old=new% - Replace all occurrences of old with new. + * %VAR:*old=new% - Replace first occurrence only, + * and remove everything before it. + */ + PCTSTR Old, New; + size_t OldLength, NewLength; BOOL Star = FALSE; - int LastMatch = 0, i = 0; + size_t LastMatch = 0, i = 0; if (*Src == _T('*')) { @@ -1431,7 +1456,7 @@ SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim) Src++; } - /* the string to replace may contain the delimiter */ + /* The string to replace may contain the delimiter */ Src = _tcschr(Old = Src, _T('=')); if (Src == NULL) goto bad_subst; @@ -1449,8 +1474,8 @@ SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim) if (_tcsnicmp(&Var[i], Old, OldLength) == 0) { if (!Star) - APPEND(&Var[LastMatch], i - LastMatch) - APPEND(New, NewLength) + APPEND(&Var[LastMatch], i - LastMatch); + APPEND(New, NewLength); i += OldLength; LastMatch = i; if (Star) @@ -1459,21 +1484,87 @@ SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim) } i++; } - APPEND(&Var[LastMatch], VarLength - LastMatch) + APPEND(&Var[LastMatch], VarLength - LastMatch); } - continue; + + goto success; bad_subst: Src = SubstStart; + /* Only if no batch context active do we echo the delimiter */ if (!bc) - APPEND1(Delim) + APPEND1(Delim); } - *Dest = _T('\0'); + +success: + *SrcIncLen = (Src - Start); + *DestIncLen = (Dest - End); return TRUE; + too_long: ConOutResPrintf(STRING_ALIAS_ERROR); nErrorLevel = 9023; return FALSE; + +#undef APPEND +#undef APPEND1 +} + +BOOL +SubstituteVars( + IN PCTSTR Src, + OUT PTSTR Dest, + IN TCHAR Delim) +{ +#define APPEND(From, Length) \ +do { \ + if (Dest + (Length) > DestEnd) \ + goto too_long; \ + memcpy(Dest, (From), (Length) * sizeof(TCHAR)); \ + Dest += (Length); \ +} while (0) + +#define APPEND1(Char) \ +do { \ + if (Dest >= DestEnd) \ + goto too_long; \ + *Dest++ = (Char); \ +} while (0) + + PTCHAR DestEnd = Dest + CMDLINE_LENGTH - 1; + PCTSTR End; + size_t SrcIncLen, DestIncLen; + + while (*Src /* && (Dest < DestEnd) */) + { + if (*Src != Delim) + { + End = _tcschr(Src, Delim); + if (End == NULL) + End = Src + _tcslen(Src); + APPEND(Src, End - Src); + Src = End; + continue; + } + + if (!SubstituteVar(Src, &SrcIncLen, Dest, DestEnd, &DestIncLen, Delim)) + { + return FALSE; + } + else + { + Src += SrcIncLen; + Dest += DestIncLen; + } + } + APPEND1(_T('\0')); + return TRUE; + +too_long: + ConOutResPrintf(STRING_ALIAS_ERROR); + nErrorLevel = 9023; + return FALSE; + #undef APPEND #undef APPEND1 } @@ -1545,11 +1636,15 @@ SubstituteForVars( return TRUE; } -LPTSTR -DoDelayedExpansion(LPTSTR Line) +PTSTR +DoDelayedExpansion( + IN PCTSTR Line) { TCHAR Buf1[CMDLINE_LENGTH]; TCHAR Buf2[CMDLINE_LENGTH]; + PTCHAR Src, Dst; + PTCHAR DestEnd = Buf2 + CMDLINE_LENGTH - 1; + size_t SrcIncLen, DestIncLen; /* First, substitute FOR variables */ if (!SubstituteForVars(Line, Buf1)) @@ -1558,12 +1653,64 @@ DoDelayedExpansion(LPTSTR Line) if (!bDelayedExpansion || !_tcschr(Buf1, _T('!'))) return cmd_dup(Buf1); - /* FIXME: Delayed substitutions actually aren't quite the same as - * immediate substitutions. In particular, it's possible to escape - * the exclamation point using ^. */ - if (!SubstituteVars(Buf1, Buf2, _T('!'))) - return NULL; + /* + * Delayed substitutions are not actually completely the same as + * immediate substitutions. In particular, it is possible to escape + * the exclamation point using the escape caret. + */ + + /* + * Perform delayed expansion: expand variables around '!', + * and reparse escape carets. + */ + +#define APPEND1(Char) \ +do { \ + if (Dst >= DestEnd) \ + goto too_long; \ + *Dst++ = (Char); \ +} while (0) + + Src = Buf1; + Dst = Buf2; + while (*Src && (Src < &Buf1[CMDLINE_LENGTH])) + { + if (*Src == _T('^')) + { + ++Src; + if (!*Src || !(Src < &Buf1[CMDLINE_LENGTH])) + break; + + APPEND1(*Src++); + } + else if (*Src == _T('!')) + { + if (!SubstituteVar(Src, &SrcIncLen, Dst, DestEnd, &DestIncLen, _T('!'))) + { + return NULL; // Got an error during parsing. + } + else + { + Src += SrcIncLen; + Dst += DestIncLen; + } + } + else + { + APPEND1(*Src++); + } + continue; + } + APPEND1(_T('\0')); + return cmd_dup(Buf2); + +too_long: + ConOutResPrintf(STRING_ALIAS_ERROR); + nErrorLevel = 9023; + return NULL; + +#undef APPEND1 } diff --git a/base/shell/cmd/cmd.h b/base/shell/cmd/cmd.h index ac2d7fddd8c..93fefe4f4c6 100644 --- a/base/shell/cmd/cmd.h +++ b/base/shell/cmd/cmd.h @@ -95,14 +95,31 @@ ExecuteCommandWithEcho( LPCTSTR GetEnvVarOrSpecial ( LPCTSTR varName ); VOID AddBreakHandler (VOID); VOID RemoveBreakHandler (VOID); -BOOL SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim); + +BOOL +SubstituteVar( + IN PCTSTR Src, + OUT size_t* SrcIncLen, // VarNameLen + OUT PTCHAR Dest, + IN PTCHAR DestEnd, + OUT size_t* DestIncLen, + IN TCHAR Delim); + +BOOL +SubstituteVars( + IN PCTSTR Src, + OUT PTSTR Dest, + IN TCHAR Delim); BOOL SubstituteForVars( IN PCTSTR Src, OUT PTSTR Dest); -LPTSTR DoDelayedExpansion(LPTSTR Line); +PTSTR +DoDelayedExpansion( + IN PCTSTR Line); + INT DoCommand(LPTSTR first, LPTSTR rest, struct _PARSED_COMMAND *Cmd); BOOL ReadLine(TCHAR *commandline, BOOL bMore);

4 years, 8 months

1
0
0 0

[reactos] 02/05: [CMD] Some fixes for getting the enhanced '%~XXX' batch/FOR variables. CORE-11857 CORE-13736

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb2a9c31a6c8c207f2285… commit cb2a9c31a6c8c207f22852c68fc1464dd3b52080 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jul 4 17:40:58 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 19 19:44:54 2020 +0200 [CMD] Some fixes for getting the enhanced '%~XXX' batch/FOR variables. CORE-11857 CORE-13736 It will be followed with a separate fix for the FOR-loop code. Fixes some cmd_winetests. A NULL pointer can be returned for a valid existing batch/FOR variable, in which case the enhanced-variable getter should return an empty string. This situation can happen e.g. when forcing a FOR-loop to tokenize a text line with not enough tokens in it. --- base/shell/cmd/batch.c | 26 +++++--- base/shell/cmd/batch.h | 7 ++- base/shell/cmd/cmd.c | 164 +++++++++++++++++++++++++++++++++++-------------- base/shell/cmd/cmd.h | 7 ++- 4 files changed, 146 insertions(+), 58 deletions(-) diff --git a/base/shell/cmd/batch.c b/base/shell/cmd/batch.c index a7dfa2fd11a..e9a1e5aa76e 100644 --- a/base/shell/cmd/batch.c +++ b/base/shell/cmd/batch.c @@ -74,29 +74,35 @@ TCHAR textline[BATCH_BUFFSIZE]; /* * Returns a pointer to the n'th parameter of the current batch file. * If no such parameter exists returns pointer to empty string. - * If no batch file is current, returns NULL - * + * If no batch file is current, returns NULL. */ -LPTSTR FindArg(TCHAR Char, BOOL *IsParam0) +BOOL +FindArg( + IN TCHAR Char, + OUT PCTSTR* ArgPtr, + OUT BOOL* IsParam0) { - LPTSTR pp; + PCTSTR pp; INT n = Char - _T('0'); - TRACE ("FindArg: (%d)\n", n); + TRACE("FindArg: (%d)\n", n); + + *ArgPtr = NULL; if (n < 0 || n > 9) - return NULL; + return FALSE; n = bc->shiftlevel[n]; *IsParam0 = (n == 0); pp = bc->params; - /* Step up the strings till we reach the end */ - /* or the one we want */ + /* Step up the strings till we reach + * the end or the one we want. */ while (*pp && n--) - pp += _tcslen (pp) + 1; + pp += _tcslen(pp) + 1; - return pp; + *ArgPtr = pp; + return TRUE; } diff --git a/base/shell/cmd/batch.h b/base/shell/cmd/batch.h index de425ee2f11..d40b640e421 100644 --- a/base/shell/cmd/batch.h +++ b/base/shell/cmd/batch.h @@ -44,7 +44,12 @@ extern BOOL bEcho; /* The echo flag */ extern TCHAR textline[BATCH_BUFFSIZE]; /* Buffer for reading Batch file lines */ -LPTSTR FindArg(TCHAR, BOOL *); +BOOL +FindArg( + IN TCHAR Char, + OUT PCTSTR* ArgPtr, + OUT BOOL* IsParam0); + VOID ExitBatch(VOID); VOID ExitAllBatches(VOID); INT Batch(LPTSTR, LPTSTR, LPTSTR, PARSED_COMMAND *); diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index caa60a466fe..c4d41d0f247 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -964,8 +964,10 @@ GetEnvVarOrSpecial(LPCTSTR varName) } /* Handle the %~var syntax */ -static LPTSTR -GetEnhancedVar(TCHAR **pFormat, LPTSTR (*GetVar)(TCHAR, BOOL *)) +static PCTSTR +GetEnhancedVar( + IN OUT PCTSTR* pFormat, + IN BOOL (*GetVar)(TCHAR, PCTSTR*, BOOL*)) { static const TCHAR ModifierTable[] = _T("dpnxfsatz"); enum { @@ -980,28 +982,68 @@ GetEnhancedVar(TCHAR **pFormat, LPTSTR (*GetVar)(TCHAR, BOOL *)) M_SIZE = 256, /* Z: file size */ } Modifiers = 0; - TCHAR *Format, *FormatEnd; - TCHAR *PathVarName = NULL; - LPTSTR Variable; - TCHAR *VarEnd; + PCTSTR Format, FormatEnd; + PCTSTR PathVarName = NULL; + PCTSTR Variable; + PCTSTR VarEnd; BOOL VariableIsParam0; TCHAR FullPath[MAX_PATH]; - TCHAR FixedPath[MAX_PATH], *Filename, *Extension; + TCHAR FixedPath[MAX_PATH]; + PTCHAR Filename, Extension; HANDLE hFind; WIN32_FIND_DATA w32fd; - TCHAR *In, *Out; + PTCHAR In, Out; static TCHAR Result[CMDLINE_LENGTH]; - /* There is ambiguity between modifier characters and FOR variables; - * the rule that cmd uses is to pick the longest possible match. - * For example, if there is a %n variable, then out of %~anxnd, - * %~anxn will be substituted rather than just %~an. */ + /* Check whether the current character is a recognized variable. + * If it is not, then restore the previous one: there is indeed + * ambiguity between modifier characters and FOR variables; + * the rule that CMD uses is to pick the longest possible match. + * This case can happen if we have a FOR-variable specification + * of the following form: + * + * %~<modifiers><actual FOR variable character><other characters> + * + * where the FOR variable character is also a similar to a modifier, + * but should not be interpreted as is, and the following other + * characters are not part of the possible modifier characters, and + * are unrelated to the FOR variable (they can be part of a command). + * For example, if there is a %n variable, then out of %~anxnd, + * %~anxn will be substituted rather than just %~an. + * + * In the following examples, all characters 'd','p','n','x' are valid modifiers. + * + * 1. In this example, the FOR variable character is 'x' and the actual + * modifiers are 'dpn'. Parsing will first determine that 'dpnx' + * are modifiers, with the possible (last) valid variable being 'x', + * and will stop at the letter 'g'. Since 'g' is not a valid + * variable, then the actual variable is the lattest one 'x', + * and the modifiers are then actually 'dpn'. + * The FOR-loop will then display the %x variable formatted with 'dpn' + * and will append any other characters following, 'g'. + * + * C:\Temp>for %x in (foo.exe bar.txt) do @echo %~dpnxg + * C:\Temp\foog + * C:\Temp\barg + * + * + * 2. In this second example, the FOR variable character is 'g' and + * the actual modifiers are 'dpnx'. Parsing will determine also that + * the possible (last) valid variable could be 'x', but since it's + * not present in the FOR-variables list, it won't be the case. + * This means that the actual FOR variable character must follow, + * in this case, 'g'. + * + * C:\Temp>for %g in (foo.exe bar.txt) do @echo %~dpnxg + * C:\Temp\foo.exe + * C:\Temp\bar.txt + */ /* First, go through as many modifier characters as possible */ FormatEnd = Format = *pFormat; while (*FormatEnd && _tcschr(ModifierTable, _totlower(*FormatEnd))) - FormatEnd++; + ++FormatEnd; if (*FormatEnd == _T('$')) { @@ -1012,48 +1054,52 @@ GetEnhancedVar(TCHAR **pFormat, LPTSTR (*GetVar)(TCHAR, BOOL *)) return NULL; /* Must be immediately followed by the variable */ - Variable = GetVar(*++FormatEnd, &VariableIsParam0); - if (!Variable) + if (!GetVar(*++FormatEnd, &Variable, &VariableIsParam0)) return NULL; } else { /* Backtrack if necessary to get a variable name match */ - while (!(Variable = GetVar(*FormatEnd, &VariableIsParam0))) + while (!GetVar(*FormatEnd, &Variable, &VariableIsParam0)) { if (FormatEnd == Format) return NULL; - FormatEnd--; + --FormatEnd; } } - for (; Format < FormatEnd && *Format != _T('$'); Format++) - Modifiers |= 1 << (_tcschr(ModifierTable, _totlower(*Format)) - ModifierTable); - *pFormat = FormatEnd + 1; + /* If the variable is empty, return an empty string */ + if (!Variable || !*Variable) + return _T(""); + /* Exclude the leading and trailing quotes */ VarEnd = &Variable[_tcslen(Variable)]; if (*Variable == _T('"')) { - Variable++; + ++Variable; if (VarEnd > Variable && VarEnd[-1] == _T('"')) - VarEnd--; + --VarEnd; } - if ((char *)VarEnd - (char *)Variable >= sizeof Result) + if ((ULONG_PTR)VarEnd - (ULONG_PTR)Variable >= sizeof(Result)) return _T(""); - memcpy(Result, Variable, (char *)VarEnd - (char *)Variable); + memcpy(Result, Variable, (ULONG_PTR)VarEnd - (ULONG_PTR)Variable); Result[VarEnd - Variable] = _T('\0'); + /* Now determine the actual modifiers */ + for (; Format < FormatEnd && *Format != _T('$'); ++Format) + Modifiers |= 1 << (_tcschr(ModifierTable, _totlower(*Format)) - ModifierTable); + if (PathVarName) { /* $PATH: syntax - search the directories listed in the * specified environment variable for the file */ - LPTSTR PathVar; - FormatEnd[-1] = _T('\0'); + PTSTR PathVar; + ((PTSTR)FormatEnd)[-1] = _T('\0'); // FIXME: HACK! PathVar = GetEnvVar(PathVarName); - FormatEnd[-1] = _T(':'); + ((PTSTR)FormatEnd)[-1] = _T(':'); if (!PathVar || !SearchPath(PathVar, Result, NULL, ARRAYSIZE(FullPath), FullPath, NULL)) { @@ -1070,6 +1116,7 @@ GetEnhancedVar(TCHAR **pFormat, LPTSTR (*GetVar)(TCHAR, BOOL *)) /* Special case: If the variable is %0 and modifier characters are present, * use the batch file's path (which includes the .bat/.cmd extension) * rather than the actual %0 variable (which might not). */ + ASSERT(bc); _tcscpy(FullPath, bc->BatchFilePath); } else @@ -1103,7 +1150,7 @@ GetEnhancedVar(TCHAR **pFormat, LPTSTR (*GetVar)(TCHAR, BOOL *)) /* If it doesn't exist, just leave the name as it was given */ if (hFind != INVALID_HANDLE_VALUE) { - LPTSTR FixedComponent = w32fd.cFileName; + PTSTR FixedComponent = w32fd.cFileName; if (*w32fd.cAlternateFileName && ((Modifiers & M_SHORT) || !_tcsicmp(In, w32fd.cAlternateFileName))) { @@ -1194,7 +1241,7 @@ GetEnhancedVar(TCHAR **pFormat, LPTSTR (*GetVar)(TCHAR, BOOL *)) } if (Modifiers & (M_PATH | M_FULL)) { - memcpy(Out, &FixedPath[2], (char *)Filename - (char *)&FixedPath[2]); + memcpy(Out, &FixedPath[2], (ULONG_PTR)Filename - (ULONG_PTR)&FixedPath[2]); Out += Filename - &FixedPath[2]; } if (Modifiers & (M_NAME | M_FULL)) @@ -1217,18 +1264,20 @@ GetEnhancedVar(TCHAR **pFormat, LPTSTR (*GetVar)(TCHAR, BOOL *)) return Result; } -static LPCTSTR -GetBatchVar(TCHAR *varName, UINT *varNameLen) +static PCTSTR +GetBatchVar( + IN PCTSTR varName, + OUT PUINT varNameLen) { - LPCTSTR ret; - TCHAR *varNameEnd; - BOOL dummy; + PCTSTR ret; + PCTSTR varNameEnd; *varNameLen = 1; - switch ( *varName ) + switch (*varName) { case _T('~'): + { varNameEnd = varName + 1; ret = GetEnhancedVar(&varNameEnd, FindArg); if (!ret) @@ -1238,6 +1287,7 @@ GetBatchVar(TCHAR *varName, UINT *varNameLen) } *varNameLen = varNameEnd - varName; return ret; + } case _T('0'): case _T('1'): @@ -1249,7 +1299,13 @@ GetBatchVar(TCHAR *varName, UINT *varNameLen) case _T('7'): case _T('8'): case _T('9'): - return FindArg(*varName, &dummy); + { + BOOL dummy; + if (!FindArg(*varName, &ret, &dummy)) + return NULL; + else + return ret; + } case _T('*'): /* Copy over the raw params (not including the batch file name) */ @@ -1423,37 +1479,53 @@ too_long: } /* Search the list of FOR contexts for a variable */ -static LPTSTR -FindForVar(TCHAR Var, BOOL *IsParam0) +static BOOL +FindForVar( + IN TCHAR Var, + OUT PCTSTR* VarPtr, + OUT BOOL* IsParam0) { PFOR_CONTEXT Ctx; + *VarPtr = NULL; *IsParam0 = FALSE; + for (Ctx = fc; Ctx != NULL; Ctx = Ctx->prev) { if ((UINT)(Var - Ctx->firstvar) < Ctx->varcount) - return Ctx->values[Var - Ctx->firstvar]; + { + *VarPtr = Ctx->values[Var - Ctx->firstvar]; + return TRUE; + } } - return NULL; + return FALSE; } BOOL -SubstituteForVars(TCHAR *Src, TCHAR *Dest) +SubstituteForVars( + IN PCTSTR Src, + OUT PTSTR Dest) { - TCHAR *DestEnd = &Dest[CMDLINE_LENGTH - 1]; + PTCHAR DestEnd = &Dest[CMDLINE_LENGTH - 1]; while (*Src) { if (Src[0] == _T('%')) { BOOL Dummy; - LPTSTR End = &Src[2]; - LPTSTR Value = NULL; + PCTSTR End = &Src[2]; + PCTSTR Value = NULL; if (Src[1] == _T('~')) Value = GetEnhancedVar(&End, FindForVar); - if (!Value) - Value = FindForVar(Src[1], &Dummy); + if (!Value && Src[1]) + { + if (FindForVar(Src[1], &Value, &Dummy) && !Value) + { + /* The variable is empty, return an empty string */ + Value = _T(""); + } + } if (Value) { diff --git a/base/shell/cmd/cmd.h b/base/shell/cmd/cmd.h index b3c1c0f1d9d..ac2d7fddd8c 100644 --- a/base/shell/cmd/cmd.h +++ b/base/shell/cmd/cmd.h @@ -96,7 +96,12 @@ LPCTSTR GetEnvVarOrSpecial ( LPCTSTR varName ); VOID AddBreakHandler (VOID); VOID RemoveBreakHandler (VOID); BOOL SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim); -BOOL SubstituteForVars(TCHAR *Src, TCHAR *Dest); + +BOOL +SubstituteForVars( + IN PCTSTR Src, + OUT PTSTR Dest); + LPTSTR DoDelayedExpansion(LPTSTR Line); INT DoCommand(LPTSTR first, LPTSTR rest, struct _PARSED_COMMAND *Cmd); BOOL ReadLine(TCHAR *commandline, BOOL bMore);

4 years, 8 months

1
0
0 0

[reactos] 01/05: [CMD_ROSTEST] Add tests for delayed expansion.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=014efdf7e85205fa2f899… commit 014efdf7e85205fa2f899675d19a243cf5b96b5a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Jun 5 00:41:31 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 19 19:44:53 2020 +0200 [CMD_ROSTEST] Add tests for delayed expansion. --- modules/rostests/win32/cmd/test_echoer_parser.cmd | 159 ++++++++++++++++++ .../rostests/win32/cmd/test_echoer_parser.cmd.exp | 187 +++++++++++++++++++++ 2 files changed, 346 insertions(+) diff --git a/modules/rostests/win32/cmd/test_echoer_parser.cmd b/modules/rostests/win32/cmd/test_echoer_parser.cmd index 85d20ad9508..e94313871f7 100644 --- a/modules/rostests/win32/cmd/test_echoer_parser.cmd +++ b/modules/rostests/win32/cmd/test_echoer_parser.cmd @@ -92,6 +92,165 @@ if 1==0 (@echo lol) else (@echo better2) :: () +:: +:: Tests for delayed expansion. +:: + +@echo off +setlocal enableextensions +setlocal enabledelayedexpansion + +echo --------- Testing Delayed Expansion --------- + +:: Checking exclamation point escaping +set ENDV= ^(an open-source operating system^) +echo This is ReactOS^^!%ENDV% +echo Hello! +echo Hello!! +echo Hello!!! +echo Hello^^^! "^!" + +:: The following tests are adapted from +:: https://ss64.com/nt/delayedexpansion.html + +echo "Hello^World" +echo "Hello^World!" + +:: Checking expansion +set "_var=first" +set "_var=second" & Echo %_var% !_var! + +:: Checking expansion and replacement +set var1=Hello ABC how are you +set var2=ABC +set result=!var1:%var2%=Developer! +echo [!result!] + +:: Test of FOR-loop +set COUNT=0 +for /l %%v in (1,1,4) do ( + set /A COUNT=!COUNT! + 1 + echo [!COUNT!] +) +echo Total = %COUNT% + + +set "com[0]=lol0" +set "com[1]=lol2" +set "com[2]=lol4" +set "com[3]=lol6" +set "com[4]=lol8" +set "com[5]=lol10" + +for /l %%k in (1,1,5) do ( + echo(!com[%%k]! + if /I "%%k" equ "5" echo OHLALA +) + + +:: +:: Re-enable the command echoer +:: +@echo on + +setlocal disabledelayedexpansion + +echo %~DP0 + +set test=abc +set abc=def + +echo % +echo %% +echo %%% +echo %%%% + +echo %test% +echo %test%% +echo %%test% +echo %%test%% +echo %%%test%%% + +echo !test! +echo !!test!! + +endlocal +setlocal enabledelayedexpansion + +:: +:: Regular and Delayed variables +:: + +echo ! +echo !! +echo !!! +echo !!!! +echo !a! +echo !!a!! + +set a=b +:: Will display b +echo !!a!! +set b=c +:: Will still display b +echo !!a!! + +echo %test% +echo %test%% +echo %%test% +echo %%test%% +echo %%%test%%% + +echo %!test!% +echo !%test%! +echo !!test!! +:: That other one is the same as the previous one. +echo !^!test^!! +echo !^^!test^^!! +echo !test! +echo !test!! +echo !!test! +echo !!test!! +echo !!!test!!! + + +set proj=XYZ +echo !%proj%_folder! +echo !!proj!_folder! + +set %proj%_folder=\\server\folder\ +echo !%proj%_folder! +echo !!proj!_folder! + + +:: +:: Delayed variables in blocks +:: + +if 1==1 ( + set "pc=T" + echo pc == !pc! + + set i=3 + set "!pc!!i!=5" + + echo other pc == !pc! and !pc!!i! == !!pc!!i!! + echo other pc == !pc! and !pc!!i! == !^!pc^!^!i^!! + echo other pc == !pc! and !pc!!i! == ^!!pc!!i!^! + echo other pc == !pc! and !pc!!i! == ^!^!pc^!^!i^!^! + set "trol=!pc!!i!" + echo the var was !trol! + + set "!pc!N=!i!" + echo updated !pc!N == !!pc!N! + echo updated !pc!N == !^!pc^!N! + echo updated !pc!N == ^!!pc!N^! + echo updated !pc!N == ^!^!pc^!N^! + set "trol=!pc!N" + echo updated !pc!N == !trol! +) + + @echo off :: diff --git a/modules/rostests/win32/cmd/test_echoer_parser.cmd.exp b/modules/rostests/win32/cmd/test_echoer_parser.cmd.exp index b582b62722f..796b31eef76 100644 --- a/modules/rostests/win32/cmd/test_echoer_parser.cmd.exp +++ b/modules/rostests/win32/cmd/test_echoer_parser.cmd.exp @@ -135,4 +135,191 @@ better2 @pwd@>(a)@space@ @pwd@>(a b )@space@ +--------- Testing Delayed Expansion --------- +This is ReactOS! (an open-source operating system) +Hello +Hello +Hello +Hello! "!" +"Hello^World" +"HelloWorld" +first second +[Hello Developer how are you] +[1] +[2] +[3] +[4] +Total = 4 +lol2 +lol4 +lol6 +lol8 +lol10 +OHLALA + +@pwd@>setlocal disabledelayedexpansion@space@ + +@pwd@>echo @pwd@\@space@ +@pwd@\ + +@pwd@>set test=abc@space@ + +@pwd@>set abc=def@space@ + +@pwd@>echo@space@@space@ +ECHO is on. + +@pwd@>echo %@space@ +% + +@pwd@>echo %@space@ +% + +@pwd@>echo %%@space@ +%% + +@pwd@>echo abc@space@ +abc + +@pwd@>echo abc@space@ +abc + +@pwd@>echo %test@space@ +%test + +@pwd@>echo %test%@space@ +%test% + +@pwd@>echo %abc%@space@ +%abc% + +@pwd@>echo !test!@space@ +!test! + +@pwd@>echo !!test!!@space@ +!!test!! + +@pwd@>endlocal + +@pwd@>setlocal enabledelayedexpansion@space@ + +@pwd@>echo !@space@ +ECHO is on. + +@pwd@>echo !!@space@ +ECHO is on. + +@pwd@>echo !!!@space@ +ECHO is on. + +@pwd@>echo !!!!@space@ +ECHO is on. + +@pwd@>echo !a!@space@ +ECHO is on. + +@pwd@>echo !!a!!@space@ +ECHO is on. + +@pwd@>set a=b@space@ + +@pwd@>echo !!a!!@space@ +b + +@pwd@>set b=c@space@ + +@pwd@>echo !!a!!@space@ +b + +@pwd@>echo@space@@space@ +ECHO is on. + +@pwd@>echo@space@@space@ +ECHO is on. + +@pwd@>echo %test@space@ +%test + +@pwd@>echo %test%@space@ +%test% + +@pwd@>echo %%@space@ +%% + +@pwd@>echo@space@@space@ +ECHO is on. + +@pwd@>echo !!@space@ +ECHO is on. + +@pwd@>echo !!test!!@space@ +ECHO is on. + +@pwd@>echo !!test!!@space@ +ECHO is on. + +@pwd@>echo !^!test^!!@space@ +test! + +@pwd@>echo !test!@space@ +ECHO is on. + +@pwd@>echo !test!!@space@ +ECHO is on. + +@pwd@>echo !!test!@space@ +ECHO is on. + +@pwd@>echo !!test!!@space@ +ECHO is on. + +@pwd@>echo !!!test!!!@space@ +ECHO is on. + +@pwd@>set proj=XYZ@space@ + +@pwd@>echo !XYZ_folder!@space@ +ECHO is on. + +@pwd@>echo !!proj!_folder!@space@ +XYZ_folder + +@pwd@>set XYZ_folder=\\server\folder\@space@ + +@pwd@>echo !XYZ_folder!@space@ +\\server\folder\ + +@pwd@>echo !!proj!_folder!@space@ +XYZ_folder + +@pwd@>if 1 == 1 ( +set "pc=T"@space@@space@ + echo pc == !pc!@space@@space@ + set i=3@space@@space@ + set "!pc!!i!=5"@space@@space@ + echo other pc == !pc! and !pc!!i! == !!pc!!i!!@space@@space@ + echo other pc == !pc! and !pc!!i! == !!pc!!i!!@space@@space@ + echo other pc == !pc! and !pc!!i! == !!pc!!i!!@space@@space@ + echo other pc == !pc! and !pc!!i! == !!pc!!i!!@space@@space@ + set "trol=!pc!!i!"@space@@space@ + echo the var was !trol!@space@@space@ + set "!pc!N=!i!"@space@@space@ + echo updated !pc!N == !!pc!N!@space@@space@ + echo updated !pc!N == !!pc!N!@space@@space@ + echo updated !pc!N == !!pc!N!@space@@space@ + echo updated !pc!N == !!pc!N!@space@@space@ + set "trol=!pc!N"@space@@space@ + echo updated !pc!N == !trol!@space@ +)@space@ +pc == T +other pc == T and T3 == T3 +other pc == T and T3 == T3 +other pc == T and T3 == T3 +other pc == T and T3 == T3 +the var was T3 +updated TN == TN +updated TN == TN +updated TN == TN +updated TN == TN +updated TN == TN --------- Finished --------------

4 years, 8 months

1
0
0 0

[reactos] 01/01: [SHELL32] Minimal SHRunControlPanel implementation (#3095)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da36f799c728bc5477e85… commit da36f799c728bc5477e85da590c31e6c20d553c4 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Sat Sep 19 16:23:44 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 19 16:23:44 2020 +0200 [SHELL32] Minimal SHRunControlPanel implementation (#3095) CORE-9215 Co-authored-by: Stanislav Motylkov <x86corez(a)gmail.com> --- dll/win32/shell32/wine/shellord.c | 21 ++++++++++++++++++++- sdk/include/psdk/shlobj.h | 10 ++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/wine/shellord.c b/dll/win32/shell32/wine/shellord.c index ab0969a157b..37ff171d4b6 100644 --- a/dll/win32/shell32/wine/shellord.c +++ b/dll/win32/shell32/wine/shellord.c @@ -1472,10 +1472,29 @@ HRESULT WINAPI SHWinHelp(HWND hwnd, LPCWSTR pszHelp, UINT uCommand, ULONG_PTR dw * SHRunControlPanel [SHELL32.161] * */ -BOOL WINAPI SHRunControlPanel (LPCWSTR commandLine, HWND parent) +BOOL WINAPI SHRunControlPanel (_In_ LPCWSTR commandLine, _In_opt_ HWND parent) { +#ifdef __REACTOS__ + /* + * TODO: Run in-process when possible, using + * HKLM\Software\Microsoft\Windows\CurrentVersion\Explorer\ControlPanel\InProcCPLs + * and possibly some extra rules. + * See also https://docs.microsoft.com/en-us/windows/win32/api/shlobj/nf-shlobj-shrunco… + * "If the specified Control Panel item is already running, SHRunControlPanel + * attempts to switch to that instance rather than opening a new instance." + * This function is not supported as of Windows Vista, where it always returns FALSE. + * However we need to keep it "alive" even when ReactOS is compliled as NT6+ + * in order to keep control panel elements launch commands. + */ + TRACE("(%s, %p)n", debugstr_w(commandLine), parent); + WCHAR parameters[MAX_PATH] = L"shell32.dll,Control_RunDLL "; + wcscat(parameters, commandLine); + + return ((INT_PTR)ShellExecuteW(parent, L"open", L"rundll32.exe", parameters, NULL, SW_SHOWNORMAL) > 32); +#else FIXME("(%s, %p): stub\n", debugstr_w(commandLine), parent); return FALSE; +#endif } static LPUNKNOWN SHELL32_IExplorerInterface=0; diff --git a/sdk/include/psdk/shlobj.h b/sdk/include/psdk/shlobj.h index b478ca228f7..422714c7b9d 100644 --- a/sdk/include/psdk/shlobj.h +++ b/sdk/include/psdk/shlobj.h @@ -2466,6 +2466,16 @@ HRESULT WINAPI CIDLData_CreateFromIDArray( _In_reads_opt_(cidl) PCUIDLIST_RELATIVE_ARRAY apidl, _Outptr_ IDataObject **ppdtobj); +/**************************************************************************** + * SHRunControlPanel + */ + +BOOL +WINAPI +SHRunControlPanel( + _In_ LPCWSTR commandLine, + _In_opt_ HWND parent); + /**************************************************************************** * SHOpenWithDialog */

4 years, 8 months

1
0
0 0

[reactos] 01/01: [IMM32][INCLUDE] Add immtable.h and modify imm32.spec (#3207)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab115e30fe282624db703… commit ab115e30fe282624db703ad16111eaf4a59841c0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 19 22:47:40 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 19 22:47:40 2020 +0900 [IMM32][INCLUDE] Add immtable.h and modify imm32.spec (#3207) - Add immtable.h header into win32ss/user/user32/misc/. - Modify imm32.spec file. CORE-11700 --- dll/win32/imm32/imm32.spec | 120 ++++++++++++++++++------------------ win32ss/user/user32/misc/immtable.h | 52 ++++++++++++++++ 2 files changed, 112 insertions(+), 60 deletions(-) diff --git a/dll/win32/imm32/imm32.spec b/dll/win32/imm32/imm32.spec index ca0ddb36904..b9c0fe55516 100644 --- a/dll/win32/imm32/imm32.spec +++ b/dll/win32/imm32/imm32.spec @@ -1,4 +1,4 @@ -@ stub ImmActivateLayout +@ stdcall -stub ImmActivateLayout(long) @ stdcall ImmAssociateContext(ptr ptr) @ stdcall ImmAssociateContextEx(ptr ptr long) @ stdcall ImmConfigureIMEA(ptr ptr long ptr) @@ -16,100 +16,100 @@ @ stdcall ImmEnumInputContext(long ptr long) @ stdcall ImmEnumRegisterWordA(long ptr str long str ptr) @ stdcall ImmEnumRegisterWordW(long ptr wstr long wstr ptr) -@ stdcall ImmEscapeA(long long long ptr) -@ stdcall ImmEscapeW(long long long ptr) -@ stub ImmFreeLayout +@ stdcall ImmEscapeA(long ptr long ptr) +@ stdcall ImmEscapeW(long ptr long ptr) +@ stdcall -stub ImmFreeLayout(long) @ stdcall ImmGenerateMessage(ptr) @ stdcall ImmGetCandidateListA(long long ptr long) @ stdcall ImmGetCandidateListCountA(long ptr) @ stdcall ImmGetCandidateListCountW(long ptr) @ stdcall ImmGetCandidateListW(long long ptr long) @ stdcall ImmGetCandidateWindow(long long ptr) -@ stdcall ImmGetCompositionFontA(long ptr) -@ stdcall ImmGetCompositionFontW(long ptr) -@ stdcall ImmGetCompositionString (long long ptr long) ImmGetCompositionStringA -@ stdcall ImmGetCompositionStringA (long long ptr long) -@ stdcall ImmGetCompositionStringW (long long ptr long) -@ stdcall ImmGetCompositionWindow(long ptr) -@ stdcall ImmGetContext(long) -@ stdcall ImmGetConversionListA(long long str ptr long long) -@ stdcall ImmGetConversionListW(long long wstr ptr long long) -@ stdcall ImmGetConversionStatus(long ptr ptr) -@ stdcall ImmGetDefaultIMEWnd(long) +@ stdcall ImmGetCompositionFontA(ptr ptr) +@ stdcall ImmGetCompositionFontW(ptr ptr) +@ stdcall ImmGetCompositionString(ptr long ptr long) ImmGetCompositionStringA +@ stdcall ImmGetCompositionStringA(ptr long ptr long) +@ stdcall ImmGetCompositionStringW(ptr long ptr long) +@ stdcall ImmGetCompositionWindow(ptr ptr) +@ stdcall ImmGetContext(ptr) +@ stdcall ImmGetConversionListA(long ptr str ptr long long) +@ stdcall ImmGetConversionListW(long ptr wstr ptr long long) +@ stdcall ImmGetConversionStatus(ptr ptr ptr) +@ stdcall ImmGetDefaultIMEWnd(ptr) @ stdcall ImmGetDescriptionA(long ptr long) @ stdcall ImmGetDescriptionW(long ptr long) -@ stdcall ImmGetGuideLineA(long long ptr long) -@ stdcall ImmGetGuideLineW(long long ptr long) +@ stdcall ImmGetGuideLineA(ptr long ptr long) +@ stdcall ImmGetGuideLineW(ptr long ptr long) @ stdcall ImmGetHotKey(long ptr ptr ptr) -@ stdcall ImmGetIMCCLockCount(long) -@ stdcall ImmGetIMCCSize(long) -@ stdcall ImmGetIMCLockCount(long) +@ stdcall ImmGetIMCCLockCount(ptr) +@ stdcall ImmGetIMCCSize(ptr) +@ stdcall ImmGetIMCLockCount(ptr) @ stdcall ImmGetIMEFileNameA(long ptr long) @ stdcall ImmGetIMEFileNameW(long ptr long) @ stdcall ImmGetImeInfoEx(ptr long ptr) -@ stdcall ImmGetImeMenuItemsA(long long long ptr ptr long) -@ stdcall ImmGetImeMenuItemsW(long long long ptr ptr long) -@ stdcall ImmGetOpenStatus(long) +@ stdcall ImmGetImeMenuItemsA(ptr long long ptr ptr long) +@ stdcall ImmGetImeMenuItemsW(ptr long long ptr ptr long) +@ stdcall ImmGetOpenStatus(ptr) @ stdcall ImmGetProperty(long long) @ stdcall ImmGetRegisterWordStyleA(long long ptr) @ stdcall ImmGetRegisterWordStyleW(long long ptr) -@ stdcall ImmGetStatusWindowPos(long ptr) -@ stdcall ImmGetVirtualKey(long) -@ stub ImmIMPGetIMEA -@ stub ImmIMPGetIMEW -@ stub ImmIMPQueryIMEA -@ stub ImmIMPQueryIMEW -@ stub ImmIMPSetIMEA -@ stub ImmIMPSetIMEW +@ stdcall ImmGetStatusWindowPos(ptr ptr) +@ stdcall ImmGetVirtualKey(ptr) +@ stdcall -stub ImmIMPGetIMEA(ptr ptr) +@ stdcall -stub ImmIMPGetIMEW(ptr ptr) +@ stdcall -stub ImmIMPQueryIMEA(ptr) +@ stdcall -stub ImmIMPQueryIMEW(ptr) +@ stdcall -stub ImmIMPSetIMEA(ptr ptr) +@ stdcall -stub ImmIMPSetIMEW(ptr ptr) @ stdcall ImmInstallIMEA(str str) @ stdcall ImmInstallIMEW(wstr wstr) @ stdcall ImmIsIME(long) @ stdcall ImmIsUIMessageA(long long long long) @ stdcall ImmIsUIMessageW(long long long long) -@ stub ImmLoadIME -@ stub ImmLoadLayout +@ stdcall -stub ImmLoadIME(long) +@ stdcall -stub ImmLoadLayout(long ptr) @ stub ImmLockClientImc -@ stdcall ImmLockIMC(long) -@ stdcall ImmLockIMCC(long) -@ stub ImmLockImeDpi -@ stdcall ImmNotifyIME(long long long long) +@ stdcall ImmLockIMC(ptr) +@ stdcall ImmLockIMCC(ptr) +@ stdcall -stub ImmLockImeDpi(long) +@ stdcall ImmNotifyIME(ptr long long long) @ stub ImmPenAuxInput -@ stdcall ImmProcessKey(long long long long long) -@ stub ImmPutImeMenuItemsIntoMappedFile -@ stdcall ImmReSizeIMCC(long long) +@ stdcall ImmProcessKey(ptr long long long long) +@ stdcall -stub ImmPutImeMenuItemsIntoMappedFile(ptr) +@ stdcall ImmReSizeIMCC(ptr long) @ stdcall ImmRegisterClient(ptr ptr) @ stdcall ImmRegisterWordA(long str long str) @ stdcall ImmRegisterWordW(long wstr long wstr) -@ stdcall ImmReleaseContext(long long) +@ stdcall ImmReleaseContext(ptr ptr) @ stdcall ImmRequestMessageA(ptr long long) @ stdcall ImmRequestMessageW(ptr long long) -@ stub ImmSendIMEMessageExA -@ stub ImmSendIMEMessageExW +@ stdcall -stub ImmSendIMEMessageExA(ptr long) +@ stdcall -stub ImmSendIMEMessageExW(ptr long) @ stub ImmSendMessageToActiveDefImeWndW @ stdcall ImmSetActiveContext(ptr ptr long) @ stdcall ImmSetActiveContextConsoleIME(ptr long) -@ stdcall ImmSetCandidateWindow(long ptr) -@ stdcall ImmSetCompositionFontA(long ptr) -@ stdcall ImmSetCompositionFontW(long ptr) -@ stdcall ImmSetCompositionStringA(long long ptr long ptr long) -@ stdcall ImmSetCompositionStringW(long long ptr long ptr long) -@ stdcall ImmSetCompositionWindow(long ptr) -@ stdcall ImmSetConversionStatus(long long long) +@ stdcall ImmSetCandidateWindow(ptr ptr) +@ stdcall ImmSetCompositionFontA(ptr ptr) +@ stdcall ImmSetCompositionFontW(ptr ptr) +@ stdcall ImmSetCompositionStringA(ptr long ptr long ptr long) +@ stdcall ImmSetCompositionStringW(ptr long ptr long ptr long) +@ stdcall ImmSetCompositionWindow(ptr ptr) +@ stdcall ImmSetConversionStatus(ptr long long) #@ stdcall ImmSetHotKey(long long long ptr) user32.CliImmSetHotKey -@ stdcall ImmSetOpenStatus(long long) -@ stdcall ImmSetStatusWindowPos(long ptr) +@ stdcall ImmSetOpenStatus(ptr long) +@ stdcall ImmSetStatusWindowPos(ptr ptr) @ stdcall ImmShowSoftKeyboard(ptr long) -@ stdcall ImmSimulateHotKey(long long) -@ stub ImmSystemHandler -@ stdcall ImmTranslateMessage(long long long long) +@ stdcall ImmSimulateHotKey(ptr long) +@ stdcall -stub ImmSystemHandler(ptr long long) +@ stdcall ImmTranslateMessage(ptr long long long) @ stub ImmUnlockClientImc -@ stdcall ImmUnlockIMC(long) -@ stdcall ImmUnlockIMCC(long) -@ stub ImmUnlockImeDpi +@ stdcall ImmUnlockIMC(ptr) +@ stdcall ImmUnlockIMCC(ptr) +@ stdcall -stub ImmUnlockImeDpi(ptr) @ stdcall ImmUnregisterWordA(long str long str) @ stdcall ImmUnregisterWordW(long wstr long wstr) -@ stub ImmWINNLSEnableIME -@ stub ImmWINNLSGetEnableStatus +@ stdcall -stub ImmWINNLSEnableIME(ptr long) +@ stdcall -stub ImmWINNLSGetEnableStatus(ptr) @ stub ImmWINNLSGetIMEHotkey ################################################################ diff --git a/win32ss/user/user32/misc/immtable.h b/win32ss/user/user32/misc/immtable.h new file mode 100644 index 00000000000..d0cbdc2e4a5 --- /dev/null +++ b/win32ss/user/user32/misc/immtable.h @@ -0,0 +1,52 @@ +DEFINE_IMM_ENTRY(BOOL, ImmWINNLSEnableIME, (HWND, BOOL)) +DEFINE_IMM_ENTRY(BOOL, ImmWINNLSGetEnableStatus, (HWND)) +DEFINE_IMM_ENTRY(LRESULT, ImmSendIMEMessageExW, (HWND, LPARAM)) +DEFINE_IMM_ENTRY(LRESULT, ImmSendIMEMessageExA, (HWND, LPARAM)) +DEFINE_IMM_ENTRY(BOOL, ImmIMPGetIMEW, (HWND, LPIMEPROW)) +DEFINE_IMM_ENTRY(BOOL, ImmIMPGetIMEA, (HWND, LPIMEPROA)) +DEFINE_IMM_ENTRY(BOOL, ImmIMPQueryIMEW, (LPIMEPROW)) +DEFINE_IMM_ENTRY(BOOL, ImmIMPQueryIMEA, (LPIMEPROA)) +DEFINE_IMM_ENTRY(BOOL, ImmIMPSetIMEW, (HWND, LPIMEPROW)) +DEFINE_IMM_ENTRY(BOOL, ImmIMPSetIMEA, (HWND, LPIMEPROA)) +DEFINE_IMM_ENTRY(HIMC, ImmAssociateContext, (HWND, HIMC)) +DEFINE_IMM_ENTRY(LRESULT, ImmEscapeA, (HKL, HIMC, UINT, LPVOID)) +DEFINE_IMM_ENTRY(LRESULT, ImmEscapeW, (HKL, HIMC, UINT, LPVOID)) +DEFINE_IMM_ENTRY(LONG, ImmGetCompositionStringA, (HIMC, DWORD, LPVOID, DWORD)) +DEFINE_IMM_ENTRY(LONG, ImmGetCompositionStringW, (HIMC, DWORD, LPVOID, DWORD)) +DEFINE_IMM_ENTRY(BOOL, ImmGetCompositionWindow, (HIMC, LPCOMPOSITIONFORM)) +DEFINE_IMM_ENTRY(HIMC, ImmGetContext, (HWND)) +DEFINE_IMM_ENTRY(HWND, ImmGetDefaultIMEWnd, (HWND)) +DEFINE_IMM_ENTRY(BOOL, ImmIsIME, (HKL)) +DEFINE_IMM_ENTRY(BOOL, ImmReleaseContext, (HWND, HIMC)) +DEFINE_IMM_ENTRY(BOOL, ImmRegisterClient, (/*PSHAREDINFO*/ LPVOID, HINSTANCE)) +DEFINE_IMM_ENTRY(BOOL, ImmGetCompositionFontW, (HIMC, LPLOGFONTW)) +DEFINE_IMM_ENTRY(BOOL, ImmGetCompositionFontA, (HIMC, LPLOGFONTA)) +DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionFontW, (HIMC, LPLOGFONTW)) +DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionFontA, (HIMC, LPLOGFONTA)) +DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionWindow, (HIMC, LPCOMPOSITIONFORM)) +DEFINE_IMM_ENTRY(BOOL, ImmNotifyIME, (HIMC, DWORD, DWORD, DWORD)) +DEFINE_IMM_ENTRY(PINPUTCONTEXT, ImmLockIMC, (HIMC)) +DEFINE_IMM_ENTRY(BOOL, ImmUnlockIMC, (HIMC)) +DEFINE_IMM_ENTRY(BOOL, ImmLoadIME, (HKL)) +DEFINE_IMM_ENTRY(BOOL, ImmSetOpenStatus, (HIMC, BOOL)) +DEFINE_IMM_ENTRY(BOOL, ImmFreeLayout, (DWORD)) +DEFINE_IMM_ENTRY(BOOL, ImmActivateLayout, (HKL)) +DEFINE_IMM_ENTRY(BOOL, ImmSetCandidateWindow, (HIMC, LPCANDIDATEFORM)) +DEFINE_IMM_ENTRY(BOOL, ImmConfigureIMEW, (HKL, HWND, DWORD, LPVOID)) +DEFINE_IMM_ENTRY(BOOL, ImmGetConversionStatus, (HIMC, LPDWORD, LPDWORD)) +DEFINE_IMM_ENTRY(BOOL, ImmSetConversionStatus, (HIMC, DWORD, DWORD)) +DEFINE_IMM_ENTRY(BOOL, ImmSetStatusWindowPos, (HIMC, LPPOINT)) +DEFINE_IMM_ENTRY(BOOL, ImmGetImeInfoEx, (PIMEINFOEX, IMEINFOEXCLASS, LPVOID)) +DEFINE_IMM_ENTRY(PIMEDPI, ImmLockImeDpi, (HKL)) +DEFINE_IMM_ENTRY(VOID, ImmUnlockImeDpi, (/*PIMEDPI*/ LPVOID)) +DEFINE_IMM_ENTRY(BOOL, ImmGetOpenStatus, (HIMC)) +DEFINE_IMM_ENTRY(BOOL, ImmSetActiveContext, (HWND, HIMC, BOOL)) +DEFINE_IMM_ENTRY(BOOL, ImmTranslateMessage, (HWND, UINT, WPARAM, LPARAM)) +DEFINE_IMM_ENTRY(BOOL, ImmLoadLayout, (HKL, PIMEINFOEX)) +DEFINE_IMM_ENTRY(DWORD, ImmProcessKey, (HWND, HKL, UINT, LPARAM, DWORD)) +DEFINE_IMM_ENTRY(LRESULT, ImmPutImeMenuItemsIntoMappedFile, (HIMC)) +DEFINE_IMM_ENTRY(DWORD, ImmGetProperty, (HKL, DWORD)) +DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionStringA, (HIMC, DWORD, LPCVOID, DWORD, LPCVOID, DWORD)) +DEFINE_IMM_ENTRY(BOOL, ImmSetCompositionStringW, (HIMC, DWORD, LPCVOID, DWORD, LPCVOID, DWORD)) +DEFINE_IMM_ENTRY(BOOL, ImmEnumInputContext, (DWORD, IMCENUMPROC, LPARAM)) +DEFINE_IMM_ENTRY(LRESULT, ImmSystemHandler, (HIMC, WPARAM, LPARAM))

4 years, 8 months

1
0
0 0

[reactos] 01/01: [RAPPS] Update help command (#3209)

by He Yang

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fbbc3efd60bdf5986a6c7… commit fbbc3efd60bdf5986a6c7ff5a7cee4c3a51689e5 Author: He Yang <1160386205(a)qq.com> AuthorDate: Sat Sep 19 20:20:14 2020 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 19 15:20:14 2020 +0300 [RAPPS] Update help command (#3209) Add missing FIND and INFO commands to the usage help string. --- base/applications/rapps/include/unattended.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/base/applications/rapps/include/unattended.h b/base/applications/rapps/include/unattended.h index c5bc8797b01..301f54ab9e7 100644 --- a/base/applications/rapps/include/unattended.h +++ b/base/applications/rapps/include/unattended.h @@ -6,6 +6,11 @@ #define CMD_KEY_INFO L"INFO" #define CMD_KEY_HELP L"?" -const WCHAR UsageString[] = L"RAPPS [/" CMD_KEY_HELP "] [/" CMD_KEY_INSTALL " packagename] [/" CMD_KEY_SETUP " filename]"; +const WCHAR UsageString[] = L"RAPPS \ +[/" CMD_KEY_HELP L"] \ +[/" CMD_KEY_INSTALL L" packagename] \ +[/" CMD_KEY_SETUP L" filename] \ +[/" CMD_KEY_FIND L" string] \ +[/" CMD_KEY_INFO L" packagename]"; BOOL ParseCmdAndExecute(LPWSTR lpCmdLine, BOOL bIsFirstLaunch, int nCmdShow);

4 years, 8 months

1
0
0 0

[reactos] 01/01: [APPWIZ] Add ES_AUTOHSCROLL to allow users to enter long text

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d905dd531838c134b59c1… commit d905dd531838c134b59c10bf4246b63af4a0feb3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 19 13:50:58 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Sep 19 13:50:58 2020 +0900 [APPWIZ] Add ES_AUTOHSCROLL to allow users to enter long text CORE-17291 --- dll/cpl/appwiz/lang/bg-BG.rc | 4 ++-- dll/cpl/appwiz/lang/cs-CZ.rc | 4 ++-- dll/cpl/appwiz/lang/de-DE.rc | 4 ++-- dll/cpl/appwiz/lang/el-GR.rc | 4 ++-- dll/cpl/appwiz/lang/en-US.rc | 4 ++-- dll/cpl/appwiz/lang/es-ES.rc | 4 ++-- dll/cpl/appwiz/lang/et-EE.rc | 4 ++-- dll/cpl/appwiz/lang/fr-FR.rc | 4 ++-- dll/cpl/appwiz/lang/he-IL.rc | 4 ++-- dll/cpl/appwiz/lang/id-ID.rc | 4 ++-- dll/cpl/appwiz/lang/it-IT.rc | 4 ++-- dll/cpl/appwiz/lang/ja-JP.rc | 4 ++-- dll/cpl/appwiz/lang/no-NO.rc | 4 ++-- dll/cpl/appwiz/lang/pl-PL.rc | 4 ++-- dll/cpl/appwiz/lang/pt-BR.rc | 4 ++-- dll/cpl/appwiz/lang/pt-PT.rc | 4 ++-- dll/cpl/appwiz/lang/ro-RO.rc | 4 ++-- dll/cpl/appwiz/lang/ru-RU.rc | 4 ++-- dll/cpl/appwiz/lang/sk-SK.rc | 4 ++-- dll/cpl/appwiz/lang/sq-AL.rc | 4 ++-- dll/cpl/appwiz/lang/tr-TR.rc | 4 ++-- dll/cpl/appwiz/lang/uk-UA.rc | 4 ++-- dll/cpl/appwiz/lang/zh-CN.rc | 4 ++-- dll/cpl/appwiz/lang/zh-TW.rc | 4 ++-- 24 files changed, 48 insertions(+), 48 deletions(-) diff --git a/dll/cpl/appwiz/lang/bg-BG.rc b/dll/cpl/appwiz/lang/bg-BG.rc index 1771b697598..2461e5f6f7c 100644 --- a/dll/cpl/appwiz/lang/bg-BG.rc +++ b/dll/cpl/appwiz/lang/bg-BG.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Вълшебникът ви помага за създаването на препратки към местни или мрежови приложения, файлове, папки, компютри или адреси в интернет.", -1, 120, 15, 200, 32 LTEXT "Напишете местоположението на предмета:", -1, 120, 50, 160, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Обзор...", IDC_SHORTCUT_BROWSE, 275, 65, 55, 15, ES_LEFT LTEXT "Натиснете ""Напред"" за продължаване.", -1, 120, 100, 160, 10 END @@ -37,7 +37,7 @@ CAPTION "Изберете заглавие за приложението" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Напишете име за препратката:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Натиснете ""Край"" за създаване на препратка.", -1, 120, 50, 170, 10 END diff --git a/dll/cpl/appwiz/lang/cs-CZ.rc b/dll/cpl/appwiz/lang/cs-CZ.rc index a03f07ba4b9..76f9163173a 100644 --- a/dll/cpl/appwiz/lang/cs-CZ.rc +++ b/dll/cpl/appwiz/lang/cs-CZ.rc @@ -31,7 +31,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Tento průvodce pomůže s vytvořením zástupců na místní\nnebo síťové programy, soubory, složky, počítače nebo\ninternetové adresy.", -1, 120, 15, 200, 30 LTEXT "Zadejte umístění položky:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Procházet...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Pokračujte kliknutím na Další.", -1, 120, 97, 162, 10 END @@ -42,7 +42,7 @@ CAPTION "Zvolte název programu" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Zadejte název tohoto zástupce:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Kliknutím na Dokončit vytvoříte zástupce.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/de-DE.rc b/dll/cpl/appwiz/lang/de-DE.rc index f44b8e79fee..df7c01c0cc8 100644 --- a/dll/cpl/appwiz/lang/de-DE.rc +++ b/dll/cpl/appwiz/lang/de-DE.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Mit diesem Assistenten können Sie Verknüpfungen mit lokalen oder vernetzten Programmen, Dateien, Ordnern, Computern oder Internetadressen erstellen.", -1, 120, 15, 200, 30 LTEXT "&Geben Sie den Speicherort des Elements ein:", -1, 120, 50, 150, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "&Durchsuchen...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Klicken Sie auf Weiter, um fortzufahren.", -1, 120, 97, 162, 10 END @@ -37,7 +37,7 @@ CAPTION "Programmbezeichnung auswählen" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Geben Sie den Namen für die Verknüpfung ein:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Klicken Sie auf Fertig stellen, um die Verknüpfung zu erstellen.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/el-GR.rc b/dll/cpl/appwiz/lang/el-GR.rc index 53c815a9f37..6911ffdfc39 100644 --- a/dll/cpl/appwiz/lang/el-GR.rc +++ b/dll/cpl/appwiz/lang/el-GR.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Αυτός ο οδηγός σας βοηθάει να δημιουργήσετε συντομεύσεις σε τοπικά προγράμματα ή προγράμματα δικτύου, αρχεία, φακέλους, υπολογιστές ή διευθύνσεις στο διαδίκτυο.", -1, 120, 15, 200, 30 LTEXT "Εισάγετε την θέση του στοιχείου:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Αναζήτηση...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Πατήστε 'Επόμενο' για να συνεχίσετε.", -1, 120, 97, 162, 10 END @@ -37,7 +37,7 @@ CAPTION "Επιλέξτε τίτλο για το πρόγραμμα" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Πληκτρολογήστε ένα όνομα για τη συντόμευση:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Πατήστε 'Τέλος' για να δημιουργήσετε τη συντόμευση.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/en-US.rc b/dll/cpl/appwiz/lang/en-US.rc index 7f25e1b4a74..1cf1a7ab924 100644 --- a/dll/cpl/appwiz/lang/en-US.rc +++ b/dll/cpl/appwiz/lang/en-US.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 LTEXT "Type the location of the item:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Browse...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Click Next to continue.", -1, 120, 97, 162, 10 END @@ -37,7 +37,7 @@ CAPTION "Select a Title for the Program" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Type a name for this shortcut:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Click Finish to create the shortcut.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/es-ES.rc b/dll/cpl/appwiz/lang/es-ES.rc index 9758843998e..2683b85fbab 100644 --- a/dll/cpl/appwiz/lang/es-ES.rc +++ b/dll/cpl/appwiz/lang/es-ES.rc @@ -35,7 +35,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Este asistente le ayudará a crear accesos directos a programas locales o en red, archivos, carpetas, equipos, o direcciones de Internet.", -1, 120, 15, 200, 30 LTEXT "Escriba la ubicación del elemento:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Examinar...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Presione Siguiente para continuar.", -1, 120, 97, 162, 10 END @@ -46,7 +46,7 @@ CAPTION "Seleccione un título para el programa" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Escriba un nombre para este acceso directo:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Haga clic en Finalizar para crear el acceso directo.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/et-EE.rc b/dll/cpl/appwiz/lang/et-EE.rc index 1536a64b7ef..2e1bcf4b404 100644 --- a/dll/cpl/appwiz/lang/et-EE.rc +++ b/dll/cpl/appwiz/lang/et-EE.rc @@ -33,7 +33,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Selle viisardi abil saate luua otseteid kohalike või\nvõrguprogrammide, failide, kaustada, arvutite või\nInterneti-aadresside juurde.", -1, 120, 15, 200, 30 LTEXT "Tippige üksuse asukoht:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Sirvi...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Jätkamiseks klõpsake nuppu Edasi.", -1, 120, 97, 162, 10 END @@ -44,7 +44,7 @@ CAPTION "Programmi jaoks tiitli valimine" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Tippige selle otsetee nimi:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Otsetee loomiseks klõpsake nuppu Valmis.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/fr-FR.rc b/dll/cpl/appwiz/lang/fr-FR.rc index e03f2ef5d7c..59a069a0739 100644 --- a/dll/cpl/appwiz/lang/fr-FR.rc +++ b/dll/cpl/appwiz/lang/fr-FR.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Cet assistant vous aide à créer des raccourcis vers des programmes, des fichiers, des dossiers, des ordinateurs,\nou des adresses Internet locaux ou sur le réseau.", -1, 120, 15, 200, 30 LTEXT "Entrez la localisation de l'élément :", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Parcourir...", IDC_SHORTCUT_BROWSE, 272, 65, 60, 15, ES_LEFT LTEXT "Cliquez sur Suivant pour continuer.", -1, 120, 97, 162, 10 END @@ -37,7 +37,7 @@ CAPTION "Sélectionnez un titre pour le programme" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "En&trez un nom pour ce raccourci :", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Cliquez sur Terminer pour créer le raccourci.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/he-IL.rc b/dll/cpl/appwiz/lang/he-IL.rc index ade66f0999d..cb068fdaec9 100644 --- a/dll/cpl/appwiz/lang/he-IL.rc +++ b/dll/cpl/appwiz/lang/he-IL.rc @@ -27,7 +27,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "This wizard helps you to create shortcuts to local or\nnetwork programs, files, folders, computers, or Internet\naddresses.", -1, 120, 15, 200, 30 LTEXT "הקלד את מיקום הפריט:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "סייר...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "לחץ הבא כדי להמשיך.", -1, 120, 97, 162, 10 END @@ -38,7 +38,7 @@ CAPTION "בחירת שם לתכנית" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "הקלד שם עבור קיצור דרך זה:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "לחץ על סיום כדי ליצור את קיצור הדרך.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/id-ID.rc b/dll/cpl/appwiz/lang/id-ID.rc index 32e0a8ea171..4be97de03c6 100644 --- a/dll/cpl/appwiz/lang/id-ID.rc +++ b/dll/cpl/appwiz/lang/id-ID.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Penuntun ini membantu membuat pintasan pada lokal atau\njaringan berupa program, berkas, folder, Komputer, atau Alamat Internet.", -1, 120, 15, 200, 30 LTEXT "Ketik lokasi butir:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Cari...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Klik Lanjut untuk meneruskan.", -1, 120, 97, 162, 10 END @@ -37,7 +37,7 @@ CAPTION "Pilih Judul untuk Program" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Ketik nama untuk pintasan ini:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Klik Selesai untuk membuat pintasan.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/it-IT.rc b/dll/cpl/appwiz/lang/it-IT.rc index 1aa8d164e79..c545681392a 100644 --- a/dll/cpl/appwiz/lang/it-IT.rc +++ b/dll/cpl/appwiz/lang/it-IT.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Questo wizard permette la creazione di collegamenti verso programmi locali o di rete, file, cartella, computer, o\nindirizzi Internet.", -1, 120, 15, 200, 30 LTEXT "Digitare la posizione:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Sfoglia...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Premere Avanti per continuare.", -1, 120, 97, 162, 10 END @@ -37,7 +37,7 @@ CAPTION "Scelta del titolo del programma" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Digitare il nome per questo collegamento:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Premere Fine per creare il collegamento.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/ja-JP.rc b/dll/cpl/appwiz/lang/ja-JP.rc index 045e9ac89de..ddbe0f6cc4f 100644 --- a/dll/cpl/appwiz/lang/ja-JP.rc +++ b/dll/cpl/appwiz/lang/ja-JP.rc @@ -26,7 +26,7 @@ FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN LTEXT "このウィザードは、ローカルまたはネットワークプログラム、ファイル、フォルダー、コンピューター、またはインターネットアドレスへのショートカットを作成するのを助けます。", -1, 120, 15, 200, 30 LTEXT "項目の位置を入力して下さい:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "参照...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "次へをクリックすると続行します。", -1, 120, 97, 162, 10 END @@ -37,7 +37,7 @@ CAPTION "プログラムのタイトルを選択します" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN LTEXT "このショートカットの名前を入力して下さい(&T):", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "完了をクリックするとショートカットを作成します。", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/no-NO.rc b/dll/cpl/appwiz/lang/no-NO.rc index 8731c9b70c4..72b6971e4ee 100644 --- a/dll/cpl/appwiz/lang/no-NO.rc +++ b/dll/cpl/appwiz/lang/no-NO.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Denne veiviseren vil hjelper deg å lage snarvei til en lokal eller\nnettverk programmer, filer, mapper, datamaskiner, eller internett\nadresse.", -1, 120, 15, 200, 30 LTEXT "Velg din lagring plassering:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Bla gjennom...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Trykk på neste for å fortsette.", -1, 120, 97, 162, 10 END @@ -37,7 +37,7 @@ CAPTION "Velg en tittel for programmet" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Skriv inn et navn for denne snarveien:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Trykk på fullført for å opprette snarveien.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/pl-PL.rc b/dll/cpl/appwiz/lang/pl-PL.rc index 15345cb7002..5f8eb9bf1cd 100644 --- a/dll/cpl/appwiz/lang/pl-PL.rc +++ b/dll/cpl/appwiz/lang/pl-PL.rc @@ -37,7 +37,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Ten program pomoże ci stworzyć skróty do lokalnych lub sieciowych programów, plików, katalogów, komputerów, bądź adresów Internetowych.", -1, 120, 15, 200, 30 LTEXT "Wpisz ścieżkę dostępu do obiektu:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Przeglądaj...", IDC_SHORTCUT_BROWSE, 274, 65, 55, 15, ES_LEFT LTEXT "Kliknij Dalej, aby kontynuować.", -1, 120, 97, 162, 10 END @@ -48,7 +48,7 @@ CAPTION "Wybierz nazwę" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Wpisz nazwę dla tego skrótu:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Kliknij Zakończ, by utworzyć skrót.", -1, 120, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/pt-BR.rc b/dll/cpl/appwiz/lang/pt-BR.rc index 35404e74dc2..1b5fb17e00c 100644 --- a/dll/cpl/appwiz/lang/pt-BR.rc +++ b/dll/cpl/appwiz/lang/pt-BR.rc @@ -28,7 +28,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Este assitente irá ajudá-lo a criar atalhos para\nprogramas, arquivos, pastas, computadores ou endereços\nde Internet, ambos locais ou de rede.", -1, 120, 15, 200, 30 LTEXT "Digite a localização do item:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Procurar...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Pressione Próximo para prosseguir.", -1, 120, 97, 162, 10 END @@ -39,7 +39,7 @@ CAPTION "Selecione um Título para o Programa" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Digite um nome para este atalho:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Pressione Terminar para criar o atalho.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/pt-PT.rc b/dll/cpl/appwiz/lang/pt-PT.rc index cac74180974..297c4e83b1d 100644 --- a/dll/cpl/appwiz/lang/pt-PT.rc +++ b/dll/cpl/appwiz/lang/pt-PT.rc @@ -28,7 +28,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Este assitente irá ajudá-lo a criar atalhos para\nprogramas, arquivos, pastas, computadores ou endereços\nde Internet, ambos locais ou de rede.", -1, 120, 15, 200, 30 LTEXT "Digite a localização do item:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Procurar...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Pressione Próximo para prosseguir.", -1, 120, 97, 162, 10 END @@ -39,7 +39,7 @@ CAPTION "Seleccione um Título para o Programa" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Digite um nome para este atalho:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Pressione Terminar para criar o atalho.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/ro-RO.rc b/dll/cpl/appwiz/lang/ro-RO.rc index 45eb1112d49..9a8d36f9b4e 100644 --- a/dll/cpl/appwiz/lang/ro-RO.rc +++ b/dll/cpl/appwiz/lang/ro-RO.rc @@ -32,7 +32,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Acest asistent vă va ajuta în crearea unei scurtături\ncătre adrese din Internet, calculatoare, dosare, fișiere\nlocale sau din rețea.", -1, 120, 15, 200, 30 LTEXT "Scrieți adresa elementului:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Spe&cificare…", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Apăsați „Înainte” pentru a continua.", -1, 120, 97, 162, 10 END @@ -43,7 +43,7 @@ CAPTION "Asistent pentru creare de scurtătură" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Scrieți un n&ume pentru scurtătură:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Apăsați „Sfârșit” pentru a crea scurtătura.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/ru-RU.rc b/dll/cpl/appwiz/lang/ru-RU.rc index 42d1c80017e..fcabc788e33 100644 --- a/dll/cpl/appwiz/lang/ru-RU.rc +++ b/dll/cpl/appwiz/lang/ru-RU.rc @@ -26,7 +26,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Этот мастер поможет создать ярлык для локальных или\nсетевых программ, файлов, папок, компьютеров или\nИнтернет-адресов.", -1, 120, 15, 200, 30 LTEXT "Выберите местоположение элемента:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Обзор...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Щелкните ""Далее"" для продолжения.", -1, 120, 97, 162, 10 END @@ -37,7 +37,7 @@ CAPTION "Выбор заголовка для программы" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Введите заголовок ярлыка:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Щелкните ""Завершить"" для создания ярлыка.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/sk-SK.rc b/dll/cpl/appwiz/lang/sk-SK.rc index 5a52da02bdc..0e10958df79 100644 --- a/dll/cpl/appwiz/lang/sk-SK.rc +++ b/dll/cpl/appwiz/lang/sk-SK.rc @@ -30,7 +30,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Tento sprievodca Vám pomôže vytvoriť odkazy na miestne alebo\nsieťové programy, súbory, priečinky, počítače, alebo internetové\nadresy.", -1, 120, 15, 200, 30 LTEXT "Zadajte umiestnenie položky:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "&Prehľadávať...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Kliknite na tlačidlo Ďalej pre pokračovanie.", -1, 120, 97, 162, 10 END @@ -41,7 +41,7 @@ CAPTION "Select a Title for the Program" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Napíšte názov pre tento odkaz:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Kliknite na tlačidlo Dokončiť pre vytvorenie odkazu.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/sq-AL.rc b/dll/cpl/appwiz/lang/sq-AL.rc index bf247b9a099..3d114275343 100644 --- a/dll/cpl/appwiz/lang/sq-AL.rc +++ b/dll/cpl/appwiz/lang/sq-AL.rc @@ -30,7 +30,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Ky magjistar ju ndihmon për të krijuar shkurtesat për të lokale ose\nprograme networku, dokumenta, dosje, kompjutra, ose adresa\nInterneti.", -1, 120, 15, 200, 30 LTEXT "Shkruaj vendndodhjen e sendit:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Shfleto...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Klikoni Next për të vazhduar.", -1, 120, 97, 162, 10 END @@ -41,7 +41,7 @@ CAPTION "Zgjidh një titull për Programin" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Shkruaj nje emer per kete shortcut:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Kliko Finish per te krijuar një shortcut.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/tr-TR.rc b/dll/cpl/appwiz/lang/tr-TR.rc index a45bf5a6d7e..bfe17114860 100644 --- a/dll/cpl/appwiz/lang/tr-TR.rc +++ b/dll/cpl/appwiz/lang/tr-TR.rc @@ -28,7 +28,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Bu yardımcı, yerli ya da ağdaki izlencelere, kütüklere,\ndizinlere, bilgisayarlara ve Umûmî Ağ adreslerine\nkısayollar oluşturmanıza yardım eder.", -1, 120, 15, 200, 30 LTEXT "Öğenin konumunu yazınız:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "&Göz At...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Sürdürmek için ""İleri""ye tıklayınız.", -1, 120, 97, 162, 10 END @@ -39,7 +39,7 @@ CAPTION "İzlencenin Adını Seç" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Bu kısayol için bir ad yazınız:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Kısayolu oluşturmak için ""Bitir""e tıklayınız.", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/uk-UA.rc b/dll/cpl/appwiz/lang/uk-UA.rc index 965dc6233f2..79af27fdb4f 100644 --- a/dll/cpl/appwiz/lang/uk-UA.rc +++ b/dll/cpl/appwiz/lang/uk-UA.rc @@ -34,7 +34,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Цей майстер допомагає створити ярлик, який указує на\nлокальні або мережні програми, файли, папки, комп'ютери\nабо адреси в Інтернеті.", -1, 120, 15, 200, 30 LTEXT "Укажіть розташування об'єкта:", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "Огляд...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "Щоб продовжити установку, натисніть кнопку ""Далі"".", -1, 120, 97, 162, 10 END @@ -45,7 +45,7 @@ CAPTION "Вибір назви програми" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Введіть ім'я ярлика:", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "Щоб створити ярлик, натисніть кнопку ""Готово"".", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/zh-CN.rc b/dll/cpl/appwiz/lang/zh-CN.rc index 42d017c2dd1..1ac9c908e01 100644 --- a/dll/cpl/appwiz/lang/zh-CN.rc +++ b/dll/cpl/appwiz/lang/zh-CN.rc @@ -35,7 +35,7 @@ FONT 9, "宋体", 0, 0, 0x0 BEGIN LTEXT "此向导可帮助您创建本地或网络程序、文件、文件夹、计算机或 Internet 地址的快捷方式。", -1, 120, 15, 200, 30 LTEXT "请输入项目位置：", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "浏览...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "点击“下一步”继续。", -1, 120, 97, 162, 10 END @@ -46,7 +46,7 @@ CAPTION "选择程序标题" FONT 9, "宋体", 0, 0, 0x0 BEGIN LTEXT "输入快捷方式名称(&T)：", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "点击“完成”创建快捷方式", -1, 118, 97, 178, 17 END diff --git a/dll/cpl/appwiz/lang/zh-TW.rc b/dll/cpl/appwiz/lang/zh-TW.rc index a33c0b93a52..76acffcfdaf 100644 --- a/dll/cpl/appwiz/lang/zh-TW.rc +++ b/dll/cpl/appwiz/lang/zh-TW.rc @@ -35,7 +35,7 @@ FONT 9, "新細明體", 0, 0, 0x0 BEGIN LTEXT "此精靈幫助您建立本地或網路程式、檔案、目錄、電腦或網際網路地址的捷徑。", -1, 120, 15, 200, 30 LTEXT "輸入項目位置：", -1, 120, 50, 120, 10 - EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT | ES_AUTOHSCROLL PUSHBUTTON "瀏覽...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT LTEXT "按 [下一步] 繼續。", -1, 120, 97, 162, 10 END @@ -46,7 +46,7 @@ CAPTION "選擇程式標題" FONT 9, "新細明體", 0, 0, 0x0 BEGIN LTEXT "輸入捷徑名稱(&T)：", -1, 120, 15, 150, 10 - EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT + EDITTEXT IDC_SHORTCUT_NAME, 120, 35, 150, 15, ES_LEFT | ES_AUTOHSCROLL LTEXT "按 [完成] 建立捷徑", -1, 118, 97, 178, 17 END

4 years, 8 months

1
0
0 0

[reactos] 01/01: [SHELL32][SHELLEXT] Fix use of SHFileOperation results and improve log on failure / fix log spam (#3198)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5a30fc249e24108317a3… commit a5a30fc249e24108317a37fd430b119e49e38f10 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Fri Sep 18 21:19:55 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Sep 18 21:19:55 2020 +0200 [SHELL32][SHELLEXT] Fix use of SHFileOperation results and improve log on failure / fix log spam (#3198) --- dll/shellext/mydocs/CMyDocsDropHandler.cpp | 7 ++++- dll/win32/shell32/CCopyToMenu.cpp | 8 +++++- dll/win32/shell32/CMoveToMenu.cpp | 8 +++++- dll/win32/shell32/droptargets/CFSDropTarget.cpp | 33 ++++++++++++++-------- .../shell32/droptargets/CRecyclerDropTarget.cpp | 5 ++-- dll/win32/shell32/shellrecyclebin/recyclebin_v5.c | 6 ++-- dll/win32/shell32/shlfileop.cpp | 4 +++ 7 files changed, 53 insertions(+), 18 deletions(-) diff --git a/dll/shellext/mydocs/CMyDocsDropHandler.cpp b/dll/shellext/mydocs/CMyDocsDropHandler.cpp index cd74af6d016..477ca4b1d7f 100644 --- a/dll/shellext/mydocs/CMyDocsDropHandler.cpp +++ b/dll/shellext/mydocs/CMyDocsDropHandler.cpp @@ -157,7 +157,12 @@ CMyDocsDropHandler::Drop(IDataObject *pDataObject, DWORD dwKeyState, fileop.pFrom = pszzSrcList; fileop.pTo = szzDir; fileop.fFlags = FOF_ALLOWUNDO | FOF_FILESONLY | FOF_MULTIDESTFILES | FOF_NOCONFIRMMKDIR; - SHFileOperationW(&fileop); + int res = SHFileOperationW(&fileop); + if (res) + { + ERR("SHFileOperationW failed with 0x%x\n", res); + hr = E_FAIL; + } // unlock buffer strSrcList.ReleaseBuffer(); diff --git a/dll/win32/shell32/CCopyToMenu.cpp b/dll/win32/shell32/CCopyToMenu.cpp index 47da3b11f44..de2e2921ecd 100644 --- a/dll/win32/shell32/CCopyToMenu.cpp +++ b/dll/win32/shell32/CCopyToMenu.cpp @@ -211,7 +211,13 @@ HRESULT CCopyToMenu::DoRealCopy(LPCMINVOKECOMMANDINFO lpici, LPCITEMIDLIST pidl) op.pFrom = strFiles; op.pTo = szPath; op.fFlags = FOF_ALLOWUNDO; - return ((SHFileOperation(&op) == 0) ? S_OK : E_FAIL); + int res = SHFileOperationW(&op); + if (res) + { + ERR("SHFileOperationW failed with 0x%x\n", res); + return E_FAIL; + } + return S_OK; } CStringW CCopyToMenu::DoGetFileTitle() diff --git a/dll/win32/shell32/CMoveToMenu.cpp b/dll/win32/shell32/CMoveToMenu.cpp index 7e74473e143..be90f97201a 100644 --- a/dll/win32/shell32/CMoveToMenu.cpp +++ b/dll/win32/shell32/CMoveToMenu.cpp @@ -178,7 +178,13 @@ HRESULT CMoveToMenu::DoRealMove(LPCMINVOKECOMMANDINFO lpici, LPCITEMIDLIST pidl) op.pFrom = strFiles; op.pTo = szPath; op.fFlags = FOF_ALLOWUNDO; - return ((SHFileOperation(&op) == 0) ? S_OK : E_FAIL); + int res = SHFileOperationW(&op); + if (res) + { + ERR("SHFileOperationW failed with 0x%x\n", res); + return E_FAIL; + } + return S_OK; } CStringW CMoveToMenu::DoGetFileTitle() diff --git a/dll/win32/shell32/droptargets/CFSDropTarget.cpp b/dll/win32/shell32/droptargets/CFSDropTarget.cpp index b8e67fd9adf..4fb1657da78 100644 --- a/dll/win32/shell32/droptargets/CFSDropTarget.cpp +++ b/dll/win32/shell32/droptargets/CFSDropTarget.cpp @@ -75,7 +75,7 @@ HRESULT CFSDropTarget::_CopyItems(IShellFolder * pSFFrom, UINT cidl, return hr; pszSrcList = BuildPathsList(strretFrom.pOleStr, cidl, apidl); - ERR("Source file (just the first) = %s, target path = %s, bCopy: %d\n", debugstr_w(pszSrcList), debugstr_w(m_sPathTarget), bCopy); + TRACE("Source file (just the first) = %s, target path = %s, bCopy: %d\n", debugstr_w(pszSrcList), debugstr_w(m_sPathTarget), bCopy); CoTaskMemFree(strretFrom.pOleStr); if (!pszSrcList) return E_OUTOFMEMORY; @@ -92,9 +92,11 @@ HRESULT CFSDropTarget::_CopyItems(IShellFolder * pSFFrom, UINT cidl, HeapFree(GetProcessHeap(), 0, pszSrcList); if (res) + { + ERR("SHFileOperationW failed with 0x%x\n", res); return E_FAIL; - else - return S_OK; + } + return S_OK; } CFSDropTarget::CFSDropTarget(): @@ -489,7 +491,10 @@ HRESULT CFSDropTarget::_DoDrop(IDataObject *pDataObject, { hr = pDataObject->GetData(&fmt, &medium); TRACE("CFSTR_SHELLIDLIST.\n"); - + if (FAILED(hr)) + { + ERR("CFSTR_SHELLIDLIST failed\n"); + } /* lock the handle */ LPIDA lpcida = (LPIDA)GlobalLock(medium.hGlobal); if (!lpcida) @@ -597,9 +602,9 @@ HRESULT CFSDropTarget::_DoDrop(IDataObject *pDataObject, } hr = ppf->Save(wszTarget, FALSE); - if (FAILED(hr)) - break; - SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, wszTarget, NULL); + if (FAILED(hr)) + break; + SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, wszTarget, NULL); } else { @@ -636,9 +641,9 @@ HRESULT CFSDropTarget::_DoDrop(IDataObject *pDataObject, break; hr = ppf->Save(wszTarget, TRUE); - if (FAILED(hr)) - break; - SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, wszTarget, NULL); + if (FAILED(hr)) + break; + SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, wszTarget, NULL); } } } @@ -680,7 +685,13 @@ HRESULT CFSDropTarget::_DoDrop(IDataObject *pDataObject, op.hwnd = m_hwndSite; op.wFunc = bCopy ? FO_COPY : FO_MOVE; op.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR; - hr = SHFileOperationW(&op); + int res = SHFileOperationW(&op); + if (res) + { + ERR("SHFileOperationW failed with 0x%x\n", res); + hr = E_FAIL; + } + return hr; } ERR("Error calling GetData\n"); diff --git a/dll/win32/shell32/droptargets/CRecyclerDropTarget.cpp b/dll/win32/shell32/droptargets/CRecyclerDropTarget.cpp index fa2b5ff1bcb..efd446d5cfa 100644 --- a/dll/win32/shell32/droptargets/CRecyclerDropTarget.cpp +++ b/dll/win32/shell32/droptargets/CRecyclerDropTarget.cpp @@ -58,9 +58,10 @@ class CRecyclerDropTarget : FileOp.fFlags = FOF_ALLOWUNDO; TRACE("Deleting file (just the first) = %s, allowundo: %d\n", debugstr_w(FileOp.pFrom), (FileOp.fFlags == FOF_ALLOWUNDO)); - if (SHFileOperationW(&FileOp) != 0) + int res = SHFileOperationW(&FileOp); + if (res) { - ERR("SHFileOperation failed with 0x%x\n", GetLastError()); + ERR("SHFileOperation failed with 0x%x\n", res); hr = E_FAIL; } diff --git a/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c b/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c index 518cd0f216e..4e333da9f27 100644 --- a/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c +++ b/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c @@ -503,10 +503,12 @@ RecycleBin5_RecycleBin5_Restore( op.pFrom = pDeletedFileName; op.pTo = pDeletedFile->FileNameW; - if (!SHFileOperationW(&op)) + int res = SHFileOperationW(&op); + if (res) { + ERR("SHFileOperationW failed with 0x%x\n", res); UnmapViewOfFile(pHeader); - return HRESULT_FROM_WIN32(GetLastError()); + return E_FAIL; } /* Clear last entry in the file */ diff --git a/dll/win32/shell32/shlfileop.cpp b/dll/win32/shell32/shlfileop.cpp index c9e7400bed2..204feceaafe 100644 --- a/dll/win32/shell32/shlfileop.cpp +++ b/dll/win32/shell32/shlfileop.cpp @@ -1027,6 +1027,10 @@ int WINAPI SHFileOperationA(LPSHFILEOPSTRUCTA lpFileOp) // Call the actual function retCode = SHFileOperationW(&nFileOp); + if (retCode) + { + ERR("SHFileOperationW failed with 0x%x\n", retCode); + } // Cleanup cleanup:

4 years, 8 months

1
0
0 0

[reactos] 01/01: [SDK][INCLUDE] Add ANSI/Unicode mappings for SHAboutInfo and SHGetValueGoodBoot

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ad5ae6389987d8322b6d… commit 3ad5ae6389987d8322b6db26a473efb8a34d19ff Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Sep 18 17:30:16 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Sep 18 17:30:16 2020 +0900 [SDK][INCLUDE] Add ANSI/Unicode mappings for SHAboutInfo and SHGetValueGoodBoot --- sdk/include/reactos/shlwapi_undoc.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index 7117d1c190b..328bd511db6 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -27,6 +27,12 @@ extern "C" { BOOL WINAPI SHAboutInfoA(LPSTR lpszDest, DWORD dwDestLen); BOOL WINAPI SHAboutInfoW(LPWSTR lpszDest, DWORD dwDestLen); +#ifdef UNICODE +#define SHAboutInfo SHAboutInfoW +#else +#define SHAboutInfo SHAboutInfoA +#endif + HRESULT WINAPI IUnknown_QueryStatus(IUnknown *lpUnknown, REFGUID pguidCmdGroup, ULONG cCmds, OLECMD *prgCmds, OLECMDTEXT* pCmdText); HRESULT WINAPI IUnknown_Exec(IUnknown* lpUnknown, REFGUID pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT* pvaIn, VARIANT* pvaOut); LONG WINAPI SHSetWindowBits(HWND hwnd, INT offset, UINT wMask, UINT wFlags); @@ -127,6 +133,11 @@ DWORD WINAPI SHGetValueGoodBootA(HKEY hkey, LPCSTR pSubKey, LPCSTR pValue, LPDWORD pwType, LPVOID pvData, LPDWORD pbData); DWORD WINAPI SHGetValueGoodBootW(HKEY hkey, LPCWSTR pSubKey, LPCWSTR pValue, LPDWORD pwType, LPVOID pvData, LPDWORD pbData); +#ifdef UNICODE +#define SHGetValueGoodBoot SHGetValueGoodBootW +#else +#define SHGetValueGoodBoot SHGetValueGoodBootA +#endif int WINAPIV

4 years, 8 months

1
0
0 0

[reactos] 01/01: [SDK][INCLUDE] Add SHGetValueGoodBootA/W prototypes

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=efde1f42685098d04743f… commit efde1f42685098d04743f8484f718d6db316ffab Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Sep 18 17:22:16 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Sep 18 17:22:16 2020 +0900 [SDK][INCLUDE] Add SHGetValueGoodBootA/W prototypes --- sdk/include/reactos/shlwapi_undoc.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index f2b48278973..7117d1c190b 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -123,6 +123,11 @@ DWORD WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr, PVOID WINAPI SHLockSharedEx(HANDLE hData, DWORD dwProcessId, BOOL bWriteAccess); +DWORD WINAPI SHGetValueGoodBootA(HKEY hkey, LPCSTR pSubKey, LPCSTR pValue, + LPDWORD pwType, LPVOID pvData, LPDWORD pbData); +DWORD WINAPI SHGetValueGoodBootW(HKEY hkey, LPCWSTR pSubKey, LPCWSTR pValue, + LPDWORD pwType, LPVOID pvData, LPDWORD pbData); + int WINAPIV ShellMessageBoxWrapW(

4 years, 8 months

1
0
0 0

[reactos] 01/01: [SDK][INCLUDE] Add SHAnsiToUnicodeCP and SHUnicodeToAnsiCP prototypes

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=733d6cebeda73e800b659… commit 733d6cebeda73e800b65951d77f1f7a68d2d2b6b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Sep 18 17:09:29 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Sep 18 17:09:29 2020 +0900 [SDK][INCLUDE] Add SHAnsiToUnicodeCP and SHUnicodeToAnsiCP prototypes --- sdk/include/reactos/shlwapi_undoc.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index a56ed24ed9d..f2b48278973 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -118,6 +118,9 @@ HRESULT WINAPI IUnknown_OnFocusChangeIS(LPUNKNOWN lpUnknown, LPUNKNOWN pFocusObj DWORD WINAPI SHAnsiToUnicode(LPCSTR lpSrcStr, LPWSTR lpDstStr, INT iLen); INT WINAPI SHUnicodeToAnsi(LPCWSTR lpSrcStr, LPSTR lpDstStr, INT iLen); +DWORD WINAPI SHAnsiToUnicodeCP(DWORD dwCp, LPCSTR lpSrcStr, LPWSTR lpDstStr, int iLen); +DWORD WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr, int dstlen); + PVOID WINAPI SHLockSharedEx(HANDLE hData, DWORD dwProcessId, BOOL bWriteAccess); int

4 years, 8 months

1
0
0 0

[reactos] 01/01: [CMD] HISTORY: Fix command output (missing linefeed) (#3205)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ac2b2ef8c7d74a664f4de… commit ac2b2ef8c7d74a664f4de8dce9ebc7f2deef57bb Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Fri Sep 18 00:17:08 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Sep 18 00:17:08 2020 +0200 [CMD] HISTORY: Fix command output (missing linefeed) (#3205) CORE-12603 Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- base/shell/cmd/history.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/shell/cmd/history.c b/base/shell/cmd/history.c index 3c709a7ecf0..d0f3f40c5c1 100644 --- a/base/shell/cmd/history.c +++ b/base/shell/cmd/history.c @@ -113,7 +113,7 @@ INT CommandHistory(LPTSTR param) else { for (h_tmp = Top->prev; h_tmp != Bottom; h_tmp = h_tmp->prev) - ConErrPuts(h_tmp->string); + ConOutPrintf(_T("%s\n"), h_tmp->string); } return 0; }

4 years, 8 months

1
0
0 0

[reactos] 01/01: [KERNEL32] Improve SetComputerNameExW (#3171)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=378b26ce2714c8039e239… commit 378b26ce2714c8039e23932e0fa4e365c149c106 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Sep 17 23:51:47 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 17 23:51:47 2020 +0900 [KERNEL32] Improve SetComputerNameExW (#3171) Reduce failures of kernel32_apitest SetComputerNameExW testcase and improve SetComputerNameExW. --- dll/win32/kernel32/client/compname.c | 96 ++++++++++++++++++++++++++---------- 1 file changed, 71 insertions(+), 25 deletions(-) diff --git a/dll/win32/kernel32/client/compname.c b/dll/win32/kernel32/client/compname.c index 46d05e78d32..2b4b335d4f7 100644 --- a/dll/win32/kernel32/client/compname.c +++ b/dll/win32/kernel32/client/compname.c @@ -21,16 +21,19 @@ * PROJECT: ReactOS system libraries * PURPOSE: Computer name functions * FILE: dll/win32/kernel32/client/compname.c - * PROGRAMER: Eric Kohl + * PROGRAMERS: Eric Kohl + * Katayama Hirofumi MZ */ /* INCLUDES ******************************************************************/ #include <k32.h> +#include <windns.h> #define NDEBUG #include <debug.h> +typedef NTSTATUS (WINAPI *FN_DnsValidateName_W)(LPCWSTR, DNS_NAME_FORMAT); /* FUNCTIONS *****************************************************************/ @@ -451,6 +454,31 @@ GetComputerNameW(LPWSTR lpBuffer, LPDWORD lpnSize) return ret; } +static +BOOL +BaseVerifyDnsName(LPCWSTR lpDnsName) +{ + HINSTANCE hDNSAPI; + FN_DnsValidateName_W fnValidate; + NTSTATUS Status; + BOOL ret = FALSE; + + hDNSAPI = LoadLibraryW(L"dnsapi.dll"); + if (hDNSAPI == NULL) + return FALSE; + + fnValidate = (FN_DnsValidateName_W)GetProcAddress(hDNSAPI, "DnsValidateName_W"); + if (fnValidate) + { + Status = (*fnValidate)(lpDnsName, DnsNameHostnameLabel); + if (Status == STATUS_SUCCESS || Status == DNS_ERROR_NON_RFC_NAME) + ret = TRUE; + } + + FreeLibrary(hDNSAPI); + + return ret; +} /* * @implemented @@ -460,39 +488,56 @@ BOOL IsValidComputerName(COMPUTER_NAME_FORMAT NameType, LPCWSTR lpComputerName) { - PWCHAR p; - ULONG Length; + size_t Length; + static const WCHAR s_szInvalidChars[] = + L"\"/\\[]:|<>+=;,?" + L"\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F" + L"\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F"; - /* FIXME: do verification according to NameType */ + if (lpComputerName == NULL) + return FALSE; - Length = 0; - p = (PWCHAR)lpComputerName; +#define MAX_COMPUTER_NAME_EX 64 + /* Get string length */ + if (!NT_SUCCESS(RtlStringCchLengthW(lpComputerName, MAX_COMPUTER_NAME_EX + 1, &Length))) + return FALSE; +#undef MAX_COMPUTER_NAME_EX - while (*p != 0) - { - if (!(iswctype(*p, _ALPHA | _DIGIT) || *p == L'!' || *p == L'@' || *p == L'#' || - *p == L'$' || *p == L'%' || *p == L'^' || *p == L'&' || *p == L'\'' || - *p == L')' || *p == L'(' || *p == L'.' || *p == L'-' || *p == L'_' || - *p == L'{' || *p == L'}' || *p == L'~')) - return FALSE; + /* An empty name is invalid, except a DNS name */ + if (Length == 0 && NameType != ComputerNamePhysicalDnsDomain) + return FALSE; - Length++; - p++; + /* Leading or trailing spaces are invalid */ + if (Length > 0 && + (lpComputerName[0] == L' ' || lpComputerName[Length - 1] == L' ')) + { + return FALSE; } - if (NameType == ComputerNamePhysicalDnsDomain) - return TRUE; - - if (Length == 0) + /* Check whether the name contains any invalid character */ + if (wcscspn(lpComputerName, s_szInvalidChars) < Length) return FALSE; - if (NameType == ComputerNamePhysicalNetBIOS && - Length > MAX_COMPUTERNAME_LENGTH) - return FALSE; + switch (NameType) + { + case ComputerNamePhysicalNetBIOS: + if (Length > MAX_COMPUTERNAME_LENGTH) + return FALSE; + return TRUE; - return TRUE; -} + case ComputerNamePhysicalDnsDomain: + /* An empty DNS name is valid */ + if (Length != 0) + return BaseVerifyDnsName(lpComputerName); + return TRUE; + + case ComputerNamePhysicalDnsHostname: + return BaseVerifyDnsName(lpComputerName); + default: + return FALSE; + } +} static BOOL @@ -547,6 +592,7 @@ SetComputerNameToRegistry(LPCWSTR RegistryKey, NtFlushKey(KeyHandle); NtClose(KeyHandle); + SetLastError(ERROR_SUCCESS); return TRUE; } @@ -637,7 +683,7 @@ SetComputerNameExW(COMPUTER_NAME_FORMAT NameType, lpBuffer); default: - SetLastError (ERROR_INVALID_PARAMETER); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } }

4 years, 8 months

1
0
0 0

[reactos] 01/01: [COMCTL32][SHELL32] Fix arrow keys and reordering on ListView (#3162)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c87489a43ce04b4f8a83… commit 8c87489a43ce04b4f8a83bf75a5c1712a315146f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Sep 17 22:18:34 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 17 22:18:34 2020 +0900 [COMCTL32][SHELL32] Fix arrow keys and reordering on ListView (#3162) - Disable special auto-arrange codes in LISTVIEW_GetNextItem function. - Add auto-arrange reordering codes on CDefView. CORE-16875 --- dll/win32/comctl32/listview.c | 10 +++ dll/win32/shell32/CDefView.cpp | 192 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 191 insertions(+), 11 deletions(-) diff --git a/dll/win32/comctl32/listview.c b/dll/win32/comctl32/listview.c index e26457b48dc..4119c27a90a 100644 --- a/dll/win32/comctl32/listview.c +++ b/dll/win32/comctl32/listview.c @@ -7449,7 +7449,9 @@ static INT LISTVIEW_GetNextItem(const LISTVIEW_INFO *infoPtr, INT nItem, UINT uF UINT uMask = 0; LVFINDINFOW lvFindInfo; INT nCountPerColumn; +#ifndef __REACTOS__ INT nCountPerRow; +#endif INT i; TRACE("nItem=%d, uFlags=%x, nItemCount=%d\n", nItem, uFlags, infoPtr->nItemCount); @@ -7490,6 +7492,7 @@ static INT LISTVIEW_GetNextItem(const LISTVIEW_INFO *infoPtr, INT nItem, UINT uF } else { +#ifndef __REACTOS__ /* Special case for autoarrange - move 'til the top of a list */ if (is_autoarrange(infoPtr)) { @@ -7502,6 +7505,7 @@ static INT LISTVIEW_GetNextItem(const LISTVIEW_INFO *infoPtr, INT nItem, UINT uF } return -1; } +#endif lvFindInfo.flags = LVFI_NEARESTXY; lvFindInfo.vkDirection = VK_UP; LISTVIEW_GetItemPosition(infoPtr, nItem, &lvFindInfo.pt); @@ -7525,6 +7529,7 @@ static INT LISTVIEW_GetNextItem(const LISTVIEW_INFO *infoPtr, INT nItem, UINT uF } else { +#ifndef __REACTOS__ /* Special case for autoarrange - move 'til the bottom of a list */ if (is_autoarrange(infoPtr)) { @@ -7537,6 +7542,7 @@ static INT LISTVIEW_GetNextItem(const LISTVIEW_INFO *infoPtr, INT nItem, UINT uF } return -1; } +#endif lvFindInfo.flags = LVFI_NEARESTXY; lvFindInfo.vkDirection = VK_DOWN; LISTVIEW_GetItemPosition(infoPtr, nItem, &lvFindInfo.pt); @@ -7561,6 +7567,7 @@ static INT LISTVIEW_GetNextItem(const LISTVIEW_INFO *infoPtr, INT nItem, UINT uF } else if ((infoPtr->uView == LV_VIEW_SMALLICON) || (infoPtr->uView == LV_VIEW_ICON)) { +#ifndef __REACTOS__ /* Special case for autoarrange - move 'til the beginning of a row */ if (is_autoarrange(infoPtr)) { @@ -7573,6 +7580,7 @@ static INT LISTVIEW_GetNextItem(const LISTVIEW_INFO *infoPtr, INT nItem, UINT uF } return -1; } +#endif lvFindInfo.flags = LVFI_NEARESTXY; lvFindInfo.vkDirection = VK_LEFT; LISTVIEW_GetItemPosition(infoPtr, nItem, &lvFindInfo.pt); @@ -7597,6 +7605,7 @@ static INT LISTVIEW_GetNextItem(const LISTVIEW_INFO *infoPtr, INT nItem, UINT uF } else if ((infoPtr->uView == LV_VIEW_SMALLICON) || (infoPtr->uView == LV_VIEW_ICON)) { +#ifndef __REACTOS__ /* Special case for autoarrange - move 'til the end of a row */ if (is_autoarrange(infoPtr)) { @@ -7609,6 +7618,7 @@ static INT LISTVIEW_GetNextItem(const LISTVIEW_INFO *infoPtr, INT nItem, UINT uF } return -1; } +#endif lvFindInfo.flags = LVFI_NEARESTXY; lvFindInfo.vkDirection = VK_RIGHT; LISTVIEW_GetItemPosition(infoPtr, nItem, &lvFindInfo.pt); diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 6495b08610e..b3ed556acf4 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -57,6 +57,20 @@ typedef struct to call TrackPopupMenu and let it use the 0 value as an indication that the menu was canceled */ #define CONTEXT_MENU_BASE_ID 1 +/* Convert client coordinates to listview coordinates */ +static void +ClientToListView(HWND hwndLV, POINT *ppt) +{ + POINT Origin; + + /* FIXME: LVM_GETORIGIN is broken. See CORE-17266 */ + if (!ListView_GetOrigin(hwndLV, &Origin)) + return; + + ppt->x += Origin.x; + ppt->y += Origin.y; +} + class CDefView : public CWindowImpl<CDefView, CWindow, CControlWinTraits>, public CComObjectRootEx<CComMultiThreadModelNoCS>, @@ -117,6 +131,8 @@ class CDefView : BOOL _Sort(); HRESULT _DoFolderViewCB(UINT uMsg, WPARAM wParam, LPARAM lParam); HRESULT _GetSnapToGrid(); + void _MoveSelectionOnAutoArrange(POINT pt); + INT _FindInsertableIndexFromPoint(POINT pt); public: CDefView(); @@ -2019,6 +2035,7 @@ LRESULT CDefView::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl m_pSourceDataObject = pda; m_ptFirstMousePos = params->ptAction; ClientToScreen(&m_ptFirstMousePos); + ::ClientToListView(m_ListView, &m_ptFirstMousePos); HIMAGELIST big_icons, small_icons; Shell_GetImageLists(&big_icons, &small_icons); @@ -3263,6 +3280,7 @@ HRESULT CDefView::drag_notify_subitem(DWORD grfKeyState, POINTL pt, DWORD *pdwEf } m_ptLastMousePos = htinfo.pt; + ::ClientToListView(m_ListView, &m_ptLastMousePos); /* We need to check if we drag the selection over itself */ if (lResult != -1 && m_pSourceDataObject.p != NULL) @@ -3378,6 +3396,150 @@ HRESULT WINAPI CDefView::DragLeave() return S_OK; } +INT CDefView::_FindInsertableIndexFromPoint(POINT pt) +{ + RECT rcBound; + INT i, nCount = m_ListView.GetItemCount(); + DWORD dwSpacing; + INT dx, dy; + BOOL bSmall = ((m_ListView.GetStyle() & LVS_TYPEMASK) != LVS_ICON); + + /* FIXME: LVM_GETORIGIN is broken. See CORE-17266 */ + pt.x += m_ListView.GetScrollPos(SB_HORZ); + pt.y += m_ListView.GetScrollPos(SB_VERT); + + if (m_ListView.GetStyle() & LVS_ALIGNLEFT) + { + // vertically + for (i = 0; i < nCount; ++i) + { + dwSpacing = ListView_GetItemSpacing(m_ListView, bSmall); + dx = LOWORD(dwSpacing); + dy = HIWORD(dwSpacing); + ListView_GetItemRect(m_ListView, i, &rcBound, LVIR_SELECTBOUNDS); + rcBound.right = rcBound.left + dx; + rcBound.bottom = rcBound.top + dy; + if (pt.x < rcBound.right && pt.y < (rcBound.top + rcBound.bottom) / 2) + { + return i; + } + } + for (i = nCount - 1; i >= 0; --i) + { + ListView_GetItemRect(m_ListView, i, &rcBound, LVIR_SELECTBOUNDS); + if (rcBound.left < pt.x && rcBound.top < pt.y) + { + return i + 1; + } + } + } + else + { + // horizontally + for (i = 0; i < nCount; ++i) + { + dwSpacing = ListView_GetItemSpacing(m_ListView, bSmall); + dx = LOWORD(dwSpacing); + dy = HIWORD(dwSpacing); + ListView_GetItemRect(m_ListView, i, &rcBound, LVIR_SELECTBOUNDS); + rcBound.right = rcBound.left + dx; + rcBound.bottom = rcBound.top + dy; + if (pt.y < rcBound.bottom && pt.x < rcBound.left) + { + return i; + } + if (pt.y < rcBound.bottom && pt.x < rcBound.right) + { + return i + 1; + } + } + for (i = nCount - 1; i >= 0; --i) + { + ListView_GetItemRect(m_ListView, i, &rcBound, LVIR_SELECTBOUNDS); + if (rcBound.left < pt.x && rcBound.top < pt.y) + { + return i + 1; + } + } + } + + return nCount; +} + +typedef CSimpleMap<LPARAM, INT> CLParamIndexMap; + +static INT CALLBACK +SelectionMoveCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort) +{ + CLParamIndexMap *pmap = (CLParamIndexMap *)lParamSort; + INT i1 = pmap->Lookup(lParam1), i2 = pmap->Lookup(lParam2); + if (i1 < i2) + return -1; + if (i1 > i2) + return 1; + return 0; +} + +void CDefView::_MoveSelectionOnAutoArrange(POINT pt) +{ + // get insertable index from position + INT iPosition = _FindInsertableIndexFromPoint(pt); + + // create identity mapping of indexes + CSimpleArray<INT> array; + INT nCount = m_ListView.GetItemCount(); + for (INT i = 0; i < nCount; ++i) + { + array.Add(i); + } + + // re-ordering mapping + INT iItem = -1; + while ((iItem = m_ListView.GetNextItem(iItem, LVNI_SELECTED)) >= 0) + { + INT iFrom = iItem, iTo = iPosition; + if (iFrom < iTo) + --iTo; + if (iFrom >= nCount) + iFrom = nCount - 1; + if (iTo >= nCount) + iTo = nCount - 1; + + // shift indexes by swapping (like a bucket relay) + if (iFrom < iTo) + { + for (INT i = iFrom; i < iTo; ++i) + { + // swap array[i] and array[i + 1] + INT tmp = array[i]; + array[i] = array[i + 1]; + array[i + 1] = tmp; + } + } + else + { + for (INT i = iFrom; i > iTo; --i) + { + // swap array[i] and array[i - 1] + INT tmp = array[i]; + array[i] = array[i - 1]; + array[i - 1] = tmp; + } + } + } + + // create mapping (ListView's lParam to index) from array + CLParamIndexMap map; + for (INT i = 0; i < nCount; ++i) + { + LPARAM lParam = m_ListView.GetItemData(array[i]); + map.Add(lParam, i); + } + + // finally sort + m_ListView.SortItems(SelectionMoveCompareFunc, &map); +} + HRESULT WINAPI CDefView::Drop(IDataObject* pDataObject, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect) { ImageList_DragLeave(m_hWnd); @@ -3393,23 +3555,31 @@ HRESULT WINAPI CDefView::Drop(IDataObject* pDataObject, DWORD grfKeyState, POINT m_pCurDropTarget.Release(); } - /* Restore the selection */ - m_ListView.SetItemState(-1, 0, LVIS_SELECTED); - for (UINT i = 0 ; i < m_cidl; i++) - SelectItem(m_apidl[i], SVSI_SELECT); + POINT ptDrop = { pt.x, pt.y }; + ::ScreenToClient(m_ListView, &ptDrop); + ::ClientToListView(m_ListView, &ptDrop); + m_ptLastMousePos = ptDrop; - /* Reposition the items */ - int lvIndex = -1; - while ((lvIndex = m_ListView.GetNextItem(lvIndex, LVNI_SELECTED)) > -1) + m_ListView.SetRedraw(FALSE); + if (m_ListView.GetStyle() & LVS_AUTOARRANGE) + { + _MoveSelectionOnAutoArrange(m_ptLastMousePos); + } + else { POINT ptItem; - if (m_ListView.GetItemPosition(lvIndex, &ptItem)) + INT iItem = -1; + while ((iItem = m_ListView.GetNextItem(iItem, LVNI_SELECTED)) >= 0) { - ptItem.x += pt.x - m_ptFirstMousePos.x; - ptItem.y += pt.y - m_ptFirstMousePos.y; - m_ListView.SetItemPosition(lvIndex, &ptItem); + if (m_ListView.GetItemPosition(iItem, &ptItem)) + { + ptItem.x += m_ptLastMousePos.x - m_ptFirstMousePos.x; + ptItem.y += m_ptLastMousePos.y - m_ptFirstMousePos.y; + m_ListView.SetItemPosition(iItem, &ptItem); + } } } + m_ListView.SetRedraw(TRUE); } else if (m_pCurDropTarget) {

4 years, 8 months

1
0
0 0

[reactos] 179/179: [DBGHELP_WINETEST] Add from wine-staging 5.16

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f66c66f72ab8b1ce05d0… commit 0f66c66f72ab8b1ce05d01f88624033cb7dc23b7 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Sep 14 14:17:10 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:36:03 2020 +0200 [DBGHELP_WINETEST] Add from wine-staging 5.16 --- modules/rostests/winetests/CMakeLists.txt | 1 + modules/rostests/winetests/dbghelp/CMakeLists.txt | 6 + modules/rostests/winetests/dbghelp/dbghelp.c | 144 ++++++++++++++++++++++ modules/rostests/winetests/dbghelp/testlist.c | 12 ++ sdk/tools/winesync/dbghelp.cfg | 1 + 5 files changed, 164 insertions(+) diff --git a/modules/rostests/winetests/CMakeLists.txt b/modules/rostests/winetests/CMakeLists.txt index fb8df2e9709..45a146c75d9 100644 --- a/modules/rostests/winetests/CMakeLists.txt +++ b/modules/rostests/winetests/CMakeLists.txt @@ -36,6 +36,7 @@ add_subdirectory(cryptui) add_subdirectory(d3dcompiler_43) add_subdirectory(d3drm) add_subdirectory(d3dx9_36) +add_subdirectory(dbghelp) add_subdirectory(devenum) add_subdirectory(dinput) add_subdirectory(dinput8) diff --git a/modules/rostests/winetests/dbghelp/CMakeLists.txt b/modules/rostests/winetests/dbghelp/CMakeLists.txt new file mode 100644 index 00000000000..2cc768a42ff --- /dev/null +++ b/modules/rostests/winetests/dbghelp/CMakeLists.txt @@ -0,0 +1,6 @@ + +add_executable(dbghelp_winetest dbghelp.c testlist.c) +target_compile_definitions(dbghelp_winetest PRIVATE WINETEST_USE_DBGSTR_LONGLONG) +set_module_type(dbghelp_winetest win32cui) +add_importlibs(dbghelp_winetest dbghelp gdi32 user32 msvcrt kernel32 ntdll) +add_rostests_file(TARGET dbghelp_winetest) diff --git a/modules/rostests/winetests/dbghelp/dbghelp.c b/modules/rostests/winetests/dbghelp/dbghelp.c new file mode 100644 index 00000000000..214adb7b16b --- /dev/null +++ b/modules/rostests/winetests/dbghelp/dbghelp.c @@ -0,0 +1,144 @@ +/* + * Copyright 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" +#include "verrsrc.h" +#include "dbghelp.h" +#include "wine/test.h" + +#if defined(__i386__) || defined(__x86_64__) + +static DWORD CALLBACK stack_walk_thread(void *arg) +{ + DWORD count = SuspendThread(GetCurrentThread()); + ok(!count, "got %d\n", count); + return 0; +} + +static void test_stack_walk(void) +{ + char si_buf[sizeof(SYMBOL_INFO) + 200]; + SYMBOL_INFO *si = (SYMBOL_INFO *)si_buf; + STACKFRAME64 frame = {{0}}, frame0; + BOOL found_our_frame = FALSE; + DWORD machine; + HANDLE thread; + DWORD64 disp; + CONTEXT ctx; + DWORD count; + BOOL ret; + + thread = CreateThread(NULL, 0, stack_walk_thread, NULL, 0, NULL); + + /* wait for the thread to suspend itself */ + do + { + Sleep(50); + count = SuspendThread(thread); + ResumeThread(thread); + } + while (!count); + + ctx.ContextFlags = CONTEXT_CONTROL; + ret = GetThreadContext(thread, &ctx); + ok(ret, "got error %u\n", ret); + + frame.AddrPC.Mode = AddrModeFlat; + frame.AddrFrame.Mode = AddrModeFlat; + frame.AddrStack.Mode = AddrModeFlat; + +#ifdef __i386__ + machine = IMAGE_FILE_MACHINE_I386; + + frame.AddrPC.Segment = ctx.SegCs; + frame.AddrPC.Offset = ctx.Eip; + frame.AddrFrame.Segment = ctx.SegSs; + frame.AddrFrame.Offset = ctx.Ebp; + frame.AddrStack.Segment = ctx.SegSs; + frame.AddrStack.Offset = ctx.Esp; +#elif defined(__x86_64__) + machine = IMAGE_FILE_MACHINE_AMD64; + + frame.AddrPC.Segment = ctx.SegCs; + frame.AddrPC.Offset = ctx.Rip; + frame.AddrFrame.Segment = ctx.SegSs; + frame.AddrFrame.Offset = ctx.Rbp; + frame.AddrStack.Segment = ctx.SegSs; + frame.AddrStack.Offset = ctx.Rsp; +#endif + frame0 = frame; + + /* first invocation just calculates the return address */ + ret = StackWalk64(machine, GetCurrentProcess(), thread, &frame, &ctx, NULL, + SymFunctionTableAccess64, SymGetModuleBase64, NULL); + ok(ret, "StackWalk64() failed: %u\n", GetLastError()); + ok(frame.AddrPC.Offset == frame0.AddrPC.Offset, "expected %s, got %s\n", + wine_dbgstr_longlong(frame0.AddrPC.Offset), + wine_dbgstr_longlong(frame.AddrPC.Offset)); + ok(frame.AddrStack.Offset == frame0.AddrStack.Offset, "expected %s, got %s\n", + wine_dbgstr_longlong(frame0.AddrStack.Offset), + wine_dbgstr_longlong(frame.AddrStack.Offset)); + ok(frame.AddrReturn.Offset && frame.AddrReturn.Offset != frame.AddrPC.Offset, + "got bad return address %s\n", wine_dbgstr_longlong(frame.AddrReturn.Offset)); + + while (frame.AddrReturn.Offset) + { + char *addr; + + ret = StackWalk64(machine, GetCurrentProcess(), thread, &frame, &ctx, NULL, + SymFunctionTableAccess64, SymGetModuleBase64, NULL); + ok(ret, "StackWalk64() failed: %u\n", GetLastError()); + + addr = (void *)(DWORD_PTR)frame.AddrPC.Offset; + + if (addr > (char *)stack_walk_thread && addr < (char *)stack_walk_thread + 0x100) + { + found_our_frame = TRUE; + + si->SizeOfStruct = sizeof(SYMBOL_INFO); + si->MaxNameLen = 200; + if (SymFromAddr(GetCurrentProcess(), frame.AddrPC.Offset, &disp, si)) + ok(!strcmp(si->Name, "stack_walk_thread"), "got wrong name %s\n", si->Name); + } + } + + ret = StackWalk64(machine, GetCurrentProcess(), thread, &frame, &ctx, NULL, + SymFunctionTableAccess64, SymGetModuleBase64, NULL); + ok(!ret, "StackWalk64() should have failed\n"); + + ok(found_our_frame, "didn't find stack_walk_thread frame\n"); +} + +#else /* __i386__ || __x86_64__ */ + +static void test_stack_walk(void) +{ +} + +#endif /* __i386__ || __x86_64__ */ + +START_TEST(dbghelp) +{ + BOOL ret = SymInitialize(GetCurrentProcess(), NULL, TRUE); + ok(ret, "got error %u\n", GetLastError()); + + test_stack_walk(); + + ret = SymCleanup(GetCurrentProcess()); + ok(ret, "got error %u\n", GetLastError()); +} diff --git a/modules/rostests/winetests/dbghelp/testlist.c b/modules/rostests/winetests/dbghelp/testlist.c new file mode 100644 index 00000000000..b78c165301a --- /dev/null +++ b/modules/rostests/winetests/dbghelp/testlist.c @@ -0,0 +1,12 @@ +/* Automatically generated file; DO NOT EDIT!! */ + +#define STANDALONE +#include <wine/test.h> + +extern void func_dbghelp(void); + +const struct test winetest_testlist[] = +{ + { "dbghelp", func_dbghelp }, + { 0, 0 } +}; diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index 3b1605ae74b..bd721b981a3 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -1,5 +1,6 @@ directories: dlls/dbghelp: dll/win32/dbghelp + dlls/dbghelp/tests: modules/rostests/winetests/dbghelp files: include/dbghelp.h: sdk/include/psdk/dbghelp.h include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h

4 years, 8 months

1
0
0 0

[reactos] 178/179: [DOC] Update README.WINE to reflect dbghelp latest status

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f2cf465dba1655c982922… commit f2cf465dba1655c9829226b8b0aeda213412f609 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Sep 11 19:57:56 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:36:03 2020 +0200 [DOC] Update README.WINE to reflect dbghelp latest status --- media/doc/README.WINE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 72af1000226..3273024a322 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -66,7 +66,7 @@ dll/win32/cryptdll # Synced to WineStaging-4.18 dll/win32/cryptnet # Synced to WineStaging-4.18 dll/win32/cryptui # Synced to WineStaging-4.18 dll/win32/dbgeng # Synced to WineStaging-4.18 -dll/win32/dbghelp # Synced to WineStaging-3.9 +dll/win32/dbghelp # Synced to WineStaging-5.16 dll/win32/dciman32 # Synced to WineStaging-3.3 dll/win32/faultrep # Synced to WineStaging-4.18 dll/win32/fontsub # Synced to WineStaging-2.9

4 years, 8 months

1
0
0 0

[reactos] 177/179: [WINESYNC]: dbghelp is now in sync with wine-staging wine-5.16

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7837dcfc600e108bd35b3… commit 7837dcfc600e108bd35b3ac755be06ed6a758d4f Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Sep 11 19:56:54 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:36:02 2020 +0200 [WINESYNC]: dbghelp is now in sync with wine-staging wine-5.16 --- sdk/tools/winesync/dbghelp.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index 14f279794a5..3b1605ae74b 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -4,4 +4,4 @@ files: include/dbghelp.h: sdk/include/psdk/dbghelp.h include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h tags: - wine: 7e965d60b542c0baa6f79605f45669a2ea9bceb8 + wine: wine-5.16

4 years, 8 months

1
0
0 0

[reactos] 176/179: [WINESYNC] dbghelp: Always check for debug symbols in BINDIR.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c15a8e78b03b20016ef96… commit c15a8e78b03b20016ef96e8e1584bdb430bc3359 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 19:54:10 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:36:02 2020 +0200 [WINESYNC] dbghelp: Always check for debug symbols in BINDIR. wine-staging patch by Sebastian Lackner <sebastian(a)fds-team.de> --- dll/win32/dbghelp/elf_module.c | 1 + ...01-dbghelp__Always_check_for_debug_symbols_in_BINDIR.diff | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/dll/win32/dbghelp/elf_module.c b/dll/win32/dbghelp/elf_module.c index e44629f016e..923608f35e3 100644 --- a/dll/win32/dbghelp/elf_module.c +++ b/dll/win32/dbghelp/elf_module.c @@ -1436,6 +1436,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename, load_elf.elf_info = elf_info; ret = search_unix_path(filename, process_getenv(pcs, L"LD_LIBRARY_PATH"), elf_load_file_cb, &load_elf) + || search_unix_path(filename, BINDIR, elf_load_file_cb, &load_elf) || search_dll_path(pcs, filename, elf_load_file_cb, &load_elf); } diff --git a/sdk/tools/winesync/dbghelp_staging/0001-dbghelp__Always_check_for_debug_symbols_in_BINDIR.diff b/sdk/tools/winesync/dbghelp_staging/0001-dbghelp__Always_check_for_debug_symbols_in_BINDIR.diff new file mode 100644 index 00000000000..1fba125a79c --- /dev/null +++ b/sdk/tools/winesync/dbghelp_staging/0001-dbghelp__Always_check_for_debug_symbols_in_BINDIR.diff @@ -0,0 +1,12 @@ +diff --git a/dll/win32/dbghelp/elf_module.c b/dll/win32/dbghelp/elf_module.c +index e44629f..923608f 100644 +--- a/dll/win32/dbghelp/elf_module.c ++++ b/dll/win32/dbghelp/elf_module.c +@@ -1436,6 +1436,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename, + load_elf.elf_info = elf_info; + + ret = search_unix_path(filename, process_getenv(pcs, L"LD_LIBRARY_PATH"), elf_load_file_cb, &load_elf) ++ || search_unix_path(filename, BINDIR, elf_load_file_cb, &load_elf) + || search_dll_path(pcs, filename, elf_load_file_cb, &load_elf); + } +

4 years, 8 months

1
0
0 0

[reactos] 175/179: [WINESYNC] dbghelp: Add xmm and mxcsr register mapping functions for i386.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=767cb4cff47ff324ee20d… commit 767cb4cff47ff324ee20d26f6e077fb31a95b566 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Fri Sep 11 19:53:59 2020 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Sep 16 10:36:02 2020 +0200 [WINESYNC] dbghelp: Add xmm and mxcsr register mapping functions for i386. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 7e965d60b542c0baa6f79605f45669a2ea9bceb8 by Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dll/win32/dbghelp/cpu_i386.c | 10 ++++++++++ sdk/tools/winesync/dbghelp.cfg | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dll/win32/dbghelp/cpu_i386.c b/dll/win32/dbghelp/cpu_i386.c index 78f477115d7..23c1fb02c67 100644 --- a/dll/win32/dbghelp/cpu_i386.c +++ b/dll/win32/dbghelp/cpu_i386.c @@ -610,6 +610,16 @@ static void *i386_fetch_context_reg(union ctx *pctx, unsigned regno, unsigned *s case CV_REG_FS: *size = sizeof(ctx->SegFs); return &ctx->SegFs; case CV_REG_GS: *size = sizeof(ctx->SegGs); return &ctx->SegGs; + case CV_REG_XMM0 + 0: *size = 16; return &ctx->ExtendedRegisters[10*16]; + case CV_REG_XMM0 + 1: *size = 16; return &ctx->ExtendedRegisters[11*16]; + case CV_REG_XMM0 + 2: *size = 16; return &ctx->ExtendedRegisters[12*16]; + case CV_REG_XMM0 + 3: *size = 16; return &ctx->ExtendedRegisters[13*16]; + case CV_REG_XMM0 + 4: *size = 16; return &ctx->ExtendedRegisters[14*16]; + case CV_REG_XMM0 + 5: *size = 16; return &ctx->ExtendedRegisters[15*16]; + case CV_REG_XMM0 + 6: *size = 16; return &ctx->ExtendedRegisters[16*16]; + case CV_REG_XMM0 + 7: *size = 16; return &ctx->ExtendedRegisters[17*16]; + + case CV_REG_MXCSR: *size = sizeof(DWORD); return &ctx->ExtendedRegisters[24]; } FIXME("Unknown register %x\n", regno); return NULL; diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index 2fecd3ea9c7..14f279794a5 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -4,4 +4,4 @@ files: include/dbghelp.h: sdk/include/psdk/dbghelp.h include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h tags: - wine: 70b2d181b1547dbe3c2a62e57c6afb0ee903f358 + wine: 7e965d60b542c0baa6f79605f45669a2ea9bceb8

4 years, 8 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2020