March 2015 - Wine-Commits - list.winehq.org

Francois Gouget : dbghelp: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: 11f985541a68239556adc51d227a7f5f662c0637 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11f985541a68239556adc51d2… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 28 17:30:04 2015 +0100 dbghelp: Fix compilation on systems that don't support nameless unions. --- dlls/dbghelp/cpu_x86_64.c | 50 +++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index 94f561c..a5aa03f 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -53,7 +53,7 @@ typedef union _UNWIND_CODE BYTE CodeOffset; BYTE UnwindOp : 4; BYTE OpInfo : 4; - }; + } u; USHORT FrameOffset; } UNWIND_CODE, *PUNWIND_CODE; @@ -158,14 +158,14 @@ static void dump_unwind_info(struct cpu_stack_walk* csw, ULONG64 base, RUNTIME_F for (i = 0; i < info->CountOfCodes; i++) { - TRACE(" 0x%x: ", info->UnwindCode[i].CodeOffset); - switch (info->UnwindCode[i].UnwindOp) + TRACE(" 0x%x: ", info->UnwindCode[i].u.CodeOffset); + switch (info->UnwindCode[i].u.UnwindOp) { case UWOP_PUSH_NONVOL: - TRACE("pushq %%%s\n", reg_names[info->UnwindCode[i].OpInfo]); + TRACE("pushq %%%s\n", reg_names[info->UnwindCode[i].u.OpInfo]); break; case UWOP_ALLOC_LARGE: - if (info->UnwindCode[i].OpInfo) + if (info->UnwindCode[i].u.OpInfo) { count = *(DWORD*)&info->UnwindCode[i+1]; i += 2; @@ -178,7 +178,7 @@ static void dump_unwind_info(struct cpu_stack_walk* csw, ULONG64 base, RUNTIME_F TRACE("subq $0x%x,%%rsp\n", count); break; case UWOP_ALLOC_SMALL: - count = (info->UnwindCode[i].OpInfo + 1) * 8; + count = (info->UnwindCode[i].u.OpInfo + 1) * 8; TRACE("subq $0x%x,%%rsp\n", count); break; case UWOP_SET_FPREG: @@ -187,29 +187,29 @@ static void dump_unwind_info(struct cpu_stack_walk* csw, ULONG64 base, RUNTIME_F break; case UWOP_SAVE_NONVOL: count = *(USHORT*)&info->UnwindCode[i+1] * 8; - TRACE("movq %%%s,0x%x(%%rsp)\n", reg_names[info->UnwindCode[i].OpInfo], count); + TRACE("movq %%%s,0x%x(%%rsp)\n", reg_names[info->UnwindCode[i].u.OpInfo], count); i++; break; case UWOP_SAVE_NONVOL_FAR: count = *(DWORD*)&info->UnwindCode[i+1]; - TRACE("movq %%%s,0x%x(%%rsp)\n", reg_names[info->UnwindCode[i].OpInfo], count); + TRACE("movq %%%s,0x%x(%%rsp)\n", reg_names[info->UnwindCode[i].u.OpInfo], count); i += 2; break; case UWOP_SAVE_XMM128: count = *(USHORT*)&info->UnwindCode[i+1] * 16; - TRACE("movaps %%xmm%u,0x%x(%%rsp)\n", info->UnwindCode[i].OpInfo, count); + TRACE("movaps %%xmm%u,0x%x(%%rsp)\n", info->UnwindCode[i].u.OpInfo, count); i++; break; case UWOP_SAVE_XMM128_FAR: count = *(DWORD*)&info->UnwindCode[i+1]; - TRACE("movaps %%xmm%u,0x%x(%%rsp)\n", info->UnwindCode[i].OpInfo, count); + TRACE("movaps %%xmm%u,0x%x(%%rsp)\n", info->UnwindCode[i].u.OpInfo, count); i += 2; break; case UWOP_PUSH_MACHFRAME: - TRACE("PUSH_MACHFRAME %u\n", info->UnwindCode[i].OpInfo); + TRACE("PUSH_MACHFRAME %u\n", info->UnwindCode[i].u.OpInfo); break; default: - FIXME("unknown code %u\n", info->UnwindCode[i].UnwindOp); + FIXME("unknown code %u\n", info->UnwindCode[i].u.UnwindOp); break; } } @@ -261,10 +261,10 @@ static void set_float_reg(CONTEXT *context, int reg, M128A val) static int get_opcode_size(UNWIND_CODE op) { - switch (op.UnwindOp) + switch (op.u.UnwindOp) { case UWOP_ALLOC_LARGE: - return 2 + (op.OpInfo != 0); + return 2 + (op.u.OpInfo != 0); case UWOP_SAVE_NONVOL: case UWOP_SAVE_XMM128: return 2; @@ -515,21 +515,21 @@ static BOOL interpret_function_table_entry(struct cpu_stack_walk* csw, for (i = 0; i < info->CountOfCodes; i += get_opcode_size(info->UnwindCode[i])) { - if (prolog_offset < info->UnwindCode[i].CodeOffset) continue; /* skip it */ + if (prolog_offset < info->UnwindCode[i].u.CodeOffset) continue; /* skip it */ - switch (info->UnwindCode[i].UnwindOp) + switch (info->UnwindCode[i].u.UnwindOp) { case UWOP_PUSH_NONVOL: /* pushq %reg */ if (!sw_read_mem(csw, context->Rsp, &value, sizeof(DWORD64))) return FALSE; - set_int_reg(context, info->UnwindCode[i].OpInfo, value); + set_int_reg(context, info->UnwindCode[i].u.OpInfo, value); context->Rsp += sizeof(ULONG64); break; case UWOP_ALLOC_LARGE: /* subq $nn,%rsp */ - if (info->UnwindCode[i].OpInfo) context->Rsp += *(DWORD*)&info->UnwindCode[i+1]; + if (info->UnwindCode[i].u.OpInfo) context->Rsp += *(DWORD*)&info->UnwindCode[i+1]; else context->Rsp += *(USHORT*)&info->UnwindCode[i+1] * 8; break; case UWOP_ALLOC_SMALL: /* subq $n,%rsp */ - context->Rsp += (info->UnwindCode[i].OpInfo + 1) * 8; + context->Rsp += (info->UnwindCode[i].u.OpInfo + 1) * 8; break; case UWOP_SET_FPREG: /* leaq nn(%rsp),%framereg */ context->Rsp = newframe; @@ -537,28 +537,28 @@ static BOOL interpret_function_table_entry(struct cpu_stack_walk* csw, case UWOP_SAVE_NONVOL: /* movq %reg,n(%rsp) */ off = newframe + *(USHORT*)&info->UnwindCode[i+1] * 8; if (!sw_read_mem(csw, off, &value, sizeof(DWORD64))) return FALSE; - set_int_reg(context, info->UnwindCode[i].OpInfo, value); + set_int_reg(context, info->UnwindCode[i].u.OpInfo, value); break; case UWOP_SAVE_NONVOL_FAR: /* movq %reg,nn(%rsp) */ off = newframe + *(DWORD*)&info->UnwindCode[i+1]; if (!sw_read_mem(csw, off, &value, sizeof(DWORD64))) return FALSE; - set_int_reg(context, info->UnwindCode[i].OpInfo, value); + set_int_reg(context, info->UnwindCode[i].u.OpInfo, value); break; case UWOP_SAVE_XMM128: /* movaps %xmmreg,n(%rsp) */ off = newframe + *(USHORT*)&info->UnwindCode[i+1] * 16; if (!sw_read_mem(csw, off, &floatvalue, sizeof(M128A))) return FALSE; - set_float_reg(context, info->UnwindCode[i].OpInfo, floatvalue); + set_float_reg(context, info->UnwindCode[i].u.OpInfo, floatvalue); break; case UWOP_SAVE_XMM128_FAR: /* movaps %xmmreg,nn(%rsp) */ off = newframe + *(DWORD*)&info->UnwindCode[i+1]; if (!sw_read_mem(csw, off, &floatvalue, sizeof(M128A))) return FALSE; - set_float_reg(context, info->UnwindCode[i].OpInfo, floatvalue); + set_float_reg(context, info->UnwindCode[i].u.OpInfo, floatvalue); break; case UWOP_PUSH_MACHFRAME: - FIXME("PUSH_MACHFRAME %u\n", info->UnwindCode[i].OpInfo); + FIXME("PUSH_MACHFRAME %u\n", info->UnwindCode[i].u.OpInfo); break; default: - FIXME("unknown code %u\n", info->UnwindCode[i].UnwindOp); + FIXME("unknown code %u\n", info->UnwindCode[i].u.UnwindOp); break; } }

1 0

Francois Gouget : advapi32: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: fbc59357644b7eb75d71e62698c206e884c13c54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbc59357644b7eb75d71e6269… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 28 11:24:54 2015 +0100 advapi32: Fix compilation on systems that don't support nameless unions. --- dlls/advapi32/service.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index f9b370b..0eb0a47 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -28,6 +28,8 @@ #include <time.h> #include <assert.h> +#define NONAMELESSUNION + #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -2214,7 +2216,7 @@ BOOL WINAPI ChangeServiceConfig2W( SC_HANDLE hService, DWORD dwInfoLevel, SC_RPC_CONFIG_INFOW info; info.dwInfoLevel = dwInfoLevel; - info.descr = lpInfo; + info.u.descr = lpInfo; err = svcctl_ChangeServiceConfig2W( hService, info ); } __EXCEPT(rpc_filter)

1 0

Andrew Eikum : shell32: Use a helper function to allocate strings from the registry.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: e56e9c11fac2efb85641879ada222dbce92ff13b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e56e9c11fac2efb85641879ad… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Feb 27 09:01:43 2015 -0600 shell32: Use a helper function to allocate strings from the registry. --- dlls/shell32/shellpath.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index caf6777..d33091d 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3194,6 +3194,29 @@ static HRESULT get_known_folder_registry_path( return hr; } +static HRESULT get_known_folder_wstr(const WCHAR *regpath, const WCHAR *value, WCHAR **out) +{ + DWORD size = 0; + HRESULT hr; + + size = 0; + hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, regpath, value, RRF_RT_REG_SZ, NULL, NULL, &size)); + if(FAILED(hr)) + return hr; + + *out = CoTaskMemAlloc(size); + if(!*out) + return E_OUTOFMEMORY; + + hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, regpath, value, RRF_RT_REG_SZ, NULL, *out, &size)); + if(FAILED(hr)){ + CoTaskMemFree(*out); + *out = NULL; + } + + return hr; +} + static HRESULT get_known_folder_dword(const WCHAR *registryPath, const WCHAR *value, DWORD *out) { DWORD dwSize = sizeof(DWORD); @@ -3660,7 +3683,6 @@ static HRESULT WINAPI knownfolder_GetFolderDefinition( { struct knownfolder *knownfolder = impl_from_IKnownFolder( iface ); HRESULT hr; - DWORD dwSize; TRACE("(%p, %p)\n", knownfolder, pKFD); if(!pKFD) return E_INVALIDARG; @@ -3671,21 +3693,10 @@ static HRESULT WINAPI knownfolder_GetFolderDefinition( if(FAILED(hr)) return hr; - hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, knownfolder->registryPath, szName, RRF_RT_REG_SZ, NULL, NULL, &dwSize)); + hr = get_known_folder_wstr(knownfolder->registryPath, szName, &pKFD->pszName); if(FAILED(hr)) return hr; - pKFD->pszName = CoTaskMemAlloc(dwSize); - if(!pKFD->pszName) - return E_OUTOFMEMORY; - - hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, knownfolder->registryPath, szName, RRF_RT_REG_SZ, NULL, pKFD->pszName, &dwSize)); - if(FAILED(hr)){ - CoTaskMemFree(pKFD->pszName); - pKFD->pszName = NULL; - return hr; - } - return S_OK; }

1 0

Andrew Eikum : shell32: Use a helper function to get DWORDs from registry.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: b5c12cf9f3679a799c81cd66e63ae916dc74c40d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5c12cf9f3679a799c81cd66e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Feb 27 09:01:35 2015 -0600 shell32: Use a helper function to get DWORDs from registry. --- dlls/shell32/shellpath.c | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 84ac7d5..caf6777 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -768,6 +768,12 @@ VOID WINAPI PathSetDlgItemPathAW(HWND hDlg, int id, LPCVOID pszPath) PathSetDlgItemPathA(hDlg, id, pszPath); } +static const WCHAR szCategory[] = {'C','a','t','e','g','o','r','y',0}; +static const WCHAR szAttributes[] = {'A','t','t','r','i','b','u','t','e','s',0}; +static const WCHAR szName[] = {'N','a','m','e',0}; +static const WCHAR szRelativePath[] = {'R','e','l','a','t','i','v','e','P','a','t','h',0}; +static const WCHAR szParentFolder[] = {'P','a','r','e','n','t','F','o','l','d','e','r',0}; + static const WCHAR szCurrentVersion[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\0'}; static const WCHAR Administrative_ToolsW[] = {'A','d','m','i','n','i','s','t','r','a','t','i','v','e',' ','T','o','o','l','s','\0'}; static const WCHAR AppDataW[] = {'A','p','p','D','a','t','a','\0'}; @@ -2816,7 +2822,6 @@ static HRESULT set_folder_attributes(void) static const WCHAR wfparsingW[] = {'W','a','n','t','s','F','O','R','P','A','R','S','I','N','G',0}; static const WCHAR wfdisplayW[] = {'W','a','n','t','s','F','O','R','D','I','S','P','L','A','Y',0}; static const WCHAR hideasdeleteW[] = {'H','i','d','e','A','s','D','e','l','e','t','e','P','e','r','U','s','e','r',0}; - static const WCHAR attributesW[] = {'A','t','t','r','i','b','u','t','e','s',0}; static const WCHAR cfattributesW[] = {'C','a','l','l','F','o','r','A','t','t','r','i','b','u','t','e','s',0}; static const WCHAR emptyW[] = {0}; @@ -2864,7 +2869,7 @@ static HRESULT set_folder_attributes(void) if (folders[i].hideasdel) res = RegSetValueExW( hkey, hideasdeleteW, 0, REG_SZ, (const BYTE *)emptyW, sizeof(emptyW) ); if (folders[i].attr) - res = RegSetValueExW( hkey, attributesW, 0, REG_DWORD, + res = RegSetValueExW( hkey, szAttributes, 0, REG_DWORD, (const BYTE *)&folders[i].attr, sizeof(DWORD)); if (folders[i].call_for_attr) res = RegSetValueExW( hkey, cfattributesW, 0, REG_DWORD, @@ -3147,12 +3152,6 @@ HRESULT WINAPI SHGetFolderPathEx(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE toke return hr; } -/* constant values used by known folder functions */ -static const WCHAR szCategory[] = {'C','a','t','e','g','o','r','y',0}; -static const WCHAR szName[] = {'N','a','m','e',0}; -static const WCHAR szRelativePath[] = {'R','e','l','a','t','i','v','e','P','a','t','h',0}; -static const WCHAR szParentFolder[] = {'P','a','r','e','n','t','F','o','l','d','e','r',0}; - /* * Internal function to convert known folder identifier to path of registry key * associated with known folder. @@ -3195,6 +3194,13 @@ static HRESULT get_known_folder_registry_path( return hr; } +static HRESULT get_known_folder_dword(const WCHAR *registryPath, const WCHAR *value, DWORD *out) +{ + DWORD dwSize = sizeof(DWORD); + DWORD dwType; + return HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, registryPath, value, RRF_RT_DWORD, &dwType, out, &dwSize)); +} + /* * Internal function to get place where folder redirection information are stored. * @@ -3212,16 +3218,12 @@ static HRESULT get_known_folder_redirection_place( HRESULT hr; LPWSTR lpRegistryPath = NULL; KF_CATEGORY category; - DWORD dwSize; /* first, get known folder's category */ hr = get_known_folder_registry_path(rfid, NULL, &lpRegistryPath); if(SUCCEEDED(hr)) - { - dwSize = sizeof(category); - hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, lpRegistryPath, szCategory, RRF_RT_DWORD, NULL, &category, &dwSize)); - } + hr = get_known_folder_dword(lpRegistryPath, szCategory, &category); if(SUCCEEDED(hr)) { @@ -3245,15 +3247,6 @@ static HRESULT get_known_folder_redirection_place( static HRESULT get_known_folder_path_by_id(REFKNOWNFOLDERID folderId, LPWSTR lpRegistryPath, DWORD dwFlags, LPWSTR *ppszPath); -static HRESULT get_known_folder_category( - LPWSTR registryPath, - KF_CATEGORY* pCategory) -{ - DWORD dwSize = sizeof(DWORD); - DWORD dwType; - return HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, registryPath, szCategory, RRF_RT_DWORD, &dwType, pCategory, &dwSize)); -} - static HRESULT redirect_known_folder( REFKNOWNFOLDERID rfid, HWND hwnd, @@ -3460,7 +3453,7 @@ static HRESULT WINAPI knownfolder_GetCategory( hr = E_FAIL; if(SUCCEEDED(hr)) - hr = get_known_folder_category(knownfolder->registryPath, pCategory); + hr = get_known_folder_dword(knownfolder->registryPath, szCategory, pCategory); return hr; } @@ -3518,7 +3511,7 @@ static HRESULT get_known_folder_path( /* check, if folder was redirected */ if(SUCCEEDED(hr)) - hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, registryPath, szCategory, RRF_RT_REG_DWORD, NULL, &category, &dwSize)); + hr = get_known_folder_dword(registryPath, szCategory, &category); if(SUCCEEDED(hr)) { @@ -3674,7 +3667,7 @@ static HRESULT WINAPI knownfolder_GetFolderDefinition( ZeroMemory(pKFD, sizeof(*pKFD)); - hr = get_known_folder_category(knownfolder->registryPath, &pKFD->category); + hr = get_known_folder_dword(knownfolder->registryPath, szCategory, &pKFD->category); if(FAILED(hr)) return hr;

1 0

Andrew Eikum : shell32: Rearrange error handling in IKnownFolder:: GetFolderDefinition.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: d7d058482ce86c6e0c1a64c7e73a3f56f25f4523 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7d058482ce86c6e0c1a64c7e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Feb 27 09:01:26 2015 -0600 shell32: Rearrange error handling in IKnownFolder::GetFolderDefinition. --- dlls/shell32/shellpath.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 0cdc409..84ac7d5 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3675,20 +3675,25 @@ static HRESULT WINAPI knownfolder_GetFolderDefinition( ZeroMemory(pKFD, sizeof(*pKFD)); hr = get_known_folder_category(knownfolder->registryPath, &pKFD->category); + if(FAILED(hr)) + return hr; - if(SUCCEEDED(hr)) - hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, knownfolder->registryPath, szName, RRF_RT_REG_SZ, NULL, NULL, &dwSize)); + hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, knownfolder->registryPath, szName, RRF_RT_REG_SZ, NULL, NULL, &dwSize)); + if(FAILED(hr)) + return hr; - if(SUCCEEDED(hr)) - { - pKFD->pszName = CoTaskMemAlloc(dwSize); - if(!pKFD->pszName) hr = E_OUTOFMEMORY; - } + pKFD->pszName = CoTaskMemAlloc(dwSize); + if(!pKFD->pszName) + return E_OUTOFMEMORY; - if(SUCCEEDED(hr)) - hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, knownfolder->registryPath, szName, RRF_RT_REG_SZ, NULL, pKFD->pszName, &dwSize)); + hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, knownfolder->registryPath, szName, RRF_RT_REG_SZ, NULL, pKFD->pszName, &dwSize)); + if(FAILED(hr)){ + CoTaskMemFree(pKFD->pszName); + pKFD->pszName = NULL; + return hr; + } - return hr; + return S_OK; } static const struct IKnownFolderVtbl knownfolder_vtbl =

1 0

Matteo Bruni : d3d9: Pack structures to 4-bytes alignment on x86.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: 41556170f231aa6ae6a5e227d8e030cf941817e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41556170f231aa6ae6a5e227d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 27 13:18:23 2015 +0100 d3d9: Pack structures to 4-bytes alignment on x86. Reported by Christoph von Wittich. --- include/d3d9caps.h | 8 ++++++++ include/d3d9types.h | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/include/d3d9caps.h b/include/d3d9caps.h index 838e1f3..5cc757b 100644 --- a/include/d3d9caps.h +++ b/include/d3d9caps.h @@ -20,6 +20,10 @@ #ifndef __WINE_D3D9CAPS_H #define __WINE_D3D9CAPS_H +#ifdef __i386__ +#include <pshpack4.h> +#endif + /* * Definitions */ @@ -392,4 +396,8 @@ typedef struct _D3DCAPS9 { } D3DCAPS9; +#ifdef __i386__ +#include <poppack.h> +#endif + #endif diff --git a/include/d3d9types.h b/include/d3d9types.h index fd7c4ce..3afcf89 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -21,6 +21,10 @@ #ifndef __WINE_D3D9TYPES_H #define __WINE_D3D9TYPES_H +#ifdef __i386__ +#include <pshpack4.h> +#endif + /***************************************************************************** * Direct 3D v9 #defines */ @@ -1580,4 +1584,8 @@ typedef enum _D3DSHADER_COMPARISON D3DSPC_RESERVED1, } D3DSHADER_COMPARISON; +#ifdef __i386__ +#include <poppack.h> +#endif + #endif /* __WINE_D3D9TYPES_H */

1 0

Matteo Bruni : wined3d: Drop a few unnecessary &x[0].
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: 2f804307bda0f62ac23c9a3387e185150868fede URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f804307bda0f62ac23c9a338… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 27 13:18:20 2015 +0100 wined3d: Drop a few unnecessary &x[0]. --- dlls/wined3d/state.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ccfe667..67570d5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1220,7 +1220,7 @@ void state_fogcolor(struct wined3d_context *context, const struct wined3d_state float col[4]; D3DCOLORTOGLFLOAT4(state->render_states[WINED3D_RS_FOGCOLOR], col); - gl_info->gl_ops.gl.p_glFogfv(GL_FOG_COLOR, &col[0]); + gl_info->gl_ops.gl.p_glFogfv(GL_FOG_COLOR, col); checkGLcall("glFog GL_FOG_COLOR"); } @@ -4867,11 +4867,10 @@ void light(struct wined3d_context *context, const struct wined3d_state *state, D { case WINED3D_LIGHT_POINT: /* Position */ - gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_POSITION, &lightInfo->lightPosn[0]); + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_POSITION, lightInfo->lightPosn); checkGLcall("glLightfv"); gl_info->gl_ops.gl.p_glLightf(GL_LIGHT0 + Index, GL_SPOT_CUTOFF, lightInfo->cutoff); checkGLcall("glLightf"); - /* Attenuation - Are these right? guessing... */ gl_info->gl_ops.gl.p_glLightf(GL_LIGHT0 + Index, GL_CONSTANT_ATTENUATION, lightInfo->OriginalParms.attenuation0); checkGLcall("glLightf"); @@ -4887,16 +4886,15 @@ void light(struct wined3d_context *context, const struct wined3d_state *state, D case WINED3D_LIGHT_SPOT: /* Position */ - gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_POSITION, &lightInfo->lightPosn[0]); + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_POSITION, lightInfo->lightPosn); checkGLcall("glLightfv"); /* Direction */ - gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_SPOT_DIRECTION, &lightInfo->lightDirn[0]); + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_SPOT_DIRECTION, lightInfo->lightDirn); checkGLcall("glLightfv"); gl_info->gl_ops.gl.p_glLightf(GL_LIGHT0 + Index, GL_SPOT_EXPONENT, lightInfo->exponent); checkGLcall("glLightf"); gl_info->gl_ops.gl.p_glLightf(GL_LIGHT0 + Index, GL_SPOT_CUTOFF, lightInfo->cutoff); checkGLcall("glLightf"); - /* Attenuation - Are these right? guessing... */ gl_info->gl_ops.gl.p_glLightf(GL_LIGHT0 + Index, GL_CONSTANT_ATTENUATION, lightInfo->OriginalParms.attenuation0); checkGLcall("glLightf"); @@ -4913,7 +4911,7 @@ void light(struct wined3d_context *context, const struct wined3d_state *state, D case WINED3D_LIGHT_DIRECTIONAL: /* Direction */ /* Note GL uses w position of 0 for direction! */ - gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_POSITION, &lightInfo->lightPosn[0]); + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_POSITION, lightInfo->lightPosn); checkGLcall("glLightfv"); gl_info->gl_ops.gl.p_glLightf(GL_LIGHT0 + Index, GL_SPOT_CUTOFF, lightInfo->cutoff); checkGLcall("glLightf");

1 0

Nikolay Sivov : include/debug.h: Support tracing of VT_BSTR|VT_BYREF.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: 5bd6b569cda5788b4d8ba028e99cf9ea17a521b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bd6b569cda5788b4d8ba028e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 27 14:38:31 2015 +0300 include/debug.h: Support tracing of VT_BSTR|VT_BYREF. --- include/wine/debug.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/wine/debug.h b/include/wine/debug.h index 5465935..9028cb5 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -277,6 +277,8 @@ static inline const char *wine_dbgstr_variant( const VARIANT *v ) if (V_VT(v) & VT_BYREF) { if (V_VT(v) == (VT_VARIANT|VT_BYREF)) return wine_dbg_sprintf( "%p {VT_VARIANT|VT_BYREF: %s}", v, wine_dbgstr_variant(V_VARIANTREF(v)) ); + if (V_VT(v) == (VT_BSTR|VT_BYREF)) + return wine_dbg_sprintf( "%p {VT_BSTR|VT_BYREF: %s}", v, wine_dbgstr_w(*V_BSTRREF(v)) ); return wine_dbg_sprintf( "%p {%s %p}", v, wine_dbgstr_vt(V_VT(v)), V_BYREF(v) ); }

1 0

Mark Harmstone : include: Add definition of GUID_All_Objects.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: fa64a7d842fdc271541c12f11262b0e83e554948 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa64a7d842fdc271541c12f11… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Fri Feb 27 21:32:16 2015 +0000 include: Add definition of GUID_All_Objects. --- include/dsound.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/dsound.h b/include/dsound.h index 9dd9671..c7a2bd5 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -668,6 +668,8 @@ DECLARE_INTERFACE_(IDirectSoundBuffer8,IUnknown) }; #undef INTERFACE +DEFINE_GUID(GUID_All_Objects, 0xaa114de5, 0xc262, 0x4169, 0xa1, 0xc8, 0x23, 0xd6, 0x98, 0xcc, 0x73, 0xb5); + #if !defined(__cplusplus) || defined(CINTERFACE) /*** IUnknown methods ***/ #define IDirectSoundBuffer8_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)

1 0

Matteo Bruni : wined3d: Add a couple checkGLcall() in surface_prepare_rb() .
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: 8ed9c2a11bf8a61909ef0940d0dee3611a6c003e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ed9c2a11bf8a61909ef0940d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 27 13:18:21 2015 +0100 wined3d: Add a couple checkGLcall() in surface_prepare_rb(). --- dlls/wined3d/surface.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 36806ec..c045591 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2923,6 +2923,7 @@ void surface_prepare_rb(struct wined3d_surface *surface, const struct wined3d_gl gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, surface->rb_multisample); gl_info->fbo_ops.glRenderbufferStorageMultisample(GL_RENDERBUFFER, surface->resource.multisample_type, surface->resource.format->glInternal, surface->pow2Width, surface->pow2Height); + checkGLcall("glRenderbufferStorageMultisample()"); TRACE("Created multisample rb %u.\n", surface->rb_multisample); } else @@ -2934,6 +2935,7 @@ void surface_prepare_rb(struct wined3d_surface *surface, const struct wined3d_gl gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, surface->rb_resolved); gl_info->fbo_ops.glRenderbufferStorage(GL_RENDERBUFFER, surface->resource.format->glInternal, surface->pow2Width, surface->pow2Height); + checkGLcall("glRenderbufferStorage()"); TRACE("Created resolved rb %u.\n", surface->rb_resolved); } }

1 0