wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

Henri Verbeet : wined3d: Explicitly pass the FBO target to the FBO management functions.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: e01d56f33169aa314d5488e03f8c0d651cd58c2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e01d56f33169aa314d5488e03… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 4 20:39:50 2010 +0200 wined3d: Explicitly pass the FBO target to the FBO management functions. --- dlls/wined3d/context.c | 38 ++++++++++++++++++++------------------ 1 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index bc0f88d..67a2e12 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -277,12 +277,12 @@ void context_attach_surface_fbo(const struct wined3d_context *context, } /* GL locking is done by the caller */ -static void context_check_fbo_status(struct wined3d_context *context) +static void context_check_fbo_status(struct wined3d_context *context, GLenum target) { const struct wined3d_gl_info *gl_info = context->gl_info; GLenum status; - status = gl_info->fbo_ops.glCheckFramebufferStatus(GL_FRAMEBUFFER); + status = gl_info->fbo_ops.glCheckFramebufferStatus(target); if (status == GL_FRAMEBUFFER_COMPLETE) { TRACE("FBO complete\n"); @@ -335,12 +335,12 @@ static struct fbo_entry *context_create_fbo_entry(struct wined3d_context *contex } /* GL locking is done by the caller */ -static void context_reuse_fbo_entry(struct wined3d_context *context, struct fbo_entry *entry) +static void context_reuse_fbo_entry(struct wined3d_context *context, GLenum target, struct fbo_entry *entry) { const struct wined3d_gl_info *gl_info = context->gl_info; IWineD3DDeviceImpl *device = context->swapchain->device; - context_bind_fbo(context, GL_FRAMEBUFFER, &entry->id); + context_bind_fbo(context, target, &entry->id); context_clean_fbo_attachments(gl_info); memcpy(entry->render_targets, device->render_targets, gl_info->limits.buffers * sizeof(*entry->render_targets)); @@ -364,7 +364,7 @@ static void context_destroy_fbo_entry(struct wined3d_context *context, struct fb /* GL locking is done by the caller */ -static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context) +static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, GLenum target) { const struct wined3d_gl_info *gl_info = context->gl_info; IWineD3DDeviceImpl *device = context->swapchain->device; @@ -391,7 +391,7 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context) else { entry = LIST_ENTRY(list_tail(&context->fbo_list), struct fbo_entry, entry); - context_reuse_fbo_entry(context, entry); + context_reuse_fbo_entry(context, target, entry); list_remove(&entry->entry); list_add_head(&context->fbo_list, &entry->entry); } @@ -400,19 +400,19 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context) } /* GL locking is done by the caller */ -static void context_apply_fbo_entry(struct wined3d_context *context, struct fbo_entry *entry) +static void context_apply_fbo_entry(struct wined3d_context *context, GLenum target, struct fbo_entry *entry) { const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int i; - context_bind_fbo(context, GL_FRAMEBUFFER, &entry->id); + context_bind_fbo(context, target, &entry->id); if (!entry->attached) { /* Apply render targets */ for (i = 0; i < gl_info->limits.buffers; ++i) { - context_attach_surface_fbo(context, GL_FRAMEBUFFER, i, entry->render_targets[i]); + context_attach_surface_fbo(context, target, i, entry->render_targets[i]); } /* Apply depth targets */ @@ -421,7 +421,7 @@ static void context_apply_fbo_entry(struct wined3d_context *context, struct fbo_ surface_set_compatible_renderbuffer(entry->depth_stencil, entry->render_targets[0]->pow2Width, entry->render_targets[0]->pow2Height); } - context_attach_depth_stencil_fbo(context, GL_FRAMEBUFFER, entry->depth_stencil, TRUE); + context_attach_depth_stencil_fbo(context, target, entry->depth_stencil, TRUE); entry->attached = TRUE; } @@ -438,7 +438,7 @@ static void context_apply_fbo_entry(struct wined3d_context *context, struct fbo_ } /* GL locking is done by the caller */ -static void context_apply_fbo_state(struct wined3d_context *context) +static void context_apply_fbo_state(struct wined3d_context *context, GLenum target) { struct fbo_entry *entry, *entry2; @@ -455,14 +455,16 @@ static void context_apply_fbo_state(struct wined3d_context *context) if (context->render_offscreen) { - context->current_fbo = context_find_fbo_entry(context); - context_apply_fbo_entry(context, context->current_fbo); - } else { + context->current_fbo = context_find_fbo_entry(context, target); + context_apply_fbo_entry(context, target, context->current_fbo); + } + else + { context->current_fbo = NULL; - context_bind_fbo(context, GL_FRAMEBUFFER, NULL); + context_bind_fbo(context, target, NULL); } - context_check_fbo_status(context); + context_check_fbo_status(context, target); } /* Context activation is done by the caller. */ @@ -2014,7 +2016,7 @@ void context_apply_clear_state(struct wined3d_context *context, IWineD3DDeviceIm { if (!context->render_offscreen) context_validate_onscreen_formats(device, context); ENTER_GL(); - context_apply_fbo_state(context); + context_apply_fbo_state(context, GL_FRAMEBUFFER); LEAVE_GL(); } @@ -2054,7 +2056,7 @@ void context_apply_draw_state(struct wined3d_context *context, IWineD3DDeviceImp { if (!context->render_offscreen) context_validate_onscreen_formats(device, context); ENTER_GL(); - context_apply_fbo_state(context); + context_apply_fbo_state(context, GL_FRAMEBUFFER); LEAVE_GL(); }

1 0

Henri Verbeet : wined3d: Move draw buffer setup code out of context_apply_fbo_entry().
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 4fd3050b98bec675969c2681ddf3772818b6a5d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fd3050b98bec675969c2681d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 4 20:39:49 2010 +0200 wined3d: Move draw buffer setup code out of context_apply_fbo_entry(). --- dlls/wined3d/context.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4db678d..bc0f88d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -403,7 +403,6 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context) static void context_apply_fbo_entry(struct wined3d_context *context, struct fbo_entry *entry) { const struct wined3d_gl_info *gl_info = context->gl_info; - IWineD3DDeviceImpl *device = context->swapchain->device; unsigned int i; context_bind_fbo(context, GL_FRAMEBUFFER, &entry->id); @@ -436,14 +435,6 @@ static void context_apply_fbo_entry(struct wined3d_context *context, struct fbo_ if (entry->depth_stencil) context_apply_attachment_filter_states(entry->depth_stencil); } - - for (i = 0; i < gl_info->limits.buffers; ++i) - { - if (device->render_targets[i]) - device->draw_buffers[i] = GL_COLOR_ATTACHMENT0 + i; - else - device->draw_buffers[i] = GL_NONE; - } } /* GL locking is done by the caller */ @@ -1883,6 +1874,16 @@ static void context_apply_draw_buffer(struct wined3d_context *context, BOOL blit { if (!blit) { + unsigned int i; + + for (i = 0; i < gl_info->limits.buffers; ++i) + { + if (device->render_targets[i]) + device->draw_buffers[i] = GL_COLOR_ATTACHMENT0 + i; + else + device->draw_buffers[i] = GL_NONE; + } + if (gl_info->supported[ARB_DRAW_BUFFERS]) { GL_EXTCALL(glDrawBuffersARB(gl_info->limits.buffers, device->draw_buffers));

1 0

Jacek Caban : urlmon: Added reading from cache file tests.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 41a448a5d6fbccb01c7986f6824b4eb36a1c2c42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41a448a5d6fbccb01c7986f68… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 4 20:14:49 2010 +0200 urlmon: Added reading from cache file tests. --- dlls/urlmon/tests/url.c | 112 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 89 insertions(+), 23 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 3c253fa..661bf6e 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -176,6 +176,7 @@ static const WCHAR wszIndexHtml[] = {'i','n','d','e','x','.','h','t','m','l',0}; static const WCHAR cache_fileW[] = {'c',':','\\','c','a','c','h','e','.','h','t','m',0}; static const CHAR dwl_htmlA[] = "dwl.html"; static const WCHAR dwl_htmlW[] = {'d','w','l','.','h','t','m','l',0}; +static const WCHAR test_txtW[] = {'t','e','s','t','.','t','x','t',0}; static const WCHAR emptyW[] = {0}; static BOOL stopped_binding = FALSE, stopped_obj_binding = FALSE, emulate_protocol = FALSE, @@ -187,7 +188,8 @@ static IBinding *current_binding; static HANDLE complete_event, complete_event2; static HRESULT binding_hres; static BOOL have_IHttpNegotiate2, use_bscex; -static BOOL test_redirect; +static BOOL test_redirect, use_cache_file, callback_read; +static WCHAR cache_file_name[MAX_PATH]; static LPCWSTR urls[] = { WINE_ABOUT_URL, @@ -512,18 +514,19 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &bind_info, &bindinfo); ok(hres == S_OK, "GetBindInfo failed: %08x\n", hres); - if(filedwl_api) { - ok(bind_info == (BINDF_PULLDATA|BINDF_FROMURLMON|BINDF_NEEDFILE), "bind_info=%08x\n", bind_info); - }else if(tymed == TYMED_ISTREAM && is_urlmon_protocol(test_protocol)) { - ok(bind_info == (BINDF_ASYNCHRONOUS|BINDF_ASYNCSTORAGE|BINDF_PULLDATA - |BINDF_FROMURLMON), - "bind_info=%08x\n", bind_info); - }else if(bindf&BINDF_ASYNCHRONOUS) { - ok(bind_info == (BINDF_ASYNCHRONOUS|BINDF_ASYNCSTORAGE|BINDF_PULLDATA - |BINDF_FROMURLMON|BINDF_NEEDFILE), - "bind_info=%08x\n", bind_info); - }else - ok(bind_info == (BINDF_FROMURLMON|BINDF_NEEDFILE), "bind_info=%08x\n", bind_info); + ok(bind_info & BINDF_FROMURLMON, "BINDF_FROMURLMON is not set\n"); + + if(filedwl_api || !is_urlmon_protocol(test_protocol) || !(bindf&BINDF_ASYNCSTORAGE) || tymed != TYMED_ISTREAM) + ok(bind_info & BINDF_NEEDFILE, "BINDF_NEEDFILE is not set\n"); + else + ok(!(bind_info & BINDF_NEEDFILE), "BINDF_NEEDFILE is set\n"); + + bind_info &= ~(BINDF_NEEDFILE|BINDF_FROMURLMON); + if(filedwl_api) + ok(bind_info == BINDF_PULLDATA, "bind_info = %x, expected BINDF_PULLDATA\n", bind_info); + else + ok(bind_info == (bindf & ~(BINDF_NEEDFILE|BINDF_FROMURLMON)), "bind_info = %x, expected %x\n", + bind_info, (bindf & ~(BINDF_NEEDFILE|BINDF_FROMURLMON))); ok(bindinfo.cbSize == sizeof(bindinfo), "bindinfo.cbSize = %d\n", bindinfo.cbSize); ok(!bindinfo.szExtraInfo, "bindinfo.szExtraInfo = %p\n", bindinfo.szExtraInfo); @@ -805,12 +808,9 @@ static HRESULT WINAPI Protocol_Continue(IInternetProtocol *iface, ok(hres == S_OK, "ReportProgress(BINDSTATUS_MIMETYPEAVAILABLE) failed: %08x\n", hres); - if(tymed == TYMED_FILE) { - hres = IInternetProtocolSink_ReportProgress(protocol_sink, - BINDSTATUS_CACHEFILENAMEAVAILABLE, cache_fileW); - ok(hres == S_OK, - "ReportProgress(BINDSTATUS_CACHEFILENAMEAVAILABLE) failed: %08x\n", hres); - } + hres = IInternetProtocolSink_ReportProgress(protocol_sink, + BINDSTATUS_CACHEFILENAMEAVAILABLE, use_cache_file ? cache_file_name : cache_fileW); + ok(hres == S_OK, "ReportProgress(BINDSTATUS_CACHEFILENAMEAVAILABLE) failed: %08x\n", hres); bscf |= BSCF_FIRSTDATANOTIFICATION; break; @@ -1545,9 +1545,14 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DW } ok(U(*pstgmed).pstm != NULL, "U(*pstgmed).pstm == NULL\n"); - do hres = IStream_Read(U(*pstgmed).pstm, buf, 512, &readed); - while(hres == S_OK); - ok(hres == S_FALSE || hres == E_PENDING, "IStream_Read returned %08x\n", hres); + if(callback_read) { + do { + hres = IStream_Read(U(*pstgmed).pstm, buf, 512, &readed); + if(test_protocol == HTTP_TEST && emulate_protocol && readed) + ok(buf[0] == (use_cache_file && !(bindf&BINDF_ASYNCHRONOUS) ? 'X' : '?'), "buf[0] = '%c'\n", buf[0]); + }while(hres == S_OK); + ok(hres == S_FALSE || hres == E_PENDING, "IStream_Read returned %08x\n", hres); + } break; case TYMED_FILE: @@ -2231,6 +2236,8 @@ static BOOL test_RegisterBindStatusCallback(void) #define BINDTEST_FILEDWLAPI 0x0004 #define BINDTEST_HTTPRESPONSE 0x0008 #define BINDTEST_REDIRECT 0x0010 +#define BINDTEST_USE_CACHE 0x0020 +#define BINDTEST_NO_CALLBACK_READ 0x0040 static void init_bind_test(int protocol, DWORD flags, DWORD t) { @@ -2250,6 +2257,8 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) else urls[HTTP_TEST] = WINE_ABOUT_URL; test_redirect = (flags & BINDTEST_REDIRECT) != 0; + use_cache_file = (flags & BINDTEST_USE_CACHE) != 0; + callback_read = !(flags & BINDTEST_NO_CALLBACK_READ); } static void test_BindToStorage(int protocol, DWORD flags, DWORD t) @@ -2370,7 +2379,7 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) ok(hres == S_OK, "IMoniker_BindToStorage failed: %08x\n", hres); ok(unk != NULL, "unk == NULL\n"); } - if(unk) + if(unk && callback_read) IUnknown_Release(unk); if(FAILED(hres)) @@ -2446,6 +2455,28 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST) http_is_first = FALSE; + + if(!callback_read) { + BYTE buf[512]; + DWORD readed; + IStream *stream; + + hres = IUnknown_QueryInterface(unk, &IID_IStream, (void**)&stream); + ok(hres == S_OK, "Could not get IStream iface: %08x\n", hres); + IUnknown_Release(unk); + + do { + readed = 0xdeadbeef; + hres = IStream_Read(stream, buf, sizeof(buf), &readed); + ok(readed != 0xdeadbeef, "readed = 0xdeadbeef\n"); + if(emulate_protocol && test_protocol == HTTP_TEST && readed) + ok(buf[0] == (use_cache_file && !(bindf&BINDF_ASYNCHRONOUS) ? 'X' : '?'), "buf[0] = '%c'\n", buf[0]); + }while(hres == S_OK); + ok(hres == S_FALSE, "IStream_Read returned %08x\n", hres); + ok(!readed, "readed = %d\n", readed); + + IStream_Release(stream); + } } static void test_BindToObject(int protocol, DWORD flags) @@ -2778,6 +2809,27 @@ static void create_file(void) set_file_url(path); } +static void create_cache_file(void) +{ + char buf[6500]; + HANDLE file; + DWORD size; + + file = CreateFileW(test_txtW, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n"); + if(file == INVALID_HANDLE_VALUE) + return; + + memset(buf, 'X', sizeof(buf)); + WriteFile(file, buf, sizeof(buf), &size, NULL); + CloseHandle(file); + + size = GetCurrentDirectoryW(MAX_PATH, cache_file_name); + cache_file_name[size] = '\\'; + memcpy(cache_file_name+size+1, test_txtW, sizeof(test_txtW)); +} + static void test_ReportResult(HRESULT exhres) { IMoniker *mon = NULL; @@ -2886,6 +2938,7 @@ START_TEST(url) complete_event2 = CreateEvent(NULL, FALSE, FALSE, NULL); thread_id = GetCurrentThreadId(); create_file(); + create_cache_file(); test_create(); @@ -2917,6 +2970,15 @@ START_TEST(url) trace("synchronous http test (to object)...\n"); test_BindToObject(HTTP_TEST, 0); + trace("emulated synchronous http test (with cache)...\n"); + test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE|BINDTEST_USE_CACHE, TYMED_ISTREAM); + + trace("emulated synchronous http test (with cache, no read)...\n"); + test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE|BINDTEST_USE_CACHE|BINDTEST_NO_CALLBACK_READ, TYMED_ISTREAM); + + trace("synchronous http test (with cache, no read)...\n"); + test_BindToStorage(HTTP_TEST, BINDTEST_USE_CACHE|BINDTEST_NO_CALLBACK_READ, TYMED_ISTREAM); + trace("synchronous file test...\n"); test_BindToStorage(FILE_TEST, 0, TYMED_ISTREAM); @@ -2959,6 +3021,9 @@ START_TEST(url) trace("emulated http test (redirect)...\n"); test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE|BINDTEST_REDIRECT, TYMED_ISTREAM); + trace("emulated http test (with cache)...\n"); + test_BindToStorage(HTTP_TEST, BINDTEST_EMULATE|BINDTEST_USE_CACHE, TYMED_ISTREAM); + trace("asynchronous https test...\n"); test_BindToStorage(HTTPS_TEST, 0, TYMED_ISTREAM); @@ -3029,6 +3094,7 @@ START_TEST(url) } DeleteFileA(wszIndexHtmlA); + DeleteFileW(test_txtW); CloseHandle(complete_event); CloseHandle(complete_event2); CoUninitialize();

1 0

Jacek Caban : urlmon: Use cache file to read in synchronous binding.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 7708097d7bb6503533acbe87530cb569bd8e2f5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7708097d7bb6503533acbe875… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 4 20:13:54 2010 +0200 urlmon: Use cache file to read in synchronous binding. --- dlls/urlmon/binding.c | 66 ++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 52 insertions(+), 14 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index b566265..e0f3624 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -47,6 +47,7 @@ typedef struct { BYTE buf[1024*8]; DWORD size; BOOL init; + HANDLE file; HRESULT hres; LPWSTR cache_file; @@ -101,6 +102,7 @@ struct Binding { LPWSTR redirect_url; IID iid; BOOL report_mime; + BOOL use_cache_file; DWORD state; HRESULT hres; download_state_t download_state; @@ -134,6 +136,20 @@ static void fill_stgmed_buffer(stgmed_buf_t *buf) buf->init = TRUE; } +static void read_protocol_data(stgmed_buf_t *stgmed_buf) +{ + BYTE buf[8192]; + DWORD read; + HRESULT hres; + + fill_stgmed_buffer(stgmed_buf); + if(stgmed_buf->size < sizeof(stgmed_buf->buf)) + return; + + do hres = IInternetProtocol_Read(stgmed_buf->protocol, buf, sizeof(buf), &read); + while(hres == S_OK); +} + static void dump_BINDINFO(BINDINFO *bi) { static const char * const BINDINFOF_str[] = { @@ -339,6 +355,19 @@ static void create_object(Binding *binding) IInternetProtocol_Terminate(binding->protocol, 0); } +static void cache_file_available(Binding *This, const WCHAR *file_name) +{ + heap_free(This->stgmed_buf->cache_file); + This->stgmed_buf->cache_file = heap_strdupW(file_name); + + if(This->use_cache_file) { + This->stgmed_buf->file = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if(This->stgmed_buf->file == INVALID_HANDLE_VALUE) + WARN("CreateFile failed: %u\n", GetLastError()); + } +} + #define STGMEDUNK_THIS(iface) DEFINE_THIS(stgmed_buf_t, Unknown, iface) static HRESULT WINAPI StgMedUnk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) @@ -377,6 +406,8 @@ static ULONG WINAPI StgMedUnk_Release(IUnknown *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + if(This->file != INVALID_HANDLE_VALUE) + CloseHandle(This->file); IInternetProtocol_Release(This->protocol); heap_free(This->cache_file); heap_free(This); @@ -403,6 +434,7 @@ static stgmed_buf_t *create_stgmed_buf(IInternetProtocol *protocol) ret->ref = 1; ret->size = 0; ret->init = FALSE; + ret->file = INVALID_HANDLE_VALUE; ret->hres = S_OK; ret->cache_file = NULL; @@ -488,6 +520,15 @@ static HRESULT WINAPI ProtocolStream_Read(IStream *iface, void *pv, TRACE("(%p)->(%p %d %p)\n", This, pv, cb, pcbRead); + if(This->buf->file != INVALID_HANDLE_VALUE) { + if (!ReadFile(This->buf->file, pv, cb, &read, NULL)) + return INET_E_DOWNLOAD_FAILURE; + + if(pcbRead) + *pcbRead = read; + return read ? S_OK : S_FALSE; + } + if(This->buf->size) { read = cb; @@ -690,16 +731,7 @@ static HRESULT stgmed_file_fill_stgmed(stgmed_obj_t *obj, STGMEDIUM *stgmed) return INET_E_DATA_NOT_AVAILABLE; } - fill_stgmed_buffer(file_obj->buf); - if(file_obj->buf->size == sizeof(file_obj->buf->buf)) { - BYTE buf[1024]; - DWORD read; - HRESULT hres; - - do { - hres = IInternetProtocol_Read(file_obj->buf->protocol, buf, sizeof(buf), &read); - }while(hres == S_OK); - } + read_protocol_data(file_obj->buf); stgmed->tymed = TYMED_FILE; stgmed->u.lpszFileName = file_obj->buf->cache_file; @@ -988,8 +1020,7 @@ static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink mime_available(This, szStatusText); break; case BINDSTATUS_CACHEFILENAMEAVAILABLE: - heap_free(This->stgmed_buf->cache_file); - This->stgmed_buf->cache_file = heap_strdupW(szStatusText); + cache_file_available(This, szStatusText); break; case BINDSTATUS_DECODING: IBindStatusCallback_OnProgress(This->callback, 0, 0, BINDSTATUS_DECODING, szStatusText); @@ -1020,9 +1051,12 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres if(This->download_state == END_DOWNLOAD || (This->state & BINDING_STOPPED)) return; - if(This->download_state == BEFORE_DOWNLOAD) { + if(This->stgmed_buf->file != INVALID_HANDLE_VALUE) + read_protocol_data(This->stgmed_buf); + else if(This->download_state == BEFORE_DOWNLOAD) fill_stgmed_buffer(This->stgmed_buf); + if(This->download_state == BEFORE_DOWNLOAD) { This->download_state = DOWNLOADING; sent_begindownloaddata = TRUE; IBindStatusCallback_OnProgress(This->callback, progress, progress_max, @@ -1431,8 +1465,12 @@ static HRESULT Binding_Create(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, if(to_obj) ret->bindinfo.dwOptions |= 0x100000; - if(!(ret->bindf & BINDF_ASYNCHRONOUS) || !is_urlmon_protocol(url)) + if(!(ret->bindf & BINDF_ASYNCHRONOUS)) { ret->bindf |= BINDF_NEEDFILE; + ret->use_cache_file = TRUE; + }else if(!is_urlmon_protocol(url)) { + ret->bindf |= BINDF_NEEDFILE; + } ret->url = heap_strdupW(url);

1 0

Alexandre Julliard : mmdevapi: Don' t try to lookup functions if the library isn't found.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 41db8e5910502adfbd829a4f21f21aef76aca0be URL: http://source.winehq.org/git/wine.git/?a=commit;h=41db8e5910502adfbd829a4f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 4 21:30:07 2010 +0200 mmdevapi: Don't try to lookup functions if the library isn't found. --- dlls/mmdevapi/main.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 0467963..18d8f80 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -174,7 +174,11 @@ static void load_libopenal(void) char error[128]; openal_handle = wine_dlopen(SONAME_LIBOPENAL, RTLD_NOW, error, sizeof(error)); if (!openal_handle) + { ERR("Couldn't load " SONAME_LIBOPENAL ": %s\n", error); + return; + } + #define LOAD_FUNCPTR(f) \ if((p##f = wine_dlsym(openal_handle, #f, NULL, 0)) == NULL) { \ ERR("Couldn't lookup %s in libopenal\n", #f); \

1 0

Alexandre Julliard : server: Check that the prefix type can support the client architecture.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: ac69fcb14feb4afb9ea78d349749f2c573cbdda8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac69fcb14feb4afb9ea78d349… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 4 18:23:29 2010 +0200 server: Check that the prefix type can support the client architecture. --- dlls/kernel32/process.c | 14 -------------- dlls/ntdll/server.c | 28 ++++++++++++++++------------ server/object.h | 1 + server/registry.c | 28 ++++++++++++++++++++++++++++ server/thread.c | 10 +++++++--- 5 files changed, 52 insertions(+), 29 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 1062aa6..9a1f2f5 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -908,11 +908,8 @@ static void start_wineboot( HANDLE handles[2] ) { static const WCHAR wineboot[] = {'\\','w','i','n','e','b','o','o','t','.','e','x','e',0}; static const WCHAR args[] = {' ','-','-','i','n','i','t',0}; - const DWORD expected_type = (sizeof(void*) > sizeof(int) || is_wow64) ? - SCS_64BIT_BINARY : SCS_32BIT_BINARY; STARTUPINFOW si; PROCESS_INFORMATION pi; - DWORD type; void *redir; WCHAR app[MAX_PATH]; WCHAR cmdline[MAX_PATH + (sizeof(wineboot) + sizeof(args)) / sizeof(WCHAR)]; @@ -928,17 +925,6 @@ static void start_wineboot( HANDLE handles[2] ) lstrcatW( app, wineboot ); Wow64DisableWow64FsRedirection( &redir ); - if (GetBinaryTypeW( app, &type ) && type != expected_type) - { - if (type == SCS_64BIT_BINARY) - MESSAGE( "wine: '%s' is a 64-bit prefix, it cannot be used with 32-bit Wine.\n", - wine_get_config_dir() ); - else - MESSAGE( "wine: '%s' is a 32-bit prefix, it cannot be used with %s Wine.\n", - wine_get_config_dir(), is_wow64 ? "wow64" : "64-bit" ); - ExitProcess( 1 ); - } - strcpyW( cmdline, app ); strcatW( cmdline, args ); if (CreateProcessW( app, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi )) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 568f0c5..08ee784 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1039,6 +1039,7 @@ NTSTATUS server_init_process_done(void) */ size_t server_init_thread( void *entry_point ) { + static const int is_win64 = (sizeof(void *) > sizeof(int)); int ret; int reply_pipe[2]; struct sigaction sig_act; @@ -1083,20 +1084,23 @@ size_t server_init_thread( void *entry_point ) } SERVER_END_REQ; -#ifndef _WIN64 - is_wow64 = (server_cpus & (1 << CPU_x86_64)) != 0; -#endif + is_wow64 = !is_win64 && (server_cpus & (1 << CPU_x86_64)) != 0; ntdll_get_thread_data()->wow64_redir = is_wow64; - if (ret) + switch (ret) { - if (ret == STATUS_NOT_SUPPORTED) - { - static const char * const cpu_arch[] = { "x86", "x86_64", "Alpha", "PowerPC", "Sparc" }; - server_protocol_error( "the running wineserver doesn't support the %s architecture.\n", - cpu_arch[client_cpu] ); - } - else server_protocol_error( "init_thread failed with status %x\n", ret ); + case STATUS_SUCCESS: + return info_size; + case STATUS_NOT_REGISTRY_FILE: + fatal_error( "'%s' is a 32-bit installation, it cannot support 64-bit applications.\n", + wine_get_config_dir() ); + case STATUS_NOT_SUPPORTED: + if (is_win64) + fatal_error( "wineserver is 32-bit, it cannot support 64-bit applications.\n" ); + else + fatal_error( "'%s' is a 64-bit installation, it cannot be used with a 32-bit wineserver.\n", + wine_get_config_dir() ); + default: + server_protocol_error( "init_thread failed with status %x\n", ret ); } - return info_size; } diff --git a/server/object.h b/server/object.h index 01dc00e..172c3f7 100644 --- a/server/object.h +++ b/server/object.h @@ -186,6 +186,7 @@ extern int get_page_size(void); /* registry functions */ +extern unsigned int get_prefix_cpu_mask(void); extern void init_registry(void); extern void flush_registry(void); diff --git a/server/registry.c b/server/registry.c index 7f78209..483b064 100644 --- a/server/registry.c +++ b/server/registry.c @@ -1641,6 +1641,34 @@ static WCHAR *format_user_registry_path( const SID *sid, struct unicode_str *pat return p; } +/* get the cpu architectures that can be supported in the current prefix */ +unsigned int get_prefix_cpu_mask(void) +{ + /* Allowed server/client/prefix combinations: + * + * prefix + * 32 64 + * server +------+------+ client + * | ok | fail | 32 + * 32 +------+------+--- + * | fail | fail | 64 + * ---+------+------+--- + * | ok | ok | 32 + * 64 +------+------+--- + * | fail | ok | 64 + * ---+------+------+--- + */ + switch (prefix_type) + { + case PREFIX_64BIT: + /* 64-bit prefix requires 64-bit server */ + return sizeof(void *) > sizeof(int) ? ~0 : 0; + case PREFIX_32BIT: + default: + return ~CPU_64BIT_MASK; /* only 32-bit cpus supported on 32-bit prefix */ + } +} + /* registry initialisation */ void init_registry(void) { diff --git a/server/thread.c b/server/thread.c index 1c3e5bb..c4deb68 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1098,6 +1098,7 @@ DECL_HANDLER(new_thread) /* initialize a new thread */ DECL_HANDLER(init_thread) { + unsigned int prefix_cpu_mask = get_prefix_cpu_mask(); struct process *process = current->process; int reply_fd = thread_get_inflight_fd( current, req->reply_fd ); int wait_fd = thread_get_inflight_fd( current, req->wait_fd ); @@ -1134,9 +1135,12 @@ DECL_HANDLER(init_thread) if (!process->peb) /* first thread, initialize the process too */ { - if (!CPU_FLAG(req->cpu) || !(supported_cpus & CPU_FLAG(req->cpu))) + if (!CPU_FLAG(req->cpu) || !(supported_cpus & prefix_cpu_mask & CPU_FLAG(req->cpu))) { - set_error( STATUS_NOT_SUPPORTED ); + if (!(supported_cpus & CPU_64BIT_MASK)) + set_error( STATUS_NOT_SUPPORTED ); + else + set_error( STATUS_NOT_REGISTRY_FILE ); /* server supports it but not the prefix */ return; } process->unix_pid = current->unix_pid; @@ -1163,7 +1167,7 @@ DECL_HANDLER(init_thread) reply->tid = get_thread_id( current ); reply->version = SERVER_PROTOCOL_VERSION; reply->server_start = server_start_time; - reply->all_cpus = supported_cpus; + reply->all_cpus = supported_cpus & prefix_cpu_mask; return; error:

1 0

Alexandre Julliard : server: Use the prefix architecture instead of the server one to check for WoW processes .
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: bbc03d5172d105f3ac5598bfdf02a2c04727b03d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbc03d5172d105f3ac5598bfd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 4 20:26:53 2010 +0200 server: Use the prefix architecture instead of the server one to check for WoW processes. --- server/process.h | 3 +++ server/registry.c | 7 +++++++ server/thread.c | 8 -------- server/thread.h | 1 - 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/server/process.h b/server/process.h index 87e12e0..cee7be9 100644 --- a/server/process.h +++ b/server/process.h @@ -92,6 +92,9 @@ struct process_snapshot int handles; /* number of handles */ }; +#define CPU_FLAG(cpu) (1 << (cpu)) +#define CPU_64BIT_MASK CPU_FLAG(CPU_x86_64) + /* process functions */ extern unsigned int alloc_ptid( void *ptr ); diff --git a/server/registry.c b/server/registry.c index e5c0da4..7f78209 100644 --- a/server/registry.c +++ b/server/registry.c @@ -43,6 +43,7 @@ #include "file.h" #include "handle.h" #include "request.h" +#include "process.h" #include "unicode.h" #include "security.h" @@ -1873,6 +1874,12 @@ void flush_registry(void) if (fchdir( server_dir_fd ) == -1) fatal_perror( "chdir to server dir" ); } +/* determine if the thread is wow64 (32-bit client running on 64-bit prefix) */ +static int is_wow64_thread( struct thread *thread ) +{ + return (prefix_type == PREFIX_64BIT && !(CPU_FLAG(thread->process->cpu) & CPU_64BIT_MASK)); +} + /* create a registry key */ DECL_HANDLER(create_key) diff --git a/server/thread.c b/server/thread.c index a6bc55a..1c3e5bb 100644 --- a/server/thread.c +++ b/server/thread.c @@ -53,7 +53,6 @@ #include "security.h" -#define CPU_FLAG(cpu) (1 << (cpu)) #ifdef __i386__ static const unsigned int supported_cpus = CPU_FLAG(CPU_x86); #elif defined(__x86_64__) @@ -67,7 +66,6 @@ static const unsigned int supported_cpus = CPU_FLAG(CPU_SPARC); #else #error Unsupported CPU #endif -#define CPU_64BIT_MASK CPU_FLAG(CPU_x86_64) /* thread queues */ @@ -409,12 +407,6 @@ struct thread *get_thread_from_pid( int pid ) return NULL; } -/* determine if the thread is wow64 (32-bit client running on 64-bit server) */ -int is_wow64_thread( struct thread *thread ) -{ - return (supported_cpus & CPU_64BIT_MASK) && !(CPU_FLAG(thread->process->cpu) & CPU_64BIT_MASK); -} - int set_thread_affinity( struct thread *thread, affinity_t affinity ) { int ret = 0; diff --git a/server/thread.h b/server/thread.h index 045a43c..1e95732 100644 --- a/server/thread.h +++ b/server/thread.h @@ -118,7 +118,6 @@ extern int thread_add_inflight_fd( struct thread *thread, int client, int server extern int thread_get_inflight_fd( struct thread *thread, int client ); extern struct thread_snapshot *thread_snap( int *count ); extern struct token *thread_get_impersonation_token( struct thread *thread ); -extern int is_wow64_thread( struct thread *thread ); extern int set_thread_affinity( struct thread *thread, affinity_t affinity ); /* ptrace functions */

1 0

Alexandre Julliard : server: Store the prefix 32/ 64 architecture in the registry files.
by Alexandre Julliard 05 May '10

05 May '10

Module: wine Branch: master Commit: 58791c9acd762ac074e7a46dea2cc0bc632d84a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58791c9acd762ac074e7a46de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 4 20:26:04 2010 +0200 server: Store the prefix 32/64 architecture in the registry files. --- server/registry.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 50 insertions(+), 4 deletions(-) diff --git a/server/registry.c b/server/registry.c index f4dbf8e..e5c0da4 100644 --- a/server/registry.c +++ b/server/registry.c @@ -109,6 +109,7 @@ static struct key *root_key; static const timeout_t ticks_1601_to_1970 = (timeout_t)86400 * (369 * 365 + 89) * TICKS_PER_SEC; static const timeout_t save_period = 30 * -TICKS_PER_SEC; /* delay between periodic saves */ static struct timeout_user *save_timeout_user; /* saving timer */ +static enum prefix_type { PREFIX_UNKNOWN, PREFIX_32BIT, PREFIX_64BIT } prefix_type; static const WCHAR root_name[] = { '\\','R','e','g','i','s','t','r','y','\\' }; static const WCHAR wow6432node[] = {'W','o','w','6','4','3','2','N','o','d','e'}; @@ -1305,6 +1306,35 @@ static struct key *load_key( struct key *base, const char *buffer, return create_key_recursive( base, &name, modif ); } +/* load a global option from the input file */ +static int load_global_option( const char *buffer, struct file_load_info *info ) +{ + const char *p; + + if (!strncmp( buffer, "#arch=", 6 )) + { + enum prefix_type type; + p = buffer + 6; + if (!strcmp( p, "win32" )) type = PREFIX_32BIT; + else if (!strcmp( p, "win64" )) type = PREFIX_64BIT; + else + { + file_read_error( "Unknown architecture", info ); + set_error( STATUS_NOT_REGISTRY_FILE ); + return 0; + } + if (prefix_type == PREFIX_UNKNOWN) prefix_type = type; + else if (type != prefix_type) + { + file_read_error( "Mismatched architecture", info ); + set_error( STATUS_NOT_REGISTRY_FILE ); + return 0; + } + } + /* ignore unknown options */ + return 1; +} + /* load a key option from the input file */ static int load_key_option( struct key *key, const char *buffer, struct file_load_info *info ) { @@ -1525,6 +1555,7 @@ static void load_keys( struct key *key, const char *filename, FILE *f, int prefi break; case '#': /* option */ if (subkey) load_key_option( subkey, p, &info ); + else if (!load_global_option( p, &info )) goto done; break; case ';': /* comment */ case 0: /* empty line */ @@ -1563,7 +1594,7 @@ static void load_registry( struct key *key, obj_handle_t handle ) } /* load one of the initial registry files */ -static void load_init_registry_from_file( const char *filename, struct key *key ) +static int load_init_registry_from_file( const char *filename, struct key *key ) { FILE *f; @@ -1574,7 +1605,7 @@ static void load_init_registry_from_file( const char *filename, struct key *key if (get_error() == STATUS_NOT_REGISTRY_FILE) { fprintf( stderr, "%s is not a valid registry file\n", filename ); - return; + return 1; } } @@ -1583,6 +1614,7 @@ static void load_init_registry_from_file( const char *filename, struct key *key save_branch_info[save_branch_count].path = filename; save_branch_info[save_branch_count++].key = (struct key *)grab_object( key ); make_object_static( &key->obj ); + return (f != NULL); } static WCHAR *format_user_registry_path( const SID *sid, struct unicode_str *path ) @@ -1639,7 +1671,10 @@ void init_registry(void) if (!(hklm = create_key_recursive( root_key, &HKLM_name, current_time ))) fatal_error( "could not create Machine registry key\n" ); - load_init_registry_from_file( "system.reg", hklm ); + if (!load_init_registry_from_file( "system.reg", hklm )) + prefix_type = sizeof(void *) > sizeof(int) ? PREFIX_64BIT : PREFIX_32BIT; + else if (prefix_type == PREFIX_UNKNOWN) + prefix_type = PREFIX_32BIT; /* load userdef.reg into Registry\User\.Default */ @@ -1660,7 +1695,7 @@ void init_registry(void) load_init_registry_from_file( "user.reg", hkcu ); /* set the shared flag on Software\Classes\Wow6432Node */ - if (sizeof(void *) > sizeof(int)) + if (prefix_type == PREFIX_64BIT) { if ((key = create_key_recursive( hklm, &classes_name, current_time ))) { @@ -1687,6 +1722,17 @@ static void save_all_subkeys( struct key *key, FILE *f ) fprintf( f, ";; All keys relative to " ); dump_path( key, NULL, f ); fprintf( f, "\n" ); + switch (prefix_type) + { + case PREFIX_32BIT: + fprintf( f, "\n#arch=win32\n" ); + break; + case PREFIX_64BIT: + fprintf( f, "\n#arch=win64\n" ); + break; + default: + break; + } save_subkeys( key, key, f ); }

1 0

André Hentschel : wineusr: Fix a typo.
by Alexandre Julliard 05 May '10

05 May '10

Module: docs Branch: master Commit: 020da79da4b60d3890eda4cd425989c545aab5a3 URL: http://source.winehq.org/git/docs.git/?a=commit;h=020da79da4b60d3890eda4cd4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 4 20:48:04 2010 +0200 wineusr: Fix a typo. --- en/wineusr-running.sgml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/en/wineusr-running.sgml b/en/wineusr-running.sgml index 106be37..dda25cc 100644 --- a/en/wineusr-running.sgml +++ b/en/wineusr-running.sgml @@ -427,7 +427,7 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\" bash. </para> <para>Note however that there are some exceptions to the rule: - If you want to change the PATH, SYSTEM or TEMP variables, the of course + If you want to change the PATH, SYSTEM or TEMP variables, then of course you can't modify it that way, since this will alter the Unix environment settings. Instead, you should set them into the registry. To set them you should launch <userinput>wine regedit</userinput> and then go to the

1 0

André Hentschel : wineusr: Unix paths are supported.
by Alexandre Julliard 05 May '10

05 May '10

Module: docs Branch: master Commit: 619f21882bbca71107e7c16d65e839154fdd63fe URL: http://source.winehq.org/git/docs.git/?a=commit;h=619f21882bbca71107e7c16d6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 4 20:48:00 2010 +0200 wineusr: Unix paths are supported. --- en/wineusr-running.sgml | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/en/wineusr-running.sgml b/en/wineusr-running.sgml index f36383f..106be37 100644 --- a/en/wineusr-running.sgml +++ b/en/wineusr-running.sgml @@ -90,8 +90,8 @@ Usage: wine PROGRAM [ARGUMENTS...] Run the specified program in the <parameter>Path</parameter> environment variable, you can simply give the executable file name. However, if the executable is not in <parameter>Path</parameter>, you must give the full path to - the executable (in Windows format, not UNIX format!). For - example, given a <parameter>Path</parameter> of the following: + the executable. For example, given a <parameter>Path</parameter> + of the following: </para> <screen> Path="c:\windows;c:\windows\system;e:\;e:\test;f:\" @@ -112,7 +112,11 @@ Path="c:\windows;c:\windows\system;e:\;e:\test;f:\" </screen> <para> (note the backslash-escaped "\" !) + or: </para> + <screen> +<prompt>$</prompt> <userinput>wine ~/.wine/drive_c/myapps/foo.exe</userinput> + </screen> <para> For details on running text mode (CUI) executables, read the <link linkend="CUI-programs">section</link> below.

1 0

← Newer
1
...
80
81
82
83
84
85
86
...
96
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 2010