February 2007 - Wine-commits

Aric Stewart : user32: We are calculating the height for the drop down based on
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: ea60a508b1810ea9f901f0cd4cf5f0bae4690525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea60a508b1810ea9f901f0cd4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Feb 2 15:04:23 2007 -0600 user32: We are calculating the height for the drop down based on number of items however the if statement used nIHeight (just the height of 1 item) and not nHeight (the height all the items). --- dlls/user32/combo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index badb2ef..7e54ea8 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1116,7 +1116,7 @@ static void CBDropDown( LPHEADCOMBO lphc if (nHeight < nDroppedHeight - COMBO_YBORDERSIZE()) nDroppedHeight = nHeight + COMBO_YBORDERSIZE(); - if (nDroppedHeight < nIHeight) + if (nDroppedHeight < nHeight) { if (nItems < 5) nDroppedHeight = (nItems+1)*nIHeight;

1 0

Clinton Stimpson : user32: Add test cases for update rects affected by ShowWindow.
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: 7432a715ed7782615da1023f9b94bd6a40d99f1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7432a715ed7782615da1023f9… Author: Clinton Stimpson <cjstimpson(a)utwire.net> Date: Tue Feb 6 23:15:09 2007 -0700 user32: Add test cases for update rects affected by ShowWindow. --- dlls/user32/tests/win.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 735c8aa..ef456ca 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4162,6 +4162,42 @@ void test_gettext(void) UnregisterClass( clsname, NULL ); } +static void test_GetUpdateRect(void) +{ + RECT rc1, rc2; + HWND hgrandparent, hparent, hchild; + + hgrandparent = CreateWindowA("static", "grandparent", WS_OVERLAPPEDWINDOW, + 0, 0, 100, 100, NULL, NULL, 0, NULL); + + hparent = CreateWindowA("static", "parent", WS_CHILD|WS_VISIBLE, + 0, 0, 100, 100, hgrandparent, NULL, 0, NULL); + + hchild = CreateWindowA("static", "child", WS_CHILD|WS_VISIBLE, + 10, 10, 30, 30, hparent, NULL, 0, NULL); + + ShowWindow(hgrandparent, SW_SHOW); + UpdateWindow(hgrandparent); + + ShowWindow(hchild, SW_HIDE); + SetRect(&rc2, 0, 0, 0, 0); + GetUpdateRect(hgrandparent, &rc1, FALSE); + todo_wine + { + ok(EqualRect(&rc1, &rc2), "rects do not match (%d,%d,%d,%d) / (%d,%d,%d,%d)\n", + rc1.left, rc1.top, rc1.right, rc1.bottom, + rc2.left, rc2.top, rc2.right, rc2.bottom); + } + + SetRect(&rc2, 10, 10, 40, 40); + GetUpdateRect(hparent, &rc1, FALSE); + ok(EqualRect(&rc1, &rc2), "rects do not match (%d,%d,%d,%d) / (%d,%d,%d,%d)\n", + rc1.left, rc1.top, rc1.right, rc1.bottom, + rc2.left, rc2.top, rc2.right, rc2.bottom); + + DestroyWindow(hgrandparent); +} + START_TEST(win) { pGetAncestor = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetAncestor" ); @@ -4240,6 +4276,7 @@ START_TEST(win) test_SetWindowLong(); test_ShowWindow(); test_gettext(); + test_GetUpdateRect(); /* add the tests above this line */ UnhookWindowsHookEx(hhook);

1 0

Alexandre Julliard : widl: Only recognize attribute keywords inside an attribute list.
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: 24ded9e69aa7c71c18f3164a4449969b035d5c13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24ded9e69aa7c71c18f3164a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 7 17:50:17 2007 +0100 widl: Only recognize attribute keywords inside an attribute list. --- tools/widl/parser.l | 226 +++++++++++++++++++++++++-------------------------- tools/widl/parser.y | 8 -- 2 files changed, 111 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24ded9e69aa7c71c18f31…

1 0

Alexandre Julliard : widl: Add a string list type and use it for the endpoint attribute.
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: cc9a07f19409097fdd48e4855e9a8ddbdc7b9b4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc9a07f19409097fdd48e4855… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 7 17:54:33 2007 +0100 widl: Add a string list type and use it for the endpoint attribute. --- tools/widl/parser.y | 25 ++++++++++++++++++++++++- tools/widl/widltypes.h | 7 +++++++ 2 files changed, 31 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 3331709..0d03b03 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -64,6 +64,7 @@ # endif #endif +static str_list_t *append_str(str_list_t *list, char *str); static attr_list_t *append_attr(attr_list_t *list, attr_t *attr); static attr_t *make_attr(enum attr_type type); static attr_t *make_attrv(enum attr_type type, unsigned long val); @@ -122,6 +123,7 @@ static void check_arg(var_t *arg); %union { attr_t *attr; attr_list_t *attr_list; + str_list_t *str_list; expr_t *expr; expr_list_t *expr_list; array_dims_t *array_dims; @@ -223,6 +225,7 @@ static void check_arg(var_t *arg); %type <attr> attribute %type <attr_list> m_attributes attributes attrib_list +%type <str_list> str_list %type <expr> m_expr expr expr_const %type <expr_list> m_exprs /* exprs expr_list */ expr_list_const %type <array_dims> array array_list @@ -386,6 +389,10 @@ attrib_list: attribute | attrib_list ']' '[' attribute { $$ = append_attr( $1, $4 ); } ; +str_list: aSTRING { $$ = append_str( NULL, $1 ); } + | str_list ',' aSTRING { $$ = append_str( $1, $3 ); } + ; + attribute: { $$ = NULL; } | tAGGREGATABLE { $$ = make_attr(ATTR_AGGREGATABLE); } | tAPPOBJECT { $$ = make_attr(ATTR_APPOBJECT); } @@ -406,7 +413,7 @@ attribute: { $$ = NULL; } | tDISPLAYBIND { $$ = make_attr(ATTR_DISPLAYBIND); } | tDLLNAME '(' aSTRING ')' { $$ = make_attrp(ATTR_DLLNAME, $3); } | tDUAL { $$ = make_attr(ATTR_DUAL); } - | tENDPOINT '(' aSTRING ')' { $$ = make_attrp(ATTR_ENDPOINT, $3); } + | tENDPOINT '(' str_list ')' { $$ = make_attrp(ATTR_ENDPOINT, $3); } | tENTRY '(' aSTRING ')' { $$ = make_attrp(ATTR_ENTRY_STRING, $3); } | tENTRY '(' expr_const ')' { $$ = make_attrp(ATTR_ENTRY_ORDINAL, $3); } | tEXPLICITHANDLE { $$ = make_attr(ATTR_EXPLICIT_HANDLE); } @@ -907,6 +914,22 @@ void init_types(void) decl_builtin("handle_t", RPC_FC_BIND_PRIMITIVE); } +static str_list_t *append_str(str_list_t *list, char *str) +{ + struct str_list_entry_t *entry; + + if (!str) return list; + if (!list) + { + list = xmalloc( sizeof(*list) ); + list_init( list ); + } + entry = xmalloc( sizeof(*entry) ); + entry->str = str; + list_add_tail( list, &entry->entry ); + return list; +} + static attr_list_t *append_attr(attr_list_t *list, attr_t *attr) { if (!attr) return list; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index faaac6a..29ebd5e 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -47,6 +47,7 @@ typedef struct _importinfo_t importinfo_ typedef struct _typelib_t typelib_t; typedef struct list attr_list_t; +typedef struct list str_list_t; typedef struct list func_list_t; typedef struct list expr_list_t; typedef struct list var_list_t; @@ -162,6 +163,12 @@ enum type_kind TKIND_MAX }; +struct str_list_entry_t +{ + char *str; + struct list entry; +}; + struct _attr_t { enum attr_type type; union {

1 0

Alexandre Julliard : widl: Output endpoint information in client and server files.
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: 94ee8e8fac3cf0988127a779ee7bf17c01b54a26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94ee8e8fac3cf0988127a779e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 7 17:55:09 2007 +0100 widl: Output endpoint information in client and server files. --- tools/widl/client.c | 15 +++++++++++++-- tools/widl/server.c | 15 +++++++++++++-- tools/widl/typegen.c | 35 +++++++++++++++++++++++++++++++++++ tools/widl/typegen.h | 1 + 4 files changed, 62 insertions(+), 4 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 5fcffeb..3322a07 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -330,6 +330,9 @@ static void write_clientinterfacedecl(ty { unsigned long ver = get_attrv(iface->attrs, ATTR_VERSION); const UUID *uuid = get_attrp(iface->attrs, ATTR_UUID); + const str_list_t *endpoints = get_attrp(iface->attrs, ATTR_ENDPOINT); + + if (endpoints) write_endpoints( client, iface->name, endpoints ); print_client("static const RPC_CLIENT_INTERFACE %s___RpcClientInterface =\n", iface->name ); print_client("{\n"); @@ -341,8 +344,16 @@ static void write_clientinterfacedecl(ty uuid->Data4[7], LOWORD(ver), HIWORD(ver)); print_client("{{0x8a885d04,0x1ceb,0x11c9,{0x9f,0xe8,0x08,0x00,0x2b,0x10,0x48,0x60}},{2,0}},\n"); /* FIXME */ print_client("0,\n"); - print_client("0,\n"); - print_client("0,\n"); + if (endpoints) + { + print_client("%u,\n", list_count(endpoints)); + print_client("(PRPC_PROTSEQ_ENDPOINT)%s__RpcProtseqEndpoint,\n", iface->name); + } + else + { + print_client("0,\n"); + print_client("0,\n"); + } print_client("0,\n"); print_client("0,\n"); print_client("0,\n"); diff --git a/tools/widl/server.c b/tools/widl/server.c index 75b9647..831d7ac 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -358,6 +358,9 @@ static void write_serverinterfacedecl(ty { unsigned long ver = get_attrv(iface->attrs, ATTR_VERSION); UUID *uuid = get_attrp(iface->attrs, ATTR_UUID); + const str_list_t *endpoints = get_attrp(iface->attrs, ATTR_ENDPOINT); + + if (endpoints) write_endpoints( server, iface->name, endpoints ); print_server("extern RPC_DISPATCH_TABLE %s_v%d_%d_DispatchTable;\n", iface->name, LOWORD(ver), HIWORD(ver)); fprintf(server, "\n"); @@ -371,8 +374,16 @@ static void write_serverinterfacedecl(ty uuid->Data4[7], LOWORD(ver), HIWORD(ver)); print_server("{{0x8a885d04,0x1ceb,0x11c9,{0x9f,0xe8,0x08,0x00,0x2b,0x10,0x48,0x60}},{2,0}},\n"); /* FIXME */ print_server("&%s_v%d_%d_DispatchTable,\n", iface->name, LOWORD(ver), HIWORD(ver)); - print_server("0,\n"); - print_server("0,\n"); + if (endpoints) + { + print_server("%u,\n", list_count(endpoints)); + print_server("(PRPC_PROTSEQ_ENDPOINT)%s__RpcProtseqEndpoint,\n", iface->name); + } + else + { + print_server("0,\n"); + print_server("0,\n"); + } print_server("0,\n"); print_server("0,\n"); print_server("0,\n"); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 72d32fc..b72e87b 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2417,3 +2417,38 @@ void write_expr_eval_routine_list(FILE * fprintf(file, "};\n\n"); } + + +void write_endpoints( FILE *f, const char *prefix, const str_list_t *list ) +{ + const struct str_list_entry_t *endpoint; + const char *p; + + /* this should be an array of RPC_PROTSEQ_ENDPOINT but we want const strings */ + print_file( f, 0, "static const unsigned char * %s__RpcProtseqEndpoint[][2] =\n{\n", prefix ); + LIST_FOR_EACH_ENTRY( endpoint, list, const struct str_list_entry_t, entry ) + { + print_file( f, 1, "{ (const unsigned char *)\"" ); + for (p = endpoint->str; *p && *p != ':'; p++) + { + if (*p == '"' || *p == '\\') fputc( '\\', f ); + fputc( *p, f ); + } + if (!*p) goto error; + if (p[1] != '[') goto error; + + fprintf( f, "\", (const unsigned char *)\"" ); + for (p += 2; *p && *p != ']'; p++) + { + if (*p == '"' || *p == '\\') fputc( '\\', f ); + fputc( *p, f ); + } + if (*p != ']') goto error; + fprintf( f, "\" },\n" ); + } + print_file( f, 0, "};\n\n" ); + return; + +error: + error("Invalid endpoint syntax '%s'\n", endpoint->str); +} diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index 2fa4728..eda259b 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -49,3 +49,4 @@ void assign_stub_out_args( FILE *file, i void declare_stub_args( FILE *file, int indent, const func_t *func ); int write_expr_eval_routines(FILE *file, const char *iface); void write_expr_eval_routine_list(FILE *file, const char *iface); +void write_endpoints( FILE *f, const char *prefix, const str_list_t *list );

1 0

Alexandre Julliard : msvcrt: Implement fopen/wfopen on top of fsopen/ wfsopen instead of the other way around.
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: 2851b31f4cbda7698eee796d1b2c3c47215858ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=2851b31f4cbda7698eee796d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 7 13:25:29 2007 +0100 msvcrt: Implement fopen/wfopen on top of fsopen/wfsopen instead of the other way around. --- dlls/msvcrt/file.c | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 0cd098b..952f64c 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2356,9 +2356,9 @@ MSVCRT_wint_t CDECL _fputwchar(MSVCRT_wi } /********************************************************************* - * fopen (MSVCRT.@) + * _fsopen (MSVCRT.@) */ -MSVCRT_FILE* CDECL MSVCRT_fopen(const char *path, const char *mode) +MSVCRT_FILE * CDECL MSVCRT__fsopen(const char *path, const char *mode, int share) { MSVCRT_FILE* file; int open_flags, stream_flags, fd; @@ -2370,7 +2370,7 @@ MSVCRT_FILE* CDECL MSVCRT_fopen(const ch return NULL; LOCK_FILES(); - fd = _open(path, open_flags, MSVCRT__S_IREAD | MSVCRT__S_IWRITE); + fd = MSVCRT__sopen(path, open_flags, share, MSVCRT__S_IREAD | MSVCRT__S_IWRITE); if (fd < 0) file = NULL; else if ((file = msvcrt_alloc_fp()) && msvcrt_init_fp(file, fd, stream_flags) @@ -2390,9 +2390,9 @@ MSVCRT_FILE* CDECL MSVCRT_fopen(const ch } /********************************************************************* - * _wfopen (MSVCRT.@) + * _wfsopen (MSVCRT.@) */ -MSVCRT_FILE * CDECL MSVCRT__wfopen(const MSVCRT_wchar_t *path, const MSVCRT_wchar_t *mode) +MSVCRT_FILE * CDECL MSVCRT__wfsopen(const MSVCRT_wchar_t *path, const MSVCRT_wchar_t *mode, int share) { const unsigned int plen = strlenW(path), mlen = strlenW(mode); char *patha = MSVCRT_calloc(plen + 1, 1); @@ -2404,7 +2404,7 @@ MSVCRT_FILE * CDECL MSVCRT__wfopen(const WideCharToMultiByte(CP_ACP,0,path,plen,patha,plen,NULL,NULL) && WideCharToMultiByte(CP_ACP,0,mode,mlen,modea,mlen,NULL,NULL)) { - MSVCRT_FILE *retval = MSVCRT_fopen(patha,modea); + MSVCRT_FILE *retval = MSVCRT__fsopen(patha,modea,share); MSVCRT_free(patha); MSVCRT_free(modea); return retval; @@ -2415,22 +2415,19 @@ MSVCRT_FILE * CDECL MSVCRT__wfopen(const } /********************************************************************* - * _fsopen (MSVCRT.@) + * fopen (MSVCRT.@) */ -MSVCRT_FILE* CDECL MSVCRT__fsopen(const char *path, const char *mode, int share) +MSVCRT_FILE * CDECL MSVCRT_fopen(const char *path, const char *mode) { - FIXME(":(%s,%s,%d),ignoring share mode!\n",path,mode,share); - return MSVCRT_fopen(path,mode); + return MSVCRT__fsopen( path, mode, MSVCRT__SH_DENYNO ); } /********************************************************************* - * _wfsopen (MSVCRT.@) + * _wfopen (MSVCRT.@) */ -MSVCRT_FILE* CDECL MSVCRT__wfsopen(const MSVCRT_wchar_t *path, const MSVCRT_wchar_t *mode, int share) +MSVCRT_FILE * CDECL MSVCRT__wfopen(const MSVCRT_wchar_t *path, const MSVCRT_wchar_t *mode) { - FIXME(":(%s,%s,%d),ignoring share mode!\n", - debugstr_w(path),debugstr_w(mode),share); - return MSVCRT__wfopen(path,mode); + return MSVCRT__wfsopen( path, mode, MSVCRT__SH_DENYNO ); } /* MSVCRT_fputc calls MSVCRT__flsbuf which calls MSVCRT_fputc */

1 0

Peter Oberndorfer : msi: Honor attributes for combobox.
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: c1b7a825ff6ca9ede64d5eae2808738664af1b4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1b7a825ff6ca9ede64d5eae2… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Sat Feb 3 20:09:09 2007 +0100 msi: Honor attributes for combobox. --- dlls/msi/dialog.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 7c1cb91..1502374 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1124,9 +1124,18 @@ static UINT msi_dialog_icon_control( msi static UINT msi_dialog_combo_control( msi_dialog *dialog, MSIRECORD *rec ) { static const WCHAR szCombo[] = { 'C','O','M','B','O','B','O','X',0 }; + DWORD attributes, style; + + style = CBS_AUTOHSCROLL | WS_TABSTOP | WS_GROUP | WS_CHILD; + attributes = MSI_RecordGetInteger( rec, 8 ); + if ( ~attributes & msidbControlAttributesSorted) + style |= CBS_SORT; + if ( attributes & msidbControlAttributesComboList) + style |= CBS_DROPDOWNLIST; + else + style |= CBS_DROPDOWN; - msi_dialog_add_control( dialog, rec, szCombo, - SS_BITMAP | SS_LEFT | SS_CENTERIMAGE ); + msi_dialog_add_control( dialog, rec, szCombo, style ); return ERROR_SUCCESS; }

1 0

Peter Oberndorfer : msi: Clean up magic numbers.
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: 712e67723a707d6c7a18e509cb208d3e5cb67fd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=712e67723a707d6c7a18e509c… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Sat Feb 3 20:09:11 2007 +0100 msi: Clean up magic numbers. --- dlls/msi/dialog.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 1502374..34adf9c 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1645,9 +1645,9 @@ static UINT msi_dialog_create_radiobutto style = WS_CHILD | BS_AUTORADIOBUTTON | BS_MULTILINE | WS_TABSTOP; name = MSI_RecordGetString( rec, 3 ); text = MSI_RecordGetString( rec, 8 ); - if( attributes & 1 ) + if( attributes & msidbControlAttributesVisible ) style |= WS_VISIBLE; - if( ~attributes & 2 ) + if( ~attributes & msidbControlAttributesEnabled ) style |= WS_DISABLED; control = msi_dialog_create_window( dialog, rec, 0, szButton, name, text,

1 0

Mikołaj Zalewski : shell32: shlfileop tests: Avoid buffer overflows for paths.
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: dbef32e4ed168b83496a0c60f434e220914673df URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbef32e4ed168b83496a0c60f… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Feb 4 23:52:39 2007 +0100 shell32: shlfileop tests: Avoid buffer overflows for paths. --- dlls/shell32/tests/shlfileop.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index b363c5e..23aaeba 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -329,8 +329,8 @@ static void test_delete(void) static void test_rename(void) { SHFILEOPSTRUCTA shfo, shfo2; - CHAR from[MAX_PATH]; - CHAR to[MAX_PATH]; + CHAR from[5*MAX_PATH]; + CHAR to[5*MAX_PATH]; DWORD retval; shfo.hwnd = NULL; @@ -438,8 +438,8 @@ static void test_rename(void) static void test_copy(void) { SHFILEOPSTRUCTA shfo, shfo2; - CHAR from[MAX_PATH]; - CHAR to[MAX_PATH]; + CHAR from[5*MAX_PATH]; + CHAR to[5*MAX_PATH]; FILEOP_FLAGS tmp_flags; DWORD retval; @@ -767,8 +767,8 @@ static void test_copy(void) static void test_move(void) { SHFILEOPSTRUCTA shfo, shfo2; - CHAR from[MAX_PATH]; - CHAR to[MAX_PATH]; + CHAR from[5*MAX_PATH]; + CHAR to[5*MAX_PATH]; DWORD retval; shfo.hwnd = NULL;

1 0

Juan Lang : msvcrt: Implement _mbbtype according to MSDN.
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: 24dbdf8fa584bf374344e0a0b2fecedeb63edcaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=24dbdf8fa584bf374344e0a0b… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Feb 5 15:34:31 2007 -0800 msvcrt: Implement _mbbtype according to MSDN. --- dlls/msvcrt/mbcs.c | 26 ++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 2 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 6546ede..2e5310e 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -26,6 +26,7 @@ #include "msvcrt.h" #include "wine/unicode.h" #include "wine/debug.h" +#include "msvcrt/mbctype.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -740,6 +741,31 @@ unsigned int CDECL _mbbtombc(unsigned in } /********************************************************************* + * _mbbtype(MSVCRT.@) + */ +int CDECL _mbbtype(unsigned char c, int type) +{ + if (type == 1) + { + if ((c >= 0x20 && c <= 0x7e) || (c >= 0xa1 && c <= 0xdf)) + return _MBC_SINGLE; + else if ((c >= 0x40 && c <= 0x7e) || (c >= 0x80 && c <= 0xfc)) + return _MBC_TRAIL; + else + return _MBC_ILLEGAL; + } + else + { + if ((c >= 0x20 && c <= 0x7e) || (c >= 0xa1 && c <= 0xdf)) + return _MBC_SINGLE; + else if ((c >= 0x81 && c <= 0x9f) || (c >= 0xe0 && c <= 0xfc)) + return _MBC_LEAD; + else + return _MBC_ILLEGAL; + } +} + +/********************************************************************* * _ismbbkana(MSVCRT.@) */ int CDECL _ismbbkana(unsigned int c) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 9130322..9cdee2c 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -338,7 +338,7 @@ @ cdecl _makepath(str str str str str) @ cdecl _matherr(ptr) MSVCRT__matherr @ cdecl _mbbtombc(long) -@ stub _mbbtype #(long long) +@ cdecl _mbbtype(long long) # extern _mbcasemap @ cdecl _mbccpy (str str) @ stub _mbcjistojms #(long)

1 0