wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

Frédéric Delanoy : wordpad: Update French translation.
by Alexandre Julliard 13 May '10

13 May '10

Module: wine Branch: master Commit: 1fcf509336e8b4d07ef6f88b4513663e0f82bff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fcf509336e8b4d07ef6f88b4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu May 13 18:27:53 2010 +0200 wordpad: Update French translation. --- programs/wordpad/Fr.rc | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index 54ae0b9..499c05b 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -1,5 +1,6 @@ /* * Copyright 2006-2009 by Jonathan Ernst + * Copyright 2010 by 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 @@ -58,11 +59,11 @@ BEGIN MENUITEM SEPARATOR POPUP "&Avancé" BEGIN - MENUITEM "&Information sélection", ID_EDIT_SELECTIONINFO - MENUITEM "&Format caractères", ID_EDIT_CHARFORMAT - MENUITEM "&Déf. format car.", ID_EDIT_DEFCHARFORMAT - MENUITEM "Format paragrap&he", ID_EDIT_PARAFORMAT - MENUITEM "Texte &complet", ID_EDIT_GETTEXT + MENUITEM "&Informations sur la sélection", ID_EDIT_SELECTIONINFO + MENUITEM "&Format de caractères", ID_EDIT_CHARFORMAT + MENUITEM "Format de caractères par &défaut", ID_EDIT_DEFCHARFORMAT + MENUITEM "Format de &paragraphe", ID_EDIT_PARAFORMAT + MENUITEM "Texte &complet", ID_EDIT_GETTEXT END END POPUP "&Affichage" @@ -129,7 +130,7 @@ BEGIN MENUITEM "Fuchsia" ID_COLOR_FUCHSIA MENUITEM "Eau" ID_COLOR_AQUA MENUITEM "Blanc" ID_COLOR_WHITE - MENUITEM "Automatic" ID_COLOR_AUTOMATIC + MENUITEM "Automatique" ID_COLOR_AUTOMATIC END END @@ -250,11 +251,10 @@ BEGIN STRING_PREVIEW_CLOSE, "Fermer" STRING_PREVIEW_PAGE, "Page" STRING_PREVIEW_PAGES, "Pages" -END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_UNITS_CM, "cm" + STRING_UNITS_CM, "cm" + STRING_UNITS_IN, "po" + STRING_UNITS_INCH, "pouces" + STRING_UNITS_PT, "pt" END STRINGTABLE DISCARDABLE

1 0

Jacek Caban : mshtml: Fixed test on some IEs.
by Alexandre Julliard 13 May '10

13 May '10

Module: wine Branch: master Commit: 563d289a62597fb7eb747decc85c97d4ca166e53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=563d289a62597fb7eb747decc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 13 17:57:35 2010 +0200 mshtml: Fixed test on some IEs. --- dlls/mshtml/tests/dom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7be4fe7..fd4238e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3003,7 +3003,7 @@ static void test_select_elem(IHTMLSelectElement *select) V_I4(&name) = 1; hres = IHTMLSelectElement_item(select, name, index, NULL); - ok(hres == E_POINTER, "item failed: %08x, expected E_POINTER\n", hres); + ok(hres == E_POINTER || broken(hres == E_INVALIDARG), "item failed: %08x, expected E_POINTER\n", hres); disp = NULL; hres = IHTMLSelectElement_item(select, name, index, &disp);

1 0

Aric Stewart : gdi32: Use usp10 to optionally generate glyphs for bidi strings.
by Alexandre Julliard 13 May '10

13 May '10

Module: wine Branch: master Commit: 2a8958ec18655275cd946fbe00f4efe3d4e1378d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a8958ec18655275cd946fbe0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu May 13 10:43:26 2010 -0500 gdi32: Use usp10 to optionally generate glyphs for bidi strings. --- dlls/gdi32/bidi.c | 184 +++++++++++++++++++++++++++++++++------------- dlls/gdi32/font.c | 15 ++-- dlls/gdi32/gdi_private.h | 4 +- 3 files changed, 142 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a8958ec18655275cd946…

1 0

Matteo Bruni : d3dx9: Add sampler dcl instruction support to the shader assembler.
by Alexandre Julliard 13 May '10

13 May '10

Module: wine Branch: master Commit: 745b5fe8f1aa1de994a9fe0ce6084daf52e47314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=745b5fe8f1aa1de994a9fe0ce… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Thu May 13 17:21:59 2010 +0200 d3dx9: Add sampler dcl instruction support to the shader assembler. --- dlls/d3dx9_36/asmparser.c | 9 ++++++ dlls/d3dx9_36/asmshader.l | 10 ++++++ dlls/d3dx9_36/asmshader.y | 44 ++++++++++++++++++++++++++++ dlls/d3dx9_36/asmutils.c | 11 +++++++ dlls/d3dx9_36/bytecodewriter.c | 59 ++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/d3dx9_36_private.h | 13 ++++++++- dlls/d3dx9_36/tests/asm.c | 10 ++---- 7 files changed, 148 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=745b5fe8f1aa1de994a9f…

1 0

Matteo Bruni : d3dx9: Add input dcl instruction support to the shader assembler.
by Alexandre Julliard 13 May '10

13 May '10

Module: wine Branch: master Commit: 6cbd5114758bd8c55f4bd60aa58b631fef146167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cbd5114758bd8c55f4bd60aa… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Thu May 13 17:21:58 2010 +0200 d3dx9: Add input dcl instruction support to the shader assembler. --- dlls/d3dx9_36/asmparser.c | 10 ++++++++++ dlls/d3dx9_36/asmshader.y | 24 ++++++++++++++++++++++++ dlls/d3dx9_36/bytecodewriter.c | 1 + dlls/d3dx9_36/d3dx9_36_private.h | 2 ++ 4 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/asmparser.c b/dlls/d3dx9_36/asmparser.c index f1360cb..bee92f6 100644 --- a/dlls/d3dx9_36/asmparser.c +++ b/dlls/d3dx9_36/asmparser.c @@ -51,6 +51,15 @@ static void asmparser_dcl_output(struct asm_parser *This, DWORD usage, DWORD num } } +static void asmparser_dcl_input(struct asm_parser *This, DWORD usage, DWORD num, + const struct shader_reg *reg) { + if(!This->shader) return; + if(!record_declaration(This->shader, usage, num, FALSE, reg->regnum, reg->writemask)) { + ERR("Out of memory\n"); + set_parse_status(This, PARSE_ERR); + } +} + static void asmparser_instr(struct asm_parser *This, DWORD opcode, DWORD mod, DWORD shift, BWRITER_COMPARISON_TYPE comp, @@ -149,6 +158,7 @@ static const struct asmparser_backend parser_vs_3 = { asmparser_coissue_unsupported, asmparser_dcl_output, + asmparser_dcl_input, asmparser_end, diff --git a/dlls/d3dx9_36/asmshader.y b/dlls/d3dx9_36/asmshader.y index 8231c3a..ca4d24c 100644 --- a/dlls/d3dx9_36/asmshader.y +++ b/dlls/d3dx9_36/asmshader.y @@ -522,6 +522,30 @@ instruction: INSTR_ADD omods dreg ',' sregs reg.writemask = $4; asm_ctx.funcs->dcl_output(&asm_ctx, $2.dclusage, $2.regnum, &reg); } + | INSTR_DCL dclusage REG_INPUT + { + struct shader_reg reg; + TRACE("Input reg declaration\n"); + ZeroMemory(&reg, sizeof(reg)); + reg.type = BWRITERSPR_INPUT; + reg.regnum = $3; + reg.rel_reg = NULL; + reg.srcmod = 0; + reg.writemask = BWRITERSP_WRITEMASK_ALL; + asm_ctx.funcs->dcl_input(&asm_ctx, $2.dclusage, $2.regnum, &reg); + } + | INSTR_DCL dclusage REG_INPUT writemask + { + struct shader_reg reg; + TRACE("Input reg declaration\n"); + ZeroMemory(&reg, sizeof(reg)); + reg.type = BWRITERSPR_INPUT; + reg.regnum = $3; + reg.rel_reg = NULL; + reg.srcmod = 0; + reg.writemask = $4; + asm_ctx.funcs->dcl_input(&asm_ctx, $2.dclusage, $2.regnum, &reg); + } | INSTR_REP sregs { TRACE("REP\n"); diff --git a/dlls/d3dx9_36/bytecodewriter.c b/dlls/d3dx9_36/bytecodewriter.c index ff6393f..4d62465 100644 --- a/dlls/d3dx9_36/bytecodewriter.c +++ b/dlls/d3dx9_36/bytecodewriter.c @@ -284,6 +284,7 @@ static void sm_3_header(struct bc_writer *This, const struct bwriter_shader *sha /* Declare the shader type and version */ put_dword(buffer, This->version); + write_declarations(buffer, TRUE, shader->inputs, shader->num_inputs, D3DSPR_INPUT); write_declarations(buffer, TRUE, shader->outputs, shader->num_outputs, D3DSPR_OUTPUT); return; } diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 19b1921..344bdbf 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -255,6 +255,8 @@ struct asmparser_backend { void (*dcl_output)(struct asm_parser *This, DWORD usage, DWORD num, const struct shader_reg *reg); + void (*dcl_input)(struct asm_parser *This, DWORD usage, DWORD num, + const struct shader_reg *reg); void (*end)(struct asm_parser *This);

1 0

Matteo Bruni : d3dx9: Complete output dcl instruction support.
by Alexandre Julliard 13 May '10

13 May '10

Module: wine Branch: master Commit: efec8bb36166808d25b36ae14bdf7e12052e0860 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efec8bb36166808d25b36ae14… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Thu May 13 17:21:58 2010 +0200 d3dx9: Complete output dcl instruction support. --- dlls/d3dx9_36/asmshader.l | 117 ++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/asmshader.y | 91 +++++++++++++++++++++++++++++ dlls/d3dx9_36/d3dx9_36_private.h | 13 ++++ dlls/d3dx9_36/tests/asm.c | 6 +- 4 files changed, 224 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=efec8bb36166808d25b36…

1 0

Matteo Bruni : d3dx9: Add output dcl instruction partial support to the shader assembler.
by Alexandre Julliard 13 May '10

13 May '10

Module: wine Branch: master Commit: b627d13ea81cc281c5981b6a2bc78e5de3685a34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b627d13ea81cc281c5981b6a2… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Thu May 13 17:21:58 2010 +0200 d3dx9: Add output dcl instruction partial support to the shader assembler. --- dlls/d3dx9_36/asmparser.c | 15 +++++++ dlls/d3dx9_36/asmshader.l | 12 ++++++ dlls/d3dx9_36/asmshader.y | 40 +++++++++++++++++++ dlls/d3dx9_36/asmutils.c | 2 + dlls/d3dx9_36/bytecodewriter.c | 79 ++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/d3dx9_36_private.h | 9 ++++ dlls/d3dx9_36/tests/asm.c | 6 +- 7 files changed, 160 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b627d13ea81cc281c5981…

1 0

Thomas Mullaly : urlmon: CreateUri should return E_INVALIDARG for NULL args .
by Alexandre Julliard 13 May '10

13 May '10

Module: wine Branch: master Commit: c79be42057ea20751c2b15c9ced2f4498798e093 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c79be42057ea20751c2b15c9c… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed May 12 22:35:59 2010 -0400 urlmon: CreateUri should return E_INVALIDARG for NULL args. --- dlls/urlmon/tests/uri.c | 19 ++++++++++++++++++- dlls/urlmon/uri.c | 8 ++++++++ 2 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 13d69fc..a978606 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -20,7 +20,9 @@ /* * IUri testing framework goals: - * - Test invalid flags + * - Test invalid args + * - invalid flags + * - invalid args (IUri, uri string) * - Test parsing for components when no canonicalization occurs * - Test parsing for components when canonicalization occurs. * - More tests... @@ -75,6 +77,18 @@ static void test_CreateUri_InvalidFlags(void) { } } +static void test_CreateUri_InvalidArgs(void) { + HRESULT hr; + IUri *uri = (void*) 0xdeadbeef; + + hr = pCreateUri(http_urlW, 0, 0, NULL); + ok(hr == E_INVALIDARG, "Error: CreateUri returned 0x%08x, expected 0x%08x\n", hr, E_INVALIDARG); + + hr = pCreateUri(NULL, 0, 0, &uri); + ok(hr == E_INVALIDARG, "Error: CreateUri returned 0x%08x, expected 0x%08x\n", hr, E_INVALIDARG); + ok(uri == NULL, "Error: Expected the IUri to be NULL, but it was %p instead\n", uri); +} + START_TEST(uri) { HMODULE hurlmon; @@ -88,4 +102,7 @@ START_TEST(uri) { trace("test CreateUri invalid flags...\n"); test_CreateUri_InvalidFlags(); + + trace("test CreateUri invalid args...\n"); + test_CreateUri_InvalidArgs(); } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 668aa9b..5b72fa5 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -296,6 +296,14 @@ HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IU TRACE("(%s %x %x %p)\n", debugstr_w(pwzURI), dwFlags, (DWORD)dwReserved, ppURI); + if(!ppURI) + return E_INVALIDARG; + + if(!pwzURI) { + *ppURI = NULL; + return E_INVALIDARG; + } + ret = heap_alloc(sizeof(Uri)); if(!ret) return E_OUTOFMEMORY;

1 0

Mike Kaplinskiy : server: Use a less hackish approach to not POLLIN when we have a hung up socket.
by Alexandre Julliard 13 May '10

13 May '10

Module: wine Branch: master Commit: 3aa93e11ad89b5f9b6974c84dd41b5324cf02dda URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aa93e11ad89b5f9b6974c84d… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Wed May 12 01:59:06 2010 -0400 server: Use a less hackish approach to not POLLIN when we have a hung up socket. --- server/sock.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/server/sock.c b/server/sock.c index da7ae67..a893863 100644 --- a/server/sock.c +++ b/server/sock.c @@ -406,7 +406,7 @@ static void sock_poll_event( struct fd *fd, int event ) if ( event & POLLIN && !hangup_seen ) { sock->pmask |= FD_READ; - sock->hmask |= (FD_READ|FD_CLOSE); + sock->hmask |= FD_READ; sock->errors[FD_READ_BIT] = 0; if (debug_level) fprintf(stderr, "socket %p is readable\n", sock ); @@ -498,7 +498,8 @@ static int sock_get_poll_events( struct fd *fd ) if (mask & FD_READ || async_waiting( sock->read_q )) ev |= POLLIN | POLLPRI; if (mask & FD_WRITE || async_waiting( sock->write_q )) ev |= POLLOUT; /* We use POLLIN with 0 bytes recv() as FD_CLOSE indication for stream sockets. */ - if ( sock->type == SOCK_STREAM && ( sock->mask & ~sock->hmask & FD_CLOSE) ) + if ( sock->type == SOCK_STREAM && ( sock->mask & ~sock->hmask & FD_CLOSE) && + !(sock->hmask & FD_READ) && sock->state & FD_READ ) ev |= POLLIN; return ev; @@ -522,7 +523,6 @@ static void sock_queue_async( struct fd *fd, const async_data_t *data, int type, case ASYNC_TYPE_READ: if (!sock->read_q && !(sock->read_q = create_async_queue( sock->fd ))) return; queue = sock->read_q; - sock->hmask &= ~FD_CLOSE; break; case ASYNC_TYPE_WRITE: if (!sock->write_q && !(sock->write_q = create_async_queue( sock->fd ))) return; @@ -956,8 +956,6 @@ DECL_HANDLER(enable_socket_event) sock->pmask &= ~req->mask; /* is this safe? */ sock->hmask &= ~req->mask; - if ( req->mask & FD_READ ) - sock->hmask &= ~FD_CLOSE; sock->state |= req->sstate; sock->state &= ~req->cstate; if ( sock->type != SOCK_STREAM ) sock->state &= ~STREAM_FLAG_MASK;

1 0

Mike Kaplinskiy : server: Keep polling sockets after we got a 0 recv, but not for POLLIN.
by Alexandre Julliard 13 May '10

13 May '10

Module: wine Branch: master Commit: 535f878e3d04c237e9dc7af2b14aad2bd92d13ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=535f878e3d04c237e9dc7af2b… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Wed May 12 01:59:04 2010 -0400 server: Keep polling sockets after we got a 0 recv, but not for POLLIN. --- server/sock.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 753518d..da7ae67 100644 --- a/server/sock.c +++ b/server/sock.c @@ -428,13 +428,16 @@ static void sock_poll_event( struct fd *fd, int event ) if (debug_level) fprintf(stderr, "socket %p got OOB data\n", sock); } + /* According to WS2 specs, FD_CLOSE is only delivered when there is no more data to be read (i.e. hangup_seen = 1) */ - else if ( hangup_seen && (sock->state & (FD_READ|FD_WRITE) )) + if ( hangup_seen && (sock->state & (FD_READ|FD_WRITE) )) { sock->errors[FD_CLOSE_BIT] = sock_error( fd ); if ( (event & POLLERR) || ( sock_shutdown_type == SOCK_SHUTDOWN_EOF && (event & POLLHUP) )) sock->state &= ~FD_WRITE; + sock->state &= ~FD_READ; + sock->pmask |= FD_CLOSE; sock->hmask |= FD_CLOSE; if (debug_level) @@ -443,7 +446,7 @@ static void sock_poll_event( struct fd *fd, int event ) } } - if ( sock->pmask & FD_CLOSE || event & (POLLERR|POLLHUP) ) + if ( event & (POLLERR|POLLHUP) ) { if ( debug_level ) fprintf( stderr, "removing socket %p from select loop\n", sock );

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
96
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 May 2010