April 2008 - Wine-commits - list.winehq.org

Lei Zhang : gdiplus: Add a stub for GdipSetInfinite.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 0fe2f5b67716c18b074c60b341f9a7c602b41408 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fe2f5b67716c18b074c60b34… Author: Lei Zhang <thestig(a)google.com> Date: Thu Apr 10 12:40:16 2008 -0700 gdiplus: Add a stub for GdipSetInfinite. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/region.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index b951d65..58e913e 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -533,7 +533,7 @@ @ stdcall GdipSetImageAttributesToIdentity(ptr long) @ stdcall GdipSetImageAttributesWrapMode(ptr long long long) @ stdcall GdipSetImagePalette(ptr ptr) -@ stub GdipSetInfinite +@ stdcall GdipSetInfinite(ptr) @ stdcall GdipSetInterpolationMode(ptr long) @ stdcall GdipSetLineBlend(ptr ptr ptr long) @ stub GdipSetLineColors diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 9656f4e..92da580 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -39,3 +39,13 @@ GpStatus WINGDIPAPI GdipSetEmpty(GpRegion *region) return NotImplemented; } + +GpStatus WINGDIPAPI GdipSetInfinite(GpRegion *region) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +}

1 0

Lei Zhang : gdiplus: Add a stub for GdipSetImageAttributesToIdentity.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 6a44f191797b6425aa11dee13027fc3a71b57aee URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a44f191797b6425aa11dee13… Author: Lei Zhang <thestig(a)google.com> Date: Thu Apr 10 12:40:15 2008 -0700 gdiplus: Add a stub for GdipSetImageAttributesToIdentity. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/imageattributes.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index caf8864..b951d65 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -530,7 +530,7 @@ @ stdcall GdipSetImageAttributesOutputChannelColorProfile(ptr long long ptr) @ stdcall GdipSetImageAttributesRemapTable(ptr long long long ptr) @ stdcall GdipSetImageAttributesThreshold(ptr long long long) -@ stub GdipSetImageAttributesToIdentity +@ stdcall GdipSetImageAttributesToIdentity(ptr long) @ stdcall GdipSetImageAttributesWrapMode(ptr long long long) @ stdcall GdipSetImagePalette(ptr ptr) @ stub GdipSetInfinite diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index 879c443..858ea15 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -169,3 +169,14 @@ GpStatus WINGDIPAPI GdipSetImageAttributesThreshold(GpImageAttributes *imageAttr return NotImplemented; } + +GpStatus WINGDIPAPI GdipSetImageAttributesToIdentity(GpImageAttributes *imageAttr, + ColorAdjustType type) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +}

1 0

Lei Zhang : gdiplus: Add a stub for GdipSetImageAttributesThreshold.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 03c7d5583049d59e8bae61406fe8c61d49fda928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03c7d5583049d59e8bae61406… Author: Lei Zhang <thestig(a)google.com> Date: Thu Apr 10 12:40:14 2008 -0700 gdiplus: Add a stub for GdipSetImageAttributesThreshold. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/imageattributes.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 349e10f..caf8864 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -529,7 +529,7 @@ @ stdcall GdipSetImageAttributesOutputChannel(ptr long long long) @ stdcall GdipSetImageAttributesOutputChannelColorProfile(ptr long long ptr) @ stdcall GdipSetImageAttributesRemapTable(ptr long long long ptr) -@ stub GdipSetImageAttributesThreshold +@ stdcall GdipSetImageAttributesThreshold(ptr long long long) @ stub GdipSetImageAttributesToIdentity @ stdcall GdipSetImageAttributesWrapMode(ptr long long long) @ stdcall GdipSetImagePalette(ptr ptr) diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index f4cecbe..879c443 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -158,3 +158,14 @@ GpStatus WINGDIPAPI GdipSetImageAttributesRemapTable(GpImageAttributes *imageAtt return NotImplemented; } + +GpStatus WINGDIPAPI GdipSetImageAttributesThreshold(GpImageAttributes *imageAttr, + ColorAdjustType type, BOOL enableFlag, REAL threshold) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +}

1 0

Lei Zhang : gdiplus: Add a stub for GdipSetImageAttributesRemapTable.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 65445b9e7ebf77b4b24bda687249a67091152512 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65445b9e7ebf77b4b24bda687… Author: Lei Zhang <thestig(a)google.com> Date: Thu Apr 10 12:40:13 2008 -0700 gdiplus: Add a stub for GdipSetImageAttributesRemapTable. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/imageattributes.c | 12 ++++++++++++ include/gdipluscolor.h | 16 +++++++++++++++- include/gdipluscolormatrix.h | 7 +++++++ include/gdiplusgpstubs.h | 1 + 5 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 8157f4f..349e10f 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -528,7 +528,7 @@ @ stdcall GdipSetImageAttributesNoOp(ptr long long) @ stdcall GdipSetImageAttributesOutputChannel(ptr long long long) @ stdcall GdipSetImageAttributesOutputChannelColorProfile(ptr long long ptr) -@ stub GdipSetImageAttributesRemapTable +@ stdcall GdipSetImageAttributesRemapTable(ptr long long long ptr) @ stub GdipSetImageAttributesThreshold @ stub GdipSetImageAttributesToIdentity @ stdcall GdipSetImageAttributesWrapMode(ptr long long long) diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index b74fc66..f4cecbe 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -146,3 +146,15 @@ GpStatus WINGDIPAPI GdipSetImageAttributesOutputChannelColorProfile(GpImageAttri return NotImplemented; } + +GpStatus WINGDIPAPI GdipSetImageAttributesRemapTable(GpImageAttributes *imageAttr, + ColorAdjustType type, BOOL enableFlag, UINT mapSize, + GDIPCONST ColorMap *map) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} diff --git a/include/gdipluscolor.h b/include/gdipluscolor.h index 5c8e53f..39b7cb6 100644 --- a/include/gdipluscolor.h +++ b/include/gdipluscolor.h @@ -28,7 +28,21 @@ enum ColorChannelFlags ColorChannelFlagsLast }; -#ifndef __cplusplus +#ifdef __cplusplus + +/* FIXME: missing the methods. */ +class Color +{ +protected: + ARGB Argb; +}; + +#else /* end of c++ typedefs */ + +typedef struct Color +{ + ARGB Argb; +} Color; typedef enum ColorChannelFlags ColorChannelFlags; diff --git a/include/gdipluscolormatrix.h b/include/gdipluscolormatrix.h index afc04c0..532e8f4 100644 --- a/include/gdipluscolormatrix.h +++ b/include/gdipluscolormatrix.h @@ -42,11 +42,18 @@ enum ColorAdjustType ColorAdjustTypeAny }; +struct ColorMap +{ + Color oldColor; + Color newCOlor; +}; + #ifndef __cplusplus typedef enum ColorAdjustType ColorAdjustType; typedef enum ColorMatrixFlags ColorMatrixFlags; typedef struct ColorMatrix ColorMatrix; +typedef struct ColorMap ColorMap; #endif /* end of c typedefs */ diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index d7d8702..9f7d092 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -80,5 +80,6 @@ typedef DashStyle GpDashStyle; typedef MatrixOrder GpMatrixOrder; typedef Point GpPoint; typedef WrapMode GpWrapMode; +typedef Color GpColor; #endif

1 0

Petr Sumbera : server: Workaround for conflict between Wine and Solaris list.h.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: f4575aaa5f0f179a9021a160f865091ceb8ab1ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4575aaa5f0f179a9021a160f… Author: Petr Sumbera <petr.sumbera(a)sun.com> Date: Thu Apr 10 17:03:18 2008 +0200 server: Workaround for conflict between Wine and Solaris list.h. --- server/fd.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/server/fd.c b/server/fd.c index 41e404c..0d33e77 100644 --- a/server/fd.c +++ b/server/fd.c @@ -44,7 +44,25 @@ #include <sys/statvfs.h> #endif #ifdef HAVE_SYS_VFS_H +/* + * Solaris defines its system list in sys/list.h. + * This need to be workaround it here. + */ +#define list SYSLIST +#define list_next SYSLIST_NEXT +#define list_prev SYSLIST_PREV +#define list_head SYSLIST_HEAD +#define list_tail SYSLIST_TAIL +#define list_move_tail SYSLIST_MOVE_TAIL +#define list_remove SYSLIST_REMOVE #include <sys/vfs.h> +#undef list +#undef list_next +#undef list_prev +#undef list_head +#undef list_tail +#undef list_move_tail +#undef list_remove #endif #ifdef HAVE_SYS_PARAM_H #include <sys/param.h>

1 0

Luis C. Busquets Pérez : tools: Add Spanish translation to wine.desktop.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: f1f76e8a4e3bb079c6fa7b11002f7daae2755cf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1f76e8a4e3bb079c6fa7b110… Author: Luis C. Busquets Pérez <luis.busquets(a)ilidium.com> Date: Thu Apr 10 20:50:51 2008 +0200 tools: Add Spanish translation to wine.desktop. --- tools/wine.desktop | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.desktop b/tools/wine.desktop index a2165f9..a499530 100644 --- a/tools/wine.desktop +++ b/tools/wine.desktop @@ -2,6 +2,7 @@ Type=Application Name=Wine Windows Emulator Name[de]=Wine Windows-Emulator +Name[es]=Emulador Windows de Wine Name[nl]=Wine Windows-emulator Name[sv]=Windows-emulatorn Wine Name[ru]=Wine Эмулятор Windows

1 0

Petr Sumbera : winetest: Fix shell substitution syntax for Solaris.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 7975a1a926c90153fbe573598063bb2b548ceca0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7975a1a926c90153fbe573598… Author: Petr Sumbera <petr.sumbera(a)sun.com> Date: Thu Apr 10 12:02:04 2008 +0200 winetest: Fix shell substitution syntax for Solaris. --- programs/winetest/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 5a188b6..917c6f7 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -6,7 +6,7 @@ MODULE = winetest.exe APPMODE = -mconsole IMPORTS = comctl32 version user32 gdi32 advapi32 wsock32 kernel32 -EXTRARCFLAGS = -DBUILD_SHA1=\"$$(GIT_DIR=$(TOPSRCDIR)/.git git rev-parse HEAD 2>/dev/null)\" +EXTRARCFLAGS = -DBUILD_SHA1=\"`GIT_DIR=$(TOPSRCDIR)/.git git rev-parse HEAD 2>/dev/null`\" C_SRCS = \ gui.c \

1 0

Juan Lang : cryptui: Add stub DLL.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 2016c63e8278d69ac399eb4908344ec3a70c5ed7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2016c63e8278d69ac399eb490… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Apr 10 11:16:01 2008 -0700 cryptui: Add stub DLL. --- Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/cryptui/Makefile.in | 13 ++++++++++++ dlls/cryptui/cryptui.spec | 48 +++++++++++++++++++++++++++++++++++++++++++++ dlls/cryptui/main.c | 46 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 114 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index cc9211d..c91c86d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -201,6 +201,7 @@ ALL_MAKEFILES = \ dlls/cryptdll/Makefile \ dlls/cryptnet/Makefile \ dlls/cryptnet/tests/Makefile \ + dlls/cryptui/Makefile \ dlls/ctapi32/Makefile \ dlls/ctl3d32/Makefile \ dlls/d3d10/Makefile \ @@ -625,6 +626,7 @@ dlls/cryptdlg/Makefile: dlls/cryptdlg/Makefile.in dlls/Makedll.rules dlls/cryptdll/Makefile: dlls/cryptdll/Makefile.in dlls/Makedll.rules dlls/cryptnet/Makefile: dlls/cryptnet/Makefile.in dlls/Makedll.rules dlls/cryptnet/tests/Makefile: dlls/cryptnet/tests/Makefile.in dlls/Maketest.rules +dlls/cryptui/Makefile: dlls/cryptui/Makefile.in dlls/Makedll.rules dlls/ctapi32/Makefile: dlls/ctapi32/Makefile.in dlls/Makedll.rules dlls/ctl3d32/Makefile: dlls/ctl3d32/Makefile.in dlls/Makedll.rules dlls/d3d10/Makefile: dlls/d3d10/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 3a18ed9..b66a40a 100755 --- a/configure +++ b/configure @@ -21350,6 +21350,8 @@ ac_config_files="$ac_config_files dlls/cryptnet/Makefile" ac_config_files="$ac_config_files dlls/cryptnet/tests/Makefile" +ac_config_files="$ac_config_files dlls/cryptui/Makefile" + ac_config_files="$ac_config_files dlls/ctapi32/Makefile" ac_config_files="$ac_config_files dlls/ctl3d32/Makefile" @@ -22699,6 +22701,7 @@ do "dlls/cryptdll/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptdll/Makefile" ;; "dlls/cryptnet/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptnet/Makefile" ;; "dlls/cryptnet/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptnet/tests/Makefile" ;; + "dlls/cryptui/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/cryptui/Makefile" ;; "dlls/ctapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ctapi32/Makefile" ;; "dlls/ctl3d32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ctl3d32/Makefile" ;; "dlls/d3d10/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d10/Makefile" ;; diff --git a/configure.ac b/configure.ac index 3e14bdc..e9dadee 100644 --- a/configure.ac +++ b/configure.ac @@ -1704,6 +1704,7 @@ AC_CONFIG_FILES([dlls/cryptdlg/Makefile]) AC_CONFIG_FILES([dlls/cryptdll/Makefile]) AC_CONFIG_FILES([dlls/cryptnet/Makefile]) AC_CONFIG_FILES([dlls/cryptnet/tests/Makefile]) +AC_CONFIG_FILES([dlls/cryptui/Makefile]) AC_CONFIG_FILES([dlls/ctapi32/Makefile]) AC_CONFIG_FILES([dlls/ctl3d32/Makefile]) AC_CONFIG_FILES([dlls/d3d10/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 6f171d7..9b979ac 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -43,6 +43,7 @@ BASEDIRS = \ cryptdlg \ cryptdll \ cryptnet \ + cryptui \ ctapi32 \ ctl3d32 \ d3d10 \ diff --git a/dlls/cryptui/Makefile.in b/dlls/cryptui/Makefile.in new file mode 100644 index 0000000..2ab5e16 --- /dev/null +++ b/dlls/cryptui/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = cryptui.dll +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/cryptui/cryptui.spec b/dlls/cryptui/cryptui.spec new file mode 100644 index 0000000..aa4b00a --- /dev/null +++ b/dlls/cryptui/cryptui.spec @@ -0,0 +1,48 @@ +1 stub ACUIProviderInvokeUI +2 stub CryptUIDlgCertMgr +3 stub CryptUIDlgFreeCAContext +4 stub CryptUIDlgSelectCA +5 stub CryptUIDlgSelectCertificateA +6 stub CryptUIDlgSelectCertificateFromStore +7 stub CryptUIDlgSelectCertificateW +8 stub CryptUIDlgSelectStoreA +9 stub CryptUIDlgSelectStoreW +10 stub CryptUIDlgViewCRLA +11 stub CryptUIDlgViewCRLW +12 stub CryptUIDlgViewCTLA +13 stub CryptUIDlgViewCTLW +14 stub CryptUIDlgViewCertificateA +15 stub CryptUIDlgViewCertificatePropertiesA +16 stub CryptUIDlgViewCertificatePropertiesW +17 stub CryptUIDlgViewCertificateW +18 stub CryptUIDlgViewContext +19 stub CryptUIDlgViewSignerInfoA +20 stub CryptUIDlgViewSignerInfoW +21 stub CryptUIFreeCertificatePropertiesPagesA +22 stub CryptUIFreeCertificatePropertiesPagesW +23 stub CryptUIFreeViewSignaturesPagesA +24 stub CryptUIFreeViewSignaturesPagesW +25 stub CryptUIGetCertificatePropertiesPagesA +26 stub CryptUIGetCertificatePropertiesPagesW +27 stub CryptUIGetViewSignaturesPagesA +28 stub CryptUIGetViewSignaturesPagesW +29 stub CryptUIStartCertMgr +30 stub CryptUIWizBuildCTL +31 stub CryptUIWizCertRequest +32 stub CryptUIWizCreateCertRequestNoDS +33 stub CryptUIWizDigitalSign +34 stub CryptUIWizExport +35 stub CryptUIWizFreeCertRequestNoDS +36 stub CryptUIWizFreeDigitalSignContext +37 stub CryptUIWizImport +38 stub CryptUIWizQueryCertRequestNoDS +39 stub CryptUIWizSubmitCertRequestNoDS +40 stub DllRegisterServer +41 stub DllUnregisterServer +42 stub EnrollmentCOMObjectFactory_getInstance +43 stub I_CryptUIProtect +44 stub I_CryptUIProtectFailure +45 stub LocalEnroll +46 stub LocalEnrollNoDS +47 stub RetrievePKCS7FromCA +48 stub WizardFree diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c new file mode 100644 index 0000000..a951f01 --- /dev/null +++ b/dlls/cryptui/main.c @@ -0,0 +1,46 @@ +/* + * Copyright 2008 Juan Lang + * + * 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 "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(cryptui); + +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; + case DLL_PROCESS_DETACH: + break; + default: + break; + } + return TRUE; +}

1 0

Juan Lang : softpub: Forward softpub functions to wintrust.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 7267c0772bb15416d0cebcb7f0b5693c4c7fbdd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7267c0772bb15416d0cebcb7f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Apr 10 10:27:04 2008 -0700 softpub: Forward softpub functions to wintrust. --- dlls/softpub/Makefile.in | 5 +--- dlls/softpub/main.c | 46 --------------------------------------------- dlls/softpub/softpub.spec | 42 ++++++++++++++++++++-------------------- 3 files changed, 22 insertions(+), 71 deletions(-) diff --git a/dlls/softpub/Makefile.in b/dlls/softpub/Makefile.in index b62dae7..8166939 100644 --- a/dlls/softpub/Makefile.in +++ b/dlls/softpub/Makefile.in @@ -3,10 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = softpub.dll -IMPORTS = kernel32 - -C_SRCS = \ - main.c +IMPORTS = wintrust kernel32 @MAKE_DLL_RULES@ diff --git a/dlls/softpub/main.c b/dlls/softpub/main.c deleted file mode 100644 index bf9a6f5..0000000 --- a/dlls/softpub/main.c +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2008 Maarten Lankhorst - * - * 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 "config.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(softpub); - -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; - case DLL_PROCESS_DETACH: - break; - default: - break; - } - return TRUE; -} diff --git a/dlls/softpub/softpub.spec b/dlls/softpub/softpub.spec index 620ae27..5b2e20a 100644 --- a/dlls/softpub/softpub.spec +++ b/dlls/softpub/softpub.spec @@ -1,24 +1,24 @@ -1 stub GenericChainCertificateTrust -2 stub GenericChainFinalProv -3 stub HTTPSCertificateTrust -4 stub SoftpubDefCertInit +1 stdcall GenericChainCertificateTrust(ptr) wintrust.GenericChainCertificateTrust +2 stdcall GenericChainFinalProv(ptr) wintrust.GenericChainFinalProv +3 stdcall HTTPSCertificateTrust(ptr) wintrust.HTTPSCertificateTrust +4 stdcall SoftpubDefCertInit(ptr) wintrust.SoftpubDefCertInit 5 stub SoftpubFreeDefUsageCallData 6 stub SoftpubLoadDefUsageCallData 7 stub AddPersonalTrustDBPages -8 stub DllRegisterServer -9 stub DllUnregisterServer -10 stub DriverCleanupPolicy -11 stub DriverFinalPolicy -12 stub DriverInitializePolicy -13 stub FindCertsByIssuer -14 stub HTTPSFinalProv -15 stub OfficeCleanupPolicy -16 stub OfficeInitializePolicy -17 stub OpenPersonalTrustDBDialog -18 stub SoftpubAuthenticode -19 stub SoftpubCheckCert -20 stub SoftpubCleanup -21 stub SoftpubDumpStructure -22 stub SoftpubInitialize -23 stub SoftpubLoadMessage -24 stub SoftpubLoadSignature +8 stdcall -private DllRegisterServer() wintrust.SoftpubDllRegisterServer +9 stdcall -private DllUnregisterServer() wintrust.SoftpubDllUnregisterServer +10 stdcall DriverCleanupPolicy(ptr) wintrust.DriverCleanupPolicy +11 stdcall DriverFinalPolicy(ptr) wintrust.DriverFinalPolicy +12 stdcall DriverInitializePolicy(ptr) wintrust.DriverInitializePolicy +13 stdcall FindCertsByIssuer(ptr ptr ptr ptr long wstr long) wintrust.FindCertsByIssuer +14 stdcall HTTPSFinalProv(ptr) wintrust.HTTPSFinalProv +15 stdcall OfficeCleanupPolicy(ptr) wintrust.OfficeCleanupPolicy +16 stdcall OfficeInitializePolicy(ptr) wintrust.OfficeInitializePolicy +17 stdcall OpenPersonalTrustDBDialog(long) wintrust.OpenPersonalTrustDBDialog +18 stdcall SoftpubAuthenticode(ptr) wintrust.SoftpubAuthenticode +19 stdcall SoftpubCheckCert(ptr long long long) wintrust.SoftpubCheckCert +20 stdcall SoftpubCleanup(ptr) wintrust.SoftpubCleanup +21 stdcall SoftpubDumpStructure(ptr) wintrust.SoftpubDumpStructure +22 stdcall SoftpubInitialize(ptr) wintrust.SoftpubInitialize +23 stdcall SoftpubLoadMessage(ptr) wintrust.SoftpubLoadMessage +24 stdcall SoftpubLoadSignature(ptr) wintrust.SoftpubLoadSignature

1 0

Rob Shearman : winedos: The calling convention should come after the return type in the declaration of VGA_DoShowMouse for portability .
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 8dcde49a53148c56bd35f273c6a7bce7958833bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dcde49a53148c56bd35f273c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Apr 10 12:01:59 2008 +0100 winedos: The calling convention should come after the return type in the declaration of VGA_DoShowMouse for portability. --- dlls/winedos/vga.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winedos/vga.c b/dlls/winedos/vga.c index d236591..26618a2 100644 --- a/dlls/winedos/vga.c +++ b/dlls/winedos/vga.c @@ -657,7 +657,7 @@ int VGA_GetWindowStart(void) * * Callback for VGA_ShowMouse. */ -static WINAPI void VGA_DoShowMouse( ULONG_PTR show ) +static void WINAPI VGA_DoShowMouse( ULONG_PTR show ) { INT rv;

1 0