February 2007 - Wine-Commits

tools/winetest dissect
by Jeremy Newman Feb. 27, 2007

Feb. 27, 2007

ChangeSet ID: 30937 CVSROOT: /opt/cvs-commit Module name: tools Changes by: jnewman(a)winehq.org 2007/02/27 10:35:27 Modified files: winetest : dissect Log message: Paul Vriens <paul.vriens.wine(a)gmail.com> Cater for the new skip method Patch: http://cvs.winehq.org/patch.py?id=30937 Old revision New revision Changes Path 1.18 1.19 +4 -0 tools/winetest/dissect Index: tools/winetest/dissect diff -u -p tools/winetest/dissect:1.18 tools/winetest/dissect:1.19 --- tools/winetest/dissect:1.18 27 Feb 2007 16:35:27 -0000 +++ tools/winetest/dissect 27 Feb 2007 16:35:27 -0000 @@ -158,6 +158,10 @@ while (<IN>) { } elsif (s/^($test: (\d+) tests executed, (\d+) marked as todo, (\d+) failures?\.)\r?$/$1/) { <IN>; # current test finished $result = "$2 $3 $4"; + goto FINISH; + } elsif (s/^($test: (\d+) tests executed $(\d+) marked as todo, (\d+) failures$, (\d+) skipped?\.)\r?$/$1/) { + <IN>; # current test finished + $result = "$2 $3 $4"; FINISH: print SUM "- $unit $test $result $source $rev\n"; print OUT;

1 0

Peter Oberndorfer : ntdll: Extend debugger tests.
by Alexandre Julliard Feb. 27, 2007

Feb. 27, 2007

Module: wine Branch: master Commit: ce6f221db8d17f6a1ca6a8a49629a36c05345bc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce6f221db8d17f6a1ca6a8a49… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Mon Feb 26 23:42:12 2007 +0100 ntdll: Extend debugger tests. Shows that second chance handler gets the same modified context as the exception handlers. --- dlls/ntdll/tests/exception.c | 77 +++++++++++++++++++++++++++++++++++++----- 1 files changed, 68 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 347acab..08ec9c6 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -38,6 +38,7 @@ #ifdef __i386__ static int my_argc; static char** my_argv; +static int test_stage; static struct _TEB * (WINAPI *pNtCurrentTeb)(void); static NTSTATUS (WINAPI *pNtGetContextThread)(HANDLE,CONTEXT*); @@ -261,6 +262,11 @@ static DWORD rtlraiseexception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR ok(context->Eax == 0xf00f00f0, "Eax is %x, should have been set to 0xf00f00f0 in vectored handler\n", context->Eax); + /* give the debugger a chance to examine the state a second time */ + /* without the exception handler changing Eip */ + if (test_stage == 2) + return ExceptionContinueSearch; + /* Eip in context is decreased by 1 * Increase it again, else execution will continue in the middle of a instruction */ if(rec->ExceptionCode == EXCEPTION_BREAKPOINT && (context->Eip == (DWORD)code_mem + 0xa)) @@ -621,11 +627,15 @@ static void test_debugger(void) else if (de.dwDebugEventCode == EXCEPTION_DEBUG_EVENT) { CONTEXT ctx; + int stage; counter++; status = pNtReadVirtualMemory(pi.hProcess, &code_mem, &code_mem_address, sizeof(code_mem_address), &size_read); ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status); + status = pNtReadVirtualMemory(pi.hProcess, &test_stage, &stage, + sizeof(stage), &size_read); + ok(!status,"NtReadVirtualMemory failed with 0x%x\n", status); ctx.ContextFlags = CONTEXT_FULL; status = pNtGetContextThread(pi.hThread, &ctx); @@ -642,17 +652,61 @@ static void test_debugger(void) } else if (counter >= 2) /* skip startup breakpoint */ { - ok((char *)ctx.Eip == (char *)code_mem_address + 0xb, "Eip at %x instead of %p\n", - ctx.Eip, (char *)code_mem_address + 0xb); - /* setting the context from debugger does not affect the context, the exception handlers gets */ - /* uncomment once wine is fixed */ - /* ctx.Eip = 0x12345; */ - ctx.Eax = 0xf00f00f1; + if (stage == 1) + { + ok((char *)ctx.Eip == (char *)code_mem_address + 0xb, "Eip at %x instead of %p\n", + ctx.Eip, (char *)code_mem_address + 0xb); + /* setting the context from debugger does not affect the context, the exception handlers gets */ + /* uncomment once wine is fixed */ + /* ctx.Eip = 0x12345; */ + ctx.Eax = 0xf00f00f1; + + /* let the debuggee handle the exception */ + continuestatus = DBG_EXCEPTION_NOT_HANDLED; + } + else if (stage == 2) + { + if (de.u.Exception.dwFirstChance) + { + /* debugger gets first chance exception with unmodified ctx.Eip */ + ok((char *)ctx.Eip == (char *)code_mem_address + 0xb, "Eip at 0x%x instead of %p\n", + ctx.Eip, (char *)code_mem_address + 0xb); + + /* setting the context from debugger does not affect the context, the exception handlers gets */ + /* uncomment once wine is fixed */ + /* ctx.Eip = 0x12345; */ + ctx.Eax = 0xf00f00f1; + + /* pass exception to debuggee + * exception will not be handled and + * a second chance exception will be raised */ + continuestatus = DBG_EXCEPTION_NOT_HANDLED; + } + else + { + /* debugger gets context after exception handler has played with it */ + /* ctx.Eip is the same value the exception handler got */ + if (de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT) + { + todo_wine{ + ok((char *)ctx.Eip == (char *)code_mem_address + 0xa, "Eip at 0x%x instead of %p\n", + ctx.Eip, (char *)code_mem_address + 0xa); + } + /* need to fixup Eip for debuggee */ + if ((char *)ctx.Eip == (char *)code_mem_address + 0xa) + ctx.Eip += 1; + } + else + ok((char *)ctx.Eip == (char *)code_mem_address + 0xb, "Eip at 0x%x instead of %p\n", + ctx.Eip, (char *)code_mem_address + 0xb); + /* here we handle exception */ + } + } + else + ok(FALSE, "unexpected stage %d\n", stage); + status = pNtSetContextThread(pi.hThread, &ctx); ok(!status, "NtSetContextThread failed with 0x%x\n", status); - - if (de.u.Exception.dwFirstChance) - continuestatus = DBG_EXCEPTION_NOT_HANDLED; } } @@ -711,6 +765,11 @@ START_TEST(exception) if (pRtlRaiseException) { + test_stage = 1; + run_rtlraiseexception_test(0x12345); + run_rtlraiseexception_test(EXCEPTION_BREAKPOINT); + run_rtlraiseexception_test(EXCEPTION_INVALID_HANDLE); + test_stage = 2; run_rtlraiseexception_test(0x12345); run_rtlraiseexception_test(EXCEPTION_BREAKPOINT); run_rtlraiseexception_test(EXCEPTION_INVALID_HANDLE);

1 0

Peter Oberndorfer : ntdll/tests: Add a debugger around the exceptions.
by Alexandre Julliard Feb. 27, 2007

Feb. 27, 2007

Module: wine Branch: master Commit: 647d0d9b88eec546202d2bf3476999a29679e0ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=647d0d9b88eec546202d2bf34… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Mon Feb 26 23:42:09 2007 +0100 ntdll/tests: Add a debugger around the exceptions. Shows that the first chance handler gets a unmodified context. Shows that changing the context has no effect when exception is not handled by debugger. --- dlls/ntdll/tests/exception.c | 175 +++++++++++++++++++++++++++++++++++++----- 1 files changed, 154 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=647d0d9b88eec546202d2…

1 0

Aric Stewart : kernel32: Allow for non base-10 int values in ini file.
by Alexandre Julliard Feb. 27, 2007

Feb. 27, 2007

Module: wine Branch: master Commit: 00eca70b2ad69abd97f75bd055e837cf1be9a6de URL: http://source.winehq.org/git/wine.git/?a=commit;h=00eca70b2ad69abd97f75bd05… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Feb 27 18:15:17 2007 +0900 kernel32: Allow for non base-10 int values in ini file. --- dlls/kernel32/profile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 339b852..b48f5e9 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1288,7 +1288,7 @@ UINT WINAPI GetPrivateProfileIntW( LPCWSTR section, LPCWSTR entry, if (!buffer[0]) return (UINT)def_val; RtlInitUnicodeString( &bufferW, buffer ); - RtlUnicodeStringToInteger( &bufferW, 10, &result); + RtlUnicodeStringToInteger( &bufferW, 0, &result); return result; }

1 0

Jason Edmeades : cmd.exe: Make 'set t' show all vars starting with 't'.
by Alexandre Julliard Feb. 27, 2007

Feb. 27, 2007

Module: wine Branch: master Commit: 1c632cd0fb403d012145d23ae7357d23c0541fb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c632cd0fb403d012145d23ae… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Mon Feb 26 23:06:11 2007 +0000 cmd.exe: Make 'set t' show all vars starting with 't'. --- programs/cmd/builtins.c | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 4f73fd0..a1d1154 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -939,12 +939,16 @@ static int WCMD_compare( const void *a, const void *b ) * WCMD_setshow_sortenv * * sort variables into order for display + * Optionally only display those who start with a stub + * returns the count displayed */ -static void WCMD_setshow_sortenv(const char *s) +static int WCMD_setshow_sortenv(const char *s, const char *stub) { - UINT count=0, len=0, i; + UINT count=0, len=0, i, displayedcount=0, stublen=0; const char **str; + if (stub) stublen = strlen(stub); + /* count the number of strings, and the total length */ while ( s[len] ) { len += (lstrlen(&s[len]) + 1); @@ -954,7 +958,7 @@ static void WCMD_setshow_sortenv(const char *s) /* add the strings to an array */ str = LocalAlloc (LMEM_FIXED | LMEM_ZEROINIT, count * sizeof (char*) ); if( !str ) - return; + return 0; str[0] = s; for( i=1; i<count; i++ ) str[i] = str[i-1] + lstrlen(str[i-1]) + 1; @@ -964,11 +968,17 @@ static void WCMD_setshow_sortenv(const char *s) /* print it */ for( i=0; i<count; i++ ) { + if (!stub || CompareString (LOCALE_USER_DEFAULT, + NORM_IGNORECASE | SORT_STRINGSORT, + str[i], stublen, stub, -1) == 2) { WCMD_output_asis(str[i]); WCMD_output_asis("\n"); + displayedcount++; + } } LocalFree( str ); + return displayedcount; } /**************************************************************************** @@ -982,27 +992,16 @@ void WCMD_setshow_env (char *s) { LPVOID env; char *p; int status; -char buffer[1048]; if (strlen(param1) == 0) { env = GetEnvironmentStrings (); - WCMD_setshow_sortenv( env ); + WCMD_setshow_sortenv( env, NULL ); } else { p = strchr (s, '='); if (p == NULL) { - - /* FIXME: Emulate Win98 for now, ie "SET C" looks ONLY for an - environment variable C, whereas on NT it shows ALL variables - starting with C. - */ - status = GetEnvironmentVariable(s, buffer, sizeof(buffer)); - if (status) { - WCMD_output_asis( s); - WCMD_output_asis( "="); - WCMD_output_asis( buffer); - WCMD_output_asis( "\n"); - } else { + env = GetEnvironmentStrings (); + if (WCMD_setshow_sortenv( env, s ) == 0) { WCMD_output ("Environment variable %s not defined\n", s); } return; @@ -1013,7 +1012,6 @@ char buffer[1048]; status = SetEnvironmentVariable (s, p); if ((!status) & (GetLastError() != ERROR_ENVVAR_NOT_FOUND)) WCMD_print_error(); } - /* WCMD_output (newline); @JED*/ } /****************************************************************************

1 0

Jason Edmeades : cmd.exe: Add rd /s support.
by Alexandre Julliard Feb. 27, 2007

Feb. 27, 2007

Module: wine Branch: master Commit: 69194ce0d786349d17286d333f7d3252ec0584e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69194ce0d786349d17286d333… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Mon Feb 26 23:04:40 2007 +0000 cmd.exe: Add rd /s support. --- programs/cmd/builtins.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 9a8b513..4f73fd0 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -35,6 +35,7 @@ #define WIN32_LEAN_AND_MEAN #include "wcmd.h" +#include <shellapi.h> void WCMD_execute (char *orig_command, char *parameter, char *substitution); @@ -633,7 +634,24 @@ void WCMD_remove_dir (void) { WCMD_output ("Argument missing\n"); return; } - if (!RemoveDirectory (param1)) WCMD_print_error (); + + /* If subdirectory search not supplied, just try to remove + and report error if it fails (eg if it contains a file) */ + if (strstr (quals, "/S") == NULL) { + if (!RemoveDirectory (param1)) WCMD_print_error (); + + /* Otherwise use ShFileOp to recursively remove a directory */ + } else { + + /* Do the delete */ + SHFILEOPSTRUCT lpDir; + lpDir.hwnd = NULL; + lpDir.pTo = NULL; + lpDir.pFrom = param1; + lpDir.fFlags = FOF_SILENT | FOF_NOCONFIRMATION | FOF_NOERRORUI; + lpDir.wFunc = FO_DELETE; + if (SHFileOperationA(&lpDir)) WCMD_print_error (); + } } /****************************************************************************

1 0

Jason Edmeades : cmd.exe: Locate programs more correctly.
by Alexandre Julliard Feb. 27, 2007

Feb. 27, 2007

Module: wine Branch: master Commit: 3232e61b9457d2003cfd76df614bf04c38a9bde5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3232e61b9457d2003cfd76df6… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Mon Feb 26 23:04:16 2007 +0000 cmd.exe: Locate programs more correctly. --- programs/cmd/wcmdmain.c | 263 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 182 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3232e61b9457d2003cfd7…

1 0

Jason Edmeades : cmd.exe: Allow special named env vars to be modified.
by Alexandre Julliard Feb. 27, 2007

Feb. 27, 2007

Module: wine Branch: master Commit: 54ba046ad50a8d3aa230e4c8ada23bca91fc0bef URL: http://source.winehq.org/git/wine.git/?a=commit;h=54ba046ad50a8d3aa230e4c8a… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Mon Feb 26 23:03:34 2007 +0000 cmd.exe: Allow special named env vars to be modified. --- programs/cmd/wcmdmain.c | 117 +++++++++++++++++++++------------------------- 1 files changed, 53 insertions(+), 64 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index b7845c7..b753291 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -304,7 +304,6 @@ int main (int argc, char *argv[]) void WCMD_process_command (char *command) { char *cmd, *p, *s, *t; - char temp[MAXSTRING]; int status, i; DWORD count, creationDisposition; HANDLE h; @@ -322,12 +321,8 @@ void WCMD_process_command (char *command) /* Additionally: */ /* Expand the DATE, TIME, CD, RANDOM and ERRORLEVEL special */ /* names allowing environment variable overrides */ - - /* FIXME: Winnt would replace %1%fred%1 with first parm, then */ - /* contents of fred, then the digit 1. Would need to remove */ - /* ExpandEnvStrings to achieve this */ - /* NOTE: To support the %PATH:xxx% syntax, also need to do */ - /* manual expansion of environment variables here */ + /* NOTE: To support the %PATH:xxx% syntax, also perform */ + /* manual expansion of environment variables here */ p = new_cmd; while ((p = strchr(p, '%'))) { @@ -356,61 +351,6 @@ void WCMD_process_command (char *command) strcat (p, s); free (s); - /* Handle DATE, TIME, ERRORLEVEL and CD replacements allowing */ - /* override if existing env var called that name */ - } else if ((CompareString (LOCALE_USER_DEFAULT, - NORM_IGNORECASE | SORT_STRINGSORT, - (p+1), 11, "ERRORLEVEL%", -1) == 2) && - (GetEnvironmentVariable("ERRORLEVEL", temp, 1) == 0) && - (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) { - sprintf(temp, "%d", errorlevel); - s = strdup (p+12); - strcpy (p, temp); - strcat (p, s); - - } else if ((CompareString (LOCALE_USER_DEFAULT, - NORM_IGNORECASE | SORT_STRINGSORT, - (p+1), 5, "DATE%", -1) == 2) && - (GetEnvironmentVariable("DATE", temp, 1) == 0) && - (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) { - - GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, - NULL, temp, MAXSTRING); - s = strdup (p+6); - strcpy (p, temp); - strcat (p, s); - - } else if ((CompareString (LOCALE_USER_DEFAULT, - NORM_IGNORECASE | SORT_STRINGSORT, - (p+1), 5, "TIME%", -1) == 2) && - (GetEnvironmentVariable("TIME", temp, 1) == 0) && - (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) { - GetTimeFormat(LOCALE_USER_DEFAULT, TIME_NOSECONDS, NULL, - NULL, temp, MAXSTRING); - s = strdup (p+6); - strcpy (p, temp); - strcat (p, s); - - } else if ((CompareString (LOCALE_USER_DEFAULT, - NORM_IGNORECASE | SORT_STRINGSORT, - (p+1), 3, "CD%", -1) == 2) && - (GetEnvironmentVariable("CD", temp, 1) == 0) && - (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) { - GetCurrentDirectory (MAXSTRING, temp); - s = strdup (p+4); - strcpy (p, temp); - strcat (p, s); - - } else if ((CompareString (LOCALE_USER_DEFAULT, - NORM_IGNORECASE | SORT_STRINGSORT, - (p+1), 7, "RANDOM%", -1) == 2) && - (GetEnvironmentVariable("RANDOM", temp, 1) == 0) && - (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) { - sprintf(temp, "%d", rand() % 32768); - s = strdup (p+8); - strcpy (p, temp); - strcat (p, s); - } else { p = WCMD_expand_envvar(p); } @@ -1156,8 +1096,57 @@ static char *WCMD_expand_envvar(char *start) { } /* Expand to contents, if unchanged, return */ - len = ExpandEnvironmentStrings(thisVar, thisVarContents, - sizeof(thisVarContents)); + /* Handle DATE, TIME, ERRORLEVEL and CD replacements allowing */ + /* override if existing env var called that name */ + if ((CompareString (LOCALE_USER_DEFAULT, + NORM_IGNORECASE | SORT_STRINGSORT, + thisVar, 12, "%ERRORLEVEL%", -1) == 2) && + (GetEnvironmentVariable("ERRORLEVEL", thisVarContents, 1) == 0) && + (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) { + sprintf(thisVarContents, "%d", errorlevel); + len = strlen(thisVarContents); + + } else if ((CompareString (LOCALE_USER_DEFAULT, + NORM_IGNORECASE | SORT_STRINGSORT, + thisVar, 6, "%DATE%", -1) == 2) && + (GetEnvironmentVariable("DATE", thisVarContents, 1) == 0) && + (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) { + + GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, + NULL, thisVarContents, MAXSTRING); + len = strlen(thisVarContents); + + } else if ((CompareString (LOCALE_USER_DEFAULT, + NORM_IGNORECASE | SORT_STRINGSORT, + thisVar, 6, "%TIME%", -1) == 2) && + (GetEnvironmentVariable("TIME", thisVarContents, 1) == 0) && + (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) { + GetTimeFormat(LOCALE_USER_DEFAULT, TIME_NOSECONDS, NULL, + NULL, thisVarContents, MAXSTRING); + len = strlen(thisVarContents); + + } else if ((CompareString (LOCALE_USER_DEFAULT, + NORM_IGNORECASE | SORT_STRINGSORT, + thisVar, 4, "%CD%", -1) == 2) && + (GetEnvironmentVariable("CD", thisVarContents, 1) == 0) && + (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) { + GetCurrentDirectory (MAXSTRING, thisVarContents); + len = strlen(thisVarContents); + + } else if ((CompareString (LOCALE_USER_DEFAULT, + NORM_IGNORECASE | SORT_STRINGSORT, + thisVar, 8, "%RANDOM%", -1) == 2) && + (GetEnvironmentVariable("RANDOM", thisVarContents, 1) == 0) && + (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) { + sprintf(thisVarContents, "%d", rand() % 32768); + len = strlen(thisVarContents); + + } else { + + len = ExpandEnvironmentStrings(thisVar, thisVarContents, + sizeof(thisVarContents)); + } + if (len == 0) return endOfVar+1;

1 0

Dmitry Timoshkov : user32: Simplify height calculation.
by Alexandre Julliard Feb. 27, 2007

Feb. 27, 2007

Module: wine Branch: master Commit: b5186e17dd44972c40a1f4e4a305d8b937cc7b2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5186e17dd44972c40a1f4e4a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Feb 27 15:56:01 2007 +0800 user32: Simplify height calculation. --- dlls/user32/cursoricon.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 1d6101a..38e2ac6 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1759,6 +1759,8 @@ BOOL WINAPI GetIconInfo(HICON hIcon, PICONINFO iconinfo) iconinfo->yHotspot = ciconinfo->ptHotSpot.y; } + height = ciconinfo->nHeight; + if (ciconinfo->bBitsPerPixel > 1) { iconinfo->hbmColor = CreateBitmap( ciconinfo->nWidth, ciconinfo->nHeight, @@ -1766,12 +1768,11 @@ BOOL WINAPI GetIconInfo(HICON hIcon, PICONINFO iconinfo) (char *)(ciconinfo + 1) + ciconinfo->nHeight * get_bitmap_width_bytes (ciconinfo->nWidth,1) ); - height = ciconinfo->nHeight; } else { iconinfo->hbmColor = 0; - height = ciconinfo->nHeight * 2; + height *= 2; } iconinfo->hbmMask = CreateBitmap ( ciconinfo->nWidth, height,

1 0

Dmitry Timoshkov : imm32: Simplify ImmInternalSendIMENotify.
by Alexandre Julliard Feb. 27, 2007

Feb. 27, 2007

Module: wine Branch: master Commit: f0e88c2aef25be5fb60798aa9bd9f5ffc4c78064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0e88c2aef25be5fb60798aa9… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Feb 27 15:55:45 2007 +0800 imm32: Simplify ImmInternalSendIMENotify. --- dlls/imm32/imm.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index ff4916a..02a362e 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -171,18 +171,15 @@ static void ImmInternalPostIMEMessage(UINT msg, WPARAM wParam, LPARAM lParam) static LRESULT ImmInternalSendIMENotify(WPARAM notify, LPARAM lParam) { - LRESULT rc = 0; + HWND target; - if (root_context->hwnd) - rc = SendMessageW(root_context->hwnd, WM_IME_NOTIFY, notify, lParam); - else - { - HWND target = GetFocus(); - if (target) - rc = SendMessageW(target, WM_IME_NOTIFY, notify, lParam); - } + target = root_context->hwnd; + if (!target) target = GetFocus(); - return rc; + if (target) + return SendMessageW(target, WM_IME_NOTIFY, notify, lParam); + + return 0; } static void ImmInternalSetOpenStatus(BOOL fOpen)

1 0