December 2005 - Wine-Commits

H. Verbeet : wined3d: Don't change the shader's refcount in SetVertexShader and
by Alexandre Julliard Dec. 13, 2005

Dec. 13, 2005

Module: wine Branch: refs/heads/master Commit: 6077c63feb2e0d70a077fbda3c1978c95f4c113f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6077c63feb2e0d70a077fbd… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Dec 13 11:11:01 2005 +0100 wined3d: Don't change the shader's refcount in SetVertexShader and SetPixelShader. --- dlls/wined3d/device.c | 37 +++---------------------------------- 1 files changed, 3 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c3a7f9c..a9c253f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3761,7 +3761,6 @@ HRESULT WINAPI IWineD3DDeviceImpl_GetVer HRESULT WINAPI IWineD3DDeviceImpl_SetVertexShader(IWineD3DDevice *iface, IWineD3DVertexShader* pShader) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DVertexShader *oldShader = This->updateStateBlock->vertexShader; This->updateStateBlock->vertexShader = pShader; This->updateStateBlock->changed.vertexShader = TRUE; @@ -3772,20 +3771,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetVer return D3D_OK; } - if (pShader != NULL) { - IUnknown *newVertexShaderParent; - /* GetParent will add a ref, so leave it hanging until the vertex buffer is cleared */ - TRACE("(%p) : setting pShader(%p)\n", This, pShader); - IWineD3DVertexShader_GetParent(pShader, &newVertexShaderParent); - } else { - TRACE("Clear down the shader\n"); - } - if (oldShader != NULL) { - IUnknown *oldVertexShaderParent; - IWineD3DVertexShader_GetParent(oldShader, &oldVertexShaderParent); - IUnknown_Release(oldVertexShaderParent); - IUnknown_Release(oldVertexShaderParent); - } + TRACE("(%p) : setting pShader(%p)\n", This, pShader); /** * TODO: merge HAL shaders context switching from prototype */ @@ -3947,39 +3933,22 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetVer #undef GET_SHADER_CONSTANT HRESULT WINAPI IWineD3DDeviceImpl_SetPixelShader(IWineD3DDevice *iface, IWineD3DPixelShader *pShader) { - IUnknown *parent; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DPixelShader *oldpShader = This->updateStateBlock->pixelShader; This->updateStateBlock->pixelShader = pShader; This->updateStateBlock->changed.pixelShader = TRUE; This->updateStateBlock->set.pixelShader = TRUE; - if (pShader == NULL) { - /* clear down the shader */ - TRACE("Clear down the shader\n"); - } - /* Handle recording of state blocks */ if (This->isRecordingState) { TRACE("Recording... not performing anything\n"); return D3D_OK; } + + TRACE("(%p) : setting pShader(%p)\n", This, pShader); /** * TODO: merge HAL shaders context switching from prototype */ - - /* manage reference counting. */ - if (pShader != NULL) { - IWineD3DPixelShader_GetParent(pShader, &parent); /* get parent adds a ref for us*/ - } - - if (oldpShader != NULL) { - IWineD3DPixelShader_GetParent(oldpShader, &parent); - IUnknown_Release(parent); /* once for the getparent */ - IUnknown_Release(parent); /* and once for the ref */ - } - return D3D_OK; }

1 0

Oliver Stieber : wined3d: Cube texture named constants.
by Alexandre Julliard Dec. 13, 2005

Dec. 13, 2005

Module: wine Branch: refs/heads/master Commit: ea942e1e75260cbd92c37c8bccc529546312d02b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ea942e1e75260cbd92c37c8… Author: Oliver Stieber <oliver_stieber(a)yahoo.co.uk> Date: Tue Dec 13 11:10:20 2005 +0100 wined3d: Cube texture named constants. Update cubetexture so that names constants instead of numeric constants are used for the facetype and also add some additional checks where facetype is passed as a parameter to the function. --- dlls/wined3d/cubetexture.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index ce0bfce..4cc8d0a 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -140,7 +140,7 @@ void WINAPI IWineD3DCubeTextureImpl_PreL /* If were dirty then reload the surfaces */ if (This->baseTexture.dirty != FALSE) { for (i = 0; i < This->baseTexture.levels; i++) { - for (j = 0; j < 6; j++) { + for (j = D3DCUBEMAP_FACE_POSITIVE_X; j <= D3DCUBEMAP_FACE_NEGATIVE_Z ; j++) { if(setGlTextureDesc) IWineD3DSurface_SetGlTextureDesc(This->surfaces[j][i], This->baseTexture.textureName, cube_targets[j]); IWineD3DSurface_LoadTexture(This->surfaces[j][i]); @@ -273,7 +273,7 @@ HRESULT WINAPI IWineD3DCubeTextureImpl_G IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; HRESULT hr = D3DERR_INVALIDCALL; - if (Level < This->baseTexture.levels) { + if (Level < This->baseTexture.levels && FaceType >= D3DCUBEMAP_FACE_POSITIVE_X && FaceType <= D3DCUBEMAP_FACE_NEGATIVE_Z) { *ppCubeMapSurface = This->surfaces[FaceType][Level]; IWineD3DSurface_AddRef(*ppCubeMapSurface); @@ -282,7 +282,7 @@ HRESULT WINAPI IWineD3DCubeTextureImpl_G if (D3D_OK == hr) { TRACE("(%p) -> faceType(%d) level(%d) returning surface@%p\n", This, FaceType, Level, This->surfaces[FaceType][Level]); } else { - WARN("(%p) level(%d) overflow Levels(%d)\n", This, Level, This->baseTexture.levels); + WARN("(%p) level(%d) overflow Levels(%d) Or FaceType(%d)\n", This, Level, This->baseTexture.levels, FaceType); } return hr; @@ -292,14 +292,14 @@ HRESULT WINAPI IWineD3DCubeTextureImpl_L HRESULT hr = D3DERR_INVALIDCALL; IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; - if (Level < This->baseTexture.levels) { + if (Level < This->baseTexture.levels && FaceType >= D3DCUBEMAP_FACE_POSITIVE_X && FaceType <= D3DCUBEMAP_FACE_NEGATIVE_Z) { hr = IWineD3DSurface_LockRect(This->surfaces[FaceType][Level], pLockedRect, pRect, Flags); } if (D3D_OK == hr) { TRACE("(%p) -> faceType(%d) level(%d) returning memory@%p success(%lu)\n", This, FaceType, Level, pLockedRect->pBits, hr); } else { - WARN("(%p) level(%d) overflow Levels(%d)\n", This, Level, This->baseTexture.levels); + WARN("(%p) level(%d) overflow Levels(%d) Or FaceType(%d)\n", This, Level, This->baseTexture.levels, FaceType); } return hr; @@ -309,23 +309,29 @@ HRESULT WINAPI IWineD3DCubeTextureImpl_U HRESULT hr = D3DERR_INVALIDCALL; IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; - if (Level < This->baseTexture.levels) { + if (Level < This->baseTexture.levels && FaceType >= D3DCUBEMAP_FACE_POSITIVE_X && FaceType <= D3DCUBEMAP_FACE_NEGATIVE_Z) { hr = IWineD3DSurface_UnlockRect(This->surfaces[FaceType][Level]); } if (D3D_OK == hr) { TRACE("(%p) -> faceType(%d) level(%d) success(%lu)\n", This, FaceType, Level, hr); } else { - WARN("(%p) level(%d) overflow Levels(%d)\n", This, Level, This->baseTexture.levels); + WARN("(%p) level(%d) overflow Levels(%d) Or FaceType(%d)\n", This, Level, This->baseTexture.levels, FaceType); } return hr; } HRESULT WINAPI IWineD3DCubeTextureImpl_AddDirtyRect(IWineD3DCubeTexture *iface, D3DCUBEMAP_FACES FaceType, CONST RECT* pDirtyRect) { + HRESULT hr = D3DERR_INVALIDCALL; IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; This->baseTexture.dirty = TRUE; TRACE("(%p) : dirtyfication of faceType(%d) Level (0)\n", This, FaceType); - return IWineD3DSurface_AddDirtyRect(This->surfaces[FaceType][0], pDirtyRect); + if (FaceType >= D3DCUBEMAP_FACE_POSITIVE_X && FaceType <= D3DCUBEMAP_FACE_NEGATIVE_Z) { + hr = IWineD3DSurface_AddDirtyRect(This->surfaces[FaceType][0], pDirtyRect); + } else { + WARN("(%p) overflow FaceType(%d)\n", This, FaceType); + } + return hr; }

1 0

Paul Vriens : shell32/tests/shlfolder.c: ILFindLastID has to be called by ordinal.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: ac7fd9d6e557c596f083f1f690b8154093dcb289 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac7fd9d6e557c596f083f1f… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Mon Dec 12 18:13:14 2005 +0100 shell32/tests/shlfolder.c: ILFindLastID has to be called by ordinal. --- dlls/shell32/tests/shlfolder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 66df199..2a09ea6 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -369,7 +369,7 @@ static void test_GetDisplayName(void) } /* WinXP stores the filenames as both ANSI and UNICODE in the pidls */ - pidlLast = ILFindLastID(pidlTestFile); + pidlLast = pILFindLastID(pidlTestFile); todo_wine { ok( pidlLast->mkid.cb >= 76, "Expected pidl length of at least 76, got %d.\n", pidlLast->mkid.cb);

1 0

Alexandre Julliard : TEB.StackLimit should not include the guard page.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: f3dad37ba2671a7d86c5770e498252e3363e809c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f3dad37ba2671a7d86c5770… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 17:28:32 2005 +0100 TEB.StackLimit should not include the guard page. --- dlls/kernel/process.c | 5 +++-- dlls/ntdll/signal_i386.c | 4 ++-- dlls/ntdll/thread.c | 8 +++++--- dlls/ntdll/virtual.c | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index af9e23f..42c4033 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -978,7 +978,8 @@ static void *init_stack(void) IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); stack_size = max( nt->OptionalHeader.SizeOfStackReserve, nt->OptionalHeader.SizeOfStackCommit ); - stack_size = (stack_size + (page_size - 1)) & ~(page_size - 1); + stack_size += page_size; /* for the guard page */ + stack_size = (stack_size + 0xffff) & ~0xffff; /* round to 64K boundary */ if (stack_size < 1024 * 1024) stack_size = 1024 * 1024; /* Xlib needs a large stack */ if (!(base = VirtualAlloc( NULL, stack_size, MEM_COMMIT, PAGE_READWRITE ))) @@ -990,7 +991,7 @@ static void *init_stack(void) /* note: limit is lower than base since the stack grows down */ NtCurrentTeb()->DeallocationStack = base; NtCurrentTeb()->Tib.StackBase = (char *)base + stack_size; - NtCurrentTeb()->Tib.StackLimit = base; + NtCurrentTeb()->Tib.StackLimit = (char *)base + page_size; /* setup guard page */ VirtualProtect( base, 1, PAGE_READWRITE | PAGE_GUARD, NULL ); diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 3cc54af..2a7fdf5 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -830,10 +830,10 @@ static EXCEPTION_RECORD *setup_exception } if (stack - 1 > stack || /* check for overflow in subtraction */ - (char *)(stack - 1) < (char *)NtCurrentTeb()->Tib.StackLimit + 4096 || + (char *)(stack - 1) < (char *)NtCurrentTeb()->Tib.StackLimit || (char *)stack > (char *)NtCurrentTeb()->Tib.StackBase) { - UINT diff = (char *)NtCurrentTeb()->Tib.StackLimit + 4096 - (char *)stack; + UINT diff = (char *)NtCurrentTeb()->Tib.StackLimit - (char *)stack; if (diff < 4096) { ERR( "stack overflow %u bytes in thread %04lx eip %08lx esp %08lx stack %p-%p\n", diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 8367751..07cd08d 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -201,7 +201,7 @@ static void start_thread( struct wine_pt PRTL_THREAD_START_ROUTINE func = startup_info->entry_point; void *arg = startup_info->entry_arg; struct debug_info debug_info; - SIZE_T size; + SIZE_T size, page_size = getpagesize(); debug_info.str_pos = debug_info.strings; debug_info.out_pos = debug_info.output; @@ -219,10 +219,10 @@ static void start_thread( struct wine_pt &size, MEM_SYSTEM, PAGE_READWRITE ); /* limit is lower than base since the stack grows down */ teb->Tib.StackBase = (char *)info->stack_base + info->stack_size; - teb->Tib.StackLimit = info->stack_base; + teb->Tib.StackLimit = (char *)info->stack_base + page_size; /* setup the guard page */ - size = 1; + size = page_size; NtProtectVirtualMemory( NtCurrentProcess(), &teb->DeallocationStack, &size, PAGE_READWRITE | PAGE_GUARD, NULL ); RtlFreeHeap( GetProcessHeap(), 0, info ); @@ -252,6 +252,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HAN DWORD tid = 0; int request_pipe[2]; NTSTATUS status; + SIZE_T page_size = getpagesize(); if( ! is_current_process( process ) ) { @@ -307,6 +308,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HAN if (!stack_commit) stack_commit = nt->OptionalHeader.SizeOfStackCommit; } if (stack_reserve < stack_commit) stack_reserve = stack_commit; + stack_reserve += page_size; /* for the guard page */ stack_reserve = (stack_reserve + 0xffff) & ~0xffff; /* round to 64K boundary */ if (stack_reserve < 1024 * 1024) stack_reserve = 1024 * 1024; /* Xlib needs a large stack */ diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index f3984f0..7d2d445 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1196,7 +1196,7 @@ NTSTATUS VIRTUAL_HandleFault( LPCVOID ad ret = STATUS_GUARD_PAGE_VIOLATION; } /* is it inside the stack guard page? */ - if (((const char *)addr >= stack) && ((const char *)addr < stack + (page_mask+1))) + if (((const char *)addr >= stack - (page_mask + 1)) && ((const char *)addr < stack)) ret = STATUS_STACK_OVERFLOW; } RtlLeaveCriticalSection( &csVirtual );

1 0

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

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 95888acbe4d713694746bd6520fb1aeffb18f72d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=95888acbe4d713694746bd6… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Mon Dec 12 18:13:02 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 c19268d..5b0d86f 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -459,7 +459,7 @@ static void test_GetStandardColorSpacePr ret = pGetStandardColorSpaceProfileA( machine, 0, newprofile, &size ); GLE = GetLastError(); todo_wine - ok( !ret && GLE == ERROR_INVALID_PARAMETER, + ok( !ret && (GLE == ERROR_INVALID_PARAMETER || GLE == ERROR_NOT_SUPPORTED), "GetStandardColorSpaceProfileA() returns %d (GLE=%ld)\n", ret, GLE ); size = 0;

1 0

Alexandre Julliard : kernel: Moved main stack initialization to process.c.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 8a8a94aecbfcd908e5909113ea2139ce17c41b56 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8a8a94aecbfcd908e590911… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 17:20:29 2005 +0100 kernel: Moved main stack initialization to process.c. --- dlls/kernel/kernel_private.h | 3 --- dlls/kernel/process.c | 40 +++++++++++++++++++++++++++++++++------- dlls/kernel/thread.c | 28 ---------------------------- 3 files changed, 33 insertions(+), 38 deletions(-) diff --git a/dlls/kernel/kernel_private.h b/dlls/kernel/kernel_private.h index 98195d4..7139ffb 100644 --- a/dlls/kernel/kernel_private.h +++ b/dlls/kernel/kernel_private.h @@ -115,9 +115,6 @@ extern LPVOID DOSMEM_MapDosToLinear(UINT extern UINT DOSMEM_MapLinearToDos(LPVOID); /* linear Wine to DOS */ extern void load_winedos(void); -/* thread.c */ -extern TEB *THREAD_InitStack( TEB *teb, DWORD stack_size ); - /* environ.c */ extern void ENV_CopyStartupInformation(void); diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index d95d08c..af9e23f 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -967,6 +967,38 @@ static BOOL process_init(void) /*********************************************************************** + * init_stack + * + * Allocate the stack of new process. + */ +static void *init_stack(void) +{ + void *base; + SIZE_T stack_size, page_size = getpagesize(); + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); + + stack_size = max( nt->OptionalHeader.SizeOfStackReserve, nt->OptionalHeader.SizeOfStackCommit ); + stack_size = (stack_size + (page_size - 1)) & ~(page_size - 1); + if (stack_size < 1024 * 1024) stack_size = 1024 * 1024; /* Xlib needs a large stack */ + + if (!(base = VirtualAlloc( NULL, stack_size, MEM_COMMIT, PAGE_READWRITE ))) + { + ERR( "failed to allocate main process stack\n" ); + ExitProcess( 1 ); + } + + /* note: limit is lower than base since the stack grows down */ + NtCurrentTeb()->DeallocationStack = base; + NtCurrentTeb()->Tib.StackBase = (char *)base + stack_size; + NtCurrentTeb()->Tib.StackLimit = base; + + /* setup guard page */ + VirtualProtect( base, 1, PAGE_READWRITE | PAGE_GUARD, NULL ); + return NtCurrentTeb()->Tib.StackBase; +} + + +/*********************************************************************** * start_process * * Startup routine of a new process. Runs on the new process stack. @@ -1010,7 +1042,6 @@ void __wine_kernel_init(void) { WCHAR *main_exe_name, *p; char error[1024]; - DWORD stack_size = 0; int file_exists; PEB *peb = NtCurrentTeb()->Peb; @@ -1130,13 +1161,8 @@ void __wine_kernel_init(void) set_library_wargv( __wine_main_argv ); if (!build_command_line( __wine_main_wargv )) goto error; - stack_size = RtlImageNtHeader(peb->ImageBaseAddress)->OptionalHeader.SizeOfStackReserve; - - /* allocate main thread stack */ - if (!THREAD_InitStack( NtCurrentTeb(), stack_size )) goto error; - /* switch to the new stack */ - wine_switch_to_stack( start_process, NULL, NtCurrentTeb()->Tib.StackBase ); + wine_switch_to_stack( start_process, NULL, init_stack() ); error: ExitProcess( GetLastError() ); diff --git a/dlls/kernel/thread.c b/dlls/kernel/thread.c index fd65b99..c927037 100644 --- a/dlls/kernel/thread.c +++ b/dlls/kernel/thread.c @@ -49,34 +49,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(thread); WINE_DECLARE_DEBUG_CHANNEL(relay); -/*********************************************************************** - * THREAD_InitStack - * - * Allocate the stack of a thread. - */ -TEB *THREAD_InitStack( TEB *teb, DWORD stack_size ) -{ - DWORD old_prot; - DWORD page_size = getpagesize(); - void *base; - - stack_size = (stack_size + (page_size - 1)) & ~(page_size - 1); - if (stack_size < 1024 * 1024) stack_size = 1024 * 1024; /* Xlib needs a large stack */ - - if (!(base = VirtualAlloc( NULL, stack_size, MEM_COMMIT, PAGE_READWRITE ))) - return NULL; - - teb->DeallocationStack = base; - teb->Tib.StackBase = (char *)base + stack_size; - teb->Tib.StackLimit = base; /* note: limit is lower than base since the stack grows down */ - - /* Setup guard pages */ - - VirtualProtect( base, 1, PAGE_READWRITE | PAGE_GUARD, &old_prot ); - return teb; -} - - struct new_thread_info { LPTHREAD_START_ROUTINE func;

1 0

Alexandre Julliard : server: Don't enable polling on regular files in add_queue.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 770c4a1551a3198f7cf2282dbe749d95e4902804 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=770c4a1551a3198f7cf2282… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 17:20:03 2005 +0100 server: Don't enable polling on regular files in add_queue. --- server/fd.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/fd.c b/server/fd.c index 5c4efd4..90fb7af 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1479,7 +1479,7 @@ int default_fd_add_queue( struct object struct fd *fd = get_obj_fd( obj ); if (!fd) return 0; - if (list_empty( &obj->wait_queue )) /* first on the queue */ + if (!fd->inode && list_empty( &obj->wait_queue )) /* first on the queue */ set_fd_events( fd, fd->fd_ops->get_poll_events( fd ) ); add_queue( obj, entry ); release_object( fd ); @@ -1493,7 +1493,7 @@ void default_fd_remove_queue( struct obj grab_object( obj ); remove_queue( obj, entry ); - if (list_empty( &obj->wait_queue )) /* last on the queue is gone */ + if (!fd->inode && list_empty( &obj->wait_queue )) /* last on the queue is gone */ set_fd_events( fd, 0 ); release_object( obj ); release_object( fd );

1 0

Alexandre Julliard : Pass specific access rights to wine_server_handle_to_fd.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 59797f292ec23054a90326f4319fb308776c807f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=59797f292ec23054a90326f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 17:15:26 2005 +0100 Pass specific access rights to wine_server_handle_to_fd. --- dlls/kernel/comm.c | 24 ++++++++++++------------ dlls/kernel/sync.c | 2 +- dlls/ntdll/directory.c | 2 +- dlls/ntdll/file.c | 4 ++-- dlls/ntdll/server.c | 5 ----- dlls/ntdll/virtual.c | 4 ++-- dlls/winedos/int13.c | 2 +- dlls/winsock/socket.c | 14 +++++++------- 8 files changed, 26 insertions(+), 31 deletions(-)

1 0

Alexandre Julliard : server: Added access rights mapping to file objects.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: a510a7e117bdd98c89673c2eca12852fc7824489 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a510a7e117bdd98c89673c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 16:46:17 2005 +0100 server: Added access rights mapping to file objects. --- dlls/kernel/tests/sync.c | 2 -- dlls/ntdll/server.c | 5 +++++ server/directory.c | 12 ++++++++++- server/fd.c | 10 +++++---- server/file.c | 44 +++++++++++++++++++++++++++------------- server/file.h | 6 ++++++ server/mailslot.c | 50 +++++++++++++++++++++++++++++++++------------- server/mapping.c | 18 +++++++++++++---- server/named_pipe.c | 30 ++++++++++++++++++++++++---- server/object.c | 6 +++++- server/process.c | 6 +++--- server/registry.c | 4 ++-- server/serial.c | 12 ++++++++++- server/sock.c | 30 +++++++++++++++++----------- 14 files changed, 171 insertions(+), 64 deletions(-)

1 0

Alexandre Julliard : server: Added access rights mapping to process and thread objects.
by Alexandre Julliard Dec. 12, 2005

Dec. 12, 2005

Module: wine Branch: refs/heads/master Commit: 46d1b3e8da47999f7d8d58be8802eadae8321b21 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=46d1b3e8da47999f7d8d58b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 15:03:07 2005 +0100 server: Added access rights mapping to process and thread objects. --- server/process.c | 12 +++++++++++- server/thread.c | 12 +++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/server/process.c b/server/process.c index 83cd716..c1657e4 100644 --- a/server/process.c +++ b/server/process.c @@ -59,6 +59,7 @@ static int running_processes; static void process_dump( struct object *obj, int verbose ); static int process_signaled( struct object *obj, struct thread *thread ); +static unsigned int process_map_access( struct object *obj, unsigned int access ); static void process_poll_event( struct fd *fd, int event ); static void process_destroy( struct object *obj ); @@ -72,7 +73,7 @@ static const struct object_ops process_o no_satisfied, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ - no_map_access, /* map_access */ + process_map_access, /* map_access */ no_lookup_name, /* lookup_name */ no_close_handle, /* close_handle */ process_destroy /* destroy */ @@ -415,6 +416,15 @@ static int process_signaled( struct obje return !process->running_threads; } +static unsigned int process_map_access( struct object *obj, unsigned int access ) +{ + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | SYNCHRONIZE; + if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | SYNCHRONIZE; + if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE; + if (access & GENERIC_ALL) access |= PROCESS_ALL_ACCESS; + return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); +} + static void process_poll_event( struct fd *fd, int event ) { struct process *process = get_fd_user( fd ); diff --git a/server/thread.c b/server/thread.c index 9e2481e..507eed5 100644 --- a/server/thread.c +++ b/server/thread.c @@ -83,6 +83,7 @@ struct thread_apc static void dump_thread( struct object *obj, int verbose ); static int thread_signaled( struct object *obj, struct thread *thread ); +static unsigned int thread_map_access( struct object *obj, unsigned int access ); static void thread_poll_event( struct fd *fd, int event ); static void destroy_thread( struct object *obj ); static struct thread_apc *thread_dequeue_apc( struct thread *thread, int system_only ); @@ -97,7 +98,7 @@ static const struct object_ops thread_op no_satisfied, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ - no_map_access, /* map_access */ + thread_map_access, /* map_access */ no_lookup_name, /* lookup_name */ no_close_handle, /* close_handle */ destroy_thread /* destroy */ @@ -271,6 +272,15 @@ static int thread_signaled( struct objec return (mythread->state == TERMINATED); } +static unsigned int thread_map_access( struct object *obj, unsigned int access ) +{ + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | SYNCHRONIZE; + if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | SYNCHRONIZE; + if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE; + if (access & GENERIC_ALL) access |= THREAD_ALL_ACCESS; + return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); +} + /* get a thread pointer from a thread id (and increment the refcount) */ struct thread *get_thread_from_id( thread_id_t id ) {

1 0