wine-commits December 2012

wine-commits@winehq.org

2 participants
549 discussions

Henri Verbeet : ddraw: Avoid LPDDCAPS.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: wine Branch: master Commit: 9800ad3d7181a1e561e28b281cbc9473891a93fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9800ad3d7181a1e561e28b281… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 5 21:01:45 2012 +0100 ddraw: Avoid LPDDCAPS. --- include/ddraw.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/ddraw.h b/include/ddraw.h index 7e96762..9416951 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -1332,7 +1332,7 @@ DECLARE_INTERFACE_(IDirectDraw,IUnknown) STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK lpEnumModesCallback) PURE; STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE; STDMETHOD(FlipToGDISurface)(THIS) PURE; - STDMETHOD(GetCaps)(THIS_ LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) PURE; + STDMETHOD(GetCaps)(THIS_ DDCAPS *driver_caps, DDCAPS *hel_caps) PURE; STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE; STDMETHOD(GetGDISurface)(THIS_ struct IDirectDrawSurface **surface) PURE; @@ -1442,7 +1442,7 @@ DECLARE_INTERFACE_(IDirectDraw2,IUnknown) /*20*/ STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK lpEnumModesCallback) PURE; /*24*/ STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE; /*28*/ STDMETHOD(FlipToGDISurface)(THIS) PURE; -/*2c*/ STDMETHOD(GetCaps)(THIS_ LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) PURE; +/*2c*/ STDMETHOD(GetCaps)(THIS_ DDCAPS *driver_caps, DDCAPS *hel_caps) PURE; /*30*/ STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; /*34*/ STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE; /*38*/ STDMETHOD(GetGDISurface)(THIS_ struct IDirectDrawSurface **surface) PURE; @@ -1540,7 +1540,7 @@ DECLARE_INTERFACE_(IDirectDraw3,IUnknown) /*20*/ STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK lpEnumModesCallback) PURE; /*24*/ STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE; /*28*/ STDMETHOD(FlipToGDISurface)(THIS) PURE; -/*2c*/ STDMETHOD(GetCaps)(THIS_ LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) PURE; +/*2c*/ STDMETHOD(GetCaps)(THIS_ DDCAPS *driver_caps, DDCAPS *hel_caps) PURE; /*30*/ STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; /*34*/ STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE; /*38*/ STDMETHOD(GetGDISurface)(THIS_ struct IDirectDrawSurface **surface) PURE; @@ -1644,7 +1644,7 @@ DECLARE_INTERFACE_(IDirectDraw4,IUnknown) /*20*/ STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK2 lpEnumModesCallback) PURE; /*24*/ STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK2 lpEnumSurfacesCallback) PURE; /*28*/ STDMETHOD(FlipToGDISurface)(THIS) PURE; -/*2c*/ STDMETHOD(GetCaps)(THIS_ LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) PURE; +/*2c*/ STDMETHOD(GetCaps)(THIS_ DDCAPS *driver_caps, DDCAPS *hel_caps) PURE; /*30*/ STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; /*34*/ STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE; /*38*/ STDMETHOD(GetGDISurface)(THIS_ struct IDirectDrawSurface4 **surface) PURE; @@ -1760,7 +1760,7 @@ DECLARE_INTERFACE_(IDirectDraw7,IUnknown) /*20*/ STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK2 lpEnumModesCallback) PURE; /*24*/ STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK7 lpEnumSurfacesCallback) PURE; /*28*/ STDMETHOD(FlipToGDISurface)(THIS) PURE; -/*2c*/ STDMETHOD(GetCaps)(THIS_ LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) PURE; +/*2c*/ STDMETHOD(GetCaps)(THIS_ DDCAPS *driver_caps, DDCAPS *hel_caps) PURE; /*30*/ STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; /*34*/ STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE; /*38*/ STDMETHOD(GetGDISurface)(THIS_ struct IDirectDrawSurface7 **surface) PURE;

1 0

Henri Verbeet : ddraw: Avoid LPDDSCAPS2.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: wine Branch: master Commit: 338e4593ac87ee50eca8628e7592fc62e564b80f URL: http://source.winehq.org/git/wine.git/?a=commit;h=338e4593ac87ee50eca8628e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 5 21:01:44 2012 +0100 ddraw: Avoid LPDDSCAPS2. --- include/ddraw.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/ddraw.h b/include/ddraw.h index ec4b850..7e96762 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -1657,7 +1657,7 @@ DECLARE_INTERFACE_(IDirectDraw4,IUnknown) /*54*/ STDMETHOD(SetDisplayMode)(THIS_ DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) PURE; /*58*/ STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD dwFlags, HANDLE hEvent) PURE; /* added in v2 */ -/*5c*/ STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS2 lpDDCaps, LPDWORD lpdwTotal, LPDWORD lpdwFree) PURE; +/*5c*/ STDMETHOD(GetAvailableVidMem)(THIS_ DDSCAPS2 *caps, DWORD *total, DWORD *free) PURE; /* added in v4 */ /*60*/ STDMETHOD(GetSurfaceFromDC)(THIS_ HDC dc, struct IDirectDrawSurface4 **surface) PURE; /*64*/ STDMETHOD(RestoreAllSurfaces)(THIS) PURE; @@ -1773,7 +1773,7 @@ DECLARE_INTERFACE_(IDirectDraw7,IUnknown) /*54*/ STDMETHOD(SetDisplayMode)(THIS_ DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) PURE; /*58*/ STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD dwFlags, HANDLE hEvent) PURE; /* added in v2 */ -/*5c*/ STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS2 lpDDCaps, LPDWORD lpdwTotal, LPDWORD lpdwFree) PURE; +/*5c*/ STDMETHOD(GetAvailableVidMem)(THIS_ DDSCAPS2 *caps, DWORD *total, DWORD *free) PURE; /* added in v4 */ /*60*/ STDMETHOD(GetSurfaceFromDC)(THIS_ HDC dc, struct IDirectDrawSurface7 **surface) PURE; /*64*/ STDMETHOD(RestoreAllSurfaces)(THIS) PURE; @@ -2315,7 +2315,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface4,IUnknown) STDMETHOD(Flip)(THIS_ IDirectDrawSurface4 *dst_surface, DWORD flags) PURE; STDMETHOD(GetAttachedSurface)(THIS_ DDSCAPS2 *caps, IDirectDrawSurface4 **attachment) PURE; STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE; - STDMETHOD(GetCaps)(THIS_ LPDDSCAPS2 lpDDSCaps) PURE; + STDMETHOD(GetCaps)(THIS_ DDSCAPS2 *caps) PURE; STDMETHOD(GetClipper)(THIS_ IDirectDrawClipper **clipper) PURE; STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; STDMETHOD(GetDC)(THIS_ HDC *lphDC) PURE; @@ -2482,7 +2482,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface7,IUnknown) STDMETHOD(Flip)(THIS_ IDirectDrawSurface7 *dst_surface, DWORD flags) PURE; STDMETHOD(GetAttachedSurface)(THIS_ DDSCAPS2 *caps, IDirectDrawSurface7 **attachment) PURE; STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE; - STDMETHOD(GetCaps)(THIS_ LPDDSCAPS2 lpDDSCaps) PURE; + STDMETHOD(GetCaps)(THIS_ DDSCAPS2 *caps) PURE; STDMETHOD(GetClipper)(THIS_ IDirectDrawClipper **clipper) PURE; STDMETHOD(GetColorKey)(THIS_ DWORD dwFlags, LPDDCOLORKEY lpDDColorKey) PURE; STDMETHOD(GetDC)(THIS_ HDC *lphDC) PURE;

1 0

Alexandre Julliard : gdi32: Don' t store a font pointer in the generic part of the DC.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: wine Branch: master Commit: 8cca615f0200df17ab71199590db1194bfeade86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cca615f0200df17ab7119959… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 5 21:13:54 2012 +0100 gdi32: Don't store a font pointer in the generic part of the DC. --- dlls/gdi32/dc.c | 1 - dlls/gdi32/freetype.c | 4 ++-- dlls/gdi32/gdi_private.h | 3 --- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 5df55bc..07d68eb 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -409,7 +409,6 @@ INT nulldrv_SaveDC( PHYSDEV dev ) newdc->vportExtY = dc->vportExtY; newdc->virtual_res = dc->virtual_res; newdc->virtual_size = dc->virtual_size; - newdc->gdiFont = dc->gdiFont; /* Get/SetDCState() don't change hVisRgn field ("Undoc. Windows" p.559). */ diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index a06d575..456a094 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -309,6 +309,8 @@ typedef struct tagHFONTLIST { HFONT hfont; } HFONTLIST; +typedef struct tagGdiFont GdiFont; + typedef struct { struct list entry; Face *face; @@ -4552,7 +4554,6 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) if (!hfont) /* notification that the font has been changed by another driver */ { - dc->gdiFont = NULL; physdev->font = NULL; release_dc_ptr( dc ); return 0; @@ -5010,7 +5011,6 @@ done: } } TRACE( "%p %s %d aa %x\n", hfont, debugstr_w(lf.lfFaceName), lf.lfHeight, *aa_flags ); - dc->gdiFont = ret; physdev->font = ret; } LeaveCriticalSection( &freetype_cs ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 2408c97..8288e35 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -57,8 +57,6 @@ struct gdi_obj_funcs BOOL (*pDeleteObject)( HGDIOBJ handle ); }; -typedef struct tagGdiFont GdiFont; - typedef struct tagDC { HDC hSelf; /* Handle to this DC */ @@ -103,7 +101,6 @@ typedef struct tagDC HBITMAP hBitmap; HPALETTE hPalette; - GdiFont *gdiFont; struct gdi_path *path; UINT font_code_page;

1 0

Alexandre Julliard : gdi32: Don' t create a separate font handle for linked fonts.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: wine Branch: master Commit: baedf81b11d2321a0c1ca903d89bfcd762226dfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=baedf81b11d2321a0c1ca903d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 5 21:13:29 2012 +0100 gdi32: Don't create a separate font handle for linked fonts. --- dlls/gdi32/freetype.c | 44 +------------------------------------------- 1 files changed, 1 insertions(+), 43 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f9db1d7..a06d575 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -374,7 +374,6 @@ struct enum_charset_list { static struct list gdi_font_list = LIST_INIT(gdi_font_list); static struct list unused_gdi_font_list = LIST_INIT(unused_gdi_font_list); #define UNUSED_CACHE_SIZE 10 -static struct list child_font_list = LIST_INIT(child_font_list); static struct list system_links = LIST_INIT(system_links); static struct list font_subst_list = LIST_INIT(font_subst_list); @@ -4058,7 +4057,6 @@ static void free_font(GdiFont *font) LIST_FOR_EACH_SAFE(cursor, cursor2, &font->hfontlist) { HFONTLIST *hfontlist = LIST_ENTRY(cursor, HFONTLIST, entry); - DeleteObject(hfontlist->hfont); list_remove(&hfontlist->entry); HeapFree(GetProcessHeap(), 0, hfontlist); } @@ -4288,19 +4286,6 @@ static GdiFont *find_in_cache(HFONT hfont, const LOGFONTW *plf, const FMAT2 *pma fd.can_use_bitmap = can_use_bitmap; calc_hash(&fd); - /* try the child list */ - LIST_FOR_EACH(font_elem_ptr, &child_font_list) { - ret = LIST_ENTRY(font_elem_ptr, struct tagGdiFont, entry); - if(!fontcmp(ret, &fd)) { - if(!can_use_bitmap && !FT_IS_SCALABLE(ret->ft_face)) continue; - LIST_FOR_EACH(hfontlist_elem_ptr, &ret->hfontlist) { - hflist = LIST_ENTRY(hfontlist_elem_ptr, struct tagHFONTLIST, entry); - if(hflist->hfont == hfont) - return ret; - } - } - } - /* try the in-use list */ LIST_FOR_EACH(font_elem_ptr, &gdi_font_list) { ret = LIST_ENTRY(font_elem_ptr, struct tagGdiFont, entry); @@ -5051,13 +5036,6 @@ static void dump_gdi_font_list(void) TRACE("gdiFont=%p %s %d\n", gdiFont, debugstr_w(gdiFont->font_desc.lf.lfFaceName), gdiFont->font_desc.lf.lfHeight); } - - TRACE("---------- Child gdiFont Cache ----------\n"); - LIST_FOR_EACH(elem_ptr, &child_font_list) { - gdiFont = LIST_ENTRY(elem_ptr, struct tagGdiFont, entry); - TRACE("gdiFont=%p %s %d\n", - gdiFont, debugstr_w(gdiFont->font_desc.lf.lfFaceName), gdiFont->font_desc.lf.lfHeight); - } } /************************************************************* @@ -5077,21 +5055,6 @@ BOOL WineEngDestroyFontInstance(HFONT handle) GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); - LIST_FOR_EACH_ENTRY(gdiFont, &child_font_list, struct tagGdiFont, entry) - { - hfontlist_elem_ptr = list_head(&gdiFont->hfontlist); - while(hfontlist_elem_ptr) { - hflist = LIST_ENTRY(hfontlist_elem_ptr, struct tagHFONTLIST, entry); - hfontlist_elem_ptr = list_next(&gdiFont->hfontlist, hfontlist_elem_ptr); - if(hflist->hfont == handle) { - TRACE("removing child font %p from child list\n", gdiFont); - list_remove(&gdiFont->entry); - LeaveCriticalSection( &freetype_cs ); - return TRUE; - } - } - } - TRACE("destroying hfont=%p\n", handle); if(TRACE_ON(font)) dump_gdi_font_list(); @@ -7128,7 +7091,6 @@ static UINT freetype_GetOutlineTextMetrics( PHYSDEV dev, UINT cbSize, OUTLINETEX static BOOL load_child_font(GdiFont *font, CHILD_FONT *child) { - HFONTLIST *hfontlist; child->font = alloc_font(); child->font->ft_face = OpenFontFace(child->font, child->face, 0, -font->ppem); if(!child->font->ft_face) @@ -7142,13 +7104,9 @@ static BOOL load_child_font(GdiFont *font, CHILD_FONT *child) child->font->ntmFlags = child->face->ntmFlags; child->font->orientation = font->orientation; child->font->scale_y = font->scale_y; - hfontlist = HeapAlloc(GetProcessHeap(), 0, sizeof(*hfontlist)); - hfontlist->hfont = CreateFontIndirectW(&font->font_desc.lf); child->font->name = strdupW(child->face->family->FamilyName); - list_add_head(&child->font->hfontlist, &hfontlist->entry); child->font->base_font = font; - list_add_head(&child_font_list, &child->font->entry); - TRACE("created child font hfont %p for base %p child %p\n", hfontlist->hfont, font, child->font); + TRACE("created child font %p for base %p\n", child->font, font); return TRUE; }

1 0

Francois Gouget : testbot/TestAgent: Remove some unneeded checks for a broken connection.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: tools Branch: master Commit: 2ff8c9c40724bdd5771ab92d197c2438639c01c3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2ff8c9c40724bdd5771ab92d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 6 21:01:13 2012 +0100 testbot/TestAgent: Remove some unneeded checks for a broken connection. These checks are redundant with the first recv_xxx() or send_xxx() call these functions make (only send_file() is a slightly special case). --- testbot/src/testagentd/testagentd.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 6d4589e..fc3a840 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -215,9 +215,6 @@ static int recv_raw_data(SOCKET client, void* data, uint64_t size) static int recv_raw_uint32(SOCKET client, uint32_t *u32) { - if (broken) - return 0; - if (!recv_raw_data(client, u32, sizeof(*u32))) return 0; *u32 = ntohl(*u32); @@ -228,9 +225,6 @@ static int recv_raw_uint64(SOCKET client, uint64_t *u64) { uint32_t high, low; - if (broken) - return 0; - if (!recv_raw_uint32(client, &high) || !recv_raw_uint32(client, &low)) return 0; *u64 = ((uint64_t)high) << 32 | low; @@ -244,9 +238,6 @@ static int recv_raw_uint64(SOCKET client, uint64_t *u64) static int recv_entry_header(SOCKET client, char *type, uint64_t *size) { - if (broken) - return 0; - return recv_raw_data(client, type, sizeof(*type)) && recv_raw_uint64(client, size); } @@ -259,9 +250,6 @@ static int expect_entry_header(SOCKET client, char type, uint64_t *size) uint64_t hsize; int success; - if (broken) - return 0; - if (!recv_entry_header(client, &htype, &hsize)) return 0;

1 0

Francois Gouget : testbot/TestAgent: Tweak the getfile RPC error handling.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: tools Branch: master Commit: 6dcdc3c5153cbc0a9d179624cb81b8198adf8fb4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6dcdc3c5153cbc0a9d179624… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 6 21:01:02 2012 +0100 testbot/TestAgent: Tweak the getfile RPC error handling. Send the error message from the do_xxx() function like we do for all other RPCs rather than from the lower level send_file() function. --- testbot/src/testagentd/testagentd.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index bb50d91..6d4589e 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -542,12 +542,12 @@ static int send_file(SOCKET client, int fd, const char* filename) debug(" send_file(%s)\n", filename); if (fstat(fd, &st)) { - set_status(ST_ERROR, "unable to compute the size of '%s': %s", filename, strerror(errno)); - send_error(client); + set_status(ST_ERROR, "unable to get the size of '%s': %s", filename, strerror(errno)); return 0; } size = st.st_size; - send_entry_header(client, 'd', size); + if (!send_entry_header(client, 'd', size)) + return 0; while (size) { @@ -612,12 +612,18 @@ static void do_getfile(SOCKET client) } else { - send_list_size(client, 1); - send_file(client, fd, filename); + if (!send_list_size(client, 1) || + !send_file(client, fd, filename)) + { + /* If the file is not accessible then send_file() will fail and we + * can still salvage the connection by sending the error message + * in place of the file content. In all the other cases the + * connection is broken anyway which send_error() will deal with + * just fine. + */ + send_error(client); + } close(fd); - /* Trying to report the status now would be pointless: either - * the client got all the data fine or the connection is busted. - */ } free(filename); }

1 0

Francois Gouget : testbot/TestAgent: Fix handling of unknown RPCs.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: tools Branch: master Commit: a4c232a4d7faafc4f43dce2036b43b154d00abae URL: http://source.winehq.org/git/tools.git/?a=commit;h=a4c232a4d7faafc4f43dce20… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 6 20:58:24 2012 +0100 testbot/TestAgent: Fix handling of unknown RPCs. We must set the error message otherwise it could be uninitialized. --- testbot/src/testagentd/testagentd.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index edb1a24..bb50d91 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -862,6 +862,7 @@ static void do_unknown(SOCKET client, uint32_t id) if (recv_list_size(client, &argc)) skip_entries(client, argc); + set_status(ST_ERROR, "unknown RPC %s", rpc_name(id)); send_error(client); }

1 0

Francois Gouget : testbot/TestAgent: Fix the Ping() RPC.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: tools Branch: master Commit: 69d6211ba314e2a1504f5394cff96c04c4072dc8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=69d6211ba314e2a1504f5394… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 6 20:58:12 2012 +0100 testbot/TestAgent: Fix the Ping() RPC. It's not used for the connection setup so it can be implemented normally. --- testbot/lib/WineTestBot/TestAgent.pm | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index e0066c5..8bc3e59 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -848,16 +848,6 @@ sub _Connect($) return 1; } -sub _Ping($) -{ - my ($self) = @_; - - # Send the RPC and get the reply - return $self->_SendRawUInt32($RPC_PING) && - $self->_SendListSize(0) && - $self->_RecvList(''); -} - sub _StartRPC($$) { my ($self, $RpcId) = @_; @@ -892,7 +882,11 @@ sub _StartRPC($$) sub Ping($) { my ($self) = @_; - return $self->_StartRPC($RPC_PING); + + # Send the RPC and get the reply + return $self->_StartRPC($RPC_PING) && + $self->_SendListSize(0) && + $self->_RecvList(''); } sub GetVersion($)

1 0

Francois Gouget : testbot/VMs: Work around the lack of Domain:: get_snapshot_by_name() in older libsys-virt-perl versions.
by Alexandre Julliard 06 Dec '12

06 Dec '12

Module: tools Branch: master Commit: 804dbf8b1ce6e6b1fe2088e4950a66579d6f5aba URL: http://source.winehq.org/git/tools.git/?a=commit;h=804dbf8b1ce6e6b1fe2088e4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 6 20:57:48 2012 +0100 testbot/VMs: Work around the lack of Domain::get_snapshot_by_name() in older libsys-virt-perl versions. --- testbot/lib/WineTestBot/VMs.pm | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 4be607a..82ad379 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -277,7 +277,18 @@ sub _GetSnapshot($$) return $ErrMessage if (defined $ErrMessage); my $Snapshot; - eval { $Snapshot = $Domain->get_snapshot_by_name($SnapshotName) }; + eval { + # Work around the lack of get_snapshot_by_name() in older libvirt versions. + foreach my $Snap ($Domain->list_snapshots()) + { + if ($Snap->get_name() eq $SnapshotName) + { + $Snapshot = $Snap; + last; + } + } + $@ = "Snapshot '$SnapshotName' not found" if (!$Snapshot); + }; return ($@->message(), undef, undef) if ($@); return (undef, $Domain, $Snapshot); }

1 0

Jacek Caban : itss: Fixed fragment part handling in IInternetProtocolInfo:: CombineUrl.
by Alexandre Julliard 05 Dec '12

05 Dec '12

Module: wine Branch: master Commit: 60195ff6a963a6842df77697b78ae7d0c32d5a4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=60195ff6a963a6842df77697b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 5 18:38:40 2012 +0100 itss: Fixed fragment part handling in IInternetProtocolInfo::CombineUrl. --- dlls/itss/protocol.c | 4 +++- dlls/itss/tests/protocol.c | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/itss/protocol.c b/dlls/itss/protocol.c index 6b188c6..1463518 100644 --- a/dlls/itss/protocol.c +++ b/dlls/itss/protocol.c @@ -469,7 +469,9 @@ static HRESULT WINAPI ITSProtocolInfo_CombineUrl(IInternetProtocolInfo *iface, if(strchrW(pwzRelativeUrl, ':')) return STG_E_INVALIDNAME; - if(pwzRelativeUrl[0] != '/') { + if(pwzRelativeUrl[0] == '#') { + base_end += strlenW(base_end); + }else if(pwzRelativeUrl[0] != '/') { ptr = strrchrW(base_end, '/'); if(ptr) base_end = ptr+1; diff --git a/dlls/itss/tests/protocol.c b/dlls/itss/tests/protocol.c index 133a8bf..6fd3431 100644 --- a/dlls/itss/tests/protocol.c +++ b/dlls/itss/tests/protocol.c @@ -483,6 +483,12 @@ static const struct { {"mk:@MSITStore:test.chm::/dir/blank.html", "test.html", 0, S_OK, "mk:@MSITStore:test.chm::/dir/test.html"}, {"xxx:test.chm::/dir/blank.html", "test.html", 0, INET_E_USE_DEFAULT_PROTOCOLHANDLER, NULL}, {"its:test.chm::/dir/blank.html", "/test.html", 0, S_OK, "its:test.chm::/test.html"}, + {"its:test.chm::/blank.html", "#frag", 0, S_OK, "its:test.chm::/blank.html#frag"}, + {"its:test.chm::/blank.html#hash", "#frag", 0, S_OK, "its:test.chm::/blank.html#hash#frag"}, + {"its:test.chm::/blank.html", "test.html#frag", 0, S_OK, "its:test.chm::/test.html#frag"}, + {"its:test.chm::/blank.html", "/test.html#frag", 0, S_OK, "its:test.chm::/test.html#frag"}, + {"its:test.chm::/blank.html", "?query", 0, S_OK, "its:test.chm::/?query"}, + {"its:test.chm::/blank.html#frag/blank", "test.html", 0, S_OK, "its:test.chm::/blank.html#frag/test.html"}, }; static void test_its_protocol_info(IInternetProtocol *protocol)

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
55
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 December 2012