Ros-diffs April 2019

ros-diffs@reactos.org

32 participants
240 discussions

[reactos] 01/01: [NTOS/MM] Ensure ImageBase is not used uninitialized

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2450dec4270df951e8031… commit 2450dec4270df951e8031632248aceb101065419 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Apr 27 23:58:01 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Apr 30 18:57:43 2019 +0200 [NTOS/MM] Ensure ImageBase is not used uninitialized --- ntoskrnl/mm/section.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 335ab054d84..56ffab8a2ad 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -197,7 +197,7 @@ NTSTATUS NTAPI PeFmtCreateSection(IN CONST VOID * FileHeader, ULONG cbHeadersSize = 0; ULONG nSectionAlignment; ULONG nFileAlignment; - ULONG_PTR ImageBase; + ULONG_PTR ImageBase = 0; const IMAGE_DOS_HEADER * pidhDosHeader; const IMAGE_NT_HEADERS32 * pinhNtHeader; const IMAGE_OPTIONAL_HEADER32 * piohOptHeader;

5 years, 7 months

[reactos] 01/01: [KERNEL32] Addendum to 0e3a0435 (PR #803): always return TRUE in the stub-plemented SetThreadStackGuarantee() to continue satisfying programs that use it. CORE-15989

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=77d234b049b96e9c56fc2… commit 77d234b049b96e9c56fc23b91fffe179e2e73b95 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Apr 29 22:51:35 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Apr 29 22:51:35 2019 +0200 [KERNEL32] Addendum to 0e3a0435 (PR #803): always return TRUE in the stub-plemented SetThreadStackGuarantee() to continue satisfying programs that use it. CORE-15989 --- dll/win32/kernel32/client/thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/kernel32/client/thread.c b/dll/win32/kernel32/client/thread.c index 1a593ba2ddf..e64cd7230d3 100644 --- a/dll/win32/kernel32/client/thread.c +++ b/dll/win32/kernel32/client/thread.c @@ -985,8 +985,8 @@ SetThreadStackGuarantee(IN OUT PULONG StackSizeInBytes) // FIXME: Unimplemented! UNIMPLEMENTED_ONCE; - // return TRUE; - return FALSE; + // Temporary HACK for supporting applications! + return TRUE; // FALSE; } /*

5 years, 7 months

[reactos] 01/01: [OSK] Make the buttons themed

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f681bad2463687049c539… commit f681bad2463687049c539ebd9ab6324fa93dadb1 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Mon Apr 22 15:01:18 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Apr 29 21:31:29 2019 +0200 [OSK] Make the buttons themed Our On-Screen Keyboard has a manifest and the buttons (the ones with BS_ICON styles) aren't rendered with the specific theme as it should be but instead it takes the classic theme. The code relies on NM_CUSTOMDRAW notification, which is more intuitive and efficient than doing owner-drawn operations as NM_CUSTOMDRAW allows the controls to use styles whereas you cannot do it on owner-drawn controls. CORE-15965 --- base/applications/osk/CMakeLists.txt | 2 +- base/applications/osk/main.c | 61 ++++++++++++++++++++++++++++++++++++ base/applications/osk/osk.h | 6 ++-- 3 files changed, 66 insertions(+), 3 deletions(-) diff --git a/base/applications/osk/CMakeLists.txt b/base/applications/osk/CMakeLists.txt index 24b64eafa9e..ff5876046ca 100644 --- a/base/applications/osk/CMakeLists.txt +++ b/base/applications/osk/CMakeLists.txt @@ -3,5 +3,5 @@ file(GLOB osk_rc_deps res/*.*) add_rc_deps(rsrc.rc ${osk_rc_deps}) add_executable(osk main.c settings.c rsrc.rc) set_module_type(osk win32gui UNICODE) -add_importlibs(osk comdlg32 winmm shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 ntdll) +add_importlibs(osk comdlg32 uxtheme winmm shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 ntdll) add_cd_file(TARGET osk DESTINATION reactos/system32 FOR all) diff --git a/base/applications/osk/main.c b/base/applications/osk/main.c index e12d68dedf0..6f04d78f979 100644 --- a/base/applications/osk/main.c +++ b/base/applications/osk/main.c @@ -24,6 +24,7 @@ BOOL OSK_DlgCommand(WPARAM wCommand, HWND hWndControl); BOOL OSK_ReleaseKey(WORD ScanCode); INT_PTR APIENTRY OSK_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam); +LRESULT APIENTRY OSK_ThemeHandler(HWND hDlg, NMCUSTOMDRAW *pNmDraw); int WINAPI wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int); /* FUNCTIONS ******************************************************************/ @@ -428,6 +429,58 @@ BOOL OSK_ReleaseKey(WORD ScanCode) return TRUE; } +/*********************************************************************** + * + * OSK_ThemeHandler + * + * Function helper which handles theme drawing of controls + */ +LRESULT APIENTRY OSK_ThemeHandler(HWND hDlg, NMCUSTOMDRAW *pNmDraw) +{ + HTHEME hTheme; + HWND hDlgButtonCtrl; + INT iState = PBS_NORMAL; + + /* Retrieve the theme handle for the button controls */ + hDlgButtonCtrl = pNmDraw->hdr.hwndFrom; + hTheme = GetWindowTheme(hDlgButtonCtrl); + + /* + Begin the painting procedures if we retrieved + the theme for control buttons of the dialog. + */ + if (hTheme) + { + /* + The button could be either in normal state or pushed. + Retrieve its state and save to a variable. + */ + if (pNmDraw->uItemState & CDIS_DEFAULT) + { + iState = PBS_DEFAULTED; + } + else if (pNmDraw->uItemState & CDIS_SELECTED) + { + iState = PBS_PRESSED; + } + else if (pNmDraw->uItemState & CDIS_HOT) + { + iState = PBS_HOT; + } + + if (IsThemeBackgroundPartiallyTransparent(hTheme, BP_PUSHBUTTON, iState)) + { + /* Draw the application if the theme is transparent */ + DrawThemeParentBackground(hDlg, pNmDraw->hdc, &pNmDraw->rc); + } + + /* Draw it */ + DrawThemeBackground(hTheme, pNmDraw->hdc, BP_PUSHBUTTON, iState, &pNmDraw->rc, NULL); + } + + return CDRF_SKIPDEFAULT; +} + /*********************************************************************** * * OSK_DlgProc @@ -444,6 +497,9 @@ INT_PTR APIENTRY OSK_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) OSK_DlgTimer(); return TRUE; + case WM_NOTIFY: + return OSK_ThemeHandler(hDlg, (LPNMCUSTOMDRAW)lParam); + case WM_CTLCOLORSTATIC: if ((HWND)lParam == GetDlgItem(hDlg, IDC_LED_NUM)) { @@ -567,6 +623,11 @@ INT_PTR APIENTRY OSK_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) } break; + case WM_THEMECHANGED: + /* Redraw the dialog (and its control buttons) using the new theme */ + InvalidateRect(hDlg, NULL, FALSE); + break; + case WM_CLOSE: OSK_DlgClose(); break; diff --git a/base/applications/osk/osk.h b/base/applications/osk/osk.h index f320d14c4f4..a435e69ac6a 100644 --- a/base/applications/osk/osk.h +++ b/base/applications/osk/osk.h @@ -1,9 +1,9 @@ /* * PROJECT: ReactOS On-Screen Keyboard * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/osk/osk.h * PURPOSE: On screen keyboard. - * PROGRAMMERS: Denis ROBERT + * COPYRIGHT: Denis ROBERT + * Copyright 2019 Bișoc George (fraizeraust99 at gmail dot com) */ #ifndef _OSK_H @@ -16,6 +16,8 @@ #include <windows.h> #include <commctrl.h> #include <debug.h> +#include <uxtheme.h> +#include <vsstyle.h> #include "main.h"

5 years, 7 months

[reactos] 01/01: [WIN32KNT_APITEST] Forgot a extension in CMakeLists.txt

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ce337242bcb1a5283629… commit 9ce337242bcb1a528362981c2e95f9bce6e8e552 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Apr 29 19:42:04 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Apr 29 19:42:04 2019 +0900 [WIN32KNT_APITEST] Forgot a extension in CMakeLists.txt --- modules/rostests/apitests/win32nt/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/apitests/win32nt/CMakeLists.txt b/modules/rostests/apitests/win32nt/CMakeLists.txt index 918903b872b..31e649e0c14 100644 --- a/modules/rostests/apitests/win32nt/CMakeLists.txt +++ b/modules/rostests/apitests/win32nt/CMakeLists.txt @@ -35,7 +35,7 @@ list(APPEND SOURCE ntgdi/NtGdiSelectPen.c ntgdi/NtGdiSetBitmapBits.c ntgdi/NtGdiSetDIBitsToDeviceInternal.c - ntgdi/NtGdiTransformPoints + ntgdi/NtGdiTransformPoints.c # ntuser/NtUserCallHwnd.c # ntuser/NtUserCallHwndLock.c

5 years, 7 months

[reactos] 01/01: [WIN32SS][NTGDI][GDI32] Fix DPtoLP and NtGdiTransformPoints etc. (#1540)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8bdfdd5c17426b04f0451… commit 8bdfdd5c17426b04f0451192e6f3fb12e0598161 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Apr 29 14:45:44 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Apr 29 14:45:44 2019 +0900 [WIN32SS][NTGDI][GDI32] Fix DPtoLP and NtGdiTransformPoints etc. (#1540) Fix NtGdiTransformPoints, gdi32!DPtoLP, gdi32!LPtoDP and gdi32!SetMapMode functions. Fix CORE-15983. CORE-15983 --- win32ss/gdi/gdi32/objects/coord.c | 58 ++++++++++++++++++++++----------------- win32ss/gdi/ntgdi/coord.c | 26 ++++++++++++------ win32ss/gdi/ntgdi/coord.h | 3 ++ win32ss/gdi/ntgdi/xformobj.c | 22 ++++++++++++++- win32ss/gdi/ntgdi/xformobj.h | 3 ++ 5 files changed, 77 insertions(+), 35 deletions(-) diff --git a/win32ss/gdi/gdi32/objects/coord.c b/win32ss/gdi/gdi32/objects/coord.c index dd74b33946..a42fa1236b 100644 --- a/win32ss/gdi/gdi32/objects/coord.c +++ b/win32ss/gdi/gdi32/objects/coord.c @@ -171,28 +171,35 @@ DPtoLP( _Inout_updates_(nCount) LPPOINT lpPoints, _In_ INT nCount) { -#if 0 - INT i; PDC_ATTR pdcattr; + SIZEL sizlView; - /* Get the DC attribute */ - pdcattr = GdiGetDcAttr(hdc); - if (!pdcattr) + if (nCount <= 0) + return TRUE; + + if (hdc == NULL) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - - if (pdcattr->flXform & ANY_XFORM_CHANGES) + if (lpPoints == NULL) { - GdiFixupTransforms(pdcattr); + return TRUE; } - // FIXME: can this fail on Windows? - GdiTransformPoints(&pdcattr->mxDeviceToWorld, lpPoints, lpPoints, nCount); + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + return FALSE; + + if (pdcattr->iMapMode == MM_ISOTROPIC) + { + if (NtGdiGetDCPoint(hdc, GdiGetViewPortExt, (PPOINTL)&sizlView)) + { + if (sizlView.cx == 0 || sizlView.cy == 0) + return FALSE; + } + } - return TRUE; -#endif return NtGdiTransformPoints(hdc, lpPoints, lpPoints, nCount, GdiDpToLp); } @@ -203,28 +210,25 @@ LPtoDP( _Inout_updates_(nCount) LPPOINT lpPoints, _In_ INT nCount) { -#if 0 - INT i; PDC_ATTR pdcattr; - /* Get the DC attribute */ - pdcattr = GdiGetDcAttr(hdc); - if (!pdcattr) + if (nCount <= 0) + return TRUE; + + if (hdc == NULL) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - - if (pdcattr->flXform & ANY_XFORM_CHANGES) + if (lpPoints == NULL) { - GdiFixupTransforms(pdcattr); + return TRUE; } - // FIXME: can this fail on Windows? - GdiTransformPoints(&pdcattr->mxWorldToDevice, lpPoints, lpPoints, nCount); + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr == NULL) + return FALSE; - return TRUE; -#endif return NtGdiTransformPoints(hdc, lpPoints, lpPoints, nCount, GdiLpToDp); } @@ -490,6 +494,9 @@ SetViewportExtEx( (pdcattr->szlViewportExt.cy == nYExtent)) return TRUE; + if (nXExtent == 0 || nYExtent == 0) + return TRUE; + /* Only change viewport extension if we are in iso or aniso mode */ if ((pdcattr->iMapMode == MM_ISOTROPIC) || (pdcattr->iMapMode == MM_ANISOTROPIC)) @@ -512,7 +519,8 @@ SetViewportExtEx( NtGdiMirrorWindowOrg(hdc); /* Update xform flags */ - pdcattr->flXform |= (PAGE_EXTENTS_CHANGED|INVALIDATE_ATTRIBUTES|DEVICE_TO_WORLD_INVALID); + pdcattr->flXform |= (PAGE_EXTENTS_CHANGED | INVALIDATE_ATTRIBUTES | + DEVICE_TO_WORLD_INVALID); } return TRUE; diff --git a/win32ss/gdi/ntgdi/coord.c b/win32ss/gdi/ntgdi/coord.c index 58d236581b..adaee5f0ab 100644 --- a/win32ss/gdi/ntgdi/coord.c +++ b/win32ss/gdi/ntgdi/coord.c @@ -3,7 +3,8 @@ * PROJECT: ReactOS kernel * PURPOSE: Coordinate systems * FILE: win32ss/gdi/ntgdi/coord.c - * PROGRAMER: Timo Kreuzer (timo.kreuzer(a)rectos.org) + * PROGRAMERS: Timo Kreuzer (timo.kreuzer(a)rectos.org) + * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ /* Coordinate translation overview @@ -195,7 +196,7 @@ DC_vUpdateWorldToDevice(PDC pdc) XFORMOBJ_iCombine(&xoWorldToDevice, &xoWorldToPage, &xoPageToDevice); /* Reset the flags */ - pdc->pdcattr->flXform &= ~(PAGE_XLATE_CHANGED|PAGE_EXTENTS_CHANGED|WORLD_XFORM_CHANGED); + pdc->pdcattr->flXform &= ~WORLD_XFORM_CHANGED; } VOID @@ -213,7 +214,7 @@ DC_vUpdateDeviceToWorld(PDC pdc) XFORMOBJ_vInit(&xoDeviceToWorld, &pdc->pdcattr->mxDeviceToWorld); if (XFORMOBJ_iInverse(&xoDeviceToWorld, &xoWorldToDevice) == DDI_ERROR) { - // FIXME: do we need to reset anything? + MX_Set0(&pdc->pdcattr->mxDeviceToWorld); return; } @@ -377,10 +378,14 @@ NtGdiTransformPoints( if (Count <= 0) return TRUE; + if (!UnsafePtsIn || !UnsafePtOut) + { + return FALSE; + } + pdc = DC_LockDc(hDC); if (!pdc) { - EngSetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -595,7 +600,7 @@ NtGdiOffsetViewportOrgEx( } pdcattr->ptlViewportOrg.x += XOffset; pdcattr->ptlViewportOrg.y += YOffset; - pdcattr->flXform |= PAGE_XLATE_CHANGED; + pdcattr->flXform |= PAGE_XLATE_CHANGED | DEVICE_TO_WORLD_INVALID; DC_UnlockDc(dc); @@ -821,6 +826,9 @@ IntGdiSetMapMode( FLONG flXform; PDC_ATTR pdcattr = dc->pdcattr; + if (MapMode == pdcattr->iMapMode) + return MapMode; + flXform = pdcattr->flXform & ~(ISO_OR_ANISO_MAP_MODE|PTOD_EFM22_NEGATIVE| PTOD_EFM11_NEGATIVE|POSITIVE_Y_IS_UP|PAGE_TO_DEVICE_SCALE_IDENTITY| PAGE_TO_DEVICE_IDENTITY); @@ -921,7 +929,7 @@ GreSetViewportOrgEx( pdcattr->ptlViewportOrg.x = X; pdcattr->ptlViewportOrg.y = Y; - pdcattr->flXform |= PAGE_XLATE_CHANGED; + pdcattr->flXform |= PAGE_XLATE_CHANGED | DEVICE_TO_WORLD_INVALID; DC_UnlockDc(dc); return TRUE; @@ -972,7 +980,7 @@ NtGdiSetViewportOrgEx( pdcattr->ptlViewportOrg.x = X; pdcattr->ptlViewportOrg.y = Y; - pdcattr->flXform |= PAGE_XLATE_CHANGED; + pdcattr->flXform |= PAGE_XLATE_CHANGED | DEVICE_TO_WORLD_INVALID; DC_UnlockDc(dc); @@ -1024,7 +1032,7 @@ NtGdiSetWindowOrgEx( pdcattr->ptlWindowOrg.x = X; pdcattr->ptlWindowOrg.y = Y; - pdcattr->flXform |= PAGE_XLATE_CHANGED; + pdcattr->flXform |= PAGE_XLATE_CHANGED | DEVICE_TO_WORLD_INVALID; DC_UnlockDc(dc); @@ -1060,7 +1068,7 @@ IntMirrorWindowOrg(PDC dc) X = (X * pdcattr->szlWindowExt.cx) / cx; pdcattr->ptlWindowOrg.x = pdcattr->lWindowOrgx - X; // Now set the inverted win origion. - pdcattr->flXform |= PAGE_XLATE_CHANGED; + pdcattr->flXform |= PAGE_XLATE_CHANGED | DEVICE_TO_WORLD_INVALID; return; } diff --git a/win32ss/gdi/ntgdi/coord.h b/win32ss/gdi/ntgdi/coord.h index dc3228dfad..9c7a75bbcd 100644 --- a/win32ss/gdi/ntgdi/coord.h +++ b/win32ss/gdi/ntgdi/coord.h @@ -131,6 +131,9 @@ DC_vXformDeviceToWorld( PMATRIX pmx; pmx = DC_pmxDeviceToWorld(pdc); + if (!MX_IsInvertible(pmx)) + return; + XFORMOBJ_vInit(&xo, pmx); XFORMOBJ_bApplyXform(&xo, XF_LTOL, cNumPoints, pptlDest, pptlSource); } diff --git a/win32ss/gdi/ntgdi/xformobj.c b/win32ss/gdi/ntgdi/xformobj.c index e1d2241f2c..02216a5859 100644 --- a/win32ss/gdi/ntgdi/xformobj.c +++ b/win32ss/gdi/ntgdi/xformobj.c @@ -3,7 +3,8 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: win32ss/gdi/ntgdi/xformobj.c * PURPOSE: XFORMOBJ API - * PROGRAMMER: Timo Kreuzer + * PROGRAMMERS: Timo Kreuzer + * Katayama Hirofumi MZ */ /** Includes ******************************************************************/ @@ -243,6 +244,25 @@ XFORMOBJ_iCombineXform( } } +BOOL FASTCALL +MX_IsInvertible(IN PMATRIX pmx) +{ + FLOATOBJ foDet; + MulSub(&foDet, &pmx->efM11, &pmx->efM22, &pmx->efM12, &pmx->efM21); + return !FLOATOBJ_Equal0(&foDet); +} + +VOID FASTCALL +MX_Set0(OUT PMATRIX pmx) +{ + FLOATOBJ_Set0(&pmx->efM11); + FLOATOBJ_Set0(&pmx->efM12); + FLOATOBJ_Set0(&pmx->efM21); + FLOATOBJ_Set0(&pmx->efM22); + FLOATOBJ_Set0(&pmx->efDx); + FLOATOBJ_Set0(&pmx->efDy); +} + /* * A^-1 = adj(A) / det(AT) * A^-1 = 1/(a*d - b*c) * (a22,-a12,a21,-a11) diff --git a/win32ss/gdi/ntgdi/xformobj.h b/win32ss/gdi/ntgdi/xformobj.h index 0c3ff2ee51..179890d86a 100644 --- a/win32ss/gdi/ntgdi/xformobj.h +++ b/win32ss/gdi/ntgdi/xformobj.h @@ -74,3 +74,6 @@ XFORMOBJ_bApplyXform( IN ULONG cPoints, IN PVOID pvIn, OUT PVOID pvOut); + +BOOL FASTCALL MX_IsInvertible(IN PMATRIX pmx); +VOID FASTCALL MX_Set0(OUT PMATRIX pmx);

5 years, 7 months

[reactos] 01/01: [APITESTS] set_module_type(win32u module)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=45ec49ca2f35af830d919… commit 45ec49ca2f35af830d9194e7d45640824196aad5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Apr 29 12:49:54 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Apr 29 12:49:54 2019 +0900 [APITESTS] set_module_type(win32u module) --- modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt | 2 +- modules/rostests/apitests/win32u/win32u_2ksp4/CMakeLists.txt | 2 +- modules/rostests/apitests/win32u/win32u_ros/CMakeLists.txt | 2 +- modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt | 2 +- modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt index d40ba116c0..021fba309c 100644 --- a/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt +++ b/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt @@ -7,5 +7,5 @@ add_library(win32u_2k3sp2 MODULE ${win32u_2k3sp2_asm} ${CMAKE_CURRENT_BINARY_DIR}/win32u_2k3sp2.def) -set_module_type(win32u_2k3sp2 win32dll) +set_module_type(win32u_2k3sp2 module) add_dependencies(win32u_2k3sp2 psdk) diff --git a/modules/rostests/apitests/win32u/win32u_2ksp4/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_2ksp4/CMakeLists.txt index ca8dc375af..99f1c534ed 100644 --- a/modules/rostests/apitests/win32u/win32u_2ksp4/CMakeLists.txt +++ b/modules/rostests/apitests/win32u/win32u_2ksp4/CMakeLists.txt @@ -7,5 +7,5 @@ add_library(win32u_2ksp4 MODULE ${win32ku_2ksp4_asm} ${CMAKE_CURRENT_BINARY_DIR}/win32u_2ksp4.def) -set_module_type(win32u_2ksp4 win32dll) +set_module_type(win32u_2ksp4 module) add_dependencies(win32u_2ksp4 psdk) diff --git a/modules/rostests/apitests/win32u/win32u_ros/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_ros/CMakeLists.txt index 86b760a70d..e8a8c03cf2 100644 --- a/modules/rostests/apitests/win32u/win32u_ros/CMakeLists.txt +++ b/modules/rostests/apitests/win32u/win32u_ros/CMakeLists.txt @@ -9,6 +9,6 @@ add_library(win32u MODULE ${win32u_ros_asm} ${CMAKE_CURRENT_BINARY_DIR}/win32u.def) -set_module_type(win32u win32dll) +set_module_type(win32u module) add_dependencies(win32u psdk) add_rostests_file(TARGET win32u) diff --git a/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt index 4ee130196f..38737886d0 100644 --- a/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt +++ b/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt @@ -7,5 +7,5 @@ add_library(win32u_vista MODULE ${win32u_vista_asm} ${CMAKE_CURRENT_BINARY_DIR}/win32u_vista.def) -set_module_type(win32u_vista win32dll) +set_module_type(win32u_vista module) add_dependencies(win32u_vista psdk) diff --git a/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt index 7da15784c7..6a84838435 100644 --- a/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt +++ b/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt @@ -7,5 +7,5 @@ add_library(win32u_xpsp2 MODULE ${win32u_xpsp2_asm} ${CMAKE_CURRENT_BINARY_DIR}/win32u_xpsp2.def) -set_module_type(win32u_xpsp2 win32dll) +set_module_type(win32u_xpsp2 module) add_dependencies(win32u_xpsp2 psdk)

5 years, 7 months

[reactos] 01/01: [APITESTS] Add NtGdiTransformPoints testcase (#1542)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=45bbb11a50867ae6ba726… commit 45bbb11a50867ae6ba7267866f273e27774a004e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Apr 29 09:13:22 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Apr 29 09:13:22 2019 +0900 [APITESTS] Add NtGdiTransformPoints testcase (#1542) Add a testcase for NtGdiTransformPoints function. set_module_type(win32u... win32dll) CORE-15983 --- modules/rostests/apitests/win32nt/CMakeLists.txt | 1 + .../apitests/win32nt/ntgdi/NtGdiTransformPoints.c | 364 +++++++++++++++++++++ modules/rostests/apitests/win32nt/testlist.c | 2 + .../apitests/win32u/win32u_2k3sp2/CMakeLists.txt | 2 +- .../apitests/win32u/win32u_2ksp4/CMakeLists.txt | 2 +- .../apitests/win32u/win32u_ros/CMakeLists.txt | 2 +- .../apitests/win32u/win32u_vista/CMakeLists.txt | 2 +- .../apitests/win32u/win32u_xpsp2/CMakeLists.txt | 2 +- 8 files changed, 372 insertions(+), 5 deletions(-) diff --git a/modules/rostests/apitests/win32nt/CMakeLists.txt b/modules/rostests/apitests/win32nt/CMakeLists.txt index 516e940dd3..918903b872 100644 --- a/modules/rostests/apitests/win32nt/CMakeLists.txt +++ b/modules/rostests/apitests/win32nt/CMakeLists.txt @@ -35,6 +35,7 @@ list(APPEND SOURCE ntgdi/NtGdiSelectPen.c ntgdi/NtGdiSetBitmapBits.c ntgdi/NtGdiSetDIBitsToDeviceInternal.c + ntgdi/NtGdiTransformPoints # ntuser/NtUserCallHwnd.c # ntuser/NtUserCallHwndLock.c diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiTransformPoints.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiTransformPoints.c new file mode 100644 index 0000000000..33b4dfd442 --- /dev/null +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiTransformPoints.c @@ -0,0 +1,364 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Test for NtGdiTransformPoints + * COPYRIGHT: Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#include <win32nt.h> + +START_TEST(NtGdiTransformPoints) +{ + HDC hDC; + POINT apt1[3], apt2[3]; + BOOL ret; + SIZE siz; + + /* NULL HDC */ + + SetLastError(0xDEADBEEF); + ret = NtGdiTransformPoints(NULL, NULL, NULL, 0, GdiDpToLp); + ok_int(ret, TRUE); + ok_err(0xDEADBEEF); + + SetLastError(0xDEADBEEF); + ret = NtGdiTransformPoints(NULL, NULL, NULL, 1, GdiDpToLp); + ok_int(ret, FALSE); + ok_err(0xDEADBEEF); + + SetLastError(0xDEADBEEF); + ret = NtGdiTransformPoints(NULL, apt1, NULL, 1, GdiDpToLp); + ok_int(ret, FALSE); + ok_err(0xDEADBEEF); + + SetLastError(0xDEADBEEF); + ret = NtGdiTransformPoints(NULL, NULL, apt2, 1, GdiDpToLp); + ok_int(ret, FALSE); + ok_err(0xDEADBEEF); + + SetLastError(0xDEADBEEF); + ret = NtGdiTransformPoints(NULL, apt1, apt1, 0, GdiDpToLp); + ok_int(ret, TRUE); + ok_err(0xDEADBEEF); + + SetLastError(0xDEADBEEF); + ret = NtGdiTransformPoints(NULL, apt1, apt2, 0, GdiDpToLp); + ok_int(ret, TRUE); + ok_err(0xDEADBEEF); + + SetLastError(0xDEADBEEF); + ret = NtGdiTransformPoints(NULL, apt1, apt2, 1, GdiDpToLp); + ok_int(ret, FALSE); + ok_err(0xDEADBEEF); + + /* (HDC)1 */ + + SetLastError(0xDEADBEEF); + ret = NtGdiTransformPoints((HDC)1, NULL, NULL, 0, GdiDpToLp); + ok_int(ret, TRUE); + ok_err(0xDEADBEEF); + + SetLastError(0xDEADBEEF); + ret = NtGdiTransformPoints((HDC)1, NULL, NULL, 1, GdiDpToLp); + ok_int(ret, FALSE); + ok_err(0xDEADBEEF); + + SetLastError(0xDEADBEEF); + ret = NtGdiTransformPoints((HDC)1, apt1, NULL, 1, GdiDpToLp); + ok_int(ret, FALSE); + ok_err(0xDEADBEEF); + + SetLastError(0xDEADBEEF); + ret = NtGdiTransformPoints((HDC)1, NULL, apt2, 1, GdiDpToLp); + ok_int(ret, FALSE); + ok_err(0xDEADBEEF); + + SetLastError(0xDEADBEEF); + ret = NtGdiTransformPoints((HDC)1, apt1, apt1, 0, GdiDpToLp); + ok_int(ret, TRUE); + ok_err(0xDEADBEEF); + + SetLastError(0xDEADBEEF); + ret = NtGdiTransformPoints((HDC)1, apt1, apt2, 0, GdiDpToLp); + ok_int(ret, TRUE); + ok_err(0xDEADBEEF); + + SetLastError(0xDEADBEEF); + ret = NtGdiTransformPoints((HDC)1, apt1, apt2, 1, GdiDpToLp); + ok_int(ret, FALSE); + ok_err(0xDEADBEEF); + + /* hDC */ + + hDC = CreateCompatibleDC(NULL); + ok(hDC != NULL, "hDC was NULL\n"); + + SetMapMode(hDC, MM_TEXT); + + SetLastError(0xDEADBEEF); + ret = NtGdiTransformPoints(hDC, NULL, NULL, 0, GdiDpToLp); + ok_int(ret, TRUE); + ok_err(0xDEADBEEF); + + SetLastError(0xDEADBEEF); + ret = NtGdiTransformPoints(hDC, NULL, NULL, 1, GdiDpToLp); + ok_int(ret, FALSE); + ok_err(0xDEADBEEF); + + SetLastError(0xDEADBEEF); + ret = NtGdiTransformPoints(hDC, apt1, NULL, 1, GdiDpToLp); + ok_int(ret, FALSE); + ok_err(0xDEADBEEF); + + SetLastError(0xDEADBEEF); + ret = NtGdiTransformPoints(hDC, NULL, apt2, 1, GdiDpToLp); + ok_int(ret, FALSE); + ok_err(0xDEADBEEF); + + SetLastError(0xDEADBEEF); + ret = NtGdiTransformPoints(hDC, apt1, apt1, 0, GdiDpToLp); + ok_int(ret, TRUE); + ok_err(0xDEADBEEF); + + SetLastError(0xDEADBEEF); + ret = NtGdiTransformPoints(hDC, apt1, apt2, 0, GdiDpToLp); + ok_int(ret, TRUE); + ok_err(0xDEADBEEF); + + SetLastError(0xDEADBEEF); + apt1[0].x = apt1[0].y = 256; + ret = NtGdiTransformPoints(hDC, apt1, apt1, 1, GdiDpToLp); + ok_int(ret, TRUE); + ok_err(0xDEADBEEF); + ok_long(apt1[0].x, 256); + ok_long(apt1[0].y, 256); + + SetLastError(0xDEADBEEF); + apt1[0].x = apt1[0].y = 256; + apt2[0].x = apt2[0].y = 0xBEEFDEAD; + ret = NtGdiTransformPoints(hDC, apt1, apt2, 0, GdiDpToLp); + ok_int(ret, TRUE); + ok_err(0xDEADBEEF); + ok_long(apt1[0].x, 256); + ok_long(apt1[0].y, 256); + ok_long(apt2[0].x, 0xBEEFDEAD); + ok_long(apt2[0].x, 0xBEEFDEAD); + + SetLastError(0xDEADBEEF); + apt1[0].x = apt1[0].y = 256; + apt2[0].x = apt2[0].y = 0xBEEFDEAD; + ret = NtGdiTransformPoints(hDC, apt1, apt2, 1, GdiDpToLp); + ok_int(ret, TRUE); + ok_err(0xDEADBEEF); + ok_long(apt1[0].x, 256); + ok_long(apt1[0].y, 256); + ok_long(apt2[0].x, 256); + ok_long(apt2[0].x, 256); + + /* MM_ISOTROPIC */ + + SetMapMode(hDC, MM_ISOTROPIC); + ok_int(SetWindowExtEx(hDC, 10, 10, NULL), TRUE); + ok_int(GetWindowExtEx(hDC, &siz), TRUE); + ok_long(siz.cx, 10); + ok_long(siz.cy, 10); + ok_int(SetViewportExtEx(hDC, 100, 100, NULL), TRUE); + ok_int(GetViewportExtEx(hDC, &siz), TRUE); + ok_long(siz.cx, 100); + ok_long(siz.cy, 100); + SetLastError(0xDEADBEEF); + apt1[0].x = apt1[0].y = 256; + apt2[0].x = apt2[0].y = 0xBEEFDEAD; + ret = NtGdiTransformPoints(hDC, apt1, apt2, 1, GdiDpToLp); + ok_int(ret, TRUE); + ok_err(0xDEADBEEF); + ok_long(apt1[0].x, 256); + ok_long(apt1[0].y, 256); + ok_long(apt2[0].x, 26); + ok_long(apt2[0].x, 26); + + SetMapMode(hDC, MM_ISOTROPIC); + ok_int(SetWindowExtEx(hDC, 10, 10, NULL), TRUE); + ok_int(GetWindowExtEx(hDC, &siz), TRUE); + ok_long(siz.cx, 10); + ok_long(siz.cy, 10); + ok_int(SetViewportExtEx(hDC, 20, 100, NULL), TRUE); + ok_int(GetViewportExtEx(hDC, &siz), TRUE); + ok_long(siz.cx, 20); + ok_long(siz.cy, 20); + SetLastError(0xDEADBEEF); + apt1[0].x = apt1[0].y = 256; + apt2[0].x = apt2[0].y = 0xBEEFDEAD; + ret = NtGdiTransformPoints(hDC, apt1, apt2, 1, GdiDpToLp); + ok_int(ret, TRUE); + ok_err(0xDEADBEEF); + ok_long(apt1[0].x, 256); + ok_long(apt1[0].y, 256); + ok_long(apt2[0].x, 128); + ok_long(apt2[0].x, 128); + + SetMapMode(hDC, MM_ISOTROPIC); + ok_int(SetWindowExtEx(hDC, 10, 10, NULL), TRUE); + ok_int(GetWindowExtEx(hDC, &siz), TRUE); + ok_long(siz.cx, 10); + ok_long(siz.cy, 10); + ok_int(SetViewportExtEx(hDC, 100, 0, NULL), TRUE); + ok_int(GetViewportExtEx(hDC, &siz), TRUE); + ok_long(siz.cx, 20); + ok_long(siz.cy, 20); + SetLastError(0xDEADBEEF); + apt1[0].x = apt1[0].y = 256; + apt2[0].x = apt2[0].y = 0xBEEFDEAD; + ret = NtGdiTransformPoints(hDC, apt1, apt2, 1, GdiDpToLp); + ok_int(ret, TRUE); + ok_err(0xDEADBEEF); + ok_long(apt1[0].x, 256); + ok_long(apt1[0].y, 256); + ok_long(apt2[0].x, 128); + ok_long(apt2[0].x, 128); + + SetMapMode(hDC, MM_ISOTROPIC); + ok_int(SetWindowExtEx(hDC, 10, 10, NULL), TRUE); + ok_int(GetWindowExtEx(hDC, &siz), TRUE); + ok_long(siz.cx, 10); + ok_long(siz.cy, 10); + ok_int(SetViewportExtEx(hDC, 0, 100, NULL), TRUE); + ok_int(GetViewportExtEx(hDC, &siz), TRUE); + ok_long(siz.cx, 20); + ok_long(siz.cy, 20); + SetLastError(0xDEADBEEF); + apt1[0].x = apt1[0].y = 256; + apt2[0].x = apt2[0].y = 0xBEEFDEAD; + ret = NtGdiTransformPoints(hDC, apt1, apt2, 1, GdiDpToLp); + ok_int(ret, TRUE); + ok_err(0xDEADBEEF); + ok_long(apt1[0].x, 256); + ok_long(apt1[0].y, 256); + ok_long(apt2[0].x, 128); + ok_long(apt2[0].x, 128); + + SetMapMode(hDC, MM_ISOTROPIC); + ok_int(SetWindowExtEx(hDC, 10, 10, NULL), TRUE); + ok_int(GetWindowExtEx(hDC, &siz), TRUE); + ok_long(siz.cx, 10); + ok_long(siz.cy, 10); + ok_int(SetViewportExtEx(hDC, 0, 0, NULL), TRUE); + ok_int(GetViewportExtEx(hDC, &siz), TRUE); + ok_long(siz.cx, 20); + ok_long(siz.cy, 20); + SetLastError(0xDEADBEEF); + apt1[0].x = apt1[0].y = 256; + apt2[0].x = apt2[0].y = 0xBEEFDEAD; + ret = NtGdiTransformPoints(hDC, apt1, apt2, 1, GdiDpToLp); + ok_int(ret, TRUE); + ok_err(0xDEADBEEF); + ok_long(apt1[0].x, 256); + ok_long(apt1[0].y, 256); + ok_long(apt2[0].x, 128); + ok_long(apt2[0].x, 128); + + /* MM_ANISOTROPIC */ + + SetMapMode(hDC, MM_ANISOTROPIC); + ok_int(SetWindowExtEx(hDC, 10, 10, NULL), TRUE); + ok_int(GetWindowExtEx(hDC, &siz), TRUE); + ok_long(siz.cx, 10); + ok_long(siz.cy, 10); + ok_int(SetViewportExtEx(hDC, 100, 100, NULL), TRUE); + ok_int(GetViewportExtEx(hDC, &siz), TRUE); + ok_long(siz.cx, 100); + ok_long(siz.cy, 100); + SetLastError(0xDEADBEEF); + apt1[0].x = apt1[0].y = 256; + apt2[0].x = apt2[0].y = 0xBEEFDEAD; + ret = NtGdiTransformPoints(hDC, apt1, apt2, 1, GdiDpToLp); + ok_int(ret, TRUE); + ok_err(0xDEADBEEF); + ok_long(apt1[0].x, 256); + ok_long(apt1[0].y, 256); + ok_long(apt2[0].x, 26); + ok_long(apt2[0].x, 26); + + SetMapMode(hDC, MM_ANISOTROPIC); + ok_int(SetWindowExtEx(hDC, 10, 10, NULL), TRUE); + ok_int(GetWindowExtEx(hDC, &siz), TRUE); + ok_long(siz.cx, 10); + ok_long(siz.cy, 10); + ok_int(SetViewportExtEx(hDC, 20, 100, NULL), TRUE); + ok_int(GetViewportExtEx(hDC, &siz), TRUE); + ok_long(siz.cx, 20); + ok_long(siz.cy, 100); + SetLastError(0xDEADBEEF); + apt1[0].x = apt1[0].y = 256; + apt2[0].x = apt2[0].y = 0xBEEFDEAD; + ret = NtGdiTransformPoints(hDC, apt1, apt2, 1, GdiDpToLp); + ok_int(ret, TRUE); + ok_err(0xDEADBEEF); + ok_long(apt1[0].x, 256); + ok_long(apt1[0].y, 256); + ok_long(apt2[0].x, 128); + ok_long(apt2[0].x, 128); + + SetMapMode(hDC, MM_ANISOTROPIC); + ok_int(SetWindowExtEx(hDC, 10, 10, NULL), TRUE); + ok_int(GetWindowExtEx(hDC, &siz), TRUE); + ok_long(siz.cx, 10); + ok_long(siz.cy, 10); + ok_int(SetViewportExtEx(hDC, 100, 0, NULL), TRUE); + ok_int(GetViewportExtEx(hDC, &siz), TRUE); + ok_long(siz.cx, 20); + ok_long(siz.cy, 100); + SetLastError(0xDEADBEEF); + apt1[0].x = apt1[0].y = 256; + apt2[0].x = apt2[0].y = 0xBEEFDEAD; + ret = NtGdiTransformPoints(hDC, apt1, apt2, 1, GdiDpToLp); + ok_int(ret, TRUE); + ok_err(0xDEADBEEF); + ok_long(apt1[0].x, 256); + ok_long(apt1[0].y, 256); + ok_long(apt2[0].x, 128); + ok_long(apt2[0].x, 128); + + SetMapMode(hDC, MM_ANISOTROPIC); + ok_int(SetWindowExtEx(hDC, 10, 10, NULL), TRUE); + ok_int(GetWindowExtEx(hDC, &siz), TRUE); + ok_long(siz.cx, 10); + ok_long(siz.cy, 10); + ok_int(SetViewportExtEx(hDC, 0, 100, NULL), TRUE); + ok_int(GetViewportExtEx(hDC, &siz), TRUE); + ok_long(siz.cx, 20); + ok_long(siz.cy, 100); + SetLastError(0xDEADBEEF); + apt1[0].x = apt1[0].y = 256; + apt2[0].x = apt2[0].y = 0xBEEFDEAD; + ret = NtGdiTransformPoints(hDC, apt1, apt2, 1, GdiDpToLp); + ok_int(ret, TRUE); + ok_err(0xDEADBEEF); + ok_long(apt1[0].x, 256); + ok_long(apt1[0].y, 256); + ok_long(apt2[0].x, 128); + ok_long(apt2[0].x, 128); + + SetMapMode(hDC, MM_ANISOTROPIC); + ok_int(SetWindowExtEx(hDC, 10, 10, NULL), TRUE); + ok_int(GetWindowExtEx(hDC, &siz), TRUE); + ok_long(siz.cx, 10); + ok_long(siz.cy, 10); + ok_int(SetViewportExtEx(hDC, 0, 0, NULL), TRUE); + ok_int(GetViewportExtEx(hDC, &siz), TRUE); + ok_long(siz.cx, 20); + ok_long(siz.cy, 100); + SetLastError(0xDEADBEEF); + apt1[0].x = apt1[0].y = 256; + apt2[0].x = apt2[0].y = 0xBEEFDEAD; + ret = NtGdiTransformPoints(hDC, apt1, apt2, 1, GdiDpToLp); + ok_int(ret, TRUE); + ok_err(0xDEADBEEF); + ok_long(apt1[0].x, 256); + ok_long(apt1[0].y, 256); + ok_long(apt2[0].x, 128); + ok_long(apt2[0].x, 128); + + ret = DeleteDC(hDC); + ok_int(ret, TRUE); +} diff --git a/modules/rostests/apitests/win32nt/testlist.c b/modules/rostests/apitests/win32nt/testlist.c index b262191be6..70f5611497 100644 --- a/modules/rostests/apitests/win32nt/testlist.c +++ b/modules/rostests/apitests/win32nt/testlist.c @@ -36,6 +36,7 @@ extern void func_NtGdiSelectFont(void); extern void func_NtGdiSelectPen(void); extern void func_NtGdiSetBitmapBits(void); extern void func_NtGdiSetDIBitsToDeviceInternal(void); +extern void func_NtGdiTransformPoints(void); //extern void func_NtUserCallHwnd(void); //extern void func_NtUserCallHwndLock(void); //extern void func_NtUserCallHwndOpt(void); @@ -96,6 +97,7 @@ const struct test winetest_testlist[] = { "NtGdiSelectPen", func_NtGdiSelectPen }, { "NtGdiSetBitmapBits", func_NtGdiSetBitmapBits }, { "NtGdiSetDIBitsToDeviceInternal", func_NtGdiSetDIBitsToDeviceInternal }, + { "NtGdiTransformPoints", func_NtGdiTransformPoints }, /* ntuser */ //{ "NtUserCallHwnd", func_NtUserCallHwnd }, diff --git a/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt index 021fba309c..d40ba116c0 100644 --- a/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt +++ b/modules/rostests/apitests/win32u/win32u_2k3sp2/CMakeLists.txt @@ -7,5 +7,5 @@ add_library(win32u_2k3sp2 MODULE ${win32u_2k3sp2_asm} ${CMAKE_CURRENT_BINARY_DIR}/win32u_2k3sp2.def) -set_module_type(win32u_2k3sp2 module) +set_module_type(win32u_2k3sp2 win32dll) add_dependencies(win32u_2k3sp2 psdk) diff --git a/modules/rostests/apitests/win32u/win32u_2ksp4/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_2ksp4/CMakeLists.txt index 99f1c534ed..ca8dc375af 100644 --- a/modules/rostests/apitests/win32u/win32u_2ksp4/CMakeLists.txt +++ b/modules/rostests/apitests/win32u/win32u_2ksp4/CMakeLists.txt @@ -7,5 +7,5 @@ add_library(win32u_2ksp4 MODULE ${win32ku_2ksp4_asm} ${CMAKE_CURRENT_BINARY_DIR}/win32u_2ksp4.def) -set_module_type(win32u_2ksp4 module) +set_module_type(win32u_2ksp4 win32dll) add_dependencies(win32u_2ksp4 psdk) diff --git a/modules/rostests/apitests/win32u/win32u_ros/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_ros/CMakeLists.txt index e8a8c03cf2..86b760a70d 100644 --- a/modules/rostests/apitests/win32u/win32u_ros/CMakeLists.txt +++ b/modules/rostests/apitests/win32u/win32u_ros/CMakeLists.txt @@ -9,6 +9,6 @@ add_library(win32u MODULE ${win32u_ros_asm} ${CMAKE_CURRENT_BINARY_DIR}/win32u.def) -set_module_type(win32u module) +set_module_type(win32u win32dll) add_dependencies(win32u psdk) add_rostests_file(TARGET win32u) diff --git a/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt index 38737886d0..4ee130196f 100644 --- a/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt +++ b/modules/rostests/apitests/win32u/win32u_vista/CMakeLists.txt @@ -7,5 +7,5 @@ add_library(win32u_vista MODULE ${win32u_vista_asm} ${CMAKE_CURRENT_BINARY_DIR}/win32u_vista.def) -set_module_type(win32u_vista module) +set_module_type(win32u_vista win32dll) add_dependencies(win32u_vista psdk) diff --git a/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt b/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt index 6a84838435..7da15784c7 100644 --- a/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt +++ b/modules/rostests/apitests/win32u/win32u_xpsp2/CMakeLists.txt @@ -7,5 +7,5 @@ add_library(win32u_xpsp2 MODULE ${win32u_xpsp2_asm} ${CMAKE_CURRENT_BINARY_DIR}/win32u_xpsp2.def) -set_module_type(win32u_xpsp2 module) +set_module_type(win32u_xpsp2 win32dll) add_dependencies(win32u_xpsp2 psdk)

5 years, 7 months

[reactos] 01/01: [KERNEL32_APITEST] Rename the 'Console.c' file into 'ConsoleCP.c' and its test-function as well, in order to reflect the actual name of the corresponding test.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f21f75046780b342d73ab… commit f21f75046780b342d73aba3c863327866364d7a9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 28 22:47:14 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 28 23:46:35 2019 +0200 [KERNEL32_APITEST] Rename the 'Console.c' file into 'ConsoleCP.c' and its test-function as well, in order to reflect the actual name of the corresponding test. --- modules/rostests/apitests/kernel32/CMakeLists.txt | 2 +- modules/rostests/apitests/kernel32/{Console.c => ConsoleCP.c} | 2 +- modules/rostests/apitests/kernel32/testlist.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/rostests/apitests/kernel32/CMakeLists.txt b/modules/rostests/apitests/kernel32/CMakeLists.txt index 205c9cb2ab..1b8c8314c8 100644 --- a/modules/rostests/apitests/kernel32/CMakeLists.txt +++ b/modules/rostests/apitests/kernel32/CMakeLists.txt @@ -4,7 +4,7 @@ add_subdirectory(redirptest) add_message_headers(ANSI FormatMessage.mc) list(APPEND SOURCE - Console.c + ConsoleCP.c CreateProcess.c DefaultActCtx.c DeviceIoControl.c diff --git a/modules/rostests/apitests/kernel32/Console.c b/modules/rostests/apitests/kernel32/ConsoleCP.c similarity index 99% rename from modules/rostests/apitests/kernel32/Console.c rename to modules/rostests/apitests/kernel32/ConsoleCP.c index 21dfd4b9e7..5d12bd88c5 100644 --- a/modules/rostests/apitests/kernel32/Console.c +++ b/modules/rostests/apitests/kernel32/ConsoleCP.c @@ -446,7 +446,7 @@ static void test_cp932(HANDLE hConOut) SetConsoleOutputCP(oldcp); } -START_TEST(Console) +START_TEST(ConsoleCP) { HANDLE hConIn, hConOut; FreeConsole(); diff --git a/modules/rostests/apitests/kernel32/testlist.c b/modules/rostests/apitests/kernel32/testlist.c index 469926aa11..1a15572f98 100644 --- a/modules/rostests/apitests/kernel32/testlist.c +++ b/modules/rostests/apitests/kernel32/testlist.c @@ -3,7 +3,7 @@ #define STANDALONE #include <apitest.h> -extern void func_Console(void); +extern void func_ConsoleCP(void); extern void func_CreateProcess(void); extern void func_DefaultActCtx(void); extern void func_DeviceIoControl(void); @@ -36,7 +36,7 @@ extern void func_WideCharToMultiByte(void); const struct test winetest_testlist[] = { - { "ConsoleCP", func_Console }, + { "ConsoleCP", func_ConsoleCP }, { "CreateProcess", func_CreateProcess }, { "DefaultActCtx", func_DefaultActCtx }, { "DeviceIoControl", func_DeviceIoControl },

5 years, 7 months

[reactos] 03/03: Add a shared "port" directory for POSIX functions needed by multiple host tools (getopt/mkstemps) and import the one and only getopt from glibc.

by Colin Finck

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c11c411153eea31d1002… commit 2c11c411153eea31d10025dddf7332ce641be629 Author: Colin Finck <colin(a)reactos.org> AuthorDate: Sat Apr 27 16:19:26 2019 +0200 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Sun Apr 28 23:23:06 2019 +0200 Add a shared "port" directory for POSIX functions needed by multiple host tools (getopt/mkstemps) and import the one and only getopt from glibc. This finally fixes our duplicated getopt functions from different sources and gives us an up to date and the most compatible implementation. isohybrid actually relies on a glibc-specific getopt behavior that we previously hacked into the reactos_support_code.c implementation derived from BSD/mingw-w64. widl also needs getopt and previously used an even older BSD-derived code. --- sdk/tools/hhpcomp/CMakeLists.txt | 2 +- sdk/tools/hhpcomp/chmc/chmc.c | 15 +- sdk/tools/hhpcomp/port/config.h | 7 - sdk/tools/isohybrid/CMakeLists.txt | 4 +- sdk/tools/isohybrid/reactos_support_code.c | 490 --------------- sdk/tools/isohybrid/reactos_support_code.h | 26 +- sdk/tools/port/bits/getopt_core.h | 91 +++ sdk/tools/port/bits/getopt_ext.h | 71 +++ sdk/tools/port/getopt.c | 808 +++++++++++++++++++++++++ sdk/tools/port/getopt.h | 36 ++ sdk/tools/port/getopt1.c | 155 +++++ sdk/tools/port/getopt_int.h | 118 ++++ sdk/tools/{hhpcomp => }/port/mkstemps.c | 17 +- sdk/tools/port/port.h | 5 + sdk/tools/widl/CMakeLists.txt | 6 +- sdk/tools/widl/getopt.c | 915 ----------------------------- sdk/tools/widl/port/config.h | 15 - sdk/tools/widl/port/mkstemps.c | 139 ----- 18 files changed, 1305 insertions(+), 1615 deletions(-) diff --git a/sdk/tools/hhpcomp/CMakeLists.txt b/sdk/tools/hhpcomp/CMakeLists.txt index 8e073ff12e..fa8a7c6f00 100644 --- a/sdk/tools/hhpcomp/CMakeLists.txt +++ b/sdk/tools/hhpcomp/CMakeLists.txt @@ -7,7 +7,7 @@ list(APPEND SOURCE chmc/err.c lzx_compress/lz_nonslide.c lzx_compress/lzx_layer.c - port/mkstemps.c) + ../port/mkstemps.c) # used by lzx_compress add_definitions(-DNONSLIDE) diff --git a/sdk/tools/hhpcomp/chmc/chmc.c b/sdk/tools/hhpcomp/chmc/chmc.c index 934bfba417..f96ff11673 100644 --- a/sdk/tools/hhpcomp/chmc/chmc.c +++ b/sdk/tools/hhpcomp/chmc/chmc.c @@ -26,20 +26,15 @@ #include <string.h> #include <assert.h> -#if defined(_WIN32) || defined(__APPLE__) #include <stdlib.h> #include <sys/types.h> #include <sys/stat.h> -#ifdef __REACTOS__ -#include <io.h> -int mkstemps(char* template, int suffix_len); -#endif /* __REACTOS__ */ +#include "../../port/port.h" + +#ifdef _WIN32 + #include <io.h> #else -#ifdef __REACTOS__ -#include <sys/types.h> -#include <sys/stat.h> -#endif /* __REACTOS__ */ -#include <unistd.h> + #include <unistd.h> #endif #include "err.h" diff --git a/sdk/tools/hhpcomp/port/config.h b/sdk/tools/hhpcomp/port/config.h deleted file mode 100644 index 74ef33dafe..0000000000 --- a/sdk/tools/hhpcomp/port/config.h +++ /dev/null @@ -1,7 +0,0 @@ - -#pragma once - -#if defined(_WIN32) -#include <io.h> -#define HAVE_PROCESS_H 1 -#endif diff --git a/sdk/tools/isohybrid/CMakeLists.txt b/sdk/tools/isohybrid/CMakeLists.txt index 13b57e1aff..06a09bc229 100644 --- a/sdk/tools/isohybrid/CMakeLists.txt +++ b/sdk/tools/isohybrid/CMakeLists.txt @@ -4,4 +4,6 @@ add_definitions( add_host_tool(isohybrid isohybrid.c - reactos_support_code.c) + reactos_support_code.c + ../port/getopt.c + ../port/getopt1.c) diff --git a/sdk/tools/isohybrid/reactos_support_code.c b/sdk/tools/isohybrid/reactos_support_code.c index aa9f2a4261..bc87cd36b3 100644 --- a/sdk/tools/isohybrid/reactos_support_code.c +++ b/sdk/tools/isohybrid/reactos_support_code.c @@ -21,496 +21,6 @@ isohybrid_warning(const char *fmt, ...) va_end(ap); } -///////////////////////////////////////////////////////////////////////////// -// getopt code from mingw-w64 -///////////////////////////////////////////////////////////////////////////// -/* $OpenBSD: getopt_long.c,v 1.23 2007/10/31 12:34:57 chl Exp $ */ -/* $NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $ */ - -/* - * Copyright (c) 2002 Todd C. Miller <Todd.Miller(a)courtesan.com> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Sponsored in part by the Defense Advanced Research Projects - * Agency (DARPA) and Air Force Research Laboratory, Air Force - * Materiel Command, USAF, under agreement number F39502-99-1-0512. - */ -/*- - * Copyright (c) 2000 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Dieter Baron and Thomas Klausner. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ -int opterr = 1; /* if error message should be printed */ -int optind = 1; /* index into parent argv vector */ - -///// REACTOS ONLY: optopt set to 0 by default, because isohybrid needs this -int optopt = 0; /* character checked for validity */ - -int optreset; /* reset getopt */ -char *optarg; /* argument associated with option */ - -#define PRINT_ERROR ((opterr) && (*options != ':')) - -#define FLAG_PERMUTE 0x01 /* permute non-options to the end of argv */ -#define FLAG_ALLARGS 0x02 /* treat non-options as args to option "-1" */ -#define FLAG_LONGONLY 0x04 /* operate as getopt_long_only */ - -/* return values */ -#define BADCH (int)'?' -#define BADARG ((*options == ':') ? (int)':' : (int)'?') -#define INORDER (int)1 - -#define EMSG "" - -static char *place = EMSG; /* option letter processing */ - -/* XXX: set optreset to 1 rather than these two */ -static int nonopt_start = -1; /* first non option argument (for permute) */ -static int nonopt_end = -1; /* first option after non options (for permute) */ - -/* Error messages */ -static const char recargchar[] = "option requires an argument -- %c"; -static const char recargstring[] = "option requires an argument -- %s"; -static const char ambig[] = "ambiguous option -- %.*s"; -static const char noarg[] = "option doesn't take an argument -- %.*s"; -static const char illoptchar[] = "unknown option -- %c"; -static const char illoptstring[] = "unknown option -- %s"; - -/* -* Compute the greatest common divisor of a and b. -*/ -static int -gcd(int a, int b) -{ - int c; - - c = a % b; - while (c != 0) { - a = b; - b = c; - c = a % b; - } - - return (b); -} - -/* -* Exchange the block from nonopt_start to nonopt_end with the block -* from nonopt_end to opt_end (keeping the same order of arguments -* in each block). -*/ -static void -permute_args(int panonopt_start, int panonopt_end, int opt_end, -char * const *nargv) -{ - int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos; - char *swap; - - /* - * compute lengths of blocks and number and size of cycles - */ - nnonopts = panonopt_end - panonopt_start; - nopts = opt_end - panonopt_end; - ncycle = gcd(nnonopts, nopts); - cyclelen = (opt_end - panonopt_start) / ncycle; - - for (i = 0; i < ncycle; i++) { - cstart = panonopt_end + i; - pos = cstart; - for (j = 0; j < cyclelen; j++) { - if (pos >= panonopt_end) - pos -= nnonopts; - else - pos += nopts; - swap = nargv[pos]; - /* LINTED const cast */ - ((char **)nargv)[pos] = nargv[cstart]; - /* LINTED const cast */ - ((char **)nargv)[cstart] = swap; - } - } -} - -/* -* parse_long_options -- -* Parse long options in argc/argv argument vector. -* Returns -1 if short_too is set and the option does not match long_options. -*/ -static int -parse_long_options(char * const *nargv, const char *options, -const struct option *long_options, int *idx, int short_too) -{ - char *current_argv, *has_equal; - size_t current_argv_len; - int i, ambiguous, match; - -#define IDENTICAL_INTERPRETATION(_x, _y) \ - (long_options[(_x)].has_arg == long_options[(_y)].has_arg && \ - long_options[(_x)].flag == long_options[(_y)].flag && \ - long_options[(_x)].val == long_options[(_y)].val) - - current_argv = place; - match = -1; - ambiguous = 0; - - optind++; - - if ((has_equal = strchr(current_argv, '=')) != NULL) { - /* argument found (--option=arg) */ - current_argv_len = has_equal - current_argv; - has_equal++; - } - else - current_argv_len = strlen(current_argv); - - for (i = 0; long_options[i].name; i++) { - /* find matching long option */ - if (strncmp(current_argv, long_options[i].name, - current_argv_len)) - continue; - - if (strlen(long_options[i].name) == current_argv_len) { - /* exact match */ - match = i; - ambiguous = 0; - break; - } - /* - * If this is a known short option, don't allow - * a partial match of a single character. - */ - if (short_too && current_argv_len == 1) - continue; - - if (match == -1) /* partial match */ - match = i; - else if (!IDENTICAL_INTERPRETATION(i, match)) - ambiguous = 1; - } - if (ambiguous) { - /* ambiguous abbreviation */ - if (PRINT_ERROR) - warnx(ambig, (int)current_argv_len, - current_argv); - optopt = 0; - return (BADCH); - } - if (match != -1) { /* option found */ - if (long_options[match].has_arg == no_argument - && has_equal) { - if (PRINT_ERROR) - warnx(noarg, (int)current_argv_len, - current_argv); - /* - * XXX: GNU sets optopt to val regardless of flag - */ - if (long_options[match].flag == NULL) - optopt = long_options[match].val; - else - optopt = 0; - return (BADARG); - } - if (long_options[match].has_arg == required_argument || - long_options[match].has_arg == optional_argument) { - if (has_equal) - optarg = has_equal; - else if (long_options[match].has_arg == - required_argument) { - /* - * optional argument doesn't use next nargv - */ - optarg = nargv[optind++]; - } - } - if ((long_options[match].has_arg == required_argument) - && (optarg == NULL)) { - /* - * Missing argument; leading ':' indicates no error - * should be generated. - */ - if (PRINT_ERROR) - warnx(recargstring, - current_argv); - /* - * XXX: GNU sets optopt to val regardless of flag - */ - if (long_options[match].flag == NULL) - optopt = long_options[match].val; - else - optopt = 0; - --optind; - return (BADARG); - } - } - else { /* unknown option */ - if (short_too) { - --optind; - return (-1); - } - if (PRINT_ERROR) - warnx(illoptstring, current_argv); - optopt = 0; - return (BADCH); - } - if (idx) - *idx = match; - if (long_options[match].flag) { - *long_options[match].flag = long_options[match].val; - return (0); - } - else - return (long_options[match].val); -#undef IDENTICAL_INTERPRETATION -} - -/* -* getopt_internal -- -* Parse argc/argv argument vector. Called by user level routines. -*/ -static int -getopt_internal(int nargc, char * const *nargv, const char *options, -const struct option *long_options, int *idx, int flags) -{ - char *oli; /* option letter list index */ - int optchar, short_too; - static int posixly_correct = -1; - - if (options == NULL) - return (-1); - - /* - * XXX Some GNU programs (like cvs) set optind to 0 instead of - * XXX using optreset. Work around this braindamage. - */ - if (optind == 0) - optind = optreset = 1; - - /* - * Disable GNU extensions if POSIXLY_CORRECT is set or options - * string begins with a '+'. - * - * CV, 2009-12-14: Check POSIXLY_CORRECT anew if optind == 0 or - * optreset != 0 for GNU compatibility. - */ - if (posixly_correct == -1 || optreset != 0) - posixly_correct = (getenv("POSIXLY_CORRECT") != NULL); - if (*options == '-') - flags |= FLAG_ALLARGS; - else if (posixly_correct || *options == '+') - flags &= ~FLAG_PERMUTE; - if (*options == '+' || *options == '-') - options++; - - optarg = NULL; - if (optreset) - nonopt_start = nonopt_end = -1; -start: - if (optreset || !*place) { /* update scanning pointer */ - optreset = 0; - if (optind >= nargc) { /* end of argument vector */ - place = EMSG; - if (nonopt_end != -1) { - /* do permutation, if we have to */ - permute_args(nonopt_start, nonopt_end, - optind, nargv); - optind -= nonopt_end - nonopt_start; - } - else if (nonopt_start != -1) { - /* - * If we skipped non-options, set optind - * to the first of them. - */ - optind = nonopt_start; - } - nonopt_start = nonopt_end = -1; - return (-1); - } - if (*(place = nargv[optind]) != '-' || - (place[1] == '\0' && strchr(options, '-') == NULL)) { - place = EMSG; /* found non-option */ - if (flags & FLAG_ALLARGS) { - /* - * GNU extension: - * return non-option as argument to option 1 - */ - optarg = nargv[optind++]; - return (INORDER); - } - if (!(flags & FLAG_PERMUTE)) { - /* - * If no permutation wanted, stop parsing - * at first non-option. - */ - return (-1); - } - /* do permutation */ - if (nonopt_start == -1) - nonopt_start = optind; - else if (nonopt_end != -1) { - permute_args(nonopt_start, nonopt_end, - optind, nargv); - nonopt_start = optind - - (nonopt_end - nonopt_start); - nonopt_end = -1; - } - optind++; - /* process next argument */ - goto start; - } - if (nonopt_start != -1 && nonopt_end == -1) - nonopt_end = optind; - - /* - * If we have "-" do nothing, if "--" we are done. - */ - if (place[1] != '\0' && *++place == '-' && place[1] == '\0') { - optind++; - place = EMSG; - /* - * We found an option (--), so if we skipped - * non-options, we have to permute. - */ - if (nonopt_end != -1) { - permute_args(nonopt_start, nonopt_end, - optind, nargv); - optind -= nonopt_end - nonopt_start; - } - nonopt_start = nonopt_end = -1; - return (-1); - } - } - - /* - * Check long options if: - * 1) we were passed some - * 2) the arg is not just "-" - * 3) either the arg starts with -- we are getopt_long_only() - */ - if (long_options != NULL && place != nargv[optind] && - (*place == '-' || (flags & FLAG_LONGONLY))) { - short_too = 0; - if (*place == '-') - place++; /* --foo long option */ - else if (*place != ':' && strchr(options, *place) != NULL) - short_too = 1; /* could be short option too */ - - optchar = parse_long_options(nargv, options, long_options, - idx, short_too); - if (optchar != -1) { - place = EMSG; - return (optchar); - } - } - - if ((optchar = (int)*place++) == (int)':' || - (optchar == (int)'-' && *place != '\0') || - (oli = strchr(options, optchar)) == NULL) { - /* - * If the user specified "-" and '-' isn't listed in - * options, return -1 (non-option) as per POSIX. - * Otherwise, it is an unknown option character (or ':'). - */ - if (optchar == (int)'-' && *place == '\0') - return (-1); - if (!*place) - ++optind; - if (PRINT_ERROR) - warnx(illoptchar, optchar); - optopt = optchar; - return (BADCH); - } - if (long_options != NULL && optchar == 'W' && oli[1] == ';') { - /* -W long-option */ - if (*place) /* no space */ - /* NOTHING */; - else if (++optind >= nargc) { /* no arg */ - place = EMSG; - if (PRINT_ERROR) - warnx(recargchar, optchar); - optopt = optchar; - return (BADARG); - } - else /* white space */ - place = nargv[optind]; - optchar = parse_long_options(nargv, options, long_options, - idx, 0); - place = EMSG; - return (optchar); - } - if (*++oli != ':') { /* doesn't take argument */ - if (!*place) - ++optind; - } - else { /* takes (optional) argument */ - optarg = NULL; - if (*place) /* no white space */ - optarg = place; - else if (oli[1] != ':') { /* arg not optional */ - if (++optind >= nargc) { /* no arg */ - place = EMSG; - if (PRINT_ERROR) - warnx(recargchar, optchar); - optopt = optchar; - return (BADARG); - } - else - optarg = nargv[optind]; - } - place = EMSG; - ++optind; - } - /* dump back option letter */ - return (optchar); -} - -/* -* getopt_long_only -- -* Parse argc/argv argument vector. -*/ -int -getopt_long_only(int nargc, char * const *nargv, const char *options, -const struct option *long_options, int *idx) -{ - - return (getopt_internal(nargc, nargv, options, long_options, idx, - FLAG_PERMUTE | FLAG_LONGONLY)); -} -///////////////////////////////////////////////////////////////////////////// - #ifdef _WIN32 int fsync(int fd) diff --git a/sdk/tools/isohybrid/reactos_support_code.h b/sdk/tools/isohybrid/reactos_support_code.h index 591ace9e4b..91735aec1c 100644 --- a/sdk/tools/isohybrid/reactos_support_code.h +++ b/sdk/tools/isohybrid/reactos_support_code.h @@ -16,6 +16,8 @@ #include <unistd.h> #endif +#include "../port/port.h" + // isotypes.h would provide these, but it's not available on MSVC < 2013. typedef unsigned char uint8_t; typedef unsigned short uint16_t; @@ -31,30 +33,6 @@ void isohybrid_warning(const char* fmt, ...); #define warnx(...) isohybrid_warning(__VA_ARGS__) -///////////////////////////////////////////////////////////////////////////// -// getopt code from mingw-w64 -///////////////////////////////////////////////////////////////////////////// -extern int optopt; /* single option character, as parsed */ -extern char *optarg; /* pointer to argument of current option */ - -struct option /* specification for a long form option... */ -{ - const char *name; /* option name, without leading hyphens */ - int has_arg; /* does it take an argument? */ - int *flag; /* where to save its status, or NULL */ - int val; /* its associated status value */ -}; - -enum /* permitted values for its `has_arg' field... */ -{ - no_argument = 0, /* option never takes an argument */ - required_argument, /* option always requires an argument */ - optional_argument /* option may take an argument */ -}; - -int getopt_long_only(int nargc, char * const *nargv, const char *options, const struct option *long_options, int *idx); -///////////////////////////////////////////////////////////////////////////// - #ifdef _WIN32 int fsync(int fd); int getppid(void); diff --git a/sdk/tools/port/bits/getopt_core.h b/sdk/tools/port/bits/getopt_core.h new file mode 100644 index 0000000000..8736f4bb43 --- /dev/null +++ b/sdk/tools/port/bits/getopt_core.h @@ -0,0 +1,91 @@ +/* Declarations for getopt (basic, portable features only). + Copyright (C) 1989-2019 Free Software Foundation, Inc. + This file is part of the GNU C Library and is also part of gnulib. + Patches to this file should be submitted to both projects. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#ifndef _GETOPT_CORE_H +#define _GETOPT_CORE_H 1 + +/* This header should not be used directly; include getopt.h or + unistd.h instead. Unlike most bits headers, it does not have + a protective #error, because the guard macro for getopt.h in + gnulib is not fixed. */ + +/* For communication from 'getopt' to the caller. + When 'getopt' finds an option that takes an argument, + the argument value is returned here. + Also, when 'ordering' is RETURN_IN_ORDER, + each non-option ARGV-element is returned here. */ + +extern char *optarg; + +/* Index in ARGV of the next element to be scanned. + This is used for communication to and from the caller + and for communication between successive calls to 'getopt'. + + On entry to 'getopt', zero means this is the first call; initialize. + + When 'getopt' returns -1, this is the index of the first of the + non-option elements that the caller should itself scan. + + Otherwise, 'optind' communicates from one call to the next + how much of ARGV has been scanned so far. */ + +extern int optind; + +/* Callers store zero here to inhibit the error message 'getopt' prints + for unrecognized options. */ + +extern int opterr; + +/* Set to an option character which was unrecognized. */ + +extern int optopt; + +/* Get definitions and prototypes for functions to process the + arguments in ARGV (ARGC of them, minus the program name) for + options given in OPTS. + + Return the option character from OPTS just read. Return -1 when + there are no more options. For unrecognized options, or options + missing arguments, 'optopt' is set to the option letter, and '?' is + returned. + + The OPTS string is a list of characters which are recognized option + letters, optionally followed by colons, specifying that that letter + takes an argument, to be placed in 'optarg'. + + If a letter in OPTS is followed by two colons, its argument is + optional. This behavior is specific to the GNU 'getopt'. + + The argument '--' causes premature termination of argument + scanning, explicitly telling 'getopt' that there are no more + options. + + If OPTS begins with '-', then non-option arguments are treated as + arguments to the option '\1'. This behavior is specific to the GNU + 'getopt'. If OPTS begins with '+', or POSIXLY_CORRECT is set in + the environment, then do not permute arguments. + + For standards compliance, the 'argv' argument has the type + char *const *, but this is inaccurate; if argument permutation is + enabled, the argv array (not the strings it points to) must be + writable. */ + +extern int getopt (int ___argc, char *const *___argv, const char *__shortopts); + +#endif /* getopt_core.h */ diff --git a/sdk/tools/port/bits/getopt_ext.h b/sdk/tools/port/bits/getopt_ext.h new file mode 100644 index 0000000000..bb89d6ee2c --- /dev/null +++ b/sdk/tools/port/bits/getopt_ext.h @@ -0,0 +1,71 @@ +/* Declarations for getopt (GNU extensions). + Copyright (C) 1989-2019 Free Software Foundation, Inc. + This file is part of the GNU C Library and is also part of gnulib. + Patches to this file should be submitted to both projects. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#ifndef _GETOPT_EXT_H +#define _GETOPT_EXT_H 1 + +/* This header should not be used directly; include getopt.h instead. + Unlike most bits headers, it does not have a protective #error, + because the guard macro for getopt.h in gnulib is not fixed. */ + +/* Describe the long-named options requested by the application. + The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector + of 'struct option' terminated by an element containing a name which is + zero. + + The field 'has_arg' is: + no_argument (or 0) if the option does not take an argument, + required_argument (or 1) if the option requires an argument, + optional_argument (or 2) if the option takes an optional argument. + + If the field 'flag' is not NULL, it points to a variable that is set + to the value given in the field 'val' when the option is found, but + left unchanged if the option is not found. + + To have a long-named option do something other than set an 'int' to + a compiled-in constant, such as set a value from 'optarg', set the + option's 'flag' field to zero and its 'val' field to a nonzero + value (the equivalent single-letter option character, if there is + one). For long options that have a zero 'flag' field, 'getopt' + returns the contents of the 'val' field. */ + +struct option +{ + const char *name; + /* has_arg can't be an enum because some compilers complain about + type mismatches in all the code that assumes it is an int. */ + int has_arg; + int *flag; + int val; +}; + +/* Names for the values of the 'has_arg' field of 'struct option'. */ + +#define no_argument 0 +#define required_argument 1 +#define optional_argument 2 + +extern int getopt_long (int ___argc, char *__getopt_argv_const *___argv, + const char *__shortopts, + const struct option *__longopts, int *__longind); +extern int getopt_long_only (int ___argc, char *__getopt_argv_const *___argv, + const char *__shortopts, + const struct option *__longopts, int *__longind); + +#endif /* getopt_ext.h */ diff --git a/sdk/tools/port/getopt.c b/sdk/tools/port/getopt.c new file mode 100644 index 0000000000..1613acafad --- /dev/null +++ b/sdk/tools/port/getopt.c @@ -0,0 +1,808 @@ +/* Getopt for GNU. + Copyright (C) 1987-2019 Free Software Foundation, Inc. + This file is part of the GNU C Library and is also part of gnulib. + Patches to this file should be submitted to both projects. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#include "getopt.h" + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#ifndef _WIN32 +#include <unistd.h> +#endif + +#ifdef _LIBC +/* When used as part of glibc, error printing must be done differently + for standards compliance. getopt is not a cancellation point, so + it must not call functions that are, and it is specified by an + older standard than stdio locking, so it must not refer to + functions in the "user namespace" related to stdio locking. + Finally, it must use glibc's internal message translation so that + the messages are looked up in the proper text domain. */ +# include <libintl.h> +# define fprintf __fxprintf_nocancel +# define flockfile(fp) _IO_flockfile (fp) +# define funlockfile(fp) _IO_funlockfile (fp) +#else +# define _(msgid) (msgid) +/* When used standalone, flockfile and funlockfile might not be + available. */ +# ifndef _POSIX_THREAD_SAFE_FUNCTIONS +# define flockfile(fp) /* nop */ +# define funlockfile(fp) /* nop */ +# endif +/* When used standalone, do not attempt to use alloca. */ +# define __libc_use_alloca(size) 0 +# undef alloca +# define alloca(size) (abort (), (void *)0) +#endif + +/* This implementation of 'getopt' has three modes for handling + options interspersed with non-option arguments. It can stop + scanning for options at the first non-option argument encountered, + as POSIX specifies. It can continue scanning for options after the + first non-option argument, but permute 'argv' as it goes so that, + after 'getopt' is done, all the options precede all the non-option + arguments and 'optind' points to the first non-option argument. + Or, it can report non-option arguments as if they were arguments to + the option character '\x01'. + + The default behavior of 'getopt_long' is to permute the argument list. + When this implementation is used standalone, the default behavior of + 'getopt' is to stop at the first non-option argument, but when it is + used as part of GNU libc it also permutes the argument list. In both + cases, setting the environment variable POSIXLY_CORRECT to any value + disables permutation. + + If the first character of the OPTSTRING argument to 'getopt' or + 'getopt_long' is '+', both functions will stop at the first + non-option argument. If it is '-', both functions will report + non-option arguments as arguments to the option character '\x01'. */ + +#include "getopt_int.h" + +/* For communication from 'getopt' to the caller. + When 'getopt' finds an option that takes an argument, + the argument value is returned here. + Also, when 'ordering' is RETURN_IN_ORDER, + each non-option ARGV-element is returned here. */ + +char *optarg; + +/* Index in ARGV of the next element to be scanned. + This is used for communication to and from the caller + and for communication between successive calls to 'getopt'. + + On entry to 'getopt', zero means this is the first call; initialize. + + When 'getopt' returns -1, this is the index of the first of the + non-option elements that the caller should itself scan. + + Otherwise, 'optind' communicates from one call to the next + how much of ARGV has been scanned so far. */ + +/* 1003.2 says this must be 1 before any call. */ +int optind = 1; + +/* Callers store zero here to inhibit the error message + for unrecognized options. */ + +int opterr = 1; + +/* Set to an option character which was unrecognized. + This must be initialized on some systems to avoid linking in the + system's own getopt implementation. */ + +int optopt = '?'; + +/* Keep a global copy of all internal members of getopt_data. */ + +static struct _getopt_data getopt_data; + +/* Exchange two adjacent subsequences of ARGV. + One subsequence is elements [first_nonopt,last_nonopt) + which contains all the non-options that have been skipped so far. + The other is elements [last_nonopt,optind), which contains all + the options processed since those non-options were skipped. + + 'first_nonopt' and 'last_nonopt' are relocated so that they describe + the new indices of the non-options in ARGV after they are moved. */ + +static void +exchange (char **argv, struct _getopt_data *d) +{ + int bottom = d->__first_nonopt; + int middle = d->__last_nonopt; + int top = d->optind; + char *tem; + + /* Exchange the shorter segment with the far end of the longer segment. + That puts the shorter segment into the right place. + It leaves the longer segment in the right place overall, + but it consists of two parts that need to be swapped next. */ + + while (top > middle && middle > bottom) + { + if (top - middle > middle - bottom) + { + /* Bottom segment is the short one. */ + int len = middle - bottom; + int i; + + /* Swap it with the top part of the top segment. */ + for (i = 0; i < len; i++) + { + tem = argv[bottom + i]; + argv[bottom + i] = argv[top - (middle - bottom) + i]; + argv[top - (middle - bottom) + i] = tem; + } + /* Exclude the moved bottom segment from further swapping. */ + top -= len; + } + else + { + /* Top segment is the short one. */ + int len = top - middle; + int i; + + /* Swap it with the bottom part of the bottom segment. */ + for (i = 0; i < len; i++) + { + tem = argv[bottom + i]; + argv[bottom + i] = argv[middle + i]; + argv[middle + i] = tem; + } + /* Exclude the moved top segment from further swapping. */ + bottom += len; + } + } + + /* Update records for the slots the non-options now occupy. */ + + d->__first_nonopt += (d->optind - d->__last_nonopt); + d->__last_nonopt = d->optind; +} + +/* Process the argument starting with d->__nextchar as a long option. + d->optind should *not* have been advanced over this argument. + + If the value returned is -1, it was not actually a long option, the + state is unchanged, and the argument should be processed as a set + of short options (this can only happen when long_only is true). + Otherwise, the option (and its argument, if any) have been consumed + and the return value is the value to return from _getopt_internal_r. */ +static int +process_long_option (int argc, char **argv, const char *optstring, + const struct option *longopts, int *longind, + int long_only, struct _getopt_data *d, + int print_errors, const char *prefix) +{ + char *nameend; + size_t namelen; + const struct option *p; + const struct option *pfound = NULL; + int n_options; + int option_index; + + for (nameend = d->__nextchar; *nameend && *nameend != '='; nameend++) + /* Do nothing. */ ; + namelen = nameend - d->__nextchar; + + /* First look for an exact match, counting the options as a side + effect. */ + for (p = longopts, n_options = 0; p->name; p++, n_options++) + if (!strncmp (p->name, d->__nextchar, namelen) + && namelen == strlen (p->name)) + { + /* Exact match found. */ + pfound = p; + option_index = n_options; + break; + } + + if (pfound == NULL) + { + /* Didn't find an exact match, so look for abbreviations. */ + unsigned char *ambig_set = NULL; + int ambig_malloced = 0; + int ambig_fallback = 0; + int indfound = -1; + + for (p = longopts, option_index = 0; p->name; p++, option_index++) + if (!strncmp (p->name, d->__nextchar, namelen)) + { + if (pfound == NULL) + { + /* First nonexact match found. */ + pfound = p; + indfound = option_index; + } + else if (long_only + || pfound->has_arg != p->has_arg + || pfound->flag != p->flag + || pfound->val != p->val) + { + /* Second or later nonexact match found. */ + if (!ambig_fallback) + { + if (!print_errors) + /* Don't waste effort tracking the ambig set if + we're not going to print it anyway. */ + ambig_fallback = 1; + else if (!ambig_set) + { + if (__libc_use_alloca (n_options)) + ambig_set = alloca (n_options); + else if ((ambig_set = malloc (n_options)) == NULL) + /* Fall back to simpler error message. */ + ambig_fallback = 1; + else + ambig_malloced = 1; + + if (ambig_set) + { + memset (ambig_set, 0, n_options); + ambig_set[indfound] = 1; + } + } + if (ambig_set) + ambig_set[option_index] = 1; + } + } + } + + if (ambig_set || ambig_fallback) + { + if (print_errors) + { + if (ambig_fallback) + fprintf (stderr, _("%s: option '%s%s' is ambiguous\n"), + argv[0], prefix, d->__nextchar); + else + { + flockfile (stderr); + fprintf (stderr, + _("%s: option '%s%s' is ambiguous; possibilities:"), + argv[0], prefix, d->__nextchar); + + for (option_index = 0; option_index < n_options; option_index++) + if (ambig_set[option_index]) + fprintf (stderr, " '%s%s'", + prefix, longopts[option_index].name); + + /* This must use 'fprintf' even though it's only + printing a single character, so that it goes through + __fxprintf_nocancel when compiled as part of glibc. */ + fprintf (stderr, "\n"); + funlockfile (stderr); + } + } + if (ambig_malloced) + free (ambig_set); + d->__nextchar += strlen (d->__nextchar); + d->optind++; + d->optopt = 0; + return '?'; + } + + option_index = indfound; + } + + if (pfound == NULL) + { + /* Can't find it as a long option. If this is not getopt_long_only, + or the option starts with '--' or is not a valid short option, + then it's an error. */ + if (!long_only || argv[d->optind][1] == '-' + || strchr (optstring, *d->__nextchar) == NULL) + { + if (print_errors) + fprintf (stderr, _("%s: unrecognized option '%s%s'\n"), + argv[0], prefix, d->__nextchar); + + d->__nextchar = NULL; + d->optind++; + d->optopt = 0; + return '?'; + } + + /* Otherwise interpret it as a short option. */ + return -1; + } + + /* We have found a matching long option. Consume it. */ + d->optind++; + d->__nextchar = NULL; + if (*nameend) + { + /* Don't test has_arg with >, because some C compilers don't + allow it to be used on enums. */ + if (pfound->has_arg) + d->optarg = nameend + 1; + else + { + if (print_errors) + fprintf (stderr, + _("%s: option '%s%s' doesn't allow an argument\n"), + argv[0], prefix, pfound->name); + + d->optopt = pfound->val; + return '?'; + } + } + else if (pfound->has_arg == 1) + { + if (d->optind < argc) + d->optarg = argv[d->optind++]; + else + { + if (print_errors) + fprintf (stderr, + _("%s: option '%s%s' requires an argument\n"), + argv[0], prefix, pfound->name); + + d->optopt = pfound->val; + return optstring[0] == ':' ? ':' : '?'; + } + } + + if (longind != NULL) + *longind = option_index; + if (pfound->flag) + { + *(pfound->flag) = pfound->val; + return 0; + } + return pfound->val; +} + +/* Initialize internal data upon the first call to getopt. */ + +static const char * +_getopt_initialize (int argc, + char **argv, const char *optstring, + struct _getopt_data *d, int posixly_correct) +{ + /* Start processing options with ARGV-element 1 (since ARGV-element 0 + is the program name); the sequence of previously skipped + non-option ARGV-elements is empty. */ + if (d->optind == 0) + d->optind = 1; + + d->__first_nonopt = d->__last_nonopt = d->optind; + d->__nextchar = NULL; + + /* Determine how to handle the ordering of options and nonoptions. */ + if (optstring[0] == '-') + { + d->__ordering = RETURN_IN_ORDER; + ++optstring; + } + else if (optstring[0] == '+') + { + d->__ordering = REQUIRE_ORDER; + ++optstring; + } + else if (posixly_correct || !!getenv ("POSIXLY_CORRECT")) + d->__ordering = REQUIRE_ORDER; + else + d->__ordering = PERMUTE; + + d->__initialized = 1; + return optstring; +} + +/* Scan elements of ARGV (whose length is ARGC) for option characters + given in OPTSTRING. + + If an element of ARGV starts with '-', and is not exactly "-" or "--", + then it is an option element. The characters of this element + (aside from the initial '-') are option characters. If 'getopt' + is called repeatedly, it returns successively each of the option characters + from each of the option elements. + + If 'getopt' finds another option character, it returns that character, + updating 'optind' and 'nextchar' so that the next call to 'getopt' can + resume the scan with the following option character or ARGV-element. + + If there are no more option characters, 'getopt' returns -1. + Then 'optind' is the index in ARGV of the first ARGV-element + that is not an option. (The ARGV-elements have been permuted + so that those that are not options now come last.) + + OPTSTRING is a string containing the legitimate option characters. + If an option character is seen that is not listed in OPTSTRING, + return '?' after printing an error message. If you set 'opterr' to + zero, the error message is suppressed but we still return '?'. + + If a char in OPTSTRING is followed by a colon, that means it wants an arg, + so the following text in the same ARGV-element, or the text of the following + ARGV-element, is returned in 'optarg'. Two colons mean an option that + wants an optional arg; if there is text in the current ARGV-element, + it is returned in 'optarg', otherwise 'optarg' is set to zero. + + If OPTSTRING starts with '-' or '+', it requests different methods of + handling the non-option ARGV-elements. + See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above. + + Long-named options begin with '--' instead of '-'. + Their names may be abbreviated as long as the abbreviation is unique + or is an exact match for some defined option. If they have an + argument, it follows the option name in the same ARGV-element, separated + from the option name by a '=', or else the in next ARGV-element. + When 'getopt' finds a long-named option, it returns 0 if that option's + 'flag' field is nonzero, the value of the option's 'val' field + if the 'flag' field is zero. + + The elements of ARGV aren't really const, because we permute them. + But we pretend they're const in the prototype to be compatible + with other systems. + + LONGOPTS is a vector of 'struct option' terminated by an + element containing a name which is zero. + + LONGIND returns the index in LONGOPT of the long-named option found. + It is only valid when a long-named option has been found by the most + recent call. + + If LONG_ONLY is nonzero, '-' as well as '--' can introduce + long-named options. */ + +int +_getopt_internal_r (int argc, char **argv, const char *optstring, + const struct option *longopts, int *longind, + int long_only, struct _getopt_data *d, int posixly_correct) +{ + int print_errors = d->opterr; + + if (argc < 1) + return -1; + + d->optarg = NULL; + + if (d->optind == 0 || !d->__initialized) + optstring = _getopt_initialize (argc, argv, optstring, d, posixly_correct); + else if (optstring[0] == '-' || optstring[0] == '+') + optstring++; + + if (optstring[0] == ':') + print_errors = 0; + + /* Test whether ARGV[optind] points to a non-option argument. */ +#define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0') + + if (d->__nextchar == NULL || *d->__nextchar == '\0') + { + /* Advance to the next ARGV-element. */ + + /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been + moved back by the user (who may also have changed the arguments). */ + if (d->__last_nonopt > d->optind) + d->__last_nonopt = d->optind; + if (d->__first_nonopt > d->optind) + d->__first_nonopt = d->optind; + + if (d->__ordering == PERMUTE) + { + /* If we have just processed some options following some non-options, + exchange them so that the options come first. */ + + if (d->__first_nonopt != d->__last_nonopt + && d->__last_nonopt != d->optind) + exchange (argv, d); + else if (d->__last_nonopt != d->optind) + d->__first_nonopt = d->optind; + + /* Skip any additional non-options + and extend the range of non-options previously skipped. */ + + while (d->optind < argc && NONOPTION_P) + d->optind++; + d->__last_nonopt = d->optind; + } + + /* The special ARGV-element '--' means premature end of options. + Skip it like a null option, + then exchange with previous non-options as if it were an option, + then skip everything else like a non-option. */ + + if (d->optind != argc && !strcmp (argv[d->optind], "--")) + { + d->optind++; + + if (d->__first_nonopt != d->__last_nonopt + && d->__last_nonopt != d->optind) + exchange (argv, d); + else if (d->__first_nonopt == d->__last_nonopt) + d->__first_nonopt = d->optind; + d->__last_nonopt = argc; + + d->optind = argc; + } + + /* If we have done all the ARGV-elements, stop the scan + and back over any non-options that we skipped and permuted. */ + + if (d->optind == argc) + { + /* Set the next-arg-index to point at the non-options + that we previously skipped, so the caller will digest them. */ + if (d->__first_nonopt != d->__last_nonopt) + d->optind = d->__first_nonopt; + return -1; + } + + /* If we have come to a non-option and did not permute it, + either stop the scan or describe it to the caller and pass it by. */ + + if (NONOPTION_P) + { + if (d->__ordering == REQUIRE_ORDER) + return -1; + d->optarg = argv[d->optind++]; + return 1; + } + + /* We have found another option-ARGV-element. + Check whether it might be a long option. */ + if (longopts) + { + if (argv[d->optind][1] == '-') + { + /* "--foo" is always a long option. The special option + "--" was handled above. */ + d->__nextchar = argv[d->optind] + 2; + return process_long_option (argc, argv, optstring, longopts, + longind, long_only, d, + print_errors, "--"); + } + + /* If long_only and the ARGV-element has the form "-f", + where f is a valid short option, don't consider it an + abbreviated form of a long option that starts with f. + Otherwise there would be no way to give the -f short + option. + + On the other hand, if there's a long option "fubar" and + the ARGV-element is "-fu", do consider that an + abbreviation of the long option, just like "--fu", and + not "-f" with arg "u". + + This distinction seems to be the most useful approach. */ + if (long_only && (argv[d->optind][2] + || !strchr (optstring, argv[d->optind][1]))) + { + int code; + d->__nextchar = argv[d->optind] + 1; + code = process_long_option (argc, argv, optstring, longopts, + longind, long_only, d, + print_errors, "-"); + if (code != -1) + return code; + } + } + + /* It is not a long option. Skip the initial punctuation. */ + d->__nextchar = argv[d->optind] + 1; + } + + /* Look at and handle the next short option-character. */ + + { + char c = *d->__nextchar++; + const char *temp = strchr (optstring, c); + + /* Increment 'optind' when we start to process its last character. */ + if (*d->__nextchar == '\0') + ++d->optind; + + if (temp == NULL || c == ':' || c == ';') + { + if (print_errors) + fprintf (stderr, _("%s: invalid option -- '%c'\n"), argv[0], c); + d->optopt = c; + return '?'; + } + + /* Convenience. Treat POSIX -W foo same as long option --foo */ + if (temp[0] == 'W' && temp[1] == ';' && longopts != NULL) + { + /* This is an option that requires an argument. */ + if (*d->__nextchar != '\0') + d->optarg = d->__nextchar; + else if (d->optind == argc) + { + if (print_errors) + fprintf (stderr, + _("%s: option requires an argument -- '%c'\n"), + argv[0], c); + + d->optopt = c; + if (optstring[0] == ':') + c = ':'; + else + c = '?'; + return c; + } + else + d->optarg = argv[d->optind]; + + d->__nextchar = d->optarg; + d->optarg = NULL; + return process_long_option (argc, argv, optstring, longopts, longind, + 0 /* long_only */, d, print_errors, "-W "); + } + if (temp[1] == ':') + { + if (temp[2] == ':') + { + /* This is an option that accepts an argument optionally. */ + if (*d->__nextchar != '\0') + { + d->optarg = d->__nextchar; + d->optind++; + } + else + d->optarg = NULL; + d->__nextchar = NULL; + } + else + { + /* This is an option that requires an argument. */ + if (*d->__nextchar != '\0') + { + d->optarg = d->__nextchar; + /* If we end this ARGV-element by taking the rest as an arg, + we must advance to the next element now. */ + d->optind++; + } + else if (d->optind == argc) + { + if (print_errors) + fprintf (stderr, + _("%s: option requires an argument -- '%c'\n"), + argv[0], c); + + d->optopt = c; + if (optstring[0] == ':') + c = ':'; + else + c = '?'; + } + else + /* We already incremented 'optind' once; + increment it again when taking next ARGV-elt as argument. */ + d->optarg = argv[d->optind++]; + d->__nextchar = NULL; + } + } + return c; + } +} + +int +_getopt_internal (int argc, char **argv, const char *optstring, + const struct option *longopts, int *longind, int long_only, + int posixly_correct) +{ + int result; + + getopt_data.optind = optind; + getopt_data.opterr = opterr; + + result = _getopt_internal_r (argc, argv, optstring, longopts, + longind, long_only, &getopt_data, + posixly_correct); + + optind = getopt_data.optind; + optarg = getopt_data.optarg; + optopt = getopt_data.optopt; + + return result; +} + +/* glibc gets a LSB-compliant getopt and a POSIX-complaint __posix_getopt. + Standalone applications just get a POSIX-compliant getopt. + POSIX and LSB both require these functions to take 'char *const *argv' + even though this is incorrect (because of the permutation). */ +#define GETOPT_ENTRY(NAME, POSIXLY_CORRECT) \ + int \ + NAME (int argc, char *const *argv, const char *optstring) \ + { \ + return _getopt_internal (argc, (char **)argv, optstring, \ + 0, 0, 0, POSIXLY_CORRECT); \ + } + +#ifdef _LIBC +GETOPT_ENTRY(getopt, 0) +GETOPT_ENTRY(__posix_getopt, 1) +#else +GETOPT_ENTRY(getopt, 1) +#endif + + +#ifdef TEST + +/* Compile with -DTEST to make an executable for use in testing + the above definition of 'getopt'. */ + +int +main (int argc, char **argv) +{ + int c; + int digit_optind = 0; + + while (1) + { + int this_option_optind = optind ? optind : 1; + + c = getopt (argc, argv, "abc:d:0123456789"); + if (c == -1) + break; + + switch (c) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + if (digit_optind != 0 && digit_optind != this_option_optind) + printf ("digits occur in two different argv-elements.\n"); + digit_optind = this_option_optind; + printf ("option %c\n", c); + break; + + case 'a': + printf ("option a\n"); + break; + + case 'b': + printf ("option b\n"); + break; + + case 'c': + printf ("option c with value '%s'\n", optarg); + break; + + case '?': + break; + + default: + printf ("?? getopt returned character code 0%o ??\n", c); + } + } + + if (optind < argc) + { + printf ("non-option ARGV-elements: "); + while (optind < argc) + printf ("%s ", argv[optind++]); + printf ("\n"); + } + + exit (0); +} + +#endif /* TEST */ diff --git a/sdk/tools/port/getopt.h b/sdk/tools/port/getopt.h new file mode 100644 index 0000000000..f7146d5ff3 --- /dev/null +++ b/sdk/tools/port/getopt.h @@ -0,0 +1,36 @@ +/* Declarations for getopt. + Copyright (C) 1989-2019 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Unlike the bulk of the getopt implementation, this file is NOT part + of gnulib; gnulib also has a getopt.h but it is different. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#ifndef _GETOPT_H +#define _GETOPT_H 1 + +/* The type of the 'argv' argument to getopt_long and getopt_long_only + is properly 'char **', since both functions may write to the array + (in order to move all the options to the beginning). However, for + compatibility with old versions of LSB, glibc has to use 'char *const *' + instead. */ +#ifndef __getopt_argv_const +# define __getopt_argv_const const +#endif + +#include "bits/getopt_core.h" +#include "bits/getopt_ext.h" + +#endif /* getopt.h */ diff --git a/sdk/tools/port/getopt1.c b/sdk/tools/port/getopt1.c new file mode 100644 index 0000000000..d767dcce13 --- /dev/null +++ b/sdk/tools/port/getopt1.c @@ -0,0 +1,155 @@ +/* getopt_long and getopt_long_only entry points for GNU getopt. + Copyright (C) 1987-2019 Free Software Foundation, Inc. + This file is part of the GNU C Library and is also part of gnulib. + Patches to this file should be submitted to both projects. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#include "getopt.h" +#include "getopt_int.h" + +int +getopt_long (int argc, char *__getopt_argv_const *argv, const char *options, + const struct option *long_options, int *opt_index) +{ + return _getopt_internal (argc, (char **) argv, options, long_options, + opt_index, 0, 0); +} + +int +_getopt_long_r (int argc, char **argv, const char *options, + const struct option *long_options, int *opt_index, + struct _getopt_data *d) +{ + return _getopt_internal_r (argc, argv, options, long_options, opt_index, + 0, d, 0); +} + +/* Like getopt_long, but '-' as well as '--' can indicate a long option. + If an option that starts with '-' (not '--') doesn't match a long option, + but does match a short option, it is parsed as a short option + instead. */ + +int +getopt_long_only (int argc, char *__getopt_argv_const *argv, + const char *options, + const struct option *long_options, int *opt_index) +{ + return _getopt_internal (argc, (char **) argv, options, long_options, + opt_index, 1, 0); +} + +int +_getopt_long_only_r (int argc, char **argv, const char *options, + const struct option *long_options, int *opt_index, + struct _getopt_data *d) +{ + return _getopt_internal_r (argc, argv, options, long_options, opt_index, + 1, d, 0); +} + + +#ifdef TEST + +#include <stdio.h> +#include <stdlib.h> + +int +main (int argc, char **argv) +{ + int c; + int digit_optind = 0; + + while (1) + { + int this_option_optind = optind ? optind : 1; + int option_index = 0; + static const struct option long_options[] = + { + {"add", 1, 0, 0}, + {"append", 0, 0, 0}, + {"delete", 1, 0, 0}, + {"verbose", 0, 0, 0}, + {"create", 0, 0, 0}, + {"file", 1, 0, 0}, + {0, 0, 0, 0} + }; + + c = getopt_long (argc, argv, "abc:d:0123456789", + long_options, &option_index); + if (c == -1) + break; + + switch (c) + { + case 0: + printf ("option %s", long_options[option_index].name); + if (optarg) + printf (" with arg %s", optarg); + printf ("\n"); + break; + + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + if (digit_optind != 0 && digit_optind != this_option_optind) + printf ("digits occur in two different argv-elements.\n"); + digit_optind = this_option_optind; + printf ("option %c\n", c); + break; + + case 'a': + printf ("option a\n"); + break; + + case 'b': + printf ("option b\n"); + break; + + case 'c': + printf ("option c with value '%s'\n", optarg); + break; + + case 'd': + printf ("option d with value '%s'\n", optarg); + break; + + case '?': + break; + + default: + printf ("?? getopt returned character code 0%o ??\n", c); + } + } + + if (optind < argc) + { + printf ("non-option ARGV-elements: "); + while (optind < argc) + printf ("%s ", argv[optind++]); + printf ("\n"); + } + + exit (0); +} + +#endif /* TEST */ diff --git a/sdk/tools/port/getopt_int.h b/sdk/tools/port/getopt_int.h new file mode 100644 index 0000000000..0a0125e018 --- /dev/null +++ b/sdk/tools/port/getopt_int.h @@ -0,0 +1,118 @@ +/* Internal declarations for getopt. + Copyright (C) 1989-2019 Free Software Foundation, Inc. + This file is part of the GNU C Library and is also part of gnulib. + Patches to this file should be submitted to both projects. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#ifndef _GETOPT_INT_H +#define _GETOPT_INT_H 1 + +#include "getopt.h" + +extern int _getopt_internal (int ___argc, char **___argv, + const char *__shortopts, + const struct option *__longopts, int *__longind, + int __long_only, int __posixly_correct); + + +/* Reentrant versions which can handle parsing multiple argument + vectors at the same time. */ + +/* Describe how to deal with options that follow non-option ARGV-elements. + + REQUIRE_ORDER means don't recognize them as options; stop option + processing when the first non-option is seen. This is what POSIX + specifies should happen. + + PERMUTE means permute the contents of ARGV as we scan, so that + eventually all the non-options are at the end. This allows options + to be given in any order, even with programs that were not written + to expect this. + + RETURN_IN_ORDER is an option available to programs that were + written to expect options and other ARGV-elements in any order + and that care about the ordering of the two. We describe each + non-option ARGV-element as if it were the argument of an option + with character code 1. + + The special argument '--' forces an end of option-scanning regardless + of the value of 'ordering'. In the case of RETURN_IN_ORDER, only + '--' can cause 'getopt' to return -1 with 'optind' != ARGC. */ + +enum __ord + { + REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER + }; + +/* Data type for reentrant functions. */ +struct _getopt_data +{ + /* These have exactly the same meaning as the corresponding global + variables, except that they are used for the reentrant + versions of getopt. */ + int optind; + int opterr; + int optopt; + char *optarg; + + /* Internal members. */ + + /* True if the internal members have been initialized. */ + int __initialized; + + /* The next char to be scanned in the option-element + in which the last option character we returned was found. + This allows us to pick up the scan where we left off. + + If this is zero, or a null string, it means resume the scan + by advancing to the next ARGV-element. */ + char *__nextchar; + + /* See __ord above. */ + enum __ord __ordering; + + /* Handle permutation of arguments. */ + + /* Describe the part of ARGV that contains non-options that have + been skipped. 'first_nonopt' is the index in ARGV of the first + of them; 'last_nonopt' is the index after the last of them. */ + + int __first_nonopt; + int __last_nonopt; +}; + +/* The initializer is necessary to set OPTIND and OPTERR to their + default values and to clear the initialization flag. */ +#define _GETOPT_DATA_INITIALIZER { 1, 1 } + +extern int _getopt_internal_r (int ___argc, char **___argv, + const char *__shortopts, + const struct option *__longopts, int *__longind, + int __long_only, struct _getopt_data *__data, + int __posixly_correct); + +extern int _getopt_long_r (int ___argc, char **___argv, + const char *__shortopts, + const struct option *__longopts, int *__longind, + struct _getopt_data *__data); + +extern int _getopt_long_only_r (int ___argc, char **___argv, + const char *__shortopts, + const struct option *__longopts, + int *__longind, + struct _getopt_data *__data); + +#endif /* getopt_int.h */ diff --git a/sdk/tools/hhpcomp/port/mkstemps.c b/sdk/tools/port/mkstemps.c similarity index 95% rename from sdk/tools/hhpcomp/port/mkstemps.c rename to sdk/tools/port/mkstemps.c index d19dc3a6ac..1c7f63d054 100644 --- a/sdk/tools/hhpcomp/port/mkstemps.c +++ b/sdk/tools/port/mkstemps.c @@ -17,22 +17,19 @@ Boston, MA 02110-1301, USA. */ -#include "config.h" - #include <sys/types.h> #include <stdlib.h> #include <string.h> #include <errno.h> #include <stdio.h> #include <fcntl.h> -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#endif -#ifdef HAVE_PROCESS_H -#include <process.h> + +#ifdef _WIN32 + #include <io.h> + #include <process.h> +#else + #include <unistd.h> + #include <sys/time.h> #endif /* We need to provide a type for gcc_uint64_t. */ diff --git a/sdk/tools/port/port.h b/sdk/tools/port/port.h new file mode 100644 index 0000000000..ccd4122fed --- /dev/null +++ b/sdk/tools/port/port.h @@ -0,0 +1,5 @@ +#pragma once + +#include "getopt_int.h" + +int mkstemps(char *template, int suffix_len); diff --git a/sdk/tools/widl/CMakeLists.txt b/sdk/tools/widl/CMakeLists.txt index 17239f0136..a37a80d977 100644 --- a/sdk/tools/widl/CMakeLists.txt +++ b/sdk/tools/widl/CMakeLists.txt @@ -8,8 +8,6 @@ if(MSVC) add_definitions(-Dvsnprintf=_vsnprintf) endif() endif() - - list(APPEND SOURCE getopt.c) endif() list(APPEND SOURCE @@ -29,7 +27,9 @@ list(APPEND SOURCE write_sltg.c parser.yy.c parser.tab.c - port/mkstemps.c) + ../port/getopt.c + ../port/getopt1.c + ../port/mkstemps.c) # Taken from widl.rbuild add_definitions(-DINT16=SHORT) diff --git a/sdk/tools/widl/getopt.c b/sdk/tools/widl/getopt.c deleted file mode 100644 index 3fae7871fa..0000000000 --- a/sdk/tools/widl/getopt.c +++ /dev/null @@ -1,915 +0,0 @@ -/* - * Copyright (c) 1987, 1993, 1994, 1996 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include <stdlib.h> -#include <string.h> -#include <stdio.h> - -struct option { - const char *name; - int has_arg; - int *flag; - int val; -}; - -int opterr = 1; -int optind = 1; -int optopt = '?'; -int optreset; -char *optarg; - -#define my_index strchr - -#ifdef _LIBC -# ifdef USE_NONOPTION_FLAGS -# define SWAP_FLAGS(ch1, ch2) \ - if (nonoption_flags_len > 0) \ - { \ - char __tmp = __getopt_nonoption_flags[ch1]; \ - __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \ - __getopt_nonoption_flags[ch2] = __tmp; \ - } -# else -# define SWAP_FLAGS(ch1, ch2) -# endif -#else /* !_LIBC */ -# define SWAP_FLAGS(ch1, ch2) -#endif /* _LIBC */ - -int __getopt_initialized; - -static int first_nonopt = -1; -static int last_nonopt = -1; - -static char *nextchar; - -static char *posixly_correct; - -static enum -{ - REQUIRE_ORDER, - PERMUTE, - RETURN_IN_ORDER -} ordering; - -static void -exchange (argv) - char **argv; -{ - int bottom = first_nonopt; - int middle = last_nonopt; - int top = optind; - char *tem; - - /* Exchange the shorter segment with the far end of the longer segment. - That puts the shorter segment into the right place. - It leaves the longer segment in the right place overall, - but it consists of two parts that need to be swapped next. */ - -#if defined _LIBC && defined USE_NONOPTION_FLAGS - /* First make sure the handling of the `__getopt_nonoption_flags' - string can work normally. Our top argument must be in the range - of the string. */ - if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len) - { - /* We must extend the array. The user plays games with us and - presents new arguments. */ - char *new_str = malloc (top + 1); - if (new_str == NULL) - nonoption_flags_len = nonoption_flags_max_len = 0; - else - { - memset (__mempcpy (new_str, __getopt_nonoption_flags, - nonoption_flags_max_len), - '\0', top + 1 - nonoption_flags_max_len); - nonoption_flags_max_len = top + 1; - __getopt_nonoption_flags = new_str; - } - } -#endif - - while (top > middle && middle > bottom) - { - if (top - middle > middle - bottom) - { - /* Bottom segment is the short one. */ - int len = middle - bottom; - register int i; - - /* Swap it with the top part of the top segment. */ - for (i = 0; i < len; i++) - { - tem = argv[bottom + i]; - argv[bottom + i] = argv[top - (middle - bottom) + i]; - argv[top - (middle - bottom) + i] = tem; - SWAP_FLAGS (bottom + i, top - (middle - bottom) + i); - } - /* Exclude the moved bottom segment from further swapping. */ - top -= len; - } - else - { - /* Top segment is the short one. */ - int len = top - middle; - register int i; - - /* Swap it with the bottom part of the bottom segment. */ - for (i = 0; i < len; i++) - { - tem = argv[bottom + i]; - argv[bottom + i] = argv[middle + i]; - argv[middle + i] = tem; - SWAP_FLAGS (bottom + i, middle + i); - } - /* Exclude the moved top segment from further swapping. */ - bottom += len; - } - } - - /* Update records for the slots the non-options now occupy. */ - - first_nonopt += (optind - last_nonopt); - last_nonopt = optind; -} - -static const char * -_getopt_initialize (argc, argv, optstring) - int argc; - char *const *argv; - const char *optstring; -{ - /* Start processing options with ARGV-element 1 (since ARGV-element 0 - is the program name); the sequence of previously skipped - non-option ARGV-elements is empty. */ - - first_nonopt = last_nonopt = optind; - - nextchar = NULL; - - posixly_correct = getenv ("POSIXLY_CORRECT"); - - /* Determine how to handle the ordering of options and nonoptions. */ - - if (optstring[0] == '-') - { - ordering = RETURN_IN_ORDER; - ++optstring; - } - else if (optstring[0] == '+') - { - ordering = REQUIRE_ORDER; - ++optstring; - } - else if (posixly_correct != NULL) - ordering = REQUIRE_ORDER; - else - ordering = PERMUTE; - -#if defined _LIBC && defined USE_NONOPTION_FLAGS - if (posixly_correct == NULL - && argc == __libc_argc && argv == __libc_argv) - { - if (nonoption_flags_max_len == 0) - { - if (__getopt_nonoption_flags == NULL - || __getopt_nonoption_flags[0] == '\0') - nonoption_flags_max_len = -1; - else - { - const char *orig_str = __getopt_nonoption_flags; - int len = nonoption_flags_max_len = strlen (orig_str); - if (nonoption_flags_max_len < argc) - nonoption_flags_max_len = argc; - __getopt_nonoption_flags = malloc (nonoption_flags_max_len); - if (__getopt_nonoption_flags == NULL) - nonoption_flags_max_len = -1; - else - memset (__mempcpy (__getopt_nonoption_flags, orig_str, len), - '\0', nonoption_flags_max_len - len); - } - } - nonoption_flags_len = nonoption_flags_max_len; - } - else - nonoption_flags_len = 0; -#endif - - return optstring; -} - -int -getopt_long_only (int argc, char * const *argv, const char *options, const struct option *long_options, int *opt_index) -{ - return _getopt_internal (argc, argv, options, long_options, opt_index, 1); -} - -int -_getopt_internal (argc, argv, optstring, longopts, longind, long_only) - int argc; - char *const *argv; - const char *optstring; - const struct option *longopts; - int *longind; - int long_only; -{ - int print_errors = opterr; - if (optstring[0] == ':') - print_errors = 0; - - if (argc < 1) - return -1; - - optarg = NULL; - - if (optind == 0 || !__getopt_initialized) - { - if (optind == 0) - optind = 1; /* Don't scan ARGV[0], the program name. */ - optstring = _getopt_initialize (argc, argv, optstring); - __getopt_initialized = 1; - } - - /* Test whether ARGV[optind] points to a non-option argument. - Either it does not have option syntax, or there is an environment flag - from the shell indicating it is not an option. The later information - is only used when the used in the GNU libc. */ -#if defined _LIBC && defined USE_NONOPTION_FLAGS -# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0' \ - || (optind < nonoption_flags_len \ - && __getopt_nonoption_flags[optind] == '1')) -#else -# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0') -#endif - - if (nextchar == NULL || *nextchar == '\0') - { - /* Advance to the next ARGV-element. */ - - /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been - moved back by the user (who may also have changed the arguments). */ - if (last_nonopt > optind) - last_nonopt = optind; - if (first_nonopt > optind) - first_nonopt = optind; - - if (ordering == PERMUTE) - { - /* If we have just processed some options following some non-options, - exchange them so that the options come first. */ - - if (first_nonopt != last_nonopt && last_nonopt != optind) - exchange ((char **) argv); - else if (last_nonopt != optind) - first_nonopt = optind; - - /* Skip any additional non-options - and extend the range of non-options previously skipped. */ - - while (optind < argc && NONOPTION_P) - optind++; - last_nonopt = optind; - } - - /* The special ARGV-element `--' means premature end of options. - Skip it like a null option, - then exchange with previous non-options as if it were an option, - then skip everything else like a non-option. */ - - if (optind != argc && !strcmp (argv[optind], "--")) - { - optind++; - - if (first_nonopt != last_nonopt && last_nonopt != optind) - exchange ((char **) argv); - else if (first_nonopt == last_nonopt) - first_nonopt = optind; - last_nonopt = argc; - - optind = argc; - } - - /* If we have done all the ARGV-elements, stop the scan - and back over any non-options that we skipped and permuted. */ - - if (optind == argc) - { - /* Set the next-arg-index to point at the non-options - that we previously skipped, so the caller will digest them. */ - if (first_nonopt != last_nonopt) - optind = first_nonopt; - return -1; - } - - /* If we have come to a non-option and did not permute it, - either stop the scan or describe it to the caller and pass it by. */ - - if (NONOPTION_P) - { - if (ordering == REQUIRE_ORDER) - return -1; - optarg = argv[optind++]; - return 1; - } - - /* We have found another option-ARGV-element. - Skip the initial punctuation. */ - - nextchar = (argv[optind] + 1 - + (longopts != NULL && argv[optind][1] == '-')); - } - - /* Decode the current option-ARGV-element. */ - - /* Check whether the ARGV-element is a long option. - - If long_only and the ARGV-element has the form "-f", where f is - a valid short option, don't consider it an abbreviated form of - a long option that starts with f. Otherwise there would be no - way to give the -f short option. - - On the other hand, if there's a long option "fubar" and - the ARGV-element is "-fu", do consider that an abbreviation of - the long option, just like "--fu", and not "-f" with arg "u". - - This distinction seems to be the most useful approach. */ - - if (longopts != NULL - && (argv[optind][1] == '-' - || (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1]))))) - { - char *nameend; - const struct option *p; - const struct option *pfound = NULL; - int exact = 0; - int ambig = 0; - int indfound = -1; - int option_index; - - for (nameend = nextchar; *nameend && *nameend != '='; nameend++) - /* Do nothing. */ ; - - /* Test all long options for either exact match - or abbreviated matches. */ - for (p = longopts, option_index = 0; p->name; p++, option_index++) - if (!strncmp (p->name, nextchar, nameend - nextchar)) - { - if ((unsigned int) (nameend - nextchar) - == (unsigned int) strlen (p->name)) - { - /* Exact match found. */ - pfound = p; - indfound = option_index; - exact = 1; - break; - } - else if (pfound == NULL) - { - /* First nonexact match found. */ - pfound = p; - indfound = option_index; - } - else if (long_only - || pfound->has_arg != p->has_arg - || pfound->flag != p->flag - || pfound->val != p->val) - /* Second or later nonexact match found. */ - ambig = 1; - } - - if (ambig && !exact) - { - if (print_errors) - { -#if defined _LIBC && defined USE_IN_LIBIO - char *buf; - - if (__asprintf (&buf, _("%s: option `%s' is ambiguous\n"), - argv[0], argv[optind]) >= 0) - { - - if (_IO_fwide (stderr, 0) > 0) - __fwprintf (stderr, L"%s", buf); - else - fputs (buf, stderr); - - free (buf); - } -#else - fprintf (stderr, "%s: option `%s' is ambiguous\n", - argv[0], argv[optind]); -#endif - } - nextchar += strlen (nextchar); - optind++; - optopt = 0; - return '?'; - } - - if (pfound != NULL) - { - option_index = indfound; - optind++; - if (*nameend) - { - /* Don't test has_arg with >, because some C compilers don't - allow it to be used on enums. */ - if (pfound->has_arg) - optarg = nameend + 1; - else - { - if (print_errors) - { -#if defined _LIBC && defined USE_IN_LIBIO - char *buf; - int n; -#endif - - if (argv[optind - 1][1] == '-') - { - /* --option */ -#if defined _LIBC && defined USE_IN_LIBIO - n = __asprintf (&buf, "\ -%s: option `--%s' doesn't allow an argument\n", - argv[0], pfound->name); -#else - fprintf (stderr, "\ -%s: option `--%s' doesn't allow an argument\n", - argv[0], pfound->name); -#endif - } - else - { - /* +option or -option */ -#if defined _LIBC && defined USE_IN_LIBIO - n = __asprintf (&buf, "\ -%s: option `%c%s' doesn't allow an argument\n", - argv[0], argv[optind - 1][0], - pfound->name); -#else - fprintf (stderr, "\ -%s: option `%c%s' doesn't allow an argument\n", - argv[0], argv[optind - 1][0], pfound->name); -#endif - } - -#if defined _LIBC && defined USE_IN_LIBIO - if (n >= 0) - { - if (_IO_fwide (stderr, 0) > 0) - __fwprintf (stderr, L"%s", buf); - else - fputs (buf, stderr); - - free (buf); - } -#endif - } - - nextchar += strlen (nextchar); - - optopt = pfound->val; - return '?'; - } - } - else if (pfound->has_arg == 1) - { - if (optind < argc) - optarg = argv[optind++]; - else - { - if (print_errors) - { -#if defined _LIBC && defined USE_IN_LIBIO - char *buf; - - if (__asprintf (&buf, _("\ -%s: option `%s' requires an argument\n"), - argv[0], argv[optind - 1]) >= 0) - { - if (_IO_fwide (stderr, 0) > 0) - __fwprintf (stderr, L"%s", buf); - else - fputs (buf, stderr); - - free (buf); - } -#else - fprintf (stderr, - "%s: option `%s' requires an argument\n", - argv[0], argv[optind - 1]); -#endif - } - nextchar += strlen (nextchar); - optopt = pfound->val; - return optstring[0] == ':' ? ':' : '?'; - } - } - nextchar += strlen (nextchar); - if (longind != NULL) - *longind = option_index; - if (pfound->flag) - { - *(pfound->flag) = pfound->val; - return 0; - } - return pfound->val; - } - - /* Can't find it as a long option. If this is not getopt_long_only, - or the option starts with '--' or is not a valid short - option, then it's an error. - Otherwise interpret it as a short option. */ - if (!long_only || argv[optind][1] == '-' - || my_index (optstring, *nextchar) == NULL) - { - if (print_errors) - { -#if defined _LIBC && defined USE_IN_LIBIO - char *buf; - int n; -#endif - - if (argv[optind][1] == '-') - { - /* --option */ -#if defined _LIBC && defined USE_IN_LIBIO - n = __asprintf (&buf, _("%s: unrecognized option `--%s'\n"), - argv[0], nextchar); -#else - fprintf (stderr, "%s: unrecognized option `--%s'\n", - argv[0], nextchar); -#endif - } - else - { - /* +option or -option */ -#if defined _LIBC && defined USE_IN_LIBIO - n = __asprintf (&buf, _("%s: unrecognized option `%c%s'\n"), - argv[0], argv[optind][0], nextchar); -#else - fprintf (stderr, "%s: unrecognized option `%c%s'\n", - argv[0], argv[optind][0], nextchar); -#endif - } - -#if defined _LIBC && defined USE_IN_LIBIO - if (n >= 0) - { - if (_IO_fwide (stderr, 0) > 0) - __fwprintf (stderr, L"%s", buf); - else - fputs (buf, stderr); - - free (buf); - } -#endif - } - nextchar = (char *) ""; - optind++; - optopt = 0; - return '?'; - } - } - - /* Look at and handle the next short option-character. */ - - { - char c = *nextchar++; - char *temp = my_index (optstring, c); - - /* Increment `optind' when we start to process its last character. */ - if (*nextchar == '\0') - ++optind; - - if (temp == NULL || c == ':') - { - if (print_errors) - { -#if defined _LIBC && defined USE_IN_LIBIO - char *buf; - int n; -#endif - - if (posixly_correct) - { - /* 1003.2 specifies the format of this message. */ -#if defined _LIBC && defined USE_IN_LIBIO - n = __asprintf (&buf, _("%s: illegal option -- %c\n"), - argv[0], c); -#else - fprintf (stderr, "%s: illegal option -- %c\n", argv[0], c); -#endif - } - else - { -#if defined _LIBC && defined USE_IN_LIBIO - n = __asprintf (&buf, _("%s: invalid option -- %c\n"), - argv[0], c); -#else - fprintf (stderr, "%s: invalid option -- %c\n", argv[0], c); -#endif - } - -#if defined _LIBC && defined USE_IN_LIBIO - if (n >= 0) - { - if (_IO_fwide (stderr, 0) > 0) - __fwprintf (stderr, L"%s", buf); - else - fputs (buf, stderr); - - free (buf); - } -#endif - } - optopt = c; - return '?'; - } - /* Convenience. Treat POSIX -W foo same as long option --foo */ - if (temp[0] == 'W' && temp[1] == ';') - { - char *nameend; - const struct option *p; - const struct option *pfound = NULL; - int exact = 0; - int ambig = 0; - int indfound = 0; - int option_index; - - /* This is an option that requires an argument. */ - if (*nextchar != '\0') - { - optarg = nextchar; - /* If we end this ARGV-element by taking the rest as an arg, - we must advance to the next element now. */ - optind++; - } - else if (optind == argc) - { - if (print_errors) - { - /* 1003.2 specifies the format of this message. */ -#if defined _LIBC && defined USE_IN_LIBIO - char *buf; - - if (__asprintf (&buf, - _("%s: option requires an argument -- %c\n"), - argv[0], c) >= 0) - { - if (_IO_fwide (stderr, 0) > 0) - __fwprintf (stderr, L"%s", buf); - else - fputs (buf, stderr); - - free (buf); - } -#else - fprintf (stderr, "%s: option requires an argument -- %c\n", - argv[0], c); -#endif - } - optopt = c; - if (optstring[0] == ':') - c = ':'; - else - c = '?'; - return c; - } - else - /* We already incremented `optind' once; - increment it again when taking next ARGV-elt as argument. */ - optarg = argv[optind++]; - - /* optarg is now the argument, see if it's in the - table of longopts. */ - - for (nextchar = nameend = optarg; *nameend && *nameend != '='; nameend++) - /* Do nothing. */ ; - - /* Test all long options for either exact match - or abbreviated matches. */ - for (p = longopts, option_index = 0; p->name; p++, option_index++) - if (!strncmp (p->name, nextchar, nameend - nextchar)) - { - if ((unsigned int) (nameend - nextchar) == strlen (p->name)) - { - /* Exact match found. */ - pfound = p; - indfound = option_index; - exact = 1; - break; - } - else if (pfound == NULL) - { - /* First nonexact match found. */ - pfound = p; - indfound = option_index; - } - else - /* Second or later nonexact match found. */ - ambig = 1; - } - if (ambig && !exact) - { - if (print_errors) - { -#if defined _LIBC && defined USE_IN_LIBIO - char *buf; - - if (__asprintf (&buf, _("%s: option `-W %s' is ambiguous\n"), - argv[0], argv[optind]) >= 0) - { - if (_IO_fwide (stderr, 0) > 0) - __fwprintf (stderr, L"%s", buf); - else - fputs (buf, stderr); - - free (buf); - } -#else - fprintf (stderr, "%s: option `-W %s' is ambiguous\n", - argv[0], argv[optind]); -#endif - } - nextchar += strlen (nextchar); - optind++; - return '?'; - } - if (pfound != NULL) - { - option_index = indfound; - if (*nameend) - { - /* Don't test has_arg with >, because some C compilers don't - allow it to be used on enums. */ - if (pfound->has_arg) - optarg = nameend + 1; - else - { - if (print_errors) - { -#if defined _LIBC && defined USE_IN_LIBIO - char *buf; - - if (__asprintf (&buf, _("\ -%s: option `-W %s' doesn't allow an argument\n"), - argv[0], pfound->name) >= 0) - { - if (_IO_fwide (stderr, 0) > 0) - __fwprintf (stderr, L"%s", buf); - else - fputs (buf, stderr); - - free (buf); - } -#else - fprintf (stderr, "\ -%s: option `-W %s' doesn't allow an argument\n", - argv[0], pfound->name); -#endif - } - - nextchar += strlen (nextchar); - return '?'; - } - } - else if (pfound->has_arg == 1) - { - if (optind < argc) - optarg = argv[optind++]; - else - { - if (print_errors) - { -#if defined _LIBC && defined USE_IN_LIBIO - char *buf; - - if (__asprintf (&buf, _("\ -%s: option `%s' requires an argument\n"), - argv[0], argv[optind - 1]) >= 0) - { - if (_IO_fwide (stderr, 0) > 0) - __fwprintf (stderr, L"%s", buf); - else - fputs (buf, stderr); - - free (buf); - } -#else - fprintf (stderr, - "%s: option `%s' requires an argument\n", - argv[0], argv[optind - 1]); -#endif - } - nextchar += strlen (nextchar); - return optstring[0] == ':' ? ':' : '?'; - } - } - nextchar += strlen (nextchar); - if (longind != NULL) - *longind = option_index; - if (pfound->flag) - { - *(pfound->flag) = pfound->val; - return 0; - } - return pfound->val; - } - nextchar = NULL; - return 'W'; /* Let the application handle it. */ - } - if (temp[1] == ':') - { - if (temp[2] == ':') - { - /* This is an option that accepts an argument optionally. */ - if (*nextchar != '\0') - { - optarg = nextchar; - optind++; - } - else - optarg = NULL; - nextchar = NULL; - } - else - { - /* This is an option that requires an argument. */ - if (*nextchar != '\0') - { - optarg = nextchar; - /* If we end this ARGV-element by taking the rest as an arg, - we must advance to the next element now. */ - optind++; - } - else if (optind == argc) - { - if (print_errors) - { - /* 1003.2 specifies the format of this message. */ -#if defined _LIBC && defined USE_IN_LIBIO - char *buf; - - if (__asprintf (&buf, _("\ -%s: option requires an argument -- %c\n"), - argv[0], c) >= 0) - { - if (_IO_fwide (stderr, 0) > 0) - __fwprintf (stderr, L"%s", buf); - else - fputs (buf, stderr); - - free (buf); - } -#else - fprintf (stderr, - "%s: option requires an argument -- %c\n", - argv[0], c); -#endif - } - optopt = c; - if (optstring[0] == ':') - c = ':'; - else - c = '?'; - } - else - /* We already incremented `optind' once; - increment it again when taking next ARGV-elt as argument. */ - optarg = argv[optind++]; - nextchar = NULL; - } - } - return c; - } -} diff --git a/sdk/tools/widl/port/config.h b/sdk/tools/widl/port/config.h deleted file mode 100644 index 568b15d51d..0000000000 --- a/sdk/tools/widl/port/config.h +++ /dev/null @@ -1,15 +0,0 @@ - -#pragma once - -#include <io.h> - -#define HAVE_PROCESS_H 1 - -int -_getopt_internal( - int argc, - char *const *argv, - const char *optstring, - const struct option *longopts, - int *longind, - int long_only); diff --git a/sdk/tools/widl/port/mkstemps.c b/sdk/tools/widl/port/mkstemps.c deleted file mode 100644 index 5558a6e78f..0000000000 --- a/sdk/tools/widl/port/mkstemps.c +++ /dev/null @@ -1,139 +0,0 @@ -/* Copyright (C) 1991, 1992, 1996, 1998 Free Software Foundation, Inc. - This file is derived from mkstemp.c from the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "config.h" - -#include <sys/types.h> -#include <stdlib.h> -#include <string.h> -#include <errno.h> -#include <stdio.h> -#include <fcntl.h> -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#endif -#ifdef HAVE_PROCESS_H -#include <process.h> -#endif - -/* We need to provide a type for gcc_uint64_t. */ -#ifdef __GNUC__ -__extension__ typedef unsigned long long gcc_uint64_t; -#else -typedef unsigned long gcc_uint64_t; -#endif - -#ifndef TMP_MAX -#define TMP_MAX 16384 -#endif - -/* - -@deftypefn Replacement int mkstemps (char *@var{template}, int @var{suffix_len}) - -Generate a unique temporary file name from @var{template}. -@var{template} has the form: - -@example - @var{path}/ccXXXXXX@var{suffix} -@end example - -@var{suffix_len} tells us how long @var{suffix} is (it can be zero -length). The last six characters of @var{template} before @var{suffix} -must be @samp{XXXXXX}; they are replaced with a string that makes the -filename unique. Returns a file descriptor open on the file for -reading and writing. - -@end deftypefn - -*/ - -int -mkstemps ( - char *template, - int suffix_len) -{ - static const char letters[] - = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; - static gcc_uint64_t value; -#ifdef HAVE_GETTIMEOFDAY - struct timeval tv; -#endif - char *XXXXXX; - size_t len; - int count; - - len = strlen (template); - - if ((int) len < 6 + suffix_len - || strncmp (&template[len - 6 - suffix_len], "XXXXXX", 6)) - { - return -1; - } - - XXXXXX = &template[len - 6 - suffix_len]; - -#ifdef HAVE_GETTIMEOFDAY - /* Get some more or less random data. */ - gettimeofday (&tv, NULL); - value += ((gcc_uint64_t) tv.tv_usec << 16) ^ tv.tv_sec ^ getpid (); -#else - value += getpid (); -#endif - - for (count = 0; count < TMP_MAX; ++count) - { - gcc_uint64_t v = value; - int fd; - - /* Fill in the random bits. */ - XXXXXX[0] = letters[v % 62]; - v /= 62; - XXXXXX[1] = letters[v % 62]; - v /= 62; - XXXXXX[2] = letters[v % 62]; - v /= 62; - XXXXXX[3] = letters[v % 62]; - v /= 62; - XXXXXX[4] = letters[v % 62]; - v /= 62; - XXXXXX[5] = letters[v % 62]; - -#ifdef VMS - fd = open (template, O_RDWR|O_CREAT|O_EXCL, 0600, "fop=tmd"); -#else - fd = open (template, O_RDWR|O_CREAT|O_EXCL, 0600); -#endif - if (fd >= 0) - /* The file does not exist. */ - return fd; - - /* This is a random value. It is only necessary that the next - TMP_MAX values generated by adding 7777 to VALUE are different - with (module 2^32). */ - value += 7777; - } - - /* We return the null string if we can't find a unique file name. */ - template[0] = '\0'; - return -1; -}

5 years, 7 months

[reactos] 02/03: [ISOHYBRID] Fix the remaining warnings properly.

by Colin Finck

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c02257ef57858bfe91f10… commit c02257ef57858bfe91f106e8c91c669e4a141293 Author: Colin Finck <colin(a)reactos.org> AuthorDate: Sat Apr 27 11:35:04 2019 +0200 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Sun Apr 28 23:22:53 2019 +0200 [ISOHYBRID] Fix the remaining warnings properly. I will send these changes upstream (minus the REACTOS_ISOHYBRID_EFI_MAC_SUPPORT ifdefs). --- sdk/tools/isohybrid/CMakeLists.txt | 8 -------- sdk/tools/isohybrid/isohybrid.c | 17 +++++++++++------ 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/sdk/tools/isohybrid/CMakeLists.txt b/sdk/tools/isohybrid/CMakeLists.txt index d24f3b95cb..13b57e1aff 100644 --- a/sdk/tools/isohybrid/CMakeLists.txt +++ b/sdk/tools/isohybrid/CMakeLists.txt @@ -5,11 +5,3 @@ add_definitions( add_host_tool(isohybrid isohybrid.c reactos_support_code.c) - -if(MSVC) - # Disable warning "'x': unreferenced local variable" - add_target_compile_flags(isohybrid "/wd4101") - - # Disable warning "'return': conversion from '__int64' to 'int', possible loss of data" - add_target_compile_flags(isohybrid "/wd4244") -endif() diff --git a/sdk/tools/isohybrid/isohybrid.c b/sdk/tools/isohybrid/isohybrid.c index b8d2da6f36..7ca2abc456 100644 --- a/sdk/tools/isohybrid/isohybrid.c +++ b/sdk/tools/isohybrid/isohybrid.c @@ -603,7 +603,7 @@ void read_mbr_template(char *path, uint8_t *mbr) { FILE *fp; - int ret; + size_t ret; fp = fopen(path, "rb"); if (fp == NULL) @@ -616,7 +616,7 @@ read_mbr_template(char *path, uint8_t *mbr) } -int +size_t initialise_mbr(uint8_t *mbr) { int i = 0; @@ -975,7 +975,10 @@ main(int argc, char *argv[]) FILE *fp = NULL; uint8_t *buf = NULL, *bufz = NULL; int cylsize = 0, frac = 0; + size_t mbr_size; +#ifdef REACTOS_ISOHYBRID_EFI_MAC_SUPPORT size_t orig_gpt_size, free_space, gpt_size; +#endif struct iso_primary_descriptor descriptor; prog = strcpy(alloca(strlen(argv[0]) + 1), argv[0]); @@ -1089,7 +1092,9 @@ main(int argc, char *argv[]) err(1, "%s", argv[0]); isosize = lendian_int(descriptor.size) * lendian_short(descriptor.block_size); +#ifdef REACTOS_ISOHYBRID_EFI_MAC_SUPPORT free_space = isostat.st_size - isosize; +#endif cylsize = head * sector * 512; frac = isostat.st_size % cylsize; @@ -1127,15 +1132,15 @@ main(int argc, char *argv[]) buf = bufz; memset(buf, 0, BUFSIZE); - i = initialise_mbr(buf); + mbr_size = initialise_mbr(buf); if (mode & VERBOSE) - display_mbr(buf, i); + display_mbr(buf, mbr_size); if (fseeko(fp, (off_t) 0, SEEK_SET)) err(1, "%s: seek error - 5", argv[0]); - if (fwrite(buf, sizeof(char), i, fp) != (size_t)i) + if (fwrite(buf, sizeof(char), mbr_size, fp) != mbr_size) err(1, "%s: write error - 1", argv[0]); #ifdef REACTOS_ISOHYBRID_EFI_MAC_SUPPORT @@ -1177,7 +1182,7 @@ main(int argc, char *argv[]) if (fseeko(fp, (off_t) 512, SEEK_SET)) err(1, "%s: seek error - 6", argv[0]); - if (fwrite(buf, sizeof(char), gpt_size, fp) != (size_t)gpt_size) + if (fwrite(buf, sizeof(char), gpt_size, fp) != gpt_size) err(1, "%s: write error - 2", argv[0]); }

5 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2019