Ros-diffs November 2014

ros-diffs@reactos.org

18 participants
373 discussions

[hbelusca] 65325: [KERNEL32][BEEP] Int32x32To64 used with unsigned input values will cause unintentional sign extension. There is a lot of code in ROS that is still not fixed!! Fixes BEEP sound. Se...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Nov 8 16:35:05 2014 New Revision: 65325 URL: http://svn.reactos.org/svn/reactos?rev=65325&view=rev Log: [KERNEL32][BEEP] Int32x32To64 used with unsigned input values will cause unintentional sign extension. There is a lot of code in ROS that is still not fixed!! Fixes BEEP sound. See also r64020, CORE-8502 and CORE-8505 for more details. CORE-8505 #comment CsrCaptureTimeout and BEEP code fixed. Modified: trunk/reactos/dll/ntdll/csr/capture.c trunk/reactos/drivers/base/beep/beep.c Modified: trunk/reactos/dll/ntdll/csr/capture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/csr/capture.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/csr/capture.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/csr/capture.c [iso-8859-1] Sat Nov 8 16:35:05 2014 @@ -321,7 +321,7 @@ if (Milliseconds == -1) return NULL; /* Convert to relative ticks */ - Timeout->QuadPart = Int32x32To64(Milliseconds, -10000); + Timeout->QuadPart = Milliseconds * -10000LL; return Timeout; } Modified: trunk/reactos/drivers/base/beep/beep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/beep/beep.c?r… ============================================================================== --- trunk/reactos/drivers/base/beep/beep.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/beep/beep.c [iso-8859-1] Sat Nov 8 16:35:05 2014 @@ -339,7 +339,7 @@ { /* Beep successful, queue a DPC to stop it */ Status = STATUS_SUCCESS; - DueTime.QuadPart = Int32x32To64(BeepParam->Duration, -10000); + DueTime.QuadPart = BeepParam->Duration * -10000LL; InterlockedIncrement(&DeviceExtension->TimerActive); KeSetTimer(&DeviceExtension->Timer, DueTime, &DeviceObject->Dpc); }

9 years, 10 months

[tkreuzer] 65324: [GDI32] - Add annotations for text function - Improve formatting and some variable names - No code change

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Nov 8 15:34:47 2014 New Revision: 65324 URL: http://svn.reactos.org/svn/reactos?rev=65324&view=rev Log: [GDI32] - Add annotations for text function - Improve formatting and some variable names - No code change Modified: trunk/reactos/win32ss/gdi/gdi32/objects/text.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/text.c [iso-8859-1] Sat Nov 8 15:34:47 2014 @@ -9,26 +9,238 @@ BOOL WINAPI TextOutA( - HDC hdc, - int nXStart, - int nYStart, - LPCSTR lpString, - int cchString) + _In_ HDC hdc, + _In_ INT nXStart, + _In_ INT nYStart, + _In_reads_(cchString) LPCSTR lpString, + _In_ INT cchString) +{ + ANSI_STRING StringA; + UNICODE_STRING StringU; + BOOL bResult; + + if (lpString != NULL) + { + RtlInitAnsiString(&StringA, (LPSTR)lpString); + RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE); + } + else + { + StringU.Buffer = NULL; + } + + bResult = TextOutW(hdc, nXStart, nYStart, StringU.Buffer, cchString); + + RtlFreeUnicodeString(&StringU); + return bResult; +} + + +/* + * @implemented + */ +BOOL +WINAPI +TextOutW( + _In_ HDC hdc, + _In_ INT nXStart, + _In_ INT nYStart, + _In_reads_(cchString) LPCWSTR lpString, + _In_ INT cchString) +{ + return NtGdiExtTextOutW(hdc, + nXStart, + nYStart, + 0, NULL, + (LPWSTR)lpString, + cchString, + NULL, + 0); +} + + +/* + * @unimplemented + */ +BOOL +WINAPI +PolyTextOutA( + _In_ HDC hdc, + _In_reads_(cStrings) const POLYTEXTA *pptxt, + _In_ INT cStrings) +{ + for (; cStrings>0; cStrings--, pptxt++) + { + if (!ExtTextOutA(hdc, + pptxt->x, + pptxt->y, + pptxt->uiFlags, + &pptxt->rcl, + pptxt->lpstr, + pptxt->n, + pptxt->pdx)) + { + return FALSE; + } + } + + return TRUE; +} + + +/* + * @unimplemented + */ +BOOL +WINAPI +PolyTextOutW( + _In_ HDC hdc, + _In_reads_(cStrings) const POLYTEXTW *pptxt, + _In_ INT cStrings) +{ + for (; cStrings>0; cStrings--, pptxt++) + { + if (!ExtTextOutW(hdc, + pptxt->x, + pptxt->y, + pptxt->uiFlags, + &pptxt->rcl, + pptxt->lpstr, + pptxt->n, + pptxt->pdx)) + { + return FALSE; + } + } + + return TRUE; +} + + +/* + * @implemented + */ +DWORD +WINAPI +GdiGetCodePage( + _In_ HDC hdc) +{ + PDC_ATTR pdcattr; + + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (pdcattr->ulDirty_ & DIRTY_CHARSET) + return LOWORD(NtGdiGetCharSet(hdc)); + + return LOWORD(pdcattr->iCS_CP); +} + + +/* + * @unimplemented + */ +INT +WINAPI +GetTextCharacterExtra( + _In_ HDC hdc) +{ + PDC_ATTR pdcattr; + + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + /* Do not set LastError here! */ + return 0x8000000; + } + + return pdcattr->lTextExtra; +} + + +/* + * @implemented + */ +INT +WINAPI +GetTextCharset( + _In_ HDC hdc) +{ + /* MSDN docs say this is equivalent */ + return NtGdiGetTextCharsetInfo(hdc,NULL,0); +} + + +/* + * @implemented + */ +BOOL +WINAPI +GetTextMetricsA( + _In_ HDC hdc, + _Out_ LPTEXTMETRICA lptm) +{ + TMW_INTERNAL tmwi; + + if (!NtGdiGetTextMetricsW(hdc, &tmwi, sizeof(TMW_INTERNAL))) + { + return FALSE; + } + + FONT_TextMetricWToA(&tmwi.TextMetric, lptm); + return TRUE; +} + + +/* + * @implemented + */ +BOOL +WINAPI +GetTextMetricsW( + _In_ HDC hdc, + _Out_ LPTEXTMETRICW lptm) +{ + TMW_INTERNAL tmwi; + + if (!NtGdiGetTextMetricsW(hdc, &tmwi, sizeof(TMW_INTERNAL))) + { + return FALSE; + } + + *lptm = tmwi.TextMetric; + return TRUE; +} + + +/* + * @implemented + */ +BOOL +APIENTRY +GetTextExtentPointA( + _In_ HDC hdc, + _In_reads_(cchString) LPCSTR lpString, + _In_ INT cchString, + _Out_ LPSIZE lpsz) { ANSI_STRING StringA; UNICODE_STRING StringU; BOOL ret; - if (NULL != lpString) - { - RtlInitAnsiString(&StringA, (LPSTR)lpString); - RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE); - } - else - StringU.Buffer = NULL; - - ret = TextOutW(hdc, nXStart, nYStart, StringU.Buffer, cchString); + RtlInitAnsiString(&StringA, (LPSTR)lpString); + RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE); + + ret = GetTextExtentPointW(hdc, StringU.Buffer, cchString, lpsz); + RtlFreeUnicodeString(&StringU); + return ret; } @@ -37,170 +249,126 @@ * @implemented */ BOOL -WINAPI -TextOutW( - HDC hdc, - int nXStart, - int nYStart, - LPCWSTR lpString, - int cchString) -{ - return NtGdiExtTextOutW(hdc, nXStart, nYStart, 0, NULL, (LPWSTR)lpString, cchString, NULL, 0); -} - - -/* - * @unimplemented - */ -BOOL -WINAPI -PolyTextOutA( HDC hdc, const POLYTEXTA *pptxt, INT cStrings ) -{ - for (; cStrings>0; cStrings--, pptxt++) - if (!ExtTextOutA( hdc, pptxt->x, pptxt->y, pptxt->uiFlags, &pptxt->rcl, pptxt->lpstr, pptxt->n, pptxt->pdx )) - return FALSE; - return TRUE; -} - - -/* - * @unimplemented - */ -BOOL -WINAPI -PolyTextOutW( HDC hdc, const POLYTEXTW *pptxt, INT cStrings ) -{ - for (; cStrings>0; cStrings--, pptxt++) - if (!ExtTextOutW( hdc, pptxt->x, pptxt->y, pptxt->uiFlags, &pptxt->rcl, pptxt->lpstr, pptxt->n, pptxt->pdx )) - return FALSE; - return TRUE; -} - - -/* - * @implemented - */ -DWORD -WINAPI -GdiGetCodePage(HDC hdc) -{ - PDC_ATTR pdcattr; - - /* Get the DC attribute */ - pdcattr = GdiGetDcAttr(hdc); - if (pdcattr == NULL) +APIENTRY +GetTextExtentPointW( + _In_ HDC hdc, + _In_reads_(cchString) LPCWSTR lpString, + _In_ INT cchString, + _Out_ LPSIZE lpsz) +{ + return NtGdiGetTextExtent(hdc, (LPWSTR)lpString, cchString, lpsz, 0); +} + + +/* + * @implemented + */ +BOOL +WINAPI +GetTextExtentExPointW( + _In_ HDC hdc, + _In_reads_(cchString) LPCWSTR lpszString, + _In_ INT cchString, + _In_ INT nMaxExtent, + _Out_opt_ LPINT lpnFit, + _Out_writes_to_opt_(cchString, *lpnFit) LPINT lpnDx, + _Out_ LPSIZE lpSize) +{ + + /* Windows doesn't check nMaxExtent validity in unicode version */ + if (nMaxExtent < -1) + { + DPRINT("nMaxExtent is invalid: %d\n", nMaxExtent); + } + + return NtGdiGetTextExtentExW ( + hdc, (LPWSTR)lpszString, cchString, nMaxExtent, (PULONG)lpnFit, (PULONG)lpnDx, lpSize, 0 ); +} + + +/* + * @implemented + */ +BOOL +WINAPI +GetTextExtentExPointWPri( + _In_ HDC hdc, + _In_reads_(cwc) LPWSTR lpwsz, + _In_ ULONG cwc, + _In_ ULONG dxMax, + _Out_opt_ ULONG *pcCh, + _Out_writes_to_opt_(cwc, *pcCh) PULONG pdxOut, + _In_ LPSIZE psize) +{ + return NtGdiGetTextExtentExW(hdc, lpwsz, cwc, dxMax, pcCh, pdxOut, psize, 0); +} + +/* + * @implemented + */ +BOOL +WINAPI +GetTextExtentExPointA( + _In_ HDC hdc, + _In_reads_(cchString) LPCSTR lpszStr, + _In_ INT cchString, + _In_ INT nMaxExtent, + _Out_opt_ LPINT lpnFit, + _Out_writes_to_opt_ (cchString, *lpnFit) LPINT lpnDx, + _Out_ LPSIZE lpSize) +{ + NTSTATUS Status; + LPWSTR lpszStrW; + BOOL bResult = FALSE; + + if (nMaxExtent < -1) { SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - if (pdcattr->ulDirty_ & DIRTY_CHARSET) - return LOWORD(NtGdiGetCharSet(hdc)); - - return LOWORD(pdcattr->iCS_CP); -} - - -/* - * @unimplemented - */ -int -WINAPI -GetTextCharacterExtra( - HDC hdc -) -{ - PDC_ATTR pdcattr; - - /* Get the DC attribute */ - pdcattr = GdiGetDcAttr(hdc); - if (pdcattr == NULL) - { - /* Do not set LastError here! */ - return 0x8000000; - } - - return pdcattr->lTextExtra; -} - - -/* - * @implemented - */ -int -WINAPI -GetTextCharset(HDC hdc) -{ - /* MSDN docs say this is equivalent */ - return NtGdiGetTextCharsetInfo(hdc,NULL,0); -} - - - -/* - * @implemented - */ -BOOL -WINAPI -GetTextMetricsA( - HDC hdc, - LPTEXTMETRICA lptm -) -{ - TMW_INTERNAL tmwi; - - if (!NtGdiGetTextMetricsW(hdc, &tmwi, sizeof(TMW_INTERNAL))) - { return FALSE; } - FONT_TextMetricWToA(&tmwi.TextMetric, lptm); - return TRUE; -} - - -/* - * @implemented - */ -BOOL -WINAPI -GetTextMetricsW( - HDC hdc, - LPTEXTMETRICW lptm -) -{ - TMW_INTERNAL tmwi; - - if (! NtGdiGetTextMetricsW(hdc, &tmwi, sizeof(TMW_INTERNAL))) - { + Status = HEAP_strdupA2W(&lpszStrW, lpszStr); + if (!NT_SUCCESS (Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); return FALSE; } - *lptm = tmwi.TextMetric; - return TRUE; -} - - -/* - * @implemented - */ -BOOL -APIENTRY -GetTextExtentPointA( - HDC hdc, - LPCSTR lpString, - int cchString, - LPSIZE lpSize -) + bResult = NtGdiGetTextExtentExW(hdc, + lpszStrW, + cchString, + nMaxExtent, + (PULONG)lpnFit, + (PULONG)lpnDx, + lpSize, + 0); + + HEAP_free(lpszStrW); + + return bResult; +} + + +/* + * @implemented + */ +BOOL +WINAPI +GetTextExtentPoint32A( + _In_ HDC hdc, + _In_reads_(cchString) LPCSTR lpString, + _In_ INT cchString, + _Out_ LPSIZE lpSize) { ANSI_STRING StringA; UNICODE_STRING StringU; BOOL ret; - RtlInitAnsiString(&StringA, (LPSTR)lpString); + StringA.Buffer = (LPSTR)lpString; + StringA.Length = cchString; RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE); - ret = GetTextExtentPointW(hdc, StringU.Buffer, cchString, lpSize); + ret = GetTextExtentPoint32W(hdc, StringU.Buffer, cchString, lpSize); RtlFreeUnicodeString(&StringU); @@ -212,195 +380,77 @@ * @implemented */ BOOL -APIENTRY -GetTextExtentPointW( - HDC hdc, - LPCWSTR lpString, - int cchString, - LPSIZE lpSize -) +WINAPI +GetTextExtentPoint32W( + _In_ HDC hdc, + _In_reads_(cchString) LPCWSTR lpString, + _In_ int cchString, + _Out_ LPSIZE lpSize) { return NtGdiGetTextExtent(hdc, (LPWSTR)lpString, cchString, lpSize, 0); } - -/* - * @implemented - */ -BOOL -APIENTRY -GetTextExtentExPointW( - HDC hdc, - LPCWSTR lpszStr, - int cchString, - int nMaxExtent, - LPINT lpnFit, - LPINT alpDx, - LPSIZE lpSize -) -{ - - /* Windows doesn't check nMaxExtent validity in unicode version */ - if(nMaxExtent < -1) - DPRINT("nMaxExtent is invalid: %d\n", nMaxExtent); - - return NtGdiGetTextExtentExW ( - hdc, (LPWSTR)lpszStr, cchString, nMaxExtent, (PULONG)lpnFit, (PULONG)alpDx, lpSize, 0 ); -} - - -/* - * @implemented - */ -BOOL -WINAPI -GetTextExtentExPointWPri(HDC hdc, - LPWSTR lpwsz, - ULONG cwc, - ULONG dxMax, - ULONG *pcCh, - PULONG pdxOut, - LPSIZE psize) -{ - return NtGdiGetTextExtentExW(hdc,lpwsz,cwc,dxMax,pcCh,pdxOut,psize,0); -} - -/* - * @implemented - */ -BOOL -APIENTRY -GetTextExtentExPointA( - HDC hdc, - LPCSTR lpszStr, - int cchString, - int nMaxExtent, - LPINT lpnFit, - LPINT alpDx, - LPSIZE lpSize -) -{ - NTSTATUS Status; - LPWSTR lpszStrW; - BOOL rc = 0; - - if(nMaxExtent < -1) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - Status = HEAP_strdupA2W ( &lpszStrW, lpszStr ); - if (!NT_SUCCESS (Status)) - SetLastError (RtlNtStatusToDosError(Status)); - else - { - rc = NtGdiGetTextExtentExW ( - hdc, lpszStrW, cchString, nMaxExtent, (PULONG)lpnFit, (PULONG)alpDx, lpSize, 0 ); - - HEAP_free ( lpszStrW ); - } - - return rc; -} - - -/* - * @implemented - */ -BOOL -APIENTRY -GetTextExtentPoint32A( - HDC hdc, - LPCSTR lpString, - int cchString, - LPSIZE lpSize -) +/* + * @implemented + */ +BOOL +WINAPI +GetTextExtentExPointI( + _In_ HDC hdc, + _In_reads_(cgi) LPWORD pgiIn, + _In_ INT cgi, + _In_ INT nMaxExtent, + _Out_opt_ LPINT lpnFit, + _Out_writes_to_opt_(cwchString, *lpnFit) LPINT lpnDx, + _Out_ LPSIZE lpSize) +{ + return NtGdiGetTextExtentExW(hdc, + pgiIn, + cgi, + nMaxExtent, + (PULONG)lpnFit, + (PULONG)lpnDx, + lpSize, + GTEF_INDICES); +} + +/* + * @implemented + */ +BOOL +WINAPI +GetTextExtentPointI( + _In_ HDC hdc, + _In_reads_(cgi) LPWORD pgiIn, + _In_ int cgi, + _Out_ LPSIZE lpSize) +{ + return NtGdiGetTextExtent(hdc, pgiIn, cgi, lpSize, GTEF_INDICES); +} + +/* + * @implemented + */ +BOOL +WINAPI +ExtTextOutA( + _In_ HDC hdc, + _In_ INT x, + _In_ INT y, + _In_ UINT fuOptions, + _In_opt_ const RECT *lprc, + _In_reads_opt_(cch) LPCSTR lpString, + _In_ UINT cch, + _In_reads_opt_(cch) const INT *lpDx) { ANSI_STRING StringA; UNICODE_STRING StringU; BOOL ret; - StringA.Buffer = (LPSTR)lpString; - StringA.Length = cchString; - RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE); - - ret = GetTextExtentPoint32W(hdc, StringU.Buffer, cchString, lpSize); - - RtlFreeUnicodeString(&StringU); - - return ret; -} - - -/* - * @implemented - */ -BOOL -APIENTRY -GetTextExtentPoint32W( - HDC hdc, - LPCWSTR lpString, - int cchString, - LPSIZE lpSize -) -{ - return NtGdiGetTextExtent(hdc, (LPWSTR)lpString, cchString, lpSize, 0); -} - -/* - * @implemented - */ -BOOL -WINAPI -GetTextExtentExPointI(HDC hdc, - LPWORD pgiIn, - int cgi, - int nMaxExtent, - LPINT lpnFit, - LPINT alpDx, - LPSIZE lpSize) -{ - return NtGdiGetTextExtentExW(hdc,pgiIn,cgi,nMaxExtent,(ULONG *)lpnFit, (PULONG) alpDx,lpSize,GTEF_INDICES); -} - -/* - * @implemented - */ -BOOL -WINAPI -GetTextExtentPointI(HDC hdc, - LPWORD pgiIn, - int cgi, - LPSIZE lpSize) -{ - return NtGdiGetTextExtent(hdc,pgiIn,cgi,lpSize,GTEF_INDICES); -} - -/* - * @implemented - */ -BOOL -WINAPI -ExtTextOutA( - HDC hdc, - int X, - int Y, - UINT fuOptions, - CONST RECT *lprc, - LPCSTR lpString, - UINT cchString, - CONST INT *lpDx -) -{ - ANSI_STRING StringA; - UNICODE_STRING StringU; - BOOL ret; - RtlInitAnsiString(&StringA, (LPSTR)lpString); RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE); - ret = ExtTextOutW(hdc, X, Y, fuOptions, lprc, StringU.Buffer, cchString, lpDx); + ret = ExtTextOutW(hdc, x, y, fuOptions, lprc, StringU.Buffer, cch, lpDx); RtlFreeUnicodeString(&StringU); @@ -414,17 +464,24 @@ BOOL WINAPI ExtTextOutW( - HDC hdc, - int X, - int Y, - UINT fuOptions, - CONST RECT *lprc, - LPCWSTR lpString, - UINT cchString, - CONST INT *lpDx -) -{ - return NtGdiExtTextOutW(hdc, X, Y, fuOptions, (LPRECT)lprc, (LPWSTR)lpString, cchString, (LPINT)lpDx, 0); + _In_ HDC hdc, + _In_ INT x, + _In_ INT y, + _In_ UINT fuOptions, + _In_opt_ const RECT *lprc, + _In_reads_opt_(cwc) LPCWSTR lpString, + _In_ UINT cwc, + _In_reads_opt_(cwc) const INT *lpDx) +{ + return NtGdiExtTextOutW(hdc, + x, + y, + fuOptions, + (LPRECT)lprc, + (LPWSTR)lpString, + cwc, + (LPINT)lpDx, + 0); } @@ -433,12 +490,13 @@ */ INT WINAPI -GetTextFaceW(HDC hDC, - INT nCount, - PWSTR pFaceName) +GetTextFaceW( + _In_ HDC hdc, + _In_ INT cwcMax, + _Out_writes_to_opt_(cwcMax, return) LPWSTR pFaceName) { /* Validate parameters */ - if (pFaceName && nCount <= 0) + if (pFaceName && cwcMax <= 0) { /* Set last error and return failure */ GdiSetLastError(ERROR_INVALID_PARAMETER); @@ -446,22 +504,25 @@ } /* Forward to kernel */ - return NtGdiGetTextFaceW(hDC, nCount, pFaceName, FALSE); -} - - -/* - * @implemented - */ -int -WINAPI -GetTextFaceA( HDC hdc, INT count, LPSTR name ) + return NtGdiGetTextFaceW(hdc, cwcMax, pFaceName, FALSE); +} + + +/* + * @implemented + */ +INT +WINAPI +GetTextFaceA( + _In_ HDC hdc, + _In_ INT cchMax, + _Out_writes_to_opt_(cchMax, return) LPSTR lpName) { INT res; LPWSTR nameW; /* Validate parameters */ - if (name && count <= 0) + if (lpName && cchMax <= 0) { /* Set last error and return failure */ GdiSetLastError(ERROR_INVALID_PARAMETER); @@ -474,16 +535,20 @@ { return 0; } + GetTextFaceW( hdc, res, nameW ); - if (name) - { - if (count && !WideCharToMultiByte( CP_ACP, 0, nameW, -1, name, count, NULL, NULL)) - name[count-1] = 0; - res = strlen(name); + if (lpName) + { + if (cchMax && !WideCharToMultiByte( CP_ACP, 0, nameW, -1, lpName, cchMax, NULL, NULL)) + lpName[cchMax-1] = 0; + res = strlen(lpName); } else + { res = WideCharToMultiByte( CP_ACP, 0, nameW, -1, NULL, 0, NULL, NULL); + } + HeapFree( GetProcessHeap(), 0, nameW ); return res; } @@ -494,27 +559,28 @@ */ INT WINAPI -GetTextFaceAliasW(HDC hdc, - int cChar, - LPWSTR pszOut) -{ - if ( pszOut && !cChar ) +GetTextFaceAliasW( + _In_ HDC hdc, + _In_ INT cwcMax, + _Out_writes_to_opt_(cwcMax, return) LPWSTR pszOut) +{ + if (pszOut && !cwcMax) { GdiSetLastError(ERROR_INVALID_PARAMETER); return 0; } - return NtGdiGetTextFaceW(hdc,cChar,pszOut,TRUE); + + return NtGdiGetTextFaceW(hdc, cwcMax, pszOut, TRUE); } BOOL WINAPI GetFontResourceInfoW( - LPCWSTR lpFileName, - DWORD *pdwBufSize, - void* lpBuffer, - DWORD dwType -) + _In_z_ LPCWSTR lpFileName, + _Inout_ DWORD *pdwBufSize, + _Out_writes_to_(*pdwBufSize, *pdwBufSize) PVOID lpBuffer, + _In_ DWORD dwType) { BOOL bRet; UNICODE_STRING NtFileName; @@ -545,29 +611,23 @@ RtlFreeHeap(RtlGetProcessHeap(), 0, NtFileName.Buffer); - if (!bRet) - { - return FALSE; - } - - return TRUE; + return bRet; } /* * @unimplemented */ -int +INT WINAPI SetTextCharacterExtra( - HDC hdc, - int CharExtra -) -{ - INT cExtra; + _In_ HDC hdc, + _In_ INT nCharExtra) +{ PDC_ATTR pdcattr; - - if (CharExtra == 0x80000000) + INT nOldCharExtra; + + if (nCharExtra == 0x80000000) { SetLastError(ERROR_INVALID_PARAMETER); return 0x80000000; @@ -576,7 +636,7 @@ #if 0 if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) { - return MFDRV_SetTextCharacterExtra( hdc, CharExtra ); // Wine port. + return MFDRV_SetTextCharacterExtra( hdc, nCharExtra ); // Wine port. } #endif @@ -597,9 +657,9 @@ } } - cExtra = pdcattr->lTextExtra; - pdcattr->lTextExtra = CharExtra; - return cExtra; + nOldCharExtra = pdcattr->lTextExtra; + pdcattr->lTextExtra = nCharExtra; + return nOldCharExtra; } /* @@ -608,7 +668,8 @@ */ UINT WINAPI -GetTextAlign(HDC hdc) +GetTextAlign( + _In_ HDC hdc) { PDC_ATTR pdcattr; @@ -630,7 +691,8 @@ */ COLORREF WINAPI -GetTextColor(HDC hdc) +GetTextColor( + _In_ HDC hdc) { PDC_ATTR pdcattr; @@ -651,11 +713,12 @@ */ UINT WINAPI -SetTextAlign(HDC hdc, - UINT fMode) +SetTextAlign( + _In_ HDC hdc, + _In_ UINT fMode) { PDC_ATTR pdcattr; - INT OldMode; + INT fOldMode; /* Get the DC attribute */ pdcattr = GdiGetDcAttr(hdc); @@ -686,7 +749,7 @@ } #endif - OldMode = pdcattr->lTextAlign; + fOldMode = pdcattr->lTextAlign; pdcattr->lTextAlign = fMode; // Raw if (pdcattr->dwLayout & LAYOUT_RTL) { @@ -694,7 +757,7 @@ } pdcattr->flTextAlign = fMode & TA_MASK; - return OldMode; + return fOldMode; } @@ -704,12 +767,11 @@ COLORREF WINAPI SetTextColor( - HDC hdc, - COLORREF crColor -) + _In_ HDC hdc, + _In_ COLORREF crColor) { PDC_ATTR pdcattr; - COLORREF OldColor = CLR_INVALID; + COLORREF crOldColor = CLR_INVALID; /* Get the DC attribute */ pdcattr = GdiGetDcAttr(hdc); @@ -740,15 +802,16 @@ } #endif - OldColor = (COLORREF) pdcattr->ulForegroundClr; - pdcattr->ulForegroundClr = (ULONG) crColor; - - if ( pdcattr->crForegroundClr != crColor ) + crOldColor = (COLORREF) pdcattr->ulForegroundClr; + pdcattr->ulForegroundClr = (ULONG)crColor; + + if (pdcattr->crForegroundClr != crColor) { pdcattr->ulDirty_ |= (DIRTY_TEXT|DIRTY_LINE|DIRTY_FILL); pdcattr->crForegroundClr = crColor; } - return OldColor; + + return crOldColor; } /* @@ -757,10 +820,9 @@ BOOL WINAPI SetTextJustification( - HDC hdc, - int extra, - int breaks -) + _In_ HDC hdc, + _In_ INT nBreakExtra, + _In_ INT nBreakCount) { PDC_ATTR pdcattr; @@ -776,7 +838,7 @@ if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) { if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return MFDRV_SetTextJustification( hdc, extra, breaks ) + return MFDRV_SetTextJustification( hdc, nBreakExtra, nBreakCount ) else { SetLastError(ERROR_INVALID_HANDLE); @@ -793,8 +855,8 @@ } } - pdcattr->cBreak = breaks; - pdcattr->lBreakExtra = extra; + pdcattr->cBreak = nBreakCount; + pdcattr->lBreakExtra = nBreakExtra; return TRUE; } @@ -803,32 +865,35 @@ */ UINT WINAPI -GetStringBitmapA(HDC hdc, - LPSTR psz, - BOOL DoCall, - UINT cj, - BYTE *lpSB) +GetStringBitmapA( + _In_ HDC hdc, + _In_ LPSTR psz, + _In_ BOOL bDoCall, + _In_ UINT cj, + _Out_writes_(cj) BYTE *lpSB) { NTSTATUS Status; PWSTR pwsz; - UINT retValue = 0; - - if (DoCall) - { - Status = HEAP_strdupA2W ( &pwsz, psz ); - if ( !NT_SUCCESS (Status) ) - { - SetLastError (RtlNtStatusToDosError(Status)); - } - else - { - retValue = NtGdiGetStringBitmapW(hdc, pwsz, 1, lpSB, cj); - HEAP_free ( pwsz ); - } - } - - return retValue; + UINT uResult = 0; + + if (!bDoCall) + { + return 0; + } + + Status = HEAP_strdupA2W(&pwsz, psz); + if (!NT_SUCCESS(Status)) + { + SetLastError (RtlNtStatusToDosError(Status)); + } + else + { + uResult = NtGdiGetStringBitmapW(hdc, pwsz, 1, lpSB, cj); + HEAP_free(pwsz); + } + + return uResult; } @@ -837,35 +902,39 @@ */ UINT WINAPI -GetStringBitmapW(HDC hdc, - LPWSTR pwsz, - BOOL doCall, - UINT cj, - BYTE *lpSB) -{ - UINT retValue = 0; - - if (doCall) - { - retValue = NtGdiGetStringBitmapW(hdc, pwsz, 1, lpSB, cj); - } - - return retValue; - -} - -/* - * @implemented - */ -BOOL -WINAPI -GetETM(HDC hdc, - EXTTEXTMETRIC *petm) -{ - BOOL Ret = NtGdiGetETM(hdc, petm); - - if (Ret && petm) +GetStringBitmapW( + _In_ HDC hdc, + _In_ LPWSTR pwsz, + _In_ BOOL bDoCall, + _In_ UINT cj, + _Out_writes_(cj) BYTE *lpSB) +{ + if (!bDoCall) + { + return 0; + } + + return NtGdiGetStringBitmapW(hdc, pwsz, 1, lpSB, cj); + +} + +/* + * @implemented + */ +BOOL +WINAPI +GetETM( + _In_ HDC hdc, + _Out_ EXTTEXTMETRIC *petm) +{ + BOOL bResult; + + bResult = NtGdiGetETM(hdc, petm); + + if (bResult && petm) + { petm->emKernPairs = (WORD)GetKerningPairsA(hdc, 0, 0); - - return Ret; -} + } + + return bResult; +}

9 years, 10 months

[ekohl] 65323: [NET] - Convert error messages to resource strings. - ACCOUNTS: Add some padding to display strings. - USER: Support interactive password input.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Nov 8 14:35:27 2014 New Revision: 65323 URL: http://svn.reactos.org/svn/reactos?rev=65323&view=rev Log: [NET] - Convert error messages to resource strings. - ACCOUNTS: Add some padding to display strings. - USER: Support interactive password input. Modified: trunk/reactos/base/applications/network/net/cmdAccounts.c trunk/reactos/base/applications/network/net/cmdLocalGroup.c trunk/reactos/base/applications/network/net/cmdUser.c trunk/reactos/base/applications/network/net/lang/en-US.rc trunk/reactos/base/applications/network/net/lang/ro-RO.rc trunk/reactos/base/applications/network/net/lang/ru-RU.rc trunk/reactos/base/applications/network/net/main.c trunk/reactos/base/applications/network/net/net.h trunk/reactos/base/applications/network/net/resource.h Modified: trunk/reactos/base/applications/network/net/cmdAccounts.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdAccounts.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdAccounts.c [iso-8859-1] Sat Nov 8 14:35:27 2014 @@ -48,7 +48,7 @@ if (_wcsicmp(argv[i], L"/domain") == 0) { - PrintToConsole(L"The /DOMAIN option is not supported yet!\n"); + PrintResourceString(IDS_ERROR_OPTION_NOT_SUPPORTED, L"/DOMAIN"); #if 0 Domain = TRUE; #endif @@ -74,7 +74,7 @@ value = wcstoul(p, &endptr, 10); if (*endptr != 0) { - PrintToConsole(L"You entered an invalid value for the /FORCELOGOFF option.\n"); + PrintResourceString(IDS_ERROR_INVALID_OPTION_VALUE, L"/FORCELOGOFF"); result = 1; goto done; } @@ -89,7 +89,7 @@ value = wcstoul(p, &endptr, 10); if (*endptr != 0) { - PrintToConsole(L"You entered an invalid value for the /MINPWLEN option.\n"); + PrintResourceString(IDS_ERROR_INVALID_OPTION_VALUE, L"/MINPWLEN"); result = 1; goto done; } @@ -111,7 +111,7 @@ value = wcstoul(p, &endptr, 10); if (*endptr != 0) { - PrintToConsole(L"You entered an invalid value for the /MAXPWAGE option.\n"); + PrintResourceString(IDS_ERROR_INVALID_OPTION_VALUE, L"/MAXPWLEN"); result = 1; goto done; } @@ -126,7 +126,7 @@ value = wcstoul(p, &endptr, 10); if (*endptr != 0) { - PrintToConsole(L"You entered an invalid value for the /MINPWAGE option.\n"); + PrintResourceString(IDS_ERROR_INVALID_OPTION_VALUE, L"/MINPWAGE"); result = 1; goto done; } @@ -140,7 +140,7 @@ value = wcstoul(p, &endptr, 10); if (*endptr != 0) { - PrintToConsole(L"You entered an invalid value for the /UNIQUEPW option.\n"); + PrintResourceString(IDS_ERROR_INVALID_OPTION_VALUE, L"/UNIQUEPW"); result = 1; goto done; } @@ -168,32 +168,32 @@ RtlGetNtProductType(&ProductType); - PrintToConsole(L"Force logoff after: "); + PrintToConsole(L"Force logoff after: "); if (Info0->usrmod0_force_logoff == TIMEQ_FOREVER) PrintToConsole(L"Never\n"); else PrintToConsole(L"%lu seconds\n", Info0->usrmod0_force_logoff); - PrintToConsole(L"Minimum password age (in days): %lu\n", Info0->usrmod0_min_passwd_age / 86400); - PrintToConsole(L"Maximum password age (in days): %lu\n", Info0->usrmod0_max_passwd_age / 86400); - PrintToConsole(L"Minimum password length: %lu\n", Info0->usrmod0_min_passwd_len); - - PrintToConsole(L"Password history length: "); + PrintToConsole(L"Minimum password age (in days): %lu\n", Info0->usrmod0_min_passwd_age / 86400); + PrintToConsole(L"Maximum password age (in days): %lu\n", Info0->usrmod0_max_passwd_age / 86400); + PrintToConsole(L"Minimum password length: %lu\n", Info0->usrmod0_min_passwd_len); + + PrintToConsole(L"Password history length: "); if (Info0->usrmod0_password_hist_len == 0) PrintToConsole(L"None\n"); else PrintToConsole(L"%lu\n", Info0->usrmod0_password_hist_len); - PrintToConsole(L"Lockout threshold: "); + PrintToConsole(L"Lockout threshold: "); if (Info3->usrmod3_lockout_threshold == 0) PrintToConsole(L"Never\n"); else PrintToConsole(L"%lu\n", Info3->usrmod3_lockout_threshold); - PrintToConsole(L"Lockout duration (in minutes): %lu\n", Info3->usrmod3_lockout_duration / 60); - PrintToConsole(L"Lockout observation window (in minutes): %lu\n", Info3->usrmod3_lockout_observation_window / 60); - - PrintToConsole(L"Computer role: "); + PrintToConsole(L"Lockout duration (in minutes): %lu\n", Info3->usrmod3_lockout_duration / 60); + PrintToConsole(L"Lockout observation window (in minutes): %lu\n", Info3->usrmod3_lockout_observation_window / 60); + + PrintToConsole(L"Computer role: "); if (Info1->usrmod1_role == UAS_ROLE_PRIMARY) { Modified: trunk/reactos/base/applications/network/net/cmdLocalGroup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdLocalGroup.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdLocalGroup.c [iso-8859-1] Sat Nov 8 14:35:27 2014 @@ -248,7 +248,7 @@ } else if (_wcsicmp(argv[i], L"/domain") == 0) { - printf("The /DOMAIN option is not supported yet!\n"); + PrintResourceString(IDS_ERROR_OPTION_NOT_SUPPORTED, L"/DOMAIN"); #if 0 bDomain = TRUE; #endif Modified: trunk/reactos/base/applications/network/net/cmdUser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdUser.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdUser.c [iso-8859-1] Sat Nov 8 14:35:27 2014 @@ -267,6 +267,47 @@ } +static +VOID +ReadPassword( + LPWSTR *lpPassword, + LPBOOL lpAllocated) +{ + WCHAR szPassword1[PWLEN + 1]; + WCHAR szPassword2[PWLEN + 1]; + LPWSTR ptr; + + *lpAllocated = FALSE; + + printf("Enter the password for user xxx: "); + ReadFromConsole(szPassword1, PWLEN + 1, FALSE); + printf("\n"); + + printf("Enter the password again: "); + ReadFromConsole(szPassword2, PWLEN + 1, FALSE); + printf("\n"); + + if (wcslen(szPassword1) == wcslen(szPassword2) && + wcscmp(szPassword1, szPassword2) == 0) + { + ptr = HeapAlloc(GetProcessHeap(), + 0, + (wcslen(szPassword1) + 1) * sizeof(WCHAR)); + if (ptr != NULL) + { + wcscpy(ptr, szPassword1); + *lpPassword = ptr; + *lpAllocated = TRUE; + } + } + else + { + printf("The passwords do not match!"); + *lpPassword = NULL; + } +} + + INT cmdUser( INT argc, @@ -286,6 +327,7 @@ LPWSTR p; LPWSTR endptr; DWORD value; + BOOL bPasswordAllocated = FALSE; NET_API_STATUS Status; if (argc == 2) @@ -305,14 +347,14 @@ if (argv[i][0] != L'/') { lpUserName = argv[i]; - printf("User: %S\n", lpUserName); +// printf("User: %S\n", lpUserName); i++; } if (argv[i][0] != L'/') { lpPassword = argv[i]; - printf("Password: %S\n", lpPassword); +// printf("Password: %S\n", lpPassword); i++; } @@ -333,7 +375,7 @@ } else if (_wcsicmp(argv[j], L"/domain") == 0) { - printf("The /DOMAIN option is not supported yet!\n"); + PrintResourceString(IDS_ERROR_OPTION_NOT_SUPPORTED, L"/DOMAIN"); #if 0 bDomain = TRUE; #endif @@ -344,6 +386,13 @@ { result = 1; goto done; + } + + /* Interactive password input */ + if (lpPassword != NULL && wcscmp(lpPassword, L"*") == 0) + { + ReadPassword(&lpPassword, + &bPasswordAllocated); } if (!bAdd && !bDelete) @@ -387,7 +436,7 @@ } else { - PrintToConsole(L"You entered an invalid value for the /ACTIVE option.\n"); + PrintResourceString(IDS_ERROR_INVALID_OPTION_VALUE, L"/ACTIVE"); result = 1; goto done; } @@ -402,7 +451,7 @@ value = wcstoul(p, &endptr, 10); if (*endptr != 0) { - PrintToConsole(L"You entered an invalid value for the /COUNTRYCODE option.\n"); + PrintResourceString(IDS_ERROR_INVALID_OPTION_VALUE, L"/COUNTRYCODE"); result = 1; goto done; } @@ -413,6 +462,16 @@ } else if (_wcsnicmp(argv[j], L"/expires:", 9) == 0) { + p = &argv[i][9]; + if (_wcsicmp(p, L"never") == 0) + { + pUserInfo->usri4_acct_expires = TIMEQ_FOREVER; + } + else + { + /* FIXME: Parse the date */ + PrintResourceString(IDS_ERROR_OPTION_NOT_SUPPORTED, L"/EXPIRES"); + } } else if (_wcsnicmp(argv[j], L"/fullname:", 10) == 0) { @@ -435,7 +494,7 @@ } else { - PrintToConsole(L"You entered an invalid value for the /PASSWORDCHG option.\n"); + PrintResourceString(IDS_ERROR_INVALID_OPTION_VALUE, L"/PASSWORDCHG"); result = 1; goto done; } @@ -453,7 +512,7 @@ } else { - PrintToConsole(L"You entered an invalid value for the /PASSWORDREQ option.\n"); + PrintResourceString(IDS_ERROR_INVALID_OPTION_VALUE, L"/PASSWORDREQ"); result = 1; goto done; } @@ -468,6 +527,8 @@ } else if (_wcsnicmp(argv[j], L"/times:", 7) == 0) { + /* FIXME */ + PrintResourceString(IDS_ERROR_OPTION_NOT_SUPPORTED, L"/TIMES"); } else if (_wcsnicmp(argv[j], L"/usercomment:", 13) == 0) { @@ -475,6 +536,8 @@ } else if (_wcsnicmp(argv[j], L"/workstations:", 14) == 0) { + /* FIXME */ + PrintResourceString(IDS_ERROR_OPTION_NOT_SUPPORTED, L"/WORKSTATIONS"); } } @@ -506,6 +569,9 @@ } done: + if (bPasswordAllocated == TRUE && lpPassword != NULL) + HeapFree(GetProcessHeap(), 0, lpPassword); + if (!bAdd && !bDelete && pUserInfo != NULL) NetApiBufferFree(pUserInfo); Modified: trunk/reactos/base/applications/network/net/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/lang/en-US.rc [iso-8859-1] Sat Nov 8 14:35:27 2014 @@ -34,7 +34,7 @@ IDS_SESSION_HELP "SESSION\n..." IDS_SHARE_SYNTAX "Usage:\nNET SHARE ..." IDS_SHARE_HELP "SHARE\n..." - IDS_START_SYNTAX "Usage:\nNET START ..." + IDS_START_SYNTAX "Usage:\nNET START <Service name>" IDS_START_HELP "START\n..." IDS_STATISTICS_SYNTAX "Usage:\nNET STATISTICS ..." IDS_STATISTICS_HELP "STATISTICS\n..." @@ -64,4 +64,7 @@ IDS_NET_SYNTAX "Usage:\nNET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\ HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\ SHARE | START | STATISTICS | STOP | TIME | USE | NET USER | VIEW ]\n" + + IDS_ERROR_OPTION_NOT_SUPPORTED "The %s option is not supported yet.\n" + IDS_ERROR_INVALID_OPTION_VALUE "You entered an invalid value for the %s option.\n" END Modified: trunk/reactos/base/applications/network/net/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/lang/ro-RO.rc [iso-8859-1] Sat Nov 8 14:35:27 2014 @@ -70,4 +70,7 @@ IDS_NET_SYNTAX "Utilizare:\nNET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\ HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\ SHARE | START | STATISTICS | STOP | TIME | USE | NET USER | VIEW ]\n" + + IDS_ERROR_OPTION_NOT_SUPPORTED "The %s option is not supported yet.\n" + IDS_ERROR_INVALID_OPTION_VALUE "You entered an invalid value for the %s option.\n" END Modified: trunk/reactos/base/applications/network/net/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/lang/ru-RU.rc [iso-8859-1] Sat Nov 8 14:35:27 2014 @@ -66,4 +66,7 @@ IDS_NET_SYNTAX "ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ:\nNET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP |\n\ HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION |\n\ SHARE | START | STATISTICS | STOP | TIME | USE | NET USER | VIEW ]\n" + + IDS_ERROR_OPTION_NOT_SUPPORTED "The %s option is not supported yet.\n" + IDS_ERROR_INVALID_OPTION_VALUE "You entered an invalid value for the %s option.\n" END Modified: trunk/reactos/base/applications/network/net/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/main.c [iso-8859-1] Sat Nov 8 14:35:27 2014 @@ -118,6 +118,43 @@ } +VOID +ReadFromConsole( + LPWSTR lpInput, + DWORD dwLength, + BOOL bEcho) +{ + DWORD dwOldMode; + DWORD dwRead = 0; + HANDLE hFile; + LPWSTR p; + PCHAR pBuf; + + pBuf = HeapAlloc(GetProcessHeap(), 0, dwLength - 1); + ZeroMemory(lpInput, dwLength * sizeof(WCHAR)); + hFile = GetStdHandle(STD_INPUT_HANDLE); + GetConsoleMode(hFile, &dwOldMode); + + SetConsoleMode(hFile, ENABLE_LINE_INPUT | (bEcho ? ENABLE_ECHO_INPUT : 0)); + + ReadFile(hFile, (PVOID)pBuf, dwLength - 1, &dwRead, NULL); + + MultiByteToWideChar(CP_OEMCP, 0, pBuf, dwRead, lpInput, dwLength - 1); + HeapFree(GetProcessHeap(), 0, pBuf); + + for (p = lpInput; *p; p++) + { + if (*p == L'\x0d') + { + *p = L'\0'; + break; + } + } + + SetConsoleMode(hFile, dwOldMode); +} + + int wmain(int argc, WCHAR **argv) { PCOMMAND cmdptr; Modified: trunk/reactos/base/applications/network/net/net.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/net.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/net.h [iso-8859-1] Sat Nov 8 14:35:27 2014 @@ -39,6 +39,12 @@ WriteToConsole( LPWSTR lpString); +VOID +ReadFromConsole( + LPWSTR lpInput, + DWORD dwLength, + BOOL bEcho); + VOID help(VOID); INT unimplemented(INT argc, WCHAR **argv); Modified: trunk/reactos/base/applications/network/net/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/resource.h [iso-8859-1] Sat Nov 8 14:35:27 2014 @@ -44,3 +44,6 @@ #define IDS_VIEW_HELP 141 #define IDS_HELP_SYNTAX 142 #define IDS_NET_SYNTAX 143 + +#define IDS_ERROR_OPTION_NOT_SUPPORTED 500 +#define IDS_ERROR_INVALID_OPTION_VALUE 501

9 years, 10 months

[janderwald] 65322: [NDK] - adjust PLUGPLAY_CONTROL_INTERFACE_DEVICE_LIST_DATA [UMPNPMGR] - implement PNP_GetInterfaceDeviceList, PNP_GetInterfaceDeviceListSize - currently not yet working PlugPlay...

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Nov 8 13:28:01 2014 New Revision: 65322 URL: http://svn.reactos.org/svn/reactos?rev=65322&view=rev Log: [NDK] - adjust PLUGPLAY_CONTROL_INTERFACE_DEVICE_LIST_DATA [UMPNPMGR] - implement PNP_GetInterfaceDeviceList, PNP_GetInterfaceDeviceListSize - currently not yet working PlugPlayControlGetInterfaceDeviceList class in NtPlugPlayControl is not implemented Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/include/ndk/cmtypes.h Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Sat Nov 8 13:28:01 2014 @@ -169,6 +169,8 @@ { case STATUS_NO_SUCH_DEVICE: return CR_NO_SUCH_DEVINST; + case STATUS_NOT_IMPLEMENTED: + return CR_CALL_NOT_IMPLEMENTED; default: /* FIXME: add more mappings */ @@ -1223,8 +1225,34 @@ PNP_RPC_BUFFER_SIZE *pulLength, DWORD ulFlags) { - UNIMPLEMENTED; - return CR_CALL_NOT_IMPLEMENTED; + NTSTATUS Status; + PLUGPLAY_CONTROL_INTERFACE_DEVICE_LIST_DATA PlugPlayData; + DWORD ret = CR_SUCCESS; + + UNREFERENCED_PARAMETER(hBinding); + UNREFERENCED_PARAMETER(ulFlags); + + RtlInitUnicodeString(&PlugPlayData.DeviceInstance, + pszDeviceID); + + PlugPlayData.FilterGuid = InterfaceGuid; + PlugPlayData.Buffer = Buffer; + PlugPlayData.BufferSize = *pulLength; + + Status = NtPlugPlayControl(PlugPlayControlGetInterfaceDeviceList, + (PVOID)&PlugPlayData, + sizeof(PLUGPLAY_CONTROL_INTERFACE_DEVICE_LIST_DATA)); + if (NT_SUCCESS(Status)) + { + *pulLength = PlugPlayData.BufferSize; + } + else + { + ret = NtStatusToCrError(Status); + } + + DPRINT("PNP_GetInterfaceDeviceListSize() done (returns %lx)\n", ret); + return ret; } @@ -1238,8 +1266,36 @@ LPWSTR pszDeviceID, DWORD ulFlags) { - UNIMPLEMENTED; - return CR_CALL_NOT_IMPLEMENTED; + NTSTATUS Status; + PLUGPLAY_CONTROL_INTERFACE_DEVICE_LIST_DATA PlugPlayData; + DWORD ret = CR_SUCCESS; + + UNREFERENCED_PARAMETER(hBinding); + UNREFERENCED_PARAMETER(ulFlags); + + DPRINT("PNP_GetInterfaceDeviceListSize() called\n"); + + RtlInitUnicodeString(&PlugPlayData.DeviceInstance, + pszDeviceID); + + PlugPlayData.FilterGuid = InterfaceGuid; + PlugPlayData.Buffer = NULL; + PlugPlayData.BufferSize = 0; + + Status = NtPlugPlayControl(PlugPlayControlGetInterfaceDeviceList, + (PVOID)&PlugPlayData, + sizeof(PLUGPLAY_CONTROL_INTERFACE_DEVICE_LIST_DATA)); + if (NT_SUCCESS(Status)) + { + *pulLen = PlugPlayData.BufferSize; + } + else + { + ret = NtStatusToCrError(Status); + } + + DPRINT("PNP_GetInterfaceDeviceListSize() done (returns %lx)\n", ret); + return ret; } Modified: trunk/reactos/include/ndk/cmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/cmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/cmtypes.h [iso-8859-1] Sat Nov 8 13:28:01 2014 @@ -422,7 +422,7 @@ typedef struct _PLUGPLAY_CONTROL_INTERFACE_DEVICE_LIST_DATA { UNICODE_STRING DeviceInstance; - LPWSTR FilterGuid; + LPGUID FilterGuid; PVOID Buffer; ULONG BufferSize; } PLUGPLAY_CONTROL_INTERFACE_DEVICE_LIST_DATA, *PPLUGPLAY_CONTROL_INTERFACE_DEVICE_LIST_DATA;

9 years, 10 months

[janderwald] 65321: [NDK] - add type for retrieving device interface list - please review

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Nov 8 13:13:03 2014 New Revision: 65321 URL: http://svn.reactos.org/svn/reactos?rev=65321&view=rev Log: [NDK] - add type for retrieving device interface list - please review Modified: trunk/reactos/include/ndk/cmtypes.h Modified: trunk/reactos/include/ndk/cmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/cmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/cmtypes.h [iso-8859-1] Sat Nov 8 13:13:03 2014 @@ -418,6 +418,15 @@ // Plug and Play Control Classes // +//Class 0x09 +typedef struct _PLUGPLAY_CONTROL_INTERFACE_DEVICE_LIST_DATA +{ + UNICODE_STRING DeviceInstance; + LPWSTR FilterGuid; + PVOID Buffer; + ULONG BufferSize; +} PLUGPLAY_CONTROL_INTERFACE_DEVICE_LIST_DATA, *PPLUGPLAY_CONTROL_INTERFACE_DEVICE_LIST_DATA; + //Class 0x0A typedef struct _PLUGPLAY_CONTROL_PROPERTY_DATA {

9 years, 10 months

[tkreuzer] 65320: [GDI32] Use GdiGetDcAttr() where appropriate, improve SetLastError() situation.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Nov 8 13:12:07 2014 New Revision: 65320 URL: http://svn.reactos.org/svn/reactos?rev=65320&view=rev Log: [GDI32] Use GdiGetDcAttr() where appropriate, improve SetLastError() situation. Modified: trunk/reactos/win32ss/gdi/gdi32/objects/text.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/text.c [iso-8859-1] Sat Nov 8 13:12:07 2014 @@ -84,10 +84,20 @@ WINAPI GdiGetCodePage(HDC hdc) { - PDC_ATTR Dc_Attr; - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return 0; - if (Dc_Attr->ulDirty_ & DIRTY_CHARSET) return LOWORD(NtGdiGetCharSet(hdc)); - return LOWORD(Dc_Attr->iCS_CP); + PDC_ATTR pdcattr; + + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (pdcattr->ulDirty_ & DIRTY_CHARSET) + return LOWORD(NtGdiGetCharSet(hdc)); + + return LOWORD(pdcattr->iCS_CP); } @@ -97,14 +107,20 @@ int WINAPI GetTextCharacterExtra( - HDC hDc -) -{ - PDC_ATTR Dc_Attr; - - if (!GdiGetHandleUserData((HGDIOBJ) hDc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return 0; - return Dc_Attr->lTextExtra; -// return GetDCDWord( hDc, GdiGetTextCharExtra, 0); + HDC hdc +) +{ + PDC_ATTR pdcattr; + + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + /* Do not set LastError here! */ + return 0x8000000; + } + + return pdcattr->lTextExtra; } @@ -133,7 +149,7 @@ { TMW_INTERNAL tmwi; - if (! NtGdiGetTextMetricsW(hdc, &tmwi, sizeof(TMW_INTERNAL))) + if (!NtGdiGetTextMetricsW(hdc, &tmwi, sizeof(TMW_INTERNAL))) { return FALSE; } @@ -544,38 +560,46 @@ int WINAPI SetTextCharacterExtra( - HDC hDC, + HDC hdc, int CharExtra ) { - INT cExtra = 0x80000000; - PDC_ATTR Dc_Attr; - - if (CharExtra == cExtra) + INT cExtra; + PDC_ATTR pdcattr; + + if (CharExtra == 0x80000000) { SetLastError(ERROR_INVALID_PARAMETER); - return cExtra; - } + return 0x80000000; + } + #if 0 - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - { - return MFDRV_SetTextCharacterExtra( hDC, CharExtra ); // Wine port. + if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) + { + return MFDRV_SetTextCharacterExtra( hdc, CharExtra ); // Wine port. } #endif - if (!GdiGetHandleUserData((HGDIOBJ) hDC, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return cExtra; - - if (NtCurrentTeb()->GdiTebBatch.HDC == hDC) - { - if (Dc_Attr->ulDirty_ & DC_FONTTEXT_DIRTY) + + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0x8000000; + } + + if (NtCurrentTeb()->GdiTebBatch.HDC == hdc) + { + if (pdcattr->ulDirty_ & DC_FONTTEXT_DIRTY) { - NtGdiFlush(); // Sync up Dc_Attr from Kernel space. - Dc_Attr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); + NtGdiFlush(); // Sync up pdcattr from Kernel space. + pdcattr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); } } - cExtra = Dc_Attr->lTextExtra; - Dc_Attr->lTextExtra = CharExtra; + + cExtra = pdcattr->lTextExtra; + pdcattr->lTextExtra = CharExtra; return cExtra; -// return GetAndSetDCDWord( hDC, GdiGetSetTextCharExtra, CharExtra, 0, 0, 0 ); } /* @@ -586,9 +610,17 @@ WINAPI GetTextAlign(HDC hdc) { - PDC_ATTR Dc_Attr; - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return 0; - return Dc_Attr->lTextAlign; + PDC_ATTR pdcattr; + + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + /* Do not set LastError here! */ + return GDI_ERROR; + } + + return pdcattr->lTextAlign; } @@ -600,11 +632,18 @@ WINAPI GetTextColor(HDC hdc) { - PDC_ATTR Dc_Attr; - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return 0; - return Dc_Attr->ulForegroundClr; -} - + PDC_ATTR pdcattr; + + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + /* Do not set LastError here! */ + return CLR_INVALID; + } + + return pdcattr->ulForegroundClr; +} /* @@ -615,8 +654,17 @@ SetTextAlign(HDC hdc, UINT fMode) { - PDC_ATTR Dc_Attr; + PDC_ATTR pdcattr; INT OldMode; + + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return GDI_ERROR; + } + #if 0 if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) { @@ -624,7 +672,7 @@ return MFDRV_SetTextAlign( hdc, fMode ) else { - PLDC pLDC = Dc_Attr->pvLDC; + PLDC pLDC = pdcattr->pvLDC; if ( !pLDC ) { SetLastError(ERROR_INVALID_HANDLE); @@ -637,15 +685,15 @@ } } #endif - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return GDI_ERROR; - - OldMode = Dc_Attr->lTextAlign; - Dc_Attr->lTextAlign = fMode; // Raw - if (Dc_Attr->dwLayout & LAYOUT_RTL) + + OldMode = pdcattr->lTextAlign; + pdcattr->lTextAlign = fMode; // Raw + if (pdcattr->dwLayout & LAYOUT_RTL) { if ((fMode & TA_CENTER) != TA_CENTER) fMode ^= TA_RIGHT; } - Dc_Attr->flTextAlign = fMode & TA_MASK; + + pdcattr->flTextAlign = fMode & TA_MASK; return OldMode; } @@ -660,8 +708,17 @@ COLORREF crColor ) { - PDC_ATTR Dc_Attr; + PDC_ATTR pdcattr; COLORREF OldColor = CLR_INVALID; + + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return GDI_ERROR; + } + #if 0 if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) { @@ -669,7 +726,7 @@ return MFDRV_SetTextColor( hDC, crColor ); else { - PLDC pLDC = Dc_Attr->pvLDC; + PLDC pLDC = pdcattr->pvLDC; if ( !pLDC ) { SetLastError(ERROR_INVALID_HANDLE); @@ -682,15 +739,14 @@ } } #endif - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return OldColor; - - OldColor = (COLORREF) Dc_Attr->ulForegroundClr; - Dc_Attr->ulForegroundClr = (ULONG) crColor; - - if ( Dc_Attr->crForegroundClr != crColor ) - { - Dc_Attr->ulDirty_ |= (DIRTY_TEXT|DIRTY_LINE|DIRTY_FILL); - Dc_Attr->crForegroundClr = crColor; + + OldColor = (COLORREF) pdcattr->ulForegroundClr; + pdcattr->ulForegroundClr = (ULONG) crColor; + + if ( pdcattr->crForegroundClr != crColor ) + { + pdcattr->ulDirty_ |= (DIRTY_TEXT|DIRTY_LINE|DIRTY_FILL); + pdcattr->crForegroundClr = crColor; } return OldColor; } @@ -706,7 +762,16 @@ int breaks ) { - PDC_ATTR Dc_Attr; + PDC_ATTR pdcattr; + + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + { + /* Do not set LastError here! */ + return GDI_ERROR; + } + #if 0 if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) { @@ -718,20 +783,20 @@ return FALSE; } #endif - if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return FALSE; - - if (NtCurrentTeb()->GdiTebBatch.HDC == hdc) + + if (NtCurrentTeb()->GdiTebBatch.HDC == hdc) + { + if (pdcattr->ulDirty_ & DC_FONTTEXT_DIRTY) { - if (Dc_Attr->ulDirty_ & DC_FONTTEXT_DIRTY) - { - NtGdiFlush(); // Sync up Dc_Attr from Kernel space. - Dc_Attr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); - } + NtGdiFlush(); // Sync up pdcattr from Kernel space. + pdcattr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); } - Dc_Attr->cBreak = breaks; - Dc_Attr->lBreakExtra = extra; - return TRUE; - } + } + + pdcattr->cBreak = breaks; + pdcattr->lBreakExtra = extra; + return TRUE; +} /* * @implemented

9 years, 10 months

[akhaldi] 65319: [CSCRIPT] * Import from Wine 1.7.27. CORE-8770 #resolve #comment Imported in r65317. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Nov 8 11:41:13 2014 New Revision: 65319 URL: http://svn.reactos.org/svn/reactos?rev=65319&view=rev Log: [CSCRIPT] * Import from Wine 1.7.27. CORE-8770 #resolve #comment Imported in r65317. CORE-8540 Added: trunk/reactos/base/applications/cmdutils/cscript/ (with props) trunk/reactos/base/applications/cmdutils/cscript/CMakeLists.txt (with props) trunk/reactos/base/applications/cmdutils/cscript/ihost.idl (with props) trunk/reactos/base/applications/cmdutils/cscript/rsrc.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] Sat Nov 8 11:41:13 2014 @@ -1,4 +1,5 @@ add_subdirectory(comp) +add_subdirectory(cscript) add_subdirectory(dbgprint) add_subdirectory(doskey) add_subdirectory(find) Propchange: trunk/reactos/base/applications/cmdutils/cscript/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Nov 8 11:41:13 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/base/applications/cmdutils/cscript/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/base/applications/cmdutils/cscript/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/base/applications/cmdutils/cscript/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/applications/cmdutils/cscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/cscript/CMakeLists.txt (added) +++ trunk/reactos/base/applications/cmdutils/cscript/CMakeLists.txt [iso-8859-1] Sat Nov 8 11:41:13 2014 @@ -0,0 +1,21 @@ + +add_definitions(-DCSCRIPT_BUILD) +set(wscript_folder ${REACTOS_SOURCE_DIR}/base/applications/cmdutils/wscript) +include_directories(${wscript_folder}) + +list(APPEND SOURCE + ${wscript_folder}/arguments.c + ${wscript_folder}/host.c + ${wscript_folder}/main.c + ${wscript_folder}/wscript.h) + +add_executable(cscript ${SOURCE} rsrc.rc) +add_idl_headers(cscript_idlheader ihost.idl) +add_typelib(ihost.idl) +set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ihost.tlb) +target_link_libraries(cscript uuid wine) +set_module_type(cscript win32cui UNICODE) +add_importlibs(cscript shell32 oleaut32 ole32 advapi32 msvcrt kernel32 ntdll) +add_dependencies(cscript stdole2 cscript_idlheader) +add_pch(cscript ${wscript_folder}/wscript.h SOURCE) +add_cd_file(TARGET cscript DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/base/applications/cmdutils/cscript/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/cscript/ihost.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/cscript/ihost.idl (added) +++ trunk/reactos/base/applications/cmdutils/cscript/ihost.idl [iso-8859-1] Sat Nov 8 11:41:13 2014 @@ -0,0 +1,188 @@ +/* + * Copyright 2010 Jacek Caban for CodeWeavers + * + * 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 + */ + +#pragma makedep typelib + +#include "ihost_dispid.h" + +import "oaidl.idl"; + +[ + uuid(60254ca0-953b-11cf-8c96-00aa00b8708c), + version(5.6), +] +library IHost +{ + importlib("stdole2.tlb"); + + [ + odl, + uuid(2cc5a9d1-b1e5-11d3-a286-00104bd35090), + dual, + oleautomation + ] + interface IArguments2 : IDispatch { + [id(DISPID_VALUE)] + HRESULT Item( + [in] LONG Index, + [out, retval] BSTR *out_Value); + + [id(IARGUMENTS2_COUNT_DISPID)] + HRESULT Count([out, retval] LONG *out_Count); + + [id(IARGUMENTS2_LENGTH_DISPID), propget] + HRESULT length([out, retval] LONG *out_Count); + } + + [ + odl, + uuid(53bad8c1-e718-11cf-893d-00a0c9054228), + hidden, + dual, + nonextensible, + oleautomation + ] + interface ITextStream : IDispatch { + [id(ITEXTSTREAM_LINE_DISPID), propget] + HRESULT Line([out, retval] LONG *Line); + + [id(ITEXTSTREAM_COLUMN_DISPID), propget] + HRESULT Column([out, retval] LONG *Column); + + [id(ITEXTSTREAM_ATENDOFSTREAM_DISPID), propget] + HRESULT AtEndOfStream([out, retval] VARIANT_BOOL *EOS); + + [id(ITEXTSTREAM_ATENDOFLINE_DISPID), propget] + HRESULT AtEndOfLine([out, retval] VARIANT_BOOL *EOL); + + [id(ITEXTSTREAM_READ_DISPID)] + HRESULT Read( + [in] LONG Characters, + [out, retval] BSTR *Text); + + [id(ITEXTSTREAM_READLINE_DISPID)] + HRESULT ReadLine([out, retval] BSTR *Text); + + [id(ITEXTSTREAM_READALL_DISPID)] + HRESULT ReadAll([out, retval] BSTR *Text); + + [id(ITEXTSTREAM_WRITE_DISPID)] + HRESULT Write([in] BSTR Text); + + [id(ITEXTSTREAM_WRITELINE_DISPID)] + HRESULT WriteLine([in, optional, defaultvalue("")] BSTR Text); + + [id(ITEXTSTREAM_WRITEBLANKLINES_DISPID)] + HRESULT WriteBlankLines([in] LONG Lines); + + [id(ITEXTSTREAM_SKIP_DISPID)] + HRESULT Skip([in] LONG Characters); + + [id(ITEXTSTREAM_SKIPLINE_DISPID)] + HRESULT SkipLine(); + + [id(ITEXTSTREAM_CLOSE_DISPID)] + HRESULT Close(); + } + + [ + odl, + uuid(91afbd1b-5feb-43f5-b028-e2ca960617ec), + dual, + oleautomation + ] + interface IHost : IDispatch { + [id(IHOST_NAME_DISPID), propget] + HRESULT Name([out, retval] BSTR *out_Name); + + [id(IHOST_APPLICATION_DISPID), propget] + HRESULT Application([out, retval] IDispatch **out_Dispatch); + + [id(IHOST_FULLNAME_DISPID), propget] + HRESULT FullName([out, retval] BSTR *out_Path); + + [id(IHOST_PATH_DISPID), propget] + HRESULT Path([out, retval] BSTR* out_Path); + + [id(IHOST_INTERACTIVE_DISPID), propget] + HRESULT Interactive([out, retval] VARIANT_BOOL *out_Interactive); + + [id(IHOST_INTERACTIVE_DISPID), propput] + HRESULT Interactive([in] VARIANT_BOOL out_Interactive); + + [id(IHOST_QUIT_DISPID)] + HRESULT Quit([in, optional, defaultvalue(0)] int ExitCode); + + [id(IHOST_SCRIPTNAME_DISPID), propget] + HRESULT ScriptName([out, retval] BSTR *out_ScriptName); + + [id(IHOST_SCRIPTFULLNAME_DISPID), propget] + HRESULT ScriptFullName([out, retval] BSTR* out_ScriptFullName); + + [id(IHOST_ARGUMENTS_DISPID), propget] + HRESULT Arguments([out, retval] IArguments2 **out_Arguments); + + [id(IHOST_VERSION_DISPID), propget] + HRESULT Version([out, retval] BSTR *out_Version); + + [id(IHOST_BUILDVERSION_DISPID), propget] + HRESULT BuildVersion([out, retval] int *out_Build); + + [id(IHOST_TIMEOUT_DISPID), propget] + HRESULT Timeout([out, retval] LONG *out_Timeout); + + [id(IHOST_TIMEOUT_DISPID), propput] + HRESULT Timeout([in] LONG out_Timeout); + + [id(IHOST_CREATEOBJECT_DISPID)] + HRESULT CreateObject( + [in] BSTR ProgID, + [in, optional, defaultvalue("")] BSTR Prefix, + [out, retval] IDispatch **out_Dispatch); + + [id(IHOST_ECHO_DISPID), vararg] + HRESULT Echo([in] SAFEARRAY(VARIANT) pArgs); + + [id(IHOST_GETOBJECT_DISPID)] + HRESULT GetObject( + [in] BSTR Pathname, + [in, optional, defaultvalue("")] BSTR ProgID, + [in, optional, defaultvalue("")] BSTR Prefix, + [out, retval] IDispatch **out_Dispatch); + + [id(IHOST_DISCONNECTOBJECT_DISPID)] + HRESULT DisconnectObject([in] IDispatch *Object); + + [id(IHOST_SLEEP_DISPID)] + HRESULT Sleep([in] LONG Time); + + [id(IHOST_CONNECTOBJECT_DISPID)] + HRESULT ConnectObject( + [in] IDispatch *Object, + [in] BSTR Prefix); + + [id(IHOST_STDIN_DISPID), propget] + HRESULT StdIn([out, retval] ITextStream **out_ppts); + + [id(IHOST_STDOUT_DISPID), propget] + HRESULT StdOut([out, retval] ITextStream **ppts); + + [id(IHOST_STDERR_DISPID), propget] + HRESULT StdErr([out, retval] ITextStream **ppts); + } +} Propchange: trunk/reactos/base/applications/cmdutils/cscript/ihost.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/cscript/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/cscript/rsrc.rc (added) +++ trunk/reactos/base/applications/cmdutils/cscript/rsrc.rc [iso-8859-1] Sat Nov 8 11:41:13 2014 @@ -0,0 +1,20 @@ +/* + * Copyright 2010 Jacek Caban for CodeWeavers + * + * 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 + */ + +/* @makedep: ihost.tlb */ +1 TYPELIB ihost.tlb Propchange: trunk/reactos/base/applications/cmdutils/cscript/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Nov 8 11:41:13 2014 @@ -234,6 +234,7 @@ ReactOS shares the following programs with Winehq. +reactos/base/applications/cmdutils/cscript # Synced to Wine-1.7.27 reactos/base/applications/cmdutils/reg # Synced to Wine-1.7.27 reactos/base/applications/cmdutils/taskkill # Synced to Wine-1.7.27 reactos/base/applications/cmdutils/wmic # Synced to Wine-1.7.27

9 years, 10 months

[akhaldi] 65318: [WSCRIPT_WINETEST] * Import from Wine 1.7.27. CORE-8769 CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Nov 8 11:26:28 2014 New Revision: 65318 URL: http://svn.reactos.org/svn/reactos?rev=65318&view=rev Log: [WSCRIPT_WINETEST] * Import from Wine 1.7.27. CORE-8769 CORE-8540 Added: trunk/rostests/winetests/wscript/ (with props) trunk/rostests/winetests/wscript/CMakeLists.txt (with props) trunk/rostests/winetests/wscript/rsrc.rc (with props) trunk/rostests/winetests/wscript/run.c (with props) trunk/rostests/winetests/wscript/run.js (with props) trunk/rostests/winetests/wscript/run.vbs (with props) trunk/rostests/winetests/wscript/testlist.c (with props) Modified: trunk/rostests/winetests/CMakeLists.txt Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Sat Nov 8 11:26:28 2014 @@ -114,6 +114,7 @@ add_subdirectory(wlanapi) add_subdirectory(wldap32) add_subdirectory(ws2_32) +add_subdirectory(wscript) add_subdirectory(wshom) add_subdirectory(xcopy) add_subdirectory(xinput1_3) Propchange: trunk/rostests/winetests/wscript/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Nov 8 11:26:28 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rostests/winetests/wscript/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rostests/winetests/wscript/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Added: trunk/rostests/winetests/wscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wscript/CMakeLi… ============================================================================== --- trunk/rostests/winetests/wscript/CMakeLists.txt (added) +++ trunk/rostests/winetests/wscript/CMakeLists.txt [iso-8859-1] Sat Nov 8 11:26:28 2014 @@ -0,0 +1,7 @@ + +add_definitions(-DUSE_WINE_TODOS) +add_executable(wscript_winetest run.c testlist.c rsrc.rc) +target_link_libraries(wscript_winetest uuid) +set_module_type(wscript_winetest win32cui) +add_importlibs(wscript_winetest ole32 oleaut32 psapi advapi32 msvcrt kernel32) +add_cd_file(TARGET wscript_winetest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/winetests/wscript/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/wscript/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wscript/rsrc.rc… ============================================================================== --- trunk/rostests/winetests/wscript/rsrc.rc (added) +++ trunk/rostests/winetests/wscript/rsrc.rc [iso-8859-1] Sat Nov 8 11:26:28 2014 @@ -0,0 +1,23 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * 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 + */ + +/* @makedep: run.js */ +run.js TESTSCRIPT "run.js" + +/* @makedep: run.vbs */ +run.vbs TESTSCRIPT "run.vbs" Propchange: trunk/rostests/winetests/wscript/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/wscript/run.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wscript/run.c?r… ============================================================================== --- trunk/rostests/winetests/wscript/run.c (added) +++ trunk/rostests/winetests/wscript/run.c [iso-8859-1] Sat Nov 8 11:26:28 2014 @@ -0,0 +1,480 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * 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 <stdio.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COBJMACROS +#define CONST_VTABLE + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <psapi.h> + +#include <wine/test.h> + +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + expect_ ## func = TRUE + +#define CLEAR_CALLED(func) \ + expect_ ## func = called_ ## func = FALSE + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_EXPECT(func) \ + do { \ + CHECK_EXPECT2(func); \ + expect_ ## func = FALSE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +DEFINE_EXPECT(reportSuccess); + +#define DISPID_TESTOBJ_OK 10000 +#define DISPID_TESTOBJ_TRACE 10001 +#define DISPID_TESTOBJ_REPORTSUCCESS 10002 +#define DISPID_TESTOBJ_WSCRIPTFULLNAME 10003 +#define DISPID_TESTOBJ_WSCRIPTPATH 10004 +#define DISPID_TESTOBJ_WSCRIPTSCRIPTNAME 10005 +#define DISPID_TESTOBJ_WSCRIPTSCRIPTFULLNAME 10006 + +#define TESTOBJ_CLSID "{178fc166-f585-4e24-9c13-4bb7faf80646}" + +static const GUID CLSID_TestObj = + {0x178fc166,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x06,0x46}}; + +static const char *script_name; +static HANDLE wscript_process; + +static int strcmp_wa(LPCWSTR strw, const char *stra) +{ + WCHAR buf[512]; + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR)); + return lstrcmpW(strw, buf); +} + +static const WCHAR* mystrrchr(const WCHAR *str, WCHAR ch) +{ + const WCHAR *pos = NULL, *current = str; + while(*current != 0) { + if(*current == ch) + pos = current; + ++current; + } + return pos; +} + +static BSTR a2bstr(const char *str) +{ + BSTR ret; + int len; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = SysAllocStringLen(NULL, len-1); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + + return ret; +} + +static HRESULT WINAPI Dispatch_QueryInterface(IDispatch *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDispatch)) { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI Dispatch_AddRef(IDispatch *iface) +{ + return 2; +} + +static ULONG WINAPI Dispatch_Release(IDispatch *iface) +{ + return 1; +} + +static HRESULT WINAPI Dispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Dispatch_GetTypeInfo(IDispatch *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI Dispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + unsigned i; + + for(i=0; i<cNames; i++) { + if(!strcmp_wa(rgszNames[i], "ok")) { + rgDispId[i] = DISPID_TESTOBJ_OK; + }else if(!strcmp_wa(rgszNames[i], "trace")) { + rgDispId[i] = DISPID_TESTOBJ_TRACE; + }else if(!strcmp_wa(rgszNames[i], "reportSuccess")) { + rgDispId[i] = DISPID_TESTOBJ_REPORTSUCCESS; + }else if(!strcmp_wa(rgszNames[i], "wscriptFullName")) { + rgDispId[i] = DISPID_TESTOBJ_WSCRIPTFULLNAME; + }else if(!strcmp_wa(rgszNames[i], "wscriptPath")) { + rgDispId[i] = DISPID_TESTOBJ_WSCRIPTPATH; + }else if(!strcmp_wa(rgszNames[i], "wscriptScriptName")) { + rgDispId[i] = DISPID_TESTOBJ_WSCRIPTSCRIPTNAME; + }else if(!strcmp_wa(rgszNames[i], "wscriptScriptFullName")) { + rgDispId[i] = DISPID_TESTOBJ_WSCRIPTSCRIPTFULLNAME; + }else { + ok(0, "unexpected name %s\n", wine_dbgstr_w(rgszNames[i])); + return DISP_E_UNKNOWNNAME; + } + } + + return S_OK; +} + +static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pdp, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + switch(dispIdMember) { + case DISPID_TESTOBJ_OK: { + VARIANT *expr, *msg; + + ok(wFlags == INVOKE_FUNC, "wFlags = %x\n", wFlags); + ok(pdp->cArgs == 2, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + + expr = pdp->rgvarg+1; + if(V_VT(expr) == (VT_VARIANT|VT_BYREF)) + expr = V_VARIANTREF(expr); + + msg = pdp->rgvarg; + if(V_VT(msg) == (VT_VARIANT|VT_BYREF)) + msg = V_VARIANTREF(msg); + + ok(V_VT(msg) == VT_BSTR, "V_VT(psp->rgvargs) = %d\n", V_VT(msg)); + ok(V_VT(expr) == VT_BOOL, "V_VT(psp->rgvargs+1) = %d\n", V_VT(expr)); + ok(V_BOOL(expr), "%s: %s\n", script_name, wine_dbgstr_w(V_BSTR(msg))); + if(pVarResult) + V_VT(pVarResult) = VT_EMPTY; + break; + } + case DISPID_TESTOBJ_TRACE: + ok(wFlags == INVOKE_FUNC, "wFlags = %x\n", wFlags); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(V_VT(pdp->rgvarg) == VT_BSTR, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + trace("%s: %s\n", script_name, wine_dbgstr_w(V_BSTR(pdp->rgvarg))); + if(pVarResult) + V_VT(pVarResult) = VT_EMPTY; + break; + case DISPID_TESTOBJ_REPORTSUCCESS: + CHECK_EXPECT(reportSuccess); + + ok(wFlags == INVOKE_FUNC, "wFlags = %x\n", wFlags); + ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + if(pVarResult) + V_VT(pVarResult) = VT_EMPTY; + break; + case DISPID_TESTOBJ_WSCRIPTFULLNAME: + { + WCHAR fullName[MAX_PATH]; + DWORD res; + + ok(wFlags == INVOKE_PROPERTYGET, "wFlags = %x\n", wFlags); + ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + V_VT(pVarResult) = VT_BSTR; + res = GetModuleFileNameExW(wscript_process, NULL, fullName, sizeof(fullName)/sizeof(WCHAR)); + if(res == 0) + return E_FAIL; + if(!(V_BSTR(pVarResult) = SysAllocString(fullName))) + return E_OUTOFMEMORY; + break; + } + case DISPID_TESTOBJ_WSCRIPTPATH: + { + WCHAR fullPath[MAX_PATH]; + DWORD res; + const WCHAR *pos; + + ok(wFlags == INVOKE_PROPERTYGET, "wFlags = %x\n", wFlags); + ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + V_VT(pVarResult) = VT_BSTR; + res = GetModuleFileNameExW(wscript_process, NULL, fullPath, sizeof(fullPath)/sizeof(WCHAR)); + if(res == 0) + return E_FAIL; + pos = mystrrchr(fullPath, '\\'); + if(!(V_BSTR(pVarResult) = SysAllocStringLen(fullPath, pos-fullPath))) + return E_OUTOFMEMORY; + break; + } + case DISPID_TESTOBJ_WSCRIPTSCRIPTNAME: + { + char fullPath[MAX_PATH]; + char *pos; + long res; + + ok(wFlags == INVOKE_PROPERTYGET, "wFlags = %x\n", wFlags); + ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + V_VT(pVarResult) = VT_BSTR; + res = GetFullPathNameA(script_name, sizeof(fullPath)/sizeof(WCHAR), fullPath, &pos); + if(!res || res > sizeof(fullPath)/sizeof(WCHAR)) + return E_FAIL; + if(!(V_BSTR(pVarResult) = SysAllocString(a2bstr(pos)))) + return E_OUTOFMEMORY; + break; + } + case DISPID_TESTOBJ_WSCRIPTSCRIPTFULLNAME: + { + char fullPath[MAX_PATH]; + long res; + + ok(wFlags == INVOKE_PROPERTYGET, "wFlags = %x\n", wFlags); + ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + V_VT(pVarResult) = VT_BSTR; + res = GetFullPathNameA(script_name, sizeof(fullPath)/sizeof(WCHAR), fullPath, NULL); + if(!res || res > sizeof(fullPath)/sizeof(WCHAR)) + return E_FAIL; + if(!(V_BSTR(pVarResult) = SysAllocString(a2bstr(fullPath)))) + return E_OUTOFMEMORY; + break; + } + default: + ok(0, "unexpected dispIdMember %d\n", dispIdMember); + return E_NOTIMPL; + } + + return S_OK; +} + +static IDispatchVtbl testobj_vtbl = { + Dispatch_QueryInterface, + Dispatch_AddRef, + Dispatch_Release, + Dispatch_GetTypeInfoCount, + Dispatch_GetTypeInfo, + Dispatch_GetIDsOfNames, + Dispatch_Invoke +}; + +static IDispatch testobj = { &testobj_vtbl }; + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IClassFactory, riid)) { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) +{ + ok(!outer, "outer = %p\n", outer); + return IDispatch_QueryInterface(&testobj, riid, ppv); +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) +{ + return S_OK; +} + +static const IClassFactoryVtbl ClassFactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ClassFactory_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory testobj_cf = { &ClassFactoryVtbl }; + +static void run_test(const char *file_name) +{ + char command[MAX_PATH]; + STARTUPINFOA si = {sizeof(si)}; + PROCESS_INFORMATION pi; + BOOL bres; + + script_name = file_name; + sprintf(command, "wscript.exe %s arg1 2 ar3", file_name); + + SET_EXPECT(reportSuccess); + + bres = CreateProcessA(NULL, command, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi); + if(!bres) { + win_skip("script.exe is not available\n"); + CLEAR_CALLED(reportSuccess); + return; + } + + wscript_process = pi.hProcess; + WaitForSingleObject(pi.hProcess, INFINITE); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + CHECK_CALLED(reportSuccess); +} + +static BOOL WINAPI test_enum_proc(HMODULE module, LPCSTR type, LPSTR name, LONG_PTR param) +{ + const char *script_data, *ext; + DWORD script_size, size; + char file_name[MAX_PATH]; + HANDLE file; + HRSRC src; + BOOL res; + + trace("running %s test...\n", name); + + src = FindResourceA(NULL, name, type); + ok(src != NULL, "Could not find resource %s: %u\n", name, GetLastError()); + if(!src) + return TRUE; + + script_data = LoadResource(NULL, src); + script_size = SizeofResource(NULL, src); + while(script_size && !script_data[script_size-1]) + script_size--; + + ext = strrchr(name, '.'); + ok(ext != NULL, "no script extension\n"); + if(!ext) + return TRUE; + + sprintf(file_name, "test%s", ext); + + file = CreateFileA(file_name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %u\n", GetLastError()); + if(file == INVALID_HANDLE_VALUE) + return TRUE; + + res = WriteFile(file, script_data, script_size, &size, NULL); + CloseHandle(file); + ok(res, "Could not write to file: %u\n", GetLastError()); + if(!res) + return TRUE; + + run_test(file_name); + + DeleteFileA(file_name); + return TRUE; +} + +static BOOL init_key(const char *key_name, const char *def_value, BOOL init) +{ + HKEY hkey; + DWORD res; + + if(!init) { + RegDeleteKeyA(HKEY_CLASSES_ROOT, key_name); + return TRUE; + } + + res = RegCreateKeyA(HKEY_CLASSES_ROOT, key_name, &hkey); + if(res != ERROR_SUCCESS) + return FALSE; + + if(def_value) + res = RegSetValueA(hkey, NULL, REG_SZ, def_value, strlen(def_value)); + + RegCloseKey(hkey); + return res == ERROR_SUCCESS; +} + +static BOOL init_registry(BOOL init) +{ + return init_key("Wine.Test\\CLSID", TESTOBJ_CLSID, init); +} + +static BOOL register_activex(void) +{ + DWORD regid; + HRESULT hres; + + if(!init_registry(TRUE)) { + init_registry(FALSE); + return FALSE; + } + + hres = CoRegisterClassObject(&CLSID_TestObj, (IUnknown *)&testobj_cf, + CLSCTX_SERVER, REGCLS_MULTIPLEUSE, &regid); + ok(hres == S_OK, "Could not register script engine: %08x\n", hres); + return TRUE; +} + +START_TEST(run) +{ + char **argv; + int argc; + + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + if(!register_activex()) { + skip("Could not register ActiveX object.\n"); + CoUninitialize(); + return; + } + + argc = winetest_get_mainargs(&argv); + if(argc > 2) + run_test(argv[2]); + else + EnumResourceNamesA(NULL, "TESTSCRIPT", test_enum_proc, 0); + + init_registry(FALSE); + CoUninitialize(); +} Propchange: trunk/rostests/winetests/wscript/run.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/wscript/run.js URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wscript/run.js?… ============================================================================== --- trunk/rostests/winetests/wscript/run.js (added) +++ trunk/rostests/winetests/wscript/run.js [iso-8859-1] Sat Nov 8 11:26:28 2014 @@ -0,0 +1,60 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * 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 + */ + +var winetest = new ActiveXObject("Wine.Test"); + +function ok(expr, msg) { + winetest.ok(expr, msg); +} + +ok(typeof(WScript) === "object", "typeof(WScript) = " + typeof(WScript)); +ok(typeof(WSH) === "object", "typeof(WSH) = " + typeof(WSH)); +ok(WScript === WSH, "WScript !== WSH"); +ok(WScript.Name === "Windows Script Host", "WScript.Name = " + WScript.Name); +ok(typeof(WScript.Version) === "string", "typeof(WScript.Version) = " + typeof(WScript.Version)); +ok(typeof(WScript.BuildVersion) === "number", "typeof(WScript.BuldVersion) = " + typeof(WScript.BuldVersion)); +ok(WScript.FullName === winetest.wscriptFullName, "WScript.FullName = ", WScript.FullName); +ok(WScript.Path === winetest.wscriptPath, "WScript.Path = ", WScript.Path); +ok(WScript.ScriptName === winetest.wscriptScriptName, "WScript.ScriptName = " + WScript.ScriptName); +ok(WScript.ScriptFullName === winetest.wscriptScriptFullName, "WScript.ScriptFullName = " + WScript.ScriptFullName); +ok(typeof(WScript.Arguments) === "object", "typeof(WScript.Arguments) = " + typeof(WScript.Arguments)); +ok(WScript.Arguments.Item(0) === "arg1", "WScript.Arguments.Item(0) = " + WScript.Arguments.Item(0)); +ok(WScript.Arguments.Item(1) === "2", "WScript.Arguments.Item(1) = " + WScript.Arguments.Item(1)); +ok(WScript.Arguments.Item(2) === "ar3", "WScript.Arguments.Item(2) = " + WScript.Arguments.Item(2)); +try { + WScript.Arguments.Item(3); + ok(false, "expected exception"); +}catch(e) {} +ok(WScript.Arguments.Count() === 3, "WScript.Arguments.Count() = " + WScript.Arguments.Count()); +ok(WScript.Arguments.length === 3, "WScript.Arguments.length = " + WScript.Arguments.length); +ok(WScript.Interactive === true, "WScript.Interactive = " + WScript.Interactive); +WScript.Interactive = false; +ok(WScript.Interactive === false, "WScript.Interactive = " + WScript.Interactive); +WScript.Interactive = true; +ok(WScript.Interactive === true, "WScript.Interactive = " + WScript.Interactive); +ok(WScript.Application === WScript, "WScript.Application = " + WScript.Application); + +var obj = WScript.CreateObject("Wine.Test"); +obj.ok(true, "Broken WScript.CreateObject object?"); + +try { + obj = WScript.CreateObject("nonexistent"); + ok(false, "Expected exception for CreateObject('nonexistent')"); +}catch(e) {} + +winetest.reportSuccess(); Propchange: trunk/rostests/winetests/wscript/run.js ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/wscript/run.vbs URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wscript/run.vbs… ============================================================================== --- trunk/rostests/winetests/wscript/run.vbs (added) +++ trunk/rostests/winetests/wscript/run.vbs [iso-8859-1] Sat Nov 8 11:26:28 2014 @@ -0,0 +1,30 @@ +' +' Copyright 2011 Jacek Caban for CodeWeavers +' +' 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 +' + +Option Explicit + +Dim winetest +Set winetest = CreateObject("Wine.Test") + +Sub ok(expr, msg) + Call winetest.ok(expr, msg) +End Sub + +Call ok(WScript is WSH, "WScript is not WSH") + +Call winetest.reportSuccess() Propchange: trunk/rostests/winetests/wscript/run.vbs ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/wscript/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wscript/testlis… ============================================================================== --- trunk/rostests/winetests/wscript/testlist.c (added) +++ trunk/rostests/winetests/wscript/testlist.c [iso-8859-1] Sat Nov 8 11:26:28 2014 @@ -0,0 +1,12 @@ +/* Automatically generated by make depend; DO NOT EDIT!! */ + +#define STANDALONE +#include <wine/test.h> + +extern void func_run(void); + +const struct test winetest_testlist[] = +{ + { "run", func_run }, + { 0, 0 } +}; Propchange: trunk/rostests/winetests/wscript/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 10 months

[akhaldi] 65317: [WSCRIPT] * Import from Wine 1.7.27. CORE-8769 #resolve #comment Imported in r65317. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Nov 8 11:23:02 2014 New Revision: 65317 URL: http://svn.reactos.org/svn/reactos?rev=65317&view=rev Log: [WSCRIPT] * Import from Wine 1.7.27. CORE-8769 #resolve #comment Imported in r65317. CORE-8540 Added: trunk/reactos/base/applications/cmdutils/wscript/ (with props) trunk/reactos/base/applications/cmdutils/wscript/CMakeLists.txt (with props) trunk/reactos/base/applications/cmdutils/wscript/arguments.c (with props) trunk/reactos/base/applications/cmdutils/wscript/host.c (with props) trunk/reactos/base/applications/cmdutils/wscript/ihost.idl (with props) trunk/reactos/base/applications/cmdutils/wscript/ihost_dispid.h (with props) trunk/reactos/base/applications/cmdutils/wscript/main.c (with props) trunk/reactos/base/applications/cmdutils/wscript/rsrc.rc (with props) trunk/reactos/base/applications/cmdutils/wscript/wscript.h (with props) Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] Sat Nov 8 11:23:02 2014 @@ -11,4 +11,5 @@ add_subdirectory(sort) add_subdirectory(taskkill) add_subdirectory(wmic) +add_subdirectory(wscript) add_subdirectory(xcopy) Propchange: trunk/reactos/base/applications/cmdutils/wscript/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Nov 8 11:23:02 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/base/applications/cmdutils/wscript/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/base/applications/cmdutils/wscript/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/base/applications/cmdutils/wscript/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/applications/cmdutils/wscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wscript/CMakeLists.txt (added) +++ trunk/reactos/base/applications/cmdutils/wscript/CMakeLists.txt [iso-8859-1] Sat Nov 8 11:23:02 2014 @@ -0,0 +1,17 @@ + +list(APPEND SOURCE + arguments.c + host.c + main.c + wscript.h) + +add_executable(wscript ${SOURCE} rsrc.rc) +add_idl_headers(wscript_idlheader ihost.idl) +add_typelib(ihost.idl) +set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ihost.tlb) +target_link_libraries(wscript uuid wine) +set_module_type(wscript win32cui UNICODE) +add_importlibs(wscript shell32 oleaut32 ole32 advapi32 msvcrt kernel32 ntdll) +add_dependencies(wscript stdole2 wscript_idlheader) +add_pch(wscript wscript.h SOURCE) +add_cd_file(TARGET wscript DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/base/applications/cmdutils/wscript/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/wscript/arguments.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wscript/arguments.c (added) +++ trunk/reactos/base/applications/cmdutils/wscript/arguments.c [iso-8859-1] Sat Nov 8 11:23:02 2014 @@ -0,0 +1,127 @@ +/* + * Copyright 2011 Michal Zietek + * + * 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 "wscript.h" + +WCHAR **argums; +int numOfArgs; + +static HRESULT WINAPI Arguments2_QueryInterface(IArguments2 *iface, REFIID riid, void **ppv) +{ + WINE_TRACE("(%s %p)\n", wine_dbgstr_guid(riid), ppv); + + if(IsEqualGUID(&IID_IUnknown, riid) + || IsEqualGUID(&IID_IDispatch, riid) + || IsEqualGUID(&IID_IArguments2, riid)) { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI Arguments2_AddRef(IArguments2 *iface) +{ + return 2; +} + +static ULONG WINAPI Arguments2_Release(IArguments2 *iface) +{ + return 1; +} + +static HRESULT WINAPI Arguments2_GetTypeInfoCount(IArguments2 *iface, UINT *pctinfo) +{ + WINE_TRACE("(%p)\n", pctinfo); + + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI Arguments2_GetTypeInfo(IArguments2 *iface, UINT iTInfo, LCID lcid, + ITypeInfo **ppTInfo) +{ + WINE_TRACE("(%x %x %p\n", iTInfo, lcid, ppTInfo); + + ITypeInfo_AddRef(arguments_ti); + *ppTInfo = arguments_ti; + return S_OK; +} + +static HRESULT WINAPI Arguments2_GetIDsOfNames(IArguments2 *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + WINE_TRACE("(%s %p %d %x %p)\n", wine_dbgstr_guid(riid), rgszNames, + cNames, lcid, rgDispId); + + return ITypeInfo_GetIDsOfNames(arguments_ti, rgszNames, cNames, rgDispId); +} + +static HRESULT WINAPI Arguments2_Invoke(IArguments2 *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + WINE_TRACE("(%d %p %p)\n", dispIdMember, pDispParams, pVarResult); + + return ITypeInfo_Invoke(arguments_ti, iface, dispIdMember, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI Arguments2_Item(IArguments2 *iface, LONG index, BSTR *out_Value) +{ + WINE_TRACE("(%d %p)\n", index, out_Value); + + if(index<0 || index >= numOfArgs) + return E_INVALIDARG; + if(!(*out_Value = SysAllocString(argums[index]))) + return E_OUTOFMEMORY; + + return S_OK; +} + +static HRESULT WINAPI Arguments2_Count(IArguments2 *iface, LONG *out_Count) +{ + WINE_TRACE("(%p)\n", out_Count); + + *out_Count = numOfArgs; + return S_OK; +} + +static HRESULT WINAPI Arguments2_get_length(IArguments2 *iface, LONG *out_Count) +{ + WINE_TRACE("(%p)\n", out_Count); + + *out_Count = numOfArgs; + return S_OK; +} + +static const IArguments2Vtbl Arguments2Vtbl = { + Arguments2_QueryInterface, + Arguments2_AddRef, + Arguments2_Release, + Arguments2_GetTypeInfoCount, + Arguments2_GetTypeInfo, + Arguments2_GetIDsOfNames, + Arguments2_Invoke, + Arguments2_Item, + Arguments2_Count, + Arguments2_get_length +}; + +IArguments2 arguments_obj = { &Arguments2Vtbl }; Propchange: trunk/reactos/base/applications/cmdutils/wscript/arguments.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/wscript/host.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wscript/host.c (added) +++ trunk/reactos/base/applications/cmdutils/wscript/host.c [iso-8859-1] Sat Nov 8 11:23:02 2014 @@ -0,0 +1,333 @@ +/* + * Copyright 2010 Jacek Caban for CodeWeavers + * + * 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 "wscript.h" + +#define BUILDVERSION 16535 + +static const WCHAR wshNameW[] = {'W','i','n','d','o','w','s',' ','S','c','r','i','p','t',' ','H','o','s','t',0}; +static const WCHAR wshVersionW[] = {'5','.','8'}; + +VARIANT_BOOL wshInteractive = +#ifndef CSCRIPT_BUILD + VARIANT_TRUE; +#else + VARIANT_FALSE; +#endif + +static HRESULT WINAPI Host_QueryInterface(IHost *iface, REFIID riid, void **ppv) +{ + WINE_TRACE("(%s %p)\n", wine_dbgstr_guid(riid), ppv); + + if(IsEqualGUID(&IID_IUnknown, riid) + || IsEqualGUID(&IID_IDispatch, riid) + || IsEqualGUID(&IID_IHost, riid)) { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI Host_AddRef(IHost *iface) +{ + return 2; +} + +static ULONG WINAPI Host_Release(IHost *iface) +{ + return 1; +} + +static HRESULT WINAPI Host_GetTypeInfoCount(IHost *iface, UINT *pctinfo) +{ + WINE_TRACE("(%p)\n", pctinfo); + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI Host_GetTypeInfo(IHost *iface, UINT iTInfo, LCID lcid, + ITypeInfo **ppTInfo) +{ + WINE_TRACE("(%x %x %p\n", iTInfo, lcid, ppTInfo); + + ITypeInfo_AddRef(host_ti); + *ppTInfo = host_ti; + return S_OK; +} + +static HRESULT WINAPI Host_GetIDsOfNames(IHost *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + WINE_TRACE("(%s %p %d %x %p)\n", wine_dbgstr_guid(riid), rgszNames, + cNames, lcid, rgDispId); + + return ITypeInfo_GetIDsOfNames(host_ti, rgszNames, cNames, rgDispId); +} + +static HRESULT WINAPI Host_Invoke(IHost *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + WINE_TRACE("(%d %p %p)\n", dispIdMember, pDispParams, pVarResult); + + return ITypeInfo_Invoke(host_ti, iface, dispIdMember, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI Host_get_Name(IHost *iface, BSTR *out_Name) +{ + WINE_TRACE("(%p)\n", out_Name); + + if(!(*out_Name = SysAllocString(wshNameW))) + return E_OUTOFMEMORY; + return S_OK; +} + +static HRESULT WINAPI Host_get_Application(IHost *iface, IDispatch **out_Dispatch) +{ + WINE_TRACE("(%p)\n", out_Dispatch); + + *out_Dispatch = (IDispatch*)&host_obj; + return S_OK; +} + +static HRESULT WINAPI Host_get_FullName(IHost *iface, BSTR *out_Path) +{ + WCHAR fullPath[MAX_PATH]; + + WINE_TRACE("(%p)\n", out_Path); + + if(GetModuleFileNameW(NULL, fullPath, sizeof(fullPath)/sizeof(WCHAR)) == 0) + return E_FAIL; + if(!(*out_Path = SysAllocString(fullPath))) + return E_OUTOFMEMORY; + return S_OK; +} + +static HRESULT WINAPI Host_get_Path(IHost *iface, BSTR *out_Path) +{ + WCHAR path[MAX_PATH]; + int howMany; + WCHAR *pos; + + WINE_TRACE("(%p)\n", out_Path); + + if(GetModuleFileNameW(NULL, path, sizeof(path)/sizeof(WCHAR)) == 0) + return E_FAIL; + pos = strrchrW(path, '\\'); + howMany = pos - path; + if(!(*out_Path = SysAllocStringLen(path, howMany))) + return E_OUTOFMEMORY; + return S_OK; +} + +static HRESULT WINAPI Host_get_Interactive(IHost *iface, VARIANT_BOOL *out_Interactive) +{ + WINE_TRACE("(%p)\n", out_Interactive); + + *out_Interactive = wshInteractive; + return S_OK; +} + +static HRESULT WINAPI Host_put_Interactive(IHost *iface, VARIANT_BOOL v) +{ + WINE_TRACE("(%x)\n", v); + + wshInteractive = v; + return S_OK; +} + +static HRESULT WINAPI Host_Quit(IHost *iface, int ExitCode) +{ + WINE_FIXME("(%d)\n", ExitCode); + return E_NOTIMPL; +} + +static HRESULT WINAPI Host_get_ScriptName(IHost *iface, BSTR *out_ScriptName) +{ + WCHAR *scriptName; + + WINE_TRACE("(%p)\n", out_ScriptName); + + scriptName = strrchrW(scriptFullName, '\\'); + ++scriptName; + if(!(*out_ScriptName = SysAllocString(scriptName))) + return E_OUTOFMEMORY; + return S_OK; +} + +static HRESULT WINAPI Host_get_ScriptFullName(IHost *iface, BSTR *out_ScriptFullName) +{ + WINE_TRACE("(%p)\n", out_ScriptFullName); + + if(!(*out_ScriptFullName = SysAllocString(scriptFullName))) + return E_OUTOFMEMORY; + return S_OK; +} + +static HRESULT WINAPI Host_get_Arguments(IHost *iface, IArguments2 **out_Arguments) +{ + WINE_TRACE("(%p)\n", out_Arguments); + + *out_Arguments = &arguments_obj; + return S_OK; +} + +static HRESULT WINAPI Host_get_Version(IHost *iface, BSTR *out_Version) +{ + WINE_TRACE("(%p)\n", out_Version); + + if(!(*out_Version = SysAllocString(wshVersionW))) + return E_OUTOFMEMORY; + return S_OK; +} + +static HRESULT WINAPI Host_get_BuildVersion(IHost *iface, int *out_Build) +{ + WINE_TRACE("(%p)\n", out_Build); + + *out_Build = BUILDVERSION; + return S_OK; +} + +static HRESULT WINAPI Host_get_Timeout(IHost *iface, LONG *out_Timeout) +{ + WINE_FIXME("(%p)\n", out_Timeout); + return E_NOTIMPL; +} + +static HRESULT WINAPI Host_put_Timeout(IHost *iface, LONG v) +{ + WINE_FIXME("(%d)\n", v); + return E_NOTIMPL; +} + +static HRESULT WINAPI Host_CreateObject(IHost *iface, BSTR ProgID, BSTR Prefix, + IDispatch **out_Dispatch) +{ + IUnknown *unk; + GUID guid; + HRESULT hres; + + TRACE("(%s %s %p)\n", wine_dbgstr_w(ProgID), wine_dbgstr_w(Prefix), out_Dispatch); + + if(Prefix && *Prefix) { + FIXME("Prefix %s not supported\n", debugstr_w(Prefix)); + return E_NOTIMPL; + } + + hres = CLSIDFromProgID(ProgID, &guid); + if(FAILED(hres)) + return hres; + + hres = CoCreateInstance(&guid, NULL, CLSCTX_INPROC_SERVER|CLSCTX_LOCAL_SERVER|CLSCTX_REMOTE_SERVER, + &IID_IUnknown, (void**)&unk); + if(FAILED(hres)) + return hres; + + hres = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)out_Dispatch); + IUnknown_Release(unk); + return hres; +} + +static HRESULT WINAPI Host_Echo(IHost *iface, SAFEARRAY *args) +{ + WINE_FIXME("(%p)\n", args); + return E_NOTIMPL; +} + +static HRESULT WINAPI Host_GetObject(IHost *iface, BSTR Pathname, BSTR ProgID, + BSTR Prefix, IDispatch **out_Dispatch) +{ + WINE_FIXME("(%s %s %s %p)\n", wine_dbgstr_w(Pathname), wine_dbgstr_w(ProgID), + wine_dbgstr_w(Prefix), out_Dispatch); + return E_NOTIMPL; +} + +static HRESULT WINAPI Host_DisconnectObject(IHost *iface, IDispatch *Object) +{ + WINE_FIXME("(%p)\n", Object); + return E_NOTIMPL; +} + +static HRESULT WINAPI Host_Sleep(IHost *iface, LONG Time) +{ + WINE_FIXME("(%d)\n", Time); + return E_NOTIMPL; +} + +static HRESULT WINAPI Host_ConnectObject(IHost *iface, IDispatch *Object, BSTR Prefix) +{ + WINE_FIXME("(%p %s)\n", Object, wine_dbgstr_w(Prefix)); + return E_NOTIMPL; +} + +static HRESULT WINAPI Host_get_StdIn(IHost *iface, ITextStream **ppts) +{ + WINE_FIXME("(%p)\n", ppts); + return E_NOTIMPL; +} + +static HRESULT WINAPI Host_get_StdOut(IHost *iface, ITextStream **ppts) +{ + WINE_FIXME("(%p)\n", ppts); + return E_NOTIMPL; +} + +static HRESULT WINAPI Host_get_StdErr(IHost *iface, ITextStream **ppts) +{ + WINE_FIXME("(%p)\n", ppts); + return E_NOTIMPL; +} + +static const IHostVtbl HostVtbl = { + Host_QueryInterface, + Host_AddRef, + Host_Release, + Host_GetTypeInfoCount, + Host_GetTypeInfo, + Host_GetIDsOfNames, + Host_Invoke, + Host_get_Name, + Host_get_Application, + Host_get_FullName, + Host_get_Path, + Host_get_Interactive, + Host_put_Interactive, + Host_Quit, + Host_get_ScriptName, + Host_get_ScriptFullName, + Host_get_Arguments, + Host_get_Version, + Host_get_BuildVersion, + Host_get_Timeout, + Host_put_Timeout, + Host_CreateObject, + Host_Echo, + Host_GetObject, + Host_DisconnectObject, + Host_Sleep, + Host_ConnectObject, + Host_get_StdIn, + Host_get_StdOut, + Host_get_StdErr +}; + +IHost host_obj = { &HostVtbl }; Propchange: trunk/reactos/base/applications/cmdutils/wscript/host.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/wscript/ihost.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wscript/ihost.idl (added) +++ trunk/reactos/base/applications/cmdutils/wscript/ihost.idl [iso-8859-1] Sat Nov 8 11:23:02 2014 @@ -0,0 +1,188 @@ +/* + * Copyright 2010 Jacek Caban for CodeWeavers + * + * 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 + */ + +#pragma makedep typelib + +#include "ihost_dispid.h" + +import "oaidl.idl"; + +[ + uuid(60254ca0-953b-11cf-8c96-00aa00b8708c), + version(5.6), +] +library IHost +{ + importlib("stdole2.tlb"); + + [ + odl, + uuid(2cc5a9d1-b1e5-11d3-a286-00104bd35090), + dual, + oleautomation + ] + interface IArguments2 : IDispatch { + [id(DISPID_VALUE)] + HRESULT Item( + [in] LONG Index, + [out, retval] BSTR *out_Value); + + [id(IARGUMENTS2_COUNT_DISPID)] + HRESULT Count([out, retval] LONG *out_Count); + + [id(IARGUMENTS2_LENGTH_DISPID), propget] + HRESULT length([out, retval] LONG *out_Count); + } + + [ + odl, + uuid(53bad8c1-e718-11cf-893d-00a0c9054228), + hidden, + dual, + nonextensible, + oleautomation + ] + interface ITextStream : IDispatch { + [id(ITEXTSTREAM_LINE_DISPID), propget] + HRESULT Line([out, retval] LONG *Line); + + [id(ITEXTSTREAM_COLUMN_DISPID), propget] + HRESULT Column([out, retval] LONG *Column); + + [id(ITEXTSTREAM_ATENDOFSTREAM_DISPID), propget] + HRESULT AtEndOfStream([out, retval] VARIANT_BOOL *EOS); + + [id(ITEXTSTREAM_ATENDOFLINE_DISPID), propget] + HRESULT AtEndOfLine([out, retval] VARIANT_BOOL *EOL); + + [id(ITEXTSTREAM_READ_DISPID)] + HRESULT Read( + [in] LONG Characters, + [out, retval] BSTR *Text); + + [id(ITEXTSTREAM_READLINE_DISPID)] + HRESULT ReadLine([out, retval] BSTR *Text); + + [id(ITEXTSTREAM_READALL_DISPID)] + HRESULT ReadAll([out, retval] BSTR *Text); + + [id(ITEXTSTREAM_WRITE_DISPID)] + HRESULT Write([in] BSTR Text); + + [id(ITEXTSTREAM_WRITELINE_DISPID)] + HRESULT WriteLine([in, optional, defaultvalue("")] BSTR Text); + + [id(ITEXTSTREAM_WRITEBLANKLINES_DISPID)] + HRESULT WriteBlankLines([in] LONG Lines); + + [id(ITEXTSTREAM_SKIP_DISPID)] + HRESULT Skip([in] LONG Characters); + + [id(ITEXTSTREAM_SKIPLINE_DISPID)] + HRESULT SkipLine(); + + [id(ITEXTSTREAM_CLOSE_DISPID)] + HRESULT Close(); + } + + [ + odl, + uuid(91afbd1b-5feb-43f5-b028-e2ca960617ec), + dual, + oleautomation + ] + interface IHost : IDispatch { + [id(IHOST_NAME_DISPID), propget] + HRESULT Name([out, retval] BSTR *out_Name); + + [id(IHOST_APPLICATION_DISPID), propget] + HRESULT Application([out, retval] IDispatch **out_Dispatch); + + [id(IHOST_FULLNAME_DISPID), propget] + HRESULT FullName([out, retval] BSTR *out_Path); + + [id(IHOST_PATH_DISPID), propget] + HRESULT Path([out, retval] BSTR* out_Path); + + [id(IHOST_INTERACTIVE_DISPID), propget] + HRESULT Interactive([out, retval] VARIANT_BOOL *out_Interactive); + + [id(IHOST_INTERACTIVE_DISPID), propput] + HRESULT Interactive([in] VARIANT_BOOL out_Interactive); + + [id(IHOST_QUIT_DISPID)] + HRESULT Quit([in, optional, defaultvalue(0)] int ExitCode); + + [id(IHOST_SCRIPTNAME_DISPID), propget] + HRESULT ScriptName([out, retval] BSTR *out_ScriptName); + + [id(IHOST_SCRIPTFULLNAME_DISPID), propget] + HRESULT ScriptFullName([out, retval] BSTR* out_ScriptFullName); + + [id(IHOST_ARGUMENTS_DISPID), propget] + HRESULT Arguments([out, retval] IArguments2 **out_Arguments); + + [id(IHOST_VERSION_DISPID), propget] + HRESULT Version([out, retval] BSTR *out_Version); + + [id(IHOST_BUILDVERSION_DISPID), propget] + HRESULT BuildVersion([out, retval] int *out_Build); + + [id(IHOST_TIMEOUT_DISPID), propget] + HRESULT Timeout([out, retval] LONG *out_Timeout); + + [id(IHOST_TIMEOUT_DISPID), propput] + HRESULT Timeout([in] LONG out_Timeout); + + [id(IHOST_CREATEOBJECT_DISPID)] + HRESULT CreateObject( + [in] BSTR ProgID, + [in, optional, defaultvalue("")] BSTR Prefix, + [out, retval] IDispatch **out_Dispatch); + + [id(IHOST_ECHO_DISPID), vararg] + HRESULT Echo([in] SAFEARRAY(VARIANT) pArgs); + + [id(IHOST_GETOBJECT_DISPID)] + HRESULT GetObject( + [in] BSTR Pathname, + [in, optional, defaultvalue("")] BSTR ProgID, + [in, optional, defaultvalue("")] BSTR Prefix, + [out, retval] IDispatch **out_Dispatch); + + [id(IHOST_DISCONNECTOBJECT_DISPID)] + HRESULT DisconnectObject([in] IDispatch *Object); + + [id(IHOST_SLEEP_DISPID)] + HRESULT Sleep([in] LONG Time); + + [id(IHOST_CONNECTOBJECT_DISPID)] + HRESULT ConnectObject( + [in] IDispatch *Object, + [in] BSTR Prefix); + + [id(IHOST_STDIN_DISPID), propget] + HRESULT StdIn([out, retval] ITextStream **out_ppts); + + [id(IHOST_STDOUT_DISPID), propget] + HRESULT StdOut([out, retval] ITextStream **ppts); + + [id(IHOST_STDERR_DISPID), propget] + HRESULT StdErr([out, retval] ITextStream **ppts); + } +} Propchange: trunk/reactos/base/applications/cmdutils/wscript/ihost.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/wscript/ihost_dispid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wscript/ihost_dispid.h (added) +++ trunk/reactos/base/applications/cmdutils/wscript/ihost_dispid.h [iso-8859-1] Sat Nov 8 11:23:02 2014 @@ -0,0 +1,58 @@ +/* + * Copyright 2010 Jacek Caban for CodeWeavers + * + * 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 + */ + +#pragma once + +#define IHOST_NAME_DISPID DISPID_VALUE +#define IHOST_APPLICATION_DISPID 100 +#define IHOST_FULLNAME_DISPID 101 +#define IHOST_PATH_DISPID 102 +#define IHOST_INTERACTIVE_DISPID 103 +#define IHOST_QUIT_DISPID 200 +#define IHOST_SCRIPTNAME_DISPID 1000 +#define IHOST_SCRIPTFULLNAME_DISPID 1001 +#define IHOST_ARGUMENTS_DISPID 1002 +#define IHOST_VERSION_DISPID 1003 +#define IHOST_BUILDVERSION_DISPID 1004 +#define IHOST_TIMEOUT_DISPID 1005 +#define IHOST_STDIN_DISPID 1006 +#define IHOST_STDOUT_DISPID 1007 +#define IHOST_STDERR_DISPID 1008 +#define IHOST_CREATEOBJECT_DISPID 2000 +#define IHOST_ECHO_DISPID 2001 +#define IHOST_GETOBJECT_DISPID 2002 +#define IHOST_DISCONNECTOBJECT_DISPID 2003 +#define IHOST_SLEEP_DISPID 2004 +#define IHOST_CONNECTOBJECT_DISPID 2005 + +#define IARGUMENTS2_COUNT_DISPID 1 +#define IARGUMENTS2_LENGTH_DISPID 2 + +#define ITEXTSTREAM_LINE_DISPID 10000 +#define ITEXTSTREAM_COLUMN_DISPID -529 +#define ITEXTSTREAM_ATENDOFSTREAM_DISPID 10002 +#define ITEXTSTREAM_ATENDOFLINE_DISPID 10003 +#define ITEXTSTREAM_READ_DISPID 10004 +#define ITEXTSTREAM_READLINE_DISPID 10005 +#define ITEXTSTREAM_READALL_DISPID 10006 +#define ITEXTSTREAM_WRITE_DISPID 10007 +#define ITEXTSTREAM_WRITELINE_DISPID 10008 +#define ITEXTSTREAM_WRITEBLANKLINES_DISPID 10009 +#define ITEXTSTREAM_SKIP_DISPID 10010 +#define ITEXTSTREAM_SKIPLINE_DISPID 10011 +#define ITEXTSTREAM_CLOSE_DISPID 10012 Propchange: trunk/reactos/base/applications/cmdutils/wscript/ihost_dispid.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/wscript/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wscript/main.c (added) +++ trunk/reactos/base/applications/cmdutils/wscript/main.c [iso-8859-1] Sat Nov 8 11:23:02 2014 @@ -0,0 +1,467 @@ +/* + * Copyright 2010 Jacek Caban for CodeWeavers + * + * 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 "wscript.h" + +#include <shellapi.h> +#include <activscp.h> + +#ifdef _WIN64 + +#define IActiveScriptParse_Release IActiveScriptParse64_Release +#define IActiveScriptParse_InitNew IActiveScriptParse64_InitNew +#define IActiveScriptParse_ParseScriptText IActiveScriptParse64_ParseScriptText + +#else + +#define IActiveScriptParse_Release IActiveScriptParse32_Release +#define IActiveScriptParse_InitNew IActiveScriptParse32_InitNew +#define IActiveScriptParse_ParseScriptText IActiveScriptParse32_ParseScriptText + +#endif + +static const WCHAR wscriptW[] = {'W','S','c','r','i','p','t',0}; +static const WCHAR wshW[] = {'W','S','H',0}; +WCHAR scriptFullName[MAX_PATH]; + +ITypeInfo *host_ti; +ITypeInfo *arguments_ti; + +static HRESULT query_interface(REFIID,void**); + +static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, + REFIID riid, void **ppv) +{ + return query_interface(riid, ppv); +} + +static ULONG WINAPI ActiveScriptSite_AddRef(IActiveScriptSite *iface) +{ + return 2; +} + +static ULONG WINAPI ActiveScriptSite_Release(IActiveScriptSite *iface) +{ + return 1; +} + +static HRESULT WINAPI ActiveScriptSite_GetLCID(IActiveScriptSite *iface, LCID *plcid) +{ + WINE_TRACE("()\n"); + + *plcid = GetUserDefaultLCID(); + return S_OK; +} + +static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, + LPCOLESTR pstrName, DWORD dwReturnMask, IUnknown **ppunkItem, ITypeInfo **ppti) +{ + WINE_TRACE("(%s %x %p %p)\n", wine_dbgstr_w(pstrName), dwReturnMask, ppunkItem, ppti); + + if(strcmpW(pstrName, wshW) && strcmpW(pstrName, wscriptW)) + return E_FAIL; + + if(dwReturnMask & SCRIPTINFO_ITYPEINFO) { + ITypeInfo_AddRef(host_ti); + *ppti = host_ti; + } + + if(dwReturnMask & SCRIPTINFO_IUNKNOWN) { + IHost_AddRef(&host_obj); + *ppunkItem = (IUnknown*)&host_obj; + } + + return S_OK; +} + +static HRESULT WINAPI ActiveScriptSite_GetDocVersionString(IActiveScriptSite *iface, + BSTR *pbstrVersion) +{ + WINE_FIXME("()\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSite_OnScriptTerminate(IActiveScriptSite *iface, + const VARIANT *pvarResult, const EXCEPINFO *pexcepinfo) +{ + WINE_FIXME("()\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSite_OnStateChange(IActiveScriptSite *iface, + SCRIPTSTATE ssScriptState) +{ + WINE_TRACE("(%x)\n", ssScriptState); + return S_OK; +} + +static HRESULT WINAPI ActiveScriptSite_OnScriptError(IActiveScriptSite *iface, + IActiveScriptError *pscripterror) +{ + WINE_FIXME("()\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSite_OnEnterScript(IActiveScriptSite *iface) +{ + WINE_TRACE("()\n"); + return S_OK; +} + +static HRESULT WINAPI ActiveScriptSite_OnLeaveScript(IActiveScriptSite *iface) +{ + WINE_TRACE("()\n"); + return S_OK; +} + +static IActiveScriptSiteVtbl ActiveScriptSiteVtbl = { + ActiveScriptSite_QueryInterface, + ActiveScriptSite_AddRef, + ActiveScriptSite_Release, + ActiveScriptSite_GetLCID, + ActiveScriptSite_GetItemInfo, + ActiveScriptSite_GetDocVersionString, + ActiveScriptSite_OnScriptTerminate, + ActiveScriptSite_OnStateChange, + ActiveScriptSite_OnScriptError, + ActiveScriptSite_OnEnterScript, + ActiveScriptSite_OnLeaveScript +}; + +static IActiveScriptSite script_site = { &ActiveScriptSiteVtbl }; + +static HRESULT WINAPI ActiveScriptSiteWindow_QueryInterface(IActiveScriptSiteWindow *iface, REFIID riid, void **ppv) +{ + return query_interface(riid, ppv); +} + +static ULONG WINAPI ActiveScriptSiteWindow_AddRef(IActiveScriptSiteWindow *iface) +{ + return 2; +} + +static ULONG WINAPI ActiveScriptSiteWindow_Release(IActiveScriptSiteWindow *iface) +{ + return 1; +} + +static HRESULT WINAPI ActiveScriptSiteWindow_GetWindow(IActiveScriptSiteWindow *iface, HWND *phwnd) +{ + TRACE("(%p)\n", phwnd); + + *phwnd = NULL; + return S_OK; +} + +static HRESULT WINAPI ActiveScriptSiteWindow_EnableModeless(IActiveScriptSiteWindow *iface, BOOL fEnable) +{ + TRACE("(%x)\n", fEnable); + return S_OK; +} + +static IActiveScriptSiteWindowVtbl ActiveScriptSiteWindowVtbl = { + ActiveScriptSiteWindow_QueryInterface, + ActiveScriptSiteWindow_AddRef, + ActiveScriptSiteWindow_Release, + ActiveScriptSiteWindow_GetWindow, + ActiveScriptSiteWindow_EnableModeless +}; + +static IActiveScriptSiteWindow script_site_window = { &ActiveScriptSiteWindowVtbl }; + +static HRESULT query_interface(REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(IID_IUnknown %p)\n", ppv); + *ppv = &script_site; + }else if(IsEqualGUID(riid, &IID_IActiveScriptSite)) { + TRACE("(IID_IActiveScriptSite %p)\n", ppv); + *ppv = &script_site; + }else if(IsEqualGUID(riid, &IID_IActiveScriptSiteWindow)) { + TRACE("(IID_IActiveScriptSiteWindow %p)\n", ppv); + *ppv = &script_site_window; + }else { + *ppv = NULL; + TRACE("(%s %p)\n", wine_dbgstr_guid(riid), ppv); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static BOOL load_typelib(void) +{ + ITypeLib *typelib; + HRESULT hres; + + static const WCHAR wscript_exeW[] = {'w','s','c','r','i','p','t','.','e','x','e',0}; + + hres = LoadTypeLib(wscript_exeW, &typelib); + if(FAILED(hres)) + return FALSE; + + hres = ITypeLib_GetTypeInfoOfGuid(typelib, &IID_IHost, &host_ti); + if(SUCCEEDED(hres)) + hres = ITypeLib_GetTypeInfoOfGuid(typelib, &IID_IArguments2, &arguments_ti); + + ITypeLib_Release(typelib); + return SUCCEEDED(hres); +} + +static BOOL get_engine_clsid(const WCHAR *ext, CLSID *clsid) +{ + WCHAR fileid[64], progid[64]; + DWORD res; + LONG size; + HKEY hkey; + HRESULT hres; + + static const WCHAR script_engineW[] = + {'\\','S','c','r','i','p','t','E','n','g','i','n','e',0}; + + res = RegOpenKeyW(HKEY_CLASSES_ROOT, ext, &hkey); + if(res != ERROR_SUCCESS) + return FALSE; + + size = sizeof(fileid)/sizeof(WCHAR); + res = RegQueryValueW(hkey, NULL, fileid, &size); + RegCloseKey(hkey); + if(res != ERROR_SUCCESS) + return FALSE; + + WINE_TRACE("fileid is %s\n", wine_dbgstr_w(fileid)); + + strcatW(fileid, script_engineW); + res = RegOpenKeyW(HKEY_CLASSES_ROOT, fileid, &hkey); + if(res != ERROR_SUCCESS) + return FALSE; + + size = sizeof(progid)/sizeof(WCHAR); + res = RegQueryValueW(hkey, NULL, progid, &size); + RegCloseKey(hkey); + if(res != ERROR_SUCCESS) + return FALSE; + + WINE_TRACE("ProgID is %s\n", wine_dbgstr_w(progid)); + + hres = CLSIDFromProgID(progid, clsid); + return SUCCEEDED(hres); +} + +static BOOL create_engine(CLSID *clsid, IActiveScript **script_ret, + IActiveScriptParse **parser) +{ + IActiveScript *script; + IUnknown *unk; + HRESULT hres; + + hres = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IUnknown, (void**)&unk); + if(FAILED(hres)) + return FALSE; + + hres = IUnknown_QueryInterface(unk, &IID_IActiveScript, (void**)&script); + IUnknown_Release(unk); + if(FAILED(hres)) + return FALSE; + + hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParse, (void**)parser); + if(FAILED(hres)) { + IActiveScript_Release(script); + return FALSE; + } + + *script_ret = script; + return TRUE; +} + +static BOOL init_engine(IActiveScript *script, IActiveScriptParse *parser) +{ + HRESULT hres; + + if(!load_typelib()) + return FALSE; + + hres = IActiveScript_SetScriptSite(script, &script_site); + if(FAILED(hres)) + return FALSE; + + hres = IActiveScriptParse_InitNew(parser); + if(FAILED(hres)) + return FALSE; + + hres = IActiveScript_AddNamedItem(script, wscriptW, SCRIPTITEM_ISVISIBLE); + if(FAILED(hres)) + return FALSE; + + hres = IActiveScript_AddNamedItem(script, wshW, SCRIPTITEM_ISVISIBLE); + if(FAILED(hres)) + return FALSE; + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_INITIALIZED); + return SUCCEEDED(hres); +} + +static BSTR get_script_str(const WCHAR *filename) +{ + const char *file_map; + HANDLE file, map; + DWORD size, len; + BSTR ret; + + file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL); + if(file == INVALID_HANDLE_VALUE) + return NULL; + + size = GetFileSize(file, NULL); + map = CreateFileMappingW(file, NULL, PAGE_READONLY, 0, 0, NULL); + CloseHandle(file); + if(map == INVALID_HANDLE_VALUE) + return NULL; + + file_map = MapViewOfFile(map, FILE_MAP_READ, 0, 0, 0); + CloseHandle(map); + if(!file_map) + return NULL; + + len = MultiByteToWideChar(CP_ACP, 0, file_map, size, NULL, 0); + ret = SysAllocStringLen(NULL, len); + MultiByteToWideChar(CP_ACP, 0, file_map, size, ret, len); + + UnmapViewOfFile(file_map); + return ret; +} + +static void run_script(const WCHAR *filename, IActiveScript *script, IActiveScriptParse *parser) +{ + BSTR text; + HRESULT hres; + + text = get_script_str(filename); + if(!text) { + WINE_FIXME("Could not get script text\n"); + return; + } + + hres = IActiveScriptParse_ParseScriptText(parser, text, NULL, NULL, NULL, 1, 1, + SCRIPTTEXT_HOSTMANAGESSOURCE|SCRIPTITEM_ISVISIBLE, NULL, NULL); + SysFreeString(text); + if(FAILED(hres)) { + WINE_FIXME("ParseScriptText failed: %08x\n", hres); + return; + } + + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_STARTED); + if(FAILED(hres)) + WINE_FIXME("SetScriptState failed: %08x\n", hres); +} + +static BOOL set_host_properties(const WCHAR *prop) +{ + static const WCHAR nologoW[] = {'n','o','l','o','g','o',0}; + static const WCHAR iactive[] = {'i',0}; + static const WCHAR batch[] = {'b',0}; + + if(*prop == '/') { + ++prop; + if(*prop == '/') + ++prop; + } + else + ++prop; + + if(strcmpiW(prop, iactive) == 0) + wshInteractive = VARIANT_TRUE; + else if(strcmpiW(prop, batch) == 0) + wshInteractive = VARIANT_FALSE; + else if(strcmpiW(prop, nologoW) == 0) + WINE_FIXME("ignored %s switch\n", debugstr_w(nologoW)); + else + { + WINE_FIXME("unsupported switch %s\n", debugstr_w(prop)); + return FALSE; + } + return TRUE; +} + +int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cmdshow) +{ + WCHAR *ext, *filepart, *filename = NULL; + IActiveScriptParse *parser; + IActiveScript *script; + WCHAR **argv; + CLSID clsid; + int argc, i; + DWORD res; + + WINE_TRACE("(%p %p %s %x)\n", hInst, hPrevInst, wine_dbgstr_w(cmdline), cmdshow); + + argv = CommandLineToArgvW(cmdline, &argc); + if(!argv) + return 1; + + for(i=0; i<argc; i++) { + if(*argv[i] == '/' || *argv[i] == '-') { + if(!set_host_properties(argv[i])) + return 1; + }else { + filename = argv[i]; + argums = argv+i+1; + numOfArgs = argc-i-1; + break; + } + } + + if(!filename) { + WINE_FIXME("No file name specified\n"); + return 1; + } + res = GetFullPathNameW(filename, sizeof(scriptFullName)/sizeof(WCHAR), scriptFullName, &filepart); + if(!res || res > sizeof(scriptFullName)/sizeof(WCHAR)) + return 1; + + ext = strrchrW(filepart, '.'); + if(!ext || !get_engine_clsid(ext, &clsid)) { + WINE_FIXME("Could not find engine for %s\n", wine_dbgstr_w(ext)); + return 1; + } + + CoInitialize(NULL); + + if(!create_engine(&clsid, &script, &parser)) { + WINE_FIXME("Could not create script engine\n"); + CoUninitialize(); + return 1; + } + + if(init_engine(script, parser)) { + run_script(filename, script, parser); + IActiveScript_Close(script); + ITypeInfo_Release(host_ti); + }else { + WINE_FIXME("Script initialization failed\n"); + } + + IActiveScript_Release(script); + IActiveScriptParse_Release(parser); + + CoUninitialize(); + + return 0; +} Propchange: trunk/reactos/base/applications/cmdutils/wscript/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/wscript/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wscript/rsrc.rc (added) +++ trunk/reactos/base/applications/cmdutils/wscript/rsrc.rc [iso-8859-1] Sat Nov 8 11:23:02 2014 @@ -0,0 +1,20 @@ +/* + * Copyright 2010 Jacek Caban for CodeWeavers + * + * 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 + */ + +/* @makedep: ihost.tlb */ +1 TYPELIB ihost.tlb Propchange: trunk/reactos/base/applications/cmdutils/wscript/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/wscript/wscript.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/wscript/wscript.h (added) +++ trunk/reactos/base/applications/cmdutils/wscript/wscript.h [iso-8859-1] Sat Nov 8 11:23:02 2014 @@ -0,0 +1,54 @@ +/* + * Copyright 2010 Jacek Caban for CodeWeavers + * + * 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 + */ + +#ifndef _WSCRIPT_H_ +#define _WSCRIPT_H_ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COBJMACROS +#define CONST_VTABLE + +#include <windef.h> +#include <winbase.h> +#include <initguid.h> +#include <ihost.h> +#include <wine/debug.h> +#include <wine/unicode.h> + +WINE_DEFAULT_DEBUG_CHANNEL(wscript); + +extern IHost host_obj; + +extern IArguments2 arguments_obj; + +extern ITypeInfo *host_ti; + +extern ITypeInfo *arguments_ti; + +extern WCHAR scriptFullName[]; + +extern WCHAR **argums; + +extern int numOfArgs; + +extern VARIANT_BOOL wshInteractive; + +#endif /* _WSCRIPT_H_ */ Propchange: trunk/reactos/base/applications/cmdutils/wscript/wscript.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Nov 8 11:23:02 2014 @@ -237,6 +237,7 @@ reactos/base/applications/cmdutils/reg # Synced to Wine-1.7.27 reactos/base/applications/cmdutils/taskkill # Synced to Wine-1.7.27 reactos/base/applications/cmdutils/wmic # Synced to Wine-1.7.27 +reactos/base/applications/cmdutils/wscript # Synced to Wine-1.7.27 reactos/base/applications/cmdutils/xcopy # Synced to Wine-1.7.27 reactos/base/applications/games/winmine # Forked at Wine-1_3_5 reactos/base/applications/extrac32 # Synced to Wine-1.7.27

9 years, 10 months

[akhaldi] 65316: [WSHOM_WINETEST] * Import from Wine 1.7.27. CORE-8768 CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Nov 8 10:27:05 2014 New Revision: 65316 URL: http://svn.reactos.org/svn/reactos?rev=65316&view=rev Log: [WSHOM_WINETEST] * Import from Wine 1.7.27. CORE-8768 CORE-8540 Added: trunk/rostests/winetests/wshom/ (with props) trunk/rostests/winetests/wshom/CMakeLists.txt (with props) trunk/rostests/winetests/wshom/testlist.c (with props) trunk/rostests/winetests/wshom/wshom.c (with props) trunk/rostests/winetests/wshom/wshom.idl (with props) Modified: trunk/rostests/winetests/CMakeLists.txt Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Sat Nov 8 10:27:05 2014 @@ -114,6 +114,7 @@ add_subdirectory(wlanapi) add_subdirectory(wldap32) add_subdirectory(ws2_32) +add_subdirectory(wshom) add_subdirectory(xcopy) add_subdirectory(xinput1_3) add_subdirectory(xmllite) Propchange: trunk/rostests/winetests/wshom/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Nov 8 10:27:05 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rostests/winetests/wshom/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rostests/winetests/wshom/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Added: trunk/rostests/winetests/wshom/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wshom/CMakeList… ============================================================================== --- trunk/rostests/winetests/wshom/CMakeLists.txt (added) +++ trunk/rostests/winetests/wshom/CMakeLists.txt [iso-8859-1] Sat Nov 8 10:27:05 2014 @@ -0,0 +1,8 @@ + +add_definitions(-DUSE_WINE_TODOS) +add_idl_headers(wshom_winetest_idlheaders wshom.idl) +add_executable(wshom_winetest wshom.c testlist.c) +set_module_type(wshom_winetest win32cui) +add_importlibs(wshom_winetest oleaut32 ole32 msvcrt kernel32) +add_dependencies(wshom_winetest stdole2 wshom_winetest_idlheaders) +add_cd_file(TARGET wshom_winetest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/winetests/wshom/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/wshom/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wshom/testlist.… ============================================================================== --- trunk/rostests/winetests/wshom/testlist.c (added) +++ trunk/rostests/winetests/wshom/testlist.c [iso-8859-1] Sat Nov 8 10:27:05 2014 @@ -0,0 +1,12 @@ +/* Automatically generated by make depend; DO NOT EDIT!! */ + +#define STANDALONE +#include <wine/test.h> + +extern void func_wshom(void); + +const struct test winetest_testlist[] = +{ + { "wshom", func_wshom }, + { 0, 0 } +}; Propchange: trunk/rostests/winetests/wshom/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/wshom/wshom.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wshom/wshom.c?r… ============================================================================== --- trunk/rostests/winetests/wshom/wshom.c (added) +++ trunk/rostests/winetests/wshom/wshom.c [iso-8859-1] Sat Nov 8 10:27:05 2014 @@ -0,0 +1,189 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COBJMACROS +#define CONST_VTABLE + +#include <windef.h> +#include <winbase.h> +#include <initguid.h> +#include <dispex.h> +#include <wshom.h> +#include <wine/test.h> + +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); + +#define EXPECT_HR(hr,hr_exp) \ + ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) + +static void test_wshshell(void) +{ + static const WCHAR desktopW[] = {'D','e','s','k','t','o','p',0}; + static const WCHAR lnk1W[] = {'f','i','l','e','.','l','n','k',0}; + static const WCHAR pathW[] = {'%','P','A','T','H','%',0}; + static const WCHAR sysW[] = {'S','Y','S','T','E','M',0}; + static const WCHAR path2W[] = {'P','A','T','H',0}; + IWshEnvironment *env; + IWshShell3 *sh3; + IDispatchEx *dispex; + IWshCollection *coll; + IDispatch *disp, *shortcut; + IUnknown *shell; + IFolderCollection *folders; + IWshShortcut *shcut; + ITypeInfo *ti; + HRESULT hr; + TYPEATTR *tattr; + DISPPARAMS dp; + EXCEPINFO ei; + VARIANT arg, res; + BSTR str, ret; + UINT err; + + hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IDispatch, (void**)&disp); + if(FAILED(hr)) { + win_skip("Could not create WshShell object: %08x\n", hr); + return; + } + + hr = IDispatch_QueryInterface(disp, &IID_IWshShell3, (void**)&shell); + EXPECT_HR(hr, S_OK); + IDispatch_Release(disp); + + hr = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + EXPECT_HR(hr, E_NOINTERFACE); + + hr = IUnknown_QueryInterface(shell, &IID_IWshShell3, (void**)&sh3); + EXPECT_HR(hr, S_OK); + + hr = IWshShell3_get_SpecialFolders(sh3, &coll); + EXPECT_HR(hr, S_OK); + + hr = IWshCollection_QueryInterface(coll, &IID_IFolderCollection, (void**)&folders); + EXPECT_HR(hr, E_NOINTERFACE); + + hr = IWshCollection_QueryInterface(coll, &IID_IDispatch, (void**)&disp); + EXPECT_HR(hr, S_OK); + + hr = IDispatch_GetTypeInfo(disp, 0, 0, &ti); + EXPECT_HR(hr, S_OK); + + hr = ITypeInfo_GetTypeAttr(ti, &tattr); + EXPECT_HR(hr, S_OK); + ok(IsEqualIID(&tattr->guid, &IID_IWshCollection), "got wrong type guid\n"); + ITypeInfo_ReleaseTypeAttr(ti, tattr); + + /* try to call Item() with normal IDispatch procedure */ + str = SysAllocString(desktopW); + V_VT(&arg) = VT_BSTR; + V_BSTR(&arg) = str; + dp.rgvarg = &arg; + dp.rgdispidNamedArgs = NULL; + dp.cArgs = 1; + dp.cNamedArgs = 0; + hr = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 1033, DISPATCH_PROPERTYGET, &dp, &res, &ei, &err); + EXPECT_HR(hr, DISP_E_MEMBERNOTFOUND); + + /* try Item() directly, it returns directory path apparently */ + V_VT(&res) = VT_EMPTY; + hr = IWshCollection_Item(coll, &arg, &res); + EXPECT_HR(hr, S_OK); + ok(V_VT(&res) == VT_BSTR, "got res type %d\n", V_VT(&res)); + SysFreeString(str); + VariantClear(&res); + + /* CreateShortcut() */ + str = SysAllocString(lnk1W); + hr = IWshShell3_CreateShortcut(sh3, str, &shortcut); + EXPECT_HR(hr, S_OK); + SysFreeString(str); + hr = IDispatch_QueryInterface(shortcut, &IID_IWshShortcut, (void**)&shcut); + EXPECT_HR(hr, S_OK); + + hr = IWshShortcut_get_Arguments(shcut, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + hr = IWshShortcut_get_IconLocation(shcut, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + IWshShortcut_Release(shcut); + IDispatch_Release(shortcut); + + /* ExpandEnvironmentStrings */ + hr = IWshShell3_ExpandEnvironmentStrings(sh3, NULL, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + str = SysAllocString(pathW); + hr = IWshShell3_ExpandEnvironmentStrings(sh3, str, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + SysFreeString(str); + + V_VT(&arg) = VT_BSTR; + V_BSTR(&arg) = SysAllocString(sysW); + hr = IWshShell3_get_Environment(sh3, &arg, &env); + ok(hr == S_OK, "got 0x%08x\n", hr); + VariantClear(&arg); + + hr = IWshEnvironment_get_Item(env, NULL, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + ret = (BSTR)0x1; + hr = IWshEnvironment_get_Item(env, NULL, &ret); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ret && !*ret, "got %p\n", ret); + SysFreeString(ret); + + /* invalid var name */ + str = SysAllocString(lnk1W); + hr = IWshEnvironment_get_Item(env, str, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + ret = NULL; + hr = IWshEnvironment_get_Item(env, str, &ret); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ret && *ret == 0, "got %s\n", wine_dbgstr_w(ret)); + SysFreeString(ret); + SysFreeString(str); + + /* valid name */ + str = SysAllocString(path2W); + hr = IWshEnvironment_get_Item(env, str, &ret); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ret && *ret != 0, "got %s\n", wine_dbgstr_w(ret)); + SysFreeString(ret); + SysFreeString(str); + + IWshEnvironment_Release(env); + + IWshCollection_Release(coll); + IDispatch_Release(disp); + IWshShell3_Release(sh3); + IUnknown_Release(shell); +} + +START_TEST(wshom) +{ + CoInitialize(NULL); + + test_wshshell(); + + CoUninitialize(); +} Propchange: trunk/rostests/winetests/wshom/wshom.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/wshom/wshom.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wshom/wshom.idl… ============================================================================== --- trunk/rostests/winetests/wshom/wshom.idl (added) +++ trunk/rostests/winetests/wshom/wshom.idl [iso-8859-1] Sat Nov 8 10:27:05 2014 @@ -0,0 +1,664 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * 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 + */ + +import "oaidl.idl"; +cpp_quote("#undef ExpandEnvironmentStrings") + +[ + helpstring("Windows Script Host Object Model"), + uuid(f935dc20-1cf0-11d0-adb9-00c04fd58a0b), + version(1.0) +] +library IWshRuntimeLibrary +{ + importlib("stdole2.tlb"); + + typedef enum { + WshRunning = 0, + WshFinished, + WshFailed + } WshExecStatus; + + typedef enum { + UnknownType = 0, + Removable, + Fixed, + Remote, + CDRom, + RamDisk + } DriveTypeConst; + + typedef enum { + Normal = 0x000, + ReadOnly = 0x001, + Hidden = 0x002, + System = 0x004, + Volume = 0x008, + Directory = 0x010, + Archive = 0x020, + Alias = 0x400, + Compressed = 0x800 + } FileAttribute; + + typedef enum { + ForReading = 0x1, + ForWriting = 0x2, + ForAppending = 0x8 + } IOMode; + + typedef enum { + TristateTrue = -1, + TristateFalse = 0, + TristateUseDefault = -2, + TristateMixed = -2 + } Tristate; + + interface IFolder; + interface IFolderCollection; + + [ + uuid(53bad8c1-e718-11cf-893d-00a0c9054228), + odl, + hidden, + dual, + nonextensible, + oleautomation + ] + interface ITextStream : IDispatch { + [id(0x2710), propget] + HRESULT Line([out, retval] long* Line); + + [id(0xfffffdef), propget] + HRESULT Column([out, retval] long* Column); + + [id(0x2712), propget] + HRESULT AtEndOfStream([out, retval] VARIANT_BOOL* EOS); + + [id(0x2713), propget] + HRESULT AtEndOfLine([out, retval] VARIANT_BOOL* EOL); + + [id(0x2714)] + HRESULT Read([in] long Characters, [out, retval] BSTR* Text); + + [id(0x2715)] + HRESULT ReadLine([out, retval] BSTR* Text); + + [id(0x2716)] + HRESULT ReadAll([out, retval] BSTR* Text); + + [id(0x2717)] + HRESULT Write([in] BSTR Text); + + [id(0x2718)] + HRESULT WriteLine([in, defaultvalue("")] BSTR Text); + + [id(0x2719)] + HRESULT WriteBlankLines([in] long Lines); + + [id(0x271a)] + HRESULT Skip([in] long Characters); + + [id(0x271b)] + HRESULT SkipLine(); + + [id(0x271c)] + HRESULT Close(); + }; + + [ + uuid(c7c3f5a0-88a3-11d0-abcb-00a0c90fffc0), + odl, + hidden, + dual, + nonextensible, + oleautomation + ] + interface IDrive : IDispatch { + [id(DISPID_VALUE), propget] + HRESULT Path([out, retval] BSTR* path); + + [id(0x2710), propget] + HRESULT DriveLetter([out, retval] BSTR* letter); + + [id(0x2711), propget] + HRESULT ShareName([out, retval] BSTR* ShareName); + + [id(0x2712), propget] + HRESULT DriveType([out, retval] DriveTypeConst* type); + + [id(0x2713), propget] + HRESULT RootFolder([out, retval] IFolder** folder); + + [id(0x2715), propget] + HRESULT AvailableSpace([out, retval] VARIANT* Avail); + + [id(0x2714), propget] + HRESULT FreeSpace([out, retval] VARIANT* pFree); + + [id(0x2716), propget] + HRESULT TotalSize([out, retval] VARIANT* Total); + + [id(0x2717), propget] + HRESULT VolumeName([out, retval] BSTR* Name); + + [id(0x2717), propput] + HRESULT VolumeName([in] BSTR Name); + + [id(0x2718), propget] + HRESULT FileSystem([out, retval] BSTR* pFileSystem); + + [id(0x2719), propget] + HRESULT SerialNumber([out, retval] long* SerialNumber); + + [id(0x271a), propget] + HRESULT IsReady([out, retval] VARIANT_BOOL* pfReady); + }; + + [ + uuid(c7c3f5a4-88a3-11d0-abcb-00a0c90fffc0), + odl, + hidden, + dual, + nonextensible, + oleautomation + ] + interface IFile : IDispatch { + [id(DISPID_VALUE), propget] + HRESULT Path([out, retval] BSTR* path); + + [id(0x03e8), propget] + HRESULT Name([out, retval] BSTR* Name); + + [id(0x03e8), propput] + HRESULT Name([in] BSTR Name); + + [id(0x03ea), propget] + HRESULT ShortPath([out, retval] BSTR* path); + + [id(0x03e9), propget] + HRESULT ShortName([out, retval] BSTR* Name); + + [id(0x03ec), propget] + HRESULT Drive([out, retval] IDrive** drive); + + [id(0x03ed), propget] + HRESULT ParentFolder([out, retval] IFolder** folder); + + [id(0x03eb), propget] + HRESULT Attributes([out, retval] FileAttribute* attr); + + [id(0x03eb), propput] + HRESULT Attributes([in] FileAttribute attr); + + [id(0x03ee), propget] + HRESULT DateCreated([out, retval] DATE* date); + + [id(0x03ef), propget] + HRESULT DateLastModified([out, retval] DATE* date); + + [id(0x03f0), propget] + HRESULT DateLastAccessed([out, retval] DATE* date); + + [id(0x03f1), propget] + HRESULT Size([out, retval] VARIANT* Size); + + [id(0x03f2), propget] + HRESULT Type([out, retval] BSTR* Type); + + [id(0x04b0)] + HRESULT Delete([in, defaultvalue(0)] VARIANT_BOOL Force); + + [id(0x04b2)] + HRESULT Copy( + [in] BSTR Destination, + [in, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles); + + [id(0x04b4)] + HRESULT Move([in] BSTR Destination); + + [id(0x044c)] + HRESULT OpenAsTextStream( + [in, defaultvalue(1)] IOMode IOMode, + [in, defaultvalue(0)] Tristate Format, + [out, retval] ITextStream** ppts); + }; + + [ + uuid(c7c3f5a5-88a3-11d0-abcb-00a0c90fffc0), + odl, + hidden, + dual, + nonextensible, + oleautomation + ] + interface IFileCollection : IDispatch { + [id(DISPID_VALUE), propget] + HRESULT Item( + [in] VARIANT Key, + [out, retval] IFile** ppfile); + [id(DISPID_NEWENUM), propget, restricted, hidden] + HRESULT _NewEnum([out, retval] IUnknown** ppenum); + [id(1), propget] + HRESULT Count([out, retval] long* count); + }; + + [ + uuid(c7c3f5a2-88a3-11d0-abcb-00a0c90fffc0), + odl, + hidden, + dual, + nonextensible, + oleautomation + ] + interface IFolder : IDispatch { + [id(DISPID_VALUE), propget] + HRESULT Path([out, retval] BSTR* path); + + [id(0x03e8), propget] + HRESULT Name([out, retval] BSTR* name); + + [id(0x03e8), propput] + HRESULT Name([in] BSTR name); + + [id(0x03ea), propget] + HRESULT ShortPath([out, retval] BSTR* path); + + [id(0x03e9), propget] + HRESULT ShortName([out, retval] BSTR* name); + + [id(0x03ec), propget] + HRESULT Drive([out, retval] IDrive** drive); + + [id(0x03ed), propget] + HRESULT ParentFolder([out, retval] IFolder** folder); + + [id(0x03eb), propget] + HRESULT Attributes([out, retval] FileAttribute* attr); + + [id(0x03eb), propput] + HRESULT Attributes([in] FileAttribute attr); + + [id(0x03ee), propget] + HRESULT DateCreated([out, retval] DATE* date); + + [id(0x03ef), propget] + HRESULT DateLastModified([out, retval] DATE* date); + + [id(0x03f0), propget] + HRESULT DateLastAccessed([out, retval] DATE* date); + + [id(0x03f2), propget] + HRESULT Type([out, retval] BSTR* type); + + [id(0x04b1)] + HRESULT Delete([in, defaultvalue(0)] VARIANT_BOOL force); + + [id(0x04b3)] + HRESULT Copy( + [in] BSTR Destination, + [in, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles); + + [id(0x04b5)] + HRESULT Move([in] BSTR Destination); + + [id(0x2710), propget] + HRESULT IsRootFolder([out, retval] VARIANT_BOOL* root); + + [id(0x03f1), propget] + HRESULT Size([out, retval] VARIANT* size); + + [id(0x2711), propget] + HRESULT SubFolders([out, retval] IFolderCollection** folders); + + [id(0x2712), propget] + HRESULT Files([out, retval] IFileCollection** files); + + [id(0x044d)] + HRESULT CreateTextFile( + [in] BSTR FileName, + [in, defaultvalue(-1)] VARIANT_BOOL Overwrite, + [in, defaultvalue(0)] VARIANT_BOOL Unicode, + [out, retval] ITextStream** ppts); + }; + + [ + uuid(c7c3f5a3-88a3-11d0-abcb-00a0c90fffc0), + odl, + hidden, + dual, + nonextensible, + oleautomation + ] + interface IFolderCollection : IDispatch { + [id(2)] + HRESULT Add( + [in] BSTR Name, + [out, retval] IFolder** folder); + + [id(DISPID_VALUE), propget] + HRESULT Item( + [in] VARIANT Key, + [out, retval] IFolder** folder); + + [id(DISPID_NEWENUM), propget, restricted, hidden] + HRESULT _NewEnum([out, retval] IUnknown** ppenum); + + [id(1), propget] + HRESULT Count([out, retval] long* count); + }; + + [ + uuid(f935dc27-1cf0-11d0-adb9-00c04fd58a0b), + odl, + dual, + oleautomation + ] + interface IWshCollection : IDispatch { + [id(DISPID_VALUE)] + HRESULT Item( + [in] VARIANT *Index, + [out, retval] VARIANT *out_Value); + + [id(1)] + HRESULT Count([out, retval] long *out_Count); + + [id(2), propget] + HRESULT length([out, retval] long *out_Count); + + [id(DISPID_NEWENUM)] + HRESULT _NewEnum([out, retval] IUnknown *out_Enum); + } + + [ + uuid(f935dc29-1cf0-11d0-adb9-00c04fd58a0b), + odl, + dual, + oleautomation + ] + interface IWshEnvironment : IDispatch { + [id(DISPID_VALUE), propget] + HRESULT Item( + [in] BSTR Name, + [out, retval] BSTR *out_Value); + + [id(DISPID_VALUE), propput] + HRESULT Item( + [in] BSTR Name, + [in] BSTR Value); + + [id(1)] + HRESULT Count([out, retval] long *out_Count); + + [id(2), propget] + HRESULT length([out, retval] long *out_Count); + + [id(DISPID_NEWENUM)] + HRESULT _NewEnum([out, retval] IUnknown **out_Enum); + + [id(0x03e9)] + HRESULT Remove([in] BSTR Name); + } + + [ + uuid(08fed190-be19-11d3-a28b-00104bd35090), + odl, + dual, + oleautomation + ] + interface IWshExec : IDispatch { + [id(0x0001), propget] + HRESULT Status([out, retval] WshExecStatus* Status); + + [id(0x0003), propget] + HRESULT StdIn([out, retval] ITextStream** stream); + + [id(0x0004), propget] + HRESULT StdOut([out, retval] ITextStream** stream); + + [id(0x0005), propget] + HRESULT StdErr([out, retval] ITextStream** stream); + + [id(0x0006), propget] + HRESULT ProcessID([out, retval] long* pid); + + [id(0x0007), propget] + HRESULT ExitCode([out, retval] long* ExitCode); + + [id(0x0008)] + HRESULT Terminate(); + }; + + [ + uuid(f935dc23-1cf0-11d0-adb9-00c04fd58a0b), + odl, + dual, + oleautomation + ] + interface IWshShortcut : IDispatch { + [id(DISPID_VALUE), propget] + HRESULT FullName([out, retval] BSTR* name); + + [id(0x03e8), propget] + HRESULT Arguments([out, retval] BSTR* Arguments); + + [id(0x03e8), propput] + HRESULT Arguments([in] BSTR Arguments); + + [id(0x03e9), propget] + HRESULT Description([out, retval] BSTR* Description); + + [id(0x03e9), propput] + HRESULT Description([in] BSTR Description); + + [id(0x03ea), propget] + HRESULT Hotkey([out, retval] BSTR* HotKey); + + [id(0x03ea), propput] + HRESULT Hotkey([in] BSTR HotKey); + + [id(0x03eb), propget] + HRESULT IconLocation([out, retval] BSTR* IconPath); + + [id(0x03eb), propput] + HRESULT IconLocation([in] BSTR IconPath); + + [id(0x03ec), propput] + HRESULT RelativePath([in] BSTR rhs); + + [id(0x03ed), propget] + HRESULT TargetPath([out, retval] BSTR* Path); + + [id(0x03ed), propput] + HRESULT TargetPath([in] BSTR Path); + + [id(0x03ee), propget] + HRESULT WindowStyle([out, retval] int* ShowCmd); + + [id(0x03ee), propput] + HRESULT WindowStyle([in] int ShowCmd); + + [id(0x03ef), propget] + HRESULT WorkingDirectory([out, retval] BSTR* WorkingDirectory); + + [id(0x03ef), propput] + HRESULT WorkingDirectory([in] BSTR WorkingDirectory); + + [id(0x07d0), hidden] + HRESULT Load([in] BSTR PathLink); + + [id(0x07d1)] + HRESULT Save(); + }; + + [ + uuid(f935dc21-1cf0-11d0-adb9-00c04fd58a0b), + odl, + dual, + oleautomation, + hidden + ] + interface IWshShell : IDispatch { + [id(0x0064), propget] + HRESULT SpecialFolders([out, retval] IWshCollection** out_Folders); + + [id(0x00c8), propget] + HRESULT Environment( + [in, optional] VARIANT* Type, + [out, retval] IWshEnvironment** out_Env); + + [id(0x03e8)] + HRESULT Run( + [in] BSTR Command, + [in, optional] VARIANT* WindowStyle, + [in, optional] VARIANT* WaitOnReturn, + [out, retval] int* out_ExitCode); + + [id(0x03e9)] + HRESULT Popup( + [in] BSTR Text, + [in, optional] VARIANT* SecondsToWait, + [in, optional] VARIANT* Title, + [in, optional] VARIANT* Type, + [out, retval] int* out_Button); + + [id(0x03ea)] + HRESULT CreateShortcut( + [in] BSTR PathLink, + [out, retval] IDispatch** out_Shortcut); + + [id(0x03ee)] + HRESULT ExpandEnvironmentStrings( + [in] BSTR Src, + [out, retval] BSTR* out_Dst); + + [id(0x07d0)] + HRESULT RegRead( + [in] BSTR Name, + [out, retval] VARIANT* out_Value); + + [id(0x07d1)] + HRESULT RegWrite( + [in] BSTR Name, + [in] VARIANT* Value, + [in, optional] VARIANT* Type); + + [id(0x07d2)] + HRESULT RegDelete([in] BSTR Name); + }; + + [ + uuid(24be5a30-edfe-11d2-b933-00104b365c9f), + odl, + dual, + oleautomation, + hidden + ] + interface IWshShell2 : IWshShell { + [id(0x0bb8)] + HRESULT LogEvent( + [in] VARIANT* Type, + [in] BSTR Message, + [in, defaultvalue("")] BSTR Target, + [out, retval] VARIANT_BOOL* out_Success); + + [id(0x0bc2)] + HRESULT AppActivate( + [in] VARIANT* App, + [in, optional] VARIANT* Wait, + [out, retval] VARIANT_BOOL* out_Success); + + [id(0x0bc3)] + HRESULT SendKeys( + [in] BSTR Keys, + [in, optional] VARIANT* Wait); + }; + + [ + uuid(41904400-be18-11d3-a28b-00104bd35090), + odl, + dual, + oleautomation + ] + interface IWshShell3 : IWshShell2 { + [id(0x0bc4)] + HRESULT Exec( + [in] BSTR Command, + [out, retval] IWshExec** out_Exec); + + [id(0x0bc5), propget] + HRESULT CurrentDirectory([out, retval] BSTR* out_Directory); + + [id(0x0bc5), propput] + HRESULT CurrentDirectory([in] BSTR out_Directory); + }; + + [ + uuid(24be5a31-edfe-11d2-b933-00104b365c9f), + odl, + dual, + oleautomation + ] + interface IWshNetwork2 : IDispatch { + [id(0x60020000), propget] + HRESULT UserDomain([out, retval] BSTR *out_UserDomain); + } + + [ + helpstring("Windows Script Host Shell Object"), + uuid(f935dc22-1cf0-11d0-adb9-00c04fd58a0b), + threading(apartment), + progid("WScript.Shell.1"), + vi_progid("WScript.Shell") + ] + coclass IWshShell_Class { + [default] interface IWshShell3; + } + + [ + helpstring("Windows Script Host Shell Object"), + uuid(72c24dd5-d70a-438b-8a42-98424b88afb8), + threading(apartment), + progid("WScript.Shell.1"), + vi_progid("WScript.Shell") + ] + coclass WshShell { + [default] interface IWshShell3; + } + + [ + helpstring("Windows Script Host Network Object"), + uuid(f935dc26-1cf0-11d0-adb9-00c04fd58a0b), + threading(apartment), + progid("WScript.Network.1"), + vi_progid("WScript.Network") + ] + coclass IWshNetwork_Class { + [default] interface IWshNetwork2; + } + + [ + helpstring("Windows Script Host Network Object"), + uuid(093ff999-1ea0-4079-9525-9614c3504b74), + threading(apartment), + progid("WScript.Network.1"), + vi_progid("WScript.Network") + ] + coclass WshNetwork { + [default] interface IWshNetwork2; + } +} Propchange: trunk/rostests/winetests/wshom/wshom.idl ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 10 months

← Newer
1
...
19
20
21
22
23
24
25
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2014