Ros-diffs July 2010

ros-diffs@reactos.org

17 participants
467 discussions

[tkreuzer] 48056: [NTOSKRNL] KeQuerySystemTime and KeQueryInterruptTime are not implemenetd on amd64

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jul 15 00:07:31 2010 New Revision: 48056 URL: http://svn.reactos.org/svn/reactos?rev=48056&view=rev Log: [NTOSKRNL] KeQuerySystemTime and KeQueryInterruptTime are not implemenetd on amd64 Modified: trunk/reactos/ntoskrnl/ke/clock.c Modified: trunk/reactos/ntoskrnl/ke/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/clock.c?rev=48… ============================================================================== --- trunk/reactos/ntoskrnl/ke/clock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/clock.c [iso-8859-1] Thu Jul 15 00:07:31 2010 @@ -175,6 +175,7 @@ } } +#ifndef _M_AMD64 /* * @implemented */ @@ -217,6 +218,7 @@ /* Return the time value */ return CurrentTime.QuadPart; } +#endif /* * @implemented

14 years, 2 months

[tkreuzer] 48055: [shellapi.h] fix inclusion of pshpack / poppack (global and not for _WIN64)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jul 14 23:52:48 2010 New Revision: 48055 URL: http://svn.reactos.org/svn/reactos?rev=48055&view=rev Log: [shellapi.h] fix inclusion of pshpack / poppack (global and not for _WIN64) Modified: trunk/reactos/include/psdk/shellapi.h Modified: trunk/reactos/include/psdk/shellapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shellapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/shellapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shellapi.h [iso-8859-1] Wed Jul 14 23:52:48 2010 @@ -8,6 +8,11 @@ #pragma warning(push) #pragma warning(disable:4201) #endif + +#if !defined(_WIN64) +#include <pshpack1.h> +#endif + #define WINSHELLAPI DECLSPEC_IMPORT #define ABE_LEFT 0 #define ABE_TOP 1 @@ -160,7 +165,7 @@ typedef WORD FILEOP_FLAGS; typedef WORD PRINTEROP_FLAGS; -#include <pshpack1.h> + typedef struct _AppBarData { DWORD cbSize; HWND hWnd; @@ -330,7 +335,6 @@ int cchOldPath; int cchNewPath; } SHNAMEMAPPINGW, *LPSHNAMEMAPPINGW; -#include <poppack.h> #define SHERB_NOCONFIRMATION 0x1 #define SHERB_NOPROGRESSUI 0x2 @@ -440,6 +444,11 @@ #define SHEmptyRecycleBin SHEmptyRecycleBinA #define SHGetNewLinkInfo SHGetNewLinkInfoA #endif + +#if !defined(_WIN64) +#include <pshpack1.h> +#endif + #ifdef _MSC_VER #pragma warning(pop) #endif

14 years, 2 months

[tkreuzer] 48054: [ntdll_winetest] Comment out some tests for WIN64 builds (wine headers are broken)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jul 14 23:13:31 2010 New Revision: 48054 URL: http://svn.reactos.org/svn/reactos?rev=48054&view=rev Log: [ntdll_winetest] Comment out some tests for WIN64 builds (wine headers are broken) Added: trunk/rostests/winetests/ntdll/ros_diff.patch (with props) Modified: trunk/rostests/winetests/ntdll/generated.c Modified: trunk/rostests/winetests/ntdll/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/generated… ============================================================================== --- trunk/rostests/winetests/ntdll/generated.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/generated.c [iso-8859-1] Wed Jul 14 23:13:31 2010 @@ -442,6 +442,7 @@ static void test_pack_FLOATING_SAVE_AREA(void) { +#if 0 // this doesn't exist on amd64 /* FLOATING_SAVE_AREA */ TEST_TYPE_SIZE (FLOATING_SAVE_AREA, 112) TEST_TYPE_ALIGN (FLOATING_SAVE_AREA, 4) @@ -472,6 +473,7 @@ TEST_FIELD_SIZE (FLOATING_SAVE_AREA, Cr0NpxState, 4) TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, Cr0NpxState, 4) TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, Cr0NpxState, 108) +#endif } static void test_pack_FPO_DATA(void) @@ -875,7 +877,7 @@ static void test_pack_IMAGE_LOAD_CONFIG_DIRECTORY(void) { /* IMAGE_LOAD_CONFIG_DIRECTORY */ - TEST_TYPE_SIZE (IMAGE_LOAD_CONFIG_DIRECTORY, 88) +// TEST_TYPE_SIZE (IMAGE_LOAD_CONFIG_DIRECTORY, 88) TEST_TYPE_ALIGN (IMAGE_LOAD_CONFIG_DIRECTORY, 8) TEST_FIELD_SIZE (IMAGE_LOAD_CONFIG_DIRECTORY, Size, 4) TEST_FIELD_ALIGN (IMAGE_LOAD_CONFIG_DIRECTORY, Size, 4) @@ -898,6 +900,7 @@ TEST_FIELD_SIZE (IMAGE_LOAD_CONFIG_DIRECTORY, CriticalSectionDefaultTimeout, 4) TEST_FIELD_ALIGN (IMAGE_LOAD_CONFIG_DIRECTORY, CriticalSectionDefaultTimeout, 4) TEST_FIELD_OFFSET(IMAGE_LOAD_CONFIG_DIRECTORY, CriticalSectionDefaultTimeout, 20) +#if 0 // wine headers are broken TEST_FIELD_SIZE (IMAGE_LOAD_CONFIG_DIRECTORY, DeCommitFreeBlockThreshold, 4) TEST_FIELD_ALIGN (IMAGE_LOAD_CONFIG_DIRECTORY, DeCommitFreeBlockThreshold, 4) TEST_FIELD_OFFSET(IMAGE_LOAD_CONFIG_DIRECTORY, DeCommitFreeBlockThreshold, 24) @@ -937,6 +940,7 @@ TEST_FIELD_SIZE (IMAGE_LOAD_CONFIG_DIRECTORY, SEHandlerCount, 4) TEST_FIELD_ALIGN (IMAGE_LOAD_CONFIG_DIRECTORY, SEHandlerCount, 4) TEST_FIELD_OFFSET(IMAGE_LOAD_CONFIG_DIRECTORY, SEHandlerCount, 80) +#endif } static void test_pack_IMAGE_NT_HEADERS(void) @@ -1980,11 +1984,13 @@ static void test_pack_PFLOATING_SAVE_AREA(void) { +#if 0 /* PFLOATING_SAVE_AREA */ TEST_TYPE_SIZE (PFLOATING_SAVE_AREA, 8) TEST_TYPE_ALIGN (PFLOATING_SAVE_AREA, 8) TEST_TARGET_SIZE (PFLOATING_SAVE_AREA, 112) TEST_TARGET_ALIGN(PFLOATING_SAVE_AREA, 4) +#endif } static void test_pack_PFPO_DATA(void) @@ -2157,7 +2163,9 @@ /* PIMAGE_LOAD_CONFIG_DIRECTORY */ TEST_TYPE_SIZE (PIMAGE_LOAD_CONFIG_DIRECTORY, 8) TEST_TYPE_ALIGN (PIMAGE_LOAD_CONFIG_DIRECTORY, 8) +#if 0// wine headers are broken TEST_TARGET_SIZE (PIMAGE_LOAD_CONFIG_DIRECTORY, 88) +#endif TEST_TARGET_ALIGN(PIMAGE_LOAD_CONFIG_DIRECTORY, 8) } Added: trunk/rostests/winetests/ntdll/ros_diff.patch URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/ros_diff.… ============================================================================== --- trunk/rostests/winetests/ntdll/ros_diff.patch (added) +++ trunk/rostests/winetests/ntdll/ros_diff.patch [iso-8859-1] Wed Jul 14 23:13:31 2010 @@ -1,0 +1,69 @@ +Index: generated.c +=================================================================== +--- generated.c (Revision 48052) ++++ generated.c (Arbeitskopie) +@@ -442,6 +442,7 @@ + + static void test_pack_FLOATING_SAVE_AREA(void) + { ++#if 0 + /* FLOATING_SAVE_AREA */ + TEST_TYPE_SIZE (FLOATING_SAVE_AREA, 112) + TEST_TYPE_ALIGN (FLOATING_SAVE_AREA, 4) +@@ -472,6 +473,7 @@ + TEST_FIELD_SIZE (FLOATING_SAVE_AREA, Cr0NpxState, 4) + TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, Cr0NpxState, 4) + TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, Cr0NpxState, 108) ++#endif + } + + static void test_pack_FPO_DATA(void) +@@ -875,7 +877,7 @@ + static void test_pack_IMAGE_LOAD_CONFIG_DIRECTORY(void) + { + /* IMAGE_LOAD_CONFIG_DIRECTORY */ +- TEST_TYPE_SIZE (IMAGE_LOAD_CONFIG_DIRECTORY, 88) ++// TEST_TYPE_SIZE (IMAGE_LOAD_CONFIG_DIRECTORY, 88) + TEST_TYPE_ALIGN (IMAGE_LOAD_CONFIG_DIRECTORY, 8) + TEST_FIELD_SIZE (IMAGE_LOAD_CONFIG_DIRECTORY, Size, 4) + TEST_FIELD_ALIGN (IMAGE_LOAD_CONFIG_DIRECTORY, Size, 4) +@@ -898,6 +900,7 @@ + TEST_FIELD_SIZE (IMAGE_LOAD_CONFIG_DIRECTORY, CriticalSectionDefaultTimeout, 4) + TEST_FIELD_ALIGN (IMAGE_LOAD_CONFIG_DIRECTORY, CriticalSectionDefaultTimeout, 4) + TEST_FIELD_OFFSET(IMAGE_LOAD_CONFIG_DIRECTORY, CriticalSectionDefaultTimeout, 20) ++#if 0 // wine headers are broken + TEST_FIELD_SIZE (IMAGE_LOAD_CONFIG_DIRECTORY, DeCommitFreeBlockThreshold, 4) + TEST_FIELD_ALIGN (IMAGE_LOAD_CONFIG_DIRECTORY, DeCommitFreeBlockThreshold, 4) + TEST_FIELD_OFFSET(IMAGE_LOAD_CONFIG_DIRECTORY, DeCommitFreeBlockThreshold, 24) +@@ -937,6 +940,7 @@ + TEST_FIELD_SIZE (IMAGE_LOAD_CONFIG_DIRECTORY, SEHandlerCount, 4) + TEST_FIELD_ALIGN (IMAGE_LOAD_CONFIG_DIRECTORY, SEHandlerCount, 4) + TEST_FIELD_OFFSET(IMAGE_LOAD_CONFIG_DIRECTORY, SEHandlerCount, 80) ++#endif + } + + static void test_pack_IMAGE_NT_HEADERS(void) +@@ -1980,11 +1984,13 @@ + + static void test_pack_PFLOATING_SAVE_AREA(void) + { ++#if 0 + /* PFLOATING_SAVE_AREA */ + TEST_TYPE_SIZE (PFLOATING_SAVE_AREA, 8) + TEST_TYPE_ALIGN (PFLOATING_SAVE_AREA, 8) + TEST_TARGET_SIZE (PFLOATING_SAVE_AREA, 112) + TEST_TARGET_ALIGN(PFLOATING_SAVE_AREA, 4) ++#endif + } + + static void test_pack_PFPO_DATA(void) +@@ -2157,7 +2163,9 @@ + /* PIMAGE_LOAD_CONFIG_DIRECTORY */ + TEST_TYPE_SIZE (PIMAGE_LOAD_CONFIG_DIRECTORY, 8) + TEST_TYPE_ALIGN (PIMAGE_LOAD_CONFIG_DIRECTORY, 8) ++#if 0// wine headers are broken + TEST_TARGET_SIZE (PIMAGE_LOAD_CONFIG_DIRECTORY, 88) ++#endif + TEST_TARGET_ALIGN(PIMAGE_LOAD_CONFIG_DIRECTORY, 8) + } + Propchange: trunk/rostests/winetests/ntdll/ros_diff.patch ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 2 months

[tkreuzer] 48053: Fix build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jul 14 22:32:06 2010 New Revision: 48053 URL: http://svn.reactos.org/svn/reactos?rev=48053&view=rev Log: Fix build Modified: trunk/rostests/winetests/gdi32/gdi32.rbuild Modified: trunk/rostests/winetests/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/gdi32.rbu… ============================================================================== --- trunk/rostests/winetests/gdi32/gdi32.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/gdi32.rbuild [iso-8859-1] Wed Jul 14 22:32:06 2010 @@ -13,7 +13,6 @@ <file>dc.c</file> <file>gdiobj.c</file> <file>generated.c</file> - </ifnot> <file>icm.c</file> <file>font.c</file> <file>mapping.c</file>

14 years, 2 months

[spetreolle] 48052: gdi32:generated should now build on x64.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Wed Jul 14 22:08:19 2010 New Revision: 48052 URL: http://svn.reactos.org/svn/reactos?rev=48052&view=rev Log: gdi32:generated should now build on x64. Modified: trunk/rostests/winetests/gdi32/gdi32.rbuild Modified: trunk/rostests/winetests/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/gdi32.rbu… ============================================================================== --- trunk/rostests/winetests/gdi32/gdi32.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/gdi32.rbuild [iso-8859-1] Wed Jul 14 22:08:19 2010 @@ -12,8 +12,7 @@ <file>clipping.c</file> <file>dc.c</file> <file>gdiobj.c</file> - <ifnot property="ARCH" value="amd64"> - <file>generated.c</file> + <file>generated.c</file> </ifnot> <file>icm.c</file> <file>font.c</file>

14 years, 2 months

[spetreolle] 48051: A little closer to x64 compat in GDI headers. Patch by Samuel Serapion.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Wed Jul 14 22:02:51 2010 New Revision: 48051 URL: http://svn.reactos.org/svn/reactos?rev=48051&view=rev Log: A little closer to x64 compat in GDI headers. Patch by Samuel Serapion. Modified: trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Wed Jul 14 22:02:51 2010 @@ -1715,7 +1715,7 @@ typedef struct tagEMRCREATEBRUSHINDIRECT { EMR emr; DWORD ihBrush; - LOGBRUSH lb; + LOGBRUSH32 lb; } EMRCREATEBRUSHINDIRECT,*PEMRCREATEBRUSHINDIRECT; typedef LONG LCSCSTYPE; typedef LONG LCSGAMUTMATCH; @@ -1897,11 +1897,11 @@ EXTLOGFONTW elfw; } EMREXTCREATEFONTINDIRECTW,*PEMREXTCREATEFONTINDIRECTW; typedef struct tagEXTLOGPEN { - UINT elpPenStyle; - UINT elpWidth; + DWORD elpPenStyle; + DWORD elpWidth; UINT elpBrushStyle; COLORREF elpColor; - LONG elpHatch; + ULONG_PTR elpHatch; DWORD elpNumEntries; DWORD elpStyleEntry[1]; } EXTLOGPEN,*PEXTLOGPEN,*LPEXTLOGPEN,*NPEXTLOGPEN;

14 years, 2 months

[tkreuzer] 48050: [GDI32_WINETEST] Don't compile generated.c on amd64

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jul 14 21:36:24 2010 New Revision: 48050 URL: http://svn.reactos.org/svn/reactos?rev=48050&view=rev Log: [GDI32_WINETEST] Don't compile generated.c on amd64 Modified: trunk/rostests/winetests/gdi32/gdi32.rbuild Modified: trunk/rostests/winetests/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/gdi32.rbu… ============================================================================== --- trunk/rostests/winetests/gdi32/gdi32.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/gdi32.rbuild [iso-8859-1] Wed Jul 14 21:36:24 2010 @@ -12,7 +12,9 @@ <file>clipping.c</file> <file>dc.c</file> <file>gdiobj.c</file> - <file>generated.c</file> + <ifnot property="ARCH" value="amd64"> + <file>generated.c</file> + </ifnot> <file>icm.c</file> <file>font.c</file> <file>mapping.c</file>

14 years, 2 months

[jgardou] 48049: Push sync to 48046, this time with cursoricon.c

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Jul 14 20:28:06 2010 New Revision: 48049 URL: http://svn.reactos.org/svn/reactos?rev=48049&view=rev Log: Push sync to 48046, this time with cursoricon.c Modified: branches/reactos-yarotows/include/reactos/winsock/msafd.h (props changed) branches/reactos-yarotows/include/reactos/winsock/msafdlib.h (props changed) branches/reactos-yarotows/include/reactos/winsock/mswinsock.h (props changed) branches/reactos-yarotows/include/reactos/winsock/rnr20lib.h (props changed) branches/reactos-yarotows/include/reactos/winsock/wsmobile.h (props changed) branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c Propchange: branches/reactos-yarotows/include/reactos/winsock/msafd.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jul 14 20:28:06 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/reactos/winsock/msafd.h:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/include/reactos/winsock/msafd.h:44354-45543 +/trunk/reactos/include/reactos/winsock/msafd.h:44354-45543,48010-48040 Propchange: branches/reactos-yarotows/include/reactos/winsock/msafdlib.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jul 14 20:28:06 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/reactos/winsock/msafdlib.h:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/include/reactos/winsock/msafdlib.h:44354-45543 +/trunk/reactos/include/reactos/winsock/msafdlib.h:44354-45543,48010-48040 Propchange: branches/reactos-yarotows/include/reactos/winsock/mswinsock.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jul 14 20:28:06 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/reactos/winsock/mswinsock.h:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/include/reactos/winsock/mswinsock.h:44354-45543 +/trunk/reactos/include/reactos/winsock/mswinsock.h:44354-45543,48010-48040 Propchange: branches/reactos-yarotows/include/reactos/winsock/rnr20lib.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jul 14 20:28:06 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/reactos/winsock/rnr20lib.h:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/include/reactos/winsock/rnr20lib.h:44354-45543 +/trunk/reactos/include/reactos/winsock/rnr20lib.h:44354-45543,48010-48040 Propchange: branches/reactos-yarotows/include/reactos/winsock/wsmobile.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jul 14 20:28:06 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/reactos/winsock/wsmobile.h:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/include/reactos/winsock/wsmobile.h:44354-45543 +/trunk/reactos/include/reactos/winsock/wsmobile.h:44354-45543,48010-48040 Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Wed Jul 14 20:28:06 2010 @@ -491,89 +491,6 @@ } -/* - * @implemented - */ -HANDLE -APIENTRY -NtUserCreateCursorIconHandle(PICONINFO IconInfo OPTIONAL, BOOL Indirect) -{ - PCURICON_OBJECT CurIcon; - PSURFACE psurfBmp; - NTSTATUS Status; - HANDLE Ret; - DECLARE_RETURN(HANDLE); - - DPRINT("Enter NtUserCreateCursorIconHandle\n"); - UserEnterExclusive(); - - if (!(CurIcon = IntCreateCurIconHandle())) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - RETURN((HANDLE)0); - } - - Ret = CurIcon->Self; - - if (IconInfo) - { - Status = MmCopyFromCaller(&CurIcon->IconInfo, IconInfo, sizeof(ICONINFO)); - if (NT_SUCCESS(Status)) - { - /* Copy bitmaps and size info */ - if (Indirect) - { - /* Convert bitmaps to unowned objects, so that they can be shared between processes */ - CurIcon->IconInfo.hbmMask = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmMask); - GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmMask, NULL); - if(CurIcon->IconInfo.hbmColor) - { - CurIcon->IconInfo.hbmColor = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmColor); - GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmColor, NULL); - } - } - if (CurIcon->IconInfo.hbmColor && - (psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmColor))) - { - CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; - CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy; - SURFACE_UnlockSurface(psurfBmp); - GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmColor, NULL); - } - if (CurIcon->IconInfo.hbmMask && - (psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmMask))) - { - if(!CurIcon->IconInfo.hbmColor) - { - CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; - CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy/2; - } - SURFACE_UnlockSurface(psurfBmp); - GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmMask, NULL); - } - - /* Calculate icon hotspot */ - if (CurIcon->IconInfo.fIcon == TRUE) - { - CurIcon->IconInfo.xHotspot = CurIcon->Size.cx >> 1; - CurIcon->IconInfo.yHotspot = CurIcon->Size.cy >> 1; - } - } - else - { - SetLastNtError(Status); - /* FIXME - Don't exit here */ - } - } - - UserDereferenceObject(CurIcon); - RETURN(Ret); - -CLEANUP: - DPRINT("Leave NtUserCreateCursorIconHandle, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} /* * @implemented @@ -1057,11 +974,13 @@ } /* Delete old bitmaps */ - if (CurIcon->IconInfo.hbmColor != IconInfo.hbmColor) + if ((CurIcon->IconInfo.hbmColor) + && (CurIcon->IconInfo.hbmColor != IconInfo.hbmColor)) { GreDeleteObject(CurIcon->IconInfo.hbmColor); } - if (CurIcon->IconInfo.hbmMask != IconInfo.hbmMask) + if ((CurIcon->IconInfo.hbmMask) + && CurIcon->IconInfo.hbmMask != IconInfo.hbmMask) { GreDeleteObject(CurIcon->IconInfo.hbmMask); } @@ -1253,6 +1172,15 @@ } done: + if(Ret) + { + /* This icon is shared now */ + GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmMask, NULL); + if(CurIcon->IconInfo.hbmColor) + { + GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmColor, NULL); + } + } UserDereferenceObject(CurIcon); RETURN(Ret);

14 years, 2 months

[jgardou] 48048: Sync with trunk (r48042), except win32k/ntuser/cursoricon.c ***branch DOES NOT BUILD with this commit***

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Jul 14 20:15:30 2010 New Revision: 48048 URL: http://svn.reactos.org/svn/reactos?rev=48048&view=rev Log: Sync with trunk (r48042), except win32k/ntuser/cursoricon.c ***branch DOES NOT BUILD with this commit*** Added: branches/reactos-yarotows/dll/3rdparty/libjpeg/jaricom.c - copied unchanged from r48040, trunk/reactos/dll/3rdparty/libjpeg/jaricom.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jcarith.c - copied unchanged from r48040, trunk/reactos/dll/3rdparty/libjpeg/jcarith.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jdarith.c - copied unchanged from r48040, trunk/reactos/dll/3rdparty/libjpeg/jdarith.c branches/reactos-yarotows/dll/3rdparty/libpng/ (props changed) - copied from r48040, trunk/reactos/dll/3rdparty/libpng/ branches/reactos-yarotows/dll/3rdparty/libtiff/ (props changed) - copied from r48040, trunk/reactos/dll/3rdparty/libtiff/ branches/reactos-yarotows/dll/win32/dnsapi/dnsapi/memory.c - copied unchanged from r48040, trunk/reactos/dll/win32/dnsapi/dnsapi/memory.c branches/reactos-yarotows/dll/win32/wing32/ - copied from r48040, trunk/reactos/dll/win32/wing32/ branches/reactos-yarotows/include/reactos/libs/libjpeg/rosdiff.patch - copied unchanged from r48040, trunk/reactos/include/reactos/libs/libjpeg/rosdiff.patch branches/reactos-yarotows/include/reactos/libs/libpng/ (props changed) - copied from r48040, trunk/reactos/include/reactos/libs/libpng/ branches/reactos-yarotows/include/reactos/libs/libtiff/ (props changed) - copied from r48040, trunk/reactos/include/reactos/libs/libtiff/ branches/reactos-yarotows/include/reactos/libs/zlib/ (props changed) - copied from r48040, trunk/reactos/include/reactos/libs/zlib/ branches/reactos-yarotows/include/reactos/winsock/msafd.h - copied unchanged from r48040, trunk/reactos/include/reactos/winsock/msafd.h branches/reactos-yarotows/include/reactos/winsock/msafdlib.h - copied unchanged from r48040, trunk/reactos/include/reactos/winsock/msafdlib.h branches/reactos-yarotows/include/reactos/winsock/mswinsock.h - copied unchanged from r48040, trunk/reactos/include/reactos/winsock/mswinsock.h branches/reactos-yarotows/include/reactos/winsock/rnr20lib.h - copied unchanged from r48040, trunk/reactos/include/reactos/winsock/rnr20lib.h branches/reactos-yarotows/include/reactos/winsock/wsmobile.h - copied unchanged from r48040, trunk/reactos/include/reactos/winsock/wsmobile.h Removed: branches/reactos-yarotows/dll/3rdparty/libjpeg/cderror.h branches/reactos-yarotows/dll/3rdparty/libjpeg/cdjpeg.h branches/reactos-yarotows/dll/3rdparty/libjpeg/jchuff.h branches/reactos-yarotows/dll/3rdparty/libjpeg/jconfig.h branches/reactos-yarotows/dll/3rdparty/libjpeg/jcphuff.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jdct.h branches/reactos-yarotows/dll/3rdparty/libjpeg/jdhuff.h branches/reactos-yarotows/dll/3rdparty/libjpeg/jdphuff.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jerror.h branches/reactos-yarotows/dll/3rdparty/libjpeg/jidctred.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jinclude.h branches/reactos-yarotows/dll/3rdparty/libjpeg/jmemsys.h branches/reactos-yarotows/dll/3rdparty/libjpeg/jmorecfg.h branches/reactos-yarotows/dll/3rdparty/libjpeg/jpegexiforient.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jpegint.h branches/reactos-yarotows/dll/3rdparty/libjpeg/jpeglib.h branches/reactos-yarotows/dll/3rdparty/libjpeg/jversion.h branches/reactos-yarotows/dll/3rdparty/libjpeg/libjpeg.reactos.diff branches/reactos-yarotows/dll/3rdparty/libjpeg/makefile.ansi branches/reactos-yarotows/dll/3rdparty/libjpeg/transupp.h branches/reactos-yarotows/dll/win32/dnsapi/dnsapi/free.c branches/reactos-yarotows/include/reactos/libs/libjpeg/jchuff.h branches/reactos-yarotows/include/reactos/libs/libjpeg/jdhuff.h branches/reactos-yarotows/include/reactos/libs/libjpeg/libjpeg.reactos.diff Modified: branches/reactos-yarotows/ (props changed) branches/reactos-yarotows/base/applications/applications.rbuild branches/reactos-yarotows/boot/bootdata/packages/reactos.dff branches/reactos-yarotows/dll/3rdparty/3rdparty.rbuild branches/reactos-yarotows/dll/3rdparty/libjpeg/README branches/reactos-yarotows/dll/3rdparty/libjpeg/ansi2knr.c branches/reactos-yarotows/dll/3rdparty/libjpeg/change.log branches/reactos-yarotows/dll/3rdparty/libjpeg/cjpeg.c branches/reactos-yarotows/dll/3rdparty/libjpeg/ckconfig.c branches/reactos-yarotows/dll/3rdparty/libjpeg/djpeg.c branches/reactos-yarotows/dll/3rdparty/libjpeg/example.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jcapimin.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jccoefct.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jcdctmgr.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jchuff.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jcinit.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jcmainct.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jcmarker.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jcmaster.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jcparam.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jcprepct.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jcsample.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jctrans.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jdapimin.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jdapistd.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jdatadst.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jdatasrc.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jdcoefct.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jddctmgr.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jdhuff.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jdinput.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jdmainct.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jdmarker.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jdmaster.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jdsample.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jdtrans.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jfdctflt.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jfdctfst.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jfdctint.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jidctflt.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jidctint.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jpegtran.c branches/reactos-yarotows/dll/3rdparty/libjpeg/jutils.c branches/reactos-yarotows/dll/3rdparty/libjpeg/libjpeg.rbuild branches/reactos-yarotows/dll/3rdparty/libjpeg/rdbmp.c branches/reactos-yarotows/dll/3rdparty/libjpeg/rdjpgcom.c branches/reactos-yarotows/dll/3rdparty/libjpeg/rdppm.c branches/reactos-yarotows/dll/3rdparty/libjpeg/rdswitch.c branches/reactos-yarotows/dll/3rdparty/libjpeg/transupp.c branches/reactos-yarotows/dll/3rdparty/libjpeg/wrppm.c branches/reactos-yarotows/dll/3rdparty/libpng/docs/ (props changed) branches/reactos-yarotows/dll/win32/dnsapi/dnsapi.rbuild branches/reactos-yarotows/dll/win32/dnsapi/dnsapi.spec branches/reactos-yarotows/dll/win32/msafd/include/helpers.h branches/reactos-yarotows/dll/win32/msafd/misc/helpers.c branches/reactos-yarotows/dll/win32/user32/user32.pspec branches/reactos-yarotows/dll/win32/user32/windows/cursoricon.c branches/reactos-yarotows/dll/win32/win32.rbuild branches/reactos-yarotows/dll/win32/windowscodecs/windowscodecs.rbuild branches/reactos-yarotows/dll/win32/ws2_32/misc/catalog.c branches/reactos-yarotows/drivers/network/afd/afd/main.c branches/reactos-yarotows/include/psdk/winsock2.h branches/reactos-yarotows/include/psdk/wsahelp.h branches/reactos-yarotows/include/reactos/libs/libjpeg/cderror.h branches/reactos-yarotows/include/reactos/libs/libjpeg/cdjpeg.h branches/reactos-yarotows/include/reactos/libs/libjpeg/jconfig.h branches/reactos-yarotows/include/reactos/libs/libjpeg/jdct.h branches/reactos-yarotows/include/reactos/libs/libjpeg/jerror.h branches/reactos-yarotows/include/reactos/libs/libjpeg/jmorecfg.h branches/reactos-yarotows/include/reactos/libs/libjpeg/jpegint.h branches/reactos-yarotows/include/reactos/libs/libjpeg/jpeglib.h branches/reactos-yarotows/include/reactos/libs/libjpeg/jversion.h branches/reactos-yarotows/include/reactos/libs/libjpeg/transupp.h branches/reactos-yarotows/include/reactos/win32k/ntuser.h branches/reactos-yarotows/include/reactos/wine/config.h branches/reactos-yarotows/subsystems/win32/csrss/win32csr/ (props changed) branches/reactos-yarotows/subsystems/win32/win32k/ntuser/simplecall.c branches/reactos-yarotows/subsystems/win32/win32k/w32ksvc.db [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/reactos-yarotows/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/base/applicati… Modified: branches/reactos-yarotows/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/boot/bootdata/… Modified: branches/reactos-yarotows/dll/3rdparty/3rdparty.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/3… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/README URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/ansi2knr.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Removed: branches/reactos-yarotows/dll/3rdparty/libjpeg/cderror.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Removed: branches/reactos-yarotows/dll/3rdparty/libjpeg/cdjpeg.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/change.log URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/cjpeg.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/ckconfig.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/djpeg.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/example.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jcapimin.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jccoefct.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jcdctmgr.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jchuff.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Removed: branches/reactos-yarotows/dll/3rdparty/libjpeg/jchuff.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jcinit.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jcmainct.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jcmarker.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jcmaster.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Removed: branches/reactos-yarotows/dll/3rdparty/libjpeg/jconfig.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jcparam.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Removed: branches/reactos-yarotows/dll/3rdparty/libjpeg/jcphuff.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jcprepct.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jcsample.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jctrans.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jdapimin.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jdapistd.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jdatadst.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jdatasrc.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jdcoefct.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Removed: branches/reactos-yarotows/dll/3rdparty/libjpeg/jdct.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jddctmgr.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jdhuff.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Removed: branches/reactos-yarotows/dll/3rdparty/libjpeg/jdhuff.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jdinput.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jdmainct.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jdmarker.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jdmaster.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Removed: branches/reactos-yarotows/dll/3rdparty/libjpeg/jdphuff.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jdsample.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jdtrans.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Removed: branches/reactos-yarotows/dll/3rdparty/libjpeg/jerror.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jfdctflt.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jfdctfst.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jfdctint.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jidctflt.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jidctint.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Removed: branches/reactos-yarotows/dll/3rdparty/libjpeg/jidctred.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Removed: branches/reactos-yarotows/dll/3rdparty/libjpeg/jinclude.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Removed: branches/reactos-yarotows/dll/3rdparty/libjpeg/jmemsys.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Removed: branches/reactos-yarotows/dll/3rdparty/libjpeg/jmorecfg.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Removed: branches/reactos-yarotows/dll/3rdparty/libjpeg/jpegexiforient.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Removed: branches/reactos-yarotows/dll/3rdparty/libjpeg/jpegint.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Removed: branches/reactos-yarotows/dll/3rdparty/libjpeg/jpeglib.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jpegtran.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/jutils.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Removed: branches/reactos-yarotows/dll/3rdparty/libjpeg/jversion.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/libjpeg.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Removed: branches/reactos-yarotows/dll/3rdparty/libjpeg/libjpeg.reactos.diff URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Removed: branches/reactos-yarotows/dll/3rdparty/libjpeg/makefile.ansi URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/rdbmp.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/rdjpgcom.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/rdppm.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/rdswitch.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/transupp.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Removed: branches/reactos-yarotows/dll/3rdparty/libjpeg/transupp.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/3rdparty/libjpeg/wrppm.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/3rdparty/l… Modified: branches/reactos-yarotows/dll/win32/dnsapi/dnsapi.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/dnsa… Modified: branches/reactos-yarotows/dll/win32/dnsapi/dnsapi.spec URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/dnsa… Removed: branches/reactos-yarotows/dll/win32/dnsapi/dnsapi/free.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/dnsa… Modified: branches/reactos-yarotows/dll/win32/msafd/include/helpers.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msaf… Modified: branches/reactos-yarotows/dll/win32/msafd/misc/helpers.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/msaf… Modified: branches/reactos-yarotows/dll/win32/user32/user32.pspec URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/user… Modified: branches/reactos-yarotows/dll/win32/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/user… Modified: branches/reactos-yarotows/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/win3… Modified: branches/reactos-yarotows/dll/win32/windowscodecs/windowscodecs.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/wind… Modified: branches/reactos-yarotows/dll/win32/ws2_32/misc/catalog.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/dll/win32/ws2_… Modified: branches/reactos-yarotows/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/drivers/networ… Modified: branches/reactos-yarotows/include/psdk/winsock2.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/psdk/w… Modified: branches/reactos-yarotows/include/psdk/wsahelp.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/psdk/w… Modified: branches/reactos-yarotows/include/reactos/libs/libjpeg/cderror.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/reacto… Modified: branches/reactos-yarotows/include/reactos/libs/libjpeg/cdjpeg.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/reacto… Removed: branches/reactos-yarotows/include/reactos/libs/libjpeg/jchuff.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/reacto… Modified: branches/reactos-yarotows/include/reactos/libs/libjpeg/jconfig.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/reacto… Modified: branches/reactos-yarotows/include/reactos/libs/libjpeg/jdct.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/reacto… Removed: branches/reactos-yarotows/include/reactos/libs/libjpeg/jdhuff.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/reacto… Modified: branches/reactos-yarotows/include/reactos/libs/libjpeg/jerror.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/reacto… Modified: branches/reactos-yarotows/include/reactos/libs/libjpeg/jmorecfg.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/reacto… Modified: branches/reactos-yarotows/include/reactos/libs/libjpeg/jpegint.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/reacto… Modified: branches/reactos-yarotows/include/reactos/libs/libjpeg/jpeglib.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/reacto… Modified: branches/reactos-yarotows/include/reactos/libs/libjpeg/jversion.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/reacto… Removed: branches/reactos-yarotows/include/reactos/libs/libjpeg/libjpeg.reactos.diff URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/reacto… Modified: branches/reactos-yarotows/include/reactos/libs/libjpeg/transupp.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/reacto… Modified: branches/reactos-yarotows/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/reacto… Modified: branches/reactos-yarotows/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/include/reacto… Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… Modified: branches/reactos-yarotows/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win…

14 years, 2 months

[cgutman] 48047: [WINSOCK] - Fix branch build

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Jul 14 19:49:37 2010 New Revision: 48047 URL: http://svn.reactos.org/svn/reactos?rev=48047&view=rev Log: [WINSOCK] - Fix branch build Modified: branches/aicom-network-branch/include/reactos/winsock/msafdlib.h Modified: branches/aicom-network-branch/include/reactos/winsock/msafdlib.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/include/re… ============================================================================== --- branches/aicom-network-branch/include/reactos/winsock/msafdlib.h [iso-8859-1] (original) +++ branches/aicom-network-branch/include/reactos/winsock/msafdlib.h [iso-8859-1] Wed Jul 14 19:49:37 2010 @@ -169,12 +169,15 @@ typedef INT (WINAPI *PICF_CONNECT)(PVOID IcfData); +typedef INT +(WINAPI *PICF_DISCONNECT)(PVOID IcfData); + typedef struct _SOCK_ICF_DATA { HANDLE IcfHandle; PVOID IcfOpenDynamicFwPort; PICF_CONNECT IcfConnect; - PVOID IcfDisconnect; + PICF_DISCONNECT IcfDisconnect; HINSTANCE DllHandle; } SOCK_ICF_DATA, *PSOCK_ICF_DATA;

14 years, 2 months

← Newer
1
...
31
32
33
34
35
36
37
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2010