Ros-diffs July 2009

ros-diffs@reactos.org

27 participants
605 discussions

[dchapyshev] 42012: - Samplify SwitchToThread and QueueUserWorkItem - Remove unneeded InternalWorkItemTrampoline function and QUEUE_USER_WORKITEM_CONTEXT structure - Other small changes
by dchapyshev＠svn.reactos.org 17 Jul '09

17 Jul '09

Author: dchapyshev Date: Fri Jul 17 20:42:12 2009 New Revision: 42012 URL: http://svn.reactos.org/svn/reactos?rev=42012&view=rev Log: - Samplify SwitchToThread and QueueUserWorkItem - Remove unneeded InternalWorkItemTrampoline function and QUEUE_USER_WORKITEM_CONTEXT structure - Other small changes Modified: trunk/reactos/dll/win32/kernel32/thread/thread.c Modified: trunk/reactos/dll/win32/kernel32/thread/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] Fri Jul 17 20:42:12 2009 @@ -263,13 +263,13 @@ BOOL bInheritHandle, DWORD dwThreadId) { - NTSTATUS errCode; + NTSTATUS Status; HANDLE ThreadHandle; OBJECT_ATTRIBUTES ObjectAttributes; CLIENT_ID ClientId ; ClientId.UniqueProcess = 0; - ClientId.UniqueThread = (HANDLE)dwThreadId; + ClientId.UniqueThread = ULongToHandle(dwThreadId); InitializeObjectAttributes(&ObjectAttributes, NULL, @@ -277,13 +277,13 @@ NULL, NULL); - errCode = NtOpenThread(&ThreadHandle, - dwDesiredAccess, - &ObjectAttributes, - &ClientId); - if (!NT_SUCCESS(errCode)) - { - SetLastErrorByStatus (errCode); + Status = NtOpenThread(&ThreadHandle, + dwDesiredAccess, + &ObjectAttributes, + &ClientId); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); return NULL; } @@ -306,9 +306,7 @@ WINAPI SwitchToThread(VOID) { - NTSTATUS Status; - Status = NtYieldExecution(); - return Status != STATUS_NO_YIELD_PERFORMED; + return NtYieldExecution() != STATUS_NO_YIELD_PERFORMED; } @@ -750,10 +748,10 @@ * @unimplemented */ LANGID WINAPI -SetThreadUILanguage(WORD wReserved) -{ - DPRINT1("SetThreadUILanguage(0x%4x) unimplemented!\n", wReserved); - return 0; +SetThreadUILanguage(LANGID LangId) +{ + DPRINT1("SetThreadUILanguage(0x%4x) unimplemented!\n", LangId); + return LangId; } static void CALLBACK @@ -773,10 +771,13 @@ Status = NtQueueApcThread(hThread, IntCallUserApc, pfnAPC, (PVOID)dwData, NULL); - if (Status) + if (!NT_SUCCESS(Status)) + { SetLastErrorByStatus(Status); - - return NT_SUCCESS(Status); + return 0; + } + + return 1; } /* @@ -853,34 +854,6 @@ } -typedef struct _QUEUE_USER_WORKITEM_CONTEXT -{ - LPTHREAD_START_ROUTINE Function; - PVOID Context; -} QUEUE_USER_WORKITEM_CONTEXT, *PQUEUE_USER_WORKITEM_CONTEXT; - -static VOID -NTAPI -InternalWorkItemTrampoline(PVOID Context) -{ - QUEUE_USER_WORKITEM_CONTEXT Info; - - ASSERT(Context); - - /* Save the context to the stack */ - Info = *(volatile QUEUE_USER_WORKITEM_CONTEXT *)Context; - - /* Free the context before calling the callback. This avoids - a memory leak in case the thread dies... */ - RtlFreeHeap(RtlGetProcessHeap(), - 0, - Context); - - /* Call the real callback */ - Info.Function(Info.Context); -} - - /* * @implemented */ @@ -892,34 +865,13 @@ ULONG Flags ) { - PQUEUE_USER_WORKITEM_CONTEXT WorkItemContext; - NTSTATUS Status; - - /* Save the context for the trampoline function */ - WorkItemContext = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - sizeof(*WorkItemContext)); - if (WorkItemContext == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - WorkItemContext->Function = Function; - WorkItemContext->Context = Context; - - /* NOTE: Don't use Function directly since the callback signature - differs. This might cause problems on certain platforms... */ - Status = RtlQueueWorkItem(InternalWorkItemTrampoline, - WorkItemContext, + NTSTATUS Status; + + Status = RtlQueueWorkItem((WORKERCALLBACKFUNC)Function, + Context, Flags); if (!NT_SUCCESS(Status)) { - /* Free the allocated context in case of failure */ - RtlFreeHeap(RtlGetProcessHeap(), - 0, - WorkItemContext); - SetLastErrorByStatus(Status); return FALSE; } @@ -942,16 +894,16 @@ ULONG dwFlags ) { - NTSTATUS Status = RtlRegisterWait( phNewWaitObject, - hObject, - Callback, - Context, - dwMilliseconds, - dwFlags ); - - if (Status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(Status) ); + NTSTATUS Status = RtlRegisterWait(phNewWaitObject, + hObject, + Callback, + Context, + dwMilliseconds, + dwFlags); + + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); return FALSE; } return TRUE; @@ -974,18 +926,19 @@ NTSTATUS Status; HANDLE hNewWaitObject; - Status = RtlRegisterWait( &hNewWaitObject, - hObject, - Callback, - Context, - dwMilliseconds, - dwFlags ); - - if (Status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(Status) ); + Status = RtlRegisterWait(&hNewWaitObject, + hObject, + Callback, + Context, + dwMilliseconds, + dwFlags); + + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); return NULL; } + return hNewWaitObject; } @@ -999,12 +952,14 @@ HANDLE WaitHandle ) { - NTSTATUS Status = RtlDeregisterWaitEx( WaitHandle, NULL ); - if (Status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(Status) ); - return FALSE; - } + NTSTATUS Status = RtlDeregisterWaitEx(WaitHandle, NULL); + + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + return TRUE; } @@ -1019,12 +974,14 @@ HANDLE CompletionEvent ) { - NTSTATUS Status = RtlDeregisterWaitEx( WaitHandle, CompletionEvent ); - if (Status != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(Status) ); - return FALSE; - } + NTSTATUS Status = RtlDeregisterWaitEx(WaitHandle, CompletionEvent); + + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + return TRUE; }

1 0

[jimtabor] 42011: - Cleanup and minor changes. - The use of CSRSS for creating the desktop window is a cleverly written hack. Real genius! The down side, this is a good example of thread coding, I do hate having to remove it. We could just leave it in there unused to keep it as an example. Let me know.
by jimtabor＠svn.reactos.org 17 Jul '09

17 Jul '09

Author: jimtabor Date: Fri Jul 17 20:41:29 2009 New Revision: 42011 URL: http://svn.reactos.org/svn/reactos?rev=42011&view=rev Log: - Cleanup and minor changes. - The use of CSRSS for creating the desktop window is a cleverly written hack. Real genius! The down side, this is a good example of thread coding, I do hate having to remove it. We could just leave it in there unused to keep it as an example. Let me know. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c [iso-8859-1] Fri Jul 17 20:41:29 2009 @@ -11,7 +11,7 @@ #include "w32csr.h" #include <debug.h> -#define DESKTOP_WINDOW_ATOM 32769 //32880 +#define DESKTOP_WINDOW_ATOM 32769 #define PM_SHOW_DESKTOP 1 #define PM_HIDE_DESKTOP 2 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] Fri Jul 17 20:41:29 2009 @@ -38,7 +38,7 @@ static struct { int FnId; - INT ClsId; + int ClsId; } FnidToiCls[] = { { FNID_BUTTON, ICLS_BUTTON}, @@ -61,7 +61,7 @@ { int i; - for ( i = 0; i < 11; i++) + for ( i = 0; i < (sizeof(FnidToiCls)/2)/sizeof(int); i++) { if (FnidToiCls[i].FnId == FnId) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] Fri Jul 17 20:41:29 2009 @@ -1,27 +1,8 @@ /* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * $Id: painting.c 16320 2005-06-29 07:09:25Z navaraf $ - * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: ntuser init. and main funcs. - * FILE: subsys/win32k/ntuser/ntuser.c + * FILE: subsystems/win32/win32k/ntuser/ntuser.c * REVISION HISTORY: * 16 July 2005 Created (hardon) */ 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] Fri Jul 17 20:41:29 2009 @@ -1,26 +1,8 @@ -/* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Windows - * FILE: subsys/win32k/ntuser/window.c + * FILE: subsystems/win32/win32k/ntuser/window.c * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * REVISION HISTORY: * 06-06-2001 CSH Created @@ -1597,7 +1579,7 @@ * message window (style: WS_POPUP|WS_DISABLED) */ ParentWindowHandle = IntGetMessageWindow(); - DPRINT1("Parent is HWND_MESSAGE 0x%x\n", ParentWindowHandle); + DPRINT("Parent is HWND_MESSAGE 0x%x\n", ParentWindowHandle); } else if (hWndParent) {

1 0

[fireball] 42010: - Update wingdi.h with new stuff from Wine.
by fireball＠svn.reactos.org 17 Jul '09

17 Jul '09

Author: fireball Date: Fri Jul 17 20:23:48 2009 New Revision: 42010 URL: http://svn.reactos.org/svn/reactos?rev=42010&view=rev Log: - Update wingdi.h with new stuff from Wine. Modified: branches/arwinss/reactos/include/psdk/wingdi.h Modified: branches/arwinss/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/wi… ============================================================================== --- branches/arwinss/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/psdk/wingdi.h [iso-8859-1] Fri Jul 17 20:23:48 2009 @@ -190,6 +190,11 @@ #define EMR_SETLINKEDUFIS 119 #define EMR_SETTEXTJUSTIFICATION 120 #define EMR_COLORMATCHTOTARGETW 121 +#define EMR_CREATECOLORSPACEW 122 + +#define EMR_MIN 1 +#define EMR_MAX 122 + #endif #define ENHMETA_SIGNATURE 1179469088 #define EPS_SIGNATURE 0x46535045 @@ -265,6 +270,16 @@ #define META_CREATEFONTINDIRECT 0x2FB #define META_CREATEBRUSHINDIRECT 0x2FC #define META_CREATEREGION 0x6FF +#define META_DRAWTEXT 0x062F +#define META_RESETDC 0x014C +#define META_STARTDOC 0x014D +#define META_STARTPAGE 0x004F +#define META_ENDPAGE 0x0050 +#define META_ABORTDOC 0x0052 +#define META_ENDDOC 0x005E +#define META_CREATEBRUSH 0x00F8 +#define META_CREATEBITMAPINDIRECT 0x02FD +#define META_CREATEBITMAP 0x06FE #define PT_MOVETO 6 #define PT_LINETO 2 #define PT_BEZIERTO 4 @@ -379,6 +394,17 @@ #define JOHAB_CHARSET 130 #define VIETNAMESE_CHARSET 163 #define MAC_CHARSET 77 +/* I don't know if the values of *_CHARSET macros are defined in Windows + * or if we can choose them as we want. -- srtxg + */ +#define VISCII_CHARSET (BYTE)240 /* viscii1.1-1 */ +#define TCVN_CHARSET (BYTE)241 /* tcvn-0 */ +#define KOI8_CHARSET (BYTE)242 /* koi8-{r,u,ru} */ +#define ISO3_CHARSET (BYTE)243 /* iso8859-3 */ +#define ISO4_CHARSET (BYTE)244 /* iso8859-4 */ +#define ISO10_CHARSET (BYTE)245 /* iso8859-10 */ +#define CELTIC_CHARSET (BYTE)246 /* iso8859-14 */ + #define OUT_DEFAULT_PRECIS 0 #define OUT_STRING_PRECIS 1 #define OUT_CHARACTER_PRECIS 2 @@ -562,6 +588,7 @@ #define PS_TYPE_MASK 983040 #define ALTERNATE 1 #define WINDING 2 +#define POLYFILL_LAST 2 #define DC_BINNAMES 12 #define DC_BINS 6 #define DC_COPIES 18 @@ -601,6 +628,7 @@ #define DCBA_FACEDOWNRIGHT 259 #define FLOODFILLBORDER 0 #define FLOODFILLSURFACE 1 +#define ETO_GRAYED 0x00001 #define ETO_OPAQUE 0x00002 #define ETO_CLIPPED 0x00004 #if (WINVER >= 0x0400) @@ -813,6 +841,7 @@ #define GGO_UNHINTED 256 #define GM_COMPATIBLE 1 #define GM_ADVANCED 2 +#define GM_LAST 2 #define MM_ANISOTROPIC 8 #define MM_HIENGLISH 5 #define MM_HIMETRIC 3 @@ -889,6 +918,7 @@ #define MWT_MAX MWT_RIGHTMULTIPLY #define OPAQUE 2 #define TRANSPARENT 1 +#define BKMODE_LAST 2 #define BLACKONWHITE 1 #define WHITEONBLACK 2 #define COLORONCOLOR 3 @@ -1015,6 +1045,7 @@ #define BS_DIBPATTERNPT 6 #define BS_PATTERN8X8 7 #define BS_DIBPATTERN8X8 8 +#define BS_MONOPATTERN 9 #define LCS_CALIBRATED_RGB 0 #define LCS_DEVICE_RGB 1 #define LCS_DEVICE_CMYK 2 @@ -2151,6 +2182,26 @@ LONG cxSrc; LONG cySrc; } EMRSTRETCHBLT,*PEMRSTRETCHBLT; +typedef struct tagEMRALPHABLEND { + EMR emr; + RECTL rclBounds; + LONG xDest; + LONG yDest; + LONG cxDest; + LONG cyDest; + DWORD dwRop; + LONG xSrc; + LONG ySrc; + XFORM xformSrc; + COLORREF crBkColorSrc; + DWORD iUsageSrc; + DWORD offBmiSrc; + DWORD cbBmiSrc; + DWORD offBitsSrc; + DWORD cbBitsSrc; + LONG cxSrc; + LONG cySrc; +} EMRALPHABLEND, *PEMRALPHABLEND; typedef struct tagEMRSTRETCHDIBITS { EMR emr; RECTL rclBounds; @@ -2904,11 +2955,14 @@ BOOL WINAPI FixBrushOrgEx(HDC,int,int,LPPOINT); BOOL WINAPI FlattenPath(HDC); BOOL WINAPI FloodFill(HDC,int,int,COLORREF); +BOOL WINAPI FrameRgn(HDC,HRGN,HBRUSH,INT,INT); BOOL WINAPI GdiAlphaBlend(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION); BOOL WINAPI GdiComment(HDC,UINT,const BYTE*); +DEVMODEW * WINAPI GdiConvertToDevmodeW(const DEVMODEA *); BOOL WINAPI GdiFlush(void); DWORD WINAPI GdiGetBatchLimit(void); DWORD WINAPI GdiSetBatchLimit(DWORD); +BOOL WINAPI GdiIsMetaFileDC(HDC); #define GetCValue(cmyk) ((BYTE)(cmyk)) #define GetMValue(cmyk) ((BYTE)((cmyk)>> 8)) #define GetYValue(cmyk) ((BYTE)((cmyk)>>16)) @@ -3004,8 +3058,8 @@ UINT WINAPI GetSystemPaletteUse(HDC); UINT WINAPI GetTextAlign(HDC); int WINAPI GetTextCharacterExtra(HDC); -int WINAPI GetTextCharset(HDC); -int WINAPI GetTextCharsetInfo(HDC,LPFONTSIGNATURE,DWORD); +UINT WINAPI GetTextCharset(HDC); +UINT WINAPI GetTextCharsetInfo(HDC,LPFONTSIGNATURE,DWORD); COLORREF WINAPI GetTextColor(HDC); BOOL WINAPI GetTextExtentExPointA(HDC,LPCSTR,int,int,LPINT,LPINT,LPSIZE); BOOL WINAPI GetTextExtentExPointW( HDC,LPCWSTR,int,int,LPINT,LPINT,LPSIZE ); @@ -3046,11 +3100,11 @@ BOOL WINAPI PlgBlt(HDC,const POINT*,HDC,int,int,int,int,HBITMAP,int,int); BOOL WINAPI PolyBezier(HDC,const POINT*,DWORD); BOOL WINAPI PolyBezierTo(HDC,const POINT*,DWORD); -BOOL WINAPI PolyDraw(HDC,const POINT*,const BYTE*,int); +BOOL WINAPI PolyDraw(HDC,const POINT*,const BYTE*,DWORD); BOOL WINAPI Polygon(HDC,const POINT*,int); BOOL WINAPI Polyline(HDC,const POINT*,int); BOOL WINAPI PolylineTo(HDC,const POINT*,DWORD); -BOOL WINAPI PolyPolygon(HDC,const POINT*,const INT*,int); +BOOL WINAPI PolyPolygon(HDC,const POINT*,const INT*,DWORD); BOOL WINAPI PolyPolyline(HDC,const POINT*,const DWORD*,DWORD); BOOL WINAPI PolyTextOutA(HDC,const POLYTEXTA*,int); BOOL WINAPI PolyTextOutW(HDC,const POLYTEXTW*,int); @@ -3081,7 +3135,7 @@ HPALETTE WINAPI SelectPalette(HDC,HPALETTE,BOOL); int WINAPI SetAbortProc(HDC,ABORTPROC); int WINAPI SetArcDirection(HDC,int); -LONG WINAPI SetBitmapBits(HBITMAP,DWORD,PCVOID); +LONG WINAPI SetBitmapBits(HBITMAP,LONG,PCVOID); BOOL WINAPI SetBitmapDimensionEx(HBITMAP,int,int,LPSIZE); COLORREF WINAPI SetBkColor(HDC,COLORREF); int WINAPI SetBkMode(HDC,int); @@ -3117,6 +3171,7 @@ BOOL WINAPI SetPixelV(HDC,int,int,COLORREF); int WINAPI SetPolyFillMode(HDC,int); BOOL WINAPI SetRectRgn(HRGN,int,int,int,int); +INT WINAPI SetRelAbs(HDC,INT); int WINAPI SetROP2(HDC,int); int WINAPI SetStretchBltMode(HDC,int); UINT WINAPI SetSystemPaletteUse(HDC,UINT); @@ -3336,6 +3391,22 @@ #endif #endif +#ifdef __WINESRC__ +/* the DC hook support is only exported on Win16, the 32-bit version is a Wine extension */ + +#define DCHC_INVALIDVISRGN 0x0001 +#define DCHC_DELETEDC 0x0002 +#define DCHF_INVALIDATEVISRGN 0x0001 +#define DCHF_VALIDATEVISRGN 0x0002 + +typedef BOOL (CALLBACK *DCHOOKPROC)(HDC,WORD,DWORD_PTR,LPARAM); + +WINGDIAPI DWORD_PTR WINAPI GetDCHook(HDC,DCHOOKPROC*); +WINGDIAPI BOOL WINAPI SetDCHook(HDC,DCHOOKPROC,DWORD_PTR); +WINGDIAPI WORD WINAPI SetHookFlags(HDC,WORD); +WINGDIAPI INT WINAPI SelectVisRgn(HDC,HRGN); +#endif /* __WINESRC__ */ + #ifdef _MSC_VER #pragma warning(pop) #endif

1 0

[fireball] 42009: - Add .rbuild and .rc files for gdi32 and user32.
by fireball＠svn.reactos.org 17 Jul '09

17 Jul '09

Author: fireball Date: Fri Jul 17 20:08:01 2009 New Revision: 42009 URL: http://svn.reactos.org/svn/reactos?rev=42009&view=rev Log: - Add .rbuild and .rc files for gdi32 and user32. Added: branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild (with props) branches/arwinss/reactos/dll/win32/gdi32/gdi32.rc (with props) branches/arwinss/reactos/dll/win32/user32/user32.rbuild (with props) branches/arwinss/reactos/dll/win32/user32/user32.rc (with props) Added: branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild (added) +++ branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] Fri Jul 17 20:08:01 2009 @@ -1,0 +1,41 @@ +<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes"> + <importlibrary definition="gdi32.spec" /> + <include base="gdi32">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="WINVER">0x0600</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="LANGPACK" /> + <library>ntdll</library> + <library>user32</library> + <library>kernel32</library> +  + <library>win32ksys</library> + <library>pseh</library> + <library>dxguid</library> + + <file>bidi.c</file> + <file>bitblt.c</file> + <file>bitmap.c</file> + <file>brush.c</file> + <file>clipping.c</file> + <file>dc.c</file> + <file>dib.c</file> + <file>driver.c</file> + <file>enhmetafile.c</file> + <file>font.c</file> + <file>freetype.c</file> + <file>gdi_main.c</file> + <file>gdiobj.c</file> + <file>icm.c</file> + <file>mapping.c</file> + <file>metafile.c</file> + <file>opengl.c</file> + <file>painting.c</file> + <file>palette.c</file> + <file>path.c</file> + <file>pen.c</file> + <file>printdrv.c</file> + <file>region.c</file> + + <file>gdi32.rc</file> +</module> Propchange: branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/arwinss/reactos/dll/win32/gdi32/gdi32.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/gdi32.rc (added) +++ branches/arwinss/reactos/dll/win32/gdi32/gdi32.rc [iso-8859-1] Fri Jul 17 20:08:01 2009 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "GDI Client DLL\0" +#define REACTOS_STR_INTERNAL_NAME "gdi32\0" +#define REACTOS_STR_ORIGINAL_FILENAME "gdi32.dll\0" +#include <reactos/version.rc> Propchange: branches/arwinss/reactos/dll/win32/gdi32/gdi32.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/arwinss/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/user32.rbuild (added) +++ branches/arwinss/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] Fri Jul 17 20:08:01 2009 @@ -1,0 +1,20 @@ +<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" installbase="system32" installname="user32.dll" unicode="yes"> + <importlibrary definition="user32.spec" /> + <include base="user32">.</include> + <include base="user32">include</include> + <include base="ReactOS">include/reactos/subsys</include> + <define name="_DISABLE_TIDENTS" /> + <define name="WINVER">0x0600</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>wine</library> + <library>ntdll</library> + <library>gdi32</library> + <library>kernel32</library> + <library>advapi32</library> + <library>imm32</library> + <library>win32ksys</library> + <library>pseh</library> + + <file>winpos.c</file> + <file>user32.rc</file> +</module> Propchange: branches/arwinss/reactos/dll/win32/user32/user32.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/arwinss/reactos/dll/win32/user32/user32.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/user32.rc (added) +++ branches/arwinss/reactos/dll/win32/user32/user32.rc [iso-8859-1] Fri Jul 17 20:08:01 2009 @@ -1,0 +1,103 @@ +/* $Id: user32.rc 34194 2008-06-29 20:36:47Z mkupfer $ */ + +#include <windows.h> +#include "resource.h" + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS User API Client Dll\0" +#define REACTOS_STR_INTERNAL_NAME "user32\0" +#define REACTOS_STR_ORIGINAL_FILENAME "user32.dll\0" +#include <reactos/version.rc> + +#define IDS_MDI_MOREWINDOWS 13 + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +///////////////////////////////////////////////////////////////////////////// +// +// Cursors +// + +/* New cursor resources */ +100 CURSOR "resources/ocr_normal.cur" +101 CURSOR "resources/ocr_ibeam.cur" +102 CURSOR "resources/ocr_wait.cur" +103 CURSOR "resources/ocr_cross.cur" +104 CURSOR "resources/ocr_up.cur" +105 CURSOR "resources/ocr_sizenwse.cur" +106 CURSOR "resources/ocr_sizenesw.cur" +107 CURSOR "resources/ocr_sizewe.cur" +108 CURSOR "resources/ocr_sizens.cur" +109 CURSOR "resources/ocr_sizeall.cur" +110 CURSOR "resources/ocr_no.cur" +111 CURSOR "resources/ocr_appstarting.cur" +112 CURSOR "resources/ocr_help.cur" +113 CURSOR "resources/ocr_pen.cur" +114 CURSOR "resources/ocr_hand.cur" +115 CURSOR "resources/ocr_icon.cur" +116 CURSOR "resources/ocr_cdautostart.cur" + +/* Compatible cursor resources (will be removed) */ +32512 CURSOR "resources/ocr_normal.cur" +32513 CURSOR "resources/ocr_ibeam.cur" +32514 CURSOR "resources/ocr_wait.cur" +32515 CURSOR "resources/ocr_cross.cur" +32516 CURSOR "resources/ocr_up.cur" +32642 CURSOR "resources/ocr_sizenwse.cur" +32643 CURSOR "resources/ocr_sizenesw.cur" +32644 CURSOR "resources/ocr_sizewe.cur" +32645 CURSOR "resources/ocr_sizens.cur" +32646 CURSOR "resources/ocr_sizeall.cur" +32648 CURSOR "resources/ocr_no.cur" +32650 CURSOR "resources/ocr_appstarting.cur" +32651 CURSOR "resources/ocr_help.cur" +32640 CURSOR "resources/ocr_size.cur" +32641 CURSOR "resources/ocr_icon.cur" +32649 CURSOR "resources/ocr_hand.cur" + +///////////////////////////////////////////////////////////////////////////// +// +// Icons +// + +32512 ICON "resources/oic_sample.ico" +32513 ICON "resources/oic_hand.ico" +32514 ICON "resources/oic_ques.ico" +32515 ICON "resources/oic_bang.ico" +32516 ICON "resources/oic_note.ico" +32517 ICON "resources/oic_reactos.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// Bitmaps +// + +OBM_CHECKBOXES BITMAP "resources/obm_checkboxes.bmp" +OBM_CLOSE BITMAP "resources/obm_close.bmp" +OBM_COMBO BITMAP "resources/obm_combo.bmp" +OBM_MNARROW BITMAP "resources/obm_mnarrow.bmp" + +///////////////////////////////////////////////////////////////////////////// +// +// Languages +// + +#include "lang/bg-BG.rc" +#include "lang/cs-CZ.rc" +#include "lang/da-DK.rc" +#include "lang/de-DE.rc" +#include "lang/el-GR.rc" +#include "lang/en-US.rc" +#include "lang/es-ES.rc" +#include "lang/fr-FR.rc" +#include "lang/hu-HU.rc" +#include "lang/id-ID.rc" +#include "lang/ja-JP.rc" +#include "lang/nl-NL.rc" +#include "lang/nb-NO.rc" +#include "lang/pl-PL.rc" +#include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" +#include "lang/sv-SE.rc" +#include "lang/uk-UA.rc" +#include "lang/it-IT.rc" Propchange: branches/arwinss/reactos/dll/win32/user32/user32.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 42008: - Remove tests and 16 bit stuff.
by fireball＠svn.reactos.org 17 Jul '09

17 Jul '09

Author: fireball Date: Fri Jul 17 20:05:01 2009 New Revision: 42008 URL: http://svn.reactos.org/svn/reactos?rev=42008&view=rev Log: - Remove tests and 16 bit stuff. Removed: branches/arwinss/reactos/dll/win32/gdi32/Makefile.in branches/arwinss/reactos/dll/win32/gdi32/bidi16.c branches/arwinss/reactos/dll/win32/gdi32/env.c branches/arwinss/reactos/dll/win32/gdi32/gdi.exe.spec branches/arwinss/reactos/dll/win32/gdi32/gdi16.c branches/arwinss/reactos/dll/win32/gdi32/printdrv16.c branches/arwinss/reactos/dll/win32/gdi32/tests/ branches/arwinss/reactos/dll/win32/gdi32/version.rc branches/arwinss/reactos/dll/win32/gdi32/version16.rc branches/arwinss/reactos/dll/win32/gdi32/wing.c branches/arwinss/reactos/dll/win32/gdi32/wing.spec branches/arwinss/reactos/dll/win32/user32/bidi16.c branches/arwinss/reactos/dll/win32/user32/comm16.c branches/arwinss/reactos/dll/win32/user32/hook16.c branches/arwinss/reactos/dll/win32/user32/network.c branches/arwinss/reactos/dll/win32/user32/resources/version16.rc branches/arwinss/reactos/dll/win32/user32/tests/ branches/arwinss/reactos/dll/win32/user32/user.exe.spec branches/arwinss/reactos/dll/win32/user32/user16.c branches/arwinss/reactos/dll/win32/user32/wnd16.c [This mail would be too long, it was shortened to contain the URLs only.] Removed: branches/arwinss/reactos/dll/win32/gdi32/Makefile.in URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Removed: branches/arwinss/reactos/dll/win32/gdi32/bidi16.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Removed: branches/arwinss/reactos/dll/win32/gdi32/env.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Removed: branches/arwinss/reactos/dll/win32/gdi32/gdi.exe.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Removed: branches/arwinss/reactos/dll/win32/gdi32/gdi16.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Removed: branches/arwinss/reactos/dll/win32/gdi32/printdrv16.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Removed: branches/arwinss/reactos/dll/win32/gdi32/version.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Removed: branches/arwinss/reactos/dll/win32/gdi32/version16.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Removed: branches/arwinss/reactos/dll/win32/gdi32/wing.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Removed: branches/arwinss/reactos/dll/win32/gdi32/wing.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… Removed: branches/arwinss/reactos/dll/win32/user32/bidi16.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Removed: branches/arwinss/reactos/dll/win32/user32/comm16.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Removed: branches/arwinss/reactos/dll/win32/user32/hook16.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Removed: branches/arwinss/reactos/dll/win32/user32/network.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Removed: branches/arwinss/reactos/dll/win32/user32/resources/version16.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Removed: branches/arwinss/reactos/dll/win32/user32/user.exe.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Removed: branches/arwinss/reactos/dll/win32/user32/user16.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Removed: branches/arwinss/reactos/dll/win32/user32/wnd16.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3…

1 0

[fireball] 42007: - Copy Wine's gdi32 and user32.
by fireball＠svn.reactos.org 17 Jul '09

17 Jul '09

Author: fireball Date: Fri Jul 17 20:02:01 2009 New Revision: 42007 URL: http://svn.reactos.org/svn/reactos?rev=42007&view=rev Log: - Copy Wine's gdi32 and user32. Added: branches/arwinss/reactos/dll/win32/gdi32/ - copied from r41998, vendor/wine/dlls/gdi32/current/ branches/arwinss/reactos/dll/win32/user32/ - copied from r41998, vendor/wine/dlls/user32/current/

1 0

[dchapyshev] 42006: - Remove unneeded check and cycle
by dchapyshev＠svn.reactos.org 17 Jul '09

17 Jul '09

Author: dchapyshev Date: Fri Jul 17 19:53:37 2009 New Revision: 42006 URL: http://svn.reactos.org/svn/reactos?rev=42006&view=rev Log: - Remove unneeded check and cycle Modified: trunk/reactos/dll/win32/kernel32/misc/ldr.c Modified: trunk/reactos/dll/win32/kernel32/misc/ldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ld… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/ldr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/ldr.c [iso-8859-1] Fri Jul 17 19:53:37 2009 @@ -335,7 +335,7 @@ if (!NT_SUCCESS(Status)) { - SetLastError( RtlNtStatusToDosError( Status ) ); + SetLastErrorByStatus(Status); fnExp = NULL; } @@ -388,10 +388,8 @@ DWORD dwExitCode ) { - if ( FreeLibrary(hLibModule) ) - ExitThread(dwExitCode); - for (;;) - ; + FreeLibrary(hLibModule); + ExitThread(dwExitCode); }

1 0

[dchapyshev] 42005: - Re-implement FreeLibrary (for support LOAD_LIBRARY_AS_DATAFILE) - HeapAlloc -> RtlAllocateHeap, GetProcessHeap -> RtlGetProcessHeap, HeapFree -> RtlFreeHeap, CloseHandle -> NtClose - Remove FIXME in LoadModule
by dchapyshev＠svn.reactos.org 17 Jul '09

17 Jul '09

Author: dchapyshev Date: Fri Jul 17 19:15:17 2009 New Revision: 42005 URL: http://svn.reactos.org/svn/reactos?rev=42005&view=rev Log: - Re-implement FreeLibrary (for support LOAD_LIBRARY_AS_DATAFILE) - HeapAlloc -> RtlAllocateHeap, GetProcessHeap -> RtlGetProcessHeap, HeapFree -> RtlFreeHeap, CloseHandle -> NtClose - Remove FIXME in LoadModule Modified: trunk/reactos/dll/win32/kernel32/misc/ldr.c Modified: trunk/reactos/dll/win32/kernel32/misc/ldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ld… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/ldr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/ldr.c [iso-8859-1] Fri Jul 17 19:15:17 2009 @@ -20,6 +20,7 @@ } LOADPARMS32; extern BOOLEAN InWindows; +extern WaitForInputIdleType lpfnGlobalRegisterWaitForInputIdle; /* FUNCTIONS ****************************************************************/ @@ -349,8 +350,31 @@ WINAPI FreeLibrary( HMODULE hLibModule ) { - LdrUnloadDll(hLibModule); - return TRUE; + PVOID Module = (PVOID)((ULONG_PTR)hLibModule & ~1); + NTSTATUS Status; + + if ((ULONG_PTR)hLibModule & 1) + { + if (!RtlImageNtHeader(Module)) + { + SetLastErrorByStatus(STATUS_INVALID_IMAGE_FORMAT); + return FALSE; + } + + Status = NtUnmapViewOfSection(NtCurrentProcess(), Module); + } + else + { + Status = LdrUnloadDll(hLibModule); + } + + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + return TRUE; } @@ -703,7 +727,7 @@ } Length = (BYTE)LoadParams->lpCmdLine[0]; - if(!(CommandLine = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + if(!(CommandLine = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, strlen(lpModuleName) + Length + 2))) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -727,7 +751,7 @@ { DWORD Error; - HeapFree(GetProcessHeap(), 0, CommandLine); + RtlFreeHeap(RtlGetProcessHeap(), 0, CommandLine); /* return the right value */ Error = GetLastError(); switch(Error) @@ -745,14 +769,16 @@ return 0; } - HeapFree(GetProcessHeap(), 0, CommandLine); + RtlFreeHeap(RtlGetProcessHeap(), 0, CommandLine); /* Wait up to 15 seconds for the process to become idle */ - /* FIXME: This is user32! Windows soft-loads this only if required. */ - //WaitForInputIdle(ProcessInformation.hProcess, 15000); - - CloseHandle(ProcessInformation.hThread); - CloseHandle(ProcessInformation.hProcess); + if (NULL != lpfnGlobalRegisterWaitForInputIdle) + { + lpfnGlobalRegisterWaitForInputIdle(ProcessInformation.hProcess, 15000); + } + + NtClose(ProcessInformation.hThread); + NtClose(ProcessInformation.hProcess); return 33; }

1 0

[dchapyshev] 42004: - Implement LOAD_LIBRARY_AS_DATAFILE flag for LoadLibraryExW (based on Wine code).
by dchapyshev＠svn.reactos.org 17 Jul '09

17 Jul '09

Author: dchapyshev Date: Fri Jul 17 17:53:15 2009 New Revision: 42004 URL: http://svn.reactos.org/svn/reactos?rev=42004&view=rev Log: - Implement LOAD_LIBRARY_AS_DATAFILE flag for LoadLibraryExW (based on Wine code). Modified: trunk/reactos/dll/win32/kernel32/misc/ldr.c Modified: trunk/reactos/dll/win32/kernel32/misc/ldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ld… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/ldr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/ldr.c [iso-8859-1] Fri Jul 17 17:53:15 2009 @@ -161,6 +161,49 @@ } +static +NTSTATUS +LoadLibraryAsDatafile(PWSTR path, LPCWSTR name, HMODULE* hmod) +{ + static const WCHAR dotDLL[] = {'.','d','l','l',0}; + + WCHAR filenameW[MAX_PATH]; + HANDLE hFile = INVALID_HANDLE_VALUE; + HANDLE mapping; + HMODULE module; + + *hmod = 0; + + if (!SearchPathW( path, name, dotDLL, sizeof(filenameW) / sizeof(filenameW[0]), + filenameW, NULL )) + { + return NtCurrentTeb()->LastStatusValue; + } + + hFile = CreateFileW( filenameW, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, 0, 0 ); + + if (hFile == INVALID_HANDLE_VALUE) return NtCurrentTeb()->LastStatusValue; + + mapping = CreateFileMappingW( hFile, NULL, PAGE_READONLY, 0, 0, NULL ); + CloseHandle( hFile ); + if (!mapping) return NtCurrentTeb()->LastStatusValue; + + module = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 ); + CloseHandle( mapping ); + if (!module) return NtCurrentTeb()->LastStatusValue; + + /* make sure it's a valid PE file */ + if (!RtlImageNtHeader(module)) + { + UnmapViewOfFile( module ); + return STATUS_INVALID_IMAGE_FORMAT; + } + *hmod = (HMODULE)((char *)module + 1); /* set low bit of handle to indicate datafile module */ + return STATUS_SUCCESS; +} + + /* * @implemented */ @@ -200,6 +243,7 @@ dwFlags & LOAD_WITH_ALTERED_SEARCH_PATH ? lpLibFileName : NULL); RtlInitUnicodeString(&DllName, (LPWSTR)lpLibFileName); + if (DllName.Buffer[DllName.Length/sizeof(WCHAR) - 1] == L' ') { RtlCreateUnicodeString(&DllName, (LPWSTR)lpLibFileName); @@ -211,6 +255,28 @@ DllName.Buffer[DllName.Length/sizeof(WCHAR)] = UNICODE_NULL; FreeString = TRUE; } + + if (dwFlags & LOAD_LIBRARY_AS_DATAFILE) + { + Status = LdrGetDllHandle(SearchPath, NULL, &DllName, (PVOID*)&hInst); + if (!NT_SUCCESS(Status)) + { + /* The method in load_library_as_datafile allows searching for the + * 'native' libraries only + */ + Status = LoadLibraryAsDatafile(SearchPath, DllName.Buffer, &hInst); + RtlFreeUnicodeString(&DllName); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return NULL; + } + + return hInst; + } + } + + /* HACK!!! FIXME */ if (InWindows) { /* Call the API Properly */ @@ -224,6 +290,7 @@ /* Call the ROS API. NOTE: Don't fix this, I have a patch to merge later. */ Status = LdrLoadDll(SearchPath, &dwFlags, &DllName, (PVOID*)&hInst); } + RtlFreeHeap(RtlGetProcessHeap(), 0, SearchPath); if (FreeString) RtlFreeUnicodeString(&DllName);

1 0

[dchapyshev] 42003: - Rewrite SearchPathW (based on Wine code). It fixes regression in mysql
by dchapyshev＠svn.reactos.org 17 Jul '09

17 Jul '09

Author: dchapyshev Date: Fri Jul 17 15:24:07 2009 New Revision: 42003 URL: http://svn.reactos.org/svn/reactos?rev=42003&view=rev Log: - Rewrite SearchPathW (based on Wine code). It fixes regression in mysql Modified: trunk/reactos/dll/win32/kernel32/file/dir.c trunk/reactos/dll/win32/kernel32/include/kernel32.h trunk/reactos/dll/win32/kernel32/misc/ldr.c Modified: trunk/reactos/dll/win32/kernel32/file/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/di… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/dir.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/dir.c [iso-8859-1] Fri Jul 17 15:24:07 2009 @@ -954,183 +954,102 @@ } +/*********************************************************************** + * ContainsPath (Wine name: contains_pathW) + * + * Check if the file name contains a path; helper for SearchPathW. + * A relative path is not considered a path unless it starts with ./ or ../ + */ +static +BOOL +ContainsPath(LPCWSTR name) +{ + if (RtlDetermineDosPathNameType_U(name) != RtlPathTypeRelative) return TRUE; + if (name[0] != '.') return FALSE; + if (name[1] == '/' || name[1] == '\\') return TRUE; + return (name[1] == '.' && (name[2] == '/' || name[2] == '\\')); +} + + /* * @implemented */ DWORD WINAPI -SearchPathW ( - LPCWSTR lpPath, - LPCWSTR lpFileName, - LPCWSTR lpExtension, - DWORD nBufferLength, - LPWSTR lpBuffer, - LPWSTR *lpFilePart - ) -/* - * FUNCTION: Searches for the specified file - * ARGUMENTS: - * lpPath = Points to a null-terminated string that specified the - * path to be searched. If this parameters is NULL then - * the following directories are searched - * The directory from which the application loaded - * The current directory - * The system directory - * The 16-bit system directory - * The windows directory - * The directories listed in the PATH environment - * variable - * lpFileName = Specifies the filename to search for - * lpExtension = Points to the null-terminated string that specifies - * an extension to be added to the filename when - * searching for the file. The first character of the - * filename extension must be a period (.). The - * extension is only added if the specified filename - * doesn't end with an extension - * - * If the filename extension is not required or if the - * filename contains an extension, this parameters can be - * NULL - * nBufferLength = The length in characters of the buffer for output - * lpBuffer = Points to the buffer for the valid path and filename of - * file found - * lpFilePart = Points to the last component of the valid path and - * filename - * RETURNS: On success, the length, in characters, of the string copied to the - * buffer - * On failure, zero. - */ -{ - DWORD retCode = 0; - ULONG pos, len; - PWCHAR EnvironmentBufferW = NULL; - PWCHAR AppPathW = NULL; - WCHAR Buffer; - BOOL HasExtension = FALSE, IsAbsolute = FALSE; - LPCWSTR p; - PWCHAR Name; - - TRACE("SearchPath\n"); - - p = lpFileName + wcslen(lpFileName); - while (lpFileName < p && - L'\\' != *(p - 1) && - L'/' != *(p - 1)) - { - HasExtension = HasExtension || L'.' == *(p - 1); - if (p >= lpFileName && L'\\' == *(p-1)) - { - if (':' == *p) - IsAbsolute = TRUE; - } - p--; - } - if (IsAbsolute) - { - if (HasExtension || NULL == lpExtension) - { - Name = (PWCHAR) lpFileName; - } - else - { - Name = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_GENERATE_EXCEPTIONS, - (wcslen(lpFileName) + wcslen(lpExtension) + 1) - * sizeof(WCHAR)); - if (NULL == Name) - { - SetLastError(ERROR_OUTOFMEMORY); - return 0; - } - wcscat(wcscpy(Name, lpFileName), lpExtension); - } - if (RtlDoesFileExists_U(Name)) - { - retCode = RtlGetFullPathName_U (Name, - nBufferLength * sizeof(WCHAR), - lpBuffer, - lpFilePart); - } - if (Name != lpFileName) - { - RtlFreeHeap(GetProcessHeap(), 0, Name); - } +SearchPathW(LPCWSTR lpPath, + LPCWSTR lpFileName, + LPCWSTR lpExtension, + DWORD nBufferLength, + LPWSTR lpBuffer, + LPWSTR *lpFilePart) +{ + DWORD ret = 0; + + /* If the name contains an explicit path, ignore the path */ + if (ContainsPath(lpFileName)) + { + /* try first without extension */ + if (RtlDoesFileExists_U(lpFileName)) + return GetFullPathNameW(lpFileName, nBufferLength, lpBuffer, lpFilePart); + + if (lpExtension) + { + LPCWSTR p = wcsrchr(lpFileName, '.'); + if (p && !strchr((const char *)p, '/') && !wcschr( p, '\\' )) + lpExtension = NULL; /* Ignore the specified extension */ + } + + /* Allocate a buffer for the file name and extension */ + if (lpExtension) + { + LPWSTR tmp; + DWORD len = wcslen(lpFileName) + wcslen(lpExtension); + + if (!(tmp = RtlAllocateHeap(RtlGetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)))) + { + SetLastError(ERROR_OUTOFMEMORY); + return 0; + } + wcscpy(tmp, lpFileName); + wcscat(tmp, lpExtension); + if (RtlDoesFileExists_U(tmp)) + ret = GetFullPathNameW(tmp, nBufferLength, lpBuffer, lpFilePart); + RtlFreeHeap(RtlGetProcessHeap(), 0, tmp); + } + } + else if (lpPath && lpPath[0]) /* search in the specified path */ + { + ret = RtlDosSearchPath_U(lpPath, + lpFileName, + lpExtension, + nBufferLength * sizeof(WCHAR), + lpBuffer, + lpFilePart) / sizeof(WCHAR); + } + else /* search in the default path */ + { + WCHAR *DllPath = GetDllLoadPath(NULL); + + if (DllPath) + { + ret = RtlDosSearchPath_U(DllPath, + lpFileName, + lpExtension, + nBufferLength * sizeof(WCHAR), + lpBuffer, + lpFilePart) / sizeof(WCHAR); + RtlFreeHeap(RtlGetProcessHeap(), 0, DllPath); } else { - if (lpPath == NULL) - { - - AppPathW = (PWCHAR) RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_GENERATE_EXCEPTIONS|HEAP_ZERO_MEMORY, - MAX_PATH * sizeof(WCHAR)); - if (AppPathW == NULL) - { - SetLastError(ERROR_OUTOFMEMORY); - return 0; - } - - - wcscat (AppPathW, NtCurrentPeb()->ProcessParameters->ImagePathName.Buffer); - - len = wcslen (AppPathW); - - while (len && AppPathW[len - 1] != L'\\') - len--; - - if (len) AppPathW[len-1] = L'\0'; - - len = GetEnvironmentVariableW(L"PATH", &Buffer, 0); - len += 1 + GetCurrentDirectoryW(0, &Buffer); - len += 1 + GetSystemDirectoryW(&Buffer, 0); - len += 1 + GetWindowsDirectoryW(&Buffer, 0); - len += 1 + wcslen(AppPathW) * sizeof(WCHAR); - - EnvironmentBufferW = (PWCHAR) RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_GENERATE_EXCEPTIONS|HEAP_ZERO_MEMORY, - len * sizeof(WCHAR)); - if (EnvironmentBufferW == NULL) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, AppPathW); - SetLastError(ERROR_OUTOFMEMORY); - return 0; - } - - pos = GetCurrentDirectoryW(len, EnvironmentBufferW); - EnvironmentBufferW[pos++] = L';'; - EnvironmentBufferW[pos] = 0; - pos += GetSystemDirectoryW(&EnvironmentBufferW[pos], len - pos); - EnvironmentBufferW[pos++] = L';'; - EnvironmentBufferW[pos] = 0; - pos += GetWindowsDirectoryW(&EnvironmentBufferW[pos], len - pos); - EnvironmentBufferW[pos++] = L';'; - EnvironmentBufferW[pos] = 0; - pos += GetEnvironmentVariableW(L"PATH", &EnvironmentBufferW[pos], len - pos); - EnvironmentBufferW[pos++] = L';'; - EnvironmentBufferW[pos] = 0; - wcscat (EnvironmentBufferW, AppPathW); - - RtlFreeHeap (RtlGetProcessHeap (), - 0, - AppPathW); - - lpPath = EnvironmentBufferW; - - } - - retCode = RtlDosSearchPath_U ((PWCHAR)lpPath, (PWCHAR)lpFileName, (PWCHAR)lpExtension, - nBufferLength * sizeof(WCHAR), lpBuffer, lpFilePart); - - if (EnvironmentBufferW != NULL) - { - RtlFreeHeap(GetProcessHeap(), 0, EnvironmentBufferW); - } - if (retCode == 0) - { - SetLastError(ERROR_FILE_NOT_FOUND); - } - } - return retCode / sizeof(WCHAR); + SetLastError(ERROR_OUTOFMEMORY); + return 0; + } + } + + if (!ret) SetLastError(ERROR_FILE_NOT_FOUND); + + return ret; } /* Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Fri Jul 17 15:24:07 2009 @@ -189,5 +189,8 @@ PCODEPAGE_ENTRY FASTCALL IntGetCodePageEntry(UINT CodePage); +LPWSTR +GetDllLoadPath(LPCWSTR lpModule); + #endif /* ndef _KERNEL32_INCLUDE_KERNEL32_H */ Modified: trunk/reactos/dll/win32/kernel32/misc/ldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ld… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/ldr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/ldr.c [iso-8859-1] Fri Jul 17 15:24:07 2009 @@ -31,7 +31,7 @@ * @remarks Returned pointer must be freed by caller. */ -LPWSTR WINAPI +LPWSTR GetDllLoadPath(LPCWSTR lpModule) { ULONG Pos = 0, Length = 0;

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
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