January 2006 - Wine-Commits

Michael Stefaniuc : oleaut: Merge the VarCmp tests from vartype.c into vartest.c.
by Alexandre Julliard Jan. 18, 2006

Jan. 18, 2006

Module: wine Branch: refs/heads/master Commit: 0d00d9af0e169d0eafca6e89e203b2bcc6e9c1ad URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0d00d9af0e169d0eafca6e8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 18 11:30:01 2006 +0100 oleaut: Merge the VarCmp tests from vartype.c into vartest.c. --- dlls/oleaut32/tests/vartest.c | 21 +++++++++++++ dlls/oleaut32/tests/vartype.c | 67 ----------------------------------------- 2 files changed, 21 insertions(+), 67 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 9733cdf..85fb76e 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -4946,6 +4946,9 @@ static HRESULT (WINAPI *pVarCmp)(LPVARIA _VARCMP(vt1,val1,VT_RESERVED,vt2,val2,VT_RESERVED,lcid,0,res4) #define VARCMP(vt1,val1,vt2,val2,result) \ VARCMPEX(vt1,val1,vt2,val2,result,result,result,result) +/* The above macros do not work for VT_NULL as NULL gets expanded first */ +#define V_NULL_ V_NULL +#define VT_NULL_ VT_NULL static void test_VarCmp(void) { @@ -5081,8 +5084,14 @@ static void test_VarCmp(void) ok(V_EMPTY(&left) == 19, "VT_EMPTY modified!\n"); ok(V_VT(&left) & V_VT(&right) & VT_RESERVED, "VT_RESERVED filtered out!\n"); VARCMP(I4,1,UI1,1,VARCMP_EQ); + VARCMP(I2,2,I2,2,VARCMP_EQ); + VARCMP(I2,1,I2,2,VARCMP_LT); + VARCMP(I2,2,I2,1,VARCMP_GT); + VARCMP(I2,2,EMPTY,1,VARCMP_GT); + VARCMP(I2,2,NULL_,1,VARCMP_NULL); /* BSTR handling, especialy in conjunction with VT_RESERVED */ + VARCMP(BSTR,bstr0,NULL_,0,VARCMP_NULL); VARCMP(BSTR,bstr0,BSTR,bstr0,VARCMP_EQ); VARCMP(BSTR,bstrempty,BSTR,bstr0,VARCMP_LT); VARCMP(BSTR,bstr7,BSTR,bstr0,VARCMP_GT); @@ -5091,14 +5100,17 @@ static void test_VarCmp(void) VARCMP(BSTR,NULL,BSTR,NULL,VARCMP_EQ); VARCMP(BSTR,bstrempty,BSTR,NULL,VARCMP_EQ); VARCMP(BSTR,NULL,EMPTY,0,VARCMP_EQ); + VARCMP(EMPTY,0,BSTR,NULL,VARCMP_EQ); VARCMP(EMPTY,0,BSTR,bstrempty,VARCMP_EQ); VARCMP(EMPTY,1,BSTR,bstrempty,VARCMP_EQ); VARCMP(BSTR,bstr0,EMPTY,0,VARCMP_GT); + VARCMP(BSTR,bstr42,EMPTY,0,VARCMP_GT); VARCMPEX(BSTR,bstrempty,UI1,0,VARCMP_GT,VARCMP_LT,VARCMP_GT,VARCMP_GT); VARCMPEX(BSTR,bstrempty,I2,-1,VARCMP_GT,VARCMP_LT,VARCMP_GT,VARCMP_GT); VARCMPEX(I4,0,BSTR,bstrempty,VARCMP_LT,VARCMP_LT,VARCMP_GT,VARCMP_LT); VARCMPEX(BSTR,NULL,UI1,0,VARCMP_GT,VARCMP_LT,VARCMP_GT,VARCMP_GT); VARCMPEX(I4,7,BSTR,NULL,VARCMP_LT,VARCMP_LT,VARCMP_GT,VARCMP_LT); + _VARCMP(BSTR,(BSTR)100,0,I2,100,0,lcid,0,VARCMP_GT); VARCMPEX(BSTR,bstr0,UI1,0,VARCMP_GT,VARCMP_EQ,VARCMP_EQ,VARCMP_GT); VARCMPEX(I2,0,BSTR,bstr0,VARCMP_LT,VARCMP_EQ,VARCMP_EQ,VARCMP_LT); ok(V_VT(&left) & V_VT(&right) & VT_RESERVED, "VT_RESERVED filtered out!\n"); @@ -5107,6 +5119,7 @@ static void test_VarCmp(void) VARCMPEX(BSTR,bstr2cents,I4,42,VARCMP_GT,VARCMP_LT,VARCMP_GT,VARCMP_GT); VARCMP(BSTR,bstr2cents,I4,-1,VARCMP_GT); VARCMPEX(BSTR,bstr2cents,I4,-666,VARCMP_GT,VARCMP_LT,VARCMP_GT,VARCMP_GT); + VARCMPEX(BSTR,bstr0,I2,0,VARCMP_GT,VARCMP_EQ,VARCMP_EQ,VARCMP_GT); VARCMPEX(BSTR,bstr0,I4,0,VARCMP_GT,VARCMP_EQ,VARCMP_EQ,VARCMP_GT); VARCMPEX(BSTR,bstr0,I4,-666,VARCMP_GT,VARCMP_LT,VARCMP_GT,VARCMP_GT); VARCMP(BSTR,bstr1,I4,0,VARCMP_GT); @@ -5131,6 +5144,9 @@ static void test_VarCmp(void) VARCMPEX(BSTR,bstr666neg,I4,-666,VARCMP_GT,VARCMP_EQ,VARCMP_EQ,VARCMP_LT); VARCMPEX(BSTR,bstr7,R8,7.0,VARCMP_GT,VARCMP_EQ,VARCMP_EQ,VARCMP_GT); VARCMPEX(R8,3.141592,BSTR,NULL,VARCMP_LT,VARCMP_LT,VARCMP_GT,VARCMP_LT); + VARCMP(BSTR,bstr7,BSTR,bstr7,VARCMP_EQ); + VARCMP(BSTR,bstr7,BSTR,bstr42,VARCMP_GT); + VARCMP(BSTR,bstr42,BSTR,bstr7,VARCMP_LT); /* DECIMAL handling */ SETDEC(dec,0,0,0,0); @@ -5148,6 +5164,11 @@ static void test_VarCmp(void) VARCMP(DATE,DATE_MIN,DATE,DATE_MIN-1,VARCMP_GT); VARCMP(DATE,R8_MIN,R8,R8_MIN,VARCMP_EQ); VARCMP(DATE,1,DATE,1+1e-15,VARCMP_LT); /* 1e-15 == 8.64e-11 seconds */ + VARCMP(DATE,25570.0,DATE,25570.0,VARCMP_EQ); + VARCMP(DATE,25570.0,DATE,25571.0,VARCMP_LT); + VARCMP(DATE,25571.0,DATE,25570.0,VARCMP_GT); + VARCMP(DATE,25570.0,EMPTY,0,VARCMP_GT); + VARCMP(DATE,25570.0,NULL_,0,VARCMP_NULL); /* R4 precission handling */ VARCMP(R4,1,R8,1+1e-8,VARCMP_EQ); diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index d77655c..0d9269c 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -77,13 +77,6 @@ int val_empty, val_null; #define VARINIT( A, type, value) V_VT(A) = VT##type; V##type(A) = value -/* Macro for VarCmp*/ - -#define VARCMP(left, ltype, lvalue, right, rtype, rvalue, lcid, flags) \ - VARINIT(left, ltype, lvalue); \ - VARINIT(right, rtype, rvalue); \ - hres = pVarCmp(left, right, lcid, flags) - /* Macros for converting and testing results */ #define CONVVARS(typ) HRESULT hres; CONV_TYPE out; typ in @@ -518,8 +511,6 @@ static HRESULT (WINAPI *pVarBstrFromDate static HRESULT (WINAPI *pVarBstrFromDec)(DECIMAL*,LCID,ULONG,BSTR*); static HRESULT (WINAPI *pVarBstrCmp)(BSTR,BSTR,LCID,ULONG); -static HRESULT (WINAPI *pVarCmp)(LPVARIANT,LPVARIANT,LCID,ULONG); - static INT (WINAPI *pSystemTimeToVariantTime)(LPSYSTEMTIME,double*); static void (WINAPI *pClearCustData)(LPCUSTDATA); @@ -4717,62 +4708,6 @@ static void test_VarBoolChangeTypeEx(voi } } -#undef EXPECT_LT -#undef EXPECT_GT -#undef EXPECT_EQ -#undef EXPECT_NULL -#undef EXPECTRES -#define EXPECTRES(res) ok(hres == res, "expected " #res ", got hres=0x%08lx\n", hres) -#define EXPECT_LT EXPECTRES(VARCMP_LT) -#define EXPECT_GT EXPECTRES(VARCMP_GT) -#define EXPECT_EQ EXPECTRES(VARCMP_EQ) -#define EXPECT_NULL EXPECTRES(VARCMP_NULL) - -static void test_VarCmp(void) -{ - HRESULT hres; - VARIANTARG left, right; - LCID lcid; - WCHAR szvalNULL[] = { '0',0 }; - WCHAR szval100[] = { '1','0','0',0 }; - WCHAR szval101[] = { '1','0','1',0 }; - BSTR bzvalNULL, bzval100, bzval101; - - lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); - bzvalNULL=SysAllocString(szvalNULL); - bzval100=SysAllocString(szval100); - bzval101=SysAllocString(szval101); - CHECKPTR(VarCmp); - VARCMP(&left, _DATE, 25570.0, &right, _DATE, 25570.0, lcid, 0); EXPECT_EQ; - VARCMP(&left, _DATE, 25570.0, &right, _DATE, 25571.0, lcid, 0); EXPECT_LT; - VARCMP(&left, _DATE, 25571.0, &right, _DATE, 25570.0, lcid, 0); EXPECT_GT; - VARCMP(&left, _DATE, 25570.0, &right, _EMPTY, 0, lcid, 0); EXPECT_GT; - VARCMP(&left, _DATE, 25570.0, &right, _NULL, 0, lcid, 0); EXPECT_NULL; - VARCMP(&left, _I2, 2, &right, _I2, 2, lcid, 0); EXPECT_EQ; - VARCMP(&left, _I2, 1, &right, _I2, 2, lcid, 0); EXPECT_LT; - VARCMP(&left, _I2, 2, &right, _I2, 1, lcid, 0); EXPECT_GT; - VARCMP(&left, _I2, 2, &right, _EMPTY, 1, lcid, 0); EXPECT_GT; - VARCMP(&left, _I2, 2, &right, _NULL, 1, lcid, 0); EXPECT_NULL; - VARCMP(&left, _BSTR, NULL, &right, _EMPTY, 0, lcid, 0); EXPECT_EQ; - VARCMP(&left, _EMPTY, 0, &right, _BSTR, NULL, lcid, 0); EXPECT_EQ; - VARCMP(&left, _EMPTY, 0, &right, _BSTR, bzval100, lcid, 0); EXPECT_LT; - VARCMP(&left, _BSTR, bzvalNULL, &right, _EMPTY, 0, lcid, 0); EXPECT_GT; - VARCMP(&left, _BSTR, bzvalNULL, &right, _NULL, 0, lcid, 0); EXPECT_NULL; - VARCMP(&left, _BSTR, bzvalNULL, &right, _I2, 0, lcid, 0); EXPECT_GT; - VARCMP(&left, _BSTR, bzvalNULL, &right, _NULL, 0, lcid, 0); EXPECT_NULL; - VARCMP(&left, _BSTR, bzval100, &right, _BSTR, bzval100, lcid, 0); EXPECT_EQ; - VARCMP(&left, _BSTR, bzval100, &right, _BSTR, bzval101, lcid, 0); EXPECT_LT; - VARCMP(&left, _BSTR, bzval101, &right, _BSTR, bzval100, lcid, 0); EXPECT_GT; - VARCMP(&left, _BSTR, bzval100, &right, _I2, 100, lcid, 0); EXPECT_GT; - VARCMP(&left, _BSTR, bzval100, &right, _I2, 101, lcid, 0); EXPECT_GT; - VARCMP(&left, _BSTR, bzval100, &right, _I2, 101, lcid, 0); EXPECT_GT; - VARCMP(&left, _I2, 100, &right, _BSTR, bzval100, lcid, 0); EXPECT_LT; - VARCMP(&left, _BSTR, (BSTR)100, &right, _I2, 100, lcid, 0); EXPECT_GT; - SysFreeString(szval101); - SysFreeString(szval100); - SysFreeString(szvalNULL); -} - /* * BSTR */ @@ -5994,8 +5929,6 @@ START_TEST(vartype) test_VarBoolCopy(); test_VarBoolChangeTypeEx(); - test_VarCmp(); - test_VarBstrFromR4(); test_VarBstrFromDate(); test_VarBstrFromDec();

1 0

Robert Shearman : rpcrt4: Clear the newly allocated memory used for complex arrays and structs.
by Alexandre Julliard Jan. 18, 2006

Jan. 18, 2006

Module: wine Branch: refs/heads/master Commit: 68b9225022d78b85490328e02a8f18e60fe3bb44 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=68b9225022d78b85490328e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jan 18 11:29:50 2006 +0100 rpcrt4: Clear the newly allocated memory used for complex arrays and structs. --- dlls/rpcrt4/ndr_marshall.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 026f517..6a681a7 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1767,7 +1767,10 @@ unsigned char * WINAPI NdrComplexStructU TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); if (fMustAlloc || !*ppMemory) + { *ppMemory = NdrAllocate(pStubMsg, size); + memset(*ppMemory, 0, size); + } pFormat += 4; if (*(const WORD*)pFormat) conf_array = pFormat + *(const WORD*)pFormat; @@ -2170,7 +2173,10 @@ unsigned char * WINAPI NdrComplexArrayUn esize = ComplexStructSize(pStubMsg, pFormat); if (fMustAlloc || !*ppMemory) + { *ppMemory = NdrAllocate(pStubMsg, pStubMsg->MaxCount * esize); + memset(*ppMemory, 0, pStubMsg->MaxCount * esize); + } pMemory = *ppMemory; for (count = 0; count < pStubMsg->ActualCount; count++)

1 0

Robert Shearman : rpcrt4: Fix the sending of >5800 byte messages by only adding offset
by Alexandre Julliard Jan. 18, 2006

Jan. 18, 2006

Module: wine Branch: refs/heads/master Commit: a4000349f8ba130b863c4d58aea2b320b5799759 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a4000349f8ba130b863c4d5… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jan 18 11:29:38 2006 +0100 rpcrt4: Fix the sending of >5800 byte messages by only adding offset to the buffer after the first batch of data has been written to the pipe. --- dlls/rpcrt4/rpc_message.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 0dce2e8..d47f9d9 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -254,15 +254,13 @@ RPC_STATUS RPCRT4_Send(RpcConnection *Co hdr_size = Header->common.frag_len; Header->common.flags |= RPC_FLG_FIRST; Header->common.flags &= ~RPC_FLG_LAST; - while (!(Header->common.flags & RPC_FLG_LAST)) { + while (!(Header->common.flags & RPC_FLG_LAST)) { /* decide if we need to split the packet into fragments */ if ((BufferLength + hdr_size) <= Connection->MaxTransmissionSize) { Header->common.flags |= RPC_FLG_LAST; Header->common.frag_len = BufferLength + hdr_size; } else { Header->common.frag_len = Connection->MaxTransmissionSize; - buffer_pos += Header->common.frag_len - hdr_size; - BufferLength -= Header->common.frag_len - hdr_size; } /* transmit packet header */ @@ -283,6 +281,8 @@ RPC_STATUS RPCRT4_Send(RpcConnection *Co return GetLastError(); } + buffer_pos += Header->common.frag_len - hdr_size; + BufferLength -= Header->common.frag_len - hdr_size; Header->common.flags &= ~RPC_FLG_FIRST; }

1 0

Robert Shearman : ole: Update the COM todo list.
by Alexandre Julliard Jan. 18, 2006

Jan. 18, 2006

Module: wine Branch: refs/heads/master Commit: b4fe7ea7c63349a525d5caf48e9453d24ae79114 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b4fe7ea7c63349a525d5caf… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jan 18 11:29:20 2006 +0100 ole: Update the COM todo list. --- dlls/ole32/compobj.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index a06879e..80ecd11 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -33,7 +33,6 @@ * - Implement the OXID resolver so we don't need magic endpoint names for * clients and servers to meet up * - * - Pump the message loop during RPC calls. * - Call IMessageFilter functions. * * - Make all ole interface marshaling use NDR to be wire compatible with

1 0

Robert Shearman : ole: Re-post the quit message outside of the DoDragDrop message loop.
by Alexandre Julliard Jan. 18, 2006

Jan. 18, 2006

Module: wine Branch: refs/heads/master Commit: ba8cdfdc374829becc619acc406c738c93d07571 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ba8cdfdc374829becc619ac… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jan 18 11:29:13 2006 +0100 ole: Re-post the quit message outside of the DoDragDrop message loop. --- dlls/ole32/ole2.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index d16a7ce..beb485e 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -526,6 +526,8 @@ HRESULT WINAPI DoDragDrop ( */ SetCapture(hwndTrackWindow); + msg.message = 0; + /* * Pump messages. All mouse input should go the the capture window. */ @@ -564,6 +566,9 @@ HRESULT WINAPI DoDragDrop ( } } + /* re-post the quit message to outer message loop */ + if (msg.message == WM_QUIT) + PostQuitMessage(msg.wParam); /* * Destroy the temporary window. */

1 0

Robert Shearman : oleaut: Reduce an ERR down to a WARN since a NULL interface pointer
by Alexandre Julliard Jan. 18, 2006

Jan. 18, 2006

Module: wine Branch: refs/heads/master Commit: 89846948e301fdf1dcf5f29ae9b7fc9ee5de5fed URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=89846948e301fdf1dcf5f29… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jan 18 11:29:01 2006 +0100 oleaut: Reduce an ERR down to a WARN since a NULL interface pointer doesn't signify an error; it is just unusual. --- dlls/oleaut32/tmarshal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 273a598..e4fafa2 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -167,7 +167,7 @@ _marshal_interface(marshal_state *buf, R * can happen. S_OK to make sure we continue * serializing. */ - ERR("pUnk is NULL?\n"); + WARN("pUnk is NULL\n"); xsize = 0; return xbuf_add(buf,(LPBYTE)&xsize,sizeof(xsize)); }

1 0

Robert Shearman : notepad: Add a Font menu item for the Chinese locale.
by Alexandre Julliard Jan. 18, 2006

Jan. 18, 2006

Module: wine Branch: refs/heads/master Commit: 76316796bf347df8c05474fc226a79b35dcdf0e5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=76316796bf347df8c05474f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Jan 18 11:28:48 2006 +0100 notepad: Add a Font menu item for the Chinese locale. --- programs/notepad/Zh.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Zh.rc b/programs/notepad/Zh.rc index a065bd7..010fe9b 100644 --- a/programs/notepad/Zh.rc +++ b/programs/notepad/Zh.rc @@ -43,6 +43,7 @@ POPUP "�༭��&E��" { MENUITEM "��ڡ�ʱ�䣨&T��\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "�Զ��У�&W��", CMD_WRAP + MENUITEM "&Font...", CMD_FONT /* FIXME */ } POPUP "��&S��" { MENUITEM "��&S��", CMD_SEARCH

1 0

Huw Davies : msxml: Add attribute node implementation.
by Alexandre Julliard Jan. 18, 2006

Jan. 18, 2006

Module: wine Branch: refs/heads/master Commit: ef23ab472934abc87ad41fb9dc8d733c681735f5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ef23ab472934abc87ad41fb… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 18 11:28:34 2006 +0100 msxml: Add attribute node implementation. --- dlls/msxml3/Makefile.in | 1 dlls/msxml3/attribute.c | 543 +++++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/msxml_private.h | 1 dlls/msxml3/node.c | 3 4 files changed, 548 insertions(+), 0 deletions(-) create mode 100644 dlls/msxml3/attribute.c

1 0

appdb/include application.php version.php
by WineHQ Jan. 18, 2006

Jan. 18, 2006

ChangeSet ID: 22368 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/01/17 22:32:28 Modified files: include : application.php version.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Make back link in rejection emails point to appsubmit.php Patch: http://cvs.winehq.org/patch.py?id=22368 Old revision New revision Changes Path 1.39 1.40 +1 -1 appdb/include/application.php 1.44 1.45 +1 -1 appdb/include/version.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.39 appdb/include/application.php:1.40 --- appdb/include/application.php:1.39 18 Jan 2006 4:32:28 -0000 +++ appdb/include/application.php 18 Jan 2006 4:32:28 -0000 @@ -393,7 +393,7 @@ class Application { break; case "reject": $sSubject = $this->sName." has been rejected by ".$_SESSION['current']->sRealname; - $sMsg .= APPDB_ROOT."admin/resubmitRejectedApps.php?sub=view&appId=".$this->iAppId."\n"; + $sMsg .= APPDB_ROOT."appsubmit.php?apptype=application&sub=view&appId=".$this->iAppId."\n"; /* if replyText is set we should report the reason the application was rejected */ if($_REQUEST['replyText']) Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.44 appdb/include/version.php:1.45 --- appdb/include/version.php:1.44 18 Jan 2006 4:32:28 -0000 +++ appdb/include/version.php 18 Jan 2006 4:32:28 -0000 @@ -503,7 +503,7 @@ class Version { break; case "reject": $sSubject = "Version '".$this->sName."' of '".$oApp->sName."' has been rejected by ".$_SESSION['current']->sRealname; - $sMsg .= APPDB_ROOT."admin/resubmitRejectedApps.php?sub=view&versionId=".$this->iVersionId."\n"; + $sMsg .= APPDB_ROOT."appsubmit.php?apptype=application&sub=view&versionId=".$this->iVersionId."\n"; /* if replyText is set we should report the reason the application was rejected */ if($_REQUEST['replyText'])

1 0

appdb/admin resubmitRejectedApps.php
by WineHQ Jan. 18, 2006

Jan. 18, 2006

ChangeSet ID: 22367 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/01/17 22:21:04 Modified files: admin : resubmitRejectedApps.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Redirect admin/resubmitRejectedApps.php to appsubmit.php Patch: http://cvs.winehq.org/patch.py?id=22367 Old revision New revision Changes Path 1.4 1.5 +2 -357 appdb/admin/resubmitRejectedApps.php

1 0