wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Alexandre Julliard : gdi32: Make gdi.exe into a stand-alone 16-bit module.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 4edcf1caa52a09fffaf032a35ffd129259084096 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4edcf1caa52a09fffaf032a35… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 21:47:30 2009 +0100 gdi32: Make gdi.exe into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 9 ++++++++ configure.ac | 1 + dlls/Makefile.in | 4 --- dlls/gdi.exe16/Makefile.in | 22 ++++++++++++++++++++ dlls/{gdi32/bidi16.c => gdi.exe16/bidi.c} | 0 dlls/{gdi32 => gdi.exe16}/env.c | 0 dlls/{gdi32/gdi16.c => gdi.exe16/gdi.c} | 0 .../gdi.exe.spec => gdi.exe16/gdi.exe16.spec} | 0 dlls/{gdi32/metafile16.c => gdi.exe16/metafile.c} | 0 dlls/{gdi32/printdrv16.c => gdi.exe16/printdrv.c} | 1 - dlls/{gdi32/version16.rc => gdi.exe16/version.rc} | 0 dlls/gdi32/Makefile.in | 18 ---------------- 13 files changed, 32 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index ade0783..3cae649 100644 --- a/.gitignore +++ b/.gitignore @@ -45,7 +45,6 @@ dlls/advapi32/svcctl.h dlls/advapi32/svcctl_c.c dlls/atl/atliface.h dlls/dxdiagn/fil_data.h -dlls/gdi.exe16 dlls/jscript/jsglobal.tlb dlls/jscript/parser.tab.c dlls/jscript/parser.tab.h diff --git a/configure b/configure index 275a1ef..4f52528 100755 --- a/configure +++ b/configure @@ -14897,6 +14897,14 @@ dlls/fwpuclnt/Makefile: dlls/fwpuclnt/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/fwpuclnt/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/gdi.exe16/Makefile" +test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + gdi.exe16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/gdi.exe16/Makefile: dlls/gdi.exe16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/gdi.exe16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/gdi32/Makefile" test "x$enable_gdi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ gdi32" @@ -18947,6 +18955,7 @@ do "dlls/fusion/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/fusion/Makefile" ;; "dlls/fusion/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/fusion/tests/Makefile" ;; "dlls/fwpuclnt/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/fwpuclnt/Makefile" ;; + "dlls/gdi.exe16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdi.exe16/Makefile" ;; "dlls/gdi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdi32/Makefile" ;; "dlls/gdi32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdi32/tests/Makefile" ;; "dlls/gdiplus/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdiplus/Makefile" ;; diff --git a/configure.ac b/configure.ac index 6e4d892..e5ff544 100644 --- a/configure.ac +++ b/configure.ac @@ -2250,6 +2250,7 @@ WINE_CONFIG_MAKEFILE([dlls/fltlib/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL WINE_CONFIG_MAKEFILE([dlls/fusion/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/fusion/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/fwpuclnt/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/gdi.exe16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/gdi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/gdi32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/gdiplus/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 5150da9..092986e 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -18,7 +18,6 @@ DOCSUBDIRS = $(DLLSUBDIRS) # 16-bit dlls WIN16_FILES = \ - gdi.exe16 \ krnl386.exe16 \ user.exe16 \ wprocs.dll16 @@ -31,9 +30,6 @@ all: $(BUILDSUBDIRS) @WIN16_FILES@ # Placeholders for 16-bit libraries -gdi.exe16: - echo "gdi32.dll" >$@ - krnl386.exe16: echo "kernel32.dll" >$@ diff --git a/dlls/gdi.exe16/Makefile.in b/dlls/gdi.exe16/Makefile.in new file mode 100644 index 0000000..ab845a5 --- /dev/null +++ b/dlls/gdi.exe16/Makefile.in @@ -0,0 +1,22 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = gdi.exe16 +IMPORTS = user32 advapi32 gdi32 kernel32 + +EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,gdi32.dll,--heap,65520 +EXTRARCFLAGS = -O res16 + +C_SRCS = \ + bidi.c \ + env.c \ + gdi.c \ + metafile.c \ + printdrv.c + +RC_SRCS = version.rc + +@MAKE_DLL_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/gdi32/bidi16.c b/dlls/gdi.exe16/bidi.c similarity index 100% rename from dlls/gdi32/bidi16.c rename to dlls/gdi.exe16/bidi.c diff --git a/dlls/gdi32/env.c b/dlls/gdi.exe16/env.c similarity index 100% rename from dlls/gdi32/env.c rename to dlls/gdi.exe16/env.c diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi.exe16/gdi.c similarity index 100% rename from dlls/gdi32/gdi16.c rename to dlls/gdi.exe16/gdi.c diff --git a/dlls/gdi32/gdi.exe.spec b/dlls/gdi.exe16/gdi.exe16.spec similarity index 100% rename from dlls/gdi32/gdi.exe.spec rename to dlls/gdi.exe16/gdi.exe16.spec diff --git a/dlls/gdi32/metafile16.c b/dlls/gdi.exe16/metafile.c similarity index 100% rename from dlls/gdi32/metafile16.c rename to dlls/gdi.exe16/metafile.c diff --git a/dlls/gdi32/printdrv16.c b/dlls/gdi.exe16/printdrv.c similarity index 99% rename from dlls/gdi32/printdrv16.c rename to dlls/gdi.exe16/printdrv.c index f0b8cf0..aee0e65 100644 --- a/dlls/gdi32/printdrv16.c +++ b/dlls/gdi.exe16/printdrv.c @@ -48,7 +48,6 @@ #include "winreg.h" #include "wownt32.h" #include "wine/debug.h" -#include "gdi_private.h" WINE_DEFAULT_DEBUG_CHANNEL(print); diff --git a/dlls/gdi32/version16.rc b/dlls/gdi.exe16/version.rc similarity index 100% rename from dlls/gdi32/version16.rc rename to dlls/gdi.exe16/version.rc diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 3202e73..16ea5b4 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -9,8 +9,6 @@ IMPORTS = advapi32 kernel32 ntdll EXTRAINCL = @FREETYPEINCL@ @FONTCONFIGINCL@ EXTRALIBS = @CARBONLIB@ -SPEC_SRCS16 = gdi.exe.spec - C_SRCS = \ bidi.c \ bitblt.c \ @@ -49,15 +47,7 @@ C_SRCS = \ printdrv.c \ region.c -C_SRCS16 = \ - bidi16.c \ - env.c \ - gdi16.c \ - metafile16.c \ - printdrv16.c - RC_SRCS = version.rc -RC_SRCS16 = version16.rc EXTRASUBDIRS = \ enhmfdrv \ @@ -65,12 +55,4 @@ EXTRASUBDIRS = \ @MAKE_DLL_RULES@ -# Special rules for 16-bit resource and spec files - -gdi.exe.spec.o: gdi.exe.spec version16.res - $(WINEBUILD) $(WINEBUILDFLAGS) --dll -o $@ --heap 65520 --main-module $(MODULE) --res version16.res --export $(SRCDIR)/gdi.exe.spec - -version16.res: version16.rc - $(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/version16.rc - @DEPENDENCIES@ # everything below this line is overwritten by make depend

1 0

Alexandre Julliard : gdi32: Stop exporting the 16-bit print job functions.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: fc55cdcd591b347c5dc50835d1cf199072507bbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc55cdcd591b347c5dc50835d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 21:34:46 2009 +0100 gdi32: Stop exporting the 16-bit print job functions. --- dlls/gdi32/Makefile.in | 4 ++-- dlls/gdi32/gdi32.spec | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 45bdad5..3202e73 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -47,14 +47,14 @@ C_SRCS = \ path.c \ pen.c \ printdrv.c \ - printdrv16.c \ region.c C_SRCS16 = \ bidi16.c \ env.c \ gdi16.c \ - metafile16.c + metafile16.c \ + printdrv16.c RC_SRCS = version.rc RC_SRCS16 = version16.rc diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index ebd9525..96faf06 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -513,13 +513,10 @@ ################################################################ # Wine extensions: Win16 functions that are needed by other dlls # -@ stdcall CloseJob16(long) @ stdcall GetDCHook(long ptr) -@ stdcall OpenJob16(str str long) @ stdcall SelectVisRgn(long long) @ stdcall SetDCHook(long ptr long) @ stdcall SetHookFlags(long long) -@ stdcall WriteSpool16(long ptr long) ################################################################ # Wine internal extensions

1 0

Alexandre Julliard : wineps.drv: Don't include 16-bit headers in psdrv.h.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: cc2d6f330fe27136550495e9f9320694ce6fe706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc2d6f330fe27136550495e9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 21:32:42 2009 +0100 wineps.drv: Don't include 16-bit headers in psdrv.h. --- dlls/wineps.drv/builtin.c | 1 + dlls/wineps.drv/download.c | 1 + dlls/wineps.drv/driver.c | 1 + dlls/wineps.drv/font.c | 1 + dlls/wineps.drv/init.c | 2 ++ dlls/wineps.drv/psdrv.h | 1 - dlls/wineps.drv/truetype.c | 2 ++ dlls/wineps.drv/type1afm.c | 1 + 8 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index c8c3f9b..e0a3951 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "winerror.h" #include "wingdi.h" +#include "winnls.h" #include "psdrv.h" #include "wine/debug.h" diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index e794af6..82b70b4 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "winnls.h" #include "psdrv.h" #include "wine/debug.h" diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 378f4fe..fa07775 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -33,6 +33,7 @@ #include "psdrv.h" #include "winuser.h" +#include "wine/wingdi16.h" #include "wownt32.h" #include "prsht.h" #include "psdlg.h" diff --git a/dlls/wineps.drv/font.c b/dlls/wineps.drv/font.c index 7f54954..d66c5e6 100644 --- a/dlls/wineps.drv/font.c +++ b/dlls/wineps.drv/font.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "winnls.h" #include "winspool.h" #include "psdrv.h" diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index fca0849..ef5d9d8 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -38,8 +38,10 @@ #include "winbase.h" #include "winerror.h" #include "winreg.h" +#include "winnls.h" #include "psdrv.h" #include "winspool.h" +#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(psdrv); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 99560a7..9b2ec50 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -26,7 +26,6 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "wine/wingdi16.h" #include "winspool.h" #include "wine/list.h" diff --git a/dlls/wineps.drv/truetype.c b/dlls/wineps.drv/truetype.c index 59ebe19..36ee404 100644 --- a/dlls/wineps.drv/truetype.c +++ b/dlls/wineps.drv/truetype.c @@ -67,7 +67,9 @@ #include "winbase.h" #include "winerror.h" #include "winreg.h" +#include "winnls.h" #include "psdrv.h" +#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(psdrv); diff --git a/dlls/wineps.drv/type1afm.c b/dlls/wineps.drv/type1afm.c index 4feee71..e7248c4 100644 --- a/dlls/wineps.drv/type1afm.c +++ b/dlls/wineps.drv/type1afm.c @@ -47,6 +47,7 @@ #include "winbase.h" #include "winerror.h" #include "winreg.h" +#include "winnls.h" #include "psdrv.h" #include "wine/debug.h"

1 0

Alexandre Julliard : wineps.drv: Duplicate the print job support from 16-bit GDI.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 9a05f3143fc3304ad3207a90a249517b6d5665d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a05f3143fc3304ad3207a90a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 21:29:08 2009 +0100 wineps.drv: Duplicate the print job support from 16-bit GDI. --- dlls/wineps.drv/escape.c | 134 +++++++++++++++++++++++++++++++++++++++++---- dlls/wineps.drv/init.c | 2 +- dlls/wineps.drv/psdrv.h | 2 +- dlls/wineps.drv/text.c | 2 +- 4 files changed, 125 insertions(+), 15 deletions(-) diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 73412cc..1062b96 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -17,13 +17,26 @@ * 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 "wine/port.h" + #include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <signal.h> +#include <errno.h> +#include <fcntl.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif #include "windef.h" #include "winbase.h" #include "wingdi.h" #include "wine/wingdi16.h" -#include "wownt32.h" +#include "winreg.h" #include "psdrv.h" #include "wine/debug.h" #include "winspool.h" @@ -33,9 +46,109 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); static const char psbegindocument[] = "%%BeginDocument: Wine passthrough\n"; +/* FIXME: should use winspool functions instead */ +static DWORD create_job(LPCSTR pszOutput) +{ + int fd = -1; + char psCmd[1024]; + const char *psCmdP = psCmd; + HKEY hkey; + + /* TTD convert the 'output device' into a spool file name */ + + if (pszOutput == NULL || *pszOutput == '\0') return 0; + + psCmd[0] = 0; + /* @@ Wine registry key: HKCU\Software\Wine\Printing\Spooler */ + if(!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Printing\\Spooler", &hkey)) + { + DWORD type, count = sizeof(psCmd); + RegQueryValueExA(hkey, pszOutput, 0, &type, (LPBYTE)psCmd, &count); + RegCloseKey(hkey); + } + if (!psCmd[0] && !strncmp("LPR:",pszOutput,4)) + sprintf(psCmd,"|lpr -P'%s'",pszOutput+4); + + TRACE("Got printerSpoolCommand '%s' for output device '%s'\n", + psCmd, pszOutput); + if (!*psCmd) + psCmdP = pszOutput; + else + { + while (*psCmdP && isspace(*psCmdP)) + { + psCmdP++; + } + if (!*psCmdP) return 0; + } + TRACE("command: '%s'\n", psCmdP); +#ifdef HAVE_FORK + if (*psCmdP == '|') + { + int fds[2]; + if (pipe(fds)) { + ERR("pipe() failed!\n"); + return 0; + } + if (fork() == 0) + { + psCmdP++; + + TRACE("In child need to exec %s\n",psCmdP); + close(0); + dup2(fds[0],0); + close (fds[1]); + + /* reset signals that we previously set to SIG_IGN */ + signal( SIGPIPE, SIG_DFL ); + signal( SIGCHLD, SIG_DFL ); + + execl("/bin/sh", "/bin/sh", "-c", psCmdP, NULL); + _exit(1); + + } + close (fds[0]); + fd = fds[1]; + TRACE("Need to execute a cmnd and pipe the output to it\n"); + } + else +#endif + { + char *buffer; + WCHAR psCmdPW[MAX_PATH]; + + TRACE("Just assume it's a file\n"); + + /** + * The file name can be dos based, we have to find its + * corresponding Unix file name. + */ + MultiByteToWideChar(CP_ACP, 0, psCmdP, -1, psCmdPW, MAX_PATH); + if ((buffer = wine_get_unix_file_name(psCmdPW))) + { + if ((fd = open(buffer, O_CREAT | O_TRUNC | O_WRONLY, 0666)) < 0) + { + ERR("Failed to create spool file '%s' ('%s'). (error %s)\n", + buffer, psCmdP, strerror(errno)); + } + HeapFree(GetProcessHeap(), 0, buffer); + } + } + return fd + 1; +} + +static int close_job( DWORD id ) +{ + int fd = id - 1; + close( fd ); + return TRUE; +} + DWORD write_spool( PSDRV_PDEVICE *physDev, const void *data, DWORD num ) { - return WriteSpool16( physDev->job.hJob, (LPSTR)data, num ); + int fd = physDev->job.id - 1; + if (write( fd, data, num) != num) return SP_OUTOFDISK; + return num; } /********************************************************************** @@ -393,7 +506,7 @@ static INT PSDRV_StartDocA( PSDRV_PDEVICE *physDev, const DOCINFOA *doc ) PRINTER_INFO_5A *pi5 = (PRINTER_INFO_5A*)buf; DWORD needed; - if(physDev->job.hJob) { + if(physDev->job.id) { FIXME("hJob != 0. Now what?\n"); return 0; } @@ -411,8 +524,8 @@ static INT PSDRV_StartDocA( PSDRV_PDEVICE *physDev, const DOCINFOA *doc ) ClosePrinter(hprn); } - physDev->job.hJob = OpenJob16(output, doc->lpszDocName, HDC_16(physDev->hdc) ); - if(!physDev->job.hJob) { + physDev->job.id = create_job( output ); + if(!physDev->job.id) { WARN("OpenJob failed\n"); return 0; } @@ -428,7 +541,7 @@ static INT PSDRV_StartDocA( PSDRV_PDEVICE *physDev, const DOCINFOA *doc ) } else physDev->job.DocName = NULL; - return physDev->job.hJob; + return physDev->job.id; } /************************************************************************ @@ -479,7 +592,7 @@ INT CDECL PSDRV_StartDoc( PSDRV_PDEVICE *physDev, const DOCINFOW *doc ) INT CDECL PSDRV_EndDoc( PSDRV_PDEVICE *physDev ) { INT ret = 1; - if(!physDev->job.hJob) { + if(!physDev->job.id) { FIXME("hJob == 0. Now what?\n"); return 0; } @@ -490,11 +603,8 @@ INT CDECL PSDRV_EndDoc( PSDRV_PDEVICE *physDev ) } PSDRV_WriteFooter( physDev ); - if( CloseJob16( physDev->job.hJob ) == SP_ERROR ) { - WARN("CloseJob error\n"); - ret = 0; - } - physDev->job.hJob = 0; + ret = close_job( physDev->job.id ); + physDev->job.id = 0; HeapFree(GetProcessHeap(), 0, physDev->job.DocName); physDev->job.DocName = NULL; diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 152ee03..fca0849 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -365,7 +365,7 @@ BOOL CDECL PSDRV_CreateDC( HDC hdc, PSDRV_PDEVICE **pdev, LPCWSTR driver, LPCWST WideCharToMultiByte( CP_ACP, 0, output, -1, physDev->job.output, len, NULL, NULL ); } else physDev->job.output = NULL; - physDev->job.hJob = 0; + physDev->job.id = 0; if(initData) { DEVMODEA *devmodeA = DEVMODEdupWtoA(PSDRV_Heap, initData); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 5fecc15..99560a7 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -335,7 +335,7 @@ typedef struct { } PSPEN; typedef struct { - HANDLE16 hJob; + DWORD id; /* Job id */ LPSTR output; /* Output file/port */ LPSTR DocName; /* Document Name */ BOOL banding; /* Have we received a NEXTBAND */ diff --git a/dlls/wineps.drv/text.c b/dlls/wineps.drv/text.c index 310e1cb..8ed7888 100644 --- a/dlls/wineps.drv/text.c +++ b/dlls/wineps.drv/text.c @@ -47,7 +47,7 @@ BOOL CDECL PSDRV_ExtTextOut( PSDRV_PDEVICE *physDev, INT x, INT y, UINT flags, TRACE("(x=%d, y=%d, flags=0x%08x, str=%s, count=%d, lpDx=%p)\n", x, y, flags, debugstr_wn(str, count), count, lpDx); - if(physDev->job.hJob == 0) return FALSE; + if(physDev->job.id == 0) return FALSE; /* write font if not already written */ PSDRV_SetFont(physDev);

1 0

Alexandre Julliard : wineps.drv: Add a wrapper function for WriteSpool16.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 7f6b6eb344de4371df47fdc150994b7e95ce7c13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f6b6eb344de4371df47fdc15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 20:53:11 2009 +0100 wineps.drv: Add a wrapper function for WriteSpool16. --- dlls/wineps.drv/escape.c | 9 ++++++- dlls/wineps.drv/graphics.c | 2 +- dlls/wineps.drv/ps.c | 46 ++++++++++++++++++------------------------- dlls/wineps.drv/psdrv.h | 2 + 4 files changed, 29 insertions(+), 30 deletions(-) diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index c594bea..73412cc 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -33,6 +33,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv); static const char psbegindocument[] = "%%BeginDocument: Wine passthrough\n"; +DWORD write_spool( PSDRV_PDEVICE *physDev, const void *data, DWORD num ) +{ + return WriteSpool16( physDev->job.hJob, (LPSTR)data, num ); +} + /********************************************************************** * ExtEscape (WINEPS.@) */ @@ -252,10 +257,10 @@ INT CDECL PSDRV_ExtEscape( PSDRV_PDEVICE *physDev, INT nEscape, INT cbInput, LPC * in_data[0] instead. */ if(!physDev->job.in_passthrough) { - WriteSpool16(physDev->job.hJob, (LPSTR)psbegindocument, sizeof(psbegindocument)-1); + write_spool(physDev, psbegindocument, sizeof(psbegindocument)-1); physDev->job.in_passthrough = TRUE; } - return WriteSpool16(physDev->job.hJob,((char*)in_data)+2,*(const WORD*)in_data); + return write_spool(physDev,((char*)in_data)+2,*(const WORD*)in_data); } case POSTSCRIPT_IGNORE: diff --git a/dlls/wineps.drv/graphics.c b/dlls/wineps.drv/graphics.c index 657599b..e9c66d2 100644 --- a/dlls/wineps.drv/graphics.c +++ b/dlls/wineps.drv/graphics.c @@ -129,7 +129,7 @@ BOOL CDECL PSDRV_Rectangle( PSDRV_PDEVICE *physDev, INT left, INT top, INT right if(physDev->job.in_passthrough && !physDev->job.had_passthrough_rect && GetROP2(physDev->hdc) == R2_NOP) { char buf[256]; sprintf(buf, "N %d %d %d %d B\n", rect.right - rect.left, rect.bottom - rect.top, rect.left, rect.top); - WriteSpool16(physDev->job.hJob, buf, strlen(buf)); + write_spool(physDev, buf, strlen(buf)); physDev->job.had_passthrough_rect = TRUE; return TRUE; } diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 372b373..89728fd 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -196,7 +196,7 @@ DWORD PSDRV_WriteSpool(PSDRV_PDEVICE *physDev, LPCSTR lpData, DWORD cch) } if(physDev->job.in_passthrough) { /* Was in PASSTHROUGH mode */ - WriteSpool16( physDev->job.hJob, (LPSTR)psenddocument, sizeof(psenddocument)-1 ); + write_spool( physDev, psenddocument, sizeof(psenddocument)-1 ); physDev->job.in_passthrough = physDev->job.had_passthrough_rect = FALSE; } @@ -207,7 +207,7 @@ DWORD PSDRV_WriteSpool(PSDRV_PDEVICE *physDev, LPCSTR lpData, DWORD cch) do { num = min(num_left, 0x8000); - if(WriteSpool16( physDev->job.hJob, (LPSTR)lpData, num ) != num) + if(write_spool( physDev, lpData, num ) != num) return 0; lpData += num; num_left -= num; @@ -217,19 +217,16 @@ DWORD PSDRV_WriteSpool(PSDRV_PDEVICE *physDev, LPCSTR lpData, DWORD cch) } -static INT PSDRV_WriteFeature(HANDLE16 hJob, LPCSTR feature, LPCSTR value, LPSTR invocation) +static INT PSDRV_WriteFeature(PSDRV_PDEVICE *physDev, LPCSTR feature, LPCSTR value, LPCSTR invocation) { char *buf = HeapAlloc( PSDRV_Heap, 0, sizeof(psbeginfeature) + strlen(feature) + strlen(value)); - sprintf(buf, psbeginfeature, feature, value); - WriteSpool16( hJob, buf, strlen(buf) ); - - WriteSpool16( hJob, invocation, strlen(invocation) ); - - WriteSpool16( hJob, (LPSTR)psendfeature, strlen(psendfeature) ); + write_spool( physDev, buf, strlen(buf) ); + write_spool( physDev, invocation, strlen(invocation) ); + write_spool( physDev, psendfeature, strlen(psendfeature) ); HeapFree( PSDRV_Heap, 0, buf ); return 1; @@ -321,30 +318,28 @@ INT PSDRV_WriteHeader( PSDRV_PDEVICE *physDev, LPCSTR title ) sprintf(buf, psheader, escaped_title, llx, lly, urx, ury); HeapFree(GetProcessHeap(), 0, escaped_title); - if( WriteSpool16( physDev->job.hJob, buf, strlen(buf) ) != - strlen(buf) ) { + if( write_spool( physDev, buf, strlen(buf) ) != strlen(buf) ) { WARN("WriteSpool error\n"); HeapFree( PSDRV_Heap, 0, buf ); return 0; } HeapFree( PSDRV_Heap, 0, buf ); - WriteSpool16( physDev->job.hJob, (LPSTR)psbeginprolog, strlen(psbeginprolog) ); - WriteSpool16( physDev->job.hJob, (LPSTR)psprolog, strlen(psprolog) ); - WriteSpool16( physDev->job.hJob, (LPSTR)psendprolog, strlen(psendprolog) ); - - WriteSpool16( physDev->job.hJob, (LPSTR)psbeginsetup, strlen(psbeginsetup) ); + write_spool( physDev, psbeginprolog, strlen(psbeginprolog) ); + write_spool( physDev, psprolog, strlen(psprolog) ); + write_spool( physDev, psendprolog, strlen(psendprolog) ); + write_spool( physDev, psbeginsetup, strlen(psbeginsetup) ); if(physDev->Devmode->dmPublic.u1.s1.dmCopies > 1) { char copies_buf[100]; sprintf(copies_buf, "mark {\n << /NumCopies %d >> setpagedevice\n} stopped cleartomark\n", physDev->Devmode->dmPublic.u1.s1.dmCopies); - WriteSpool16(physDev->job.hJob, copies_buf, strlen(copies_buf)); + write_spool(physDev, copies_buf, strlen(copies_buf)); } for(slot = physDev->pi->ppd->InputSlots; slot; slot = slot->next) { if(slot->WinBin == physDev->Devmode->dmPublic.u1.s1.dmDefaultSource) { if(slot->InvocationString) { - PSDRV_WriteFeature(physDev->job.hJob, "*InputSlot", slot->Name, + PSDRV_WriteFeature(physDev, "*InputSlot", slot->Name, slot->InvocationString); break; } @@ -354,7 +349,7 @@ INT PSDRV_WriteHeader( PSDRV_PDEVICE *physDev, LPCSTR title ) LIST_FOR_EACH_ENTRY(page, &physDev->pi->ppd->PageSizes, PAGESIZE, entry) { if(page->WinPage == physDev->Devmode->dmPublic.u1.s1.dmPaperSize) { if(page->InvocationString) { - PSDRV_WriteFeature(physDev->job.hJob, "*PageSize", page->Name, + PSDRV_WriteFeature(physDev, "*PageSize", page->Name, page->InvocationString); break; } @@ -366,14 +361,14 @@ INT PSDRV_WriteHeader( PSDRV_PDEVICE *physDev, LPCSTR title ) for(duplex = physDev->pi->ppd->Duplexes; duplex; duplex = duplex->next) { if(duplex->WinDuplex == win_duplex) { if(duplex->InvocationString) { - PSDRV_WriteFeature(physDev->job.hJob, "*Duplex", duplex->Name, + PSDRV_WriteFeature(physDev, "*Duplex", duplex->Name, duplex->InvocationString); break; } } } - WriteSpool16( physDev->job.hJob, (LPSTR)psendsetup, strlen(psendsetup) ); + write_spool( physDev, psendsetup, strlen(psendsetup) ); return 1; @@ -392,8 +387,7 @@ INT PSDRV_WriteFooter( PSDRV_PDEVICE *physDev ) sprintf(buf, psfooter, physDev->job.PageNo); - if( WriteSpool16( physDev->job.hJob, buf, strlen(buf) ) != - strlen(buf) ) { + if( write_spool( physDev, buf, strlen(buf) ) != strlen(buf) ) { WARN("WriteSpool error\n"); HeapFree( PSDRV_Heap, 0, buf ); return 0; @@ -406,8 +400,7 @@ INT PSDRV_WriteFooter( PSDRV_PDEVICE *physDev ) INT PSDRV_WriteEndPage( PSDRV_PDEVICE *physDev ) { - if( WriteSpool16( physDev->job.hJob, (LPSTR)psendpage, sizeof(psendpage)-1 ) != - sizeof(psendpage)-1 ) { + if( write_spool( physDev, psendpage, sizeof(psendpage)-1 ) != sizeof(psendpage)-1 ) { WARN("WriteSpool error\n"); return 0; } @@ -451,8 +444,7 @@ INT PSDRV_WriteNewPage( PSDRV_PDEVICE *physDev ) physDev->logPixelsX, physDev->logPixelsY, xtrans, ytrans, rotation); - if( WriteSpool16( physDev->job.hJob, buf, strlen(buf) ) != - strlen(buf) ) { + if( write_spool( physDev, buf, strlen(buf) ) != strlen(buf) ) { WARN("WriteSpool error\n"); HeapFree( PSDRV_Heap, 0, buf ); return 0; diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index c9a4a4e..5fecc15 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -492,6 +492,8 @@ extern BOOL PSDRV_WriteDownloadGlyphShow(PSDRV_PDEVICE *physDev, WORD *glpyhs, UINT count); extern BOOL PSDRV_EmptyDownloadList(PSDRV_PDEVICE *physDev, BOOL write_undef); +extern DWORD write_spool( PSDRV_PDEVICE *physDev, const void *data, DWORD num ); + #define MAX_G_NAME 31 /* max length of PS glyph name */ extern void get_glyph_name(HDC hdc, WORD index, char *name);

1 0

Vincent Povirk : gdiplus: Fix cleanup after errors in GdipCloneImage.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 8b154a590edc9e773521e94e4f4176cf258b3ff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b154a590edc9e773521e94e4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Dec 6 20:07:40 2009 -0600 gdiplus: Fix cleanup after errors in GdipCloneImage. --- dlls/gdiplus/image.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 22895c7..73a6bd6 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -746,12 +746,14 @@ GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage) GdipBitmapUnlockBits((GpBitmap*)*cloneImage, &lockeddata_dst); } - GdipBitmapUnlockBits(bitmap, &lockeddata_src); + if (stat != Ok) + GdipDisposeImage(*cloneImage); } + GdipBitmapUnlockBits(bitmap, &lockeddata_src); + if (stat != Ok) { - GdipDisposeImage(*cloneImage); *cloneImage = NULL; } else memcpy(&(*cloneImage)->format, &image->format, sizeof(GUID));

1 0

Vincent Povirk : gdiplus: Implement GdipCloneBitmapArea.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: bf04d3fa6915145b5c797e75b41002da2d40cc5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf04d3fa6915145b5c797e75b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Dec 6 20:02:35 2009 -0600 gdiplus: Implement GdipCloneBitmapArea. --- dlls/gdiplus/image.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 60 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 5b70918..22895c7 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -607,17 +607,73 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, GpStatus WINGDIPAPI GdipCloneBitmapArea(REAL x, REAL y, REAL width, REAL height, PixelFormat format, GpBitmap* srcBitmap, GpBitmap** dstBitmap) { - FIXME("(%f,%f,%f,%f,%i,%p,%p): stub\n", x, y, width, height, format, srcBitmap, dstBitmap); + BitmapData lockeddata_src, lockeddata_dst; + int i; + UINT row_size; + Rect area; + GpStatus stat; - return NotImplemented; + TRACE("(%f,%f,%f,%f,%i,%p,%p)\n", x, y, width, height, format, srcBitmap, dstBitmap); + + if (!srcBitmap || !dstBitmap || srcBitmap->image.type != ImageTypeBitmap || + x < 0 || y < 0 || + x + width > srcBitmap->width || y + height > srcBitmap->height) + { + TRACE("<-- InvalidParameter\n"); + return InvalidParameter; + } + + if (format == PixelFormatDontCare) + format = srcBitmap->format; + + area.X = roundr(x); + area.Y = roundr(y); + area.Width = roundr(width); + area.Height = roundr(height); + + stat = GdipBitmapLockBits(srcBitmap, &area, ImageLockModeRead, format, + &lockeddata_src); + if (stat != Ok) return stat; + + stat = GdipCreateBitmapFromScan0(lockeddata_src.Width, lockeddata_src.Height, + 0, lockeddata_src.PixelFormat, NULL, dstBitmap); + if (stat == Ok) + { + stat = GdipBitmapLockBits(*dstBitmap, NULL, ImageLockModeWrite, + lockeddata_src.PixelFormat, &lockeddata_dst); + + if (stat == Ok) + { + /* copy the image data */ + row_size = (lockeddata_src.Width * PIXELFORMATBPP(lockeddata_src.PixelFormat) +7)/8; + for (i=0; i<lockeddata_src.Height; i++) + memcpy((BYTE*)lockeddata_dst.Scan0+lockeddata_dst.Stride*i, + (BYTE*)lockeddata_src.Scan0+lockeddata_src.Stride*i, + row_size); + + GdipBitmapUnlockBits(*dstBitmap, &lockeddata_dst); + } + + if (stat != Ok) + GdipDisposeImage((GpImage*)*dstBitmap); + } + + GdipBitmapUnlockBits(srcBitmap, &lockeddata_src); + + if (stat != Ok) + { + *dstBitmap = NULL; + } + + return stat; } GpStatus WINGDIPAPI GdipCloneBitmapAreaI(INT x, INT y, INT width, INT height, PixelFormat format, GpBitmap* srcBitmap, GpBitmap** dstBitmap) { - FIXME("(%i,%i,%i,%i,%i,%p,%p): stub\n", x, y, width, height, format, srcBitmap, dstBitmap); + TRACE("(%i,%i,%i,%i,%i,%p,%p)\n", x, y, width, height, format, srcBitmap, dstBitmap); - return NotImplemented; + return GdipCloneBitmapArea(x, y, width, height, format, srcBitmap, dstBitmap); } GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage)

1 0

Marcus Meissner : rpcrt4: Fixed array_compute_and_size_conformance on strings (Coverity).
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 4c36f79964519e9160b11cc530ec745907ece6cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c36f79964519e9160b11cc53… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Dec 6 23:33:56 2009 +0100 rpcrt4: Fixed array_compute_and_size_conformance on strings (Coverity). --- dlls/rpcrt4/ndr_marshall.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 8db45b8..4511164 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1778,7 +1778,7 @@ static inline void array_compute_and_size_conformance( break; case RPC_FC_C_CSTRING: case RPC_FC_C_WSTRING: - if (pFormat[0] == RPC_FC_C_CSTRING) + if (fc == RPC_FC_C_CSTRING) { TRACE("string=%s\n", debugstr_a((const char *)pMemory)); pStubMsg->ActualCount = strlen((const char *)pMemory)+1; @@ -1789,7 +1789,7 @@ static inline void array_compute_and_size_conformance( pStubMsg->ActualCount = strlenW((LPCWSTR)pMemory)+1; } - if (fc == RPC_FC_STRING_SIZED) + if (pFormat[1] == RPC_FC_STRING_SIZED) pFormat = ComputeConformance(pStubMsg, pMemory, pFormat + 2, 0); else pStubMsg->MaxCount = pStubMsg->ActualCount;

1 0

Jacek Caban : jscript: Don' t pass EXPR_NEWREF flag to evaluate member expression in array_expression_eval .
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 8d44d63849b2498a6e82c3825a5397353dc3f3d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d44d63849b2498a6e82c3825… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 6 22:10:44 2009 +0100 jscript: Don't pass EXPR_NEWREF flag to evaluate member expression in array_expression_eval. --- dlls/jscript/engine.c | 2 +- dlls/jscript/tests/lang.js | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 15ef905..9a89431 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1396,7 +1396,7 @@ HRESULT array_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, TRACE("\n"); - hres = expr_eval(ctx, expr->member_expr, EXPR_NEWREF, ei, &exprval); + hres = expr_eval(ctx, expr->member_expr, 0, ei, &exprval); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 1359e05..b13091f 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -863,6 +863,13 @@ ok(("1" in obj) === false, "1 is in obj"); obj = [1,2,3]; ok((1 in obj) === true, "1 is not in obj"); +obj = new Object(); +try { + obj.prop["test"]; + ok(false, "expected exception"); +}catch(e) {} +ok(!("prop" in obj), "prop in obj"); + ok(isNaN(NaN) === true, "isNaN(NaN) !== true"); ok(isNaN(0.5) === false, "isNaN(0.5) !== false"); ok(isNaN(Infinity) === false, "isNaN(Infinity) !== false");

1 0

Jacek Caban : mshtml: Added test for setting VT_EMPTY event handler.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: f1a543d5469457ca63b284ab2ec65b4063f8d4c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1a543d5469457ca63b284ab2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 6 22:10:24 2009 +0100 mshtml: Added test for setting VT_EMPTY event handler. --- dlls/mshtml/htmlevent.c | 1 + dlls/mshtml/tests/events.c | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index c09db52..41be3e2 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1065,6 +1065,7 @@ HRESULT set_event_handler(event_target_t **event_target, HTMLDocumentNode *doc, default: FIXME("not supported vt=%d\n", V_VT(var)); + case VT_EMPTY: return E_NOTIMPL; } diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index eac72a6..abca9f4 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1082,6 +1082,10 @@ static void test_onclick(IHTMLDocument2 *doc) ok(hres == S_OK, "get_onclick failed: %08x\n", hres); ok(V_VT(&v) == VT_NULL, "V_VT(onclick) = %d\n", V_VT(&v)); + V_VT(&v) = VT_EMPTY; + hres = IHTMLElement_put_onclick(div, v); + ok(hres == E_NOTIMPL, "put_onclick failed: %08x\n", hres); + V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)&div_onclick_obj; hres = IHTMLElement_put_onclick(div, v);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2009