Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 41482: comment out nt4compat usb driver, it doesn't compile
by tkreuzer＠svn.reactos.org 20 Jun '09

20 Jun '09

Author: tkreuzer Date: Sat Jun 20 16:36:25 2009 New Revision: 41482 URL: http://svn.reactos.org/svn/reactos?rev=41482&view=rev Log: comment out nt4compat usb driver, it doesn't compile Modified: branches/ros-amd64-bringup/reactos/drivers/usb/directory.rbuild Modified: branches/ros-amd64-bringup/reactos/drivers/usb/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/usb/directory.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/usb/directory.rbuild [iso-8859-1] Sat Jun 20 16:36:25 2009 @@ -1,9 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <directory name="nt4compat"> +  <!--directory name="usbd"> <xi:include href="usbd/usbd.rbuild" /> </directory>

1 0

[tkreuzer] 41481: comment out telnet for now, it doesn't compile
by tkreuzer＠svn.reactos.org 20 Jun '09

20 Jun '09

Author: tkreuzer Date: Sat Jun 20 16:31:02 2009 New Revision: 41481 URL: http://svn.reactos.org/svn/reactos?rev=41481&view=rev Log: comment out telnet for now, it doesn't compile Modified: branches/ros-amd64-bringup/reactos/base/applications/network/network.rbuild Modified: branches/ros-amd64-bringup/reactos/base/applications/network/network.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/network/network.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/network/network.rbuild [iso-8859-1] Sat Jun 20 16:31:02 2009 @@ -28,9 +28,9 @@ <directory name="route"> <xi:include href="route/route.rbuild" /> </directory> - <directory name="telnet"> +  <directory name="tracert"> <xi:include href="tracert/tracert.rbuild" /> </directory>

1 0

[tkreuzer] 41480: Fix 64bit issues, add a wine compatibility hack
by tkreuzer＠svn.reactos.org 20 Jun '09

20 Jun '09

Author: tkreuzer Date: Sat Jun 20 16:29:21 2009 New Revision: 41480 URL: http://svn.reactos.org/svn/reactos?rev=41480&view=rev Log: Fix 64bit issues, add a wine compatibility hack Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/include/ntwrapper.h branches/ros-amd64-bringup/reactos/dll/win32/user32/include/user32p.h Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/include/ntwrapper.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/include/ntwrapper.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/include/ntwrapper.h [iso-8859-1] Sat Jun 20 16:29:21 2009 @@ -85,7 +85,7 @@ } EXTINLINE DWORD WINAPI -DragObject(HWND hwnd1, HWND hwnd2, UINT u1, DWORD dw1, HCURSOR hc1) +DragObject(HWND hwnd1, HWND hwnd2, UINT u1, ULONG_PTR dw1, HCURSOR hc1) { return NtUserDragObject(hwnd1, hwnd2, u1, dw1, hc1); } @@ -96,7 +96,7 @@ return NtUserKillTimer(hWnd, IDEvent); } -EXTINLINE UINT_PTR WINAPI +EXTINLINE UINT WINAPI // FIXME: wine compatibility definition, should be UINT_PTR SetSystemTimer(HWND hWnd, UINT_PTR IDEvent, UINT Period, TIMERPROC TimerFunc) { return NtUserSetSystemTimer(hWnd, IDEvent, Period, TimerFunc); Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Sat Jun 20 16:29:21 2009 @@ -118,7 +118,7 @@ NtUserCallOneParam((DWORD)bShow, ONEPARAM_ROUTINE_SHOWCURSOR) #define NtUserGetDesktopMapping(Ptr) \ - (PVOID)NtUserCallOneParam((DWORD)Ptr, ONEPARAM_ROUTINE_GETDESKTOPMAPPING) + (PVOID)NtUserCallOneParam((DWORD_PTR)Ptr, ONEPARAM_ROUTINE_GETDESKTOPMAPPING) #define ShowCaret(hwnd) \ NtUserShowCaret(hwnd) @@ -127,7 +127,7 @@ NtUserHideCaret(hwnd) #define NtUserRegisterSystemClasses(Count,SysClasses) \ - (BOOL)NtUserCallTwoParam((DWORD)Count, (DWORD)SysClasses, TWOPARAM_ROUTINE_ROS_REGSYSCLASSES) + (BOOL)NtUserCallTwoParam(Count, (DWORD_PTR)SysClasses, TWOPARAM_ROUTINE_ROS_REGSYSCLASSES) /* Internal Thread Data */ extern HINSTANCE User32Instance;

1 0

[tkreuzer] 41479: Remove usage of RETURN() macro
by tkreuzer＠svn.reactos.org 20 Jun '09

20 Jun '09

Author: tkreuzer Date: Sat Jun 20 16:14:20 2009 New Revision: 41479 URL: http://svn.reactos.org/svn/reactos?rev=41479&view=rev Log: Remove usage of RETURN() macro Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Sat Jun 20 16:14:20 2009 @@ -102,29 +102,31 @@ break; case THREADSTATE_INSENDMESSAGE: { - DWORD Ret = ISMEX_NOSEND; PUSER_MESSAGE_QUEUE MessageQueue = ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->MessageQueue; DPRINT1("THREADSTATE_INSENDMESSAGE\n"); + ret = ISMEX_NOSEND; if (!IsListEmpty(&MessageQueue->SentMessagesListHead)) { - Ret = ISMEX_SEND; + ret = ISMEX_SEND; } else if (!IsListEmpty(&MessageQueue->NotifyMessagesListHead)) { /* FIXME Need to set message flag when in callback mode with notify */ - Ret = ISMEX_NOTIFY; + ret = ISMEX_NOTIFY; } /* FIXME Need to set message flag if replied to or ReplyMessage */ - RETURN( Ret); + break; } case THREADSTATE_GETMESSAGETIME: /* FIXME Needs more work! */ - RETURN( ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->timeLast); + ret = ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->timeLast; + break; case THREADSTATE_GETINPUTSTATE: - RETURN( HIWORD(IntGetQueueStatus(FALSE)) & (QS_KEY | QS_MOUSEBUTTON)); + ret = HIWORD(IntGetQueueStatus(FALSE)) & (QS_KEY | QS_MOUSEBUTTON); + break; } DPRINT("Leave NtUserGetThreadState, ret=%i\n", ret);

1 0

[tkreuzer] 41478: Fix "no newline at end of file"
by tkreuzer＠svn.reactos.org 20 Jun '09

20 Jun '09

Author: tkreuzer Date: Sat Jun 20 15:45:31 2009 New Revision: 41478 URL: http://svn.reactos.org/svn/reactos?rev=41478&view=rev Log: Fix "no newline at end of file" Modified: branches/ros-amd64-bringup/reactos/base/applications/mplay32/mplay32.c Modified: branches/ros-amd64-bringup/reactos/base/applications/mplay32/mplay32.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] Sat Jun 20 15:45:31 2009 @@ -709,4 +709,4 @@ } return 0; -} +}

1 0

[dreimer] 41477: Oops, small remnant of a prerelease test...
by dreimer＠svn.reactos.org 20 Jun '09

20 Jun '09

Author: dreimer Date: Sat Jun 20 15:39:43 2009 New Revision: 41477 URL: http://svn.reactos.org/svn/reactos?rev=41477&view=rev Log: Oops, small remnant of a prerelease test... Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Sat Jun 20 15:39:43 2009 @@ -32,7 +32,7 @@ :: First check for a new Updater for %%F in (update.cmd) do set _ROSBE_UPDDATE=%%~tF -rem "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/update.cmd 1> NUL 2> NUL +"Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/update.cmd 1> NUL 2> NUL for %%F in (update.cmd) do set _ROSBE_UPDDATE2=%%~tF if !_ROSBE_UPDDATE! NEQ !_ROSBE_UPDDATE2! ( cls

1 0

[tkreuzer] 41476: fix x86 compilation
by tkreuzer＠svn.reactos.org 20 Jun '09

20 Jun '09

Author: tkreuzer Date: Sat Jun 20 15:21:33 2009 New Revision: 41476 URL: http://svn.reactos.org/svn/reactos?rev=41476&view=rev Log: fix x86 compilation Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/mktime.c Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/mktime.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/mktime.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new/mktime.c [iso-8859-1] Sat Jun 20 15:21:33 2009 @@ -76,7 +76,7 @@ } /* Finally get normalized tm struct */ - ptm2 = gmtime(&time); + ptm2 = _gmtime64(&time); if (!ptm2) { return -1;

1 0

[tkreuzer] 41475: Fix outdated rbuild flags
by tkreuzer＠svn.reactos.org 20 Jun '09

20 Jun '09

Author: tkreuzer Date: Sat Jun 20 15:05:46 2009 New Revision: 41475 URL: http://svn.reactos.org/svn/reactos?rev=41475&view=rev Log: Fix outdated rbuild flags Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React… ============================================================================== --- branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] Sat Jun 20 15:05:46 2009 @@ -70,41 +70,41 @@ <property name="VERSION_TARGET" value="NT52" /> <if property="VERSION_TARGET" value="NT4"> - <define name="WINVER" overridable="true">0x400</define> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT" overridable="true">0x400</define> + <define name="WINVER">0x400</define> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x400</define> <define name="_WIN32_WINDOWS">0x400</define> <define name="_SETUPAPI_VER">0x400</define> </if> <if property="VERSION_TARGET" value="NT5"> - <define name="WINVER" overridable="true">0x500</define> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT" overridable="true">0x500</define> + <define name="WINVER">0x500</define> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x500</define> <define name="_WIN32_WINDOWS">0x500</define> <define name="_SETUPAPI_VER">0x500</define> </if> <if property="VERSION_TARGET" value="NT51"> - <define name="WINVER" overridable="true">0x501</define> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT" overridable="true">0x501</define> + <define name="WINVER">0x501</define> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> <define name="_WIN32_WINDOWS">0x501</define> <define name="_SETUPAPI_VER">0x501</define> </if> <if property="VERSION_TARGET" value="NT52"> - <define name="WINVER" overridable="true">0x502</define> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT" overridable="true">0x502</define> + <define name="WINVER">0x502</define> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x502</define> <define name="_WIN32_WINDOWS">0x502</define> <define name="_SETUPAPI_VER">0x502</define> </if> <if property="VERSION_TARGET" value="NT6"> - <define name="WINVER" overridable="true">0x600</define> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT" overridable="true">0x600</define> + <define name="WINVER">0x600</define> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x600</define> <define name="_WIN32_WINDOWS">0x600</define> <define name="_SETUPAPI_VER">0x600</define> </if>

1 0

[cwittich] 41474: partial dbghelp wine sync
by cwittich＠svn.reactos.org 19 Jun '09

19 Jun '09

Author: cwittich Date: Sat Jun 20 02:14:54 2009 New Revision: 41474 URL: http://svn.reactos.org/svn/reactos?rev=41474&view=rev Log: partial dbghelp wine sync Modified: trunk/reactos/dll/win32/dbghelp/dbghelp_private.h trunk/reactos/dll/win32/dbghelp/storage.c Modified: trunk/reactos/dll/win32/dbghelp/dbghelp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp_… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dbghelp_private.h [iso-8859-1] Sat Jun 20 02:14:54 2009 @@ -78,11 +78,17 @@ struct hash_table_elt* next; }; +struct hash_table_bucket +{ + struct hash_table_elt* first; + struct hash_table_elt* last; +}; + struct hash_table { unsigned num_elts; unsigned num_buckets; - struct hash_table_elt** buckets; + struct hash_table_bucket* buckets; struct pool* pool; }; @@ -90,7 +96,6 @@ unsigned num_buckets); void hash_table_destroy(struct hash_table* ht); void hash_table_add(struct hash_table* ht, struct hash_table_elt* elt); -void* hash_table_find(const struct hash_table* ht, const char* name); unsigned hash_table_hash(const char* name, unsigned num_buckets); struct hash_table_iter Modified: trunk/reactos/dll/win32/dbghelp/storage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/storage.… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/storage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/storage.c [iso-8859-1] Sat Jun 20 02:14:54 2009 @@ -361,36 +361,30 @@ void hash_table_add(struct hash_table* ht, struct hash_table_elt* elt) { unsigned hash = hash_table_hash(elt->name, ht->num_buckets); - struct hash_table_elt** p; if (!ht->buckets) { - ht->buckets = pool_alloc(ht->pool, ht->num_buckets * sizeof(struct hash_table_elt*)); + ht->buckets = pool_alloc(ht->pool, ht->num_buckets * sizeof(struct hash_table_bucket)); assert(ht->buckets); - memset(ht->buckets, 0, ht->num_buckets * sizeof(struct hash_table_elt*)); + memset(ht->buckets, 0, ht->num_buckets * sizeof(struct hash_table_bucket)); } /* in some cases, we need to get back the symbols of same name in the order * in which they've been inserted. So insert new elements at the end of the list. */ - for (p = &ht->buckets[hash]; *p; p = &((*p)->next)); - *p = elt; + if (!ht->buckets[hash].first) + { + ht->buckets[hash].first = elt; + } + else + { + ht->buckets[hash].last->next = elt; + } + ht->buckets[hash].last = elt; elt->next = NULL; ht->num_elts++; } -void* hash_table_find(const struct hash_table* ht, const char* name) -{ - unsigned hash = hash_table_hash(name, ht->num_buckets); - struct hash_table_elt* elt; - - if(!ht->buckets) return NULL; - - for (elt = ht->buckets[hash]; elt; elt = elt->next) - if (!strcmp(name, elt->name)) return elt; - return NULL; -} - void hash_table_iter_init(const struct hash_table* ht, struct hash_table_iter* hti, const char* name) { @@ -410,10 +404,10 @@ void* hash_table_iter_up(struct hash_table_iter* hti) { - if(!hti->ht->buckets) return NULL; + if (!hti->ht->buckets) return NULL; if (hti->element) hti->element = hti->element->next; while (!hti->element && hti->index < hti->last) - hti->element = hti->ht->buckets[++hti->index]; + hti->element = hti->ht->buckets[++hti->index].first; return hti->element; }

1 0

[cwittich] 41473: improve some more Lsa stubs
by cwittich＠svn.reactos.org 19 Jun '09

19 Jun '09

Author: cwittich Date: Sat Jun 20 02:08:02 2009 New Revision: 41473 URL: http://svn.reactos.org/svn/reactos?rev=41473&view=rev Log: improve some more Lsa stubs Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Sat Jun 20 02:08:02 2009 @@ -183,7 +183,7 @@ ULONG CountOfRights) { FIXME("(%p,%p,%p,0x%08x) stub\n", PolicyHandle, AccountSid, UserRights, CountOfRights); - return STATUS_NOT_IMPLEMENTED; + return STATUS_OBJECT_NAME_NOT_FOUND; } /* @@ -213,7 +213,7 @@ PSID TrustedDomainSid) { FIXME("(%p,%p) stub\n", PolicyHandle, TrustedDomainSid); - return STATUS_NOT_IMPLEMENTED; + return STATUS_SUCCESS; } /* @@ -245,7 +245,7 @@ PULONG CountReturned) { FIXME("(%p,%p,%p,%p) stub\n", PolicyHandle, UserRights, EnumerationBuffer, CountReturned); - return STATUS_NOT_IMPLEMENTED; + return STATUS_NO_MORE_ENTRIES; } /* @@ -262,7 +262,9 @@ { FIXME("(%p,%p,%p,0x%08x,%p) stub\n", PolicyHandle, EnumerationContext, Buffer, PreferedMaximumLength, CountReturned); - return STATUS_NOT_IMPLEMENTED; + + if (CountReturned) *CountReturned = 0; + return STATUS_SUCCESS; } /* @@ -279,7 +281,8 @@ { FIXME("(%p,%p,%p,0x%08x,%p) stub\n", PolicyHandle, EnumerationContext, Buffer, PreferedMaximumLength, CountReturned); - return STATUS_NOT_IMPLEMENTED; + if (CountReturned) *CountReturned = 0; + return STATUS_SUCCESS; } /* @@ -477,7 +480,7 @@ PLSA_HANDLE TrustedDomainHandle) { FIXME("(%p,%p,0x%08x,%p) stub\n", PolicyHandle, TrustedDomainName, DesiredAccess, TrustedDomainHandle); - return STATUS_NOT_IMPLEMENTED; + return STATUS_OBJECT_NAME_NOT_FOUND; } /* @@ -615,7 +618,7 @@ PVOID *Buffer) { FIXME("(%p,%p,%d,%p) stub\n", PolicyHandle, TrustedDomainName, InformationClass, Buffer); - return STATUS_NOT_IMPLEMENTED; + return STATUS_OBJECT_NAME_NOT_FOUND; } /* @@ -630,7 +633,7 @@ PVOID *Buffer) { FIXME("(%p,%p,%d,%p) stub\n", PolicyHandle, TrustedDomainSid, InformationClass, Buffer); - return STATUS_NOT_IMPLEMENTED; + return STATUS_OBJECT_NAME_NOT_FOUND; } /* @@ -646,7 +649,7 @@ ULONG CountOfRights) { FIXME("(%p,%p,%d,%p,0x%08x) stub\n", PolicyHandle, AccountSid, AllRights, UserRights, CountOfRights); - return STATUS_NOT_IMPLEMENTED; + return STATUS_SUCCESS; } /* @@ -688,7 +691,7 @@ PVOID Buffer) { FIXME("(%p,0x%08x,%p) stub\n", PolicyHandle, InformationClass, Buffer); - return STATUS_NOT_IMPLEMENTED; + return STATUS_UNSUCCESSFUL; } /* @@ -719,7 +722,7 @@ PVOID Buffer) { FIXME("(%p,%p,%d,%p) stub\n", PolicyHandle, TrustedDomainName, InformationClass, Buffer); - return STATUS_NOT_IMPLEMENTED; + return STATUS_SUCCESS; } /* @@ -734,7 +737,7 @@ PVOID Buffer) { FIXME("(%p,%p,%d,%p) stub\n", PolicyHandle, TrustedDomainSid, InformationClass, Buffer); - return STATUS_NOT_IMPLEMENTED; + return STATUS_SUCCESS; } /* @@ -748,7 +751,7 @@ PLSA_UNICODE_STRING PrivateData) { FIXME("(%p,%p,%p) stub\n", PolicyHandle, KeyName, PrivateData); - return STATUS_NOT_IMPLEMENTED; + return STATUS_OBJECT_NAME_NOT_FOUND; } /*

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs