July 2008 - Wine-Commits - list.winehq.org

Rob Shearman : widl: Remove some unnecessary calls to duptype.
by Alexandre Julliard July 7, 2008

July 7, 2008

Module: wine Branch: master Commit: 90d633cdd16a4293b7db3ea8590e7014c5349dc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d633cdd16a4293b7db3ea85… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Jul 4 23:53:23 2008 +0100 widl: Remove some unnecessary calls to duptype. --- tools/widl/parser.y | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index a590cc4..f1a95d4 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -819,7 +819,7 @@ base_type: tBYTE { $$ = make_builtin($<str>1); } } | tUNSIGNED { $$ = make_int(-1); } | tFLOAT { $$ = make_builtin($<str>1); } - | tSINGLE { $$ = duptype(find_type("float", 0), 1); } + | tSINGLE { $$ = find_type("float", 0); } | tDOUBLE { $$ = make_builtin($<str>1); } | tBOOLEAN { $$ = make_builtin($<str>1); } | tERRORSTATUST { $$ = make_builtin($<str>1); } @@ -1069,7 +1069,7 @@ structdef: tSTRUCT t_ident '{' fields '}' { $$ = get_typev(RPC_FC_STRUCT, $2, ts } ; -type: tVOID { $$ = duptype(find_type_or_error("void", 0), 1); } +type: tVOID { $$ = find_type_or_error("void", 0); } | aKNOWNTYPE { $$ = find_type_or_error($1, 0); } | base_type { $$ = $1; } | enumdef { $$ = $1; } @@ -1761,7 +1761,7 @@ static type_t *make_class(char *name) static type_t *make_safearray(type_t *type) { - type_t *sa = duptype(find_type_or_error("SAFEARRAY", 0), 1); + type_t *sa = find_type_or_error("SAFEARRAY", 0); sa->ref = type; return make_type(pointer_default, sa); }

1 0

Rob Shearman : include: Remove unused file wine/rpcss_shared.h.
by Alexandre Julliard July 7, 2008

July 7, 2008

Module: wine Branch: master Commit: 666b57d62fea94365b2441462b31f3cbc0a249c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=666b57d62fea94365b2441462… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Jul 4 23:49:32 2008 +0100 include: Remove unused file wine/rpcss_shared.h. --- dlls/rpcrt4/rpc_binding.h | 1 - dlls/rpcrt4/rpc_message.h | 1 - include/wine/rpcss_shared.h | 146 ------------------------------------------- tools/make_makefiles | 1 - 4 files changed, 0 insertions(+), 149 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index 2838037..7f446e6 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -21,7 +21,6 @@ #ifndef __WINE_RPC_BINDING_H #define __WINE_RPC_BINDING_H -#include "wine/rpcss_shared.h" #include "rpcndr.h" #include "security.h" #include "wine/list.h" diff --git a/dlls/rpcrt4/rpc_message.h b/dlls/rpcrt4/rpc_message.h index 95eb807..7e746cb 100644 --- a/dlls/rpcrt4/rpc_message.h +++ b/dlls/rpcrt4/rpc_message.h @@ -21,7 +21,6 @@ #ifndef __WINE_RPC_MESSAGE_H #define __WINE_RPC_MESSAGE_H -#include "wine/rpcss_shared.h" #include "rpc_defs.h" typedef unsigned int NCA_STATUS; diff --git a/include/wine/rpcss_shared.h b/include/wine/rpcss_shared.h deleted file mode 100644 index 821a155..0000000 --- a/include/wine/rpcss_shared.h +++ /dev/null @@ -1,146 +0,0 @@ -/* - * RPCSS shared definitions - * - * Copyright (C) 2002 Greg Turner - * - * 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 - */ - -#ifndef __WINE_RPCSS_SHARED_H -#define __WINE_RPCSS_SHARED_H - -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <rpc.h> -#include <rpcdcep.h> - -#define RPCSS_NP_PROTOCOL_VERSION 0x0000 - -#define RPCSS_STRINGIFY_MACRO(x) RPCSS_STRINGIFY_MACRO2(x) -#define RPCSS_STRINGIFY_MACRO2(x) #x - -#define STRINGIFIED_RPCSS_NP_PROTOCOL_VERSION \ - RPCSS_STRINGIFY_MACRO(RPCSS_NP_PROTOCOL_VERSION) - -/* only local communications are supported so far on this pipe. - until this changes, we can just use a constant pipe-name */ -#define NAME_RPCSS_NAMED_PIPE \ - ("\\\\.\\pipe\\RpcssNP" STRINGIFIED_RPCSS_NP_PROTOCOL_VERSION) - -/* mutex is local only... perhaps this ought to be part of the pipe - protocol for remote wine<->wine connections? */ -#define RPCSS_MASTER_MUTEX_NAME \ - ("RPCSSMasterMutex" STRINGIFIED_RPCSS_NP_PROTOCOL_VERSION) - -/* payloads above 1K are fragmented into multiple messages */ -#define VARDATA_PAYLOAD_BYTES 1024 - -/* ick -- maybe we should pass a handle to a mailslot or something? */ -#define MAX_RPCSS_NP_REPLY_STRING_LEN 512 - -/* number of microseconds/10 to wait for master mutex before giving up */ -#define MASTER_MUTEX_TIMEOUT 6000000 - -/* number of milliseconds to wait on the master mutex after it returns BUSY */ -#define MASTER_MUTEX_WAITNAMEDPIPE_TIMEOUT 5000 - -/* a data payload; not a normal message */ -#define RPCSS_NP_MESSAGE_TYPEID_VARDATAPAYLOADMSG 1 -typedef struct _RPCSS_NP_MESSAGE_UNION_VARDATAPAYLOADMSG { - char payload[VARDATA_PAYLOAD_BYTES]; -} RPCSS_NP_MESSAGE_UNION_VARDATAPAYLOADMSG; - -/* RANMSG: - * Simply tells the server that another rpcss instance ran. - * The server should respond by resetting its timeout to the - * full lazy timeout. - */ -#define RPCSS_NP_MESSAGE_TYPEID_RANMSG 2 -typedef struct _RPCSS_NP_MESSAGE_UNION_RANMSG { - long timeout; -} RPCSS_NP_MESSAGE_UNION_RANMSG; - -/* REGISTEREPMSG: - * Registers endpoints with the endpoint server. - * object_count and binding_count contain the number - * of object uuids and endpoints in the vardata payload, - * respectively. - */ -#define RPCSS_NP_MESSAGE_TYPEID_REGISTEREPMSG 3 -typedef struct _RPCSS_NP_MESSAGE_UNION_REGISTEREPMSG { - RPC_SYNTAX_IDENTIFIER iface; - int object_count; - int binding_count; - int no_replace; -} RPCSS_NP_MESSAGE_UNION_REGISTEREPMSG; - -/* UNREGISTEREPMSG: - * Unregisters endpoints with the endpoint server. - * object_count and binding_count contain the number - * of object uuids and endpoints in the vardata payload, - * respectively. - */ -#define RPCSS_NP_MESSAGE_TYPEID_UNREGISTEREPMSG 4 -typedef struct _RPCSS_NP_MESSAGE_UNION_UNREGISTEREPMSG { - RPC_SYNTAX_IDENTIFIER iface; - int object_count; - int binding_count; -} RPCSS_NP_MESSAGE_UNION_UNREGISTEREPMSG; - -/* RESOLVEEPMSG: - * Locates an endpoint registered with the endpoint server. - * Vardata contains a single protseq string. This is a bit - * silly: the protseq string is probably shorter than the - * reply (an endpoint string), which is truncated at - * MAX_RPCSS_NP_REPLY_STRING_LEN, at least for the moment. - * returns the empty string if the requested endpoint isn't - * registered. - */ -#define RPCSS_NP_MESSAGE_TYPEID_RESOLVEEPMSG 5 -typedef struct _RPCSS_NP_MESSAGE_UNION_RESOLVEEPMSG { - RPC_SYNTAX_IDENTIFIER iface; - UUID object; -} RPCSS_NP_MESSAGE_UNION_RESOLVEEPMSG; - -typedef union { - RPCSS_NP_MESSAGE_UNION_RANMSG ranmsg; - RPCSS_NP_MESSAGE_UNION_VARDATAPAYLOADMSG vardatapayloadmsg; - RPCSS_NP_MESSAGE_UNION_REGISTEREPMSG registerepmsg; - RPCSS_NP_MESSAGE_UNION_UNREGISTEREPMSG unregisterepmsg; - RPCSS_NP_MESSAGE_UNION_RESOLVEEPMSG resolveepmsg; -} RPCSS_NP_MESSAGE_UNION; - -/* vardata_payload_size specifies the number of bytes - * to be transferred over the pipe in VARDATAPAYLOAD - * messages (divide by VARDATA_PAYLOAD_BYTES to - * get the # of payloads) - */ -typedef struct _RPCSS_NP_MESSAGE { - UINT32 message_type; - RPCSS_NP_MESSAGE_UNION message; - UINT32 vardata_payload_size; -} RPCSS_NP_MESSAGE, *PRPCSS_NP_MESSAGE; - -typedef union { - /* some of these aren't used, but I guess we don't care */ - UINT as_uint; - INT as_int; - void *as_pvoid; - HANDLE as_handle; - char as_string[MAX_RPCSS_NP_REPLY_STRING_LEN]; /* FIXME: yucky */ -} RPCSS_NP_REPLY, *PRPCSS_NP_REPLY; - -#endif /* __WINE_RPCSS_SHARED_H */ diff --git a/tools/make_makefiles b/tools/make_makefiles index bb49263..175c127 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -108,7 +108,6 @@ my %private_headers = ( "wine/port.h" => 1, "wine/pthread.h" => 1, "wine/rpcfc.h" => 1, - "wine/rpcss_shared.h" => 1, "wine/server.h" => 1, "wine/server_protocol.h" => 1, "wine/test.h" => 1,

1 0

Dylan Smith : richedit: Fixed the selection bar width.
by Alexandre Julliard July 7, 2008

July 7, 2008

Module: wine Branch: master Commit: 2eec4f03ed58ff607cf0bfbf30358fd7be55e9d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eec4f03ed58ff607cf0bfbf3… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Jul 4 16:02:47 2008 -0400 richedit: Fixed the selection bar width. --- dlls/riched20/editor.c | 4 ++-- dlls/riched20/editstr.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index dedc59e..6ff1385 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1697,7 +1697,7 @@ ME_TextEditor *ME_MakeEditor(HWND hWnd) { ME_CheckCharOffsets(ed); if (GetWindowLongW(hWnd, GWL_STYLE) & ES_SELECTIONBAR) - ed->selofs = 16; + ed->selofs = SELECTIONBAR_WIDTH; else ed->selofs = 0; ed->linesel = 0; @@ -2111,7 +2111,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, if (settings & ECO_AUTOWORDSELECTION) FIXME("ECO_AUTOWORDSELECTION not implemented yet!\n"); if (settings & ECO_SELECTIONBAR) - editor->selofs = 16; + editor->selofs = SELECTIONBAR_WIDTH; else editor->selofs = 0; ME_WrapMarkedParagraphs(editor); diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index d54edbf..cab52ad 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -90,6 +90,8 @@ typedef enum { diUndoPotentialEndTransaction, /* 19 - allows grouping typed chars for undo */ } ME_DIType; +#define SELECTIONBAR_WIDTH 9 + /******************************** run flags *************************/ #define MERF_STYLEFLAGS 0x0FFF /* run contains non-text content, which has its own rules for wrapping, sizing etc */

1 0

Rob Shearman : widl: Rename find_type_helper, find_type and find_type2 to find_type, find_type_error and find_type_error2 respectively.
by Alexandre Julliard July 7, 2008

July 7, 2008

Module: wine Branch: master Commit: ed0c013849e66b0dd0bf6a89a319e8fd455d8752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed0c013849e66b0dd0bf6a89a… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Jul 4 23:53:17 2008 +0100 widl: Rename find_type_helper, find_type and find_type2 to find_type, find_type_error and find_type_error2 respectively. --- tools/widl/parser.y | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 180ca98..a590cc4 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -128,7 +128,8 @@ static type_t *append_ptrchain_type(type_t *ptrchain, type_t *type); static type_t *reg_type(type_t *type, const char *name, int t); static type_t *reg_typedefs(decl_spec_t *decl_spec, var_list_t *names, attr_list_t *attrs); -static type_t *find_type2(char *name, int t); +static type_t *find_type_or_error(const char *name, int t); +static type_t *find_type_or_error2(char *name, int t); static type_t *get_type(unsigned char type, char *name, int t); static type_t *get_typev(unsigned char type, var_t *name, int t); static int get_struct_type(var_list_t *fields); @@ -156,7 +157,6 @@ static attr_list_t *check_module_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_coclass_attrs(const char *name, attr_list_t *attrs); const char *get_attr_display_name(enum attr_type type); static void add_explicit_handle_if_necessary(func_t *func); -static type_t *find_type_helper(const char *name, int t); static void check_def(const type_t *t); static statement_t *make_statement(enum statement_type type); @@ -920,7 +920,7 @@ dispinterfacedef: dispinterfacehdr '{' ; inherit: { $$ = NULL; } - | ':' aKNOWNTYPE { $$ = find_type2($2, 0); } + | ':' aKNOWNTYPE { $$ = find_type_or_error2($2, 0); } ; interface: tINTERFACE aIDENTIFIER { $$ = get_type(RPC_FC_IP, $2, 0); $$->kind = TKIND_INTERFACE; } @@ -957,7 +957,7 @@ interfacedef: interfacehdr inherit | interfacehdr ':' aIDENTIFIER '{' import int_statements '}' semicolon_opt { $$ = $1.interface; - $$->ref = find_type2($3, 0); + $$->ref = find_type_or_error2($3, 0); if (!$$->ref) error_loc("base class '%s' not found in import\n", $3); $$->funcs = $6; compute_method_indexes($$); @@ -1069,15 +1069,15 @@ structdef: tSTRUCT t_ident '{' fields '}' { $$ = get_typev(RPC_FC_STRUCT, $2, ts } ; -type: tVOID { $$ = duptype(find_type("void", 0), 1); } - | aKNOWNTYPE { $$ = find_type($1, 0); } +type: tVOID { $$ = duptype(find_type_or_error("void", 0), 1); } + | aKNOWNTYPE { $$ = find_type_or_error($1, 0); } | base_type { $$ = $1; } | enumdef { $$ = $1; } - | tENUM aIDENTIFIER { $$ = find_type2($2, tsENUM); } + | tENUM aIDENTIFIER { $$ = find_type_or_error2($2, tsENUM); } | structdef { $$ = $1; } | tSTRUCT aIDENTIFIER { $$ = get_type(RPC_FC_STRUCT, $2, tsSTRUCT); } | uniondef { $$ = $1; } - | tUNION aIDENTIFIER { $$ = find_type2($2, tsUNION); } + | tUNION aIDENTIFIER { $$ = find_type_or_error2($2, tsUNION); } | tSAFEARRAY '(' type ')' { $$ = make_safearray($3); } ; @@ -1128,14 +1128,14 @@ static void decl_builtin(const char *name, unsigned char type) static type_t *make_builtin(char *name) { /* NAME is strdup'd in the lexer */ - type_t *t = duptype(find_type(name, 0), 0); + type_t *t = duptype(find_type_or_error(name, 0), 0); t->name = name; return t; } static type_t *make_int(int sign) { - type_t *t = duptype(find_type("int", 0), 1); + type_t *t = duptype(find_type_or_error("int", 0), 1); t->sign = sign; if (sign < 0) @@ -1761,7 +1761,7 @@ static type_t *make_class(char *name) static type_t *make_safearray(type_t *type) { - type_t *sa = duptype(find_type("SAFEARRAY", 0), 1); + type_t *sa = duptype(find_type_or_error("SAFEARRAY", 0), 1); sa->ref = type; return make_type(pointer_default, sa); } @@ -1895,7 +1895,7 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at if (name->name) { type_t *cur; - cur = find_type_helper(name->name, 0); + cur = find_type(name->name, 0); if (cur) error_loc("%s: redefinition error; original definition was at %s:%d\n", cur->name, cur->loc_info.input_name, @@ -1915,7 +1915,7 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at return type; } -static type_t *find_type_helper(const char *name, int t) +type_t *find_type(const char *name, int t) { struct rtype *cur = type_hash[hash_ident(name)]; while (cur && (cur->t != t || strcmp(cur->name, name))) @@ -1923,9 +1923,9 @@ static type_t *find_type_helper(const char *name, int t) return cur ? cur->type : NULL; } -type_t *find_type(const char *name, int t) +static type_t *find_type_or_error(const char *name, int t) { - type_t *type = find_type_helper(name, t); + type_t *type = find_type(name, t); if (!type) { error_loc("type '%s' not found\n", name); return NULL; @@ -1933,23 +1933,23 @@ type_t *find_type(const char *name, int t) return type; } -static type_t *find_type2(char *name, int t) +static type_t *find_type_or_error2(char *name, int t) { - type_t *tp = find_type(name, t); + type_t *tp = find_type_or_error(name, t); free(name); return tp; } int is_type(const char *name) { - return find_type_helper(name, 0) != NULL; + return find_type(name, 0) != NULL; } static type_t *get_type(unsigned char type, char *name, int t) { type_t *tp; if (name) { - tp = find_type_helper(name, t); + tp = find_type(name, t); if (tp) { free(name); return tp; @@ -2705,7 +2705,7 @@ static void add_explicit_handle_if_necessary(func_t *func) * function */ var_t *idl_handle = make_var(xstrdup("IDL_handle")); idl_handle->attrs = append_attr(NULL, make_attr(ATTR_IN)); - idl_handle->type = find_type("handle_t", 0); + idl_handle->type = find_type_or_error("handle_t", 0); if (!func->def->type->fields_or_args) { func->def->type->fields_or_args = xmalloc( sizeof(*func->def->type->fields_or_args) ); @@ -2860,7 +2860,7 @@ static statement_t *process_typedefs(declarator_list_t *decls) LIST_FOR_EACH_ENTRY_SAFE( decl, next, decls, declarator_t, entry ) { var_t *var = decl->var; - type_t *type = find_type(var->name, 0); + type_t *type = find_type_or_error(var->name, 0); *type_list = xmalloc(sizeof(type_list_t)); (*type_list)->type = type; (*type_list)->next = NULL;

1 0

Dylan Smith : richedit: Made sure the caret position is stored when moving up/down.
by Alexandre Julliard July 7, 2008

July 7, 2008

Module: wine Branch: master Commit: db95d69f992a1618e3f407a810b74fd6f8eaffaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=db95d69f992a1618e3f407a81… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Jul 4 15:30:51 2008 -0400 richedit: Made sure the caret position is stored when moving up/down. The caret's x position is stored in ME_TextEditor.nUDArrowX so that when the caret is moved up or down, it will stay along the same horizontal position, or at the end of a line. Unfortunately, the value stored in nUDArrowX was being unconditionally discarded in ME_ArrowKey, preventing it from serving its purpose. --- dlls/riched20/caret.c | 1 - dlls/riched20/editor.c | 9 +++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index ebf6c56..4a1a8a4 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1349,7 +1349,6 @@ ME_ArrowKey(ME_TextEditor *editor, int nVKey, BOOL extend, BOOL ctrl) BOOL success = FALSE; ME_CheckCharOffsets(editor); - editor->nUDArrowX = -1; switch(nVKey) { case VK_LEFT: editor->bCaretAtEnd = 0; diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 28850f9..dedc59e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1542,10 +1542,12 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) { case VK_LEFT: case VK_RIGHT: - case VK_UP: - case VK_DOWN: case VK_HOME: case VK_END: + editor->nUDArrowX = -1; + /* fall through */ + case VK_UP: + case VK_DOWN: case VK_PRIOR: case VK_NEXT: ME_CommitUndo(editor); /* End coalesced undos for typed characters */ @@ -1553,6 +1555,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) return TRUE; case VK_BACK: case VK_DELETE: + editor->nUDArrowX = -1; /* FIXME backspace and delete aren't the same, they act different wrt paragraph style of the merged paragraph */ if (GetWindowLongW(editor->hWnd, GWL_STYLE) & ES_READONLY) return FALSE; @@ -1583,6 +1586,8 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) return TRUE; default: + if (nKey != VK_SHIFT && nKey != VK_CONTROL && nKey && nKey != VK_MENU) + editor->nUDArrowX = -1; if (ctrl_is_down) { if (nKey == 'W')

1 0

Dylan Smith : user32: Increased area for scrolling via mouse drag outside scrollbar.
by Alexandre Julliard July 4, 2008

July 4, 2008

Module: wine Branch: master Commit: 2f1c7b1610498e54cbd9a4dd3fdf4408e98ac7c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f1c7b1610498e54cbd9a4dd3… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jul 3 11:03:12 2008 -0400 user32: Increased area for scrolling via mouse drag outside scrollbar. When dragging the scrollbar thumb with the mouse, the mouse is able to move away from the scrollbar and keep scrolling so long as it isn't too far away from the scrollbar. This makes it easier to quickly scroll with the mouse. All that this patch changes is the distance that the mouse can be moved away from the scrollbar before it is consider outside of the scrollbar and returns to its original position. The distances are proportional to the size of the scrollbar. --- dlls/user32/scroll.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index ddfacd6..af35c97 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -328,16 +328,25 @@ static UINT SCROLL_GetThumbVal( SCROLLBAR_INFO *infoPtr, RECT *rect, static BOOL SCROLL_PtInRectEx( LPRECT lpRect, POINT pt, BOOL vertical ) { RECT rect = *lpRect; + int scrollbarWidth; + /* Pad hit rect to allow mouse to be dragged outside of scrollbar and + * still be considered in the scrollbar. */ if (vertical) { - rect.left -= lpRect->right - lpRect->left; - rect.right += lpRect->right - lpRect->left; + scrollbarWidth = lpRect->right - lpRect->left; + rect.left -= scrollbarWidth*8; + rect.right += scrollbarWidth*8; + rect.top -= scrollbarWidth*2; + rect.bottom += scrollbarWidth*2; } else { - rect.top -= lpRect->bottom - lpRect->top; - rect.bottom += lpRect->bottom - lpRect->top; + scrollbarWidth = lpRect->bottom - lpRect->top; + rect.left -= scrollbarWidth*2; + rect.right += scrollbarWidth*2; + rect.top -= scrollbarWidth*8; + rect.bottom += scrollbarWidth*8; } return PtInRect( &rect, pt ); }

1 0

Dylan Smith : wordpad: Properly save window rect on closing Min/ Maximized windows.
by Alexandre Julliard July 4, 2008

July 4, 2008

Module: wine Branch: master Commit: fcaa59918189dd5f6ee872823479f80ab542561d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcaa59918189dd5f6ee872823… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jul 3 12:51:17 2008 -0400 wordpad: Properly save window rect on closing Min/Maximized windows. Previously the window size and position was obtained in such a way that when the window is closed while minimized, it would be hidden when the program is started again. Closing a maximized window would save the size of the maximized window and use it as the normal/restored size when the program is started again. --- programs/wordpad/registry.c | 26 +++++++++++++++++++++++--- programs/wordpad/wordpad.c | 9 +++++++-- programs/wordpad/wordpad.h | 1 + 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/programs/wordpad/registry.c b/programs/wordpad/registry.c index 28f13b9..7bf7c49 100644 --- a/programs/wordpad/registry.c +++ b/programs/wordpad/registry.c @@ -33,6 +33,7 @@ static const WCHAR key_text[] = {'T','e','x','t',0}; static const WCHAR var_file[] = {'F','i','l','e','%','d',0}; static const WCHAR var_framerect[] = {'F','r','a','m','e','R','e','c','t',0}; static const WCHAR var_barstate0[] = {'B','a','r','S','t','a','t','e','0',0}; +static const WCHAR var_maximized[] = {'M','a','x','i','m','i','z','e','d',0}; static LRESULT registry_get_handle(HKEY *hKey, LPDWORD action, LPCWSTR subKey) { @@ -82,11 +83,15 @@ void registry_set_options(HWND hMainWnd) if(registry_get_handle(&hKey, &action, (LPWSTR)key_options) == ERROR_SUCCESS) { - RECT rc; + WINDOWPLACEMENT wp; + DWORD isMaximized; - GetWindowRect(hMainWnd, &rc); + wp.length = sizeof(WINDOWPLACEMENT); + GetWindowPlacement(hMainWnd, &wp); + isMaximized = (wp.showCmd == SW_SHOWMAXIMIZED); - RegSetValueExW(hKey, var_framerect, 0, REG_BINARY, (LPBYTE)&rc, sizeof(RECT)); + RegSetValueExW(hKey, var_framerect, 0, REG_BINARY, (LPBYTE)&wp.rcNormalPosition, sizeof(RECT)); + RegSetValueExW(hKey, var_maximized, 0, REG_DWORD, (LPBYTE)&isMaximized, sizeof(DWORD)); registry_set_pagemargins(hKey); } @@ -112,6 +117,21 @@ void registry_read_winrect(RECT* rc) RegCloseKey(hKey); } +void registry_read_maximized(DWORD *bMaximized) +{ + HKEY hKey; + DWORD size = sizeof(DWORD); + + if(registry_get_handle(&hKey, 0, (LPWSTR)key_options) != ERROR_SUCCESS || + RegQueryValueExW(hKey, var_maximized, 0, NULL, (LPBYTE)bMaximized, &size) != + ERROR_SUCCESS || size != sizeof(DWORD)) + { + *bMaximized = FALSE; + } + + RegCloseKey(hKey); +} + static void truncate_path(LPWSTR file, LPWSTR out, LPWSTR pos1, LPWSTR pos2) { static const WCHAR dots[] = {'.','.','.',0}; diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 0900ea3..80638c8 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2490,7 +2490,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara return 0; } -int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdParagraph, int res) +int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdParagraph, int nCmdShow) { INITCOMMONCONTROLSEX classes = {8, ICC_BAR_CLASSES|ICC_COOL_CLASSES|ICC_USEREX_CLASSES}; HACCEL hAccel; @@ -2500,6 +2500,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar UINT_PTR hPrevRulerProc; HWND hRulerWnd; POINTL EditPoint; + DWORD bMaximized; static const WCHAR wszAccelTable[] = {'M','A','I','N','A','C','C','E','L', 'T','A','B','L','E','\0'}; @@ -2522,7 +2523,11 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar registry_read_winrect(&rc); hMainWnd = CreateWindowExW(0, wszMainWndClass, wszAppTitle, WS_CLIPCHILDREN|WS_OVERLAPPEDWINDOW, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, NULL, NULL, hInstance, NULL); - ShowWindow(hMainWnd, SW_SHOWDEFAULT); + registry_read_maximized(&bMaximized); + if ((nCmdShow == SW_SHOWNORMAL || nCmdShow == SW_SHOWDEFAULT) + && bMaximized) + nCmdShow = SW_SHOWMAXIMIZED; + ShowWindow(hMainWnd, nCmdShow); set_caption(NULL); set_bar_states(); diff --git a/programs/wordpad/wordpad.h b/programs/wordpad/wordpad.h index 42682dd..53a6c13 100644 --- a/programs/wordpad/wordpad.h +++ b/programs/wordpad/wordpad.h @@ -216,6 +216,7 @@ void registry_read_filelist(HWND); void registry_read_options(void); void registry_read_formatopts_all(DWORD[], DWORD[]); void registry_read_winrect(RECT*); +void registry_read_maximized(DWORD*); void registry_set_filelist(LPCWSTR, HWND); void registry_set_formatopts_all(DWORD[]); void registry_set_options(HWND);

1 0

Vladimir Pankratov : README: Add Russian translation.
by Alexandre Julliard July 4, 2008

July 4, 2008

Module: wine Branch: master Commit: 0cd3bda1f1729c81431ab664767fcaf98d9afdb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cd3bda1f1729c81431ab6647… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Thu Jul 3 15:12:45 2008 +0500 README: Add Russian translation. --- documentation/README.ru | 189 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 189 insertions(+), 0 deletions(-) diff --git a/documentation/README.ru b/documentation/README.ru new file mode 100644 index 0000000..dbcd0da --- /dev/null +++ b/documentation/README.ru @@ -0,0 +1,189 @@ +1. �� + +Wine - �� , �� Microsoft +Windows (�� DOS, Windows 3.x � Win32) �� Unix. �� +�� , �� Microsoft +Windows, � �� (Winelib), �� Windows API, +�� Unix- �� X11-��. �� +�� Win32 � �� Unix. + +Wine - �� , �� +GNU LGPL; �� LICENSE. + + +2. �� + +�� , �� , �� +Wine Installer �� Wine. � ��, �� +�� Wine (� �� ), ��: + +./tools/wineinstall + +�� "wine program". �� +�� . �� Wine, +� �� http://www.winehq.org. + + +3. �� + +�� Wine �� : + + Linux �� 2.0.36 �� + FreeBSD 7.0 �� + Solaris x86 9 �� + NetBSD-�� + Mac OS X 10.4 �� + +�� Wine �� , �� +�� , �� . �� , +� �� , �� Wine � ��. + +Linux: + Linux 2.2.x: �� ; Linux 2.0.x: �� + (�� 2.0.x �� ), + �� 2.4.x �� 2.6.x. + +FreeBSD: + Wine �� , �� FreeBSD + 7.0. � FreeBSD 6.3 �� , �� Wine ��. �� + <http://wiki.freebsd.org/Wine> �� . + +Solaris: + �� Wine �� GNU + (gcc, gas, � �.�.). ��: �� gas *��* �� + �� gcc �� . �� gcc �� + �� gas �� cc, �� ld � �� gnu. (?) + +NetBSD: + �� , �� USER_LDT, SYSVSHM, SYSVSEM � SYSVMSG + �� . + +Mac OS X: + �� Xcode 2.4 �� x86. + + +�� : + Wine �� . �� + �� Samba. ��, + NTFS �� , �� + ��. �� Linux, �� ext3. + +�� : + � �� X11 + (xlib6g-dev � Debian � XFree86-devel � Red Hat). + + ��, �� "make" (�� GNU make). + + �� flex �� 2.5 �� , � �� bison. + +�� : + �� , �� + �� . �� http://wiki.winehq.org/Recommended_Packages �� + �� , �� . + + �� 64-�� , �� 32-�� + �� ; �� + http://wiki.winehq.org/WineOn64bit. + +4. �� + +�� wineinstall, �� +�� Wine: + +./configure +make depend +make + +�� "wine" � �� /�� . +�� "wine" �� , � �� Windows. +�� "libwine" ("Winelib") �� +�� Windows �� Unix. + +�� , �� ./configure --help. + +�� , �� +�� (�� README ��). +�� "make clean", � �� : + + bunzip2 -c patch-file | patch -p1 + +�� "patch-file" - �� (��-�� +wine-1.0.x.diff.bz2). �� "./configure", � �� +"make depend && make". + + +5. �� + +�� , Wine �� , �� "make install"; �� +�� wine, �� Wine, � �� +�� . + +�� Wine. +�� "dpkg -r wine" �� "rpm -e wine" �� "make uninstall" +�� . + +�� , �� "winecfg". �� +�� http://www.winehq.org/ �� . + + +6. �� + +�� , �� . + +��: �� : + + wine notepad (�� , �� + wine notepad.exe � ��, �� ) + + wine c:\\windows\\notepad.exe (�� DOS) + + wine ~/.wine/drive_c/windows/notepad.exe (�� Unix) + + wine notepad.exe /parameter1 -parameter2 parameter3 + (�� ) + +Wine �� , �� +�� . �� , +�� . �� , +�� Wine Developer's Guide. + + +7. �� + +WWW: �� Wine �� WineHQ �� + http://www.winehq.org/: �� Wine, �� , + �� . �� . + +FAQ: Wine FAQ �� http://www.winehq.org/FAQ + +Usenet: �� Wine � �� + �� comp.emulators.ms-windows.wine. + +��: �� Wine Bugzilla �� http://bugs.winehq.org + �� , �� + �� . �� + comp.emulators.ms-windows.wine. + +IRC: �� #WineHQ �� irc.freenode.net. + +GIT: �� Wine �� GIT. + �� http://www.winehq.org/site/git �� . + +��: + �� Wine; + �� http://www.winehq.org/forums �� . + +Wiki: Wine Wiki �� http://wiki.winehq.org + +�� -�� , �� , �� (� �� 'diff -u') +�� wine-patches(a)winehq.org �� . + +-- +Alexandre Julliard +julliard(a)winehq.org + +�� +�� +scriptkid(a)mail.ru +�� +lav(a)etersoft.ru

1 0

Vladimir Pankratov : shell32: Update Russian translation.
by Alexandre Julliard July 4, 2008

July 4, 2008

Module: wine Branch: master Commit: 35ac3870415e5be9eb5294c1450d7104791ae132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35ac3870415e5be9eb5294c14… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Thu Jul 3 13:09:27 2008 +0500 shell32: Update Russian translation. --- dlls/shell32/shell32_Ru.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32_Ru.rc b/dlls/shell32/shell32_Ru.rc index 808d668..ebd7b96 100644 --- a/dlls/shell32/shell32_Ru.rc +++ b/dlls/shell32/shell32_Ru.rc @@ -119,7 +119,7 @@ FONT 8, "MS Shell Dlg" WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP - PUSHBUTTON "�� &�� ", IDD_MAKENEWFOLDER, 12, 174, 70, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "�� &�� ", IDD_MAKENEWFOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "��", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "��", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP } @@ -159,7 +159,7 @@ FONT 8, "MS Shell Dlg" { ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE LTEXT "�� , ��, �� , � Wine �� .", 12289, 36, 11, 182, 18 - LTEXT "&��:", 12305, 7, 39, 24, 10 + LTEXT "&��:", 12305, 4, 39, 30, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "��", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP

1 0

Nikolay Sivov : gdiplus: Remove unnecessary cast from GdipAddPathRectangle.
by Alexandre Julliard July 4, 2008

July 4, 2008

Module: wine Branch: master Commit: 95ced6e1f5de059afe31a70483e958a8d1404dea URL: http://source.winehq.org/git/wine.git/?a=commit;h=95ced6e1f5de059afe31a7048… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jul 3 18:35:18 2008 +0400 gdiplus: Remove unnecessary cast from GdipAddPathRectangle. --- dlls/gdiplus/graphicspath.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 6e5747f..1022fb4 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -813,7 +813,7 @@ GpStatus WINGDIPAPI GdipAddPathRectangle(GpPath *path, REAL x, REAL y, ptf[1].X = x; ptf[1].Y = y+height; - if((retstat = GdipAddPathLine2(path,(GDIPCONST GpPointF*)&ptf,2)) != Ok) goto fail; + if((retstat = GdipAddPathLine2(path, ptf, 2)) != Ok) goto fail; path->pathdata.Types[path->pathdata.Count-1] |= PathPointTypeCloseSubpath; /* free backup */

1 0