wine-commits June 2012

wine-commits@winehq.org

3 participants
827 discussions

Piotr Caban : msvcp90: Fix streamoff and streampos definition.
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: bbea6efca070df6c1be4931e4ebdb3b7f5e2e7ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbea6efca070df6c1be4931e4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 6 14:49:05 2012 +0200 msvcp90: Fix streamoff and streampos definition. --- dlls/msvcp90/ios.c | 70 ++++++++++++++++++++++++------------------------ dlls/msvcp90/msvcp90.h | 4 +- 2 files changed, 37 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bbea6efca070df6c1be49…

1 0

Erich Hoover : server: Access the completion from the file descriptor instead of the async object .
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: e7dbb212a293ba1abc7356313e7a4429bf72e515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7dbb212a293ba1abc7356313… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Jun 5 07:35:27 2012 -0600 server: Access the completion from the file descriptor instead of the async object. --- dlls/ntdll/tests/file.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ server/async.c | 40 ++++++++++++++++++++++++++++++++-------- 2 files changed, 76 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index e299560..f6a9e7c 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1107,6 +1107,50 @@ static void test_iocp_fileio(HANDLE h) } CloseHandle( hPipeClt ); + + /* test associating a completion port with a handle after an async is queued */ + hPipeSrv = CreateNamedPipeA( pipe_name, PIPE_ACCESS_INBOUND | FILE_FLAG_OVERLAPPED, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, 4, 1024, 1024, 1000, NULL ); + ok( hPipeSrv != INVALID_HANDLE_VALUE, "Cannot create named pipe\n" ); + if (hPipeSrv == INVALID_HANDLE_VALUE ) + return; + hPipeClt = CreateFileA( pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED, NULL ); + ok( hPipeClt != INVALID_HANDLE_VALUE, "Cannot connect to pipe\n" ); + if (hPipeClt != INVALID_HANDLE_VALUE) + { + OVERLAPPED o = {0,}; + BYTE send_buf[TEST_BUF_LEN], recv_buf[TEST_BUF_LEN]; + DWORD read; + long count; + + memset( send_buf, 0, TEST_BUF_LEN ); + memset( recv_buf, 0xde, TEST_BUF_LEN ); + count = get_pending_msgs(h); + ok( !count, "Unexpected msg count: %ld\n", count ); + ReadFile( hPipeSrv, recv_buf, TEST_BUF_LEN, &read, &o); + + U(iosb).Status = 0xdeadbeef; + res = pNtSetInformationFile( hPipeSrv, &iosb, &fci, sizeof(fci), FileCompletionInformation ); + ok( res == STATUS_SUCCESS, "NtSetInformationFile failed: %x\n", res ); + ok( U(iosb).Status == STATUS_SUCCESS, "iosb.Status invalid: %x\n", U(iosb).Status ); + count = get_pending_msgs(h); + ok( !count, "Unexpected msg count: %ld\n", count ); + + WriteFile( hPipeClt, send_buf, TEST_BUF_LEN, &read, NULL ); + + if (get_msg(h)) + { + ok( completionKey == CKEY_SECOND, "Invalid completion key: %lx\n", completionKey ); + ok( ioSb.Information == 3, "Invalid ioSb.Information: %ld\n", ioSb.Information ); + ok( U(ioSb).Status == STATUS_SUCCESS, "Invalid ioSb.Status: %x\n", U(ioSb).Status); + ok( completionValue == (ULONG_PTR)&o, "Invalid completion value: %lx\n", completionValue ); + ok( !memcmp( send_buf, recv_buf, TEST_BUF_LEN ), "Receive buffer (%x %x %x) did not match send buffer (%x %x %x)\n", recv_buf[0], recv_buf[1], recv_buf[2], send_buf[0], send_buf[1], send_buf[2] ); + } + count = get_pending_msgs(h); + ok( !count, "Unexpected msg count: %ld\n", count ); + } + + CloseHandle( hPipeSrv ); + CloseHandle( hPipeClt ); } static void test_file_basic_information(void) diff --git a/server/async.c b/server/async.c index dd28dff..843a02b 100644 --- a/server/async.c +++ b/server/async.c @@ -42,8 +42,6 @@ struct async struct timeout_user *timeout; unsigned int timeout_status; /* status to report upon timeout */ struct event *event; - struct completion *completion; - apc_param_t comp_key; async_data_t data; /* data for async I/O call */ }; @@ -75,10 +73,13 @@ struct async_queue { struct object obj; /* object header */ struct fd *fd; /* file descriptor owning this queue */ + struct completion *completion; /* completion associated with a recently closed file descriptor */ + apc_param_t comp_key; /* completion key associated with a recently closed file descriptor */ struct list queue; /* queue of async objects */ }; static void async_queue_dump( struct object *obj, int verbose ); +static void async_queue_destroy( struct object *obj ); static const struct object_ops async_queue_ops = { @@ -97,7 +98,7 @@ static const struct object_ops async_queue_ops = no_lookup_name, /* lookup_name */ no_open_file, /* open_file */ no_close_handle, /* close_handle */ - no_destroy /* destroy */ + async_queue_destroy /* destroy */ }; @@ -123,7 +124,6 @@ static void async_destroy( struct object *obj ) if (async->timeout) remove_timeout_user( async->timeout ); if (async->event) release_object( async->event ); - if (async->completion) release_object( async->completion ); release_object( async->queue ); release_object( async->thread ); } @@ -135,6 +135,13 @@ static void async_queue_dump( struct object *obj, int verbose ) fprintf( stderr, "Async queue fd=%p\n", async_queue->fd ); } +static void async_queue_destroy( struct object *obj ) +{ + struct async_queue *async_queue = (struct async_queue *)obj; + assert( obj->ops == &async_queue_ops ); + if (async_queue->completion) release_object( async_queue->completion ); +} + /* notifies client thread of new status of its async request */ void async_terminate( struct async *async, unsigned int status ) { @@ -178,6 +185,7 @@ struct async_queue *create_async_queue( struct fd *fd ) if (queue) { queue->fd = fd; + queue->completion = NULL; list_init( &queue->queue ); } return queue; @@ -187,6 +195,7 @@ struct async_queue *create_async_queue( struct fd *fd ) void free_async_queue( struct async_queue *queue ) { if (!queue) return; + if (queue->fd) queue->completion = fd_get_completion( queue->fd, &queue->comp_key ); queue->fd = NULL; async_wake_up( queue, STATUS_HANDLES_CLOSED ); release_object( queue ); @@ -213,8 +222,6 @@ struct async *create_async( struct thread *thread, struct async_queue *queue, co async->data = *data; async->timeout = NULL; async->queue = (struct async_queue *)grab_object( queue ); - async->completion = NULL; - if (queue->fd) async->completion = fd_get_completion( queue->fd, &async->comp_key ); list_add_tail( &queue->queue, &async->queue_entry ); grab_object( async ); @@ -233,6 +240,24 @@ void async_set_timeout( struct async *async, timeout_t timeout, unsigned int sta async->timeout_status = status; } +static void add_async_completion( struct async_queue *queue, apc_param_t cvalue, unsigned int status, + unsigned int information ) +{ + if (queue->fd) + { + apc_param_t ckey; + struct completion *completion = fd_get_completion( queue->fd, &ckey ); + + if (completion) + { + add_completion( completion, ckey, cvalue, status, information ); + release_object( completion ); + } + } + else if (queue->completion) add_completion( queue->completion, queue->comp_key, + cvalue, status, information ); +} + /* store the result of the client-side async callback */ void async_set_result( struct object *obj, unsigned int status, unsigned int total, client_ptr_t apc ) { @@ -258,8 +283,7 @@ void async_set_result( struct object *obj, unsigned int status, unsigned int tot if (async->timeout) remove_timeout_user( async->timeout ); async->timeout = NULL; async->status = status; - if (async->completion && async->data.cvalue) - add_completion( async->completion, async->comp_key, async->data.cvalue, status, total ); + if (async->data.cvalue) add_async_completion( async->queue, async->data.cvalue, status, total ); if (apc) { apc_call_t data;

1 0

Christian Costa : d3drm: Implement IDirect3DRMMeshBuilderX_SetMaterial.
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: 6aa77edfb3d9e82871b77cd037aa48ba56afb16c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aa77edfb3d9e82871b77cd03… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jun 5 22:45:44 2012 +0200 d3drm: Implement IDirect3DRMMeshBuilderX_SetMaterial. --- dlls/d3drm/meshbuilder.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 0f39b4a..bdb5e00 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -651,13 +651,13 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetTexture(IDirect3DRMMeshBuil } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetMaterial(IDirect3DRMMeshBuilder2* iface, - LPDIRECT3DRMMATERIAL pMaterial) + LPDIRECT3DRMMATERIAL material) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - FIXME("(%p)->(%p): stub\n", This, pMaterial); + TRACE("(%p)->(%p)\n", This, material); - return E_NOTIMPL; + return IDirect3DRMMeshBuilder3_SetMaterial(&This->IDirect3DRMMeshBuilder3_iface, (LPDIRECT3DRMMATERIAL2)material); } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetTextureTopology(IDirect3DRMMeshBuilder2* iface, @@ -1756,9 +1756,15 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetMaterial(IDirect3DRMMeshBui { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - FIXME("(%p)->(%p): stub\n", This, material); + TRACE("(%p)->(%p)\n", This, material); - return E_NOTIMPL; + if (material) + IDirect3DRMTexture2_AddRef(material); + if (This->material) + IDirect3DRMTexture2_Release(This->material); + This->material = material; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetTextureTopology(IDirect3DRMMeshBuilder3* iface,

1 0

Christian Costa : d3drm: Fix SetMaterial macros.
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: 1425c78c4cd894c23f6552bbd070745a6c0a9eaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1425c78c4cd894c23f6552bbd… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jun 5 22:45:36 2012 +0200 d3drm: Fix SetMaterial macros. --- include/d3drmobj.h | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/d3drmobj.h b/include/d3drmobj.h index c5f69b3..33721f9 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -2571,7 +2571,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder,IDirect3DRMVisual) #define IDirect3DRMMeshBuilder_SetColorRGB(p,a,b,c) (p)->lpVtbl->SetColorRGB(p,a,b,c) #define IDirect3DRMMeshBuilder_SetColor(p,a) (p)->lpVtbl->SetColor(p,a) #define IDirect3DRMMeshBuilder_SetTexture(p,a) (p)->lpVtbl->SetTexture(p,a) -#define IDirect3DRMMeshBuilder_SetMateria(p,a) (p)->lpVtbl->SetMateria(p,a) +#define IDirect3DRMMeshBuilder_SetMaterial(p,a) (p)->lpVtbl->SetMaterial(p,a) #define IDirect3DRMMeshBuilder_SetTextureTopology(p,a,b) (p)->lpVtbl->SetTextureTopology(p,a,b) #define IDirect3DRMMeshBuilder_SetQuality(p,a) (p)->lpVtbl->SetQuality(p,a) #define IDirect3DRMMeshBuilder_SetPerspective(p,a) (p)->lpVtbl->SetPerspective(p,a) @@ -2624,7 +2624,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder,IDirect3DRMVisual) #define IDirect3DRMMeshBuilder_SetColorRGB(p,a,b,c) (p)->SetColorRGB(a,b,c) #define IDirect3DRMMeshBuilder_SetColor(p,a) (p)->SetColor(a) #define IDirect3DRMMeshBuilder_SetTexture(p,a) (p)->SetTexture(a) -#define IDirect3DRMMeshBuilder_SetMateria(p,a) (p)->SetMateria(a) +#define IDirect3DRMMeshBuilder_SetMaterial(p,a) (p)->SetMaterial(a) #define IDirect3DRMMeshBuilder_SetTextureTopology(p,a,b) (p)->SetTextureTopology(a,b) #define IDirect3DRMMeshBuilder_SetQuality(p,a) (p)->SetQuality(a) #define IDirect3DRMMeshBuilder_SetPerspective(p,a) (p)->SetPerspective(a) @@ -2745,7 +2745,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder2,IDirect3DRMMeshBuilder) #define IDirect3DRMMeshBuilder2_SetColorRGB(p,a,b,c) (p)->lpVtbl->SetColorRGB(p,a,b,c) #define IDirect3DRMMeshBuilder2_SetColor(p,a) (p)->lpVtbl->SetColor(p,a) #define IDirect3DRMMeshBuilder2_SetTexture(p,a) (p)->lpVtbl->SetTexture(p,a) -#define IDirect3DRMMeshBuilder2_SetMateria(p,a) (p)->lpVtbl->SetMateria(p,a) +#define IDirect3DRMMeshBuilder2_SetMaterial(p,a) (p)->lpVtbl->SetMaterial(p,a) #define IDirect3DRMMeshBuilder2_SetTextureTopology(p,a,b) (p)->lpVtbl->SetTextureTopology(p,a,b) #define IDirect3DRMMeshBuilder2_SetQuality(p,a) (p)->lpVtbl->SetQuality(p,a) #define IDirect3DRMMeshBuilder2_SetPerspective(p,a) (p)->lpVtbl->SetPerspective(p,a) @@ -2801,7 +2801,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder2,IDirect3DRMMeshBuilder) #define IDirect3DRMMeshBuilder2_SetColorRGB(p,a,b,c) (p)->SetColorRGB(a,b,c) #define IDirect3DRMMeshBuilder2_SetColor(p,a) (p)->SetColor(a) #define IDirect3DRMMeshBuilder2_SetTexture(p,a) (p)->SetTexture(a) -#define IDirect3DRMMeshBuilder2_SetMateria(p,a) (p)->SetMateria(a) +#define IDirect3DRMMeshBuilder2_SetMaterial(p,a) (p)->SetMaterial(a) #define IDirect3DRMMeshBuilder2_SetTextureTopology(p,a,b) (p)->SetTextureTopology(a,b) #define IDirect3DRMMeshBuilder2_SetQuality(p,a) (p)->SetQuality(a) #define IDirect3DRMMeshBuilder2_SetPerspective(p,a) (p)->SetPerspective(a) @@ -2925,6 +2925,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder3,IDirect3DRMVisual) #define IDirect3DRMMeshBuilder3_SetName(p,a) (p)->lpVtbl->SetName(p,a) #define IDirect3DRMMeshBuilder3_GetName(p,a,b) (p)->lpVtbl->GetName(p,a,b) #define IDirect3DRMMeshBuilder3_GetClassName(p,a,b) (p)->lpVtbl->GetClassName(p,a,b) + /*** IDirect3DRMMeshBuilder3 methods ***/ #define IDirect3DRMMeshBuilder3_Load(p,a,b,c,d,e) (p)->lpVtbl->Load(p,a,b,c,d,e) #define IDirect3DRMMeshBuilder3_Save(p,a,b,c) (p)->lpVtbl->Save(p,a,b,c) @@ -2943,7 +2944,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder3,IDirect3DRMVisual) #define IDirect3DRMMeshBuilder3_SetColorRGB(p,a,b,c) (p)->lpVtbl->SetColorRGB(p,a,b,c) #define IDirect3DRMMeshBuilder3_SetColor(p,a) (p)->lpVtbl->SetColor(p,a) #define IDirect3DRMMeshBuilder3_SetTexture(p,a) (p)->lpVtbl->SetTexture(p,a) -#define IDirect3DRMMeshBuilder3_SetMateria(p,a) (p)->lpVtbl->SetMateria(p,a) +#define IDirect3DRMMeshBuilder3_SetMaterial(p,a) (p)->lpVtbl->SetMaterial(p,a) #define IDirect3DRMMeshBuilder3_SetTextureTopology(p,a,b) (p)->lpVtbl->SetTextureTopology(p,a,b) #define IDirect3DRMMeshBuilder3_SetQuality(p,a) (p)->lpVtbl->SetQuality(p,a) #define IDirect3DRMMeshBuilder3_SetPerspective(p,a) (p)->lpVtbl->SetPerspective(p,a) @@ -2957,9 +2958,11 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder3,IDirect3DRMVisual) #define IDirect3DRMMeshBuilder3_GetTextureCoordinates(p,a,b,c) (p)->lpVtbl->GetTextureCoordinates(p,a,b,c) #define IDirect3DRMMeshBuilder3_AddVertex(p,a,b,c) (p)->lpVtbl->AddVertex(p,a,b,c) #define IDirect3DRMMeshBuilder3_AddNormal(p,a,b,c) (p)->lpVtbl->AddNormal(p,a,b,c) + #define IDirect3DRMMeshBuilder3_CreateFace(p,a) (p)->lpVtbl->CreateFace(p,a) #define IDirect3DRMMeshBuilder3_GetQuality(p) (p)->lpVtbl->GetQuality(p) #define IDirect3DRMMeshBuilder3_GetPerspective(p) (p)->lpVtbl->GetPerspective(p) + #define IDirect3DRMMeshBuilder3_GetFaceCount(p) (p)->lpVtbl->GetFaceCount(p) #define IDirect3DRMMeshBuilder3_GetVertexCount(p) (p)->lpVtbl->GetVertexCount(p) #define IDirect3DRMMeshBuilder3_GetVertexColor(p,a) (p)->lpVtbl->GetVertexColor(p,a) @@ -3016,7 +3019,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder3,IDirect3DRMVisual) #define IDirect3DRMMeshBuilder3_SetColorRGB(p,a,b,c) (p)->SetColorRGB(a,b,c) #define IDirect3DRMMeshBuilder3_SetColor(p,a) (p)->SetColor(a) #define IDirect3DRMMeshBuilder3_SetTexture(p,a) (p)->SetTexture(a) -#define IDirect3DRMMeshBuilder3_SetMateria(p,a) (p)->SetMateria(a) +#define IDirect3DRMMeshBuilder3_SetMaterial(p,a) (p)->SetMaterial(a) #define IDirect3DRMMeshBuilder3_SetTextureTopology(p,a,b) (p)->SetTextureTopology(a,b) #define IDirect3DRMMeshBuilder3_SetQuality(p,a) (p)->SetQuality(a) #define IDirect3DRMMeshBuilder3_SetPerspective(p,a) (p)->SetPerspective(a) @@ -3031,6 +3034,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder3,IDirect3DRMVisual) #define IDirect3DRMMeshBuilder3_AddVertex(p,a,b,c) (p)->AddVertex(a,b,c) #define IDirect3DRMMeshBuilder3_AddNormal(p,a,b,c) (p)->AddNormal(a,b,c) #define IDirect3DRMMeshBuilder3_CreateFace(p,a) (p)->CreateFace(a) + #define IDirect3DRMMeshBuilder3_GetQuality(p) (p)->GetQuality() #define IDirect3DRMMeshBuilder3_GetPerspective(p) (p)->GetPerspective() #define IDirect3DRMMeshBuilder3_GetFaceCount(p) (p)->GetFaceCount()

1 0

Christian Costa : d3drm: Pass texture of mesh builder to newly created mesh .
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: 8080528fc4c545e2ab1d56b21cec6c90cae755f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8080528fc4c545e2ab1d56b21… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jun 5 22:45:18 2012 +0200 d3drm: Pass texture of mesh builder to newly created mesh. --- dlls/d3drm/meshbuilder.c | 32 +++++++++++++++++++++++++++----- 1 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 836412e..0f39b4a 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -77,6 +77,7 @@ typedef struct { Coords2d* pCoords2d; D3DCOLOR color; IDirect3DRMMaterial2* material; + IDirect3DRMTexture3* texture; } IDirect3DRMMeshBuilderImpl; char templates[] = { @@ -633,13 +634,20 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetColor(IDirect3DRMMeshBuilde } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetTexture(IDirect3DRMMeshBuilder2* iface, - LPDIRECT3DRMTEXTURE pTexture) + LPDIRECT3DRMTEXTURE texture) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); + LPDIRECT3DRMTEXTURE3 texture3 = NULL; + HRESULT hr = D3DRM_OK; - FIXME("(%p)->(%p): stub\n", This, pTexture); + if (texture) + hr = IDirect3DRMTexture_QueryInterface(texture, &IID_IDirect3DRMTexture3, (LPVOID*)&texture3); + if (SUCCEEDED(hr)) + hr = IDirect3DRMMeshBuilder3_SetTexture(&This->IDirect3DRMMeshBuilder3_iface, texture3); + if (texture3) + IDirect3DRMTexture3_Release(texture3); - return E_NOTIMPL; + return hr; } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetMaterial(IDirect3DRMMeshBuilder2* iface, @@ -1732,9 +1740,15 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetTexture(IDirect3DRMMeshBuil { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - FIXME("(%p)->(%p): stub\n", This, texture); + TRACE("(%p)->(%p)\n", This, texture); - return E_NOTIMPL; + if (texture) + IDirect3DRMTexture3_AddRef(texture); + if (This->texture) + IDirect3DRMTexture3_Release(This->texture); + This->texture = texture; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetMaterial(IDirect3DRMMeshBuilder3* iface, @@ -2025,6 +2039,14 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuil hr = IDirect3DRMMesh_SetGroupColor(*mesh, 0, This->color); if (SUCCEEDED(hr)) hr = IDirect3DRMMesh_SetGroupMaterial(*mesh, 0, (LPDIRECT3DRMMATERIAL)This->material); + if (SUCCEEDED(hr) && This->texture) + { + LPDIRECT3DRMTEXTURE texture; + + IDirect3DRMTexture3_QueryInterface(This->texture, &IID_IDirect3DRMTexture, (LPVOID*)&texture); + hr = IDirect3DRMMesh_SetGroupTexture(*mesh, 0, texture); + IDirect3DRMTexture_Release(texture); + } if (FAILED(hr)) IDirect3DRMMesh_Release(*mesh); }

1 0

Christian Costa : d3drm: Implement IDirect3DRMMesh_SetGroupTexture.
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: db6b10e22d9e1c0f039746b392a7ce0468763312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db6b10e22d9e1c0f039746b39… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Jun 5 22:45:09 2012 +0200 d3drm: Implement IDirect3DRMMesh_SetGroupTexture. --- dlls/d3drm/meshbuilder.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index f3f00c1..836412e 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2692,13 +2692,25 @@ static HRESULT WINAPI IDirect3DRMMeshImpl_SetGroupMaterial(IDirect3DRMMesh* ifac } static HRESULT WINAPI IDirect3DRMMeshImpl_SetGroupTexture(IDirect3DRMMesh* iface, - D3DRMGROUPINDEX id, LPDIRECT3DRMTEXTURE value) + D3DRMGROUPINDEX id, LPDIRECT3DRMTEXTURE texture) { IDirect3DRMMeshImpl *This = impl_from_IDirect3DRMMesh(iface); - FIXME("(%p)->(%u,%p): stub\n", This, id, value); + TRACE("(%p)->(%u,%p)\n", This, id, texture); - return E_NOTIMPL; + if (id >= This->nb_groups) + return D3DRMERR_BADVALUE; + + if (This->groups[id].texture) + IDirect3DRMTexture3_Release(This->groups[id].texture); + + if (!texture) + { + This->groups[id].texture = NULL; + return D3DRM_OK; + } + + return IDirect3DRMTexture3_QueryInterface(texture, &IID_IDirect3DRMTexture, (LPVOID*)&This->groups[id].texture); } static DWORD WINAPI IDirect3DRMMeshImpl_GetGroupCount(IDirect3DRMMesh* iface)

1 0

Dmitry Timoshkov : server: Make sure that region and rectangle have the same origin before calling rect_in_region ().
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: 94c817e311e4ae1915461d27b17e8394f9ee9433 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94c817e311e4ae1915461d27b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 6 14:47:45 2012 +0900 server: Make sure that region and rectangle have the same origin before calling rect_in_region(). --- server/window.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/server/window.c b/server/window.c index 329fdb6..3456e1a 100644 --- a/server/window.c +++ b/server/window.c @@ -2457,7 +2457,12 @@ DECL_HANDLER(update_window_zorder) if (!(ptr->style & WS_VISIBLE)) continue; if (ptr->ex_style & WS_EX_TRANSPARENT) continue; if (!intersect_rect( &tmp, &ptr->visible_rect, &rect )) continue; - if (ptr->win_region && !rect_in_region( ptr->win_region, &rect )) continue; + if (ptr->win_region) + { + tmp = rect; + offset_rect( &tmp, -ptr->window_rect.left, -ptr->window_rect.top ); + if (!rect_in_region( ptr->win_region, &tmp )) continue; + } /* found a window obscuring the rectangle, now move win above this one */ /* making sure to not violate the topmost rule */ if (!(ptr->ex_style & WS_EX_TOPMOST) || (win->ex_style & WS_EX_TOPMOST))

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: 983dca65796facd0784dac5c07a7dc27c120f380 URL: http://source.winehq.org/git/wine.git/?a=commit;h=983dca65796facd0784dac5c0… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jun 6 03:04:07 2012 +0200 po: Update German translation. --- po/de.po | 24 ++++++++---------------- 1 files changed, 8 insertions(+), 16 deletions(-) diff --git a/po/de.po b/po/de.po index 5cad432..f5ec36e 100644 --- a/po/de.po +++ b/po/de.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-05-24 02:18+0200\n" +"PO-Revision-Date: 2012-06-06 01:03+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -3431,43 +3431,35 @@ msgstr "Hoch" #: joy.rc:33 msgid "Joysticks" -msgstr "" +msgstr "Joysticks" #: joy.rc:36 winecfg.rc:204 msgid "&Disable" msgstr "&Ausschalten" #: joy.rc:37 -#, fuzzy -#| msgid "&enable" msgid "&Enable" -msgstr "&aktiv" +msgstr "&Einschalten" #: joy.rc:38 -#, fuzzy -#| msgid "Disconnected" msgid "Connected" -msgstr "Getrennt" +msgstr "Verbunden" #: joy.rc:40 -#, fuzzy -#| msgid "&Disable" msgid "Disabled" -msgstr "&Ausschalten" +msgstr "Ausgeschaltet" #: joy.rc:46 msgid "Test Joystick" -msgstr "" +msgstr "Joystick testen" #: joy.rc:53 msgid "Test Force Feedback" -msgstr "" +msgstr "Force Feedback testen" #: joy.rc:28 -#, fuzzy -#| msgid "Create Control" msgid "Game Controllers" -msgstr "S&teuerelement erstellen" +msgstr "Spielsteuerungsgeräte" #: jscript.rc:25 msgid "Error converting object to primitive type"

1 0

Alexandre Julliard : libwine: Avoid memrchr.
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: cbdc795515a040e2927d35c973561083752d42bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbdc795515a040e2927d35c97… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 6 12:39:33 2012 +0200 libwine: Avoid memrchr. --- libs/wine/config.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 349fb7d..df5c33b 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -165,7 +165,8 @@ static char *get_runtime_bindir( const char *argv0 ) if ((ret = readlink( EXE_LINK, bindir, size )) == -1) break; if (ret != size) { - if (!(p = memrchr( bindir, '/', ret ))) break; + bindir[ret] = 0; + if (!(p = strrchr( bindir, '/' ))) break; if (p == bindir) p++; *p = 0; return bindir;

1 0

Francois Gouget : windowscodecs/tests: Fix compilation on systems that don' t support nameless structs.
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: 624ad399f18c5204523672f7b6d6c1f1b3519c2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=624ad399f18c5204523672f7b… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 6 11:09:25 2012 +0200 windowscodecs/tests: Fix compilation on systems that don't support nameless structs. --- dlls/windowscodecs/tests/metadata.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 1292bbf..70a3913 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -386,7 +386,7 @@ static void test_metadata_IFD(void) ok(id.vt == VT_UI2, "%u: unexpected vt: %u\n", i, id.vt); ok(U(id).uiVal == td[i].id, "%u: unexpected id: %#x\n", i, U(id).uiVal); ok(value.vt == td[i].type, "%u: unexpected vt: %u\n", i, value.vt); - ok(U(value).uhVal.QuadPart == td[i].value, "%u: unexpected id: %d/%d\n", i, U(value).uhVal.LowPart, U(value).uhVal.HighPart); + ok(U(value).uhVal.QuadPart == td[i].value, "%u: unexpected id: %d/%d\n", i, U(value).uhVal.u.LowPart, U(value).uhVal.u.HighPart); PropVariantClear(&schema); PropVariantClear(&id);

1 0

← Newer
1
...
71
72
73
74
75
76
77
...
83
Older →

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 June 2012