Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 66861: - Fix build
by gadamopoulos＠svn.reactos.org 22 Mar '15

22 Mar '15

Author: gadamopoulos Date: Sun Mar 22 21:37:02 2015 New Revision: 66861 URL: http://svn.reactos.org/svn/reactos?rev=66861&view=rev Log: - Fix build Modified: trunk/reactos/include/reactos/undocuser.h Modified: trunk/reactos/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocuser.… ============================================================================== --- trunk/reactos/include/reactos/undocuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/undocuser.h [iso-8859-1] Sun Mar 22 21:37:02 2015 @@ -165,6 +165,7 @@ LPARAM lParam, PBSMINFO pBSMInfo); BOOL WINAPI CliImmSetHotKey(DWORD dwID, UINT uModifiers, UINT uVirtualKey, HKL hKl); +HWND WINAPI SetTaskmanWindow(HWND); HWND WINAPI GetTaskmanWindow(VOID); HWND WINAPI GetProgmanWindow(VOID); BOOL WINAPI SetShellWindow(HWND);

1 0

[gadamopoulos] 66860: [SHELL32] - Call SetTaskmanWindow right before RegisterShellHookWindow like the old explorer did.
by gadamopoulos＠svn.reactos.org 22 Mar '15

22 Mar '15

Author: gadamopoulos Date: Sun Mar 22 21:34:08 2015 New Revision: 66860 URL: http://svn.reactos.org/svn/reactos?rev=66860&view=rev Log: [SHELL32] - Call SetTaskmanWindow right before RegisterShellHookWindow like the old explorer did. Modified: trunk/reactos/dll/win32/shell32/wine/shellord.c Modified: trunk/reactos/dll/win32/shell32/wine/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shellord.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shellord.c [iso-8859-1] Sun Mar 22 21:34:08 2015 @@ -310,9 +310,14 @@ DWORD dwType) { if (dwType == 3) + { + SetTaskmanWindow(hWnd); return RegisterShellHookWindow(hWnd); + } else if (dwType == 0) + { return DeregisterShellHookWindow(hWnd); + } ERR("Unsupported argument"); return FALSE;

1 0

[spetreolle] 66859: [IPHLPAPI] Add checks for the family.
by spetreolle＠svn.reactos.org 22 Mar '15

22 Mar '15

Author: spetreolle Date: Sun Mar 22 20:35:21 2015 New Revision: 66859 URL: http://svn.reactos.org/svn/reactos?rev=66859&view=rev Log: [IPHLPAPI] Add checks for the family. Modified: trunk/reactos/dll/win32/iphlpapi/address.c Modified: trunk/reactos/dll/win32/iphlpapi/address.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/address… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/address.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/address.c [iso-8859-1] Sun Mar 22 20:35:21 2015 @@ -290,15 +290,24 @@ if (!pOutBufLen) return ERROR_INVALID_PARAMETER; - if ((Family == AF_INET6) || (Family == AF_UNSPEC)) - { - /* One day maybe... */ - FIXME("IPv6 is not supported in ReactOS!\n"); - if (Family == AF_INET6) - { + switch(Family) + { + case AF_INET: + break; + case AF_INET6: + /* One day maybe... */ + FIXME("IPv6 is not supported in ReactOS!\n"); /* We got nothing to say in this case */ return ERROR_NO_DATA; - } + break; + case AF_UNSPEC: + WARN("IPv6 addresses ignored, IPv4 only\n"); + Family = AF_INET; + break; + default: + ERR("Invalid family 0x%x\n", Family); + return ERROR_INVALID_PARAMETER; + break; } RemainingSize = *pOutBufLen;

1 0

[akhaldi] 66858: [FUSION_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 22 Mar '15

22 Mar '15

Author: akhaldi Date: Sun Mar 22 18:34:09 2015 New Revision: 66858 URL: http://svn.reactos.org/svn/reactos?rev=66858&view=rev Log: [FUSION_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/fusion/asmcache.c trunk/rostests/winetests/fusion/asmname.c trunk/rostests/winetests/fusion/fusion.c Modified: trunk/rostests/winetests/fusion/asmcache.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/fusion/asmcache… ============================================================================== --- trunk/rostests/winetests/fusion/asmcache.c [iso-8859-1] (original) +++ trunk/rostests/winetests/fusion/asmcache.c [iso-8859-1] Sun Mar 22 18:34:09 2015 @@ -889,6 +889,43 @@ IAssemblyCache_Release(cache); } +static void test_CreateAssemblyCacheItem(void) +{ + IAssemblyCache *cache; + IAssemblyCacheItem *item; + HRESULT hr; + + static const WCHAR wine[] = {'w','i','n','e',0}; + + hr = pCreateAssemblyCache(&cache, 0); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IAssemblyCache_CreateAssemblyCacheItem(cache, 0, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + hr = IAssemblyCache_CreateAssemblyCacheItem(cache, 0, NULL, &item, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + IAssemblyCacheItem_Release(item); + + hr = IAssemblyCache_CreateAssemblyCacheItem(cache, 0, NULL, &item, wine); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + IAssemblyCacheItem_Release(item); + + hr = IAssemblyCache_CreateAssemblyCacheItem(cache, 1, (void *)0xdeadbeef, &item, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + IAssemblyCacheItem_Release(item); + + hr = IAssemblyCache_CreateAssemblyCacheItem(cache, 1, NULL, &item, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + IAssemblyCacheItem_Release(item); + + hr = IAssemblyCache_CreateAssemblyCacheItem(cache, 0, (void *)0xdeadbeef, &item, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + IAssemblyCacheItem_Release(item); + + IAssemblyCache_Release(cache); +} + static void test_InstallAssembly(void) { IAssemblyCache *cache; @@ -1243,8 +1280,7 @@ "Expected ASSEMBLYINFO_FLAG_INSTALLED, got %08x\n", info.dwAssemblyFlags); ok(info.uliAssemblySizeInKB.u.HighPart == 0, "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), - "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Expected E_NOT_SUFFICIENT_BUFFER, got %08x\n", hr); todo_wine { ok((info.uliAssemblySizeInKB.u.LowPart == 4), @@ -1266,8 +1302,7 @@ "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, empty), "Assembly path was changed\n"); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), - "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Expected E_NOT_SUFFICIENT_BUFFER, got %08x\n", hr); todo_wine { ok((info.uliAssemblySizeInKB.u.LowPart == 4), @@ -1329,7 +1364,7 @@ lstrcatW(name, otherver); hr = IAssemblyCache_QueryAssemblyInfo(cache, QUERYASMINFO_FLAG_VALIDATE, name, &info); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); ok(info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED, "got %08x\n", info.dwAssemblyFlags); /* short buffer, QUERYASMINFO_FLAG_GETSIZE */ @@ -1339,7 +1374,7 @@ lstrcatW(name, otherver); hr = IAssemblyCache_QueryAssemblyInfo(cache, QUERYASMINFO_FLAG_GETSIZE, name, &info); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); ok(info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED, "got %08x\n", info.dwAssemblyFlags); /* display name is "wine, Version=1.0.0.00000" */ @@ -1533,8 +1568,7 @@ lstrcatW(name, commasep); lstrcatW(name, ver); hr = IAssemblyCache_QueryAssemblyInfo(cache, 0, name, &info); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), - "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Expected E_NOT_SUFFICIENT_BUFFER, got %08x\n", hr); ok(info.cbAssemblyInfo == sizeof(ASSEMBLY_INFO), "Expected sizeof(ASSEMBLY_INFO), got %d\n", info.cbAssemblyInfo); ok(info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED, @@ -1561,6 +1595,7 @@ return; test_CreateAssemblyCache(); + test_CreateAssemblyCacheItem(); test_InstallAssembly(); test_QueryAssemblyInfo(); } Modified: trunk/rostests/winetests/fusion/asmname.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/fusion/asmname.… ============================================================================== --- trunk/rostests/winetests/fusion/asmname.c [iso-8859-1] (original) +++ trunk/rostests/winetests/fusion/asmname.c [iso-8859-1] Sun Mar 22 18:34:09 2015 @@ -434,7 +434,7 @@ str[0] = '\0'; hr = IAssemblyName_GetName(name, &size, str); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(lstrlenW(str) == 0, "Expected empty name\n"); + ok(!str[0], "Expected empty name\n"); ok(size == 0, "Expected 0, got %d\n", size); hi = 0xbeefcace; @@ -470,7 +470,7 @@ str[0] = '\0'; hr = IAssemblyName_GetName(name, &size, str); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(lstrlenW(str) == 0, "Expected empty name\n"); + ok(!str[0], "Expected empty name\n"); ok(size == 1, "Expected 1, got %d\n", size); hi = 0xbeefcace; Modified: trunk/rostests/winetests/fusion/fusion.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/fusion/fusion.c… ============================================================================== --- trunk/rostests/winetests/fusion/fusion.c [iso-8859-1] (original) +++ trunk/rostests/winetests/fusion/fusion.c [iso-8859-1] Sun Mar 22 18:34:09 2015 @@ -108,16 +108,14 @@ /* NULL pwzCachePath, pcchPath is 0 */ size = 0; hr = pGetCachePath(ASM_CACHE_GAC, NULL, &size); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), - "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Expected E_NOT_SUFFICIENT_BUFFER, got %08x\n", hr); ok(size == lstrlenW(cachepath) + 1, "Expected %d, got %d\n", lstrlenW(cachepath) + 1, size); /* NULL pwszCachePath, pcchPath is MAX_PATH */ size = MAX_PATH; hr = pGetCachePath(ASM_CACHE_GAC, NULL, &size); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), - "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Expected E_NOT_SUFFICIENT_BUFFER, got %08x\n", hr); ok(size == lstrlenW(cachepath) + 1, "Expected %d, got %d\n", lstrlenW(cachepath) + 1, size); @@ -142,8 +140,7 @@ lstrcpyW(path, nochange); size = lstrlenW(cachepath); hr = pGetCachePath(ASM_CACHE_GAC, path, &size); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), - "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Expected E_NOT_SUFFICIENT_BUFFER, got %08x\n", hr); ok( !lstrcmpW( nochange, path ), "Expected %s, got %s\n", wine_dbgstr_w(nochange), wine_dbgstr_w(path)); lstrcpyW(cachepath, windir);

1 0

[akhaldi] 66857: [GDIPLUS] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 22 Mar '15

22 Mar '15

Author: akhaldi Date: Sun Mar 22 18:33:30 2015 New Revision: 66857 URL: http://svn.reactos.org/svn/reactos?rev=66857&view=rev Log: [GDIPLUS] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/gdiplus/graphics.c trunk/reactos/dll/win32/gdiplus/image.c trunk/reactos/dll/win32/gdiplus/region.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] Sun Mar 22 18:33:30 2015 @@ -823,6 +823,10 @@ right = bitmap->width-1; if (bottom >= bitmap->height) bottom = bitmap->height-1; + if (bottom < top || right < left) + /* entirely outside image, just sample a pixel so we don't have to + * special-case this later */ + left = top = right = bottom = 0; } else { @@ -1775,7 +1779,7 @@ for(i = 1; i < count; i++){ if((types[i] & PathPointTypePathTypeMask) == PathPointTypeBezier){ if((i + 2 >= count) || !(types[i + 1] & PathPointTypeBezier) - || !(types[i + 1] & PathPointTypeBezier)){ + || !(types[i + 2] & PathPointTypeBezier)){ ERR("Bad bezier points\n"); goto end; } @@ -2021,8 +2025,7 @@ rect->Height = GetDeviceCaps(graphics->hdc, VERTRES); } - if (graphics->hdc && - (GetMapMode(graphics->hdc) != MM_TEXT || GetGraphicsMode(graphics->hdc) != GM_COMPATIBLE)) + if (graphics->hdc) { POINT points[2]; Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] Sun Mar 22 18:33:30 2015 @@ -565,8 +565,8 @@ } #define convert_indexed_to_rgb(getpixel_function, setpixel_function) do { \ - for (x=0; x<width; x++) \ - for (y=0; y<height; y++) { \ + for (y=0; y<height; y++) \ + for (x=0; x<width; x++) { \ BYTE index; \ ARGB argb; \ BYTE *color = (BYTE *)&argb; \ @@ -578,8 +578,8 @@ } while (0); #define convert_rgb_to_rgb(getpixel_function, setpixel_function) do { \ - for (x=0; x<width; x++) \ - for (y=0; y<height; y++) { \ + for (y=0; y<height; y++) \ + for (x=0; x<width; x++) { \ BYTE r, g, b, a; \ getpixel_function(&r, &g, &b, &a, src_bits+src_stride*y, x); \ setpixel_function(r, g, b, a, dst_bits+dst_stride*y, x); \ @@ -588,8 +588,8 @@ } while (0); #define convert_rgb_to_indexed(getpixel_function, setpixel_function) do { \ - for (x=0; x<width; x++) \ - for (y=0; y<height; y++) { \ + for (y=0; y<height; y++) \ + for (x=0; x<width; x++) { \ BYTE r, g, b, a; \ getpixel_function(&r, &g, &b, &a, src_bits+src_stride*y, x); \ setpixel_function(r, g, b, a, dst_bits+dst_stride*y, x, palette); \ @@ -1466,6 +1466,18 @@ return stat; } +static inline DWORD blend_argb_no_bkgnd_alpha(DWORD src, DWORD bkgnd) +{ + BYTE b = (BYTE)src; + BYTE g = (BYTE)(src >> 8); + BYTE r = (BYTE)(src >> 16); + DWORD alpha = (BYTE)(src >> 24); + return ((b + ((BYTE)bkgnd * (255 - alpha) + 127) / 255) | + (g + ((BYTE)(bkgnd >> 8) * (255 - alpha) + 127) / 255) << 8 | + (r + ((BYTE)(bkgnd >> 16) * (255 - alpha) + 127) / 255) << 16 | + (alpha << 24)); +} + GpStatus WINGDIPAPI GdipCreateHBITMAPFromBitmap(GpBitmap* bitmap, HBITMAP* hbmReturn, ARGB background) { @@ -1506,6 +1518,17 @@ if (stat == Ok) stat = GdipBitmapUnlockBits(bitmap, &lockeddata); + + if (stat == Ok && (background & 0xffffff)) + { + DWORD *ptr; + UINT i; + for (ptr = (DWORD*)bits, i = 0; i < width * height; ptr++, i++) + { + if ((*ptr & 0xff000000) == 0xff000000) continue; + *ptr = blend_argb_no_bkgnd_alpha(*ptr, background); + } + } } else stat = GenericError; @@ -3836,11 +3859,6 @@ * Encoding functions - * These functions encode an image in different image file formats. */ -#define BITMAP_FORMAT_BMP 0x4d42 /* "BM" */ -#define BITMAP_FORMAT_JPEG 0xd8ff -#define BITMAP_FORMAT_GIF 0x4947 -#define BITMAP_FORMAT_PNG 0x5089 -#define BITMAP_FORMAT_APM 0xcdd7 static GpStatus encode_image_WIC(GpImage *image, IStream* stream, GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) Modified: trunk/reactos/dll/win32/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/region.c… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] Sun Mar 22 18:33:30 2015 @@ -1,5 +1,6 @@ /* * Copyright (C) 2008 Google (Lei Zhang) + * Copyright (C) 2013 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -63,6 +64,28 @@ #define FLAGS_NOFLAGS 0x0 #define FLAGS_INTPATH 0x4000 + +struct memory_buffer +{ + const BYTE *buffer; + INT size, pos; +}; + +struct region_header +{ + DWORD size; + DWORD checksum; + DWORD magic; + DWORD num_children; +}; + +struct path_header +{ + DWORD size; + DWORD magic; + DWORD count; + DWORD flags; +}; /* Header size as far as header->size is concerned. This doesn't include * header->size or header->checksum @@ -510,12 +533,221 @@ return GdipCreateRegionRect(&rectf, region); } +static inline void init_memory_buffer(struct memory_buffer *mbuf, const BYTE *buffer, INT size) +{ + mbuf->buffer = buffer; + mbuf->size = size; + mbuf->pos = 0; +} + +static inline const void *buffer_read(struct memory_buffer *mbuf, INT size) +{ + if (mbuf->size - mbuf->pos >= size) + { + const void *data = mbuf->buffer + mbuf->pos; + mbuf->pos += size; + return data; + } + return NULL; +} + +static GpStatus read_element(struct memory_buffer *mbuf, GpRegion *region, region_element *node, INT *count) +{ + GpStatus status; + const DWORD *type; + + type = buffer_read(mbuf, sizeof(DWORD)); + if (!type) return Ok; + + TRACE("type %#x\n", *type); + + node->type = *type; + + switch (node->type) + { + case CombineModeReplace: + case CombineModeIntersect: + case CombineModeUnion: + case CombineModeXor: + case CombineModeExclude: + case CombineModeComplement: + { + region_element *left, *right; + + left = GdipAlloc(sizeof(region_element)); + if (!left) return OutOfMemory; + right = GdipAlloc(sizeof(region_element)); + if (!right) + { + GdipFree(left); + return OutOfMemory; + } + + status = read_element(mbuf, region, left, count); + if (status == Ok) + { + status = read_element(mbuf, region, right, count); + if (status == Ok) + { + node->elementdata.combine.left = left; + node->elementdata.combine.right = right; + region->num_children += 2; + return Ok; + } + } + + GdipFree(left); + GdipFree(right); + return status; + } + + case RegionDataRect: + { + const GpRectF *rc; + + rc = buffer_read(mbuf, sizeof(GpRectF)); + if (!rc) + { + ERR("failed to read rect data\n"); + return InvalidParameter; + } + + node->elementdata.rect = *rc; + *count += 1; + return Ok; + } + + case RegionDataPath: + { + GpPath *path; + const struct path_header *path_header; + const BYTE *types; + + path_header = buffer_read(mbuf, sizeof(struct path_header)); + if (!path_header) + { + ERR("failed to read path header\n"); + return InvalidParameter; + } + if (path_header->magic != VERSION_MAGIC) + { + ERR("invalid path header magic %#x\n", path_header->magic); + return InvalidParameter; + } + + /* Windows always fails to create an empty path in a region */ + if (!path_header->count) + { + TRACE("refusing to create an empty path in a region\n"); + return GenericError; + } + + status = GdipCreatePath(FillModeAlternate, &path); + if (status) return status; + + node->elementdata.path = path; + + if (!lengthen_path(path, path_header->count)) + return OutOfMemory; + + path->pathdata.Count = path_header->count; + + if (path_header->flags & ~FLAGS_INTPATH) + FIXME("unhandled path flags %#x\n", path_header->flags); + + if (path_header->flags & FLAGS_INTPATH) + { + const packed_point *pt; + DWORD i; + + pt = buffer_read(mbuf, sizeof(packed_point) * path_header->count); + if (!pt) + { + ERR("failed to read packed %u path points\n", path_header->count); + return InvalidParameter; + } + + for (i = 0; i < path_header->count; i++) + { + path->pathdata.Points[i].X = (REAL)pt[i].X; + path->pathdata.Points[i].Y = (REAL)pt[i].Y; + } + } + else + { + const GpPointF *ptf; + + ptf = buffer_read(mbuf, sizeof(GpPointF) * path_header->count); + if (!ptf) + { + ERR("failed to read %u path points\n", path_header->count); + return InvalidParameter; + } + memcpy(path->pathdata.Points, ptf, sizeof(GpPointF) * path_header->count); + } + + types = buffer_read(mbuf, path_header->count); + if (!types) + { + ERR("failed to read %u path types\n", path_header->count); + return InvalidParameter; + } + memcpy(path->pathdata.Types, types, path_header->count); + if (path_header->count & 3) + { + if (!buffer_read(mbuf, 4 - (path_header->count & 3))) + { + ERR("failed to read rounding %u bytes\n", 4 - (path_header->count & 3)); + return InvalidParameter; + } + } + + *count += 1; + return Ok; + } + + case RegionDataEmptyRect: + case RegionDataInfiniteRect: + *count += 1; + return Ok; + + default: + FIXME("element type %#x is not supported\n", *type); + break; + } + + return InvalidParameter; +} + GpStatus WINGDIPAPI GdipCreateRegionRgnData(GDIPCONST BYTE *data, INT size, GpRegion **region) { - FIXME("(%p, %d, %p): stub\n", data, size, region); - - *region = NULL; - return NotImplemented; + GpStatus status; + struct memory_buffer mbuf; + const struct region_header *region_header; + INT count; + + if (!data || !size) return InvalidParameter; + + TRACE("%p, %d, %p\n", data, size, region); + + init_memory_buffer(&mbuf, data, size); + + region_header = buffer_read(&mbuf, sizeof(struct region_header)); + if (!region_header || region_header->magic != VERSION_MAGIC) + return InvalidParameter; + + status = GdipCreateRegion(region); + if (status != Ok) return status; + + count = 0; + status = read_element(&mbuf, *region, &(*region)->node, &count); + if (status == Ok && !count) + status = InvalidParameter; + + if (status != Ok) + GdipDeleteRegion(*region); + + return status; } @@ -726,15 +958,9 @@ { INT i; const GpPath* path = element->elementdata.path; - struct _pathheader - { - DWORD size; - DWORD magic; - DWORD count; - DWORD flags; - } *pathheader; - - pathheader = (struct _pathheader *)(buffer + *filled); + struct path_header *pathheader; + + pathheader = (struct path_header *)(buffer + *filled); pathheader->flags = is_integer_path(path) ? FLAGS_INTPATH : FLAGS_NOFLAGS; /* 3 for headers, once again size doesn't count itself */ @@ -811,13 +1037,7 @@ GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size, UINT *needed) { - struct _region_header - { - DWORD size; - DWORD checksum; - DWORD magic; - DWORD num_children; - } *region_header; + struct region_header *region_header; INT filled = 0; UINT required; GpStatus status; @@ -835,7 +1055,7 @@ return InsufficientBuffer; } - region_header = (struct _region_header *)buffer; + region_header = (struct region_header *)buffer; region_header->size = sizeheader_size + get_element_size(&region->node); region_header->checksum = 0; region_header->magic = VERSION_MAGIC; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Mar 22 18:33:30 2015 @@ -76,7 +76,7 @@ reactos/dll/win32/faultrep # Synced to Wine-1.7.27 reactos/dll/win32/fltlib # Synced to Wine-1.7.27 reactos/dll/win32/fusion # Synced to WineStaging-1.7.37 -reactos/dll/win32/gdiplus # Synced to Wine-1.7.27 +reactos/dll/win32/gdiplus # Synced to WineStaging-1.7.37 reactos/dll/win32/hhctrl.ocx # Synced to Wine-1.7.27 reactos/dll/win32/hlink # Synced to Wine-1.7.27 reactos/dll/win32/hnetcfg # Synced to Wine-1.7.27

1 0

[akhaldi] 66856: [MPLAY32] Give a valid pointer to a MCI_SEEK_PARMS structure when using MCI_SEEK_TO_START flag. By Ricardo Hanke. CORE-9408
by akhaldi＠svn.reactos.org 22 Mar '15

22 Mar '15

Author: akhaldi Date: Sun Mar 22 18:07:59 2015 New Revision: 66856 URL: http://svn.reactos.org/svn/reactos?rev=66856&view=rev Log: [MPLAY32] Give a valid pointer to a MCI_SEEK_PARMS structure when using MCI_SEEK_TO_START flag. By Ricardo Hanke. CORE-9408 Modified: trunk/reactos/base/applications/mplay32/mplay32.c Modified: trunk/reactos/base/applications/mplay32/mplay32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] Sun Mar 22 18:07:59 2015 @@ -640,6 +640,7 @@ { MCIERROR mciError; MCI_GENERIC_PARMS mciGeneric; + MCI_SEEK_PARMS mciSeek; if (wDeviceId == 0) return; @@ -654,7 +655,7 @@ return; } - mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_SEEK_TO_START, 0); + mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_SEEK_TO_START, (DWORD_PTR)&mciSeek); UpdateTimeDisplay(hTimeDisplay); UpdateWindowCaption(hwnd); @@ -777,10 +778,11 @@ { MCIERROR mciError; MCI_PLAY_PARMS mciPlay; + MCI_SEEK_PARMS mciSeek; SetTimer(hwnd, IDT_PLAYTIMER, 100, (TIMERPROC)PlayTimerProc); - mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_SEEK_TO_START, 0); + mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_SEEK_TO_START, (DWORD_PTR)&mciSeek); mciPlay.dwCallback = (DWORD_PTR)hwnd; mciPlay.dwFrom = 0;

1 0

[cfinck] 66855: [ROSAUTOTEST] Make outputting a string as easy as it should be. Now that our StringOut internally uses OutputDebugStringA instead of DbgPrint, we don't need to output in 512 byte ch...
by cfinck＠svn.reactos.org 22 Mar '15

22 Mar '15

Author: cfinck Date: Sun Mar 22 12:35:08 2015 New Revision: 66855 URL: http://svn.reactos.org/svn/reactos?rev=66855&view=rev Log: [ROSAUTOTEST] Make outputting a string as easy as it should be. Now that our StringOut internally uses OutputDebugStringA instead of DbgPrint, we don't need to output in 512 byte chunks anymore. Additionally, do an explicit flush when using std::cout to not lose debug output. ROSTESTS-158 #resolve #comment Committed in r66855 Modified: trunk/rostests/rosautotest/CWineTest.cpp trunk/rostests/rosautotest/precomp.h trunk/rostests/rosautotest/tools.cpp Modified: trunk/rostests/rosautotest/CWineTest.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CWineTest.cpp… ============================================================================== --- trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] Sun Mar 22 12:35:08 2015 @@ -276,7 +276,6 @@ stringstream ss, ssFinish; DWORD StartTime; float TotalTime; - string tailString; CPipe Pipe; char Buffer[1024]; @@ -295,7 +294,7 @@ { /* Output text through StringOut, even while the test is still running */ Buffer[BytesAvailable] = 0; - tailString = StringOut(tailString.append(string(Buffer)), false); + StringOut(string(Buffer)); if(Configuration.DoSubmit()) TestInfo->Log += Buffer; @@ -305,16 +304,9 @@ } catch(CTestException& e) { - if(!tailString.empty()) - StringOut(tailString); - tailString.clear(); StringOut(e.GetMessage()); TestInfo->Log += e.GetMessage(); } - - /* Print what's left */ - if(!tailString.empty()) - StringOut(tailString); TotalTime = ((float)GetTickCount() - StartTime)/1000; ssFinish << "Test " << TestInfo->Test << " completed in "; Modified: trunk/rostests/rosautotest/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/precomp.h?rev… ============================================================================== --- trunk/rostests/rosautotest/precomp.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/precomp.h [iso-8859-1] Sun Mar 22 12:35:08 2015 @@ -69,7 +69,7 @@ string EscapeString(const string& Input); string GetINIValue(PCWCH AppName, PCWCH KeyName, PCWCH FileName); bool IsNumber(const char* Input); -string StringOut(const string& String, bool forcePrint = true); +void StringOut(const string& InputString); string UnicodeToAscii(PCWSTR UnicodeString); string UnicodeToAscii(const wstring& UnicodeString); Modified: trunk/rostests/rosautotest/tools.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/tools.cpp?rev… ============================================================================== --- trunk/rostests/rosautotest/tools.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/tools.cpp [iso-8859-1] Sun Mar 22 12:35:08 2015 @@ -2,12 +2,11 @@ * PROJECT: ReactOS Automatic Testing Utility * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Various helper functions - * COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2008-2015 Colin Finck <colin(a)reactos.org> */ #include "precomp.h" -#define DBGPRINT_BUFSIZE 511 static const char HexCharacters[] = "0123456789ABCDEF"; /** @@ -87,85 +86,43 @@ /** * Outputs a string through the standard output and the debug output. - * The string may have LF or CRLF line endings. - * - * @param String + * The input string may have LF or CRLF line endings. + * + * @param InputString * The std::string to output */ -string -StringOut(const string& String, bool forcePrint) -{ - char DbgString[DBGPRINT_BUFSIZE + 1]; - size_t i, start = 0, last_newline = 0, size = 0, curr_pos = 0; - string NewString; +void +StringOut(const string& InputString) +{ + const char* pInput = InputString.c_str(); + char* OutputString = new char[InputString.size() + 1]; + char* pOutput = OutputString; /* Unify the line endings (the piped output of the tests may use CRLF) */ - for(i = 0; i < String.size(); i++) + while (*pInput) { /* If this is a CRLF line-ending, only copy a \n to the new string and skip the next character */ - if(String[i] == '\r' && String[i + 1] == '\n') - { - NewString += '\n'; - ++i; + if (*pInput == '\r' && *(pInput + 1) == '\n') + { + *pOutput = '\n'; + ++pInput; } else { - /* Otherwise copy the string */ - NewString += String[i]; - } - - curr_pos = NewString.size(); - - /* Try to print whole lines but obey the 512 bytes chunk size limit*/ - if(NewString[curr_pos - 1] == '\n' || (curr_pos - start) == DBGPRINT_BUFSIZE) - { - if((curr_pos - start) >= DBGPRINT_BUFSIZE) - { - /* No newlines so far, or the string just fits */ - if(last_newline <= start || ((curr_pos - start == DBGPRINT_BUFSIZE) && NewString[curr_pos - 1] == '\n')) - { - size = curr_pos - start; - memcpy(DbgString, NewString.c_str() + start, size); - start = curr_pos; - } - else - { - size = last_newline - start; - memcpy(DbgString, NewString.c_str() + start, size); - start = last_newline; - } - - DbgString[size] = 0; - OutputDebugStringA(DbgString); - } - - last_newline = curr_pos; - } - } - - size = curr_pos - start; - - /* Only print if forced to or if the rest is a whole line */ - if(forcePrint == true || NewString[curr_pos - 1] == '\n') - { - /* Output the whole string */ - if(Configuration.DoPrint()) - cout << NewString; - - memcpy(DbgString, NewString.c_str() + start, size); - DbgString[size] = 0; - OutputDebugStringA(DbgString); - - NewString.clear(); - return NewString; - } - - /* Output full lines only */ - if(Configuration.DoPrint()) - cout << NewString.substr(0, start); - - /* Return the remaining chunk */ - return NewString.substr(start, size); + *pOutput = *pInput; + } + + ++pInput; + ++pOutput; + } + + *pOutput = 0; + OutputDebugStringA(OutputString); + + if (Configuration.DoPrint()) + cout << OutputString << flush; + + delete[] OutputString; } /**

1 0

[khornicek] 66854: [WIN32K] - set the devmode size for ENUM_REGISTRY_SETTINGS case in NtUserEnumDisplaySettings so it gets copied back to caller later
by khornicek＠svn.reactos.org 22 Mar '15

22 Mar '15

Author: khornicek Date: Sun Mar 22 12:08:09 2015 New Revision: 66854 URL: http://svn.reactos.org/svn/reactos?rev=66854&view=rev Log: [WIN32K] - set the devmode size for ENUM_REGISTRY_SETTINGS case in NtUserEnumDisplaySettings so it gets copied back to caller later Modified: trunk/reactos/win32ss/user/ntuser/display.c Modified: trunk/reactos/win32ss/user/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/displa… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/display.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/display.c [iso-8859-1] Sun Mar 22 12:08:09 2015 @@ -602,6 +602,7 @@ /* Get the registry settings */ Status = UserEnumRegistryDisplaySettings(pustrDevice, &dmReg); pdm = &dmReg; + pdm->dmSize = sizeof(DEVMODEW); } else if (iModeNum == ENUM_CURRENT_SETTINGS) {

1 0

[janderwald] 66853: [SYSAUDIO][KMIXER] - convert to pnp software device
by janderwald＠svn.reactos.org 22 Mar '15

22 Mar '15

Author: janderwald Date: Sun Mar 22 11:27:52 2015 New Revision: 66853 URL: http://svn.reactos.org/svn/reactos?rev=66853&view=rev Log: [SYSAUDIO][KMIXER] - convert to pnp software device Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.c trunk/reactos/drivers/wdm/audio/sysaudio/main.c trunk/reactos/media/inf/wdmaudio.inf Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.c [iso-8859-1] Sun Mar 22 11:27:52 2015 @@ -40,13 +40,15 @@ NTSTATUS NTAPI -KMix_InstallDevice( - IN PDRIVER_OBJECT DriverObject) +KMix_AddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject) { NTSTATUS Status; UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\kmixer"); PDEVICE_OBJECT DeviceObject; PKMIXER_DEVICE_EXT DeviceExtension; + PDEVICE_OBJECT NextDeviceObject; DPRINT1("KMix_InstallDevice called\n"); @@ -80,8 +82,12 @@ /* set io flags */ DeviceObject->Flags |= DO_DIRECT_IO | DO_POWER_PAGABLE; + /* clear initializing flag */ DeviceObject->Flags &= ~ DO_DEVICE_INITIALIZING; + + NextDeviceObject = IoAttachDeviceToDeviceStack(DeviceObject, PhysicalDeviceObject); + KsSetDevicePnpAndBaseObject(DeviceExtension->KsDeviceHeader, NextDeviceObject, DeviceObject); DPRINT("KMix_InstallDevice result %x\n", Status); return STATUS_SUCCESS; @@ -110,6 +116,7 @@ DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = KsDefaultForwardIrp; DriverObject->MajorFunction[IRP_MJ_PNP] = KMix_Pnp; DriverObject->DriverUnload = KMix_Unload; + DriverObject->DriverExtension->AddDevice = KMix_AddDevice; - return KMix_InstallDevice(DriverObject); + return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/sysaudio/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/main.c [iso-8859-1] Sun Mar 22 11:27:52 2015 @@ -131,17 +131,17 @@ NTSTATUS NTAPI -SysAudio_InstallDevice( - IN PDRIVER_OBJECT DriverObject) +SysAudio_AddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject) { NTSTATUS Status; UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\sysaudio"); UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\DosDevices\\sysaudio"); - PDEVICE_OBJECT DeviceObject; + PDEVICE_OBJECT DeviceObject, NextDeviceObject; SYSAUDIODEVEXT *DeviceExtension; - - DPRINT("SysAudio_InstallDevice called\n"); + DPRINT("SysAudio_AddDevice called\n"); /* Create the device */ Status = IoCreateDevice(DriverObject, @@ -160,7 +160,7 @@ } /* Register device interfaces */ - Status = SysAudioRegisterDeviceInterfaces(DeviceObject); + Status = SysAudioRegisterDeviceInterfaces(PhysicalDeviceObject); if (!NT_SUCCESS(Status)) { /* Failed to register @@ -215,6 +215,10 @@ /* clear initializing flag */ DeviceObject->Flags &= ~ DO_DEVICE_INITIALIZING; + /* atttach to device stack */ + NextDeviceObject = IoAttachDeviceToDeviceStack(DeviceObject, PhysicalDeviceObject); + KsSetDevicePnpAndBaseObject(DeviceExtension->KsDeviceHeader, NextDeviceObject, DeviceObject); + /* register shutdown notfication */ IoRegisterShutdownNotification(DeviceObject); @@ -259,7 +263,8 @@ /* Sysaudio needs to do work on pnp, so handle it */ DriverObject->MajorFunction[IRP_MJ_PNP] = SysAudio_Pnp; DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = SysAudio_Shutdown; - - /* Call our initialization function */ - return SysAudio_InstallDevice(DriverObject); -} + DriverObject->DriverExtension->AddDevice = SysAudio_AddDevice; + + /* done */ + return STATUS_SUCCESS; +} Modified: trunk/reactos/media/inf/wdmaudio.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/wdmaudio.inf?rev… ============================================================================== --- trunk/reactos/media/inf/wdmaudio.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/wdmaudio.inf [iso-8859-1] Sun Mar 22 11:27:52 2015 @@ -25,8 +25,8 @@ ExcludeFromSelect = WDMAUDIO_CopyFilesOnlyId [GenericMfg] -;%WDM_KMIXER.DeviceDesc% = WDM_KMIXER, SW\{B7EAFDC0-A680-11D0-96D8-00AA0051E51D} -;%WDM_SYSAUDIO.DeviceDesc% = WDM_SYSAUDIO, SW\{A7C7A5B0-5AF3-11D1-9CED-00A024BF0407} +%WDM_KMIXER.DeviceDesc% = WDM_KMIXER, SW\{B7EAFDC0-A680-11D0-96D8-00AA0051E51D} +%WDM_SYSAUDIO.DeviceDesc% = WDM_SYSAUDIO, SW\{A7C7A5B0-5AF3-11D1-9CED-00A024BF0407} %WDM_WDMAUD.DeviceDesc% = WDM_WDMAUD, SW\{CD171DE3-69E5-11D2-B56D-0000F8754380} ;%WDM_DRMKAUD.DeviceDesc% = WDM_DRMKAUD, SW\{EEC12DB6-AD9C-4168-8658-B03DAEF417FE} @@ -51,11 +51,11 @@ [DeviceRegistration] ; Kmixer swenum install -;HKLM,%RunOnce%,"WDM_KMIXER0",,"rundll32.exe streamci.dll,StreamingDeviceSetup %WDM_KMIXER.DeviceId%,%KSNAME_Filter%,%KSCATEGORY_MIXER%,%17%\WDMAUDIO.inf,WDM_KMIXER.Interface.Install" -;HKLM,%RunOnce%,"WDM_KMIXER1",,"rundll32.exe streamci.dll,StreamingDeviceSetup %WDM_KMIXER.DeviceId%,%KSNAME_Filter%,%KSCATEGORY_AUDIO%,%17%\WDMAUDIO.inf,WDM_KMIXER.Interface.Install" +HKLM,%RunOnce%,"WDM_KMIXER0",,"rundll32.exe streamci.dll,StreamingDeviceSetup %WDM_KMIXER.DeviceId%,%KSNAME_Filter%,%KSCATEGORY_MIXER%,%17%\WDMAUDIO.inf,WDM_KMIXER.Interface.Install" +HKLM,%RunOnce%,"WDM_KMIXER1",,"rundll32.exe streamci.dll,StreamingDeviceSetup %WDM_KMIXER.DeviceId%,%KSNAME_Filter%,%KSCATEGORY_AUDIO%,%17%\WDMAUDIO.inf,WDM_KMIXER.Interface.Install" ; Sysaudio swenum install -;HKLM,%RunOnce%,"WDM_SYSAUDIO",,"rundll32.exe streamci.dll,StreamingDeviceSetup %WDM_SYSAUDIO.DeviceId%,%KSNAME_Filter%,%KSCATEGORY_SYSAUDIO%,%17%\WDMAUDIO.inf,WDM_SYSAUDIO.Interface.Install" +HKLM,%RunOnce%,"WDM_SYSAUDIO",,"rundll32.exe streamci.dll,StreamingDeviceSetup %WDM_SYSAUDIO.DeviceId%,%KSNAME_Filter%,%KSCATEGORY_SYSAUDIO%,%17%\WDMAUDIO.inf,WDM_SYSAUDIO.Interface.Install" ; WDMAud install HKLM,%RunOnce%,"WDM_WDMAUD",,"rundll32.exe streamci.dll,StreamingDeviceSetup %WDM_WDMAUD.DeviceId%,%KSNAME_Filter%,%KSCATEGORY_WDMAUD%,%17%\WDMAUDIO.inf,WDM_WDMAUD.Interface.Install"

1 0

[janderwald] 66852: [KS] - fix a few bugs
by janderwald＠svn.reactos.org 22 Mar '15

22 Mar '15

Author: janderwald Date: Sun Mar 22 10:27:44 2015 New Revision: 66852 URL: http://svn.reactos.org/svn/reactos?rev=66852&view=rev Log: [KS] - fix a few bugs Modified: trunk/reactos/drivers/ksfilter/ks/swenum.c Modified: trunk/reactos/drivers/ksfilter/ks/swenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/swenum… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/swenum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/swenum.c [iso-8859-1] Sun Mar 22 10:27:44 2015 @@ -73,7 +73,11 @@ DeviceExtension->DeviceEntry = DeviceEntry; DeviceExtension->BusDeviceExtension = BusDeviceExtension; - /* TODO: update last creation time in bus device extension */ + /* not started yet*/ + DeviceEntry->DeviceState = NotStarted; + + /* get current time */ + KeQuerySystemTime(&DeviceEntry->TimeCreated); /* setup flags */ DeviceObject->Flags |= DO_POWER_PAGABLE; @@ -1209,10 +1213,10 @@ if (Diff.QuadPart > Int32x32To64(15000, 10000)) { - //DPRINT1("DeviceID %S Instance %S TimeCreated %I64u Now %I64u Diff %I64u hung\n", DeviceEntry->DeviceName, DeviceEntry->Instance, DeviceEntry->TimeCreated.QuadPart, Time.QuadPart, Diff.QuadPart); - /* release spin lock */ KeReleaseSpinLock(&BusDeviceExtension->Lock, OldLevel); + + DPRINT1("DeviceID %S Instance %S TimeCreated %I64u Now %I64u Diff %I64u hung\n", DeviceEntry->DeviceName, DeviceEntry->Instance, DeviceEntry->TimeCreated.QuadPart, Time.QuadPart, Diff.QuadPart); /* deactivate interfaces */ //KspEnableBusDeviceInterface(DeviceEntry, FALSE); @@ -1966,10 +1970,8 @@ InsertTailList(&DeviceEntry->IrpPendingList, &Irp->Tail.Overlay.ListEntry); Time.QuadPart = Int32x32To64(1500, -10000); - DbgPrint("PENDING Irp %p %wZ\n", Irp, &IoStack->FileObject->FileName); - - /* query current time */ - KeQuerySystemTime(&DeviceEntry->TimeCreated); + DbgPrint("PENDING Irp %p %wZ DeviceState %d\n", Irp, &IoStack->FileObject->FileName, DeviceEntry->DeviceState); + /* set timer */ KeSetTimer(&BusDeviceExtension->Timer, Time, &BusDeviceExtension->Dpc); @@ -1996,9 +1998,6 @@ /* insert into irp pending list */ InsertTailList(&DeviceEntry->IrpPendingList, &Irp->Tail.Overlay.ListEntry); - - /* get current time */ - KeQuerySystemTime(&DeviceEntry->TimeCreated); /* invalidate device relations */ IoInvalidateDeviceRelations(BusDeviceExtension->PhysicalDeviceObject, BusRelations); @@ -2123,6 +2122,11 @@ { /* start bus */ Status = KspStartBusDevice(DeviceObject, ChildDeviceExtension, Irp); + if (NT_SUCCESS(Status)) + { + /* complete pending irps*/ + KspCompletePendingIrps(ChildDeviceExtension->DeviceEntry, STATUS_REPARSE); + } /* set time out */ Time.QuadPart = Int32x32To64(1500, -10000);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs