wine-commits May 2016

wine-commits@winehq.org

4 participants
542 discussions

Jacek Caban : wininet: Store request URL in req_file_t.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 4227dfaa947c212842f56721f2984be20b3a77aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4227dfaa947c212842f56721f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 17 19:14:38 2016 +0200 wininet: Store request URL in req_file_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 81 ++++++++++++++++++++++++++++--------------------- dlls/wininet/internet.c | 1 + dlls/wininet/internet.h | 1 + 3 files changed, 48 insertions(+), 35 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c44156c..9ccb776 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1873,14 +1873,14 @@ static DWORD HTTP_ResolveName(http_request_t *request) return ERROR_SUCCESS; } -static BOOL HTTP_GetRequestURL(http_request_t *req, LPWSTR buf) +static WCHAR *compose_request_url(http_request_t *req) { static const WCHAR http[] = { 'h','t','t','p',':','/','/',0 }; static const WCHAR https[] = { 'h','t','t','p','s',':','/','/',0 }; - static const WCHAR slash[] = { '/',0 }; LPHTTPHEADERW host_header; - const WCHAR *host; - LPCWSTR scheme; + const WCHAR *host, *scheme; + WCHAR *buf, *ptr; + size_t len; EnterCriticalSection( &req->headers_section ); @@ -1888,18 +1888,30 @@ static BOOL HTTP_GetRequestURL(http_request_t *req, LPWSTR buf) if (host_header) host = host_header->lpszValue; else host = req->server->canon_host_port; - if (req->hdr.dwFlags & INTERNET_FLAG_SECURE) + if (req->server->is_https) scheme = https; else scheme = http; - strcpyW(buf, scheme); - strcatW(buf, host); - if (req->path[0] != '/') - strcatW(buf, slash); - strcatW(buf, req->path); + + len = strlenW(scheme) + strlenW(host) + (req->path[0] != '/' ? 1 : 0) + strlenW(req->path); + ptr = buf = heap_alloc((len+1) * sizeof(WCHAR)); + if(buf) { + strcpyW(ptr, scheme); + ptr += strlenW(ptr); + + strcpyW(ptr, host); + ptr += strlenW(ptr); + + if(req->path[0] != '/') + *ptr++ = '/'; + + strcpyW(ptr, req->path); + ptr += strlenW(ptr); + *ptr = 0; + } LeaveCriticalSection( &req->headers_section ); - return TRUE; + return buf; } @@ -2158,27 +2170,29 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe case INTERNET_OPTION_CACHE_TIMESTAMPS: { INTERNET_CACHE_ENTRY_INFOW *info; INTERNET_CACHE_TIMESTAMPS *ts = buffer; - WCHAR url[INTERNET_MAX_URL_LENGTH]; DWORD nbytes, error; BOOL ret; TRACE("INTERNET_OPTION_CACHE_TIMESTAMPS\n"); + if(!req->req_file) + return ERROR_FILE_NOT_FOUND; + if (*size < sizeof(*ts)) { *size = sizeof(*ts); return ERROR_INSUFFICIENT_BUFFER; } + nbytes = 0; - HTTP_GetRequestURL(req, url); - ret = GetUrlCacheEntryInfoW(url, NULL, &nbytes); + ret = GetUrlCacheEntryInfoW(req->req_file->url, NULL, &nbytes); error = GetLastError(); if (!ret && error == ERROR_INSUFFICIENT_BUFFER) { if (!(info = heap_alloc(nbytes))) return ERROR_OUTOFMEMORY; - GetUrlCacheEntryInfoW(url, info, &nbytes); + GetUrlCacheEntryInfoW(req->req_file->url, info, &nbytes); ts->ftExpires = info->ExpireTime; ts->ftLastModified = info->LastModifiedTime; @@ -2367,29 +2381,25 @@ static DWORD HTTPREQ_SetOption(object_header_t *hdr, DWORD option, void *buffer, static void commit_cache_entry(http_request_t *req) { - WCHAR url[INTERNET_MAX_URL_LENGTH]; + WCHAR *header; + DWORD header_len; + BOOL res; TRACE("%p\n", req); CloseHandle(req->hCacheFile); req->hCacheFile = NULL; - if(HTTP_GetRequestURL(req, url)) { - WCHAR *header; - DWORD header_len; - BOOL res; - - header = build_response_header(req, TRUE); - header_len = (header ? strlenW(header) : 0); - res = CommitUrlCacheEntryW(url, req->req_file->file_name, req->expires, - req->last_modified, NORMAL_CACHE_ENTRY, - header, header_len, NULL, 0); - if(res) - req->req_file->is_committed = TRUE; - else - WARN("CommitUrlCacheEntry failed: %u\n", GetLastError()); - heap_free(header); - } + header = build_response_header(req, TRUE); + header_len = (header ? strlenW(header) : 0); + res = CommitUrlCacheEntryW(req->req_file->url, req->req_file->file_name, req->expires, + req->last_modified, NORMAL_CACHE_ENTRY, + header, header_len, NULL, 0); + if(res) + req->req_file->is_committed = TRUE; + else + WARN("CommitUrlCacheEntry failed: %u\n", GetLastError()); + heap_free(header); } static void create_cache_entry(http_request_t *req) @@ -2397,8 +2407,8 @@ static void create_cache_entry(http_request_t *req) static const WCHAR no_cacheW[] = {'n','o','-','c','a','c','h','e',0}; static const WCHAR no_storeW[] = {'n','o','-','s','t','o','r','e',0}; - WCHAR url[INTERNET_MAX_URL_LENGTH]; WCHAR file_name[MAX_PATH+1]; + WCHAR *url; BOOL b = TRUE; /* FIXME: We should free previous cache file earlier */ @@ -2455,8 +2465,8 @@ static void create_cache_entry(http_request_t *req) FIXME("INTERNET_FLAG_NEED_FILE is not supported correctly\n"); } - b = HTTP_GetRequestURL(req, url); - if(!b) { + url = compose_request_url(req); + if(!url) { WARN("Could not get URL\n"); return; } @@ -2468,6 +2478,7 @@ static void create_cache_entry(http_request_t *req) } create_req_file(file_name, &req->req_file); + req->req_file->url = url; req->hCacheFile = CreateFileW(file_name, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index e192592..75ae2d6 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3901,6 +3901,7 @@ void req_file_release(req_file_t *req_file) if(req_file->file_handle && req_file->file_handle != INVALID_HANDLE_VALUE) CloseHandle(req_file->file_handle); heap_free(req_file->file_name); + heap_free(req_file->url); heap_free(req_file); } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 54c7555..20ee999 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -268,6 +268,7 @@ typedef struct LONG ref; HANDLE file_handle; WCHAR *file_name; + WCHAR *url; BOOL is_committed; } req_file_t;

1 0

Jacek Caban : wininet: Rewrite test_accept_encoding using more generic request.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: ce4bdcd0c1f619096631974d101eb4b95978671d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce4bdcd0c1f619096631974d1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 17 19:13:56 2016 +0200 wininet: Rewrite test_accept_encoding using more generic request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 51 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 78cec50..d42c3e7 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -475,6 +475,18 @@ static void _close_request(unsigned line, test_request_t *req) ok_(__FILE__,line)(ret, "InternetCloseHandle(session) failed: %u\n", GetLastError()); } +#define receive_simple_request(a,b,c) _receive_simple_request(__LINE__,a,b,c) +static DWORD _receive_simple_request(unsigned line, HINTERNET req, char *buf, size_t buf_size) +{ + DWORD read = 0; + BOOL ret; + + ret = InternetReadFile(req, buf, buf_size, &read); + ok_(__FILE__,line)(ret, "InternetReadFile failed: %u\n", GetLastError()); + + return read; +} + static void close_async_handle(HINTERNET handle, HANDLE complete_event, int handle_cnt) { BOOL res; @@ -2055,7 +2067,8 @@ static DWORD CALLBACK server_thread(LPVOID param) int r, c = -1, i, on, count = 0; SOCKET s; struct sockaddr_in sa; - char buffer[0x100]; + char *buffer; + size_t buffer_size; WSADATA wsaData; int last_request = 0; char host_header[22]; @@ -2086,16 +2099,20 @@ static DWORD CALLBACK server_thread(LPVOID param) sprintf(host_header, "Host: localhost:%d", si->port); sprintf(host_header_override, "Host: test.local:%d\r\n", si->port); + buffer = HeapAlloc(GetProcessHeap(), 0, buffer_size = 1000); do { if(c == -1) c = accept(s, NULL, NULL); - memset(buffer, 0, sizeof buffer); - for(i=0; i<(sizeof buffer-1); i++) + memset(buffer, 0, buffer_size); + for(i=0;; i++) { - r = recv(c, &buffer[i], 1, 0); + if(i == buffer_size) + buffer = HeapReAlloc(GetProcessHeap(), 0, buffer, buffer_size *= 2); + + r = recv(c, buffer+i, 1, 0); if (r != 1) break; if (i<4) continue; @@ -2168,7 +2185,7 @@ static DWORD CALLBACK server_thread(LPVOID param) if (strstr(buffer, "Content-Length: 100")) { if (strstr(buffer, "POST /test7b")) - recvfrom(c, buffer, sizeof buffer, 0, NULL, NULL); + recvfrom(c, buffer, buffer_size, 0, NULL, NULL); send(c, okmsg, sizeof okmsg-1, 0); send(c, page1, sizeof page1-1, 0); } @@ -2259,7 +2276,7 @@ static DWORD CALLBACK server_thread(LPVOID param) if (strstr(buffer, "GET /testH")) { send(c, ok_with_length2, sizeof(ok_with_length2)-1, 0); - recvfrom(c, buffer, sizeof(buffer), 0, NULL, NULL); + recvfrom(c, buffer, buffer_size, 0, NULL, NULL); send(c, ok_with_length, sizeof(ok_with_length)-1, 0); } @@ -2341,13 +2358,6 @@ static DWORD CALLBACK server_thread(LPVOID param) } if (strstr(buffer, "GET /test_premature_disconnect")) trace("closing connection\n"); - if (strstr(buffer, "/test_accept_encoding_http10")) - { - if (strstr(buffer, "Accept-Encoding: gzip")) - send(c, okmsg, sizeof okmsg-1, 0); - else - send(c, notokmsg, sizeof notokmsg-1, 0); - } if (strstr(buffer, "HEAD /upload.txt")) { if (strstr(buffer, "Authorization: Basic dXNlcjpwd2Q=")) @@ -2384,12 +2394,18 @@ static DWORD CALLBACK server_thread(LPVOID param) SetEvent(server_req_rec_event); WaitForSingleObject(conn_wait_event, INFINITE); } + if (strstr(buffer, "/echo_request")) + { + send(c, okmsg, sizeof(okmsg)-1, 0); + send(c, buffer, strlen(buffer), 0); + } shutdown(c, 2); closesocket(c); c = -1; } while (!last_request); closesocket(s); + HeapFree(GetProcessHeap(), 0, buffer); return 0; } @@ -4250,6 +4266,7 @@ static void test_request_content_length(int port) static void test_accept_encoding(int port) { HINTERNET ses, con, req; + char buf[1000]; BOOL ret; ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); @@ -4258,7 +4275,7 @@ static void test_accept_encoding(int port) con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); ok(con != NULL, "InternetConnect failed\n"); - req = HttpOpenRequestA(con, "GET", "/test_accept_encoding_http10", "HTTP/1.0", NULL, NULL, 0, 0); + req = HttpOpenRequestA(con, "GET", "/echo_request", "HTTP/1.0", NULL, NULL, 0, 0); ok(req != NULL, "HttpOpenRequest failed\n"); ret = HttpAddRequestHeadersA(req, "Accept-Encoding: gzip\r\n", ~0u, HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDREQ_FLAG_ADD); @@ -4268,16 +4285,20 @@ static void test_accept_encoding(int port) ok(ret, "HttpSendRequestA failed\n"); test_status_code(req, 200); + receive_simple_request(req, buf, sizeof(buf)); + ok(strstr(buf, "Accept-Encoding: gzip") != NULL, "Accept-Encoding header not found in %s\n", buf); InternetCloseHandle(req); - req = HttpOpenRequestA(con, "GET", "/test_accept_encoding_http10", "HTTP/1.0", NULL, NULL, 0, 0); + req = HttpOpenRequestA(con, "GET", "/echo_request", "HTTP/1.0", NULL, NULL, 0, 0); ok(req != NULL, "HttpOpenRequest failed\n"); ret = HttpSendRequestA(req, "Accept-Encoding: gzip", ~0u, NULL, 0); ok(ret, "HttpSendRequestA failed\n"); test_status_code(req, 200); + receive_simple_request(req, buf, sizeof(buf)); + ok(strstr(buf, "Accept-Encoding: gzip") != NULL, "Accept-Encoding header not found in %s\n", buf); InternetCloseHandle(req); InternetCloseHandle(con);

1 0

Frédéric Delanoy : French translation for release 1.9.10
by Jeremy Newman 18 May '16

18 May '16

Module: website Branch: master Commit: a1a9525fb8c3ab31b5a69aa4f67588ea3afa3a5b URL: http://source.winehq.org/git/website.git/?a=commit;h=a1a9525fb8c3ab31b5a69a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed May 18 11:43:30 2016 +0200 French translation for release 1.9.10 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016051701.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2016051701.xml b/news/fr/2016051701.xml new file mode 100644 index 0000000..41ffbd2 --- /dev/null +++ b/news/fr/2016051701.xml @@ -0,0 +1,15 @@ +<news> +<date>17 mai 2016</date> +<title>Sortie de Wine 1.9.10</title> +<body> +La version de développement 1.9.10 de Wine est disponible. +<a href="{$root}/announce/1.9.10">Nouveautés</a> de cette version : +<ul> + <li>Option de rendu haute résolution (« Retina ») sous Mac OS X.</li> + <li>Énumération de répertoires plus compatible.</li> + <li>Quelques correctifs dans le moteur d'exécution C++.</li> + <li>Améliorations dans la sortie vidéo.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.10.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Stefan Dösinger : wined3d: Discard the backbuffer in swapchain_gl_present() with the "discard" swap effect.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: aa475ce23fa295a8f5d0fa120d7b3dac1a5a41b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa475ce23fa295a8f5d0fa120… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 17 14:01:56 2016 +0200 wined3d: Discard the backbuffer in swapchain_gl_present() with the "discard" swap effect. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index f982add..7368cda 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -606,6 +606,9 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, * The FLIP swap effect is not implemented yet. We could mark WINED3D_LOCATION_DRAWABLE * up to date and hope WGL flipped front and back buffers and read this data into * the FBO. Don't bother about this for now. */ + if (swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_DISCARD) + wined3d_texture_validate_location(swapchain->back_buffers[swapchain->desc.backbuffer_count - 1], + 0, WINED3D_LOCATION_DISCARDED); if (fb->depth_stencil) {

1 0

Stefan Dösinger : wined3d: Use wined3d_texture_prepare_location() in wined3d_texture_update_desc().
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 3a7271655651f1af1323dfca58c6f2a5c6494675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a7271655651f1af1323dfca5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 17 14:01:55 2016 +0200 wined3d: Use wined3d_texture_prepare_location() in wined3d_texture_update_desc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 8 -------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e0d7c80..4fb2251 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4303,11 +4303,3 @@ cpu: return surface_cpu_blt(dst_texture, dst_sub_resource_idx, &dst_box, src_texture, src_sub_resource_idx, &src_box, flags, fx, filter); } - -/* Context activation is done by the caller. Context may be NULL in - * WINED3D_NO3D mode. */ -void wined3d_surface_prepare(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) -{ - wined3d_texture_prepare_location(surface->container, - surface_get_sub_resource_idx(surface), context, location); -} diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 53dbb2f..e0bb82f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1051,7 +1051,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT } else { - wined3d_surface_prepare(surface, NULL, WINED3D_LOCATION_SYSMEM); + wined3d_texture_prepare_location(texture, 0, NULL, WINED3D_LOCATION_SYSMEM); valid_location = WINED3D_LOCATION_SYSMEM; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c2f6471..bf43d75 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2713,8 +2713,6 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location, UINT w, UINT h) DECLSPEC_HIDDEN; -void wined3d_surface_prepare(struct wined3d_surface *surface, struct wined3d_context *context, - DWORD location) DECLSPEC_HIDDEN; void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const struct wined3d_surface *rt) DECLSPEC_HIDDEN; void surface_set_dirty(struct wined3d_surface *surface) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Emit position / attribute 0 last in draw_primitive_immediate_mode().
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: abad305c1ae9a524e97eeaa05cf5f6d22dfe6f95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abad305c1ae9a524e97eeaa05… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 14:01:54 2016 +0200 wined3d: Emit position / attribute 0 last in draw_primitive_immediate_mode(). Emitting the position / attribute 0 provokes the actual vertex emission, so needs to happen last. This fixes a regression introduced by commit f3c155cc56eb31fa9294d388e755208a2633c398. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/drawprim.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index c086491..45fa524 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -214,9 +214,9 @@ static void draw_primitive_immediate_mode(struct wined3d_context *context, const unsigned int element_idx; stride_idx = get_stride_idx(idx_data, idx_size, state->base_vertex_index, start_idx, vertex_idx); - for (element_idx = 0; use_map; use_map >>= 1, ++element_idx) + for (element_idx = MAX_ATTRIBS - 1; use_map; use_map &= ~(1u << element_idx), --element_idx) { - if (!(use_map & 1u)) + if (!(use_map & 1u << element_idx)) continue; ptr = si->elements[element_idx].data.addr + si->elements[element_idx].stride * stride_idx; @@ -329,12 +329,6 @@ static void draw_primitive_immediate_mode(struct wined3d_context *context, const stride_idx = get_stride_idx(idx_data, idx_size, state->base_vertex_index, start_idx, vertex_idx); - if (position) - { - ptr = position + stride_idx * si->elements[WINED3D_FFP_POSITION].stride; - ops->position[si->elements[WINED3D_FFP_POSITION].format->emit_idx](ptr); - } - if (normal) { ptr = normal + stride_idx * si->elements[WINED3D_FFP_NORMAL].stride; @@ -379,6 +373,12 @@ static void draw_primitive_immediate_mode(struct wined3d_context *context, const ops->texcoord[si->elements[WINED3D_FFP_TEXCOORD0 + coord_idx].format->emit_idx]( GL_TEXTURE0_ARB + context->tex_unit_map[texture_idx], ptr); } + + if (position) + { + ptr = position + stride_idx * si->elements[WINED3D_FFP_POSITION].stride; + ops->position[si->elements[WINED3D_FFP_POSITION].format->emit_idx](ptr); + } } gl_info->gl_ops.gl.p_glEnd();

1 0

Henri Verbeet : wined3d: Pass wined3d_ivec4 structures to wined3d_device_get_ps_consts_i().
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: f69cf783df233e9ded04c4df193d39d1b465d424 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f69cf783df233e9ded04c4df1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 14:01:53 2016 +0200 wined3d: Pass wined3d_ivec4 structures to wined3d_device_get_ps_consts_i(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 3 ++- dlls/wined3d/device.c | 14 +++++++------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index bfbee07..1938016 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3158,7 +3158,8 @@ static HRESULT WINAPI d3d9_device_GetPixelShaderConstantI(IDirect3DDevice9Ex *if TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); wined3d_mutex_lock(); - hr = wined3d_device_get_ps_consts_i(device->wined3d_device, reg_idx, data, count); + hr = wined3d_device_get_ps_consts_i(device->wined3d_device, + reg_idx, count, (struct wined3d_ivec4 *)data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1c25f1b..d827528 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2681,17 +2681,17 @@ HRESULT CDECL wined3d_device_set_ps_consts_i(struct wined3d_device *device, } HRESULT CDECL wined3d_device_get_ps_consts_i(const struct wined3d_device *device, - UINT start_register, int *constants, UINT vector4i_count) + unsigned int start_idx, unsigned int count, struct wined3d_ivec4 *constants) { - UINT count = min(vector4i_count, WINED3D_MAX_CONSTS_I - start_register); - - TRACE("device %p, start_register %u, constants %p, vector4i_count %u.\n", - device, start_register, constants, vector4i_count); + TRACE("device %p, start_idx %u, count %u, constants %p.\n", + device, start_idx, count, constants); - if (!constants || start_register >= WINED3D_MAX_CONSTS_I) + if (!constants || start_idx >= WINED3D_MAX_CONSTS_I) return WINED3DERR_INVALIDCALL; - memcpy(constants, &device->state.ps_consts_i[start_register], count * sizeof(int) * 4); + if (count > WINED3D_MAX_CONSTS_I - start_idx) + count = WINED3D_MAX_CONSTS_I - start_idx; + memcpy(constants, &device->state.ps_consts_i[start_idx], count * sizeof(*constants)); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 4219b53..c4446b8 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -72,7 +72,7 @@ @ cdecl wined3d_device_get_ps_cb(ptr long) @ cdecl wined3d_device_get_ps_consts_b(ptr long ptr long) @ cdecl wined3d_device_get_ps_consts_f(ptr long long ptr) -@ cdecl wined3d_device_get_ps_consts_i(ptr long ptr long) +@ cdecl wined3d_device_get_ps_consts_i(ptr long long ptr) @ cdecl wined3d_device_get_ps_resource_view(ptr long) @ cdecl wined3d_device_get_ps_sampler(ptr long) @ cdecl wined3d_device_get_raster_status(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b01e8e4..af320a4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2127,7 +2127,7 @@ HRESULT __cdecl wined3d_device_get_ps_consts_b(const struct wined3d_device *devi HRESULT __cdecl wined3d_device_get_ps_consts_f(const struct wined3d_device *device, unsigned int start_idx, unsigned int count, struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_device_get_ps_consts_i(const struct wined3d_device *device, - UINT start_register, int *constants, UINT vector4i_count); + unsigned int start_idx, unsigned int count, struct wined3d_ivec4 *constants); struct wined3d_shader_resource_view * __cdecl wined3d_device_get_ps_resource_view(const struct wined3d_device *device, UINT idx); struct wined3d_sampler * __cdecl wined3d_device_get_ps_sampler(const struct wined3d_device *device, UINT idx);

1 0

Henri Verbeet : wined3d: Pass wined3d_ivec4 structures to wined3d_device_set_ps_consts_i().
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 596f7077971c2ca2abdc5f484b7f41bf4794a23b URL: http://source.winehq.org/git/wine.git/?a=commit;h=596f7077971c2ca2abdc5f484… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 14:01:52 2016 +0200 wined3d: Pass wined3d_ivec4 structures to wined3d_device_set_ps_consts_i(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 3 ++- dlls/wined3d/device.c | 26 ++++++++++++++------------ dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 5 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8f46fcd..bfbee07 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3142,7 +3142,8 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantI(IDirect3DDevice9Ex *if TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); wined3d_mutex_lock(); - hr = wined3d_device_set_ps_consts_i(device->wined3d_device, reg_idx, data, count); + hr = wined3d_device_set_ps_consts_i(device->wined3d_device, + reg_idx, count, (const struct wined3d_ivec4 *)data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 19e819c..1c25f1b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2648,26 +2648,28 @@ HRESULT CDECL wined3d_device_get_ps_consts_b(const struct wined3d_device *device } HRESULT CDECL wined3d_device_set_ps_consts_i(struct wined3d_device *device, - UINT start_register, const int *constants, UINT vector4i_count) + unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants) { - UINT count = min(vector4i_count, WINED3D_MAX_CONSTS_I - start_register); - UINT i; + unsigned int i; - TRACE("device %p, start_register %u, constants %p, vector4i_count %u.\n", - device, start_register, constants, vector4i_count); + TRACE("device %p, start_idx %u, count %u, constants %p.\n", + device, start_idx, count, constants); - if (!constants || start_register >= WINED3D_MAX_CONSTS_I) + if (!constants || start_idx >= WINED3D_MAX_CONSTS_I) return WINED3DERR_INVALIDCALL; - memcpy(&device->update_state->ps_consts_i[start_register], constants, count * sizeof(int) * 4); - for (i = 0; i < count; ++i) - TRACE("Set INT constant %u to {%d, %d, %d, %d}.\n", start_register + i, - constants[i * 4], constants[i * 4 + 1], - constants[i * 4 + 2], constants[i * 4 + 3]); + if (count > WINED3D_MAX_CONSTS_I - start_idx) + count = WINED3D_MAX_CONSTS_I - start_idx; + memcpy(&device->update_state->ps_consts_i[start_idx], constants, count * sizeof(*constants)); + if (TRACE_ON(d3d)) + { + for (i = 0; i < count; ++i) + TRACE("Set ivec4 constant %u to %s.\n", start_idx + i, debug_ivec4(&constants[i])); + } if (device->recording) { - for (i = start_register; i < count + start_register; ++i) + for (i = start_idx; i < count + start_idx; ++i) device->recording->changed.pixelShaderConstantsI |= (1u << i); } else diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index b648034..b76a5c0 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -928,7 +928,7 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) for (i = 0; i < stateblock->num_contained_ps_consts_i; ++i) { wined3d_device_set_ps_consts_i(device, stateblock->contained_ps_consts_i[i], - &stateblock->state.ps_consts_i[stateblock->contained_ps_consts_i[i]].x, 1); + 1, &stateblock->state.ps_consts_i[stateblock->contained_ps_consts_i[i]]); } for (i = 0; i < stateblock->num_contained_ps_consts_b; ++i) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index d81e065..4219b53 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -131,7 +131,7 @@ @ cdecl wined3d_device_set_ps_cb(ptr long ptr) @ cdecl wined3d_device_set_ps_consts_b(ptr long ptr long) @ cdecl wined3d_device_set_ps_consts_f(ptr long long ptr) -@ cdecl wined3d_device_set_ps_consts_i(ptr long ptr long) +@ cdecl wined3d_device_set_ps_consts_i(ptr long long ptr) @ cdecl wined3d_device_set_ps_resource_view(ptr long ptr) @ cdecl wined3d_device_set_ps_sampler(ptr long ptr) @ cdecl wined3d_device_set_render_state(ptr long long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8ddf560..b01e8e4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2219,7 +2219,7 @@ HRESULT __cdecl wined3d_device_set_ps_consts_b(struct wined3d_device *device, HRESULT __cdecl wined3d_device_set_ps_consts_f(struct wined3d_device *device, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_device_set_ps_consts_i(struct wined3d_device *device, - UINT start_register, const int *constants, UINT vector4i_count); + unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants); void __cdecl wined3d_device_set_ps_resource_view(struct wined3d_device *device, UINT idx, struct wined3d_shader_resource_view *view); void __cdecl wined3d_device_set_ps_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler);

1 0

Henri Verbeet : wined3d: Pass wined3d_ivec4 structures to wined3d_device_get_vs_consts_i().
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 3ae7ab95838837a64b6226efc6778d271f2bed6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ae7ab95838837a64b6226efc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 14:01:51 2016 +0200 wined3d: Pass wined3d_ivec4 structures to wined3d_device_get_vs_consts_i(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 3 ++- dlls/wined3d/device.c | 14 +++++++------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0c099e0..8f46fcd 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2868,7 +2868,8 @@ static HRESULT WINAPI d3d9_device_GetVertexShaderConstantI(IDirect3DDevice9Ex *i TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); wined3d_mutex_lock(); - hr = wined3d_device_get_vs_consts_i(device->wined3d_device, reg_idx, data, count); + hr = wined3d_device_get_vs_consts_i(device->wined3d_device, + reg_idx, count, (struct wined3d_ivec4 *)data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 59a5c8c..19e819c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2452,17 +2452,17 @@ HRESULT CDECL wined3d_device_set_vs_consts_i(struct wined3d_device *device, } HRESULT CDECL wined3d_device_get_vs_consts_i(const struct wined3d_device *device, - UINT start_register, int *constants, UINT vector4i_count) + unsigned int start_idx, unsigned int count, struct wined3d_ivec4 *constants) { - UINT count = min(vector4i_count, WINED3D_MAX_CONSTS_I - start_register); - - TRACE("device %p, start_register %u, constants %p, vector4i_count %u.\n", - device, start_register, constants, vector4i_count); + TRACE("device %p, start_idx %u, count %u, constants %p.\n", + device, start_idx, count, constants); - if (!constants || start_register >= WINED3D_MAX_CONSTS_I) + if (!constants || start_idx >= WINED3D_MAX_CONSTS_I) return WINED3DERR_INVALIDCALL; - memcpy(constants, &device->state.vs_consts_i[start_register], count * sizeof(int) * 4); + if (count > WINED3D_MAX_CONSTS_I - start_idx) + count = WINED3D_MAX_CONSTS_I - start_idx; + memcpy(constants, &device->state.vs_consts_i[start_idx], count * sizeof(*constants)); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3831a65..d81e065 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -95,7 +95,7 @@ @ cdecl wined3d_device_get_vs_cb(ptr long) @ cdecl wined3d_device_get_vs_consts_b(ptr long ptr long) @ cdecl wined3d_device_get_vs_consts_f(ptr long long ptr) -@ cdecl wined3d_device_get_vs_consts_i(ptr long ptr long) +@ cdecl wined3d_device_get_vs_consts_i(ptr long long ptr) @ cdecl wined3d_device_get_vs_resource_view(ptr long) @ cdecl wined3d_device_get_vs_sampler(ptr long) @ cdecl wined3d_device_get_wined3d(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 31aba7a..8ddf560 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2163,7 +2163,7 @@ HRESULT __cdecl wined3d_device_get_vs_consts_b(const struct wined3d_device *devi HRESULT __cdecl wined3d_device_get_vs_consts_f(const struct wined3d_device *device, unsigned int start_idx, unsigned int count, struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_device_get_vs_consts_i(const struct wined3d_device *device, - UINT start_register, int *constants, UINT vector4i_count); + unsigned int start_idx, unsigned int count, struct wined3d_ivec4 *constants); struct wined3d_shader_resource_view * __cdecl wined3d_device_get_vs_resource_view(const struct wined3d_device *device, UINT idx); struct wined3d_sampler * __cdecl wined3d_device_get_vs_sampler(const struct wined3d_device *device, UINT idx);

1 0

Henri Verbeet : wined3d: Pass wined3d_ivec4 structures to wined3d_device_set_vs_consts_i().
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: ba840a4c050554fd8f689d732e5fb8a4126dd641 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba840a4c050554fd8f689d732… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 14:01:50 2016 +0200 wined3d: Pass wined3d_ivec4 structures to wined3d_device_set_vs_consts_i(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 3 ++- dlls/wined3d/device.c | 26 ++++++++++++++------------ dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 5 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index b0ef724..0c099e0 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2852,7 +2852,8 @@ static HRESULT WINAPI d3d9_device_SetVertexShaderConstantI(IDirect3DDevice9Ex *i TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); wined3d_mutex_lock(); - hr = wined3d_device_set_vs_consts_i(device->wined3d_device, reg_idx, data, count); + hr = wined3d_device_set_vs_consts_i(device->wined3d_device, + reg_idx, count, (const struct wined3d_ivec4 *)data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a61e1f5..59a5c8c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2419,26 +2419,28 @@ HRESULT CDECL wined3d_device_get_vs_consts_b(const struct wined3d_device *device } HRESULT CDECL wined3d_device_set_vs_consts_i(struct wined3d_device *device, - UINT start_register, const int *constants, UINT vector4i_count) + unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants) { - UINT count = min(vector4i_count, WINED3D_MAX_CONSTS_I - start_register); - UINT i; + unsigned int i; - TRACE("device %p, start_register %u, constants %p, vector4i_count %u.\n", - device, start_register, constants, vector4i_count); + TRACE("device %p, start_idx %u, count %u, constants %p.\n", + device, start_idx, count, constants); - if (!constants || start_register >= WINED3D_MAX_CONSTS_I) + if (!constants || start_idx >= WINED3D_MAX_CONSTS_I) return WINED3DERR_INVALIDCALL; - memcpy(&device->update_state->vs_consts_i[start_register], constants, count * sizeof(int) * 4); - for (i = 0; i < count; ++i) - TRACE("Set INT constant %u to {%d, %d, %d, %d}.\n", start_register + i, - constants[i * 4], constants[i * 4 + 1], - constants[i * 4 + 2], constants[i * 4 + 3]); + if (count > WINED3D_MAX_CONSTS_I - start_idx) + count = WINED3D_MAX_CONSTS_I - start_idx; + memcpy(&device->update_state->vs_consts_i[start_idx], constants, count * sizeof(*constants)); + if (TRACE_ON(d3d)) + { + for (i = 0; i < count; ++i) + TRACE("Set ivec4 constant %u to %s.\n", start_idx + i, debug_ivec4(&constants[i])); + } if (device->recording) { - for (i = start_register; i < count + start_register; ++i) + for (i = start_idx; i < count + start_idx; ++i) device->recording->changed.vertexShaderConstantsI |= (1u << i); } else diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 090faed..b648034 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -906,7 +906,7 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) for (i = 0; i < stateblock->num_contained_vs_consts_i; ++i) { wined3d_device_set_vs_consts_i(device, stateblock->contained_vs_consts_i[i], - &stateblock->state.vs_consts_i[stateblock->contained_vs_consts_i[i]].x, 1); + 1, &stateblock->state.vs_consts_i[stateblock->contained_vs_consts_i[i]]); } for (i = 0; i < stateblock->num_contained_vs_consts_b; ++i) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 4eb2470..3831a65 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -151,7 +151,7 @@ @ cdecl wined3d_device_set_vs_cb(ptr long ptr) @ cdecl wined3d_device_set_vs_consts_b(ptr long ptr long) @ cdecl wined3d_device_set_vs_consts_f(ptr long long ptr) -@ cdecl wined3d_device_set_vs_consts_i(ptr long ptr long) +@ cdecl wined3d_device_set_vs_consts_i(ptr long long ptr) @ cdecl wined3d_device_set_vs_resource_view(ptr long ptr) @ cdecl wined3d_device_set_vs_sampler(ptr long ptr) @ cdecl wined3d_device_setup_fullscreen_window(ptr ptr long long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index af5cd38..31aba7a 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2251,7 +2251,7 @@ HRESULT __cdecl wined3d_device_set_vs_consts_b(struct wined3d_device *device, HRESULT __cdecl wined3d_device_set_vs_consts_f(struct wined3d_device *device, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_device_set_vs_consts_i(struct wined3d_device *device, - UINT start_register, const int *constants, UINT vector4i_count); + unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants); void __cdecl wined3d_device_set_vs_resource_view(struct wined3d_device *device, UINT idx, struct wined3d_shader_resource_view *view); void __cdecl wined3d_device_set_vs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler);

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
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 May 2016