May 2008 - Wine-commits - list.winehq.org

Dmitry Timoshkov : user32: Set the size of returned DEVMODE to least common one as XP does.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: 2e19d9c47321340306b11c45ba68b31cb3ff51e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e19d9c47321340306b11c45b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun May 4 12:38:58 2008 +0900 user32: Set the size of returned DEVMODE to least common one as XP does. --- dlls/user32/sysparams.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 2fa3fee..71e846d 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3074,7 +3074,7 @@ BOOL WINAPI EnumDisplaySettingsExA(LPCSTR lpszDeviceName, DWORD iModeNum, ret = EnumDisplaySettingsExW(nameW.Buffer,iModeNum,&devmodeW,dwFlags); if (ret) { - lpDevMode->dmSize = sizeof(*lpDevMode); + lpDevMode->dmSize = FIELD_OFFSET(DEVMODEA, dmICMMethod); lpDevMode->dmSpecVersion = devmodeW.dmSpecVersion; lpDevMode->dmDriverVersion = devmodeW.dmDriverVersion; WideCharToMultiByte(CP_ACP, 0, devmodeW.dmDeviceName, -1,

1 0

Roderick Colenbrander : wined3d: At the start of RemoveContextFromArray numContexts is decreased by 1, the loop which loops through the whole array doesn' t take this into account.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: e3b662bb20ff2118943f0bbdc627b70f16a4f991 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3b662bb20ff2118943f0bbdc… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat May 3 20:15:58 2008 +0000 wined3d: At the start of RemoveContextFromArray numContexts is decreased by 1, the loop which loops through the whole array doesn't take this into account. Discovered by Peter Oberndorfer. --- dlls/wined3d/context.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e5b82e5..3341555 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -546,7 +546,8 @@ static void RemoveContextFromArray(IWineD3DDeviceImpl *This, WineD3DContext *con ERR("Cannot allocate a new context array, PANIC!!!\n"); } t = 0; - for(s = 0; s < This->numContexts; s++) { + /* Note that we decreased numContexts a few lines up, so use '<=' instead of '<' */ + for(s = 0; s <= This->numContexts; s++) { if(oldArray[s] == context) continue; This->contexts[t] = oldArray[s]; t++;

1 0

James Hawkins : msi: Fix a typo.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: 02b531b302dffdb559657484f40246ee767adb77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02b531b302dffdb559657484f… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sat May 3 21:12:41 2008 -0500 msi: Fix a typo. --- dlls/msi/helpers.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 0dc02b4..223cacd 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -1098,7 +1098,7 @@ static INT_PTR cabinet_notify(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) if (lstrcmpW(f->File, data->file->File)) return 0; - size = lstrlenW(data->destination) + lstrlenW(file) + 2; + size = lstrlenW(data->destination) + lstrlenW(data->file->FileName) + 2; path = msi_alloc(size * sizeof(WCHAR)); lstrcpyW(path, data->destination); PathAddBackslashW(path);

1 0

Dmitry Timoshkov : winex11.drv: Set the size of returned DEVMODE to least common one as XP does.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: fa61eac0f70bfe4bd08cd44f3acb06ffeb6d6ac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa61eac0f70bfe4bd08cd44f3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun May 4 12:31:04 2008 +0900 winex11.drv: Set the size of returned DEVMODE to least common one as XP does. --- dlls/winex11.drv/settings.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index d68b674..3527134 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -271,9 +271,9 @@ BOOL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DW static const WCHAR dev_name[CCHDEVICENAME] = { 'W','i','n','e',' ','X','1','1',' ','d','r','i','v','e','r',0 }; - devmode->dmSize = sizeof(DEVMODEW); - devmode->dmSpecVersion = MAKEWORD(1,4); - devmode->dmDriverVersion = MAKEWORD(1,4); + devmode->dmSize = FIELD_OFFSET(DEVMODEW, dmICMMethod); + devmode->dmSpecVersion = DM_SPECVERSION; + devmode->dmDriverVersion = DM_SPECVERSION; memcpy(devmode->dmDeviceName, dev_name, sizeof(dev_name)); devmode->dmDriverExtra = 0; devmode->u2.dmDisplayFlags = 0;

1 0

Andrew Talbot : wininet: Remove unused variables.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: 07ae2992b8676f1785e88634d9ce75e29425cb8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=07ae2992b8676f1785e88634d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat May 3 14:03:05 2008 +0100 wininet: Remove unused variables. --- dlls/wininet/ftp.c | 4 ---- dlls/wininet/http.c | 5 ----- dlls/wininet/urlcache.c | 6 ------ 3 files changed, 0 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 4077de3..36e9005 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2547,11 +2547,9 @@ INT FTP_ReceiveResponse(LPWININETFTPSESSIONW lpwfs, DWORD_PTR dwContext) INT rc = 0; char firstprefix[5]; BOOL multiline = FALSE; - LPWININETAPPINFOW hIC = NULL; TRACE("socket(%d)\n", lpwfs->sndSocket); - hIC = lpwfs->lpAppInfo; SendAsyncCallback(&lpwfs->hdr, dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); while(1) @@ -3168,7 +3166,6 @@ lend: static BOOL FTP_RetrieveFileData(LPWININETFTPSESSIONW lpwfs, INT nDataSocket, HANDLE hFile) { DWORD nBytesWritten; - DWORD nBytesReceived = 0; INT nRC = 0; CHAR *lpszBuffer; @@ -3190,7 +3187,6 @@ static BOOL FTP_RetrieveFileData(LPWININETFTPSESSIONW lpwfs, INT nDataSocket, HA if (nRC == 0) goto recv_end; WriteFile(hFile, lpszBuffer, nRC, &nBytesWritten, NULL); - nBytesReceived += nRC; } } diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 3155ac1..7f336f4 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1375,7 +1375,6 @@ static void HTTPREQ_CloseConnection(WININETHANDLEHEADER *hdr) { LPWININETHTTPREQW lpwhr = (LPWININETHTTPREQW) hdr; LPWININETHTTPSESSIONW lpwhs = NULL; - LPWININETAPPINFOW hIC = NULL; TRACE("%p\n",lpwhr); @@ -1408,7 +1407,6 @@ static void HTTPREQ_CloseConnection(WININETHANDLEHEADER *hdr) } lpwhs = lpwhr->lpHttpSession; - hIC = lpwhs->lpAppInfo; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_CLOSING_CONNECTION, 0, 0); @@ -3463,7 +3461,6 @@ HINTERNET HTTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, LPCWSTR lpszPassword, DWORD dwFlags, DWORD_PTR dwContext, DWORD dwInternalFlags) { - BOOL bSuccess = FALSE; LPWININETHTTPSESSIONW lpwhs = NULL; HINTERNET handle = NULL; @@ -3534,8 +3531,6 @@ HINTERNET HTTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, sizeof(handle)); } - bSuccess = TRUE; - lerror: if( lpwhs ) WININET_Release( &lpwhs->hdr ); diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index f34451a..6b00ebb 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1139,12 +1139,6 @@ static DWORD URLCache_HashKey(LPCSTR lpszKey) }; BYTE key[4]; DWORD i; - int subscript[sizeof(key) / sizeof(key[0])]; - - subscript[0] = *lpszKey; - subscript[1] = (char)(*lpszKey + 1); - subscript[2] = (char)(*lpszKey + 2); - subscript[3] = (char)(*lpszKey + 3); for (i = 0; i < sizeof(key) / sizeof(key[0]); i++) key[i] = lookupTable[i];

1 0

Andrew Talbot : inetcomm: Remove unused variables.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: d684d5accbc9dae1139b395eb5a99b59815e6d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d684d5accbc9dae1139b395eb… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat May 3 14:03:13 2008 +0100 inetcomm: Remove unused variables. --- dlls/inetcomm/internettransport.c | 3 --- dlls/inetcomm/mimeole.c | 2 -- 2 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/inetcomm/internettransport.c b/dlls/inetcomm/internettransport.c index 2dab22f..bba6aab 100644 --- a/dlls/inetcomm/internettransport.c +++ b/dlls/inetcomm/internettransport.c @@ -324,7 +324,6 @@ static LRESULT CALLBACK InternetTransport_WndProc(HWND hwnd, UINT uMsg, WPARAM w while (This->iCurrentBufferOffset < This->cbBuffer - 1) { - struct timeval tv; fd_set infd; if (recv(This->Socket, &This->pBuffer[This->iCurrentBufferOffset], 1, 0) <= 0) @@ -358,8 +357,6 @@ static LRESULT CALLBACK InternetTransport_WndProc(HWND hwnd, UINT uMsg, WPARAM w FD_ZERO(&infd); FD_SET(This->Socket, &infd); - tv.tv_sec = 0; - tv.tv_usec = 0; } if (This->iCurrentBufferOffset == This->cbBuffer - 1) return 0; diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 1e39f27..ee03e92 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1510,7 +1510,6 @@ static HRESULT create_body_offset_list(IStream *stm, const char *boundary, struc DWORD read; int boundary_len = strlen(boundary); char *buf, *nl_boundary, *ptr, *overlap; - DWORD total_read = 0; DWORD start = 0, overlap_no; offset_entry_t *cur_body = NULL; ULARGE_INTEGER cur; @@ -1533,7 +1532,6 @@ static HRESULT create_body_offset_list(IStream *stm, const char *boundary, struc hr = IStream_Read(stm, overlap, PARSER_BUF_SIZE, &read); if(FAILED(hr)) goto end; if(read == 0) break; - total_read += read; overlap[read] = '\0'; ptr = buf;

1 0

Andrew Talbot : wnaspi32: Remove unused variables.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: 53eacee0daa0938e9d8edc920c4795624a05416d URL: http://source.winehq.org/git/wine.git/?a=commit;h=53eacee0daa0938e9d8edc920… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat May 3 14:03:09 2008 +0100 wnaspi32: Remove unused variables. --- dlls/wnaspi32/winaspi16.c | 2 -- dlls/wnaspi32/winaspi32.c | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/wnaspi32/winaspi16.c b/dlls/wnaspi32/winaspi16.c index b8dcf27..4209082 100644 --- a/dlls/wnaspi32/winaspi16.c +++ b/dlls/wnaspi32/winaspi16.c @@ -126,7 +126,6 @@ ASPI_OpenDevice16(SRB_ExecSCSICmd16 *prb) static void ASPI_DebugPrintCmd(SRB_ExecSCSICmd16 *prb, UINT16 mode) { - BYTE cmd; int i; BYTE *cdb; BYTE *lpBuf = PTR_TO_LIN( prb->SRB_BufPointer, mode ); @@ -173,7 +172,6 @@ ASPI_DebugPrintCmd(SRB_ExecSCSICmd16 *prb, UINT16 mode) TRACE("CDB Length: %d\n", prb->SRB_CDBLen); TRACE("POST Proc: %x\n", (DWORD) prb->SRB_PostProc); cdb = &prb->CDBByte[0]; - cmd = prb->CDBByte[0]; if (TRACE_ON(aspi)) { TRACE("CDB buffer["); diff --git a/dlls/wnaspi32/winaspi32.c b/dlls/wnaspi32/winaspi32.c index 36a9202..94ed418 100644 --- a/dlls/wnaspi32/winaspi32.c +++ b/dlls/wnaspi32/winaspi32.c @@ -140,7 +140,6 @@ ASPI_OpenDevice(SRB_ExecSCSICmd *prb) static void ASPI_DebugPrintCmd(SRB_ExecSCSICmd *prb) { - BYTE cmd; int i; BYTE *cdb; @@ -185,7 +184,6 @@ ASPI_DebugPrintCmd(SRB_ExecSCSICmd *prb) TRACE("CDB Length: %d\n", prb->SRB_CDBLen); TRACE("POST Proc: %p\n", prb->SRB_PostProc); cdb = &prb->CDBByte[0]; - cmd = prb->CDBByte[0]; if (TRACE_ON(aspi)) { TRACE("CDB buffer["); for (i = 0; i < prb->SRB_CDBLen; i++) {

1 0

Paul Vriens : setupapi/tests: Skip some tests on win9x.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: d6f9de67b8e50c23b202ad497cb08e7ce2b75909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f9de67b8e50c23b202ad497… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sat May 3 16:49:19 2008 +0200 setupapi/tests: Skip some tests on win9x. --- dlls/setupapi/tests/devinst.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index f3f6c99..afd1860 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -965,6 +965,11 @@ static void testDeviceRegistryPropertyW() SetLastError(0xdeadbeef); set = pSetupDiGetClassDevsW(&guid, NULL, 0, DIGCF_DEVICEINTERFACE); + if (set == INVALID_HANDLE_VALUE && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + skip("W-functions are not implemented\n"); + return; + } ok(set != INVALID_HANDLE_VALUE, "SetupDiGetClassDevsW failed: %08x\n", GetLastError()); SetLastError(0xdeadbeef);

1 0

Paul Vriens : setupapi/tests: Clean up properly on win9x.
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: ed67a1f350073eb283e1b71524f324977fc0dc62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed67a1f350073eb283e1b7152… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sun May 4 14:30:17 2008 +0200 setupapi/tests: Clean up properly on win9x. --- dlls/setupapi/tests/devinst.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index afd1860..727e454 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -280,8 +280,14 @@ static void testInstallClass(void) '{','6','a','5','5','b','5','a','4','-','3','f','6','5','-', '1','1','d','b','-','b','7','0','4','-', '0','0','1','1','9','5','5','c','2','b','d','b','}',0}; + static const CHAR classKey_win9x[] = + "System\\CurrentControlSet\\Services\\Class\\" + "{6a55b5a4-3f65-11db-b704-0011955c2bdb}"; + static const CHAR bogus_win9x[] = + "System\\CurrentControlSet\\Services\\Class\\Bogus"; char tmpfile[MAX_PATH]; BOOL ret; + HKEY hkey; if (!pSetupDiInstallClassA) { @@ -305,9 +311,26 @@ static void testInstallClass(void) ret = pSetupDiInstallClassA(NULL, tmpfile + 2, 0, NULL); ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08x\n", GetLastError()); + /* The next call will succeed. Information is put into the registry but the + * location(s) is/are depending on the Windows version. + */ ret = pSetupDiInstallClassA(NULL, tmpfile, 0, NULL); ok(ret, "SetupDiInstallClassA failed: %08x\n", GetLastError()); - RegDeleteKeyW(HKEY_LOCAL_MACHINE, classKey); + if (!RegOpenKeyA(HKEY_LOCAL_MACHINE, classKey_win9x, &hkey)) + { + /* We are on win9x */ + RegCloseKey(hkey); + ok(!RegDeleteKeyA(HKEY_LOCAL_MACHINE, classKey_win9x), + "Couldn't delete win9x classkey\n"); + ok(!RegDeleteKeyA(HKEY_LOCAL_MACHINE, bogus_win9x), + "Couldn't delete win9x bogus services class\n"); + } + else + { + /* NT4 and above */ + ok(!RegDeleteKeyW(HKEY_LOCAL_MACHINE, classKey), + "Couldn't delete NT classkey\n"); + } DeleteFile(tmpfile); }

1 0

Andrew Talbot : dbghelp: Include port. h for possible alternative to strtoull().
by Alexandre Julliard 05 May '08

05 May '08

Module: wine Branch: master Commit: dbe65d03e2a2c66db19f9daebf8774ab27f540a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbe65d03e2a2c66db19f9daeb… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri May 2 23:27:39 2008 +0100 dbghelp: Include port.h for possible alternative to strtoull(). --- dlls/dbghelp/stabs.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index 889a775..d550633 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -30,6 +30,7 @@ */ #include "config.h" +#include "wine/port.h" #include <sys/types.h> #include <fcntl.h>

1 0