Skip to content

Commit e446465

Browse files
author
Git for Windows Build Agent
committed
Update 7 packages
mingw-w64-i686-crt-git (13.0.0.r245.g1243c4e62-1 -> 13.0.0.r257.g94a83f88e-1) mingw-w64-i686-headers-git (13.0.0.r245.g1243c4e62-1 -> 13.0.0.r257.g94a83f88e-2) mingw-w64-i686-libmangle-git (13.0.0.r245.g1243c4e62-1 -> 13.0.0.r257.g94a83f88e-1) mingw-w64-i686-libwinpthread (13.0.0.r245.g1243c4e62-1 -> 13.0.0.r257.g94a83f88e-1) mingw-w64-i686-nghttp2 (1.67.1-1 -> 1.68.0-1) mingw-w64-i686-tools-git (13.0.0.r245.g1243c4e62-1 -> 13.0.0.r257.g94a83f88e-1) mingw-w64-i686-winpthreads (13.0.0.r245.g1243c4e62-1 -> 13.0.0.r257.g94a83f88e-1) Signed-off-by: Git for Windows Build Agent <[email protected]>
1 parent 778b6e0 commit e446465

File tree

86 files changed

+90
-66
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+90
-66
lines changed

mingw32/bin/gendef.exe

0 Bytes
Binary file not shown.

mingw32/bin/genidl.exe

0 Bytes
Binary file not shown.

mingw32/bin/genpeimg.exe

0 Bytes
Binary file not shown.

mingw32/bin/libnghttp2-14.dll

512 Bytes
Binary file not shown.

mingw32/bin/libwinpthread-1.dll

0 Bytes
Binary file not shown.

mingw32/bin/widl.exe

0 Bytes
Binary file not shown.

mingw32/include/comutil.h

Lines changed: 45 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
#include <ole2.h>
1010
#include <stdio.h>
11+
#include <new>
1112

1213
#ifndef _COM_ASSERT
1314
#define _COM_ASSERT(x) ((void)0)
@@ -51,8 +52,50 @@ namespace _com_util {
5152
}
5253

5354
namespace _com_util {
54-
BSTR WINAPI ConvertStringToBSTR(const char *pSrc);
55-
char *WINAPI ConvertBSTRToString(BSTR pSrc);
55+
inline BSTR WINAPI ConvertStringToBSTR(const char *pSrc){
56+
int wcSize;
57+
BSTR bstr;
58+
if(!pSrc) return NULL;
59+
wcSize=::MultiByteToWideChar(CP_ACP,0,pSrc,-1,NULL,0);
60+
if (wcSize==0) {
61+
_com_issue_error(HRESULT_FROM_WIN32(GetLastError()));
62+
return NULL;
63+
}
64+
bstr=::SysAllocStringLen(NULL,wcSize-1);
65+
if(!bstr) {
66+
_com_issue_error(E_OUTOFMEMORY);
67+
return NULL;
68+
}
69+
if(::MultiByteToWideChar(CP_ACP,0,pSrc,-1,bstr,wcSize)==0) {
70+
DWORD err = ::GetLastError();
71+
::SysFreeString(bstr);
72+
_com_issue_error(HRESULT_FROM_WIN32(err));
73+
return NULL;
74+
}
75+
return bstr;
76+
}
77+
inline char *WINAPI ConvertBSTRToString(BSTR pSrc){
78+
int mbSize;
79+
char *str;
80+
if(!pSrc) return NULL;
81+
mbSize = ::WideCharToMultiByte(CP_ACP,0,pSrc,-1,NULL,0,NULL,NULL);
82+
if (mbSize==0) {
83+
_com_issue_error(HRESULT_FROM_WIN32(::GetLastError()));
84+
return NULL;
85+
}
86+
str=new(::std::nothrow) char[mbSize];
87+
if(!str) {
88+
_com_issue_error(E_OUTOFMEMORY);
89+
return NULL;
90+
}
91+
if(::WideCharToMultiByte(CP_ACP,0,pSrc,-1,str,mbSize,NULL,NULL)==0) {
92+
DWORD err = ::GetLastError();
93+
delete[] str;
94+
_com_issue_error(HRESULT_FROM_WIN32(err));
95+
return NULL;
96+
}
97+
return str;
98+
}
5699
}
57100

58101
class _bstr_t {

mingw32/include/nghttp2/nghttp2ver.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929
* @macro
3030
* Version number of the nghttp2 library release
3131
*/
32-
#define NGHTTP2_VERSION "1.67.1"
32+
#define NGHTTP2_VERSION "1.68.0"
3333

3434
/**
3535
* @macro
3636
* Numerical representation of the version number of the nghttp2 library
3737
* release. This is a 24 bit number with 8 bits for major number, 8 bits
3838
* for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203.
3939
*/
40-
#define NGHTTP2_VERSION_NUM 0x014301
40+
#define NGHTTP2_VERSION_NUM 0x014400
4141

4242
#endif /* NGHTTP2VER_H */

mingw32/include/unistd.h

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -56,29 +56,10 @@ int __cdecl __MINGW_NOTHROW usleep(useconds_t);
5656
#define FTRUNCATE_DEFINED
5757
/* This is defined as a real library function to allow autoconf
5858
to verify its existence. */
59-
#if !defined(NO_OLDNAMES) || defined(_POSIX)
60-
int ftruncate(int, off32_t);
61-
int ftruncate64(int, off64_t);
62-
int truncate(const char *, off32_t);
63-
int truncate64(const char *, off64_t);
64-
#ifndef __CRT__NO_INLINE
65-
__CRT_INLINE int ftruncate(int __fd, off32_t __length)
66-
{
67-
return _chsize (__fd, __length);
68-
}
69-
#endif /* !__CRT__NO_INLINE */
70-
#else
7159
int ftruncate(int, _off_t);
7260
int ftruncate64(int, _off64_t);
7361
int truncate(const char *, _off_t);
7462
int truncate64(const char *, _off64_t);
75-
#ifndef __CRT__NO_INLINE
76-
__CRT_INLINE int ftruncate(int __fd, _off_t __length)
77-
{
78-
return _chsize (__fd, __length);
79-
}
80-
#endif /* !__CRT__NO_INLINE */
81-
#endif
8263
#endif /* FTRUNCATE_DEFINED */
8364

8465
#ifndef _FILE_OFFSET_BITS_SET_FTRUNCATE

mingw32/lib/cmake/nghttp2/nghttp2ConfigVersion.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@
99
# The variable CVF_VERSION must be set before calling configure_file().
1010

1111

12-
set(PACKAGE_VERSION "1.67.1")
12+
set(PACKAGE_VERSION "1.68.0")
1313

1414
if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
1515
set(PACKAGE_VERSION_COMPATIBLE FALSE)
1616
else()
1717

18-
if("1.67.1" MATCHES "^([0-9]+)\\.")
18+
if("1.68.0" MATCHES "^([0-9]+)\\.")
1919
set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
2020
if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
2121
string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
2222
endif()
2323
else()
24-
set(CVF_VERSION_MAJOR "1.67.1")
24+
set(CVF_VERSION_MAJOR "1.68.0")
2525
endif()
2626

2727
if(PACKAGE_FIND_VERSION_RANGE)

0 commit comments

Comments
 (0)