December 2007 - Wine-Commits

Johannes Stezenbach : wininet: Implement support for INTERNET_OPTION_VERSION in InternetQueryOptionW.
by Alexandre Julliard Dec. 24, 2007

Dec. 24, 2007

Module: wine Branch: master Commit: 7e18416e80780a70a88a1247b39278e5bdf279aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e18416e80780a70a88a1247b… Author: Johannes Stezenbach <js(a)sig21.net> Date: Sat Dec 22 23:29:11 2007 +0100 wininet: Implement support for INTERNET_OPTION_VERSION in InternetQueryOptionW. --- dlls/wininet/internet.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index cf4e9bf..03c5153 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2330,6 +2330,20 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d } } break; + case INTERNET_OPTION_VERSION: + { + TRACE("INTERNET_OPTION_VERSION\n"); + if (*lpdwBufferLength < sizeof(INTERNET_VERSION_INFO)) + INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); + else + { + static const INTERNET_VERSION_INFO info = { 6, 0 }; + memcpy(lpBuffer, &info, sizeof(info)); + *lpdwBufferLength = sizeof(info); + bSuccess = TRUE; + } + break; + } default: FIXME("Stub! %d\n", dwOption); break;

1 0

Stefan Leichter : kernel32: Silence a fixme in GetNativeSystemInfo.
by Alexandre Julliard Dec. 24, 2007

Dec. 24, 2007

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 Dec. 24, 2007

Dec. 24, 2007

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

Johannes Stezenbach : wininet: Fix error return code in FindFirstUrlCacheEntryW() stub.
by Alexandre Julliard Dec. 24, 2007

Dec. 24, 2007

Module: wine Branch: master Commit: a3ae419594c708ae1ed53d897f18044b277d49c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3ae419594c708ae1ed53d897… Author: Johannes Stezenbach <js(a)sig21.net> Date: Sat Dec 22 23:29:35 2007 +0100 wininet: Fix error return code in FindFirstUrlCacheEntryW() stub. --- 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 852ac87..597665d 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2796,6 +2796,7 @@ INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryW(LPCWSTR lpszUrlSearchPattern, LPINTERNET_CACHE_ENTRY_INFOW lpFirstCacheEntryInfo, LPDWORD lpdwFirstCacheEntryInfoBufferSize) { FIXME("(%s, %p, %p): stub\n", debugstr_w(lpszUrlSearchPattern), lpFirstCacheEntryInfo, lpdwFirstCacheEntryInfoBufferSize); + SetLastError(ERROR_FILE_NOT_FOUND); return 0; }

1 0

Peter Oberndorfer : gdi32: Fix a comment typo.
by Alexandre Julliard Dec. 24, 2007

Dec. 24, 2007

Module: wine Branch: master Commit: cea66e5859bc7f321cedef60bd329555d47138d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cea66e5859bc7f321cedef60b… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Sat Dec 22 15:09:59 2007 +0100 gdi32: Fix a comment typo. --- dlls/gdi32/palette.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index c55c814..169d6f6 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -869,7 +869,7 @@ VOID WINAPI SetMagicColors16(HDC16 hDC, COLORREF color, UINT16 index) } /********************************************************************* - * SetMagicColors (GDI.@) + * SetMagicColors (GDI32.@) */ BOOL WINAPI SetMagicColors(HDC hdc, ULONG u1, ULONG u2) {

1 0

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

Dec. 24, 2007

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

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

Dec. 24, 2007

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: Fix deleting temporary rows, with tests.
by Alexandre Julliard Dec. 24, 2007

Dec. 24, 2007

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

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

Dec. 24, 2007

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

Peter Oberndorfer : winex11: Remove unused SWAP_INT macro.
by Alexandre Julliard Dec. 24, 2007

Dec. 24, 2007

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