Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 68801: [CRT] Don't call DeleteCriticalSection on static critical section (wine-patch by Piotr Caban)
by cwittich＠svn.reactos.org 23 Aug '15

23 Aug '15

Author: cwittich Date: Sun Aug 23 09:05:26 2015 New Revision: 68801 URL: http://svn.reactos.org/svn/reactos?rev=68801&view=rev Log: [CRT] Don't call DeleteCriticalSection on static critical section (wine-patch by Piotr Caban) Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Sun Aug 23 09:05:26 2015 @@ -1050,8 +1050,6 @@ for(i=0; i<sizeof(fstream)/sizeof(fstream[0]); i++) free(fstream[i]); - - DeleteCriticalSection(&file_cs); } /*********************************************************************

1 0

[cwittich] 68800: [KERNEL32] fix a regression introduced in r68797
by cwittich＠svn.reactos.org 23 Aug '15

23 Aug '15

Author: cwittich Date: Sun Aug 23 08:19:39 2015 New Revision: 68800 URL: http://svn.reactos.org/svn/reactos?rev=68800&view=rev Log: [KERNEL32] fix a regression introduced in r68797 Modified: trunk/reactos/dll/win32/kernel32/client/path.c Modified: trunk/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] Sun Aug 23 08:19:39 2015 @@ -2118,7 +2118,7 @@ if (count >= ret) { - lstrcpynW(path, tmp_path, count); + lstrcpynW(path, full_tmp_path, count); /* the remaining buffer must be zeroed up to 32766 bytes in XP or 32767 * bytes after it, we will assume the > XP behavior for now */ memset(path + ret, 0, (min(count, 32767) - ret) * sizeof(WCHAR));

1 0

[cwittich] 68799: [ADVAPI32] prevent buffer overflow in ParseStringSecurityDescriptorToSecurityDescriptor (wine-patch by Alistair Leslie-Hughes)
by cwittich＠svn.reactos.org 23 Aug '15

23 Aug '15

Author: cwittich Date: Sun Aug 23 07:07:25 2015 New Revision: 68799 URL: http://svn.reactos.org/svn/reactos?rev=68799&view=rev Log: [ADVAPI32] prevent buffer overflow in ParseStringSecurityDescriptorToSecurityDescriptor (wine-patch by Alistair Leslie-Hughes) Modified: trunk/reactos/dll/win32/advapi32/wine/security.c Modified: trunk/reactos/dll/win32/advapi32/wine/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/wine/se… ============================================================================== --- trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/wine/security.c [iso-8859-1] Sun Aug 23 07:07:25 2015 @@ -2544,12 +2544,14 @@ { BOOL bret = FALSE; WCHAR toktype; - WCHAR tok[MAX_PATH]; + WCHAR *tok; LPCWSTR lptoken; LPBYTE lpNext = NULL; DWORD len; *cBytes = sizeof(SECURITY_DESCRIPTOR); + + tok = heap_alloc( (lstrlenW(StringSecurityDescriptor) + 1) * sizeof(WCHAR)); if (SecurityDescriptor) lpNext = (LPBYTE)(SecurityDescriptor + 1); @@ -2672,6 +2674,7 @@ bret = TRUE; lend: + heap_free(tok); return bret; }

1 0

[cwittich] 68798: [RTL] make RtlAddVectoredExceptionHandler hotpatchable
by cwittich＠svn.reactos.org 23 Aug '15

23 Aug '15

Author: cwittich Date: Sun Aug 23 07:01:19 2015 New Revision: 68798 URL: http://svn.reactos.org/svn/reactos?rev=68798&view=rev Log: [RTL] make RtlAddVectoredExceptionHandler hotpatchable Modified: trunk/reactos/lib/rtl/vectoreh.c Modified: trunk/reactos/lib/rtl/vectoreh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/vectoreh.c?rev=687… ============================================================================== --- trunk/reactos/lib/rtl/vectoreh.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/vectoreh.c [iso-8859-1] Sun Aug 23 07:01:19 2015 @@ -111,7 +111,7 @@ /* * @implemented */ -PVOID NTAPI +PVOID NTAPI DECLSPEC_HOTPATCH RtlAddVectoredExceptionHandler(IN ULONG FirstHandler, IN PVECTORED_EXCEPTION_HANDLER VectoredHandler) {

1 0

[cwittich] 68797: [KERNEL32] sync GetTempPathW with wine wine-1.7.50
by cwittich＠svn.reactos.org 23 Aug '15

23 Aug '15

Author: cwittich Date: Sun Aug 23 06:53:08 2015 New Revision: 68797 URL: http://svn.reactos.org/svn/reactos?rev=68797&view=rev Log: [KERNEL32] sync GetTempPathW with wine wine-1.7.50 Modified: trunk/reactos/dll/win32/kernel32/client/path.c Modified: trunk/reactos/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/path.c [iso-8859-1] Sun Aug 23 06:53:08 2015 @@ -2116,13 +2116,18 @@ ret++; /* add space for terminating 0 */ - if (count) - { - lstrcpynW(path, full_tmp_path, count); - if (count >= ret) - ret--; /* return length without 0 */ - else if (count < 4) - path[0] = 0; /* avoid returning ambiguous "X:" */ + if (count >= ret) + { + lstrcpynW(path, tmp_path, count); + /* the remaining buffer must be zeroed up to 32766 bytes in XP or 32767 + * bytes after it, we will assume the > XP behavior for now */ + memset(path + ret, 0, (min(count, 32767) - ret) * sizeof(WCHAR)); + ret--; /* return length without 0 */ + } + else if (count) + { + /* the buffer must be cleared if contents will not fit */ + memset(path, 0, count * sizeof(WCHAR)); } DPRINT("GetTempPathW returning %u, %S\n", ret, path);

1 0

[cwittich] 68796: [PSDK] sync digitalv.h with wine (packing and x64 fixes)
by cwittich＠svn.reactos.org 23 Aug '15

23 Aug '15

Author: cwittich Date: Sun Aug 23 06:37:05 2015 New Revision: 68796 URL: http://svn.reactos.org/svn/reactos?rev=68796&view=rev Log: [PSDK] sync digitalv.h with wine (packing and x64 fixes) Modified: trunk/reactos/include/psdk/digitalv.h Modified: trunk/reactos/include/psdk/digitalv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/digitalv.h?re… ============================================================================== --- trunk/reactos/include/psdk/digitalv.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/digitalv.h [iso-8859-1] Sun Aug 23 06:37:05 2015 @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef __WINE_DIGITALV_H @@ -22,6 +22,8 @@ /* * Wine Digital Video extensions */ + +#include <pshpack1.h> #ifdef __cplusplus extern "C" { @@ -199,7 +201,7 @@ #define MCI_DGV_MONITOR_METHOD 0x00010000L #define MCI_DGV_MONITOR_SOURCE 0x00020000L -/* values for dwSource parameter of the MCI_DGV_MONITOR_PARMS struture */ +/* values for dwSource parameter of the MCI_DGV_MONITOR_PARMS structure */ #define MCI_DGV_MONITOR_INPUT 0x00004000L #define MCI_DGV_MONITOR_FILE 0x00004001L @@ -459,20 +461,20 @@ /* parameter block for MCI_WHERE, MCI_PUT, MCI_FREEZE, MCI_UNFREEZE cmds */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; RECT rc; } MCI_DGV_RECT_PARMS, *LPMCI_DGV_RECT_PARMS; /* parameter block for MCI_CAPTURE command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; LPSTR lpstrFileName; RECT rc; } MCI_DGV_CAPTURE_PARMSA, *LPMCI_DGV_CAPTURE_PARMSA; typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; LPWSTR lpstrFileName; RECT rc; } MCI_DGV_CAPTURE_PARMSW, *LPMCI_DGV_CAPTURE_PARMSW; @@ -487,7 +489,7 @@ /* parameter block for MCI_COPY command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwFrom; DWORD dwTo; RECT rc; @@ -498,14 +500,14 @@ /* parameter block for MCI_CUE command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwTo; } MCI_DGV_CUE_PARMS, *LPMCI_DGV_CUE_PARMS; /* parameter block for MCI_CUT command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwFrom; DWORD dwTo; RECT rc; @@ -516,7 +518,7 @@ /* parameter block for MCI_DELETE command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwFrom; DWORD dwTo; RECT rc; @@ -531,14 +533,14 @@ /* parameter block for MCI_INFO command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; LPSTR lpstrReturn; DWORD dwRetSize; DWORD dwItem; } MCI_DGV_INFO_PARMSA, * LPMCI_DGV_INFO_PARMSA; typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; LPWSTR lpstrReturn; DWORD dwRetSize; DWORD dwItem; @@ -550,7 +552,7 @@ /* parameter block for MCI_LIST command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; LPSTR lpstrReturn; DWORD dwLength; DWORD dwNumber; @@ -559,7 +561,7 @@ } MCI_DGV_LIST_PARMSA, *LPMCI_DGV_LIST_PARMSA; typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; LPWSTR lpstrReturn; DWORD dwLength; DWORD dwNumber; @@ -581,7 +583,7 @@ /* parameter block for MCI_MONITOR command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwSource; DWORD dwMethod; } MCI_DGV_MONITOR_PARMS, * LPMCI_DGV_MONITOR_PARMS; @@ -589,7 +591,7 @@ /* parameter block for MCI_OPEN command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; UINT wDeviceID; LPSTR lpstrDeviceType; LPSTR lpstrElementName; @@ -599,7 +601,7 @@ } MCI_DGV_OPEN_PARMSA, *LPMCI_DGV_OPEN_PARMSA; typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; UINT wDeviceID; LPWSTR lpstrDeviceType; LPWSTR lpstrElementName; @@ -618,7 +620,7 @@ /* parameter block for MCI_PASTE command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwTo; RECT rc; DWORD dwAudioStream; @@ -636,7 +638,7 @@ /* parameter block for MCI_QUALITY command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwItem; LPSTR lpstrName; DWORD lpstrAlgorithm; @@ -644,7 +646,7 @@ } MCI_DGV_QUALITY_PARMSA, *LPMCI_DGV_QUALITY_PARMSA; typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwItem; LPWSTR lpstrName; DWORD lpstrAlgorithm; @@ -661,7 +663,7 @@ /* parameter block for MCI_RECORD command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwFrom; DWORD dwTo; RECT rc; @@ -672,13 +674,13 @@ /* parameter block for MCI_RESERVE command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; LPSTR lpstrPath; DWORD dwSize; } MCI_DGV_RESERVE_PARMSA, *LPMCI_DGV_RESERVE_PARMSA; typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; LPWSTR lpstrPath; DWORD dwSize; } MCI_DGV_RESERVE_PARMSW, *LPMCI_DGV_RESERVE_PARMSW; @@ -689,13 +691,13 @@ /* parameter block for MCI_RESTORE command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; LPSTR lpstrFileName; RECT rc; } MCI_DGV_RESTORE_PARMSA, *LPMCI_DGV_RESTORE_PARMSA; typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; LPWSTR lpstrFileName; RECT rc; } MCI_DGV_RESTORE_PARMSW, *LPMCI_DGV_RESTORE_PARMSW; @@ -710,13 +712,13 @@ /* parameter block for MCI_SAVE command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; LPSTR lpstrFileName; RECT rc; } MCI_DGV_SAVE_PARMSA, *LPMCI_DGV_SAVE_PARMSA; typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; LPWSTR lpstrFileName; RECT rc; } MCI_DGV_SAVE_PARMSW, *LPMCI_DGV_SAVE_PARMSW; @@ -727,7 +729,7 @@ /* parameter block for MCI_SET command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwTimeFormat; DWORD dwAudio; DWORD dwFileFormat; @@ -737,7 +739,7 @@ /* parameter block for MCI_SETAUDIO command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwItem; DWORD dwValue; DWORD dwOver; @@ -746,7 +748,7 @@ } MCI_DGV_SETAUDIO_PARMSA, *LPMCI_DGV_SETAUDIO_PARMSA; typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwItem; DWORD dwValue; DWORD dwOver; @@ -760,7 +762,7 @@ /* parameter block for MCI_SIGNAL command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwPosition; DWORD dwPeriod; DWORD dwUserParm; @@ -769,7 +771,7 @@ /* parameter block for MCI_SETVIDEO command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwItem; DWORD dwValue; DWORD dwOver; @@ -779,7 +781,7 @@ } MCI_DGV_SETVIDEO_PARMSA, *LPMCI_DGV_SETVIDEO_PARMSA; typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwItem; DWORD dwValue; DWORD dwOver; @@ -794,8 +796,8 @@ /* parameter block for MCI_STATUS command message */ typedef struct { - DWORD dwCallback; - DWORD dwReturn; + DWORD_PTR dwCallback; + DWORD_PTR dwReturn; DWORD dwItem; DWORD dwTrack; LPSTR lpstrDrive; @@ -803,8 +805,8 @@ } MCI_DGV_STATUS_PARMSA, *LPMCI_DGV_STATUS_PARMSA; typedef struct { - DWORD dwCallback; - DWORD dwReturn; + DWORD_PTR dwCallback; + DWORD_PTR dwReturn; DWORD dwItem; DWORD dwTrack; LPWSTR lpstrDrive; @@ -817,7 +819,7 @@ /* parameter block for MCI_STEP command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; DWORD dwFrames; } MCI_DGV_STEP_PARMS, *LPMCI_DGV_STEP_PARMS; @@ -832,7 +834,7 @@ /* parameter block for MCI_UPDATE command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; RECT rc; HDC hDC; } MCI_DGV_UPDATE_PARMS, * LPMCI_DGV_UPDATE_PARMS; @@ -844,14 +846,14 @@ /* parameter block for MCI_WINDOW command message */ typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; HWND hWnd; UINT nCmdShow; LPSTR lpstrText; } MCI_DGV_WINDOW_PARMSA, *LPMCI_DGV_WINDOW_PARMSA; typedef struct { - DWORD dwCallback; + DWORD_PTR dwCallback; HWND hWnd; UINT nCmdShow; LPWSTR lpstrText; @@ -861,4 +863,6 @@ } #endif +#include <poppack.h> + #endif /* __WINE_DIGITALV_H */

1 0

[cwittich] 68795: [UXTHEME] Fix bug preventing GetThemeString from working (patch by Mark Harmstone)
by cwittich＠svn.reactos.org 22 Aug '15

22 Aug '15

Author: cwittich Date: Sat Aug 22 18:40:59 2015 New Revision: 68795 URL: http://svn.reactos.org/svn/reactos?rev=68795&view=rev Log: [UXTHEME] Fix bug preventing GetThemeString from working (patch by Mark Harmstone) Modified: trunk/reactos/dll/win32/uxtheme/property.c Modified: trunk/reactos/dll/win32/uxtheme/property.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/property… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/property.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/property.c [iso-8859-1] Sat Aug 22 18:40:59 2015 @@ -194,7 +194,7 @@ if(!hTheme) return E_HANDLE; - if(!(tp = MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, iPropId))) + if(!(tp = MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_STRING, iPropId))) return E_PROP_ID_UNSUPPORTED; return MSSTYLES_GetPropertyString(tp, pszBuff, cchMaxBuffChars); }

1 0

[pschweitzer] 68794: [HACKSSIGN] Stack hacks! Let's introduce hackssign. This application (and its associated driver) are here to allow users to assign drive letter to their VMware/VBox shared fold...
by pschweitzer＠svn.reactos.org 22 Aug '15

22 Aug '15

Author: pschweitzer Date: Sat Aug 22 12:29:37 2015 New Revision: 68794 URL: http://svn.reactos.org/svn/reactos?rev=68794&view=rev Log: [HACKSSIGN] Stack hacks! Let's introduce hackssign. This application (and its associated driver) are here to allow users to assign drive letter to their VMware/VBox shared folders. It relies on two components: a client to communicate the instructions and a driver to execute such instructions. Do not execute this application nor its driver outside ReactOS. There are barely no security checks nor sanety checks. You could do substantial damages. So, let's go back to shared folders state in ReactOS nowadays... VMware ------ Configure your shared folders Install VMware Tools Reboot >From here, you can access your share from cmd or explorer with UNC path (for instance: \\vmware-host\Shared Folders\ReactOS) Go to C:\ReactOS\bin (or whatever, depending on your setup) Execute hackssign assign z ReactOS vmware (for instance) z is the letter you want to give, and ReactOS is the name of your share (you gave it in VMware configuration) You're done, you can access your share with the Z drive letter VirtualBox ---------- Configure your shared folders Install VBox Guest Additions Reboot Go to C:\ReactOS\bin (or whatever, depending on your setup) Execute rosvboxmgmt start >From here, you can access your share from cmd or explorer with UNC path (for instance: \\vboxsvr\ReactOS) Execute hackssign assign z ReactOS virtualbox (for instance) z is the letter you want to give, and ReactOS is the name of your share (you gave it in VMware configuration) You're done, you can access your share with the Z drive letter Note that you can delete an assignement by performing a hackssign delete z (or whatever drive you want to remove). In such case, the share remains available with its UNC path. Added: trunk/rosapps/applications/cmdutils/hackssign/ trunk/rosapps/applications/cmdutils/hackssign/CMakeLists.txt (with props) trunk/rosapps/applications/cmdutils/hackssign/client.c (with props) trunk/rosapps/applications/cmdutils/hackssign/driver.c (with props) trunk/rosapps/applications/cmdutils/hackssign/hackssign.rc (with props) trunk/rosapps/applications/cmdutils/hackssign/ioctl.h (with props) Modified: trunk/rosapps/applications/cmdutils/CMakeLists.txt trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c Modified: trunk/rosapps/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/CMak… ============================================================================== --- trunk/rosapps/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/CMakeLists.txt [iso-8859-1] Sat Aug 22 12:29:37 2015 @@ -1,5 +1,6 @@ add_subdirectory(appwiz) add_subdirectory(cat) +add_subdirectory(hackssign) add_subdirectory(ntfsinfo) add_subdirectory(rosvboxmgmt) add_subdirectory(tee) Added: trunk/rosapps/applications/cmdutils/hackssign/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/hack… ============================================================================== --- trunk/rosapps/applications/cmdutils/hackssign/CMakeLists.txt (added) +++ trunk/rosapps/applications/cmdutils/hackssign/CMakeLists.txt [iso-8859-1] Sat Aug 22 12:29:37 2015 @@ -0,0 +1,9 @@ +add_executable(hackssign_client client.c hackssign.rc) +set_module_type(hackssign_client win32cui UNICODE) +add_importlibs(hackssign_client msvcrt kernel32 advapi32) +add_cd_file(TARGET hackssign_client DESTINATION reactos/bin FOR all) + +add_library(hackssign_driver SHARED driver.c hackssign.rc) +set_module_type(hackssign_driver kernelmodedriver) +add_importlibs(hackssign_driver ntoskrnl hal) +add_cd_file(TARGET hackssign_driver DESTINATION reactos/bin FOR all) Propchange: trunk/rosapps/applications/cmdutils/hackssign/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/cmdutils/hackssign/client.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/hack… ============================================================================== --- trunk/rosapps/applications/cmdutils/hackssign/client.c (added) +++ trunk/rosapps/applications/cmdutils/hackssign/client.c [iso-8859-1] Sat Aug 22 12:29:37 2015 @@ -0,0 +1,263 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Hackssign application & driver + * FILE: cmdutils/hackssign/client.c + * PURPOSE: Client: Assign drive letter to shared folders for VMware/VBox VMs + * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <stdio.h> +#include <wchar.h> +#include <windows.h> + +#include "ioctl.h" + +/* DON'T MESS AROUND THIS! */ +typedef enum _HV_TYPES +{ + vmVMware, + vmVirtualBox, + vmMax, +} HV_TYPES; +PCWSTR hV[] = { L"vmware", L"virtualbox" }; +PCWSTR dev[] = { L"\\Device\\hgfs\\;", L"\\Device\\VBoxMiniRdr\\;" }; +PCWSTR unc[] = { L":\\vmware-host\\Shared Folders\\", L":\\vboxsvr\\" }; + +BOOL performDevIoCtl(DWORD dwIoControlCode, LPVOID lpInBuffer, DWORD nInBufferSize) +{ + BOOL ret; + HANDLE dev; + DWORD lpBytesReturned; + + dev = CreateFile(L"\\\\.\\hackssign", + GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, NULL); + if (dev == INVALID_HANDLE_VALUE) + { + wprintf(L"Opening device failed\n"); + return FALSE; + } + + ret = DeviceIoControl(dev, dwIoControlCode, lpInBuffer, nInBufferSize, NULL, 0, &lpBytesReturned, NULL); + wprintf(L"Done: it %s with error: %lx\n", (ret != 0 ? L"succeed" : L"failed"), (ret != 0 ? ERROR_SUCCESS : GetLastError())); + + CloseHandle(dev); + + return ret; +} + + +BOOL startService() +{ + PWSTR fileName; + WCHAR path[MAX_PATH]; + SC_HANDLE hManager, hService; + + hManager = OpenSCManager(NULL, NULL, SC_MANAGER_CREATE_SERVICE); + if (hManager == NULL) + { + wprintf(L"Service manager opening failed\n"); + return FALSE; + } + + hService = OpenService(hManager, L"hackssign", SERVICE_START | SERVICE_STOP | DELETE); + if (hService == NULL) + { + if (GetModuleFileName(NULL, path, MAX_PATH) == 0) + { + wprintf(L"Getting own path failed\n"); + CloseServiceHandle(hManager); + return FALSE; + } + + fileName = wcsrchr(path, L'\\'); + if (fileName == NULL) + { + wprintf(L"Invalid path: %s\n", path); + CloseServiceHandle(hManager); + return FALSE; + } + + ++fileName; + *fileName = UNICODE_NULL; + wcscat(path, L"hackssign_driver.sys"); + + if (GetFileAttributes(path) == INVALID_FILE_ATTRIBUTES) + { + wprintf(L"Driver not found: %s\n", path); + CloseServiceHandle(hManager); + return FALSE; + } + + hService = CreateService(hManager, L"hackssign", L"hackssign", + SERVICE_START | SERVICE_STOP | DELETE, SERVICE_KERNEL_DRIVER, + SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, path, NULL, NULL, + NULL, NULL, NULL); + if (hService == NULL) + { + wprintf(L"Creating service failed\n"); + CloseServiceHandle(hManager); + return FALSE; + } + } + + if (!StartService(hService, 0, NULL) && + GetLastError() != ERROR_SERVICE_ALREADY_RUNNING) + { + wprintf(L"Starting service failed\n"); + CloseServiceHandle(hService); + CloseServiceHandle(hManager); + return FALSE; + } + + wprintf(L"Starting service succeed\n"); + CloseServiceHandle(hService); + CloseServiceHandle(hManager); + return TRUE; +} + +int assignLetter(WCHAR letter, PCWSTR path, PCWSTR device) +{ + BOOL ret; + DWORD len; + PWSTR str; + HV_TYPES vm; + WCHAR capsLetter; + DWORD inputBufferSize; + PASSIGN_INPUT inputBuffer; + + for (vm = vmVMware; vm < vmMax; ++vm) + { + if (_wcsicmp(device, hV[vm]) == 0) + { + break; + } + } + if (vm == vmMax) + { + wprintf(L"Unsupported VM type\n"); + return 1; + } + + if (iswalpha(letter) == 0) + { + wprintf(L"Invalid letter provided\n"); + return 1; + } + + capsLetter = towupper(letter); + if (capsLetter == L'C') + { + wprintf(L"Looks suspicious, won't proceed\n"); + return 1; + } + + len = wcslen(path); + if (len == 0) + { + wprintf(L"Invalid share name\n"); + return 1; + } + + if (wcschr(path, L'\\') != NULL) + { + wprintf(L"Only give the name of a share\n"); + return 1; + } + + inputBufferSize = len * sizeof(WCHAR) + sizeof(ASSIGN_INPUT) + (wcslen(dev[vm]) + wcslen(unc[vm]) + 2) * sizeof(WCHAR); + inputBuffer = malloc(inputBufferSize); + if (inputBuffer == NULL) + { + wprintf(L"Memory failure\n"); + return 1; + } + + inputBuffer->letter = capsLetter; + inputBuffer->offset = sizeof(ASSIGN_INPUT); + inputBuffer->len = len * sizeof(WCHAR) + (wcslen(dev[vm]) + wcslen(unc[vm]) + 1) * sizeof(WCHAR); + str = (PWSTR)((ULONG_PTR)inputBuffer + inputBuffer->offset); + swprintf(str, L"%s%c%s%s", dev[vm], capsLetter, unc[vm], path); + + if (!startService()) + { + free(inputBuffer); + return 1; + } + + Sleep(500); + + ret = performDevIoCtl(FSCTL_HACKSSIGN_ASSIGN, inputBuffer, inputBufferSize); + free(inputBuffer); + + return (ret == FALSE); +} + +int deleteLetter(WCHAR letter) +{ + WCHAR capsLetter; + + if (iswalpha(letter) == 0) + { + wprintf(L"Invalid letter provided\n"); + return 1; + } + + capsLetter = towupper(letter); + if (capsLetter == L'C') + { + wprintf(L"Looks suspicious, won't proceed\n"); + return 1; + } + + if (!startService()) + { + return 1; + } + + Sleep(500); + + return (performDevIoCtl(FSCTL_HACKSSIGN_DELETE, &capsLetter, sizeof(WCHAR)) == FALSE); +} + +void printUsage(void) +{ + wprintf(L"ReactOS Hackssign application\n"); + wprintf(L"\assign <letter> <share name> <vmtype>: Assign a drive letter to the share given the VM type\n"); + wprintf(L"\t\tVM types are: vmware or virtual\n"); + wprintf(L"\tdelete <letter>: delete driver letter assignation\n"); +} + +int wmain(int argc, wchar_t *argv[]) +{ + PCWSTR cmd; + + if (argc < 3) + { + printUsage(); + return 0; + } + + cmd = argv[1]; + + if (_wcsicmp(cmd, L"assign") == 0) + { + if (argc < 5) + { + printUsage(); + return 0; + } + + return assignLetter(argv[2][0], argv[3], argv[4]); + } + else if (_wcsicmp(cmd, L"delete") == 0) + { + return deleteLetter(argv[2][0]); + } + else + { + printUsage(); + return 0; + } +} Propchange: trunk/rosapps/applications/cmdutils/hackssign/client.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/cmdutils/hackssign/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/hack… ============================================================================== --- trunk/rosapps/applications/cmdutils/hackssign/driver.c (added) +++ trunk/rosapps/applications/cmdutils/hackssign/driver.c [iso-8859-1] Sat Aug 22 12:29:37 2015 @@ -0,0 +1,198 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Hackssign application & driver + * FILE: cmdutils/hackssign/driver.c + * PURPOSE: Driver: Assign drive letter to shared folders for VMware/VBox VMs + * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <wdm.h> +#include <ntifs.h> +#include <wchar.h> +#define NDEBUG +#include <debug.h> + +#include "ioctl.h" + +typedef struct _HS_VCB +{ + SHARE_ACCESS shareAccess; +} HS_VCB, *PHS_VCB; + +ERESOURCE globalLock; +PDEVICE_OBJECT gDevObj; + +NTSTATUS +NTAPI +hsDispatch(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PHS_VCB vcb; + NTSTATUS status; + WCHAR dosBuffer[7]; + PFILE_OBJECT fileObject; + PIO_STACK_LOCATION stack; + PASSIGN_INPUT inputBuffer; + UNICODE_STRING target, source; + + FsRtlEnterFileSystem(); + ExAcquireResourceExclusiveLite(&globalLock, TRUE); + + stack = IoGetCurrentIrpStackLocation(Irp); + fileObject = stack->FileObject; + switch (stack->MajorFunction) + { + case IRP_MJ_CREATE: + if (fileObject->FileName.Length != 0) + { + status = STATUS_INVALID_DEVICE_REQUEST; + break; + } + + status = IoCheckShareAccess(stack->Parameters.Create.SecurityContext->DesiredAccess, + stack->Parameters.Create.ShareAccess, + fileObject, &((PHS_VCB)DeviceObject->DeviceExtension)->shareAccess, TRUE); + if (NT_SUCCESS(status)) + { + DPRINT1("Device opened\n"); + + Irp->IoStatus.Information = FILE_OPENED; + fileObject->FsContext = DeviceObject->DeviceExtension; + status = STATUS_SUCCESS; + } + break; + + case IRP_MJ_FILE_SYSTEM_CONTROL: + if (stack->Parameters.FileSystemControl.FsControlCode == FSCTL_HACKSSIGN_ASSIGN) + { + if (stack->Parameters.FileSystemControl.InputBufferLength <= sizeof(ASSIGN_INPUT) || + Irp->AssociatedIrp.SystemBuffer == NULL) + { + status = STATUS_INVALID_DEVICE_REQUEST; + break; + } + + inputBuffer = Irp->AssociatedIrp.SystemBuffer; + + swprintf(dosBuffer, L"\\??\\%c:", inputBuffer->letter); + RtlInitUnicodeString(&source, dosBuffer); + target.Buffer = (PWSTR)((ULONG_PTR)inputBuffer + inputBuffer->offset); + target.Length = inputBuffer->len; + target.MaximumLength = target.Length; + + DPRINT1("Will link %wZ to %wZ\n", &source, &target); + + status = IoCreateSymbolicLink(&source, &target); + break; + } + else if (stack->Parameters.FileSystemControl.FsControlCode == FSCTL_HACKSSIGN_DELETE) + { + if (stack->Parameters.FileSystemControl.InputBufferLength < sizeof(WCHAR) || + Irp->AssociatedIrp.SystemBuffer == NULL) + { + status = STATUS_INVALID_DEVICE_REQUEST; + break; + } + + inputBuffer = Irp->AssociatedIrp.SystemBuffer; + + swprintf(dosBuffer, L"\\??\\%c:", inputBuffer->letter); + RtlInitUnicodeString(&source, dosBuffer); + + DPRINT1("Will unlink %wZ\n", &source); + + status = IoDeleteSymbolicLink(&source); + break; + } + + status = STATUS_INVALID_DEVICE_REQUEST; + break; + + case IRP_MJ_CLEANUP: + vcb = fileObject->FsContext; + if (vcb == NULL) + { + status = STATUS_INVALID_HANDLE; + break; + } + + DPRINT1("Device cleaned up\n"); + IoRemoveShareAccess(fileObject, &vcb->shareAccess); + status = STATUS_SUCCESS; + break; + + case IRP_MJ_CLOSE: + vcb = fileObject->FsContext; + if (vcb == NULL) + { + status = STATUS_INVALID_HANDLE; + break; + } + + DPRINT1("Device closed\n"); + fileObject->FsContext = NULL; + status = STATUS_SUCCESS; + break; + + default: + status = STATUS_INVALID_DEVICE_REQUEST; + break; + } + + ExReleaseResourceLite(&globalLock); + FsRtlExitFileSystem(); + + Irp->IoStatus.Status = status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return status; +} + +VOID +NTAPI +hsUnload(PDRIVER_OBJECT DriverObject) +{ + IoDeleteDevice(gDevObj); + ExDeleteResourceLite(&globalLock); +} + +NTSTATUS +NTAPI +DriverEntry(PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath) +{ + NTSTATUS status; + PDEVICE_OBJECT devObj; + UNICODE_STRING devName, uDevName; + + DPRINT1("Starting hackssign driver\n"); + + RtlInitUnicodeString(&devName, L"\\Device\\hackssign"); + status = IoCreateDevice(DriverObject, sizeof(HS_VCB), &devName, FILE_DEVICE_FILE_SYSTEM, 0, FALSE, &devObj); + if (!NT_SUCCESS(status)) + { + DPRINT1("IoCreateDevice failed\n"); + return status; + } + + RtlInitUnicodeString(&uDevName, L"\\??\\hackssign"); + status = IoCreateSymbolicLink(&uDevName, &devName); + if (!NT_SUCCESS(status)) + { + DPRINT1("IoCreateSymbolicLink failed\n"); + IoDeleteDevice(devObj); + return status; + } + + gDevObj = devObj; + ExInitializeResourceLite(&globalLock); + RtlZeroMemory(devObj->DeviceExtension, sizeof(HS_VCB)); + + DriverObject->DriverUnload = hsUnload; + DriverObject->MajorFunction[IRP_MJ_CREATE] = hsDispatch; + DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = hsDispatch; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = hsDispatch; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = hsDispatch; + + return STATUS_SUCCESS; +} Propchange: trunk/rosapps/applications/cmdutils/hackssign/driver.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/cmdutils/hackssign/hackssign.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/hack… ============================================================================== --- trunk/rosapps/applications/cmdutils/hackssign/hackssign.rc (added) +++ trunk/rosapps/applications/cmdutils/hackssign/hackssign.rc [iso-8859-1] Sat Aug 22 12:29:37 2015 @@ -0,0 +1,5 @@ + +#define REACTOS_STR_FILE_DESCRIPTION "Hack assign letters\0" +#define REACTOS_STR_INTERNAL_NAME "hackssign\0" +#define REACTOS_STR_ORIGINAL_FILENAME "hackssign.exe\0" +#include <reactos/version.rc> Propchange: trunk/rosapps/applications/cmdutils/hackssign/hackssign.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/cmdutils/hackssign/ioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/hack… ============================================================================== --- trunk/rosapps/applications/cmdutils/hackssign/ioctl.h (added) +++ trunk/rosapps/applications/cmdutils/hackssign/ioctl.h [iso-8859-1] Sat Aug 22 12:29:37 2015 @@ -0,0 +1,9 @@ +typedef struct _ASSIGN_INPUT +{ + WCHAR letter; + USHORT offset; + USHORT len; +} ASSIGN_INPUT, *PASSIGN_INPUT; + +#define FSCTL_HACKSSIGN_ASSIGN CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 0x42, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_HACKSSIGN_DELETE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 42, METHOD_BUFFERED, FILE_ANY_ACCESS) Propchange: trunk/rosapps/applications/cmdutils/hackssign/ioctl.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/rosv… ============================================================================== --- trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/rosvboxmgmt/rosvboxmgmt.c [iso-8859-1] Sat Aug 22 12:29:37 2015 @@ -1,3 +1,11 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS VBox Shared Folders Management + * FILE: cmdutils/hackssign/client.c + * PURPOSE: Communicate with VBox mini redirector to deal with shared folders + * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> + */ + #include <stdio.h> #include <wchar.h> #include <windows.h>

1 0

[bfreisen] 68793: [HHPCOMP] Remove __inline to fix VS 2015 build. See CORE-10013.
by bfreisen＠svn.reactos.org 22 Aug '15

22 Aug '15

Author: bfreisen Date: Sat Aug 22 11:41:11 2015 New Revision: 68793 URL: http://svn.reactos.org/svn/reactos?rev=68793&view=rev Log: [HHPCOMP] Remove __inline to fix VS 2015 build. See CORE-10013. Modified: trunk/reactos/tools/hhpcomp/lzx_compress/lz_nonslide.c Modified: trunk/reactos/tools/hhpcomp/lzx_compress/lz_nonslide.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hhpcomp/lzx_compress… ============================================================================== --- trunk/reactos/tools/hhpcomp/lzx_compress/lz_nonslide.c [iso-8859-1] (original) +++ trunk/reactos/tools/hhpcomp/lzx_compress/lz_nonslide.c [iso-8859-1] Sat Aug 22 11:41:11 2015 @@ -139,7 +139,7 @@ } #endif -__inline int lz_left_to_process(lz_info *lzi) +int lz_left_to_process(lz_info *lzi) { return lzi->chars_in_buf - lzi->block_loc; }

1 0

[bfreisen] 68792: [HHPCOMP] Improve functionality of Windows MSVC build. Based on a WIP patch by Michael Fritscher. See CORE-10019.
by bfreisen＠svn.reactos.org 22 Aug '15

22 Aug '15

Author: bfreisen Date: Sat Aug 22 11:16:50 2015 New Revision: 68792 URL: http://svn.reactos.org/svn/reactos?rev=68792&view=rev Log: [HHPCOMP] Improve functionality of Windows MSVC build. Based on a WIP patch by Michael Fritscher. See CORE-10019. Modified: trunk/reactos/tools/hhpcomp/chmc/chmc.c trunk/reactos/tools/hhpcomp/hhpcomp.cpp trunk/reactos/tools/hhpcomp/port/mkstemps.c Modified: trunk/reactos/tools/hhpcomp/chmc/chmc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hhpcomp/chmc/chmc.c?… ============================================================================== --- trunk/reactos/tools/hhpcomp/chmc/chmc.c [iso-8859-1] (original) +++ trunk/reactos/tools/hhpcomp/chmc/chmc.c [iso-8859-1] Sat Aug 22 11:16:50 2015 @@ -44,6 +44,11 @@ #include "../lzx_compress/lzx_compress.h" #define PACKAGE_STRING "hhpcomp development version" + +/* if O_BINARY is not defined, the system is probably not expecting any such flag */ +#ifndef O_BINARY +#define O_BINARY 0 +#endif int chmc_section_add(struct chmcFile *chm, const char *name); struct chmcSection * chmc_section_create(struct chmcFile *chm, @@ -133,7 +138,7 @@ chm->config = config; if (strcmp(filename, "-") != 0) { - chm->fd = creat(filename, 0644); + chm->fd = open(filename, O_RDWR | O_CREAT | O_TRUNC | O_BINARY, 0644); if (chm->fd < 0) { chmcerr_set(errno, strerror(errno)); chmcerr_return_msg("creat file '%s'", filename); @@ -978,7 +983,9 @@ struct chmcLzxInfo *lzx_info = (struct chmcLzxInfo *)arg; struct chmcSect0 *sect0 = &lzx_info->chm->sect0; int wx; - + static int counter = 0; + + counter += n; wx = write(lzx_info->section->fd, buf, n); sect0->file_len += wx; lzx_info->section->len += wx; @@ -1025,7 +1032,7 @@ // need to keep current entry file and offset trought blocks // until last entry while (todo) { - // end of entris reached? + // end of entries reached? if (lzx_info->pos == &chm->entries_list) { lzx_info->eof = 1; break; @@ -1046,7 +1053,7 @@ else if (lzx_info->fd == -1) { // open file if it isn't - lzx_info->fd = open(node->name, O_RDONLY); + lzx_info->fd = open(node->name, O_RDONLY | O_BINARY); if (lzx_info->fd < 0) { chmc_error("%s: %d: error %d: '%s' %s\n", __FILE__, __LINE__, @@ -1073,7 +1080,8 @@ { rx = read(lzx_info->fd, (char *)buf + (n - todo), toread); if (rx <= 0) { - chmc_error("read error\n"); + int temp = errno; + chmc_error("read error %s \n", strerror(temp)); lzx_info->error = 2; break; } @@ -1610,18 +1618,24 @@ assert(chm); + chmc_dump("write itsf %d\n", _CHMC_ITSF_V3_LEN); write(chm->fd, itsf, _CHMC_ITSF_V3_LEN); + chmc_dump("write sect0 %d\n", _CHMC_SECT0_LEN); write(chm->fd, sect0, _CHMC_SECT0_LEN); + chmc_dump("write itsp %d\n", _CHMC_ITSP_V1_LEN); write(chm->fd, itsp, _CHMC_ITSP_V1_LEN); list_for_each(pos, &chm->pmgl_list) { pmgl = list_entry(pos, struct chmcPmglChunkNode, list); + chmc_dump("write pmgl %d\n", _CHMC_CHUNK_LEN); write(chm->fd, &pmgl->chunk, _CHMC_CHUNK_LEN); } + chmc_dump("itsp->num_blocks %d", itsp->num_blocks); if (itsp->num_blocks > 1) { list_for_each( pos, &chm->pmgi_list ) { pmgi = list_entry(pos, struct chmcPmgiChunkNode, list); + chmc_dump("write pmgi %d\n", _CHMC_CHUNK_LEN); write(chm->fd, &pmgi->chunk, _CHMC_CHUNK_LEN); } } @@ -1640,7 +1654,7 @@ if (stat(filename, &statbuf) < 0) return errno; - in = open(filename, O_RDONLY); + in = open(filename, O_RDONLY | O_BINARY); if (in >= 0) { todo = statbuf.st_size; Modified: trunk/reactos/tools/hhpcomp/hhpcomp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hhpcomp/hhpcomp.cpp?… ============================================================================== --- trunk/reactos/tools/hhpcomp/hhpcomp.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/hhpcomp/hhpcomp.cpp [iso-8859-1] Sat Aug 22 11:16:50 2015 @@ -62,11 +62,14 @@ struct chmcFile chm; struct chmcConfig chm_config; + memset(&chm, 0, sizeof(struct chmcFile)); + memset(&chm_config, 0, sizeof(struct chmcConfig)); chm_config.title = project_file.get_title_string().c_str(); chm_config.hhc = project_file.get_contents_file_string().c_str(); chm_config.hhk = project_file.get_index_file_string().c_str(); chm_config.deftopic = project_file.get_default_topic_string().c_str(); chm_config.language = project_file.get_language_code(); + chm_config.tmpdir = "."; int err; err = chmc_init(&chm, replace_backslashes(project_file.get_compiled_file_string()).c_str(), &chm_config); Modified: trunk/reactos/tools/hhpcomp/port/mkstemps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hhpcomp/port/mkstemp… ============================================================================== --- trunk/reactos/tools/hhpcomp/port/mkstemps.c [iso-8859-1] (original) +++ trunk/reactos/tools/hhpcomp/port/mkstemps.c [iso-8859-1] Sat Aug 22 11:16:50 2015 @@ -46,6 +46,11 @@ #define TMP_MAX 16384 #endif +/* if O_BINARY is not defined, the system is probably not expecting any such flag */ +#ifndef O_BINARY +#define O_BINARY 0 +#endif + /* @deftypefn Replacement int mkstemps (char *@var{template}, int @var{suffix_len}) @@ -87,6 +92,7 @@ if ((int) len < 6 + suffix_len || strncmp (&template[len - 6 - suffix_len], "XXXXXX", 6)) { + printf("wrong parameter\n"); return -1; } @@ -121,7 +127,7 @@ #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); + fd = open (template, O_RDWR|O_CREAT|O_EXCL|O_BINARY, 0600); #endif if (fd >= 0) /* The file does not exist. */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs