June 2012 - Wine-commits - list.winehq.org

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

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

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

Piotr Caban : msvcp90: Rename sentry_char_{create, destroy} functions.
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: 46838cf2e50590aa9070e27891528937af6160ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=46838cf2e50590aa9070e2789… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 6 14:49:23 2012 +0200 msvcp90: Rename sentry_char_{create,destroy} functions. --- dlls/msvcp90/ios.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 6820b56..38ab71a 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -3001,7 +3001,7 @@ void __thiscall basic_ostream_char_osfx(basic_ostream_char *this) basic_ostream_char__Osfx(this); } -static BOOL sentry_char_create(basic_ostream_char *ostr) +static BOOL basic_ostream_char_sentry_create(basic_ostream_char *ostr) { basic_ios_char *base = basic_ostream_char_get_basic_ios(ostr); @@ -3014,7 +3014,7 @@ static BOOL sentry_char_create(basic_ostream_char *ostr) return ios_base_good(&base->base); } -static void sentry_char_destroy(basic_ostream_char *ostr) +static void basic_ostream_char_sentry_destroy(basic_ostream_char *ostr) { basic_ios_char *base = basic_ostream_char_get_basic_ios(ostr); @@ -3048,14 +3048,14 @@ basic_ostream_char* __thiscall basic_ostream_char_put(basic_ostream_char *this, TRACE("(%p %c)\n", this, ch); - if(!sentry_char_create(this) + if(!basic_ostream_char_sentry_create(this) || basic_streambuf_char_sputc(base->strbuf, ch)==EOF) { - sentry_char_destroy(this); + basic_ostream_char_sentry_destroy(this); ios_base_setstate(&base->base, IOSTATE_badbit); return this; } - sentry_char_destroy(this); + basic_ostream_char_sentry_destroy(this); return this; } @@ -3128,14 +3128,14 @@ basic_ostream_char* __thiscall basic_ostream_char_write(basic_ostream_char *this TRACE("(%p %s %ld)\n", this, debugstr_a(str), count); - if(!sentry_char_create(this) + if(!basic_ostream_char_sentry_create(this) || basic_streambuf_char_sputn(base->strbuf, str, count)!=count) { - sentry_char_destroy(this); + basic_ostream_char_sentry_destroy(this); ios_base_setstate(&base->base, IOSTATE_badbit); return this; } - sentry_char_destroy(this); + basic_ostream_char_sentry_destroy(this); return this; }

1 0

Piotr Caban : msvcp90: Call correct setstate function in basic_ostream class.
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: 140861cadeef40b5865de5662f1063e325a7e1e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=140861cadeef40b5865de5662… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 6 14:49:37 2012 +0200 msvcp90: Call correct setstate function in basic_ostream class. --- dlls/msvcp90/ios.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 38ab71a..49837a8 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -2975,7 +2975,7 @@ basic_ostream_char* __thiscall basic_ostream_char_flush(basic_ostream_char *this if(basic_ios_char_rdbuf_get(base) && ios_base_good(&base->base) && basic_streambuf_char_pubsync(basic_ios_char_rdbuf_get(base))==-1) - ios_base_setstate(&base->base, IOSTATE_badbit); + basic_ios_char_setstate(base, IOSTATE_badbit); return this; } @@ -3051,7 +3051,7 @@ basic_ostream_char* __thiscall basic_ostream_char_put(basic_ostream_char *this, if(!basic_ostream_char_sentry_create(this) || basic_streambuf_char_sputc(base->strbuf, ch)==EOF) { basic_ostream_char_sentry_destroy(this); - ios_base_setstate(&base->base, IOSTATE_badbit); + basic_ios_char_setstate(base, IOSTATE_badbit); return this; } @@ -3074,7 +3074,7 @@ basic_ostream_char* __thiscall basic_ostream_char_seekp(basic_ostream_char *this basic_streambuf_char_pubseekoff(basic_ios_char_rdbuf_get(base), &seek, off, way, OPENMODE_out); if(seek.off==0 && seek.pos==-1 && seek.state==0) - ios_base_setstate(&base->base, IOSTATE_failbit); + basic_ios_char_setstate(base, IOSTATE_failbit); } return this; } @@ -3094,7 +3094,7 @@ basic_ostream_char* __thiscall basic_ostream_char_seekp_fpos(basic_ostream_char basic_streambuf_char_pubseekpos(basic_ios_char_rdbuf_get(base), &seek, pos, OPENMODE_out); if(seek.off==0 && seek.pos==-1 && seek.state==0) - ios_base_setstate(&base->base, IOSTATE_failbit); + basic_ios_char_setstate(base, IOSTATE_failbit); } return this; } @@ -3131,7 +3131,7 @@ basic_ostream_char* __thiscall basic_ostream_char_write(basic_ostream_char *this if(!basic_ostream_char_sentry_create(this) || basic_streambuf_char_sputn(base->strbuf, str, count)!=count) { basic_ostream_char_sentry_destroy(this); - ios_base_setstate(&base->base, IOSTATE_badbit); + basic_ios_char_setstate(base, IOSTATE_badbit); return this; }

1 0

Józef Kucia : d3dx9: Implement ID3DXRenderToSurface:: GetDevice.
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: de1f2ffd526a108d8a60f6dde5bf551da4b66b4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=de1f2ffd526a108d8a60f6dde… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Jun 5 12:05:45 2012 +0200 d3dx9: Implement ID3DXRenderToSurface::GetDevice. --- dlls/d3dx9_36/render.c | 11 +++++++++-- dlls/d3dx9_36/tests/core.c | 27 +++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/render.c b/dlls/d3dx9_36/render.c index 99cee8d..9aa1487 100644 --- a/dlls/d3dx9_36/render.c +++ b/dlls/d3dx9_36/render.c @@ -85,8 +85,15 @@ static ULONG WINAPI D3DXRenderToSurface_Release(ID3DXRenderToSurface *iface) static HRESULT WINAPI D3DXRenderToSurface_GetDevice(ID3DXRenderToSurface *iface, IDirect3DDevice9 **device) { - FIXME("(%p)->(%p): stub\n", iface, device); - return E_NOTIMPL; + struct render_to_surface *render = impl_from_ID3DXRenderToSurface(iface); + + TRACE("(%p)->(%p)\n", iface, device); + + if (!device) return D3DERR_INVALIDCALL; + + IDirect3DDevice9_AddRef(render->device); + *device = render->device; + return D3D_OK; } static HRESULT WINAPI D3DXRenderToSurface_GetDesc(ID3DXRenderToSurface *iface, diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 5b0ebc7..41b282d 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -500,6 +500,32 @@ void test_D3DXCreateRenderToSurface(IDirect3DDevice9 *device) if (SUCCEEDED(hr)) ID3DXRenderToSurface_Release(render); } +static void test_ID3DXRenderToSurface(IDirect3DDevice9 *device) +{ + HRESULT hr; + ULONG ref_count; + IDirect3DDevice9 *out_device; + ID3DXRenderToSurface *render; + + hr = D3DXCreateRenderToSurface(device, 256, 256, D3DFMT_A8R8G8B8, FALSE, D3DFMT_UNKNOWN, &render); + if (FAILED(hr)) + { + skip("Failed to create ID3DXRenderToSurface\n"); + return; + } + + /* GetDevice */ + hr = ID3DXRenderToSurface_GetDevice(render, NULL /* device */); + ok(hr == D3DERR_INVALIDCALL, "ID3DXRenderToSurface::GetDevice returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + ref_count = get_ref((IUnknown *)device); + hr = ID3DXRenderToSurface_GetDevice(render, &out_device); + ok(hr == D3D_OK, "ID3DXRenderToSurface::GetDevice returned %#x, expected %#x\n", hr, D3D_OK); + check_release((IUnknown *)out_device, ref_count); + + check_release((IUnknown *)render, 0); +} + START_TEST(core) { HWND wnd; @@ -535,6 +561,7 @@ START_TEST(core) test_ID3DXSprite(device); test_ID3DXFont(device); test_D3DXCreateRenderToSurface(device); + test_ID3DXRenderToSurface(device); check_release((IUnknown*)device, 0); check_release((IUnknown*)d3d, 0);

1 0

Hans Leidekker : fusion: Account for the version prefix when building the file mask.
by Alexandre Julliard 06 Jun '12

06 Jun '12

Module: wine Branch: master Commit: ea40a90469f3abcc18d1b599d30aa0b7ae6e6c40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea40a90469f3abcc18d1b599d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 6 10:42:43 2012 +0200 fusion: Account for the version prefix when building the file mask. --- dlls/fusion/asmenum.c | 78 +++++++++++++++++++++++++++---------------------- 1 files changed, 43 insertions(+), 35 deletions(-) diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index 641ed2f..76a2bce 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -166,23 +166,32 @@ static const IAssemblyEnumVtbl AssemblyEnumVtbl = { IAssemblyEnumImpl_Clone }; -static void parse_name(IAssemblyName *name, int depth, LPWSTR path, LPWSTR buf) +static void build_file_mask(IAssemblyName *name, int depth, const WCHAR *path, + const WCHAR *prefix, WCHAR *buf) { - WCHAR disp[MAX_PATH]; + static const WCHAR star[] = {'*',0}; + static const WCHAR ss_fmt[] = {'%','s','\\','%','s',0}; + static const WCHAR sss_fmt[] = {'%','s','\\','%','s','_','_','%','s',0}; + static const WCHAR ssss_fmt[] = {'%','s','\\','%','s','%','s','_','_','%','s',0}; + static const WCHAR ver_fmt[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; + static const WCHAR star_fmt[] = {'%','s','\\','*',0}; + static const WCHAR star_prefix_fmt[] = {'%','s','\\','%','s','*',0}; + WCHAR disp[MAX_PATH], version[24]; /* strlen("65535") * 4 + 3 + 1 */ LPCWSTR verptr, pubkeyptr; HRESULT hr; DWORD size, major_size, minor_size, build_size, revision_size; WORD major, minor, build, revision; - - static const WCHAR star[] = {'*',0}; - static const WCHAR ss_fmt[] = {'%','s','\\','%','s',0}; - static const WCHAR verpubkey[] = {'%','s','\\','%','s','_','_','%','s',0}; - static const WCHAR ver_fmt[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; - - WCHAR version[24]; /* strlen("65535") * 4 + 3 + 1 */ WCHAR token_str[TOKEN_LENGTH + 1]; BYTE token[BYTES_PER_TOKEN]; + if (!name) + { + if (prefix && depth == 1) + sprintfW(buf, star_prefix_fmt, path, prefix); + else + sprintfW(buf, star_fmt, path); + return; + } if (depth == 0) { size = MAX_PATH; @@ -224,7 +233,10 @@ static void parse_name(IAssemblyName *name, int depth, LPWSTR path, LPWSTR buf) pubkeyptr = token_str; } - sprintfW(buf, verpubkey, path, verptr, pubkeyptr); + if (prefix) + sprintfW(buf, ssss_fmt, path, prefix, verptr, pubkeyptr); + else + sprintfW(buf, sss_fmt, path, verptr, pubkeyptr); } } @@ -289,31 +301,24 @@ static void insert_assembly(struct list *assemblies, ASMNAME *to_insert) } static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, - int depth, LPWSTR path) + int depth, const WCHAR *prefix, LPWSTR path) { static const WCHAR dot[] = {'.',0}; static const WCHAR dotdot[] = {'.','.',0}; - static const WCHAR search_fmt[] = {'%','s','\\','*',0}; static const WCHAR dblunder[] = {'_','_',0}; static const WCHAR path_fmt[] = {'%','s','\\','%','s','\\','%','s','.','d','l','l',0}; - static const WCHAR fmt[] = {'%','s',',',' ','V','e','r','s','i','o','n','=','%','s',',',' ', + static const WCHAR name_fmt[] = {'%','s',',',' ','V','e','r','s','i','o','n','=','%','s',',',' ', 'C','u','l','t','u','r','e','=','n','e','u','t','r','a','l',',',' ', 'P','u','b','l','i','c','K','e','y','T','o','k','e','n','=','%','s',0}; static const WCHAR ss_fmt[] = {'%','s','\\','%','s',0}; - static const WCHAR v40[] = {'v','4','.','0','_'}; WIN32_FIND_DATAW ffd; - WCHAR buf[MAX_PATH], disp[MAX_PATH], asmpath[MAX_PATH]; + WCHAR buf[MAX_PATH], disp[MAX_PATH], asmpath[MAX_PATH], *ptr; static WCHAR parent[MAX_PATH]; ASMNAME *asmname; HANDLE hfind; - WCHAR *ptr; HRESULT hr = S_OK; - if (name) - parse_name(name, depth, path, buf); - else - sprintfW(buf, search_fmt, path); - + build_file_mask(name, depth, path, prefix, buf); hfind = FindFirstFileW(buf, &ffd); if (hfind == INVALID_HANDLE_VALUE) return S_OK; @@ -334,19 +339,21 @@ static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, } else if (depth == 1) { - unsigned int prefix_len = sizeof(v40)/sizeof(WCHAR); const WCHAR *token, *version = ffd.cFileName; sprintfW(asmpath, path_fmt, path, ffd.cFileName, parent); - ptr = strstrW(ffd.cFileName, dblunder); *ptr = '\0'; token = ptr + 2; - if (strlenW(ffd.cFileName) >= prefix_len && - !memcmp(ffd.cFileName, v40, sizeof(v40))) version += prefix_len; - - sprintfW(disp, fmt, parent, version, token); + if (prefix) + { + unsigned int prefix_len = strlenW(prefix); + if (strlenW(ffd.cFileName) >= prefix_len && + !memicmpW(ffd.cFileName, prefix, prefix_len)) + version += prefix_len; + } + sprintfW(disp, name_fmt, parent, version, token); asmname = HeapAlloc(GetProcessHeap(), 0, sizeof(ASMNAME)); if (!asmname) @@ -376,7 +383,7 @@ static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, } sprintfW(buf, ss_fmt, path, ffd.cFileName); - hr = enum_gac_assemblies(assemblies, name, depth + 1, buf); + hr = enum_gac_assemblies(assemblies, name, depth + 1, prefix, buf); if (FAILED(hr)) break; } while (FindNextFileW(hfind, &ffd) != 0); @@ -391,6 +398,7 @@ static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName) static const WCHAR gac_32[] = {'\\','G','A','C','_','3','2',0}; static const WCHAR gac_64[] = {'\\','G','A','C','_','6','4',0}; static const WCHAR gac_msil[] = {'\\','G','A','C','_','M','S','I','L',0}; + static const WCHAR v40[] = {'v','4','.','0','_',0}; WCHAR path[MAX_PATH], buf[MAX_PATH]; SYSTEM_INFO info; HRESULT hr; @@ -406,17 +414,17 @@ static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName) if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) { strcpyW(path + size - 1, gac_64); - hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); + hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, v40, path); if (FAILED(hr)) return hr; } strcpyW(path + size - 1, gac_32); - hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); + hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, v40, path); if (FAILED(hr)) return hr; strcpyW(path + size - 1, gac_msil); - hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); + hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, v40, path); if (FAILED(hr)) return hr; @@ -429,22 +437,22 @@ static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName) if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) { strcpyW(path + size - 1, gac_64); - hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); + hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, NULL, path); if (FAILED(hr)) return hr; } strcpyW(path + size - 1, gac_32); - hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); + hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, NULL, path); if (FAILED(hr)) return hr; strcpyW(path + size - 1, gac_msil); - hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); + hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, NULL, path); if (FAILED(hr)) return hr; strcpyW(path + size - 1, gac); - hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); + hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, NULL, path); if (FAILED(hr)) return hr;

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

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

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