August 2006 - Wine-Commits - list.winehq.org

Mike McCormack : msi: Store properties in a hash table, not the database.
by Alexandre Julliard Aug. 25, 2006

Aug. 25, 2006

Module: wine Branch: master Commit: a4fb1c94ac54dbf5b425858c31d02bb2c444331a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a4fb1c94ac54dbf5b425858… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Aug 25 17:54:29 2006 +0900 msi: Store properties in a hash table, not the database. Use string insensitive comparisons for property names. --- dlls/msi/msipriv.h | 8 +- dlls/msi/package.c | 253 ++++++++++++++++++++++++++++------------------------ 2 files changed, 144 insertions(+), 117 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=a4fb1c94ac54dbf5b42…

1 0

James Hawkins : msi: Fix the height of the line control window.
by Alexandre Julliard Aug. 25, 2006

Aug. 25, 2006

Module: wine Branch: master Commit: 0de9cf4d002964eef7b2c4fa51c6e7e478286e09 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0de9cf4d002964eef7b2c4f… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Aug 24 13:15:51 2006 -0700 msi: Fix the height of the line control window. --- dlls/msi/dialog.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 5bee66b..5a1f550 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -753,6 +753,9 @@ static UINT msi_dialog_line_control( msi { TRACE("%p %p\n", dialog, rec); + /* line is exactly 2 units in height */ + MSI_RecordSetInteger( rec, 7, 2 ); + msi_dialog_add_control( dialog, rec, szStatic, SS_ETCHEDHORZ | SS_SUNKEN ); return ERROR_SUCCESS; }

1 0

James Hawkins : msi: Add a stub implementation of the DirectoryList dialog control.
by Alexandre Julliard Aug. 25, 2006

Aug. 25, 2006

Module: wine Branch: master Commit: 25062556a8f06c5064904a0096ddddda2bdd0957 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=25062556a8f06c5064904a0… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Aug 24 13:15:16 2006 -0700 msi: Add a stub implementation of the DirectoryList dialog control. --- dlls/msi/dialog.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 90a9b58..5bee66b 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -138,6 +138,7 @@ static const WCHAR szSelectionTree[] = { static const WCHAR szGroupBox[] = { 'G','r','o','u','p','B','o','x',0 }; static const WCHAR szListBox[] = { 'L','i','s','t','B','o','x',0 }; static const WCHAR szDirectoryCombo[] = { 'D','i','r','e','c','t','o','r','y','C','o','m','b','o',0 }; +static const WCHAR szDirectoryList[] = { 'D','i','r','e','c','t','o','r','y','L','i','s','t',0 }; static UINT msi_dialog_checkbox_handler( msi_dialog *, msi_control *, WPARAM ); static void msi_dialog_checkbox_sync_state( msi_dialog *, msi_control * ); @@ -1955,6 +1956,23 @@ static UINT msi_dialog_directory_combo( return ERROR_SUCCESS; } +/******************** Directory List ***************************************/ + +static UINT msi_dialog_directory_list( msi_dialog *dialog, MSIRECORD *rec ) +{ + msi_control *control; + DWORD style; + + style = LVS_LIST | LVS_EDITLABELS | WS_VSCROLL | LVS_SHAREIMAGELISTS | + LVS_AUTOARRANGE | LVS_SINGLESEL | WS_BORDER | + LVS_SORTASCENDING | WS_CHILD | WS_GROUP | WS_TABSTOP; + control = msi_dialog_add_control( dialog, rec, WC_LISTVIEWW, style ); + if (!control) + return ERROR_FUNCTION_FAILED; + + return ERROR_SUCCESS; +} + static const struct control_handler msi_dialog_handler[] = { { szText, msi_dialog_text_control }, @@ -1974,6 +1992,7 @@ static const struct control_handler msi_ { szGroupBox, msi_dialog_group_box }, { szListBox, msi_dialog_list_box }, { szDirectoryCombo, msi_dialog_directory_combo }, + { szDirectoryList, msi_dialog_directory_list }, }; #define NUM_CONTROL_TYPES (sizeof msi_dialog_handler/sizeof msi_dialog_handler[0])

1 0

James Hawkins : msi: Add a stub implementation of the DirectoryCombo dialog control.
by Alexandre Julliard Aug. 25, 2006

Aug. 25, 2006

Module: wine Branch: master Commit: c9674e690c053c4be05e4b651909e7702d18f442 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c9674e690c053c4be05e4b6… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Aug 24 13:15:07 2006 -0700 msi: Add a stub implementation of the DirectoryCombo dialog control. --- dlls/msi/dialog.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 96e866e..90a9b58 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -137,6 +137,7 @@ static const WCHAR szSelectionTree[] = { 'S','e','l','e','c','t','i','o','n','T','r','e','e',0 }; static const WCHAR szGroupBox[] = { 'G','r','o','u','p','B','o','x',0 }; static const WCHAR szListBox[] = { 'L','i','s','t','B','o','x',0 }; +static const WCHAR szDirectoryCombo[] = { 'D','i','r','e','c','t','o','r','y','C','o','m','b','o',0 }; static UINT msi_dialog_checkbox_handler( msi_dialog *, msi_control *, WPARAM ); static void msi_dialog_checkbox_sync_state( msi_dialog *, msi_control * ); @@ -1938,6 +1939,22 @@ static UINT msi_dialog_list_box( msi_dia return ERROR_SUCCESS; } +/******************** Directory Combo ***************************************/ + +static UINT msi_dialog_directory_combo( msi_dialog *dialog, MSIRECORD *rec ) +{ + msi_control *control; + DWORD style; + + style = CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + WS_CHILD | WS_GROUP | WS_TABSTOP | WS_VSCROLL; + control = msi_dialog_add_control( dialog, rec, WC_COMBOBOXW, style ); + if (!control) + return ERROR_FUNCTION_FAILED; + + return ERROR_SUCCESS; +} + static const struct control_handler msi_dialog_handler[] = { { szText, msi_dialog_text_control }, @@ -1956,6 +1973,7 @@ static const struct control_handler msi_ { szSelectionTree, msi_dialog_selection_tree }, { szGroupBox, msi_dialog_group_box }, { szListBox, msi_dialog_list_box }, + { szDirectoryCombo, msi_dialog_directory_combo }, }; #define NUM_CONTROL_TYPES (sizeof msi_dialog_handler/sizeof msi_dialog_handler[0])

1 0

Stefan Dösinger : wined3d: Load projected textures in fragment shaders.
by Alexandre Julliard Aug. 25, 2006

Aug. 25, 2006

Module: wine Branch: master Commit: d4a88724dd7d3bc81bc12f623b2f31e143f85719 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d4a88724dd7d3bc81bc12f6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 24 23:57:46 2006 +0200 wined3d: Load projected textures in fragment shaders. --- dlls/wined3d/arb_program_shader.c | 9 +++++-- dlls/wined3d/glsl_shader.c | 49 ++++++++++++++++++++++++++----------- 2 files changed, 41 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7a3fb70..e3c21e3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -642,8 +642,13 @@ void pshader_hw_tex(SHADER_OPCODE_ARG* a else reg_sampler_code = src[1] & D3DSP_REGNUM_MASK; - shader_addline(buffer, "TEX %s, %s, texture[%lu], 2D;\n", - reg_dest, reg_coord, reg_sampler_code); + if(This->wineD3DDevice->stateBlock->textureState[reg_sampler_code][D3DTSS_TEXTURETRANSFORMFLAGS] & D3DTTFF_PROJECTED) { + shader_addline(buffer, "TXP %s, %s, texture[%lu], 2D;\n", + reg_dest, reg_coord, reg_sampler_code); + } else { + shader_addline(buffer, "TEX %s, %s, texture[%lu], 2D;\n", + reg_dest, reg_coord, reg_sampler_code); + } } void pshader_hw_texcoord(SHADER_OPCODE_ARG* arg) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2ff147c..257b9e5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1377,21 +1377,40 @@ void pshader_glsl_tex(SHADER_OPCODE_ARG* } sampler_type = arg->reg_maps->samplers[sampler_code] & WINED3DSP_TEXTURETYPE_MASK; - switch(sampler_type) { - - case WINED3DSTT_2D: - shader_addline(buffer, "%s = texture2D(%s, %s.st);\n", dst_str, sampler_str, coord_reg); - break; - case WINED3DSTT_CUBE: - shader_addline(buffer, "%s = textureCube(%s, %s.stp);\n", dst_str, sampler_str, coord_reg); - break; - case WINED3DSTT_VOLUME: - shader_addline(buffer, "%s = texture3D(%s, %s.stp);\n", dst_str, sampler_str, coord_reg); - break; - default: - shader_addline(buffer, "%s = unrecognized_stype(%s, %s.stp);\n", dst_str, sampler_str, coord_reg); - FIXME("Unrecognized sampler type: %#lx;\n", sampler_type); - break; + if(This->wineD3DDevice->stateBlock->textureState[sampler_code][D3DTSS_TEXTURETRANSFORMFLAGS] & D3DTTFF_PROJECTED) { + switch(sampler_type) { + + case WINED3DSTT_2D: + shader_addline(buffer, "%s = texture2DProj(%s, %s);\n", dst_str, sampler_str, coord_reg); + break; + case WINED3DSTT_CUBE: + shader_addline(buffer, "%s = textureCubeProj(%s, %s);\n", dst_str, sampler_str, coord_reg); + break; + case WINED3DSTT_VOLUME: + shader_addline(buffer, "%s = texture3DProj(%s, %s);\n", dst_str, sampler_str, coord_reg); + break; + default: + shader_addline(buffer, "%s = unrecognized_stype(%s, %s.stp);\n", dst_str, sampler_str, coord_reg); + FIXME("Unrecognized sampler type: %#lx;\n", sampler_type); + break; + } + } else { + switch(sampler_type) { + + case WINED3DSTT_2D: + shader_addline(buffer, "%s = texture2D(%s, %s.st);\n", dst_str, sampler_str, coord_reg); + break; + case WINED3DSTT_CUBE: + shader_addline(buffer, "%s = textureCube(%s, %s.stp);\n", dst_str, sampler_str, coord_reg); + break; + case WINED3DSTT_VOLUME: + shader_addline(buffer, "%s = texture3D(%s, %s.stp);\n", dst_str, sampler_str, coord_reg); + break; + default: + shader_addline(buffer, "%s = unrecognized_stype(%s, %s.stp);\n", dst_str, sampler_str, coord_reg); + FIXME("Unrecognized sampler type: %#lx;\n", sampler_type); + break; + } } }

1 0

Stefan Dösinger : wined3d: Compile pixel shaders in drawprim.
by Alexandre Julliard Aug. 25, 2006

Aug. 25, 2006

Module: wine Branch: master Commit: 0b7a96e92b78d08728c8f82a847108fc760f314e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0b7a96e92b78d08728c8f82… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 24 23:55:23 2006 +0200 wined3d: Compile pixel shaders in drawprim. --- dlls/wined3d/drawprim.c | 7 +++++++ dlls/wined3d/pixelshader.c | 3 --- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index c2ed58c..aa022e2 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1796,6 +1796,13 @@ #undef BUFFER_OR_DATA useDrawStridedSlow = TRUE; } + if(usePixelShaderFunction) { + /* We compile the shader here because it depends on the texture stage state + * setup of the bound textures. If the shader is already compiled and the texture stage + * state setup matches the program this function will do nothing + */ + IWineD3DPixelShader_CompileShader(This->stateBlock->pixelShader); + } /* If GLSL is used for either pixel or vertex shaders, make a GLSL program * Otherwise set NULL, to restore fixed function */ if ((wined3d_settings.vs_selected_mode == SHADER_GLSL && useVertexShaderFunction) || diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index f5d6462..ab05dbb 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -949,9 +949,6 @@ static HRESULT WINAPI IWineD3DPixelShade This->baseShader.function = NULL; } - /* Compile the shader. */ - IWineD3DPixelShader_CompileShader(iface); - return WINED3D_OK; }

1 0

Paul Vriens : softpub.h: Added some GUIDs.
by Alexandre Julliard Aug. 25, 2006

Aug. 25, 2006

Module: wine Branch: master Commit: 17e172719686d628b0ebbeb9b567cf97eeadc550 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=17e172719686d628b0ebbeb… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Fri Aug 25 10:57:47 2006 +0200 softpub.h: Added some GUIDs. --- include/softpub.h | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/include/softpub.h b/include/softpub.h index d31c9e9..963dadd 100644 --- a/include/softpub.h +++ b/include/softpub.h @@ -29,7 +29,14 @@ #define WINTRUST_ACTION_GENERIC_CHAIN_VE #define WINTRUST_ACTION_GENERIC_VERIFY_V2 \ { 0xaac56b, 0xcd44, 0x11d0, { 0x8c,0xc2,0x00,0xc0,0x4f,0xc2,0x95,0xee }} + #define WINTRUST_ACTION_TRUSTPROVIDER_TEST \ { 0x573e31f8, 0xddba, 0x11d0, { 0x8c,0xcb,0x00,0xc0,0x4f,0xc2,0x95,0xee }} +#define OFFICESIGN_ACTION_VERIFY \ + { 0x5555c2cd, 0x17fb, 0x11d1, { 0x85,0xc4,0x00,0xc0,0x4f,0xc2,0x95,0xee }} + +#define DRIVER_ACTION_VERIFY \ + { 0xf750e6c3, 0x38ee, 0x11d1, { 0x85,0xe5,0x00,0xc0,0x4f,0xc2,0x95,0xee }} + #endif /* __WINE_SOFTPUB_H */

1 0

Louis Lenders : riched32: Add version resource.
by Alexandre Julliard Aug. 25, 2006

Aug. 25, 2006

Module: wine Branch: master Commit: 4e92e29ce91ea4f99b4b9903c931255abe03d4ff URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4e92e29ce91ea4f99b4b990… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Aug 24 22:13:21 2006 +0100 riched32: Add version resource. --- dlls/riched32/Makefile.in | 2 ++ dlls/riched32/version.rc | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) create mode 100644 dlls/riched32/version.rc diff --git a/dlls/riched32/Makefile.in b/dlls/riched32/Makefile.in index 2ac1aea..4aa587c 100644 --- a/dlls/riched32/Makefile.in +++ b/dlls/riched32/Makefile.in @@ -8,6 +8,8 @@ IMPORTS = riched20 user32 kernel32 C_SRCS = \ richedit.c +RC_SRCS = version.rc + @MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/riched32/version.rc b/dlls/riched32/version.rc new file mode 100644 index 0000000..f17a783 --- /dev/null +++ b/dlls/riched32/version.rc @@ -0,0 +1,24 @@ +/* + * 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 WINE_FILEDESCRIPTION_STR "Wrapper Dll for Richedit" +#define WINE_FILENAME_STR "riched32.dll" +#define WINE_FILEVERSION 5,1,2600,0 +#define WINE_FILEVERSION_STR "5,1,2600,0" +#define WINE_PRODUCTVERSION 5,1,2600,0 +#define WINE_PRODUCTVERSION_STR "5,1,2600,0" + +#include "wine/wine_common_ver.rc"

1 0

Stefan Leichter : ntdll: Print 64bit integers with wine_dbgstr_longlong.
by Alexandre Julliard Aug. 25, 2006

Aug. 25, 2006

Module: wine Branch: master Commit: 4746a63e2222ee9468795690baedeca053e6717a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4746a63e2222ee946879569… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Aug 24 21:54:50 2006 +0200 ntdll: Print 64bit integers with wine_dbgstr_longlong. --- dlls/ntdll/version.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 81127f8..2feac69 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -595,7 +595,7 @@ NTSTATUS WINAPI RtlVerifyVersionInfo( co RTL_OSVERSIONINFOEXW ver; NTSTATUS status; - TRACE("(%p,0x%lx,0x%llx)\n", info, dwTypeMask, dwlConditionMask); + TRACE("(%p,0x%lx,0x%s)\n", info, dwTypeMask, wine_dbgstr_longlong(dwlConditionMask)); ver.dwOSVersionInfoSize = sizeof(ver); if ((status = RtlGetVersion( &ver )) != STATUS_SUCCESS) return status;

1 0

Louis Lenders : wine.inf: Add a bunch of fake dlls.
by Alexandre Julliard Aug. 25, 2006

Aug. 25, 2006

Module: wine Branch: master Commit: d5a761a704841d33d966a49571fc81486f9f801a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d5a761a704841d33d966a49… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Aug 24 22:06:55 2006 +0100 wine.inf: Add a bunch of fake dlls. --- tools/wine.inf | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index a9d0e93..63aa09a 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2152,17 +2152,25 @@ HKLM,%CurrentVersion%\Telephony\Country 11,,notepad.exe 11,,ntdll.dll 11,,opengl32.dll +11,,ole32.dll +11,,oleaut32.dll +11,,olepro32.dll 11,,progman.exe 11,,regsvr32.exe +11,,riched20.dll +11,,riched32.dll 11,,rpcrt4.dll 11,,shdocvw.dll 11,,shell32.dll 11,,shfolder.dll 11,,shlwapi.dll +11,,urlmon.dll 11,,user32.dll 11,,version.dll 11,,wcmd.exe +11,,wininet.dll 11,,winmm.dll +11,,winspool.drv 11,,winver.exe 11,,ws2_32.dll 11,,wsock32.dll

1 0