Ros-diffs September 2008

ros-diffs@reactos.org

27 participants
747 discussions

[fireball] 36303: - Select ANSI_VAR_FONT in explorer when drawing start button text and desktop switching buttons text. Based on Juriy Sidorov's patch from bug 3484. See issue #3484 for more details.
by fireball＠svn.reactos.org 18 Sep '08

18 Sep '08

Author: fireball Date: Thu Sep 18 07:56:52 2008 New Revision: 36303 URL: http://svn.reactos.org/svn/reactos?rev=36303&view=rev Log: - Select ANSI_VAR_FONT in explorer when drawing start button text and desktop switching buttons text. Based on Juriy Sidorov's patch from bug 3484. See issue #3484 for more details. Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] Thu Sep 18 07:56:52 2008 @@ -93,6 +93,7 @@ // create start button ResString start_str(IDS_START); WindowCanvas canvas(_hwnd); + FontSelection font(canvas, GetStockFont(ANSI_VAR_FONT)); RECT rect = {0, 0}; DrawText(canvas, start_str, -1, &rect, DT_SINGLELINE|DT_CALCRECT); int start_btn_width = rect.right+16+8; @@ -101,6 +102,7 @@ // create "Start" button HWND hwndStart = Button(_hwnd, start_str, 1, 1, start_btn_width, REBARBAND_HEIGHT, IDC_START, WS_VISIBLE|WS_CHILD|BS_OWNERDRAW); + SetWindowFont(hwndStart, GetStockFont(ANSI_VAR_FONT), FALSE); new StartButton(hwndStart); /* Save the handle to the window, needed for push-state handling */ Modified: trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp [iso-8859-1] Thu Sep 18 07:56:52 2008 @@ -141,6 +141,7 @@ HBITMAP hbmp = CreateCompatibleBitmap(canvas, cx, cy); HBITMAP hbmp_old = SelectBitmap(hdc, hbmp); + FontSelection font(hdc, GetStockFont(ANSI_VAR_FONT)); FmtString num_txt(TEXT("%d"), i+1); TextColor color(hdc, RGB(64,64,64)); BkMode mode(hdc, TRANSPARENT);

1 0

[cwittich] 36302: only touch the type on success or STATUS_BUFFER_OVERFLOW
by cwittich＠svn.reactos.org 18 Sep '08

18 Sep '08

Author: cwittich Date: Thu Sep 18 07:54:45 2008 New Revision: 36302 URL: http://svn.reactos.org/svn/reactos?rev=36302&view=rev Log: only touch the type on success or STATUS_BUFFER_OVERFLOW Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Thu Sep 18 07:54:45 2008 @@ -3861,7 +3861,7 @@ } } - if (lpType != NULL) + if ((lpType != NULL) && (NT_SUCCESS(Status) || (Status == STATUS_BUFFER_OVERFLOW))) { *lpType = ValueInfo->Type; }

1 0

[fireball] 36301: - Create a stock font object ANSI_VAR_FONT, this fixes explorer's clock using the wrong font (and any other app using that stock font object). See issue #3484 for more details.
by fireball＠svn.reactos.org 18 Sep '08

18 Sep '08

Author: fireball Date: Thu Sep 18 07:43:21 2008 New Revision: 36301 URL: http://svn.reactos.org/svn/reactos?rev=36301&view=rev Log: - Create a stock font object ANSI_VAR_FONT, this fixes explorer's clock using the wrong font (and any other app using that stock font object). See issue #3484 for more details. Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] Thu Sep 18 07:43:21 2008 @@ -86,9 +86,9 @@ { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Courier New" }; //Bitstream Vera Sans Mono -/*static LOGFONTW AnsiVarFont = - *{ 10, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - * 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif" }; */ +static LOGFONTW AnsiVarFont = + { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, + 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif" }; static LOGFONTW SystemFont = { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, @@ -139,6 +139,7 @@ (void) TextIntCreateFontIndirect(&OEMFixedFont, (HFONT*)&StockObjects[OEM_FIXED_FONT]); (void) TextIntCreateFontIndirect(&AnsiFixedFont, (HFONT*)&StockObjects[ANSI_FIXED_FONT]); + (void) TextIntCreateFontIndirect(&AnsiVarFont, (HFONT*)&StockObjects[ANSI_VAR_FONT]); (void) TextIntCreateFontIndirect(&SystemFont, (HFONT*)&StockObjects[SYSTEM_FONT]); (void) TextIntCreateFontIndirect(&DeviceDefaultFont, (HFONT*)&StockObjects[DEVICE_DEFAULT_FONT]); (void) TextIntCreateFontIndirect(&SystemFixedFont, (HFONT*)&StockObjects[SYSTEM_FIXED_FONT]);

1 0

[fireball] 36300: - Save SizeOfImage field from the image header during PE loading.
by fireball＠svn.reactos.org 18 Sep '08

18 Sep '08

Author: fireball Date: Thu Sep 18 06:19:29 2008 New Revision: 36300 URL: http://svn.reactos.org/svn/reactos?rev=36300&view=rev Log: - Save SizeOfImage field from the image header during PE loading. Modified: trunk/reactos/ntoskrnl/mm/pe.c Modified: trunk/reactos/ntoskrnl/mm/pe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pe.c?rev=36300… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pe.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pe.c [iso-8859-1] Thu Sep 18 06:19:29 2008 @@ -362,6 +362,9 @@ if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, ImageBase)) ImageSectionObject->ImageBase = piohOptHeader->ImageBase; + if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfImage)) + ImageSectionObject->ImageSize = piohOptHeader->SizeOfImage; + if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfStackReserve)) ImageSectionObject->StackReserve = piohOptHeader->SizeOfStackReserve; @@ -384,6 +387,14 @@ DIE(("ImageBase exceeds the address space\n")); ImageSectionObject->ImageBase = pioh64OptHeader->ImageBase; + } + + if(RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, SizeOfImage)) + { + if(pioh64OptHeader->SizeOfImage > MAXULONG_PTR) + DIE(("SizeOfImage exceeds the address space\n")); + + ImageSectionObject->ImageSize = pioh64OptHeader->SizeOfImage; } if(RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, SizeOfStackReserve))

1 0

[cgutman] 36299: - Revert header changes - Requested by Ged
by cgutman＠svn.reactos.org 18 Sep '08

18 Sep '08

Author: cgutman Date: Thu Sep 18 04:19:25 2008 New Revision: 36299 URL: http://svn.reactos.org/svn/reactos?rev=36299&view=rev Log: - Revert header changes - Requested by Ged Modified: branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32.h branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32p.h Modified: branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32.h URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… ============================================================================== --- branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32.h [iso-8859-1] (original) +++ branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32.h [iso-8859-1] Thu Sep 18 04:19:25 2008 @@ -23,7 +23,6 @@ #include <winsock2.h> #include <Ws2tcpip.h> #include <Ws2spi.h> -#include <nspapi.h> #include <ndk/umtypes.h> #include <ndk/rtlfuncs.h> Modified: branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32p.h URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… ============================================================================== --- branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32p.h [iso-8859-1] (original) +++ branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32p.h [iso-8859-1] Thu Sep 18 04:19:25 2008 @@ -21,18 +21,6 @@ WsAsyncGetServByPort, WsAsyncTerminate, } WSASYNCOPS; - -typedef struct _ADDRINFOW -{ - INT ai_flags; - INT ai_family; - INT ai_socktype; - INT ai_protocol; - SIZE_T ai_addrlen; - PWSTR ai_canonname; - struct SOCKADDR *ai_addr; - struct ADDRINFOW *ai_next; -} ADDRINFOW, *PADDRINFOW; typedef struct _WSASYNCBLOCK { @@ -869,23 +857,6 @@ WSAAPI WsAsyncGlobalInitialize(VOID); -INT -WSAAPI -GetNameInfoW(IN CONST SOCKADDR *pSockaddr, - IN socklen_t SockaddrLength, - OUT PWCHAR pNodeBuffer, - IN DWORD NodeBufferSize, - OUT PWCHAR pServiceBuffer, - IN DWORD ServiceBufferSize, - IN INT Flags); - -BOOL -WSPAPI -WPUPostMessage(IN HWND hWnd, - IN UINT Msg, - IN WPARAM wParam, - IN LPARAM lParam); - FORCEINLINE PWSPROCESS WsGetProcess()

1 0

[janderwald] 36298: - Refresh adapter statistics when INetConnection_GetProperties is called - Perform icon change when the adapter receives operational / disconnected state
by janderwald＠svn.reactos.org 18 Sep '08

18 Sep '08

Author: janderwald Date: Thu Sep 18 04:01:52 2008 New Revision: 36298 URL: http://svn.reactos.org/svn/reactos?rev=36298&view=rev Log: - Refresh adapter statistics when INetConnection_GetProperties is called - Perform icon change when the adapter receives operational / disconnected state Modified: trunk/reactos/dll/win32/netshell/connectmanager.c trunk/reactos/dll/win32/netshell/lanstatusui.c Modified: trunk/reactos/dll/win32/netshell/connectmanager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/connect… ============================================================================== --- trunk/reactos/dll/win32/netshell/connectmanager.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/connectmanager.c [iso-8859-1] Thu Sep 18 04:01:52 2008 @@ -3,6 +3,7 @@ typedef struct tagINetConnectionItem { struct tagINetConnectionItem * Next; + DWORD dwAdapterIndex; NETCON_PROPERTIES Props; }INetConnectionItem, *PINetConnectionItem; @@ -21,6 +22,7 @@ const INetConnectionVtbl * lpVtbl; LONG ref; NETCON_PROPERTIES Props; + DWORD dwAdapterIndex; } INetConnectionImpl, *LPINetConnectionImpl; @@ -29,6 +31,7 @@ return (LPINetConnectionManagerImpl)((char *)iface - FIELD_OFFSET(INetConnectionManagerImpl, lpVtblNetConnection)); } +VOID NormalizeOperStatus(MIB_IFROW *IfEntry, NETCON_PROPERTIES * Props); static HRESULT @@ -211,7 +214,7 @@ INetConnection * iface, NETCON_PROPERTIES **ppProps) { - + MIB_IFROW IfEntry; NETCON_PROPERTIES * pProperties; INetConnectionImpl * This = (INetConnectionImpl*)iface; @@ -238,6 +241,17 @@ } *ppProps = pProperties; + + /* get updated adapter characteristics */ + ZeroMemory(&IfEntry, sizeof(IfEntry)); + IfEntry.dwIndex = This->dwAdapterIndex; + if(GetIfEntry(&IfEntry) != NO_ERROR) + return NOERROR; + + NormalizeOperStatus(&IfEntry, pProperties); + + + return NOERROR; } @@ -298,7 +312,7 @@ This->ref = 1; This->lpVtbl = &vt_NetConnection; - + This->dwAdapterIndex = pItem->dwAdapterIndex; CopyMemory(&This->Props, &pItem->Props, sizeof(NETCON_PROPERTIES)); if (pItem->Props.pszwName) @@ -479,6 +493,37 @@ } return FALSE; } + +VOID +NormalizeOperStatus( + MIB_IFROW *IfEntry, + NETCON_PROPERTIES * Props) +{ + switch(IfEntry->dwOperStatus) + { + case MIB_IF_OPER_STATUS_NON_OPERATIONAL: + Props->Status = NCS_HARDWARE_DISABLED; + break; + case MIB_IF_OPER_STATUS_UNREACHABLE: + Props->Status = NCS_DISCONNECTED; + break; + case MIB_IF_OPER_STATUS_DISCONNECTED: + Props->Status = NCS_MEDIA_DISCONNECTED; + break; + case MIB_IF_OPER_STATUS_CONNECTING: + Props->Status = NCS_CONNECTING; + break; + case MIB_IF_OPER_STATUS_CONNECTED: + Props->Status = NCS_CONNECTED; + break; + case MIB_IF_OPER_STATUS_OPERATIONAL: + Props->Status = NCS_CONNECTED; + break; + default: + break; + } +} + static BOOL @@ -589,32 +634,10 @@ break; ZeroMemory(pNew, sizeof(INetConnectionItem)); - + pNew->dwAdapterIndex = dwAdapterIndex; /* store NetCfgInstanceId */ CLSIDFromString(szNetCfg, &pNew->Props.guidId); - switch(IfEntry.dwOperStatus) - { - case MIB_IF_OPER_STATUS_NON_OPERATIONAL: - pNew->Props.Status = NCS_HARDWARE_DISABLED; - break; - case MIB_IF_OPER_STATUS_UNREACHABLE: - pNew->Props.Status = NCS_DISCONNECTED; - break; - case MIB_IF_OPER_STATUS_DISCONNECTED: - pNew->Props.Status = NCS_MEDIA_DISCONNECTED; - break; - case MIB_IF_OPER_STATUS_CONNECTING: - pNew->Props.Status = NCS_CONNECTING; - break; - case MIB_IF_OPER_STATUS_CONNECTED: - pNew->Props.Status = NCS_CONNECTED; - break; - case MIB_IF_OPER_STATUS_OPERATIONAL: - pNew->Props.Status = NCS_CONNECTED; - break; - default: - break; - } + NormalizeOperStatus(&IfEntry, &pNew->Props); switch(IfEntry.dwType) { Modified: trunk/reactos/dll/win32/netshell/lanstatusui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanstat… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] Thu Sep 18 04:01:52 2008 @@ -141,31 +141,49 @@ } hIcon = NULL; - if (pContext->dwInOctets == IfEntry.dwInOctets && pContext->dwOutOctets == IfEntry.dwOutOctets && pContext->Status != 0) - { - hIcon = LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_IDLE), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); - pContext->Status = 0; - } - else if (pContext->dwInOctets != IfEntry.dwInOctets && pContext->dwOutOctets != IfEntry.dwOutOctets && pContext->Status != 1) - { - pContext->Status = 1; - hIcon = LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_TRANSREC), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); - } - else if (pContext->dwInOctets != IfEntry.dwInOctets && pContext->Status != 2) - { - hIcon = LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_REC), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); - pContext->Status = 2; - } - else if (pContext->dwOutOctets != IfEntry.dwOutOctets && pContext->Status != 3) - { - hIcon = LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_TRANS), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); - pContext->Status = 3; + if (IfEntry.dwOperStatus == MIB_IF_OPER_STATUS_CONNECTED || IfEntry.dwOperStatus == MIB_IF_OPER_STATUS_OPERATIONAL) + { + if (pContext->dwInOctets == IfEntry.dwInOctets && pContext->dwOutOctets == IfEntry.dwOutOctets && pContext->Status != 0) + { + hIcon = LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_IDLE), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); + pContext->Status = 0; + } + else if (pContext->dwInOctets != IfEntry.dwInOctets && pContext->dwOutOctets != IfEntry.dwOutOctets && pContext->Status != 1) + { + pContext->Status = 1; + hIcon = LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_TRANSREC), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); + } + else if (pContext->dwInOctets != IfEntry.dwInOctets && pContext->Status != 2) + { + hIcon = LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_REC), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); + pContext->Status = 2; + } + else if (pContext->dwOutOctets != IfEntry.dwOutOctets && pContext->Status != 3) + { + hIcon = LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_TRANS), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); + pContext->Status = 3; + } + } + else if (IfEntry.dwOperStatus == MIB_IF_OPER_STATUS_UNREACHABLE || MIB_IF_OPER_STATUS_DISCONNECTED) + { + if (pContext->Status != 4) + { + hIcon = LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_OFF), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); + pContext->Status = 4; + } + } + else if (MIB_IF_OPER_STATUS_NON_OPERATIONAL) + { + if (pContext->Status != 5) + { + hIcon = LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_OFF), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); + pContext->Status = 5; + } } if (hIcon) { hOldIcon = (HICON)SendDlgItemMessageW(hwndDlg, IDC_NETSTAT, STM_SETICON, (WPARAM)hIcon, 0); - ZeroMemory(&nid, sizeof(nid)); nid.cbSize = sizeof(nid); @@ -420,6 +438,9 @@ return S_OK; /* get an instance to of IConnectionManager */ + + //hr = CoCreateInstance(&CLSID_ConnectionManager, NULL, CLSCTX_INPROC_SERVER, &IID_INetConnectionManager, (LPVOID*)&INetConMan); + hr = INetConnectionManager_Constructor(NULL, &IID_INetConnectionManager, (LPVOID*)&INetConMan); if (FAILED(hr)) return hr;

1 0

[janderwald] 36297: - Use LoadImage over deprecated LoadIcon (thanks Ged) - Restore focus to status dialog when network properties dialog is closed
by janderwald＠svn.reactos.org 18 Sep '08

18 Sep '08

Author: janderwald Date: Thu Sep 18 02:18:18 2008 New Revision: 36297 URL: http://svn.reactos.org/svn/reactos?rev=36297&view=rev Log: - Use LoadImage over deprecated LoadIcon (thanks Ged) - Restore focus to status dialog when network properties dialog is closed Modified: trunk/reactos/dll/win32/netshell/lanstatusui.c Modified: trunk/reactos/dll/win32/netshell/lanstatusui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanstat… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] Thu Sep 18 02:18:18 2008 @@ -143,22 +143,22 @@ hIcon = NULL; if (pContext->dwInOctets == IfEntry.dwInOctets && pContext->dwOutOctets == IfEntry.dwOutOctets && pContext->Status != 0) { - hIcon = LoadIcon(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_IDLE)); + hIcon = LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_IDLE), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); pContext->Status = 0; } else if (pContext->dwInOctets != IfEntry.dwInOctets && pContext->dwOutOctets != IfEntry.dwOutOctets && pContext->Status != 1) { pContext->Status = 1; - hIcon = LoadIcon(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_TRANSREC)); + hIcon = LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_TRANSREC), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); } else if (pContext->dwInOctets != IfEntry.dwInOctets && pContext->Status != 2) { - hIcon = LoadIcon(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_REC)); + hIcon = LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_REC), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); pContext->Status = 2; } else if (pContext->dwOutOctets != IfEntry.dwOutOctets && pContext->Status != 3) { - hIcon = LoadIcon(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_TRANS)); + hIcon = LoadImage(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_TRANS), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR); pContext->Status = 3; } @@ -173,7 +173,7 @@ nid.hWnd = pContext->hwndStatusDlg; nid.uFlags = NIF_ICON; nid.u.uVersion = 3; - nid.hIcon = CopyIcon(hIcon); + nid.hIcon = CopyImage(hIcon, IMAGE_ICON, 0, 0, 0); Shell_NotifyIconW(NIM_MODIFY, &nid); if (hOldIcon) @@ -281,11 +281,11 @@ pContext = (LANSTATUSUI_CONTEXT*)GetWindowLongPtr(hwndDlg, DWLP_USER); if (LOWORD(wParam) == IDC_STATUS_PROPERTIES) { - //FIXME - // show net connection property dialog - // if (pContext) - ShowNetConnectionProperties(pContext->pNet, pContext->hwndDlg); + { + ShowNetConnectionProperties(pContext->pNet, GetParent(pContext->hwndDlg)); + BringWindowToTop(GetParent(pContext->hwndDlg)); + } break; } else if (LOWORD(wParam) == IDC_ENDISABLE)

1 0

[janderwald] 36296: - Fix several bugs in icon changing code
by janderwald＠svn.reactos.org 17 Sep '08

17 Sep '08

Author: janderwald Date: Wed Sep 17 17:21:04 2008 New Revision: 36296 URL: http://svn.reactos.org/svn/reactos?rev=36296&view=rev Log: - Fix several bugs in icon changing code Modified: trunk/reactos/dll/win32/netshell/lanstatusui.c Modified: trunk/reactos/dll/win32/netshell/lanstatusui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanstat… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] Wed Sep 17 17:21:04 2008 @@ -151,12 +151,12 @@ pContext->Status = 1; hIcon = LoadIcon(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_TRANSREC)); } - else if (pContext->dwInOctets == IfEntry.dwInOctets && pContext->Status != 2) + else if (pContext->dwInOctets != IfEntry.dwInOctets && pContext->Status != 2) { hIcon = LoadIcon(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_REC)); - pContext->Status = 2; - } - else if (pContext->dwOutOctets == IfEntry.dwOutOctets && pContext->Status != 3) + pContext->Status = 2; + } + else if (pContext->dwOutOctets != IfEntry.dwOutOctets && pContext->Status != 3) { hIcon = LoadIcon(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_TRANS)); pContext->Status = 3; @@ -246,6 +246,8 @@ } CoTaskMemFree(pStr); pContext->dwAdapterIndex = dwAdapterIndex; + pContext->dwInOctets = 0; + pContext->dwOutOctets = 0; /* update adapter info */ pContext->Status = -1;

1 0

[janderwald] 36295: - Update Status Icon when there is activity - Also update the Taskbar Notification Icon
by janderwald＠svn.reactos.org 17 Sep '08

17 Sep '08

Author: janderwald Date: Wed Sep 17 16:58:34 2008 New Revision: 36295 URL: http://svn.reactos.org/svn/reactos?rev=36295&view=rev Log: - Update Status Icon when there is activity - Also update the Taskbar Notification Icon Modified: trunk/reactos/dll/win32/netshell/lang/de-DE.rc trunk/reactos/dll/win32/netshell/lanstatusui.c trunk/reactos/dll/win32/netshell/resource.h Modified: trunk/reactos/dll/win32/netshell/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/de… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/de-DE.rc [iso-8859-1] Wed Sep 17 16:58:34 2008 @@ -37,13 +37,10 @@ LTEXT "Übertragungsrate:", -1, 19, 48, 60, 8 GROUPBOX "Aktivität", -1, 9, 74, 182, 70, BS_GROUPBOX RTEXT "Gesendet", -1, 26, 90, 60, 8 - ICON IDI_HORIZONTAL, -1, 90, 85, 18, 20 - ICON IDI_NETSTAT, -1, 110, 85, 18, 20 - ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 + ICON "", IDC_NETSTAT, 110, 85, 18, 20 LTEXT "Empfangen", -1, 149, 90, 37, 8 LTEXT "Bytes:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 - ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 PUSHBUTTON "E&igenschaften", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "&Deaktivieren", IDC_ENDISABLE, 66, 150, 50, 14 Modified: trunk/reactos/dll/win32/netshell/lanstatusui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanstat… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] Wed Sep 17 16:58:34 2008 @@ -10,6 +10,7 @@ { struct tagNotificationItem *pNext; CLSID guidItem; + UINT uID; HWND hwndDlg; }NOTIFICATION_ITEM; @@ -24,11 +25,14 @@ typedef struct { INetConnection *pNet; - HWND hwndDlg; + HWND hwndStatusDlg; /* LanStatusDlg window */ + HWND hwndDlg; /* status dialog window */ DWORD dwAdapterIndex; UINT_PTR nIDEvent; DWORD dwInOctets; DWORD dwOutOctets; + UINT uID; + UINT Status; }LANSTATUSUI_CONTEXT; VOID @@ -42,6 +46,9 @@ WCHAR Buffer[100]; WCHAR DayBuffer[30]; WCHAR LocBuffer[50]; + HICON hIcon, hOldIcon; + NOTIFYICONDATAW nid; + #if 0 ULONGLONG Ticks; #else @@ -98,8 +105,6 @@ SendDlgItemMessageW(hwndDlg, IDC_SEND, WM_SETTEXT, 0, (LPARAM)szBuffer); } - //FIXME - //set duration #if 0 Ticks = GetTickCount64(); #else @@ -135,6 +140,47 @@ SendDlgItemMessageW(hwndDlg, IDC_DURATION, WM_SETTEXT, 0, (LPARAM)Buffer); } + hIcon = NULL; + if (pContext->dwInOctets == IfEntry.dwInOctets && pContext->dwOutOctets == IfEntry.dwOutOctets && pContext->Status != 0) + { + hIcon = LoadIcon(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_IDLE)); + pContext->Status = 0; + } + else if (pContext->dwInOctets != IfEntry.dwInOctets && pContext->dwOutOctets != IfEntry.dwOutOctets && pContext->Status != 1) + { + pContext->Status = 1; + hIcon = LoadIcon(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_TRANSREC)); + } + else if (pContext->dwInOctets == IfEntry.dwInOctets && pContext->Status != 2) + { + hIcon = LoadIcon(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_REC)); + pContext->Status = 2; + } + else if (pContext->dwOutOctets == IfEntry.dwOutOctets && pContext->Status != 3) + { + hIcon = LoadIcon(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_TRANS)); + pContext->Status = 3; + } + + if (hIcon) + { + hOldIcon = (HICON)SendDlgItemMessageW(hwndDlg, IDC_NETSTAT, STM_SETICON, (WPARAM)hIcon, 0); + + + ZeroMemory(&nid, sizeof(nid)); + nid.cbSize = sizeof(nid); + nid.uID = pContext->uID; + nid.hWnd = pContext->hwndStatusDlg; + nid.uFlags = NIF_ICON; + nid.u.uVersion = 3; + nid.hIcon = CopyIcon(hIcon); + + Shell_NotifyIconW(NIM_MODIFY, &nid); + if (hOldIcon) + DestroyIcon(hOldIcon); + } + pContext->dwInOctets = IfEntry.dwInOctets; + pContext->dwOutOctets = IfEntry.dwOutOctets; } @@ -202,8 +248,8 @@ pContext->dwAdapterIndex = dwAdapterIndex; /* update adapter info */ + pContext->Status = -1; UpdateLanStatusUIDlg(hwndDlg, pContext); - pContext->nIDEvent = SetTimer(hwndDlg, 0xFABC, 1000, NULL); CoTaskMemFree(pAdapterInfo); } @@ -225,7 +271,7 @@ case WM_INITDIALOG: page = (PROPSHEETPAGE*)lParam; pContext = (LANSTATUSUI_CONTEXT*)page->lParam; - pContext->hwndDlg = GetParent(hwndDlg); + pContext->hwndDlg = hwndDlg; InitializeLANStatusUiDlg(hwndDlg, pContext); SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pContext); return TRUE; @@ -251,17 +297,9 @@ if (lppsn->hdr.code == PSN_APPLY || lppsn->hdr.code == PSN_RESET) { pContext = (LANSTATUSUI_CONTEXT*)GetWindowLongPtr(hwndDlg, DWLP_USER); - KillTimer(hwndDlg, pContext->nIDEvent); SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR); pContext->hwndDlg = NULL; - return PSNRET_NOERROR; - } - break; - case WM_TIMER: - pContext = (LANSTATUSUI_CONTEXT*)GetWindowLongPtr(hwndDlg, DWLP_USER); - if (wParam == (WPARAM)pContext->nIDEvent) - { - UpdateLanStatusUIDlg(hwndDlg, pContext); + return TRUE; } break; } @@ -276,7 +314,6 @@ HPROPSHEETPAGE hppages[2]; PROPSHEETHEADERW pinfo; NETCON_PROPERTIES * pProperties = NULL; - HWND hwnd; ZeroMemory(&pinfo, sizeof(PROPSHEETHEADERW)); ZeroMemory(hppages, sizeof(hppages)); @@ -293,7 +330,7 @@ pinfo.dwFlags |= PSH_PROPTITLE; } - if (pProperties->MediaType == NCM_LAN) + if (pProperties->MediaType == NCM_LAN && pProperties->Status == NCS_CONNECTED) { hppages[0] = InitializePropertySheetPage(MAKEINTRESOURCEW(IDD_LAN_NETSTATUS), LANStatusUiDlg, (LPARAM)pContext, NULL); if (hppages[0]) @@ -301,12 +338,13 @@ if (pinfo.nPages) { - hwnd = (HWND)PropertySheetW(&pinfo); - if (hwnd) - { - pContext->hwndDlg = hwnd; - } - } + PropertySheetW(&pinfo); + } + } + else if (pProperties->Status == NCS_MEDIA_DISCONNECTED || pProperties->Status == NCS_DISCONNECTED || + pProperties->Status == NCS_HARDWARE_DISABLED) + { + ShowNetConnectionProperties(pContext->pNet, pContext->hwndDlg); } NcFreeNetconProperties(pProperties); } @@ -326,13 +364,17 @@ switch(uMsg) { case WM_INITDIALOG: - pContext = (LANSTATUSUI_CONTEXT*)CoTaskMemAlloc(sizeof(LANSTATUSUI_CONTEXT)); - if (!pContext) - return FALSE; - pContext->hwndDlg = NULL; - pContext->pNet = (INetConnection*)lParam; - SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pContext); + pContext = (LANSTATUSUI_CONTEXT *)lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)lParam); + pContext->nIDEvent = SetTimer(hwndDlg, 0xFABC, 1000, NULL); return TRUE; + case WM_TIMER: + pContext = (LANSTATUSUI_CONTEXT*)GetWindowLongPtr(hwndDlg, DWLP_USER); + if (wParam == (WPARAM)pContext->nIDEvent) + { + UpdateLanStatusUIDlg(pContext->hwndDlg, pContext); + } + break; case WM_SHOWSTATUSDLG: if (LOWORD(lParam) == WM_LBUTTONDOWN) { @@ -342,8 +384,8 @@ if (pContext->hwndDlg) { - ShowWindow(pContext->hwndDlg, SW_SHOW); - BringWindowToTop(pContext->hwndDlg); + ShowWindow(GetParent(pContext->hwndDlg), SW_SHOW); + BringWindowToTop(GetParent(pContext->hwndDlg)); } else { @@ -370,6 +412,7 @@ ULONG Count; ULONG Index; NOTIFICATION_ITEM * pItem, *pLast = NULL; + LANSTATUSUI_CONTEXT * pContext; if (This->pHead) return S_OK; @@ -395,9 +438,20 @@ pItem = (NOTIFICATION_ITEM*)CoTaskMemAlloc(sizeof(NOTIFICATION_ITEM)); if (!pItem) break; + + pContext = (LANSTATUSUI_CONTEXT*)CoTaskMemAlloc(sizeof(LANSTATUSUI_CONTEXT)); + if (!pContext) + { + CoTaskMemFree(pItem); + break; + } + pItem->pNext = NULL; - - hwndDlg = CreateDialogParamW(netshell_hInstance, MAKEINTRESOURCEW(IDD_STATUS), NULL, LANStatusDlg, (LPARAM)INetCon); + ZeroMemory(pContext, sizeof(LANSTATUSUI_CONTEXT)); + pContext->uID = Index; + pContext->pNet = INetCon; + + hwndDlg = CreateDialogParamW(netshell_hInstance, MAKEINTRESOURCEW(IDD_STATUS), NULL, LANStatusDlg, (LPARAM)pContext); if (hwndDlg) { ZeroMemory(&nid, sizeof(nid)); @@ -407,17 +461,26 @@ nid.u.uVersion = 3; nid.uCallbackMessage = WM_SHOWSTATUSDLG; nid.hWnd = hwndDlg; - nid.hIcon = LoadIcon(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_IDLE)); + hr = INetConnection_GetProperties(INetCon, &pProps); if (SUCCEEDED(hr)) { CopyMemory(&pItem->guidItem, &pProps->guidId, sizeof(GUID)); - pItem->hwndDlg = hwndDlg; if (!(pProps->dwCharacter & NCCF_SHOW_ICON)) { nid.dwState = NIS_HIDDEN; } + if (pProps->Status == NCS_MEDIA_DISCONNECTED || pProps->Status == NCS_DISCONNECTED || pProps->Status == NCS_HARDWARE_DISABLED) + nid.hIcon = LoadIcon(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_OFF)); + else if (pProps->Status == NCS_CONNECTED) + nid.hIcon = LoadIcon(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_IDLE)); + + + wcscpy(nid.szTip, pProps->pszwName); + nid.uFlags |= NIF_TIP; } + pContext->hwndStatusDlg = hwndDlg; + pItem->hwndDlg = hwndDlg; if (Shell_NotifyIconW(NIM_ADD, &nid)) { Modified: trunk/reactos/dll/win32/netshell/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/resourc… ============================================================================== --- trunk/reactos/dll/win32/netshell/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/resource.h [iso-8859-1] Wed Sep 17 16:58:34 2008 @@ -36,6 +36,7 @@ #define IDC_STATUS 1104 #define IDC_DURATION 1105 #define IDC_SPEED 1106 +#define IDC_NETSTAT 1107 /* resource constants */

1 0

[dreimer] 36294: Fix Header usage in different arches. Not nice, but it works. plz try
by dreimer＠svn.reactos.org 17 Sep '08

17 Sep '08

Author: dreimer Date: Wed Sep 17 15:43:21 2008 New Revision: 36294 URL: http://svn.reactos.org/svn/reactos?rev=36294&view=rev Log: Fix Header usage in different arches. Not nice, but it works. plz try Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Wed Sep 17 15:43:21 2008 @@ -49,16 +49,25 @@ set PATH=%_ROSBE_MINGWPATH%\bin;%_ROSBE_ORIGINALPATH% set _ROSBE_GCCVERSION= set _ROSBE_GCCTARGET= -for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i -for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i +if .%ROS_ARCH%. == .. ( + for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i + for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION2=%%i + for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i + for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET2=%%i +) else ( + for /f "usebackq tokens=3" %%i in (`"%ROS_PREFIX%-gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i + for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION2=%%i + for /f "usebackq tokens=2" %%i in (`"%ROS_PREFIX%-gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i + for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET2=%%i +) set PATH=%_ROSBE_MINGWPATH%\bin;%_ROSBE_MINGWPATH%\libexec\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%;%_ROSBE_ORIGINALPATH% set _ROSBE_MINGWMAKE=%_ROSBE_MINGWPATH%\bin\mingw32-make.exe if "%_ROSBE_MODE%" == "MinGW" ( set C_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include - set CPLUS_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%;%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%;%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include + set CPLUS_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION2%;%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION2%\%_ROSBE_GCCTARGET2%;%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include ) else ( set HOST_CFLAGS=-I"%_ROSBE_MINGWPATH%\include" -I"%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include" - set HOST_CPPFLAGS=-I"%_ROSBE_MINGWPATH%\include" -I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%" -I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%" -I"%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include" + set HOST_CPPFLAGS=-I"%_ROSBE_MINGWPATH%\include" -I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION2%" -I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION2%\%_ROSBE_GCCTARGET2%" -I"%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include" ) set LIBRARY_PATH=%_ROSBE_MINGWPATH%\lib;%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2008