wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

Henri Verbeet : wined3d: Move clip status to wined3d_state.
by Alexandre Julliard 22 Sep '10

22 Sep '10

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

Henri Verbeet : wined3d: Move clip plane state to wined3d_state.
by Alexandre Julliard 22 Sep '10

22 Sep '10

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

Henri Verbeet : wined3d: Move light state to wined3d_state.
by Alexandre Julliard 22 Sep '10

22 Sep '10

Module: wine Branch: master Commit: 4546a13d98f03377628ad1370445e51e9e59d437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4546a13d98f03377628ad1370… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 21 21:20:54 2010 +0200 wined3d: Move light state to wined3d_state. --- dlls/wined3d/device.c | 18 +++++++++--------- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/stateblock.c | 24 +++++++++++++----------- dlls/wined3d/wined3d_private.h | 12 ++++++------ 4 files changed, 30 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4546a13d98f03377628ad…

1 0

Henri Verbeet : wined3d: Move the primitive type to wined3d_state.
by Alexandre Julliard 22 Sep '10

22 Sep '10

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

Joerg Schiermeier : Fix intro page layout.
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: bugzilla Branch: master Commit: e55e57cab55fb91d2caf1c3e7f16d1d05b604f1d URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=e55e57cab55fb91d2caf1… Author: Joerg Schiermeier <project(a)Schiermeier-Software.de> Date: Tue Sep 21 02:46:28 2010 +0200 Fix intro page layout. --- skins/custom/index.css | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/skins/custom/index.css b/skins/custom/index.css index 2c40719..2ccc6ce 100644 --- a/skins/custom/index.css +++ b/skins/custom/index.css @@ -7,6 +7,5 @@ } div#login_box { position: relative; - top: 205px; text-align: left; -} \ No newline at end of file +}

1 0

Luca Bennati : taskkill: Add Italian translation.
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: wine Branch: master Commit: 32089dc604ac434eed38b4da26501ae711b6f184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32089dc604ac434eed38b4da2… Author: Luca Bennati <lucak3(a)gmail.com> Date: Tue Sep 21 09:56:08 2010 +0200 taskkill: Add Italian translation. --- programs/taskkill/It.rc | 44 +++++++++++++++++++++++++++++++++++++++++ programs/taskkill/Makefile.in | 3 +- 2 files changed, 46 insertions(+), 1 deletions(-) diff --git a/programs/taskkill/It.rc b/programs/taskkill/It.rc new file mode 100644 index 0000000..05bf2d8 --- /dev/null +++ b/programs/taskkill/It.rc @@ -0,0 +1,44 @@ +/* + * Task termination utility + * Italian language support + * + * Copyright 2010 Luca Bennati + * + * 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_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_USAGE, "Uso: taskkill [/?] [/f] [/im NomeProcesso | /pid IDProcesso]\n" + STRING_INVALID_OPTION, "Errore: opzione specificata dalla riga di comando sconosciuta o non valida.\n" + STRING_INVALID_PARAM, "Errore: parametro specificato dalla riga di comando non valido.\n" + STRING_MISSING_OPTION, "Errore: una delle opzioni /im o /pid deve essere specificata.\n" + STRING_MISSING_PARAM, "Errore: l'opzione %s richiede un parametro dalla riga di comando.\n" + STRING_MUTUAL_EXCLUSIVE, "Errore: le opzioni /im e /pid si escludono mutualmente.\n" + STRING_CLOSE_PID_SEARCH, "Messaggio di chiusura mandato alle finestre top-level del processo con PID %u.\n" + STRING_CLOSE_PROC_SRCH, "Messaggio di chiusura mandato alle finestre top-level del processo \"%s\" con PID %u.\n" + STRING_TERM_PID_SEARCH, "Il processo con PID %u è stato terminato forzatamente.\n" + STRING_TERM_PROC_SEARCH, "Il processo \"%s\" con PID %u è stato terminato forzatamente.\n" + STRING_SEARCH_FAILED, "Errore: processo non trovato \"%s\".\n" + STRING_ENUM_FAILED, "Errore: impossibile elencare la lista dei processi.\n" + STRING_TERMINATE_FAILED, "Errore: impossibile terminare il processo \"%s\".\n" +} diff --git a/programs/taskkill/Makefile.in b/programs/taskkill/Makefile.in index b3bfff3..53667d2 100644 --- a/programs/taskkill/Makefile.in +++ b/programs/taskkill/Makefile.in @@ -6,6 +6,7 @@ IMPORTS = psapi user32 C_SRCS = taskkill.c RC_SRCS = \ - En.rc + En.rc \ + It.rc @MAKE_PROG_RULES@

1 0

Zach Smith : dinput: OSX joystick driver separate device for each top level HID collection.
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: wine Branch: master Commit: fa5f61f59d6cbd0bbcd12ae7ebdc4098729065bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa5f61f59d6cbd0bbcd12ae7e… Author: Zach Smith <IAmSparticle(a)gmail.com> Date: Mon Sep 20 22:25:27 2010 -0400 dinput: OSX joystick driver separate device for each top level HID collection. --- dlls/dinput/joystick_osx.c | 123 ++++++++++++++++++++++++++++++++++++------- 1 files changed, 103 insertions(+), 20 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index bc6908b..fc218d3 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -119,7 +119,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); #ifdef HAVE_IOHIDMANAGERCREATE static IOHIDManagerRef gIOHIDManagerRef = NULL; -static CFArrayRef gDevices = NULL; +static CFArrayRef gCollections = NULL; typedef struct JoystickImpl JoystickImpl; static const IDirectInputDevice8AVtbl JoystickAvt; @@ -194,6 +194,64 @@ static CFMutableDictionaryRef creates_osx_device_match(int usage) return result; } +static CFIndex find_top_level(IOHIDDeviceRef tIOHIDDeviceRef, CFArrayRef topLevels) +{ + CFArrayRef gElementCFArrayRef; + CFIndex numTops = 0; + + if (!tIOHIDDeviceRef) + return 0; + + gElementCFArrayRef = IOHIDDeviceCopyMatchingElements(tIOHIDDeviceRef, NULL, 0); + + if (gElementCFArrayRef) + { + CFIndex idx, cnt = CFArrayGetCount(gElementCFArrayRef); + for (idx=0; idx<cnt; idx++) + { + IOHIDElementRef tIOHIDElementRef = (IOHIDElementRef)CFArrayGetValueAtIndex(gElementCFArrayRef, idx); + int eleType = IOHIDElementGetType(tIOHIDElementRef); + + /* Check for top-level gaming device collections */ + if (eleType == kIOHIDElementTypeCollection && IOHIDElementGetParent(tIOHIDElementRef) == 0) + { + int tUsagePage = IOHIDElementGetUsagePage(tIOHIDElementRef); + int tUsage = IOHIDElementGetUsage(tIOHIDElementRef); + + if (tUsagePage == kHIDPage_GenericDesktop && + (tUsage == kHIDUsage_GD_Joystick || tUsage == kHIDUsage_GD_GamePad)) + { + CFArrayAppendValue((CFMutableArrayRef)topLevels, tIOHIDElementRef); + numTops++; + } + } + } + } + return numTops; +} + +static void get_element_children(IOHIDElementRef tElement, CFArrayRef childElements) +{ + CFIndex idx, cnt; + CFArrayRef tElementChildrenArray = IOHIDElementGetChildren(tElement); + + cnt = CFArrayGetCount(tElementChildrenArray); + if (cnt < 1) + return; + + /* Either add the element to the array or grab its children */ + for (idx=0; idx<cnt; idx++) + { + IOHIDElementRef tChildElementRef; + + tChildElementRef = (IOHIDElementRef)CFArrayGetValueAtIndex(tElementChildrenArray, idx); + if (IOHIDElementGetType(tChildElementRef) == kIOHIDElementTypeCollection) + get_element_children(tChildElementRef, childElements); + else + CFArrayAppendValue((CFMutableArrayRef)childElements, tChildElementRef); + } +} + static int find_osx_devices(void) { IOReturn tIOReturn; @@ -213,14 +271,14 @@ static int find_osx_devices(void) &kCFTypeArrayCallBacks ); /* build matching dictionary */ - result = creates_osx_device_match(kHIDPage_Sport); + result = creates_osx_device_match(kHIDUsage_GD_Joystick); if (!result) { CFRelease(matching); return 0; } CFArrayAppendValue( ( CFMutableArrayRef )matching, result ); - result = creates_osx_device_match(kHIDPage_Game); + result = creates_osx_device_match(kHIDUsage_GD_GamePad); if (!result) { CFRelease(matching); @@ -232,17 +290,31 @@ static int find_osx_devices(void) devset = IOHIDManagerCopyDevices( gIOHIDManagerRef ); if (devset) { - CFIndex count; - gDevices = CFArrayCreateMutable( kCFAllocatorDefault, 0, - &kCFTypeArrayCallBacks ); + CFIndex countDevices, countCollections, idx; + CFArrayRef gDevices = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); CFSetApplyFunction(devset, CFSetApplierFunctionCopyToCFArray, (void*)gDevices); - count = CFArrayGetCount( gDevices); CFRelease( devset); - count = CFArrayGetCount( gDevices); + countDevices = CFArrayGetCount(gDevices); - TRACE("found %i device(s)\n",(int)count); - return count; + gCollections = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); + if (!gCollections) + return 0; + countCollections = 0; + for (idx = 0; idx < countDevices; idx++) + { + CFIndex tTop; + IOHIDDeviceRef tDevice; + + tDevice = (IOHIDDeviceRef) CFArrayGetValueAtIndex(gDevices, idx); + tTop = find_top_level(tDevice, gCollections); + countCollections += tTop; + } + + CFRelease(gDevices); + + TRACE("found %i device(s), %i collection(s)\n",(int)countDevices,(int)countCollections); + return (int)countCollections; } return 0; } @@ -250,12 +322,21 @@ static int find_osx_devices(void) static int get_osx_device_name(int id, char *name, int length) { CFStringRef str; + IOHIDElementRef tIOHIDElementRef; IOHIDDeviceRef tIOHIDDeviceRef; - if (!gDevices) + if (!gCollections) + return 0; + + tIOHIDElementRef = (IOHIDElementRef)CFArrayGetValueAtIndex(gCollections, id); + + if (!tIOHIDElementRef) + { + ERR("Invalid Element requested %i\n",id); return 0; + } - tIOHIDDeviceRef = ( IOHIDDeviceRef ) CFArrayGetValueAtIndex( gDevices, id ); + tIOHIDDeviceRef = IOHIDElementGetDevice(tIOHIDElementRef); if (name) name[0] = 0; @@ -304,7 +385,7 @@ static void insert_sort_button(int header, IOHIDElementRef tIOHIDElementRef, static void get_osx_device_elements(JoystickImpl *device, int axis_map[8]) { - IOHIDDeviceRef tIOHIDDeviceRef; + IOHIDElementRef tIOHIDElementRef; CFArrayRef gElementCFArrayRef; DWORD axes = 0; DWORD sliders = 0; @@ -313,16 +394,16 @@ static void get_osx_device_elements(JoystickImpl *device, int axis_map[8]) device->elementCFArrayRef = NULL; - if (!gDevices) + if (!gCollections) return; - tIOHIDDeviceRef = ( IOHIDDeviceRef ) CFArrayGetValueAtIndex( gDevices, device->id ); + tIOHIDElementRef = (IOHIDElementRef)CFArrayGetValueAtIndex(gCollections, device->id); - if (!tIOHIDDeviceRef) + if (!tIOHIDElementRef) return; - gElementCFArrayRef = IOHIDDeviceCopyMatchingElements( tIOHIDDeviceRef, - NULL, 0 ); + gElementCFArrayRef = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); + get_element_children(tIOHIDElementRef, gElementCFArrayRef); if (gElementCFArrayRef) { @@ -439,15 +520,17 @@ static void get_osx_device_elements_props(JoystickImpl *device) static void poll_osx_device_state(JoystickGenericImpl *device_in) { JoystickImpl *device = (JoystickImpl*)device_in; + IOHIDElementRef tIOHIDTopElementRef; IOHIDDeviceRef tIOHIDDeviceRef; CFArrayRef gElementCFArrayRef = device->elementCFArrayRef; TRACE("polling device %i\n",device->id); - if (!gDevices) + if (!gCollections) return; - tIOHIDDeviceRef = ( IOHIDDeviceRef ) CFArrayGetValueAtIndex( gDevices, device->id ); + tIOHIDTopElementRef = (IOHIDElementRef) CFArrayGetValueAtIndex(gCollections, device->id); + tIOHIDDeviceRef = IOHIDElementGetDevice(tIOHIDTopElementRef); if (!tIOHIDDeviceRef) return;

1 0

Misha Koshelev : d3dx9_36: Implement D3DXCreateMesh and initial ID3DXMesh methods.
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: wine Branch: master Commit: af0c074d7bbf3cf27cf8dffe1e9007ff3c23d256 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af0c074d7bbf3cf27cf8dffe1… Author: Misha Koshelev <misha680(a)gmail.com> Date: Thu Sep 16 17:02:48 2010 -0500 d3dx9_36: Implement D3DXCreateMesh and initial ID3DXMesh methods. --- dlls/d3dx9_36/d3dx9_36_private.h | 18 ++ dlls/d3dx9_36/mesh.c | 433 +++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/tests/mesh.c | 151 +++++++++++--- 3 files changed, 567 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af0c074d7bbf3cf27cf8d…

1 0

Igor Paliychuk : shell32: Ukrainian translation update.
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: wine Branch: master Commit: 2b94a71d23123016a02bdfed0a197cf8790f943f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b94a71d23123016a02bdfed0… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Tue Sep 21 16:21:49 2010 +0300 shell32: Ukrainian translation update. --- dlls/shell32/shell32_Uk.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_Uk.rc b/dlls/shell32/shell32_Uk.rc index b79e746..e7bc179 100644 --- a/dlls/shell32/shell32_Uk.rc +++ b/dlls/shell32/shell32_Uk.rc @@ -303,6 +303,7 @@ STRINGTABLE IDS_COMMON_OEM_LINKS "OEM ��" IDS_DOCUMENTS "��" IDS_DOWNLOADS "��" + IDS_LOCAL_APPDATA_LOW "AppData\\LocalLow" IDS_NEWFOLDER "�� "

1 0

Igor Paliychuk : inetcpl: Added Ukrainian translation.
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: wine Branch: master Commit: d61b73b0b655e06d22b8dfcff873eec752e19400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d61b73b0b655e06d22b8dfcff… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Tue Sep 21 16:21:01 2010 +0300 inetcpl: Added Ukrainian translation. --- dlls/inetcpl.cpl/Makefile.in | 1 + dlls/inetcpl.cpl/cpl_Uk.rc | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index 4c32225..c8a7543 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -16,6 +16,7 @@ RC_SRCS = \ cpl_Pl.rc \ cpl_Si.rc \ cpl_Sv.rc \ + cpl_Uk.rc \ inetcpl.rc SVG_SRCS = \ diff --git a/dlls/inetcpl.cpl/cpl_Uk.rc b/dlls/inetcpl.cpl/cpl_Uk.rc new file mode 100644 index 0000000..e9bc576 --- /dev/null +++ b/dlls/inetcpl.cpl/cpl_Uk.rc @@ -0,0 +1,34 @@ +/* + * Internet control panel applet + * + * Copyright 2010 Detlef Riekenberg + * Copyright 2010 Igor Paliychuk + * + * 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 "inetcpl.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPL_NAME "Налаштування Інтернету" + IDS_CPL_INFO "Налаштувати Wine Internet Browser та пов'язані параметри" +END

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2010