wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Alexander Scott-Johns : rtutils: Add stub TraceRegisterExW and TraceRegisterExA.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 5a91cffc20cf85664596706326152c88ce2914ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a91cffc20cf8566459670632… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Fri Jun 26 23:53:49 2009 +0100 rtutils: Add stub TraceRegisterExW and TraceRegisterExA. The -W function is imported by Windows Journal Viewer. --- dlls/rtutils/Makefile.in | 3 +- dlls/rtutils/rtutils.spec | 4 +- dlls/rtutils/tracing.c | 64 +++++++++++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/rtutils.h | 49 ++++++++++++++++++++++++++++++++++ 5 files changed, 118 insertions(+), 3 deletions(-) diff --git a/dlls/rtutils/Makefile.in b/dlls/rtutils/Makefile.in index dfe9bbb..d695502 100644 --- a/dlls/rtutils/Makefile.in +++ b/dlls/rtutils/Makefile.in @@ -7,7 +7,8 @@ IMPORTLIB = rtutils IMPORTS = kernel32 C_SRCS = \ - main.c + main.c \ + tracing.c @MAKE_DLL_RULES@ diff --git a/dlls/rtutils/rtutils.spec b/dlls/rtutils/rtutils.spec index 008009c..1c8c9c3 100644 --- a/dlls/rtutils/rtutils.spec +++ b/dlls/rtutils/rtutils.spec @@ -47,8 +47,8 @@ @ stub TracePrintfW @ stub TracePutsExA @ stub TracePutsExW -@ stub TraceRegisterExA -@ stub TraceRegisterExW +@ stdcall TraceRegisterExA(str long) +@ stdcall TraceRegisterExW(wstr long) @ stub TraceVprintfExA @ stub TraceVprintfExW @ stub UpdateWaitTimer diff --git a/dlls/rtutils/tracing.c b/dlls/rtutils/tracing.c new file mode 100644 index 0000000..96d1dfb --- /dev/null +++ b/dlls/rtutils/tracing.c @@ -0,0 +1,64 @@ +/* + * Tracing API functions + * + * Copyright 2009 Alexander Scott-Johns + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "winuser.h" +#include "winnls.h" + +#include "wine/debug.h" + +#include "rtutils.h" + +WINE_DEFAULT_DEBUG_CHANNEL(rtutils); + +/****************************************************************************** + * TraceRegisterExW (RTUTILS.@) + */ +DWORD WINAPI TraceRegisterExW(LPCWSTR name, DWORD flags) +{ + FIXME("(%s, %x): stub\n", debugstr_w(name), flags); + return INVALID_TRACEID; +} + +/****************************************************************************** + * TraceRegisterExA (RTUTILS.@) + * + * See TraceRegisterExW. + */ +DWORD WINAPI TraceRegisterExA(LPCSTR name, DWORD flags) +{ + DWORD id; + int lenW = MultiByteToWideChar(CP_ACP, 0, name, -1, NULL, 0); + WCHAR* nameW = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR)); + if (!nameW) + { + SetLastError(ERROR_OUTOFMEMORY); + return INVALID_TRACEID; + } + MultiByteToWideChar(CP_ACP, 0, name, -1, nameW, lenW); + id = TraceRegisterExW(nameW, flags); + HeapFree(GetProcessHeap(), 0, nameW); + return id; +} diff --git a/include/Makefile.in b/include/Makefile.in index c62b85f..4210bbb 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -390,6 +390,7 @@ SRCDIR_INCLUDES = \ rpcndr.h \ rpcnterr.h \ rpcproxy.h \ + rtutils.h \ scarderr.h \ schannel.h \ schemadef.h \ diff --git a/include/rtutils.h b/include/rtutils.h new file mode 100644 index 0000000..1e2921a --- /dev/null +++ b/include/rtutils.h @@ -0,0 +1,49 @@ +/* + * Rtutils.h - Routing utilities / RRAS tracing + * + * Copyright (C) 2009 Alexander Scott-Johns + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _RTUTILS_H_ +#define _RTUTILS_H_ + +#include <stdarg.h> + +#ifdef __cplusplus +extern "C" { +#endif + +DWORD WINAPI TraceRegisterExW(LPCWSTR name, DWORD flags); +DWORD WINAPI TraceRegisterExA(LPCSTR name, DWORD flags); +#define TraceRegisterEx WINELIB_NAME_AW(TraceRegisterEx) + +#define TraceRegisterW(name) TraceRegisterExW((name), 0) +#define TraceRegisterA(name) TraceRegisterExA((name), 0) +#define TraceRegister WINELIB_NAME_AW(TraceRegister) + +/* Flags for TraceRegisterEx(W|A) */ +#define TRACE_USE_FILE 1 +#define TRACE_USE_CONSOLE 2 + +/* Return value of TraceRegisterEx(W|A) */ +#define INVALID_TRACEID 0xFFFFFFFF + +#ifdef __cplusplus +} +#endif + +#endif /* _RTUTILS_H_ */

1 0

Alexander Scott-Johns : rtutils: Add stub dll.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: a4689aaeeee907cb995391db39703c8ca32b221c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4689aaeeee907cb995391db3… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Fri Jun 26 23:12:21 2009 +0100 rtutils: Add stub dll. --- configure | 9 +++++++ configure.ac | 1 + dlls/Makefile.in | 5 ++++ dlls/rtutils/Makefile.in | 14 +++++++++++ dlls/rtutils/main.c | 47 +++++++++++++++++++++++++++++++++++++ dlls/rtutils/rtutils.spec | 56 +++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 132 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 3ede4fc..51a5440 100755 --- a/configure +++ b/configure @@ -27151,6 +27151,14 @@ dlls/rsaenh/tests/Makefile: dlls/rsaenh/tests/Makefile.in dlls/Maketest.rules" ac_config_files="$ac_config_files dlls/rsaenh/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/rtutils/Makefile" +test "x$enable_rtutils" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + rtutils" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/rtutils/Makefile: dlls/rtutils/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/rtutils/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/sane.ds/Makefile" test "x$enable_sane_ds" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ sane.ds" @@ -29682,6 +29690,7 @@ do "dlls/rsabase/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsabase/Makefile" ;; "dlls/rsaenh/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsaenh/Makefile" ;; "dlls/rsaenh/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsaenh/tests/Makefile" ;; + "dlls/rtutils/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rtutils/Makefile" ;; "dlls/sane.ds/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sane.ds/Makefile" ;; "dlls/sccbase/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sccbase/Makefile" ;; "dlls/schannel/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/schannel/Makefile" ;; diff --git a/configure.ac b/configure.ac index 6392039..2dafff3 100644 --- a/configure.ac +++ b/configure.ac @@ -2324,6 +2324,7 @@ WINE_CONFIG_MAKEFILE([dlls/rpcrt4/tests/Makefile],[dlls/Maketest.rules],[dlls],[ WINE_CONFIG_MAKEFILE([dlls/rsabase/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/rsaenh/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/rsaenh/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) +WINE_CONFIG_MAKEFILE([dlls/rtutils/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/sane.ds/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/sccbase/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/schannel/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index a55d715..edb73cb 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -188,6 +188,7 @@ IMPORT_LIBS = \ riched20/libriched20.$(IMPLIBEXT) \ rpcrt4/librpcrt4.$(IMPLIBEXT) \ rsaenh/librsaenh.$(IMPLIBEXT) \ + rtutils/librtutils.$(IMPLIBEXT) \ secur32/libsecur32.$(IMPLIBEXT) \ sensapi/libsensapi.$(IMPLIBEXT) \ serialui/libserialui.$(IMPLIBEXT) \ @@ -332,6 +333,7 @@ CROSS_IMPLIBS = \ riched20/libriched20.a \ rpcrt4/librpcrt4.a \ rsaenh/librsaenh.a \ + rtutils/librtutils.a \ secur32/libsecur32.a \ sensapi/libsensapi.a \ serialui/libserialui.a \ @@ -682,6 +684,9 @@ rpcrt4/librpcrt4.def rpcrt4/librpcrt4.a: rpcrt4/rpcrt4.spec $(WINEBUILD) rsaenh/librsaenh.def rsaenh/librsaenh.a: rsaenh/rsaenh.spec $(WINEBUILD) @cd rsaenh && $(MAKE) `basename $@` +rtutils/librtutils.def rtutils/librtutils.a: rtutils/rtutils.spec $(WINEBUILD) + @cd rtutils && $(MAKE) `basename $@` + secur32/libsecur32.def secur32/libsecur32.a: secur32/secur32.spec $(WINEBUILD) @cd secur32 && $(MAKE) `basename $@` diff --git a/dlls/rtutils/Makefile.in b/dlls/rtutils/Makefile.in new file mode 100644 index 0000000..dfe9bbb --- /dev/null +++ b/dlls/rtutils/Makefile.in @@ -0,0 +1,14 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = rtutils.dll +IMPORTLIB = rtutils +IMPORTS = kernel32 + +C_SRCS = \ + main.c + +@MAKE_DLL_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/rtutils/main.c b/dlls/rtutils/main.c new file mode 100644 index 0000000..009101a --- /dev/null +++ b/dlls/rtutils/main.c @@ -0,0 +1,47 @@ +/* + * rtutils main + * + * Copyright 2009 Alexander Scott-Johns + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(rtutils); + +/*********************************************************************** + * DllMain (RTUTILS.@) + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); + + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinstDLL ); + break; + } + + return TRUE; +} diff --git a/dlls/rtutils/rtutils.spec b/dlls/rtutils/rtutils.spec new file mode 100644 index 0000000..008009c --- /dev/null +++ b/dlls/rtutils/rtutils.spec @@ -0,0 +1,56 @@ +@ stub CreateWaitEvent +@ stub CreateWaitEventBinding +@ stub CreateWaitTimer +@ stub DeRegisterWaitEventBinding +@ stub DeRegisterWaitEventBindingSelf +@ stub DeRegisterWaitEventsTimers +@ stub DeRegisterWaitEventsTimersSelf +@ stub DebugPrintWaitWorkerThreads +@ stub LogErrorA +@ stub LogErrorW +@ stub LogEventA +@ stub LogEventW +@ stub MprSetupProtocolEnum +@ stub MprSetupProtocolFree +@ stub QueueWorkItem +@ stub RegisterWaitEventBinding +@ stub RegisterWaitEventsTimers +@ stub RouterAssert +@ stub RouterGetErrorStringA +@ stub RouterGetErrorStringW +@ stub RouterLogDeregisterA +@ stub RouterLogDeregisterW +@ stub RouterLogEventA +@ stub RouterLogEventDataA +@ stub RouterLogEventDataW +@ stub RouterLogEventExA +@ stub RouterLogEventExW +@ stub RouterLogEventStringA +@ stub RouterLogEventStringW +@ stub RouterLogEventValistExA +@ stub RouterLogEventValistExW +@ stub RouterLogEventW +@ stub RouterLogRegisterA +@ stub RouterLogRegisterW +@ stub SetIoCompletionProc +@ stub TraceDeregisterA +@ stub TraceDeregisterExA +@ stub TraceDeregisterExW +@ stub TraceDeregisterW +@ stub TraceDumpExA +@ stub TraceDumpExW +@ stub TraceGetConsoleA +@ stub TraceGetConsoleW +@ stub TracePrintfA +@ stub TracePrintfExA +@ stub TracePrintfExW +@ stub TracePrintfW +@ stub TracePutsExA +@ stub TracePutsExW +@ stub TraceRegisterExA +@ stub TraceRegisterExW +@ stub TraceVprintfExA +@ stub TraceVprintfExW +@ stub UpdateWaitTimer +@ stub WTFreeEvent +@ stub WTFreeTimer

1 0

Nikolay Sivov : comctl32/rebar: Update Rebar structure.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 759b914c9e5afe5f8ea8295da2c3132033f81a91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=759b914c9e5afe5f8ea8295da… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jun 28 03:40:20 2009 +0400 comctl32/rebar: Update Rebar structure. --- include/commctrl.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 2c887d0..beecb52 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1988,6 +1988,9 @@ typedef struct tagREBARBANDINFOA UINT cxIdeal; LPARAM lParam; UINT cxHeader; + /* _WIN32_WINNT >= 0x0600 */ + RECT rcChevronLocation; + UINT uChevronState; } REBARBANDINFOA, *LPREBARBANDINFOA; typedef REBARBANDINFOA const *LPCREBARBANDINFOA; @@ -2014,6 +2017,9 @@ typedef struct tagREBARBANDINFOW UINT cxIdeal; LPARAM lParam; UINT cxHeader; + /* _WIN32_WINNT >= 0x0600 */ + RECT rcChevronLocation; + UINT uChevronState; } REBARBANDINFOW, *LPREBARBANDINFOW; typedef REBARBANDINFOW const *LPCREBARBANDINFOW;

1 0

Nikolay Sivov : comctl32/progress: Implement PBM_GETBKCOLOR.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 753407ef824b335210440863868d37646f39964a URL: http://source.winehq.org/git/wine.git/?a=commit;h=753407ef824b3352104408638… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jun 28 02:51:59 2009 +0400 comctl32/progress: Implement PBM_GETBKCOLOR. --- dlls/comctl32/progress.c | 4 +++- include/commctrl.h | 1 + 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index a2c852e..56f40bb 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -31,7 +31,6 @@ * * Messages: * -- PBM_GETSTEP - * -- PBM_GETBKCOLOR * -- PBM_SETSTATE * -- PBM_GETSTATE * @@ -722,6 +721,9 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, InvalidateRect(hwnd, NULL, TRUE); return 0; + case PBM_GETBKCOLOR: + return infoPtr->ColorBk; + case PBM_SETMARQUEE: if(wParam != 0) { diff --git a/include/commctrl.h b/include/commctrl.h index 98e4010..2c887d0 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -484,6 +484,7 @@ static const WCHAR PROGRESS_CLASSW[] = { 'm','s','c','t','l','s','_', #define PBM_GETPOS (WM_USER+8) #define PBM_SETBARCOLOR (WM_USER+9) #define PBM_SETMARQUEE (WM_USER+10) +#define PBM_GETBKCOLOR (WM_USER+14) #define PBM_GETBARCOLOR (WM_USER+15) #define PBM_SETBKCOLOR CCM_SETBKCOLOR

1 0

Nikolay Sivov : comctl32/progress: Implement PBM_GETBARCOLOR, add some todo entries.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 84f3c50474ba20c0e2a6b4f7e1894df67938344b URL: http://source.winehq.org/git/wine.git/?a=commit;h=84f3c50474ba20c0e2a6b4f7e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jun 28 02:46:35 2009 +0400 comctl32/progress: Implement PBM_GETBARCOLOR, add some todo entries. --- dlls/comctl32/progress.c | 14 ++++++++++++++ include/commctrl.h | 1 + 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index 776345f..a2c852e 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -27,6 +27,17 @@ * the specification mentioned above. * If you discover missing features, or bugs, please note them below. * + * TODO: + * + * Messages: + * -- PBM_GETSTEP + * -- PBM_GETBKCOLOR + * -- PBM_SETSTATE + * -- PBM_GETSTATE + * + * Styles: + * -- PBS_SMOOTHREVERSE + * */ #include <stdarg.h> @@ -703,6 +714,9 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, InvalidateRect(hwnd, NULL, TRUE); return 0; + case PBM_GETBARCOLOR: + return infoPtr->ColorBar; + case PBM_SETBKCOLOR: infoPtr->ColorBk = (COLORREF)lParam; InvalidateRect(hwnd, NULL, TRUE); diff --git a/include/commctrl.h b/include/commctrl.h index 6eb5f32..98e4010 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -484,6 +484,7 @@ static const WCHAR PROGRESS_CLASSW[] = { 'm','s','c','t','l','s','_', #define PBM_GETPOS (WM_USER+8) #define PBM_SETBARCOLOR (WM_USER+9) #define PBM_SETMARQUEE (WM_USER+10) +#define PBM_GETBARCOLOR (WM_USER+15) #define PBM_SETBKCOLOR CCM_SETBKCOLOR #define PBS_SMOOTH 0x01

1 0

Nikolay Sivov : comctl32/toolbar: Move parameter cast to WinProc level, some code cleanup.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: f6bdb637bf2cd0f7882dd66cccf97163ef2fc47b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6bdb637bf2cd0f7882dd66cc… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jun 28 02:06:18 2009 +0400 comctl32/toolbar: Move parameter cast to WinProc level, some code cleanup. --- dlls/comctl32/toolbar.c | 487 ++++++++++++++++++++++------------------------- 1 files changed, 223 insertions(+), 264 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6bdb637bf2cd0f7882dd…

1 0

Vincent Povirk : windowscodecs: Add test for BMP decoder.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: b19e329be41fd55b5ec6d0e932f9466dc7b18072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b19e329be41fd55b5ec6d0e93… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jun 10 15:57:15 2009 -0500 windowscodecs: Add test for BMP decoder. --- configure | 9 ++ configure.ac | 1 + dlls/Makefile.in | 5 + dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/tests/Makefile.in | 13 +++ dlls/windowscodecs/tests/bmpformat.c | 151 ++++++++++++++++++++++++++++++++++ 6 files changed, 180 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b19e329be41fd55b5ec6d…

1 0

Vincent Povirk : windowscodecs: Implement GetResolution for BMP decoder.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 78c3aa78d2c90e411778c42839b6a424df9f22ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=78c3aa78d2c90e411778c4283… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jun 24 16:32:19 2009 -0500 windowscodecs: Implement GetResolution for BMP decoder. --- dlls/windowscodecs/bmpdecode.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index 7db5dfb..afe4881 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -155,11 +155,33 @@ static HRESULT WINAPI BmpFrameDecode_GetPixelFormat(IWICBitmapFrameDecode *iface return E_NOTIMPL; } +static HRESULT BmpHeader_GetResolution(BITMAPV5HEADER *bih, double *pDpiX, double *pDpiY) +{ + switch (bih->bV5Size) + { + case sizeof(BITMAPCOREHEADER): + *pDpiX = 96.0; + *pDpiY = 96.0; + return S_OK; + case sizeof(BITMAPCOREHEADER2): + case sizeof(BITMAPINFOHEADER): + case sizeof(BITMAPV4HEADER): + case sizeof(BITMAPV5HEADER): + *pDpiX = bih->bV5XPelsPerMeter * 0.0254; + *pDpiY = bih->bV5YPelsPerMeter * 0.0254; + return S_OK; + default: + return E_FAIL; + } +} + static HRESULT WINAPI BmpFrameDecode_GetResolution(IWICBitmapFrameDecode *iface, double *pDpiX, double *pDpiY) { - FIXME("(%p,%p,%p): stub\n", iface, pDpiX, pDpiY); - return E_NOTIMPL; + BmpFrameDecode *This = (BmpFrameDecode*)iface; + TRACE("(%p,%p,%p)\n", iface, pDpiX, pDpiY); + + return BmpHeader_GetResolution(&This->bih, pDpiX, pDpiY); } static HRESULT WINAPI BmpFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface,

1 0

Vincent Povirk : windowscodecs: Implement GetSize for BMP decoder.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 7c7f70a3177524ff7c2d871dcc8fc5d22bd65c17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c7f70a3177524ff7c2d871dc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jun 24 16:20:29 2009 -0500 windowscodecs: Implement GetSize for BMP decoder. --- dlls/windowscodecs/bmpdecode.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index 5ab8121..7db5dfb 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -116,11 +116,36 @@ static ULONG WINAPI BmpFrameDecode_Release(IWICBitmapFrameDecode *iface) return ref; } +static HRESULT BmpHeader_GetSize(BITMAPV5HEADER *bih, UINT *puiWidth, UINT *puiHeight) +{ + switch (bih->bV5Size) + { + case sizeof(BITMAPCOREHEADER): + { + BITMAPCOREHEADER *bch = (BITMAPCOREHEADER*)bih; + *puiWidth = bch->bcWidth; + *puiHeight = bch->bcHeight; + return S_OK; + } + case sizeof(BITMAPCOREHEADER2): + case sizeof(BITMAPINFOHEADER): + case sizeof(BITMAPV4HEADER): + case sizeof(BITMAPV5HEADER): + *puiWidth = bih->bV5Width; + *puiHeight = bih->bV5Height; + return S_OK; + default: + return E_FAIL; + } +} + static HRESULT WINAPI BmpFrameDecode_GetSize(IWICBitmapFrameDecode *iface, UINT *puiWidth, UINT *puiHeight) { - FIXME("(%p,%p,%p): stub\n", iface, puiWidth, puiHeight); - return E_NOTIMPL; + BmpFrameDecode *This = (BmpFrameDecode*)iface; + TRACE("(%p,%p,%p)\n", iface, puiWidth, puiHeight); + + return BmpHeader_GetSize(&This->bih, puiWidth, puiHeight); } static HRESULT WINAPI BmpFrameDecode_GetPixelFormat(IWICBitmapFrameDecode *iface,

1 0

Vincent Povirk : windowscodecs: Implement GetFrame for BMP decoder.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: eca8ef6924724a009b63032ebc376c53cb4ef5c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eca8ef6924724a009b63032eb… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Sat Jun 13 17:32:16 2009 -0500 windowscodecs: Implement GetFrame for BMP decoder. --- dlls/windowscodecs/bmpdecode.c | 156 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 154 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index f60471e..5ab8121 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -59,12 +59,141 @@ typedef struct { } BITMAPCOREHEADER2; typedef struct { + const IWICBitmapFrameDecodeVtbl *lpVtbl; + LONG ref; + IStream *stream; + BITMAPFILEHEADER bfh; + BITMAPV5HEADER bih; +} BmpFrameDecode; + +HRESULT WINAPI BmpFrameDecode_QueryInterface(IWICBitmapFrameDecode *iface, REFIID iid, + void **ppv) +{ + BmpFrameDecode *This = (BmpFrameDecode*)iface; + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapSource, iid) || + IsEqualIID(&IID_IWICBitmapFrameDecode, iid)) + { + *ppv = This; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI BmpFrameDecode_AddRef(IWICBitmapFrameDecode *iface) +{ + BmpFrameDecode *This = (BmpFrameDecode*)iface; + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI BmpFrameDecode_Release(IWICBitmapFrameDecode *iface) +{ + BmpFrameDecode *This = (BmpFrameDecode*)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + IStream_Release(This->stream); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI BmpFrameDecode_GetSize(IWICBitmapFrameDecode *iface, + UINT *puiWidth, UINT *puiHeight) +{ + FIXME("(%p,%p,%p): stub\n", iface, puiWidth, puiHeight); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpFrameDecode_GetPixelFormat(IWICBitmapFrameDecode *iface, + WICPixelFormatGUID *pPixelFormat) +{ + FIXME("(%p,%p): stub\n", iface, pPixelFormat); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpFrameDecode_GetResolution(IWICBitmapFrameDecode *iface, + double *pDpiX, double *pDpiY) +{ + FIXME("(%p,%p,%p): stub\n", iface, pDpiX, pDpiY); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, + IWICPalette *pIPalette) +{ + FIXME("(%p,%p): stub\n", iface, pIPalette); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, + const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) +{ + FIXME("(%p,%p,%u,%u,%p): stub\n", iface, prc, cbStride, cbBufferSize, pbBuffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpFrameDecode_GetMetadataQueryReader(IWICBitmapFrameDecode *iface, + IWICMetadataQueryReader **ppIMetadataQueryReader) +{ + FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpFrameDecode_GetColorContexts(IWICBitmapFrameDecode *iface, + UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) +{ + FIXME("(%p,%u,%p,%p): stub\n", iface, cCount, ppIColorContexts, pcActualCount); + return E_NOTIMPL; +} + +static HRESULT WINAPI BmpFrameDecode_GetThumbnail(IWICBitmapFrameDecode *iface, + IWICBitmapSource **ppIThumbnail) +{ + FIXME("(%p,%p): stub\n", iface, ppIThumbnail); + return E_NOTIMPL; +} + +static const IWICBitmapFrameDecodeVtbl BmpFrameDecode_Vtbl = { + BmpFrameDecode_QueryInterface, + BmpFrameDecode_AddRef, + BmpFrameDecode_Release, + BmpFrameDecode_GetSize, + BmpFrameDecode_GetPixelFormat, + BmpFrameDecode_GetResolution, + BmpFrameDecode_CopyPalette, + BmpFrameDecode_CopyPixels, + BmpFrameDecode_GetMetadataQueryReader, + BmpFrameDecode_GetColorContexts, + BmpFrameDecode_GetThumbnail +}; + +typedef struct { const IWICBitmapDecoderVtbl *lpVtbl; LONG ref; BOOL initialized; IStream *stream; BITMAPFILEHEADER bfh; BITMAPV5HEADER bih; + BmpFrameDecode *framedecode; } BmpDecoder; static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream) @@ -140,6 +269,7 @@ static ULONG WINAPI BmpDecoder_Release(IWICBitmapDecoder *iface) if (ref == 0) { if (This->stream) IStream_Release(This->stream); + if (This->framedecode) IUnknown_Release((IUnknown*)This->framedecode); HeapFree(GetProcessHeap(), 0, This); } @@ -229,8 +359,29 @@ static HRESULT WINAPI BmpDecoder_GetFrameCount(IWICBitmapDecoder *iface, static HRESULT WINAPI BmpDecoder_GetFrame(IWICBitmapDecoder *iface, UINT index, IWICBitmapFrameDecode **ppIBitmapFrame) { - FIXME("(%p,%u,%p): stub\n", iface, index, ppIBitmapFrame); - return E_NOTIMPL; + BmpDecoder *This = (BmpDecoder*)iface; + + if (index != 0) return E_INVALIDARG; + + if (!This->stream) return WINCODEC_ERR_WRONGSTATE; + + if (!This->framedecode) + { + This->framedecode = HeapAlloc(GetProcessHeap(), 0, sizeof(BmpFrameDecode)); + if (!This->framedecode) return E_OUTOFMEMORY; + + This->framedecode->lpVtbl = &BmpFrameDecode_Vtbl; + This->framedecode->ref = 1; + This->framedecode->stream = This->stream; + IStream_AddRef(This->stream); + This->framedecode->bfh = This->bfh; + This->framedecode->bih = This->bih; + } + + *ppIBitmapFrame = (IWICBitmapFrameDecode*)This->framedecode; + IWICBitmapFrameDecode_AddRef((IWICBitmapFrameDecode*)This->framedecode); + + return S_OK; } static const IWICBitmapDecoderVtbl BmpDecoder_Vtbl = { @@ -268,6 +419,7 @@ HRESULT BmpDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->ref = 1; This->initialized = FALSE; This->stream = NULL; + This->framedecode = NULL; ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); IUnknown_Release((IUnknown*)This);

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
112
Older →

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