-
Notifications
You must be signed in to change notification settings - Fork 0
/
win32xx-MSYS2.patch
137 lines (125 loc) · 4.65 KB
/
win32xx-MSYS2.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
Only in win32xx/: .git
Only in win32xx/: build
Only in win32xx/: CMakeLists.txt
Only in win32xx/: README.md
diff -cr win32xx.old/samples/MovieShow/src/Mainfrm.cpp win32xx/samples/MovieShow/src/Mainfrm.cpp
*** win32xx.old/samples/MovieShow/src/Mainfrm.cpp 2021-04-27 16:56:11.587278500 +0800
--- win32xx/samples/MovieShow/src/Mainfrm.cpp 2021-04-27 16:55:54.547224400 +0800
***************
*** 13,18 ****
--- 13,19 ----
#endif
#include <gdiplus.h>
+ #include <shlwapi.h>
#ifdef _MSC_VER
#pragma warning (default : 4458) // enable declaration hides class member warning
***************
*** 56,63 ****
--- 57,66 ----
for (UINT j = 0; j < num; ++j)
{
+ #ifdef _MSC_VER
#pragma warning ( push )
#pragma warning ( disable : 6385 ) // '208' bytse might be read.
+ #endif
// Correct code incorrectly flaged with a C6385 warning by the VS2019 analyser.
if (wcscmp(pImageCodecInfo[j].MimeType, format) == 0)
{
***************
*** 65,71 ****
--- 68,76 ----
free(pImageCodecInfo);
return j; // Success
}
+ #ifdef _MSC_VER
#pragma warning ( pop ) // ( disable : 6385 ) '208' bytse might be read.
+ #endif
}
free(pImageCodecInfo);
***************
*** 167,173 ****
CLSID gifClsid;
GetEncoderClsid(L"image/gif", &gifClsid);
! VERIFY(Gdiplus::Ok == img->Save(stream, &gifClsid));
// Get the size of the stream
ULARGE_INTEGER streamSize;
--- 172,178 ----
CLSID gifClsid;
GetEncoderClsid(L"image/gif", &gifClsid);
! VERIFY(Gdiplus::Ok == img->Save(stream, &gifClsid, NULL));
// Get the size of the stream
ULARGE_INTEGER streamSize;
***************
*** 476,482 ****
std::vector<CString> CMainFrame::GetWords(const CString& str) const
{
int position = 0;
! CString token = str.Tokenize(L" ", position);
std::vector<CString> words;
while (!token.IsEmpty())
{
--- 481,488 ----
std::vector<CString> CMainFrame::GetWords(const CString& str) const
{
int position = 0;
! //CString token =str.Tokenize(L" ", position);
! CString token = (LPCTSTR)str.Tokenize(_T(" "), position);
std::vector<CString> words;
while (!token.IsEmpty())
{
diff -cr win32xx.old/samples/MovieShow/src/Resource.rc win32xx/samples/MovieShow/src/Resource.rc
*** win32xx.old/samples/MovieShow/src/Resource.rc 2021-04-27 16:57:39.555680500 +0800
--- win32xx/samples/MovieShow/src/Resource.rc 2021-04-27 16:57:17.045772700 +0800
***************
*** 49,55 ****
BEGIN
MENUITEM "None", IDM_BOXSET_0
END
! MENUITEM "&Watch List" IDM_WATCHLIST
MENUITEM "&Remove File From Library", IDM_REMOVE_FILE
END
END
--- 49,55 ----
BEGIN
MENUITEM "None", IDM_BOXSET_0
END
! MENUITEM "&Watch List", IDM_WATCHLIST
MENUITEM "&Remove File From Library", IDM_REMOVE_FILE
END
END
diff -cr win32xx.old/samples/NetSimple/src/Client.cpp win32xx/samples/NetSimple/src/Client.cpp
*** win32xx.old/samples/NetSimple/src/Client.cpp 2021-04-27 17:00:05.128302000 +0800
--- win32xx/samples/NetSimple/src/Client.cpp 2021-04-27 16:59:50.342345600 +0800
***************
*** 54,60 ****
{
getline(cin, s);
if (s == "quit") break;
! int i = client.SendTo(s.c_str(), static_cast<int>(s.length()), 0, "127.0.0.1", 3000);
cout << "Sending " << i << " characters\n";
}
--- 54,60 ----
{
getline(cin, s);
if (s == "quit") break;
! int i = client.SendTo(s.c_str(), static_cast<int>(s.length()), 0, (LPCTSTR)"127.0.0.1", (UINT)3000);
cout << "Sending " << i << " characters\n";
}
diff -cr win32xx.old/samples/NetSimple/src/Server.cpp win32xx/samples/NetSimple/src/Server.cpp
*** win32xx.old/samples/NetSimple/src/Server.cpp 2021-04-27 17:00:55.736431100 +0800
--- win32xx/samples/NetSimple/src/Server.cpp 2021-04-27 17:00:36.962455200 +0800
***************
*** 55,61 ****
}
// Bind the IP address and port# to the main socket
! if (SOCKET_ERROR == server.Bind("127.0.0.1", 3000))
{
cout << "Failed to bind IP address to socket\n" ;
return 0;
--- 55,61 ----
}
// Bind the IP address and port# to the main socket
! if (SOCKET_ERROR == server.Bind((LPCTSTR)"127.0.0.1", (UINT)3000))
{
cout << "Failed to bind IP address to socket\n" ;
return 0;