Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 66871: [ICCVID] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Mar 25 11:54:53 2015 New Revision: 66871 URL: http://svn.reactos.org/svn/reactos?rev=66871&view=rev Log: [ICCVID] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/iccvid/iccvid.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/iccvid/iccvid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid.c?… ============================================================================== --- trunk/reactos/dll/win32/iccvid/iccvid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iccvid/iccvid.c [iso-8859-1] Wed Mar 25 11:54:53 2015 @@ -62,8 +62,6 @@ #define ICCVID_MAGIC mmioFOURCC('c', 'v', 'i', 'd') #define compare_fourcc(fcc1, fcc2) (((fcc1)^(fcc2))&~0x20202020) - -#define DBUG 0 #define MAX_STRIPS 32 /* ------------------------------------------------------------------------ */ 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] Wed Mar 25 11:54:53 2015 @@ -81,7 +81,7 @@ reactos/dll/win32/hlink # Synced to Wine-1.7.27 reactos/dll/win32/hnetcfg # Synced to WineStaging-1.7.37 reactos/dll/win32/httpapi # Synced to Wine-1.7.27 -reactos/dll/win32/iccvid # Synced to Wine-1.7.27 +reactos/dll/win32/iccvid # Synced to WineStaging-1.7.37 reactos/dll/win32/icmp # Out of sync reactos/dll/win32/ieframe # Synced to Wine-1.7.27 reactos/dll/win32/imaadp32.acm # Synced to Wine-1.7.27

10 years, 1 month

[akhaldi] 66870: [HNETCFG] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Mar 25 11:54:05 2015 New Revision: 66870 URL: http://svn.reactos.org/svn/reactos?rev=66870&view=rev Log: [HNETCFG] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/hnetcfg/apps.c trunk/reactos/dll/win32/hnetcfg/hnetcfg.c trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/hnetcfg/apps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/apps.c?r… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/apps.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/apps.c [iso-8859-1] Wed Mar 25 11:54:05 2015 @@ -131,7 +131,20 @@ ITypeInfo_Release( info ); } *ret = typeinfo[tid]; - return S_OK; + ITypeInfo_AddRef(typeinfo[tid]); + return S_OK; +} + +void release_typelib(void) +{ + unsigned i; + + for (i = 0; i < sizeof(typeinfo)/sizeof(*typeinfo); i++) + if (typeinfo[i]) + ITypeInfo_Release(typeinfo[i]); + + if (typelib) + ITypeLib_Release(typelib); } static HRESULT WINAPI fw_app_GetTypeInfo( @@ -243,8 +256,12 @@ { fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); - FIXME("%p, %p\n", This, ipVersion); - return E_NOTIMPL; + TRACE("%p, %p\n", This, ipVersion); + + if (!ipVersion) + return E_POINTER; + *ipVersion = NET_FW_IP_VERSION_ANY; + return S_OK; } static HRESULT WINAPI fw_app_put_IpVersion( @@ -253,8 +270,8 @@ { fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); - FIXME("%p, %u\n", This, ipVersion); - return E_NOTIMPL; + TRACE("%p, %u\n", This, ipVersion); + return S_OK; } static HRESULT WINAPI fw_app_get_Scope( Modified: trunk/reactos/dll/win32/hnetcfg/hnetcfg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg.… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/hnetcfg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/hnetcfg.c [iso-8859-1] Wed Mar 25 11:54:05 2015 @@ -103,9 +103,9 @@ static hnetcfg_cf fw_app_cf = { { &hnetcfg_cf_vtbl }, NetFwAuthorizedApplication_create }; static hnetcfg_cf fw_openport_cf = { { &hnetcfg_cf_vtbl }, NetFwOpenPort_create }; -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) { - TRACE("(0x%p, %d, %p)\n",hInstDLL,fdwReason,lpvReserved); + TRACE("(0x%p, %d, %p)\n", hInstDLL, fdwReason, reserved); switch(fdwReason) { case DLL_WINE_PREATTACH: @@ -113,6 +113,10 @@ case DLL_PROCESS_ATTACH: instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL); + break; + case DLL_PROCESS_DETACH: + if (reserved) break; + release_typelib(); break; } return TRUE; Modified: trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hnetcfg/hnetcfg_… ============================================================================== --- trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hnetcfg/hnetcfg_private.h [iso-8859-1] Wed Mar 25 11:54:05 2015 @@ -49,6 +49,7 @@ }; HRESULT get_typeinfo(enum type_id, ITypeInfo **) DECLSPEC_HIDDEN; +void release_typelib(void) DECLSPEC_HIDDEN; HRESULT NetFwMgr_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwPolicy_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; 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] Wed Mar 25 11:54:05 2015 @@ -79,7 +79,7 @@ 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 +reactos/dll/win32/hnetcfg # Synced to WineStaging-1.7.37 reactos/dll/win32/httpapi # Synced to Wine-1.7.27 reactos/dll/win32/iccvid # Synced to Wine-1.7.27 reactos/dll/win32/icmp # Out of sync

10 years, 1 month

[akhaldi] 66869: [GDIPLUS_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Mar 25 11:51:58 2015 New Revision: 66869 URL: http://svn.reactos.org/svn/reactos?rev=66869&view=rev Log: [GDIPLUS_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/rostests/winetests/gdiplus/graphics.c trunk/rostests/winetests/gdiplus/image.c trunk/rostests/winetests/gdiplus/region.c Modified: trunk/rostests/winetests/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/graphic… ============================================================================== --- trunk/rostests/winetests/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/graphics.c [iso-8859-1] Wed Mar 25 11:51:58 2015 @@ -34,7 +34,6 @@ #define expect(expected, got) ok((got) == (expected), "Expected %d, got %d\n", (INT)(expected), (INT)(got)) #define expectf_(expected, got, precision) ok(fabs((expected) - (got)) <= (precision), "Expected %f, got %f\n", (expected), (got)) #define expectf(expected, got) expectf_((expected), (got), 0.001) -#define TABLE_LEN (23) static const REAL mm_per_inch = 25.4; static const REAL point_per_inch = 72.0; @@ -3776,6 +3775,7 @@ hdc = CreateCompatibleDC(0); status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); status = GdipGetDpiY(graphics, &dpi); expect(Ok, status); @@ -5552,6 +5552,61 @@ GdipDeleteGraphics(graphics); ReleaseDC(hwnd, hdc); +} + +static void test_GdipGetVisibleClipBounds_memoryDC(void) +{ + HDC hdc,dc; + HBITMAP bmp; + HGDIOBJ old; + RECT rect; + POINT pt; + int width = 0; + int height = 0; + GpGraphics* graphics = NULL; + GpRect boundRect; + GpStatus status; + + ok(GetClientRect(hwnd, &rect), "GetClientRect should have succeeded\n"); + width = rect.right - rect.left; + height = rect.bottom - rect.top; + + dc = GetDC(hwnd); + hdc = CreateCompatibleDC ( dc ); + bmp = CreateCompatibleBitmap ( dc, width, height ); + old = SelectObject (hdc, bmp); + + /*change the window origin is the key test point*/ + SetWindowOrgEx (hdc, rect.left+10, rect.top+10, &pt); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + status = GdipGetVisibleClipBoundsI(graphics, &boundRect); + expect(Ok, status); + + ok(boundRect.X==rect.left+10 && + boundRect.Y==rect.top+10 && + boundRect.Width==width && + boundRect.Height==height, "Expected GdipGetVisibleClipBoundsI ok\n"); + + status = GdipSetClipRectI(graphics, 0, 0, width, height, CombineModeReplace); + expect(Ok, status); + + status = GdipGetVisibleClipBoundsI(graphics, &boundRect); + expect(Ok, status); + + ok(boundRect.X==rect.left+10 && + boundRect.Y==rect.top+10 && + boundRect.Width==width-10 && + boundRect.Height==height-10, "Expected GdipGetVisibleClipBoundsI ok\n"); + + GdipDeleteGraphics(graphics); + + SelectObject (hdc, old); + DeleteObject (bmp); + DeleteDC (hdc); + ReleaseDC(hwnd, dc); } START_TEST(graphics) @@ -5625,6 +5680,7 @@ test_alpha_hdc(); test_bitmapfromgraphics(); test_GdipFillRectangles(); + test_GdipGetVisibleClipBounds_memoryDC(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd ); Modified: trunk/rostests/winetests/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/image.c… ============================================================================== --- trunk/rostests/winetests/gdiplus/image.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/image.c [iso-8859-1] Wed Mar 25 11:51:58 2015 @@ -1703,6 +1703,10 @@ stat = GdipDisposeImage((GpImage*)bitmap); expect(Ok, stat); + /* make (1,0) have no alpha and (2,0) a different blue value. */ + bits[7] = 0x00; + bits[8] = 0x40; + /* create alpha Bitmap */ stat = GdipCreateBitmapFromScan0(8, 20, 32, PixelFormat32bppARGB, bits, &bitmap); expect(Ok, stat); @@ -1728,18 +1732,103 @@ { DWORD val = *(DWORD*)bm.bmBits; ok(val == 0x682a2a2a, "got %x, expected 0x682a2a2a\n", val); + val = *((DWORD*)bm.bmBits + (bm.bmHeight-1) * bm.bmWidthBytes/4 + 1); + ok(val == 0x0, "got %x, expected 0x682a2a2a\n", val); } hdc = CreateCompatibleDC(NULL); oldhbitmap = SelectObject(hdc, hbitmap); pixel = GetPixel(hdc, 5, 5); + expect(0x2a2a2a, pixel); + pixel = GetPixel(hdc, 1, 0); + expect(0x0, pixel); + SelectObject(hdc, oldhbitmap); DeleteDC(hdc); - expect(0x2a2a2a, pixel); - + + DeleteObject(hbitmap); + } + + /* create HBITMAP with bkgnd colour */ + stat = GdipCreateHBITMAPFromBitmap(bitmap, &hbitmap, 0xff00ff); + expect(Ok, stat); + + if (stat == Ok) + { + ret = GetObjectA(hbitmap, sizeof(BITMAP), &bm); + expect(sizeof(BITMAP), ret); + + expect(0, bm.bmType); + expect(8, bm.bmWidth); + expect(20, bm.bmHeight); + expect(32, bm.bmWidthBytes); + expect(1, bm.bmPlanes); + expect(32, bm.bmBitsPixel); + ok(bm.bmBits != NULL, "got DDB, expected DIB\n"); + + if (bm.bmBits) + { + DWORD val = *(DWORD*)bm.bmBits; + ok(val == 0x68c12ac1, "got %x, expected 0x682a2a2a\n", val); + val = *((DWORD*)bm.bmBits + (bm.bmHeight-1) * bm.bmWidthBytes/4 + 1); + ok(val == 0xff00ff, "got %x, expected 0x682a2a2a\n", val); + } + + hdc = CreateCompatibleDC(NULL); + + oldhbitmap = SelectObject(hdc, hbitmap); + pixel = GetPixel(hdc, 5, 5); + expect(0xc12ac1, pixel); + pixel = GetPixel(hdc, 1, 0); + expect(0xff00ff, pixel); + pixel = GetPixel(hdc, 2, 0); + expect(0xb12ac1, pixel); + + SelectObject(hdc, oldhbitmap); + DeleteDC(hdc); + DeleteObject(hbitmap); + } + + /* create HBITMAP with bkgnd colour with alpha and show it behaves with no alpha. */ + stat = GdipCreateHBITMAPFromBitmap(bitmap, &hbitmap, 0x80ff00ff); + expect(Ok, stat); + + if (stat == Ok) + { + ret = GetObjectA(hbitmap, sizeof(BITMAP), &bm); + expect(sizeof(BITMAP), ret); + + expect(0, bm.bmType); + expect(8, bm.bmWidth); + expect(20, bm.bmHeight); + expect(32, bm.bmWidthBytes); + expect(1, bm.bmPlanes); + expect(32, bm.bmBitsPixel); + ok(bm.bmBits != NULL, "got DDB, expected DIB\n"); + + if (bm.bmBits) + { + DWORD val = *(DWORD*)bm.bmBits; + ok(val == 0x68c12ac1, "got %x, expected 0x682a2a2a\n", val); + val = *((DWORD*)bm.bmBits + (bm.bmHeight-1) * bm.bmWidthBytes/4 + 1); + ok(val == 0xff00ff, "got %x, expected 0x682a2a2a\n", val); + } + + hdc = CreateCompatibleDC(NULL); + + oldhbitmap = SelectObject(hdc, hbitmap); + pixel = GetPixel(hdc, 5, 5); + expect(0xc12ac1, pixel); + pixel = GetPixel(hdc, 1, 0); + expect(0xff00ff, pixel); + pixel = GetPixel(hdc, 2, 0); + expect(0xb12ac1, pixel); + + SelectObject(hdc, oldhbitmap); + DeleteDC(hdc); DeleteObject(hbitmap); } Modified: trunk/rostests/winetests/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/region.… ============================================================================== --- trunk/rostests/winetests/gdiplus/region.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/region.c [iso-8859-1] Wed Mar 25 11:51:58 2015 @@ -107,6 +107,56 @@ rgn.data.rdh.rcBound.left, rgn.data.rdh.rcBound.top, rgn.data.rdh.rcBound.right, rgn.data.rdh.rcBound.bottom); } +static void test_region_data(DWORD *data, UINT size, INT line) +{ + GpStatus status; + GpRegion *region; + DWORD buf[256]; + UINT needed, i; + + status = GdipCreateRegionRgnData((BYTE *)data, size, &region); + /* Windows always fails to create an empty path in a region */ + if (data[4] == RGNDATA_PATH) + { + struct _path_header + { + DWORD size; + DWORD magic; + DWORD count; + DWORD flags; + } *path_header = (struct _path_header *)(data + 5); + if (!path_header->count) + { + ok_(__FILE__, line)(status == GenericError, "expected GenericError, got %d\n", status); + return; + } + } + + ok_(__FILE__, line)(status == Ok, "GdipCreateRegionRgnData error %d\n", status); + if (status != Ok) return; + + needed = 0; + status = GdipGetRegionDataSize(region, &needed); + ok_(__FILE__, line)(status == Ok, "status %d\n", status); + ok_(__FILE__, line)(needed == size, "data size mismatch: %u != %u\n", needed, size); + + memset(buf, 0xee, sizeof(buf)); + needed = 0; + status = GdipGetRegionData(region, (BYTE *)buf, sizeof(buf), &needed); + ok_(__FILE__, line)(status == Ok, "status %08x\n", status); + ok_(__FILE__, line)(needed == size, "data size mismatch: %u != %u\n", needed, size); + + size /= sizeof(DWORD); + for (i = 0; i < size - 1; i++) + { + if (i == 1) continue; /* data[1] never matches */ + ok_(__FILE__, line)(data[i] == buf[i], "off %u: %#x != %#x\n", i, data[i], buf[i]); + } + /* some Windows versions fail to properly clear the aligned DWORD */ + ok_(__FILE__, line)(data[size - 1] == buf[size - 1] || broken(data[size - 1] != buf[size - 1]), + "off %u: %#x != %#x\n", size - 1, data[size - 1], buf[size - 1]); +} + static void test_getregiondata(void) { GpStatus status; @@ -148,6 +198,7 @@ expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_INFINITE_RECT); expect_dword(buf + 6, 0xeeeeeeee); + test_region_data(buf, needed, __LINE__); status = GdipSetEmpty(region); ok(status == Ok, "status %08x\n", status); @@ -165,6 +216,7 @@ expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_EMPTY_RECT); expect_dword(buf + 6, 0xeeeeeeee); + test_region_data(buf, needed, __LINE__); status = GdipSetInfinite(region); ok(status == Ok, "status %08x\n", status); @@ -182,6 +234,7 @@ expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_INFINITE_RECT); expect_dword(buf + 6, 0xeeeeeeee); + test_region_data(buf, needed, __LINE__); status = GdipDeleteRegion(region); ok(status == Ok, "status %08x\n", status); @@ -210,6 +263,7 @@ expect_float(buf + 7, 100.0); expect_float(buf + 8, 200.0); expect_dword(buf + 10, 0xeeeeeeee); + test_region_data(buf, needed, __LINE__); rect.X = 50; rect.Y = 30; @@ -295,6 +349,7 @@ expect_float(buf + 37, 22.0); expect_float(buf + 38, 55.0); expect_dword(buf + 39, 0xeeeeeeee); + test_region_data(buf, needed, __LINE__); status = GdipDeleteRegion(region2); ok(status == Ok, "status %08x\n", status); @@ -336,6 +391,7 @@ expect_float(buf + 16, 28.0); expect_dword(buf + 17, 0x81010100); expect_dword(buf + 18, 0xeeeeeeee); + test_region_data(buf, needed, __LINE__); rect.X = 50; rect.Y = 30; @@ -376,6 +432,7 @@ expect_float(buf + 22, 10.0); expect_float(buf + 23, 20.0); expect_dword(buf + 24, 0xeeeeeeee); + test_region_data(buf, needed, __LINE__); status = GdipDeleteRegion(region); ok(status == Ok, "status %08x\n", status); @@ -408,6 +465,7 @@ ok(*(buf + 8) == 0x4000 /* before win7 */ || *(buf + 8) == 0, "expected 0x4000 or 0, got %08x\n", *(buf + 8)); expect_dword(buf + 10, 0xeeeeeeee); + test_region_data(buf, needed, __LINE__); /* Transform an empty region */ status = GdipCreateMatrix(&matrix); @@ -458,6 +516,7 @@ expect(6, point[3].Y); expect_dword(buf + 13, 0x81010100); /* 0x01010100 if we don't close the path */ expect_dword(buf + 14, 0xeeeeeeee); + test_region_data(buf, needed, __LINE__); status = GdipTranslateRegion(region, 0.6, 0.8); expect(Ok, status); @@ -485,6 +544,7 @@ expect_float(buf + 16, 6.8); expect_dword(buf + 17, 0x81010100); /* 0x01010100 if we don't close the path */ expect_dword(buf + 18, 0xeeeeeeee); + test_region_data(buf, needed, __LINE__); status = GdipDeletePath(path); expect(Ok, status); @@ -527,6 +587,7 @@ expect_float(buf + 16, 6.2); expect_dword(buf + 17, 0x01010100); expect_dword(buf + 18, 0xeeeeeeee); + test_region_data(buf, needed, __LINE__); status = GdipDeletePath(path); expect(Ok, status); @@ -589,6 +650,7 @@ ok(*(buf + 28) == 0x00000101 || *(buf + 28) == 0x43050101 /* Win 7 */, "expected 00000101 or 43050101 got %08x\n", *(buf + 28)); expect_dword(buf + 29, 0xeeeeeeee); + test_region_data(buf, needed, __LINE__); status = GdipDeletePath(path); expect(Ok, status); @@ -632,6 +694,7 @@ expect(23, point[3].Y); expect_dword(buf + 13, 0x81010100); /* 0x01010100 if we don't close the path */ expect_dword(buf + 14, 0xeeeeeeee); + test_region_data(buf, needed, __LINE__); status = GdipDeletePath(path); expect(Ok, status); @@ -674,6 +737,7 @@ expect_float(buf + 16, 2300.0); expect_dword(buf + 17, 0x81010100); /* 0x01010100 if we don't close the path */ expect_dword(buf + 18, 0xeeeeeeee); + test_region_data(buf, needed, __LINE__); status = GdipDeletePath(path); expect(Ok, status); @@ -737,6 +801,7 @@ *(buf + 33) == 0x43030303 /* 32-bit win7 */ || *(buf + 33) == 0x4c030303 /* 64-bit win7 */, "expected 0x00030303 or 0x43030303 or 0x4c030303 got %08x\n", *(buf + 33)); expect_dword(buf + 34, 0xeeeeeeee); + test_region_data(buf, needed, __LINE__); status = GdipDeletePath(path); expect(Ok, status);

10 years, 1 month

[hbelusca] 66868: Fix build.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Mar 25 00:09:09 2015 New Revision: 66868 URL: http://svn.reactos.org/svn/reactos?rev=66868&view=rev Log: Fix build. Modified: trunk/reactos/win32ss/user/winsrv/CMakeLists.txt Modified: trunk/reactos/win32ss/user/winsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/CMakeL… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/CMakeLists.txt [iso-8859-1] Wed Mar 25 00:09:09 2015 @@ -1,3 +1,6 @@ + +# Console Configuration library +add_subdirectory(concfg) include_directories( ${REACTOS_SOURCE_DIR}/include/reactos/subsys @@ -24,9 +27,9 @@ # Add the components target_link_libraries(winsrv consrv usersrv) # Add win32ksys because of NtUser...() -target_link_libraries(winsrv win32ksys libcntpr ${PSEH_LIB} ${CONSRV_TARGET_LINK_LIBS}) +target_link_libraries(winsrv ${CONSRV_TARGET_LINK_LIBS} win32ksys libcntpr ${PSEH_LIB}) -add_delay_importlibs(winsrv advapi32 ${CONSRV_DELAY_IMPORT_LIBS}) -add_importlibs(winsrv csrsrv gdi32 user32 kernel32 ntdll ${CONSRV_IMPORT_LIBS} ${USERSRV_IMPORT_LIBS}) +add_delay_importlibs(winsrv ${CONSRV_DELAY_IMPORT_LIBS} advapi32) +add_importlibs(winsrv ${CONSRV_IMPORT_LIBS} ${USERSRV_IMPORT_LIBS} csrsrv gdi32 user32 kernel32 ntdll) add_dependencies(winsrv bugcodes) add_cd_file(TARGET winsrv DESTINATION reactos/system32 FOR all)

10 years, 1 month

[hbelusca] 66867: [CONSRV] - Introduce a "console configuration" library that is used by both CONSRV and the console properties applet so that they can share common code concerning getting/setting ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Mar 24 23:58:44 2015 New Revision: 66867 URL: http://svn.reactos.org/svn/reactos?rev=66867&view=rev Log: [CONSRV] - Introduce a "console configuration" library that is used by both CONSRV and the console properties applet so that they can share common code concerning getting/setting console registry properties. - Make use of the Windows-compatible (and undocumented) CONSOLE_STATE_INFO structure for that purpose (as well as the WM_SETCONSOLEINFO): see commits r63819 and r58415 and links within for more details. Note: this structure needs to be 4-byte packed (contrary to what it is said in almost all the links from above. The difference is only visible at the level of the last member that is the ConsoleTitle string array. This was tested on windows). - Simplify some parts of console settings initialization. - Some work is still needed concerning how to correctly retrieve the default console settings (without touching the ConsoleTitle member of CONSOLE_STATE_INFO, contrary to what we do currently). [CONSOLE.DLL] - Make the console properties applet windows-compatible, in the sense that you can now run it on win2k3 and use it instead of the windows one. This implies having the same strange hacks as windows' one, namely, that the window handle parameter of the CPlApplet entry point is either used as the caller (parent) window handle, OR, as a shared section handle to shared data with CONSRV. [KERNEL32] - Rework the console applet initialization accordingly. Also we reload each time the console.dll when opening the console applet, and then unload it: this "allows" to reset all the global variables that console.dll may (and does) have. Added: trunk/reactos/win32ss/user/winsrv/concfg/ trunk/reactos/win32ss/user/winsrv/concfg/CMakeLists.txt (with props) trunk/reactos/win32ss/user/winsrv/concfg/settings.c - copied, changed from r66665, trunk/reactos/win32ss/user/winsrv/consrv/settings.c trunk/reactos/win32ss/user/winsrv/concfg/settings.h - copied, changed from r66665, trunk/reactos/win32ss/user/winsrv/consrv/include/settings.h Removed: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/consolecpl.h Modified: trunk/reactos/dll/cpl/console/CMakeLists.txt trunk/reactos/dll/cpl/console/colors.c trunk/reactos/dll/cpl/console/console.c trunk/reactos/dll/cpl/console/console.h trunk/reactos/dll/cpl/console/font.c trunk/reactos/dll/cpl/console/lang/fr-FR.rc trunk/reactos/dll/cpl/console/layout.c trunk/reactos/dll/cpl/console/options.c trunk/reactos/dll/win32/kernel32/client/console/init.c trunk/reactos/win32ss/user/winsrv/consrv.cmake trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/terminal.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h trunk/reactos/win32ss/user/winsrv/consrv/include/conio_winsrv.h trunk/reactos/win32ss/user/winsrv/consrv/include/console.h trunk/reactos/win32ss/user/winsrv/consrv/include/settings.h trunk/reactos/win32ss/user/winsrv/consrv/settings.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/console/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/CMakeLists… Modified: trunk/reactos/dll/cpl/console/colors.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/colors.c?r… Modified: trunk/reactos/dll/cpl/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/console.c?… Modified: trunk/reactos/dll/cpl/console/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/console.h?… Modified: trunk/reactos/dll/cpl/console/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/font.c?rev… Modified: trunk/reactos/dll/cpl/console/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/fr-FR… Modified: trunk/reactos/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/layout.c?r… Modified: trunk/reactos/dll/cpl/console/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/options.c?… Modified: trunk/reactos/dll/win32/kernel32/client/console/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Added: trunk/reactos/win32ss/user/winsrv/concfg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/concfg… Copied: trunk/reactos/win32ss/user/winsrv/concfg/settings.c (from r66665, trunk/reactos/win32ss/user/winsrv/consrv/settings.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/concfg… Copied: trunk/reactos/win32ss/user/winsrv/concfg/settings.h (from r66665, trunk/reactos/win32ss/user/winsrv/consrv/include/settings.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/concfg… Modified: trunk/reactos/win32ss/user/winsrv/consrv.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Removed: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/consolecpl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/terminal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/conio_winsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/settings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…

10 years, 1 month

[hbelusca] 66866: [NTOS]: Don't hardcode the size of the ShutDownWaitEntry and use the correct pool tags when freeing the entry.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Mar 24 00:19:43 2015 New Revision: 66866 URL: http://svn.reactos.org/svn/reactos?rev=66866&view=rev Log: [NTOS]: Don't hardcode the size of the ShutDownWaitEntry and use the correct pool tags when freeing the entry. Modified: trunk/reactos/ntoskrnl/po/poshtdwn.c Modified: trunk/reactos/ntoskrnl/po/poshtdwn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/poshtdwn.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/po/poshtdwn.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/poshtdwn.c [iso-8859-1] Tue Mar 24 00:19:43 2015 @@ -57,7 +57,7 @@ PAGED_CODE(); /* Allocate a new shutdown wait entry */ - ShutDownWaitEntry = ExAllocatePoolWithTag(PagedPool, 8u, 'LSoP'); + ShutDownWaitEntry = ExAllocatePoolWithTag(PagedPool, sizeof(*ShutDownWaitEntry), 'LSoP'); if (ShutDownWaitEntry == NULL) { return STATUS_NO_MEMORY; @@ -84,7 +84,7 @@ { /* We cannot proceed, cleanup and return failure */ ObDereferenceObject(Thread); - ExFreePoolWithTag(ShutDownWaitEntry, 0); + ExFreePoolWithTag(ShutDownWaitEntry, 'LSoP'); Status = STATUS_UNSUCCESSFUL; } @@ -138,7 +138,7 @@ ObfDereferenceObject(ShutDownWaitEntry->Thread); /* Finally free the entry */ - ExFreePoolWithTag(ShutDownWaitEntry, 0); + ExFreePoolWithTag(ShutDownWaitEntry, 'LSoP'); } }

10 years, 1 month

[ekohl] 66865: [NETAPI32] Implement NetWkstaTransportAdd, NetWkstaTransportDel and NetWkstaTransportEnum.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Mar 23 21:47:50 2015 New Revision: 66865 URL: http://svn.reactos.org/svn/reactos?rev=66865&view=rev Log: [NETAPI32] Implement NetWkstaTransportAdd, NetWkstaTransportDel and NetWkstaTransportEnum. Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec trunk/reactos/dll/win32/netapi32/wksta.c trunk/reactos/dll/win32/netapi32/wksta_new.c Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] Mon Mar 23 21:47:50 2015 @@ -255,8 +255,8 @@ @ stub NetValidatePasswordPolicyFree @ stdcall NetWkstaGetInfo(wstr long ptr) @ stdcall NetWkstaSetInfo(wstr long ptr ptr) -@ stub NetWkstaTransportAdd -@ stub NetWkstaTransportDel +@ stdcall NetWkstaTransportAdd(wstr long ptr ptr) +@ stdcall NetWkstaTransportDel(wstr wstr long) @ stdcall NetWkstaTransportEnum(wstr long ptr long ptr ptr ptr) @ stdcall NetWkstaUserEnum(wstr long ptr long ptr ptr ptr) @ stdcall NetWkstaUserGetInfo(wstr long ptr) Modified: trunk/reactos/dll/win32/netapi32/wksta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/wksta.c… ============================================================================== --- trunk/reactos/dll/win32/netapi32/wksta.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/wksta.c [iso-8859-1] Mon Mar 23 21:47:50 2015 @@ -43,6 +43,7 @@ return ret && !strcmpiW( name, buf ); } +#if 0 static void wprint_mac(WCHAR* buffer, int len, const MIB_IFROW *ifRow) { int i; @@ -72,6 +73,7 @@ } buffer[2*i]=0; } +#endif /* Theoretically this could be too short, except that MS defines * MAX_ADAPTER_NAME as 128, and MAX_INTERFACE_NAME_LEN as 256, and both @@ -84,6 +86,7 @@ #define NBT_TRANSPORT_NAME_HEADER "\\Device\\NetBT_Tcpip_" #define UNKNOWN_TRANSPORT_NAME_HEADER "\\Device\\UnknownTransport_" +#if 0 static void wprint_name(WCHAR *buffer, int len, ULONG transport, PMIB_IFROW ifRow) { @@ -109,6 +112,7 @@ *ptr1 = *ptr2; *ptr1 = '\0'; } +#endif /*********************************************************************** * NetWkstaTransportEnum (NETAPI32.@) @@ -125,6 +129,7 @@ /**********************************************************************/ +#if 0 static BOOL WkstaEnumAdaptersCallback(UCHAR totalLANAs, UCHAR lanaIndex, ULONG transport, const NetBIOSAdapterImpl *data, void *closure) { @@ -214,9 +219,11 @@ ret = FALSE; return ret; } +#endif /**********************************************************************/ +#if 0 NET_API_STATUS WINAPI NetWkstaTransportEnum(LMSTR ServerName, DWORD level, PBYTE* pbuf, DWORD prefmaxlen, LPDWORD read_entries, @@ -271,6 +278,7 @@ } return ret; } +#endif /************************************************************ Modified: trunk/reactos/dll/win32/netapi32/wksta_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/wksta_n… ============================================================================== --- trunk/reactos/dll/win32/netapi32/wksta_new.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/wksta_new.c [iso-8859-1] Mon Mar 23 21:47:50 2015 @@ -404,8 +404,125 @@ NET_API_STATUS WINAPI +NetWkstaTransportAdd( + LPWSTR servername, + DWORD level, + LPBYTE buf, + LPDWORD parm_err) +{ + NET_API_STATUS status; + + TRACE("NetWkstaTransportAdd(%s, %d, %p, %p)\n", debugstr_w(servername), + level, buf, parm_err); + + RpcTryExcept + { + status = NetrWkstaTransportAdd(servername, + level, + (LPWKSTA_TRANSPORT_INFO_0)buf, + parm_err); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + + +NET_API_STATUS +WINAPI +NetWkstaTransportDel( + LPWSTR servername, + LPWSTR transportname, + DWORD ucond) +{ + NET_API_STATUS status; + + TRACE("NetWkstaTransportDel(%s, %s, %d)\n", debugstr_w(servername), + debugstr_w(transportname), ucond); + + RpcTryExcept + { + status = NetrWkstaTransportDel(servername, + transportname, + ucond); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + + +NET_API_STATUS +WINAPI +NetWkstaTransportEnum( + LPWSTR servername, + DWORD level, + LPBYTE *bufptr, + DWORD prefmaxlen, + LPDWORD entriesread, + LPDWORD totalentries, + LPDWORD resumehandle) +{ + WKSTA_TRANSPORT_ENUM_STRUCT TransportEnumInfo; + WKSTA_TRANSPORT_INFO_0_CONTAINER Container0; + NET_API_STATUS status; + + TRACE("NetWkstaTransportEnum(%s, %d, %p, %d, %p, %p, %p)\n", debugstr_w(servername), + level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle); + + TransportEnumInfo.Level = level; + switch (level) + { + case 0: + TransportEnumInfo.WkstaTransportInfo.Level0 = &Container0; + Container0.EntriesRead = 0; + Container0.Buffer = NULL; + break; + + default: + return ERROR_INVALID_PARAMETER; + } + + RpcTryExcept + { + status = NetrWkstaTransportEnum(servername, + &TransportEnumInfo, + prefmaxlen, + totalentries, + resumehandle); + if (status == NERR_Success || status == ERROR_MORE_DATA) + { + switch (level) + { + case 0: + *bufptr = (LPBYTE)TransportEnumInfo.WkstaTransportInfo.Level0->Buffer; + *entriesread = TransportEnumInfo.WkstaTransportInfo.Level0->EntriesRead; + break; + } + } + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + + +NET_API_STATUS +WINAPI NetWkstaUserEnum( - LMSTR servername, + LPWSTR servername, DWORD level, LPBYTE *bufptr, DWORD prefmaxlen,

10 years, 1 month

[khornicek] 66864: [GDI32] - export GdiGetBitmapBitsSize

by khornicek＠svn.reactos.org

Author: khornicek Date: Mon Mar 23 13:25:16 2015 New Revision: 66864 URL: http://svn.reactos.org/svn/reactos?rev=66864&view=rev Log: [GDI32] - export GdiGetBitmapBitsSize Modified: trunk/reactos/win32ss/gdi/gdi32/gdi32.spec Modified: trunk/reactos/win32ss/gdi/gdi32/gdi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/gdi32.sp… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/gdi32.spec [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/gdi32.spec [iso-8859-1] Mon Mar 23 13:25:16 2015 @@ -283,6 +283,7 @@ @ stdcall GdiFixUpHandle(ptr) @ stdcall GdiFlush() @ stdcall GdiFullscreenControl(ptr ptr long ptr ptr) NtGdiFullscreenControl +@ stdcall GdiGetBitmapBitsSize(ptr) @ stdcall GdiGetBatchLimit() @ stdcall GdiGetCharDimensions(long ptr ptr) @ stdcall GdiGetCodePage(long)

10 years, 1 month

[gadamopoulos] 66863: [WINLOGON] - Create the window station handle and the desktops with MAXIMUM_ALLOWED access rights. - Call AddAceToWindowStation before calling SetWindowStationUser.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Mar 23 07:46:17 2015 New Revision: 66863 URL: http://svn.reactos.org/svn/reactos?rev=66863&view=rev Log: [WINLOGON] - Create the window station handle and the desktops with MAXIMUM_ALLOWED access rights. - Call AddAceToWindowStation before calling SetWindowStationUser. Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/wlx.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Mon Mar 23 07:46:17 2015 @@ -1007,6 +1007,11 @@ DWORD WINAPI SetWindowStationUser(HWINSTA hWinSta, LUID* pluid, PSID psid, DWORD sidSize); +BOOL +AddAceToWindowStation( + IN HWINSTA WinSta, + IN PSID Sid); + static BOOL AllowWinstaAccess(PWLSESSION Session) { @@ -1068,6 +1073,8 @@ WARN("Couldn't get Authentication id from user token!\n"); goto Cleanup; } + + AddAceToWindowStation(Session->InteractiveWindowStation, psid); ret = SetWindowStationUser(Session->InteractiveWindowStation, &Stats.AuthenticationId, Modified: trunk/reactos/base/system/winlogon/wlx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/wlx.c… ============================================================================== --- trunk/reactos/base/system/winlogon/wlx.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/wlx.c [iso-8859-1] Mon Mar 23 07:46:17 2015 @@ -1235,7 +1235,7 @@ Session->InteractiveWindowStation = CreateWindowStationW( Session->InteractiveWindowStationName, 0, - GENERIC_ALL, + MAXIMUM_ALLOWED, &DefaultSecurity); if (!Session->InteractiveWindowStation) { @@ -1256,7 +1256,7 @@ NULL, NULL, 0, /* FIXME: Add DF_ALLOWOTHERACCOUNTHOOK flag? */ - GENERIC_ALL, + MAXIMUM_ALLOWED, &UserDesktopSecurity); if (!Session->ApplicationDesktop) { @@ -1272,7 +1272,7 @@ NULL, NULL, 0, - GENERIC_ALL, + MAXIMUM_ALLOWED, &DefaultSecurity); if (!Session->WinlogonDesktop) { @@ -1288,7 +1288,7 @@ NULL, NULL, 0, - GENERIC_ALL, + MAXIMUM_ALLOWED, &DefaultSecurity); if(!Session->ScreenSaverDesktop) {

10 years, 1 month

[ekohl] 66862: [SCHEDSVC] Start work on the seceduler service. [NETAPI32] Implement the scheduler service client functions.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Mar 22 21:57:55 2015 New Revision: 66862 URL: http://svn.reactos.org/svn/reactos?rev=66862&view=rev Log: [SCHEDSVC] Start work on the seceduler service. [NETAPI32] Implement the scheduler service client functions. Added: trunk/reactos/base/services/schedsvc/ (with props) trunk/reactos/base/services/schedsvc/CMakeLists.txt (with props) trunk/reactos/base/services/schedsvc/precomp.h (with props) trunk/reactos/base/services/schedsvc/rpcserver.c (with props) trunk/reactos/base/services/schedsvc/schedsvc.c (with props) trunk/reactos/base/services/schedsvc/schedsvc.rc (with props) trunk/reactos/base/services/schedsvc/schedsvc.spec (with props) trunk/reactos/dll/win32/netapi32/schedule.c (with props) trunk/reactos/include/reactos/idl/atsvc.acf (with props) trunk/reactos/include/reactos/idl/atsvc.idl (with props) Modified: trunk/reactos/base/services/CMakeLists.txt trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/dll/win32/netapi32/CMakeLists.txt trunk/reactos/dll/win32/netapi32/netapi32.c trunk/reactos/dll/win32/netapi32/netapi32.spec Modified: trunk/reactos/base/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/CMakeLists.t… ============================================================================== --- trunk/reactos/base/services/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/CMakeLists.txt [iso-8859-1] Sun Mar 22 21:57:55 2015 @@ -2,6 +2,7 @@ add_subdirectory(audiosrv) add_subdirectory(eventlog) add_subdirectory(rpcss) +add_subdirectory(schedsvc) add_subdirectory(spoolsv) add_subdirectory(svchost) add_subdirectory(tcpsvcs) Propchange: trunk/reactos/base/services/schedsvc/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Mar 22 21:57:55 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/base/services/schedsvc/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/base/services/schedsvc/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/base/services/schedsvc/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/services/schedsvc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/schedsvc/CMa… ============================================================================== --- trunk/reactos/base/services/schedsvc/CMakeLists.txt (added) +++ trunk/reactos/base/services/schedsvc/CMakeLists.txt [iso-8859-1] Sun Mar 22 21:57:55 2015 @@ -0,0 +1,16 @@ + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl) +add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/atsvc.idl) +spec2def(schedsvc.dll schedsvc.spec ADD_IMPORTLIB) + +add_library(schedsvc SHARED + rpcserver.c + schedsvc.c + schedsvc.rc + ${CMAKE_CURRENT_BINARY_DIR}/atsvc_s.c + ${CMAKE_CURRENT_BINARY_DIR}/schedsvc.def) + +set_module_type(schedsvc win32dll UNICODE) +target_link_libraries(schedsvc wine) +add_importlibs(schedsvc advapi32 rpcrt4 msvcrt kernel32 ntdll) +add_cd_file(TARGET schedsvc DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/base/services/schedsvc/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/schedsvc/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/schedsvc/pre… ============================================================================== --- trunk/reactos/base/services/schedsvc/precomp.h (added) +++ trunk/reactos/base/services/schedsvc/precomp.h [iso-8859-1] Sun Mar 22 21:57:55 2015 @@ -0,0 +1,22 @@ +#ifndef _SCHEDSVC_PCH_ +#define _SCHEDSVC_PCH_ + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <winsvc.h> + +#include <atsvc_s.h> + +#include <wine/debug.h> + +DWORD +WINAPI +RpcThreadRoutine( + LPVOID lpParameter); + +#endif /* _SCHEDSVC_PCH_ */ Propchange: trunk/reactos/base/services/schedsvc/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/schedsvc/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/schedsvc/rpc… ============================================================================== --- trunk/reactos/base/services/schedsvc/rpcserver.c (added) +++ trunk/reactos/base/services/schedsvc/rpcserver.c [iso-8859-1] Sun Mar 22 21:57:55 2015 @@ -0,0 +1,129 @@ +/* + * ReactOS Services + * Copyright (C) 2015 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Services + * FILE: base/services/schedsvc/rpcserver.c + * PURPOSE: Scheduler service + * PROGRAMMER: Eric Kohl + */ + +/* INCLUDES *****************************************************************/ + +#include "precomp.h" + +#include "lmerr.h" + +WINE_DEFAULT_DEBUG_CHANNEL(schedsvc); + +/* FUNCTIONS *****************************************************************/ + +DWORD +WINAPI +RpcThreadRoutine( + LPVOID lpParameter) +{ + RPC_STATUS Status; + + Status = RpcServerUseProtseqEpW(L"ncacn_np", 20, L"\\pipe\\atsvc", NULL); + if (Status != RPC_S_OK) + { + ERR("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); + return 0; + } + + Status = RpcServerRegisterIf(atsvc_v1_0_s_ifspec, NULL, NULL); + if (Status != RPC_S_OK) + { + ERR("RpcServerRegisterIf() failed (Status %lx)\n", Status); + return 0; + } + + Status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, FALSE); + if (Status != RPC_S_OK) + { + ERR("RpcServerListen() failed (Status %lx)\n", Status); + } + + return 0; +} + + +void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + + +void __RPC_USER midl_user_free(void __RPC_FAR * ptr) +{ + HeapFree(GetProcessHeap(), 0, ptr); +} + + +/* Function 0 */ +NET_API_STATUS +WINAPI +NetrJobAdd( + ATSVC_HANDLE ServerName, + LPAT_INFO pAtInfo, + LPDWORD pJobId) +{ + return ERROR_SUCCESS; +} + + +/* Function 1 */ +NET_API_STATUS +WINAPI +NetrJobDel( + ATSVC_HANDLE ServerName, + DWORD MinJobId, + DWORD MaxJobId) +{ + return ERROR_SUCCESS; +} + + +/* Function 2 */ +NET_API_STATUS +__stdcall +NetrJobEnum( + ATSVC_HANDLE ServerName, + LPAT_ENUM_CONTAINER pEnumContainer, + DWORD PreferedMaximumLength, + LPDWORD pTotalEntries, + LPDWORD pResumeHandle) +{ + return ERROR_SUCCESS; +} + + +/* Function 3 */ +NET_API_STATUS +WINAPI +NetrJobGetInfo( + ATSVC_HANDLE ServerName, + DWORD JobId, + LPAT_INFO *ppAtInfo) +{ + return ERROR_SUCCESS; +} + +/* EOF */ Propchange: trunk/reactos/base/services/schedsvc/rpcserver.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/schedsvc/schedsvc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/schedsvc/sch… ============================================================================== --- trunk/reactos/base/services/schedsvc/schedsvc.c (added) +++ trunk/reactos/base/services/schedsvc/schedsvc.c [iso-8859-1] Sun Mar 22 21:57:55 2015 @@ -0,0 +1,183 @@ +/* + * ReactOS Services + * Copyright (C) 2015 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Services + * FILE: base/services/schedsvc/schedsvc.c + * PURPOSE: Scheduling service + * PROGRAMMER: Eric Kohl + */ + +/* INCLUDES *****************************************************************/ + +#include "precomp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(schedsvc); + +/* GLOBALS ******************************************************************/ + +static WCHAR ServiceName[] = L"Schedule"; + +static SERVICE_STATUS_HANDLE ServiceStatusHandle; +static SERVICE_STATUS ServiceStatus; + +/* FUNCTIONS *****************************************************************/ + +static VOID +UpdateServiceStatus(DWORD dwState) +{ + ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + ServiceStatus.dwCurrentState = dwState; + ServiceStatus.dwControlsAccepted = 0; + ServiceStatus.dwWin32ExitCode = 0; + ServiceStatus.dwServiceSpecificExitCode = 0; + ServiceStatus.dwCheckPoint = 0; + + if (dwState == SERVICE_START_PENDING || + dwState == SERVICE_STOP_PENDING || + dwState == SERVICE_PAUSE_PENDING || + dwState == SERVICE_CONTINUE_PENDING) + ServiceStatus.dwWaitHint = 10000; + else + ServiceStatus.dwWaitHint = 0; + + SetServiceStatus(ServiceStatusHandle, + &ServiceStatus); +} + +static DWORD WINAPI +ServiceControlHandler(DWORD dwControl, + DWORD dwEventType, + LPVOID lpEventData, + LPVOID lpContext) +{ + TRACE("ServiceControlHandler() called\n"); + + switch (dwControl) + { + case SERVICE_CONTROL_STOP: + TRACE(" SERVICE_CONTROL_STOP received\n"); + /* Stop listening to incoming RPC messages */ + RpcMgmtStopServerListening(NULL); + UpdateServiceStatus(SERVICE_STOPPED); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_PAUSE: + TRACE(" SERVICE_CONTROL_PAUSE received\n"); + UpdateServiceStatus(SERVICE_PAUSED); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_CONTINUE: + TRACE(" SERVICE_CONTROL_CONTINUE received\n"); + UpdateServiceStatus(SERVICE_RUNNING); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_INTERROGATE: + TRACE(" SERVICE_CONTROL_INTERROGATE received\n"); + SetServiceStatus(ServiceStatusHandle, + &ServiceStatus); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_SHUTDOWN: + TRACE(" SERVICE_CONTROL_SHUTDOWN received\n"); + UpdateServiceStatus(SERVICE_STOPPED); + return ERROR_SUCCESS; + + default : + TRACE(" Control %lu received\n", dwControl); + return ERROR_CALL_NOT_IMPLEMENTED; + } +} + + +static +DWORD +ServiceInit(VOID) +{ + HANDLE hThread; + + hThread = CreateThread(NULL, + 0, + (LPTHREAD_START_ROUTINE)RpcThreadRoutine, + NULL, + 0, + NULL); + + if (!hThread) + { + ERR("Can't create PortThread\n"); + return GetLastError(); + } + else + CloseHandle(hThread); + + return ERROR_SUCCESS; +} + + +VOID WINAPI +SchedServiceMain(DWORD argc, LPTSTR *argv) +{ + DWORD dwError; + + UNREFERENCED_PARAMETER(argc); + UNREFERENCED_PARAMETER(argv); + + TRACE("SchedServiceMain() called\n"); + + ServiceStatusHandle = RegisterServiceCtrlHandlerExW(ServiceName, + ServiceControlHandler, + NULL); + if (!ServiceStatusHandle) + { + ERR("RegisterServiceCtrlHandlerExW() failed! (Error %lu)\n", GetLastError()); + return; + } + + UpdateServiceStatus(SERVICE_START_PENDING); + + dwError = ServiceInit(); + if (dwError != ERROR_SUCCESS) + { + ERR("Service stopped (dwError: %lu\n", dwError); + UpdateServiceStatus(SERVICE_STOPPED); + return; + } + + UpdateServiceStatus(SERVICE_RUNNING); +} + + +BOOL WINAPI +DllMain(HINSTANCE hinstDLL, + DWORD fdwReason, + LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} Propchange: trunk/reactos/base/services/schedsvc/schedsvc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/schedsvc/schedsvc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/schedsvc/sch… ============================================================================== --- trunk/reactos/base/services/schedsvc/schedsvc.rc (added) +++ trunk/reactos/base/services/schedsvc/schedsvc.rc [iso-8859-1] Sun Mar 22 21:57:55 2015 @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Scheduler Service" +#define REACTOS_STR_INTERNAL_NAME "schedsvc" +#define REACTOS_STR_ORIGINAL_FILENAME "schedsvc.dll" +#include <reactos/version.rc> Propchange: trunk/reactos/base/services/schedsvc/schedsvc.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/schedsvc/schedsvc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/schedsvc/sch… ============================================================================== --- trunk/reactos/base/services/schedsvc/schedsvc.spec (added) +++ trunk/reactos/base/services/schedsvc/schedsvc.spec [iso-8859-1] Sun Mar 22 21:57:55 2015 @@ -0,0 +1 @@ +@ stdcall SchedServiceMain(long ptr) Propchange: trunk/reactos/base/services/schedsvc/schedsvc.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Sun Mar 22 21:57:55 2015 @@ -1609,7 +1609,7 @@ ; SvcHost services HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost","DcomLaunch",0x00010000,"PlugPlay" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost","netsvcs",0x00010000,"DHCP","BITS","lanmanworkstation","winmgmt" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost","netsvcs",0x00010000,"DHCP","BITS","lanmanworkstation","Schedule","winmgmt" ; Win32 config HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows",,0x00000012 Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sun Mar 22 21:57:55 2015 @@ -1252,6 +1252,7 @@ "PNP_TDI", \ "TDI", \ "PlugPlay", \ + "SchedulerGroup", \ "SpoolerGroup", \ "UIGroup", \ "Extended Base" @@ -1897,6 +1898,18 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Start",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Type",0x00010001,0x00000010 +; Scheduler service +HKLM,"SYSTEM\CurrentControlSet\Services\Schedule","DependOnService",0x00010000,"RPCSS" +HKLM,"SYSTEM\CurrentControlSet\Services\Schedule","DisplayName",0x00000000,"Scheduler service" +HKLM,"SYSTEM\CurrentControlSet\Services\Schedule","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Schedule","Group",0x00000000,"SchedulerGroup" +HKLM,"SYSTEM\CurrentControlSet\Services\Schedule","ImagePath",0x00020000,"%SystemRoot%\system32\svchost.exe -k netsvcs" +HKLM,"SYSTEM\CurrentControlSet\Services\Schedule","ObjectName",0x00000000,"LocalSystem" +HKLM,"SYSTEM\CurrentControlSet\Services\Schedule","Start",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\Schedule","Type",0x00010001,0x00000020 +HKLM,"SYSTEM\CurrentControlSet\Services\Schedule\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\schedsvc.dll" +HKLM,"SYSTEM\CurrentControlSet\Services\Schedule\Parameters","ServiceMain",0x00000000,"SchedServiceMain" + ; Spooler service HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","DependOnService",0x00010000,"RPCSS" HKLM,"SYSTEM\CurrentControlSet\Services\Spooler","DisplayName",0x00000000,"Printer Spooler" Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] Sun Mar 22 21:57:55 2015 @@ -6,6 +6,7 @@ add_definitions(-D__WINESRC__) spec2def(netapi32.dll netapi32.spec ADD_IMPORTLIB) add_rpc_files(client + ${REACTOS_SOURCE_DIR}/include/reactos/idl/atsvc.idl ${REACTOS_SOURCE_DIR}/include/reactos/idl/dssetup.idl ${REACTOS_SOURCE_DIR}/include/reactos/idl/wkssvc.idl) @@ -23,11 +24,13 @@ nbt.c netapi32.c netbios.c + schedule.c share.c user.c wksta.c wksta_new.c netapi32.h + ${CMAKE_CURRENT_BINARY_DIR}/atsvc_c.c ${CMAKE_CURRENT_BINARY_DIR}/dssetup_c.c ${CMAKE_CURRENT_BINARY_DIR}/wkssvc_c.c) Modified: trunk/reactos/dll/win32/netapi32/netapi32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.c [iso-8859-1] Sun Mar 22 21:57:55 2015 @@ -201,25 +201,3 @@ return ApiStatus; } - -NET_API_STATUS WINAPI NetScheduleJobAdd(LPCWSTR server, LPBYTE bufptr, LPDWORD jobid) -{ - FIXME("stub (%s, %p, %p)\n", debugstr_w(server), bufptr, jobid); - return NERR_Success; -} - -NET_API_STATUS WINAPI NetScheduleJobDel(LPCWSTR server, DWORD minjobid, DWORD maxjobid) -{ - FIXME("stub (%s, %d, %d)\n", debugstr_w(server), minjobid, maxjobid); - return NERR_Success; -} - -NET_API_STATUS WINAPI NetScheduleJobEnum(LPCWSTR server, LPBYTE* bufptr, DWORD prefmaxsize, LPDWORD entriesread, - LPDWORD totalentries, LPDWORD resumehandle) -{ - FIXME("stub (%s, %p, %d, %p, %p, %p)\n", debugstr_w(server), bufptr, prefmaxsize, entriesread, totalentries, resumehandle); - *entriesread = 0; - *totalentries = 0; - return NERR_Success; -} - Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] Sun Mar 22 21:57:55 2015 @@ -204,7 +204,7 @@ @ stdcall NetScheduleJobAdd(wstr ptr ptr) @ stdcall NetScheduleJobDel(wstr long long) @ stdcall NetScheduleJobEnum(wstr ptr long ptr ptr ptr) -@ stub NetScheduleJobGetInfo +@ stdcall NetScheduleJobGetInfo(wstr long ptr) @ stub NetServerComputerNameAdd @ stub NetServerComputerNameDel @ stdcall NetServerDiskEnum(wstr long ptr long ptr ptr ptr) Added: trunk/reactos/dll/win32/netapi32/schedule.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/schedul… ============================================================================== --- trunk/reactos/dll/win32/netapi32/schedule.c (added) +++ trunk/reactos/dll/win32/netapi32/schedule.c [iso-8859-1] Sun Mar 22 21:57:55 2015 @@ -0,0 +1,199 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: NetAPI DLL + * FILE: reactos/dll/win32/netapi32/schedule.c + * PURPOSE: Scheduler service interface code + * + * PROGRAMMERS: Eric Kohl + */ + +/* INCLUDES ******************************************************************/ + +#include "netapi32.h" +#include "atsvc_c.h" + +WINE_DEFAULT_DEBUG_CHANNEL(netapi32); + +/* FUNCTIONS *****************************************************************/ + +handle_t __RPC_USER +ATSVC_HANDLE_bind(ATSVC_HANDLE pszSystemName) +{ + handle_t hBinding = NULL; + LPWSTR pszStringBinding; + RPC_STATUS status; + + TRACE("ATSVC_HANDLE_bind() called\n"); + + status = RpcStringBindingComposeW(NULL, + L"ncacn_np", + (RPC_WSTR)pszSystemName, + L"\\pipe\\atsvc", + NULL, + &pszStringBinding); + if (status) + { + TRACE("RpcStringBindingCompose returned 0x%x\n", status); + return NULL; + } + + /* Set the binding handle that will be used to bind to the server. */ + status = RpcBindingFromStringBindingW(pszStringBinding, + &hBinding); + if (status) + { + TRACE("RpcBindingFromStringBinding returned 0x%x\n", status); + } + + status = RpcStringFreeW(&pszStringBinding); + if (status) + { +// TRACE("RpcStringFree returned 0x%x\n", status); + } + + return hBinding; +} + + +void __RPC_USER +ATSVC_HANDLE_unbind(ATSVC_HANDLE pszSystemName, + handle_t hBinding) +{ + RPC_STATUS status; + + TRACE("ATSVC_HANDLE_unbind() called\n"); + + status = RpcBindingFree(&hBinding); + if (status) + { + TRACE("RpcBindingFree returned 0x%x\n", status); + } +} + + +NET_API_STATUS +WINAPI +NetScheduleJobAdd( + LPCWSTR ServerName, + LPBYTE Buffer, + LPDWORD JobId) +{ + NET_API_STATUS status; + + TRACE("NetScheduleJobAdd(%s, %p, %p)\n", debugstr_w(ServerName), + Buffer, JobId); + + RpcTryExcept + { + status = NetrJobAdd(ServerName, + (LPAT_INFO)Buffer, + JobId); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + + +NET_API_STATUS +WINAPI +NetScheduleJobDel( + LPCWSTR ServerName, + DWORD MinJobId, + DWORD MaxJobId) +{ + NET_API_STATUS status; + + TRACE("NetScheduleJobDel(%s, %d, %d)\n", debugstr_w(ServerName), + MinJobId, MaxJobId); + + RpcTryExcept + { + status = NetrJobDel(ServerName, + MinJobId, + MaxJobId); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + + +NET_API_STATUS +WINAPI +NetScheduleJobEnum( + LPCWSTR ServerName, + LPBYTE *PointerToBuffer, + DWORD PreferredMaximumLength, + LPDWORD EntriesRead, + LPDWORD TotalEntries, + LPDWORD ResumeHandle) +{ + AT_ENUM_CONTAINER EnumContainer; + NET_API_STATUS status; + + TRACE("NetScheduleJobEnum(%s, %p, %d, %p, %p, %p)\n", debugstr_w(ServerName), + PointerToBuffer, PreferredMaximumLength, EntriesRead, TotalEntries, ResumeHandle); + + EnumContainer.EntriesRead = 0; + EnumContainer.Buffer = NULL; + + RpcTryExcept + { + status = NetrJobEnum(ServerName, + &EnumContainer, + PreferredMaximumLength, + TotalEntries, + ResumeHandle); + if (status == NERR_Success || status == ERROR_MORE_DATA) + { + *PointerToBuffer = (LPBYTE)EnumContainer.Buffer; + *EntriesRead = EnumContainer.EntriesRead; + } + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + + +NET_API_STATUS +WINAPI +NetScheduleJobGetInfo( + LPCWSTR ServerName, + DWORD JobId, + LPBYTE *PointerToBuffer) +{ + NET_API_STATUS status; + + TRACE("NetScheduleJobGetInfo(%s, %d, %p)\n", debugstr_w(ServerName), + JobId, PointerToBuffer); + + RpcTryExcept + { + status = NetrJobGetInfo(ServerName, + JobId, + (LPAT_INFO *)PointerToBuffer); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/netapi32/schedule.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/reactos/idl/atsvc.acf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/atsvc.… ============================================================================== --- trunk/reactos/include/reactos/idl/atsvc.acf (added) +++ trunk/reactos/include/reactos/idl/atsvc.acf [iso-8859-1] Sun Mar 22 21:57:55 2015 @@ -0,0 +1,6 @@ +[ + explicit_handle +] +interface atsvc +{ +} Propchange: trunk/reactos/include/reactos/idl/atsvc.acf ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/reactos/idl/atsvc.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/atsvc.… ============================================================================== --- trunk/reactos/include/reactos/idl/atsvc.idl (added) +++ trunk/reactos/include/reactos/idl/atsvc.idl [iso-8859-1] Sun Mar 22 21:57:55 2015 @@ -0,0 +1,81 @@ +/* + * Scheduler Service interface definition + */ + +#include <ms-dtyp.idl> + +typedef [handle] const wchar_t *ATSVC_HANDLE; + +typedef struct _AT_ENUM +{ + DWORD JobId; + DWORD_PTR JobTime; + DWORD DaysOfMonth; + unsigned char DaysOfWeek; + unsigned char Flags; + wchar_t *Command; +} AT_ENUM, *PAT_ENUM, *LPAT_ENUM; + +typedef struct _AT_INFO +{ + DWORD_PTR JobTime; + DWORD DaysOfMonth; + unsigned char DaysOfWeek; + unsigned char Flags; + [string] wchar_t *Command; +} AT_INFO, *PAT_INFO, *LPAT_INFO; + +typedef struct _AT_ENUM_CONTAINER +{ + DWORD EntriesRead; + [size_is( EntriesRead)] LPAT_ENUM Buffer; +} AT_ENUM_CONTAINER, *PAT_ENUM_CONTAINER, *LPAT_ENUM_CONTAINER; + +[ + uuid(1FF70682-0A51-30E8-076D-740BE8CEE98B), + version(1.0), +#ifdef __midl + ms_union, +#endif + pointer_default(unique), + endpoint("ncacn_np:[\\pipe\\atsvc]") +#ifndef __midl + ,explicit_handle +#endif +] +interface atsvc +{ + /* Function 0 */ + NET_API_STATUS + __stdcall + NetrJobAdd( + [in, string, unique] ATSVC_HANDLE ServerName, + [in] LPAT_INFO pAtInfo, + [out] LPDWORD pJobId); + + /* Function 1 */ + NET_API_STATUS + __stdcall + NetrJobDel( + [in, string, unique] ATSVC_HANDLE ServerName, + [in] DWORD MinJobId, + [in] DWORD MaxJobId); + + /* Function 2 */ + NET_API_STATUS + __stdcall + NetrJobEnum( + [in, string, unique] ATSVC_HANDLE ServerName, + [in,out] LPAT_ENUM_CONTAINER pEnumContainer, + [in] DWORD PreferedMaximumLength, + [out] LPDWORD pTotalEntries, + [in, out, unique] LPDWORD pResumeHandle); + + /* Function 3 */ + NET_API_STATUS + __stdcall + NetrJobGetInfo( + [in, string, unique] ATSVC_HANDLE ServerName, + [in] DWORD JobId, + [out] LPAT_INFO *ppAtInfo); +} Propchange: trunk/reactos/include/reactos/idl/atsvc.idl ------------------------------------------------------------------------------ svn:eol-style = native

10 years, 1 month

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs