October 2010 - Wine-Commits

Henri Verbeet : d3d10core: Implement ID3D10Buffer::Unmap().
by Alexandre Julliard Oct. 15, 2010

Oct. 15, 2010

Module: wine Branch: master Commit: 0749d139b425a7c1477cff2d42c0650bc6c9a52d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0749d139b425a7c1477cff2d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 15 14:35:13 2010 +0200 d3d10core: Implement ID3D10Buffer::Unmap(). --- dlls/d3d10core/buffer.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/buffer.c b/dlls/d3d10core/buffer.c index 4a68299..9230e9d 100644 --- a/dlls/d3d10core/buffer.c +++ b/dlls/d3d10core/buffer.c @@ -138,7 +138,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_Map(ID3D10Buffer *iface, D3D10_MAP static void STDMETHODCALLTYPE d3d10_buffer_Unmap(ID3D10Buffer *iface) { - FIXME("iface %p stub!\n", iface); + TRACE("iface %p.\n", iface); + + IWineD3DBuffer_Unmap(((struct d3d10_buffer *)iface)->wined3d_buffer); } static void STDMETHODCALLTYPE d3d10_buffer_GetDesc(ID3D10Buffer *iface, D3D10_BUFFER_DESC *desc)

1 0

Henri Verbeet : d3dcompiler: Remove some stray tabs.
by Alexandre Julliard Oct. 15, 2010

Oct. 15, 2010

Module: wine Branch: master Commit: ac8f8c02a6ab7118f0ad3e6c752a7601ab22773d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac8f8c02a6ab7118f0ad3e6c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 15 14:35:15 2010 +0200 d3dcompiler: Remove some stray tabs. --- dlls/d3dcompiler_43/asmparser.c | 13 +++++++------ dlls/d3dcompiler_43/asmshader.y | 2 +- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/d3dcompiler_43/asmparser.c b/dlls/d3dcompiler_43/asmparser.c index 8d65d04..789bdb5 100644 --- a/dlls/d3dcompiler_43/asmparser.c +++ b/dlls/d3dcompiler_43/asmparser.c @@ -161,8 +161,9 @@ static void asmparser_dcl_input_ps_2(struct asm_parser *This, DWORD usage, DWORD } } -static void asmparser_dcl_input_unsupported(struct asm_parser *This, DWORD usage, DWORD num, - DWORD mod, const struct shader_reg *reg) { +static void asmparser_dcl_input_unsupported(struct asm_parser *This, + DWORD usage, DWORD num, DWORD mod, const struct shader_reg *reg) +{ asmparser_message(This, "Line %u: Input declaration unsupported in this shader version\n", This->line_no); set_parse_status(This, PARSE_ERR); } @@ -185,9 +186,9 @@ static void asmparser_dcl_sampler(struct asm_parser *This, DWORD samptype, } } -static void asmparser_dcl_sampler_unsupported(struct asm_parser *This, DWORD samptype, - DWORD mod, DWORD regnum, - unsigned int line_no) { +static void asmparser_dcl_sampler_unsupported(struct asm_parser *This, + DWORD samptype, DWORD mod, DWORD regnum, unsigned int line_no) +{ asmparser_message(This, "Line %u: Sampler declaration unsupported in this shader version\n", This->line_no); set_parse_status(This, PARSE_ERR); } @@ -538,7 +539,7 @@ ns */ return; } /* Use the default handling */ - break; + break; case BWRITERSIO_TEXCOORD: /* texcoord/texcrd are two instructions present only in PS <= 1.3 and PS 1.4 respectively */ if(This->shader->version == BWRITERPS_VERSION(1, 4)) diff --git a/dlls/d3dcompiler_43/asmshader.y b/dlls/d3dcompiler_43/asmshader.y index 5dc0914..4360d9f 100644 --- a/dlls/d3dcompiler_43/asmshader.y +++ b/dlls/d3dcompiler_43/asmshader.y @@ -1053,7 +1053,7 @@ dreg_name: REG_TEMP } | REG_CONSTINT { - asmparser_message(&asm_ctx, "Line %u: Register i%u is not a valid destination register\n", + asmparser_message(&asm_ctx, "Line %u: Register i%u is not a valid destination register\n", asm_ctx.line_no, $1); set_parse_status(&asm_ctx, PARSE_WARN); } diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index a5121fb..9584bd9 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -290,7 +290,7 @@ typedef void (*instr_writer)(struct bc_writer *This, struct bytecode_backend { void (*header)(struct bc_writer *This, const struct bwriter_shader *shader, - struct bytecode_buffer *buffer); + struct bytecode_buffer *buffer); void (*end)(struct bc_writer *This, const struct bwriter_shader *shader, struct bytecode_buffer *buffer); void (*srcreg)(struct bc_writer *This, const struct shader_reg *reg,

1 0

Jacek Caban : exdisp.idl: Added missing declarations.
by Alexandre Julliard Oct. 15, 2010

Oct. 15, 2010

Module: wine Branch: master Commit: 70c937f7a7f81326bb2e83455d31fd26466a76be URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c937f7a7f81326bb2e83455… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 15 14:16:55 2010 +0200 exdisp.idl: Added missing declarations. --- include/exdisp.idl | 71 +++++++++++++++++++++++++++++++++++++++++++++++++--- include/exdispid.h | 31 ++++++++++++++++++++++- 2 files changed, 97 insertions(+), 5 deletions(-) diff --git a/include/exdisp.idl b/include/exdisp.idl index 808663e..54dd1df 100644 --- a/include/exdisp.idl +++ b/include/exdisp.idl @@ -409,7 +409,9 @@ dispinterface DWebBrowserEvents2 void SetSecureLockIcon([in] long SecureLockIcon); [id(DISPID_FILEDOWNLOAD)] - void FileDownload([in, out] VARIANT_BOOL* Cancel); + void FileDownload( + [in] VARIANT_BOOL ActiveDocument, + [in, out] VARIANT_BOOL *Cancel); [id(DISPID_NAVIGATEERROR)] void NavigateError( @@ -525,7 +527,8 @@ enum ShellWindowTypeConstants { SWC_EXPLORER = 0, SWC_BROWSER = 1, SWC_3RDPARTY = 2, - SWC_CALLBACK = 4 + SWC_CALLBACK = 4, + SWC_DESKTOP = 8 } ShellWindowTypeConstants; typedef @@ -658,10 +661,69 @@ interface IShellUIHelper : IDispatch { } [ + uuid(a7fe6eda-1932-4281-b881-87b31b8bc52c), + oleautomation, + dual +] +interface IShellUIHelper2 : IShellUIHelper { + [id(DISPID_ADDSEARCHPROVIDER)] + HRESULT AddSearchProvider([in] BSTR URL); + + [id(DISPID_RUNONCESHOWN)] + HRESULT RunOnceShown(); + + [id(DISPID_SKIPRUNONCE)] + HRESULT SkipRunOnce(); + + [id(DISPID_CUSTOMIZESETTINGS)] HRESULT CustomizeSettings( + [in] VARIANT_BOOL fSQM, + [in] VARIANT_BOOL fPhishing, + [in] BSTR bstrLocale); + + [id(DISPID_SQMENABLED)] + HRESULT SqmEnabled([out, retval] VARIANT_BOOL *pfEnabled); + + [id(DISPID_PHISHINGENABLED)] + HRESULT PhishingEnabled([out, retval] VARIANT_BOOL *pfEnabled); + + [id(DISPID_BRANDIMAGEURI)] + HRESULT BrandImageUri([out, retval] BSTR *pbstrUri); + + [id(DISPID_SKIPTABSWELCOME)] + HRESULT SkipTabsWelcome(); + + [id(DISPID_DIAGNOSECONNECTION)] + HRESULT DiagnoseConnection(); + + [id(DISPID_CUSTOMIZECLEARTYPE)] + HRESULT CustomizeClearType([in] VARIANT_BOOL fSet); + + [id(DISPID_ISSEARCHPROVIDERINSTALLED)] + HRESULT IsSearchProviderInstalled( + [in] BSTR URL, + [out, retval] DWORD *pdwResult); + + [id(DISPID_ISSEARCHMIGRATED)] + HRESULT IsSearchMigrated([out, retval] VARIANT_BOOL *pfMigrated); + + [id(DISPID_DEFAULTSEARCHPROVIDER)] + HRESULT DefaultSearchProvider([out, retval] BSTR *pbstrName); + + [id(DISPID_RUNONCEREQUIREDSETTINGSCOMPLETE)] + HRESULT RunOnceRequiredSettingsComplete([in] VARIANT_BOOL fComplete); + + [id(DISPID_RUNONCEHASSHOWN)] + HRESULT RunOnceHasShown([out, retval] VARIANT_BOOL *pfShown); + + [id(DISPID_SEARCHGUIDEURL)] + HRESULT SearchGuideUrl([out, retval] BSTR *pbstrUrl); +} + +[ uuid(64ab4bb7-111e-11d1-8f79-00c04fc2fbe1) ] coclass ShellUIHelper { - [default] interface IShellUIHelper; + [default] interface IShellUIHelper2; } [ @@ -789,7 +851,8 @@ interface IScriptErrorList : IDispatch { [ uuid(efd01300-160f-11d2-bb2e-00805ff7efca), - hidden + hidden, + noncreatable ] coclass CScriptErrorList { [default] interface IScriptErrorList; diff --git a/include/exdispid.h b/include/exdispid.h index 232cee6..012f704 100644 --- a/include/exdispid.h +++ b/include/exdispid.h @@ -91,7 +91,36 @@ #define DISPID_AUTOSCAN 11 #define DISPID_AUTOCOMPLETEATTACH 12 #define DISPID_SHOWBROWSERUI 13 -#define DISPID_SHELLUIHELPERLAST 13 +#define DISPID_ADDSEARCHPROVIDER 14 +#define DISPID_RUNONCESHOWN 15 +#define DISPID_SKIPRUNONCE 16 +#define DISPID_CUSTOMIZESETTINGS 17 +#define DISPID_SQMENABLED 18 +#define DISPID_PHISHINGENABLED 19 +#define DISPID_BRANDIMAGEURI 20 +#define DISPID_SKIPTABSWELCOME 21 +#define DISPID_DIAGNOSECONNECTION 22 +#define DISPID_CUSTOMIZECLEARTYPE 23 +#define DISPID_ISSEARCHPROVIDERINSTALLED 24 +#define DISPID_ISSEARCHMIGRATED 25 +#define DISPID_DEFAULTSEARCHPROVIDER 26 +#define DISPID_RUNONCEREQUIREDSETTINGSCOMPLETE 27 +#define DISPID_RUNONCEHASSHOWN 28 +#define DISPID_SEARCHGUIDEURL 29 +#define DISPID_ADDSERVICE 30 +#define DISPID_ISSERVICEINSTALLED 31 +#define DISPID_ADDTOFAVORITESBAR 32 +#define DISPID_BUILDNEWTABPAGE 33 +#define DISPID_SETRECENTLYCLOSEDVISIBLE 34 +#define DISPID_SETACTIVITIESVISIBLE 35 +#define DISPID_CONTENTDISCOVERYRESET 36 +#define DISPID_INPRIVATEFILTERINGENABLED 37 +#define DISPID_SUGGESTEDSITESENABLED 38 +#define DISPID_ENABLESUGGESTEDSITES 39 +#define DISPID_NAVIGATETOSUGGESTEDSITES 40 +#define DISPID_SHOWTABSHELP 41 +#define DISPID_SHOWINPRIVATEHELP 42 +#define DISPID_SHELLUIHELPERLAST 43 #define DISPID_ADVANCEERROR 10 #define DISPID_RETREATERROR 11

1 0

Henri Verbeet : d3d10core: Implement ID3D10Buffer::Map().
by Alexandre Julliard Oct. 15, 2010

Oct. 15, 2010

Module: wine Branch: master Commit: 8ebc1800557e2316a24c6e4c75b8e6373a203479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ebc1800557e2316a24c6e4c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 15 14:35:14 2010 +0200 d3d10core: Implement ID3D10Buffer::Map(). --- dlls/d3d10core/buffer.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/buffer.c b/dlls/d3d10core/buffer.c index 9230e9d..8d8e0e0 100644 --- a/dlls/d3d10core/buffer.c +++ b/dlls/d3d10core/buffer.c @@ -131,9 +131,16 @@ static UINT STDMETHODCALLTYPE d3d10_buffer_GetEvictionPriority(ID3D10Buffer *ifa static HRESULT STDMETHODCALLTYPE d3d10_buffer_Map(ID3D10Buffer *iface, D3D10_MAP map_type, UINT map_flags, void **data) { - FIXME("iface %p, map_type %u, map_flags %#x, data %p stub!\n", iface, map_type, map_flags, data); + struct d3d10_buffer *buffer = (struct d3d10_buffer *)iface; - return E_NOTIMPL; + TRACE("iface %p, map_type %u, map_flags %#x, data %p.\n", iface, map_type, map_flags, data); + + 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); + + return IWineD3DBuffer_Map(buffer->wined3d_buffer, 0, 0, (BYTE **)data, 0); } static void STDMETHODCALLTYPE d3d10_buffer_Unmap(ID3D10Buffer *iface)

1 0

Henri Verbeet : wined3d: IWineD3DBuffer_Unmap() can't fail.
by Alexandre Julliard Oct. 15, 2010

Oct. 15, 2010

Module: wine Branch: master Commit: 70f4e66f84b0a3e027b8d71c254ea32df810546b URL: http://source.winehq.org/git/wine.git/?a=commit;h=70f4e66f84b0a3e027b8d71c2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 15 14:35:12 2010 +0200 wined3d: IWineD3DBuffer_Unmap() can't fail. --- dlls/d3d8/buffer.c | 12 ++++-------- dlls/d3d9/buffer.c | 12 ++++-------- dlls/ddraw/device.c | 8 +------- dlls/ddraw/vertexbuffer.c | 5 ++--- dlls/wined3d/buffer.c | 19 +++++-------------- include/wine/wined3d.idl | 2 +- 6 files changed, 17 insertions(+), 41 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index f7dc12d..e2a026b 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -197,15 +197,13 @@ static HRESULT WINAPI d3d8_vertexbuffer_Lock(IDirect3DVertexBuffer8 *iface, static HRESULT WINAPI d3d8_vertexbuffer_Unlock(IDirect3DVertexBuffer8 *iface) { - HRESULT hr; - TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = IWineD3DBuffer_Unmap(((IDirect3DVertexBuffer8Impl *)iface)->wineD3DVertexBuffer); + IWineD3DBuffer_Unmap(((IDirect3DVertexBuffer8Impl *)iface)->wineD3DVertexBuffer); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_vertexbuffer_GetDesc(IDirect3DVertexBuffer8 *iface, D3DVERTEXBUFFER_DESC *desc) @@ -461,15 +459,13 @@ static HRESULT WINAPI d3d8_indexbuffer_Lock(IDirect3DIndexBuffer8 *iface, static HRESULT WINAPI d3d8_indexbuffer_Unlock(IDirect3DIndexBuffer8 *iface) { - HRESULT hr; - TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = IWineD3DBuffer_Unmap(((IDirect3DIndexBuffer8Impl *)iface)->wineD3DIndexBuffer); + IWineD3DBuffer_Unmap(((IDirect3DIndexBuffer8Impl *)iface)->wineD3DIndexBuffer); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_indexbuffer_GetDesc(IDirect3DIndexBuffer8 *iface, D3DINDEXBUFFER_DESC *desc) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index ac8c244..231e0c8 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -199,15 +199,13 @@ static HRESULT WINAPI d3d9_vertexbuffer_Lock(IDirect3DVertexBuffer9 *iface, static HRESULT WINAPI d3d9_vertexbuffer_Unlock(IDirect3DVertexBuffer9 *iface) { - HRESULT hr; - TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = IWineD3DBuffer_Unmap(((IDirect3DVertexBuffer9Impl *)iface)->wineD3DVertexBuffer); + IWineD3DBuffer_Unmap(((IDirect3DVertexBuffer9Impl *)iface)->wineD3DVertexBuffer); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_vertexbuffer_GetDesc(IDirect3DVertexBuffer9 *iface, D3DVERTEXBUFFER_DESC *desc) @@ -463,15 +461,13 @@ static HRESULT WINAPI d3d9_indexbuffer_Lock(IDirect3DIndexBuffer9 *iface, static HRESULT WINAPI d3d9_indexbuffer_Unlock(IDirect3DIndexBuffer9 *iface) { - HRESULT hr; - TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = IWineD3DBuffer_Unmap(((IDirect3DIndexBuffer9Impl *)iface)->wineD3DIndexBuffer); + IWineD3DBuffer_Unmap(((IDirect3DIndexBuffer9Impl *)iface)->wineD3DIndexBuffer); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_indexbuffer_GetDesc(IDirect3DIndexBuffer9 *iface, D3DINDEXBUFFER_DESC *desc) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 720aaa0..7976ecb 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4364,13 +4364,7 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, return hr; } memcpy(LockedIndices, Indices, IndexCount * sizeof(WORD)); - hr = IWineD3DBuffer_Unmap(This->indexbuffer); - if(hr != D3D_OK) - { - ERR("(%p) IWineD3DBuffer::Unmap failed with hr = %08x\n", This, hr); - LeaveCriticalSection(&ddraw_cs); - return hr; - } + IWineD3DBuffer_Unmap(This->indexbuffer); /* Set the index stream */ IWineD3DDevice_SetBaseVertexIndex(This->wineD3DDevice, StartVertex); diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 36087f2..a001b03 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -266,15 +266,14 @@ static HRESULT WINAPI IDirect3DVertexBufferImpl_Unlock(IDirect3DVertexBuffer7 *iface) { IDirect3DVertexBufferImpl *This = (IDirect3DVertexBufferImpl *)iface; - HRESULT hr; TRACE("iface %p.\n", iface); EnterCriticalSection(&ddraw_cs); - hr = IWineD3DBuffer_Unmap(This->wineD3DVertexBuffer); + IWineD3DBuffer_Unmap(This->wineD3DVertexBuffer); LeaveCriticalSection(&ddraw_cs); - return hr; + return D3D_OK; } static HRESULT WINAPI diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 23b4a4a..2306d1f 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1338,7 +1338,7 @@ static HRESULT STDMETHODCALLTYPE buffer_Map(IWineD3DBuffer *iface, UINT offset, return WINED3D_OK; } -static HRESULT STDMETHODCALLTYPE buffer_Unmap(IWineD3DBuffer *iface) +static void STDMETHODCALLTYPE buffer_Unmap(IWineD3DBuffer *iface) { struct wined3d_buffer *This = (struct wined3d_buffer *)iface; ULONG i; @@ -1351,15 +1351,15 @@ static HRESULT STDMETHODCALLTYPE buffer_Unmap(IWineD3DBuffer *iface) * the next call (this will happen if the lock_count is < 0). */ if (!This->lock_count) { - TRACE("Unmap called without a previous Map call!\n"); - return WINED3D_OK; + WARN("Unmap called without a previous Map call.\n"); + return; } if (InterlockedDecrement(&This->lock_count)) { /* Delay loading the buffer until everything is unlocked */ TRACE("Ignoring unlock\n"); - return WINED3D_OK; + return; } if(!(This->flags & WINED3D_BUFFER_DOUBLEBUFFER) && This->buffer_object) @@ -1410,8 +1410,6 @@ static HRESULT STDMETHODCALLTYPE buffer_Unmap(IWineD3DBuffer *iface) { buffer_PreLoad(iface); } - - return WINED3D_OK; } static void STDMETHODCALLTYPE buffer_GetDesc(IWineD3DBuffer *iface, WINED3DBUFFER_DESC *desc) @@ -1520,14 +1518,7 @@ HRESULT buffer_init(struct wined3d_buffer *buffer, IWineD3DDeviceImpl *device, memcpy(ptr, data, size); - hr = IWineD3DBuffer_Unmap((IWineD3DBuffer *)buffer); - if (FAILED(hr)) - { - ERR("Failed to unmap buffer, hr %#x\n", hr); - buffer_UnLoad((IWineD3DBuffer *)buffer); - resource_cleanup((IWineD3DResource *)buffer); - return hr; - } + IWineD3DBuffer_Unmap((IWineD3DBuffer *)buffer); } buffer->maps = HeapAlloc(GetProcessHeap(), 0, sizeof(*buffer->maps)); diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index e024940..fda722a 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2731,7 +2731,7 @@ interface IWineD3DBuffer : IWineD3DResource [out] BYTE **data, [in] DWORD flags ); - HRESULT Unmap( + void Unmap( ); void GetDesc( [out] WINED3DBUFFER_DESC *desc

1 0

Alexandre Julliard : winhlp32: Use a standard About dialog, with the proper icon.
by Alexandre Julliard Oct. 15, 2010

Oct. 15, 2010

Module: wine Branch: master Commit: 5d69141014d698497a5427a6ce16ebbed09bc852 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d69141014d698497a5427a6c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 15 12:13:13 2010 +0200 winhlp32: Use a standard About dialog, with the proper icon. --- programs/winhlp32/Bg.rc | 3 --- programs/winhlp32/Cs.rc | 3 --- programs/winhlp32/Da.rc | 3 --- programs/winhlp32/De.rc | 3 --- programs/winhlp32/En.rc | 10 ++-------- programs/winhlp32/Eo.rc | 3 --- programs/winhlp32/Es.rc | 3 --- programs/winhlp32/Fi.rc | 3 --- programs/winhlp32/Fr.rc | 5 +---- programs/winhlp32/He.rc | 3 --- programs/winhlp32/Hu.rc | 3 --- programs/winhlp32/It.rc | 3 --- programs/winhlp32/Ja.rc | 3 --- programs/winhlp32/Ko.rc | 3 --- programs/winhlp32/Lt.rc | 3 --- programs/winhlp32/Makefile.in | 2 -- programs/winhlp32/Nl.rc | 3 --- programs/winhlp32/No.rc | 3 --- programs/winhlp32/Pl.rc | 3 --- programs/winhlp32/Pt.rc | 6 ------ programs/winhlp32/Rm.rc | 3 --- programs/winhlp32/Ro.rc | 3 --- programs/winhlp32/Ru.rc | 3 --- programs/winhlp32/Si.rc | 3 --- programs/winhlp32/Sk.rc | 3 --- programs/winhlp32/Sr.rc | 3 --- programs/winhlp32/Sv.rc | 3 --- programs/winhlp32/Tr.rc | 3 --- programs/winhlp32/Uk.rc | 3 --- programs/winhlp32/Wa.rc | 3 --- programs/winhlp32/Zh.rc | 6 ------ programs/winhlp32/macro.c | 6 +++++- programs/winhlp32/winhelp.c | 1 - programs/winhlp32/winhelp_res.h | 1 - 34 files changed, 8 insertions(+), 107 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5d69141014d698497a542…

1 0

Trygve Vea : cryptdlg: Updated Norwegian translation.
by Alexandre Julliard Oct. 15, 2010

Oct. 15, 2010

Module: wine Branch: master Commit: 6bf2875c6ed28bea03fbc27a88ec7851e2f2ab1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bf2875c6ed28bea03fbc27a8… Author: Trygve Vea <trygve.vea(a)gmail.com> Date: Fri Oct 15 06:53:54 2010 +0200 cryptdlg: Updated Norwegian translation. --- dlls/cryptdlg/cryptdlg_No.rc | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/cryptdlg/cryptdlg_No.rc b/dlls/cryptdlg/cryptdlg_No.rc index 670a247..520f8ea 100644 --- a/dlls/cryptdlg/cryptdlg_No.rc +++ b/dlls/cryptdlg/cryptdlg_No.rc @@ -2,6 +2,7 @@ * cryptdlg dll resources (Norwegian Bokmål) * * Copyright 2010 Alexander N. Sørnes <alex(a)thehandofagony.com> + * Copyright 2010 Trygve Vea <trygve.vea(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,9 +27,9 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE { - IDS_CERT_POLICY "Sertifikatpolitikk" - IDS_POLICY_ID "Politikk-ID: " - IDS_POLICY_QUALIFIER_INFO "Info om politikkvalifisering" + IDS_CERT_POLICY "Sertifikatregel" + IDS_POLICY_ID "Regel-ID: " + IDS_POLICY_QUALIFIER_INFO "Info om regelkvalifisering" IDS_POLICY_QUALIFIER_ID "Kvalifiserings-ID=" IDS_CPS "CPS" /* Certification Practice Statement */ IDS_USER_NOTICE "Brukernotis"

1 0

Trygve Vea : crypt32: Updated Norwegian translation.
by Alexandre Julliard Oct. 15, 2010

Oct. 15, 2010

Module: wine Branch: master Commit: fe8a5ac44d744288589d14203ee4f80cafb12daa URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe8a5ac44d744288589d14203… Author: Trygve Vea <trygve.vea(a)gmail.com> Date: Fri Oct 15 06:49:55 2010 +0200 crypt32: Updated Norwegian translation. --- dlls/crypt32/crypt32_No.rc | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/crypt32_No.rc b/dlls/crypt32/crypt32_No.rc index be6b994..bcafb95 100644 --- a/dlls/crypt32/crypt32_No.rc +++ b/dlls/crypt32/crypt32_No.rc @@ -2,6 +2,7 @@ * crypt32 dll resources * * Copyright (C) 2006-2009 Alexander N. Sørnes <alex(a)thehandofagony.com> + * Copyright (C) 2010 Trygve Vea <trygve.vea(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,14 +27,14 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE { - IDS_AUTHORITY_KEY_ID "Identifiserer for autentiseringsnøkkel" + IDS_AUTHORITY_KEY_ID "Identifikator for autentiseringsnøkkel" IDS_KEY_ATTRIBUTES "Nøkkelegenskaper" IDS_KEY_USAGE_RESTRICTION "Begrensning av nøkkelbruk" IDS_SUBJECT_ALT_NAME "Alternativt navn for emne" IDS_ISSUER_ALT_NAME "Alternativt navn for utsteder" IDS_BASIC_CONSTRAINTS "Basisbegrensninger" IDS_KEY_USAGE "Nøkkelbruk" - IDS_CERT_POLICIES "Sertifikatholdninger" + IDS_CERT_POLICIES "Sertifikatregler" IDS_SUBJECT_KEY_IDENTIFIER "Identifiserer for emnenøkkel" IDS_CRL_REASON_CODE "CRL-grunnkode" IDS_CRL_DIST_POINTS "CRL-distribusjonspunkter" @@ -41,7 +42,7 @@ STRINGTABLE IDS_AUTHORITY_INFO_ACCESS "Myndighet-informasjonstilgang" IDS_CERT_EXTENSIONS "Sertifikatutvidelser" IDS_NEXT_UPDATE_LOCATION "Neste oppdateringsplassering" - IDS_YES_OR_NO_TRUST "Ja eller nei tillit" + IDS_YES_OR_NO_TRUST "Ja eller nei-tillit" IDS_EMAIL_ADDRESS "E-postadresse" IDS_UNSTRUCTURED_NAME "Ustrukturert navn" IDS_CONTENT_TYPE "Innholdstype"

1 0

Alexandre Julliard : gdi32/tests: Make the test clipping window topmost to see if it helps.
by Alexandre Julliard Oct. 15, 2010

Oct. 15, 2010

Module: wine Branch: master Commit: 295682f35c30f7b22bae0b6d3c02638ef4899f65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=295682f35c30f7b22bae0b6d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 15 12:19:24 2010 +0200 gdi32/tests: Make the test clipping window topmost to see if it helps. --- dlls/gdi32/tests/clipping.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index 0bca179..641beac 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -35,7 +35,8 @@ static void test_GetRandomRgn(void) ok( hwnd != 0, "CreateWindow failed\n" ); SetRect(&window_rc, 400, 300, 500, 400); - MoveWindow(hwnd, window_rc.left, window_rc.top, window_rc.right - window_rc.left, window_rc.bottom - window_rc.top, FALSE); + SetWindowPos(hwnd, HWND_TOPMOST, window_rc.left, window_rc.top, + window_rc.right - window_rc.left, window_rc.bottom - window_rc.top, 0 ); hdc = GetDC(hwnd); ret = GetRandomRgn(hdc, hrgn, 1);

1 0

Rico Schüller : d3d10: Forward D3D10GetShaderDebugInfo () to d3dcompiler.
by Alexandre Julliard Oct. 15, 2010

Oct. 15, 2010

Module: wine Branch: master Commit: 9e0f26cdd636fa69f1d9fca49ab9f8cd6ed47199 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e0f26cdd636fa69f1d9fca49… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 14 21:04:54 2010 +0200 d3d10: Forward D3D10GetShaderDebugInfo() to d3dcompiler. --- dlls/d3d10/d3d10.spec | 2 +- include/d3d10shader.h | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10.spec b/dlls/d3d10/d3d10.spec index 121df17..94e2424 100644 --- a/dlls/d3d10/d3d10.spec +++ b/dlls/d3d10/d3d10.spec @@ -13,7 +13,7 @@ @ stdcall D3D10GetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob @ stdcall D3D10GetOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetOutputSignatureBlob @ stdcall D3D10GetPixelShaderProfile(ptr) -@ stub D3D10GetShaderDebugInfo +@ stdcall D3D10GetShaderDebugInfo(ptr long ptr) d3dcompiler_43.D3DGetDebugInfo @ stub D3D10GetVersion @ stdcall D3D10GetVertexShaderProfile(ptr) @ stub D3D10PreprocessShader diff --git a/include/d3d10shader.h b/include/d3d10shader.h index cf61f9d..316f3ca 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -293,5 +293,6 @@ HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10Shad HRESULT WINAPI D3D10GetInputSignatureBlob(const void *data, SIZE_T data_size, ID3D10Blob **blob); HRESULT WINAPI D3D10GetOutputSignatureBlob(const void *data, SIZE_T data_size, ID3D10Blob **blob); HRESULT WINAPI D3D10GetInputAndOutputSignatureBlob(const void *data, SIZE_T data_size, ID3D10Blob **blob); +HRESULT WINAPI D3D10GetShaderDebugInfo(const void *data, SIZE_T data_size, ID3D10Blob **blob); #endif /* __WINE_D3D10SHADER_H */

1 0