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

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

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 + +(a)MAKE_DLL_RULES@ + +(a)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

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

Detlef Riekenberg : advapi32: Check the output pointer first in RegOpenKey, with test.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 0ca3b3b423444e0febcec4f9c2e44940dca493ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ca3b3b423444e0febcec4f9c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jun 28 20:40:04 2009 +0200 advapi32: Check the output pointer first in RegOpenKey, with test. --- dlls/advapi32/registry.c | 8 +++++++- dlls/advapi32/tests/registry.c | 9 +++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 52de6c5..3762908 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -381,6 +381,9 @@ LSTATUS WINAPI RegOpenKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, REGSAM acc */ LSTATUS WINAPI RegOpenKeyW( HKEY hkey, LPCWSTR name, PHKEY retkey ) { + if (!retkey) + return ERROR_INVALID_PARAMETER; + if (!name || !*name) { *retkey = hkey; @@ -402,10 +405,13 @@ LSTATUS WINAPI RegOpenKeyW( HKEY hkey, LPCWSTR name, PHKEY retkey ) * * RETURNS * Success: ERROR_SUCCESS - * Failure: A standard Win32 error code. retkey is set to 0. + * Failure: A standard Win32 error code. When retkey is valid, *retkey is set to 0. */ LSTATUS WINAPI RegOpenKeyA( HKEY hkey, LPCSTR name, PHKEY retkey ) { + if (!retkey) + return ERROR_INVALID_PARAMETER; + if (!name || !*name) { *retkey = hkey; diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 47e76b2..ca82fa1 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -956,9 +956,18 @@ static void test_reg_open_key(void) RegCloseKey(hkResult); /* send in NULL hkResult */ + SetLastError(0xdeadbeef); ret = RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Test", NULL); ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", ret); + SetLastError(0xdeadbeef); + ret = RegOpenKeyA(HKEY_CURRENT_USER, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", ret); + + SetLastError(0xdeadbeef); + ret = RegOpenKeyA(NULL, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", ret); + /* beginning backslash character */ ret = RegOpenKeyA(HKEY_CURRENT_USER, "\\Software\\Wine\\Test", &hkResult); ok(ret == ERROR_BAD_PATHNAME || /* NT/2k/XP */

1 0

Louis Lenders : advapi32: Add a few tests for GetSidSubAuthority and SetLastError correctly.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 011c5b8fae7c53bc2a5be2ff4e5337f69b2f7afc URL: http://source.winehq.org/git/wine.git/?a=commit;h=011c5b8fae7c53bc2a5be2ff4… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sat Jun 27 12:48:46 2009 +0200 advapi32: Add a few tests for GetSidSubAuthority and SetLastError correctly. --- dlls/advapi32/security.c | 2 ++ dlls/advapi32/tests/security.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 773a839..e1cbb1a 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1073,6 +1073,7 @@ GetSidIdentifierAuthority( PSID pSid ) PDWORD WINAPI GetSidSubAuthority( PSID pSid, DWORD nSubAuthority ) { + SetLastError(ERROR_SUCCESS); return RtlSubAuthoritySid(pSid, nSubAuthority); } @@ -1085,6 +1086,7 @@ GetSidSubAuthority( PSID pSid, DWORD nSubAuthority ) PUCHAR WINAPI GetSidSubAuthorityCount (PSID pSid) { + SetLastError(ERROR_SUCCESS); return RtlSubAuthorityCountSid(pSid); } diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index af52a3a..de794de 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -92,6 +92,9 @@ typedef BOOL (WINAPI *fnSetFileSecurityA)(LPCSTR, SECURITY_INFORMATION, static DWORD (WINAPI *pGetNamedSecurityInfoA)(LPSTR, SE_OBJECT_TYPE, SECURITY_INFORMATION, PSID*, PSID*, PACL*, PACL*, PSECURITY_DESCRIPTOR*); +static PDWORD (WINAPI *pGetSidSubAuthority)(PSID, DWORD); +static PUCHAR (WINAPI *pGetSidSubAuthorityCount)(PSID); +static BOOL (WINAPI *pIsValidSid)(PSID); typedef DWORD (WINAPI *fnRtlAdjustPrivilege)(ULONG,BOOLEAN,BOOLEAN,PBOOLEAN); typedef BOOL (WINAPI *fnCreateWellKnownSid)(WELL_KNOWN_SID_TYPE,PSID,PSID,DWORD*); typedef BOOL (WINAPI *fnDuplicateTokenEx)(HANDLE,DWORD,LPSECURITY_ATTRIBUTES, @@ -160,6 +163,9 @@ static void init(void) pSetFileSecurityA = (fnSetFileSecurityA)GetProcAddress(hmod, "SetFileSecurityA" ); pCreateWellKnownSid = (fnCreateWellKnownSid)GetProcAddress( hmod, "CreateWellKnownSid" ); pGetNamedSecurityInfoA = (void *)GetProcAddress(hmod, "GetNamedSecurityInfoA"); + pGetSidSubAuthority = (void *)GetProcAddress(hmod, "GetSidSubAuthority"); + pGetSidSubAuthorityCount = (void *)GetProcAddress(hmod, "GetSidSubAuthorityCount"); + pIsValidSid = (void *)GetProcAddress(hmod, "IsValidSid"); pMakeSelfRelativeSD = (void *)GetProcAddress(hmod, "MakeSelfRelativeSD"); pSetEntriesInAclW = (void *)GetProcAddress(hmod, "SetEntriesInAclW"); pSetSecurityDescriptorControl = (void *)GetProcAddress(hmod, "SetSecurityDescriptorControl"); @@ -3176,6 +3182,34 @@ static void test_GetSecurityInfo(void) CloseHandle(obj); } +static void test_GetSidSubAuthority(void) +{ + PSID psid = NULL; + + if (!pGetSidSubAuthority || !pConvertStringSidToSidA || !pIsValidSid || !pGetSidSubAuthorityCount) + { + win_skip("Some functions not available\n"); + return; + } + /* Note: on windows passing in an invalid index like -1, lets GetSidSubAuthority return 0x05000000 but + still GetLastError returns ERROR_SUCCESS then. We don't test these unlikely cornercases here for now */ + ok(pConvertStringSidToSidA("S-1-5-21-93476-23408-4576",&psid),"ConvertStringSidToSidA failed\n"); + ok(pIsValidSid(psid),"Sid is not valid\n"); + SetLastError(0xbebecaca); + ok(*pGetSidSubAuthorityCount(psid) == 4,"GetSidSubAuthorityCount gave %d expected 4\n",*pGetSidSubAuthorityCount(psid)); + ok(GetLastError() == 0,"GetLastError returned %d instead of 0\n",GetLastError()); + SetLastError(0xbebecaca); + ok(*pGetSidSubAuthority(psid,0) == 21,"GetSidSubAuthority gave %d expected 21",*pGetSidSubAuthority(psid,0)); + ok(GetLastError() == 0,"GetLastError returned %d instead of 0\n",GetLastError()); + SetLastError(0xbebecaca); + ok(*pGetSidSubAuthority(psid,1) == 93476,"GetSidSubAuthority gave %d expected 93476",*pGetSidSubAuthority(psid,1)); + ok(GetLastError() == 0,"GetLastError returned %d instead of 0\n",GetLastError()); + SetLastError(0xbebecaca); + todo_wine ok(*pGetSidSubAuthority(psid,4) == 0,"GetSidSubAuthority gave %d,expected 0\n",*pGetSidSubAuthority(psid,4)); + ok(GetLastError() == 0,"GetLastError returned %d instead of 0\n",GetLastError()); + LocalFree(psid); +} + START_TEST(security) { init(); @@ -3205,4 +3239,5 @@ START_TEST(security) test_PrivateObjectSecurity(); test_acls(); test_GetSecurityInfo(); + test_GetSidSubAuthority(); }

1 0

Frédéric Delanoy : appwiz.cpl: Updated French translation.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 85aadbd9064e8fb5114af1e2f90c3e32d45e4eab URL: http://source.winehq.org/git/wine.git/?a=commit;h=85aadbd9064e8fb5114af1e2f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jun 28 21:29:25 2009 +0200 appwiz.cpl: Updated French translation. --- dlls/appwiz.cpl/En.rc | 4 ++-- dlls/appwiz.cpl/Fr.rc | 39 ++++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/appwiz.cpl/En.rc b/dlls/appwiz.cpl/En.rc index 3463b2e..da34c3b 100644 --- a/dlls/appwiz.cpl/En.rc +++ b/dlls/appwiz.cpl/En.rc @@ -45,9 +45,9 @@ FONT 8, "MS Shell Dlg" CONTROL "&Install...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 - CONTROL "The following software can be automatically removed. To remove a program or to modify its installed components, select it from the list and click Add/Remove.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "The following software can be automatically removed. To remove a program or to modify its installed components, select it from the list and click Change/Remove.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 - CONTROL "Add/&Remove...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 198, 64, 14 + CONTROL "Change/&Remove...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 CONTROL "&Support Info...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 176, 198, 64, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 } diff --git a/dlls/appwiz.cpl/Fr.rc b/dlls/appwiz.cpl/Fr.rc index 8dbdff1..f13797e 100644 --- a/dlls/appwiz.cpl/Fr.rc +++ b/dlls/appwiz.cpl/Fr.rc @@ -1,5 +1,5 @@ /* -* Ajoute/Supprime des programmes resources francaises +* Ressources fran�aises pour Ajout/suppression de programmes * * Copyright 2008 David Adam * @@ -23,16 +23,17 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE { - IDS_CPL_TITLE, "Ajouter/Supprimer des programmes" - IDS_CPL_DESC, "Vous autorise � installer un nouveau logiciel, ou supprimer un logiciel existant de votre ordinateur." + IDS_CPL_TITLE, "Ajout/Suppression de programmes" + IDS_CPL_DESC, "Vous permet d'installer un nouveau logiciel, ou supprimer un logiciel existant de votre ordinateur." IDS_TAB1_TITLE, "Applications" - IDS_UNINSTALL_FAILED, "Incapable d'ex�cuter le d�sinstalleur, '%s'. Voulez-vous supprimer l'entr�e de ce programme du registre?" + IDS_UNINSTALL_FAILED, "Impossible d'ex�cuter le d�sinstalleur '%s'. Voulez-vous supprimer l'entr�e de d�sinstallation de ce programme dans la base de registres ?" IDS_NOT_SPECIFIED, "Non sp�cifi�" IDS_COLUMN_NAME, "Nom" - IDS_COLUMN_PUBLISHER, "Editeur" + IDS_COLUMN_PUBLISHER, "�diteur" IDS_COLUMN_VERSION, "Version" + IDS_INSTALL_FILTER, "Programmes d'installation\0*instal*.exe;*setup*.exe;*.msi\0Programmes (*.exe)\0*.exe\0Tous les fichiers (*.*)\0*.*\0\0" } IDD_MAIN DIALOG 0, 0, 320, 220 @@ -40,32 +41,32 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Installation/D�sinstallation" FONT 8, "MS Shell Dlg" { -CONTROL "Pour installer un nouveau programme � partir d'une disquette, d'un cdrom ou de votre disque dur, cliquer sur Installer.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 +CONTROL "Pour installer un nouveau programme � partir d'une disquette, d'un cdrom ou de votre disque dur, cliquez sur Installer.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 CONTROL "&Installer", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 - CONTROL "Les logiciels suivants peuvent �tre automatiquement d�sinstall�s. Pour supprimer un programme ou modifier ses composants, le s�lectionner dans la liste, et cliquer sur Ajouter/Supprimer.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "Les logiciels suivants peuvent �tre d�sinstall�s automatiquement.\nPour supprimer un programme ou modifier ses composants, s�lectionnez-le dans la liste, et cliquez sur Modifier/Supprimer.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 - CONTROL "Ajouter/&Supprimer", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 198, 64, 14 - CONTROL "&Info. support", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 176, 198, 64, 14 + CONTROL "Modifier/&Supprimer", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 + CONTROL "&Infos de support", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 176, 198, 64, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 } IDD_INFO DIALOG 0, 0, 256, 138 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Information pour support" +CAPTION "Informations de support" FONT 8, "MS Shell Dlg" { CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 - CONTROL "Les informations suivantes peuvent �tre utilis�es pour obtenir un support technique pour %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 - CONTROL "Editeur:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 - CONTROL "Version:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 - CONTROL "Contact:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 - CONTROL "Support Information:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 - CONTROL "Support Telephone:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 - CONTROL "Lisez-moi:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 - CONTROL "Mise � jour des produits:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 - CONTROL "Commentaires:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 + CONTROL "Les informations suivantes peuvent �tre utilis�es pour obtenir du support technique pour %s :", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "�diteur :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 + CONTROL "Version :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 + CONTROL "Contact :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 + CONTROL "Support :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 + CONTROL "T�l�phone :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 + CONTROL "Lisez-moi :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 + CONTROL "Mises � jour :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 + CONTROL "Commentaires :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8 CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8 CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8

1 0

Vincent Povirk : include: Add some definitions to wincodec.idl.
by Alexandre Julliard 29 Jun '09

29 Jun '09

Module: wine Branch: master Commit: 2824c4458b8554ff9e6487d9a5702b74134463ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=2824c4458b8554ff9e6487d9a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jun 24 16:39:33 2009 -0500 include: Add some definitions to wincodec.idl. --- include/wincodec.idl | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index abb4d08..84aafcb 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -43,6 +43,14 @@ typedef enum WICBitmapAlphaChannelOption { WICBITMAPALPHACHANNELOPTIONS_FORCE_DWORD = CODEC_FORCE_DWORD } WICBitmapAlphaChannelOption; +typedef enum WICBitmapDecoderCapabilities { + WICBitmapDecoderCapabilitySameEncoder = 0x00000001, + WICBitmapDecoderCapabilityCanDecodeAllImages = 0x00000002, + WICBitmapDecoderCapabilityCanDecodeSomeImages = 0x00000004, + WICBitmapDecoderCapabilityCanEnumerateMetadata = 0x00000008, + WICBitmapDecoderCapabilityCanDecodeThumbnail = 0x00000010, +} WICBitmapDecoderCapabilities; + typedef GUID WICPixelFormatGUID; typedef REFGUID REFWICPixelFormatGUID; @@ -53,6 +61,9 @@ typedef struct WICRect { INT Height; } WICRect; +cpp_quote("#define WINCODEC_ERR_WRONGSTATE 0x88982f04") +cpp_quote("#define WINCODEC_ERR_CODECNOTHUMBNAIL 0x88982f44") + interface IWICBitmap; interface IWICComponentInfo; interface IWICBitmapEncoder;

1 0

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

29 Jun '09

Module: wine Branch: master Commit: 6f86ceef499288eca963f959a63aa2fcf0051120 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f86ceef499288eca963f959a… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Sat Jun 13 16:18:35 2009 -0500 windowscodecs: Implement trivial methods for BMP decoder. --- dlls/windowscodecs/bmpdecode.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index 2ab8034..a77d356 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -101,8 +101,8 @@ static HRESULT WINAPI BmpDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p static HRESULT WINAPI BmpDecoder_GetContainerFormat(IWICBitmapDecoder *iface, GUID *pguidContainerFormat) { - FIXME("(%p,%p): stub\n", iface, pguidContainerFormat); - return E_NOTIMPL; + memcpy(pguidContainerFormat, &GUID_ContainerFormatBmp, sizeof(GUID)); + return S_OK; } static HRESULT WINAPI BmpDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, @@ -150,8 +150,8 @@ static HRESULT WINAPI BmpDecoder_GetThumbnail(IWICBitmapDecoder *iface, static HRESULT WINAPI BmpDecoder_GetFrameCount(IWICBitmapDecoder *iface, UINT *pCount) { - FIXME("(%p,%p): stub\n", iface, pCount); - return E_NOTIMPL; + *pCount = 1; + return S_OK; } static HRESULT WINAPI BmpDecoder_GetFrame(IWICBitmapDecoder *iface,

1 0

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

29 Jun '09

Module: wine Branch: master Commit: 0caec8321547ccb9cc42f70aaf8c60e3d15d0b68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0caec8321547ccb9cc42f70aa… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Sat Jun 13 17:15:55 2009 -0500 windowscodecs: Implement Initialize method for BMP decoder. --- dlls/windowscodecs/bmpdecode.c | 78 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 76 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index a77d356..f60471e 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" #include "winreg.h" +#include "wingdi.h" #include "objbase.h" #include "wincodec.h" @@ -35,10 +36,68 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct { + DWORD bc2Size; + DWORD bc2Width; + DWORD bc2Height; + WORD bc2Planes; + WORD bc2BitCount; + DWORD bc2Compression; + DWORD bc2SizeImage; + DWORD bc2XRes; + DWORD bc2YRes; + DWORD bc2ClrUsed; + DWORD bc2ClrImportant; + /* same as BITMAPINFOHEADER until this point */ + WORD bc2ResUnit; + WORD bc2Reserved; + WORD bc2Orientation; + WORD bc2Halftoning; + DWORD bc2HalftoneSize1; + DWORD bc2HalftoneSize2; + DWORD bc2ColorSpace; + DWORD bc2AppData; +} BITMAPCOREHEADER2; + +typedef struct { const IWICBitmapDecoderVtbl *lpVtbl; LONG ref; + BOOL initialized; + IStream *stream; + BITMAPFILEHEADER bfh; + BITMAPV5HEADER bih; } BmpDecoder; +static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream) +{ + HRESULT hr; + ULONG bytestoread, bytesread; + + if (This->initialized) return WINCODEC_ERR_WRONGSTATE; + + hr = IStream_Read(stream, &This->bfh, sizeof(BITMAPFILEHEADER), &bytesread); + if (FAILED(hr)) return hr; + if (bytesread != sizeof(BITMAPFILEHEADER) || + This->bfh.bfType != 0x4d42 /* "BM" */) return E_FAIL; + + hr = IStream_Read(stream, &This->bih.bV5Size, sizeof(DWORD), &bytesread); + if (FAILED(hr)) return hr; + if (bytesread != sizeof(DWORD) || + (This->bih.bV5Size != sizeof(BITMAPCOREHEADER) && + This->bih.bV5Size != sizeof(BITMAPCOREHEADER2) && + This->bih.bV5Size != sizeof(BITMAPINFOHEADER) && + This->bih.bV5Size != sizeof(BITMAPV4HEADER) && + This->bih.bV5Size != sizeof(BITMAPV5HEADER))) return E_FAIL; + + bytestoread = This->bih.bV5Size-sizeof(DWORD); + hr = IStream_Read(stream, &This->bih.bV5Width, bytestoread, &bytesread); + if (FAILED(hr)) return hr; + if (bytestoread != bytesread) return E_FAIL; + + This->initialized = TRUE; + + return S_OK; +} + HRESULT WINAPI BmpDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID iid, void **ppv) { @@ -79,7 +138,10 @@ static ULONG WINAPI BmpDecoder_Release(IWICBitmapDecoder *iface) TRACE("(%p) refcount=%u\n", iface, ref); if (ref == 0) + { + if (This->stream) IStream_Release(This->stream); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -94,8 +156,18 @@ static HRESULT WINAPI BmpDecoder_QueryCapability(IWICBitmapDecoder *iface, IStre static HRESULT WINAPI BmpDecoder_Initialize(IWICBitmapDecoder *iface, IStream *pIStream, WICDecodeOptions cacheOptions) { - FIXME("(%p,%p,%x): stub\n", iface, pIStream, cacheOptions); - return E_NOTIMPL; + HRESULT hr; + BmpDecoder *This = (BmpDecoder*)iface; + + hr = BmpDecoder_ReadHeaders(This, pIStream); + + if (SUCCEEDED(hr)) + { + This->stream = pIStream; + IStream_AddRef(pIStream); + } + + return hr; } static HRESULT WINAPI BmpDecoder_GetContainerFormat(IWICBitmapDecoder *iface, @@ -194,6 +266,8 @@ HRESULT BmpDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->lpVtbl = &BmpDecoder_Vtbl; This->ref = 1; + This->initialized = FALSE; + This->stream = NULL; ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); IUnknown_Release((IUnknown*)This);

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