wine-commits August 2013

wine-commits@winehq.org

2 participants
461 discussions

Stefan Dösinger : wined3d: Add a function for allocating aligned resource memory.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 4dd4a6913b4750679588163951452d3521bc4b89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dd4a6913b475067958816395… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 21 15:15:48 2013 +0200 wined3d: Add a function for allocating aligned resource memory. --- dlls/wined3d/buffer.c | 10 ++-- dlls/wined3d/resource.c | 43 ++++++++++++++++---- dlls/wined3d/surface.c | 86 +++++++++++++++++++--------------------- dlls/wined3d/swapchain.c | 4 +- dlls/wined3d/wined3d_private.h | 19 +++++---- 5 files changed, 93 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4dd4a6913b47506795881…

1 0

Stefan Dösinger : wined3d: Improve volume size calculation.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 9d75a517c2422706ed73577c0ebbee1764f1b10e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d75a517c2422706ed73577c0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 21 15:15:47 2013 +0200 wined3d: Improve volume size calculation. --- dlls/wined3d/surface.c | 6 +++--- dlls/wined3d/utils.c | 5 ++++- dlls/wined3d/volume.c | 6 ++++-- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c5dd301..c8fedd0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2293,7 +2293,7 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi if (format->flags & WINED3DFMT_FLAG_COMPRESSED) { - UINT row_length = wined3d_format_calculate_size(format, 1, update_w, 1); + UINT row_length = wined3d_format_calculate_size(format, 1, update_w, 1, 1); UINT row_count = (update_h + format->block_height - 1) / format->block_height; const BYTE *addr = data->addr; GLenum internal; @@ -3437,7 +3437,7 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, struct wined3d_device *device = surface->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_format *format = wined3d_get_format(gl_info, format_id); - UINT resource_size = wined3d_format_calculate_size(format, device->surface_alignment, width, height); + UINT resource_size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, 1); TRACE("surface %p, width %u, height %u, format %s, multisample_type %#x, multisample_quality %u.\n", surface, width, height, debug_d3dformat(format_id), multisample_type, multisample_type); @@ -7161,7 +7161,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, UINT alignment, UIN /* FIXME: Check that the format is supported by the device. */ - resource_size = wined3d_format_calculate_size(format, alignment, width, height); + resource_size = wined3d_format_calculate_size(format, alignment, width, height, 1); if (!resource_size) return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7cb14d7..9462a3c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1942,7 +1942,8 @@ const struct wined3d_format *wined3d_get_format(const struct wined3d_gl_info *gl return &gl_info->formats[idx]; } -UINT wined3d_format_calculate_size(const struct wined3d_format *format, UINT alignment, UINT width, UINT height) +UINT wined3d_format_calculate_size(const struct wined3d_format *format, UINT alignment, + UINT width, UINT height, UINT depth) { UINT size; @@ -1968,6 +1969,8 @@ UINT wined3d_format_calculate_size(const struct wined3d_format *format, UINT ali size /= format->height_scale.denominator; } + size *= depth; + return size; } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index b4a8c64..50d9a75 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -265,6 +265,7 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_format *format = wined3d_get_format(gl_info, format_id); HRESULT hr; + UINT size; if (!gl_info->supported[EXT_TEXTURE3D]) { @@ -272,10 +273,11 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device return WINED3DERR_INVALIDCALL; } + size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, depth); + hr = resource_init(&volume->resource, device, WINED3D_RTYPE_VOLUME, format, WINED3D_MULTISAMPLE_NONE, 0, usage, pool, width, height, depth, - width * height * depth * format->byte_count, parent, parent_ops, - &volume_resource_ops); + size, parent, parent_ops, &volume_resource_ops); if (FAILED(hr)) { WARN("Failed to initialize resource, returning %#x.\n", hr); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1772234..639c344 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2962,7 +2962,7 @@ struct wined3d_format const struct wined3d_format *wined3d_get_format(const struct wined3d_gl_info *gl_info, enum wined3d_format_id format_id) DECLSPEC_HIDDEN; UINT wined3d_format_calculate_size(const struct wined3d_format *format, - UINT alignment, UINT width, UINT height) DECLSPEC_HIDDEN; + UINT alignment, UINT width, UINT height, UINT depth) DECLSPEC_HIDDEN; DWORD wined3d_format_convert_from_float(const struct wined3d_surface *surface, const struct wined3d_color *color) DECLSPEC_HIDDEN;

1 0

Piotr Caban : msvcrt: Fix lookahead buffer usage on pipes.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 089cc7818299c0d8f6a2fa726d205db25aad895f URL: http://source.winehq.org/git/wine.git/?a=commit;h=089cc7818299c0d8f6a2fa726… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 21 13:52:26 2013 +0200 msvcrt: Fix lookahead buffer usage on pipes. --- dlls/msvcrt/file.c | 12 ++++++++++-- dlls/msvcrt/tests/file.c | 9 +++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 0df95d9..871027d 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2571,8 +2571,16 @@ static int read_i(int fd, void *buf, unsigned int count) if (fdinfo->wxflag & (WX_PIPE | WX_NOSEEK)) { - fdinfo->lookahead[0] = lookahead[0]; - fdinfo->lookahead[1] = lookahead[1]; + if (lookahead[0]=='\n' && (!utf16 || !lookahead[1])) + { + bufstart[j++] = '\n'; + if (utf16) bufstart[j++] = 0; + } + else + { + fdinfo->lookahead[0] = lookahead[0]; + fdinfo->lookahead[1] = lookahead[1]; + } } else SetFilePointer(fdinfo->handle, -1-utf16, NULL, FILE_CURRENT); diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index fc92272..7a3253a 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2032,8 +2032,8 @@ static void test_pipes(const char* selfname) ok(0, "pipe failed with errno %d\n", errno); return; } - r = write(pipes[1], "\r\n\rab", 5); - ok(r == 5, "write returned %d, errno = %d\n", r, errno); + r = write(pipes[1], "\r\n\rab\r\n", 7); + ok(r == 7, "write returned %d, errno = %d\n", r, errno); setmode(pipes[0], O_TEXT); r = read(pipes[0], buf, 1); ok(r == 1, "read returned %d, expected 1\n", r); @@ -2044,9 +2044,10 @@ static void test_pipes(const char* selfname) r = read(pipes[0], buf, 1); ok(r == 1, "read returned %d, expected 1\n", r); ok(buf[0] == 'a', "buf[0] = %x, expected 'a'\n", buf[0]); - r = read(pipes[0], buf, 1); - ok(r == 1, "read returned %d, expected 1\n", r); + r = read(pipes[0], buf, 2); + ok(r == 2, "read returned %d, expected 1\n", r); ok(buf[0] == 'b', "buf[0] = %x, expected 'b'\n", buf[0]); + ok(buf[1] == '\n', "buf[1] = %x, expected '\\n'\n", buf[1]); if (p_fopen_s) {

1 0

Piotr Caban : msvcrt: Improve setting standard handles flags.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: f42c631d6e1b5c6cc16de4d329f29141dea47518 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f42c631d6e1b5c6cc16de4d32… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 21 13:52:10 2013 +0200 msvcrt: Improve setting standard handles flags. --- dlls/msvcrt/file.c | 38 +++++++++++++++++++++++++++----------- 1 files changed, 27 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 8403b4b..0df95d9 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -65,6 +65,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #define WX_PIPE 0x08 #define WX_DONTINHERIT 0x10 #define WX_APPEND 0x20 +#define WX_NOSEEK 0x40 #define WX_TEXT 0x80 /* values for exflag - it's used differently in msvcr90.dll*/ @@ -347,7 +348,7 @@ static int msvcrt_set_fd(HANDLE hand, int flag, int fd) } fdinfo->handle = hand; - fdinfo->wxflag = WX_OPEN | (flag & (WX_DONTINHERIT | WX_APPEND | WX_TEXT | WX_PIPE)); + fdinfo->wxflag = WX_OPEN | (flag & (WX_DONTINHERIT | WX_APPEND | WX_TEXT | WX_PIPE | WX_NOSEEK)); fdinfo->lookahead[0] = '\n'; fdinfo->lookahead[1] = '\n'; fdinfo->lookahead[2] = '\n'; @@ -515,16 +516,31 @@ void msvcrt_init_io(void) } fdinfo = msvcrt_get_ioinfo(MSVCRT_STDIN_FILENO); - if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) - msvcrt_set_fd(GetStdHandle(STD_INPUT_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDIN_FILENO); + if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) { + HANDLE h = GetStdHandle(STD_INPUT_HANDLE); + DWORD type = GetFileType(h); + + msvcrt_set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_NOSEEK : 0) + |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0), MSVCRT_STDIN_FILENO); + } fdinfo = msvcrt_get_ioinfo(MSVCRT_STDOUT_FILENO); - if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) - msvcrt_set_fd(GetStdHandle(STD_OUTPUT_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDOUT_FILENO); + if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) { + HANDLE h = GetStdHandle(STD_OUTPUT_HANDLE); + DWORD type = GetFileType(h); + + msvcrt_set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_NOSEEK : 0) + |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0), MSVCRT_STDOUT_FILENO); + } fdinfo = msvcrt_get_ioinfo(MSVCRT_STDERR_FILENO); - if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) - msvcrt_set_fd(GetStdHandle(STD_ERROR_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDERR_FILENO); + if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) { + HANDLE h = GetStdHandle(STD_ERROR_HANDLE); + DWORD type = GetFileType(h); + + msvcrt_set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_NOSEEK : 0) + |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0), MSVCRT_STDERR_FILENO); + } TRACE(":handles (%p)(%p)(%p)\n", msvcrt_get_ioinfo(MSVCRT_STDIN_FILENO)->handle, msvcrt_get_ioinfo(MSVCRT_STDOUT_FILENO)->handle, @@ -2343,7 +2359,7 @@ static int read_utf8(int fd, MSVCRT_wchar_t *buf, unsigned int count) buf[0] = '\n'; else { buf[0] = '\r'; - if(fdinfo->wxflag & WX_PIPE) + if(fdinfo->wxflag & (WX_PIPE | WX_NOSEEK)) fdinfo->lookahead[0] = lookahead; else SetFilePointer(fdinfo->handle, -1, NULL, FILE_CURRENT); @@ -2391,7 +2407,7 @@ static int read_utf8(int fd, MSVCRT_wchar_t *buf, unsigned int count) if(char_len+i <= pos) i += char_len; - if(fdinfo->wxflag & WX_PIPE) { + if(fdinfo->wxflag & (WX_PIPE | WX_NOSEEK)) { if(i < pos) fdinfo->lookahead[0] = readbuf[i]; if(i+1 < pos) @@ -2419,7 +2435,7 @@ static int read_utf8(int fd, MSVCRT_wchar_t *buf, unsigned int count) if(lookahead != '\n') readbuf[j++] = '\r'; - if(fdinfo->wxflag & WX_PIPE) + if(fdinfo->wxflag & (WX_PIPE | WX_NOSEEK)) fdinfo->lookahead[0] = lookahead; else SetFilePointer(fdinfo->handle, -1, NULL, FILE_CURRENT); @@ -2553,7 +2569,7 @@ static int read_i(int fd, void *buf, unsigned int count) if(utf16) bufstart[j++] = 0; } - if (fdinfo->wxflag & WX_PIPE) + if (fdinfo->wxflag & (WX_PIPE | WX_NOSEEK)) { fdinfo->lookahead[0] = lookahead[0]; fdinfo->lookahead[1] = lookahead[1];

1 0

André Hentschel : schannel/tests: Fix test on win8.1.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 8e5b8600b2eb7cb218c9fa8c8211c90ec91742e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e5b8600b2eb7cb218c9fa8c8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 21 00:24:30 2013 +0200 schannel/tests: Fix test on win8.1. --- dlls/schannel/tests/main.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index 83c107a..d8ade9a 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -216,8 +216,9 @@ static void testGetInfo(void) if (status == STATUS_SUCCESS) { - ok(PackageInfo.fCapabilities == LSA_BASE_CAPS, "fCapabilities: 0x%x\n", - PackageInfo.fCapabilities); + ok(PackageInfo.fCapabilities == LSA_BASE_CAPS || + PackageInfo.fCapabilities == (LSA_BASE_CAPS|SECPKG_FLAG_APPCONTAINER_PASSTHROUGH), + "fCapabilities: 0x%x\n", PackageInfo.fCapabilities); ok(PackageInfo.wVersion == 1, "wVersion: %d\n", PackageInfo.wVersion); ok(PackageInfo.wRPCID == 14, "wRPCID: %d\n", PackageInfo.wRPCID); ok(PackageInfo.cbMaxToken == 0x4000 ||

1 0

Hans Leidekker : wbemprox: Accept the root\default namespace.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: d799a664f46623282b6173ff8bcf5562444a30d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d799a664f46623282b6173ff8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 21 14:09:28 2013 +0200 wbemprox: Accept the root\default namespace. --- dlls/wbemprox/tests/services.c | 8 +++++++- dlls/wbemprox/wbemlocator.c | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index 5d659b1..7f8a7a2 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -108,6 +108,9 @@ static void test_IWbemLocator(void) static const WCHAR path19W[] = {'R','O','O','T','\\','\\','C','I','M','V','2',0}; static const WCHAR path20W[] = {'R','O','O','T','\\','C','I','M','V','2','\\',0}; static const WCHAR path21W[] = {'R','O','O','T','/','C','I','M','V','2',0}; + static const WCHAR path22W[] = {'r','o','o','t','\\','d','e','f','a','u','l','t',0}; + static const WCHAR path23W[] = {'r','o','o','t','\\','c','i','m','v','0',0}; + static const WCHAR path24W[] = {'r','o','o','t','\\','c','i','m','v','1',0}; static const struct { const WCHAR *path; @@ -138,7 +141,10 @@ static void test_IWbemLocator(void) { path18W, S_OK }, { path19W, WBEM_E_INVALID_NAMESPACE }, { path20W, WBEM_E_INVALID_NAMESPACE }, - { path21W, S_OK } + { path21W, S_OK }, + { path22W, S_OK }, + { path23W, WBEM_E_INVALID_NAMESPACE }, + { path24W, WBEM_E_INVALID_NAMESPACE } }; IWbemLocator *locator; IWbemServices *services; diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index e869a6a..07bd89f 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -101,6 +101,7 @@ static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **na { static const WCHAR rootW[] = {'R','O','O','T'}; static const WCHAR cimv2W[] = {'C','I','M','V','2'}; + static const WCHAR defaultW[] = {'D','E','F','A','U','L','T'}; HRESULT hr = WBEM_E_INVALID_NAMESPACE; const WCHAR *p, *q; unsigned int len; @@ -138,7 +139,9 @@ static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **na goto done; } q++; - if ((len = strlenW( q )) != sizeof(cimv2W) / sizeof(cimv2W[0]) || memicmpW( q, cimv2W, len )) + len = strlenW( q ); + if ((len != sizeof(cimv2W) / sizeof(cimv2W[0]) || memicmpW( q, cimv2W, len )) && + (len != sizeof(defaultW) / sizeof(defaultW[0]) || memicmpW( q, defaultW, len ))) goto done; if (!(*namespace = heap_alloc( (len + 1) * sizeof(WCHAR) ))) hr = E_OUTOFMEMORY; else

1 0

Jacek Caban : ieframe/tests: Use winehq snapshot instead of the main page.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 00bbc620101a2048f3a438ef7838948d8ff89eaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=00bbc620101a2048f3a438ef7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 21 13:45:31 2013 +0200 ieframe/tests: Use winehq snapshot instead of the main page. --- dlls/ieframe/tests/webbrowser.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 217ff28..675bc12 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2742,7 +2742,7 @@ static void test_download(DWORD flags) test_ready_state((flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOBACK|DWL_FROM_GOFORWARD|DWL_REFRESH)) ? READYSTATE_COMPLETE : READYSTATE_LOADING); - if((is_http && !(flags & (DWL_FROM_GOBACK|DWL_FROM_GOFORWARD|DWL_REFRESH))) || (flags & DWL_EXPECT_BEFORE_NAVIGATE)) + if(flags & (DWL_EXPECT_BEFORE_NAVIGATE|(is_http ? DWL_FROM_PUT_HREF : 0))) SET_EXPECT(Invoke_PROPERTYCHANGE); if(flags & DWL_EXPECT_BEFORE_NAVIGATE) { @@ -2784,7 +2784,7 @@ static void test_download(DWORD flags) DispatchMessage(&msg); } - if((is_http && !(flags & (DWL_FROM_GOBACK|DWL_FROM_GOFORWARD|DWL_REFRESH))) || (flags & DWL_EXPECT_BEFORE_NAVIGATE)) + if(flags & (DWL_EXPECT_BEFORE_NAVIGATE|(is_http ? DWL_FROM_PUT_HREF : 0))) todo_wine CHECK_CALLED(Invoke_PROPERTYCHANGE); if(flags & DWL_EXPECT_BEFORE_NAVIGATE) { @@ -2914,6 +2914,8 @@ static void test_put_href(IWebBrowser2 *unk, const char *url) BSTR str; HRESULT hres; + trace("put_href(%s)...\n", url); + doc = get_document(unk); location = NULL; @@ -2922,6 +2924,8 @@ static void test_put_href(IWebBrowser2 *unk, const char *url) ok(hres == S_OK, "get_location failed: %08x\n", hres); ok(location != NULL, "location == NULL\n"); + is_http = !memcmp(url, "http:", 5); + SET_EXPECT(TranslateUrl); SET_EXPECT(Invoke_BEFORENAVIGATE2); if(!is_http) @@ -2929,7 +2933,6 @@ static void test_put_href(IWebBrowser2 *unk, const char *url) dwl_flags = DWL_FROM_PUT_HREF; - is_http = !memcmp(url, "http:", 5); str = a2bstr(current_url = url); is_first_load = FALSE; hres = IHTMLLocation_put_href(location, str); @@ -3423,7 +3426,7 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) test_Refresh(webbrowser); trace("put_href http URL...\n"); - test_put_href(webbrowser, "http://www.winehq.org/"); + test_put_href(webbrowser, "http://test.winehq.org/tests/winehq_snapshot/"); test_download(DWL_FROM_PUT_HREF|DWL_HTTP); trace("GoBack...\n"); @@ -3431,7 +3434,7 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) test_download(DWL_FROM_GOBACK|DWL_HTTP); trace("GoForward...\n"); - test_go_forward(webbrowser, "http://www.winehq.org/"); + test_go_forward(webbrowser, "http://test.winehq.org/tests/winehq_snapshot/"); test_download(DWL_FROM_GOFORWARD|DWL_HTTP); }

1 0

Nikolay Sivov : msxml3: Fix a warning accessing internal buffer of xmlOutputBuffer.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: db79c6bd89345a8e8016b56c3f04995a3d0bb410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db79c6bd89345a8e8016b56c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 21 16:11:05 2013 +0400 msxml3: Fix a warning accessing internal buffer of xmlOutputBuffer. --- dlls/msxml3/node.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index a196f4e..4c03571 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -987,6 +987,15 @@ static void htmldoc_dumpcontent(xmlOutputBufferPtr buf, xmlDocPtr doc) doc->type = type; } +static const xmlChar *get_output_buffer_content(xmlOutputBufferPtr output) +{ +#ifdef LIBXML2_NEW_BUFFER + return xmlOutputBufferGetContent(output); +#else + return xmlBufferContent(output->buffer); +#endif +} + HRESULT node_transform_node(const xmlnode *This, IXMLDOMNode *stylesheet, BSTR *p) { #ifdef SONAME_LIBXSLT @@ -1015,7 +1024,7 @@ HRESULT node_transform_node(const xmlnode *This, IXMLDOMNode *stylesheet, BSTR * if (output) { htmldoc_dumpcontent(output, result->doc); - content = xmlBufferContent(output->buffer); + content = get_output_buffer_content(output); *p = bstr_from_xmlChar(content); xmlOutputBufferClose(output); }

1 0

Nikolay Sivov : msxml3: Fix a warning in DTD dumping code on recent libxml2 versions.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 9554dfb13c9ecdad0c63f74d141f2ae48b2a9130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9554dfb13c9ecdad0c63f74d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 21 14:31:28 2013 +0400 msxml3: Fix a warning in DTD dumping code on recent libxml2 versions. --- dlls/msxml3/node.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 79de75c..a196f4e 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -896,6 +896,50 @@ HRESULT node_get_xml(xmlnode *This, BOOL ensure_eol, BSTR *ret) return *ret ? S_OK : E_OUTOFMEMORY; } +/* duplicates xmlBufferWriteQuotedString() logic */ +static void xml_write_quotedstring(xmlOutputBufferPtr buf, const xmlChar *string) +{ + const xmlChar *cur, *base; + + if (xmlStrchr(string, '\"')) + { + if (xmlStrchr(string, '\'')) + { + xmlOutputBufferWrite(buf, 1, "\""); + base = cur = string; + + while (*cur) + { + if (*cur == '"') + { + if (base != cur) + xmlOutputBufferWrite(buf, cur-base, (const char*)base); + xmlOutputBufferWrite(buf, 6, """); + cur++; + base = cur; + } + else + cur++; + } + if (base != cur) + xmlOutputBufferWrite(buf, cur-base, (const char*)base); + xmlOutputBufferWrite(buf, 1, "\""); + } + else + { + xmlOutputBufferWrite(buf, 1, "\'"); + xmlOutputBufferWriteString(buf, (const char*)string); + xmlOutputBufferWrite(buf, 1, "\'"); + } + } + else + { + xmlOutputBufferWrite(buf, 1, "\""); + xmlOutputBufferWriteString(buf, (const char*)string); + xmlOutputBufferWrite(buf, 1, "\""); + } +} + static void htmldtd_dumpcontent(xmlOutputBufferPtr buf, xmlDocPtr doc) { xmlDtdPtr cur = doc->intSubset; @@ -905,17 +949,17 @@ static void htmldtd_dumpcontent(xmlOutputBufferPtr buf, xmlDocPtr doc) if (cur->ExternalID) { xmlOutputBufferWriteString(buf, " PUBLIC "); - xmlBufferWriteQuotedString(buf->buffer, cur->ExternalID); + xml_write_quotedstring(buf, cur->ExternalID); if (cur->SystemID) { xmlOutputBufferWriteString(buf, " "); - xmlBufferWriteQuotedString(buf->buffer, cur->SystemID); + xml_write_quotedstring(buf, cur->SystemID); } } else if (cur->SystemID) { xmlOutputBufferWriteString(buf, " SYSTEM "); - xmlBufferWriteQuotedString(buf->buffer, cur->SystemID); + xml_write_quotedstring(buf, cur->SystemID); } xmlOutputBufferWriteString(buf, ">\n"); }

1 0

Alexandre Julliard : server: Create the critical section keyed event object on startup.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 8c0796c4a7ffa758c70df0fe4931339599d6d2dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c0796c4a7ffa758c70df0fe4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 21 12:51:31 2013 +0200 server: Create the critical section keyed event object on startup. --- server/directory.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/server/directory.c b/server/directory.c index 6250177..e5e82b0 100644 --- a/server/directory.c +++ b/server/directory.c @@ -413,6 +413,7 @@ void init_directories(void) static const WCHAR event_high_memW[] = {'H','i','g','h','M','e','m','o','r','y','C','o','n','d','i','t','i','o','n'}; static const WCHAR event_high_pagedW[] = {'H','i','g','h','P','a','g','e','d','P','o','o','l','C','o','n','d','i','t','i','o','n'}; static const WCHAR event_high_nonpgW[] = {'H','i','g','h','N','o','n','P','a','g','e','d','P','o','o','l','C','o','n','d','i','t','i','o','n'}; + static const WCHAR keyed_event_crit_sectW[] = {'C','r','i','t','S','e','c','O','u','t','O','f','M','e','m','o','r','y','E','v','e','n','t'}; static const struct unicode_str kernel_events[] = { { event_low_memW, sizeof(event_low_memW) }, @@ -422,9 +423,11 @@ void init_directories(void) { event_high_pagedW, sizeof(event_high_pagedW) }, { event_high_nonpgW, sizeof(event_high_nonpgW) } }; + static const struct unicode_str keyed_event_crit_sect_str = {keyed_event_crit_sectW, sizeof(keyed_event_crit_sectW)}; struct directory *dir_driver, *dir_device, *dir_global, *dir_basenamed, *dir_sessions, *dir_kernel; struct symlink *link_dosdev, *link_global1, *link_global2, *link_local, *link_pipe, *link_mailslot, *link_0, *link_session; + struct keyed_event *keyed_event; unsigned int i; root_directory = create_directory( NULL, NULL, 0, HASH_SIZE ); @@ -469,6 +472,8 @@ void init_directories(void) struct event *event = create_event( dir_kernel, &kernel_events[i], 0, 1, 0, NULL ); make_object_static( (struct object *)event ); } + keyed_event = create_keyed_event( dir_kernel, &keyed_event_crit_sect_str, 0, NULL ); + make_object_static( (struct object *)keyed_event ); /* the objects hold references so we can release these directories */ release_object( dir_global );

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
47
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 August 2013