February 2006 - Wine-commits

Mike McCormack : server: Distinguish between a directory and a file changing in
by Alexandre Julliard 20 Feb '06

20 Feb '06

Module: wine Branch: refs/heads/master Commit: a2813f7c2ef879fee94948eb4f935448e2f48152 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a2813f7c2ef879fee94948e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Feb 20 12:28:46 2006 +0100 server: Distinguish between a directory and a file changing in ReadDirectoryChangesW. Add a test for it. --- dlls/kernel/tests/change.c | 80 ++++++++++++++++++++++++++++++++++++++++++++ server/change.c | 67 +++++++++++++++++++++++++++++++------ 2 files changed, 136 insertions(+), 11 deletions(-) diff --git a/dlls/kernel/tests/change.c b/dlls/kernel/tests/change.c index 3c8e245..dfdaa9e 100644 --- a/dlls/kernel/tests/change.c +++ b/dlls/kernel/tests/change.c @@ -560,6 +560,85 @@ static void test_readdirectorychanges_nu ok( r == TRUE, "failed to remove directory\n"); } +static void test_readdirectorychanges_filedir(void) +{ + NTSTATUS r; + HANDLE hdir, hfile; + char buffer[0x1000]; + DWORD fflags, filter = 0; + OVERLAPPED ov; + WCHAR path[MAX_PATH], subdir[MAX_PATH], file[MAX_PATH]; + static const WCHAR szBoo[] = { '\\','b','o','o',0 }; + static const WCHAR szHoo[] = { '\\','h','o','o',0 }; + static const WCHAR szFoo[] = { '\\','f','o','o',0 }; + PFILE_NOTIFY_INFORMATION pfni; + + r = GetTempPathW( MAX_PATH, path ); + ok( r != 0, "temp path failed\n"); + if (!r) + return; + + lstrcatW( path, szBoo ); + lstrcpyW( subdir, path ); + lstrcatW( subdir, szHoo ); + + lstrcpyW( file, path ); + lstrcatW( file, szFoo ); + + DeleteFileW( file ); + RemoveDirectoryW( subdir ); + RemoveDirectoryW( path ); + + r = CreateDirectoryW(path, NULL); + ok( r == TRUE, "failed to create directory\n"); + + fflags = FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED; + hdir = CreateFileW(path, GENERIC_READ|SYNCHRONIZE|FILE_LIST_DIRECTORY, + FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, fflags, NULL); + ok( hdir != INVALID_HANDLE_VALUE, "failed to open directory\n"); + + ov.hEvent = CreateEvent( NULL, 0, 0, NULL ); + + filter = FILE_NOTIFY_CHANGE_FILE_NAME; + + r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,TRUE,filter,NULL,&ov,NULL); + ok(r==TRUE, "should return true\n"); + + r = WaitForSingleObject( ov.hEvent, 10 ); + ok( r == WAIT_TIMEOUT, "should timeout\n" ); + + r = CreateDirectoryW( subdir, NULL ); + ok( r == TRUE, "failed to create directory\n"); + + hfile = CreateFileW( file, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL ); + ok( hfile != INVALID_HANDLE_VALUE, "failed to create file\n"); + ok( CloseHandle(hfile), "failed toc lose file\n"); + + r = WaitForSingleObject( ov.hEvent, INFINITE ); + ok( r == WAIT_OBJECT_0, "event should be ready\n" ); + + ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); + ok( ov.InternalHigh == 0x12, "ov.InternalHigh wrong\n"); + + pfni = (PFILE_NOTIFY_INFORMATION) buffer; + ok( pfni->NextEntryOffset == 0, "offset wrong\n" ); + ok( pfni->Action == FILE_ACTION_ADDED, "action wrong\n" ); + ok( pfni->FileNameLength == 6, "len wrong\n" ); + ok( !memcmp(pfni->FileName,&szFoo[1],6), "name wrong\n" ); + + r = DeleteFileW( file ); + ok( r == TRUE, "failed to delete file\n"); + + r = RemoveDirectoryW( subdir ); + ok( r == TRUE, "failed to remove directory\n"); + + CloseHandle(hdir); + + r = RemoveDirectoryW( path ); + ok( r == TRUE, "failed to remove directory\n"); +} + START_TEST(change) { HMODULE hkernel32 = GetModuleHandle("kernel32"); @@ -570,4 +649,5 @@ START_TEST(change) test_ffcn(); test_readdirectorychanges(); test_readdirectorychanges_null(); + test_readdirectorychanges_filedir(); } diff --git a/server/change.c b/server/change.c index aa8e0cb..d0de942 100644 --- a/server/change.c +++ b/server/change.c @@ -485,24 +485,20 @@ static int inotify_get_poll_events( stru return POLLIN; } -static void inotify_do_change_notify( struct dir *dir, struct inotify_event *ie ) +static void inotify_do_change_notify( struct dir *dir, unsigned int action, + const char *relpath ) { struct change_record *record; if (dir->want_data) { - size_t len = strlen(ie->name); + size_t len = strlen(relpath); record = malloc( offsetof(struct change_record, name[len]) ); if (!record) return; - if( ie->mask & IN_CREATE ) - record->action = FILE_ACTION_ADDED; - else if( ie->mask & IN_DELETE ) - record->action = FILE_ACTION_REMOVED; - else - record->action = FILE_ACTION_MODIFIED; - memcpy( record->name, ie->name, len ); + record->action = action; + memcpy( record->name, relpath, len ); record->len = len; list_add_tail( &dir->change_records, &record->entry ); @@ -535,11 +531,39 @@ static unsigned int filter_from_event( s return filter; } +static int inode_entry_is_dir( struct inode *inode, const char *name ) +{ + /* distinguish a created file from a directory */ + char *path; + struct list *head; + struct stat st; + int unix_fd, r; + + head = list_head( &inode->dirs ); + if (!head) + return -1; + + path = malloc( strlen(name) + 32 ); + if (!path) + return -1; + + unix_fd = get_unix_fd( LIST_ENTRY( head, struct dir, in_entry )->fd ); + sprintf( path, "/proc/self/fd/%u/%s", unix_fd, name ); + r = stat( path, &st ); + free( path ); + if (-1 == r) + return -1; + + if (S_ISDIR(st.st_mode)) + return 1; + return 0; +} + static void inotify_notify_all( struct inotify_event *ie ) { + unsigned int filter, action; struct inode *inode; struct dir *dir; - unsigned int filter; inode = inode_from_wd( ie->wd ); if (!inode) @@ -549,10 +573,31 @@ static void inotify_notify_all( struct i } filter = filter_from_event( ie ); + + if (ie->mask & IN_CREATE) + { + switch (inode_entry_is_dir( inode, ie->name )) + { + case 1: + filter &= ~FILE_NOTIFY_CHANGE_FILE_NAME; + break; + case 0: + filter &= ~FILE_NOTIFY_CHANGE_DIR_NAME; + break; + default: + break; + /* Maybe the file disappeared before we could check it? */ + } + action = FILE_ACTION_ADDED; + } + else if (ie->mask & IN_DELETE) + action = FILE_ACTION_REMOVED; + else + action = FILE_ACTION_MODIFIED; LIST_FOR_EACH_ENTRY( dir, &inode->dirs, struct dir, in_entry ) if (filter & dir->filter) - inotify_do_change_notify( dir, ie ); + inotify_do_change_notify( dir, action, ie->name ); } static void inotify_poll_event( struct fd *fd, int event )

1 0

Eric Pouech : dbghelp: Virtual modules.
by Alexandre Julliard 20 Feb '06

20 Feb '06

Module: wine Branch: refs/heads/master Commit: 88aa6703af6ebc287d9c9391dd2ea7e1bd299f8f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=88aa6703af6ebc287d9c939… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Feb 20 12:16:08 2006 +0100 dbghelp: Virtual modules. Rewrote virtual modules handling so that it's an option to either PE or ELF modules rather than a specific type. --- dlls/dbghelp/dbghelp_private.h | 10 +++++----- dlls/dbghelp/elf_module.c | 9 +++++---- dlls/dbghelp/module.c | 33 ++++++++++++++++++--------------- dlls/dbghelp/path.c | 1 - dlls/dbghelp/pe_module.c | 6 +++--- 5 files changed, 31 insertions(+), 28 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 3f5fcf6..d7371a2 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -258,14 +258,14 @@ enum module_type DMT_ELF, /* a real ELF shared module */ DMT_PE, /* a native or builtin PE module */ DMT_PDB, /* PDB file */ - DMT_VIRTUAL, /* a virtual module (ie defined by caller) */ }; struct module { IMAGEHLP_MODULE module; struct module* next; - enum module_type type; + enum module_type type : 16; + unsigned short is_virtual : 1; struct elf_module_info* elf_info; /* memory allocation pool */ @@ -345,9 +345,9 @@ extern struct module* module_get_debug(const struct process* pcs, struct module*); extern struct module* module_new(struct process* pcs, const char* name, - enum module_type type, unsigned long addr, - unsigned long size, unsigned long stamp, - unsigned long checksum); + enum module_type type, BOOL virtual, + unsigned long addr, unsigned long size, + unsigned long stamp, unsigned long checksum); extern struct module* module_get_container(const struct process* pcs, const struct module* inner); diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 92bb3f1..ad1a4ff 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1091,7 +1091,7 @@ static BOOL elf_load_file(struct process struct elf_module_info *elf_module_info = HeapAlloc(GetProcessHeap(), 0, sizeof(struct elf_module_info)); if (!elf_module_info) goto leave; - elf_info->module = module_new(pcs, filename, DMT_ELF, + elf_info->module = module_new(pcs, filename, DMT_ELF, FALSE, (load_offset) ? load_offset : fmap.elf_start, fmap.elf_size, 0, calc_crc32(&fmap)); if (!elf_info->module) @@ -1292,7 +1292,8 @@ BOOL elf_synchronize_module_list(struct for (module = pcs->lmodules; module; module = module->next) { - if (module->type == DMT_ELF) module->elf_info->elf_mark = 0; + if (module->type == DMT_ELF && !module->is_virtual) + module->elf_info->elf_mark = 0; } es.pcs = pcs; @@ -1303,8 +1304,8 @@ BOOL elf_synchronize_module_list(struct module = pcs->lmodules; while (module) { - if (module->type == DMT_ELF && !module->elf_info->elf_mark && - !module->elf_info->elf_loader) + if (module->type == DMT_ELF && !module->is_virtual && + !module->elf_info->elf_mark && !module->elf_info->elf_loader) { module_remove(pcs, module); /* restart all over */ diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 17974ef..7f13167 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -78,13 +78,12 @@ static void module_fill_module(const cha while ((*out = tolower(*out))) out++; } -static const char* get_module_type(enum module_type type) +static const char* get_module_type(enum module_type type, BOOL virtual) { switch (type) { - case DMT_ELF: return "ELF"; - case DMT_PE: return "PE"; - case DMT_VIRTUAL: return "Virtual"; + case DMT_ELF: return virtual ? "Virtual ELF" : "ELF"; + case DMT_PE: return virtual ? "Virtual PE" : "PE"; default: return "---"; } } @@ -93,13 +92,13 @@ static const char* get_module_type( * Creates and links a new module to a process */ struct module* module_new(struct process* pcs, const char* name, - enum module_type type, + enum module_type type, BOOL virtual, unsigned long mod_addr, unsigned long size, unsigned long stamp, unsigned long checksum) { struct module* module; - assert(type == DMT_ELF || type == DMT_PE || type == DMT_VIRTUAL); + assert(type == DMT_ELF || type == DMT_PE); if (!(module = HeapAlloc(GetProcessHeap(), 0, sizeof(*module)))) return NULL; @@ -109,7 +108,7 @@ struct module* module_new(struct process pcs->lmodules = module; TRACE("=> %s %08lx-%08lx %s\n", - get_module_type(type), mod_addr, mod_addr + size, name); + get_module_type(type, virtual), mod_addr, mod_addr + size, name); pool_init(&module->pool, 65536); @@ -126,6 +125,7 @@ struct module* module_new(struct process module->module.CheckSum = checksum; module->type = type; + module->is_virtual = virtual ? TRUE : FALSE; module->sortlist_valid = FALSE; module->addr_sorttab = NULL; /* FIXME: this seems a bit too high (on a per module basis) @@ -154,8 +154,7 @@ struct module* module_find_by_name(const if (type == DMT_UNKNOWN) { if ((module = module_find_by_name(pcs, name, DMT_PE)) || - (module = module_find_by_name(pcs, name, DMT_ELF)) || - (module = module_find_by_name(pcs, name, DMT_VIRTUAL))) + (module = module_find_by_name(pcs, name, DMT_ELF))) return module; } else @@ -243,8 +242,9 @@ struct module* module_get_debug(const st if (module->module.SymType == SymDeferred) { BOOL ret; - - switch (module->type) + + if (module->is_virtual) ret = FALSE; + else switch (module->type) { case DMT_ELF: ret = elf_load_debug_info(module, NULL); @@ -264,7 +264,6 @@ struct module* module_get_debug(const st ret ? CBA_DEFERRED_SYMBOL_LOAD_COMPLETE : CBA_DEFERRED_SYMBOL_LOAD_FAILURE, &idsl64); break; - case DMT_VIRTUAL: /* fall through */ default: ret = FALSE; break; @@ -290,8 +289,7 @@ struct module* module_find_by_addr(const if (type == DMT_UNKNOWN) { if ((module = module_find_by_addr(pcs, addr, DMT_PE)) || - (module = module_find_by_addr(pcs, addr, DMT_ELF)) || - (module = module_find_by_addr(pcs, addr, DMT_VIRTUAL))) + (module = module_find_by_addr(pcs, addr, DMT_ELF))) return module; } else @@ -436,6 +434,10 @@ DWORD64 WINAPI SymLoadModuleEx(HANDLE h PCSTR ModuleName, DWORD64 BaseOfDll, DWORD DllSize, PMODLOAD_DATA Data, DWORD Flags) { + TRACE("(%p %p %s %s %s %08lx %p %08lx)\n", + hProcess, hFile, debugstr_a(ImageName), debugstr_a(ModuleName), + wine_dbgstr_longlong(BaseOfDll), DllSize, Data, Flags); + if (Data) FIXME("Unsupported load data parameter %p for %s\n", Data, ImageName); if (!validate_addr64(BaseOfDll)) return FALSE; @@ -445,7 +447,8 @@ DWORD64 WINAPI SymLoadModuleEx(HANDLE h struct module* module; if (!pcs) return FALSE; - module = module_new(pcs, ImageName, DMT_VIRTUAL, (DWORD)BaseOfDll, DllSize, 0, 0); + module = module_new(pcs, ImageName, module_get_type_by_name(ImageName), TRUE, + (DWORD)BaseOfDll, DllSize, 0, 0); if (!module) return FALSE; if (ModuleName) lstrcpynA(module->module.ModuleName, ModuleName, sizeof(module->module.ModuleName)); diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index 2362ca1..8033967 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -282,7 +282,6 @@ static BOOL CALLBACK sffip_cb(LPCSTR buf } break; case DMT_PDB: - case DMT_VIRTUAL: FIXME("NIY on '%s'\n", buffer); break; default: diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 417aadb..395f398 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -360,7 +360,7 @@ struct module* pe_load_module(struct pro if (!base) base = nth->OptionalHeader.ImageBase; if (!size) size = nth->OptionalHeader.SizeOfImage; - module = module_new(pcs, loaded_name, DMT_PE, base, size, + module = module_new(pcs, loaded_name, DMT_PE, FALSE, base, size, nth->FileHeader.TimeDateStamp, nth->OptionalHeader.CheckSum); if (module) @@ -428,11 +428,11 @@ struct module* pe_load_module_from_pcs(s if (pe_load_nt_header(pcs->handle, base, &nth)) { if (!size) size = nth.OptionalHeader.SizeOfImage; - module = module_new(pcs, name, DMT_PE, base, size, + module = module_new(pcs, name, DMT_PE, FALSE, base, size, nth.FileHeader.TimeDateStamp, nth.OptionalHeader.CheckSum); } } else if (size) - module = module_new(pcs, name, DMT_PE, base, size, 0 /* FIXME */, 0 /* FIXME */); + module = module_new(pcs, name, DMT_PE, FALSE, base, size, 0 /* FIXME */, 0 /* FIXME */); } return module; }

1 0

Alexandre Julliard : kernel: Don' t require execute permission for DOS memory, this will be
by Alexandre Julliard 20 Feb '06

20 Feb '06

Module: wine Branch: refs/heads/master Commit: 8445773c0e43f8548d517ae7bf23757e74fe1fc4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8445773c0e43f8548d517ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 20 12:03:05 2006 +0100 kernel: Don't require execute permission for DOS memory, this will be done in winedos if necessary. --- dlls/kernel/dosmem.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/dosmem.c b/dlls/kernel/dosmem.c index 73bc2dc..7642b27 100644 --- a/dlls/kernel/dosmem.c +++ b/dlls/kernel/dosmem.c @@ -99,7 +99,7 @@ BOOL load_winedos(void) /* ok, we're the winning thread */ if (!VirtualProtect( DOSMEM_dosmem + DOSMEM_protect, DOSMEM_SIZE - DOSMEM_protect, - PAGE_EXECUTE_READWRITE, NULL ) || + PAGE_READWRITE, NULL ) || !(hModule = LoadLibraryA( "winedos.dll" ))) { ERR("Could not load winedos.dll, DOS subsystem unavailable\n");

1 0

Rein Klazes : user: Add conformance tests for menu item drawing.
by Alexandre Julliard 20 Feb '06

20 Feb '06

Module: wine Branch: refs/heads/master Commit: 1d0ec411d417d456c0cb3da8de5047e382a710a3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1d0ec411d417d456c0cb3da… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Mon Feb 20 12:00:39 2006 +0100 user: Add conformance tests for menu item drawing. --- dlls/user/tests/menu.c | 299 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 285 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=1d0ec411d417d456c0c…

1 0

Rein Klazes : user: Menu drawing fixes.
by Alexandre Julliard 20 Feb '06

20 Feb '06

Module: wine Branch: refs/heads/master Commit: 00ca259872284290387f5f0290f337675c8ed8ef URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=00ca259872284290387f5f0… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Mon Feb 20 11:58:54 2006 +0100 user: Menu drawing fixes. - check mark is drawn left of a bitmap; - if a MNS_CHECKORBMP-style menu has a checkmark, do no draw any bitmap; - space for the popup arrow is also reserved for non popup items; - implement the MNS_NOCHECK style. --- dlls/user/menu.c | 100 +++++++++++++++++++++++++++--------------------------- 1 files changed, 50 insertions(+), 50 deletions(-) diff --git a/dlls/user/menu.c b/dlls/user/menu.c index 84781b4..2f58cb0 100644 --- a/dlls/user/menu.c +++ b/dlls/user/menu.c @@ -37,7 +37,6 @@ * - MNS_AUTODISMISS * - MNS_DRAGDROP * - MNS_MODELESS - * - MNS_NOCHECK * - MNS_NOTIFYBYPOS */ @@ -1009,16 +1008,12 @@ static void MENU_CalcItemSize( HDC hdc, lpitem->bmpsize = size; lppop->maxBmpSize.cx = max( lppop->maxBmpSize.cx, size.cx); lppop->maxBmpSize.cy = max( lppop->maxBmpSize.cy, size.cy); - lpitem->rect.right += size.cx; - itemheight = size.cy; - if (lppop->dwStyle & MNS_CHECKORBMP) - lpitem->rect.right += check_bitmap_width; - else - lpitem->rect.right += 2 * check_bitmap_width; - } else - lpitem->rect.right += 2 * check_bitmap_width; - if (lpitem->fType & MF_POPUP) - lpitem->rect.right += arrow_bitmap_width; + lpitem->rect.right += size.cx + 2; + itemheight = size.cy + 2; + } + lpitem->rect.right += 4 + arrow_bitmap_width + menucharsize.cx; + if( !(lppop->dwStyle & MNS_NOCHECK)) + lpitem->rect.right += check_bitmap_width; } else if (lpitem->hbmpItem) { /* menuBar */ SIZE size; @@ -1070,6 +1065,8 @@ static void MENU_CalcItemSize( HDC hdc, lpitem->xTab = 4 + check_bitmap_width + lpitem->bmpsize.cx + txtwidth; } + if( (lppop->dwStyle & MNS_NOCHECK)) + lpitem->xTab -= check_bitmap_width; lpitem->rect.right += 2 + txtwidth; itemheight = max( itemheight, max( txtheight + 2, menucharsize.cy + 4)); @@ -1501,7 +1498,7 @@ static void MENU_DrawMenuItem( HWND hwnd bmprc.left = lpitem->text ? menucharsize.cx : 0; } else { bmprc.left = 4; - if( !(menu->dwStyle & MNS_NOCHECK)) + if( !(menu->dwStyle & ( MNS_CHECKORBMP | MNS_NOCHECK))) bmprc.left += GetSystemMetrics( SM_CXMENUCHECK); } bmprc.right = bmprc.left + lpitem->bmpsize.cx; @@ -1518,49 +1515,49 @@ static void MENU_DrawMenuItem( HWND hwnd HBITMAP bm; INT y = rect.top + rect.bottom; RECT rc = rect; + int checked = FALSE; UINT check_bitmap_width = GetSystemMetrics( SM_CXMENUCHECK ); UINT check_bitmap_height = GetSystemMetrics( SM_CYMENUCHECK ); - - if (lpitem->hbmpItem) - { - POPUPMENU *menu = MENU_GetMenu(hmenu); - if (menu->dwStyle & MNS_CHECKORBMP) - rc.left += menu->maxBmpSize.cx - check_bitmap_width; - else - rc.left += menu->maxBmpSize.cx; - } /* Draw the check mark * * FIXME: * Custom checkmark bitmaps are monochrome but not always 1bpp. */ - bm = (lpitem->fState & MF_CHECKED) ? lpitem->hCheckBit : lpitem->hUnCheckBit; - if (bm) /* we have a custom bitmap */ - { - HDC hdcMem = CreateCompatibleDC( hdc ); - SelectObject( hdcMem, bm ); - BitBlt( hdc, rc.left, (y - check_bitmap_height) / 2, - check_bitmap_width, check_bitmap_height, - hdcMem, 0, 0, SRCCOPY ); - DeleteDC( hdcMem ); - } - else if (lpitem->fState & MF_CHECKED) /* standard bitmaps */ - { - RECT r; - HBITMAP bm = CreateBitmap( check_bitmap_width, check_bitmap_height, 1, 1, NULL ); - HDC hdcMem = CreateCompatibleDC( hdc ); - SelectObject( hdcMem, bm ); - SetRect( &r, 0, 0, check_bitmap_width, check_bitmap_height ); - DrawFrameControl( hdcMem, &r, DFC_MENU, - (lpitem->fType & MFT_RADIOCHECK) ? - DFCS_MENUBULLET : DFCS_MENUCHECK ); - BitBlt( hdc, rc.left, (y - r.bottom) / 2, r.right, r.bottom, - hdcMem, 0, 0, SRCCOPY ); - DeleteDC( hdcMem ); - DeleteObject( bm ); + if( !(menu->dwStyle & MNS_NOCHECK)) { + bm = (lpitem->fState & MF_CHECKED) ? lpitem->hCheckBit : + lpitem->hUnCheckBit; + if (bm) /* we have a custom bitmap */ + { + HDC hdcMem = CreateCompatibleDC( hdc ); + + SelectObject( hdcMem, bm ); + BitBlt( hdc, rc.left, (y - check_bitmap_height) / 2, + check_bitmap_width, check_bitmap_height, + hdcMem, 0, 0, SRCCOPY ); + DeleteDC( hdcMem ); + checked = TRUE; + } + else if (lpitem->fState & MF_CHECKED) /* standard bitmaps */ + { + RECT r; + HBITMAP bm = CreateBitmap( check_bitmap_width, + check_bitmap_height, 1, 1, NULL ); + HDC hdcMem = CreateCompatibleDC( hdc ); + + SelectObject( hdcMem, bm ); + SetRect( &r, 0, 0, check_bitmap_width, check_bitmap_height); + DrawFrameControl( hdcMem, &r, DFC_MENU, + (lpitem->fType & MFT_RADIOCHECK) ? + DFCS_MENUBULLET : DFCS_MENUCHECK ); + BitBlt( hdc, rc.left, (y - r.bottom) / 2, r.right, r.bottom, + hdcMem, 0, 0, SRCCOPY ); + DeleteDC( hdcMem ); + DeleteObject( bm ); + checked = TRUE; + } } - if (lpitem->hbmpItem) - { + if( lpitem->hbmpItem && + !( checked && (menu->dwStyle & MNS_CHECKORBMP))) { POINT origorg; /* some applications make this assumption on the DC's origin */ SetViewportOrgEx( hdc, lpitem->rect.left, lpitem->rect.top, &origorg); @@ -1572,8 +1569,9 @@ static void MENU_DrawMenuItem( HWND hwnd if (lpitem->fType & MF_POPUP) draw_popup_arrow( hdc, rect, arrow_bitmap_width, arrow_bitmap_height); - - rect.left += check_bitmap_width; + rect.left += 4; + if( !(menu->dwStyle & MNS_NOCHECK)) + rect.left += check_bitmap_width; rect.right -= arrow_bitmap_width; } else if( lpitem->hbmpItem) @@ -1595,6 +1593,9 @@ static void MENU_DrawMenuItem( HWND hwnd DT_CENTER | DT_VCENTER | DT_SINGLELINE : DT_LEFT | DT_VCENTER | DT_SINGLELINE; + if( !(menu->dwStyle & MNS_CHECKORBMP)) + rect.left += menu->maxBmpSize.cx; + if ( lpitem->fState & MFS_DEFAULT ) { hfontOld = SelectObject( hdc, get_menu_font(TRUE) ); @@ -4869,7 +4870,6 @@ BOOL WINAPI SetMenuInfo (HMENU hMenu, LP if (menu->dwStyle & MNS_AUTODISMISS) FIXME("MNS_AUTODISMISS unimplemented\n"); if (menu->dwStyle & MNS_DRAGDROP) FIXME("MNS_DRAGDROP unimplemented\n"); if (menu->dwStyle & MNS_MODELESS) FIXME("MNS_MODELESS unimplemented\n"); - if (menu->dwStyle & MNS_NOCHECK) FIXME("MNS_NOCHECK unimplemented\n"); if (menu->dwStyle & MNS_NOTIFYBYPOS) FIXME("MNS_NOTIFYBYPOS unimplemented\n"); }

1 0

Rein Klazes : user: Menu string width calculation fixes.
by Alexandre Julliard 20 Feb '06

20 Feb '06

Module: wine Branch: refs/heads/master Commit: 885f217022e0d56d0c0fbce7bcee44843824ad2b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=885f217022e0d56d0c0fbce… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Mon Feb 20 11:58:03 2006 +0100 user: Menu string width calculation fixes. - Use DrawText in stead of GetTextExtendPoint32, to properly measure strings with ampersands like "&File"; - Fix mess with strings with an embedded tab; - In case of a menu bar, two extra pixels are added if the item has both a bitmap and string. --- dlls/user/menu.c | 81 ++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 51 insertions(+), 30 deletions(-) diff --git a/dlls/user/menu.c b/dlls/user/menu.c index 26bcff5..84781b4 100644 --- a/dlls/user/menu.c +++ b/dlls/user/menu.c @@ -943,6 +943,7 @@ static void MENU_CalcItemSize( HDC hdc, UINT check_bitmap_width = GetSystemMetrics( SM_CXMENUCHECK ); UINT arrow_bitmap_width; BITMAP bm; + INT itemheight; TRACE("dc=%p owner=%p (%d,%d)\n", hdc, hwndOwner, orgX, orgY); debug_print_menuitem("MENU_CalcItemSize: menuitem:", lpitem, @@ -996,6 +997,8 @@ static void MENU_CalcItemSize( HDC hdc, return; } + itemheight = 0; + if (!menuBar) { if (lpitem->hbmpItem) { SIZE size; @@ -1007,7 +1010,7 @@ static void MENU_CalcItemSize( HDC hdc, lppop->maxBmpSize.cx = max( lppop->maxBmpSize.cx, size.cx); lppop->maxBmpSize.cy = max( lppop->maxBmpSize.cy, size.cy); lpitem->rect.right += size.cx; - lpitem->rect.bottom += size.cy; + itemheight = size.cy; if (lppop->dwStyle & MNS_CHECKORBMP) lpitem->rect.right += check_bitmap_width; else @@ -1022,41 +1025,59 @@ static void MENU_CalcItemSize( HDC hdc, MENU_GetBitmapItemSize( lpitem, &size, hwndOwner ); lpitem->bmpsize = size; lpitem->rect.right += size.cx; - lpitem->rect.bottom += size.cy; - /* Leave space for the sunken border */ - lpitem->rect.right += 2; - lpitem->rect.bottom += 2; + if( lpitem->text) lpitem->rect.right += 2; + itemheight = size.cy; } /* it must be a text item - unless it's the system menu */ - if (!(lpitem->fType & MF_SYSMENU) && lpitem->text) - { SIZE size; - - GetTextExtentPoint32W(hdc, lpitem->text, strlenW(lpitem->text), &size); + if (!(lpitem->fType & MF_SYSMENU) && lpitem->text) { + RECT rc = lpitem->rect; + LONG txtheight, txtwidth; - lpitem->rect.right += size.cx; - lpitem->rect.bottom += max(max(size.cy, GetSystemMetrics(SM_CYMENU)-1), lppop->maxBmpSize.cy); - lpitem->xTab = 0; - - if (menuBar) - { + lpitem->xTab = 0; + if (menuBar) { + txtheight = DrawTextW( hdc, lpitem->text, -1, &rc, + DT_SINGLELINE|DT_CALCRECT); + lpitem->rect.right += rc.right - rc.left; + itemheight = max( max( itemheight, txtheight), + GetSystemMetrics( SM_CYMENU) - 1); lpitem->rect.right += 2 * menucharsize.cx; - } - else if ((p = strchrW( lpitem->text, '\t' )) != NULL) - { - /* Item contains a tab (only meaningful in popup menus) */ - GetTextExtentPoint32W(hdc, lpitem->text, (int)(p - lpitem->text) , &size); - lpitem->xTab = check_bitmap_width + menucharsize.cx + size.cx; - lpitem->rect.right += menucharsize.cx; - } - else - { - if (strchrW( lpitem->text, '\b' )) - lpitem->rect.right += menucharsize.cx; - lpitem->xTab = lpitem->rect.right - check_bitmap_width - - arrow_bitmap_width; - } + } else { + if ((p = strchrW( lpitem->text, '\t' )) != NULL) { + RECT tmprc = rc; + LONG tmpheight; + int n = (int)( p - lpitem->text); + /* Item contains a tab (only meaningful in popup menus) */ + /* get text size before the tab */ + txtheight = DrawTextW( hdc, lpitem->text, n, &rc, + DT_SINGLELINE|DT_CALCRECT); + txtwidth = rc.right - rc.left; + p += 1; /* advance past the Tab */ + /* get text size after the tab */ + tmpheight = DrawTextW( hdc, p, -1, &tmprc, + DT_SINGLELINE|DT_CALCRECT); + lpitem->xTab = menucharsize.cx + + 4 + check_bitmap_width + lpitem->bmpsize.cx + txtwidth; + txtheight = max( txtheight, tmpheight); + txtwidth += menucharsize.cx + /* space for the tab */ + tmprc.right - tmprc.left; /* space for the short cut */ + } else { + txtheight = DrawTextW( hdc, lpitem->text, -1, &rc, + DT_SINGLELINE|DT_CALCRECT); + txtwidth = rc.right - rc.left; + if (strchrW( lpitem->text, '\b' )) + lpitem->rect.right += menucharsize.cx; + lpitem->xTab = 4 + check_bitmap_width + lpitem->bmpsize.cx + + txtwidth; + } + lpitem->rect.right += 2 + txtwidth; + itemheight = max( itemheight, + max( txtheight + 2, menucharsize.cy + 4)); + } + } else if( menuBar) { + itemheight = max( itemheight, GetSystemMetrics(SM_CYMENU)-1); } + lpitem->rect.bottom += itemheight; TRACE("%s\n", wine_dbgstr_rect( &lpitem->rect)); }

1 0

Rein Klazes : user: Menu drawing fixes.
by Alexandre Julliard 20 Feb '06

20 Feb '06

Module: wine Branch: refs/heads/master Commit: 2757532fee1e8bc48e6d4131e7e9b2fa71f9fb50 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2757532fee1e8bc48e6d413… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Mon Feb 20 11:57:07 2006 +0100 user: Menu drawing fixes. Replace some #defined constants by values calculated from windows metrics. --- dlls/user/menu.c | 52 ++++++++++++++++++++++++---------------------------- 1 files changed, 24 insertions(+), 28 deletions(-) diff --git a/dlls/user/menu.c b/dlls/user/menu.c index cf76884..26bcff5 100644 --- a/dlls/user/menu.c +++ b/dlls/user/menu.c @@ -140,15 +140,6 @@ typedef struct #define TPM_BUTTONDOWN 0x40000000 /* menu was clicked before tracking */ #define TPM_POPUPMENU 0x20000000 /* menu is a popup menu */ - /* Space between 2 menu bar items */ -#define MENU_BAR_ITEMS_SPACE 12 - - /* Minimum width of a tab character */ -#define MENU_TAB_SPACE 8 - - /* Height of a separator item */ -#define SEPARATOR_HEIGHT 5 - /* Space between 2 columns */ #define MENU_COL_SPACE 4 @@ -960,18 +951,19 @@ static void MENU_CalcItemSize( HDC hdc, GetObjectW( get_arrow_bitmap(), sizeof(bm), &bm ); arrow_bitmap_width = bm.bmWidth; + /* not done in Menu_Init: GetDialogBaseUnits() breaks there */ + if( !menucharsize.cx ) { + menucharsize.cx = GdiGetCharDimensions( hdc, NULL, &menucharsize.cy ); + /* Win95/98/ME will use menucharsize.cy here. Testing is possible + * but it is unlikely an application will depend on that */ + ODitemheight = HIWORD( GetDialogBaseUnits()); + } + SetRect( &lpitem->rect, orgX, orgY, orgX, orgY ); if (lpitem->fType & MF_OWNERDRAW) { MEASUREITEMSTRUCT mis; - /* not done in Menu_Init: GetDialogBaseUnits() breaks there */ - if( !menucharsize.cx ) { - menucharsize.cx = GdiGetCharDimensions( hdc, NULL, &menucharsize.cy ); - /* Win95/98/ME will use menucharsize.cy here. Testing is possible - * but it is unlikely an application will depend on that */ - ODitemheight = HIWORD( GetDialogBaseUnits()); - } mis.CtlType = ODT_MENU; mis.CtlID = 0; mis.itemID = lpitem->wID; @@ -998,14 +990,16 @@ static void MENU_CalcItemSize( HDC hdc, if (lpitem->fType & MF_SEPARATOR) { - lpitem->rect.bottom += SEPARATOR_HEIGHT; - return; + lpitem->rect.bottom += GetSystemMetrics( SM_CYMENUSIZE)/2; + if( !menuBar) + lpitem->rect.right += arrow_bitmap_width + menucharsize.cx; + return; } if (!menuBar) { if (lpitem->hbmpItem) { SIZE size; - + MENU_GetBitmapItemSize(lpitem, &size, hwndOwner); /* Keep the size of the bitmap in callback mode to be able * to draw it correctly */ @@ -1046,19 +1040,19 @@ static void MENU_CalcItemSize( HDC hdc, if (menuBar) { - lpitem->rect.right += MENU_BAR_ITEMS_SPACE; + lpitem->rect.right += 2 * menucharsize.cx; } else if ((p = strchrW( lpitem->text, '\t' )) != NULL) { /* Item contains a tab (only meaningful in popup menus) */ GetTextExtentPoint32W(hdc, lpitem->text, (int)(p - lpitem->text) , &size); - lpitem->xTab = check_bitmap_width + MENU_TAB_SPACE + size.cx; - lpitem->rect.right += MENU_TAB_SPACE; + lpitem->xTab = check_bitmap_width + menucharsize.cx + size.cx; + lpitem->rect.right += menucharsize.cx; } else { if (strchrW( lpitem->text, '\b' )) - lpitem->rect.right += MENU_TAB_SPACE; + lpitem->rect.right += menucharsize.cx; lpitem->xTab = lpitem->rect.right - check_bitmap_width - arrow_bitmap_width; } @@ -1456,7 +1450,7 @@ static void MENU_DrawMenuItem( HWND hwnd rc.left++; rc.right--; - rc.top += SEPARATOR_HEIGHT / 2; + rc.top = ( rc.top + rc.bottom) / 2; if (flat_menu) { oldPen = SelectObject( hdc, SYSCOLOR_GetPen(COLOR_BTNSHADOW) ); @@ -1585,10 +1579,12 @@ static void MENU_DrawMenuItem( HWND hwnd hfontOld = SelectObject( hdc, get_menu_font(TRUE) ); } - if (menuBar) - { - rect.left += MENU_BAR_ITEMS_SPACE / 2; - rect.right -= MENU_BAR_ITEMS_SPACE / 2; + if (menuBar) { + if( lpitem->hbmpItem) + rect.left += lpitem->bmpsize.cx; + if( !(lpitem->hbmpItem == HBMMENU_CALLBACK)) + rect.left += menucharsize.cx; + rect.right -= menucharsize.cx; } for (i = 0; lpitem->text[i]; i++)

1 0

Rein Klazes : user: Menu drawing fixes.
by Alexandre Julliard 20 Feb '06

20 Feb '06

Module: wine Branch: refs/heads/master Commit: 444a5471359df32a86a7b97e1c7070228ad62606 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=444a5471359df32a86a7b97… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Mon Feb 20 11:56:21 2006 +0100 user: Menu drawing fixes. - Move sending WM_MEASUREITEM message for HBMMENU_CALLBACK bitmaps to MENU_GetBitmapItemSize(); - Save the received bitmap size in the menu item structure as it will need to be sent in the WM_DRAWITEM message; - Move sending WM_DRAWITEM message for HBMMENU_CALLBACK bitmaps to MENU_DrawBitmapItem(); - This also means that HBMMENU_CALLBACK bitmaps are now supported in menu bars. --- dlls/user/menu.c | 161 ++++++++++++++++++++++++++++++++---------------------- 1 files changed, 95 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=444a5471359df32a86a…

1 0

Rein Klazes : user: Move drawing of pop menu arrows to a subroutine reduces nesting
by Alexandre Julliard 20 Feb '06

20 Feb '06

Module: wine Branch: refs/heads/master Commit: 672a1e4e4e2fd9f76f0de078d9b51319d4b7a883 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=672a1e4e4e2fd9f76f0de07… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Mon Feb 20 11:54:28 2006 +0100 user: Move drawing of pop menu arrows to a subroutine reduces nesting level of some large if statements in the drawing code. Some updates to the comments. --- dlls/user/menu.c | 326 +++++++++++++++++++++++++++++------------------------- 1 files changed, 173 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=672a1e4e4e2fd9f76f0…

1 0

Detlef Riekenberg : winspool/tests: Add some tests for SetDefaultPrinterA/W .
by Alexandre Julliard 20 Feb '06

20 Feb '06

Module: wine Branch: refs/heads/master Commit: 4be3d64d47805b3921c0bd34d58f9a81b445be32 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4be3d64d47805b3921c0bd3… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Feb 20 11:51:10 2006 +0100 winspool/tests: Add some tests for SetDefaultPrinterA/W. --- dlls/winspool/tests/info.c | 106 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 106 insertions(+), 0 deletions(-) diff --git a/dlls/winspool/tests/info.c b/dlls/winspool/tests/info.c index bc04934..d5990fd 100644 --- a/dlls/winspool/tests/info.c +++ b/dlls/winspool/tests/info.c @@ -35,6 +35,7 @@ static char env_win9x_case[] = "windowS static HANDLE hwinspool; static FARPROC pGetDefaultPrinterA; +static FARPROC pSetDefaultPrinterA; /* report common behavior only once */ static DWORD report_deactivated_spooler = 1; @@ -584,10 +585,114 @@ static void test_OpenPrinter(void) } + +static void test_SetDefaultPrinter(void) +{ + DWORD res; + LPSTR default_printer; + DWORD size = DEFAULT_PRINTER_SIZE; + CHAR buffer[DEFAULT_PRINTER_SIZE]; + CHAR org_value[DEFAULT_PRINTER_SIZE]; + + + if (!pSetDefaultPrinterA) return; + /* only supported on win2k and above */ + + default_printer = find_default_printer(); + + /* backup the original value */ + org_value[0] = '\0'; + SetLastError(MAGIC_DEAD); + res = GetProfileStringA("windows", "device", NULL, org_value, size); + + /* first part: with the default Printer */ + SetLastError(MAGIC_DEAD); + res = pSetDefaultPrinterA("no_printer_with_this_name"); + + RETURN_ON_DEACTIVATED_SPOOLER(res) + /* spooler is running or we have no spooler here*/ + + /* Not implemented in wine */ + if (!res && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { + trace("SetDefaultPrinterA() not implemented yet.\n"); + return; + } + + ok(!res && (GetLastError() == ERROR_INVALID_PRINTER_NAME), + "returned %ld with %ld (expected '0' with " \ + "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); + + WriteProfileStringA("windows", "device", org_value); + SetLastError(MAGIC_DEAD); + res = pSetDefaultPrinterA(""); + ok(res || (!res && (GetLastError() == ERROR_INVALID_PRINTER_NAME)), + "returned %ld with %ld (expected '!=0' or '0' with " \ + "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); + + WriteProfileStringA("windows", "device", org_value); + SetLastError(MAGIC_DEAD); + res = pSetDefaultPrinterA(NULL); + ok(res || (!res && (GetLastError() == ERROR_INVALID_PRINTER_NAME)), + "returned %ld with %ld (expected '!=0' or '0' with " \ + "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); + + WriteProfileStringA("windows", "device", org_value); + SetLastError(MAGIC_DEAD); + res = pSetDefaultPrinterA(default_printer); + ok(res || (!res && (GetLastError() == ERROR_INVALID_PRINTER_NAME)), + "returned %ld with %ld (expected '!=0' or '0' with " \ + "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); + + + /* second part: always without a default Printer */ + WriteProfileStringA("windows", "device", NULL); + SetLastError(MAGIC_DEAD); + res = pSetDefaultPrinterA("no_printer_with_this_name"); + + ok(!res && (GetLastError() == ERROR_INVALID_PRINTER_NAME), + "returned %ld with %ld (expected '0' with " \ + "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); + + WriteProfileStringA("windows", "device", NULL); + SetLastError(MAGIC_DEAD); + res = pSetDefaultPrinterA(""); + /* we get ERROR_INVALID_PRINTER_NAME when no printer is installed */ + ok(res || (!res && (GetLastError() == ERROR_INVALID_PRINTER_NAME)), + "returned %ld with %ld (expected '!=0' or '0' with " \ + "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); + + WriteProfileStringA("windows", "device", NULL); + SetLastError(MAGIC_DEAD); + res = pSetDefaultPrinterA(NULL); + /* we get ERROR_INVALID_PRINTER_NAME when no printer is installed */ + ok(res || (!res && (GetLastError() == ERROR_INVALID_PRINTER_NAME)), + "returned %ld with %ld (expected '!=0' or '0' with " \ + "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); + + WriteProfileStringA("windows", "device", NULL); + SetLastError(MAGIC_DEAD); + res = pSetDefaultPrinterA(default_printer); + ok(res || (!res && (GetLastError() == ERROR_INVALID_PRINTER_NAME)), + "returned %ld with %ld (expected '!=0' or '0' with " \ + "ERROR_INVALID_PRINTER_NAME)\n", res, GetLastError()); + + /* restore the original value */ + res = pSetDefaultPrinterA(default_printer); /* the nice way */ + WriteProfileStringA("windows", "device", org_value); /* the old way */ + + buffer[0] = '\0'; + SetLastError(MAGIC_DEAD); + res = GetProfileStringA("windows", "device", NULL, buffer, size); + ok(!lstrcmpA(org_value, buffer), "'%s' (expected '%s')\n", buffer, org_value); + +} + + START_TEST(info) { hwinspool = GetModuleHandleA("winspool.drv"); pGetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "GetDefaultPrinterA"); + pSetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "SetDefaultPrinterA"); find_default_printer(); @@ -595,4 +700,5 @@ START_TEST(info) test_GetDefaultPrinter(); test_GetPrinterDriverDirectory(); test_OpenPrinter(); + test_SetDefaultPrinter(); }

1 0