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

Henri Verbeet : d3d9: Don' t return a pointer to the implementation in IDirect3DTexture9Impl_QueryInterface ().
by Alexandre Julliard 29 Mar '12

29 Mar '12

Module: wine Branch: master Commit: e1b8573ee80a1c876a0d8a433877456bbc14a4f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1b8573ee80a1c876a0d8a433… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 28 20:22:40 2012 +0200 d3d9: Don't return a pointer to the implementation in IDirect3DTexture9Impl_QueryInterface(). --- dlls/d3d9/texture.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 49a0fe6..12da634 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -33,20 +33,20 @@ static inline IDirect3DTexture9Impl *impl_from_IDirect3DTexture9(IDirect3DTextur static HRESULT WINAPI IDirect3DTexture9Impl_QueryInterface(IDirect3DTexture9 *iface, REFIID riid, void **ppobj) { - IDirect3DTexture9Impl *This = impl_from_IDirect3DTexture9(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DResource9) - || IsEqualGUID(riid, &IID_IDirect3DBaseTexture9) - || IsEqualGUID(riid, &IID_IDirect3DTexture9)) { + if (IsEqualGUID(riid, &IID_IDirect3DTexture9) + || IsEqualGUID(riid, &IID_IDirect3DBaseTexture9) + || IsEqualGUID(riid, &IID_IDirect3DResource9) + || IsEqualGUID(riid, &IID_IUnknown)) + { IDirect3DTexture9_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p) not found\n", This, debugstr_guid(riid), ppobj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Andrew Eikum : mmdevapi: TRACE all COM method calls.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: edab3b13f75afc69cae1d04f7ca3f9b5c1d34493 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edab3b13f75afc69cae1d04f7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Mar 28 08:56:26 2012 -0500 mmdevapi: TRACE all COM method calls. --- dlls/mmdevapi/devenum.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index ba55368..6f55c7c 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -649,6 +649,7 @@ static HRESULT WINAPI MMDevice_GetId(IMMDevice *iface, WCHAR **itemid) wsprintfW( str, formatW, id->Data1, id->Data2, id->Data3, id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); + TRACE("returning %s\n", wine_dbgstr_w(str)); return S_OK; } @@ -682,24 +683,28 @@ static inline MMDevice *impl_from_IMMEndpoint(IMMEndpoint *iface) static HRESULT WINAPI MMEndpoint_QueryInterface(IMMEndpoint *iface, REFIID riid, void **ppv) { MMDevice *This = impl_from_IMMEndpoint(iface); + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); return IMMDevice_QueryInterface(&This->IMMDevice_iface, riid, ppv); } static ULONG WINAPI MMEndpoint_AddRef(IMMEndpoint *iface) { MMDevice *This = impl_from_IMMEndpoint(iface); + TRACE("(%p)\n", This); return IMMDevice_AddRef(&This->IMMDevice_iface); } static ULONG WINAPI MMEndpoint_Release(IMMEndpoint *iface) { MMDevice *This = impl_from_IMMEndpoint(iface); + TRACE("(%p)\n", This); return IMMDevice_Release(&This->IMMDevice_iface); } static HRESULT WINAPI MMEndpoint_GetDataFlow(IMMEndpoint *iface, EDataFlow *flow) { MMDevice *This = impl_from_IMMEndpoint(iface); + TRACE("(%p)->(%p)\n", This, flow); if (!flow) return E_POINTER; *flow = This->flow; @@ -738,6 +743,7 @@ static void MMDevCol_Destroy(MMDevColImpl *This) static HRESULT WINAPI MMDevCol_QueryInterface(IMMDeviceCollection *iface, REFIID riid, void **ppv) { MMDevColImpl *This = impl_from_IMMDeviceCollection(iface); + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); if (!ppv) return E_POINTER; @@ -860,6 +866,7 @@ void MMDevEnum_Free(void) static HRESULT WINAPI MMDevEnum_QueryInterface(IMMDeviceEnumerator *iface, REFIID riid, void **ppv) { MMDevEnumImpl *This = impl_from_IMMDeviceEnumerator(iface); + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); if (!ppv) return E_POINTER; @@ -1090,6 +1097,7 @@ static void MMDevPropStore_Destroy(MMDevPropStore *This) static HRESULT WINAPI MMDevPropStore_QueryInterface(IPropertyStore *iface, REFIID riid, void **ppv) { MMDevPropStore *This = impl_from_IPropertyStore(iface); + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); if (!ppv) return E_POINTER; @@ -1181,7 +1189,7 @@ static HRESULT WINAPI MMDevPropStore_GetAt(IPropertyStore *iface, DWORD prop, PR static HRESULT WINAPI MMDevPropStore_GetValue(IPropertyStore *iface, REFPROPERTYKEY key, PROPVARIANT *pv) { MMDevPropStore *This = impl_from_IPropertyStore(iface); - TRACE("(%p)->(\"%s,%u\", %p\n", This, debugstr_guid(&key->fmtid), key ? key->pid : 0, pv); + TRACE("(%p)->(\"%s,%u\", %p)\n", This, key ? debugstr_guid(&key->fmtid) : NULL, key ? key->pid : 0, pv); if (!key || !pv) return E_POINTER; @@ -1206,6 +1214,7 @@ static HRESULT WINAPI MMDevPropStore_GetValue(IPropertyStore *iface, REFPROPERTY static HRESULT WINAPI MMDevPropStore_SetValue(IPropertyStore *iface, REFPROPERTYKEY key, REFPROPVARIANT pv) { MMDevPropStore *This = impl_from_IPropertyStore(iface); + TRACE("(%p)->(\"%s,%u\", %p)\n", This, key ? debugstr_guid(&key->fmtid) : NULL, key ? key->pid : 0, pv); if (!key || !pv) return E_POINTER; @@ -1348,6 +1357,7 @@ static ULONG WINAPI info_device_Release(IMMDevice *iface) static HRESULT WINAPI info_device_OpenPropertyStore(IMMDevice *iface, DWORD access, IPropertyStore **ppv) { + TRACE("(static)->(%x, %p)\n", access, ppv); *ppv = &info_device_ps; return S_OK; }

1 0

Aric Stewart : strmbase: Add beginnings of BaseWindow.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: a179b50c9b694c8965c353f8f3b377e79292e347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a179b50c9b694c8965c353f8f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 28 07:29:06 2012 -0500 strmbase: Add beginnings of BaseWindow. --- dlls/strmbase/Makefile.in | 3 +- dlls/strmbase/window.c | 146 +++++++++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 38 ++++++++++++ 3 files changed, 186 insertions(+), 1 deletions(-) diff --git a/dlls/strmbase/Makefile.in b/dlls/strmbase/Makefile.in index 07ac5a0..06654ab 100644 --- a/dlls/strmbase/Makefile.in +++ b/dlls/strmbase/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ pospass.c \ qualitycontrol.c \ seeking.c \ - transform.c + transform.c \ + window.c @MAKE_IMPLIB_RULES@ diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c new file mode 100644 index 0000000..3a90e78 --- /dev/null +++ b/dlls/strmbase/window.c @@ -0,0 +1,146 @@ +/* + * Generic Implementation of strmbase window classes + * + * Copyright 2012 Aric Stewart, CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "dshow.h" +#include "wine/debug.h" +#include "wine/unicode.h" +#include "wine/strmbase.h" +#include "uuids.h" +#include "vfwmsgs.h" +#include <assert.h> + +WINE_DEFAULT_DEBUG_CHANNEL(strmbase); + +static LRESULT CALLBACK WndProcW(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + BaseWindow* This = (BaseWindow*)GetWindowLongPtrW(hwnd, 0); + + if (!This) + return DefWindowProcW(hwnd, uMsg, wParam, lParam); + + if (This->pFuncsTable->pfnOnReceiveMessage) + return This->pFuncsTable->pfnOnReceiveMessage(This, hwnd, uMsg, wParam, lParam); + else + return BaseWindowImpl_OnReceiveMessage(This, hwnd, uMsg, wParam, lParam); +} + +LRESULT WINAPI BaseWindowImpl_OnReceiveMessage(BaseWindow *This, HWND hwnd, INT uMsg, WPARAM wParam, LPARAM lParam) +{ + if (This->pFuncsTable->pfnPossiblyEatMessage && This->pFuncsTable->pfnPossiblyEatMessage(This, uMsg, wParam, lParam)) + return 0; + + switch (uMsg) + { + case WM_SIZE: + if (This->pFuncsTable->pfnOnSize) + return This->pFuncsTable->pfnOnSize(This, LOWORD(lParam), HIWORD(lParam)); + else + return BaseWindowImpl_OnSize(This, LOWORD(lParam), HIWORD(lParam)); + } + + return DefWindowProcW(hwnd, uMsg, wParam, lParam); +} + +BOOL WINAPI BaseWindowImpl_OnSize(BaseWindow *This, LONG Width, LONG Height) +{ + This->Width = Width; + This->Height = Height; + return TRUE; +} + +HRESULT WINAPI BaseWindow_Init(BaseWindow *pBaseWindow, const BaseWindowFuncTable* pFuncsTable) +{ + if (!pFuncsTable) + return E_INVALIDARG; + + ZeroMemory(pBaseWindow,sizeof(BaseWindow)); + pBaseWindow->pFuncsTable = pFuncsTable; + + return S_OK; +} + +HRESULT WINAPI BaseWindow_Destroy(BaseWindow *This) +{ + if (This->hWnd) + BaseWindowImpl_DoneWithWindow(This); + + HeapFree(GetProcessHeap(), 0, This); + return S_OK; +} + +HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This) +{ + WNDCLASSW winclass; + static const WCHAR windownameW[] = { 'A','c','t','i','v','e','M','o','v','i','e',' ','W','i','n','d','o','w',0 }; + + This->pClassName = This->pFuncsTable->pfnGetClassWindowStyles(This, &This->ClassStyles, &This->WindowStyles, &This->WindowStylesEx); + + winclass.style = This->ClassStyles; + winclass.lpfnWndProc = WndProcW; + winclass.cbClsExtra = 0; + winclass.cbWndExtra = sizeof(BaseWindow*); + winclass.hInstance = This->hInstance; + winclass.hIcon = NULL; + winclass.hCursor = NULL; + winclass.hbrBackground = GetStockObject(BLACK_BRUSH); + winclass.lpszMenuName = NULL; + winclass.lpszClassName = This->pClassName; + if (!RegisterClassW(&winclass) && GetLastError() != ERROR_CLASS_ALREADY_EXISTS) + { + ERR("Unable to register window class: %u\n", GetLastError()); + return E_FAIL; + } + + This->hWnd = CreateWindowExW(This->WindowStylesEx, + This->pClassName, windownameW, + This->WindowStyles, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, NULL, NULL, This->hInstance, + NULL); + + if (!This->hWnd) + { + ERR("Unable to create window\n"); + return E_FAIL; + } + + SetWindowLongPtrW(This->hWnd, 0, (LONG_PTR)This); + + This->hDC = GetDC(This->hWnd); + + return S_OK; +} + +HRESULT WINAPI BaseWindowImpl_DoneWithWindow(BaseWindow *This) +{ + if (!This->hWnd) + return S_OK; + + if (This->hDC) + ReleaseDC(This->hWnd, This->hDC); + This->hDC = NULL; + + DestroyWindow(This->hWnd); + This->hWnd = NULL; + + return S_OK; +} diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 4944e34..f5aac5c 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -391,6 +391,44 @@ VOID WINAPI OutputQueue_EOS(OutputQueue *pOutputQueue); VOID WINAPI OutputQueue_SendAnyway(OutputQueue *pOutputQueue); DWORD WINAPI OutputQueueImpl_ThreadProc(OutputQueue *pOutputQueue); +typedef struct tagBaseWindow +{ + HWND hWnd; + LONG Width; + LONG Height; + HINSTANCE hInstance; + LPWSTR pClassName; + DWORD ClassStyles; + DWORD WindowStyles; + DWORD WindowStylesEx; + HDC hDC; + + const struct BaseWindowFuncTable* pFuncsTable; +} BaseWindow; + +typedef LPWSTR (WINAPI *BaseWindow_GetClassWindowStyles)(BaseWindow *This, DWORD *pClassStyles, DWORD *pWindowStyles, DWORD *pWindowStylesEx); +typedef BOOL (WINAPI *BaseWindow_PossiblyEatMessage)(BaseWindow *This, UINT uMsg, WPARAM wParam, LPARAM lParam); +typedef LRESULT (WINAPI *BaseWindow_OnReceiveMessage)(BaseWindow *This, HWND hwnd, INT uMsg, WPARAM wParam, LPARAM lParam); +typedef BOOL (WINAPI *BaseWindow_OnSize)(BaseWindow *This, LONG Height, LONG Width); + +typedef struct BaseWindowFuncTable +{ + /* Required */ + BaseWindow_GetClassWindowStyles pfnGetClassWindowStyles; + /* Optional, WinProc Related */ + BaseWindow_OnReceiveMessage pfnOnReceiveMessage; + BaseWindow_PossiblyEatMessage pfnPossiblyEatMessage; + BaseWindow_OnSize pfnOnSize; +} BaseWindowFuncTable; + +HRESULT WINAPI BaseWindow_Init(BaseWindow *pBaseWindow, const BaseWindowFuncTable* pFuncsTable); +HRESULT WINAPI BaseWindow_Destroy(BaseWindow *pBaseWindow); + +HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This); +HRESULT WINAPI BaseWindowImpl_DoneWithWindow(BaseWindow *This); +LRESULT WINAPI BaseWindowImpl_OnReceiveMessage(BaseWindow *This, HWND hwnd, INT uMsg, WPARAM wParam, LPARAM lParam); +BOOL WINAPI BaseWindowImpl_OnSize(BaseWindow *This, LONG Height, LONG Width); + /* Dll Functions */ BOOL WINAPI STRMBASE_DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv); HRESULT WINAPI STRMBASE_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv);

1 0

Matteo Bruni : wined3d: Update the correct draw buffers mask.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 439097c810bdcb2bd3f838d2ee47369d1f4d7e8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=439097c810bdcb2bd3f838d2e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 28 13:52:11 2012 +0200 wined3d: Update the correct draw buffers mask. --- dlls/wined3d/context.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index fe26549..7d16d3c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2041,7 +2041,7 @@ static DWORD context_generate_rt_mask_no_fbo(const struct wined3d_device *device void context_apply_blit_state(struct wined3d_context *context, const struct wined3d_device *device) { struct wined3d_surface *rt = context->current_rt; - DWORD rt_mask, old_mask; + DWORD rt_mask, *cur_mask; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { @@ -2072,13 +2072,13 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine rt_mask = context_generate_rt_mask_no_fbo(device, rt); } - old_mask = context->current_fbo ? context->current_fbo->rt_mask : context->draw_buffers_mask; + cur_mask = context->current_fbo ? &context->current_fbo->rt_mask : &context->draw_buffers_mask; ENTER_GL(); - if (rt_mask != old_mask) + if (rt_mask != *cur_mask) { context_apply_draw_buffers(context, rt_mask); - context->draw_buffers_mask = rt_mask; + *cur_mask = rt_mask; } if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) @@ -2112,7 +2112,7 @@ static BOOL context_validate_rt_config(UINT rt_count, BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_device *device, UINT rt_count, const struct wined3d_fb_state *fb) { - DWORD rt_mask = 0, old_mask; + DWORD rt_mask = 0, *cur_mask; UINT i; struct wined3d_surface **rts = fb->render_targets; @@ -2177,13 +2177,13 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win rt_mask = context_generate_rt_mask_no_fbo(device, rt_count ? rts[0] : NULL); } - old_mask = context->current_fbo ? context->current_fbo->rt_mask : context->draw_buffers_mask; + cur_mask = context->current_fbo ? &context->current_fbo->rt_mask : &context->draw_buffers_mask; ENTER_GL(); - if (rt_mask != old_mask) + if (rt_mask != *cur_mask) { context_apply_draw_buffers(context, rt_mask); - context->draw_buffers_mask = rt_mask; + *cur_mask = rt_mask; context_invalidate_state(context, STATE_FRAMEBUFFER); } @@ -2246,7 +2246,7 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat const struct wined3d_device *device = context->swapchain->device; const struct wined3d_fb_state *fb = state->fb; DWORD rt_mask = find_draw_buffers_mask(context, device); - DWORD old_mask; + DWORD *cur_mask; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { @@ -2263,11 +2263,11 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat } } - old_mask = context->current_fbo ? context->current_fbo->rt_mask : context->draw_buffers_mask; - if (rt_mask != old_mask) + cur_mask = context->current_fbo ? &context->current_fbo->rt_mask : &context->draw_buffers_mask; + if (rt_mask != *cur_mask) { context_apply_draw_buffers(context, rt_mask); - context->draw_buffers_mask = rt_mask; + *cur_mask = rt_mask; } } @@ -2275,16 +2275,16 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat void context_state_drawbuf(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_device *device = context->swapchain->device; - DWORD rt_mask, old_mask; + DWORD rt_mask, *cur_mask; if (isStateDirty(context, STATE_FRAMEBUFFER)) return; - old_mask = context->current_fbo ? context->current_fbo->rt_mask : context->draw_buffers_mask; + cur_mask = context->current_fbo ? &context->current_fbo->rt_mask : &context->draw_buffers_mask; rt_mask = find_draw_buffers_mask(context, device); - if (rt_mask != old_mask) + if (rt_mask != *cur_mask) { context_apply_draw_buffers(context, rt_mask); - context->draw_buffers_mask = rt_mask; + *cur_mask = rt_mask; } }

1 0

Matteo Bruni : wined3d: Support WINED3D_TTFF_COUNT3 texture projection in the ARB backend.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 7e3c7840e3d873aa4c6b323d4bc0fc07b669e1b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e3c7840e3d873aa4c6b323d4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 28 13:52:12 2012 +0200 wined3d: Support WINED3D_TTFF_COUNT3 texture projection in the ARB backend. --- dlls/wined3d/arb_program_shader.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 50cd91a..6b2d950 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1914,6 +1914,7 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins) char reg_coord[40]; DWORD reg_sampler_code; WORD myflags = 0; + BOOL swizzle_coord = FALSE; /* All versions have a destination register */ shader_arb_get_dst_param(ins, dst, reg_dest); @@ -1948,18 +1949,18 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins) if (reg_sampler_code < MAX_TEXTURES) flags = priv->cur_ps_args->super.tex_transform >> reg_sampler_code * WINED3D_PSARGS_TEXTRANSFORM_SHIFT; if (flags & WINED3D_PSARGS_PROJECTED) + { myflags |= TEX_PROJ; + if ((flags & ~WINED3D_PSARGS_PROJECTED) == WINED3D_TTFF_COUNT3) + swizzle_coord = TRUE; + } } else if (shader_version < WINED3D_SHADER_VERSION(2,0)) { enum wined3d_shader_src_modifier src_mod = ins->src[0].modifiers; if (src_mod == WINED3DSPSM_DZ) { - /* TXP cannot handle DZ natively, so move the z coordinate to .w. reg_coord is a read-only - * varying register, so we need a temp reg - */ - shader_addline(ins->ctx->buffer, "SWZ TA, %s, x, y, z, z;\n", reg_coord); - strcpy(reg_coord, "TA"); + swizzle_coord = TRUE; myflags |= TEX_PROJ; } else if(src_mod == WINED3DSPSM_DW) { myflags |= TEX_PROJ; @@ -1968,6 +1969,15 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins) if (ins->flags & WINED3DSI_TEXLD_PROJECT) myflags |= TEX_PROJ; if (ins->flags & WINED3DSI_TEXLD_BIAS) myflags |= TEX_BIAS; } + + if (swizzle_coord) + { + /* TXP cannot handle DZ natively, so move the z coordinate to .w. + * reg_coord is a read-only varying register, so we need a temp reg */ + shader_addline(ins->ctx->buffer, "SWZ TA, %s, x, y, z, z;\n", reg_coord); + strcpy(reg_coord, "TA"); + } + shader_hw_sample(ins, reg_sampler_code, reg_dest, reg_coord, myflags, NULL, NULL); }

1 0

Matteo Bruni : include: Fix some winsock definitions.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: c0d4c66a5a790a302bd089c24c619a518e4a4909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0d4c66a5a790a302bd089c24… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 28 13:52:13 2012 +0200 include: Fix some winsock definitions. --- include/winsock2.h | 28 ++++++++++++++-------------- include/ws2spi.h | 1 + 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/include/winsock2.h b/include/winsock2.h index b884587..3e060e5 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -678,9 +678,9 @@ DWORD WINAPI WSAWaitForMultipleEvents(DWORD,const WSAEVENT*,BOOL,DWORD,BOOL); * "Winsock2 Prototypes" section above. */ #if WS_API_TYPEDEFS -typedef SOCKET (WINAPI *LPFN_WSAACCEPT)(SOCKET,WS(sockaddr)*,LPINT,LPCONDITIONPROC,DWORD_PTR); -typedef INT (WINAPI *LPFN_WSAADRESSTOSTRINGA)(LPSOCKADDR,DWORD,LPWSAPROTOCOL_INFOA,LPSTR,LPDWORD); -typedef INT (WINAPI *LPFN_WSAADRESSTOSTRINGW)(LPSOCKADDR,DWORD,LPWSAPROTOCOL_INFOW,LPWSTR,LPDWORD); +typedef SOCKET (WINAPI *LPFN_WSAACCEPT)(SOCKET,struct WS(sockaddr)*,LPINT,LPCONDITIONPROC,DWORD_PTR); +typedef INT (WINAPI *LPFN_WSAADDRESSTOSTRINGA)(LPSOCKADDR,DWORD,LPWSAPROTOCOL_INFOA,LPSTR,LPDWORD); +typedef INT (WINAPI *LPFN_WSAADDRESSTOSTRINGW)(LPSOCKADDR,DWORD,LPWSAPROTOCOL_INFOW,LPWSTR,LPDWORD); #define LPFN_WSAADDRESSTOSTRING WINELIB_NAME_AW(LPFN_WSAADDRESSTOSTRING) typedef BOOL (WINAPI *LPFN_WSACLOSEEVENT)(WSAEVENT); typedef int (WINAPI *LPFN_WSACONNECT)(SOCKET,const struct WS(sockaddr)*,int,LPWSABUF,LPWSABUF,LPQOS,LPQOS); @@ -688,36 +688,36 @@ typedef WSAEVENT (WINAPI *LPFN_WSACREATEEVENT)(void); typedef INT (WINAPI *LPFN_WSADUPLICATESOCKETA)(SOCKET,DWORD,LPWSAPROTOCOL_INFOA); typedef INT (WINAPI *LPFN_WSADUPLICATESOCKETW)(SOCKET,DWORD,LPWSAPROTOCOL_INFOW); #define LPFN_WSADUPLICATESOCKET WINELIB_NAME_AW(LPFN_WSADUPLICATESOCKET) -typedef INT (WINAPI *LPFNWSAENUMNAMESPACEPROVIDERSA)(LPDWORD,LPWSANAMESPACE_INFOA); -typedef INT (WINAPI *LPFNWSAENUMNAMESPACEPROVIDERSW)(LPDWORD,LPWSANAMESPACE_INFOW); -#define LPFN_WSAENUMNAMESPACEPROVIDERS WINELIB_NAME_AW(LPFNWSAENUMNAMESPACEPROVIDERS) -typedef int (WINAPI *LPFN_WSAENUMNETWORKEVENT)(SOCKET,WSAEVENT,LPWSANETWORKEVENTS); +typedef INT (WINAPI *LPFN_WSAENUMNAMESPACEPROVIDERSA)(LPDWORD,LPWSANAMESPACE_INFOA); +typedef INT (WINAPI *LPFN_WSAENUMNAMESPACEPROVIDERSW)(LPDWORD,LPWSANAMESPACE_INFOW); +#define LPFN_WSAENUMNAMESPACEPROVIDERS WINELIB_NAME_AW(LPFN_WSAENUMNAMESPACEPROVIDERS) +typedef int (WINAPI *LPFN_WSAENUMNETWORKEVENTS)(SOCKET,WSAEVENT,LPWSANETWORKEVENTS); typedef int (WINAPI *LPFN_WSAENUMPROTOCOLSA)(LPINT,LPWSAPROTOCOL_INFOA,LPDWORD); typedef int (WINAPI *LPFN_WSAENUMPROTOCOLSW)(LPINT,LPWSAPROTOCOL_INFOW,LPDWORD); #define LPFN_WSAENUMPROTOCOLS WINELIB_NAME_AW(LPFN_WSAENUMPROTOCOLS) typedef int (WINAPI *LPFN_WSAEVENTSELECT)(SOCKET,WSAEVENT,LONG); typedef BOOL (WINAPI *LPFN_WSAGETOVERLAPPEDRESULT)(SOCKET,LPWSAOVERLAPPED,LPDWORD,BOOL,LPDWORD); -typedef BOOL (WINAPI *LPFNWSAGETQOSBYNAME)(SOCKET,LPWSABUF,LPQOS); -typedef INT (WINAPI *LPFNWSAGETSERVICECLASSINFOA)(LPGUID,LPGUID,LPDWORD,LPWSASERVICECLASSINFOA); -typedef INT (WINAPI *LPFNWSAGETSERVICECLASSINFOW)(LPGUID,LPGUID,LPDWORD,LPWSASERVICECLASSINFOW); +typedef BOOL (WINAPI *LPFN_WSAGETQOSBYNAME)(SOCKET,LPWSABUF,LPQOS); +typedef INT (WINAPI *LPFN_WSAGETSERVICECLASSINFOA)(LPGUID,LPGUID,LPDWORD,LPWSASERVICECLASSINFOA); +typedef INT (WINAPI *LPFN_WSAGETSERVICECLASSINFOW)(LPGUID,LPGUID,LPDWORD,LPWSASERVICECLASSINFOW); #define LPFN_LPFNWSAGETSERVICECLASSINFO WINELIB_NAME_AW(LPFN_LPFNWSAGETSERVICECLASSINFO) typedef INT (WINAPI *LPFN_WSAGETSERVICECLASSNAMEBYCLASSIDA)(LPGUID,LPSTR,LPDWORD); typedef INT (WINAPI *LPFN_WSAGETSERVICECLASSNAMEBYCLASSIDW)(LPGUID,LPWSTR,LPDWORD); #define LPFN_WSAGETSERVICECLASSNAMEBYCLASSID WINELIB_NAME_AW(LPFN_WSAGETSERVICECLASSNAMEBYCLASSID) typedef int (WINAPI *LPFN_WSAHTONL)(SOCKET,ULONG,ULONG*); typedef int (WINAPI *LPFN_WSAHTONS)(SOCKET,WS(u_short),WS(u_short)*); -typedef int (WINAPI LPFN_WSAINSTALLSERVICECLASSA)(LPWSASERVICECLASSINFOA); -typedef int (WINAPI LPFN_WSAINSTALLSERVICECLASSW)(LPWSASERVICECLASSINFOW); +typedef int (WINAPI *LPFN_WSAINSTALLSERVICECLASSA)(LPWSASERVICECLASSINFOA); +typedef int (WINAPI *LPFN_WSAINSTALLSERVICECLASSW)(LPWSASERVICECLASSINFOW); typedef int (WINAPI *LPFN_WSAIOCTL)(SOCKET,DWORD,LPVOID,DWORD,LPVOID,DWORD,LPDWORD,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE); typedef int (WINAPI *LPFN_WSAJOINLEAF)(SOCKET,const struct WS(sockaddr)*,int,LPWSABUF,LPWSABUF,LPQOS,LPQOS,DWORD); typedef INT (WINAPI *LPFN_WSALOOKUPSERVICEBEGINA)(LPWSAQUERYSETA,DWORD,LPHANDLE); typedef INT (WINAPI *LPFN_WSALOOKUPSERVICEBEGINW)(LPWSAQUERYSETW,DWORD,LPHANDLE); #define LPFN_WSALOOKUPSERVICEBEGIN WINELIB_NAME_AW(LPFN_WSALOOKUPSERVICEBEGIN); -typedef INT (WINAPI *LPFN_WSALOOKUPSERVICEEND(HANDLE); +typedef INT (WINAPI *LPFN_WSALOOKUPSERVICEEND)(HANDLE); typedef INT (WINAPI *LPFN_WSALOOKUPSERVICENEXTA)(HANDLE,DWORD,LPDWORD,LPWSAQUERYSETA); typedef INT (WINAPI *LPFN_WSALOOKUPSERVICENEXTW)(HANDLE,DWORD,LPDWORD,LPWSAQUERYSETW); #define LPFN_WSALOOKUPSERVICENEXT WINELIB_NAME_AW(LPFN_WSALOOKUPSERVICENEXT) -typedef int (WINAPI *LPFN_WSANSPIoctl)(HANDLE, DWORD,LPVOID,DWORD,LPVOID,DWORD,LPDWORD,LPWSACOMPLETION); +typedef int (WINAPI *LPFN_WSANSPIOCTL)(HANDLE,DWORD,LPVOID,DWORD,LPVOID,DWORD,LPDWORD,LPWSACOMPLETION); typedef int (WINAPI *LPFN_WSANTOHL)(SOCKET,ULONG,ULONG*); typedef int (WINAPI *LPFN_WSANTOHS)(SOCKET,WS(u_short),WS(u_short)*); typedef INT (WINAPI *LPFN_WSAPROVIDERCONFIGCHANGE)(LPHANDLE,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE); diff --git a/include/ws2spi.h b/include/ws2spi.h index b30c45c..5df7d24 100644 --- a/include/ws2spi.h +++ b/include/ws2spi.h @@ -42,6 +42,7 @@ INT WINAPI WSCEnumProtocols(LPINT,LPWSAPROTOCOL_INFOW,LPDWORD,LPINT); INT WINAPI WSCGetProviderPath(LPGUID,LPWSTR,LPINT,LPINT); INT WINAPI WSCInstallNameSpace(LPWSTR,LPWSTR,DWORD,DWORD,LPGUID); INT WINAPI WSCUnInstallNameSpace(LPGUID); +INT WINAPI WSCUpdateProvider(LPGUID, const WCHAR *, const LPWSAPROTOCOL_INFOW, DWORD, LPINT); INT WINAPI WSCWriteProviderOrder(LPDWORD,DWORD); #ifdef __cplusplus

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 576b639535890922f9e966caa69d3d3c003806a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=576b639535890922f9e966caa… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Mar 28 13:19:01 2012 +0200 po: Update French translation. --- po/fr.po | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index a1ed20a..3ad094b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3474,10 +3474,8 @@ msgid "Expected ')'" msgstr "« ) » attendu" #: jscript.rc:37 -#, fuzzy -#| msgid "Invalid parameter.\n" msgid "Invalid character" -msgstr "Paramètre non valide.\n" +msgstr "Caractère non valide" #: jscript.rc:38 msgid "Unterminated string constant"

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 1528d9021f174875ecda0af1ed0458deba3a7a26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1528d9021f174875ecda0af1e… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue Mar 27 21:19:44 2012 +0900 po: Update Korean translation. --- po/ko.po | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/po/ko.po b/po/ko.po index 474cc9c..7f4ae51 100644 --- a/po/ko.po +++ b/po/ko.po @@ -3440,10 +3440,8 @@ msgid "Expected ')'" msgstr "')' 가 필요합니다" #: jscript.rc:37 -#, fuzzy -#| msgid "Invalid parameter.\n" msgid "Invalid character" -msgstr "잘못된 매개변수.\n" +msgstr "잘못된 문자" #: jscript.rc:38 msgid "Unterminated string constant"

1 0

Jacek Caban : jscript: Properly handle NULL bstr in str_to_number.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 8f36daa4229389bfbbf10801381f6f9c3a643e57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f36daa4229389bfbbf108013… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 28 15:04:28 2012 +0200 jscript: Properly handle NULL bstr in str_to_number. --- dlls/jscript/jsutils.c | 5 +++++ dlls/jscript/tests/lang.js | 4 +++- dlls/jscript/tests/run.c | 28 ++++++++++++++++++++++++---- 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 31c471f..040ec58 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -320,6 +320,11 @@ static HRESULT str_to_number(BSTR str, double *ret) static const WCHAR infinityW[] = {'I','n','f','i','n','i','t','y'}; + if(!ptr) { + *ret = 0; + return S_OK; + } + while(isspaceW(*ptr)) ptr++; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index b6fe821..8f5e5d5 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1238,7 +1238,9 @@ for(var i=0; i<2; i++) tmp[i] = /b/; ok(tmp[0] != tmp[1], "tmp[0] == tmp [1]"); -ok(createNullBSTR() === '', "createNullBSTR() !== ''"); +ok(isNullBSTR(getNullBSTR()), "isNullBSTR(getNullBSTR()) failed\n"); +ok(getNullBSTR() === '', "getNullBSTR() !== ''"); +ok(+getNullBSTR() === 0 , "+getNullBTR() !=== 0"); ok(getVT(nullDisp) === "VT_DISPATCH", "getVT(nullDisp) = " + getVT(nullDisp)); ok(typeof(nullDisp) === "object", "typeof(nullDisp) = " + typeof(nullDisp)); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index dbf83e6..e6f0009 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -84,7 +84,7 @@ DEFINE_EXPECT(DeleteMemberByDispID); #define DISPID_GLOBAL_OK 0x1004 #define DISPID_GLOBAL_GETVT 0x1005 #define DISPID_GLOBAL_TESTOBJ 0x1006 -#define DISPID_GLOBAL_NULL_BSTR 0x1007 +#define DISPID_GLOBAL_GETNULLBSTR 0x1007 #define DISPID_GLOBAL_NULL_DISP 0x1008 #define DISPID_GLOBAL_TESTTHIS 0x1009 #define DISPID_GLOBAL_TESTTHIS2 0x100a @@ -95,6 +95,7 @@ DEFINE_EXPECT(DeleteMemberByDispID); #define DISPID_GLOBAL_ISWIN64 0x100f #define DISPID_GLOBAL_PUREDISP 0x1010 #define DISPID_GLOBAL_TESTPROPDELETE 0x1010 +#define DISPID_GLOBAL_ISNULLBSTR 0x1011 #define DISPID_TESTOBJ_PROP 0x2000 #define DISPID_TESTOBJ_ONLYDISPID 0x2001 @@ -438,8 +439,12 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_TESTOBJ; return S_OK; } - if(!strcmp_wa(bstrName, "createNullBSTR")) { - *pid = DISPID_GLOBAL_NULL_BSTR; + if(!strcmp_wa(bstrName, "getNullBSTR")) { + *pid = DISPID_GLOBAL_GETNULLBSTR; + return S_OK; + } + if(!strcmp_wa(bstrName, "isNullBSTR")) { + *pid = DISPID_GLOBAL_ISNULLBSTR; return S_OK; } if(!strcmp_wa(bstrName, "nullDisp")) { @@ -663,13 +668,28 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_DISPATCH(pvarRes) = (IDispatch*)&pureDisp; return S_OK; - case DISPID_GLOBAL_NULL_BSTR: + case DISPID_GLOBAL_GETNULLBSTR: if(pvarRes) { V_VT(pvarRes) = VT_BSTR; V_BSTR(pvarRes) = NULL; } return S_OK; + case DISPID_GLOBAL_ISNULLBSTR: + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + ok(pei != NULL, "pei == NULL\n"); + ok(V_VT(pdp->rgvarg) == VT_BSTR, "V_VT(pdp->rgvarg) = %d\n", V_VT(pdp->rgvarg)); + + V_VT(pvarRes) = VT_BOOL; + V_BOOL(pvarRes) = V_BSTR(pdp->rgvarg) ? VARIANT_FALSE : VARIANT_TRUE; + return S_OK; + case DISPID_GLOBAL_ISWIN64: if(pvarRes) { V_VT(pvarRes) = VT_BOOL;

1 0

Hans Leidekker : sxs: Parse the display name in CreateAssemblyNameObject.
by Alexandre Julliard 28 Mar '12

28 Mar '12

Module: wine Branch: master Commit: 5a6b9ec329e852345599d5f18cd5461c8eff48fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a6b9ec329e852345599d5f18… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 28 15:33:30 2012 +0200 sxs: Parse the display name in CreateAssemblyNameObject. --- dlls/sxs/name.c | 196 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/sxs/sxs_private.h | 38 +++++++++ 2 files changed, 227 insertions(+), 7 deletions(-) diff --git a/dlls/sxs/name.c b/dlls/sxs/name.c index 1adeebd..9ca911b 100644 --- a/dlls/sxs/name.c +++ b/dlls/sxs/name.c @@ -28,6 +28,8 @@ #include "winsxs.h" #include "wine/debug.h" +#include "wine/unicode.h" +#include "sxs_private.h" WINE_DEFAULT_DEBUG_CHANNEL(sxs); @@ -35,8 +37,18 @@ struct name { IAssemblyName IAssemblyName_iface; LONG refs; + WCHAR *name; + WCHAR *arch; + WCHAR *token; + WCHAR *type; + WCHAR *version; }; +static const WCHAR archW[] = {'p','r','o','c','e','s','s','o','r','A','r','c','h','i','t','e','c','t','u','r','e',0}; +static const WCHAR tokenW[] = {'p','u','b','l','i','c','K','e','y','T','o','k','e','n',0}; +static const WCHAR typeW[] = {'t','y','p','e',0}; +static const WCHAR versionW[] = {'v','e','r','s','i','o','n',0}; + static inline struct name *impl_from_IAssemblyName( IAssemblyName *iface ) { return CONTAINING_RECORD( iface, struct name, IAssemblyName_iface ); @@ -79,6 +91,11 @@ static ULONG WINAPI name_Release( IAssemblyName *iface ) if (!refs) { TRACE("destroying %p\n", name); + HeapFree( GetProcessHeap(), 0, name->name ); + HeapFree( GetProcessHeap(), 0, name->arch ); + HeapFree( GetProcessHeap(), 0, name->token ); + HeapFree( GetProcessHeap(), 0, name->type ); + HeapFree( GetProcessHeap(), 0, name->version ); HeapFree( GetProcessHeap(), 0, name ); } return refs; @@ -117,8 +134,32 @@ static HRESULT WINAPI name_GetDisplayName( LPDWORD buflen, DWORD flags ) { - FIXME("%p, %p, %p, 0x%08x\n", iface, buffer, buflen, flags); - return E_NOTIMPL; + static const WCHAR fmtW[] = {',','%','s','=','\"','%','s','\"',0}; + struct name *name = impl_from_IAssemblyName( iface ); + WCHAR version[30]; + unsigned int len; + + TRACE("%p, %p, %p, 0x%08x\n", iface, buffer, buflen, flags); + + if (!buflen || flags) return E_INVALIDARG; + + len = strlenW( name->name ) + 1; + if (name->arch) len += strlenW( archW ) + strlenW( name->arch ) + 4; + if (name->token) len += strlenW( tokenW ) + strlenW( name->token ) + 4; + if (name->type) len += strlenW( typeW ) + strlenW( name->type ) + 4; + if (name->version) len += strlenW( versionW ) + strlenW( version ) + 4; + if (len > *buflen) + { + *buflen = len; + return HRESULT_FROM_WIN32( ERROR_INSUFFICIENT_BUFFER ); + } + strcpyW( buffer, name->name ); + len = strlenW( buffer ); + if (name->arch) len += sprintfW( buffer + len, fmtW, archW, name->arch ); + if (name->token) len += sprintfW( buffer + len, fmtW, tokenW, name->token ); + if (name->type) len += sprintfW( buffer + len, fmtW, typeW, name->type ); + if (name->version) len += sprintfW( buffer + len, fmtW, versionW, name->version ); + return S_OK; } static HRESULT WINAPI name_Reserved( @@ -139,22 +180,85 @@ static HRESULT WINAPI name_Reserved( return E_NOTIMPL; } +const WCHAR *get_name_attribute( IAssemblyName *iface, enum name_attr_id id ) +{ + struct name *name = impl_from_IAssemblyName( iface ); + + switch (id) + { + case NAME_ATTR_ID_NAME: return name->name; + case NAME_ATTR_ID_ARCH: return name->arch; + case NAME_ATTR_ID_TOKEN: return name->token; + case NAME_ATTR_ID_TYPE: return name->type; + case NAME_ATTR_ID_VERSION: return name->version; + default: + ERR("unhandled name attribute %u\n", id); + break; + } + return NULL; +} + static HRESULT WINAPI name_GetName( IAssemblyName *iface, LPDWORD buflen, WCHAR *buffer ) { - FIXME("%p, %p, %p\n", iface, buflen, buffer); - return E_NOTIMPL; + const WCHAR *name; + int len; + + TRACE("%p, %p, %p\n", iface, buflen, buffer); + + if (!buflen || !buffer) return E_INVALIDARG; + + name = get_name_attribute( iface, NAME_ATTR_ID_NAME ); + len = strlenW( name ) + 1; + if (len > *buflen) + { + *buflen = len; + return HRESULT_FROM_WIN32( ERROR_INSUFFICIENT_BUFFER ); + } + strcpyW( buffer, name ); + *buflen = len + 3; + return S_OK; +} + +static HRESULT parse_version( WCHAR *version, DWORD *high, DWORD *low ) +{ + WORD ver[4]; + WCHAR *p, *q; + unsigned int i; + + memset( ver, 0, sizeof(ver) ); + for (i = 0, p = version; i < 4; i++) + { + if (!*p) break; + q = strchrW( p, '.' ); + if (q) *q = 0; + ver[i] = atolW( p ); + if (!q && i < 3) break; + p = q + 1; + } + *high = (ver[0] << 16) + ver[1]; + *low = (ver[2] << 16) + ver[3]; + return S_OK; } static HRESULT WINAPI name_GetVersion( IAssemblyName *iface, - LPDWORD hi, + LPDWORD high, LPDWORD low ) { - FIXME("%p, %p, %p\n", iface, hi, low); - return E_NOTIMPL; + struct name *name = impl_from_IAssemblyName( iface ); + WCHAR *version; + HRESULT hr; + + TRACE("%p, %p, %p\n", iface, high, low); + + if (!name->version) return HRESULT_FROM_WIN32( ERROR_NOT_FOUND ); + if (!(version = strdupW( name->version ))) return E_OUTOFMEMORY; + hr = parse_version( version, high, low ); + HeapFree( GetProcessHeap(), 0, version ); + return hr; } static HRESULT WINAPI name_IsEqual( @@ -190,6 +294,72 @@ static const IAssemblyNameVtbl name_vtbl = name_Clone }; +static WCHAR *parse_value( const WCHAR *str, unsigned int *len ) +{ + WCHAR *ret; + const WCHAR *p = str; + + if (*p++ != '\"') return NULL; + while (*p && *p != '\"') p++; + if (!*p) return NULL; + + *len = p - str; + if (!(ret = HeapAlloc( GetProcessHeap(), 0, *len * sizeof(WCHAR) ))) return NULL; + memcpy( ret, str + 1, (*len - 1) * sizeof(WCHAR) ); + ret[*len - 1] = 0; + return ret; +} + +static HRESULT parse_displayname( struct name *name, const WCHAR *displayname ) +{ + const WCHAR *p, *q; + unsigned int len; + + p = q = displayname; + while (*q && *q != ',') q++; + len = q - p; + if (!(name->name = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + memcpy( name->name, p, len * sizeof(WCHAR) ); + name->name[len] = 0; + if (!*q) return S_OK; + + for (;;) + { + p = ++q; + while (*q && *q != '=') q++; + if (!*q) return E_INVALIDARG; + len = q - p; + if (len == sizeof(archW)/sizeof(archW[0]) - 1 && !memcmp( p, archW, len * sizeof(WCHAR) )) + { + p = ++q; + if (!(name->arch = parse_value( p, &len ))) return E_INVALIDARG; + q += len; + } + else if (len == sizeof(tokenW)/sizeof(tokenW[0]) - 1 && !memcmp( p, tokenW, len * sizeof(WCHAR) )) + { + p = ++q; + if (!(name->token = parse_value( p, &len ))) return E_INVALIDARG; + q += len; + } + else if (len == sizeof(typeW)/sizeof(typeW[0]) - 1 && !memcmp( p, typeW, len * sizeof(WCHAR) )) + { + p = ++q; + if (!(name->type = parse_value( p, &len ))) return E_INVALIDARG; + q += len; + } + else if (len == sizeof(versionW)/sizeof(versionW[0]) - 1 && !memcmp( p, versionW, len * sizeof(WCHAR) )) + { + p = ++q; + if (!(name->version = parse_value( p, &len ))) return E_INVALIDARG; + q += len; + } + else return HRESULT_FROM_WIN32( ERROR_SXS_INVALID_ASSEMBLY_IDENTITY_ATTRIBUTE_NAME ); + while (*q && *q != ',') q++; + if (!*q) break; + } + return S_OK; +} + /****************************************************************** * CreateAssemblyNameObject (SXS.@) */ @@ -200,6 +370,7 @@ HRESULT WINAPI CreateAssemblyNameObject( LPVOID reserved ) { struct name *name; + HRESULT hr; TRACE("%p, %s, 0x%08x, %p\n", obj, debugstr_w(assembly), flags, reserved); @@ -215,6 +386,17 @@ HRESULT WINAPI CreateAssemblyNameObject( name->IAssemblyName_iface.lpVtbl = &name_vtbl; name->refs = 1; + hr = parse_displayname( name, assembly ); + if (hr != S_OK) + { + HeapFree( GetProcessHeap(), 0, name->name ); + HeapFree( GetProcessHeap(), 0, name->arch ); + HeapFree( GetProcessHeap(), 0, name->token ); + HeapFree( GetProcessHeap(), 0, name->type ); + HeapFree( GetProcessHeap(), 0, name->version ); + HeapFree( GetProcessHeap(), 0, name ); + return hr; + } *obj = &name->IAssemblyName_iface; return S_OK; } diff --git a/dlls/sxs/sxs_private.h b/dlls/sxs/sxs_private.h new file mode 100644 index 0000000..8ff9920 --- /dev/null +++ b/dlls/sxs/sxs_private.h @@ -0,0 +1,38 @@ +/* + * Copyright 2012 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +enum name_attr_id +{ + NAME_ATTR_ID_NAME, + NAME_ATTR_ID_ARCH, + NAME_ATTR_ID_TOKEN, + NAME_ATTR_ID_TYPE, + NAME_ATTR_ID_VERSION +}; + +const WCHAR *get_name_attribute( IAssemblyName *, enum name_attr_id ); + +static inline WCHAR *strdupW( const WCHAR *src ) +{ + WCHAR *dst; + + if (!src) return NULL; + dst = HeapAlloc( GetProcessHeap(), 0, (strlenW( src ) + 1) * sizeof(WCHAR) ); + if (dst) strcpyW( dst, src ); + return dst; +}

1 0