July 2008 - Wine-commits - list.winehq.org

Alexandre Julliard : winex11: Fetch the current X window position on ShowWindow resulting from a window manager event .
by Alexandre Julliard 31 Jul '08

31 Jul '08

Module: wine Branch: master Commit: 31b4061c9b0b9b960346f047c3d7afa9afe092f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31b4061c9b0b9b960346f047c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 31 11:40:49 2008 +0200 winex11: Fetch the current X window position on ShowWindow resulting from a window manager event. This ensures that we get the correct size for maximized windows too, which cannot be done with SetWindowPlacement. --- dlls/winex11.drv/event.c | 27 +---------------------- dlls/winex11.drv/window.c | 42 +++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/winex11.drv.spec | 1 + 3 files changed, 44 insertions(+), 26 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index accd6b4..d54b5bb 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -883,34 +883,9 @@ static void handle_wm_state_notify( struct x11drv_win_data *data, XPropertyEvent if (data->iconic && data->wm_state == NormalState) /* restore window */ { - int x, y; - unsigned int width, height, border, depth; - Window root, top; - WINDOWPLACEMENT wp; - RECT rect; - - /* FIXME: hack */ - wine_tsx11_lock(); - XGetGeometry( event->display, data->whole_window, &root, &x, &y, &width, &height, - &border, &depth ); - XTranslateCoordinates( event->display, data->whole_window, root, 0, 0, &x, &y, &top ); - wine_tsx11_unlock(); - rect.left = x; - rect.top = y; - rect.right = x + width; - rect.bottom = y + height; - OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); - X11DRV_X_to_window_rect( data, &rect ); - - wp.length = sizeof(wp); - GetWindowPlacement( data->hwnd, &wp ); - wp.flags = 0; - wp.showCmd = SW_RESTORE; - wp.rcNormalPosition = rect; - TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window ); data->iconic = FALSE; - SetWindowPlacement( data->hwnd, &wp ); + ShowWindow( data->hwnd, SW_RESTORE ); } else if (!data->iconic && data->wm_state == IconicState) { diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index a45f04b..3143765 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2056,6 +2056,48 @@ void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, } +/*********************************************************************** + * ShowWindow (X11DRV.@) + */ +UINT X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) +{ + int x, y; + unsigned int width, height, border, depth; + Window root, top; + DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); + + if (!data || !data->whole_window || !data->managed || !data->mapped || data->iconic) return swp; + if (style & WS_MINIMIZE) return swp; + + /* only fetch the new rectangle if the ShowWindow was a result of a window manager event */ + + if (!thread_data->current_event || thread_data->current_event->xany.window != data->whole_window) + return swp; + + if (thread_data->current_event->type != ConfigureNotify && + thread_data->current_event->type != PropertyNotify) + return swp; + + TRACE( "win %p/%lx cmd %d at %s flags %08x\n", + hwnd, data->whole_window, cmd, wine_dbgstr_rect(rect), swp ); + + wine_tsx11_lock(); + XGetGeometry( thread_data->display, data->whole_window, + &root, &x, &y, &width, &height, &border, &depth ); + XTranslateCoordinates( thread_data->display, data->whole_window, root, 0, 0, &x, &y, &top ); + wine_tsx11_unlock(); + rect->left = x; + rect->top = y; + rect->right = x + width; + rect->bottom = y + height; + OffsetRect( rect, virtual_screen_rect.left, virtual_screen_rect.top ); + X11DRV_X_to_window_rect( data, rect ); + return swp & ~(SWP_NOMOVE | SWP_NOCLIENTMOVE | SWP_NOSIZE | SWP_NOCLIENTSIZE); +} + + /********************************************************************** * SetWindowIcon (X11DRV.@) * diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 5dbe40f..cacc5b9 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -111,6 +111,7 @@ @ cdecl SetWindowRgn(long long long) X11DRV_SetWindowRgn @ cdecl SetWindowStyle(ptr long) X11DRV_SetWindowStyle @ cdecl SetWindowText(long wstr) X11DRV_SetWindowText +@ cdecl ShowWindow(long long ptr long) X11DRV_ShowWindow @ cdecl SysCommand(long long long) X11DRV_SysCommand @ cdecl WindowMessage(long long long long) X11DRV_WindowMessage @ cdecl WindowPosChanging(long long long ptr ptr ptr) X11DRV_WindowPosChanging

1 0

Alexandre Julliard : user32: Return a proper rectangle from WINPOS_MinMaximize.
by Alexandre Julliard 31 Jul '08

31 Jul '08

Module: wine Branch: master Commit: cd337174aa0ce501140e7b9791cb20fe15317810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd337174aa0ce501140e7b979… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 30 16:05:09 2008 +0200 user32: Return a proper rectangle from WINPOS_MinMaximize. --- dlls/user32/win.c | 3 ++- dlls/user32/winpos.c | 14 +++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 2b7f620..7756ab0 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1249,7 +1249,8 @@ static HWND WIN_CreateWindowEx( CREATESTRUCTA *cs, LPCWSTR className, UINT flags swFlag = WINPOS_MinMaximize( hwnd, swFlag, &newPos ); swFlag |= SWP_FRAMECHANGED; /* Frame always gets changed */ if (!(style & WS_VISIBLE) || (style & WS_CHILD) || GetActiveWindow()) swFlag |= SWP_NOACTIVATE; - SetWindowPos( hwnd, 0, newPos.left, newPos.top, newPos.right, newPos.bottom, swFlag ); + SetWindowPos( hwnd, 0, newPos.left, newPos.top, newPos.right - newPos.left, + newPos.bottom - newPos.top, swFlag ); } /* Notify the parent window only */ diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index a05b5f7..fed65e9 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -905,7 +905,8 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) if (!(old_style & WS_MINIMIZE)) swpFlags |= SWP_STATECHANGED; SetRect( rect, wpl.ptMinPosition.x, wpl.ptMinPosition.y, - GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON) ); + wpl.ptMinPosition.x + GetSystemMetrics(SM_CXICON), + wpl.ptMinPosition.y + GetSystemMetrics(SM_CYICON) ); swpFlags |= SWP_NOCOPYBITS; break; @@ -919,7 +920,8 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) if (old_style & WS_MINIMIZE) WINPOS_ShowIconTitle( hwnd, FALSE ); if (!(old_style & WS_MAXIMIZE)) swpFlags |= SWP_STATECHANGED; - SetRect( rect, wpl.ptMaxPosition.x, wpl.ptMaxPosition.y, size.x, size.y ); + SetRect( rect, wpl.ptMaxPosition.x, wpl.ptMaxPosition.y, + wpl.ptMaxPosition.x + size.x, wpl.ptMaxPosition.y + size.y ); break; case SW_SHOWNOACTIVATE: @@ -941,7 +943,8 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) WINPOS_GetMinMaxInfo( hwnd, &size, &wpl.ptMaxPosition, NULL, NULL); WIN_SetStyle( hwnd, WS_MAXIMIZE, 0 ); swpFlags |= SWP_STATECHANGED; - SetRect( rect, wpl.ptMaxPosition.x, wpl.ptMaxPosition.y, size.x, size.y ); + SetRect( rect, wpl.ptMaxPosition.x, wpl.ptMaxPosition.y, + wpl.ptMaxPosition.x + size.x, wpl.ptMaxPosition.y + size.y ); break; } } @@ -952,9 +955,6 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) /* Restore to normal position */ *rect = wpl.rcNormalPosition; - rect->right -= rect->left; - rect->bottom -= rect->top; - break; } @@ -1055,7 +1055,7 @@ static BOOL show_window( HWND hwnd, INT cmd ) } else SetWindowPos( hwnd, HWND_TOP, newPos.left, newPos.top, - newPos.right, newPos.bottom, LOWORD(swp) ); + newPos.right - newPos.left, newPos.bottom - newPos.top, swp ); if (cmd == SW_HIDE) {

1 0

Alexandre Julliard : winex11: Send WM_SYSCOMMAND instead of calling ShowWindow directly to minimize/ restore a window.
by Alexandre Julliard 31 Jul '08

31 Jul '08

Module: wine Branch: master Commit: 8d77c375b27adc490d24d7593769f4e149d4102c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d77c375b27adc490d24d7593… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 31 12:08:38 2008 +0200 winex11: Send WM_SYSCOMMAND instead of calling ShowWindow directly to minimize/restore a window. --- dlls/winex11.drv/event.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index d54b5bb..6250486 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -885,13 +885,13 @@ static void handle_wm_state_notify( struct x11drv_win_data *data, XPropertyEvent { TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window ); data->iconic = FALSE; - ShowWindow( data->hwnd, SW_RESTORE ); + SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); } else if (!data->iconic && data->wm_state == IconicState) { TRACE( "minimizing win %p/%lx\n", data->hwnd, data->whole_window ); data->iconic = TRUE; - ShowWindow( data->hwnd, SW_MINIMIZE ); + SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_MINIMIZE, 0 ); } }

1 0

Vladimir Pankratov : netapi32: Add stub for NetWkstaUserEnum.
by Alexandre Julliard 30 Jul '08

30 Jul '08

Module: wine Branch: master Commit: ee120e01c97ee584d4bf8bf075057f932c62fd13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee120e01c97ee584d4bf8bf07… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Wed Jul 30 17:07:05 2008 +0500 netapi32: Add stub for NetWkstaUserEnum. --- dlls/netapi32/netapi32.spec | 2 +- dlls/netapi32/wksta.c | 13 +++++++++++++ include/lmwksta.h | 1 + 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index 2750497..4b53e79 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -217,7 +217,7 @@ @ stub NetWkstaTransportAdd @ stub NetWkstaTransportDel @ stdcall NetWkstaTransportEnum (wstr long ptr long ptr ptr ptr) -@ stub NetWkstaUserEnum +@ stdcall NetWkstaUserEnum(wstr long ptr long ptr ptr ptr) @ stdcall NetWkstaUserGetInfo(wstr long ptr) @ stub NetWkstaUserSetInfo @ stdcall NetapipBufferAllocate(long ptr) NetApiBufferAllocate diff --git a/dlls/netapi32/wksta.c b/dlls/netapi32/wksta.c index 6914d02..85a3368 100644 --- a/dlls/netapi32/wksta.c +++ b/dlls/netapi32/wksta.c @@ -444,6 +444,19 @@ NET_API_STATUS WINAPI NetWkstaUserGetInfo(LMSTR reserved, DWORD level, } /************************************************************ + * NetWkstaUserEnum (NETAPI32.@) + */ +NET_API_STATUS WINAPI +NetWkstaUserEnum(LMSTR servername, DWORD level, LPBYTE* bufptr, + DWORD prefmaxlen, LPDWORD entriesread, + LPDWORD totalentries, LPDWORD resumehandle) +{ + FIXME("(%s, %d, %p, %d, %p, %p, %p): stub!\n", debugstr_w(servername), + level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle); + return ERROR_INVALID_PARAMETER; +} + +/************************************************************ * NetpGetComputerName (NETAPI32.@) */ NET_API_STATUS WINAPI NetpGetComputerName(LPWSTR *Buffer) diff --git a/include/lmwksta.h b/include/lmwksta.h index 6ccb704..6bc2faf 100644 --- a/include/lmwksta.h +++ b/include/lmwksta.h @@ -83,6 +83,7 @@ NET_API_STATUS WINAPI NetWkstaTransportDel(LMSTR,LMSTR,DWORD); NET_API_STATUS WINAPI NetWkstaTransportEnum(LMSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD); NET_API_STATUS WINAPI NetWkstaUserGetInfo(LMSTR,DWORD,LPBYTE*); NET_API_STATUS WINAPI NetWkstaUserSetInfo(LMSTR,DWORD,LPBYTE,LPDWORD); +NET_API_STATUS WINAPI NetWkstaUserEnum(LMSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD); #ifdef __cplusplus }

1 0

Alexander Morozov : ntoskrnl.exe: Add stub for IoDeleteSymbolicLink.
by Alexandre Julliard 30 Jul '08

30 Jul '08

Module: wine Branch: master Commit: 809fe637bd17ddead43c6240fec242718df3c39b URL: http://source.winehq.org/git/wine.git/?a=commit;h=809fe637bd17ddead43c6240f… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Tue Jul 29 17:04:47 2008 +0400 ntoskrnl.exe: Add stub for IoDeleteSymbolicLink. --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d761fd1..aff50fd 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -441,6 +441,16 @@ NTSTATUS WINAPI IoCreateSymbolicLink( UNICODE_STRING *name, UNICODE_STRING *targ /*********************************************************************** + * IoDeleteSymbolicLink (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoDeleteSymbolicLink( UNICODE_STRING *name ) +{ + FIXME( "%s\n", debugstr_us(name) ); + return STATUS_SUCCESS; +} + + +/*********************************************************************** * IofCompleteRequest (NTOSKRNL.EXE.@) */ #ifdef DEFINE_FASTCALL2_ENTRYPOINT diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 9d9a22b..0bfda7e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -355,7 +355,7 @@ @ stub IoDeleteController @ stdcall IoDeleteDevice(ptr) @ stdcall IoDeleteDriver(ptr) -@ stub IoDeleteSymbolicLink +@ stdcall IoDeleteSymbolicLink(ptr) @ stub IoDetachDevice @ stub IoDeviceHandlerObjectSize @ stub IoDeviceHandlerObjectType

1 0

Alexander Morozov : include/ddk/wdm.h: Add defines.
by Alexandre Julliard 30 Jul '08

30 Jul '08

Module: wine Branch: master Commit: 478e64f5495d179fc832b6681e9282dc9f3bb310 URL: http://source.winehq.org/git/wine.git/?a=commit;h=478e64f5495d179fc832b6681… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Wed Jul 30 11:55:23 2008 +0400 include/ddk/wdm.h: Add defines. --- include/ddk/wdm.h | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 931a130..cfe911c 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -125,11 +125,66 @@ typedef struct _WAIT_CONTEXT_BLOCK { PKDPC BufferChainingDpc; } WAIT_CONTEXT_BLOCK, *PWAIT_CONTEXT_BLOCK; +#define DO_BUFFERED_IO 0x00000004 +#define DO_EXCLUSIVE 0x00000008 +#define DO_DIRECT_IO 0x00000010 +#define DO_MAP_IO_BUFFER 0x00000020 +#define DO_DEVICE_INITIALIZING 0x00000080 +#define DO_SHUTDOWN_REGISTERED 0x00000800 +#define DO_BUS_ENUMERATED_DEVICE 0x00001000 +#define DO_POWER_PAGABLE 0x00002000 +#define DO_POWER_INRUSH 0x00004000 + +#define IO_NO_INCREMENT 0 +#define IO_CD_ROM_INCREMENT 1 +#define IO_DISK_INCREMENT 1 +#define IO_KEYBOARD_INCREMENT 6 +#define IO_MAILSLOT_INCREMENT 2 +#define IO_MOUSE_INCREMENT 6 +#define IO_NAMED_PIPE_INCREMENT 2 +#define IO_NETWORK_INCREMENT 2 +#define IO_PARALLEL_INCREMENT 1 +#define IO_SERIAL_INCREMENT 2 +#define IO_SOUND_INCREMENT 8 +#define IO_VIDEO_INCREMENT 1 + #ifndef DEVICE_TYPE #define DEVICE_TYPE ULONG #endif #define IRP_MJ_MAXIMUM_FUNCTION 0x1b +#define IRP_MJ_CREATE 0x00 +#define IRP_MJ_CREATE_NAMED_PIPE 0x01 +#define IRP_MJ_CLOSE 0x02 +#define IRP_MJ_READ 0x03 +#define IRP_MJ_WRITE 0x04 +#define IRP_MJ_QUERY_INFORMATION 0x05 +#define IRP_MJ_SET_INFORMATION 0x06 +#define IRP_MJ_QUERY_EA 0x07 +#define IRP_MJ_SET_EA 0x08 +#define IRP_MJ_FLUSH_BUFFERS 0x09 +#define IRP_MJ_QUERY_VOLUME_INFORMATION 0x0a +#define IRP_MJ_SET_VOLUME_INFORMATION 0x0b +#define IRP_MJ_DIRECTORY_CONTROL 0x0c +#define IRP_MJ_FILE_SYSTEM_CONTROL 0x0d #define IRP_MJ_DEVICE_CONTROL 0x0e +#define IRP_MJ_INTERNAL_DEVICE_CONTROL 0x0f +#define IRP_MJ_SHUTDOWN 0x10 +#define IRP_MJ_LOCK_CONTROL 0x11 +#define IRP_MJ_CLEANUP 0x12 +#define IRP_MJ_CREATE_MAILSLOT 0x13 +#define IRP_MJ_QUERY_SECURITY 0x14 +#define IRP_MJ_SET_SECURITY 0x15 +#define IRP_MJ_POWER 0x16 +#define IRP_MJ_SYSTEM_CONTROL 0x17 +#define IRP_MJ_DEVICE_CHANGE 0x18 +#define IRP_MJ_QUERY_QUOTA 0x19 +#define IRP_MJ_SET_QUOTA 0x1a +#define IRP_MJ_PNP 0x1b + +#define IRP_QUOTA_CHARGED 0x01 +#define IRP_ALLOCATED_MUST_SUCCEED 0x02 +#define IRP_ALLOCATED_FIXED_SIZE 0x04 +#define IRP_LOOKASIDE_ALLOCATION 0x08 typedef struct _DEVICE_OBJECT { CSHORT Type;

1 0

Alexander Morozov : ntoskrnl.exe: Add stubs for IoAllocateIrp, IoInitializeIrp and IoFreeIrp.
by Alexandre Julliard 30 Jul '08

30 Jul '08

Module: wine Branch: master Commit: 217af4e7b9cad7efaaf731b88d05154767c0b960 URL: http://source.winehq.org/git/wine.git/?a=commit;h=217af4e7b9cad7efaaf731b88… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Tue Jul 29 16:52:57 2008 +0400 ntoskrnl.exe: Add stubs for IoAllocateIrp, IoInitializeIrp and IoFreeIrp. --- dlls/ntoskrnl.exe/ntoskrnl.c | 29 +++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 6 +++--- include/ddk/wdm.h | 3 +++ 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 564c55b..d761fd1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -247,6 +247,35 @@ NTSTATUS wine_ntoskrnl_main_loop( HANDLE stop_event ) } } + +/*********************************************************************** + * IoInitializeIrp (NTOSKRNL.EXE.@) + */ +void WINAPI IoInitializeIrp( IRP *irp, USHORT size, CCHAR stack_size ) +{ + FIXME( "%p, %u, %d\n", irp, size, stack_size ); +} + + +/*********************************************************************** + * IoAllocateIrp (NTOSKRNL.EXE.@) + */ +PIRP WINAPI IoAllocateIrp( CCHAR stack_size, BOOLEAN charge_quota ) +{ + FIXME( "%d, %d\n", stack_size, charge_quota ); + return NULL; +} + + +/*********************************************************************** + * IoFreeIrp (NTOSKRNL.EXE.@) + */ +void WINAPI IoFreeIrp( IRP *irp ) +{ + FIXME( "%p\n", irp ); +} + + /*********************************************************************** * IoAllocateMdl (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0e7b8e8..9d9a22b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -311,7 +311,7 @@ @ stub IoAllocateController @ stub IoAllocateDriverObjectExtension @ stub IoAllocateErrorLogEntry -@ stub IoAllocateIrp +@ stdcall IoAllocateIrp(long long) @ stdcall IoAllocateMdl(ptr long long long ptr) @ stdcall IoAllocateWorkItem(ptr) @ stub IoAssignResources @@ -370,7 +370,7 @@ @ stub IoForwardIrpSynchronously @ stub IoFreeController @ stub IoFreeErrorLogEntry -@ stub IoFreeIrp +@ stdcall IoFreeIrp(ptr) @ stub IoFreeMdl @ stub IoFreeWorkItem @ stub IoGetAttachedDevice @@ -397,7 +397,7 @@ @ stub IoGetRequestorSessionId @ stub IoGetStackLimits @ stub IoGetTopLevelIrp -@ stub IoInitializeIrp +@ stdcall IoInitializeIrp(ptr long long) @ stub IoInitializeRemoveLockEx @ stub IoInitializeTimer @ stub IoInvalidateDeviceRelations diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index cfe911c..e2340dd 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -932,13 +932,16 @@ PVOID WINAPI ExAllocatePoolWithQuotaTag(POOL_TYPE,SIZE_T,ULONG); void WINAPI ExFreePool(PVOID); void WINAPI ExFreePoolWithTag(PVOID,ULONG); +PIRP WINAPI IoAllocateIrp(CCHAR,BOOLEAN); NTSTATUS WINAPI IoCreateDevice(DRIVER_OBJECT*,ULONG,UNICODE_STRING*,DEVICE_TYPE,ULONG,BOOLEAN,DEVICE_OBJECT**); NTSTATUS WINAPI IoCreateDriver(UNICODE_STRING*,PDRIVER_INITIALIZE); NTSTATUS WINAPI IoCreateSymbolicLink(UNICODE_STRING*,UNICODE_STRING*); void WINAPI IoDeleteDevice(DEVICE_OBJECT*); void WINAPI IoDeleteDriver(DRIVER_OBJECT*); NTSTATUS WINAPI IoDeleteSymbolicLink(UNICODE_STRING*); +void WINAPI IoFreeIrp(IRP*); PEPROCESS WINAPI IoGetCurrentProcess(void); +void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR); PKTHREAD WINAPI KeGetCurrentThread(void); void WINAPI KeQuerySystemTime(LARGE_INTEGER*);

1 0

Rob Shearman : oleaut32: Handle strings with a length of 0xffff in SLTG_DoVars.
by Alexandre Julliard 30 Jul '08

30 Jul '08

Module: wine Branch: master Commit: 9f9d8dc6839a724ee3c894227b93cff8c53c3031 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f9d8dc6839a724ee3c894227… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Jul 30 13:18:47 2008 +0100 oleaut32: Handle strings with a length of 0xffff in SLTG_DoVars. This means that the string is NULL so don't attempt to access the string data in this case. --- dlls/oleaut32/typelib.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index fd60db2..c569fb2 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3161,9 +3161,15 @@ static void SLTG_DoVars(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsign case VT_BSTR: { WORD len = *(WORD *)(pBlk + pItem->byte_offs); - INT alloc_len = MultiByteToWideChar(CP_ACP, 0, pBlk + pItem->byte_offs + 2, len, NULL, 0); - BSTR str = SysAllocStringLen(NULL, alloc_len); - MultiByteToWideChar(CP_ACP, 0, pBlk + pItem->byte_offs + 2, len, str, alloc_len); + BSTR str; + TRACE_(typelib)("len = %u\n", len); + if (len == 0xffff) { + str = NULL; + } else { + INT alloc_len = MultiByteToWideChar(CP_ACP, 0, pBlk + pItem->byte_offs + 2, len, NULL, 0); + str = SysAllocStringLen(NULL, alloc_len); + MultiByteToWideChar(CP_ACP, 0, pBlk + pItem->byte_offs + 2, len, str, alloc_len); + } V_VT((*ppVarDesc)->vardesc.u.lpvarValue) = VT_BSTR; V_BSTR((*ppVarDesc)->vardesc.u.lpvarValue) = str; break;

1 0

Rob Shearman : oleaut32: Fix the loading of the parameter name for SLTG propget functions.
by Alexandre Julliard 30 Jul '08

30 Jul '08

Module: wine Branch: master Commit: 6f9baca2563707ae9debfc70ea0157109a7418e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f9baca2563707ae9debfc70e… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Jul 30 13:18:55 2008 +0100 oleaut32: Fix the loading of the parameter name for SLTG propget functions. The parameter could have an offset of 0xffff/0xfffe, in which case the parameter name should be the name of the function, rather than NULL. --- dlls/oleaut32/typelib.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index c569fb2..45c5e13 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3308,6 +3308,9 @@ static void SLTG_DoFuncs(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, if(paramName) { (*ppFuncDesc)->pParamDesc[param].Name = TLB_MultiByteToBSTR(paramName); + } else { + (*ppFuncDesc)->pParamDesc[param].Name = + SysAllocString((*ppFuncDesc)->Name); } }

1 0

Rob Shearman : oleaut32: Move the debug logging of the variable type in SLTG_DoVars.
by Alexandre Julliard 30 Jul '08

30 Jul '08

Module: wine Branch: master Commit: 0ed6ebfec1b271d5595212d14048cf291d3fd964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ed6ebfec1b271d5595212d14… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Jul 30 13:18:16 2008 +0100 oleaut32: Move the debug logging of the variable type in SLTG_DoVars. Move it before loading of the constant data to allow better debugging of problems during the processing of loading the constant data. --- dlls/oleaut32/typelib.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index f190065..aaff551 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3135,6 +3135,12 @@ static void SLTG_DoVars(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsign SLTG_DoElem(pType, pBlk, &(*ppVarDesc)->vardesc.elemdescVar, ref_lookup); + if (TRACE_ON(typelib)) { + char buf[300]; + dump_TypeDesc(&(*ppVarDesc)->vardesc.elemdescVar.tdesc, buf); + TRACE_(typelib)("elemdescVar: %s\n", buf); + } + if (pItem->flags & 0x40) { TRACE_(typelib)("VAR_DISPATCH\n"); (*ppVarDesc)->vardesc.varkind = VAR_DISPATCH; @@ -3186,12 +3192,6 @@ static void SLTG_DoVars(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsign if (pItem->flags & 0x80) (*ppVarDesc)->vardesc.wVarFlags |= VARFLAG_FREADONLY; - if (TRACE_ON(typelib)) { - char buf[300]; - dump_TypeDesc(&(*ppVarDesc)->vardesc.elemdescVar.tdesc, buf); - TRACE_(typelib)("elemdescVar: %s\n", buf); - } - bstrPrevName = (*ppVarDesc)->Name; ppVarDesc = &((*ppVarDesc)->next); }

1 0