wine-commits April 2006

wine-commits@winehq.org

4 participants
512 discussions

Alexandre Julliard : gdi: Change ReadFontDir error into a warning.
by Alexandre Julliard 04 Apr '06

04 Apr '06

Module: wine Branch: refs/heads/master Commit: 1b7600c60b790c72544f58d93599178b1b8bb38c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1b7600c60b790c72544f58d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 4 11:54:14 2006 +0200 gdi: Change ReadFontDir error into a warning. --- dlls/gdi/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index febe146..4f29812 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -1049,7 +1049,7 @@ static BOOL ReadFontDir(const char *dirn dir = opendir(dirname); if(!dir) { - ERR("Can't open directory %s\n", debugstr_a(dirname)); + WARN("Can't open directory %s\n", debugstr_a(dirname)); return FALSE; } while((dent = readdir(dir)) != NULL) {

1 0

Stefan Dösinger : wined3d: Add WINED3DCLIPSTATUS to wined3d_types.h.
by Alexandre Julliard 04 Apr '06

04 Apr '06

Module: wine Branch: refs/heads/master Commit: 91a8e2a0710541d5f0b9ba733e13e9640e78c92e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=91a8e2a0710541d5f0b9ba7… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Apr 4 00:30:07 2006 +0200 wined3d: Add WINED3DCLIPSTATUS to wined3d_types.h. --- include/wine/wined3d_interface.h | 2 -- include/wine/wined3d_types.h | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index f64ff92..73fa410 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -149,14 +149,12 @@ DEFINE_GUID(IID_IWineD3DQuery, #if defined( __WINE_D3D8_H ) /* Identical: */ # define WINED3DLIGHT D3DLIGHT8 -# define WINED3DCLIPSTATUS D3DCLIPSTATUS8 # define WINED3DMATERIAL D3DMATERIAL8 # define WINED3DVIEWPORT D3DVIEWPORT8 #else /* Identical: */ # define WINED3DLIGHT D3DLIGHT9 -# define WINED3DCLIPSTATUS D3DCLIPSTATUS9 # define WINED3DMATERIAL D3DMATERIAL9 # define WINED3DVIEWPORT D3DVIEWPORT9 diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index da42bcb..60fa601 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -559,6 +559,12 @@ typedef struct _WINED3DVOLUME_DESC UINT *Depth; } WINED3DVOLUME_DESC; +typedef struct _WINED3DCLIPSTATUS { + DWORD ClipUnion; + DWORD ClipIntersection; +} WINED3DCLIPSTATUS; + + typedef struct _WINED3DVERTEXELEMENT { WORD Stream; WORD Offset;

1 0

Stefan Dösinger : wined3d: Add WINED3DRASTERSTATUS to wined3d_types.h.
by Alexandre Julliard 04 Apr '06

04 Apr '06

Module: wine Branch: refs/heads/master Commit: 08c38a87e145548137f900c1adf8626abd41d57c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=08c38a87e145548137f900c… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Apr 4 00:27:28 2006 +0200 wined3d: Add WINED3DRASTERSTATUS to wined3d_types.h. --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/d3d9/swapchain.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/swapchain.c | 2 +- include/wine/wined3d_interface.h | 4 ++-- include/wine/wined3d_types.h | 5 +++++ 7 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 96f44f0..54ffb04 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -266,7 +266,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_GetR IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_GetRasterStatus(This->WineD3DDevice, 0, pRasterStatus); + return IWineD3DDevice_GetRasterStatus(This->WineD3DDevice, 0, (WINED3DRASTER_STATUS *) pRasterStatus); } void WINAPI IDirect3DDevice8Impl_SetGammaRamp(LPDIRECT3DDEVICE8 iface, DWORD Flags, CONST D3DGAMMARAMP* pRamp) { diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 9c68e84..3f557f2 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -208,7 +208,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_Ge IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_GetRasterStatus(This->WineD3DDevice, iSwapChain, pRasterStatus); + return IWineD3DDevice_GetRasterStatus(This->WineD3DDevice, iSwapChain, (WINED3DRASTER_STATUS *) pRasterStatus); } HRESULT WINAPI IDirect3DDevice9Impl_SetDialogBoxMode(LPDIRECT3DDEVICE9 iface, BOOL bEnableDialogs) { diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 7382a9e..4eac38e 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -94,7 +94,7 @@ HRESULT WINAPI IDirect3DSwapChain9Impl_G HRESULT WINAPI IDirect3DSwapChain9Impl_GetRasterStatus(LPDIRECT3DSWAPCHAIN9 iface, D3DRASTER_STATUS* pRasterStatus) { IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DSwapChain_GetRasterStatus(This->wineD3DSwapChain, pRasterStatus); + return IWineD3DSwapChain_GetRasterStatus(This->wineD3DSwapChain, (WINED3DRASTER_STATUS *) pRasterStatus); } HRESULT WINAPI IDirect3DSwapChain9Impl_GetDisplayMode(LPDIRECT3DSWAPCHAIN9 iface, D3DDISPLAYMODE* pMode) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 14d1b5e..5df1ab2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5454,7 +5454,7 @@ BOOL WINAPI IWineD3DDeviceImpl_GetS } -HRESULT WINAPI IWineD3DDeviceImpl_GetRasterStatus(IWineD3DDevice *iface, UINT iSwapChain, D3DRASTER_STATUS* pRasterStatus) { +HRESULT WINAPI IWineD3DDeviceImpl_GetRasterStatus(IWineD3DDevice *iface, UINT iSwapChain, WINED3DRASTER_STATUS* pRasterStatus) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DSwapChain *swapChain; HRESULT hr; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index f2e6a56..55bb6e1 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -381,7 +381,7 @@ HRESULT WINAPI IWineD3DSwapChainImpl_Get } -HRESULT WINAPI IWineD3DSwapChainImpl_GetRasterStatus(IWineD3DSwapChain *iface, D3DRASTER_STATUS*pRasterStatus) { +HRESULT WINAPI IWineD3DSwapChainImpl_GetRasterStatus(IWineD3DSwapChain *iface, WINED3DRASTER_STATUS *pRasterStatus) { IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface; static BOOL showFixmes = TRUE; pRasterStatus->InVBlank = TRUE; diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 6478d8d..f64ff92 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -329,7 +329,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD STDMETHOD(GetDirect3D)(THIS_ IWineD3D** ppD3D) PURE; STDMETHOD(GetDisplayMode)(THIS_ UINT iSwapChain, WINED3DDISPLAYMODE* pMode) PURE; STDMETHOD_(UINT, GetNumberOfSwapChains)(THIS) PURE; - STDMETHOD(GetRasterStatus)(THIS_ UINT iSwapChain, D3DRASTER_STATUS* pRasterStatus) PURE; + STDMETHOD(GetRasterStatus)(THIS_ UINT iSwapChain, WINED3DRASTER_STATUS* pRasterStatus) PURE; STDMETHOD(GetSwapChain)(THIS_ UINT iSwapChain, struct IWineD3DSwapChain **pSwapChain) PURE; STDMETHOD(Reset)(THIS_ WINED3DPRESENT_PARAMETERS* pPresentationParameters) PURE; STDMETHOD(SetDialogBoxMode)(THIS_ BOOL bEnableDialogs) PURE; @@ -1293,7 +1293,7 @@ DECLARE_INTERFACE_(IWineD3DSwapChain,IWi STDMETHOD(Present)(THIS_ CONST RECT *pSourceRect, CONST RECT *pDestRect, HWND hDestWindowOverride, CONST RGNDATA *pDirtyRegion, DWORD dwFlags) PURE; STDMETHOD(GetFrontBufferData)(THIS_ IWineD3DSurface *pDestSurface) PURE; STDMETHOD(GetBackBuffer)(THIS_ UINT iBackBuffer, WINED3DBACKBUFFER_TYPE Type, IWineD3DSurface **ppBackBuffer) PURE; - STDMETHOD(GetRasterStatus)(THIS_ D3DRASTER_STATUS *pRasterStatus) PURE; + STDMETHOD(GetRasterStatus)(THIS_ WINED3DRASTER_STATUS *pRasterStatus) PURE; STDMETHOD(GetDisplayMode)(THIS_ WINED3DDISPLAYMODE *pMode) PURE; STDMETHOD(GetPresentParameters)(THIS_ WINED3DPRESENT_PARAMETERS *pPresentationParameters) PURE; STDMETHOD(SetGammaRamp)(THIS_ DWORD Flags, const D3DGAMMARAMP *pRamp) PURE; diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index a072981..da42bcb 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -631,6 +631,11 @@ typedef struct _WINED3DDEVINFO_STAGETIMI float ComputationProcessingPercent; } WINED3DDEVINFO_STAGETIMINGS; +typedef struct _WINED3DRASTER_STATUS { + BOOL InVBlank; + UINT ScanLine; +} WINED3DRASTER_STATUS; + typedef struct WINED3DRESOURCESTATS { BOOL bThrashing;

1 0

Mike McCormack : msiexec: Add an icon for msiexec and .msi files.
by Alexandre Julliard 04 Apr '06

04 Apr '06

Module: wine Branch: refs/heads/master Commit: 92b5d9e18982916de18170de9b1f5ec39a1cbf19 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=92b5d9e18982916de18170d… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Apr 4 15:16:39 2006 +0900 msiexec: Add an icon for msiexec and .msi files. --- programs/msiexec/.gitignore | 3 +- programs/msiexec/Makefile.in | 5 ++- programs/msiexec/rsrc.rc | 76 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 programs/msiexec/rsrc.rc diff --git a/programs/msiexec/.gitignore b/programs/msiexec/.gitignore index d6f8e42..2126466 100644 --- a/programs/msiexec/.gitignore +++ b/programs/msiexec/.gitignore @@ -1,3 +1,4 @@ Makefile msiexec -version.res +msiexec.ico +rsrc.res diff --git a/programs/msiexec/Makefile.in b/programs/msiexec/Makefile.in index 8b7cf50..6949d20 100644 --- a/programs/msiexec/Makefile.in +++ b/programs/msiexec/Makefile.in @@ -9,7 +9,10 @@ IMPORTS = msi ole32 advapi32 user32 ke C_SRCS = \ msiexec.c -RC_SRCS = version.rc +RC_SRCS = rsrc.rc +RC_BINSRC = rsrc.rc +RC_BINARIES = \ + msiexec.ico @MAKE_PROG_RULES@ diff --git a/programs/msiexec/rsrc.rc b/programs/msiexec/rsrc.rc new file mode 100644 index 0000000..cc141b2 --- /dev/null +++ b/programs/msiexec/rsrc.rc @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2006 Mike McCormack + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <windows.h> + +#include "version.rc" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +/* BINRES msiexec.ico */ +1 ICON DISCARDABLE msiexec.ico +/* { + '00 00 01 00 01 00 20 20 10 00 00 00 00 00 E8 02' + '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' + '00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00' + '00 00 80 00 80 00 80 80 00 00 C0 C0 C0 00 80 80' + '80 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00' + '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 03 83 00 00 00 00 00 00 00 00 00 00 00' + '00 00 33 33 00 00 00 00 00 00 00 00 00 00 00 00' + '00 03 3B 30 00 00 00 80 00 00 00 00 00 00 00 00' + '00 33 33 00 00 00 03 33 00 00 00 00 00 00 00 00' + '03 3B 30 00 00 00 33 B3 30 00 00 00 00 00 00 00' + '0B 33 00 00 00 00 38 33 B0 00 00 00 00 00 00 00' + '03 38 00 00 03 00 03 38 30 00 00 00 00 00 00 00' + '33 33 00 03 00 30 00 00 00 00 00 00 00 00 00 00' + '33 B3 33 30 00 00 01 11 11 00 00 00 00 00 00 00' + '33 33 B3 B0 00 00 11 11 11 10 00 00 00 00 00 00' + '33 33 83 33 00 01 11 11 11 11 00 00 00 00 00 00' + '03 B3 33 33 33 01 11 11 11 11 10 00 00 00 00 00' + '03 33 3B 33 3B 01 11 11 11 11 10 00 00 00 00 00' + '03 83 38 33 83 01 11 11 11 11 11 00 00 00 00 00' + '00 33 B3 33 33 01 11 11 11 11 11 00 00 00 00 00' + '00 03 33 B3 33 30 11 11 10 00 10 10 00 00 00 00' + '00 00 33 38 3B 30 11 10 00 FF 00 0F 00 00 00 00' + '00 00 00 03 33 30 01 00 FF FF FF FF 00 00 00 00' + '00 00 00 00 00 00 01 0F FF FF FF FF 00 00 00 00' + '00 00 00 00 00 00 00 0F FF FF FF F0 00 00 00 00' + '00 00 00 00 00 00 00 0F FF FF FF 00 00 00 00 00' + '00 00 00 00 00 00 00 0F FF FF F0 00 00 00 00 00' + '00 00 00 00 00 00 00 00 FF F0 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF FF' + 'FF FF FF FF FF FF FF FF FF FF FF E1 1F FF FF 00' + '1F FF FE 00 1F FF FC 00 0F FF F8 00 07 FF F0 00' + '03 FF F0 00 03 FF F0 00 03 FF E0 00 01 FF E0 0C' + '01 FF E0 0C 00 FF E0 00 00 7F F0 00 00 7F F0 00' + '00 3F F0 00 00 1F F8 00 00 0F FC 00 00 07 FE 00' + '00 07 FF 00 00 03 FF E1 00 03 FF FF 80 07 FF FF' + '80 0F FF FF C0 1F FF FF C0 3F FF FF E0 FF FF FF' + 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF' +} */

1 0

James Hawkins : wine.inf: Add hhctrl.ocx to the list of fake dlls.
by Alexandre Julliard 04 Apr '06

04 Apr '06

Module: wine Branch: refs/heads/master Commit: efa638f3fb11d58393cdb14193e5c63458d7ca65 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=efa638f3fb11d58393cdb14… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Apr 3 23:36:46 2006 -0500 wine.inf: Add hhctrl.ocx to the list of fake dlls. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index c6b1e4c..0f952ae 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2118,6 +2118,7 @@ HKLM,%CurrentVersion%\Telephony\Country 11,,ddraw.dll 11,,gdi32.dll 11,,help.exe,winhelp.exe +11,,hhctrl.ocx 11,,kernel32.dll 11,,msiexec.exe 11,,msvcrt.dll

1 0

Mike McCormack : configure: Warn if the fonts aren't going to be built.
by Alexandre Julliard 04 Apr '06

04 Apr '06

Module: wine Branch: refs/heads/master Commit: 8f6aa41a78e13c747b5f2930f736e7f32f82f649 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8f6aa41a78e13c747b5f293… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Apr 4 13:36:51 2006 +0900 configure: Warn if the fonts aren't going to be built. --- configure | 10 ++++++++++ configure.ac | 10 ++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 3c49fb4..9bffafd 100755 --- a/configure +++ b/configure @@ -10304,6 +10304,9 @@ if test "$FONTFORGE" != "false" -a -n "$ then FONTSSUBDIRS="fonts" + wine_cv_msg_fonts=no +else + wine_cv_msg_fonts=yes fi echo "$as_me:$LINENO: checking for parport header/ppdev.h" >&5 @@ -20859,6 +20862,13 @@ then echo "*** enable Wine to use TrueType fonts." fi +if test "$wine_cv_msg_fonts" = "yes" +then + echo + echo "*** Warning: Freetype or Fontforge is missing." + echo "*** Fonts will not be built. Dialog text may be invisible or unaligned." +fi + if test -z "$ALSALIBS" -a \ -z "$ARTSC_LIBS" -a \ -z "$AUDIOIOLIBS" -a \ diff --git a/configure.ac b/configure.ac index fd23c66..afcc222 100644 --- a/configure.ac +++ b/configure.ac @@ -628,6 +628,9 @@ dnl Only build the fonts dir if we have if test "$FONTFORGE" != "false" -a -n "$FREETYPELIBS" then AC_SUBST(FONTSSUBDIRS,"fonts") + wine_cv_msg_fonts=no +else + wine_cv_msg_fonts=yes fi dnl **** Check for parport (currently Linux only) **** @@ -1754,6 +1757,13 @@ then echo "*** enable Wine to use TrueType fonts." fi +if test "$wine_cv_msg_fonts" = "yes" +then + echo + echo "*** Warning: Freetype or Fontforge is missing." + echo "*** Fonts will not be built. Dialog text may be invisible or unaligned." +fi + if test -z "$ALSALIBS" -a \ -z "$ARTSC_LIBS" -a \ -z "$AUDIOIOLIBS" -a \

1 0

Alexandre Julliard : server: Don't single step into signal handlers.
by Alexandre Julliard 03 Apr '06

03 Apr '06

Module: wine Branch: refs/heads/master Commit: 3dd0b2ef6478c0f24a7575b8709a7c83d980683f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3dd0b2ef6478c0f24a7575b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 3 21:42:42 2006 +0200 server: Don't single step into signal handlers. --- server/ptrace.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index d7134f2..90053cf 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -84,10 +84,7 @@ static int handle_child_status( struct t if (sig != want_sig) { /* ignore other signals for now */ - if (thread && get_thread_single_step( thread )) - ptrace( PTRACE_SINGLESTEP, pid, (caddr_t)1, sig ); - else - ptrace( PTRACE_CONT, pid, (caddr_t)1, sig ); + ptrace( PTRACE_CONT, pid, (caddr_t)1, sig ); } return sig; }

1 0

Alexandre Julliard : ntdll: Save FPU context for all exceptions.
by Alexandre Julliard 03 Apr '06

03 Apr '06

Module: wine Branch: refs/heads/master Commit: a1f0f3917441ad7e787e9d778f4ca9b82211f9d8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a1f0f3917441ad7e787e9d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 3 21:39:33 2006 +0200 ntdll: Save FPU context for all exceptions. --- dlls/ntdll/signal_i386.c | 48 +++++++++++++++++++++++++--------------------- 1 files changed, 26 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index a9f2589..d957cd3 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -704,27 +704,6 @@ inline static void *init_handler( const /*********************************************************************** - * save_fpu - * - * Set the FPU context from a sigcontext. - */ -inline static void save_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext ) -{ - context->ContextFlags |= CONTEXT86_FLOATING_POINT; -#ifdef FPU_sig - if (FPU_sig(sigcontext)) - { - context->FloatSave = *FPU_sig(sigcontext); - return; - } -#endif /* FPU_sig */ -#ifdef __GNUC__ - __asm__ __volatile__( "fnsave %0; fwait" : "=m" (context->FloatSave) ); -#endif /* __GNUC__ */ -} - - -/*********************************************************************** * restore_fpu * * Restore the FPU context to a sigcontext. @@ -773,6 +752,21 @@ inline static void save_context( CONTEXT context->Dr3 = regs->dr3; context->Dr6 = regs->dr6; context->Dr7 = regs->dr7; + +#ifdef FPU_sig + if (FPU_sig(sigcontext)) + { + context->ContextFlags |= CONTEXT_FLOATING_POINT; + context->FloatSave = *FPU_sig(sigcontext); + } + else +#endif + { +#ifdef __GNUC__ + context->ContextFlags |= CONTEXT_FLOATING_POINT; + __asm__ __volatile__( "fnsave %0; fwait" : "=m" (context->FloatSave) ); +#endif + } } @@ -815,6 +809,17 @@ inline static void restore_context( cons #else wine_set_fs( context->SegFs ); #endif + +#ifdef FPU_sig + if (FPU_sig(sigcontext)) + { + *FPU_sig(sigcontext) = context->FloatSave; + } + else +#endif + { + restore_fpu( context ); + } } @@ -1278,7 +1283,6 @@ static HANDLER_DEF(fpe_handler) CONTEXT *context; context = get_exception_context( rec ); - save_fpu( context, HANDLER_CONTEXT ); switch(get_trap_code(HANDLER_CONTEXT)) {

1 0

Robert Shearman : ole32: Add documentation for the clip format user marshal functions.
by Alexandre Julliard 03 Apr '06

03 Apr '06

Module: wine Branch: refs/heads/master Commit: c77711a6c9e4752c4196926c2292a03608b68267 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c77711a6c9e4752c4196926… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Apr 3 16:27:41 2006 +0100 ole32: Add documentation for the clip format user marshal functions. --- dlls/ole32/usrmarshal.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 76 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 3bd46cb..8c76bc4 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -59,6 +59,26 @@ static void dump_user_flags(unsigned lon } } +/****************************************************************************** + * CLIPFORMAT_UserSize [OLE32.@] + * + * Calculates the buffer size required to marshal a clip format. + * + * PARAMS + * pFlags [I] Flags. See notes. + * StartingSize [I] Starting size of the buffer. This value is added on to + * the buffer size required for the clip format. + * pCF [I] Clip format to size. + * + * RETURNS + * The buffer size required to marshal a clip format plus the starting size. + * + * NOTES + * Even though the function is documented to take a pointer to an unsigned + * long in pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is an unsigned long. + * This function is only intended to be called by the RPC runtime. + */ unsigned long __RPC_USER CLIPFORMAT_UserSize(unsigned long *pFlags, unsigned long StartingSize, CLIPFORMAT *pCF) { unsigned long size = StartingSize; @@ -85,6 +105,25 @@ unsigned long __RPC_USER CLIPFORMAT_User return size; } +/****************************************************************************** + * CLIPFORMAT_UserMarshal [OLE32.@] + * + * Marshals a clip format into a buffer. + * + * PARAMS + * pFlags [I] Flags. See notes. + * pBuffer [I] Buffer to marshal the clip format into. + * pCF [I] Clip format to marshal. + * + * RETURNS + * The end of the marshaled data in the buffer. + * + * NOTES + * Even though the function is documented to take a pointer to an unsigned + * long in pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is an unsigned long. + * This function is only intended to be called by the RPC runtime. + */ unsigned char * __RPC_USER CLIPFORMAT_UserMarshal(unsigned long *pFlags, unsigned char *pBuffer, CLIPFORMAT *pCF) { wireCLIPFORMAT wirecf = (wireCLIPFORMAT)pBuffer; @@ -123,6 +162,25 @@ unsigned char * __RPC_USER CLIPFORMAT_Us return pBuffer; } +/****************************************************************************** + * CLIPFORMAT_UserUnmarshal [OLE32.@] + * + * Unmarshals a clip format from a buffer. + * + * PARAMS + * pFlags [I] Flags. See notes. + * pBuffer [I] Buffer to marshal the clip format from. + * pCF [O] Address that receive the unmarshaled clip format. + * + * RETURNS + * The end of the marshaled data in the buffer. + * + * NOTES + * Even though the function is documented to take a pointer to an unsigned + * long in pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is an unsigned long. + * This function is only intended to be called by the RPC runtime. + */ unsigned char * __RPC_USER CLIPFORMAT_UserUnmarshal(unsigned long *pFlags, unsigned char *pBuffer, CLIPFORMAT *pCF) { wireCLIPFORMAT wirecf = (wireCLIPFORMAT)pBuffer; @@ -158,6 +216,24 @@ unsigned char * __RPC_USER CLIPFORMAT_Us return pBuffer; } +/****************************************************************************** + * CLIPFORMAT_UserFree [OLE32.@] + * + * Frees an unmarshaled clip format. + * + * PARAMS + * pFlags [I] Flags. See notes. + * pCF [I] Clip format to free. + * + * RETURNS + * The end of the marshaled data in the buffer. + * + * NOTES + * Even though the function is documented to take a pointer to an unsigned + * long in pFlags, it actually takes a pointer to a USER_MARSHAL_CB + * structure, of which the first parameter is an unsigned long. + * This function is only intended to be called by the RPC runtime. + */ void __RPC_USER CLIPFORMAT_UserFree(unsigned long *pFlags, CLIPFORMAT *pCF) { /* there is no inverse of the RegisterClipboardFormat function,

1 0

Robert Shearman : widl: Fix the type offset for generated conformant string calls.
by Alexandre Julliard 03 Apr '06

03 Apr '06

Module: wine Branch: refs/heads/master Commit: e2ea2b5891077e9419437511605a8f5cf85eca2c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e2ea2b5891077e941943751… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Apr 3 16:27:17 2006 +0100 widl: Fix the type offset for generated conformant string calls. --- tools/widl/typegen.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index a8ab982..96d42a1 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1591,11 +1591,11 @@ void write_remoting_arguments(FILE *file fprintf(file, ";\n"); } - /* FIXME: these can't both be correct */ if (phase == PHASE_FREE) print_phase_function(file, indent, "Pointer", phase, var->name, *type_offset); else - print_phase_function(file, indent, "ConformantString", phase, var->name, *type_offset); + print_phase_function(file, indent, "ConformantString", phase, var->name, + *type_offset + (has_size ? 4 : 2)); } } else if (is_array_type(var->attrs, var->ptr_level, var->array))

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 April 2006