January 2008 - Wine-commits

Rob Shearman : rpcrt4: Add tests for RPC_FC_P_DEREF|RPC_FC_P_ONSTACK pointers.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: 68c8e5fe4187c3c6b79798256b79c9123ef5008f URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c8e5fe4187c3c6b79798256… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jan 16 14:02:58 2008 +0000 rpcrt4: Add tests for RPC_FC_P_DEREF|RPC_FC_P_ONSTACK pointers. --- dlls/rpcrt4/tests/ndr_marshall.c | 154 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 154 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 6c72d23..6987b55 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -477,6 +477,159 @@ static void test_simple_types(void) } +static void test_nontrivial_pointer_types(void) +{ + RPC_MESSAGE RpcMessage; + MIDL_STUB_MESSAGE StubMsg; + MIDL_STUB_DESC StubDesc; + void *ptr; + char **p1; + char *p2; + char ch; + unsigned char *mem, *mem_orig; + + static const unsigned char fmtstr_ref_unique_out[] = + { + 0x12, 0x8, /* FC_UP [simple_pointer] */ + 0x2, /* FC_CHAR */ + 0x5c, /* FC_PAD */ + 0x11, 0x14, /* FC_RP [alloced_on_stack] [pointer_deref] */ + NdrFcShort( 0xfffffffa ), /* Offset= -6 (0) */ + }; + + p1 = &p2; + p2 = &ch; + ch = 0x22; + + StubDesc = Object_StubDesc; + StubDesc.pFormatTypes = fmtstr_ref_unique_out; + + NdrClientInitializeNew( + &RpcMessage, + &StubMsg, + &StubDesc, + 0); + + StubMsg.BufferLength = 0; + NdrPointerBufferSize( &StubMsg, + (unsigned char *)p1, + &fmtstr_ref_unique_out[4] ); + ok(StubMsg.BufferLength == 5, "length %d\n", StubMsg.BufferLength); + + /*NdrGetBuffer(&_StubMsg, _StubMsg.BufferLength, NULL);*/ + StubMsg.RpcMsg->Buffer = StubMsg.BufferStart = StubMsg.Buffer = HeapAlloc(GetProcessHeap(), 0, StubMsg.BufferLength); + StubMsg.BufferEnd = StubMsg.BufferStart + StubMsg.BufferLength; + + ptr = NdrPointerMarshall( &StubMsg, (unsigned char *)p1, &fmtstr_ref_unique_out[4] ); + ok(ptr == NULL, "ret %p\n", ptr); + ok(StubMsg.Buffer - StubMsg.BufferStart == 5, "Buffer %p Start %p len %d\n", + StubMsg.Buffer, StubMsg.BufferStart, StubMsg.Buffer - StubMsg.BufferStart); + ok(*(unsigned int *)StubMsg.BufferStart != 0, "pointer ID marshalled incorrectly\n"); + ok(*(unsigned char *)(StubMsg.BufferStart + 4) == 0x22, "char data marshalled incorrectly: 0x%x\n", + *(unsigned char *)(StubMsg.BufferStart + 4)); + + StubMsg.Buffer = StubMsg.BufferStart; + StubMsg.MemorySize = 0; + mem = NULL; + + /* Client */ + my_alloc_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + mem = mem_orig = HeapAlloc(GetProcessHeap(), 0, sizeof(void *)); + *(void **)mem = NULL; + NdrPointerUnmarshall( &StubMsg, &mem, &fmtstr_ref_unique_out[4], 0); + ok(mem == mem_orig, "mem alloced\n"); + ok(my_alloc_called == 1, "alloc called %d\n", my_alloc_called); + + my_alloc_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + NdrPointerUnmarshall( &StubMsg, &mem, &fmtstr_ref_unique_out[4], 1); + todo_wine { + ok(mem == mem_orig, "mem alloced\n"); + ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); + } + + my_free_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + NdrPointerFree( &StubMsg, mem, &fmtstr_ref_unique_out[4] ); + ok(my_free_called == 1, "free called %d\n", my_free_called); + + mem = my_alloc(sizeof(void *)); + *(void **)mem = NULL; + my_free_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + NdrPointerFree( &StubMsg, mem, &fmtstr_ref_unique_out[4] ); + ok(my_free_called == 0, "free called %d\n", my_free_called); + my_free(mem); + + mem = my_alloc(sizeof(void *)); + *(void **)mem = my_alloc(sizeof(char)); + my_free_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + NdrPointerFree( &StubMsg, mem, &fmtstr_ref_unique_out[4] ); + ok(my_free_called == 1, "free called %d\n", my_free_called); + my_free(mem); + + /* Server */ + my_alloc_called = 0; + StubMsg.IsClient = 0; + mem = NULL; + StubMsg.Buffer = StubMsg.BufferStart; + NdrPointerUnmarshall( &StubMsg, &mem, &fmtstr_ref_unique_out[4], 0); + ok(mem != StubMsg.BufferStart, "mem pointing at buffer\n"); + todo_wine + ok(my_alloc_called == 1, "alloc called %d\n", my_alloc_called); + NdrPointerFree( &StubMsg, mem, &fmtstr_ref_unique_out[4] ); + + my_alloc_called = 0; + mem = NULL; + StubMsg.Buffer = StubMsg.BufferStart; + NdrPointerUnmarshall( &StubMsg, &mem, &fmtstr_ref_unique_out[4], 1); + ok(mem != StubMsg.BufferStart, "mem pointing at buffer\n"); + todo_wine + ok(my_alloc_called == 1, "alloc called %d\n", my_alloc_called); + NdrPointerFree( &StubMsg, mem, &fmtstr_ref_unique_out[4] ); + + my_alloc_called = 0; + mem = mem_orig; + *(void **)mem = NULL; + StubMsg.Buffer = StubMsg.BufferStart; + NdrPointerUnmarshall( &StubMsg, &mem, &fmtstr_ref_unique_out[4], 0); + todo_wine { + ok(mem == mem_orig, "mem alloced\n"); + ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); + } + + my_alloc_called = 0; + mem = mem_orig; + *(void **)mem = NULL; + StubMsg.Buffer = StubMsg.BufferStart; + NdrPointerUnmarshall( &StubMsg, &mem, &fmtstr_ref_unique_out[4], 1); + todo_wine { + ok(mem == mem_orig, "mem alloced\n"); + ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); + } + + mem = my_alloc(sizeof(void *)); + *(void **)mem = NULL; + my_free_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + NdrPointerFree( &StubMsg, mem, &fmtstr_ref_unique_out[4] ); + ok(my_free_called == 0, "free called %d\n", my_free_called); + my_free(mem); + + mem = my_alloc(sizeof(void *)); + *(void **)mem = my_alloc(sizeof(char)); + my_free_called = 0; + StubMsg.Buffer = StubMsg.BufferStart; + NdrPointerFree( &StubMsg, mem, &fmtstr_ref_unique_out[4] ); + ok(my_free_called == 1, "free called %d\n", my_free_called); + my_free(mem); + + HeapFree(GetProcessHeap(), 0, mem_orig); + HeapFree(GetProcessHeap(), 0, StubMsg.RpcMsg->Buffer); +} + static void test_simple_struct_marshal(const unsigned char *formattypes, void *memsrc, long srcsize, @@ -1655,6 +1808,7 @@ START_TEST( ndr_marshall ) { test_ndr_simple_type(); test_simple_types(); + test_nontrivial_pointer_types(); test_simple_struct(); test_fullpointer_xlat(); test_client_init();

1 0

Rob Shearman : comctl32: Keep on displaying the last frame of the animation after the animation has stopped .
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: 92dde895069722f1dcfd8d6f51cf712071142085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92dde895069722f1dcfd8d6f5… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jan 16 14:03:09 2008 +0000 comctl32: Keep on displaying the last frame of the animation after the animation has stopped. --- dlls/comctl32/animate.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index 5e3ffb1..d4283a1 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -903,11 +903,10 @@ static LRESULT WINAPI ANIMATE_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LP case WM_PRINTCLIENT: case WM_PAINT: { - /* the animation isn't playing, or has not decompressed + /* the animation has not decompressed * (and displayed) the first frame yet, don't paint */ - if ((!infoPtr->uTimer && !infoPtr->hThread) || - !infoPtr->hbmPrevFrame) + if (!infoPtr->hbmPrevFrame) { /* default paint handling */ return DefWindowProcW(hWnd, uMsg, wParam, lParam);

1 0

Rob Shearman : comctl32: Support seeking to a particular frame.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: 1030d412791bfa6471538e3d6144050eddae92c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1030d412791bfa6471538e3d6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jan 16 14:03:26 2008 +0000 comctl32: Support seeking to a particular frame. In this case just draw the frame without starting the timer thread of setting a timer and without sending any notifications. --- dlls/comctl32/animate.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index d4283a1..931f279 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -145,6 +145,8 @@ static BOOL ANIMATE_LoadFileW(ANIMATE_INFO *infoPtr, LPWSTR lpName) static BOOL ANIMATE_DoStop(ANIMATE_INFO *infoPtr) { + BOOL stopped = FALSE; + EnterCriticalSection(&infoPtr->cs); /* should stop playing */ @@ -167,15 +169,18 @@ static BOOL ANIMATE_DoStop(ANIMATE_INFO *infoPtr) CloseHandle( handle ); CloseHandle( infoPtr->hStopEvent ); infoPtr->hStopEvent = 0; + stopped = TRUE; } if (infoPtr->uTimer) { KillTimer(infoPtr->hwndSelf, infoPtr->uTimer); infoPtr->uTimer = 0; + stopped = TRUE; } LeaveCriticalSection(&infoPtr->cs); - ANIMATE_Notify(infoPtr, ACN_STOP); + if (stopped) + ANIMATE_Notify(infoPtr, ACN_STOP); return TRUE; } @@ -429,12 +434,20 @@ static LRESULT ANIMATE_Play(ANIMATE_INFO *infoPtr, UINT cRepeat, WORD wFrom, WOR TRACE("(repeat=%d from=%d to=%d);\n", infoPtr->nLoop, infoPtr->nFromFrame, infoPtr->nToFrame); - if (infoPtr->nFromFrame >= infoPtr->nToFrame || + if (infoPtr->nFromFrame > infoPtr->nToFrame || infoPtr->nToFrame >= infoPtr->mah.dwTotalFrames) return FALSE; infoPtr->currFrame = infoPtr->nFromFrame; + /* seek - doesn't need to start a thread or set a timer and neither + * does it send a notification */ + if (infoPtr->nFromFrame == infoPtr->nToFrame) + { + ANIMATE_DrawFrame(infoPtr); + return TRUE; + } + if (infoPtr->dwStyle & ACS_TIMER) { TRACE("Using a timer\n");

1 0

Alexandre Julliard : winebuild: Reserve the space for the PE header in the .init section.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: 538071ce7e8052ea317950bb13615f09af315911 URL: http://source.winehq.org/git/wine.git/?a=commit;h=538071ce7e8052ea317950bb1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 16 17:51:59 2008 +0100 winebuild: Reserve the space for the PE header in the .init section. --- tools/winebuild/spec32.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 8df5b85..912e194 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -358,13 +358,14 @@ void BuildSpec32File( DLLSPEC *spec ) /* Reserve some space for the PE header */ - output( "\t.text\n" ); - output( "\t.align %d\n", get_alignment(page_size) ); + output( "\n\t.section \".init\",\"ax\"\n" ); + output( "\tjmp 1f\n" ); output( "__wine_spec_pe_header:\n" ); if (target_platform == PLATFORM_APPLE) - output( "\t.space 65536\n" ); + output( "\t.space %u\n", 65536 + page_size ); else - output( "\t.skip 65536\n" ); + output( "\t.skip %u\n", 65536 + page_size ); + output( "1:\n" ); /* Output the NT header */

1 0

Christopher Berner : user32: Fixed off by one scroll bar pixels.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: e59bf8c560605e648b4fdf7ec53ca6f09ad3f145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e59bf8c560605e648b4fdf7ec… Author: Christopher Berner <raccoonone(a)procyongames.com> Date: Mon Jan 14 21:28:59 2008 -0800 user32: Fixed off by one scroll bar pixels. --- dlls/user32/scroll.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 78564b0..bd2feb9 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -210,10 +210,7 @@ static BOOL SCROLL_GetScrollBarRect( HWND hwnd, INT nBar, RECT *lprect, lprect->top = wndPtr->rectClient.bottom - wndPtr->rectWindow.top; lprect->right = wndPtr->rectClient.right - wndPtr->rectWindow.left; lprect->bottom = lprect->top + GetSystemMetrics(SM_CYHSCROLL); - if(wndPtr->dwStyle & WS_BORDER) { - lprect->left--; - lprect->right++; - } else if(wndPtr->dwStyle & WS_VSCROLL) + if(wndPtr->dwStyle & WS_VSCROLL) lprect->right++; vertical = FALSE; break; @@ -226,10 +223,7 @@ static BOOL SCROLL_GetScrollBarRect( HWND hwnd, INT nBar, RECT *lprect, lprect->top = wndPtr->rectClient.top - wndPtr->rectWindow.top; lprect->right = lprect->left + GetSystemMetrics(SM_CXVSCROLL); lprect->bottom = wndPtr->rectClient.bottom - wndPtr->rectWindow.top; - if(wndPtr->dwStyle & WS_BORDER) { - lprect->top--; - lprect->bottom++; - } else if(wndPtr->dwStyle & WS_HSCROLL) + if(wndPtr->dwStyle & WS_HSCROLL) lprect->bottom++; vertical = TRUE; break;

1 0

Marcus Meissner : wined3d: Check for overflows.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: 293ec5843dfd5b468ed06776c27a7f2aef6df7e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=293ec5843dfd5b468ed06776c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jan 15 08:06:37 2008 +0100 wined3d: Check for overflows. --- dlls/wined3d/device.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a17dc9e..ff0bcf6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3178,6 +3178,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetSamplerState(IWineD3DDevice *iface, Sampler -= (WINED3DVERTEXTEXTURESAMPLER0 - MAX_FRAGMENT_SAMPLERS); } + if (Sampler >= sizeof(This->stateBlock->samplerState)/sizeof(This->stateBlock->samplerState[0])) { + ERR("Current Sampler overflows sampleState0 array (sampler %d vs size %d)\n", Sampler, + sizeof(This->stateBlock->samplerState)/sizeof(This->stateBlock->samplerState[0]) + ); + return WINED3D_OK; /* Windows accepts overflowing this array ... we do not. */ + } /** * SetSampler is designed to allow for more than the standard up to 8 textures * and Geforce has stopped supporting more than 6 standard textures in openGL. @@ -3223,6 +3229,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetSamplerState(IWineD3DDevice *iface, Sampler -= (WINED3DVERTEXTEXTURESAMPLER0 - MAX_FRAGMENT_SAMPLERS); } + if (Sampler >= sizeof(This->stateBlock->samplerState)/sizeof(This->stateBlock->samplerState[0])) { + ERR("Current Sampler overflows sampleState0 array (sampler %d vs size %d)\n", Sampler, + sizeof(This->stateBlock->samplerState)/sizeof(This->stateBlock->samplerState[0]) + ); + return WINED3D_OK; /* Windows accepts overflowing this array ... we do not. */ + } *Value = This->stateBlock->samplerState[Sampler][Type]; TRACE("(%p) : Returning %#x\n", This, *Value); @@ -4398,6 +4410,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTexture(IWineD3DDevice *iface, DWORD Stage -= (WINED3DVERTEXTEXTURESAMPLER0 - MAX_FRAGMENT_SAMPLERS); } + if (Stage >= sizeof(This->stateBlock->textures)/sizeof(This->stateBlock->textures[0])) { + ERR("Current stage overflows textures array (stage %d vs size %d)\n", Stage, + sizeof(This->stateBlock->textures)/sizeof(This->stateBlock->textures[0]) + ); + return WINED3D_OK; /* Windows accepts overflowing this array ... we do not. */ + } + oldTexture = This->updateStateBlock->textures[Stage]; if(pTexture != NULL) { @@ -4490,6 +4509,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetTexture(IWineD3DDevice *iface, DWORD Stage -= (WINED3DVERTEXTEXTURESAMPLER0 - MAX_FRAGMENT_SAMPLERS); } + if (Stage >= sizeof(This->stateBlock->textures)/sizeof(This->stateBlock->textures[0])) { + ERR("Current stage overflows textures array (stage %d vs size %d)\n", Stage, + sizeof(This->stateBlock->textures)/sizeof(This->stateBlock->textures[0]) + ); + return WINED3D_OK; /* Windows accepts overflowing this array ... we do not. */ + } + *ppTexture=This->stateBlock->textures[Stage]; if (*ppTexture) IWineD3DBaseTexture_AddRef(*ppTexture);

1 0

Alexandre Julliard : ntdll: Fall back to a server device ioctl for files with no associated fd.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: 5b71d645f05d9728ab28c8f3be5709a5fd5365f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b71d645f05d9728ab28c8f3b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 16 14:57:20 2008 +0100 ntdll: Fall back to a server device ioctl for files with no associated fd. --- dlls/ntdll/cdrom.c | 15 ++++++++------- dlls/ntdll/file.c | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 56a138e..9da442c 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -2141,7 +2141,12 @@ NTSTATUS CDROM_DeviceIoControl(HANDLE hDevice, piosb->Information = 0; - if ((status = server_get_unix_fd( hDevice, 0, &fd, &needs_close, NULL, NULL ))) goto error; + if ((status = server_get_unix_fd( hDevice, 0, &fd, &needs_close, NULL, NULL ))) + { + if (status == STATUS_BAD_DEVICE_TYPE) return status; /* no associated fd */ + goto error; + } + if ((status = CDROM_Open(fd, &dev))) { if (needs_close) close( fd ); @@ -2415,12 +2420,8 @@ NTSTATUS CDROM_DeviceIoControl(HANDLE hDevice, break; default: - FIXME("Unsupported IOCTL %x (type=%x access=%x func=%x meth=%x)\n", - dwIoControlCode, dwIoControlCode >> 16, (dwIoControlCode >> 14) & 3, - (dwIoControlCode >> 2) & 0xFFF, dwIoControlCode & 3); - sz = 0; - status = STATUS_INVALID_PARAMETER; - break; + if (needs_close) close( fd ); + return STATUS_NOT_SUPPORTED; } if (needs_close) close( fd ); error: diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index d4e80ab..5a99616 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1104,7 +1104,7 @@ NTSTATUS WINAPI NtDeviceIoControlFile(HANDLE handle, HANDLE event, break; } - if (status == STATUS_NOT_SUPPORTED) + if (status == STATUS_NOT_SUPPORTED || status == STATUS_BAD_DEVICE_TYPE) status = server_ioctl_file( handle, event, apc, apc_context, io, code, in_buffer, in_size, out_buffer, out_size );

1 0

Alexandre Julliard : mountmgr.sys: Fix values returned for IOCTL_STORAGE_GET_DEVICE_NUMBER on emulated disks.
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: 4003457ff3b328295b40ce43d8c68f0e0250b889 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4003457ff3b328295b40ce43d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 16 15:23:10 2008 +0100 mountmgr.sys: Fix values returned for IOCTL_STORAGE_GET_DEVICE_NUMBER on emulated disks. --- dlls/mountmgr.sys/mountmgr.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 98bed94..ee819a5 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -142,17 +142,17 @@ static NTSTATUS create_disk_device( DRIVER_OBJECT *driver, DWORD type, DEVICE_OB case DRIVE_REMOVABLE: info->devnum.DeviceType = FILE_DEVICE_DISK; info->devnum.DeviceNumber = i; - info->devnum.PartitionNumber = 0; + info->devnum.PartitionNumber = ~0u; break; case DRIVE_CDROM: info->devnum.DeviceType = FILE_DEVICE_CD_ROM; info->devnum.DeviceNumber = i; - info->devnum.PartitionNumber = 0; + info->devnum.PartitionNumber = ~0u; break; case DRIVE_FIXED: default: /* FIXME */ info->devnum.DeviceType = FILE_DEVICE_DISK; - info->devnum.DeviceNumber = 1; + info->devnum.DeviceNumber = 0; info->devnum.PartitionNumber = i; break; } @@ -441,6 +441,7 @@ static NTSTATUS WINAPI harddisk_driver_entry( DRIVER_OBJECT *driver, UNICODE_STR UNICODE_STRING nameW, linkW; DEVICE_OBJECT *device; NTSTATUS status; + struct disk_device_info *info; driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = harddisk_ioctl; @@ -449,13 +450,18 @@ static NTSTATUS WINAPI harddisk_driver_entry( DRIVER_OBJECT *driver, UNICODE_STR RtlInitUnicodeString( &nameW, harddisk0W ); RtlInitUnicodeString( &linkW, physdrive0W ); - if (!(status = IoCreateDevice( driver, 0, &nameW, 0, 0, FALSE, &device ))) + if (!(status = IoCreateDevice( driver, sizeof(*info), &nameW, 0, 0, FALSE, &device ))) status = IoCreateSymbolicLink( &linkW, &nameW ); if (status) { FIXME( "failed to create device error %x\n", status ); return status; } + info = device->DeviceExtension; + info->name = nameW; + info->devnum.DeviceType = FILE_DEVICE_DISK; + info->devnum.DeviceNumber = 0; + info->devnum.PartitionNumber = 0; create_drive_mount_points( driver );

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 16 Jan '08

16 Jan '08

1 0

Francois Gouget : include: Document some Microsoft spelling mistakes so we know they are not to be fixed .
by Alexandre Julliard 16 Jan '08

16 Jan '08

Module: wine Branch: master Commit: 15652ba960f0f050b6dfce51db312a79e32e1469 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15652ba960f0f050b6dfce51d… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 16 12:19:08 2008 +0100 include: Document some Microsoft spelling mistakes so we know they are not to be fixed. --- include/setupapi.h | 1 + include/windns.h | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/setupapi.h b/include/setupapi.h index 8e14f91..fd20126 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1384,6 +1384,7 @@ PVOID WINAPI MyMalloc(DWORD dwSize); PVOID WINAPI MyRealloc(PVOID lpSrc, DWORD dwSize); DWORD WINAPI OpenAndMapForRead(PCWSTR, PDWORD, PHANDLE, PHANDLE, PVOID *); LONG WINAPI QueryRegistryValue(HKEY, PCWSTR, PBYTE *, PDWORD, PDWORD); +/* RetreiveFileSecurity is not a typo, as per Microsoft's dlls */ DWORD WINAPI RetreiveFileSecurity(PCWSTR, PSECURITY_DESCRIPTOR *); BOOL WINAPI SetupAddSectionToDiskSpaceListA(HDSKSPC, HINF, HINF, PCSTR, UINT, PVOID, UINT); BOOL WINAPI SetupAddSectionToDiskSpaceListW(HDSKSPC, HINF, HINF, PCWSTR, UINT, PVOID, UINT); diff --git a/include/windns.h b/include/windns.h index c55d013..205f30d 100644 --- a/include/windns.h +++ b/include/windns.h @@ -152,7 +152,7 @@ typedef enum _DnsSection DnsSectionQuestion, DnsSectionAnswer, DnsSectionAuthority, - DnsSectionAddtional + DnsSectionAddtional /* Not a typo, as per Microsoft's headers */ } DNS_SECTION; typedef LONG DNS_STATUS, *PDNS_STATUS;

1 0