public inbox for cygwin-apps-cvs@sourceware.org help / color / mirror / Atom feed
From: yselkowitz@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [setup] branch master, updated. release_2.873-7-g22819fa Date: Sun, 10 Jan 2016 01:10:00 -0000 [thread overview] Message-ID: <20160110011000.75582.qmail@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=cygwin-setup.git;h=22819fa1dc28fdd507db34c6eeface0d4f2b67fc commit 22819fa1dc28fdd507db34c6eeface0d4f2b67fc Author: Yaakov Selkowitz <yselkowi@redhat.com> Date: Fri Jan 8 14:25:55 2016 -0600 Use Winsock 2 throughout Winsock 2 was shipped with Windows 98. * Makefile.am (@SETUP@_LDADD): Link with ws2_32 instead of wsock32. * nio-ftp.cc: Include winsock2.h instead of winsock.h. * nio-http.cc: Ditto. * simpsock.cc: Ditto. Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com> https://sourceware.org/git/gitweb.cgi?p=cygwin-setup.git;h=b19cf431647e3cba6c3150941e4e1c6fa1a53438 commit b19cf431647e3cba6c3150941e4e1c6fa1a53438 Author: Yaakov Selkowitz <yselkowi@redhat.com> Date: Fri Jan 8 14:23:01 2016 -0600 nio-ie5: drop unnecessary LoadLibrary call wininet.dll is already load-time dynamically linked. * nio-ie5 (NetIO): Drop unnecessary LoadLibrary call. Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com> https://sourceware.org/git/gitweb.cgi?p=cygwin-setup.git;h=67fb0b58f3b8f63ec752625655f7b2ee5852e378 commit 67fb0b58f3b8f63ec752625655f7b2ee5852e378 Author: Yaakov Selkowitz <yselkowi@redhat.com> Date: Fri Jan 8 13:44:11 2016 -0600 propsheet: drop support for Common Controls v4 This test was only needed for Windows 9x, as Windows 2000 shipped with Internet Explorer 5.01 and Windows ME shipped with 5.5: https://msdn.microsoft.com/en-us/library/windows/desktop/hh298349.aspx * propsheet.cc (GetPROPSHEETHEADERSize): Remove. (PropSheet::Create): Use sizeof (PROPSHEETHEADER) unconditionally. * win32.h (_WIN32_IE): Remove. Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com> Diff: --- Makefile.am | 2 +- nio-ftp.cc | 2 +- nio-http.cc | 2 +- nio-ie5.cc | 7 ------- propsheet.cc | 45 +-------------------------------------------- simpsock.cc | 2 +- win32.h | 4 ---- 7 files changed, 5 insertions(+), 59 deletions(-) diff --git a/Makefile.am b/Makefile.am index 248db8d..9a0c80a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -103,7 +103,7 @@ inilint_SOURCES = \ @SETUP@_LDADD = \ libgetopt++/libgetopt++.la -lgcrypt -lgpg-error -llzma -lbz2 -lz \ - -lshlwapi -lcomctl32 -lole32 -lwsock32 -lpsapi -luuid -lntdll -lwininet -lmingw32 + -lshlwapi -lcomctl32 -lole32 -lws2_32 -lpsapi -luuid -lntdll -lwininet -lmingw32 @SETUP@_LDFLAGS = -mwindows -Wc,-static -static-libtool-libs @SETUP@_SOURCES = \ AntiVirus.cc \ diff --git a/nio-ftp.cc b/nio-ftp.cc index 9f19189..171e3a2 100644 --- a/nio-ftp.cc +++ b/nio-ftp.cc @@ -26,7 +26,7 @@ static const char *cvsid = #include "LogSingleton.h" #include "win32.h" -#include "winsock.h" +#include <winsock2.h> #include <stdio.h> #include <stdlib.h> #include <ctype.h> diff --git a/nio-http.cc b/nio-http.cc index 7336baf..259dc0f 100644 --- a/nio-http.cc +++ b/nio-http.cc @@ -22,7 +22,7 @@ static const char *cvsid = #endif #include "win32.h" -#include "winsock.h" +#include <winsock2.h> #include <stdio.h> #include <stdlib.h> diff --git a/nio-ie5.cc b/nio-ie5.cc index db4666c..c66cf52 100644 --- a/nio-ie5.cc +++ b/nio-ie5.cc @@ -41,13 +41,6 @@ NetIO (_url) if (internet == 0) { - HINSTANCE h = LoadLibrary ("wininet.dll"); - if (!h) - { - note (NULL, IDS_WININET); - connection = 0; - return; - } InternetAttemptConnect (0); internet = InternetOpen ("Cygwin Setup", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); diff --git a/propsheet.cc b/propsheet.cc index 976aefb..016f9d3 100644 --- a/propsheet.cc +++ b/propsheet.cc @@ -294,49 +294,6 @@ PropSheetProc (HWND hwndDlg, UINT uMsg, LPARAM lParam) return TRUE; } -static DWORD -GetPROPSHEETHEADERSize () -{ - // For compatibility with all versions of comctl32.dll, we have to do this. - - DLLVERSIONINFO vi; - HMODULE mod; - DLLGETVERSIONPROC DllGetVersion; - DWORD retval = 0; - - - // This 'isn't safe' in a DLL, according to MSDN - mod = LoadLibrary ("comctl32.dll"); - - DllGetVersion = (DLLGETVERSIONPROC) GetProcAddress (mod, "DllGetVersion"); - if (DllGetVersion == NULL) - { - // Something's wildly broken, punt. - retval = PROPSHEETHEADER_V1_SIZE; - } - else - { - vi.cbSize = sizeof (DLLVERSIONINFO); - DllGetVersion (&vi); - - if ((vi.dwMajorVersion < 4) || - ((vi.dwMajorVersion == 4) && (vi.dwMinorVersion < 71))) - { - // Recent. - retval = sizeof (PROPSHEETHEADER); - } - else - { - // Old (== Win95/NT4 w/o IE 4 or better) - retval = PROPSHEETHEADER_V1_SIZE; - } - } - - FreeLibrary (mod); - - return retval; -} - bool PropSheet::Create (const Window * Parent, DWORD Style) { @@ -344,7 +301,7 @@ PropSheet::Create (const Window * Parent, DWORD Style) PageHandles = CreatePages (); - p.dwSize = GetPROPSHEETHEADERSize (); + p.dwSize = sizeof (PROPSHEETHEADER); p.dwFlags = PSH_NOAPPLYNOW | PSH_WIZARD | PSH_USECALLBACK /*| PSH_MODELESS */ | PSH_USEICONID; if (Parent != NULL) diff --git a/simpsock.cc b/simpsock.cc index 852f043..88f843b 100644 --- a/simpsock.cc +++ b/simpsock.cc @@ -21,7 +21,7 @@ static const char *cvsid = #endif #include "win32.h" -#include <winsock.h> +#include <winsock2.h> #include <stdio.h> #include <stdarg.h> #include <stdlib.h> diff --git a/win32.h b/win32.h index d271748..a6b3316 100644 --- a/win32.h +++ b/win32.h @@ -49,10 +49,6 @@ #define DECLSPEC_IMPORT #define WINBASEAPI -/* Require at least Internet Explorer 3, in order to have access to - * sufficient Windows Common Controls features from <commctrl.h> . */ -#define _WIN32_IE 0x0300 - #include <windows.h> /* FIXME: The use of _access(fname, 0) as an existence check should be
reply other threads:[~2016-01-10 1:10 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20160110011000.75582.qmail@sourceware.org \ --to=yselkowitz@sourceware.org \ --cc=cygwin-apps-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).