September 2013 - Wine-commits

Henri Verbeet : wined3d: Pass a resource to wined3d_resource_allocate_sysmem().
by Alexandre Julliard 16 Sep '13

16 Sep '13

Module: wine Branch: master Commit: 261246ef21d285727fc2da69fb223b649d56d142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=261246ef21d285727fc2da69f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 16 10:57:24 2013 +0200 wined3d: Pass a resource to wined3d_resource_allocate_sysmem(). --- dlls/wined3d/buffer.c | 3 ++- dlls/wined3d/resource.c | 17 +++++++++-------- dlls/wined3d/surface.c | 11 +++++------ dlls/wined3d/volume.c | 6 ++++-- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 21 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 2deb7d2..b61c3ce 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -500,7 +500,8 @@ BYTE *buffer_get_sysmem(struct wined3d_buffer *This, struct wined3d_context *con /* AllocatedMemory exists if the buffer is double buffered or has no buffer object at all */ if(This->resource.allocatedMemory) return This->resource.allocatedMemory; - This->resource.heap_memory = wined3d_resource_allocate_sysmem(This->resource.size); + if (!wined3d_resource_allocate_sysmem(&This->resource)) + ERR("Failed to allocate system memory.\n"); This->resource.allocatedMemory = This->resource.heap_memory; if (This->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index a677d00..78f35e9 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -120,11 +120,10 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * if (size) { - resource->heap_memory = wined3d_resource_allocate_sysmem(size); - if (!resource->heap_memory) + if (!wined3d_resource_allocate_sysmem(resource)) { - ERR("Out of memory!\n"); - return WINED3DERR_OUTOFVIDEOMEMORY; + ERR("Failed to allocate system memory.\n"); + return E_OUTOFMEMORY; } } else @@ -344,19 +343,21 @@ void CDECL wined3d_resource_get_desc(const struct wined3d_resource *resource, st desc->size = resource->size; } -void *wined3d_resource_allocate_sysmem(SIZE_T size) +BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) { void **p; SIZE_T align = RESOURCE_ALIGNMENT - 1 + sizeof(*p); void *mem; - if (!(mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size + align))) - return NULL; + if (!(mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, resource->size + align))) + return FALSE; p = (void **)(((ULONG_PTR)mem + align) & ~(RESOURCE_ALIGNMENT - 1)) - 1; *p = mem; - return ++p; + resource->heap_memory = ++p; + + return TRUE; } void wined3d_resource_free_sysmem(void *mem) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b64c8e9..e40a65a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -587,9 +587,8 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) { /* Whatever surface we have, make sure that there is memory allocated * for the downloaded copy, or a PBO to map. */ - if (!surface->resource.heap_memory) - surface->resource.heap_memory = wined3d_resource_allocate_sysmem(surface->resource.size); - + if (!surface->resource.heap_memory && !wined3d_resource_allocate_sysmem(&surface->resource)) + ERR("Failed to allocate system memory.\n"); surface->resource.allocatedMemory = surface->resource.heap_memory; if (surface->flags & SFLAG_INSYSMEM) @@ -1432,7 +1431,7 @@ static void surface_remove_pbo(struct wined3d_surface *surface, const struct win else { if (!surface->resource.heap_memory) - surface->resource.heap_memory = wined3d_resource_allocate_sysmem(surface->resource.size); + wined3d_resource_allocate_sysmem(&surface->resource); else if (!(surface->flags & SFLAG_CLIENT)) ERR("Surface %p has heap_memory %p and flags %#x.\n", surface, surface->resource.heap_memory, surface->flags); @@ -1458,9 +1457,9 @@ static BOOL surface_init_sysmem(struct wined3d_surface *surface) { if (!surface->resource.heap_memory) { - if (!(surface->resource.heap_memory = wined3d_resource_allocate_sysmem(surface->resource.size))) + if (!wined3d_resource_allocate_sysmem(&surface->resource)) { - ERR("Failed to allocate memory.\n"); + ERR("Failed to allocate system memory.\n"); return FALSE; } } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 7f2dbf9..62c6ab9 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -391,9 +391,11 @@ static BOOL volume_prepare_system_memory(struct wined3d_volume *volume) if (volume->resource.allocatedMemory) return TRUE; - volume->resource.heap_memory = wined3d_resource_allocate_sysmem(volume->resource.size); - if (!volume->resource.heap_memory) + if (!wined3d_resource_allocate_sysmem(&volume->resource)) + { + ERR("Failed to allocate system memory.\n"); return FALSE; + } volume->resource.allocatedMemory = volume->resource.heap_memory; return TRUE; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a30db57..cbf6e78 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1984,7 +1984,6 @@ struct wined3d_resource_ops void (*resource_unload)(struct wined3d_resource *resource); }; -void *wined3d_resource_allocate_sysmem(SIZE_T size) DECLSPEC_HIDDEN; void wined3d_resource_free_sysmem(void *mem) DECLSPEC_HIDDEN; struct wined3d_resource @@ -2025,6 +2024,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * const struct wined3d_resource_ops *resource_ops) DECLSPEC_HIDDEN; DWORD resource_set_priority(struct wined3d_resource *resource, DWORD priority) DECLSPEC_HIDDEN; void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN; +BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; DWORD wined3d_resource_sanitize_map_flags(const struct wined3d_resource *resource, DWORD flags) DECLSPEC_HIDDEN; GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Pass a resource to wined3d_resource_free_sysmem().
by Alexandre Julliard 16 Sep '13

16 Sep '13

Module: wine Branch: master Commit: d1e44ff77595a0d60c409b22fdaf76771b1e6841 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e44ff77595a0d60c409b22f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 16 10:57:25 2013 +0200 wined3d: Pass a resource to wined3d_resource_free_sysmem(). --- dlls/wined3d/buffer.c | 3 +-- dlls/wined3d/resource.c | 12 ++++++------ dlls/wined3d/surface.c | 34 +++++++++------------------------- dlls/wined3d/volume.c | 6 ++---- dlls/wined3d/wined3d_private.h | 3 +-- 5 files changed, 19 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b61c3ce..de06ae8 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -198,9 +198,8 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, struct wine } else { - wined3d_resource_free_sysmem(This->resource.heap_memory); + wined3d_resource_free_sysmem(&This->resource); This->resource.allocatedMemory = NULL; - This->resource.heap_memory = NULL; } return; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 78f35e9..a24db3c 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -138,7 +138,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * if (size > wined3d_device_get_available_texture_mem(device)) { ERR("Out of adapter memory\n"); - wined3d_resource_free_sysmem(resource->heap_memory); + wined3d_resource_free_sysmem(resource); return WINED3DERR_OUTOFVIDEOMEMORY; } adapter_adjust_memory(device->adapter, size); @@ -172,9 +172,8 @@ void resource_cleanup(struct wined3d_resource *resource) ERR("Failed to free private data when destroying resource %p, hr = %#x.\n", resource, hr); } - wined3d_resource_free_sysmem(resource->heap_memory); + wined3d_resource_free_sysmem(resource); resource->allocatedMemory = NULL; - resource->heap_memory = NULL; device_resource_released(resource->device, resource); } @@ -360,14 +359,15 @@ BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) return TRUE; } -void wined3d_resource_free_sysmem(void *mem) +void wined3d_resource_free_sysmem(struct wined3d_resource *resource) { - void **p = mem; + void **p = resource->heap_memory; - if (!mem) + if (!p) return; HeapFree(GetProcessHeap(), 0, *(--p)); + resource->heap_memory = NULL; } DWORD wined3d_resource_sanitize_map_flags(const struct wined3d_resource *resource, DWORD flags) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e40a65a..a48d0bf 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -566,10 +566,7 @@ static void surface_load_pbo(struct wined3d_surface *surface, const struct wined /* We don't need the system memory anymore and we can't even use it for PBOs. */ if (!(surface->flags & SFLAG_CLIENT)) - { - wined3d_resource_free_sysmem(surface->resource.heap_memory); - surface->resource.heap_memory = NULL; - } + wined3d_resource_free_sysmem(&surface->resource); surface->resource.allocatedMemory = NULL; surface->flags |= SFLAG_PBO; context_release(context); @@ -601,9 +598,8 @@ static void surface_evict_sysmem(struct wined3d_surface *surface) if (surface->resource.map_count || (surface->flags & SFLAG_DONOTFREE)) return; - wined3d_resource_free_sysmem(surface->resource.heap_memory); + wined3d_resource_free_sysmem(&surface->resource); surface->resource.allocatedMemory = NULL; - surface->resource.heap_memory = NULL; surface_invalidate_location(surface, SFLAG_INSYSMEM); } @@ -1611,8 +1607,7 @@ static HRESULT gdi_surface_private_setup(struct wined3d_surface *surface) hr = surface_create_dib_section(surface); if (SUCCEEDED(hr)) { - wined3d_resource_free_sysmem(surface->resource.heap_memory); - surface->resource.heap_memory = NULL; + wined3d_resource_free_sysmem(&surface->resource); surface->resource.allocatedMemory = surface->dib.bitmap_data; } @@ -1671,8 +1666,7 @@ static void gdi_surface_map(struct wined3d_surface *surface, const RECT *rect, D ERR("Failed to create dib section, hr %#x.\n", hr); return; } - wined3d_resource_free_sysmem(surface->resource.heap_memory); - surface->resource.heap_memory = NULL; + wined3d_resource_free_sysmem(&surface->resource); surface->resource.allocatedMemory = surface->dib.bitmap_data; } } @@ -2867,8 +2861,6 @@ HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem if (mem && mem != surface->resource.allocatedMemory) { - void *release = NULL; - /* Do I have to copy the old surface content? */ if (surface->flags & SFLAG_DIBSECTION) { @@ -2881,8 +2873,7 @@ HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem } else if (!(surface->flags & SFLAG_USERPTR)) { - release = surface->resource.heap_memory; - surface->resource.heap_memory = NULL; + wined3d_resource_free_sysmem(&surface->resource); } surface->resource.allocatedMemory = mem; surface->flags |= SFLAG_USERPTR; @@ -2894,9 +2885,6 @@ HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem /* For client textures OpenGL has to be notified. */ if (surface->flags & SFLAG_CLIENT) surface_release_client_storage(surface); - - /* Now free the old memory if any. */ - wined3d_resource_free_sysmem(release); } else if (surface->flags & SFLAG_USERPTR) { @@ -3086,8 +3074,7 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, surface->flags &= ~(SFLAG_LOCATIONS | SFLAG_USERPTR); surface->resource.allocatedMemory = NULL; - wined3d_resource_free_sysmem(surface->resource.heap_memory); - surface->resource.heap_memory = NULL; + wined3d_resource_free_sysmem(&surface->resource); surface->resource.width = width; surface->resource.height = height; @@ -3583,8 +3570,7 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) /* Use the DIB section from now on if we are not using a PBO. */ if (!(surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM))) { - wined3d_resource_free_sysmem(surface->resource.heap_memory); - surface->resource.heap_memory = NULL; + wined3d_resource_free_sysmem(&surface->resource); surface->resource.allocatedMemory = surface->dib.bitmap_data; } } @@ -5004,9 +4990,8 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE if (!dst_surface->resource.map_count && !(dst_surface->flags & SFLAG_DONOTFREE)) { - wined3d_resource_free_sysmem(dst_surface->resource.heap_memory); + wined3d_resource_free_sysmem(&dst_surface->resource); dst_surface->resource.allocatedMemory = NULL; - dst_surface->resource.heap_memory = NULL; } else { @@ -6933,8 +6918,7 @@ static HRESULT surface_init(struct wined3d_surface *surface, UINT alignment, UIN if ((usage & WINED3DUSAGE_OWNDC) && !surface->hDC && SUCCEEDED(surface_create_dib_section(surface))) { - wined3d_resource_free_sysmem(surface->resource.heap_memory); - surface->resource.heap_memory = NULL; + wined3d_resource_free_sysmem(&surface->resource); surface->resource.allocatedMemory = surface->dib.bitmap_data; } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 62c6ab9..4865c59 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -142,8 +142,7 @@ static void wined3d_volume_download_data(struct wined3d_volume *volume, static void wined3d_volume_evict_sysmem(struct wined3d_volume *volume) { - wined3d_resource_free_sysmem(volume->resource.heap_memory); - volume->resource.heap_memory = NULL; + wined3d_resource_free_sysmem(&volume->resource); volume->resource.allocatedMemory = NULL; wined3d_volume_invalidate_location(volume, WINED3D_LOCATION_SYSMEM); } @@ -702,8 +701,7 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device if (pool == WINED3D_POOL_DEFAULT && usage & WINED3DUSAGE_DYNAMIC && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT]) { - wined3d_resource_free_sysmem(volume->resource.heap_memory); - volume->resource.heap_memory = NULL; + wined3d_resource_free_sysmem(&volume->resource); volume->resource.allocatedMemory = NULL; volume->flags |= WINED3D_VFLAG_PBO; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cbf6e78..07e8c9b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1984,8 +1984,6 @@ struct wined3d_resource_ops void (*resource_unload)(struct wined3d_resource *resource); }; -void wined3d_resource_free_sysmem(void *mem) DECLSPEC_HIDDEN; - struct wined3d_resource { LONG ref; @@ -2025,6 +2023,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * DWORD resource_set_priority(struct wined3d_resource *resource, DWORD priority) DECLSPEC_HIDDEN; void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN; BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; +void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; DWORD wined3d_resource_sanitize_map_flags(const struct wined3d_resource *resource, DWORD flags) DECLSPEC_HIDDEN; GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : Wine release 1.7.2
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: website Branch: master Commit: e3343e35cc99f65457f7e2f12c9148b7e76e0c3b URL: http://source.winehq.org/git/website.git/?a=commit;h=e3343e35cc99f65457f7e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 13 20:19:33 2013 +0200 Wine release 1.7.2 --- news/en/2013091301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2013091301.xml b/news/en/2013091301.xml new file mode 100644 index 0000000..2c33738 --- /dev/null +++ b/news/en/2013091301.xml @@ -0,0 +1,17 @@ +<news> +<date>September 13, 2013</date> +<title>Wine 1.7.2 Released</title> +<body> + The Wine development release 1.7.2 is now available. + <a href="{$root}/announce/1.7.2">What's new</a> in this release: +<ul> + <li>Right-to-left text layout improvements.</li> + <li>NTLM and Negotiate authentication for RPC over HTTP.</li> + <li>More glyphs in the built-in Wingdings font.</li> + <li>Better system tray support in the Mac driver.</li> + <li>Activation context improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.2.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.7.2.
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: wine Branch: master Commit: 24fa9a2cdeabd5f28371b15e9a6aace48c07b984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24fa9a2cdeabd5f28371b15e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 13 20:11:57 2013 +0200 Release 1.7.2. --- ANNOUNCE | 890 +++++++++++++++++++++++++++---------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 401 insertions(+), 511 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24fa9a2cdeabd5f28371b…

1 0

Tag wine-1.7.2 : Alexandre Julliard : Release 1.7.2
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: wine Branch: refs/tags/wine-1.7.2 Tag: 27fb1363c3b464de8c1766de874ddbeeec7598c4 URL: http://source.winehq.org/git/wine.git/?a=tag;h=27fb1363c3b464de8c1766de874d… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 13 20:11:57 2013 +0200 Release 1.7.2

1 0

Henri Verbeet : d3d9: Avoid LPVOID.
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: wine Branch: master Commit: 674b1e922d4d3050850a6e76e6a28ad24dbb8b8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=674b1e922d4d3050850a6e76e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 13 10:18:13 2013 +0200 d3d9: Avoid LPVOID. --- dlls/d3d9/d3d9_main.c | 8 +++----- dlls/d3d9/tests/d3d9ex.c | 6 ++++-- dlls/d3d9/tests/visual.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index 2059b98..d8c5e23 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -93,12 +93,10 @@ void* WINAPI Direct3DShaderValidatorCreate9(void) /******************************************************************* * DllMain */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { - /* At process attach */ - TRACE("fdwReason=%d\n", fdwReason); - if (fdwReason == DLL_PROCESS_ATTACH) - DisableThreadLibraryCalls(hInstDLL); + if (reason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls(inst); return TRUE; } diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 470e8a4..f4f3327 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -30,8 +30,10 @@ static HMODULE d3d9_handle = 0; -static BOOL (WINAPI *pEnumDisplaySettingsExA)(LPCSTR, DWORD, DEVMODEA *, DWORD); -static LONG (WINAPI *pChangeDisplaySettingsExA)(LPCSTR, LPDEVMODE, HWND, DWORD, LPVOID); +static BOOL (WINAPI *pEnumDisplaySettingsExA)(const char *device_name, + DWORD mode_idx, DEVMODEA *mode, DWORD flags); +static LONG (WINAPI *pChangeDisplaySettingsExA)(const char *device_name, + DEVMODEA *mode, HWND window, DWORD flags, void *param); static IDirect3D9 * (WINAPI *pDirect3DCreate9)(UINT SDKVersion); static HRESULT (WINAPI *pDirect3DCreate9Ex)(UINT SDKVersion, IDirect3D9Ex **d3d9ex); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f047cd7..471c0d6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -7268,7 +7268,7 @@ static void shademode_test(IDirect3DDevice9 *device) DWORD color0_gouraud = 0, color1_gouraud = 0; DWORD shademode = D3DSHADE_FLAT; DWORD primtype = D3DPT_TRIANGLESTRIP; - LPVOID data = NULL; + void *data = NULL; UINT i, j; struct vertex quad_strip[] = {

1 0

Francois Gouget : sane.ds: SANE_SaneSetDefaults() is only used if SONAME_LIBSANE is defined.
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: wine Branch: master Commit: 0a177833efaff87def4542fdbfa57a6b20d094d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a177833efaff87def4542fdb… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 13 10:48:16 2013 +0200 sane.ds: SANE_SaneSetDefaults() is only used if SONAME_LIBSANE is defined. --- dlls/sane.ds/capability.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index ee7435d..7bb64b3 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -1221,6 +1221,7 @@ TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) return twCC; } +#ifdef SONAME_LIBSANE TW_UINT16 SANE_SaneSetDefaults (void) { TW_CAPABILITY cap; @@ -1248,3 +1249,4 @@ TW_UINT16 SANE_SaneSetDefaults (void) return TWCC_SUCCESS; } +#endif

1 0

Francois Gouget : msi: Make some dialog_xxx() functions static.
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: wine Branch: master Commit: 7c146b8aa0ffb29e4514521ef650f2eddd93800a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c146b8aa0ffb29e4514521ef… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 13 10:48:46 2013 +0200 msi: Make some dialog_xxx() functions static. --- dlls/msi/dialog.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 5a7cbe7..92374d4 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2989,7 +2989,7 @@ static void msi_dialog_update_directory_list( msi_dialog *dialog, msi_control *c FindClose( file ); } -UINT msi_dialog_directorylist_up( msi_dialog *dialog ) +static UINT msi_dialog_directorylist_up( msi_dialog *dialog ) { msi_control *control; LPWSTR prop, path, ptr; @@ -3492,7 +3492,7 @@ static UINT msi_dialog_fill_controls( msi_dialog *dialog ) return r; } -UINT msi_dialog_reset( msi_dialog *dialog ) +static UINT msi_dialog_reset( msi_dialog *dialog ) { /* FIXME: should restore the original values of any properties we changed */ return msi_dialog_evaluate_control_conditions( dialog ); @@ -3926,7 +3926,7 @@ static msi_dialog *dialog_create( MSIPACKAGE *package, const WCHAR *name, msi_di return dialog; } -void msi_dialog_end_dialog( msi_dialog *dialog ) +static void msi_dialog_end_dialog( msi_dialog *dialog ) { TRACE("%p\n", dialog); dialog->finished = 1;

1 0

Aric Stewart : user32: Use Uniscribe ScriptBreak and the resulting Unicode Line Break algorithm to break lines for DT_WORDBREAK .
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: wine Branch: master Commit: 4247e80a797944cee3e58ceba6b2757094f10632 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4247e80a797944cee3e58ceba… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Sep 12 10:45:51 2013 -0500 user32: Use Uniscribe ScriptBreak and the resulting Unicode Line Break algorithm to break lines for DT_WORDBREAK. --- dlls/user32/text.c | 28 +++++++++++++++++++++++----- 1 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 338cba2..a32792e 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -38,6 +38,7 @@ #include "wine/unicode.h" #include "winnls.h" #include "controls.h" +#include "usp10.h" #include "user_private.h" #include "wine/debug.h" @@ -357,24 +358,40 @@ static void TEXT_WordBreak (HDC hdc, WCHAR *str, unsigned int max_str, { WCHAR *p; int word_fits; + SCRIPT_LOGATTR *sla; + SCRIPT_ANALYSIS sa; + int i; + assert (format & DT_WORDBREAK); assert (chars_fit < *len_str); + sla = HeapAlloc(GetProcessHeap(), 0, sizeof(SCRIPT_LOGATTR) * *len_str); + + memset(&sa, 0, sizeof(SCRIPT_ANALYSIS)); + sa.eScript = SCRIPT_UNDEFINED; + + ScriptBreak(str, *len_str, &sa, sla); + /* Work back from the last character that did fit to either a space or the * last character of a word, whichever is met first. */ p = str + chars_fit; /* The character that doesn't fit */ + i = chars_fit; word_fits = TRUE; if (!chars_fit) ; /* we pretend that it fits anyway */ - else if (*p == SPACE) /* chars_fit < *len_str so this is valid */ - p--; /* the word just fitted */ + else if (sla[i].fSoftBreak) /* chars_fit < *len_str so this is valid */ + { + /* the word just fitted */ + p--; + } else { - while (p > str && *(--p) != SPACE) - ; - word_fits = (p != str || *p == SPACE); + while (i > 0 && !sla[(--i)+1].fSoftBreak) p--; + p--; + word_fits = (i != 0 || sla[i+1].fSoftBreak ); } + /* If there was one or the first character didn't fit then */ if (word_fits) { @@ -427,6 +444,7 @@ static void TEXT_WordBreak (HDC hdc, WCHAR *str, unsigned int max_str, } /* Remeasure the string */ GetTextExtentExPointW (hdc, str, *len_str, 0, NULL, NULL, size); + HeapFree(GetProcessHeap(),0, sla); } /*********************************************************************

1 0

Dmitry Timoshkov : shlwapi: Merge two case statements.
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: wine Branch: master Commit: b07f431878e1050e691fb01efc271a71ebb58740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b07f431878e1050e691fb01ef… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 13 13:51:56 2013 +0900 shlwapi: Merge two case statements. --- dlls/shlwapi/istream.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/istream.c b/dlls/shlwapi/istream.c index e08c071..c7242d1 100644 --- a/dlls/shlwapi/istream.c +++ b/dlls/shlwapi/istream.c @@ -437,6 +437,7 @@ HRESULT WINAPI SHCreateStreamOnFileEx(LPCWSTR lpszPath, DWORD dwMode, switch (STGM_SHARE_MODE(dwMode)) { case 0: + case STGM_SHARE_DENY_NONE: dwShare = FILE_SHARE_READ|FILE_SHARE_WRITE; break; case STGM_SHARE_DENY_READ: @@ -448,9 +449,6 @@ HRESULT WINAPI SHCreateStreamOnFileEx(LPCWSTR lpszPath, DWORD dwMode, case STGM_SHARE_EXCLUSIVE: dwShare = 0; break; - case STGM_SHARE_DENY_NONE: - dwShare = FILE_SHARE_READ|FILE_SHARE_WRITE; - break; default: return E_INVALIDARG; }

1 0