September 2010 - Wine-Commits

Frédéric Delanoy : taskkill: Add French translation.
by Alexandre Julliard Sept. 22, 2010

Sept. 22, 2010

Module: wine Branch: master Commit: da8137852afb7cfae96502dc2dbc55f0b1ef182b URL: http://source.winehq.org/git/wine.git/?a=commit;h=da8137852afb7cfae96502dc2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 22 12:16:15 2010 +0200 taskkill: Add French translation. --- programs/taskkill/Fr.rc | 44 +++++++++++++++++++++++++++++++++++++++++ programs/taskkill/Makefile.in | 1 + 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/programs/taskkill/Fr.rc b/programs/taskkill/Fr.rc new file mode 100644 index 0000000..51bfe85 --- /dev/null +++ b/programs/taskkill/Fr.rc @@ -0,0 +1,44 @@ +/* + * Task termination utility + * French language support + * + * Copyright 2010 Frédéric Delanoy + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "taskkill.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_USAGE, "Usage : taskkill [/?] [/f] [/im NomProcessus | /pid IdProcessus]\n" + STRING_INVALID_OPTION, "Erreur : option de ligne de commande inconnue ou invalide.\n" + STRING_INVALID_PARAM, "Erreur : paramètre de ligne de commande invalide.\n" + STRING_MISSING_OPTION, "Erreur : une des options /im ou /pid doit être spécifiée.\n" + STRING_MISSING_PARAM, "Erreur : l'option %s requiert un paramètre de ligne de commande.\n" + STRING_MUTUAL_EXCLUSIVE, "Erreur : les options /im et /pid sont incompatibles.\n" + STRING_CLOSE_PID_SEARCH, "Message de fermeture envoyé aux fenêtres supérieures du processus de PID %u.\n" + STRING_CLOSE_PROC_SRCH, "Message de fermeture envoyé aux fenêtres supérieures du processus \"%s\" de PID %u.\n" + STRING_TERM_PID_SEARCH, "Le processus de PID %u a été terminé brutalement.\n" + STRING_TERM_PROC_SEARCH, "Le processus \"%s\" de PID %u a été terminé brutalement.\n" + STRING_SEARCH_FAILED, "Erreur : processus \"%s\" introuvable.\n" + STRING_ENUM_FAILED, "Erreur : impossible d'énumérer la liste de processus.\n" + STRING_TERMINATE_FAILED, "Erreur : impossible de terminer le processus \"%s\".\n" +} diff --git a/programs/taskkill/Makefile.in b/programs/taskkill/Makefile.in index 249459d..a52c5f8 100644 --- a/programs/taskkill/Makefile.in +++ b/programs/taskkill/Makefile.in @@ -8,6 +8,7 @@ C_SRCS = taskkill.c RC_SRCS = \ De.rc \ En.rc \ + Fr.rc \ It.rc \ Lt.rc

1 0

Austin English : ntoskrnl.exe: Add stub for READ_REGISTER_BUFFER_UCHAR.
by Alexandre Julliard Sept. 22, 2010

Sept. 22, 2010

Module: wine Branch: master Commit: 7bc0484c890f45dcd3b4d01e95caa2c7db50f92d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bc0484c890f45dcd3b4d01e9… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Sep 22 00:07:03 2010 -0700 ntoskrnl.exe: Add stub for READ_REGISTER_BUFFER_UCHAR. --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 17990e0..18317e2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1532,6 +1532,14 @@ VOID WINAPI KeInitializeDpc(PRKDPC Dpc, PKDEFERRED_ROUTINE DeferredRoutine, PVOI FIXME("stub\n"); } +/*********************************************************************** + * READ_REGISTER_BUFFER_UCHAR (NTOSKRNL.EXE.@) + */ +VOID WINAPI READ_REGISTER_BUFFER_UCHAR(PUCHAR Register, PUCHAR Buffer, ULONG Count) +{ + FIXME("stub\n"); +} + /***************************************************** * DllMain */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 31af18b..f9eb721 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -921,7 +921,7 @@ @ stub PsSetThreadWin32Thread @ stdcall PsTerminateSystemThread(long) @ stub PsThreadType -@ stub READ_REGISTER_BUFFER_UCHAR +@ stdcall READ_REGISTER_BUFFER_UCHAR(ptr ptr long) @ stub READ_REGISTER_BUFFER_ULONG @ stub READ_REGISTER_BUFFER_USHORT @ stub READ_REGISTER_UCHAR

1 0

Anders Jonsson : taskkill: Add Swedish translation.
by Alexandre Julliard Sept. 22, 2010

Sept. 22, 2010

Module: wine Branch: master Commit: 475475803979c26ee9a5781b7ce24b628984526b URL: http://source.winehq.org/git/wine.git/?a=commit;h=475475803979c26ee9a5781b7… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Wed Sep 22 12:38:07 2010 +0200 taskkill: Add Swedish translation. --- programs/taskkill/Makefile.in | 3 +- programs/taskkill/Sv.rc | 43 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletions(-) diff --git a/programs/taskkill/Makefile.in b/programs/taskkill/Makefile.in index a52c5f8..65004e2 100644 --- a/programs/taskkill/Makefile.in +++ b/programs/taskkill/Makefile.in @@ -10,6 +10,7 @@ RC_SRCS = \ En.rc \ Fr.rc \ It.rc \ - Lt.rc + Lt.rc \ + Sv.rc @MAKE_PROG_RULES@ diff --git a/programs/taskkill/Sv.rc b/programs/taskkill/Sv.rc new file mode 100644 index 0000000..209abdc --- /dev/null +++ b/programs/taskkill/Sv.rc @@ -0,0 +1,43 @@ +/* + * Task termination utility + * Swedish language support + * + * Copyright 2010 Anders Jonsson + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "taskkill.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_USAGE, "Användning: taskkill [/?] [/f] [/im Processnamn | /pid Process-ID]\n" + STRING_INVALID_OPTION, "Fel: Okänt eller ogiltigt kommandoradsval angavs.\n" + STRING_INVALID_PARAM, "Fel: Ogiltig kommandoradsparameter angavs.\n" + STRING_MISSING_OPTION, "Fel: Ett av valen /im eller /pid måste anges.\n" + STRING_MISSING_PARAM, "Fel: Valet %s kräver en kommandoradsparameter.\n" + STRING_MUTUAL_EXCLUSIVE, "Fel: Valen /im och /pid kan inte användas tillsammans.\n" + STRING_CLOSE_PID_SEARCH, "Stängningsmeddelande sänt till toppnivåfönster för processen med PID %u.\n" + STRING_CLOSE_PROC_SRCH, "Stängningsmeddelande sänt till toppnivåfönster för processen \"%s\" med PID %u.\n" + STRING_TERM_PID_SEARCH, "Tvingade fram nedstängning av processen med PID %u.\n" + STRING_TERM_PROC_SEARCH, "Tvingade fram nedstängning av processen \"%s\" med PID %u.\n" + STRING_SEARCH_FAILED, "Fel: Kunde inte hitta processen \"%s\".\n" + STRING_ENUM_FAILED, "Fel: Kunde inte räkna upp processlistan.\n" + STRING_TERMINATE_FAILED, "Fel: Kunde inte avbryta processen \"%s\".\n" +}

1 0

Austin Lund : comctl32/tests: LVM_GETRECTITEM should return TRUE.
by Alexandre Julliard Sept. 22, 2010

Sept. 22, 2010

Module: wine Branch: master Commit: 3836e62ed8d44e73892bb30cb80a2d9bd9f6a7d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3836e62ed8d44e73892bb30cb… Author: Austin Lund <austin.lund(a)gmail.com> Date: Wed Sep 22 16:28:30 2010 +1000 comctl32/tests: LVM_GETRECTITEM should return TRUE. --- dlls/comctl32/tests/listview.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6ef82bb..4297e0b 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3278,7 +3278,8 @@ static void test_getitemrect(void) r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); expect(0, r); rect.left = LVIR_LABEL; - SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); + r = SendMessage(hwnd, LVM_GETITEMRECT, 0, (LPARAM)&rect); + expect(TRUE, r); expect(0, rect.left); expect(0, rect.top); todo_wine expect(96, rect.right);

1 0

Jacek Caban : mshtml: Added PrintHTML stub.
by Alexandre Julliard Sept. 22, 2010

Sept. 22, 2010

Module: wine Branch: master Commit: 60827da9d5e5a0dc708cf1f1f34192663158f117 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60827da9d5e5a0dc708cf1f1f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 22 12:18:43 2010 +0200 mshtml: Added PrintHTML stub. --- dlls/mshtml/main.c | 8 ++++++++ dlls/mshtml/mshtml.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index a8bfb5e..679c206 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -334,6 +334,14 @@ HRESULT WINAPI ShowHTMLDialog(HWND hwndParent, IMoniker *pMk, VARIANT *pvarArgIn return E_NOTIMPL; } +/*********************************************************************** + * PrintHTML (MSHTML.@) + */ +void WINAPI PrintHTML(HWND hwnd, HINSTANCE handle, LPCSTR cmdline, INT show) +{ + FIXME("(%p %p %s %x)\n", hwnd, handle, debugstr_a(cmdline), show); +} + DEFINE_GUID(CLSID_CBackgroundPropertyPage, 0x3050F232, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_CCDAnchorPropertyPage, 0x3050F1FC, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_CCDGenericPropertyPage, 0x3050F17F, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); diff --git a/dlls/mshtml/mshtml.spec b/dlls/mshtml/mshtml.spec index c8e1be5..5dfcdcd 100644 --- a/dlls/mshtml/mshtml.spec +++ b/dlls/mshtml/mshtml.spec @@ -6,7 +6,7 @@ @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() @ stub MatchExactGetIDsOfNames -@ stub PrintHTML +@ stdcall PrintHTML(ptr ptr str long) @ stdcall RNIGetCompatibleVersion() @ stdcall RunHTMLApplication(long long str long) @ stdcall ShowHTMLDialog(ptr ptr ptr wstr ptr)

1 0

Henri Verbeet : wined3d: Move the primitive type to wined3d_state.
by Alexandre Julliard Sept. 22, 2010

Sept. 22, 2010

Module: wine Branch: master Commit: f4df53c41ab04fcc37888c0da6ecb82bfe56d6bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4df53c41ab04fcc37888c0da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 21 21:20:53 2010 +0200 wined3d: Move the primitive type to wined3d_state. --- dlls/wined3d/device.c | 10 +++++----- dlls/wined3d/drawprim.c | 4 ++-- dlls/wined3d/stateblock.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 +--- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c37be12..c7dbe04 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4655,7 +4655,7 @@ static void WINAPI IWineD3DDeviceImpl_SetPrimitiveType(IWineD3DDevice *iface, TRACE("iface %p, primitive_type %s\n", iface, debug_d3dprimitivetype(primitive_type)); This->updateStateBlock->changed.primitive_type = TRUE; - This->updateStateBlock->gl_primitive_type = gl_primitive_type_from_d3d(primitive_type); + This->updateStateBlock->state.gl_primitive_type = gl_primitive_type_from_d3d(primitive_type); } static void WINAPI IWineD3DDeviceImpl_GetPrimitiveType(IWineD3DDevice *iface, @@ -4665,7 +4665,7 @@ static void WINAPI IWineD3DDeviceImpl_GetPrimitiveType(IWineD3DDevice *iface, TRACE("iface %p, primitive_type %p\n", iface, primitive_type); - *primitive_type = d3d_primitive_type_from_gl(This->stateBlock->gl_primitive_type); + *primitive_type = d3d_primitive_type_from_gl(This->stateBlock->state.gl_primitive_type); TRACE("Returning %s\n", debug_d3dprimitivetype(*primitive_type)); } @@ -5513,10 +5513,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawRectPatch(IWineD3DDevice *iface, UI } This->currentPatch = patch; - old_primitive_type = This->stateBlock->gl_primitive_type; - This->stateBlock->gl_primitive_type = GL_TRIANGLES; + old_primitive_type = This->stateBlock->state.gl_primitive_type; + This->stateBlock->state.gl_primitive_type = GL_TRIANGLES; IWineD3DDevice_DrawPrimitiveStrided(iface, patch->numSegs[0] * patch->numSegs[1] * 2 * 3, &patch->strided); - This->stateBlock->gl_primitive_type = old_primitive_type; + This->stateBlock->state.gl_primitive_type = old_primitive_type; This->currentPatch = NULL; /* Destroy uncached patches */ diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 80cbf30..6ff8b32 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -651,7 +651,7 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT StartIdx, UINT || (!glPointParameteri && !context->gl_info->supported[NV_POINT_SPRITE])) && context->render_offscreen && This->stateBlock->state.render_states[WINED3DRS_POINTSPRITEENABLE] - && This->stateBlock->gl_primitive_type == GL_POINTS) + && This->stateBlock->state.gl_primitive_type == GL_POINTS) { FIXME("Point sprite coordinate origin switching not supported.\n"); } @@ -659,7 +659,7 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT StartIdx, UINT /* Ok, we will be updating the screen from here onwards so grab the lock */ ENTER_GL(); { - GLenum glPrimType = This->stateBlock->gl_primitive_type; + GLenum glPrimType = This->stateBlock->state.gl_primitive_type; BOOL emulation = FALSE; const struct wined3d_stream_info *stream_info = &This->strided_streams; struct wined3d_stream_info stridedlcl; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 900836d..82e6081 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -718,7 +718,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) This->state.transforms[transform] = targetStateBlock->state.transforms[transform]; } - if (This->changed.primitive_type) This->gl_primitive_type = targetStateBlock->gl_primitive_type; + if (This->changed.primitive_type) This->state.gl_primitive_type = targetStateBlock->state.gl_primitive_type; if (This->changed.indices && ((This->state.index_buffer != targetStateBlock->state.index_buffer) @@ -995,7 +995,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Apply(IWineD3DStateBlock *iface) if (This->changed.primitive_type) { This->device->updateStateBlock->changed.primitive_type = TRUE; - This->device->updateStateBlock->gl_primitive_type = This->gl_primitive_type; + This->device->updateStateBlock->state.gl_primitive_type = This->state.gl_primitive_type; } if (This->changed.indices) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ee3573d..bc6a1a9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2356,6 +2356,7 @@ struct wined3d_state enum wined3d_format_id index_format; INT base_vertex_index; INT load_base_vertex_index; /* Non-indexed drawing needs 0 here, indexed needs base_vertex_index. */ + GLenum gl_primitive_type; struct IWineD3DVertexShaderImpl *vertex_shader; BOOL vs_consts_b[MAX_CONST_B]; @@ -2394,9 +2395,6 @@ struct IWineD3DStateBlockImpl SAVEDSTATES changed; struct wined3d_state state; - /* primitive type */ - GLenum gl_primitive_type; - /* Light hashmap . Collisions are handled using standard wine double linked lists */ #define LIGHTMAP_SIZE 43 /* Use of a prime number recommended. Set to 1 for a linked list! */ #define LIGHTMAP_HASHFUNC(x) ((x) % LIGHTMAP_SIZE) /* Primitive and simple function */

1 0

Dmitry Timoshkov : user32: Uncomment the GetWindowPlacement() test, fill the test data with real values.
by Alexandre Julliard Sept. 22, 2010

Sept. 22, 2010

Module: wine Branch: master Commit: 6cccf51645e17bd09aacae47bbfe492d9571b74b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cccf51645e17bd09aacae47b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Sep 22 17:50:27 2010 +0900 user32: Uncomment the GetWindowPlacement() test, fill the test data with real values. --- dlls/user32/tests/msg.c | 140 ++++++++++++++++++++++++++--------------------- 1 files changed, 77 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6cccf51645e17bd09aaca…

1 0

Henri Verbeet : wined3d: Move clip plane state to wined3d_state.
by Alexandre Julliard Sept. 22, 2010

Sept. 22, 2010

Module: wine Branch: master Commit: 9ce3c61a4196cf9c00b88f58893d96164959b7c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ce3c61a4196cf9c00b88f588… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 21 21:20:55 2010 +0200 wined3d: Move clip plane state to wined3d_state. --- dlls/wined3d/device.c | 25 +++++++++++++------------ dlls/wined3d/state.c | 10 +++++----- dlls/wined3d/stateblock.c | 14 ++++++++------ dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 27 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 289c2a4..6f4c84a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2808,18 +2808,19 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetClipPlane(IWineD3DDevice *iface, DWO This->updateStateBlock->changed.clipplane |= 1 << Index; - if(This->updateStateBlock->clipplane[Index][0] == pPlane[0] && - This->updateStateBlock->clipplane[Index][1] == pPlane[1] && - This->updateStateBlock->clipplane[Index][2] == pPlane[2] && - This->updateStateBlock->clipplane[Index][3] == pPlane[3]) { + if (This->updateStateBlock->state.clip_planes[Index][0] == pPlane[0] + && This->updateStateBlock->state.clip_planes[Index][1] == pPlane[1] + && This->updateStateBlock->state.clip_planes[Index][2] == pPlane[2] + && This->updateStateBlock->state.clip_planes[Index][3] == pPlane[3]) + { TRACE("Application is setting old values over, nothing to do\n"); return WINED3D_OK; } - This->updateStateBlock->clipplane[Index][0] = pPlane[0]; - This->updateStateBlock->clipplane[Index][1] = pPlane[1]; - This->updateStateBlock->clipplane[Index][2] = pPlane[2]; - This->updateStateBlock->clipplane[Index][3] = pPlane[3]; + This->updateStateBlock->state.clip_planes[Index][0] = pPlane[0]; + This->updateStateBlock->state.clip_planes[Index][1] = pPlane[1]; + This->updateStateBlock->state.clip_planes[Index][2] = pPlane[2]; + This->updateStateBlock->state.clip_planes[Index][3] = pPlane[3]; /* Handle recording of state blocks */ if (This->isRecordingState) { @@ -2843,10 +2844,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetClipPlane(IWineD3DDevice *iface, DWO return WINED3DERR_INVALIDCALL; } - pPlane[0] = (float) This->stateBlock->clipplane[Index][0]; - pPlane[1] = (float) This->stateBlock->clipplane[Index][1]; - pPlane[2] = (float) This->stateBlock->clipplane[Index][2]; - pPlane[3] = (float) This->stateBlock->clipplane[Index][3]; + pPlane[0] = (float)This->stateBlock->state.clip_planes[Index][0]; + pPlane[1] = (float)This->stateBlock->state.clip_planes[Index][1]; + pPlane[2] = (float)This->stateBlock->state.clip_planes[Index][2]; + pPlane[3] = (float)This->stateBlock->state.clip_planes[Index][3]; return WINED3D_OK; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f7072f5..a99833e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3809,11 +3809,11 @@ static void clipplane(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wi } TRACE("Clipplane [%f,%f,%f,%f]\n", - stateblock->clipplane[index][0], - stateblock->clipplane[index][1], - stateblock->clipplane[index][2], - stateblock->clipplane[index][3]); - glClipPlane(GL_CLIP_PLANE0 + index, stateblock->clipplane[index]); + stateblock->state.clip_planes[index][0], + stateblock->state.clip_planes[index][1], + stateblock->state.clip_planes[index][2], + stateblock->state.clip_planes[index][3]); + glClipPlane(GL_CLIP_PLANE0 + index, stateblock->state.clip_planes[index]); checkGLcall("glClipPlane"); glPopMatrix(); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index c8152c8..2834fa5 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -818,10 +818,12 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) { if (!(map & 1)) continue; - if (memcmp(targetStateBlock->clipplane[i], This->clipplane[i], sizeof(*This->clipplane))) + if (memcmp(targetStateBlock->state.clip_planes[i], + This->state.clip_planes[i], sizeof(*This->state.clip_planes))) { TRACE("Updating clipplane %u.\n", i); - memcpy(This->clipplane[i], targetStateBlock->clipplane[i], sizeof(*This->clipplane)); + memcpy(This->state.clip_planes[i], + targetStateBlock->state.clip_planes[i], sizeof(*This->state.clip_planes)); } } @@ -1061,10 +1063,10 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Apply(IWineD3DStateBlock *iface) if (!(map & 1)) continue; - clip[0] = This->clipplane[i][0]; - clip[1] = This->clipplane[i][1]; - clip[2] = This->clipplane[i][2]; - clip[3] = This->clipplane[i][3]; + clip[0] = This->state.clip_planes[i][0]; + clip[1] = This->state.clip_planes[i][1]; + clip[2] = This->state.clip_planes[i][2]; + clip[3] = This->state.clip_planes[i][3]; IWineD3DDevice_SetClipPlane(device, i, clip); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 01c8469..5cb9723 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2374,6 +2374,7 @@ struct wined3d_state DWORD lowest_disabled_stage; WINED3DMATRIX transforms[HIGHEST_TRANSFORMSTATE + 1]; + double clip_planes[MAX_CLIPPLANES][4]; WINED3DMATERIAL material; WINED3DVIEWPORT viewport; RECT scissor_rect; @@ -2402,7 +2403,6 @@ struct IWineD3DStateBlockImpl struct wined3d_state state; /* Clipping */ - double clipplane[MAX_CLIPPLANES][4]; WINED3DCLIPSTATUS clip_status; /* Contained state management */

1 0

Eric Pouech : server: Fix console creation logic.
by Alexandre Julliard Sept. 22, 2010

Sept. 22, 2010

Module: wine Branch: master Commit: 04607ca6320289b64fa7dc7abd67ff5a45141ff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04607ca6320289b64fa7dc7ab… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Sep 21 22:09:06 2010 +0200 server: Fix console creation logic. --- server/console.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/server/console.c b/server/console.c index d256ae8..4441163 100644 --- a/server/console.c +++ b/server/console.c @@ -1386,6 +1386,7 @@ DECL_HANDLER(alloc_console) struct thread *renderer; struct console_input *console; int fd; + int attach = 0; switch (req->pid) { @@ -1398,12 +1399,14 @@ DECL_HANDLER(alloc_console) return; } grab_object( process ); + attach = 1; break; case 0xffffffff: /* no renderer, console to be attached to current process */ renderer = NULL; process = current->process; grab_object( process ); + attach = 1; break; default: /* renderer is current, console to be attached to req->pid */ @@ -1411,7 +1414,7 @@ DECL_HANDLER(alloc_console) if (!(process = get_process_from_id( req->pid ))) return; } - if (process != current->process && process->console) + if (attach && process->console) { set_error( STATUS_ACCESS_DENIED ); goto the_end; @@ -1433,8 +1436,11 @@ DECL_HANDLER(alloc_console) if (!console->evt || (evt = alloc_handle( current->process, console->evt, SYNCHRONIZE|GENERIC_READ|GENERIC_WRITE, 0 ))) { - process->console = (struct console_input*)grab_object( console ); - console->num_proc++; + if (attach) + { + process->console = (struct console_input*)grab_object( console ); + console->num_proc++; + } reply->handle_in = in; reply->event = evt; release_object( console );

1 0

Henri Verbeet : wined3d: Move clip status to wined3d_state.
by Alexandre Julliard Sept. 22, 2010

Sept. 22, 2010

Module: wine Branch: master Commit: f870cf07e8ef7a1d93d37fb1592cd841244a76fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=f870cf07e8ef7a1d93d37fb15… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 21 21:20:56 2010 +0200 wined3d: Move clip status to wined3d_state. --- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/state.c | 15 +++++++++------ dlls/wined3d/stateblock.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 +--- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6f4c84a..89ddb85 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2862,8 +2862,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetClipStatus(IWineD3DDevice *iface, if (!pClipStatus) return WINED3DERR_INVALIDCALL; - This->updateStateBlock->clip_status.ClipUnion = pClipStatus->ClipUnion; - This->updateStateBlock->clip_status.ClipIntersection = pClipStatus->ClipIntersection; + This->updateStateBlock->state.clip_status.ClipUnion = pClipStatus->ClipUnion; + This->updateStateBlock->state.clip_status.ClipIntersection = pClipStatus->ClipIntersection; return WINED3D_OK; } @@ -2874,8 +2874,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetClipStatus(IWineD3DDevice *iface, if (!pClipStatus) return WINED3DERR_INVALIDCALL; - pClipStatus->ClipUnion = This->updateStateBlock->clip_status.ClipUnion; - pClipStatus->ClipIntersection = This->updateStateBlock->clip_status.ClipIntersection; + pClipStatus->ClipUnion = This->updateStateBlock->state.clip_status.ClipUnion; + pClipStatus->ClipIntersection = This->updateStateBlock->state.clip_status.ClipIntersection; return WINED3D_OK; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a99833e..772f5f5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -616,12 +616,15 @@ static void state_clipping(DWORD state, IWineD3DStateBlockImpl *stateblock, stru if (disable & WINED3DCLIPPLANE5) { glDisable(GL_CLIP_PLANE5); checkGLcall("glDisable(clip plane 5)"); } /** update clipping status */ - if (enable) { - stateblock->clip_status.ClipUnion = 0; - stateblock->clip_status.ClipIntersection = 0xFFFFFFFF; - } else { - stateblock->clip_status.ClipUnion = 0; - stateblock->clip_status.ClipIntersection = 0; + if (enable) + { + stateblock->state.clip_status.ClipUnion = 0; + stateblock->state.clip_status.ClipIntersection = 0xFFFFFFFF; + } + else + { + stateblock->state.clip_status.ClipUnion = 0; + stateblock->state.clip_status.ClipIntersection = 0; } } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 2834fa5..2523bcb 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1251,8 +1251,8 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat IWineD3DDevice_SetRenderState(device, WINED3DRS_BLENDOPALPHA, WINED3DBLENDOP_ADD); /* clipping status */ - This->clip_status.ClipUnion = 0; - This->clip_status.ClipIntersection = 0xFFFFFFFF; + This->state.clip_status.ClipUnion = 0; + This->state.clip_status.ClipIntersection = 0xFFFFFFFF; /* Texture Stage States - Put directly into state block, we will call function below */ for (i = 0; i < MAX_TEXTURES; ++i) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5cb9723..337e91f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2375,6 +2375,7 @@ struct wined3d_state WINED3DMATRIX transforms[HIGHEST_TRANSFORMSTATE + 1]; double clip_planes[MAX_CLIPPLANES][4]; + WINED3DCLIPSTATUS clip_status; WINED3DMATERIAL material; WINED3DVIEWPORT viewport; RECT scissor_rect; @@ -2402,9 +2403,6 @@ struct IWineD3DStateBlockImpl SAVEDSTATES changed; struct wined3d_state state; - /* Clipping */ - WINED3DCLIPSTATUS clip_status; - /* Contained state management */ DWORD contained_render_states[WINEHIGHEST_RENDER_STATE + 1]; unsigned int num_contained_render_states;

1 0