October 2007 - Wine-Commits

Alexandre Julliard : kernel32: Fix GlobalMemoryStatus to take into account the IMAGE_FILE_LARGE_ADDRESS_AWARE flag .
by Alexandre Julliard Oct. 16, 2007

Oct. 16, 2007

Module: wine Branch: master Commit: b22183703f8f77f8e1e32482f34934cadd207963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b22183703f8f77f8e1e32482f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 15 22:32:36 2007 +0200 kernel32: Fix GlobalMemoryStatus to take into account the IMAGE_FILE_LARGE_ADDRESS_AWARE flag. Also the page file size must not be truncated to 2Gb no matter what the flag is set to. --- dlls/kernel32/heap.c | 57 +++++++++++++++++++++++++++---------------------- 1 files changed, 31 insertions(+), 26 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 587499a..f3b269f 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1220,13 +1220,18 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex ) int rval; #endif + if (lpmemex->dwLength != sizeof(*lpmemex)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (time(NULL)==cache_lastchecked) { memcpy(lpmemex,&cached_memstatus,sizeof(*lpmemex)); return TRUE; } cache_lastchecked = time(NULL); - lpmemex->dwLength = sizeof(*lpmemex); lpmemex->dwMemoryLoad = 0; lpmemex->ullTotalPhys = 16*1024*1024; lpmemex->ullAvailPhys = 16*1024*1024; @@ -1366,10 +1371,12 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) { MEMORYSTATUSEX memstatus; OSVERSIONINFOW osver; + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( GetModuleHandleW(0) ); /* Because GlobalMemoryStatus is identical to GlobalMemoryStatusEX save for one extra field in the struct, and the lack of a bug, we simply call GlobalMemoryStatusEx and copy the values across. */ + memstatus.dwLength = sizeof(memstatus); GlobalMemoryStatusEx(&memstatus); lpBuffer->dwLength = sizeof(*lpBuffer); @@ -1377,7 +1384,6 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) /* Windows 2000 and later report -1 when values are greater than 4 Gb. * NT reports values modulo 4 Gb. - * Values between 2 Gb and 4 Gb are rounded down to 2 Gb. */ osver.dwOSVersionInfoSize = sizeof(osver); @@ -1385,33 +1391,32 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) if ( osver.dwMajorVersion >= 5 ) { - lpBuffer->dwTotalPhys = (memstatus.ullTotalPhys > MAXDWORD) ? MAXDWORD : - (memstatus.ullTotalPhys > MAXLONG) ? MAXLONG : memstatus.ullTotalPhys; - lpBuffer->dwAvailPhys = (memstatus.ullAvailPhys > MAXDWORD) ? MAXDWORD : - (memstatus.ullAvailPhys > MAXLONG) ? MAXLONG : memstatus.ullAvailPhys; - lpBuffer->dwTotalPageFile = (memstatus.ullTotalPageFile > MAXDWORD) ? MAXDWORD : - (memstatus.ullTotalPageFile > MAXLONG) ? MAXLONG : memstatus.ullTotalPageFile; - lpBuffer->dwAvailPageFile = (memstatus.ullAvailPageFile > MAXDWORD) ? MAXDWORD : - (memstatus.ullAvailPageFile > MAXLONG) ? MAXLONG : memstatus.ullAvailPageFile; - lpBuffer->dwTotalVirtual = (memstatus.ullTotalVirtual > MAXDWORD) ? MAXDWORD : - (memstatus.ullTotalVirtual > MAXLONG) ? MAXLONG : memstatus.ullTotalVirtual; - lpBuffer->dwAvailVirtual = (memstatus.ullAvailVirtual > MAXDWORD) ? MAXDWORD : - (memstatus.ullAvailVirtual > MAXLONG) ? MAXLONG : memstatus.ullAvailVirtual; + lpBuffer->dwTotalPhys = min( memstatus.ullTotalPhys, MAXDWORD ); + lpBuffer->dwAvailPhys = min( memstatus.ullAvailPhys, MAXDWORD ); + lpBuffer->dwTotalPageFile = min( memstatus.ullTotalPageFile, MAXDWORD ); + lpBuffer->dwAvailPageFile = min( memstatus.ullAvailPageFile, MAXDWORD ); + lpBuffer->dwTotalVirtual = min( memstatus.ullTotalVirtual, MAXDWORD ); + lpBuffer->dwAvailVirtual = min( memstatus.ullAvailVirtual, MAXDWORD ); + } else /* duplicate NT bug */ { - lpBuffer->dwTotalPhys = (memstatus.ullTotalPhys > MAXDWORD) ? memstatus.ullTotalPhys : - (memstatus.ullTotalPhys > MAXLONG) ? MAXLONG : memstatus.ullTotalPhys; - lpBuffer->dwAvailPhys = (memstatus.ullAvailPhys > MAXDWORD) ? memstatus.ullAvailPhys : - (memstatus.ullAvailPhys > MAXLONG) ? MAXLONG : memstatus.ullAvailPhys; - lpBuffer->dwTotalPageFile = (memstatus.ullTotalPageFile > MAXDWORD) ? memstatus.ullTotalPageFile : - (memstatus.ullTotalPageFile > MAXLONG) ? MAXLONG : memstatus.ullTotalPageFile; - lpBuffer->dwAvailPageFile = (memstatus.ullAvailPageFile > MAXDWORD) ? memstatus.ullAvailPageFile : - (memstatus.ullAvailPageFile > MAXLONG) ? MAXLONG : memstatus.ullAvailPageFile; - lpBuffer->dwTotalVirtual = (memstatus.ullTotalVirtual > MAXDWORD) ? memstatus.ullTotalVirtual : - (memstatus.ullTotalVirtual > MAXLONG) ? MAXLONG : memstatus.ullTotalVirtual; - lpBuffer->dwAvailVirtual = (memstatus.ullAvailVirtual > MAXDWORD) ? memstatus.ullAvailVirtual : - (memstatus.ullAvailVirtual > MAXLONG) ? MAXLONG : memstatus.ullAvailVirtual; + lpBuffer->dwTotalPhys = memstatus.ullTotalPhys; + lpBuffer->dwAvailPhys = memstatus.ullAvailPhys; + lpBuffer->dwTotalPageFile = memstatus.ullTotalPageFile; + lpBuffer->dwAvailPageFile = memstatus.ullAvailPageFile; + lpBuffer->dwTotalVirtual = memstatus.ullTotalVirtual; + lpBuffer->dwAvailVirtual = memstatus.ullAvailVirtual; + } + + /* values are limited to 2Gb unless the app has the IMAGE_FILE_LARGE_ADDRESS_AWARE flag */ + /* page file sizes are not limited (Adobe Illustrator 8 depends on this) */ + if (!(nt->FileHeader.Characteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE)) + { + if (lpBuffer->dwTotalPhys > MAXLONG) lpBuffer->dwTotalPhys = MAXLONG; + if (lpBuffer->dwAvailPhys > MAXLONG) lpBuffer->dwAvailPhys = MAXLONG; + if (lpBuffer->dwTotalVirtual > MAXLONG) lpBuffer->dwTotalVirtual = MAXLONG; + if (lpBuffer->dwAvailVirtual > MAXLONG) lpBuffer->dwAvailVirtual = MAXLONG; } /* work around for broken photoshop 4 installer */

1 0

James Hawkins : user32: The server should release data sent with WM_DDE_POKE.
by Alexandre Julliard Oct. 16, 2007

Oct. 16, 2007

Module: wine Branch: master Commit: dbad0ee62651a2d0b4308a091a07c688feabe147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbad0ee62651a2d0b4308a091… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Oct 12 00:13:49 2007 -0500 user32: The server should release data sent with WM_DDE_POKE. --- dlls/user32/dde_client.c | 2 +- dlls/user32/tests/dde.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 50b00fa..cb9fbc8 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -725,7 +725,7 @@ static WDML_XACT* WDML_ClientQueuePoke(WDML_CONV* pConv, LPVOID pData, DWORD cbD if (ddePoke) { memcpy(ddePoke->Value, pData, cbData); - ddePoke->fRelease = FALSE; /* FIXME: app owned ? */ + ddePoke->fRelease = TRUE; ddePoke->cfFormat = wFmt; GlobalUnlock(pXAct->hMem); } diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 3ecab1f..cea7846 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -176,12 +176,8 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA if (msg_index == 7) todo_wine { ok(poke->unused == 0, "Expected 0, got %d\n", poke->unused); - ok(poke->cfFormat == CF_TEXT, "Expected CF_TEXT, got %d\n", poke->cfFormat); - } - - todo_wine - { ok(poke->fRelease == TRUE, "Expected TRUE, got %d\n", poke->fRelease); + ok(poke->cfFormat == CF_TEXT, "Expected CF_TEXT, got %d\n", poke->cfFormat); } if (msg_index == 5)

1 0

James Hawkins : user32: Add tests for DdeCreateDataHandle.
by Alexandre Julliard Oct. 16, 2007

Oct. 16, 2007

Module: wine Branch: master Commit: 88913f094bf90e146c71f9f5ec7e65f761585640 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88913f094bf90e146c71f9f5e… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Oct 12 00:22:54 2007 -0500 user32: Add tests for DdeCreateDataHandle. --- dlls/user32/tests/dde.c | 192 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 192 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 1601cd1..1388c34 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -1454,6 +1454,197 @@ static void test_DdeCreateStringHandleW(DWORD dde_inst, int codepage) ok(DdeFreeStringHandle(dde_inst, str_handle), "DdeFreeStringHandle failed\n"); } +static void test_DdeCreateDataHandle(void) +{ + HDDEDATA hdata; + DWORD dde_inst; + DWORD size; + UINT res, err; + BOOL ret; + HSZ item; + LPBYTE ptr; + + dde_inst = 0; + res = DdeInitializeA(&dde_inst, client_ddeml_callback, APPCMD_CLIENTONLY, 0); + ok(res == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", res); + + item = DdeCreateStringHandleA(dde_inst, "item", CP_WINANSI); + ok(item != NULL, "Expected non-NULL hsz\n"); + + /* invalid instance id */ + DdeGetLastError(dde_inst); + hdata = DdeCreateDataHandle(0xdeadbeef, (LPBYTE)"data", MAX_PATH, 0, item, CF_TEXT, 0); + err = DdeGetLastError(dde_inst); + todo_wine + { + ok(hdata == NULL, "Expected NULL, got %p\n", hdata); + ok(err == DMLERR_INVALIDPARAMETER, + "Expected DMLERR_INVALIDPARAMETER, got %d\n", err); + } + + /* 0 instance id */ + DdeGetLastError(dde_inst); + hdata = DdeCreateDataHandle(0, (LPBYTE)"data", MAX_PATH, 0, item, CF_TEXT, 0); + err = DdeGetLastError(dde_inst); + todo_wine + { + ok(hdata == NULL, "Expected NULL, got %p\n", hdata); + ok(err == DMLERR_INVALIDPARAMETER, + "Expected DMLERR_INVALIDPARAMETER, got %d\n", err); + } + + /* NULL pSrc */ + DdeGetLastError(dde_inst); + hdata = DdeCreateDataHandle(dde_inst, NULL, MAX_PATH, 0, item, CF_TEXT, 0); + err = DdeGetLastError(dde_inst); + ok(hdata != NULL, "Expected non-NULL hdata\n"); + ok(err == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", err); + + ptr = GlobalLock(hdata); + todo_wine + { + ok(ptr == NULL, "Expected NULL, got %p\n", ptr); + } + + ptr = DdeAccessData(hdata, &size); + ok(ptr != NULL, "Expected non-NULL ptr\n"); + ok(lstrlenA((LPSTR)ptr) == 0, "Expected 0, got %d\n", lstrlenA((LPSTR)ptr)); + ok(size == 260, "Expected 260, got %d\n", size); + + ret = DdeUnaccessData(hdata); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + + ret = DdeFreeDataHandle(hdata); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + + /* cb is zero */ + DdeGetLastError(dde_inst); + hdata = DdeCreateDataHandle(dde_inst, (LPBYTE)"data", 0, 0, item, CF_TEXT, 0); + err = DdeGetLastError(dde_inst); + ok(hdata != NULL, "Expected non-NULL hdata\n"); + ok(err == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", err); + + ptr = GlobalLock(hdata); + todo_wine + { + ok(ptr == NULL, "Expected NULL, got %p\n", ptr); + } + + ptr = DdeAccessData(hdata, &size); + ok(ptr != NULL, "Expected non-NULL ptr\n"); + ok(lstrlenA((LPSTR)ptr) != 0, "Expected non-empty string\n"); + ok(lstrcmpA((LPSTR)ptr, "data"), "Did not expect data\n"); + ok(size == 0, "Expected 0, got %d\n", size); + + ret = DdeUnaccessData(hdata); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + + ret = DdeFreeDataHandle(hdata); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + + /* cbOff is non-zero */ + DdeGetLastError(dde_inst); + hdata = DdeCreateDataHandle(dde_inst, (LPBYTE)"data", MAX_PATH, 2, item, CF_TEXT, 0); + err = DdeGetLastError(dde_inst); + ok(hdata != NULL, "Expected non-NULL hdata\n"); + ok(err == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", err); + + ptr = GlobalLock(hdata); + todo_wine + { + ok(ptr == NULL, "Expected NULL, got %p\n", ptr); + } + + ptr = DdeAccessData(hdata, &size); + ok(ptr != NULL, "Expected non-NULL ptr\n"); + ok(size == 262, "Expected 262, got %d\n", size); + todo_wine + { + ok(lstrlenA((LPSTR)ptr) == 0, "Expected 0, got %d\n", lstrlenA((LPSTR)ptr)); + } + + ret = DdeUnaccessData(hdata); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + + ret = DdeFreeDataHandle(hdata); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + + /* NULL item */ + DdeGetLastError(dde_inst); + hdata = DdeCreateDataHandle(dde_inst, (LPBYTE)"data", MAX_PATH, 0, 0, CF_TEXT, 0); + err = DdeGetLastError(dde_inst); + ok(hdata != NULL, "Expected non-NULL hdata\n"); + ok(err == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", err); + + ptr = GlobalLock(hdata); + todo_wine + { + ok(ptr == NULL, "Expected NULL, got %p\n", ptr); + } + + ptr = DdeAccessData(hdata, &size); + ok(ptr != NULL, "Expected non-NULL ptr\n"); + ok(!lstrcmpA((LPSTR)ptr, "data"), "Expected data, got %s\n", ptr); + ok(size == 260, "Expected 260, got %d\n", size); + + ret = DdeUnaccessData(hdata); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + + ret = DdeFreeDataHandle(hdata); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + + /* NULL item */ + DdeGetLastError(dde_inst); + hdata = DdeCreateDataHandle(dde_inst, (LPBYTE)"data", MAX_PATH, 0, (HSZ)0xdeadbeef, CF_TEXT, 0); + err = DdeGetLastError(dde_inst); + ok(hdata != NULL, "Expected non-NULL hdata\n"); + ok(err == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", err); + + ptr = GlobalLock(hdata); + todo_wine + { + ok(ptr == NULL, "Expected NULL, got %p\n", ptr); + } + + ptr = DdeAccessData(hdata, &size); + ok(ptr != NULL, "Expected non-NULL ptr\n"); + ok(!lstrcmpA((LPSTR)ptr, "data"), "Expected data, got %s\n", ptr); + ok(size == 260, "Expected 260, got %d\n", size); + + ret = DdeUnaccessData(hdata); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + + ret = DdeFreeDataHandle(hdata); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + + /* invalid clipboard format */ + DdeGetLastError(dde_inst); + hdata = DdeCreateDataHandle(dde_inst, (LPBYTE)"data", MAX_PATH, 0, item, 0xdeadbeef, 0); + err = DdeGetLastError(dde_inst); + ok(hdata != NULL, "Expected non-NULL hdata\n"); + ok(err == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", err); + + ptr = GlobalLock(hdata); + todo_wine + { + ok(ptr == NULL, "Expected NULL, got %p\n", ptr); + } + + ptr = DdeAccessData(hdata, &size); + ok(ptr != NULL, "Expected non-NULL ptr\n"); + ok(!lstrcmpA((LPSTR)ptr, "data"), "Expected data, got %s\n", ptr); + ok(size == 260, "Expected 260, got %d\n", size); + + ret = DdeUnaccessData(hdata); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + + ret = DdeFreeDataHandle(hdata); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + + ret = DdeUninitialize(dde_inst); + ok(res == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", res); +} + static void test_DdeCreateStringHandle(void) { DWORD dde_inst, ret; @@ -1900,6 +2091,7 @@ START_TEST(dde) test_dde_aw_transaction(); + test_DdeCreateDataHandle(); test_DdeCreateStringHandle(); test_FreeDDElParam(); test_PackDDElParam();

1 0

Alexandre Julliard : user32: Fix message processing in dde test and go back to more reasonable timeouts .
by Alexandre Julliard Oct. 16, 2007

Oct. 16, 2007

Module: wine Branch: master Commit: 9f3f51bad74ab97ad2cd91fccac1d48d4f1c5e6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f3f51bad74ab97ad2cd91fcc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 15 21:19:22 2007 +0200 user32: Fix message processing in dde test and go back to more reasonable timeouts. --- dlls/user32/tests/dde.c | 77 +++++++++++++++++++++------------------------- 1 files changed, 35 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f3f51bad74ab97ad2cd9…

1 0

James Hawkins : user32: Increase the message timeout.
by Alexandre Julliard Oct. 16, 2007

Oct. 16, 2007

Module: wine Branch: master Commit: 8725b39003bdd24fbdb2c26b43897ee7c6d2941a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8725b39003bdd24fbdb2c26b4… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Oct 12 00:11:56 2007 -0500 user32: Increase the message timeout. --- dlls/user32/tests/dde.c | 194 +++++++++++++++++++++-------------------------- 1 files changed, 86 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8725b39003bdd24fbdb2c…

1 0

James Hawkins : user32: Return DMLERR_INVALIDPARAMETER if hszItem is NULL.
by Alexandre Julliard Oct. 16, 2007

Oct. 16, 2007

Module: wine Branch: master Commit: 4fb3518e2ae8126c9c66f5546abadba6e9111ddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fb3518e2ae8126c9c66f5546… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Oct 12 00:20:08 2007 -0500 user32: Return DMLERR_INVALIDPARAMETER if hszItem is NULL. --- dlls/user32/dde_client.c | 9 +++++++-- dlls/user32/tests/dde.c | 10 ++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 16e6daa..fe2dada 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -1141,8 +1141,13 @@ HDDEDATA WINAPI DdeClientTransaction(LPBYTE pData, DWORD cbData, HCONV hConv, HS pXAct = WDML_ClientQueueExecute(pConv, pData, cbData); break; case XTYP_POKE: - pXAct = WDML_ClientQueuePoke(pConv, pData, cbData, wFmt, hszItem); - break; + if (!hszItem) + { + pConv->instance->lastError = DMLERR_INVALIDPARAMETER; + return 0; + } + pXAct = WDML_ClientQueuePoke(pConv, pData, cbData, wFmt, hszItem); + break; case XTYP_ADVSTART|XTYPF_NODATA: case XTYP_ADVSTART|XTYPF_NODATA|XTYPF_ACKREQ: case XTYP_ADVSTART: diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 5d0c915..1601cd1 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -358,10 +358,7 @@ static void test_ddeml_client(void) ret = DdeGetLastError(client_pid); ok(op == NULL, "Expected NULL, got %p\n", op); ok(res == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", res); - todo_wine - { - ok(ret == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", ret); - } + ok(ret == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", ret); /* XTYP_POKE, no data */ res = 0xdeadbeef; @@ -370,10 +367,7 @@ static void test_ddeml_client(void) ret = DdeGetLastError(client_pid); ok(op == NULL, "Expected NULL, got %p\n", op); ok(res == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", res); - todo_wine - { - ok(ret == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", ret); - } + ok(ret == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", ret); /* XTYP_POKE, wrong size */ res = 0xdeadbeef;

1 0

James Hawkins : user32: Return DMLERR_INVALIDPARAMETER if hszItem is NULL.
by Alexandre Julliard Oct. 16, 2007

Oct. 16, 2007

Module: wine Branch: master Commit: 97dc03216183d803e73d30a8ad9d679c28f10c07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97dc03216183d803e73d30a8a… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Oct 12 00:14:34 2007 -0500 user32: Return DMLERR_INVALIDPARAMETER if hszItem is NULL. --- dlls/user32/dde_client.c | 2 +- dlls/user32/tests/dde.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index cb9fbc8..78987c5 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -1163,7 +1163,7 @@ HDDEDATA WINAPI DdeClientTransaction(LPBYTE pData, DWORD cbData, HCONV hConv, HS pXAct = WDML_ClientQueueUnadvise(pConv, wFmt, hszItem); break; case XTYP_REQUEST: - if (pData) + if (pData || !hszItem) { pConv->instance->lastError = DMLERR_INVALIDPARAMETER; return 0; diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index cea7846..9755cf4 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -353,10 +353,7 @@ static void test_ddeml_client(void) ret = DdeGetLastError(client_pid); ok(hdata == NULL, "Expected NULL hdata, got %p\n", hdata); ok(res == 0xdeadbeef, "Expected 0xdeadbeef, got %08x\n", res); - todo_wine - { - ok(ret == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", ret); - } + ok(ret == DMLERR_INVALIDPARAMETER, "Expected DMLERR_INVALIDPARAMETER, got %d\n", ret); DdeFreeStringHandle(client_pid, item);

1 0

James Hawkins : user32: Return DMLERR_MEMORY_ERROR instead of posting an ACK when fAckReq is returned by the server for WM_DDE_DATA .
by Alexandre Julliard Oct. 16, 2007

Oct. 16, 2007

Module: wine Branch: master Commit: ccabbeed60504351c52a7e2d24386660571851fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccabbeed60504351c52a7e2d2… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Oct 12 00:15:27 2007 -0500 user32: Return DMLERR_MEMORY_ERROR instead of posting an ACK when fAckReq is returned by the server for WM_DDE_DATA. --- dlls/user32/dde_client.c | 2 +- dlls/user32/tests/dde.c | 30 +++++++----------------------- 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 78987c5..16e6daa 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -533,7 +533,7 @@ static WDML_QUEUE_STATE WDML_HandleRequestReply(WDML_CONV* pConv, MSG* msg, WDML } if (wdh.fAckReq) { - WDML_PostAck(pConv, WDML_CLIENT_SIDE, 0, FALSE, TRUE, uiHi, msg->lParam, WM_DDE_DATA); + pConv->instance->lastError = DMLERR_MEMORY_ERROR; } else { diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 9755cf4..5d0c915 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -109,7 +109,6 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA case WM_DDE_REQUEST: { - if (msg_index == 5) todo_wine ok((msg_index >= 2 && msg_index <= 4) || (msg_index >= 7 && msg_index <= 8), "Expected 2, 3, 4, 7 or 8, got %d\n", msg_index); @@ -161,7 +160,6 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA case WM_DDE_POKE: { - if (msg_index == 7) todo_wine ok(msg_index == 5 || msg_index == 6, "Expected 5 or 6, got %d\n", msg_index); ok(wparam == (WPARAM)client, "Expected client hwnd, got %08lx\n", wparam); @@ -173,7 +171,7 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA poke = GlobalLock((HGLOBAL)lo); ok(poke != NULL, "Expected non-NULL poke\n"); ok(poke->fReserved == 0, "Expected 0, got %d\n", poke->fReserved); - if (msg_index == 7) todo_wine + if (msg_index == 6) todo_wine { ok(poke->unused == 0, "Expected 0, got %d\n", poke->unused); ok(poke->fRelease == TRUE, "Expected TRUE, got %d\n", poke->fRelease); @@ -183,11 +181,9 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA if (msg_index == 5) ok(lstrcmpA((LPSTR)poke->Value, "poke data\r\n"), "Expected 'poke data\\r\\n', got %s\n", poke->Value); - else if (msg_index == 6) todo_wine - { + else ok(!lstrcmpA((LPSTR)poke->Value, "poke data\r\n"), "Expected 'poke data\\r\\n', got %s\n", poke->Value); - } GlobalUnlock((HGLOBAL)lo); @@ -199,10 +195,7 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA case WM_DDE_EXECUTE: { - todo_wine - { - ok(msg_index == 7, "Expected 7, got %d\n", msg_index); - } + ok(msg_index == 7, "Expected 7, got %d\n", msg_index); ok(wparam == (WPARAM)client, "Expected client hwnd, got %08lx\n", wparam); ptr = GlobalLock((HGLOBAL)lparam); @@ -219,10 +212,7 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA case WM_DDE_TERMINATE: { - todo_wine - { - ok(msg_index == 9, "Expected 9, got %d\n", msg_index); - } + ok(msg_index == 9, "Expected 9, got %d\n", msg_index); ok(wparam == (WPARAM)client, "Expected client hwnd, got %08lx\n", wparam); ok(lparam == 0, "Expected 0, got %08lx\n", lparam); @@ -232,10 +222,7 @@ static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPA } default: - todo_wine - { - ok(FALSE, "Unhandled msg: %08x\n", msg); - } + ok(FALSE, "Unhandled msg: %08x\n", msg); } return DefWindowProcA(hwnd, msg, wparam, lparam); @@ -467,11 +454,8 @@ static void test_ddeml_client(void) } str = (LPSTR)DdeAccessData(hdata, &size); - todo_wine - { - ok(!lstrcmpA(str, "command executed\r\n"), "Expected 'command executed\\r\\n', got %s\n", str); - ok(size == 21, "Expected 21, got %d\n", size); - } + ok(!lstrcmpA(str, "command executed\r\n"), "Expected 'command executed\\r\\n', got %s\n", str); + ok(size == 21, "Expected 21, got %d\n", size); ret = DdeUnaccessData(hdata); ok(ret == TRUE, "Expected TRUE, got %d\n", ret);

1 0

Alexander Nicolaysen Sørnes : user menu: fix typo spotted by Ron Olgiati
by Chris Morgan Oct. 15, 2007

Oct. 15, 2007

Module: appdb Branch: master Commit: 6c2a45f1067e156ffde6b6c180d0c1f31c56fa6a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=6c2a45f1067e156ffde6b6c1… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Oct 15 02:54:34 2007 +0200 user menu: fix typo spotted by Ron Olgiati --- include/sidebar_login.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/sidebar_login.php b/include/sidebar_login.php index 1521646..eb18ce2 100644 --- a/include/sidebar_login.php +++ b/include/sidebar_login.php @@ -52,7 +52,7 @@ function global_sidebar_login() { $iVersionsRejected = version::objectGetEntriesCount(true, true); if($iVersionsRejected && !$_SESSION['current']->hasPriv("admin")) { - $g->add("Review Rejected Versiosn ($iVersionsRejected)", + $g->add("Review Rejected Versions ($iVersionsRejected)", BASE."objectManager.php?sClass=version_queue&bIsRejected=true". "&bIsQueue=true&sTitle=Rejected+Versions", "center"); }

1 0

Detlef Riekenberg : localspl/tests: Spelling fix.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: 3fd7290d4fc91cea887b16a7c094d22ec843576c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fd7290d4fc91cea887b16a7c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Oct 14 22:14:58 2007 +0200 localspl/tests: Spelling fix. --- dlls/localspl/tests/localmon.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index bc759f1..06cdfbe 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -715,14 +715,14 @@ static void test_OpenPort() SetLastError(0xdeadbeef); res = pOpenPort(does_not_existW, &hPort); ok (!res && (hPort == (HANDLE) 0xdeadbeef), - "got %u with 0x%x and %p (expectet '0' and 0xdeadbeef)\n", res, GetLastError(), hPort); + "got %u with 0x%x and %p (expected '0' and 0xdeadbeef)\n", res, GetLastError(), hPort); if (res) pClosePort(hPort); hPort = (HANDLE) 0xdeadbeef; SetLastError(0xdeadbeef); res = pOpenPort(emptyW, &hPort); ok (!res && (hPort == (HANDLE) 0xdeadbeef), - "got %u with 0x%x and %p (expectet '0' and 0xdeadbeef)\n", res, GetLastError(), hPort); + "got %u with 0x%x and %p (expected '0' and 0xdeadbeef)\n", res, GetLastError(), hPort); if (res) pClosePort(hPort);

1 0