August 2010 - Wine-Commits - list.winehq.org

Uwe Bonnes : wininet: Add const qualifier after openssl version check.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: 53391a344546b3e71a302ae2985b03f73756ad4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=53391a344546b3e71a302ae29… Author: Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> Date: Mon Jul 26 18:41:00 2010 +0200 wininet: Add const qualifier after openssl version check. --- dlls/winhttp/net.c | 5 +++++ dlls/wininet/netconnection.c | 5 +++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index e60bd16..573f108 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -38,6 +38,7 @@ #endif #ifdef HAVE_OPENSSL_SSL_H # include <openssl/ssl.h> +# include <openssl/opensslv.h> #undef FAR #undef DSA #endif @@ -91,7 +92,11 @@ static CRITICAL_SECTION init_ssl_cs = { &init_ssl_cs_debug, -1, 0, 0, 0, 0 }; static void *libssl_handle; static void *libcrypto_handle; +#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER> 0x1000000) +static const SSL_METHOD *method; +#else static SSL_METHOD *method; +#endif static SSL_CTX *ctx; static int hostname_idx; static int error_idx; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index abd7415..54ca51b 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -60,6 +60,7 @@ #endif #ifdef HAVE_OPENSSL_SSL_H # include <openssl/ssl.h> +# include <openssl/opensslv.h> #undef FAR #undef DSA #endif @@ -113,7 +114,11 @@ static CRITICAL_SECTION init_ssl_cs = { &init_ssl_cs_debug, -1, 0, 0, 0, 0 }; static void *OpenSSL_ssl_handle; static void *OpenSSL_crypto_handle; +#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER> 0x1000000) +static const SSL_METHOD *meth; +#else static SSL_METHOD *meth; +#endif static SSL_CTX *ctx; static int hostname_idx; static int error_idx;

1 0

David Hedberg : explorerframe: Add classfactory implementation.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: 46a3e7c24daf26bce6a4e98cb8114bd47b7f1283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46a3e7c24daf26bce6a4e98cb… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sat Jul 31 20:02:48 2010 +0200 explorerframe: Add classfactory implementation. --- dlls/explorerframe/explorerframe.spec | 2 +- dlls/explorerframe/explorerframe_main.c | 109 +++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 1 deletions(-) diff --git a/dlls/explorerframe/explorerframe.spec b/dlls/explorerframe/explorerframe.spec index 58777b0..9ef2684 100644 --- a/dlls/explorerframe/explorerframe.spec +++ b/dlls/explorerframe/explorerframe.spec @@ -3,5 +3,5 @@ # 134 stub EXPLORERFRAME_134 @ stdcall -private DllCanUnloadNow() -@ stub DllGetClassObject +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllGetVersion(ptr) diff --git a/dlls/explorerframe/explorerframe_main.c b/dlls/explorerframe/explorerframe_main.c index 51f7d39..fd958ef 100644 --- a/dlls/explorerframe/explorerframe_main.c +++ b/dlls/explorerframe/explorerframe_main.c @@ -94,3 +94,112 @@ HRESULT WINAPI DllGetVersion(DLLVERSIONINFO *info) WARN("wrong DLLVERSIONINFO size from app.\n"); return E_INVALIDARG; } + +/************************************************************************* + * Implement the ExplorerFrame class factory + * + * (Taken from shdocvw/factory.c; based on implementation in + * ddraw/main.c) + */ + +#define FACTORY(x) ((IClassFactory*) &(x)->lpClassFactoryVtbl) + +typedef struct +{ + const IClassFactoryVtbl *lpClassFactoryVtbl; + HRESULT (*cf)(IUnknown*, REFIID, void**); + LONG ref; +} IClassFactoryImpl; + +/************************************************************************* + * EFCF_QueryInterface (IUnknown) + */ +static HRESULT WINAPI EFCF_QueryInterface(IClassFactory* iface, + REFIID riid, void **ppobj) +{ + TRACE("%p (%s %p)\n", iface, debugstr_guid(riid), ppobj); + + if(!ppobj) + return E_POINTER; + + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IClassFactory, riid)) + { + *ppobj = iface; + IClassFactory_AddRef(iface); + return S_OK; + } + + WARN("Interface not supported.\n"); + + *ppobj = NULL; + return E_NOINTERFACE; +} + +/************************************************************************* + * EFCF_AddRef (IUnknown) + */ +static ULONG WINAPI EFCF_AddRef(IClassFactory *iface) +{ + EFRAME_LockModule(); + + return 2; /* non-heap based object */ +} + +/************************************************************************* + * EFCF_Release (IUnknown) + */ +static ULONG WINAPI EFCF_Release(IClassFactory *iface) +{ + EFRAME_UnlockModule(); + + return 1; /* non-heap based object */ +} + +/************************************************************************* + * EFCF_CreateInstance (IClassFactory) + */ +static HRESULT WINAPI EFCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, + REFIID riid, void **ppobj) +{ + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + return This->cf(pOuter, riid, ppobj); +} + +/************************************************************************* + * EFCF_LockServer (IClassFactory) + */ +static HRESULT WINAPI EFCF_LockServer(IClassFactory *iface, BOOL dolock) +{ + TRACE("%p (%d)\n", iface, dolock); + + if (dolock) + EFRAME_LockModule(); + else + EFRAME_UnlockModule(); + + return S_OK; +} + +static const IClassFactoryVtbl EFCF_Vtbl = +{ + EFCF_QueryInterface, + EFCF_AddRef, + EFCF_Release, + EFCF_CreateInstance, + EFCF_LockServer +}; + +/************************************************************************* + * DllGetClassObject (ExplorerFrame.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) +{ + static IClassFactoryImpl NSTCClassFactory = {&EFCF_Vtbl, NamespaceTreeControl_Constructor}; + + TRACE("%s, %s, %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + if(IsEqualGUID(&CLSID_NamespaceTreeControl, rclsid)) + return IClassFactory_QueryInterface(FACTORY(&NSTCClassFactory), riid, ppv); + + return CLASS_E_CLASSNOTAVAILABLE; +}

1 0

Dmitry Timoshkov : gdi32: Do not crash on an invalid pointer passed to AddFontMemResourceEx.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: 81557b5e21551150296b811f7617bca4a75a0c70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81557b5e21551150296b811f7… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Aug 2 15:35:04 2010 +0900 gdi32: Do not crash on an invalid pointer passed to AddFontMemResourceEx. --- dlls/gdi32/font.c | 21 +++++++++++- dlls/gdi32/freetype.c | 2 +- dlls/gdi32/tests/font.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++ include/wingdi.h | 1 + 4 files changed, 105 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 29281f9..9ebf7b3 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -33,6 +33,7 @@ #include "winnls.h" #include "wownt32.h" #include "gdi_private.h" +#include "wine/exception.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -3184,7 +3185,25 @@ BOOL WINAPI RemoveFontResourceW( LPCWSTR str ) */ HANDLE WINAPI AddFontMemResourceEx( PVOID pbFont, DWORD cbFont, PVOID pdv, DWORD *pcFonts) { - return WineEngAddFontMemResourceEx(pbFont, cbFont, pdv, pcFonts); + HANDLE ret; + DWORD num_fonts; + + ret = WineEngAddFontMemResourceEx(pbFont, cbFont, pdv, &num_fonts); + if (ret) + { + __TRY + { + *pcFonts = num_fonts; + } + __EXCEPT_PAGE_FAULT + { + WARN("page fault while writing to *pcFonts (%p)\n", pcFonts); + RemoveFontMemResourceEx(ret); + ret = 0; + } + __ENDTRY + } + return ret; } /*********************************************************************** diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 532278c..e2db1aa 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2151,7 +2151,7 @@ HANDLE WineEngAddFontMemResourceEx(PVOID pbFont, DWORD cbFont, PVOID pdv, DWORD { TRACE("AddFontToList failed\n"); HeapFree(GetProcessHeap(), 0, pFontCopy); - return NULL; + return 0; } /* FIXME: is the handle only for use in RemoveFontMemResourceEx or should it be a true handle? * For now return something unique but quite random diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index d89132d..bbb54cd 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -44,6 +44,8 @@ DWORD (WINAPI *pGetGlyphIndicesA)(HDC hdc, LPCSTR lpstr, INT count, LPWORD pgi, DWORD (WINAPI *pGetGlyphIndicesW)(HDC hdc, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags); BOOL (WINAPI *pGdiRealizationInfo)(HDC hdc, DWORD *); HFONT (WINAPI *pCreateFontIndirectExA)(const ENUMLOGFONTEXDV *); +HANDLE (WINAPI *pAddFontMemResourceEx)(PVOID, DWORD, PVOID, DWORD *); +BOOL (WINAPI *pRemoveFontMemResourceEx)(HANDLE); static HMODULE hgdi32 = 0; @@ -59,6 +61,8 @@ static void init(void) pGetGlyphIndicesW = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesW"); pGdiRealizationInfo = (void *)GetProcAddress(hgdi32, "GdiRealizationInfo"); pCreateFontIndirectExA = (void *)GetProcAddress(hgdi32, "CreateFontIndirectExA"); + pAddFontMemResourceEx = (void *)GetProcAddress(hgdi32, "AddFontMemResourceEx"); + pRemoveFontMemResourceEx = (void *)GetProcAddress(hgdi32, "RemoveFontMemResourceEx"); } static INT CALLBACK is_truetype_font_installed_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) @@ -3142,6 +3146,84 @@ static void test_CreateFontIndirectEx(void) DeleteObject(hfont); } +static void free_font(void *font) +{ + UnmapViewOfFile(font); +} + +static void *load_font(const char *font_name, DWORD *font_size) +{ + char file_name[MAX_PATH]; + HANDLE file, mapping; + void *font; + + if (!GetWindowsDirectory(file_name, sizeof(file_name))) return NULL; + strcat(file_name, "\\fonts\\"); + strcat(file_name, font_name); + + file = CreateFile(file_name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + if (file == INVALID_HANDLE_VALUE) return NULL; + + *font_size = GetFileSize(file, NULL); + + mapping = CreateFileMapping(file, NULL, PAGE_READONLY, 0, 0, NULL); + if (!mapping) + { + CloseHandle(file); + return NULL; + } + + font = MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0); + + CloseHandle(file); + CloseHandle(mapping); + return font; +} + +static void test_AddFontMemResource(void) +{ + void *font; + DWORD font_size, num_fonts; + HANDLE ret; + + if (!pAddFontMemResourceEx || !pRemoveFontMemResourceEx) + { + win_skip("AddFontMemResourceEx is not available on this platform\n"); + return; + } + + font = load_font("sserife.fon", &font_size); + if (!font) + { + skip("Unable to locate and load font sserife.fon\n"); + return; + } + + num_fonts = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = pAddFontMemResourceEx(font, font_size, NULL, &num_fonts); + ok(ret != 0, "AddFontMemResourceEx error %d\n", GetLastError()); + ok(num_fonts != 0xdeadbeef, "number of loaded fonts should not be 0xdeadbeef\n"); + ok(num_fonts != 0, "number of loaded fonts should not be 0\n"); + + free_font(font); + + SetLastError(0xdeadbeef); + ok(pRemoveFontMemResourceEx(ret), "RemoveFontMemResourceEx error %d\n", GetLastError()); + + /* test invalid pointer to number of loaded fonts */ + font = load_font("sserife.fon", &font_size); + ok(font != NULL, "Unable to locate and load font sserife.fon\n"); + + ret = pAddFontMemResourceEx(font, font_size, NULL, (void *)0xdeadbeef); + ok(!ret, "AddFontMemResourceEx should fail\n"); + + ret = pAddFontMemResourceEx(font, font_size, NULL, NULL); + ok(!ret, "AddFontMemResourceEx should fail\n"); + + free_font(font); +} + START_TEST(font) { init(); @@ -3162,6 +3244,7 @@ START_TEST(font) test_nonexistent_font(); test_orientation(); test_height_selection(); + test_AddFontMemResource(); /* On Windows Arial has a lot of default charset aliases such as Arial Cyr, * I'd like to avoid them in this test. diff --git a/include/wingdi.h b/include/wingdi.h index 3f5058f..fa68c23 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3630,6 +3630,7 @@ WINGDIAPI UINT WINAPI RealizePalette(HDC); WINGDIAPI BOOL WINAPI Rectangle(HDC,INT,INT,INT,INT); WINGDIAPI BOOL WINAPI RectInRegion(HRGN,const RECT *); WINGDIAPI BOOL WINAPI RectVisible(HDC,const RECT*); +WINGDIAPI BOOL WINAPI RemoveFontMemResourceEx(HANDLE); WINGDIAPI BOOL WINAPI RemoveFontResourceA(LPCSTR); WINGDIAPI BOOL WINAPI RemoveFontResourceW(LPCWSTR); #define RemoveFontResource WINELIB_NAME_AW(RemoveFontResource)

1 0

Jacek Caban : jscript: Fixed test crash on some win9x installations.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: 636bc7494f6f9e25d585ee4986c69909e2cff854 URL: http://source.winehq.org/git/wine.git/?a=commit;h=636bc7494f6f9e25d585ee498… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 2 11:09:08 2010 +0200 jscript: Fixed test crash on some win9x installations. --- dlls/jscript/tests/jscript.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 006e055..f7f1e30 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -335,7 +335,10 @@ static HRESULT set_script_prop(IActiveScript *engine, DWORD property, VARIANT *v hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptProperty, (void**)&script_prop); - ok(hres == S_OK, "Could not get IActiveScriptProperty iface: %08x\n", hres); + if(FAILED(hres)) { + win_skip("IActiveScriptProperty not supported\n"); + return E_NOTIMPL; + } hres = IActiveScriptProperty_SetProperty(script_prop, property, NULL, val); IActiveScriptProperty_Release(script_prop);

1 0

Jacek Caban : jscript: Use generic property for Error.number.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: 6263f0079abaff354f6662794e36b569c795f7ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=6263f0079abaff354f6662794… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 2 11:10:03 2010 +0200 jscript: Use generic property for Error.number. --- dlls/jscript/error.c | 48 ++++++++++++-------------------------------- dlls/jscript/tests/api.js | 6 +++++ 2 files changed, 19 insertions(+), 35 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index e3cfce6..2465c77 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -29,7 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); typedef struct { DispatchEx dispex; - VARIANT number; VARIANT description; VARIANT message; } ErrorInstance; @@ -50,24 +49,6 @@ static inline ErrorInstance *error_this(vdisp_t *jsthis) return is_vclass(jsthis, JSCLASS_ERROR) ? error_from_vdisp(jsthis) : NULL; } -static HRESULT Error_number(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, - DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - ErrorInstance *This = error_from_vdisp(jsthis); - - TRACE("\n"); - - switch(flags) { - case DISPATCH_PROPERTYGET: - return VariantCopy(retv, &This->number); - case DISPATCH_PROPERTYPUT: - return VariantCopy(&This->number, get_arg(dp, 0)); - default: - FIXME("unimplemented flags %x\n", flags); - return E_NOTIMPL; - } -} - static HRESULT Error_description(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { @@ -203,7 +184,6 @@ static void Error_destructor(DispatchEx *dispex) { ErrorInstance *This = (ErrorInstance*)dispex; - VariantClear(&This->number); VariantClear(&This->description); VariantClear(&This->message); heap_free(This); @@ -212,7 +192,6 @@ static void Error_destructor(DispatchEx *dispex) static const builtin_prop_t Error_props[] = { {descriptionW, Error_description, 0}, {messageW, Error_message, 0}, - {numberW, Error_number, 0}, {toStringW, Error_toString, PROPF_METHOD} }; @@ -228,7 +207,6 @@ static const builtin_info_t Error_info = { static const builtin_prop_t ErrorInst_props[] = { {descriptionW, Error_description, 0}, {messageW, Error_message, 0}, - {numberW, Error_number, 0}, }; static const builtin_info_t ErrorInst_info = { @@ -265,18 +243,22 @@ static HRESULT alloc_error(script_ctx_t *ctx, DispatchEx *prototype, } static HRESULT create_error(script_ctx_t *ctx, DispatchEx *constr, - const UINT *number, const WCHAR *msg, DispatchEx **ret) + UINT number, const WCHAR *msg, DispatchEx **ret) { ErrorInstance *err; + VARIANT v; HRESULT hres; hres = alloc_error(ctx, NULL, constr, &err); if(FAILED(hres)) return hres; - if(number) { - V_VT(&err->number) = VT_I4; - V_I4(&err->number) = *number; + V_VT(&v) = VT_I4; + V_I4(&v) = number; + hres = jsdisp_propput_name(&err->dispex, numberW, &v, NULL/*FIXME*/, NULL/*FIXME*/); + if(FAILED(hres)) { + jsdisp_release(&err->dispex); + return hres; } V_VT(&err->message) = VT_BSTR; @@ -297,14 +279,13 @@ static HRESULT create_error(script_ctx_t *ctx, DispatchEx *constr, static HRESULT error_constr(script_ctx_t *ctx, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, DispatchEx *constr) { DispatchEx *err; - VARIANT numv; - UINT num; + UINT num = 0; BSTR msg = NULL; HRESULT hres; - V_VT(&numv) = VT_NULL; - if(arg_cnt(dp)) { + VARIANT numv; + hres = to_number(ctx, get_arg(dp, 0), ei, &numv); if(FAILED(hres) || (V_VT(&numv)==VT_R8 && isnan(V_R8(&numv)))) hres = to_string(ctx, get_arg(dp, 0), ei, &msg); @@ -326,10 +307,7 @@ static HRESULT error_constr(script_ctx_t *ctx, WORD flags, DISPPARAMS *dp, switch(flags) { case INVOKE_FUNC: case DISPATCH_CONSTRUCT: - if(V_VT(&numv) == VT_NULL) - hres = create_error(ctx, constr, NULL, msg, &err); - else - hres = create_error(ctx, constr, &num, msg, &err); + hres = create_error(ctx, constr, num, msg, &err); SysFreeString(msg); if(FAILED(hres)) @@ -477,7 +455,7 @@ static HRESULT throw_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCH WARN("%s\n", debugstr_w(buf)); id |= JSCRIPT_ERROR; - hres = create_error(ctx, constr, &id, buf, &err); + hres = create_error(ctx, constr, id, buf, &err); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index e05e5bb..f794244 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1772,10 +1772,16 @@ ok(err.message === "message", "err.message !== 'message'"); ok(err.toString() === (invokeVersion < 2 ? "[object Error]" : "Error: message"), "err.toString() = " + err.toString()); err = new Error(123); ok(err.number === 123, "err.number = " + err.number); +err.number = 254; +ok(err.number === 254, "err.number = " + err.number); err = new Error(0, "message"); ok(err.number === 0, "err.number = " + err.number); ok(err.message === "message", "err.message = " + err.message); ok(err.description === "message", "err.description = " + err.description); +err = new Error(); +ok(err.number === 0, "err.number = " + err.number); + +ok(!("number" in Error), "number is in Error"); tmp = new Object(); tmp.toString = function() { return "test"; };

1 0

Matteo Bruni : d3dcompiler_43: Add dll directory.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: 70962ee4d8a15659ee44c49b8c6316874fb11957 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70962ee4d8a15659ee44c49b8… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Fri Jul 30 16:21:43 2010 +0200 d3dcompiler_43: Add dll directory. --- .gitignore | 1 + configure | 1 + configure.ac | 1 + dlls/d3dcompiler_43/Makefile.in | 13 ++++++++ dlls/d3dcompiler_43/d3dcompiler_43.spec | 17 +++++++++++ dlls/d3dcompiler_43/d3dcompiler_43_main.c | 45 +++++++++++++++++++++++++++++ dlls/d3dcompiler_43/version.rc | 26 ++++++++++++++++ 7 files changed, 104 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 78a693f..4e0346f 100644 --- a/.gitignore +++ b/.gitignore @@ -68,6 +68,7 @@ dlls/kernel32/nls/winerr_ptb.mc.rc dlls/kernel32/nls/winerr_ptg.mc.rc dlls/kernel32/nls/winerr_rus.mc.rc dlls/kernel32/nls/winerr_ukr.mc.rc +dlls/libd3dcompiler.def dlls/libd3dx9.def dlls/libkernel.def dlls/libwinspool.def diff --git a/configure b/configure index 6232cba..a5b8dd0 100755 --- a/configure +++ b/configure @@ -14429,6 +14429,7 @@ wine_fn_config_dll d3d8 enable_d3d8 d3d8 wine_fn_config_test dlls/d3d8/tests d3d8_test wine_fn_config_dll d3d9 enable_d3d9 d3d9 wine_fn_config_test dlls/d3d9/tests d3d9_test +wine_fn_config_dll d3dcompiler_43 enable_d3dcompiler_43 d3dcompiler wine_fn_config_dll d3dim enable_d3dim d3dim wine_fn_config_dll d3drm enable_d3drm d3drm wine_fn_config_test dlls/d3drm/tests d3drm_test diff --git a/configure.ac b/configure.ac index b7ceb8d..bacba41 100644 --- a/configure.ac +++ b/configure.ac @@ -2285,6 +2285,7 @@ WINE_CONFIG_DLL(d3d8,,[d3d8]) WINE_CONFIG_TEST(dlls/d3d8/tests) WINE_CONFIG_DLL(d3d9,,[d3d9]) WINE_CONFIG_TEST(dlls/d3d9/tests) +WINE_CONFIG_DLL(d3dcompiler_43,,[d3dcompiler]) WINE_CONFIG_DLL(d3dim,,[d3dim]) WINE_CONFIG_DLL(d3drm,,[d3drm]) WINE_CONFIG_TEST(dlls/d3drm/tests) diff --git a/dlls/d3dcompiler_43/Makefile.in b/dlls/d3dcompiler_43/Makefile.in new file mode 100644 index 0000000..2510af4 --- /dev/null +++ b/dlls/d3dcompiler_43/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = d3dcompiler_43.dll +IMPORTLIB = d3dcompiler + +C_SRCS = \ + d3dcompiler_43_main.c + +RC_SRCS = version.rc + +(a)MAKE_DLL_RULES@ diff --git a/dlls/d3dcompiler_43/d3dcompiler_43.spec b/dlls/d3dcompiler_43/d3dcompiler_43.spec new file mode 100644 index 0000000..ab6e1d7 --- /dev/null +++ b/dlls/d3dcompiler_43/d3dcompiler_43.spec @@ -0,0 +1,17 @@ +@ stub D3DAssemble +@ stub DebugSetMute +@ stub D3DCompile +@ stub D3DCompressShaders +@ stub D3DCreateBlob +@ stub D3DDecompressShaders +@ stub D3DDisassemble10Effect +@ stub D3DDisassemble +@ stub D3DGetBlobPart +@ stub D3DGetDebugInfo +@ stub D3DGetInputAndOutputSignatureBlob +@ stub D3DGetInputSignatureBlob +@ stub D3DGetOutputSignatureBlob +@ stub D3DPreprocess +@ stub D3DReflect +@ stub D3DReturnFailure1 +@ stub D3DStripShader diff --git a/dlls/d3dcompiler_43/d3dcompiler_43_main.c b/dlls/d3dcompiler_43/d3dcompiler_43_main.c new file mode 100644 index 0000000..cdf69b7 --- /dev/null +++ b/dlls/d3dcompiler_43/d3dcompiler_43_main.c @@ -0,0 +1,45 @@ +/* + * Direct3D shader compiler main file + * + * Copyright 2010 Matteo Bruni for CodeWeavers + * + * 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(d3dcompiler); + +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(inst); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} diff --git a/dlls/d3dcompiler_43/version.rc b/dlls/d3dcompiler_43/version.rc new file mode 100644 index 0000000..5603735 --- /dev/null +++ b/dlls/d3dcompiler_43/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2010 Matteo Bruni for CodeWeavers + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine D3DCompiler" +#define WINE_FILENAME_STR "d3dcompiler_43.dll" +#define WINE_FILEVERSION 9,29,952,3111 +#define WINE_FILEVERSION_STR "9.29.952.3111" +#define WINE_PRODUCTVERSION 9,29,952,3111 +#define WINE_PRODUCTVERSION_STR "9.29.952.3111" + +#include "wine/wine_common_ver.rc"

1 0

Misha Koshelev : d3dx9: Complete test for D3DXCreateSphere.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: cc1738ad3cf20f1744626ae122942c2728b03939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc1738ad3cf20f1744626ae12… Author: Misha Koshelev <misha680(a)gmail.com> Date: Fri Jul 30 13:21:13 2010 -0500 d3dx9: Complete test for D3DXCreateSphere. --- dlls/d3dx9_36/tests/mesh.c | 432 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 428 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc1738ad3cf20f1744626…

1 0

David Hedberg : explorerframe: Add dll stub.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: e2cf9ad33e547c6b8c516cc68b18bc82e303de34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2cf9ad33e547c6b8c516cc68… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sat Jul 31 20:02:45 2010 +0200 explorerframe: Add dll stub. --- configure | 1 + configure.ac | 1 + dlls/explorerframe/Makefile.in | 14 +++++++ dlls/explorerframe/explorerframe.spec | 7 +++ dlls/explorerframe/explorerframe_main.c | 66 +++++++++++++++++++++++++++++++ dlls/explorerframe/explorerframe_main.h | 30 ++++++++++++++ dlls/explorerframe/version.rc | 29 +++++++++++++ 7 files changed, 148 insertions(+), 0 deletions(-) diff --git a/configure b/configure index a5b8dd0..6dd4a36 100755 --- a/configure +++ b/configure @@ -14503,6 +14503,7 @@ wine_fn_config_lib dxerr9 wine_fn_config_dll dxgi enable_dxgi dxgi wine_fn_config_test dlls/dxgi/tests dxgi_test wine_fn_config_lib dxguid +wine_fn_config_dll explorerframe enable_explorerframe wine_fn_config_dll faultrep enable_faultrep wine_fn_config_dll fltlib enable_fltlib wine_fn_config_dll fusion enable_fusion diff --git a/configure.ac b/configure.ac index bacba41..aac7a82 100644 --- a/configure.ac +++ b/configure.ac @@ -2359,6 +2359,7 @@ WINE_CONFIG_LIB(dxerr9) WINE_CONFIG_DLL(dxgi,,[dxgi]) WINE_CONFIG_TEST(dlls/dxgi/tests) WINE_CONFIG_LIB(dxguid) +WINE_CONFIG_DLL(explorerframe) WINE_CONFIG_DLL(faultrep) WINE_CONFIG_DLL(fltlib) WINE_CONFIG_DLL(fusion) diff --git a/dlls/explorerframe/Makefile.in b/dlls/explorerframe/Makefile.in new file mode 100644 index 0000000..3ef7e5b --- /dev/null +++ b/dlls/explorerframe/Makefile.in @@ -0,0 +1,14 @@ +EXTRADEFS = -DCOM_NO_WINDOWS_H +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = explorerframe.dll + +C_SRCS = \ + explorerframe_main.c + +RC_SRCS = \ + version.rc + +(a)MAKE_DLL_RULES@ diff --git a/dlls/explorerframe/explorerframe.spec b/dlls/explorerframe/explorerframe.spec new file mode 100644 index 0000000..dbd9c41 --- /dev/null +++ b/dlls/explorerframe/explorerframe.spec @@ -0,0 +1,7 @@ +# 110 stub EXPLORERFRAME_110 +# 111 stub EXPLORERFRAME_111 +# 134 stub EXPLORERFRAME_134 + +@ stdcall -private DllCanUnloadNow() +@ stub DllGetClassObject +@ stub DllGetVersion diff --git a/dlls/explorerframe/explorerframe_main.c b/dlls/explorerframe/explorerframe_main.c new file mode 100644 index 0000000..4fa5cc6 --- /dev/null +++ b/dlls/explorerframe/explorerframe_main.c @@ -0,0 +1,66 @@ +/* + * ExplorerFrame main functions + * + * Copyright 2010 David Hedberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "shlwapi.h" + +#include "wine/debug.h" + +#include "explorerframe_main.h" + +WINE_DEFAULT_DEBUG_CHANNEL(explorerframe); + +HINSTANCE explorerframe_hinstance; +LONG EFRAME_refCount = 0; + +/************************************************************************* + * DllMain (ExplorerFrame.@) + */ +BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) +{ + TRACE("%p, 0x%x, %p\n", hinst, fdwReason, fImpLoad); + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinst); + explorerframe_hinstance = hinst; + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + +/************************************************************************* + * DllCanUnloadNow (ExplorerFrame.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + TRACE("refCount is %d\n", EFRAME_refCount); + return EFRAME_refCount ? S_FALSE : S_OK; +} diff --git a/dlls/explorerframe/explorerframe_main.h b/dlls/explorerframe/explorerframe_main.h new file mode 100644 index 0000000..45be664 --- /dev/null +++ b/dlls/explorerframe/explorerframe_main.h @@ -0,0 +1,30 @@ +/* + * ExplorerFrame main include + * + * Copyright 2010 David Hedberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_EXPLORERFRAME_H +#define __WINE_EXPLORERFRAME_H + +extern HINSTANCE explorerframe_hinstance; + +extern LONG EFRAME_refCount; +static inline void EFRAME_LockModule(void) { InterlockedIncrement( &EFRAME_refCount ); } +static inline void EFRAME_UnlockModule(void) { InterlockedDecrement( &EFRAME_refCount ); } + +#endif /* __WINE_EXPLORERFRAME_H */ diff --git a/dlls/explorerframe/version.rc b/dlls/explorerframe/version.rc new file mode 100644 index 0000000..257b1fc --- /dev/null +++ b/dlls/explorerframe/version.rc @@ -0,0 +1,29 @@ +/* + * ExplorerFrame Version Resource + * + * Copyright 2010 David Hedberg + * + * 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 + */ + +#define WINE_OLESELFREGISTER +#define WINE_FILEDESCRIPTION_STR "Wine ExplorerFrame" +#define WINE_FILENAME_STR "explorerframe.dll" +#define WINE_FILEVERSION 6,1,7600,16385 +#define WINE_FILEVERSION_STR "6.1.7600.16385" +#define WINE_PRODUCTVERSION 6,1,7600,16385 +#define WINE_PRODUCTVERSION_STR "6.1.7600.16385" + +#include "wine/wine_common_ver.rc"

1 0

David Hedberg : explorerframe: Add a stub of NamespaceTreeControl.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: 49b43e8f7c9643bf8c4ae73d9c3c5f34a61f0b95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49b43e8f7c9643bf8c4ae73d9… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sat Jul 31 20:02:47 2010 +0200 explorerframe: Add a stub of NamespaceTreeControl. --- dlls/explorerframe/Makefile.in | 4 +- dlls/explorerframe/explorerframe_main.h | 4 + dlls/explorerframe/nstc.c | 356 +++++++++++++++++++++++++++++++ 3 files changed, 363 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49b43e8f7c9643bf8c4ae…

1 0

David Hedberg : explorerframe: Implement DllGetVersion.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: ddfab6bb9d474172526abb9e1b7ff5fd3cc50d14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddfab6bb9d474172526abb9e1… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sat Jul 31 20:02:46 2010 +0200 explorerframe: Implement DllGetVersion. --- dlls/explorerframe/explorerframe.spec | 2 +- dlls/explorerframe/explorerframe_main.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletions(-) diff --git a/dlls/explorerframe/explorerframe.spec b/dlls/explorerframe/explorerframe.spec index dbd9c41..58777b0 100644 --- a/dlls/explorerframe/explorerframe.spec +++ b/dlls/explorerframe/explorerframe.spec @@ -4,4 +4,4 @@ @ stdcall -private DllCanUnloadNow() @ stub DllGetClassObject -@ stub DllGetVersion +@ stdcall -private DllGetVersion(ptr) diff --git a/dlls/explorerframe/explorerframe_main.c b/dlls/explorerframe/explorerframe_main.c index 4fa5cc6..51f7d39 100644 --- a/dlls/explorerframe/explorerframe_main.c +++ b/dlls/explorerframe/explorerframe_main.c @@ -64,3 +64,33 @@ HRESULT WINAPI DllCanUnloadNow(void) TRACE("refCount is %d\n", EFRAME_refCount); return EFRAME_refCount ? S_FALSE : S_OK; } + +/************************************************************************* + * DllGetVersion (ExplorerFrame.@) + */ +HRESULT WINAPI DllGetVersion(DLLVERSIONINFO *info) +{ + TRACE("%p\n", info); + if(info->cbSize == sizeof(DLLVERSIONINFO) || + info->cbSize == sizeof(DLLVERSIONINFO2)) + { + /* Windows 7 */ + info->dwMajorVersion = 6; + info->dwMinorVersion = 1; + info->dwBuildNumber = 7600; + info->dwPlatformID = DLLVER_PLATFORM_WINDOWS; + if(info->cbSize == sizeof(DLLVERSIONINFO2)) + { + DLLVERSIONINFO2 *info2 = (DLLVERSIONINFO2*)info; + info2->dwFlags = 0; + info2->ullVersion = MAKEDLLVERULL(info->dwMajorVersion, + info->dwMinorVersion, + info->dwBuildNumber, + 16385); /* "hotfix number" */ + } + return S_OK; + } + + WARN("wrong DLLVERSIONINFO size from app.\n"); + return E_INVALIDARG; +}

1 0