December 2007 - Wine-commits

Johannes Stezenbach : ws2_32: Set *res = NULL for error return from WS_getaddrinfo().
by Alexandre Julliard 24 Dec '07

24 Dec '07

Module: wine Branch: master Commit: ca4d35fe4819957fa9a4aa4b73f255f2f836e3aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca4d35fe4819957fa9a4aa4b7… Author: Johannes Stezenbach <js(a)sig21.net> Date: Sat Dec 22 23:29:55 2007 +0100 ws2_32: Set *res = NULL for error return from WS_getaddrinfo(). --- dlls/ws2_32/socket.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 12024f5..f1ea825 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3480,6 +3480,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr freeaddrinfo(unixaires); } else { result = convert_eai_u2w(result); + *res = NULL; } return result;

1 0

Stefan Leichter : gdiplus: Partly implement GdipCreateFromHDC2
by Alexandre Julliard 24 Dec '07

24 Dec '07

Module: wine Branch: master Commit: bfffb4f4616cb28dbc346ac058be5f630056cb0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfffb4f4616cb28dbc346ac05… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Dec 23 10:56:32 2007 +0100 gdiplus: Partly implement GdipCreateFromHDC2 --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 10 ++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 607ac6a..796b7cb 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -89,7 +89,7 @@ @ stub GdipCreateFontFromDC @ stdcall GdipCreateFontFromLogfontA(ptr ptr ptr) @ stdcall GdipCreateFontFromLogfontW(ptr ptr ptr) -@ stub GdipCreateFromHDC2 +@ stdcall GdipCreateFromHDC2(long long ptr) @ stdcall GdipCreateFromHDC(long ptr) @ stdcall GdipCreateFromHWND(long ptr) @ stub GdipCreateFromHWNDICM diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c69c0e5..65e7151 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -745,8 +745,18 @@ end: GpStatus WINGDIPAPI GdipCreateFromHDC(HDC hdc, GpGraphics **graphics) { + return GdipCreateFromHDC2(hdc, NULL, graphics); +} + +GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC hdc, HANDLE hDevice, GpGraphics **graphics) +{ GpStatus retval; + if(hDevice != NULL) { + FIXME("Don't know how to hadle parameter hDevice\n"); + return NotImplemented; + } + if(hdc == NULL) return OutOfMemory; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 05ed742..caf3532 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -51,6 +51,7 @@ GpStatus WINGDIPAPI GdipSetPenStartCap(GpPen*,GpLineCap); GpStatus WINGDIPAPI GdipSetPenWidth(GpPen*,REAL); GpStatus WINGDIPAPI GdipCreateFromHDC(HDC,GpGraphics**); +GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC,HANDLE,GpGraphics**); GpStatus WINGDIPAPI GdipCreateFromHWND(HWND,GpGraphics**); GpStatus WINGDIPAPI GdipCreateLineBrush(GDIPCONST GpPointF*,GDIPCONST GpPointF*, ARGB,ARGB,GpWrapMode,GpLineGradient**);

1 0

Stefan Leichter : kernel32: Silence a fixme in GetNativeSystemInfo.
by Alexandre Julliard 24 Dec '07

24 Dec '07

Module: wine Branch: master Commit: 20c0ba23413de5a945ecdaaab2a8f78b12fb5a70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20c0ba23413de5a945ecdaaab… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Dec 23 11:06:22 2007 +0100 kernel32: Silence a fixme in GetNativeSystemInfo. --- dlls/kernel32/cpu.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index c7d366e..eed4cdd 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -808,7 +808,12 @@ VOID WINAPI GetSystemInfo( VOID WINAPI GetNativeSystemInfo( LPSYSTEM_INFO si /* [out] Destination for system information, may not be NULL */) { - FIXME("(%p) using GetSystemInfo()\n", si); + static BOOL reported = FALSE; + if (!reported) { + FIXME("(%p) using GetSystemInfo()\n", si); + reported = TRUE; + } else + TRACE("(%p) using GetSystemInfo()\n", si); GetSystemInfo(si); }

1 0

Andrew Talbot : msacm32: Remove unneeded casts.
by Alexandre Julliard 24 Dec '07

24 Dec '07

Module: wine Branch: master Commit: 0d6bc9076f6c60550ee634e39c616b79ec4ec7d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d6bc9076f6c60550ee634e39… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Dec 21 17:05:29 2007 +0000 msacm32: Remove unneeded casts. --- dlls/msacm32/driver.c | 2 +- dlls/msacm32/pcmconverter.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index 086eef2..481daf0 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -299,7 +299,7 @@ MMRESULT WINAPI acmDriverDetailsW(HACMDRIVERID hadid, PACMDRIVERDETAILSW padd, D if (mmr == MMSYSERR_NOERROR) { ACMDRIVERDETAILSW paddw; paddw.cbStruct = sizeof(paddw); - mmr = (MMRESULT)MSACM_Message(acmDrvr, ACMDM_DRIVER_DETAILS, (LPARAM)&paddw, 0); + mmr = MSACM_Message(acmDrvr, ACMDM_DRIVER_DETAILS, (LPARAM)&paddw, 0); acmDriverClose(acmDrvr, 0); paddw.cbStruct = min(padd->cbStruct, sizeof(*padd)); diff --git a/dlls/msacm32/pcmconverter.c b/dlls/msacm32/pcmconverter.c index 4b8fdfe..62c359c 100644 --- a/dlls/msacm32/pcmconverter.c +++ b/dlls/msacm32/pcmconverter.c @@ -1006,8 +1006,8 @@ static LRESULT PCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER if (adsi->fdwDriver & PCM_RESAMPLE) { DWORD nsrc2 = nsrc; DWORD ndst2 = ndst; - apd->cvt.cvtChangeRate((DWORD)adsi->pwfxSrc->nSamplesPerSec, adsh->pbSrc, &nsrc2, - (DWORD)adsi->pwfxDst->nSamplesPerSec, adsh->pbDst, &ndst2); + apd->cvt.cvtChangeRate(adsi->pwfxSrc->nSamplesPerSec, adsh->pbSrc, &nsrc2, + adsi->pwfxDst->nSamplesPerSec, adsh->pbDst, &ndst2); nsrc -= nsrc2; ndst -= ndst2; } else {

1 0

Andrey Turkin : dbghelp: Adjust minidump streams ordering and sizing.
by Alexandre Julliard 24 Dec '07

24 Dec '07

Module: wine Branch: master Commit: 33df0a7605c6675ea49e857a5aee4cf223ac0f01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33df0a7605c6675ea49e857a5… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sat Dec 22 04:21:56 2007 +0300 dbghelp: Adjust minidump streams ordering and sizing. To more closely match native format; this is required for windbg. --- dlls/dbghelp/minidump.c | 55 ++++++++++++++++++++++++---------------------- 1 files changed, 29 insertions(+), 26 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index e8daeda..949545f 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -351,7 +351,8 @@ static void append(struct dump_context* dc, void* data, unsigned size) * Write in File the exception information from pcs */ static void dump_exception_info(struct dump_context* dc, - const MINIDUMP_EXCEPTION_INFORMATION* except) + const MINIDUMP_EXCEPTION_INFORMATION* except, + DWORD *size) { MINIDUMP_EXCEPTION_STREAM mdExcpt; EXCEPTION_RECORD rec, *prec; @@ -390,6 +391,7 @@ static void dump_exception_info(struct dump_context* dc, mdExcpt.ThreadContext.Rva = dc->rva + sizeof(mdExcpt); append(dc, &mdExcpt, sizeof(mdExcpt)); + *size = sizeof(mdExcpt); append(dc, pctx, sizeof(*pctx)); } @@ -398,7 +400,7 @@ static void dump_exception_info(struct dump_context* dc, * * Write in File the modules from pcs */ -static void dump_modules(struct dump_context* dc, BOOL dump_elf) +static void dump_modules(struct dump_context* dc, BOOL dump_elf, DWORD *size) { MINIDUMP_MODULE mdModule; MINIDUMP_MODULE_LIST mdModuleList; @@ -422,7 +424,7 @@ static void dump_modules(struct dump_context* dc, BOOL dump_elf) * FIXME: if we don't ask for all modules in cb, we'll get a hole in the file */ rva_base = dc->rva; - dc->rva += sizeof(mdModuleList.NumberOfModules) + sizeof(mdModule) * nmod; + dc->rva += *size = sizeof(mdModuleList.NumberOfModules) + sizeof(mdModule) * nmod; for (i = 0; i < dc->num_module; i++) { if ((dc->module[i].is_elf && !dump_elf) || @@ -497,7 +499,7 @@ static void dump_modules(struct dump_context* dc, BOOL dump_elf) * * Dumps into File the information about the system */ -static void dump_system_info(struct dump_context* dc) +static void dump_system_info(struct dump_context* dc, DWORD *size) { MINIDUMP_SYSTEM_INFO mdSysInfo; SYSTEM_INFO sysInfo; @@ -525,6 +527,7 @@ static void dump_system_info(struct dump_context* dc) memset(&mdSysInfo.Cpu, 0, sizeof(mdSysInfo.Cpu)); append(dc, &mdSysInfo, sizeof(mdSysInfo)); + *size = sizeof(mdSysInfo); slen = lstrlenW(osInfo.szCSDVersion) * sizeof(WCHAR); WriteFile(dc->hFile, &slen, sizeof(slen), &written, NULL); @@ -538,7 +541,8 @@ static void dump_system_info(struct dump_context* dc) * Dumps into File the information about running threads */ static void dump_threads(struct dump_context* dc, - const MINIDUMP_EXCEPTION_INFORMATION* except) + const MINIDUMP_EXCEPTION_INFORMATION* except, + DWORD *size) { MINIDUMP_THREAD mdThd; MINIDUMP_THREAD_LIST mdThdList; @@ -618,6 +622,7 @@ static void dump_threads(struct dump_context* dc, } writeat(dc, rva_base, &mdThdList.NumberOfThreads, sizeof(mdThdList.NumberOfThreads)); + *size = dc->rva - rva_base; } /****************************************************************** @@ -625,7 +630,7 @@ static void dump_threads(struct dump_context* dc, * * dumps information about the memory of the process (stack of the threads) */ -static void dump_memory_info(struct dump_context* dc) +static void dump_memory_info(struct dump_context* dc, DWORD* size) { MINIDUMP_MEMORY_LIST mdMemList; MINIDUMP_MEMORY_DESCRIPTOR mdMem; @@ -639,6 +644,8 @@ static void dump_memory_info(struct dump_context* dc) sizeof(mdMemList.NumberOfMemoryRanges)); rva_base = dc->rva; dc->rva += mdMemList.NumberOfMemoryRanges * sizeof(mdMem); + *size = sizeof(mdMemList.NumberOfMemoryRanges) + + mdMemList.NumberOfMemoryRanges * sizeof(mdMem); for (i = 0; i < dc->num_mem; i++) { @@ -663,7 +670,7 @@ static void dump_memory_info(struct dump_context* dc) } } -static void dump_misc_info(struct dump_context* dc) +static void dump_misc_info(struct dump_context* dc, DWORD* size) { MINIDUMP_MISC_INFO mmi; @@ -672,6 +679,7 @@ static void dump_misc_info(struct dump_context* dc) mmi.ProcessId = dc->pid; /* FIXME: create/user/kernel time */ append(dc, &mmi, sizeof(mmi)); + *size = sizeof(mmi); } /****************************************************************** @@ -725,6 +733,7 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, mdHead.StreamDirectoryRva = sizeof(mdHead); mdHead.u.TimeDateStamp = time(NULL); mdHead.Flags = DumpType; + mdHead.CheckSum = 0; append(&dc, &mdHead, sizeof(mdHead)); /* 3) write stream directories */ @@ -733,45 +742,40 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, /* 3.1) write data stream directories */ + /* must be first in minidump */ + mdDir.StreamType = SystemInfoStream; + mdDir.Location.Rva = dc.rva; + dump_system_info(&dc, &mdDir.Location.DataSize); + writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), + &mdDir, sizeof(mdDir)); + mdDir.StreamType = ThreadListStream; mdDir.Location.Rva = dc.rva; - dump_threads(&dc, ExceptionParam); - mdDir.Location.DataSize = dc.rva - mdDir.Location.Rva; + dump_threads(&dc, ExceptionParam, &mdDir.Location.DataSize); writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), &mdDir, sizeof(mdDir)); mdDir.StreamType = ModuleListStream; mdDir.Location.Rva = dc.rva; - dump_modules(&dc, FALSE); - mdDir.Location.DataSize = dc.rva - mdDir.Location.Rva; + dump_modules(&dc, FALSE, &mdDir.Location.DataSize); writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), &mdDir, sizeof(mdDir)); mdDir.StreamType = 0xfff0; /* FIXME: this is part of MS reserved streams */ mdDir.Location.Rva = dc.rva; - dump_modules(&dc, TRUE); - mdDir.Location.DataSize = dc.rva - mdDir.Location.Rva; + dump_modules(&dc, TRUE, &mdDir.Location.DataSize); writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), &mdDir, sizeof(mdDir)); mdDir.StreamType = MemoryListStream; mdDir.Location.Rva = dc.rva; - dump_memory_info(&dc); - mdDir.Location.DataSize = dc.rva - mdDir.Location.Rva; - writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), - &mdDir, sizeof(mdDir)); - - mdDir.StreamType = SystemInfoStream; - mdDir.Location.Rva = dc.rva; - dump_system_info(&dc); - mdDir.Location.DataSize = dc.rva - mdDir.Location.Rva; + dump_memory_info(&dc, &mdDir.Location.DataSize); writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), &mdDir, sizeof(mdDir)); mdDir.StreamType = MiscInfoStream; mdDir.Location.Rva = dc.rva; - dump_misc_info(&dc); - mdDir.Location.DataSize = dc.rva - mdDir.Location.Rva; + dump_misc_info(&dc, &mdDir.Location.DataSize); writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), &mdDir, sizeof(mdDir)); @@ -780,8 +784,7 @@ BOOL WINAPI MiniDumpWriteDump(HANDLE hProcess, DWORD pid, HANDLE hFile, { mdDir.StreamType = ExceptionStream; mdDir.Location.Rva = dc.rva; - dump_exception_info(&dc, ExceptionParam); - mdDir.Location.DataSize = dc.rva - mdDir.Location.Rva; + dump_exception_info(&dc, ExceptionParam, &mdDir.Location.DataSize); writeat(&dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), &mdDir, sizeof(mdDir)); }

1 0

Rob Shearman : rpcrt4: Set pStubMsg-> BufferMark in NdrConformantVaryingArrayUnmarshall and NdrVaryingArrayUnmarshall .
by Alexandre Julliard 24 Dec '07

24 Dec '07

Module: wine Branch: master Commit: 64d1e2d8e3c5f570be41f7fd568915111dd784f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64d1e2d8e3c5f570be41f7fd5… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Dec 22 01:39:56 2007 +0000 rpcrt4: Set pStubMsg->BufferMark in NdrConformantVaryingArrayUnmarshall and NdrVaryingArrayUnmarshall. pStubMsg->BufferMark should always be set before EmbeddedPointerUnmarshall is called and these functions didn't previously do so. --- dlls/rpcrt4/ndr_marshall.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index c5cebea..2db0212 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2885,6 +2885,7 @@ unsigned char* WINAPI NdrConformantVaryingArrayUnmarshall( PMIDL_STUB_MESSAGE pS if (!*ppMemory || fMustAlloc) *ppMemory = NdrAllocate(pStubMsg, memsize); + pStubMsg->BufferMark = pStubMsg->Buffer; safe_copy_from_buffer(pStubMsg, *ppMemory + pStubMsg->Offset, bufsize); EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, *ppMemory, pFormat, TRUE /* FIXME */); @@ -4515,6 +4516,7 @@ unsigned char * WINAPI NdrVaryingArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, if (!*ppMemory || fMustAlloc) *ppMemory = NdrAllocate(pStubMsg, size); + pStubMsg->BufferMark = pStubMsg->Buffer; safe_copy_from_buffer(pStubMsg, *ppMemory + pStubMsg->Offset, bufsize); EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, *ppMemory, pFormat, TRUE /* FIXME */);

1 0

James Hawkins : msi: Fix deleting temporary rows, with tests.
by Alexandre Julliard 24 Dec '07

24 Dec '07

Module: wine Branch: master Commit: 3c0f7ca4e6e1cd192251fda825a61dab4fa808bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c0f7ca4e6e1cd192251fda82… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Dec 21 21:04:18 2007 -0600 msi: Fix deleting temporary rows, with tests. --- dlls/msi/table.c | 25 +++++++++- dlls/msi/tests/db.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+), 3 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 844feb3..7824521 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1543,6 +1543,7 @@ static UINT TABLE_delete_row( struct tagMSIVIEW *view, UINT row ) { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; UINT r, num_rows, num_cols, i; + BYTE **data; TRACE("%p %d\n", tv, row); @@ -1556,13 +1557,25 @@ static UINT TABLE_delete_row( struct tagMSIVIEW *view, UINT row ) if ( row >= num_rows ) return ERROR_FUNCTION_FAILED; - tv->table->row_count--; + if ( row < tv->table->row_count ) + { + num_rows = tv->table->row_count; + tv->table->row_count--; + data = tv->table->data; + } + else + { + num_rows = tv->table->nonpersistent_row_count; + row -= tv->table->row_count; + tv->table->nonpersistent_row_count--; + data = tv->table->nonpersistent_data; + } if ( row == num_rows - 1 ) return ERROR_SUCCESS; for (i = row + 1; i < num_rows; i++) - memcpy(tv->table->data[i - 1], tv->table->data[i], tv->row_size); + memcpy(data[i - 1], data[i], tv->row_size); return ERROR_SUCCESS; } @@ -1622,6 +1635,13 @@ static UINT TABLE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, r = table_validate_new( tv, rec ); break; + case MSIMODIFY_INSERT: + r = table_validate_new( tv, rec ); + if (r != ERROR_SUCCESS) + break; + r = TABLE_insert_row( view, rec, FALSE ); + break; + case MSIMODIFY_INSERT_TEMPORARY: r = table_validate_new( tv, rec ); if (r != ERROR_SUCCESS) @@ -1634,7 +1654,6 @@ static UINT TABLE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, break; case MSIMODIFY_REFRESH: - case MSIMODIFY_INSERT: case MSIMODIFY_ASSIGN: case MSIMODIFY_REPLACE: case MSIMODIFY_MERGE: diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 05a9aa9..099580d 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -4642,6 +4642,9 @@ static void test_order(void) r = MsiViewFetch(hview, &hrec); ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + MsiViewClose(hview); + MsiCloseHandle(hview); + query = "SELECT `A`, `D` FROM `Mesa`, `Sideboard` ORDER BY `F`"; r = MsiDatabaseOpenView(hdb, query, &hview); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -4750,8 +4753,125 @@ static void test_order(void) r = MsiViewFetch(hview, &hrec); ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + MsiViewClose(hview); + MsiCloseHandle(hview); + MsiCloseHandle(hdb); +} + +static void test_viewmodify_delete_temporary(void) +{ + MSIHANDLE hdb, hview, hrec; + const char *query; + UINT r; + + DeleteFile(msifile); + + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "CREATE TABLE `Table` ( `A` SHORT PRIMARY KEY `A` )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "SELECT * FROM `Table`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + hrec = MsiCreateRecord(1); + MsiRecordSetInteger(hrec, 1, 1); + + r = MsiViewModify(hview, MSIMODIFY_INSERT, hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + MsiCloseHandle(hrec); + + hrec = MsiCreateRecord(1); + MsiRecordSetInteger(hrec, 1, 2); + + r = MsiViewModify(hview, MSIMODIFY_INSERT_TEMPORARY, hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + MsiCloseHandle(hrec); + + hrec = MsiCreateRecord(1); + MsiRecordSetInteger(hrec, 1, 3); + + r = MsiViewModify(hview, MSIMODIFY_INSERT, hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + MsiCloseHandle(hrec); + + hrec = MsiCreateRecord(1); + MsiRecordSetInteger(hrec, 1, 4); + + r = MsiViewModify(hview, MSIMODIFY_INSERT_TEMPORARY, hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + MsiCloseHandle(hrec); + MsiViewClose(hview); + MsiCloseHandle(hview); + + query = "SELECT * FROM `Table` WHERE `A` = 2"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewModify(hview, MSIMODIFY_DELETE, hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + MsiCloseHandle(hrec); + MsiViewClose(hview); + MsiCloseHandle(hview); + + query = "SELECT * FROM `Table` WHERE `A` = 3"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewModify(hview, MSIMODIFY_DELETE, hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + MsiCloseHandle(hrec); + MsiViewClose(hview); + MsiCloseHandle(hview); + + query = "SELECT * FROM `Table` ORDER BY `A`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiRecordGetInteger(hrec, 1); + ok(r == 1, "Expected 1, got %d\n", r); + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiRecordGetInteger(hrec, 1); + ok(r == 4, "Expected 4, got %d\n", r); + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + MsiViewClose(hview); MsiCloseHandle(hview); MsiCloseHandle(hdb); + DeleteFileA(msifile); } START_TEST(db) @@ -4783,4 +4903,5 @@ START_TEST(db) test_viewmodify_delete(); test_defaultdatabase(); test_order(); + test_viewmodify_delete_temporary(); }

1 0

James Hawkins : msi: Allow the not-equal operator in WHERE query string comparisons.
by Alexandre Julliard 24 Dec '07

24 Dec '07

Module: wine Branch: master Commit: 58c7fe1095d01593fee7080c5ed4077ef9a11197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58c7fe1095d01593fee7080c5… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Dec 21 23:13:30 2007 -0600 msi: Allow the not-equal operator in WHERE query string comparisons. --- dlls/msi/tests/db.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++----- dlls/msi/where.c | 2 + 2 files changed, 58 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 099580d..891139b 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -3899,13 +3899,63 @@ static void test_select_markers(void) r = MsiViewFetch(view, &res); ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); - r = MsiViewClose(view); - ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); - r = MsiCloseHandle(view); - ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); - r = MsiCloseHandle(hdb); - ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + MsiCloseHandle(rec); + MsiViewClose(view); + MsiCloseHandle(view); + + rec = MsiCreateRecord(2); + MsiRecordSetString(rec, 1, "one"); + MsiRecordSetInteger(rec, 2, 1); + + query = "SELECT * FROM `Table` WHERE `Two`<>? AND `Three`>? ORDER BY `Three`"; + r = MsiDatabaseOpenView(hdb, query, &view); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(view, rec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewFetch(view, &res); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + size = MAX_PATH; + r = MsiRecordGetString(res, 1, buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buf, "apple"), "Expected apple, got %s\n", buf); + + size = MAX_PATH; + r = MsiRecordGetString(res, 2, buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buf, "two"), "Expected two, got %s\n", buf); + r = MsiRecordGetInteger(res, 3); + ok(r == 2, "Expected 2, got %d\n", r); + + MsiCloseHandle(res); + + r = MsiViewFetch(view, &res); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + size = MAX_PATH; + r = MsiRecordGetString(res, 1, buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buf, "banana"), "Expected banana, got %s\n", buf); + + size = MAX_PATH; + r = MsiRecordGetString(res, 2, buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buf, "three"), "Expected three, got %s\n", buf); + + r = MsiRecordGetInteger(res, 3); + ok(r == 3, "Expected 3, got %d\n", r); + + MsiCloseHandle(res); + + r = MsiViewFetch(view, &res); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + MsiCloseHandle(rec); + MsiViewClose(view); + MsiCloseHandle(view); + MsiCloseHandle(hdb); DeleteFile(msifile); } diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 258cb32..98eaa62 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -286,6 +286,7 @@ static UINT STRCMP_Evaluate( MSIWHEREVIEW *wv, UINT row, const struct expr *cond sr = lstrcmpW( l_str, r_str ); *val = ( cond->u.expr.op == OP_EQ && ( sr == 0 ) ) || + ( cond->u.expr.op == OP_NE && ( sr != 0 ) ) || ( cond->u.expr.op == OP_LT && ( sr < 0 ) ) || ( cond->u.expr.op == OP_GT && ( sr > 0 ) ); @@ -617,6 +618,7 @@ static UINT WHERE_VerifyCondition( MSIDATABASE *db, MSIVIEW *table, struct expr case OP_EQ: case OP_GT: case OP_LT: + case OP_NE: break; default: *valid = FALSE;

1 0

James Hawkins : msi: Allow whitespace after the property name when setting a property in the dialog .
by Alexandre Julliard 24 Dec '07

24 Dec '07

Module: wine Branch: master Commit: f0d369ba44f336a51cab0590ad3310efe3babbd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0d369ba44f336a51cab0590a… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Dec 21 23:29:13 2007 -0600 msi: Allow whitespace after the property name when setting a property in the dialog. --- dlls/msi/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 4994216..4417d4b 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3074,7 +3074,7 @@ static UINT msi_dialog_set_property( msi_dialog *dialog, LPCWSTR event, LPCWSTR prop = msi_alloc( len*sizeof(WCHAR)); strcpyW( prop, &event[1] ); p = strchrW( prop, ']' ); - if( p && p[1] == 0 ) + if( p && (p[1] == 0 || p[1] == ' ') ) { *p = 0; if( strcmpW( szNullArg, arg ) )

1 0

Peter Oberndorfer : winex11: Remove unused SWAP_INT macro.
by Alexandre Julliard 24 Dec '07

24 Dec '07

Module: wine Branch: master Commit: 730d5469036fde9a1389bf47bbfb931a9faca6fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=730d5469036fde9a1389bf47b… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Sat Dec 22 16:09:55 2007 +0200 winex11: Remove unused SWAP_INT macro. --- dlls/winex11.drv/text.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/text.c b/dlls/winex11.drv/text.c index 69ad225..752b8d3 100644 --- a/dlls/winex11.drv/text.c +++ b/dlls/winex11.drv/text.c @@ -31,7 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(text); -#define SWAP_INT(a,b) { int t = a; a = b; b = t; } #define IROUND(x) (int)((x)>0? (x)+0.5 : (x) - 0.5)

1 0