[ros-diffs] [dreimer] 72403: [RAPPS] Fix Audacity/NIRLauncher/Tahoma and Watercolor entries.
Author: dreimer Date: Sun Aug 21 11:45:05 2016 New Revision: 72403 URL: http://svn.reactos.org/svn/reactos?rev=72403&view=rev Log: [RAPPS] Fix Audacity/NIRLauncher/Tahoma and Watercolor entries. Modified: trunk/reactos/media/rapps/audacity.txt trunk/reactos/media/rapps/nirlauncher.txt trunk/reactos/media/rapps/tahoma.txt trunk/reactos/media/rapps/watercolor.txt Modified: trunk/reactos/media/rapps/audacity.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/audacity.txt?rev=72403&r1=72402&r2=72403&view=diff == --- trunk/reactos/media/rapps/audacity.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/audacity.txt [iso-8859-1] Sun Aug 21 11:45:05 2016 @@ -6,31 +6,29 @@ Size = 25.3 MiB Category = 1 URLSite = http://audacityteam.org/ -URLDownload = http://app.oldfoss.com:81/download/Audacity/audacity_win_2_1_2-1453294050.exe +URLDownload = https://www.jabawok.net/installers/audacity-win-2.1.2.exe SHA1 = 850f643bb715782f120edb8eee982b0f3543a332 CDPath = none [Section.0407] Description = Freie, quelloffene Cross-Plattform Software zur Aufnahme und Bearbeitung von Sounds. -Size = 0,0 B +Size = 25,3 MiB [Section.0a] Description = Programa libre, gratuito y multiplataforma para grabar y editar audio y música. -Size = 0.0 B [Section.0418] Description = Un program gratuit, multiplatformÄ, cu surse deschise pentru înregistrarea Èi editarea de sunete. -Size = 0,0 o +Size = 25,3 Mio [Section.0419] Description = ÐÑогÑамма Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи и ÑедакÑиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð·Ð²ÑковÑÑ Ñайлов, оÑиенÑиÑÐ¾Ð²Ð°Ð½Ð½Ð°Ñ Ð½Ð° ÑабоÑÑ Ñ Ð½ÐµÑколÑкими доÑожками. -Size = 0.0 B +Size = 25,3 MiB [Section.041f] Description = Sesleri kaydetme ve düzenleme için özgür, açık kaynak ve çapraz platform yazılımdır. -Size = 0,0 B +Size = 25,3 MiB [Section.0804] Description = å è´¹ã å¼æºçã 跨平å°è½¯ä»¶çå½å¶åç¼è¾å£°é³ã -Size = 0.0 B Modified: trunk/reactos/media/rapps/nirlauncher.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/nirlauncher.txt?rev=72403&r1=72402&r2=72403&view=diff == --- trunk/reactos/media/rapps/nirlauncher.txt [iso-8859-1] (original) +++ trunk/reactos/media/rapps/nirlauncher.txt [iso-8859-1] Sun Aug 21 11:45:05 2016 @@ -1,44 +1,42 @@ [Section] Name = NirLauncher -Version = 1.19.97 +Version = 1.19.98 License = Freeware Description = A package of more than 180 utilities for Windows. -Size = 23.1 MiB +Size = 23.6 MiB Category = 12 URLSite = http://launcher.nirsoft.net/ -URLDownload = http://download2.nirsoft.net/nirsoft_package_1.19.97.zip -SHA1 = 37e645bea1503207dbc3eda488bf5eec916f9a40 +URLDownload = http://svn.reactos.org/packages/nirsoft_package_1.19.98.zip +SHA1 = 003458ee09b034884c8d5d4753463985a1c16862 CDPath = none [Section.0407] Description = Paket von mehr als 180 Utilities für Windows. -Size = 0,0 B +Size = 23,6 MiB [Section.040c] Description = Un ensemble de plus de 180 utilitaires pour Windows. -Size = 0,0 o +Size = 23,6 Mio [Section.0a] License = Gratuita Description = Un paquete con más de 180 utilidades. -Size = 0.0 B [Section.0418] License = GratuitÄ Description = Pachet cu peste 180 de utilitare. -Size = 0,0 o +Size = 23,6 Mio [Section.0419] License = ÐеÑплаÑно Description = ÐÐ°ÐºÐµÑ Ð¸Ð· более Ñем 180 ÑÑÐ¸Ð»Ð¸Ñ Ð´Ð»Ñ Windows. -Size = 0.0 B +Size = 23,6 MiB [Section.041f] License = Ãcretsiz Description = Windows için 180 araçtan daha çoÄunun bir paketi. -Size = 0,0 B +Size = 23,6 MiB [Section.0804] Description = è¶ è¿ 180 å®ç¨ç¨åºå¯ç¨äº Windows çä¸æ´å¥è¡å¨ã -Size = 0.0 B Modified: trunk/reactos/media/rapps/tahoma.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/tahoma.txt?rev=72403&r1=72402&r2=72403&view=diff == --- trunk/reactos/media/rapps/tahoma.txt[iso-8859-1] (original) +++ trunk/reactos/media/rapps/tahoma.txt[iso-8859-1] Sun Aug 21 11:45:05 2016 @@ -6,66 +6,59 @@ Size = 305.1 KiB Category = 14 URLSite = http://support.microsoft.com/ -URLDownload = http://download.microsoft.com/download/office97pro/fonts/1/w95/en-us/tahoma32.exe +URLDownload = http://linux4u.jinr.ru/pub/win9x/fonts/tahoma32.exe SHA1 = 888ce7b7ab5fd41f9802f3a65fd0622eb651a068 CDPath = none [Section.0407] License = Unbekannt Description = Tahoma Font Pack, der von einigen Anwendungen benötigt wird (Steam). Beinhaltet: Tahoma.ttf, Tahomabd.ttf. -Size = 0,0 B +Size = 305,1 KiB [Section.0a] License = Desconocida Description = Paquete tipográfico Tahoma, necesario para ciertas aplicaciones (como Steam). Incluye: Tahoma.ttf, Tahomabd.ttf. -Size = 0.0 B [Section.040
[ros-diffs] [ekohl] 72404: [LSASRV] Implement LsaIFree_LSAPR_SR_SECURITY_DESCRIPTOR and LsaIFree_LSAPR_TRANSLATED_NAMES.
Author: ekohl Date: Sun Aug 21 14:56:54 2016 New Revision: 72404 URL: http://svn.reactos.org/svn/reactos?rev=72404&view=rev Log: [LSASRV] Implement LsaIFree_LSAPR_SR_SECURITY_DESCRIPTOR and LsaIFree_LSAPR_TRANSLATED_NAMES. Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.c trunk/reactos/dll/win32/lsasrv/lsasrv.spec Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.c?rev=72404&r1=72403&r2=72404&view=diff == --- trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] Sun Aug 21 14:56:54 2016 @@ -206,6 +206,46 @@ } midl_user_free(Ptr->Domains); +} + +midl_user_free(Ptr); +} +} + + +VOID +NTAPI +LsaIFree_LSAPR_SR_SECURITY_DESCRIPTOR( +PLSAPR_SR_SECURITY_DESCRIPTOR Ptr) +{ +if (Ptr != NULL) +{ +if (Ptr->SecurityDescriptor != NULL) +midl_user_free(Ptr->SecurityDescriptor); + +midl_user_free(Ptr); +} +} + + +VOID +NTAPI +LsaIFree_LSAPR_TRANSLATED_NAMES( +PLSAPR_TRANSLATED_NAMES Ptr) +{ +ULONG i; + +if (Ptr != NULL) +{ +if (Ptr->Names != NULL) +{ +for (i = 0; i < Ptr->Entries; i++) +{ +if (Ptr->Names[i].Name.Buffer != NULL) +midl_user_free(Ptr->Names[i].Name.Buffer); +} + +midl_user_free(Ptr->Names); } midl_user_free(Ptr); Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.spec?rev=72404&r1=72403&r2=72404&view=diff == --- trunk/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] Sun Aug 21 14:56:54 2016 @@ -38,8 +38,8 @@ @ stdcall LsaIFree_LSAPR_PRIVILEGE_ENUM_BUFFER(ptr) @ stdcall LsaIFree_LSAPR_PRIVILEGE_SET(ptr) @ stdcall LsaIFree_LSAPR_REFERENCED_DOMAIN_LIST(ptr) - @ stub LsaIFree_LSAPR_SR_SECURITY_DESCRIPTOR - @ stub LsaIFree_LSAPR_TRANSLATED_NAMES + @ stdcall LsaIFree_LSAPR_SR_SECURITY_DESCRIPTOR(ptr) + @ stdcall LsaIFree_LSAPR_TRANSLATED_NAMES(ptr) @ stub LsaIFree_LSAPR_TRANSLATED_SIDS @ stub LsaIFree_LSAPR_TRUSTED_DOMAIN_INFO @ stub LsaIFree_LSAPR_TRUSTED_ENUM_BUFFER
[ros-diffs] [akhaldi] 72405: [CRT] Sync strtok_s() with Wine Staging 1.9.16 and mark strtok() as synced. CORE-11866
Author: akhaldi Date: Sun Aug 21 16:24:00 2016 New Revision: 72405 URL: http://svn.reactos.org/svn/reactos?rev=72405&view=rev Log: [CRT] Sync strtok_s() with Wine Staging 1.9.16 and mark strtok() as synced. CORE-11866 Added: trunk/reactos/sdk/lib/crt/string/strtok_s.c (with props) Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/sdk/lib/crt/crt.cmake trunk/reactos/sdk/lib/crt/string/strtok.c Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=72405&r1=72404&r2=72405&view=diff == --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Aug 21 16:24:00 2016 @@ -292,6 +292,8 @@ reactos/lib/sdk/crt/signal/xcptinfo.c # Synced to WineStaging-1.7.37 reactos/lib/sdk/crt/string/scanf.c/h # Synced to Wine-1.7.17 reactos/lib/sdk/crt/string/strtoi64.c # Synced to WineStaging-1.9.9 + reactos/lib/sdk/crt/string/strtok.c # Synced to WineStaging-1.9.16 + reactos/lib/sdk/crt/string/strtok_s.c # Synced to WineStaging-1.9.16 reactos/lib/sdk/crt/string/strtoul.c # Synced to WineStaging-1.9.9 reactos/lib/sdk/crt/strings/wcs.c # Synced at 20080611 reactos/lib/sdk/crt/wine/heap.c # Synced at 20080529 Modified: trunk/reactos/sdk/lib/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/crt.cmake?rev=72405&r1=72404&r2=72405&view=diff == --- trunk/reactos/sdk/lib/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/crt.cmake [iso-8859-1] Sun Aug 21 16:24:00 2016 @@ -294,6 +294,7 @@ string/strtod.c string/strtoi64.c string/strtok.c +#string/strtok_s.c string/strtol.c string/strtoul.c string/strtoull.c Modified: trunk/reactos/sdk/lib/crt/string/strtok.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/string/strtok.c?rev=72405&r1=72404&r2=72405&view=diff == --- trunk/reactos/sdk/lib/crt/string/strtok.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/string/strtok.c [iso-8859-1] Sun Aug 21 16:24:00 2016 @@ -1,4 +1,4 @@ -/* taken from wine string.c */ +/* Taken from Wine Staging msvcrt/string.c */ #include #include @@ -22,31 +22,3 @@ data->strtok_next = str; return ret; } - -/* - * strtok_s (MSVCRT.@) - */ -char * CDECL strtok_s(char *str, const char *delim, char **ctx) -{ -if (!MSVCRT_CHECK_PMT(delim != NULL) || !MSVCRT_CHECK_PMT(ctx != NULL) || -!MSVCRT_CHECK_PMT(str != NULL || *ctx != NULL)) { -*_errno() = EINVAL; -return NULL; -} - -if(!str) -str = *ctx; - -while(*str && strchr(delim, *str)) -str++; -if(!*str) -return NULL; - -*ctx = str+1; -while(**ctx && !strchr(delim, **ctx)) -(*ctx)++; -if(**ctx) -*(*ctx)++ = 0; - -return str; -} Added: trunk/reactos/sdk/lib/crt/string/strtok_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/string/strtok_s.c?rev=72405 == --- trunk/reactos/sdk/lib/crt/string/strtok_s.c (added) +++ trunk/reactos/sdk/lib/crt/string/strtok_s.c [iso-8859-1] Sun Aug 21 16:24:00 2016 @@ -0,0 +1,30 @@ +/* Taken from Wine Staging msvcrt/string.c */ + +#include +#include + +/* + * strtok_s (MSVCRT.@) + */ +char * CDECL strtok_s(char *str, const char *delim, char **ctx) +{ +if (!MSVCRT_CHECK_PMT(delim != NULL)) return NULL; +if (!MSVCRT_CHECK_PMT(ctx != NULL)) return NULL; +if (!MSVCRT_CHECK_PMT(str != NULL || *ctx != NULL)) return NULL; + +if(!str) +str = *ctx; + +while(*str && strchr(delim, *str)) +str++; +if(!*str) +return NULL; + +*ctx = str+1; +while(**ctx && !strchr(delim, **ctx)) +(*ctx)++; +if(**ctx) +*(*ctx)++ = 0; + +return str; +} Propchange: trunk/reactos/sdk/lib/crt/string/strtok_s.c -- svn:eol-style = native
[ros-diffs] [akhaldi] 72406: [CDMAKE][CTR] Fix strtok_s for empty strings. Part of Wine commit 4fa616c by Bernhard Übelacker.
Author: akhaldi Date: Sun Aug 21 16:30:06 2016 New Revision: 72406 URL: http://svn.reactos.org/svn/reactos?rev=72406&view=rev Log: [CDMAKE][CTR] Fix strtok_s for empty strings. Part of Wine commit 4fa616c by Bernhard Übelacker. Modified: trunk/reactos/sdk/lib/crt/string/strtok_s.c trunk/reactos/sdk/tools/cdmake/cdmake.c Modified: trunk/reactos/sdk/lib/crt/string/strtok_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/string/strtok_s.c?rev=72406&r1=72405&r2=72406&view=diff == --- trunk/reactos/sdk/lib/crt/string/strtok_s.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/string/strtok_s.c [iso-8859-1] Sun Aug 21 16:30:06 2016 @@ -18,7 +18,10 @@ while(*str && strchr(delim, *str)) str++; if(!*str) +{ +*ctx = str; return NULL; +} *ctx = str+1; while(**ctx && !strchr(delim, **ctx)) Modified: trunk/reactos/sdk/tools/cdmake/cdmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/cdmake/cdmake.c?rev=72406&r1=72405&r2=72406&view=diff == --- trunk/reactos/sdk/tools/cdmake/cdmake.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/cdmake/cdmake.c [iso-8859-1] Sun Aug 21 16:30:06 2016 @@ -1930,7 +1930,10 @@ while (*str && strchr(delim, *str)) str++; if (!*str) +{ +*ctx = str; return NULL; +} *ctx = str + 1; while (**ctx && !strchr(delim, **ctx))
[ros-diffs] [akhaldi] 72407: [README.WINE] Update some paths.
Author: akhaldi Date: Sun Aug 21 16:44:35 2016 New Revision: 72407 URL: http://svn.reactos.org/svn/reactos?rev=72407&view=rev Log: [README.WINE] Update some paths. Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=72407&r1=72406&r2=72407&view=diff == --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Aug 21 16:44:35 2016 @@ -251,11 +251,11 @@ from Winehq CVS. If you are looking to update something in these files check Wine current sources first as it may already be fixed. -reactos/lib/3rdparty/strmbase # Synced to WineStaging-1.9.11 - -reactos/lib/rtl/actctx.c# Partly synced with WineStaging-1.7.55 -reactos/lib/rtl/timerqueue.c# Partly synced with WineStaging-1.7.55 -reactos/lib/rtl/wait.c # Partly synced with WineStaging-1.7.55 +reactos/sdk/lib/3rdparty/strmbase # Synced to WineStaging-1.9.11 + +reactos/sdk/lib/rtl/actctx.c# Partly synced with WineStaging-1.7.55 +reactos/sdk/lib/rtl/timerqueue.c# Partly synced with WineStaging-1.7.55 +reactos/sdk/lib/rtl/wait.c # Partly synced with WineStaging-1.7.55 advapi32 - reactos/dll/win32/advapi32/wine/cred.c # Synced to WineStaging-1.7.55 @@ -286,19 +286,19 @@ reactos/dll/win32/kernel32/winnls/string/sortkey.c # Synced to WineStaging-1.9.16 msvcrt - - reactos/lib/sdk/crt/except/cpp.c # Synced at 20080528 - reactos/lib/sdk/crt/except/cppexcept.c# Synced at 2007 - reactos/lib/sdk/crt/process/_cwait.c # Synced to WineStaging-1.7.37 - reactos/lib/sdk/crt/signal/xcptinfo.c # Synced to WineStaging-1.7.37 - reactos/lib/sdk/crt/string/scanf.c/h # Synced to Wine-1.7.17 - reactos/lib/sdk/crt/string/strtoi64.c # Synced to WineStaging-1.9.9 - reactos/lib/sdk/crt/string/strtok.c # Synced to WineStaging-1.9.16 - reactos/lib/sdk/crt/string/strtok_s.c # Synced to WineStaging-1.9.16 - reactos/lib/sdk/crt/string/strtoul.c # Synced to WineStaging-1.9.9 - reactos/lib/sdk/crt/strings/wcs.c # Synced at 20080611 - reactos/lib/sdk/crt/wine/heap.c # Synced at 20080529 - reactos/lib/sdk/crt/wine/undname.c# Synced to WineStaging-1.7.55 - reactos/lib/sdk/crt/process/thread.c # Synced to WineStaging-1.7.55 + reactos/sdk/lib/crt/except/cpp.c # Synced at 20080528 + reactos/sdk/lib/crt/except/cppexcept.c# Synced at 2007 + reactos/sdk/lib/crt/process/_cwait.c # Synced to WineStaging-1.7.37 + reactos/sdk/lib/crt/signal/xcptinfo.c # Synced to WineStaging-1.7.37 + reactos/sdk/lib/crt/string/scanf.c/h # Synced to Wine-1.7.17 + reactos/sdk/lib/crt/string/strtoi64.c # Synced to WineStaging-1.9.9 + reactos/sdk/lib/crt/string/strtok.c # Synced to WineStaging-1.9.16 + reactos/sdk/lib/crt/string/strtok_s.c # Synced to WineStaging-1.9.16 + reactos/sdk/lib/crt/string/strtoul.c # Synced to WineStaging-1.9.9 + reactos/sdk/lib/crt/strings/wcs.c # Synced at 20080611 + reactos/sdk/lib/crt/wine/heap.c # Synced at 20080529 + reactos/sdk/lib/crt/wine/undname.c# Synced to WineStaging-1.7.55 + reactos/sdk/lib/crt/process/thread.c # Synced to WineStaging-1.7.55 User32 - reactos/win32ss/user/user32/controls/button.c# Synced to WineStaging-1.7.37
[ros-diffs] [akhaldi] 72408: [UNICODE] Sync with Wine Staging 1.9.16. CORE-11866
Author: akhaldi Date: Sun Aug 21 16:47:13 2016 New Revision: 72408 URL: http://svn.reactos.org/svn/reactos?rev=72408&view=rev Log: [UNICODE] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/sdk/tools/unicode/casemap.c trunk/reactos/sdk/tools/unicode/compose.c trunk/reactos/sdk/tools/unicode/wctype.c Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=72408&r1=72407&r2=72408&view=diff == --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Aug 21 16:47:13 2016 @@ -15,7 +15,7 @@ The following build tools are shared with Wine. -reactos/sdk/tools/unicode # Synced to WineStaging-1.9.11 +reactos/sdk/tools/unicode # Synced to WineStaging-1.9.16 reactos/sdk/tools/widl # Synced to WineStaging-1.9.11 reactos/sdk/tools/wpp # Synced to WineStaging-1.9.11 Modified: trunk/reactos/sdk/tools/unicode/casemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/unicode/casemap.c?rev=72408&r1=72407&r2=72408&view=diff == --- trunk/reactos/sdk/tools/unicode/casemap.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/unicode/casemap.c [iso-8859-1] Sun Aug 21 16:47:13 2016 @@ -1,5 +1,5 @@ /* Unicode case mappings */ -/* generated from http://www.unicode.org/Public/8.0.0/ucd/UnicodeData.txt */ +/* generated from http://www.unicode.org/Public/9.0.0/ucd/UnicodeData.txt */ /* DO NOT EDIT!! */ #include "wine/unicode.h" @@ -488,7 +488,7 @@ 0x0001, 0x, 0x, 0x, 0x0001, 0x, 0x0001, 0x, 0x0001, 0x, 0x0001, 0x, 0x0001, 0x, 0x0001, 0x, 0x0001, 0x, 0x0001, 0x, 0x0001, 0x, 0x0001, 0x, -0x5abc, 0x5ab1, 0x5ab5, 0x5abf, 0x, 0x, 0x5aee, 0x5ad6, +0x5abc, 0x5ab1, 0x5ab5, 0x5abf, 0x5abc, 0x, 0x5aee, 0x5ad6, 0x5aeb, 0x03a0, 0x0001, 0x, 0x0001, 0x, 0x, 0x, 0x, 0x, 0x, 0x, 0x, 0x, 0x, 0x, 0x, 0x, 0x, 0x, 0x, 0x, 0x, 0x, @@ -530,41 +530,41 @@ 0x, 0x, 0x, 0x, 0x, 0x, 0x }; -const WCHAR wine_casemap_upper[4433] = +const WCHAR wine_casemap_upper[4570] = { /* index */ 0x019f, 0x029f, 0x039f, 0x045a, 0x0556, 0x0656, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x06dd, 0x0100, 0x0100, 0x0100, 0x0100, -0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x07db, 0x08da, 0x09da, -0x0100, 0x0ace, 0x0100, 0x0100, 0x0b53, 0x0100, 0x0100, 0x0100, -0x0100, 0x0100, 0x0100, 0x0100, 0x0c3d, 0x0d3d, 0x0100, 0x0100, -0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, -0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, -0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, -0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, -0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, -0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, -0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, -0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, -0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, -0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, -0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, -0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, -0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, -0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, -0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0dfc, 0x0ed9, -0x0100, 0x0100, 0x0100, 0x0f91, 0x0100, 0x0100, 0x0100, 0x0100, -0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, -0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, -0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, -0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, -0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, -0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, -0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, -0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, -0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, -0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x1051, +0x0100, 0x0100, 0x0100, 0x0100, 0x07db, 0x0864, 0x0963, 0x0a63, +0x0100, 0x0b57, 0x0100, 0x0100, 0x0bdc, 0x0100, 0x0100, 0x0100, +0x0100, 0x0100, 0x0100, 0x0100, 0x0cc6, 0x0dc6, 0x0100, 0x0100, +0x0100, 0x0100, 0x0100, 0x0100, 0x0100,
[ros-diffs] [akhaldi] 72409: [WIDL] Sync with Wine Staging 1.9.16. CORE-11866
Author: akhaldi Date: Sun Aug 21 17:22:27 2016 New Revision: 72409 URL: http://svn.reactos.org/svn/reactos?rev=72409&view=rev Log: [WIDL] Sync with Wine Staging 1.9.16. CORE-11866 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/sdk/tools/widl/expr.c Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=72409&r1=72408&r2=72409&view=diff == --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Aug 21 17:22:27 2016 @@ -16,7 +16,7 @@ The following build tools are shared with Wine. reactos/sdk/tools/unicode # Synced to WineStaging-1.9.16 -reactos/sdk/tools/widl # Synced to WineStaging-1.9.11 +reactos/sdk/tools/widl # Synced to WineStaging-1.9.16 reactos/sdk/tools/wpp # Synced to WineStaging-1.9.11 The following libraries are shared with Wine. Modified: trunk/reactos/sdk/tools/widl/expr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/expr.c?rev=72409&r1=72408&r2=72409&view=diff == --- trunk/reactos/sdk/tools/widl/expr.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/widl/expr.c [iso-8859-1] Sun Aug 21 17:22:27 2016 @@ -222,8 +222,8 @@ e->is_const = TRUE; if (is_signed_integer_type(tref)) { -cast_mask = (1 << (cast_type_bits - 1)) - 1; -if (expr->cval & (1 << (cast_type_bits - 1))) +cast_mask = (1u << (cast_type_bits - 1)) - 1; +if (expr->cval & (1u << (cast_type_bits - 1))) e->cval = -((-expr->cval) & cast_mask); else e->cval = expr->cval & cast_mask; @@ -231,8 +231,8 @@ else { /* calculate ((1 << cast_type_bits) - 1) avoiding overflow */ -cast_mask = ((1 << (cast_type_bits - 1)) - 1) | -1 << (cast_type_bits - 1); +cast_mask = ((1u << (cast_type_bits - 1)) - 1) | +1u << (cast_type_bits - 1); e->cval = expr->cval & cast_mask; } }
[ros-diffs] [akhaldi] 72410: [FDEBUG] Improve header inclusions.
Author: akhaldi Date: Sun Aug 21 17:25:07 2016 New Revision: 72410 URL: http://svn.reactos.org/svn/reactos?rev=72410&view=rev Log: [FDEBUG] Improve header inclusions. Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.c Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug.c?rev=72410&r1=72409&r2=72410&view=diff == --- trunk/reactos/boot/freeldr/fdebug/fdebug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/fdebug.c [iso-8859-1] Sun Aug 21 17:25:07 2016 @@ -1,11 +1,13 @@ -// fdebug.cpp : Defines the entry point for the application. -// - -#include +/* fdebug.c : Defines the entry point for the application. */ + +#include + +#include +#include +#include +#include #include #include -#include -#include #include "resource.h" #include "rs232.h"
[ros-diffs] [zhu] 72411: Re-enabled some leftover UDP code that I missed earlier
Author: zhu Date: Sun Aug 21 17:59:47 2016 New Revision: 72411 URL: http://svn.reactos.org/svn/reactos?rev=72411&view=rev Log: Re-enabled some leftover UDP code that I missed earlier Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c?rev=72411&r1=72410&r2=72411&view=diff == --- branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c [iso-8859-1] Sun Aug 21 17:59:47 2016 @@ -1860,10 +1860,10 @@ { case IPPROTO_ICMP : case IPPROTO_RAW : -//raw_remove(AddressFile->lwip_raw_pcb); +raw_remove(AddressFile->lwip_raw_pcb); break; case IPPROTO_UDP : -//udp_remove(AddressFile->lwip_udp_pcb); +udp_remove(AddressFile->lwip_udp_pcb); break; case IPPROTO_TCP : /* Nothing to deallocate for TCP */
[ros-diffs] [zhu] 72412: Fixed mixing of declarations and case statements.
Author: zhu Date: Sun Aug 21 18:15:11 2016 New Revision: 72412 URL: http://svn.reactos.org/svn/reactos?rev=72412&view=rev Log: Fixed mixing of declarations and case statements. Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/information.c Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/information.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/information.c?rev=72412&r1=72411&r2=72412&view=diff == --- branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/information.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/information.c [iso-8859-1] Sun Aug 21 18:15:11 2016 @@ -151,7 +151,11 @@ PIO_STACK_LOCATION IrpSp; PTDI_REQUEST_KERNEL_QUERY_INFORMATION Query; NTSTATUS Status; - +PTDI_ADDRESS_INFO AddressInfo; +PADDRESS_FILE AddressFile; +PTA_ADDRESS TAAddress; +PTDI_MAX_DATAGRAM_INFO MaxDatagramInfo; + IrpSp = IoGetCurrentIrpStackLocation(Irp); Query = (PTDI_REQUEST_KERNEL_QUERY_INFORMATION)&IrpSp->Parameters; @@ -159,10 +163,6 @@ switch (Query->QueryType) { case TDI_QUERY_ADDRESS_INFO : -PTDI_ADDRESS_INFO AddressInfo; -PADDRESS_FILE AddressFile; -PTA_ADDRESS TAAddress; - if (MmGetMdlByteCount(Irp->MdlAddress) < sizeof(*AddressInfo)) { DPRINT1("MDL buffer too small.\n"); Status = STATUS_BUFFER_TOO_SMALL; @@ -185,8 +185,6 @@ break; case TDI_QUERY_MAX_DATAGRAM_INFO: { -PTDI_MAX_DATAGRAM_INFO MaxDatagramInfo; - if (MmGetMdlByteCount(Irp->MdlAddress) < sizeof(*MaxDatagramInfo)) { DPRINT1("MDL buffer too small.\n");
[ros-diffs] [akhaldi] 72413: [CRT] Sync wctype.c with Wine Staging 1.9.16 and document this. CORE-11866
Author: akhaldi Date: Sun Aug 21 18:24:21 2016 New Revision: 72413 URL: http://svn.reactos.org/svn/reactos?rev=72413&view=rev Log: [CRT] Sync wctype.c with Wine Staging 1.9.16 and document this. CORE-11866 Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/sdk/lib/crt/string/wctype.c Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=72413&r1=72412&r2=72413&view=diff == --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Aug 21 18:24:21 2016 @@ -295,7 +295,8 @@ reactos/sdk/lib/crt/string/strtok.c # Synced to WineStaging-1.9.16 reactos/sdk/lib/crt/string/strtok_s.c # Synced to WineStaging-1.9.16 reactos/sdk/lib/crt/string/strtoul.c # Synced to WineStaging-1.9.9 - reactos/sdk/lib/crt/strings/wcs.c # Synced at 20080611 + reactos/sdk/lib/crt/string/wcs.c # Synced at 20080611 + reactos/sdk/lib/crt/string/wctype.c # Synced at WineStaging-1.9.16 reactos/sdk/lib/crt/wine/heap.c # Synced at 20080529 reactos/sdk/lib/crt/wine/undname.c# Synced to WineStaging-1.7.55 reactos/sdk/lib/crt/process/thread.c # Synced to WineStaging-1.7.55 Modified: trunk/reactos/sdk/lib/crt/string/wctype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/string/wctype.c?rev=72413&r1=72412&r2=72413&view=diff == --- trunk/reactos/sdk/lib/crt/string/wctype.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/string/wctype.c [iso-8859-1] Sun Aug 21 18:24:21 2016 @@ -60,9 +60,9 @@ 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0xe220, 0x7248, 0xb210, 0x5210, 0x5210, 0x5210, 0x5210, 0xb210, 0xb210, -0xb210, 0xb210, 0x1312, 0xb210, 0xb210, 0xe230, 0xb210, 0xb210, +0xb210, 0xb210, 0x1310, 0xb210, 0xb210, 0xe230, 0xb210, 0xb210, 0x5210, 0x5210, 0x3214, 0x3214, 0xb210, 0x1312, 0xb210, 0xb210, -0xb210, 0x3214, 0x1312, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, +0xb210, 0x3214, 0x1310, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0xb210, @@ -150,7 +150,7 @@ 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0x1301, 0x1302, 0x1301, 0x1302, 0xb300, 0xb200, 0x1301, 0x1302, -0x, 0x, 0x1300, 0x1302, 0x1302, 0x1302, 0xb210, 0x, +0x, 0x, 0x1300, 0x1302, 0x1302, 0x1302, 0xb210, 0x1301, 0x, 0x, 0x, 0x, 0xb200, 0xb200, 0x1301, 0xb210, 0x1301, 0x1301, 0x1301, 0x, 0x1301, 0x, 0x1301, 0x1301, 0x1302, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, @@ -204,7 +204,7 @@ 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, -0x, 0x, 0x, 0x, 0x, 0x, 0x, 0x, +0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, @@ -216,7 +216,7 @@ 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, -0x, 0x1210, 0xb210, 0x, 0x, 0x, 0x, 0x, +0x, 0x1210, 0xb210, 0x, 0x, 0xb200, 0xb200, 0x5200, 0x, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, @@ -231,10 +231,10 @@ 0x2300, 0x2300, 0x2300, 0x, 0x, 0x, 0x, 0x, 0x2300, 0x2300, 0x2300, 0x2210, 0x2210, 0x, 0x, 0x, 0x, 0x, 0x, 0x, 0x, 0x, 0x, 0x, -0x6220, 0x6220, 0x6220, 0x6220, 0x, 0x, 0xb200, 0xb200, +0x6220, 0x6220, 0x6220, 0x6220, 0x6220, 0x6220, 0xb200, 0xb200, 0xc200, 0x5210, 0x5210, 0xc200, 0x7210, 0xc210, 0xb200, 0xb200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, -0xd200, 0xd200, 0xd200, 0xc210, 0x, 0x, 0xc210, 0xc210, +0xd200, 0xd200, 0xd200, 0xc210, 0xc220, 0x, 0xc210, 0xc210, 0xc300, 0xc300, 0xc300, 0xc300, 0xc300, 0xc300, 0x
[ros-diffs] [mjansen] 72414: [WIN32SS] Implement windows class versioning, by Sylvain Deverre. CORE-11858 #comment Committed, thanks!
Author: mjansen Date: Sun Aug 21 18:28:33 2016 New Revision: 72414 URL: http://svn.reactos.org/svn/reactos?rev=72414&view=rev Log: [WIN32SS] Implement windows class versioning, by Sylvain Deverre. CORE-11858 #comment Committed, thanks! Modified: trunk/reactos/win32ss/user/ntuser/class.c trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/user32/windows/class.c trunk/reactos/win32ss/user/user32/windows/window.c Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.c?rev=72414&r1=72413&r2=72414&view=diff == --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Sun Aug 21 18:28:33 2016 @@ -255,6 +255,9 @@ // comparisons, remove registration of the atom if not zeroed. if (Class->atomClassName) IntDeregisterClassAtom(Class->atomClassName); +// Dereference non-versioned class name +if (Class->atomNVClassName) +IntDeregisterClassAtom(Class->atomNVClassName); if (Class->pdce) { @@ -423,22 +426,37 @@ /* Update the base class first */ Class = Class->pclsBase; - -if (!IntRegisterClassAtom(ClassName, - &Atom)) -{ -return FALSE; -} - -IntDeregisterClassAtom(Class->atomClassName); - -Class->atomClassName = Atom; +if (ClassName->Length > 0) +{ +if (!IntRegisterClassAtom(ClassName, + &Atom)) +{ +ERR("RegisterClassAtom failed ! %x\n", EngGetLastError()); +return FALSE; +} +} +else +{ +if (IS_ATOM(ClassName->Buffer)) +{ +Atom = (ATOM)((ULONG_PTR)ClassName->Buffer & 0x); // XXX: are we missing refcount here ? +} +else +{ +EngSetLastError(ERROR_INVALID_PARAMETER); +return FALSE; +} +} + +IntDeregisterClassAtom(Class->atomNVClassName); + +Class->atomNVClassName = Atom; /* Update the clones */ Class = Class->pclsClone; while (Class != NULL) { -Class->atomClassName = Atom; +Class->atomNVClassName = Atom; Class = Class->pclsNext; } @@ -1000,6 +1018,7 @@ FASTCALL IntCreateClass(IN CONST WNDCLASSEXW* lpwcx, IN PUNICODE_STRING ClassName, + IN PUNICODE_STRING ClassVersion, IN PUNICODE_STRING MenuName, IN DWORD fnID, IN DWORD dwFlags, @@ -1008,7 +1027,7 @@ { SIZE_T ClassSize; PCLS Class = NULL; -RTL_ATOM Atom; +RTL_ATOM Atom, verAtom; WNDPROC WndProc; PWSTR pszMenuName = NULL; NTSTATUS Status = STATUS_SUCCESS; @@ -1020,6 +1039,14 @@ &Atom)) { ERR("Failed to register class atom!\n"); +return NULL; +} + +if (!IntRegisterClassAtom(ClassVersion, + &verAtom)) +{ +ERR("Failed to register version class atom!\n"); +IntDeregisterClassAtom(Atom); return NULL; } @@ -1054,7 +1081,8 @@ Class->rpdeskParent = Desktop; Class->pclsBase = Class; -Class->atomClassName = Atom; +Class->atomClassName = verAtom; +Class->atomNVClassName = Atom; Class->fnid = fnID; Class->CSF_flags = dwFlags; @@ -1181,6 +1209,7 @@ Class); Class = NULL; +IntDeregisterClassAtom(verAtom); IntDeregisterClassAtom(Atom); } } @@ -1193,12 +1222,13 @@ UserHeapFree(pszMenuName); IntDeregisterClassAtom(Atom); +IntDeregisterClassAtom(verAtom); EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); } -TRACE("Created class 0x%p with name %wZ and proc 0x%p for atom 0x%x and hInstance 0x%p, global %u\n", -Class, ClassName, Class->lpfnWndProc, Atom, Class->hModule, Class->Global); +TRACE("Created class 0x%p with name %wZ and proc 0x%p for atom 0x%x and version atom 0x%x and hInstance 0x%p, global %u\n", +Class, ClassName, Class->lpfnWndProc, Atom, verAtom, Class->hModule, Class->Global); return Class; } @@ -1429,6 +1459,7 @@ RTL_ATOM UserRegisterClass(IN CONST WNDCLASSEXW* lpwcx, IN PUNICODE_STRING ClassName, + IN PUNICODE_STRING ClassVersion, IN PUNICODE_STRING MenuName, IN DWORD fnID, IN DWORD dwFlags) @@ -1446,7 +1477,7 @@ pi = pti->ppi; // Need only to test for two conditions not four... Fix more whine tests -if ( IntGetAtomFromStringOrAtom( ClassName, &ClassAtom) && +if ( IntGetAtomFromStringOrAtom( ClassVersion, &ClassAtom) &&
[ros-diffs] [mjansen] 72415: [SHELL32] Fix a crash in shell32:shelldispatch by returning an empty CFolderItems object instead of nothing.
Author: mjansen Date: Sun Aug 21 18:48:48 2016 New Revision: 72415 URL: http://svn.reactos.org/svn/reactos?rev=72415&view=rev Log: [SHELL32] Fix a crash in shell32:shelldispatch by returning an empty CFolderItems object instead of nothing. Modified: trunk/reactos/dll/win32/shell32/CFolder.cpp Modified: trunk/reactos/dll/win32/shell32/CFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CFolder.cpp?rev=72415&r1=72414&r2=72415&view=diff == --- trunk/reactos/dll/win32/shell32/CFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CFolder.cpp [iso-8859-1] Sun Aug 21 18:48:48 2016 @@ -82,8 +82,10 @@ HRESULT STDMETHODCALLTYPE CFolder::Items(FolderItems **ppid) { -TRACE("(%p, %p)\n", this, ppid); -return E_NOTIMPL; +CFolderItems* item = new CComObject(); +item->AddRef(); +*ppid = item; +return S_OK; } HRESULT STDMETHODCALLTYPE CFolder::ParseName(BSTR bName, FolderItem **ppid)
[ros-diffs] [mjansen] 72416: [SHELL32] Partially implement CFolderItems. Thanks to Giannis for the advice :)
Author: mjansen Date: Sun Aug 21 19:58:32 2016 New Revision: 72416 URL: http://svn.reactos.org/svn/reactos?rev=72416&view=rev Log: [SHELL32] Partially implement CFolderItems. Thanks to Giannis for the advice :) Modified: trunk/reactos/dll/win32/shell32/CFolder.cpp trunk/reactos/dll/win32/shell32/CFolderItems.cpp trunk/reactos/dll/win32/shell32/CFolderItems.h Modified: trunk/reactos/dll/win32/shell32/CFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CFolder.cpp?rev=72416&r1=72415&r2=72416&view=diff == --- trunk/reactos/dll/win32/shell32/CFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CFolder.cpp [iso-8859-1] Sun Aug 21 19:58:32 2016 @@ -82,9 +82,17 @@ HRESULT STDMETHODCALLTYPE CFolder::Items(FolderItems **ppid) { -CFolderItems* item = new CComObject(); -item->AddRef(); -*ppid = item; +CFolderItems* items = new CComObject(); +items->AddRef(); + +HRESULT hr = items->Init(ILClone(m_idlist)); +if (FAILED_UNEXPECTEDLY(hr)) +{ +items->Release(); +return hr; +} + +*ppid = items; return S_OK; } Modified: trunk/reactos/dll/win32/shell32/CFolderItems.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CFolderItems.cpp?rev=72416&r1=72415&r2=72416&view=diff == --- trunk/reactos/dll/win32/shell32/CFolderItems.cpp[iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CFolderItems.cpp[iso-8859-1] Sun Aug 21 19:58:32 2016 @@ -1,7 +1,7 @@ /* * FolderItem(s) implementation * - * Copyright 2015 Mark Jansen + * Copyright 2015,2016 Mark Jansen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -162,18 +162,65 @@ CFolderItems::CFolderItems() +:m_Count(-1) { } CFolderItems::~CFolderItems() { +} + +HRESULT CFolderItems::Init(LPITEMIDLIST idlist) +{ +CComPtr psfDesktop, psfTarget; + +m_idlist.Attach(idlist); + +HRESULT hr = SHGetDesktopFolder(&psfDesktop); +if (FAILED_UNEXPECTEDLY(hr)) +return hr; + +hr = psfDesktop->BindToObject(m_idlist, NULL, IID_PPV_ARG(IShellFolder, &psfTarget)); +if (FAILED_UNEXPECTEDLY(hr)) +return hr; + +hr = psfTarget->EnumObjects(NULL, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, &m_EnumIDList); + +if (FAILED_UNEXPECTEDLY(hr)) +return hr; + +return S_OK; } // *** FolderItems methods *** HRESULT STDMETHODCALLTYPE CFolderItems::get_Count(long *plCount) { -TRACE("(%p, %p)\n", this, plCount); -return E_NOTIMPL; +if (!m_EnumIDList) +return E_FAIL; + +if (!plCount) +return E_POINTER; + +if (m_Count == -1) +{ +long count = 0; + +HRESULT hr = m_EnumIDList->Reset(); +if (FAILED_UNEXPECTEDLY(hr)) +return hr; + +CComHeapPtr Pidl; +hr = m_EnumIDList->Next(1, &Pidl, 0); +while (hr != S_FALSE) +{ +count++; +Pidl.Free(); +} +m_Count = count; +} +*plCount = m_Count; + +return S_OK; } HRESULT STDMETHODCALLTYPE CFolderItems::get_Application(IDispatch **ppid) @@ -190,13 +237,43 @@ HRESULT STDMETHODCALLTYPE CFolderItems::Item(VARIANT index, FolderItem **ppid) { -TRACE("(%p, %s, %p)\n", this, wine_dbgstr_variant(&index), ppid); -return E_NOTIMPL; +if (!m_EnumIDList) +return E_FAIL; + +if (V_VT(&index) != VT_I4 && V_VT(&index) != VT_UI4) +return E_INVALIDARG; + +ULONG count = V_UI4(&index); + +HRESULT hr = m_EnumIDList->Reset(); +if (FAILED_UNEXPECTEDLY(hr)) +return hr; + +hr = m_EnumIDList->Skip(count); + +if (FAILED_UNEXPECTEDLY(hr)) +return hr; + +CComHeapPtr spPidl; +hr = m_EnumIDList->Next(1, &spPidl, 0); +if (hr == S_OK) +{ +CFolderItem* item = new CComObject(); +item->AddRef(); +item->Init(spPidl.Detach()); +*ppid = item; +return S_OK; +} + +return hr; } HRESULT STDMETHODCALLTYPE CFolderItems::_NewEnum(IUnknown **ppunk) { -TRACE("(%p, %p)\n", this, ppunk); -return E_NOTIMPL; -} - +CFolderItems* items = new CComObject(); +items->AddRef(); +items->Init(ILClone(m_idlist)); +*ppunk = items; +return S_OK; +} + Modified: trunk/reactos/dll/win32/shell32/CFolderItems.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CFolderItems.h?rev=72416&r1=72415&r2=72416&view=diff == --- trunk/reactos/dll/win32/shell32/CFolderItems.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CFolderItems.h [iso-8859-1] Sun Aug 21 19:58:32 2016 @@ -34,6 +34,7 @@ CFolderItem(); ~CFolderItem(); +//
[ros-diffs] [mjansen] 72417: [WIN32SS] Fix argument name, spotted by Hermes. CORE-11858
Author: mjansen Date: Sun Aug 21 20:03:19 2016 New Revision: 72417 URL: http://svn.reactos.org/svn/reactos?rev=72417&view=rev Log: [WIN32SS] Fix argument name, spotted by Hermes. CORE-11858 Modified: trunk/reactos/win32ss/user/ntuser/class.c Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.c?rev=72417&r1=72416&r2=72417&view=diff == --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Sun Aug 21 20:03:19 2016 @@ -2382,7 +2382,7 @@ NtUserRegisterClassExWOW( WNDCLASSEXW* lpwcx, PUNICODE_STRING ClassName, -PUNICODE_STRING ClsNVersion, +PUNICODE_STRING ClsVersion, PCLSMENUNAME pClassMenuName, DWORD fnID, DWORD Flags, @@ -2437,7 +2437,7 @@ sizeof(WNDCLASSEXW)); CapturedName = ProbeForReadUnicodeString(ClassName); -CapturedVersion = ProbeForReadUnicodeString(ClsNVersion); +CapturedVersion = ProbeForReadUnicodeString(ClsVersion); ProbeForRead(pClassMenuName, sizeof(CLSMENUNAME),
[ros-diffs] [mjansen] 72418: Addendum to r72417. CORE-11858 #resolve
Author: mjansen Date: Sun Aug 21 20:07:05 2016 New Revision: 72418 URL: http://svn.reactos.org/svn/reactos?rev=72418&view=rev Log: Addendum to r72417. CORE-11858 #resolve Modified: trunk/reactos/win32ss/include/ntuser.h Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?rev=72418&r1=72417&r2=72418&view=diff == --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Sun Aug 21 20:07:05 2016 @@ -2836,7 +2836,7 @@ NtUserRegisterClassExWOW( WNDCLASSEXW* lpwcx, PUNICODE_STRING pustrClassName, -PUNICODE_STRING pustrCNVersion, +PUNICODE_STRING pustrCVersion, PCLSMENUNAME pClassMenuName, DWORD fnID, DWORD Flags,
[ros-diffs] [ekohl] 72419: [LSASRV] Implement LsaIFree_LSAPR_TRANSLATED_SIDS.
Author: ekohl Date: Sun Aug 21 21:24:10 2016 New Revision: 72419 URL: http://svn.reactos.org/svn/reactos?rev=72419&view=rev Log: [LSASRV] Implement LsaIFree_LSAPR_TRANSLATED_SIDS. Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.c trunk/reactos/dll/win32/lsasrv/lsasrv.spec Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.c?rev=72419&r1=72418&r2=72419&view=diff == --- trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] Sun Aug 21 21:24:10 2016 @@ -216,7 +216,7 @@ VOID NTAPI LsaIFree_LSAPR_SR_SECURITY_DESCRIPTOR( -PLSAPR_SR_SECURITY_DESCRIPTOR Ptr) +IN PLSAPR_SR_SECURITY_DESCRIPTOR Ptr) { if (Ptr != NULL) { @@ -231,7 +231,7 @@ VOID NTAPI LsaIFree_LSAPR_TRANSLATED_NAMES( -PLSAPR_TRANSLATED_NAMES Ptr) +IN PLSAPR_TRANSLATED_NAMES Ptr) { ULONG i; @@ -247,6 +247,21 @@ midl_user_free(Ptr->Names); } + +midl_user_free(Ptr); +} +} + + +VOID +NTAPI +LsaIFree_LSAPR_TRANSLATED_SIDS( +IN PLSAPR_TRANSLATED_SIDS Ptr) +{ +if (Ptr != NULL) +{ +if (Ptr->Sids != NULL) +midl_user_free(Ptr->Sids); midl_user_free(Ptr); } Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.spec?rev=72419&r1=72418&r2=72419&view=diff == --- trunk/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] Sun Aug 21 21:24:10 2016 @@ -40,7 +40,7 @@ @ stdcall LsaIFree_LSAPR_REFERENCED_DOMAIN_LIST(ptr) @ stdcall LsaIFree_LSAPR_SR_SECURITY_DESCRIPTOR(ptr) @ stdcall LsaIFree_LSAPR_TRANSLATED_NAMES(ptr) - @ stub LsaIFree_LSAPR_TRANSLATED_SIDS + @ stdcall LsaIFree_LSAPR_TRANSLATED_SIDS(ptr) @ stub LsaIFree_LSAPR_TRUSTED_DOMAIN_INFO @ stub LsaIFree_LSAPR_TRUSTED_ENUM_BUFFER @ stub LsaIFree_LSAPR_TRUSTED_ENUM_BUFFER_EX
[ros-diffs] [ekohl] 72420: [INCLUDE] Add the RtlLengthSecurityDescriptor prototype to the NDK.
Author: ekohl Date: Sun Aug 21 21:31:40 2016 New Revision: 72420 URL: http://svn.reactos.org/svn/reactos?rev=72420&view=rev Log: [INCLUDE] Add the RtlLengthSecurityDescriptor prototype to the NDK. Modified: trunk/reactos/base/system/services/config.c trunk/reactos/sdk/include/ndk/rtlfuncs.h Modified: trunk/reactos/base/system/services/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/config.c?rev=72420&r1=72419&r2=72420&view=diff == --- trunk/reactos/base/system/services/config.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/config.c [iso-8859-1] Sun Aug 21 21:31:40 2016 @@ -15,10 +15,6 @@ #define NDEBUG #include -ULONG -NTAPI -RtlLengthSecurityDescriptor( - _In_ PSECURITY_DESCRIPTOR SecurityDescriptor); /* FUNCTIONS */ Modified: trunk/reactos/sdk/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ndk/rtlfuncs.h?rev=72420&r1=72419&r2=72420&view=diff == --- trunk/reactos/sdk/include/ndk/rtlfuncs.h[iso-8859-1] (original) +++ trunk/reactos/sdk/include/ndk/rtlfuncs.h[iso-8859-1] Sun Aug 21 21:31:40 2016 @@ -1468,6 +1468,13 @@ ULONG NTAPI RtlLengthRequiredSid(IN ULONG SubAuthorityCount); + +_IRQL_requires_max_(APC_LEVEL) +NTSYSAPI +ULONG +NTAPI +RtlLengthSecurityDescriptor( +_In_ PSECURITY_DESCRIPTOR SecurityDescriptor); NTSYSAPI ULONG
[ros-diffs] [ekohl] 72421: [LSASRV] Implement LsarSetSecurityObject.
Author: ekohl Date: Sun Aug 21 21:39:02 2016 New Revision: 72421 URL: http://svn.reactos.org/svn/reactos?rev=72421&view=rev Log: [LSASRV] Implement LsarSetSecurityObject. Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?rev=72421&r1=72420&r2=72421&view=diff == --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sun Aug 21 21:39:02 2016 @@ -13,6 +13,26 @@ static RTL_CRITICAL_SECTION PolicyHandleTableLock; +static +GENERIC_MAPPING +LsapPolicyMapping = {POLICY_READ, + POLICY_WRITE, + POLICY_EXECUTE, + POLICY_ALL_ACCESS}; + +static +GENERIC_MAPPING +LsapAccountMapping = {ACCOUNT_READ, + ACCOUNT_WRITE, + ACCOUNT_EXECUTE, + ACCOUNT_ALL_ACCESS}; + +static +GENERIC_MAPPING +LsapSecretMapping = {SECRET_READ, + SECRET_WRITE, + SECRET_EXECUTE, + SECRET_ALL_ACCESS}; /* FUNCTIONS ***/ @@ -259,8 +279,142 @@ SECURITY_INFORMATION SecurityInformation, PLSAPR_SR_SECURITY_DESCRIPTOR SecurityDescriptor) { -UNIMPLEMENTED; -return STATUS_NOT_IMPLEMENTED; +PLSA_DB_OBJECT DbObject = NULL; +ACCESS_MASK DesiredAccess = 0; +PSECURITY_DESCRIPTOR RelativeSd = NULL; +ULONG RelativeSdSize = 0; +HANDLE TokenHandle = NULL; +PGENERIC_MAPPING Mapping; +NTSTATUS Status; + +TRACE("LsarSetSecurityObject(%p %lx %p)\n", + ObjectHandle, SecurityInformation, SecurityDescriptor); + +if ((SecurityDescriptor == NULL) || +(SecurityDescriptor->SecurityDescriptor == NULL) || + !RtlValidSecurityDescriptor((PSECURITY_DESCRIPTOR)SecurityDescriptor->SecurityDescriptor)) +return ERROR_INVALID_PARAMETER; + +if (SecurityInformation == 0 || +SecurityInformation & ~(OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION +| DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION)) +return ERROR_INVALID_PARAMETER; + +if (SecurityInformation & SACL_SECURITY_INFORMATION) +DesiredAccess |= ACCESS_SYSTEM_SECURITY; + +if (SecurityInformation & DACL_SECURITY_INFORMATION) +DesiredAccess |= WRITE_DAC; + +if (SecurityInformation & (OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION)) +DesiredAccess |= WRITE_OWNER; + +if ((SecurityInformation & OWNER_SECURITY_INFORMATION) && +(((PISECURITY_DESCRIPTOR)SecurityDescriptor)->Owner == NULL)) +return ERROR_INVALID_PARAMETER; + +if ((SecurityInformation & GROUP_SECURITY_INFORMATION) && +(((PISECURITY_DESCRIPTOR)SecurityDescriptor)->Group == NULL)) +return ERROR_INVALID_PARAMETER; + +/* Validate the ObjectHandle */ +Status = LsapValidateDbObject(ObjectHandle, + LsaDbIgnoreObject, + DesiredAccess, + &DbObject); +if (!NT_SUCCESS(Status)) +{ +ERR("LsapValidateDbObject failed (Status 0x%08lx)\n", Status); +return Status; +} + +/* Get the mapping for the object type */ +switch (DbObject->ObjectType) +{ +case LsaDbPolicyObject: +Mapping = &LsapPolicyMapping; +break; + +case LsaDbAccountObject: +Mapping = &LsapAccountMapping; +break; + +//case LsaDbDomainObject: +//Mapping = &LsapDomainMapping; +//break; + +case LsaDbSecretObject: +Mapping = &LsapSecretMapping; +break; + +default: +return STATUS_INVALID_HANDLE; +} + +/* Get the size of the SD */ +Status = LsapGetObjectAttribute(DbObject, +L"SecDesc", +NULL, +&RelativeSdSize); +if (!NT_SUCCESS(Status)) +return Status; + +/* Allocate a buffer for the SD */ +RelativeSd = RtlAllocateHeap(RtlGetProcessHeap(), 0, RelativeSdSize); +if (RelativeSd == NULL) +return STATUS_INSUFFICIENT_RESOURCES; + +/* Get the SD */ +Status = LsapGetObjectAttribute(DbObject, +L"SecDesc", +RelativeSd, +&RelativeSdSize); +if (!NT_SUCCESS(Status)) +goto done; + +#if 0 +RpcImpersonateClient(NULL); + +Status = NtOpenThreadToken(NtCurrentThread(), + 8, + TRUE, + &hToken); +if (!NT_SUCCESS(Status)) +goto done; + +