May 2009 - Wine-Commits - list.winehq.org

Austin English : wbemprox: Add stub dll.
by Alexandre Julliard May 6, 2009

May 6, 2009

Module: wine Branch: master Commit: e10f24e8391c978055cefb1b5c04eec274819d88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e10f24e8391c978055cefb1b5… Author: Austin English <austinenglish(a)gmail.com> Date: Wed May 6 07:51:21 2009 -0500 wbemprox: Add stub dll. --- configure | 9 +++++++++ configure.ac | 1 + dlls/wbemprox/Makefile.in | 13 +++++++++++++ dlls/wbemprox/main.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemprox.spec | 4 ++++ 5 files changed, 69 insertions(+), 0 deletions(-) diff --git a/configure b/configure index e6459d6..98593e3 100755 --- a/configure +++ b/configure @@ -27318,6 +27318,14 @@ dlls/w32sys.dll16/Makefile: dlls/w32sys.dll16/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/w32sys.dll16/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/wbemprox/Makefile" +test "x$enable_wbemprox" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + wbemprox" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/wbemprox/Makefile: dlls/wbemprox/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/wbemprox/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/win32s16.dll16/Makefile" test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ win32s16.dll16" @@ -29326,6 +29334,7 @@ do "dlls/vwin32.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/vwin32.vxd/Makefile" ;; "dlls/w32skrnl/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/w32skrnl/Makefile" ;; "dlls/w32sys.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/w32sys.dll16/Makefile" ;; + "dlls/wbemprox/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wbemprox/Makefile" ;; "dlls/win32s16.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/win32s16.dll16/Makefile" ;; "dlls/win87em.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/win87em.dll16/Makefile" ;; "dlls/winaspi.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winaspi.dll16/Makefile" ;; diff --git a/configure.ac b/configure.ac index 7ab7077..4ab3f6a 100644 --- a/configure.ac +++ b/configure.ac @@ -2260,6 +2260,7 @@ WINE_CONFIG_MAKEFILE([dlls/vtdapi.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL WINE_CONFIG_MAKEFILE([dlls/vwin32.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/w32skrnl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/w32sys.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) +WINE_CONFIG_MAKEFILE([dlls/wbemprox/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/win32s16.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/win87em.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/winaspi.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in new file mode 100644 index 0000000..58aad37 --- /dev/null +++ b/dlls/wbemprox/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = wbemprox.dll +IMPORTS = kernel32 + +C_SRCS = \ + main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/wbemprox/main.c b/dlls/wbemprox/main.c new file mode 100644 index 0000000..89812b2 --- /dev/null +++ b/dlls/wbemprox/main.c @@ -0,0 +1,42 @@ +/* + * + * Copyright 2009 Austin English + * + * 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 + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/wbemprox/wbemprox.spec b/dlls/wbemprox/wbemprox.spec new file mode 100644 index 0000000..c5fc87a --- /dev/null +++ b/dlls/wbemprox/wbemprox.spec @@ -0,0 +1,4 @@ +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer

1 0

Alexandre Julliard : gdiplus/tests: Don't free GDI objects with GlobalFree.
by Alexandre Julliard May 6, 2009

May 6, 2009

Module: wine Branch: master Commit: f6f2f9346eb2dc1b5ce076572664f008559e31a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6f2f9346eb2dc1b5ce076572… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 6 16:45:05 2009 +0200 gdiplus/tests: Don't free GDI objects with GlobalFree. --- dlls/gdiplus/tests/image.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 4c836cd..4443f88 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -480,7 +480,7 @@ static void test_GdipCreateBitmapFromHBITMAP(void) expectf(HEIGHT1, height); if (stat == Ok) GdipDisposeImage((GpImage*)gpbm); - GlobalFree(hbm); + DeleteObject(hbm); hbm = CreateBitmap(WIDTH2, HEIGHT2, 1, 1, &buff); stat = GdipCreateBitmapFromHBITMAP(hbm, NULL, &gpbm); @@ -493,7 +493,7 @@ static void test_GdipCreateBitmapFromHBITMAP(void) expectf(HEIGHT2, height); if (stat == Ok) GdipDisposeImage((GpImage*)gpbm); - GlobalFree(hbm); + DeleteObject(hbm); hdc = CreateCompatibleDC(0); ok(hdc != NULL, "CreateCompatibleDC failed\n"); @@ -530,8 +530,8 @@ static void test_GdipCreateBitmapFromHBITMAP(void) if (stat == Ok) GdipDisposeImage((GpImage*)gpbm); - GlobalFree(hpal); - GlobalFree(hbm); + DeleteObject(hpal); + DeleteObject(hbm); } static void test_GdipGetImageFlags(void)

1 0

Hans Leidekker : msi: Reject NULL or empty patch package parameter in MsiApplyPatch.
by Alexandre Julliard May 6, 2009

May 6, 2009

Module: wine Branch: master Commit: 0d8a826ef54f831fcbacd9204587d2e50a37732b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d8a826ef54f831fcbacd9204… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 6 15:57:22 2009 +0200 msi: Reject NULL or empty patch package parameter in MsiApplyPatch. --- dlls/msi/msi.c | 3 +++ dlls/msi/tests/package.c | 12 ++++++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 58a1856..ed8b4ab 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -315,6 +315,9 @@ static UINT MSI_ApplyPatchW(LPCWSTR szPatchPackage, LPCWSTR szProductCode, LPCWS static const WCHAR patcheq[] = {'P','A','T','C','H','=',0}; static WCHAR empty[] = {0}; + if (!szPatchPackage || !szPatchPackage[0]) + return ERROR_INVALID_PARAMETER; + if (!szProductCode) { r = MsiOpenDatabaseW(szPatchPackage, MSIDBOPEN_READONLY, &patch); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index a7e5261..308a9cc 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -11604,6 +11604,17 @@ static void test_MsiApplyMultiplePatches(void) todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r); } +static void test_MsiApplyPatch(void) +{ + UINT r; + + r = MsiApplyPatch(NULL, NULL, INSTALLTYPE_DEFAULT, NULL); + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r); + + r = MsiApplyPatch("", NULL, INSTALLTYPE_DEFAULT, NULL); + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r); +} + START_TEST(package) { HMODULE hmsi = GetModuleHandleA("msi.dll"); @@ -11642,4 +11653,5 @@ START_TEST(package) test_MsiGetProductProperty(); test_MsiSetProperty(); test_MsiApplyMultiplePatches(); + test_MsiApplyPatch(); }

1 0

Hans Leidekker : wininet: Don't send any data after being redirected.
by Alexandre Julliard May 6, 2009

May 6, 2009

Module: wine Branch: master Commit: 6bb143af3343bf4ab8f1a0d68664c65307bb9b21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bb143af3343bf4ab8f1a0d68… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 6 15:57:56 2009 +0200 wininet: Don't send any data after being redirected. --- dlls/wininet/http.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d3918a3..9c75862 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3271,7 +3271,7 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, DWORD dwContentLength, BOOL bEndRequest) { INT cnt; - BOOL bSuccess = FALSE; + BOOL bSuccess = FALSE, redirected = FALSE; LPWSTR requestString = NULL; INT responseLen; BOOL loop_next; @@ -3373,7 +3373,7 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, goto lend; /* send the request as ASCII, tack on the optional data */ - if( !lpOptional ) + if (!lpOptional || redirected) dwOptionalLength = 0; len = WideCharToMultiByte( CP_ACP, 0, requestString, -1, NULL, 0, NULL, NULL ); @@ -3467,6 +3467,7 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, } HeapFree( GetProcessHeap(), 0, new_url ); } + redirected = TRUE; } } if (!(lpwhr->hdr.dwFlags & INTERNET_FLAG_NO_AUTH) && bSuccess)

1 0

Austin English : winex11.drv: Remove an outdated comment.
by Alexandre Julliard May 6, 2009

May 6, 2009

Module: wine Branch: master Commit: 2b03dd373d8e8bcd20989a9c9bac271d44b7bd1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b03dd373d8e8bcd20989a9c9… Author: Austin English <austinenglish(a)gmail.com> Date: Wed May 6 07:12:46 2009 -0500 winex11.drv: Remove an outdated comment. --- dlls/winex11.drv/xrender.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index f4b68ff..f8f3ba9 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -639,8 +639,7 @@ void X11DRV_XRender_DeleteDC(X11DRV_PDEVICE *physDev) /*********************************************************************** * X11DRV_XRender_UpdateDrawable * - * This gets called from X11DRV_SetDrawable and X11DRV_SelectBitmap. - * It deletes the pict and tile when the drawable changes. + * Deletes the pict and tile when the drawable changes. */ void X11DRV_XRender_UpdateDrawable(X11DRV_PDEVICE *physDev) {

1 0

Henri Verbeet : wined3d: Add an initial shader_sm4_read_src_param() implementation.
by Alexandre Julliard May 6, 2009

May 6, 2009

Module: wine Branch: master Commit: 9381a416811a38e73fb8cd50f5b84e2a4bd7f969 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9381a416811a38e73fb8cd50f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 6 10:05:46 2009 +0200 wined3d: Add an initial shader_sm4_read_src_param() implementation. --- dlls/wined3d/shader_sm4.c | 70 +++++++++++++++++++++++++++++++++++++--- dlls/wined3d/wined3d_private.h | 9 +++++ 2 files changed, 74 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index cdfaa08..5ec8688 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -31,14 +31,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); #define WINED3D_SM4_REGISTER_TYPE_SHIFT 12 #define WINED3D_SM4_REGISTER_TYPE_MASK (0xf << WINED3D_SM4_REGISTER_TYPE_SHIFT) +#define WINED3D_SM4_IMMCONST_TYPE_SHIFT 0 +#define WINED3D_SM4_IMMCONST_TYPE_MASK (0x3 << WINED3D_SM4_IMMCONST_TYPE_SHIFT) + #define WINED3D_SM4_WRITEMASK_SHIFT 4 #define WINED3D_SM4_WRITEMASK_MASK (0xf << WINED3D_SM4_WRITEMASK_SHIFT) +#define WINED3D_SM4_SWIZZLE_SHIFT 4 +#define WINED3D_SM4_SWIZZLE_MASK (0xff << WINED3D_SM4_SWIZZLE_SHIFT) + enum wined3d_sm4_register_type { WINED3D_SM4_RT_TEMP = 0x0, WINED3D_SM4_RT_INPUT = 0x1, WINED3D_SM4_RT_OUTPUT = 0x2, + WINED3D_SM4_RT_IMMCONST = 0x4, +}; + +enum wined3d_sm4_immconst_type +{ + WINED3D_SM4_IMMCONST_FLOAT = 0x1, + WINED3D_SM4_IMMCONST_FLOAT4 = 0x2, }; struct wined3d_sm4_data @@ -48,9 +61,11 @@ struct wined3d_sm4_data static const WINED3DSHADER_PARAM_REGISTER_TYPE register_type_table[] = { - /* WINED3D_SM4_RT_TEMP */ WINED3DSPR_TEMP, - /* WINED3D_SM4_RT_INPUT */ WINED3DSPR_INPUT, - /* WINED3D_SM4_RT_OUTPUT */ WINED3DSPR_OUTPUT, + /* WINED3D_SM4_RT_TEMP */ WINED3DSPR_TEMP, + /* WINED3D_SM4_RT_INPUT */ WINED3DSPR_INPUT, + /* WINED3D_SM4_RT_OUTPUT */ WINED3DSPR_OUTPUT, + /* UNKNOWN */ 0, + /* WINED3D_SM4_RT_IMMCONST */ WINED3DSPR_IMMCONST, }; static void *shader_sm4_init(const DWORD *byte_code) @@ -101,8 +116,53 @@ static void shader_sm4_read_opcode(void *data, const DWORD **ptr, struct wined3d static void shader_sm4_read_src_param(const DWORD **ptr, struct wined3d_shader_src_param *src_param, struct wined3d_shader_src_param *src_rel_addr, DWORD shader_version) { - FIXME("ptr %p, src_param %p, src_rel_addr %p, shader_version %#x stub!\n", - ptr, src_param, src_rel_addr, shader_version); + DWORD token = *(*ptr)++; + enum wined3d_sm4_register_type register_type; + + register_type = (token & WINED3D_SM4_REGISTER_TYPE_MASK) >> WINED3D_SM4_REGISTER_TYPE_SHIFT; + if (register_type >= sizeof(register_type_table) / sizeof(*register_type_table)) + { + FIXME("Unhandled register type %#x\n", register_type); + src_param->register_type = WINED3DSPR_TEMP; + } + else + { + src_param->register_type = register_type_table[register_type]; + } + + if (register_type == WINED3D_SM4_RT_IMMCONST) + { + enum wined3d_sm4_immconst_type immconst_type = + (token & WINED3D_SM4_IMMCONST_TYPE_MASK) >> WINED3D_SM4_IMMCONST_TYPE_SHIFT; + src_param->swizzle = WINED3DSP_NOSWIZZLE; + + switch(immconst_type) + { + case WINED3D_SM4_IMMCONST_FLOAT: + src_param->immconst_type = WINED3D_IMMCONST_FLOAT; + memcpy(src_param->immconst_data, *ptr, 1 * sizeof(DWORD)); + *ptr += 1; + break; + + case WINED3D_SM4_IMMCONST_FLOAT4: + src_param->immconst_type = WINED3D_IMMCONST_FLOAT4; + memcpy(src_param->immconst_data, *ptr, 4 * sizeof(DWORD)); + *ptr += 4; + break; + + default: + FIXME("Unhandled immediate constant type %#x\n", immconst_type); + break; + } + } + else + { + src_param->register_idx = *(*ptr)++; + src_param->swizzle = (token & WINED3D_SM4_SWIZZLE_MASK) >> WINED3D_SM4_SWIZZLE_SHIFT; + } + + src_param->modifiers = 0; + src_param->rel_addr = NULL; } static void shader_sm4_read_dst_param(const DWORD **ptr, struct wined3d_shader_dst_param *dst_param, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 85811e7..38c8e1e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -322,8 +322,15 @@ typedef enum _WINED3DSHADER_PARAM_REGISTER_TYPE WINED3DSPR_MISCTYPE = 17, WINED3DSPR_LABEL = 18, WINED3DSPR_PREDICATE = 19, + WINED3DSPR_IMMCONST, } WINED3DSHADER_PARAM_REGISTER_TYPE; +enum wined3d_immconst_type +{ + WINED3D_IMMCONST_FLOAT, + WINED3D_IMMCONST_FLOAT4, +}; + typedef enum _WINED3DVS_RASTOUT_OFFSETS { WINED3DSRO_POSITION = 0, @@ -645,6 +652,8 @@ struct wined3d_shader_src_param DWORD swizzle; DWORD modifiers; const struct wined3d_shader_src_param *rel_addr; + enum wined3d_immconst_type immconst_type; + DWORD immconst_data[4]; }; struct wined3d_shader_instruction

1 0

Stefan Dösinger : wined3d: Pack hardcoded local constants in ARB.
by Alexandre Julliard May 6, 2009

May 6, 2009

Module: wine Branch: master Commit: 4c29105cb2726ab1aead2b51ef1e70321848073c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c29105cb2726ab1aead2b51e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 5 20:45:32 2009 +0200 wined3d: Pack hardcoded local constants in ARB. This makes the location of used program.local parameters more predictable and eases sharing this space with other private constants. --- dlls/wined3d/arb_program_shader.c | 45 ++++++++++++++++++++++++++++-------- 1 files changed, 35 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1fcae76..67422b4 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -270,9 +270,29 @@ static void shader_arb_update_float_pixel_constants(IWineD3DDevice *iface, UINT This->highest_dirty_ps_const = max(This->highest_dirty_ps_const, start + count + 1); } +static DWORD *local_const_mapping(IWineD3DBaseShaderImpl *This) +{ + DWORD *ret; + DWORD idx = 0; + const local_constant *lconst; + + if(This->baseShader.load_local_constsF || list_empty(&This->baseShader.constantsF)) return NULL; + + ret = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD) * This->baseShader.limits.temporary); + if(!ret) { + ERR("Out of memory\n"); + return NULL; + } + + LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) { + ret[lconst->idx] = idx++; + } + return ret; +} + /* Generate the variable & register declarations for the ARB_vertex_program output target */ static void shader_generate_arb_declarations(IWineD3DBaseShader *iface, const shader_reg_maps *reg_maps, - SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_info) + SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_info, DWORD *lconst_map) { IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; @@ -353,10 +373,10 @@ static void shader_generate_arb_declarations(IWineD3DBaseShader *iface, const sh /* Load local constants using the program-local space, * this avoids reloading them each time the shader is used */ - if(!This->baseShader.load_local_constsF) { + if(lconst_map) { LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) { shader_addline(buffer, "PARAM C%u = program.local[%u];\n", lconst->idx, - lconst->idx); + lconst_map[lconst->idx]); } } @@ -366,7 +386,7 @@ static void shader_generate_arb_declarations(IWineD3DBaseShader *iface, const sh * local constants do not declare the loaded constants as an array because ARB compilers usually * do not optimize unused constants away */ - if(This->baseShader.load_local_constsF || list_empty(&This->baseShader.constantsF)) { + if(!lconst_map || list_empty(&This->baseShader.constantsF)) { /* Need to PARAM the environment parameters (constants) so we can use relative addressing */ shader_addline(buffer, "PARAM C[%d] = { program.env[0..%d] };\n", max_constantsF, max_constantsF - 1); @@ -1980,6 +2000,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, const local_constant *lconst; GLuint retval; const char *fragcolor; + DWORD *lconst_map = local_const_mapping((IWineD3DBaseShaderImpl *) This); /* Create the hw ARB shader */ shader_addline(buffer, "!!ARBfp1.0\n"); @@ -2017,7 +2038,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, } /* Base Declarations */ - shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION); + shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, lconst_map); /* Base Shader Body */ shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function); @@ -2048,12 +2069,13 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, } /* Load immediate constants */ - if(!This->baseShader.load_local_constsF) { + if(lconst_map) { LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) { const float *value = (const float *)lconst->value; - GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, lconst->idx, value)); + GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, lconst_map[lconst->idx], value)); checkGLcall("glProgramLocalParameter4fvARB"); } + HeapFree(GetProcessHeap(), 0, lconst_map); } return retval; @@ -2069,6 +2091,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, const WineD3D_GL_Info *gl_info = &device->adapter->gl_info; const local_constant *lconst; GLuint ret; + DWORD *lconst_map = local_const_mapping((IWineD3DBaseShaderImpl *) This); /* Create the hw ARB shader */ shader_addline(buffer, "!!ARBvp1.0\n"); @@ -2082,7 +2105,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, shader_addline(buffer, "TEMP TMP;\n"); /* Base Declarations */ - shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION); + shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, lconst_map); /* We need a constant to fixup the final position */ shader_addline(buffer, "PARAM posFixup = program.env[%d];\n", ARB_SHADER_PRIVCONST_POS); @@ -2165,13 +2188,15 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, ret = -1; } else { /* Load immediate constants */ - if(!This->baseShader.load_local_constsF) { + if(lconst_map) { LIST_FOR_EACH_ENTRY(lconst, &This->baseShader.constantsF, local_constant, entry) { const float *value = (const float *)lconst->value; - GL_EXTCALL(glProgramLocalParameter4fvARB(GL_VERTEX_PROGRAM_ARB, lconst->idx, value)); + GL_EXTCALL(glProgramLocalParameter4fvARB(GL_VERTEX_PROGRAM_ARB, lconst_map[lconst->idx], value)); } } } + HeapFree(GetProcessHeap(), 0, lconst_map); + return ret; }

1 0

Henri Verbeet : wined3d: Shift the writemask in the frontend.
by Alexandre Julliard May 6, 2009

May 6, 2009

Module: wine Branch: master Commit: 699eae0cf7461bf6bc771ef5dae03ff99a4cb57a URL: http://source.winehq.org/git/wine.git/?a=commit;h=699eae0cf7461bf6bc771ef5d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 6 10:05:45 2009 +0200 wined3d: Shift the writemask in the frontend. --- dlls/wined3d/shader_sm1.c | 6 +++++- dlls/wined3d/wined3d_private.h | 10 +++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c index a353f48..d13df03 100644 --- a/dlls/wined3d/shader_sm1.c +++ b/dlls/wined3d/shader_sm1.c @@ -76,6 +76,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); #define WINED3DSP_DSTSHIFT_SHIFT 24 #define WINED3DSP_DSTSHIFT_MASK (0xf << WINED3DSP_DSTSHIFT_SHIFT) +/* Write mask */ +#define WINED3D_SM1_WRITEMASK_SHIFT 16 +#define WINED3D_SM1_WRITEMASK_MASK (0xf << WINED3D_SM1_WRITEMASK_SHIFT) + /* Swizzle mask */ #define WINED3DSP_SWIZZLE_SHIFT 16 #define WINED3DSP_SWIZZLE_MASK (0xff << WINED3DSP_SWIZZLE_SHIFT) @@ -351,7 +355,7 @@ static void shader_parse_dst_param(DWORD param, const struct wined3d_shader_src_ dst->register_type = ((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); dst->register_idx = param & WINED3DSP_REGNUM_MASK; - dst->write_mask = param & WINED3DSP_WRITEMASK_ALL; + dst->write_mask = (param & WINED3D_SM1_WRITEMASK_MASK) >> WINED3D_SM1_WRITEMASK_SHIFT; dst->modifiers = (param & WINED3DSP_DSTMOD_MASK) >> WINED3DSP_DSTMOD_SHIFT; dst->shift = (param & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; dst->rel_addr = rel_addr; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 282814a..85811e7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -351,11 +351,11 @@ typedef enum _WINED3DSHADER_PARAM_SRCMOD_TYPE WINED3DSPSM_NOT = 13, } WINED3DSHADER_PARAM_SRCMOD_TYPE; -#define WINED3DSP_WRITEMASK_0 0x00010000 /* .x r */ -#define WINED3DSP_WRITEMASK_1 0x00020000 /* .y g */ -#define WINED3DSP_WRITEMASK_2 0x00040000 /* .z b */ -#define WINED3DSP_WRITEMASK_3 0x00080000 /* .w a */ -#define WINED3DSP_WRITEMASK_ALL 0x000F0000 /* all */ +#define WINED3DSP_WRITEMASK_0 0x1 /* .x r */ +#define WINED3DSP_WRITEMASK_1 0x2 /* .y g */ +#define WINED3DSP_WRITEMASK_2 0x4 /* .z b */ +#define WINED3DSP_WRITEMASK_3 0x8 /* .w a */ +#define WINED3DSP_WRITEMASK_ALL 0xf /* all */ typedef enum _WINED3DSHADER_PARAM_DSTMOD_TYPE {

1 0

Henri Verbeet : wined3d: Remove some redundant code.
by Alexandre Julliard May 6, 2009

May 6, 2009

Module: wine Branch: master Commit: 46b4c15a3165c3c375a1c2a729e8d4c14cb6e863 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46b4c15a3165c3c375a1c2a72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 6 10:05:44 2009 +0200 wined3d: Remove some redundant code. --- dlls/wined3d/pixelshader.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 108f5d3..5dcd5ae 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -341,18 +341,10 @@ static GLuint pixelshader_compile(IWineD3DPixelShaderImpl *This, const struct ps CONST DWORD *function = This->baseShader.function; GLuint retval; SHADER_BUFFER buffer; - const struct wined3d_shader_frontend *fe; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; TRACE("(%p) : function %p\n", This, function); - fe = shader_select_frontend(This->baseShader.reg_maps.shader_version); - if (!fe) - { - FIXME("Unable to find frontend for shader.\n"); - return WINED3DERR_INVALIDCALL; - } - pixelshader_update_samplers(&This->baseShader.reg_maps, ((IWineD3DDeviceImpl *)This->baseShader.device)->stateBlock->textures);

1 0

Alexandre Julliard : winapi: Handle types should be treated as pointers.
by Alexandre Julliard May 6, 2009

May 6, 2009

Module: wine Branch: master Commit: b46be0be7df81dbeca54a29ca267c0b2a9cc8c5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b46be0be7df81dbeca54a29ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 6 13:44:54 2009 +0200 winapi: Handle types should be treated as pointers. --- dlls/ntdll/tests/generated.c | 2 -- tools/winapi/winapi_test | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/generated.c b/dlls/ntdll/tests/generated.c index 89b2e05..b7bfa6d 100644 --- a/dlls/ntdll/tests/generated.c +++ b/dlls/ntdll/tests/generated.c @@ -2856,7 +2856,6 @@ static void test_pack_HCURSOR(void) /* HCURSOR */ TEST_TYPE_SIZE (HCURSOR, 4) TEST_TYPE_ALIGN (HCURSOR, 4) - TEST_TYPE_UNSIGNED(HCURSOR) } static void test_pack_HFILE(void) @@ -2893,7 +2892,6 @@ static void test_pack_HMODULE(void) /* HMODULE */ TEST_TYPE_SIZE (HMODULE, 4) TEST_TYPE_ALIGN (HMODULE, 4) - TEST_TYPE_UNSIGNED(HMODULE) } static void test_pack_INT(void) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 7288a2e..99a7276 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -220,9 +220,9 @@ sub _find_align_kind_size($) { $align = 4; $kind = "float"; $size = 12; - } elsif (/^H(?:DC|BITMAP|BRUSH|ICON|INSTANCE|KEY|MENU|METAFILE|RESULT|WND)$/) { + } elsif (/^H(?:DC|BITMAP|BRUSH|ICON|INSTANCE|KEY|MENU|METAFILE|WND)$/) { $align = 4; - $kind = "unsigned"; + $kind = "pointer"; $size = 4; } elsif (/^LP(?:BYTE|CSTR|CWSTR|DWORD|STR|VOID|WSTR)$/) { $align = 4;

1 0