Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
Lima-camera-pco
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Jira
Jira
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
LimaGroup
Lima-camera-pco
Commits
3decc7b3
Commit
3decc7b3
authored
Apr 25, 2019
by
Roberto Arturo Homs-Regojo
Committed by
Roberto Arturo Homs-Regojo
Jun 27, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[wip] maxPath
parent
8be16776
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
include/Pco.h
include/Pco.h
+1
-0
src/PcoCameraUtils.cpp
src/PcoCameraUtils.cpp
+6
-6
No files found.
include/Pco.h
View file @
3decc7b3
...
...
@@ -148,6 +148,7 @@ DECLARE_HANDLE(HWND);
//-------------------- win
#ifndef __linux__
# define UNUSED
# define PATH_MAX MAX_PATH
#endif
//-------------------- linux / win
...
...
src/PcoCameraUtils.cpp
View file @
3decc7b3
...
...
@@ -168,7 +168,7 @@ time_t getTimestamp()
//(..\..\..\..\src\PcoCamera.cpp) $
#define LEN_BUFF_DATE 128
#define LEN_BUFF_PATH
260 // Same as MAX_PATH under Windows
#define LEN_BUFF_PATH
PATH_MAX // 260 in win
#define TOKNR_DT 5
int
__xlat_date
(
char
*
s1
,
char
&
ptrTo
,
int
lenTo
)
...
...
@@ -2737,7 +2737,7 @@ char *_getDllPath(const char *pzFileName, char *path, size_t strLen)
# pragma comment(lib, "version.lib")
# define LEN_DRIVE 7
# define LEN_DIR
MAX_PATH
# define LEN_DIR
PATH_MAX
//====================================================================
//====================================================================
...
...
@@ -2747,8 +2747,8 @@ char *_getDllPath(const char *pzFileName, char *path, size_t strLen)
char
drive
[
LEN_DRIVE
+
1
];
char
dir
[
LEN_DIR
+
1
];
char
_pathFn
[
MAX_PATH
+
1
];
char
_pathFnInstall
[
MAX_PATH
+
1
];
char
_pathFn
[
PATH_MAX
+
1
];
char
_pathFnInstall
[
PATH_MAX
+
1
];
char
*
ptr
;
size_t
nr
;
FILE
*
stream
;
...
...
@@ -2761,7 +2761,7 @@ char *_getDllPath(const char *pzFileName, char *path, size_t strLen)
return
path
;
# endif
GetModuleFileName
(
GetModuleHandle
(
pzFileName
),
_pathFn
,
MAX_PATH
);
GetModuleFileName
(
GetModuleHandle
(
pzFileName
),
_pathFn
,
PATH_MAX
);
err
=
_splitpath_s
(
_pathFn
,
drive
,
LEN_DRIVE
,
dir
,
LEN_DIR
,
NULL
,
0
,
NULL
,
0
);
...
...
@@ -2773,7 +2773,7 @@ char *_getDllPath(const char *pzFileName, char *path, size_t strLen)
*
ptr
=
0
;
ptr
=
path
;
err
=
_makepath_s
(
_pathFnInstall
,
MAX_PATH
,
drive
,
dir
,
err
=
_makepath_s
(
_pathFnInstall
,
PATH_MAX
,
drive
,
dir
,
FILENAME_INSTALL_VERSION
,
FILEEXT_INSTALL_VERSION
);
printf
(
"----- path[%s] path1[%s] drive[%s] dir[%s]
\n
"
,
_pathFn
,
_pathFnInstall
,
drive
,
dir
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment