October 2006 - Wine-commits

Andrew Talbot : shell32: Another cast-qual warning fix.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: 19e85ca5a9eba72fb1c8d6ee525ec7600296b900 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=19e85ca5a9eba72fb1c8d6e… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sun Oct 1 00:04:02 2006 +0100 shell32: Another cast-qual warning fix. --- dlls/shell32/shlfileop.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index bff1b63..6405b5b 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -133,6 +133,7 @@ BOOL SHELL_ConfirmDialogW(HWND hWnd, int WCHAR szCaption[255], szText[255], szBuffer[MAX_PATH + 256]; SHELL_ConfirmIDstruc ids; MSGBOXPARAMSW params; + DWORD_PTR args[1]; if (!SHELL_ConfirmIDs(nKindOfDialog, &ids)) return FALSE; @@ -140,8 +141,9 @@ BOOL SHELL_ConfirmDialogW(HWND hWnd, int LoadStringW(shell32_hInstance, ids.caption_resource_id, szCaption, sizeof(szCaption)/sizeof(WCHAR)); LoadStringW(shell32_hInstance, ids.text_resource_id, szText, sizeof(szText)/sizeof(WCHAR)); + args[0] = (DWORD_PTR)szDir; FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, - szText, 0, 0, szBuffer, sizeof(szBuffer), (va_list*)&szDir); + szText, 0, 0, szBuffer, sizeof(szBuffer), (va_list*)args); ZeroMemory(&params, sizeof(params)); params.cbSize = sizeof(MSGBOXPARAMSW);

1 0

Karsten Elfenbein : rsaenh/tests: import & export of a plaintext public key + algID check.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: c156c1e496a65261814d609a6366d9ff12146c6d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c156c1e496a65261814d609… Author: Karsten Elfenbein <kelfe(a)gmx.de> Date: Fri Sep 29 20:46:53 2006 +0200 rsaenh/tests: import & export of a plaintext public key + algID check. --- dlls/rsaenh/tests/rsaenh.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 90caeb4..2162562 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1142,6 +1142,42 @@ static void test_rsa_encrypt(void) CryptDestroyKey(hRSAKey); } + +static void test_import_export(void) +{ + DWORD dwLen, dwDataLen; + HCRYPTKEY hPublicKey; + BOOL result; + ALG_ID algID; + BYTE emptyKey[2048]; + static BYTE abPlainPublicKey[84] = { + 0x06, 0x02, 0x00, 0x00, 0x00, 0xa4, 0x00, 0x00, + 0x52, 0x53, 0x41, 0x31, 0x00, 0x02, 0x00, 0x00, + 0x01, 0x00, 0x01, 0x00, 0x11, 0x11, 0x11, 0x11, + 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, + 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, + 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, + 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, + 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, + 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, + 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, + 0x11, 0x11, 0x11, 0x11 + }; + + dwLen=84; + result = CryptImportKey(hProv, abPlainPublicKey, dwLen, 0, 0, &hPublicKey); + ok(result, "failed to import the public key\n"); + + dwDataLen=sizeof(algID); + result = CryptGetKeyParam(hPublicKey, KP_ALGID, (LPBYTE)&algID, &dwDataLen, 0); + ok(result, "failed to get the KP_ALGID from the imported public key\n"); + ok(algID == CALG_RSA_KEYX, "Expected CALG_RSA_KEYX, got %x\n", algID); + + result = CryptExportKey(hPublicKey, 0, PUBLICKEYBLOB, 0, emptyKey, &dwLen); + ok(result, "failed to export the fresh imported public key\n"); + ok(dwLen == 84, "Expected exported key to be 84 bytes long but got %ld bytes.",dwLen); + ok(!memcmp(emptyKey, abPlainPublicKey, dwLen), "exported key is different from the imported key\n"); +} static void test_schannel_provider(void) { @@ -1586,6 +1622,7 @@ START_TEST(rsaenh) test_import_private(); test_verify_signature(); test_rsa_encrypt(); + test_import_export(); test_enum_container(); clean_up_environment(); test_schannel_provider();

1 0

Andrew Talbot : shell32: Cast-qual warnings fix.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: 30806fc00cdbc4974ed449a66b6213e7514d0938 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=30806fc00cdbc4974ed449a… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Sep 29 22:13:48 2006 +0100 shell32: Cast-qual warnings fix. --- dlls/shell32/shellord.c | 6 ++++-- dlls/shell32/shellpath.c | 2 +- dlls/shell32/shfldr_fs.c | 2 +- dlls/shell32/shlexec.c | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 14ffcfd..124d88b 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -348,7 +348,8 @@ int WINAPIV ShellMessageBoxW( ...) { WCHAR szText[100],szTitle[100]; - LPCWSTR pszText = szText, pszTitle = szTitle, pszTemp; + LPCWSTR pszText = szText, pszTitle = szTitle; + LPWSTR pszTemp; va_list args; int ret; @@ -405,7 +406,8 @@ int WINAPIV ShellMessageBoxA( ...) { char szText[100],szTitle[100]; - LPCSTR pszText = szText, pszTitle = szTitle, pszTemp; + LPCSTR pszText = szText, pszTitle = szTitle; + LPSTR pszTemp; va_list args; int ret; diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index ddaedc8..d239a3d 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -600,7 +600,7 @@ int WINAPI PathCleanupSpec( LPCWSTR lpsz else { LPSTR lpszFileA = (LPSTR)lpszFileW; - LPCSTR lpszPathA = (LPSTR)lpszPathW; + LPCSTR lpszPathA = (LPCSTR)lpszPathW; LPSTR p = lpszFileA; TRACE("Cleanup %s\n",debugstr_a(lpszFileA)); diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index dca38c2..8bd6eaf 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -311,7 +311,7 @@ static ULONG WINAPI IShellFolder_fnRelea */ LPITEMIDLIST SHELL32_CreatePidlFromBindCtx(IBindCtx *pbc, LPCWSTR path) { - static const WCHAR szfsbc[] = { + static WCHAR szfsbc[] = { 'F','i','l','e',' ','S','y','s','t','e','m',' ', 'B','i','n','d',' ','D','a','t','a',0 }; IFileSystemBindData *fsbd = NULL; diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 955f323..6ca0b19 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1464,7 +1464,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW retval = execfunc(wszQuotedCmd, env, FALSE, &sei_tmp, sei); HeapFree( GetProcessHeap(), 0, env ); } - else if (PathIsURLW((LPWSTR)lpFile)) /* File not found, check for URL */ + else if (PathIsURLW(lpFile)) /* File not found, check for URL */ { static const WCHAR wShell[] = {'\\','s','h','e','l','l','\\',0}; static const WCHAR wCommand[] = {'\\','c','o','m','m','a','n','d',0};

1 0

Michael Stefaniuc : winedump: Win64 printf format warning fixes.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: ba123abf57e854026c0af3b8115db20fcbf9a23a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ba123abf57e854026c0af3b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 29 21:32:57 2006 +0200 winedump: Win64 printf format warning fixes. --- tools/winedump/Makefile.in | 1 tools/winedump/debug.c | 8 ++- tools/winedump/le.c | 86 +++++++++++++++++---------------- tools/winedump/lnk.c | 38 +++++++-------- tools/winedump/minidump.c | 100 +++++++++++++++++++-------------------- tools/winedump/ne.c | 4 +- tools/winedump/pe.c | 114 ++++++++++++++++++++++---------------------- 7 files changed, 175 insertions(+), 176 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ba123abf57e854026c0…

1 0

Francois Gouget : riched20: Tweak a buffer declaration to fix the compilation with Visual C++.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: 9197f5c3dfbcdf0114d4b795da2be768ceddb35a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9197f5c3dfbcdf0114d4b79… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 29 13:06:22 2006 +0200 riched20: Tweak a buffer declaration to fix the compilation with Visual C++. --- dlls/riched20/tests/editor.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 5e34b92..5dc136e 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -976,8 +976,7 @@ #define MAX_BUF_LEN 1024 static void test_EM_EXLIMITTEXT(void) { int i, selBegin, selEnd, len1, len2; - int BUFSIZE = 1024; - char text[BUFSIZE+1]; + char text[1024 + 1]; int textlimit = 0; /* multiple of 100 */ HWND hwndRichEdit = new_richedit(NULL); @@ -1001,9 +1000,9 @@ static void test_EM_EXLIMITTEXT(void) /* default for WParam = 0 */ ok(65536 == i, "EM_EXLIMITTEXT: expected: %d, actual: %d\n", 65536, i); - textlimit = BUFSIZE; + textlimit = sizeof(text)-1; memset(text, 'W', textlimit); - text[BUFSIZE] = 0; + text[sizeof(text)-1] = 0; SendMessage(hwndRichEdit, EM_EXLIMITTEXT, 0, textlimit); /* maxed out text */ SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text);

1 0

Francois Gouget : d3d9: Tweak a buffer declaration to fix the compilation with Visual C++.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: 2c82c707daf4ad7db4dbdf3d58d9f7834fb0e00a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2c82c707daf4ad7db4dbdf3… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 29 13:06:42 2006 +0200 d3d9: Tweak a buffer declaration to fix the compilation with Visual C++. --- dlls/d3d9/tests/stateblock.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index 65a11e6..5da6d60 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -1303,18 +1303,15 @@ static void test_state_management( 1 for transforms 1 for render states */ - const int max_tests = 2 + 1 + 1 + 1; - const int max_buffer = SHADER_CONSTANTS_REQ_BUFFER * 2 + - LIGHTS_REQ_BUFFER + - TRANSFORMS_REQ_BUFFER + - RENDER_STATES_REQ_BUFFER; + state_test tests[2 + 1 + 1 + 1]; + BYTE buffer[SHADER_CONSTANTS_REQ_BUFFER * 2 + + LIGHTS_REQ_BUFFER + + TRANSFORMS_REQ_BUFFER + + RENDER_STATES_REQ_BUFFER]; unsigned int tcount = 0; unsigned int bcount = 0; - state_test tests[max_tests]; - BYTE buffer[max_buffer]; - hret = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(hret == D3D_OK, "GetDeviceCaps returned %#lx.\n", hret); if (hret != D3D_OK) return;

1 0

Jason Green : user32: Stub implementation of BlockInput.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: 3004cbda2472bbdcb25e65f9212569bd87d44f31 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3004cbda2472bbdcb25e65f… Author: Jason Green <jave27(a)gmail.com> Date: Fri Sep 29 12:59:11 2006 -0400 user32: Stub implementation of BlockInput. --- dlls/user/input.c | 10 ++++++++++ dlls/user/user32.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/user/input.c b/dlls/user/input.c index 24ffed7..54ab246 100644 --- a/dlls/user/input.c +++ b/dlls/user/input.c @@ -669,6 +669,16 @@ HKL WINAPI ActivateKeyboardLayout(HKL hL return USER_Driver->pActivateKeyboardLayout(hLayout, flags); } +/********************************************************************** + * BlockInput (USER32.@) + */ +BOOL WINAPI BlockInput(BOOL fBlockIt) +{ + FIXME_(keyboard)("(%d): stub\n", fBlockIt); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + + return FALSE; +} /*********************************************************************** * GetKeyboardLayoutList (USER32.@) diff --git a/dlls/user/user32.spec b/dlls/user/user32.spec index 817858d..508b6d1 100644 --- a/dlls/user/user32.spec +++ b/dlls/user/user32.spec @@ -12,7 +12,7 @@ # @ stub AllowForegroundActivation @ stdcall AttachThreadInput(long long long) @ stdcall BeginDeferWindowPos(long) @ stdcall BeginPaint(long ptr) -# @ stub BlockInput +@ stdcall BlockInput(long) @ stdcall BringWindowToTop(long) @ stdcall BroadcastSystemMessage(long ptr long long long) BroadcastSystemMessageA @ stdcall BroadcastSystemMessageA(long ptr long long long)

1 0

Michael Stefaniuc : server: Win64 printf format warning fixes.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: 5664b8eeeff320fd3bef071d11cf1e66b94cffb6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5664b8eeeff320fd3bef071… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 29 21:32:32 2006 +0200 server: Win64 printf format warning fixes. --- server/Makefile.in | 2 +- server/registry.c | 2 +- server/trace.c | 50 +++++++++++++++++++++++++------------------------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/server/Makefile.in b/server/Makefile.in index 4a9bc02..f62bd1d 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -1,4 +1,4 @@ -DEFS = -D__WINESRC__ -DWINE_NO_LONG_AS_INT +DEFS = -D__WINESRC__ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = .. SRCDIR = @srcdir@ diff --git a/server/registry.c b/server/registry.c index b53720c..93d69de 100644 --- a/server/registry.c +++ b/server/registry.c @@ -210,7 +210,7 @@ static void dump_value( const struct key { DWORD dw; memcpy( &dw, value->data, sizeof(DWORD) ); - fprintf( f, "dword:%08lx", dw ); + fprintf( f, "dword:%08x", dw ); break; } /* else fall through */ diff --git a/server/trace.c b/server/trace.c index db93e82..7f0538b 100644 --- a/server/trace.c +++ b/server/trace.c @@ -99,9 +99,9 @@ static void dump_char_info( const char_i static void dump_context( const CONTEXT *context ) { #ifdef __i386__ - fprintf( stderr, "{flags=%08lx,eax=%08lx,ebx=%08lx,ecx=%08lx,edx=%08lx,esi=%08lx,edi=%08lx," - "ebp=%08lx,eip=%08lx,esp=%08lx,eflags=%08lx,cs=%04lx,ds=%04lx,es=%04lx," - "fs=%04lx,gs=%04lx,dr0=%08lx,dr1=%08lx,dr2=%08lx,dr3=%08lx,dr6=%08lx,dr7=%08lx,", + fprintf( stderr, "{flags=%08x,eax=%08x,ebx=%08x,ecx=%08x,edx=%08x,esi=%08x,edi=%08x," + "ebp=%08x,eip=%08x,esp=%08x,eflags=%08x,cs=%04x,ds=%04x,es=%04x," + "fs=%04x,gs=%04x,dr0=%08x,dr1=%08x,dr2=%08x,dr3=%08x,dr6=%08x,dr7=%08x,", context->ContextFlags, context->Eax, context->Ebx, context->Ecx, context->Edx, context->Esi, context->Edi, context->Ebp, context->Eip, context->Esp, context->EFlags, context->SegCs, context->SegDs, context->SegEs, context->SegFs, context->SegGs, @@ -117,7 +117,7 @@ #endif static void dump_exc_record( const EXCEPTION_RECORD *rec ) { unsigned int i; - fprintf( stderr, "{code=%lx,flags=%lx,rec=%p,addr=%p,params={", + fprintf( stderr, "{code=%x,flags=%x,rec=%p,addr=%p,params={", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionRecord, rec->ExceptionAddress ); for (i = 0; i < min(rec->NumberParameters,EXCEPTION_MAXIMUM_PARAMETERS); i++) @@ -319,25 +319,25 @@ static void dump_varargs_startup_info( d memset( &params, 0, sizeof(params) ); memcpy( &params, ptr, min( size, sizeof(params) )); - fprintf( stderr, "{AllocationSize=%lx,", params.AllocationSize ); - fprintf( stderr, "Size=%lx,", params.Size ); - fprintf( stderr, "Flags=%lx,", params.Flags ); - fprintf( stderr, "DebugFlags=%lx,", params.DebugFlags ); + fprintf( stderr, "{AllocationSize=%x,", params.AllocationSize ); + fprintf( stderr, "Size=%x,", params.Size ); + fprintf( stderr, "Flags=%x,", params.Flags ); + fprintf( stderr, "DebugFlags=%x,", params.DebugFlags ); fprintf( stderr, "ConsoleHandle=%p,", params.ConsoleHandle ); - fprintf( stderr, "ConsoleFlags=%lx,", params.ConsoleFlags ); + fprintf( stderr, "ConsoleFlags=%x,", params.ConsoleFlags ); fprintf( stderr, "hStdInput=%p,", params.hStdInput ); fprintf( stderr, "hStdOutput=%p,", params.hStdOutput ); fprintf( stderr, "hStdError=%p,", params.hStdError ); fprintf( stderr, "CurrentDirectory.Handle=%p,", params.CurrentDirectory.Handle ); - fprintf( stderr, "dwX=%ld,", params.dwX ); - fprintf( stderr, "dwY=%ld,", params.dwY ); - fprintf( stderr, "dwXSize=%ld,", params.dwXSize ); - fprintf( stderr, "dwYSize=%ld,", params.dwYSize ); - fprintf( stderr, "dwXCountChars=%ld,", params.dwXCountChars ); - fprintf( stderr, "dwYCountChars=%ld,", params.dwYCountChars ); - fprintf( stderr, "dwFillAttribute=%lx,", params.dwFillAttribute ); - fprintf( stderr, "dwFlags=%lx,", params.dwFlags ); - fprintf( stderr, "wShowWindow=%lx,", params.wShowWindow ); + fprintf( stderr, "dwX=%d,", params.dwX ); + fprintf( stderr, "dwY=%d,", params.dwY ); + fprintf( stderr, "dwXSize=%d,", params.dwXSize ); + fprintf( stderr, "dwYSize=%d,", params.dwYSize ); + fprintf( stderr, "dwXCountChars=%d,", params.dwXCountChars ); + fprintf( stderr, "dwYCountChars=%d,", params.dwYCountChars ); + fprintf( stderr, "dwFillAttribute=%x,", params.dwFillAttribute ); + fprintf( stderr, "dwFlags=%x,", params.dwFlags ); + fprintf( stderr, "wShowWindow=%x,", params.wShowWindow ); fprintf( stderr, "CurrentDirectory.DosPath=L\"" ); dump_inline_unicode_string( &params.CurrentDirectory.DosPath, cur_data, size ); fprintf( stderr, "\",DllPath=L\"" ); @@ -414,7 +414,7 @@ static void dump_varargs_LUID_AND_ATTRIB fputc( '{', stderr ); while (len > 0) { - fprintf( stderr, "{luid=%08lx%08lx,attr=%lx}", + fprintf( stderr, "{luid=%08x%08x,attr=%x}", lat->Luid.HighPart, lat->Luid.LowPart, lat->Attributes ); lat++; if (--len) fputc( ',', stderr ); @@ -436,13 +436,13 @@ static void dump_inline_sid( const SID * } fputc( '{', stderr ); - fprintf( stderr, "S-%u-%lu", sid->Revision, MAKELONG( + fprintf( stderr, "S-%u-%u", sid->Revision, MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5], sid->IdentifierAuthority.Value[4] ), MAKEWORD( sid->IdentifierAuthority.Value[3], sid->IdentifierAuthority.Value[2] ) ) ); for (i = 0; i < sid->SubAuthorityCount; i++) - fprintf( stderr, "-%lu", sid->SubAuthority[i] ); + fprintf( stderr, "-%u", sid->SubAuthority[i] ); fputc( '}', stderr ); } @@ -485,25 +485,25 @@ static void dump_inline_acl( const ACL * case ACCESS_DENIED_ACE_TYPE: sid = (const SID *)&((const ACCESS_DENIED_ACE *)ace)->SidStart; sid_size = ace->AceSize - FIELD_OFFSET(ACCESS_DENIED_ACE, SidStart); - fprintf( stderr, "ACCESS_DENIED_ACE_TYPE,Mask=%lx", + fprintf( stderr, "ACCESS_DENIED_ACE_TYPE,Mask=%x", ((const ACCESS_DENIED_ACE *)ace)->Mask ); break; case ACCESS_ALLOWED_ACE_TYPE: sid = (const SID *)&((const ACCESS_ALLOWED_ACE *)ace)->SidStart; sid_size = ace->AceSize - FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart); - fprintf( stderr, "ACCESS_ALLOWED_ACE_TYPE,Mask=%lx", + fprintf( stderr, "ACCESS_ALLOWED_ACE_TYPE,Mask=%x", ((const ACCESS_ALLOWED_ACE *)ace)->Mask ); break; case SYSTEM_AUDIT_ACE_TYPE: sid = (const SID *)&((const SYSTEM_AUDIT_ACE *)ace)->SidStart; sid_size = ace->AceSize - FIELD_OFFSET(SYSTEM_AUDIT_ACE, SidStart); - fprintf( stderr, "SYSTEM_AUDIT_ACE_TYPE,Mask=%lx", + fprintf( stderr, "SYSTEM_AUDIT_ACE_TYPE,Mask=%x", ((const SYSTEM_AUDIT_ACE *)ace)->Mask ); break; case SYSTEM_ALARM_ACE_TYPE: sid = (const SID *)&((const SYSTEM_ALARM_ACE *)ace)->SidStart; sid_size = ace->AceSize - FIELD_OFFSET(SYSTEM_ALARM_ACE, SidStart); - fprintf( stderr, "SYSTEM_ALARM_ACE_TYPE,Mask=%lx", + fprintf( stderr, "SYSTEM_ALARM_ACE_TYPE,Mask=%x", ((const SYSTEM_ALARM_ACE *)ace)->Mask ); break; default:

1 0

Michael Stefaniuc : wrc: Win64 printf format warning fixes.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: d2d330174f542058ce155f1737030508aca72b58 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d2d330174f542058ce155f1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 29 21:32:48 2006 +0200 wrc: Win64 printf format warning fixes. --- tools/wrc/Makefile.in | 1 - tools/wrc/dumpres.c | 30 +++++++++++++++--------------- tools/wrc/newstruc.c | 10 +++++----- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index 5b30f48..e0efa18 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -4,7 +4,6 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ EXEEXT = @EXEEXT@ -DEFS = -DWINE_NO_LONG_AS_INT PROGRAMS = wrc$(EXEEXT) MANPAGES = wrc.man diff --git a/tools/wrc/dumpres.c b/tools/wrc/dumpres.c index afc757d..fdaecb0 100644 --- a/tools/wrc/dumpres.c +++ b/tools/wrc/dumpres.c @@ -203,12 +203,12 @@ static void dump_lvc(const lvc_t *l) printf("LANGUAGE <not set>\n"); if(l->version) - printf("VERSION %08lx\n", *(l->version)); + printf("VERSION %08x\n", *(l->version)); else printf("VERSION <not set>\n"); if(l->characts) - printf("CHARACTERISTICS %08lx\n", *(l->characts)); + printf("CHARACTERISTICS %08x\n", *(l->characts)); else printf("CHARACTERISTICS <not set>\n"); } @@ -537,16 +537,16 @@ static void dump_control(const control_t { assert(ctrl->style != NULL); assert(ctrl->style->and_mask == 0); - printf("\tStyle: %08lx\n", ctrl->style->or_mask); + printf("\tStyle: %08x\n", ctrl->style->or_mask); } if(ctrl->gotexstyle) { assert(ctrl->exstyle != NULL); assert(ctrl->exstyle->and_mask == 0); - printf("\tExStyle: %08lx\n", ctrl->exstyle->or_mask); + printf("\tExStyle: %08x\n", ctrl->exstyle->or_mask); } if(ctrl->gothelpid) - printf("\tHelpid: %ld\n", ctrl->helpid); + printf("\tHelpid: %d\n", ctrl->helpid); if(ctrl->extra) { printf("\t"); @@ -577,14 +577,14 @@ static void dump_dialog(const dialog_t * { assert(dlg->style != NULL); assert(dlg->style->and_mask == 0); - printf("Style: %08lx\n", dlg->style->or_mask); + printf("Style: %08x\n", dlg->style->or_mask); } if(dlg->gotexstyle) { assert(dlg->exstyle != NULL); assert(dlg->exstyle->and_mask == 0); - printf("ExStyle: %08lx\n", dlg->exstyle->or_mask); + printf("ExStyle: %08x\n", dlg->exstyle->or_mask); } printf("Menu: %s\n", get_nameid_str(dlg->menu)); printf("Class: %s\n", get_nameid_str(dlg->dlgclass)); @@ -627,16 +627,16 @@ static void dump_dialogex(const dialogex { assert(dlgex->style != NULL); assert(dlgex->style->and_mask == 0); - printf("Style: %08lx\n", dlgex->style->or_mask); + printf("Style: %08x\n", dlgex->style->or_mask); } if(dlgex->gotexstyle) { assert(dlgex->exstyle != NULL); assert(dlgex->exstyle->and_mask == 0); - printf("ExStyle: %08lx\n", dlgex->exstyle->or_mask); + printf("ExStyle: %08x\n", dlgex->exstyle->or_mask); } if(dlgex->gothelpid) - printf("Helpid: %ld\n", dlgex->helpid); + printf("Helpid: %d\n", dlgex->helpid); printf("Menu: %s\n", get_nameid_str(dlgex->menu)); printf("Class: %s\n", get_nameid_str(dlgex->dlgclass)); printf("Title: "); print_string(dlgex->title); printf("\n"); @@ -683,7 +683,7 @@ static void dump_menu_item(const menu_it if(item->name) { print_string(item->name); - printf(", %d, %08lx", item->id, item->state); + printf(", %d, %08x", item->id, item->state); } else printf("SEPARATOR"); @@ -732,9 +732,9 @@ static void dump_menuex_item(const menue if(item->gotid) printf(", Id=%d", item->id); if(item->gottype) - printf(", Type=%ld", item->type); + printf(", Type=%d", item->type); if(item->gotstate) - printf(", State=%08lx", item->state); + printf(", State=%08x", item->state); if(item->gothelpid) printf(", HelpId=%d", item->helpid); printf("\n"); @@ -749,9 +749,9 @@ static void dump_menuex_item(const menue if(item->gotid) printf(", Id=%d", item->id); if(item->gottype) - printf(", Type=%ld", item->type); + printf(", Type=%d", item->type); if(item->gotstate) - printf(", State=%08lx", item->state); + printf(", State=%08x", item->state); if(item->gothelpid) printf(", HelpId=%d", item->helpid); } diff --git a/tools/wrc/newstruc.c b/tools/wrc/newstruc.c index 4df8c9d..9c215e4 100644 --- a/tools/wrc/newstruc.c +++ b/tools/wrc/newstruc.c @@ -327,7 +327,7 @@ #endif type |= FL_SIZEBE | FL_OS2; } else - parser_error("Invalid bitmap format, bih->biSize = %ld", bih->biSize); + parser_error("Invalid bitmap format, bih->biSize = %d", bih->biSize); switch(type) { @@ -1043,7 +1043,7 @@ #endif for(id = mbp[i].idlo; id <= mbp[i].idhi; id++) { if(MSGTAB_BAD_PTR(mep, rd->data, rd->size, mep->length)) - parser_error("Messagetable's data for block %d, ID 0x%08lx is outside of defined data", (int)i, id); + parser_error("Messagetable's data for block %d, ID 0x%08x is outside of defined data", i, id); if(mep->flags == 1) /* Docu says 'flags == 0x0001' for unicode */ { WORD *wp = (WORD *)&mep[1]; @@ -1051,7 +1051,7 @@ #endif int n; if(mep->length & 1) - parser_error("Message 0x%08lx is unicode (block %d), but has odd length (%d)", id, (int)i, mep->length); + parser_error("Message 0x%08x is unicode (block %d), but has odd length (%d)", id, i, mep->length); for(n = 0; n < l; n++) wp[n] = BYTESWAP_WORD(wp[n]); @@ -1096,7 +1096,7 @@ #endif mep->flags = BYTESWAP_WORD(mep->flags); if(MSGTAB_BAD_PTR(mep, rd->data, rd->size, mep->length)) - parser_error("Messagetable's data for block %d, ID 0x%08lx is outside of defined data", (int)i, id); + parser_error("Messagetable's data for block %d, ID 0x%08x is outside of defined data", i, id); if(mep->flags == 1) /* Docu says 'flags == 0x0001' for unicode */ { WORD *wp = (WORD *)&mep[1]; @@ -1104,7 +1104,7 @@ #endif int n; if(mep->length & 1) - parser_error("Message 0x%08lx is unicode (block %d), but has odd length (%d)", id, (int)i, mep->length); + parser_error("Message 0x%08x is unicode (block %d), but has odd length (%d)", id, i, mep->length); for(n = 0; n < l; n++) wp[n] = BYTESWAP_WORD(wp[n]);

1 0

Francois Gouget : rpcrt4: Don't return void values. This fixes Visual C++ warnings.
by Alexandre Julliard 02 Oct '06

02 Oct '06

Module: wine Branch: master Commit: 1011bc47bfd62dc11550c4d030cb330a321df2e2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1011bc47bfd62dc11550c4d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 29 13:05:24 2006 +0200 rpcrt4: Don't return void values. This fixes Visual C++ warnings. --- dlls/rpcrt4/tests/cstub.c | 2 +- dlls/rpcrt4/tests/ndr_marshall.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 1438caa..3a4c7b4 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -56,7 +56,7 @@ static void * CALLBACK my_alloc(size_t s static void CALLBACK my_free(void *ptr) { my_free_called++; - return NdrOleFree(ptr); + NdrOleFree(ptr); } typedef struct _MIDL_PROC_FORMAT_STRING diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 3d1a5d0..67ac531 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -42,7 +42,7 @@ void * CALLBACK my_alloc(size_t size) void CALLBACK my_free(void *ptr) { my_free_called++; - return NdrOleFree(ptr); + NdrOleFree(ptr); } static const MIDL_STUB_DESC Object_StubDesc =

1 0