October 2010 - Wine-Commits

Alexandre Julliard : ifsmgr.vxd: Avoid using the CONTEXT86 type.
by Alexandre Julliard Oct. 20, 2010

Oct. 20, 2010

Module: wine Branch: master Commit: 2f96fcc7f910a74ebe87169594a61ecc76733ef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f96fcc7f910a74ebe8716959… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 15:36:30 2010 +0200 ifsmgr.vxd: Avoid using the CONTEXT86 type. --- dlls/ifsmgr.vxd/ifsmgr.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ifsmgr.vxd/ifsmgr.c b/dlls/ifsmgr.vxd/ifsmgr.c index 68c4446..2fe3198 100644 --- a/dlls/ifsmgr.vxd/ifsmgr.c +++ b/dlls/ifsmgr.vxd/ifsmgr.c @@ -58,11 +58,11 @@ struct win32apireq { unsigned short ar_pad; }; -static void win32apieq_2_CONTEXT(const struct win32apireq *pIn, CONTEXT86 *pCxt) +static void win32apieq_2_CONTEXT(const struct win32apireq *pIn, CONTEXT *pCxt) { memset(pCxt,0,sizeof(*pCxt)); - pCxt->ContextFlags=CONTEXT86_INTEGER|CONTEXT86_CONTROL; + pCxt->ContextFlags=CONTEXT_INTEGER|CONTEXT_CONTROL; pCxt->Eax = pIn->ar_eax; pCxt->Ebx = pIn->ar_ebx; pCxt->Ecx = pIn->ar_ecx; @@ -70,7 +70,7 @@ static void win32apieq_2_CONTEXT(const struct win32apireq *pIn, CONTEXT86 *pCxt) pCxt->Esi = pIn->ar_esi; pCxt->Edi = pIn->ar_edi; - /* FIXME: Only partial CONTEXT86_CONTROL */ + /* FIXME: Only partial CONTEXT_CONTROL */ pCxt->Ebp = pIn->ar_ebp; /* FIXME: pIn->ar_proid ignored */ @@ -78,7 +78,7 @@ static void win32apieq_2_CONTEXT(const struct win32apireq *pIn, CONTEXT86 *pCxt) /* FIXME: pIn->ar_pad ignored */ } -static void CONTEXT_2_win32apieq(const CONTEXT86 *pCxt, struct win32apireq *pOut) +static void CONTEXT_2_win32apieq(const CONTEXT *pCxt, struct win32apireq *pOut) { memset(pOut,0,sizeof(struct win32apireq)); @@ -89,7 +89,7 @@ static void CONTEXT_2_win32apieq(const CONTEXT86 *pCxt, struct win32apireq *pOut pOut->ar_esi = pCxt->Esi; pOut->ar_edi = pCxt->Edi; - /* FIXME: Only partial CONTEXT86_CONTROL */ + /* FIXME: Only partial CONTEXT_CONTROL */ pOut->ar_ebp = pCxt->Ebp; /* FIXME: pOut->ar_proid ignored */ @@ -116,7 +116,7 @@ BOOL WINAPI IFSMGR_DeviceIoControl(DWORD dwIoControlCode, LPVOID lpvInBuffer, DW case IFS_IOCTL_21: case IFS_IOCTL_2F: { - CONTEXT86 cxt; + CONTEXT cxt; struct win32apireq *pIn=lpvInBuffer; struct win32apireq *pOut=lpvOutBuffer;

1 0

Alexandre Julliard : vwin32.vxd: Avoid using the CONTEXT86 type.
by Alexandre Julliard Oct. 20, 2010

Oct. 20, 2010

Module: wine Branch: master Commit: f14d522fd2e45149923eaee34ed67edcccc0369a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f14d522fd2e45149923eaee34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 15:36:35 2010 +0200 vwin32.vxd: Avoid using the CONTEXT86 type. --- dlls/vwin32.vxd/vwin32.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/vwin32.vxd/vwin32.c b/dlls/vwin32.vxd/vwin32.c index 972af12..82fa80c 100644 --- a/dlls/vwin32.vxd/vwin32.c +++ b/dlls/vwin32.vxd/vwin32.c @@ -58,20 +58,20 @@ typedef struct tagMID { extern void __wine_call_int_handler( CONTEXT *context, BYTE intnum ); /* Pop a DWORD from the 32-bit stack */ -static inline DWORD stack32_pop( CONTEXT86 *context ) +static inline DWORD stack32_pop( CONTEXT *context ) { DWORD ret = *(DWORD *)context->Esp; context->Esp += sizeof(DWORD); return ret; } -static void DIOCRegs_2_CONTEXT( DIOC_REGISTERS *pIn, CONTEXT86 *pCxt ) +static void DIOCRegs_2_CONTEXT( DIOC_REGISTERS *pIn, CONTEXT *pCxt ) { memset( pCxt, 0, sizeof(*pCxt) ); /* Note: segment registers == 0 means that CTX_SEG_OFF_TO_LIN will interpret 32-bit register contents as linear pointers */ - pCxt->ContextFlags=CONTEXT86_INTEGER|CONTEXT86_CONTROL; + pCxt->ContextFlags=CONTEXT_INTEGER|CONTEXT_CONTROL; pCxt->Eax = pIn->reg_EAX; pCxt->Ebx = pIn->reg_EBX; pCxt->Ecx = pIn->reg_ECX; @@ -79,12 +79,12 @@ static void DIOCRegs_2_CONTEXT( DIOC_REGISTERS *pIn, CONTEXT86 *pCxt ) pCxt->Esi = pIn->reg_ESI; pCxt->Edi = pIn->reg_EDI; - /* FIXME: Only partial CONTEXT86_CONTROL */ + /* FIXME: Only partial CONTEXT_CONTROL */ pCxt->EFlags = pIn->reg_Flags & ~0x00020000; /* clear vm86 mode */ } -static void CONTEXT_2_DIOCRegs( CONTEXT86 *pCxt, DIOC_REGISTERS *pOut ) +static void CONTEXT_2_DIOCRegs( CONTEXT *pCxt, DIOC_REGISTERS *pOut ) { memset( pOut, 0, sizeof(DIOC_REGISTERS) ); @@ -95,7 +95,7 @@ static void CONTEXT_2_DIOCRegs( CONTEXT86 *pCxt, DIOC_REGISTERS *pOut ) pOut->reg_ESI = pCxt->Esi; pOut->reg_EDI = pCxt->Edi; - /* FIXME: Only partial CONTEXT86_CONTROL */ + /* FIXME: Only partial CONTEXT_CONTROL */ pOut->reg_Flags = pCxt->EFlags; } @@ -117,7 +117,7 @@ BOOL WINAPI VWIN32_DeviceIoControl(DWORD dwIoControlCode, case 0x29: /* Int 0x31 call, call it VWIN_DIOC_INT31 ? */ case VWIN32_DIOC_DOS_DRIVEINFO: { - CONTEXT86 cxt; + CONTEXT cxt; DIOC_REGISTERS *pIn = lpvInBuffer; DIOC_REGISTERS *pOut = lpvOutBuffer; BYTE intnum = 0; @@ -178,7 +178,7 @@ BOOL WINAPI VWIN32_DeviceIoControl(DWORD dwIoControlCode, * Programming Secrets". Parameters from experimentation on real Win98. * */ -DWORD WINAPI VWIN32_VxDCall( DWORD service, CONTEXT86 *context ) +DWORD WINAPI VWIN32_VxDCall( DWORD service, CONTEXT *context ) { switch ( LOWORD(service) ) {

1 0

Alexandre Julliard : ntoskrnl.exe: Avoid using the CONTEXT86 type.
by Alexandre Julliard Oct. 20, 2010

Oct. 20, 2010

Module: wine Branch: master Commit: 3161fc517f548ec459000a85a3975b217666174d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3161fc517f548ec459000a85a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 15:33:58 2010 +0200 ntoskrnl.exe: Avoid using the CONTEXT86 type. --- dlls/ntoskrnl.exe/instr.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index e7046f4..ab80719 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -59,7 +59,7 @@ static inline struct idtr get_idtr(void) } /* store an operand into a register */ -static void store_reg( CONTEXT86 *context, BYTE regmodrm, const BYTE *addr, int long_op ) +static void store_reg( CONTEXT *context, BYTE regmodrm, const BYTE *addr, int long_op ) { switch((regmodrm >> 3) & 7) { @@ -103,7 +103,7 @@ static void store_reg( CONTEXT86 *context, BYTE regmodrm, const BYTE *addr, int * * Return the address of an instruction operand (from the mod/rm byte). */ -static BYTE *INSTR_GetOperandAddr( CONTEXT86 *context, BYTE *instr, +static BYTE *INSTR_GetOperandAddr( CONTEXT *context, BYTE *instr, int long_addr, int segprefix, int *len ) { int mod, rm, base = 0, index = 0, ss = 0, seg = 0, off; @@ -258,7 +258,7 @@ static BYTE *INSTR_GetOperandAddr( CONTEXT86 *context, BYTE *instr, * Emulate a privileged instruction. * Returns exception continuation status. */ -static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT86 *context ) +static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) { int prefix, segprefix, prefixlen, len, long_op, long_addr; BYTE *instr; @@ -432,7 +432,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT86 *context ) LONG CALLBACK vectored_handler( EXCEPTION_POINTERS *ptrs ) { EXCEPTION_RECORD *record = ptrs->ExceptionRecord; - CONTEXT86 *context = ptrs->ContextRecord; + CONTEXT *context = ptrs->ContextRecord; if ((record->ExceptionCode == EXCEPTION_ACCESS_VIOLATION || record->ExceptionCode == EXCEPTION_PRIV_INSTRUCTION))

1 0

Ričardas Barkauskas : wlanapi: New stub dll.
by Alexandre Julliard Oct. 20, 2010

Oct. 20, 2010

Module: wine Branch: master Commit: 303079f16a728e15d9a1a92b5fde63de4fcddb5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=303079f16a728e15d9a1a92b5… Author: Ričardas Barkauskas <miegalius(a)gmail.com> Date: Wed Oct 20 11:21:15 2010 +0300 wlanapi: New stub dll. --- configure | 1 + configure.ac | 1 + dlls/wlanapi/Makefile.in | 6 +++++ dlls/wlanapi/main.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wlanapi/wlanapi.spec | 36 +++++++++++++++++++++++++++++++++++ 5 files changed, 90 insertions(+), 0 deletions(-) diff --git a/configure b/configure index ace7d46..74f9849 100755 --- a/configure +++ b/configure @@ -14970,6 +14970,7 @@ wine_fn_config_dll wintab32 enable_wintab32 wintab32 wine_fn_config_test dlls/wintab32/tests wintab32_test wine_fn_config_dll wintrust enable_wintrust wintrust wine_fn_config_test dlls/wintrust/tests wintrust_test +wine_fn_config_dll wlanapi enable_wlanapi wine_fn_config_dll wldap32 enable_wldap32 wldap32 wine_fn_config_test dlls/wldap32/tests wldap32_test wine_fn_config_dll wmi enable_wmi diff --git a/configure.ac b/configure.ac index 85983d5..1260370 100644 --- a/configure.ac +++ b/configure.ac @@ -2748,6 +2748,7 @@ WINE_CONFIG_DLL(wintab32,,[wintab32]) WINE_CONFIG_TEST(dlls/wintab32/tests) WINE_CONFIG_DLL(wintrust,,[wintrust]) WINE_CONFIG_TEST(dlls/wintrust/tests) +WINE_CONFIG_DLL(wlanapi) WINE_CONFIG_DLL(wldap32,,[wldap32]) WINE_CONFIG_TEST(dlls/wldap32/tests) WINE_CONFIG_DLL(wmi) diff --git a/dlls/wlanapi/Makefile.in b/dlls/wlanapi/Makefile.in new file mode 100644 index 0000000..12db8ca --- /dev/null +++ b/dlls/wlanapi/Makefile.in @@ -0,0 +1,6 @@ +MODULE = wlanapi.dll + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c new file mode 100644 index 0000000..97ffd79 --- /dev/null +++ b/dlls/wlanapi/main.c @@ -0,0 +1,46 @@ +/* + * Copyright 2010 Ričardas Barkauskas + * + * 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(wlanapi); + + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/wlanapi/wlanapi.spec b/dlls/wlanapi/wlanapi.spec new file mode 100644 index 0000000..670c41f --- /dev/null +++ b/dlls/wlanapi/wlanapi.spec @@ -0,0 +1,36 @@ +@ stub WlanAllocateMemory +@ stub WlanCloseHandle +@ stub WlanConnect +@ stub WlanDeleteProfile +@ stub WlanDisconnect +@ stub WlanEnumInterfaces +@ stub WlanExtractPsdIEDataList +@ stub WlanFreeMemory +@ stub WlanGetAvailableNetworkList +@ stub WlanGetFilterList +@ stub WlanGetInterfaceCapability +@ stub WlanGetNetworkBssList +@ stub WlanGetProfile +@ stub WlanGetProfileCustomUserData +@ stub WlanGetProfileList +@ stub WlanGetSecuritySettings +@ stub WlanIhvControl +@ stub WlanOpenHandle +@ stub WlanQueryAutoConfigParameter +@ stub WlanQueryInterface +@ stub WlanReasonCodeToString +@ stub WlanRegisterNotification +@ stub WlanRenameProfile +@ stub WlanSaveTemporaryProfile +@ stub WlanScan +@ stub WlanSetAutoConfigParameter +@ stub WlanSetFilterList +@ stub WlanSetInterface +@ stub WlanSetProfile +@ stub WlanSetProfileCustomUserData +@ stub WlanSetProfileEapUserData +@ stub WlanSetProfileEapXmlUserData +@ stub WlanSetProfileList +@ stub WlanSetProfilePosition +@ stub WlanSetPsdIEDataList +@ stub WlanSetSecuritySettings

1 0

Ričardas Barkauskas : wer: Stub WerAddExcludedApplication.
by Alexandre Julliard Oct. 20, 2010

Oct. 20, 2010

Module: wine Branch: master Commit: 9e3edabe3c2855efab48b40b5a818c18fc7fe9b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e3edabe3c2855efab48b40b5… Author: Ričardas Barkauskas <miegalius(a)gmail.com> Date: Wed Oct 20 01:22:51 2010 +0300 wer: Stub WerAddExcludedApplication. --- dlls/wer/main.c | 6 ++++++ dlls/wer/wer.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wer/main.c b/dlls/wer/main.c index d015d27..740462f 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -26,6 +26,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(wer); +HRESULT WINAPI WerAddExcludedApplication(PCWSTR exeName, BOOL allUsers) +{ + FIXME("(%s, %d) stub\n",debugstr_w(exeName), allUsers); + return E_NOTIMPL; +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); diff --git a/dlls/wer/wer.spec b/dlls/wer/wer.spec index b2edb3a..d240a90 100644 --- a/dlls/wer/wer.spec +++ b/dlls/wer/wer.spec @@ -61,7 +61,7 @@ @ stub WerpShowUpsellUI @ stub WerpSubmitReportFromStore @ stub WerpSvcReportFromMachineQueue -@ stub WerAddExcludedApplication +@ stdcall WerAddExcludedApplication(wstr long) @ stub WerRemoveExcludedApplication @ stub WerReportAddDump @ stub WerReportAddFile

1 0

Alexandre Julliard : ntdll: Avoid using the CONTEXT86 type.
by Alexandre Julliard Oct. 20, 2010

Oct. 20, 2010

Module: wine Branch: master Commit: 085d398302c920e039a22007282777202e078704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=085d398302c920e039a220072… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 15:33:49 2010 +0200 ntdll: Avoid using the CONTEXT86 type. --- dlls/ntdll/relay.c | 6 +++--- dlls/ntdll/signal_i386.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index a2d5377..296a89a 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -444,7 +444,7 @@ static LONGLONG WINAPI relay_call( struct relay_descr *descr, unsigned int idx, #ifdef __i386__ void WINAPI __regs_relay_call_regs( struct relay_descr *descr, unsigned int idx, unsigned int orig_eax, unsigned int ret_addr, - CONTEXT86 *context ) + CONTEXT *context ) { WORD ordinal = LOWORD(idx); BYTE nb_args = LOBYTE(HIWORD(idx)); @@ -922,7 +922,7 @@ static void SNOOP_PrintArg(DWORD x) #define CALLER1REF (*(DWORD*)context->Esp) -void WINAPI __regs_SNOOP_Entry( CONTEXT86 *context ) +void WINAPI __regs_SNOOP_Entry( CONTEXT *context ) { DWORD ordinal=0,entry = context->Eip - 5; SNOOP_DLL *dll = firstdll; @@ -1015,7 +1015,7 @@ void WINAPI __regs_SNOOP_Entry( CONTEXT86 *context ) } -void WINAPI __regs_SNOOP_Return( CONTEXT86 *context ) +void WINAPI __regs_SNOOP_Return( CONTEXT *context ) { SNOOP_RETURNENTRY *ret = (SNOOP_RETURNENTRY*)(context->Eip - 5); SNOOP_FUN *fun = &ret->dll->funs[ret->ordinal]; diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index c08693e..f30a617 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1428,7 +1428,7 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) * Check if the fault location is a privileged instruction. * Based on the instruction emulation code in dlls/kernel/instr.c. */ -static inline DWORD is_privileged_instr( CONTEXT86 *context ) +static inline DWORD is_privileged_instr( CONTEXT *context ) { const BYTE *instr; unsigned int prefix_count = 0;

1 0

Henri Verbeet : d3d10core: Implement ID3D10Texture3D::Map().
by Alexandre Julliard Oct. 20, 2010

Oct. 20, 2010

Module: wine Branch: master Commit: 4a626fda420f893329a7e33dc851f7072a500629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a626fda420f893329a7e33dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 20 12:12:29 2010 +0200 d3d10core: Implement ID3D10Texture3D::Map(). --- dlls/d3d10core/texture.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 22e03eb..920b64f 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -349,10 +349,30 @@ static UINT STDMETHODCALLTYPE d3d10_texture3d_GetEvictionPriority(ID3D10Texture3 static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UINT sub_resource, D3D10_MAP map_type, UINT map_flags, D3D10_MAPPED_TEXTURE3D *mapped_texture) { - FIXME("iface %p, sub_resource %u, map_type %u, map_flags %#x, mapped_texture %p stub!\n", + struct d3d10_texture3d *texture = (struct d3d10_texture3d *)iface; + WINED3DLOCKED_BOX wined3d_map_desc; + HRESULT hr; + + TRACE("iface %p, sub_resource %u, map_type %u, map_flags %#x, mapped_texture %p.\n", iface, sub_resource, map_type, map_flags, mapped_texture); - return E_NOTIMPL; + if (map_type != D3D10_MAP_READ_WRITE) + FIXME("Ignoring map_type %#x.\n", map_type); + if (map_flags) + FIXME("Ignoring map_flags %#x.\n", map_flags); + + hr = IWineD3DVolumeTexture_Map(texture->wined3d_texture, sub_resource, &wined3d_map_desc, NULL, 0); + if (FAILED(hr)) + { + WARN("Failed to map texture, hr %#x.\n", hr); + return hr; + } + + mapped_texture->pData = wined3d_map_desc.pBits; + mapped_texture->RowPitch = wined3d_map_desc.RowPitch; + mapped_texture->DepthPitch = wined3d_map_desc.SlicePitch; + + return hr; } static void STDMETHODCALLTYPE d3d10_texture3d_Unmap(ID3D10Texture3D *iface, UINT sub_resource)

1 0

Henri Verbeet : d3d10core: Implement ID3D10Texture3D::Unmap().
by Alexandre Julliard Oct. 20, 2010

Oct. 20, 2010

Module: wine Branch: master Commit: 292c8c36de198cfcbb58d624838cee7a42e10877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=292c8c36de198cfcbb58d6248… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 20 12:12:28 2010 +0200 d3d10core: Implement ID3D10Texture3D::Unmap(). --- dlls/d3d10core/texture.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index aa94516..22e03eb 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -357,7 +357,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UIN static void STDMETHODCALLTYPE d3d10_texture3d_Unmap(ID3D10Texture3D *iface, UINT sub_resource) { - FIXME("iface %p, sub_resource %u stub!\n", iface, sub_resource); + TRACE("iface %p, sub_resource %u.\n", iface, sub_resource); + + IWineD3DVolumeTexture_Unmap(((struct d3d10_texture3d *)iface)->wined3d_texture, sub_resource); } static void STDMETHODCALLTYPE d3d10_texture3d_GetDesc(ID3D10Texture3D *iface, D3D10_TEXTURE3D_DESC *desc)

1 0

Henri Verbeet : wined3d: Recognize the SM4 sqrt opcode.
by Alexandre Julliard Oct. 20, 2010

Oct. 20, 2010

Module: wine Branch: master Commit: d508a855c16fa6bd24c89c6bfcd6d5c128f22d72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d508a855c16fa6bd24c89c6bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 20 12:12:27 2010 +0200 wined3d: Recognize the SM4 sqrt opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2f70a57..3678f44 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5007,6 +5007,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_SGN */ shader_hw_sgn, /* WINED3DSIH_SINCOS */ shader_hw_sincos, /* WINED3DSIH_SLT */ shader_hw_map2gl, + /* WINED3DSIH_SQRT */ NULL, /* WINED3DSIH_SUB */ shader_hw_map2gl, /* WINED3DSIH_TEX */ pshader_hw_tex, /* WINED3DSIH_TEXBEM */ pshader_hw_texbem, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fb7d02e..85b1a28 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5065,6 +5065,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SGN */ shader_glsl_sgn, /* WINED3DSIH_SINCOS */ shader_glsl_sincos, /* WINED3DSIH_SLT */ shader_glsl_compare, + /* WINED3DSIH_SQRT */ NULL, /* WINED3DSIH_SUB */ shader_glsl_arith, /* WINED3DSIH_TEX */ shader_glsl_tex, /* WINED3DSIH_TEXBEM */ shader_glsl_texbem, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index e3451a5..77ffacb 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -111,6 +111,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_SGN */ "sgn", /* WINED3DSIH_SINCOS */ "sincos", /* WINED3DSIH_SLT */ "slt", + /* WINED3DSIH_SQRT */ "sqrt", /* WINED3DSIH_SUB */ "sub", /* WINED3DSIH_TEX */ "texld", /* WINED3DSIH_TEXBEM */ "texbem", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index ef7af43..d0b36c6 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -87,6 +87,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_SAMPLE = 0x45, WINED3D_SM4_OP_SAMPLE_LOD = 0x48, WINED3D_SM4_OP_SAMPLE_GRAD = 0x49, + WINED3D_SM4_OP_SQRT = 0x4b, WINED3D_SM4_OP_SINCOS = 0x4d, WINED3D_SM4_OP_UTOF = 0x56, }; @@ -167,6 +168,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_SAMPLE, WINED3DSIH_SAMPLE, 1, 3}, {WINED3D_SM4_OP_SAMPLE_LOD, WINED3DSIH_SAMPLE_LOD, 1, 4}, {WINED3D_SM4_OP_SAMPLE_GRAD,WINED3DSIH_SAMPLE_GRAD, 1, 5}, + {WINED3D_SM4_OP_SQRT, WINED3DSIH_SQRT, 1, 1}, {WINED3D_SM4_OP_SINCOS, WINED3DSIH_SINCOS, 2, 1}, {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, 1, 1}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 77a512a..bc77f62 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -480,6 +480,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_SGN, WINED3DSIH_SINCOS, WINED3DSIH_SLT, + WINED3DSIH_SQRT, WINED3DSIH_SUB, WINED3DSIH_TEX, WINED3DSIH_TEXBEM,

1 0

Juan Lang : crypt32: Correct Unicode quoting of BMP strings.
by Alexandre Julliard Oct. 20, 2010

Oct. 20, 2010

Module: wine Branch: master Commit: 7833f30721fa400215cdd82fadac34b893acf2c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7833f30721fa400215cdd82fa… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 19 19:23:50 2010 -0700 crypt32: Correct Unicode quoting of BMP strings. --- dlls/crypt32/str.c | 45 +++++++++++++++++++++++++++++++++++++++------ dlls/crypt32/tests/str.c | 10 +++++----- 2 files changed, 44 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 1bdba5d..e118000 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -73,12 +73,12 @@ DWORD WINAPI CertRDNValueToStrA(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue, if (pValue->cbData && isspace(pValue->pbData[pValue->cbData - 1])) needsQuotes = TRUE; for (i = 0; i < pValue->cbData; i++) - { + { if (is_quotable_char(pValue->pbData[i])) needsQuotes = TRUE; if (pValue->pbData[i] == '"') len += 1; - } + } if (needsQuotes) len += 2; if (!psz || !csz) @@ -158,7 +158,7 @@ DWORD WINAPI CertRDNValueToStrA(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue, DWORD WINAPI CertRDNValueToStrW(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue, LPWSTR psz, DWORD csz) { - DWORD ret = 0, len, i; + DWORD ret = 0, len, i, strLen; BOOL needsQuotes = FALSE; TRACE("(%d, %p, %p, %d)\n", dwValueType, pValue, psz, csz); @@ -175,19 +175,18 @@ DWORD WINAPI CertRDNValueToStrW(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue, case CERT_RDN_GRAPHIC_STRING: case CERT_RDN_VISIBLE_STRING: case CERT_RDN_GENERAL_STRING: - case CERT_RDN_BMP_STRING: len = pValue->cbData; if (pValue->cbData && isspace(pValue->pbData[0])) needsQuotes = TRUE; if (pValue->cbData && isspace(pValue->pbData[pValue->cbData - 1])) needsQuotes = TRUE; for (i = 0; i < pValue->cbData; i++) - { + { if (is_quotable_char(pValue->pbData[i])) needsQuotes = TRUE; if (pValue->pbData[i] == '"') len += 1; - } + } if (needsQuotes) len += 2; if (!psz || !csz) @@ -209,6 +208,40 @@ DWORD WINAPI CertRDNValueToStrW(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue, ret = ptr - psz; } break; + case CERT_RDN_BMP_STRING: + strLen = len = pValue->cbData / sizeof(WCHAR); + if (pValue->cbData && isspace(pValue->pbData[0])) + needsQuotes = TRUE; + if (pValue->cbData && isspace(pValue->pbData[strLen - 1])) + needsQuotes = TRUE; + for (i = 0; i < strLen; i++) + { + if (is_quotable_char(((LPCWSTR)pValue->pbData)[i])) + needsQuotes = TRUE; + if (((LPCWSTR)pValue->pbData)[i] == '"') + len += 1; + } + if (needsQuotes) + len += 2; + if (!psz || !csz) + ret = len; + else + { + WCHAR *ptr = psz; + + if (needsQuotes) + *ptr++ = '"'; + for (i = 0; i < strLen && ptr - psz < csz; ptr++, i++) + { + *ptr = ((LPCWSTR)pValue->pbData)[i]; + if (((LPCWSTR)pValue->pbData)[i] == '"' && ptr - psz < csz - 1) + *(++ptr) = '"'; + } + if (needsQuotes && ptr - psz < csz) + *ptr++ = '"'; + ret = ptr - psz; + } + break; default: FIXME("string type %d unimplemented\n", dwValueType); } diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index 913599e..b9af4cd 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -570,7 +570,7 @@ static void test_CertNameToStrW(void) blob.pbData = encodedQuotedCN; blob.cbData = sizeof(encodedQuotedCN); test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, quotedCN_W, - TRUE); + FALSE); blob.pbData = encodedMultipleAttrCN; blob.cbData = sizeof(encodedMultipleAttrCN); test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, multipleAttrCN_W, @@ -583,17 +583,17 @@ static void test_CertNameToStrW(void) test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, equalCN_W, FALSE); blob.pbData = encodedLessThanCN; blob.cbData = sizeof(encodedLessThanCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, lessThanCN_W, TRUE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, lessThanCN_W, FALSE); blob.pbData = encodedGreaterThanCN; blob.cbData = sizeof(encodedGreaterThanCN); test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, greaterThanCN_W, - TRUE); + FALSE); blob.pbData = encodedHashCN; blob.cbData = sizeof(encodedHashCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, hashCN_W, TRUE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, hashCN_W, FALSE); blob.pbData = encodedSemiCN; blob.cbData = sizeof(encodedSemiCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, semiCN_W, TRUE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, semiCN_W, FALSE); } struct StrToNameA

1 0