July 2009 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Don' t call glGetError if nobody is listening.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: 6a04c2d5cc7aa63bf5564f1c3d8813a436212749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a04c2d5cc7aa63bf5564f1c3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 15 18:45:03 2009 +0200 wined3d: Don't call glGetError if nobody is listening. --- dlls/wined3d/wined3d_private.h | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 60c363c..68f2e4c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -883,17 +883,19 @@ extern int num_lock; /* Checking of API calls */ /* --------------------- */ #ifndef WINE_NO_DEBUG_MSGS -#define checkGLcall(A) \ -do { \ - GLint err = glGetError(); \ - if (err == GL_NO_ERROR) { \ - TRACE("%s call ok %s / %d\n", A, __FILE__, __LINE__); \ - \ - } else do { \ - FIXME(">>>>>>>>>>>>>>>>> %s (%#x) from %s @ %s / %d\n", \ - debug_glerror(err), err, A, __FILE__, __LINE__); \ - err = glGetError(); \ - } while (err != GL_NO_ERROR); \ +#define checkGLcall(A) \ +do { \ + GLint err; \ + if(!__WINE_IS_DEBUG_ON(_FIXME, __wine_dbch___default)) break; \ + err = glGetError(); \ + if (err == GL_NO_ERROR) { \ + TRACE("%s call ok %s / %d\n", A, __FILE__, __LINE__); \ + \ + } else do { \ + FIXME(">>>>>>>>>>>>>>>>> %s (%#x) from %s @ %s / %d\n", \ + debug_glerror(err), err, A, __FILE__, __LINE__); \ + err = glGetError(); \ + } while (err != GL_NO_ERROR); \ } while(0) #else #define checkGLcall(A) do {} while(0)

1 0

Dmitry Timoshkov : comctl32: Explicitly initialize visible order of a newly added item, force visible order recalculation on redraw.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: 1d265bcac2188ab14215af049c043ff7c9f31785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d265bcac2188ab14215af049… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Jul 16 17:34:54 2009 +0900 comctl32: Explicitly initialize visible order of a newly added item, force visible order recalculation on redraw. --- dlls/comctl32/treeview.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index fd20cef..8155aab 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1255,6 +1255,7 @@ TREEVIEW_InsertItemT(TREEVIEW_INFO *infoPtr, const TVINSERTSTRUCTW *ptdi, BOOL i newItem->parent = parentItem; newItem->iIntegral = 1; + newItem->visibleOrder = -1; if (!TREEVIEW_DoSetItemT(infoPtr, newItem, tvItem, isW)) return 0; @@ -1394,8 +1395,6 @@ TREEVIEW_InsertItemT(TREEVIEW_INFO *infoPtr, const TVINSERTSTRUCTW *ptdi, BOOL i } else { - newItem->visibleOrder = -1; - /* refresh treeview if newItem is the first item inserted under parentItem */ if (ISVISIBLE(parentItem) && newItem->prevSibling == newItem->nextSibling) { @@ -1594,6 +1593,7 @@ TREEVIEW_SetRedraw(TREEVIEW_INFO* infoPtr, WPARAM wParam) if (infoPtr->bRedraw) { TREEVIEW_UpdateSubTree(infoPtr, infoPtr->root); + TREEVIEW_RecalculateVisibleOrder(infoPtr, NULL); TREEVIEW_UpdateScrollBars(infoPtr); TREEVIEW_Invalidate(infoPtr, NULL); }

1 0

Michael Stefaniuc : Set the encoding of the Romanian resources to UTF-8.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: 2bf4acb56ca9524ff03acb521b88ddf604785e39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bf4acb56ca9524ff03acb521… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 16 01:12:03 2009 +0200 Set the encoding of the Romanian resources to UTF-8. --- dlls/iccvid/iccvid_Ro.rc | 2 ++ dlls/localspl/spl_Ro.rc | 2 ++ dlls/msvidc32/msvidc32_Ro.rc | 2 ++ 3 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/iccvid/iccvid_Ro.rc b/dlls/iccvid/iccvid_Ro.rc index ccd8ef7..d99a0b2 100644 --- a/dlls/iccvid/iccvid_Ro.rc +++ b/dlls/iccvid/iccvid_Ro.rc @@ -19,6 +19,8 @@ #include "iccvid_private.h" +#pragma code_page(65001) + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_Ro.rc b/dlls/localspl/spl_Ro.rc index 499d75b..7f98800 100644 --- a/dlls/localspl/spl_Ro.rc +++ b/dlls/localspl/spl_Ro.rc @@ -20,6 +20,8 @@ #include "localspl_private.h" +#pragma code_page(65001) + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/msvidc32/msvidc32_Ro.rc b/dlls/msvidc32/msvidc32_Ro.rc index 62bcef0..c001dd4 100644 --- a/dlls/msvidc32/msvidc32_Ro.rc +++ b/dlls/msvidc32/msvidc32_Ro.rc @@ -19,6 +19,8 @@ #include "msvidc32_private.h" +#pragma code_page(65001) + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE

1 0

Alexandre Julliard : wrc: Report an error when encountering non-ASCII characters.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: fc8c8a52517725f264071e60679b23a7ac6cd080 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc8c8a52517725f264071e606… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 11:15:15 2009 +0200 wrc: Report an error when encountering non-ASCII characters. --- tools/wrc/parser.l | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index d92e973..cafa35a 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -573,7 +573,7 @@ L\" { } {ws}+ want_id = wanted_id; /* Eat whitespace */ -<INITIAL>. return yytext[0]; +<INITIAL>[ -~] return yytext[0]; <*>.|\n { /* Catch all rule to find any unmatched text */ @@ -582,8 +582,8 @@ L\" { line_number++; char_number = 1; } - parser_warning("Unmatched text '%c' (0x%02x) YY_START=%d\n", - isprint(*yytext & 0xff) ? *yytext : '.', *yytext, YY_START); + parser_error("Unmatched text '%c' (0x%02x) YY_START=%d", + isprint((unsigned char)*yytext) ? *yytext : '.', *yytext, YY_START); } <<EOF>> current_codepage = -1; yyterminate();

1 0

Alexandre Julliard : wrc: Avoid a crash if a file didn' t contain any resources.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: 5d5699569651acaafb4db84f2925368e92ad93f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d5699569651acaafb4db84f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 11:15:00 2009 +0200 wrc: Avoid a crash if a file didn't contain any resources. --- tools/wrc/parser.y | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index f891f24..d905475 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -386,15 +386,17 @@ resource_file $1 = rsc; /* Final statements before were done */ - head = get_resource_head($1); - if (resource_top) /* append to existing resources */ + if ((head = get_resource_head($1)) != NULL) { - resource_t *tail = resource_top; - while (tail->next) tail = tail->next; - tail->next = head; - head->prev = tail; + if (resource_top) /* append to existing resources */ + { + resource_t *tail = resource_top; + while (tail->next) tail = tail->next; + tail->next = head; + head->prev = tail; + } + else resource_top = head; } - else resource_top = head; sttres = NULL; } ;

1 0

Ricardo Filipe : taskmgr: Update Portuguese translation and convert to UTF8 .
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: 1eab4f2f3dd239d4874c52417e294755c8ef4bde URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eab4f2f3dd239d4874c52417… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Wed Jul 15 17:40:49 2009 -0700 taskmgr: Update Portuguese translation and convert to UTF8. --- programs/taskmgr/Pt.rc | 184 +++++++++++++++++++++++++++++++++++------------- 1 files changed, 136 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1eab4f2f3dd239d4874c5…

1 0

Ricardo Filipe : reg: Update Portuguese translation and convert to UTF8.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: 2f48c23e588293511f6e079c9d74ec2dc4b90a73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f48c23e588293511f6e079c9… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Wed Jul 15 16:05:39 2009 -0700 reg: Update Portuguese translation and convert to UTF8. --- programs/reg/Pt.rc | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/programs/reg/Pt.rc b/programs/reg/Pt.rc index 6294408..0de0e33 100644 --- a/programs/reg/Pt.rc +++ b/programs/reg/Pt.rc @@ -22,7 +22,9 @@ #include "reg.h" -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +#pragma code_page(65001) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE STRINGTABLE { @@ -30,4 +32,9 @@ STRINGTABLE STRING_ADD_USAGE, "REG ADD nome_chave [/v nome_valor | /ve] [/t tipo] [/s separador] [/d dados] [/f]\n" STRING_DELETE_USAGE, "REG DELETE nome_chave [/v nome_valor | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY nome_chave [/v nome_valor | /ve] [/s]\n" + STRING_SUCCESS, "A operação foi completada com sucesso\n" + STRING_INVALID_KEY, "Erro: Nome de chave inválido\n" + STRING_INVALID_CMDLINE, "Erro: Parâmetros da linha de comandos inválidos\n" + STRING_NO_REMOTE, "Erro: Incapaz de adicionar chaves à máquina remota\n" + STRING_CANNOT_FIND, "Erro: O sistema foi incapaz de encontrar a chave de registo ou valor especificado\n" }

1 0

Nikolay Sivov : comctl32/dpa: Don' t use start index on searching sorted array.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: 3373ed8fbb6aeaf2fd6fa484e5e05d9143b34fd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3373ed8fbb6aeaf2fd6fa484e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jul 15 23:59:25 2009 +0400 comctl32/dpa: Don't use start index on searching sorted array. --- dlls/comctl32/dpa.c | 3 ++- dlls/comctl32/tests/dpa.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c index bbad10d..43f2a3a 100644 --- a/dlls/comctl32/dpa.c +++ b/dlls/comctl32/dpa.c @@ -802,7 +802,8 @@ INT WINAPI DPA_Search (const HDPA hdpa, LPVOID pFind, INT nStart, INT l, r, x, n; LPVOID *lpPtr; - l = (nStart == -1) ? 0 : nStart; + /* for binary search ignore start index */ + l = 0; r = hdpa->nItemCount - 1; lpPtr = hdpa->ptrs; while (r >= l) { diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index ed28119..741aeb6 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -289,9 +289,9 @@ static void test_dpa(void) ok(j == DPA_ERR, "j=%d\n", j); /* ... but for a binary search it's ignored */ j = pDPA_Search(dpa, (PVOID)(INT_PTR)i, i+1, CB_CmpLT, 0xdeadbeef, DPAS_SORTED); - todo_wine ok(j+1 == i, "j=%d i=%d\n", j, i); + ok(j+1 == i, "j=%d i=%d\n", j, i); } - + /* Try to get the index of a nonexistent item */ i = pDPA_GetPtrIndex(dpa, (PVOID)7); ok(i == DPA_ERR, "i=%d\n", i);

1 0

Aric Stewart : gdi32: In init_system_links, reinitialize val_len and data_len before continuing.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: 6a5bb87e3a405bc8f8b410b283cbd364e2280cc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a5bb87e3a405bc8f8b410b28… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jul 15 14:31:17 2009 -0500 gdi32: In init_system_links, reinitialize val_len and data_len before continuing. --- dlls/gdi32/freetype.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 6500601..96b197a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1663,7 +1663,7 @@ static BOOL init_system_links(void) if(psub) { TRACE("%s: SystemLink entry for substituted font, ignoring\n", debugstr_w(value)); - continue; + goto next; } font_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*font_link)); font_link->font_name = strdupW(value); @@ -1712,6 +1712,7 @@ static BOOL init_system_links(void) } } list_add_tail(&system_links, &font_link->entry); + next: val_len = max_val + 1; data_len = max_data; }

1 0

Jacek Caban : include: Added netcon.idl.
by Alexandre Julliard 16 Jul '09

16 Jul '09

Module: wine Branch: master Commit: 3935c81b2120a6c46be9f043bb7132571d1c1321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3935c81b2120a6c46be9f043b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 16 00:58:25 2009 +0200 include: Added netcon.idl. --- .gitignore | 1 + dlls/uuid/uuid.c | 1 + include/Makefile.in | 1 + include/netcon.idl | 412 +++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 415 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3935c81b2120a6c46be9f…

1 0