December 2005 - Wine-Commits

Tomas Carnecky : x11drv: Allow users to preload an OpenGL library.
by Alexandre Julliard Dec. 16, 2005

Dec. 16, 2005

Module: wine Branch: refs/heads/master Commit: 7499cabb28441adb862cbeb3c89fe4832224ac65 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7499cabb28441adb862cbeb… Author: Tomas Carnecky <tom(a)dbservice.com> Date: Fri Dec 16 12:37:34 2005 +0100 x11drv: Allow users to preload an OpenGL library. --- dlls/x11drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/x11drv/opengl.c b/dlls/x11drv/opengl.c index 7660b0e..3a400c1 100644 --- a/dlls/x11drv/opengl.c +++ b/dlls/x11drv/opengl.c @@ -140,7 +140,7 @@ static BOOL has_opengl(void) opengl_handle = wine_dlopen(SONAME_LIBGL, RTLD_NOW|RTLD_GLOBAL, NULL, 0); if (opengl_handle == NULL) return FALSE; -#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(opengl_handle, #f, NULL, 0)) == NULL) goto sym_not_found; +#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(RTLD_DEFAULT, #f, NULL, 0)) == NULL) goto sym_not_found; LOAD_FUNCPTR(glGetError) LOAD_FUNCPTR(glXChooseVisual) LOAD_FUNCPTR(glXGetConfig)

1 0

Ivan Leo Puoti : Add some structs/prototypes to wdm.h.
by Alexandre Julliard Dec. 16, 2005

Dec. 16, 2005

Module: wine Branch: refs/heads/master Commit: 4c53092566327dd9cbf1eab5558e995ab34baadb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4c53092566327dd9cbf1eab… Author: Ivan Leo Puoti <ivanleo(a)gmail.com> Date: Fri Dec 16 12:37:24 2005 +0100 Add some structs/prototypes to wdm.h. --- include/ddk/wdm.h | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 118 insertions(+), 0 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 49d5977..b10a6f1 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -92,6 +92,16 @@ typedef struct _VPB { WCHAR VolumeLabel[MAXIMUM_VOLUME_LABEL_LENGTH / sizeof(WCHAR)]; } VPB, *PVPB; +typedef enum _POOL_TYPE { + NonPagedPool, + PagedPool, + NonPagedPoolMustSucceed, + UnkownType, + NonPagedPoolCacheAligned, + PagedPoolCacheAligned, + NonPagedPoolCacheAlignedMustS, + MaxPoolType +} POOL_TYPE; typedef struct _WAIT_CONTEXT_BLOCK { KDEVICE_QUEUE_ENTRY WaitQueueEntry; @@ -826,6 +836,8 @@ typedef struct _KUSER_SHARED_DATA { }; } KSHARED_USER_DATA, *PKSHARED_USER_DATA; +NTSTATUS WINAPI ObCloseHandle(IN HANDLE handle); + #define IoGetCurrentIrpStackLocation(_Irp) ((_Irp)->Tail.Overlay.CurrentStackLocation) #define KernelMode 0 @@ -842,4 +854,110 @@ typedef struct _KUSER_SHARED_DATA { #define SYMBOLIC_LINK_QUERY 0x0001 #define SYMBOLIC_LINK_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0x1) +/* Zw function prototypes */ +NTSTATUS WINAPI ZwAddBootEntry(PUNICODE_STRING,PUNICODE_STRING); +NTSTATUS WINAPI ZwAccessCheckAndAuditAlarm(PUNICODE_STRING,HANDLE,PUNICODE_STRING,PUNICODE_STRING,PSECURITY_DESCRIPTOR,ACCESS_MASK,PGENERIC_MAPPING,BOOLEAN,PACCESS_MASK,PBOOLEAN,PBOOLEAN); +NTSTATUS WINAPI ZwAdjustPrivilegesToken(HANDLE,BOOLEAN,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD); +NTSTATUS WINAPI ZwAlertThread(HANDLE ThreadHandle); +NTSTATUS WINAPI ZwAllocateVirtualMemory(HANDLE,PVOID*,ULONG,SIZE_T*,ULONG,ULONG); +NTSTATUS WINAPI ZwCancelIoFile(HANDLE,PIO_STATUS_BLOCK); +NTSTATUS WINAPI ZwCancelTimer(HANDLE, BOOLEAN*); +NTSTATUS WINAPI ZwClearEvent(HANDLE); +NTSTATUS WINAPI ZwClose(HANDLE); +NTSTATUS WINAPI ZwCloseObjectAuditAlarm(PUNICODE_STRING,HANDLE,BOOLEAN); +NTSTATUS WINAPI ZwConnectPort(PHANDLE,PUNICODE_STRING,PSECURITY_QUALITY_OF_SERVICE,PLPC_SECTION_WRITE,PLPC_SECTION_READ,PULONG,PVOID,PULONG); +NTSTATUS WINAPI ZwCreateDirectoryObject(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES); +NTSTATUS WINAPI ZwCreateEvent(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES *,BOOLEAN,BOOLEAN); +NTSTATUS WINAPI ZwCreateFile(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,PLARGE_INTEGER,ULONG,ULONG,ULONG,ULONG,PVOID,ULONG); +NTSTATUS WINAPI ZwCreateKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG,const UNICODE_STRING*,ULONG,PULONG); +NTSTATUS WINAPI ZwCreateSection(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*,const LARGE_INTEGER*,ULONG,ULONG,HANDLE); +NTSTATUS WINAPI ZwCreateSymbolicLinkObject(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PUNICODE_STRING); +NTSTATUS WINAPI ZwCreateTimer(HANDLE*, ACCESS_MASK, const OBJECT_ATTRIBUTES*, TIMER_TYPE); +NTSTATUS WINAPI ZwDeleteAtom(RTL_ATOM); +NTSTATUS WINAPI ZwDeleteFile(POBJECT_ATTRIBUTES); +NTSTATUS WINAPI ZwDeleteKey(HANDLE); +NTSTATUS WINAPI ZwDeleteValueKey(HANDLE,const UNICODE_STRING *); +NTSTATUS WINAPI ZwDeviceIoControlFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,PVOID,ULONG,PVOID,ULONG); +NTSTATUS WINAPI ZwDisplayString(PUNICODE_STRING); +NTSTATUS WINAPI ZwDuplicateObject(HANDLE,HANDLE,HANDLE,PHANDLE,ACCESS_MASK,ULONG,ULONG); +NTSTATUS WINAPI ZwDuplicateToken(HANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,SECURITY_IMPERSONATION_LEVEL,TOKEN_TYPE,PHANDLE); +NTSTATUS WINAPI ZwEnumerateKey(HANDLE,ULONG,KEY_INFORMATION_CLASS,void *,DWORD,DWORD *); +NTSTATUS WINAPI ZwEnumerateValueKey(HANDLE,ULONG,KEY_VALUE_INFORMATION_CLASS,PVOID,ULONG,PULONG); +NTSTATUS WINAPI ZwFlushInstructionCache(HANDLE,LPCVOID,SIZE_T); +NTSTATUS WINAPI ZwFlushKey(HANDLE); +NTSTATUS WINAPI ZwFlushVirtualMemory(HANDLE,LPCVOID*,SIZE_T*,ULONG); +NTSTATUS WINAPI ZwFreeVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG); +NTSTATUS WINAPI ZwFsControlFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,PVOID,ULONG,PVOID,ULONG); +NTSTATUS WINAPI ZwInitiatePowerAction(POWER_ACTION,SYSTEM_POWER_STATE,ULONG,BOOLEAN); +NTSTATUS WINAPI ZwLoadDriver(const UNICODE_STRING *); +NTSTATUS WINAPI ZwLoadKey(const OBJECT_ATTRIBUTES *,OBJECT_ATTRIBUTES *); +NTSTATUS WINAPI ZwLockVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG); +NTSTATUS WINAPI ZwMakeTemporaryObject(HANDLE); +NTSTATUS WINAPI ZwMapViewOfSection(HANDLE,HANDLE,PVOID*,ULONG,SIZE_T,const LARGE_INTEGER*,SIZE_T*,SECTION_INHERIT,ULONG,ULONG); +NTSTATUS WINAPI ZwNotifyChangeKey(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,BOOLEAN,PVOID,ULONG,BOOLEAN); +NTSTATUS WINAPI ZwOpenDirectoryObject(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES); +NTSTATUS WINAPI ZwOpenEvent(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES *); +NTSTATUS WINAPI ZwOpenFile(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,ULONG,ULONG); +NTSTATUS WINAPI ZwOpenKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES *); +NTSTATUS WINAPI ZwOpenProcess(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,const CLIENT_ID*); +NTSTATUS WINAPI ZwOpenProcessToken(HANDLE,DWORD,HANDLE *); +NTSTATUS WINAPI ZwOpenSection(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*); +NTSTATUS WINAPI ZwOpenSymbolicLinkObject(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES); +NTSTATUS WINAPI ZwOpenThread(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*,const CLIENT_ID*); +NTSTATUS WINAPI ZwOpenThreadToken(HANDLE,DWORD,BOOLEAN,HANDLE *); +NTSTATUS WINAPI ZwOpenTimer(HANDLE*, ACCESS_MASK, const OBJECT_ATTRIBUTES*); +NTSTATUS WINAPI ZwPowerInformation(POWER_INFORMATION_LEVEL,PVOID,ULONG,PVOID,ULONG); +NTSTATUS WINAPI ZwPulseEvent(HANDLE,PULONG); +NTSTATUS WINAPI ZwQueryDefaultLocale(BOOLEAN,LCID*); +NTSTATUS WINAPI ZwQueryDefaultUILanguage(LANGID*); +NTSTATUS WINAPI ZwQueryDirectoryFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,PVOID,ULONG,FILE_INFORMATION_CLASS,BOOLEAN,PUNICODE_STRING,BOOLEAN); +NTSTATUS WINAPI ZwQueryDirectoryObject(HANDLE,PDIRECTORY_BASIC_INFORMATION,ULONG,BOOLEAN,BOOLEAN,PULONG,PULONG); +NTSTATUS WINAPI ZwQueryEaFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,BOOLEAN,PVOID,ULONG,PVOID,BOOLEAN); +NTSTATUS WINAPI ZwQueryFullAttributesFile(const OBJECT_ATTRIBUTES*,FILE_NETWORK_OPEN_INFORMATION*); +NTSTATUS WINAPI ZwQueryInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,LONG,FILE_INFORMATION_CLASS); +NTSTATUS WINAPI ZwQueryInformationThread(HANDLE,THREADINFOCLASS,PVOID,ULONG,PULONG); +NTSTATUS WINAPI ZwQueryInformationToken(HANDLE,DWORD,LPVOID,DWORD,LPDWORD); +NTSTATUS WINAPI ZwQueryInstallUILanguage(LANGID*); +NTSTATUS WINAPI ZwQueryKey(HANDLE,KEY_INFORMATION_CLASS,void *,DWORD,DWORD *); +NTSTATUS WINAPI ZwQueryObject(HANDLE, OBJECT_INFORMATION_CLASS, PVOID, ULONG, PULONG); +NTSTATUS WINAPI ZwQuerySecurityObject(HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,ULONG,PULONG); +NTSTATUS WINAPI ZwQuerySection(HANDLE,SECTION_INFORMATION_CLASS,PVOID,ULONG,PULONG); +NTSTATUS WINAPI ZwQuerySymbolicLinkObject(HANDLE,PUNICODE_STRING,PULONG); +NTSTATUS WINAPI ZwQuerySystemInformation(SYSTEM_INFORMATION_CLASS,PVOID,ULONG,PULONG); +NTSTATUS WINAPI ZwQueryTimerResolution(PULONG,PULONG,PULONG); +NTSTATUS WINAPI ZwQueryValueKey(HANDLE,const UNICODE_STRING *,KEY_VALUE_INFORMATION_CLASS,void *,DWORD,DWORD *); +NTSTATUS WINAPI ZwQueryVolumeInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FS_INFORMATION_CLASS); +NTSTATUS WINAPI ZwReadFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,PVOID,ULONG,PLARGE_INTEGER,PULONG); +NTSTATUS WINAPI ZwReplaceKey(POBJECT_ATTRIBUTES,HANDLE,POBJECT_ATTRIBUTES); +NTSTATUS WINAPI ZwRequestWaitReplyPort(HANDLE,PLPC_MESSAGE,PLPC_MESSAGE); +NTSTATUS WINAPI ZwResetEvent(HANDLE,PULONG); +NTSTATUS WINAPI ZwRestoreKey(HANDLE,HANDLE,ULONG); +NTSTATUS WINAPI ZwSaveKey(HANDLE,HANDLE); +NTSTATUS WINAPI ZwSecureConnectPort(PHANDLE,PUNICODE_STRING,PSECURITY_QUALITY_OF_SERVICE,PLPC_SECTION_WRITE,PSID,PLPC_SECTION_READ,PULONG,PVOID,PULONG); +NTSTATUS WINAPI ZwSetDefaultLocale(BOOLEAN,LCID); +NTSTATUS WINAPI ZwSetDefaultUILanguage(LANGID); +NTSTATUS WINAPI ZwSetEaFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG); +NTSTATUS WINAPI ZwSetEvent(HANDLE,PULONG); +NTSTATUS WINAPI ZwSetInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FILE_INFORMATION_CLASS); +NTSTATUS WINAPI ZwSetInformationKey(HANDLE,const int,PVOID,ULONG); +NTSTATUS WINAPI ZwSetInformationObject(HANDLE, OBJECT_INFORMATION_CLASS, PVOID, ULONG); +NTSTATUS WINAPI ZwSetInformationProcess(HANDLE,PROCESS_INFORMATION_CLASS,PVOID,ULONG); +NTSTATUS WINAPI ZwSetInformationThread(HANDLE,THREADINFOCLASS,LPCVOID,ULONG); +NTSTATUS WINAPI ZwSetIoCompletion(HANDLE,ULONG,ULONG,NTSTATUS,ULONG); +NTSTATUS WINAPI ZwSetSecurityObject(HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR); +NTSTATUS WINAPI ZwSetSystemInformation(SYSTEM_INFORMATION_CLASS,PVOID,ULONG); +NTSTATUS WINAPI ZwSetSystemTime(const LARGE_INTEGER*,LARGE_INTEGER*); +NTSTATUS WINAPI ZwSetTimer(HANDLE, const LARGE_INTEGER*, PTIMER_APC_ROUTINE, PVOID, BOOLEAN, ULONG, BOOLEAN*); +NTSTATUS WINAPI ZwSetValueKey(HANDLE,const UNICODE_STRING *,ULONG,ULONG,const void *,ULONG); +NTSTATUS WINAPI ZwSetVolumeInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FS_INFORMATION_CLASS); +NTSTATUS WINAPI ZwSuspendThread(HANDLE,PULONG); +NTSTATUS WINAPI ZwTerminateProcess(HANDLE,LONG); +NTSTATUS WINAPI ZwUnloadDriver(const UNICODE_STRING *); +NTSTATUS WINAPI ZwUnloadKey(HANDLE); +NTSTATUS WINAPI ZwUnmapViewOfSection(HANDLE,PVOID); +NTSTATUS WINAPI ZwWaitForSingleObject(HANDLE,BOOLEAN,const LARGE_INTEGER*); +NTSTATUS WINAPI ZwWaitForMultipleObjects(ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER*); +NTSTATUS WINAPI ZwWriteFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,const void*,ULONG,PLARGE_INTEGER,PULONG); +NTSTATUS WINAPI ZwYieldExecution(void); + #endif

1 0

James Hawkins : setupapi: Added stubs for SetupGetInfInformation and
by Alexandre Julliard Dec. 15, 2005

Dec. 15, 2005

Module: wine Branch: refs/heads/master Commit: 11fced7b5759d57c1d6e1becff34409bffce5fe5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=11fced7b5759d57c1d6e1be… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 15 11:02:20 2005 +0100 setupapi: Added stubs for SetupGetInfInformation and SetupQueryInfFileInformation. --- dlls/setupapi/setupapi.spec | 6 +++--- dlls/setupapi/stubs.c | 36 ++++++++++++++++++++++++++++++++++++ include/setupapi.h | 6 ++++++ 3 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 8ccbafb..f4fa56f 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -401,7 +401,7 @@ @ stub SetupGetInfFileListA @ stub SetupGetInfFileListW @ stdcall SetupGetInfInformationA(ptr long ptr long ptr) -@ stub SetupGetInfInformationW +@ stdcall SetupGetInfInformationW(ptr long ptr long ptr) @ stub SetupGetInfSections @ stdcall SetupGetIntField(ptr long ptr) @ stdcall SetupGetLineByIndexA(long str long ptr) @@ -457,8 +457,8 @@ @ stub SetupQueryDrivesInDiskSpaceListW @ stub SetupQueryFileLogA @ stub SetupQueryFileLogW -@ stub SetupQueryInfFileInformationA -@ stub SetupQueryInfFileInformationW +@ stdcall SetupQueryInfFileInformationA(ptr long str long ptr) +@ stdcall SetupQueryInfFileInformationW(ptr long wstr long ptr) @ stub SetupQueryInfOriginalFileInformationA @ stub SetupQueryInfOriginalFileInformationW @ stub SetupQueryInfVersionInformationA diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 4dcf2fe..59adb78 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -163,6 +163,42 @@ BOOL WINAPI SetupGetInfInformationA( LPC } /*********************************************************************** + * SetupGetInfInformationW (SETUPAPI.@) + */ +BOOL WINAPI SetupGetInfInformationW( LPCVOID InfSpec, DWORD SearchControl, + PSP_INF_INFORMATION ReturnBuffer, + DWORD ReturnBufferSize, PDWORD RequiredSize) +{ + FIXME("(%p, %ld, %p, %ld, %p) Stub!\n", + InfSpec, SearchControl, ReturnBuffer, ReturnBufferSize, RequiredSize ); + return TRUE; +} + +/*********************************************************************** + * SetupQueryInfFileInformationA (SETUPAPI.@) + */ +BOOL WINAPI SetupQueryInfFileInformationA(PSP_INF_INFORMATION InfInformation, + UINT InfIndex, PSTR ReturnBuffer, + DWORD ReturnBufferSize, PDWORD RequiredSize) +{ + FIXME("(%p, %u, %p, %ld, %p) Stub!\n", + InfInformation, InfIndex, ReturnBuffer, ReturnBufferSize, RequiredSize ); + return TRUE; +} + +/*********************************************************************** + * SetupQueryInfFileInformationW (SETUPAPI.@) + */ +BOOL WINAPI SetupQueryInfFileInformationW(PSP_INF_INFORMATION InfInformation, + UINT InfIndex, PWSTR ReturnBuffer, + DWORD ReturnBufferSize, PDWORD RequiredSize) +{ + FIXME("(%p, %u, %p, %ld, %p) Stub!\n", + InfInformation, InfIndex, ReturnBuffer, ReturnBufferSize, RequiredSize ); + return TRUE; +} + +/*********************************************************************** * SetupInitializeFileLogW(SETUPAPI.@) */ HANDLE WINAPI SetupInitializeFileLogW(LPWSTR LogFileName, DWORD Flags) diff --git a/include/setupapi.h b/include/setupapi.h index adbdfdf..ce3bde0 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -787,6 +787,9 @@ BOOL WINAPI SetupGetBinaryField( PIN DWORD WINAPI SetupGetFieldCount( PINFCONTEXT context ); BOOL WINAPI SetupGetFileQueueCount( HSPFILEQ, UINT, PUINT ); BOOL WINAPI SetupGetFileQueueFlags( HSPFILEQ, PDWORD ); +BOOL WINAPI SetupGetInfInformationA( LPCVOID, DWORD, PSP_INF_INFORMATION, DWORD, PDWORD); +BOOL WINAPI SetupGetInfInformationW( LPCVOID, DWORD, PSP_INF_INFORMATION, DWORD, PDWORD); +#define SetupGetInfInformation WINELIB_NAME_AW(SetupGetInfInformation) BOOL WINAPI SetupGetIntField( PINFCONTEXT context, DWORD index, PINT result ); BOOL WINAPI SetupGetLineByIndexA( HINF, PCSTR, DWORD, INFCONTEXT * ); BOOL WINAPI SetupGetLineByIndexW( HINF, PCWSTR, DWORD, INFCONTEXT * ); @@ -824,6 +827,9 @@ HINF WINAPI SetupOpenInfFileA( PCSTR HINF WINAPI SetupOpenInfFileW( PCWSTR name, PCWSTR pszclass, DWORD style, UINT *error ); #define SetupOpenInfFile WINELIB_NAME_AW(SetupOpenInfFile) HINF WINAPI SetupOpenMasterInf( VOID ); +BOOL WINAPI SetupQueryInfFileInformationA(PSP_INF_INFORMATION, UINT, PSTR, DWORD, PDWORD); +BOOL WINAPI SetupQueryInfFileInformationW(PSP_INF_INFORMATION, UINT, PWSTR, DWORD, PDWORD); +#define SetupQueryInfFileInformation WINELIB_NAME_AW(SetupQueryInFileInformation) BOOL WINAPI SetupQueueCopyA(HSPFILEQ,PCSTR,PCSTR,PCSTR,PCSTR,PCSTR,PCSTR,PCSTR,DWORD); BOOL WINAPI SetupQueueCopyW(HSPFILEQ,PCWSTR,PCWSTR,PCWSTR,PCWSTR,PCWSTR,PCWSTR,PCWSTR,DWORD); #define SetupQueueCopy WINELIB_NAME_AW(SetupQueueCopy)

1 0

Alexandre Julliard : ntdll: Reimplemented _chkstk and _alloca_probe directly in assembly.
by Alexandre Julliard Dec. 15, 2005

Dec. 15, 2005

Module: wine Branch: refs/heads/master Commit: 50bbfb3c8c6f69be82291f1d8cf9916343e24a61 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=50bbfb3c8c6f69be82291f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 15 10:48:12 2005 +0100 ntdll: Reimplemented _chkstk and _alloca_probe directly in assembly. --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/rtl.c | 24 ++++++++++++++---------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 04ae9f4..64e7daf 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1233,7 +1233,7 @@ @ stdcall -ret64 _alldiv(double double) # @ stub _alldvrm @ stdcall -ret64 _allmul(double double) -@ stdcall -i386 _alloca_probe() +@ stdcall -i386 -norelay _alloca_probe() @ stdcall -ret64 _allrem(double double) # @ stub _allshl # @ stub _allshr @@ -1242,7 +1242,7 @@ # @ stub _aulldvrm @ stdcall -ret64 _aullrem(double double) # @ stub _aullshr -@ stdcall -i386 _chkstk() +@ stdcall -i386 -norelay _chkstk() @ stub _fltused @ cdecl -ret64 _ftol() NTDLL__ftol @ cdecl _i64toa(double ptr long) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index f01dbe4..0881c97 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -391,11 +391,13 @@ DWORD WINAPI RtlDeleteSecurityObject(DWO * Glorified "enter xxxx". */ #ifdef __i386__ -void WINAPI __regs__chkstk( CONTEXT86 *context ) -{ - context->Esp -= context->Eax; -} -DEFINE_REGS_ENTRYPOINT( _chkstk, 0, 0 ); +__ASM_GLOBAL_FUNC( _chkstk, + "negl %eax\n\t" + "addl %esp,%eax\n\t" + "xchgl %esp,%eax\n\t" + "movl 0(%eax),%eax\n\t" /* copy return address from old location */ + "movl %eax,0(%esp)\n\t" + "ret" ); #endif /************************************************************************** @@ -404,11 +406,13 @@ DEFINE_REGS_ENTRYPOINT( _chkstk, 0, 0 ); * Glorified "enter xxxx". */ #ifdef __i386__ -void WINAPI __regs__alloca_probe( CONTEXT86 *context ) -{ - context->Esp -= context->Eax; -} -DEFINE_REGS_ENTRYPOINT( _alloca_probe, 0, 0 ); +__ASM_GLOBAL_FUNC( _alloca_probe, + "negl %eax\n\t" + "addl %esp,%eax\n\t" + "xchgl %esp,%eax\n\t" + "movl 0(%eax),%eax\n\t" /* copy return address from old location */ + "movl %eax,0(%esp)\n\t" + "ret" ); #endif

1 0

Jacek Caban : mshtml: Fix handling Gecko strings.
by Alexandre Julliard Dec. 15, 2005

Dec. 15, 2005

Module: wine Branch: refs/heads/master Commit: b48d9590a3fdd6e9f913e0d703045802a5232211 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b48d9590a3fdd6e9f913e0d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 15 10:41:56 2005 +0100 mshtml: Fix handling Gecko strings. --- dlls/mshtml/nsembed.c | 19 ++++++++++--------- dlls/mshtml/nsiface.idl | 8 +++++--- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index bce48ed..f409eae 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -44,22 +44,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define PR_UINT32_MAX 0xffffffff -typedef struct nsACString { +struct nsStringContainer { + void *v; void *d1; PRUint32 d2; void *d3; -} nsString; +}; static nsresult (*NS_InitXPCOM2)(nsIServiceManager**,void*,void*); static nsresult (*NS_ShutdownXPCOM)(nsIServiceManager*); static nsresult (*NS_GetComponentRegistrar)(nsIComponentRegistrar**); -static nsresult (*NS_StringContainerInit)(nsString*); -static nsresult (*NS_CStringContainerInit)(nsACString*); -static nsresult (*NS_StringContainerFinish)(nsString*); -static nsresult (*NS_CStringContainerFinish)(nsACString*); -static nsresult (*NS_StringSetData)(nsString*,const PRUnichar*,PRUint32); +static nsresult (*NS_StringContainerInit)(nsStringContainer*); +static nsresult (*NS_CStringContainerInit)(nsCStringContainer*); +static nsresult (*NS_StringContainerFinish)(nsStringContainer*); +static nsresult (*NS_CStringContainerFinish)(nsCStringContainer*); +static nsresult (*NS_StringSetData)(nsAString*,const PRUnichar*,PRUint32); static nsresult (*NS_CStringSetData)(nsACString*,const char*,PRUint32); -static nsresult (*NS_NewLocalFile)(const nsString*,PRBool,nsIFile**); +static nsresult (*NS_NewLocalFile)(const nsAString*,PRBool,nsIFile**); static PRUint32 (*NS_CStringGetData)(nsACString*,const char**,PRBool*); static HINSTANCE hXPCOM = NULL; @@ -245,7 +246,7 @@ static BOOL load_gecko() nsresult nsres; nsIObserver *pStartNotif; nsIComponentRegistrar *registrar = NULL; - nsString path; + nsAString path; nsIFile *gre_dir; PRUnichar gre_path[MAX_PATH]; WCHAR path_env[MAX_PATH]; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 077ed25..0567c6a 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -44,11 +44,13 @@ typedef BYTE PRUint8; typedef BOOL PRBool; typedef LARGE_INTEGER PRInt64; typedef ULARGE_INTEGER PRUint64; - -typedef int nsAString; -typedef struct nsACString nsACString; typedef PRUint64 DOMTimeStamp; +typedef struct nsStringContainer nsStringContainer; +typedef nsStringContainer nsCStringContainer; +typedef nsStringContainer nsACString; +typedef nsStringContainer nsAString; + interface nsIWebBrowserChrome; [

1 0

Jacek Caban : mshtml: Set Gecko's profile.
by Alexandre Julliard Dec. 15, 2005

Dec. 15, 2005

Module: wine Branch: refs/heads/master Commit: 054164d5ba844bfa5470bd650b90c12035699c35 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=054164d5ba844bfa5470bd6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 15 10:26:11 2005 +0100 mshtml: Set Gecko's profile. Make sure that Gecko components are registered. --- dlls/mshtml/nsembed.c | 52 ++++++++++++++++++++++++++++++++++++++++++----- dlls/mshtml/nsiface.idl | 20 ++++++++++++++++++ 2 files changed, 67 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index bd36126..bce48ed 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -38,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NS_APPSTARTUPNOTIFIER_CONTRACTID "@mozilla.org/embedcomp/appstartup-notifier;1" #define NS_WEBBROWSER_CONTRACTID "@mozilla.org/embedding/browser/nsWebBrowser;1" #define NS_IOSERVICE_CONTRACTID "@mozilla.org/network/io-service;1" +#define NS_PROFILE_CONTRACTID "@mozilla.org/profile/manager;1" #define APPSTARTUP_TOPIC "app-startup" @@ -210,11 +211,40 @@ static BOOL get_wine_gecko_path(PRUnicha return TRUE; } +static void set_profile(void) +{ + nsIProfile *profile; + PRBool exists = FALSE; + nsresult nsres; + + static const WCHAR wszMSHTML[] = {'M','S','H','T','M','L',0}; + + nsres = nsIServiceManager_GetServiceByContactID(pServMgr, NS_PROFILE_CONTRACTID, + &IID_nsIProfile, (void**)&profile); + if(NS_FAILED(nsres)) { + ERR("Could not get profile service: %08lx\n", nsres); + return; + } + + nsres = nsIProfile_ProfileExists(profile, wszMSHTML, &exists); + if(!exists) { + nsres = nsIProfile_CreateNewProfile(profile, wszMSHTML, NULL, NULL, FALSE); + if(NS_FAILED(nsres)) + ERR("CreateNewProfile failed: %08lx\n", nsres); + } + + nsres = nsIProfile_SetCurrentProfile(profile, wszMSHTML); + if(NS_FAILED(nsres)) + ERR("SetCurrentProfile failed: %08lx\n", nsres); + + nsIProfile_Release(profile); +} + static BOOL load_gecko() { nsresult nsres; nsIObserver *pStartNotif; - nsIComponentRegistrar *registrar; + nsIComponentRegistrar *registrar = NULL; nsString path; nsIFile *gre_dir; PRUnichar gre_path[MAX_PATH]; @@ -292,6 +322,19 @@ static BOOL load_gecko() if(NS_FAILED(nsres)) ERR("Could not get nsIComponentManager: %08lx\n", nsres); + nsres = NS_GetComponentRegistrar(&registrar); + if(NS_SUCCEEDED(nsres)) { + nsres = nsIComponentRegistrar_AutoRegister(registrar, NULL); + if(NS_FAILED(nsres)) + ERR("AutoRegister(NULL) failed: %08lx\n", nsres); + + nsres = nsIComponentRegistrar_AutoRegister(registrar, gre_dir); + if(NS_FAILED(nsres)) + ERR("AutoRegister(gre_dir) failed: %08lx\n", nsres); + }else { + ERR("NS_GetComponentRegistrar failed: %08lx\n", nsres); + } + nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, NS_APPSTARTUPNOTIFIER_CONTRACTID, NULL, &IID_nsIObserver, (void**)&pStartNotif); if(NS_SUCCEEDED(nsres)) { @@ -304,14 +347,13 @@ static BOOL load_gecko() ERR("could not get appstartup-notifier: %08lx\n", nsres); } - nsres = NS_GetComponentRegistrar(&registrar); - if(NS_SUCCEEDED(nsres)) { + if(registrar) { register_nsservice(registrar); nsIComponentRegistrar_Release(registrar); - }else { - ERR("NS_GetComponentRegistrar failed: %08lx\n", nsres); } + set_profile(); + return TRUE; } diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 390e115..077ed25 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -515,3 +515,23 @@ interface nsIPromptService : nsISupports const PRUnichar *aText, PRUint32 aCount, const PRUnichar **aSelectList, PRInt32 *aOutSelection, PRBool *_retval); } + +[ + object, + uuid(02b0625a-e7f3-11d2-9f5a-006008a6efe9) +] +interface nsIProfile : nsISupports +{ + nsresult GetProfileCount(PRInt32 *aProfileCount); + nsresult GetProfileList(PRUint32 *length, PRUnichar ***profileNames); + nsresult ProfileExists(const PRUnichar *profileName, PRBool *_retval); + nsresult GetCurrentProfile(PRUnichar * *aCurrentProfile); + nsresult SetCurrentProfile(const PRUnichar * aCurrentProfile); + nsresult ShutDownCurrentProfile(PRUint32 shutDownType); + nsresult CreateNewProfile(const PRUnichar *profileName, + const PRUnichar *nativeProfileDir, const PRUnichar *langcode, + PRBool useExistingDir); + nsresult RenameProfile(const PRUnichar *oldName, const PRUnichar *newName); + nsresult DeleteProfile(const PRUnichar *name, PRBool canDeleteFiles); + nsresult CloneProfile(const PRUnichar *profileName); +}

1 0

Oliver Stieber : wined3d: Internal reference counting.
by Alexandre Julliard Dec. 15, 2005

Dec. 15, 2005

Module: wine Branch: refs/heads/master Commit: e76969b0d61dd2c1a23a2ab7e7f42bbd9d327df4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e76969b0d61dd2c1a23a2ab… Author: Oliver Stieber <oliver_stieber(a)yahoo.co.uk> Date: Thu Dec 15 10:25:47 2005 +0100 wined3d: Internal reference counting. Change most references to resources parent into references to the resource, so that external reference counts match DirectX but object aren't released if they are still referenced by the stateblock. --- dlls/wined3d/device.c | 90 ++++++++++++++++++--------------------------- dlls/wined3d/stateblock.c | 29 ++++++--------- 2 files changed, 48 insertions(+), 71 deletions(-)

1 0

Paul Vriens : mscms: Add another possible error.
by Alexandre Julliard Dec. 15, 2005

Dec. 15, 2005

Module: wine Branch: refs/heads/master Commit: 49f137b666db766178ca87dc00095a00bd3be573 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=49f137b666db766178ca87d… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Thu Dec 15 10:25:19 2005 +0100 mscms: Add another possible error. --- dlls/mscms/tests/profile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 223dbc1..45b569c 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -515,7 +515,7 @@ static void test_GetStandardColorSpacePr /* Parameter checks */ todo_wine - fail_GSCSPW(machineW, 0, newprofile, &size, 0, (GLE == ERROR_INVALID_PARAMETER)); + fail_GSCSPW(machineW, 0, newprofile, &size, 0, (GLE == ERROR_INVALID_PARAMETER || GLE == ERROR_NOT_SUPPORTED)); todo_wine fail_GSCSPW(NULL, 0, newprofile, NULL, 0, (GLE == ERROR_INVALID_PARAMETER)); todo_wine

1 0

Paul Vriens : d3d9: Don't treat missing d3d9.dll as a failure.
by Alexandre Julliard Dec. 15, 2005

Dec. 15, 2005

Module: wine Branch: refs/heads/master Commit: 27462d1d40306b9ba10d9e353890cd101d16adfa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=27462d1d40306b9ba10d9e3… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Thu Dec 15 10:25:06 2005 +0100 d3d9: Don't treat missing d3d9.dll as a failure. --- dlls/d3d9/tests/vertexdeclaration.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/vertexdeclaration.c b/dlls/d3d9/tests/vertexdeclaration.c index eb88240..5118b55 100644 --- a/dlls/d3d9/tests/vertexdeclaration.c +++ b/dlls/d3d9/tests/vertexdeclaration.c @@ -20,19 +20,16 @@ #include <d3d9.h> #include "wine/test.h" +static HMODULE d3d9_handle = 0; + static IDirect3DDevice9 *init_d3d9(void) { IDirect3D9 * (__stdcall * d3d9_create)(UINT SDKVersion) = 0; - HMODULE d3d9_handle = 0; IDirect3D9 *d3d9_ptr = 0; IDirect3DDevice9 *device_ptr = 0; D3DPRESENT_PARAMETERS present_parameters; HRESULT hres; - d3d9_handle = LoadLibrary("d3d9"); - ok(d3d9_handle != NULL, "Failed to load d3d9.\n"); - if (!d3d9_handle) return NULL; - d3d9_create = (void *)GetProcAddress(d3d9_handle, "Direct3DCreate9"); ok(d3d9_create != NULL, "Failed to get address of Direct3DCreate9\n"); if (!d3d9_create) return NULL; @@ -93,7 +90,16 @@ static void test_get_set_vertex_declarat START_TEST(vertexdeclaration) { - IDirect3DDevice9 *device_ptr = init_d3d9(); + IDirect3DDevice9 *device_ptr; + + d3d9_handle = LoadLibraryA("d3d9.dll"); + if (!d3d9_handle) + { + trace("Could not load d3d9.dll, skipping tests\n"); + return; + } + + device_ptr = init_d3d9(); if (!device_ptr) return; test_get_set_vertex_declaration(device_ptr);

1 0

Dmitry Timoshkov : iccvid: Add support for ICM_DECOMPRESS_END message.
by Alexandre Julliard Dec. 15, 2005

Dec. 15, 2005

Module: wine Branch: refs/heads/master Commit: bd52a2eedffe50c7b4e84d8eeb1d391d1c070942 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bd52a2eedffe50c7b4e84d8… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 15 10:24:49 2005 +0100 iccvid: Add support for ICM_DECOMPRESS_END message. --- dlls/iccvid/iccvid.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index 009c4ae..06915d1 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -931,6 +931,16 @@ static LRESULT ICCVID_GetInfo( ICCVID_In return sizeof(ICINFO); } +static LRESULT ICCVID_DecompressEnd( ICCVID_Info *info ) +{ + if( info->cvinfo ) + { + free_cvinfo( info->cvinfo ); + info->cvinfo = NULL; + } + return ICERR_OK; +} + LRESULT WINAPI ICCVID_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg, LPARAM lParam1, LPARAM lParam2) { @@ -978,6 +988,10 @@ LRESULT WINAPI ICCVID_DriverProc( DWORD_ case ICM_DECOMPRESSEX: return ICCVID_DecompressEx( info, (ICDECOMPRESSEX*) lParam1, (DWORD) lParam2 ); + + case ICM_DECOMPRESS_END: + return ICCVID_DecompressEnd( info ); + case DRV_CLOSE: return ICCVID_Close( info );

1 0