Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 25787: - Fix a few warnings
by janderwald＠svn.reactos.org 11 Feb '07

11 Feb '07

Author: janderwald Date: Sun Feb 11 18:23:48 2007 New Revision: 25787 URL: http://svn.reactos.org/svn/reactos?rev=25787&view=rev Log: - Fix a few warnings Modified: trunk/reactos/lib/3rdparty/adns/src/check.c trunk/reactos/lib/3rdparty/adns/src/event.c trunk/reactos/lib/3rdparty/adns/src/general.c trunk/reactos/lib/3rdparty/adns/src/setup.c Modified: trunk/reactos/lib/3rdparty/adns/src/check.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/adns/src/chec… ============================================================================== --- trunk/reactos/lib/3rdparty/adns/src/check.c (original) +++ trunk/reactos/lib/3rdparty/adns/src/check.c Sun Feb 11 18:23:48 2007 @@ -102,7 +102,7 @@ static void checkc_global(adns_state ads) { int i; - assert(ads->udpsocket >= 0); + assert(ads->udpsocket != INVALID_SOCKET); for (i=0; i<ads->nsortlist; i++) assert(!(ads->sortlist[i].base.s_addr & ~ads->sortlist[i].mask.s_addr)); @@ -111,7 +111,7 @@ switch (ads->tcpstate) { case server_connecting: - assert(ads->tcpsocket >= 0); + assert(ads->tcpsocket != INVALID_SOCKET); checkc_notcpbuf(ads); break; case server_disconnected: @@ -120,7 +120,7 @@ checkc_notcpbuf(ads); break; case server_ok: - assert(ads->tcpsocket >= 0); + assert(ads->tcpsocket != INVALID_SOCKET); assert(ads->tcprecv_skip <= ads->tcprecv.used); break; default: Modified: trunk/reactos/lib/3rdparty/adns/src/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/adns/src/even… ============================================================================== --- trunk/reactos/lib/3rdparty/adns/src/event.c (original) +++ trunk/reactos/lib/3rdparty/adns/src/event.c Sun Feb 11 18:23:48 2007 @@ -114,7 +114,7 @@ ADNS_CLEAR_ERRNO fd= socket(AF_INET,SOCK_STREAM,proto->p_proto); ADNS_CAPTURE_ERRNO; - if (fd<0) { + if (fd == INVALID_SOCKET) { adns__diag(ads,-1,0,"cannot create TCP socket: %s",strerror(errno)); return; } Modified: trunk/reactos/lib/3rdparty/adns/src/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/adns/src/gene… ============================================================================== --- trunk/reactos/lib/3rdparty/adns/src/general.c (original) +++ trunk/reactos/lib/3rdparty/adns/src/general.c Sun Feb 11 18:23:48 2007 @@ -254,7 +254,7 @@ SINFO( nodata, "No such data" ) }; -static int si_compar(const void *key, const void *elem) { +static int __cdecl si_compar(const void *key, const void *elem) { const adns_status *st= key; const struct sinfo *si= elem; @@ -295,7 +295,7 @@ STINFO( permfail ) }; -static int sti_compar(const void *key, const void *elem) { +static int __cdecl sti_compar(const void *key, const void *elem) { const adns_status *st= key; const struct stinfo *sti= elem; Modified: trunk/reactos/lib/3rdparty/adns/src/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/adns/src/setu… ============================================================================== --- trunk/reactos/lib/3rdparty/adns/src/setup.c (original) +++ trunk/reactos/lib/3rdparty/adns/src/setup.c Sun Feb 11 18:23:48 2007 @@ -536,7 +536,7 @@ ADNS_CLEAR_ERRNO; ads->udpsocket= socket(AF_INET,SOCK_DGRAM,proto->p_proto); ADNS_CAPTURE_ERRNO; - if (ads->udpsocket<0) { r= errno; goto x_free; } + if (ads->udpsocket == INVALID_SOCKET) { r= errno; goto x_free; } r= adns__setnonblock(ads,ads->udpsocket); if (r) { r= errno; goto x_closeudp; } @@ -682,7 +682,7 @@ else break; } adns_socket_close(ads->udpsocket); - if (ads->tcpsocket >= 0) adns_socket_close(ads->tcpsocket); + if (ads->tcpsocket != INVALID_SOCKET) adns_socket_close(ads->tcpsocket); adns__vbuf_free(&ads->tcpsend); adns__vbuf_free(&ads->tcprecv); freesearchlist(ads);

1 0

[greatlrd] 25786: adding some comment after review how it works in windows. I doing my own syscall in windows 2000 to see how it act and base my knowledges of that to correct some part of win32k dx handling.
by greatlrd＠svn.reactos.org 11 Feb '07

11 Feb '07

Author: greatlrd Date: Sun Feb 11 18:19:22 2007 New Revision: 25786 URL: http://svn.reactos.org/svn/reactos?rev=25786&view=rev Log: adding some comment after review how it works in windows. I doing my own syscall in windows 2000 to see how it act and base my knowledges of that to correct some part of win32k dx handling. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Sun Feb 11 18:19:22 2007 @@ -52,6 +52,19 @@ return TRUE; } + +/* Documations how it works in windows and what we should do +* + * HANDLE NtGdiDdCreateDirectDrawObject(HDC hdc) + * + * Use CreateDCW(LDisplay,NULL,NULL,NULL); or some thing else to create a DC. +.* + * A NULL DC are not accpect it return 0 as error + * + * How the interal works see msdn and ddk that is egunt inforamtions to figour or see reactos + * source code. ReactOS interal working diffent here what windows does. + */ + HANDLE STDCALL NtGdiDdCreateDirectDrawObject(HDC hdc) { @@ -80,7 +93,6 @@ if (hdc == NULL) { - DPRINT1("FIXME hdc is NULL \n"); return NULL; } } @@ -183,6 +195,8 @@ DPRINT1("DirectDraw return handler 0x%x\n",hDirectDraw); return hDirectDraw; } + + BOOL STDCALL NtGdiDdDeleteDirectDrawObject( HANDLE hDirectDrawLocal)

1 0

[janderwald] 25785: fix svn properties
by janderwald＠svn.reactos.org 11 Feb '07

11 Feb '07

Author: janderwald Date: Sun Feb 11 18:14:04 2007 New Revision: 25785 URL: http://svn.reactos.org/svn/reactos?rev=25785&view=rev Log: fix svn properties Modified: trunk/reactos/dll/win32/smdll/query.c (props changed) Propchange: trunk/reactos/dll/win32/smdll/query.c ------------------------------------------------------------------------------ svn:keywords = author date id revision

1 0

[janderwald] 25784: - remove stdcall decoration
by janderwald＠svn.reactos.org 11 Feb '07

11 Feb '07

Author: janderwald Date: Sun Feb 11 18:12:49 2007 New Revision: 25784 URL: http://svn.reactos.org/svn/reactos?rev=25784&view=rev Log: - remove stdcall decoration Modified: trunk/reactos/dll/win32/samsrv/samsrv.def Modified: trunk/reactos/dll/win32/samsrv/samsrv.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.de… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.def (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.def Sun Feb 11 18:12:49 2007 @@ -18,12 +18,12 @@ ;SamIFree_SAMPR_USER_INFO_BUFFER ;SamIGetPrivateData ;SamIGetSerialNumberDomain -SamIInitialize@0 +SamIInitialize ;SamINotifyDelta ;SamISetAuditingInformation ;SamISetPrivateData ;SamISetSerialNumberDomain -SampInitializeRegistry@0 +SampInitializeRegistry ;SampRtlConvertUlongToUnicodeString ;SamrAddMemberToAlias ;SamrAddMemberToGroup

1 0

[fireball] 25783: Right now, it's not enough to just set the bios video mode to 0x12, other stuff like choosing correct font is needed. Fixes "no text output in 1st stage setup" bug (and it still sets the videomode to 0x12, so it's not a hack).
by fireball＠svn.reactos.org 11 Feb '07

11 Feb '07

Author: fireball Date: Sun Feb 11 16:37:39 2007 New Revision: 25783 URL: http://svn.reactos.org/svn/reactos?rev=25783&view=rev Log: Right now, it's not enough to just set the bios video mode to 0x12, other stuff like choosing correct font is needed. Fixes "no text output in 1st stage setup" bug (and it still sets the videomode to 0x12, so it's not a hack). Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c Sun Feb 11 16:37:39 2007 @@ -1108,7 +1108,7 @@ VOID PcVideoPrepareForReactOS(VOID) { - PcVideoSetBiosMode(0x12); + PcVideoSetMode80x50_80x43(); PcVideoHideShowTextCursor(FALSE); }

1 0

[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 11 Feb '07

11 Feb '07

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

1 0

[spetreolle] 25781: move from branch
by spetreolle＠svn.reactos.org 11 Feb '07

11 Feb '07

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/

1 0

[spetreolle] 25780: delete empty dir
by spetreolle＠svn.reactos.org 11 Feb '07

11 Feb '07

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/

1 0

[greatlrd] 25779: adding winetest from the vendor drop for usp10.dll
by greatlrd＠svn.reactos.org 11 Feb '07

11 Feb '07

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>

1 0

[greatlrd] 25778: sorry I forget the rbuild for the usp10 it self :(
by greatlrd＠svn.reactos.org 11 Feb '07

11 Feb '07

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

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs