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

Alexandre Julliard : libwine: Add a minor number to the library filename for future extensions.
by Alexandre Julliard 07 Aug '06

07 Aug '06

Module: wine Branch: refs/heads/master Commit: 539442c7f83b6453f32cfe6840800d432382cacf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=539442c7f83b6453f32cfe6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 5 21:29:58 2006 +0200 libwine: Add a minor number to the library filename for future extensions. --- libs/.gitignore | 2 +- libs/wine/Makefile.in | 30 ++++++++++++++++++++---------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/libs/.gitignore b/libs/.gitignore index 966ebc6..ff27f54 100644 --- a/libs/.gitignore +++ b/libs/.gitignore @@ -1,2 +1,2 @@ *.dylib -*.so.1 +*.so.* diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 3f8cf3e..fff6d4c 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -9,6 +9,7 @@ VERSCRIPT = $(SRCDIR)/wine.map EXTRALIBS = $(LIBPORT) @DLLIBS@ @CRTLIBS@ DEFS = -D__WINESRC__ -DWINE_UNICODE_API="" +VERSION = 1.0 SOVERSION = 1 SONAME = libwine.so.$(SOVERSION) DYNAME = libwine.$(SOVERSION).dylib @@ -113,9 +114,12 @@ config.o: config.c $(RELPATH) # Linking rules -libwine.so.$(SOVERSION): $(OBJS) $(VERSCRIPT) Makefile.in +libwine.so.$(VERSION): $(OBJS) $(VERSCRIPT) Makefile.in $(LDSHARED) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@ +libwine.so.$(SOVERSION): libwine.so.$(VERSION) + $(RM) $@ && $(LN_S) libwine.so.$(VERSION) $@ + libwine.so: libwine.so.$(SOVERSION) $(RM) $@ && $(LN_S) libwine.so.$(SOVERSION) $@ @@ -125,9 +129,12 @@ libwine.a: wine.def libwine.dll: $(OBJS) wine.def Makefile.in $(DLLWRAP) --def $(SRCDIR)/wine.def -o $@ $(OBJS) $(EXTRALIBS) -libwine.$(SOVERSION).dylib: $(OBJS) $(RELPATH) Makefile.in +libwine.$(VERSION).dylib: $(OBJS) $(RELPATH) Makefile.in $(LDSHARED) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@ +libwine.$(SOVERSION).dylib: libwine.$(VERSION).dylib + $(RM) $@ && $(LN_S) libwine.$(VERSION).dylib $@ + libwine.dylib: libwine.$(SOVERSION).dylib $(RM) $@ && $(LN_S) libwine.$(SOVERSION).dylib $@ @@ -135,21 +142,23 @@ # Install rules .PHONY: install-lib-so install-lib-dll install-lib-dylib install-dev-so install-dev-dll install-dev-dylib -install-lib-so: libwine.so.$(SOVERSION) dummy +install-lib-so: libwine.so.$(VERSION) dummy $(MKINSTALLDIRS) $(DESTDIR)$(libdir) - $(INSTALL_PROGRAM) libwine.so.$(SOVERSION) $(DESTDIR)$(libdir)/libwine.so.$(SOVERSION) + $(INSTALL_PROGRAM) libwine.so.$(VERSION) $(DESTDIR)$(libdir)/libwine.so.$(VERSION) + cd $(DESTDIR)$(libdir) && $(RM) libwine.so.$(SOVERSION) && $(LN_S) libwine.so.$(VERSION) libwine.so.$(SOVERSION) install-lib-dll: libwine.dll dummy $(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(INSTALL_DATA) libwine.dll $(DESTDIR)$(libdir)/libwine.dll -install-lib-dylib: libwine.$(SOVERSION).dylib dummy +install-lib-dylib: libwine.$(VERSION).dylib dummy $(MKINSTALLDIRS) $(DESTDIR)$(libdir) - $(INSTALL_PROGRAM) libwine.$(SOVERSION).dylib $(DESTDIR)$(libdir)/libwine.$(SOVERSION).dylib + $(INSTALL_PROGRAM) libwine.$(VERSION).dylib $(DESTDIR)$(libdir)/libwine.$(VERSION).dylib + cd $(DESTDIR)$(libdir) && $(RM) libwine.$(SOVERSION).dylib && $(LN_S) libwine.$(VERSION).dylib libwine.$(SOVERSION).dylib install-dev-so: dummy $(MKINSTALLDIRS) $(DESTDIR)$(libdir) - cd $(DESTDIR)$(libdir) && $(RM) libwine.so && $(LN_S) libwine.so.$(SOVERSION) libwine.so + cd $(DESTDIR)$(libdir) && $(RM) libwine.so && $(LN_S) libwine.so.$(VERSION) libwine.so install-dev-dll: libwine.a dummy $(MKINSTALLDIRS) $(DESTDIR)$(libdir) @@ -157,16 +166,17 @@ install-dev-dll: libwine.a dummy install-dev-dylib: dummy $(MKINSTALLDIRS) $(DESTDIR)$(libdir) - cd $(DESTDIR)$(libdir) && $(RM) libwine.dylib && $(LN_S) libwine.$(SOVERSION).dylib libwine.dylib + cd $(DESTDIR)$(libdir) && $(RM) libwine.dylib && $(LN_S) libwine.$(VERSION).dylib libwine.dylib install install-lib:: $(LIBEXT:%=install-lib-%) install install-dev:: $(LIBEXT:%=install-dev-%) uninstall:: - -cd $(DESTDIR)$(libdir) && $(RM) libwine.a libwine.dll libwine.so libwine.so.$(SOVERSION) libwine.dylib libwine.$(SOVERSION).dylib + -cd $(DESTDIR)$(libdir) && $(RM) libwine.a libwine.dll libwine.so libwine.so.$(VERSION) \ + libwine.so.$(SOVERSION) libwine.dylib libwine.$(VERSION).dylib libwine.$(SOVERSION).dylib clean:: - $(RM) libwine.so.$(SOVERSION) + $(RM) libwine.so.$(SOVERSION) libwine.so.$(VERSION) $(RELPATH): @cd $(TOOLSDIR)/tools && $(MAKE) relpath

1 0

Krzysztof Foltman : riched20: Ensure text is wrapped before invalidating selection.
by Alexandre Julliard 07 Aug '06

07 Aug '06

Module: wine Branch: refs/heads/master Commit: 3a0c15e939a5a02f91142f34829a61ee74203dd6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3a0c15e939a5a02f91142f3… Author: Krzysztof Foltman <wdev(a)foltman.com> Date: Fri Aug 4 23:40:06 2006 +0200 riched20: Ensure text is wrapped before invalidating selection. --- dlls/riched20/caret.c | 1 + dlls/riched20/paint.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index da52288..5124822 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -118,6 +118,7 @@ ME_GetCursorCoordinates(ME_TextEditor *e assert(!pCursor->nOffset || !editor->bCaretAtEnd); assert(height && x && y); + assert(!(ME_GetParagraph(pCursorRun)->member.para.nFlags & MEPF_REWRAP)); if (pCursorRun->type == diRun) { ME_DisplayItem *row = ME_FindItemBack(pCursorRun, diStartRowOrParagraph); diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index f26583c..899f2d0 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -505,6 +505,7 @@ ME_InvalidateFromOfs(ME_TextEditor *edit void ME_InvalidateSelection(ME_TextEditor *editor) { + ME_WrapMarkedParagraphs(editor); if (ME_IsSelection(editor) || editor->nLastSelStart != editor->nLastSelEnd) { int x, y, height;

1 0

Francois Gouget : mshtml: Fix the .jfif Content Type.
by Alexandre Julliard 07 Aug '06

07 Aug '06

Module: wine Branch: refs/heads/master Commit: c5c447ef18fb8937848459e70480829c559a573b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c5c447ef18fb8937848459e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Aug 5 11:42:25 2006 +0200 mshtml: Fix the .jfif Content Type. --- dlls/mshtml/mshtml.inf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/mshtml.inf b/dlls/mshtml/mshtml.inf index e64c16d..e0098ce 100644 --- a/dlls/mshtml/mshtml.inf +++ b/dlls/mshtml/mshtml.inf @@ -381,7 +381,7 @@ HKCR,"MIME\Database\Content Type\image/p HKCR,"MIME\Database\Content Type\image/pjpeg\Bits","0",1,02,00,00,00,FF,FF,FF,D8 HKCR,"MIME\Database\Content Type\image/pjpeg","Image Filter CLSID",,"%CLSID_IImageDecodeFilter%" HKCR,".jfif",,,"pjpegfile" -HKCR,".jfif","Content Type",,"image/pjpeg" +HKCR,".jfif","Content Type",,"image/jpeg" HKCR,"pjpegfile",,,"JPEG Image" HKCR,"pjpegfile\CLSID",,,"%CLSID_HTMLDocument%" ;; HKCR,"pjpegfile\shell\open\command",,,"""%IEXPLORE%"" -nohome"

1 0

Francois Gouget : wine.inf: We should not override existing associations.
by Alexandre Julliard 07 Aug '06

07 Aug '06

Module: wine Branch: refs/heads/master Commit: e9106273d9f80188400e5caaabacf27327664a14 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e9106273d9f80188400e5ca… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Aug 5 11:43:30 2006 +0200 wine.inf: We should not override existing associations. --- tools/wine.inf | 82 ++++++++++++++++++++++++++++---------------------------- 1 files changed, 41 insertions(+), 41 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 077f68e..a39670d 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -81,47 +81,47 @@ FontSubStr="Software\Microsoft\Windows N Control="System\CurrentControlSet\Control" [Classes] -HKCR,.avi,"Content Type",,"video/avi" -HKCR,.dll,"Content Type",,"application/x-msdownload" -HKCR,.exe,,,"exefile" -HKCR,.exe,"Content Type",,"application/x-msdownload" -HKCR,.htm,,,"htmlfile" -HKCR,.htm,"Content Type",,"text/html" -HKCR,.html,,,"htmlfile" -HKCR,.html,"Content Type",,"text/html" -HKCR,.ini,,,"inifile" -HKCR,.jfif,"Content Type",,"image/jpeg" -HKCR,.lnk,,,"lnkfile" -HKCR,.msi,,,"Msi.Package" -HKCR,.tif,"Content Type",,"image/tiff" -HKCR,.tiff,"Content Type",,"image/tiff" -HKCR,.txt,,,"txtfile" -HKCR,.wav,"Content Type",,"audio/wav" -HKCR,.xml,"Content Type",,"text/xml" -HKCR,.xsl,"Content Type",,"text/xsl" -HKCR,exefile\DefaultIcon,,,"%1" -HKCR,exefile\shell\open\command,,,"""%1"" %*" -HKCR,folder\shell\open\ddeexec,,,"[ViewFolder("%l", %I, %S)]" -HKCR,folder\shell\open\ddeexec,"NoActivateHandler",,"" -HKCR,folder\shell\open\ddeexec\application,,,"Folders" -HKCR,htmlfile\shell\open\command,,,"winebrowser" -HKCR,inifile\shell\open\command,,,"%11%\notepad.exe %1" -HKCR,inifile\shell\print\command,,,"%11%\notepad.exe /p %1" -HKCR,lnkfile,,,"Shortcut" -HKCR,lnkfile,"NeverShowExt",,"" -HKCR,lnkfile,"IsShortcut",,"yes" -HKCR,lnkfile\CLSID,,,"{00021401-0000-0000-C000-000000000046}" -HKCR,lnkfile\shellex\IconHandler,,,"{00021401-0000-0000-C000-000000000046}" -HKCR,lnkfile\shellex\ContextMenuHandlers\{00021401-0000-0000-C000-000000000046},,, -HKCR,Msi.Package\DefaultIcon,,,"msiexec.exe" -HKCR,Msi.Package\shell\Open\command,,,"msiexec /i %1" -HKCR,Msi.Package\shell\Repair\command,,,"msiexec /f %1" -HKCR,Msi.Package\shell\Uninstall\command,,,"msiexec /x %1" -HKCR,txtfile\shell\open\command,,,"%11%\notepad.exe %1" -HKCR,txtfile\shell\print\command,,,"%11%\notepad.exe /p %1" -HKCR,http\shell\open\command,,,"winebrowser" -HKCR,https\shell\open\command,,,"winebrowser" -HKCR,mailto\shell\open\command,,,"winebrowser %1" +HKCR,.avi,"Content Type",2,"video/avi" +HKCR,.dll,"Content Type",2,"application/x-msdownload" +HKCR,.exe,,2,"exefile" +HKCR,.exe,"Content Type",2,"application/x-msdownload" +HKCR,.htm,,2,"htmlfile" +HKCR,.htm,"Content Type",2,"text/html" +HKCR,.html,,2,"htmlfile" +HKCR,.html,"Content Type",2,"text/html" +HKCR,.ini,,2,"inifile" +HKCR,.jfif,"Content Type",2,"image/jpeg" +HKCR,.lnk,,2,"lnkfile" +HKCR,.msi,,2,"Msi.Package" +HKCR,.tif,"Content Type",2,"image/tiff" +HKCR,.tiff,"Content Type",2,"image/tiff" +HKCR,.txt,,2,"txtfile" +HKCR,.wav,"Content Type",2,"audio/wav" +HKCR,.xml,"Content Type",2,"text/xml" +HKCR,.xsl,"Content Type",2,"text/xsl" +HKCR,exefile\DefaultIcon,,2,"%1" +HKCR,exefile\shell\open\command,,2,"""%1"" %*" +HKCR,folder\shell\open\ddeexec,,2,"[ViewFolder("%l", %I, %S)]" +HKCR,folder\shell\open\ddeexec,"NoActivateHandler",2,"" +HKCR,folder\shell\open\ddeexec\application,,2,"Folders" +HKCR,htmlfile\shell\open\command,,2,"winebrowser" +HKCR,inifile\shell\open\command,,2,"%11%\notepad.exe %1" +HKCR,inifile\shell\print\command,,2,"%11%\notepad.exe /p %1" +HKCR,lnkfile,,2,"Shortcut" +HKCR,lnkfile,"NeverShowExt",2,"" +HKCR,lnkfile,"IsShortcut",2,"yes" +HKCR,lnkfile\CLSID,,2,"{00021401-0000-0000-C000-000000000046}" +HKCR,lnkfile\shellex\IconHandler,,2,"{00021401-0000-0000-C000-000000000046}" +HKCR,lnkfile\shellex\ContextMenuHandlers\{00021401-0000-0000-C000-000000000046},,2,"" +HKCR,Msi.Package\DefaultIcon,,2,"msiexec.exe" +HKCR,Msi.Package\shell\Open\command,,2,"msiexec /i %1" +HKCR,Msi.Package\shell\Repair\command,,2,"msiexec /f %1" +HKCR,Msi.Package\shell\Uninstall\command,,2,"msiexec /x %1" +HKCR,txtfile\shell\open\command,,2,"%11%\notepad.exe %1" +HKCR,txtfile\shell\print\command,,2,"%11%\notepad.exe /p %1" +HKCR,http\shell\open\command,,2,"winebrowser" +HKCR,https\shell\open\command,,2,"winebrowser" +HKCR,mailto\shell\open\command,,2,"winebrowser %1" ; FIXME: the following should be done by the dll registration HKCR,AVIFile\Compressors\auds,,,"{0002000F-0000-0000-C000-000000000046}" HKCR,AVIFile\Compressors\vids,,,"{00020001-0000-0000-C000-000000000046}"

1 0

Robert Reif : netapi32: Add stub for NetUserGetLocalGroups.
by Alexandre Julliard 05 Aug '06

05 Aug '06

Module: wine Branch: refs/heads/master Commit: fb2017d4f4d5d484493c0612e4cba4b83032f93e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fb2017d4f4d5d484493c061… Author: Robert Reif <reif(a)earthlink.net> Date: Fri Aug 4 19:12:34 2006 -0400 netapi32: Add stub for NetUserGetLocalGroups. --- dlls/netapi32/access.c | 14 +++++++++++++- dlls/netapi32/netapi32.spec | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index a5b1f89..872f395 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -303,7 +303,19 @@ NetUserGetInfo(LPCWSTR servername, LPCWS return NERR_Success; } - +/************************************************************ + * NetUserGetLocalGroups (NETAPI32.@) + */ +NET_API_STATUS WINAPI +NetUserGetLocalGroups(LPCWSTR servername, LPCWSTR username, DWORD level, + DWORD flags, LPBYTE* bufptr, DWORD prefmaxlen, + LPDWORD entriesread, LPDWORD totalentries) +{ + FIXME("(%s, %s, %ld, %08lx, %p %ld, %p, %p) stub!\n", + debugstr_w(servername), debugstr_w(username), level, flags, bufptr, + prefmaxlen, entriesread, totalentries); + return NERR_InternalError; +} /************************************************************ * NetUserEnum (NETAPI32.@) diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index ab1aa3d..7868bc9 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -205,7 +205,7 @@ @ stdcall NetUserEnum(wstr long long ptr long ptr ptr ptr) @ stub NetUserGetGroups @ stdcall NetUserGetInfo(wstr wstr long ptr) -@ stub NetUserGetLocalGroups +@ stdcall NetUserGetLocalGroups(ptr ptr long long ptr long ptr ptr); @ stdcall NetUserModalsGet(wstr long ptr) @ stub NetUserModalsSet @ stub NetUserSetGroups

1 0

Robert Reif : netapi32: Add stub for NetLocalGroupEnum.
by Alexandre Julliard 05 Aug '06

05 Aug '06

Module: wine Branch: refs/heads/master Commit: f1adcb191f45743cd0ef893d3f39922c5a9c5fb3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f1adcb191f45743cd0ef893… Author: Robert Reif <reif(a)earthlink.net> Date: Fri Aug 4 18:35:04 2006 -0400 netapi32: Add stub for NetLocalGroupEnum. --- dlls/netapi32/access.c | 16 ++++++++++++++++ dlls/netapi32/netapi32.spec | 2 +- 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 4701156..cb413cd 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -686,6 +686,22 @@ NET_API_STATUS WINAPI NetLocalGroupAdd(L } /************************************************************ + * NetLocalGroupEnum (NETAPI32.@) + */ +NET_API_STATUS WINAPI NetLocalGroupEnum(LPCWSTR servername, DWORD level, + LPBYTE* bufptr, DWORD prefmaxlen, + LPDWORD entriesread, + LPDWORD totalentries, + PDWORD_PTR resumehandle) +{ + FIXME("(%s %ld %p %ld %p %p %p) stub!\n", debugstr_w(servername), + level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle); + *entriesread = 0; + *totalentries = 0; + return NERR_Success; +} + +/************************************************************ * NetLocalGroupSetMember (NETAPI32.@) */ diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index 392cef7..ab1aa3d 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -107,7 +107,7 @@ @ stub NetLocalGroupDel @ stub NetLocalGroupDelMember @ stub NetLocalGroupDelMembers -@ stub NetLocalGroupEnum +@ stdcall NetLocalGroupEnum(ptr long ptr long ptr ptr ptr) @ stub NetLocalGroupGetInfo @ stub NetLocalGroupGetMembers @ stub NetLocalGroupSetInfo

1 0

Robert Reif : netapi32: Return an error for unimplemented levels in NetUserGetInfo.
by Alexandre Julliard 05 Aug '06

05 Aug '06

Module: wine Branch: refs/heads/master Commit: 651ac4697089b4b756b1232f1b29fd757396d372 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=651ac4697089b4b756b1232… Author: Robert Reif <reif(a)earthlink.net> Date: Fri Aug 4 19:00:58 2006 -0400 netapi32: Return an error for unimplemented levels in NetUserGetInfo. --- dlls/netapi32/access.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index cb413cd..a5b1f89 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -294,7 +294,7 @@ NetUserGetInfo(LPCWSTR servername, LPCWS case 1053: { FIXME("Level %ld is not implemented\n", level); - break; + return NERR_InternalError; } default: ERR("Invalid level %ld is specified\n", level);

1 0

Roderick Colenbrander : wined3d: Raster caps fix.
by Alexandre Julliard 05 Aug '06

05 Aug '06

Module: wine Branch: refs/heads/master Commit: 6ded5542b2fed9880d730d21db96ee9ed796b0f8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6ded5542b2fed9880d730d2… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Aug 4 22:42:57 2006 +0200 wined3d: Raster caps fix. --- dlls/wined3d/directx.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 375906b..f621d86 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1726,7 +1726,10 @@ #endif WINED3DPRASTERCAPS_FOGRANGE | WINED3DPRASTERCAPS_STIPPLE | WINED3DPRASTERCAPS_SUBPIXEL | - WINED3DPRASTERCAPS_ZTEST; + WINED3DPRASTERCAPS_ZTEST | + WINED3DPRASTERCAPS_SCISSORTEST | + WINED3DPRASTERCAPS_SLOPESCALEDEPTHBIAS | + WINED3DPRASTERCAPS_DEPTHBIAS; if (GL_SUPPORT(EXT_TEXTURE_FILTER_ANISOTROPIC)) { *pCaps->RasterCaps |= WINED3DPRASTERCAPS_ANISOTROPY |

1 0

Roderick Colenbrander : wined3d: Volume textures fix.
by Alexandre Julliard 05 Aug '06

05 Aug '06

Module: wine Branch: refs/heads/master Commit: 3d9e96f3bc34029c93ceb3fd3f9674d2c69e414d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3d9e96f3bc34029c93ceb3f… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Aug 5 00:11:17 2006 +0200 wined3d: Volume textures fix. --- dlls/wined3d/directx.c | 11 +++++++++-- dlls/wined3d/volume.c | 34 +++++++++++++++++++--------------- include/wine/wined3d_gl.h | 18 ++++++++++++++++++ 3 files changed, 46 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f621d86..04cd41d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -680,6 +680,9 @@ #undef USE_GL_FUNC } else if (strcmp(ThisExtn, "GL_EXT_stencil_wrap") == 0) { TRACE_(d3d_caps)(" FOUND: EXT Stencil wrap support\n"); gl_info->supported[EXT_STENCIL_WRAP] = TRUE; + } else if (strcmp(ThisExtn, "GL_EXT_texture3D") == 0) { + TRACE_(d3d_caps)(" FOUND: EXT_texture3D support\n"); + gl_info->supported[EXT_TEXTURE3D] = TRUE; } else if (strcmp(ThisExtn, "GL_EXT_texture_compression_s3tc") == 0) { TRACE_(d3d_caps)(" FOUND: EXT Texture S3TC compression support\n"); gl_info->supported[EXT_TEXTURE_COMPRESSION_S3TC] = TRUE; @@ -1803,13 +1806,17 @@ #endif *pCaps->TextureCaps = WINED3DPTEXTURECAPS_ALPHA | WINED3DPTEXTURECAPS_ALPHAPALETTE | WINED3DPTEXTURECAPS_BORDER | - WINED3DPTEXTURECAPS_VOLUMEMAP | WINED3DPTEXTURECAPS_MIPMAP | WINED3DPTEXTURECAPS_PROJECTED | WINED3DPTEXTURECAPS_PERSPECTIVE | - WINED3DPTEXTURECAPS_VOLUMEMAP_POW2 | WINED3DPTEXTURECAPS_NONPOW2CONDITIONAL; + if( GL_SUPPORT(EXT_TEXTURE3D)) { + *pCaps->TextureCaps |= WINED3DPTEXTURECAPS_VOLUMEMAP | + WINED3DPTEXTURECAPS_MIPVOLUMEMAP | + WINED3DPTEXTURECAPS_VOLUMEMAP_POW2; + } + if (GL_SUPPORT(ARB_TEXTURE_CUBE_MAP)) { *pCaps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP | WINED3DPTEXTURECAPS_MIPCUBEMAP | diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 82a1d87..5a10b13 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -24,7 +24,7 @@ #include "config.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); -#define GLINFO_LOCATION ((IWineD3DImpl *)(((IWineD3DDeviceImpl *)This->wineD3DDevice)->wineD3D))->gl_info +#define GLINFO_LOCATION ((IWineD3DImpl *)(((IWineD3DDeviceImpl *)This->resource.wineD3DDevice)->wineD3D))->gl_info /* ******************************************* IWineD3DVolume IUnknown parts follow @@ -285,18 +285,19 @@ static HRESULT WINAPI IWineD3DVolumeImpl IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; const PixelFormatDesc *formatEntry = getFormatDescEntry(This->resource.format); - TRACE("Calling glTexImage3D %x level=%d, intfmt=%x, w=%d, h=%d,d=%d, 0=%d, glFmt=%x, glType=%x, Mem=%p\n", - GL_TEXTURE_3D, - gl_level, - formatEntry->glInternal, - This->currentDesc.Width, - This->currentDesc.Height, - This->currentDesc.Depth, - 0, - formatEntry->glFormat, - formatEntry->glType, - This->resource.allocatedMemory); - glTexImage3D(GL_TEXTURE_3D, + if(GL_SUPPORT(EXT_TEXTURE3D)) { + TRACE("Calling glTexImage3D %x level=%d, intfmt=%x, w=%d, h=%d,d=%d, 0=%d, glFmt=%x, glType=%x, Mem=%p\n", + GL_TEXTURE_3D, + gl_level, + formatEntry->glInternal, + This->currentDesc.Width, + This->currentDesc.Height, + This->currentDesc.Depth, + 0, + formatEntry->glFormat, + formatEntry->glType, + This->resource.allocatedMemory); + GL_EXTCALL(glTexImage3DEXT(GL_TEXTURE_3D, gl_level, formatEntry->glInternal, This->currentDesc.Width, @@ -305,8 +306,11 @@ static HRESULT WINAPI IWineD3DVolumeImpl 0, formatEntry->glFormat, formatEntry->glType, - This->resource.allocatedMemory); - checkGLcall("glTexImage3D"); + This->resource.allocatedMemory)); + checkGLcall("glTexImage3D"); + } else + WARN("This OpenGL implementation doesn't support 3D textures\n"); + return WINED3D_OK; } diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index d9b075c..923ca4a 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -350,6 +350,20 @@ #define GL_DISTANCE_ATTENUATION_EXT #endif typedef void (APIENTRY * PGLFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param); typedef void (APIENTRY * PGLFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params); +/* GL_EXT_texture3D */ +#ifndef GL_EXT_texture3D +#define GL_PACK_SKIP_IMAGES_EXT 0x806B +#define GL_PACK_IMAGE_HEIGHT_EXT 0x806C +#define GL_UNPACK_SKIP_IMAGES_EXT 0x806D +#define GL_UNPACK_IMAGE_HEIGHT_EXT 0x806E +#define GL_TEXTURE_3D_EXT 0x806F +#define GL_PROXY_TEXTURE_3D_EXT 0x8070 +#define GL_TEXTURE_DEPTH_EXT 0x8071 +#define GL_TEXTURE_WRAP_R_EXT 0x8072 +#define GL_MAX_3D_TEXTURE_SIZE_EXT 0x8073 +#endif +typedef void (APIENTRY * PGLFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); +typedef void (APIENTRY * PGLFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); /* GL_EXT_texture_env_combine */ #ifndef GL_EXT_texture_env_combine #define GL_EXT_texture_env_combine 1 @@ -1373,6 +1387,7 @@ typedef enum _GL_SupportedExt { EXT_SECONDARY_COLOR, EXT_STENCIL_TWO_SIDE, EXT_STENCIL_WRAP, + EXT_TEXTURE3D, EXT_TEXTURE_COMPRESSION_S3TC, EXT_TEXTURE_FILTER_ANISOTROPIC, EXT_TEXTURE_LOD, @@ -1482,6 +1497,9 @@ #define GL_EXT_FUNCS_GEN \ USE_GL_FUNC(PGLFNGLSECONDARYCOLOR3FEXTPROC, glSecondaryColor3fEXT); \ USE_GL_FUNC(PGLFNGLSECONDARYCOLOR3FVEXTPROC, glSecondaryColor3fvEXT); \ USE_GL_FUNC(PGLFNGLSECONDARYCOLORPOINTEREXTPROC, glSecondaryColorPointerEXT); \ + /* GL_EXT_texture3D */ \ + USE_GL_FUNC(PGLFNGLTEXIMAGE3DEXTPROC, glTexImage3DEXT); \ + USE_GL_FUNC(PGLFNGLTEXSUBIMAGE3DEXTPROC, glTexSubImage3DEXT); \ /* GL_ARB_vertex_program */ \ USE_GL_FUNC(PGLFNGENPROGRAMSARBPROC, glGenProgramsARB); \ USE_GL_FUNC(PGLFNBINDPROGRAMARBPROC, glBindProgramARB); \

1 0

Andrew Talbot : msi: Write-strings warnings fix.
by Alexandre Julliard 05 Aug '06

05 Aug '06

Module: wine Branch: refs/heads/master Commit: d58e1dba4233ac5b69ac978a63624f95c1358e73 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d58e1dba4233ac5b69ac978… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Aug 4 22:27:42 2006 +0100 msi: Write-strings warnings fix. --- dlls/msi/install.c | 12 ++++++------ dlls/msi/msipriv.h | 4 ++-- dlls/msi/tests/package.c | 16 ++++++++-------- include/msiquery.h | 8 ++++---- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index f5e2c42..249102f 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -579,7 +579,7 @@ UINT WINAPI MsiSetFeatureStateW(MSIHANDL /*********************************************************************** * MsiGetFeatureStateA (MSI.@) */ -UINT WINAPI MsiGetFeatureStateA(MSIHANDLE hInstall, LPSTR szFeature, +UINT WINAPI MsiGetFeatureStateA(MSIHANDLE hInstall, LPCSTR szFeature, INSTALLSTATE *piInstalled, INSTALLSTATE *piAction) { LPWSTR szwFeature = NULL; @@ -594,7 +594,7 @@ UINT WINAPI MsiGetFeatureStateA(MSIHANDL return rc; } -UINT MSI_GetFeatureStateW(MSIPACKAGE *package, LPWSTR szFeature, +UINT MSI_GetFeatureStateW(MSIPACKAGE *package, LPCWSTR szFeature, INSTALLSTATE *piInstalled, INSTALLSTATE *piAction) { MSIFEATURE *feature; @@ -617,7 +617,7 @@ UINT MSI_GetFeatureStateW(MSIPACKAGE *pa /*********************************************************************** * MsiGetFeatureStateW (MSI.@) */ -UINT WINAPI MsiGetFeatureStateW(MSIHANDLE hInstall, LPWSTR szFeature, +UINT WINAPI MsiGetFeatureStateW(MSIHANDLE hInstall, LPCWSTR szFeature, INSTALLSTATE *piInstalled, INSTALLSTATE *piAction) { MSIPACKAGE* package; @@ -652,7 +652,7 @@ UINT WINAPI MsiSetComponentStateA(MSIHAN /*********************************************************************** * MsiGetComponentStateA (MSI.@) */ -UINT WINAPI MsiGetComponentStateA(MSIHANDLE hInstall, LPSTR szComponent, +UINT WINAPI MsiGetComponentStateA(MSIHANDLE hInstall, LPCSTR szComponent, INSTALLSTATE *piInstalled, INSTALLSTATE *piAction) { LPWSTR szwComponent= NULL; @@ -683,7 +683,7 @@ static UINT MSI_SetComponentStateW(MSIPA return ERROR_SUCCESS; } -UINT MSI_GetComponentStateW(MSIPACKAGE *package, LPWSTR szComponent, +UINT MSI_GetComponentStateW(MSIPACKAGE *package, LPCWSTR szComponent, INSTALLSTATE *piInstalled, INSTALLSTATE *piAction) { MSICOMPONENT *comp; @@ -726,7 +726,7 @@ UINT WINAPI MsiSetComponentStateW(MSIHAN /*********************************************************************** * MsiGetComponentStateW (MSI.@) */ -UINT WINAPI MsiGetComponentStateW(MSIHANDLE hInstall, LPWSTR szComponent, +UINT WINAPI MsiGetComponentStateW(MSIHANDLE hInstall, LPCWSTR szComponent, INSTALLSTATE *piInstalled, INSTALLSTATE *piAction) { MSIPACKAGE* package; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 27655ae..5d2c21e 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -393,8 +393,8 @@ extern INT MSI_ProcessMessage( MSIPACKAG extern UINT MSI_GetPropertyW( MSIPACKAGE *, LPCWSTR, LPWSTR, DWORD * ); extern UINT MSI_GetPropertyA(MSIPACKAGE *, LPCSTR, LPSTR, DWORD* ); extern MSICONDITION MSI_EvaluateConditionW( MSIPACKAGE *, LPCWSTR ); -extern UINT MSI_GetComponentStateW( MSIPACKAGE *, LPWSTR, INSTALLSTATE *, INSTALLSTATE * ); -extern UINT MSI_GetFeatureStateW( MSIPACKAGE *, LPWSTR, INSTALLSTATE *, INSTALLSTATE * ); +extern UINT MSI_GetComponentStateW( MSIPACKAGE *, LPCWSTR, INSTALLSTATE *, INSTALLSTATE * ); +extern UINT MSI_GetFeatureStateW( MSIPACKAGE *, LPCWSTR, INSTALLSTATE *, INSTALLSTATE * ); extern UINT WINAPI MSI_SetFeatureStateW(MSIPACKAGE*, LPCWSTR, INSTALLSTATE ); /* for deformating */ diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 3f0299e..679c45c 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -98,7 +98,7 @@ static UINT create_file_table( MSIHANDLE "PRIMARY KEY `File`)" ); } -static UINT add_component_entry( MSIHANDLE hdb, char *values ) +static UINT add_component_entry( MSIHANDLE hdb, const char *values ) { char insert[] = "INSERT INTO `Component` " "(`Component`, `ComponentId`, `Directory_`, `Attributes`, `Condition`, `KeyPath`) " @@ -114,7 +114,7 @@ static UINT add_component_entry( MSIHAND return r; } -static UINT add_feature_entry( MSIHANDLE hdb, char *values ) +static UINT add_feature_entry( MSIHANDLE hdb, const char *values ) { char insert[] = "INSERT INTO `Feature` (`Feature`, `Feature_Parent`, " "`Title`, `Description`, `Display`, `Level`, `Directory_`, `Attributes`) VALUES( %s )"; @@ -129,7 +129,7 @@ static UINT add_feature_entry( MSIHANDLE return r; } -static UINT add_feature_components_entry( MSIHANDLE hdb, char *values ) +static UINT add_feature_components_entry( MSIHANDLE hdb, const char *values ) { char insert[] = "INSERT INTO `FeatureComponents` " "(`Feature_`, `Component_`) " @@ -145,7 +145,7 @@ static UINT add_feature_components_entry return r; } -static UINT add_file_entry( MSIHANDLE hdb, char *values ) +static UINT add_file_entry( MSIHANDLE hdb, const char *values ) { char insert[] = "INSERT INTO `File` " "(`File`, `Component_`, `FileName`, `FileSize`, `Version`, `Language`, `Attributes`, `Sequence`) " @@ -291,7 +291,7 @@ static void test_getsourcepath_bad( void ok( r == ERROR_INVALID_HANDLE, "return value wrong\n"); } -static UINT add_directory_entry( MSIHANDLE hdb, char *values ) +static UINT add_directory_entry( MSIHANDLE hdb, const char *values ) { char insert[] = "INSERT INTO `Directory` (`Directory`,`Directory_Parent`,`DefaultDir`) VALUES( %s )"; char *query; @@ -334,7 +334,7 @@ static void test_getsourcepath( void ) /* another test but try create a directory this time */ hdb = create_package_db(); ok( hdb, "failed to create database\n"); - + r = add_directory_entry( hdb, "'TARGETDIR', '', 'SourceDir'"); ok( r == S_OK, "failed\n"); @@ -470,7 +470,7 @@ static void test_settargetpath(void) MSIHANDLE hpkg; UINT r; MSIHANDLE hdb; - + hdb = create_package_db(); ok ( hdb, "failed to create package database\n" ); @@ -985,7 +985,7 @@ static void test_condition(void) DeleteFile(msifile); } -static BOOL check_prop_empty( MSIHANDLE hpkg, char * prop) +static BOOL check_prop_empty( MSIHANDLE hpkg, const char * prop) { UINT r; DWORD sz; diff --git a/include/msiquery.h b/include/msiquery.h index b1de190..ed99b85 100644 --- a/include/msiquery.h +++ b/include/msiquery.h @@ -189,14 +189,14 @@ #define MsiDatabaseGenerateTransform UINT WINAPI MsiDatabaseCommit(MSIHANDLE); /* install state */ -UINT WINAPI MsiGetFeatureStateA(MSIHANDLE,LPSTR,INSTALLSTATE*,INSTALLSTATE*); -UINT WINAPI MsiGetFeatureStateW(MSIHANDLE,LPWSTR,INSTALLSTATE*,INSTALLSTATE*); +UINT WINAPI MsiGetFeatureStateA(MSIHANDLE,LPCSTR,INSTALLSTATE*,INSTALLSTATE*); +UINT WINAPI MsiGetFeatureStateW(MSIHANDLE,LPCWSTR,INSTALLSTATE*,INSTALLSTATE*); #define MsiGetFeatureState WINELIB_NAME_AW(MsiGetFeatureState) UINT WINAPI MsiSetComponentStateA(MSIHANDLE,LPCSTR,INSTALLSTATE); UINT WINAPI MsiSetComponentStateW(MSIHANDLE,LPCWSTR,INSTALLSTATE); #define MsiSetComponentState WINELIB_NAME_AW(MsiSetComponentState) -UINT WINAPI MsiGetComponentStateA(MSIHANDLE,LPSTR,INSTALLSTATE*,INSTALLSTATE*); -UINT WINAPI MsiGetComponentStateW(MSIHANDLE,LPWSTR,INSTALLSTATE*,INSTALLSTATE*); +UINT WINAPI MsiGetComponentStateA(MSIHANDLE,LPCSTR,INSTALLSTATE*,INSTALLSTATE*); +UINT WINAPI MsiGetComponentStateW(MSIHANDLE,LPCWSTR,INSTALLSTATE*,INSTALLSTATE*); #define MsiGetComponentState WINELIB_NAME_AW(MsiGetComponentState) MSICONDITION WINAPI MsiEvaluateConditionA(MSIHANDLE,LPCSTR);

1 0