July 2011 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Make the surface parameter to surface_depth_blt() const.
by Alexandre Julliard July 18, 2011

July 18, 2011

Module: wine Branch: master Commit: 437cec1a49d8e06305eaeb138e46171ef93e24ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=437cec1a49d8e06305eaeb138… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 17 22:29:07 2011 +0200 wined3d: Make the surface parameter to surface_depth_blt() const. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 92a4ae5..7b10ec8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5561,7 +5561,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa } /* GL locking is done by the caller */ -static void surface_depth_blt(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, +static void surface_depth_blt(const struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, GLuint texture, GLint x, GLint y, GLsizei w, GLsizei h, GLenum target) { struct wined3d_device *device = surface->resource.device;

1 0

Henri Verbeet : wined3d: Make the surface parameter to surface_get_rect() const.
by Alexandre Julliard July 18, 2011

July 18, 2011

Module: wine Branch: master Commit: db12216301a930a2dcd00f68c195a17b6434a324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db12216301a930a2dcd00f68c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 17 22:29:03 2011 +0200 wined3d: Make the surface parameter to surface_get_rect() const. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f0cfeb4..17f9b70 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -274,7 +274,7 @@ static void surface_get_blt_info(GLenum target, const RECT *rect, GLsizei w, GLs } } -static inline void surface_get_rect(struct wined3d_surface *surface, const RECT *rect_in, RECT *rect_out) +static void surface_get_rect(const struct wined3d_surface *surface, const RECT *rect_in, RECT *rect_out) { if (rect_in) *rect_out = *rect_in;

1 0

Henri Verbeet : wined3d: Make the surface parameter to surface_is_full_rect () const.
by Alexandre Julliard July 18, 2011

July 18, 2011

Module: wine Branch: master Commit: 416a55c7aa36c08bed862980c46d7f968de26444 URL: http://source.winehq.org/git/wine.git/?a=commit;h=416a55c7aa36c08bed862980c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 17 22:29:04 2011 +0200 wined3d: Make the surface parameter to surface_is_full_rect() const. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 17f9b70..458cc36 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1070,7 +1070,7 @@ static HRESULT surface_flip(struct wined3d_surface *surface, struct wined3d_surf return WINED3D_OK; } -static BOOL surface_is_full_rect(struct wined3d_surface *surface, const RECT *r) +static BOOL surface_is_full_rect(const struct wined3d_surface *surface, const RECT *r) { if ((r->left && r->right) || abs(r->right - r->left) != surface->resource.width) return FALSE;

1 0

Henri Verbeet : wined3d: Make the surface parameter to surface_convert_depth_to_float() const.
by Alexandre Julliard July 18, 2011

July 18, 2011

Module: wine Branch: master Commit: d314aa2d6ef8a899ba6ced167d45a718aa4642a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d314aa2d6ef8a899ba6ced167… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 17 22:29:05 2011 +0200 wined3d: Make the surface parameter to surface_convert_depth_to_float() const. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 458cc36..069861e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1212,7 +1212,7 @@ static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum wined return TRUE; } -static BOOL surface_convert_depth_to_float(struct wined3d_surface *surface, DWORD depth, float *float_depth) +static BOOL surface_convert_depth_to_float(const struct wined3d_surface *surface, DWORD depth, float *float_depth) { const struct wined3d_format *format = surface->resource.format;

1 0

Henri Verbeet : wined3d: Make the surface parameter to surface_convert_color_to_float() const.
by Alexandre Julliard July 18, 2011

July 18, 2011

Module: wine Branch: master Commit: a97ed5346095643e52fe4cc924f7a7c1f40c5dce URL: http://source.winehq.org/git/wine.git/?a=commit;h=a97ed5346095643e52fe4cc92… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 17 22:29:06 2011 +0200 wined3d: Make the surface parameter to surface_convert_color_to_float() const. --- dlls/wined3d/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 069861e..92a4ae5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2477,11 +2477,11 @@ void surface_add_dirty_rect(struct wined3d_surface *surface, const WINED3DBOX *d } } -static BOOL surface_convert_color_to_float(struct wined3d_surface *surface, +static BOOL surface_convert_color_to_float(const struct wined3d_surface *surface, DWORD color, WINED3DCOLORVALUE *float_color) { const struct wined3d_format *format = surface->resource.format; - struct wined3d_device *device = surface->resource.device; + const struct wined3d_device *device = surface->resource.device; switch (format->id) {

1 0

Francois Gouget : d3dx9_36: Add a trailing '\n' to an ERR() call.
by Alexandre Julliard July 18, 2011

July 18, 2011

Module: wine Branch: master Commit: e0711b195df4373bca20a799348ddf16f9543950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0711b195df4373bca20a7993… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jul 17 10:18:04 2011 +0200 d3dx9_36: Add a trailing '\n' to an ERR() call. --- dlls/d3dx9_36/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 717c356..94a291f 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -534,7 +534,7 @@ static HRESULT WINAPI ID3DXMeshImpl_ConvertAdjacencyToPointReps(ID3DXMesh *iface /* Should never happen as CreateMesh does not allow meshes with 0 faces */ if (This->numfaces == 0) { - ERR("Number of faces was zero."); + ERR("Number of faces was zero.\n"); hr = D3DERR_INVALIDCALL; goto cleanup; }

1 0

Austin English : dbghelp: Add stubs for SymEnumSourceLines/ SymEnumSourceLinesW.
by Alexandre Julliard July 18, 2011

July 18, 2011

Module: wine Branch: master Commit: 13d86cc0a3c92b622d405d630753413fe797d71b URL: http://source.winehq.org/git/wine.git/?a=commit;h=13d86cc0a3c92b622d405d630… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Jul 16 12:33:29 2011 -0500 dbghelp: Add stubs for SymEnumSourceLines/SymEnumSourceLinesW. --- dlls/dbghelp/dbghelp.spec | 4 ++-- dlls/dbghelp/source.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index ddb9d33..7678e53 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -46,8 +46,8 @@ @ stub SymEnumSourceFileTokens @ stdcall SymEnumSourceFiles(ptr int64 str ptr ptr) @ stdcall SymEnumSourceFilesW(ptr int64 wstr ptr ptr) -@ stub SymEnumSourceLines -@ stub SymEnumSourceLinesW +@ stdcall SymEnumSourceLines(ptr int64 str str long long ptr ptr) +@ stdcall SymEnumSourceLinesW(ptr int64 wstr wstr long long ptr ptr) @ stub SymEnumSym @ stdcall SymEnumSymbols(ptr int64 str ptr ptr) @ stub SymEnumSymbolsForAddr diff --git a/dlls/dbghelp/source.c b/dlls/dbghelp/source.c index 3bed023..693ba78 100644 --- a/dlls/dbghelp/source.c +++ b/dlls/dbghelp/source.c @@ -309,6 +309,38 @@ BOOL WINAPI SymEnumSourceFiles(HANDLE hProcess, ULONG64 ModBase, PCSTR Mask, } /****************************************************************** + * SymEnumSourceLines (DBGHELP.@) + * + */ +BOOL WINAPI SymEnumSourceLines(HANDLE hProcess, ULONG64 base, PCSTR obj, + PCSTR file, DWORD line, DWORD flags, + PSYM_ENUMLINES_CALLBACK EnumLinesCallback, + PVOID UserContext) +{ + FIXME("%p %s %s %s %u %u %p %p: stub!\n", + hProcess, wine_dbgstr_longlong(base), debugstr_a(obj), debugstr_a(file), + line, flags, EnumLinesCallback, UserContext); + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; +} + +/****************************************************************** + * SymEnumSourceLinesW(DBGHELP.@) + * + */ +BOOL WINAPI SymEnumSourceLinesW(HANDLE hProcess, ULONG64 base, PCWSTR obj, + PCWSTR file, DWORD line, DWORD flags, + PSYM_ENUMLINES_CALLBACKW EnumLinesCallback, + PVOID UserContext) +{ + FIXME("%p %s %s %s %u %u %p %p: stub!\n", + hProcess, wine_dbgstr_longlong(base), debugstr_w(obj), debugstr_w(file), + line, flags, EnumLinesCallback, UserContext); + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; +} + +/****************************************************************** * SymGetSourceFileToken (DBGHELP.@) * */

1 0

Francois Gouget : wineoss.drv: Add a trailing '\n' to a TRACE() call.
by Alexandre Julliard July 18, 2011

July 18, 2011

Module: wine Branch: master Commit: a53e011021f776abdcec6d901498b80c2b6943b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a53e011021f776abdcec6d901… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jul 17 10:15:09 2011 +0200 wineoss.drv: Add a trailing '\n' to a TRACE() call. --- dlls/wineoss.drv/mmdevdrv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 32e9354..ac684f7 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -299,7 +299,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, void ***keys, else fd = open(ai.devnode, O_RDONLY, 0); if(fd < 0){ - WARN("Opening device \"%s\" failed, pretending it doesn't exist: %d (%s)", + WARN("Opening device \"%s\" failed, pretending it doesn't exist: %d (%s)\n", ai.devnode, errno, strerror(errno)); continue; }

1 0

Frédéric Delanoy : cmd/tests: Convert line endings to DOS style at runtime before running batch test file .
by Alexandre Julliard July 18, 2011

July 18, 2011

Module: wine Branch: master Commit: 1cb7378e94bc15d8223af824f0d691fb478d0e08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cb7378e94bc15d8223af824f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 16 10:14:50 2011 +0200 cmd/tests: Convert line endings to DOS style at runtime before running batch test file. --- programs/cmd/tests/batch.c | 43 ++++++++++++++++++++++++++++++------------- 1 files changed, 30 insertions(+), 13 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 03c2b56..2715b11 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -25,22 +25,39 @@ static char workdir[MAX_PATH]; static DWORD workdir_len; -/* Substitute escaped spaces with real ones */ -static const char* replace_escaped_spaces(const char *data, DWORD size, DWORD *new_size) +/* Convert to DOS line endings, and substitute escaped spaces with real ones */ +static const char* convert_input_data(const char *data, DWORD size, DWORD *new_size) { - static const char escaped_space[] = {'@','s','p','a','c','e','@','\0'}; + static const char escaped_space[] = {'@','s','p','a','c','e','@'}; + DWORD i, eol_count = 0; char *ptr, *new_data; - new_data = ptr = HeapAlloc(GetProcessHeap(), 0, size + 1); - memcpy( new_data, data, size ); - new_data[size] = 0; - - while ((ptr = strstr(ptr, escaped_space))) - { - char *end = ptr + sizeof(escaped_space) - 1; - *ptr++ = ' '; - memmove( ptr, end, strlen(end) + 1 ); + for (i = 0; i < size; i++) + if (data[i] == '\n') eol_count++; + + ptr = new_data = HeapAlloc(GetProcessHeap(), 0, size + eol_count + 1); + + for (i = 0; i < size; i++) { + switch (data[i]) { + case '\n': + *ptr++ = '\r'; + *ptr++ = '\n'; + break; + case '@': + if (data + i + sizeof(escaped_space) - 1 < data + size + && !memcmp(data + i, escaped_space, sizeof(escaped_space))) { + *ptr++ = ' '; + i += sizeof(escaped_space) - 1; + } else { + *ptr++ = data[i]; + } + break; + default: + *ptr++ = data[i]; + } } + *ptr = '\0'; + *new_size = strlen(new_data); return new_data; } @@ -233,7 +250,7 @@ static void run_test(const char *cmd_data, DWORD cmd_size, const char *exp_data, const char *out_data, *actual_cmd_data; DWORD out_size, actual_cmd_size; - actual_cmd_data = replace_escaped_spaces(cmd_data, cmd_size, &actual_cmd_size); + actual_cmd_data = convert_input_data(cmd_data, cmd_size, &actual_cmd_size); if(!actual_cmd_size || !actual_cmd_data) goto cleanup;

1 0

Francois Gouget : winex11.drv: Make copy_image_bits() static.
by Alexandre Julliard July 18, 2011

July 18, 2011

Module: wine Branch: master Commit: 3726670098be736de65ad934959c375a05fd5c1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3726670098be736de65ad9349… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jul 17 10:18:00 2011 +0200 winex11.drv: Make copy_image_bits() static. --- dlls/winex11.drv/bitblt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 53f5c63..7a36b8b 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1640,7 +1640,7 @@ static void set_color_info( const ColorShifts *color_shifts, BITMAPINFO *info ) } /* copy the image bits, fixing up alignment and byte swapping as necessary */ - DWORD copy_image_bits( BITMAPINFO *info, const ColorShifts *color_shifts, XImage *image, +static DWORD copy_image_bits( BITMAPINFO *info, const ColorShifts *color_shifts, XImage *image, const struct gdi_image_bits *src_bits, struct gdi_image_bits *dst_bits, unsigned int zeropad_mask ) {

1 0