diff options
Diffstat (limited to 'utils')
-rw-r--r-- | utils/MTP/MTP_DLL/MTP_DLL.cpp | 2 | ||||
-rw-r--r-- | utils/MTP/MTP_DLL/MTP_DLL.h | 4 | ||||
-rw-r--r-- | utils/MTP/MTP_DLL/MTP_DLL.vcproj | 30 | ||||
-rw-r--r-- | utils/MTP/MTP_DLL/mtp_wrapper.cpp | 8 | ||||
-rw-r--r-- | utils/MTP/MTP_DLL/progresshelper.cpp | 2 | ||||
-rw-r--r-- | utils/MTP/MTP_DLL/stdafx.cpp | 5 | ||||
-rw-r--r-- | utils/MTP/MTP_DLL/stdafx.h | 22 |
7 files changed, 11 insertions, 62 deletions
diff --git a/utils/MTP/MTP_DLL/MTP_DLL.cpp b/utils/MTP/MTP_DLL/MTP_DLL.cpp index 73085afaee..2d9bbe48cb 100644 --- a/utils/MTP/MTP_DLL/MTP_DLL.cpp +++ b/utils/MTP/MTP_DLL/MTP_DLL.cpp | |||
@@ -1,6 +1,6 @@ | |||
1 | /* MTP_DLL.cpp : Defines the entry point for the DLL application. */ | 1 | /* MTP_DLL.cpp : Defines the entry point for the DLL application. */ |
2 | 2 | ||
3 | #include "stdafx.h" | 3 | #include <windows.h> |
4 | #include "MTP_DLL.h" | 4 | #include "MTP_DLL.h" |
5 | 5 | ||
6 | 6 | ||
diff --git a/utils/MTP/MTP_DLL/MTP_DLL.h b/utils/MTP/MTP_DLL/MTP_DLL.h index 2793c936e1..6faab84619 100644 --- a/utils/MTP/MTP_DLL/MTP_DLL.h +++ b/utils/MTP/MTP_DLL/MTP_DLL.h | |||
@@ -2,11 +2,15 @@ | |||
2 | #ifndef MTP_DLL_H | 2 | #ifndef MTP_DLL_H |
3 | #define MTP_DLL_H | 3 | #define MTP_DLL_H |
4 | 4 | ||
5 | #ifndef MTP_NODLL | ||
5 | #ifdef MTP_DLL_EXPORTS | 6 | #ifdef MTP_DLL_EXPORTS |
6 | #define MTP_DLL_API __declspec(dllexport) | 7 | #define MTP_DLL_API __declspec(dllexport) |
7 | #else | 8 | #else |
8 | #define MTP_DLL_API __declspec(dllimport) | 9 | #define MTP_DLL_API __declspec(dllimport) |
9 | #endif | 10 | #endif |
11 | #else | ||
12 | #define MTP_DLL_API | ||
13 | #endif | ||
10 | 14 | ||
11 | #ifdef __cplusplus | 15 | #ifdef __cplusplus |
12 | extern "C" | 16 | extern "C" |
diff --git a/utils/MTP/MTP_DLL/MTP_DLL.vcproj b/utils/MTP/MTP_DLL/MTP_DLL.vcproj index 644e2e445e..d8acdfe8e7 100644 --- a/utils/MTP/MTP_DLL/MTP_DLL.vcproj +++ b/utils/MTP/MTP_DLL/MTP_DLL.vcproj | |||
@@ -45,7 +45,7 @@ | |||
45 | MinimalRebuild="true" | 45 | MinimalRebuild="true" |
46 | BasicRuntimeChecks="3" | 46 | BasicRuntimeChecks="3" |
47 | RuntimeLibrary="3" | 47 | RuntimeLibrary="3" |
48 | UsePrecompiledHeader="2" | 48 | UsePrecompiledHeader="0" |
49 | WarningLevel="3" | 49 | WarningLevel="3" |
50 | Detect64BitPortabilityProblems="true" | 50 | Detect64BitPortabilityProblems="true" |
51 | DebugInformationFormat="4" | 51 | DebugInformationFormat="4" |
@@ -121,7 +121,7 @@ | |||
121 | AdditionalIncludeDirectories="c:\wmsdk\wmfsdk95\include;c:\wmsdk\wmfsdk95\wmdm\inc" | 121 | AdditionalIncludeDirectories="c:\wmsdk\wmfsdk95\include;c:\wmsdk\wmfsdk95\wmdm\inc" |
122 | PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MTP_DLL_EXPORTS" | 122 | PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MTP_DLL_EXPORTS" |
123 | RuntimeLibrary="2" | 123 | RuntimeLibrary="2" |
124 | UsePrecompiledHeader="2" | 124 | UsePrecompiledHeader="0" |
125 | WarningLevel="3" | 125 | WarningLevel="3" |
126 | Detect64BitPortabilityProblems="true" | 126 | Detect64BitPortabilityProblems="true" |
127 | DebugInformationFormat="3" | 127 | DebugInformationFormat="3" |
@@ -170,7 +170,7 @@ | |||
170 | /> | 170 | /> |
171 | <Tool | 171 | <Tool |
172 | Name="VCPostBuildEventTool" | 172 | Name="VCPostBuildEventTool" |
173 | CommandLine="echo Copying $(TargetName) dll / lib to ..
copy /Y "$(InputDir)$(ConfigurationName)\$(TargetFileName)" "$(InputDir)..\"
copy /Y "$(InputDir)$(ConfigurationName)\$(TargetName).lib" "$(InputDir)..\"" | 173 | CommandLine="echo Copying $(TargetName) dll / lib to ..
copy /Y "$(InputDir)$(ConfigurationName)\$(TargetFileName)" "$(InputDir)..\"
copy /Y "$(InputDir)$(ConfigurationName)\$(TargetName).lib" "$(InputDir)..\"
" |
174 | /> | 174 | /> |
175 | </Configuration> | 175 | </Configuration> |
176 | </Configurations> | 176 | </Configurations> |
@@ -194,26 +194,6 @@ | |||
194 | RelativePath=".\progresshelper.cpp" | 194 | RelativePath=".\progresshelper.cpp" |
195 | > | 195 | > |
196 | </File> | 196 | </File> |
197 | <File | ||
198 | RelativePath=".\stdafx.cpp" | ||
199 | > | ||
200 | <FileConfiguration | ||
201 | Name="Debug|Win32" | ||
202 | > | ||
203 | <Tool | ||
204 | Name="VCCLCompilerTool" | ||
205 | UsePrecompiledHeader="1" | ||
206 | /> | ||
207 | </FileConfiguration> | ||
208 | <FileConfiguration | ||
209 | Name="Release|Win32" | ||
210 | > | ||
211 | <Tool | ||
212 | Name="VCCLCompilerTool" | ||
213 | UsePrecompiledHeader="1" | ||
214 | /> | ||
215 | </FileConfiguration> | ||
216 | </File> | ||
217 | </Filter> | 197 | </Filter> |
218 | <Filter | 198 | <Filter |
219 | Name="Header Files" | 199 | Name="Header Files" |
@@ -228,10 +208,6 @@ | |||
228 | RelativePath=".\progresshelper.h" | 208 | RelativePath=".\progresshelper.h" |
229 | > | 209 | > |
230 | </File> | 210 | </File> |
231 | <File | ||
232 | RelativePath=".\stdafx.h" | ||
233 | > | ||
234 | </File> | ||
235 | </Filter> | 211 | </Filter> |
236 | <Filter | 212 | <Filter |
237 | Name="Resource Files" | 213 | Name="Resource Files" |
diff --git a/utils/MTP/MTP_DLL/mtp_wrapper.cpp b/utils/MTP/MTP_DLL/mtp_wrapper.cpp index f444a59631..f3a05f3c0c 100644 --- a/utils/MTP/MTP_DLL/mtp_wrapper.cpp +++ b/utils/MTP/MTP_DLL/mtp_wrapper.cpp | |||
@@ -31,8 +31,6 @@ | |||
31 | */ | 31 | */ |
32 | 32 | ||
33 | 33 | ||
34 | #include "stdafx.h" | ||
35 | |||
36 | #include <windows.h> | 34 | #include <windows.h> |
37 | #include "mswmdm_i.c" | 35 | #include "mswmdm_i.c" |
38 | #include "mswmdm.h" | 36 | #include "mswmdm.h" |
@@ -120,7 +118,7 @@ static int mtp_close(struct mtp_if* mtp) | |||
120 | return 0; | 118 | return 0; |
121 | } | 119 | } |
122 | 120 | ||
123 | __declspec(dllexport) int mtp_description(wchar_t* name, wchar_t* manufacturer, DWORD* version) | 121 | MTP_DLL_API int mtp_description(wchar_t* name, wchar_t* manufacturer, DWORD* version) |
124 | { | 122 | { |
125 | HRESULT hr; | 123 | HRESULT hr; |
126 | int num = 0; | 124 | int num = 0; |
@@ -177,7 +175,7 @@ __declspec(dllexport) int mtp_description(wchar_t* name, wchar_t* manufacturer, | |||
177 | return (num > 0) ? num : -1; | 175 | return (num > 0) ? num : -1; |
178 | } | 176 | } |
179 | 177 | ||
180 | __declspec(dllexport) int mtp_sendnk(LPWSTR file, int filesize, void (*callback)(unsigned int progress, unsigned int max)) | 178 | MTP_DLL_API int mtp_sendnk(LPWSTR file, int filesize, void (*callback)(unsigned int progress, unsigned int max)) |
181 | { | 179 | { |
182 | HRESULT hr; | 180 | HRESULT hr; |
183 | bool return_value = false; | 181 | bool return_value = false; |
@@ -281,4 +279,4 @@ __declspec(dllexport) int mtp_sendnk(LPWSTR file, int filesize, void (*callback) | |||
281 | return return_value ? 1 : 0; | 279 | return return_value ? 1 : 0; |
282 | } | 280 | } |
283 | 281 | ||
284 | } \ No newline at end of file | 282 | } |
diff --git a/utils/MTP/MTP_DLL/progresshelper.cpp b/utils/MTP/MTP_DLL/progresshelper.cpp index a8aac365c5..0fabebe22e 100644 --- a/utils/MTP/MTP_DLL/progresshelper.cpp +++ b/utils/MTP/MTP_DLL/progresshelper.cpp | |||
@@ -30,8 +30,6 @@ | |||
30 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 30 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
31 | */ | 31 | */ |
32 | 32 | ||
33 | #include "stdafx.h" | ||
34 | |||
35 | #include <windows.h> | 33 | #include <windows.h> |
36 | #include "mswmdm_i.c" | 34 | #include "mswmdm_i.c" |
37 | #include "mswmdm.h" | 35 | #include "mswmdm.h" |
diff --git a/utils/MTP/MTP_DLL/stdafx.cpp b/utils/MTP/MTP_DLL/stdafx.cpp deleted file mode 100644 index c603f4f2c7..0000000000 --- a/utils/MTP/MTP_DLL/stdafx.cpp +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | /* stdafx.cpp : source file that includes just the standard includes | ||
2 | MTP_DLL.pch will be the pre-compiled header | ||
3 | stdafx.obj will contain the pre-compiled type information */ | ||
4 | |||
5 | #include "stdafx.h" | ||
diff --git a/utils/MTP/MTP_DLL/stdafx.h b/utils/MTP/MTP_DLL/stdafx.h deleted file mode 100644 index dc8d61f531..0000000000 --- a/utils/MTP/MTP_DLL/stdafx.h +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | #pragma once | ||
2 | |||
3 | /* Modify the following defines if you have to target a platform prior to the ones specified below. | ||
4 | Refer to MSDN for the latest info on corresponding values for different platforms. */ | ||
5 | #ifndef WINVER /* Allow use of features specific to Windows XP or later. */ | ||
6 | #define WINVER 0x0501 /* Change this to the appropriate value to target other versions of Windows. */ | ||
7 | #endif | ||
8 | |||
9 | #ifndef _WIN32_WINNT /* Allow use of features specific to Windows XP or later. */ | ||
10 | #define _WIN32_WINNT 0x0501 /* Change this to the appropriate value to target other versions of Windows. */ | ||
11 | #endif | ||
12 | |||
13 | #ifndef _WIN32_WINDOWS /* Allow use of features specific to Windows 98 or later. */ | ||
14 | #define _WIN32_WINDOWS 0x0410 /* Change this to the appropriate value to target Windows Me or later. */ | ||
15 | #endif | ||
16 | |||
17 | #ifndef _WIN32_IE /* Allow use of features specific to IE 6.0 or later. */ | ||
18 | #define _WIN32_IE 0x0600 /* Change this to the appropriate value to target other versions of IE. */ | ||
19 | #endif | ||
20 | |||
21 | #define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ | ||
22 | #include <windows.h> | ||