September 2011 - Wine-commits

Erich Hoover : hhctrl.ocx: Use the correct values for current_tab when some tabs are disabled.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: 3228b4d1c3a0edca8ac061dc7882ea0255355684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3228b4d1c3a0edca8ac061dc7… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Sep 27 20:00:10 2011 -0600 hhctrl.ocx: Use the correct values for current_tab when some tabs are disabled. --- dlls/hhctrl.ocx/help.c | 19 ++++++++++++++++++- dlls/hhctrl.ocx/hhctrl.h | 1 + 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index d710d3b..fb9ea08 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -448,6 +448,7 @@ static LRESULT Child_OnSize(HWND hwnd) static LRESULT OnTabChange(HWND hwnd) { HHInfo *info = (HHInfo*)GetWindowLongPtrW(hwnd, GWLP_USERDATA); + int tab_id, tab_index, i; TRACE("%p\n", hwnd); @@ -457,7 +458,23 @@ static LRESULT OnTabChange(HWND hwnd) if(info->tabs[info->current_tab].hwnd) ShowWindow(info->tabs[info->current_tab].hwnd, SW_HIDE); - info->current_tab = SendMessageW(info->hwndTabCtrl, TCM_GETCURSEL, 0, 0); + tab_id = (int) SendMessageW(info->hwndTabCtrl, TCM_GETCURSEL, 0, 0); + /* convert the ID of the tab to an index in our tab list */ + tab_index = -1; + for (i=0; i<TAB_NUMTABS; i++) + { + if (info->tabs[i].id == tab_id) + { + tab_index = i; + break; + } + } + if (tab_index == -1) + { + FIXME("Tab ID %d does not correspond to a valid index in the tab list.\n", tab_id); + return 0; + } + info->current_tab = tab_index; if(info->tabs[info->current_tab].hwnd) ShowWindow(info->tabs[info->current_tab].hwnd, SW_SHOW); diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 8e63545..3e496f9 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -111,6 +111,7 @@ typedef struct CHMInfo #define TAB_INDEX 1 #define TAB_SEARCH 2 #define TAB_FAVORITES 3 +#define TAB_NUMTABS TAB_FAVORITES typedef struct { HWND hwnd;

1 0

Erich Hoover : hhctrl.ocx: Default to the correct tab for different HH_DISPLAY_* values.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: 973237996b6d4573b2469b5c4951bb31a239fd8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=973237996b6d4573b2469b5c4… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Sep 27 20:01:38 2011 -0600 hhctrl.ocx: Default to the correct tab for different HH_DISPLAY_* values. --- dlls/hhctrl.ocx/hhctrl.c | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 02d3b7d..2747dcb 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -159,12 +159,13 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat { case HH_DISPLAY_TOPIC: case HH_DISPLAY_TOC: + case HH_DISPLAY_INDEX: case HH_DISPLAY_SEARCH:{ HHInfo *info; BOOL res; + NMHDR nmhdr; const WCHAR *index = NULL; - - FIXME("Not all HH cases handled correctly\n"); + int tab_index = TAB_CONTENTS; if (!filename) return NULL; @@ -192,6 +193,32 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat ReleaseHelpViewer(info); return NULL; } + + switch(command) + { + case HH_DISPLAY_TOPIC: + case HH_DISPLAY_TOC: + tab_index = TAB_CONTENTS; + if (data) + FIXME("Should jump to topic '%s'.\n", debugstr_w((WCHAR *)data)); + break; + case HH_DISPLAY_INDEX: + tab_index = TAB_INDEX; + if (data) + FIXME("Should select keyword '%s'.\n", debugstr_w((WCHAR *)data)); + break; + case HH_DISPLAY_SEARCH: + tab_index = TAB_SEARCH; + if (data) + FIXME("Should display search specified by HH_FTS_QUERY structure.\n"); + break; + } + /* open the requested tab */ + memset(&nmhdr, 0, sizeof(nmhdr)); + nmhdr.code = TCN_SELCHANGE; + SendMessageW(info->hwndTabCtrl, TCM_SETCURSEL, (WPARAM)info->tabs[tab_index].id, 0); + SendMessageW(info->WinType.hwndNavigation, WM_NOTIFY, 0, (LPARAM)&nmhdr); + return info->WinType.hwndHelp; } case HH_HELP_CONTEXT: {

1 0

Erich Hoover : hhctrl.ocx: Open a specific topic when requested.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: f1b7bb4eaaeb1668169877d691a0d984b89a441d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1b7bb4eaaeb1668169877d69… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Sep 27 20:02:11 2011 -0600 hhctrl.ocx: Open a specific topic when requested. --- dlls/hhctrl.ocx/hhctrl.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 2747dcb..400f920 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -166,15 +166,17 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat NMHDR nmhdr; const WCHAR *index = NULL; int tab_index = TAB_CONTENTS; + const WCHAR *default_index = NULL; if (!filename) return NULL; - if (!resolve_filename(filename, fullname, MAX_PATH, &index, NULL)) + if (!resolve_filename(filename, fullname, MAX_PATH, &default_index, NULL)) { WARN("can't find %s\n", debugstr_w(filename)); return 0; } + index = default_index; info = CreateHelpViewer(fullname); if(!info) @@ -183,10 +185,20 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat if(!index) index = info->WinType.pszFile; + /* called to load a specified topic */ + switch(command) + { + case HH_DISPLAY_TOPIC: + case HH_DISPLAY_TOC: + if (data) + index = (const WCHAR *)data; + break; + } + res = NavigateToChm(info, info->pCHMInfo->szFile, index); - if (index != info->WinType.pszFile) - heap_free((WCHAR*)index); + if (default_index) + heap_free((WCHAR*)default_index); if(!res) { @@ -199,8 +211,6 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat case HH_DISPLAY_TOPIC: case HH_DISPLAY_TOC: tab_index = TAB_CONTENTS; - if (data) - FIXME("Should jump to topic '%s'.\n", debugstr_w((WCHAR *)data)); break; case HH_DISPLAY_INDEX: tab_index = TAB_INDEX;

1 0

Erich Hoover : hhctrl.ocx: When called as a program, quit when HtmlHelp call fails.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: 4cf842e75ddd77898070c2ebcbb16d82d5716678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cf842e75ddd77898070c2ebc… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Sep 27 20:02:32 2011 -0600 hhctrl.ocx: When called as a program, quit when HtmlHelp call fails. --- dlls/hhctrl.ocx/hhctrl.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 400f920..7647abb 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -349,6 +349,7 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) int len, buflen, mapid = -1; WCHAR *filename; char *endq = NULL; + HWND hwnd; hh_process = TRUE; @@ -404,12 +405,18 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) /* Open a specific help topic */ if(mapid != -1) - HtmlHelpW(GetDesktopWindow(), filename, HH_HELP_CONTEXT, mapid); + hwnd = HtmlHelpW(GetDesktopWindow(), filename, HH_HELP_CONTEXT, mapid); else - HtmlHelpW(GetDesktopWindow(), filename, HH_DISPLAY_TOPIC, 0); + hwnd = HtmlHelpW(GetDesktopWindow(), filename, HH_DISPLAY_TOPIC, 0); heap_free(filename); + if (!hwnd) + { + ERR("Failed to open HTML Help file '%s'.\n", szCmdLine); + return 0; + } + while (GetMessageW(&msg, 0, 0, 0)) { TranslateMessage(&msg);

1 0

Alexandre Julliard : winex11: Get rid of the client-side DIB optimization in StretchBlt.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: 6e80c49fc916acd6a534de990dc97968839dc7f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e80c49fc916acd6a534de990… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 28 11:12:14 2011 +0200 winex11: Get rid of the client-side DIB optimization in StretchBlt. --- dlls/winex11.drv/bitblt.c | 23 ++--------------------- dlls/winex11.drv/xrender.c | 17 ++--------------- 2 files changed, 4 insertions(+), 36 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 4c7246e..34d4c05 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1315,7 +1315,6 @@ BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, X11DRV_PDEVICE *physDevSrc = get_x11drv_dev( src_dev ); BOOL fStretch; INT width, height; - INT sDst, sSrc = DIB_Status_None; const BYTE *opcode; Pixmap src_pixmap; GC tmpGC; @@ -1328,25 +1327,11 @@ BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, fStretch = (src->width != dst->width) || (src->height != dst->height); - if (physDevDst != physDevSrc) - sSrc = X11DRV_LockDIBSection( physDevSrc, DIB_Status_None ); - width = dst->visrect.right - dst->visrect.left; height = dst->visrect.bottom - dst->visrect.top; - sDst = X11DRV_LockDIBSection( physDevDst, DIB_Status_None ); - if (physDevDst == physDevSrc) sSrc = sDst; - - /* try client-side DIB copy */ - if (!fStretch && sSrc == DIB_Status_AppMod) - { - if (physDevDst != physDevSrc) X11DRV_UnlockDIBSection( physDevSrc, FALSE ); - X11DRV_UnlockDIBSection( physDevDst, TRUE ); - dst_dev = GET_NEXT_PHYSDEV( dst_dev, pStretchBlt ); - return dst_dev->funcs->pStretchBlt( dst_dev, dst, src_dev, src, rop ); - } - - X11DRV_CoerceDIBSection( physDevDst, DIB_Status_GdiMod ); + X11DRV_LockDIBSection( physDevDst, DIB_Status_GdiMod ); + if (physDevDst != physDevSrc) X11DRV_LockDIBSection( physDevSrc, DIB_Status_GdiMod ); opcode = BITBLT_Opcodes[(rop >> 16) & 0xff]; @@ -1359,7 +1344,6 @@ BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, XSetFunction( gdi_display, physDevDst->gc, OP_ROP(*opcode) ); wine_tsx11_unlock(); - if (physDevSrc != physDevDst) X11DRV_CoerceDIBSection( physDevSrc, DIB_Status_GdiMod ); wine_tsx11_lock(); XCopyArea( gdi_display, physDevSrc->drawable, physDevDst->drawable, physDevDst->gc, @@ -1376,7 +1360,6 @@ BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, { int fg, bg; - X11DRV_CoerceDIBSection( physDevSrc, DIB_Status_GdiMod ); get_colors(physDevDst, physDevSrc, &fg, &bg); wine_tsx11_lock(); XSetBackground( gdi_display, physDevDst->gc, fg ); @@ -1402,8 +1385,6 @@ BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, src_pixmap = XCreatePixmap( gdi_display, root_window, width, height, physDevDst->depth ); wine_tsx11_unlock(); - if (physDevDst != physDevSrc) X11DRV_CoerceDIBSection( physDevSrc, DIB_Status_GdiMod ); - if (fStretch) BITBLT_GetSrcAreaStretch( physDevSrc, physDevDst, src_pixmap, tmpGC, src, dst ); else diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index a51543b..e37ddc2 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2609,7 +2609,6 @@ static BOOL xrenderdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, { struct xrender_physdev *physdev_dst = get_xrender_dev( dst_dev ); struct xrender_physdev *physdev_src = get_xrender_dev( src_dev ); - INT sSrc, sDst; BOOL stretch = (src->width != dst->width) || (src->height != dst->height); if (src_dev->funcs != dst_dev->funcs) @@ -2627,20 +2626,8 @@ static BOOL xrenderdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, /* if not stretching, we only need to handle format conversion */ if (!stretch && physdev_dst->format == physdev_src->format) goto x11drv_fallback; - sSrc = sDst = X11DRV_LockDIBSection( physdev_dst->x11dev, DIB_Status_None ); - if (physdev_dst != physdev_src) sSrc = X11DRV_LockDIBSection( physdev_src->x11dev, DIB_Status_None ); - - /* try client-side DIB copy */ - if (!stretch && sSrc == DIB_Status_AppMod) - { - if (physdev_dst != physdev_src) X11DRV_UnlockDIBSection( physdev_src->x11dev, FALSE ); - X11DRV_UnlockDIBSection( physdev_dst->x11dev, TRUE ); - dst_dev = GET_NEXT_PHYSDEV( dst_dev, pStretchBlt ); - return dst_dev->funcs->pStretchBlt( dst_dev, dst, src_dev, src, rop ); - } - - X11DRV_CoerceDIBSection( physdev_dst->x11dev, DIB_Status_GdiMod ); - if (physdev_dst != physdev_src) X11DRV_CoerceDIBSection( physdev_src->x11dev, DIB_Status_GdiMod ); + X11DRV_LockDIBSection( physdev_dst->x11dev, DIB_Status_GdiMod ); + if (physdev_dst != physdev_src) X11DRV_LockDIBSection( physdev_src->x11dev, DIB_Status_GdiMod ); if (rop != SRCCOPY) {

1 0

Alexandre Julliard : winex11: Fall back to the DIB engine for client-side stretching.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: 6861f4c252fc4d2932679f3f161501d283566325 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6861f4c252fc4d2932679f3f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 28 11:27:19 2011 +0200 winex11: Fall back to the DIB engine for client-side stretching. --- dlls/winex11.drv/bitblt.c | 350 +-------------------------------------------- 1 files changed, 4 insertions(+), 346 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6861f4c252fc4d2932679…

1 0

Alistair Leslie-Hughes : mscoree: Add ICorDebug interface support.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: bef72c48846b0bab3bb91f1bbe34afc41bc68573 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bef72c48846b0bab3bb91f1bb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Sep 27 09:06:18 2011 +1000 mscoree: Add ICorDebug interface support. --- dlls/mscoree/Makefile.in | 1 + dlls/mscoree/assembly.c | 2 + dlls/mscoree/config.c | 3 + dlls/mscoree/cordebug.c | 177 ++++++++++++++++++++++++++++++++++++++++ dlls/mscoree/corruntimehost.c | 22 ++--- dlls/mscoree/metadata.c | 4 +- dlls/mscoree/metahost.c | 7 +- dlls/mscoree/mscoree_main.c | 45 +++++++++- dlls/mscoree/mscoree_private.h | 44 +++++++--- dlls/mscoree/tests/Makefile.in | 1 + dlls/mscoree/tests/debugging.c | 106 ++++++++++++++++++++++++ include/cordebug.idl | 5 + include/metahost.idl | 1 + 13 files changed, 385 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bef72c48846b0bab3bb91…

1 0

Frédéric Delanoy : msvcrt/tests: Remove dead assignments (Clang).
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: 3274475299252a414b7abfefc7653ab55682a9e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3274475299252a414b7abfefc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Sep 26 15:52:36 2011 +0200 msvcrt/tests: Remove dead assignments (Clang). --- dlls/msvcrt/tests/file.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 09a88c8..e7b7353 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -130,15 +130,15 @@ static void test_fileops( void ) ok(buffer[0] == outbuffer[strlen(outbuffer)-1],"fgets exchanged chars for bufmode=%x\n", bufmodes[bufmode]); rewind(file); - for (i = 0, c = EOF; i < sizeof(outbuffer); i++) + for (i = 0; i < sizeof(outbuffer); i++) { - ok((c = fgetc(file)) == outbuffer[i], "fgetc returned wrong data for bufmode=%x\n", bufmodes[bufmode]); + ok(fgetc(file) == outbuffer[i], "fgetc returned wrong data for bufmode=%x\n", bufmodes[bufmode]); } ok((c = fgetc(file)) == EOF, "getc did not return EOF for bufmode=%x\n", bufmodes[bufmode]); ok(feof(file), "feof did not return EOF for bufmode=%x\n", bufmodes[bufmode]); ok(ungetc(c, file) == EOF, "ungetc(EOF) did not return EOF for bufmode=%x\n", bufmodes[bufmode]); ok(feof(file), "feof after ungetc(EOF) did not return EOF for bufmode=%x\n", bufmodes[bufmode]); - ok((c = fgetc(file)) == EOF, "getc did not return EOF for bufmode=%x\n", bufmodes[bufmode]); + ok(fgetc(file) == EOF, "getc did not return EOF for bufmode=%x\n", bufmodes[bufmode]); c = outbuffer[sizeof(outbuffer) - 1]; ok(ungetc(c, file) == c, "ungetc did not return its input for bufmode=%x\n", bufmodes[bufmode]); ok(!feof(file), "feof after ungetc returned EOF for bufmode=%x\n", bufmodes[bufmode]); @@ -146,7 +146,7 @@ static void test_fileops( void ) ok(c == outbuffer[sizeof(outbuffer) - 1], "getc did not return ungetc'd data for bufmode=%x\n", bufmodes[bufmode]); ok(!feof(file), "feof after getc returned EOF prematurely for bufmode=%x\n", bufmodes[bufmode]); - ok((c = fgetc(file)) == EOF, "getc did not return EOF for bufmode=%x\n", bufmodes[bufmode]); + ok(fgetc(file) == EOF, "getc did not return EOF for bufmode=%x\n", bufmodes[bufmode]); ok(feof(file), "feof after getc did not return EOF for bufmode=%x\n", bufmodes[bufmode]); rewind(file);

1 0

Alexandre Julliard : makedep: Ensure that error messages contain "error".
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: 54f71a0d8e9da5d5e565d8fd7e98e5d66c9cd3f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54f71a0d8e9da5d5e565d8fd7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 28 12:55:16 2011 +0200 makedep: Ensure that error messages contain "error". Suggested by Dan Kegel. --- tools/makedep.c | 56 +++++++++++++++++++++++++++++++----------------------- 1 files changed, 32 insertions(+), 24 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 799c6e0..2d3e5b4 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -108,7 +108,7 @@ static void *xmalloc( size_t size ) { void *res; if (!(res = malloc (size ? size : 1))) - fatal_error( "%s: Virtual memory exhausted.\n", ProgramName ); + fatal_error( "%s: error: Virtual memory exhausted.\n", ProgramName ); return res; } @@ -121,7 +121,7 @@ static void *xrealloc (void *ptr, size_t size) void *res; assert( size ); if (!(res = realloc( ptr, size ))) - fatal_error( "%s: Virtual memory exhausted.\n", ProgramName ); + fatal_error( "%s: error: Virtual memory exhausted.\n", ProgramName ); return res; } @@ -131,7 +131,7 @@ static void *xrealloc (void *ptr, size_t size) static char *xstrdup( const char *str ) { char *res = strdup( str ); - if (!res) fatal_error( "%s: Virtual memory exhausted.\n", ProgramName ); + if (!res) fatal_error( "%s: error: Virtual memory exhausted.\n", ProgramName ); return res; } @@ -286,36 +286,36 @@ static INCL_FILE *add_include( INCL_FILE *pFile, const char *name, int line, int for (pos = 0; pos < MAX_INCLUDES; pos++) if (!pFile->files[pos]) break; if (pos >= MAX_INCLUDES) - fatal_error( "%s: %s: too many included files, please fix MAX_INCLUDES\n", + fatal_error( "%s: %s: error: too many included files, please fix MAX_INCLUDES\n", ProgramName, pFile->name ); /* enforce some rules for the Wine tree */ if (!memcmp( name, "../", 3 )) - fatal_error( "%s:%d: #include directive with relative path not allowed\n", + fatal_error( "%s:%d: error: #include directive with relative path not allowed\n", pFile->filename, line ); if (!strcmp( name, "config.h" )) { if ((ext = strrchr( pFile->filename, '.' )) && !strcmp( ext, ".h" )) - fatal_error( "%s:%d: config.h must not be included by a header file\n", + fatal_error( "%s:%d: error: config.h must not be included by a header file\n", pFile->filename, line ); if (pos) - fatal_error( "%s:%d: config.h must be included before anything else\n", + fatal_error( "%s:%d: error: config.h must be included before anything else\n", pFile->filename, line ); } else if (!strcmp( name, "wine/port.h" )) { if ((ext = strrchr( pFile->filename, '.' )) && !strcmp( ext, ".h" )) - fatal_error( "%s:%d: wine/port.h must not be included by a header file\n", + fatal_error( "%s:%d: error: wine/port.h must not be included by a header file\n", pFile->filename, line ); - if (!pos) fatal_error( "%s:%d: config.h must be included before wine/port.h\n", + if (!pos) fatal_error( "%s:%d: error: config.h must be included before wine/port.h\n", pFile->filename, line ); if (pos > 1) - fatal_error( "%s:%d: wine/port.h must be included before everything except config.h\n", + fatal_error( "%s:%d: error: wine/port.h must be included before everything except config.h\n", pFile->filename, line ); if (strcmp( pFile->files[0]->name, "config.h" )) - fatal_error( "%s:%d: config.h must be included before wine/port.h\n", + fatal_error( "%s:%d: error: config.h must be included before wine/port.h\n", pFile->filename, line ); } @@ -356,6 +356,7 @@ static FILE *open_src_file( INCL_FILE *pFile ) } if (!file) { + fprintf( stderr, "%s: error: ", ProgramName ); perror( pFile->name ); exit(1); } @@ -527,13 +528,15 @@ static FILE *open_include_file( INCL_FILE *pFile ) free( filename ); } + fprintf( stderr, "%s:%d: error: ", pFile->included_by->filename, pFile->included_line ); perror( pFile->name ); - while (pFile->included_by) + pFile = pFile->included_by; + while (pFile && pFile->included_by) { const char *parent = pFile->included_by->sourcename; if (!parent) parent = pFile->included_by->name; - fprintf( stderr, " %s was first included from %s:%d\n", - pFile->name, parent, pFile->included_line ); + fprintf( stderr, "%s:%d: note: %s was first included here\n", + parent, pFile->included_line, pFile->name ); pFile = pFile->included_by; } exit(1); @@ -575,7 +578,8 @@ static void parse_idl_file( INCL_FILE *pFile, FILE *file, int for_h_file ) if (*p != '"') continue; include = ++p; while (*p && (*p != '"')) p++; - if (!*p) fatal_error( "%s:%d: Malformed import directive\n", pFile->filename, input_line ); + if (!*p) fatal_error( "%s:%d: error: Malformed import directive\n", + pFile->filename, input_line ); *p = 0; if (for_h_file && strendswith( include, ".idl" )) strcpy( p - 4, ".h" ); add_include( pFile, include, input_line, 0 ); @@ -608,7 +612,7 @@ static void parse_idl_file( INCL_FILE *pFile, FILE *file, int for_h_file ) include = p; while (*p && (*p != quote)) p++; if (!*p || (quote == '"' && p[-1] != '\\')) - fatal_error( "%s:%d: Malformed #include directive inside cpp_quote\n", + fatal_error( "%s:%d: error: Malformed #include directive inside cpp_quote\n", pFile->filename, input_line ); if (quote == '"') p--; /* remove backslash */ *p = 0; @@ -627,7 +631,8 @@ static void parse_idl_file( INCL_FILE *pFile, FILE *file, int for_h_file ) if (quote == '<') quote = '>'; include = p; while (*p && (*p != quote)) p++; - if (!*p) fatal_error( "%s:%d: Malformed #include directive\n", pFile->filename, input_line ); + if (!*p) fatal_error( "%s:%d: error: Malformed #include directive\n", + pFile->filename, input_line ); *p = 0; add_include( pFile, include, input_line, (quote == '>') ); } @@ -656,7 +661,7 @@ static void parse_c_file( INCL_FILE *pFile, FILE *file ) if (quote == '<') quote = '>'; include = p; while (*p && (*p != quote)) p++; - if (!*p) fatal_error( "%s:%d: Malformed #include directive\n", + if (!*p) fatal_error( "%s:%d: error: Malformed #include directive\n", pFile->filename, input_line ); *p = 0; add_include( pFile, include, input_line, (quote == '>') ); @@ -697,7 +702,7 @@ static void parse_rc_file( INCL_FILE *pFile, FILE *file ) while (*p && !isspace(*p) && *p != '*') p++; } if (!*p) - fatal_error( "%s:%d: Malformed makedep comment\n", pFile->filename, input_line ); + fatal_error( "%s:%d: error: Malformed makedep comment\n", pFile->filename, input_line ); *p = 0; } else /* check for #include */ @@ -712,7 +717,7 @@ static void parse_rc_file( INCL_FILE *pFile, FILE *file ) if (quote == '<') quote = '>'; include = p; while (*p && (*p != quote)) p++; - if (!*p) fatal_error( "%s:%d: Malformed #include directive\n", + if (!*p) fatal_error( "%s:%d: error: Malformed #include directive\n", pFile->filename, input_line ); *p = 0; } @@ -954,7 +959,8 @@ static FILE *create_temp_file( char **tmp_name ) if (errno != EEXIST) break; id += 7777; } - if (!ret) fatal_error( "failed to create output file for '%s'\n", OutputFileName ); + if (!ret) fatal_error( "%s: error: failed to create output file for '%s'\n", + ProgramName, OutputFileName ); *tmp_name = name; return ret; } @@ -979,7 +985,7 @@ static void output_dependencies(void) while (fgets( buffer, sizeof(buffer), file ) && !found) { if (fwrite( buffer, 1, strlen(buffer), tmp_file ) != strlen(buffer)) - fatal_error( "error writing to %s\n", tmp_name ); + fatal_error( "%s: error: failed to write to %s\n", ProgramName, tmp_name ); found = !strncmp( buffer, Separator, strlen(Separator) ); } fclose( file ); @@ -1017,7 +1023,8 @@ static void output_dependencies(void) if (ret == -1) { unlink( tmp_name ); - fatal_error( "failed to rename output file to '%s'\n", OutputFileName ); + fatal_error( "%s: error: failed to rename output file to '%s'\n", + ProgramName, OutputFileName ); } free( tmp_name ); } @@ -1070,7 +1077,8 @@ int main( int argc, char *argv[] ) INCL_PATH *path, *next; int i, j; - ProgramName = argv[0]; + if ((ProgramName = strrchr( argv[0], '/' ))) ProgramName++; + else ProgramName = argv[0]; i = 1; while (i < argc)

1 0

Huw Davies : gdi32: Use a separate variable to indicate the default has been retrieved.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: b4430319f16753270397e11310ac327736d438a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4430319f16753270397e1131… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 28 13:46:48 2011 +0100 gdi32: Use a separate variable to indicate the default has been retrieved. --- dlls/gdi32/freetype.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index d71b0c5..81c704b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4602,16 +4602,21 @@ DWORD WineEngGetGlyphIndices(GdiFont *font, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags) { int i; - int default_char = -1; + WORD default_char; + BOOL got_default = FALSE; - if (flags & GGI_MARK_NONEXISTING_GLYPHS) default_char = 0xffff; /* XP would use 0x1f for bitmap fonts */ + if (flags & GGI_MARK_NONEXISTING_GLYPHS) + { + default_char = 0xffff; /* XP would use 0x1f for bitmap fonts */ + got_default = TRUE; + } for(i = 0; i < count; i++) { pgi[i] = get_glyph_index(font, lpstr[i]); if (pgi[i] == 0) { - if (default_char == -1) + if (!got_default) { if (FT_IS_SFNT(font->ft_face)) { @@ -4624,6 +4629,7 @@ DWORD WineEngGetGlyphIndices(GdiFont *font, LPCWSTR lpstr, INT count, WineEngGetTextMetrics(font, &textm); default_char = textm.tmDefaultChar; } + got_default = TRUE; } pgi[i] = default_char; }

1 0