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

Huw Davies : gdi32: Add a helper to create a new FreeType face.
by Alexandre Julliard March 29, 2012

March 29, 2012

Module: wine Branch: master Commit: 7ac623f380354244a7f068ce22e1f4780508ee5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ac623f380354244a7f068ce2… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 28 14:49:23 2012 +0100 gdi32: Add a helper to create a new FreeType face. --- dlls/gdi32/freetype.c | 140 +++++++++++++++++++++++++++---------------------- 1 files changed, 78 insertions(+), 62 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 8a077a9..44222cf 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1789,11 +1789,85 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr debugstr_w(face->StyleName)); } +static FT_Face new_ft_face( const char *file, void *font_data_ptr, DWORD font_data_size, + FT_Long face_index, BOOL allow_bitmap ) +{ + FT_Error err; + TT_OS2 *pOS2; + FT_Face ft_face; + + if (file) + { + TRACE("Loading font file %s index %ld\n", debugstr_a(file), face_index); + err = pFT_New_Face(library, file, face_index, &ft_face); + } + else + { + TRACE("Loading font from ptr %p size %d, index %ld\n", font_data_ptr, font_data_size, face_index); + err = pFT_New_Memory_Face(library, font_data_ptr, font_data_size, face_index, &ft_face); + } + + if (err != 0) + { + WARN("Unable to load font %s/%p err = %x\n", debugstr_a(file), font_data_ptr, err); + return NULL; + } + + /* There are too many bugs in FreeType < 2.1.9 for bitmap font support */ + if (!FT_IS_SCALABLE( ft_face ) && FT_SimpleVersion < ((2 << 16) | (1 << 8) | (9 << 0))) + { + WARN("FreeType version < 2.1.9, skipping bitmap font %s/%p\n", debugstr_a(file), font_data_ptr); + goto fail; + } + + if (!FT_IS_SFNT( ft_face )) + { + if (FT_IS_SCALABLE( ft_face ) || !allow_bitmap ) + { + WARN("Ignoring font %s/%p\n", debugstr_a(file), font_data_ptr); + goto fail; + } + } + else + { + if (!(pOS2 = pFT_Get_Sfnt_Table( ft_face, ft_sfnt_os2 )) || + !pFT_Get_Sfnt_Table( ft_face, ft_sfnt_hhea ) || + !pFT_Get_Sfnt_Table( ft_face, ft_sfnt_head )) + { + TRACE("Font %s/%p lacks either an OS2, HHEA or HEAD table.\n" + "Skipping this font.\n", debugstr_a(file), font_data_ptr); + goto fail; + } + + /* Wine uses ttfs as an intermediate step in building its bitmap fonts; + we don't want to load these. */ + if (!memcmp( pOS2->achVendID, "Wine", sizeof(pOS2->achVendID) )) + { + FT_ULong len = 0; + + if (!pFT_Load_Sfnt_Table( ft_face, FT_MAKE_TAG('E','B','S','C'), 0, NULL, &len )) + { + TRACE("Skipping Wine bitmap-only TrueType font %s\n", debugstr_a(file)); + goto fail; + } + } + } + + if (!ft_face->family_name || !ft_face->style_name) + { + TRACE("Font %s/%p lacks either a family or style name\n", debugstr_a(file), font_data_ptr); + goto fail; + } + + return ft_face; +fail: + pFT_Done_Face( ft_face ); + return NULL; +} + static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_size, DWORD flags) { FT_Face ft_face; - TT_OS2 *pOS2; - FT_Error err; FT_Long face_index = 0, num_faces; INT ret = 0; @@ -1822,66 +1896,8 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ #endif /* HAVE_CARBON_CARBON_H */ do { - if (file) - { - TRACE("Loading font file %s index %ld\n", debugstr_a(file), face_index); - err = pFT_New_Face(library, file, face_index, &ft_face); - } else - { - TRACE("Loading font from ptr %p size %d, index %ld\n", font_data_ptr, font_data_size, face_index); - err = pFT_New_Memory_Face(library, font_data_ptr, font_data_size, face_index, &ft_face); - } - - if(err != 0) { - WARN("Unable to load font %s/%p err = %x\n", debugstr_a(file), font_data_ptr, err); - return 0; - } - - if(!FT_IS_SFNT(ft_face) && (FT_IS_SCALABLE(ft_face) || !(flags & ADDFONT_FORCE_BITMAP))) { /* for now we'll accept TT/OT or bitmap fonts*/ - WARN("Ignoring font %s/%p\n", debugstr_a(file), font_data_ptr); - pFT_Done_Face(ft_face); - return 0; - } - - /* There are too many bugs in FreeType < 2.1.9 for bitmap font support */ - if(!FT_IS_SCALABLE(ft_face) && FT_SimpleVersion < ((2 << 16) | (1 << 8) | (9 << 0))) { - WARN("FreeType version < 2.1.9, skipping bitmap font %s/%p\n", debugstr_a(file), font_data_ptr); - pFT_Done_Face(ft_face); - return 0; - } - - if(FT_IS_SFNT(ft_face)) - { - if(!(pOS2 = pFT_Get_Sfnt_Table(ft_face, ft_sfnt_os2)) || - !pFT_Get_Sfnt_Table(ft_face, ft_sfnt_hhea) || - !pFT_Get_Sfnt_Table(ft_face, ft_sfnt_head)) - { - TRACE("Font %s/%p lacks either an OS2, HHEA or HEAD table.\n" - "Skipping this font.\n", debugstr_a(file), font_data_ptr); - pFT_Done_Face(ft_face); - return 0; - } - - /* Wine uses ttfs as an intermediate step in building its bitmap fonts; - we don't want to load these. */ - if(!memcmp(pOS2->achVendID, "Wine", sizeof(pOS2->achVendID))) - { - FT_ULong len = 0; - - if(!pFT_Load_Sfnt_Table(ft_face, FT_MAKE_TAG('E','B','S','C'), 0, NULL, &len)) - { - TRACE("Skipping Wine bitmap-only TrueType font %s\n", debugstr_a(file)); - pFT_Done_Face(ft_face); - return 0; - } - } - } - - if(!ft_face->family_name || !ft_face->style_name) { - TRACE("Font %s/%p lacks either a family or style name\n", debugstr_a(file), font_data_ptr); - pFT_Done_Face(ft_face); - return 0; - } + ft_face = new_ft_face( file, font_data_ptr, font_data_size, face_index, flags & ADDFONT_FORCE_BITMAP ); + if (!ft_face) return 0; if(ft_face->family_name[0] == '.') /* Ignore fonts with names beginning with a dot */ {

1 0

Aric Stewart : strmbase: Add beginnings of BaseWindow.
by Alexandre Julliard March 28, 2012

March 28, 2012

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

Andrew Eikum : mmdevapi: TRACE all COM method calls.
by Alexandre Julliard March 28, 2012

March 28, 2012

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

Hans Leidekker : msi/tests: Reduce code duplication in the feature/ component state tests.
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: ccad8e9d804bada5740ba742da7e572da96910bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccad8e9d804bada5740ba742d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 28 15:34:41 2012 +0200 msi/tests: Reduce code duplication in the feature/component state tests. --- dlls/msi/tests/package.c | 5134 +++------------------------------------------- 1 files changed, 302 insertions(+), 4832 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ccad8e9d804bada5740ba…

1 0

Hans Leidekker : sxs/tests: Add tests for CreateAssemblyNameObject.
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: 456961548e5f4e6920d50fc0b19ea3678969e98b URL: http://source.winehq.org/git/wine.git/?a=commit;h=456961548e5f4e6920d50fc0b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 28 15:33:44 2012 +0200 sxs/tests: Add tests for CreateAssemblyNameObject. --- configure | 3 +- configure.ac | 3 +- dlls/sxs/Makefile.in | 1 + dlls/sxs/tests/Makefile.in | 7 ++ dlls/sxs/tests/name.c | 228 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 240 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=456961548e5f4e6920d50…

1 0

Matteo Bruni : wined3d: Support WINED3D_TTFF_COUNT3 texture projection in the ARB backend.
by Alexandre Julliard March 28, 2012

March 28, 2012

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 March 28, 2012

March 28, 2012

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

Hans Leidekker : msi: Also set the Intel property on 64-bit processors.
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: d351a9999e33bfedbaf8160007ad6ebbc33cb038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d351a9999e33bfedbaf816000… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 28 15:34:06 2012 +0200 msi: Also set the Intel property on 64-bit processors. --- dlls/msi/package.c | 3 +-- dlls/msi/tests/package.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 43c6ff9..834467f 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -884,10 +884,9 @@ static VOID set_installer_properties(MSIPACKAGE *package) GetNativeSystemInfo( &sys_info ); sprintfW( bufstr, szIntFormat, sys_info.wProcessorLevel ); + msi_set_property( package->db, szIntel, bufstr ); if (sys_info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) { - msi_set_property( package->db, szIntel, bufstr ); - GetSystemDirectoryW( pth, MAX_PATH ); PathAddBackslashW( pth ); msi_set_property( package->db, szSystemFolder, pth ); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 5a2ce9e..6c53827 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -10181,6 +10181,12 @@ static void test_installprops(void) { buf[0] = 0; size = MAX_PATH; + r = MsiGetProperty(hpkg, "Intel", buf, &size); + ok(r == ERROR_SUCCESS, "failed to get property: %d\n", r); + ok(buf[0], "property not set\n"); + + buf[0] = 0; + size = MAX_PATH; r = MsiGetProperty(hpkg, "MsiAMD64", buf, &size); ok(r == ERROR_SUCCESS, "failed to get property: %d\n", r); ok(buf[0], "property not set\n"); @@ -10251,6 +10257,12 @@ static void test_installprops(void) { buf[0] = 0; size = MAX_PATH; + r = MsiGetProperty(hpkg, "Intel", buf, &size); + ok(r == ERROR_SUCCESS, "failed to get property: %d\n", r); + ok(buf[0], "property not set\n"); + + buf[0] = 0; + size = MAX_PATH; r = MsiGetProperty(hpkg, "MsiAMD64", buf, &size); ok(r == ERROR_SUCCESS, "failed to get property: %d\n", r); ok(!buf[0], "property set\n"); @@ -10313,6 +10325,12 @@ static void test_installprops(void) { buf[0] = 0; size = MAX_PATH; + r = MsiGetProperty(hpkg, "Intel", buf, &size); + ok(r == ERROR_SUCCESS, "failed to get property: %d\n", r); + ok(buf[0], "property not set\n"); + + buf[0] = 0; + size = MAX_PATH; r = MsiGetProperty(hpkg, "MsiAMD64", buf, &size); ok(r == ERROR_SUCCESS, "failed to get property: %d\n", r); ok(buf[0], "property not set\n");

1 0

Hans Leidekker : msi: Clear the cert pointer in MsiGetFileSignatureInformation.
by Alexandre Julliard March 28, 2012

March 28, 2012

Module: wine Branch: master Commit: 3f1e3008ea9027d3982fb3d0175f119bc32154f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f1e3008ea9027d3982fb3d01… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 28 15:34:26 2012 +0200 msi: Clear the cert pointer in MsiGetFileSignatureInformation. --- dlls/msi/msi.c | 1 + dlls/msi/tests/msi.c | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 4022b3a..53ae641 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2580,6 +2580,7 @@ HRESULT WINAPI MsiGetFileSignatureInformationW( LPCWSTR path, DWORD flags, PCCER data.dwProvFlags = 0; data.dwUIContext = WTD_UICONTEXT_INSTALL; hr = WinVerifyTrustEx( INVALID_HANDLE_VALUE, &generic_verify_v2, &data ); + *cert = NULL; if (FAILED(hr)) goto done; if (!(signer = WTHelperGetProvSignerFromChain( data.hWVTStateData, 0, FALSE, 0 ))) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 59f996a..aaf1f42 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -11794,8 +11794,10 @@ static void test_MsiGetFileSignatureInformation(void) hr = MsiGetFileSignatureInformationA( "signature.bin", 0, NULL, NULL, &len ); ok(hr == E_INVALIDARG, "expected E_INVALIDARG got 0x%08x\n", hr); + cert = (const CERT_CONTEXT *)0xdeadbeef; hr = MsiGetFileSignatureInformationA( "signature.bin", 0, &cert, NULL, &len ); todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_FUNCTION_FAILED), "got 0x%08x\n", hr); + ok(cert == NULL, "got %p\n", cert); DeleteFileA( "signature.bin" ); }

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard March 28, 2012

March 28, 2012

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