July 2012 - Wine-Commits - list.winehq.org

Francois Gouget : appwiz.cpl: Only offer to download an addon if its installer is missing.
by Alexandre Julliard July 16, 2012

July 16, 2012

Module: wine Branch: master Commit: 0f36dc8df8e057d3e97670df0d1d77a6690e45fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f36dc8df8e057d3e97670df0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jul 16 10:09:32 2012 +0200 appwiz.cpl: Only offer to download an addon if its installer is missing. --- dlls/appwiz.cpl/addons.c | 49 +++++++++++++++++++++++++++------------------ 1 files changed, 29 insertions(+), 20 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 8e93dee..b2445d4 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -175,25 +175,31 @@ static void set_status(DWORD id) SendMessageW(status, WM_SETTEXT, 0, (LPARAM)buf); } -static BOOL install_file(const WCHAR *file_name) +enum install_res { + INSTALL_OK = 0, + INSTALL_FAILED, + INSTALL_NEXT, +}; + +static enum install_res install_file(const WCHAR *file_name) { ULONG res; res = MsiInstallProductW(file_name, NULL); if(res != ERROR_SUCCESS) { ERR("MsiInstallProduct failed: %u\n", res); - return FALSE; + return INSTALL_FAILED; } - return TRUE; + return INSTALL_OK; } -static BOOL install_from_unix_file(const char *dir, const char *subdir, const char *file_name) +static enum install_res install_from_unix_file(const char *dir, const char *subdir, const char *file_name) { LPWSTR dos_file_name; char *file_path; int fd, len; - BOOL ret; + enum install_res ret; static WCHAR * (CDECL *wine_get_dos_file_name)(const char*); static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; @@ -201,7 +207,7 @@ static BOOL install_from_unix_file(const char *dir, const char *subdir, const ch len = strlen(dir); file_path = heap_alloc(len+strlen(subdir)+strlen(file_name)+3); if(!file_path) - return FALSE; + return INSTALL_FAILED; memcpy(file_path, dir, len); if(len && file_path[len-1] != '/' && file_path[len-1] != '\\') @@ -217,7 +223,7 @@ static BOOL install_from_unix_file(const char *dir, const char *subdir, const ch if(fd == -1) { TRACE("%s not found\n", debugstr_a(file_path)); heap_free(file_path); - return FALSE; + return INSTALL_NEXT; } close(fd); @@ -230,7 +236,7 @@ static BOOL install_from_unix_file(const char *dir, const char *subdir, const ch if(!dos_file_name) { ERR("Could not get dos file name of %s\n", debugstr_a(file_path)); heap_free(file_path); - return FALSE; + return INSTALL_FAILED; } } else { /* Windows mode */ UINT res; @@ -265,16 +271,16 @@ static HKEY open_config_key(void) return res == ERROR_SUCCESS ? ret : NULL; } -static BOOL install_from_registered_dir(void) +static enum install_res install_from_registered_dir(void) { char *package_dir; HKEY hkey; DWORD res, type, size = MAX_PATH; - BOOL ret; + enum install_res ret; hkey = open_config_key(); if(!hkey) - return FALSE; + return INSTALL_NEXT; package_dir = heap_alloc(size); res = RegGetValueA(hkey, NULL, addon->dir_config_key, RRF_RT_ANY, &type, (PBYTE)package_dir, &size); @@ -283,9 +289,12 @@ static BOOL install_from_registered_dir(void) res = RegGetValueA(hkey, NULL, addon->dir_config_key, RRF_RT_ANY, &type, (PBYTE)package_dir, &size); } RegCloseKey(hkey); - if(res != ERROR_SUCCESS || (type != REG_SZ && type != REG_EXPAND_SZ)) { + if(res == ERROR_FILE_NOT_FOUND) { heap_free(package_dir); - return FALSE; + return INSTALL_NEXT; + } else if(res != ERROR_SUCCESS || (type != REG_SZ && type != REG_EXPAND_SZ)) { + heap_free(package_dir); + return INSTALL_FAILED; } TRACE("Trying %s/%s\n", debugstr_a(package_dir), debugstr_a(addon->file_name)); @@ -296,7 +305,7 @@ static BOOL install_from_registered_dir(void) return ret; } -static BOOL install_from_default_dir(void) +static enum install_res install_from_default_dir(void) { const char *data_dir, *package_dir; char *dir_buf = NULL; @@ -312,15 +321,15 @@ static BOOL install_from_default_dir(void) strcpy(dir_buf+len, "/../"); package_dir = dir_buf; }else { - return FALSE; + return INSTALL_NEXT; } ret = install_from_unix_file(package_dir, addon->subdir_name, addon->file_name); heap_free(dir_buf); - if (!ret) + if (ret == INSTALL_NEXT) ret = install_from_unix_file(INSTALL_DATADIR "/wine/", addon->subdir_name, addon->file_name); - if (!ret && strcmp(INSTALL_DATADIR, "/usr/share")) + if (ret == INSTALL_NEXT && strcmp(INSTALL_DATADIR, "/usr/share")) ret = install_from_unix_file("/usr/share/wine/", addon->subdir_name, addon->file_name); return ret; } @@ -588,9 +597,9 @@ BOOL install_addon(addon_t addon_type) * - /usr/share/wine/$addon_subdir/ * - download from URL stored in $url_config_key value of HKCU/Wine/Software/$config_key key */ - if(!install_from_registered_dir() - && !install_from_default_dir() - && (url = get_url())) + if (install_from_registered_dir() == INSTALL_NEXT + && install_from_default_dir() == INSTALL_NEXT + && (url = get_url())) DialogBoxW(hInst, addon->dialog_template, 0, installer_proc); heap_free(url);

1 0

Henri Verbeet : winex11: Properly calculate the virtual screen rect in xinerama_init().
by Alexandre Julliard July 16, 2012

July 16, 2012

Module: wine Branch: master Commit: ed331cb0a5f3bee1b2075b877d3c2a19a668f9fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed331cb0a5f3bee1b2075b877… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 15 15:44:59 2012 +0200 winex11: Properly calculate the virtual screen rect in xinerama_init(). --- dlls/winex11.drv/xinerama.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index b2014ed..84db8ba 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -177,6 +177,7 @@ void xinerama_init( unsigned int width, unsigned int height ) } primary = get_primary(); + SetRectEmpty( &virtual_screen_rect ); /* coordinates (0,0) have to point to the primary monitor origin */ OffsetRect( &rect, -primary->rcMonitor.left, -primary->rcMonitor.top ); @@ -184,17 +185,17 @@ void xinerama_init( unsigned int width, unsigned int height ) { OffsetRect( &monitors[i].rcMonitor, rect.left, rect.top ); OffsetRect( &monitors[i].rcWork, rect.left, rect.top ); + UnionRect( &virtual_screen_rect, &virtual_screen_rect, &monitors[i].rcMonitor ); TRACE( "monitor %p: %s work %s%s\n", index_to_monitor(i), wine_dbgstr_rect(&monitors[i].rcMonitor), wine_dbgstr_rect(&monitors[i].rcWork), (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); } - virtual_screen_rect = rect; screen_width = primary->rcMonitor.right - primary->rcMonitor.left; screen_height = primary->rcMonitor.bottom - primary->rcMonitor.top; TRACE( "virtual size: %s primary size: %dx%d\n", - wine_dbgstr_rect(&rect), screen_width, screen_height ); + wine_dbgstr_rect(&virtual_screen_rect), screen_width, screen_height ); wine_tsx11_unlock(); }

1 0

André Hentschel : ntdll: Add support for relay debugging on ARM.
by Alexandre Julliard July 16, 2012

July 16, 2012

Module: wine Branch: master Commit: 1ceec8c78982d7ef5124e86a8da53166473e1f4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ceec8c78982d7ef5124e86a8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jul 15 16:45:01 2012 +0200 ntdll: Add support for relay debugging on ARM. --- dlls/ntdll/relay.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 3588f1c..b3c4aea 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(relay); -#if defined(__i386__) || defined(__x86_64__) +#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) WINE_DECLARE_DEBUG_CHANNEL(timestamp); @@ -355,6 +355,37 @@ __ASM_GLOBAL_FUNC( call_entry_point, __ASM_CFI(".cfi_def_cfa %esp,4\n\t") __ASM_CFI(".cfi_same_value %ebp\n\t") "ret" ) +#elif defined(__arm__) +__ASM_GLOBAL_FUNC( call_entry_point, + "push {r4, r5, LR}\n\t" + "mov r4, r0\n\t" + "mov r5, SP\n\t" + "lsl r3, r1, #2\n\t" + "cmp r3, #0\n\t" + "beq 5f\n\t" + "sub SP, SP, r3\n\t" + "bic SP, SP, #15\n\t" + "1:\tsub r3, r3, #4\n\t" + "ldr r0, [r2, r3]\n\t" + "str r0, [SP, r3]\n\t" + "cmp r3, #0\n\t" + "bgt 1b\n\t" + "cmp r1, #1\n\t" + "bgt 2f\n\t" + "pop {r0}\n\t" + "b 5f\n\t" + "2:\tcmp r1, #2\n\t" + "bgt 3f\n\t" + "pop {r0-r1}\n\t" + "b 5f\n\t" + "3:\tcmp r1, #3\n\t" + "bgt 4f\n\t" + "pop {r0-r2}\n\t" + "b 5f\n\t" + "4:\tpop {r0-r3}\n\t" + "5:\tblx r4\n\t" + "mov SP, r5\n\t" + "pop {r4, r5, PC}" ) #else __ASM_GLOBAL_FUNC( call_entry_point, "pushq %rbp\n\t"

1 0

Henri Verbeet : wined3d: Get rid of the unused sampler_stages limit.
by Alexandre Julliard July 16, 2012

July 16, 2012

Module: wine Branch: master Commit: adf66a338f3cd777ce51dee4e436e88471b7991b URL: http://source.winehq.org/git/wine.git/?a=commit;h=adf66a338f3cd777ce51dee4e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 15 15:44:58 2012 +0200 wined3d: Get rid of the unused sampler_stages limit. --- dlls/wined3d/directx.c | 6 ------ dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b0c2d38..542d857 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2405,7 +2405,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) gl_info->limits.fragment_samplers = 1; gl_info->limits.vertex_samplers = 0; gl_info->limits.combined_samplers = gl_info->limits.fragment_samplers + gl_info->limits.vertex_samplers; - gl_info->limits.sampler_stages = 1; gl_info->limits.vertex_attribs = 16; gl_info->limits.glsl_vs_float_constants = 0; gl_info->limits.glsl_ps_float_constants = 0; @@ -2761,11 +2760,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) gl_info->limits.texture_stages = fragment_caps.MaxTextureBlendStages; TRACE("Max texture stages: %u.\n", gl_info->limits.texture_stages); - /* In some cases the number of texture stages can be larger than the number - * of samplers. The GF4 for example can use only 2 samplers (no fragment - * shaders), but 8 texture stages (register combiners). */ - gl_info->limits.sampler_stages = max(gl_info->limits.fragment_samplers, gl_info->limits.texture_stages); - if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT]) { gl_info->fbo_ops.glIsRenderbuffer = gl_info->glIsRenderbuffer; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a5b2c55..17d371f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1479,7 +1479,6 @@ struct wined3d_gl_limits UINT vertex_samplers; UINT combined_samplers; UINT general_combiners; - UINT sampler_stages; UINT clipplanes; UINT texture_size; UINT texture3d_size;

1 0

André Hentschel : winebuild: Generate relay debugging thunks for ARM.
by Alexandre Julliard July 16, 2012

July 16, 2012

Module: wine Branch: master Commit: 83b60a7b0d592850c4d6b5cf3a43e71dd5cbdba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83b60a7b0d592850c4d6b5cf3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jul 15 16:41:56 2012 +0200 winebuild: Generate relay debugging thunks for ARM. --- tools/winebuild/spec32.c | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 3dff304..7892f22 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -83,7 +83,7 @@ int has_relays( DLLSPEC *spec ) { int i; - if (target_cpu != CPU_x86 && target_cpu != CPU_x86_64) return 0; + if (target_cpu != CPU_x86 && target_cpu != CPU_x86_64 && target_cpu != CPU_ARM) return 0; for (i = spec->base; i <= spec->limit; i++) { @@ -210,6 +210,34 @@ static void output_relay_debug( DLLSPEC *spec ) } break; + case CPU_ARM: + switch (args) + { + default: output( "\tpush {r0-r3}\n" ); break; + case 3: output( "\tpush {r0-r2}\n" ); break; + case 2: output( "\tpush {r0-r1}\n" ); break; + case 1: output( "\tpush {r0}\n" ); break; + case 0: break; + } + output( "\tpush {LR}\n" ); + output( "\tmov r2, SP\n"); + if (odp->flags & FLAG_RET64) flags |= 1; + output( "\tmov r1, #%u\n", (flags << 24) ); + if (args) output( "\tadd r1, #%u\n", (args << 16) ); + if ((i - spec->base) & 0xf000) output( "\tadd r1, #%u\n", (i - spec->base) & 0xf000 ); + if ((i - spec->base) & 0x0f00) output( "\tadd r1, #%u\n", (i - spec->base) & 0x0f00 ); + if ((i - spec->base) & 0x00f0) output( "\tadd r1, #%u\n", (i - spec->base) & 0x00f0 ); + if ((i - spec->base) & 0x000f) output( "\tadd r1, #%u\n", (i - spec->base) & 0x000f ); + output( "\tldr r0, [PC, #0]\n"); + output( "\tmov PC, PC\n"); + output( "\t.long .L__wine_spec_relay_descr\n" ); + output( "\tldr r3, [r0, #4]\n"); + output( "\tblx r3\n"); + output( "\tpop {r3}\n" ); + if (args) output( "\tadd SP, SP, #%u\n", min(args*4, 16) ); + output( "\tbx r3\n"); + break; + case CPU_x86_64: output( "\tsubq $40,%%rsp\n" ); output_cfi( ".cfi_adjust_cfa_offset 40" );

1 0

Henri Verbeet : winex11: Add support for XRandR 1.3.
by Alexandre Julliard July 16, 2012

July 16, 2012

Module: wine Branch: master Commit: 2b4a7912ec00e1c69e98ccb1d2e810d8df572027 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b4a7912ec00e1c69e98ccb1d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 15 15:45:01 2012 +0200 winex11: Add support for XRandR 1.3. --- dlls/winex11.drv/xrandr.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index e2dbff3..de29423 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -53,8 +53,8 @@ MAKE_FUNCPTR(XRRFreeOutputInfo) MAKE_FUNCPTR(XRRFreeScreenResources) MAKE_FUNCPTR(XRRGetCrtcInfo) MAKE_FUNCPTR(XRRGetOutputInfo) -MAKE_FUNCPTR(XRRGetScreenResources) MAKE_FUNCPTR(XRRSetCrtcConfig) +static typeof(XRRGetScreenResources) *xrandr_get_screen_resources; static RRMode *xrandr12_modes; #endif @@ -96,7 +96,6 @@ static int load_xrandr(void) LOAD_FUNCPTR(XRRFreeScreenResources) LOAD_FUNCPTR(XRRGetCrtcInfo) LOAD_FUNCPTR(XRRGetOutputInfo) - LOAD_FUNCPTR(XRRGetScreenResources) LOAD_FUNCPTR(XRRSetCrtcConfig) r = 2; #endif @@ -273,7 +272,7 @@ static int xrandr12_get_current_mode(void) int i, ret = -1; wine_tsx11_lock(); - if (!(resources = pXRRGetScreenResources( gdi_display, root_window ))) + if (!(resources = xrandr_get_screen_resources( gdi_display, root_window ))) { wine_tsx11_unlock(); ERR("Failed to get screen resources.\n"); @@ -322,7 +321,7 @@ static LONG xrandr12_set_current_mode( int mode ) mode = mode % xrandr_mode_count; wine_tsx11_lock(); - if (!(resources = pXRRGetScreenResources( gdi_display, root_window ))) + if (!(resources = xrandr_get_screen_resources( gdi_display, root_window ))) { wine_tsx11_unlock(); ERR("Failed to get screen resources.\n"); @@ -364,7 +363,7 @@ static void xrandr12_init_modes(void) XRRCrtcInfo *crtc_info; int i, j; - if (!(resources = pXRRGetScreenResources( gdi_display, root_window ))) + if (!(resources = xrandr_get_screen_resources( gdi_display, root_window ))) { ERR("Failed to get screen resources.\n"); return; @@ -459,6 +458,14 @@ void X11DRV_XRandR_Init(void) #ifdef HAVE_XRRGETSCREENRESOURCES if (ret >= 2 && (major > 1 || (major == 1 && minor >= 2))) + { + if (major > 1 || (major == 1 && minor >= 3)) + xrandr_get_screen_resources = wine_dlsym( xrandr_handle, "XRRGetScreenResourcesCurrent", NULL, 0 ); + if (!xrandr_get_screen_resources) + xrandr_get_screen_resources = wine_dlsym( xrandr_handle, "XRRGetScreenResources", NULL, 0 ); + } + + if (xrandr_get_screen_resources) xrandr12_init_modes(); else #endif

1 0

Alexandre Julliard : gdiplus: Avoid out of bounds access warning.
by Alexandre Julliard July 16, 2012

July 16, 2012

Module: wine Branch: master Commit: 9ff2bbc3c8bdcb2113af9012b2ba0b7521c79ea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ff2bbc3c8bdcb2113af9012b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 16 14:28:31 2012 +0200 gdiplus: Avoid out of bounds access warning. --- dlls/gdiplus/tests/image.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 750b084..1f5ace1 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3317,6 +3317,7 @@ static void test_tiff_palette(void) ColorPalette pal; ARGB entry[256]; } palette; + ARGB *entries = palette.pal.Entries; /* 1bpp TIFF without palette */ image = load_image((const BYTE *)&TIFF_data, sizeof(TIFF_data)); @@ -3346,8 +3347,8 @@ todo_wine expect(2, palette.pal.Count); if (palette.pal.Count == 2) { - ok(palette.pal.Entries[0] == 0xff000000, "expected 0xff000000, got %#x\n", palette.pal.Entries[0]); - ok(palette.pal.Entries[1] == 0xffffffff, "expected 0xffffffff, got %#x\n", palette.pal.Entries[1]); + ok(entries[0] == 0xff000000, "expected 0xff000000, got %#x\n", entries[0]); + ok(entries[1] == 0xffffffff, "expected 0xffffffff, got %#x\n", entries[1]); } GdipDisposeImage(image);

1 0

Nikolay Sivov : ole32: No need to test for null implementation pointer in methods.
by Alexandre Julliard July 16, 2012

July 16, 2012

Module: wine Branch: master Commit: a3a97558de148116f5bfea66c142e8ff4b9f5990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3a97558de148116f5bfea66c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 14 21:13:40 2012 +0400 ole32: No need to test for null implementation pointer in methods. --- dlls/ole32/storage32.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index df84108..c04675d 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -365,7 +365,7 @@ static HRESULT WINAPI StorageBaseImpl_QueryInterface( { StorageBaseImpl *This = impl_from_IStorage(iface); - if ( (This==0) || (ppvObject==0) ) + if (!ppvObject) return E_INVALIDARG; *ppvObject = 0; @@ -379,8 +379,7 @@ static HRESULT WINAPI StorageBaseImpl_QueryInterface( { *ppvObject = &This->IPropertySetStorage_iface; } - - if ((*ppvObject)==0) + else return E_NOINTERFACE; IStorage_AddRef(iface); @@ -578,7 +577,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStorage( iface, debugstr_w(pwcsName), pstgPriority, grfMode, snbExclude, reserved, ppstg); - if ( (This==0) || (pwcsName==NULL) || (ppstg==0) ) + if ((pwcsName==NULL) || (ppstg==0) ) { res = E_INVALIDARG; goto end; @@ -709,7 +708,7 @@ static HRESULT WINAPI StorageBaseImpl_EnumElements( TRACE("(%p, %d, %p, %d, %p)\n", iface, reserved1, reserved2, reserved3, ppenum); - if ( (This==0) || (ppenum==0)) + if (!ppenum) return E_INVALIDARG; if (This->reverted) @@ -719,7 +718,7 @@ static HRESULT WINAPI StorageBaseImpl_EnumElements( This, This->storageDirEntry); - if (newEnum!=0) + if (newEnum) { *ppenum = &newEnum->IEnumSTATSTG_iface; @@ -750,7 +749,7 @@ static HRESULT WINAPI StorageBaseImpl_Stat( TRACE("(%p, %p, %x)\n", iface, pstatstg, grfStatFlag); - if ( (This==0) || (pstatstg==0)) + if (!pstatstg) { res = E_INVALIDARG; goto end; @@ -2076,7 +2075,7 @@ static HRESULT deleteStorageContents( /* * Open the storage and enumerate it */ - hr = StorageBaseImpl_OpenStorage( + hr = IStorage_OpenStorage( &parentStorage->IStorage_iface, entryDataToDelete.name, 0, @@ -2209,11 +2208,11 @@ static HRESULT removeFromTree( DirRef parentStorageIndex, DirRef deletedIndex) { - HRESULT hr = S_OK; DirEntry entryToDelete; DirEntry parentEntry; DirRef parentEntryRef; ULONG typeOfRelation; + HRESULT hr; hr = StorageBaseImpl_ReadDirEntry(This, deletedIndex, &entryToDelete);

1 0

Henri Verbeet : winex11: Add support for XRandR 1.2.
by Alexandre Julliard July 16, 2012

July 16, 2012

Module: wine Branch: master Commit: cf6f8d2eb50aa28829ee2b76c61aab411f8730ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf6f8d2eb50aa28829ee2b76c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 15 15:45:00 2012 +0200 winex11: Add support for XRandR 1.2. --- configure | 16 +++ configure.ac | 7 +- dlls/winex11.drv/xrandr.c | 237 +++++++++++++++++++++++++++++++++++++++++---- include/config.h.in | 3 + 4 files changed, 244 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf6f8d2eb50aa28829ee2…

1 0

Henri Verbeet : ddraw: Create surfaces with the correct mip level in device_parent_create_texture_surface ().
by Alexandre Julliard July 16, 2012

July 16, 2012

Module: wine Branch: master Commit: 89a781adc984ce43a26b1d61f666f59d73599dfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=89a781adc984ce43a26b1d61f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 15 15:44:57 2012 +0200 ddraw: Create surfaces with the correct mip level in device_parent_create_texture_surface(). --- dlls/ddraw/ddraw.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 2a44d1f..1963de2 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5348,7 +5348,7 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ } /* FIXME: Validate that format, usage, pool, etc. really make sense. */ - if (FAILED(hr = ddraw_create_surface(ddraw, &desc, &ddraw_surface, 0, tex_root->version))) + if (FAILED(hr = ddraw_create_surface(ddraw, &desc, &ddraw_surface, level, tex_root->version))) return hr; done:

1 0