May 2010 - Wine-Commits - list.winehq.org

Vincent Povirk : ole32: Store the location of all blocks in a big block chain in memory.
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: 42550953a650e1ef166339fb4e2fdc06741ad5b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42550953a650e1ef166339fb4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 4 15:15:41 2010 -0500 ole32: Store the location of all blocks in a big block chain in memory. A big block chain is a linked list, and we pretty much need random access to them. This should theoretically make accessing a random point in the chain O(log2 n) instead of O(n) (with disk access scaling based on the size of the read/write, not its location). It theoretically takes O(n) memory based on the size, but it can do better if the chain isn't very fragmented (which I believe will generally be the case for long chains). It also involves fetching all the big block locations when we open the chain, but we already do that anyway (and it should be faster to read it all in one go than piecemeal). --- dlls/ole32/storage32.c | 271 ++++++++++++++++++++++++++++++------------------ dlls/ole32/storage32.h | 13 ++- 2 files changed, 180 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42550953a650e1ef16633…

1 0

Damjan Jovanovic : winemenubuilder: Use only widechar functions when dealing with registered associations.
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: e04422a2b364421d94fed5456e16a280fdceb237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e04422a2b364421d94fed5456… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 4 21:40:34 2010 +0200 winemenubuilder: Use only widechar functions when dealing with registered associations. --- programs/winemenubuilder/winemenubuilder.c | 130 +++++++++++++++++---------- 1 files changed, 82 insertions(+), 48 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 33c2208..201f9ac 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1444,6 +1444,16 @@ static char* wchars_to_unix_chars(LPCWSTR string) return ret; } +static WCHAR* utf8_chars_to_wchars(LPCSTR string) +{ + WCHAR *ret; + INT size = MultiByteToWideChar(CP_UTF8, 0, string, -1, NULL, 0); + ret = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (ret) + MultiByteToWideChar(CP_UTF8, 0, string, -1, ret, size); + return ret; +} + static char *slashes_to_minuses(const char *string) { int i; @@ -1690,15 +1700,15 @@ static BOOL freedesktop_mime_type_for_extension(struct list *native_mime_types, return ret; } -static CHAR* reg_get_valA(HKEY key, LPCSTR subkey, LPCSTR name) +static WCHAR* reg_get_valW(HKEY key, LPCWSTR subkey, LPCWSTR name) { DWORD size; - if (RegGetValueA(key, subkey, name, RRF_RT_REG_SZ, NULL, NULL, &size) == ERROR_SUCCESS) + if (RegGetValueW(key, subkey, name, RRF_RT_REG_SZ, NULL, NULL, &size) == ERROR_SUCCESS) { - CHAR *ret = HeapAlloc(GetProcessHeap(), 0, size); + WCHAR *ret = HeapAlloc(GetProcessHeap(), 0, size); if (ret) { - if (RegGetValueA(key, subkey, name, RRF_RT_REG_SZ, NULL, ret, &size) == ERROR_SUCCESS) + if (RegGetValueW(key, subkey, name, RRF_RT_REG_SZ, NULL, ret, &size) == ERROR_SUCCESS) return ret; } HeapFree(GetProcessHeap(), 0, ret); @@ -1706,18 +1716,14 @@ static CHAR* reg_get_valA(HKEY key, LPCSTR subkey, LPCSTR name) return NULL; } -static WCHAR* reg_get_valW(HKEY key, LPCWSTR subkey, LPCWSTR name) +static CHAR* reg_get_val_utf8(HKEY key, LPCWSTR subkey, LPCWSTR name) { - DWORD size; - if (RegGetValueW(key, subkey, name, RRF_RT_REG_SZ, NULL, NULL, &size) == ERROR_SUCCESS) + WCHAR *valW = reg_get_valW(key, subkey, name); + if (valW) { - WCHAR *ret = HeapAlloc(GetProcessHeap(), 0, size); - if (ret) - { - if (RegGetValueW(key, subkey, name, RRF_RT_REG_SZ, NULL, ret, &size) == ERROR_SUCCESS) - return ret; - } - HeapFree(GetProcessHeap(), 0, ret); + char *val = wchars_to_utf8_chars(valW); + HeapFree(GetProcessHeap(), 0, valW); + return val; } return NULL; } @@ -1732,10 +1738,12 @@ static HKEY open_associations_reg_key(void) return NULL; } -static BOOL has_association_changed(LPCSTR extensionA, LPCWSTR extensionW, LPCSTR mimeType, LPCWSTR progId, LPCSTR appName, LPCWSTR docName) +static BOOL has_association_changed(LPCWSTR extensionW, LPCSTR mimeType, LPCWSTR progId, LPCSTR appName, LPCWSTR docName) { static const WCHAR ProgIDW[] = {'P','r','o','g','I','D',0}; static const WCHAR DocNameW[] = {'D','o','c','N','a','m','e',0}; + static const WCHAR MimeTypeW[] = {'M','i','m','e','T','y','p','e',0}; + static const WCHAR AppNameW[] = {'A','p','p','N','a','m','e',0}; HKEY assocKey; BOOL ret; @@ -1746,7 +1754,7 @@ static BOOL has_association_changed(LPCSTR extensionA, LPCWSTR extensionW, LPCST ret = FALSE; - valueA = reg_get_valA(assocKey, extensionA, "MimeType"); + valueA = reg_get_val_utf8(assocKey, extensionW, MimeTypeW); if (!valueA || lstrcmpA(valueA, mimeType)) ret = TRUE; HeapFree(GetProcessHeap(), 0, valueA); @@ -1756,7 +1764,7 @@ static BOOL has_association_changed(LPCSTR extensionA, LPCWSTR extensionW, LPCST ret = TRUE; HeapFree(GetProcessHeap(), 0, value); - valueA = reg_get_valA(assocKey, extensionA, "AppName"); + valueA = reg_get_val_utf8(assocKey, extensionW, AppNameW); if (!valueA || lstrcmpA(valueA, appName)) ret = TRUE; HeapFree(GetProcessHeap(), 0, valueA); @@ -1780,32 +1788,68 @@ static void update_association(LPCWSTR extension, LPCSTR mimeType, LPCWSTR progI { static const WCHAR ProgIDW[] = {'P','r','o','g','I','D',0}; static const WCHAR DocNameW[] = {'D','o','c','N','a','m','e',0}; - HKEY assocKey; + static const WCHAR MimeTypeW[] = {'M','i','m','e','T','y','p','e',0}; + static const WCHAR AppNameW[] = {'A','p','p','N','a','m','e',0}; + static const WCHAR DesktopFileW[] = {'D','e','s','k','t','o','p','F','i','l','e',0}; + HKEY assocKey = NULL; + HKEY subkey = NULL; + WCHAR *mimeTypeW = NULL; + WCHAR *appNameW = NULL; + WCHAR *desktopFileW = NULL; + + assocKey = open_associations_reg_key(); + if (assocKey == NULL) + { + WINE_ERR("could not open file associations key\n"); + goto done; + } - if ((assocKey = open_associations_reg_key())) + if (RegCreateKeyW(assocKey, extension, &subkey) != ERROR_SUCCESS) { - HKEY subkey; - if (RegCreateKeyW(assocKey, extension, &subkey) == ERROR_SUCCESS) - { - RegSetValueExA(subkey, "MimeType", 0, REG_SZ, (const BYTE*) mimeType, lstrlenA(mimeType) + 1); - RegSetValueExW(subkey, ProgIDW, 0, REG_SZ, (const BYTE*) progId, (lstrlenW(progId) + 1) * sizeof(WCHAR)); - RegSetValueExA(subkey, "AppName", 0, REG_SZ, (const BYTE*) appName, lstrlenA(appName) + 1); - if (docName) - RegSetValueExW(subkey, DocNameW, 0, REG_SZ, (const BYTE*) docName, (lstrlenW(docName) + 1) * sizeof(WCHAR)); - RegSetValueExA(subkey, "DesktopFile", 0, REG_SZ, (const BYTE*) desktopFile, (lstrlenA(desktopFile) + 1)); - RegCloseKey(subkey); - } - else - WINE_ERR("could not create extension subkey\n"); - RegCloseKey(assocKey); + WINE_ERR("could not create extension subkey\n"); + goto done; } - else - WINE_ERR("could not open file associations key\n"); + + mimeTypeW = utf8_chars_to_wchars(mimeType); + if (mimeTypeW == NULL) + { + WINE_ERR("out of memory\n"); + goto done; + } + + appNameW = utf8_chars_to_wchars(appName); + if (appNameW == NULL) + { + WINE_ERR("out of memory\n"); + goto done; + } + + desktopFileW = utf8_chars_to_wchars(desktopFile); + if (desktopFileW == NULL) + { + WINE_ERR("out of memory\n"); + goto done; + } + + RegSetValueExW(subkey, MimeTypeW, 0, REG_SZ, (const BYTE*) mimeTypeW, (lstrlenW(mimeTypeW) + 1) * sizeof(WCHAR)); + RegSetValueExW(subkey, ProgIDW, 0, REG_SZ, (const BYTE*) progId, (lstrlenW(progId) + 1) * sizeof(WCHAR)); + RegSetValueExW(subkey, AppNameW, 0, REG_SZ, (const BYTE*) appNameW, (lstrlenW(appNameW) + 1) * sizeof(WCHAR)); + if (docName) + RegSetValueExW(subkey, DocNameW, 0, REG_SZ, (const BYTE*) docName, (lstrlenW(docName) + 1) * sizeof(WCHAR)); + RegSetValueExW(subkey, DesktopFileW, 0, REG_SZ, (const BYTE*) desktopFile, (lstrlenW(desktopFileW) + 1) * sizeof(WCHAR)); + +done: + RegCloseKey(assocKey); + RegCloseKey(subkey); + HeapFree(GetProcessHeap(), 0, mimeTypeW); + HeapFree(GetProcessHeap(), 0, appNameW); + HeapFree(GetProcessHeap(), 0, desktopFileW); } static BOOL cleanup_associations(void) { static const WCHAR openW[] = {'o','p','e','n',0}; + static const WCHAR DesktopFileW[] = {'D','e','s','k','t','o','p','F','i','l','e',0}; HKEY assocKey; BOOL hasChanged = FALSE; if ((assocKey = open_associations_reg_key())) @@ -1815,7 +1859,6 @@ static BOOL cleanup_associations(void) for (i = 0; !done; i++) { WCHAR *extensionW = NULL; - char *extensionA = NULL; DWORD size = 1024; LSTATUS ret; @@ -1836,20 +1879,13 @@ static BOOL cleanup_associations(void) if (ret == ERROR_SUCCESS) { WCHAR *command; - extensionA = wchars_to_utf8_chars(extensionW); - if (extensionA == NULL) - { - WINE_ERR("out of memory\n"); - done = TRUE; - goto end; - } command = assoc_query(ASSOCSTR_COMMAND, extensionW, openW); if (command == NULL) { - char *desktopFile = reg_get_valA(assocKey, extensionA, "DesktopFile"); + char *desktopFile = reg_get_val_utf8(assocKey, extensionW, DesktopFileW); if (desktopFile) { - WINE_TRACE("removing file type association for %s\n", wine_dbgstr_a(extensionA)); + WINE_TRACE("removing file type association for %s\n", wine_dbgstr_w(extensionW)); remove(desktopFile); } RegDeleteKeyW(assocKey, extensionW); @@ -1864,8 +1900,6 @@ static BOOL cleanup_associations(void) WINE_ERR("error %d while reading registry\n", ret); done = TRUE; } - end: - HeapFree(GetProcessHeap(), 0, extensionA); HeapFree(GetProcessHeap(), 0, extensionW); } RegCloseKey(assocKey); @@ -2111,7 +2145,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package else goto end; /* no progID => not a file type association */ - if (has_association_changed(extensionA, extensionW, mimeTypeA, progIdW, friendlyAppNameA, friendlyDocNameW)) + if (has_association_changed(extensionW, mimeTypeA, progIdW, friendlyAppNameA, friendlyDocNameW)) { char *desktopPath = heap_printf("%s/wine-extension-%s.desktop", applications_dir, &extensionA[1]); if (desktopPath)

1 0

Damjan Jovanovic : winemenubuilder: Use a unicode WinMain.
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: bc526034e04652a5a3ae22ea7b3940f6d68a3a01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc526034e04652a5a3ae22ea7… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 4 21:38:21 2010 +0200 winemenubuilder: Use a unicode WinMain. --- programs/winemenubuilder/Makefile.in | 2 +- programs/winemenubuilder/winemenubuilder.c | 37 +++++++++++++++------------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/programs/winemenubuilder/Makefile.in b/programs/winemenubuilder/Makefile.in index f6142ef..beb29ee 100644 --- a/programs/winemenubuilder/Makefile.in +++ b/programs/winemenubuilder/Makefile.in @@ -4,7 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winemenubuilder.exe -APPMODE = -mwindows +APPMODE = -mwindows -municode IMPORTS = uuid shell32 shlwapi ole32 user32 advapi32 kernel32 EXTRAINCL = @PNGINCL@ diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 51f0adb..33c2208 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2729,9 +2729,9 @@ static void cleanup_menus(void) WINE_ERR("error opening registry key, menu cleanup failed\n"); } -static CHAR *next_token( LPSTR *p ) +static WCHAR *next_token( LPWSTR *p ) { - LPSTR token = NULL, t = *p; + LPWSTR token = NULL, t = *p; if( !t ) return NULL; @@ -2746,7 +2746,7 @@ static CHAR *next_token( LPSTR *p ) case '"': /* unquote the token */ token = ++t; - t = strchr( token, '"' ); + t = strchrW( token, '"' ); if( t ) *t++ = 0; break; @@ -2755,7 +2755,7 @@ static CHAR *next_token( LPSTR *p ) break; default: token = t; - t = strchr( token, ' ' ); + t = strchrW( token, ' ' ); if( t ) *t++ = 0; break; @@ -2808,11 +2808,16 @@ static BOOL init_xdg(void) /*********************************************************************** * - * WinMain + * wWinMain */ -int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) +int PASCAL wWinMain (HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int show) { - LPSTR token = NULL, p; + static const WCHAR dash_aW[] = {'-','a',0}; + static const WCHAR dash_rW[] = {'-','r',0}; + static const WCHAR dash_uW[] = {'-','u',0}; + static const WCHAR dash_wW[] = {'-','w',0}; + + LPWSTR token = NULL, p; BOOL bWait = FALSE; BOOL bURL = FALSE; int ret = 0; @@ -2825,37 +2830,35 @@ int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show token = next_token( &p ); if( !token ) break; - if( !lstrcmpA( token, "-a" ) ) + if( !strcmpW( token, dash_aW ) ) { RefreshFileTypeAssociations(); continue; } - if( !lstrcmpA( token, "-r" ) ) + if( !strcmpW( token, dash_rW ) ) { cleanup_menus(); continue; } - if( !lstrcmpA( token, "-w" ) ) + if( !strcmpW( token, dash_wW ) ) bWait = TRUE; - else if ( !lstrcmpA( token, "-u" ) ) + else if ( !strcmpW( token, dash_uW ) ) bURL = TRUE; else if( token[0] == '-' ) { - WINE_ERR( "unknown option %s\n",token); + WINE_ERR( "unknown option %s\n", wine_dbgstr_w(token) ); } else { - WCHAR link[MAX_PATH]; BOOL bRet; - MultiByteToWideChar( CP_ACP, 0, token, -1, link, sizeof(link)/sizeof(WCHAR) ); if (bURL) - bRet = Process_URL( link, bWait ); + bRet = Process_URL( token, bWait ); else - bRet = Process_Link( link, bWait ); + bRet = Process_Link( token, bWait ); if (!bRet) { - WINE_ERR( "failed to build menu item for %s\n",token); + WINE_ERR( "failed to build menu item for %s\n", wine_dbgstr_w(token) ); ret = 1; } }

1 0

Henri Verbeet : wined3d: Setup the FBO for the correct target in context_apply_clear_state().
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: ed75f5ca7aae3de6afeca5dc97be9f54a140104d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed75f5ca7aae3de6afeca5dc9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 4 20:39:52 2010 +0200 wined3d: Setup the FBO for the correct target in context_apply_clear_state(). --- dlls/wined3d/context.c | 61 ++++++++++++++++++++++++++++++++-------- dlls/wined3d/device.c | 24 +--------------- dlls/wined3d/wined3d_private.h | 4 ++- 3 files changed, 53 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e205b7a..9815ce3 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -455,7 +455,7 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ context->rebind_fbo = FALSE; } - if (context->render_offscreen) + if (render_targets) { context->current_fbo = context_find_fbo_entry(context, target, render_targets, depth_stencil); context_apply_fbo_entry(context, target, context->current_fbo); @@ -469,6 +469,21 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ context_check_fbo_status(context, target); } +/* GL locking is done by the caller */ +static void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, + IWineD3DSurfaceImpl *render_target, IWineD3DSurfaceImpl *depth_stencil) +{ + if (surface_is_offscreen(render_target)) + { + context->blit_targets[0] = render_target; + context_apply_fbo_state(context, target, context->blit_targets, depth_stencil); + } + else + { + context_apply_fbo_state(context, target, NULL, NULL); + } +} + /* Context activation is done by the caller. */ void context_alloc_occlusion_query(struct wined3d_context *context, struct wined3d_occlusion_query *query) { @@ -1357,6 +1372,10 @@ struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, IWineD3 sizeof(*ret->pshader_const_dirty) * device->d3d_pshader_constantF); } + ret->blit_targets = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + gl_info->limits.buffers * sizeof(*ret->blit_targets)); + if (!ret->blit_targets) goto out; + ret->free_occlusion_query_size = 4; ret->free_occlusion_queries = HeapAlloc(GetProcessHeap(), 0, ret->free_occlusion_query_size * sizeof(*ret->free_occlusion_queries)); @@ -1490,6 +1509,7 @@ struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, IWineD3 out: HeapFree(GetProcessHeap(), 0, ret->free_event_queries); HeapFree(GetProcessHeap(), 0, ret->free_occlusion_queries); + HeapFree(GetProcessHeap(), 0, ret->blit_targets); HeapFree(GetProcessHeap(), 0, ret->pshader_const_dirty); HeapFree(GetProcessHeap(), 0, ret->vshader_const_dirty); HeapFree(GetProcessHeap(), 0, ret); @@ -1524,6 +1544,7 @@ void context_destroy(IWineD3DDeviceImpl *This, struct wined3d_context *context) destroy = FALSE; } + HeapFree(GetProcessHeap(), 0, context->blit_targets); HeapFree(GetProcessHeap(), 0, context->vshader_const_dirty); HeapFree(GetProcessHeap(), 0, context->pshader_const_dirty); device_context_remove(This, context); @@ -2010,23 +2031,30 @@ void context_apply_blit_state(struct wined3d_context *context, IWineD3DDeviceImp } /* Context activation is done by the caller. */ -void context_apply_clear_state(struct wined3d_context *context, IWineD3DDeviceImpl *device) +void context_apply_clear_state(struct wined3d_context *context, IWineD3DDeviceImpl *device, + IWineD3DSurfaceImpl *render_target, IWineD3DSurfaceImpl *depth_stencil) { const struct StateEntry *state_table = device->StateTable; + GLenum buffer; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { if (!context->render_offscreen) context_validate_onscreen_formats(device, context); ENTER_GL(); - context_apply_fbo_state(context, GL_FRAMEBUFFER, device->render_targets, device->depth_stencil); + context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, render_target, depth_stencil); LEAVE_GL(); } - if (context->draw_buffer_dirty) - { - context_apply_draw_buffer(context, FALSE); - context->draw_buffer_dirty = FALSE; - } + if (!surface_is_offscreen(render_target)) + buffer = surface_get_gl_buffer(render_target); + else if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + buffer = GL_COLOR_ATTACHMENT0; + else + buffer = device->offscreenBuffer; + + ENTER_GL(); + context_set_draw_buffer(context, buffer); + LEAVE_GL(); if (context->last_was_blit) { @@ -2056,10 +2084,19 @@ void context_apply_draw_state(struct wined3d_context *context, IWineD3DDeviceImp if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - if (!context->render_offscreen) context_validate_onscreen_formats(device, context); - ENTER_GL(); - context_apply_fbo_state(context, GL_FRAMEBUFFER, device->render_targets, device->depth_stencil); - LEAVE_GL(); + if (!context->render_offscreen) + { + context_validate_onscreen_formats(device, context); + ENTER_GL(); + context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, NULL); + LEAVE_GL(); + } + else + { + ENTER_GL(); + context_apply_fbo_state(context, GL_FRAMEBUFFER, device->render_targets, device->depth_stencil); + LEAVE_GL(); + } } if (context->draw_buffer_dirty) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 585edd5..3472d04 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4455,29 +4455,7 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac return WINED3D_OK; } - context_apply_clear_state(context, This); - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - if (!surface_is_offscreen(target)) - { - TRACE("Surface %p is onscreen\n", target); - - ENTER_GL(); - context_bind_fbo(context, GL_FRAMEBUFFER, NULL); - context_set_draw_buffer(context, surface_get_gl_buffer(target)); - LEAVE_GL(); - } - else - { - TRACE("Surface %p is offscreen\n", target); - - ENTER_GL(); - context_bind_fbo(context, GL_FRAMEBUFFER, &context->dst_fbo); - context_attach_surface_fbo(context, GL_FRAMEBUFFER, 0, target); - context_attach_depth_stencil_fbo(context, GL_FRAMEBUFFER, depth_stencil, TRUE); - LEAVE_GL(); - } - } + context_apply_clear_state(context, This, target, depth_stencil); target->get_drawable_size(context, &drawable_width, &drawable_height); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fabf22a..cad88b9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1092,6 +1092,7 @@ struct wined3d_context GLuint fbo_read_binding; GLuint fbo_draw_binding; BOOL rebind_fbo; + IWineD3DSurfaceImpl **blit_targets; /* Queries */ GLuint *free_occlusion_queries; @@ -1192,7 +1193,8 @@ void context_alloc_event_query(struct wined3d_context *context, void context_alloc_occlusion_query(struct wined3d_context *context, struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; void context_apply_blit_state(struct wined3d_context *context, IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; -void context_apply_clear_state(struct wined3d_context *context, IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; +void context_apply_clear_state(struct wined3d_context *context, IWineD3DDeviceImpl *device, + IWineD3DSurfaceImpl *render_target, IWineD3DSurfaceImpl *depth_stencil) DECLSPEC_HIDDEN; void context_apply_draw_state(struct wined3d_context *context, IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; void context_attach_depth_stencil_fbo(struct wined3d_context *context, GLenum fbo_target, IWineD3DSurfaceImpl *depth_stencil, BOOL use_render_buffer) DECLSPEC_HIDDEN;

1 0

Jörg Höhle : wineoss: Supply FFFFFFFF for midiOutGetVolume, not garbage.
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: 8aeb9ec03ae1ecb2d1700200858ff7bec9e1e8f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aeb9ec03ae1ecb2d17002008… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Jan 30 22:55:43 2010 +0100 wineoss: Supply FFFFFFFF for midiOutGetVolume, not garbage. --- dlls/wineoss.drv/midi.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 61d0383..20163b1 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -1632,6 +1632,17 @@ static DWORD modUnprepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) } /************************************************************************** + * modGetVolume [internal] + */ +static DWORD modGetVolume(WORD wDevID, DWORD* lpdwVolume) +{ + if (!lpdwVolume) return MMSYSERR_INVALPARAM; + if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; + *lpdwVolume = 0xFFFFFFFF; + return (MidiOutDev[wDevID].caps.dwSupport & MIDICAPS_VOLUME) ? 0 : MMSYSERR_NOTSUPPORTED; +} + +/************************************************************************** * modReset [internal] */ static DWORD modReset(WORD wDevID) @@ -1748,7 +1759,7 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case MODM_GETNUMDEVS: return MODM_NumDevs; case MODM_GETVOLUME: - return 0; + return modGetVolume(wDevID, (DWORD*)dwParam1); case MODM_SETVOLUME: return 0; case MODM_RESET:

1 0

Vincent Povirk : ole32: Remove some assumptions about the internals of BlockChainStream.
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: 93cc582a8d040c3442513b26906d4093ff13ad84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93cc582a8d040c3442513b269… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 16 16:38:35 2010 -0500 ole32: Remove some assumptions about the internals of BlockChainStream. --- dlls/ole32/storage32.c | 92 +++++++++++------------------------------------- 1 files changed, 21 insertions(+), 71 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 434d8b2..c6a532c 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5766,76 +5766,22 @@ static ULONG SmallBlockChainStream_GetNextFreeBlock( ULONG count = BlockChainStream_GetCount(This->parentStorage->smallBlockDepotChain); - ULONG sbdIndex = This->parentStorage->smallBlockDepotStart; - ULONG nextBlock, newsbdIndex; BYTE smallBlockDepot[MAX_BIG_BLOCK_SIZE]; + ULARGE_INTEGER newSize, offset; + ULONG bytesWritten; - nextBlock = sbdIndex; - while (nextBlock != BLOCK_END_OF_CHAIN) - { - sbdIndex = nextBlock; - StorageImpl_GetNextBlockInChain(This->parentStorage, sbdIndex, &nextBlock); - } - - newsbdIndex = StorageImpl_GetNextFreeBigBlock(This->parentStorage); - if (sbdIndex != BLOCK_END_OF_CHAIN) - StorageImpl_SetNextBlockInChain( - This->parentStorage, - sbdIndex, - newsbdIndex); - - StorageImpl_SetNextBlockInChain( - This->parentStorage, - newsbdIndex, - BLOCK_END_OF_CHAIN); + newSize.QuadPart = (count + 1) * This->parentStorage->bigBlockSize; + BlockChainStream_Enlarge(This->parentStorage->smallBlockDepotChain, newSize); /* * Initialize all the small blocks to free */ memset(smallBlockDepot, BLOCK_UNUSED, This->parentStorage->bigBlockSize); - StorageImpl_WriteBigBlock(This->parentStorage, newsbdIndex, smallBlockDepot); - - if (count == 0) - { - /* - * We have just created the small block depot. - */ - DirEntry rootEntry; - ULONG sbStartIndex; - - /* - * Save it in the header - */ - This->parentStorage->smallBlockDepotStart = newsbdIndex; - StorageImpl_SaveFileHeader(This->parentStorage); + offset.QuadPart = count * This->parentStorage->bigBlockSize; + BlockChainStream_WriteAt(This->parentStorage->smallBlockDepotChain, + offset, This->parentStorage->bigBlockSize, smallBlockDepot, &bytesWritten); - /* - * And allocate the first big block that will contain small blocks - */ - sbStartIndex = - StorageImpl_GetNextFreeBigBlock(This->parentStorage); - - StorageImpl_SetNextBlockInChain( - This->parentStorage, - sbStartIndex, - BLOCK_END_OF_CHAIN); - - StorageImpl_ReadDirEntry( - This->parentStorage, - This->parentStorage->base.storageDirEntry, - &rootEntry); - - rootEntry.startingBlock = sbStartIndex; - rootEntry.size.u.HighPart = 0; - rootEntry.size.u.LowPart = This->parentStorage->bigBlockSize; - - StorageImpl_WriteDirEntry( - This->parentStorage, - This->parentStorage->base.storageDirEntry, - &rootEntry); - } - else - StorageImpl_SaveFileHeader(This->parentStorage); + StorageImpl_SaveFileHeader(This->parentStorage); } } @@ -5851,20 +5797,24 @@ static ULONG SmallBlockChainStream_GetNextFreeBlock( { DirEntry rootEntry; ULONG blocksRequired = (blockIndex / smallBlocksPerBigBlock) + 1; + ULARGE_INTEGER old_size, size_required; - StorageImpl_ReadDirEntry( - This->parentStorage, - This->parentStorage->base.storageDirEntry, - &rootEntry); + size_required.QuadPart = blocksRequired * This->parentStorage->bigBlockSize; - if (rootEntry.size.u.LowPart < - (blocksRequired * This->parentStorage->bigBlockSize)) - { - rootEntry.size.u.LowPart += This->parentStorage->bigBlockSize; + old_size = BlockChainStream_GetSize(This->parentStorage->smallBlockRootChain); + if (size_required.QuadPart > old_size.QuadPart) + { BlockChainStream_SetSize( This->parentStorage->smallBlockRootChain, - rootEntry.size); + size_required); + + StorageImpl_ReadDirEntry( + This->parentStorage, + This->parentStorage->base.storageDirEntry, + &rootEntry); + + rootEntry.size = size_required; StorageImpl_WriteDirEntry( This->parentStorage,

1 0

Henri Verbeet : wined3d: Use context_apply_clear_state() in color_fill_fbo( ).
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: 8de7d2ed4ce52147369116afe69256016c50ffb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8de7d2ed4ce52147369116afe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 4 20:39:53 2010 +0200 wined3d: Use context_apply_clear_state() in color_fill_fbo(). --- dlls/wined3d/device.c | 34 ++++++++-------------------------- 1 files changed, 8 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3472d04..3001b3b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5487,42 +5487,24 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surface, if (rect) IWineD3DSurface_LoadLocation((IWineD3DSurface *)surface, SFLAG_INDRAWABLE, NULL); IWineD3DSurface_ModifyLocation((IWineD3DSurface *)surface, SFLAG_INDRAWABLE, TRUE); - if (!surface_is_offscreen(surface)) - { - TRACE("Surface %p is onscreen\n", surface); - - context = context_acquire(This, surface); - ENTER_GL(); - context_bind_fbo(context, GL_FRAMEBUFFER, NULL); - context_set_draw_buffer(context, surface_get_gl_buffer(surface)); - } - else - { - TRACE("Surface %p is offscreen\n", surface); + context = context_acquire(This, surface); + context_apply_clear_state(context, This, surface, NULL); - context = context_acquire(This, NULL); - ENTER_GL(); - context_bind_fbo(context, GL_FRAMEBUFFER, &context->dst_fbo); - context_attach_surface_fbo(context, GL_FRAMEBUFFER, 0, surface); - context_attach_depth_stencil_fbo(context, GL_FRAMEBUFFER, NULL, FALSE); - } + ENTER_GL(); - if (rect) { - glEnable(GL_SCISSOR_TEST); + if (rect) + { if (surface_is_offscreen(surface)) glScissor(rect->x1, rect->y1, rect->x2 - rect->x1, rect->y2 - rect->y1); else glScissor(rect->x1, surface->currentDesc.Height - rect->y2, rect->x2 - rect->x1, rect->y2 - rect->y1); checkGLcall("glScissor"); - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SCISSORRECT); - } else { + } + else + { glDisable(GL_SCISSOR_TEST); } - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE)); - - glDisable(GL_BLEND); - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_ALPHABLENDENABLE)); glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_COLORWRITEENABLE));

1 0

André Hentschel : winecfg: Fix builtin_only list.
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: 9c19df1d7b975254bdb9dac1ffc965eb50678c75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c19df1d7b975254bdb9dac1f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue May 4 20:16:57 2010 +0200 winecfg: Fix builtin_only list. --- programs/winecfg/libraries.c | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index 37cc12b..19504d6 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -54,8 +54,8 @@ static const char * const builtin_only[] = "ddraw", "gdi32", "glu32", - "icmp", "gphoto2.ds", + "icmp", "iphlpapi", "kernel32", "mountmgr.sys", @@ -69,19 +69,10 @@ static const char * const builtin_only[] = "user32", "vdmdbg", "w32skrnl", - "winealsa.drv", - "wineaudioio.drv", "wined3d", "winedos", - "wineesd.drv", - "winejack.drv", - "winejoystick.drv", "winemp3.acm", - "winenas.drv", - "wineoss.drv", "wineps", - "wineps.drv", - "winex11.drv", "winmm", "wintab32", "wnaspi32",

1 0

Damjan Jovanovic : wine.desktop: Add hr and sr@latin translations.
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: 75f34a615bb9e198e36240c16f1bdfcd9c7ec4ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=75f34a615bb9e198e36240c16… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed May 5 06:35:38 2010 +0200 wine.desktop: Add hr and sr(a)latin translations. --- tools/wine.desktop | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/wine.desktop b/tools/wine.desktop index 819560e..50489e1 100644 --- a/tools/wine.desktop +++ b/tools/wine.desktop @@ -17,6 +17,8 @@ Name[da]=Wine, Programstarter til Windows-programmer Name[nb]=Wine Programlaster for Windowsapplikasjoner Name[nn]=Wine Programlaster for Windowsapplikasjoner Name[sr]=Wine - дизач Windows програма +Name[sr(a)latin]=Wine - dizač Windows programa +Name[hr]=Wine - dizač Windows programa Exec=wine start /unix %f MimeType=application/x-ms-dos-executable;application/x-msi;application/x-win-lnk; Icon=wine

1 0

Alexandre Julliard : server: Use the prefix architecture instead of the server one to check for WoW processes .
by Alexandre Julliard May 5, 2010

May 5, 2010

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