June 2006 - Wine-commits - list.winehq.org

Mikołaj Zalewski : notepad: Pl.rc: Fix the ellipsis in menu.
by Alexandre Julliard 15 Jun '06

15 Jun '06

Module: wine Branch: refs/heads/master Commit: 35b7a813f694d02325518d1df9d836e58896b584 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=35b7a813f694d02325518d1… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Jun 15 15:30:13 2006 +0200 notepad: Pl.rc: Fix the ellipsis in menu. --- programs/notepad/Pl.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/notepad/Pl.rc b/programs/notepad/Pl.rc index e2e5105..e91ebd8 100644 --- a/programs/notepad/Pl.rc +++ b/programs/notepad/Pl.rc @@ -26,8 +26,8 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT MAIN_MENU MENU { POPUP "&Plik" { - MENUITEM "&Nowy...", CMD_NEW - MENUITEM "&Otw�rz\tCtrl+O", CMD_OPEN + MENUITEM "&Nowy", CMD_NEW + MENUITEM "&Otw�rz...\tCtrl+O", CMD_OPEN MENUITEM "&Zapisz\tCtrl+S", CMD_SAVE MENUITEM "Z&apisz jako...", CMD_SAVE_AS MENUITEM SEPARATOR

1 0

Alexandre Julliard : dlls: d3d8, d3d9 and ddraw no longer depend on OpenGL or X.
by Alexandre Julliard 15 Jun '06

15 Jun '06

Module: wine Branch: refs/heads/master Commit: 9d4feaa09bfddd8646acc412504f58761a780c2b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9d4feaa09bfddd8646acc41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 15 16:52:23 2006 +0200 dlls: d3d8, d3d9 and ddraw no longer depend on OpenGL or X. --- dlls/Makefile.in | 16 ++++++---------- dlls/make_dlls | 8 ++------ programs/winetest/Makefile.in | 10 ++++------ 3 files changed, 12 insertions(+), 22 deletions(-) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 937d8ec..0462978 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -9,8 +9,8 @@ # special configure-dependent targets GLU32FILES = glu32 GLUT32FILES = glut32 -OPENGLFILES = d3d8 d3d9 d3dx8 opengl32 wined3d -XFILES = ddraw x11drv +OPENGLFILES = opengl32 wined3d +XFILES = x11drv EXTRADIRS = @GLU32FILES@ @GLUT32FILES@ @OPENGLFILES@ @XFILES@ # Subdir list @@ -34,11 +34,15 @@ BASEDIRS = \ crypt32 \ cryptdll \ ctl3d32 \ + d3d8 \ + d3d9 \ d3dim \ d3drm \ + d3dx8 \ d3dxof \ dbghelp \ dciman32 \ + ddraw \ devenum \ dinput \ dinput8 \ @@ -199,10 +203,6 @@ IMPLIBSUBDIRS = \ SUBDIRS = \ $(BASEDIRS) \ $(IMPLIBSUBDIRS) \ - d3d8 \ - d3d9 \ - d3dx8 \ - ddraw \ glu32 \ glut32 \ opengl32 \ @@ -299,9 +299,6 @@ x11drv.dll.so: winex11.drv.so # Map symlink name to the corresponding library -ddraw.dll.so: ddraw/ddraw.dll.so - $(RM) $@ && $(LN_S) ddraw/ddraw.dll.so $@ - gdi32.dll.so: gdi/gdi32.dll.so $(RM) $@ && $(LN_S) gdi/gdi32.dll.so $@ @@ -918,7 +915,6 @@ libwinspool.$(IMPLIBEXT): winspool.drv/l # Map library name to the corresponding directory -ddraw/ddraw.dll.so: ddraw gdi/gdi32.dll.so: gdi winmm/joystick/joystick.drv.so: winmm/joystick kernel/kernel32.dll.so: kernel diff --git a/dlls/make_dlls b/dlls/make_dlls index 2be1b57..1295235 100755 --- a/dlls/make_dlls +++ b/dlls/make_dlls @@ -33,13 +33,9 @@ my %altnames = (); # list of special dlls that can be switched on or off by configure my %special_dlls = ( - "ddraw" => "XFILES", "glu32" => "GLU32FILES", "glut32" => "GLUT32FILES", "opengl32" => "OPENGLFILES", - "d3d8" => "OPENGLFILES", - "d3d9" => "OPENGLFILES", - "d3dx8" => "OPENGLFILES", "wined3d" => "OPENGLFILES", "x11drv" => "XFILES" ); @@ -222,7 +218,7 @@ # output the lib name -> directory rules print NEWMAKE "# Map symlink name to the corresponding library\n\n"; foreach my $mod (sort keys %directories) { - next unless (needs_symlink($mod) || $mod eq "ddraw.dll"); # FIXME: hack because of x11drv + next unless needs_symlink($mod); printf NEWMAKE "%s.so: %s/%s.so\n", $mod, $directories{$mod}, $mod; printf NEWMAKE "\t\$(RM) \$@ && \$(LN_S) %s/%s.so \$@\n\n", $directories{$mod}, $mod; } @@ -303,7 +299,7 @@ print NEWMAKE "# Map library name to the foreach my $mod (sort keys %directories) { - next unless (needs_symlink($mod) || $mod eq "ddraw.dll"); # FIXME: hack because of x11drv + next unless needs_symlink($mod); printf NEWMAKE "%s/%s.so: %s\n", $directories{$mod}, $mod, $directories{$mod}; } foreach my $mod (sort keys %staticlib_dirs) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index f585f80..c8fb220 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -18,17 +18,15 @@ RC_SRCS = \ RC_BINSRC = winetest.rc RC_BINARIES = wine.ico -XFILES = ddraw_test.exe$(DLLEXT) -OPENGLFILES = d3d8_test.exe$(DLLEXT) d3d9_test.exe$(DLLEXT) - TESTBINS = \ - @OPENGLFILES@ \ - @XFILES@ \ - advpack_test.exe$(DLLEXT) \ advapi32_test.exe$(DLLEXT) \ + advpack_test.exe$(DLLEXT) \ cabinet_test.exe$(DLLEXT) \ comctl32_test.exe$(DLLEXT) \ crypt32_test.exe$(DLLEXT) \ + d3d8_test.exe$(DLLEXT) \ + d3d9_test.exe$(DLLEXT) \ + ddraw_test.exe$(DLLEXT) \ dinput_test.exe$(DLLEXT) \ dnsapi_test.exe$(DLLEXT) \ dsound_test.exe$(DLLEXT) \

1 0

Alexandre Julliard : configure: Ues the standard AC_MSG_WARN to print warnings.
by Alexandre Julliard 15 Jun '06

15 Jun '06

Module: wine Branch: refs/heads/master Commit: bb7fe6815723cb1023120a32899c204dd956730e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bb7fe6815723cb1023120a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 15 16:52:32 2006 +0200 configure: Ues the standard AC_MSG_WARN to print warnings. --- configure | 57 +++++++++++++++++++++++++++++++++++++-------------------- configure.ac | 41 +++++++++++++++++++++-------------------- 2 files changed, 58 insertions(+), 40 deletions(-) diff --git a/configure b/configure index f91bc8f..7f2ef1e 100755 --- a/configure +++ b/configure @@ -22808,42 +22808,55 @@ fi exitcode=0 if test "$have_x" = "no" then - echo - echo "*** Warning: X development files not found. Wine will be built without" - echo "*** X support, which currently does not work, and would probably not be" - echo "*** what you want anyway. You will need to install devel packages of" - echo "*** Xlib/Xfree86 at the very least." + echo >&2 + { echo "$as_me:$LINENO: WARNING: X development files not found. Wine will be built without" >&5 +echo "$as_me: WARNING: X development files not found. Wine will be built without" >&2;} + { echo "$as_me:$LINENO: WARNING: X support, which currently does not work, and probably" >&5 +echo "$as_me: WARNING: X support, which currently does not work, and probably" >&2;} + { echo "$as_me:$LINENO: WARNING: isn't what you want anyway. You will need to install devel" >&5 +echo "$as_me: WARNING: isn't what you want anyway. You will need to install devel" >&2;} + { echo "$as_me:$LINENO: WARNING: packages of Xlib/Xfree86 at the very least." >&5 +echo "$as_me: WARNING: packages of Xlib/Xfree86 at the very least." >&2;} exitcode=1 fi if test "$wine_cv_opengl_version_OK" = "no" then - echo - echo "*** Warning: old Mesa headers detected. Wine will be built without Direct3D" - echo "*** support. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)" + echo >&2 + { echo "$as_me:$LINENO: WARNING: Old Mesa headers detected. Wine will be built without Direct3D" >&5 +echo "$as_me: WARNING: Old Mesa headers detected. Wine will be built without Direct3D" >&2;} + { echo "$as_me:$LINENO: WARNING: support. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)" >&5 +echo "$as_me: WARNING: support. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)" >&2;} exitcode=1 fi if test "$wine_cv_msg_freetype" = "yes" then - echo - echo "*** Note: Your system appears to have the FreeType 2 runtime libraries" - echo "*** installed, but 'freetype-config' is not in your PATH. Install the" - echo "*** freetype-devel package (or its equivalent on your distribution) to" - echo "*** enable Wine to use TrueType fonts." + echo >&2 + { echo "$as_me:$LINENO: WARNING: Your system appears to have the FreeType 2 runtime libraries" >&5 +echo "$as_me: WARNING: Your system appears to have the FreeType 2 runtime libraries" >&2;} + { echo "$as_me:$LINENO: WARNING: installed, but 'freetype-config' is not in your PATH. Install" >&5 +echo "$as_me: WARNING: installed, but 'freetype-config' is not in your PATH. Install" >&2;} + { echo "$as_me:$LINENO: WARNING: the freetype-devel package (or its equivalent on your distribution)" >&5 +echo "$as_me: WARNING: the freetype-devel package (or its equivalent on your distribution)" >&2;} + { echo "$as_me:$LINENO: WARNING: to enable Wine to use TrueType fonts." >&5 +echo "$as_me: WARNING: to enable Wine to use TrueType fonts." >&2;} exitcode=1 fi if test -z "$FONTSSUBDIRS" then - echo + echo >&2 if test "$FONTFORGE" = "false" then - echo "*** Warning: FontForge is missing." + { echo "$as_me:$LINENO: WARNING: FontForge is missing." >&5 +echo "$as_me: WARNING: FontForge is missing." >&2;} else - echo "*** Warning: FreeType is missing." + { echo "$as_me:$LINENO: WARNING: FreeType is missing." >&5 +echo "$as_me: WARNING: FreeType is missing." >&2;} fi - echo "*** Fonts will not be built. Dialog text may be invisible or unaligned." + { echo "$as_me:$LINENO: WARNING: Fonts will not be built. Dialog text may be invisible or unaligned." >&5 +echo "$as_me: WARNING: Fonts will not be built. Dialog text may be invisible or unaligned." >&2;} exitcode=1 fi @@ -22857,9 +22870,13 @@ if test -z "$ALSALIBS" -a \ "$ac_cv_header_machine_soundcard_h" != "yes" -a \ "$ac_cv_header_soundcard_h" != "yes" then - echo "*** No sound system was found. Windows applications will be silent." - echo "*** The currently supported sound systems are:" - echo "*** ALSA, ARTS, EsounD, AudioIO, Jack, NAS and OSS" + echo >&2 + { echo "$as_me:$LINENO: WARNING: No sound system was found. Windows applications will be silent." >&5 +echo "$as_me: WARNING: No sound system was found. Windows applications will be silent." >&2;} + { echo "$as_me:$LINENO: WARNING: The currently supported sound systems are:" >&5 +echo "$as_me: WARNING: The currently supported sound systems are:" >&2;} + { echo "$as_me:$LINENO: WARNING: ALSA, ARTS, EsounD, AudioIO, Jack, NAS and OSS" >&5 +echo "$as_me: WARNING: ALSA, ARTS, EsounD, AudioIO, Jack, NAS and OSS" >&2;} exitcode=1 fi diff --git a/configure.ac b/configure.ac index 5b83b7c..d6295b1 100644 --- a/configure.ac +++ b/configure.ac @@ -1826,42 +1826,42 @@ AC_OUTPUT exitcode=0 if test "$have_x" = "no" then - echo - echo "*** Warning: X development files not found. Wine will be built without" - echo "*** X support, which currently does not work, and would probably not be" - echo "*** what you want anyway. You will need to install devel packages of" - echo "*** Xlib/Xfree86 at the very least." + echo >&2 + AC_MSG_WARN([X development files not found. Wine will be built without]) + AC_MSG_WARN([X support, which currently does not work, and probably]) + AC_MSG_WARN([isn't what you want anyway. You will need to install devel]) + AC_MSG_WARN([ packages of Xlib/Xfree86 at the very least.]) exitcode=1 fi if test "$wine_cv_opengl_version_OK" = "no" then - echo - echo "*** Warning: old Mesa headers detected. Wine will be built without Direct3D" - echo "*** support. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)" + echo >&2 + AC_MSG_WARN([Old Mesa headers detected. Wine will be built without Direct3D]) + AC_MSG_WARN([support. Consider upgrading your Mesa libraries (http://www.mesa3d.org/).]) exitcode=1 fi if test "$wine_cv_msg_freetype" = "yes" then - echo - echo "*** Note: Your system appears to have the FreeType 2 runtime libraries" - echo "*** installed, but 'freetype-config' is not in your PATH. Install the" - echo "*** freetype-devel package (or its equivalent on your distribution) to" - echo "*** enable Wine to use TrueType fonts." + echo >&2 + AC_MSG_WARN([Your system appears to have the FreeType 2 runtime libraries]) + AC_MSG_WARN([installed, but 'freetype-config' is not in your PATH. Install]) + AC_MSG_WARN([the freetype-devel package (or its equivalent on your distribution)]) + AC_MSG_WARN([to enable Wine to use TrueType fonts.]) exitcode=1 fi if test -z "$FONTSSUBDIRS" then - echo + echo >&2 if test "$FONTFORGE" = "false" then - echo "*** Warning: FontForge is missing." + AC_MSG_WARN([FontForge is missing.]) else - echo "*** Warning: FreeType is missing." + AC_MSG_WARN([FreeType is missing.]) fi - echo "*** Fonts will not be built. Dialog text may be invisible or unaligned." + AC_MSG_WARN([Fonts will not be built. Dialog text may be invisible or unaligned.]) exitcode=1 fi @@ -1875,9 +1875,10 @@ if test -z "$ALSALIBS" -a \ "$ac_cv_header_machine_soundcard_h" != "yes" -a \ "$ac_cv_header_soundcard_h" != "yes" then - echo "*** No sound system was found. Windows applications will be silent." - echo "*** The currently supported sound systems are:" - echo "*** ALSA, ARTS, EsounD, AudioIO, Jack, NAS and OSS" + echo >&2 + AC_MSG_WARN([No sound system was found. Windows applications will be silent.]) + AC_MSG_WARN([The currently supported sound systems are:]) + AC_MSG_WARN([ALSA, ARTS, EsounD, AudioIO, Jack, NAS and OSS]) exitcode=1 fi

1 0

Alexandre Julliard : ddraw: Make some functions static.
by Alexandre Julliard 15 Jun '06

15 Jun '06

Module: wine Branch: refs/heads/master Commit: 7f8c29a40733a5d5093121839ec5a7ece45890e7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7f8c29a40733a5d50931218… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 15 17:14:37 2006 +0200 ddraw: Make some functions static. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/main.c | 5 +---- dlls/ddraw/material.c | 8 ++++---- dlls/ddraw/surface.c | 8 ++++---- dlls/ddraw/vertexbuffer.c | 8 ++++---- dlls/ddraw/viewport.c | 2 +- 6 files changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f86321e..cdf4d46 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2703,7 +2703,7 @@ D3D7CB_CreateDepthStencilSurface(IUnknow * so the WineD3DSwapchain has a parent and can be released when the D3D * device is destroyed *****************************************************************************/ -HRESULT WINAPI +static HRESULT WINAPI D3D7CB_CreateAdditionalSwapChain(IUnknown *device, WINED3DPRESENT_PARAMETERS* pPresentationParameters, IWineD3DSwapChain ** ppSwapChain) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 84f8823..4c33d9d 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -50,9 +50,6 @@ #include "ddraw_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); -/* The driver's guid */ -GUID guid = {0x40c1b248,0x9d7d,0x4a29,{0xd7,0xb7,0x4c,0xd8,0x10,0x9f,0x3d,0x5d}}; - /* The configured default surface */ WINED3DSURFTYPE DefaultSurfaceType = SURFACE_UNKNOWN; @@ -720,7 +717,7 @@ HRESULT WINAPI DllCanUnloadNow(void) * Returns: * DDENUMRET_OK; *******************************************************************************/ -HRESULT WINAPI +static HRESULT WINAPI DestroyCallback(IDirectDrawSurface7 *surf, DDSURFACEDESC2 *desc, void *context) diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c index df5783d..36e617d 100644 --- a/dlls/ddraw/material.c +++ b/dlls/ddraw/material.c @@ -312,7 +312,7 @@ IDirect3DMaterialImpl_GetHandle(IDirect3 return DD_OK; } -HRESULT WINAPI +static HRESULT WINAPI Thunk_IDirect3DMaterialImpl_2_GetHandle(LPDIRECT3DMATERIAL2 iface, LPDIRECT3DDEVICE2 lpDirect3DDevice2, LPD3DMATERIALHANDLE lpHandle) @@ -323,7 +323,7 @@ Thunk_IDirect3DMaterialImpl_2_GetHandle( lpHandle); } -HRESULT WINAPI +static HRESULT WINAPI Thunk_IDirect3DMaterialImpl_1_GetHandle(LPDIRECT3DMATERIAL iface, LPDIRECT3DDEVICE lpDirect3DDevice, LPD3DMATERIALHANDLE lpHandle) @@ -334,7 +334,7 @@ Thunk_IDirect3DMaterialImpl_1_GetHandle( lpHandle); } -HRESULT WINAPI +static HRESULT WINAPI Thunk_IDirect3DMaterialImpl_2_QueryInterface(LPDIRECT3DMATERIAL2 iface, REFIID riid, LPVOID* obp) @@ -345,7 +345,7 @@ Thunk_IDirect3DMaterialImpl_2_QueryInter obp); } -HRESULT WINAPI +static HRESULT WINAPI Thunk_IDirect3DMaterialImpl_1_QueryInterface(LPDIRECT3DMATERIAL iface, REFIID riid, LPVOID* obp) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 113ec5f..212b9b3 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1144,7 +1144,7 @@ IDirectDrawSurfaceImpl_PageUnlock(IDirec * DDERR_UNSUPPORTED * *****************************************************************************/ -HRESULT WINAPI IDirectDrawSurfaceImpl_BltBatch(IDirectDrawSurface7 *iface, DDBLTBATCH *Batch, DWORD Count, DWORD Flags) +static HRESULT WINAPI IDirectDrawSurfaceImpl_BltBatch(IDirectDrawSurface7 *iface, DDBLTBATCH *Batch, DWORD Count, DWORD Flags) { TRACE("(%p)->(%p,%ld,%08lx)\n",iface,Batch,Count,Flags); @@ -1218,7 +1218,7 @@ IDirectDrawSurfaceImpl_EnumAttachedSurfa * DD_OK, because it's a stub * *****************************************************************************/ -HRESULT WINAPI +static HRESULT WINAPI IDirectDrawSurfaceImpl_EnumOverlayZOrders(IDirectDrawSurface7 *iface, DWORD Flags, void *context, @@ -1628,7 +1628,7 @@ IDirectDrawSurfaceImpl_GetDDInterface(ID } /* This seems also windows implementation specific - I don't think WineD3D needs this */ -HRESULT WINAPI IDirectDrawSurfaceImpl_ChangeUniquenessValue(IDirectDrawSurface7 *iface) +static HRESULT WINAPI IDirectDrawSurfaceImpl_ChangeUniquenessValue(IDirectDrawSurface7 *iface) { ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirectDrawSurface7, iface); volatile IDirectDrawSurfaceImpl* vThis = This; @@ -1653,7 +1653,7 @@ HRESULT WINAPI IDirectDrawSurfaceImpl_Ch return DD_OK; } -HRESULT WINAPI IDirectDrawSurfaceImpl_GetUniquenessValue(IDirectDrawSurface7 *iface, LPDWORD pValue) +static HRESULT WINAPI IDirectDrawSurfaceImpl_GetUniquenessValue(IDirectDrawSurface7 *iface, LPDWORD pValue) { ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirectDrawSurface7, iface); diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 0514038..9dfe9ce 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -124,7 +124,7 @@ Thunk_IDirect3DVertexBufferImpl_1_QueryI * The new refcount * *****************************************************************************/ -ULONG WINAPI +static ULONG WINAPI IDirect3DVertexBufferImpl_AddRef(IDirect3DVertexBuffer7 *iface) { ICOM_THIS_FROM(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer7, iface); @@ -135,7 +135,7 @@ IDirect3DVertexBufferImpl_AddRef(IDirect return ref; } -ULONG WINAPI +static ULONG WINAPI Thunk_IDirect3DVertexBufferImpl_1_AddRef(IDirect3DVertexBuffer *iface) { ICOM_THIS_FROM(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer, iface); @@ -154,7 +154,7 @@ Thunk_IDirect3DVertexBufferImpl_1_AddRef * The new refcount * *****************************************************************************/ -ULONG WINAPI +static ULONG WINAPI IDirect3DVertexBufferImpl_Release(IDirect3DVertexBuffer7 *iface) { ICOM_THIS_FROM(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer7, iface); @@ -171,7 +171,7 @@ IDirect3DVertexBufferImpl_Release(IDirec return ref; } -ULONG WINAPI +static ULONG WINAPI Thunk_IDirect3DVertexBufferImpl_1_Release(IDirect3DVertexBuffer *iface) { ICOM_THIS_FROM(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer, iface); diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index ab06ece..f1ac9e3 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -283,7 +283,7 @@ IDirect3DViewportImpl_GetViewport(IDirec * DDERR_INVALIDPARAMS if Data is NULL * *****************************************************************************/ -HRESULT WINAPI +static HRESULT WINAPI IDirect3DViewportImpl_SetViewport(IDirect3DViewport3 *iface, D3DVIEWPORT *lpData) {

1 0

Stefan Dösinger : wined3d: Support more than one back buffer.
by Alexandre Julliard 15 Jun '06

15 Jun '06

Module: wine Branch: refs/heads/master Commit: 3862f8e3d771fef8dd99fd0029387f91671f62a4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3862f8e3d771fef8dd99fd0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jun 15 12:54:19 2006 +0200 wined3d: Support more than one back buffer. --- dlls/d3d8/tests/device.c | 3 - dlls/d3d9/tests/device.c | 3 - dlls/wined3d/device.c | 120 ++++++++++++++++++++++++++++++---------- dlls/wined3d/drawprim.c | 2 - dlls/wined3d/surface.c | 58 ++++++++++++++----- dlls/wined3d/swapchain.c | 21 ++++--- dlls/wined3d/wined3d_private.h | 2 - 7 files changed, 147 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=3862f8e3d771fef8dd9…

1 0

Alexandre Julliard : d3d8: Remove dependencies on OpenGL headers and libraries.
by Alexandre Julliard 15 Jun '06

15 Jun '06

Module: wine Branch: refs/heads/master Commit: 558fbb8af887963be5c4d1ebe19598dbd5d06b45 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=558fbb8af887963be5c4d1e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 15 16:51:57 2006 +0200 d3d8: Remove dependencies on OpenGL headers and libraries. --- dlls/d3d8/Makefile.in | 3 +-- dlls/d3d8/d3d8_private.h | 13 ------------- 2 files changed, 1 insertions(+), 15 deletions(-) diff --git a/dlls/d3d8/Makefile.in b/dlls/d3d8/Makefile.in index eb490bb..e4bc35c 100644 --- a/dlls/d3d8/Makefile.in +++ b/dlls/d3d8/Makefile.in @@ -5,8 +5,7 @@ VPATH = @srcdir@ MODULE = d3d8.dll IMPORTLIB = libd3d8.$(IMPLIBEXT) IMPORTS = wined3d user32 gdi32 advapi32 kernel32 -EXTRAINCL = @X_CFLAGS@ -EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@ +EXTRALIBS = -ldxguid -luuid C_SRCS = \ basetexture.c \ diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index f90c53e..7b7ebf5 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -23,19 +23,6 @@ #ifndef __WINE_D3D8_PRIVATE_H #define __WINE_D3D8_PRIVATE_H -#ifndef __WINE_CONFIG_H -# error You must include config.h to use this header -#endif - -#undef APIENTRY -#undef CALLBACK -#undef WINAPI - -/* Redefines the constants */ -#define CALLBACK __stdcall -#define WINAPI __stdcall -#define APIENTRY WINAPI - #include <stdarg.h> #define NONAMELESSUNION

1 0

Alexandre Julliard : d3d9: Remove dependencies on OpenGL headers and libraries.
by Alexandre Julliard 15 Jun '06

15 Jun '06

Module: wine Branch: refs/heads/master Commit: 7b27b33495f1e70cb5e7754ed9ef72c8e399aebe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7b27b33495f1e70cb5e7754… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 15 16:52:01 2006 +0200 d3d9: Remove dependencies on OpenGL headers and libraries. --- dlls/d3d9/Makefile.in | 3 +-- dlls/d3d9/d3d9_private.h | 13 ------------- 2 files changed, 1 insertions(+), 15 deletions(-) diff --git a/dlls/d3d9/Makefile.in b/dlls/d3d9/Makefile.in index e78c9a0..0d0f65d 100644 --- a/dlls/d3d9/Makefile.in +++ b/dlls/d3d9/Makefile.in @@ -5,8 +5,7 @@ VPATH = @srcdir@ MODULE = d3d9.dll IMPORTLIB = libd3d9.$(IMPLIBEXT) IMPORTS = wined3d user32 gdi32 kernel32 -EXTRAINCL = @X_CFLAGS@ -EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@ +EXTRALIBS = -ldxguid -luuid C_SRCS = \ basetexture.c \ diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index b114dde..bf96731 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -23,10 +23,6 @@ #ifndef __WINE_D3D9_PRIVATE_H #define __WINE_D3D9_PRIVATE_H -#ifndef __WINE_CONFIG_H -# error You must include config.h to use this header -#endif - #include <stdarg.h> #define NONAMELESSUNION @@ -38,15 +34,6 @@ #include "winuser.h" #include "wine/debug.h" #include "wine/unicode.h" -#undef APIENTRY -#undef CALLBACK -#undef WINAPI - -/* Redefines the constants */ -#define CALLBACK __stdcall -#define WINAPI __stdcall -#define APIENTRY WINAPI - #include "gdi.h" #include "d3d9.h" #include "ddraw.h"

1 0

Alexandre Julliard : d3dx8: Remove dependencies on OpenGL headers and libraries.
by Alexandre Julliard 15 Jun '06

15 Jun '06

Module: wine Branch: refs/heads/master Commit: 0b56f2c6cb86bbd152fc80d164d4bc203506c360 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0b56f2c6cb86bbd152fc80d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 15 16:52:05 2006 +0200 d3dx8: Remove dependencies on OpenGL headers and libraries. --- dlls/d3dx8/Makefile.in | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/Makefile.in b/dlls/d3dx8/Makefile.in index 4ddc48d..ffd1a57 100644 --- a/dlls/d3dx8/Makefile.in +++ b/dlls/d3dx8/Makefile.in @@ -5,8 +5,7 @@ VPATH = @srcdir@ MODULE = d3dx8.dll IMPORTLIB = libd3dx8.$(IMPLIBEXT) IMPORTS = d3d8 user32 gdi32 kernel32 -EXTRAINCL = @X_CFLAGS@ -EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@ +EXTRALIBS = -ldxguid -luuid C_SRCS = \ d3dx8_main.c \

1 0

Stefan Dösinger : ddraw: Rewrite most of ddraw using WineD3D.
by Alexandre Julliard 15 Jun '06

15 Jun '06

Module: wine Branch: refs/heads/master Commit: c8901d6f6253f6c97610eb1068ac4ff89758ed0a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c8901d6f6253f6c97610eb1… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Jun 9 19:36:12 2006 +0200 ddraw: Rewrite most of ddraw using WineD3D. --- dlls/ddraw/Makefile.in | 44 dlls/ddraw/clipper.c | 306 +-- dlls/ddraw/d3d_private.h | 1234 ---------- dlls/ddraw/d3d_utils.c | 391 --- dlls/ddraw/ddraw.c | 3046 +++++++++++++++++++++++++ dlls/ddraw/ddraw.spec | 4 dlls/ddraw/ddraw_hal.c | 578 ----- dlls/ddraw/ddraw_main.c | 1787 --------------- dlls/ddraw/ddraw_private.h | 1454 ++++-------- dlls/ddraw/ddraw_thunks.c | 63 - dlls/ddraw/ddraw_user.c | 575 ----- dlls/ddraw/ddraw_utils.c | 951 -------- dlls/ddraw/device.c | 4574 ++++++++++++++++++++++++++++++++++++++ dlls/ddraw/device_main.c | 2241 ------------------- dlls/ddraw/device_opengl.c | 4450 ------------------------------------- dlls/ddraw/direct3d.c | 1394 ++++++++++++ dlls/ddraw/direct3d_main.c | 439 ---- dlls/ddraw/direct3d_opengl.c | 445 ---- dlls/ddraw/executebuffer.c | 462 ++-- dlls/ddraw/gamma.c | 213 ++ dlls/ddraw/gl_api.h | 125 - dlls/ddraw/gl_private.h | 174 - dlls/ddraw/light.c | 255 +- dlls/ddraw/main.c | 1150 +++++----- dlls/ddraw/material.c | 419 ++- dlls/ddraw/opengl_private.h | 222 -- dlls/ddraw/opengl_utils.c | 1326 ----------- dlls/ddraw/palette.c | 240 ++ dlls/ddraw/palette_hal.c | 134 - dlls/ddraw/palette_main.c | 281 -- dlls/ddraw/parent.c | 152 + dlls/ddraw/surface.c | 2091 +++++++++++++++++ dlls/ddraw/surface_dib.c | 1483 ------------ dlls/ddraw/surface_fakezbuffer.c | 312 --- dlls/ddraw/surface_gamma.c | 79 - dlls/ddraw/surface_hal.c | 411 --- dlls/ddraw/surface_main.c | 1516 ------------- dlls/ddraw/surface_thunks.c | 12 dlls/ddraw/surface_user.c | 675 ------ dlls/ddraw/surface_wndproc.c | 104 - dlls/ddraw/tests/d3d.c | 224 +- dlls/ddraw/texture.c | 1215 +++------- dlls/ddraw/utils.c | 1171 ++++++++++ dlls/ddraw/vertexbuffer.c | 872 ++++--- dlls/ddraw/viewport.c | 655 ++++- 45 files changed, 16306 insertions(+), 23643 deletions(-) delete mode 100644 dlls/ddraw/d3d_private.h delete mode 100644 dlls/ddraw/d3d_utils.c create mode 100644 dlls/ddraw/ddraw.c delete mode 100644 dlls/ddraw/ddraw_hal.c delete mode 100644 dlls/ddraw/ddraw_main.c delete mode 100644 dlls/ddraw/ddraw_user.c delete mode 100644 dlls/ddraw/ddraw_utils.c create mode 100644 dlls/ddraw/device.c delete mode 100644 dlls/ddraw/device_main.c delete mode 100644 dlls/ddraw/device_opengl.c create mode 100644 dlls/ddraw/direct3d.c delete mode 100644 dlls/ddraw/direct3d_main.c delete mode 100644 dlls/ddraw/direct3d_opengl.c create mode 100644 dlls/ddraw/gamma.c delete mode 100644 dlls/ddraw/gl_api.h delete mode 100644 dlls/ddraw/gl_private.h delete mode 100644 dlls/ddraw/opengl_private.h delete mode 100644 dlls/ddraw/opengl_utils.c create mode 100644 dlls/ddraw/palette.c delete mode 100644 dlls/ddraw/palette_hal.c delete mode 100644 dlls/ddraw/palette_main.c create mode 100644 dlls/ddraw/parent.c create mode 100644 dlls/ddraw/surface.c delete mode 100644 dlls/ddraw/surface_dib.c delete mode 100644 dlls/ddraw/surface_fakezbuffer.c delete mode 100644 dlls/ddraw/surface_gamma.c delete mode 100644 dlls/ddraw/surface_hal.c delete mode 100644 dlls/ddraw/surface_main.c delete mode 100644 dlls/ddraw/surface_user.c delete mode 100644 dlls/ddraw/surface_wndproc.c create mode 100644 dlls/ddraw/utils.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=c8901d6f6253f6c9761…

1 0

Alexandre Julliard : server: Fixed a compiler warning on MacOSX.
by Alexandre Julliard 15 Jun '06

15 Jun '06

Module: wine Branch: refs/heads/master Commit: 0fa7170dc318a6624f960c49e459cb521d2ae999 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0fa7170dc318a6624f960c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 15 14:14:31 2006 +0200 server: Fixed a compiler warning on MacOSX. --- server/fd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/fd.c b/server/fd.c index d2b7eca..7806bae 100644 --- a/server/fd.c +++ b/server/fd.c @@ -278,7 +278,7 @@ static file_pos_t max_unix_offset = OFF_ #define DUMP_LONG_LONG(val) do { \ if (sizeof(val) > sizeof(unsigned long) && (val) > ~0UL) \ - fprintf( stderr, "%lx%08lx", (unsigned long)((val) >> 32), (unsigned long)(val) ); \ + fprintf( stderr, "%lx%08lx", (unsigned long)((unsigned long long)(val) >> 32), (unsigned long)(val) ); \ else \ fprintf( stderr, "%lx", (unsigned long)(val) ); \ } while (0)

1 0