January 2017 - Wine-commits

Louis Lenders : advapi32: Spelling fix in comment.
by Alexandre Julliard 10 Jan '17

10 Jan '17

Module: wine Branch: master Commit: 05f9b023d2996984dda3b8143e80a2b5037968b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05f9b023d2996984dda3b8143… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Jan 10 16:17:55 2017 +0100 advapi32: Spelling fix in comment. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 28331df..7e41c0a 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2688,7 +2688,7 @@ BOOL WINAPI AddAuditAccessAce( } /****************************************************************************** - * AddAuditAccessAce [ADVAPI32.@] + * AddAuditAccessAceEx [ADVAPI32.@] */ BOOL WINAPI AddAuditAccessAceEx( IN OUT PACL pAcl,

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

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

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

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

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

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 : winapi: Add some more __stdcall synonyms.
by Alexandre Julliard 09 Jan '17

09 Jan '17

Module: wine Branch: master Commit: b9181615a905904de55c43a2f411143b78ea086e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9181615a905904de55c43a2f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jan 7 14:55:14 2017 +0100 winapi: Add some more __stdcall synonyms. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/c_parser.pm | 4 ++-- tools/winapi/winapi_function.pm | 4 ++-- tools/winapi/winapi_local.pm | 4 ++-- tools/winapi/winapi_parser.pm | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm index 8bb40d5..d42e04a 100644 --- a/tools/winapi/c_parser.pm +++ b/tools/winapi/c_parser.pm @@ -37,7 +37,7 @@ use c_type; my $CALL_CONVENTION="__cdecl|__stdcall|" . "__RPC_API|__RPC_STUB|__RPC_USER|" . "CALLBACK|CDECL|NTAPI|PASCAL|RPC_ENTRY|RPC_VAR_ENTRY|" . - "VFWAPI|VFWAPIV|WINAPI|WINAPIV|APIENTRY|"; + "SEC_ENTRY|VFWAPI|VFWAPIV|WINGDIPAPI|WMIAPI|WINAPI|WINAPIV|APIENTRY|"; sub parse_c_function($$$$$); @@ -1735,7 +1735,7 @@ sub parse_c_variable($$$$$$$) $type = $self->_format_c_type($type); last finished; - } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+\b(?:\s*\*)*\s*$\s*(?:$CALL_CONVENTION)?(?:\s*\*)*)\s*(\w+)\s*($\s*$.*?$)$//s) { + } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+\b(?:\s*\*)*\s*$\s*(?:$CALL_CONVENTION)?(?:\s+DECLSPEC_[A-Z]+)?(?:\s*\*)*)\s*(\w+)\s*($\s*$.*?$)$//s) { $type = $self->_format_c_type("$sign$1$3"); $name = $2; diff --git a/tools/winapi/winapi_function.pm b/tools/winapi/winapi_function.pm index 023fbf5..633e9ea 100644 --- a/tools/winapi/winapi_function.pm +++ b/tools/winapi/winapi_function.pm @@ -309,7 +309,7 @@ sub calling_convention16($) { } elsif(/^(?:VFWAPIV|WINAPIV)$/) { if(!defined($suffix)) { return undef; } return "pascal$suffix"; # FIXME: Is this correct? - } elsif(/^(?:__stdcall|__RPC_STUB|__RPC_USER|NET_API_FUNCTION|RPC_ENTRY|VFWAPI|WINAPI|CALLBACK)$/) { + } elsif(/^(?:__stdcall|__RPC_STUB|__RPC_USER|NET_API_FUNCTION|RPC_ENTRY|SEC_ENTRY|VFWAPI|WINGDIPAPI|WMIAPI|WINAPI|CALLBACK)$/) { if(!defined($suffix)) { return undef; } return "pascal$suffix"; } elsif($_ eq "__asm") { @@ -327,7 +327,7 @@ sub calling_convention32($) { return "cdecl"; } elsif(/^(?:VFWAPIV|WINAPIV)$/) { return "varargs"; - } elsif(/^(?:__stdcall|__RPC_STUB|__RPC_USER|NET_API_FUNCTION|RPC_ENTRY|VFWAPI|WINAPI|CALLBACK)$/) { + } elsif(/^(?:__stdcall|__RPC_STUB|__RPC_USER|NET_API_FUNCTION|RPC_ENTRY|SEC_ENTRY|VFWAPI|WINGDIPAPI|WMIAPI|WINAPI|CALLBACK)$/) { return "stdcall"; } elsif($_ eq "__asm") { return "asm"; diff --git a/tools/winapi/winapi_local.pm b/tools/winapi/winapi_local.pm index 5a4dcea..42dd146 100644 --- a/tools/winapi/winapi_local.pm +++ b/tools/winapi/winapi_local.pm @@ -85,7 +85,7 @@ sub _check_function($$$$$$) { $implemented_calling_convention = "cdecl"; } elsif($calling_convention =~ /^(?:VFWAPIV|WINAPIV)$/) { $implemented_calling_convention = "varargs"; - } elsif($calling_convention =~ /^(?:__stdcall|__RPC_STUB|__RPC_USER|NET_API_FUNCTION|RPC_ENTRY|VFWAPI|WINAPI|CALLBACK)$/) { + } elsif($calling_convention =~ /^(?:__stdcall|__RPC_STUB|__RPC_USER|NET_API_FUNCTION|RPC_ENTRY|SEC_ENTRY|VFWAPI|WINGDIPAPI|WMIAPI|WINAPI|CALLBACK)$/) { if(defined($implemented_return_kind) && $implemented_return_kind =~ /^(?:s_word|word|void)$/) { $implemented_calling_convention = "pascal16"; } else { @@ -101,7 +101,7 @@ sub _check_function($$$$$$) { $implemented_calling_convention = "cdecl"; } elsif($calling_convention =~ /^(?:VFWAPIV|WINAPIV)$/) { $implemented_calling_convention = "varargs"; - } elsif($calling_convention =~ /^(?:__stdcall|__RPC_STUB|__RPC_USER|APIENTRY|NET_API_FUNCTION|RPC_ENTRY|VFWAPI|WINAPI|CALLBACK)$/) { + } elsif($calling_convention =~ /^(?:__stdcall|__RPC_STUB|__RPC_USER|APIENTRY|NET_API_FUNCTION|RPC_ENTRY|SEC_ENTRY|VFWAPI|WINGDIPAPI|WMIAPI|WINAPI|CALLBACK)$/) { if(defined($implemented_return_kind) && $implemented_return_kind eq "longlong") { $implemented_calling_convention = "stdcall"; # FIXME: Check entry flags } else { diff --git a/tools/winapi/winapi_parser.pm b/tools/winapi/winapi_parser.pm index 3092a7d..b24ce5f 100644 --- a/tools/winapi/winapi_parser.pm +++ b/tools/winapi/winapi_parser.pm @@ -28,7 +28,7 @@ my $CALL_CONVENTION="__cdecl|__stdcall|" . "__RPC_API|__RPC_STUB|__RPC_USER|RPC_ENTRY|" . "RPC_VAR_ENTRY|STDMETHODCALLTYPE|NET_API_FUNCTION|" . "CALLBACK|CDECL|NTAPI|PASCAL|APIENTRY|" . - "VFWAPI|VFWAPIV|WINAPI|WINAPIV|"; + "SEC_ENTRY|VFWAPI|VFWAPIV|WINGDIPAPI|WMIAPI|WINAPI|WINAPIV|"; sub parse_c_file($$) { my $file = shift;

1 0

Nikolay Sivov : shell32/tests: Some tests for ExtractIcon().
by Alexandre Julliard 09 Jan '17

09 Jan '17

Module: wine Branch: master Commit: c1645b6dfdd0a42cc51e3200b02db8559db08f6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1645b6dfdd0a42cc51e3200b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 8 21:54:46 2017 +0300 shell32/tests: Some tests for ExtractIcon(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelllink.c | 97 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 8af3c97..293f69c 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -1150,6 +1150,102 @@ static void test_propertystore(void) IShellLinkW_Release(linkW); } +static void test_ExtractIcon(void) +{ + static const WCHAR nameW[] = {'\\','e','x','t','r','a','c','t','i','c','o','n','_','t','e','s','t','.','t','x','t',0}; + static const WCHAR shell32W[] = {'s','h','e','l','l','3','2','.','d','l','l',0}; + WCHAR pathW[MAX_PATH]; + HICON hicon, hicon2; + char path[MAX_PATH]; + HANDLE file; + int r; + + /* specified instance handle */ + hicon = ExtractIconA(GetModuleHandleA("shell32.dll"), NULL, 0); +todo_wine + ok(hicon == NULL, "Got icon %p\n", hicon); + hicon2 = ExtractIconA(GetModuleHandleA("shell32.dll"), "shell32.dll", -1); + ok(hicon2 != NULL, "Got icon %p\n", hicon2); + + /* existing index */ + hicon = ExtractIconA(NULL, "shell32.dll", 0); + ok(hicon != NULL && HandleToLong(hicon) != -1, "Got icon %p\n", hicon); + DestroyIcon(hicon); + + /* returns number of resources */ + hicon = ExtractIconA(NULL, "shell32.dll", -1); + ok(HandleToLong(hicon) > 1 && hicon == hicon2, "Got icon %p\n", hicon); + + /* invalid index, valid dll name */ + hicon = ExtractIconA(NULL, "shell32.dll", 3000); + ok(hicon == NULL, "Got icon %p\n", hicon); + + /* Create a temporary non-executable file */ + GetTempPathA(sizeof(path), path); + strcat(path, "\\extracticon_test.txt"); + file = CreateFileA(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "Failed to create a test file\n"); + CloseHandle(file); + + hicon = ExtractIconA(NULL, path, 0); +todo_wine + ok(hicon == NULL, "Got icon %p\n", hicon); + + hicon = ExtractIconA(NULL, path, -1); + ok(hicon == NULL, "Got icon %p\n", hicon); + + hicon = ExtractIconA(NULL, path, 1); +todo_wine + ok(hicon == NULL, "Got icon %p\n", hicon); + + r = DeleteFileA(path); + ok(r, "failed to delete file %s (%d)\n", path, GetLastError()); + + /* same for W variant */ +if (0) +{ + /* specified instance handle, crashes on XP, 2k3 */ + hicon = ExtractIconW(GetModuleHandleA("shell32.dll"), NULL, 0); + ok(hicon == NULL, "Got icon %p\n", hicon); +} + hicon2 = ExtractIconW(GetModuleHandleA("shell32.dll"), shell32W, -1); + ok(hicon2 != NULL, "Got icon %p\n", hicon2); + + /* existing index */ + hicon = ExtractIconW(NULL, shell32W, 0); + ok(hicon != NULL && HandleToLong(hicon) != -1, "Got icon %p\n", hicon); + DestroyIcon(hicon); + + /* returns number of resources */ + hicon = ExtractIconW(NULL, shell32W, -1); + ok(HandleToLong(hicon) > 1 && hicon == hicon2, "Got icon %p\n", hicon); + + /* invalid index, valid dll name */ + hicon = ExtractIconW(NULL, shell32W, 3000); + ok(hicon == NULL, "Got icon %p\n", hicon); + + /* Create a temporary non-executable file */ + GetTempPathW(sizeof(pathW)/sizeof(pathW[0]), pathW); + lstrcatW(pathW, nameW); + file = CreateFileW(pathW, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "Failed to create a test file\n"); + CloseHandle(file); + + hicon = ExtractIconW(NULL, pathW, 0); +todo_wine + ok(hicon == NULL, "Got icon %p\n", hicon); + + hicon = ExtractIconW(NULL, pathW, -1); + ok(hicon == NULL, "Got icon %p\n", hicon); + + hicon = ExtractIconW(NULL, pathW, 1); +todo_wine + ok(hicon == NULL, "Got icon %p\n", hicon); + + r = DeleteFileW(pathW); + ok(r, "failed to delete file %s (%d)\n", path, GetLastError()); +} + START_TEST(shelllink) { HRESULT r; @@ -1178,6 +1274,7 @@ START_TEST(shelllink) test_SHGetStockIconInfo(); test_SHExtractIcons(); test_propertystore(); + test_ExtractIcon(); CoUninitialize(); }

1 0