January 2012 - Wine-commits

Francois Gouget : po: Fix an accelerator key specification in the Romanian translation.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: 5023f7402de157133e78b608b429138f34a2693a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5023f7402de157133e78b608b… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 24 00:34:08 2012 +0100 po: Fix an accelerator key specification in the Romanian translation. --- po/ro.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/ro.po b/po/ro.po index e7f33a0..27555f2 100644 --- a/po/ro.po +++ b/po/ro.po @@ -11649,7 +11649,7 @@ msgstr "&Copiază numele cheii" #: regedit.rc:60 regedit.rc:112 wordpad.rc:50 msgid "&Find...\tCtrl+F" -msgstr "Cău&tare...\tCrtl+F" +msgstr "Cău&tare...\tCtrl+F" #: regedit.rc:61 msgid "Find Ne&xt\tF3"

1 0

Francois Gouget : po: Fix an accelerator key specification in the Hungarian translation.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: 2990f853d4501ce486ba990bcac1c39cce648f3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2990f853d4501ce486ba990bc… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 24 00:34:18 2012 +0100 po: Fix an accelerator key specification in the Hungarian translation. --- po/hu.po | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/po/hu.po b/po/hu.po index c134c3c..3368217 100644 --- a/po/hu.po +++ b/po/hu.po @@ -10361,7 +10361,7 @@ msgstr "" #: notepad.rc:46 msgid "Select &all\tCtrl+A" -msgstr "&Az összes kijelölése" +msgstr "&Az összes kijelölése\tCtrl+A" #: notepad.rc:47 msgid "&Time/Date\tF5" @@ -13839,7 +13839,6 @@ msgid "R&edo\tCtrl+Y" msgstr "&Előre\tCtrl+Y" #: wordpad.rc:47 -#, fuzzy msgid "&Clear\tDel" msgstr "Tör&lés\tDel"

1 0

Francois Gouget : po: Fix an accelerator key specification in the Portuguese translation.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: aafd9bd1ba4def7e128c03da43ead80602f41235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aafd9bd1ba4def7e128c03da4… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 24 00:34:36 2012 +0100 po: Fix an accelerator key specification in the Portuguese translation. --- po/pt_PT.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/pt_PT.po b/po/pt_PT.po index 55180d3..0aa44ad 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -10595,7 +10595,7 @@ msgstr "" #: notepad.rc:46 msgid "Select &all\tCtrl+A" -msgstr "Seleccionar &tudo" +msgstr "Seleccionar &tudo\tCtrl+A" #: notepad.rc:47 msgid "&Time/Date\tF5"

1 0

Francois Gouget : po: Fix an accelerator key specification in the Russian translation.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: c0c7e6ba1120dbdc3f90ac780c828c9dd0cf0a01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0c7e6ba1120dbdc3f90ac780… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 24 00:35:07 2012 +0100 po: Fix an accelerator key specification in the Russian translation. --- po/ru.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/ru.po b/po/ru.po index 2ec0dc9..cdbb2c0 100644 --- a/po/ru.po +++ b/po/ru.po @@ -10269,7 +10269,7 @@ msgstr "&Удалить\tDel" #: notepad.rc:46 msgid "Select &all\tCtrl+A" -msgstr "Выделить в&сё" +msgstr "Выделить в&сё\tCtrl+A" #: notepad.rc:47 msgid "&Time/Date\tF5"

1 0

Francois Gouget : po: Fix an accelerator key specification in the Swedish translation.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: 452ec21da5fe531e7d60a39b59956ba67e1c3711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=452ec21da5fe531e7d60a39b5… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 24 00:35:33 2012 +0100 po: Fix an accelerator key specification in the Swedish translation. --- po/sv.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/sv.po b/po/sv.po index d2d5941..2dfc695 100644 --- a/po/sv.po +++ b/po/sv.po @@ -10259,7 +10259,7 @@ msgstr "&Ta bort\tDel" #: notepad.rc:46 msgid "Select &all\tCtrl+A" -msgstr "Markera &allt" +msgstr "Markera &all\tCtrl+A" #: notepad.rc:47 msgid "&Time/Date\tF5"

1 0

Francois Gouget : po: Fix the accelerator key specifications in the Chinese (Taiwan) translation .
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: ca68a40263ca9713e5a4161f349f7b574708efc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca68a40263ca9713e5a4161f3… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 24 00:39:59 2012 +0100 po: Fix the accelerator key specifications in the Chinese (Taiwan) translation. --- po/zh_TW.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 3e7127a..2cd0ce5 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -10197,7 +10197,7 @@ msgstr "" #: notepad.rc:46 msgid "Select &all\tCtrl+A" -msgstr "全選(&A)" +msgstr "全選(&A)\tCtrl+A" #: notepad.rc:47 msgid "&Time/Date\tF5" @@ -10209,7 +10209,7 @@ msgstr "自動換行(&W)" #: notepad.rc:53 msgid "&Search...\tCtrl+F" -msgstr "尋找(&S)..." +msgstr "尋找(&S)...\tCtrl+F" #: notepad.rc:54 msgid "&Search next\tF3"

1 0

Thomas Faber : crypt32: Fix build with MSVC.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: a7144d916db882a3cb0d9f53e356726b00ba04bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7144d916db882a3cb0d9f53e… Author: Thomas Faber <thfabba(a)gmx.de> Date: Mon Jan 23 18:37:35 2012 +0100 crypt32: Fix build with MSVC. --- dlls/crypt32/msg.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 50c1bee..610f8c5 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1809,7 +1809,12 @@ static BOOL CEnvelopedEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, char oid_rsa_data[] = szOID_RSA_data; CRYPT_ENVELOPED_DATA envelopedData = { CMSG_ENVELOPED_DATA_PKCS_1_5_VERSION, msg->cRecipientInfo, - msg->recipientInfo, { oid_rsa_data, msg->algo, msg->data } + msg->recipientInfo, { oid_rsa_data, { + msg->algo.pszObjId, + { msg->algo.Parameters.cbData, msg->algo.Parameters.pbData } + }, + { msg->data.cbData, msg->data.pbData } + } }; ret = CRYPT_AsnEncodePKCSEnvelopedData(&envelopedData, pvData,

1 0

Henri Verbeet : wined3d: Get rid of the vertex buffer conversion hack in process_vertices_strided() .
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: 41c910d5f066347ec7ed9918b0801ffb961f8637 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41c910d5f066347ec7ed9918b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 23 20:33:33 2012 +0100 wined3d: Get rid of the vertex buffer conversion hack in process_vertices_strided(). The main thing that's broken is the unnecessary color conversion in case bgra vertex arrays are supported. It shouldn't be hard to fix that, but at this point I don't think this hack even helps a lot anymore. --- dlls/wined3d/device.c | 124 ++++++++++--------------------------------------- 1 files changed, 25 insertions(+), 99 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f56d027..348ee08 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3185,13 +3185,14 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO const struct wined3d_stream_info *stream_info, struct wined3d_buffer *dest, DWORD flags, DWORD DestFVF) { - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - char *dest_ptr, *dest_conv = NULL, *dest_conv_addr = NULL; struct wined3d_matrix mat, proj_mat, view_mat, world_mat; struct wined3d_viewport vp; + UINT vertex_size; unsigned int i; + BYTE *dest_ptr; BOOL doClip; DWORD numTextures; + HRESULT hr; if (stream_info->use_map & (1 << WINED3D_FFP_NORMAL)) { @@ -3204,34 +3205,6 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO return WINED3DERR_INVALIDCALL; } - if (!dest->resource.allocatedMemory) - buffer_get_sysmem(dest, gl_info); - - /* Get a pointer into the destination vbo(create one if none exists) and - * write correct opengl data into it. It's cheap and allows us to run drawStridedFast - */ - if (!dest->buffer_object && gl_info->supported[ARB_VERTEX_BUFFER_OBJECT]) - { - dest->flags |= WINED3D_BUFFER_CREATEBO; - wined3d_buffer_preload(dest); - } - - if (dest->buffer_object) - { - unsigned char extrabytes = 0; - /* If the destination vertex buffer has D3DFVF_XYZ position(non-rhw), native d3d writes RHW position, where the RHW - * gets written into the 4 bytes after the Z position. In the case of a dest buffer that only has D3DFVF_XYZ data, - * this may write 4 extra bytes beyond the area that should be written - */ - if(DestFVF == WINED3DFVF_XYZ) extrabytes = 4; - dest_conv_addr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwCount * get_flexible_vertex_size(DestFVF) + extrabytes); - if(!dest_conv_addr) { - ERR("Out of memory\n"); - /* Continue without storing converted vertices */ - } - dest_conv = dest_conv_addr; - } - if (device->stateBlock->state.render_states[WINED3D_RS_CLIPPING]) { static BOOL warned = FALSE; @@ -3248,8 +3221,16 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO warned = TRUE; FIXME("Clipping is broken and disabled for now\n"); } - } else doClip = FALSE; - dest_ptr = ((char *)buffer_get_sysmem(dest, gl_info)) + dwDestIndex * get_flexible_vertex_size(DestFVF); + } + else + doClip = FALSE; + + vertex_size = get_flexible_vertex_size(DestFVF); + if (FAILED(hr = wined3d_buffer_map(dest, dwDestIndex * vertex_size, dwCount * vertex_size, &dest_ptr, 0))) + { + WARN("Failed to map buffer, hr %#x.\n", hr); + return hr; + } wined3d_device_get_transform(device, WINED3D_TS_VIEW, &view_mat); wined3d_device_get_transform(device, WINED3D_TS_PROJECTION, &proj_mat); @@ -3382,28 +3363,13 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO dest_ptr += 3 * sizeof(float); - if((DestFVF & WINED3DFVF_POSITION_MASK) == WINED3DFVF_XYZRHW) { + if ((DestFVF & WINED3DFVF_POSITION_MASK) == WINED3DFVF_XYZRHW) dest_ptr += sizeof(float); - } - - if(dest_conv) { - float w = 1 / rhw; - ( (float *) dest_conv)[0] = x * w; - ( (float *) dest_conv)[1] = y * w; - ( (float *) dest_conv)[2] = z * w; - ( (float *) dest_conv)[3] = w; - - dest_conv += 3 * sizeof(float); - - if((DestFVF & WINED3DFVF_POSITION_MASK) == WINED3DFVF_XYZRHW) { - dest_conv += sizeof(float); - } - } } - if (DestFVF & WINED3DFVF_PSIZE) { + + if (DestFVF & WINED3DFVF_PSIZE) dest_ptr += sizeof(DWORD); - if(dest_conv) dest_conv += sizeof(DWORD); - } + if (DestFVF & WINED3DFVF_NORMAL) { const struct wined3d_stream_info_element *element = &stream_info->elements[WINED3D_FFP_NORMAL]; @@ -3411,9 +3377,6 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO /* AFAIK this should go into the lighting information */ FIXME("Didn't expect the destination to have a normal\n"); copy_and_next(dest_ptr, normal, 3 * sizeof(float)); - if(dest_conv) { - copy_and_next(dest_conv, normal, 3 * sizeof(float)); - } } if (DestFVF & WINED3DFVF_DIFFUSE) @@ -3431,20 +3394,10 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO *( (DWORD *) dest_ptr) = 0xffffffff; dest_ptr += sizeof(DWORD); - - if(dest_conv) { - *( (DWORD *) dest_conv) = 0xffffffff; - dest_conv += sizeof(DWORD); - } } - else { + else + { copy_and_next(dest_ptr, color_d, sizeof(DWORD)); - if(dest_conv) { - *( (DWORD *) dest_conv) = (*color_d & 0xff00ff00) ; /* Alpha + green */ - *( (DWORD *) dest_conv) |= (*color_d & 0x00ff0000) >> 16; /* Red */ - *( (DWORD *) dest_conv) |= (*color_d & 0xff0000ff) << 16; /* Blue */ - dest_conv += sizeof(DWORD); - } } } @@ -3464,20 +3417,10 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO *( (DWORD *) dest_ptr) = 0xFF000000; dest_ptr += sizeof(DWORD); - - if(dest_conv) { - *( (DWORD *) dest_conv) = 0xFF000000; - dest_conv += sizeof(DWORD); - } } - else { + else + { copy_and_next(dest_ptr, color_s, sizeof(DWORD)); - if(dest_conv) { - *( (DWORD *) dest_conv) = (*color_s & 0xff00ff00) ; /* Alpha + green */ - *( (DWORD *) dest_conv) |= (*color_s & 0x00ff0000) >> 16; /* Red */ - *( (DWORD *) dest_conv) |= (*color_s & 0xff0000ff) << 16; /* Blue */ - dest_conv += sizeof(DWORD); - } } } @@ -3488,33 +3431,16 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO if (!(stream_info->use_map & (1 << (WINED3D_FFP_TEXCOORD0 + tex_index)))) { ERR("No source texture, but destination requests one\n"); - dest_ptr+=GET_TEXCOORD_SIZE_FROM_FVF(DestFVF, tex_index) * sizeof(float); - if(dest_conv) dest_conv += GET_TEXCOORD_SIZE_FROM_FVF(DestFVF, tex_index) * sizeof(float); + dest_ptr += GET_TEXCOORD_SIZE_FROM_FVF(DestFVF, tex_index) * sizeof(float); } - else { + else + { copy_and_next(dest_ptr, tex_coord, GET_TEXCOORD_SIZE_FROM_FVF(DestFVF, tex_index) * sizeof(float)); - if(dest_conv) { - copy_and_next(dest_conv, tex_coord, GET_TEXCOORD_SIZE_FROM_FVF(DestFVF, tex_index) * sizeof(float)); - } } } } - if (dest_conv) - { - ENTER_GL(); - - GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, dest->buffer_object)); - checkGLcall("glBindBufferARB(GL_ARRAY_BUFFER_ARB)"); - GL_EXTCALL(glBufferSubDataARB(GL_ARRAY_BUFFER_ARB, dwDestIndex * get_flexible_vertex_size(DestFVF), - dwCount * get_flexible_vertex_size(DestFVF), - dest_conv_addr)); - checkGLcall("glBufferSubDataARB(GL_ARRAY_BUFFER_ARB)"); - - LEAVE_GL(); - - HeapFree(GetProcessHeap(), 0, dest_conv_addr); - } + wined3d_buffer_unmap(dest); return WINED3D_OK; }

1 0

Matteo Bruni : wined3d: SM1 texture projection always divides by w when there is a vertex shader set .
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: f69f2aa3478b860096b846d7a57794d2a7cabe78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f69f2aa3478b860096b846d7a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jan 23 22:34:47 2012 +0100 wined3d: SM1 texture projection always divides by w when there is a vertex shader set. --- dlls/d3d9/tests/visual.c | 18 +++++++++--------- dlls/wined3d/shader.c | 35 ++++++++++++++++++++--------------- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c3c4ad6..4f0f204 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -4237,25 +4237,25 @@ static void texture_transform_flags_test(IDirect3DDevice9 *device) struct projected_textures_test_run projected_tests_3[4] = { { - "D3DTTFF_PROJECTED (like COUNT4 | PROJECTED) - bottom left", + "D3DTTFF_COUNT3 | D3DTTFF_PROJECTED (like COUNT4 | PROJECTED) - bottom left", D3DTTFF_PROJECTED, decl3, - TRUE, TRUE, + TRUE, FALSE, {120, 300, 240, 390}, }, { - "D3DTTFF_PROJECTED (like COUNT4 | PROJECTED, the w component has the default value 1.0) - bottom right", - D3DTTFF_PROJECTED, - decl, + "D3DTTFF_COUNT3 | D3DTTFF_PROJECTED (like COUNT4 | PROJECTED) - bottom right", + D3DTTFF_COUNT3 | D3DTTFF_PROJECTED, + decl3, TRUE, TRUE, - {340, 450, 360, 465}, + {440, 300, 560, 390}, }, { - "0xffffffff (like COUNT4 | PROJECTED, the w component has the default value 1.0) - top left", + "0xffffffff (like COUNT4 | PROJECTED) - top left", 0xffffffff, - decl, + decl3, TRUE, TRUE, - {20, 210, 40, 225}, + {120, 60, 240, 150}, }, { "D3DTTFF_PROJECTED (like COUNT4 | PROJECTED) - top right", diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 1ca4351..d047269 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1919,14 +1919,15 @@ void find_ps_compile_args(const struct wined3d_state *state, if (flags & WINED3D_TTFF_PROJECTED) { - enum wined3d_sampler_texture_type sampler_type = shader->reg_maps.sampler_type[i]; DWORD tex_transform = flags & ~WINED3D_TTFF_PROJECTED; - DWORD max_valid = WINED3D_TTFF_COUNT4; if (!state->vertex_shader) { unsigned int j; unsigned int index = state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX]; + DWORD max_valid = WINED3D_TTFF_COUNT4; + enum wined3d_sampler_texture_type sampler_type = shader->reg_maps.sampler_type[i]; + for (j = 0; j < state->vertex_declaration->element_count; ++j) { struct wined3d_vertex_declaration_element *element = @@ -1939,21 +1940,25 @@ void find_ps_compile_args(const struct wined3d_state *state, break; } } + if (!tex_transform || tex_transform > max_valid) + { + WARN("Fixing up projected texture transform flags from %#x to %#x.\n", + tex_transform, max_valid); + tex_transform = max_valid; + } + if ((sampler_type == WINED3DSTT_1D && tex_transform > WINED3D_TTFF_COUNT1) + || (sampler_type == WINED3DSTT_2D && tex_transform > WINED3D_TTFF_COUNT2) + || (sampler_type == WINED3DSTT_VOLUME && tex_transform > WINED3D_TTFF_COUNT3)) + tex_transform |= WINED3D_PSARGS_PROJECTED; + else + { + WARN("Application requested projected texture with unsuitable texture coordinates.\n"); + WARN("(texture unit %u, transform flags %#x, sampler type %u).\n", + i, tex_transform, sampler_type); + } } - - if (!tex_transform || tex_transform > max_valid) - { - WARN("Fixing up projected texture transform flags from %#x to %#x.\n", - tex_transform, max_valid); - tex_transform = max_valid; - } - - if ((sampler_type == WINED3DSTT_1D && tex_transform > WINED3D_TTFF_COUNT1) - || (sampler_type == WINED3DSTT_2D && tex_transform > WINED3D_TTFF_COUNT2) - || (sampler_type == WINED3DSTT_VOLUME && tex_transform > WINED3D_TTFF_COUNT3)) - tex_transform |= WINED3D_PSARGS_PROJECTED; else - WARN("Application requested projected texture with unsuitable texture coordinates.\n"); + tex_transform = WINED3D_TTFF_COUNT4 | WINED3D_PSARGS_PROJECTED; args->tex_transform |= tex_transform << i * WINED3D_PSARGS_TEXTRANSFORM_SHIFT; }

1 0

Matteo Bruni : ddraw: Accept pointers to wrong IDirectDrawSurface versions.
by Alexandre Julliard 24 Jan '12

24 Jan '12

Module: wine Branch: master Commit: e51d3f6de60716391181f91fc73f3fbee45f4e9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e51d3f6de60716391181f91fc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jan 23 22:34:48 2012 +0100 ddraw: Accept pointers to wrong IDirectDrawSurface versions. --- dlls/ddraw/surface.c | 57 ++++++++++++++++-- dlls/ddraw/tests/ddraw1.c | 143 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 143 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 120 +++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 93 +++++++++++++++++++++++++++++ 5 files changed, 551 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e51d3f6de60716391181f…

1 0