Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 52025: [I8042PRT] - Don't ASSERT(FALSE) when receiving an unknown PNP IRP
by cgutman＠svn.reactos.org 31 May '11

31 May '11

Author: cgutman Date: Tue May 31 18:02:49 2011 New Revision: 52025 URL: http://svn.reactos.org/svn/reactos?rev=52025&view=rev Log: [I8042PRT] - Don't ASSERT(FALSE) when receiving an unknown PNP IRP Modified: trunk/reactos/drivers/input/i8042prt/pnp.c Modified: trunk/reactos/drivers/input/i8042prt/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/pnp… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/pnp.c [iso-8859-1] Tue May 31 18:02:49 2011 @@ -708,7 +708,6 @@ default: { ERR_(I8042PRT, "IRP_MJ_PNP / unknown minor function 0x%x\n", MinorFunction); - ASSERT(FALSE); return ForwardIrpAndForget(DeviceObject, Irp); } }

1 0

[tkreuzer] 52024: fix build
by tkreuzer＠svn.reactos.org 31 May '11

31 May '11

Author: tkreuzer Date: Tue May 31 17:50:55 2011 New Revision: 52024 URL: http://svn.reactos.org/svn/reactos?rev=52024&view=rev Log: fix build Modified: trunk/reactos/lib/sdk/crt/string/splitp.c Modified: trunk/reactos/lib/sdk/crt/string/splitp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/splitp.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/splitp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/splitp.c [iso-8859-1] Tue May 31 17:50:55 2011 @@ -24,7 +24,7 @@ /* Check parameter */ if (!path) { - __set_errno(EINVAL); + //__set_errno(EINVAL); return; }

1 0

[tkreuzer] 52023: [CRT] Rewrite _splitpath. See issue #6244 for more details.
by tkreuzer＠svn.reactos.org 31 May '11

31 May '11

Author: tkreuzer Date: Tue May 31 17:29:49 2011 New Revision: 52023 URL: http://svn.reactos.org/svn/reactos?rev=52023&view=rev Log: [CRT] Rewrite _splitpath. See issue #6244 for more details. Modified: trunk/reactos/lib/sdk/crt/string/splitp.c Modified: trunk/reactos/lib/sdk/crt/string/splitp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/splitp.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/splitp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/splitp.c [iso-8859-1] Tue May 31 17:29:49 2011 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * PURPOSE: CRT: implementation of _splitpath / _wsplitpath + * PROGRAMMERS: Timo Kreuzer + */ + #include <precomp.h> #include <tchar.h> @@ -6,64 +13,72 @@ */ void _tsplitpath(const _TCHAR* path, _TCHAR* drive, _TCHAR* dir, _TCHAR* fname, _TCHAR* ext) { - _TCHAR* tmp_drive = NULL; - _TCHAR* tmp_dir = NULL; - _TCHAR* tmp_ext = NULL; + const _TCHAR *src, *dir_start, *file_start = 0, *ext_start = 0; - tmp_drive = (_TCHAR*)_tcschr(path,':'); - if (drive) + /* Truncate all output strings */ + if (drive) drive[0] = '\0'; + if (dir) dir[0] = '\0'; + if (fname) fname[0] = '\0'; + if (ext) ext[0] = '\0'; + + /* Check parameter */ + if (!path) { - if (tmp_drive) - { - _tcsncpy(drive,tmp_drive-1,2); - *(drive+2) = 0; - } - else - { - *drive = 0; - } - } - if (!tmp_drive) - { - tmp_drive = (_TCHAR*)path - 1; + __set_errno(EINVAL); + return; } - tmp_dir = (_TCHAR*)_tcsrchr(path,'\\'); - if (dir) + /* Skip '\\?\' prefix */ + if ((path[0] == '\\') && (path[1] == '\\') && + (path[2] == '?') && (path[3] == '\\')) path += 4; + + if (path[0] == '\0') return; + + /* Check if we have a drive letter (only 1 char supported) */ + if (path[1] == ':') { - if (tmp_dir) + if (drive) { - _tcsncpy(dir,tmp_drive+1,tmp_dir-tmp_drive); - *(dir+(tmp_dir-tmp_drive)) = 0; + drive[0] = path[0]; + drive[1] = ':'; + drive[2] = '\0'; } - else - { - *dir =0; - } + path += 2; + } + + /* Scan the rest of the string */ + dir_start = path; + while (*path != '\0') + { + /* Remember last path seperator and last dot */ + if ((*path == '\\') || (*path == '/')) file_start = path + 1; + if (*path == '.') ext_start = path; + path++; } - /* If the dot is before the last dir separator, it's part - * of a directory name, not the start of the extension */ - if (!tmp_ext || tmp_ext < tmp_dir) + /* Check if we got */ + if (!file_start) file_start = path; + if (!ext_start || ext_start < file_start) ext_start = path; + + if (dir) { - tmp_ext = (_TCHAR*)path+_tcslen(path); - } - if (ext) - { - _tcscpy(ext,tmp_ext); + src = dir_start; + while (src < file_start) *dir++ = *src++; + *dir = '\0'; } - if (fname) + if (fname) { - if (tmp_dir) - { - _tcsncpy(fname,tmp_dir+1,tmp_ext-tmp_dir-1); - *(fname+(tmp_ext-tmp_dir-1)) = 0; - } - else - { - _tcsncpy(fname,tmp_drive+1,tmp_ext-tmp_drive-1); - *(fname+(tmp_ext-path))=0; - } + src = file_start; + while (src < ext_start) *fname++ = *src++; + *fname = '\0'; + } + + if (ext) + { + src = ext_start; + while (*src != '\0') *ext++ = *src++; + *ext = '\0'; } } +

1 0

[tkreuzer] 52022: [MSVCRT_APITEST] Add tests for splitpath
by tkreuzer＠svn.reactos.org 31 May '11

31 May '11

Author: tkreuzer Date: Tue May 31 17:26:30 2011 New Revision: 52022 URL: http://svn.reactos.org/svn/reactos?rev=52022&view=rev Log: [MSVCRT_APITEST] Add tests for splitpath Added: trunk/rostests/apitests/msvcrt/ (with props) trunk/rostests/apitests/msvcrt/CMakeLists.txt (with props) trunk/rostests/apitests/msvcrt/msvcrt_apitest.rbuild (with props) trunk/rostests/apitests/msvcrt/splitpath.c (with props) trunk/rostests/apitests/msvcrt/testlist.c (with props) Propchange: trunk/rostests/apitests/msvcrt/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue May 31 17:26:30 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rostests/apitests/msvcrt/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rostests/apitests/msvcrt/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/rostests/apitests/msvcrt/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/rostests/apitests/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/CMakeList… ============================================================================== --- trunk/rostests/apitests/msvcrt/CMakeLists.txt (added) +++ trunk/rostests/apitests/msvcrt/CMakeLists.txt [iso-8859-1] Tue May 31 17:26:30 2011 @@ -1,0 +1,12 @@ + +add_definitions(-D_DLL -D__USE_CRTIMP) + +list(APPEND SOURCE + splitpath.c + testlist.c) + +add_executable(msvcrt_apitest ${SOURCE}) +target_link_libraries(msvcrt_apitest wine) +set_module_type(msvcrt_apitest win32cui) +add_importlibs(msvcrt_apitest msvcrt kernel32) +add_cd_file(TARGET msvcrt_apitest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/apitests/msvcrt/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/msvcrt/msvcrt_apitest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/msvcrt_ap… ============================================================================== --- trunk/rostests/apitests/msvcrt/msvcrt_apitest.rbuild (added) +++ trunk/rostests/apitests/msvcrt/msvcrt_apitest.rbuild [iso-8859-1] Tue May 31 17:26:30 2011 @@ -1,0 +1,13 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="msvcrt_apitest" type="win32cui" installbase="bin" installname="msvcrt_apitest.exe"> + <include base="msvcrt_apitest">.</include> + <library>wine</library> + <library>pseh</library> + <file>testlist.c</file> + + <file>splitpath.c</file> + +</module> +</group> Propchange: trunk/rostests/apitests/msvcrt/msvcrt_apitest.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/msvcrt/splitpath.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/splitpath… ============================================================================== --- trunk/rostests/apitests/msvcrt/splitpath.c (added) +++ trunk/rostests/apitests/msvcrt/splitpath.c [iso-8859-1] Tue May 31 17:26:30 2011 @@ -1,0 +1,94 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for _splitpath + * PROGRAMMER: Timo Kreuzer + */ + +#include <wine/test.h> +#include <stdio.h> +#include <stdlib.h> +#include <strings.h> +#include <stdarg.h> + +#define ok_str(x, y) \ + ok(strcmp(x, y) == 0, "got '%s', expected '%s'\n", x, y); + +#define ok_int(x, y) \ + ok(x == y, "got %d, expected %d\n", x, y); + +START_TEST(splitpath) +{ + char drive[5]; + char dir[64]; + char fname[32]; + char ext[10]; + + _splitpath("c:\\dir1\\dir2\\file.ext", drive, dir, fname, ext); + ok_str(drive, "c:"); + ok_str(dir, "\\dir1\\dir2\\"); + ok_str(fname, "file"); + ok_str(ext, ".ext"); + + *_errno() = 0; + _splitpath("c:\\dir1\\dir2\\file.ext", 0, 0, 0, 0); + ok_int(*_errno(), 0); + + *_errno() = 0; + _splitpath(0, drive, dir, fname, ext); + ok_int(*_errno(), EINVAL); + ok_str(drive, ""); + ok_str(dir, ""); + ok_str(fname, ""); + ok_str(ext, ""); + + _splitpath("\\\\?\\c:\\dir1\\dir2\\file.ext", drive, dir, fname, ext); + ok_str(drive, "c:"); + ok_str(dir, "\\dir1\\dir2\\"); + ok_str(fname, "file"); + ok_str(ext, ".ext"); + + _splitpath("ab:\\dir1\\..\\file", drive, dir, fname, ext); + ok_str(drive, ""); + ok_str(dir, "ab:\\dir1\\..\\"); + ok_str(fname, "file"); + ok_str(ext, ""); + + _splitpath("//?/c:/dir1/dir2/file.ext", drive, dir, fname, ext); + ok_str(drive, ""); + ok_str(dir, "//?/c:/dir1/dir2/"); + ok_str(fname, "file"); + ok_str(ext, ".ext"); + + _splitpath("\\\\?\\0:/dir1\\dir2/file.", drive, dir, fname, ext); + ok_str(drive, "0:"); + ok_str(dir, "/dir1\\dir2/"); + ok_str(fname, "file"); + ok_str(ext, "."); + + _splitpath("\\\\.\\c:\\dir1\\dir2\\.ext.ext2", drive, dir, fname, ext); + ok_str(drive, ""); + ok_str(dir, "\\\\.\\c:\\dir1\\dir2\\"); + ok_str(fname, ".ext"); + ok_str(ext, ".ext2"); + + _splitpath("\\??\\c:\\dir1\\dir2\\file. ~ ", drive, dir, fname, ext); + ok_str(drive, ""); + ok_str(dir, "\\??\\c:\\dir1\\dir2\\"); + ok_str(fname, "file"); + ok_str(ext, ". ~ "); + + _splitpath("x: dir1\\/dir2 \\.blub", drive, dir, fname, ext); + ok_str(drive, "x:"); + ok_str(dir, " dir1\\/dir2 \\"); + ok_str(fname, ""); + ok_str(ext, ".blub"); + + _splitpath("/:\\dir1\\dir2\\file.ext", drive, dir, fname, ext); + ok_str(drive, "/:"); + ok_str(dir, "\\dir1\\dir2\\"); + ok_str(fname, "file"); + ok_str(ext, ".ext"); + +} + Propchange: trunk/rostests/apitests/msvcrt/splitpath.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/msvcrt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/msvcrt/testlist.… ============================================================================== --- trunk/rostests/apitests/msvcrt/testlist.c (added) +++ trunk/rostests/apitests/msvcrt/testlist.c [iso-8859-1] Tue May 31 17:26:30 2011 @@ -1,0 +1,16 @@ +#define WIN32_LEAN_AND_MEAN +#define __ROS_LONG64__ +#include <windows.h> + +#define STANDALONE +#include "wine/test.h" + +extern void func_splitpath(void); + +const struct test winetest_testlist[] = +{ + { "splitpath", func_splitpath }, + + { 0, 0 } +}; + Propchange: trunk/rostests/apitests/msvcrt/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[khornicek] 52021: [SHELL32_NEW] Fix building with CMake. Had to turn PCH off as Amine suggested, it needs more work.
by khornicek＠svn.reactos.org 31 May '11

31 May '11

Author: khornicek Date: Tue May 31 16:55:10 2011 New Revision: 52021 URL: http://svn.reactos.org/svn/reactos?rev=52021&view=rev Log: [SHELL32_NEW] Fix building with CMake. Had to turn PCH off as Amine suggested, it needs more work. Modified: branches/shell32_new-bringup/dll/win32/shell32/CMakeLists.txt Modified: branches/shell32_new-bringup/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Tue May 31 16:55:10 2011 @@ -1,3 +1,5 @@ +set_unicode() +set_cpp() remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) @@ -10,6 +12,7 @@ include_directories( ${REACTOS_SOURCE_DIR}/include/reactos/wine ${REACTOS_SOURCE_DIR}/lib/recyclebin + ${REACTOS_SOURCE_DIR}/lib/atl ${REACTOS_SOURCE_DIR}) generate_idl_iids(shobjidl_local.idl) @@ -17,71 +20,73 @@ spec2def(shell32.dll shell32.spec) list(APPEND SOURCE - authors.c - autocomplete.c - brsfolder.c - changenotify.c - classes.c - clipboard.c - control.c - dataobject.c - dde.c - debughlp.c - desktop.c - dialogs.c - dragdrophelper.c - enumidlist.c - extracticon.c - folders.c - iconcache.c - pidl.c - regsvr.c - shell32_main.c - shellitem.c - shelllink.c - shellole.c - shellord.c - shellpath.c - shellreg.c - shellstring.c - shfldr_desktop.c - shfldr_fs.c - shfldr_mycomp.c - shfldr_mydocuments.c - shfldr_printers.c - shfldr_admintools.c - shfldr_netplaces.c - shfldr_fonts.c - shfldr_cpanel.c - shfldr_recyclebin.c - shlexec.c - shlfileop.c - shlfolder.c - shlfsbind.c - shlmenu.c - shlview.c - shpolicy.c - shv_def_cmenu.c - startmenu.c - stubs.c - ros-systray.c - fprop.c - drive.c - she_ocmenu.c - shv_item_new.c - folder_options.c + authors.cpp + autocomplete.cpp + brsfolder.cpp + changenotify.cpp + classes.cpp + clipboard.cpp + control.cpp + dataobject.cpp + dde.cpp + debughlp.cpp + desktop.cpp + dialogs.cpp + dragdrophelper.cpp + enumidlist.cpp + extracticon.cpp + folders.cpp + iconcache.cpp + pidl.cpp + shell32_main.cpp + shellitem.cpp + shelllink.cpp + shellole.cpp + shellord.cpp + shellpath.cpp + shellreg.cpp + shellstring.cpp + shfldr_desktop.cpp + shfldr_fs.cpp + shfldr_mycomp.cpp + shfldr_mydocuments.cpp + shfldr_printers.cpp + shfldr_admintools.cpp + shfldr_netplaces.cpp + shfldr_fonts.cpp + shfldr_cpanel.cpp + shfldr_recyclebin.cpp + shlexec.cpp + shlfileop.cpp + shlfolder.cpp + shlfsbind.cpp + shlmenu.cpp + shlview.cpp + shpolicy.cpp + shv_def_cmenu.cpp + startmenu.cpp + stubs.cpp + ros-systray.cpp + fprop.cpp + drive.cpp + she_ocmenu.cpp + shv_item_new.cpp + folder_options.cpp shell32.rc ${CMAKE_CURRENT_BINARY_DIR}/shobjidl_local_i.c ${CMAKE_CURRENT_BINARY_DIR}/shell32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/shell32.def) -add_pch(shell32 ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) +# FIXME +#add_pch(shell32 ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) +#add_library(shell32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/shell32_precomp.h.gch ${SOURCE}) -add_library(shell32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/shell32_precomp.h.gch ${SOURCE}) +add_library(shell32 SHARED ${SOURCE}) set_module_type(shell32 win32dll) target_link_libraries(shell32 + atlnew wine uuid recyclebin)

1 0

[nyadav] 52020: [AUDSRV] Use Double Buffering to Improve latency
by nyadav＠svn.reactos.org 31 May '11

31 May '11

Author: nyadav Date: Tue May 31 16:30:46 2011 New Revision: 52020 URL: http://svn.reactos.org/svn/reactos?rev=52020&view=rev Log: [AUDSRV] Use Double Buffering to Improve latency Added: branches/nyadav-audio-branch/base/services/audsrv/stream.c (with props) Modified: branches/nyadav-audio-branch/base/services/audsrv/CMakeLists.txt branches/nyadav-audio-branch/base/services/audsrv/audsrv.c branches/nyadav-audio-branch/base/services/audsrv/audsrv.h branches/nyadav-audio-branch/base/services/audsrv/rpc.c branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h Modified: branches/nyadav-audio-branch/base/services/audsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/CMakeLists.txt [iso-8859-1] Tue May 31 16:30:46 2011 @@ -6,7 +6,8 @@ list(APPEND SOURCE audsrv.c audsrv.rc - rpc.c) + rpc.c + stream.c) add_executable(audsrv ${SOURCE}) Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/audsrv.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/audsrv.c [iso-8859-1] Tue May 31 16:30:46 2011 @@ -153,27 +153,24 @@ -void fill(MixerEngine * mixer) +void fill(MixerEngine * mixer,int buffer) { DWORD Length; UINT i = 0; - mixer->mastervolume = 1000; - mixer->masterchannels=2; - mixer->masterfreq=48000; - mixer->masterbitspersample=16; - mixer->masterchannelmask = KSAUDIO_SPEAKER_STEREO; +Sleep(100); Length = mixer->masterfreq * mixer->masterchannels * mixer->masterbitspersample / 8; - mixer->masterbuf = (PSHORT)HeapAlloc(GetProcessHeap(), 0, Length); + mixer->masterbuf[buffer] = (PSHORT)HeapAlloc(GetProcessHeap(), 0, Length); while (i < Length / 2) { - mixer->masterbuf[i] = 0x7FFF * sin(0.5 * (i - 1) * 500 * _2pi / 48000); + mixer->masterbuf[buffer][i] = 0x7FFF * sin(0.5 * (i - 1) * 500 * _2pi / 48000); i++; - mixer->masterbuf[i] = 0x7FFF * sin(0.5 * (i - 2) * 500 * _2pi / 48000); + mixer->masterbuf[buffer][i] = 0x7FFF * sin(0.5 * (i - 2) * 500 * _2pi / 48000); i++; } -} - -void initdevice(MixerEngine * mixer) + mixer->bytes_to_play = Length; +} + +void playbuffer(MixerEngine * mixer,int buffer) { SP_DEVICE_INTERFACE_DATA InterfaceData; SP_DEVINFO_DATA DeviceData; @@ -186,7 +183,8 @@ DWORD Length; BOOL Result; NTSTATUS Status; - +if(mixer->masterbuf[buffer]) +{ // // Get a handle to KS Audio Interfaces // @@ -195,7 +193,7 @@ NULL, DIGCF_DEVICEINTERFACE |DIGCF_PRESENT); - printf("DeviceHandle %p\n", DeviceHandle); + //printf("DeviceHandle %p\n", DeviceHandle); // // Enumerate the first interface @@ -208,7 +206,7 @@ 1, &InterfaceData); - printf("SetupDiEnumDeviceInterfaces %u Error %ld\n", Result, GetLastError()); + //printf("SetupDiEnumDeviceInterfaces %u Error %ld\n", Result, GetLastError()); // // Get the interface details (namely the device path) @@ -227,7 +225,7 @@ NULL, &DeviceData); - wprintf(L"SetupDiGetDeviceInterfaceDetail %u Path DetailData %s\n", Result, (LPWSTR)&DetailData->DevicePath[0]); + //wprintf(L"SetupDiGetDeviceInterfaceDetail %u Path DetailData %s\n", Result, (LPWSTR)&DetailData->DevicePath[0]); // // Open a handle to the device @@ -240,7 +238,7 @@ FILE_ATTRIBUTE_NORMAL, NULL); - printf("Handle %p\n", mixer->FilterHandle); + //printf("Handle %p\n", mixer->FilterHandle); // // Close the interface handle and clean up @@ -273,7 +271,7 @@ // // Setup the KS Data Format Information // - printf("DataFormat %p %p\n", DataFormat,(PVOID)((((ULONG_PTR)DataFormat + 7)) & ~7)); + //printf("DataFormat %p %p\n", DataFormat,(PVOID)((((ULONG_PTR)DataFormat + 7)) & ~7)); DataFormat->Flags = 0; DataFormat->Reserved = 0; @@ -294,14 +292,14 @@ WaveFormat->Samples.wValidBitsPerSample = mixer->masterbitspersample; WaveFormat->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; - printf("Creating pin\n"); + //printf("Creating pin\n"); // // Create the pin // Status = KsCreatePin(mixer->FilterHandle, PinConnect, GENERIC_READ|GENERIC_WRITE, &(mixer->PinHandle)); - printf("PinHandle %p Status %lx\n", mixer->PinHandle, Status); + //printf("PinHandle %p Status %lx\n", mixer->PinHandle, Status); Length = mixer->masterfreq * mixer->masterchannels * mixer->masterbitspersample / 8; @@ -311,9 +309,9 @@ mixer->Packet = (PKSSTREAM_HEADER)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(KSSTREAM_HEADER)); - mixer->Packet->Data = mixer->masterbuf; - mixer->Packet->FrameExtent = Length; - mixer->Packet->DataUsed = Length; + mixer->Packet->Data = mixer->masterbuf[buffer]; + mixer->Packet->FrameExtent = mixer->bytes_to_play; + mixer->Packet->DataUsed = mixer->bytes_to_play; mixer->Packet->Size = sizeof(KSSTREAM_HEADER); mixer->Packet->PresentationTime.Numerator = 1; mixer->Packet->PresentationTime.Denominator = 1; @@ -338,13 +336,6 @@ sizeof(State), &Length, NULL); -} -void playbuffer(MixerEngine * mixer) -{ - DWORD Length = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA) + MAX_PATH * sizeof(WCHAR); - // - // Play our 1-second buffer - // DeviceIoControl(mixer->PinHandle, IOCTL_KS_WRITE_STREAM, @@ -355,14 +346,6 @@ &Length, NULL); -} -void closedevice(MixerEngine * mixer) -{ - KSSTATE State; - DWORD Length = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA) + MAX_PATH * sizeof(WCHAR); - // - // Change the state to stop - // State = KSSTATE_STOP; DeviceIoControl(mixer->PinHandle, IOCTL_KS_PROPERTY, @@ -375,17 +358,21 @@ CloseHandle(mixer->PinHandle); CloseHandle(mixer->FilterHandle); - +} } DWORD WINAPI RunMixerThread(LPVOID param) { MixerEngine * mixer = (MixerEngine *) param; - SetEvent(mixer->EventPool[0]); + + SetEvent(mixer->played); while(1) { - while(WaitForSingleObject(mixer->EventPool[0],100)!=0){if(mixer->dead)goto DEAD;} - fill(mixer); - SetEvent(mixer->EventPool[1]); + while(WaitForSingleObject(mixer->streampresent,100)!=0){if(mixer->dead)goto DEAD;} /*Check if there is at least one stream present.*/ + + while(WaitForSingleObject(mixer->played,100)!=0){if(mixer->dead)goto DEAD;} + fill(mixer,1-mixer->playcurrent); + SetEvent(mixer->filled); + } DEAD: printf("\nMixer Thread Ended\n"); @@ -396,11 +383,11 @@ MixerEngine * mixer = (MixerEngine *) param; while(1) { - while(WaitForSingleObject(mixer->EventPool[1],100)!=0){if(mixer->dead)goto DEAD;} - initdevice(mixer); - playbuffer(mixer); - closedevice(mixer); - SetEvent(mixer->EventPool[0]); + while(WaitForSingleObject(mixer->filled,100)!=0){if(mixer->dead)goto DEAD;} + SetEvent(mixer->played); + playbuffer(mixer,mixer->playcurrent); + + mixer->playcurrent=1-mixer->playcurrent; } DEAD: @@ -481,8 +468,12 @@ pengine->mute=FALSE; pengine->dead=0; - pengine->EventPool[0]=CreateEvent(NULL,FALSE,FALSE,NULL); - pengine->EventPool[1]=CreateEvent(NULL,FALSE,FALSE,NULL); + pengine->playcurrent=1; + pengine->masterbuf[0] = NULL; + pengine->masterbuf[1] = NULL; + pengine->played=CreateEvent(NULL,FALSE,FALSE,NULL); + pengine->filled=CreateEvent(NULL,FALSE,FALSE,NULL); + pengine->streampresent=CreateEvent(NULL,TRUE,FALSE,NULL); SetConsoleCtrlHandler(close,TRUE); SpawnMixerThread(pengine); SpawnPlayerThread(pengine); @@ -510,8 +501,12 @@ pengine->mute=FALSE; pengine->dead=0; - pengine->EventPool[0]=CreateEvent(NULL,FALSE,FALSE,NULL); - pengine->EventPool[1]=CreateEvent(NULL,FALSE,FALSE,NULL); + pengine->playcurrent=1; + pengine->masterbuf[0] = NULL; + pengine->masterbuf[1] = NULL; + pengine->played=CreateEvent(NULL,FALSE,FALSE,NULL); + pengine->filled=CreateEvent(NULL,FALSE,FALSE,NULL); + pengine->streampresent=CreateEvent(NULL,TRUE,FALSE,NULL); SetConsoleCtrlHandler(close,TRUE); SpawnMixerThread(pengine); SpawnPlayerThread(pengine); Modified: branches/nyadav-audio-branch/base/services/audsrv/audsrv.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/audsrv.h [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/audsrv.h [iso-8859-1] Tue May 31 16:30:46 2011 @@ -34,6 +34,8 @@ int bitspersample; int channels; ULONG channelmask; + HANDLE played; + HANDLE streamready; HANDLE thread; float balance; struct ServerStream * next; @@ -43,10 +45,13 @@ { /*Should be Initialized at Server Start*/ char dead; - HANDLE EventPool[2];//0=Played,1=Ready + HANDLE played; + HANDLE filled; + HANDLE streampresent; HANDLE mixerthread; HANDLE playerthread; HANDLE rpcthread; + int playcurrent; /*Should be Initialized at Server Start from configuration file,Currently there is no configuration file so initialized to a fixed value at start*/ int mastervolume; BOOL mute; @@ -55,8 +60,9 @@ int masterchannels; unsigned long masterchannelmask; int masterbitspersample; - PSHORT masterbuf; + PSHORT masterbuf[2]; /*Currently don't know the future of following variables*/ + long bytes_to_play; HANDLE FilterHandle; HANDLE PinHandle; PKSPROPERTY Property; @@ -64,10 +70,15 @@ ServerStream * serverstreamlist; } MixerEngine; -extern MixerEngine engine; +extern MixerEngine engine,*pengine; /* rpc.c */ DWORD WINAPI RunRPCThread(LPVOID lpParameter); +/* audsrv.c*/ +void fill(MixerEngine * mixer,int buffer); +void playbuffer(MixerEngine * mixer,int buffer); +/*stream.c*/ +HANDLE addstream(LONG frequency,int channels,int bitspersample, ULONG channelmask,int volume,int mute,float balance); /********************************/ #endif /* __AUDSRV_H__ */ Modified: branches/nyadav-audio-branch/base/services/audsrv/rpc.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/rpc.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/rpc.c [iso-8859-1] Tue May 31 16:30:46 2011 @@ -45,11 +45,13 @@ /*************************RPC Functions**********************************/ -NTSTATUS AUDInitStream( IN RPC_BINDING_HANDLE hBinding) +int AUDInitStream( IN RPC_BINDING_HANDLE hBinding,LONG frequency,int channels,int bitspersample, ULONG channelmask,int volume,int mute,float balance) { - UNIMPLEMENTED;/*Coolest Macro I have ever seen*/ - printf("Client Connected and called server's procedure\n"); - return STATUS_NOT_IMPLEMENTED; + HANDLE stream; + printf("Client Connected and Initiated Stream Freq: %ld,Channle: %d,Bitspersample: %d,Mask: %ld,Volume: %d,Mute: %d,Balance: %f\n",frequency,channels,bitspersample,channelmask,volume,mute,balance); + stream = addstream(frequency,channels,bitspersample,channelmask,volume,mute,balance); + if( stream == NULL ){return 0;}else{printf("Stream added\n");} + return (int)stream; } /*************************************************************************/ void __RPC_FAR *__RPC_USER midl_user_allocate(SIZE_T len) Added: branches/nyadav-audio-branch/base/services/audsrv/stream.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/stream.c (added) +++ branches/nyadav-audio-branch/base/services/audsrv/stream.c [iso-8859-1] Tue May 31 16:30:46 2011 @@ -1,0 +1,59 @@ +#include "audsrv.h" + +DWORD WINAPI RunStreamThread(LPVOID param) +{ + ServerStream * localstream = (ServerStream *) param; + + SetEvent(localstream->streamready); + printf("Signaling Mixer Thread For First Stream\n"); + SetEvent(pengine->streampresent); + while (1){OutputDebugStringA("Stream Thread Running.");Sleep(100);}; + /*Clean Stream's data*/ +} + +HANDLE addstream(LONG frequency,int channels,int bitspersample, ULONG channelmask,int volume,int mute,float balance) +{ + ServerStream * newstream,*localstream; + DWORD dwID; + + /*Add Data to Linked list*/ + localstream = pengine->serverstreamlist; + newstream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ServerStream)); + if(newstream == NULL) {goto error;} + if(volume < 0) {newstream->volume = 0;}else if (volume > 1000) {newstream->volume = 1000;}else {newstream->volume = volume;} + if(volume < -1.0) {newstream->volume = -1.0;}else if (volume > 1.0) {newstream->volume = 1.0;}else {newstream->volume = volume;} + newstream->freq = frequency; /*TODO frequency validation required*/ + newstream->bitspersample = bitspersample; /*TODO bitspersample validation*/ + newstream->channels = channels; /*TODO validation*/ + newstream->channelmask = channelmask; /*TODO validation*/ + + newstream->next = NULL; + newstream->played = CreateEvent(NULL,FALSE,FALSE,NULL); + newstream->streamready = CreateEvent(NULL,FALSE,FALSE,NULL); + + if(newstream->played == NULL || newstream->streamready == NULL) {goto error;} + newstream->thread=CreateThread(NULL,0,RunStreamThread,newstream,0,&dwID); + if(newstream->thread == NULL) {goto error;} + + WaitForSingleObject(newstream->streamready,INFINITE); + + if(localstream == NULL) + { + pengine->serverstreamlist = localstream; + + pengine->masterfreq=frequency; + pengine->masterchannels=channels; + pengine->masterchannelmask=channelmask; + pengine->masterbitspersample=bitspersample; + } + else + { + while(localstream->next != NULL){localstream = localstream->next;} + localstream->next = newstream; + } + return newstream->thread; + +error: + HeapFree(GetProcessHeap(), 0, newstream); + return NULL; +} Propchange: branches/nyadav-audio-branch/base/services/audsrv/stream.c ------------------------------------------------------------------------------ eol-style = native Propchange: branches/nyadav-audio-branch/base/services/audsrv/stream.c ------------------------------------------------------------------------------ mime-type = text/plain Propchange: branches/nyadav-audio-branch/base/services/audsrv/stream.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/nyadav-audio-branch/base/services/audsrv/stream.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/audsrvapi.c [iso-8859-1] Tue May 31 16:30:46 2011 @@ -7,38 +7,25 @@ */ WINAPI int initstream (ClientStream * clientstream,LONG frequency,int channels,int bitspersample, ULONG channelmask,int volume,int mute,float balance) { - RPC_STATUS status; - unsigned short * pszStringBinding = NULL; - - - if(clientstream == NULL ) return -1; + int streamid; + if (clientstream == NULL ) return -1; if (clientstream->callbacks.OpenComplete == NULL || clientstream->callbacks.BufferCopied == NULL || clientstream->callbacks.PlayComplete == NULL) return -2; /*Validity of all other data will be checked at server*/ /*Check Connection Status If not connected call Connect()*/ /*If connected Properly call the remote audsrv_initstream() function*/ - status = RpcStringBindingComposeW(NULL,L"ncacn_np",NULL,L"\\pipe\\audsrv", NULL,&pszStringBinding); - - status = RpcBindingFromStringBindingW(pszStringBinding, &audsrv_v0_0_c_ifspec); - - if (status) printf("Connection Problem p %d \n",status); - - status = RpcStringFree(&pszStringBinding); - - if (status) printf("Problem Freeing String : %d \n",status); - RpcTryExcept { - AUDInitStream (audsrv_v0_0_c_ifspec); + streamid = AUDInitStream (audsrv_v0_0_c_ifspec,frequency,channels,bitspersample,channelmask,volume,mute,balance); + printf("AUDInitStream Returned %d",streamid); } - RpcExcept(1) + RpcExcept(1) { status = RpcExceptionCode(); printf("Runtime reported exception 0x%lx = %ld\n", status, status); } RpcEndExcept - status = RpcBindingFree(&audsrv_v0_0_c_ifspec); - if (status == RPC_S_INVALID_BINDING) printf("Error : %d Invalid RPC S HANDLE\n",status); + /*Analyse the return by the function*/ /*Currently Suppose the return is 0 and a valid streamid is returned*/ clientstream->stream = &status; Modified: branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/dll/win32/a… ============================================================================== --- branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/dll/win32/audsrvapi/dllmain.c [iso-8859-1] Tue May 31 16:30:46 2011 @@ -7,13 +7,27 @@ LPVOID lpReserved ) { - + RPC_STATUS status; + unsigned short * pszStringBinding = NULL; + switch (ul_reason_for_call) { case DLL_PROCESS_ATTACH: + status = RpcStringBindingComposeW(NULL,L"ncacn_np",NULL,L"\\pipe\\audsrv", NULL,&pszStringBinding); + + status = RpcBindingFromStringBindingW(pszStringBinding, &audsrv_v0_0_c_ifspec); + + if (status) printf("Connection Problem p %d \n",status); + + status = RpcStringFree(&pszStringBinding); + + if (status) printf("Problem Freeing String : %d \n",status); + break; case DLL_THREAD_ATTACH: case DLL_THREAD_DETACH: case DLL_PROCESS_DETACH: + status = RpcBindingFree(audsrv_v0_0_c_ifspec); + if (status == RPC_S_INVALID_BINDING) printf("Error : %d Invalid RPC S HANDLE\n",status); break; } return TRUE; Modified: branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/include/rea… ============================================================================== --- branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl [iso-8859-1] (original) +++ branches/nyadav-audio-branch/include/reactos/idl/audsrvrpc.idl [iso-8859-1] Tue May 31 16:30:46 2011 @@ -3,6 +3,7 @@ */ #include <ms-dtyp.idl> + cpp_quote("#if !defined(__AUDSRV_H__) ") typedef long NTSTATUS; @@ -19,6 +20,7 @@ typedef AUDSRV_HANDLE *PAUDSRV_HANDLE; typedef [handle, unique] LPWSTR AUDSRV_HANDLE_W; typedef [handle, unique] LPSTR AUDSRV_HANDLE_A; + typedef struct _RPC_CLIENT_ID { DWORD UniqueProcess; @@ -37,6 +39,6 @@ interface audsrv { - NTSTATUS AUDInitStream([in] handle_t h1); + int AUDInitStream([in] handle_t h1,[in]LONG frequency,[in]int channels,[in]int bitspersample,[in] ULONG channelmask,[in]int volume,[in]int mute,[in]float balance); } Modified: branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/include/rea… ============================================================================== --- branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h [iso-8859-1] (original) +++ branches/nyadav-audio-branch/include/reactos/libs/audsrv/audsrvapi.h [iso-8859-1] Tue May 31 16:30:46 2011 @@ -7,6 +7,7 @@ #include <stdio.h> /********************Structures*********************/ + typedef struct CallBacks { void (*OpenComplete) (int error ); @@ -18,7 +19,7 @@ { HANDLE stream; int dead; -HANDLE ClientEventPool[1]; /*[0]th event is for Activescheduler*/ +HANDLE ClientEventPool[1]; //0]th event is for Activescheduler struct CallBacks callbacks; } ClientStream;

1 0

[cgutman] 52019: [NTOSKRNL] - Implement IoTranslateBusAddress
by cgutman＠svn.reactos.org 30 May '11

30 May '11

Author: cgutman Date: Mon May 30 22:27:28 2011 New Revision: 52019 URL: http://svn.reactos.org/svn/reactos?rev=52019&view=rev Log: [NTOSKRNL] - Implement IoTranslateBusAddress Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Mon May 30 22:27:28 2011 @@ -4119,7 +4119,7 @@ } /* - * @unimplemented + * @implemented */ BOOLEAN NTAPI @@ -4129,6 +4129,11 @@ IN OUT PULONG AddressSpace, OUT PPHYSICAL_ADDRESS TranslatedAddress) { - UNIMPLEMENTED; - return FALSE; -} + /* FIXME: Notify the resource arbiter */ + + return HalTranslateBusAddress(InterfaceType, + BusNumber, + BusAddress, + AddressSpace, + TranslatedAddress); +}

1 0

[tkreuzer] 52018: [WIN32K] - Refactor NtGdiGetTextMetricsW - Implement NtGdiGetETM - Halfplement RFONT_vGetTextMetrics - Hackplement RFONT_vGetETM
by tkreuzer＠svn.reactos.org 30 May '11

30 May '11

Author: tkreuzer Date: Mon May 30 22:18:44 2011 New Revision: 52018 URL: http://svn.reactos.org/svn/reactos?rev=52018&view=rev Log: [WIN32K] - Refactor NtGdiGetTextMetricsW - Implement NtGdiGetETM - Halfplement RFONT_vGetTextMetrics - Hackplement RFONT_vGetETM Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/textmetric.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/textmetric.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/textmetric.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/textmetric.c [iso-8859-1] Mon May 30 22:18:44 2011 @@ -11,6 +11,81 @@ #define NDEBUG #include <debug.h> + + +VOID +NTAPI +RFONT_vGetTextMetrics( + PRFONT prfnt, + TMW_INTERNAL *ptmwi) +{ + PIFIMETRICS pifi = prfnt->ppfe->pifi; + + ptmwi->tmw.tmAscent = (prfnt->fddm.fxMaxAscender + 8) / 16; + ptmwi->tmw.tmDescent = (prfnt->fddm.fxMaxDescender + 8) / 16; + ptmwi->tmw.tmHeight = ptmwi->tmw.tmAscent + ptmwi->tmw.tmDescent; + ptmwi->tmw.tmInternalLeading = 0; // FIXME + ptmwi->tmw.tmExternalLeading = 0; // FIXME + ptmwi->tmw.tmAveCharWidth = 0; // FIXME + ptmwi->tmw.tmMaxCharWidth = prfnt->fddm.cxMax; + ptmwi->tmw.tmWeight = pifi->usWinWeight; + ptmwi->tmw.tmOverhang = 0; // FIXME + ptmwi->tmw.tmDigitizedAspectX = pifi->ptlAspect.x; + ptmwi->tmw.tmDigitizedAspectY = pifi->ptlAspect.y; + ptmwi->tmw.tmFirstChar = pifi->wcFirstChar; + ptmwi->tmw.tmLastChar = pifi->wcLastChar; + ptmwi->tmw.tmDefaultChar = pifi->wcDefaultChar; + ptmwi->tmw.tmBreakChar = pifi->wcBreakChar; + ptmwi->tmw.tmItalic = ((pifi->fsSelection & FM_SEL_ITALIC) != 0); + ptmwi->tmw.tmUnderlined = ((pifi->fsSelection & FM_SEL_UNDERSCORE) != 0); + ptmwi->tmw.tmStruckOut = ((pifi->fsSelection & FM_SEL_STRIKEOUT) != 0); + ptmwi->tmw.tmPitchAndFamily = pifi->jWinPitchAndFamily; + ptmwi->tmw.tmCharSet = pifi->jWinCharSet; + ptmwi->tmdiff.chFirst = pifi->chFirstChar; + ptmwi->tmdiff.chLast = pifi->chLastChar; + ptmwi->tmdiff.chDefault = pifi->chDefaultChar; + ptmwi->tmdiff.chBreak = pifi->chBreakChar; + ptmwi->tmdiff.cjotma = 0; // FIXME +} + +VOID +NTAPI +RFONT_vGetETM( + PRFONT prfnt, + EXTTEXTMETRIC *petm) +{ + PIFIMETRICS pifi = prfnt->ppfe->pifi; + + petm->emSize = sizeof(EXTTEXTMETRIC); + petm->emPointSize = 0; // FIXME + petm->emOrientation = 0; // FIXME + petm->emMasterHeight = 0; // FIXME + petm->emMinScale = 0; // FIXME + petm->emMaxScale = 0; // FIXME + petm->emMasterUnits = 0; // FIXME + petm->emCapHeight = 0; // FIXME + petm->emXHeight = 0; // FIXME + petm->emLowerCaseAscent = 0; // FIXME + petm->emLowerCaseDescent = 0; // FIXME + petm->emSlant = 0; // FIXME + petm->emSuperScript = 0; // FIXME + petm->emSubScript = 0; // FIXME + petm->emSuperScriptSize = 0; // FIXME + petm->emSubScriptSize = 0; // FIXME + petm->emUnderlineOffset = 0; // FIXME + petm->emUnderlineWidth = 0; // FIXME + petm->emDoubleUpperUnderlineOffset = 0; // FIXME + petm->emDoubleLowerUnderlineOffset = 0; // FIXME + petm->emDoubleUpperUnderlineWidth = 0; // FIXME + petm->emDoubleLowerUnderlineWidth = 0; // FIXME + petm->emStrikeOutOffset = 0; // FIXME + petm->emStrikeOutWidth = 0; // FIXME + petm->emKernPairs = pifi->cKerningPairs; + petm->emKernTracks = 0; // FIXME + +} + + W32KAPI BOOL APIENTRY @@ -21,7 +96,6 @@ { PDC pdc; PRFONT prfnt; - PIFIMETRICS pifi; BOOL bResult = TRUE; /* verify that the buffer is large enough */ @@ -36,19 +110,13 @@ /* Get pointer to RFONT and IFI */ prfnt = DC_prfnt(pdc); - pifi = prfnt->ppfe->pifi; /* Enter SEH for buffer copy */ _SEH2_TRY { /* Probe and fill TMW_INTERNAL */ ProbeForWrite(ptmwi, cj, 1); - RtlCopyMemory(&ptmwi->TextMetric, prfnt->ptmw, sizeof(TEXTMETRICW)); - ptmwi->Diff.cjotma = 0; // FIXME: what is this? - ptmwi->Diff.chFirst = pifi->chFirstChar; - ptmwi->Diff.chLast = pifi->chLastChar; - ptmwi->Diff.ChDefault = pifi->chDefaultChar; - ptmwi->Diff.ChBreak = pifi->chBreakChar; + RFONT_vGetTextMetrics(prfnt, ptmwi); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -69,8 +137,37 @@ IN HDC hdc, OUT EXTTEXTMETRIC *petm) { - ASSERT(FALSE); - return FALSE; + PDC pdc; + PRFONT prfnt; + BOOL bResult = TRUE; + + /* Lock the DC */ + pdc = DC_LockDc(hdc); + if (!pdc) + { + return FALSE; + } + + /* Get pointer to RFONT */ + prfnt = DC_prfnt(pdc); + + /* Enter SEH for buffer copy */ + _SEH2_TRY + { + /* Probe and fill TMW_INTERNAL */ + ProbeForWrite(petm, sizeof(EXTTEXTMETRIC), 1); + RFONT_vGetETM(prfnt, petm); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + bResult = FALSE; + } + _SEH2_END + + /* Unlock the DC and return */ + DC_UnlockDc(pdc); + return bResult; } W32KAPI Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h [iso-8859-1] Mon May 30 22:18:44 2011 @@ -107,7 +107,7 @@ DHPDEV dhpdev; PFE * ppfe; - PFF * pPFF; + PFF * ppff; RFONTLINK rflPDEV; RFONTLINK rflPFF; PRFONT prfntSystemTT; @@ -121,7 +121,7 @@ FLONG flEUDCState; ULONG ulContent; ULONG ulTimeStamp; - ULONG uiNumLinks; + ULONG ulNumLinks; ULONG iGraphicsMode; ULONG ulOrientation; ULONG cBitsPerPel;

1 0

[tkreuzer] 52017: fix field names of TMW_INTERNAL and TMDIFF
by tkreuzer＠svn.reactos.org 30 May '11

30 May '11

Author: tkreuzer Date: Mon May 30 22:15:04 2011 New Revision: 52017 URL: http://svn.reactos.org/svn/reactos?rev=52017&view=rev Log: fix field names of TMW_INTERNAL and TMDIFF Modified: branches/GSoC_2011/GdiFontDriver/dll/win32/gdi32/objects/text.c branches/GSoC_2011/GdiFontDriver/include/reactos/win32k/ntgdityp.h Modified: branches/GSoC_2011/GdiFontDriver/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/dll/win… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/dll/win32/gdi32/objects/text.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/dll/win32/gdi32/objects/text.c [iso-8859-1] Mon May 30 22:15:04 2011 @@ -110,7 +110,7 @@ return FALSE; } - FONT_TextMetricWToA(&tmwi.TextMetric, lptm); + FONT_TextMetricWToA(&tmwi.tmw, lptm); return TRUE; } @@ -132,7 +132,7 @@ return FALSE; } - *lptm = tmwi.TextMetric; + *lptm = tmwi.tmw; return TRUE; } Modified: branches/GSoC_2011/GdiFontDriver/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/include… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/include/reactos/win32k/ntgdityp.h [iso-8859-1] Mon May 30 22:15:04 2011 @@ -332,14 +332,14 @@ ULONG cjotma; CHAR chFirst; CHAR chLast; - CHAR ChDefault; - CHAR ChBreak; + CHAR chDefault; + CHAR chBreak; } TMDIFF, *PTMDIFF; typedef struct _TMW_INTERNAL { - TEXTMETRICW TextMetric; - TMDIFF Diff; + TEXTMETRICW tmw; + TMDIFF tmdiff; } TMW_INTERNAL, *PTMW_INTERNAL; typedef struct _NTMW_INTERNAL @@ -548,7 +548,7 @@ // typedef struct _DRIVER_FUNCTIONS { - PFN_DrvEnablePDEV EnablePDEV; + PFN_DrvEnablePDEV EnablePDEV; PFN_DrvCompletePDEV CompletePDEV; PFN_DrvDisablePDEV DisablePDEV; PFN_DrvEnableSurface EnableSurface; @@ -584,10 +584,10 @@ PFN_DrvStartPage StartPage; PFN_DrvEndDoc EndDoc; PFN_DrvStartDoc StartDoc; - PVOID Unknown3; + PVOID Unknown3; PFN_DrvGetGlyphMode GetGlyphMode; PFN_DrvSynchronize Synchronize; - PVOID Unknown4; + PVOID Unknown4; PFN_DrvSaveScreenBits SaveScreenBits; PFN_DrvGetModes GetModes; PFN_DrvFree Free; @@ -641,7 +641,7 @@ PVOID Reserved9; PVOID Reserved10; PVOID Reserved11; /* 92 */ - + /* ReactOS specify */ PFN_DrvEnableDriver EnableDriver; //ReactOS Extra } DRIVER_FUNCTIONS, *PDRIVER_FUNCTIONS;

1 0

[rharabien] 52016: [USER32] - Use DISPLAY_DEVICEW instead of assuming DISPLAY_DEVICE is in unicode
by rharabien＠svn.reactos.org 30 May '11

30 May '11

Author: rharabien Date: Mon May 30 21:34:10 2011 New Revision: 52016 URL: http://svn.reactos.org/svn/reactos?rev=52016&view=rev Log: [USER32] - Use DISPLAY_DEVICEW instead of assuming DISPLAY_DEVICE is in unicode Modified: trunk/reactos/dll/win32/user32/misc/display.c Modified: trunk/reactos/dll/win32/user32/misc/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/disp… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/display.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/display.c [iso-8859-1] Mon May 30 21:34:10 2011 @@ -83,7 +83,7 @@ EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD iDevNum, - PDISPLAY_DEVICE lpDisplayDevice, + PDISPLAY_DEVICEW lpDisplayDevice, DWORD dwFlags) { UNICODE_STRING Device;

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