February 2008 - Wine-Commits

Alexandre Julliard : gdi32: Avoid calling GetObject16 from 32-bit code.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 1fa9e526ff0931991aa547c8137327f6143307bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fa9e526ff0931991aa547c81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 18 18:07:51 2008 +0100 gdi32: Avoid calling GetObject16 from 32-bit code. --- dlls/gdi32/mfdrv/objects.c | 51 +++++++++++++++++++++++++++++++++---------- 1 files changed, 39 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c index a43598b..c6dbb87 100644 --- a/dlls/gdi32/mfdrv/objects.c +++ b/dlls/gdi32/mfdrv/objects.c @@ -354,14 +354,32 @@ HBRUSH MFDRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) * MFDRV_CreateFontIndirect */ -static UINT16 MFDRV_CreateFontIndirect(PHYSDEV dev, HFONT hFont, LOGFONT16 *logfont) +static UINT16 MFDRV_CreateFontIndirect(PHYSDEV dev, HFONT hFont, LOGFONTW *logfont) { char buffer[sizeof(METARECORD) - 2 + sizeof(LOGFONT16)]; METARECORD *mr = (METARECORD *)&buffer; + LOGFONT16 *font16; mr->rdSize = (sizeof(METARECORD) + sizeof(LOGFONT16) - 2) / 2; mr->rdFunction = META_CREATEFONTINDIRECT; - memcpy(&(mr->rdParm), logfont, sizeof(LOGFONT16)); + font16 = (LOGFONT16 *)&mr->rdParm; + + font16->lfHeight = logfont->lfHeight; + font16->lfWidth = logfont->lfWidth; + font16->lfEscapement = logfont->lfEscapement; + font16->lfOrientation = logfont->lfOrientation; + font16->lfWeight = logfont->lfWeight; + font16->lfItalic = logfont->lfItalic; + font16->lfUnderline = logfont->lfUnderline; + font16->lfStrikeOut = logfont->lfStrikeOut; + font16->lfCharSet = logfont->lfCharSet; + font16->lfOutPrecision = logfont->lfOutPrecision; + font16->lfClipPrecision = logfont->lfClipPrecision; + font16->lfQuality = logfont->lfQuality; + font16->lfPitchAndFamily = logfont->lfPitchAndFamily; + WideCharToMultiByte( CP_ACP, 0, logfont->lfFaceName, -1, font16->lfFaceName, LF_FACESIZE, NULL, NULL ); + font16->lfFaceName[LF_FACESIZE-1] = 0; + if (!(MFDRV_WriteRecord( dev, mr, mr->rdSize * 2))) return 0; return MFDRV_AddHandle( dev, hFont ); @@ -374,15 +392,15 @@ static UINT16 MFDRV_CreateFontIndirect(PHYSDEV dev, HFONT hFont, LOGFONT16 *logf HFONT MFDRV_SelectFont( PHYSDEV dev, HFONT hfont, HANDLE gdiFont ) { METAFILEDRV_PDEVICE *physDev = (METAFILEDRV_PDEVICE *)dev; - LOGFONT16 lf16; + LOGFONTW font; INT16 index; index = MFDRV_FindObject(dev, hfont); if( index < 0 ) { - if (!GetObject16( HFONT_16(hfont), sizeof(lf16), &lf16 )) + if (!GetObjectW( hfont, sizeof(font), &font )) return HGDI_ERROR; - index = MFDRV_CreateFontIndirect(dev, hfont, &lf16); + index = MFDRV_CreateFontIndirect(dev, hfont, &font); if( index < 0 ) return HGDI_ERROR; GDI_hdc_using_object(hfont, physDev->hdc); @@ -419,15 +437,24 @@ HPEN MFDRV_SelectPen( PHYSDEV dev, HPEN hpen ) index = MFDRV_FindObject(dev, hpen); if( index < 0 ) { - if (!GetObject16( HPEN_16(hpen), sizeof(logpen), &logpen )) - { - /* must be an extended pen */ - EXTLOGPEN *elp; - INT size = GetObjectW( hpen, 0, NULL ); + /* must be an extended pen */ + INT size = GetObjectW( hpen, 0, NULL ); + + if (!size) return 0; - if (!size) return 0; + if (size == sizeof(LOGPEN)) + { + LOGPEN pen; - elp = HeapAlloc( GetProcessHeap(), 0, size ); + GetObjectW( hpen, sizeof(pen), &pen ); + logpen.lopnStyle = pen.lopnStyle; + logpen.lopnWidth.x = pen.lopnWidth.x; + logpen.lopnWidth.y = pen.lopnWidth.y; + logpen.lopnColor = pen.lopnColor; + } + else /* must be an extended pen */ + { + EXTLOGPEN *elp = HeapAlloc( GetProcessHeap(), 0, size ); GetObjectW( hpen, size, elp ); /* FIXME: add support for user style pens */

1 0

Alexandre Julliard : gdi32: Reimplemented GetObject16 and moved it to gdi16 .c.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: a306af0c62e54b358b3557dc8c060ad05b9d2b40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a306af0c62e54b358b3557dc8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 18 17:46:29 2008 +0100 gdi32: Reimplemented GetObject16 and moved it to gdi16.c. --- dlls/gdi32/gdi16.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdiobj.c | 24 ----------- 2 files changed, 108 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index 8d7875b..8e9d90d 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -119,6 +119,25 @@ static void logfont_16_to_W( const LOGFONT16 *font16, LPLOGFONTW font32 ) font32->lfFaceName[LF_FACESIZE-1] = 0; } +/* convert a LOGFONTW to a LOGFONT16 */ +static void logfont_W_to_16( const LOGFONTW* font32, LPLOGFONT16 font16 ) +{ + font16->lfHeight = font32->lfHeight; + font16->lfWidth = font32->lfWidth; + font16->lfEscapement = font32->lfEscapement; + font16->lfOrientation = font32->lfOrientation; + font16->lfWeight = font32->lfWeight; + font16->lfItalic = font32->lfItalic; + font16->lfUnderline = font32->lfUnderline; + font16->lfStrikeOut = font32->lfStrikeOut; + font16->lfCharSet = font32->lfCharSet; + font16->lfOutPrecision = font32->lfOutPrecision; + font16->lfClipPrecision = font32->lfClipPrecision; + font16->lfQuality = font32->lfQuality; + font16->lfPitchAndFamily = font32->lfPitchAndFamily; + WideCharToMultiByte( CP_ACP, 0, font32->lfFaceName, -1, font16->lfFaceName, LF_FACESIZE, NULL, NULL ); + font16->lfFaceName[LF_FACESIZE-1] = 0; +} /*********************************************************************** * SetBkColor (GDI.1) @@ -1145,6 +1164,95 @@ INT16 WINAPI GetMapMode16( HDC16 hdc ) /*********************************************************************** + * GetObject (GDI.82) + */ +INT16 WINAPI GetObject16( HGDIOBJ16 handle16, INT16 count, LPVOID buffer ) +{ + HGDIOBJ handle = HGDIOBJ_32( handle16 ); + switch( GetObjectType( handle )) + { + case OBJ_PEN: + if (buffer) + { + LOGPEN16 *pen16 = buffer; + LOGPEN pen; + + if (count < sizeof(LOGPEN16)) return 0; + if (!GetObjectW( handle, sizeof(pen), &pen )) return 0; + + pen16->lopnStyle = pen.lopnStyle; + pen16->lopnColor = pen.lopnColor; + pen16->lopnWidth.x = pen.lopnWidth.x; + pen16->lopnWidth.y = pen.lopnWidth.y; + } + return sizeof(LOGPEN16); + + case OBJ_BRUSH: + if (buffer) + { + LOGBRUSH brush; + LOGBRUSH16 brush16; + + if (!GetObjectW( handle, sizeof(brush), &brush )) return 0; + brush16.lbStyle = brush.lbStyle; + brush16.lbColor = brush.lbColor; + brush16.lbHatch = brush.lbHatch; + if (count > sizeof(brush16)) count = sizeof(brush16); + memcpy( buffer, &brush16, count ); + return count; + } + return sizeof(LOGBRUSH16); + + case OBJ_PAL: + return GetObjectW( handle, count, buffer ); + + case OBJ_FONT: + if (buffer) + { + LOGFONTW font; + LOGFONT16 font16; + + if (!GetObjectW( handle, sizeof(font), &font )) return 0; + logfont_W_to_16( &font, &font16 ); + if (count > sizeof(font16)) count = sizeof(font16); + memcpy( buffer, &font16, count ); + return count; + } + return sizeof(LOGFONT16); + + case OBJ_BITMAP: + { + DIBSECTION dib; + INT size; + BITMAP16 *bmp16 = buffer; + + if (!(size = GetObjectW( handle, sizeof(dib), &dib ))) return 0; + if (size == sizeof(DIBSECTION) && count > sizeof(BITMAP16)) + { + FIXME("not implemented for DIBs: count %d\n", count); + return 0; + } + else + { + if (count < sizeof(BITMAP16)) return 0; + bmp16->bmType = dib.dsBm.bmType; + bmp16->bmWidth = dib.dsBm.bmWidth; + bmp16->bmHeight = dib.dsBm.bmHeight; + bmp16->bmWidthBytes = dib.dsBm.bmWidthBytes; + bmp16->bmPlanes = dib.dsBm.bmPlanes; + bmp16->bmBitsPixel = dib.dsBm.bmBitsPixel; + bmp16->bmBits = 0; + return sizeof(BITMAP16); + } + } + + default: + return 0; + } +} + + +/*********************************************************************** * GetPixel (GDI.83) */ COLORREF WINAPI GetPixel16( HDC16 hdc, INT16 x, INT16 y ) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 560d519..e05c1b9 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -944,30 +944,6 @@ HGDIOBJ WINAPI GetStockObject( INT obj ) /*********************************************************************** - * GetObject (GDI.82) - */ -INT16 WINAPI GetObject16( HGDIOBJ16 handle16, INT16 count, LPVOID buffer ) -{ - GDIOBJHDR * ptr; - HGDIOBJ handle = HGDIOBJ_32( handle16 ); - INT16 result = 0; - - TRACE("%p %d %p\n", handle, count, buffer ); - if (!count) return 0; - - if (!(ptr = GDI_GetObjPtr( handle, MAGIC_DONTCARE ))) return 0; - - if (ptr->funcs && ptr->funcs->pGetObject16) - result = ptr->funcs->pGetObject16( handle, ptr, count, buffer ); - else - SetLastError( ERROR_INVALID_HANDLE ); - - GDI_ReleaseObj( handle ); - return result; -} - - -/*********************************************************************** * GetObjectA (GDI32.@) */ INT WINAPI GetObjectA( HGDIOBJ handle, INT count, LPVOID buffer )

1 0

Alexandre Julliard : winex11: Move the raising of windows on SetFocus to the X11 driver where it belongs .
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 125793df0eab65798f53529784e7256d407f2ef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=125793df0eab65798f5352978… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 18 17:22:51 2008 +0100 winex11: Move the raising of windows on SetFocus to the X11 driver where it belongs. --- dlls/user32/focus.c | 4 ---- dlls/winex11.drv/window.c | 16 ++++++---------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index e2932d2..2eb1496 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -113,10 +113,6 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) if (SendMessageW( hwnd, WM_QUERYNEWPALETTE, 0, 0 )) SendMessageTimeoutW( HWND_BROADCAST, WM_PALETTEISCHANGING, (WPARAM)hwnd, 0, SMTO_ABORTIFHUNG, 2000, NULL ); - - if (!GetPropA( hwnd, "__wine_x11_managed" )) - SetWindowPos( hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE ); - if (!IsWindow(hwnd)) return FALSE; } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 5ead133..1e65a72 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1516,13 +1516,10 @@ void X11DRV_SetFocus( HWND hwnd ) { Display *display = thread_display(); struct x11drv_win_data *data; - XWindowAttributes win_attr; - - /* Only mess with the X focus if there's */ - /* no desktop window and if the window is not managed by the WM. */ - if (root_window != DefaultRootWindow(display)) return; + XWindowChanges changes; - if (!hwnd) /* If setting the focus to 0, uninstall the colormap */ + /* If setting the focus to 0, uninstall the colormap */ + if (!hwnd && root_window == DefaultRootWindow(display)) { wine_tsx11_lock(); if (X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_PRIVATE) @@ -1538,11 +1535,10 @@ void X11DRV_SetFocus( HWND hwnd ) /* Set X focus and install colormap */ wine_tsx11_lock(); - if (XGetWindowAttributes( display, data->whole_window, &win_attr ) && - (win_attr.map_state == IsViewable)) + changes.stack_mode = Above; + XConfigureWindow( display, data->whole_window, CWStackMode, &changes ); + if (root_window == DefaultRootWindow(display)) { - /* If window is not viewable, don't change anything */ - /* we must not use CurrentTime (ICCCM), so try to use last message time instead */ /* FIXME: this is not entirely correct */ XSetInputFocus( display, data->whole_window, RevertToParent,

1 0

Maarten Lankhorst : softpub: Add initial stub dll.
by Alexandre Julliard Feb. 18, 2008

Feb. 18, 2008

Module: wine Branch: master Commit: e11826f553158d880c7c922f97a0267e5bb7f881 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e11826f553158d880c7c922f9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Feb 17 18:20:32 2008 -0800 softpub: Add initial stub dll. --- Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/softpub/Makefile.in | 13 ++++++++++++ dlls/softpub/main.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ dlls/softpub/softpub.spec | 24 +++++++++++++++++++++++ 7 files changed, 90 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index 0e91431..71a3eda 100644 --- a/Makefile.in +++ b/Makefile.in @@ -409,6 +409,7 @@ ALL_MAKEFILES = \ dlls/slbcsp/Makefile \ dlls/snmpapi/Makefile \ dlls/snmpapi/tests/Makefile \ + dlls/softpub/Makefile \ dlls/spoolss/Makefile \ dlls/spoolss/tests/Makefile \ dlls/stdole2.tlb/Makefile \ @@ -806,6 +807,7 @@ dlls/shlwapi/tests/Makefile: dlls/shlwapi/tests/Makefile.in dlls/Maketest.rules dlls/slbcsp/Makefile: dlls/slbcsp/Makefile.in dlls/Makedll.rules dlls/snmpapi/Makefile: dlls/snmpapi/Makefile.in dlls/Makedll.rules dlls/snmpapi/tests/Makefile: dlls/snmpapi/tests/Makefile.in dlls/Maketest.rules +dlls/softpub/Makefile: dlls/softpub/Makefile.in dlls/Makedll.rules dlls/spoolss/Makefile: dlls/spoolss/Makefile.in dlls/Makedll.rules dlls/spoolss/tests/Makefile: dlls/spoolss/tests/Makefile.in dlls/Maketest.rules dlls/stdole2.tlb/Makefile: dlls/stdole2.tlb/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 4787bb9..4387bb5 100755 --- a/configure +++ b/configure @@ -21669,6 +21669,8 @@ ac_config_files="$ac_config_files dlls/snmpapi/Makefile" ac_config_files="$ac_config_files dlls/snmpapi/tests/Makefile" +ac_config_files="$ac_config_files dlls/softpub/Makefile" + ac_config_files="$ac_config_files dlls/spoolss/Makefile" ac_config_files="$ac_config_files dlls/spoolss/tests/Makefile" @@ -22748,6 +22750,7 @@ do "dlls/slbcsp/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/slbcsp/Makefile" ;; "dlls/snmpapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/snmpapi/Makefile" ;; "dlls/snmpapi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/snmpapi/tests/Makefile" ;; + "dlls/softpub/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/softpub/Makefile" ;; "dlls/spoolss/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/spoolss/Makefile" ;; "dlls/spoolss/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/spoolss/tests/Makefile" ;; "dlls/stdole2.tlb/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/stdole2.tlb/Makefile" ;; diff --git a/configure.ac b/configure.ac index c7aea29..58945f1 100644 --- a/configure.ac +++ b/configure.ac @@ -1908,6 +1908,7 @@ AC_CONFIG_FILES([dlls/shlwapi/tests/Makefile]) AC_CONFIG_FILES([dlls/slbcsp/Makefile]) AC_CONFIG_FILES([dlls/snmpapi/Makefile]) AC_CONFIG_FILES([dlls/snmpapi/tests/Makefile]) +AC_CONFIG_FILES([dlls/softpub/Makefile]) AC_CONFIG_FILES([dlls/spoolss/Makefile]) AC_CONFIG_FILES([dlls/spoolss/tests/Makefile]) AC_CONFIG_FILES([dlls/stdole2.tlb/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index d4fd827..08b6840 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -199,6 +199,7 @@ BASEDIRS = \ shlwapi \ slbcsp \ snmpapi \ + softpub \ spoolss \ stdole2.tlb \ stdole32.tlb \ diff --git a/dlls/softpub/Makefile.in b/dlls/softpub/Makefile.in new file mode 100644 index 0000000..b62dae7 --- /dev/null +++ b/dlls/softpub/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = softpub.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/softpub/main.c b/dlls/softpub/main.c new file mode 100644 index 0000000..bf9a6f5 --- /dev/null +++ b/dlls/softpub/main.c @@ -0,0 +1,46 @@ +/* + * 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 new file mode 100644 index 0000000..620ae27 --- /dev/null +++ b/dlls/softpub/softpub.spec @@ -0,0 +1,24 @@ +1 stub GenericChainCertificateTrust +2 stub GenericChainFinalProv +3 stub HTTPSCertificateTrust +4 stub 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

1 0

Maarten Lankhorst : dssenh: Add initial stub dll.
by Alexandre Julliard Feb. 18, 2008

Feb. 18, 2008

Module: wine Branch: master Commit: 2472e81cea2854d0dd2f491f88852c6667ead9c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2472e81cea2854d0dd2f491f8… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Feb 17 18:20:32 2008 -0800 dssenh: Add initial stub dll. --- Makefile.in | 2 ++ configure | 3 +++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/dssenh/Makefile.in | 13 +++++++++++++ dlls/dssenh/dssenh.spec | 27 +++++++++++++++++++++++++++ dlls/dssenh/main.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 93 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index 71a3eda..73506ed 100644 --- a/Makefile.in +++ b/Makefile.in @@ -235,6 +235,7 @@ ALL_MAKEFILES = \ dlls/dpnlobby/Makefile \ dlls/dsound/Makefile \ dlls/dsound/tests/Makefile \ + dlls/dssenh/Makefile \ dlls/dswave/Makefile \ dlls/dwmapi/Makefile \ dlls/dxdiagn/Makefile \ @@ -633,6 +634,7 @@ dlls/dpnhpast/Makefile: dlls/dpnhpast/Makefile.in dlls/Makedll.rules dlls/dpnlobby/Makefile: dlls/dpnlobby/Makefile.in dlls/Makedll.rules dlls/dsound/Makefile: dlls/dsound/Makefile.in dlls/Makedll.rules dlls/dsound/tests/Makefile: dlls/dsound/tests/Makefile.in dlls/Maketest.rules +dlls/dssenh/Makefile: dlls/dssenh/Makefile.in dlls/Makedll.rules dlls/dswave/Makefile: dlls/dswave/Makefile.in dlls/Makedll.rules dlls/dwmapi/Makefile: dlls/dwmapi/Makefile.in dlls/Makedll.rules dlls/dxdiagn/Makefile: dlls/dxdiagn/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 4387bb5..f0202e6 100755 --- a/configure +++ b/configure @@ -21321,6 +21321,8 @@ ac_config_files="$ac_config_files dlls/dsound/Makefile" ac_config_files="$ac_config_files dlls/dsound/tests/Makefile" +ac_config_files="$ac_config_files dlls/dssenh/Makefile" + ac_config_files="$ac_config_files dlls/dswave/Makefile" ac_config_files="$ac_config_files dlls/dwmapi/Makefile" @@ -22576,6 +22578,7 @@ do "dlls/dpnlobby/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dpnlobby/Makefile" ;; "dlls/dsound/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dsound/Makefile" ;; "dlls/dsound/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dsound/tests/Makefile" ;; + "dlls/dssenh/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dssenh/Makefile" ;; "dlls/dswave/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dswave/Makefile" ;; "dlls/dwmapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dwmapi/Makefile" ;; "dlls/dxdiagn/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxdiagn/Makefile" ;; diff --git a/configure.ac b/configure.ac index 58945f1..aa940a1 100644 --- a/configure.ac +++ b/configure.ac @@ -1734,6 +1734,7 @@ AC_CONFIG_FILES([dlls/dpnhpast/Makefile]) AC_CONFIG_FILES([dlls/dpnlobby/Makefile]) AC_CONFIG_FILES([dlls/dsound/Makefile]) AC_CONFIG_FILES([dlls/dsound/tests/Makefile]) +AC_CONFIG_FILES([dlls/dssenh/Makefile]) AC_CONFIG_FILES([dlls/dswave/Makefile]) AC_CONFIG_FILES([dlls/dwmapi/Makefile]) AC_CONFIG_FILES([dlls/dxdiagn/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 08b6840..065b0b1 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -75,6 +75,7 @@ BASEDIRS = \ dpnhpast \ dpnlobby \ dsound \ + dssenh \ dswave \ dwmapi \ dxdiagn \ diff --git a/dlls/dssenh/Makefile.in b/dlls/dssenh/Makefile.in new file mode 100644 index 0000000..69aa663 --- /dev/null +++ b/dlls/dssenh/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = dssenh.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/dssenh/dssenh.spec b/dlls/dssenh/dssenh.spec new file mode 100644 index 0000000..037be06 --- /dev/null +++ b/dlls/dssenh/dssenh.spec @@ -0,0 +1,27 @@ +@ stub CPAcquireContext +@ stub CPCreateHash +@ stub CPDecrypt +@ stub CPDeriveKey +@ stub CPDestroyHash +@ stub CPDestroyKey +@ stub CPDuplicateHash +@ stub CPDuplicateKey +@ stub CPEncrypt +@ stub CPExportKey +@ stub CPGenKey +@ stub CPGenRandom +@ stub CPGetHashParam +@ stub CPGetKeyParam +@ stub CPGetProvParam +@ stub CPGetUserKey +@ stub CPHashData +@ stub CPHashSessionKey +@ stub CPImportKey +@ stub CPReleaseContext +@ stub CPSetHashParam +@ stub CPSetKeyParam +@ stub CPSetProvParam +@ stub CPSignHash +@ stub CPVerifySignature +@ stub DllRegisterServer +@ stub DllUnregisterServer diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c new file mode 100644 index 0000000..9578d1b --- /dev/null +++ b/dlls/dssenh/main.c @@ -0,0 +1,46 @@ +/* + * 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(dssenh); + +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

Maarten Lankhorst : sccbase: Add initial stub dll.
by Alexandre Julliard Feb. 18, 2008

Feb. 18, 2008

Module: wine Branch: master Commit: 322d4cab1e6b1c6ddbb9be86d6e0ffef2aeab1d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=322d4cab1e6b1c6ddbb9be86d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Feb 17 18:20:32 2008 -0800 sccbase: Add initial stub dll. --- Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/sccbase/Makefile.in | 13 ++++++++++++ dlls/sccbase/main.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ dlls/sccbase/sccbase.spec | 26 +++++++++++++++++++++++++ 7 files changed, 92 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index 70427ef..9c3a005 100644 --- a/Makefile.in +++ b/Makefile.in @@ -385,6 +385,7 @@ ALL_MAKEFILES = \ dlls/rsaenh/Makefile \ dlls/rsaenh/tests/Makefile \ dlls/sane.ds/Makefile \ + dlls/sccbase/Makefile \ dlls/schannel/Makefile \ dlls/schannel/tests/Makefile \ dlls/secur32/Makefile \ @@ -780,6 +781,7 @@ dlls/rsabase/tests/Makefile: dlls/rsabase/tests/Makefile.in dlls/Maketest.rules dlls/rsaenh/Makefile: dlls/rsaenh/Makefile.in dlls/Makedll.rules dlls/rsaenh/tests/Makefile: dlls/rsaenh/tests/Makefile.in dlls/Maketest.rules dlls/sane.ds/Makefile: dlls/sane.ds/Makefile.in dlls/Makedll.rules +dlls/sccbase/Makefile: dlls/sccbase/Makefile.in dlls/Makedll.rules dlls/schannel/Makefile: dlls/schannel/Makefile.in dlls/Makedll.rules dlls/schannel/tests/Makefile: dlls/schannel/tests/Makefile.in dlls/Maketest.rules dlls/secur32/Makefile: dlls/secur32/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 494c4da..3a38161 100755 --- a/configure +++ b/configure @@ -21621,6 +21621,8 @@ ac_config_files="$ac_config_files dlls/rsaenh/tests/Makefile" ac_config_files="$ac_config_files dlls/sane.ds/Makefile" +ac_config_files="$ac_config_files dlls/sccbase/Makefile" + ac_config_files="$ac_config_files dlls/schannel/Makefile" ac_config_files="$ac_config_files dlls/schannel/tests/Makefile" @@ -22720,6 +22722,7 @@ do "dlls/rsaenh/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsaenh/Makefile" ;; "dlls/rsaenh/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rsaenh/tests/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" ;; "dlls/schannel/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/schannel/tests/Makefile" ;; "dlls/secur32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/secur32/Makefile" ;; diff --git a/configure.ac b/configure.ac index f4404b3..da0df30 100644 --- a/configure.ac +++ b/configure.ac @@ -1884,6 +1884,7 @@ AC_CONFIG_FILES([dlls/rsabase/tests/Makefile]) AC_CONFIG_FILES([dlls/rsaenh/Makefile]) AC_CONFIG_FILES([dlls/rsaenh/tests/Makefile]) AC_CONFIG_FILES([dlls/sane.ds/Makefile]) +AC_CONFIG_FILES([dlls/sccbase/Makefile]) AC_CONFIG_FILES([dlls/schannel/Makefile]) AC_CONFIG_FILES([dlls/schannel/tests/Makefile]) AC_CONFIG_FILES([dlls/secur32/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index f241168..1378ffb 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -183,6 +183,7 @@ BASEDIRS = \ rsabase \ rsaenh \ sane.ds \ + sccbase \ schannel \ secur32 \ security \ diff --git a/dlls/sccbase/Makefile.in b/dlls/sccbase/Makefile.in new file mode 100644 index 0000000..a24f123 --- /dev/null +++ b/dlls/sccbase/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = sccbase.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/sccbase/main.c b/dlls/sccbase/main.c new file mode 100644 index 0000000..37abe5f --- /dev/null +++ b/dlls/sccbase/main.c @@ -0,0 +1,46 @@ +/* + * 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(sccbase); + +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/sccbase/sccbase.spec b/dlls/sccbase/sccbase.spec new file mode 100644 index 0000000..c63d06b --- /dev/null +++ b/dlls/sccbase/sccbase.spec @@ -0,0 +1,26 @@ +@ stub CPAcquireContext +@ stub CPAcquireContextW +@ stub CPCreateHash +@ stub CPDecrypt +@ stub CPDeriveKey +@ stub CPDestroyHash +@ stub CPDestroyKey +@ stub CPEncrypt +@ stub CPExportKey +@ stub CPGenKey +@ stub CPGenRandom +@ stub CPGetHashParam +@ stub CPGetKeyParam +@ stub CPGetProvParam +@ stub CPGetUserKey +@ stub CPHashData +@ stub CPHashSessionKey +@ stub CPImportKey +@ stub CPReleaseContext +@ stub CPSetHashParam +@ stub CPSetKeyParam +@ stub CPSetProvParam +@ stub CPSignHash +@ stub CPVerifySignature +@ stub DllRegisterServer +@ stub DllUnregisterServer

1 0

Maarten Lankhorst : slbcsp: Add initial stub dll.
by Alexandre Julliard Feb. 18, 2008

Feb. 18, 2008

Module: wine Branch: master Commit: b3a9699ab3e3f60d135b2b80f73fb8ba2540ec6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3a9699ab3e3f60d135b2b80f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Feb 17 18:20:32 2008 -0800 slbcsp: Add initial stub dll. --- Makefile.in | 2 ++ configure | 3 +++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/slbcsp/Makefile.in | 13 +++++++++++++ dlls/slbcsp/main.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/slbcsp/slbcsp.spec | 27 +++++++++++++++++++++++++++ 7 files changed, 93 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index 9c3a005..0e91431 100644 --- a/Makefile.in +++ b/Makefile.in @@ -406,6 +406,7 @@ ALL_MAKEFILES = \ dlls/shfolder/Makefile \ dlls/shlwapi/Makefile \ dlls/shlwapi/tests/Makefile \ + dlls/slbcsp/Makefile \ dlls/snmpapi/Makefile \ dlls/snmpapi/tests/Makefile \ dlls/spoolss/Makefile \ @@ -802,6 +803,7 @@ dlls/shell32/tests/Makefile: dlls/shell32/tests/Makefile.in dlls/Maketest.rules dlls/shfolder/Makefile: dlls/shfolder/Makefile.in dlls/Makedll.rules dlls/shlwapi/Makefile: dlls/shlwapi/Makefile.in dlls/Makedll.rules dlls/shlwapi/tests/Makefile: dlls/shlwapi/tests/Makefile.in dlls/Maketest.rules +dlls/slbcsp/Makefile: dlls/slbcsp/Makefile.in dlls/Makedll.rules dlls/snmpapi/Makefile: dlls/snmpapi/Makefile.in dlls/Makedll.rules dlls/snmpapi/tests/Makefile: dlls/snmpapi/tests/Makefile.in dlls/Maketest.rules dlls/spoolss/Makefile: dlls/spoolss/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 3a38161..4787bb9 100755 --- a/configure +++ b/configure @@ -21663,6 +21663,8 @@ ac_config_files="$ac_config_files dlls/shlwapi/Makefile" ac_config_files="$ac_config_files dlls/shlwapi/tests/Makefile" +ac_config_files="$ac_config_files dlls/slbcsp/Makefile" + ac_config_files="$ac_config_files dlls/snmpapi/Makefile" ac_config_files="$ac_config_files dlls/snmpapi/tests/Makefile" @@ -22743,6 +22745,7 @@ do "dlls/shfolder/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/shfolder/Makefile" ;; "dlls/shlwapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/shlwapi/Makefile" ;; "dlls/shlwapi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/shlwapi/tests/Makefile" ;; + "dlls/slbcsp/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/slbcsp/Makefile" ;; "dlls/snmpapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/snmpapi/Makefile" ;; "dlls/snmpapi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/snmpapi/tests/Makefile" ;; "dlls/spoolss/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/spoolss/Makefile" ;; diff --git a/configure.ac b/configure.ac index da0df30..c7aea29 100644 --- a/configure.ac +++ b/configure.ac @@ -1905,6 +1905,7 @@ AC_CONFIG_FILES([dlls/shell32/tests/Makefile]) AC_CONFIG_FILES([dlls/shfolder/Makefile]) AC_CONFIG_FILES([dlls/shlwapi/Makefile]) AC_CONFIG_FILES([dlls/shlwapi/tests/Makefile]) +AC_CONFIG_FILES([dlls/slbcsp/Makefile]) AC_CONFIG_FILES([dlls/snmpapi/Makefile]) AC_CONFIG_FILES([dlls/snmpapi/tests/Makefile]) AC_CONFIG_FILES([dlls/spoolss/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 1378ffb..d4fd827 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -197,6 +197,7 @@ BASEDIRS = \ shell32 \ shfolder \ shlwapi \ + slbcsp \ snmpapi \ spoolss \ stdole2.tlb \ diff --git a/dlls/slbcsp/Makefile.in b/dlls/slbcsp/Makefile.in new file mode 100644 index 0000000..f42320b --- /dev/null +++ b/dlls/slbcsp/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = slbcsp.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/slbcsp/main.c b/dlls/slbcsp/main.c new file mode 100644 index 0000000..594f811 --- /dev/null +++ b/dlls/slbcsp/main.c @@ -0,0 +1,46 @@ +/* + * 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(slbcsp); + +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/slbcsp/slbcsp.spec b/dlls/slbcsp/slbcsp.spec new file mode 100644 index 0000000..d3462fa --- /dev/null +++ b/dlls/slbcsp/slbcsp.spec @@ -0,0 +1,27 @@ +@ stub CPAcquireContext +@ stub CPSetHashParam +@ stub CPSetKeyParam +@ stub CPSetProvParam +@ stub CPCreateHash +@ stub CPDecrypt +@ stub CPDeriveKey +@ stub CPDestroyHash +@ stub CPDestroyKey +@ stub CPDuplicateHash +@ stub CPDuplicateKey +@ stub CPEncrypt +@ stub CPExportKey +@ stub CPGenKey +@ stub CPGenRandom +@ stub CPGetHashParam +@ stub CPGetKeyParam +@ stub CPGetProvParam +@ stub CPGetUserKey +@ stub CPHashData +@ stub CPHashSessionKey +@ stub CPImportKey +@ stub CPReleaseContext +@ stub CPSignHash +@ stub CPVerifySignature +@ stub DllRegisterServer +@ stub DllUnregisterServer

1 0

Maarten Lankhorst : mssip32: Add initial stub dll.
by Alexandre Julliard Feb. 18, 2008

Feb. 18, 2008

Module: wine Branch: master Commit: c438d23902824e077a5c26f3c76971a060edec5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c438d23902824e077a5c26f3c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Feb 17 18:20:32 2008 -0800 mssip32: Add initial stub dll. --- Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/mssip32/Makefile.in | 13 ++++++++++++ dlls/mssip32/main.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mssip32/mssip32.spec | 9 ++++++++ 7 files changed, 75 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index 4335947..70427ef 100644 --- a/Makefile.in +++ b/Makefile.in @@ -317,6 +317,7 @@ ALL_MAKEFILES = \ dlls/msisys.ocx/Makefile \ dlls/msnet32/Makefile \ dlls/msrle32/Makefile \ + dlls/mssip32/Makefile \ dlls/msvcirt/Makefile \ dlls/msvcr71/Makefile \ dlls/msvcrt/Makefile \ @@ -711,6 +712,7 @@ dlls/msimtf/Makefile: dlls/msimtf/Makefile.in dlls/Makedll.rules dlls/msisys.ocx/Makefile: dlls/msisys.ocx/Makefile.in dlls/Makedll.rules dlls/msnet32/Makefile: dlls/msnet32/Makefile.in dlls/Makedll.rules dlls/msrle32/Makefile: dlls/msrle32/Makefile.in dlls/Makedll.rules +dlls/mssip32/Makefile: dlls/mssip32/Makefile.in dlls/Makedll.rules dlls/msvcirt/Makefile: dlls/msvcirt/Makefile.in dlls/Makedll.rules dlls/msvcr71/Makefile: dlls/msvcr71/Makefile.in dlls/Makedll.rules dlls/msvcrt/Makefile: dlls/msvcrt/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index d55dac3..494c4da 100755 --- a/configure +++ b/configure @@ -21485,6 +21485,8 @@ ac_config_files="$ac_config_files dlls/msnet32/Makefile" ac_config_files="$ac_config_files dlls/msrle32/Makefile" +ac_config_files="$ac_config_files dlls/mssip32/Makefile" + ac_config_files="$ac_config_files dlls/msvcirt/Makefile" ac_config_files="$ac_config_files dlls/msvcr71/Makefile" @@ -22650,6 +22652,7 @@ do "dlls/msisys.ocx/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msisys.ocx/Makefile" ;; "dlls/msnet32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msnet32/Makefile" ;; "dlls/msrle32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msrle32/Makefile" ;; + "dlls/mssip32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mssip32/Makefile" ;; "dlls/msvcirt/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msvcirt/Makefile" ;; "dlls/msvcr71/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msvcr71/Makefile" ;; "dlls/msvcrt/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msvcrt/Makefile" ;; diff --git a/configure.ac b/configure.ac index dfab0d7..f4404b3 100644 --- a/configure.ac +++ b/configure.ac @@ -1816,6 +1816,7 @@ AC_CONFIG_FILES([dlls/msimtf/Makefile]) AC_CONFIG_FILES([dlls/msisys.ocx/Makefile]) AC_CONFIG_FILES([dlls/msnet32/Makefile]) AC_CONFIG_FILES([dlls/msrle32/Makefile]) +AC_CONFIG_FILES([dlls/mssip32/Makefile]) AC_CONFIG_FILES([dlls/msvcirt/Makefile]) AC_CONFIG_FILES([dlls/msvcr71/Makefile]) AC_CONFIG_FILES([dlls/msvcrt/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 780d912..f241168 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -135,6 +135,7 @@ BASEDIRS = \ msisys.ocx \ msnet32 \ msrle32 \ + mssip32 \ msvcirt \ msvcr71 \ msvcrt \ diff --git a/dlls/mssip32/Makefile.in b/dlls/mssip32/Makefile.in new file mode 100644 index 0000000..2bbb94d --- /dev/null +++ b/dlls/mssip32/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = mssip32.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/mssip32/main.c b/dlls/mssip32/main.c new file mode 100644 index 0000000..91ec17f --- /dev/null +++ b/dlls/mssip32/main.c @@ -0,0 +1,46 @@ +/* + * 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(mssip32); + +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/mssip32/mssip32.spec b/dlls/mssip32/mssip32.spec new file mode 100644 index 0000000..0c09bfb --- /dev/null +++ b/dlls/mssip32/mssip32.spec @@ -0,0 +1,9 @@ +@ stub CryptSIPGetInfo +@ stub CryptSIPGetRegWorkingFlags +@ stub CryptSIPCreateIndirectData +@ stub CryptSIPGetSignedDataMsg +@ stub CryptSIPPutSignedDataMsg +@ stub CryptSIPRemoveSignedDataMsg +@ stub CryptSIPVerifyIndirectData +@ stub DllRegisterServer +@ stub DllUnregisterServer

1 0

Maarten Lankhorst : initpki: Add initial stub dll.
by Alexandre Julliard Feb. 18, 2008

Feb. 18, 2008

Module: wine Branch: master Commit: 7c3d24bf5cdec69f5ef7432925d1d8053562e12a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c3d24bf5cdec69f5ef743292… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Feb 17 18:20:32 2008 -0800 initpki: Add initial stub dll. --- Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/initpki/Makefile.in | 13 ++++++++++++ dlls/initpki/initpki.spec | 4 +++ dlls/initpki/main.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 70 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index 9407b13..4335947 100644 --- a/Makefile.in +++ b/Makefile.in @@ -266,6 +266,7 @@ ALL_MAKEFILES = \ dlls/inetcomm/tests/Makefile \ dlls/infosoft/Makefile \ dlls/infosoft/tests/Makefile \ + dlls/initpki/Makefile \ dlls/inkobj/Makefile \ dlls/inseng/Makefile \ dlls/iphlpapi/Makefile \ @@ -659,6 +660,7 @@ dlls/inetcomm/Makefile: dlls/inetcomm/Makefile.in dlls/Makedll.rules dlls/inetcomm/tests/Makefile: dlls/inetcomm/tests/Makefile.in dlls/Maketest.rules dlls/infosoft/Makefile: dlls/infosoft/Makefile.in dlls/Makedll.rules dlls/infosoft/tests/Makefile: dlls/infosoft/tests/Makefile.in dlls/Maketest.rules +dlls/initpki/Makefile: dlls/initpki/Makefile.in dlls/Makedll.rules dlls/inkobj/Makefile: dlls/inkobj/Makefile.in dlls/Makedll.rules dlls/inseng/Makefile: dlls/inseng/Makefile.in dlls/Makedll.rules dlls/iphlpapi/Makefile: dlls/iphlpapi/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 4be76fb..d55dac3 100755 --- a/configure +++ b/configure @@ -21383,6 +21383,8 @@ ac_config_files="$ac_config_files dlls/infosoft/Makefile" ac_config_files="$ac_config_files dlls/infosoft/tests/Makefile" +ac_config_files="$ac_config_files dlls/initpki/Makefile" + ac_config_files="$ac_config_files dlls/inkobj/Makefile" ac_config_files="$ac_config_files dlls/inseng/Makefile" @@ -22597,6 +22599,7 @@ do "dlls/inetcomm/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/inetcomm/tests/Makefile" ;; "dlls/infosoft/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/infosoft/Makefile" ;; "dlls/infosoft/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/infosoft/tests/Makefile" ;; + "dlls/initpki/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/initpki/Makefile" ;; "dlls/inkobj/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/inkobj/Makefile" ;; "dlls/inseng/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/inseng/Makefile" ;; "dlls/iphlpapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/iphlpapi/Makefile" ;; diff --git a/configure.ac b/configure.ac index be7389b..dfab0d7 100644 --- a/configure.ac +++ b/configure.ac @@ -1765,6 +1765,7 @@ AC_CONFIG_FILES([dlls/inetcomm/Makefile]) AC_CONFIG_FILES([dlls/inetcomm/tests/Makefile]) AC_CONFIG_FILES([dlls/infosoft/Makefile]) AC_CONFIG_FILES([dlls/infosoft/tests/Makefile]) +AC_CONFIG_FILES([dlls/initpki/Makefile]) AC_CONFIG_FILES([dlls/inkobj/Makefile]) AC_CONFIG_FILES([dlls/inseng/Makefile]) AC_CONFIG_FILES([dlls/iphlpapi/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 3297a64..780d912 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -96,6 +96,7 @@ BASEDIRS = \ imm32 \ inetcomm \ infosoft \ + initpki \ inkobj \ inseng \ iphlpapi \ diff --git a/dlls/initpki/Makefile.in b/dlls/initpki/Makefile.in new file mode 100644 index 0000000..ece8248 --- /dev/null +++ b/dlls/initpki/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = initpki.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/initpki/initpki.spec b/dlls/initpki/initpki.spec new file mode 100644 index 0000000..51d80bc --- /dev/null +++ b/dlls/initpki/initpki.spec @@ -0,0 +1,4 @@ +@ stub DllInstall +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stub InitializePKI diff --git a/dlls/initpki/main.c b/dlls/initpki/main.c new file mode 100644 index 0000000..d936dd8 --- /dev/null +++ b/dlls/initpki/main.c @@ -0,0 +1,46 @@ +/* + * 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(initpki); + +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

Maarten Lankhorst : gpkcsp: Add initial stub dll.
by Alexandre Julliard Feb. 18, 2008

Feb. 18, 2008

Module: wine Branch: master Commit: e4576c807ba771c2d5cb63edec58eb6330ebb51c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4576c807ba771c2d5cb63ede… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Feb 17 18:20:32 2008 -0800 gpkcsp: Add initial stub dll. --- Makefile.in | 2 ++ configure | 3 +++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/gpkcsp/Makefile.in | 13 +++++++++++++ dlls/gpkcsp/gpkcsp.spec | 26 ++++++++++++++++++++++++++ dlls/gpkcsp/main.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 92 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index c7a5306..9407b13 100644 --- a/Makefile.in +++ b/Makefile.in @@ -248,6 +248,7 @@ ALL_MAKEFILES = \ dlls/gdiplus/tests/Makefile \ dlls/glu32/Makefile \ dlls/gphoto2.ds/Makefile \ + dlls/gpkcsp/Makefile \ dlls/hal/Makefile \ dlls/hhctrl.ocx/Makefile \ dlls/hid/Makefile \ @@ -640,6 +641,7 @@ dlls/gdiplus/Makefile: dlls/gdiplus/Makefile.in dlls/Makedll.rules dlls/gdiplus/tests/Makefile: dlls/gdiplus/tests/Makefile.in dlls/Maketest.rules dlls/glu32/Makefile: dlls/glu32/Makefile.in dlls/Makedll.rules dlls/gphoto2.ds/Makefile: dlls/gphoto2.ds/Makefile.in dlls/Makedll.rules +dlls/gpkcsp/Makefile: dlls/gpkcsp/Makefile.in dlls/Makedll.rules dlls/hal/Makefile: dlls/hal/Makefile.in dlls/Makedll.rules dlls/hhctrl.ocx/Makefile: dlls/hhctrl.ocx/Makefile.in dlls/Makedll.rules dlls/hid/Makefile: dlls/hid/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 758a851..4be76fb 100755 --- a/configure +++ b/configure @@ -21347,6 +21347,8 @@ ac_config_files="$ac_config_files dlls/glu32/Makefile" ac_config_files="$ac_config_files dlls/gphoto2.ds/Makefile" +ac_config_files="$ac_config_files dlls/gpkcsp/Makefile" + ac_config_files="$ac_config_files dlls/hal/Makefile" ac_config_files="$ac_config_files dlls/hhctrl.ocx/Makefile" @@ -22577,6 +22579,7 @@ do "dlls/gdiplus/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdiplus/tests/Makefile" ;; "dlls/glu32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/glu32/Makefile" ;; "dlls/gphoto2.ds/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gphoto2.ds/Makefile" ;; + "dlls/gpkcsp/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gpkcsp/Makefile" ;; "dlls/hal/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/hal/Makefile" ;; "dlls/hhctrl.ocx/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/hhctrl.ocx/Makefile" ;; "dlls/hid/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/hid/Makefile" ;; diff --git a/configure.ac b/configure.ac index bb8aac4..be7389b 100644 --- a/configure.ac +++ b/configure.ac @@ -1747,6 +1747,7 @@ AC_CONFIG_FILES([dlls/gdiplus/Makefile]) AC_CONFIG_FILES([dlls/gdiplus/tests/Makefile]) AC_CONFIG_FILES([dlls/glu32/Makefile]) AC_CONFIG_FILES([dlls/gphoto2.ds/Makefile]) +AC_CONFIG_FILES([dlls/gpkcsp/Makefile]) AC_CONFIG_FILES([dlls/hal/Makefile]) AC_CONFIG_FILES([dlls/hhctrl.ocx/Makefile]) AC_CONFIG_FILES([dlls/hid/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 6577b2a..3297a64 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -82,6 +82,7 @@ BASEDIRS = \ gdi32 \ gdiplus \ gphoto2.ds \ + gpkcsp \ hal \ hhctrl.ocx \ hid \ diff --git a/dlls/gpkcsp/Makefile.in b/dlls/gpkcsp/Makefile.in new file mode 100644 index 0000000..39d6a95 --- /dev/null +++ b/dlls/gpkcsp/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = gpkcsp.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/gpkcsp/gpkcsp.spec b/dlls/gpkcsp/gpkcsp.spec new file mode 100644 index 0000000..1f828b0 --- /dev/null +++ b/dlls/gpkcsp/gpkcsp.spec @@ -0,0 +1,26 @@ +@ stub CPAcquireContext +@ stub CPCreateHash +@ stub CPDecrypt +@ stub CPDeriveKey +@ stub CPDestroyHash +@ stub CPDestroyKey +@ stub CPEncrypt +@ stub CPExportKey +@ stub CPGenKey +@ stub CPGenRandom +@ stub CPGetHashParam +@ stub CPGetKeyParam +@ stub CPGetProvParam +@ stub CPGetUserKey +@ stub CPHashData +@ stub CPHashSessionKey +@ stub CPImportKey +@ stub CPReleaseContext +@ stub CPSetHashParam +@ stub CPSetKeyParam +@ stub CPSetProvParam +@ stub CPSignHash +@ stub CPVerifySignature +@ stdcall DllMain(ptr long ptr) +@ stub DllRegisterServer +@ stub DllUnregisterServer diff --git a/dlls/gpkcsp/main.c b/dlls/gpkcsp/main.c new file mode 100644 index 0000000..b6d9f17 --- /dev/null +++ b/dlls/gpkcsp/main.c @@ -0,0 +1,46 @@ +/* + * 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(gpkcsp); + +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