December 2006 - Wine-commits

Alexandre Julliard : gdi32: Disable the freetype mmap sharing on Mac OS.
by Alexandre Julliard 08 Dec '06

08 Dec '06

Module: wine Branch: master Commit: ae9f68dec91cd6ac66a99dc62d69dc53eaf910d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae9f68dec91cd6ac66a99dc62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 8 12:14:13 2006 +0100 gdi32: Disable the freetype mmap sharing on Mac OS. --- dlls/gdi32/freetype.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 6301a5f..ab4a266 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1887,6 +1887,7 @@ static LONG calc_ppem_for_height(FT_Face static struct font_mapping *map_font( const char *name ) { +#ifndef __APPLE__ /* Mac OS fonts use resource forks, we can't simply mmap them */ struct font_mapping *mapping; struct stat st; int fd; @@ -1923,6 +1924,7 @@ static struct font_mapping *map_font( co error: close( fd ); +#endif return NULL; } @@ -1945,13 +1947,11 @@ static FT_Face OpenFontFile(GdiFont *fon TRACE("%s, %ld, %d x %d\n", debugstr_a(file), face_index, width, height); - if (!(font->mapping = map_font( file ))) - { - WARN("failed to map %s\n", debugstr_a(file)); - return 0; - } + if ((font->mapping = map_font( file ))) + err = pFT_New_Memory_Face(library, font->mapping->data, font->mapping->size, face_index, &ft_face); + else + err = pFT_New_Face(library, file, face_index, &ft_face); - err = pFT_New_Memory_Face(library, font->mapping->data, font->mapping->size, face_index, &ft_face); if(err) { ERR("FT_New_Face rets %d\n", err); return 0;

1 0

Louis Lenders : shell32: Define AVI resource 152.
by Alexandre Julliard 08 Dec '06

08 Dec '06

Module: wine Branch: master Commit: c231fd6872e815bbf571095e81a00ff932ff0678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c231fd6872e815bbf571095e8… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Dec 8 08:05:19 2006 +0000 shell32: Define AVI resource 152. --- dlls/shell32/shres.rc | 3 +++ dlls/shell32/shresdef.h | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shres.rc b/dlls/shell32/shres.rc index 9e01c65..d02b6b4 100644 --- a/dlls/shell32/shres.rc +++ b/dlls/shell32/shres.rc @@ -12395,6 +12395,9 @@ IDR_AVI_FILEMOVE AVI searching.avi /* BINRES filecopy.avi */ IDR_AVI_FILECOPY AVI searching.avi +/* BINRES findcomputer.avi */ +IDR_AVI_FINDCOMPUTER AVI searching.avi + /*--------------------- END FIXME ------------------------*/ /* diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index eafd650..422acc4 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -141,6 +141,7 @@ FIXME: Need to add them, but for now jus */ #define IDR_AVI_SEARCH 150 #define IDR_AVI_SEARCHING 151 +#define IDR_AVI_FINDCOMPUTER 152 #define IDR_AVI_FILEMOVE 160 #define IDR_AVI_FILECOPY 161

1 0

Marcus Meissner : comcat: Remove const from COMCAT Manager.
by Alexandre Julliard 08 Dec '06

08 Dec '06

Module: wine Branch: master Commit: ccae172e1d42bcdc2341676dffda48cf12847592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccae172e1d42bcdc2341676df… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Dec 8 09:35:08 2006 +0100 comcat: Remove const from COMCAT Manager. --- dlls/comcat/comcat_private.h | 2 +- dlls/comcat/manager.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comcat/comcat_private.h b/dlls/comcat/comcat_private.h index 88587b5..4002dfd 100644 --- a/dlls/comcat/comcat_private.h +++ b/dlls/comcat/comcat_private.h @@ -63,7 +63,7 @@ typedef struct LONG ref; } ComCatMgrImpl; -extern const ComCatMgrImpl COMCAT_ComCatMgr; +extern ComCatMgrImpl COMCAT_ComCatMgr; extern const ICatRegisterVtbl COMCAT_ICatRegister_Vtbl; extern const ICatInformationVtbl COMCAT_ICatInformation_Vtbl; diff --git a/dlls/comcat/manager.c b/dlls/comcat/manager.c index 9911b78..0b80cbe 100644 --- a/dlls/comcat/manager.c +++ b/dlls/comcat/manager.c @@ -111,7 +111,7 @@ static const IUnknownVtbl COMCAT_IUnknow /********************************************************************** * static ComCatMgr instance */ -const ComCatMgrImpl COMCAT_ComCatMgr = +ComCatMgrImpl COMCAT_ComCatMgr = { &COMCAT_IUnknown_Vtbl, &COMCAT_ICatRegister_Vtbl,

1 0

Alexandre Julliard : dbghelp: Avoid a printf format warning.
by Alexandre Julliard 08 Dec '06

08 Dec '06

Module: wine Branch: master Commit: 5feef7e3296ef0f7a0c991eae8d0e6e5dcf4286a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5feef7e3296ef0f7a0c991eae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 8 11:39:32 2006 +0100 dbghelp: Avoid a printf format warning. --- dlls/dbghelp/stack.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/stack.c b/dlls/dbghelp/stack.c index 9d9d4f3..aec6a2b 100644 --- a/dlls/dbghelp/stack.c +++ b/dlls/dbghelp/stack.c @@ -433,7 +433,7 @@ static BOOL stack_walk(struct stack_walk if (!sw_read_mem(cb, frame->AddrFrame.Offset + sizeof(DWORD), &frame->AddrReturn.Offset, sizeof(DWORD))) { - WARN("Cannot read new frame offset %08x\n", frame->AddrFrame.Offset + sizeof(DWORD)); + WARN("Cannot read new frame offset %08x\n", frame->AddrFrame.Offset + (int)sizeof(DWORD)); goto done_err; } sw_read_mem(cb, frame->AddrFrame.Offset + 2 * sizeof(DWORD),

1 0

Paul Vriens : advpack/tests: Change the output for HRESULT's.
by Alexandre Julliard 08 Dec '06

08 Dec '06

Module: wine Branch: master Commit: c9f6c4c7cfa4e1805d25bb4d7a1a0991aed00b60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9f6c4c7cfa4e1805d25bb4d7… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Dec 8 08:13:57 2006 +0100 advpack/tests: Change the output for HRESULT's. --- dlls/advpack/tests/advpack.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index be3fb46..c9a2d36 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -303,36 +303,36 @@ static void translateinfstringex_test(vo /* try a NULL filename */ hr = pOpenINFEngine(NULL, "Options.NTx86", 0, &hinf, NULL); - ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %d\n", hr); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); /* try an empty filename */ hr = pOpenINFEngine("", "Options.NTx86", 0, &hinf, NULL); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), - "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %d\n", hr); + "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %08x\n", hr); /* try a NULL hinf */ hr = pOpenINFEngine("c:\\test.inf", "Options.NTx86", 0, NULL, NULL); - ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %d\n", hr); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); /* open the INF without the Install section specified */ hr = pOpenINFEngine("c:\\test.inf", NULL, 0, &hinf, NULL); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); /* try a NULL hinf */ hr = pTranslateInfStringEx(NULL, "c:\\test.inf", "Options.NTx86", "InstallDir", buffer, size, &size, NULL); - ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %d\n", hr); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); /* try a NULL filename */ hr = pTranslateInfStringEx(hinf, NULL, "Options.NTx86", "InstallDir", buffer, size, &size, NULL); - ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %d\n", hr); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); /* try an empty filename */ size = MAX_PATH; hr = pTranslateInfStringEx(hinf, "", "Options.NTx86", "InstallDir", buffer, size, &size, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", (UINT)hr); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); todo_wine { ok(!strcmp(buffer, TEST_STRING2), "Expected %s, got %s\n", TEST_STRING2, buffer); @@ -342,28 +342,28 @@ static void translateinfstringex_test(vo /* try a NULL translate section */ hr = pTranslateInfStringEx(hinf, "c:\\test.inf", NULL, "InstallDir", buffer, size, &size, NULL); - ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %d\n", hr); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); /* try an empty translate section */ hr = pTranslateInfStringEx(hinf, "c:\\test.inf", "", "InstallDir", buffer, size, &size, NULL); - ok(hr == SPAPI_E_LINE_NOT_FOUND, "Expected SPAPI_E_LINE_NOT_FOUND, got %d\n", hr); + ok(hr == SPAPI_E_LINE_NOT_FOUND, "Expected SPAPI_E_LINE_NOT_FOUND, got %08x\n", hr); /* try a NULL translate key */ hr = pTranslateInfStringEx(hinf, "c:\\test.inf", "Options.NTx86", NULL, buffer, size, &size, NULL); - ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %d\n", hr); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); /* try an empty translate key */ hr = pTranslateInfStringEx(hinf, "c:\\test.inf", "Options.NTx86", "", buffer, size, &size, NULL); - ok(hr == SPAPI_E_LINE_NOT_FOUND, "Expected SPAPI_E_LINE_NOT_FOUND, got %d\n", hr); + ok(hr == SPAPI_E_LINE_NOT_FOUND, "Expected SPAPI_E_LINE_NOT_FOUND, got %08x\n", hr); /* successfully translate the string */ size = MAX_PATH; hr = pTranslateInfStringEx(hinf, "c:\\test.inf", "Options.NTx86", "InstallDir", buffer, size, &size, NULL); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); todo_wine { ok(!strcmp(buffer, TEST_STRING2), "Expected %s, got %s\n", TEST_STRING2, buffer); @@ -372,27 +372,27 @@ static void translateinfstringex_test(vo /* try a NULL hinf */ hr = pCloseINFEngine(NULL); - ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %d\n", hr); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); /* successfully close the hinf */ hr = pCloseINFEngine(hinf); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); /* open the inf with the install section */ hr = pOpenINFEngine("c:\\test.inf", "section", 0, &hinf, NULL); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); /* translate the string with the install section specified */ size = MAX_PATH; hr = pTranslateInfStringEx(hinf, "c:\\test.inf", "Options.NTx86", "InstallDir", buffer, size, &size, NULL); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(!strcmp(buffer, PROG_FILES), "Expected %s, got %s\n", PROG_FILES, buffer); ok(size == PROG_FILES_LEN, "Expected size %d, got %d\n", PROG_FILES_LEN, size); /* close the INF again */ hr = pCloseINFEngine(hinf); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); DeleteFileA("c:\\test.inf"); }

1 0

Alexandre Julliard : winedump: Avoid printf format warnings.
by Alexandre Julliard 08 Dec '06

08 Dec '06

Module: wine Branch: master Commit: f910e2b5f64935105deac09b08d9fa7ca99dce88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f910e2b5f64935105deac09b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 8 11:39:21 2006 +0100 winedump: Avoid printf format warnings. --- tools/winedump/pdb.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 9dd9c2c..9243b18 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -479,7 +479,7 @@ static void pdb_jg_dump(void) "\tblock_size: %08x\n" "\tfree_list: %04x\n" "\ttotal_alloc:%04x\n", - sizeof(pdb2) - 1, reader.u.jg.header->ident, + (int)sizeof(pdb2) - 1, reader.u.jg.header->ident, reader.u.jg.header->signature, reader.u.jg.header->block_size, reader.u.jg.header->free_list, @@ -607,7 +607,7 @@ static void pdb_ds_dump(void) "\ttoc_size: %08x\n" "\tunknown2: %08x\n" "\ttoc_page: %08x\n", - sizeof(pdb7) - 1, reader.u.ds.header->signature, + (int)sizeof(pdb7) - 1, reader.u.ds.header->signature, reader.u.ds.header->block_size, reader.u.ds.header->unknown1, reader.u.ds.header->num_pages,

1 0

Byeong-Sik Jeon : imm32: Send the WM_IME_CHAR message, although ResultString has been read.
by Alexandre Julliard 08 Dec '06

08 Dec '06

Module: wine Branch: master Commit: 6cf39ed9746e5517e3dcba3ec5e7012041f31759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cf39ed9746e5517e3dcba3ec… Author: Byeong-Sik Jeon <wjsqudtlr(a)gmail.com> Date: Fri Dec 8 12:12:16 2006 +0900 imm32: Send the WM_IME_CHAR message, although ResultString has been read. --- dlls/imm32/imm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 22cd75c..bee6472 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1566,7 +1566,7 @@ static LRESULT WINAPI IME_WindowProc(HWN TRACE("IME message %s, 0x%x, 0x%x (%i)\n", "WM_IME_COMPOSITION", (UINT)wParam, (UINT)lParam, root_context->bRead); - if ((lParam & GCS_RESULTSTR) && (!root_context->bRead)) + if (lParam & GCS_RESULTSTR) IMM_PostResult(root_context); else UpdateDataInDefaultIMEWindow(hwnd);

1 0

Andrew Talbot : crypt32/tests: Cast-qual warnings fix.
by Alexandre Julliard 08 Dec '06

08 Dec '06

Module: wine Branch: master Commit: fa8b971c2e35bb811121badd34dbf36f3ab90d78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa8b971c2e35bb811121badd3… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Dec 7 22:58:51 2006 +0000 crypt32/tests: Cast-qual warnings fix. --- dlls/crypt32/tests/encode.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 6a1801d..20c646a 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -234,12 +234,12 @@ static void test_decodeInt(DWORD dwEncod /* When the output buffer is NULL, this always succeeds */ SetLastError(0xdeadbeef); ret = CryptDecodeObjectEx(dwEncoding, X509_INTEGER, - (BYTE *)ints[i].encoded, ints[i].encoded[1] + 2, 0, NULL, NULL, + ints[i].encoded, ints[i].encoded[1] + 2, 0, NULL, NULL, &bufSize); ok(ret && GetLastError() == NOERROR, "Expected success and NOERROR, got %d\n", GetLastError()); ret = CryptDecodeObjectEx(dwEncoding, X509_INTEGER, - (BYTE *)ints[i].encoded, ints[i].encoded[1] + 2, + ints[i].encoded, ints[i].encoded[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %d\n", GetLastError()); ok(bufSize == sizeof(int), "Wrong size %d\n", bufSize); @@ -254,12 +254,12 @@ static void test_decodeInt(DWORD dwEncod for (i = 0; i < sizeof(bigInts) / sizeof(bigInts[0]); i++) { ret = CryptDecodeObjectEx(dwEncoding, X509_MULTI_BYTE_INTEGER, - (BYTE *)bigInts[i].encoded, bigInts[i].encoded[1] + 2, 0, NULL, NULL, + bigInts[i].encoded, bigInts[i].encoded[1] + 2, 0, NULL, NULL, &bufSize); ok(ret && GetLastError() == NOERROR, "Expected success and NOERROR, got %d\n", GetLastError()); ret = CryptDecodeObjectEx(dwEncoding, X509_MULTI_BYTE_INTEGER, - (BYTE *)bigInts[i].encoded, bigInts[i].encoded[1] + 2, + bigInts[i].encoded, bigInts[i].encoded[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %d\n", GetLastError()); ok(bufSize >= sizeof(CRYPT_INTEGER_BLOB), "Wrong size %d\n", bufSize); @@ -279,12 +279,12 @@ static void test_decodeInt(DWORD dwEncod for (i = 0; i < sizeof(bigUInts) / sizeof(bigUInts[0]); i++) { ret = CryptDecodeObjectEx(dwEncoding, X509_MULTI_BYTE_UINT, - (BYTE *)bigUInts[i].encoded, bigUInts[i].encoded[1] + 2, 0, NULL, NULL, + bigUInts[i].encoded, bigUInts[i].encoded[1] + 2, 0, NULL, NULL, &bufSize); ok(ret && GetLastError() == NOERROR, "Expected success and NOERROR, got %d\n", GetLastError()); ret = CryptDecodeObjectEx(dwEncoding, X509_MULTI_BYTE_UINT, - (BYTE *)bigUInts[i].encoded, bigUInts[i].encoded[1] + 2, + bigUInts[i].encoded, bigUInts[i].encoded[1] + 2, CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &bufSize); ok(ret, "CryptDecodeObjectEx failed: %d\n", GetLastError()); ok(bufSize >= sizeof(CRYPT_INTEGER_BLOB), "Wrong size %d\n", bufSize);

1 0

Andrew Talbot : crypt32/tests: Cast-qual warnings fix.
by Alexandre Julliard 08 Dec '06

08 Dec '06

Module: wine Branch: master Commit: 43605806c5dad0f89c086d45432eda66069aebfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=43605806c5dad0f89c086d454… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Dec 7 22:58:06 2006 +0000 crypt32/tests: Cast-qual warnings fix. --- dlls/crypt32/tests/store.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 3b5f183..e251d98 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -667,7 +667,7 @@ static void testRegStore(void) { ok(hdr->cb == sizeof(bigCert2), "Wrong size %d of cert property\n", hdr->cb); - ok(!memcmp((BYTE *)hdr + sizeof(*hdr), bigCert2, + ok(!memcmp((const BYTE *)hdr + sizeof(*hdr), bigCert2, hdr->cb), "Unexpected cert in cert property\n"); } hdr = findPropID(buf, size, CERT_HASH_PROP_ID); @@ -676,7 +676,7 @@ static void testRegStore(void) { ok(hdr->cb == sizeof(hash), "Wrong size %d of hash property\n", hdr->cb); - ok(!memcmp((BYTE *)hdr + sizeof(*hdr), hash, + ok(!memcmp((const BYTE *)hdr + sizeof(*hdr), hash, hdr->cb), "Unexpected hash in cert property\n"); } }

1 0

appdb/include application.php
by WineHQ 08 Dec '06

08 Dec '06

ChangeSet ID: 30409 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/12/07 21:38:27 Modified files: include : application.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Use $this instead of $oApp since this method is referring to its class Patch: http://cvs.winehq.org/patch.py?id=30409 Old revision New revision Changes Path 1.76 1.77 +2 -2 appdb/include/application.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.76 appdb/include/application.php:1.77 --- appdb/include/application.php:1.76 8 Dec 2006 3:38:27 -0000 +++ appdb/include/application.php 8 Dec 2006 3:38:27 -0000 @@ -345,12 +345,12 @@ class Application { { case "add": $sSubject = "Submitted application accepted"; - $sMsg = "The application you submitted (".$oApp->sName." ".$this->sName.") has been accepted by ".$_SESSION['current']->sRealname."."; + $sMsg = "The application you submitted (".$this->sName." ".$this->sName.") has been accepted by ".$_SESSION['current']->sRealname."."; $sMsg .= "Administrators Responce:\n"; break; case "reject": $sSubject = "Submitted application rejected"; - $sMsg = "The application you submitted (".$oApp->sName." ".$this->sName.") has been rejected by ".$_SESSION['current']->sRealname."."; + $sMsg = "The application you submitted (".$this->sName." ".$this->sName.") has been rejected by ".$_SESSION['current']->sRealname."."; $sMsg .= "Clicking on the link in this email will allow you to modify and resubmit the application. "; $sMsg .= "A link to your queue of applications and versions will also show up on the left hand side of the Appdb site once you have logged in. "; $sMsg .= APPDB_ROOT."appsubmit.php?sub=view&apptype=application&appId=".$this->iAppId."\n";

1 0