May 2007 - Wine-Commits - list.winehq.org

Andrew Talbot : opengl32: Exclude unused header.
by Alexandre Julliard May 16, 2007

May 16, 2007

Module: wine Branch: master Commit: cde845fec5e45229815a9470e1f717406c5cf31a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde845fec5e45229815a9470e… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue May 15 22:28:31 2007 +0100 opengl32: Exclude unused header. --- dlls/opengl32/wgl.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index a23cd83..ca6702f 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -28,7 +28,6 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winerror.h" #include "winreg.h" #include "wingdi.h" #include "winternl.h"

1 0

Dan Hipschman : widl: Improve handling of offsets in the type format string .
by Alexandre Julliard May 16, 2007

May 16, 2007

Module: wine Branch: master Commit: 217fc9c0f3d5d514eb0a2cf352783374855ce17c URL: http://source.winehq.org/git/wine.git/?a=commit;h=217fc9c0f3d5d514eb0a2cf35… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue May 15 17:45:59 2007 -0700 widl: Improve handling of offsets in the type format string. --- tools/widl/client.c | 17 ++---- tools/widl/proxy.c | 56 +++++++------------- tools/widl/server.c | 20 ++----- tools/widl/typegen.c | 139 ++++++++++++++++++++++++++------------------------ tools/widl/typegen.h | 3 +- 5 files changed, 103 insertions(+), 132 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=217fc9c0f3d5d514eb0a2…

1 0

Mikołaj Zalewski : comctl32: toolbar: TB_SETIMAGELIST should try to preserve button width.
by Alexandre Julliard May 16, 2007

May 16, 2007

Module: wine Branch: master Commit: 7b8241b1ee1c7f9126423bda85f3fa8acc849ead URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b8241b1ee1c7f9126423bda8… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue May 15 18:54:03 2007 +0200 comctl32: toolbar: TB_SETIMAGELIST should try to preserve button width. --- dlls/comctl32/tests/toolbar.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/comctl32/toolbar.c | 3 +++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index e2d5095..f997b61 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -678,6 +678,14 @@ static tbsize_result_t tbsize_results[] = { {0, 0, 672, 26}, {489, 39}, 3, { { 0, 2, 163, 41}, {163, 2, 330, 41}, {330, 2, 493, 41}, }, }, + { {0, 0, 672, 104}, {978, 24}, 6, { + { 0, 2, 163, 26}, {163, 2, 326, 26}, {326, 2, 489, 26}, + {489, 2, 652, 26}, {652, 2, 819, 26}, {819, 2, 850, 26}, + }, }, + { {0, 0, 672, 28}, {978, 38}, 6, { + { 0, 0, 163, 38}, {163, 0, 326, 38}, {326, 0, 489, 38}, + {489, 0, 652, 38}, {652, 0, 819, 38}, {819, 0, 850, 38}, + }, }, }; static int tbsize_numtests = 0; @@ -725,6 +733,7 @@ static TBBUTTON buttons3[] = { static void test_sizes(void) { HWND hToolbar = NULL; + HIMAGELIST himl; int style; int i; @@ -855,7 +864,36 @@ static void test_sizes(void) ok(SendMessageA(hToolbar, TB_SETSTATE, 20, TBSTATE_ENABLED), "TB_SETSTATE failed\n"); ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(23, 22), "Unexpected button size\n"); + /* TB_SETIMAGELIST always changes the height but the width only if necessary */ + SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELONG(100, 100)); + himl = ImageList_LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_BITMAP_80x15), 20, 2, CLR_NONE, IMAGE_BITMAP, LR_DEFAULTCOLOR); + ok(SendMessageA(hToolbar, TB_SETIMAGELIST, 0, (LPARAM)himl) == 0, "TB_SETIMAGELIST failed\n"); + ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(100, 21), "Unexpected button size\n"); + SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELONG(100, 100)); + ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(100, 100), "Unexpected button size\n"); + SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELONG(1, 1)); + ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(27, 21), "Unexpected button size\n"); + ok(SendMessageA(hToolbar, TB_SETIMAGELIST, 0, 0) == (LRESULT)himl, "TB_SETIMAGELIST failed\n"); + ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(27, 7), "Unexpected button size\n"); + SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELONG(1, 1)); + ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(8, 7), "Unexpected button size\n"); + ok(SendMessageA(hToolbar, TB_SETIMAGELIST, 0, (LPARAM)himl) == 0, "TB_SETIMAGELIST failed\n"); + ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(27, 21), "Unexpected button size\n"); + /* the text is taken into account */ + SendMessageA(hToolbar, TB_ADDSTRINGA, 0, (LPARAM)"A\0MMMMMMMMMMMMM\0"); + SendMessageA(hToolbar, TB_ADDBUTTONS, 4, (LPARAM)buttons3); + ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(163, 38), "Unexpected button size\n"); + ok(SendMessageA(hToolbar, TB_SETIMAGELIST, 0, 0) == (LRESULT)himl, "TB_SETIMAGELIST failed\n"); + ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(163, 24), "Unexpected button size\n"); + /* the style change also comes into effect */ + check_sizes(); + SetWindowLong(hToolbar, GWL_STYLE, GetWindowLong(hToolbar, GWL_STYLE) | TBSTYLE_FLAT); + ok(SendMessageA(hToolbar, TB_SETIMAGELIST, 0, (LPARAM)himl) == 0, "TB_SETIMAGELIST failed\n"); + check_sizes_todo(0x30); /* some small problems with BTNS_AUTOSIZE button sizes */ + rebuild_toolbar(&hToolbar); + ImageList_Destroy(himl); + SendMessageA(hToolbar, TB_ADDBUTTONS, 1, (LPARAM)&buttons3[3]); ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(27, 39), "Unexpected button size\n"); SendMessageA(hToolbar, TB_DELETEBUTTON, 0, 0); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 89037c4..9be48ea 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4791,6 +4791,7 @@ TOOLBAR_SetImageList (HWND hwnd, WPARAM wParam, LPARAM lParam) TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); HIMAGELIST himlTemp; HIMAGELIST himl = (HIMAGELIST)lParam; + INT oldButtonWidth = infoPtr->nButtonWidth; INT i, id = 0; if (infoPtr->iVersion >= 5) @@ -4810,6 +4811,8 @@ TOOLBAR_SetImageList (HWND hwnd, WPARAM wParam, LPARAM lParam) infoPtr->nBitmapHeight = 1; } TOOLBAR_CalcToolbar(hwnd); + if (infoPtr->nButtonWidth < oldButtonWidth) + TOOLBAR_SetButtonSize(hwnd, 0, MAKELONG(oldButtonWidth, infoPtr->nButtonHeight)); TRACE("hwnd %p, new himl=%p, id = %d, count=%d, bitmap w=%d, h=%d\n", hwnd, infoPtr->himlDef, id, infoPtr->nNumBitmaps,

1 0

Erez Volk : ntdll: Added IDT Timezone (Israel daylight savings time).
by Alexandre Julliard May 16, 2007

May 16, 2007

Module: wine Branch: master Commit: 14a32754362d3afa36e40d928fc91a43051ce317 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14a32754362d3afa36e40d928… Author: Erez Volk <erez.volk(a)gmail.com> Date: Tue May 15 20:43:51 2007 +0300 ntdll: Added IDT Timezone (Israel daylight savings time). --- dlls/ntdll/time.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 30c71db..1159a89 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -233,6 +233,9 @@ static const struct tagTZ_INFO TZ_INFO[] = {"IST", {'I','s','r','a','e','l',' ','S','t','a','n','d','a','r','d',' ','T','i', 'm','e','\0'}, -120, 0}, + {"IDT", + {'I','s','r','a','e','l',' ','S','t','a','n','d','a','r','d',' ','T','i', + 'm','e','\0'}, -180, 1}, {"MSK", {'R','u','s','s','i','a','n',' ','S','t','a','n','d','a','r','d',' ','T', 'i','m','e','\0'}, -180, 0},

1 0

Andrew Talbot : ole32: Exclude unused headers.
by Alexandre Julliard May 16, 2007

May 16, 2007

Module: wine Branch: master Commit: 4ea954df4227a2d8b59280d19b1448c64d402f78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ea954df4227a2d8b59280d19… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue May 15 22:28:23 2007 +0100 ole32: Exclude unused headers. --- dlls/ole32/classmoniker.c | 1 - dlls/ole32/hglobalstream.c | 1 - dlls/ole32/ole16.c | 1 - dlls/ole32/ole2.c | 2 -- dlls/ole32/ole2_16.c | 4 ---- dlls/ole32/ole2impl.c | 1 - dlls/ole32/ole2nls.c | 3 --- dlls/ole32/ole32_main.c | 1 - dlls/ole32/oleproxy.c | 1 - dlls/ole32/stg_stream.c | 1 - dlls/ole32/storage.c | 1 - 11 files changed, 0 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 07db622..514990a 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -31,7 +31,6 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winnls.h" #include "wine/debug.h" #include "ole2.h" #include "wine/unicode.h" diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index d98c0c5..872fb24 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -39,7 +39,6 @@ #include "objbase.h" #include "ole2.h" #include "winerror.h" -#include "winreg.h" #include "winternl.h" #include "wine/debug.h" diff --git a/dlls/ole32/ole16.c b/dlls/ole32/ole16.c index d9c2202..b89efa8 100644 --- a/dlls/ole32/ole16.c +++ b/dlls/ole32/ole16.c @@ -35,7 +35,6 @@ #include "winuser.h" #include "objbase.h" #include "ole2.h" -#include "ole2ver.h" #include "rpc.h" #include "winerror.h" #include "winreg.h" diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 8ad9953..4fe31b0 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -41,10 +41,8 @@ #include "winuser.h" #include "winnls.h" #include "winreg.h" -#include "commctrl.h" #include "ole2.h" #include "ole2ver.h" -#include "wownt32.h" #include "wine/unicode.h" #include "compobj_private.h" diff --git a/dlls/ole32/ole2_16.c b/dlls/ole32/ole2_16.c index 20e9725..90a1ed2 100644 --- a/dlls/ole32/ole2_16.c +++ b/dlls/ole32/ole2_16.c @@ -35,12 +35,8 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winnls.h" -#include "commctrl.h" #include "ole2.h" -#include "ole2ver.h" #include "winerror.h" -#include "wownt32.h" #include "wine/winbase16.h" #include "wine/wingdi16.h" diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c index f123fe9..da50f4a 100644 --- a/dlls/ole32/ole2impl.c +++ b/dlls/ole32/ole2impl.c @@ -32,7 +32,6 @@ #include "wine/debug.h" #include "ole2.h" #include "olestd.h" -#include "winreg.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/dlls/ole32/ole2nls.c b/dlls/ole32/ole2nls.c index 9851d70..f42ddf9 100644 --- a/dlls/ole32/ole2nls.c +++ b/dlls/ole32/ole2nls.c @@ -31,11 +31,8 @@ #include "windef.h" #include "winbase.h" -#include "winerror.h" #include "winnls.h" -#include "winreg.h" #include "winuser.h" -#include "winver.h" #include "wine/winbase16.h" diff --git a/dlls/ole32/ole32_main.c b/dlls/ole32/ole32_main.c index 328a972..1d58d55 100644 --- a/dlls/ole32/ole32_main.c +++ b/dlls/ole32/ole32_main.c @@ -22,7 +22,6 @@ #include <stdio.h> #include "windef.h" -#include "winerror.h" #include "winbase.h" #include "wingdi.h" #include "winuser.h" diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index dd12e5c..e807941 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -53,7 +53,6 @@ #include "ole2.h" #include "rpc.h" #include "winerror.h" -#include "winreg.h" #include "wtypes.h" #include "compobj_private.h" diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index e144b2c..1bcb40b 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -36,7 +36,6 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "winreg.h" #include "winternl.h" #include "wine/debug.h" diff --git a/dlls/ole32/storage.c b/dlls/ole32/storage.c index 401c984..b2b89ff 100644 --- a/dlls/ole32/storage.c +++ b/dlls/ole32/storage.c @@ -36,7 +36,6 @@ #define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" -#include "winreg.h" #include "winternl.h" #include "winerror.h" #include "wine/winbase16.h"

1 0

Dmitry Timoshkov : kernel32: Add a test for LoadLibraryEx( LOAD_LIBRARY_AS_DATAFILE).
by Alexandre Julliard May 16, 2007

May 16, 2007

Module: wine Branch: master Commit: 59a2686ae400a2225cb7858d26c9b35ec1ec873a URL: http://source.winehq.org/git/wine.git/?a=commit;h=59a2686ae400a2225cb7858d2… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed May 16 01:10:29 2007 +0900 kernel32: Add a test for LoadLibraryEx(LOAD_LIBRARY_AS_DATAFILE). --- dlls/kernel32/tests/loader.c | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index ea5bb21..b67b81d 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -231,7 +231,8 @@ START_TEST(loader) static const char section_data[0x10] = "section data"; int i; DWORD dummy, file_size, file_align; - HANDLE hfile, hlib; + HANDLE hfile; + HMODULE hlib, hlib_as_data_file; SYSTEM_INFO si; char temp_path[MAX_PATH]; char dll_name[MAX_PATH]; @@ -421,7 +422,33 @@ START_TEST(loader) } SetLastError(0xdeadbeef); + hlib_as_data_file = LoadLibraryEx(dll_name, 0, LOAD_LIBRARY_AS_DATAFILE); + ok(hlib_as_data_file != 0, "LoadLibraryEx error %u\n", GetLastError()); +todo_wine ok(hlib_as_data_file == hlib, "hlib_as_file and hlib are different\n"); + + SetLastError(0xdeadbeef); ok(FreeLibrary(hlib), "FreeLibrary error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + hlib = GetModuleHandle(dll_name); +todo_wine ok(hlib != 0, "GetModuleHandle error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ok(FreeLibrary(hlib_as_data_file), "FreeLibrary error %d\n", GetLastError()); + + hlib = GetModuleHandle(dll_name); + ok(!hlib, "GetModuleHandle should fail\n"); + + SetLastError(0xdeadbeef); + hlib_as_data_file = LoadLibraryEx(dll_name, 0, LOAD_LIBRARY_AS_DATAFILE); + ok(hlib_as_data_file != 0, "LoadLibraryEx error %u\n", GetLastError()); + ok((ULONG_PTR)hlib_as_data_file & 1, "hlib_as_data_file is even\n"); + + hlib = GetModuleHandle(dll_name); + ok(!hlib, "GetModuleHandle should fail\n"); + + SetLastError(0xdeadbeef); + ok(FreeLibrary(hlib_as_data_file), "FreeLibrary error %d\n", GetLastError()); } else { /* LoadLibrary is expected to fail */

1 0

Alexandre Julliard : ntoskrnl.exe: Added IofCompleteRequest.
by Alexandre Julliard May 16, 2007

May 16, 2007

Module: wine Branch: master Commit: e2d94ec0014cb8b167d9598c15b3f7d4f60ffb04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2d94ec0014cb8b167d9598c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 15 21:56:05 2007 +0200 ntoskrnl.exe: Added IofCompleteRequest. --- dlls/ntoskrnl.exe/ntoskrnl.c | 31 +++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 8ed3a51..8884622 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -51,6 +51,22 @@ typedef struct _KSERVICE_TABLE_DESCRIPTOR KSERVICE_TABLE_DESCRIPTOR KeServiceDescriptorTable[4]; +#ifdef __i386__ +#define DEFINE_FASTCALL1_ENTRYPOINT( name ) \ + __ASM_GLOBAL_FUNC( name, \ + "popl %eax\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME("__regs_") #name ) +#define DEFINE_FASTCALL2_ENTRYPOINT( name ) \ + __ASM_GLOBAL_FUNC( name, \ + "popl %eax\n\t" \ + "pushl %edx\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME("__regs_") #name ) +#endif + static inline LPCSTR debugstr_us( const UNICODE_STRING *us ) { if (!us) return "<null>"; @@ -183,6 +199,21 @@ NTSTATUS WINAPI IoCreateSymbolicLink( UNICODE_STRING *name, UNICODE_STRING *targ } +/*********************************************************************** + * IofCompleteRequest (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL2_ENTRYPOINT +DEFINE_FASTCALL2_ENTRYPOINT( IofCompleteRequest ) +void WINAPI __regs_IofCompleteRequest( IRP *irp, UCHAR priority_boost ) +#else +void WINAPI IofCompleteRequest( IRP *irp, UCHAR priority_boost ) +#endif +{ + TRACE( "%p %u\n", irp, priority_boost ); + /* nothing to do for now */ +} + + /***************************************************** * DllMain */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 871216e..5bfd792 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -40,7 +40,7 @@ @ stub IoSetPartitionInformation @ stub IoWritePartitionTable @ stub IofCallDriver -@ stub IofCompleteRequest +@ stdcall -norelay IofCompleteRequest(ptr long) @ stub KeAcquireInStackQueuedSpinLockAtDpcLevel @ stub KeReleaseInStackQueuedSpinLockFromDpcLevel @ stub KeSetTimeUpdateNotifyRoutine

1 0

Alexandre Julliard : ntoskrnl.exe: Export KeServiceDescriptorTable and KeTickCount.
by Alexandre Julliard May 16, 2007

May 16, 2007

Module: wine Branch: master Commit: 72f2ba6fc41dd3bbfd5c287b9f954e2c3d383cc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72f2ba6fc41dd3bbfd5c287b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 15 21:49:26 2007 +0200 ntoskrnl.exe: Export KeServiceDescriptorTable and KeTickCount. --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 ++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 0aa84b4..8ed3a51 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -37,6 +37,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); + +KSYSTEM_TIME KeTickCount; + +typedef struct _KSERVICE_TABLE_DESCRIPTOR +{ + PULONG_PTR Base; + PULONG Count; + ULONG Limit; + PUCHAR Number; +} KSERVICE_TABLE_DESCRIPTOR, *PKSERVICE_TABLE_DESCRIPTOR; + +KSERVICE_TABLE_DESCRIPTOR KeServiceDescriptorTable[4]; + + static inline LPCSTR debugstr_us( const UNICODE_STRING *us ) { if (!us) return "<null>"; diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index d5eeb9a..871216e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -603,7 +603,7 @@ @ stub KeRundownQueue @ stub KeSaveFloatingPointState @ stub KeSaveStateForHibernate -@ stub KeServiceDescriptorTable +@ extern KeServiceDescriptorTable @ stub KeSetAffinityThread @ stub KeSetBasePriorityThread @ stub KeSetDmaIoCoherency @@ -622,7 +622,7 @@ @ stub KeStackAttachProcess @ stub KeSynchronizeExecution @ stub KeTerminateThread -@ stub KeTickCount +@ extern KeTickCount @ stub KeUnstackDetachProcess @ stub KeUpdateRunTime @ stub KeUpdateSystemTime

1 0

Alexandre Julliard : ntoskrnl.exe: Implemented IoCreateSymbolicLink.
by Alexandre Julliard May 16, 2007

May 16, 2007

Module: wine Branch: master Commit: 7330edd25dbebb1cfb856bdf1ae3c627c5ba123f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7330edd25dbebb1cfb856bdf1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 15 21:45:51 2007 +0200 ntoskrnl.exe: Implemented IoCreateSymbolicLink. --- dlls/ntoskrnl.exe/ntoskrnl.c | 21 +++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index ae78665..0aa84b4 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -148,6 +148,27 @@ void WINAPI IoDeleteDevice( DEVICE_OBJECT *device ) } +/*********************************************************************** + * IoCreateSymbolicLink (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoCreateSymbolicLink( UNICODE_STRING *name, UNICODE_STRING *target ) +{ + HANDLE handle; + OBJECT_ATTRIBUTES attr; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = name; + attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_OPENIF; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + TRACE( "%s -> %s\n", debugstr_us(name), debugstr_us(target) ); + /* FIXME: store handle somewhere */ + return NtCreateSymbolicLinkObject( &handle, SYMBOLIC_LINK_ALL_ACCESS, &attr, target ); +} + + /***************************************************** * DllMain */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 04591ba..d5eeb9a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -345,7 +345,7 @@ @ stub IoCreateStreamFileObject @ stub IoCreateStreamFileObjectEx @ stub IoCreateStreamFileObjectLite -@ stub IoCreateSymbolicLink +@ stdcall IoCreateSymbolicLink(ptr ptr) @ stub IoCreateSynchronizationEvent @ stub IoCreateUnprotectedSymbolicLink @ stub IoCsqInitialize

1 0

Alexandre Julliard : ntoskrnl.exe: Implemented IoCreateDevice and IoDeleteDevice.
by Alexandre Julliard May 16, 2007

May 16, 2007

Module: wine Branch: master Commit: a2adc8881554887c03ed985a6d08c565e675e657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2adc8881554887c03ed985a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 15 21:41:50 2007 +0200 ntoskrnl.exe: Implemented IoCreateDevice and IoDeleteDevice. --- dlls/ntoskrnl.exe/Makefile.in | 3 + dlls/ntoskrnl.exe/ntoskrnl.c | 163 +++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 +- 3 files changed, 168 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/Makefile.in b/dlls/ntoskrnl.exe/Makefile.in index 448eb1f..2e91316 100644 --- a/dlls/ntoskrnl.exe/Makefile.in +++ b/dlls/ntoskrnl.exe/Makefile.in @@ -6,6 +6,9 @@ MODULE = ntoskrnl.exe IMPORTLIB = libntoskrnl.exe.$(IMPLIBEXT) IMPORTS = kernel32 ntdll +C_SRCS = \ + ntoskrnl.c + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c new file mode 100644 index 0000000..ae78665 --- /dev/null +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -0,0 +1,163 @@ +/* + * ntoskrnl.exe implementation + * + * Copyright (C) 2007 Alexandre Julliard + * + * 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 + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winternl.h" +#include "ddk/wdm.h" +#include "wine/unicode.h" +#include "wine/server.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); + +static inline LPCSTR debugstr_us( const UNICODE_STRING *us ) +{ + if (!us) return "<null>"; + return debugstr_wn( us->Buffer, us->Length / sizeof(WCHAR) ); +} + +static HANDLE get_device_manager(void) +{ + static HANDLE device_manager; + HANDLE handle = 0, ret = device_manager; + + if (!ret) + { + SERVER_START_REQ( create_device_manager ) + { + req->access = SYNCHRONIZE; + req->attributes = 0; + if (!wine_server_call( req )) handle = reply->handle; + } + SERVER_END_REQ; + + if (!handle) + { + ERR( "failed to create the device manager\n" ); + return 0; + } + if (!(ret = InterlockedCompareExchangePointer( &device_manager, handle, 0 ))) + ret = handle; + else + NtClose( handle ); /* somebody beat us to it */ + } + return ret; +} + + +/*********************************************************************** + * IoCreateDevice (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoCreateDevice( DRIVER_OBJECT *driver, ULONG ext_size, + UNICODE_STRING *name, DEVICE_TYPE type, + ULONG characteristics, BOOLEAN exclusive, + DEVICE_OBJECT **ret_device ) +{ + NTSTATUS status; + DEVICE_OBJECT *device; + HANDLE handle = 0; + HANDLE manager = get_device_manager(); + + TRACE( "(%p, %u, %s, %u, %x, %u, %p)\n", + driver, ext_size, debugstr_us(name), type, characteristics, exclusive, ret_device ); + + if (!(device = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*device) + ext_size ))) + return STATUS_NO_MEMORY; + + SERVER_START_REQ( create_device ) + { + req->access = 0; + req->attributes = 0; + req->rootdir = 0; + req->manager = manager; + req->user_ptr = device; + if (name) wine_server_add_data( req, name->Buffer, name->Length ); + if (!(status = wine_server_call( req ))) handle = reply->handle; + } + SERVER_END_REQ; + + if (status == STATUS_SUCCESS) + { + device->DriverObject = driver; + device->DeviceExtension = device + 1; + device->DeviceType = type; + device->Reserved = handle; + + device->NextDevice = driver->DeviceObject; + driver->DeviceObject = device; + + *ret_device = device; + } + else HeapFree( GetProcessHeap(), 0, device ); + + return status; +} + + +/*********************************************************************** + * IoDeleteDevice (NTOSKRNL.EXE.@) + */ +void WINAPI IoDeleteDevice( DEVICE_OBJECT *device ) +{ + NTSTATUS status; + + TRACE( "%p\n", device ); + + SERVER_START_REQ( delete_device ) + { + req->handle = device->Reserved; + status = wine_server_call( req ); + } + SERVER_END_REQ; + + if (status == STATUS_SUCCESS) + { + DEVICE_OBJECT **prev = &device->DriverObject->DeviceObject; + while (*prev && *prev != device) prev = &(*prev)->NextDevice; + if (*prev) *prev = (*prev)->NextDevice; + NtClose( device->Reserved ); + HeapFree( GetProcessHeap(), 0, device ); + } +} + + +/***************************************************** + * DllMain + */ +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + switch(reason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( inst ); + break; + } + return TRUE; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 4e6a38c..04591ba 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -336,7 +336,7 @@ @ stub IoCompleteRequest @ stub IoConnectInterrupt @ stub IoCreateController -@ stub IoCreateDevice +@ stdcall IoCreateDevice(ptr long ptr long long long ptr) @ stub IoCreateDisk @ stub IoCreateDriver @ stub IoCreateFile @@ -353,7 +353,7 @@ @ stub IoCsqRemoveIrp @ stub IoCsqRemoveNextIrp @ stub IoDeleteController -@ stub IoDeleteDevice +@ stdcall IoDeleteDevice(ptr) @ stub IoDeleteDriver @ stub IoDeleteSymbolicLink @ stub IoDetachDevice

1 0