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

Henri Verbeet : wined3d: Don' t try to resolve vertex buffer locations in context_stream_info_from_declaration ().
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: 1360af6adcbc5c77a7b3c5e32f3c886e450456f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1360af6adcbc5c77a7b3c5e32… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 14 10:04:22 2014 +0200 wined3d: Don't try to resolve vertex buffer locations in context_stream_info_from_declaration(). --- dlls/wined3d/context.c | 99 +++++++++++++++++++++++--------------------------- dlls/wined3d/device.c | 18 +++++---- 2 files changed, 55 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1360af6adcbc5c77a7b3c…

1 0

Henri Verbeet : wined3d: Clarify WINED3DUSAGE_WRITEONLY a bit.
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: 63f2b65141ada3e5c5ba55d606c0f2bf6dc7c626 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63f2b65141ada3e5c5ba55d60… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 14 10:04:23 2014 +0200 wined3d: Clarify WINED3DUSAGE_WRITEONLY a bit. --- dlls/wined3d/resource.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index caec580..934cabc 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -59,6 +59,12 @@ static void resource_check_usage(DWORD usage) | WINED3DUSAGE_OVERLAY | WINED3DUSAGE_TEXTURE; + /* WINED3DUSAGE_WRITEONLY is supposed to result in write-combined mappings + * being returned. OpenGL doesn't give us explicit control over that, but + * the hints and access flags we set for typical access patterns on + * dynamic resources should in theory have the same effect on the OpenGL + * driver. */ + if (usage & ~handled) FIXME("Unhandled usage flags %#x.\n", usage & ~handled); if ((usage & (WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY)) == WINED3DUSAGE_DYNAMIC)

1 0

Henri Verbeet : wined3d: Make vp_ffp_states static.
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: 0ef760ef8264be50720dde36944982dacb77d151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ef760ef8264be50720dde369… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 14 10:04:24 2014 +0200 wined3d: Make vp_ffp_states static. --- dlls/wined3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f450f20..36c4e71 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5091,7 +5091,7 @@ const struct StateEntryTemplate misc_state_template[] = { {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, }; -const struct StateEntryTemplate vp_ffp_states[] = +static const struct StateEntryTemplate vp_ffp_states[] = { { STATE_VDECL, { STATE_VDECL, vertexdeclaration }, WINED3D_GL_EXT_NONE }, { STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), { STATE_VDECL, NULL }, WINED3D_GL_EXT_NONE },

1 0

Henri Verbeet : wined3d: Make wined3d_arbfp_blit_rb_functions static.
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: 8b8af4bee0ad1f65cfbdd4d3c951b71186eee68a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b8af4bee0ad1f65cfbdd4d3c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 14 10:04:25 2014 +0200 wined3d: Make wined3d_arbfp_blit_rb_functions static. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 819a04f..d312ecf 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6791,7 +6791,7 @@ static void arbfp_free_blit_shader(struct wine_rb_entry *entry, void *context) HeapFree(GetProcessHeap(), 0, entry_arb); } -const struct wine_rb_functions wined3d_arbfp_blit_rb_functions = +static const struct wine_rb_functions wined3d_arbfp_blit_rb_functions = { wined3d_rb_alloc, wined3d_rb_realloc,

1 0

Jacek Caban : mshtml: Added IDispatch support for IHTMLTable[23] interfaces.
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: cf50d5f70054c9759f4da89343c0ced62e76643f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf50d5f70054c9759f4da8934… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 14 11:57:36 2014 +0200 mshtml: Added IDispatch support for IHTMLTable[23] interfaces. --- dlls/mshtml/htmltable.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index fd7c265..de12537 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -946,6 +946,8 @@ static const NodeImplVtbl HTMLTableImplVtbl = { static const tid_t HTMLTable_iface_tids[] = { HTMLELEMENT_TIDS, IHTMLTable_tid, + IHTMLTable2_tid, + IHTMLTable3_tid, 0 };

1 0

Austin English : dbghelp: Ignore a few more symbol ids.
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: 8980a6fa5c1128650d478739debef10f56bcd300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8980a6fa5c1128650d478739d… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jul 11 19:17:35 2014 -0700 dbghelp: Ignore a few more symbol ids. --- dlls/dbghelp/msc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index d797a4a..5e8804f 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1988,7 +1988,12 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* roo case S_SECTINFO_V3: case S_SUBSECTINFO_V3: case S_ENTRYPOINT_V3: + case 0x113e: case 0x1139: + case 0x1141: + case 0x1142: + case 0x1143: + case 0x1144: TRACE("Unsupported symbol id %x\n", sym->generic.id); break;

1 0

Jacek Caban : wininet: Use stored server name in HTTP_InsertCookies.
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: ffec675b4f1dfdadda6635f2a819b126ac00338c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffec675b4f1dfdadda6635f2a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 14 15:21:11 2014 +0200 wininet: Use stored server name in HTTP_InsertCookies. --- dlls/wininet/http.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ffd31e6..8ff42a2 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4177,16 +4177,11 @@ static LPWSTR HTTP_build_req( LPCWSTR *list, int len ) static void HTTP_InsertCookies(http_request_t *request) { DWORD cookie_size, size, cnt = 0; - HTTPHEADERW *host; WCHAR *cookies; static const WCHAR cookieW[] = {'C','o','o','k','i','e',':',' ',0}; - host = HTTP_GetHeader(request, hostW); - if(!host) - return; - - if(get_cookie(host->lpszValue, request->path, NULL, &cookie_size, INTERNET_COOKIE_HTTPONLY) != ERROR_SUCCESS) + if(get_cookie(request->server->name, request->path, NULL, &cookie_size, INTERNET_COOKIE_HTTPONLY) != ERROR_SUCCESS) return; size = sizeof(cookieW) + cookie_size * sizeof(WCHAR) + sizeof(szCrLf); @@ -4194,7 +4189,7 @@ static void HTTP_InsertCookies(http_request_t *request) return; cnt += sprintfW(cookies, cookieW); - get_cookie(host->lpszValue, request->path, cookies+cnt, &cookie_size, INTERNET_COOKIE_HTTPONLY); + get_cookie(request->server->name, request->path, cookies+cnt, &cookie_size, INTERNET_COOKIE_HTTPONLY); strcatW(cookies, szCrLf); HTTP_HttpAddRequestHeadersW(request, cookies, strlenW(cookies), HTTP_ADDREQ_FLAG_REPLACE);

1 0

Jacek Caban : wininet: Rewrite structs storing cookies to represent domains as a tree.
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: 4707b4483bfaa4ef55c6c0665dd20fe6c26226e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4707b4483bfaa4ef55c6c0665… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 14 15:21:38 2014 +0200 wininet: Rewrite structs storing cookies to represent domains as a tree. --- dlls/wininet/cookie.c | 571 ++++++++++++++++++++++++++------------------------ 1 file changed, 301 insertions(+), 270 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4707b4483bfaa4ef55c6c…

1 0

Thomas Faber : wininet: Do not omit mandatory argument to WriteFile.
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: 9609df86e3ad9ec90ca936c3f11de7c60a4482ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=9609df86e3ad9ec90ca936c3f… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 12 10:30:29 2014 +0200 wininet: Do not omit mandatory argument to WriteFile. --- dlls/wininet/cookie.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 34234db..2c8dd84 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -416,6 +416,7 @@ static BOOL save_persistent_cookie(cookie_container_t *container) BOOL do_save = FALSE; char buf[64], *dyn_buf; FILETIME time; + DWORD bytes_written; if (!create_cookie_url(container->domain->domain, container->path, cookie_url, sizeof(cookie_url)/sizeof(cookie_url[0]))) return FALSE; @@ -454,31 +455,31 @@ static BOOL save_persistent_cookie(cookie_container_t *container) continue; dyn_buf = heap_strdupWtoA(cookie_container->name); - if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), NULL, NULL)) { + if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), &bytes_written, NULL)) { heap_free(dyn_buf); do_save = FALSE; break; } heap_free(dyn_buf); - if(!WriteFile(cookie_handle, "\n", 1, NULL, NULL)) { + if(!WriteFile(cookie_handle, "\n", 1, &bytes_written, NULL)) { do_save = FALSE; break; } dyn_buf = heap_strdupWtoA(cookie_container->data); - if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), NULL, NULL)) { + if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), &bytes_written, NULL)) { heap_free(dyn_buf); do_save = FALSE; break; } heap_free(dyn_buf); - if(!WriteFile(cookie_handle, "\n", 1, NULL, NULL)) { + if(!WriteFile(cookie_handle, "\n", 1, &bytes_written, NULL)) { do_save = FALSE; break; } dyn_buf = heap_strdupWtoA(container->domain->domain); - if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), NULL, NULL)) { + if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), &bytes_written, NULL)) { heap_free(dyn_buf); do_save = FALSE; break; @@ -486,7 +487,7 @@ static BOOL save_persistent_cookie(cookie_container_t *container) heap_free(dyn_buf); dyn_buf = heap_strdupWtoA(container->path); - if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), NULL, NULL)) { + if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), &bytes_written, NULL)) { heap_free(dyn_buf); do_save = FALSE; break; @@ -496,7 +497,7 @@ static BOOL save_persistent_cookie(cookie_container_t *container) sprintf(buf, "\n%u\n%u\n%u\n%u\n%u\n*\n", cookie_container->flags, cookie_container->expiry.dwLowDateTime, cookie_container->expiry.dwHighDateTime, cookie_container->create.dwLowDateTime, cookie_container->create.dwHighDateTime); - if(!WriteFile(cookie_handle, buf, strlen(buf), NULL, NULL)) { + if(!WriteFile(cookie_handle, buf, strlen(buf), &bytes_written, NULL)) { do_save = FALSE; break; }

1 0

Thomas Faber : d3dxof: Do not omit mandatory argument to WriteFile.
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: 21b821677394ce760ad4e3065031f2d358961bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=21b821677394ce760ad4e3065… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 12 10:33:21 2014 +0200 d3dxof: Do not omit mandatory argument to WriteFile. --- dlls/d3dxof/d3dxof.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 4172c62..8ca5793 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -136,6 +136,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV HRESULT hr; LPBYTE file_buffer; DWORD file_size; + DWORD bytes_written; TRACE("(%p/%p)->(%p,%x,%p)\n", This, iface, pvSource, dwLoadOptions, ppEnumObj); @@ -240,7 +241,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV file = CreateFileA(tmp, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, NULL); if (file != INVALID_HANDLE_VALUE) { - WriteFile(file, file_buffer, file_size, NULL, NULL); + WriteFile(file, file_buffer, file_size, &bytes_written, NULL); CloseHandle(file); } } @@ -304,6 +305,7 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP parse_buffer buf; HRESULT hr; LPBYTE decomp_buffer = NULL; + DWORD bytes_written; ZeroMemory(&buf, sizeof(buf)); buf.buffer = pvData; @@ -325,7 +327,7 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP file = CreateFileA(tmp, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, NULL); if (file != INVALID_HANDLE_VALUE) { - WriteFile(file, pvData, cbSize, NULL, NULL); + WriteFile(file, pvData, cbSize, &bytes_written, NULL); CloseHandle(file); } }

1 0