wine-commits April 2013

wine-commits@winehq.org

2 participants
579 discussions

Jacek Caban : jscript: Store concatenated strings as a rope string to avoid useless copying.
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: 8541f94e2ced1af23ee3dc41961fe891986d449b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8541f94e2ced1af23ee3dc419… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 23 15:02:37 2013 +0200 jscript: Store concatenated strings as a rope string to avoid useless copying. --- dlls/jscript/jsstr.c | 204 +++++++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/jsstr.h | 107 +++++++++++++++++++++++--- 2 files changed, 290 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8541f94e2ced1af23ee3d…

1 0

Piotr Caban : mshtml: Added IOmHistory::get_length implementation.
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: 019a1af76e3c5e6bab394215f075eb1545e880b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=019a1af76e3c5e6bab394215f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 23 16:21:04 2013 +0200 mshtml: Added IOmHistory::get_length implementation. --- dlls/mshtml/htmlwindow.c | 14 +++++++++----- dlls/mshtml/mshtml_private.h | 16 ++++++++++++++-- dlls/mshtml/oleobj.c | 31 ++++++++++++++++++++++++++----- dlls/mshtml/omnavigator.c | 26 +++++++++++++++----------- dlls/mshtml/tests/htmldoc.c | 6 +++--- 5 files changed, 67 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index ccb2a56..28c071e 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -264,8 +264,12 @@ static void release_inner_window(HTMLInnerWindow *This) if(This->screen) IHTMLScreen_Release(This->screen); - if(This->history) - IOmHistory_Release(This->history); + + if(This->history) { + This->history->window = NULL; + IOmHistory_Release(&This->history->IOmHistory_iface); + } + if(This->mon) IMoniker_Release(This->mon); @@ -763,13 +767,13 @@ static HRESULT WINAPI HTMLWindow2_get_history(IHTMLWindow2 *iface, IOmHistory ** if(!window->history) { HRESULT hres; - hres = create_history(&window->history); + hres = create_history(window, &window->history); if(FAILED(hres)) return hres; } - IOmHistory_AddRef(window->history); - *p = window->history; + IOmHistory_AddRef(&window->history->IOmHistory_iface); + *p = &window->history->IOmHistory_iface; return S_OK; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c610ef5..08c48ce 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -28,6 +28,7 @@ #include "objsafe.h" #include "htiframe.h" #include "tlogstg.h" +#include "shdeprecated.h" #include "wine/list.h" #include "wine/unicode.h" @@ -339,6 +340,15 @@ struct HTMLLocation { }; typedef struct { + DispatchEx dispex; + IOmHistory IOmHistory_iface; + + LONG ref; + + HTMLInnerWindow *window; +} OmHistory; + +typedef struct { HTMLOuterWindow *window; LONG ref; } windowref_t; @@ -403,7 +413,7 @@ struct HTMLInnerWindow { HTMLImageElementFactory *image_factory; HTMLOptionElementFactory *option_factory; IHTMLScreen *screen; - IOmHistory *history; + OmHistory *history; IHTMLStorage *session_storage; unsigned parser_callback_cnt; @@ -545,6 +555,8 @@ struct HTMLDocumentObj { IAdviseSink *view_sink; IDocObjectService *doc_object_service; IUnknown *webbrowser; + ITravelLog *travel_log; + IUnknown *browser_service; DOCHOSTUIINFO hostinfo; @@ -738,7 +750,7 @@ HRESULT HTMLImageElementFactory_Create(HTMLInnerWindow*,HTMLImageElementFactory* HRESULT HTMLLocation_Create(HTMLInnerWindow*,HTMLLocation**) DECLSPEC_HIDDEN; IOmNavigator *OmNavigator_Create(void) DECLSPEC_HIDDEN; HRESULT HTMLScreen_Create(IHTMLScreen**) DECLSPEC_HIDDEN; -HRESULT create_history(IOmHistory**) DECLSPEC_HIDDEN; +HRESULT create_history(HTMLInnerWindow*,OmHistory**) DECLSPEC_HIDDEN; HRESULT create_storage(IHTMLStorage**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index c463ebe..ac15cdf 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -215,6 +215,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite HTMLDocument *This = impl_from_IOleObject(iface); IOleCommandTarget *cmdtrg = NULL; IOleWindow *ole_window; + IBrowserService *browser_service; BOOL hostui_setup; VARIANT silent; HWND hwnd; @@ -251,6 +252,16 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite This->doc_obj->webbrowser = NULL; } + if(This->doc_obj->browser_service) { + IUnknown_Release(This->doc_obj->browser_service); + This->doc_obj->browser_service = NULL; + } + + if(This->doc_obj->travel_log) { + ITravelLog_Release(This->doc_obj->travel_log); + This->doc_obj->travel_log = NULL; + } + memset(&This->doc_obj->hostinfo, 0, sizeof(DOCHOSTUIINFO)); if(!pClientSite) @@ -323,6 +334,20 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite IOleWindow_Release(ole_window); } + hres = do_query_service((IUnknown*)pClientSite, &IID_IShellBrowser, + &IID_IBrowserService, (void**)&browser_service); + if(SUCCEEDED(hres)) { + ITravelLog *travel_log; + + This->doc_obj->browser_service = (IUnknown*)browser_service; + + hres = IBrowserService_GetTravelLog(browser_service, &travel_log); + if(SUCCEEDED(hres)) + This->doc_obj->travel_log = travel_log; + }else { + browser_service = NULL; + } + hres = IOleClientSite_QueryInterface(pClientSite, &IID_IOleCommandTarget, (void**)&cmdtrg); if(SUCCEEDED(hres)) { VARIANT var; @@ -332,16 +357,13 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite if(!hostui_setup) { IDocObjectService *doc_object_service; - IBrowserService *browser_service; IWebBrowser2 *wb; V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown*)&This->window->base.IHTMLWindow2_iface; IOleCommandTarget_Exec(cmdtrg, &CGID_DocHostCmdPriv, DOCHOST_DOCCANNAVIGATE, 0, &var, NULL); - hres = do_query_service((IUnknown*)pClientSite, &IID_IShellBrowser, - &IID_IBrowserService, (void**)&browser_service); - if(SUCCEEDED(hres)) { + if(browser_service) { hres = IBrowserService_QueryInterface(browser_service, &IID_IDocObjectService, (void**)&doc_object_service); if(SUCCEEDED(hres)) { @@ -354,7 +376,6 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite hres = do_query_service((IUnknown*)pClientSite, &IID_IWebBrowserApp, &IID_IWebBrowser2, (void**)&wb); if(SUCCEEDED(hres)) This->doc_obj->webbrowser = (IUnknown*)wb; - IBrowserService_Release(browser_service); } } } diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 51421d3..5b564a1 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -44,13 +44,6 @@ typedef struct { HTMLMimeTypesCollection *mime_types; } OmNavigator; -typedef struct { - DispatchEx dispex; - IOmHistory IOmHistory_iface; - - LONG ref; -} OmHistory; - static inline OmHistory *impl_from_IOmHistory(IOmHistory *iface) { return CONTAINING_RECORD(iface, OmHistory, IOmHistory_iface); @@ -142,8 +135,17 @@ static HRESULT WINAPI OmHistory_Invoke(IOmHistory *iface, DISPID dispIdMember, R static HRESULT WINAPI OmHistory_get_length(IOmHistory *iface, short *p) { OmHistory *This = impl_from_IOmHistory(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->window || !This->window->base.outer_window->doc_obj + || !This->window->base.outer_window->doc_obj->travel_log) { + *p = 0; + }else { + *p = ITravelLog_CountEntries(This->window->base.outer_window->doc_obj->travel_log, + This->window->base.outer_window->doc_obj->browser_service); + } + return S_OK; } static HRESULT WINAPI OmHistory_back(IOmHistory *iface, VARIANT *pvargdistance) @@ -193,7 +195,7 @@ static dispex_static_data_t OmHistory_dispex = { }; -HRESULT create_history(IOmHistory **ret) +HRESULT create_history(HTMLInnerWindow *window, OmHistory **ret) { OmHistory *history; @@ -205,7 +207,9 @@ HRESULT create_history(IOmHistory **ret) history->IOmHistory_iface.lpVtbl = &OmHistoryVtbl; history->ref = 1; - *ret = &history->IOmHistory_iface; + history->window = window; + + *ret = history; return S_OK; } diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index f1fa06e..7531a40 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -5291,7 +5291,7 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon) CHECK_CALLED(Exec_ShellDocView_37); todo_wine CHECK_CALLED_BROKEN(IsErrorUrl); }else { - todo_wine CHECK_CALLED(GetTravelLog); + CHECK_CALLED(GetTravelLog); } CHECK_CALLED_BROKEN(Exec_ShellDocView_84); todo_wine CHECK_CALLED(GetPendingUrl); @@ -6377,7 +6377,7 @@ static void test_ClientSite(IOleObject *oleobj, DWORD flags) CHECK_CALLED(Invoke_AMBIENT_USERAGENT); CLEAR_CALLED(Invoke_AMBIENT_PALETTE); /* not called on IE9 */ CLEAR_CALLED(GetOverrideKeyPath); /* Called by IE9 */ - todo_wine CHECK_CALLED(GetTravelLog); + CHECK_CALLED(GetTravelLog); CHECK_CALLED_BROKEN(Exec_ShellDocView_84); set_clientsite = TRUE; @@ -7706,7 +7706,7 @@ static void test_UIActivate(BOOL do_load, BOOL use_ipsex, BOOL use_ipsw) CHECK_CALLED(QueryStatus_SETPROGRESSTEXT); CHECK_CALLED(Exec_SETPROGRESSMAX); CHECK_CALLED(Exec_SETPROGRESSPOS); - todo_wine CHECK_CALLED(GetTravelLog); + CHECK_CALLED(GetTravelLog); CHECK_CALLED_BROKEN(Exec_ShellDocView_84); hres = IOleDocumentView_GetInPlaceSite(view, &inplacesite);

1 0

Stefan Leichter : msvcr80: Add some 64-bit only exports.
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: 47c6310e464ed82d66ec586ef883f28d479e34d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47c6310e464ed82d66ec586ef… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Apr 21 23:02:38 2013 +0200 msvcr80: Add some 64-bit only exports. --- dlls/msvcr80/msvcr80.spec | 50 +++++++++++++++++++++++++++++++++++++++----- 1 files changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 006204a..860383a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -151,14 +151,20 @@ @ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -arch=i386 -norelay _EH_prolog() msvcrt._EH_prolog @ stub _FindAndUnlinkFrame +@ stub -arch=win64 _GetImageBase +@ stub -arch=win64 _GetThrowImageBase @ cdecl _Getdays() msvcrt._Getdays @ cdecl _Getmonths() msvcrt._Getmonths @ cdecl _Gettnames() msvcrt._Gettnames @ extern _HUGE msvcrt._HUGE @ stub _IsExceptionObjectToBeDestroyed -@ stub _NLG_Dispatch2 -@ stub _NLG_Return -@ stub _NLG_Return2 +@ stub -arch=i386 _NLG_Dispatch2 +@ stub -arch=arm,win64 __NLG_Dispatch2 +@ stub -arch=i386 _NLG_Return +@ stub -arch=i386 _NLG_Return2 +@ stub -arch=arm,win64 __NLG_Return2 +@ stub -arch=win64 _SetImageBase +@ stub -arch=win64 _SetThrowImageBase @ cdecl _Strftime(str long str ptr ptr) msvcrt._Strftime @ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter @ stub __AdjustPointer @@ -210,8 +216,10 @@ @ cdecl __dllonexit(ptr ptr ptr) msvcrt.__dllonexit @ cdecl __doserrno() msvcrt.__doserrno @ stub __dstbias -@ stub ___fls_getvalue@4 -@ stub ___fls_setvalue@8 +@ stub -arch=i386 ___fls_getvalue@4 +@ stub -arch=x86_64 __fls_getvalue +@ stub -arch=i386 ___fls_setvalue@8 +@ stub -arch=x86_64 __fls_setvalue @ cdecl __fpecode() msvcrt.__fpecode @ stub __free_locale @ stub __get_app_type @@ -372,6 +380,7 @@ @ cdecl _chdir(str) msvcrt._chdir @ cdecl _chdrive(long) msvcrt._chdrive @ cdecl _chgsign(double) msvcrt._chgsign +@ cdecl -arch=arm,x86_64 _chgsignf(float) msvcrt._chgsignf @ cdecl -arch=i386 -norelay _chkesp() msvcrt._chkesp @ cdecl _chmod(str long) msvcrt._chmod @ cdecl _chsize(long long) msvcrt._chsize @@ -385,6 +394,7 @@ @ cdecl _controlfp(long long) msvcrt._controlfp @ cdecl _controlfp_s(ptr long long) msvcrt._controlfp_s @ cdecl _copysign(double double) msvcrt._copysign +@ cdecl -arch=arm,x86_64 _copysignf(float float) msvcrt._copysignf @ varargs _cprintf(str) msvcrt._cprintf @ stub _cprintf_l @ stub _cprintf_p @@ -395,7 +405,8 @@ @ cdecl _cputws(wstr) msvcrt._cputws @ cdecl _creat(str long) msvcrt._creat @ cdecl _create_locale(long str) msvcrt._create_locale -@ stub _crt_debugger_hook +@ stub -arch=i386 _crt_debugger_hook +@ stub -arch=arm,win64 __crt_debugger_hook @ varargs _cscanf(str) msvcrt._cscanf @ varargs _cscanf_l(str ptr) msvcrt._cscanf_l @ varargs _cscanf_s(str) msvcrt._cscanf_s @@ -469,10 +480,12 @@ @ cdecl _findnext64(long ptr) msvcrt._findnext64 @ cdecl _findnext64i32(long ptr) msvcrt._findnext64i32 @ cdecl _finite(double) msvcrt._finite +@ cdecl -arch=arm,x86_64 _finitef(float) msvcrt._finitef @ cdecl _flsbuf(long ptr) msvcrt._flsbuf @ cdecl _flushall() msvcrt._flushall @ extern _fmode msvcrt._fmode @ cdecl _fpclass(double) msvcrt._fpclass +# stub -arch=x86_64 _fpclassf @ cdecl _fpieee_flt(long ptr ptr) msvcrt._fpieee_flt @ cdecl _fpreset() msvcrt._fpreset @ stub _fprintf_l @@ -662,6 +675,7 @@ @ cdecl _ismbstrail(ptr ptr) msvcrt._ismbstrail @ stub _ismbstrail_l @ cdecl _isnan(double) msvcrt._isnan +@ cdecl -arch=arm,x86_64 _isnanf(float) msvcrt._isnanf @ cdecl _isprint_l(long ptr) msvcrt._isprint_l @ stub _ispunct_l @ cdecl _isspace_l(long ptr) msvcrt._isspace_l @@ -703,6 +717,7 @@ @ cdecl _lock_file(ptr) msvcrt._lock_file @ cdecl _locking(long long long) msvcrt._locking @ cdecl _logb(double) msvcrt._logb +@ cdecl -arch=arm,x86_64 _logbf(float) msvcrt._logbf @ cdecl -arch=i386 _longjmpex(ptr long) msvcrt._longjmpex @ cdecl _lrotl(long long) msvcrt._lrotl @ cdecl _lrotr(long long) msvcrt._lrotr @@ -865,6 +880,7 @@ @ cdecl _mktime64(ptr) msvcrt._mktime64 @ cdecl _msize(ptr) msvcrt._msize @ cdecl _nextafter(double double) msvcrt._nextafter +@ cdecl -arch=arm,x86_64 _nextafterf(float float) msvcrt._nextafterf @ cdecl _onexit(ptr) msvcrt._onexit @ varargs _open(str long) msvcrt._open @ cdecl _open_osfhandle(long long) msvcrt._open_osfhandle @@ -908,6 +924,7 @@ @ cdecl -arch=i386 _safe_fprem() msvcrt._safe_fprem @ cdecl -arch=i386 _safe_fprem1() msvcrt._safe_fprem1 @ cdecl _scalb(double long) msvcrt._scalb +@ cdecl -arch=arm,x86_64 _scalbf(float long) msvcrt._scalbf @ varargs _scanf_l(str ptr) msvcrt._scanf_l @ varargs _scanf_s_l(str ptr) msvcrt._scanf_s_l @ varargs _scprintf(str) msvcrt._scprintf @@ -939,6 +956,7 @@ @ cdecl _seterrormode(long) msvcrt._seterrormode @ cdecl -arch=i386,x86_64,arm -norelay _setjmp(ptr) msvcrt._setjmp @ cdecl -arch=i386 -norelay _setjmp3(ptr long) msvcrt._setjmp3 +@ cdecl -arch=x86_64,arm -norelay _setjmpex(ptr ptr) msvcrt._setjmpex @ cdecl _setmaxstdio(long) msvcrt._setmaxstdio @ cdecl _setmbcp(long) msvcrt._setmbcp @ cdecl _setmode(long long) msvcrt._setmode @@ -1281,11 +1299,15 @@ @ cdecl abort() msvcrt.abort @ cdecl abs(long) msvcrt.abs @ cdecl acos(double) msvcrt.acos +@ cdecl -arch=arm,x86_64 acosf(float) msvcrt.acosf @ cdecl asctime(ptr) msvcrt.asctime @ cdecl asctime_s(ptr long ptr) msvcrt.asctime_s @ cdecl asin(double) msvcrt.asin +@ cdecl -arch=arm,x86_64 asinf(float) msvcrt.asinf @ cdecl atan(double) msvcrt.atan +@ cdecl -arch=arm,x86_64 atanf(float) msvcrt.atanf @ cdecl atan2(double double) msvcrt.atan2 +@ cdecl -arch=arm,x86_64 atan2f(float float) msvcrt.atan2f @ cdecl atexit(ptr) msvcrt.atexit @ cdecl atof(str) msvcrt.atof @ cdecl atoi(str) msvcrt.atoi @@ -1295,14 +1317,18 @@ @ cdecl btowc(long) msvcrt.btowc @ cdecl calloc(long long) msvcrt.calloc @ cdecl ceil(double) msvcrt.ceil +@ cdecl -arch=arm,x86_64 ceilf(float) msvcrt.ceilf @ cdecl clearerr(ptr) msvcrt.clearerr @ stub clearerr_s @ cdecl clock() msvcrt.clock @ cdecl cos(double) msvcrt.cos +@ cdecl -arch=arm,x86_64 cosf(float) msvcrt.cosf @ cdecl cosh(double) msvcrt.cosh +@ cdecl -arch=arm,x86_64 coshf(float) msvcrt.coshf @ cdecl -ret64 div(long long) msvcrt.div @ cdecl exit(long) msvcrt.exit @ cdecl exp(double) msvcrt.exp +@ cdecl -arch=arm,x86_64 expf(float) msvcrt.expf @ cdecl fabs(double) msvcrt.fabs @ cdecl fclose(ptr) msvcrt.fclose @ cdecl feof(ptr) msvcrt.feof @@ -1314,7 +1340,9 @@ @ cdecl fgetwc(ptr) msvcrt.fgetwc @ cdecl fgetws(ptr long ptr) msvcrt.fgetws @ cdecl floor(double) msvcrt.floor +@ cdecl -arch=arm,x86_64 floorf(float) msvcrt.floorf @ cdecl fmod(double double) msvcrt.fmod +@ cdecl -arch=arm,x86_64 fmodf(float float) msvcrt.fmodf @ cdecl fopen(str str) msvcrt.fopen @ cdecl fopen_s(ptr str str) msvcrt.fopen_s @ varargs fprintf(ptr str) msvcrt.fprintf @@ -1378,7 +1406,9 @@ @ cdecl ldiv(long long) msvcrt.ldiv @ cdecl localeconv() msvcrt.localeconv @ cdecl log(double) msvcrt.log +@ cdecl -arch=arm,x86_64 logf(float) msvcrt.logf @ cdecl log10(double) msvcrt.log10 +@ cdecl -arch=arm,x86_64 log10f(float) msvcrt.log10f @ cdecl -arch=i386,x86_64,arm longjmp(ptr long) msvcrt.longjmp @ cdecl malloc(long) msvcrt.malloc @ cdecl mblen(ptr long) msvcrt.mblen @@ -1397,8 +1427,10 @@ @ cdecl memmove_s(ptr long ptr long) msvcrt.memmove_s @ cdecl memset(ptr long long) msvcrt.memset @ cdecl modf(double ptr) msvcrt.modf +@ cdecl -arch=arm,x86_64 modff(float ptr) msvcrt.modff @ cdecl perror(str) msvcrt.perror @ cdecl pow(double double) msvcrt.pow +@ cdecl -arch=arm,x86_64 powf(float float) msvcrt.powf @ varargs printf(str) msvcrt.printf @ varargs printf_s(str) msvcrt.printf_s @ cdecl putc(long ptr) msvcrt.putc @@ -1418,14 +1450,18 @@ @ varargs scanf(str) msvcrt.scanf @ varargs scanf_s(str) msvcrt.scanf_s @ cdecl setbuf(ptr ptr) msvcrt.setbuf +@ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) msvcrt.setjmp @ cdecl setlocale(long str) msvcrt.setlocale @ cdecl setvbuf(ptr str long long) msvcrt.setvbuf @ cdecl signal(long long) msvcrt.signal @ cdecl sin(double) msvcrt.sin +@ cdecl -arch=arm,x86_64 sinf(float) msvcrt.sinf @ cdecl sinh(double) msvcrt.sinh +@ cdecl -arch=arm,x86_64 sinhf(float) msvcrt.sinhf @ varargs sprintf(ptr str) msvcrt.sprintf @ varargs sprintf_s(ptr long str) msvcrt.sprintf_s @ cdecl sqrt(double) msvcrt.sqrt +@ cdecl -arch=arm,x86_64 sqrtf(float) msvcrt.sqrtf @ cdecl srand(long) msvcrt.srand @ varargs sscanf(str str) msvcrt.sscanf @ varargs sscanf_s(str str) msvcrt.sscanf_s @@ -1462,7 +1498,9 @@ @ varargs swscanf_s(wstr wstr) msvcrt.swscanf_s @ cdecl system(str) msvcrt.system @ cdecl tan(double) msvcrt.tan +@ cdecl -arch=arm,x86_64 tanf(float) msvcrt.tanf @ cdecl tanh(double) msvcrt.tanh +@ cdecl -arch=arm,x86_64 tanhf(float) msvcrt.tanhf @ cdecl tmpfile() msvcrt.tmpfile @ cdecl tmpfile_s(ptr) msvcrt.tmpfile_s @ cdecl tmpnam(ptr) msvcrt.tmpnam

1 0

Erich Hoover : server: Report a default DACL for registry keys.
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: 04cd764d7688c59f88c19b25d5c6baea75a15ba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04cd764d7688c59f88c19b25d… Author: Erich Hoover <ehoover(a)mines.edu> Date: Fri Apr 19 17:25:43 2013 -0600 server: Report a default DACL for registry keys. --- dlls/advapi32/tests/security.c | 42 +++++++++++++++++++++++++++++++++++++++- server/registry.c | 35 ++++++++++++++++++++++++-------- server/security.h | 1 + server/token.c | 8 +++++++ 4 files changed, 76 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 86a4237..e10c1ed 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3007,7 +3007,9 @@ static void test_GetNamedSecurityInfoA(void) { char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], *user; char system_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES]; - PSID admin_sid = (PSID) admin_ptr, system_sid = (PSID) system_ptr, user_sid; + char users_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES]; + PSID admin_sid = (PSID) admin_ptr, users_sid = (PSID) users_ptr; + PSID system_sid = (PSID) system_ptr, user_sid; DWORD sid_size = sizeof(admin_ptr), user_size; char invalid_path[] = "/an invalid file path"; char software_key[] = "MACHINE\\Software"; @@ -3015,6 +3017,7 @@ static void test_GetNamedSecurityInfoA(void) SECURITY_DESCRIPTOR_CONTROL control; ACL_SIZE_INFORMATION acl_size; CHAR windows_dir[MAX_PATH]; + int users_ace_id = -1, i; PSECURITY_DESCRIPTOR pSD; ACCESS_ALLOWED_ACE *ace; BOOL bret = TRUE, isNT4; @@ -3022,8 +3025,10 @@ static void test_GetNamedSecurityInfoA(void) DWORD error, revision; BOOL owner_defaulted; BOOL group_defaulted; + BOOL dacl_defaulted; HANDLE token, hTemp; PSID owner, group; + BOOL dacl_present; PACL pDacl; if (!pSetNamedSecurityInfoA || !pGetNamedSecurityInfoA || !pCreateWellKnownSid) @@ -3202,6 +3207,41 @@ static void test_GetNamedSecurityInfoA(void) || broken(((SID*)group)->SubAuthority[0] == SECURITY_NT_NON_UNIQUE) /* Vista */, "MACHINE\\Software group SID != Local System SID.\n"); LocalFree(pSD); + + /* Test querying the DACL of a built-in registry key */ + sid_size = sizeof(users_ptr); + pCreateWellKnownSid(WinBuiltinUsersSid, NULL, users_sid, &sid_size); + error = pGetNamedSecurityInfoA(software_key, SE_REGISTRY_KEY, DACL_SECURITY_INFORMATION, + NULL, NULL, NULL, NULL, &pSD); + ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); + + bret = GetSecurityDescriptorDacl(pSD, &dacl_present, &pDacl, &dacl_defaulted); + ok(bret, "GetSecurityDescriptorDacl failed with error %d\n", GetLastError()); + ok(dacl_present, "DACL should be present\n"); + ok(pDacl && IsValidAcl(pDacl), "GetSecurityDescriptorDacl returned invalid DACL.\n"); + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + ok(acl_size.AceCount != 0, "GetAclInformation returned no ACLs\n"); + for (i=0; i<acl_size.AceCount; i++) + { + bret = pGetAce(pDacl, i, (VOID **)&ace); + ok(bret, "Failed to get ACE %d.\n", i); + bret = EqualSid(&ace->SidStart, users_sid); + if (bret) users_ace_id = i; + } + ok(users_ace_id != -1, "Bultin Users ACE not found.\n"); + if (users_ace_id != -1) + { + bret = pGetAce(pDacl, users_ace_id, (VOID **)&ace); + ok(bret, "Failed to get Builtin Users ACE.\n"); + ok(((ACE_HEADER *)ace)->AceFlags == (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE), + "Builtin Users ACE has unexpected flags (0x%x != 0x%x)\n", ((ACE_HEADER *)ace)->AceFlags, + INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE); + ok(ace->Mask == GENERIC_READ, "Builtin Users ACE has unexpected mask (0x%x != 0x%x)\n", + ace->Mask, GENERIC_READ); + } + + LocalFree(pSD); } static void test_ConvertStringSecurityDescriptor(void) diff --git a/server/registry.c b/server/registry.c index efc2005..eb182f2 100644 --- a/server/registry.c +++ b/server/registry.c @@ -345,16 +345,33 @@ static struct security_descriptor *key_get_sd( struct object *obj ) if (!key_default_sd) { - size_t sid_len = security_sid_len( security_builtin_admins_sid ); - - key_default_sd = mem_alloc( sizeof(*key_default_sd) + 2 * sid_len ); - key_default_sd->control = 0; - key_default_sd->owner_len = sid_len; - key_default_sd->group_len = sid_len; + size_t users_sid_len = security_sid_len( security_builtin_users_sid ); + size_t admins_sid_len = security_sid_len( security_builtin_admins_sid ); + size_t dacl_len = sizeof(ACL) + offsetof( ACCESS_ALLOWED_ACE, SidStart ) + users_sid_len; + ACCESS_ALLOWED_ACE *aaa; + ACL *dacl; + + key_default_sd = mem_alloc( sizeof(*key_default_sd) + 2 * admins_sid_len + dacl_len ); + key_default_sd->control = SE_DACL_PRESENT; + key_default_sd->owner_len = admins_sid_len; + key_default_sd->group_len = admins_sid_len; key_default_sd->sacl_len = 0; - key_default_sd->dacl_len = 0; - memcpy( key_default_sd + 1, security_builtin_admins_sid, sid_len ); - memcpy( (char *)(key_default_sd + 1) + sid_len, security_builtin_admins_sid, sid_len ); + key_default_sd->dacl_len = dacl_len; + memcpy( key_default_sd + 1, security_builtin_admins_sid, admins_sid_len ); + memcpy( (char *)(key_default_sd + 1) + admins_sid_len, security_builtin_admins_sid, admins_sid_len ); + + dacl = (ACL *)((char *)(key_default_sd + 1) + 2 * admins_sid_len); + dacl->AclRevision = ACL_REVISION; + dacl->Sbz1 = 0; + dacl->AclSize = dacl_len; + dacl->AceCount = 1; + dacl->Sbz2 = 0; + aaa = (ACCESS_ALLOWED_ACE *)(dacl + 1); + aaa->Header.AceType = ACCESS_ALLOWED_ACE_TYPE; + aaa->Header.AceFlags = INHERIT_ONLY_ACE | CONTAINER_INHERIT_ACE; + aaa->Header.AceSize = offsetof( ACCESS_ALLOWED_ACE, SidStart ) + users_sid_len; + aaa->Mask = GENERIC_READ; + memcpy( &aaa->SidStart, security_builtin_users_sid, users_sid_len ); } return key_default_sd; } diff --git a/server/security.h b/server/security.h index 9856f96..ab5f027 100644 --- a/server/security.h +++ b/server/security.h @@ -42,6 +42,7 @@ extern const LUID SeCreateGlobalPrivilege; extern const PSID security_world_sid; extern const PSID security_local_user_sid; extern const PSID security_local_system_sid; +extern const PSID security_builtin_users_sid; extern const PSID security_builtin_admins_sid; diff --git a/server/token.c b/server/token.c index 7d6086d..6d8961a 100644 --- a/server/token.c +++ b/server/token.c @@ -84,6 +84,13 @@ static const struct /* same fields as struct SID */ SID_IDENTIFIER_AUTHORITY IdentifierAuthority; DWORD SubAuthority[2]; } builtin_admins_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS } }; +static const struct /* same fields as struct SID */ +{ + BYTE Revision; + BYTE SubAuthorityCount; + SID_IDENTIFIER_AUTHORITY IdentifierAuthority; + DWORD SubAuthority[2]; +} builtin_users_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS } }; const PSID security_world_sid = (PSID)&world_sid; static const PSID security_local_sid = (PSID)&local_sid; @@ -92,6 +99,7 @@ static const PSID security_authenticated_user_sid = (PSID)&authenticated_user_si const PSID security_local_system_sid = (PSID)&local_system_sid; const PSID security_local_user_sid = (PSID)&local_user_sid; const PSID security_builtin_admins_sid = (PSID)&builtin_admins_sid; +const PSID security_builtin_users_sid = (PSID)&builtin_users_sid; static luid_t prev_luid_value = { 1000, 0 };

1 0

Michael Stefaniuc : dsound/tests: Mark some capture status as broken.
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: 624bbd980fef01ba4c56f882a999a58eded8e8a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=624bbd980fef01ba4c56f882a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 23 00:01:40 2013 +0200 dsound/tests: Mark some capture status as broken. --- dlls/dsound/tests/capture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index 2afd522..af4f691 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -402,7 +402,7 @@ static void test_capture_buffer(LPDIRECTSOUNDCAPTURE dsco, rc=IDirectSoundCaptureBuffer_GetStatus(dscbo,&status); ok(rc==DS_OK,"IDirectSoundCaptureBuffer_GetStatus() failed: %08x\n", rc); - ok(status==(DSCBSTATUS_CAPTURING|DSCBSTATUS_LOOPING), + ok(status==(DSCBSTATUS_CAPTURING|DSCBSTATUS_LOOPING) || broken(status==DSCBSTATUS_CAPTURING), "GetStatus: bad status: %x\n",status); if (record) {

1 0

Erich Hoover : advapi32: Fix group ownership test on Vista.
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: 0ae8f2daa43355a077920cc648e6e2e57b2d072d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ae8f2daa43355a077920cc64… Author: Erich Hoover <ehoover(a)mines.edu> Date: Fri Apr 19 17:21:02 2013 -0600 advapi32: Fix group ownership test on Vista. --- dlls/advapi32/tests/security.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 7dd0501..86a4237 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3198,7 +3198,8 @@ static void test_GetNamedSecurityInfoA(void) bret = GetSecurityDescriptorGroup(pSD, &group, &group_defaulted); ok(bret, "GetSecurityDescriptorGroup failed with error %d\n", GetLastError()); ok(group != NULL, "group should not be NULL\n"); - ok(EqualSid(group, admin_sid) || broken(EqualSid(group, system_sid)) /* before Win7 */, + ok(EqualSid(group, admin_sid) || broken(EqualSid(group, system_sid)) /* before Win7 */ + || broken(((SID*)group)->SubAuthority[0] == SECURITY_NT_NON_UNIQUE) /* Vista */, "MACHINE\\Software group SID != Local System SID.\n"); LocalFree(pSD); }

1 0

Jacek Caban : wrc: Allow '/' and '\' in identifiers.
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: 0da8be91ef67284de63b90001d62adf7776d27bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0da8be91ef67284de63b90001… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 23 14:13:58 2013 +0200 wrc: Allow '/' and '\' in identifiers. --- tools/wrc/parser.l | 10 +--------- tools/wrc/parser.y | 5 ++--- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index cf16ccc..8c50a8a 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -404,14 +404,7 @@ static unsigned long xstrtoul(const char *nptr, char **endptr, int base) 0[oO][0-7]+[lL]? { parser_lval.num = xstrtoul(yytext+2, 0, 8); return (yytext[yyleng-1] == 'L' || yytext[yyleng-1] == 'l') ? tLNUMBER : tNUMBER; } - /* - * The next two rules scan identifiers and filenames. - * This is achieved by using the priority ruling - * of the scanner where a '.' is valid in a filename - * and *only* in a filename. In this case, the second - * rule will be reduced because it is longer. - */ -[A-Za-z_0-9.]+ { +[A-Za-z_0-9./\\]+ { struct keyword *tok = iskeyword(yytext); if(tok) @@ -430,7 +423,6 @@ static unsigned long xstrtoul(const char *nptr, char **endptr, int base) return tIDENT; } } -[A-Za-z_0-9./\\]+ parser_lval.str = make_string(yytext); return tFILENAME; /* * Wide string scanning diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index 4cc37ac..ad5fb98 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -268,7 +268,7 @@ static int rsrcid_to_token(int lookahead); %token tNL %token <num> tNUMBER tLNUMBER -%token <str> tSTRING tIDENT tFILENAME +%token <str> tSTRING tIDENT %token <raw> tRAWDATA %token tACCELERATORS tBITMAP tCURSOR tDIALOG tDIALOGEX tMENU tMENUEX tMESSAGETABLE %token tRCDATA tVERSIONINFO tSTRINGTABLE tFONT tFONTDIR tICON tHTML @@ -647,8 +647,7 @@ resource_definition ; -filename: tFILENAME { $$ = make_filename($1); } - | tIDENT { $$ = make_filename($1); } +filename: tIDENT { $$ = make_filename($1); } | tSTRING { $$ = make_filename($1); } ;

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMMESHBUILDER3.
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: 68c4f61dc5d9a6abb8471ed748821e40323ecb59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c4f61dc5d9a6abb8471ed74… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 23 13:21:34 2013 +0200 d3drm: Avoid LPDIRECT3DRMMESHBUILDER3. --- dlls/d3drm/d3drm.c | 9 +++------ dlls/d3drm/meshbuilder.c | 9 +++------ dlls/d3drm/tests/d3drm.c | 2 +- include/d3drm.h | 2 +- include/d3drmobj.h | 2 +- 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 3e9e777..ff7ea71 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -929,14 +929,11 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateMesh(IDirect3DRM3 *iface, IDirect3D return Direct3DRMMesh_create(mesh); } -static HRESULT WINAPI IDirect3DRM3Impl_CreateMeshBuilder(IDirect3DRM3* iface, - LPDIRECT3DRMMESHBUILDER3* ppMeshBuilder) +static HRESULT WINAPI IDirect3DRM3Impl_CreateMeshBuilder(IDirect3DRM3 *iface, IDirect3DRMMeshBuilder3 **mesh_builder) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - - TRACE("(%p/%p)->(%p)\n", iface, This, ppMeshBuilder); + TRACE("iface %p, mesh_builder %p.\n", iface, mesh_builder); - return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder3, (IUnknown**)ppMeshBuilder); + return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder3, (IUnknown **)mesh_builder); } static HRESULT WINAPI IDirect3DRM3Impl_CreateFace(IDirect3DRM3* iface, LPDIRECT3DRMFACE2* Face) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 4678593..40e23de 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1750,13 +1750,10 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_AddMesh(IDirect3DRMMeshBuilder return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_AddMeshBuilder(IDirect3DRMMeshBuilder3* iface, - LPDIRECT3DRMMESHBUILDER3 MeshBuilder, - DWORD flags) +static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_AddMeshBuilder(IDirect3DRMMeshBuilder3 *iface, + IDirect3DRMMeshBuilder3 *mesh_builder, DWORD flags) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - - FIXME("(%p)->(%p,%u): stub\n", This, MeshBuilder, flags); + FIXME("iface %p, mesh_builder %p, flags %#x stub!\n", iface, mesh_builder, flags); return E_NOTIMPL; } diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 1317777..be85098 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -528,7 +528,7 @@ static void test_MeshBuilder3(void) HRESULT hr; IDirect3DRM *d3drm; IDirect3DRM3 *d3drm3; - LPDIRECT3DRMMESHBUILDER3 pMeshBuilder3; + IDirect3DRMMeshBuilder3 *pMeshBuilder3; D3DRMLOADMEMORY info; int val; DWORD val1; diff --git a/include/d3drm.h b/include/d3drm.h index d4d21eb..f1e5c4e 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -339,7 +339,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) STDMETHOD(CreateObject)(THIS_ REFCLSID rclsid, LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObj) PURE; STDMETHOD(CreateFrame)(THIS_ IDirect3DRMFrame3 *parent, IDirect3DRMFrame3 **frame) PURE; STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE; - STDMETHOD(CreateMeshBuilder)(THIS_ LPDIRECT3DRMMESHBUILDER3 *) PURE; + STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder3 **mesh_builder) PURE; STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE2 *) PURE; STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION2 *) PURE; STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET2 *) PURE; diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 5179002..71244a1 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -2861,7 +2861,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder3,IDirect3DRMVisual) STDMETHOD(GenerateNormals)(THIS_ D3DVALUE crease, DWORD flags) PURE; STDMETHOD_(D3DRMCOLORSOURCE, GetColorSource)(THIS) PURE; STDMETHOD(AddMesh)(THIS_ IDirect3DRMMesh *mesh) PURE; - STDMETHOD(AddMeshBuilder)(THIS_ LPDIRECT3DRMMESHBUILDER3, DWORD flags) PURE; + STDMETHOD(AddMeshBuilder)(THIS_ IDirect3DRMMeshBuilder3 *mesh_builder, DWORD flags) PURE; STDMETHOD(AddFrame)(THIS_ IDirect3DRMFrame3 *frame) PURE; STDMETHOD(AddFace)(THIS_ LPDIRECT3DRMFACE2) PURE; STDMETHOD(AddFaces)(THIS_ DWORD vcount, D3DVECTOR *vertices, DWORD ncount, D3DVECTOR *normals, DWORD *data,

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMMESHBUILDER2.
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: 5c442f8dc84da57af02ee9954ee3495c35df8f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c442f8dc84da57af02ee9954… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 23 13:21:33 2013 +0200 d3drm: Avoid LPDIRECT3DRMMESHBUILDER2. --- dlls/d3drm/d3drm.c | 9 +++------ include/d3drm.h | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index eba40c8..3e9e777 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -533,14 +533,11 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateMesh(IDirect3DRM2 *iface, IDirect3D return IDirect3DRM3_CreateMesh(&d3drm->IDirect3DRM3_iface, mesh); } -static HRESULT WINAPI IDirect3DRM2Impl_CreateMeshBuilder(IDirect3DRM2* iface, - LPDIRECT3DRMMESHBUILDER2 * ppMeshBuilder) +static HRESULT WINAPI IDirect3DRM2Impl_CreateMeshBuilder(IDirect3DRM2 *iface, IDirect3DRMMeshBuilder2 **mesh_builder) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - - TRACE("(%p/%p)->(%p)\n", iface, This, ppMeshBuilder); + TRACE("iface %p, mesh_builder %p.\n", iface, mesh_builder); - return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder2, (IUnknown**)ppMeshBuilder); + return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder2, (IUnknown **)mesh_builder); } static HRESULT WINAPI IDirect3DRM2Impl_CreateFace(IDirect3DRM2* iface, LPDIRECT3DRMFACE * ppFace) diff --git a/include/d3drm.h b/include/d3drm.h index 1f62756..d4d21eb 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -198,7 +198,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) STDMETHOD(CreateObject)(THIS_ REFCLSID rclsid, LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObj) PURE; STDMETHOD(CreateFrame)(THIS_ IDirect3DRMFrame *parent, IDirect3DRMFrame2 **frame) PURE; STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE; - STDMETHOD(CreateMeshBuilder)(THIS_ LPDIRECT3DRMMESHBUILDER2 *) PURE; + STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder2 **mesh_builder) PURE; STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE *) PURE; STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION *) PURE; STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE;

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMMESHBUILDER.
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: ec1c18b65cb5ee721f28f3dbae6b2df7820759fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec1c18b65cb5ee721f28f3dba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 23 13:21:32 2013 +0200 d3drm: Avoid LPDIRECT3DRMMESHBUILDER. --- dlls/d3drm/d3drm.c | 8 +++----- dlls/d3drm/meshbuilder.c | 8 +++----- dlls/d3drm/tests/d3drm.c | 10 +++++----- include/d3drm.h | 2 +- include/d3drmobj.h | 4 ++-- 5 files changed, 14 insertions(+), 18 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 4402cec..eba40c8 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -154,13 +154,11 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateMesh(IDirect3DRM *iface, IDirect3DRM return IDirect3DRM3_CreateMesh(&d3drm->IDirect3DRM3_iface, mesh); } -static HRESULT WINAPI IDirect3DRMImpl_CreateMeshBuilder(IDirect3DRM* iface, LPDIRECT3DRMMESHBUILDER * ppMeshBuilder) +static HRESULT WINAPI IDirect3DRMImpl_CreateMeshBuilder(IDirect3DRM *iface, IDirect3DRMMeshBuilder **mesh_builder) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - - TRACE("(%p/%p)->(%p)\n", iface, This, ppMeshBuilder); + TRACE("iface %p, mesh_builder %p.\n", iface, mesh_builder); - return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder, (IUnknown**)ppMeshBuilder); + return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder, (IUnknown **)mesh_builder); } static HRESULT WINAPI IDirect3DRMImpl_CreateFace(IDirect3DRM* iface, LPDIRECT3DRMFACE * ppFace) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index c0e2f86..4678593 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -590,12 +590,10 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddMesh(IDirect3DRMMeshBuilder return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddMeshBuilder(IDirect3DRMMeshBuilder2* iface, - LPDIRECT3DRMMESHBUILDER pMeshBuilder) +static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddMeshBuilder(IDirect3DRMMeshBuilder2 *iface, + IDirect3DRMMeshBuilder *mesh_builder) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - - FIXME("(%p)->(%p): stub\n", This, pMeshBuilder); + FIXME("iface %p, mesh_builder %p stub!\n", iface, mesh_builder); return E_NOTIMPL; } diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 7c52738..1317777 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -226,7 +226,7 @@ static void test_MeshBuilder(void) { HRESULT hr; IDirect3DRM *d3drm; - LPDIRECT3DRMMESHBUILDER pMeshBuilder; + IDirect3DRMMeshBuilder *pMeshBuilder; IDirect3DRMMesh *mesh; D3DRMLOADMEMORY info; int val; @@ -675,7 +675,7 @@ static void test_Frame(void) IDirect3DRMFrame *pFrameP2; IDirect3DRMFrame *pFrameTmp; LPDIRECT3DRMFRAMEARRAY pArray; - LPDIRECT3DRMMESHBUILDER pMeshBuilder; + IDirect3DRMMeshBuilder *mesh_builder; IDirect3DRMVisual *visual1; IDirect3DRMVisual *visual_tmp; LPDIRECT3DRMVISUALARRAY pVisualArray; @@ -907,9 +907,9 @@ static void test_Frame(void) CHECK_REFCOUNT(pFrameP1, 3); /* Create Visual */ - hr = IDirect3DRM_CreateMeshBuilder(d3drm, &pMeshBuilder); + hr = IDirect3DRM_CreateMeshBuilder(d3drm, &mesh_builder); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr); - visual1 = (IDirect3DRMVisual *)pMeshBuilder; + visual1 = (IDirect3DRMVisual *)mesh_builder; /* Add Visual to first parent */ hr = IDirect3DRMFrame_AddVisual(pFrameP1, visual1); @@ -935,7 +935,7 @@ static void test_Frame(void) hr = IDirect3DRMFrame_DeleteVisual(pFrameP1, visual1); ok(hr == D3DRM_OK, "Cannot delete visual (hr = %x)\n", hr); CHECK_REFCOUNT(pFrameP1, 3); - IDirect3DRMMeshBuilder_Release(pMeshBuilder); + IDirect3DRMMeshBuilder_Release(mesh_builder); /* [Add/Delete]Light with NULL pointer */ hr = IDirect3DRMFrame_AddLight(pFrameP1, NULL); diff --git a/include/d3drm.h b/include/d3drm.h index f57a854..1f62756 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -60,7 +60,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) STDMETHOD(CreateObject)(THIS_ REFCLSID rclsid, LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObj) PURE; STDMETHOD(CreateFrame)(THIS_ IDirect3DRMFrame *parent, IDirect3DRMFrame **frame) PURE; STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE; - STDMETHOD(CreateMeshBuilder)(THIS_ LPDIRECT3DRMMESHBUILDER *) PURE; + STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder **mesh_builder) PURE; STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE *) PURE; STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION *) PURE; STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE; diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 70fb2e9..5179002 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -2510,7 +2510,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder,IDirect3DRMVisual) STDMETHOD(GenerateNormals)(THIS) PURE; STDMETHOD_(D3DRMCOLORSOURCE, GetColorSource)(THIS) PURE; STDMETHOD(AddMesh)(THIS_ IDirect3DRMMesh *mesh) PURE; - STDMETHOD(AddMeshBuilder)(THIS_ LPDIRECT3DRMMESHBUILDER) PURE; + STDMETHOD(AddMeshBuilder)(THIS_ IDirect3DRMMeshBuilder *mesh_builder) PURE; STDMETHOD(AddFrame)(THIS_ IDirect3DRMFrame *frame) PURE; STDMETHOD(AddFace)(THIS_ LPDIRECT3DRMFACE) PURE; STDMETHOD(AddFaces)(THIS_ DWORD vcount, D3DVECTOR *vertices, DWORD ncount, D3DVECTOR *normals, DWORD *data, @@ -2681,7 +2681,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder2,IDirect3DRMMeshBuilder) STDMETHOD(GenerateNormals)(THIS) PURE; STDMETHOD_(D3DRMCOLORSOURCE, GetColorSource)(THIS) PURE; STDMETHOD(AddMesh)(THIS_ IDirect3DRMMesh *mesh) PURE; - STDMETHOD(AddMeshBuilder)(THIS_ LPDIRECT3DRMMESHBUILDER) PURE; + STDMETHOD(AddMeshBuilder)(THIS_ IDirect3DRMMeshBuilder *mesh_builder) PURE; STDMETHOD(AddFrame)(THIS_ IDirect3DRMFrame *frame) PURE; STDMETHOD(AddFace)(THIS_ LPDIRECT3DRMFACE) PURE; STDMETHOD(AddFaces)(THIS_ DWORD vcount, D3DVECTOR *vertices, DWORD ncount, D3DVECTOR *normals, DWORD *data,

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
58
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2013