June 2006 - Wine-commits - list.winehq.org

Hans Leidekker : mscms: Fix famous typo in HeapFree call.
by Alexandre Julliard 19 Jun '06

19 Jun '06

Module: wine Branch: refs/heads/master Commit: 6831c8dfcbb30fb34048335367cfcf7a97569656 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6831c8dfcbb30fb34048335… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jun 19 16:17:06 2006 +0200 mscms: Fix famous typo in HeapFree call. --- dlls/mscms/profile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 37bbe0c..b5761bf 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -1257,7 +1257,7 @@ #ifdef HAVE_LCMS ERR( "Unable to read color profile\n" ); CloseHandle( handle ); - HeapFree( GetProcessHeap, 0, iccprofile ); + HeapFree( GetProcessHeap(), 0, iccprofile ); return NULL; }

1 0

Uwe Bonnes : secur32: Fix another GetProcessHeap vs GetProcessHeap().
by Alexandre Julliard 19 Jun '06

19 Jun '06

Module: wine Branch: refs/heads/master Commit: a8a7976bc0fa0246d7ff095821f4d62dbd96ff16 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a8a7976bc0fa0246d7ff095… Author: Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> Date: Mon Jun 19 18:01:53 2006 +0200 secur32: Fix another GetProcessHeap vs GetProcessHeap(). --- dlls/secur32/ntlm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 07beb39..97cecba 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1226,7 +1226,7 @@ void SECUR32_initNTLMSP(void) if((ret = fork_helper(&helper, "ntlm_auth", args)) != SEC_E_OK) { /* Cheat and allocate a helper anyway, so cleanup later will work. */ - helper = HeapAlloc(GetProcessHeap,0, sizeof(PNegoHelper)); + helper = HeapAlloc(GetProcessHeap(),0, sizeof(PNegoHelper)); helper->version = -1; } else

1 0

Mike McCormack : wininet: Make sure to null terminate a string before copying it.
by Alexandre Julliard 19 Jun '06

19 Jun '06

Module: wine Branch: refs/heads/master Commit: 39c905f6d062cd04208a0d61124178e0ff1ec47b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=39c905f6d062cd04208a0d6… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jun 19 16:57:43 2006 +0900 wininet: Make sure to null terminate a string before copying it. --- dlls/wininet/urlcache.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 033e3c3..5d5f3b0 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -560,6 +560,7 @@ void URLCacheContainers_CreateDefaults(v } wszCachePath[path_len] = '\\'; + wszCachePath[path_len+1] = 0; strcpyW(wszMutexName, wszCachePath);

1 0

Mike McCormack : imm32: Fix some return codes.
by Alexandre Julliard 19 Jun '06

19 Jun '06

Module: wine Branch: refs/heads/master Commit: da906667c7785e0739ed7d0cded67ff71833fbba URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=da906667c7785e0739ed7d0… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jun 19 16:57:59 2006 +0900 imm32: Fix some return codes. --- dlls/imm32/imm.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index b78e2cc..d6fce6c 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -209,10 +209,10 @@ HIMC WINAPI ImmAssociateContext(HWND hWn { InputContextData *data = (InputContextData*)hIMC; - WARN("(%p, %p): semi-stub\n",hWnd,hIMC); + WARN("(%p, %p): semi-stub\n", hWnd, hIMC); - if (!data) - return FALSE; + if (!hIMC) + return NULL; /* * WINE SPECIFIC! MAY CONFLICT @@ -227,7 +227,7 @@ HIMC WINAPI ImmAssociateContext(HWND hWn * If already associated just return */ if (data->hwnd == hWnd) - return (HIMC)data; + return hIMC; if (IsWindow(data->hwnd)) { @@ -251,7 +251,7 @@ HIMC WINAPI ImmAssociateContext(HWND hWn * TODO: We need to keep track of the old context associated * with a window and return it for now we will return NULL; */ - return (HIMC)NULL; + return NULL; } /***********************************************************************

1 0

appdb/. TODO
by WineHQ 19 Jun '06

19 Jun '06

ChangeSet ID: 25823 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/19 11:32:11 Modified files: . : TODO Log message: "EA Durbin" <ead1234(a)hotmail.com> Update the TODO to reflect that we keep this information in the wiki now Patch: http://cvs.winehq.org/patch.py?id=25823 Old revision New revision Changes Path 1.22 1.23 +2 -71 appdb/TODO Index: appdb/TODO diff -u -p appdb/TODO:1.22 appdb/TODO:1.23 --- appdb/TODO:1.22 19 Jun 2006 16:32:11 -0000 +++ appdb/TODO 19 Jun 2006 16:32:11 -0000 @@ -1,74 +1,5 @@ WineHQ Application Database TODO List -#################### -# Unassigned TODOs # -#################### +For the current TODO list please refer to the Wine Wiki at: -AppDB Todo: - - * Improve application/version submission process - Currently a user submits an application/version and a admin reviews it and -either makes changes to it and accepts it or writes a comment and rejects it. Upon -rejection the submission is deleted - - It would be more useful if instead of deleting the submission the submission -was instead passed BACK to the person who submitted it so they could ammend it and -resubmit it. - - * Add support for spell checking application, version submissions, description text -and forum postings. - - * Allow admins to view both the application submission AND the version submission. In -maybe 50% of the applications I accept I find out that the version submission was the -default template with no testing information and/or was formatted in a difficult to -understand way that required rejection. Seeing the application and the version at -application processing time would let the admin decide at that time whether to accept or -reject based on both the application and version.(Chris M - in progress) - - * Allow maintainers to handle screenshot and version submissions for the applications -they maintain. The maintainer system has been a great success so far with over 150 -applications maintained by users of the appdb. These maintainers reply to forum postings -for particular apps, edit and update application howto's and descriptions, and can add -screenshots without appdb maintainer interaction. Having application maintainers also -process screenshot and new version submissions would take more load off of the highest -level maintainers of the appdb who have to go through all screenshots and all new -versions that have been submitted. - -Continuing this distribution of work to individual experts should let us provide more -accurate and complete information. - - * Overhaul the look and feel of the appdb. It looks a bit clunky in areas and I think -with some polish it would be more pleasing to the eye and easier to maintain the look and -feel. - - * Bugzilla/Appdb bug integration - - Links between bugs and the appdb app - - Scott, can you fill in more here? - * Bugzilla/Appdb login integration, Single signon for bugzilla and appdb. - - Need to figure out how to combine the two sets of account databases - - How to provide the bugzilla and appdb authentication cookies - - How to make the changes to both appdb and bugzilla as localized as possible - to keep both applications usable for non-Wine related databases - * Way to feedback information to the owner of the application to tell them that you use the app under wine - - Might be as simple as adding a note to the application with the appropriate vendor email address. - - -# support for merging applications together. We frequently have duplicate applications that need merging and its difficult to by hand - -# support for merging versions together - -# incorporate templates into appdb to simplify code, Jeremy says we can borrow from lostwages(winehq.org/cvsweb/lostwages) for this - -# add a system that will allow users to monitor an app without becoming a maintainer. - -# add wineversion, distro, source/package fields to the user_list table. - -# add wineversion, distro, source/package fields to the appComments table. - -# add new table for maintainer ratings. fields: userid, appId versionId ,rating, wineversion, distro, source/package - -################## -# Assigned TODOs # -################## - -# add distro table and administration screens for it. (Chris) +http://wiki.winehq.org/AppdbInfo

1 0

appdb/include util.php
by WineHQ 19 Jun '06

19 Jun '06

ChangeSet ID: 25822 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/19 10:40:54 Modified files: include : util.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Disable addslashes() in makeSafe() until more finely grained filtering can be implemented Patch: http://cvs.winehq.org/patch.py?id=25822 Old revision New revision Changes Path 1.53 1.54 +2 -1 appdb/include/util.php Index: appdb/include/util.php diff -u -p appdb/include/util.php:1.53 appdb/include/util.php:1.54 --- appdb/include/util.php:1.53 19 Jun 2006 15:40:54 -0000 +++ appdb/include/util.php 19 Jun 2006 15:40:54 -0000 @@ -2,7 +2,8 @@ function makeSafe($var) { - $var = trim(addslashes($var)); +/* Disable addslashes() until we can use more finely grained filtering on user input */ +/* $var = trim(addslashes($var)); */ return $var; }

1 0

Alexandre Julliard : gdi32: Get rid of the no longer needed DIB_CreateDIBSection export.
by Alexandre Julliard 19 Jun '06

19 Jun '06

Module: wine Branch: refs/heads/master Commit: 1a2417d9bce09229f3b6a82853575759259c15ee URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1a2417d9bce09229f3b6a82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 19 11:25:42 2006 +0200 gdi32: Get rid of the no longer needed DIB_CreateDIBSection export. --- dlls/gdi/dib.c | 21 ++++----------------- dlls/gdi/gdi32.spec | 1 - 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/dlls/gdi/dib.c b/dlls/gdi/dib.c index 547159a..82d0042 100644 --- a/dlls/gdi/dib.c +++ b/dlls/gdi/dib.c @@ -1127,11 +1127,10 @@ HBITMAP16 WINAPI CreateDIBSection16 (HDC } /*********************************************************************** - * DIB_CreateDIBSection + * CreateDIBSection (GDI32.@) */ -HBITMAP DIB_CreateDIBSection(HDC hdc, const BITMAPINFO *bmi, UINT usage, - VOID **bits, HANDLE section, - DWORD offset, DWORD ovr_pitch) +HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, + VOID **bits, HANDLE section, DWORD offset) { HBITMAP ret = 0; DC *dc; @@ -1162,7 +1161,7 @@ HBITMAP DIB_CreateDIBSection(HDC hdc, co dib->dsBm.bmType = 0; dib->dsBm.bmWidth = width; dib->dsBm.bmHeight = height >= 0 ? height : -height; - dib->dsBm.bmWidthBytes = ovr_pitch ? ovr_pitch : DIB_GetDIBWidthBytes(width, bpp); + dib->dsBm.bmWidthBytes = DIB_GetDIBWidthBytes(width, bpp); dib->dsBm.bmPlanes = planes; dib->dsBm.bmBitsPixel = bpp; dib->dsBm.bmBits = NULL; @@ -1229,8 +1228,6 @@ HBITMAP DIB_CreateDIBSection(HDC hdc, co mapBits = MapViewOfFile( section, FILE_MAP_ALL_ACCESS, 0, mapOffset, mapSize ); if (mapBits) dib->dsBm.bmBits = (char *)mapBits + (offset - mapOffset); } - else if (ovr_pitch && offset) - dib->dsBm.bmBits = (LPVOID) offset; else { offset = 0; @@ -1287,13 +1284,3 @@ error: HeapFree( GetProcessHeap(), 0, dib ); return 0; } - -/*********************************************************************** - * CreateDIBSection (GDI32.@) - */ -HBITMAP WINAPI CreateDIBSection(HDC hdc, CONST BITMAPINFO *bmi, UINT usage, - VOID **bits, HANDLE section, - DWORD offset) -{ - return DIB_CreateDIBSection(hdc, bmi, usage, bits, section, offset, 0); -} diff --git a/dlls/gdi/gdi32.spec b/dlls/gdi/gdi32.spec index 1c245d8..723ffd3 100644 --- a/dlls/gdi/gdi32.spec +++ b/dlls/gdi/gdi32.spec @@ -519,6 +519,5 @@ # GDI objects ################################################################ # Wine dll separation hacks, these will go away, don't use them # -@ cdecl DIB_CreateDIBSection(long ptr long ptr long long long) @ cdecl GDI_GetObjPtr(long long) @ cdecl GDI_ReleaseObj(long)

1 0

Detlef Riekenberg : include: Declare remaining exported functions in compstui.h.
by Alexandre Julliard 19 Jun '06

19 Jun '06

Module: wine Branch: refs/heads/master Commit: e8950b29ae90fc8e53fe79af5dcbb946289d6e0d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e8950b29ae90fc8e53fe79a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jun 19 01:13:54 2006 +0200 include: Declare remaining exported functions in compstui.h. --- include/ddk/compstui.h | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/ddk/compstui.h b/include/ddk/compstui.h index 3b06749..63612f4 100644 --- a/include/ddk/compstui.h +++ b/include/ddk/compstui.h @@ -54,13 +54,16 @@ typedef struct _PROPSHEETUI_INFO { DWORD Result; } PROPSHEETUI_INFO, *PPROPSHEETUI_INFO; -typedef LONG (CALLBACK *PFNPROPSHEETUI)(PROPSHEETUI_INFO, LPARAM lParam); +typedef LONG (CALLBACK *PFNPROPSHEETUI)(PROPSHEETUI_INFO, LPARAM); /* FUNCTIONS */ -LONG CommonPropertySheetUIA(HWND, PFNPROPSHEETUI, LPARAM, LPDWORD); -LONG CommonPropertySheetUIW(HWND, PFNPROPSHEETUI, LPARAM, LPDWORD); +LONG WINAPI CommonPropertySheetUIA(HWND, PFNPROPSHEETUI, LPARAM, LPDWORD); +LONG WINAPI CommonPropertySheetUIW(HWND, PFNPROPSHEETUI, LPARAM, LPDWORD); #define CommonPropertySheetUI WINELIB_NAME_AW(CommonPropertySheetUI) +ULONG_PTR WINAPI GetPSTUIUserData(HWND); +BOOL WINAPI SetPSTUIUserData(HWND, ULONG_PTR); + #ifdef __cplusplus } /* extern "C" */ #endif

1 0

Jason Green : wined3d: Added correct cast support for gl_FogFragCoord and gl_PointSize output registers .
by Alexandre Julliard 19 Jun '06

19 Jun '06

Module: wine Branch: refs/heads/master Commit: 9afa540eb54976a497ba16e6cfde06bf47bc8cdb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9afa540eb54976a497ba16e… Author: Jason Green <jave27(a)gmail.com> Date: Sat Jun 17 15:55:15 2006 -0400 wined3d: Added correct cast support for gl_FogFragCoord and gl_PointSize output registers. --- dlls/wined3d/glsl_shader.c | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6b4fd72..a9b5820 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -380,17 +380,29 @@ static const char* shift_glsl_tab[] = { "0.5 * " /* 15 (d2) */ }; -/** Print the beginning of the generated GLSL string. example: "reg_name.xyzw = vec4(" */ -static void shader_glsl_add_dst(DWORD param, const char* reg_name, const char* reg_mask, char* outStr) { +/** Print the beginning of the generated GLSL string. example: "reg_name.xyzw = vec4(" + * Will also change the reg_mask if necessary (not all register types are equal in DX vs GL) */ +static void shader_glsl_add_dst(DWORD param, const char* reg_name, char* reg_mask, char* outStr) { int shift = (param & D3DSP_DSTSHIFT_MASK) >> D3DSP_DSTSHIFT_SHIFT; - - /* TODO: determine if destination is anything other than a float vector and accommodate*/ - if (reg_name[0] == 'A') - sprintf(outStr, "%s%s = %sivec4(", reg_name, reg_mask, shift_glsl_tab[shift]); - else - sprintf(outStr, "%s%s = %svec4(", reg_name, reg_mask, shift_glsl_tab[shift]); - + char cast[6]; + + if ((shader_get_regtype(param) == D3DSPR_RASTOUT) + && ((param & D3DSP_REGNUM_MASK) != 0)) { + /* gl_FogFragCoord or glPointSize - both floats */ + strcpy(cast, "float"); + strcpy(reg_mask, ""); + + } else if (reg_name[0] == 'A') { + /* Address register for vertex shaders (ivec4) */ + strcpy(cast, "ivec4"); + + } else { + /* Everything else should be a 4 component float vector */ + strcpy(cast, "vec4"); + } + + sprintf(outStr, "%s%s = %s%s(", reg_name, reg_mask, shift_glsl_tab[shift], cast); } /* Generate a GLSL parameter that does the input modifier computation and return the input register/mask to use */

1 0

Jason Green : wined3d: Fix lookup for LOOP register.
by Alexandre Julliard 19 Jun '06

19 Jun '06

Module: wine Branch: refs/heads/master Commit: fd83de7129dfbf3a5360aa2db1716a4c4de4223a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fd83de7129dfbf3a5360aa2… Author: Jason Green <jave27(a)gmail.com> Date: Fri Jun 16 16:13:01 2006 -0400 wined3d: Fix lookup for LOOP register. --- dlls/wined3d/baseshader.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index e50eb35..004a0ef 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -363,6 +363,11 @@ void shader_get_registers_used( } else if (D3DSIO_DEF == curOpcode->opcode) { pToken += curOpcode->num_params; + /* If there's a loop in the shader */ + } else if (D3DSIO_LOOP == curOpcode->opcode) { + reg_maps->loop = 1; + pToken += curOpcode->num_params; + /* Set texture, address, temporary registers */ } else { int i, limit; @@ -411,9 +416,6 @@ void shader_get_registers_used( else if (D3DSPR_INPUT == regtype && !pshader) reg_maps->attributes[reg] = 1; - - else if (D3DSPR_LOOP == regtype) - reg_maps->loop = 1; } } }

1 0