October 2013 - Wine-Commits

Henri Verbeet : wined3d: Send geometry shader binding updates through the command stream.
by Alexandre Julliard Oct. 4, 2013

Oct. 4, 2013

Module: wine Branch: master Commit: 819e9dda28abb33a09b9ffcf0a23760539e2f3a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=819e9dda28abb33a09b9ffcf0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 3 23:31:45 2013 +0200 wined3d: Send geometry shader binding updates through the command stream. --- dlls/wined3d/cs.c | 21 +++++++++++++++++++++ dlls/wined3d/device.c | 11 ++++------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 44a8285d..e49ce3a 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -39,6 +39,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_INDEX_BUFFER, WINED3D_CS_OP_SET_TEXTURE, WINED3D_CS_OP_SET_VERTEX_SHADER, + WINED3D_CS_OP_SET_GEOMETRY_SHADER, }; struct wined3d_cs_present @@ -531,6 +532,25 @@ void wined3d_cs_emit_set_vertex_shader(struct wined3d_cs *cs, struct wined3d_sha cs->ops->submit(cs); } +static void wined3d_cs_exec_set_geometry_shader(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_shader *op = data; + + cs->state.geometry_shader = op->shader; + device_invalidate_state(cs->device, STATE_GEOMETRY_SHADER); +} + +void wined3d_cs_emit_set_geometry_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_GEOMETRY_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, @@ -546,6 +566,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* 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, + /* WINED3D_CS_OP_SET_GEOMETRY_SHADER */ wined3d_cs_exec_set_geometry_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 77bd452..b2f10cf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2611,17 +2611,14 @@ void CDECL wined3d_device_set_geometry_shader(struct wined3d_device *device, str TRACE("device %p, shader %p.\n", device, shader); + if (device->recording || shader == prev) + return; if (shader) wined3d_shader_incref(shader); + device->update_state->geometry_shader = shader; + wined3d_cs_emit_set_geometry_shader(device->cs, shader); if (prev) wined3d_shader_decref(prev); - - device->update_state->geometry_shader = shader; - - if (device->recording || shader == prev) - return; - - device_invalidate_state(device, STATE_GEOMETRY_SHADER); } struct wined3d_shader * CDECL wined3d_device_get_geometry_shader(const struct wined3d_device *device) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 13a3aa2..545c8d3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2487,6 +2487,7 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region, DWORD flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_depth_stencil(struct wined3d_cs *cs, struct wined3d_surface *depth_stencil) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_geometry_shader(struct wined3d_cs *cs, struct wined3d_shader *shader) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buffer *buffer, enum wined3d_format_id format_id) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_render_target(struct wined3d_cs *cs, UINT render_target_idx,

1 0

Jacek Caban : wininet: Added support for locking HTTP request files.
by Alexandre Julliard Oct. 4, 2013

Oct. 4, 2013

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

Jacek Caban : wininet: Added InternetUnlockRequestFile implementation.
by Alexandre Julliard Oct. 4, 2013

Oct. 4, 2013

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: Moved request file info to separated struct.
by Alexandre Julliard Oct. 4, 2013

Oct. 4, 2013

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

Alexandre Julliard : configure: Add enable options for all modules to the recognized option list.
by Alexandre Julliard Oct. 4, 2013

Oct. 4, 2013

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

Frédéric Delanoy : dinput: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 4, 2013

Oct. 4, 2013

Module: wine Branch: master Commit: 25f3356906239efce1e482d9738a2dd3fe2074ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=25f3356906239efce1e482d97… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 4 11:43:23 2013 +0200 dinput: Use BOOL type where appropriate. --- dlls/dinput/device.c | 6 +++--- dlls/dinput/joystick.c | 4 ++-- dlls/dinput/joystick_linuxinput.c | 4 ++-- dlls/dinput/joystick_osx.c | 9 +++++---- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 2ca26fb..fc5ad5d 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -719,8 +719,8 @@ HRESULT _build_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); WCHAR username[MAX_PATH]; DWORD username_size = MAX_PATH; - int i, has_actions = 0; - BOOL load_success = FALSE; + int i; + BOOL load_success = FALSE, has_actions = FALSE; /* Unless asked the contrary by these flags, try to load a previous mapping */ if (!(dwFlags & DIDBAM_HWDEFAULTS)) @@ -760,7 +760,7 @@ HRESULT _build_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, lpdiaf->rgoAction[i].dwObjID = obj_id; lpdiaf->rgoAction[i].guidInstance = This->guid; lpdiaf->rgoAction[i].dwHow = DIAH_DEFAULT; - has_actions = 1; + has_actions = TRUE; } } else if (!(dwFlags & DIDBAM_PRESERVE)) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index ce267e6..4eddd89 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -708,7 +708,7 @@ HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, { JoystickGenericImpl *This = impl_from_IDirectInputDevice8W(iface); unsigned int i, j; - int has_actions = 0; + BOOL has_actions = FALSE; DWORD object_types[] = { DIDFT_AXIS, DIDFT_BUTTON }; DWORD type_map[] = { DIDFT_RELAXIS, DIDFT_PSHBUTTON }; @@ -739,7 +739,7 @@ HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, lpdiaf->rgoAction[i].guidInstance = This->base.guid; lpdiaf->rgoAction[i].dwHow = DIAH_DEFAULT; - has_actions = 1; + has_actions = TRUE; /* No need to try other types if the action was already mapped */ break; diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 5d1cacc..559f181 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -97,7 +97,7 @@ struct JoyDev { char *name; GUID guid; - int has_ff; + BOOL has_ff; int num_effects; /* data returned by EVIOCGBIT for caps, EV_ABS, EV_KEY, and EV_FF */ @@ -275,7 +275,7 @@ static void find_joydevs(void) joydev.num_effects > 0) { TRACE(" ... with force feedback\n"); - joydev.has_ff = 1; + joydev.has_ff = TRUE; } #endif diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 66b020e..622b054 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -841,13 +841,13 @@ static const char *osx_ff_axis_name(UInt8 axis) return ret; } -static int osx_axis_has_ff(FFCAPABILITIES *ffcaps, UInt8 axis) +static BOOL osx_axis_has_ff(FFCAPABILITIES *ffcaps, UInt8 axis) { int i; for(i = 0; i < ffcaps->numFfAxes; ++i) if(ffcaps->ffAxes[i] == axis) - return 1; - return 0; + return TRUE; + return FALSE; } static HRESULT alloc_device(REFGUID rguid, IDirectInputImpl *dinput, @@ -948,7 +948,8 @@ static HRESULT alloc_device(REFGUID rguid, IDirectInputImpl *dinput, for (i = 0; i < newDevice->generic.devcaps.dwAxes; i++) { - int wine_obj = -1, has_ff = 0; + int wine_obj = -1; + BOOL has_ff = FALSE; switch (axis_map[i]) { case kHIDUsage_GD_X:

1 0

Frédéric Delanoy : advapi32: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 4, 2013

Oct. 4, 2013

Module: wine Branch: master Commit: 6b6495e3cafc402bdf1231f6975966c0816366d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b6495e3cafc402bdf1231f69… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 4 11:43:20 2013 +0200 advapi32: Use BOOL type where appropriate. --- dlls/advapi32/registry.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index e999ce6..11e7500 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -82,13 +82,13 @@ static BOOL hkcu_cache_disabled; static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); /* check if value type needs string conversion (Ansi<->Unicode) */ -static inline int is_string( DWORD type ) +static inline BOOL is_string( DWORD type ) { return (type == REG_SZ) || (type == REG_EXPAND_SZ) || (type == REG_MULTI_SZ); } /* check if current version is NT or Win95 */ -static inline int is_version_nt(void) +static inline BOOL is_version_nt(void) { return !(GetVersion() & 0x80000000); }

1 0

Henri Verbeet : d3drm: Get rid of the Header typedef.
by Alexandre Julliard Oct. 4, 2013

Oct. 4, 2013

Module: wine Branch: master Commit: 13e3219c2f5df4efbd035bc1466a254ef5d2d95e URL: http://source.winehq.org/git/wine.git/?a=commit;h=13e3219c2f5df4efbd035bc14… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 3 23:31:48 2013 +0200 d3drm: Get rid of the Header typedef. --- dlls/d3drm/d3drm.c | 10 +++++----- dlls/d3drm/d3drm_private.h | 5 +++-- dlls/d3drm/meshbuilder.c | 9 +++++---- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index e1aa368..0ab62de 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1326,7 +1326,7 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v HRESULT hr; const GUID* pGuid; DWORD size; - Header* pHeader; + struct d3drm_file_header *header; HRESULT ret = D3DRMERR_BADOBJECT; DWORD i; @@ -1382,14 +1382,14 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v goto end; } - hr = IDirectXFileData_GetData(data, NULL, &size, (void **)&pHeader); - if ((hr != DXFILE_OK) || (size != sizeof(Header))) + hr = IDirectXFileData_GetData(data, NULL, &size, (void **)&header); + if ((hr != DXFILE_OK) || (size != sizeof(*header))) goto end; - TRACE("Version is %d %d %d\n", pHeader->major, pHeader->minor, pHeader->flags); + TRACE("Version is %u.%u, flags %#x.\n", header->major, header->minor, header->flags); /* Version must be 1.0.x */ - if ((pHeader->major != 1) || (pHeader->minor != 0)) + if ((header->major != 1) || (header->minor != 0)) { ret = D3DRMERR_BADFILE; goto end; diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index d1f30be..3daf96a 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -37,11 +37,12 @@ HRESULT Direct3DRMTexture_create(REFIID riid, IUnknown** ret_iface) DECLSPEC_HID HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *data, D3DRMLOADTEXTURECALLBACK load_texture_proc, void *arg) DECLSPEC_HIDDEN; -typedef struct { +struct d3drm_file_header +{ WORD major; WORD minor; DWORD flags; -} Header; +}; extern char templates[]; diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index c198531..0262284 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1521,11 +1521,12 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3* IDirectXFileData *data = NULL; const GUID* guid; DWORD size; - Header* header; + struct d3drm_file_header *header; HRESULT hr; HRESULT ret = D3DRMERR_BADOBJECT; - TRACE("(%p)->(%p,%p,%x,%p,%p)\n", This, filename, name, loadflags, cb, arg); + TRACE("iface %p, filename %p, name %p, loadflags %#x, cb %p, arg %p.\n", + iface, filename, name, loadflags, cb, arg); clean_mesh_builder_data(This); @@ -1573,10 +1574,10 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3* } hr = IDirectXFileData_GetData(data, NULL, &size, (void**)&header); - if ((hr != DXFILE_OK) || (size != sizeof(Header))) + if ((hr != DXFILE_OK) || (size != sizeof(*header))) goto end; - TRACE("Version is %d %d %d\n", header->major, header->minor, header->flags); + TRACE("Version is %u.%u, flags %#x.\n", header->major, header->minor, header->flags); /* Version must be 1.0.x */ if ((header->major != 1) || (header->minor != 0))

1 0

Henri Verbeet : wined3d: Send vertex shader binding updates through the command stream.
by Alexandre Julliard Oct. 4, 2013

Oct. 4, 2013

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

Alistair Leslie-Hughes : include: Add interfaces ICLRMetaHostPolicy, ICLRDebugging.
by Alexandre Julliard Oct. 3, 2013

Oct. 3, 2013

Module: wine Branch: master Commit: fcb2c9690b6e6a235c70b3407ad9d968ef3b7e21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcb2c9690b6e6a235c70b3407… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 2 11:57:45 2013 +1000 include: Add interfaces ICLRMetaHostPolicy, ICLRDebugging. --- include/metahost.idl | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 75 insertions(+), 0 deletions(-) diff --git a/include/metahost.idl b/include/metahost.idl index 51cd784..549d664 100644 --- a/include/metahost.idl +++ b/include/metahost.idl @@ -25,6 +25,30 @@ cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") cpp_quote("#undef LoadLibrary") cpp_quote("#endif") +typedef enum +{ + METAHOST_POLICY_HIGHCOMPAT = 0, + METAHOST_POLICY_APPLY_UPGRADE_POLICY = 0x08, + METAHOST_POLICY_EMULATE_EXE_LAUNCH = 0x10, + METAHOST_POLICY_SHOW_ERROR_DIALOG = 0x20, + METAHOST_POLICY_USE_PROCESS_IMAGE_PATH = 0x40, + METAHOST_POLICY_ENSURE_SKU_SUPPORTED = 0x80 +} METAHOST_POLICY_FLAGS; + +typedef enum +{ + CLR_DEBUGGING_MANAGED_EVENT_PENDING = 1 +} CLR_DEBUGGING_PROCESS_FLAGS; + +typedef struct _CLR_DEBUGGING_VERSION +{ + WORD wStructVersion; + WORD wMajor; + WORD wMinor; + WORD wBuild; + WORD wRevision; +} CLR_DEBUGGING_VERSION; + [ object, local, @@ -128,4 +152,55 @@ interface ICLRMetaHost : IUnknown [in] INT32 iExitCode); }; +[ + object, + local, + uuid(e2190695-77b2-492e-8e14-c4b3a7fdd593) +] +interface ICLRMetaHostPolicy : IUnknown +{ + HRESULT GetRequestedRuntime([in] METAHOST_POLICY_FLAGS dwPolicyFlags, + [in] LPCWSTR pwzBinary, [in] IStream *pCfgStream, + [in, out] LPWSTR pwzVersion, [in, out] DWORD *pcchVersion, + [out] LPWSTR pwzImageVersion, [out, in] DWORD *pcchImageVersion, + [out] DWORD *pdwConfigFlags, [in] REFIID riid, [retval, out] LPVOID *ppRuntime); +} + +[ + uuid(2ebcd49a-1b47-4a61-b13a-4a03701e594b) +] +coclass CLRMetaHostPolicy +{ + [default] interface ICLRMetaHostPolicy; +} + +[ + object, + local, + uuid(3151c08d-4d09-4f9b-8838-2880bf18fe51) +] +interface ICLRDebuggingLibraryProvider : IUnknown +{ + HRESULT ProvideLibrary([in] const WCHAR *pwszFileName, + [in] DWORD dwTimestamp, [in] DWORD dwSizeOfImage, + [out] HMODULE *phModule); +} + +[ + object, + local, + uuid(d28f3c5a-9634-4206-a509-477552eefb10) +] +interface ICLRDebugging : IUnknown +{ + HRESULT OpenVirtualProcess([in] ULONG64 moduleBaseAddress, + [in] IUnknown *pDataTarget, [in] ICLRDebuggingLibraryProvider *pLibraryProvider, + [in] CLR_DEBUGGING_VERSION *pMaxDebuggerSupportedVersion, + [in] REFIID riidProcess, [out] IUnknown **ppProcess, + [out, in] CLR_DEBUGGING_VERSION *pVersion, + [out] CLR_DEBUGGING_PROCESS_FLAGS *pdwFlags); + + HRESULT CanUnloadNow(HMODULE hModule); +} + cpp_quote("HRESULT WINAPI CLRCreateInstance(REFCLSID clsid, REFIID riid, LPVOID *ppInterface);")

1 0