February 2008 - Wine-Commits

Alexandre Julliard : server: Unlink remaining children inodes when deleting the parent.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: 037afca5a5c9c2561e5072e118a8a384a01ee814 URL: http://source.winehq.org/git/wine.git/?a=commit;h=037afca5a5c9c2561e5072e11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 28 10:47:14 2008 +0100 server: Unlink remaining children inodes when deleting the parent. --- server/change.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/server/change.c b/server/change.c index 590a1cb..2266621 100644 --- a/server/change.c +++ b/server/change.c @@ -438,6 +438,7 @@ static void inode_set_name( struct inode *inode, const char *name ) static void free_inode( struct inode *inode ) { int subtree = 0, watches = 0; + struct inode *tmp, *next; struct dir *dir; LIST_FOR_EACH_ENTRY( dir, &inode->dirs, struct dir, in_entry ) @@ -448,7 +449,6 @@ static void free_inode( struct inode *inode ) if (!subtree && !inode->parent) { - struct inode *tmp, *next; LIST_FOR_EACH_ENTRY_SAFE( tmp, next, &inode->children, struct inode, ch_entry ) { @@ -464,6 +464,13 @@ static void free_inode( struct inode *inode ) if (inode->parent) list_remove( &inode->ch_entry ); + /* disconnect remaining children from the parent */ + LIST_FOR_EACH_ENTRY_SAFE( tmp, next, &inode->children, struct inode, ch_entry ) + { + list_remove( &tmp->ch_entry ); + tmp->parent = NULL; + } + if (inode->wd != -1) { inotify_remove_watch( get_unix_fd( inotify_fd ), inode->wd );

1 0

Andrew Talbot : gdi32: Assign to structs instead of using memcpy.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: a4e8f4dcdd40d21dfad1e8075690a12b0367b3d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4e8f4dcdd40d21dfad1e8075… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Feb 27 21:21:10 2008 +0000 gdi32: Assign to structs instead of using memcpy. --- dlls/gdi32/freetype.c | 28 ++++++++++++++-------------- dlls/gdi32/gdi16.c | 2 +- dlls/gdi32/gdiobj.c | 2 +- dlls/gdi32/pen.c | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ca50d35..b92c0be 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1220,7 +1220,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ TRACE("pix_h %d charset %d dpi %dx%d pt %d\n", winfnt_header.pixel_height, winfnt_header.charset, winfnt_header.vertical_resolution,winfnt_header.horizontal_resolution, winfnt_header.nominal_point_size); if(TranslateCharsetInfo((DWORD*)(UINT_PTR)winfnt_header.charset, &csi, TCI_SRCCHARSET)) - memcpy(&fs, &csi.fs, sizeof(csi.fs)); + fs = csi.fs; internal_leading = winfnt_header.internal_leading; } #endif @@ -1278,7 +1278,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ face->font_version = pHeader ? pHeader->Font_Revision : 0; face->family = family; face->external = (flags & ADDFONT_EXTERNAL_FONT) ? TRUE : FALSE; - memcpy(&face->fs, &fs, sizeof(face->fs)); + face->fs = fs; memset(&face->fs_links, 0, sizeof(face->fs_links)); if(FT_IS_SCALABLE(ft_face)) { @@ -1513,7 +1513,7 @@ static BOOL init_system_links(void) { LIST_FOR_EACH_ENTRY(face, &family->faces, Face, entry) { - memcpy(&face->fs_links, &fs, sizeof(fs)); + face->fs_links = fs; } } list_add_tail(&system_links, &font_link->entry); @@ -2784,7 +2784,7 @@ static GdiFont *find_in_cache(HFONT hfont, LOGFONTW *plf, XFORM *pxf, BOOL can_u HFONTLIST *hflist; struct list *font_elem_ptr, *hfontlist_elem_ptr; - memcpy(&fd.lf, plf, sizeof(LOGFONTW)); + fd.lf = *plf; memcpy(&fd.matrix, pxf, sizeof(FMAT2)); fd.can_use_bitmap = can_use_bitmap; calc_hash(&fd); @@ -3003,7 +3003,7 @@ GdiFont *WineEngCreateFontInstance(DC *dc, HFONT hfont) ret = alloc_font(); memcpy(&ret->font_desc.matrix, &dc->xformWorld2Vport, sizeof(FMAT2)); - memcpy(&ret->font_desc.lf, &lf, sizeof(LOGFONTW)); + ret->font_desc.lf = lf; ret->font_desc.can_use_bitmap = can_use_bitmap; calc_hash(&ret->font_desc); hflist = HeapAlloc(GetProcessHeap(), 0, sizeof(*hflist)); @@ -3209,7 +3209,7 @@ found: ret->fake_italic = (it && !face->Italic); ret->fake_bold = (bd && !face->Bold); - memcpy(&ret->fs, &face->fs, sizeof(FONTSIGNATURE)); + ret->fs = face->fs; if(csi.fs.fsCsb[0]) { ret->charset = lf.lfCharSet; @@ -3378,8 +3378,8 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, if (face->cached_enum_data) { TRACE("Cached\n"); - memcpy(pelf, &face->cached_enum_data->elf, sizeof(ENUMLOGFONTEXW)); - memcpy(pntm, &face->cached_enum_data->ntm, sizeof(NEWTEXTMETRICEXW)); + *pelf = face->cached_enum_data->elf; + *pntm = face->cached_enum_data->ntm; *ptype = face->cached_enum_data->type; return; } @@ -3434,7 +3434,7 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, pntm->ntmTm.ntmFlags = face->ntmFlags; pntm->ntmTm.ntmCellHeight = pntm->ntmTm.tmHeight; pntm->ntmTm.ntmAvgWidth = pntm->ntmTm.tmAveCharWidth; - memcpy(&pntm->ntmFontSig, &face->fs, sizeof(FONTSIGNATURE)); + pntm->ntmFontSig = face->fs; pelf->elfScript[0] = '\0'; /* This will get set in WineEngEnumFonts */ @@ -3463,8 +3463,8 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, face->cached_enum_data = HeapAlloc(GetProcessHeap(), 0, sizeof(*face->cached_enum_data)); if (face->cached_enum_data) { - memcpy(&face->cached_enum_data->elf, pelf, sizeof(ENUMLOGFONTEXW)); - memcpy(&face->cached_enum_data->ntm, pntm, sizeof(NEWTEXTMETRICEXW)); + face->cached_enum_data->elf = *pelf; + face->cached_enum_data->ntm = *pntm; face->cached_enum_data->type = *ptype; } @@ -3506,7 +3506,7 @@ DWORD WineEngEnumFonts(LPLOGFONTW plf, FONTENUMPROCW proc, LPARAM lparam) if(psub) { TRACE("substituting %s -> %s\n", debugstr_w(plf->lfFaceName), debugstr_w(psub->to.name)); - memcpy(&lf, plf, sizeof(lf)); + lf = *plf; strcpyW(lf.lfFaceName, psub->to.name); plf = &lf; } @@ -4305,7 +4305,7 @@ BOOL WineEngGetTextMetrics(GdiFont *font, LPTEXTMETRICW ptm) LeaveCriticalSection( &freetype_cs ); return FALSE; } - memcpy(ptm, &font->potm->otmTextMetrics, sizeof(*ptm)); + *ptm = font->potm->otmTextMetrics; scale_font_metrics(font, ptm); LeaveCriticalSection( &freetype_cs ); return TRUE; @@ -4885,7 +4885,7 @@ INT WineEngGetTextFace(GdiFont *font, INT count, LPWSTR str) UINT WineEngGetTextCharsetInfo(GdiFont *font, LPFONTSIGNATURE fs, DWORD flags) { - if (fs) memcpy(fs, &font->fs, sizeof(FONTSIGNATURE)); + if (fs) *fs = font->fs; return font->charset; } diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index a638581..31c0ffc 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -184,7 +184,7 @@ static void newtextmetricex_W_to_16( const NEWTEXTMETRICEXW *ptmW, ptm16->ntmTm.ntmSizeEM = ptmW->ntmTm.ntmSizeEM; ptm16->ntmTm.ntmCellHeight = ptmW->ntmTm.ntmCellHeight; ptm16->ntmTm.ntmAvgWidth = ptmW->ntmTm.ntmAvgWidth; - memcpy(&ptm16->ntmFontSig, &ptmW->ntmFontSig, sizeof(FONTSIGNATURE)); + ptm16->ntmFontSig = ptmW->ntmFontSig; } /* diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 34dafaf..a4f2fb5 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -608,7 +608,7 @@ BOOL GDI_Init(void) /* For the default gui font, we use the lfHeight member in deffonts as a place-holder for the point size so we must convert this into a true height */ - memcpy(&default_gui_font, &deffonts->DefaultGuiFont, sizeof(default_gui_font)); + default_gui_font = deffonts->DefaultGuiFont; default_gui_font.lfHeight = -MulDiv(default_gui_font.lfHeight, get_dpi(), 72); stock_objects[DEFAULT_GUI_FONT] = CreateFontIndirectW( &default_gui_font ); diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index 81fcc1d..a047c65 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -265,7 +265,7 @@ static INT PEN_GetObject( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ) count == sizeof(EXTLOGPEN)) { EXTLOGPEN *elp = buffer; - memcpy(elp, &pen->logpen, sizeof(EXTLOGPEN)); + *elp = pen->logpen; elp->elpWidth = 0; return sizeof(EXTLOGPEN); }

1 0

Rob Shearman : rpcrt4: Add tests for RpcStringBindingParseA.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: f7628b69b07c0b11312985613325709beb87ed04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7628b69b07c0b11312985613… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 27 19:03:04 2008 +0000 rpcrt4: Add tests for RpcStringBindingParseA. --- dlls/rpcrt4/tests/rpc.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 57973e5..ace8aff 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -533,6 +533,83 @@ static void test_I_RpcMapWin32Status(void) } } +static void test_RpcStringBindingParseA(void) +{ + static unsigned char valid_binding[] = "00000000-0000-0000-c000-000000000046(a)ncacn_np:.[endpoint=\\pipe\\test]"; + static unsigned char valid_binding2[] = "00000000-0000-0000-c000-000000000046(a)ncacn_np:.[\\pipe\\test]"; + static unsigned char invalid_uuid_binding[] = "{00000000-0000-0000-c000-000000000046}@ncacn_np:.[endpoint=\\pipe\\test]"; + static unsigned char invalid_ep_binding[] = "00000000-0000-0000-c000-000000000046(a)ncacn_np:.[endpoint=test]"; + static unsigned char invalid_binding[] = "00000000-0000-0000-c000-000000000046(a)ncacn_np"; + RPC_STATUS status; + unsigned char *uuid; + unsigned char *protseq; + unsigned char *network_addr; + unsigned char *endpoint; + unsigned char *options; + + /* test all parameters */ + status = RpcStringBindingParseA(valid_binding, &uuid, &protseq, &network_addr, &endpoint, &options); + ok(status == RPC_S_OK, "RpcStringBindingParseA failed with error %ld\n", status); + ok(!strcmp((char *)uuid, "00000000-0000-0000-c000-000000000046"), "uuid should have been 00000000-0000-0000-C000-000000000046 instead of %s\n", uuid); + ok(!strcmp((char *)protseq, "ncacn_np"), "protseq should have been ncacn_np instead of %s\n", protseq); + ok(!strcmp((char *)network_addr, "."), "network_addr should have been . instead of %s\n", network_addr); + todo_wine + ok(!strcmp((char *)endpoint, "pipetest"), "endpoint should have been pipetest instead of %s\n", endpoint); + todo_wine + ok(options && !strcmp((char *)options, ""), "options should have been \"\" of \"%s\"\n", options); + RpcStringFreeA(&uuid); + RpcStringFreeA(&protseq); + RpcStringFreeA(&network_addr); + RpcStringFreeA(&endpoint); + RpcStringFreeA(&options); + + /* test all parameters with different type of string binding */ + status = RpcStringBindingParseA(valid_binding2, &uuid, &protseq, &network_addr, &endpoint, &options); + ok(status == RPC_S_OK, "RpcStringBindingParseA failed with error %ld\n", status); + ok(!strcmp((char *)uuid, "00000000-0000-0000-c000-000000000046"), "uuid should have been 00000000-0000-0000-C000-000000000046 instead of %s\n", uuid); + ok(!strcmp((char *)protseq, "ncacn_np"), "protseq should have been ncacn_np instead of %s\n", protseq); + ok(!strcmp((char *)network_addr, "."), "network_addr should have been . instead of %s\n", network_addr); + todo_wine + ok(!strcmp((char *)endpoint, "pipetest"), "endpoint should have been pipetest instead of %s\n", endpoint); + todo_wine + ok(options && !strcmp((char *)options, ""), "options should have been \"\" of \"%s\"\n", options); + RpcStringFreeA(&uuid); + RpcStringFreeA(&protseq); + RpcStringFreeA(&network_addr); + RpcStringFreeA(&endpoint); + RpcStringFreeA(&options); + + /* test with as many parameters NULL as possible */ + status = RpcStringBindingParseA(valid_binding, NULL, &protseq, NULL, NULL, NULL); + ok(status == RPC_S_OK, "RpcStringBindingParseA failed with error %ld\n", status); + ok(!strcmp((char *)protseq, "ncacn_np"), "protseq should have been ncacn_np instead of %s\n", protseq); + RpcStringFreeA(&protseq); + + /* test with invalid uuid */ + status = RpcStringBindingParseA(invalid_uuid_binding, NULL, &protseq, NULL, NULL, NULL); + todo_wine + ok(status == RPC_S_INVALID_STRING_UUID, "RpcStringBindingParseA should have returned RPC_S_INVALID_STRING_UUID instead of %ld\n", status); + todo_wine + ok(protseq == NULL, "protseq was %p instead of NULL\n", protseq); + + /* test with invalid endpoint */ + status = RpcStringBindingParseA(invalid_ep_binding, NULL, &protseq, NULL, NULL, NULL); + ok(status == RPC_S_OK, "RpcStringBindingParseA failed with error %ld\n", status); + RpcStringFreeA(&protseq); + + /* test with invalid binding */ + status = RpcStringBindingParseA(invalid_binding, &uuid, &protseq, &network_addr, &endpoint, &options); + todo_wine + ok(status == RPC_S_INVALID_STRING_BINDING, "RpcStringBindingParseA should have returned RPC_S_INVALID_STRING_BINDING instead of %ld\n", status); + todo_wine + ok(uuid == NULL, "uuid was %p instead of NULL\n", uuid); + ok(protseq == NULL, "protseq was %p instead of NULL\n", protseq); + todo_wine + ok(network_addr == NULL, "network_addr was %p instead of NULL\n", network_addr); + ok(endpoint == NULL, "endpoint was %p instead of NULL\n", endpoint); + ok(options == NULL, "options was %p instead of NULL\n", options); +} + START_TEST( rpc ) { trace ( " ** Uuid Conversion and Comparison Tests **\n" ); @@ -542,4 +619,5 @@ START_TEST( rpc ) test_rpc_ncacn_ip_tcp(); test_towers(); test_I_RpcMapWin32Status(); + test_RpcStringBindingParseA(); }

1 0

Rob Shearman : rpcrt4: Don't crash in RpcStringBindingParseA/ W if Endpoint or Options is NULL.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: 5fce2d88394704851eab3e88b460e098ebfb4648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fce2d88394704851eab3e88b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 27 19:02:54 2008 +0000 rpcrt4: Don't crash in RpcStringBindingParseA/W if Endpoint or Options is NULL. --- dlls/rpcrt4/rpc_binding.c | 50 ++++++++++++++++++++++++++++---------------- 1 files changed, 32 insertions(+), 18 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 3a8afde..19272af 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -468,6 +468,7 @@ RPC_STATUS WINAPI RpcStringBindingParseA( RPC_CSTR StringBinding, RPC_CSTR *ObjU { CHAR *data, *next; static const char ep_opt[] = "endpoint="; + BOOL endpoint_already_found = FALSE; TRACE("(%s,%p,%p,%p,%p,%p)\n", debugstr_a((char*)StringBinding), ObjUuid, Protseq, NetworkAddr, Endpoint, Options); @@ -513,22 +514,28 @@ RPC_STATUS WINAPI RpcStringBindingParseA( RPC_CSTR StringBinding, RPC_CSTR *ObjU next = strchr(opt, '='); if (!next) { /* not an option, must be an endpoint */ - if (*Endpoint) goto fail; - *Endpoint = (unsigned char*) opt; + if (endpoint_already_found) goto fail; + if (Endpoint) *Endpoint = (unsigned char*) opt; + else HeapFree(GetProcessHeap(), 0, opt); + endpoint_already_found = TRUE; } else { if (strncmp(opt, ep_opt, strlen(ep_opt)) == 0) { /* endpoint option */ - if (*Endpoint) goto fail; - *Endpoint = (unsigned char*) RPCRT4_strdupA(next+1); + if (endpoint_already_found) goto fail; + if (Endpoint) *Endpoint = (unsigned char*) RPCRT4_strdupA(next+1); HeapFree(GetProcessHeap(), 0, opt); + endpoint_already_found = TRUE; } else { /* network option */ - if (*Options) { - /* FIXME: this is kind of inefficient */ - *Options = (unsigned char*) RPCRT4_strconcatA( (char*)*Options, opt); + if (Options) { + if (*Options) { + /* FIXME: this is kind of inefficient */ + *Options = (unsigned char*) RPCRT4_strconcatA( (char*)*Options, opt); + HeapFree(GetProcessHeap(), 0, opt); + } else + *Options = (unsigned char*) opt; + } else HeapFree(GetProcessHeap(), 0, opt); - } else - *Options = (unsigned char*) opt; } } } @@ -559,6 +566,7 @@ RPC_STATUS WINAPI RpcStringBindingParseW( RPC_WSTR StringBinding, RPC_WSTR *ObjU { WCHAR *data, *next; static const WCHAR ep_opt[] = {'e','n','d','p','o','i','n','t','=',0}; + BOOL endpoint_already_found = FALSE; TRACE("(%s,%p,%p,%p,%p,%p)\n", debugstr_w(StringBinding), ObjUuid, Protseq, NetworkAddr, Endpoint, Options); @@ -604,22 +612,28 @@ RPC_STATUS WINAPI RpcStringBindingParseW( RPC_WSTR StringBinding, RPC_WSTR *ObjU next = strchrW(opt, '='); if (!next) { /* not an option, must be an endpoint */ - if (*Endpoint) goto fail; - *Endpoint = opt; + if (endpoint_already_found) goto fail; + if (Endpoint) *Endpoint = opt; + else HeapFree(GetProcessHeap(), 0, opt); + endpoint_already_found = TRUE; } else { if (strncmpW(opt, ep_opt, strlenW(ep_opt)) == 0) { /* endpoint option */ - if (*Endpoint) goto fail; - *Endpoint = RPCRT4_strdupW(next+1); + if (endpoint_already_found) goto fail; + if (Endpoint) *Endpoint = RPCRT4_strdupW(next+1); HeapFree(GetProcessHeap(), 0, opt); + endpoint_already_found = TRUE; } else { /* network option */ - if (*Options) { - /* FIXME: this is kind of inefficient */ - *Options = RPCRT4_strconcatW(*Options, opt); + if (Options) { + if (*Options) { + /* FIXME: this is kind of inefficient */ + *Options = RPCRT4_strconcatW(*Options, opt); + HeapFree(GetProcessHeap(), 0, opt); + } else + *Options = opt; + } else HeapFree(GetProcessHeap(), 0, opt); - } else - *Options = opt; } } }

1 0

Rob Shearman : dinput: Include fcntl.h instead of sys/fcntl. h since they are equivalent and the former is more portable.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: 376be08a7cde6b8b335c8d3e86c3ef36039e690f URL: http://source.winehq.org/git/wine.git/?a=commit;h=376be08a7cde6b8b335c8d3e8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 27 19:02:45 2008 +0000 dinput: Include fcntl.h instead of sys/fcntl.h since they are equivalent and the former is more portable. --- dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 4b0085c..f375978 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -38,7 +38,7 @@ #ifdef HAVE_SYS_TIME_H # include <sys/time.h> #endif -#include <sys/fcntl.h> +#include <fcntl.h> #ifdef HAVE_SYS_IOCTL_H # include <sys/ioctl.h> #endif diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 18a7e54..c31fc28 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -34,7 +34,7 @@ #ifdef HAVE_SYS_TIME_H # include <sys/time.h> #endif -#include <sys/fcntl.h> +#include <fcntl.h> #ifdef HAVE_SYS_IOCTL_H # include <sys/ioctl.h> #endif

1 0

Rob Shearman : dbghelp: Define NONAMELESSUNION in dwarf.c and type. c as they access VARIANT fields directly.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: 97a9ca3f4ae96541b2a1c2f3a263c21a521c06b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97a9ca3f4ae96541b2a1c2f3a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 27 19:02:39 2008 +0000 dbghelp: Define NONAMELESSUNION in dwarf.c and type.c as they access VARIANT fields directly. --- dlls/dbghelp/dwarf.c | 2 ++ dlls/dbghelp/type.c | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 81f3c7f..8965f7f 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION + #include "config.h" #include <sys/types.h> diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 7978a1c..aeb3e75 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -21,6 +21,9 @@ * Note: This really doesn't do much at the moment, but it forms the framework * upon which full support for datatype handling will eventually be built. */ + +#define NONAMELESSUNION + #include "config.h" #include <stdlib.h> #include <stdarg.h>

1 0

Mikołaj Zalewski : net: Add Polish translation.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: 2b93de3e7e4434a3f8632bf178f281b4739d5b7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b93de3e7e4434a3f8632bf17… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Feb 27 21:12:03 2008 +0100 net: Add Polish translation. --- programs/net/Pl.rc | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/programs/net/Pl.rc b/programs/net/Pl.rc new file mode 100644 index 0000000..01250b7 --- /dev/null +++ b/programs/net/Pl.rc @@ -0,0 +1,44 @@ +/* + * NET.EXE - Wine-compatible net program + * Polish language support + * + * Copyright (C) 2007 Tim Schwartz + * Copyright (C) 2008 Mikolaj Zalewski + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_USAGE, "Sk�adnia polecenia:\n\nNET [ HELP | START | STOP ]\n" + STRING_START_USAGE, "Podaj nazw� serwisu do uruchomienia.\n" + STRING_STOP_USAGE, "Podaj nazw� serwidu do zatrzymania.\n" + STRING_STOP_DEP, "Zatrzymuj� serwis: %s\n" + STRING_CANT_STOP, "Nie uda�o si� zatrzyma� serwisu %s\n" + STRING_NO_SCM, "Nie uda�o si� otrzyma� uchwytu do mened�era serwis�w.\n" + STRING_NO_SVCHANDLE, "Nie uda�o si� uzyska� uchwytu do serwisu.\n" + STRING_START_SVC, "Serwis %s jest uruchamiany...\n" + STRING_START_SVC_SUCCESS, "Serwis %s zosta� pomy�lnie uruchamiany.\n" + STRING_START_SVC_FAIL, "Uruchomienie serwisu %s nie powiod�o si�.\n" + STRING_STOP_SVC, "Serwis %s jest zatrzymywany...\n" + STRING_STOP_SVC_SUCCESS, "Serwis %s zosta� pomy�lnie zatrzymany.\n" + STRING_STOP_SVC_FAIL, "Zatrzymanie serwisu %s nie powiod�o si�.\n" + STRING_HELP_USAGE, "Sk�adnia tego polecenia:\n\nNET HELP polecenie\n -lub-\nNET polecenie /HELP\n\n Dost�pne polecenia:\n NET HELP NET START NET STOP\n" + STRING_NO_ENTRIES, "There are no entries in the list.\n" + STRING_USE_HEADER, "\nStatus Lokalny Zdalny\n---------------------------------------------------------------\n" + STRING_USE_ENTRY, "%s %S %S Otwarte zasoby: %lu\n" +}

1 0

Mikołaj Zalewski : wordpad: Always use RB_GETBARHEIGHT .
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: e2e20662003c30638a113030f95d49e36af3c861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2e20662003c30638a113030f… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Feb 27 18:21:40 2008 +0100 wordpad: Always use RB_GETBARHEIGHT. --- programs/wordpad/wordpad.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index e4a6502..300376a 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2269,7 +2269,6 @@ static LRESULT OnSize( HWND hWnd, WPARAM wParam, LPARAM lParam ) HWND hwndReBar = GetDlgItem(hWnd, IDC_REBAR); HWND hRulerWnd = GetDlgItem(hWnd, IDC_RULER); int rebarHeight = 0; - int rebarRows = 2; if (hwndStatusBar) { @@ -2285,13 +2284,7 @@ static LRESULT OnSize( HWND hWnd, WPARAM wParam, LPARAM lParam ) } if (hwndReBar) { - if(!is_bar_visible(BANDID_TOOLBAR)) - rebarRows--; - - if(!is_bar_visible(BANDID_FORMATBAR)) - rebarRows--; - - rebarHeight = rebarRows ? SendMessageW(hwndReBar, RB_GETBARHEIGHT, 0, 0) : 0; + rebarHeight = SendMessageW(hwndReBar, RB_GETBARHEIGHT, 0, 0); MoveWindow(hwndReBar, 0, 0, LOWORD(lParam), rebarHeight, TRUE); }

1 0

Mikołaj Zalewski : comctl32: rebar: Don' t assume the first band is visible.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: 23b0085a25a1b2872f5c27a4379c3eb5a0d8db38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23b0085a25a1b2872f5c27a43… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Feb 27 18:20:12 2008 +0100 comctl32: rebar: Don't assume the first band is visible. The code required that a row started with a visible band. However this was not met if the first band of the rebar was hidden. The new code should fix this case. I've also made it explicit in the comments that the functions require the first band to be visible and renamed next_band, prev_band to next_visible and prev_visible to make it clear what these functions do. --- dlls/comctl32/rebar.c | 87 ++++++++++++++++++++++++++++++++++-------------- 1 files changed, 61 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=23b0085a25a1b2872f5c2…

1 0

Mikołaj Zalewski : comctl32: rebar: To check if an image is present iImage should be compared to -1 ( with testcase).
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: 4d0bad870cc70ba34e2db95f4df44d3f829c84e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d0bad870cc70ba34e2db95f4… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Feb 27 17:00:37 2008 +0100 comctl32: rebar: To check if an image is present iImage should be compared to -1 (with testcase). --- dlls/comctl32/rebar.c | 2 +- dlls/comctl32/tests/rebar.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 54f186d..5a40e32 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1572,7 +1572,7 @@ REBAR_ValidateBand (const REBAR_INFO *infoPtr, REBAR_BAND *lpBand) } /* image is visible */ - if ((lpBand->fMask & RBBIM_IMAGE) && (infoPtr->himl)) { + if (lpBand->iImage != -1 && (infoPtr->himl)) { lpBand->fStatus |= HAS_IMAGE; if (infoPtr->dwStyle & CCS_VERT) { header += (infoPtr->imageSize.cy + REBAR_POST_IMAGE); diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 8615cc3..0dd659c 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -261,6 +261,16 @@ rbsize_result_t rbsize_results[] = { { {328, 0, 511, 28}, 0x00, 183}, { {511, 0, 672, 28}, 0x00, 161}, { { 0, 28, 672, 56}, 0x00, 200}, }, }, + { {0, 0, 672, 40}, 40, 2, {20, 20, }, 5, { + { { 0, 0, 114, 20}, 0x00, 40}, { {114, 0, 328, 20}, 0x00, 214}, + { {328, 0, 511, 20}, 0x00, 183}, { {511, 0, 672, 20}, 0x00, 161}, + { { 0, 20, 672, 40}, 0x00, 200}, + }, }, + { {0, 0, 672, 56}, 56, 2, {28, 28, }, 5, { + { { 0, 0, 114, 28}, 0x00, 40}, { {114, 0, 328, 28}, 0x00, 214}, + { {328, 0, 511, 28}, 0x00, 183}, { {511, 0, 672, 28}, 0x00, 161}, + { { 0, 28, 672, 56}, 0x00, 200}, + }, }, { {0, 0, 672, 0}, 0, 0, {0, }, 0, {{{0, 0, 0, 0}, 0, 0}, }, }, { {0, 0, 672, 65}, 65, 1, {65, }, 3, { @@ -428,6 +438,16 @@ static void layout_test(void) SendMessage(hRebar, RB_SETBANDINFO, 1, (LPARAM)&rbi); check_sizes(); + /* after removing it everything is back to normal*/ + rbi.iImage = -1; + SendMessage(hRebar, RB_SETBANDINFO, 1, (LPARAM)&rbi); + check_sizes(); + + /* Only -1 means that the image is not present. Other invalid values increase the height */ + rbi.iImage = -2; + SendMessage(hRebar, RB_SETBANDINFO, 1, (LPARAM)&rbi); + check_sizes(); + /* VARHEIGHT resizing test on a horizontal rebar */ rebuild_rebar(&hRebar); SetWindowLong(hRebar, GWL_STYLE, GetWindowLong(hRebar, GWL_STYLE) | RBS_AUTOSIZE);

1 0