Ros-diffs February 2007

ros-diffs@reactos.org

16 participants
265 discussions

[fireball] 25782: 25763 was an example of how to NEVER do in ReactOS repository. Besides reverting a good implementation, it also introduced unwanted hidden changes into cmd/console.c and videoprt.h. Don't forget to make win32k_clean / user32_clean / videoprt_clean

by fireball＠svn.reactos.org

Author: fireball Date: Sun Feb 11 16:05:50 2007 New Revision: 25782 URL: http://svn.reactos.org/svn/reactos?rev=25782&view=rev Log: 25763 was an example of how to NEVER do in ReactOS repository. Besides reverting a good implementation, it also introduced unwanted hidden changes into cmd/console.c and videoprt.h. Don't forget to make win32k_clean / user32_clean / videoprt_clean Added: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c - copied unchanged from r25762, trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Modified: trunk/reactos/base/shell/cmd/console.c trunk/reactos/dll/win32/user32/user32.def trunk/reactos/dll/win32/user32/windows/input.c trunk/reactos/drivers/video/videoprt/videoprt.h trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/input.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild trunk/reactos/tools/nci/w32ksvc.db Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c (original) +++ trunk/reactos/base/shell/cmd/console.c Sun Feb 11 16:05:50 2007 @@ -241,13 +241,10 @@ INT ConPrintfPaging(BOOL NewPage, LPTSTR szFormat, va_list arg_ptr, DWORD nStdHandle) { INT len; + PTCHAR pBuf; + CONSOLE_SCREEN_BUFFER_INFO csbi; TCHAR szOut[OUTPUT_BUFFER_SIZE]; DWORD dwWritten; - CONSOLE_SCREEN_BUFFER_INFO csbi; -#ifdef _UNICODE - INT WideLen; - PCHAR pBuf; -#endif /* used to count number of lines since last pause */ static int LineCount = 0; @@ -269,7 +266,8 @@ /* rest LineCount and return if no string have been given */ if (szFormat == NULL) return 0; - + + //get the size of the visual screen that can be printed too if (!GetConsoleScreenBufferInfo(hConsole, &csbi)) { @@ -289,48 +287,37 @@ } len = _vstprintf (szOut, szFormat, arg_ptr); - - -#ifdef _UNICODE - pBuf = malloc(len + 1); -#endif + pBuf = szOut; for(i = 0; i < len; i++) { // search 'end of string' '\n' or 'end of screen line' - for(; (i < len) && (szOut[i] != _T('\n') && (CharSL<ScreenCol)) ; i++) + for(; (i < len) && (pBuf[i] != _T('\n') && (CharSL<ScreenCol)) ; i++) CharSL++; -#ifdef _UNICODE - WideLen = WideCharToMultiByte( OutputCodePage, 0, &szOut[i-CharSL], CharSL + 1, pBuf, CharSL + 1, NULL, NULL); - WriteFile (GetStdHandle (nStdHandle),pBuf,WideLen,&dwWritten,NULL); -#else - WriteFile (GetStdHandle (nStdHandle),&szOut[i-CharSL],sizeof(CHAR)*(CharSL+1),&dwWritten,NULL); -#endif - - LineCount++; + WriteFile (GetStdHandle (nStdHandle),&pBuf[i-CharSL],sizeof(CHAR)*(CharSL+1),&dwWritten,NULL); + LineCount++; + CharSL=0; if(LineCount >= ScreenLines) { - if(_tcsnicmp(&szOut[i], _T("\n"), 2)!=0) + if(_tcsnicmp(&pBuf[i], _T("\n"), 2)!=0) WriteFile (GetStdHandle (nStdHandle),_T("\n"),sizeof(CHAR),&dwWritten,NULL); if(PagePrompt() != PROMPT_YES) { - break; + return 1; } //reset the number of lines being printed LineCount = 0; + CharSL=0; } - CharSL=0; + } #ifdef _UNICODE free(pBuf); #endif - if (i < len) //!= PROMPT_YES - return 1; - return 0; } Modified: trunk/reactos/dll/win32/user32/user32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.de… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.def (original) +++ trunk/reactos/dll/win32/user32/user32.def Sun Feb 11 16:05:50 2007 @@ -1,7 +1,7 @@ LIBRARY user32.dll EXPORTS -ActivateKeyboardLayout@8 +ActivateKeyboardLayout@8=NtUserActivateKeyboardLayout@8 AdjustWindowRect@12 AdjustWindowRectEx@16 AlignRects@16 @@ -295,7 +295,7 @@ GetKeyNameTextW@12 GetKeyState@4 GetKeyboardLayout@4 -GetKeyboardLayoutList@8 +GetKeyboardLayoutList@8=NtUserGetKeyboardLayoutList@8 GetKeyboardLayoutNameA@4 GetKeyboardLayoutNameW@4 GetKeyboardState@4 Modified: trunk/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/input.c (original) +++ trunk/reactos/dll/win32/user32/windows/input.c Sun Feb 11 16:05:50 2007 @@ -44,218 +44,6 @@ static _TRACKINGLIST tracking_info; static UINT_PTR timer; static const INT iTimerInterval = 50; /* msec for timer interval */ - - -/* LOCALE FUNCTIONS **********************************************************/ - -/* - * Utility function to read a value from the registry more easily. - * - * IN PUNICODE_STRING KeyName -> Name of key to open - * IN PUNICODE_STRING ValueName -> Name of value to open - * OUT PUNICODE_STRING ReturnedValue -> String contained in registry - * - * Returns NTSTATUS - */ - -static -NTSTATUS FASTCALL -ReadRegistryValue( PUNICODE_STRING KeyName, - PUNICODE_STRING ValueName, - PUNICODE_STRING ReturnedValue ) -{ - NTSTATUS Status; - HANDLE KeyHandle; - OBJECT_ATTRIBUTES KeyAttributes; - PKEY_VALUE_PARTIAL_INFORMATION KeyValuePartialInfo; - ULONG Length = 0; - ULONG ResLength = 0; - PWCHAR ReturnBuffer; - - InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE, - NULL, NULL); - - Status = ZwOpenKey(&KeyHandle, KEY_ALL_ACCESS, &KeyAttributes); - if( !NT_SUCCESS(Status) ) - { - return Status; - } - - Status = ZwQueryValueKey(KeyHandle, ValueName, KeyValuePartialInformation, - 0, - 0, - &ResLength); - - if( Status != STATUS_BUFFER_TOO_SMALL ) - { - NtClose(KeyHandle); - return Status; - } - - ResLength += sizeof( *KeyValuePartialInfo ); - KeyValuePartialInfo = LocalAlloc(LMEM_ZEROINIT, ResLength); - Length = ResLength; - - if( !KeyValuePartialInfo ) - { - NtClose(KeyHandle); - return STATUS_NO_MEMORY; - } - - Status = ZwQueryValueKey(KeyHandle, ValueName, KeyValuePartialInformation, - (PVOID)KeyValuePartialInfo, - Length, - &ResLength); - - if( !NT_SUCCESS(Status) ) - { - NtClose(KeyHandle); - LocalFree(KeyValuePartialInfo); - return Status; - } - - /* At this point, KeyValuePartialInfo->Data contains the key data */ - ReturnBuffer = LocalAlloc(0, KeyValuePartialInfo->DataLength); - if(!ReturnBuffer) - { - NtClose(KeyHandle); - LocalFree(KeyValuePartialInfo); - return STATUS_NO_MEMORY; - } - - RtlCopyMemory(ReturnBuffer, KeyValuePartialInfo->Data, KeyValuePartialInfo->DataLength); - RtlInitUnicodeString(ReturnedValue, ReturnBuffer); - - LocalFree(KeyValuePartialInfo); - NtClose(KeyHandle); - - return Status; -} - - -static -HKL FASTCALL -IntLoadKeyboardLayout( LPCWSTR pwszKLID, - UINT Flags) -{ - HANDLE Handle; - HINSTANCE KBModule = 0; - FARPROC pAddr = 0; - DWORD offTable = 0; - HKL hKL; - NTSTATUS Status; - WCHAR LocaleBuffer[16]; - UNICODE_STRING LayoutKeyName; - UNICODE_STRING LayoutValueName; - UNICODE_STRING DefaultLocale; - UNICODE_STRING LayoutFile; - UNICODE_STRING FullLayoutPath; - LCID LocaleId; - ULONG_PTR layout; - LANGID langid; - WCHAR FullPathBuffer[MAX_PATH]; - WCHAR LayoutKeyNameBuffer[128] = L"\\REGISTRY\\Machine\\SYSTEM\\CurrentControlSet" - L"\\Control\\KeyboardLayouts\\"; - - layout = (ULONG_PTR) wcstoul(pwszKLID, NULL, 16); - -// LocaleId = GetSystemDefaultLCID(); - - LocaleId = (LCID) layout; - - /* Create the HKL to be used by NtUserLoadKeyboardLayoutEx*/ - /* - * Microsoft Office expects this value to be something specific - * for Japanese and Korean Windows with an IME the value is 0xe001 - * We should probably check to see if an IME exists and if so then - * set this word properly. - */ - langid = PRIMARYLANGID(LANGIDFROMLCID(layout)); - if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) - layout |= 0xe001 << 16; /* FIXME */ - else - layout |= layout << 16; - - DPRINT("Input = %S, DefaultLocale = %lx\n", pwszKLID, LocaleId ); - swprintf(LocaleBuffer, L"%08lx", LocaleId); - DPRINT("DefaultLocale = %S\n", LocaleBuffer); - RtlInitUnicodeString(&DefaultLocale, LocaleBuffer); - - RtlInitUnicodeString(&LayoutKeyName, LayoutKeyNameBuffer); - LayoutKeyName.MaximumLength = sizeof(LayoutKeyNameBuffer); - RtlAppendUnicodeStringToString(&LayoutKeyName, &DefaultLocale); - DPRINT("LayoutKeyName=%wZ\n", &LayoutKeyName); - RtlInitUnicodeString(&LayoutValueName, L"Layout File"); - Status = ReadRegistryValue(&LayoutKeyName,&LayoutValueName,&LayoutFile); - - if(!NT_SUCCESS(Status)) - { - DPRINT1("Failed to read registry value, %x\n", Status); - return NULL; - } - - DPRINT("Read registry and got %wZ\n", &LayoutFile); - - Status = GetSystemDirectory(FullPathBuffer, sizeof(FullPathBuffer)); - if(Status == 0 || Status > sizeof(FullPathBuffer)) - { - DPRINT1("GetSystemDirectory() failed! (%d)\n", GetLastError()); - RtlFreeUnicodeString(&LayoutFile); - return NULL; - } - - RtlInitUnicodeString(&FullLayoutPath, FullPathBuffer); - FullLayoutPath.MaximumLength = sizeof(FullPathBuffer); - if(FullLayoutPath.Length < FullLayoutPath.MaximumLength-1) - { - FullLayoutPath.Buffer[FullLayoutPath.Length/sizeof(WCHAR)] = '\\'; - FullLayoutPath.Buffer[FullLayoutPath.Length/sizeof(WCHAR)+1] = 0; - FullLayoutPath.Length+=sizeof(WCHAR); - } - Status = RtlAppendUnicodeStringToString(&FullLayoutPath, &LayoutFile); - DPRINT("Loading Keyboard DLL %wZ\n", &FullLayoutPath); - RtlFreeUnicodeString(&LayoutFile); - - if(!NT_SUCCESS(Status)) - { - DPRINT1("RtlAppendUnicodeStringToString() failed! (%x)\n", Status); - return NULL; - } - - KBModule = LoadLibraryEx(FullPathBuffer, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); - - if(!KBModule ) - { - DPRINT1( "Failed to load %wZ, lasterror = %d\n", &FullLayoutPath, GetLastError() ); - return NULL; - } - - pAddr = GetProcAddress( KBModule, (LPCSTR) 1); - offTable = (DWORD) pAddr - (DWORD) KBModule; // Weeks to figure this out! - - DPRINT( "Load Keyboard Module Offset: %x\n", offTable ); - - FreeLibrary(KBModule); - - Handle = CreateFileW( FullPathBuffer, - GENERIC_READ, - FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - 0, - NULL); - - hKL = NtUserLoadKeyboardLayoutEx( Handle, - offTable, - (HKL) layout, - &DefaultLocale, - (UINT) layout, - Flags); - - NtClose(Handle); - - return hKL; -} /* FUNCTIONS *****************************************************************/ @@ -314,18 +102,6 @@ /* - * @unimplemented - */ -HKL STDCALL -ActivateKeyboardLayout(HKL hkl, - UINT Flags) -{ - UNIMPLEMENTED; - return (HKL)0; -} - - -/* * @implemented */ BOOL STDCALL @@ -461,18 +237,6 @@ /* - * @unimplemented - */ -UINT STDCALL -GetKeyboardLayoutList(int nBuff, - HKL FAR *lpList) -{ - UNIMPLEMENTED; - return 0; -} - - -/* * @implemented */ BOOL STDCALL @@ -534,15 +298,9 @@ LoadKeyboardLayoutA(LPCSTR pwszKLID, UINT Flags) { - HKL ret; - UNICODE_STRING pwszKLIDW; - - if (pwszKLID) RtlCreateUnicodeStringFromAsciiz(&pwszKLIDW, pwszKLID); - else pwszKLIDW.Buffer = NULL; - - ret = LoadKeyboardLayoutW(pwszKLIDW.Buffer, Flags); - RtlFreeUnicodeString(&pwszKLIDW); - return ret; + return NtUserLoadKeyboardLayoutEx( + strtoul(pwszKLID, NULL, 16), + Flags); } @@ -553,7 +311,11 @@ LoadKeyboardLayoutW(LPCWSTR pwszKLID, UINT Flags) { - return IntLoadKeyboardLayout( pwszKLID, Flags); + // Look at revision 25596 to see how it's done in windows. + // We will do things our own way. + return NtUserLoadKeyboardLayoutEx( + wcstoul(pwszKLID, NULL, 16), + Flags); } Modified: trunk/reactos/drivers/video/videoprt/videoprt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.h (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.h Sun Feb 11 16:05:50 2007 @@ -34,9 +34,7 @@ #include <ndk/ntndk.h> #include <reactos/helper.h> -//#define NDEBUG -#undef NDEBUG -#define DEBUG +#define NDEBUG #include <debug.h> #define TAG_VIDEO_PORT TAG('V', 'I', 'D', 'P') Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Sun Feb 11 16:05:50 2007 @@ -299,11 +299,11 @@ NtUserAcquireOrReleaseInputOwnership( BOOLEAN Release); -DWORD +HKL NTAPI NtUserActivateKeyboardLayout( - DWORD Unknown0, - DWORD Unknown1); + HKL hKl, + ULONG Flags); DWORD NTAPI @@ -1008,11 +1008,11 @@ NtUserGetKeyboardLayout( DWORD dwThreadid); -DWORD +UINT NTAPI NtUserGetKeyboardLayoutList( - DWORD Unknown0, - DWORD Unknown1); + INT nItems, + HKL *pHklBuff); BOOL NTAPI @@ -1219,11 +1219,7 @@ HKL NTAPI NtUserLoadKeyboardLayoutEx( - HANDLE Handle, - DWORD offTable, - HKL hKL, - PUNICODE_STRING puszKLID, - UINT KLayoutLangID, + LCID LocaleId, UINT Flags); BOOL Modified: trunk/reactos/subsystems/win32/win32k/include/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/input.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/input.h Sun Feb 11 16:05:50 2007 @@ -3,19 +3,16 @@ #include <internal/kbd.h> -typedef struct _KBDRVFILE -{ - PSINGLE_LIST_ENTRY pkbdfChain; - WCHAR wcKBDF[9]; // used w GetKeyboardLayoutName same as wszKLID. - struct _KBDTABLES* KBTables; // KBDTABLES in ntoskrnl/include/internal/kbd.h -} KBDRVFILE, *PKBDRVFILE; - typedef struct _KBL { - PLIST_ENTRY pklChain; - DWORD dwKBLFlags; + LIST_ENTRY List; + DWORD Flags; + WCHAR Name[9]; // used w GetKeyboardLayoutName same as wszKLID. + struct _KBDTABLES* KBTables; // KBDTABLES in ntoskrnl/include/internal/kbd.h + HANDLE hModule; + ULONG RefCount; HKL hkl; - PKBDRVFILE pkbdf; + LCID lcid; } KBL, *PKBL; #define KBL_UNLOADED 0x20000000 @@ -27,12 +24,14 @@ InitKeyboardImpl(VOID); PUSER_MESSAGE_QUEUE W32kGetPrimitiveMessageQueue(VOID); VOID W32kUnregisterPrimitiveMessageQueue(VOID); -PKBDTABLES W32kGetDefaultKeyLayout(VOID); +PKBL W32kGetDefaultKeyLayout(VOID); VOID FASTCALL W32kKeyProcessMessage(LPMSG Msg, PKBDTABLES KeyLayout, BYTE Prefix); BOOL FASTCALL IntBlockInput(PW32THREAD W32Thread, BOOL BlockIt); BOOL FASTCALL IntMouseInput(MOUSEINPUT *mi); BOOL FASTCALL IntKeyboardInput(KEYBDINPUT *ki); +BOOL UserInitDefaultKeyboardLayout(); + #define ThreadHasInputAccess(W32Thread) \ (TRUE) Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h Sun Feb 11 16:05:50 2007 @@ -8,7 +8,7 @@ struct _USER_MESSAGE_QUEUE* MessageQueue; LIST_ENTRY WindowListHead; LIST_ENTRY W32CallbackListHead; - struct _KBDTABLES* KeyboardLayout; + struct _KBL* KeyboardLayout; struct _DESKTOP_OBJECT* Desktop; HANDLE hDesktop; DWORD MessagePumpHookValue; @@ -36,7 +36,7 @@ LIST_ENTRY PrivateFontListHead; FAST_MUTEX DriverObjListLock; LIST_ENTRY DriverObjListHead; - struct _KBDTABLES* KeyboardLayout; + struct _KBL* KeyboardLayout; ULONG Flags; LONG GDIObjects; LONG UserObjects; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c Sun Feb 11 16:05:50 2007 @@ -529,8 +529,8 @@ KernelMode, TRUE, NULL); + DPRINT( "Keyboard Input Thread Starting...\n" ); - /* * Receive and process keyboard input. */ @@ -754,7 +754,7 @@ * keyboard layout in use. */ W32kKeyProcessMessage(&msg, - ((PW32THREAD)FocusThread->Tcb.Win32Thread)->KeyboardLayout, + ((PW32THREAD)FocusThread->Tcb.Win32Thread)->KeyboardLayout->KBTables, KeyInput.Flags & KEY_E0 ? 0xE0 : (KeyInput.Flags & KEY_E1 ? 0xE1 : 0)); @@ -816,8 +816,10 @@ } /* Initialize the default keyboard layout */ - (VOID)W32kGetDefaultKeyLayout(); - + if(!UserInitDefaultKeyboardLayout()) + { + DPRINT1("Failed to initialize default keyboard layout!\n"); + } Status = PsCreateSystemThread(&MouseThreadHandle, THREAD_ALL_ACCESS, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Sun Feb 11 16:05:50 2007 @@ -33,8 +33,7 @@ #define NDEBUG #include <debug.h> -/* Directory to load key layouts from */ -#define SYSTEMROOT_DIR L"\\SystemRoot\\System32\\" + /* Lock modifiers */ #define CAPITAL_BIT 0x80000000 #define NUMLOCK_BIT 0x40000000 @@ -52,8 +51,6 @@ BYTE gQueueKeyStateTable[256]; - -PKBDRVFILE KBLList = NULL; // Keyboard layout list. /* FUNCTIONS *****************************************************************/ @@ -434,7 +431,7 @@ cchBuff, wFlags, PsGetCurrentThreadWin32Thread() ? - PsGetCurrentThreadWin32Thread()->KeyboardLayout : 0 ); + PsGetCurrentThreadWin32Thread()->KeyboardLayout->KBTables : 0 ); } return ToUnicodeResult; @@ -456,255 +453,6 @@ 0 ); } -/* - * Utility to copy and append two unicode strings. - * - * IN OUT PUNICODE_STRING ResultFirst -> First string and result - * IN PUNICODE_STRING Second -> Second string to append - * IN BOOL Deallocate -> TRUE: Deallocate First string before - * overwriting. - * - * Returns NTSTATUS. - */ - -NTSTATUS NTAPI AppendUnicodeString(PUNICODE_STRING ResultFirst, - PUNICODE_STRING Second, - BOOL Deallocate) -{ - NTSTATUS Status; - PWSTR new_string = - ExAllocatePoolWithTag(PagedPool, - (ResultFirst->Length + Second->Length + sizeof(WCHAR)), - TAG_STRING); - if( !new_string ) - { - return STATUS_NO_MEMORY; - } - memcpy( new_string, ResultFirst->Buffer, - ResultFirst->Length ); - memcpy( new_string + ResultFirst->Length / sizeof(WCHAR), - Second->Buffer, - Second->Length ); - if( Deallocate ) - RtlFreeUnicodeString(ResultFirst); - ResultFirst->Length += Second->Length; - ResultFirst->MaximumLength = ResultFirst->Length; - new_string[ResultFirst->Length / sizeof(WCHAR)] = 0; - Status = RtlCreateUnicodeString(ResultFirst,new_string) ? - STATUS_SUCCESS : STATUS_NO_MEMORY; - ExFreePool(new_string); - return Status; -} - -/* - * Utility function to read a value from the registry more easily. - * - * IN PUNICODE_STRING KeyName -> Name of key to open - * IN PUNICODE_STRING ValueName -> Name of value to open - * OUT PUNICODE_STRING ReturnedValue -> String contained in registry - * - * Returns NTSTATUS - */ - -static NTSTATUS NTAPI ReadRegistryValue( PUNICODE_STRING KeyName, - PUNICODE_STRING ValueName, - PUNICODE_STRING ReturnedValue ) -{ - NTSTATUS Status; - HANDLE KeyHandle; - OBJECT_ATTRIBUTES KeyAttributes; - PKEY_VALUE_PARTIAL_INFORMATION KeyValuePartialInfo; - ULONG Length = 0; - ULONG ResLength = 0; - UNICODE_STRING Temp; - - InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE, - NULL, NULL); - Status = ZwOpenKey(&KeyHandle, KEY_ALL_ACCESS, &KeyAttributes); - if( !NT_SUCCESS(Status) ) - { - return Status; - } - - Status = ZwQueryValueKey(KeyHandle, ValueName, KeyValuePartialInformation, - 0, - 0, - &ResLength); - - if( Status != STATUS_BUFFER_TOO_SMALL ) - { - NtClose(KeyHandle); - return Status; - } - - ResLength += sizeof( *KeyValuePartialInfo ); - KeyValuePartialInfo = - ExAllocatePoolWithTag(PagedPool, ResLength, TAG_STRING); - Length = ResLength; - - if( !KeyValuePartialInfo ) - { - NtClose(KeyHandle); - return STATUS_NO_MEMORY; - } - - Status = ZwQueryValueKey(KeyHandle, ValueName, KeyValuePartialInformation, - (PVOID)KeyValuePartialInfo, - Length, - &ResLength); - - if( !NT_SUCCESS(Status) ) - { - NtClose(KeyHandle); - ExFreePool(KeyValuePartialInfo); - return Status; - } - - Temp.Length = Temp.MaximumLength = KeyValuePartialInfo->DataLength; - Temp.Buffer = (PWCHAR)KeyValuePartialInfo->Data; - - /* At this point, KeyValuePartialInfo->Data contains the key data */ - RtlInitUnicodeString(ReturnedValue,L""); - AppendUnicodeString(ReturnedValue,&Temp,FALSE); - - ExFreePool(KeyValuePartialInfo); - NtClose(KeyHandle); - - return Status; -} - -typedef PVOID (*KbdLayerDescriptor)(VOID); -NTSTATUS STDCALL LdrGetProcedureAddress(PVOID module, - PANSI_STRING import_name, - DWORD flags, - PVOID *func_addr); - -void InitKbdLayout( PVOID *pkKeyboardLayout ) -{ - WCHAR LocaleBuffer[16]; - UNICODE_STRING LayoutKeyName; - UNICODE_STRING LayoutValueName; - UNICODE_STRING DefaultLocale; - UNICODE_STRING LayoutFile; - UNICODE_STRING FullLayoutPath; - LCID LocaleId; - PWCHAR KeyboardLayoutWSTR; - HMODULE kbModule = 0; - NTSTATUS Status; - ANSI_STRING kbdProcedureName; - KbdLayerDescriptor layerDescGetFn; - -#define XX_STATUS(x) if (!NT_SUCCESS(Status = (x))) continue; - - do - { - Status = ZwQueryDefaultLocale(FALSE, &LocaleId); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Could not get default locale (%08lx).\n", Status); - } - else - { - DPRINT("DefaultLocale = %lx\n", LocaleId); - swprintf(LocaleBuffer, L"%08lx", LocaleId); - DPRINT("DefaultLocale = %S\n", LocaleBuffer); - RtlInitUnicodeString(&DefaultLocale, LocaleBuffer); - - RtlInitUnicodeString(&LayoutKeyName, - L"\\REGISTRY\\Machine\\SYSTEM\\CurrentControlSet" - L"\\Control\\KeyboardLayouts\\"); - - AppendUnicodeString(&LayoutKeyName,&DefaultLocale,FALSE); - - RtlInitUnicodeString(&LayoutValueName,L"Layout File"); - - Status = ReadRegistryValue(&LayoutKeyName,&LayoutValueName,&LayoutFile); - - RtlFreeUnicodeString(&LayoutKeyName); - - if( !NT_SUCCESS(Status) ) - { - DPRINT1("Got default locale but not layout file. (%08lx)\n", - Status); - } - else - { - DPRINT("Read registry and got %wZ\n", &LayoutFile); - - - RtlInitUnicodeString(&FullLayoutPath,SYSTEMROOT_DIR); - AppendUnicodeString(&FullLayoutPath,&LayoutFile,FALSE); - - DPRINT("Loading Keyboard DLL %wZ\n", &FullLayoutPath); - - RtlFreeUnicodeString(&LayoutFile); - - KeyboardLayoutWSTR = - ExAllocatePoolWithTag(PagedPool, - FullLayoutPath.Length + sizeof(WCHAR), - TAG_STRING); - - if( !KeyboardLayoutWSTR ) - { - DPRINT1("Couldn't allocate a string for the keyboard layout name.\n"); - RtlFreeUnicodeString(&FullLayoutPath); - return; - } - memcpy(KeyboardLayoutWSTR,FullLayoutPath.Buffer, - FullLayoutPath.Length); - KeyboardLayoutWSTR[FullLayoutPath.Length / sizeof(WCHAR)] = 0; - - kbModule = EngLoadImage(KeyboardLayoutWSTR); - DPRINT( "Load Keyboard Layout: %S\n", KeyboardLayoutWSTR ); - - if( !kbModule ) - DPRINT1( "Load Keyboard Layout: No %wZ\n", &FullLayoutPath ); - - ExFreePool(KeyboardLayoutWSTR); - RtlFreeUnicodeString(&FullLayoutPath); - } - } - - if( !kbModule ) - { - DPRINT1("Trying to load US Keyboard Layout\n"); - kbModule = EngLoadImage(L"\\SystemRoot\\system32\\kbdus.dll"); - - if (!kbModule) - { - DPRINT1("Failed to load any Keyboard Layout\n"); - return; - } - } - - RtlInitAnsiString( &kbdProcedureName, "KbdLayerDescriptor" ); - - LdrGetProcedureAddress((PVOID)kbModule, - &kbdProcedureName, - 0, - (PVOID*)&layerDescGetFn); - - if( layerDescGetFn ) - { - *pkKeyboardLayout = layerDescGetFn(); - } - } - while (FALSE); - - if( !*pkKeyboardLayout ) - { - DPRINT1("Failed to load the keyboard layout.\n"); - } - -#undef XX_STATUS -} - -PKBDTABLES W32kGetDefaultKeyLayout(VOID) -{ - PKBDTABLES pkKeyboardLayout = 0; - InitKbdLayout( (PVOID) &pkKeyboardLayout ); - return pkKeyboardLayout; -} BOOL FASTCALL IntTranslateKbdMessage(LPMSG lpMsg, @@ -719,7 +467,7 @@ DWORD ScanCode = 0; - keyLayout = PsGetCurrentThreadWin32Thread()->KeyboardLayout; + keyLayout = PsGetCurrentThreadWin32Thread()->KeyboardLayout->KBTables; if( !keyLayout ) return FALSE; @@ -960,7 +708,7 @@ DPRINT("Enter NtUserMapVirtualKeyEx\n"); UserEnterExclusive(); - keyLayout = PsGetCurrentThreadWin32Thread() ? PsGetCurrentThreadWin32Thread()->KeyboardLayout : 0; + keyLayout = PsGetCurrentThreadWin32Thread() ? PsGetCurrentThreadWin32Thread()->KeyboardLayout->KBTables : 0; if( !keyLayout ) RETURN(0); @@ -1053,7 +801,7 @@ UserEnterShared(); keyLayout = PsGetCurrentThreadWin32Thread() ? - PsGetCurrentThreadWin32Thread()->KeyboardLayout : 0; + PsGetCurrentThreadWin32Thread()->KeyboardLayout->KBTables : 0; if( !keyLayout || nSize < 1 ) RETURN(0); @@ -1150,7 +898,7 @@ { VK_UP, VK_NUMPAD8 }, { VK_PRIOR, VK_NUMPAD9 }, { 0,0 } }; - PVSC_VK VscVkTable = NULL; + PVSC_VK VscVkTable = NULL; if( !KeyboardLayout || !Msg || (Msg->message != WM_KEYDOWN && Msg->message != WM_SYSKEYDOWN && @@ -1247,101 +995,6 @@ } -DWORD -STDCALL -NtUserGetKeyboardLayoutList( - DWORD Items, - DWORD pHklBuff) -{ - UNIMPLEMENTED - - return 0; -} - -BOOL -STDCALL -NtUserGetKeyboardLayoutName( - LPWSTR lpszName) -{ - BOOL ret = FALSE; - LCID LocaleId; - WCHAR LocaleBuffer[16]; - NTSTATUS Status; - - - UserEnterExclusive(); - - DPRINT("Enter NtUserGetKeyboardLayoutName\n"); - - Status = ZwQueryDefaultLocale(FALSE, &LocaleId); - if (NT_SUCCESS(Status)) - { - swprintf(LocaleBuffer, L"%08lx", LocaleId); - DPRINT("LocaleId : %08lx\n",LocaleId); - _SEH_TRY - { - ProbeForWrite(lpszName, 16, 1); - RtlCopyMemory(lpszName,LocaleBuffer,16); - ret = TRUE; - } - _SEH_HANDLE - { - SetLastNtError(_SEH_GetExceptionCode()); - ret = FALSE; - } - _SEH_END; - } - UserLeave(); - return ret; -} - - -HKL FASTCALL -UserGetKeyboardLayout( - DWORD dwThreadId) -{ - NTSTATUS Status; - PETHREAD Thread; - PW32THREAD W32Thread; - PKBDTABLES layout; - - if (!dwThreadId) - W32Thread = PsGetCurrentThreadWin32Thread(); - else - { - Status = PsLookupThreadByThreadId((HANDLE)dwThreadId, &Thread);//fixme: deref thread - if(!NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return 0; - } - W32Thread = Thread->Tcb.Win32Thread; /* Wrong, but returning the pointer to - the table. */ - } - layout = W32Thread->KeyboardLayout; - if(!layout) - return 0; - return (HKL)layout; -} - - -HKL -STDCALL -NtUserGetKeyboardLayout( - DWORD dwThreadId) -{ - DECLARE_RETURN(HKL); - - UserEnterShared(); - DPRINT("Enter NtUserGetKeyboardLayout\n"); - - RETURN( UserGetKeyboardLayout(dwThreadId)); - -CLEANUP: - DPRINT("Leave NtUserGetKeyboardLayout, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} DWORD FASTCALL @@ -1360,22 +1013,6 @@ DPRINT1("Unknown type!\n"); return 0; /* The book says 0 here, so 0 */ } -} - - -HKL -STDCALL -NtUserLoadKeyboardLayoutEx( - IN HANDLE Handle, - IN DWORD offTable, - IN HKL hKL, - IN PUNICODE_STRING puszKLID, - IN UINT KLayoutLangID, - IN UINT Flags) -{ - UNIMPLEMENTED - - return 0; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Sun Feb 11 16:05:50 2007 @@ -12,17 +12,6 @@ #define NDEBUG #include <debug.h> - -DWORD -STDCALL -NtUserActivateKeyboardLayout( - DWORD Unknown0, - DWORD Unknown1) -{ - UNIMPLEMENTED - - return 0; -} DWORD STDCALL @@ -637,6 +626,7 @@ return 0; } + DWORD STDCALL NtUserUpdateInputContext( Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild Sun Feb 11 16:05:50 2007 @@ -120,6 +120,7 @@ <file>hotkey.c</file> <file>input.c</file> <file>keyboard.c</file> + <file>kbdlayout.c</file> <file>menu.c</file> <file>message.c</file> <file>metric.c</file> Modified: trunk/reactos/tools/nci/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/w32ksvc.db?rev=2… ============================================================================== --- trunk/reactos/tools/nci/w32ksvc.db (original) +++ trunk/reactos/tools/nci/w32ksvc.db Sun Feb 11 16:05:50 2007 @@ -428,7 +428,7 @@ NtUserIsClipboardFormatAvailable 1 NtUserKillSystemTimer 2 NtUserKillTimer 2 -NtUserLoadKeyboardLayoutEx 6 +NtUserLoadKeyboardLayoutEx 2 NtUserLockWindowStation 1 NtUserLockWindowUpdate 1 NtUserLockWorkStation 0

17 years, 10 months

[spetreolle] 25781: move from branch

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun Feb 11 14:21:14 2007 New Revision: 25781 URL: http://svn.reactos.org/svn/reactos?rev=25781&view=rev Log: move from branch Added: trunk/reactos/regtests/winetests/usp10/ - copied from r25780, branches/ros-branch-0_3_1/reactos/regtests/winetests/usp10/ Removed: branches/ros-branch-0_3_1/reactos/regtests/winetests/usp10/

17 years, 10 months

[spetreolle] 25780: delete empty dir

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun Feb 11 14:17:27 2007 New Revision: 25780 URL: http://svn.reactos.org/svn/reactos?rev=25780&view=rev Log: delete empty dir Removed: trunk/reactos/regtests/winetests/usp10/

17 years, 10 months

[greatlrd] 25779: adding winetest from the vendor drop for usp10.dll

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Feb 11 13:44:31 2007 New Revision: 25779 URL: http://svn.reactos.org/svn/reactos?rev=25779&view=rev Log: adding winetest from the vendor drop for usp10.dll Added: branches/ros-branch-0_3_1/reactos/regtests/winetests/usp10/testlist.c branches/ros-branch-0_3_1/reactos/regtests/winetests/usp10/usp10.c branches/ros-branch-0_3_1/reactos/regtests/winetests/usp10/usp10.rbuild Modified: trunk/reactos/regtests/winetests/directory.rbuild Added: branches/ros-branch-0_3_1/reactos/regtests/winetests/usp10/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/regtes… ============================================================================== --- branches/ros-branch-0_3_1/reactos/regtests/winetests/usp10/testlist.c (added) +++ branches/ros-branch-0_3_1/reactos/regtests/winetests/usp10/testlist.c Sun Feb 11 13:44:31 2007 @@ -1,0 +1,14 @@ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +#define STANDALONE +#include "wine/test.h" + +extern void func_usp10(void); + + +const struct test winetest_testlist[] = +{ + { "usp10", func_usp10 }, + { 0, 0 } +}; Added: branches/ros-branch-0_3_1/reactos/regtests/winetests/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/regtes… ============================================================================== --- branches/ros-branch-0_3_1/reactos/regtests/winetests/usp10/usp10.c (added) +++ branches/ros-branch-0_3_1/reactos/regtests/winetests/usp10/usp10.c Sun Feb 11 13:44:31 2007 @@ -1,0 +1,1252 @@ +/* + * Tests for usp10 dll + * + * Copyright 2006 Jeff Latimer + * Copyright 2006 Hans Leidekker + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + * Notes: + * Uniscribe allows for processing of complex scripts such as joining + * and filtering characters and bi-directional text with custom line breaks. + */ + +//#include <assert.h> +//#include <stdio.h> +//#include <windows.h> +//#include <wine/test.h> +//#include <winbase.h> +//#include <wingdi.h> +//#include <winuser.h> +//#include <winerror.h> +//#include <winnls.h> +//#include <usp10.h> + +#include <stdio.h> +#include <windows.h> +#include "usp10.h" +#include "wine/test.h" +#include "wine/windef.h" + +BOOL WINAPI ShowWindow(HWND,int); + +static void test_ScriptItemIzeShapePlace(HDC hdc, unsigned short pwOutGlyphs[256]) +{ + HRESULT hr; + int iMaxProps; + const SCRIPT_PROPERTIES **ppSp; + + int cInChars; + int cMaxItems; + SCRIPT_ITEM pItem[255]; + int pcItems; + WCHAR TestItem1[] = {'T', 'e', 's', 't', 'a', 0}; + WCHAR TestItem2[] = {'T', 'e', 's', 't', 'b', 0}; + WCHAR TestItem3[] = {'T', 'e', 's', 't', 'c',' ','1','2','3',' ',' ','e','n','d',0}; + WCHAR TestItem4[] = {'T', 'e', 's', 't', 'c',' ',0x0684,0x0694,0x06a4,' ',' ','e','n','d',0}; + WCHAR TestItem5[] = {0x0684,'T','e','s','t','c',' ',0x0684,0x0694,0x06a4,' ',' ','e','n','d',0}; + + SCRIPT_CACHE psc; + int cChars; + int cMaxGlyphs; + unsigned short pwOutGlyphs1[256]; + unsigned short pwOutGlyphs2[256]; + unsigned short pwLogClust[256]; + SCRIPT_VISATTR psva[256]; + int pcGlyphs; + int piAdvance[256]; + GOFFSET pGoffset[256]; + ABC pABC[256]; + int cnt; + + /* Start testing usp10 functions */ + /* This test determines that the pointer returned by ScriptGetProperties is valid + * by checking a known value in the table */ + hr = ScriptGetProperties(&ppSp, &iMaxProps); + trace("number of script properties %d\n", iMaxProps); + ok (iMaxProps > 0, "Number of scripts returned should not be 0\n"); + if (iMaxProps > 0) + ok( ppSp[5]->langid == 9, "Langid[5] not = to 9\n"); /* Check a known value to ensure */ + /* ptrs work */ + + + /* This set of tests are to check that the various edits in ScriptIemize work */ + cInChars = 5; /* Length of test without NULL */ + cMaxItems = 1; /* Check threshold value */ + hr = ScriptItemize(TestItem1, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); + ok (hr == E_INVALIDARG, "ScriptItemize should return E_INVALIDARG if cMaxItems < 2. Was %d\n", + cMaxItems); + cInChars = 5; + cMaxItems = 255; + hr = ScriptItemize(NULL, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); + ok (hr == E_INVALIDARG, "ScriptItemize should return E_INVALIDARG if pwcInChars is NULL\n"); + + cInChars = 5; + cMaxItems = 255; + hr = ScriptItemize(TestItem1, 0, cMaxItems, NULL, NULL, pItem, &pcItems); + ok (hr == E_INVALIDARG, "ScriptItemize should return E_INVALIDARG if cInChars is 0\n"); + + cInChars = 5; + cMaxItems = 255; + hr = ScriptItemize(TestItem1, cInChars, cMaxItems, NULL, NULL, NULL, &pcItems); + ok (hr == E_INVALIDARG, "ScriptItemize should return E_INVALIDARG if pItems is NULL\n"); + + /* This is a valid test that will cause parsing to take place */ + cInChars = 5; + cMaxItems = 255; + hr = ScriptItemize(TestItem1, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); + ok (hr == 0, "ScriptItemize should return 0, returned %08x\n", hr); + /* This test is for the interim operation of ScriptItemize where only one SCRIPT_ITEM is * + * returned. */ + ok (pcItems > 0, "The number of SCRIPT_ITEMS should be greater than 0\n"); + if (pcItems > 0) + ok (pItem[0].iCharPos == 0 && pItem[1].iCharPos == cInChars, + "Start pos not = 0 (%d) or end pos not = %d (%d)\n", + pItem[0].iCharPos, cInChars, pItem[1].iCharPos); + + /* It would appear that we have a valid SCRIPT_ANALYSIS and can continue + * ie. ScriptItemize has succeeded and that pItem has been set */ + cInChars = 5; + cMaxItems = 255; + if (hr == 0) { + psc = NULL; /* must be null on first call */ + cChars = cInChars; + cMaxGlyphs = cInChars; + hr = ScriptShape(NULL, &psc, TestItem1, cChars, + cMaxGlyphs, &pItem[0].a, + pwOutGlyphs1, pwLogClust, psva, &pcGlyphs); + ok (hr == E_PENDING, "If psc is NULL (%08x) the E_PENDING should be returned\n", hr); + cMaxGlyphs = 4; + hr = ScriptShape(hdc, &psc, TestItem1, cChars, + cMaxGlyphs, &pItem[0].a, + pwOutGlyphs1, pwLogClust, psva, &pcGlyphs); + ok (hr == E_OUTOFMEMORY, "If not enough output area cChars (%d) is > than CMaxGlyphs " + "(%d) but not E_OUTOFMEMORY\n", + cChars, cMaxGlyphs); + cMaxGlyphs = 256; + hr = ScriptShape(hdc, &psc, TestItem1, cChars, + cMaxGlyphs, &pItem[0].a, + pwOutGlyphs1, pwLogClust, psva, &pcGlyphs); + ok (hr == 0, "ScriptShape should return 0 not (%08x)\n", hr); + ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); + ok (pcGlyphs == cChars, "Chars in (%d) should equal Glyphs out (%d)\n", cChars, pcGlyphs); + if (hr ==0) { + hr = ScriptPlace(hdc, &psc, pwOutGlyphs1, pcGlyphs, psva, &pItem[0].a, piAdvance, + pGoffset, pABC); + ok (hr == 0, "ScriptPlace should return 0 not (%08x)\n", hr); + hr = ScriptPlace(NULL, &psc, pwOutGlyphs1, pcGlyphs, psva, &pItem[0].a, piAdvance, + pGoffset, pABC); + ok (hr == 0, "ScriptPlace should return 0 not (%08x)\n", hr); + for (cnt=0; cnt < pcGlyphs; cnt++) + pwOutGlyphs[cnt] = pwOutGlyphs1[cnt]; /* Send to next function */ + } + + /* This test will check to make sure that SCRIPT_CACHE is reused and that not translation * + * takes place if fNoGlyphIndex is set. */ + + cInChars = 5; + cMaxItems = 255; + hr = ScriptItemize(TestItem2, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); + ok (hr == 0, "ScriptItemize should return 0, returned %08x\n", hr); + /* This test is for the intertrim operation of ScriptItemize where only one SCRIPT_ITEM is * + * returned. */ + ok (pItem[0].iCharPos == 0 && pItem[1].iCharPos == cInChars, + "Start pos not = 0 (%d) or end pos not = %d (%d)\n", + pItem[0].iCharPos, cInChars, pItem[1].iCharPos); + /* It would appear that we have a valid SCRIPT_ANALYSIS and can continue */ + if (hr == 0) { + cChars = cInChars; + cMaxGlyphs = 256; + pItem[0].a.fNoGlyphIndex = 1; /* say no translate */ + hr = ScriptShape(NULL, &psc, TestItem2, cChars, + cMaxGlyphs, &pItem[0].a, + pwOutGlyphs2, pwLogClust, psva, &pcGlyphs); + ok (hr != E_PENDING, "If psc should not be NULL (%08x) and the E_PENDING should be returned\n", hr); + ok (hr == 0, "ScriptShape should return 0 not (%08x)\n", hr); + ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); + ok (pcGlyphs == cChars, "Chars in (%d) should equal Glyphs out (%d)\n", cChars, pcGlyphs); + for (cnt=0; cnt < cChars && TestItem2[cnt] == pwOutGlyphs2[cnt]; cnt++) {} + ok (cnt == cChars, "Translation to place when told not to. WCHAR %d - %04x != %04x\n", + cnt, TestItem2[cnt], pwOutGlyphs2[cnt]); + if (hr ==0) { + hr = ScriptPlace(hdc, &psc, pwOutGlyphs2, pcGlyphs, psva, &pItem[0].a, piAdvance, + pGoffset, pABC); + ok (hr == 0, "ScriptPlace should return 0 not (%08x)\n", hr); + } + } + hr = ScriptFreeCache( &psc); + ok (!psc, "psc is not null after ScriptFreeCache\n"); + + } + + /* This is a valid test that will cause parsing to take place and create 3 script_items */ + cInChars = (sizeof(TestItem3)/2)-1; + cMaxItems = 255; + hr = ScriptItemize(TestItem3, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); + ok (hr == 0, "ScriptItemize should return 0, returned %08x\n", hr); + if (hr == 0) + { + ok (pcItems == 3, "The number of SCRIPT_ITEMS should be 3 not %d\n", pcItems); + if (pcItems > 2) + { + ok (pItem[0].iCharPos == 0 && pItem[1].iCharPos == 6, + "Start pos [0] not = 0 (%d) or end pos [1] not = %d\n", + pItem[0].iCharPos, pItem[1].iCharPos); + ok (pItem[1].iCharPos == 6 && pItem[2].iCharPos == 11, + "Start pos [1] not = 6 (%d) or end pos [2] not = 11 (%d)\n", + pItem[1].iCharPos, pItem[2].iCharPos); + ok (pItem[2].iCharPos == 11 && pItem[3].iCharPos == cInChars, + "Start pos [2] not = 11 (%d) or end [3] pos not = 14 (%d), cInChars = %d\n", + pItem[2].iCharPos, pItem[3].iCharPos, cInChars); + } + hr = ScriptFreeCache( &psc); + ok (!psc, "psc is not null after ScriptFreeCache\n"); + } + + /* This is a valid test that will cause parsing to take place and create 3 script_items */ + cInChars = (sizeof(TestItem4)/2)-1; + cMaxItems = 255; + hr = ScriptItemize(TestItem4, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); + ok (hr == 0, "ScriptItemize should return 0, returned %08x\n", hr); + if (hr == 0) + { + ok (pcItems == 3, "The number of SCRIPT_ITEMS should be 3 not %d\n", pcItems); + if (pcItems > 2) + { + ok (pItem[0].iCharPos == 0 && pItem[1].iCharPos == 6, + "Start pos [0] not = 0 (%d) or end pos [1] not = %d\n", + pItem[0].iCharPos, pItem[1].iCharPos); + ok (pItem[1].iCharPos == 6 && pItem[2].iCharPos == 11, + "Start pos [1] not = 6 (%d) or end pos [2] not = 11 (%d)\n", + pItem[1].iCharPos, pItem[2].iCharPos); + ok (pItem[2].iCharPos == 11 && pItem[3].iCharPos == cInChars, + "Start pos [2] not = 11 (%d) or end [3] pos not = 14 (%d), cInChars = %d\n", + pItem[2].iCharPos, pItem[3].iCharPos, cInChars); + } + hr = ScriptFreeCache( &psc); + ok (!psc, "psc is not null after ScriptFreeCache\n"); + } + + /* + * This test is for when the first unicode character requires bidi support + */ + cInChars = (sizeof(TestItem5)-1)/sizeof(WCHAR); + hr = ScriptItemize(TestItem5, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); + ok (hr == 0, "ScriptItemize should return 0, returned %08x\n", hr); + ok (pcItems == 4, "There should have been 4 items, found %d\n", pcItems); + ok (pItem[0].a.s.uBidiLevel == 1, "The first character should have been bidi=1 not %d\n", + pItem[0].a.s.uBidiLevel); +} + +static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256]) +{ + HRESULT hr; + SCRIPT_CACHE psc = NULL; + int cInChars; + int cChars; + unsigned short pwOutGlyphs3[256]; + WCHAR TestItem1[] = {'T', 'e', 's', 't', 'a', 0}; + DWORD dwFlags; + int cnt; + + /* Check to make sure that SCRIPT_CACHE gets allocated ok */ + dwFlags = 0; + cInChars = cChars = 5; + /* Some sanity checks for ScriptGetCMap */ + + hr = ScriptGetCMap(NULL, NULL, NULL, 0, 0, NULL); + ok( hr == E_INVALIDARG, "(NULL,NULL,NULL,0,0,NULL), " + "expected E_INVALIDARG, got %08x\n", hr); + + hr = ScriptGetCMap(NULL, NULL, TestItem1, cInChars, dwFlags, pwOutGlyphs3); + ok( hr == E_INVALIDARG, "(NULL,NULL,TestItem1, cInChars, dwFlags, pwOutGlyphs3), " + "expected E_INVALIDARG, got %08x\n", hr); + + /* Set psc to NULL, to be able to check if a pointer is returned in psc */ + psc = NULL; + hr = ScriptGetCMap(NULL, &psc, NULL, 0, 0, NULL); + ok( hr == E_PENDING, "(NULL,&psc,NULL,0,0NULL), expected E_PENDING, " + "got %08x\n", hr); + ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); + + /* Set psc to NULL but add hdc, to be able to check if a pointer is returned in psc */ + psc = NULL; + hr = ScriptGetCMap(hdc, &psc, NULL, 0, 0, NULL); + ok( hr == S_OK, "ScriptGetCMap(NULL,&psc,NULL,0,0,NULL), expected S_OK, " + "got %08x\n", hr); + ok( psc != NULL, "ScritpGetCMap expected psc to be not NULL\n"); + + /* Set psc to NULL, to be able to check if a pointer is returned in psc */ + psc = NULL; + hr = ScriptGetCMap(NULL, &psc, TestItem1, cInChars, dwFlags, pwOutGlyphs3); + ok( hr == E_PENDING, "(NULL,&psc,), expected E_PENDING, got %08x\n", hr); + ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); + /* Check to see if the results are the same as those returned by ScriptShape */ + hr = ScriptGetCMap(hdc, &psc, TestItem1, cInChars, dwFlags, pwOutGlyphs3); + ok (hr == 0, "ScriptGetCMap should return 0 not (%08x)\n", hr); + ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); + for (cnt=0; cnt < cChars && pwOutGlyphs[cnt] == pwOutGlyphs3[cnt]; cnt++) {} + ok (cnt == cInChars, "Translation not correct. WCHAR %d - %04x != %04x\n", + cnt, pwOutGlyphs[cnt], pwOutGlyphs3[cnt]); + + hr = ScriptFreeCache( &psc); + ok (!psc, "psc is not null after ScriptFreeCache\n"); + +} + +static void test_ScriptGetFontProperties(HDC hdc) +{ + HRESULT hr; + SCRIPT_CACHE psc,old_psc; + SCRIPT_FONTPROPERTIES sfp; + + /* Some sanity checks for ScriptGetFontProperties */ + + hr = ScriptGetFontProperties(NULL,NULL,NULL); + ok( hr == E_INVALIDARG, "(NULL,NULL,NULL), expected E_INVALIDARG, got %08x\n", hr); + + hr = ScriptGetFontProperties(NULL,NULL,&sfp); + ok( hr == E_INVALIDARG, "(NULL,NULL,&sfp), expected E_INVALIDARG, got %08x\n", hr); + + /* Set psc to NULL, to be able to check if a pointer is returned in psc */ + psc = NULL; + hr = ScriptGetFontProperties(NULL,&psc,NULL); + ok( hr == E_INVALIDARG, "(NULL,&psc,NULL), expected E_INVALIDARG, got %08x\n", hr); + ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); + + /* Set psc to NULL, to be able to check if a pointer is returned in psc */ + psc = NULL; + hr = ScriptGetFontProperties(NULL,&psc,&sfp); + ok( hr == E_PENDING, "(NULL,&psc,&sfp), expected E_PENDING, got %08x\n", hr); + ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); + + hr = ScriptGetFontProperties(hdc,NULL,NULL); + ok( hr == E_INVALIDARG, "(hdc,NULL,NULL), expected E_INVALIDARG, got %08x\n", hr); + + hr = ScriptGetFontProperties(hdc,NULL,&sfp); + ok( hr == E_INVALIDARG, "(hdc,NULL,&sfp), expected E_INVALIDARG, got %08x\n", hr); + + /* Set psc to NULL, to be able to check if a pointer is returned in psc */ + psc = NULL; + hr = ScriptGetFontProperties(hdc,&psc,NULL); + ok( hr == E_INVALIDARG, "(hdc,&psc,NULL), expected E_INVALIDARG, got %08x\n", hr); + ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); + + /* Pass an uninitialized sfp */ + psc = NULL; + hr = ScriptGetFontProperties(hdc,&psc,&sfp); + ok( hr == E_INVALIDARG, "(hdc,&psc,&sfp) partly uninitialized, expected E_INVALIDARG, got %08x\n", hr); + ok( psc != NULL, "Expected a pointer in psc, got NULL\n"); + ScriptFreeCache(&psc); + ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); + + /* Give it the correct cBytes, we don't care about what's coming back */ + sfp.cBytes = sizeof(SCRIPT_FONTPROPERTIES); + psc = NULL; + hr = ScriptGetFontProperties(hdc,&psc,&sfp); + ok( hr == S_OK, "(hdc,&psc,&sfp) partly initialized, expected S_OK, got %08x\n", hr); + ok( psc != NULL, "Expected a pointer in psc, got NULL\n"); + + /* Save the psc pointer */ + old_psc = psc; + /* Now a NULL hdc again */ + hr = ScriptGetFontProperties(NULL,&psc,&sfp); + ok( hr == S_OK, "(NULL,&psc,&sfp), expected S_OK, got %08x\n", hr); + ok( psc == old_psc, "Expected psc not to be changed, was %p is now %p\n", old_psc, psc); + ScriptFreeCache(&psc); + ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); +} + +static void test_ScriptTextOut(HDC hdc) +{ + HRESULT hr; + + int cInChars; + int cMaxItems; + SCRIPT_ITEM pItem[255]; + int pcItems; + WCHAR TestItem1[] = {'T', 'e', 's', 't', 'a', 0}; + + SCRIPT_CACHE psc; + int cChars; + int cMaxGlyphs; + unsigned short pwOutGlyphs1[256]; + WORD pwLogClust[256]; + SCRIPT_VISATTR psva[256]; + int pcGlyphs; + int piAdvance[256]; + GOFFSET pGoffset[256]; + ABC pABC[256]; + RECT rect; + int piX; + int iCP = 1; + BOOL fTrailing = FALSE; + SCRIPT_LOGATTR *psla; + SCRIPT_LOGATTR sla[256]; + + /* This is a valid test that will cause parsing to take place */ + cInChars = 5; + cMaxItems = 255; + hr = ScriptItemize(TestItem1, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); + ok (hr == 0, "ScriptItemize should return 0, returned %08x\n", hr); + /* This test is for the interim operation of ScriptItemize where only one SCRIPT_ITEM is * + * returned. */ + ok (pcItems > 0, "The number of SCRIPT_ITEMS should be greater than 0\n"); + if (pcItems > 0) + ok (pItem[0].iCharPos == 0 && pItem[1].iCharPos == cInChars, + "Start pos not = 0 (%d) or end pos not = %d (%d)\n", + pItem[0].iCharPos, cInChars, pItem[1].iCharPos); + + /* It would appear that we have a valid SCRIPT_ANALYSIS and can continue + * ie. ScriptItemize has succeeded and that pItem has been set */ + cInChars = 5; + cMaxItems = 255; + if (hr == 0) { + psc = NULL; /* must be null on first call */ + cChars = cInChars; + cMaxGlyphs = cInChars; + cMaxGlyphs = 256; + hr = ScriptShape(hdc, &psc, TestItem1, cChars, + cMaxGlyphs, &pItem[0].a, + pwOutGlyphs1, pwLogClust, psva, &pcGlyphs); + ok (hr == 0, "ScriptShape should return 0 not (%08x)\n", hr); + ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); + ok (pcGlyphs == cChars, "Chars in (%d) should equal Glyphs out (%d)\n", cChars, pcGlyphs); + if (hr ==0) { + /* Note hdc is needed as glyph info is not yet in psc */ + hr = ScriptPlace(hdc, &psc, pwOutGlyphs1, pcGlyphs, psva, &pItem[0].a, piAdvance, + pGoffset, pABC); + ok (hr == 0, "Should return 0 not (%08x)\n", hr); + ScriptFreeCache(&psc); /* Get rid of psc for next test set */ + ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); + + hr = ScriptTextOut(NULL, NULL, 0, 0, 0, NULL, NULL, NULL, 0, NULL, 0, NULL, NULL, NULL); + ok (hr == E_INVALIDARG, "Should return 0 not (%08x)\n", hr); + + hr = ScriptTextOut(NULL, NULL, 0, 0, 0, NULL, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, + piAdvance, NULL, pGoffset); + ok( hr == E_INVALIDARG, "(NULL,NULL,TestItem1, cInChars, dwFlags, pwOutGlyphs3), " + "expected E_INVALIDARG, got %08x\n", hr); + + /* Set psc to NULL, to be able to check if a pointer is returned in psc */ + psc = NULL; + hr = ScriptTextOut(NULL, &psc, 0, 0, 0, NULL, NULL, NULL, 0, NULL, 0, + NULL, NULL, NULL); + ok( hr == E_INVALIDARG, "(NULL,&psc,NULL,0,0,0,NULL,), expected E_INVALIDARG, " + "got %08x\n", hr); + ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); + + /* Set psc to NULL, to be able to check if a pointer is returned in psc + * hdc is required for this one rather than the usual optional */ + psc = NULL; + hr = ScriptTextOut(NULL, &psc, 0, 0, 0, NULL, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, + piAdvance, NULL, pGoffset); + ok( hr == E_INVALIDARG, "(NULL,&psc,), expected E_INVALIDARG, got %08x\n", hr); + ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); + + /* Set that is gets a psc and that returns 0 status */ + hr = ScriptTextOut(hdc, &psc, 0, 0, 0, NULL, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, + piAdvance, NULL, pGoffset); + ok (hr == 0, "ScriptTextOut should return 0 not (%08x)\n", hr); + ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); + + /* Test Rect Rgn is acceptable */ + rect.top = 10; + rect.bottom = 20; + rect.left = 10; + rect.right = 40; + hr = ScriptTextOut(hdc, &psc, 0, 0, 0, &rect, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, + piAdvance, NULL, pGoffset); + ok (hr == 0, "ScriptTextOut should return 0 not (%08x)\n", hr); + ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); + + iCP = 1; + hr = ScriptCPtoX(iCP, fTrailing, cChars, pcGlyphs, (const WORD *) &pwLogClust, + (const SCRIPT_VISATTR *) &psva, (const int *)&piAdvance, &pItem[0].a, &piX); + ok(hr == S_OK, "ScriptCPtoX Stub should return S_OK not %08x\n", hr); + + psla = (SCRIPT_LOGATTR *)&sla; + hr = ScriptBreak(TestItem1, cChars, &pItem[0].a, psla); + ok(hr == S_OK, "ScriptBreak Stub should return S_OK not %08x\n", hr); + + /* Clean up and go */ + ScriptFreeCache(&psc); + ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); + } + } +} + +static void test_ScriptXtoX(void) +/**************************************************************************************** + * This routine tests the ScriptXtoCP and ScriptCPtoX functions using static variables * + ****************************************************************************************/ +{ + int iX, iCP; + int cChars; + int cGlyphs; + WORD pwLogClust[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; + SCRIPT_VISATTR psva[10]; + int piAdvance[10] = {200, 190, 210, 180, 170, 204, 189, 195, 212, 203}; + SCRIPT_ANALYSIS psa; + int piCP, piX; + int piTrailing; + BOOL fTrailing; + HRESULT hr; + + iX = -1; + cChars = 10; + cGlyphs = 10; + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); + ok(piCP == -1, "Negative iX should return piCP=-1 not %d\n", piCP); + ok(piTrailing == TRUE, "Negative iX should return piTrailing=TRUE not %d\n", piTrailing); + iX = 1954; + cChars = 10; + cGlyphs = 10; + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); + ok(piCP == 10, "Excessive iX should return piCP=10 not %d\n", piCP); + ok(piTrailing == FALSE, "Excessive iX should return piTrailing=FALSE not %d\n", piTrailing); + iX = 779; + cChars = 10; + cGlyphs = 10; + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); + ok(piCP == 3, "iX=%d should return piCP=3 not %d\n", iX, piCP); + ok(piTrailing == 1, "iX=%d should return piTrailing=1 not %d\n", iX, piTrailing); + iX = 780; + cChars = 10; + cGlyphs = 10; + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); + ok(piCP == 3, "iX=%d should return piCP=3 not %d\n", iX, piCP); + ok(piTrailing == 1, "iX=%d should return piTrailing=1 not %d\n", iX, piTrailing); + iX = 868; + cChars = 10; + cGlyphs = 10; + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); + ok(piCP == 4, "iX=%d should return piCP=4 not %d\n", iX, piCP); + + iX = 0; + cChars = 10; + cGlyphs = 10; + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); + ok(piCP == 0, "iX=%d should return piCP=0 not %d\n", iX, piCP); + iX = 195; + cChars = 10; + cGlyphs = 10; + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); + ok(piCP == 0, "iX=%d should return piCP=0 not %d\n", iX, piCP); + iX = 196; + cChars = 10; + cGlyphs = 10; + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); + ok(piCP == 1, "iX=%d should return piCP=1 not %d\n", iX, piCP); + + iCP=5; + fTrailing = FALSE; + cChars = 10; + cGlyphs = 10; + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piX); + ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); + ok(piX == 976, "iCP=%d should return piX=976 not %d\n", iCP, piX); + iCP=5; + fTrailing = TRUE; + cChars = 10; + cGlyphs = 10; + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piX); + ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); + ok(piX == 1171, "iCP=%d should return piX=1171 not %d\n", iCP, piX); + iCP=6; + fTrailing = FALSE; + cChars = 10; + cGlyphs = 10; + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piX); + ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); + ok(piX == 1171, "iCP=%d should return piX=1171 not %d\n", iCP, piX); + iCP=11; + fTrailing = FALSE; + cChars = 10; + cGlyphs = 10; + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piX); + ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); + ok(piX == 1953, "iCP=%d should return piX=1953 not %d\n", iCP, piX); + iCP=11; + fTrailing = TRUE; + cChars = 10; + cGlyphs = 10; + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piX); + ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); + ok(piX == 1953, "iCP=%d should return piX=1953 not %d\n", iCP, piX); + +} + +static void test_ScriptString(HDC hdc) +{ +/******************************************************************************************* + * + * This set of tests are for the string functions of uniscribe. The ScriptStringAnalyse + * function allocates memory pointed to by the SCRIPT_STRING_ANALYSIS ssa pointer. This + * memory if freed by ScriptStringFree. There needs to be a valid hdc for this as + * ScriptStringAnalyse calls ScriptSItemize, ScriptShape and ScriptPlace which require it. + * + */ + + HRESULT hr; + WCHAR teststr[] = {'T','e','s','t','1',' ','a','2','b','3', '\0'}; + int len = (sizeof(teststr) / sizeof(WCHAR)) - 1; + int Glyphs = len * 2 + 16; + int Charset; + DWORD Flags = SSA_GLYPHS; + int ReqWidth = 100; + SCRIPT_CONTROL Control; + SCRIPT_STATE State; + const int Dx[5] = {10, 10, 10, 10, 10}; + SCRIPT_TABDEF Tabdef; + const BYTE InClass = 0; + SCRIPT_STRING_ANALYSIS ssa = NULL; + + int X = 10; + int Y = 100; + UINT Options = 0; + const RECT rc = {0, 50, 100, 100}; + int MinSel = 0; + int MaxSel = 0; + BOOL Disabled = FALSE; + const int *clip_len; + UINT *order, i; + + + Charset = -1; /* this flag indicates unicode input */ + /* Test without hdc to get E_PENDING */ + hr = ScriptStringAnalyse( NULL, teststr, len, Glyphs, Charset, Flags, + ReqWidth, &Control, &State, Dx, &Tabdef, + &InClass, &ssa); + ok(hr == E_PENDING, "ScriptStringAnalyse Stub should return E_PENDING not %08x\n", hr); + + /* test with hdc, this should be a valid test */ + hr = ScriptStringAnalyse( hdc, teststr, len, Glyphs, Charset, Flags, + ReqWidth, &Control, &State, Dx, &Tabdef, + &InClass, &ssa); + ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr); + + /* test makes sure that a call with a valid pssa still works */ + hr = ScriptStringAnalyse( hdc, teststr, len, Glyphs, Charset, Flags, + ReqWidth, &Control, &State, Dx, &Tabdef, + &InClass, &ssa); + ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr); + ok(ssa != NULL, "ScriptStringAnalyse pssa should not be NULL\n"); + + if (hr == S_OK) + { + hr = ScriptStringOut(ssa, X, Y, Options, &rc, MinSel, MaxSel, Disabled); + ok(hr == S_OK, "ScriptStringOut should return S_OK not %08x\n", hr); + } + + clip_len = ScriptString_pcOutChars(ssa); + ok(*clip_len == len, "ScriptString_pcOutChars failed, got %d, expected %d\n", *clip_len, len); + + order = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *clip_len * sizeof(UINT)); + hr = ScriptStringGetOrder(ssa, order); + ok(hr == S_OK, "ScriptStringGetOrder failed, got %08x, expected S_OK\n", hr); + + for (i = 0; i < *clip_len; i++) ok(order[i] == i, "%d: got %d expected %d\n", i, order[i], i); + HeapFree(GetProcessHeap(), 0, order); + + hr = ScriptStringFree(&ssa); + ok(hr == S_OK, "ScriptStringFree should return S_OK not %08x\n", hr); +} + +static void test_ScriptStringXtoCP_CPtoX(HDC hdc) +{ +/***************************************************************************************** + * + * This test is for the ScriptStringXtoCP and ScriptStringXtoCP functions. Due to the + * nature of the fonts between Windows and Wine, the test is implemented by generating + * values using one one function then checking the output of the second. In this way + * the validity of the functions is established using Windows as a base and confirming + * similar behaviour in wine. + */ + + HRESULT hr; + WCHAR teststr1[] = {'T', 'e', 's', 't', 'e', '1', '2', ' ', 'a', '\0'}; + void *String = (WCHAR *) &teststr1; /* ScriptStringAnalysis needs void */ + int String_len = (sizeof(teststr1)/sizeof(WCHAR))-1; + int Glyphs = String_len * 2 + 16; /* size of buffer as recommended */ + int Charset = -1; /* unicode */ + DWORD Flags = SSA_GLYPHS; + int ReqWidth = 100; + SCRIPT_CONTROL Control; + SCRIPT_STATE State; + SCRIPT_TABDEF Tabdef; + const BYTE InClass = 0; + SCRIPT_STRING_ANALYSIS ssa = NULL; + + int Ch; /* Character position in string */ + int iTrailing; + int Cp; /* Character position in string */ + int X; + BOOL fTrailing; + + /* Test with hdc, this should be a valid test + * Here we generrate an SCRIPT_STRING_ANALYSIS that will be used as input to the + * following character positions to X and X to character position functions. + */ + hr = ScriptStringAnalyse( hdc, String, String_len, Glyphs, Charset, Flags, + ReqWidth, &Control, &State, NULL, &Tabdef, + &InClass, &ssa); + ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr); + ok(ssa != NULL, "ScriptStringAnalyse ssa should not be NULL\n"); + if (hr == 0) + { + /* + * Loop to generate character positions to provide starting positions for the + * ScriptStringCPtoX and ScriptStringXtoCP functions + */ + for (Cp = 0; Cp < String_len; Cp++) + { + /* The fTrailing flag is used to indicate whether the X being returned is at + * the beginning or the end of the character. What happens here is that if + * fTrailing indicates the end of the character, ie. FALSE, then ScriptStringXtoCP + * returns the beginning of the next character and iTrailing is FALSE. So for this + * loop iTrailing will be FALSE in both cases. + */ + fTrailing = FALSE; + hr = ScriptStringCPtoX(ssa, Cp, fTrailing, &X); + ok(hr == S_OK, "ScriptStringCPtoX should return S_OK not %08x\n", hr); + hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); + ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); + ok(Cp == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp, Ch, X); + ok(iTrailing == FALSE, "ScriptStringXtoCP should return iTrailing = 0 not %d for X = %d\n", + iTrailing, X); + fTrailing = TRUE; + hr = ScriptStringCPtoX(ssa, Cp, fTrailing, &X); + ok(hr == S_OK, "ScriptStringCPtoX should return S_OK not %08x\n", hr); + hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); + ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); + + /* + * Check that character position returned by ScriptStringXtoCP in Ch matches the + * one input to ScriptStringCPtoX. This means that the Cp to X position and back + * again works + */ + ok(Cp + 1 == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp + 1, Ch, X); + ok(iTrailing == FALSE, "ScriptStringXtoCP should return iTrailing = 0 not %d for X = %d\n", + iTrailing, X); + } + /* + * This test is to check that if the X position is just inside the trailing edge of the + * character then iTrailing will indicate the trailing edge, ie. TRUE + */ + fTrailing = TRUE; + Cp = 3; + hr = ScriptStringCPtoX(ssa, Cp, fTrailing, &X); + ok(hr == S_OK, "ScriptStringCPtoX should return S_OK not %08x\n", hr); + X--; /* put X just inside the trailing edge */ + hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); + ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); + ok(Cp == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp, Ch, X); + ok(iTrailing == TRUE, "ScriptStringXtoCP should return iTrailing = 1 not %d for X = %d\n", + iTrailing, X); + + /* + * This test is to check that if the X position is just outside the trailing edge of the + * character then iTrailing will indicate the leading edge, ie. FALSE, and Ch will indicate + * the next character, ie. Cp + 1 + */ + fTrailing = TRUE; + Cp = 3; + hr = ScriptStringCPtoX(ssa, Cp, fTrailing, &X); + ok(hr == S_OK, "ScriptStringCPtoX should return S_OK not %08x\n", hr); + X++; /* put X just outside the trailing edge */ + hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); + ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); + ok(Cp + 1 == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp + 1, Ch, X); + ok(iTrailing == FALSE, "ScriptStringXtoCP should return iTrailing = 0 not %d for X = %d\n", + iTrailing, X); + + /* + * This test is to check that if the X position is just outside the leading edge of the + * character then iTrailing will indicate the trailing edge, ie. TRUE, and Ch will indicate + * the next character down , ie. Cp - 1 + */ + fTrailing = FALSE; + Cp = 3; + hr = ScriptStringCPtoX(ssa, Cp, fTrailing, &X); + ok(hr == S_OK, "ScriptStringCPtoX should return S_OK not %08x\n", hr); + X--; /* put X just outside the leading edge */ + hr = ScriptStringXtoCP(ssa, X, &Ch, &iTrailing); + ok(hr == S_OK, "ScriptStringXtoCP should return S_OK not %08x\n", hr); + ok(Cp - 1 == Ch, "ScriptStringXtoCP should return Ch = %d not %d for X = %d\n", Cp - 1, Ch, X); + ok(iTrailing == TRUE, "ScriptStringXtoCP should return iTrailing = 1 not %d for X = %d\n", + iTrailing, X); + + /* + * Cleanup the the SSA for the next round of tests + */ + hr = ScriptStringFree(&ssa); + ok(hr == S_OK, "ScriptStringFree should return S_OK not %08x\n", hr); + + /* + * Test to see that exceeding the number of chars returns E_INVALIDARG. First + * generate an SSA for the subsequent tests. + */ + hr = ScriptStringAnalyse( hdc, String, String_len, Glyphs, Charset, Flags, + ReqWidth, &Control, &State, NULL, &Tabdef, + &InClass, &ssa); + ok(hr == S_OK, "ScriptStringAnalyse should return S_OK not %08x\n", hr); + + /* + * When ScriptStringCPtoX is called with a character position Cp that exceeds the + * string length, return E_INVALIDARG. This also invalidates the ssa so a + * ScriptStringFree should also fail. + */ + fTrailing = FALSE; + Cp = String_len + 1; + hr = ScriptStringCPtoX(ssa, Cp, fTrailing, &X); + ok(hr == E_INVALIDARG, "ScriptStringCPtoX should return E_INVALIDARG not %08x\n", hr); + + hr = ScriptStringFree(&ssa); + /* + * ScriptStringCPtoX should free ssa, hence ScriptStringFree should fail + */ + ok(hr == E_INVALIDARG, "ScriptStringFree should return E_INVALIDARG not %08x\n", hr); + } +} + +static void test_ScriptCacheGetHeight(HDC hdc) +{ + HRESULT hr; + SCRIPT_CACHE sc = NULL; + LONG height; + + hr = ScriptCacheGetHeight(NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); + + hr = ScriptCacheGetHeight(NULL, &sc, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); + + hr = ScriptCacheGetHeight(NULL, &sc, &height); + ok(hr == E_PENDING, "expected E_PENDING, got 0x%08x\n", hr); + + height = 0; + + hr = ScriptCacheGetHeight(hdc, &sc, &height); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + + ok(height > 0, "expected height > 0\n"); +} + +static void test_ScriptGetGlyphABCWidth(HDC hdc) +{ + HRESULT hr; + SCRIPT_CACHE sc = NULL; + ABC abc; + + hr = ScriptGetGlyphABCWidth(NULL, NULL, 'a', NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); + + hr = ScriptGetGlyphABCWidth(NULL, &sc, 'a', NULL); + ok(hr == E_PENDING, "expected E_PENDING, got 0x%08x\n", hr); + + if (0) { /* crashes on WinXP */ + hr = ScriptGetGlyphABCWidth(hdc, &sc, 'a', NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); + } + + hr = ScriptGetGlyphABCWidth(hdc, &sc, 'a', &abc); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); +} + +static void test_ScriptLayout(void) +{ + HRESULT hr; + static const BYTE levels[][5] = + { + { 0, 0, 0, 0, 0 }, + { 1, 1, 1, 1, 1 }, + { 2, 2, 2, 2, 2 }, + { 3, 3, 3, 3, 3 }, + }; + static const int expect[][5] = + { + { 0, 1, 2, 3, 4 }, + { 4, 3, 2, 1, 0 }, + { 0, 1, 2, 3, 4 }, + { 4, 3, 2, 1, 0 } + }; + int i, j, vistolog[sizeof(levels[0])], logtovis[sizeof(levels[0])]; + + hr = ScriptLayout(sizeof(levels[0]), NULL, vistolog, logtovis); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); + + hr = ScriptLayout(sizeof(levels[0]), levels[0], NULL, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); + + for (i = 0; i < sizeof(levels)/sizeof(levels[0]); i++) + { + hr = ScriptLayout(sizeof(levels[0]), levels[i], vistolog, logtovis); + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + + for (j = 0; j < sizeof(levels[i]); j++) + { + ok(expect[i][j] == vistolog[j], + "failure: levels[%d][%d] = %d, vistolog[%d] = %d\n", + i, j, levels[i][j], j, vistolog[j] ); + } + + for (j = 0; j < sizeof(levels[i]); j++) + { + ok(expect[i][j] == logtovis[j], + "failure: levels[%d][%d] = %d, logtovis[%d] = %d\n", + i, j, levels[i][j], j, logtovis[j] ); + } + } +} + +static const struct +{ + LGRPID group; + LCID lcid; + SCRIPT_DIGITSUBSTITUTE sds; + DWORD uDefaultLanguage; + DWORD fContextDigits; + WORD fDigitSubstitute; +} +subst_data[] = +{ + { 0x01, 0x00403, { 9, 3, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x00406, { 9, 6, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x00407, { 9, 7, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x00409, { 9, 9, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0040a, { 9, 10, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0040b, { 9, 11, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0040c, { 9, 12, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0040f, { 9, 15, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x00410, { 9, 16, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x00413, { 9, 19, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x00414, { 9, 20, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x00416, { 9, 22, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0041d, { 9, 29, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x00421, { 9, 33, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0042d, { 9, 45, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x00432, { 9, 50, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x00434, { 9, 52, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x00435, { 9, 53, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x00436, { 9, 54, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x00438, { 9, 56, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0043a, { 9, 58, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0043b, { 9, 59, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0043e, { 9, 62, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x00441, { 9, 65, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x00452, { 9, 82, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x00456, { 9, 86, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0046b, { 9, 107, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0046c, { 9, 108, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x00481, { 9, 129, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x00807, { 9, 7, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x00809, { 9, 9, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0080a, { 9, 10, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0080c, { 9, 12, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x00810, { 9, 16, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x00813, { 9, 19, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x00814, { 9, 20, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x00816, { 9, 22, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0081d, { 9, 29, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0083b, { 9, 59, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0083e, { 9, 62, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0086b, { 9, 107, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x00c07, { 9, 7, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x00c09, { 9, 9, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x00c0a, { 9, 10, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x00c0c, { 9, 12, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x00c3b, { 9, 59, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x00c6b, { 9, 107, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x01007, { 9, 7, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x01009, { 9, 9, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0100a, { 9, 10, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0100c, { 9, 12, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0103b, { 9, 59, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x01407, { 9, 7, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x01409, { 9, 9, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0140a, { 9, 10, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0140c, { 9, 12, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0143b, { 9, 59, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x01809, { 9, 9, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0180a, { 9, 10, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0180c, { 9, 12, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0183b, { 9, 59, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x01c09, { 9, 9, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x01c0a, { 9, 10, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x01c3b, { 9, 59, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x02009, { 9, 9, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0200a, { 9, 10, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0203b, { 9, 59, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x02409, { 9, 9, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0240a, { 9, 10, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0243b, { 9, 59, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x02809, { 9, 9, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0280a, { 9, 10, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x02c09, { 9, 9, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x02c0a, { 9, 10, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x03009, { 9, 9, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0300a, { 9, 10, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x03409, { 9, 9, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0340a, { 9, 10, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0380a, { 9, 10, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x03c0a, { 9, 10, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0400a, { 9, 10, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0440a, { 9, 10, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0480a, { 9, 10, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x04c0a, { 9, 10, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x0500a, { 9, 10, 1, 0 }, 9, 0, 0 }, + { 0x01, 0x10407, { 9, 7, 1, 0 }, 9, 0, 0 }, + { 0x02, 0x00405, { 9, 5, 1, 0 }, 9, 0, 0 }, + { 0x02, 0x0040e, { 9, 14, 1, 0 }, 9, 0, 0 }, + { 0x02, 0x00415, { 9, 21, 1, 0 }, 9, 0, 0 }, + { 0x02, 0x00418, { 9, 24, 1, 0 }, 9, 0, 0 }, + { 0x02, 0x0041a, { 9, 26, 1, 0 }, 9, 0, 0 }, + { 0x02, 0x0041b, { 9, 27, 1, 0 }, 9, 0, 0 }, + { 0x02, 0x0041c, { 9, 28, 1, 0 }, 9, 0, 0 }, + { 0x02, 0x00424, { 9, 36, 1, 0 }, 9, 0, 0 }, + { 0x02, 0x0081a, { 9, 26, 1, 0 }, 9, 0, 0 }, + { 0x02, 0x0101a, { 9, 26, 1, 0 }, 9, 0, 0 }, + { 0x02, 0x0141a, { 9, 26, 1, 0 }, 9, 0, 0 }, + { 0x02, 0x0181a, { 9, 26, 1, 0 }, 9, 0, 0 }, + { 0x02, 0x1040e, { 9, 14, 1, 0 }, 9, 0, 0 }, + { 0x03, 0x00425, { 9, 37, 1, 0 }, 9, 0, 0 }, + { 0x03, 0x00426, { 9, 38, 1, 0 }, 9, 0, 0 }, + { 0x03, 0x00427, { 9, 39, 1, 0 }, 9, 0, 0 }, + { 0x04, 0x00408, { 9, 8, 1, 0 }, 9, 0, 0 }, + { 0x05, 0x00402, { 9, 2, 1, 0 }, 9, 0, 0 }, + { 0x05, 0x00419, { 9, 25, 1, 0 }, 9, 0, 0 }, + { 0x05, 0x00422, { 9, 34, 1, 0 }, 9, 0, 0 }, + { 0x05, 0x00423, { 9, 35, 1, 0 }, 9, 0, 0 }, + { 0x05, 0x0042f, { 9, 47, 1, 0 }, 9, 0, 0 }, + { 0x05, 0x0043f, { 9, 63, 1, 0 }, 9, 0, 0 }, + { 0x05, 0x00440, { 9, 64, 1, 0 }, 9, 0, 0 }, + { 0x05, 0x00444, { 9, 68, 1, 0 }, 9, 0, 0 }, + { 0x05, 0x00450, { 9, 80, 1, 0 }, 9, 0, 0 }, + { 0x05, 0x0082c, { 9, 44, 1, 0 }, 9, 0, 0 }, + { 0x05, 0x00843, { 9, 67, 1, 0 }, 9, 0, 0 }, + { 0x05, 0x00c1a, { 9, 26, 1, 0 }, 9, 0, 0 }, + { 0x05, 0x01c1a, { 9, 26, 1, 0 }, 9, 0, 0 }, + { 0x06, 0x0041f, { 9, 31, 1, 0 }, 9, 0, 0 }, + { 0x06, 0x0042c, { 9, 44, 1, 0 }, 9, 0, 0 }, + { 0x06, 0x00443, { 9, 67, 1, 0 }, 9, 0, 0 }, + { 0x07, 0x00411, { 9, 17, 1, 0 }, 9, 0, 0 }, + { 0x08, 0x00412, { 9, 18, 1, 0 }, 9, 0, 0 }, + { 0x09, 0x00404, { 9, 4, 1, 0 }, 9, 0, 0 }, + { 0x09, 0x00c04, { 9, 4, 1, 0 }, 9, 0, 0 }, + { 0x09, 0x01404, { 9, 4, 1, 0 }, 9, 0, 0 }, + { 0x09, 0x21404, { 9, 4, 1, 0 }, 9, 0, 0 }, + { 0x09, 0x30404, { 9, 4, 1, 0 }, 9, 0, 0 }, + { 0x0a, 0x00804, { 9, 4, 1, 0 }, 9, 0, 0 }, + { 0x0a, 0x01004, { 9, 4, 1, 0 }, 9, 0, 0 }, + { 0x0a, 0x20804, { 9, 4, 1, 0 }, 9, 0, 0 }, + { 0x0a, 0x21004, { 9, 4, 1, 0 }, 9, 0, 0 }, + { 0x0b, 0x0041e, { 9, 30, 1, 0 }, 9, 0, 0 }, + { 0x0c, 0x0040d, { 9, 13, 1, 0 }, 9, 0, 0 }, + { 0x0d, 0x00401, { 1, 1, 0, 0 }, 9, 0, 0 }, + { 0x0d, 0x00420, { 9, 32, 1, 0 }, 9, 0, 0 }, + { 0x0d, 0x00429, { 41, 41, 0, 0 }, 9, 0, 0 }, + { 0x0d, 0x0045a, { 9, 90, 1, 0 }, 9, 0, 0 }, + { 0x0d, 0x00465, { 9, 101, 1, 0 }, 9, 0, 0 }, + { 0x0d, 0x00801, { 1, 1, 0, 0 }, 9, 0, 0 }, + { 0x0d, 0x00c01, { 1, 1, 0, 0 }, 9, 0, 0 }, + { 0x0d, 0x01001, { 1, 1, 0, 0 }, 9, 0, 0 }, + { 0x0d, 0x01401, { 1, 1, 0, 0 }, 9, 0, 0 }, + { 0x0d, 0x01801, { 1, 1, 0, 0 }, 9, 0, 0 }, + { 0x0d, 0x01c01, { 1, 1, 0, 0 }, 9, 0, 0 }, + { 0x0d, 0x02001, { 1, 1, 0, 0 }, 9, 0, 0 }, + { 0x0d, 0x02401, { 1, 1, 0, 0 }, 9, 0, 0 }, + { 0x0d, 0x02801, { 1, 1, 0, 0 }, 9, 0, 0 }, + { 0x0d, 0x02c01, { 1, 1, 0, 0 }, 9, 0, 0 }, + { 0x0d, 0x03001, { 1, 1, 0, 0 }, 9, 0, 0 }, + { 0x0d, 0x03401, { 1, 1, 0, 0 }, 9, 0, 0 }, + { 0x0d, 0x03801, { 1, 1, 0, 0 }, 9, 0, 0 }, + { 0x0d, 0x03c01, { 1, 1, 0, 0 }, 9, 0, 0 }, + { 0x0d, 0x04001, { 1, 1, 0, 0 }, 9, 0, 0 }, + { 0x0e, 0x0042a, { 9, 42, 1, 0 }, 9, 0, 0 }, + { 0x0f, 0x00439, { 9, 57, 1, 0 }, 9, 0, 0 }, + { 0x0f, 0x00446, { 9, 70, 1, 0 }, 9, 0, 0 }, + { 0x0f, 0x00447, { 9, 71, 1, 0 }, 9, 0, 0 }, + { 0x0f, 0x00449, { 9, 73, 1, 0 }, 9, 0, 0 }, + { 0x0f, 0x0044a, { 9, 74, 1, 0 }, 9, 0, 0 }, + { 0x0f, 0x0044b, { 9, 75, 1, 0 }, 9, 0, 0 }, + { 0x0f, 0x0044e, { 9, 78, 1, 0 }, 9, 0, 0 }, + { 0x0f, 0x0044f, { 9, 79, 1, 0 }, 9, 0, 0 }, + { 0x0f, 0x00457, { 9, 87, 1, 0 }, 9, 0, 0 }, + { 0x10, 0x00437, { 9, 55, 1, 0 }, 9, 0, 0 }, + { 0x10, 0x10437, { 9, 55, 1, 0 }, 9, 0, 0 }, + { 0x11, 0x0042b, { 9, 43, 1, 0 }, 9, 0, 0 } +}; + +static BOOL CALLBACK enum_proc(LGRPID group, LCID lcid, LPSTR locale, LONG_PTR lparam) +{ + HRESULT hr; + SCRIPT_DIGITSUBSTITUTE sds; + SCRIPT_CONTROL sc; + SCRIPT_STATE ss; + LCID lcid_old; + unsigned int i; + + if (!IsValidLocale(lcid, LCID_INSTALLED)) return TRUE; + + memset(&sds, 0, sizeof(sds)); + memset(&sc, 0, sizeof(sc)); + memset(&ss, 0, sizeof(ss)); + + lcid_old = GetThreadLocale(); + if (!SetThreadLocale(lcid)) return TRUE; + + hr = ScriptRecordDigitSubstitution(lcid, &sds); + ok(hr == S_OK, "ScriptRecordDigitSubstitution failed: 0x%08x\n", hr); + + hr = ScriptApplyDigitSubstitution(&sds, &sc, &ss); + ok(hr == S_OK, "ScriptApplyDigitSubstitution failed: 0x%08x\n", hr); + + for (i = 0; i < sizeof(subst_data)/sizeof(subst_data[0]); i++) + { + if (group == subst_data[i].group && lcid == subst_data[i].lcid) + { + ok(!memcmp(&sds, &subst_data[i].sds, sizeof(sds)), + "substitution data does not match\n"); + + ok(sc.uDefaultLanguage == subst_data[i].uDefaultLanguage, + "sc.uDefaultLanguage does not match\n"); + ok(sc.fContextDigits == subst_data[i].fContextDigits, + "sc.fContextDigits does not match\n"); + ok(ss.fDigitSubstitute == subst_data[i].fDigitSubstitute, + "ss.fDigitSubstitute does not match\n"); + } + } + SetThreadLocale(lcid_old); + return TRUE; +} + +static void test_digit_substitution(void) +{ + BOOL ret; + unsigned int i; + static const LGRPID groups[] = + { + LGRPID_WESTERN_EUROPE, + LGRPID_CENTRAL_EUROPE, + LGRPID_BALTIC, + LGRPID_GREEK, + LGRPID_CYRILLIC, + LGRPID_TURKISH, + LGRPID_JAPANESE, + LGRPID_KOREAN, + LGRPID_TRADITIONAL_CHINESE, + LGRPID_SIMPLIFIED_CHINESE, + LGRPID_THAI, + LGRPID_HEBREW, + LGRPID_ARABIC, + LGRPID_VIETNAMESE, + LGRPID_INDIC, + LGRPID_GEORGIAN, + LGRPID_ARMENIAN + }; + HMODULE hKernel32; + static BOOL (WINAPI * pEnumLanguageGroupLocalesA)(LANGGROUPLOCALE_ENUMPROC,LGRPID,DWORD,LONG_PTR); + + hKernel32 = GetModuleHandleA("kernel32.dll"); + pEnumLanguageGroupLocalesA = (void*)GetProcAddress(hKernel32, "EnumLanguageGroupLocalesA"); + + if (!pEnumLanguageGroupLocalesA) + { + trace("EnumLanguageGroupLocalesA not available on this platform\n"); + return; + } + + for (i = 0; i < sizeof(groups)/sizeof(groups[0]); i++) + { + ret = pEnumLanguageGroupLocalesA(enum_proc, groups[i], 0, 0); + ok(ret, "EnumLanguageGroupLocalesA failed unexpectedly: %u\n", GetLastError()); + } +} + +static void test_ScriptGetProperties(void) +{ + const SCRIPT_PROPERTIES **props; + HRESULT hr; + int num; + + hr = ScriptGetProperties(NULL, NULL); + ok(hr == E_INVALIDARG, "ScriptGetProperties succeeded\n"); + + hr = ScriptGetProperties(NULL, &num); + ok(hr == S_OK, "ScriptGetProperties failed: 0x%08x\n", hr); + + hr = ScriptGetProperties(&props, NULL); + ok(hr == S_OK, "ScriptGetProperties failed: 0x%08x\n", hr); + + hr = ScriptGetProperties(&props, &num); + ok(hr == S_OK, "ScriptGetProperties failed: 0x%08x\n", hr); +} + +START_TEST(usp10) +{ + HWND hwnd; + HDC hdc; + LOGFONTA lf; + HFONT hfont; + + unsigned short pwOutGlyphs[256]; + + /* We need a valid HDC to drive a lot of Script functions which requires the following * + * to set up for the tests. */ + hwnd = CreateWindowExA(0, "static", "", WS_POPUP, 0,0,100,100, + 0, 0, 0, NULL); + // FIXME do wine assert + //assert(hwnd != 0); + ShowWindow(hwnd, SW_SHOW); + UpdateWindow(hwnd); + + hdc = GetDC(hwnd); /* We now have a hdc */ + ok( hdc != NULL, "HDC failed to be created %p\n", hdc); + + memset(&lf, 0, sizeof(HFONT)); + lstrcpyA(lf.lfFaceName, "Symbol"); + lf.lfHeight = 10; + lf.lfWeight = 3; + lf.lfWidth = 10; + + hfont = SelectObject(hdc, CreateFontIndirectA(&lf)); + + test_ScriptItemIzeShapePlace(hdc,pwOutGlyphs); + test_ScriptGetCMap(hdc, pwOutGlyphs); + test_ScriptCacheGetHeight(hdc); + test_ScriptGetGlyphABCWidth(hdc); + + test_ScriptGetFontProperties(hdc); + test_ScriptTextOut(hdc); + test_ScriptXtoX(); + test_ScriptString(hdc); + test_ScriptStringXtoCP_CPtoX(hdc); + + test_ScriptLayout(); + test_digit_substitution(); + test_ScriptGetProperties(); + + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); +} Added: branches/ros-branch-0_3_1/reactos/regtests/winetests/usp10/usp10.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/regtes… ============================================================================== --- branches/ros-branch-0_3_1/reactos/regtests/winetests/usp10/usp10.rbuild (added) +++ branches/ros-branch-0_3_1/reactos/regtests/winetests/usp10/usp10.rbuild Sun Feb 11 13:44:31 2007 @@ -1,0 +1,11 @@ +<module name="usp10_winetest" type="win32cui" installbase="bin" installname="usp10_winetest.exe" allowwarnings="true"> + <include base="usp10_winetest">.</include> + <define name="__USE_W32API" /> + <library>ntdll</library> + <library>gdi32</library> + <library>kernel32</library> + <library>user32</library> + <library>usp10</library> + <file>usp10.c</file> + <file>testlist.c</file> +</module> Modified: trunk/reactos/regtests/winetests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/regtests/winetests/directo… ============================================================================== --- trunk/reactos/regtests/winetests/directory.rbuild (original) +++ trunk/reactos/regtests/winetests/directory.rbuild Sun Feb 11 13:44:31 2007 @@ -47,6 +47,9 @@ <directory name="user32"> <xi:include href="user32/user32.rbuild" /> </directory> +<directory name="usp10"> + <xi:include href="usp10/usp10.rbuild" /> +</directory> <directory name="version"> <xi:include href="version/version.rbuild" /> </directory>

17 years, 10 months

[greatlrd] 25778: sorry I forget the rbuild for the usp10 it self :(

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Feb 11 13:37:59 2007 New Revision: 25778 URL: http://svn.reactos.org/svn/reactos?rev=25778&view=rev Log: sorry I forget the rbuild for the usp10 it self :( Added: trunk/reactos/dll/win32/usp10/usp10.rbuild (with props) trunk/reactos/dll/win32/usp10/usp10_ros.diff (with props) Added: trunk/reactos/dll/win32/usp10/usp10.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.rbui… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.rbuild (added) +++ trunk/reactos/dll/win32/usp10/usp10.rbuild Sun Feb 11 13:37:59 2007 @@ -1,0 +1,20 @@ +<module name="usp10" type="win32dll" entrypoint="0" installbase="system32" installname="usp10.dll" allowwarnings ="true" stdlib="host"> + <importlibrary definition="usp10.spec.def" /> + <include base="usp10">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <file>usp10.c</file> + <file>usp10.spec</file> +</module> Propchange: trunk/reactos/dll/win32/usp10/usp10.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/usp10/usp10_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10_ros.… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10_ros.diff (added) +++ trunk/reactos/dll/win32/usp10/usp10_ros.diff Sun Feb 11 13:37:59 2007 @@ -1,0 +1,22 @@ +Index: usp10.c +=================================================================== +--- usp10.c (revision 25776) ++++ usp10.c (working copy) +@@ -35,6 +35,8 @@ + #include "wine/debug.h" + #include "wine/unicode.h" + ++DWORD STDCALL GetGlyphIndicesW( HDC hdc, LPCWSTR lpstr, int c, LPWORD pgi, DWORD fl); ++BOOL STDCALL GetCharABCWidthsI(HDC hdc, UINT giFirst, UINT cgi, LPWORD pgi, LPABC lpabc); + /** + * some documentation here: + * http://www.microsoft.com/typography/developers/uniscribe/uniscribe.htm +@@ -1241,7 +1243,7 @@ + TRACE("\n"); + + if (!psa->fNoGlyphIndex) { /* Glyph translate */ +- if (!(GetGlyphIndicesW(get_cache_hdc(psc), pwcChars, cChars, pwOutGlyphs, 0))) ++ if (!(GetGlyphIndicesW((HDC)get_cache_hdc(psc), (LPCWSTR) pwcChars, (int)cChars, (LPWORD) pwOutGlyphs,(DWORD) 0))) + return S_FALSE; + + TRACE("After: "); Propchange: trunk/reactos/dll/win32/usp10/usp10_ros.diff ------------------------------------------------------------------------------ svn:eol-style = native

17 years, 10 months

[greatlrd] 25777: adding usp10 to the building system. and small diff file as well. thuse change should not have been need it, maybe some whant take a look at them in the diff file and found 100% proper fix.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Feb 11 13:35:19 2007 New Revision: 25777 URL: http://svn.reactos.org/svn/reactos?rev=25777&view=rev Log: adding usp10 to the building system. and small diff file as well. thuse change should not have been need it, maybe some whant take a look at them in the diff file and found 100% proper fix. Removed: trunk/reactos/dll/win32/usp10/.cvsignore trunk/reactos/dll/win32/usp10/CVS/ trunk/reactos/dll/win32/usp10/Makefile.in trunk/reactos/dll/win32/usp10/tests/ Modified: trunk/reactos/dll/win32/usp10/usp10.c trunk/reactos/dll/win32/win32.rbuild Removed: trunk/reactos/dll/win32/usp10/.cvsignore URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/.cvsignore… ============================================================================== --- trunk/reactos/dll/win32/usp10/.cvsignore (original) +++ trunk/reactos/dll/win32/usp10/.cvsignore (removed) @@ -1,2 +1,0 @@ -Makefile -libusp10.def Removed: trunk/reactos/dll/win32/usp10/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/Makefile.i… ============================================================================== --- trunk/reactos/dll/win32/usp10/Makefile.in (original) +++ trunk/reactos/dll/win32/usp10/Makefile.in (removed) @@ -1,14 +1,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = usp10.dll -IMPORTLIB = libusp10.$(IMPLIBEXT) -IMPORTS = gdi32 kernel32 - -C_SRCS = \ - usp10.c - -@MAKE_DLL_RULES@ - -@DEPENDENCIES@ # everything below this line is overwritten by make depend Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.c (original) +++ trunk/reactos/dll/win32/usp10/usp10.c Sun Feb 11 13:35:19 2007 @@ -35,6 +35,8 @@ #include "wine/debug.h" #include "wine/unicode.h" +DWORD STDCALL GetGlyphIndicesW( HDC hdc, LPCWSTR lpstr, int c, LPWORD pgi, DWORD fl); +BOOL STDCALL GetCharABCWidthsI(HDC hdc, UINT giFirst, UINT cgi, LPWORD pgi, LPABC lpabc); /** * some documentation here: * http://www.microsoft.com/typography/developers/uniscribe/uniscribe.htm @@ -1241,7 +1243,7 @@ TRACE("\n"); if (!psa->fNoGlyphIndex) { /* Glyph translate */ - if (!(GetGlyphIndicesW(get_cache_hdc(psc), pwcChars, cChars, pwOutGlyphs, 0))) + if (!(GetGlyphIndicesW((HDC)get_cache_hdc(psc), (LPCWSTR) pwcChars, (int)cChars, (LPWORD) pwOutGlyphs,(DWORD) 0))) return S_FALSE; TRACE("After: "); Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Sun Feb 11 13:35:19 2007 @@ -247,6 +247,9 @@ <directory name="userenv"> <xi:include href="userenv/userenv.rbuild" /> </directory> +<directory name="usp10"> + <xi:include href="usp10/usp10.rbuild" /> +</directory> <directory name="uxtheme"> <xi:include href="uxtheme/uxtheme.rbuild" /> </directory>

17 years, 10 months

[greatlrd] 25776: Copied remotely

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Feb 11 13:22:39 2007 New Revision: 25776 URL: http://svn.reactos.org/svn/reactos?rev=25776&view=rev Log: Copied remotely Added: trunk/reactos/dll/win32/usp10/ - copied from r25775, vendor/wine/dlls/usp10/current/

17 years, 10 months

[greatlrd] 25775: Removed file/folder from wrong vendor drop I did

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Feb 11 13:20:06 2007 New Revision: 25775 URL: http://svn.reactos.org/svn/reactos?rev=25775&view=rev Log: Removed file/folder from wrong vendor drop I did Removed: vendor/wine/dlls/tests/

17 years, 10 months

[greatlrd] 25774: vendor drop of usp10 from wine cvs 11/02-2007

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Feb 11 13:19:04 2007 New Revision: 25774 URL: http://svn.reactos.org/svn/reactos?rev=25774&view=rev Log: vendor drop of usp10 from wine cvs 11/02-2007 Added: vendor/wine/dlls/usp10/ vendor/wine/dlls/usp10/current/ vendor/wine/dlls/usp10/current/.cvsignore vendor/wine/dlls/usp10/current/CVS/ vendor/wine/dlls/usp10/current/CVS/Entries vendor/wine/dlls/usp10/current/CVS/Entries.Extra vendor/wine/dlls/usp10/current/CVS/Entries.Extra.Old vendor/wine/dlls/usp10/current/CVS/Entries.Old vendor/wine/dlls/usp10/current/CVS/Repository vendor/wine/dlls/usp10/current/CVS/Root vendor/wine/dlls/usp10/current/CVS/Template vendor/wine/dlls/usp10/current/Makefile.in vendor/wine/dlls/usp10/current/tests/ vendor/wine/dlls/usp10/current/tests/.cvsignore vendor/wine/dlls/usp10/current/tests/CVS/ vendor/wine/dlls/usp10/current/tests/CVS/Entries vendor/wine/dlls/usp10/current/tests/CVS/Entries.Extra vendor/wine/dlls/usp10/current/tests/CVS/Entries.Extra.Old vendor/wine/dlls/usp10/current/tests/CVS/Entries.Old vendor/wine/dlls/usp10/current/tests/CVS/Repository vendor/wine/dlls/usp10/current/tests/CVS/Root vendor/wine/dlls/usp10/current/tests/CVS/Template vendor/wine/dlls/usp10/current/tests/Makefile.in vendor/wine/dlls/usp10/current/tests/usp10.c vendor/wine/dlls/usp10/current/usp10.c vendor/wine/dlls/usp10/current/usp10.spec [This mail would be too long, it was shortened to contain the URLs only.] Added: vendor/wine/dlls/usp10/current/.cvsignore URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/.cvsignor… Added: vendor/wine/dlls/usp10/current/CVS/Entries URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/CVS/Entri… Added: vendor/wine/dlls/usp10/current/CVS/Entries.Extra URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/CVS/Entri… Added: vendor/wine/dlls/usp10/current/CVS/Entries.Extra.Old URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/CVS/Entri… Added: vendor/wine/dlls/usp10/current/CVS/Entries.Old URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/CVS/Entri… Added: vendor/wine/dlls/usp10/current/CVS/Repository URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/CVS/Repos… Added: vendor/wine/dlls/usp10/current/CVS/Root URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/CVS/Root?… Added: vendor/wine/dlls/usp10/current/CVS/Template URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/CVS/Templ… Added: vendor/wine/dlls/usp10/current/Makefile.in URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/Makefile.… Added: vendor/wine/dlls/usp10/current/tests/.cvsignore URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/tests/.cv… Added: vendor/wine/dlls/usp10/current/tests/CVS/Entries URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/tests/CVS… Added: vendor/wine/dlls/usp10/current/tests/CVS/Entries.Extra URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/tests/CVS… Added: vendor/wine/dlls/usp10/current/tests/CVS/Entries.Extra.Old URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/tests/CVS… Added: vendor/wine/dlls/usp10/current/tests/CVS/Entries.Old URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/tests/CVS… Added: vendor/wine/dlls/usp10/current/tests/CVS/Repository URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/tests/CVS… Added: vendor/wine/dlls/usp10/current/tests/CVS/Root URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/tests/CVS… Added: vendor/wine/dlls/usp10/current/tests/CVS/Template URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/tests/CVS… Added: vendor/wine/dlls/usp10/current/tests/Makefile.in URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/tests/Mak… Added: vendor/wine/dlls/usp10/current/tests/usp10.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/tests/usp… Added: vendor/wine/dlls/usp10/current/usp10.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/usp10.c?r… Added: vendor/wine/dlls/usp10/current/usp10.spec URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/usp10.spe…

17 years, 10 months

[greatlrd] 25773: Removed file/folder did the vendor wrong sorry

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Feb 11 13:16:20 2007 New Revision: 25773 URL: http://svn.reactos.org/svn/reactos?rev=25773&view=rev Log: Removed file/folder did the vendor wrong sorry Removed: vendor/wine/dlls/.cvsignore vendor/wine/dlls/Makefile.in vendor/wine/dlls/usp10.c vendor/wine/dlls/usp10.spec Removed: vendor/wine/dlls/.cvsignore URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/.cvsignore?rev=25772&vi… ============================================================================== --- vendor/wine/dlls/.cvsignore (original) +++ vendor/wine/dlls/.cvsignore (removed) @@ -1,2 +1,0 @@ -Makefile -libusp10.def Removed: vendor/wine/dlls/Makefile.in URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/Makefile.in?rev=25772&v… ============================================================================== --- vendor/wine/dlls/Makefile.in (original) +++ vendor/wine/dlls/Makefile.in (removed) @@ -1,14 +1,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = usp10.dll -IMPORTLIB = libusp10.$(IMPLIBEXT) -IMPORTS = gdi32 kernel32 - -C_SRCS = \ - usp10.c - -@MAKE_DLL_RULES@ - -@DEPENDENCIES@ # everything below this line is overwritten by make depend Removed: vendor/wine/dlls/usp10.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10.c?rev=25772&view=… ============================================================================== --- vendor/wine/dlls/usp10.c (original) +++ vendor/wine/dlls/usp10.c (removed) @@ -1,1684 +1,0 @@ -/* - * Implementation of Uniscribe Script Processor (usp10.dll) - * - * Copyright 2005 Steven Edwards for CodeWeavers - * Copyright 2006 Hans Leidekker - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * Notes: - * Uniscribe allows for processing of complex scripts such as joining - * and filtering characters and bi-directional text with custom line breaks. - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "usp10.h" - -#include "wine/debug.h" -#include "wine/unicode.h" - -/** - * some documentation here: - * http://www.microsoft.com/typography/developers/uniscribe/uniscribe.htm - */ - -WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); - -static const SCRIPT_PROPERTIES props[] = -{ - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 9, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 8, 0, 0, 0, 0, 161, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 25, 0, 0, 0, 0, 204, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 42, 0, 0, 0, 0, 163, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 9, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 18, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 18, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 13, 0, 1, 0, 1, 177, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 13, 0, 1, 0, 0, 177, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 1, 0, 1, 0, 0, 178, 0, 0, 0, 0, 0, 0, 1, 1, 0 }, - { 1, 1, 1, 0, 0, 178, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 41, 1, 1, 0, 0, 178, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 32, 1, 1, 0, 0, 178, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 90, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0 }, - { 30, 0, 1, 1, 1, 222, 0, 0, 1, 0, 1, 0, 0, 0, 1 }, - { 30, 1, 1, 0, 0, 222, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 30, 0, 1, 0, 0, 222, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 57, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 57, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 73, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 73, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 69, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 69, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 69, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 70, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 70, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 71, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 71, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 72, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 72, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 74, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 74, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 75, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 75, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 76, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 76, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 81, 0, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0 }, - { 81, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 84, 0, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0 }, - { 84, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 83, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 83, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 85, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 85, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 80, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 80, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 94, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 94, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 101, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 93, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 92, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 9, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 91, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 9, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0 }, - { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, -}; - -static const SCRIPT_PROPERTIES *script_props[] = -{ - &props[0], &props[1], &props[2], &props[3], - &props[4], &props[5], &props[6], &props[7], - &props[8], &props[9], &props[11], &props[12], - &props[13], &props[14], &props[15], &props[16], - &props[17], &props[18], &props[19], &props[20], - &props[21], &props[22], &props[23], &props[24], - &props[25], &props[26], &props[27], &props[28], - &props[29], &props[30], &props[31], &props[32], - &props[33], &props[34], &props[35], &props[36], - &props[37], &props[38], &props[39], &props[40], - &props[41], &props[42], &props[43], &props[44], - &props[45], &props[46], &props[47], &props[48], - &props[49], &props[50], &props[51], &props[52], - &props[53], &props[54], &props[55], &props[56], - &props[57], &props[58], &props[59], &props[60], - &props[61], &props[62], &props[63], &props[64], - &props[65], &props[66], &props[67], &props[68], - &props[69], &props[70], &props[71], &props[72], - &props[73] -}; - -typedef struct { - HDC hdc; - LONG height; - WCHAR default_char; -} ScriptCache; - -typedef struct { - int numGlyphs; - WORD* glyphs; - WORD* pwLogClust; - int* piAdvance; - SCRIPT_VISATTR* psva; - GOFFSET* pGoffset; - ABC* abc; -} StringGlyphs; - -typedef struct { - BOOL invalid; - int clip_len; - ScriptCache *sc; - int cItems; - int cMaxGlyphs; - SCRIPT_ITEM* pItem; - int numItems; - StringGlyphs* glyphs; - SCRIPT_LOGATTR* logattrs; - SIZE* sz; -} StringAnalysis; - -static inline void *usp_alloc(SIZE_T size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void *usp_zero_alloc(SIZE_T size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void *usp_zero_realloc(LPVOID mem, SIZE_T size) -{ - return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); -} - -static inline void usp_free(LPVOID mem) -{ - HeapFree(GetProcessHeap(), 0, mem); -} - -static HDC get_cache_hdc(SCRIPT_CACHE *psc) -{ - return ((ScriptCache *)*psc)->hdc; -} - -static WCHAR get_cache_default_char(SCRIPT_CACHE *psc) -{ - return ((ScriptCache *)*psc)->default_char; -} - -static LONG get_cache_height(SCRIPT_CACHE *psc) -{ - return ((ScriptCache *)*psc)->height; -} - -static HRESULT init_script_cache(const HDC hdc, ScriptCache *sc) -{ - TEXTMETRICW metric; - - if (!GetTextMetricsW(hdc, &metric)) return E_INVALIDARG; - sc->height = metric.tmHeight; - sc->default_char = metric.tmDefaultChar; - sc->hdc = hdc; - return S_OK; -} - -static HRESULT get_script_cache(const HDC hdc, SCRIPT_CACHE *psc) -{ - if (!psc) return E_INVALIDARG; - if (!*psc) - { - HRESULT ret; - ScriptCache *sc; - - if (!hdc) return E_PENDING; - if (!(sc = usp_zero_alloc(sizeof(ScriptCache)))) return E_OUTOFMEMORY; - if ((ret = init_script_cache(hdc, sc))) - { - usp_free(sc); - return ret; - } - *psc = sc; - } - TRACE("<- %p\n", *psc); - return S_OK; -} - -/*********************************************************************** - * DllMain - * - */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) -{ - switch(fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); - break; - case DLL_PROCESS_DETACH: - break; - } - return TRUE; -} - -/*********************************************************************** - * ScriptFreeCache (USP10.@) - * - * Free a script cache. - * - * PARAMS - * psc [I/O] Script cache. - * - * RETURNS - * Success: S_OK - * Failure: Non-zero HRESULT value. - */ -HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc) -{ - TRACE("%p\n", psc); - - if (psc) - { - usp_free(*psc); - *psc = NULL; - } - return S_OK; -} - -/*********************************************************************** - * ScriptGetProperties (USP10.@) - * - * Retrieve a list of script properties. - * - * PARAMS - * props [I] Pointer to an array of SCRIPT_PROPERTIES pointers. - * num [I] Pointer to the number of scripts. - * - * RETURNS - * Success: S_OK - * Failure: Non-zero HRESULT value. - * - * NOTES - * Behaviour matches WinXP. - */ -HRESULT WINAPI ScriptGetProperties(const SCRIPT_PROPERTIES ***props, int *num) -{ - TRACE("(%p,%p)\n", props, num); - - if (!props && !num) return E_INVALIDARG; - - if (num) *num = sizeof(script_props)/sizeof(script_props[0]); - if (props) *props = script_props; - - return S_OK; -} - -/*********************************************************************** - * ScriptGetFontProperties (USP10.@) - * - * Get information on special glyphs. - * - * PARAMS - * hdc [I] Device context. - * psc [I/O] Opaque pointer to a script cache. - * sfp [O] Font properties structure. - */ -HRESULT WINAPI ScriptGetFontProperties(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_FONTPROPERTIES *sfp) -{ - HRESULT hr; - - TRACE("%p,%p,%p\n", hdc, psc, sfp); - - if (!sfp) return E_INVALIDARG; - if ((hr = get_script_cache(hdc, psc))) return hr; - - if (sfp->cBytes != sizeof(SCRIPT_FONTPROPERTIES)) - return E_INVALIDARG; - - /* return something sensible? */ - sfp->wgBlank = 0; - sfp->wgDefault = get_cache_default_char(psc); - sfp->wgInvalid = 0; - sfp->wgKashida = 0xffff; - sfp->iKashidaWidth = 0; - - return S_OK; -} - -/*********************************************************************** - * ScriptRecordDigitSubstitution (USP10.@) - * - * Record digit substitution settings for a given locale. - * - * PARAMS - * locale [I] Locale identifier. - * sds [I] Structure to record substitution settings. - * - * RETURNS - * Success: S_OK - * Failure: E_POINTER if sds is NULL, E_INVALIDARG otherwise. - * - * SEE ALSO - * http://blogs.msdn.com/michkap/archive/2006/02/22/536877.aspx - */ -HRESULT WINAPI ScriptRecordDigitSubstitution(LCID locale, SCRIPT_DIGITSUBSTITUTE *sds) -{ - DWORD plgid, sub; - - TRACE("0x%x, %p\n", locale, sds); - - /* This implementation appears to be correct for all languages, but it's - * not clear if sds->DigitSubstitute is ever set to anything except - * CONTEXT or NONE in reality */ - - if (!sds) return E_POINTER; - - locale = ConvertDefaultLocale(locale); - - if (!IsValidLocale(locale, LCID_INSTALLED)) - return E_INVALIDARG; - - plgid = PRIMARYLANGID(LANGIDFROMLCID(locale)); - sds->TraditionalDigitLanguage = plgid; - - if (plgid == LANG_ARABIC || plgid == LANG_FARSI) - sds->NationalDigitLanguage = plgid; - else - sds->NationalDigitLanguage = LANG_ENGLISH; - - if (!GetLocaleInfoW(locale, LOCALE_IDIGITSUBSTITUTION | LOCALE_RETURN_NUMBER, - (LPWSTR)&sub, sizeof(sub)/sizeof(WCHAR))) return E_INVALIDARG; - - switch (sub) - { - case 0: - if (plgid == LANG_ARABIC || plgid == LANG_FARSI) - sds->DigitSubstitute = SCRIPT_DIGITSUBSTITUTE_CONTEXT; - else - sds->DigitSubstitute = SCRIPT_DIGITSUBSTITUTE_NONE; - break; - case 1: - sds->DigitSubstitute = SCRIPT_DIGITSUBSTITUTE_NONE; - break; - case 2: - sds->DigitSubstitute = SCRIPT_DIGITSUBSTITUTE_NATIONAL; - break; - default: - sds->DigitSubstitute = SCRIPT_DIGITSUBSTITUTE_TRADITIONAL; - break; - } - - sds->dwReserved = 0; - return S_OK; -} - -/*********************************************************************** - * ScriptApplyDigitSubstitution (USP10.@) - * - * Apply digit substitution settings. - * - * PARAMS - * sds [I] Structure with recorded substitution settings. - * sc [I] Script control structure. - * ss [I] Script state structure. - * - * RETURNS - * Success: S_OK - * Failure: E_INVALIDARG if sds is invalid. Otherwise an HRESULT. - */ -HRESULT WINAPI ScriptApplyDigitSubstitution(const SCRIPT_DIGITSUBSTITUTE *sds, - SCRIPT_CONTROL *sc, SCRIPT_STATE *ss) -{ - SCRIPT_DIGITSUBSTITUTE psds; - - TRACE("%p, %p, %p\n", sds, sc, ss); - - if (!sc || !ss) return E_POINTER; - if (!sds) - { - sds = &psds; - if (ScriptRecordDigitSubstitution(LOCALE_USER_DEFAULT, &psds) != S_OK) - return E_INVALIDARG; - } - - sc->uDefaultLanguage = LANG_ENGLISH; - sc->fContextDigits = 0; - ss->fDigitSubstitute = 0; - - switch (sds->DigitSubstitute) { - case SCRIPT_DIGITSUBSTITUTE_CONTEXT: - case SCRIPT_DIGITSUBSTITUTE_NATIONAL: - case SCRIPT_DIGITSUBSTITUTE_NONE: - case SCRIPT_DIGITSUBSTITUTE_TRADITIONAL: - return S_OK; - default: - return E_INVALIDARG; - } -} - -/*********************************************************************** - * ScriptItemize (USP10.@) - * - * Split a Unicode string into shapeable parts. - * - * PARAMS - * pwcInChars [I] String to split. - * cInChars [I] Number of characters in pwcInChars. - * cMaxItems [I] Maximum number of items to return. - * psControl [I] Pointer to a SCRIPT_CONTROL structure. - * psState [I] Pointer to a SCRIPT_STATE structure. - * pItems [O] Buffer to receive SCRIPT_ITEM structures. - * pcItems [O] Number of script items returned. - * - * RETURNS - * Success: S_OK - * Failure: Non-zero HRESULT value. - */ -HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItems, - const SCRIPT_CONTROL *psControl, const SCRIPT_STATE *psState, - SCRIPT_ITEM *pItems, int *pcItems) -{ - -#define Numeric_start 0x0030 -#define Numeric_stop 0x0039 -#define Numeric_space 0x0020 -#define Arabic_start 0x0600 -#define Arabic_stop 0x06ff -#define Latin_start 0x0001 -#define Latin_stop 0x024f -#define Script_Arabic 6 -#define Script_Latin 1 -#define Script_Numeric 5 - - int cnt = 0, index = 0; - int New_Script = SCRIPT_UNDEFINED; - - TRACE("%s,%d,%d,%p,%p,%p,%p\n", debugstr_wn(pwcInChars, cInChars), cInChars, cMaxItems, - psControl, psState, pItems, pcItems); - - if (!pwcInChars || !cInChars || !pItems || cMaxItems < 2) - return E_INVALIDARG; - - pItems[index].iCharPos = 0; - memset(&pItems[index].a, 0, sizeof(SCRIPT_ANALYSIS)); - - if (pwcInChars[cnt] >= Numeric_start && pwcInChars[cnt] <= Numeric_stop) - pItems[index].a.eScript = Script_Numeric; - else - if (pwcInChars[cnt] >= Arabic_start && pwcInChars[cnt] <= Arabic_stop) - pItems[index].a.eScript = Script_Arabic; - else - if (pwcInChars[cnt] >= Latin_start && pwcInChars[cnt] <= Latin_stop) - pItems[index].a.eScript = Script_Latin; - - if (pItems[index].a.eScript == Script_Arabic) - pItems[index].a.s.uBidiLevel = 1; - - TRACE("New_Script=%d, eScript=%d index=%d cnt=%d iCharPos=%d\n", - New_Script, pItems[index].a.eScript, index, cnt, - pItems[index].iCharPos = cnt); - - for (cnt=0; cnt < cInChars; cnt++) - { - if ((pwcInChars[cnt] >= Numeric_start && pwcInChars[cnt] <= Numeric_stop) - || (New_Script == Script_Numeric && pwcInChars[cnt] == Numeric_space)) - New_Script = Script_Numeric; - else - if ((pwcInChars[cnt] >= Arabic_start && pwcInChars[cnt] <= Arabic_stop) - || (New_Script == Script_Arabic && pwcInChars[cnt] == Numeric_space)) - New_Script = Script_Arabic; - else - if ((WCHAR) pwcInChars[cnt] >= Latin_start && (WCHAR) pwcInChars[cnt] <= Latin_stop) - New_Script = Script_Latin; - else - New_Script = SCRIPT_UNDEFINED; - - if (New_Script != pItems[index].a.eScript) - { - TRACE("New_Script=%d, eScript=%d ", New_Script, pItems[index].a.eScript); - index++; - if (index+1 > cMaxItems) - return E_OUTOFMEMORY; - - pItems[index].iCharPos = cnt; - memset(&pItems[index].a, 0, sizeof(SCRIPT_ANALYSIS)); - - if (New_Script == Script_Arabic) - pItems[index].a.s.uBidiLevel = 1; - - pItems[index].a.eScript = New_Script; - if (New_Script == Script_Arabic) - pItems[index].a.s.uBidiLevel = 1; - - TRACE("index=%d cnt=%d iCharPos=%d\n", index, cnt, pItems[index].iCharPos = cnt); - } - } - - /* While not strictly necessary according to the spec, make sure the n+1 - * item is set up to prevent random behaviour if the caller erroneously - * checks the n+1 structure */ - memset(&pItems[index+1].a, 0, sizeof(SCRIPT_ANALYSIS)); - - TRACE("index=%d cnt=%d iCharPos=%d\n", index+1, cnt, pItems[index+1].iCharPos = cnt); - - /* Set one SCRIPT_STATE item being returned */ - *pcItems = index + 1; - - /* Set SCRIPT_ITEM */ - pItems[index+1].iCharPos = cnt; /* the last + 1 item - contains the ptr to the lastchar */ - return S_OK; -} - -/*********************************************************************** - * ScriptStringAnalyse (USP10.@) - * - */ -HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, - int cGlyphs, int iCharset, DWORD dwFlags, - int iReqWidth, SCRIPT_CONTROL *psControl, - SCRIPT_STATE *psState, const int *piDx, - SCRIPT_TABDEF *pTabdef, const BYTE *pbInClass, - SCRIPT_STRING_ANALYSIS *pssa) -{ - HRESULT hr = E_OUTOFMEMORY; - StringAnalysis *analysis = NULL; - int i, num_items = 255; - - TRACE("(%p,%p,%d,%d,%d,0x%x,%d,%p,%p,%p,%p,%p,%p)\n", - hdc, pString, cString, cGlyphs, iCharset, dwFlags, iReqWidth, - psControl, psState, piDx, pTabdef, pbInClass, pssa); - - if (iCharset != -1) - { - FIXME("Only Unicode strings are supported\n"); - return E_INVALIDARG; - } - if (cString < 1 || !pString) return E_INVALIDARG; - if ((dwFlags & SSA_GLYPHS) && !hdc) return E_PENDING; - - if (!(analysis = usp_zero_alloc(sizeof(StringAnalysis)))) return E_OUTOFMEMORY; - if (!(analysis->pItem = usp_zero_alloc(num_items * sizeof(SCRIPT_ITEM) + 1))) goto error; - - /* FIXME: handle clipping */ - analysis->clip_len = cString; - - hr = ScriptItemize(pString, cString, num_items, psControl, psState, analysis->pItem, - &analysis->numItems); - - while (hr == E_OUTOFMEMORY) - { - SCRIPT_ITEM *tmp; - - num_items *= 2; - if (!(tmp = usp_zero_realloc(analysis->pItem, num_items * sizeof(SCRIPT_ITEM) + 1))) - goto error; - - analysis->pItem = tmp; - hr = ScriptItemize(pString, cString, num_items, psControl, psState, analysis->pItem, - &analysis->numItems); - } - if (hr) goto error; - - if ((analysis->logattrs = usp_alloc(sizeof(SCRIPT_LOGATTR) * cString))) - ScriptBreak(pString, cString, (SCRIPT_STRING_ANALYSIS)analysis, analysis->logattrs); - else - goto error; - - if (!(analysis->glyphs = usp_zero_alloc(sizeof(StringGlyphs) * analysis->numItems))) - goto error; - - for (i = 0; i < analysis->numItems; i++) - { - SCRIPT_CACHE *sc = (SCRIPT_CACHE *)&analysis->sc; - int cChar = analysis->pItem[i+1].iCharPos - analysis->pItem[i].iCharPos; - int numGlyphs = 1.5 * cChar + 16; - WORD *glyphs = usp_zero_alloc(sizeof(WORD) * numGlyphs); - WORD *pwLogClust = usp_zero_alloc(sizeof(WORD) * cChar); - int *piAdvance = usp_zero_alloc(sizeof(int) * numGlyphs); - SCRIPT_VISATTR *psva = usp_zero_alloc(sizeof(SCRIPT_VISATTR) * cChar); - GOFFSET *pGoffset = usp_zero_alloc(sizeof(GOFFSET) * numGlyphs); - ABC *abc = usp_zero_alloc(sizeof(ABC)); - int numGlyphsReturned; - - /* FIXME: non unicode strings */ - WCHAR* pStr = (WCHAR*)pString; - hr = ScriptShape(hdc, sc, &pStr[analysis->pItem[i].iCharPos], - cChar, numGlyphs, &analysis->pItem[i].a, - glyphs, pwLogClust, psva, &numGlyphsReturned); - hr = ScriptPlace(hdc, sc, glyphs, numGlyphsReturned, psva, &analysis->pItem[i].a, - piAdvance, pGoffset, abc); - - analysis->glyphs[i].numGlyphs = numGlyphsReturned; - analysis->glyphs[i].glyphs = glyphs; - analysis->glyphs[i].pwLogClust = pwLogClust; - analysis->glyphs[i].piAdvance = piAdvance; - analysis->glyphs[i].psva = psva; - analysis->glyphs[i].pGoffset = pGoffset; - analysis->glyphs[i].abc = abc; - } - - *pssa = analysis; - return S_OK; - -error: - usp_free(analysis->glyphs); - usp_free(analysis->logattrs); - usp_free(analysis->pItem); - usp_free(analysis); - return hr; -} - -/*********************************************************************** - * ScriptStringOut (USP10.@) - * - * This function takes the output of ScriptStringAnalyse and joins the segments - * of glyphs and passes the resulting string to ScriptTextOut. ScriptStringOut - * only processes glyphs. - * - * Parameters: - * ssa [I] buffer to hold the analysed string components - * iX [I] X axis displacement for output - * iY [I] Y axis displacement for output - * uOptions [I] flags controling output processing - * prc [I] rectangle coordinates - * iMinSel [I] starting pos for substringing output string - * iMaxSel [I] ending pos for substringing output string - * fDisabled [I] controls text highlighting - * - * RETURNS - * Success: S_OK - * Failure: is the value returned by ScriptTextOut - */ -HRESULT WINAPI ScriptStringOut(SCRIPT_STRING_ANALYSIS ssa, - int iX, - int iY, - UINT uOptions, - const RECT *prc, - int iMinSel, - int iMaxSel, - BOOL fDisabled) -{ - StringAnalysis *analysis; - WORD *glyphs; - int item, cnt, x; - HRESULT hr; - - TRACE("(%p,%d,%d,0x%1x,%p,%d,%d,%d)\n", - ssa, iX, iY, uOptions, prc, iMinSel, iMaxSel, fDisabled); - - if (!(analysis = ssa)) return E_INVALIDARG; - - /* - * Get storage for the output buffer for the consolidated strings - */ - cnt = 0; - for (item = 0; item < analysis->numItems; item++) - { - cnt += analysis->glyphs[item].numGlyphs; - } - if (!(glyphs = usp_alloc(sizeof(WCHAR) * cnt))) return E_OUTOFMEMORY; - - /* - * ScriptStringOut only processes glyphs hence set ETO_GLYPH_INDEX - */ - uOptions |= ETO_GLYPH_INDEX; - analysis->pItem[0].a.fNoGlyphIndex = FALSE; /* say that we have glyphs */ - - /* - * Copy the string items into the output buffer - */ - - TRACE("numItems %d\n", analysis->numItems); - - cnt = 0; - for (item = 0; item < analysis->numItems; item++) - { - memcpy(&glyphs[cnt], analysis->glyphs[item].glyphs, - sizeof(WCHAR) * analysis->glyphs[item].numGlyphs); - - TRACE("Item %d, Glyphs %d ", item, analysis->glyphs[item].numGlyphs); - for (x = cnt; x < analysis->glyphs[item].numGlyphs + cnt; x ++) - TRACE("%04x", glyphs[x]); - TRACE("\n"); - - cnt += analysis->glyphs[item].numGlyphs; /* point to the end of the copied text */ - } - - hr = ScriptTextOut(analysis->sc->hdc, (SCRIPT_CACHE *)&analysis->sc, iX, iY, - uOptions, prc, &analysis->pItem->a, NULL, 0, glyphs, cnt, - analysis->glyphs->piAdvance, NULL, analysis->glyphs->pGoffset); - TRACE("ScriptTextOut hr=%08x\n", hr); - - /* - * Free the output buffer and script cache - */ - usp_free(glyphs); - return hr; -} - -/*********************************************************************** - * ScriptStringCPtoX (USP10.@) - * - */ -HRESULT WINAPI ScriptStringCPtoX(SCRIPT_STRING_ANALYSIS ssa, int icp, BOOL fTrailing, int* pX) -{ - int i, j; - int runningX = 0; - int runningCp = 0; - StringAnalysis* analysis = ssa; - - TRACE("(%p), %d, %d, (%p)\n", ssa, icp, fTrailing, pX); - - if (!ssa || !pX) return S_FALSE; - - /* icp out of range */ - if(icp < 0) - { - analysis->invalid = TRUE; - return E_INVALIDARG; - } - - for(i=0; i<analysis->numItems; i++) - { - for(j=0; j<analysis->glyphs[i].numGlyphs; j++) - { - if(runningCp == icp && fTrailing == FALSE) - { - *pX = runningX; - return S_OK; - } - runningX += analysis->glyphs[i].piAdvance[j]; - if(runningCp == icp && fTrailing == TRUE) - { - *pX = runningX; - return S_OK; - } - runningCp++; - } - } - - /* icp out of range */ - analysis->invalid = TRUE; - return E_INVALIDARG; -} - -/*********************************************************************** - * ScriptStringXtoCP (USP10.@) - * - */ -HRESULT WINAPI ScriptStringXtoCP(SCRIPT_STRING_ANALYSIS ssa, int iX, int* piCh, int* piTrailing) -{ - StringAnalysis* analysis = ssa; - int i; - int j; - int runningX = 0; - int runningCp = 0; - int width; - - TRACE("(%p), %d, (%p), (%p)\n", ssa, iX, piCh, piTrailing); - - if (!ssa || !piCh || !piTrailing) return S_FALSE; - - /* out of range */ - if(iX < 0) - { - *piCh = -1; - *piTrailing = TRUE; - return S_OK; - } - - for(i=0; i<analysis->numItems; i++) - { - for(j=0; j<analysis->glyphs[i].numGlyphs; j++) - { - width = analysis->glyphs[i].piAdvance[j]; - if(iX < (runningX + width)) - { - *piCh = runningCp; - if((iX - runningX) > width/2) - *piTrailing = TRUE; - else - *piTrailing = FALSE; - return S_OK; - } - runningX += width; - runningCp++; - } - } - - /* out of range */ - *piCh = analysis->pItem[analysis->numItems].iCharPos; - *piTrailing = FALSE; - - return S_OK; -} - - -/*********************************************************************** - * ScriptStringFree (USP10.@) - * - * Free a string analysis. - * - * PARAMS - * pssa [I] string analysis. - * - * RETURNS - * Success: S_OK - * Failure: Non-zero HRESULT value. - */ -HRESULT WINAPI ScriptStringFree(SCRIPT_STRING_ANALYSIS *pssa) -{ - StringAnalysis* analysis; - BOOL invalid; - int i; - - TRACE("(%p)\n", pssa); - - if (!pssa || !(analysis = *pssa)) return E_INVALIDARG; - invalid = analysis->invalid; - - for (i = 0; i < analysis->numItems; i++) - { - usp_free(analysis->glyphs[i].glyphs); - usp_free(analysis->glyphs[i].pwLogClust); - usp_free(analysis->glyphs[i].piAdvance); - usp_free(analysis->glyphs[i].psva); - usp_free(analysis->glyphs[i].pGoffset); - usp_free(analysis->glyphs[i].abc); - } - - usp_free(analysis->glyphs); - usp_free(analysis->pItem); - usp_free(analysis->logattrs); - usp_free(analysis->sz); - usp_free(analysis); - - if (invalid) return E_INVALIDARG; - return S_OK; -} - -/*********************************************************************** - * ScriptCPtoX (USP10.@) - * - */ -HRESULT WINAPI ScriptCPtoX(int iCP, - BOOL fTrailing, - int cChars, - int cGlyphs, - const WORD *pwLogClust, - const SCRIPT_VISATTR *psva, - const int *piAdvance, - const SCRIPT_ANALYSIS *psa, - int *piX) -{ - int item; - int iPosX; - float fMaxPosX = 0; - TRACE("(%d,%d,%d,%d,%p,%p,%p,%p,%p)\n", - iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, - psa, piX); - for (item=0; item < cGlyphs; item++) /* total piAdvance */ - fMaxPosX += piAdvance[item]; - iPosX = (fMaxPosX/cGlyphs)*(iCP+fTrailing); - if (iPosX > fMaxPosX) - iPosX = fMaxPosX; - *piX = iPosX; /* Return something in range */ - - TRACE("*piX=%d\n", *piX); - return S_OK; -} - -/*********************************************************************** - * ScriptXtoCP (USP10.@) - * - */ -HRESULT WINAPI ScriptXtoCP(int iX, - int cChars, - int cGlyphs, - const WORD *pwLogClust, - const SCRIPT_VISATTR *psva, - const int *piAdvance, - const SCRIPT_ANALYSIS *psa, - int *piCP, - int *piTrailing) -{ - int item; - int iPosX; - float fMaxPosX = 1; - float fAvePosX; - TRACE("(%d,%d,%d,%p,%p,%p,%p,%p,%p)\n", - iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, - psa, piCP, piTrailing); - if (iX < 0) /* iX is before start of run */ - { - *piCP = -1; - *piTrailing = TRUE; - return S_OK; - } - - for (item=0; item < cGlyphs; item++) /* total piAdvance */ - fMaxPosX += piAdvance[item]; - - if (iX >= fMaxPosX) /* iX too large */ - { - *piCP = cChars; - *piTrailing = FALSE; - return S_OK; - } - - fAvePosX = fMaxPosX / cGlyphs; - iPosX = fAvePosX; - for (item = 1; item < cGlyphs && iPosX < iX; item++) - iPosX += fAvePosX; - if (iPosX - iX > fAvePosX/2) - *piTrailing = 0; - else - *piTrailing = 1; /* yep we are over halfway */ - - *piCP = item -1; /* Return character position */ - TRACE("*piCP=%d iPposX=%d\n", *piCP, iPosX); - return S_OK; -} - -/*********************************************************************** - * ScriptBreak (USP10.@) - * - * Retrieve line break information. - * - * PARAMS - * chars [I] Array of characters. - * sa [I] String analysis. - * la [I] Array of logical attribute structures. - * - * RETURNS - * Success: S_OK - * Failure: S_FALSE - */ -HRESULT WINAPI ScriptBreak(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT_LOGATTR *la) -{ - unsigned int i; - - TRACE("(%s, %d, %p, %p)\n", debugstr_wn(chars, count), count, sa, la); - - if (!la) return S_FALSE; - - for (i = 0; i < count; i++) - { - memset(&la[i], 0, sizeof(SCRIPT_LOGATTR)); - - /* FIXME: set the other flags */ - la[i].fWhiteSpace = isspaceW(chars[i]); - la[i].fCharStop = 1; - } - return S_OK; -} - -static const struct -{ - WCHAR start; - WCHAR end; - DWORD flag; -} -complex_ranges[] = -{ - { 0, 0x0b, SIC_COMPLEX }, - { 0x0c, 0x0c, SIC_NEUTRAL }, - { 0x0d, 0x1f, SIC_COMPLEX }, - { 0x20, 0x2f, SIC_NEUTRAL }, - { 0x30, 0x39, SIC_ASCIIDIGIT }, - { 0x3a, 0x40, SIC_NEUTRAL }, - { 0x5b, 0x60, SIC_NEUTRAL }, - { 0x7b, 0x7e, SIC_NEUTRAL }, - { 0x7f, 0x9f, SIC_COMPLEX }, - { 0xa0, 0xa5, SIC_NEUTRAL }, - { 0xa7, 0xa8, SIC_NEUTRAL }, - { 0xab, 0xab, SIC_NEUTRAL }, - { 0xad, 0xad, SIC_NEUTRAL }, - { 0xaf, 0xaf, SIC_NEUTRAL }, - { 0xb0, 0xb1, SIC_NEUTRAL }, - { 0xb4, 0xb4, SIC_NEUTRAL }, - { 0xb6, 0xb8, SIC_NEUTRAL }, - { 0xbb, 0xbf, SIC_NEUTRAL }, - { 0xd7, 0xd7, SIC_NEUTRAL }, - { 0xf7, 0xf7, SIC_NEUTRAL }, - { 0x2b9, 0x2ba, SIC_NEUTRAL }, - { 0x2c2, 0x2cf, SIC_NEUTRAL }, - { 0x2d2, 0x2df, SIC_NEUTRAL }, - { 0x2e5, 0x2e9, SIC_COMPLEX }, - { 0x2ea, 0x2ed, SIC_NEUTRAL }, - { 0x300, 0x362, SIC_COMPLEX }, - { 0x530, 0x60b, SIC_COMPLEX }, - { 0x60c, 0x60d, SIC_NEUTRAL }, - { 0x60e, 0x669, SIC_COMPLEX }, - { 0x66a, 0x66a, SIC_NEUTRAL }, - { 0x66b, 0x6e8, SIC_COMPLEX }, - { 0x6e9, 0x6e9, SIC_NEUTRAL }, - { 0x6ea, 0x7bf, SIC_COMPLEX }, - { 0x900, 0x1360, SIC_COMPLEX }, - { 0x137d, 0x137f, SIC_COMPLEX }, - { 0x1680, 0x1680, SIC_NEUTRAL }, - { 0x1780, 0x18af, SIC_COMPLEX }, - { 0x2000, 0x200a, SIC_NEUTRAL }, - { 0x200b, 0x200f, SIC_COMPLEX }, - { 0x2010, 0x2016, SIC_NEUTRAL }, - { 0x2018, 0x2022, SIC_NEUTRAL }, - { 0x2024, 0x2028, SIC_NEUTRAL }, - { 0x2029, 0x202e, SIC_COMPLEX }, - { 0x202f, 0x2037, SIC_NEUTRAL }, - { 0x2039, 0x203c, SIC_NEUTRAL }, - { 0x2044, 0x2046, SIC_NEUTRAL }, - { 0x206a, 0x206f, SIC_COMPLEX }, - { 0x207a, 0x207e, SIC_NEUTRAL }, - { 0x208a, 0x20aa, SIC_NEUTRAL }, - { 0x20ac, 0x20cf, SIC_NEUTRAL }, - { 0x20d0, 0x20ff, SIC_COMPLEX }, - { 0x2103, 0x2103, SIC_NEUTRAL }, - { 0x2105, 0x2105, SIC_NEUTRAL }, - { 0x2109, 0x2109, SIC_NEUTRAL }, - { 0x2116, 0x2116, SIC_NEUTRAL }, - { 0x2121, 0x2122, SIC_NEUTRAL }, - { 0x212e, 0x212e, SIC_NEUTRAL }, - { 0x2153, 0x2154, SIC_NEUTRAL }, - { 0x215b, 0x215e, SIC_NEUTRAL }, - { 0x2190, 0x2199, SIC_NEUTRAL }, - { 0x21b8, 0x21b9, SIC_NEUTRAL }, - { 0x21d2, 0x21d2, SIC_NEUTRAL }, - { 0x21d4, 0x21d4, SIC_NEUTRAL }, - { 0x21e7, 0x21e7, SIC_NEUTRAL }, - { 0x2200, 0x2200, SIC_NEUTRAL }, - { 0x2202, 0x2203, SIC_NEUTRAL }, - { 0x2207, 0x2208, SIC_NEUTRAL }, - { 0x220b, 0x220b, SIC_NEUTRAL }, - { 0x220f, 0x220f, SIC_NEUTRAL }, - { 0x2211, 0x2213, SIC_NEUTRAL }, - { 0x2215, 0x2215, SIC_NEUTRAL }, - { 0x221a, 0x221a, SIC_NEUTRAL }, - { 0x221d, 0x2220, SIC_NEUTRAL }, - { 0x2223, 0x2223, SIC_NEUTRAL }, - { 0x2225, 0x2225, SIC_NEUTRAL }, - { 0x2227, 0x222c, SIC_NEUTRAL }, - { 0x222e, 0x222e, SIC_NEUTRAL }, - { 0x2234, 0x2237, SIC_NEUTRAL }, - { 0x223c, 0x223d, SIC_NEUTRAL }, - { 0x2248, 0x2248, SIC_NEUTRAL }, - { 0x224c, 0x224c, SIC_NEUTRAL }, - { 0x2252, 0x2252, SIC_NEUTRAL }, - { 0x2260, 0x2261, SIC_NEUTRAL }, - { 0x2264, 0x2267, SIC_NEUTRAL }, - { 0x226a, 0x226b, SIC_NEUTRAL }, - { 0x226e, 0x226f, SIC_NEUTRAL }, - { 0x2282, 0x2283, SIC_NEUTRAL }, - { 0x2286, 0x2287, SIC_NEUTRAL }, - { 0x2295, 0x2295, SIC_NEUTRAL }, - { 0x2299, 0x2299, SIC_NEUTRAL }, - { 0x22a5, 0x22a5, SIC_NEUTRAL }, - { 0x22bf, 0x22bf, SIC_NEUTRAL }, - { 0x2312, 0x2312, SIC_NEUTRAL }, - { 0x24ea, 0x24ea, SIC_COMPLEX }, - { 0x2500, 0x254b, SIC_NEUTRAL }, - { 0x2550, 0x256d, SIC_NEUTRAL }, - { 0x256e, 0x2574, SIC_NEUTRAL }, - { 0x2581, 0x258f, SIC_NEUTRAL }, - { 0x2592, 0x2595, SIC_NEUTRAL }, - { 0x25a0, 0x25a1, SIC_NEUTRAL }, - { 0x25a3, 0x25a9, SIC_NEUTRAL }, - { 0x25b2, 0x25b3, SIC_NEUTRAL }, - { 0x25b6, 0x25b7, SIC_NEUTRAL }, - { 0x25bc, 0x25bd, SIC_NEUTRAL }, - { 0x25c0, 0x25c1, SIC_NEUTRAL }, - { 0x25c6, 0x25c8, SIC_NEUTRAL }, - { 0x25cb, 0x25cb, SIC_NEUTRAL }, - { 0x25ce, 0x25d1, SIC_NEUTRAL }, - { 0x25e2, 0x25e5, SIC_NEUTRAL }, - { 0x25ef, 0x25ef, SIC_NEUTRAL }, - { 0x2605, 0x2606, SIC_NEUTRAL }, - { 0x2609, 0x2609, SIC_NEUTRAL }, - { 0x260e, 0x260f, SIC_NEUTRAL }, - { 0x261c, 0x261c, SIC_NEUTRAL }, - { 0x261e, 0x261e, SIC_NEUTRAL }, - { 0x2640, 0x2640, SIC_NEUTRAL }, - { 0x2642, 0x2642, SIC_NEUTRAL }, - { 0x2660, 0x2661, SIC_NEUTRAL }, - { 0x2663, 0x2665, SIC_NEUTRAL }, - { 0x2667, 0x266a, SIC_NEUTRAL }, - { 0x266c, 0x266d, SIC_NEUTRAL }, - { 0x266f, 0x266f, SIC_NEUTRAL }, - { 0x273d, 0x273d, SIC_NEUTRAL }, - { 0x2e80, 0x312f, SIC_COMPLEX }, - { 0x3190, 0x31bf, SIC_COMPLEX }, - { 0x31f0, 0x31ff, SIC_COMPLEX }, - { 0x3220, 0x325f, SIC_COMPLEX }, - { 0x3280, 0xa4ff, SIC_COMPLEX }, - { 0xd800, 0xdfff, SIC_COMPLEX }, - { 0xe000, 0xf8ff, SIC_NEUTRAL }, - { 0xf900, 0xfaff, SIC_COMPLEX }, - { 0xfb13, 0xfb28, SIC_COMPLEX }, - { 0xfb29, 0xfb29, SIC_NEUTRAL }, - { 0xfb2a, 0xfb4f, SIC_COMPLEX }, - { 0xfd3e, 0xfd3f, SIC_NEUTRAL }, - { 0xfdd0, 0xfdef, SIC_COMPLEX }, - { 0xfe20, 0xfe6f, SIC_COMPLEX }, - { 0xfeff, 0xfeff, SIC_COMPLEX }, - { 0xff01, 0xff5e, SIC_COMPLEX }, - { 0xff61, 0xff9f, SIC_COMPLEX }, - { 0xffe0, 0xffe6, SIC_COMPLEX }, - { 0xffe8, 0xffee, SIC_COMPLEX }, - { 0xfff9, 0xfffb, SIC_COMPLEX }, - { 0xfffe, 0xfffe, SIC_COMPLEX } -}; - -/*********************************************************************** - * ScriptIsComplex (USP10.@) - * - * Determine if a string is complex. - * - * PARAMS - * chars [I] Array of characters to test. - * len [I] Length in characters. - * flag [I] Flag. - * - * RETURNS - * Success: S_OK - * Failure: S_FALSE - * - * NOTES - * Behaviour matches that of WinXP. - */ -HRESULT WINAPI ScriptIsComplex(const WCHAR *chars, int len, DWORD flag) -{ - unsigned int i, j; - - TRACE("(%s,%d,0x%x)\n", debugstr_wn(chars, len), len, flag); - - for (i = 0; i < len; i++) - { - for (j = 0; j < sizeof(complex_ranges)/sizeof(complex_ranges[0]); j++) - { - if (chars[i] >= complex_ranges[j].start && - chars[i] <= complex_ranges[j].end && - (flag & complex_ranges[j].flag)) return S_OK; - } - } - return S_FALSE; -} - -/*********************************************************************** - * ScriptShape (USP10.@) - * - * Produce glyphs and visual attributes for a run. - * - * PARAMS - * hdc [I] Device context. - * psc [I/O] Opaque pointer to a script cache. - * pwcChars [I] Array of characters specifying the run. - * cChars [I] Number of characters in pwcChars. - * cMaxGlyphs [I] Length of pwOutGlyphs. - * psa [I/O] String analysis. - * pwOutGlyphs [O] Array of glyphs. - * pwLogClust [O] Array of logical cluster info. - * psva [O] Array of visual attributes. - * pcGlyphs [O] Number of glyphs returned. - * - * RETURNS - * Success: S_OK - * Failure: Non-zero HRESULT value. - */ -HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, - int cChars, int cMaxGlyphs, - SCRIPT_ANALYSIS *psa, WORD *pwOutGlyphs, WORD *pwLogClust, - SCRIPT_VISATTR *psva, int *pcGlyphs) -{ - int cnt; - HRESULT hr; - *pcGlyphs = cChars; - - TRACE("(%p, %p, %p, %d, %d, %p)\n", hdc, psc, pwcChars, cChars, cMaxGlyphs, psa); - if (psa) TRACE("psa values: %d, %d, %d, %d, %d, %d, %d\n", psa->eScript, psa->fRTL, psa->fLayoutRTL, - psa->fLinkBefore, psa->fLinkAfter, psa->fLogicalOrder, psa->fNoGlyphIndex); - - if (cChars > cMaxGlyphs) return E_OUTOFMEMORY; - if ((hr = get_script_cache(hdc, psc))) return hr; - - TRACE("Before: "); - for (cnt = 0; cnt < cChars; cnt++) - TRACE("%4x",pwcChars[cnt]); - TRACE("\n"); - - if (!psa->fNoGlyphIndex) { /* Glyph translate */ - if (!(GetGlyphIndicesW(get_cache_hdc(psc), pwcChars, cChars, pwOutGlyphs, 0))) - return S_FALSE; - - TRACE("After: "); - for (cnt = 0; cnt < cChars; cnt++) { - TRACE("%04x",pwOutGlyphs[cnt]); - } - TRACE("\n"); - } - else { - TRACE("After: "); - for (cnt = 0; cnt < cChars; cnt++) { /* no translate so set up */ - pwOutGlyphs[cnt] = pwcChars[cnt]; /* copy in to out and */ - TRACE("%04x",pwOutGlyphs[cnt]); - } - TRACE("\n"); - } - - /* Set up a valid SCRIPT_VISATTR and LogClust for each char in this run */ - for (cnt = 0; cnt < cChars; cnt++) { - /* FIXME: set to better values */ - psva[cnt].uJustification = 2; - psva[cnt].fClusterStart = 1; - psva[cnt].fDiacritic = 0; - psva[cnt].fZeroWidth = 0; - pwLogClust[cnt] = cnt; - } - return S_OK; -} - -/*********************************************************************** - * ScriptPlace (USP10.@) - * - * Produce advance widths for a run. - * - * PARAMS - * hdc [I] Device context. - * psc [I/O] Opaque pointer to a script cache. - * pwGlyphs [I] Array of glyphs. - * cGlyphs [I] Number of glyphs in pwGlyphs. - * psva [I] Array of visual attributes. - * psa [I/O] String analysis. - * piAdvance [O] Array of advance widths. - * pGoffset [O] Glyph offsets. - * pABC [O] Combined ABC width. - * - * RETURNS - * Success: S_OK - * Failure: Non-zero HRESULT value. - */ -HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, - int cGlyphs, const SCRIPT_VISATTR *psva, - SCRIPT_ANALYSIS *psa, int *piAdvance, GOFFSET *pGoffset, ABC *pABC ) -{ - int wcnt; - HRESULT hr; - LPABC lpABC; - - TRACE("(%p, %p, %p, %s, %d, %p, %p, %p)\n", hdc, psc, pwGlyphs, - debugstr_wn(pwGlyphs, cGlyphs), cGlyphs, psva, psa, piAdvance); - - if ((hr = get_script_cache(hdc, psc))) return hr; - - /* Here we need to calculate the width of the run unit. At this point the input string - * has been converted to glyphs and we still need to translate back to the original chars - * to get the correct ABC widths. */ - - if (!(lpABC = usp_zero_alloc(sizeof(ABC) * cGlyphs))) return E_OUTOFMEMORY; - - memset(pABC, 0, sizeof(ABC)); - - /* FIXME: set pGoffset to more reasonable values */ - if (!GetCharABCWidthsI(get_cache_hdc(psc), 0, cGlyphs, (WORD *) pwGlyphs, lpABC )) - { - WARN("Could not get ABC values\n"); - for (wcnt = 0; wcnt < cGlyphs; wcnt++) { - piAdvance[wcnt] = 0; - pGoffset[wcnt].du = 0; - pGoffset[wcnt].dv = 0; - } - } - else - { - for (wcnt = 0; wcnt < cGlyphs ; wcnt++) { /* add up the char lengths */ - TRACE(" Glyph=%04x, abcA=%d, abcB=%d, abcC=%d wcnt=%d\n", - pwGlyphs[wcnt], - lpABC[wcnt].abcA, - lpABC[wcnt].abcB, - lpABC[wcnt].abcC, wcnt); - pABC->abcA += lpABC[wcnt].abcA; - pABC->abcB += lpABC[wcnt].abcB; - pABC->abcC += lpABC[wcnt].abcC; - piAdvance[wcnt] = lpABC[wcnt].abcA + lpABC[wcnt].abcB + lpABC[wcnt].abcC; - pGoffset[wcnt].du = 0; - pGoffset[wcnt].dv = 0; - } - } - TRACE("Total for run: abcA=%d, abcB=%d, abcC=%d\n", pABC->abcA, pABC->abcB, pABC->abcC); - - usp_free(lpABC); - return S_OK; -} - -/*********************************************************************** - * ScriptGetCMap (USP10.@) - * - * Retrieve glyph indices. - * - * PARAMS - * hdc [I] Device context. - * psc [I/O] Opaque pointer to a script cache. - * pwcInChars [I] Array of Unicode characters. - * cChars [I] Number of characters in pwcInChars. - * dwFlags [I] Flags. - * pwOutGlyphs [O] Buffer to receive the array of glyph indices. - * - * RETURNS - * Success: S_OK - * Failure: Non-zero HRESULT value. - */ -HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars, - int cChars, DWORD dwFlags, WORD *pwOutGlyphs) -{ - int cnt; - HRESULT hr; - - TRACE("(%p,%p,%s,%d,0x%x,%p)\n", hdc, psc, debugstr_wn(pwcInChars, cChars), - cChars, dwFlags, pwOutGlyphs); - - if ((hr = get_script_cache(hdc, psc))) return hr; - - TRACE("Before: "); - for (cnt = 0; cnt < cChars; cnt++) - TRACE("%4x",pwcInChars[cnt]); - TRACE("\n"); - - GetGlyphIndicesW(get_cache_hdc(psc), pwcInChars, cChars, pwOutGlyphs, 0); - - TRACE("After: "); - for (cnt = 0; cnt < cChars; cnt++) { - TRACE("%04x",pwOutGlyphs[cnt]); - } - TRACE("\n"); - - return S_OK; -} - -/*********************************************************************** - * ScriptTextOut (USP10.@) - * - */ -HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UINT fuOptions, - const RECT *lprc, const SCRIPT_ANALYSIS *psa, const WCHAR *pwcReserved, - int iReserved, const WORD *pwGlyphs, int cGlyphs, const int *piAdvance, - const int *piJustify, const GOFFSET *pGoffset) -{ - HRESULT hr; - - TRACE("(%p, %p, %d, %d, %04x, %p, %p, %p, %d, %p, %d, %p, %p, %p)\n", - hdc, psc, x, y, fuOptions, lprc, psa, pwcReserved, iReserved, pwGlyphs, cGlyphs, - piAdvance, piJustify, pGoffset); - - if (!hdc && psc && !*psc) return E_INVALIDARG; - if (!piAdvance || !psa || !pwGlyphs) return E_INVALIDARG; - if ((hr = get_script_cache(hdc, psc))) return hr; - - fuOptions &= ETO_CLIPPED + ETO_OPAQUE; - if (!psa->fNoGlyphIndex) /* Have Glyphs? */ - fuOptions |= ETO_GLYPH_INDEX; /* Say don't do translation to glyph */ - - if (!ExtTextOutW(get_cache_hdc(psc), x, y, fuOptions, lprc, pwGlyphs, cGlyphs, NULL)) - return S_FALSE; - - return S_OK; -} - -/*********************************************************************** - * ScriptCacheGetHeight (USP10.@) - * - * Retrieve the height of the font in the cache. - * - * PARAMS - * hdc [I] Device context. - * psc [I/O] Opaque pointer to a script cache. - * height [O] Receives font height. - * - * RETURNS - * Success: S_OK - * Failure: Non-zero HRESULT value. - */ -HRESULT WINAPI ScriptCacheGetHeight(HDC hdc, SCRIPT_CACHE *psc, LONG *height) -{ - HRESULT hr; - - TRACE("(%p, %p, %p)\n", hdc, psc, height); - - if (!height) return E_INVALIDARG; - if ((hr = get_script_cache(hdc, psc))) return hr; - - *height = get_cache_height(psc); - return S_OK; -} - -/*********************************************************************** - * ScriptGetGlyphABCWidth (USP10.@) - * - * Retrieve the width of a glyph. - * - * PARAMS - * hdc [I] Device context. - * psc [I/O] Opaque pointer to a script cache. - * glyph [I] Glyph to retrieve the width for. - * abc [O] ABC widths of the glyph. - * - * RETURNS - * Success: S_OK - * Failure: Non-zero HRESULT value. - */ -HRESULT WINAPI ScriptGetGlyphABCWidth(HDC hdc, SCRIPT_CACHE *psc, WORD glyph, ABC *abc) -{ - HRESULT hr; - - TRACE("(%p, %p, 0x%04x, %p)\n", hdc, psc, glyph, abc); - - if ((hr = get_script_cache(hdc, psc))) return hr; - - /* FIXME: get this from the cache */ - if (!GetCharABCWidthsW(get_cache_hdc(psc), glyph, glyph, abc)) return E_HANDLE; - return S_OK; -} - -/*********************************************************************** - * ScriptLayout (USP10.@) - * - * Map embedding levels to visual and/or logical order. - * - * PARAMS - * runs [I] Size of level array. - * level [I] Array of embedding levels. - * vistolog [O] Map of embedding levels from visual to logical order. - * logtovis [O] Map of embedding levels from logical to visual order. - * - * RETURNS - * Success: S_OK - * Failure: Non-zero HRESULT value. - * - * BUGS - * This stub works correctly for any sequence of a single - * embedding level but not for sequences of different - * embedding levels, i.e. mixtures of RTL and LTR scripts. - */ -HRESULT WINAPI ScriptLayout(int runs, const BYTE *level, int *vistolog, int *logtovis) -{ - int i, j = runs - 1, k = 0; - - TRACE("(%d, %p, %p, %p)\n", runs, level, vistolog, logtovis); - - if (!level || (!vistolog && !logtovis)) - return E_INVALIDARG; - - for (i = 0; i < runs; i++) - { - if (level[i] % 2) - { - if (vistolog) *vistolog++ = j; - if (logtovis) *logtovis++ = j; - j--; - } - else - { - if (vistolog) *vistolog++ = k; - if (logtovis) *logtovis++ = k; - k++; - } - } - return S_OK; -} - -/*********************************************************************** - * ScriptStringGetLogicalWidths (USP10.@) - * - * Returns logical widths from a string analysis. - * - * PARAMS - * ssa [I] string analysis. - * piDx [O] logical widths returned. - * - * RETURNS - * Success: S_OK - * Failure: a non-zero HRESULT. - */ -HRESULT WINAPI ScriptStringGetLogicalWidths(SCRIPT_STRING_ANALYSIS ssa, int *piDx) -{ - int i, j, next = 0; - StringAnalysis *analysis = ssa; - - TRACE("%p, %p\n", ssa, piDx); - - if (!analysis) return S_FALSE; - - for (i = 0; i < analysis->numItems; i++) - { - for (j = 0; j < analysis->glyphs[i].numGlyphs; j++) - { - piDx[next] = analysis->glyphs[i].piAdvance[j]; - next++; - } - } - return S_OK; -} - -/*********************************************************************** - * ScriptStringValidate (USP10.@) - * - * Validate a string analysis. - * - * PARAMS - * ssa [I] string analysis. - * - * RETURNS - * Success: S_OK - * Failure: S_FALSE if invalid sequences are found - * or a non-zero HRESULT if it fails. - */ -HRESULT WINAPI ScriptStringValidate(SCRIPT_STRING_ANALYSIS ssa) -{ - StringAnalysis *analysis = ssa; - - TRACE("(%p)\n", ssa); - - if (!analysis) return E_INVALIDARG; - return (analysis->invalid) ? S_FALSE : S_OK; -} - -/*********************************************************************** - * ScriptString_pSize (USP10.@) - * - * Retrieve width and height of an analysed string. - * - * PARAMS - * ssa [I] string analysis. - * - * RETURNS - * Success: Pointer to a SIZE structure. - * Failure: NULL - */ -const SIZE * WINAPI ScriptString_pSize(SCRIPT_STRING_ANALYSIS ssa) -{ - unsigned int i, j; - StringAnalysis *analysis = ssa; - - TRACE("(%p)\n", ssa); - - if (!analysis) return NULL; - - if (!analysis->sz) - { - if (!(analysis->sz = usp_alloc(sizeof(SIZE)))) return NULL; - analysis->sz->cy = analysis->sc->height; - - analysis->sz->cx = 0; - for (i = 0; i < analysis->numItems; i++) - for (j = 0; j < analysis->glyphs[i].numGlyphs; j++) - analysis->sz->cx += analysis->glyphs[i].piAdvance[j]; - } - return analysis->sz; -} - -/*********************************************************************** - * ScriptString_pLogAttr (USP10.@) - * - * Retrieve logical attributes of an analysed string. - * - * PARAMS - * ssa [I] string analysis. - * - * RETURNS - * Success: Pointer to an array of SCRIPT_LOGATTR structures. - * Failure: NULL - */ -const SCRIPT_LOGATTR * WINAPI ScriptString_pLogAttr(SCRIPT_STRING_ANALYSIS ssa) -{ - StringAnalysis *analysis = ssa; - - TRACE("(%p)\n", ssa); - - if (!analysis) return NULL; - return analysis->logattrs; -} - -/*********************************************************************** - * ScriptString_pcOutChars (USP10.@) - * - * Retrieve the length of a string after clipping. - * - * PARAMS - * ssa [I] String analysis. - * - * RETURNS - * Success: Pointer to the length. - * Failure: NULL - */ -const int * WINAPI ScriptString_pcOutChars(SCRIPT_STRING_ANALYSIS ssa) -{ - StringAnalysis *analysis = ssa; - - TRACE("(%p)\n", ssa); - - if (!analysis) return NULL; - return &analysis->clip_len; -} - -/*********************************************************************** - * ScriptStringGetOrder (USP10.@) - * - * Retrieve a glyph order map. - * - * PARAMS - * ssa [I] String analysis. - * order [I/O] Array of glyph positions. - * - * RETURNS - * Success: S_OK - * Failure: a non-zero HRESULT. - */ -HRESULT WINAPI ScriptStringGetOrder(SCRIPT_STRING_ANALYSIS ssa, UINT *order) -{ - unsigned int i, j, k; - StringAnalysis *analysis = ssa; - - TRACE("(%p)\n", ssa); - - if (!analysis) return S_FALSE; - - /* FIXME: handle RTL scripts */ - for (i = 0, k = 0; i < analysis->numItems; i++) - for (j = 0; j < analysis->glyphs[i].numGlyphs; j++, k++) - order[k] = k; - - return S_OK; -} Removed: vendor/wine/dlls/usp10.spec URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10.spec?rev=25772&vi… ============================================================================== --- vendor/wine/dlls/usp10.spec (original) +++ vendor/wine/dlls/usp10.spec (removed) @@ -1,35 +1,0 @@ -@ stub LpkPresent -@ stdcall ScriptApplyDigitSubstitution(ptr ptr ptr) -@ stub ScriptApplyLogicalWidth -@ stdcall ScriptBreak(ptr long ptr ptr) -@ stdcall ScriptCPtoX(long long long long ptr ptr ptr ptr ptr) -@ stdcall ScriptCacheGetHeight(ptr ptr ptr) -@ stdcall ScriptFreeCache(ptr) -@ stdcall ScriptGetCMap(ptr ptr ptr long long ptr) -@ stdcall ScriptGetFontProperties(long ptr ptr) -@ stdcall ScriptGetGlyphABCWidth(ptr ptr long ptr) -@ stub ScriptGetLogicalWidths -@ stdcall ScriptGetProperties(ptr long) -@ stdcall ScriptIsComplex(wstr long long) -@ stdcall ScriptItemize(wstr long long ptr ptr ptr ptr) -@ stub ScriptJustify -@ stdcall ScriptLayout(long ptr ptr ptr) -@ stdcall ScriptPlace(ptr ptr ptr long ptr ptr ptr ptr ptr) -@ stdcall ScriptRecordDigitSubstitution(ptr ptr) -@ stdcall ScriptShape(ptr ptr ptr long long ptr ptr ptr ptr ptr) -@ stdcall ScriptStringAnalyse(ptr ptr long long long long long ptr ptr ptr ptr ptr ptr) -@ stdcall ScriptStringCPtoX(ptr long long ptr) -@ stdcall ScriptStringFree(ptr) -@ stdcall ScriptStringGetLogicalWidths(ptr ptr) -@ stdcall ScriptStringGetOrder(ptr ptr) -@ stdcall ScriptStringOut(ptr long long long ptr long long long) -@ stdcall ScriptStringValidate(ptr) -@ stdcall ScriptStringXtoCP(ptr long ptr ptr) -@ stdcall ScriptString_pLogAttr(ptr) -@ stdcall ScriptString_pSize(ptr) -@ stdcall ScriptString_pcOutChars(ptr) -@ stdcall ScriptTextOut(ptr ptr long long long ptr ptr ptr long ptr long ptr ptr ptr) -@ stdcall ScriptXtoCP(long long long ptr ptr ptr ptr ptr ptr) -@ stub UspAllocCache -@ stub UspAllocTemp -@ stub UspFreeMem

17 years, 10 months

← Newer
1
...
13
14
15
16
17
18
19
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2007