October 2010 - Wine-Commits

Paul Vriens : wldap32: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: 3d3ab1cb54a1d1e9639c9573f783d07138ef0046 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d3ab1cb54a1d1e9639c9573f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Oct 26 10:42:10 2010 +0200 wldap32: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/wldap32/Makefile.in | 1 + dlls/wldap32/wldap32_Sr.rc | 232 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 233 insertions(+), 0 deletions(-) diff --git a/dlls/wldap32/Makefile.in b/dlls/wldap32/Makefile.in index 8c9b351..232e80c 100644 --- a/dlls/wldap32/Makefile.in +++ b/dlls/wldap32/Makefile.in @@ -41,6 +41,7 @@ RC_SRCS = \ wldap32_Pt.rc \ wldap32_Ro.rc \ wldap32_Ru.rc \ + wldap32_Sr.rc \ wldap32_Sv.rc \ wldap32_Tr.rc \ wldap32_Uk.rc diff --git a/dlls/wldap32/wldap32_Sr.rc b/dlls/wldap32/wldap32_Sr.rc new file mode 100644 index 0000000..bc7de4b --- /dev/null +++ b/dlls/wldap32/wldap32_Sr.rc @@ -0,0 +1,232 @@ +/* + * Serbian resources for WLDAP32 + * + * Copyright 2005 Hans Leidekker + * Copyright 2010 Đorđe Vasiljević + * + * 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 "windef.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +STRINGTABLE +{ + 0 "Успех" + 1 "Грешка у радњама" + 2 "Грешка у протоколу" + 3 "Временско ограничење је прекорачено" + 4 "Ограничење величине је прекорачено" + 5 "Нетачно" + 6 "Тачно" + 7 "Начин потврде идентитета није подржан" + 8 "Потребна је јака потврда идентитета" + 9 "Упућивач (v2)" + 10 "Упућивач" + 11 "Административно ограничење је прекорачено" + 12 "Недоступно је критичко проширење" + 13 "Потребна је поверљивост" + 14 "" + 15 "" + 16 "Не постоји таква особина" + 17 "Неодређена врста" + 18 "Неприкладно подударање" + 19 "Ограничење кршења" + 20 "Особина или вредност постоји" + 21 "Неисправна синтакса" + 22 "" + 23 "" + 24 "" + 25 "" + 26 "" + 27 "" + 28 "" + 29 "" + 30 "" + 31 "" + 32 "Не постоји такав објекат" + 33 "Проблем у псеудониму" + 34 "Неисправна DN синтакса" + 35 "је лист" + 36 "Проблем у деференцирању псеудонима" + 37 "" + 38 "" + 39 "" + 40 "" + 41 "" + 42 "" + 43 "" + 44 "" + 45 "" + 46 "" + 47 "" + 48 "Неприкладна потврда идентитета" + 49 "Неисправни акредитиви" + 50 "Недовољна права" + 51 "Заузето" + 52 "Недоступно" + 53 "Невољно за извршавање" + 54 "Пронађена је петља" + 55 "" + 56 "" + 57 "" + 58 "" + 59 "" + 60 "Поређај недостајуће контроле" + 61 "Грешка у опсегу пописа" + 62 "" + 63 "" + 64 "Кршење именовања" + 65 "Кршење класе објеката" + 66 "Није дозвољено на не-листу" + 67 "Није дозвољено на RDN-у" + 68 "Већ постоји" + 69 "Неме класе објеката" + 70 "Резултати су превелики" + 71 "Утиче на вишеструке алгоритме" + 72 "" + 73 "" + 74 "" + 75 "" + 76 "" + 77 "" + 78 "" + 79 "" + 80 "Остало" + 81 "Сервер тренутно не ради" + 82 "Локална грешка" + 83 "Грешка у кодирању" + 84 "Грешка у декодирању" + 85 "Време истека" + 86 "Непознат идентитет" + 87 "Грешка у филтеру" + 88 "Корисник је отказан" + 89 "Грешка у параметру" + 90 "Нема меморије" + 91 "Повезивање на LDAP сервер није успело" + 92 "Радња није подржана од стране овог издања LDAP протокола" + 93 "Наведена контрола није пронађена у поруци" + 94 "Нема резултата у поруци" + 95 "Више резултата" + 96 "Понављај при руковању с упућивачима" + 97 "Ограничење чвора упућивача је прекорачено" +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +STRINGTABLE +{ + 0 "Uspeh" + 1 "Greška u radnjama" + 2 "Greška u protokolu" + 3 "Vremensko ograničenje je prekoračeno" + 4 "Ograničenje veličine je prekoračeno" + 5 "Netačno" + 6 "Tačno" + 7 "Način potvrde identiteta nije podržan" + 8 "Potrebna je jaka potvrda identiteta" + 9 "Upućivač (v2)" + 10 "Upućivač" + 11 "Administrativno ograničenje je prekoračeno" + 12 "Nedostupno je kritičko proširenje" + 13 "Potrebna je poverljivost" + 14 "" + 15 "" + 16 "Ne postoji takva osobina" + 17 "Neodređena vrsta" + 18 "Neprikladno podudaranje" + 19 "Ograničenje kršenja" + 20 "Osobina ili vrednost postoji" + 21 "Neispravna sintaksa" + 22 "" + 23 "" + 24 "" + 25 "" + 26 "" + 27 "" + 28 "" + 29 "" + 30 "" + 31 "" + 32 "Ne postoji takav objekat" + 33 "Problem u pseudonimu" + 34 "Neispravna DN sintaksa" + 35 "je list" + 36 "Problem u deferenciranju pseudonima" + 37 "" + 38 "" + 39 "" + 40 "" + 41 "" + 42 "" + 43 "" + 44 "" + 45 "" + 46 "" + 47 "" + 48 "Neprikladna potvrda identiteta" + 49 "Neispravni akreditivi" + 50 "Nedovoljna prava" + 51 "Zauzeto" + 52 "Nedostupno" + 53 "Nevoljno za izvršavanje" + 54 "Pronađena je petlja" + 55 "" + 56 "" + 57 "" + 58 "" + 59 "" + 60 "Poređaj nedostajuće kontrole" + 61 "Greška u opsegu popisa" + 62 "" + 63 "" + 64 "Kršenje imenovanja" + 65 "Kršenje klase objekata" + 66 "Nije dozvoljeno na ne-listu" + 67 "Nije dozvoljeno na RDN-u" + 68 "Već postoji" + 69 "Neme klase objekata" + 70 "Rezultati su preveliki" + 71 "Utiče na višestruke algoritme" + 72 "" + 73 "" + 74 "" + 75 "" + 76 "" + 77 "" + 78 "" + 79 "" + 80 "Ostalo" + 81 "Server trenutno ne radi" + 82 "Lokalna greška" + 83 "Greška u kodiranju" + 84 "Greška u dekodiranju" + 85 "Vreme isteka" + 86 "Nepoznat identitet" + 87 "Greška u filteru" + 88 "Korisnik je otkazan" + 89 "Greška u parametru" + 90 "Nema memorije" + 91 "Povezivanje na LDAP server nije uspelo" + 92 "Radnja nije podržana od strane ovog izdanja LDAP protokola" + 93 "Navedena kontrola nije pronađena u poruci" + 94 "Nema rezultata u poruci" + 95 "Više rezultata" + 96 "Ponavljaj pri rukovanju s upućivačima" + 97 "Ograničenje čvora upućivača je prekoračeno" +}

1 0

Henri Verbeet : wined3d: Get rid of the posFixup field from the device.
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: 1b2f9d29d738d47f4515abe4dd5ae7d5d866816e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b2f9d29d738d47f4515abe4d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 26 09:11:05 2010 +0200 wined3d: Get rid of the posFixup field from the device. --- dlls/wined3d/arb_program_shader.c | 20 ++++++++++---------- dlls/wined3d/device.c | 1 - dlls/wined3d/glsl_shader.c | 4 +++- dlls/wined3d/state.c | 22 ++-------------------- dlls/wined3d/wined3d_private.h | 18 +++++++++++++++--- 5 files changed, 30 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index dac1f4a..a76373b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -590,29 +590,29 @@ static inline void shader_arb_ps_local_constants(IWineD3DDeviceImpl* deviceImpl) } /* GL locking is done by the caller. */ -static inline void shader_arb_vs_local_constants(IWineD3DDeviceImpl* deviceImpl) +static void shader_arb_vs_local_constants(const struct wined3d_context *context, IWineD3DDeviceImpl *deviceImpl) { - IWineD3DStateBlockImpl* stateBlock; const struct wined3d_gl_info *gl_info = &deviceImpl->adapter->gl_info; + const struct wined3d_state *state = &deviceImpl->stateBlock->state; unsigned char i; struct shader_arb_priv *priv = deviceImpl->shader_priv; const struct arb_vs_compiled_shader *gl_shader = priv->compiled_vprog; + float position_fixup[4]; /* Upload the position fixup */ - GL_EXTCALL(glProgramLocalParameter4fvARB(GL_VERTEX_PROGRAM_ARB, gl_shader->pos_fixup, deviceImpl->posFixup)); + shader_get_position_fixup(context, state, position_fixup); + GL_EXTCALL(glProgramLocalParameter4fvARB(GL_VERTEX_PROGRAM_ARB, gl_shader->pos_fixup, position_fixup)); if (!gl_shader->num_int_consts) return; - stateBlock = deviceImpl->stateBlock; - for(i = 0; i < MAX_CONST_I; i++) { if(gl_shader->int_consts[i] != WINED3D_CONST_NUM_UNUSED) { float val[4]; - val[0] = (float)stateBlock->state.vs_consts_i[4 * i]; - val[1] = (float)stateBlock->state.vs_consts_i[4 * i + 1]; - val[2] = (float)stateBlock->state.vs_consts_i[4 * i + 2]; + val[0] = (float)state->vs_consts_i[4 * i]; + val[1] = (float)state->vs_consts_i[4 * i + 1]; + val[2] = (float)state->vs_consts_i[4 * i + 2]; val[3] = -1.0f; GL_EXTCALL(glProgramLocalParameter4fvARB(GL_VERTEX_PROGRAM_ARB, gl_shader->int_consts[i], val)); @@ -641,7 +641,7 @@ static void shader_arb_load_constants(const struct wined3d_context *context, cha /* Load DirectX 9 float constants for vertex shader */ device->highest_dirty_vs_const = shader_arb_load_constantsF(vshader, gl_info, GL_VERTEX_PROGRAM_ARB, device->highest_dirty_vs_const, stateBlock->state.vs_consts_f, context->vshader_const_dirty); - shader_arb_vs_local_constants(device); + shader_arb_vs_local_constants(context, device); } if (usePixelShader) @@ -4601,7 +4601,7 @@ static void shader_arb_select(const struct wined3d_context *context, BOOL usePS, glEnable(GL_VERTEX_PROGRAM_ARB); checkGLcall("glEnable(GL_VERTEX_PROGRAM_ARB);"); TRACE("(%p) : Bound vertex program %u and enabled GL_VERTEX_PROGRAM_ARB\n", This, priv->current_vprogram_id); - shader_arb_vs_local_constants(This); + shader_arb_vs_local_constants(context, This); if(priv->last_vs_color_unclamp != compiled->need_color_unclamp) { priv->last_vs_color_unclamp = compiled->need_color_unclamp; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 34d53c0..1416e59 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6827,7 +6827,6 @@ HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d, list_init(&device->shaders); device->surface_alignment = wined3d->dxVersion == 7 ? DDRAW_PITCH_ALIGNMENT : D3D8_PITCH_ALIGNMENT; - device->posFixup[0] = 1.0f; /* This is needed to get the x coord unmodified through a MAD. */ /* Get the initial screen setup for ddraw. */ hr = IWineD3D_GetAdapterDisplayMode((IWineD3D *)wined3d, adapter_idx, &mode); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f24f309..56920ff 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -733,6 +733,7 @@ static void shader_glsl_load_constants(const struct wined3d_context *context, IWineD3DDeviceImpl *device = context->swapchain->device; IWineD3DStateBlockImpl* stateBlock = device->stateBlock; struct shader_glsl_priv *priv = device->shader_priv; + float position_fixup[4]; GLhandleARB programId; struct glsl_shader_prog_link *prog = priv->glsl_program; @@ -763,7 +764,8 @@ static void shader_glsl_load_constants(const struct wined3d_context *context, stateBlock->changed.vertexShaderConstantsB & vshader->baseShader.reg_maps.boolean_constants); /* Upload the position fixup params */ - GL_EXTCALL(glUniform4fvARB(prog->posFixup_location, 1, &device->posFixup[0])); + shader_get_position_fixup(context, &stateBlock->state, position_fixup); + GL_EXTCALL(glUniform4fvARB(prog->posFixup_location, 1, position_fixup)); checkGLcall("glUniform4fvARB"); } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 52fc819..44c1081 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4644,20 +4644,6 @@ static void vertexdeclaration(DWORD state_id, IWineD3DStateBlockImpl *stateblock context->last_was_rhw = FALSE; /* This turns off the Z scale trick to 'disable' viewport frustum clipping in rhw mode*/ device->untransformed = TRUE; - - /* Todo for sw shaders: Vertex Shader output is already transformed, so set up identity matrices - * Not needed as long as only hw shaders are supported - */ - - /* This sets the shader output position correction constants. - * TODO: Move to the viewport state - */ - if (useVertexShaderFunction) - { - GLfloat yoffset = -(63.0f / 64.0f) / stateblock->state.viewport.Height; - device->posFixup[1] = context->render_offscreen ? -1.0f : 1.0f; - device->posFixup[3] = device->posFixup[1] * yoffset; - } } /* Don't have to apply the matrices when vertex shaders are used. When vshaders are turned @@ -4803,19 +4789,15 @@ static void viewport_miscpart(DWORD state, IWineD3DStateBlockImpl *stateblock, s checkGLcall("glViewport"); } -static void viewport_vertexpart(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) +static void viewport_vertexpart(DWORD state_id, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { - GLfloat yoffset = -(63.0f / 64.0f) / stateblock->state.viewport.Height; - - stateblock->device->posFixup[2] = (63.0f / 64.0f) / stateblock->state.viewport.Width; - stateblock->device->posFixup[3] = stateblock->device->posFixup[1] * yoffset; - if(!isStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION))) { transform_projection(STATE_TRANSFORM(WINED3DTS_PROJECTION), stateblock, context); } if(!isStateDirty(context, STATE_RENDER(WINED3DRS_POINTSCALEENABLE))) { state_pscale(STATE_RENDER(WINED3DRS_POINTSCALEENABLE), stateblock, context); } + /* Update the position fixup. */ if (!isStateDirty(context, STATE_VERTEXSHADERCONSTANT)) shaderconstant(STATE_VERTEXSHADERCONSTANT, stateblock, context); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2d791ce..f1d8c35 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1722,9 +1722,6 @@ struct IWineD3DDeviceImpl DWORD ddraw_width, ddraw_height; enum wined3d_format_id ddraw_format; - /* Final position fixup constant */ - float posFixup[4]; - /* With register combiners we can skip junk texture stages */ DWORD texUnitMap[MAX_COMBINED_SAMPLERS]; DWORD rev_tex_unit_map[MAX_COMBINED_SAMPLERS]; @@ -2841,6 +2838,21 @@ static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg) } } +static inline void shader_get_position_fixup(const struct wined3d_context *context, + const struct wined3d_state *state, float *position_fixup) +{ + position_fixup[0] = 1.0f; + position_fixup[1] = 1.0f; + position_fixup[2] = (63.0f / 64.0f) / state->viewport.Width; + position_fixup[3] = -(63.0f / 64.0f) / state->viewport.Height; + + if (context->render_offscreen) + { + position_fixup[1] *= -1.0f; + position_fixup[3] *= -1.0f; + } +} + static inline BOOL shader_constant_is_local(IWineD3DBaseShaderImpl* This, DWORD reg) { local_constant* lconst;

1 0

Detlef Riekenberg : advapi32: Add a stub for EventEnabled.
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: 5726ba643993a4f8d2a7a1f3c575a4ae994e062c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5726ba643993a4f8d2a7a1f3c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Oct 26 00:17:54 2010 +0200 advapi32: Add a stub for EventEnabled. --- dlls/advapi32/advapi32.spec | 1 + dlls/advapi32/eventlog.c | 10 ++++++++++ include/evntprov.h | 18 ++++++++++++++++++ 3 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 0e27e74..9bf6eae 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -217,6 +217,7 @@ # @ stub EqualDomainSid @ stdcall EqualPrefixSid(ptr ptr) @ stdcall EqualSid(ptr ptr) +@ stdcall EventEnabled(int64 ptr) @ stdcall EventRegister(ptr ptr ptr ptr) @ stdcall FileEncryptionStatusA(str ptr) @ stdcall FileEncryptionStatusW(wstr ptr) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 26be42e..1428588 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -819,6 +819,16 @@ ULONG WINAPI EventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID co } /****************************************************************************** + * EventEnabled [ADVAPI32.@] + * + */ +BOOLEAN WINAPI EventEnabled( REGHANDLE handle, PCEVENT_DESCRIPTOR descriptor ) +{ + FIXME("(%s, %p): stub\n", wine_dbgstr_longlong(handle), descriptor); + return FALSE; +} + +/****************************************************************************** * QueryTraceW [ADVAPI32.@] */ ULONG WINAPI QueryTraceW( TRACEHANDLE handle, LPCWSTR sessionname, PEVENT_TRACE_PROPERTIES properties ) diff --git a/include/evntprov.h b/include/evntprov.h index 4bb3d14..34262fe 100644 --- a/include/evntprov.h +++ b/include/evntprov.h @@ -23,8 +23,25 @@ extern "C" { #endif +#define EVENT_LEVEL_MIN 0x00 +#define EVENT_LEVEL_MAX 0xff + typedef ULONGLONG REGHANDLE, *PREGHANDLE; +typedef struct _EVENT_DESCRIPTOR +{ + USHORT Id; + UCHAR Version; + UCHAR Channel; + UCHAR Level; + UCHAR Opcode; + USHORT Task; + ULONGLONG Keyword; +} EVENT_DESCRIPTOR; + +typedef EVENT_DESCRIPTOR *PEVENT_DESCRIPTOR; +typedef const EVENT_DESCRIPTOR *PCEVENT_DESCRIPTOR; + typedef struct _EVENT_FILTER_DESCRIPTOR { ULONGLONG Ptr; @@ -35,6 +52,7 @@ typedef struct _EVENT_FILTER_DESCRIPTOR typedef VOID (NTAPI *PENABLECALLBACK)(LPCGUID,ULONG,UCHAR,ULONGLONG,ULONGLONG,PEVENT_FILTER_DESCRIPTOR,PVOID); +BOOLEAN WINAPI EventEnabled(REGHANDLE, PCEVENT_DESCRIPTOR); ULONG WINAPI EventRegister(LPCGUID,PENABLECALLBACK,PVOID,PREGHANDLE); ULONG WINAPI EventUnregister(REGHANDLE);

1 0

Michael Stefaniuc : ddraw: Add missing unlock (Smatch).
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: 1fe54842e02fba6f14c3ea28fab3570939c754d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fe54842e02fba6f14c3ea28f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 25 23:50:37 2010 +0200 ddraw: Add missing unlock (Smatch). --- dlls/ddraw/ddraw.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 1f88fa5..fd87071 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -623,6 +623,7 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, This->devicewindow = NULL; } + LeaveCriticalSection(&ddraw_cs); return DD_OK; } /* DDSCL_NORMAL or DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE */

1 0

Michael Stefaniuc : msxml3: Remove returns after returns (Smatch).
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: 63bf86357e62d738656c8cde4ab616c104484190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63bf86357e62d738656c8cde4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 25 23:50:45 2010 +0200 msxml3: Remove returns after returns (Smatch). That's the intent of commit 70edd9a7. --- dlls/msxml3/domdoc.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 2da243b..12710a8 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1206,7 +1206,6 @@ static HRESULT WINAPI domdoc_get_definition( domdoc *This = impl_from_IXMLDOMDocument3( iface ); FIXME("(%p)->(%p)\n", This, definitionNode); return E_NOTIMPL; - return IXMLDOMNode_get_definition( IXMLDOMNode_from_impl(&This->node), definitionNode ); } @@ -1293,7 +1292,6 @@ static HRESULT WINAPI domdoc_get_parsed( FIXME("(%p)->(%p) stub!\n", This, isParsed); *isParsed = VARIANT_TRUE; return S_OK; - return IXMLDOMNode_get_parsed( IXMLDOMNode_from_impl(&This->node), isParsed ); }

1 0

Michael Stefaniuc : msxml3/tests: Remove superfluous NULL check before free (Smatch).
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: 6f0c968a7b589eddb422694824a29c9b2a0b349f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f0c968a7b589eddb42269482… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 25 23:50:13 2010 +0200 msxml3/tests: Remove superfluous NULL check before free (Smatch). --- dlls/msxml3/tests/schema.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 9b3a6eb..2ca657a 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -618,7 +618,7 @@ static void test_collection_content(void) bstr = NULL; /* error if index is out of range */ ole_expect(IXMLDOMSchemaCollection_get_namespaceURI(cache1, 3, &bstr), E_FAIL); - if (bstr) SysFreeString(bstr); + SysFreeString(bstr); /* error if return pointer is NULL */ ole_expect(IXMLDOMSchemaCollection_get_namespaceURI(cache1, 0, NULL), E_POINTER); /* pointer is checked first */

1 0

Michael Stefaniuc : mscms: Don't produce unreachable code with #ifdef ( Smatch).
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: 038fbe23cc2395ca21eb9da6a100a6cf7e2c4ee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=038fbe23cc2395ca21eb9da6a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 25 23:50:04 2010 +0200 mscms: Don't produce unreachable code with #ifdef (Smatch). --- dlls/mscms/transform.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 48043a1..801ef4d 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -455,6 +455,7 @@ done: release_transform( transform ); return ret; -#endif /* HAVE_LCMS */ +#else /* HAVE_LCMS */ return FALSE; +#endif /* HAVE_LCMS */ }

1 0

Rico Schüller : include: Move D3D_REGISTER_COMPONENT_TYPE to d3dcommon.h.
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: 2bfc3c70f7f60b21542bc22f1fcc178a9975f295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bfc3c70f7f60b21542bc22f1… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Oct 25 20:30:42 2010 +0200 include: Move D3D_REGISTER_COMPONENT_TYPE to d3dcommon.h. --- include/d3d10shader.h | 10 ++-------- include/d3dcommon.idl | 12 ++++++++++++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/include/d3d10shader.h b/include/d3d10shader.h index 658db02..d8a9c5f 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -102,14 +102,6 @@ typedef enum D3D10_NAME D3D10_NAME_DEPTH = 65, } D3D10_NAME; -typedef enum D3D10_REGISTER_COMPONENT_TYPE -{ - D3D10_REGISTER_COMPONENT_UNKNOWN = 0, - D3D10_REGISTER_COMPONENT_UINT32 = 1, - D3D10_REGISTER_COMPONENT_SINT32 = 2, - D3D10_REGISTER_COMPONENT_FLOAT32 = 3, -} D3D10_REGISTER_COMPONENT_TYPE; - /* These are defined as version-neutral in d3dcommon.h */ typedef D3D_SHADER_MACRO D3D10_SHADER_MACRO; typedef D3D_SHADER_MACRO *LPD3D10_SHADER_MACRO; @@ -120,6 +112,8 @@ typedef D3D_SHADER_VARIABLE_CLASS *LPD3D10_SHADER_VARIABLE_CLASS; typedef D3D_CBUFFER_TYPE D3D10_CBUFFER_TYPE; typedef D3D_CBUFFER_TYPE *LPD3D10_CBUFFER_TYPE; +typedef D3D_REGISTER_COMPONENT_TYPE D3D10_REGISTER_COMPONENT_TYPE; + typedef D3D_INCLUDE_TYPE D3D10_INCLUDE_TYPE; typedef ID3DInclude ID3D10Include; typedef ID3DInclude *LPD3D10INCLUDE; diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index b68eb36..d343120 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -151,3 +151,15 @@ typedef enum D3D_SRV_DIMENSION D3D11_SRV_DIMENSION_TEXTURECUBEARRAY, D3D11_SRV_DIMENSION_BUFFEREX, } D3D_SRV_DIMENSION; + +typedef enum D3D_REGISTER_COMPONENT_TYPE +{ + D3D_REGISTER_COMPONENT_UNKNOWN, + D3D_REGISTER_COMPONENT_UINT32, + D3D_REGISTER_COMPONENT_SINT32, + D3D_REGISTER_COMPONENT_FLOAT32, + D3D10_REGISTER_COMPONENT_UNKNOWN = 0, + D3D10_REGISTER_COMPONENT_UINT32, + D3D10_REGISTER_COMPONENT_SINT32, + D3D10_REGISTER_COMPONENT_FLOAT32, +} D3D_REGISTER_COMPONENT_TYPE;

1 0

André Hentschel : winedump: Add ARM Thumb detection.
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: 38d7119d1851ca2c7359add78451cba89d3b8627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38d7119d1851ca2c7359add78… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 25 22:55:38 2010 +0200 winedump: Add ARM Thumb detection. --- tools/winedump/pe.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index a2b1fe5..63001ed 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -62,6 +62,7 @@ const char *get_machine_str(int mach) case IMAGE_FILE_MACHINE_AMD64: return "AMD64"; case IMAGE_FILE_MACHINE_IA64: return "IA64"; case IMAGE_FILE_MACHINE_ARM: return "ARM"; + case IMAGE_FILE_MACHINE_THUMB: return "ARM Thumb"; case IMAGE_FILE_MACHINE_SPARC: return "SPARC"; } return "???";

1 0

Łukasz Wojniłowicz : inetcpl: Update the Polish translation.
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: eaeef7156ac1e5bd68211f0a485f049a7952573e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaeef7156ac1e5bd68211f0a4… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Mon Oct 25 18:11:39 2010 +0200 inetcpl: Update the Polish translation. --- dlls/inetcpl.cpl/cpl_Pl.rc | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Pl.rc b/dlls/inetcpl.cpl/cpl_Pl.rc index 11b940a..8415063 100644 --- a/dlls/inetcpl.cpl/cpl_Pl.rc +++ b/dlls/inetcpl.cpl/cpl_Pl.rc @@ -25,6 +25,38 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN - IDS_CPL_NAME "Ustawienia Internetu" + IDS_CPL_NAME "Ustawienia internetowe" IDS_CPL_INFO "Pozwala skonfigurowa� przegl�dark� internetow� Wine i odpowiadaj�ce jej ustawienia" END + +/* "General" propsheet */ +IDD_GENERAL DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Og�lne" +BEGIN + + GROUPBOX " Strona domowa ", IDC_STATIC, 4, 4, 312, 52 + LTEXT "Mo�esz wybra� adres strony, kt�ra b�dzie twoj� stron� domow�.", + IDC_STATIC, 58, 10, 252, 10 + EDITTEXT IDC_HOME_EDIT, 58, 22, 252, 12, WS_VISIBLE | ES_AUTOHSCROLL + PUSHBUTTON "U�yj &bie��cej", IDC_HOME_CURRENT, 58, 36, 80, 14 + PUSHBUTTON "U�yj d&omy�lnej", IDC_HOME_DEFAULT, 144, 36, 80, 14 + PUSHBUTTON "U�yj pu&stej", IDC_HOME_BLANK, 230, 36, 80, 14 + +END + +/* "Content" propsheet */ +IDD_CONTENT DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Zawarto��" +BEGIN + + GROUPBOX " Certyfikaty ", IDC_STATIC, 4, 4, 312, 50 + LTEXT "Certyfikaty s� u�ywane do twojej osobistej identyfikacji oraz do identyfikacji wydawc�w i urz�d�w certyfikuj�cych.", + IDC_STATIC, 58, 14, 252, 18 + PUSHBUTTON "Certyfikaty...", IDC_CERT, 146, 34, 80, 14 + PUSHBUTTON "Wydawcy...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 + +END

1 0