December 2008 - Wine-commits

Jacek Caban : mshtml: Remove no longer used node_insert_listener.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: 327dc2c40995b34d0ca0a82794a7232671d19309 URL: http://source.winehq.org/git/wine.git/?a=commit;h=327dc2c40995b34d0ca0a8279… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 30 21:20:37 2008 +0100 mshtml: Remove no longer used node_insert_listener. --- dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/nsevents.c | 66 ------------------------------------------ 2 files changed, 0 insertions(+), 67 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 9ebaaaa..8b40fea 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -321,7 +321,6 @@ struct NSContainer { nsEventListener focus_listener; nsEventListener keypress_listener; nsEventListener load_listener; - nsEventListener node_insert_listener; nsEventListener htmlevent_listener; nsIWebBrowser *webbrowser; diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 20227f7..ac4572c 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -313,70 +313,6 @@ BOOL handle_insert_comment(HTMLDocument *doc, const PRUnichar *comment) return TRUE; } -static nsresult NSAPI handle_node_insert(nsIDOMEventListener *iface, nsIDOMEvent *event) -{ - NSContainer *This = NSEVENTLIST_THIS(iface)->This; - nsIDOMEventTarget *target; - nsIDOMComment *nscomment; - nsIDOMElement *elem; - nsresult nsres; - - TRACE("(%p %p)\n", This, event); - - nsres = nsIDOMEvent_GetTarget(event, &target); - if(NS_FAILED(nsres)) { - ERR("GetTarget failed: %08x\n", nsres); - return NS_OK; - } - - nsres = nsIDOMEventTarget_QueryInterface(target, &IID_nsIDOMElement, (void**)&elem); - if(NS_SUCCEEDED(nsres)) { - nsIDOMHTMLScriptElement *script; - - nsres = nsIDOMElement_QueryInterface(elem, &IID_nsIDOMHTMLScriptElement, (void**)&script); - if(NS_SUCCEEDED(nsres)) { - doc_insert_script(This->doc, script); - nsIDOMHTMLScriptElement_Release(script); - } - - check_event_attr(This->doc, elem); - - nsIDOMEventTarget_Release(target); - nsIDOMNode_Release(elem); - return NS_OK; - } - - nsres = nsIDOMEventTarget_QueryInterface(target, &IID_nsIDOMComment, (void**)&nscomment); - if(NS_SUCCEEDED(nsres)) { - nsAString comment_str; - BOOL remove_comment = FALSE; - - nsAString_Init(&comment_str, NULL); - nsres = nsIDOMComment_GetData(nscomment, &comment_str); - if(NS_SUCCEEDED(nsres)) { - const PRUnichar *comment; - - nsAString_GetData(&comment_str, &comment); - remove_comment = handle_insert_comment(This->doc, comment); - } - - nsAString_Finish(&comment_str); - - if(remove_comment) { - nsIDOMNode *nsparent, *tmp; - - nsIDOMComment_GetParentNode(nscomment, &nsparent); - nsIDOMNode_RemoveChild(nsparent, (nsIDOMNode*)nscomment, &tmp); - nsIDOMNode_Release(nsparent); - nsIDOMNode_Release(tmp); - } - - nsIDOMComment_Release(nscomment); - } - - return NS_OK; -} - static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent *event) { NSContainer *This = NSEVENTLIST_THIS(iface)->This; @@ -427,7 +363,6 @@ static const nsIDOMEventListenerVtbl blur_vtbl = EVENTLISTENER_VTBL(handle_ static const nsIDOMEventListenerVtbl focus_vtbl = EVENTLISTENER_VTBL(handle_focus); static const nsIDOMEventListenerVtbl keypress_vtbl = EVENTLISTENER_VTBL(handle_keypress); static const nsIDOMEventListenerVtbl load_vtbl = EVENTLISTENER_VTBL(handle_load); -static const nsIDOMEventListenerVtbl node_insert_vtbl = EVENTLISTENER_VTBL(handle_node_insert); static const nsIDOMEventListenerVtbl htmlevent_vtbl = EVENTLISTENER_VTBL(handle_htmlevent); static void init_event(nsIDOMEventTarget *target, const PRUnichar *type, @@ -489,7 +424,6 @@ void init_nsevents(NSContainer *This) init_listener(&This->focus_listener, This, &focus_vtbl); init_listener(&This->keypress_listener, This, &keypress_vtbl); init_listener(&This->load_listener, This, &load_vtbl); - init_listener(&This->node_insert_listener, This, &node_insert_vtbl); init_listener(&This->htmlevent_listener, This, &htmlevent_vtbl); nsres = nsIWebBrowser_GetContentDOMWindow(This->webbrowser, &dom_window);

1 0

Henri Verbeet : wined3d: Convert some BOOLs to bitfields in struct SAVEDSTATES.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: 3920d42f71e60227e0e5b4adc69ef7d98a93d7a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3920d42f71e60227e0e5b4adc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 30 14:56:49 2008 +0100 wined3d: Convert some BOOLs to bitfields in struct SAVEDSTATES. --- dlls/wined3d/wined3d_private.h | 43 ++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ab2c68f..82931ea 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1760,27 +1760,28 @@ extern const IWineD3DVertexDeclarationVtbl IWineD3DVertexDeclaration_Vtbl; /* Note: Very long winded but gl Lists are not flexible enough */ /* to resolve everything we need, so doing it manually for now */ typedef struct SAVEDSTATES { - BOOL indices; - BOOL material; - BOOL streamSource[MAX_STREAMS]; - BOOL streamFreq[MAX_STREAMS]; - BOOL textures[MAX_COMBINED_SAMPLERS]; - BOOL transform[HIGHEST_TRANSFORMSTATE + 1]; - BOOL viewport; - BOOL renderState[WINEHIGHEST_RENDER_STATE + 1]; - BOOL textureState[MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; - BOOL samplerState[MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1]; - BOOL clipplane[MAX_CLIPPLANES]; - BOOL vertexDecl; - BOOL pixelShader; - WORD pixelShaderConstantsB; - WORD pixelShaderConstantsI; - BOOL *pixelShaderConstantsF; - BOOL vertexShader; - WORD vertexShaderConstantsB; - WORD vertexShaderConstantsI; - BOOL *vertexShaderConstantsF; - BOOL scissorRect; + BOOL streamSource[MAX_STREAMS]; + BOOL streamFreq[MAX_STREAMS]; + BOOL textures[MAX_COMBINED_SAMPLERS]; + BOOL transform[HIGHEST_TRANSFORMSTATE + 1]; + BOOL renderState[WINEHIGHEST_RENDER_STATE + 1]; + BOOL textureState[MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; + BOOL samplerState[MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1]; + BOOL clipplane[MAX_CLIPPLANES]; + WORD pixelShaderConstantsB; /* MAX_CONST_B, 16 */ + WORD pixelShaderConstantsI; /* MAX_CONST_I, 16 */ + BOOL *pixelShaderConstantsF; + WORD vertexShaderConstantsB; /* MAX_CONST_B, 16 */ + WORD vertexShaderConstantsI; /* MAX_CONST_I, 16 */ + BOOL *vertexShaderConstantsF; + BYTE indices : 1; + BYTE material : 1; + BYTE viewport : 1; + BYTE vertexDecl : 1; + BYTE pixelShader : 1; + BYTE vertexShader : 1; + BYTE scissorRect : 1; + BYTE padding : 1; } SAVEDSTATES; struct StageState {

1 0

Henri Verbeet : wined3d: Remove an unused field from the device.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: 813c7ed202ee60aff365f39b682f8e8de9f59c99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=813c7ed202ee60aff365f39b6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 30 14:56:49 2008 +0100 wined3d: Remove an unused field from the device. --- dlls/wined3d/wined3d_private.h | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dd79c84..7d79867 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1128,9 +1128,6 @@ struct IWineD3DDeviceImpl /* Textures for when no other textures are mapped */ UINT dummyTextureName[MAX_TEXTURES]; - /* Debug stream management */ - BOOL debug; - /* Device state management */ HRESULT state; BOOL d3d_initialized;

1 0

Henri Verbeet : wined3d: Convert some BOOLs to bitfields in struct WineD3DContext.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: 3f12f59aa42394778420c3838c928c2bc079b461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f12f59aa42394778420c3838… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 30 14:56:49 2008 +0100 wined3d: Convert some BOOLs to bitfields in struct WineD3DContext. Also happens to fill two 3 byte holes. --- dlls/wined3d/state.c | 9 ++++++--- dlls/wined3d/wined3d_private.h | 29 ++++++++++++++++------------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c141fbd..746f636 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3068,7 +3068,8 @@ static void transform_texture(DWORD state, IWineD3DStateBlockImpl *stateblock, W stateblock->wineD3DDevice->frag_pipe->ffp_proj_control); /* The sampler applying function calls us if this changes */ - if(context->lastWasPow2Texture[texUnit] && stateblock->textures[texUnit]) { + if ((context->lastWasPow2Texture & (1 << texUnit)) && stateblock->textures[texUnit]) + { if(generated) { FIXME("Non-power2 texture being used with generated texture coords\n"); } @@ -3358,8 +3359,10 @@ static void sampler_texmatrix(DWORD state, IWineD3DStateBlockImpl *stateblock, W } } - if(texIsPow2 || context->lastWasPow2Texture[sampler]) { - context->lastWasPow2Texture[sampler] = texIsPow2; + if (texIsPow2 || (context->lastWasPow2Texture & (1 << sampler))) + { + if (texIsPow2) context->lastWasPow2Texture |= 1 << sampler; + else context->lastWasPow2Texture &= ~(1 << sampler); transform_texture(STATE_TEXTURESTAGE(stateblock->wineD3DDevice->texUnitMap[sampler], WINED3DTSS_TEXTURETRANSFORMFLAGS), stateblock, context); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7d79867..8759dd9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -801,21 +801,26 @@ struct WineD3DContext { DWORD tid; /* Thread ID which owns this context at the moment */ /* Stores some information about the context state for optimization */ - BOOL draw_buffer_dirty; - BOOL last_was_rhw; /* true iff last draw_primitive was in xyzrhw mode */ - BOOL last_was_pshader; - BOOL last_was_vshader; - BOOL last_was_foggy_shader; - BOOL namedArraysLoaded, numberedArraysLoaded; + WORD draw_buffer_dirty : 1; + WORD last_was_rhw : 1; /* true iff last draw_primitive was in xyzrhw mode */ + WORD last_was_pshader : 1; + WORD last_was_vshader : 1; + WORD last_was_foggy_shader : 1; + WORD namedArraysLoaded : 1; + WORD numberedArraysLoaded : 1; + WORD last_was_blit : 1; + WORD last_was_ckey : 1; + WORD fog_coord : 1; + WORD isPBuffer : 1; + WORD fog_enabled : 1; + WORD num_untracked_materials : 2; /* Max value 2 */ + WORD padding : 2; + BYTE texShaderBumpMap; /* MAX_TEXTURES, 8 */ + BYTE lastWasPow2Texture; /* MAX_TEXTURES, 8 */ DWORD numbered_array_mask; - BOOL lastWasPow2Texture[MAX_TEXTURES]; GLenum tracking_parm; /* Which source is tracking current colour */ - unsigned char num_untracked_materials; GLenum untracked_materials[2]; - BOOL last_was_blit, last_was_ckey; UINT blit_w, blit_h; - char texShaderBumpMap; - BOOL fog_coord; char *vshader_const_dirty, *pshader_const_dirty; @@ -824,7 +829,6 @@ struct WineD3DContext { HWND win_handle; HDC hdc; HPBUFFERARB pbuffer; - BOOL isPBuffer; GLint aux_buffers; /* FBOs */ @@ -834,7 +838,6 @@ struct WineD3DContext { GLuint dst_fbo; /* Extension emulation */ - BOOL fog_enabled; GLint gl_fog_source; GLfloat fog_coord_value; GLfloat color[4], fogstart, fogend, fogcolor[4];

1 0

Henri Verbeet : wined3d: Convert some BOOLs to bitfields in struct IWineD3DDeviceImpl.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: 29a0d065181b10903b1362d09e88692f81474148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29a0d065181b10903b1362d09… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 30 14:56:49 2008 +0100 wined3d: Convert some BOOLs to bitfields in struct IWineD3DDeviceImpl. Also fills a 3 byte hole. --- dlls/wined3d/device.c | 17 +++++---------- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/state.c | 4 +- dlls/wined3d/wined3d_private.h | 36 ++++++++++++++++----------------- 4 files changed, 26 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b905936..06698f5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3638,6 +3638,7 @@ static void device_map_stage(IWineD3DDeviceImpl *This, int stage, int unit) { static void device_update_fixed_function_usage_map(IWineD3DDeviceImpl *This) { int i; + This->fixed_function_usage_map = 0; for (i = 0; i < MAX_TEXTURES; ++i) { WINED3DTEXTUREOP color_op = This->stateBlock->textureState[i][WINED3DTSS_COLOROP]; WINED3DTEXTUREOP alpha_op = This->stateBlock->textureState[i][WINED3DTSS_ALPHAOP]; @@ -3650,10 +3651,6 @@ static void device_update_fixed_function_usage_map(IWineD3DDeviceImpl *This) { if (color_op == WINED3DTOP_DISABLE) { /* Not used, and disable higher stages */ - while (i < MAX_TEXTURES) { - This->fixed_function_usage_map[i] = FALSE; - ++i; - } break; } @@ -3663,13 +3660,11 @@ static void device_update_fixed_function_usage_map(IWineD3DDeviceImpl *This) { || ((alpha_arg1 == WINED3DTA_TEXTURE) && alpha_op != WINED3DTOP_SELECTARG2) || ((alpha_arg2 == WINED3DTA_TEXTURE) && alpha_op != WINED3DTOP_SELECTARG1) || ((alpha_arg3 == WINED3DTA_TEXTURE) && (alpha_op == WINED3DTOP_MULTIPLYADD || alpha_op == WINED3DTOP_LERP))) { - This->fixed_function_usage_map[i] = TRUE; - } else { - This->fixed_function_usage_map[i] = FALSE; + This->fixed_function_usage_map |= (1 << i); } if ((color_op == WINED3DTOP_BUMPENVMAP || color_op == WINED3DTOP_BUMPENVMAPLUMINANCE) && i < MAX_TEXTURES - 1) { - This->fixed_function_usage_map[i+1] = TRUE; + This->fixed_function_usage_map |= (1 << (i + 1)); } } } @@ -3682,7 +3677,7 @@ static void device_map_fixed_function_samplers(IWineD3DDeviceImpl *This) { if (This->max_ffp_textures == This->max_ffp_texture_stages || This->stateBlock->lowest_disabled_stage <= This->max_ffp_textures) { for (i = 0; i < This->stateBlock->lowest_disabled_stage; ++i) { - if (!This->fixed_function_usage_map[i]) continue; + if (!(This->fixed_function_usage_map & (1 << i))) continue; if (This->texUnitMap[i] != i) { device_map_stage(This, i, i); @@ -3696,7 +3691,7 @@ static void device_map_fixed_function_samplers(IWineD3DDeviceImpl *This) { /* Now work out the mapping */ tex = 0; for (i = 0; i < This->stateBlock->lowest_disabled_stage; ++i) { - if (!This->fixed_function_usage_map[i]) continue; + if (!(This->fixed_function_usage_map & (1 << i))) continue; if (This->texUnitMap[i] != tex) { device_map_stage(This, i, tex); @@ -3739,7 +3734,7 @@ static BOOL device_unit_free_for_vs(IWineD3DDeviceImpl *This, const DWORD *pshad if (!pshader_sampler_tokens) { /* No pixel shader, check fixed function */ - return current_mapping >= MAX_TEXTURES || !This->fixed_function_usage_map[current_mapping]; + return current_mapping >= MAX_TEXTURES || !(This->fixed_function_usage_map & (1 << current_mapping)); } /* Pixel shader, check the shader's sampler map */ diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 2c58459..a4677dc 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -453,7 +453,7 @@ void set_tex_op_nvrc(IWineD3DDevice *iface, BOOL is_alpha, int stage, WINED3DTEX static void nvrc_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / WINED3D_HIGHEST_TEXTURE_STATE; DWORD mapped_stage = stateblock->wineD3DDevice->texUnitMap[stage]; - BOOL tex_used = stateblock->wineD3DDevice->fixed_function_usage_map[stage]; + BOOL tex_used = stateblock->wineD3DDevice->fixed_function_usage_map & (1 << stage); TRACE("Setting color op for stage %d\n", stage); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 746f636..928a4bb 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2883,7 +2883,7 @@ static void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, WINED3DTE static void tex_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / WINED3D_HIGHEST_TEXTURE_STATE; DWORD mapped_stage = stateblock->wineD3DDevice->texUnitMap[stage]; - BOOL tex_used = stateblock->wineD3DDevice->fixed_function_usage_map[stage]; + BOOL tex_used = stateblock->wineD3DDevice->fixed_function_usage_map & (1 << stage); TRACE("Setting color op for stage %d\n", stage); @@ -2939,7 +2939,7 @@ static void tex_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D void tex_alphaop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / WINED3D_HIGHEST_TEXTURE_STATE; DWORD mapped_stage = stateblock->wineD3DDevice->texUnitMap[stage]; - BOOL tex_used = stateblock->wineD3DDevice->fixed_function_usage_map[stage]; + BOOL tex_used = stateblock->wineD3DDevice->fixed_function_usage_map & (1 << stage); DWORD op, arg1, arg2, arg0; TRACE("Setting alpha op for stage %d\n", stage); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8759dd9..ab2c68f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1065,19 +1065,30 @@ struct IWineD3DDeviceImpl unsigned int max_ffp_textures, max_ffp_texture_stages; - /* To store */ - BOOL view_ident; /* true iff view matrix is identity */ - BOOL untransformed; - BOOL vertexBlendUsed; /* To avoid needless setting of the blend matrices */ + WORD view_ident : 1; /* true iff view matrix is identity */ + WORD untransformed : 1; + WORD vertexBlendUsed : 1; /* To avoid needless setting of the blend matrices */ + WORD isRecordingState : 1; + WORD isInDraw : 1; + WORD render_offscreen : 1; + WORD bCursorVisible : 1; + WORD haveHardwareCursor : 1; + WORD d3d_initialized : 1; + WORD inScene : 1; /* A flag to check for proper BeginScene / EndScene call pairs */ + WORD softwareVertexProcessing : 1; /* process vertex shaders using software or hardware */ + WORD useDrawStridedSlow : 1; + WORD instancedDraw : 1; + WORD padding : 3; + + BYTE fixed_function_usage_map; /* MAX_TEXTURES, 8 */ + #define DDRAW_PITCH_ALIGNMENT 8 #define D3D8_PITCH_ALIGNMENT 4 unsigned char surface_alignment; /* Line Alignment of surfaces */ /* State block related */ - BOOL isRecordingState; IWineD3DStateBlockImpl *stateBlock; IWineD3DStateBlockImpl *updateStateBlock; - BOOL isInDraw; /* Internal use fields */ WINED3DDEVICE_CREATION_PARAMETERS createParms; @@ -1107,7 +1118,6 @@ struct IWineD3DDeviceImpl UINT paletteConversionShader; /* For rendering to a texture using glCopyTexImage */ - BOOL render_offscreen; GLenum *draw_buffers; GLuint depth_blt_texture; GLuint depth_blt_rb; @@ -1115,14 +1125,12 @@ struct IWineD3DDeviceImpl UINT depth_blt_rb_h; /* Cursor management */ - BOOL bCursorVisible; UINT xHotSpot; UINT yHotSpot; UINT xScreenSpace; UINT yScreenSpace; UINT cursorWidth, cursorHeight; GLuint cursorTexture; - BOOL haveHardwareCursor; HCURSOR hardwareCursor; /* The Wine logo surface */ @@ -1133,13 +1141,6 @@ struct IWineD3DDeviceImpl /* Device state management */ HRESULT state; - BOOL d3d_initialized; - - /* A flag to check for proper BeginScene / EndScene call pairs */ - BOOL inScene; - - /* process vertex shaders using software or hardware */ - BOOL softwareVertexProcessing; /* DirectDraw stuff */ DWORD ddraw_width, ddraw_height; @@ -1151,13 +1152,10 @@ struct IWineD3DDeviceImpl /* With register combiners we can skip junk texture stages */ DWORD texUnitMap[MAX_COMBINED_SAMPLERS]; DWORD rev_tex_unit_map[MAX_COMBINED_SAMPLERS]; - BOOL fixed_function_usage_map[MAX_TEXTURES]; /* Stream source management */ WineDirect3DVertexStridedData strided_streams; const WineDirect3DVertexStridedData *up_strided; - BOOL useDrawStridedSlow; - BOOL instancedDraw; /* Context management */ WineD3DContext **contexts; /* Dynamic array containing pointers to context structures */

1 0

Alexandre Julliard : server: Specify the user APC to call only once the system APC has executed.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: f507ccbf52c6412dadfe4e909cda51cbbf423db5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f507ccbf52c6412dadfe4e909… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 30 20:51:55 2008 +0100 server: Specify the user APC to call only once the system APC has executed. --- dlls/ntdll/directory.c | 6 ++-- dlls/ntdll/file.c | 41 ++++++++++++++++++++++----------------- dlls/ntdll/sync.c | 15 ++++++++++--- dlls/ws2_32/socket.c | 17 +++++++-------- include/wine/server_protocol.h | 6 ++-- server/async.c | 6 ++-- server/file.h | 2 +- server/protocol.def | 4 +- server/thread.c | 4 ++- server/trace.c | 9 ++++--- 10 files changed, 62 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f507ccbf52c6412dadfe4…

1 0

Alexandre Julliard : server: Make the various async I/ O parameters client_ptr_t instead of void pointers.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: 6db201080f74dece1a31a0d516ecbad983ca2b9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6db201080f74dece1a31a0d51… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 30 21:09:41 2008 +0100 server: Make the various async I/O parameters client_ptr_t instead of void pointers. --- dlls/ntdll/directory.c | 6 +++--- dlls/ntdll/file.c | 20 ++++++++++---------- dlls/ntdll/sync.c | 14 +++++++++----- dlls/ntdll/thread.c | 2 +- dlls/ws2_32/socket.c | 18 +++++++++--------- include/wine/server_protocol.h | 21 +++++++++++---------- server/async.c | 6 +++--- server/device.c | 4 ++-- server/file.h | 3 ++- server/protocol.def | 19 ++++++++++--------- server/trace.c | 31 ++++++++++++++++++++++--------- tools/make_requests | 2 +- 12 files changed, 83 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6db201080f74dece1a31a…

1 0

Henri Verbeet : wined3d: Make use_vs() and use_ps() work on a stateblock instead of a device.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: 2b926db50d04d4cfb0c8c7cfed0536a24074bf7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b926db50d04d4cfb0c8c7cfe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 30 14:56:49 2008 +0100 wined3d: Make use_vs() and use_ps() work on a stateblock instead of a device. Most callers work on a stateblock rather than a device, and the main fields we check (vertexShader and pixelShader) are part of the stateblock as well. --- dlls/wined3d/arb_program_shader.c | 14 ++++++----- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/device.c | 4 +- dlls/wined3d/drawprim.c | 8 ++++-- dlls/wined3d/glsl_shader.c | 3 +- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/pixelshader.c | 9 +++++-- dlls/wined3d/state.c | 41 +++++++++++++++++---------------- dlls/wined3d/vertexbuffer.c | 3 +- dlls/wined3d/wined3d_private.h | 16 +++++++----- 10 files changed, 57 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b926db50d04d4cfb0c8c…

1 0

Alexandre Julliard : server: Make padding explicit in the wake_up_reply structure.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: 7560a890225a8ab56c326206224fe9bedc69aefa URL: http://source.winehq.org/git/wine.git/?a=commit;h=7560a890225a8ab56c3262062… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 30 15:15:06 2008 +0100 server: Make padding explicit in the wake_up_reply structure. --- include/wine/server_protocol.h | 3 ++- server/protocol.def | 1 + server/thread.c | 1 + 3 files changed, 4 insertions(+), 1 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1845692..6499753 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -137,6 +137,7 @@ struct wake_up_reply { client_ptr_t cookie; int signaled; + int __pad; }; @@ -5058,6 +5059,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 367 +#define SERVER_PROTOCOL_VERSION 368 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index e51c24c..f064838 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -153,6 +153,7 @@ struct wake_up_reply { client_ptr_t cookie; /* magic cookie that was passed in select_request */ int signaled; /* wait result */ + int __pad; }; /* NT-style timeout, in 100ns units, negative means relative timeout */ diff --git a/server/thread.c b/server/thread.c index 98a24d8..9681c1a 100644 --- a/server/thread.c +++ b/server/thread.c @@ -565,6 +565,7 @@ static int send_thread_wakeup( struct thread *thread, client_ptr_t cookie, int s struct wake_up_reply reply; int ret; + memset( &reply, 0, sizeof(reply) ); reply.cookie = cookie; reply.signaled = signaled; if ((ret = write( get_unix_fd( thread->wait_fd ), &reply, sizeof(reply) )) == sizeof(reply))

1 0

Alexandre Julliard : server: Make a couple of fields smaller in the apc_call_t/apc_result_t structures.
by Alexandre Julliard 31 Dec '08

31 Dec '08

Module: wine Branch: master Commit: c86ec6445cb210445dac34e404985067ec92c361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c86ec6445cb210445dac34e40… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 30 15:22:45 2008 +0100 server: Make a couple of fields smaller in the apc_call_t/apc_result_t structures. --- dlls/ntdll/sync.c | 4 +- dlls/ntdll/virtual.c | 44 ++++++++++++++++++++-------------------- include/wine/server_protocol.h | 14 ++++++------ server/protocol.def | 12 +++++----- tools/make_requests | 4 +- 5 files changed, 39 insertions(+), 39 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 86a80bd..ecfe6f7 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -916,10 +916,10 @@ static BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) result->virtual_query.base = wine_server_client_ptr( info.BaseAddress ); result->virtual_query.alloc_base = wine_server_client_ptr( info.AllocationBase ); result->virtual_query.size = info.RegionSize; - result->virtual_query.state = info.State; result->virtual_query.prot = info.Protect; result->virtual_query.alloc_prot = info.AllocationProtect; - result->virtual_query.alloc_type = info.Type; + result->virtual_query.state = info.State >> 12; + result->virtual_query.alloc_type = info.Type >> 16; } break; } diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index f804eba..d2610e9 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1963,10 +1963,10 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, info->BaseAddress = wine_server_get_ptr( result.virtual_query.base ); info->AllocationBase = wine_server_get_ptr( result.virtual_query.alloc_base ); info->RegionSize = result.virtual_query.size; - info->State = result.virtual_query.state; info->Protect = result.virtual_query.prot; info->AllocationProtect = result.virtual_query.alloc_prot; - info->Type = result.virtual_query.alloc_type; + info->State = (DWORD)result.virtual_query.state << 12; + info->Type = (DWORD)result.virtual_query.alloc_type << 16; if (info->RegionSize != result.virtual_query.size) /* truncated */ return STATUS_INVALID_PARAMETER; /* FIXME */ if (res_len) *res_len = sizeof(*info); @@ -2233,6 +2233,26 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p if ((offset.u.LowPart & mask) || (*addr_ptr && ((UINT_PTR)*addr_ptr & mask))) return STATUS_INVALID_PARAMETER; + switch(protect) + { + case PAGE_NOACCESS: + access = SECTION_QUERY; + break; + case PAGE_READWRITE: + case PAGE_EXECUTE_READWRITE: + access = SECTION_QUERY | SECTION_MAP_WRITE; + break; + case PAGE_READONLY: + case PAGE_WRITECOPY: + case PAGE_EXECUTE: + case PAGE_EXECUTE_READ: + case PAGE_EXECUTE_WRITECOPY: + access = SECTION_QUERY | SECTION_MAP_READ; + break; + default: + return STATUS_INVALID_PARAMETER; + } + if (process != NtCurrentProcess()) { apc_call_t call; @@ -2259,26 +2279,6 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p return result.map_view.status; } - switch(protect) - { - case PAGE_NOACCESS: - access = SECTION_QUERY; - break; - case PAGE_READWRITE: - case PAGE_EXECUTE_READWRITE: - access = SECTION_QUERY | SECTION_MAP_WRITE; - break; - case PAGE_READONLY: - case PAGE_WRITECOPY: - case PAGE_EXECUTE: - case PAGE_EXECUTE_READ: - case PAGE_EXECUTE_WRITECOPY: - access = SECTION_QUERY | SECTION_MAP_READ; - break; - default: - return STATUS_INVALID_PARAMETER; - } - SERVER_START_REQ( get_mapping_info ) { req->handle = wine_server_obj_handle( handle ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 6499753..6e60dab 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -349,9 +349,9 @@ typedef union client_ptr_t addr; mem_size_t size; file_pos_t offset; - unsigned int zero_bits; unsigned int alloc_type; - unsigned int prot; + unsigned short zero_bits; + unsigned short prot; } map_view; struct { @@ -400,10 +400,10 @@ typedef union client_ptr_t base; client_ptr_t alloc_base; mem_size_t size; - unsigned int state; - unsigned int prot; - unsigned int alloc_prot; - unsigned int alloc_type; + unsigned short state; + unsigned short prot; + unsigned short alloc_prot; + unsigned short alloc_type; } virtual_query; struct { @@ -5059,6 +5059,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 368 +#define SERVER_PROTOCOL_VERSION 369 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index f064838..966e900 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -365,9 +365,9 @@ typedef union client_ptr_t addr; /* requested address */ mem_size_t size; /* allocation size */ file_pos_t offset; /* file offset */ - unsigned int zero_bits; /* allocation alignment */ unsigned int alloc_type;/* allocation type */ - unsigned int prot; /* memory protection flags */ + unsigned short zero_bits; /* allocation alignment */ + unsigned short prot; /* memory protection flags */ } map_view; struct { @@ -416,10 +416,10 @@ typedef union client_ptr_t base; /* resulting base address */ client_ptr_t alloc_base;/* resulting allocation base */ mem_size_t size; /* resulting region size */ - unsigned int state; /* resulting region state */ - unsigned int prot; /* resulting region protection */ - unsigned int alloc_prot;/* resulting allocation protection */ - unsigned int alloc_type;/* resulting region allocation type */ + unsigned short state; /* resulting region state */ + unsigned short prot; /* resulting region protection */ + unsigned short alloc_prot;/* resulting allocation protection */ + unsigned short alloc_type;/* resulting region allocation type */ } virtual_query; struct { diff --git a/tools/make_requests b/tools/make_requests index c5b6ad1..eeec934 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -45,8 +45,8 @@ my %formats = "timeout_t" => [ 8, 8, "&dump_timeout" ], "rectangle_t" => [ 16, 4, "&dump_rectangle" ], "char_info_t" => [ 4, 2, "&dump_char_info" ], - "apc_call_t" => [ 44, 8, "&dump_apc_call" ], - "apc_result_t" => [ 48, 8, "&dump_apc_result" ], + "apc_call_t" => [ 40, 8, "&dump_apc_call" ], + "apc_result_t" => [ 40, 8, "&dump_apc_result" ], "async_data_t" => [ 32, 8, "&dump_async_data" ], "luid_t" => [ 8, 4, "&dump_luid" ], "ioctl_code_t" => [ 4, 4, "&dump_ioctl_code" ],

1 0