wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Maik Schulz : Website: german translation of wwn 358 news item
by Maik Schulz 04 Jun '09

04 Jun '09

Module: website Branch: master Commit: 5b31bf2d2d3191db6f96ea8f8f1ee95b38be9572 URL: http://source.winehq.org/git/website.git/?a=commit;h=5b31bf2d2d3191db6f96ea… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Thu Jun 4 21:44:26 2009 +0200 Website: german translation of wwn 358 news item --- include/config.php | 2 +- news/de/2009052701.xml | 2 +- news/de/2009060301.xml | 17 +++++++++++++++++ templates/de/contributing.template | 2 +- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/include/config.php b/include/config.php index bf24675..aa80daa 100644 --- a/include/config.php +++ b/include/config.php @@ -72,7 +72,7 @@ class config } else { - trigger_error(E_USER_ERROR, "Unable to read config!"); + trigger_error("Unable to read config: ".$file); } // end of readConfig } diff --git a/news/de/2009052701.xml b/news/de/2009052701.xml index 010e276..eede6ff 100644 --- a/news/de/2009052701.xml +++ b/news/de/2009052701.xml @@ -2,7 +2,7 @@ <date>27. Mai 2009</date> <title>World Wine News Ausgabe 357</title> <body> - <a href="{$root}/wwn/357">WWN Ausgabe 357</a> wurde heute veröffentlicht. + <a href="{$root}/wwn/357">WWN Ausgabe 357 (en)</a> wurde heute veröffentlicht. <ul> <li><a href="{$root}/wwn/357#News: WWN Resurrection">Neuigkeiten: WWN Auferstehung</a></li> <li><a href="{$root}/wwn/357#A Working DIB Engine">Eine funktionierende DIB Engine</a></li> diff --git a/news/de/2009060301.xml b/news/de/2009060301.xml new file mode 100644 index 0000000..3af30d8 --- /dev/null +++ b/news/de/2009060301.xml @@ -0,0 +1,17 @@ +<news> + <date>3. Juni 2009</date> + <title>World Wine News Ausgabe 358</title> + <body> + <a href="{$root}/wwn/358">WWN Ausgabe 358 (en)</a> wurde heute veröffentlicht. +  + <ul> + <li><a href="{$root}/wwn/358#News: Wineconf 2009">Neuigkeiten: Wineconf 2009</a></li> + <li><a href="{$root}/wwn/358#A Wine Success Story">Eine Wine Erfolgs-Story</a></li> + <li><a href="{$root}/wwn/358#Modelling Wine Development">Modelle für die Wine-Entwicklung</a></li> + <li><a href="{$root}/wwn/358#Bug 61 - Resolved Fixed">Fehler 61 - Gelöst und Behoben</a></li> + <li><a href="{$root}/wwn/358#Test suite passing on windows machines">Test-Suite läuft auf Windows-Rechnern durch</a></li> + <li><a href="{$root}/wwn/358#Weekly AppDB/BugZilla Status Changes">Wöchentliche AppDB/BugZilla Statusänderungen</a></li> + </ul> +  + </body> +</news> diff --git a/templates/de/contributing.template b/templates/de/contributing.template index 62cf9b1..7c0ab2e 100644 --- a/templates/de/contributing.template +++ b/templates/de/contributing.template @@ -227,7 +227,7 @@ <p>Das Ziel der Konformitätstests für Wine ist sicherzustellen, dass das Verhalten der Wine APIs konform zu den entsprechenden Windows APIs ist. Da es viele Windows-Versionen von 95 bis XP gibt, brauchen wir sowohl Leute, die die Tests schreiben, als auch Freiwillge, - die die Tests unter Windows ausführen. Die Test Suite ist noch weit davon entfernt, + die die Tests unter Windows ausführen. Die Test-Suite ist noch weit davon entfernt, komplett zu sein, aber jedes kleine Bisschen hilft.</p> <ul> <li>Da sie automatisiert und regelmäßig ausgeführt werden

1 0

Stefan Stranz : winhlp32: Fix crash on launch.
by Alexandre Julliard 04 Jun '09

04 Jun '09

Module: wine Branch: master Commit: 1a0a47d60c337ca096c26da291adf82e49770f34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a0a47d60c337ca096c26da29… Author: Stefan Stranz <sfs1988(a)gmail.com> Date: Tue Jun 2 15:47:20 2009 -0600 winhlp32: Fix crash on launch. --- programs/winhlp32/winhelp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 1639c14..08d3875 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -274,7 +274,7 @@ HLPFILE_WINDOWINFO* WINHELP_GetWindowInfo(HLPFILE* hlpfile, LPCSTR name) { strcpy(mwi.type, "primary"); strcpy(mwi.name, "main"); - if (hlpfile->lpszTitle[0]) + if (hlpfile && hlpfile->lpszTitle[0]) { char tmp[128]; LoadString(Globals.hInstance, STID_WINE_HELP, tmp, sizeof(tmp));

1 0

Louis Lenders : ntdll: Add stub for RtlEnumerateGenericTableWithoutSplaying .
by Alexandre Julliard 04 Jun '09

04 Jun '09

Module: wine Branch: master Commit: d099c90ea304406c736a7f7b497c1856b9a88ca2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d099c90ea304406c736a7f7b4… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Jun 4 07:38:57 2009 +0200 ntdll: Add stub for RtlEnumerateGenericTableWithoutSplaying. --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/rtl.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 89e398f..acc69db 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -553,7 +553,7 @@ @ stub RtlEnumerateGenericTable # @ stub RtlEnumerateGenericTableAvl # @ stub RtlEnumerateGenericTableLikeADirectory -@ stub RtlEnumerateGenericTableWithoutSplaying +@ stdcall RtlEnumerateGenericTableWithoutSplaying(ptr ptr) # @ stub RtlEnumerateGenericTableWithoutSplayingAvl @ stub RtlEnumerateProperties @ stdcall RtlEqualComputerName(ptr ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 602bfad..4959946 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -440,6 +440,15 @@ PVOID WINAPI RtlInitializeGenericTable(PVOID pTable, PVOID arg2, PVOID arg3, PVO } /****************************************************************************** + * RtlEnumerateGenericTableWithoutSplaying [NTDLL.@] + */ +PVOID RtlEnumerateGenericTableWithoutSplaying(PVOID pTable, PVOID *RestartKey) +{ + FIXME("(%p,%p) stub!\n", pTable, RestartKey); + return NULL; +} + +/****************************************************************************** * RtlMoveMemory [NTDLL.@] * * Move a block of memory that may overlap.

1 0

Damjan Jovanovic : winemenubuilder: Associate file open applications with freedesktop.
by Alexandre Julliard 04 Jun '09

04 Jun '09

Module: wine Branch: master Commit: 7287023647dcf76f8bae71e5945b0ec45937744f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7287023647dcf76f8bae71e59… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Jun 3 18:33:28 2009 +0200 winemenubuilder: Associate file open applications with freedesktop. --- programs/winemenubuilder/winemenubuilder.c | 119 ++++++++++++++++++++++++++- 1 files changed, 114 insertions(+), 5 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 462456a..bd9c30d 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1514,6 +1514,21 @@ static BOOL freedesktop_mime_type_for_extension(struct list *native_mime_types, return ret; } +static WCHAR* reg_get_valW(HKEY key, LPCWSTR subkey, LPCWSTR name) +{ + DWORD size; + if (RegGetValueW(key, subkey, name, RRF_RT_REG_SZ, NULL, NULL, &size) == ERROR_SUCCESS) + { + WCHAR *ret = HeapAlloc(GetProcessHeap(), 0, size); + if (ret) + { + if (RegGetValueW(key, subkey, name, RRF_RT_REG_SZ, NULL, ret, &size) == ERROR_SUCCESS) + return ret; + } + } + return NULL; +} + static BOOL write_freedesktop_mime_type_entry(const char *packages_dir, const char *dot_extension, const char *mime_type, const char *comment) { @@ -1563,6 +1578,35 @@ static BOOL is_extension_blacklisted(LPCWSTR extension) return FALSE; } +static BOOL write_freedesktop_association_entry(const char *desktopPath, const char *dot_extension, + const char *friendlyAppName, const char *mimeType, + const char *progId) +{ + BOOL ret = FALSE; + FILE *desktop; + + WINE_TRACE("writing association for file type %s, friendlyAppName=%s, MIME type %s, progID=%s, to file %s\n", + wine_dbgstr_a(dot_extension), wine_dbgstr_a(friendlyAppName), wine_dbgstr_a(mimeType), + wine_dbgstr_a(progId), wine_dbgstr_a(desktopPath)); + + desktop = fopen(desktopPath, "w"); + if (desktop) + { + fprintf(desktop, "[Desktop Entry]\n"); + fprintf(desktop, "Type=Application\n"); + fprintf(desktop, "Name=%s\n", friendlyAppName); + fprintf(desktop, "MimeType=%s\n", mimeType); + fprintf(desktop, "Exec=wine start /ProgIDOpen %s %%f\n", progId); + fprintf(desktop, "NoDisplay=true\n"); + fprintf(desktop, "StartupNotify=true\n"); + ret = TRUE; + fclose(desktop); + } + else + WINE_ERR("error writing association file %s\n", wine_dbgstr_a(desktopPath)); + return ret; +} + static BOOL generate_associations(const char *xdg_data_home, const char *packages_dir, const char *applications_dir) { struct list *nativeMimeTypes = NULL; @@ -1603,6 +1647,10 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package char *friendlyDocNameA = NULL; WCHAR *contentTypeW = NULL; char *mimeTypeA = NULL; + WCHAR *friendlyAppNameW = NULL; + char *friendlyAppNameA = NULL; + WCHAR *progIdW = NULL; + char *progIdA = NULL; extensionA = wchars_to_utf8_chars(extensionW); if (extensionA == NULL) @@ -1611,11 +1659,6 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package goto end; } - commandW = assoc_query(ASSOCSTR_COMMAND, extensionW, NULL); - if (commandW == NULL) - /* no command -> unusable extension */ - goto end; - friendlyDocNameW = assoc_query(ASSOCSTR_FRIENDLYDOCNAME, extensionW, NULL); if (friendlyDocNameW) { @@ -1651,6 +1694,56 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package } } + commandW = assoc_query(ASSOCSTR_COMMAND, extensionW, NULL); + if (commandW == NULL) + /* no command => no application is associated */ + goto end; + + friendlyAppNameW = assoc_query(ASSOCSTR_FRIENDLYAPPNAME, extensionW, NULL); + if (friendlyAppNameW) + { + friendlyAppNameA = wchars_to_utf8_chars(friendlyAppNameW); + if (friendlyAppNameA == NULL) + { + WINE_ERR("out of memory\n"); + goto end; + } + } + else + { + friendlyAppNameA = heap_printf("A Wine application"); + if (friendlyAppNameA == NULL) + { + WINE_ERR("out of memory\n"); + goto end; + } + } + + progIdW = reg_get_valW(HKEY_CLASSES_ROOT, extensionW, NULL); + if (progIdW) + { + progIdA = wchars_to_utf8_chars(progIdW); + if (progIdA == NULL) + { + WINE_ERR("out of memory\n"); + goto end; + } + } + else + goto end; /* no progID => not a file type association */ + + { + char *desktopPath = heap_printf("%s/wine-extension-%s.desktop", applications_dir, &extensionA[1]); + if (desktopPath) + { + if (write_freedesktop_association_entry(desktopPath, extensionA, friendlyAppNameA, mimeTypeA, progIdA)) + { + hasChanged = TRUE; + } + HeapFree(GetProcessHeap(), 0, desktopPath); + } + } + end: HeapFree(GetProcessHeap(), 0, extensionA); HeapFree(GetProcessHeap(), 0, commandW); @@ -1658,6 +1751,10 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package HeapFree(GetProcessHeap(), 0, friendlyDocNameA); HeapFree(GetProcessHeap(), 0, contentTypeW); HeapFree(GetProcessHeap(), 0, mimeTypeA); + HeapFree(GetProcessHeap(), 0, friendlyAppNameW); + HeapFree(GetProcessHeap(), 0, friendlyAppNameA); + HeapFree(GetProcessHeap(), 0, progIdW); + HeapFree(GetProcessHeap(), 0, progIdA); } HeapFree(GetProcessHeap(), 0, extensionW); if (ret != ERROR_SUCCESS) @@ -2148,6 +2245,18 @@ static void RefreshFileTypeAssociations(void) WINE_ERR("out of memory\n"); goto end; } + + command = heap_printf("update-desktop-database %s/applications", xdg_data_dir); + if (command) + { + system(command); + HeapFree(GetProcessHeap(), 0, command); + } + else + { + WINE_ERR("out of memory\n"); + goto end; + } } end:

1 0

Aric Stewart : msctf: Define ITfCompartmentMgr and ITfCompartment.
by Alexandre Julliard 04 Jun '09

04 Jun '09

Module: wine Branch: master Commit: ba4f6066635e4b6c8da4133064d1cb52c0a703b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba4f6066635e4b6c8da413306… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 3 11:28:33 2009 -0500 msctf: Define ITfCompartmentMgr and ITfCompartment. --- include/msctf.idl | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/include/msctf.idl b/include/msctf.idl index 0a441a6..4db67f4 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -904,3 +904,37 @@ interface ITfInsertAtSelection : IUnknown [in] IDataObject *pDataObject, [out] ITfRange **ppRange); }; + +[ + object, + uuid(bb08f7a9-607a-4384-8623-056892b64371), + pointer_default(unique) +] +interface ITfCompartment : IUnknown +{ + HRESULT SetValue( + [in] TfClientId tid, + [in] const VARIANT *pvarValue); + + HRESULT GetValue( + [out] VARIANT *pvarValue); +}; + +[ + object, + uuid(7dcf57ac-18ad-438b-824d-979bffb74b7c), + pointer_default(unique) +] +interface ITfCompartmentMgr : IUnknown +{ + HRESULT GetCompartment( + [in] REFGUID rguid, + [out] ITfCompartment **ppcomp); + + HRESULT ClearCompartment( + [in] TfClientId tid, + [in] REFGUID rguid); + + HRESULT EnumCompartments( + [out] IEnumGUID **ppEnum); +};

1 0

Andrew Eikum : gdiplus: Stubs for GdipDrawImagePoints and GdipDrawImagePointsI.
by Alexandre Julliard 04 Jun '09

04 Jun '09

Module: wine Branch: master Commit: 156eeb08be4014659b6f371859149ddebbcdc7aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=156eeb08be4014659b6f37185… Author: Andrew Eikum <andrew(a)brightnightgames.com> Date: Wed Jun 3 23:31:21 2009 -0500 gdiplus: Stubs for GdipDrawImagePoints and GdipDrawImagePointsI. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/graphics.c | 14 ++++++++++++++ include/gdiplusflat.h | 2 ++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 0115f95..7d44c0b 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -177,8 +177,8 @@ @ stdcall GdipDrawImageI(ptr ptr long long) @ stdcall GdipDrawImagePointRect(ptr ptr long long long long long long long) @ stdcall GdipDrawImagePointRectI(ptr ptr long long long long long long long) -@ stub GdipDrawImagePoints -@ stub GdipDrawImagePointsI +@ stdcall GdipDrawImagePoints(ptr ptr ptr long) +@ stdcall GdipDrawImagePointsI(ptr ptr ptr long) @ stdcall GdipDrawImagePointsRect(ptr ptr ptr long long long long long long ptr ptr ptr) @ stdcall GdipDrawImagePointsRectI(ptr ptr ptr long long long long long long ptr ptr ptr) @ stdcall GdipDrawImageRect(ptr ptr long long long long) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 28cbf3e..3fedc97 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1620,6 +1620,20 @@ GpStatus WINGDIPAPI GdipDrawImagePointRectI(GpGraphics *graphics, GpImage *image return NotImplemented; } +GpStatus WINGDIPAPI GdipDrawImagePoints(GpGraphics *graphics, GpImage *image, + GDIPCONST GpPointF *dstpoints, INT count) +{ + FIXME("(%p, %p, %p, %d): stub\n", graphics, image, dstpoints, count); + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipDrawImagePointsI(GpGraphics *graphics, GpImage *image, + GDIPCONST GpPoint *dstpoints, INT count) +{ + FIXME("(%p, %p, %p, %d): stub\n", graphics, image, dstpoints, count); + return NotImplemented; +} + /* FIXME: partially implemented (only works for rectangular parallelograms) */ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image, GDIPCONST GpPointF *points, INT count, REAL srcx, REAL srcy, REAL srcwidth, diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 143921f..8e9812f 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -151,6 +151,8 @@ GpStatus WINGDIPAPI GdipDrawImage(GpGraphics*,GpImage*,REAL,REAL); GpStatus WINGDIPAPI GdipDrawImageI(GpGraphics*,GpImage*,INT,INT); GpStatus WINGDIPAPI GdipDrawImagePointRect(GpGraphics*,GpImage*,REAL,REAL,REAL,REAL,REAL,REAL,GpUnit); GpStatus WINGDIPAPI GdipDrawImagePointRectI(GpGraphics*,GpImage*,INT,INT,INT,INT,INT,INT,GpUnit); +GpStatus WINGDIPAPI GdipDrawImagePoints(GpGraphics*,GpImage*,GDIPCONST GpPointF*,INT); +GpStatus WINGDIPAPI GdipDrawImagePointsI(GpGraphics*,GpImage*,GDIPCONST GpPoint*,INT); GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics*,GpImage*, GDIPCONST GpPointF*,INT,REAL,REAL,REAL,REAL,GpUnit, GDIPCONST GpImageAttributes*,DrawImageAbort,VOID*);

1 0

Andrew Eikum : gdiplus: Stub for GdipEmfToWmfBits.
by Alexandre Julliard 04 Jun '09

04 Jun '09

Module: wine Branch: master Commit: 46de8c0eb4819ca3165717fc35f676e0ad0ee0ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=46de8c0eb4819ca3165717fc3… Author: Andrew Eikum <andrew(a)brightnightgames.com> Date: Wed Jun 3 23:31:34 2009 -0500 gdiplus: Stub for GdipEmfToWmfBits. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 7 +++++++ include/gdiplusflat.h | 1 + 3 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 5f803de..0115f95 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -199,7 +199,7 @@ @ stdcall GdipDrawRectangles(ptr ptr ptr long) @ stdcall GdipDrawRectanglesI(ptr ptr ptr long) @ stdcall GdipDrawString(ptr ptr long ptr ptr ptr ptr) -@ stub GdipEmfToWmfBits +@ stdcall GdipEmfToWmfBits(ptr long ptr long long) @ stdcall GdipEndContainer(ptr ptr) @ stub GdipEnumerateMetafileDestPoint @ stub GdipEnumerateMetafileDestPointI diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index de47c06..a18b2ad 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -694,6 +694,13 @@ GpStatus WINGDIPAPI GdipDrawCachedBitmap(GpGraphics *graphics, return GdipDrawImage(graphics, cachedbmp->image, (REAL)x, (REAL)y); } +GpStatus WINGDIPAPI GdipEmfToWmfBits(HENHMETAFILE hemf, UINT cbData16, + LPBYTE pData16, INT iMapMode, INT eFlags) +{ + FIXME("(%p, %d, %p, %d, %d): stub\n", hemf, cbData16, pData16, iMapMode, eFlags); + return NotImplemented; +} + GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) { HDC hdc; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 864f93c..143921f 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -329,6 +329,7 @@ GpStatus WINGDIPAPI GdipTransformPath(GpPath*,GpMatrix*); GpStatus WINGDIPAPI GdipCloneImage(GpImage*, GpImage**); GpStatus WINGDIPAPI GdipCloneImageAttributes(GDIPCONST GpImageAttributes*,GpImageAttributes**); GpStatus WINGDIPAPI GdipDisposeImage(GpImage*); +GpStatus WINGDIPAPI GdipEmfToWmfBits(HENHMETAFILE,UINT,LPBYTE,INT,INT); GpStatus WINGDIPAPI GdipFindFirstImageItem(GpImage*,ImageItemData*); GpStatus WINGDIPAPI GdipFindNextImageItem(GpImage*,ImageItemData*); GpStatus WINGDIPAPI GdipGetAllPropertyItems(GpImage*,UINT,UINT,PropertyItem*);

1 0

Henri Verbeet : wined3d: Add a proper enum value for "no extension".
by Alexandre Julliard 04 Jun '09

04 Jun '09

Module: wine Branch: master Commit: a44f84fdf761dea0082165cc253b603b9286277b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a44f84fdf761dea0082165cc2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 4 10:16:21 2009 +0200 wined3d: Add a proper enum value for "no extension". This would allow an extension check for ARB_COLOR_BUFFER_FLOAT to work. --- dlls/wined3d/arb_program_shader.c | 296 ++++---- dlls/wined3d/ati_fragment_shader.c | 260 ++++---- dlls/wined3d/directx.c | 2 + dlls/wined3d/nvidia_texture_shader.c | 182 +++--- dlls/wined3d/state.c | 1260 +++++++++++++++++----------------- dlls/wined3d/wined3d_gl.h | 5 +- 6 files changed, 1004 insertions(+), 1001 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a44f84fdf761dea008216…

1 0

Henri Verbeet : wined3d: Check FBO compatibility after the fixups are applied.
by Alexandre Julliard 04 Jun '09

04 Jun '09

Module: wine Branch: master Commit: 0a059aafbe7155e0d058689fe948acc5f3cbdcc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a059aafbe7155e0d058689fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 4 10:16:21 2009 +0200 wined3d: Check FBO compatibility after the fixups are applied. --- dlls/wined3d/utils.c | 59 ++++++++++++++++++++++++++++++------------------- 1 files changed, 36 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e152337..e4c09c8 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -420,6 +420,40 @@ static BOOL check_fbo_compat(const WineD3D_GL_Info *gl_info, GLint internal_form return status == GL_FRAMEBUFFER_COMPLETE_EXT; } +static void init_format_fbo_compat_info(WineD3D_GL_Info *gl_info) +{ + unsigned int i; + + for (i = 0; i < sizeof(formats) / sizeof(*formats); ++i) + { + struct GlPixelFormatDesc *desc = &gl_info->gl_formats[i]; + + if (!desc->glInternal) continue; + + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && desc->rtInternal) + { + /* Check if the default internal format is supported as a frame buffer target, otherwise + * fall back to the render target internal. + * + * Try to stick to the standard format if possible, this limits precision differences. */ + if (check_fbo_compat(gl_info, desc->glInternal)) + { + TRACE("Format %s is supported as fbo target\n", debug_d3dformat(desc->format)); + desc->rtInternal = desc->glInternal; + } + else + { + TRACE("Internal format of %s not supported as FBO target, using render target internal instead\n", + debug_d3dformat(desc->format)); + } + } + else + { + desc->rtInternal = desc->glInternal; + } + } +} + static BOOL init_format_texture_info(WineD3D_GL_Info *gl_info) { unsigned int i; @@ -439,34 +473,12 @@ static BOOL init_format_texture_info(WineD3D_GL_Info *gl_info) desc = &gl_info->gl_formats[fmt_idx]; desc->glInternal = gl_formats_template[i].glInternal; desc->glGammaInternal = gl_formats_template[i].glGammaInternal; + desc->rtInternal = gl_formats_template[i].rtInternal; desc->glFormat = gl_formats_template[i].glFormat; desc->glType = gl_formats_template[i].glType; desc->color_fixup = COLOR_FIXUP_IDENTITY; desc->Flags |= gl_formats_template[i].Flags; desc->heightscale = 1.0; - - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && gl_formats_template[i].rtInternal) - { - /* Check if the default internal format is supported as a frame buffer target, otherwise - * fall back to the render target internal. - * - * Try to stick to the standard format if possible, this limits precision differences */ - if (!check_fbo_compat(gl_info, gl_formats_template[i].glInternal)) - { - TRACE("Internal format of %s not supported as FBO target, using render target internal instead\n", - debug_d3dformat(gl_formats_template[i].fmt)); - desc->rtInternal = gl_formats_template[i].rtInternal; - } - else - { - TRACE("Format %s is supported as fbo target\n", debug_d3dformat(gl_formats_template[i].fmt)); - desc->rtInternal = gl_formats_template[i].glInternal; - } - } - else - { - desc->rtInternal = gl_formats_template[i].glInternal; - } } return TRUE; @@ -670,6 +682,7 @@ BOOL initPixelFormats(WineD3D_GL_Info *gl_info) } apply_format_fixups(gl_info); + init_format_fbo_compat_info(gl_info); return TRUE; }

1 0

Henri Verbeet : wined3d: Remove WINED3DFMT_R16G16B16A16_SNORM from the GL formats template.
by Alexandre Julliard 04 Jun '09

04 Jun '09

Module: wine Branch: master Commit: faaea935737ebff7b2dae3843b24f36c304940b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faaea935737ebff7b2dae3843… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 4 10:16:20 2009 +0200 wined3d: Remove WINED3DFMT_R16G16B16A16_SNORM from the GL formats template. This entry obviously can't work correctly. --- dlls/wined3d/utils.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4802a7c..e152337 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -343,9 +343,6 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { {WINED3DFMT_D24FS8, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_FLOAT, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL}, - {WINED3DFMT_R16G16B16A16_SNORM, GL_COLOR_INDEX, GL_COLOR_INDEX, 0, - GL_COLOR_INDEX, GL_UNSIGNED_SHORT, - 0}, }; static inline int getFmtIdx(WINED3DFORMAT fmt) {

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 June 2009