April 2009 - Wine-Commits - list.winehq.org

Alexandre Julliard : winecrt0: Disable the delay import destructor on Mac OS, it cannot be made to work.
by Alexandre Julliard April 2, 2009

April 2, 2009

Module: wine Branch: master Commit: b2d35c3620be73ca662e73fed49a280b405d1f1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2d35c3620be73ca662e73fed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 18:13:42 2009 +0200 winecrt0: Disable the delay import destructor on Mac OS, it cannot be made to work. --- dlls/winecrt0/delay_load.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winecrt0/delay_load.c b/dlls/winecrt0/delay_load.c index 5926770..ac257ba 100644 --- a/dlls/winecrt0/delay_load.c +++ b/dlls/winecrt0/delay_load.c @@ -52,7 +52,7 @@ FARPROC WINAPI DECLSPEC_HIDDEN __wine_spec_delay_load( unsigned int id ) return proc; } -#ifdef __GNUC__ +#if defined(__GNUC__) && !defined(__APPLE__) /* we can't support destructors properly on Mac OS */ static void free_delay_imports(void) __attribute__((destructor)); static void free_delay_imports(void) {

1 0

Alexandre Julliard : shell32: Add implementation of WOWShellExecute.
by Alexandre Julliard April 2, 2009

April 2, 2009

Module: wine Branch: master Commit: b1d96f6ffade16017a751f806b0c4345093458f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1d96f6ffade16017a751f806… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 18:19:42 2009 +0200 shell32: Add implementation of WOWShellExecute. The callback is probably not fully compatible, but apps are not supposed to use that function anyway. --- dlls/shell32/shell.c | 32 +++++--------------------------- dlls/shell32/shell32.spec | 2 +- dlls/shell32/shlexec.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 28 deletions(-) diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c index 67bdc01..db49c29 100644 --- a/dlls/shell32/shell.c +++ b/dlls/shell32/shell.c @@ -48,6 +48,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); +extern HINSTANCE WINAPI WOWShellExecute(HWND hWnd, LPCSTR lpOperation,LPCSTR lpFile, + LPCSTR lpParameters,LPCSTR lpDirectory, + INT iShowCmd, void *callback); typedef struct { /* structure for dropped files */ WORD wSize; @@ -600,31 +603,6 @@ HINSTANCE16 WINAPI ShellExecute16( HWND16 hWnd, LPCSTR lpOperation, LPCSTR lpFile, LPCSTR lpParameters, LPCSTR lpDirectory, INT16 iShowCmd ) { - SHELLEXECUTEINFOW seiW; - WCHAR *wVerb = NULL, *wFile = NULL, *wParameters = NULL, *wDirectory = NULL; - HANDLE hProcess = 0; - - seiW.lpVerb = lpOperation ? __SHCloneStrAtoW(&wVerb, lpOperation) : NULL; - seiW.lpFile = lpFile ? __SHCloneStrAtoW(&wFile, lpFile) : NULL; - seiW.lpParameters = lpParameters ? __SHCloneStrAtoW(&wParameters, lpParameters) : NULL; - seiW.lpDirectory = lpDirectory ? __SHCloneStrAtoW(&wDirectory, lpDirectory) : NULL; - - seiW.cbSize = sizeof(seiW); - seiW.fMask = 0; - seiW.hwnd = HWND_32(hWnd); - seiW.nShow = iShowCmd; - seiW.lpIDList = 0; - seiW.lpClass = 0; - seiW.hkeyClass = 0; - seiW.dwHotKey = 0; - seiW.hProcess = hProcess; - - SHELL_execute( &seiW, SHELL_Execute16 ); - - SHFree(wVerb); - SHFree(wFile); - SHFree(wParameters); - SHFree(wDirectory); - - return HINSTANCE_16(seiW.hInstApp); + return HINSTANCE_16( WOWShellExecute( HWND_32(hWnd), lpOperation, lpFile, lpParameters, + lpDirectory, iShowCmd, SHELL_Execute16 )); } diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index b64d8ef..5713c49 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -438,4 +438,4 @@ @ stdcall StrStrIA(str str) shlwapi.StrStrIA @ stdcall StrStrIW(wstr wstr) shlwapi.StrStrIW @ stdcall StrStrW(wstr wstr) shlwapi.StrStrW -@ stub WOWShellExecute +@ stdcall WOWShellExecute(long str str str str long ptr) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 67815ca..3be5962 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1956,6 +1956,42 @@ HINSTANCE WINAPI ShellExecuteW(HWND hwnd, LPCWSTR lpOperation, LPCWSTR lpFile, } /************************************************************************* + * WOWShellExecute [SHELL32.@] + * + * FIXME: the callback function most likely doesn't work the same way on Windows. + */ +HINSTANCE WINAPI WOWShellExecute(HWND hWnd, LPCSTR lpOperation,LPCSTR lpFile, + LPCSTR lpParameters,LPCSTR lpDirectory, INT iShowCmd, void *callback) +{ + SHELLEXECUTEINFOW seiW; + WCHAR *wVerb = NULL, *wFile = NULL, *wParameters = NULL, *wDirectory = NULL; + HANDLE hProcess = 0; + + seiW.lpVerb = lpOperation ? __SHCloneStrAtoW(&wVerb, lpOperation) : NULL; + seiW.lpFile = lpFile ? __SHCloneStrAtoW(&wFile, lpFile) : NULL; + seiW.lpParameters = lpParameters ? __SHCloneStrAtoW(&wParameters, lpParameters) : NULL; + seiW.lpDirectory = lpDirectory ? __SHCloneStrAtoW(&wDirectory, lpDirectory) : NULL; + + seiW.cbSize = sizeof(seiW); + seiW.fMask = 0; + seiW.hwnd = hWnd; + seiW.nShow = iShowCmd; + seiW.lpIDList = 0; + seiW.lpClass = 0; + seiW.hkeyClass = 0; + seiW.dwHotKey = 0; + seiW.hProcess = hProcess; + + SHELL_execute( &seiW, callback ); + + SHFree(wVerb); + SHFree(wFile); + SHFree(wParameters); + SHFree(wDirectory); + return seiW.hInstApp; +} + +/************************************************************************* * OpenAs_RunDLLA [SHELL32.@] */ void WINAPI OpenAs_RunDLLA(HWND hwnd, HINSTANCE hinst, LPCSTR cmdline, int cmdshow)

1 0

Alexandre Julliard : shell32: Make shell. dll into a stand-alone 16-bit module.
by Alexandre Julliard April 2, 2009

April 2, 2009

Module: wine Branch: master Commit: 129ba5ade016a470150ce11ed8f6383bb1103772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=129ba5ade016a470150ce11ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 18:20:13 2009 +0200 shell32: Make shell.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 9 ++++++++ configure.ac | 1 + dlls/Makefile.in | 4 --- dlls/shell.dll16/Makefile.in | 19 ++++++++++++++++++ dlls/{shell32 => shell.dll16}/shell.c | 10 +++++++- .../shell.spec => shell.dll16/shell.dll16.spec} | 0 .../version16.rc => shell.dll16/version.rc} | 0 dlls/shell32/Makefile.in | 12 ----------- dlls/shell32/shell32_main.h | 21 -------------------- dlls/shell32/shellreg.c | 1 - dlls/shell32/shlexec.c | 1 - 12 files changed, 37 insertions(+), 42 deletions(-) diff --git a/.gitignore b/.gitignore index 8120c55..93ff5f2 100644 --- a/.gitignore +++ b/.gitignore @@ -84,7 +84,6 @@ dlls/rpcrt4/tests/server_c.c dlls/rpcrt4/tests/server_s.c dlls/setupx.dll16 dlls/shdocvw/shdocvw_v1.tlb -dlls/shell.dll16 dlls/stdole2.tlb/std_ole_v2.tlb dlls/stdole32.tlb/std_ole_v1.tlb dlls/system.drv16 diff --git a/configure b/configure index b45a122..5468a78 100755 --- a/configure +++ b/configure @@ -26853,6 +26853,14 @@ dlls/shdocvw/tests/Makefile: dlls/shdocvw/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/shdocvw/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/shell.dll16/Makefile" +test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + shell.dll16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/shell.dll16/Makefile: dlls/shell.dll16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/shell.dll16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/shell32/Makefile" test "x$enable_shell32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ shell32" @@ -29204,6 +29212,7 @@ do "dlls/shdoclc/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/shdoclc/Makefile" ;; "dlls/shdocvw/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/shdocvw/Makefile" ;; "dlls/shdocvw/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/shdocvw/tests/Makefile" ;; + "dlls/shell.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/shell.dll16/Makefile" ;; "dlls/shell32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/shell32/Makefile" ;; "dlls/shell32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/shell32/tests/Makefile" ;; "dlls/shfolder/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/shfolder/Makefile" ;; diff --git a/configure.ac b/configure.ac index a243045..e3d4b63 100644 --- a/configure.ac +++ b/configure.ac @@ -2188,6 +2188,7 @@ WINE_CONFIG_MAKEFILE([dlls/sfc_os/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL WINE_CONFIG_MAKEFILE([dlls/shdoclc/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/shdocvw/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/shdocvw/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) +WINE_CONFIG_MAKEFILE([dlls/shell.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/shell32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/shell32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/shfolder/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index badffb6..498cb65 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -25,7 +25,6 @@ WIN16_FILES = \ mmsystem.dll16 \ msvideo.dll16 \ setupx.dll16 \ - shell.dll16 \ system.drv16 \ toolhelp.dll16 \ user.exe16 \ @@ -58,9 +57,6 @@ msvideo.dll16: setupx.dll16: echo "setupapi.dll" >$@ -shell.dll16: - echo "shell32.dll" >$@ - ddeml.dll16 user.exe16: echo "user32.dll" >$@ diff --git a/dlls/shell.dll16/Makefile.in b/dlls/shell.dll16/Makefile.in new file mode 100644 index 0000000..07cf620 --- /dev/null +++ b/dlls/shell.dll16/Makefile.in @@ -0,0 +1,19 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = shell.dll16 +IMPORTS = shell32 user32 advapi32 kernel32 + +EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,shell32.dll +EXTRARCFLAGS = -O res16 + +SPEC_SRCS = shell.dll16.spec + +C_SRCS = shell.c + +RC_SRCS = version.rc + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/shell32/shell.c b/dlls/shell.dll16/shell.c similarity index 98% rename from dlls/shell32/shell.c rename to dlls/shell.dll16/shell.c index db49c29..9964b60 100644 --- a/dlls/shell32/shell.c +++ b/dlls/shell.dll16/shell.c @@ -42,7 +42,6 @@ #include "shlwapi.h" #include "wine/winbase16.h" -#include "shell32_main.h" #include "wine/debug.h" @@ -52,6 +51,11 @@ extern HINSTANCE WINAPI WOWShellExecute(HWND hWnd, LPCSTR lpOperation,LPCSTR lpF LPCSTR lpParameters,LPCSTR lpDirectory, INT iShowCmd, void *callback); +#define HICON_16(h32) (LOWORD(h32)) +#define HICON_32(h16) ((HICON)(ULONG_PTR)(h16)) +#define HINSTANCE_32(h16) ((HINSTANCE)(ULONG_PTR)(h16)) +#define HINSTANCE_16(h32) (LOWORD(h32)) + typedef struct { /* structure for dropped files */ WORD wSize; POINT16 ptMousePos; @@ -170,7 +174,9 @@ HINSTANCE16 WINAPI FindExecutable16( LPCSTR lpFile, LPCSTR lpDirectory, */ BOOL16 WINAPI AboutDlgProc16( HWND16 hWnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam ) -{ return (BOOL16)AboutDlgProc( HWND_32(hWnd), msg, wParam, lParam ); +{ + FIXME( "stub\n" ); + return FALSE; } diff --git a/dlls/shell32/shell.spec b/dlls/shell.dll16/shell.dll16.spec similarity index 100% rename from dlls/shell32/shell.spec rename to dlls/shell.dll16/shell.dll16.spec diff --git a/dlls/shell32/version16.rc b/dlls/shell.dll16/version.rc similarity index 100% rename from dlls/shell32/version16.rc rename to dlls/shell.dll16/version.rc diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index d416eec..6900d31 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -64,22 +64,10 @@ SVG_SRCS = \ mydocs.svg \ trash_file.svg -C_SRCS16 = shell.c -RC_SRCS16 = version16.rc -SPEC_SRCS16 = shell.spec - EXTRA_OBJS = authors.o @MAKE_DLL_RULES@ -# Special rules for 16-bit resource files - -version16.res: version16.rc - $(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/version16.rc - -shell.spec.o: shell.spec version16.res - $(WINEBUILD) $(WINEBUILDFLAGS) --dll -o $@ --main-module $(MODULE) --res version16.res --export $(SRCDIR)/shell.spec - authors.c: $(TOPSRCDIR)/AUTHORS (LC_ALL=C; export LC_ALL; echo 'const char * const SHELL_Authors[] = {' && \ sed -e '1,2d' -e 's/$.*$/ \"\1\",/' $(TOPSRCDIR)/AUTHORS && \ diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 973e526..eea2e18 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -35,7 +35,6 @@ #include "undocshell.h" #include "shlobj.h" #include "shellapi.h" -#include "wine/windef16.h" #include "wine/unicode.h" /******************************************* @@ -153,20 +152,6 @@ void FreeChangeNotifications(void); BOOL SHELL_ConfirmYesNoW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir); -/* 16-bit functions */ -void WINAPI DragAcceptFiles16(HWND16 hWnd, BOOL16 b); -UINT16 WINAPI DragQueryFile16(HDROP16 hDrop, WORD wFile, LPSTR lpszFile, WORD wLength); -void WINAPI DragFinish16(HDROP16 h); -BOOL16 WINAPI DragQueryPoint16(HDROP16 hDrop, POINT16 *p); -HINSTANCE16 WINAPI ShellExecute16(HWND16,LPCSTR,LPCSTR,LPCSTR,LPCSTR,INT16); -HICON16 WINAPI ExtractIcon16(HINSTANCE16,LPCSTR,UINT16); -HICON16 WINAPI ExtractAssociatedIcon16(HINSTANCE16,LPSTR,LPWORD); -HICON16 WINAPI ExtractIconEx16 ( LPCSTR, INT16, HICON16 *, HICON16 *, UINT16 ); -HINSTANCE16 WINAPI FindExecutable16(LPCSTR,LPCSTR,LPSTR); -HGLOBAL16 WINAPI InternalExtractIcon16(HINSTANCE16,LPCSTR,UINT16,WORD); -BOOL16 WINAPI ShellAbout16(HWND16,LPCSTR,LPCSTR,HICON16); -BOOL16 WINAPI AboutDlgProc16(HWND16,UINT16,WPARAM16,LPARAM); - static inline BOOL SHELL_OsIsUnicode(void) { /* if high-bit of version is 0, we are emulating NT */ @@ -205,12 +190,6 @@ static inline WCHAR * __SHCloneStrAtoW(WCHAR ** target, const char * source) return *target; } -/* handle conversions */ -#define HICON_16(h32) (LOWORD(h32)) -#define HICON_32(h16) ((HICON)(ULONG_PTR)(h16)) -#define HINSTANCE_32(h16) ((HINSTANCE)(ULONG_PTR)(h16)) -#define HINSTANCE_16(h32) (LOWORD(h32)) - typedef UINT_PTR (*SHELL_ExecuteW32)(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, const SHELLEXECUTEINFOW *sei, LPSHELLEXECUTEINFOW sei_out); diff --git a/dlls/shell32/shellreg.c b/dlls/shell32/shellreg.c index fe87e96..37f3d9e 100644 --- a/dlls/shell32/shellreg.c +++ b/dlls/shell32/shellreg.c @@ -33,7 +33,6 @@ #include "winreg.h" #include "undocshell.h" -#include "wine/winbase16.h" #include "wine/debug.h" diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 3be5962..201791f 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -42,7 +42,6 @@ #include "shlwapi.h" #include "ddeml.h" -#include "wine/winbase16.h" #include "shell32_main.h" #include "pidl.h" #include "shresdef.h"

1 0

Alexandre Julliard : kernel32: Set argv[0] to the full path of the binary when starting from Unix.
by Alexandre Julliard April 2, 2009

April 2, 2009

Module: wine Branch: master Commit: fc87182d191a2b3daabf260d1ad4b12b157e3cd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc87182d191a2b3daabf260d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 2 12:59:32 2009 +0200 kernel32: Set argv[0] to the full path of the binary when starting from Unix. --- dlls/kernel32/process.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 286f0ab..624d4de 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -599,6 +599,30 @@ static void set_library_wargv( char **argv ) /*********************************************************************** + * update_library_argv0 + * + * Update the argv[0] global variable with the binary we have found. + */ +static void update_library_argv0( const WCHAR *argv0 ) +{ + DWORD len = strlenW( argv0 ); + + if (len > strlenW( __wine_main_wargv[0] )) + { + __wine_main_wargv[0] = RtlAllocateHeap( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ); + } + strcpyW( __wine_main_wargv[0], argv0 ); + + len = WideCharToMultiByte( CP_ACP, 0, argv0, -1, NULL, 0, NULL, NULL ); + if (len > strlen( __wine_main_argv[0] ) + 1) + { + __wine_main_argv[0] = RtlAllocateHeap( GetProcessHeap(), 0, len ); + } + WideCharToMultiByte( CP_ACP, 0, argv0, -1, __wine_main_argv[0], len, NULL, NULL ); +} + + +/*********************************************************************** * build_command_line * * Build the command line of a process from the argv array. @@ -1024,6 +1048,7 @@ void CDECL __wine_kernel_init(void) MESSAGE( "wine: cannot find '%s'\n", __wine_main_argv[0] ); ExitProcess( GetLastError() ); } + update_library_argv0( main_exe_name ); if (!build_command_line( __wine_main_wargv )) goto error; boot_event = start_wineboot(); }

1 0

Alexandre Julliard : oleaut32: Don't use 16-bit headers.
by Alexandre Julliard April 2, 2009

April 2, 2009

Module: wine Branch: master Commit: 0ed1041c63be8bf443da1947185baee931e05df5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ed1041c63be8bf443da19471… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 18:20:21 2009 +0200 oleaut32: Don't use 16-bit headers. --- dlls/oleaut32/olepicture.c | 3 +-- dlls/oleaut32/typelib.c | 21 ++++++++++++++++++++- dlls/oleaut32/typelib.h | 1 - 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 03119f2..adaad97 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -81,8 +81,7 @@ #include "urlmon.h" #include "wine/debug.h" #include "wine/unicode.h" - -#include "wine/wingdi16.h" +#include "wine/library.h" #include "ungif.h" diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index d1a719b..75a30d2 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -66,7 +66,6 @@ #include "winuser.h" #include "lzexpand.h" -#include "wine/winbase16.h" #include "wine/unicode.h" #include "objbase.h" #include "typelib.h" @@ -77,6 +76,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DECLARE_DEBUG_CHANNEL(typelib); +typedef struct +{ + WORD offset; + WORD length; + WORD flags; + WORD id; + WORD handle; + WORD usage; +} NE_NAMEINFO; + +typedef struct +{ + WORD type_id; /* Type identifier */ + WORD count; /* Number of resources of this type */ + DWORD resloader; /* SetResourceHandler() */ + /* + * Name info array. + */ +} NE_TYPEINFO; + static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt); static HRESULT TLB_AllocAndInitVarDesc(const VARDESC *src, VARDESC **dest_ptr); diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 821981f..1fe8ecf 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -26,7 +26,6 @@ #include "windef.h" #include "winbase.h" #include "oleauto.h" -#include "wine/windef16.h" #define HELPDLLFLAG (0x0100) #define DO_NOT_SEEK (-1)

1 0

Henri Verbeet : wined3d: Use a more reasonable name for "SHADER_OPCODE_ARG" .
by Alexandre Julliard April 1, 2009

April 1, 2009

Module: wine Branch: master Commit: c3a01b315ee165181cb51a7e461e0b200993c151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3a01b315ee165181cb51a7e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 1 12:23:01 2009 +0200 wined3d: Use a more reasonable name for "SHADER_OPCODE_ARG". --- dlls/wined3d/arb_program_shader.c | 452 ++++++++++---------- dlls/wined3d/baseshader.c | 28 +- dlls/wined3d/glsl_shader.c | 857 +++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 8 +- 4 files changed, 688 insertions(+), 657 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c3a01b315ee165181cb51…

1 0

Henri Verbeet : wined3d: Avoid a forward declaration.
by Alexandre Julliard April 1, 2009

April 1, 2009

Module: wine Branch: master Commit: de4e8cf0f9770a24cfcf0ba9170f212daadd2de5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de4e8cf0f9770a24cfcf0ba91… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 1 12:23:01 2009 +0200 wined3d: Avoid a forward declaration. --- dlls/wined3d/wined3d_private.h | 144 ++++++++++++++++++++-------------------- 1 files changed, 73 insertions(+), 71 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index abd37e9..779df72 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -295,7 +295,20 @@ typedef struct wined3d_settings_s { extern wined3d_settings_t wined3d_settings; /* Shader backends */ -struct SHADER_OPCODE_ARG; + +/* TODO: Make this dynamic, based on shader limits ? */ +#define MAX_ATTRIBS 16 +#define MAX_REG_ADDR 1 +#define MAX_REG_TEMP 32 +#define MAX_REG_TEXCRD 8 +#define MAX_REG_INPUT 12 +#define MAX_REG_OUTPUT 12 +#define MAX_CONST_I 16 +#define MAX_CONST_B 16 + +/* FIXME: This needs to go up to 2048 for + * Shader model 3 according to msdn (and for software shaders) */ +#define MAX_LABELS 16 #define SHADER_PGMSIZE 65535 typedef struct SHADER_BUFFER { @@ -393,6 +406,65 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_TABLE_SIZE }; +typedef struct semantic +{ + DWORD usage; + DWORD reg; +} semantic; + +typedef struct shader_reg_maps +{ + DWORD shader_version; + char texcoord[MAX_REG_TEXCRD]; /* pixel < 3.0 */ + char temporary[MAX_REG_TEMP]; /* pixel, vertex */ + char address[MAX_REG_ADDR]; /* vertex */ + char packed_input[MAX_REG_INPUT]; /* pshader >= 3.0 */ + char packed_output[MAX_REG_OUTPUT]; /* vertex >= 3.0 */ + char attributes[MAX_ATTRIBS]; /* vertex */ + char labels[MAX_LABELS]; /* pixel, vertex */ + DWORD texcoord_mask[MAX_REG_TEXCRD]; /* vertex < 3.0 */ + + /* Sampler usage tokens + * Use 0 as default (bit 31 is always 1 on a valid token) */ + DWORD samplers[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; + BOOL bumpmat[MAX_TEXTURES], luminanceparams[MAX_TEXTURES]; + char usesnrm, vpos, usesdsy; + char usesrelconstF; + + /* Whether or not loops are used in this shader, and nesting depth */ + unsigned loop_depth; + + /* Whether or not this shader uses fog */ + char fog; + +} shader_reg_maps; + +typedef struct SHADER_OPCODE +{ + unsigned int opcode; + const char *name; + char dst_token; + CONST UINT num_params; + enum WINED3D_SHADER_INSTRUCTION_HANDLER handler_idx; + DWORD min_version; + DWORD max_version; +} SHADER_OPCODE; + +typedef struct SHADER_OPCODE_ARG +{ + IWineD3DBaseShader *shader; + const shader_reg_maps *reg_maps; + CONST SHADER_OPCODE *opcode; + DWORD flags; + BOOL coissue; + DWORD dst; + DWORD dst_addr; + DWORD predicate; + DWORD src[4]; + DWORD src_addr[4]; + SHADER_BUFFER *buffer; +} SHADER_OPCODE_ARG; + typedef void (*SHADER_HANDLER)(const struct SHADER_OPCODE_ARG *); struct shader_caps { @@ -457,8 +529,6 @@ struct ps_compile_args { in D3D10 (unconditional NP2 support mandatory). */ }; -#define MAX_ATTRIBS 16 - enum fog_src_type { VS_FOG_Z = 0, VS_FOG_COORD = 1 @@ -2166,56 +2236,12 @@ BOOL getDepthStencilBits(const struct GlPixelFormatDesc *format_desc, short *dep void multiply_matrix(WINED3DMATRIX *dest, const WINED3DMATRIX *src1, const WINED3DMATRIX *src2); UINT wined3d_log2i(UINT32 x); -/* TODO: Make this dynamic, based on shader limits ? */ -#define MAX_REG_ADDR 1 -#define MAX_REG_TEMP 32 -#define MAX_REG_TEXCRD 8 -#define MAX_REG_INPUT 12 -#define MAX_REG_OUTPUT 12 -#define MAX_CONST_I 16 -#define MAX_CONST_B 16 - -/* FIXME: This needs to go up to 2048 for - * Shader model 3 according to msdn (and for software shaders) */ -#define MAX_LABELS 16 - -typedef struct semantic { - DWORD usage; - DWORD reg; -} semantic; - typedef struct local_constant { struct list entry; unsigned int idx; DWORD value[4]; } local_constant; -typedef struct shader_reg_maps { - DWORD shader_version; - char texcoord[MAX_REG_TEXCRD]; /* pixel < 3.0 */ - char temporary[MAX_REG_TEMP]; /* pixel, vertex */ - char address[MAX_REG_ADDR]; /* vertex */ - char packed_input[MAX_REG_INPUT]; /* pshader >= 3.0 */ - char packed_output[MAX_REG_OUTPUT]; /* vertex >= 3.0 */ - char attributes[MAX_ATTRIBS]; /* vertex */ - char labels[MAX_LABELS]; /* pixel, vertex */ - DWORD texcoord_mask[MAX_REG_TEXCRD]; /* vertex < 3.0 */ - - /* Sampler usage tokens - * Use 0 as default (bit 31 is always 1 on a valid token) */ - DWORD samplers[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; - BOOL bumpmat[MAX_TEXTURES], luminanceparams[MAX_TEXTURES]; - char usesnrm, vpos, usesdsy; - char usesrelconstF; - - /* Whether or not loops are used in this shader, and nesting depth */ - unsigned loop_depth; - - /* Whether or not this shader uses fog */ - char fog; - -} shader_reg_maps; - /* Undocumented opcode controls */ #define INST_CONTROLS_SHIFT 16 #define INST_CONTROLS_MASK 0x00ff0000 @@ -2229,30 +2255,6 @@ typedef enum COMPARISON_TYPE { COMPARISON_LE = 6 } COMPARISON_TYPE; -typedef struct SHADER_OPCODE { - unsigned int opcode; - const char* name; - char dst_token; - CONST UINT num_params; - enum WINED3D_SHADER_INSTRUCTION_HANDLER handler_idx; - DWORD min_version; - DWORD max_version; -} SHADER_OPCODE; - -typedef struct SHADER_OPCODE_ARG { - IWineD3DBaseShader* shader; - const shader_reg_maps *reg_maps; - CONST SHADER_OPCODE* opcode; - DWORD flags; - BOOL coissue; - DWORD dst; - DWORD dst_addr; - DWORD predicate; - DWORD src[4]; - DWORD src_addr[4]; - SHADER_BUFFER* buffer; -} SHADER_OPCODE_ARG; - typedef struct SHADER_LIMITS { unsigned int temporary; unsigned int texcoord;

1 0

Huw Davies : ole32/tests: Set tymed in GetData and AddRef the interfaces ( ReleaseStgMedium releases them even if pUnkForRelease is non-NULL).
by Alexandre Julliard April 1, 2009

April 1, 2009

Module: wine Branch: master Commit: 126ec0181f0f2c4232317562a5eae5b7c401f3c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=126ec0181f0f2c4232317562a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 31 14:41:11 2009 +0100 ole32/tests: Set tymed in GetData and AddRef the interfaces (ReleaseStgMedium releases them even if pUnkForRelease is non-NULL). --- dlls/ole32/tests/clipboard.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 1918b2c..88b3ba6 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -245,11 +245,22 @@ static HRESULT WINAPI DataObjectImpl_GetData(IDataObject* iface, FORMATETC *pfor IUnknown_AddRef(pmedium->pUnkForRelease); if(pformatetc->cfFormat == CF_TEXT || pformatetc->cfFormat == cf_global) + { + pmedium->tymed = TYMED_HGLOBAL; U(*pmedium).hGlobal = This->text; + } else if(pformatetc->cfFormat == cf_stream) + { + pmedium->tymed = TYMED_ISTREAM; + IStream_AddRef(This->stm); U(*pmedium).pstm = This->stm; + } else if(pformatetc->cfFormat == cf_storage) + { + pmedium->tymed = TYMED_ISTORAGE; + IStorage_AddRef(This->stg); U(*pmedium).pstg = This->stg; + } return S_OK; } }

1 0

Ge van Geldorp : mshtml/tests: Fix tests on Windows.
by Alexandre Julliard April 1, 2009

April 1, 2009

Module: wine Branch: master Commit: af5ce0d24956be1c6026189a75749fe685303bc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af5ce0d24956be1c6026189a7… Author: Ge van Geldorp <ge(a)gse.nl> Date: Wed Apr 1 12:31:18 2009 +0200 mshtml/tests: Fix tests on Windows. --- dlls/mshtml/tests/htmldoc.c | 28 +++++++++++++++++++++++----- 1 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 642087d..45fc00c 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -103,6 +103,7 @@ DEFINE_EXPECT(Exec_SETDOWNLOADSTATE_1); DEFINE_EXPECT(Exec_ShellDocView_37); DEFINE_EXPECT(Exec_ShellDocView_84); DEFINE_EXPECT(Exec_ShellDocView_103); +DEFINE_EXPECT(Exec_ShellDocView_105); DEFINE_EXPECT(Exec_UPDATECOMMANDS); DEFINE_EXPECT(Exec_SETTITLE); DEFINE_EXPECT(Exec_HTTPEQUIV); @@ -149,7 +150,7 @@ static BOOL expect_LockContainer_fLock; static BOOL expect_InPlaceUIWindow_SetActiveObject_active = TRUE; static BOOL ipsex; static BOOL set_clientsite = FALSE, container_locked = FALSE; -static BOOL readystate_set_loading = FALSE, load_from_stream; +static BOOL readystate_set_loading = FALSE, readystate_set_interactive = FALSE, load_from_stream; static BOOL editmode = FALSE, show_failed; static int stream_read, protocol_read; static enum load_state_t { @@ -648,9 +649,15 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D switch(dispID) { case DISPID_READYSTATE: CHECK_EXPECT2(OnChanged_READYSTATE); - test_MSHTML_QueryStatus(NULL, OLECMDF_SUPPORTED - | (editmode && (load_state == LD_INTERACTIVE || load_state == LD_COMPLETE) - ? OLECMDF_ENABLED : 0)); + + if(readystate_set_interactive) { + readystate_set_interactive = FALSE; + load_state = LD_INTERACTIVE; + } + else + test_MSHTML_QueryStatus(NULL, OLECMDF_SUPPORTED + | (editmode && (load_state == LD_INTERACTIVE || load_state == LD_COMPLETE) + ? OLECMDF_ENABLED : 0)); if(readystate_set_loading) { readystate_set_loading = FALSE; @@ -663,7 +670,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D CHECK_EXPECT(OnChanged_1005); if(!editmode) test_readyState(NULL); - load_state = LD_INTERACTIVE; + readystate_set_interactive = (load_state != LD_INTERACTIVE); return S_OK; } @@ -2138,6 +2145,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID break; case 1: CHECK_EXPECT(Exec_SETDOWNLOADSTATE_1); + readystate_set_interactive = (load_state != LD_INTERACTIVE); break; default: ok(0, "unexpevted V_I4(pvaIn)=%d\n", V_I4(pvaIn)); @@ -2206,6 +2214,14 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID return E_NOTIMPL; + case 105: + CHECK_EXPECT2(Exec_ShellDocView_105); + + ok(pvaIn != NULL, "pvaIn == NULL\n"); + ok(pvaOut == NULL, "pvaOut != NULL\n"); + + return E_NOTIMPL; + default: ok(0, "unexpected command %d\n", nCmdID); return E_FAIL; @@ -2750,6 +2766,7 @@ static void test_download(BOOL verb_done, BOOL css_dwl, BOOL css_try_dwl) SET_EXPECT(Exec_SETPROGRESSPOS); SET_EXPECT(Exec_SETDOWNLOADSTATE_0); SET_EXPECT(Exec_ShellDocView_103); + SET_EXPECT(Exec_ShellDocView_105); SET_EXPECT(Exec_MSHTML_PARSECOMPLETE); SET_EXPECT(Exec_HTTPEQUIV_DONE); SET_EXPECT(SetStatusText); @@ -2802,6 +2819,7 @@ static void test_download(BOOL verb_done, BOOL css_dwl, BOOL css_try_dwl) CHECK_CALLED(Exec_SETPROGRESSPOS); CHECK_CALLED(Exec_SETDOWNLOADSTATE_0); SET_CALLED(Exec_ShellDocView_103); + SET_CALLED(Exec_ShellDocView_105); CHECK_CALLED(Exec_MSHTML_PARSECOMPLETE); CHECK_CALLED(Exec_HTTPEQUIV_DONE); SET_CALLED(SetStatusText);

1 0

Huw Davies : ole32: Move the embed source hack to a separate function.
by Alexandre Julliard April 1, 2009

April 1, 2009

Module: wine Branch: master Commit: f2ba37e5b95a5a6d02ad13d1c9d344a49c9a5b63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2ba37e5b95a5a6d02ad13d1c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 31 16:58:57 2009 +0100 ole32: Move the embed source hack to a separate function. --- dlls/ole32/clipboard.c | 221 +++++++++++++++++++++++++++--------------------- 1 files changed, 124 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f2ba37e5b95a5a6d02ad1…

1 0