wine-commits January 2017

wine-commits@winehq.org

2 participants
492 discussions

Nikolay Sivov : comctl32/tests: Call appropriate default procedure for parent window (Valgrind).
by Alexandre Julliard 10 Jan '17

10 Jan '17

Module: wine Branch: master Commit: dabad0e98fb79e4da9fbd063a3278255ecdb1242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dabad0e98fb79e4da9fbd063a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 10 10:03:13 2017 +0300 comctl32/tests: Call appropriate default procedure for parent window (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 5e69414..6d21b05 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -555,7 +555,10 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP } defwndproc_counter++; - ret = DefWindowProcA(hwnd, message, wParam, lParam); + if (IsWindowUnicode(hwnd)) + ret = DefWindowProcW(hwnd, message, wParam, lParam); + else + ret = DefWindowProcA(hwnd, message, wParam, lParam); defwndproc_counter--; return ret;

1 0

Andrey Gusev : Add missing style.
by Jeremy Newman 10 Jan '17

10 Jan '17

Module: appdb Branch: master Commit: b50f67c55d5dbeb2af740302f2a3f38b5223d81b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b50f67c55d5dbeb2af740302… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Jan 10 18:24:52 2017 +0200 Add missing style. Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- styles.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/styles.css b/styles.css index f8ec293..725a99a 100644 --- a/styles.css +++ b/styles.css @@ -792,5 +792,6 @@ table.historyTable { border: 1px; /* note/howto colors */ .note-howto { font-weight: bold; color: green; } .note-defaultnote { font-weight: bold; color: #0066CC; } /* mid-light blue */ +.note-warning { font-weight: bold; color: red; } -/* done */ \ No newline at end of file +/* done */

1 0

Andrey Gusev : Add new license.
by Jeremy Newman 10 Jan '17

10 Jan '17

Module: appdb Branch: master Commit: bd586887f6f0169577e004fb62b3ed05945ae1ba URL: http://source.winehq.org/git/appdb.git/?a=commit;h=bd586887f6f0169577e004fb… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jan 9 23:45:51 2017 +0200 Add new license. Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/version.php | 5 +++-- tables/appdb_tables.sql | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/version.php b/include/version.php index e918a9c..2e34d1a 100644 --- a/include/version.php +++ b/include/version.php @@ -20,6 +20,7 @@ define("LICENSE_DEMO", "Demo"); define("LICENSE_RETAIL", "Retail"); define('LICENSE_FREETOUSE', 'Free to use'); define('LICENSE_FREETOSHARE', 'Free to use and share'); +define('LICENSE_STEAM', 'Steam'); /** * Version class for handling versions. @@ -1370,7 +1371,7 @@ EOT; public static function getLicenses() { return array(LICENSE_RETAIL, LICENSE_OPENSOURCE, LICENSE_FREETOUSE, - LICENSE_FREETOSHARE, LICENSE_DEMO, LICENSE_SHAREWARE); + LICENSE_FREETOSHARE, LICENSE_DEMO, LICENSE_SHAREWARE, LICENSE_STEAM); } // returns a string containing the html for a selection list @@ -1404,7 +1405,7 @@ EOT; public static function checkLicense($sLicense) { $aLicense = array(LICENSE_RETAIL, LICENSE_OPENSOURCE, LICENSE_FREETOUSE, - LICENSE_FREETOSHARE, LICENSE_DEMO, LICENSE_SHAREWARE); + LICENSE_FREETOSHARE, LICENSE_DEMO, LICENSE_SHAREWARE, LICENSE_STEAM); foreach($aLicense as $sElement) { diff --git a/tables/appdb_tables.sql b/tables/appdb_tables.sql index 9fb4672..20239de 100644 --- a/tables/appdb_tables.sql +++ b/tables/appdb_tables.sql @@ -58,7 +58,7 @@ create table appVersion ( ratingRelease text, submitTime datetime NOT NULL, submitterId int(11) NOT NULL default '0', - license enum('Retail','Open Source','Demo','Shareware','Free to use','Free to use and share'), + license enum('Retail','Open Source','Demo','Shareware','Free to use','Free to use and share','Steam'), obsoleteBy int(11) NOT NULL default '0', state enum('accepted','queued','rejected','pending','deleted') NOT NULL default 'accepted', hasMaintainer enum('true','false') NOT NULL default 'false',

1 0

Andrew Eikum : quartz: Don't write past end of d3d9 buffer.
by Alexandre Julliard 09 Jan '17

09 Jan '17

Module: wine Branch: master Commit: ac59a68162321610841ed072981adddb8bc78c56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac59a68162321610841ed0729… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 9 10:46:01 2017 -0600 quartz: Don't write past end of d3d9 buffer. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 3c8393f..490d8d8 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -260,9 +260,9 @@ static DWORD VMR9_SendSampleData(struct quartz_vmr *This, VMR9PresentationInfo * lock.pBits = (char *)lock.pBits + (height * lock.Pitch); while (height--) { + lock.pBits = (char *)lock.pBits - lock.Pitch; memcpy(lock.pBits, data, width * bmiHeader->biBitCount / 8); data = data + width * bmiHeader->biBitCount / 8; - lock.pBits = (char *)lock.pBits - lock.Pitch; } } else if (lock.Pitch != width * bmiHeader->biBitCount / 8)

1 0

Francois Gouget : gdiplus: Make some GdipDraw*Path() functions static.
by Alexandre Julliard 09 Jan '17

09 Jan '17

Module: wine Branch: master Commit: f870708c668d23a9122e1b6b2e37d2f0857ac47e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f870708c668d23a9122e1b6b2… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:40:49 2017 +0100 gdiplus: Make some GdipDraw*Path() functions static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index f9a6f3e..bd37d92 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3375,7 +3375,7 @@ GpStatus WINGDIPAPI GdipDrawLinesI(GpGraphics *graphics, GpPen *pen, GDIPCONST return retval; } -GpStatus GDI32_GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) +static GpStatus GDI32_GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) { INT save_state; GpStatus retval; @@ -3401,7 +3401,7 @@ end: return retval; } -GpStatus SOFTWARE_GdipDrawThinPath(GpGraphics *graphics, GpPen *pen, GpPath *path) +static GpStatus SOFTWARE_GdipDrawThinPath(GpGraphics *graphics, GpPen *pen, GpPath *path) { GpStatus stat; GpPath* flat_path; @@ -3699,7 +3699,7 @@ GpStatus SOFTWARE_GdipDrawThinPath(GpGraphics *graphics, GpPen *pen, GpPath *pat return stat; } -GpStatus SOFTWARE_GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) +static GpStatus SOFTWARE_GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) { GpStatus stat; GpPath *wide_path;

1 0

Fabian Maurer : riched20: Check for NULL in fnTextSrv_TxSetText and add test.
by Alexandre Julliard 09 Jan '17

09 Jan '17

Module: wine Branch: master Commit: 9f37f6afb4d9bd5019ef4c07a93f163551c1057e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f37f6afb4d9bd5019ef4c07a… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Jan 9 18:08:11 2017 +0100 riched20: Check for NULL in fnTextSrv_TxSetText and add test. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/txtsrv.c | 10 ++++++++++ dlls/riched20/txtsrv.c | 7 +++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 1a6ca61..4be3106 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -681,6 +681,16 @@ static void test_TxSetText(void) ok(memcmp(rettext,settext,SysStringByteLen(rettext)) == 0, "String returned differs\n"); + /* Null-pointer should behave the same as empty-string */ + + hres = ITextServices_TxSetText(txtserv, 0); + ok(hres == S_OK, "ITextServices_TxSetText failed (result = %x)\n", hres); + + hres = ITextServices_TxGetText(txtserv, &rettext); + ok(hres == S_OK, "ITextServices_TxGetText failed (result = %x)\n", hres); + ok(SysStringLen(rettext) == 0, + "String returned of wrong length (expected 0, got %d)\n", SysStringLen(rettext)); + SysFreeString(rettext); ITextServices_Release(txtserv); ITextHost_Release(host); diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 3df7798..307b484 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -286,10 +286,9 @@ DECLSPEC_HIDDEN HRESULT WINAPI fnTextSrv_TxSetText(ITextServices *iface, LPCWSTR ME_Cursor cursor; ME_SetCursorToStart(This->editor, &cursor); - ME_InternalDeleteText(This->editor, &cursor, - ME_GetTextLength(This->editor), FALSE); - ME_InsertTextFromCursor(This->editor, 0, pszText, -1, - This->editor->pBuffer->pDefaultStyle); + ME_InternalDeleteText(This->editor, &cursor, ME_GetTextLength(This->editor), FALSE); + if(pszText) + ME_InsertTextFromCursor(This->editor, 0, pszText, -1, This->editor->pBuffer->pDefaultStyle); ME_SetSelection(This->editor, 0, 0); This->editor->nModifyStep = 0; OleFlushClipboard();

1 0

Henri Verbeet : wined3d: Fully initialise "settings" in wined3d_ffp_get_vs_settings().
by Alexandre Julliard 09 Jan '17

09 Jan '17

Module: wine Branch: master Commit: 24d71ad7e777a9b93210c21216539290ec08d0d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24d71ad7e777a9b93210c2121… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 9 14:31:45 2017 +0100 wined3d: Fully initialise "settings" in wined3d_ffp_get_vs_settings(). Commit b62f4139eda58e8e25cbc58864fcea2599a20e97 introduced implicit padding in the wined3d_ffp_vs_settings structure. This causes redundant shader variants to be generated. Although easy to avoid, there's also something to be said for being more robust against padding. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0c79f90..f3001e5 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5634,10 +5634,10 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, const struct wined3d_d3d_info *d3d_info = context->d3d_info; unsigned int coord_idx, i; + memset(settings, 0, sizeof(*settings)); + if (si->position_transformed) { - memset(settings, 0, sizeof(*settings)); - settings->transformed = 1; settings->point_size = state->gl_primitive_type == GL_POINTS; settings->per_vertex_point_size = !!(si->use_map & 1u << WINED3D_FFP_PSIZE); @@ -5681,7 +5681,6 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, break; } - settings->transformed = 0; settings->clipping = state->render_states[WINED3D_RS_CLIPPING] && state->render_states[WINED3D_RS_CLIPPLANEENABLE]; settings->normal = !!(si->use_map & (1u << WINED3D_FFP_NORMAL)); @@ -5706,7 +5705,6 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, settings->specular_source = WINED3D_MCS_MATERIAL; } - settings->texcoords = 0; for (i = 0; i < MAX_TEXTURES; ++i) { coord_idx = state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX]; @@ -5717,7 +5715,6 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, if (d3d_info->limits.varying_count >= wined3d_max_compat_varyings(gl_info)) settings->texcoords = (1u << MAX_TEXTURES) - 1; - settings->light_type = 0; for (i = 0; i < MAX_ACTIVE_LIGHTS; ++i) { if (state->lights[i]) @@ -5725,7 +5722,6 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, & WINED3D_FFP_LIGHT_TYPE_MASK) << WINED3D_FFP_LIGHT_TYPE_SHIFT(i); } - settings->ortho_fog = 0; if (!state->render_states[WINED3D_RS_FOGENABLE]) settings->fog_mode = WINED3D_FFP_VS_FOG_OFF; else if (state->render_states[WINED3D_RS_FOGTABLEMODE] != WINED3D_FOG_NONE) @@ -5751,8 +5747,6 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, settings->flatshading = FALSE; settings->swizzle_map = si->swizzle_map; - - settings->padding = 0; } int wined3d_ffp_vertex_program_key_compare(const void *key, const struct wine_rb_entry *entry)

1 0

Francois Gouget : d3dx9_36/tests: Make test_texture_shader() static.
by Alexandre Julliard 09 Jan '17

09 Jan '17

Module: wine Branch: master Commit: 6e92cdacf19e97d729a5d7d624d6972eee0397fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e92cdacf19e97d729a5d7d62… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:41:52 2017 +0100 d3dx9_36/tests: Make test_texture_shader() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 011f756..9ae0321 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -2007,7 +2007,7 @@ static void test_D3DXSaveTextureToFileInMemory(IDirect3DDevice9 *device) IDirect3DVolumeTexture9_Release(volume_texture); } -void test_texture_shader(void) +static void test_texture_shader(void) { static const DWORD shader_zero[] = {0x0}; static const DWORD shader_invalid[] = {0xeeee0100};

1 0

Francois Gouget : qcap/tests: A spelling fix in an ok() message.
by Alexandre Julliard 09 Jan '17

09 Jan '17

Module: wine Branch: master Commit: fdbfd0f0b33bb40921c1fe06ae65818b709ab434 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdbfd0f0b33bb40921c1fe06a… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:43:02 2017 +0100 qcap/tests: A spelling fix in an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/qcap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 32f88e3..d7fe288 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1556,7 +1556,7 @@ static void test_AviMux(char *arg) props.cbAlign = 0xdeadbee3; props.cbPrefix = 0xdeadbee4; hr = IMemInputPin_GetAllocatorRequirements(memin, &props); - ok(hr==S_OK || broken(hr==E_INVALIDARG), "GetAllocatorRequirments returned %x\n", hr); + ok(hr==S_OK || broken(hr==E_INVALIDARG), "GetAllocatorRequirements returned %x\n", hr); if(hr == S_OK) { ok(props.cBuffers == 0xdeadbee1, "cBuffers = %d\n", props.cBuffers); ok(props.cbBuffer == 0xdeadbee2, "cbBuffer = %d\n", props.cbBuffer);

1 0

Francois Gouget : dxgi: Make wined3d_scanline_ordering_from_dxgi() static.
by Alexandre Julliard 09 Jan '17

09 Jan '17

Module: wine Branch: master Commit: 0ed0e6785dbc1e699b2f50f83dfdaa8cfd5e6c8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ed0e6785dbc1e699b2f50f83… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:41:33 2017 +0100 dxgi: Make wined3d_scanline_ordering_from_dxgi() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/dxgi_private.h | 2 -- dlls/dxgi/utils.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 06892e2..34bb6fc 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -85,8 +85,6 @@ void dump_feature_levels(const D3D_FEATURE_LEVEL *feature_levels, unsigned int l DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSPEC_HIDDEN; UINT dxgi_rational_to_uint(const DXGI_RATIONAL *rational) DECLSPEC_HIDDEN; -enum wined3d_scanline_ordering wined3d_scanline_ordering_from_dxgi( - DXGI_MODE_SCANLINE_ORDER scanline_order) DECLSPEC_HIDDEN; void dxgi_sample_desc_from_wined3d(DXGI_SAMPLE_DESC *desc, enum wined3d_multisample_type wined3d_type, unsigned int wined3d_quality) DECLSPEC_HIDDEN; void wined3d_sample_desc_from_dxgi(enum wined3d_multisample_type *wined3d_type, diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index b940b15..f41b0a8 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -407,7 +407,7 @@ UINT dxgi_rational_to_uint(const DXGI_RATIONAL *rational) return rational->Numerator; } -enum wined3d_scanline_ordering wined3d_scanline_ordering_from_dxgi(DXGI_MODE_SCANLINE_ORDER scanline_order) +static enum wined3d_scanline_ordering wined3d_scanline_ordering_from_dxgi(DXGI_MODE_SCANLINE_ORDER scanline_order) { switch (scanline_order) {

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
50
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 January 2017