March 2007 - Wine-commits - list.winehq.org

Alexandre Julliard : server: Add an open_file() function to the object operations.
by Alexandre Julliard 22 Mar '07

22 Mar '07

1 0

Alexandre Julliard : server: Implemented the open_file method for named pipe and mailslot devices.
by Alexandre Julliard 22 Mar '07

22 Mar '07

Module: wine Branch: master Commit: 94655c8493d938c3951fd9c2efd2c81253dd95a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94655c8493d938c3951fd9c2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 22 11:52:40 2007 +0100 server: Implemented the open_file method for named pipe and mailslot devices. --- dlls/ntdll/file.c | 1 + include/wine/server_protocol.h | 3 ++- server/fd.c | 10 ++++------ server/mailslot.c | 10 +++++++++- server/named_pipe.c | 10 +++++++++- server/protocol.def | 1 + server/trace.c | 1 + 7 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 0b22583..2a2f9d2 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -218,6 +218,7 @@ NTSTATUS WINAPI NtCreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATTRIB req->attributes = attr->Attributes; req->rootdir = attr->RootDirectory; req->sharing = sharing; + req->options = options; wine_server_add_data( req, attr->ObjectName->Buffer, attr->ObjectName->Length ); io->u.Status = wine_server_call( req ); *handle = reply->handle; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 726d833..c0d628f 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1035,6 +1035,7 @@ struct open_file_object_request unsigned int attributes; obj_handle_t rootdir; unsigned int sharing; + unsigned int options; /* VARARG(filename,unicode_str); */ }; struct open_file_object_reply @@ -4699,6 +4700,6 @@ union generic_reply struct allocate_locally_unique_id_reply allocate_locally_unique_id_reply; }; -#define SERVER_PROTOCOL_VERSION 285 +#define SERVER_PROTOCOL_VERSION 286 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/fd.c b/server/fd.c index cefdc16..fba6907 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1871,7 +1871,7 @@ DECL_HANDLER(open_file_object) { struct unicode_str name; struct directory *root = NULL; - struct object *obj; + struct object *obj, *result; get_req_unicode_str( &name ); if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) @@ -1879,12 +1879,10 @@ DECL_HANDLER(open_file_object) if ((obj = open_object_dir( root, &name, req->attributes, NULL ))) { - /* make sure this is a valid file object */ - struct fd *fd = get_obj_fd( obj ); - if (fd) + if ((result = obj->ops->open_file( obj, req->access, req->sharing, req->options ))) { - reply->handle = alloc_handle( current->process, obj, req->access, req->attributes ); - release_object( fd ); + reply->handle = alloc_handle( current->process, result, req->access, req->attributes ); + release_object( result ); } release_object( obj ); } diff --git a/server/mailslot.c b/server/mailslot.c index af2b25b..9391e13 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -154,6 +154,8 @@ static void mailslot_device_dump( struct object *obj, int verbose ); static struct fd *mailslot_device_get_fd( struct object *obj ); static struct object *mailslot_device_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); +static struct object *mailslot_device_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ); static void mailslot_device_destroy( struct object *obj ); static enum server_fd_type mailslot_device_get_file_info( struct fd *fd, int *flags ); @@ -169,7 +171,7 @@ static const struct object_ops mailslot_device_ops = mailslot_device_get_fd, /* get_fd */ no_map_access, /* map_access */ mailslot_device_lookup_name, /* lookup_name */ - no_open_file, /* open_file */ + mailslot_device_open_file, /* open_file */ fd_close_handle, /* close_handle */ mailslot_device_destroy /* destroy */ }; @@ -293,6 +295,12 @@ static struct object *mailslot_device_lookup_name( struct object *obj, struct un return found; } +static struct object *mailslot_device_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ) +{ + return grab_object( obj ); +} + static void mailslot_device_destroy( struct object *obj ) { struct mailslot_device *device = (struct mailslot_device*)obj; diff --git a/server/named_pipe.c b/server/named_pipe.c index 0e1aeab..e121c91 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -202,6 +202,8 @@ static void named_pipe_device_dump( struct object *obj, int verbose ); static struct fd *named_pipe_device_get_fd( struct object *obj ); static struct object *named_pipe_device_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); +static struct object *named_pipe_device_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ); static void named_pipe_device_destroy( struct object *obj ); static enum server_fd_type named_pipe_device_get_file_info( struct fd *fd, int *flags ); @@ -217,7 +219,7 @@ static const struct object_ops named_pipe_device_ops = named_pipe_device_get_fd, /* get_fd */ pipe_map_access, /* map_access */ named_pipe_device_lookup_name, /* lookup_name */ - no_open_file, /* open_file */ + named_pipe_device_open_file, /* open_file */ fd_close_handle, /* close_handle */ named_pipe_device_destroy /* destroy */ }; @@ -434,6 +436,12 @@ static struct object *named_pipe_device_lookup_name( struct object *obj, struct return found; } +static struct object *named_pipe_device_open_file( struct object *obj, unsigned int access, + unsigned int sharing, unsigned int options ) +{ + return grab_object( obj ); +} + static void named_pipe_device_destroy( struct object *obj ) { struct named_pipe_device *device = (struct named_pipe_device*)obj; diff --git a/server/protocol.def b/server/protocol.def index 1e7cb8b..8e7875c 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -861,6 +861,7 @@ enum event_op { PULSE_EVENT, SET_EVENT, RESET_EVENT }; unsigned int attributes; /* open attributes */ obj_handle_t rootdir; /* root directory */ unsigned int sharing; /* sharing flags */ + unsigned int options; /* file options */ VARARG(filename,unicode_str); /* file name */ @REPLY obj_handle_t handle; /* handle to the file */ diff --git a/server/trace.c b/server/trace.c index ed42650..c3ffe18 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1249,6 +1249,7 @@ static void dump_open_file_object_request( const struct open_file_object_request fprintf( stderr, " attributes=%08x,", req->attributes ); fprintf( stderr, " rootdir=%p,", req->rootdir ); fprintf( stderr, " sharing=%08x,", req->sharing ); + fprintf( stderr, " options=%08x,", req->options ); fprintf( stderr, " filename=" ); dump_varargs_unicode_str( cur_size ); }

1 0

Ken Thomases : Revert "gdi32: Disable the freetype mmap sharing on Mac OS." .
by Alexandre Julliard 22 Mar '07

22 Mar '07

Module: wine Branch: master Commit: df605c0ac3a1294b71416cec5da213b956295e06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df605c0ac3a1294b71416cec5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 21 18:36:39 2007 -0500 Revert "gdi32: Disable the freetype mmap sharing on Mac OS.". This reverts ae9f68dec91cd6ac66a99dc62d69dc53eaf910d0 commit. Because of commit 4e6860433e72714ed1e500eb523710656e71ba02 which extracts the constituent fonts from Mac suitcase fonts, we can use mmap on font files on the Mac. --- dlls/gdi32/freetype.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 31b3429..f7b1220 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2205,7 +2205,6 @@ static LONG calc_ppem_for_height(FT_Face ft_face, LONG height) static struct font_mapping *map_font( const char *name ) { -#ifndef __APPLE__ /* Mac OS fonts use resource forks, we can't simply mmap them */ struct font_mapping *mapping; struct stat st; int fd; @@ -2242,7 +2241,6 @@ static struct font_mapping *map_font( const char *name ) error: close( fd ); -#endif return NULL; } @@ -2265,11 +2263,13 @@ static FT_Face OpenFontFile(GdiFont *font, char *file, FT_Long face_index, LONG TRACE("%s, %ld, %d x %d\n", debugstr_a(file), face_index, width, height); - if ((font->mapping = map_font( file ))) - err = pFT_New_Memory_Face(library, font->mapping->data, font->mapping->size, face_index, &ft_face); - else - err = pFT_New_Face(library, file, face_index, &ft_face); + if (!(font->mapping = map_font( file ))) + { + WARN("failed to map %s\n", debugstr_a(file)); + return 0; + } + err = pFT_New_Memory_Face(library, font->mapping->data, font->mapping->size, face_index, &ft_face); if(err) { ERR("FT_New_Face rets %d\n", err); return 0;

1 0

Andrew Talbot : comctl32: Constify some variables.
by Alexandre Julliard 22 Mar '07

22 Mar '07

Module: wine Branch: master Commit: f76d076f8e43773be300929f7345f4ad9704292b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f76d076f8e43773be300929f7… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Mar 21 21:51:22 2007 +0000 comctl32: Constify some variables. --- dlls/comctl32/comboex.c | 40 +++++++++++++++++++++------------------- 1 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 1598c99..64e7b12 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -151,7 +151,7 @@ static inline LPCSTR debugstr_txt(LPCWSTR str) return debugstr_w(str); } -static void COMBOEX_DumpItem (CBE_ITEMDATA *item) +static void COMBOEX_DumpItem (CBE_ITEMDATA const *item) { TRACE("item %p - mask=%08x, pszText=%p, cchTM=%d, iImage=%d\n", item, item->mask, item->pszText, item->cchTextMax, item->iImage); @@ -162,7 +162,7 @@ static void COMBOEX_DumpItem (CBE_ITEMDATA *item) } -static void COMBOEX_DumpInput (COMBOBOXEXITEMW *input) +static void COMBOEX_DumpInput (COMBOBOXEXITEMW const *input) { TRACE("input - mask=%08x, iItem=%d, pszText=%p, cchTM=%d, iImage=%d\n", input->mask, input->iItem, input->pszText, input->cchTextMax, @@ -180,7 +180,7 @@ static inline CBE_ITEMDATA *get_item_data(COMBOEX_INFO *infoPtr, INT index) (WPARAM)index, 0); } -static inline cmp_func_t get_cmp_func(COMBOEX_INFO *infoPtr) +static inline cmp_func_t get_cmp_func(COMBOEX_INFO const *infoPtr) { return infoPtr->dwExtStyle & CBES_EX_CASESENSITIVE ? lstrcmpW : lstrcmpiW; } @@ -283,11 +283,11 @@ static void COMBOEX_FreeText (CBE_ITEMDATA *item) } -static INT COMBOEX_GetIndex(COMBOEX_INFO *infoPtr, CBE_ITEMDATA *item) +static INT COMBOEX_GetIndex(COMBOEX_INFO const *infoPtr, CBE_ITEMDATA const *item) { - CBE_ITEMDATA *moving; + CBE_ITEMDATA const *moving; INT index; - + moving = infoPtr->items; index = infoPtr->nb_items - 1; @@ -493,7 +493,7 @@ static CBE_ITEMDATA * COMBOEX_FindItem(COMBOEX_INFO *infoPtr, INT index) } -static inline BOOL COMBOEX_HasEdit(COMBOEX_INFO *infoPtr) +static inline BOOL COMBOEX_HasEdit(COMBOEX_INFO const *infoPtr) { return infoPtr->hwndEdit ? TRUE : FALSE; } @@ -530,7 +530,7 @@ static UINT COMBOEX_GetListboxText(COMBOEX_INFO *infoPtr, int n, LPWSTR buf) static INT COMBOEX_DeleteItem (COMBOEX_INFO *infoPtr, INT index) { - CBE_ITEMDATA *item; + CBE_ITEMDATA const *item; TRACE("(index=%d)\n", index); @@ -601,14 +601,14 @@ static BOOL COMBOEX_GetItemA (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA *cit) } -static inline BOOL COMBOEX_HasEditChanged (COMBOEX_INFO *infoPtr) +static inline BOOL COMBOEX_HasEditChanged (COMBOEX_INFO const *infoPtr) { return COMBOEX_HasEdit(infoPtr) && (infoPtr->flags & WCBE_EDITHASCHANGED) == WCBE_EDITHASCHANGED; } -static INT COMBOEX_InsertItemW (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit) +static INT COMBOEX_InsertItemW (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW const *cit) { INT index; CBE_ITEMDATA *item; @@ -693,7 +693,7 @@ static INT COMBOEX_InsertItemW (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit) } -static INT COMBOEX_InsertItemA (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA *cit) +static INT COMBOEX_InsertItemA (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA const *cit) { COMBOBOXEXITEMW citW; LPWSTR wstr = NULL; @@ -817,7 +817,7 @@ static BOOL COMBOEX_SetItemW (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMW *cit) return TRUE; } -static BOOL COMBOEX_SetItemA (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA *cit) +static BOOL COMBOEX_SetItemA (COMBOEX_INFO *infoPtr, COMBOBOXEXITEMA const *cit) { COMBOBOXEXITEMW citW; LPWSTR wstr = NULL; @@ -875,7 +875,8 @@ COMBOEX_FindStringExact (COMBOEX_INFO *infoPtr, INT start, LPCWSTR str) static DWORD_PTR COMBOEX_GetItemData (COMBOEX_INFO *infoPtr, INT index) { - CBE_ITEMDATA *item1, *item2; + CBE_ITEMDATA const *item1; + CBE_ITEMDATA const *item2; DWORD_PTR ret = 0; item1 = get_item_data(infoPtr, index); @@ -914,7 +915,8 @@ static INT COMBOEX_SetCursel (COMBOEX_INFO *infoPtr, INT index) static DWORD_PTR COMBOEX_SetItemData (COMBOEX_INFO *infoPtr, INT index, DWORD_PTR data) { - CBE_ITEMDATA *item1, *item2; + CBE_ITEMDATA *item1; + CBE_ITEMDATA const *item2; item1 = get_item_data(infoPtr, index); if ((item1 != NULL) && ((LRESULT)item1 != CB_ERR)) { @@ -933,7 +935,7 @@ static DWORD_PTR COMBOEX_SetItemData (COMBOEX_INFO *infoPtr, INT index, DWORD_PT } -static INT COMBOEX_SetItemHeight (COMBOEX_INFO *infoPtr, INT index, UINT height) +static INT COMBOEX_SetItemHeight (COMBOEX_INFO const *infoPtr, INT index, UINT height) { RECT cb_wrect, cbx_wrect, cbx_crect; @@ -967,7 +969,7 @@ static INT COMBOEX_SetItemHeight (COMBOEX_INFO *infoPtr, INT index, UINT height) /* *** WM_xxx message support *** */ -static LRESULT COMBOEX_Create (HWND hwnd, LPCREATESTRUCTA cs) +static LRESULT COMBOEX_Create (HWND hwnd, CREATESTRUCTA const *cs) { static const WCHAR COMBOBOX[] = { 'C', 'o', 'm', 'b', 'o', 'B', 'o', 'x', 0 }; static const WCHAR EDIT[] = { 'E', 'D', 'I', 'T', 0 }; @@ -1287,7 +1289,7 @@ static LRESULT COMBOEX_Command (COMBOEX_INFO *infoPtr, WPARAM wParam, LPARAM lPa } -static BOOL COMBOEX_WM_DeleteItem (COMBOEX_INFO *infoPtr, DELETEITEMSTRUCT *dis) +static BOOL COMBOEX_WM_DeleteItem (COMBOEX_INFO *infoPtr, DELETEITEMSTRUCT const *dis) { CBE_ITEMDATA *item, *olditem; NMCOMBOBOXEXW nmcit; @@ -1333,7 +1335,7 @@ static BOOL COMBOEX_WM_DeleteItem (COMBOEX_INFO *infoPtr, DELETEITEMSTRUCT *dis) } -static LRESULT COMBOEX_DrawItem (COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT *dis) +static LRESULT COMBOEX_DrawItem (COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT const *dis) { static const WCHAR nil[] = { 0 }; CBE_ITEMDATA *item = 0; @@ -1606,7 +1608,7 @@ static LRESULT COMBOEX_Destroy (COMBOEX_INFO *infoPtr) } -static LRESULT COMBOEX_MeasureItem (COMBOEX_INFO *infoPtr, MEASUREITEMSTRUCT *mis) +static LRESULT COMBOEX_MeasureItem (COMBOEX_INFO const *infoPtr, MEASUREITEMSTRUCT *mis) { static const WCHAR strW[] = { 'W', 0 }; SIZE mysize;

1 0

Andrew Talbot : msg711.acm: Replace inline static with static inline.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: a97d79e2119bfa6ce61d87ac4888d42e232e9249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a97d79e2119bfa6ce61d87ac4… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Mar 21 18:01:47 2007 +0000 msg711.acm: Replace inline static with static inline. --- dlls/msg711.acm/msg711.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c index 1b94134..b53524f 100644 --- a/dlls/msg711.acm/msg711.c +++ b/dlls/msg711.acm/msg711.c @@ -389,7 +389,7 @@ static const unsigned short _a2l[] = { 0x02B0, 0x0290, 0x02F0, 0x02D0, 0x0230, 0x0210, 0x0270, 0x0250, 0x03B0, 0x0390, 0x03F0, 0x03D0, 0x0330, 0x0310, 0x0370, 0x0350, }; -inline static int +static inline int alaw2linear(unsigned char a_val) { return (short)_a2l[a_val];

1 0

Andrew Talbot : kernel32/tests: Replace inline static with static inline.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: c261a75a6fa27c8462719d169e489e5b60859bf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c261a75a6fa27c8462719d169… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Mar 21 18:02:05 2007 +0000 kernel32/tests: Replace inline static with static inline. --- dlls/kernel32/tests/locale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 2efa6f8..ee1dc5c 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -55,7 +55,7 @@ static inline WCHAR *strchrW( const WCHAR *str, WCHAR ch ) return NULL; } -inline static int isdigitW( WCHAR wc ) +static inline int isdigitW( WCHAR wc ) { WORD type; GetStringTypeW( CT_CTYPE1, &wc, 1, &type );

1 0

Andrew Talbot : mlang/tests: Replace inline static with static inline.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: a96340becb79328ca6fade09e86535c09f76cb44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a96340becb79328ca6fade09e… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Mar 21 18:01:00 2007 +0000 mlang/tests: Replace inline static with static inline. --- dlls/mlang/tests/mlang.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 471f54a..53060fd 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -216,7 +216,7 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) ok(lenA == expected_len, "expected lenA %u, got %u\n", expected_len, lenA); } -inline static void cpinfo_cmp(MIMECPINFO *cpinfo1, MIMECPINFO *cpinfo2) +static inline void cpinfo_cmp(MIMECPINFO *cpinfo1, MIMECPINFO *cpinfo2) { ok(cpinfo1->dwFlags == cpinfo2->dwFlags, "dwFlags mismatch: %08x != %08x\n", cpinfo1->dwFlags, cpinfo2->dwFlags); ok(cpinfo1->uiCodePage == cpinfo2->uiCodePage, "uiCodePage mismatch: %u != %u\n", cpinfo1->uiCodePage, cpinfo2->uiCodePage); @@ -499,7 +499,7 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) IEnumCodePage_Release(iEnumCP); } -inline static void scriptinfo_cmp(SCRIPTINFO *sinfo1, SCRIPTINFO *sinfo2) +static inline void scriptinfo_cmp(SCRIPTINFO *sinfo1, SCRIPTINFO *sinfo2) { ok(sinfo1->ScriptId == sinfo2->ScriptId, "ScriptId mismatch: %d != %d\n", sinfo1->ScriptId, sinfo2->ScriptId); ok(sinfo1->uiCodePage == sinfo2->uiCodePage, "uiCodePage mismatch: %u != %u\n", sinfo1->uiCodePage, sinfo2->uiCodePage);

1 0

Paul Vriens : wininet/ftp: Remove unneeded check.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: 5f9d7745dc589eab47e0550aa7a2025fc7b31e86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f9d7745dc589eab47e0550aa… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Mar 21 17:55:56 2007 +0100 wininet/ftp: Remove unneeded check. --- dlls/wininet/ftp.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 526c65e..73d51e8 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2801,9 +2801,6 @@ static BOOL FTP_RetrieveFileData(LPWININETFTPSESSIONW lpwfs, INT nDataSocket, DW TRACE("\n"); - if (INVALID_HANDLE_VALUE == hFile) - return FALSE; - lpszBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CHAR)*DATA_PACKET_SIZE); if (NULL == lpszBuffer) {

1 0

Paul Vriens : wininet/ftp: Fix potential memory leak.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: 611acf5201c4823899a8c0d37c806af30033dcaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=611acf5201c4823899a8c0d37… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Mar 21 17:56:09 2007 +0100 wininet/ftp: Fix potential memory leak. --- dlls/wininet/ftp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 73d51e8..40026fd 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2825,9 +2825,10 @@ static BOOL FTP_RetrieveFileData(LPWININETFTPSESSIONW lpwfs, INT nDataSocket, DW } TRACE("Data transfer complete\n"); - HeapFree(GetProcessHeap(), 0, lpszBuffer); recv_end: + HeapFree(GetProcessHeap(), 0, lpszBuffer); + return (nRC != -1); }

1 0

Stefan Dösinger : wined3d: Store the pixel format in the texture.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: 2cdbd9a53d378e7253fbb54002ed056c59e171e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cdbd9a53d378e7253fbb5400… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 20 23:01:15 2007 +0100 wined3d: Store the pixel format in the texture. --- dlls/wined3d/device.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index da1b8c9..7863714 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -823,6 +823,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, U object->pow2scalingFactorY = (((float)Height) / ((float)pow2Height)); TRACE(" xf(%f) yf(%f)\n", object->pow2scalingFactorX, object->pow2scalingFactorY); + object->baseTexture.format = Format; + /* Calculate levels for mip mapping */ if (Levels == 0) { TRACE("calculating levels %d\n", object->baseTexture.levels); @@ -896,6 +898,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *ifa object->width = Width; object->height = Height; object->depth = Depth; + object->baseTexture.format = Format; /* Calculate levels for mip mapping */ if (Levels == 0) { @@ -1011,6 +1014,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface /* TODO: support for native non-power 2 */ /* Precalculated scaling for 'faked' non power of two texture coords */ object->pow2scalingFactor = ((float)EdgeLength) / ((float)pow2EdgeLength); + object->baseTexture.format = Format; /* Calculate levels for mip mapping */ if (Levels == 0) {

1 0