January 2007 - Wine-commits

Michael Stefaniuc : wined3d: Remove stray '\' at end of lines.
by Alexandre Julliard 09 Jan '07

09 Jan '07

Module: wine Branch: master Commit: 290ae94e663524e35e01210c06371e5b3bcc989f URL: http://source.winehq.org/git/wine.git/?a=commit;h=290ae94e663524e35e01210c0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 9 00:39:30 2007 +0100 wined3d: Remove stray '\' at end of lines. --- dlls/wined3d/device.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5957c52..d997292 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3808,22 +3808,22 @@ process_vertices_strided(IWineD3DDeviceI &world_mat); TRACE("View mat:\n"); - TRACE("%f %f %f %f\n", view_mat.u.s._11, view_mat.u.s._12, view_mat.u.s._13, view_mat.u.s._14); \ - TRACE("%f %f %f %f\n", view_mat.u.s._21, view_mat.u.s._22, view_mat.u.s._23, view_mat.u.s._24); \ - TRACE("%f %f %f %f\n", view_mat.u.s._31, view_mat.u.s._32, view_mat.u.s._33, view_mat.u.s._34); \ - TRACE("%f %f %f %f\n", view_mat.u.s._41, view_mat.u.s._42, view_mat.u.s._43, view_mat.u.s._44); \ + TRACE("%f %f %f %f\n", view_mat.u.s._11, view_mat.u.s._12, view_mat.u.s._13, view_mat.u.s._14); + TRACE("%f %f %f %f\n", view_mat.u.s._21, view_mat.u.s._22, view_mat.u.s._23, view_mat.u.s._24); + TRACE("%f %f %f %f\n", view_mat.u.s._31, view_mat.u.s._32, view_mat.u.s._33, view_mat.u.s._34); + TRACE("%f %f %f %f\n", view_mat.u.s._41, view_mat.u.s._42, view_mat.u.s._43, view_mat.u.s._44); TRACE("Proj mat:\n"); - TRACE("%f %f %f %f\n", proj_mat.u.s._11, proj_mat.u.s._12, proj_mat.u.s._13, proj_mat.u.s._14); \ - TRACE("%f %f %f %f\n", proj_mat.u.s._21, proj_mat.u.s._22, proj_mat.u.s._23, proj_mat.u.s._24); \ - TRACE("%f %f %f %f\n", proj_mat.u.s._31, proj_mat.u.s._32, proj_mat.u.s._33, proj_mat.u.s._34); \ - TRACE("%f %f %f %f\n", proj_mat.u.s._41, proj_mat.u.s._42, proj_mat.u.s._43, proj_mat.u.s._44); \ + TRACE("%f %f %f %f\n", proj_mat.u.s._11, proj_mat.u.s._12, proj_mat.u.s._13, proj_mat.u.s._14); + TRACE("%f %f %f %f\n", proj_mat.u.s._21, proj_mat.u.s._22, proj_mat.u.s._23, proj_mat.u.s._24); + TRACE("%f %f %f %f\n", proj_mat.u.s._31, proj_mat.u.s._32, proj_mat.u.s._33, proj_mat.u.s._34); + TRACE("%f %f %f %f\n", proj_mat.u.s._41, proj_mat.u.s._42, proj_mat.u.s._43, proj_mat.u.s._44); TRACE("World mat:\n"); - TRACE("%f %f %f %f\n", world_mat.u.s._11, world_mat.u.s._12, world_mat.u.s._13, world_mat.u.s._14); \ - TRACE("%f %f %f %f\n", world_mat.u.s._21, world_mat.u.s._22, world_mat.u.s._23, world_mat.u.s._24); \ - TRACE("%f %f %f %f\n", world_mat.u.s._31, world_mat.u.s._32, world_mat.u.s._33, world_mat.u.s._34); \ - TRACE("%f %f %f %f\n", world_mat.u.s._41, world_mat.u.s._42, world_mat.u.s._43, world_mat.u.s._44); \ + TRACE("%f %f %f %f\n", world_mat.u.s._11, world_mat.u.s._12, world_mat.u.s._13, world_mat.u.s._14); + TRACE("%f %f %f %f\n", world_mat.u.s._21, world_mat.u.s._22, world_mat.u.s._23, world_mat.u.s._24); + TRACE("%f %f %f %f\n", world_mat.u.s._31, world_mat.u.s._32, world_mat.u.s._33, world_mat.u.s._34); + TRACE("%f %f %f %f\n", world_mat.u.s._41, world_mat.u.s._42, world_mat.u.s._43, world_mat.u.s._44); /* Get the viewport */ IWineD3DDevice_GetViewport( (IWineD3DDevice *) This, &vp);

1 0

Michael Stefaniuc : janitorial: Remove stray '\' at end of lines.
by Alexandre Julliard 09 Jan '07

09 Jan '07

Module: wine Branch: master Commit: 22684cc767825299a151eb9f6cb26a366510a496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22684cc767825299a151eb9f6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 9 00:39:49 2007 +0100 janitorial: Remove stray '\' at end of lines. --- dlls/avifil32/tmpfile.c | 2 +- dlls/dmband/dmutils.c | 2 +- dlls/dmime/dmutils.c | 2 +- dlls/dmloader/debug.c | 2 +- dlls/dmstyle/dmutils.c | 2 +- dlls/dmusic/collection.c | 2 +- dlls/dplayx/dplayx_messages.c | 2 +- dlls/kernel32/cpu.c | 2 +- dlls/msrle32/msrle32.c | 4 ++-- dlls/ntdll/tests/om.c | 2 +- dlls/user32/tests/msg.c | 6 +++--- programs/oleview/oleview.c | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/avifil32/tmpfile.c b/dlls/avifil32/tmpfile.c index 6d6c5d1..2dfcc95 100644 --- a/dlls/avifil32/tmpfile.c +++ b/dlls/avifil32/tmpfile.c @@ -112,7 +112,7 @@ PAVIFILE AVIFILE_CreateAVITempFile(int n { register DWORD tmp; - tmp = MulDiv(AVIStreamSampleToTime(ppStreams[i], sInfo.dwLength), \ + tmp = MulDiv(AVIStreamSampleToTime(ppStreams[i], sInfo.dwLength), tmpFile->fInfo.dwScale, tmpFile->fInfo.dwRate * 1000); if (tmpFile->fInfo.dwLength < tmp) tmpFile->fInfo.dwLength = tmp; diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index 64c9f5d..4c4ca43 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -123,7 +123,7 @@ static const char *debugstr_filetime (LP FileTimeToSystemTime (time, &sysTime); - return wine_dbg_sprintf ("\'%02i. %s %04i %02i:%02i:%02i\'", \ + return wine_dbg_sprintf ("\'%02i. %s %04i %02i:%02i:%02i\'", sysTime.wDay, debugstr_month(sysTime.wMonth), sysTime.wYear, sysTime.wHour, sysTime.wMinute, sysTime.wSecond); } diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c index 84bf8bb..7078b21 100644 --- a/dlls/dmime/dmutils.c +++ b/dlls/dmime/dmutils.c @@ -276,7 +276,7 @@ static const char *debugstr_filetime (LP FileTimeToSystemTime (time, &sysTime); - return wine_dbg_sprintf ("\'%02i. %s %04i %02i:%02i:%02i\'", \ + return wine_dbg_sprintf ("\'%02i. %s %04i %02i:%02i:%02i\'", sysTime.wDay, debugstr_month(sysTime.wMonth), sysTime.wYear, sysTime.wHour, sysTime.wMinute, sysTime.wSecond); } diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c index b71376f..7dba67d 100644 --- a/dlls/dmloader/debug.c +++ b/dlls/dmloader/debug.c @@ -90,7 +90,7 @@ const char *debugstr_filetime (LPFILETIM FileTimeToSystemTime (time, &sysTime); - return wine_dbg_sprintf ("\'%02i. %s %04i %02i:%02i:%02i\'", \ + return wine_dbg_sprintf ("\'%02i. %s %04i %02i:%02i:%02i\'", sysTime.wDay, debugstr_month(sysTime.wMonth), sysTime.wYear, sysTime.wHour, sysTime.wMinute, sysTime.wSecond); } diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c index c732b56..d894015 100644 --- a/dlls/dmstyle/dmutils.c +++ b/dlls/dmstyle/dmutils.c @@ -290,7 +290,7 @@ static const char *debugstr_filetime (LP FileTimeToSystemTime (time, &sysTime); - return wine_dbg_sprintf ("\'%02i. %s %04i %02i:%02i:%02i\'", \ + return wine_dbg_sprintf ("\'%02i. %s %04i %02i:%02i:%02i\'", sysTime.wDay, debugstr_month(sysTime.wMonth), sysTime.wYear, sysTime.wHour, sysTime.wMinute, sysTime.wSecond); } diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 82c1622..e8d52fb 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -715,7 +715,7 @@ static HRESULT WINAPI IDirectMusicCollec if (This->pDesc->dwValidData & DMUS_OBJ_OBJECT) TRACE(" - GUID = %s\n", debugstr_dmguid(&This->pDesc->guidObject)); if (This->pDesc->dwValidData & DMUS_OBJ_VERSION) - TRACE(" - Version = %i,%i,%i,%i\n", (This->pDesc->vVersion.dwVersionMS >> 8) & 0x0000FFFF, This->pDesc->vVersion.dwVersionMS & 0x0000FFFF, \ + TRACE(" - Version = %i,%i,%i,%i\n", (This->pDesc->vVersion.dwVersionMS >> 8) & 0x0000FFFF, This->pDesc->vVersion.dwVersionMS & 0x0000FFFF, (This->pDesc->vVersion.dwVersionLS >> 8) & 0x0000FFFF, This->pDesc->vVersion.dwVersionLS & 0x0000FFFF); if (This->pDesc->dwValidData & DMUS_OBJ_NAME) TRACE(" - Name = %s\n", debugstr_w(This->pDesc->wszName)); diff --git a/dlls/dplayx/dplayx_messages.c b/dlls/dplayx/dplayx_messages.c index 5677b20..b47928b 100644 --- a/dlls/dplayx/dplayx_messages.c +++ b/dlls/dplayx/dplayx_messages.c @@ -437,7 +437,7 @@ void DP_MSG_ReplyReceived( IDirectPlay2A * avoid problems. */ EnterCriticalSection( &This->unk->DP_lock ); - DPQ_REMOVE_ENTRY( This->dp2->replysExpected, replysExpected, replyExpected.wExpectedReply,\ + DPQ_REMOVE_ENTRY( This->dp2->replysExpected, replysExpected, replyExpected.wExpectedReply, ==, wCommandId, lpReplyList ); LeaveCriticalSection( &This->unk->DP_lock ); diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 2d9b13e..9f21132 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -618,7 +618,7 @@ VOID WINAPI GetSystemInfo( cachedsi.wProcessorLevel = 6; break; default: - FIXME("unknown FreeBSD cpu family %d, please report! (-> setting to 386)\n", \ + FIXME("unknown FreeBSD cpu family %d, please report! (-> setting to 386)\n", (regs2[0] >> 8)&0xf); break; } diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index c1e5463..96a0807 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -101,12 +101,12 @@ static BOOL isSupportedMRLE(LPCBITMAPINF /* pre-conditions */ assert(lpbi != NULL); - if (lpbi->biSize < sizeof(BITMAPINFOHEADER) || \ + if (lpbi->biSize < sizeof(BITMAPINFOHEADER) || lpbi->biPlanes != 1) return FALSE; if (lpbi->biCompression == BI_RLE4) { - if (lpbi->biBitCount != 4 || \ + if (lpbi->biBitCount != 4 || (lpbi->biWidth % 2) != 0) return FALSE; } else if (lpbi->biCompression == BI_RLE8) { diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index e2c5f6c..557ee41 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -333,7 +333,7 @@ void test_directory(void) /* Can't use symlinks as a directory */ pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\Local"); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); - status = pNtOpenSymbolicLinkObject(&dir, SYMBOLIC_LINK_QUERY, &attr);\ + status = pNtOpenSymbolicLinkObject(&dir, SYMBOLIC_LINK_QUERY, &attr); ok(status == STATUS_SUCCESS, "Failed to open SymbolicLink(%08x)\n", status); pRtlFreeUnicodeString(&str); InitializeObjectAttributes(&attr, &str, 0, dir, NULL); diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 0933c56..7e63e73 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8231,17 +8231,17 @@ static void test_TrackMouseEvent(void) ok(ret, "TrackMouseEvent(TME_HOVER | TME_CANCEL) error %d\n", GetLastError()) default_hover_time = 0xdeadbeef; - SetLastError(0xdeadbeef); \ + SetLastError(0xdeadbeef); ret = SystemParametersInfo(SPI_GETMOUSEHOVERTIME, 0, &default_hover_time, 0); ok(ret, "SystemParametersInfo(SPI_GETMOUSEHOVERTIME) error %u\n", GetLastError()); if (!ret) default_hover_time = 400; trace("SPI_GETMOUSEHOVERTIME returned %u ms\n", default_hover_time); - SetLastError(0xdeadbeef); \ + SetLastError(0xdeadbeef); ret = SystemParametersInfo(SPI_GETMOUSEHOVERWIDTH, 0, &hover_width, 0); ok(ret, "SystemParametersInfo(SPI_GETMOUSEHOVERWIDTH) error %u\n", GetLastError()); if (!ret) hover_width = 4; - SetLastError(0xdeadbeef); \ + SetLastError(0xdeadbeef); ret = SystemParametersInfo(SPI_GETMOUSEHOVERHEIGHT, 0, &hover_height, 0); ok(ret, "SystemParametersInfo(SPI_GETMOUSEHOVERHEIGHT) error %u\n", GetLastError()); if (!ret) hover_height = 4; diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index 88ce725..b66c5a1 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -380,7 +380,7 @@ int MenuCommand(WPARAM wParam, HWND hWnd memset(&si, 0, sizeof(si)); si.cb = sizeof(si); - CreateProcess(NULL, wszRegEdit, NULL, NULL, FALSE, 0,\ + CreateProcess(NULL, wszRegEdit, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); CloseHandle(pi.hProcess); CloseHandle(pi.hThread);

1 0

Andrew Talbot : dsound: Remove unused function.
by Alexandre Julliard 09 Jan '07

09 Jan '07

Module: wine Branch: master Commit: 6a9d6ef275f5e6053f26f0ad232f16f4e25db77f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a9d6ef275f5e6053f26f0ad2… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Jan 8 20:31:00 2007 +0000 dsound: Remove unused function. --- dlls/dsound/sound3d.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 2560655..6f16686 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -105,15 +105,6 @@ static inline D3DVALUE RadToDeg (D3DVALU return newangle; } -/* conversion between degrees and radians */ -static inline D3DVALUE DegToRad (D3DVALUE angle) -{ - D3DVALUE newangle; - newangle = angle * (2*M_PI/360); - TRACE("%f deg = %f rad\n", angle, newangle); - return newangle; -} - /* angle between vectors - deg version */ static inline D3DVALUE AngleBetweenVectorsDeg (LPD3DVECTOR a, LPD3DVECTOR b) {

1 0

Michael Stefaniuc : include: Remove stray '\' at end of lines.
by Alexandre Julliard 09 Jan '07

09 Jan '07

Module: wine Branch: master Commit: d7fe958511c74bc6c2d982bc9bc7078cd42b428c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7fe958511c74bc6c2d982bc9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 9 00:39:10 2007 +0100 include: Remove stray '\' at end of lines. --- include/commctrl.h | 2 +- include/softpub.h | 38 +++++++++++++++++++------------------- include/wintrust.h | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index c1887be..e77dee2 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -381,7 +381,7 @@ typedef struct tagDRAGLISTINFO #elif defined(_MSC_VER) # define DRAGLISTMSGSTRINGW L"commctrl_DragListMsg" #else -static const WCHAR DRAGLISTMSGSTRINGW[] = { 'c','o','m','m','c','t','r','l', \ +static const WCHAR DRAGLISTMSGSTRINGW[] = { 'c','o','m','m','c','t','r','l', '_','D','r','a','g','L','i','s','t','M','s','g',0 }; #endif #define DRAGLISTMSGSTRING WINELIB_NAME_AW(DRAGLISTMSGSTRING) diff --git a/include/softpub.h b/include/softpub.h index 51b67b6..14bcec7 100644 --- a/include/softpub.h +++ b/include/softpub.h @@ -30,7 +30,7 @@ #elif defined(_MSC_VER) #define SP_GENERIC_CERT_INIT_FUNCTION L"SoftpubDefCertInit" #else -static const WCHAR SP_GENERIC_CERT_INIT_FUNCTION[] = \ +static const WCHAR SP_GENERIC_CERT_INIT_FUNCTION[] = {'S','o','f','t','p','u','b','D','e','f','C','e','r','t','I','n','i','t', 0}; #endif @@ -46,9 +46,9 @@ static const WCHAR SP_GENERIC_CERT_INIT_ #define GENERIC_CHAIN_FINALPOLICY_FUNCTION L"GenericChainFinalProv" #define GENERIC_CHAIN_CERTTRUST_FUNCTION L"GenericChainCertificateTrust" #else -static const WCHAR GENERIC_CHAIN_FINALPOLICY_FUNCTION[] = \ +static const WCHAR GENERIC_CHAIN_FINALPOLICY_FUNCTION[] = {'G','e','n','e','r','i','c','C','h','a','i','n','F','i','n','a','l','P','r','o','v', 0}; -static const WCHAR GENERIC_CHAIN_CERTTRUST_FUNCTION[] = \ +static const WCHAR GENERIC_CHAIN_CERTTRUST_FUNCTION[] = {'G','e','n','e','r','i','c','C','h','a','i','n','C','e','r','t','i','f','i','c','a','t','e','T','r','u','s','t', 0}; #endif @@ -58,7 +58,7 @@ static const WCHAR GENERIC_CHAIN_CERTTRU #elif defined(_MSC_VER) #define SP_POLICY_PROVIDER_DLL_NAME L"WINTRUST.DLL" #else -static const WCHAR SP_POLICY_PROVIDER_DLL_NAME[] = \ +static const WCHAR SP_POLICY_PROVIDER_DLL_NAME[] = {'W','I','N','T','R','U','S','T','.','D','L','L', 0}; #endif @@ -86,17 +86,17 @@ static const WCHAR SP_POLICY_PROVIDER_DL #define SP_FINALPOLICY_FUNCTION L"SoftpubAuthenticode" #define SP_CLEANUPPOLICY_FUNCTION L"SoftpubCleanup" #else -static const WCHAR SP_INIT_FUNCTION[] = \ +static const WCHAR SP_INIT_FUNCTION[] = {'S','o','f','t','p','u','b','I','n','i','t','i','a','l','i','z','e', 0}; -static const WCHAR SP_OBJTRUST_FUNCTION[] = \ +static const WCHAR SP_OBJTRUST_FUNCTION[] = {'S','o','f','t','p','u','b','L','o','a','d','M','e','s','s','a','g','e', 0}; -static const WCHAR SP_SIGTRUST_FUNCTION[] = \ +static const WCHAR SP_SIGTRUST_FUNCTION[] = {'S','o','f','t','p','u','b','L','o','a','d','S','i','g','n','a','t','u','r','e', 0}; -static const WCHAR SP_CHKCERT_FUNCTION[] = \ +static const WCHAR SP_CHKCERT_FUNCTION[] = {'S','o','f','t','p','u','b','C','h','e','c','k','C','e','r','t', 0}; -static const WCHAR SP_FINALPOLICY_FUNCTION[] = \ +static const WCHAR SP_FINALPOLICY_FUNCTION[] = {'S','o','f','t','p','u','b','A','u','t','h','e','n','t','i','c','o','d','e', 0}; -static const WCHAR SP_CLEANUPPOLICY_FUNCTION[] = \ +static const WCHAR SP_CLEANUPPOLICY_FUNCTION[] = {'S','o','f','t','p','u','b','C','l','e','a','n','u','p', 0}; #endif @@ -109,7 +109,7 @@ static const WCHAR SP_CLEANUPPOLICY_FUNC #elif defined(_MSC_VER) #define SP_TESTDUMPPOLICY_FUNCTION_TEST L"SoftpubDumpStructure" #else -static const WCHAR SP_TESTDUMPPOLICY_FUNCTION_TEST[] = \ +static const WCHAR SP_TESTDUMPPOLICY_FUNCTION_TEST[] = {'S','o','f','t','p','u','b','D','u','m','p','S','t','r','u','c','t','u','r','e', 0}; #endif @@ -125,9 +125,9 @@ static const WCHAR SP_TESTDUMPPOLICY_FUN #define HTTPS_FINALPOLICY_FUNCTION L"HTTPSFinalProv" #define HTTPS_CERTTRUST_FUNCTION L"HTTPSCertificateTrust" #else -static const WCHAR HTTPS_CERTTRUST_FUNCTION[] = \ +static const WCHAR HTTPS_CERTTRUST_FUNCTION[] = {'H','T','T','P','S','C','e','r','t','i','f','i','c','a','t','e','T','r','u','s','t', 0}; -static const WCHAR HTTPS_FINALPOLICY_FUNCTION[] = \ +static const WCHAR HTTPS_FINALPOLICY_FUNCTION[] = {'H','T','T','P','S','F','i','n','a','l','P','r','o','v', 0}; #endif @@ -146,11 +146,11 @@ static const WCHAR HTTPS_FINALPOLICY_FUN #define OFFICE_INITPROV_FUNCTION L"OfficeInitializePolicy" #define OFFICE_CLEANUPPOLICY_FUNCTION L"OfficeCleanupPolicy" #else -static const WCHAR OFFICE_POLICY_PROVIDER_DLL_NAME[] = \ +static const WCHAR OFFICE_POLICY_PROVIDER_DLL_NAME[] = {'W','I','N','T','R','U','S','T','.','D','L','L', 0}; -static const WCHAR OFFICE_INITPROV_FUNCTION[] = \ +static const WCHAR OFFICE_INITPROV_FUNCTION[] = {'O','f','f','i','c','e','I','n','i','t','i','a','l','i','z','e','P','o','l','i','c','y', 0}; -static const WCHAR OFFICE_CLEANUPPOLICY_FUNCTION[] = \ +static const WCHAR OFFICE_CLEANUPPOLICY_FUNCTION[] = {'O','f','f','i','c','e','C','l','e','a','n','u','p','P','o','l','i','c','y', 0}; #endif @@ -169,11 +169,11 @@ static const WCHAR OFFICE_CLEANUPPOLICY_ #define DRIVER_FINALPOLPROV_FUNCTION L"DriverFinalPolicy" #define DRIVER_CLEANUPPOLICY_FUNCTION L"DriverCleanupPolicy" #else -static const WCHAR DRIVER_INITPROV_FUNCTION[] = \ +static const WCHAR DRIVER_INITPROV_FUNCTION[] = {'D','r','i','v','e','r','I','n','i','t','i','a','l','i','z','e','P','o','l','i','c','y', 0}; -static const WCHAR DRIVER_FINALPOLPROV_FUNCTION[] = \ +static const WCHAR DRIVER_FINALPOLPROV_FUNCTION[] = {'D','r','i','v','e','r','F','i','n','a','l','P','o','l','i','c','y', 0}; -static const WCHAR DRIVER_CLEANUPPOLICY_FUNCTION[] = \ +static const WCHAR DRIVER_CLEANUPPOLICY_FUNCTION[] = {'D','r','i','v','e','r','C','l','e','a','n','u','p','P','o','l','i','c','y', 0}; #endif diff --git a/include/wintrust.h b/include/wintrust.h index 2c1b409..af2049e 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -355,7 +355,7 @@ extern "C" { #elif defined(_MSC_VER) #define WT_PROVIDER_CERTTRUST_FUNCTION L"WintrustCertificateTrust" #else -static const WCHAR WT_PROVIDER_CERTTRUST_FUNCTION[] = \ +static const WCHAR WT_PROVIDER_CERTTRUST_FUNCTION[] = {'W','i','n','t','r','u','s','t','C','e','r','t','i','f','i','c','a','t','e','T','r','u','s','t', 0}; #endif

1 0

Paul Vriens : ole32/tests: Cast-qual warnings fixes.
by Alexandre Julliard 09 Jan '07

09 Jan '07

Module: wine Branch: master Commit: 32fbfea47ab20e2d6030f58ca9dc92700c0e6190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32fbfea47ab20e2d6030f58ca… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Jan 8 20:59:08 2007 +0100 ole32/tests: Cast-qual warnings fixes. --- dlls/ole32/tests/stg_prop.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/tests/stg_prop.c b/dlls/ole32/tests/stg_prop.c index b25ebd5..06a4b2b 100644 --- a/dlls/ole32/tests/stg_prop.c +++ b/dlls/ole32/tests/stg_prop.c @@ -46,8 +46,8 @@ static void testProps(void) { static const WCHAR szDot[] = { '.',0 }; static const WCHAR szPrefix[] = { 's','t','g',0 }; - static const WCHAR propName[] = { 'p','r','o','p',0 }; - static const char val[] = "l33t auth0r"; + static WCHAR propName[] = { 'p','r','o','p',0 }; + static char val[] = "l33t auth0r"; WCHAR filename[MAX_PATH]; HRESULT hr; IStorage *storage = NULL; @@ -131,7 +131,7 @@ static void testProps(void) spec.ulKind = PRSPEC_PROPID; U(spec).propid = PIDSI_AUTHOR; var.vt = VT_LPSTR; - U(var).pszVal = (LPSTR)val; + U(var).pszVal = val; hr = IPropertyStorage_WriteMultiple(propertyStorage, 1, &spec, &var, 0); ok(hr == S_OK, "WriteMultiple failed: 0x%08x\n", hr); @@ -293,7 +293,7 @@ static void testCodepage(void) static const WCHAR szDot[] = { '.',0 }; static const WCHAR szPrefix[] = { 's','t','g',0 }; static CHAR aval[] = "hi"; - static const WCHAR wval[] = { 'h','i',0 }; + static WCHAR wval[] = { 'h','i',0 }; HRESULT hr; IStorage *storage = NULL; IPropertySetStorage *propSetStorage = NULL; @@ -422,7 +422,7 @@ static void testCodepage(void) * obviously something about string conversion I don't understand. */ if(0) { - static const unsigned char strVal[] = { 0x81, 0xff, 0x04, 0 }; + static unsigned char strVal[] = { 0x81, 0xff, 0x04, 0 }; /* Set code page to 950 (Traditional Chinese) */ U(var).iVal = 950; hr = IPropertyStorage_WriteMultiple(propertyStorage, 1, &spec, &var, 0);

1 0

Andrew Talbot : gdi32: Remove unused function.
by Alexandre Julliard 09 Jan '07

09 Jan '07

Module: wine Branch: master Commit: d4fdeeaa46efdbf3cfaa246dedea96491439b7f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4fdeeaa46efdbf3cfaa246de… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Jan 8 20:17:44 2007 +0000 gdi32: Remove unused function. --- dlls/gdi32/path.c | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index a045d7b..306ed37 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -122,18 +122,7 @@ static inline void INTERNAL_LPTODP_FLOAT dc->xformWorld2Vport.eDy; } -/* Performs a world-to-viewport transformation on the specified width. - */ -static inline void INTERNAL_WSTODS(DC *dc, DWORD *width) -{ - POINT pt[2]; - pt[0].x = pt[0].y = 0; - pt[1].x = *width; - pt[1].y = 0; - LPtoDP(dc->hSelf, pt, 2); - *width = pt[1].x - pt[0].x; -} - + /*********************************************************************** * BeginPath (GDI32.@) */

1 0

Andrew Talbot : gdi32: Declare some functions static.
by Alexandre Julliard 09 Jan '07

09 Jan '07

Module: wine Branch: master Commit: 21ebf42f83b96995093cbd792afdc24fac89f637 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21ebf42f83b96995093cbd792… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Jan 8 20:19:46 2007 +0000 gdi32: Declare some functions static. --- dlls/gdi32/mapping.c | 2 +- dlls/gdi32/printdrv.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 8aeb480..33ba1cb 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); * * Fix viewport extensions for isotropic mode. */ -void MAPPING_FixIsotropic( DC * dc ) +static void MAPPING_FixIsotropic( DC * dc ) { double xdim = fabs((double)dc->vportExtX * GetDeviceCaps( dc->hSelf, HORZSIZE ) / (GetDeviceCaps( dc->hSelf, HORZRES ) * dc->wndExtX)); diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c index f2e1951..caf4e14 100644 --- a/dlls/gdi32/printdrv.c +++ b/dlls/gdi32/printdrv.c @@ -439,7 +439,7 @@ typedef struct PRINTJOB #define MAX_PRINT_JOBS 1 #define SP_OK 1 -PPRINTJOB gPrintJobsTable[MAX_PRINT_JOBS]; +static PPRINTJOB gPrintJobsTable[MAX_PRINT_JOBS]; static PPRINTJOB FindPrintJobFromHandle(HANDLE16 hHandle)

1 0

Andrew Talbot : gdi32: Remove unused variables.
by Alexandre Julliard 09 Jan '07

09 Jan '07

Module: wine Branch: master Commit: 45bd6336c2bd8b4265b292c1c34bdc175cd2a758 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45bd6336c2bd8b4265b292c1c… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Jan 8 20:38:12 2007 +0000 gdi32: Remove unused variables. --- dlls/gdi32/freetype.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b9a46bc..0e5d7e6 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -339,16 +339,10 @@ static struct list font_subst_list = LIS static struct list font_list = LIST_INIT(font_list); -static const WCHAR defSerif[] = {'T','i','m','e','s',' ','N','e','w',' ', - 'R','o','m','a','n','\0'}; +static const WCHAR defSerif[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n','\0'}; static const WCHAR defSans[] = {'M','S',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; static const WCHAR defFixed[] = {'C','o','u','r','i','e','r',' ','N','e','w','\0'}; -static const WCHAR defSystem[] = {'S','y','s','t','e','m','\0'}; -static const WCHAR SystemW[] = {'S','y','s','t','e','m','\0'}; -static const WCHAR MSSansSerifW[] = {'M','S',' ','S','a','n','s',' ', - 'S','e','r','i','f','\0'}; -static const WCHAR HelvW[] = {'H','e','l','v','\0'}; static const WCHAR RegularW[] = {'R','e','g','u','l','a','r','\0'}; static const WCHAR fontsW[] = {'\\','F','o','n','t','s','\0'};

1 0

Andrew Talbot : hhctrl.ocx: Remove unused variable.
by Alexandre Julliard 09 Jan '07

09 Jan '07

Module: wine Branch: master Commit: 10334ed0419ce1f2e70c9c2310c9fcd4bdfab207 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10334ed0419ce1f2e70c9c231… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Jan 8 20:18:46 2007 +0000 hhctrl.ocx: Remove unused variable. --- dlls/hhctrl.ocx/webbrowser.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/hhctrl.ocx/webbrowser.c b/dlls/hhctrl.ocx/webbrowser.c index 3ed1cfe..b1cb1c9 100644 --- a/dlls/hhctrl.ocx/webbrowser.c +++ b/dlls/hhctrl.ocx/webbrowser.c @@ -32,8 +32,6 @@ #define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) -static const SAFEARRAYBOUND ArrayBound = {1, 0}; - typedef struct IOleClientSiteImpl { const IOleClientSiteVtbl *lpVtbl;

1 0

Detlef Riekenberg : localspl/tests: Load the user interface dll on demand.
by Alexandre Julliard 09 Jan '07

09 Jan '07

Module: wine Branch: master Commit: 83aeda3fff3910dbd871a3e566890a1c3ef33051 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83aeda3fff3910dbd871a3e56… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jan 8 17:58:54 2007 +0100 localspl/tests: Load the user interface dll on demand. --- dlls/localspl/tests/localmon.c | 46 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index b99a6a8..edbd582 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -58,11 +58,18 @@ static BOOL (WINAPI *pXcvOpenPort)(LPCW static DWORD (WINAPI *pXcvDataPort)(HANDLE, LPCWSTR, PBYTE, DWORD, PBYTE, DWORD, PDWORD); static BOOL (WINAPI *pXcvClosePort)(HANDLE); +static HMODULE hlocalui; +static PMONITORUI (WINAPI *pInitializePrintMonitorUI)(VOID); +static PMONITORUI pui; +static BOOL (WINAPI *pAddPortUI)(PCWSTR, HWND, PCWSTR, PWSTR *); +static BOOL (WINAPI *pConfigurePortUI)(PCWSTR, HWND, PCWSTR); +static BOOL (WINAPI *pDeletePortUI)(PCWSTR, HWND, PCWSTR); + static WCHAR cmd_MonitorUIW[] = {'M','o','n','i','t','o','r','U','I',0}; static WCHAR cmd_MonitorUI_lcaseW[] = {'m','o','n','i','t','o','r','u','i',0}; static WCHAR does_not_existW[] = {'d','o','e','s','_','n','o','t','_','e','x','i','s','t',0}; static WCHAR emptyW[] = {0}; -static WCHAR Monitors_LocalPortW[] = { \ +static WCHAR Monitors_LocalPortW[] = { 'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\', @@ -481,11 +488,15 @@ static void test_XcvOpenPort(void) START_TEST(localmon) { + DWORD numentries; + /* This DLL does not exists on Win9x */ hdll = LoadLibraryA("localspl.dll"); if (!hdll) return; pInitializePrintMonitor = (void *) GetProcAddress(hdll, "InitializePrintMonitor"); + pInitializePrintMonitorUI = (void *) GetProcAddress(hdll, "InitializePrintMonitorUI"); + if (!pInitializePrintMonitor) { /* The Monitor for "Local Ports" was in a seperate dll before w2k */ hlocalmon = LoadLibraryA("localmon.dll"); @@ -501,7 +512,6 @@ START_TEST(localmon) or InitializePrintMonitor fails. */ pm = pInitializePrintMonitor(Monitors_LocalPortW); if (pm) { - DWORD numentries; numentries = (pm->dwMonitorSize ) / sizeof(VOID *); /* NT4: 14, since w2k: 17 */ ok( numentries == 14 || numentries == 17, @@ -525,6 +535,38 @@ START_TEST(localmon) GET_MONITOR_FUNC(XcvDataPort); GET_MONITOR_FUNC(XcvClosePort); } + + if ((!pInitializePrintMonitorUI) && (pXcvOpenPort) && (pXcvDataPort) && (pXcvClosePort)) { + /* The user interface for "Local Ports" is in a separate dll since w2k */ + BYTE buffer[MAX_PATH]; + DWORD res; + DWORD len; + HANDLE hXcv; + + res = pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); + if (res) { + res = pXcvDataPort(hXcv, cmd_MonitorUIW, NULL, 0, buffer, MAX_PATH, &len); + if (res == ERROR_SUCCESS) hlocalui = LoadLibraryW( (LPWSTR) buffer); + if (hlocalui) pInitializePrintMonitorUI = (void *) GetProcAddress(hlocalui, "InitializePrintMonitorUI"); + pXcvClosePort(hXcv); + } + } + + if (pInitializePrintMonitorUI) { + pui = pInitializePrintMonitorUI(); + if (pui) { + numentries = (pui->dwMonitorUISize - sizeof(DWORD)) / sizeof(VOID *); + ok( numentries == 3, + "dwMonitorUISize (%d) => %d Functions\n", pui->dwMonitorUISize, numentries); + + if (numentries > 2) { + pAddPortUI = pui->pfnAddPortUI; + pConfigurePortUI = pui->pfnConfigurePortUI; + pDeletePortUI = pui->pfnDeletePortUI; + } + } + } + test_InitializePrintMonitor(); test_AddPort();

1 0