January 2010 - Wine-commits

Huw Davies : msdaps: Switch to using an entry prefix for the auto-generated dlldata routines.
by Alexandre Julliard 22 Jan '10

22 Jan '10

Module: wine Branch: master Commit: 0d519bdfd78fa3c70bd2e05f36ac01dc2d253ee0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d519bdfd78fa3c70bd2e05f3… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 21 11:33:53 2010 +0000 msdaps: Switch to using an entry prefix for the auto-generated dlldata routines. --- dlls/msdaps/Makefile.in | 4 ++- dlls/msdaps/main.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/msdaps/regsvr.c | 61 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 130 insertions(+), 1 deletions(-) diff --git a/dlls/msdaps/Makefile.in b/dlls/msdaps/Makefile.in index 0f65343..c81c6ef 100644 --- a/dlls/msdaps/Makefile.in +++ b/dlls/msdaps/Makefile.in @@ -4,12 +4,14 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msdaps.dll IMPORTS = oleaut32 ole32 rpcrt4 kernel32 ntdll -EXTRADEFS = -DREGISTER_PROXY_DLL -DPROXY_CLSID_IS="{ 0x06210e88, 0x01f5, 0x11d1, { 0xb5, 0x12, 0x00, 0x80, 0xc7, 0x81, 0xc3, 0x84 } }" +EXTRADEFS = -DREGISTER_PROXY_DLL -DPROXY_CLSID_IS="{ 0x06210e88, 0x01f5, 0x11d1, { 0xb5, 0x12, 0x00, 0x80, 0xc7, 0x81, 0xc3, 0x84 } }" -DENTRY_PREFIX=msdaps_ EXTRAIDLFLAGS = --win32-align=2 EXTRA_OBJS = dlldata.o C_SRCS = \ + main.c \ + regsvr.c \ usrmarshal.c IDL_I_SRCS = \ diff --git a/dlls/msdaps/main.c b/dlls/msdaps/main.c new file mode 100644 index 0000000..f803507 --- /dev/null +++ b/dlls/msdaps/main.c @@ -0,0 +1,66 @@ +/* + * msdaps initialisation. + * + * Copyright 2010 Huw Davies + * + * 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 <stdarg.h> +#include <string.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winerror.h" +#include "objbase.h" +#include "oleauto.h" +#include "oledb.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(oledb); + +extern BOOL WINAPI msdaps_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; +extern HRESULT WINAPI msdaps_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN; +extern HRESULT WINAPI msdaps_DllCanUnloadNow(void) DECLSPEC_HIDDEN; + +/***************************************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + return msdaps_DllMain(instance, reason, reserved); +} + +/*********************************************************************** + * DllGetClassObject + */ +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, LPVOID *obj) +{ + return msdaps_DllGetClassObject(clsid, iid, obj); +} + +/*********************************************************************** + * DllCanUnloadNow + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return msdaps_DllCanUnloadNow(); +} diff --git a/dlls/msdaps/regsvr.c b/dlls/msdaps/regsvr.c new file mode 100644 index 0000000..37946de --- /dev/null +++ b/dlls/msdaps/regsvr.c @@ -0,0 +1,61 @@ +/* + * self-registerable dll functions for msdaps.dll + * + * Copyright (C) 2004 Raphael Junqueira + * 2010 Huw Davies + * + * 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 + */ + +#define COBJMACROS + +#include "config.h" + +#include <stdarg.h> +#include <string.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "winerror.h" + +#include "ole2.h" +#include "olectl.h" +#include "oleauto.h" + +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(oledb); + +extern HRESULT WINAPI msdaps_DllRegisterServer(void) DECLSPEC_HIDDEN; +extern HRESULT WINAPI msdaps_DllUnregisterServer(void) DECLSPEC_HIDDEN; + +/*********************************************************************** + * DllRegisterServer + */ +HRESULT WINAPI DllRegisterServer(void) +{ + return msdaps_DllRegisterServer(); +} + +/*********************************************************************** + * DllUnregisterServer + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + return msdaps_DllUnregisterServer(); +}

1 0

Henri Verbeet : wined3d: Fix the ARB_pixel_buffer_object extension definitions.
by Alexandre Julliard 22 Jan '10

22 Jan '10

Module: wine Branch: master Commit: 53c35217958cc4a3af30637dad08fa1ebbb1cedb URL: http://source.winehq.org/git/wine.git/?a=commit;h=53c35217958cc4a3af30637da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 21 10:38:28 2010 +0100 wined3d: Fix the ARB_pixel_buffer_object extension definitions. --- dlls/wined3d/wined3d_gl.h | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index da1596b..eb0bda2 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -2308,14 +2308,6 @@ typedef void (WINE_GLAPI *PGLFNGETQUERYOBJECTUIVARBPROC)(GLuint query, GLenum pn /* GL_ARB_pixel_buffer_object */ #ifndef GL_ARB_pixel_buffer_object #define GL_ARB_pixel_buffer_object 1 -#endif -#define GL_PIXEL_PACK_BUFFER_ARB 0x88eb -#define GL_PIXEL_UNPACK_BUFFER_ARB 0x88ec -#define GL_PIXEL_PACK_BUFFER_BINDING_ARB 0x88ed -#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88ef - -/* GL_ARB_pixel_buffer_object */ -#ifndef GL_ARB_pixel_buffer_object #define GL_PIXEL_PACK_BUFFER_ARB 0x88eb #define GL_PIXEL_UNPACK_BUFFER_ARB 0x88ec #define GL_PIXEL_PACK_BUFFER_BINDING_ARB 0x88ed

1 0

Henri Verbeet : wined3d: Remove the second set of EXT_texture_env_dot3 definitions.
by Alexandre Julliard 22 Jan '10

22 Jan '10

Module: wine Branch: master Commit: 7047f09890a98154eb6263c45e5def97e265f162 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7047f09890a98154eb6263c45… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 21 10:38:29 2010 +0100 wined3d: Remove the second set of EXT_texture_env_dot3 definitions. --- dlls/wined3d/wined3d_gl.h | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index eb0bda2..ad3c076 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3273,13 +3273,6 @@ typedef void (WINE_GLAPI *PGLFNGETCOMPRESSEDTEXIMAGEPROC)(GLenum target, GLint l #define GL_DOT3_RGBA_EXT 0x8741 #endif -/* GL_EXT_texture_env_dot3 */ -#ifndef GL_EXT_texture_env_dot3 -#define GL_EXT_texture_env_dot3 1 -#define GL_DOT3_RGB_EXT 0x8740 -#define GL_DOT3_RGBA_EXT 0x8741 -#endif - /* GL_EXT_texture_filter_anisotropic */ #ifndef GL_EXT_texture_filter_anisotropic #define GL_EXT_texture_filter_anisotropic 1

1 0

Henri Verbeet : wined3d: Remove the duplicate GL_2X_BIT_ATI define.
by Alexandre Julliard 22 Jan '10

22 Jan '10

Module: wine Branch: master Commit: c5086a123ee085e78bb865b8e4838bf44f80e8a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5086a123ee085e78bb865b8e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 21 10:38:30 2010 +0100 wined3d: Remove the duplicate GL_2X_BIT_ATI define. --- dlls/wined3d/wined3d_gl.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index ad3c076..a70caf8 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -2835,7 +2835,6 @@ typedef GLint (WINE_GLAPI *WINED3D_PFNGLGETATTRIBLOCATIONARBPROC)(GLhandleARB pr #define GL_QUARTER_BIT_ATI 0x00000010 #define GL_EIGHTH_BIT_ATI 0x00000020 #define GL_SATURATE_BIT_ATI 0x00000040 -#define GL_2X_BIT_ATI 0x00000001 #define GL_COMP_BIT_ATI 0x00000002 #define GL_NEGATE_BIT_ATI 0x00000004 #define GL_BIAS_BIT_ATI 0x00000008

1 0

Henri Verbeet : wined3d: Remove unused occlusion query extensions.
by Alexandre Julliard 22 Jan '10

22 Jan '10

Module: wine Branch: master Commit: 60ad1aed63018120bf849bbf572851e2ef2d1e3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=60ad1aed63018120bf849bbf5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 21 10:38:31 2010 +0100 wined3d: Remove unused occlusion query extensions. --- dlls/wined3d/directx.c | 1 - dlls/wined3d/query.c | 2 +- dlls/wined3d/wined3d_gl.h | 24 ------------------------ 3 files changed, 1 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 366651f..b8684c2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -133,7 +133,6 @@ static const struct { {"GL_NV_fragment_program_option", NV_FRAGMENT_PROGRAM_OPTION, 0 }, {"GL_NV_half_float", NV_HALF_FLOAT, 0 }, {"GL_NV_light_max_exponent", NV_LIGHT_MAX_EXPONENT, 0 }, - {"GL_NV_occlusion_query", NV_OCCLUSION_QUERY, 0 }, {"GL_NV_register_combiners", NV_REGISTER_COMBINERS, 0 }, {"GL_NV_register_combiners2", NV_REGISTER_COMBINERS2, 0 }, {"GL_NV_texgen_reflection", NV_TEXGEN_REFLECTION, 0 }, diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 92e09e4..cc7d7aa 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -435,7 +435,7 @@ HRESULT query_init(IWineD3DQueryImpl *query, IWineD3DDeviceImpl *device, TRACE("Occlusion query.\n"); if (!gl_info->supported[ARB_OCCLUSION_QUERY]) { - WARN("Unsupported in local OpenGL implementation: ARB_OCCLUSION_QUERY/NV_OCCLUSION_QUERY\n"); + WARN("Unsupported in local OpenGL implementation: ARB_OCCLUSION_QUERY.\n"); return WINED3DERR_NOTAVAILABLE; } query->lpVtbl = &IWineD3DOcclusionQuery_Vtbl; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index a70caf8..c5ecb3a 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1810,7 +1810,6 @@ typedef enum wined3d_gl_extension NV_FRAGMENT_PROGRAM_OPTION, NV_HALF_FLOAT, NV_LIGHT_MAX_EXPONENT, - NV_OCCLUSION_QUERY, NV_REGISTER_COMBINERS, NV_REGISTER_COMBINERS2, NV_TEXGEN_REFLECTION, @@ -3318,13 +3317,6 @@ typedef void (WINE_GLAPI *PGLFNGETCOMPRESSEDTEXIMAGEPROC)(GLenum target, GLint l #define GL_TEXTURE_SWIZZLE_RGBA_EXT 0x8e46 #endif -/* GL_HP_occlusion_test */ -#ifndef GL_HP_occlusion_test -#define GL_HP_occlusion_test 1 -#define GL_OCCLUSION_TEST_HP 0x8165 -#define GL_OCCLUSION_TEST_RESULT_HP 0x8165 -#endif - /* GL_NV_depth_clamp */ #ifndef GL_NV_depth_clamp #define GL_NV_depth_clamp 1 @@ -3415,22 +3407,6 @@ typedef void (WINE_GLAPI *PGLFNVERTEXATTRIBS4HVNVPROC)(GLuint index, GLsizei n, #define GL_MAX_SPOT_EXPONENT_NV 0x8505 #endif -/* GL_NV_occlusion_query */ -#ifndef GL_NV_occlusion_query -#define GL_NV_occlusion_query 1 -#define GL_PIXEL_COUNTER_BITS_NV 0x8864 -#define GL_CURRENT_OCCLUSION_QUERY_ID_NV 0x8865 -#define GL_PIXEL_COUNT_NV 0x8866 -#define GL_PIXEL_COUNT_AVAILABLE_NV 0x8867 -#endif -typedef void (WINE_GLAPI *PGLFNGENOCCLUSIONQUERIESNVPROC)(GLsizei n, GLuint *ids); -typedef void (WINE_GLAPI *PGLFNDELETEOCCLUSIONQUERIESNVPROC)(GLsizei n, const GLuint *ids); -typedef GLboolean (WINE_GLAPI *PGLFNISOCCLUSIONQUERYNVPROC)(GLuint id); -typedef void (WINE_GLAPI *PGLFNBEGINOCCLUSIONQUERYNVPROC)(GLuint id); -typedef void (WINE_GLAPI *PGLFNENDOCCLUSIONQUERYNVPROC)(void); -typedef void (WINE_GLAPI *PGLFNGETOCCLUSIONQUERYIVNVPROC)(GLuint id, GLenum pname, GLint *params); -typedef void (WINE_GLAPI *PGLFNGETOCCLUSIONQUERYUIVNVPROC)(GLuint id, GLenum pname, GLuint *params); - /* GL_NV_register_combiners */ #ifndef GL_NV_register_combiners #define GL_NV_register_combiners 1

1 0

Paul Vriens : user32/tests: Don't crash on Win9x/WinMe.
by Alexandre Julliard 22 Jan '10

22 Jan '10

Module: wine Branch: master Commit: 665c90a9c7541c2908557feec519ac6493b1801b URL: http://source.winehq.org/git/wine.git/?a=commit;h=665c90a9c7541c2908557feec… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jan 21 11:59:31 2010 +0100 user32/tests: Don't crash on Win9x/WinMe. --- dlls/user32/tests/win.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 7bf498e..6fb6ce0 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2785,14 +2785,21 @@ static void test_capture_4(void) hmenu = CreatePopupMenu(); ret = AppendMenuA( hmenu, MF_STRING, 1, "winetest2"); - ok( ret, "AppendMenA has failed!\n"); + ok( ret, "AppendMenuA has failed!\n"); /* set main window to have initial capture */ SetCapture(hwnd); - /* create popup (it will self-destruct) */ - ret = TrackPopupMenu(hmenu, 0x100, 100,100, 0, hwnd, NULL); - ok( ret == 0, "TrackPopupMenu returned %d expected zero\n", ret); + if (!GetWindowLongW(GetDesktopWindow(), GWL_STYLE)) + { + win_skip("TrackPopupMenu test crashes on Win9x/WinMe\n"); + } + else + { + /* create popup (it will self-destruct) */ + ret = TrackPopupMenu(hmenu, TPM_RETURNCMD, 100, 100, 0, hwnd, NULL); + ok( ret == 0, "TrackPopupMenu returned %d expected zero\n", ret); + } /* clean up */ DestroyMenu(hmenu);

1 0

Rob Shearman : include: Replace hexadecimal representation of four character codes in WINED3DFORMAT enum with macros using the actual characters .
by Alexandre Julliard 22 Jan '10

22 Jan '10

Module: wine Branch: master Commit: c137b95db80778d86e56e531d057260eec609ae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c137b95db80778d86e56e531d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Jan 21 11:56:32 2010 +0000 include: Replace hexadecimal representation of four character codes in WINED3DFORMAT enum with macros using the actual characters. --- include/wine/wined3d.idl | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 6364f9c..ac4ee89 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -135,6 +135,10 @@ typedef enum _WINED3DDEGREETYPE WINED3DDEGREE_FORCE_DWORD = 0x7fffffff } WINED3DDEGREETYPE; +#define WINEMAKEFOURCC(ch0, ch1, ch2, ch3) \ + ((unsigned long)(unsigned char)(ch0) | ((unsigned long)(unsigned char)(ch1) << 8) | \ + ((unsigned long)(unsigned char)(ch2) << 16) | ((unsigned long)(unsigned char)(ch3) << 24)) + typedef enum _WINED3DFORMAT { WINED3DFMT_UNKNOWN, @@ -254,21 +258,21 @@ typedef enum _WINED3DFORMAT WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_B8G8R8X8_UNORM, /* FOURCC formats. */ - WINED3DFMT_UYVY = 0x59565955, /* UYVY */ - WINED3DFMT_YUY2 = 0x32595559, /* YUY2 */ - WINED3DFMT_YV12 = 0x32315659, /* YV12 */ - WINED3DFMT_DXT1 = 0x31545844, /* DXT1 */ - WINED3DFMT_DXT2 = 0x32545844, /* DXT2 */ - WINED3DFMT_DXT3 = 0x33545844, /* DXT3 */ - WINED3DFMT_DXT4 = 0x34545844, /* DXT4 */ - WINED3DFMT_DXT5 = 0x35545844, /* DXT5 */ - WINED3DFMT_MULTI2_ARGB8 = 0x3154454d, /* MET1 */ - WINED3DFMT_G8R8_G8B8 = 0x42475247, /* GRGB */ - WINED3DFMT_R8G8_B8G8 = 0x47424752, /* RGBG */ - WINED3DFMT_ATI2N = 0x32495441, /* ATI2 */ - WINED3DFMT_INST = 0x54534e49, /* INST */ - WINED3DFMT_NVHU = 0x5548564e, /* NVHU */ - WINED3DFMT_NVHS = 0x5348564e, /* NVHS */ + WINED3DFMT_UYVY = WINEMAKEFOURCC('U','Y','V','Y'), + WINED3DFMT_YUY2 = WINEMAKEFOURCC('Y','U','Y','2'), + WINED3DFMT_YV12 = WINEMAKEFOURCC('Y','V','1','2'), + WINED3DFMT_DXT1 = WINEMAKEFOURCC('D','X','T','1'), + WINED3DFMT_DXT2 = WINEMAKEFOURCC('D','X','T','2'), + WINED3DFMT_DXT3 = WINEMAKEFOURCC('D','X','T','3'), + WINED3DFMT_DXT4 = WINEMAKEFOURCC('D','X','T','4'), + WINED3DFMT_DXT5 = WINEMAKEFOURCC('D','X','T','5'), + WINED3DFMT_MULTI2_ARGB8 = WINEMAKEFOURCC('M','E','T','1'), + WINED3DFMT_G8R8_G8B8 = WINEMAKEFOURCC('G','R','G','B'), + WINED3DFMT_R8G8_B8G8 = WINEMAKEFOURCC('R','G','B','G'), + WINED3DFMT_ATI2N = WINEMAKEFOURCC('A','T','I','2'), + WINED3DFMT_INST = WINEMAKEFOURCC('I','N','S','T'), + WINED3DFMT_NVHU = WINEMAKEFOURCC('N','V','H','U'), + WINED3DFMT_NVHS = WINEMAKEFOURCC('N','V','H','S'), WINED3DFMT_FORCE_DWORD = 0xffffffff } WINED3DFORMAT;

1 0

Rob Shearman : widl: Fix symbol was not declared and using plain integer as NULL pointer sparse warnings .
by Alexandre Julliard 22 Jan '10

22 Jan '10

Module: wine Branch: master Commit: 39b3a57b3dbdfe68582ae11321a5e1dc995c6907 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39b3a57b3dbdfe68582ae1132… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Jan 21 11:56:53 2010 +0000 widl: Fix symbol was not declared and using plain integer as NULL pointer sparse warnings. --- tools/widl/parser.h | 2 ++ tools/widl/parser.l | 2 -- tools/widl/typegen.c | 8 ++++---- tools/widl/widl.c | 39 +++++++++++++++++++-------------------- 4 files changed, 25 insertions(+), 26 deletions(-) diff --git a/tools/widl/parser.h b/tools/widl/parser.h index 71f08dc..1bcc3c1 100644 --- a/tools/widl/parser.h +++ b/tools/widl/parser.h @@ -45,4 +45,6 @@ void pop_import(void); int is_type(const char *name); +extern char *temp_name; + #endif diff --git a/tools/widl/parser.l b/tools/widl/parser.l index a72c454..0d231fc 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -64,8 +64,6 @@ double [0-9]+\.[0-9]+([eE][+-]?[0-9]+)* #include "parser.tab.h" -extern char *temp_name; - static void addcchar(char c); static char *get_buffered_cstring(void); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 68e9da1..c35020c 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -69,7 +69,7 @@ static unsigned int write_string_tfs(FILE *file, const attr_list_t *attrs, type_t *type, int toplevel_param, const char *name, unsigned int *typestring_offset); -const char *string_of_type(unsigned char type) +static const char *string_of_type(unsigned char type) { switch (type) { @@ -133,7 +133,7 @@ static void *get_aliaschain_attrp(const type_t *type, enum attr_type attr) return get_attrp(t->attrs, attr); else if (type_is_alias(t)) t = type_alias_get_aliasee(t); - else return 0; + else return NULL; } } @@ -391,7 +391,7 @@ unsigned char get_struct_fc(const type_t *type) return RPC_FC_STRUCT; } -unsigned char get_array_fc(const type_t *type) +static unsigned char get_array_fc(const type_t *type) { unsigned char fc; const expr_t *size_is; @@ -641,7 +641,7 @@ static type_t *get_user_type(const type_t *t, const char **pname) if (type_is_alias(t)) t = type_alias_get_aliasee(t); else - return 0; + return NULL; } } diff --git a/tools/widl/widl.c b/tools/widl/widl.c index a481c56..8c76c24 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -100,7 +100,7 @@ int parser_debug, yy_flex_debug; int pedantic = 0; int do_everything = 1; -int preprocess_only = 0; +static int preprocess_only = 0; int do_header = 0; int do_typelib = 0; int do_proxies = 0; @@ -108,7 +108,7 @@ int do_client = 0; int do_server = 0; int do_idfile = 0; int do_dlldata = 0; -int no_preprocess = 0; +static int no_preprocess = 0; int old_names = 0; int do_win32 = 1; int do_win64 = 1; @@ -127,16 +127,15 @@ char *client_name; char *client_token; char *server_name; char *server_token; -char *idfile_name; -char *idfile_token; +static char *idfile_name; +static char *idfile_token; char *temp_name; const char *prefix_client = ""; const char *prefix_server = ""; int line_number = 1; -FILE *header; -FILE *idfile; +static FILE *idfile; size_t pointer_size = 0; syskind_t typelib_kind = sizeof(void*) == 8 ? SYS_WIN64 : SYS_WIN32; @@ -160,18 +159,18 @@ enum { static const char short_options[] = "b:cC:d:D:EhH:I:m:NpP:sS:tT:uU:VW"; static const struct option long_options[] = { - { "dlldata", 1, 0, DLLDATA_OPTION }, - { "dlldata-only", 0, 0, DLLDATA_ONLY_OPTION }, - { "local-stubs", 1, 0, LOCAL_STUBS_OPTION }, - { "oldnames", 0, 0, OLDNAMES_OPTION }, - { "prefix-all", 1, 0, PREFIX_ALL_OPTION }, - { "prefix-client", 1, 0, PREFIX_CLIENT_OPTION }, - { "prefix-server", 1, 0, PREFIX_SERVER_OPTION }, - { "win32", 0, 0, WIN32_OPTION }, - { "win64", 0, 0, WIN64_OPTION }, - { "win32-align", 1, 0, WIN32_ALIGN_OPTION }, - { "win64-align", 1, 0, WIN64_ALIGN_OPTION }, - { 0, 0, 0, 0 } + { "dlldata", 1, NULL, DLLDATA_OPTION }, + { "dlldata-only", 0, NULL, DLLDATA_ONLY_OPTION }, + { "local-stubs", 1, NULL, LOCAL_STUBS_OPTION }, + { "oldnames", 0, NULL, OLDNAMES_OPTION }, + { "prefix-all", 1, NULL, PREFIX_ALL_OPTION }, + { "prefix-client", 1, NULL, PREFIX_CLIENT_OPTION }, + { "prefix-server", 1, NULL, PREFIX_SERVER_OPTION }, + { "win32", 0, NULL, WIN32_OPTION }, + { "win64", 0, NULL, WIN64_OPTION }, + { "win32-align", 1, NULL, WIN32_ALIGN_OPTION }, + { "win64-align", 1, NULL, WIN64_ALIGN_OPTION }, + { NULL, 0, NULL, 0 } }; static void rm_tempfile(void); @@ -648,8 +647,8 @@ int main(int argc,char *argv[]) if(debuglevel) { - setbuf(stdout,0); - setbuf(stderr,0); + setbuf(stdout, NULL); + setbuf(stderr, NULL); } parser_debug = debuglevel & DEBUGLEVEL_TRACE ? 1 : 0;

1 0

Andrew Eikum : wininet: Add Internet{Set, Query}Option tests, implement POLICY option.
by Alexandre Julliard 22 Jan '10

22 Jan '10

Module: wine Branch: master Commit: deca2e5c0ed1ec5eecae4426d871918841b03065 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deca2e5c0ed1ec5eecae4426d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jan 20 14:46:44 2010 -0600 wininet: Add Internet{Set,Query}Option tests, implement POLICY option. --- dlls/wininet/internet.c | 6 ++++++ dlls/wininet/tests/internet.c | 26 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 969c079..074bf79 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2170,6 +2170,8 @@ DWORD INET_QueryOption(DWORD option, void *buffer, DWORD *size, BOOL unicode) } case INTERNET_OPTION_USER_AGENT: return ERROR_INTERNET_INCORRECT_HANDLE_TYPE; + case INTERNET_OPTION_POLICY: + return ERROR_INVALID_PARAMETER; } FIXME("Stub for %d\n", option); @@ -2401,6 +2403,10 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, SetLastError(ERROR_INTERNET_INVALID_OPTION); ret = FALSE; break; + case INTERNET_OPTION_POLICY: + SetLastError(ERROR_INVALID_PARAMETER); + ret = FALSE; + break; default: FIXME("Option %d STUB\n",dwOption); SetLastError(ERROR_INTERNET_INVALID_OPTION); diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 622711a..8708878 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -824,6 +824,31 @@ static void test_PrivacyGetSetZonePreferenceW(void) ok(ret == 0, "expected ret == 0, got %u\n", ret); } +static void test_Option_Policy(void) +{ + HINTERNET hinet; + BOOL ret; + + hinet = InternetOpen(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(hinet != 0, "InternetOpen failed: 0x%08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = InternetSetOptionW(hinet, INTERNET_OPTION_POLICY, NULL, 0); + ok(ret == FALSE, "InternetSetOption should've failed\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError should've " + "given ERROR_INVALID_PARAMETER, gave: 0x%08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = InternetQueryOptionW(hinet, INTERNET_OPTION_POLICY, NULL, 0); + ok(ret == FALSE, "InternetQueryOption should've failed\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError should've " + "given ERROR_INVALID_PARAMETER, gave: 0x%08x\n", GetLastError()); + + ret = InternetCloseHandle(hinet); + ok(ret == TRUE, "InternetCloseHandle failed: 0x%08x\n", GetLastError()); +} + + /* ############################### */ START_TEST(internet) @@ -846,6 +871,7 @@ START_TEST(internet) test_complicated_cookie(); test_version(); test_null(); + test_Option_Policy(); if (!pInternetTimeFromSystemTimeA) win_skip("skipping the InternetTime tests\n");

1 0

Andrew Eikum : wininet: Convert PER_CONN_OPTION_LIST from A to W in InternetSetOptionA.
by Alexandre Julliard 22 Jan '10

22 Jan '10

Module: wine Branch: master Commit: 60bb3f8ec2ea8d782c0522981ef126e286f2a8d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60bb3f8ec2ea8d782c0522981… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jan 20 14:48:47 2010 -0600 wininet: Convert PER_CONN_OPTION_LIST from A to W in InternetSetOptionA. --- dlls/wininet/internet.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 79 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 074bf79..0580994 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2483,6 +2483,63 @@ BOOL WINAPI InternetSetOptionA(HINTERNET hInternet, DWORD dwOption, MultiByteToWideChar( CP_ACP, 0, lpBuffer, dwBufferLength, wbuffer, wlen ); break; + case INTERNET_OPTION_PER_CONNECTION_OPTION: { + int i; + INTERNET_PER_CONN_OPTION_LISTW *listW; + INTERNET_PER_CONN_OPTION_LISTA *listA = lpBuffer; + wlen = sizeof(INTERNET_PER_CONN_OPTION_LISTW); + wbuffer = HeapAlloc( GetProcessHeap(), 0, wlen ); + listW = wbuffer; + + listW->dwSize = sizeof(INTERNET_PER_CONN_OPTION_LISTW); + if (listA->pszConnection) + { + wlen = MultiByteToWideChar( CP_ACP, 0, listA->pszConnection, -1, NULL, 0 ); + listW->pszConnection = HeapAlloc( GetProcessHeap(), 0, wlen*sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, listA->pszConnection, -1, listW->pszConnection, wlen ); + } + else + listW->pszConnection = NULL; + listW->dwOptionCount = listA->dwOptionCount; + listW->dwOptionError = listA->dwOptionError; + listW->pOptions = HeapAlloc( GetProcessHeap(), 0, sizeof(INTERNET_PER_CONN_OPTIONW) * listA->dwOptionCount ); + + for (i = 0; i < listA->dwOptionCount; ++i) { + INTERNET_PER_CONN_OPTIONA *optA = listA->pOptions + i; + INTERNET_PER_CONN_OPTIONW *optW = listW->pOptions + i; + + optW->dwOption = optA->dwOption; + + switch (optA->dwOption) { + case INTERNET_PER_CONN_AUTOCONFIG_URL: + case INTERNET_PER_CONN_PROXY_BYPASS: + case INTERNET_PER_CONN_PROXY_SERVER: + case INTERNET_PER_CONN_AUTOCONFIG_SECONDARY_URL: + case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL: + if (optA->Value.pszValue) + { + wlen = MultiByteToWideChar( CP_ACP, 0, optA->Value.pszValue, -1, NULL, 0 ); + optW->Value.pszValue = HeapAlloc( GetProcessHeap(), 0, wlen*sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, optA->Value.pszValue, -1, optW->Value.pszValue, wlen ); + } + else + optW->Value.pszValue = NULL; + break; + case INTERNET_PER_CONN_AUTODISCOVERY_FLAGS: + case INTERNET_PER_CONN_FLAGS: + case INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS: + optW->Value.dwValue = optA->Value.dwValue; + break; + case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME: + optW->Value.ftValue = optA->Value.ftValue; + default: + WARN("Unknown PER_CONN dwOption: %d, guessing at conversion to Wide\n", optA->dwOption); + optW->Value.dwValue = optA->Value.dwValue; + break; + } + } + } + break; default: wbuffer = lpBuffer; wlen = dwBufferLength; @@ -2491,7 +2548,29 @@ BOOL WINAPI InternetSetOptionA(HINTERNET hInternet, DWORD dwOption, r = InternetSetOptionW(hInternet,dwOption, wbuffer, wlen); if( lpBuffer != wbuffer ) + { + if (dwOption == INTERNET_OPTION_PER_CONNECTION_OPTION) + { + INTERNET_PER_CONN_OPTION_LISTW *list = wbuffer; + int i; + for (i = 0; i < list->dwOptionCount; ++i) { + INTERNET_PER_CONN_OPTIONW *opt = list->pOptions + i; + switch (opt->dwOption) { + case INTERNET_PER_CONN_AUTOCONFIG_URL: + case INTERNET_PER_CONN_PROXY_BYPASS: + case INTERNET_PER_CONN_PROXY_SERVER: + case INTERNET_PER_CONN_AUTOCONFIG_SECONDARY_URL: + case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL: + HeapFree( GetProcessHeap(), 0, opt->Value.pszValue ); + break; + default: + break; + } + } + HeapFree( GetProcessHeap(), 0, list->pOptions ); + } HeapFree( GetProcessHeap(), 0, wbuffer ); + } return r; }

1 0