wine-commits September 2013

wine-commits@winehq.org

2 participants
645 discussions

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

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

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

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

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

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

13 Sep '13

Module: wine Branch: master Commit: e55e24a73132ad20e1b0b56898fbc38fb2853e83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e55e24a73132ad20e1b0b5689… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 13 10:18:12 2013 +0200 d3d9: Avoid LPCWSTR. --- dlls/d3d9/d3d9_main.c | 15 +++++++++------ include/d3d9.h | 14 +++++++------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index ad2e330..2059b98 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -106,8 +106,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) /*********************************************************************** * D3DPERF_BeginEvent (D3D9.@) */ -int WINAPI D3DPERF_BeginEvent(D3DCOLOR color, LPCWSTR name) { - TRACE("(color %#x, name %s) : stub\n", color, debugstr_w(name)); +int WINAPI D3DPERF_BeginEvent(D3DCOLOR color, const WCHAR *name) +{ + TRACE("color 0x%08x, name %s.\n", color, debugstr_w(name)); return D3DPERF_event_level++; } @@ -151,13 +152,15 @@ BOOL WINAPI D3DPERF_QueryRepeatFrame(void) { /*********************************************************************** * D3DPERF_SetMarker (D3D9.@) */ -void WINAPI D3DPERF_SetMarker(D3DCOLOR color, LPCWSTR name) { - FIXME("(color %#x, name %s) : stub\n", color, debugstr_w(name)); +void WINAPI D3DPERF_SetMarker(D3DCOLOR color, const WCHAR *name) +{ + FIXME("color 0x%08x, name %s stub!\n", color, debugstr_w(name)); } /*********************************************************************** * D3DPERF_SetRegion (D3D9.@) */ -void WINAPI D3DPERF_SetRegion(D3DCOLOR color, LPCWSTR name) { - FIXME("(color %#x, name %s) : stub\n", color, debugstr_w(name)); +void WINAPI D3DPERF_SetRegion(D3DCOLOR color, const WCHAR *name) +{ + FIXME("color 0x%08x, name %s stub!\n", color, debugstr_w(name)); } diff --git a/include/d3d9.h b/include/d3d9.h index ce39c10..dc6518b 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -2087,13 +2087,13 @@ DECLARE_INTERFACE_(IDirect3DDevice9Ex,IDirect3DDevice9) extern "C" { #endif /* defined(__cplusplus) */ -int WINAPI D3DPERF_BeginEvent(D3DCOLOR,LPCWSTR); -int WINAPI D3DPERF_EndEvent(void); -DWORD WINAPI D3DPERF_GetStatus(void); -BOOL WINAPI D3DPERF_QueryRepeatFrame(void); -void WINAPI D3DPERF_SetMarker(D3DCOLOR,LPCWSTR); -void WINAPI D3DPERF_SetOptions(DWORD); -void WINAPI D3DPERF_SetRegion(D3DCOLOR,LPCWSTR); +int WINAPI D3DPERF_BeginEvent(D3DCOLOR color, const WCHAR *name); +int WINAPI D3DPERF_EndEvent(void); +DWORD WINAPI D3DPERF_GetStatus(void); +BOOL WINAPI D3DPERF_QueryRepeatFrame(void); +void WINAPI D3DPERF_SetMarker(D3DCOLOR color, const WCHAR *name); +void WINAPI D3DPERF_SetOptions(DWORD options); +void WINAPI D3DPERF_SetRegion(D3DCOLOR color, const WCHAR *name); /* Define the main entrypoint as well */ IDirect3D9* WINAPI Direct3DCreate9(UINT SDKVersion);

1 0

Henri Verbeet : wined3d: Never set the first render target to the front buffer in wined3d_device_init_3d ().
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: wine Branch: master Commit: fc85f4f7d6b051a0ba72ffe7791d120318ac6ccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc85f4f7d6b051a0ba72ffe77… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 13 10:18:11 2013 +0200 wined3d: Never set the first render target to the front buffer in wined3d_device_init_3d(). --- dlls/wined3d/device.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 561525b..627f0eb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -878,6 +878,7 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_swapchain *swapchain = NULL; struct wined3d_context *context; + DWORD clear_flags = 0; HRESULT hr; DWORD state; @@ -941,13 +942,9 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, { TRACE("Setting rendertarget to %p.\n", swapchain->back_buffers); device->fb.render_targets[0] = swapchain->back_buffers[0]; + wined3d_surface_incref(device->fb.render_targets[0]); + clear_flags |= WINED3DCLEAR_TARGET; } - else - { - TRACE("Setting rendertarget to %p.\n", swapchain->front_buffer); - device->fb.render_targets[0] = swapchain->front_buffer; - } - wined3d_surface_incref(device->fb.render_targets[0]); /* Depth Stencil support */ device->fb.depth_stencil = device->auto_depth_stencil; @@ -991,9 +988,10 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, context_release(context); /* Clear the screen */ - wined3d_device_clear(device, 0, NULL, WINED3DCLEAR_TARGET - | (swapchain_desc->enable_auto_depth_stencil ? WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL : 0), - &black, 1.0f, 0); + if (swapchain_desc->enable_auto_depth_stencil) + clear_flags |= WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL; + if (clear_flags) + wined3d_device_clear(device, 0, NULL, clear_flags, &black, 1.0f, 0); device->d3d_initialized = TRUE;

1 0

Henri Verbeet : wined3d: Just set the first render target to NULL in wined3d_device_reset().
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: wine Branch: master Commit: 3c023a5db5538a7622d4518e8ce24d36e1c459b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c023a5db5538a7622d4518e8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 13 10:18:10 2013 +0200 wined3d: Just set the first render target to NULL in wined3d_device_reset(). --- dlls/wined3d/device.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 046f5fd..561525b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4704,14 +4704,12 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (device->fb.render_targets) { - if (swapchain->back_buffers && swapchain->back_buffers[0]) - wined3d_device_set_render_target(device, 0, swapchain->back_buffers[0], FALSE); - else - wined3d_device_set_render_target(device, 0, swapchain->front_buffer, FALSE); - for (i = 1; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) { wined3d_device_set_render_target(device, i, NULL, FALSE); } + if (swapchain->back_buffers && swapchain->back_buffers[0]) + wined3d_device_set_render_target(device, 0, swapchain->back_buffers[0], FALSE); } wined3d_device_set_depth_stencil(device, NULL);

1 0

Henri Verbeet : wined3d: Just set the first render target to NULL in wined3d_device_uninit_3d().
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: wine Branch: master Commit: def0558b45aa5c071645fa29d004d70d372443ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=def0558b45aa5c071645fa29d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 13 10:18:09 2013 +0200 wined3d: Just set the first render target to NULL in wined3d_device_uninit_3d(). --- dlls/wined3d/device.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 656a3e9..046f5fd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1130,18 +1130,11 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) FIXME("Something's still holding the auto depth stencil buffer (%p).\n", surface); } - for (i = 1; i < gl_info->limits.buffers; ++i) + for (i = 0; i < gl_info->limits.buffers; ++i) { wined3d_device_set_render_target(device, i, NULL, FALSE); } - surface = device->fb.render_targets[0]; - TRACE("Setting rendertarget 0 to NULL\n"); - device->fb.render_targets[0] = NULL; - TRACE("Releasing the render target at %p\n", surface); - if (surface) - wined3d_surface_decref(surface); - context_release(context); for (i = 0; i < device->swapchain_count; ++i)

1 0

Dmitry Timoshkov : ntdll: NtReadFile should fail for overlapped IO on files if offset is negative.
by Alexandre Julliard 13 Sep '13

13 Sep '13

Module: wine Branch: master Commit: eb10471bac5510ab5a265069c472e9085e721191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb10471bac5510ab5a265069c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 13 15:45:53 2013 +0900 ntdll: NtReadFile should fail for overlapped IO on files if offset is negative. --- dlls/ntdll/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 2d07255..15e8829 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -606,7 +606,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, if (type == FD_TYPE_FILE) { - if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && !offset) + if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && (!offset || offset->QuadPart < 0)) { status = STATUS_INVALID_PARAMETER; goto done;

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
65
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 September 2013