January 2007 - Wine-commits

Stefan Dösinger : wined3d: Store the scissor rect in the stateblock.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: d4b63bbd87a221c725aff56b300224e55aa1f0a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4b63bbd87a221c725aff56b3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 10 11:28:42 2007 +0100 wined3d: Store the scissor rect in the stateblock. --- dlls/wined3d/device.c | 19 ++++++++++--------- dlls/wined3d/stateblock.c | 14 ++++++++++++++ dlls/wined3d/wined3d_private.h | 4 ++++ 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3300cdd..7b81f0e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3180,6 +3180,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl RECT windowRect; UINT winHeight; + This->updateStateBlock->set.scissorRect = TRUE; + This->updateStateBlock->changed.scissorRect = TRUE; + memcpy(&This->updateStateBlock->scissorRect, pRect, sizeof(*pRect)); + + if(This->isRecordingState) { + TRACE("Recording... not performing anything\n"); + return WINED3D_OK; + } + GetClientRect(((IWineD3DSwapChainImpl *)This->swapchains[0])->win_handle, &windowRect); /* Warning: glScissor uses window coordinates, not viewport coordinates, so our viewport correction does not apply * Warning2: Even in windowed mode the coords are relative to the window, not the screen @@ -3197,17 +3206,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl static HRESULT WINAPI IWineD3DDeviceImpl_GetScissorRect(IWineD3DDevice *iface, RECT* pRect) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - GLint scissorBox[4]; - ENTER_GL(); - /** FIXME: Windows uses a top,left origin openGL uses a bottom Right? **/ - glGetIntegerv(GL_SCISSOR_BOX, scissorBox); - pRect->left = scissorBox[0]; - pRect->top = scissorBox[1]; - pRect->right = scissorBox[0] + scissorBox[2]; - pRect->bottom = scissorBox[1] + scissorBox[3]; + memcpy(pRect, &This->updateStateBlock->scissorRect, sizeof(pRect)); TRACE("(%p)Returning a Scissor Rect of %d:%d-%d:%d\n", This, pRect->left, pRect->top, pRect->right, pRect->bottom); - LEAVE_GL(); return WINED3D_OK; } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index dba9e8a..093c83d 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -78,6 +78,7 @@ void stateblock_savedstates_copy( dest->vertexDecl = source->vertexDecl; dest->pixelShader = source->pixelShader; dest->vertexShader = source->vertexShader; + dest->scissorRect = dest->scissorRect; /* Fixed size arrays */ memcpy(dest->streamSource, source->streamSource, bsize * MAX_STREAMS); @@ -115,6 +116,7 @@ void stateblock_savedstates_set( states->vertexDecl = value; states->pixelShader = value; states->vertexShader = value; + states->scissorRect = value; /* Fixed size arrays */ memset(states->streamSource, value, bsize * MAX_STREAMS); @@ -168,6 +170,7 @@ void stateblock_copy( Dest->material = This->material; Dest->pixelShader = This->pixelShader; Dest->glsl_program = This->glsl_program; + memcpy(&Dest->scissorRect, &This->scissorRect, sizeof(Dest->scissorRect)); /* Fixed size arrays */ memcpy(Dest->vertexShaderConstantB, This->vertexShaderConstantB, sizeof(BOOL) * MAX_CONST_B); @@ -484,6 +487,14 @@ static HRESULT WINAPI IWineD3DStateBloc memcpy(&This->viewport, &targetStateBlock->viewport, sizeof(WINED3DVIEWPORT)); } + if(This->set.scissorRect && memcmp(&targetStateBlock->scissorRect, + &This->scissorRect, + sizeof(targetStateBlock->scissorRect))) + { + TRACE("Updating scissor rect\n"); + memcpy(&targetStateBlock->scissorRect, &This->scissorRect, sizeof(targetStateBlock->scissorRect)); + } + for (i = 0; i < MAX_STREAMS; i++) { if (This->set.streamSource[i] && ((This->streamStride[i] != targetStateBlock->streamStride[i]) || @@ -656,6 +667,9 @@ should really perform a delta so that on if (This->set.viewport && This->changed.viewport) IWineD3DDevice_SetViewport(pDevice, &This->viewport); + if (This->set.scissorRect && This->changed.scissorRect) + IWineD3DDevice_SetScissorRect(pDevice, &This->scissorRect); + /* TODO: Proper implementation using SetStreamSource offset (set to 0 for the moment)\n") */ for (i=0; i<MAX_STREAMS; i++) { if (This->set.streamSource[i] && This->changed.streamSource[i]) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 323fa38..0166637 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1155,6 +1155,7 @@ typedef struct SAVEDSTATES { BOOL vertexShaderConstantsB[MAX_CONST_B]; BOOL vertexShaderConstantsI[MAX_CONST_I]; BOOL *vertexShaderConstantsF; + BOOL scissorRect; } SAVEDSTATES; typedef struct { @@ -1243,6 +1244,9 @@ struct IWineD3DStateBlockImpl /* Current GLSL Shader Program */ struct glsl_shader_prog_link *glsl_program; + + /* Scissor test rectangle */ + RECT scissorRect; }; extern void stateblock_savedstates_set(

1 0

Stefan Dösinger : wined3d: Do not reset the material.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: 329670c7f129343ef0086f76b08a40d0fd5e3242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=329670c7f129343ef0086f76b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 10 11:23:04 2007 +0100 wined3d: Do not reset the material. --- dlls/wined3d/drawprim.c | 28 ---------------------------- 1 files changed, 0 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index cf47106..d210b85 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -93,8 +93,6 @@ static DWORD primitiveToGl(WINED3DPRIMIT /* Ensure the appropriate material states are set up - only change state if really required */ static void init_materials(IWineD3DDevice *iface, BOOL isDiffuseSupplied) { - - BOOL requires_material_reset = FALSE; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; if (This->tracking_color == NEEDS_TRACKING && isDiffuseSupplied) { @@ -107,45 +105,19 @@ static void init_materials(IWineD3DDevic glEnable(GL_COLOR_MATERIAL); checkGLcall("glEnable GL_COLOR_MATERIAL"); This->tracking_color = IS_TRACKING; - requires_material_reset = TRUE; /* Restore material settings as will be used */ - } else if ((This->tracking_color == IS_TRACKING && !isDiffuseSupplied) || (This->tracking_color == NEEDS_TRACKING && !isDiffuseSupplied)) { /* If we are tracking the current color but one isn't supplied, don't! */ glDisable(GL_COLOR_MATERIAL); checkGLcall("glDisable GL_COLOR_MATERIAL"); This->tracking_color = NEEDS_TRACKING; - requires_material_reset = TRUE; /* Restore material settings as will be used */ - } else if (This->tracking_color == IS_TRACKING && isDiffuseSupplied) { /* No need to reset material colors since no change to gl_color_material */ - requires_material_reset = FALSE; - } else if (This->tracking_color == NEEDS_DISABLE) { glDisable(GL_COLOR_MATERIAL); checkGLcall("glDisable GL_COLOR_MATERIAL"); This->tracking_color = DISABLED_TRACKING; - requires_material_reset = TRUE; /* Restore material settings as will be used */ } - - /* Reset the material colors which may have been tracking the color*/ - if (requires_material_reset) { - glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float*) &This->stateBlock->material.Ambient); - checkGLcall("glMaterialfv"); - glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, (float*) &This->stateBlock->material.Diffuse); - checkGLcall("glMaterialfv"); - if (This->stateBlock->renderState[WINED3DRS_SPECULARENABLE]) { - glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, (float*) &This->stateBlock->material.Specular); - checkGLcall("glMaterialfv"); - } else { - float black[4] = {0.0f, 0.0f, 0.0f, 0.0f}; - glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, &black[0]); - checkGLcall("glMaterialfv"); - } - glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, (float*) &This->stateBlock->material.Emissive); - checkGLcall("glMaterialfv"); - } - } static const GLfloat invymat[16] = {

1 0

Stefan Dösinger : wined3d: Remove the invymat from drawprim.c.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: dfeb40cbffdd875155a8443214033b036c41835a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfeb40cbffdd875155a844321… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 10 11:25:04 2007 +0100 wined3d: Remove the invymat from drawprim.c. --- dlls/wined3d/drawprim.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index d210b85..2e4a694 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -93,6 +93,7 @@ static DWORD primitiveToGl(WINED3DPRIMIT /* Ensure the appropriate material states are set up - only change state if really required */ static void init_materials(IWineD3DDevice *iface, BOOL isDiffuseSupplied) { + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; if (This->tracking_color == NEEDS_TRACKING && isDiffuseSupplied) { @@ -120,12 +121,6 @@ static void init_materials(IWineD3DDevic } } -static const GLfloat invymat[16] = { - 1.0f, 0.0f, 0.0f, 0.0f, - 0.0f, -1.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f}; - static BOOL fixed_get_input( BYTE usage, BYTE usage_idx, unsigned int* regnum) {

1 0

Stefan Dösinger : wined3d: Move material applying to the state table.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: 9b4920996e7eed4ab50077eb958d67e85e82f9e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b4920996e7eed4ab50077eb9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 10 11:26:12 2007 +0100 wined3d: Move material applying to the state table. --- dlls/wined3d/drawprim.c | 34 ---------------------------------- dlls/wined3d/state.c | 35 ++++++++++++++++++++++++----------- 2 files changed, 24 insertions(+), 45 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 2e4a694..b46192e 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -90,37 +90,6 @@ static DWORD primitiveToGl(WINED3DPRIMIT return NumVertexes; } -/* Ensure the appropriate material states are set up - only change - state if really required */ -static void init_materials(IWineD3DDevice *iface, BOOL isDiffuseSupplied) { - - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - - if (This->tracking_color == NEEDS_TRACKING && isDiffuseSupplied) { - /* If we have not set up the material color tracking, do it now as required */ - glDisable(GL_COLOR_MATERIAL); /* Note: Man pages state must enable AFTER calling glColorMaterial! Required?*/ - checkGLcall("glDisable GL_COLOR_MATERIAL"); - TRACE("glColorMaterial Parm=%x\n", This->tracking_parm); - glColorMaterial(GL_FRONT_AND_BACK, This->tracking_parm); - checkGLcall("glColorMaterial(GL_FRONT_AND_BACK, Parm)"); - glEnable(GL_COLOR_MATERIAL); - checkGLcall("glEnable GL_COLOR_MATERIAL"); - This->tracking_color = IS_TRACKING; - } else if ((This->tracking_color == IS_TRACKING && !isDiffuseSupplied) || - (This->tracking_color == NEEDS_TRACKING && !isDiffuseSupplied)) { - /* If we are tracking the current color but one isn't supplied, don't! */ - glDisable(GL_COLOR_MATERIAL); - checkGLcall("glDisable GL_COLOR_MATERIAL"); - This->tracking_color = NEEDS_TRACKING; - } else if (This->tracking_color == IS_TRACKING && isDiffuseSupplied) { - /* No need to reset material colors since no change to gl_color_material */ - } else if (This->tracking_color == NEEDS_DISABLE) { - glDisable(GL_COLOR_MATERIAL); - checkGLcall("glDisable GL_COLOR_MATERIAL"); - This->tracking_color = DISABLED_TRACKING; - } -} - static BOOL fixed_get_input( BYTE usage, BYTE usage_idx, unsigned int* regnum) { @@ -1248,9 +1217,6 @@ void drawPrimitive(IWineD3DDevice *iface } This->depth_copy_state = WINED3D_DCS_INITIAL; - /* Now initialize the materials state */ - init_materials(iface, (This->strided_streams.u.s.diffuse.lpData != NULL || This->strided_streams.u.s.diffuse.VBO != 0)); - { GLenum glPrimType; /* Ok, Work out which primitive is requested and how many vertexes that diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8cdd758..f62db54 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -806,7 +806,18 @@ static void state_fogdensity(DWORD state /* TODO: Merge with primitive type + init_materials()!! */ static void state_colormat(DWORD state, IWineD3DStateBlockImpl *stateblock) { - GLenum Parm = GL_AMBIENT_AND_DIFFUSE; + GLenum Parm = -1; + WineDirect3DStridedData *diffuse = &stateblock->wineD3DDevice->strided_streams.u.s.diffuse; + BOOL isDiffuseSupplied; + + /* Depends on the decoded vertex declaration to read the existance of diffuse data. + * The vertex declaration will call this function if the fixed function pipeline is used. + */ + if(isStateDirty(stateblock->wineD3DDevice, STATE_VDECL)) { + return; + } + + isDiffuseSupplied = diffuse->lpData || diffuse->VBO; if (stateblock->renderState[WINED3DRS_COLORVERTEX]) { TRACE("diff %d, amb %d, emis %d, spec %d\n", @@ -827,19 +838,17 @@ static void state_colormat(DWORD state, Parm = GL_EMISSION; } else if (stateblock->renderState[WINED3DRS_SPECULARMATERIALSOURCE] == D3DMCS_COLOR1) { Parm = GL_SPECULAR; - } else { - Parm = -1; - } - - if (Parm == -1) { - if (stateblock->wineD3DDevice->tracking_color != DISABLED_TRACKING) stateblock->wineD3DDevice->tracking_color = NEEDS_DISABLE; - } else { - stateblock->wineD3DDevice->tracking_color = NEEDS_TRACKING; - stateblock->wineD3DDevice->tracking_parm = Parm; } + } + if(Parm == -1 || !isDiffuseSupplied) { + glDisable(GL_COLOR_MATERIAL); + checkGLcall("glDisable GL_COLOR_MATERIAL"); } else { - if (stateblock->wineD3DDevice->tracking_color != DISABLED_TRACKING) stateblock->wineD3DDevice->tracking_color = NEEDS_DISABLE; + glColorMaterial(GL_FRONT_AND_BACK, Parm); + checkGLcall("glColorMaterial(GL_FRONT_AND_BACK, Parm)"); + glEnable(GL_COLOR_MATERIAL); + checkGLcall("glEnable(GL_COLOR_MATERIAL)"); } } @@ -2678,6 +2687,10 @@ static void vertexdeclaration(DWORD stat !isStateDirty(stateblock->wineD3DDevice, STATE_TRANSFORM(WINED3DTS_VIEW))) { transform_world(STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(0)), stateblock); } + + if(!isStateDirty(stateblock->wineD3DDevice, STATE_RENDER(WINED3DRS_COLORVERTEX))) { + state_colormat(STATE_RENDER(WINED3DRS_COLORVERTEX), stateblock); + } } else { /* We compile the shader here because we need the vertex declaration * in order to determine if we need to do any swizzling for D3DCOLOR

1 0

Alexandre Julliard : ntdll: Only return STATUS_USER_APC from a wait if a real user APC has been run.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: e3247ecc7011177d8ecef2ccc31963fb171df26e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3247ecc7011177d8ecef2ccc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 10 20:48:02 2007 +0100 ntdll: Only return STATUS_USER_APC from a wait if a real user APC has been run. Based on a patch by Thomas Kho. --- dlls/ntdll/sync.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 1d07ba7..0cb604f 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -655,10 +655,11 @@ static int wait_reply( void *cookie ) /*********************************************************************** * call_apcs * - * Call outstanding APCs. + * Call outstanding APCs. Return TRUE if a user APC has been run. */ -static void call_apcs( BOOL alertable ) +static BOOL call_apcs( BOOL alertable ) { + BOOL user_apc = FALSE; NTSTATUS ret; apc_call_t call; HANDLE handle = 0; @@ -677,12 +678,13 @@ static void call_apcs( BOOL alertable ) } SERVER_END_REQ; - if (ret) return; /* no more APCs */ + if (ret) return user_apc; /* no more APCs */ switch (call.type) { case APC_USER: call.user.func( call.user.args[0], call.user.args[1], call.user.args[2] ); + user_apc = TRUE; break; case APC_TIMER: { @@ -691,6 +693,7 @@ static void call_apcs( BOOL alertable ) RtlSecondsSince1970ToTime( call.timer.time.sec, &time ); time.QuadPart += call.timer.time.usec * 10; call.timer.func( call.timer.arg, time.u.LowPart, time.u.HighPart ); + user_apc = TRUE; break; } case APC_ASYNC_IO: @@ -733,8 +736,7 @@ NTSTATUS NTDLL_wait_for_multiple_objects SERVER_END_REQ; if (ret == STATUS_PENDING) ret = wait_reply( &cookie ); if (ret != STATUS_USER_APC) break; - call_apcs( (flags & SELECT_ALERTABLE) != 0 ); - if (flags & SELECT_ALERTABLE) break; + if (call_apcs( (flags & SELECT_ALERTABLE) != 0 )) break; signal_object = 0; /* don't signal it multiple times */ }

1 0

Alexandre Julliard : ntdll: Make sure that critical section waits are not interrupted.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: 443a5dbd809db5ca553e47aaeca3f82c2f3c2661 URL: http://source.winehq.org/git/wine.git/?a=commit;h=443a5dbd809db5ca553e47aae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 10 21:53:39 2007 +0100 ntdll: Make sure that critical section waits are not interrupted. --- dlls/ntdll/critsection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c index 5cfa4d2..2be8af2 100644 --- a/dlls/ntdll/critsection.c +++ b/dlls/ntdll/critsection.c @@ -231,7 +231,7 @@ static inline NTSTATUS wait_semaphore( R LARGE_INTEGER time; time.QuadPart = timeout * (LONGLONG)-10000000; - ret = NtWaitForSingleObject( sem, FALSE, &time ); + ret = NTDLL_wait_for_multiple_objects( 1, &sem, 0, &time, 0 ); } return ret; }

1 0

Alexandre Julliard : server: Allow suspended threads to run system APCs.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: 2520e387a190439dfcb1809f1e5819fab08773c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2520e387a190439dfcb1809f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 10 21:55:23 2007 +0100 server: Allow suspended threads to run system APCs. --- dlls/ntdll/exception.c | 2 +- server/thread.c | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 36d462f..a2f16c5 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -161,7 +161,7 @@ void wait_suspend( CONTEXT *context ) /* wait with 0 timeout, will only return once the thread is no longer suspended */ timeout.QuadPart = 0; - NTDLL_wait_for_multiple_objects( 0, NULL, 0, &timeout, 0 ); + NTDLL_wait_for_multiple_objects( 0, NULL, SELECT_INTERRUPTIBLE, &timeout, 0 ); /* retrieve the new context */ SERVER_START_REQ( get_thread_context ) diff --git a/server/thread.c b/server/thread.c index 476ee32..b8ee6fc 100644 --- a/server/thread.c +++ b/server/thread.c @@ -470,8 +470,13 @@ static int check_wait( struct thread *th struct thread_wait *wait = thread->wait; struct wait_queue_entry *entry = wait->queues; - /* Suspended threads may not acquire locks */ - if (thread->process->suspend + thread->suspend > 0) return -1; + /* Suspended threads may not acquire locks, but they can run system APCs */ + if (thread->process->suspend + thread->suspend > 0) + { + if ((wait->flags & SELECT_INTERRUPTIBLE) && !list_empty( &thread->system_apc )) + return STATUS_USER_APC; + return -1; + } assert( wait ); if (wait->flags & SELECT_ALL) @@ -1077,6 +1082,7 @@ DECL_HANDLER(queue_apc) DECL_HANDLER(get_apc) { struct thread_apc *apc; + int system_only = !req->alertable; if (req->prev) { @@ -1088,9 +1094,11 @@ DECL_HANDLER(get_apc) release_object( apc ); } + if (current->suspend + current->process->suspend > 0) system_only = 1; + for (;;) { - if (!(apc = thread_dequeue_apc( current, !req->alertable ))) + if (!(apc = thread_dequeue_apc( current, system_only ))) { /* no more APCs */ set_error( STATUS_PENDING );

1 0

Alexandre Julliard : ntdll: Compute the wait timeout only once in NTDLL_wait_for_multiple_objects.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: 30a2645ee7974b0e0167a082a10c615588cefe5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=30a2645ee7974b0e0167a082a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 10 20:44:35 2007 +0100 ntdll: Compute the wait timeout only once in NTDLL_wait_for_multiple_objects. --- dlls/ntdll/sync.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 3447ae9..1d07ba7 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -715,7 +715,9 @@ NTSTATUS NTDLL_wait_for_multiple_objects { NTSTATUS ret; int cookie; + abs_time_t abs_timeout; + NTDLL_get_server_abstime( &abs_timeout, timeout ); if (timeout) flags |= SELECT_TIMEOUT; for (;;) { @@ -724,7 +726,7 @@ NTSTATUS NTDLL_wait_for_multiple_objects req->flags = flags; req->cookie = &cookie; req->signal = signal_object; - NTDLL_get_server_abstime( &req->timeout, timeout ); + req->timeout = abs_timeout; wine_server_add_data( req, handles, count * sizeof(HANDLE) ); ret = wine_server_call( req ); }

1 0

Alexandre Julliard : make_makefiles: Get rid of the rules for dll symlinks.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: 05ef63e897e9ba6620fb474b12247ed20bce3f21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05ef63e897e9ba6620fb474b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 10 13:58:00 2007 +0100 make_makefiles: Get rid of the rules for dll symlinks. --- dlls/Makefile.in | 20 ++++-------------- tools/make_makefiles | 52 +++++++++++++------------------------------------ 2 files changed, 19 insertions(+), 53 deletions(-) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 6c01980..d516530 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -287,9 +287,7 @@ BUILDSUBDIRS = $(BASEDIRS) $(EXTRADIRS INSTALLSUBDIRS = $(BASEDIRS) $(EXTRADIRS) $(IMPLIBSUBDIRS) DOCSUBDIRS = $(BASEDIRS) $(EXTRADIRS) -(a)MAKE_RULES@ - -# Symbolic links +# 16-bit dlls WIN16_FILES = \ avifile.dll16 \ @@ -342,21 +340,11 @@ WIN16_FILES = \ wintab.dll16 \ wprocs.dll16 -SYMLINKS_SO = \ - @WIN16_FILES@ \ - +(a)MAKE_RULES@ # Main target -all: $(BUILDSUBDIRS) symlinks$(DLLEXT) - -.PHONY: symlinks symlinks.so implib - -symlinks.so: $(SYMLINKS_SO) - -symlinks: $(BUILDSUBDIRS) - -# Map symlink name to the corresponding library +all: $(BUILDSUBDIRS) @WIN16_FILES@ # Placeholders for 16-bit libraries @@ -578,6 +566,8 @@ IMPORT_LIBS = \ implib: $(IMPORT_LIBS) +.PHONY: implib + activeds/libactiveds.$(IMPLIBEXT): activeds/activeds.spec $(WINEBUILD) @cd activeds && $(MAKE) libactiveds.$(IMPLIBEXT) diff --git a/tools/make_makefiles b/tools/make_makefiles index 421170d..84c8cc2 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -332,13 +332,6 @@ sub update_dlls(@) my $text = ""; my @ignores = (); - sub needs_symlink($$) - { - my ($mod, $dir) = @_; - $mod =~ s/\.dll$//; - return $mod ne $dir; - } - foreach my $make (@_) { my %makefile = %{$makefiles{$make}}; @@ -356,7 +349,7 @@ sub update_dlls(@) next unless defined $makefile{"MODULE"}; my $module = $makefile{"MODULE"}; - (my $dir = $make) =~ s/^dlls\/(.*)\/[^\/]+$/$1/; + (my $dir = $makefile{"=dir"}) =~ s/^dlls\/(.*)\//$1/; if ($module =~ /^lib.*\.a$/) { @@ -365,6 +358,8 @@ sub update_dlls(@) } else { + (my $mod = $module) =~ s/\.dll$//; + die "invalid directory $dir for module $module\n" unless $mod eq $dir; $directories{$module} = $dir; } @@ -433,44 +428,29 @@ sub update_dlls(@) $text .= "INSTALLSUBDIRS = \$(BASEDIRS) \$(EXTRADIRS) \$(IMPLIBSUBDIRS)\n"; $text .= "DOCSUBDIRS = \$(BASEDIRS) \$(EXTRADIRS)\n"; - # output the all: target + # output the list of 16-bit files - my %targets = (); # use a hash to get rid of duplicate target names - my %targets16 = (); + my @targets16 = (); foreach my $mod (sort keys %directories) { - next if defined($special_dlls{$directories{$mod}}); # skip special dlls - $targets{$mod . ".so"} = 1 if needs_symlink($mod, $directories{$mod}); next unless defined $altnames{$mod}; foreach my $i (sort @{$altnames{$mod}}) { - $targets16{$i . "16"} = $mod; + push @targets16, $i . "16"; } } - - $text .= "\n\@MAKE_RULES\@\n\n"; - $text .= "# Symbolic links\n\n"; + $text .= "\n# 16-bit dlls\n\n"; $text .= "WIN16_FILES = \\\n"; - $text .= "\t" . join( " \\\n\t", sort keys %targets16 ) . "\n\n"; - $text .= "SYMLINKS_SO = \\\n"; - $text .= "\t\@WIN16_FILES\@ \\\n"; - $text .= "\t" . join( " \\\n\t", sort keys %targets ) . "\n\n"; + $text .= "\t" . join( " \\\n\t", sort @targets16 ) . "\n\n"; + $text .= "\@MAKE_RULES\@\n\n"; + + # output the all: target + $text .= "# Main target\n\n"; - $text .= "all: \$(BUILDSUBDIRS) symlinks\$(DLLEXT)\n\n"; - $text .= ".PHONY: symlinks symlinks.so implib\n\n"; - $text .= "symlinks.so: \$(SYMLINKS_SO)\n\n"; - $text .= "symlinks: \$(BUILDSUBDIRS)\n\n"; + $text .= "all: \$(BUILDSUBDIRS) \@WIN16_FILES\@\n\n"; # output the lib name -> directory rules - $text .= "# Map symlink name to the corresponding library\n\n"; - foreach my $mod (sort keys %directories) - { - next unless needs_symlink($mod, $directories{$mod}); - $text .= sprintf "%s.so: %s/%s.so\n", $mod, $directories{$mod}, $mod; - $text .= sprintf "\t\$(RM) \$@ && \$(LN_S) %s/%s.so \$@\n\n", $directories{$mod}, $mod; - } - $text .= "# Placeholders for 16-bit libraries\n\n"; foreach my $mod (sort keys %directories) { @@ -513,6 +493,7 @@ sub update_dlls(@) } $text .= "\n\n"; $text .= "implib: \$(IMPORT_LIBS)\n\n"; + $text .= ".PHONY: implib\n\n"; foreach my $mod (sort keys %importlibs) { @@ -541,11 +522,6 @@ sub update_dlls(@) $text .= "# Map library name to the corresponding directory\n\n"; - foreach my $mod (sort keys %directories) - { - next unless needs_symlink($mod, $directories{$mod}); - $text .= sprintf "%s/%s.so: %s\n", $directories{$mod}, $mod, $directories{$mod}; - } foreach my $mod (sort keys %staticlib_dirs) { $text .= sprintf "%s/%s: %s\n", $staticlib_dirs{$mod}, $mod, $staticlib_dirs{$mod};

1 0

Alexandre Julliard : winenas: Renamed the dlls/winmm/ winenas directory to dlls/winenas.drv.
by Alexandre Julliard 10 Jan '07

10 Jan '07

Module: wine Branch: master Commit: ae0380d97fb71318237da8764a8172c91dd76ddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae0380d97fb71318237da8764… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 10 13:45:39 2007 +0100 winenas: Renamed the dlls/winmm/winenas directory to dlls/winenas.drv. --- Makefile.in | 4 ++-- configure | 4 ++-- configure.ac | 2 +- dlls/Makefile.in | 7 +------ dlls/{winmm/winenas => winenas.drv}/Makefile.in | 2 +- dlls/{winmm/winenas => winenas.drv}/audio.c | 0 dlls/{winmm/winenas => winenas.drv}/nas.c | 0 dlls/{winmm/winenas => winenas.drv}/nas.h | 0 .../winenas => winenas.drv}/winenas.drv.spec | 0 9 files changed, 7 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ae0380d97fb71318237da…

1 0