Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

[greatlrd] 33407: adding a simple NtGdiGetStockObject it show undocumented stockobject exists in windows xp/2003 value 20 and 21

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat May 10 09:01:40 2008 New Revision: 33407 URL: http://svn.reactos.org/svn/reactos?rev=33407&view=rev Log: adding a simple NtGdiGetStockObject it show undocumented stockobject exists in windows xp/2003 value 20 and 21 Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetStockObject.c (with props) Modified: trunk/rostests/apitests/w32knapi/testlist.c Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetStockObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetStockObject.c (added) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetStockObject.c [iso-8859-1] Sat May 10 09:01:40 2008 @@ -1,0 +1,30 @@ + +INT +Test_NtGdiGetStockObject(PTESTINFO pti) +{ + RTEST(NtGdiGetStockObject(WHITE_BRUSH) != 0); + RTEST(NtGdiGetStockObject(LTGRAY_BRUSH) != 0); + RTEST(NtGdiGetStockObject(GRAY_BRUSH) != 0); + RTEST(NtGdiGetStockObject(DKGRAY_BRUSH) != 0); + RTEST(NtGdiGetStockObject(BLACK_BRUSH) != 0); + RTEST(NtGdiGetStockObject(NULL_BRUSH) != 0); + RTEST(NtGdiGetStockObject(WHITE_PEN) != 0); + RTEST(NtGdiGetStockObject(BLACK_PEN) != 0); + RTEST(NtGdiGetStockObject(NULL_PEN) != 0); + RTEST(NtGdiGetStockObject(9) == 0); + RTEST(NtGdiGetStockObject(OEM_FIXED_FONT) != 0); + RTEST(NtGdiGetStockObject(ANSI_FIXED_FONT) != 0); + RTEST(NtGdiGetStockObject(ANSI_VAR_FONT) != 0); + RTEST(NtGdiGetStockObject(SYSTEM_FONT) != 0); + RTEST(NtGdiGetStockObject(DEVICE_DEFAULT_FONT) != 0); + RTEST(NtGdiGetStockObject(DEFAULT_PALETTE) != 0); + RTEST(NtGdiGetStockObject(SYSTEM_FIXED_FONT) != 0); + RTEST(NtGdiGetStockObject(DEFAULT_GUI_FONT) != 0); + RTEST(NtGdiGetStockObject(DC_BRUSH) != 0); + RTEST(NtGdiGetStockObject(DC_PEN) != 0); + RTEST(NtGdiGetStockObject(20) != 0); + RTEST(NtGdiGetStockObject(21) != 0); + RTEST(NtGdiGetStockObject(22) == 0); + RTEST(NtGdiGetStockObject(23) == 0); + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetStockObject.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/w32knapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/testlis… ============================================================================== --- trunk/rostests/apitests/w32knapi/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/testlist.c [iso-8859-1] Sat May 10 09:01:40 2008 @@ -23,6 +23,7 @@ #include "ntgdi/NtGdiSetBitmapBits.c" //#include "ntgdi/NtGdiSTROBJ_vEnumStart.c" #include "ntgdi/NtGdiGetDIBits.c" +#include "ntgdi/NtGdiGetStockObject.c" #include "ntuser/NtUserCallHwnd.c" #include "ntuser/NtUserCallHwndLock.c" @@ -50,7 +51,7 @@ /* ntgdi */ { L"NtGdiArcInternal", Test_NtGdiArcInternal }, { L"NtGdiBitBlt", Test_NtGdiBitBlt }, - { L"NtGdiCreateBitmap", Test_NtGdiCreateBitmap }, +{ L"NtGdiCreateBitmap", Test_NtGdiCreateBitmap }, { L"NtGdiCreateCompatibleBitmap", Test_NtGdiCreateCompatibleBitmap }, { L"NtGdiDoPalette", Test_NtGdiDoPalette }, { L"NtGdiEngCreatePalette", Test_NtGdiEngCreatePalette }, @@ -65,6 +66,7 @@ { L"NtGdiSelectPen", Test_NtGdiSelectPen }, // { L"NtGdiSTROBJ_vEnumStart", Test_NtGdiSTROBJ_vEnumStart }, { L"NtGdiGetDIBitsInternal", Test_NtGdiGetDIBitsInternal }, + { L"NtGdiGetStockObject", Test_NtGdiGetStockObject }, /* ntuser */ { L"NtUserCallHwnd", Test_NtUserCallHwnd },

16 years, 4 months

[greatlrd] 33406: commit testcase for wdith negative and 0

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat May 10 07:02:59 2008 New Revision: 33406 URL: http://svn.reactos.org/svn/reactos?rev=33406&view=rev Log: commit testcase for wdith negative and 0 Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c [iso-8859-1] Sat May 10 07:02:59 2008 @@ -158,6 +158,18 @@ TEST((hBmp = NtGdiCreateBitmap(1, -1, 1, 1, NULL)) == NULL); TEST(GetLastError() == ERROR_INVALID_PARAMETER); + /* Test witdth 0 params */ + SetLastError(ERROR_SUCCESS); + TEST((hBmp = NtGdiCreateBitmap(0, 1, 1, 1, NULL)) == NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + /* Test witdth -1 params */ + SetLastError(ERROR_SUCCESS); + TEST((hBmp = NtGdiCreateBitmap(-1, 0, 1, 1, NULL)) == NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + + return APISTATUS_NORMAL; }

16 years, 4 months

[greatlrd] 33405: adding height -1 and height 0 test for create a bitmap

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat May 10 06:55:58 2008 New Revision: 33405 URL: http://svn.reactos.org/svn/reactos?rev=33405&view=rev Log: adding height -1 and height 0 test for create a bitmap Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiCreateBitmap.c [iso-8859-1] Sat May 10 06:55:58 2008 @@ -147,6 +147,17 @@ TEST(bitmap.bmBitsPixel == 8); DeleteObject(hBmp); + + /* Test height 0 params */ + SetLastError(ERROR_SUCCESS); + TEST((hBmp = NtGdiCreateBitmap(1, 0, 1, 1, NULL)) == NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + + /* Test height -1 params */ + SetLastError(ERROR_SUCCESS); + TEST((hBmp = NtGdiCreateBitmap(1, -1, 1, 1, NULL)) == NULL); + TEST(GetLastError() == ERROR_INVALID_PARAMETER); + return APISTATUS_NORMAL; }

16 years, 4 months

[greatlrd] 33404: revert r33403 for it break abiword we need fixing gdi32.dll bugs before we can fix it correct

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat May 10 06:42:00 2008 New Revision: 33404 URL: http://svn.reactos.org/svn/reactos?rev=33404&view=rev Log: revert r33403 for it break abiword we need fixing gdi32.dll bugs before we can fix it correct Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Sat May 10 06:42:00 2008 @@ -43,24 +43,22 @@ SIZEL Size; LONG WidthBytes; - /* NOTE: Windows also doesn't store nr. of planes separately! */ BitsPixel = BITMAPOBJ_GetRealBitsPixel(BitsPixel * Planes); /* Check parameters */ - - if ( (Height <= 0) || (Width <= 0) || (Width > 0x7FFFFFFF) || - (Planes > 32) || (BitsPixel > 32) || (BitsPixel == 0) ) - { - DPRINT1("Width = %d, Height = %d BitsPixel = %d\n", Width, Height, BitsPixel); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return 0; - } + if (BitsPixel == 0 || Width < 0) + { + DPRINT1("Width = %d, Height = %d BitsPixel = %d\n", Width, Height, BitsPixel); + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return 0; + } WidthBytes = BITMAPOBJ_GetWidthBytes(Width, Planes * BitsPixel); - Size.cx = Width; - Size.cy = Height; + Size.cx = abs(Width); + Size.cy = abs(Height); + /* Create the bitmap object. */ hBitmap = IntCreateBitmap(Size, WidthBytes, BitmapFormat(BitsPixel, BI_RGB), @@ -114,7 +112,14 @@ ProbeForRead(pUnsafeBits, cjBits, 1); } - hBitmap = IntGdiCreateBitmap(Width, Height, Planes, BitsPixel, pUnsafeBits); + if (0 == Width || 0 == Height) + { + hBitmap = IntGdiCreateBitmap (1, 1, 1, 1, NULL); + } + else + { + hBitmap = IntGdiCreateBitmap(Width, Height, Planes, BitsPixel, pUnsafeBits); + } } _SEH_HANDLE {

16 years, 4 months

[greatlrd] 33403: 1. remove hack in NtGdiCreateBitmap 2. BugFix IntGdiCreateBitmap 1. Height can not be negative value 2. width can not be negative value 3. Planes or BitsPerPixel can not be biger that 32Bpp 4. BitsPerPixel can not be 0 5. width size is max 0x7FFFFFFF hex

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat May 10 06:23:54 2008 New Revision: 33403 URL: http://svn.reactos.org/svn/reactos?rev=33403&view=rev Log: 1. remove hack in NtGdiCreateBitmap 2. BugFix IntGdiCreateBitmap 1. Height can not be negative value 2. width can not be negative value 3. Planes or BitsPerPixel can not be biger that 32Bpp 4. BitsPerPixel can not be 0 5. width size is max 0x7FFFFFFF hex Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Sat May 10 06:23:54 2008 @@ -43,22 +43,24 @@ SIZEL Size; LONG WidthBytes; + /* NOTE: Windows also doesn't store nr. of planes separately! */ BitsPixel = BITMAPOBJ_GetRealBitsPixel(BitsPixel * Planes); /* Check parameters */ - if (BitsPixel == 0 || Width < 0) - { - DPRINT1("Width = %d, Height = %d BitsPixel = %d\n", Width, Height, BitsPixel); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return 0; - } + + if ( (Height <= 0) || (Width <= 0) || (Width > 0x7FFFFFFF) || + (Planes > 32) || (BitsPixel > 32) || (BitsPixel == 0) ) + { + DPRINT1("Width = %d, Height = %d BitsPixel = %d\n", Width, Height, BitsPixel); + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return 0; + } WidthBytes = BITMAPOBJ_GetWidthBytes(Width, Planes * BitsPixel); - Size.cx = abs(Width); - Size.cy = abs(Height); - + Size.cx = Width; + Size.cy = Height; /* Create the bitmap object. */ hBitmap = IntCreateBitmap(Size, WidthBytes, BitmapFormat(BitsPixel, BI_RGB), @@ -112,14 +114,7 @@ ProbeForRead(pUnsafeBits, cjBits, 1); } - if (0 == Width || 0 == Height) - { - hBitmap = IntGdiCreateBitmap (1, 1, 1, 1, NULL); - } - else - { - hBitmap = IntGdiCreateBitmap(Width, Height, Planes, BitsPixel, pUnsafeBits); - } + hBitmap = IntGdiCreateBitmap(Width, Height, Planes, BitsPixel, pUnsafeBits); } _SEH_HANDLE {

16 years, 4 months

[gbrunmar] 33402: Made user32.dll compile under MSVC (doesn't link though)

by gbrunmar＠svn.reactos.org

Author: gbrunmar Date: Sat May 10 05:29:19 2008 New Revision: 33402 URL: http://svn.reactos.org/svn/reactos?rev=33402&view=rev Log: Made user32.dll compile under MSVC (doesn't link though) Modified: trunk/reactos/dll/win32/user32/controls/edit.c trunk/reactos/dll/win32/user32/controls/listbox.c trunk/reactos/dll/win32/user32/include/dde_private.h trunk/reactos/dll/win32/user32/include/user32.h trunk/reactos/dll/win32/user32/misc/resources.c trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/spy.c trunk/reactos/dll/win32/user32/windows/window.c Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Sat May 10 05:29:19 2008 @@ -171,7 +171,7 @@ /* * These functions have trivial implementations * We still like to call them internally - * "static inline" makes them more like macro's + * "static __inline" makes them more like macro's */ static __inline BOOL EDIT_EM_CanUndo(EDITSTATE *es); static __inline void EDIT_EM_EmptyUndoBuffer(EDITSTATE *es); @@ -402,14 +402,14 @@ return version; } -static inline UINT get_text_length(EDITSTATE *es) +static __inline UINT get_text_length(EDITSTATE *es) { if(es->text_length == (UINT)-1) es->text_length = strlenW(es->text); return es->text_length; } -static inline void text_buffer_changed(EDITSTATE *es) +static __inline void text_buffer_changed(EDITSTATE *es) { es->text_length = (UINT)-1; } Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] Sat May 10 05:29:19 2008 @@ -894,7 +894,7 @@ } } -static inline INT LISTBOX_lstrcmpiW( LCID lcid, LPCWSTR str1, LPCWSTR str2 ) +static __inline INT LISTBOX_lstrcmpiW( LCID lcid, LPCWSTR str1, LPCWSTR str2 ) { INT ret = CompareStringW( lcid, NORM_IGNORECASE, str1, -1, str2, -1 ); if (ret == CSTR_LESS_THAN) Modified: trunk/reactos/dll/win32/user32/include/dde_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/d… ============================================================================== --- trunk/reactos/dll/win32/user32/include/dde_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/dde_private.h [iso-8859-1] Sat May 10 05:29:19 2008 @@ -243,7 +243,7 @@ WPARAM wParam, LPARAM lParam); extern void WDML_NotifyThreadExit(DWORD tid); -static inline void WDML_ExtractAck(WORD status, DDEACK* da) +static __inline void WDML_ExtractAck(WORD status, DDEACK* da) { *da = *((DDEACK*)&status); } Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Sat May 10 05:29:19 2008 @@ -23,6 +23,7 @@ #include <windowsx.h> #include <winnls32.h> #include <ndk/ntndk.h> +#include <ddk/ntstatus.h> /* CSRSS Headers */ #include <csrss/csrss.h> @@ -37,6 +38,9 @@ /* Internal User32 Headers */ #include "user32p.h" + +#include <libs\pseh\pseh.h> +#include <libs\pseh\framebased.h> /* FIXME: Use ntgdi.h then cleanup... */ HGDIOBJ STDCALL NtGdiSelectObject(HDC hDC, HGDIOBJ hGDIObj); Modified: trunk/reactos/dll/win32/user32/misc/resources.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/reso… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/resources.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/resources.c [iso-8859-1] Sat May 10 05:29:19 2008 @@ -9,8 +9,8 @@ #define CR_INVALID_DATA 0x0000001F #endif -typedef DWORD STDCALL (*CMP_REGNOTIFY) (HANDLE, LPVOID, DWORD, PULONG); -typedef DWORD STDCALL (*CMP_UNREGNOTIFY) (ULONG ); +typedef DWORD (STDCALL *CMP_REGNOTIFY) (HANDLE, LPVOID, DWORD, PULONG); +typedef DWORD (STDCALL *CMP_UNREGNOTIFY) (ULONG ); /* FIXME: Currently IsBadWritePtr is implemented using VirtualQuery which does not seem to work properly for stack address space. */ Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Sat May 10 05:29:19 2008 @@ -1000,17 +1000,22 @@ DefWndScreenshot(HWND hWnd) { RECT rect; + HDC hdc; + INT w; + INT h; + HBITMAP hbitmap; + HDC hdc2; OpenClipboard(hWnd); EmptyClipboard(); - HDC hdc = GetWindowDC(hWnd); + hdc = GetWindowDC(hWnd); GetWindowRect(hWnd, &rect); - INT w = rect.right - rect.left; - INT h = rect.bottom - rect.top; - - HBITMAP hbitmap = CreateCompatibleBitmap(hdc, w, h); - HDC hdc2 = CreateCompatibleDC(hdc); + w = rect.right - rect.left; + h = rect.bottom - rect.top; + + hbitmap = CreateCompatibleBitmap(hdc, w, h); + hdc2 = CreateCompatibleDC(hdc); SelectObject(hdc2, hbitmap); BitBlt(hdc2, 0, 0, w, h, Modified: trunk/reactos/dll/win32/user32/windows/spy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/s… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/spy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/spy.c [iso-8859-1] Sat May 10 05:29:19 2008 @@ -1916,7 +1916,7 @@ /*********************************************************************** * get_indent_level */ -inline static INT_PTR get_indent_level(void) +__inline static INT_PTR get_indent_level(void) { return (INT_PTR)TlsGetValue( indent_tls_index ); } @@ -1925,7 +1925,7 @@ /*********************************************************************** * set_indent_level */ -inline static void set_indent_level( INT_PTR level ) +__inline static void set_indent_level( INT_PTR level ) { TlsSetValue( indent_tls_index, (void *)level ); } Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Sat May 10 05:29:19 2008 @@ -277,6 +277,7 @@ { POINT mPos[2]; UINT id = 0; + HWND top_child; /* lpParams of WM_[NC]CREATE is different for MDI children. * MDICREATESTRUCT members have the originally passed values. @@ -309,7 +310,7 @@ WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX); } - HWND top_child = GetWindow(hWndParent, GW_CHILD); + top_child = GetWindow(hWndParent, GW_CHILD); if (top_child) { @@ -382,6 +383,7 @@ { POINT mPos[2]; UINT id = 0; + HWND top_child; /* lpParams of WM_[NC]CREATE is different for MDI children. * MDICREATESTRUCT members have the originally passed values. @@ -414,7 +416,7 @@ WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX); } - HWND top_child = GetWindow(hWndParent, GW_CHILD); + top_child = GetWindow(hWndParent, GW_CHILD); if (top_child) {

16 years, 4 months

[weiden] 33401: Fix some task switch window bugs

by weiden＠svn.reactos.org

Author: weiden Date: Fri May 9 20:45:08 2008 New Revision: 33401 URL: http://svn.reactos.org/svn/reactos?rev=33401&view=rev Log: Fix some task switch window bugs Modified: trunk/reactos/base/shell/explorer-new/dragdrop.c trunk/reactos/base/shell/explorer-new/taskswnd.c trunk/reactos/base/shell/explorer-new/tbsite.c trunk/reactos/base/shell/explorer-new/todo.h trunk/reactos/base/shell/explorer-new/trayntfy.c trunk/reactos/base/shell/explorer-new/traywnd.c Modified: trunk/reactos/base/shell/explorer-new/dragdrop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/dr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/dragdrop.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/dragdrop.c [iso-8859-1] Fri May 9 20:45:08 2008 @@ -217,7 +217,7 @@ hr = IDropTargetHelper_DragEnter(This->DropTargetHelper, This->hwndTarget, pDataObject, - &pt, + (POINT *)&pt, *pdwEffect); if (SUCCEEDED(hr)) @@ -274,7 +274,7 @@ HRESULT hr; hr = IDropTargetHelper_DragOver(This->DropTargetHelper, - &pt, + (POINT *)&pt, *pdwEffect); if (SUCCEEDED(hr)) @@ -350,7 +350,7 @@ hr = IDropTargetHelper_Drop(This->DropTargetHelper, pDataObject, - &pt, + (POINT *)&pt, *pdwEffect); if (SUCCEEDED(hr) && This->CanDrop) Modified: trunk/reactos/base/shell/explorer-new/taskswnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ta… ============================================================================== --- trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] Fri May 9 20:45:08 2008 @@ -26,7 +26,7 @@ /* Set DUMP_TASKS to 1 to enable a dump of the tasks and task groups every 5 seconds */ -#define DUMP_TASKS 0 +#define DUMP_TASKS 1 static const TCHAR szTaskSwitchWndClass[] = TEXT("MSTaskSwWClass"); static const TCHAR szRunningApps[] = TEXT("Running Applications"); @@ -135,17 +135,6 @@ #define TSW_TOOLBAR_SUBCLASS_ID 1 #define MAX_TASKS_COUNT (0x7FFF) - -#define MAKE_TASKITEM_PTR(ti) ((DWORD_PTR)ti) -#define MAKE_TASKGROUP_PTR(tg) (((DWORD_PTR)tg) | 1) -#define IS_TASKGROUP_PTR(p) ((((DWORD_PTR)p) & 1) != 0) -#define GET_TASKITEM_PTR(lp) ((PTASK_ITEM)(((DWORD_PTR)lp) & ~1)) -#define GET_TASKGROUP_PTR(lp) ((PTASK_GROUP)(((DWORD_PTR)lp) & ~1)) - -#define MAKE_TASKITEM_CMD_ID(id) ((INT)(id)) -#define MAKE_TASKGROUP_CMD_ID(id) ((INT)(id) | (1 << 15)) -#define IS_TASKGROUP_CMD_ID(id) ((((INT)(id)) & (1 << 15)) != 0) -#define GET_INDEX_FROM_CMD_ID(id) ((INT)(id) & MAX_TASKS_COUNT) static VOID TaskSwitchWnd_UpdateButtonsSize(IN OUT PTASK_SWITCH_WND This, IN BOOL bRedrawDisabled); @@ -286,7 +275,7 @@ NewIndex = CurrentGroup->Index + 1; if (TaskSwitchWnd_SetToolbarButtonCommandId(This, CurrentGroup->Index + 1, - MAKE_TASKGROUP_CMD_ID(NewIndex))) + NewIndex)) { CurrentGroup->Index = NewIndex; } @@ -319,7 +308,7 @@ NewIndex = CurrentTaskItem->Index + 1; if (TaskSwitchWnd_SetToolbarButtonCommandId(This, CurrentTaskItem->Index + 1, - MAKE_TASKITEM_CMD_ID(NewIndex))) + NewIndex)) { CurrentTaskItem->Index = NewIndex; } @@ -352,7 +341,7 @@ NewIndex = CurrentGroup->Index - 1; if (TaskSwitchWnd_SetToolbarButtonCommandId(This, CurrentGroup->Index - 1, - MAKE_TASKGROUP_CMD_ID(NewIndex))) + NewIndex)) { CurrentGroup->Index = NewIndex; } @@ -385,7 +374,7 @@ NewIndex = CurrentTaskItem->Index - 1; if (TaskSwitchWnd_SetToolbarButtonCommandId(This, CurrentTaskItem->Index - 1, - MAKE_TASKITEM_CMD_ID(NewIndex))) + NewIndex)) { CurrentTaskItem->Index = NewIndex; } @@ -570,7 +559,7 @@ tbBtn.iBitmap = 0; tbBtn.fsState = TBSTATE_ENABLED | TBSTATE_ELLIPSES; tbBtn.fsStyle = BTNS_CHECK | BTNS_NOPREFIX | BTNS_SHOWTEXT; - tbBtn.dwData = MAKE_TASKITEM_PTR(TaskItem); + tbBtn.dwData = TaskItem->Index; tbBtn.iString = (DWORD_PTR)TaskSwitchWnd_GetWndTextFromTaskItem(This, TaskItem); @@ -579,7 +568,7 @@ iIndex = TaskSwitchWnd_CalculateTaskItemNewButtonIndex(This, TaskItem); ASSERT(iIndex >= 0); - tbBtn.idCommand = MAKE_TASKITEM_CMD_ID(iIndex); + tbBtn.idCommand = iIndex; TaskSwitchWnd_BeginUpdate(This); @@ -719,6 +708,7 @@ } /* Remove the group from the list */ + ASSERT(TaskGroup == CurrentGroup); *PrevLink = TaskGroup->Next; /* Free the task group */ @@ -819,39 +809,44 @@ return NULL; } - if (This->AllocatedTaskItems <= This->TaskItemCount) - { - if (This->TaskItemCount != 0) - { - PTASK_ITEM NewArray; - WORD NewArrayLength; - - NewArrayLength = This->AllocatedTaskItems + TASK_ITEM_ARRAY_ALLOC; - - NewArray = HeapReAlloc(hProcessHeap, - 0, - This->TaskItems, - NewArrayLength * sizeof(*This->TaskItems)); - if (NewArray != NULL) - { - This->AllocatedTaskItems = NewArrayLength; - This->TaskItems = NewArray; - } - else - return NULL; + ASSERT(This->AllocatedTaskItems >= This->TaskItemCount); + + if (This->TaskItemCount != 0) + { + PTASK_ITEM NewArray; + SIZE_T NewArrayLength, ActiveTaskItemIndex; + + NewArrayLength = This->AllocatedTaskItems + TASK_ITEM_ARRAY_ALLOC; + + NewArray = HeapReAlloc(hProcessHeap, + 0, + This->TaskItems, + NewArrayLength * sizeof(*This->TaskItems)); + if (NewArray != NULL) + { + if (This->ActiveTaskItem != NULL) + { + /* Fixup the ActiveTaskItem pointer */ + ActiveTaskItemIndex = This->ActiveTaskItem - This->TaskItems; + This->ActiveTaskItem = NewArray + ActiveTaskItemIndex; + } + This->AllocatedTaskItems = (WORD)NewArrayLength; + This->TaskItems = NewArray; } else - { - This->TaskItems = HeapAlloc(hProcessHeap, - 0, - TASK_ITEM_ARRAY_ALLOC * sizeof(*This->TaskItems)); - if (This->TaskItems != NULL) - { - This->AllocatedTaskItems = TASK_ITEM_ARRAY_ALLOC; - } - else - return NULL; - } + return NULL; + } + else + { + This->TaskItems = HeapAlloc(hProcessHeap, + 0, + TASK_ITEM_ARRAY_ALLOC * sizeof(*This->TaskItems)); + if (This->TaskItems != NULL) + { + This->AllocatedTaskItems = TASK_ITEM_ARRAY_ALLOC; + } + else + return NULL; } return This->TaskItems + This->TaskItemCount++; @@ -964,6 +959,43 @@ } } +static PTASK_ITEM +FindTaskItemByIndex(IN OUT PTASK_SWITCH_WND This, + IN INT Index) +{ + PTASK_ITEM TaskItem, LastItem; + + TaskItem = This->TaskItems; + LastItem = TaskItem + This->TaskItemCount; + while (TaskItem != LastItem) + { + if (TaskItem->Index == Index) + return TaskItem; + + TaskItem++; + } + + return NULL; +} + +static PTASK_GROUP +FindTaskGroupByIndex(IN OUT PTASK_SWITCH_WND This, + IN INT Index) +{ + PTASK_GROUP CurrentGroup; + + CurrentGroup = This->TaskGroups; + while (CurrentGroup != NULL) + { + if (CurrentGroup->Index == Index) + break; + + CurrentGroup = CurrentGroup->Next; + } + + return CurrentGroup; +} + static BOOL TaskSwitchWnd_AddTask(IN OUT PTASK_SWITCH_WND This, IN HWND hWnd) @@ -1211,9 +1243,9 @@ uiMin = GetSystemMetrics(SM_CXSIZE) + (2 * GetSystemMetrics(SM_CXEDGE)); - if (NewBtnSize < uiMin) + if (NewBtnSize < (LONG)uiMin) NewBtnSize = uiMin; - if (NewBtnSize > uiMax) + if (NewBtnSize > (LONG)uiMax) NewBtnSize = uiMax; This->ButtonSize.cx = NewBtnSize; @@ -1392,7 +1424,7 @@ /* Register the shell hook */ This->ShellHookMsg = RegisterWindowMessage(TEXT("SHELLHOOK")); - hShell32 = LoadLibrary(TEXT("SHELL32.DLL")); + hShell32 = GetModuleHandle(TEXT("SHELL32.DLL")); if (hShell32 != NULL) { REGSHELLHOOK RegShellHook; @@ -1405,8 +1437,6 @@ RegShellHook(This->hWnd, 3); /* 1 if no NT! We're targeting NT so we don't care! */ } - - FreeLibrary(hShell32); } /* Add all windows to the toolbar */ @@ -1434,7 +1464,7 @@ This->IsDestroying = TRUE; /* Unregister the shell hook */ - hShell32 = LoadLibrary(TEXT("SHELL32.DLL")); + hShell32 = GetModuleHandle(TEXT("SHELL32.DLL")); if (hShell32 != NULL) { REGSHELLHOOK RegShellHook; @@ -1447,8 +1477,6 @@ RegShellHook(This->hWnd, FALSE); } - - FreeLibrary(hShell32); } TaskSwitchWnd_DeleteAllTasks(This); @@ -1604,16 +1632,21 @@ HFONT hCaptionFont, hBoldCaptionFont; LRESULT Ret = CDRF_DODEFAULT; HMODULE hUser32; + PTASK_GROUP TaskGroup; + PTASK_ITEM TaskItem; #if TASK_USE_DRAWCAPTIONTEMP != 0 UINT uidctFlags = DC_TEXT | DC_ICON | DC_NOSENDMSG; #endif - - if (!IS_TASKGROUP_PTR(nmtbcd->nmcd.lItemlParam)) - { - PTASK_ITEM TaskItem = GET_TASKITEM_PTR(nmtbcd->nmcd.lItemlParam); + TaskItem = FindTaskItemByIndex(This, + (INT)nmtbcd->nmcd.dwItemSpec); + TaskGroup = FindTaskGroupByIndex(This, + (INT)nmtbcd->nmcd.dwItemSpec); + if (TaskGroup == NULL && TaskItem != NULL) + { + ASSERT(TaskItem != NULL); if (TaskItem != NULL && IsWindow(TaskItem->hWnd)) { @@ -1717,14 +1750,9 @@ } } - else - { - PTASK_GROUP TaskGroup = GET_TASKGROUP_PTR(nmtbcd->nmcd.lItemlParam); - - if (TaskGroup != NULL) - { - /* FIXME: Implement painting for task groups */ - } + else if (TaskGroup != NULL) + { + /* FIXME: Implement painting for task groups */ } return Ret; Modified: trunk/reactos/base/shell/explorer-new/tbsite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tb… ============================================================================== --- trunk/reactos/base/shell/explorer-new/tbsite.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/tbsite.c [iso-8859-1] Fri May 9 20:45:08 2008 @@ -202,10 +202,17 @@ if (SUCCEEDED(hRet)) { /* Now let's read the CLSID from the stream and see if it's our task band */ +#if defined(IStream_Read) hRet = IStream_Read(pStm, &clsid, sizeof(clsid), &ulRead); +#else + ulRead = sizeof(clsid); + hRet = IStream_Read(pStm, + &clsid, + sizeof(clsid)); +#endif if (SUCCEEDED(hRet) && ulRead == sizeof(clsid)) { if (IsEqualGUID(&clsid, @@ -350,7 +357,7 @@ shell behavior! */ if (This->WindowEventHandler != NULL) { - DbgPrint("Calling IWindowEventHandler::ProcessMessage(0x%p, 0x%x, 0x%p, 0x%p, 0x%p) This->hWndRebar=0x%p\n", hWnd, uMsg, wParam, lParam, plResult, This->hWndRebar); + /*DbgPrint("Calling IWindowEventHandler::ProcessMessage(0x%p, 0x%x, 0x%p, 0x%p, 0x%p) This->hWndRebar=0x%p\n", hWnd, uMsg, wParam, lParam, plResult, This->hWndRebar);*/ hRet = IWindowEventHandler_ProcessMessage(This->WindowEventHandler, hWnd, uMsg, Modified: trunk/reactos/base/shell/explorer-new/todo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/to… ============================================================================== --- trunk/reactos/base/shell/explorer-new/todo.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/todo.h [iso-8859-1] Fri May 9 20:45:08 2008 @@ -1,5 +1,9 @@ #ifndef __TODO_H #define __TODO_H + +#ifdef INTERFACE +#undef INTERFACE +#endif /* FIXME: Ugly hack!!! FIX ASAP! Move to uuid! */ static const GUID IID_HACK_IShellView2 = {0x88E39E80,0x3578,0x11CF,{0xAE,0x69,0x08,0x00,0x2B,0x2E,0x12,0x62}}; Modified: trunk/reactos/base/shell/explorer-new/trayntfy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] Fri May 9 20:45:08 2008 @@ -159,7 +159,7 @@ { if (Horizontal) { - if (szMax.cy + This->LineSizes[i].cy + This->LineSpacing > + if (szMax.cy + This->LineSizes[i].cy + (LONG)This->LineSpacing > pSize->cy - (2 * TRAY_CLOCK_WND_SPACING_Y)) { break; Modified: trunk/reactos/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] Fri May 9 20:45:08 2008 @@ -1010,8 +1010,7 @@ sizeof(bmp), &bmp) != 0) { - Size.cx += max(bmp.bmWidth, - GetSystemMetrics(SM_CXMINIMIZED)); + Size.cx += bmp.bmWidth; Size.cy += max(bmp.bmHeight, GetSystemMetrics(SM_CYCAPTION)); }

16 years, 4 months

[janderwald] 33400: - when menu position cannot be found insert new item at the end - reduces winetest failures from 1550 to 1250 - behaviour verified on Windows Vista

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri May 9 13:11:40 2008 New Revision: 33400 URL: http://svn.reactos.org/svn/reactos?rev=33400&view=rev Log: - when menu position cannot be found insert new item at the end - reduces winetest failures from 1550 to 1250 - behaviour verified on Windows Vista Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c 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] Fri May 9 13:11:40 2008 @@ -953,8 +953,9 @@ } if (SubMenu == NULL) { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; + /* default to last position of menu */ + SubMenu = MenuObject; + pos = MenuObject->MenuInfo.MenuItemCount; }

16 years, 4 months

[dreimer] 33399: Well... I forgot to revert some files... sry

by dreimer＠svn.reactos.org

Author: dreimer Date: Fri May 9 12:45:46 2008 New Revision: 33399 URL: http://svn.reactos.org/svn/reactos?rev=33399&view=rev Log: Well... I forgot to revert some files... sry Modified: trunk/reactos/dll/win32/crypt32/context.c trunk/reactos/dll/win32/crypt32/crl.c Modified: trunk/reactos/dll/win32/crypt32/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/context.… ============================================================================== --- trunk/reactos/dll/win32/crypt32/context.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/context.c [iso-8859-1] Fri May 9 12:45:46 2008 @@ -71,7 +71,6 @@ ret = NULL; } } - TRACE("returning %p\n", ret); return ret; } @@ -97,7 +96,6 @@ InterlockedIncrement(&linkedBase->ref); TRACE("%p's ref count is %d\n", context, linkContext->ref); } - TRACE("returning %p\n", context); return context; } @@ -125,7 +123,7 @@ contextSize); } -PCONTEXT_PROPERTY_LIST Context_GetProperties(const void *context, size_t contextSize) +PCONTEXT_PROPERTY_LIST Context_GetProperties(void *context, size_t contextSize) { PBASE_CONTEXT ptr = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); @@ -244,7 +242,7 @@ list->contextInterface->free(toReplace); } else - list_add_head(&list->contexts, entry); + list_add_tail(&list->contexts, entry); LeaveCriticalSection(&list->cs); } return context; Modified: trunk/reactos/dll/win32/crypt32/crl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crl.c?re… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crl.c [iso-8859-1] Fri May 9 12:45:46 2008 @@ -266,10 +266,10 @@ return ret; } -static BOOL CRLContext_SetProperty(PCCRL_CONTEXT context, DWORD dwPropId, - DWORD dwFlags, const void *pvData); - -static BOOL CRLContext_GetHashProp(PCCRL_CONTEXT context, DWORD dwPropId, +static BOOL WINAPI CRLContext_SetProperty(void *context, DWORD dwPropId, + DWORD dwFlags, const void *pvData); + +static BOOL CRLContext_GetHashProp(void *context, DWORD dwPropId, ALG_ID algID, const BYTE *toHash, DWORD toHashLen, void *pvData, DWORD *pcbData) { @@ -284,9 +284,10 @@ return ret; } -static BOOL CRLContext_GetProperty(PCCRL_CONTEXT context, DWORD dwPropId, - void *pvData, DWORD *pcbData) -{ +static BOOL WINAPI CRLContext_GetProperty(void *context, DWORD dwPropId, + void *pvData, DWORD *pcbData) +{ + PCCRL_CONTEXT pCRLContext = (PCCRL_CONTEXT)context; PCONTEXT_PROPERTY_LIST properties = Context_GetProperties(context, sizeof(CRL_CONTEXT)); BOOL ret; @@ -301,17 +302,20 @@ if (ret) { if (!pvData) + { *pcbData = blob.cbData; + ret = TRUE; + } else if (*pcbData < blob.cbData) { SetLastError(ERROR_MORE_DATA); *pcbData = blob.cbData; - ret = FALSE; } else { memcpy(pvData, blob.pbData, blob.cbData); *pcbData = blob.cbData; + ret = TRUE; } } else @@ -321,12 +325,12 @@ { case CERT_SHA1_HASH_PROP_ID: ret = CRLContext_GetHashProp(context, dwPropId, CALG_SHA1, - context->pbCrlEncoded, context->cbCrlEncoded, pvData, + pCRLContext->pbCrlEncoded, pCRLContext->cbCrlEncoded, pvData, pcbData); break; case CERT_MD5_HASH_PROP_ID: ret = CRLContext_GetHashProp(context, dwPropId, CALG_MD5, - context->pbCrlEncoded, context->cbCrlEncoded, pvData, + pCRLContext->pbCrlEncoded, pCRLContext->cbCrlEncoded, pvData, pcbData); break; default: @@ -367,22 +371,19 @@ } else { - if (pCRLContext->hCertStore) - ret = CertGetStoreProperty(pCRLContext->hCertStore, dwPropId, - pvData, pcbData); - else - *(DWORD *)pvData = 0; + *(DWORD *)pvData = + CertStore_GetAccessState(pCRLContext->hCertStore); ret = TRUE; } break; default: - ret = CRLContext_GetProperty(pCRLContext, dwPropId, pvData, + ret = CRLContext_GetProperty((void *)pCRLContext, dwPropId, pvData, pcbData); } return ret; } -static BOOL CRLContext_SetProperty(PCCRL_CONTEXT context, DWORD dwPropId, +static BOOL WINAPI CRLContext_SetProperty(void *context, DWORD dwPropId, DWORD dwFlags, const void *pvData) { PCONTEXT_PROPERTY_LIST properties = @@ -459,7 +460,8 @@ SetLastError(E_INVALIDARG); return FALSE; } - ret = CRLContext_SetProperty(pCRLContext, dwPropId, dwFlags, pvData); + ret = CRLContext_SetProperty((void *)pCRLContext, dwPropId, dwFlags, + pvData); TRACE("returning %d\n", ret); return ret; } @@ -517,7 +519,10 @@ if (!pTimeToVerify) { - GetSystemTimeAsFileTime(&fileTime); + SYSTEMTIME sysTime; + + GetSystemTime(&sysTime); + SystemTimeToFileTime(&sysTime, &fileTime); pTimeToVerify = &fileTime; } if ((ret = CompareFileTime(pTimeToVerify, &pCrlInfo->ThisUpdate)) >= 0)

16 years, 4 months

[dreimer] 33398: Update of some Headers for the Winetests of non autosynched Dlls. Done by Kamil Horniceck Update XCOPY from wine.

by dreimer＠svn.reactos.org

Author: dreimer Date: Fri May 9 12:37:21 2008 New Revision: 33398 URL: http://svn.reactos.org/svn/reactos?rev=33398&view=rev Log: Update of some Headers for the Winetests of non autosynched Dlls. Done by Kamil Horniceck Update XCOPY from wine. Added: trunk/reactos/base/applications/cmdutils/xcopy/Da.rc (with props) trunk/reactos/base/applications/cmdutils/xcopy/No.rc (with props) trunk/reactos/base/applications/cmdutils/xcopy/Si.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/xcopy/En.rc trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c trunk/reactos/dll/win32/crypt32/context.c trunk/reactos/dll/win32/crypt32/crl.c trunk/reactos/include/psdk/ddeml.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/psdk/winuser.h trunk/reactos/include/reactos/wine/test.h trunk/reactos/include/reactos/wine/winuser.h Added: trunk/reactos/base/applications/cmdutils/xcopy/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Da.rc (added) +++ trunk/reactos/base/applications/cmdutils/xcopy/Da.rc [iso-8859-1] Fri May 9 12:37:21 2008 @@ -1,0 +1,78 @@ +/* + * XCOPY - Wine-compatible xcopy program + * Danish language support + * + * Copyright (C) 2008 Jens Albretsen <jens(a)albretsen.dk> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +LANGUAGE LANG_DANISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_INVPARMS, "Ugyldigt antal parametere; brug «xcopy /?» for hjelp\n" + STRING_INVPARM, "Ugyldigt parameter «%s»; brug «xcopy /?» for hjelp\n" + STRING_PAUSE, "Tryk Enter for at begynde at kopiere\n" + STRING_SIMCOPY, "%d fil(er) vil blive kopieret\n" + STRING_COPY, "%d fil(er) kopieret\n" + STRING_QISDIR, "Er «%s» et filnavn eller katalog\n" \ + "på destinationen?\n" \ + "(F - Fil, K - Katalog)\n" + STRING_SRCPROMPT,"%s? (Ja|Nei)\n" + STRING_OVERWRITE,"Overskrive «%s»? (Ja|Nei|Alle)\n" + STRING_COPYFAIL, "Kunne ikke kopiere «%s» til «%s»; fejlet med r/c %d\n" + STRING_OPENFAIL, "Kunne ikke åbne «%s»\n" + STRING_READFAIL, "Kunne ikke læse «%s»\n" + STRING_YES_CHAR, "J" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "K" + + STRING_HELP, +"XCOPY - Kopierer filer eller katalogtre til en målplassering\n\ +\n\ +Syntaks:\n\ +XCOPY kilde [mål] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +hvor:\n\ +[/I] Antag at destinationen er et katalog hvis destinationen ikke\n\ + \tfindes og 2 eller flere filer bliver kopieret\n\ +[/S] Kopier kataloger og underkataloger\n\ +[/E] Kopier kataloger og underkataloger, også tomme kataloger\n\ +[/Q] Vær stille : vis ikke filnavne under kopiering\n\ +[/F] Fil hele kilde- og målnavn under kopiering\n\ +[/L] Simulér operationen; vis kun, gør intet\n\ +[/W] Spørg før koperingen starter\n\ +[/T] Lav tom katalogstruktur; kopier ikke filer\n\ +[/Y] Spørg ikke om filer skal overskrives\n\ +[/-Y] Spørg før om filer skal overskrives\n\ +[/P] Spørg om hver enkelt fil der skal kopieres\n\ +[/N] Kopier som korte filnavn (8.3 tegn)\n\ +[/U] Kopier kun filer som allerede findes på destinationen\n\ +[/R] Overskriv filer som er skrivebeskyttet\n\ +[/H] Kopier skjulte filer og systemfiler\n\ +[/C] Fortsæt selv om det opstår fejl under kopieringen\n\ +[/A] Kopier ikke filer som er markeret som arkiv\n\ +[/M] Kopier kun filer som er markeret som akriv; fjerner denne markering \n\ +[/D | /D:m-d-å] Kopier kun nye filer eller dem som er ændret efter\n\ + \t\tden opgivne dato.\n\ + \t\tHvis ingen dato opgives kopieres kun de filer hvor\n\ + \t\tdestinationen er ældre end kilden\n\n" + +} Propchange: trunk/reactos/base/applications/cmdutils/xcopy/Da.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/xcopy/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/En.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/En.rc [iso-8859-1] Fri May 9 12:37:21 2008 @@ -20,10 +20,10 @@ */ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE -BEGIN +{ STRING_INVPARMS, "Invalid number of parameters - Use xcopy /? for help\n" STRING_INVPARM, "Invalid parameter '%s' - Use xcopy /? for help\n" STRING_PAUSE, "Press <enter> to begin copying\n" @@ -76,4 +76,4 @@ \t\tIf no date is supplied, only copy if destination is older\n\ \t\tthan source\n\n" -END +} Modified: trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc [iso-8859-1] Fri May 9 12:37:21 2008 @@ -24,7 +24,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE -BEGIN +{ STRING_INVPARMS, "¿Ã¹Ù¸£Áö ¾ÊÀº ¸Å°³º¯¼öÀÇ °¹¼ö - xcopy /?·Î µµ¿ò¸»À» º¸½Ã¿À\n" STRING_INVPARM, "¿Ã¹Ù¸£Áö ¾ÊÀº ¸Å°³º¯¼ö '%s' - xcopy /?·Î µµ¿ò¸»À» º¸½Ã¿À\n" STRING_PAUSE, "<enter> ¸¦ ´©¸£¸é º¹»ç°¡ ½ÃÀÛµÉ °ÍÀÔ´Ï´Ù\n" @@ -73,8 +73,8 @@ [/A] ¿ÀÁ÷ ¾ÐÃà ¼Ó¼ºÀÌ ¼³Á¤µÇ¾îÀÖ´Â ÆÄÀÏ¸¸ º¹»ç\n\ [/M] ¿ÀÁ÷ ¾ÐÃà ¼Ó¼ºÀ» Á¦°ÅÇÏ¸é¼ ¾ÐÃà ¼Ó¼ºÀÌ ¼³Á¤µÇ¾îÀÖ´Â \n\ \ÆÄÀÏ¸¸ º¹»ç \n\ -[/D | /D:m-d-y] Copy new files or those modified after the supplied date.\n\ -\t\tIf no date is supplied, only copy if destination is older\n\ -\t\tthan source\n\n" +[/D | /D:m-d-y] ÁöÁ¤µÈ ³¯Â¥ ÈÄ¿¡ ¼öÁ¤µÇ°Å³ª »õ·Î¿î ÆÄÀÏ º¹»ç.\n\ +\t\tI¸¸¾à ¾î¶°ÇÑ ³¯Â¥µµ ÁöÁ¤µÇÁö ¾ÊÀ¸¸é,¿ÀÁ÷ ¿øº»º¸´Ù \n\ +\t\t´ë»óÀÌ ¿À·¡µÈ °Í¸¸ º¹»ç\n\n" -END +} Added: trunk/reactos/base/applications/cmdutils/xcopy/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/No.rc (added) +++ trunk/reactos/base/applications/cmdutils/xcopy/No.rc [iso-8859-1] Fri May 9 12:37:21 2008 @@ -1,0 +1,79 @@ +/* + * XCOPY - Wine-compatible xcopy program + * Norwegian Bokmål language support + * + * Copyright (C) 2008 Alexander N. Sørnes <alex(a)thehandofagony.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +STRINGTABLE +{ + STRING_INVPARMS, "Ugyldig antall parametere; bruk «xcopy /?» for hjelp\n" + STRING_INVPARM, "Ugyldig parameter «%s»; bruk «xcopy /?» for hjelp\n" + STRING_PAUSE, "Trykk Enter for å begynne å kopiere\n" + STRING_SIMCOPY, "%d fil(er) ville blitt kopiert\n" + STRING_COPY, "%d fil(er) kopiert\n" + STRING_QISDIR, "Eer «%s» et filnevn eller katalog\n" \ + "i målet?\n" \ + "(F - Fil, K - Katalog)\n" + STRING_SRCPROMPT,"%s? (Ja|Nei)\n" + STRING_OVERWRITE,"Skrive over «%s»? (Ja|Nei|Alle)\n" + STRING_COPYFAIL, "Klarte ikke kopiere «%s» til «%s»; feilet med r/c %d\n" + STRING_OPENFAIL, "Klarte ikke åpne «%s»\n" + STRING_READFAIL, "Klarte ikke lese «%s»\n" + STRING_YES_CHAR, "J" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "A" + STRING_FILE_CHAR,"F" + STRING_DIR_CHAR, "K" + + STRING_HELP, +"XCOPY - Kopierer filer eller katalogtre til en målplassering\n\ +\n\ +Syntax:\n\ +XCOPY kilde [mål] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +Where:\n\ +\n\ +[/I] Anta at målet er en katalog hvis målet ikke finnes og 2 eller\n\ + \tflere filer blir kopiert\n\ +[/S] Kopier kataloger og underkataloger\n\ +[/E] Kopier kataloger og underkataloger, ta med tomme kataloger\n\ +[/Q] Stille modus: ikke vis filnavn under kopiering\n\ +[/F] Fil hele kilde- og målnavn under kopiering\n\ +[/L] Simuler operasjonen; vis bare hva som ville blitt kopiert\n\ +[/W] Spør for koperingen starter\n\ +[/T] Lag tom katalogstruktur; ikke kopier filer\n\ +[/Y] Ikke spør når filer skal overskrives\n\ +[/-Y] Spør før filer skal overskrives\n\ +[/P] Spør for hver kildefil som skal kopieres\n\ +[/N] Kopier som korte filnavn (8.3 tegn)\n\ +[/U] Bare kopier filer som allerede finnes i målet\n\ +[/R] Skriv over filer som er skrivebeskyttet\n\ +[/H] Kopier skjulte filer og systemfiler\n\ +[/C] Fortsett selv om det oppstår feil under kopieringen\n\ +[/A] Ikke kopier filer som er markert som arkiv\n\ +[/M] Bare kopier filer som er markert som akriv; fjerner denne merkingen \n\ +[/D | /D:m-d-å] Kopier nye filer eller de som er endret etter\n\ + \t\tden oppgitte datoen.\n\ + \t\tHvis ingen dato oppgis kopieres bare de filene som er\n\ + \t\teldre i målet enn i kilden\n\n" + +} Propchange: trunk/reactos/base/applications/cmdutils/xcopy/No.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Pl.rc [iso-8859-1] Fri May 9 12:37:21 2008 @@ -24,7 +24,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE -BEGIN +{ STRING_INVPARMS, "Niew³aciwa liczba parametrów - uruchom xcopy /? aby wywietliæ pomoc\n" STRING_INVPARM, "Nieznany parameter '%s' - uruchom xcopy /? aby wywietliæ pomoc\n" STRING_PAUSE, "Nacinij <enter> aby rozpocz¹æ kopiowanie\n" @@ -76,4 +76,4 @@ \t\tJe¿eli nie podano ¿adnej daty, to kopiowane s¹ pliki, które s¹\n\ \t\tnowsze ni¿ w katalogu docelowym\n\n" -END +} Modified: trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/Ru.rc [iso-8859-1] Fri May 9 12:37:21 2008 @@ -24,7 +24,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE -BEGIN +{ STRING_INVPARMS, "Íåäîïóñòèìîå ÷èñëî ïàðàìåòðîâ - ïîïðîáóéòå 'xcopy /?' äëÿ ïîëó÷åíèÿ\n\ ïîäðîáíîãî îïèñàíèÿ.\n" @@ -79,4 +79,4 @@ [/D | /D:m-d-y] Êîïèðóåò òîëüêî íîâûå ôàéëû èëè òå, êîòîðûå áûëè èçìåíåíû\n\ ïîñëå óêàçàííîé äàòû. Åñëè äàòà íå óêàçàíà, êîïèðóåò òîëüêî\n\ òå ôàéëû, êîòîðûå íîâåå â èñõîäíîé ïàïêå.\n" -END +} Added: trunk/reactos/base/applications/cmdutils/xcopy/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Si.rc (added) +++ trunk/reactos/base/applications/cmdutils/xcopy/Si.rc [iso-8859-1] Fri May 9 12:37:21 2008 @@ -1,0 +1,82 @@ +/* + * XCOPY - Wine-compatible xcopy program + * Slovenian language support + * + * Copyright (C) 2008 Rok Mandeljc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(65001) + +LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_INVPARMS, "Neveljavno Å¡tevilo parametrov - za pomoÄ uporabite xcopy /?\n" + STRING_INVPARM, "Neveljaven parameter '%s' - za pomoÄ uporabite xcopy /?\n" + STRING_PAUSE, "Za zaÄetek kopiranja pritisnite <enter>\n" + STRING_SIMCOPY, "Prekopiral bom %d datotek\n" + STRING_COPY, "Prekopiral sem %d datotek\n" + STRING_QISDIR, "Ali je '%s' ime ciljne datoteke \n" \ + "ali mape?\n" \ + "(D - Datoteka, M - Mapa)\n" + STRING_SRCPROMPT,"%s? (Da|Ne)\n" + STRING_OVERWRITE,"Ali naj prepiÅ¡em %s? (Da|Ne|Vse)\n" + STRING_COPYFAIL, "Kopiranje '%s' v '%s' ni uspelo (koda napake: %d)\n" + STRING_OPENFAIL, "Napaka pri odpiranju '%s'\n" + STRING_READFAIL, "Napaka pri branju '%s'\n" + STRING_YES_CHAR, "D" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "V" + STRING_FILE_CHAR,"D" + STRING_DIR_CHAR, "M" + + STRING_HELP, +"XCOPY - kopira navedene izvorne datoteke oz. mape v naveden cilj\n\ +\n\ +Sintaksa:\n\ +XCOPY izvor [cilj] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +Where:\n\ +\n\ +[/I] Äe cilj ne obstaja in gre za kopiranje dveh ali veÄ datotek, predpostavi, \n\ +\da je cilj mapa\n\ +[/S] Kopiraj mape in podmape\n\ +[/E] Kopiraj mape in podmape, vkljuÄno s praznimi mapami\n\ +[/Q] Ne izpisuj imen med kopiranjem (tiho).\n\ +[/F] Med kopiranjem izpiÅ¡i polno izvorno in ciljno pot\n\ +[/L] Simuliraj operacijo; prikaÅ¾i imena datotek, ki bi jih kopiral\n\ +[/W] VkljuÄi poziv pred zaÄetkom kopiranja\n\ +[/T] Ustvari mape, vendar ne kopiraj datotek\n\ +[/Y] OnemogoÄi poziv ob prepisovanju datotek\n\ +[/-Y] OmogoÄi poziv ob prepisovanju datotek\n\ +[/P] Poziv pred kopiranjem vsake datoteke\n\ +[/N] Pri kopiranju uporabi kratka imena\n\ +[/U] Kopiraj samo datoteke, ki Å¾e obstajajo na cilju\n\ +[/R] PrepiÅ¡i datoteke, ki so oznaÄene samo za branje\n\ +[/H] V kopiranje vkljuÄu tudi skrite in sistemske datoteke\n\ +[/C] Nadaljuj tudi, Äe pride do napake med kopiranjem\n\ +[/A] Kopiraj samo datoteke, ki imajo atribut arhiva\n\ +[/M] Kopiraj samo datoteke, ki imajo atribut arhiva ter odstrani atribut\n\ +\tarhiva\n\ +[/D | /D:m-d-y] Kopiraj datoteke, ustvarjene ali spremenjene po navedenem datumu.\n\ +\t\tÄe datum ni podan, gre za kopiranje datotek, katerih obstojeÄi cilj je\n\ +\t\tod izvora\n\n" + +} + +#pragma code_page(default) Propchange: trunk/reactos/base/applications/cmdutils/xcopy/Si.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] Fri May 9 12:37:21 2008 @@ -23,11 +23,14 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "Bg.rc" +#include "Da.rc" #include "De.rc" #include "El.rc" #include "En.rc" #include "Fr.rc" #include "Ko.rc" #include "Nl.rc" +#include "No.rc" #include "Pl.rc" #include "Ru.rc" +#include "Si.rc" Modified: trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/xcopy.c [iso-8859-1] Fri May 9 12:37:21 2008 @@ -794,7 +794,7 @@ /* ========================================================================= * Routine copied from cmd.exe md command - - * This works recursivly. so creating dir1\dir2\dir3 will create dir1 and + * This works recursively. so creating dir1\dir2\dir3 will create dir1 and * dir2 if they do not already exist. * ========================================================================= */ static BOOL XCOPY_CreateDirectory(const WCHAR* path) Modified: trunk/reactos/dll/win32/crypt32/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/context.… ============================================================================== --- trunk/reactos/dll/win32/crypt32/context.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/context.c [iso-8859-1] Fri May 9 12:37:21 2008 @@ -71,6 +71,7 @@ ret = NULL; } } + TRACE("returning %p\n", ret); return ret; } @@ -96,6 +97,7 @@ InterlockedIncrement(&linkedBase->ref); TRACE("%p's ref count is %d\n", context, linkContext->ref); } + TRACE("returning %p\n", context); return context; } @@ -123,7 +125,7 @@ contextSize); } -PCONTEXT_PROPERTY_LIST Context_GetProperties(void *context, size_t contextSize) +PCONTEXT_PROPERTY_LIST Context_GetProperties(const void *context, size_t contextSize) { PBASE_CONTEXT ptr = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); @@ -242,7 +244,7 @@ list->contextInterface->free(toReplace); } else - list_add_tail(&list->contexts, entry); + list_add_head(&list->contexts, entry); LeaveCriticalSection(&list->cs); } return context; Modified: trunk/reactos/dll/win32/crypt32/crl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crl.c?re… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crl.c [iso-8859-1] Fri May 9 12:37:21 2008 @@ -266,10 +266,10 @@ return ret; } -static BOOL WINAPI CRLContext_SetProperty(void *context, DWORD dwPropId, - DWORD dwFlags, const void *pvData); - -static BOOL CRLContext_GetHashProp(void *context, DWORD dwPropId, +static BOOL CRLContext_SetProperty(PCCRL_CONTEXT context, DWORD dwPropId, + DWORD dwFlags, const void *pvData); + +static BOOL CRLContext_GetHashProp(PCCRL_CONTEXT context, DWORD dwPropId, ALG_ID algID, const BYTE *toHash, DWORD toHashLen, void *pvData, DWORD *pcbData) { @@ -284,10 +284,9 @@ return ret; } -static BOOL WINAPI CRLContext_GetProperty(void *context, DWORD dwPropId, - void *pvData, DWORD *pcbData) -{ - PCCRL_CONTEXT pCRLContext = (PCCRL_CONTEXT)context; +static BOOL CRLContext_GetProperty(PCCRL_CONTEXT context, DWORD dwPropId, + void *pvData, DWORD *pcbData) +{ PCONTEXT_PROPERTY_LIST properties = Context_GetProperties(context, sizeof(CRL_CONTEXT)); BOOL ret; @@ -302,20 +301,17 @@ if (ret) { if (!pvData) - { *pcbData = blob.cbData; - ret = TRUE; - } else if (*pcbData < blob.cbData) { SetLastError(ERROR_MORE_DATA); *pcbData = blob.cbData; + ret = FALSE; } else { memcpy(pvData, blob.pbData, blob.cbData); *pcbData = blob.cbData; - ret = TRUE; } } else @@ -325,12 +321,12 @@ { case CERT_SHA1_HASH_PROP_ID: ret = CRLContext_GetHashProp(context, dwPropId, CALG_SHA1, - pCRLContext->pbCrlEncoded, pCRLContext->cbCrlEncoded, pvData, + context->pbCrlEncoded, context->cbCrlEncoded, pvData, pcbData); break; case CERT_MD5_HASH_PROP_ID: ret = CRLContext_GetHashProp(context, dwPropId, CALG_MD5, - pCRLContext->pbCrlEncoded, pCRLContext->cbCrlEncoded, pvData, + context->pbCrlEncoded, context->cbCrlEncoded, pvData, pcbData); break; default: @@ -371,19 +367,22 @@ } else { - *(DWORD *)pvData = - CertStore_GetAccessState(pCRLContext->hCertStore); + if (pCRLContext->hCertStore) + ret = CertGetStoreProperty(pCRLContext->hCertStore, dwPropId, + pvData, pcbData); + else + *(DWORD *)pvData = 0; ret = TRUE; } break; default: - ret = CRLContext_GetProperty((void *)pCRLContext, dwPropId, pvData, + ret = CRLContext_GetProperty(pCRLContext, dwPropId, pvData, pcbData); } return ret; } -static BOOL WINAPI CRLContext_SetProperty(void *context, DWORD dwPropId, +static BOOL CRLContext_SetProperty(PCCRL_CONTEXT context, DWORD dwPropId, DWORD dwFlags, const void *pvData) { PCONTEXT_PROPERTY_LIST properties = @@ -460,8 +459,7 @@ SetLastError(E_INVALIDARG); return FALSE; } - ret = CRLContext_SetProperty((void *)pCRLContext, dwPropId, dwFlags, - pvData); + ret = CRLContext_SetProperty(pCRLContext, dwPropId, dwFlags, pvData); TRACE("returning %d\n", ret); return ret; } @@ -519,10 +517,7 @@ if (!pTimeToVerify) { - SYSTEMTIME sysTime; - - GetSystemTime(&sysTime); - SystemTimeToFileTime(&sysTime, &fileTime); + GetSystemTimeAsFileTime(&fileTime); pTimeToVerify = &fileTime; } if ((ret = CompareFileTime(pTimeToVerify, &pCrlInfo->ThisUpdate)) >= 0) Modified: trunk/reactos/include/psdk/ddeml.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddeml.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/ddeml.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ddeml.h [iso-8859-1] Fri May 9 12:37:21 2008 @@ -192,6 +192,7 @@ #define XTYP_DISCONNECT (0x00C0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK ) #define XTYP_UNREGISTER (0x00D0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK ) #define XTYP_WILDCONNECT (0x00E0 | XCLASS_DATA | XTYPF_NOBLOCK) +#define XTYP_MONITOR (0x00F0 | XCLASS_NOTIFICATION | XTYPF_NOBLOCK) #define XTYP_MASK 0x00F0 #define XTYP_SHIFT 4 Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Fri May 9 12:37:21 2008 @@ -3998,6 +3998,22 @@ PCWSTR lpFilePath; } ASSEMBLY_FILE_DETAILED_INFORMATION,*PASSEMBLY_FILE_DETAILED_INFORMATION; typedef const ASSEMBLY_FILE_DETAILED_INFORMATION *PCASSEMBLY_FILE_DETAILED_INFORMATION; + +#define ACTIVATION_CONTEXT_PATH_TYPE_NONE 1 +#define ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE 2 +#define ACTIVATION_CONTEXT_PATH_TYPE_URL 3 +#define ACTIVATION_CONTEXT_PATH_TYPE_ASSEMBLYREF 4 + +#define ACTIVATION_CONTEXT_SECTION_ASSEMBLY_INFORMATION 1 +#define ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION 2 +#define ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION 3 +#define ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION 4 +#define ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION 5 +#define ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION 6 +#define ACTIVATION_CONTEXT_SECTION_COM_PROGID_REDIRECTION 7 +#define ACTIVATION_CONTEXT_SECTION_GLOBAL_OBJECT_RENAME_TABLE 8 +#define ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES 9 + #endif /* (WIN32_WINNT >= 0x0501) */ typedef struct _PROCESSOR_POWER_POLICY_INFO { Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Fri May 9 12:37:21 2008 @@ -2475,6 +2475,8 @@ #define OBJID_CURSOR 0xFFFFFFF7 #define OBJID_ALERT 0xFFFFFFF6 #define OBJID_SOUND 0xFFFFFFF5 +#define OBJID_QUERYCLASSNAMEIDX 0xFFFFFFF4 +#define OBJID_NATIVEOM 0xFFFFFF0 #define GUI_CARETBLINKING 0x00000001 #define GUI_INMOVESIZE 0x00000002 #define GUI_INMENUMODE 0x00000004 Modified: trunk/reactos/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/test.… ============================================================================== --- trunk/reactos/include/reactos/wine/test.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/test.h [iso-8859-1] Fri May 9 12:37:21 2008 @@ -59,6 +59,7 @@ extern int winetest_loop_todo(void); extern void winetest_end_todo( const char* platform ); extern int winetest_get_mainargs( char*** pargv ); +extern void winetest_wait_child_process( HANDLE process ); #ifdef STANDALONE #define START_TEST(name) \ @@ -342,6 +343,32 @@ return winetest_argc; } +void winetest_wait_child_process( HANDLE process ) +{ + DWORD exit_code = 1; + + if (WaitForSingleObject( process, 30000 )) + fprintf( stdout, "%s: child process wait failed\n", current_test->name ); + else + GetExitCodeProcess( process, &exit_code ); + + if (exit_code) + { + if (exit_code > 255) + { + fprintf( stdout, "%s: exception 0x%08x in child process\n", current_test->name, exit_code ); + InterlockedIncrement( &failures ); + } + else + { + fprintf( stdout, "%s: %u failures in child process\n", + current_test->name, exit_code ); + while (exit_code-- > 0) + InterlockedIncrement(&failures); + } + } +} + /* Find a test by name */ static const struct test *find_test( const char *name ) { Modified: trunk/reactos/include/reactos/wine/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winus… ============================================================================== --- trunk/reactos/include/reactos/wine/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winuser.h [iso-8859-1] Fri May 9 12:37:21 2008 @@ -30,6 +30,15 @@ #define E_PROP_SET_UNSUPPORTED ((HRESULT)0x80070492) #endif +/* MapVirtualKey translation types */ +#define MAPVK_VK_TO_VSC 0 +#define MAPVK_VSC_TO_VK 1 +#define MAPVK_VK_TO_CHAR 2 +#define MAPVK_VSC_TO_VK_EX 3 +#define MAPVK_VK_TO_VSC_EX 4 + +#define WM_SETVISIBLE 0x0009 + #define MAKEINTATOMA(atom) ((LPCSTR)((ULONG_PTR)((WORD)(atom)))) #define MAKEINTATOMW(atom) ((LPCWSTR)((ULONG_PTR)((WORD)(atom))))

16 years, 4 months

← Newer
1
...
36
37
38
39
40
41
42
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2008