Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[INETCPL] Sync with Wine Staging 4.18. CORE-16441

Browse source
This commit is contained in:
Amine Khaldi 2019-12-23 00:57:10 +01:00
parent 4d74a058bd
commit 90cb67a7f4
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dll/cpl/inetcpl/connections.c
View file

@ -1,5 +1,5 @@
/*
* Copyright 2018 Piotr cabna for CodeWeavers
* Copyright 2018 Piotr Caban for CodeWeavers
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,6 +20,7 @@
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
#include <winnls.h>
#include <wininet.h>
#include <winuser.h>
#include <winreg.h>
@ -27,7 +28,6 @@
#include "inetcpl.h"
#include "wine/debug.h"
#include "wine/heap.h"
#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(inetcpl);
@ -193,7 +193,7 @@ static void connections_on_initdialog(HWND hwnd)
EnableWindow(GetDlgItem(hwnd, IDC_EDIT_PROXY_PORT), TRUE);
}
port = strchrW(address, ':');
port = wcschr(address, ':');
if(port)
{
*port = 0;

7
dll/cpl/inetcpl/inetcpl.c
View file

@ -77,17 +77,24 @@ HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline)
*/
static int CALLBACK propsheet_callback(HWND hwnd, UINT msg, LPARAM lparam)
{
#ifdef __REACTOS__
// NOTE: This callback is needed to set large icon correctly.
HICON hIcon;
#endif
TRACE("(%p, 0x%08x/%d, 0x%lx)\n", hwnd, msg, msg, lparam);
switch (msg)
{
case PSCB_INITIALIZED:
#ifdef __REACTOS__
{
hIcon = LoadIconW(hcpl, MAKEINTRESOURCEW(ICO_MAIN));
SendMessageW(hwnd, WM_SETICON, ICON_BIG, (LPARAM)hIcon);
break;
}
#else
SendMessageW(hwnd, WM_SETICON, ICON_BIG, (LPARAM) LoadIconW(hcpl, MAKEINTRESOURCEW(ICO_MAIN)));
break;
#endif
}
return 0;
}

2
media/doc/README.WINE
View file

@ -222,7 +222,7 @@ dll/win32/xinput9_1_0 # Synced to WineStaging-2.9
dll/win32/xmllite # Synced to WineStaging-4.18
dll/win32/xolehlp # Synced to WineStaging-3.21
dll/cpl/inetcpl # Synced to WineStaging-3.17
dll/cpl/inetcpl # Synced to WineStaging-4.18
win32ss/printing/monitors/localmon/ui/ # Synced to WineStaging-3.3 (known there as /dll/win32/localui)