Ros-diffs July 2009

ros-diffs@reactos.org

27 participants
605 discussions

[dchapyshev] 42111: - Fix types of parameters for WPUFDIsSet, WSCInstallProvider
by dchapyshev＠svn.reactos.org 21 Jul '09

21 Jul '09

Author: dchapyshev Date: Tue Jul 21 10:59:30 2009 New Revision: 42111 URL: http://svn.reactos.org/svn/reactos?rev=42111&view=rev Log: - Fix types of parameters for WPUFDIsSet, WSCInstallProvider Modified: trunk/reactos/dll/win32/ws2_32/include/upcall.h trunk/reactos/dll/win32/ws2_32/misc/stubs.c trunk/reactos/dll/win32/ws2_32/misc/upcall.c Modified: trunk/reactos/dll/win32/ws2_32/include/upcall.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/u… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/include/upcall.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/include/upcall.h [iso-8859-1] Tue Jul 21 10:59:30 2009 @@ -37,7 +37,7 @@ IN DWORD dwContext, OUT LPINT lpErrno); -SOCKET +int WSPAPI WPUFDIsSet( IN SOCKET s, Modified: trunk/reactos/dll/win32/ws2_32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] Tue Jul 21 10:59:30 2009 @@ -775,8 +775,8 @@ */ INT EXPORT -WSCInstallProvider(IN CONST LPGUID lpProviderId, - IN CONST LPWSTR lpszProviderDllPath, +WSCInstallProvider(IN LPGUID lpProviderId, + IN CONST WCHAR* lpszProviderDllPath, IN CONST LPWSAPROTOCOL_INFOW lpProtocolInfoList, IN DWORD dwNumberOfEntries, OUT LPINT lpErrno) Modified: trunk/reactos/dll/win32/ws2_32/misc/upcall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/upca… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/upcall.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/upcall.c [iso-8859-1] Tue Jul 21 10:59:30 2009 @@ -84,7 +84,7 @@ /* * @unimplemented */ -SOCKET +int WSPAPI WPUFDIsSet(IN SOCKET s, IN LPFD_SET set)

1 0

[jimtabor] 42110: - [Win32k] Update class structure and fixed on class wine test.
by jimtabor＠svn.reactos.org 21 Jul '09

21 Jul '09

Author: jimtabor Date: Tue Jul 21 04:56:24 2009 New Revision: 42110 URL: http://svn.reactos.org/svn/reactos?rev=42110&view=rev Log: - [Win32k] Update class structure and fixed on class wine test. Modified: trunk/reactos/dll/win32/user32/windows/class.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/menu.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/class.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/class.c [iso-8859-1] Tue Jul 21 04:56:24 2009 @@ -136,6 +136,8 @@ WNDCLASSEXA wcex; BOOL retval; + if (!hInstance) hInstance = User32Instance; + retval = GetClassInfoExA(hInstance, lpClassName, &wcex); if (retval) { @@ -143,7 +145,7 @@ lpWndClass->lpfnWndProc = wcex.lpfnWndProc; lpWndClass->cbClsExtra = wcex.cbClsExtra; lpWndClass->cbWndExtra = wcex.cbWndExtra; - lpWndClass->hInstance = wcex.hInstance; + lpWndClass->hInstance = (User32Instance == hInstance) ? 0 : wcex.hInstance; lpWndClass->hIcon = wcex.hIcon; lpWndClass->hCursor = wcex.hCursor; lpWndClass->hbrBackground = wcex.hbrBackground; @@ -167,6 +169,8 @@ WNDCLASSEXW wcex; BOOL retval; + if (!hInstance) hInstance = User32Instance; + retval = GetClassInfoExW(hInstance, lpClassName, &wcex); if (retval) { @@ -174,7 +178,7 @@ lpWndClass->lpfnWndProc = wcex.lpfnWndProc; lpWndClass->cbClsExtra = wcex.cbClsExtra; lpWndClass->cbWndExtra = wcex.cbWndExtra; - lpWndClass->hInstance = wcex.hInstance; + lpWndClass->hInstance = (User32Instance == hInstance) ? 0 : wcex.hInstance; lpWndClass->hIcon = wcex.hIcon; lpWndClass->hCursor = wcex.hCursor; lpWndClass->hbrBackground = wcex.hbrBackground; @@ -208,7 +212,7 @@ if (nIndex >= 0) { if (nIndex + sizeof(ULONG_PTR) < nIndex || - nIndex + sizeof(ULONG_PTR) > Class->ClsExtra) + nIndex + sizeof(ULONG_PTR) > Class->cbclsExtra) { SetLastError(ERROR_INVALID_PARAMETER); } @@ -220,11 +224,11 @@ switch (nIndex) { case GCL_CBWNDEXTRA: - Ret = (ULONG_PTR)Class->WndExtra; + Ret = (ULONG_PTR)Class->cbwndExtra; break; case GCL_CBCLSEXTRA: - Ret = (ULONG_PTR)Class->ClsExtra; + Ret = (ULONG_PTR)Class->cbclsExtra; break; case GCL_HBRBACKGROUND: @@ -234,7 +238,7 @@ break; case GCL_HMODULE: - Ret = (ULONG_PTR)Class->hInstance; + Ret = (ULONG_PTR)Class->hModule; break; case GCL_MENUNAME: @@ -242,11 +246,11 @@ break; case GCL_STYLE: - Ret = (ULONG_PTR)Class->Style; + Ret = (ULONG_PTR)Class->style; break; case GCW_ATOM: - Ret = (ULONG_PTR)Class->Atom; + Ret = (ULONG_PTR)Class->atomClassName; break; case GCLP_HCURSOR: @@ -321,7 +325,7 @@ if (nIndex >= 0) { if (nIndex + sizeof(ULONG_PTR) < nIndex || - nIndex + sizeof(ULONG_PTR) > Class->ClsExtra) + nIndex + sizeof(ULONG_PTR) > Class->cbclsExtra) { SetLastError(ERROR_INVALID_PARAMETER); } @@ -333,11 +337,11 @@ switch (nIndex) { case GCL_CBWNDEXTRA: - Ret = (ULONG_PTR)Class->WndExtra; + Ret = (ULONG_PTR)Class->cbwndExtra; break; case GCL_CBCLSEXTRA: - Ret = (ULONG_PTR)Class->ClsExtra; + Ret = (ULONG_PTR)Class->cbclsExtra; break; case GCL_HBRBACKGROUND: @@ -347,7 +351,7 @@ break; case GCL_HMODULE: - Ret = (ULONG_PTR)Class->hInstance; + Ret = (ULONG_PTR)Class->hModule; break; case GCL_MENUNAME: @@ -355,11 +359,11 @@ break; case GCL_STYLE: - Ret = (ULONG_PTR)Class->Style; + Ret = (ULONG_PTR)Class->style; break; case GCW_ATOM: - Ret = (ULONG_PTR)Class->Atom; + Ret = (ULONG_PTR)Class->atomClassName; break; case GCLP_HCURSOR: Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue Jul 21 04:56:24 2009 @@ -98,40 +98,52 @@ UINT Unicode : 1; } CALLPROC, *PCALLPROC; +#define CSF_SERVERSIDEPROC 0x0001 +#define CSF_ANSIPROC 0x0002 +#define CSF_WOWDEFERDESTROY 0x0004 +#define CSF_SYSTEMCLASS 0x0008 +#define CSF_WOWCLASS 0x0010 +#define CSF_WOWEXTRA 0x0020 +#define CSF_CACHEDSMICON 0x0040 +#define CSF_WIN40COMPAT 0x0080 + typedef struct _WINDOWCLASS { - struct _WINDOWCLASS *Next; - struct _WINDOWCLASS *Clone; - struct _WINDOWCLASS *Base; + struct _WINDOWCLASS *pclsNext; + RTL_ATOM atomClassName; + ATOM atomNVClassName; + DWORD fnid; // New ClassId struct _DESKTOP *rpdeskParent; - RTL_ATOM Atom; - ULONG Windows; - - UINT Style; - WNDPROC WndProc; + PVOID pdce; + DWORD CSF_flags; + PSTR lpszClientAnsiMenuName; + PWSTR lpszClientUnicodeMenuName; + HANDLE hMenu; /* FIXME - Use pointer! */ + PCALLPROC spcpdFirst; + struct _WINDOWCLASS *pclsBase; + struct _WINDOWCLASS *pclsClone; + ULONG cWndReferenceCount; + UINT style; + WNDPROC lpfnWndProc; union { WNDPROC WndProcExtra; PCALLPROC CallProc; }; - PCALLPROC CallProcList; - INT ClsExtra; - INT WndExtra; - PVOID Dce; - DWORD fnID; // New ClassId - HINSTANCE hInstance; + INT cbclsExtra; + INT cbwndExtra; + HINSTANCE hModule; HANDLE hIcon; /* FIXME - Use pointer! */ - HANDLE hIconSm; /* FIXME - Use pointer! */ HANDLE hCursor; /* FIXME - Use pointer! */ HBRUSH hbrBackground; - HANDLE hMenu; /* FIXME - Use pointer! */ PWSTR MenuName; PSTR AnsiMenuName; + HANDLE hIconSm; /* FIXME - Use pointer! */ UINT Destroying : 1; UINT Unicode : 1; - UINT System : 1; - UINT Global : 1; + UINT System : 1; // CSF_SYSTEMCLASS + UINT Global : 1; // CS_GLOBALCLASS UINT MenuNameIsString : 1; UINT NotUsed : 27; } WINDOWCLASS, *PWINDOWCLASS; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Tue Jul 21 04:56:24 2009 @@ -90,15 +90,15 @@ IntDestroyClass(IN OUT PWINDOWCLASS Class) { /* there shouldn't be any clones anymore */ - ASSERT(Class->Windows == 0); - ASSERT(Class->Clone == NULL); - - if (Class->Base == Class) + ASSERT(Class->cWndReferenceCount == 0); + ASSERT(Class->pclsClone == NULL); + + if (Class->pclsBase == Class) { PCALLPROC CallProc, NextCallProc; /* Destroy allocated callproc handles */ - CallProc = Class->CallProcList; + CallProc = Class->spcpdFirst; while (CallProc != NULL) { NextCallProc = CallProc->Next; @@ -110,10 +110,10 @@ CallProc = NextCallProc; } - if (Class->Dce) - { - DceFreeClassDCE(((PDCE)Class->Dce)->hDC); - Class->Dce = NULL; + if (Class->pdce) + { + DceFreeClassDCE(((PDCE)Class->pdce)->hDC); + Class->pdce = NULL; } IntFreeClassMenuName(Class); @@ -144,9 +144,9 @@ Class = pi->LocalClassList; while (Class != NULL) { - pi->LocalClassList = Class->Next; - - ASSERT(Class->Base == Class); + pi->LocalClassList = Class->pclsNext; + + ASSERT(Class->pclsBase == Class); IntDestroyClass(Class); Class = pi->LocalClassList; @@ -156,9 +156,9 @@ Class = pi->GlobalClassList; while (Class != NULL) { - pi->GlobalClassList = Class->Next; - - ASSERT(Class->Base == Class); + pi->GlobalClassList = Class->pclsNext; + + ASSERT(Class->pclsBase == Class); IntDestroyClass(Class); Class = pi->GlobalClassList; @@ -168,9 +168,9 @@ Class = pi->SystemClassList; while (Class != NULL) { - pi->SystemClassList = Class->Next; - - ASSERT(Class->Base == Class); + pi->SystemClassList = Class->pclsNext; + + ASSERT(Class->pclsBase == Class); IntDestroyClass(Class); Class = pi->SystemClassList; @@ -245,7 +245,7 @@ { PCALLPROC CallProc; - CallProc = Class->CallProcList; + CallProc = Class->spcpdFirst; while (CallProc != NULL) { if (CallProc->WndProc == WndProc && @@ -268,17 +268,17 @@ ASSERT(CallProc->Next == NULL); - BaseClass = Class->Base; + BaseClass = Class->pclsBase; ASSERT(CallProc->Next == NULL); - CallProc->Next = BaseClass->CallProcList; - BaseClass->CallProcList = CallProc; + CallProc->Next = BaseClass->spcpdFirst; + BaseClass->spcpdFirst = CallProc; /* Update all clones */ - Class = Class->Clone; + Class = Class->pclsClone; while (Class != NULL) { - Class->CallProcList = BaseClass->CallProcList; - Class = Class->Next; + Class->spcpdFirst = BaseClass->spcpdFirst; + Class = Class->pclsNext; } } @@ -289,7 +289,7 @@ RTL_ATOM Atom = (RTL_ATOM)0; /* update the base class first */ - Class = Class->Base; + Class = Class->pclsBase; if (!IntRegisterClassAtom(ClassName, &Atom)) @@ -297,17 +297,17 @@ return FALSE; } - IntDeregisterClassAtom(Class->Atom); - - Class->Atom = Atom; + IntDeregisterClassAtom(Class->atomClassName); + + Class->atomClassName = Atom; /* update the clones */ - Class = Class->Clone; + Class = Class->pclsClone; while (Class != NULL) { - Class->Atom = Atom; - - Class = Class->Next; + Class->atomClassName = Atom; + + Class = Class->pclsNext; } return TRUE; @@ -322,13 +322,13 @@ if (Class->System) { - return (Ansi ? Class->WndProcExtra : Class->WndProc); + return (Ansi ? Class->WndProcExtra : Class->lpfnWndProc); } else { if (!Ansi == Class->Unicode) { - return Class->WndProc; + return Class->lpfnWndProc; } else { @@ -336,7 +336,7 @@ /* make sure the call procedures are located on the desktop of the base class! */ - BaseClass = Class->Base; + BaseClass = Class->pclsBase; Class = BaseClass; if (Class->CallProc != NULL) @@ -351,12 +351,12 @@ return NULL; NewCallProc = UserFindCallProc(Class, - Class->WndProc, + Class->lpfnWndProc, Class->Unicode); if (NewCallProc == NULL) { NewCallProc = CreateCallProc(NULL, - Class->WndProc, + Class->lpfnWndProc, Class->Unicode, pi); if (NewCallProc == NULL) @@ -372,12 +372,12 @@ Class->CallProc = NewCallProc; /* update the clones */ - Class = Class->Clone; + Class = Class->pclsClone; while (Class != NULL) { Class->CallProc = NewCallProc; - Class = Class->Next; + Class = Class->pclsNext; } return GetCallProcHandle(NewCallProc); @@ -395,13 +395,13 @@ if (Class->System) { - DPRINT1("Attempted to change window procedure of system window class 0x%p!\n", Class->Atom); + DPRINT1("Attempted to change window procedure of system window class 0x%p!\n", Class->atomClassName); SetLastWin32Error(ERROR_ACCESS_DENIED); return NULL; } /* update the base class first */ - Class = Class->Base; + Class = Class->pclsBase; /* resolve any callproc handle if possible */ if (IsCallProcHandle(WndProc)) @@ -426,16 +426,16 @@ /* update the class info */ Class->Unicode = !Ansi; - Class->WndProc = WndProc; + Class->lpfnWndProc = WndProc; /* update the clones */ - Class = Class->Clone; + Class = Class->pclsClone; while (Class != NULL) { Class->Unicode = !Ansi; - Class->WndProc = WndProc; - - Class = Class->Next; + Class->lpfnWndProc = WndProc; + + Class = Class->pclsNext; } return Ret; @@ -450,7 +450,7 @@ PWINDOWCLASS Class; ASSERT(Desktop != NULL); - ASSERT(BaseClass->Base == BaseClass); + ASSERT(BaseClass->pclsBase == BaseClass); if (BaseClass->rpdeskParent == Desktop) { @@ -462,8 +462,8 @@ if (BaseClass->rpdeskParent == NULL) { - ASSERT(BaseClass->Windows == 0); - ASSERT(BaseClass->Clone == NULL); + ASSERT(BaseClass->cWndReferenceCount == 0); + ASSERT(BaseClass->pclsClone == NULL); /* Classes are also located in the shared heap when the class was created before the thread attached to a desktop. As soon @@ -476,17 +476,17 @@ { /* The user is asking for a class object on a different desktop, try to find one! */ - Class = BaseClass->Clone; + Class = BaseClass->pclsClone; while (Class != NULL) { if (Class->rpdeskParent == Desktop) { - ASSERT(Class->Base == BaseClass); - ASSERT(Class->Clone == NULL); + ASSERT(Class->pclsBase == BaseClass); + ASSERT(Class->pclsClone == NULL); break; } - Class = Class->Next; + Class = Class->pclsNext; } } @@ -494,7 +494,7 @@ { /* The window is created on a different desktop, we need to clone the class object to the desktop heap of the window! */ - ClassSize = sizeof(*BaseClass) + (SIZE_T)BaseClass->ClsExtra; + ClassSize = sizeof(*BaseClass) + (SIZE_T)BaseClass->cbclsExtra; Class = DesktopHeapAlloc(Desktop, ClassSize); @@ -507,7 +507,7 @@ /* update some pointers and link the class */ Class->rpdeskParent = Desktop; - Class->Windows = 0; + Class->cWndReferenceCount = 0; if (BaseClass->rpdeskParent == NULL) { @@ -515,27 +515,27 @@ heap anymore, delete it so the only class left is the clone we just created, which now serves as the new base class */ - ASSERT(BaseClass->Clone == NULL); - ASSERT(Class->Clone == NULL); - Class->Base = Class; - Class->Next = BaseClass->Next; + ASSERT(BaseClass->pclsClone == NULL); + ASSERT(Class->pclsClone == NULL); + Class->pclsBase = Class; + Class->pclsNext = BaseClass->pclsNext; /* replace the base class */ (void)InterlockedExchangePointer((PVOID*)ClassLink, Class); /* destroy the obsolete copy on the shared heap */ - BaseClass->Base = NULL; - BaseClass->Clone = NULL; + BaseClass->pclsBase = NULL; + BaseClass->pclsClone = NULL; IntDestroyClass(BaseClass); } else { /* link in the clone */ - Class->Clone = NULL; - Class->Base = BaseClass; - Class->Next = BaseClass->Clone; - (void)InterlockedExchangePointer(&BaseClass->Clone, + Class->pclsClone = NULL; + Class->pclsBase = BaseClass; + Class->pclsNext = BaseClass->pclsClone; + (void)InterlockedExchangePointer(&BaseClass->pclsClone, Class); } } @@ -555,14 +555,14 @@ { PWINDOWCLASS Class; - ASSERT(BaseClass->Base == BaseClass); + ASSERT(BaseClass->pclsBase == BaseClass); Class = IntGetClassForDesktop(BaseClass, ClassLink, Desktop); if (Class != NULL) { - Class->Windows++; + Class->cWndReferenceCount++; } return Class; @@ -575,34 +575,34 @@ { PWINDOWCLASS Clone, BaseClass; - ASSERT(Class->Base != Class); - ASSERT(Class->Base->Clone != NULL); + ASSERT(Class->pclsBase != Class); + ASSERT(Class->pclsBase->pclsClone != NULL); ASSERT(Class->rpdeskParent != NULL); - ASSERT(Class->Windows != 0); - ASSERT(Class->Base->rpdeskParent != NULL); - ASSERT(Class->Base->Windows == 0); + ASSERT(Class->cWndReferenceCount != 0); + ASSERT(Class->pclsBase->rpdeskParent != NULL); + ASSERT(Class->pclsBase->cWndReferenceCount == 0); /* unlink the clone */ - *CloneLink = Class->Next; - Class->Clone = Class->Base->Clone; - - BaseClass = Class->Base; + *CloneLink = Class->pclsNext; + Class->pclsClone = Class->pclsBase->pclsClone; + + BaseClass = Class->pclsBase; /* update the class information to make it a base class */ - Class->Base = Class; - Class->Next = (*BaseClassLink)->Next; + Class->pclsBase = Class; + Class->pclsNext = (*BaseClassLink)->pclsNext; /* update all clones */ - Clone = Class->Clone; + Clone = Class->pclsClone; while (Clone != NULL) { - ASSERT(Clone->Clone == NULL); - Clone->Base = Class; + ASSERT(Clone->pclsClone == NULL); + Clone->pclsBase = Class; if (!Class->System) Clone->CallProc = Class->CallProc; - Clone = Clone->Next; + Clone = Clone->pclsNext; } /* link in the new base class */ @@ -617,19 +617,19 @@ { PWINDOWCLASS *PrevLink, BaseClass, CurrentClass; - BaseClass = Class->Base; - - if (--Class->Windows == 0) + BaseClass = Class->pclsBase; + + if (--Class->cWndReferenceCount == 0) { if (BaseClass == Class) { - ASSERT(Class->Base == Class); + ASSERT(Class->pclsBase == Class); /* check if there are clones of the class on other desktops, link the first clone in if possible. If there are no clones then leave the class on the desktop heap. It will get moved to the shared heap when the thread detaches. */ - if (BaseClass->Clone != NULL) + if (BaseClass->pclsClone != NULL) { if (BaseClass->System) PrevLink = &pi->SystemClassList; @@ -643,45 +643,45 @@ { ASSERT(CurrentClass != NULL); - PrevLink = &CurrentClass->Next; - CurrentClass = CurrentClass->Next; + PrevLink = &CurrentClass->pclsNext; + CurrentClass = CurrentClass->pclsNext; } ASSERT(*PrevLink == BaseClass); /* make the first clone become the new base class */ - IntMakeCloneBaseClass(BaseClass->Clone, + IntMakeCloneBaseClass(BaseClass->pclsClone, PrevLink, - &BaseClass->Clone); + &BaseClass->pclsClone); /* destroy the class, there's still another clone of the class that now serves as a base class. Make sure we don't destruct resources shared by all classes (Base = NULL)! */ - BaseClass->Base = NULL; - BaseClass->Clone = NULL; + BaseClass->pclsBase = NULL; + BaseClass->pclsClone = NULL; IntDestroyClass(BaseClass); } } else { /* locate the cloned class and unlink it */ - PrevLink = &BaseClass->Clone; - CurrentClass = BaseClass->Clone; + PrevLink = &BaseClass->pclsClone; + CurrentClass = BaseClass->pclsClone; while (CurrentClass != Class) { ASSERT(CurrentClass != NULL); - PrevLink = &CurrentClass->Next; - CurrentClass = CurrentClass->Next; + PrevLink = &CurrentClass->pclsNext; + CurrentClass = CurrentClass->pclsNext; } ASSERT(CurrentClass == Class); (void)InterlockedExchangePointer((PVOID*)PrevLink, - Class->Next); - - ASSERT(Class->Base == BaseClass); - ASSERT(Class->Clone == NULL); + Class->pclsNext); + + ASSERT(Class->pclsBase == BaseClass); + ASSERT(Class->pclsClone == NULL); /* the class was just a clone, we don't need it anymore */ IntDestroyClass(Class); @@ -696,12 +696,12 @@ PWINDOWCLASS NewClass; SIZE_T ClassSize; - ASSERT(Class->Base == Class); + ASSERT(Class->pclsBase == Class); ASSERT(Class->rpdeskParent != NULL); - ASSERT(Class->Windows == 0); - ASSERT(Class->Clone == NULL); - - ClassSize = sizeof(*Class) + (SIZE_T)Class->ClsExtra; + ASSERT(Class->cWndReferenceCount == 0); + ASSERT(Class->pclsClone == NULL); + + ClassSize = sizeof(*Class) + (SIZE_T)Class->cbclsExtra; /* allocate the new base class on the shared heap */ NewClass = UserHeapAlloc(ClassSize); @@ -712,15 +712,15 @@ ClassSize); NewClass->rpdeskParent = NULL; - NewClass->Base = NewClass; + NewClass->pclsBase = NewClass; /* replace the class in the list */ (void)InterlockedExchangePointer((PVOID*)*ClassLinkPtr, NewClass); - *ClassLinkPtr = &NewClass->Next; + *ClassLinkPtr = &NewClass->pclsNext; /* free the obsolete class on the desktop heap */ - Class->Base = NULL; + Class->pclsBase = NULL; IntDestroyClass(Class); return TRUE; } @@ -749,15 +749,15 @@ Class = *Link; while (Class != NULL) { - NextClass = Class->Next; - - ASSERT(Class->Base == Class); + NextClass = Class->pclsNext; + + ASSERT(Class->pclsBase == Class); if (Class->rpdeskParent == Desktop && - Class->Windows == 0) + Class->cWndReferenceCount == 0) { /* there shouldn't be any clones around anymore! */ - ASSERT(Class->Clone == NULL); + ASSERT(Class->pclsClone == NULL); /* FIXME - If process is terminating, don't move the class but rather destroy it! */ /* FIXME - We could move the class to another desktop heap if there's still desktops @@ -771,27 +771,27 @@ } else { - ASSERT(NextClass == Class->Next); + ASSERT(NextClass == Class->pclsNext); if (FreeOnFailure) { /* unlink the base class */ (void)InterlockedExchangePointer((PVOID*)Link, - Class->Next); + Class->pclsNext); /* we can free the old base class now */ - Class->Base = NULL; + Class->pclsBase = NULL; IntDestroyClass(Class); } else { - Link = &Class->Next; + Link = &Class->pclsNext; *Ret = FALSE; } } } else - Link = &Class->Next; + Link = &Class->pclsNext; Class = NextClass; } @@ -889,8 +889,8 @@ ClassSize); Class->rpdeskParent = Desktop; - Class->Base = Class; - Class->Atom = Atom; + Class->pclsBase = Class; + Class->atomClassName = Atom; if (dwFlags & REGISTERCLASS_SYSTEM) { @@ -906,11 +906,11 @@ /* need to protect with SEH since accessing the WNDCLASSEX structure and string buffers might raise an exception! We don't want to leak memory... */ - Class->WndProc = lpwcx->lpfnWndProc; - Class->Style = lpwcx->style; - Class->ClsExtra = lpwcx->cbClsExtra; - Class->WndExtra = lpwcx->cbWndExtra; - Class->hInstance = lpwcx->hInstance; + Class->lpfnWndProc = lpwcx->lpfnWndProc; + Class->style = lpwcx->style; + Class->cbclsExtra = lpwcx->cbClsExtra; + Class->cbwndExtra = lpwcx->cbWndExtra; + Class->hModule = lpwcx->hInstance; Class->hIcon = lpwcx->hIcon; /* FIXME */ Class->hIconSm = lpwcx->hIconSm; /* FIXME */ Class->hCursor = lpwcx->hCursor; /* FIXME */ @@ -957,7 +957,7 @@ if (!(dwFlags & REGISTERCLASS_ANSI)) Class->Unicode = TRUE; - if (Class->Style & CS_GLOBALCLASS) + if (Class->style & CS_GLOBALCLASS) Class->Global = TRUE; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -1009,19 +1009,19 @@ Class = *PrevLink; while (Class != NULL) { - if (Class->Atom == Atom && - (hInstance == NULL || Class->hInstance == hInstance) && + if (Class->atomClassName == Atom && + (hInstance == NULL || Class->hModule == hInstance) && !Class->Destroying) { - ASSERT(Class->Base == Class); + ASSERT(Class->pclsBase == Class); if (Link != NULL) *Link = PrevLink; break; } - PrevLink = &Class->Next; - Class = Class->Next; + PrevLink = &Class->pclsNext; + Class = Class->pclsNext; } return Class; @@ -1250,11 +1250,11 @@ else List = &pi->LocalClassList; - Class->Next = *List; + Class->pclsNext = *List; (void)InterlockedExchangePointer((PVOID*)List, Class); - Ret = Class->Atom; + Ret = Class->atomClassName; } return Ret; @@ -1291,20 +1291,20 @@ ASSERT(Class != NULL); - if (Class->Windows != 0 || - Class->Clone != NULL) + if (Class->cWndReferenceCount != 0 || + Class->pclsClone != NULL) { SetLastWin32Error(ERROR_CLASS_HAS_WINDOWS); return FALSE; } /* must be a base class! */ - ASSERT(Class->Base == Class); + ASSERT(Class->pclsBase == Class); /* unlink the class */ - *Link = Class->Next; - - if (NT_SUCCESS(IntDeregisterClassAtom(Class->Atom))) + *Link = Class->pclsNext; + + if (NT_SUCCESS(IntDeregisterClassAtom(Class->atomClassName))) { /* finally free the resources */ IntDestroyClass(Class); @@ -1342,7 +1342,7 @@ /* find out how big the buffer needs to be */ Status = RtlQueryAtomInAtomTable(gAtomTable, - Class->Atom, + Class->atomClassName, NULL, NULL, szStaticTemp, @@ -1368,7 +1368,7 @@ /* query the class name */ Status = RtlQueryAtomInAtomTable(gAtomTable, - Class->Atom, + Class->atomClassName, NULL, NULL, szTemp, @@ -1402,7 +1402,7 @@ /* query the atom name */ Status = RtlQueryAtomInAtomTable(gAtomTable, - Class->Atom, + Class->atomClassName, NULL, NULL, ClassName->Buffer, @@ -1444,7 +1444,7 @@ TRACE("GetClassLong(%d)\n", Index); if (Index + sizeof(ULONG_PTR) < Index || - Index + sizeof(ULONG_PTR) > Class->ClsExtra) + Index + sizeof(ULONG_PTR) > Class->cbclsExtra) { SetLastWin32Error(ERROR_INVALID_PARAMETER); return 0; @@ -1463,11 +1463,11 @@ switch (Index) { case GCL_CBWNDEXTRA: - Ret = (ULONG_PTR)Class->WndExtra; + Ret = (ULONG_PTR)Class->cbwndExtra; break; case GCL_CBCLSEXTRA: - Ret = (ULONG_PTR)Class->ClsExtra; + Ret = (ULONG_PTR)Class->cbclsExtra; break; case GCLP_HBRBACKGROUND: @@ -1490,7 +1490,7 @@ break; case GCLP_HMODULE: - Ret = (ULONG_PTR)Class->hInstance; + Ret = (ULONG_PTR)Class->hModule; break; case GCLP_MENUNAME: @@ -1502,7 +1502,7 @@ break; case GCL_STYLE: - Ret = (ULONG_PTR)Class->Style; + Ret = (ULONG_PTR)Class->style; break; case GCLP_WNDPROC: @@ -1512,7 +1512,7 @@ break; case GCW_ATOM: - Ret = (ULONG_PTR)Class->Atom; + Ret = (ULONG_PTR)Class->atomClassName; break; default: @@ -1530,7 +1530,7 @@ BOOL Ret = FALSE; /* change the base class first */ - Class = Class->Base; + Class = Class->pclsBase; if (MenuName->Length != 0) { @@ -1581,14 +1581,14 @@ Class->MenuNameIsString = TRUE; /* update the clones */ - Class = Class->Clone; + Class = Class->pclsClone; while (Class != NULL) { Class->MenuName = strBufW; Class->AnsiMenuName = AnsiString.Buffer; Class->MenuNameIsString = TRUE; - Class = Class->Next; + Class = Class->pclsNext; } } else @@ -1611,14 +1611,14 @@ Class->MenuNameIsString = FALSE; /* update the clones */ - Class = Class->Clone; + Class = Class->pclsClone; while (Class != NULL) { Class->MenuName = MenuName->Buffer; Class->AnsiMenuName = (PSTR)MenuName->Buffer; Class->MenuNameIsString = FALSE; - Class = Class->Next; + Class = Class->pclsNext; } Ret = TRUE; @@ -1638,7 +1638,7 @@ /* NOTE: For GCLP_MENUNAME and GCW_ATOM this function may raise an exception! */ /* change the information in the base class first, then update the clones */ - Class = Class->Base; + Class = Class->pclsBase; if (Index >= 0) { @@ -1647,7 +1647,7 @@ TRACE("SetClassLong(%d, %x)\n", Index, NewLong); if (Index + sizeof(ULONG_PTR) < Index || - Index + sizeof(ULONG_PTR) > Class->ClsExtra) + Index + sizeof(ULONG_PTR) > Class->cbclsExtra) { SetLastWin32Error(ERROR_INVALID_PARAMETER); return 0; @@ -1662,11 +1662,11 @@ *Data = NewLong; /* update the clones */ - Class = Class->Clone; + Class = Class->pclsClone; while (Class != NULL) { *(PULONG_PTR)((ULONG_PTR)(Class + 1) + Index) = NewLong; - Class = Class->Next; + Class = Class->pclsNext; } return Ret; @@ -1675,15 +1675,15 @@ switch (Index) { case GCL_CBWNDEXTRA: - Ret = (ULONG_PTR)Class->WndExtra; - Class->WndExtra = (INT)NewLong; + Ret = (ULONG_PTR)Class->cbwndExtra; + Class->cbwndExtra = (INT)NewLong; /* update the clones */ - Class = Class->Clone; + Class = Class->pclsClone; while (Class != NULL) { - Class->WndExtra = (INT)NewLong; - Class = Class->Next; + Class->cbwndExtra = (INT)NewLong; + Class = Class->pclsNext; } break; @@ -1697,11 +1697,11 @@ Class->hbrBackground = (HBRUSH)NewLong; /* update the clones */ - Class = Class->Clone; + Class = Class->pclsClone; while (Class != NULL) { Class->hbrBackground = (HBRUSH)NewLong; - Class = Class->Next; + Class = Class->pclsNext; } break; @@ -1711,11 +1711,11 @@ Class->hCursor = (HANDLE)NewLong; /* update the clones */ - Class = Class->Clone; + Class = Class->pclsClone; while (Class != NULL) { Class->hCursor = (HANDLE)NewLong; - Class = Class->Next; + Class = Class->pclsNext; } break; @@ -1725,11 +1725,11 @@ Class->hIcon = (HANDLE)NewLong; /* update the clones */ - Class = Class->Clone; + Class = Class->pclsClone; while (Class != NULL) { Class->hIcon = (HANDLE)NewLong; - Class = Class->Next; + Class = Class->pclsNext; } break; @@ -1739,24 +1739,24 @@ Class->hIconSm = (HANDLE)NewLong; /* update the clones */ - Class = Class->Clone; + Class = Class->pclsClone; while (Class != NULL) { Class->hIconSm = (HANDLE)NewLong; - Class = Class->Next; + Class = Class->pclsNext; } break; case GCLP_HMODULE: - Ret = (ULONG_PTR)Class->hInstance; - Class->hInstance = (HINSTANCE)NewLong; + Ret = (ULONG_PTR)Class->hModule; + Class->hModule = (HINSTANCE)NewLong; /* update the clones */ - Class = Class->Clone; + Class = Class->pclsClone; while (Class != NULL) { - Class->hInstance = (HINSTANCE)NewLong; - Class = Class->Next; + Class->hModule = (HINSTANCE)NewLong; + Class = Class->pclsNext; } break; @@ -1775,8 +1775,8 @@ } case GCL_STYLE: - Ret = (ULONG_PTR)Class->Style; - Class->Style = (UINT)NewLong; + Ret = (ULONG_PTR)Class->style; + Class->style = (UINT)NewLong; /* FIXME - what if the CS_GLOBALCLASS style is changed? should we move the class to the appropriate list? For now, we save @@ -1784,11 +1784,11 @@ locate the appropriate list */ /* update the clones */ - Class = Class->Clone; + Class = Class->pclsClone; while (Class != NULL) { - Class->Style = (UINT)NewLong; - Class = Class->Next; + Class->style = (UINT)NewLong; + Class = Class->pclsNext; } break; @@ -1802,7 +1802,7 @@ { PUNICODE_STRING Value = (PUNICODE_STRING)NewLong; - Ret = (ULONG_PTR)Class->Atom; + Ret = (ULONG_PTR)Class->atomClassName; if (!IntSetClassAtom(Class, Value)) { @@ -1827,15 +1827,15 @@ { PPROCESSINFO pi; - lpwcx->style = Class->Style; + lpwcx->style = Class->style; pi = GetW32ProcessInfo(); lpwcx->lpfnWndProc = IntGetClassWndProc(Class, pi, Ansi); - lpwcx->cbClsExtra = Class->ClsExtra; - lpwcx->cbWndExtra = Class->WndExtra; + lpwcx->cbClsExtra = Class->cbclsExtra; + lpwcx->cbWndExtra = Class->cbwndExtra; lpwcx->hIcon = Class->hIcon; /* FIXME - get handle from pointer */ lpwcx->hCursor = Class->hCursor; /* FIXME - get handle from pointer */ lpwcx->hbrBackground = Class->hbrBackground; @@ -1845,12 +1845,12 @@ else lpwcx->lpszMenuName = Class->MenuName; - if (Class->hInstance == pi->hModUser) + if (Class->hModule == pi->hModUser) lpwcx->hInstance = NULL; else - lpwcx->hInstance = Class->hInstance; - - lpwcx->lpszClassName = (LPCWSTR)((ULONG_PTR)Class->Atom); /* FIXME - return the string? */ + lpwcx->hInstance = Class->hModule; + + lpwcx->lpszClassName = (LPCWSTR)((ULONG_PTR)Class->atomClassName); /* FIXME - return the string? */ lpwcx->hIconSm = Class->hIconSm; /* FIXME - get handle from pointer */ @@ -1908,14 +1908,14 @@ { int iCls; - Class->fnID = SystemClasses[i].ClassId; - if (LockupFnIdToiCls(Class->fnID, &iCls)) - { - gpsi->atomSysClass[iCls] = Class->Atom; + Class->fnid = SystemClasses[i].ClassId; + if (LockupFnIdToiCls(Class->fnid, &iCls)) + { + gpsi->atomSysClass[iCls] = Class->atomClassName; } ASSERT(Class->System); - Class->Next = pi->SystemClassList; + Class->pclsNext = pi->SystemClassList; (void)InterlockedExchangePointer((PVOID*)&pi->SystemClassList, Class); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Tue Jul 21 04:56:24 2009 @@ -1140,7 +1140,7 @@ if (Class != NULL) { ASSERT(Class->System); - Class->Next = pi->SystemClassList; + Class->pclsNext = pi->SystemClassList; (void)InterlockedExchangePointer((PVOID*)&pi->SystemClassList, Class); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] Tue Jul 21 04:56:24 2009 @@ -1425,7 +1425,7 @@ { bti->rgstate[4] = STATE_SYSTEM_INVISIBLE; } - if (pWindowObject->Wnd->pcls->Style & CS_NOCLOSE) + if (pWindowObject->Wnd->pcls->style & CS_NOCLOSE) { bti->rgstate[5] = STATE_SYSTEM_UNAVAILABLE; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Tue Jul 21 04:56:24 2009 @@ -694,7 +694,7 @@ { /* generate double click messages, if necessary */ if ((((*HitTest) != HTCLIENT) || - (Window->Wnd->pcls->Style & CS_DBLCLKS)) && + (Window->Wnd->pcls->style & CS_DBLCLKS)) && MsqIsDblClk(Msg, Remove)) { Msg->message += WM_LBUTTONDBLCLK - WM_LBUTTONDOWN; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Tue Jul 21 04:56:24 2009 @@ -342,20 +342,20 @@ Flags &= ~(DCX_CLIPCHILDREN | DCX_CLIPSIBLINGS | DCX_PARENTCLIP); if (!(Flags & DCX_WINDOW)) // not window rectangle { - if (Wnd->pcls->Style & CS_PARENTDC) + if (Wnd->pcls->style & CS_PARENTDC) { Flags |= DCX_PARENTCLIP; } if (!(Flags & DCX_CACHE) && // Not on the cheap wine list. - !(Wnd->pcls->Style & CS_OWNDC) ) - { - if (!(Wnd->pcls->Style & CS_CLASSDC)) + !(Wnd->pcls->style & CS_OWNDC) ) + { + if (!(Wnd->pcls->style & CS_CLASSDC)) // The window is not POWNED or has any CLASS, so we are looking for cheap wine. Flags |= DCX_CACHE; else { - if (Wnd->pcls->Dce) hDC = ((PDCE)Wnd->pcls->Dce)->hDC; + if (Wnd->pcls->pdce) hDC = ((PDCE)Wnd->pcls->pdce)->hDC; DPRINT("We have CLASS!!\n"); } } @@ -646,7 +646,7 @@ { if (!(pDCE->DCXFlags & DCX_CACHE)) /* owned or Class DCE*/ { - if (Window->Wnd->pcls->Style & CS_CLASSDC || + if (Window->Wnd->pcls->style & CS_CLASSDC || Window->Wnd->style & CS_CLASSDC) /* Test Class first */ { if (pDCE->DCXFlags & (DCX_INTERSECTRGN | DCX_EXCLUDERGN)) /* Class DCE*/ @@ -657,7 +657,7 @@ pDCE->DCXFlags = DCX_DCEEMPTY; pDCE->hwndCurrent = 0; } - else if (Window->Wnd->pcls->Style & CS_OWNDC || + else if (Window->Wnd->pcls->style & CS_OWNDC || Window->Wnd->style & CS_OWNDC) /* owned DCE*/ { pDCE = DceFreeDCE(pDCE, FALSE); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Tue Jul 21 04:56:24 2009 @@ -604,7 +604,7 @@ pwi->dwExStyle = Wnd->ExStyle; pwi->dwWindowStatus = (UserGetForegroundWindow() == Window->hSelf); /* WS_ACTIVECAPTION */ IntGetWindowBorderMeasures(Window, &pwi->cxWindowBorders, &pwi->cyWindowBorders); - pwi->atomWindowType = (Wnd->pcls ? Wnd->pcls->Atom : 0); + pwi->atomWindowType = (Wnd->pcls ? Wnd->pcls->atomClassName : 0); pwi->wCreatorVersion = 0x400; /* FIXME - return a real version number */ return TRUE; } @@ -1664,11 +1664,11 @@ if (Window) { Window->Wnd = DesktopHeapAlloc(pti->Desktop, - sizeof(WINDOW) + Class->WndExtra); + sizeof(WINDOW) + Class->cbwndExtra); if (!Window->Wnd) goto AllocErr; RtlZeroMemory(Window->Wnd, - sizeof(WINDOW) + Class->WndExtra); + sizeof(WINDOW) + Class->cbwndExtra); Window->Wnd->hdr.Handle = hWnd; /* FIXME: Remove hack , are you sure?*/ Wnd = Window->Wnd; @@ -1749,13 +1749,13 @@ { /* NOTE: Always create a unicode window for system classes! */ Wnd->Unicode = TRUE; - Wnd->lpfnWndProc = Wnd->pcls->WndProc; + Wnd->lpfnWndProc = Wnd->pcls->lpfnWndProc; Wnd->WndProcExtra = Wnd->pcls->WndProcExtra; } else { Wnd->Unicode = Wnd->pcls->Unicode; - Wnd->lpfnWndProc = Wnd->pcls->WndProc; + Wnd->lpfnWndProc = Wnd->pcls->lpfnWndProc; Wnd->CallProc = NULL; } @@ -1764,7 +1764,7 @@ Window->LastChild = NULL; Window->PrevSibling = NULL; Window->NextSibling = NULL; - Wnd->cbwndExtra = Wnd->pcls->WndExtra; + Wnd->cbwndExtra = Wnd->pcls->cbwndExtra; InitializeListHead(&Wnd->PropListHead); InitializeListHead(&Window->WndObjListHead); @@ -1848,10 +1848,10 @@ InsertTailList (&pti->WindowListHead, &Window->ThreadListEntry); /* Handle "CS_CLASSDC", it is tested first. */ - if ((Wnd->pcls->Style & CS_CLASSDC) && !(Wnd->pcls->Dce)) // One DCE per class to have CLASS. - Wnd->pcls->Dce = DceAllocDCE(Window, DCE_CLASS_DC); + if ((Wnd->pcls->style & CS_CLASSDC) && !(Wnd->pcls->pdce)) // One DCE per class to have CLASS. + Wnd->pcls->pdce = DceAllocDCE(Window, DCE_CLASS_DC); /* Allocate a DCE for this window. */ - else if ( Wnd->pcls->Style & CS_OWNDC) + else if ( Wnd->pcls->style & CS_OWNDC) Window->Dce = DceAllocDCE(Window, DCE_WINDOW_DC); Pos.x = x; @@ -2656,7 +2656,7 @@ The user mode version however calls GetWindowText() which will send WM_GETTEXT messages to windows belonging to its processes */ if((!CheckWindowName || !RtlCompareUnicodeString(WindowName, &(Child->Wnd->strName), TRUE)) && - (!ClassAtom || Child->Wnd->pcls->Atom == ClassAtom)) + (!ClassAtom || Child->Wnd->pcls->atomClassName == ClassAtom)) { Ret = Child->hSelf; break; @@ -2829,7 +2829,7 @@ WindowMatches = !CheckWindowName || !RtlCompareUnicodeString( &WindowName, &TopLevelWindow->Wnd->strName, TRUE); ClassMatches = (ClassAtom == (RTL_ATOM)0) || - ClassAtom == TopLevelWindow->Wnd->pcls->Atom; + ClassAtom == TopLevelWindow->Wnd->pcls->atomClassName; if (WindowMatches && ClassMatches) { @@ -3760,12 +3760,12 @@ { /* check if the new procedure matches with the one in the window class. If so, we need to restore both procedures! */ - Wnd->IsSystem = (NewWndProc == Wnd->pcls->WndProc || + Wnd->IsSystem = (NewWndProc == Wnd->pcls->lpfnWndProc || NewWndProc == Wnd->pcls->WndProcExtra); if (Wnd->IsSystem) { - Wnd->lpfnWndProc = Wnd->pcls->WndProc; + Wnd->lpfnWndProc = Wnd->pcls->lpfnWndProc; Wnd->WndProcExtra = Wnd->pcls->WndProcExtra; Wnd->Unicode = !Ansi; return Ret; @@ -4334,7 +4334,7 @@ RETURN( FALSE); } else - Wnd->pcls->fnID |= fnID; + Wnd->pcls->fnid |= fnID; } RETURN( TRUE);

1 0

[janderwald] 42109: allocators.c - Implement IKsAllocator interface and use it in new implemented KsCreateAllocator, KsCreateDefaultAllocatorEx, KsValidateAllocatorFramingEx api.c - Implement KsSetDevicePnpAndBaseObject, KsQueryDevicePnpObject, KsSetTargetState, KsSetTargetDeviceObject, KsSetPowerDispatch, KsFreeDeviceHeader, KsFreeObjectHeader, KsAllocateObjectCreateItem, KsFreeObjectCreateItem, KsFreeObjectCreateItemsByContext, KsCreateDefaultSecurity clocks.c - Implement KsCreateClock, KsCrea
by janderwald＠svn.reactos.org 20 Jul '09

20 Jul '09

Author: janderwald Date: Tue Jul 21 01:26:57 2009 New Revision: 42109 URL: http://svn.reactos.org/svn/reactos?rev=42109&view=rev Log: allocators.c - Implement IKsAllocator interface and use it in new implemented KsCreateAllocator, KsCreateDefaultAllocatorEx, KsValidateAllocatorFramingEx api.c - Implement KsSetDevicePnpAndBaseObject, KsQueryDevicePnpObject, KsSetTargetState, KsSetTargetDeviceObject, KsSetPowerDispatch, KsFreeDeviceHeader, KsFreeObjectHeader, KsAllocateObjectCreateItem, KsFreeObjectCreateItem, KsFreeObjectCreateItemsByContext, KsCreateDefaultSecurity clocks.c - Implement KsCreateClock, KsCreateDefaultClock, partly implement KsAllocateDefaultClockEx, KsFreeDefaultClock, KsGetDefaultClockState, KsSetDefaultClockState, KsGetDefaultClockTime, KsSetDefaultClockTime device.c - Partly implement IKsDevice interface in order to let AVStream client devices initialize - Implement KsInitializeDevice - Implement registering of device interface for AVStream drivers driver.c - Implement KsGetDeviceForDeviceObject - Set device flags for ks - Store Address for client drivers device extension filter.c - Implement IKsFilter & IKsControl interface - Handle KSPROPERTY requests filterfactory.c - Implement IKsFilterFactory interface - Implement KsCreateFilterFactory, KsFilterFactorySetDeviceClassesState, KsFilterFactoryGetSymbolicLink, KsFilterFactoryAddCreateItem - Add KsFilterFactoryUpdateCacheData image.c - Implement KsLoadResource irp.c - Implement KsDispatchQuerySecurity, KsDispatchSetSecurity, KsWriteFile, KsDefaultIoCompletion Added: trunk/reactos/drivers/ksfilter/ks/api.c (with props) trunk/reactos/drivers/ksfilter/ks/deviceinterface.c (with props) trunk/reactos/drivers/ksfilter/ks/event.c (with props) trunk/reactos/drivers/ksfilter/ks/filter.c (with props) trunk/reactos/drivers/ksfilter/ks/filterfactory.c (with props) trunk/reactos/drivers/ksfilter/ks/image.c (with props) trunk/reactos/drivers/ksfilter/ks/property.c (with props) Removed: trunk/reactos/drivers/ksfilter/ks/events.c trunk/reactos/drivers/ksfilter/ks/properties.c Modified: trunk/reactos/drivers/ksfilter/ks/allocators.c trunk/reactos/drivers/ksfilter/ks/bag.c trunk/reactos/drivers/ksfilter/ks/clocks.c trunk/reactos/drivers/ksfilter/ks/connectivity.c trunk/reactos/drivers/ksfilter/ks/device.c trunk/reactos/drivers/ksfilter/ks/driver.c trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/ksfilter/ks/kcom.c trunk/reactos/drivers/ksfilter/ks/ks.rbuild trunk/reactos/drivers/ksfilter/ks/ksfunc.h trunk/reactos/drivers/ksfilter/ks/ksiface.h trunk/reactos/drivers/ksfilter/ks/kstypes.h trunk/reactos/drivers/ksfilter/ks/methods.c trunk/reactos/drivers/ksfilter/ks/misc.c trunk/reactos/drivers/ksfilter/ks/priv.h trunk/reactos/drivers/ksfilter/ks/topology.c trunk/reactos/drivers/ksfilter/ks/worker.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/ksfilter/ks/allocators.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/alloca… Added: trunk/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/api.c?… Modified: trunk/reactos/drivers/ksfilter/ks/bag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/bag.c?… Modified: trunk/reactos/drivers/ksfilter/ks/clocks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/clocks… Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/connec… Modified: trunk/reactos/drivers/ksfilter/ks/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/device… Added: trunk/reactos/drivers/ksfilter/ks/deviceinterface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/device… Modified: trunk/reactos/drivers/ksfilter/ks/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/driver… Added: trunk/reactos/drivers/ksfilter/ks/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/event.… Removed: trunk/reactos/drivers/ksfilter/ks/events.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/events… Added: trunk/reactos/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… Added: trunk/reactos/drivers/ksfilter/ks/filterfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… Added: trunk/reactos/drivers/ksfilter/ks/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/image.… Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… Modified: trunk/reactos/drivers/ksfilter/ks/kcom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/kcom.c… Modified: trunk/reactos/drivers/ksfilter/ks/ks.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ks.rbu… Modified: trunk/reactos/drivers/ksfilter/ks/ksfunc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ksfunc… Modified: trunk/reactos/drivers/ksfilter/ks/ksiface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ksifac… Modified: trunk/reactos/drivers/ksfilter/ks/kstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/kstype… Modified: trunk/reactos/drivers/ksfilter/ks/methods.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/method… Modified: trunk/reactos/drivers/ksfilter/ks/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/misc.c… Modified: trunk/reactos/drivers/ksfilter/ks/priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/priv.h… Removed: trunk/reactos/drivers/ksfilter/ks/properties.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/proper… Added: trunk/reactos/drivers/ksfilter/ks/property.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/proper… Modified: trunk/reactos/drivers/ksfilter/ks/topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/topolo… Modified: trunk/reactos/drivers/ksfilter/ks/worker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/worker…

1 0

[jimtabor] 42108: - [Win32k] Update window structure.
by jimtabor＠svn.reactos.org 20 Jul '09

20 Jul '09

Author: jimtabor Date: Tue Jul 21 01:18:16 2009 New Revision: 42108 URL: http://svn.reactos.org/svn/reactos?rev=42108&view=rev Log: - [Win32k] Update window structure. Modified: trunk/reactos/dll/win32/user32/windows/class.c trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/dialog.c trunk/reactos/dll/win32/user32/windows/menu.c trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/eng/engwindow.c trunk/reactos/subsystems/win32/win32k/include/winpos.h trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/focus.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/menu.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/vis.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… Modified: trunk/reactos/subsystems/win32/win32k/eng/engwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/include/winpos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/vis.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…

1 0

[dgorbachev] 42107: Fix compilation of drmk.sys
by dgorbachev＠svn.reactos.org 20 Jul '09

20 Jul '09

Author: dgorbachev Date: Tue Jul 21 01:04:01 2009 New Revision: 42107 URL: http://svn.reactos.org/svn/reactos?rev=42107&view=rev Log: Fix compilation of drmk.sys Modified: trunk/reactos/include/ddk/portcls.h trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Tue Jul 21 01:04:01 2009 @@ -138,9 +138,9 @@ #include <mmreg.h> #undef NOBITMAP +#include <punknown.h> #include <ks.h> #include <ksmedia.h> -#include <punknown.h> #include <drmk.h> #ifdef __cplusplus Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4210… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Tue Jul 21 01:04:01 2009 @@ -3670,10 +3670,10 @@ PUNKNOWN NTAPI KsDeviceGetOuterUnknown( - IN PKSDEVICE Device) -{ - return KsGetOuterUnknown((PVOID) Device); -} + IN PKSDEVICE Device); +//{ +// return KsGetOuterUnknown((PVOID) Device); +//} KSDDKAPI PUNKNOWN

1 0

[fireball] 42106: - Add polygon filling support to GrePolygon (previously only polygon outline was drawn).
by fireball＠svn.reactos.org 20 Jul '09

20 Jul '09

Author: fireball Date: Mon Jul 20 23:30:34 2009 New Revision: 42106 URL: http://svn.reactos.org/svn/reactos?rev=42106&view=rev Log: - Add polygon filling support to GrePolygon (previously only polygon outline was drawn). Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/polyfill.c branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/polyfill.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/polyfill.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/polyfill.c [iso-8859-1] Mon Jul 20 23:30:34 2009 @@ -27,7 +27,7 @@ * 21/2/2003: Created */ -#include <w32k.h> +#include <win32k.h> #define NDEBUG #include <debug.h> @@ -430,22 +430,21 @@ BoundRect.right = x2; //DPRINT("Fill Line (%d, %d) to (%d, %d)\n",x1, ScanLine, x2, ScanLine); - IntEngLineTo(&psurf->SurfObj, - dc->rosdc.CombinedClip, - BrushObj, - x1, - ScanLine, - x2, - ScanLine, - &BoundRect, // Bounding rectangle - RopMode); // MIX + GreLineTo(&psurf->SurfObj, + NULL,//dc->rosdc.CombinedClip, + BrushObj, + x1, + ScanLine, + x2, + ScanLine, + &BoundRect, // Bounding rectangle + RopMode); // MIX } pLeft = pRight->pNext; pRight = pLeft ? pLeft->pNext : NULL; } } -static void APIENTRY POLYGONFILL_FillScanLineWinding( @@ -503,15 +502,15 @@ BoundRect.right = x2; //DPRINT("Fill Line (%d, %d) to (%d, %d)\n",x1, ScanLine, x2, ScanLine); - IntEngLineTo(&psurf->SurfObj, - dc->rosdc.CombinedClip, - BrushObj, - x1, - ScanLine, - x2, - ScanLine, - &BoundRect, // Bounding rectangle - RopMode); // MIX + GreLineTo(&psurf->SurfObj, + NULL,//dc->rosdc.CombinedClip, + BrushObj, + x1, + ScanLine, + x2, + ScanLine, + &BoundRect, // Bounding rectangle + RopMode); // MIX x1 = newx1; x2 = newx2; @@ -526,15 +525,15 @@ BoundRect.right = x2; //DPRINT("Fill Line (%d, %d) to (%d, %d)\n",x1, ScanLine, x2, ScanLine); - IntEngLineTo(&psurf->SurfObj, - dc->rosdc.CombinedClip, - BrushObj, - x1, - ScanLine, - x2, - ScanLine, - &BoundRect, // Bounding rectangle - RopMode); // MIX + GreLineTo(&psurf->SurfObj, + NULL, //dc->rosdc.CombinedClip, + BrushObj, + x1, + ScanLine, + x2, + ScanLine, + &BoundRect, // Bounding rectangle + RopMode); // MIX } //When the fill mode is ALTERNATE, GDI fills the area between odd-numbered and @@ -560,7 +559,7 @@ FILL_EDGE_LIST *list = 0; FILL_EDGE *ActiveHead = 0; int ScanLine; - PDC_ATTR pdcattr = dc->pdcattr; + //PDC_ATTR pdcattr = dc->pdcattr; void (APIENTRY *FillScanLine)( PDC dc, @@ -578,9 +577,9 @@ if (NULL == list) return FALSE; - if ( WINDING == pdcattr->jFillMode ) - FillScanLine = POLYGONFILL_FillScanLineWinding; - else /* default */ + //if ( WINDING == pdcattr->jFillMode ) + //FillScanLine = POLYGONFILL_FillScanLineWinding; + //else /* default */ FillScanLine = POLYGONFILL_FillScanLineAlternate; /* For each Scanline from BoundRect.bottom to BoundRect.top, @@ -599,12 +598,12 @@ return TRUE; } -BOOL FASTCALL -IntFillPolygon( +BOOL NTAPI +GrepFillPolygon( PDC dc, - SURFACE *psurf, + SURFOBJ *psurf, BRUSHOBJ *BrushObj, - CONST PPOINT Points, + CONST POINT *Points, int Count, RECTL DestRect, POINTL *BrushOrigin) @@ -617,7 +616,7 @@ //DPRINT("IntFillPolygon\n"); /* Create Edge List. */ - list = POLYGONFILL_MakeEdgeList(Points, Count); + list = POLYGONFILL_MakeEdgeList((PPOINT)Points, Count); /* DEBUG_PRINT_EDGELIST(list); */ if (NULL == list) return FALSE; @@ -647,17 +646,18 @@ LineRect.left = x1; LineRect.right = x2; - IntEngBitBlt(&psurf->SurfObj, - NULL, - NULL, - dc->rosdc.CombinedClip, - NULL, - &LineRect, - NULL, - NULL, - BrushObj, - BrushOrigin, - ROP3_TO_ROP4(PATCOPY)); + GrepBitBltEx(psurf, + NULL, + NULL, + NULL,//dc->rosdc.CombinedClip, + NULL, + &LineRect, + NULL, + NULL, + BrushObj, + BrushOrigin, + ROP3_TO_ROP4(PATCOPY), + TRUE); } pLeft = pRight->pNext; pRight = pLeft ? pLeft->pNext : NULL; Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] Mon Jul 20 23:30:34 2009 @@ -100,7 +100,7 @@ RECTL DestRect; MIX Mix; INT i; - //POINT BrushOrigin = {0, 0}; + POINT BrushOrigin = {0, 0}; // HACK DestRect.left = 0; @@ -116,20 +116,13 @@ //BrushOrigin = *((PPOINTL)&pbrFill->ptOrigin); //BrushOrigin.x += dc->ptlDCOrig.x; //BrushOrigin.y += dc->ptlDCOrig.y; -#if 0 - bRet = GrepBitBltEx(&pDC->pBitmap->SurfObj, - NULL, - NULL, - NULL,//dc->rosdc.CombinedClip, - NULL, - &DestRect, - NULL, - NULL, - &pDC->pFillBrush->BrushObj, - &BrushOrigin, - ROP3_TO_ROP4(PATCOPY), - TRUE); -#endif + GrepFillPolygon(pDC, + &pDC->pBitmap->SurfObj, + &pDC->pFillBrush->BrushObj, + ptPoints, + count, + DestRect, + &BrushOrigin); } } Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/gre.h [iso-8859-1] Mon Jul 20 23:30:34 2009 @@ -80,6 +80,17 @@ RECTL *RectBounds, MIX Mix); +/* polyfill.c */ +BOOL NTAPI +GrepFillPolygon( + PDC dc, + SURFOBJ *psurf, + BRUSHOBJ *BrushObj, + CONST POINT *Points, + int Count, + RECTL DestRect, + POINTL *BrushOrigin); + /* rect.c */ VOID NTAPI GreRectangle(PDC dc, Modified: branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Mon Jul 20 23:30:34 2009 @@ -101,6 +101,7 @@ <file>gdiobj.c</file> <file>lineto.c</file> <file>palobj.c</file> + <file>polyfill.c</file> <file>rect.c</file> <file>surfobj.c</file> <file>xformobj.c</file>

1 0

[fireball] 42105: - Fix build.
by fireball＠svn.reactos.org 20 Jul '09

20 Jul '09

Author: fireball Date: Mon Jul 20 23:28:10 2009 New Revision: 42105 URL: http://svn.reactos.org/svn/reactos?rev=42105&view=rev Log: - Fix build. Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c [iso-8859-1] Mon Jul 20 23:28:10 2009 @@ -45,7 +45,7 @@ DueTime.QuadPart = (LONGLONG)when; - DPRINT1("add_timeout_user(when %I64d, func %p), current time %I64d\n", when, func, CurrentTime.QuadPart); + DPRINT1("add_timeout_user(when %I64d, func %p)\n", when, func); /* Allocate memory for timeout structure */ TimeoutUser = ExAllocatePool(NonPagedPool, sizeof(struct timeout_user));

1 0

[cgutman] 42104: - Update TotalLength based on the fragment size - Make fragment offset into 8-byte units - Don't perform a useless checksum calculation - Fixes datagram fragmentation (tested using ping with a packet size of 16000) - This also seems to fix DHCP over a bridged NIC in vbox
by cgutman＠svn.reactos.org 20 Jul '09

20 Jul '09

Author: cgutman Date: Mon Jul 20 21:46:54 2009 New Revision: 42104 URL: http://svn.reactos.org/svn/reactos?rev=42104&view=rev Log: - Update TotalLength based on the fragment size - Make fragment offset into 8-byte units - Don't perform a useless checksum calculation - Fixes datagram fragmentation (tested using ping with a packet size of 16000) - This also seems to fix DHCP over a bridged NIC in vbox Modified: trunk/reactos/lib/drivers/ip/network/transmit.c Modified: trunk/reactos/lib/drivers/ip/network/transmit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/tra… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/transmit.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/transmit.c [iso-8859-1] Mon Jul 20 21:46:54 2009 @@ -114,14 +114,17 @@ RtlCopyMemory(IFC->Data, IFC->DatagramData, DataSize); // SAFE - FragOfs = (USHORT)IFC->Position; // Swap? + /* Fragment offset is in 8 byte blocks */ + FragOfs = (USHORT)(IFC->Position / 8); + if (MoreFragments) FragOfs |= IPv4_MF_MASK; else FragOfs &= ~IPv4_MF_MASK; Header = IFC->Header; - Header->FlagsFragOfs = FragOfs; + Header->FlagsFragOfs = WH2N(FragOfs); + Header->TotalLength = WH2N((USHORT)(DataSize + IFC->HeaderSize)); /* FIXME: Handle options */ @@ -250,22 +253,6 @@ /* Fetch path MTU now, because it may change */ TI_DbgPrint(MID_TRACE,("PathMTU: %d\n", NCE->Interface->MTU)); - if ((IPPacket->Flags & IP_PACKET_FLAG_RAW) == 0) { - /* Calculate checksum of IP header */ - TI_DbgPrint(MID_TRACE,("-> not IP_PACKET_FLAG_RAW\n")); - ((PIPv4_HEADER)IPPacket->Header)->Checksum = 0; - - ((PIPv4_HEADER)IPPacket->Header)->Checksum = (USHORT) - IPv4Checksum(IPPacket->Header, IPPacket->HeaderSize, 0); - TI_DbgPrint(MID_TRACE,("IP Check: %x\n", ((PIPv4_HEADER)IPPacket->Header)->Checksum)); - - TI_DbgPrint(MAX_TRACE, ("Sending packet (length is %d).\n", - WN2H(((PIPv4_HEADER)IPPacket->Header)->TotalLength))); - } else { - TI_DbgPrint(MAX_TRACE, ("Sending raw packet (flags are 0x%X).\n", - IPPacket->Flags)); - } - NdisQueryPacket(IPPacket->NdisPacket, NULL, NULL,

1 0

[dchapyshev] 42103: - Add some defines
by dchapyshev＠svn.reactos.org 20 Jul '09

20 Jul '09

Author: dchapyshev Date: Mon Jul 20 21:45:06 2009 New Revision: 42103 URL: http://svn.reactos.org/svn/reactos?rev=42103&view=rev Log: - Add some defines Modified: trunk/reactos/include/psdk/svcguid.h Modified: trunk/reactos/include/psdk/svcguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/svcguid.h?rev… ============================================================================== --- trunk/reactos/include/psdk/svcguid.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/svcguid.h [iso-8859-1] Mon Jul 20 21:45:06 2009 @@ -4,6 +4,11 @@ #ifdef __cplusplus extern "C" { #endif + +#define SVCID_HOSTNAME { 0x0002a800, 0, 0, { 0xC0,0,0,0,0,0,0,0x46 } } +#define SVCID_INET_HOSTADDRBYINETSTRING { 0x0002a801, 0, 0, { 0xC0,0,0,0,0,0,0,0x46 } } +#define SVCID_INET_HOSTADDRBYNAME { 0x0002a803, 0, 0, { 0xC0,0,0,0,0,0,0,0x46 } } +#define SVCID_INET_SERVICEBYNAME { 0x0002a802, 0, 0, { 0xC0,0,0,0,0,0,0,0x46 } } #define SVCID_NETWARE(_SapId) \ { (0x000B << 16) | (_SapId), 0, 0, { 0xC0,0,0,0,0,0,0,0x46 } } @@ -24,6 +29,213 @@ (_g)->Data4[6] = 0x0; \ (_g)->Data4[7] = 0x46; } +#define SVCID_PRINT_QUEUE SVCID_NETWARE(0x3) +#define SVCID_FILE_SERVER SVCID_NETWARE(0x4) +#define SVCID_JOB_SERVER SVCID_NETWARE(0x5) +#define SVCID_GATEWAY SVCID_NETWARE(0x6) +#define SVCID_PRINT_SERVER SVCID_NETWARE(0x7) +#define SVCID_ARCHIVE_QUEUE SVCID_NETWARE(0x8) +#define SVCID_ARCHIVE_SERVER SVCID_NETWARE(0x9) +#define SVCID_JOB_QUEUE SVCID_NETWARE(0xA) +#define SVCID_ADMINISTRATION SVCID_NETWARE(0xB) +#define SVCID_NAS_SNA_GATEWAY SVCID_NETWARE(0x21) +#define SVCID_REMOTE_BRIDGE_SERVER SVCID_NETWARE(0x24) +#define SVCID_TIME_SYNCHRONIZATION_SERVER SVCID_NETWARE(0x2D) +#define SVCID_ARCHIVE_SERVER_DYNAMIC_SAP SVCID_NETWARE(0x2E) +#define SVCID_ADVERTISING_PRINT_SERVER SVCID_NETWARE(0x47) +#define SVCID_BTRIEVE_VAP SVCID_NETWARE(0x4B) +#define SVCID_DIRECTORY_SERVER SVCID_NETWARE(0x278) +#define SVCID_NETWARE_386 SVCID_NETWARE(0x107) +#define SVCID_HP_PRINT_SERVER SVCID_NETWARE(0x30C) +#define SVCID_SNA_SERVER SVCID_NETWARE(0x444) +#define SVCID_SAA_SERVER SVCID_NETWARE(0x130) + +#define SVCID_TCP_RR(Port, Type) { (0x0009 << 16) | (Port), 0, Type, { 0xC0,0,0,0,0,0,0,0x46 } } + +#define SVCID_DNS(Type) SVCID_TCP_RR(53, Type) + +#define SVCID_DNS_TYPE_A SVCID_DNS(0x0001) +#define SVCID_DNS_TYPE_NS SVCID_DNS(0x0002) +#define SVCID_DNS_TYPE_MD SVCID_DNS(0x0003) +#define SVCID_DNS_TYPE_MF SVCID_DNS(0x0004) +#define SVCID_DNS_TYPE_CNAME SVCID_DNS(0x0005) +#define SVCID_DNS_TYPE_SOA SVCID_DNS(0x0006) +#define SVCID_DNS_TYPE_MB SVCID_DNS(0x0007) +#define SVCID_DNS_TYPE_MG SVCID_DNS(0x0008) +#define SVCID_DNS_TYPE_MR SVCID_DNS(0x0009) +#define SVCID_DNS_TYPE_NULL SVCID_DNS(0x000a) +#define SVCID_DNS_TYPE_WKS SVCID_DNS(0x000b) +#define SVCID_DNS_TYPE_PTR SVCID_DNS(0x000c) +#define SVCID_DNS_TYPE_HINFO SVCID_DNS(0x000d) +#define SVCID_DNS_TYPE_MINFO SVCID_DNS(0x000e) +#define SVCID_DNS_TYPE_MX SVCID_DNS(0x000f) +#define SVCID_DNS_TYPE_TEXT SVCID_DNS(0x0010) +#define SVCID_DNS_TYPE_RP SVCID_DNS(0x0011) +#define SVCID_DNS_TYPE_AFSDB SVCID_DNS(0x0012) +#define SVCID_DNS_TYPE_X25 SVCID_DNS(0x0013) +#define SVCID_DNS_TYPE_ISDN SVCID_DNS(0x0014) +#define SVCID_DNS_TYPE_RT SVCID_DNS(0x0015) +#define SVCID_DNS_TYPE_NSAP SVCID_DNS(0x0016) +#define SVCID_DNS_TYPE_NSAPPTR SVCID_DNS(0x0017) +#define SVCID_DNS_TYPE_SIG SVCID_DNS(0x0018) +#define SVCID_DNS_TYPE_KEY SVCID_DNS(0x0019) +#define SVCID_DNS_TYPE_PX SVCID_DNS(0x001a) +#define SVCID_DNS_TYPE_GPOS SVCID_DNS(0x001b) +#define SVCID_DNS_TYPE_AAAA SVCID_DNS(0x001c) +#define SVCID_DNS_TYPE_LOC SVCID_DNS(0x001d) +#define SVCID_DNS_TYPE_NXT SVCID_DNS(0x001e) +#define SVCID_DNS_TYPE_SRV SVCID_DNS(0x0021) +#define SVCID_DNS_TYPE_ATMA SVCID_DNS(0x0022) + +#define SVCID_TCP(Port) SVCID_TCP_RR(Port, 0) + +#define SVCID_ECHO_TCP SVCID_TCP(7) +#define SVCID_DISCARD_TCP SVCID_TCP(9) +#define SVCID_SYSTAT_TCP SVCID_TCP(11) +#define SVCID_SYSTAT_TCP SVCID_TCP(11) +#define SVCID_DAYTIME_TCP SVCID_TCP(13) +#define SVCID_NETSTAT_TCP SVCID_TCP(15) +#define SVCID_QOTD_TCP SVCID_TCP(17) +#define SVCID_CHARGEN_TCP SVCID_TCP(19) +#define SVCID_FTP_DATA_TCP SVCID_TCP(20) +#define SVCID_FTP_TCP SVCID_TCP(21) +#define SVCID_TELNET_TCP SVCID_TCP(23) +#define SVCID_SMTP_TCP SVCID_TCP(25) +#define SVCID_TIME_TCP SVCID_TCP(37) +#define SVCID_NAME_TCP SVCID_TCP(42) +#define SVCID_WHOIS_TCP SVCID_TCP(43) +#define SVCID_DOMAIN_TCP SVCID_TCP(53) +#define SVCID_NAMESERVER_TCP SVCID_TCP(53) +#define SVCID_MTP_TCP SVCID_TCP(57) +#define SVCID_RJE_TCP SVCID_TCP(77) +#define SVCID_FINGER_TCP SVCID_TCP(79) +#define SVCID_LINK_TCP SVCID_TCP(87) +#define SVCID_SUPDUP_TCP SVCID_TCP(95) +#define SVCID_HOSTNAMES_TCP SVCID_TCP(101) +#define SVCID_ISO_TSAP_TCP SVCID_TCP(102) +#define SVCID_DICTIONARY_TCP SVCID_TCP(103) +#define SVCID_X400_TCP SVCID_TCP(103) +#define SVCID_X400_SND_TCP SVCID_TCP(104) +#define SVCID_CSNET_NS_TCP SVCID_TCP(105) +#define SVCID_POP_TCP SVCID_TCP(109) +#define SVCID_POP2_TCP SVCID_TCP(109) +#define SVCID_POP3_TCP SVCID_TCP(110) +#define SVCID_PORTMAP_TCP SVCID_TCP(111) +#define SVCID_SUNRPC_TCP SVCID_TCP(111) +#define SVCID_AUTH_TCP SVCID_TCP(113) +#define SVCID_SFTP_TCP SVCID_TCP(115) +#define SVCID_PATH_TCP SVCID_TCP(117) +#define SVCID_UUCP_PATH_TCP SVCID_TCP(117) +#define SVCID_NNTP_TCP SVCID_TCP(119) +#define SVCID_NBSESSION_TCP SVCID_TCP(139) +#define SVCID_NEWS_TCP SVCID_TCP(144) +#define SVCID_TCPREPO_TCP SVCID_TCP(158) +#define SVCID_PRINT_SRV_TCP SVCID_TCP(170) +#define SVCID_VMNET_TCP SVCID_TCP(175) +#define SVCID_VMNET0_TCP SVCID_TCP(400) +#define SVCID_EXEC_TCP SVCID_TCP(512) +#define SVCID_LOGIN_TCP SVCID_TCP(513) +#define SVCID_SHELL_TCP SVCID_TCP(514) +#define SVCID_PRINTER_TCP SVCID_TCP(515) +#define SVCID_EFS_TCP SVCID_TCP(520) +#define SVCID_TEMPO_TCP SVCID_TCP(526) +#define SVCID_COURIER_TCP SVCID_TCP(530) +#define SVCID_CONFERENCE_TCP SVCID_TCP(531) +#define SVCID_NETNEWS_TCP SVCID_TCP(532) +#define SVCID_UUCP_TCP SVCID_TCP(540) +#define SVCID_KLOGIN_TCP SVCID_TCP(543) +#define SVCID_KSHELL_TCP SVCID_TCP(544) +#define SVCID_REMOTEFS_TCP SVCID_TCP(556) +#define SVCID_GARCON_TCP SVCID_TCP(600) +#define SVCID_MAITRD_TCP SVCID_TCP(601) +#define SVCID_BUSBOY_TCP SVCID_TCP(602) +#define SVCID_KERBEROS_TCP SVCID_TCP(750) +#define SVCID_KERBEROS_MASTER_TCP SVCID_TCP(751) +#define SVCID_KRB_PROP_TCP SVCID_TCP(754) +#define SVCID_ERLOGIN_TCP SVCID_TCP(888) +#define SVCID_KPOP_TCP SVCID_TCP(1109) +#define SVCID_INGRESLOCK_TCP SVCID_TCP(1524) +#define SVCID_KNETD_TCP SVCID_TCP(2053) +#define SVCID_EKLOGIN_TCP SVCID_TCP(2105) +#define SVCID_RMT_TCP SVCID_TCP(5555) +#define SVCID_MTB_TCP SVCID_TCP(5556) +#define SVCID_MAN_TCP SVCID_TCP(9535) +#define SVCID_W_TCP SVCID_TCP(9536) +#define SVCID_MANTST_TCP SVCID_TCP(9537) +#define SVCID_BNEWS_TCP SVCID_TCP(10000) +#define SVCID_QUEUE_TCP SVCID_TCP(10001) +#define SVCID_POKER_TCP SVCID_TCP(10002) +#define SVCID_GATEWAY_TCP SVCID_TCP(10003) +#define SVCID_REMP_TCP SVCID_TCP(10004) +#define SVCID_QMASTER_TCP SVCID_TCP(10012) + +#define SVCID_UDP_RR(Port, Type) { (0x000A << 16) | (Port), 0, Type, { 0xC0,0,0,0,0,0,0,0x46 } } +#define SVCID_UDP(Port) SVCID_UDP_RR(Port, 0) + +#define SVCID_ECHO_UDP SVCID_UDP(7) +#define SVCID_DISCARD_UDP SVCID_UDP(9) +#define SVCID_DAYTIME_UDP SVCID_UDP(13) +#define SVCID_QOTD_UDP SVCID_UDP(17) +#define SVCID_CHARGEN_UDP SVCID_UDP(19) +#define SVCID_TIME_UDP SVCID_UDP(37) +#define SVCID_RLP_UDP SVCID_UDP(39) +#define SVCID_NAME_UDP SVCID_UDP(42) +#define SVCID_DOMAIN_UDP SVCID_UDP(53) +#define SVCID_NAMESERVER_UDP SVCID_UDP(53) +#define SVCID_BOOTP_UDP SVCID_UDP(67) +#define SVCID_TFTP_UDP SVCID_UDP(69) +#define SVCID_PORTMAP_UDP SVCID_UDP(111) +#define SVCID_SUNRPC_UDP SVCID_UDP(111) +#define SVCID_NTP_UDP SVCID_UDP(123) +#define SVCID_NBNAME_UDP SVCID_UDP(137) +#define SVCID_NBDATAGRAM_UDP SVCID_UDP(138) +#define SVCID_SGMP_UDP SVCID_UDP(153) +#define SVCID_SNMP_UDP SVCID_UDP(161) +#define SVCID_SNMP_TRAP_UDP SVCID_UDP(162) +#define SVCID_LOAD_UDP SVCID_UDP(315) +#define SVCID_SYTEK_UDP SVCID_UDP(500) +#define SVCID_BIFF_UDP SVCID_UDP(512) +#define SVCID_WHO_UDP SVCID_UDP(513) +#define SVCID_SYSLOG_UDP SVCID_UDP(514) +#define SVCID_TALK_UDP SVCID_UDP(517) +#define SVCID_NTALK_UDP SVCID_UDP(518) +#define SVCID_ROUTE_UDP SVCID_UDP(520) +#define SVCID_TIMED_UDP SVCID_UDP(525) +#define SVCID_RVD_CONTROL_UDP SVCID_UDP(531) +#define SVCID_NETWALL_UDP SVCID_UDP(533) +#define SVCID_NEW_RWHO_UDP SVCID_UDP(550) +#define SVCID_RMONITOR_UDP SVCID_UDP(560) +#define SVCID_MONITOR_UDP SVCID_UDP(561) +#define SVCID_ACCTMASTER_UDP SVCID_UDP(700) +#define SVCID_ACCTSLAVE_UDP SVCID_UDP(701) +#define SVCID_ACCT_UDP SVCID_UDP(702) +#define SVCID_ACCTLOGIN_UDP SVCID_UDP(703) +#define SVCID_ACCTPRINTER_UDP SVCID_UDP(704) +#define SVCID_ELCSD_UDP SVCID_UDP(704) +#define SVCID_ACCTINFO_UDP SVCID_UDP(705) +#define SVCID_ACCTSLAVE2_UDP SVCID_UDP(706) +#define SVCID_ACCTDISK_UDP SVCID_UDP(707) +#define SVCID_KERBEROS_UDP SVCID_UDP(750) +#define SVCID_KERBEROS_MASTER_UDP SVCID_UDP(751) +#define SVCID_PASSWD_SERVER_UDP SVCID_UDP(752) +#define SVCID_USERREG_SERVER_UDP SVCID_UDP(753) +#define SVCID_PHONE_UDP SVCID_UDP(1167) +#define SVCID_MAZE_UDP SVCID_UDP(1666) +#define SVCID_NFS_UDP SVCID_UDP(2049) +#define SVCID_RSCS0_UDP SVCID_UDP(10000) +#define SVCID_RSCS1_UDP SVCID_UDP(10001) +#define SVCID_RSCS2_UDP SVCID_UDP(10002) +#define SVCID_RSCS3_UDP SVCID_UDP(10003) +#define SVCID_RSCS4_UDP SVCID_UDP(10004) +#define SVCID_RSCS5_UDP SVCID_UDP(10005) +#define SVCID_RSCS6_UDP SVCID_UDP(10006) +#define SVCID_RSCS7_UDP SVCID_UDP(10007) +#define SVCID_RSCS8_UDP SVCID_UDP(10008) +#define SVCID_RSCS9_UDP SVCID_UDP(10009) +#define SVCID_RSCSA_UDP SVCID_UDP(10010) +#define SVCID_RSCSB_UDP SVCID_UDP(10011) +#define SVCID_QMASTER_UDP SVCID_UDP(10012) + #ifdef __cplusplus } #endif

1 0

[dchapyshev] 42102: - Implement WSAHtons, WSANtohs - Add some cases to MsafdReturnWithErrno, SockAsyncSelectCompletionRoutine Opera loads pages now, but the keyboard does not work. Patch by Mikhail Denisenko (denisenkom@gmail.com) See issue #4151 for more details.
by dchapyshev＠svn.reactos.org 20 Jul '09

20 Jul '09

Author: dchapyshev Date: Mon Jul 20 20:30:30 2009 New Revision: 42102 URL: http://svn.reactos.org/svn/reactos?rev=42102&view=rev Log: - Implement WSAHtons, WSANtohs - Add some cases to MsafdReturnWithErrno, SockAsyncSelectCompletionRoutine Opera loads pages now, but the keyboard does not work. Patch by Mikhail Denisenko (denisenkom(a)gmail.com) See issue #4151 for more details. Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/ws2_32/misc/stubs.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Mon Jul 20 20:30:30 2009 @@ -340,6 +340,10 @@ case STATUS_INVALID_CONNECTION: DbgPrint("MSAFD: STATUS_INVALID_CONNECTION\n"); *Errno = WSAEAFNOSUPPORT; + break; + case STATUS_INVALID_ADDRESS: + DbgPrint("MSAFD: STATUS_INVALID_ADDRESS\n"); + *Errno = WSAEADDRNOTAVAIL; break; case STATUS_REMOTE_NOT_LISTENING: DbgPrint("MSAFD: STATUS_REMOTE_NOT_LISTENING\n"); @@ -2289,6 +2293,7 @@ /* FIXME: THIS IS NOT RIGHT!!! HACK HACK HACK! */ case AFD_EVENT_CONNECT: + case AFD_EVENT_CONNECT_FAIL: if (0 != (Socket->SharedData.AsyncEvents & FD_CONNECT) && 0 == (Socket->SharedData.AsyncDisabledEvents & FD_CONNECT)) { Modified: trunk/reactos/dll/win32/ws2_32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] Mon Jul 20 20:30:30 2009 @@ -510,10 +510,33 @@ IN USHORT hostshort, OUT USHORT FAR* lpnetshort) { - UNIMPLEMENTED - - WSASetLastError(WSASYSCALLFAILURE); - return SOCKET_ERROR; + if (!WSAINITIALIZED) + { + WSASetLastError(WSANOTINITIALISED); + return SOCKET_ERROR; + } + + PCATALOG_ENTRY provider; + if (!ReferenceProviderByHandle((HANDLE)s, &provider)) + { + WSASetLastError(WSAENOTSOCK); + return SOCKET_ERROR; + } + + switch (provider->ProtocolInfo.iNetworkByteOrder) + { + case BIGENDIAN: + *lpnetshort = htons(hostshort); + break; + case LITTLEENDIAN: +#ifdef LE + *lpnetshort = hostshort; +#else + *lpnetshort = (((hostshort & 0xFF00) >> 8) | ((hostshort & 0x00FF) << 8)); +#endif + break; + } + return 0; } @@ -576,10 +599,33 @@ IN USHORT netshort, OUT USHORT FAR* lphostshort) { - UNIMPLEMENTED - - WSASetLastError(WSASYSCALLFAILURE); - return SOCKET_ERROR; + if (!WSAINITIALIZED) + { + WSASetLastError(WSANOTINITIALISED); + return SOCKET_ERROR; + } + + PCATALOG_ENTRY provider; + if (!ReferenceProviderByHandle((HANDLE)s, &provider)) + { + WSASetLastError(WSAENOTSOCK); + return SOCKET_ERROR; + } + + switch (provider->ProtocolInfo.iNetworkByteOrder) + { + case BIGENDIAN: + *lphostshort = ntohs(netshort); + break; + case LITTLEENDIAN: +#ifdef LE + *lphostshort = netshort; +#else + *lphostshort = (((netshort & 0xFF00) >> 8) | ((netshort & 0x00FF) << 8)); +#endif + break; + } + return 0; }

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2009