January 2006 - Wine-Commits

Robert Reif : dsound: Rename some functions, make some functions global, and move
by Alexandre Julliard Jan. 14, 2006

Jan. 14, 2006

Module: wine Branch: refs/heads/master Commit: 52e384f9fb77908971685ee752144f248ab573e3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=52e384f9fb77908971685ee… Author: Robert Reif <reif(a)earthlink.net> Date: Sat Jan 14 17:06:52 2006 +0100 dsound: Rename some functions, make some functions global, and move some code around. --- dlls/dsound/buffer.c | 102 ++++++++++++++++++++++++++++++++++++++++- dlls/dsound/dsound.c | 105 ++++-------------------------------------- dlls/dsound/dsound_private.h | 33 ++++++++----- 3 files changed, 131 insertions(+), 109 deletions(-)

1 0

Robert Reif : dsound: Add DSOUND_PrimarySetFormat and use it to set primary format.
by Alexandre Julliard Jan. 14, 2006

Jan. 14, 2006

Module: wine Branch: refs/heads/master Commit: 2d82fc42f075c369d8f41c7da2f1ec7480840f3a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2d82fc42f075c369d8f41c7… Author: Robert Reif <reif(a)earthlink.net> Date: Sat Jan 14 17:06:22 2006 +0100 dsound: Add DSOUND_PrimarySetFormat and use it to set primary format. --- dlls/dsound/dsound_private.h | 1 + dlls/dsound/primary.c | 26 ++++++++++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 63225db..cdce82c 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -498,6 +498,7 @@ HRESULT DSOUND_PrimaryDestroy(DirectSoun HRESULT DSOUND_PrimaryPlay(DirectSoundDevice *device); HRESULT DSOUND_PrimaryStop(DirectSoundDevice *device); HRESULT DSOUND_PrimaryGetPosition(DirectSoundDevice *device, LPDWORD playpos, LPDWORD writepos); +HRESULT DSOUND_PrimarySetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex); /* buffer.c */ diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index c69eddc..e3cd3a2 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -318,19 +318,12 @@ HRESULT DSOUND_PrimaryGetPosition(Direct return DS_OK; } -/******************************************************************************* - * PrimaryBuffer - */ -/* This sets this format for the <em>Primary Buffer Only</em> */ -/* See file:///cdrom/sdk52/docs/worddoc/dsound.doc page 120 */ -static HRESULT WINAPI PrimaryBufferImpl_SetFormat( - LPDIRECTSOUNDBUFFER8 iface,LPCWAVEFORMATEX wfex -) { - DirectSoundDevice *device = ((PrimaryBufferImpl *)iface)->device; +HRESULT DSOUND_PrimarySetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex) +{ HRESULT err = DS_OK; int i, alloc_size, cp_size; DWORD nSamplesPerSec; - TRACE("(%p,%p)\n", iface, wfex); + TRACE("(%p,%p)\n", device, wfex); if (device->priolevel == DSSCL_NORMAL) { WARN("failed priority check!\n"); @@ -430,6 +423,19 @@ done: return err; } +/******************************************************************************* + * PrimaryBuffer + */ +/* This sets this format for the <em>Primary Buffer Only</em> */ +/* See file:///cdrom/sdk52/docs/worddoc/dsound.doc page 120 */ +static HRESULT WINAPI PrimaryBufferImpl_SetFormat( + LPDIRECTSOUNDBUFFER8 iface, + LPCWAVEFORMATEX wfex) +{ + TRACE("(%p,%p)\n", iface, wfex); + return DSOUND_PrimarySetFormat(((PrimaryBufferImpl *)iface)->device, wfex); +} + static HRESULT WINAPI PrimaryBufferImpl_SetVolume( LPDIRECTSOUNDBUFFER8 iface,LONG vol ) {

1 0

Stefan Leichter : winetest: Add cabinet tests.
by Alexandre Julliard Jan. 14, 2006

Jan. 14, 2006

Module: wine Branch: refs/heads/master Commit: fa4a93f26b38e4f823a71a37cec92333d00f39f8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fa4a93f26b38e4f823a71a3… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Sat Jan 14 17:05:50 2006 +0100 winetest: Add cabinet tests. --- programs/winetest/Makefile.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 79c1766..fb22d56 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -26,6 +26,7 @@ TESTBINS = \ @XFILES@ \ advpack_test.exe$(DLLEXT) \ advapi32_test.exe$(DLLEXT) \ + cabinet_test.exe$(DLLEXT) \ comctl32_test.exe$(DLLEXT) \ crypt32_test.exe$(DLLEXT) \ dinput_test.exe$(DLLEXT) \ @@ -102,6 +103,8 @@ advpack_test.exe$(DLLEXT): $(DLLDIR)/adv cp $(DLLDIR)/advpack/tests/advpack_test.exe$(DLLEXT) $@ && $(STRIP) $@ advapi32_test.exe$(DLLEXT): $(DLLDIR)/advapi32/tests/advapi32_test.exe$(DLLEXT) cp $(DLLDIR)/advapi32/tests/advapi32_test.exe$(DLLEXT) $@ && $(STRIP) $@ +cabinet_test.exe$(DLLEXT): $(DLLDIR)/cabinet/tests/cabinet_test.exe$(DLLEXT) + cp $(DLLDIR)/cabinet/tests/cabinet_test.exe$(DLLEXT) $@ && $(STRIP) $@ comctl32_test.exe$(DLLEXT): $(DLLDIR)/comctl32/tests/comctl32_test.exe$(DLLEXT) cp $(DLLDIR)/comctl32/tests/comctl32_test.exe$(DLLEXT) $@ && $(STRIP) $@ crypt32_test.exe$(DLLEXT): $(DLLDIR)/crypt32/tests/crypt32_test.exe$(DLLEXT)

1 0

Vitaliy Margolen : shell32: Fix cut & paste error.
by Alexandre Julliard Jan. 14, 2006

Jan. 14, 2006

Module: wine Branch: refs/heads/master Commit: a5074584a86725ef25526f09436fc45ebb3e70dc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a5074584a86725ef25526f0… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sat Jan 14 17:06:03 2006 +0100 shell32: Fix cut & paste error. --- dlls/shell32/shell32_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 8febaaa..90488ca 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -512,7 +512,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR UINT uDummy,uFlags; hr = IShellFolder_GetUIObjectOf(psfParent, 0, 1, - (LPCITEMIDLIST*)&pidlLast, &IID_IExtractIconA, + (LPCITEMIDLIST*)&pidlLast, &IID_IExtractIconW, &uDummy, (LPVOID*)&pei); if (SUCCEEDED(hr)) { @@ -525,7 +525,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR else ret = FALSE; - IExtractIconA_Release(pei); + IExtractIconW_Release(pei); } }

1 0

Huw Davies : msxml: Implement getAttribute.
by Alexandre Julliard Jan. 14, 2006

Jan. 14, 2006

Module: wine Branch: refs/heads/master Commit: d9fc6985fae076f1ee7952f010c81f8c8b11de87 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d9fc6985fae076f1ee7952f… Author: Huw Davies <huw(a)codeweavers.com> Date: Sat Jan 14 17:05:32 2006 +0100 msxml: Implement getAttribute. --- dlls/msxml3/element.c | 28 +++++++++++++++++++++++++--- dlls/msxml3/tests/domdoc.c | 20 ++++++++++++++++++++ 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 194ea89..38c3591 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -454,10 +454,32 @@ static HRESULT WINAPI domelem_get_tagNam static HRESULT WINAPI domelem_getAttribute( IXMLDOMElement *iface, - BSTR p, VARIANT* var) + BSTR name, VARIANT* value) { - FIXME("\n"); - return E_NOTIMPL; + domelem *This = impl_from_IXMLDOMElement( iface ); + xmlNodePtr element; + xmlChar *xml_name, *xml_value; + HRESULT hr = E_FAIL; + + TRACE("(%p)->(%s,%p)\n", This, debugstr_w(name), value); + + element = get_element( This ); + if ( !element ) + return E_FAIL; + + VariantInit(value); + xml_name = xmlChar_from_wchar( name ); + xml_value = xmlGetNsProp(element, xml_name, NULL); + HeapFree(GetProcessHeap(), 0, xml_name); + if(xml_value) + { + V_VT(value) = VT_BSTR; + V_BSTR(value) = bstr_from_xmlChar( xml_value ); + xmlFree(xml_value); + hr = S_OK; + } + + return hr; } static HRESULT WINAPI domelem_setAttribute( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 74b96ec..098b428 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -71,6 +71,7 @@ static const WCHAR szOpen[] = { 'o','p', static const WCHAR szdl[] = { 'd','l',0 }; static const WCHAR szlc[] = { 'l','c',0 }; static const WCHAR szbs[] = { 'b','s',0 }; +static const WCHAR szstr1[] = { 's','t','r','1',0 }; void test_domdoc( void ) { @@ -312,6 +313,25 @@ void test_domnode( void ) ok( !lstrcmpW( str, szlc ), "incorrect nodeName\n"); SysFreeString( str ); + str = SysAllocString( szNonExistentFile ); + V_VT(&var) = VT_I4; + V_I4(&var) = 0x1234; + r = IXMLDOMElement_getAttribute( element, str, &var ); + ok( r == E_FAIL, "getAttribute ret %08lx\n", r ); + ok( V_VT(&var) == VT_EMPTY, "vt = %x\n", V_VT(&var)); + VariantClear(&var); + SysFreeString( str ); + + str = SysAllocString( szdl ); + V_VT(&var) = VT_I4; + V_I4(&var) = 0x1234; + r = IXMLDOMElement_getAttribute( element, str, &var ); + ok( r == S_OK, "getAttribute ret %08lx\n", r ); + ok( V_VT(&var) == VT_BSTR, "vt = %x\n", V_VT(&var)); + ok( !lstrcmpW(V_BSTR(&var), szstr1), "wrong attr value\n"); + VariantClear( &var ); + SysFreeString( str ); + r = IXMLDOMElement_get_attributes( element, &map ); ok( r == S_OK, "get_attributes returned wrong code\n"); ok( map != NULL, "should be attributes\n");

1 0

Aric Stewart : explorer: Handle /select arguments correctly with the new winefile
by Alexandre Julliard Jan. 14, 2006

Jan. 14, 2006

Module: wine Branch: refs/heads/master Commit: 7439c29d07f7259e789f1d6c54c2feb8021441ad URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7439c29d07f7259e789f1d6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sat Jan 14 17:05:18 2006 +0100 explorer: Handle /select arguments correctly with the new winefile modifications. --- programs/explorer/explorer.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 37 insertions(+), 2 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index e573110..a8cb260 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -1,7 +1,7 @@ /* * explorer.exe * - * Copyright 2005 CodeWeavers, Aric Stewart + * Copyright 2005,2006 CodeWeavers, Aric Stewart * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -148,14 +148,49 @@ int WINAPI WinMain(HINSTANCE hinstance, parameters_struct parameters; BOOL rc; static WCHAR winefile[] = {'w','i','n','e','f','i','l','e','.','e','x','e',0}; + static WCHAR space[] = {' ',0}; + LPWSTR winefile_commandline = NULL; + DWORD len = 0; memset(&parameters,0,sizeof(parameters)); memset(&si,0,sizeof(STARTUPINFOW)); ParseCommandLine(cmdline,&parameters); + len = lstrlenW(winefile) +1; + + if (parameters.selection[0]) + { + len += lstrlenW(parameters.selection) + 2; + winefile_commandline = HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); - rc = CreateProcessW(NULL, winefile, NULL, NULL, FALSE, 0, NULL, + lstrcpyW(winefile_commandline,winefile); + lstrcatW(winefile_commandline,space); + lstrcatW(winefile_commandline,parameters.selection); + } + else if (parameters.root[0]) + { + len += lstrlenW(parameters.root) + 3; + winefile_commandline = HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); + + lstrcpyW(winefile_commandline,winefile); + lstrcatW(winefile_commandline,space); + lstrcatW(winefile_commandline,parameters.root); + if (winefile_commandline[lstrlenW(winefile_commandline)-1]!='\\') + { + static const WCHAR slash[] = {'\\',0}; + lstrcatW(winefile_commandline,slash); + } + } + else + { + winefile_commandline = HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); + lstrcpyW(winefile_commandline,winefile); + } + + rc = CreateProcessW(NULL, winefile_commandline, NULL, NULL, FALSE, 0, NULL, parameters.root, &si, &info); + + HeapFree(GetProcessHeap(),0,winefile_commandline); if (!rc) return 0;

1 0

Jacek Caban : mshtml: Better handling of IDocHostUIHandler in SetClientSite.
by Alexandre Julliard Jan. 14, 2006

Jan. 14, 2006

Module: wine Branch: refs/heads/master Commit: d44364d3fe61dca9d7d3f1189e8d24fcbae2336d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d44364d3fe61dca9d7d3f11… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jan 14 17:04:54 2006 +0100 mshtml: Better handling of IDocHostUIHandler in SetClientSite. --- dlls/mshtml/oleobj.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 3c18682..c034d33 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -73,16 +73,18 @@ static HRESULT WINAPI OleObject_SetClien if(pClientSite == This->client) return S_OK; - if(This->client) + if(This->client) { IOleClientSite_Release(This->client); + This->client = NULL; + } - if(This->hostui) + if(This->hostui) { IDocHostUIHandler_Release(This->hostui); + This->hostui = NULL; + } - if(!pClientSite) { - This->client = NULL; + if(!pClientSite) return S_OK; - } hres = IOleObject_QueryInterface(pClientSite, &IID_IDocHostUIHandler, (void**)&pDocHostUIHandler); if(SUCCEEDED(hres)) { @@ -120,6 +122,7 @@ static HRESULT WINAPI OleObject_SetClien } CoTaskMemFree(override_key_path); } + IDocHostUIHandler2_Release(pDocHostUIHandler2); } This->has_key_path = TRUE;

1 0

appdb/ ./distributionView.php include/distribu ...
by WineHQ Jan. 13, 2006

Jan. 13, 2006

ChangeSet ID: 22279 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/01/13 21:30:35 Modified files: . : distributionView.php include : distributions.php Log message: Chris Morgan Only display testing results for applications that are not currently queued if the user isn't an admin. Patch: http://cvs.winehq.org/patch.py?id=22279 Old revision New revision Changes Path 1.5 1.6 +8 -0 appdb/distributionView.php 1.1 1.2 +19 -3 appdb/include/distributions.php Index: appdb/distributionView.php diff -u -p appdb/distributionView.php:1.5 appdb/distributionView.php:1.6 --- appdb/distributionView.php:1.5 14 Jan 2006 3:30:35 -0000 +++ appdb/distributionView.php 14 Jan 2006 3:30:35 -0000 @@ -119,6 +119,14 @@ else $oApp = new application($oVersion->iAppId); $oSubmitter = new User($oTest->iSubmitterId); $bgcolor = $oTest->sTestedRating; + + /* make sure the user can view the versions we list in the table */ + /* otherwise skip over displaying the entries in this table */ + if(!$_SESSION[current]->canViewApplication($oApp)) + continue; + if(!$_SESSION[current]->canViewVersion($oVersion)) + continue; + echo '<tr class='.$bgcolor.'>',"\n"; echo '<td><a href="'.BASE.'appview.php?versionId='.$oTest->iVersionId.'&iTestingId='.$oTest->iTestingId.'">',"\n"; echo $oApp->sName.' '.$oVersion->sName.'</a></td>',"\n"; Index: appdb/include/distributions.php diff -u -p appdb/include/distributions.php:1.1 appdb/include/distributions.php:1.2 --- appdb/include/distributions.php:1.1 14 Jan 2006 3:30:35 -0000 +++ appdb/include/distributions.php 14 Jan 2006 3:30:35 -0000 @@ -44,9 +44,25 @@ class distribution{ /* * We fetch Test Result Ids. */ - $sQuery = "SELECT testingId - FROM testResults - WHERE distributionId = ".$iDistributionId; + + if($_SESSION['current']->hasPriv("admin")) + { + $sQuery = "SELECT testingId + FROM testResults + WHERE distributionId = ".$iDistributionId; + } else /* only let users view test results that aren't queued and for apps that */ + /* aren't queued or versions that aren't queued */ + { + $sQuery = "SELECT testingId + FROM testResults, appFamily, appVersion + WHERE testResults.queued = 'false' AND + testResults.versionId = appVersion.versionId AND + appFamily.appId = appVersion.appId AND + appFamily.queued = 'false' AND + appVersion.queued = 'false' AND + distributionId = ".$iDistributionId; + } + if($hResult = query_appdb($sQuery)) { while($oRow = mysql_fetch_object($hResult))

1 0

Alexandre Julliard : kernel: Reimplemented the MapHInst functions in assembly.
by Alexandre Julliard Jan. 13, 2006

Jan. 13, 2006

Module: wine Branch: refs/heads/master Commit: 068cedc7f2ebc6a2ed3f8a8e137cc9d96539d7cd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=068cedc7f2ebc6a2ed3f8a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 13 14:29:30 2006 +0100 kernel: Reimplemented the MapHInst functions in assembly. --- dlls/kernel/kernel32.spec | 8 +++--- dlls/kernel/krnl386.exe.spec | 4 +-- dlls/kernel/ne_module.c | 58 +++++++++++++++++++++++++----------------- 3 files changed, 40 insertions(+), 30 deletions(-) diff --git a/dlls/kernel/kernel32.spec b/dlls/kernel/kernel32.spec index 4c3a025..65976a1 100644 --- a/dlls/kernel/kernel32.spec +++ b/dlls/kernel/kernel32.spec @@ -790,10 +790,10 @@ @ stdcall LockFileEx(long long long long long ptr) @ stdcall LockResource(long) @ stdcall MakeCriticalSectionGlobal(ptr) -@ stdcall -i386 -register MapHInstLS() -@ stdcall -i386 -register MapHInstLS_PN() -@ stdcall -i386 -register MapHInstSL() -@ stdcall -i386 -register MapHInstSL_PN() +@ stdcall -i386 -norelay MapHInstLS() +@ stdcall -i386 -norelay MapHInstLS_PN() +@ stdcall -i386 -norelay MapHInstSL() +@ stdcall -i386 -norelay MapHInstSL_PN() @ stdcall MapHModuleLS(long) @ stdcall MapHModuleSL(long) @ stdcall MapLS(ptr) diff --git a/dlls/kernel/krnl386.exe.spec b/dlls/kernel/krnl386.exe.spec index 7b7a477..0005f37 100644 --- a/dlls/kernel/krnl386.exe.spec +++ b/dlls/kernel/krnl386.exe.spec @@ -374,8 +374,8 @@ 469 stub WOAGimmeTitle 470 stub WOADestroyConsole 471 pascal GetCurrentProcessId() GetCurrentProcessId -472 pascal -register MapHInstLS() __regs_MapHInstLS -473 pascal -register MapHInstSL() __regs_MapHInstSL +472 pascal -register MapHInstLS() MapHInstLS16 +473 pascal -register MapHInstSL() MapHInstSL16 474 pascal CloseW32Handle(long) CloseHandle 475 pascal -ret16 GetTEBSelectorFS() GetTEBSelectorFS16 476 pascal ConvertToGlobalHandle(long) ConvertToGlobalHandle diff --git a/dlls/kernel/ne_module.c b/dlls/kernel/ne_module.c index 89600d2..930dc13 100644 --- a/dlls/kernel/ne_module.c +++ b/dlls/kernel/ne_module.c @@ -2138,47 +2138,57 @@ HMODULE WINAPI MapHModuleSL(HMODULE16 hm } /*************************************************************************** - * MapHInstLS (KERNEL32.@) * MapHInstLS (KERNEL.472) */ -void WINAPI __regs_MapHInstLS( CONTEXT86 *context ) +void WINAPI MapHInstLS16( CONTEXT86 *context ) { context->Eax = MapHModuleLS( (HMODULE)context->Eax ); } -#ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( MapHInstLS, 0, 0 ); -#endif /*************************************************************************** - * MapHInstSL (KERNEL32.@) * MapHInstSL (KERNEL.473) */ -void WINAPI __regs_MapHInstSL( CONTEXT86 *context ) +void WINAPI MapHInstSL16( CONTEXT86 *context ) { context->Eax = (DWORD)MapHModuleSL( context->Eax ); } -#ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( MapHInstSL, 0, 0 ); -#endif + +#ifdef __i386__ + +/*************************************************************************** + * MapHInstLS (KERNEL32.@) + */ +__ASM_GLOBAL_FUNC( MapHInstLS, + "pushl %eax\n\t" + "call " __ASM_NAME("MapHModuleLS") "\n\t" + "ret" ); + +/*************************************************************************** + * MapHInstSL (KERNEL32.@) + */ +__ASM_GLOBAL_FUNC( MapHInstSL, + "pushl %eax\n\t" + "call " __ASM_NAME("MapHModuleSL") "\n\t" + "ret" ); /*************************************************************************** * MapHInstLS_PN (KERNEL32.@) */ -void WINAPI __regs_MapHInstLS_PN( CONTEXT86 *context ) -{ - if (context->Eax) context->Eax = MapHModuleLS( (HMODULE)context->Eax ); -} -#ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( MapHInstLS_PN, 0, 0 ); -#endif +__ASM_GLOBAL_FUNC( MapHInstLS_PN, + "testl %eax,%eax\n\t" + "jz 1f\n\t" + "pushl %eax\n\t" + "call " __ASM_NAME("MapHModuleLS") "\n" + "1:\tret" ); /*************************************************************************** * MapHInstSL_PN (KERNEL32.@) */ -void WINAPI __regs_MapHInstSL_PN( CONTEXT86 *context ) -{ - if (context->Eax) context->Eax = (DWORD)MapHModuleSL( context->Eax ); -} -#ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( MapHInstSL_PN, 0, 0 ); -#endif +__ASM_GLOBAL_FUNC( MapHInstSL_PN, + "andl $0xffff,%eax\n\t" + "jz 1f\n\t" + "pushl %eax\n\t" + "call " __ASM_NAME("MapHModuleSL") "\n" + "1:\tret" ); + +#endif /* __i386__ */

1 0

Alexandre Julliard : kernel: Reimplemented the SMap/SUnmap functions in assembly.
by Alexandre Julliard Jan. 13, 2006

Jan. 13, 2006

Module: wine Branch: refs/heads/master Commit: 643463b45603a8e2e8886875692e5833ebe46309 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=643463b45603a8e2e888687… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 13 14:26:24 2006 +0100 kernel: Reimplemented the SMap/SUnmap functions in assembly. --- dlls/kernel/kernel32.spec | 42 ++++++++++++------------- dlls/kernel/selector.c | 76 ++++++++++++++++++++------------------------- 2 files changed, 54 insertions(+), 64 deletions(-) diff --git a/dlls/kernel/kernel32.spec b/dlls/kernel/kernel32.spec index 5524cd1..4c3a025 100644 --- a/dlls/kernel/kernel32.spec +++ b/dlls/kernel/kernel32.spec @@ -922,26 +922,26 @@ @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory @ stdcall RtlUnwind(ptr ptr ptr long) ntdll.RtlUnwind @ stdcall RtlZeroMemory(ptr long) ntdll.RtlZeroMemory -@ stdcall -i386 -register SMapLS() -@ stdcall -i386 -register SMapLS_IP_EBP_12() -@ stdcall -i386 -register SMapLS_IP_EBP_16() -@ stdcall -i386 -register SMapLS_IP_EBP_20() -@ stdcall -i386 -register SMapLS_IP_EBP_24() -@ stdcall -i386 -register SMapLS_IP_EBP_28() -@ stdcall -i386 -register SMapLS_IP_EBP_32() -@ stdcall -i386 -register SMapLS_IP_EBP_36() -@ stdcall -i386 -register SMapLS_IP_EBP_40() -@ stdcall -i386 -register SMapLS_IP_EBP_8() -@ stdcall -i386 -register SUnMapLS() -@ stdcall -i386 -register SUnMapLS_IP_EBP_12() -@ stdcall -i386 -register SUnMapLS_IP_EBP_16() -@ stdcall -i386 -register SUnMapLS_IP_EBP_20() -@ stdcall -i386 -register SUnMapLS_IP_EBP_24() -@ stdcall -i386 -register SUnMapLS_IP_EBP_28() -@ stdcall -i386 -register SUnMapLS_IP_EBP_32() -@ stdcall -i386 -register SUnMapLS_IP_EBP_36() -@ stdcall -i386 -register SUnMapLS_IP_EBP_40() -@ stdcall -i386 -register SUnMapLS_IP_EBP_8() +@ stdcall -i386 -norelay SMapLS() +@ stdcall -i386 -norelay SMapLS_IP_EBP_12() +@ stdcall -i386 -norelay SMapLS_IP_EBP_16() +@ stdcall -i386 -norelay SMapLS_IP_EBP_20() +@ stdcall -i386 -norelay SMapLS_IP_EBP_24() +@ stdcall -i386 -norelay SMapLS_IP_EBP_28() +@ stdcall -i386 -norelay SMapLS_IP_EBP_32() +@ stdcall -i386 -norelay SMapLS_IP_EBP_36() +@ stdcall -i386 -norelay SMapLS_IP_EBP_40() +@ stdcall -i386 -norelay SMapLS_IP_EBP_8() +@ stdcall -i386 -norelay SUnMapLS() +@ stdcall -i386 -norelay SUnMapLS_IP_EBP_12() +@ stdcall -i386 -norelay SUnMapLS_IP_EBP_16() +@ stdcall -i386 -norelay SUnMapLS_IP_EBP_20() +@ stdcall -i386 -norelay SUnMapLS_IP_EBP_24() +@ stdcall -i386 -norelay SUnMapLS_IP_EBP_28() +@ stdcall -i386 -norelay SUnMapLS_IP_EBP_32() +@ stdcall -i386 -norelay SUnMapLS_IP_EBP_36() +@ stdcall -i386 -norelay SUnMapLS_IP_EBP_40() +@ stdcall -i386 -norelay SUnMapLS_IP_EBP_8() @ stdcall ScrollConsoleScreenBufferA(long ptr ptr ptr ptr) @ stdcall ScrollConsoleScreenBufferW(long ptr ptr ptr ptr) @ stdcall SearchPathA(str str str long ptr ptr) @@ -1092,7 +1092,7 @@ @ stdcall UTRegister(long str str str ptr ptr ptr) @ stdcall UTUnRegister(long) @ stdcall UnMapLS(long) -@ stdcall -i386 -register UnMapSLFixArray(long long) +@ stdcall -i386 -norelay UnMapSLFixArray(long long) @ stdcall UnhandledExceptionFilter(ptr) @ stdcall UninitializeCriticalSection(ptr) @ stdcall UnlockFile(long long long long long) diff --git a/dlls/kernel/selector.c b/dlls/kernel/selector.c index 2bd9180..e157ca9 100644 --- a/dlls/kernel/selector.c +++ b/dlls/kernel/selector.c @@ -562,15 +562,14 @@ LPVOID WINAPI MapSLFix( SEGPTR sptr ) /*********************************************************************** * UnMapSLFixArray (KERNEL32.@) + * + * Must not change EAX, hence defined as asm function. */ -void WINAPI __regs_UnMapSLFixArray( SEGPTR sptr[], INT length, CONTEXT86 *context ) -{ - /* Must not change EAX, hence defined as 'register' function */ -} -#ifdef DEFINE_REGS_ENTRYPOINT -DEFINE_REGS_ENTRYPOINT( UnMapSLFixArray, 8, 8 ); +#ifdef __i386__ +__ASM_GLOBAL_FUNC( UnMapSLFixArray, "ret $8" ); #endif + /*********************************************************************** * GetThreadSelectorEntry (KERNEL32.@) */ @@ -638,32 +637,29 @@ BOOL WINAPI GetThreadSelectorEntry( HAND } -#ifdef DEFINE_REGS_ENTRYPOINT +#ifdef __i386__ /*********************************************************************** * SMapLS (KERNEL32.@) */ -void WINAPI __regs_SMapLS( CONTEXT86 *context ) -{ - if (HIWORD(context->Eax)) - { - context->Eax = MapLS( (LPVOID)context->Eax ); - context->Edx = context->Eax; - } else { - context->Edx = 0; - } -} -DEFINE_REGS_ENTRYPOINT( SMapLS, 0, 0 ); +__ASM_GLOBAL_FUNC( SMapLS, + "xor %edx,%edx\n\t" + "testl $0xffff0000,%eax\n\t" + "jz 1f\n\t" + "pushl %eax\n\t" + "call " __ASM_NAME("MapLS") "\n\t" + "movl %eax,%edx\n" + "1:\tret" ); /*********************************************************************** * SUnMapLS (KERNEL32.@) */ -void WINAPI __regs_SUnMapLS( CONTEXT86 *context ) -{ - if (HIWORD(context->Eax)) UnMapLS( (SEGPTR)context->Eax ); -} -DEFINE_REGS_ENTRYPOINT( SUnMapLS, 0, 0 ); - +__ASM_GLOBAL_FUNC( SUnMapLS, + "pushl %eax\n\t" /* preserve eax */ + "pushl %eax\n\t" + "call " __ASM_NAME("UnMapLS") "\n\t" + "popl %eax\n\t" + "ret" ); /*********************************************************************** * SMapLS_IP_EBP_8 (KERNEL32.@) @@ -682,17 +678,11 @@ DEFINE_REGS_ENTRYPOINT( SUnMapLS, 0, 0 ) * unravel them at SUnMapLS. We just store the segmented pointer there. */ #define DEFINE_SMapLS(n) \ -void WINAPI __regs_SMapLS_IP_EBP_ ## n (CONTEXT86 *context) \ -{ \ - SEGPTR *ptr = (SEGPTR *)(context->Ebp + n); \ - if (!HIWORD(*ptr)) \ - { \ - context->Eax = *ptr; \ - *ptr = 0; \ - } \ - else *ptr = context->Eax = MapLS((LPVOID)*ptr); \ -} \ -DEFINE_REGS_ENTRYPOINT( SMapLS_IP_EBP_ ## n, 0, 0 ) + __ASM_GLOBAL_FUNC( SMapLS_IP_EBP_ ## n, \ + "movl " #n "(%ebp),%eax\n\t" \ + "call " __ASM_NAME("SMapLS") "\n\t" \ + "movl %edx," #n "(%ebp)\n\t" \ + "ret" ); DEFINE_SMapLS(8); DEFINE_SMapLS(12); @@ -718,13 +708,13 @@ DEFINE_SMapLS(40); */ #define DEFINE_SUnMapLS(n) \ -void WINAPI __regs_SUnMapLS_IP_EBP_ ## n (CONTEXT86 *context) \ -{ \ - SEGPTR *ptr = (SEGPTR *)(context->Ebp + n); \ - UnMapLS( *ptr ); \ - *ptr = 0; \ -} \ -DEFINE_REGS_ENTRYPOINT( SUnMapLS_IP_EBP_ ## n, 0, 0 ) + __ASM_GLOBAL_FUNC( SUnMapLS_IP_EBP_ ## n, \ + "pushl %eax\n\t" /* preserve eax */ \ + "pushl " #n "(%ebp)\n\t" \ + "call " __ASM_NAME("UnMapLS") "\n\t" \ + "movl $0," #n "(%ebp)\n\t" \ + "popl %eax\n\t" \ + "ret" ) DEFINE_SUnMapLS(8); DEFINE_SUnMapLS(12); @@ -736,4 +726,4 @@ DEFINE_SUnMapLS(32); DEFINE_SUnMapLS(36); DEFINE_SUnMapLS(40); -#endif /* DEFINE_REGS_ENTRYPOINT */ +#endif /* __i386__ */

1 0