November 2014 - Wine-commits

Henri Verbeet : d2d1: Implement d2d_solid_color_brush_GetOpacity().
by Alexandre Julliard 17 Nov '14

17 Nov '14

Module: wine Branch: master Commit: 5cc7996b1f207c41d940e4a926e098dfc7ee89a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cc7996b1f207c41d940e4a92… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 17 11:29:22 2014 +0100 d2d1: Implement d2d_solid_color_brush_GetOpacity(). --- dlls/d2d1/brush.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 8837cee..6366086 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -226,9 +226,11 @@ static void STDMETHODCALLTYPE d2d_solid_color_brush_SetTransform(ID2D1SolidColor static float STDMETHODCALLTYPE d2d_solid_color_brush_GetOpacity(ID2D1SolidColorBrush *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_brush *brush = impl_from_ID2D1SolidColorBrush(iface); - return 0.0f; + TRACE("iface %p.\n", iface); + + return brush->opacity; } static void STDMETHODCALLTYPE d2d_solid_color_brush_GetTransform(ID2D1SolidColorBrush *iface,

1 0

Henri Verbeet : wined3d: Explicitly convert the condition to bool shader_glsl_if().
by Alexandre Julliard 17 Nov '14

17 Nov '14

Module: wine Branch: master Commit: 8681999eee64221f230d34e74608382886de0980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8681999eee64221f230d34e74… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 17 11:29:23 2014 +0100 wined3d: Explicitly convert the condition to bool shader_glsl_if(). In SM4 shaders the condition is likely to be an integer instead of a bool uniform like in SM3. --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7379ba2..9a0a43b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3360,7 +3360,7 @@ static void shader_glsl_if(const struct wined3d_shader_instruction *ins) struct glsl_src_param src0_param; shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src0_param); - shader_addline(ins->ctx->buffer, "if (%s) {\n", src0_param.param_str); + shader_addline(ins->ctx->buffer, "if (bool(%s)) {\n", src0_param.param_str); } static void shader_glsl_ifc(const struct wined3d_shader_instruction *ins)

1 0

Henri Verbeet : wined3d: Recognize the SM4 uge opcode.
by Alexandre Julliard 17 Nov '14

17 Nov '14

Module: wine Branch: master Commit: 8c18ebf66a75d77d884499f2e31809f930803fba URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c18ebf66a75d77d884499f2e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 17 11:29:24 2014 +0100 wined3d: Recognize the SM4 uge opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 3 +++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 8 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a7bc23d..f5e614e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5279,6 +5279,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_TEXREG2GB */ pshader_hw_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ pshader_hw_texreg2rgb, /* WINED3DSIH_UDIV */ NULL, + /* WINED3DSIH_UGE */ NULL, /* WINED3DSIH_USHR */ NULL, /* WINED3DSIH_UTOF */ NULL, /* WINED3DSIH_XOR */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9a0a43b..98239ef 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2348,6 +2348,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_EQ: op = "equal"; break; case WINED3DSIH_GE: op = "greaterThanEqual"; break; case WINED3DSIH_IGE: op = "greaterThanEqual"; break; + case WINED3DSIH_UGE: op = "greaterThanEqual"; break; case WINED3DSIH_LT: op = "lessThan"; break; default: op = "<unhandled operator>"; @@ -2365,6 +2366,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_EQ: op = "=="; break; case WINED3DSIH_GE: op = ">="; break; case WINED3DSIH_IGE: op = ">="; break; + case WINED3DSIH_UGE: op = ">="; break; case WINED3DSIH_LT: op = "<"; break; default: op = "<unhandled operator>"; @@ -6764,6 +6766,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_TEXREG2GB */ shader_glsl_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ shader_glsl_texreg2rgb, /* WINED3DSIH_UDIV */ shader_glsl_udiv, + /* WINED3DSIH_UGE */ shader_glsl_relop, /* WINED3DSIH_USHR */ shader_glsl_binop, /* WINED3DSIH_UTOF */ shader_glsl_to_float, /* WINED3DSIH_XOR */ shader_glsl_binop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 7a98dd8..f32d248 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -150,6 +150,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_TEXREG2GB */ "texreg2gb", /* WINED3DSIH_TEXREG2RGB */ "texreg2rgb", /* WINED3DSIH_UDIV */ "udiv", + /* WINED3DSIH_UGE */ "uge", /* WINED3DSIH_USHR */ "ushr", /* WINED3DSIH_UTOF */ "utof", /* WINED3DSIH_XOR */ "xor", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index cba55ad..ac0fab5 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -117,6 +117,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_SQRT = 0x4b, WINED3D_SM4_OP_SINCOS = 0x4d, WINED3D_SM4_OP_UDIV = 0x4e, + WINED3D_SM4_OP_UGE = 0x50, WINED3D_SM4_OP_USHR = 0x55, WINED3D_SM4_OP_UTOF = 0x56, WINED3D_SM4_OP_XOR = 0x57, @@ -259,6 +260,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_SQRT, WINED3DSIH_SQRT, "F", "F"}, {WINED3D_SM4_OP_SINCOS, WINED3DSIH_SINCOS, "FF", "F"}, {WINED3D_SM4_OP_UDIV, WINED3DSIH_UDIV, "UU", "UU"}, + {WINED3D_SM4_OP_UGE, WINED3DSIH_UGE, "U", "UU"}, {WINED3D_SM4_OP_USHR, WINED3DSIH_USHR, "U", "UU"}, {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, "F", "U"}, {WINED3D_SM4_OP_XOR, WINED3DSIH_XOR, "U", "UU"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cba20f4..b7803c9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -547,6 +547,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_TEXREG2GB, WINED3DSIH_TEXREG2RGB, WINED3DSIH_UDIV, + WINED3DSIH_UGE, WINED3DSIH_USHR, WINED3DSIH_UTOF, WINED3DSIH_XOR,

1 0

Henri Verbeet : d3d10core/tests: Port alpha_test() to d3d10core.
by Alexandre Julliard 17 Nov '14

17 Nov '14

Module: wine Branch: master Commit: 1c116c35279dac5396734757b7ee434a0629201e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c116c35279dac5396734757b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 17 11:29:25 2014 +0100 d3d10core/tests: Port alpha_test() to d3d10core. --- dlls/d3d10core/tests/device.c | 253 ++++++++++++++++++++++++++++++++++++++++++ dlls/d3d8/tests/visual.c | 4 +- dlls/d3d9/tests/visual.c | 4 +- dlls/ddraw/tests/visual.c | 4 +- 4 files changed, 259 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c116c35279dac5396734…

1 0

Sebastian Lackner : server: Close fd if there is no space in thread inflight fd list.
by Alexandre Julliard 17 Nov '14

17 Nov '14

Module: wine Branch: master Commit: 749e2aa36fb8fb5c252905f58680b3f854d8be46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=749e2aa36fb8fb5c252905f58… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Nov 15 01:04:29 2014 +0100 server: Close fd if there is no space in thread inflight fd list. --- server/thread.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/thread.c b/server/thread.c index 50d6940..97860ee 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1047,6 +1047,8 @@ int thread_add_inflight_fd( struct thread *thread, int client, int server ) thread->inflight[i].server = server; return i; } + + close( server ); return -1; }

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 17 Nov '14

17 Nov '14

Module: wine Branch: master Commit: 9006a013b0f0346c892dca62009a755dac985668 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9006a013b0f0346c892dca620… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Nov 15 13:41:47 2014 +0100 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index ab03f39..f9b94a4 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2497,7 +2497,7 @@ static HRESULT CALLBACK test_coop_level_mode_set_enum_cb(DDSURFACEDESC2 *surface { struct test_coop_level_mode_set_enum_param *param = context; - if (U1(U4(surface_desc)->ddpfPixelFormat).dwRGBBitCount != registry_mode.dmBitsPerPel) + if (U1(U4(*surface_desc).ddpfPixelFormat).dwRGBBitCount != registry_mode.dmBitsPerPel) return DDENUMRET_OK; if (surface_desc->dwWidth == registry_mode.dmPelsWidth && surface_desc->dwHeight == registry_mode.dmPelsHeight) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index f505c65..9da588a 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2174,7 +2174,7 @@ static HRESULT CALLBACK test_coop_level_mode_set_enum_cb(DDSURFACEDESC2 *surface { struct test_coop_level_mode_set_enum_param *param = context; - if (U1(U4(surface_desc)->ddpfPixelFormat).dwRGBBitCount != registry_mode.dmBitsPerPel) + if (U1(U4(*surface_desc).ddpfPixelFormat).dwRGBBitCount != registry_mode.dmBitsPerPel) return DDENUMRET_OK; if (surface_desc->dwWidth == registry_mode.dmPelsWidth && surface_desc->dwHeight == registry_mode.dmPelsHeight)

1 0

Guillaume Charifi : riched20: Do not destroy IRichEditOle if still referenced.
by Alexandre Julliard 17 Nov '14

17 Nov '14

Module: wine Branch: master Commit: 27ac8d265ed12c4c6da36565316ee13bf9bf9b06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27ac8d265ed12c4c6da365653… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Sun Nov 16 22:02:24 2014 +0100 riched20: Do not destroy IRichEditOle if still referenced. --- dlls/riched20/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 8fdaa53..ca316d2 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2889,7 +2889,7 @@ void ME_DestroyEditor(ME_TextEditor *editor) ITextHost_Release(editor->texthost); if (editor->reOle) { - DestroyIRichEditOle(editor->reOle); + IRichEditOle_Release(editor->reOle); editor->reOle = NULL; } OleUninitialize();

1 0

Sebastian Lackner : comctl32: Fix invalid usage of CompareString in StrStr functions.
by Alexandre Julliard 17 Nov '14

17 Nov '14

Module: wine Branch: master Commit: 766f587f90f1192cd82ba92a90aed73c0a225988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=766f587f90f1192cd82ba92a9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Nov 17 09:10:39 2014 +0100 comctl32: Fix invalid usage of CompareString in StrStr functions. --- dlls/comctl32/string.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/string.c b/dlls/comctl32/string.c index 4c52f18..8d41508 100644 --- a/dlls/comctl32/string.c +++ b/dlls/comctl32/string.c @@ -291,7 +291,7 @@ LPSTR WINAPI StrChrA(LPCSTR lpszStr, WORD ch) * PARAMS * lpszStr [I] First string to compare * lpszComp [I] Second string to compare - * iLen [I] Maximum number of chars to compare. + * iLen [I] Number of chars to compare * * RETURNS * An integer less than, equal to or greater than 0, indicating that @@ -323,13 +323,15 @@ static LPSTR COMCTL32_StrStrHelperA(LPCSTR lpszStr, LPCSTR lpszSearch, INT (WINAPI *pStrCmpFn)(LPCSTR,LPCSTR,INT)) { size_t iLen; + LPCSTR end; if (!lpszStr || !lpszSearch || !*lpszSearch) return NULL; iLen = strlen(lpszSearch); + end = lpszStr + strlen(lpszStr); - while (*lpszStr) + while (lpszStr + iLen <= end) { if (!pStrCmpFn(lpszStr, lpszSearch, iLen)) return (LPSTR)lpszStr; @@ -382,6 +384,7 @@ INT WINAPI StrToIntA (LPCSTR lpszStr) LPWSTR WINAPI StrStrIW(LPCWSTR lpszStr, LPCWSTR lpszSearch) { int iLen; + LPCWSTR end; TRACE("(%s,%s)\n", debugstr_w(lpszStr), debugstr_w(lpszSearch)); @@ -389,8 +392,9 @@ LPWSTR WINAPI StrStrIW(LPCWSTR lpszStr, LPCWSTR lpszSearch) return NULL; iLen = strlenW(lpszSearch); + end = lpszStr + strlenW(lpszStr); - while (*lpszStr) + while (lpszStr + iLen <= end) { if (!StrCmpNIW(lpszStr, lpszSearch, iLen)) return (LPWSTR)lpszStr; @@ -480,7 +484,7 @@ LPWSTR WINAPI StrChrW(LPCWSTR lpszStr, WCHAR ch) * PARAMS * lpszStr [I] First string to compare * lpszComp [I] Second string to compare - * iLen [I] Maximum number of chars to compare. + * iLen [I] Number of chars to compare * * RETURNS * An integer less than, equal to or greater than 0, indicating that

1 0

Sebastian Lackner : shlwapi: Fix invalid usage of CompareString in StrStr functions.
by Alexandre Julliard 17 Nov '14

17 Nov '14

Module: wine Branch: master Commit: 5aec09e4d1c92e099edff03ac786895b3896e233 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aec09e4d1c92e099edff03ac… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Nov 17 09:11:08 2014 +0100 shlwapi: Fix invalid usage of CompareString in StrStr functions. --- dlls/shlwapi/string.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index b4b5b8a..eaaaf3b 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -364,7 +364,7 @@ int WINAPI StrCmpIW(LPCWSTR lpszStr, LPCWSTR lpszComp) * PARAMS * lpszStr [I] First string to compare * lpszComp [I] Second string to compare - * iLen [I] Maximum number of chars to compare. + * iLen [I] Number of chars to compare * * RETURNS * An integer less than, equal to or greater than 0, indicating that @@ -395,7 +395,7 @@ INT WINAPI StrCmpNW(LPCWSTR lpszStr, LPCWSTR lpszComp, INT iLen) * PARAMS * lpszStr [I] First string to compare * lpszComp [I] Second string to compare - * iLen [I] Maximum number of chars to compare. + * iLen [I] Number of chars to compare * * RETURNS * An integer less than, equal to or greater than 0, indicating that @@ -521,13 +521,15 @@ static LPSTR SHLWAPI_StrStrHelperA(LPCSTR lpszStr, LPCSTR lpszSearch, INT (WINAPI *pStrCmpFn)(LPCSTR,LPCSTR,INT)) { size_t iLen; + LPCSTR end; if (!lpszStr || !lpszSearch || !*lpszSearch) return NULL; iLen = strlen(lpszSearch); + end = lpszStr + strlen(lpszStr); - while (*lpszStr) + while (lpszStr + iLen <= end) { if (!pStrCmpFn(lpszStr, lpszSearch, iLen)) return (LPSTR)lpszStr; @@ -670,6 +672,7 @@ LPSTR WINAPI StrStrIA(LPCSTR lpszStr, LPCSTR lpszSearch) LPWSTR WINAPI StrStrIW(LPCWSTR lpszStr, LPCWSTR lpszSearch) { int iLen; + LPCWSTR end; TRACE("(%s,%s)\n", debugstr_w(lpszStr), debugstr_w(lpszSearch)); @@ -677,8 +680,9 @@ LPWSTR WINAPI StrStrIW(LPCWSTR lpszStr, LPCWSTR lpszSearch) return NULL; iLen = strlenW(lpszSearch); + end = lpszStr + strlenW(lpszStr); - while (*lpszStr) + while (lpszStr + iLen <= end) { if (!StrCmpNIW(lpszStr, lpszSearch, iLen)) return (LPWSTR)lpszStr;

1 0

Austin English : cryptext.dll: Add a stub dll.
by Alexandre Julliard 17 Nov '14

17 Nov '14

Module: wine Branch: master Commit: a4f941286893e5cf86c6d691a81a564afbe33707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4f941286893e5cf86c6d691a… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Nov 16 21:31:52 2014 -0800 cryptext.dll: Add a stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/cryptext/Makefile.in | 4 ++++ dlls/cryptext/cryptext.spec | 30 +++++++++++++++++++++++++++++ dlls/cryptext/cryptext_main.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 82 insertions(+) diff --git a/configure b/configure index de03151..d09438e 100755 --- a/configure +++ b/configure @@ -932,6 +932,7 @@ enable_crtdll enable_crypt32 enable_cryptdlg enable_cryptdll +enable_cryptext enable_cryptnet enable_cryptui enable_ctapi32 @@ -16861,6 +16862,7 @@ wine_fn_config_dll crypt32 enable_crypt32 implib,po wine_fn_config_test dlls/crypt32/tests crypt32_test wine_fn_config_dll cryptdlg enable_cryptdlg po wine_fn_config_dll cryptdll enable_cryptdll implib +wine_fn_config_dll cryptext enable_cryptext wine_fn_config_dll cryptnet enable_cryptnet implib wine_fn_config_test dlls/cryptnet/tests cryptnet_test wine_fn_config_dll cryptui enable_cryptui implib,po diff --git a/configure.ac b/configure.ac index 4ee8133..04bcbd8 100644 --- a/configure.ac +++ b/configure.ac @@ -2741,6 +2741,7 @@ WINE_CONFIG_DLL(crypt32,,[implib,po]) WINE_CONFIG_TEST(dlls/crypt32/tests) WINE_CONFIG_DLL(cryptdlg,,[po]) WINE_CONFIG_DLL(cryptdll,,[implib]) +WINE_CONFIG_DLL(cryptext) WINE_CONFIG_DLL(cryptnet,,[implib]) WINE_CONFIG_TEST(dlls/cryptnet/tests) WINE_CONFIG_DLL(cryptui,,[implib,po]) diff --git a/dlls/cryptext/Makefile.in b/dlls/cryptext/Makefile.in new file mode 100644 index 0000000..e1a46ba --- /dev/null +++ b/dlls/cryptext/Makefile.in @@ -0,0 +1,4 @@ +MODULE = cryptext.dll + +C_SRCS = \ + cryptext_main.c diff --git a/dlls/cryptext/cryptext.spec b/dlls/cryptext/cryptext.spec new file mode 100644 index 0000000..b0e920e --- /dev/null +++ b/dlls/cryptext/cryptext.spec @@ -0,0 +1,30 @@ +@ stub CryptExtAddCER +@ stub CryptExtAddCERW +@ stub CryptExtAddCRL +@ stub CryptExtAddCRLW +@ stub CryptExtAddCTL +@ stub CryptExtAddCTLW +@ stub CryptExtAddP7R +@ stub CryptExtAddP7RW +@ stub CryptExtAddPFX +@ stub CryptExtAddPFXW +@ stub CryptExtAddSPC +@ stub CryptExtAddSPCW +@ stub CryptExtOpenCAT +@ stub CryptExtOpenCATW +@ stub CryptExtOpenCER +@ stub CryptExtOpenCERW +@ stub CryptExtOpenCRL +@ stub CryptExtOpenCRLW +@ stub CryptExtOpenCTL +@ stub CryptExtOpenCTLW +@ stub CryptExtOpenP7R +@ stub CryptExtOpenP7RW +@ stub CryptExtOpenPKCS7 +@ stub CryptExtOpenPKCS7W +@ stub CryptExtOpenSTR +@ stub CryptExtOpenSTRW +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer diff --git a/dlls/cryptext/cryptext_main.c b/dlls/cryptext/cryptext_main.c new file mode 100644 index 0000000..75ede4e --- /dev/null +++ b/dlls/cryptext/cryptext_main.c @@ -0,0 +1,45 @@ +/* + * Crypto Shell Extensions + * + * Copyright 2014 Austin English + * + * 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(cryptext); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +}

1 0