January 2009 - Wine-Commits

Henri Verbeet : wined3d: Fix texture creation error handling.
by Alexandre Julliard Jan. 13, 2009

Jan. 13, 2009

Module: wine Branch: master Commit: 2654a148deffa2d09107682474f79984463cd65a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2654a148deffa2d0910768247… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 13 10:31:57 2009 +0100 wined3d: Fix texture creation error handling. Doing the levels calculation before the object is created prevents leaking resources and avoids changing baseTexture.levels after it's been initialized by basetexture_init(). --- dlls/wined3d/device.c | 85 +++++++++++++++++++++++++++---------------------- 1 files changed, 47 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6717fd8..8594cb7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -802,6 +802,53 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, U return WINED3DERR_INVALIDCALL; } + /* Non-power2 support */ + if (GL_SUPPORT(ARB_TEXTURE_NON_POWER_OF_TWO)) + { + pow2Width = Width; + pow2Height = Height; + } + else + { + /* Find the nearest pow2 match */ + pow2Width = pow2Height = 1; + while (pow2Width < Width) pow2Width <<= 1; + while (pow2Height < Height) pow2Height <<= 1; + + if (pow2Width != Width || pow2Height != Height) + { + if (Levels > 1) + { + WARN("Attempted to create a mipmapped np2 texture without unconditional np2 support\n"); + return WINED3DERR_INVALIDCALL; + } + Levels = 1; + } + } + + /* Calculate levels for mip mapping */ + if (Usage & WINED3DUSAGE_AUTOGENMIPMAP) + { + if (!GL_SUPPORT(SGIS_GENERATE_MIPMAP)) + { + WARN("No mipmap generation support, returning D3DERR_INVALIDCALL\n"); + return WINED3DERR_INVALIDCALL; + } + + if (Levels > 1) + { + WARN("D3DUSAGE_AUTOGENMIPMAP is set, and level count > 1, returning D3DERR_INVALIDCALL\n"); + return WINED3DERR_INVALIDCALL; + } + + Levels = 1; + } + else if (!Levels) + { + Levels = wined3d_log2i(max(Width, Height)) + 1; + TRACE("Calculated levels = %d\n", Levels); + } + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { @@ -838,28 +885,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, U object->baseTexture.magLookup = magLookup_noFilter; } - /** Non-power2 support **/ - if (GL_SUPPORT(ARB_TEXTURE_NON_POWER_OF_TWO)) { - pow2Width = Width; - pow2Height = Height; - } else { - /* Find the nearest pow2 match */ - pow2Width = pow2Height = 1; - while (pow2Width < Width) pow2Width <<= 1; - while (pow2Height < Height) pow2Height <<= 1; - - if(pow2Width != Width || pow2Height != Height) { - if(Levels > 1) { - WARN("Attempted to create a mipmapped np2 texture without unconditional np2 support\n"); - HeapFree(GetProcessHeap(), 0, object); - *ppTexture = NULL; - return WINED3DERR_INVALIDCALL; - } else { - Levels = 1; - } - } - } - /** FIXME: add support for real non-power-two if it's provided by the video card **/ /* Precalculated scaling for 'faked' non power of two texture coords. Second also don't use ARB_TEXTURE_RECTANGLE in case the surface format is P8 and EXT_PALETTED_TEXTURE @@ -895,22 +920,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, U } TRACE(" xf(%f) yf(%f)\n", object->baseTexture.pow2Matrix[0], object->baseTexture.pow2Matrix[5]); - /* Calculate levels for mip mapping */ - if (Usage & WINED3DUSAGE_AUTOGENMIPMAP) { - if(!GL_SUPPORT(SGIS_GENERATE_MIPMAP)) { - WARN("No mipmap generation support, returning D3DERR_INVALIDCALL\n"); - return WINED3DERR_INVALIDCALL; - } - if(Levels > 1) { - WARN("D3DUSAGE_AUTOGENMIPMAP is set, and level count > 1, returning D3DERR_INVALIDCALL\n"); - return WINED3DERR_INVALIDCALL; - } - object->baseTexture.levels = 1; - } else if (Levels == 0) { - object->baseTexture.levels = wined3d_log2i(max(Width, Height)) + 1; - TRACE("Calculated levels = %d\n", object->baseTexture.levels); - } - /* Generate all the surfaces */ tmpW = Width; tmpH = Height;

1 0

Alexandre Julliard : user32/tests: Only display failing message sequences instead of every single message.
by Alexandre Julliard Jan. 13, 2009

Jan. 13, 2009

Module: wine Branch: master Commit: 7d9b745391a301b1c4f5060826dd4f1388d15991 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d9b745391a301b1c4f506082… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 12 21:51:01 2009 +0100 user32/tests: Only display failing message sequences instead of every single message. --- dlls/user32/tests/msg.c | 188 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 129 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d9b745391a301b1c4f50…

1 0

Alexandre Julliard : user32/tests: Centralize the tracing of the received messages in the msg.c test.
by Alexandre Julliard Jan. 13, 2009

Jan. 13, 2009

Module: wine Branch: master Commit: a26857da31f665db2e57311ebc61b8d2b9a5ae6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a26857da31f665db2e57311eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 12 21:03:57 2009 +0100 user32/tests: Centralize the tracing of the received messages in the msg.c test. --- dlls/user32/tests/msg.c | 578 +++++++++++++++++------------------------------ 1 files changed, 208 insertions(+), 370 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a26857da31f665db2e573…

1 0

Alexandre Julliard : configure: Don' t force a 32-bit build when cross-compiling.
by Alexandre Julliard Jan. 13, 2009

Jan. 13, 2009

Module: wine Branch: master Commit: 6b4ed0faae380ffe01bbd98e5d49bd422e34ecbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b4ed0faae380ffe01bbd98e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 12 19:29:43 2009 +0100 configure: Don't force a 32-bit build when cross-compiling. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index d42d651..48603ae 100755 --- a/configure +++ b/configure @@ -3804,7 +3804,7 @@ fi case $host in x86_64*) - if test "x$enable_win64" != "xyes" + if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes" then CC="$CC -m32" CXX="$CXX -m32" diff --git a/configure.ac b/configure.ac index d5d8f8e..1a84d69 100644 --- a/configure.ac +++ b/configure.ac @@ -101,7 +101,7 @@ AC_CHECK_TOOL(CPPBIN,cpp,cpp) case $host in x86_64*) - if test "x$enable_win64" != "xyes" + if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes" then CC="$CC -m32" CXX="$CXX -m32"

1 0

Paul Vriens : tools: Explicitly check for Vista.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: tools Branch: master Commit: c3e5702ef0bef213be4fbc9aabc96ae002dc8dc9 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c3e5702ef0bef213be4fbc9a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jan 12 08:00:49 2009 +0100 tools: Explicitly check for Vista. --- winetest/dissect | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 2ecedef..5ef467c 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -168,13 +168,13 @@ if ($plid==1 && $major==4) { } elsif ($minor==2) { $version = "2003"; } - } elsif ($major==6) { + } elsif ($major==6 && $minor== 0) { if ($product==1) { $version = "vista"; } elsif ($product==3) { $version = "2008"; } - } + } } elsif ($plid==3) { $version = "ce$major$minor"; }

1 0

Austin English : httpapi: Add stub dll.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: 8cf8e2c60a263e0b015b36dc36c9bf83e6767aa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cf8e2c60a263e0b015b36dc3… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jan 11 14:54:15 2009 -0600 httpapi: Add stub dll. --- configure | 9 +++++++ configure.ac | 1 + dlls/httpapi/Makefile.in | 13 ++++++++++ dlls/httpapi/httpapi.spec | 52 +++++++++++++++++++++++++++++++++++++++++++ dlls/httpapi/httpapi_main.c | 44 ++++++++++++++++++++++++++++++++++++ 5 files changed, 119 insertions(+), 0 deletions(-) diff --git a/configure b/configure index a3914e0..d42d651 100755 --- a/configure +++ b/configure @@ -24876,6 +24876,14 @@ dlls/hnetcfg/Makefile: dlls/hnetcfg/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/hnetcfg/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/httpapi/Makefile" +test "x$enable_httpapi" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + httpapi" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/httpapi/Makefile: dlls/httpapi/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/httpapi/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/iccvid/Makefile" test "x$enable_iccvid" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ iccvid" @@ -28166,6 +28174,7 @@ do "dlls/hlink/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/hlink/Makefile" ;; "dlls/hlink/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/hlink/tests/Makefile" ;; "dlls/hnetcfg/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/hnetcfg/Makefile" ;; + "dlls/httpapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/httpapi/Makefile" ;; "dlls/iccvid/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/iccvid/Makefile" ;; "dlls/icmp/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/icmp/Makefile" ;; "dlls/ifsmgr.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ifsmgr.vxd/Makefile" ;; diff --git a/configure.ac b/configure.ac index 083203e..d5d8f8e 100644 --- a/configure.ac +++ b/configure.ac @@ -1887,6 +1887,7 @@ WINE_CONFIG_MAKEFILE([dlls/hid/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DI WINE_CONFIG_MAKEFILE([dlls/hlink/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/hlink/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/hnetcfg/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/httpapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/iccvid/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/icmp/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/ifsmgr.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/httpapi/Makefile.in b/dlls/httpapi/Makefile.in new file mode 100644 index 0000000..6d21cd6 --- /dev/null +++ b/dlls/httpapi/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = httpapi.dll +IMPORTS = kernel32 + +C_SRCS = \ + httpapi_main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec new file mode 100644 index 0000000..aa8fea2 --- /dev/null +++ b/dlls/httpapi/httpapi.spec @@ -0,0 +1,52 @@ +@ stub HttpAddFragmentToCache +@ stub HttpAddUrl +@ stub HttpAddUrlToConfigGroup +@ stub HttpCancelHttpRequest +@ stub HttpCreateAppPool +@ stub HttpCreateConfigGroup +@ stub HttpCreateFilter +@ stub HttpCreateHttpHandle +@ stub HttpDeleteConfigGroup +@ stub HttpDeleteServiceConfiguration +@ stub HttpFilterAccept +@ stub HttpFilterAppRead +@ stub HttpFilterAppWrite +@ stub HttpFilterAppWriteAndRawRead +@ stub HttpFilterClose +@ stub HttpFilterRawRead +@ stub HttpFilterRawWrite +@ stub HttpFilterRawWriteAndAppRead +@ stub HttpFlushResponseCache +@ stub HttpGetCounters +@ stub HttpInitialize +@ stub HttpInitializeServerContext +@ stub HttpOpenAppPool +@ stub HttpOpenControlChannel +@ stub HttpOpenFilter +@ stub HttpQueryAppPoolInformation +@ stub HttpQueryConfigGroupInformation +@ stub HttpQueryControlChannelInformation +@ stub HttpQueryServerContextInformation +@ stub HttpQueryServiceConfiguration +@ stub HttpReadFragmentFromCache +@ stub HttpReceiveClientCertificate +@ stub HttpReceiveHttpRequest +@ stub HttpReceiveHttpResponse +@ stub HttpReceiveRequestEntityBody +@ stub HttpRemoveAllUrlsFromConfigGroup +@ stub HttpRemoveUrl +@ stub HttpRemoveUrlFromConfigGroup +@ stub HttpSendHttpRequest +@ stub HttpSendHttpResponse +@ stub HttpSendRequestEntityBody +@ stub HttpSendResponseEntityBody +@ stub HttpSetAppPoolInformation +@ stub HttpSetConfigGroupInformation +@ stub HttpSetControlChannelInformation +@ stub HttpSetServerContextInformation +@ stub HttpSetServiceConfiguration +@ stub HttpShutdownAppPool +@ stub HttpShutdownFilter +@ stub HttpTerminate +@ stub HttpWaitForDemandStart +@ stub HttpWaitForDisconnect diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c new file mode 100644 index 0000000..b678e19 --- /dev/null +++ b/dlls/httpapi/httpapi_main.c @@ -0,0 +1,44 @@ +/* + * HTTPAPI implementation + * + * Copyright 2009 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(httpapi); + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv ) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinst ); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +}

1 0

Andrey Turkin : programs: Add cacls stub.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: c0f4fc49781fa7fe536263a2e55f18968b87a1d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0f4fc49781fa7fe536263a2e… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sun Jan 11 22:36:53 2009 +0300 programs: Add cacls stub. --- .gitignore | 1 + configure | 10 ++++++++++ configure.ac | 1 + programs/cacls/Makefile.in | 15 +++++++++++++++ programs/cacls/cacls_main.c | 31 +++++++++++++++++++++++++++++++ 5 files changed, 58 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index ab0eef7..531c2fc 100644 --- a/.gitignore +++ b/.gitignore @@ -223,6 +223,7 @@ loader/wine.de.man loader/wine.fr.man loader/wine.man programs/Makeprog.rules +programs/cacls/cacls programs/clock/clock programs/cmd/cmd programs/cmdlgtst/cmdlgtst diff --git a/configure b/configure index 0c82d0e..a3914e0 100755 --- a/configure +++ b/configure @@ -26929,6 +26929,15 @@ programs/Makefile: programs/Makefile.in Make.rules" ac_config_files="$ac_config_files programs/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + programs/cacls/Makefile" +test "x$enable_cacls" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ + cacls" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ + cacls" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +programs/cacls/Makefile: programs/cacls/Makefile.in programs/Makeprog.rules" +ac_config_files="$ac_config_files programs/cacls/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/clock/Makefile" test "x$enable_clock" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ clock" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ @@ -28414,6 +28423,7 @@ do "libs/wpp/Makefile") CONFIG_FILES="$CONFIG_FILES libs/wpp/Makefile" ;; "loader/Makefile") CONFIG_FILES="$CONFIG_FILES loader/Makefile" ;; "programs/Makefile") CONFIG_FILES="$CONFIG_FILES programs/Makefile" ;; + "programs/cacls/Makefile") CONFIG_FILES="$CONFIG_FILES programs/cacls/Makefile" ;; "programs/clock/Makefile") CONFIG_FILES="$CONFIG_FILES programs/clock/Makefile" ;; "programs/cmd/Makefile") CONFIG_FILES="$CONFIG_FILES programs/cmd/Makefile" ;; "programs/cmdlgtst/Makefile") CONFIG_FILES="$CONFIG_FILES programs/cmdlgtst/Makefile" ;; diff --git a/configure.ac b/configure.ac index 591d541..083203e 100644 --- a/configure.ac +++ b/configure.ac @@ -2144,6 +2144,7 @@ WINE_CONFIG_MAKEFILE([libs/wine/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([libs/wpp/Makefile],[Make.rules]) WINE_CONFIG_MAKEFILE([loader/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) WINE_CONFIG_MAKEFILE([programs/Makefile],[Make.rules],[],[ALL_TOP_DIRS]) +WINE_CONFIG_MAKEFILE([programs/cacls/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/clock/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/cmd/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/cmdlgtst/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS]) diff --git a/programs/cacls/Makefile.in b/programs/cacls/Makefile.in new file mode 100644 index 0000000..33eee02 --- /dev/null +++ b/programs/cacls/Makefile.in @@ -0,0 +1,15 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = cacls.exe +APPMODE = -mconsole +IMPORTS = kernel32 + +C_SRCS = \ + cacls_main.c + +(a)MAKE_PROG_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/programs/cacls/cacls_main.c b/programs/cacls/cacls_main.c new file mode 100644 index 0000000..a6a2949 --- /dev/null +++ b/programs/cacls/cacls_main.c @@ -0,0 +1,31 @@ +/* + * ACL viewer/editor stub + * Copyright (C) 2009 Andrey Turkin + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdlib.h> +#include <stdio.h> + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(cacls); + +int main(int argc, char** argv) +{ + WINE_FIXME("This is dummy cacls, not performing ACL manipulations\n"); + return 0; +}

1 0

Austin Lund : riched20/tests: Added ITextServices::TxSetText test.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: c607ab96b6a5d61a5525c33fc828ed00ff40a720 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c607ab96b6a5d61a5525c33fc… Author: Austin Lund <austin.lund(a)gmail.com> Date: Fri Jan 9 14:51:27 2009 +1000 riched20/tests: Added ITextServices::TxSetText test. --- dlls/riched20/tests/Makefile.in | 2 +- dlls/riched20/tests/txtsrv.c | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/tests/Makefile.in b/dlls/riched20/tests/Makefile.in index 9690e5e..1f26e31 100644 --- a/dlls/riched20/tests/Makefile.in +++ b/dlls/riched20/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = riched20.dll -IMPORTS = ole32 user32 gdi32 kernel32 +IMPORTS = ole32 oleaut32 user32 gdi32 kernel32 CTESTS = \ editor.c \ diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 3732377..0714535 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -31,6 +31,7 @@ #include <initguid.h> #include <textserv.h> #include <wine/test.h> +#include <oleauto.h> static HMODULE hmoduleRichEdit; @@ -641,6 +642,30 @@ static void test_TxGetText(void) CoTaskMemFree(dummyTextHost); } +static void test_TxSetText(void) +{ + HRESULT hres; + BSTR rettext; + WCHAR settext[] = {'T','e','s','t',0}; + + if (!init_texthost()) + return; + + hres = ITextServices_TxSetText(txtserv, settext); + todo_wine ok(hres == S_OK, "ITextServices_TxSetText failed\n"); + + hres = ITextServices_TxGetText(txtserv, &rettext); + todo_wine ok(hres == S_OK, "ITextServices_TxGetText failed\n"); + + todo_wine ok(SysStringLen(rettext) == 4, + "String returned of wrong length\n"); + todo_wine ok(memcmp(rettext,settext,SysStringByteLen(rettext)) == 0, + "String returned differs\n"); + + IUnknown_Release(txtserv); + CoTaskMemFree(dummyTextHost); +} + START_TEST( txtsrv ) { setup_thiscall_wrappers(); @@ -656,6 +681,7 @@ START_TEST( txtsrv ) CoTaskMemFree(dummyTextHost); test_TxGetText(); + test_TxSetText(); } if (wrapperCodeMem) VirtualFree(wrapperCodeMem, 0, MEM_RELEASE); }

1 0

Hwang YunSong(황윤성) : cryptui: New Korean resource.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: e90c8f53e2e220a3146d23d9e81b7e7cd58b76a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e90c8f53e2e220a3146d23d9e… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Jan 12 10:00:35 2009 +0900 cryptui: New Korean resource. --- dlls/cryptui/cryptui.rc | 1 + dlls/cryptui/cryptui_Ko.rc | 332 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 333 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e90c8f53e2e220a3146d2…

1 0

Michael Karcher : widl: Dereference operator in expr works on any declared pointer.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: 1c56d293f0087789d975ffe5c666fc442e015618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c56d293f0087789d975ffe5c… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sun Jan 11 15:00:18 2009 +0100 widl: Dereference operator in expr works on any declared pointer. --- dlls/rpcrt4/tests/server.c | 23 +++++++++++++++++++++++ dlls/rpcrt4/tests/server.idl | 1 + tools/widl/expr.c | 3 +++ 3 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index df0cdfd..fe4a1e8 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -227,6 +227,23 @@ s_sum_conf_array(int x[], int n) } int +s_sum_conf_ptr_by_conf_ptr(int n1, int *n2_then_x1, int *x2) +{ + int i; + int sum = 0; + if(n1 == 0) + return 0; + + for(i = 1; i < n1; ++i) + sum += n2_then_x1[i]; + + for(i = 0; i < *n2_then_x1; ++i) + sum += x2[i]; + + return sum; +} + +int s_sum_unique_conf_array(int x[], int n) { return s_sum_conf_array(x, n); @@ -1127,6 +1144,7 @@ array_tests(void) {{1, -2, 3, -4}, {2, 3, 5, 7}, {-4, -1, -14, 4114}} }; int c[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; + int c2[] = {10, 100, 200}; vector_t vs[2] = {{1, -2, 3}, {4, -5, -6}}; cps_t cps; cpsc_t cpsc; @@ -1147,6 +1165,11 @@ array_tests(void) ok(sum_conf_array(&c[7], 1) == 7, "RPC sum_conf_array\n"); ok(sum_conf_array(&c[2], 0) == 0, "RPC sum_conf_array\n"); + ok(sum_conf_ptr_by_conf_ptr(1, c2, c) == 45, "RPC sum_conf_ptr_by_conf_ptr"); + ok(sum_conf_ptr_by_conf_ptr(3, c2, c) == 345, "RPC sum_conf_ptr_by_conf_ptr"); + c2[0] = 0; + ok(sum_conf_ptr_by_conf_ptr(3, c2, c) == 300, "RPC sum_conf_ptr_by_conf_ptr"); + ok(sum_unique_conf_array(ca, 4) == -2, "RPC sum_unique_conf_array\n"); ok(sum_unique_conf_ptr(ca, 5) == 3, "RPC sum_unique_conf_array\n"); ok(sum_unique_conf_ptr(NULL, 10) == 0, "RPC sum_unique_conf_array\n"); diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 53ec016..254551e 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -121,6 +121,7 @@ cpp_quote("#endif") int test_list_length(test_list_t *ls); int sum_fixed_int_3d(int m[2][3][4]); int sum_conf_array([size_is(n)] int x[], int n); + int sum_conf_ptr_by_conf_ptr(int n1, [size_is(n1)] int *n2_then_x1, [size_is(*n2_then_x1)] int *x2); int sum_unique_conf_array([size_is(n), unique] int x[], int n); int sum_unique_conf_ptr([size_is(n), unique] int *x, int n); int sum_var_array([length_is(n)] int x[20], int n); diff --git a/tools/widl/expr.c b/tools/widl/expr.c index 7f0e26d..7717da3 100644 --- a/tools/widl/expr.c +++ b/tools/widl/expr.c @@ -470,6 +470,9 @@ static struct expression_type resolve_expression(const struct expr_loc *expr_loc result = resolve_expression(expr_loc, cont_type, e->ref); if (result.type && is_ptr(result.type)) result.type = type_pointer_get_ref(result.type); + else if(result.type && is_array(result.type) + && !result.type->declarray) + result.type = type_array_get_element(result.type); else error_loc_info(&expr_loc->v->loc_info, "dereference operator applied to non-pointer type in expression%s%s\n", expr_loc->attr ? " for attribute " : "",

1 0