April 2011 - Wine-Commits - list.winehq.org

Alexandre Julliard : server: Add support for opening a new file handle from a mapping object.
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: eb2fe39d63dfd6fe0ad7a11f55657f42cabff070 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb2fe39d63dfd6fe0ad7a11f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 18 13:41:54 2011 +0200 server: Add support for opening a new file handle from a mapping object. --- server/file.c | 25 +++++++++++++++++++++++++ server/file.h | 9 +++++++++ server/mapping.c | 25 +++++++++++++++++++++---- server/object.h | 4 ---- 4 files changed, 55 insertions(+), 8 deletions(-) diff --git a/server/file.c b/server/file.c index 8cf474b..ce95576 100644 --- a/server/file.c +++ b/server/file.c @@ -141,6 +141,31 @@ struct file *create_file_for_fd( int fd, unsigned int access, unsigned int shari return file; } +/* create a file by duplicating an fd object */ +struct file *create_file_for_fd_obj( struct fd *fd, unsigned int access, unsigned int sharing ) +{ + struct file *file; + struct stat st; + + if (fstat( get_unix_fd(fd), &st ) == -1) + { + file_set_error(); + return NULL; + } + + if ((file = alloc_object( &file_ops ))) + { + file->mode = st.st_mode; + file->access = default_fd_map_access( &file->obj, access ); + if (!(file->fd = dup_fd_object( fd, access, sharing, FILE_SYNCHRONOUS_IO_NONALERT ))) + { + release_object( file ); + return NULL; + } + } + return file; +} + static struct object *create_file_obj( struct fd *fd, unsigned int access, mode_t mode ) { struct file *file = alloc_object( &file_ops ); diff --git a/server/file.h b/server/file.h index 26290a3..772c9b8 100644 --- a/server/file.h +++ b/server/file.h @@ -116,11 +116,20 @@ extern struct file *get_file_obj( struct process *process, obj_handle_t handle, extern int get_file_unix_fd( struct file *file ); extern int is_same_file( struct file *file1, struct file *file2 ); extern struct file *create_file_for_fd( int fd, unsigned int access, unsigned int sharing ); +extern struct file *create_file_for_fd_obj( struct fd *fd, unsigned int access, unsigned int sharing ); extern struct file *grab_file_unless_removable( struct file *file ); extern void file_set_error(void); extern struct security_descriptor *mode_to_sd( mode_t mode, const SID *user, const SID *group ); extern mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ); +/* file mapping functions */ + +extern struct mapping *get_mapping_obj( struct process *process, obj_handle_t handle, + unsigned int access ); +extern obj_handle_t open_mapping_file( struct process *process, struct mapping *mapping, + unsigned int access, unsigned int sharing ); +extern int get_page_size(void); + /* change notification functions */ extern void do_change_notify( int unix_fd ); diff --git a/server/mapping.c b/server/mapping.c index 5c77989..01622e8 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -565,6 +565,24 @@ static struct object *create_mapping( struct directory *root, const struct unico return NULL; } +struct mapping *get_mapping_obj( struct process *process, obj_handle_t handle, unsigned int access ) +{ + return (struct mapping *)get_handle_obj( process, handle, access, &mapping_ops ); +} + +/* open a new file handle to the file backing the mapping */ +obj_handle_t open_mapping_file( struct process *process, struct mapping *mapping, + unsigned int access, unsigned int sharing ) +{ + obj_handle_t handle; + struct file *file = create_file_for_fd_obj( mapping->fd, access, sharing ); + + if (!file) return 0; + handle = alloc_handle( process, file, access, 0 ); + release_object( file ); + return handle; +} + static void mapping_dump( struct object *obj, int verbose ) { struct mapping *mapping = (struct mapping *)obj; @@ -682,8 +700,7 @@ DECL_HANDLER(get_mapping_info) struct mapping *mapping; struct fd *fd; - if ((mapping = (struct mapping *)get_handle_obj( current->process, req->handle, - req->access, &mapping_ops ))) + if ((mapping = get_mapping_obj( current->process, req->handle, req->access ))) { reply->size = mapping->size; reply->protect = mapping->protect; @@ -713,7 +730,7 @@ DECL_HANDLER(get_mapping_committed_range) { struct mapping *mapping; - if ((mapping = (struct mapping *)get_handle_obj( current->process, req->handle, 0, &mapping_ops ))) + if ((mapping = get_mapping_obj( current->process, req->handle, 0 ))) { if (!(req->offset & page_mask) && req->offset < mapping->size) reply->committed = find_committed_range( mapping, req->offset, &reply->size ); @@ -729,7 +746,7 @@ DECL_HANDLER(add_mapping_committed_range) { struct mapping *mapping; - if ((mapping = (struct mapping *)get_handle_obj( current->process, req->handle, 0, &mapping_ops ))) + if ((mapping = get_mapping_obj( current->process, req->handle, 0 ))) { if (!(req->size & page_mask) && !(req->offset & page_mask) && diff --git a/server/object.h b/server/object.h index 172c3f7..a8cb327 100644 --- a/server/object.h +++ b/server/object.h @@ -180,10 +180,6 @@ extern void generate_debug_event( struct thread *thread, int code, const void *a extern void generate_startup_debug_events( struct process *process, client_ptr_t entry ); extern void debug_exit_thread( struct thread *thread ); -/* mapping functions */ - -extern int get_page_size(void); - /* registry functions */ extern unsigned int get_prefix_cpu_mask(void);

1 0

Alexandre Julliard : server: Check sharing options when duplicating an fd object.
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: 35431ed0e7dece8676f5b4c01cbedbf7dee3df6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=35431ed0e7dece8676f5b4c01… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 18 13:41:32 2011 +0200 server: Check sharing options when duplicating an fd object. --- server/fd.c | 92 ++++++++++++++++++++++++++++++---------------------------- 1 files changed, 48 insertions(+), 44 deletions(-) diff --git a/server/fd.c b/server/fd.c index e0ec708..1743952 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1471,6 +1471,48 @@ static void fd_destroy( struct object *obj ) } } +/* check if the desired access is possible without violating */ +/* the sharing mode of other opens of the same file */ +static unsigned int check_sharing( struct fd *fd, unsigned int access, unsigned int sharing, + unsigned int open_flags, unsigned int options ) +{ + unsigned int existing_sharing = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; + unsigned int existing_access = 0; + struct list *ptr; + + fd->access = access; + fd->sharing = sharing; + + LIST_FOR_EACH( ptr, &fd->inode->open ) + { + struct fd *fd_ptr = LIST_ENTRY( ptr, struct fd, inode_entry ); + if (fd_ptr != fd) + { + /* if access mode is 0, sharing mode is ignored */ + if (fd_ptr->access) existing_sharing &= fd_ptr->sharing; + existing_access |= fd_ptr->access; + } + } + + if (((access & FILE_UNIX_READ_ACCESS) && !(existing_sharing & FILE_SHARE_READ)) || + ((access & FILE_UNIX_WRITE_ACCESS) && !(existing_sharing & FILE_SHARE_WRITE)) || + ((access & DELETE) && !(existing_sharing & FILE_SHARE_DELETE))) + return STATUS_SHARING_VIOLATION; + if (((existing_access & FILE_MAPPING_WRITE) && !(sharing & FILE_SHARE_WRITE)) || + ((existing_access & FILE_MAPPING_IMAGE) && (access & FILE_UNIX_WRITE_ACCESS))) + return STATUS_SHARING_VIOLATION; + if ((existing_access & FILE_MAPPING_IMAGE) && (options & FILE_DELETE_ON_CLOSE)) + return STATUS_CANNOT_DELETE; + if ((existing_access & FILE_MAPPING_ACCESS) && (open_flags & O_TRUNC)) + return STATUS_USER_MAPPED_FILE; + if (!access) return 0; /* if access mode is 0, sharing mode is ignored (except for mappings) */ + if (((existing_access & FILE_UNIX_READ_ACCESS) && !(sharing & FILE_SHARE_READ)) || + ((existing_access & FILE_UNIX_WRITE_ACCESS) && !(sharing & FILE_SHARE_WRITE)) || + ((existing_access & DELETE) && !(sharing & FILE_SHARE_DELETE))) + return STATUS_SHARING_VIOLATION; + return 0; +} + /* set the events that select waits for on this fd */ void set_fd_events( struct fd *fd, int events ) { @@ -1581,13 +1623,12 @@ struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *use /* duplicate an fd object for a different user */ struct fd *dup_fd_object( struct fd *orig, unsigned int access, unsigned int sharing, unsigned int options ) { + unsigned int err; struct fd *fd = alloc_fd_object(); if (!fd) return NULL; - fd->access = access; fd->options = options; - fd->sharing = sharing; fd->cacheable = orig->cacheable; if (orig->unix_name) @@ -1611,6 +1652,11 @@ struct fd *dup_fd_object( struct fd *orig, unsigned int access, unsigned int sha fd->closed = closed; fd->inode = (struct inode *)grab_object( orig->inode ); list_add_head( &fd->inode->open, &fd->inode_entry ); + if ((err = check_sharing( fd, access, sharing, 0, options ))) + { + set_error( err ); + goto failed; + } } else if ((fd->unix_fd = dup( orig->unix_fd )) == -1) { @@ -1630,48 +1676,6 @@ void set_no_fd_status( struct fd *fd, unsigned int status ) fd->no_fd_status = status; } -/* check if the desired access is possible without violating */ -/* the sharing mode of other opens of the same file */ -static unsigned int check_sharing( struct fd *fd, unsigned int access, unsigned int sharing, - unsigned int open_flags, unsigned int options ) -{ - unsigned int existing_sharing = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; - unsigned int existing_access = 0; - struct list *ptr; - - fd->access = access; - fd->sharing = sharing; - - LIST_FOR_EACH( ptr, &fd->inode->open ) - { - struct fd *fd_ptr = LIST_ENTRY( ptr, struct fd, inode_entry ); - if (fd_ptr != fd) - { - /* if access mode is 0, sharing mode is ignored */ - if (fd_ptr->access) existing_sharing &= fd_ptr->sharing; - existing_access |= fd_ptr->access; - } - } - - if (((access & FILE_UNIX_READ_ACCESS) && !(existing_sharing & FILE_SHARE_READ)) || - ((access & FILE_UNIX_WRITE_ACCESS) && !(existing_sharing & FILE_SHARE_WRITE)) || - ((access & DELETE) && !(existing_sharing & FILE_SHARE_DELETE))) - return STATUS_SHARING_VIOLATION; - if (((existing_access & FILE_MAPPING_WRITE) && !(sharing & FILE_SHARE_WRITE)) || - ((existing_access & FILE_MAPPING_IMAGE) && (access & FILE_SHARE_WRITE))) - return STATUS_SHARING_VIOLATION; - if ((existing_access & FILE_MAPPING_IMAGE) && (options & FILE_DELETE_ON_CLOSE)) - return STATUS_CANNOT_DELETE; - if ((existing_access & FILE_MAPPING_ACCESS) && (open_flags & O_TRUNC)) - return STATUS_USER_MAPPED_FILE; - if (!access) return 0; /* if access mode is 0, sharing mode is ignored (except for mappings) */ - if (((existing_access & FILE_UNIX_READ_ACCESS) && !(sharing & FILE_SHARE_READ)) || - ((existing_access & FILE_UNIX_WRITE_ACCESS) && !(sharing & FILE_SHARE_WRITE)) || - ((existing_access & DELETE) && !(sharing & FILE_SHARE_DELETE))) - return STATUS_SHARING_VIOLATION; - return 0; -} - /* sets the user of an fd that previously had no user */ void set_fd_user( struct fd *fd, const struct fd_ops *user_ops, struct object *user ) {

1 0

Huw Davies : gdi32: Clip solid brush fills.
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: 402f200c874f9a4b6f8c2ae8d60f0d98b3943727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=402f200c874f9a4b6f8c2ae8d… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 15 16:25:58 2011 +0100 gdi32: Clip solid brush fills. --- dlls/gdi32/dibdrv/objects.c | 40 ++++++++++++++----- dlls/gdi32/tests/dib.c | 88 +++++++++++++++++++++++++++++++----------- 2 files changed, 94 insertions(+), 34 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 2d006aa..c8fb7fe 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -275,20 +275,38 @@ COLORREF CDECL dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) */ static BOOL solid_brush(dibdrv_physdev *pdev, int num, RECT *rects) { - int i; - DC *dc = get_dibdrv_dc( &pdev->dev ); - - if(get_clip_region(dc)) return FALSE; + int i, j; + const WINEREGION *clip = get_wine_region(pdev->clip); - for(i = 0; i < num; i++) /* simple clip to extents */ + for(i = 0; i < num; i++) { - if(rects[i].left < dc->vis_rect.left) rects[i].left = dc->vis_rect.left; - if(rects[i].top < dc->vis_rect.top) rects[i].top = dc->vis_rect.top; - if(rects[i].right > dc->vis_rect.right) rects[i].right = dc->vis_rect.right; - if(rects[i].bottom > dc->vis_rect.bottom) rects[i].bottom = dc->vis_rect.bottom; - } + for(j = 0; j < clip->numRects; j++) + { + RECT rect = rects[i]; + + /* Optimize unclipped case */ + if(clip->rects[j].top <= rect.top && clip->rects[j].bottom >= rect.bottom && + clip->rects[j].left <= rect.left && clip->rects[j].right >= rect.right) + { + pdev->dib.funcs->solid_rects(&pdev->dib, 1, &rect, pdev->brush_and, pdev->brush_xor); + break; + } + + if(clip->rects[j].top >= rect.bottom) break; + if(clip->rects[j].bottom <= rect.top) continue; + + if(clip->rects[j].right > rect.left && clip->rects[j].left < rect.right) + { + rect.left = max(rect.left, clip->rects[j].left); + rect.top = max(rect.top, clip->rects[j].top); + rect.right = min(rect.right, clip->rects[j].right); + rect.bottom = min(rect.bottom, clip->rects[j].bottom); - pdev->dib.funcs->solid_rects(&pdev->dib, num, rects, pdev->brush_and, pdev->brush_xor); + pdev->dib.funcs->solid_rects(&pdev->dib, 1, &rect, pdev->brush_and, pdev->brush_xor); + } + } + } + release_wine_region(pdev->clip); return TRUE; } diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 90eb008..784d8d5 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -78,9 +78,10 @@ static const char *sha1_graphics_a8r8g8b8[] = "a3cadd34d95d3d5cc23344f69aab1c2e55935fcf", "2426172d9e8fec27d9228088f382ef3c93717da9", "9e8f27ca952cdba01dbf25d07c34e86a7820c012", - "76343ceb04e6295e0560019249d3c0318a23c8a6", - "6ecee6ba1c06dcb6b70ff42a8ea2df7803847860", "17b2c177bdce5e94433574a928bda5c94a8cdfa5", + "fe6cc678fb13a3ead67839481bf22348adc69f52", + "d51bd330cec510cdccf5394328bd8e5411901e9e", + "f2af53dd073a09b1031d0032d28da35c82adc566", NULL }; @@ -144,7 +145,7 @@ static void compare_hash(BITMAPINFO *bmi, BYTE *bits, const char ***sha1, const bmi->bmiHeader.biBitCount, info, **sha1, hash); (*sha1)++; } - else trace("\"%s\",\n", hash); + else ok(**sha1 != NULL, "missing hash, got \"%s\",\n", hash); HeapFree(GetProcessHeap(), 0, hash); } @@ -161,7 +162,11 @@ static const RECT hline_clips[] = {120, 99, 140, 99}, /* t edgecase clipped */ {120, 199, 140, 199}, /* b edgecase */ {120, 200, 140, 200}, /* b edgecase clipped */ - {120, 132, 310, 132} /* inside two clip rects */ + {120, 132, 310, 132}, /* inside two clip rects */ + { 10, 134, 101, 134}, /* r end on l edgecase */ + { 10, 136, 100, 136}, /* r end on l edgecase clipped */ + {199, 138, 220, 138}, /* l end on r edgecase */ + {200, 140, 220, 200} /* l end on r edgecase clipped */ }; static const RECT vline_clips[] = @@ -176,7 +181,32 @@ static const RECT vline_clips[] = {126, 99, 126, 140}, /* t edgecase clipped */ {128, 120, 128, 200}, /* b edgecase */ {130, 120, 130, 201}, /* b edgecase clipped */ - {132, 12, 132, 140} /* inside two clip rects */ + {132, 12, 132, 140}, /* inside two clip rects */ + {134, 90, 134, 101}, /* b end on t edgecase */ + {136, 90, 136, 100}, /* b end on t edgecase clipped */ + {138, 199, 138, 220}, /* t end on b edgecase */ + {140, 200, 140, 220} /* t end on b edgecase clipped */ +}; + +static const RECT patblt_clips[] = +{ + {120, 120, 140, 126}, /* unclipped */ + {100, 130, 140, 136}, /* l edgecase */ + { 99, 140, 140, 146}, /* l edgecase clipped */ + {180, 130, 200, 136}, /* r edgecase */ + {180, 140, 201, 146}, /* r edgecase clipped */ + {120, 100, 130, 110}, /* t edgecase */ + {140, 99, 150, 110}, /* t edgecase clipped */ + {120, 180, 130, 200}, /* b edgecase */ + {140, 180, 150, 201}, /* b edgecase */ + {199, 150, 210, 156}, /* l edge on r edgecase */ + {200, 160, 210, 166}, /* l edge on r edgecase clipped */ + { 90, 150, 101, 156}, /* r edge on l edgecase */ + { 90, 160, 100, 166}, /* r edge on l edgecase clipped */ + {160, 90, 166, 101}, /* b edge on t edgecase */ + {170, 90, 176, 101}, /* b edge on t edgecase clipped */ + {160, 199, 166, 210}, /* t edge on b edgecase */ + {170, 200, 176, 210}, /* t edge on b edgecase clipped */ }; static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sha1) @@ -221,6 +251,29 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh compare_hash(bmi, bits, sha1, "diagonal solid lines"); memset(bits, 0xcc, dib_size); + /* solid brush PatBlt */ + solid_brush = CreateSolidBrush(RGB(0x33, 0xaa, 0xff)); + orig_brush = SelectObject(hdc, solid_brush); + + for(i = 0, y = 10; i < 256; i++) + { + BOOL ret; + + ret = PatBlt(hdc, 10, y, 100, 10, rop3[i]); + + if(rop_uses_src(rop3[i])) + ok(ret == FALSE, "got TRUE for %x\n", rop3[i]); + else + { + ok(ret, "got FALSE for %x\n", rop3[i]); + y += 20; + } + + } + compare_hash(bmi, bits, sha1, "solid patblt"); + memset(bits, 0xcc, dib_size); + + /* clipped lines */ hrgn = CreateRectRgn(10, 10, 200, 20); hrgn2 = CreateRectRgn(100, 100, 200, 200); CombineRgn(hrgn, hrgn, hrgn2, RGN_OR); @@ -246,27 +299,16 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh compare_hash(bmi, bits, sha1, "clipped solid vlines"); memset(bits, 0xcc, dib_size); - ExtSelectClipRgn(hdc, NULL, RGN_COPY); - - solid_brush = CreateSolidBrush(RGB(0x33, 0xaa, 0xff)); - orig_brush = SelectObject(hdc, solid_brush); - - for(i = 0, y = 10; i < 256; i++) + for(i = 0; i < sizeof(patblt_clips) / sizeof(patblt_clips[0]); i++) { - BOOL ret; - - ret = PatBlt(hdc, 10, y, 100, 10, rop3[i]); + PatBlt(hdc, patblt_clips[i].left, patblt_clips[i].top, + patblt_clips[i].right - patblt_clips[i].left, + patblt_clips[i].bottom - patblt_clips[i].top, PATCOPY); + } + compare_hash(bmi, bits, sha1, "clipped patblt"); - if(rop_uses_src(rop3[i])) - ok(ret == FALSE, "got TRUE for %x\n", rop3[i]); - else - { - ok(ret, "got FALSE for %x\n", rop3[i]); - y += 20; - } + ExtSelectClipRgn(hdc, NULL, RGN_COPY); - } - compare_hash(bmi, bits, sha1, "solid patblt"); SelectObject(hdc, orig_brush); SelectObject(hdc, orig_pen);

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetTechniqueDesc().
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: d64eb4699f871a6bf002799194cea687ca0a8b97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d64eb4699f871a6bf00279919… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Apr 18 10:57:39 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetTechniqueDesc(). --- dlls/d3dx9_36/effect.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 595baba..dc67864 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -156,6 +156,21 @@ static inline D3DXHANDLE get_pass_handle(struct d3dx_pass *pass) return (D3DXHANDLE) pass; } +struct d3dx_technique *is_valid_technique(struct ID3DXBaseEffectImpl *base, D3DXHANDLE technique) +{ + unsigned int i; + + for (i = 0; i < base->technique_count; ++i) + { + if (base->technique_handles[i] == technique) + { + return get_technique_struct(technique); + } + } + + return NULL; +} + static void free_parameter(D3DXHANDLE handle, BOOL element, BOOL child) { unsigned int i; @@ -394,10 +409,21 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetParameterDesc(ID3DXBaseEffect *ifac static HRESULT WINAPI ID3DXBaseEffectImpl_GetTechniqueDesc(ID3DXBaseEffect *iface, D3DXHANDLE technique, D3DXTECHNIQUE_DESC *desc) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_technique *tech = technique ? is_valid_technique(This, technique) : get_technique_struct(This->technique_handles[0]); - FIXME("iface %p, technique %p, desc %p stub\n", This, technique, desc); + TRACE("iface %p, technique %p, desc %p\n", This, technique, desc); - return E_NOTIMPL; + if (!desc || !tech) + { + WARN("Invalid argument specified.\n"); + return D3DERR_INVALIDCALL; + } + + desc->Name = tech->name; + desc->Passes = tech->pass_count; + desc->Annotations = tech->annotation_count; + + return D3D_OK; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetPassDesc(ID3DXBaseEffect *iface, D3DXHANDLE pass, D3DXPASS_DESC *desc)

1 0

Andrew Nguyen : krnl386.exe: Fix size calculation in GetSystemDirectory16.
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: 43f283c0855d369690f1d747b051280f08b1c6bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=43f283c0855d369690f1d747b… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat Apr 16 03:37:29 2011 -0500 krnl386.exe: Fix size calculation in GetSystemDirectory16. --- dlls/krnl386.exe16/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/krnl386.exe16/file.c b/dlls/krnl386.exe16/file.c index 0a1098f..37c401a 100644 --- a/dlls/krnl386.exe16/file.c +++ b/dlls/krnl386.exe16/file.c @@ -628,11 +628,11 @@ UINT16 WINAPI GetWindowsDirectory16( LPSTR path, UINT16 count ) */ UINT16 WINAPI GetSystemDirectory16( LPSTR path, UINT16 count ) { - static const char * system16 = "\\SYSTEM"; + static const char system16[] = "\\SYSTEM"; char windir[MAX_PATH]; UINT16 len; - len = GetWindowsDirectory16(windir, sizeof(windir) - sizeof(system16)) + sizeof(system16); + len = GetWindowsDirectory16(windir, sizeof(windir) - sizeof(system16) + 1) + sizeof(system16); if (count >= len) { lstrcpyA(path, windir);

1 0

Francois Gouget : setupapi: Fix the SetupDiGetActualSectionToInstallEx() definition.
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: 0fa223d7ec643e3f5cf89ba54763eccc88b78e63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fa223d7ec643e3f5cf89ba54… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 18 11:12:31 2011 +0200 setupapi: Fix the SetupDiGetActualSectionToInstallEx() definition. --- include/setupapi.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/setupapi.h b/include/setupapi.h index c15ec52..baa5787 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1516,7 +1516,7 @@ BOOL WINAPI SetupDiGetActualSectionToInstallW(HINF, PCWSTR, PWSTR, DWORD, PD #define SetupDiGetActualSectionToInstall WINELIB_NAME_AW(SetupDiGetActualSectionToInstall) BOOL WINAPI SetupDiGetActualSectionToInstallExA(HINF, PCSTR, PSTR, DWORD, PDWORD, PSTR *, PVOID); BOOL WINAPI SetupDiGetActualSectionToInstallExW(HINF, PCWSTR, PWSTR, DWORD, PDWORD, PWSTR *, PVOID); -#define SetupDiGetActualSectionToInstallEx WINELIB_NAME_AW(SetupDiGetActualSectionToInstalExl) +#define SetupDiGetActualSectionToInstallEx WINELIB_NAME_AW(SetupDiGetActualSectionToInstallEx) BOOL WINAPI SetupDiGetClassBitmapIndex(const GUID *, PINT); BOOL WINAPI SetupDiGetClassDescriptionA(const GUID*, PSTR, DWORD, PDWORD); BOOL WINAPI SetupDiGetClassDescriptionW(const GUID*, PWSTR, DWORD, PDWORD);

1 0

Francois Gouget : msi: Move msi_get_cabinet_stream() up and make it static.
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: d685bfa548834db471aaaad9a938fe1ed1e40a71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d685bfa548834db471aaaad9a… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 18 11:19:31 2011 +0200 msi: Move msi_get_cabinet_stream() up and make it static. --- dlls/msi/media.c | 22 +++++++++++----------- dlls/msi/msipriv.h | 1 - 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index c261d7c..6675f2b 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -117,6 +117,17 @@ static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi) return r; } +static MSICABINETSTREAM *msi_get_cabinet_stream( MSIPACKAGE *package, UINT disk_id ) +{ + MSICABINETSTREAM *cab; + + LIST_FOR_EACH_ENTRY( cab, &package->cabinet_streams, MSICABINETSTREAM, entry ) + { + if (cab->disk_id == disk_id) return cab; + } + return NULL; +} + static void * CDECL cabinet_alloc(ULONG cb) { return msi_alloc(cb); @@ -919,14 +930,3 @@ UINT msi_add_cabinet_stream( MSIPACKAGE *package, UINT disk_id, IStorage *storag return ERROR_SUCCESS; } - -MSICABINETSTREAM *msi_get_cabinet_stream( MSIPACKAGE *package, UINT disk_id ) -{ - MSICABINETSTREAM *cab; - - LIST_FOR_EACH_ENTRY( cab, &package->cabinet_streams, MSICABINETSTREAM, entry ) - { - if (cab->disk_id == disk_id) return cab; - } - return NULL; -} diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index c132477..848fe01 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1018,7 +1018,6 @@ extern UINT ready_media(MSIPACKAGE *package, UINT Sequence, BOOL IsCompressed, M extern UINT msi_load_media_info(MSIPACKAGE *package, UINT Sequence, MSIMEDIAINFO *mi); extern void msi_free_media_info(MSIMEDIAINFO *mi); extern BOOL msi_cabextract(MSIPACKAGE* package, MSIMEDIAINFO *mi, LPVOID data); -extern MSICABINETSTREAM *msi_get_cabinet_stream(MSIPACKAGE *, UINT); extern UINT msi_add_cabinet_stream(MSIPACKAGE *, UINT, IStorage *, const WCHAR *); /* control event stuff */

1 0

Andrew Nguyen : wine.inf: Add a fake 16-bit DLL for mmsystem.dll.
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: 2b92e554a831e197b8e9b560593ffa5b7a0fdf41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b92e554a831e197b8e9b5605… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat Apr 16 03:37:34 2011 -0500 wine.inf: Add a fake 16-bit DLL for mmsystem.dll. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index d4a457b..ee23bb3 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2576,6 +2576,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,,winhlp32.exe 10,command,start.exe 10,system,ddeml.dll,ddeml.dll16 +10,system,mmsystem.dll,mmsystem.dll16 11,,ddhelp.exe 11,,dosx.exe 11,,dsound.vxd

1 0

Francois Gouget : mshtml: get_channelbsc_mon() is unused so remove it.
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: d69dd163ba262317c53ba72b9375f8a5832f344c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d69dd163ba262317c53ba72b9… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 18 11:18:25 2011 +0200 mshtml: get_channelbsc_mon() is unused so remove it. --- dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/navigate.c | 7 ------- 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 084cd08..94dddad 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -731,7 +731,6 @@ HRESULT bind_mon_to_buffer(HTMLDocumentNode*,IMoniker*,void**,DWORD*); HRESULT create_channelbsc(IMoniker*,WCHAR*,BYTE*,DWORD,nsChannelBSC**); HRESULT channelbsc_load_stream(nsChannelBSC*,IStream*); void channelbsc_set_channel(nsChannelBSC*,nsChannel*,nsIStreamListener*,nsISupports*); -IMoniker *get_channelbsc_mon(nsChannelBSC*); void set_ready_state(HTMLWindow*,READYSTATE); diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 990401a..78e747a 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1589,13 +1589,6 @@ HRESULT create_channelbsc(IMoniker *mon, WCHAR *headers, BYTE *post_data, DWORD return S_OK; } -IMoniker *get_channelbsc_mon(nsChannelBSC *This) -{ - if(This->bsc.mon) - IMoniker_AddRef(This->bsc.mon); - return This->bsc.mon; -} - void set_window_bscallback(HTMLWindow *window, nsChannelBSC *callback) { if(window->bscallback) {

1 0

Andrew Nguyen : wing32: Fix two typos in export names.
by Alexandre Julliard April 18, 2011

April 18, 2011

Module: wine Branch: master Commit: 6dab9cde4a89bfdf2b41565b88c164da9c69d73d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dab9cde4a89bfdf2b41565b8… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sat Apr 16 04:26:59 2011 -0500 wing32: Fix two typos in export names. --- dlls/wing32/wing32.c | 8 ++++---- dlls/wing32/wing32.spec | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wing32/wing32.c b/dlls/wing32/wing32.c index 3c6d3d9..ac74986 100644 --- a/dlls/wing32/wing32.c +++ b/dlls/wing32/wing32.c @@ -95,9 +95,9 @@ UINT WINAPI WinGGetDIBColorTable( HDC hdc, UINT start, UINT end, RGBQUAD *colors } /*********************************************************************** - * WinGCreateHalfTonePalette (WING32.@) + * WinGCreateHalftonePalette (WING32.@) */ -HPALETTE WINAPI WinGCreateHalfTonePalette( void ) +HPALETTE WINAPI WinGCreateHalftonePalette( void ) { HDC hdc; HPALETTE hpal; @@ -110,9 +110,9 @@ HPALETTE WINAPI WinGCreateHalfTonePalette( void ) } /*********************************************************************** - * WinGCreateHalfToneBrush (WING32.@) + * WinGCreateHalftoneBrush (WING32.@) */ -HBRUSH WINAPI WinGCreateHalfToneBrush( HDC hdc, COLORREF color, INT type ) +HBRUSH WINAPI WinGCreateHalftoneBrush( HDC hdc, COLORREF color, INT type ) { return CreateSolidBrush( color ); } diff --git a/dlls/wing32/wing32.spec b/dlls/wing32/wing32.spec index 67d3bb8..c2f361d 100644 --- a/dlls/wing32/wing32.spec +++ b/dlls/wing32/wing32.spec @@ -1,8 +1,8 @@ @ stdcall WinGBitBlt(long long long long long long long long) @ stdcall WinGCreateBitmap(long ptr ptr) @ stdcall WinGCreateDC() -@ stdcall WinGCreateHalfToneBrush(long long long) -@ stdcall WinGCreateHalfTonePalette() +@ stdcall WinGCreateHalftoneBrush(long long long) +@ stdcall WinGCreateHalftonePalette() @ stdcall WinGGetDIBColorTable(long long long ptr) @ stdcall WinGGetDIBPointer(long ptr) @ stdcall WinGRecommendDIBFormat(ptr)

1 0