September 2007 - Wine-commits

Stefan Dösinger : wined3d: Unify pixel format correction.
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: 2b2c9199e8a43c7ab58be5cc1875e1be88474bf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b2c9199e8a43c7ab58be5cc1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 21 23:53:57 2007 +0200 wined3d: Unify pixel format correction. --- dlls/wined3d/arb_program_shader.c | 190 ++++++++++++++++++++++++++++++++++--- dlls/wined3d/baseshader.c | 4 + dlls/wined3d/glsl_shader.c | 56 +++++++----- dlls/wined3d/wined3d_private.h | 3 +- 4 files changed, 218 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b2c9199e8a43c7ab58be…

1 0

Stefan Dösinger : wined3d: SRGB write correction emulation.
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: 6313e0ffff5f57e437937e17fa482694d17d9664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6313e0ffff5f57e437937e17f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 14 13:02:59 2007 +0200 wined3d: SRGB write correction emulation. --- dlls/wined3d/arb_program_shader.c | 72 ++++++++++++++++++++++++++++++++++++- dlls/wined3d/glsl_shader.c | 68 +++++++++++++++++++++++++++++++--- dlls/wined3d/pixelshader.c | 62 +++++++++++++++++++++++++++++--- dlls/wined3d/state.c | 8 +---- dlls/wined3d/wined3d_private.h | 11 ++++++ 5 files changed, 202 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6313e0ffff5f57e437937…

1 0

Stefan Dösinger : wined3d: A0 needs the .x swizzle.
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: 316095c7a386295b26e703ad55d764cfe13b8abd URL: http://source.winehq.org/git/wine.git/?a=commit;h=316095c7a386295b26e703ad5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 4 11:10:07 2007 +0200 wined3d: A0 needs the .x swizzle. --- dlls/wined3d/arb_program_shader.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2a006eb..4d404d6 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -316,10 +316,15 @@ static const char * const shift_tab[] = { "coefdiv.x" /* 15 (d2) */ }; -static void shader_arb_get_write_mask(const DWORD param, char *write_mask) { +static void shader_arb_get_write_mask(SHADER_OPCODE_ARG* arg, const DWORD param, char *write_mask) { + IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *) arg->shader; char *ptr = write_mask; + char vshader = shader_is_vshader_version(This->baseShader.hex_version); - if ((param & WINED3DSP_WRITEMASK_ALL) != WINED3DSP_WRITEMASK_ALL) { + if(vshader && shader_get_regtype(param) == WINED3DSPR_ADDR) { + *ptr++ = '.'; + *ptr++ = 'x'; + } else if ((param & WINED3DSP_WRITEMASK_ALL) != WINED3DSP_WRITEMASK_ALL) { *ptr++ = '.'; if (param & WINED3DSP_WRITEMASK_0) *ptr++ = 'x'; if (param & WINED3DSP_WRITEMASK_1) *ptr++ = 'y'; @@ -472,7 +477,7 @@ static void vshader_program_add_param(SHADER_OPCODE_ARG *arg, const DWORD param, if (!is_input) { char write_mask[6]; - shader_arb_get_write_mask(param, write_mask); + shader_arb_get_write_mask(arg, param, write_mask); strcat(hwLine, write_mask); } else { char swizzle[6]; @@ -585,7 +590,7 @@ static void shader_arb_color_correction(SHADER_OPCODE_ARG* arg) { } pshader_get_register_name(arg->dst, reg); - shader_arb_get_write_mask(arg->dst, writemask); + shader_arb_get_write_mask(arg, arg->dst, writemask); if(strlen(writemask) == 0) strcpy(writemask, ".xyzw"); switch(fmt) { @@ -786,7 +791,7 @@ void pshader_hw_bem(SHADER_OPCODE_ARG* arg) { char dst_wmask[20]; pshader_get_register_name(arg->dst, dst_name); - shader_arb_get_write_mask(arg->dst, dst_wmask); + shader_arb_get_write_mask(arg, arg->dst, dst_wmask); strcat(dst_name, dst_wmask); pshader_gen_input_modifier_line(buffer, arg->src[0], 0, src_name[0]); @@ -817,7 +822,7 @@ void pshader_hw_cnd(SHADER_OPCODE_ARG* arg) { /* Handle output register */ pshader_get_register_name(arg->dst, dst_name); - shader_arb_get_write_mask(arg->dst, dst_wmask); + shader_arb_get_write_mask(arg, arg->dst, dst_wmask); strcat(dst_name, dst_wmask); /* Generate input register names (with modifiers) */ @@ -846,7 +851,7 @@ void pshader_hw_cmp(SHADER_OPCODE_ARG* arg) { /* Handle output register */ pshader_get_register_name(arg->dst, dst_name); - shader_arb_get_write_mask(arg->dst, dst_wmask); + shader_arb_get_write_mask(arg, arg->dst, dst_wmask); strcat(dst_name, dst_wmask); /* Generate input register names (with modifiers) */ @@ -906,7 +911,7 @@ void pshader_hw_map2gl(SHADER_OPCODE_ARG* arg) { /* Handle output register */ pshader_get_register_name(dst, output_rname); strcpy(operands[0], output_rname); - shader_arb_get_write_mask(dst, output_wmask); + shader_arb_get_write_mask(arg, dst, output_wmask); strcat(operands[0], output_wmask); if (saturate && (shift == 0)) @@ -992,7 +997,7 @@ void pshader_hw_texcoord(SHADER_OPCODE_ARG* arg) { DWORD hex_version = This->baseShader.hex_version; char tmp[20]; - shader_arb_get_write_mask(dst, tmp); + shader_arb_get_write_mask(arg, dst, tmp); if (hex_version != WINED3DPS_VERSION(1,4)) { DWORD reg = dst & WINED3DSP_REGNUM_MASK; shader_addline(buffer, "MOV_SAT T%u%s, fragment.texcoord[%u];\n", reg, tmp, reg);

1 0

Jeff Latimer : mpr: Check for out of memory condition.
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: c04123fac9386a5125f6f0129f16085ed32654a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c04123fac9386a5125f6f0129… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Fri Sep 21 23:08:22 2007 +1000 mpr: Check for out of memory condition. --- dlls/mpr/pwcache.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/pwcache.c b/dlls/mpr/pwcache.c index f8d3e32..a760dd2 100644 --- a/dlls/mpr/pwcache.c +++ b/dlls/mpr/pwcache.c @@ -56,8 +56,9 @@ static LPSTR MPR_GetValueName( LPCSTR pbResource, WORD cbResource, BYTE nType ) DWORD i; name = HeapAlloc( GetProcessHeap(), 0, 6+cbResource*2 ); - if( name ) - sprintf( name, "X-%02X-", nType ); + if( !name ) return NULL; + + sprintf( name, "X-%02X-", nType ); for(i=0; i<cbResource; i++) { name[5+i*2]=hex((pbResource[i]&0xf0)>>4);

1 0

Roderick Colenbrander : wined3d: The amount of video memory is set in FillGLCaps unless overridden using a registry option .
by Alexandre Julliard 24 Sep '07

24 Sep '07

Module: wine Branch: master Commit: 479078a5b32e6d09a6769779b4e1fa0f46aadbe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=479078a5b32e6d09a6769779b… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Sep 21 23:12:38 2007 +0200 wined3d: The amount of video memory is set in FillGLCaps unless overridden using a registry option. --- dlls/wined3d/wined3d_main.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 2443e33..5886df5 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -113,8 +113,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) DWORD len; WNDCLASSA wc; - wined3d_settings.emulated_textureram = 64*1024*1024; - /* We need our own window class for a fake window which we use to retrieve GL capabilities */ /* We might need CS_OWNDC in the future if we notice strange things on Windows. * Various articles/posts about OpenGL problems on Windows recommend this. */

1 0

Alexander Nicolaysen Sørnes : objectManager: add preview support, use it for notes
by Chris Morgan 23 Sep '07

23 Sep '07

Module: appdb Branch: master Commit: d7fc82c72fbd3c0aae035a2e84de499b8c58cc37 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d7fc82c72fbd3c0aae035a2e… Author: Alexander Nicolaysen Sørnes <alexander(a)alex.alexstyrt> Date: Sun Sep 23 16:09:38 2007 +0200 objectManager: add preview support, use it for notes --- include/note.php | 23 ++++++++++++++--------- include/objectManager.php | 45 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 58 insertions(+), 10 deletions(-) diff --git a/include/note.php b/include/note.php index 3cf1157..7866f9e 100644 --- a/include/note.php +++ b/include/note.php @@ -136,6 +136,10 @@ class Note { return TRUE; } + function objectShowPreview() + { + return TRUE; + } function SendNotificationMail($sAction="add",$sMsg=null) { @@ -183,7 +187,7 @@ class Note { /* Show note */ /* $bDisplayOnly means we should not display any editing controls, even if */ /* the user has the ability to edit this note */ - function display($bDisplayOnly = false) + function display($aVars = null) { switch($this->sTitle) { @@ -216,15 +220,12 @@ class Note { $shOutput .= $this->shDescription; $shOutput .= "</td></tr>\n"; - if(!$bDisplayOnly) + if((!$aVars || $aVars['bEditing'] != "true") && $this->canEdit()) { - if ($this->canEdit()) - { - $shOutput .= "<tr class=\"color1\" align=\"center\" valign=\"top\"><td>"; - $shOutput .= "<form method=\"post\" name=\"message\" action=\"objectManager.php?sClass=note&sAction=edit&iId=".$this->iNoteId."&sReturnTo=".urlencode($oVersion->objectMakeUrl())."\">"; - $shOutput .= '<input type="submit" value="Edit Note" class="button">'; - $shOutput .= '</form></td></tr>'; - } + $shOutput .= "<tr class=\"color1\" align=\"center\" valign=\"top\"><td>"; + $shOutput .= "<form method=\"post\" name=\"message\" action=\"objectManager.php?sClass=note&sAction=edit&iId=".$this->iNoteId."&sReturnTo=".urlencode($oVersion->objectMakeUrl())."\">"; + $shOutput .= '<input type="submit" value="Edit Note" class="button">'; + $shOutput .= '</form></td></tr>'; } $shOutput .= "</table>\n"; @@ -237,6 +238,9 @@ class Note { { switch($sAction) { + case "preview": + return array("bEditing"); + case "add": return array("iVersionId","sNoteTitle"); @@ -261,6 +265,7 @@ class Note { echo html_frame_start("Edit Application Note {$aClean['noteId']}", "90%","",0); echo html_table_begin("width='100%' border=0 align=left cellpadding=6 cellspacing=0 class='box-body'"); + echo '<input type="hidden" name="bEditing" value="true" />'; echo '<input type="hidden" name="iNoteId" value="'.$this->iNoteId.'" />'; echo '<input type="hidden" name="iVersionId" value="'.$this->iVersionId.'" />'; diff --git a/include/objectManager.php b/include/objectManager.php index 0cd500c..7d749ae 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -1,5 +1,7 @@ <?php +define("PREVIEW_ENTRY", 2); + /* class for managing objects */ /* - handles processing of queued objects */ /* - handles the display and editing of unqueued objects */ @@ -236,6 +238,9 @@ class ObjectManager { global $aClean; $oObject->getOutputEditorValues($aClean); + + if($sErrors == PREVIEW_ENTRY) + $this->show_preview($oObject, $aClean); } echo '<form name="sQform" action="'.$this->makeUrl("edit", $this->iId). @@ -312,6 +317,7 @@ class ObjectManager echo '<input name="sSubmit" type="submit" value="Submit" class="button">'. '&nbsp',"\n"; echo '<input name="sSubmit" type="submit" value="Delete" class="button" />'."\n"; + $this->handle_preview_button(); echo "</td></tr>\n"; } @@ -632,6 +638,20 @@ class ObjectManager echo "</table>\n"; } + function show_preview($oObject, $aClean) + { + echo html_frame_start("Preview", "75%"); + + $aVars = $this->get_custom_vars($aClean, "preview"); + + if($aVars) + $oObject->display($aVars); + else + $oObject->display(); + + echo html_frame_end(); + } + /* Display screen for submitting a new entry of given type */ function add_entry($aClean, $sErrors = "") { @@ -648,6 +668,9 @@ class ObjectManager { global $aClean; $oObject->getOutputEditorValues($aClean); + + if($sErrors == PREVIEW_ENTRY) + $this->show_preview($oObject, $aClean); } /* Display help if it is exists */ @@ -673,13 +696,26 @@ class ObjectManager echo "<div align=\"center\">"; echo "<input type=\"submit\" class=\"button\" value=\"Submit\" ". "name=\"sSubmit\" />\n"; + $this->handle_preview_button(); echo "</div></form>\n"; - echo html_back_link(1, $sBackLink); echo "</div>\n"; } + function handle_preview_button() + { + $oObject = new $this->sClass($this->iId); + + if(!method_exists($oObject, "objectShowPreview")) + return; + + if(!$oObject->objectShowPreview()) + return; + + echo '<input type="submit" name="sSubmit" class="button" value="Preview" />'; + } + function handle_anonymous_submission() { $oObject = new $this->sClass(); @@ -822,6 +858,9 @@ class ObjectManager // have to correct switch($aClean['sSubmit']) { + case "Preview": + return PREVIEW_ENTRY; + case "Submit": // if we have errors, return them if($sErrors) @@ -1070,6 +1109,10 @@ class ObjectManager if($sErrors === TRUE) return TRUE; + + if($sErrors == PREVIEW_ENTRY) + return TRUE; + echo "<font color=\"red\">\n"; echo "The following errors were found<br />\n"; echo "<ul>$sErrors</ul>\n";

1 0

Chris Morgan : Fix error when processing bug links. Reported by Tony Lambregts.
by Chris Morgan 23 Sep '07

23 Sep '07

Module: appdb Branch: master Commit: 561e44573dec650cfab8f650588c15da5d01e8f0 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=561e44573dec650cfab8f650… Author: Chris Morgan <cmorgan(a)alum.wpi.edu> Date: Sun Sep 23 11:54:54 2007 -0400 Fix error when processing bug links. Reported by Tony Lambregts. --- include/bugs.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/bugs.php b/include/bugs.php index e57f6a1..672adb9 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -476,7 +476,7 @@ class Bug $oTable->AddRow($oHeaderRow); $oDataRow = $this->objectGetTableRow(); - $oDataRow->oTableRow->SetClass("color0"); + $oDataRow->GetTableRow()->SetClass("color0"); $oTable->AddRow($oDataRow); echo $oTable->GetString();

1 0

Carroll Vance : ntoskrnl.exe: Added PsCreateSystemThread.
by Alexandre Julliard 21 Sep '07

21 Sep '07

Module: wine Branch: master Commit: 8d1a85914aa43290be0a18c5a43704d73f292bc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d1a85914aa43290be0a18c5a… Author: Carroll Vance <ovencleaner(a)gmail.com> Date: Thu Sep 20 17:44:46 2007 -0500 ntoskrnl.exe: Added PsCreateSystemThread. --- dlls/ntoskrnl.exe/ntoskrnl.c | 13 +++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 4b16c39..87b0ef5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -477,6 +477,19 @@ void WINAPI MmFreeNonCachedMemory( void *addr, SIZE_T size ) VirtualFree( addr, 0, MEM_RELEASE ); } +/*********************************************************************** + * PsCreateSystemThread (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI PsCreateSystemThread(PHANDLE ThreadHandle, ULONG DesiredAccess, + POBJECT_ATTRIBUTES ObjectAttributes, + HANDLE ProcessHandle, PCLIENT_ID ClientId, + PVOID StartRoutine, PVOID StartContext) +{ + if (!ProcessHandle) ProcessHandle = GetCurrentProcess(); + return RtlCreateUserThread(ProcessHandle, 0, FALSE, 0, 0, + 0, StartRoutine, StartContext, + ThreadHandle, ClientId); +} /*********************************************************************** * PsGetCurrentProcessId (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 45449a0..56cb407 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -843,7 +843,7 @@ @ stub PsChargeProcessPagedPoolQuota @ stub PsChargeProcessPoolQuota @ stub PsCreateSystemProcess -@ stub PsCreateSystemThread +@ stdcall PsCreateSystemThread(ptr long ptr long ptr ptr ptr) @ stub PsDereferenceImpersonationToken @ stub PsDereferencePrimaryToken @ stub PsDisableImpersonation

1 0

Mikolaj Zalewski : wintab32: Add DisableThreadLibraryCalls.
by Alexandre Julliard 21 Sep '07

21 Sep '07

Module: wine Branch: master Commit: 50539e7115c156937ff915a352fbae736c02a046 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50539e7115c156937ff915a35… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Mon Sep 17 16:53:43 2007 -0700 wintab32: Add DisableThreadLibraryCalls. --- dlls/wintab32/wintab32.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index 8c7c2f7..5f8608b 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -73,6 +73,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) { case DLL_PROCESS_ATTACH: TRACE("Initialization\n"); + DisableThreadLibraryCalls(hInstDLL); InitializeCriticalSection(&csTablet); csTablet.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": csTablet"); hx11drv = GetModuleHandleA("winex11.drv");

1 0

Mikolaj Zalewski : winex11.drv/wintab32: Make wintab strings in winex11. drv Unicode, implement WTInfoW.
by Alexandre Julliard 21 Sep '07

21 Sep '07

Module: wine Branch: master Commit: 29a634728d8968cf296ee77e7a2ab4e2b33ec4e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29a634728d8968cf296ee77e7… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Thu Sep 20 13:01:06 2007 -0700 winex11.drv/wintab32: Make wintab strings in winex11.drv Unicode, implement WTInfoW. --- dlls/winex11.drv/winex11.drv.spec | 2 +- dlls/winex11.drv/wintab.c | 93 +++++++++++++++++++++++++----------- dlls/wintab32/context.c | 85 +++++++++++++++++++++++++++------- dlls/wintab32/wintab32.c | 4 +- dlls/wintab32/wintab_internal.h | 2 +- 5 files changed, 136 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=29a634728d8968cf296ee…

1 0