wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Nikolay Sivov : wshom: Fix refcount for typeinfo pointers.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 13d99144bdb256a7ff7fc377955c8d1253d667fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=13d99144bdb256a7ff7fc3779… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 29 07:26:41 2012 -0500 wshom: Fix refcount for typeinfo pointers. --- dlls/wshom.ocx/wshom_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wshom.ocx/wshom_main.c b/dlls/wshom.ocx/wshom_main.c index 1c6bb44..c253b61 100644 --- a/dlls/wshom.ocx/wshom_main.c +++ b/dlls/wshom.ocx/wshom_main.c @@ -77,6 +77,7 @@ HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) } *typeinfo = typeinfos[tid]; + ITypeInfo_AddRef(*typeinfo); return S_OK; }

1 0

Henri Verbeet : wined3d: Fix a typo in wined3d_device_set_stream_output().
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 56b3953207a8afa2f54f59d339714cb9a6410e2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b3953207a8afa2f54f59d33… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 28 22:11:48 2012 +0100 wined3d: Fix a typo in wined3d_device_set_stream_output(). --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 713e959..c52882b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1581,7 +1581,7 @@ void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT if (buffer) wined3d_buffer_incref(buffer); if (prev_buffer) - wined3d_buffer_decref(buffer); + wined3d_buffer_decref(prev_buffer); return; }

1 0

Henri Verbeet : wined3d: Also unbind stream outputs and the geometry shader in stateblock_unbind_resources ().
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 5d9d20ee0ef1ea7d4269fc12a79f80621dc5dffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d9d20ee0ef1ea7d4269fc12a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 28 22:11:47 2012 +0100 wined3d: Also unbind stream outputs and the geometry shader in stateblock_unbind_resources(). --- dlls/wined3d/stateblock.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index c399bad..9b71486 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -491,6 +491,15 @@ void stateblock_unbind_resources(struct wined3d_stateblock *stateblock) } } + for (i = 0; i < MAX_STREAM_OUT; ++i) + { + if ((buffer = state->stream_output[i].buffer)) + { + state->stream_output[i].buffer = NULL; + wined3d_buffer_decref(buffer); + } + } + for (i = 0; i < MAX_STREAMS; ++i) { if ((buffer = state->streams[i].buffer)) @@ -512,6 +521,12 @@ void stateblock_unbind_resources(struct wined3d_stateblock *stateblock) wined3d_shader_decref(shader); } + if ((shader = state->geometry_shader)) + { + state->geometry_shader = NULL; + wined3d_shader_decref(shader); + } + if ((shader = state->pixel_shader)) { state->pixel_shader = NULL;

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXMATRIXSTACK.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 8c94757c2b6d84110b7fdc82125053e8f44fa236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c94757c2b6d84110b7fdc821… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 28 22:11:46 2012 +0100 d3dx9: Avoid LPD3DXMATRIXSTACK. --- dlls/d3dx9_36/math.c | 2 +- include/d3dx9math.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 12073e3..e09dbec 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -877,7 +877,7 @@ D3DXMATRIX* WINAPI D3DXMatrixTranspose(D3DXMATRIX *pout, CONST D3DXMATRIX *pm) static const unsigned int INITIAL_STACK_SIZE = 32; -HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, LPD3DXMATRIXSTACK *ppstack) +HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, ID3DXMatrixStack **ppstack) { struct ID3DXMatrixStackImpl *object; diff --git a/include/d3dx9math.h b/include/d3dx9math.h index 0f5dc7c..769e086 100644 --- a/include/d3dx9math.h +++ b/include/d3dx9math.h @@ -451,7 +451,7 @@ DECLARE_INTERFACE_(ID3DXMatrixStack, IUnknown) extern "C" { #endif -HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, LPD3DXMATRIXSTACK* ppstack); +HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, ID3DXMatrixStack **stack); #ifdef __cplusplus }

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXBASEMESH.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: d608de9341ccd75c0a6ce36901bf2cc806487338 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d608de9341ccd75c0a6ce3690… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 28 22:11:45 2012 +0100 d3dx9: Avoid LPD3DXBASEMESH. --- include/d3dx9mesh.h | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 76e7179..21261ab 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -782,7 +782,7 @@ HRESULT WINAPI D3DXComputeIMTFromSignal(ID3DXMesh *mesh, DWORD texture_idx, UINT LPD3DXUVATLASCB status_cb, void *status_ctx, ID3DXBuffer **buffer); HRESULT WINAPI D3DXComputeIMTFromTexture(struct ID3DXMesh *mesh, struct IDirect3DTexture9 *texture, DWORD texture_idx, DWORD options, LPD3DXUVATLASCB cb, void *ctx, struct ID3DXBuffer **out); -HRESULT WINAPI D3DXComputeNormals(LPD3DXBASEMESH, CONST DWORD *); +HRESULT WINAPI D3DXComputeNormals(ID3DXBaseMesh *mesh, const DWORD *adjacency); HRESULT WINAPI D3DXComputeTangentFrameEx(ID3DXMesh *mesh_in, DWORD texture_in_semantic, DWORD texture_in_idx, DWORD u_partial_out_semantic, DWORD u_partial_out_idx, DWORD v_partial_out_semantic, DWORD v_partial_out_idx, DWORD normal_out_semantic, DWORD normal_out_idx, DWORD flags, @@ -801,8 +801,11 @@ HRESULT WINAPI D3DXGenerateOutputDecl(D3DVERTEXELEMENT9 *, CONST D3DVERTEXELEMEN HRESULT WINAPI D3DXGeneratePMesh(ID3DXMesh *mesh, const DWORD *adjacency, const D3DXATTRIBUTEWEIGHTS *attribute_weights, const float *vertex_weights, DWORD min_value, DWORD flags, ID3DXPMesh **pmesh); -HRESULT WINAPI D3DXIntersect(LPD3DXBASEMESH, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, BOOL *, DWORD *, FLOAT *, FLOAT *, FLOAT *, LPD3DXBUFFER *, DWORD *); -HRESULT WINAPI D3DXIntersectSubset(LPD3DXBASEMESH, DWORD, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, BOOL *, DWORD *, FLOAT *, FLOAT *, FLOAT *, LPD3DXBUFFER *, DWORD *); +HRESULT WINAPI D3DXIntersect(ID3DXBaseMesh *mesh, const D3DXVECTOR3 *ray_position, const D3DXVECTOR3 *ray_direction, + BOOL *hit, DWORD *face_idx, float *u, float *v, float *distance, ID3DXBuffer **hits, DWORD *hit_count); +HRESULT WINAPI D3DXIntersectSubset(ID3DXBaseMesh *mesh, DWORD attribute_id, const D3DXVECTOR3 *ray_position, + const D3DXVECTOR3 *ray_direction, BOOL *hit, DWORD *face_idx, float *u, float *v, float *distance, + ID3DXBuffer **hits, DWORD *hit_count); BOOL WINAPI D3DXIntersectTri(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3*, FLOAT *, FLOAT *, FLOAT *); HRESULT WINAPI D3DXOptimizeFaces(LPCVOID, UINT, UINT, BOOL, DWORD *); HRESULT WINAPI D3DXOptimizeVertices(LPCVOID, UINT, UINT, BOOL, DWORD *);

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXMESH.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: d480f9e1a8c03029efa6604abe76d6873c75337c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d480f9e1a8c03029efa6604ab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 28 22:11:44 2012 +0100 d3dx9: Avoid LPD3DXMESH. --- dlls/d3dx9_36/mesh.c | 19 ++++------ dlls/d3dx9_36/skin.c | 16 ++++---- include/d3dx9anim.h | 2 +- include/d3dx9mesh.h | 91 +++++++++++++++++++++++++++++++++----------------- 4 files changed, 76 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d480f9e1a8c03029efa66…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 04bcba1c3ed777e23975bfe147087f28d257235b URL: http://source.winehq.org/git/wine.git/?a=commit;h=04bcba1c3ed777e23975bfe14… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Nov 28 22:48:10 2012 +0200 po: Update Lithuanian translation. --- po/lt.po | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index 0939da1..2f02cab 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-11-03 18:42+0300\n" +"PO-Revision-Date: 2012-11-28 22:47+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -10101,10 +10101,8 @@ msgid "Wine Command Prompt" msgstr "Wine komandų interpretatorius" #: cmd.rc:349 -#, fuzzy -#| msgid "CMD Version %1!S!\n" msgid "Wine CMD Version %1!S!\n" -msgstr "CMD versija %1!S!\n" +msgstr "Wine CMD versija %1!S!\n" #: cmd.rc:350 msgid "More? "

1 0

Andrew Talbot : shdocvw: Remove unused variable.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: acb1d678a982972255980628772330e23a9768a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acb1d678a9829722559806287… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 28 20:37:23 2012 +0000 shdocvw: Remove unused variable. --- dlls/shdocvw/shdocvw.h | 2 -- dlls/shdocvw/shdocvw_main.c | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index e741482..341cdc5 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -50,8 +50,6 @@ extern LONG SHDOCVW_refCount DECLSPEC_HIDDEN; static inline void SHDOCVW_LockModule(void) { InterlockedIncrement( &SHDOCVW_refCount ); } static inline void SHDOCVW_UnlockModule(void) { InterlockedDecrement( &SHDOCVW_refCount ); } -extern HINSTANCE shdocvw_hinstance DECLSPEC_HIDDEN; - /* memory allocation functions */ diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index db9034c..be1588c 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -41,7 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); LONG SHDOCVW_refCount = 0; -HINSTANCE shdocvw_hinstance = 0; static HMODULE SHDOCVW_hshell32 = 0; static HINSTANCE ieframe_instance; @@ -148,7 +147,6 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) switch (fdwReason) { case DLL_PROCESS_ATTACH: - shdocvw_hinstance = hinst; break; case DLL_PROCESS_DETACH: if (SHDOCVW_hshell32) FreeLibrary(SHDOCVW_hshell32);

1 0

Andrew Talbot : uxtheme: Remove unused variable.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 925a4411e8dac1e3fd9ff3c81736a2324d50b87c URL: http://source.winehq.org/git/wine.git/?a=commit;h=925a4411e8dac1e3fd9ff3c81… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 28 20:37:26 2012 +0000 uxtheme: Remove unused variable. --- dlls/uxtheme/msstyles.c | 1 - dlls/uxtheme/system.c | 3 --- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 0adb70d..8205a12 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -48,7 +48,6 @@ static BOOL MSSTYLES_GetNextToken(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LP static void MSSTYLES_ParseThemeIni(PTHEME_FILE tf, BOOL setMetrics); static HRESULT MSSTYLES_GetFont (LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LOGFONTW* logfont); -extern HINSTANCE hDllInst; extern int alphaBlendMode; #define MSSTYLES_VERSION 0x0003 diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 6ee1dac..8947587 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -57,7 +57,6 @@ static const WCHAR szDllName[] = {'D','l','l','N','a','m','e','\0'}; static const WCHAR szIniDocumentation[] = {'d','o','c','u','m','e','n','t','a','t','i','o','n','\0'}; -DECLSPEC_HIDDEN HINSTANCE hDllInst; DECLSPEC_HIDDEN ATOM atDialogThemeEnabled; static DWORD dwThemeAppProperties = STAP_ALLOW_NONCLIENT | STAP_ALLOW_CONTROLS; @@ -537,8 +536,6 @@ void UXTHEME_InitSystem(HINSTANCE hInst) 'u','x','_','d','i','a','l','o','g','t','h','e','m','e','\0' }; - hDllInst = hInst; - atWindowTheme = GlobalAddAtomW(szWindowTheme); atSubAppName = GlobalAddAtomW(szSubAppName); atSubIdList = GlobalAddAtomW(szSubIdList);

1 0

Andrew Talbot : winex11.drv: Remove unused variable.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 00360e7c03acc63c619573e1c706f7952f44a917 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00360e7c03acc63c619573e1c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 28 20:37:30 2012 +0000 winex11.drv: Remove unused variable. --- dlls/winex11.drv/palette.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index b9ad599..bd687ca 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -54,7 +54,6 @@ static PALETTEENTRY *COLOR_sysPal; /* current system palette */ static int COLOR_gapStart = 256; static int COLOR_gapEnd = -1; -static int COLOR_gapFilled = 0; UINT16 X11DRV_PALETTE_PaletteFlags = 0; @@ -670,7 +669,6 @@ static void X11DRV_PALETTE_FillDefaultColors( const PALETTEENTRY *sys_pal_templa if( --max <= 0 ) break; } } - COLOR_gapFilled = idx - COLOR_gapStart; } }

1 0

Andrew Talbot : winscard: Remove unused variable.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 960189b5536cafb9d85de77d9345d86ef0f4aedb URL: http://source.winehq.org/git/wine.git/?a=commit;h=960189b5536cafb9d85de77d9… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 28 20:37:33 2012 +0000 winscard: Remove unused variable. --- dlls/winscard/winscard.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index 473d5f3..c57ef49 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -26,7 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winscard); -static HMODULE WINSCARD_hModule; static HANDLE g_startedEvent = NULL; const SCARD_IO_REQUEST g_rgSCardT0Pci = { SCARD_PROTOCOL_T0, 8 }; @@ -43,7 +42,6 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: { DisableThreadLibraryCalls(hinstDLL); - WINSCARD_hModule = hinstDLL; /* FIXME: for now, we act as if the pcsc daemon is always started */ g_startedEvent = CreateEventA(NULL,TRUE,TRUE,NULL); break;

1 0

Andrew Talbot : wtsapi32: Remove unused variable.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: ffb2cae6fc29553d52b4a991ec93fd1633c5dbca URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffb2cae6fc29553d52b4a991e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Nov 28 20:37:39 2012 +0000 wtsapi32: Remove unused variable. --- dlls/wtsapi32/wtsapi32.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 875cfb5..c25f75b 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -25,7 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wtsapi); -static HMODULE WTSAPI32_hModule; BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -35,7 +34,6 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: { DisableThreadLibraryCalls(hinstDLL); - WTSAPI32_hModule = hinstDLL; break; } case DLL_PROCESS_DETACH:

1 0

Alexandre Julliard : setupapi: Load IRegistrar from atl100.dll.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 960f0595b2648f5fdfe253a9df8c0671ab6efb61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=960f0595b2648f5fdfe253a9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 28 21:25:00 2012 +0100 setupapi: Load IRegistrar from atl100.dll. --- dlls/setupapi/fakedll.c | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 7393e40..525f399 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -770,7 +770,7 @@ static BOOL CALLBACK register_resource( HMODULE module, LPCWSTR type, LPWSTR nam static void register_fake_dll( const WCHAR *name, const void *data, size_t size ) { - static const WCHAR atlW[] = {'a','t','l','.','d','l','l',0}; + static const WCHAR atlW[] = {'a','t','l','1','0','0','.','d','l','l',0}; static const WCHAR moduleW[] = {'M','O','D','U','L','E',0}; static const WCHAR regtypeW[] = {'W','I','N','E','_','R','E','G','I','S','T','R','Y',0}; static const WCHAR manifestW[] = {'W','I','N','E','_','M','A','N','I','F','E','S','T',0}; @@ -791,20 +791,14 @@ static void register_fake_dll( const WCHAR *name, const void *data, size_t size if (!registrar) { - /* create the object by hand since we can't guarantee that atl and ole32 are registered */ - IClassFactory *cf; - HRESULT (WINAPI *pDllGetClassObject)( REFCLSID clsid, REFIID iid, LPVOID *ppv ); + HRESULT (WINAPI *pAtlCreateRegistrar)(IRegistrar**); HMODULE atl = LoadLibraryW( atlW ); - if ((pDllGetClassObject = (void *)GetProcAddress( atl, "DllGetClassObject" ))) - { - hr = pDllGetClassObject( &CLSID_Registrar, &IID_IClassFactory, (void **)&cf ); - if (SUCCEEDED( hr )) - { - hr = IClassFactory_CreateInstance( cf, NULL, &IID_IRegistrar, (void **)&registrar ); - IClassFactory_Release( cf ); - } - } + if ((pAtlCreateRegistrar = (void *)GetProcAddress( atl, "AtlCreateRegistrar" ))) + hr = pAtlCreateRegistrar( &registrar ); + else + hr = E_NOINTERFACE; + if (!registrar) { ERR( "failed to create IRegistrar: %x\n", hr );

1 0

Francois Gouget : testbot/TestAgent: Adopt a more client/ server-oriented terminology.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: tools Branch: master Commit: 534b42d9be75c702b5192280bc85815405b9d3a4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=534b42d9be75c702b5192280… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 29 03:59:58 2012 +0100 testbot/TestAgent: Adopt a more client/server-oriented terminology. --- testbot/lib/WineTestBot/TestAgent.pm | 30 +++++++++++++------------- testbot/scripts/TestAgent | 38 +++++++++++++++++----------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index f2fa888..40f1bed 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -137,20 +137,20 @@ sub _Copy($$) sub SendFile($$$) { - my ($Hostname, $HostPathName, $GuestPathName) = @_; - LogMsg "SendFile $HostPathName -> $Hostname $GuestPathName\n"; + my ($Hostname, $LocalPathName, $ServerPathName) = @_; + LogMsg "SendFile $LocalPathName -> $Hostname $ServerPathName\n"; my $fh; - if (!open($fh, "<", $HostPathName)) + if (!open($fh, "<", $LocalPathName)) { - return "unable to open '$HostPathName' for reading: $!"; + return "unable to open '$LocalPathName' for reading: $!"; } my $Err; my $nc = _Connect($Hostname); if ($nc) { - $nc->send("write\n$GuestPathName\n", 0); + $nc->send("write\n$ServerPathName\n", 0); $Err = $! if (!_Copy($fh, $nc)); $nc->shutdown($DONE_WRITING); @@ -170,20 +170,20 @@ sub SendFile($$$) sub GetFile($$$) { - my ($Hostname, $GuestPathName, $HostPathName) = @_; - LogMsg "GetFile $Hostname $GuestPathName -> $HostPathName\n"; + my ($Hostname, $ServerPathName, $LocalPathName) = @_; + LogMsg "GetFile $Hostname $ServerPathName -> $LocalPathName\n"; my $fh; - if (!open($fh, ">", $HostPathName)) + if (!open($fh, ">", $LocalPathName)) { - return "unable to open '$HostPathName' for writing: $!"; + return "unable to open '$LocalPathName' for writing: $!"; } - my ($Err, $GuestSize); + my ($Err, $ServerSize); my $nc = _Connect($Hostname); if ($nc) { - $nc->send("read\n$GuestPathName\n", 0); + $nc->send("read\n$ServerPathName\n", 0); # The status of the open operation is returned first so it does not # get mixed up with the file data. However we must not mix buffered # (<> or read()) and unbuffered (File:Copy::copy()) read operations on @@ -194,7 +194,7 @@ sub GetFile($$$) } elsif ($Err =~ s/^ok: size=(-?[0-9]+)\n//) { - $GuestSize=$1; + $ServerSize = $1; if ($Err ne "" and syswrite($fh, $Err, length($Err)) < 0) { $Err = $!; @@ -211,8 +211,8 @@ sub GetFile($$$) $Err = $@; } close($fh); - my $HostSize=-s $HostPathName; - if (!defined $Err and $HostSize != $GuestSize) + my $LocalSize = -s $LocalPathName; + if (!defined $Err and $LocalSize != $ServerSize) { # Something still went wrong during the transfer. Get the last operation # status @@ -220,7 +220,7 @@ sub GetFile($$$) ($Err, $StatusErr) = GetStatus($Hostname); $Err = $StatusErr if (!defined $StatusErr); } - unlink $HostPathName if ($Err); + unlink $LocalPathName if ($Err); return $Err; } diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index cc823f6..c917b0a 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -1,7 +1,7 @@ #!/usr/bin/perl -w # # This is a testagentd client. It can be used to exchange files or run -# commands on VMs, mostly for testing purposes. +# commands on the testagentd server, mostly for testing purposes. # # Copyright 2012 Francois Gouget # @@ -42,7 +42,7 @@ sub error(@) print STDERR "$name0:error: ", @_; } -my ($Cmd, $Hostname, $HostPathName, $GuestPathName, $Script, $ScriptTimeout); +my ($Cmd, $Hostname, $LocalPathName, $ServerPathName, $Script, $ScriptTimeout); my $Port; my $Timeout; my $Usage; @@ -86,14 +86,14 @@ while (@ARGV) } elsif ($arg eq "send") { - $HostPathName = check_opt_val($arg, $HostPathName); - $GuestPathName = check_opt_val($arg, $GuestPathName) if (!$Usage); + $LocalPathName = check_opt_val($arg, $LocalPathName); + $ServerPathName = check_opt_val($arg, $ServerPathName) if (!$Usage); $Cmd = $arg; } elsif ($arg eq "get") { - $GuestPathName = check_opt_val($arg, $GuestPathName); - $HostPathName = check_opt_val($arg, $HostPathName) if (!$Usage); + $ServerPathName = check_opt_val($arg, $ServerPathName); + $LocalPathName = check_opt_val($arg, $LocalPathName) if (!$Usage); $Cmd = $arg; } elsif ($arg eq "runscript") @@ -128,25 +128,25 @@ if (defined $Usage) error("try '$name0 --help' for more information\n"); exit $Usage; } - print "Usage: $name0 [options] <hostname> send <hostpath> <guestpath>\n"; - print "or $name0 [options] <hostname> get <guestpath> <hostpath>\n"; + print "Usage: $name0 [options] <hostname> send <localpath> <serverpath>\n"; + print "or $name0 [options] <hostname> get <serverpath> <localpath>\n"; print "or $name0 [options] <hostname> runscript <command>\n"; print "or $name0 [options] <hostname> status\n"; print "\n"; - print "This is a testagentd client. It can be used to send/receive files and to run scripts on the specified guest host.\n"; + print "This is a testagentd client. It can be used to send/receive files and to run scripts on the specified server.\n"; print "\n"; print "Where:\n"; - print " send Sends the <hostpath> file and saves it as <guestpath> on the\n"; - print " guest.\n"; - print " get Retrieves the <guestpath> file from the guest and saves it as\n"; - print " <hostpath>.\n"; - print " runscript Runs the specified <command> on the guest.\n"; + print " send Sends the <localpath> file and saves it as <serverpath> on the\n"; + print " server.\n"; + print " get Retrieves the <serverpath> file from the server and saves it as\n"; + print " <localpath>.\n"; + print " runscript Runs the specified <command> on the server.\n"; print " status Retrieves the status of the last command that was run on the\n"; - print " guest.\n"; - print " <hostname> Is the hostname of the guest.\n"; + print " server.\n"; + print " <hostname> Is the hostname of the TestAgent server.\n"; print " --port <port> Use the specified port number instead of the default one.\n"; print " --timeout <timeout> Use the specified timeout (in seconds) instead of the\n"; - print " default one.\n"; + print " default one.\n"; print " --help Shows this usage message.\n"; exit 0; } @@ -154,11 +154,11 @@ if (defined $Usage) my $Err; if ($Cmd eq "send") { - $Err = TestAgent::SendFile($Hostname, $HostPathName, $GuestPathName); + $Err = TestAgent::SendFile($Hostname, $LocalPathName, $ServerPathName); } elsif ($Cmd eq "get") { - $Err = TestAgent::GetFile($Hostname, $GuestPathName, $HostPathName); + $Err = TestAgent::GetFile($Hostname, $ServerPathName, $LocalPathName); } elsif ($Cmd eq "runscript") {

1 0

Francois Gouget : testbot/TestAgent: Fix some formatting inconsistencies.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: tools Branch: master Commit: e9bd41df9964336e3e1121c27367a04c5172b601 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e9bd41df9964336e3e1121c2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 29 03:53:48 2012 +0100 testbot/TestAgent: Fix some formatting inconsistencies. --- testbot/scripts/TestAgent | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index a16bd5f..cc823f6 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -30,7 +30,7 @@ sub BEGIN } } -my $name0=$0; +my $name0 = $0; $name0 =~ s+^.*/++; use WineTestBot::Config; @@ -49,17 +49,17 @@ my $Usage; sub check_opt_val($$) { - my ($option, $val)=@_; + my ($option, $val) = @_; if (defined $val) { error("$option can only be specified once\n"); - $Usage=2; # but continue processing this option + $Usage = 2; # but continue processing this option } if (!@ARGV) { error("missing value for $option\n"); - $Usage=2; + $Usage = 2; return undef; } return shift @ARGV; @@ -67,18 +67,18 @@ sub check_opt_val($$) while (@ARGV) { - my $arg=shift @ARGV; + my $arg = shift @ARGV; if ($arg eq "--help") { - $Usage=0; + $Usage = 0; } elsif ($arg eq "--port") { - $Port=check_opt_val($arg, $Port); + $Port = check_opt_val($arg, $Port); } elsif ($arg eq "--timeout") { - $ScriptTimeout=check_opt_val($arg, $ScriptTimeout); + $ScriptTimeout = check_opt_val($arg, $ScriptTimeout); } elsif (!defined $Hostname) { @@ -86,19 +86,19 @@ while (@ARGV) } elsif ($arg eq "send") { - $HostPathName=check_opt_val($arg, $HostPathName); - $GuestPathName=check_opt_val($arg, $GuestPathName) if (!$Usage); + $HostPathName = check_opt_val($arg, $HostPathName); + $GuestPathName = check_opt_val($arg, $GuestPathName) if (!$Usage); $Cmd = $arg; } elsif ($arg eq "get") { - $GuestPathName=check_opt_val($arg, $GuestPathName); - $HostPathName=check_opt_val($arg, $HostPathName) if (!$Usage); + $GuestPathName = check_opt_val($arg, $GuestPathName); + $HostPathName = check_opt_val($arg, $HostPathName) if (!$Usage); $Cmd = $arg; } elsif ($arg eq "runscript") { - $Script=check_opt_val($arg, $Script); + $Script = check_opt_val($arg, $Script); $Cmd = $arg; } elsif ($arg eq "status")

1 0

Francois Gouget : testbot/testagentd: Add dependencies on the header file.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: tools Branch: master Commit: 3f68628812e189a8dac9649c8abbdfed7342478c URL: http://source.winehq.org/git/tools.git/?a=commit;h=3f68628812e189a8dac9649c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 29 03:52:49 2012 +0100 testbot/testagentd: Add dependencies on the header file. --- testbot/src/testagentd/Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/testbot/src/testagentd/Makefile b/testbot/src/testagentd/Makefile index ddd4fa0..6090d02 100644 --- a/testbot/src/testagentd/Makefile +++ b/testbot/src/testagentd/Makefile @@ -24,6 +24,8 @@ TestAgentd.exe: testagentd.obj platform_windows.obj .c.obj: $(CROSSCC32) -Wall -c -o $@ $< +C_SRCS = testagentd.c platform_unix.c platform_windows.c +$(C_SRCS:.c=.o) $(C_SRCS:.c=.obj): platform.h iso: windows mkdir winetest

1 0

Stefan Dösinger : ddraw: Properly use the index buffer as a dynamic buffer.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: a61f68fc5ab67e9c08665bd1861d6811be42d30f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a61f68fc5ab67e9c08665bd18… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 27 00:00:32 2012 +0100 ddraw: Properly use the index buffer as a dynamic buffer. --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index a7fac29..3a35c47 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -277,6 +277,7 @@ struct d3d_device struct ddraw *ddraw; struct wined3d_buffer *indexbuffer; UINT indexbuffer_size; + UINT indexbuffer_pos; struct ddraw_surface *target; /* Viewport management */ diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 6cc25ba..64a5d46 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4041,6 +4041,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, DWORD stride = get_flexible_vertex_size(vb->fvf); WORD *LockedIndices; HRESULT hr; + UINT ib_pos = This->indexbuffer_pos; TRACE("iface %p, primitive_type %#x, vb %p, start_vertex %u, vertex_count %u, indices %p, index_count %u, flags %#x.\n", iface, PrimitiveType, D3DVertexBuf, StartVertex, NumVertices, Indices, IndexCount, Flags); @@ -4075,14 +4076,18 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, if (This->indexbuffer) wined3d_buffer_decref(This->indexbuffer); This->indexbuffer = buffer; This->indexbuffer_size = size; + ib_pos = 0; } + if (This->indexbuffer_size - IndexCount * sizeof(WORD) < ib_pos) + ib_pos = 0; + /* Copy the index stream into the index buffer. A new IWineD3DDevice * method could be created which takes an user pointer containing the * indices or a SetData-Method for the index buffer, which overrides the * index buffer data with our pointer. */ - hr = wined3d_buffer_map(This->indexbuffer, 0, IndexCount * sizeof(WORD), - (BYTE **)&LockedIndices, 0); + hr = wined3d_buffer_map(This->indexbuffer, ib_pos, IndexCount * sizeof(WORD), + (BYTE **)&LockedIndices, ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); if (FAILED(hr)) { ERR("Failed to map buffer, hr %#x.\n", hr); @@ -4091,6 +4096,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, } memcpy(LockedIndices, Indices, IndexCount * sizeof(WORD)); wined3d_buffer_unmap(This->indexbuffer); + This->indexbuffer_pos = ib_pos + IndexCount * sizeof(WORD); /* Set the index stream */ wined3d_device_set_base_vertex_index(This->wined3d_device, StartVertex); @@ -4107,7 +4113,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, wined3d_device_set_primitive_type(This->wined3d_device, PrimitiveType); - hr = wined3d_device_draw_indexed_primitive(This->wined3d_device, 0, IndexCount); + hr = wined3d_device_draw_indexed_primitive(This->wined3d_device, ib_pos / sizeof(WORD), IndexCount); wined3d_mutex_unlock();

1 0

Stefan Dösinger : ddraw: Make the index buffer write only.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 108fcb691c3116aefa5e1bcc2d19e0290085d610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=108fcb691c3116aefa5e1bcc2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 27 00:00:31 2012 +0100 ddraw: Make the index buffer write only. --- dlls/ddraw/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index dd7d3ee..6cc25ba 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4063,7 +4063,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, TRACE("Growing index buffer to %u bytes\n", size); - hr = wined3d_buffer_create_ib(This->wined3d_device, size, WINED3DUSAGE_DYNAMIC /* Usage */, + hr = wined3d_buffer_create_ib(This->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, WINED3D_POOL_DEFAULT, NULL, &ddraw_null_wined3d_parent_ops, &buffer); if (FAILED(hr)) {

1 0

Jason Edmeades : cmd: Change what 'ver' issues.
by Alexandre Julliard 28 Nov '12

28 Nov '12

1 0

Stefan Dösinger : ddraw: Don' t create a wastefully large index buffer.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 4b95487bddd34f6dac3eb84f34110e0acc97470c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b95487bddd34f6dac3eb84f3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 27 00:00:30 2012 +0100 ddraw: Don't create a wastefully large index buffer. --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 29 ++++++----------------------- 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 319fcab..a7fac29 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -276,6 +276,7 @@ struct d3d_device struct wined3d_device *wined3d_device; struct ddraw *ddraw; struct wined3d_buffer *indexbuffer; + UINT indexbuffer_size; struct ddraw_surface *target; /* Viewport management */ diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index ba7d011..dd7d3ee 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -240,7 +240,7 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface) * care of that on uninit_3d(). */ /* Free the index buffer. */ - wined3d_buffer_decref(This->indexbuffer); + if (This->indexbuffer) wined3d_buffer_decref(This->indexbuffer); /* Set the device up to render to the front buffer since the back * buffer will vanish soon. */ @@ -4039,8 +4039,6 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, struct d3d_device *This = impl_from_IDirect3DDevice7(iface); struct d3d_vertex_buffer *vb = unsafe_impl_from_IDirect3DVertexBuffer7(D3DVertexBuf); DWORD stride = get_flexible_vertex_size(vb->fvf); - struct wined3d_resource *wined3d_resource; - struct wined3d_resource_desc desc; WORD *LockedIndices; HRESULT hr; @@ -4058,13 +4056,9 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, wined3d_device_set_vertex_declaration(This->wined3d_device, vb->wineD3DVertexDeclaration); - /* check that the buffer is large enough to hold the indices, - * reallocate if necessary. */ - wined3d_resource = wined3d_buffer_get_resource(This->indexbuffer); - wined3d_resource_get_desc(wined3d_resource, &desc); - if (desc.size < IndexCount * sizeof(WORD)) + if (This->indexbuffer_size < IndexCount * sizeof(WORD)) { - UINT size = max(desc.size * 2, IndexCount * sizeof(WORD)); + UINT size = max(This->indexbuffer_size * 2, IndexCount * sizeof(WORD)); struct wined3d_buffer *buffer; TRACE("Growing index buffer to %u bytes\n", size); @@ -4073,13 +4067,14 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, WINED3D_POOL_DEFAULT, NULL, &ddraw_null_wined3d_parent_ops, &buffer); if (FAILED(hr)) { - ERR("(%p) IWineD3DDevice::CreateIndexBuffer failed with hr = %08x\n", This, hr); + ERR("(%p) wined3d_buffer_create_ib failed with hr = %08x\n", This, hr); wined3d_mutex_unlock(); return hr; } - wined3d_buffer_decref(This->indexbuffer); + if (This->indexbuffer) wined3d_buffer_decref(This->indexbuffer); This->indexbuffer = buffer; + This->indexbuffer_size = size; } /* Copy the index stream into the index buffer. A new IWineD3DDevice @@ -6529,17 +6524,6 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, device->legacy_projection = ident; device->legacy_clipspace = ident; - /* Create an index buffer, it's needed for indexed drawing */ - hr = wined3d_buffer_create_ib(ddraw->wined3d_device, 0x40000 /* Length. Don't know how long it should be */, - WINED3DUSAGE_DYNAMIC /* Usage */, WINED3D_POOL_DEFAULT, NULL, - &ddraw_null_wined3d_parent_ops, &device->indexbuffer); - if (FAILED(hr)) - { - ERR("Failed to create an index buffer, hr %#x.\n", hr); - ddraw_handle_table_destroy(&device->handle_table); - return hr; - } - /* This is for convenience. */ device->wined3d_device = ddraw->wined3d_device; wined3d_device_incref(ddraw->wined3d_device); @@ -6549,7 +6533,6 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, if (FAILED(hr)) { ERR("Failed to set render target, hr %#x.\n", hr); - wined3d_buffer_decref(device->indexbuffer); ddraw_handle_table_destroy(&device->handle_table); return hr; }

1 0

Erich Hoover : advapi: Implement GetNamedSecurityInfoW on top of GetSecurityInfo.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 722c2b1008416ff72be4e1d60060e79957061584 URL: http://source.winehq.org/git/wine.git/?a=commit;h=722c2b1008416ff72be4e1d60… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Nov 26 12:13:47 2012 -0700 advapi: Implement GetNamedSecurityInfoW on top of GetSecurityInfo. --- dlls/advapi32/security.c | 104 ++++++++------------------------ dlls/advapi32/tests/security.c | 131 +++++++++++++++++++++++++++++++++------- 2 files changed, 133 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=722c2b1008416ff72be4e…

1 0

Erich Hoover : advapi: Implement SetNamedSecurityInfoW on top of SetSecurityInfo.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 5851032d07c321f2c050187115cfd8e21b5f3f49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5851032d07c321f2c05018711… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Nov 26 12:08:57 2012 -0700 advapi: Implement SetNamedSecurityInfoW on top of SetSecurityInfo. --- dlls/advapi32/security.c | 36 ++++++++++++++++++++++++++++++++++-- dlls/advapi32/tests/security.c | 15 +++++++++++++-- 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 6afcc42..6c1cdf1 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3919,9 +3919,41 @@ DWORD WINAPI SetNamedSecurityInfoW(LPWSTR pObjectName, SE_OBJECT_TYPE ObjectType, SECURITY_INFORMATION SecurityInfo, PSID psidOwner, PSID psidGroup, PACL pDacl, PACL pSacl) { - FIXME("%s %d %d %p %p %p %p\n", debugstr_w(pObjectName), ObjectType, + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + IO_STATUS_BLOCK io; + DWORD access = 0; + HANDLE hFile; + DWORD status; + + TRACE( "%s %d %d %p %p %p %p\n", debugstr_w(pObjectName), ObjectType, SecurityInfo, psidOwner, psidGroup, pDacl, pSacl); - return ERROR_SUCCESS; + + if (!pObjectName) return ERROR_INVALID_PARAMETER; + if (!RtlDosPathNameToNtPathName_U( pObjectName, &nameW, NULL, NULL )) + return ERROR_PATH_NOT_FOUND; + + if (SecurityInfo & (OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION)) + access |= WRITE_OWNER; + if (SecurityInfo & DACL_SECURITY_INFORMATION) + access |= WRITE_DAC; + if (SecurityInfo & SACL_SECURITY_INFORMATION) + access |= ACCESS_SYSTEM_SECURITY; + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.ObjectName = &nameW; + attr.SecurityDescriptor = NULL; + + status = NtCreateFile( &hFile, access, &attr, &io, NULL, FILE_FLAG_BACKUP_SEMANTICS, + FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN, + FILE_OPEN_FOR_BACKUP_INTENT, NULL, 0 ); + RtlFreeUnicodeString( &nameW ); + if (status != STATUS_SUCCESS) + return RtlNtStatusToDosError( status ); + status = SetSecurityInfo( hFile, ObjectType, SecurityInfo, psidOwner, psidGroup, pDacl, pSacl ); + CloseHandle( hFile ); + return status; } /****************************************************************************** diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index da5af04..2a4df4d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -101,6 +101,8 @@ static BOOL (WINAPI *pSetFileSecurityA)(LPCSTR, SECURITY_INFORMATION, static DWORD (WINAPI *pGetNamedSecurityInfoA)(LPSTR, SE_OBJECT_TYPE, SECURITY_INFORMATION, PSID*, PSID*, PACL*, PACL*, PSECURITY_DESCRIPTOR*); +static DWORD (WINAPI *pSetNamedSecurityInfoA)(LPTSTR, SE_OBJECT_TYPE, SECURITY_INFORMATION, + PSID, PSID, PACL, PACL); static PDWORD (WINAPI *pGetSidSubAuthority)(PSID, DWORD); static PUCHAR (WINAPI *pGetSidSubAuthorityCount)(PSID); static BOOL (WINAPI *pIsValidSid)(PSID); @@ -170,6 +172,7 @@ static void init(void) pSetFileSecurityA = (void *)GetProcAddress(hmod, "SetFileSecurityA" ); pCreateWellKnownSid = (void *)GetProcAddress( hmod, "CreateWellKnownSid" ); pGetNamedSecurityInfoA = (void *)GetProcAddress(hmod, "GetNamedSecurityInfoA"); + pSetNamedSecurityInfoA = (void *)GetProcAddress(hmod, "SetNamedSecurityInfoA"); pGetSidSubAuthority = (void *)GetProcAddress(hmod, "GetSidSubAuthority"); pGetSidSubAuthorityCount = (void *)GetProcAddress(hmod, "GetSidSubAuthorityCount"); pIsValidSid = (void *)GetProcAddress(hmod, "IsValidSid"); @@ -3002,6 +3005,7 @@ static void test_SetEntriesInAclA(void) static void test_GetNamedSecurityInfoA(void) { + char invalid_path[] = "/an invalid file path"; PSECURITY_DESCRIPTOR pSecDesc; DWORD revision; SECURITY_DESCRIPTOR_CONTROL control; @@ -3014,9 +3018,9 @@ static void test_GetNamedSecurityInfoA(void) BOOL ret, isNT4; CHAR windows_dir[MAX_PATH]; - if (!pGetNamedSecurityInfoA) + if (!pGetNamedSecurityInfoA || !pSetNamedSecurityInfoA) { - win_skip("GetNamedSecurityInfoA is not available\n"); + win_skip("[Get|Set]NamedSecurityInfoA is not available\n"); return; } @@ -3072,6 +3076,13 @@ static void test_GetNamedSecurityInfoA(void) error = pGetNamedSecurityInfoA(windows_dir, SE_FILE_OBJECT,OWNER_SECURITY_INFORMATION, NULL, NULL, &dacl, NULL, NULL); ok(error==ERROR_INVALID_PARAMETER, "GetNamedSecurityInfo failed with error %d\n", error); + + /* Test behavior of SetNamedSecurityInfo with an invalid path */ + SetLastError(0xdeadbeef); + error = pSetNamedSecurityInfoA(invalid_path, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, NULL, + NULL, NULL, NULL); + ok(error == ERROR_FILE_NOT_FOUND, "Unexpected error returned: 0x%x\n", error); + ok(GetLastError() == 0xdeadbeef, "Expected last error to remain unchanged.\n"); } static void test_ConvertStringSecurityDescriptor(void)

1 0

Jacek Caban : mshtml: Added IHTMLInputElement:: defaultValue property implementation.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 639a42a8fd304fc639018d91671688aa736bde73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=639a42a8fd304fc639018d916… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 28 16:57:24 2012 +0100 mshtml: Added IHTMLInputElement::defaultValue property implementation. --- dlls/mshtml/htmlinput.c | 26 ++++++++++++++++++--- dlls/mshtml/tests/dom.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 4d25c41..fb0e80b 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -355,15 +355,33 @@ static HRESULT WINAPI HTMLInputElement_get_onselect(IHTMLInputElement *iface, VA static HRESULT WINAPI HTMLInputElement_put_defaultValue(IHTMLInputElement *iface, BSTR v) { HTMLInputElement *This = impl_from_IHTMLInputElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLInputElement_SetDefaultValue(This->nsinput, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("SetValue failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLInputElement_get_defaultValue(IHTMLInputElement *iface, BSTR *p) { HTMLInputElement *This = impl_from_IHTMLInputElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLInputElement_GetDefaultValue(This->nsinput, &nsstr); + return return_nsstr(nsres, &nsstr, p); } static HRESULT WINAPI HTMLInputElement_put_readOnly(IHTMLInputElement *iface, VARIANT_BOOL v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 6bd7837..d45a1fe 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2946,6 +2946,49 @@ static void _test_input_put_value(unsigned line, IUnknown *unk, const char *val) _test_input_value(line, unk, val); } +#define test_input_defaultValue(o,t) _test_input_defaultValue(__LINE__,o,t) +static void _test_input_defaultValue(unsigned line, IUnknown *unk, const char *exval) +{ + IHTMLInputElement *input; + BSTR str; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLInputElement, (void**)&input); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLInputElement: %08x\n", hres); + if(FAILED(hres)) + return; + + hres = IHTMLInputElement_get_defaultValue(input, &str); + ok_(__FILE__,line) (hres == S_OK, "get_defaultValue failed: %08x\n", hres); + if(exval) + ok_(__FILE__,line) (!strcmp_wa(str, exval), "defaultValue=%s\n", wine_dbgstr_w(str)); + else + ok_(__FILE__,line) (!str, "exval != NULL\n"); + SysFreeString(str); + IHTMLInputElement_Release(input); +} + +#define test_input_put_defaultValue(o,v) _test_input_put_defaultValue(__LINE__,o,v) +static void _test_input_put_defaultValue(unsigned line, IUnknown *unk, const char *val) +{ + IHTMLInputElement *input; + BSTR str; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLInputElement, (void**)&input); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLInputElement: %08x\n", hres); + if(FAILED(hres)) + return; + + str = a2bstr(val); + hres = IHTMLInputElement_put_defaultValue(input, str); + ok_(__FILE__,line) (hres == S_OK, "get_defaultValue failed: %08x\n", hres); + SysFreeString(str); + IHTMLInputElement_Release(input); + + _test_input_defaultValue(line, unk, val); +} + #define test_input_src(i,s) _test_input_src(__LINE__,i,s) static void _test_input_src(unsigned line, IHTMLInputElement *input, const char *exsrc) { @@ -5882,7 +5925,9 @@ static void test_elems(IHTMLDocument2 *doc) test_node_put_value_str((IUnknown*)elem, "test"); test_node_get_value_str((IUnknown*)elem, NULL); test_input_value((IUnknown*)elem, NULL); + test_input_defaultValue((IUnknown*)elem, NULL); test_input_put_value((IUnknown*)elem, "test"); + test_input_defaultValue((IUnknown*)elem, NULL); test_elem_class((IUnknown*)elem, "testclass"); test_elem_tabindex((IUnknown*)elem, 2); test_elem_set_tabindex((IUnknown*)elem, 3); @@ -6307,6 +6352,17 @@ static void test_elems2(IHTMLDocument2 *doc) } test_elem_set_innerhtml((IUnknown*)div, + "<input value=\"val\" id =\"inputid\" />"); + elem = get_elem_by_id(doc, "inputid", TRUE); + if(elem) { + test_input_defaultValue((IUnknown*)elem, "val"); + test_input_put_value((IUnknown*)elem, "test"); + test_input_put_defaultValue((IUnknown*)elem, "new val"); + test_input_value((IUnknown*)elem, "test"); + IHTMLElement_Release(elem); + } + + test_elem_set_innerhtml((IUnknown*)div, "<form id=\"form\"><input type=\"button\" /><div><input type=\"text\" /></div></textarea>"); elem = get_elem_by_id(doc, "form", TRUE); if(elem) {

1 0

Akihiro Sagawa : winmm: Fix handling of mmio file buffers.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: c2cf4ddb932274486cc83a693b4a737f94f31b90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2cf4ddb932274486cc83a693… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Nov 29 00:00:19 2012 +0900 winmm: Fix handling of mmio file buffers. --- dlls/winmm/mmio.c | 32 ++++++++++++++------------------ dlls/winmm/tests/mmio.c | 16 ++++++++-------- 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index b6f60d1..551ccbf 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -771,6 +771,8 @@ LONG WINAPI mmioRead(HMMIO hmmio, HPSTR pch, LONG cch) return send_message(wm->ioProc, &wm->info, MMIOM_READ, (LPARAM)pch, cch, FALSE); /* first try from current buffer */ + if (cch && wm->info.fccIOProc != FOURCC_MEM && wm->info.pchNext == wm->info.pchEndRead) + MMIO_GrabNextBuffer(wm, TRUE); if (wm->info.pchNext != wm->info.pchEndRead) { count = wm->info.pchEndRead - wm->info.pchNext; if (count > cch || count < 0) count = cch; @@ -796,6 +798,8 @@ LONG WINAPI mmioRead(HMMIO hmmio, HPSTR pch, LONG cch) cch -= size; count += size; } + wm->bBufferLoaded = FALSE; + mmioSeek(hmmio, 0, SEEK_CUR); } TRACE("count=%d\n", count); @@ -887,35 +891,27 @@ LONG WINAPI mmioSeek(HMMIO hmmio, LONG lOffset, INT iOrigin) return -1; } - if (offset && offset >= wm->dwFileSize && wm->info.fccIOProc != FOURCC_MEM) { - /* should check that write mode exists */ - if (MMIO_Flush(wm, 0) != MMSYSERR_NOERROR) - return -1; - wm->info.lBufOffset = offset; - wm->info.pchEndRead = wm->info.pchBuffer; - wm->info.pchEndWrite = wm->info.pchBuffer + wm->info.cchBuffer; - if ((wm->info.dwFlags & MMIO_RWMODE) == MMIO_READ) { - wm->info.lDiskOffset = wm->dwFileSize; - } - } else if ((wm->info.cchBuffer > 0) && + /* stay in same buffer ? */ + /* some memory mapped buffers are defined with -1 as a size */ + if ((wm->info.cchBuffer > 0) && ((offset < wm->info.lBufOffset) || (offset >= wm->info.lBufOffset + wm->info.cchBuffer) || + (offset > wm->dwFileSize && wm->info.fccIOProc != FOURCC_MEM) || !wm->bBufferLoaded)) { - /* stay in same buffer ? */ - /* some memory mapped buffers are defined with -1 as a size */ /* condition to change buffer */ if ((wm->info.fccIOProc == FOURCC_MEM) || MMIO_Flush(wm, 0) != MMSYSERR_NOERROR || /* this also sets the wm->info.lDiskOffset field */ send_message(wm->ioProc, &wm->info, MMIOM_SEEK, - (offset / wm->info.cchBuffer) * wm->info.cchBuffer, - SEEK_SET, FALSE) == -1) + offset, SEEK_SET, FALSE) == -1) return -1; - MMIO_GrabNextBuffer(wm, TRUE); + wm->info.lBufOffset = offset; + wm->bBufferLoaded = FALSE; + wm->info.pchNext = wm->info.pchEndRead = wm->info.pchBuffer; } - - wm->info.pchNext = wm->info.pchBuffer + (offset - wm->info.lBufOffset); + else + wm->info.pchNext = wm->info.pchBuffer + (offset - wm->info.lBufOffset); TRACE("=> %d\n", offset); return offset; diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 232f84b..d4697db 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -812,14 +812,14 @@ static void test_mmio_end_of_file(void) ok(sizeof(RIFF_buf) == ret, "got %d\n", ret); ret = mmioRead(hmmio, data, sizeof(data)); - todo_wine ok(ret == 0, "expected %d, got %d\n", 0, ret); + ok(ret == 0, "expected %d, got %d\n", 0, ret); res = mmioGetInfo(hmmio, &mmio, 0); ok(res == MMSYSERR_NOERROR, "expected 0, got %d\n", res); res = mmioAdvance(hmmio, &mmio, MMIO_READ); ok(res == MMSYSERR_NOERROR, "expected 0, got %d\n", res); - todo_wine ok(mmio.pchNext == mmio.pchEndRead, "expected %p, got %p\n", mmio.pchEndRead, mmio.pchNext); + ok(mmio.pchNext == mmio.pchEndRead, "expected %p, got %p\n", mmio.pchEndRead, mmio.pchNext); mmioClose(hmmio, 0); DeleteFileA(test_file); @@ -874,18 +874,18 @@ static void test_mmio_buffer_pointer(void) ok(pos == size, "failed to seek, got %d\n", pos); res = mmioGetInfo(hmmio, &mmio, 0); ok(res == MMSYSERR_NOERROR, "expected 0, got %d\n", res); - todo_wine ok(mmio.lBufOffset == size, "expected %d, got %d\n", size, mmio.lBufOffset); - todo_wine ok(mmio.pchNext == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchNext); - todo_wine ok(mmio.pchEndRead == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndRead); + ok(mmio.lBufOffset == size, "expected %d, got %d\n", size, mmio.lBufOffset); + ok(mmio.pchNext == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchNext); + ok(mmio.pchEndRead == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndRead); /* reading a lot (as sizeof(data) > mmio.cchBuffer), the buffer is empty */ size = mmioRead(hmmio, data, sizeof(data)); ok(size == sizeof(data), "failed to read, got %d\n", size); res = mmioGetInfo(hmmio, &mmio, 0); ok(res == MMSYSERR_NOERROR, "expected 0, got %d\n", res); - todo_wine ok(mmio.lBufOffset == pos+size, "expected %d, got %d\n", pos+size, mmio.lBufOffset); - todo_wine ok(mmio.pchNext == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchNext); - todo_wine ok(mmio.pchEndRead == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndRead); + ok(mmio.lBufOffset == pos+size, "expected %d, got %d\n", pos+size, mmio.lBufOffset); + ok(mmio.pchNext == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchNext); + ok(mmio.pchEndRead == mmio.pchBuffer, "expected %p, got %p\n", mmio.pchBuffer, mmio.pchEndRead); mmioClose(hmmio, 0); DeleteFileA(test_file);

1 0

André Hentschel : ntdll: Exit when we can' t map the shared user data.
by Alexandre Julliard 28 Nov '12

28 Nov '12

Module: wine Branch: master Commit: 579f4f9da069441c269651177567f024a4df5ee2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=579f4f9da069441c269651177… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 27 19:35:08 2012 +0100 ntdll: Exit when we can't map the shared user data. --- dlls/ntdll/thread.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 8f8fdcf..01a8026 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -200,6 +200,7 @@ HANDLE thread_init(void) SIZE_T size, info_size; HANDLE exe_file = 0; LARGE_INTEGER now; + NTSTATUS status; struct ntdll_thread_data *thread_data; static struct debug_info debug_info; /* debug info for initial thread */ @@ -209,7 +210,13 @@ HANDLE thread_init(void) addr = (void *)0x7ffe0000; size = 0x10000; - NtAllocateVirtualMemory( NtCurrentProcess(), &addr, 0, &size, MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE ); + status = NtAllocateVirtualMemory( NtCurrentProcess(), &addr, 0, &size, + MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE ); + if (status) + { + MESSAGE( "wine: failed to map the shared user data: %08x\n", status ); + exit(1); + } user_shared_data = addr; /* allocate and initialize the PEB */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2012