October 2013 - Wine-commits

Frédéric Delanoy : cabinet: Use BOOL type where appropriate.
by Alexandre Julliard 04 Oct '13

04 Oct '13

Module: wine Branch: master Commit: fbcf83f79cf2509176f9a0de4dc8088adb49ee0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbcf83f79cf2509176f9a0de4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 4 11:43:24 2013 +0200 cabinet: Use BOOL type where appropriate. --- dlls/cabinet/fdi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 33734e7..2e39444 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2048,7 +2048,7 @@ static int fdi_decomp(const struct fdi_file *fi, int savemode, fdi_decomp_state FDICABINETINFO fdici; char emptystring = '\0'; cab_UBYTE buf2[64]; - int success = FALSE; + BOOL success = FALSE; struct fdi_folder *fol = NULL, *linkfol = NULL; struct fdi_file *file = NULL, *linkfile = NULL;

1 0

Alexandre Julliard : configure: Disable tools by default when cross-compiling.
by Alexandre Julliard 04 Oct '13

04 Oct '13

Module: wine Branch: master Commit: 1970edd2855ea712dc0070ab70963eb5d4f29cdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1970edd2855ea712dc0070ab7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 4 14:37:16 2013 +0200 configure: Disable tools by default when cross-compiling. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 4154b43..0ceb931 100755 --- a/configure +++ b/configure @@ -4292,7 +4292,6 @@ then enable_fonts=${enable_fonts:-no} enable_server=${enable_server:-no} - enable_tools=${enable_tools:-no} elif test "x$enable_win64" = "xyes" then test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" @@ -4318,6 +4317,7 @@ else /*) ;; *) wine_cv_toolsdir="\$(top_builddir)/$wine_cv_toolsdir" ;; esac + enable_tools=${enable_tools:-no} else as_fn_error $? "could not find Wine tools in $wine_cv_toolsdir" "$LINENO" 5 fi diff --git a/configure.ac b/configure.ac index 708197a..d362611 100644 --- a/configure.ac +++ b/configure.ac @@ -197,7 +197,6 @@ then AC_SUBST([WOW64_DISABLE],[\#]) enable_fonts=${enable_fonts:-no} enable_server=${enable_server:-no} - enable_tools=${enable_tools:-no} elif test "x$enable_win64" = "xyes" then test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" @@ -219,6 +218,7 @@ AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir, /*) ;; *) wine_cv_toolsdir="\$(top_builddir)/$wine_cv_toolsdir" ;; esac + enable_tools=${enable_tools:-no} else AC_MSG_ERROR([could not find Wine tools in $wine_cv_toolsdir]) fi])

1 0

Alexandre Julliard : configure: Add enable options for all modules to the recognized option list.
by Alexandre Julliard 04 Oct '13

04 Oct '13

Module: wine Branch: master Commit: d92bcec95a55bae2f9bc686bad9b2641a162c548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d92bcec95a55bae2f9bc686ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 4 17:46:14 2013 +0200 configure: Add enable options for all modules to the recognized option list. --- aclocal.m4 | 8 + configure | 489 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 497 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d92bcec95a55bae2f9bc6…

1 0

Alexandre Julliard : makefiles: Link libwine statically into the tools to avoid run-time path dependencies .
by Alexandre Julliard 04 Oct '13

04 Oct '13

Module: wine Branch: master Commit: a60ebd3ade22879d5992bcde7fd1da150859cd30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a60ebd3ade22879d5992bcde7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 4 14:17:53 2013 +0200 makefiles: Link libwine statically into the tools to avoid run-time path dependencies. --- .gitignore | 2 - Make.rules.in | 8 ++-- Make.vars.in | 2 +- Maketest.rules.in | 2 +- configure | 15 +------ configure.ac | 11 +----- fonts/Makefile.in | 100 ++++++++++++++++++++++++------------------------ libs/wine/Makefile.in | 5 ++ tools/Makefile.in | 4 +- tools/wmc/Makefile.in | 15 +++---- tools/wrc/Makefile.in | 15 +++---- 11 files changed, 78 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a60ebd3ade22879d5992b…

1 0

Jacek Caban : wininet: Moved request file info to separated struct.
by Alexandre Julliard 04 Oct '13

04 Oct '13

Module: wine Branch: master Commit: c58317b5b4adbccfe093ea00c93cade79f0b491f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c58317b5b4adbccfe093ea00c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 4 16:52:43 2013 +0200 wininet: Moved request file info to separated struct. --- dlls/wininet/http.c | 40 +++++++++++++++++++++++++--------------- dlls/wininet/internet.c | 30 ++++++++++++++++++++++++++++++ dlls/wininet/internet.h | 19 +++++++++++++++++-- 3 files changed, 72 insertions(+), 17 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 2d11040..d2bd2d4 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1912,11 +1912,10 @@ static void HTTPREQ_Destroy(object_header_t *hdr) TRACE("\n"); - if(request->hCacheFile) { + if(request->hCacheFile) CloseHandle(request->hCacheFile); - DeleteFileW(request->cacheFile); - } - heap_free(request->cacheFile); + if(request->req_file) + req_file_release(request->req_file); request->read_section.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &request->read_section ); @@ -2194,25 +2193,25 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe TRACE("INTERNET_OPTION_DATAFILE_NAME\n"); - if(!req->cacheFile) { + if(!req->req_file) { *size = 0; return ERROR_INTERNET_ITEM_NOT_FOUND; } if(unicode) { - req_size = (lstrlenW(req->cacheFile)+1) * sizeof(WCHAR); + req_size = (lstrlenW(req->req_file->file_name)+1) * sizeof(WCHAR); if(*size < req_size) return ERROR_INSUFFICIENT_BUFFER; *size = req_size; - memcpy(buffer, req->cacheFile, *size); + memcpy(buffer, req->req_file->file_name, *size); return ERROR_SUCCESS; }else { - req_size = WideCharToMultiByte(CP_ACP, 0, req->cacheFile, -1, NULL, 0, NULL, NULL); + req_size = WideCharToMultiByte(CP_ACP, 0, req->req_file->file_name, -1, NULL, 0, NULL, NULL); if (req_size > *size) return ERROR_INSUFFICIENT_BUFFER; - *size = WideCharToMultiByte(CP_ACP, 0, req->cacheFile, + *size = WideCharToMultiByte(CP_ACP, 0, req->req_file->file_name, -1, buffer, *size, NULL, NULL); return ERROR_SUCCESS; } @@ -2376,12 +2375,17 @@ static void commit_cache_entry(http_request_t *req) if(HTTP_GetRequestURL(req, url)) { WCHAR *header; DWORD header_len; + BOOL res; header = build_response_header(req, TRUE); header_len = (header ? strlenW(header) : 0); - CommitUrlCacheEntryW(url, req->cacheFile, req->expires, + 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); } } @@ -2396,9 +2400,14 @@ static void create_cache_entry(http_request_t *req) BOOL b = TRUE; /* FIXME: We should free previous cache file earlier */ - heap_free(req->cacheFile); - CloseHandle(req->hCacheFile); - req->hCacheFile = NULL; + if(req->req_file) { + req_file_release(req->req_file); + req->req_file = NULL; + } + if(req->hCacheFile) { + CloseHandle(req->hCacheFile); + req->hCacheFile = NULL; + } if(req->hdr.dwFlags & INTERNET_FLAG_NO_CACHE_WRITE) b = FALSE; @@ -2450,8 +2459,9 @@ static void create_cache_entry(http_request_t *req) return; } - req->cacheFile = heap_strdupW(file_name); - req->hCacheFile = CreateFileW(req->cacheFile, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, + create_req_file(file_name, &req->req_file); + + req->hCacheFile = CreateFileW(file_name, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if(req->hCacheFile == INVALID_HANDLE_VALUE) { WARN("Could not create file: %u\n", GetLastError()); diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index a54a3df..ace1bfa 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3901,6 +3901,36 @@ BOOL WINAPI InternetQueryDataAvailable( HINTERNET hFile, return res == ERROR_SUCCESS; } +DWORD create_req_file(const WCHAR *file_name, req_file_t **ret) +{ + req_file_t *req_file; + + req_file = heap_alloc_zero(sizeof(*req_file)); + if(!req_file) + return ERROR_NOT_ENOUGH_MEMORY; + + req_file->ref = 1; + + req_file->file_name = heap_strdupW(file_name); + if(!req_file->file_name) { + heap_free(req_file); + return ERROR_NOT_ENOUGH_MEMORY; + } + + *ret = req_file; + return ERROR_SUCCESS; +} + +void req_file_release(req_file_t *req_file) +{ + if(InterlockedDecrement(&req_file->ref)) + return; + + if(!req_file->is_committed) + DeleteFileW(req_file->file_name); + heap_free(req_file->file_name); + heap_free(req_file); +} /*********************************************************************** * InternetLockRequestFile (WININET.@) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 246eb95..8cde45e 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -247,6 +247,13 @@ typedef enum #define INET_OPENURL 0x0001 #define INET_CALLBACKW 0x0002 +typedef struct +{ + LONG ref; + WCHAR *file_name; + BOOL is_committed; +} req_file_t; + typedef struct _object_header_t object_header_t; typedef struct { @@ -280,7 +287,6 @@ struct _object_header_t struct list children; }; - typedef struct { object_header_t hdr; @@ -357,7 +363,7 @@ typedef struct DWORD nCustHeaders; FILETIME last_modified; HANDLE hCacheFile; - LPWSTR cacheFile; + req_file_t *req_file; FILETIME expires; struct HttpAuthInfo *authInfo; struct HttpAuthInfo *proxyAuthInfo; @@ -444,6 +450,15 @@ int sock_get_error(int) DECLSPEC_HIDDEN; server_t *get_server(const WCHAR*,INTERNET_PORT,BOOL,BOOL); +DWORD create_req_file(const WCHAR*,req_file_t**) DECLSPEC_HIDDEN; +void req_file_release(req_file_t*) DECLSPEC_HIDDEN; + +static inline req_file_t *req_file_addref(req_file_t *req_file) +{ + InterlockedIncrement(&req_file->ref); + return req_file; +} + BOOL init_urlcache(void) DECLSPEC_HIDDEN; void free_urlcache(void) DECLSPEC_HIDDEN; void free_cookie(void) DECLSPEC_HIDDEN;

1 0

Jacek Caban : wininet: Forward InternetLockRequestFile to handle-specific functions.
by Alexandre Julliard 04 Oct '13

04 Oct '13

Module: wine Branch: master Commit: c1bab59e81490127fc18cbb1edfff86b98902861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1bab59e81490127fc18cbb1e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 4 16:52:58 2013 +0200 wininet: Forward InternetLockRequestFile to handle-specific functions. --- dlls/wininet/ftp.c | 9 ++++++++- dlls/wininet/http.c | 10 +++++++++- dlls/wininet/internet.c | 30 ++++++++++++++++++++++++++---- dlls/wininet/internet.h | 1 + 4 files changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 1b67211..db64a17 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1291,6 +1291,12 @@ static DWORD FTPFILE_QueryDataAvailable(object_header_t *hdr, DWORD *available, return ERROR_SUCCESS; } +static DWORD FTPFILE_LockRequestFile(object_header_t *hdr, req_file_t **ret) +{ + ftp_file_t *file = (ftp_file_t*)hdr; + FIXME("%p\n", file); + return ERROR_NOT_SUPPORTED; +} static const object_vtbl_t FTPFILEVtbl = { FTPFILE_Destroy, @@ -1301,7 +1307,8 @@ static const object_vtbl_t FTPFILEVtbl = { FTPFILE_ReadFileEx, FTPFILE_WriteFile, FTPFILE_QueryDataAvailable, - NULL + NULL, + FTPFILE_LockRequestFile }; /*********************************************************************** diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d2bd2d4..26156ce 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3252,6 +3252,13 @@ done: return ERROR_SUCCESS; } +static DWORD HTTPREQ_LockRequestFile(object_header_t *hdr, req_file_t **ret) +{ + http_request_t *req = (http_request_t*)hdr; + FIXME("(%p)\n", req); + return ERROR_NOT_SUPPORTED; +} + static const object_vtbl_t HTTPREQVtbl = { HTTPREQ_Destroy, HTTPREQ_CloseConnection, @@ -3261,7 +3268,8 @@ static const object_vtbl_t HTTPREQVtbl = { HTTPREQ_ReadFileEx, HTTPREQ_WriteFile, HTTPREQ_QueryDataAvailable, - NULL + NULL, + HTTPREQ_LockRequestFile }; /*********************************************************************** diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index ace1bfa..f1ea8be 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3935,11 +3935,33 @@ void req_file_release(req_file_t *req_file) /*********************************************************************** * InternetLockRequestFile (WININET.@) */ -BOOL WINAPI InternetLockRequestFile( HINTERNET hInternet, HANDLE -*lphLockReqHandle) +BOOL WINAPI InternetLockRequestFile(HINTERNET hInternet, HANDLE *lphLockReqHandle) { - FIXME("STUB\n"); - return FALSE; + req_file_t *req_file = NULL; + object_header_t *hdr; + DWORD res; + + TRACE("(%p %p)\n", hInternet, lphLockReqHandle); + + hdr = get_handle_object(hInternet); + if (!hdr) { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if(hdr->vtbl->LockRequestFile) { + res = hdr->vtbl->LockRequestFile(hdr, &req_file); + }else { + WARN("wrong handle\n"); + res = ERROR_INTERNET_INCORRECT_HANDLE_TYPE; + } + + WININET_Release(hdr); + + *lphLockReqHandle = req_file; + if(res != ERROR_SUCCESS) + SetLastError(res); + return res == ERROR_SUCCESS; } BOOL WINAPI InternetUnlockRequestFile( HANDLE hLockHandle) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 8cde45e..2195897 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -266,6 +266,7 @@ typedef struct { DWORD (*WriteFile)(object_header_t*,const void*,DWORD,DWORD*); DWORD (*QueryDataAvailable)(object_header_t*,DWORD*,DWORD,DWORD_PTR); DWORD (*FindNextFileW)(object_header_t*,void*); + DWORD (*LockRequestFile)(object_header_t*,req_file_t**); } object_vtbl_t; #define INTERNET_HANDLE_IN_USE 1

1 0

Jacek Caban : wininet: Added InternetUnlockRequestFile implementation.
by Alexandre Julliard 04 Oct '13

04 Oct '13

Module: wine Branch: master Commit: 817d6625a845913e35d5b27ea6ba7f03730f9a38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=817d6625a845913e35d5b27ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 4 16:53:07 2013 +0200 wininet: Added InternetUnlockRequestFile implementation. --- dlls/wininet/internet.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index f1ea8be..5448eb4 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3964,10 +3964,12 @@ BOOL WINAPI InternetLockRequestFile(HINTERNET hInternet, HANDLE *lphLockReqHandl return res == ERROR_SUCCESS; } -BOOL WINAPI InternetUnlockRequestFile( HANDLE hLockHandle) +BOOL WINAPI InternetUnlockRequestFile(HANDLE hLockHandle) { - FIXME("STUB\n"); - return FALSE; + TRACE("(%p)\n", hLockHandle); + + req_file_release(hLockHandle); + return TRUE; }

1 0

Jacek Caban : wininet: Added support for locking HTTP request files.
by Alexandre Julliard 04 Oct '13

04 Oct '13

Module: wine Branch: master Commit: 47f490e1f6fa7b756289d09718ab15850c052718 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47f490e1f6fa7b756289d0971… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 4 16:53:22 2013 +0200 wininet: Added support for locking HTTP request files. --- dlls/wininet/http.c | 12 ++++++++++-- dlls/wininet/internet.c | 9 +++++++++ dlls/wininet/internet.h | 1 + 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 26156ce..ec746cd 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3255,8 +3255,16 @@ done: static DWORD HTTPREQ_LockRequestFile(object_header_t *hdr, req_file_t **ret) { http_request_t *req = (http_request_t*)hdr; - FIXME("(%p)\n", req); - return ERROR_NOT_SUPPORTED; + + TRACE("(%p)\n", req); + + if(!req->req_file) { + WARN("No cache file name available\n"); + return ERROR_FILE_NOT_FOUND; + } + + *ret = req_file_addref(req->req_file); + return ERROR_SUCCESS; } static const object_vtbl_t HTTPREQVtbl = { diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 5448eb4..954e891 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3917,6 +3917,13 @@ DWORD create_req_file(const WCHAR *file_name, req_file_t **ret) return ERROR_NOT_ENOUGH_MEMORY; } + req_file->file_handle = CreateFileW(req_file->file_name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if(req_file->file_handle == INVALID_HANDLE_VALUE) { + req_file_release(req_file); + return GetLastError(); + } + *ret = req_file; return ERROR_SUCCESS; } @@ -3928,6 +3935,8 @@ void req_file_release(req_file_t *req_file) if(!req_file->is_committed) DeleteFileW(req_file->file_name); + 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); } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 2195897..3d948cf 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -250,6 +250,7 @@ typedef enum typedef struct { LONG ref; + HANDLE file_handle; WCHAR *file_name; BOOL is_committed; } req_file_t;

1 0

Henri Verbeet : wined3d: Send vertex shader binding updates through the command stream.
by Alexandre Julliard 04 Oct '13

04 Oct '13

Module: wine Branch: master Commit: 368fcab2e8ae2c6188a62bcea4cb3e505140b381 URL: http://source.winehq.org/git/wine.git/?a=commit;h=368fcab2e8ae2c6188a62bcea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 3 23:31:44 2013 +0200 wined3d: Send vertex shader binding updates through the command stream. --- dlls/wined3d/cs.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/device.c | 22 +++++++--------------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index e4ec0e8..44a8285d 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -38,6 +38,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ, WINED3D_CS_OP_SET_INDEX_BUFFER, WINED3D_CS_OP_SET_TEXTURE, + WINED3D_CS_OP_SET_VERTEX_SHADER, }; struct wined3d_cs_present @@ -134,6 +135,12 @@ struct wined3d_cs_set_texture struct wined3d_texture *texture; }; +struct wined3d_cs_set_shader +{ + enum wined3d_cs_op opcode; + struct wined3d_shader *shader; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -505,6 +512,25 @@ void wined3d_cs_emit_set_texture(struct wined3d_cs *cs, UINT stage, struct wined cs->ops->submit(cs); } +static void wined3d_cs_exec_set_vertex_shader(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_shader *op = data; + + cs->state.vertex_shader = op->shader; + device_invalidate_state(cs->device, STATE_VSHADER); +} + +void wined3d_cs_emit_set_vertex_shader(struct wined3d_cs *cs, struct wined3d_shader *shader) +{ + struct wined3d_cs_set_shader *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_VERTEX_SHADER; + op->shader = shader; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -519,6 +545,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ */ wined3d_cs_exec_set_stream_source_freq, /* WINED3D_CS_OP_SET_INDEX_BUFFER */ wined3d_cs_exec_set_index_buffer, /* WINED3D_CS_OP_SET_TEXTURE */ wined3d_cs_exec_set_texture, + /* WINED3D_CS_OP_SET_VERTEX_SHADER */ wined3d_cs_exec_set_vertex_shader, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0c2f3e8..77bd452 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2077,27 +2077,19 @@ void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struc TRACE("device %p, shader %p.\n", device, shader); - if (shader) - wined3d_shader_incref(shader); - if (prev) - wined3d_shader_decref(prev); - - device->update_state->vertex_shader = shader; - if (device->recording) - { - TRACE("Recording... not performing anything.\n"); device->recording->changed.vertexShader = TRUE; - return; - } if (shader == prev) - { - TRACE("Application is setting the old shader over, nothing to do.\n"); return; - } - device_invalidate_state(device, STATE_VSHADER); + if (shader) + wined3d_shader_incref(shader); + device->update_state->vertex_shader = shader; + if (!device->recording) + wined3d_cs_emit_set_vertex_shader(device->cs, shader); + if (prev) + wined3d_shader_decref(prev); } struct wined3d_shader * CDECL wined3d_device_get_vertex_shader(const struct wined3d_device *device) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6cde5b0..13a3aa2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2499,6 +2499,7 @@ void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_i void wined3d_cs_emit_set_texture(struct wined3d_cs *cs, UINT stage, struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_vertex_shader(struct wined3d_cs *cs, struct wined3d_shader *shader) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN; /* Direct3D terminology with little modifications. We do not have an issued state

1 0

Akihiro Sagawa : gdi32: Don' t modify output glyph metrics unless the function succeeds.
by Alexandre Julliard 03 Oct '13

03 Oct '13

Module: wine Branch: master Commit: 88acc9c899f20c3ba92353b7933f0a9f64bed3b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88acc9c899f20c3ba92353b79… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Oct 4 00:56:17 2013 +0900 gdi32: Don't modify output glyph metrics unless the function succeeds. --- dlls/gdi32/freetype.c | 53 ++++++++++++++++++++++++---------------------- dlls/gdi32/tests/font.c | 5 ++++ 2 files changed, 33 insertions(+), 25 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ca9e18f..ab7b99f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6184,6 +6184,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, const MAT2* lpmat) { static const FT_Matrix identityMat = {(1 << 16), 0, 0, (1 << 16)}; + GLYPHMETRICS gm; FT_Face ft_face = incoming_font->ft_face; GdiFont *font = incoming_font; FT_Glyph_Metrics metrics; @@ -6419,8 +6420,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, top = (metrics.horiBearingY + 63) & -64; bottom = (metrics.horiBearingY - metrics.height) & -64; - lpgm->gmCellIncX = adv; - lpgm->gmCellIncY = 0; + gm.gmCellIncX = adv; + gm.gmCellIncY = 0; origin_x = left; origin_y = top; } else { @@ -6492,14 +6493,14 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, vec.x = metrics.horiAdvance; vec.y = 0; pFT_Vector_Transform(&vec, &transMat); - lpgm->gmCellIncY = -((vec.y+63) >> 6); + gm.gmCellIncY = -((vec.y+63) >> 6); if (!avgAdvance || vec.y) - lpgm->gmCellIncX = (vec.x+63) >> 6; + gm.gmCellIncX = (vec.x+63) >> 6; else { vec.x = incoming_font->ntmAvgWidth; vec.y = 0; pFT_Vector_Transform(&vec, &transMat); - lpgm->gmCellIncX = pFT_MulFix(vec.x, em_scale) * 2; + gm.gmCellIncX = pFT_MulFix(vec.x, em_scale) * 2; } if (vertical_metrics) @@ -6520,28 +6521,29 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, width = (right - left) >> 6; height = (top - bottom) >> 6; - lpgm->gmBlackBoxX = width ? width : 1; - lpgm->gmBlackBoxY = height ? height : 1; - lpgm->gmptGlyphOrigin.x = origin_x >> 6; - lpgm->gmptGlyphOrigin.y = origin_y >> 6; + gm.gmBlackBoxX = width ? width : 1; + gm.gmBlackBoxY = height ? height : 1; + gm.gmptGlyphOrigin.x = origin_x >> 6; + gm.gmptGlyphOrigin.y = origin_y >> 6; abc->abcA = left >> 6; - abc->abcB = lpgm->gmBlackBoxX; + abc->abcB = gm.gmBlackBoxX; abc->abcC = adv - abc->abcA - abc->abcB; - TRACE("%u,%u,%s,%d,%d\n", lpgm->gmBlackBoxX, lpgm->gmBlackBoxY, - wine_dbgstr_point(&lpgm->gmptGlyphOrigin), - lpgm->gmCellIncX, lpgm->gmCellIncY); + TRACE("%u,%u,%s,%d,%d\n", gm.gmBlackBoxX, gm.gmBlackBoxY, + wine_dbgstr_point(&gm.gmptGlyphOrigin), + gm.gmCellIncX, gm.gmCellIncY); if ((format == GGO_METRICS || format == GGO_BITMAP || format == WINE_GGO_GRAY16_BITMAP) && is_identity_MAT2(lpmat)) /* don't cache custom transforms */ { - FONT_GM(font,original_index)->gm = *lpgm; + FONT_GM(font,original_index)->gm = gm; FONT_GM(font,original_index)->abc = *abc; FONT_GM(font,original_index)->init = TRUE; } if(format == GGO_METRICS) { + *lpgm = gm; return 1; /* FIXME */ } @@ -6626,7 +6628,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, src += ft_face->glyph->bitmap.pitch; dst += pitch; } - return needed; + break; } case ft_glyph_format_outline: { @@ -6654,7 +6656,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, start += pitch; } } - return needed; + break; } default: @@ -6717,7 +6719,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if (!width || !height) { - if (!buf || !buflen) return 0; + if (!buf || !buflen) break; return GDI_ERROR; } @@ -6725,18 +6727,18 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, { if ( render_mode == FT_RENDER_MODE_LCD) { - lpgm->gmBlackBoxX += 2; - lpgm->gmptGlyphOrigin.x -= 1; + gm.gmBlackBoxX += 2; + gm.gmptGlyphOrigin.x -= 1; } else { - lpgm->gmBlackBoxY += 2; - lpgm->gmptGlyphOrigin.y += 1; + gm.gmBlackBoxY += 2; + gm.gmptGlyphOrigin.y += 1; } } - width = lpgm->gmBlackBoxX; - height = lpgm->gmBlackBoxY; + width = gm.gmBlackBoxX; + height = gm.gmBlackBoxY; pitch = width * 4; needed = pitch * height; @@ -6771,7 +6773,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, vmul = 3; } - x_shift = ft_face->glyph->bitmap_left - lpgm->gmptGlyphOrigin.x; + x_shift = ft_face->glyph->bitmap_left - gm.gmptGlyphOrigin.x; if ( x_shift < 0 ) { src += hmul * -x_shift; @@ -6783,7 +6785,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, width -= x_shift; } - y_shift = lpgm->gmptGlyphOrigin.y - ft_face->glyph->bitmap_top; + y_shift = gm.gmptGlyphOrigin.y - ft_face->glyph->bitmap_top; if ( y_shift < 0 ) { src += src_pitch * vmul * -y_shift; @@ -7025,6 +7027,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, FIXME("Unsupported format %d\n", format); return GDI_ERROR; } + *lpgm = gm; return needed; } diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 031b86a..2343db6 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4172,7 +4172,12 @@ static void test_GetGlyphOutline(void) ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); } else + { ok(ret == GDI_ERROR, "%2d:GetGlyphOutlineW should return GDI_ERROR, got %d\n", fmt[i], ret); + memset(&gm2, 0xab, sizeof(gm2)); + ok(memcmp(&gm, &gm2, sizeof(GLYPHMETRICS)) == 0, + "%2d:GLYPHMETRICS shouldn't be touched on error\n", fmt[i]); + } } }

1 0