Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[akorotaev] 34359: Fix build with old psdk headers (patch by Christoph_vW)
by akorotaev＠svn.reactos.org 07 Jul '08

07 Jul '08

Author: akorotaev Date: Mon Jul 7 11:05:56 2008 New Revision: 34359 URL: http://svn.reactos.org/svn/reactos?rev=34359&view=rev Log: Fix build with old psdk headers (patch by Christoph_vW) Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache-win32.vcproj Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache-win32.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/cc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache-win32.vcproj [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ccache-win32.vcproj [iso-8859-1] Mon Jul 7 11:05:56 2008 @@ -40,7 +40,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0500;_WIN32_IE=0x0400;" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -112,7 +112,7 @@ /> <Tool Name="VCCLCompilerTool" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0500;_WIN32_IE=0x0400;" RuntimeLibrary="2" UsePrecompiledHeader="0" WarningLevel="4"

1 0

[jmorlan] 34358: IntGdiCreateBitmap: Tighten up parameter checks, preventing overflows; don't multiply by Planes twice in calculating WidthBytes. IntCreateCompatibleBitmap: Remove 65535px maximum (Windows has no such limit); return the stock 1x1 bitmap instead of creating a new one. BITMAPOBJ_GetRealBitsPixel: Change parameter type to UINT; remove 2bpp return (2bpp bitmaps are not actually supported)
by jmorlan＠svn.reactos.org 07 Jul '08

07 Jul '08

Author: jmorlan Date: Mon Jul 7 11:03:14 2008 New Revision: 34358 URL: http://svn.reactos.org/svn/reactos?rev=34358&view=rev Log: IntGdiCreateBitmap: Tighten up parameter checks, preventing overflows; don't multiply by Planes twice in calculating WidthBytes. IntCreateCompatibleBitmap: Remove 65535px maximum (Windows has no such limit); return the stock 1x1 bitmap instead of creating a new one. BITMAPOBJ_GetRealBitsPixel: Change parameter type to UINT; remove 2bpp return (2bpp bitmaps are not actually supported) Modified: trunk/reactos/subsystems/win32/win32k/include/bitmaps.h trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Modified: trunk/reactos/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] Mon Jul 7 11:03:14 2008 @@ -53,7 +53,7 @@ void INTERNAL_CALL BITMAPOBJ_CleanupBitsLock(BITMAPOBJ *pBMObj); INT FASTCALL BITMAPOBJ_GetWidthBytes (INT bmWidth, INT bpp); -INT FASTCALL BITMAPOBJ_GetRealBitsPixel(INT nBitsPixel); +UINT FASTCALL BITMAPOBJ_GetRealBitsPixel(UINT nBitsPixel); HBITMAP FASTCALL BITMAPOBJ_CopyBitmap (HBITMAP hBitmap); INT FASTCALL DIB_GetDIBWidthBytes (INT width, INT depth); int NTAPI DIB_GetDIBImageBytes (INT width, INT height, INT depth); Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Mon Jul 7 11:03:14 2008 @@ -47,17 +47,25 @@ BitsPixel = BITMAPOBJ_GetRealBitsPixel(BitsPixel * Planes); /* Check parameters */ - if (BitsPixel == 0 || Width < 0) + if (BitsPixel == 0 || Width <= 0 || Width >= 0x8000000 || Height == 0) { DPRINT1("Width = %d, Height = %d BitsPixel = %d\n", Width, Height, BitsPixel); SetLastWin32Error(ERROR_INVALID_PARAMETER); return 0; } - WidthBytes = BITMAPOBJ_GetWidthBytes(Width, Planes * BitsPixel); - - Size.cx = abs(Width); + WidthBytes = BITMAPOBJ_GetWidthBytes(Width, BitsPixel); + + Size.cx = Width; Size.cy = abs(Height); + + /* Make sure that cjBits will not overflow */ + if ((ULONGLONG)WidthBytes * Size.cy >= 0x100000000ULL) + { + DPRINT1("Width = %d, Height = %d BitsPixel = %d\n", Width, Height, BitsPixel); + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return 0; + } /* Create the bitmap object. */ hBitmap = IntCreateBitmap(Size, WidthBytes, @@ -166,18 +174,10 @@ { HBITMAP Bmp; - Bmp = NULL; - - if ((Width >= 0x10000) || (Height >= 0x10000)) - { - DPRINT1("got bad width %d or height %d, please look for reason\n", Width, Height); - return NULL; - } - /* MS doc says if width or height is 0, return 1-by-1 pixel, monochrome bitmap */ if (0 == Width || 0 == Height) { - Bmp = IntGdiCreateBitmap (1, 1, 1, 1, NULL); + Bmp = NtGdiGetStockObject(DEFAULT_BITMAP); } else { @@ -602,15 +602,11 @@ /* Internal Functions */ -INT FASTCALL -BITMAPOBJ_GetRealBitsPixel(INT nBitsPixel) -{ - if (nBitsPixel < 0) - return 0; +UINT FASTCALL +BITMAPOBJ_GetRealBitsPixel(UINT nBitsPixel) +{ if (nBitsPixel <= 1) return 1; - if (nBitsPixel <= 2) - return 2; if (nBitsPixel <= 4) return 4; if (nBitsPixel <= 8)

1 0

[fireball] 34357: - Fix build correctly this time.
by fireball＠svn.reactos.org 07 Jul '08

07 Jul '08

Author: fireball Date: Mon Jul 7 10:59:02 2008 New Revision: 34357 URL: http://svn.reactos.org/svn/reactos?rev=34357&view=rev Log: - Fix build correctly this time. Added: trunk/reactos/dll/win32/mpr/mpr_Uk.rc - copied unchanged from r34353, trunk/reactos/dll/win32/mpr/mpr_Uk.rc Modified: trunk/reactos/dll/win32/mpr/mpr.rc Modified: trunk/reactos/dll/win32/mpr/mpr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr.rc?rev=3… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr.rc [iso-8859-1] Mon Jul 7 10:59:02 2008 @@ -45,3 +45,4 @@ #include "mpr_Si.rc" #include "mpr_Sv.rc" #include "mpr_Tr.rc" +#include "mpr_Uk.rc"

1 0

[cfinck] 34356: Fixed and reformatted argvtos() function: The previous one did not check if an argument already contains quotation marks. Therefore pathes containing spaces, which were already quoted, were quoted again, so that gcc handled the full path as several arguments.
by cfinck＠svn.reactos.org 07 Jul '08

07 Jul '08

Author: cfinck Date: Mon Jul 7 09:00:29 2008 New Revision: 34356 URL: http://svn.reactos.org/svn/reactos?rev=34356&view=rev Log: Fixed and reformatted argvtos() function: The previous one did not check if an argument already contains quotation marks. Therefore pathes containing spaces, which were already quoted, were quoted again, so that gcc handled the full path as several arguments. Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/execute.c Modified: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/execute.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/cc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/execute.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/execute.c [iso-8859-1] Mon Jul 7 09:00:29 2008 @@ -21,28 +21,34 @@ #ifdef _WIN32 static char *argvtos(char **argv) { - int i, len; - char *ptr, *str; - - for (i = 0, len = 0; argv[i]; i++) { - len += strlen(argv[i]) + 3; - } - - str = ptr = (char *)malloc(len + 1); - if (str == NULL) - return NULL; - - for (i = 0; argv[i]; i++) { - len = strlen(argv[i]); - *ptr++ = '"'; - memcpy(ptr, argv[i], len); - ptr += len; - *ptr++ = '"'; - *ptr++ = ' '; - } - *ptr = 0; - - return str; + int i, len; + char *ptr, *str; + + for (i = 0, len = 0; argv[i]; i++) + len += strlen(argv[i]) + 3; + + str = ptr = (char *)malloc(len + 1); + if (str == NULL) + return NULL; + + for (i = 0; argv[i]; i++) + { + len = strlen(argv[i]); + + if(argv[i][0] != '"') + *ptr++ = '"'; + + memcpy(ptr, argv[i], len); + ptr += len; + + if(argv[i][len - 1] != '"') + *ptr++ = '"'; + + *ptr++ = ' '; + } + *ptr = 0; + + return str; } #endif

1 0

[cfinck] 34355: Attempt to fix build
by cfinck＠svn.reactos.org 07 Jul '08

07 Jul '08

Author: cfinck Date: Mon Jul 7 08:57:14 2008 New Revision: 34355 URL: http://svn.reactos.org/svn/reactos?rev=34355&view=rev Log: Attempt to fix build Modified: trunk/reactos/dll/win32/mpr/mpr.rc Modified: trunk/reactos/dll/win32/mpr/mpr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr.rc?rev=3… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr.rc [iso-8859-1] Mon Jul 7 08:57:14 2008 @@ -45,4 +45,3 @@ #include "mpr_Si.rc" #include "mpr_Sv.rc" #include "mpr_Tr.rc" -#include "mpr_Uk.rc"

1 0

[fireball] 34354: Autosyncing with Wine HEAD
by fireball＠svn.reactos.org 07 Jul '08

07 Jul '08

Author: fireball Date: Mon Jul 7 07:32:35 2008 New Revision: 34354 URL: http://svn.reactos.org/svn/reactos?rev=34354&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/hhctrl.ocx/Da.rc (with props) trunk/reactos/dll/win32/hhctrl.ocx/Si.rc (with props) trunk/reactos/dll/win32/mpr/mpr_Da.rc (with props) trunk/reactos/dll/win32/mpr/mpr_Ro.rc (with props) trunk/reactos/dll/win32/mpr/mpr_Si.rc (with props) Removed: trunk/reactos/dll/win32/mpr/mpr_Uk.rc Modified: trunk/reactos/dll/win32/hhctrl.ocx/En.rc trunk/reactos/dll/win32/hhctrl.ocx/Ru.rc trunk/reactos/dll/win32/hhctrl.ocx/Sv.rc trunk/reactos/dll/win32/hhctrl.ocx/chm.c trunk/reactos/dll/win32/hhctrl.ocx/help.c trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.c trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc trunk/reactos/dll/win32/hlink/extserv.c trunk/reactos/dll/win32/hlink/hlink_main.c trunk/reactos/dll/win32/inetcomm/inetcomm.rbuild trunk/reactos/dll/win32/inetcomm/mimeole.c trunk/reactos/dll/win32/inetmib1/inetmib1.rbuild trunk/reactos/dll/win32/inetmib1/main.c trunk/reactos/dll/win32/mapi32/prop.c trunk/reactos/dll/win32/mlang/mlang.c trunk/reactos/dll/win32/mpr/mpr.rc trunk/reactos/dll/win32/mpr/mpr_Sv.rc trunk/reactos/dll/win32/mpr/nps.c trunk/reactos/dll/win32/mpr/wnet.c Added: trunk/reactos/dll/win32/hhctrl.ocx/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/Da.rc… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/Da.rc (added) +++ trunk/reactos/dll/win32/hhctrl.ocx/Da.rc [iso-8859-1] Mon Jul 7 07:32:35 2008 @@ -1,0 +1,58 @@ +/* + * HTML Help resources + * Danish Language Support + * + * Copyright 2008 Jens Albretsen <jens(a)albretsen.dk> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_CONTENTS "&Indhold" + IDS_INDEX "I&ndeks" + IDS_SEARCH "&Søg" + IDS_FAVORITES "Favor&itter" +END + +STRINGTABLE +BEGIN + IDTB_EXPAND "Vis" + IDTB_CONTRACT "Skjul" + IDTB_STOP "Stop" + IDTB_REFRESH "Opdatér" + IDTB_BACK "Tilbage" + IDTB_HOME "Hjem" + IDTB_SYNC "Synkroniser" + IDTB_PRINT "Udskriv" + IDTB_OPTIONS "Indstillinger" + IDTB_FORWARD "Frem" + IDTB_NOTES "IDTB_NOTES" + IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" + IDTB_BROWSE_BACK "IDT_BROWSE_BACK" + IDTB_CONTENTS "IDTB_CONTENTS" + IDTB_INDEX "IDTB_INDEX" + IDTB_SEARCH "IDTB_SEARCH" + IDTB_HISTORY "IDTB_HISTORY" + IDTB_FAVORITES "IDTB_FAVORITES" + IDTB_JUMP1 "Jump1" + IDTB_JUMP2 "Jump2" + IDTB_CUSTOMIZE "Tilpas" + IDTB_ZOOM "Forstør" + IDTB_TOC_NEXT "IDTB_TOC_NEXT" + IDTB_TOC_PREV "IDTB_TOC_PREV" +END Propchange: trunk/reactos/dll/win32/hhctrl.ocx/Da.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/hhctrl.ocx/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/En.rc… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/En.rc [iso-8859-1] Mon Jul 7 07:32:35 2008 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE BEGIN Modified: trunk/reactos/dll/win32/hhctrl.ocx/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/Ru.rc… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/Ru.rc [iso-8859-1] Mon Jul 7 07:32:35 2008 @@ -38,11 +38,11 @@ IDTB_BACK "Íàçàä" IDTB_HOME "Â íà÷àëî" IDTB_SYNC "Ñèíõðîíèçèðîâàòü" - IDTB_PRINT "Ïå÷ÿòü" + IDTB_PRINT "Ïå÷àòü" IDTB_OPTIONS "Íàñòðîéêè" - IDTB_FORWARD "Â ïåð¸ä" + IDTB_FORWARD "Âïåð¸ä" IDTB_NOTES "Çàïèñêè" - IDTB_BROWSE_FWD "Ïðîñìîòð â ïåð¸ä" + IDTB_BROWSE_FWD "Ïðîñìîòð âïåð¸ä" IDTB_BROWSE_BACK "Ïðîñìîòð íàçàä" IDTB_CONTENTS "Ñîäåðæàíèå" IDTB_INDEX "Îãëàâëåíèå" Added: trunk/reactos/dll/win32/hhctrl.ocx/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/Si.rc… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/Si.rc (added) +++ trunk/reactos/dll/win32/hhctrl.ocx/Si.rc [iso-8859-1] Mon Jul 7 07:32:35 2008 @@ -1,0 +1,62 @@ +/* + * HTML Help resources + * Slovenian Language Support + * + * Copyright 2008 Rok Mandeljc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(65001) + +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_CONTENTS "&Vsebina" + IDS_INDEX "I&ndeks" + IDS_SEARCH "&Iskanje" + IDS_FAVORITES "&Priljubljene" +END + +STRINGTABLE +BEGIN + IDTB_EXPAND "PokaÅ¾i" + IDTB_CONTRACT "Skrij" + IDTB_STOP "Ustavi" + IDTB_REFRESH "OsveÅ¾i" + IDTB_BACK "Nazaj" + IDTB_HOME "Domov" + IDTB_SYNC "Sinhroniziraj" + IDTB_PRINT "Natisni" + IDTB_OPTIONS "MoÅ¾nosti" + IDTB_FORWARD "Naprej" + IDTB_NOTES "IDTB_NOTES" + IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" + IDTB_BROWSE_BACK "IDT_BROWSE_BACK" + IDTB_CONTENTS "IDTB_CONTENTS" + IDTB_INDEX "IDTB_INDEX" + IDTB_SEARCH "IDTB_SEARCH" + IDTB_HISTORY "IDTB_HISTORY" + IDTB_FAVORITES "IDTB_FAVORITES" + IDTB_JUMP1 "Skok1" + IDTB_JUMP2 "Skok2" + IDTB_CUSTOMIZE "Prilagodi" + IDTB_ZOOM "Zoom" + IDTB_TOC_NEXT "IDTB_TOC_NEXT" + IDTB_TOC_PREV "IDTB_TOC_PREV" +END + +#pragma code_page(default) Propchange: trunk/reactos/dll/win32/hhctrl.ocx/Si.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/hhctrl.ocx/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/Sv.rc… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/Sv.rc [iso-8859-1] Mon Jul 7 07:32:35 2008 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN Modified: trunk/reactos/dll/win32/hhctrl.ocx/chm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/chm.c… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/chm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/chm.c [iso-8859-1] Mon Jul 7 07:32:35 2008 @@ -229,7 +229,7 @@ info->WinType.cbStruct=sizeof(info->WinType); info->WinType.fUniCodeStrings=TRUE; info->WinType.pszType=strdupW(defaultwinW); - info->WinType.pszToc = strdupW(info->pCHMInfo->defToc); + info->WinType.pszToc = strdupW(info->pCHMInfo->defToc ? info->pCHMInfo->defToc : null); info->WinType.pszIndex = strdupW(null); info->WinType.fsValidMembers=0; info->WinType.fsWinProperties=HHWIN_PROP_TRI_PANE; @@ -363,14 +363,13 @@ CHMInfo *OpenCHM(LPCWSTR szFile) { WCHAR file[MAX_PATH] = {0}; - DWORD res; HRESULT hres; static const WCHAR wszSTRINGS[] = {'#','S','T','R','I','N','G','S',0}; CHMInfo *ret = heap_alloc_zero(sizeof(CHMInfo)); - res = GetFullPathNameW(szFile, sizeof(file)/sizeof(file[0]), file, NULL); + GetFullPathNameW(szFile, sizeof(file)/sizeof(file[0]), file, NULL); ret->szFile = strdupW(file); hres = CoCreateInstance(&CLSID_ITStorage, NULL, CLSCTX_INPROC_SERVER, @@ -391,7 +390,7 @@ &ret->strings_stream); if(FAILED(hres)) { WARN("Could not open #STRINGS stream: %08x\n", hres); - return CloseCHM(ret); + /* It's not critical, so we pass */ } if(!ReadChmSystem(ret)) { Modified: trunk/reactos/dll/win32/hhctrl.ocx/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/help.… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/help.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/help.c [iso-8859-1] Mon Jul 7 07:32:35 2008 @@ -89,9 +89,15 @@ BOOL ret; HRESULT hres; - hres = navigate_url(info, surl); - if(SUCCEEDED(hres)) - return TRUE; + static const WCHAR url_indicator[] = {':', '/', '/'}; + + TRACE("%s\n", debugstr_w(surl)); + + if (strstrW(surl, url_indicator)) { + hres = navigate_url(info, surl); + if(SUCCEEDED(hres)) + return TRUE; + } /* look up in chm if it doesn't look like a full url */ SetChmPath(&chm_path, info->pCHMInfo->szFile, surl); ret = NavigateToChm(info, chm_path.chm_file, chm_path.chm_index); @@ -575,7 +581,7 @@ { LPWSTR szBuf = HH_LoadString(buttons[dwIndex].idCommand); DWORD dwLen = strlenW(szBuf); - szBuf[dwLen + 2] = 0; /* Double-null terminate */ + szBuf[dwLen + 1] = 0; /* Double-null terminate */ buttons[dwIndex].iString = (DWORD)SendMessageW(hToolbar, TB_ADDSTRINGW, 0, (LPARAM)szBuf); heap_free(szBuf); Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.c [iso-8859-1] Mon Jul 7 07:32:35 2008 @@ -108,6 +108,9 @@ FIXME("Not all HH cases handled correctly\n"); + if (!filename) + return NULL; + index = strstrW(filename, delimW); if (index) { @@ -123,34 +126,41 @@ } info = CreateHelpViewer(filename); - - if (info) - { - if (!index) - index = info->WinType.pszFile; - res = NavigateToChm(info, info->pCHMInfo->szFile, index); - if(!res) - ReleaseHelpViewer(info); - } - - return NULL; /* FIXME */ + if(!info) + return NULL; + + if(!index) + index = info->WinType.pszFile; + + res = NavigateToChm(info, info->pCHMInfo->szFile, index); + if(!res) + { + ReleaseHelpViewer(info); + return NULL; + } + return info->WinType.hwndHelp; } case HH_HELP_CONTEXT: { HHInfo *info; LPWSTR url; + if (!filename) + return NULL; + info = CreateHelpViewer(filename); if(!info) return NULL; url = FindContextAlias(info->pCHMInfo, data); if(!url) - return NULL; + { + ReleaseHelpViewer(info); + return NULL; + } NavigateToUrl(info, url); heap_free(url); - - return NULL; /* FIXME */ + return info->WinType.hwndHelp; } case HH_PRETRANSLATEMESSAGE: { static BOOL warned = FALSE; Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc [iso-8859-1] Mon Jul 7 07:32:35 2008 @@ -30,6 +30,7 @@ #include "version.rc" #include "Cs.rc" +#include "Da.rc" #include "De.rc" #include "El.rc" #include "En.rc" @@ -41,5 +42,6 @@ #include "No.rc" #include "Pl.rc" #include "Ru.rc" +#include "Si.rc" #include "Sv.rc" #include "Tr.rc" Modified: trunk/reactos/dll/win32/hlink/extserv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/extserv.c?… ============================================================================== --- trunk/reactos/dll/win32/hlink/extserv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/extserv.c [iso-8859-1] Mon Jul 7 07:32:35 2008 @@ -26,9 +26,10 @@ #define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl))) typedef struct { - const IUnknownVtbl *lpIUnknownVtbl; - const IAuthenticateVtbl *lpIAuthenticateVtbl; - const IHttpNegotiateVtbl *lpIHttpNegotiateVtbl; + const IUnknownVtbl *lpIUnknownVtbl; + const IAuthenticateVtbl *lpIAuthenticateVtbl; + const IHttpNegotiateVtbl *lpIHttpNegotiateVtbl; + const IExtensionServicesVtbl *lpIExtensionServicesVtbl; LONG ref; IUnknown *outer; @@ -42,6 +43,7 @@ #define EXTSERVUNK(x) ((IUnknown*) &(x)->lpIUnknownVtbl) #define AUTHENTICATE(x) ((IAuthenticate*) &(x)->lpIAuthenticateVtbl) #define HTTPNEGOTIATE(x) ((IHttpNegotiate*) &(x)->lpIHttpNegotiateVtbl) +#define EXTENSIONSERVICES(x) ((IExtensionServices*) &(x)->lpIExtensionServicesVtbl) #define EXTSERVUNK_THIS(iface) DEFINE_THIS(ExtensionService, IUnknown, iface) @@ -60,6 +62,9 @@ }else if(IsEqualGUID(&IID_IHttpNegotiate, riid)) { TRACE("(%p)->(IID_IHttpNegotiate %p)\n", This, ppv); *ppv = HTTPNEGOTIATE(This); + }else if(IsEqualGUID(&IID_IExtensionServices, riid)) { + TRACE("(%p)->(IID_IExtensionServices %p)\n", This, ppv); + *ppv = EXTENSIONSERVICES(This); } if(*ppv) { @@ -209,6 +214,90 @@ HttpNegotiate_OnResponse }; +#define EXTENSIONSERVICES_THIS(iface) DEFINE_THIS(ExtensionService, IExtensionServices, iface) + +static HRESULT WINAPI ExtServ_QueryInterface(IExtensionServices *iface, REFIID riid, void **ppv) +{ + ExtensionService *This = EXTENSIONSERVICES_THIS(iface); + return IUnknown_QueryInterface(This->outer, riid, ppv); +} + +static ULONG WINAPI ExtServ_AddRef(IExtensionServices *iface) +{ + ExtensionService *This = EXTENSIONSERVICES_THIS(iface); + return IUnknown_AddRef(This->outer); +} + +static ULONG WINAPI ExtServ_Release(IExtensionServices *iface) +{ + ExtensionService *This = EXTENSIONSERVICES_THIS(iface); + return IUnknown_Release(This->outer); +} + +static HRESULT ExtServ_ImplSetAdditionalHeaders(ExtensionService* This, LPCWSTR pwzAdditionalHeaders) +{ + int len = 0; + + heap_free(This->headers); + This->headers = NULL; + + if (!pwzAdditionalHeaders) + return S_OK; + + len = strlenW(pwzAdditionalHeaders); + + if(len && pwzAdditionalHeaders[len-1] != '\n' && pwzAdditionalHeaders[len-1] != '\r') { + static const WCHAR endlW[] = {'\r','\n',0}; + This->headers = heap_alloc(len*sizeof(WCHAR) + sizeof(endlW)); + memcpy(This->headers, pwzAdditionalHeaders, len*sizeof(WCHAR)); + memcpy(This->headers+len, endlW, sizeof(endlW)); + }else { + This->headers = hlink_strdupW(pwzAdditionalHeaders); + } + + return S_OK; +} + +static HRESULT WINAPI ExtServ_SetAdditionalHeaders(IExtensionServices* iface, LPCWSTR pwzAdditionalHeaders) +{ + ExtensionService *This = EXTENSIONSERVICES_THIS(iface); + + TRACE("(%p)->(%s)\n", This, debugstr_w(pwzAdditionalHeaders)); + + return ExtServ_ImplSetAdditionalHeaders(This,pwzAdditionalHeaders); +} + +static HRESULT ExtServ_ImplSetAuthenticateData(ExtensionService* This, HWND phwnd, LPCWSTR pwzUsername, LPCWSTR pwzPassword) +{ + heap_free(This->username); + heap_free(This->password); + + This->hwnd = phwnd; + This->username = hlink_strdupW(pwzUsername); + This->password = hlink_strdupW(pwzPassword); + + return S_OK; +} + +static HRESULT WINAPI ExtServ_SetAuthenticateData(IExtensionServices* iface, HWND phwnd, LPCWSTR pwzUsername, LPCWSTR pwzPassword) +{ + ExtensionService *This = EXTENSIONSERVICES_THIS(iface); + + TRACE("(%p)->(%p %s %s)\n", This, phwnd, debugstr_w(pwzUsername), debugstr_w(pwzPassword)); + + return ExtServ_ImplSetAuthenticateData(This, phwnd, pwzUsername, pwzPassword); +} + +#undef EXTENSIONSERVICES_THIS + +static const IExtensionServicesVtbl ExtServVtbl = { + ExtServ_QueryInterface, + ExtServ_AddRef, + ExtServ_Release, + ExtServ_SetAdditionalHeaders, + ExtServ_SetAuthenticateData +}; + /*********************************************************************** * HlinkCreateExtensionServices (HLINK.@) */ @@ -217,7 +306,6 @@ IUnknown *punkOuter, REFIID riid, void** ppv) { ExtensionService *ret; - int len = 0; HRESULT hres = S_OK; TRACE("%s %p %s %s %p %s %p\n",debugstr_w(pwzAdditionalHeaders), @@ -229,22 +317,15 @@ ret->lpIUnknownVtbl = &ExtServUnkVtbl; ret->lpIAuthenticateVtbl = &AuthenticateVtbl; ret->lpIHttpNegotiateVtbl = &HttpNegotiateVtbl; + ret->lpIExtensionServicesVtbl= &ExtServVtbl; ret->ref = 1; - ret->hwnd = phwnd; - ret->username = hlink_strdupW(pszUsername); - ret->password = hlink_strdupW(pszPassword); - - if(pwzAdditionalHeaders) - len = strlenW(pwzAdditionalHeaders); - - if(len && pwzAdditionalHeaders[len-1] != '\n' && pwzAdditionalHeaders[len-1] != '\r') { - static const WCHAR endlW[] = {'\r','\n',0}; - ret->headers = heap_alloc(len*sizeof(WCHAR) + sizeof(endlW)); - memcpy(ret->headers, pwzAdditionalHeaders, len*sizeof(WCHAR)); - memcpy(ret->headers+len, endlW, sizeof(endlW)); - }else { - ret->headers = hlink_strdupW(pwzAdditionalHeaders); - } + ret->headers = NULL; + ret->hwnd = NULL; + ret->username = NULL; + ret->password = NULL; + + ExtServ_ImplSetAuthenticateData(ret, phwnd, pszUsername, pszPassword); + ExtServ_ImplSetAdditionalHeaders(ret, pwzAdditionalHeaders); if(!punkOuter) { ret->outer = EXTSERVUNK(ret); Modified: trunk/reactos/dll/win32/hlink/hlink_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/hlink_main… ============================================================================== --- trunk/reactos/dll/win32/hlink/hlink_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/hlink_main.c [iso-8859-1] Mon Jul 7 07:32:35 2008 @@ -481,8 +481,8 @@ HLinkCF_fnLockServer }; -static CFImpl HLink_cf = { &hlcfvt, &HLink_Constructor }; -static CFImpl HLinkBrowseContext_cf = { &hlcfvt, &HLinkBrowseContext_Constructor }; +static CFImpl HLink_cf = { &hlcfvt, HLink_Constructor }; +static CFImpl HLinkBrowseContext_cf = { &hlcfvt, HLinkBrowseContext_Constructor }; /*********************************************************************** * DllGetClassObject (HLINK.@) Modified: trunk/reactos/dll/win32/inetcomm/inetcomm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/inetcom… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/inetcomm.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/inetcomm.rbuild [iso-8859-1] Mon Jul 7 07:32:35 2008 @@ -1,23 +1,26 @@ -<module name="inetcomm" type="win32dll" baseaddress="${BASEADDRESS_INETCOMM}" installbase="system32" installname="inetcomm.dll" allowwarnings="true" entrypoint="0"> - <importlibrary definition="inetcomm.spec.def" /> - <include base="inetcomm">.</include> - <include base="ReactOS">include/reactos/wine</include> - <define name="__WINESRC__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x600</define> - <define name="WINVER">0x600</define> - <library>wine</library> - <library>uuid</library> - <library>ole32</library> - <library>ws2_32</library> - <library>user32</library> - <library>advapi32</library> - <library>kernel32</library> - <library>ntdll</library> - <file>inetcomm_main.c</file> - <file>internettransport.c</file> - <file>mimeole.c</file> - <file>regsvr.c</file> - <file>inetcomm.spec</file> +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="inetcomm" type="win32dll" baseaddress="${BASEADDRESS_INETCOMM}" installbase="system32" installname="inetcomm.dll" allowwarnings="true"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> + <importlibrary definition="inetcomm.spec.def" /> + <include base="inetcomm">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> + <file>inetcomm_main.c</file> + <file>internettransport.c</file> + <file>mimeole.c</file> + <file>regsvr.c</file> + <file>inetcomm.spec</file> + <library>wine</library> + <library>uuid</library> + <library>ole32</library> + <library>ws2_32</library> + <library>user32</library> + <library>advapi32</library> + <library>kernel32</library> + <library>ntdll</library> </module> +</group> Modified: trunk/reactos/dll/win32/inetcomm/mimeole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/mimeole… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/mimeole.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/mimeole.c [iso-8859-1] Mon Jul 7 07:32:35 2008 @@ -1629,8 +1629,8 @@ IStream *sub_stream; ULARGE_INTEGER start, length; - start.u.LowPart = cur->offsets.cbHeaderStart; - length.u.LowPart = cur->offsets.cbBodyEnd - cur->offsets.cbHeaderStart; + start.QuadPart = cur->offsets.cbHeaderStart; + length.QuadPart = cur->offsets.cbBodyEnd - cur->offsets.cbHeaderStart; create_sub_stream(pStm, start, length, &sub_stream); sub_body = create_sub_body(msg, sub_stream, &cur->offsets, body); IStream_Release(sub_stream); Modified: trunk/reactos/dll/win32/inetmib1/inetmib1.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetmib1/inetmib… ============================================================================== --- trunk/reactos/dll/win32/inetmib1/inetmib1.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetmib1/inetmib1.rbuild [iso-8859-1] Mon Jul 7 07:32:35 2008 @@ -1,17 +1,19 @@ -<module name="inetmib1" type="win32dll" baseaddress="${BASEADDRESS_INETMIB1}" installbase="system32" installname="inetmib1.dll" allowwarnings="true" entrypoint="0"> - <importlibrary definition="inetmib1.spec.def" /> - <include base="inetmib1">.</include> - <include base="ReactOS">include/reactos/wine</include> - <define name="__WINESRC__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <library>wine</library> - <library>snmpapi</library> - <library>kernel32</library> - <library>iphlpapi</library> - <library>ntdll</library> - <file>main.c</file> - <file>inetmib1.spec</file> +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="inetmib1" type="win32dll" baseaddress="${BASEADDRESS_INETMIB1}" installbase="system32" installname="inetmib1.dll" allowwarnings="true"> + <importlibrary definition="inetmib1.spec.def" /> + <include base="inetmib1">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> + <file>main.c</file> + <file>inetmib1.spec</file> + <library>wine</library> + <library>snmpapi</library> + <library>kernel32</library> + <library>iphlpapi</library> + <library>ntdll</library> </module> +</group> Modified: trunk/reactos/dll/win32/inetmib1/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetmib1/main.c?… ============================================================================== --- trunk/reactos/dll/win32/inetmib1/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetmib1/main.c [iso-8859-1] Mon Jul 7 07:32:35 2008 @@ -29,26 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(inetmib1); -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - case DLL_PROCESS_DETACH: - break; - default: - break; - } - - return TRUE; -} - /** * Utility functions */ @@ -115,6 +95,7 @@ AsnObjectIdentifier name; void (*init)(void); varqueryfunc query; + void (*cleanup)(void); }; static UINT mib2IfNumber[] = { 1,3,6,1,2,1,2,1 }; @@ -130,6 +111,11 @@ if (ifTable) GetIfTable(ifTable, &size, FALSE); } +} + +static void mib2IfNumberCleanup(void) +{ + HeapFree(GetProcessHeap(), 0, ifTable); } static BOOL mib2IfNumberQuery(BYTE bPduType, SnmpVarBind *pVarBind, @@ -352,18 +338,18 @@ } /* Given an OID and a base OID that it must begin with, finds the item and - * element of the table whose IP address matches the instance from the OID. - * E.g., given an OID foo.1.2.3.4.5 and a base OID foo, returns item 1 and the - * index of the entry in the table whose IP address is 2.3.4.5. + * element of the table whose value matches the instance from the OID. + * The OID is converted to a key with the function makeKey, and compared + * against entries in the table with the function compare. * If bPduType is not SNMP_PDU_GETNEXT and either the item or instance is * missing, returns SNMP_ERRORSTATUS_NOSUCHNAME. * If bPduType is SNMP_PDU_GETNEXT, returns the successor to the item and * instance, or item 1, instance 1 if either is missing. */ -static AsnInteger32 getItemAndIpAddressInstanceFromOid(AsnObjectIdentifier *oid, - AsnObjectIdentifier *base, BYTE bPduType, struct GenericTable *table, - size_t tableEntrySize, oidToKeyFunc makeKey, compareFunc compare, - UINT *item, UINT *instance) +static AsnInteger32 getItemAndInstanceFromTable(AsnObjectIdentifier *oid, + AsnObjectIdentifier *base, UINT instanceLen, BYTE bPduType, + struct GenericTable *table, size_t tableEntrySize, oidToKeyFunc makeKey, + compareFunc compare, UINT *item, UINT *instance) { AsnInteger32 ret = SNMP_ERRORSTATUS_NOERROR; @@ -380,7 +366,7 @@ *instance = 1; } else if (!SnmpUtilOidNCmp(oid, base, base->idLength) && - oid->idLength < base->idLength + 5) + oid->idLength < base->idLength + instanceLen + 1) { /* Either the table or an item is specified, but the instance is * not. @@ -396,7 +382,7 @@ *item = 1; } else if (!SnmpUtilOidNCmp(oid, base, base->idLength) && - oid->idLength == base->idLength + 5) + oid->idLength == base->idLength + instanceLen + 1) { *item = oid->ids[base->idLength]; if (!*item) @@ -406,8 +392,8 @@ } else { - AsnObjectIdentifier ipOid = { 4, oid->ids + base->idLength + 1 - }; + AsnObjectIdentifier ipOid = { instanceLen, + oid->ids + base->idLength + 1 }; *instance = findValueInTable(&ipOid, table, tableEntrySize, makeKey, compare) + 1; @@ -420,15 +406,15 @@ break; default: if (!SnmpUtilOidNCmp(oid, base, base->idLength) && - oid->idLength == base->idLength + 5) + oid->idLength == base->idLength + instanceLen + 1) { *item = oid->ids[base->idLength]; if (!*item) ret = SNMP_ERRORSTATUS_NOSUCHNAME; else { - AsnObjectIdentifier ipOid = { 4, oid->ids + base->idLength + 1 - }; + AsnObjectIdentifier ipOid = { instanceLen, + oid->ids + base->idLength + 1 }; *instance = findValueInTable(&ipOid, table, tableEntrySize, makeKey, compare); @@ -653,6 +639,11 @@ } } +static void mib2IpAddrCleanup(void) +{ + HeapFree(GetProcessHeap(), 0, ipAddrTable); +} + static void oidToIpAddrRow(AsnObjectIdentifier *oid, void *dst) { MIB_IPADDRROW *row = dst; @@ -680,8 +671,8 @@ { case SNMP_PDU_GET: case SNMP_PDU_GETNEXT: - *pErrorStatus = getItemAndIpAddressInstanceFromOid(&pVarBind->name, - &myOid, bPduType, (struct GenericTable *)ipAddrTable, + *pErrorStatus = getItemAndInstanceFromTable(&pVarBind->name, + &myOid, 4, bPduType, (struct GenericTable *)ipAddrTable, sizeof(MIB_IPADDRROW), oidToIpAddrRow, compareIpAddrRow, &item, &tableIndex); if (!*pErrorStatus) @@ -736,6 +727,11 @@ } } +static void mib2IpRouteCleanup(void) +{ + HeapFree(GetProcessHeap(), 0, ipRouteTable); +} + static void oidToIpForwardRow(AsnObjectIdentifier *oid, void *dst) { MIB_IPFORWARDROW *row = dst; @@ -763,8 +759,8 @@ { case SNMP_PDU_GET: case SNMP_PDU_GETNEXT: - *pErrorStatus = getItemAndIpAddressInstanceFromOid(&pVarBind->name, - &myOid, bPduType, (struct GenericTable *)ipRouteTable, + *pErrorStatus = getItemAndInstanceFromTable(&pVarBind->name, + &myOid, 4, bPduType, (struct GenericTable *)ipRouteTable, sizeof(MIB_IPFORWARDROW), oidToIpForwardRow, compareIpForwardRow, &item, &tableIndex); if (!*pErrorStatus) @@ -809,6 +805,11 @@ if (ipNetTable) GetIpNetTable(ipNetTable, &size, FALSE); } +} + +static void mib2IpNetCleanup(void) +{ + HeapFree(GetProcessHeap(), 0, ipNetTable); } static BOOL mib2IpNetQuery(BYTE bPduType, SnmpVarBind *pVarBind, @@ -1037,17 +1038,119 @@ return TRUE; } +static UINT mib2UdpEntry[] = { 1,3,6,1,2,1,7,5,1 }; +static PMIB_UDPTABLE udpTable; + +static void mib2UdpEntryInit(void) +{ + DWORD size = 0, ret = GetUdpTable(NULL, &size, TRUE); + + if (ret == ERROR_INSUFFICIENT_BUFFER) + { + udpTable = HeapAlloc(GetProcessHeap(), 0, size); + if (udpTable) + GetUdpTable(udpTable, &size, TRUE); + } +} + +static void mib2UdpEntryCleanup(void) +{ + HeapFree(GetProcessHeap(), 0, udpTable); +} + +static struct structToAsnValue mib2UdpEntryMap[] = { + { FIELD_OFFSET(MIB_UDPROW, dwLocalAddr), copyIpAddr }, + { FIELD_OFFSET(MIB_UDPROW, dwLocalPort), copyInt }, +}; + +static void oidToUdpRow(AsnObjectIdentifier *oid, void *dst) +{ + MIB_UDPROW *row = dst; + + assert(oid && oid->idLength >= 5); + row->dwLocalAddr = oidToIpAddr(oid); + row->dwLocalPort = oid->ids[4]; +} + +static int compareUdpRow(const void *a, const void *b) +{ + const MIB_UDPROW *key = a, *value = b; + int ret; + + ret = key->dwLocalAddr - value->dwLocalAddr; + if (ret == 0) + ret = key->dwLocalPort - value->dwLocalPort; + return ret; +} + +static BOOL mib2UdpEntryQuery(BYTE bPduType, SnmpVarBind *pVarBind, + AsnInteger32 *pErrorStatus) +{ + AsnObjectIdentifier myOid = DEFINE_OID(mib2UdpEntry); + + TRACE("(0x%02x, %s, %p)\n", bPduType, SnmpUtilOidToA(&pVarBind->name), + pErrorStatus); + + switch (bPduType) + { + case SNMP_PDU_GET: + case SNMP_PDU_GETNEXT: + if (!udpTable) + *pErrorStatus = SNMP_ERRORSTATUS_NOSUCHNAME; + else + { + UINT tableIndex = 0, item = 0; + + *pErrorStatus = getItemAndInstanceFromTable(&pVarBind->name, &myOid, + 5, bPduType, (struct GenericTable *)udpTable, + sizeof(MIB_UDPROW), oidToUdpRow, compareUdpRow, &item, + &tableIndex); + if (!*pErrorStatus) + { + assert(tableIndex); + assert(item); + *pErrorStatus = mapStructEntryToValue(mib2UdpEntryMap, + DEFINE_SIZEOF(mib2UdpEntryMap), + &udpTable->table[tableIndex - 1], item, bPduType, pVarBind); + if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) + { + AsnObjectIdentifier oid; + + setOidWithItemAndIpAddr(&pVarBind->name, &myOid, item, + udpTable->table[tableIndex - 1].dwLocalAddr); + oid.idLength = 1; + oid.ids = &udpTable->table[tableIndex - 1].dwLocalPort; + SnmpUtilOidAppend(&pVarBind->name, &oid); + } + } + } + break; + case SNMP_PDU_SET: + *pErrorStatus = SNMP_ERRORSTATUS_READONLY; + break; + default: + FIXME("0x%02x: unsupported PDU type\n", bPduType); + *pErrorStatus = SNMP_ERRORSTATUS_NOSUCHNAME; + } + return TRUE; +} + /* This list MUST BE lexicographically sorted */ static struct mibImplementation supportedIDs[] = { - { DEFINE_OID(mib2IfNumber), mib2IfNumberInit, mib2IfNumberQuery }, - { DEFINE_OID(mib2IfEntry), NULL, mib2IfEntryQuery }, - { DEFINE_OID(mib2Ip), mib2IpStatsInit, mib2IpStatsQuery }, - { DEFINE_OID(mib2IpAddr), mib2IpAddrInit, mib2IpAddrQuery }, - { DEFINE_OID(mib2IpRoute), mib2IpRouteInit, mib2IpRouteQuery }, - { DEFINE_OID(mib2IpNet), mib2IpNetInit, mib2IpNetQuery }, - { DEFINE_OID(mib2Icmp), mib2IcmpInit, mib2IcmpQuery }, - { DEFINE_OID(mib2Tcp), mib2TcpInit, mib2TcpQuery }, - { DEFINE_OID(mib2Udp), mib2UdpInit, mib2UdpQuery }, + { DEFINE_OID(mib2IfNumber), mib2IfNumberInit, mib2IfNumberQuery, + mib2IfNumberCleanup }, + { DEFINE_OID(mib2IfEntry), NULL, mib2IfEntryQuery, NULL }, + { DEFINE_OID(mib2Ip), mib2IpStatsInit, mib2IpStatsQuery, NULL }, + { DEFINE_OID(mib2IpAddr), mib2IpAddrInit, mib2IpAddrQuery, + mib2IpAddrCleanup }, + { DEFINE_OID(mib2IpRoute), mib2IpRouteInit, mib2IpRouteQuery, + mib2IpRouteCleanup }, + { DEFINE_OID(mib2IpNet), mib2IpNetInit, mib2IpNetQuery, mib2IpNetCleanup }, + { DEFINE_OID(mib2Icmp), mib2IcmpInit, mib2IcmpQuery, NULL }, + { DEFINE_OID(mib2Tcp), mib2TcpInit, mib2TcpQuery, NULL }, + { DEFINE_OID(mib2Udp), mib2UdpInit, mib2UdpQuery, NULL }, + { DEFINE_OID(mib2UdpEntry), mib2UdpEntryInit, mib2UdpEntryQuery, + mib2UdpEntryCleanup }, }; static UINT minSupportedIDLength; @@ -1071,6 +1174,15 @@ *phSubagentTrapEvent = NULL; SnmpUtilOidCpy(pFirstSupportedRegion, &myOid); return TRUE; +} + +static void cleanup(void) +{ + UINT i; + + for (i = 0; i < sizeof(supportedIDs) / sizeof(supportedIDs[0]); i++) + if (supportedIDs[i].cleanup) + supportedIDs[i].cleanup(); } static struct mibImplementation *findSupportedQuery(UINT *ids, UINT idLength, @@ -1169,3 +1281,22 @@ *pErrorIndex = errorIndex; return TRUE; } + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + cleanup(); + break; + default: + break; + } + + return TRUE; +} Modified: trunk/reactos/dll/win32/mapi32/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/prop.c?re… ============================================================================== --- trunk/reactos/dll/win32/mapi32/prop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/prop.c [iso-8859-1] Mon Jul 7 07:32:35 2008 @@ -1579,7 +1579,7 @@ * NOTES * - If this function succeeds, the returned information in *lppError must be * freed using MAPIFreeBuffer() once the caller is finished with it. - * - It is possible for this function to suceed and set *lppError to NULL, + * - It is possible for this function to succeed and set *lppError to NULL, * if there is no further information to report about hRes. */ static inline HRESULT WINAPI @@ -1598,7 +1598,7 @@ /************************************************************************** * IMAPIProp_SaveChanges {MAPI32} * - * Update any changes made to a tansactional IMAPIProp object. + * Update any changes made to a transactional IMAPIProp object. * * PARAMS * iface [I] IMAPIProp object to update @@ -1701,7 +1701,7 @@ * iface [I] IMAPIProp object to get the property tag list from * ulFlags [I] Return 0=Ascii MAPI_UNICODE=Unicode strings for * unspecified types - * lppTags [O] Destination for the retrieved peoperty tag list + * lppTags [O] Destination for the retrieved property tag list * * RETURNS * Success: S_OK. *lppTags contains the tags for all available properties. Modified: trunk/reactos/dll/win32/mlang/mlang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/mlang.c?re… ============================================================================== --- trunk/reactos/dll/win32/mlang/mlang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mlang/mlang.c [iso-8859-1] Mon Jul 7 07:32:35 2008 @@ -704,10 +704,13 @@ static inline INT lcid_to_rfc1766W( LCID lcid, LPWSTR rfc1766, INT len ) { INT n = GetLocaleInfoW( lcid, LOCALE_SISO639LANGNAME, rfc1766, len ); + INT save = n; if (n) { rfc1766[n - 1] = '-'; n += GetLocaleInfoW( lcid, LOCALE_SISO3166CTRYNAME, rfc1766 + n, len - n ); + if (n == save) + rfc1766[n - 1] = '\0'; LCMapStringW( LOCALE_USER_DEFAULT, LCMAP_LOWERCASE, rfc1766, n, rfc1766, len ); return n; } Modified: trunk/reactos/dll/win32/mpr/mpr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr.rc?rev=3… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr.rc [iso-8859-1] Mon Jul 7 07:32:35 2008 @@ -26,6 +26,7 @@ #include "mpr_Bg.rc" #include "mpr_Cs.rc" +#include "mpr_Da.rc" #include "mpr_De.rc" #include "mpr_En.rc" #include "mpr_Eo.rc" @@ -39,7 +40,9 @@ #include "mpr_No.rc" #include "mpr_Pl.rc" #include "mpr_Pt.rc" +#include "mpr_Ro.rc" #include "mpr_Ru.rc" +#include "mpr_Si.rc" #include "mpr_Sv.rc" #include "mpr_Tr.rc" #include "mpr_Uk.rc" Added: trunk/reactos/dll/win32/mpr/mpr_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Da.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Da.rc (added) +++ trunk/reactos/dll/win32/mpr/mpr_Da.rc [iso-8859-1] Mon Jul 7 07:32:35 2008 @@ -1,0 +1,46 @@ +/* + * MPR dll resources for Danish + * + * Copyright (C) 2008 Jens Albretsen <jens(a)albretsen.dk> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Hele netværket" +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Skriv netværkskodeord" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Skriv dit brugernavn og kodeord:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Proxy", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ + LTEXT "Brugernavn", -1, 40, 66, 50, 10 + LTEXT "Kodeord", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "Gem dette ko&deord (usikkert)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Annuller", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} Propchange: trunk/reactos/dll/win32/mpr/mpr_Da.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/mpr/mpr_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Ro.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Ro.rc (added) +++ trunk/reactos/dll/win32/mpr/mpr_Ro.rc [iso-8859-1] Mon Jul 7 07:32:35 2008 @@ -1,0 +1,48 @@ +/* + * Copyright (C) 2004 Juan Lang + * Copyright (C) 2008 Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "ToatÄ reÈeaua" +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Introducere parolÄ de reÈea" +FONT 8, "MS Shell Dlg" +{ + LTEXT "IntroduceÈi numele de utilizator Èi parola:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Proxy", -1, 40, 26, 50, 10 + LTEXT "Utilizator", -1, 40, 66, 50, 10 + LTEXT "ParolÄ", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&SalveazÄ aceastÄ parolÄ (nesigur)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "RenunÈÄ", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +#pragma code_page(default) Propchange: trunk/reactos/dll/win32/mpr/mpr_Ro.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/mpr/mpr_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Si.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Si.rc (added) +++ trunk/reactos/dll/win32/mpr/mpr_Si.rc [iso-8859-1] Mon Jul 7 07:32:35 2008 @@ -1,0 +1,50 @@ +/* + * MPR dll resources + * + * Copyright (C) 2008 Rok Mandeljc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(65001) + +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Celotno omreÅ¾je" +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Vnesite omreÅ¾no geslo" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Vnesite uporabniÅ¡ko ime in geslo:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Proksi", -1, 40, 26, 50, 10 +/* LTEXT "Kraljestvo", -1, 40, 46, 50, 10 */ + LTEXT "UporabniÅ¡ko ime", -1, 40, 66, 50, 10 + LTEXT "Geslo", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Shrani geslo (nezaÅ¡Äiteno)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "V redu", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "PrekliÄi", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +#pragma code_page(default) Propchange: trunk/reactos/dll/win32/mpr/mpr_Si.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/mpr/mpr_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Sv.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_Sv.rc [iso-8859-1] Mon Jul 7 07:32:35 2008 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { Removed: trunk/reactos/dll/win32/mpr/mpr_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Uk.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_Uk.rc (removed) @@ -1,46 +1,0 @@ -/* - * MPR dll resources (Ukrainian) - * - * Copyright 2006 Artem Reznikov - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -{ - IDS_ENTIRENETWORK "Âñÿ Ìåðåæà" -} - -IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ââåä³òü Ìåðåæíèé Ïàðîëü" -FONT 8, "MS Shell Dlg" -{ - LTEXT "Áóäü ëàñêà, ââåä³òü Âàø³ ³ì'ÿ òà ïàðîëü:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Ïðîêñ³", -1, 40, 26, 50, 10 -/* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Êîðèñòóâà÷", -1, 40, 66, 50, 10 - LTEXT "Ïàðîëü", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Çáåðåãòè öåé ïàðîëü (íåáåçïå÷íî)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP -} Modified: trunk/reactos/dll/win32/mpr/nps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/nps.c?rev=34… ============================================================================== --- trunk/reactos/dll/win32/mpr/nps.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/nps.c [iso-8859-1] Mon Jul 7 07:32:35 2008 @@ -76,14 +76,10 @@ case WM_COMMAND: if( wParam == IDOK ) { - WCHAR username[0x20], password[0x20]; - - username[0] = 0; hitem = GetDlgItem( hdlg, IDC_USERNAME ); if( hitem ) GetWindowTextA( hitem, lpAuthDlgStruct->lpUsername, lpAuthDlgStruct->cbUsername ); - - password[0] = 0; + hitem = GetDlgItem( hdlg, IDC_PASSWORD ); if( hitem ) GetWindowTextA( hitem, lpAuthDlgStruct->lpPassword, lpAuthDlgStruct->cbPassword ); Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=3… ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Mon Jul 7 07:32:35 2008 @@ -1312,6 +1312,7 @@ ret = _thunkNetResourceArrayAToW(lpNetResource, &count, lpNetResourceW, &size); if (ret == WN_MORE_DATA) { + HeapFree(GetProcessHeap(), 0, lpNetResourceW); lpNetResourceW = HeapAlloc(GetProcessHeap(), 0, size); if (lpNetResourceW) ret = _thunkNetResourceArrayAToW(lpNetResource, @@ -1343,6 +1344,7 @@ { ret = _thunkNetResourceArrayWToA(lpBufferW, &count, lpBuffer, cbBuffer); + HeapFree(GetProcessHeap(), 0, lpNetResourceW); lpNetResourceW = lpBufferW; size = sizeof(NETRESOURCEA); size += WideCharToMultiByte(CP_ACP, 0, lpNetResourceW->lpRemoteName,

1 0

[fireball] 34353: - Remove entrypoint=0 from compstui - No need to register cryptui, since its registering routines are stubs. Fixes ERROR_MR_MID_NOT_FOUND in 2nd stage. See issue #2719 for more details.
by fireball＠svn.reactos.org 07 Jul '08

07 Jul '08

Author: fireball Date: Mon Jul 7 07:26:44 2008 New Revision: 34353 URL: http://svn.reactos.org/svn/reactos?rev=34353&view=rev Log: - Remove entrypoint=0 from compstui - No need to register cryptui, since its registering routines are stubs. Fixes ERROR_MR_MID_NOT_FOUND in 2nd stage. See issue #2719 for more details. Modified: trunk/reactos/dll/win32/compstui/compstui.rbuild trunk/reactos/dll/win32/cryptui/cryptui.rbuild Modified: trunk/reactos/dll/win32/compstui/compstui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/compstui/compstu… ============================================================================== --- trunk/reactos/dll/win32/compstui/compstui.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/compstui/compstui.rbuild [iso-8859-1] Mon Jul 7 07:26:44 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="compstui" type="win32dll" baseaddress="${BASEADDRESS_COMPSTUI}" installbase="system32" installname="compstui.dll" allowwarnings="true" entrypoint="0"> +<module name="compstui" type="win32dll" baseaddress="${BASEADDRESS_COMPSTUI}" installbase="system32" installname="compstui.dll" allowwarnings="true"> <importlibrary definition="compstui.spec.def" /> <include base="compstui">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: trunk/reactos/dll/win32/cryptui/cryptui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptui.rbuild [iso-8859-1] Mon Jul 7 07:26:44 2008 @@ -2,7 +2,7 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="cryptui" type="win32dll" baseaddress="${BASEADDRESS_CRYPTUI}" installbase="system32" installname="cryptui.dll" allowwarnings="true"> - <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> +  <importlibrary definition="cryptui.spec.def" /> <include base="cryptui">.</include> <include base="ReactOS">include/reactos/wine</include>

1 0

[jmorlan] 34352: Extract days-since-epoch calculation code from RtlTimeToTimeFields into own function, optimize a bit, and use it in RtlTimeFieldsToTime instead of doing a 400 iteration loop.
by jmorlan＠svn.reactos.org 07 Jul '08

07 Jul '08

Author: jmorlan Date: Mon Jul 7 05:23:41 2008 New Revision: 34352 URL: http://svn.reactos.org/svn/reactos?rev=34352&view=rev Log: Extract days-since-epoch calculation code from RtlTimeToTimeFields into own function, optimize a bit, and use it in RtlTimeFieldsToTime instead of doing a 400 iteration loop. Modified: trunk/reactos/lib/rtl/time.c Modified: trunk/reactos/lib/rtl/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/time.c?rev=34352&r… ============================================================================== --- trunk/reactos/lib/rtl/time.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/time.c [iso-8859-1] Mon Jul 7 05:23:41 2008 @@ -52,6 +52,15 @@ return Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0) ? 1 : 0; } +static int DaysSinceEpoch(int Year) +{ + int Days; + Year--; /* Don't include a leap day from the current year */ + Days = Year * DAYSPERNORMALYEAR + Year / 4 - Year / 100 + Year / 400; + Days -= (EPOCHYEAR - 1) * DAYSPERNORMALYEAR + (EPOCHYEAR - 1) / 4 - (EPOCHYEAR - 1) / 100 + (EPOCHYEAR - 1) / 400; + return Days; +} + static __inline void NormalizeTimeFields(CSHORT *FieldToNormalize, CSHORT *CarryField, int Modulus) @@ -170,11 +179,9 @@ IN PTIME_FIELDS TimeFields, OUT PLARGE_INTEGER Time) { - int CurYear; int CurMonth; TIME_FIELDS IntTimeFields; - Time->QuadPart = 0; memcpy(&IntTimeFields, TimeFields, sizeof(TIME_FIELDS)); @@ -213,13 +220,10 @@ } /* Compute the time */ - for (CurYear = EPOCHYEAR; CurYear < IntTimeFields.Year; CurYear++) - { - Time->QuadPart += YearLengths[IsLeapYear(CurYear)]; - } + Time->QuadPart = DaysSinceEpoch(IntTimeFields.Year); for (CurMonth = 1; CurMonth < IntTimeFields.Month; CurMonth++) { - Time->QuadPart += MonthLengths[IsLeapYear(CurYear)][CurMonth - 1]; + Time->QuadPart += MonthLengths[IsLeapYear(IntTimeFields.Year)][CurMonth - 1]; } Time->QuadPart += IntTimeFields.Day - 1; Time->QuadPart *= SECSPERDAY; @@ -317,11 +321,7 @@ /* compute year */ CurYear = EPOCHYEAR; CurYear += Days / DAYSPERLEAPYEAR; - Days -= (CurYear - EPOCHYEAR) * DAYSPERLEAPYEAR; - CurYear--; /* The next calculation needs CurYear - 1 */ - Days += CurYear - CurYear / 4 + CurYear / 100 - CurYear / 400; - CurYear++; - Days -= EPOCHYEAR - 1 - (EPOCHYEAR -1) / 4 + (EPOCHYEAR -1) / 100 - (EPOCHYEAR - 1) / 400; + Days -= DaysSinceEpoch(CurYear); while (1) { LeapYear = IsLeapYear(CurYear);

1 0

[fireball] 34351: - Initialize TLS expansion bitmap properly (fixes accessing uninitialized memory when all regular TEB slots for TLS data are occupied).
by fireball＠svn.reactos.org 07 Jul '08

07 Jul '08

Author: fireball Date: Mon Jul 7 04:24:10 2008 New Revision: 34351 URL: http://svn.reactos.org/svn/reactos?rev=34351&view=rev Log: - Initialize TLS expansion bitmap properly (fixes accessing uninitialized memory when all regular TEB slots for TLS data are occupied). Modified: trunk/reactos/dll/ntdll/ldr/startup.c Modified: trunk/reactos/dll/ntdll/ldr/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/startup.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Mon Jul 7 04:24:10 2008 @@ -27,6 +27,7 @@ static RTL_CRITICAL_SECTION PebLock; static RTL_CRITICAL_SECTION LoaderLock; static RTL_BITMAP TlsBitMap; +static RTL_BITMAP TlsExpansionBitMap; PLDR_DATA_TABLE_ENTRY ExeModule; NTSTATUS LdrpAttachThread (VOID); @@ -333,11 +334,16 @@ Peb->FastPebLockRoutine = (PPEBLOCKROUTINE)RtlEnterCriticalSection; Peb->FastPebUnlockRoutine = (PPEBLOCKROUTINE)RtlLeaveCriticalSection; - /* initialize tls bitmap */ + /* initialize tls bitmaps */ RtlInitializeBitMap (&TlsBitMap, Peb->TlsBitmapBits, TLS_MINIMUM_AVAILABLE); + RtlInitializeBitMap (&TlsExpansionBitMap, + Peb->TlsExpansionBitmapBits, + TLS_EXPANSION_SLOTS); + Peb->TlsBitmap = &TlsBitMap; + Peb->TlsExpansionBitmap = &TlsExpansionBitMap; Peb->TlsExpansionCounter = TLS_MINIMUM_AVAILABLE; /* Initialize table of callbacks for the kernel. */

1 0

[jimtabor] 34350: Update SetLayeredWindowAttributes.
by jimtabor＠svn.reactos.org 07 Jul '08

07 Jul '08

Author: jimtabor Date: Mon Jul 7 00:54:36 2008 New Revision: 34350 URL: http://svn.reactos.org/svn/reactos?rev=34350&view=rev Log: Update SetLayeredWindowAttributes. Modified: trunk/reactos/dll/win32/user32/user32.def trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/user32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.de… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.def [iso-8859-1] Mon Jul 7 00:54:36 2008 @@ -610,7 +610,7 @@ SetInternalWindowPos@16 SetKeyboardState@4 SetLastErrorEx@8 -SetLayeredWindowAttributes@16 +SetLayeredWindowAttributes@16=NtUserSetLayeredWindowAttributes@16 SetLogonNotifyWindow@8 SetMenu@8 SetMenuContextHelpId@8 Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Mon Jul 7 00:54:36 2008 @@ -1548,20 +1548,6 @@ /* - * @unimplemented - */ -BOOL STDCALL -SetLayeredWindowAttributes(HWND hwnd, - COLORREF crKey, - BYTE bAlpha, - DWORD dwFlags) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* * @implemented */ HWND STDCALL Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Mon Jul 7 00:54:36 2008 @@ -2186,13 +2186,13 @@ NtUserSetKeyboardState( LPBYTE Unknown0); -DWORD +BOOL NTAPI NtUserSetLayeredWindowAttributes( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3); + HWND hwnd, + COLORREF crKey, + BYTE bAlpha, + DWORD dwFlags); DWORD NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Mon Jul 7 00:54:36 2008 @@ -4100,15 +4100,14 @@ /* * @unimplemented */ -DWORD STDCALL -NtUserSetLayeredWindowAttributes(DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3) -{ - UNIMPLEMENTED - - return 0; +BOOL STDCALL +NtUserSetLayeredWindowAttributes(HWND hwnd, + COLORREF crKey, + BYTE bAlpha, + DWORD dwFlags) +{ + UNIMPLEMENTED; + return FALSE; }

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
77
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 July 2008