November 2005 - Wine-Commits

wine/dlls/user focus.c
by Alexandre Julliard Nov. 15, 2005

Nov. 15, 2005

ChangeSet ID: 21280 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/15 10:53:26 Modified files: dlls/user : focus.c Log message: Dmitry Timoshkov <dmitry(a)codeweavers.com> Do not change focus if the being activated window is no longer active. Patch: http://cvs.winehq.org/patch.py?id=21280 Old revision New revision Changes Path 1.15 1.16 +9 -3 wine/dlls/user/focus.c Index: wine/dlls/user/focus.c diff -u -p wine/dlls/user/focus.c:1.15 wine/dlls/user/focus.c:1.16 --- wine/dlls/user/focus.c:1.15 15 Nov 2005 16:53:26 -0000 +++ wine/dlls/user/focus.c 15 Nov 2005 16:53:26 -0000 @@ -161,9 +161,15 @@ static BOOL set_active_window( HWND hwnd /* now change focus if necessary */ if (focus) { - HWND curfocus = GetFocus(); - if (!curfocus || !hwnd || GetAncestor( curfocus, GA_ROOT ) != hwnd) - set_focus_window( hwnd ); + GUITHREADINFO info; + + GetGUIThreadInfo( GetCurrentThreadId(), &info ); + /* Do not change focus if the window is no more active */ + if (hwnd == info.hwndActive) + { + if (!info.hwndFocus || !hwnd || GetAncestor( info.hwndFocus, GA_ROOT ) != hwnd) + set_focus_window( hwnd ); + } } return TRUE;

1 0

wine/dlls/kernel/tests drive.c
by Alexandre Julliard Nov. 15, 2005

Nov. 15, 2005

ChangeSet ID: 21279 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/15 10:53:09 Modified files: dlls/kernel/tests: drive.c Log message: Detlef Riekenberg <wine.dev(a)web.de> Made test loadable on NT 3.51 again (GetDiskFreeSpaceExA not present). Patch: http://cvs.winehq.org/patch.py?id=21279 Old revision New revision Changes Path 1.7 1.8 +8 -2 wine/dlls/kernel/tests/drive.c Index: wine/dlls/kernel/tests/drive.c diff -u -p wine/dlls/kernel/tests/drive.c:1.7 wine/dlls/kernel/tests/drive.c:1.8 --- wine/dlls/kernel/tests/drive.c:1.7 15 Nov 2005 16:53: 9 -0000 +++ wine/dlls/kernel/tests/drive.c 15 Nov 2005 16:53: 9 -0000 @@ -25,6 +25,8 @@ #include "winbase.h" #include "winerror.h" +static DWORD (WINAPI *pGetDiskFreeSpaceExA)(LPCSTR, PULARGE_INTEGER, PULARGE_INTEGER, PULARGE_INTEGER); + static void test_GetDriveTypeA(void) { char drive[] = "?:\\"; @@ -123,12 +125,13 @@ static void test_GetDiskFreeSpaceA(void) /* win3.0 thru winME */ ok( total_clusters <= 65535, "total clusters is %ld > 65535\n", total_clusters); - else { + else if (pGetDiskFreeSpaceExA) { /* NT, 2k, XP : GetDiskFreeSpace shoud be accurate */ ULARGE_INTEGER totEx, tot, d; + tot.QuadPart = sectors_per_cluster; tot.QuadPart = (tot.QuadPart * bytes_per_sector) * total_clusters; - ret = GetDiskFreeSpaceExA( drive, &d, &totEx, NULL); + ret = pGetDiskFreeSpaceExA( drive, &d, &totEx, NULL); ok( ret, "GetDiskFreeSpaceExA( %s ) failed. GetLastError=%ld\n", drive, GetLastError()); ok( bytes_per_sector == 0 || /* empty cd rom drive */ totEx.QuadPart <= tot.QuadPart, @@ -194,6 +197,9 @@ static void test_GetDiskFreeSpaceW(void) START_TEST(drive) { + HANDLE hkernel32 = GetModuleHandleA("kernel32"); + pGetDiskFreeSpaceExA = (void *) GetProcAddress(hkernel32, "GetDiskFreeSpaceExA"); + test_GetDriveTypeA(); test_GetDriveTypeW();

1 0

wine/dlls/winspool/tests info.c
by Alexandre Julliard Nov. 15, 2005

Nov. 15, 2005

ChangeSet ID: 21278 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/15 10:51:45 Modified files: dlls/winspool/tests: info.c Log message: Detlef Riekenberg <wine.dev(a)web.de> Some extra tests for GetPrinterDriverDirectory. Display a TRACE when the Service "spooler" is not running (NT). Patch: http://cvs.winehq.org/patch.py?id=21278 Old revision New revision Changes Path 1.10 1.11 +86 -0 wine/dlls/winspool/tests/info.c Index: wine/dlls/winspool/tests/info.c diff -u -p wine/dlls/winspool/tests/info.c:1.10 wine/dlls/winspool/tests/info.c:1.11 --- wine/dlls/winspool/tests/info.c:1.10 15 Nov 2005 16:51:45 -0000 +++ wine/dlls/winspool/tests/info.c 15 Nov 2005 16:51:45 -0000 @@ -25,6 +25,11 @@ #include "wingdi.h" #include "winspool.h" + +static char env_x86[] = "Windows NT x86"; +static char env_win9x_case[] = "windowS 4.0"; + + static void test_default_printer(void) { #define DEFAULT_PRINTER_SIZE 1000 @@ -118,16 +123,27 @@ static void test_printer_directory(void) DWORD cbBuf = 0, pcbNeeded = 0; BOOL res; + SetLastError(0x00dead00); res = GetPrinterDriverDirectoryA( NULL, NULL, 1, NULL, 0, &cbBuf); trace("GetPrinterDriverDirectoryA: first call returned 0x%04x, " "buffer size 0x%08lx\n", res, cbBuf); + if((res == 0) && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) + { + trace("The Service 'Spooler' is required for this test\n"); + return; + } + ok((res == 0) && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "returned %d with lasterror=%ld (expected '0' with " \ + "ERROR_INSUFFICIENT_BUFFER)\n", res, GetLastError()); + if (!cbBuf) { trace("no valid buffer size returned, skipping tests\n"); return; } buffer = HeapAlloc( GetProcessHeap(), 0, cbBuf*2); + if (buffer == NULL) return ; res = GetPrinterDriverDirectoryA(NULL, NULL, 1, buffer, cbBuf, &pcbNeeded); ok( res, "expected result != 0, got %d\n", res); @@ -139,14 +155,18 @@ static void test_printer_directory(void) ok( cbBuf == pcbNeeded, "pcbNeeded set to %ld instead of %ld\n", pcbNeeded, cbBuf); + SetLastError(0x00dead00); res = GetPrinterDriverDirectoryA( NULL, NULL, 1, buffer, cbBuf-1, &pcbNeeded); ok( !res , "expected result == 0, got %d\n", res); ok( cbBuf == pcbNeeded, "pcbNeeded set to %ld instead of %ld\n", pcbNeeded, cbBuf); + todo_wine { ok( ERROR_INSUFFICIENT_BUFFER == GetLastError(), "last error set to %ld instead of ERROR_INSUFFICIENT_BUFFER\n", GetLastError()); + } + SetLastError(0x00dead00); res = GetPrinterDriverDirectoryA( NULL, NULL, 1, NULL, cbBuf, &pcbNeeded); ok( (!res && ERROR_INVALID_USER_BUFFER == GetLastError()) || ( res && ERROR_INVALID_PARAMETER == GetLastError()) , @@ -155,12 +175,14 @@ static void test_printer_directory(void) "or result != 0 and last error == ERROR_INVALID_PARAMETER " "got result %d and last error == %ld\n", res, GetLastError()); + SetLastError(0x00dead00); res = GetPrinterDriverDirectoryA( NULL, NULL, 1, buffer, cbBuf, NULL); ok( (!res && RPC_X_NULL_REF_POINTER == GetLastError()) || res, "expected either result == 0 and " "last error == RPC_X_NULL_REF_POINTER or result != 0 " "got result %d and last error == %ld\n", res, GetLastError()); + SetLastError(0x00dead00); res = GetPrinterDriverDirectoryA( NULL, NULL, 1, NULL, cbBuf, NULL); ok( (!res && RPC_X_NULL_REF_POINTER == GetLastError()) || ( res && ERROR_INVALID_PARAMETER == GetLastError()) , @@ -169,6 +191,70 @@ static void test_printer_directory(void) "or result != 0 and last error == ERROR_INVALID_PARAMETER " "got result %d and last error == %ld\n", res, GetLastError()); + /* with a valid buffer, but level is to large */ + buffer[0] = '\0'; + SetLastError(0x00dead00); + res = GetPrinterDriverDirectoryA(NULL, NULL, 2, buffer, cbBuf, &pcbNeeded); + + /* Level not checked in win9x and wine:*/ + if((res != FALSE) && buffer[0]) + { + trace("invalid Level '2' not checked (valid Level is '1') => '%s'\n", + buffer); + } + else + { + ok( !res && (GetLastError() == ERROR_INVALID_LEVEL), + "returned %d with lasterror=%ld (expected '0' with " \ + "ERROR_INVALID_LEVEL)\n", res, GetLastError()); + } + + /* printing environments are case insensitive */ + /* "Windows 4.0" is valid for win9x and NT */ + buffer[0] = '\0'; + SetLastError(0x00dead00); + res = GetPrinterDriverDirectoryA(NULL, env_win9x_case, 1, + buffer, cbBuf*2, &pcbNeeded); + + if(!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { + cbBuf = pcbNeeded; + buffer = HeapReAlloc(GetProcessHeap(), 0, buffer, cbBuf*2); + if (buffer == NULL) return ; + + SetLastError(0x00dead00); + res = GetPrinterDriverDirectoryA(NULL, env_win9x_case, 1, + buffer, cbBuf*2, &pcbNeeded); + } + + todo_wine{ + ok(res && buffer[0], "returned %d with " \ + "lasterror=%ld and len=%d (expected '0' with 'len > 0')\n", + res, GetLastError(), lstrlenA((char *)buffer)); + } + + buffer[0] = '\0'; + SetLastError(0x00dead00); + res = GetPrinterDriverDirectoryA(NULL, env_x86, 1, + buffer, cbBuf*2, &pcbNeeded); + + if(!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { + cbBuf = pcbNeeded; + buffer = HeapReAlloc(GetProcessHeap(), 0, buffer, cbBuf*2); + if (buffer == NULL) return ; + + buffer[0] = '\0'; + SetLastError(0x00dead00); + res = GetPrinterDriverDirectoryA(NULL, env_x86, 1, + buffer, cbBuf*2, &pcbNeeded); + } + + /* "Windows NT x86" is invalid for win9x */ + ok( (res && buffer[0]) || + (!res && (GetLastError() == ERROR_INVALID_ENVIRONMENT)), + "returned %d with lasterror=%ld and len=%d (expected '!= 0' with " \ + "'len > 0' or '0' with ERROR_INVALID_ENVIRONMENT)\n", + res, GetLastError(), lstrlenA((char *)buffer)); + HeapFree( GetProcessHeap(), 0, buffer); }

1 0

wine/dlls/kernel comm.c
by Alexandre Julliard Nov. 15, 2005

Nov. 15, 2005

ChangeSet ID: 21277 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/15 10:51:28 Modified files: dlls/kernel : comm.c Log message: Cihan Altinay <cihan(a)uq.edu.au> Disable PARMRK input flag of serial ports. Patch: http://cvs.winehq.org/patch.py?id=21277 Old revision New revision Changes Path 1.100 1.101 +2 -2 wine/dlls/kernel/comm.c Index: wine/dlls/kernel/comm.c diff -u -p wine/dlls/kernel/comm.c:1.100 wine/dlls/kernel/comm.c:1.101 --- wine/dlls/kernel/comm.c:1.100 15 Nov 2005 16:51:28 -0000 +++ wine/dlls/kernel/comm.c 15 Nov 2005 16:51:28 -0000 @@ -1101,9 +1101,9 @@ BOOL WINAPI SetCommState( port.c_cc[VTIME] = 1; #ifdef IMAXBEL - port.c_iflag &= ~(ISTRIP|BRKINT|IGNCR|ICRNL|INLCR|IMAXBEL); + port.c_iflag &= ~(ISTRIP|BRKINT|IGNCR|ICRNL|INLCR|PARMRK|IMAXBEL); #else - port.c_iflag &= ~(ISTRIP|BRKINT|IGNCR|ICRNL|INLCR); + port.c_iflag &= ~(ISTRIP|BRKINT|IGNCR|ICRNL|INLCR|PARMRK); #endif port.c_iflag |= (IGNBRK);

1 0

wine/ programs/winefile/Ko.rc programs/view/Ko ...
by Alexandre Julliard Nov. 15, 2005

Nov. 15, 2005

ChangeSet ID: 21276 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/15 06:06:13 Modified files: programs/winefile: Ko.rc programs/view : Ko.rc programs/uninstaller: Ko.rc programs/taskmgr: Ko.rc dlls/wldap32 : wldap32_Ko.rc dlls/mshtml : Ko.rc dlls/avifil32 : avifile_Ko.rc Log message: YunSong Hwang <hys545(a)dreamwiz.com> Update Korean translations. Patch: http://cvs.winehq.org/patch.py?id=21276 Old revision New revision Changes Path 1.1 1.2 +30 -30 wine/programs/winefile/Ko.rc 1.1 1.2 +3 -3 wine/programs/view/Ko.rc 1.1 1.2 +3 -3 wine/programs/uninstaller/Ko.rc 1.1 1.2 +1 -1 wine/programs/taskmgr/Ko.rc 1.1 1.2 +5 -5 wine/dlls/wldap32/wldap32_Ko.rc 1.1 1.2 +2 -1 wine/dlls/mshtml/Ko.rc 1.1 1.2 +6 -6 wine/dlls/avifil32/avifile_Ko.rc

1 0

wine/dlls/ntdll signal_i386.c resource.c
by Alexandre Julliard Nov. 15, 2005

Nov. 15, 2005

ChangeSet ID: 21275 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/15 06:05:45 Modified files: dlls/ntdll : signal_i386.c resource.c Log message: Use proper asm name for external functions. Patch: http://cvs.winehq.org/patch.py?id=21275 Old revision New revision Changes Path 1.103 1.104 +1 -1 wine/dlls/ntdll/signal_i386.c 1.17 1.18 +1 -1 wine/dlls/ntdll/resource.c Index: wine/dlls/ntdll/signal_i386.c diff -u -p wine/dlls/ntdll/signal_i386.c:1.103 wine/dlls/ntdll/signal_i386.c:1.104 --- wine/dlls/ntdll/signal_i386.c:1.103 15 Nov 2005 12: 5:45 -0000 +++ wine/dlls/ntdll/signal_i386.c 15 Nov 2005 12: 5:45 -0000 @@ -1456,7 +1456,7 @@ __ASM_GLOBAL_FUNC( EXC_CallHandler, " pushl 16(%ebp)\n" " pushl 12(%ebp)\n" " pushl 8(%ebp)\n" -" call call_exception_handler\n" +" call " __ASM_NAME("call_exception_handler") "\n" " leave\n" " ret\n" ); Index: wine/dlls/ntdll/resource.c diff -u -p wine/dlls/ntdll/resource.c:1.17 wine/dlls/ntdll/resource.c:1.18 --- wine/dlls/ntdll/resource.c:1.17 15 Nov 2005 12: 5:45 -0000 +++ wine/dlls/ntdll/resource.c 15 Nov 2005 12: 5:45 -0000 @@ -371,7 +371,7 @@ __ASM_GLOBAL_FUNC( LdrAccessResource, "pushl 16(%ebp)\n" "pushl 12(%ebp)\n" "pushl 8(%ebp)\n" - "call access_resource\n" + "call " __ASM_NAME("access_resource") "\n" "leave\n" "ret $16\n" );

1 0

wine/dlls/ntdll tests/rtl.c sec.c
by Alexandre Julliard Nov. 15, 2005

Nov. 15, 2005

ChangeSet ID: 21274 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/15 06:03:46 Modified files: dlls/ntdll/tests: rtl.c dlls/ntdll : sec.c Log message: Dmitry Timoshkov <dmitry(a)codeweavers.com> Add a test for RtlAllocateAndInitializeSid, make it pass under Wine. Patch: http://cvs.winehq.org/patch.py?id=21274 Old revision New revision Changes Path 1.17 1.18 +25 -0 wine/dlls/ntdll/tests/rtl.c 1.67 1.68 +28 -28 wine/dlls/ntdll/sec.c Index: wine/dlls/ntdll/tests/rtl.c diff -u -p wine/dlls/ntdll/tests/rtl.c:1.17 wine/dlls/ntdll/tests/rtl.c:1.18 --- wine/dlls/ntdll/tests/rtl.c:1.17 15 Nov 2005 12: 3:46 -0000 +++ wine/dlls/ntdll/tests/rtl.c 15 Nov 2005 12: 3:46 -0000 @@ -64,6 +64,8 @@ static BOOLEAN (WINAPI * pRtlIsValidIn static NTSTATUS (WINAPI * pRtlDestroyHandleTable)(RTL_HANDLE_TABLE *); static RTL_HANDLE * (WINAPI * pRtlAllocateHandle)(RTL_HANDLE_TABLE *, ULONG *); static BOOLEAN (WINAPI * pRtlFreeHandle)(RTL_HANDLE_TABLE *, RTL_HANDLE *); +static NTSTATUS (WINAPI *pRtlAllocateAndInitializeSid)(PSID_IDENTIFIER_AUTHORITY,BYTE,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,PSID*); +static NTSTATUS (WINAPI *pRtlFreeSid)(PSID); #define LEN 16 static const char* src_src = "This is a test!"; /* 16 bytes long, incl NUL */ static ULONG src_aligned_block[4]; @@ -93,6 +95,8 @@ static void InitFunctionPtrs(void) pRtlDestroyHandleTable = (void *)GetProcAddress(hntdll, "RtlDestroyHandleTable"); pRtlAllocateHandle = (void *)GetProcAddress(hntdll, "RtlAllocateHandle"); pRtlFreeHandle = (void *)GetProcAddress(hntdll, "RtlFreeHandle"); + pRtlAllocateAndInitializeSid = (void *)GetProcAddress(hntdll, "RtlAllocateAndInitializeSid"); + pRtlFreeSid = (void *)GetProcAddress(hntdll, "RtlFreeSid"); } strcpy((char*)src_aligned_block, src_src); ok(strlen(src) == 15, "Source must be 16 bytes long!\n"); @@ -878,6 +882,25 @@ static void test_HandleTables(void) ok(status == STATUS_SUCCESS, "RtlDestroyHandleTable failed with error 0x%08lx\n", status); } +static void test_RtlAllocateAndInitializeSid(void) +{ + NTSTATUS ret; + SID_IDENTIFIER_AUTHORITY sia = {{ 1, 2, 3, 4, 5, 6 }}; + PSID psid; + + ret = pRtlAllocateAndInitializeSid(&sia, 0, 1, 2, 3, 4, 5, 6, 7, 8, &psid); + ok(!ret, "RtlAllocateAndInitializeSid error %08lx\n", ret); + ret = pRtlFreeSid(psid); + ok(!ret, "RtlFreeSid error %08lx\n", ret); + + /* these tests crash on XP + ret = pRtlAllocateAndInitializeSid(NULL, 0, 1, 2, 3, 4, 5, 6, 7, 8, &psid); + ret = pRtlAllocateAndInitializeSid(&sia, 0, 1, 2, 3, 4, 5, 6, 7, 8, NULL);*/ + + ret = pRtlAllocateAndInitializeSid(&sia, 9, 1, 2, 3, 4, 5, 6, 7, 8, &psid); + ok(ret == STATUS_INVALID_SID, "wrong error %08lx\n", ret); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -908,4 +931,6 @@ START_TEST(rtl) test_RtlComputeCrc32(); if (pRtlInitializeHandleTable) test_HandleTables(); + if (pRtlAllocateAndInitializeSid) + test_RtlAllocateAndInitializeSid(); } Index: wine/dlls/ntdll/sec.c diff -u -p wine/dlls/ntdll/sec.c:1.67 wine/dlls/ntdll/sec.c:1.68 --- wine/dlls/ntdll/sec.c:1.67 15 Nov 2005 12: 3:46 -0000 +++ wine/dlls/ntdll/sec.c 15 Nov 2005 12: 3:46 -0000 @@ -135,41 +135,41 @@ NTSTATUS WINAPI RtlAllocateAndInitialize DWORD nSubAuthority6, DWORD nSubAuthority7, PSID *pSid ) { + SID *tmp_sid; - TRACE("(%p, 0x%04x,0x%08lx,0x%08lx,0x%08lx,0x%08lx,0x%08lx,0x%08lx,0x%08lx,0x%08lx,%p)\n", + TRACE("(%p, 0x%04x,0x%08lx,0x%08lx,0x%08lx,0x%08lx,0x%08lx,0x%08lx,0x%08lx,0x%08lx,%p)\n", pIdentifierAuthority,nSubAuthorityCount, nSubAuthority0, nSubAuthority1, nSubAuthority2, nSubAuthority3, nSubAuthority4, nSubAuthority5, nSubAuthority6, nSubAuthority7, pSid); - if (!(*pSid = RtlAllocateHeap( GetProcessHeap(), 0, - RtlLengthRequiredSid(nSubAuthorityCount)))) - return STATUS_NO_MEMORY; + if (nSubAuthorityCount > 8) return STATUS_INVALID_SID; - ((SID*)*pSid)->Revision = SID_REVISION; - - if (pIdentifierAuthority) - memcpy(&((SID*)*pSid)->IdentifierAuthority, pIdentifierAuthority, sizeof (SID_IDENTIFIER_AUTHORITY)); - *RtlSubAuthorityCountSid(*pSid) = nSubAuthorityCount; - - if (nSubAuthorityCount > 0) - *RtlSubAuthoritySid(*pSid, 0) = nSubAuthority0; - if (nSubAuthorityCount > 1) - *RtlSubAuthoritySid(*pSid, 1) = nSubAuthority1; - if (nSubAuthorityCount > 2) - *RtlSubAuthoritySid(*pSid, 2) = nSubAuthority2; - if (nSubAuthorityCount > 3) - *RtlSubAuthoritySid(*pSid, 3) = nSubAuthority3; - if (nSubAuthorityCount > 4) - *RtlSubAuthoritySid(*pSid, 4) = nSubAuthority4; - if (nSubAuthorityCount > 5) - *RtlSubAuthoritySid(*pSid, 5) = nSubAuthority5; - if (nSubAuthorityCount > 6) - *RtlSubAuthoritySid(*pSid, 6) = nSubAuthority6; - if (nSubAuthorityCount > 7) - *RtlSubAuthoritySid(*pSid, 7) = nSubAuthority7; - - return STATUS_SUCCESS; + if (!(tmp_sid= RtlAllocateHeap( GetProcessHeap(), 0, + RtlLengthRequiredSid(nSubAuthorityCount)))) + return STATUS_NO_MEMORY; + + tmp_sid->Revision = SID_REVISION; + + if (pIdentifierAuthority) + memcpy(&tmp_sid->IdentifierAuthority, pIdentifierAuthority, sizeof(SID_IDENTIFIER_AUTHORITY)); + tmp_sid->SubAuthorityCount = nSubAuthorityCount; + + switch( nSubAuthorityCount ) + { + case 8: tmp_sid->SubAuthority[7]= nSubAuthority7; + case 7: tmp_sid->SubAuthority[6]= nSubAuthority6; + case 6: tmp_sid->SubAuthority[5]= nSubAuthority5; + case 5: tmp_sid->SubAuthority[4]= nSubAuthority4; + case 4: tmp_sid->SubAuthority[3]= nSubAuthority3; + case 3: tmp_sid->SubAuthority[2]= nSubAuthority2; + case 2: tmp_sid->SubAuthority[1]= nSubAuthority1; + case 1: tmp_sid->SubAuthority[0]= nSubAuthority0; + break; + } + *pSid = tmp_sid; + return STATUS_SUCCESS; } + /****************************************************************************** * RtlEqualSid [NTDLL.@] *

1 0

wine/dlls/shdocvw webbrowser.c shdocvw.h Makef ...
by Alexandre Julliard Nov. 15, 2005

Nov. 15, 2005

ChangeSet ID: 21273 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/15 06:03:26 Modified files: dlls/shdocvw : webbrowser.c shdocvw.h Makefile.in Added files: dlls/shdocvw : client.c Log message: Jacek Caban <jacek(a)codeweavers.com> Beginning implementation of Navigate2. Patch: http://cvs.winehq.org/patch.py?id=21273 Old revision New revision Changes Path 1.21 1.22 +68 -2 wine/dlls/shdocvw/webbrowser.c 1.25 1.26 +12 -0 wine/dlls/shdocvw/shdocvw.h 1.18 1.19 +1 -0 wine/dlls/shdocvw/Makefile.in Added 1.1 +0 -0 wine/dlls/shdocvw/client.c

1 0

wine/dlls/wined3d wined3d_private.h vertexshad ...
by Alexandre Julliard Nov. 15, 2005

Nov. 15, 2005

ChangeSet ID: 21272 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/15 06:03:13 Modified files: dlls/wined3d : wined3d_private.h vertexshader.c drawprim.c device.c Log message: Raphael Junqueira <fenix(a)club-internet.fr> - defined D3DCOLOR_B macros to access byte values of D3DCOLOR - use D3DCOLOR macros instead of using shift + masks - fix a bug where diffuse.lpData checked instead of specular.lpData - implement color fixup on ARB VShader compilation code: -> on input parameters using swizzle -> add is_color parameter on vshader_program_add_param Patch: http://cvs.winehq.org/patch.py?id=21272 Old revision New revision Changes Path 1.67 1.68 +5 -0 wine/dlls/wined3d/wined3d_private.h 1.15 1.16 +67 -47 wine/dlls/wined3d/vertexshader.c 1.33 1.34 +17 -17 wine/dlls/wined3d/drawprim.c 1.96 1.97 +4 -4 wine/dlls/wined3d/device.c

1 0

wine/ include/usp10.h dlls/usp10/usp10.spec dl ...
by Alexandre Julliard Nov. 15, 2005

Nov. 15, 2005

ChangeSet ID: 21271 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/15 06:02:16 Modified files: include : usp10.h dlls/usp10 : usp10.spec usp10.c Log message: Raphael Junqueira <fenix(a)club-internet.fr> Add stubs around ScriptStringAnalyse to avoid PAF crash. Patch: http://cvs.winehq.org/patch.py?id=21271 Old revision New revision Changes Path 1.2 1.3 +51 -0 wine/include/usp10.h 1.3 1.4 +3 -3 wine/dlls/usp10/usp10.spec 1.3 1.4 +42 -0 wine/dlls/usp10/usp10.c Index: wine/include/usp10.h diff -u -p wine/include/usp10.h:1.2 wine/include/usp10.h:1.3 --- wine/include/usp10.h:1.2 15 Nov 2005 12: 2:16 -0000 +++ wine/include/usp10.h 15 Nov 2005 12: 2:16 -0000 @@ -19,6 +19,34 @@ #ifndef __USP10_H #define __USP10_H +/** ScriptStringAnalyse */ +#define SSA_PASSWORD 0x00000001 +#define SSA_TAB 0x00000002 +#define SSA_CLIP 0x00000004 +#define SSA_FIT 0x00000008 +#define SSA_DZWG 0x00000010 +#define SSA_FALLBACK 0x00000020 +#define SSA_BREAK 0x00000040 +#define SSA_GLYPHS 0x00000080 +#define SSA_RTL 0x00000100 +#define SSA_GCP 0x00000200 +#define SSA_HOTKEY 0x00000400 +#define SSA_METAFILE 0x00000800 +#define SSA_LINK 0x00001000 +#define SSA_HIDEHOTKEY 0x00002000 +#define SSA_HOTKEYONLY 0x00002400 +#define SSA_FULLMEASURE 0x04000000 +#define SSA_LPKANSIFALLBACK 0x08000000 +#define SSA_PIDX 0x10000000 +#define SSA_LAYOUTRTL 0x20000000 +#define SSA_DONTGLYPH 0x40000000 +#define SSA_NOKASHIDA 0x80000000 + +/** StringIsComplex */ +#define SIC_COMPLEX 1 +#define SIC_ASCIIDIGIT 2 +#define SIC_NEUTRAL 4 + typedef struct tag_SCRIPT_CONTROL { DWORD uDefaultLanguage :16; DWORD fContextDigits :1; @@ -96,7 +124,15 @@ typedef struct tag_SCRIPT_FONTPROPERTIES int iKashidaWidth; } SCRIPT_FONTPROPERTIES; +typedef struct tag_SCRIPT_TABDEF { + int cTabStops; + int iScale; + int *pTabStops; + int iTabOrigin; +} SCRIPT_TABDEF; + typedef void *SCRIPT_CACHE; +typedef void *SCRIPT_STRING_ANALYSIS; /* Function Declairations */ @@ -108,5 +144,20 @@ HRESULT WINAPI ScriptItemize(const WCHAR const SCRIPT_CONTROL *psControl, const SCRIPT_STATE *psState, SCRIPT_ITEM *pItems, int *pcItems); HRESULT WINAPI ScriptGetFontProperties(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_FONTPROPERTIES *sfp); +HRESULT WINAPI ScriptStringAnalyse(HDC hdc, + const void *pString, + int cString, + int cGlyphs, + int iCharset, + DWORD dwFlags, + int iReqWidth, + SCRIPT_CONTROL *psControl, + SCRIPT_STATE *psState, + const int *piDx, + SCRIPT_TABDEF *pTabdef, + const BYTE *pbInClass, + SCRIPT_STRING_ANALYSIS *pssa); +HRESULT WINAPI ScriptStringFree(SCRIPT_STRING_ANALYSIS *pssa); +HRESULT WINAPI ScriptIsComplex(const WCHAR* pwcInChars, int cInChars, DWORD dwFlags); #endif /* __USP10_H */ Index: wine/dlls/usp10/usp10.spec diff -u -p wine/dlls/usp10/usp10.spec:1.3 wine/dlls/usp10/usp10.spec:1.4 --- wine/dlls/usp10/usp10.spec:1.3 15 Nov 2005 12: 2:16 -0000 +++ wine/dlls/usp10/usp10.spec 15 Nov 2005 12: 2:16 -0000 @@ -10,16 +10,16 @@ @ stub ScriptGetGlyphABCWidth @ stub ScriptGetLogicalWidths @ stdcall ScriptGetProperties(ptr long) -@ stub ScriptIsComplex +@ stdcall ScriptIsComplex(wstr long long) @ stdcall ScriptItemize(wstr long long ptr ptr ptr ptr) @ stub ScriptJustify @ stub ScriptLayout @ stub ScriptPlace @ stdcall ScriptRecordDigitSubstitution(ptr ptr) @ stub ScriptShape -@ stub ScriptStringAnalyse +@ stdcall ScriptStringAnalyse(ptr ptr long long long long long ptr ptr ptr ptr ptr ptr) @ stub ScriptStringCPtoX -@ stub ScriptStringFree +@ stdcall ScriptStringFree(ptr) @ stub ScriptStringGetLogicalWidths @ stub ScriptStringGetOrder @ stub ScriptStringOut Index: wine/dlls/usp10/usp10.c diff -u -p wine/dlls/usp10/usp10.c:1.3 wine/dlls/usp10/usp10.c:1.4 --- wine/dlls/usp10/usp10.c:1.3 15 Nov 2005 12: 2:16 -0000 +++ wine/dlls/usp10/usp10.c 15 Nov 2005 12: 2:16 -0000 @@ -31,6 +31,11 @@ #include "wine/debug.h" +/** + * some documentation here: + * http://www.microsoft.com/typography/developers/uniscribe/uniscribe.htm + */ + WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) @@ -87,3 +92,40 @@ HRESULT WINAPI ScriptItemize(const WCHAR psControl, psState, pItems, pcItems); return E_INVALIDARG; } + +HRESULT WINAPI ScriptStringAnalyse(HDC hdc, + const void *pString, + int cString, + int cGlyphs, + int iCharset, + DWORD dwFlags, + int iReqWidth, + SCRIPT_CONTROL *psControl, + SCRIPT_STATE *psState, + const int *piDx, + SCRIPT_TABDEF *pTabdef, + const BYTE *pbInClass, + SCRIPT_STRING_ANALYSIS *pssa) +{ + FIXME("(%p,%p,%d,%d,%d,0x%lx,%d,%p,%p,%p,%p,%p,%p): stub\n", + hdc, pString, cString, cGlyphs, iCharset, dwFlags, + iReqWidth, psControl, psState, piDx, pTabdef, pbInClass, pssa); + if (1 > cString || NULL == pString) { + return E_INVALIDARG; + } + if ((dwFlags & SSA_GLYPHS) && NULL == hdc) { + return E_INVALIDARG; + } + + return E_NOTIMPL; +} + +HRESULT WINAPI ScriptStringFree(SCRIPT_STRING_ANALYSIS *pssa) { + FIXME("(%p): stub\n",pssa); + return S_OK; +} + +HRESULT WINAPI ScriptIsComplex(const WCHAR* pwcInChars, int cInChars, DWORD dwFlags) { + FIXME("(%s,%d,0x%lx): stub\n", debugstr_w(pwcInChars), cInChars, dwFlags); + return E_NOTIMPL; +}

1 0