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

Eric Pouech : winhelp: Moved all static data used when parsing HLP files into the internal structures .
by Alexandre Julliard April 21, 2008

April 21, 2008

Module: wine Branch: master Commit: a1072794107e54927df6f56f7e94b737bc8dc0aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1072794107e54927df6f56f7… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Apr 18 21:33:57 2008 +0200 winhelp: Moved all static data used when parsing HLP files into the internal structures. --- programs/winhelp/hlpfile.c | 209 ++++++++++++++++++++------------------------ programs/winhelp/hlpfile.h | 11 ++- 2 files changed, 104 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1072794107e54927df6f…

1 0

Eric Pouech : winhelp: Add an (ugly) icon.
by Alexandre Julliard April 21, 2008

April 21, 2008

Module: wine Branch: master Commit: 077964a8d4dd9c695196f43cdef32437f2468087 URL: http://source.winehq.org/git/wine.git/?a=commit;h=077964a8d4dd9c695196f43cd… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Apr 18 21:33:45 2008 +0200 winhelp: Add an (ugly) icon. --- programs/winhelp/rsrc.rc | 3 +++ programs/winhelp/winhelp.c | 2 +- programs/winhelp/winhelp.ico | Bin 0 -> 766 bytes programs/winhelp/winhelp_res.h | 2 ++ 4 files changed, 6 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/rsrc.rc b/programs/winhelp/rsrc.rc index c8a6417..4dc7d23 100644 --- a/programs/winhelp/rsrc.rc +++ b/programs/winhelp/rsrc.rc @@ -25,6 +25,9 @@ #include "winhelp.h" #include "winhelp_res.h" +/* @makedep: winhelp.ico */ +IDI_WINHELP ICON DISCARDABLE winhelp.ico + #include "Bg.rc" #include "Cs.rc" #include "Da.rc" diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index b9c435f..65c7e20 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -324,7 +324,7 @@ static BOOL WINHELP_RegisterWinClasses(void) class_main.cbClsExtra = 0; class_main.cbWndExtra = sizeof(LONG); class_main.hInstance = Globals.hInstance; - class_main.hIcon = LoadIcon(0, IDI_APPLICATION); + class_main.hIcon = LoadIcon(Globals.hInstance, MAKEINTRESOURCE(IDI_WINHELP)); class_main.hCursor = LoadCursor(0, IDC_ARROW); class_main.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); class_main.lpszMenuName = 0; diff --git a/programs/winhelp/winhelp.ico b/programs/winhelp/winhelp.ico new file mode 100644 index 0000000..7e5c6d6 Binary files /dev/null and b/programs/winhelp/winhelp.ico differ diff --git a/programs/winhelp/winhelp_res.h b/programs/winhelp/winhelp_res.h index 14ec13f..d58de61 100644 --- a/programs/winhelp/winhelp_res.h +++ b/programs/winhelp/winhelp_res.h @@ -33,3 +33,5 @@ #define IDD_INDEX 0x150 #define IDC_INDEXLIST 0x151 + +#define IDI_WINHELP 0xF00

1 0

Eric Pouech : winhelp: Get rid of the WM_USER message.
by Alexandre Julliard April 21, 2008

April 21, 2008

Module: wine Branch: master Commit: d58ab515dfef1406fbf746665101b3a1d9a6370d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d58ab515dfef1406fbf746665… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Apr 18 21:33:51 2008 +0200 winhelp: Get rid of the WM_USER message. --- programs/winhelp/macro.c | 4 +- programs/winhelp/winhelp.c | 48 ++++++++++++++++++++++++------------------- programs/winhelp/winhelp.h | 1 + 3 files changed, 30 insertions(+), 23 deletions(-) diff --git a/programs/winhelp/macro.c b/programs/winhelp/macro.c index 68863bf..1f824f8 100644 --- a/programs/winhelp/macro.c +++ b/programs/winhelp/macro.c @@ -300,7 +300,7 @@ void CALLBACK MACRO_ChangeButtonBinding(LPCSTR id, LPCSTR macro) *b = button; - SendMessage(win->hMainWnd, WM_USER, 0, 0); + WINHELP_LayoutMainWindow(win); } void CALLBACK MACRO_ChangeEnable(LPCSTR id, LPCSTR macro) @@ -407,7 +407,7 @@ void CALLBACK MACRO_CreateButton(LPCSTR id, LPCSTR name, LPCSTR macro) button->wParam = max(button->wParam, (*b)->wParam + 1); *b = button; - SendMessage(win->hMainWnd, WM_USER, 0, 0); + WINHELP_LayoutMainWindow(win); } void CALLBACK MACRO_DeleteItem(LPCSTR str) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 65c7e20..92c1e79 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -449,6 +449,29 @@ static LRESULT WINHELP_HandleCommand(HWND hSrcWnd, LPARAM lParam) return 1; } +void WINHELP_LayoutMainWindow(WINHELP_WINDOW* win) +{ + RECT rect, button_box_rect; + INT text_top; + + GetClientRect(win->hMainWnd, &rect); + + /* Update button box and text Window */ + SetWindowPos(win->hButtonBoxWnd, HWND_TOP, + rect.left, rect.top, + rect.right - rect.left, + rect.bottom - rect.top, 0); + + GetWindowRect(win->hButtonBoxWnd, &button_box_rect); + text_top = rect.top + button_box_rect.bottom - button_box_rect.top; + + SetWindowPos(win->hTextWnd, HWND_TOP, + rect.left, text_top, + rect.right - rect.left, + rect.bottom - text_top, 0); + +} + /****************************************************************** * WINHELP_ReuseWindow * @@ -478,7 +501,7 @@ static BOOL WINHELP_ReuseWindow(WINHELP_WINDOW* win, WINHELP_WINDOW* oldwin, WINHELP_SetupText(win->hTextWnd); InvalidateRect(win->hTextWnd, NULL, TRUE); - SendMessage(win->hMainWnd, WM_USER, 0, 0); + WINHELP_LayoutMainWindow(win); ShowWindow(win->hMainWnd, nCmdShow); UpdateWindow(win->hTextWnd); @@ -692,8 +715,8 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, { WINHELP_WINDOW *win; WINHELP_BUTTON *button; - RECT rect, button_box_rect; - INT text_top, curPos, min, max, dy, keyDelta; + RECT rect; + INT curPos, min, max, dy, keyDelta; WINHELP_CheckPopup(msg); @@ -716,25 +739,8 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, 0, 0, 0, 0, hWnd, 0, Globals.hInstance, win); /* Fall through */ - case WM_USER: case WM_WINDOWPOSCHANGED: - win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); - GetClientRect(hWnd, &rect); - - /* Update button box and text Window */ - SetWindowPos(win->hButtonBoxWnd, HWND_TOP, - rect.left, rect.top, - rect.right - rect.left, - rect.bottom - rect.top, 0); - - GetWindowRect(win->hButtonBoxWnd, &button_box_rect); - text_top = rect.top + button_box_rect.bottom - button_box_rect.top; - - SetWindowPos(win->hTextWnd, HWND_TOP, - rect.left, text_top, - rect.right - rect.left, - rect.bottom - text_top, 0); - + WINHELP_LayoutMainWindow((WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0)); break; case WM_COMMAND: diff --git a/programs/winhelp/winhelp.h b/programs/winhelp/winhelp.h index abe68ea..0628c7d 100644 --- a/programs/winhelp/winhelp.h +++ b/programs/winhelp/winhelp.h @@ -180,6 +180,7 @@ INT WINHELP_MessageBoxIDS(UINT, UINT, WORD); INT WINHELP_MessageBoxIDS_s(UINT, LPCSTR, UINT, WORD); HLPFILE* WINHELP_LookupHelpFile(LPCSTR lpszFile); HLPFILE_WINDOWINFO* WINHELP_GetWindowInfo(HLPFILE* hlpfile, LPCSTR name); +void WINHELP_LayoutMainWindow(WINHELP_WINDOW* win); extern const char MAIN_WIN_CLASS_NAME[]; extern const char BUTTON_BOX_WIN_CLASS_NAME[];

1 0

Rob Shearman : widl: Add support for '%' operator in expressions.
by Alexandre Julliard April 21, 2008

April 21, 2008

Module: wine Branch: master Commit: ea9932557af5d30dc652d27edc3548664cb879c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea9932557af5d30dc652d27ed… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 20 22:16:10 2008 +0100 widl: Add support for '%' operator in expressions. --- tools/widl/header.c | 2 ++ tools/widl/parser.y | 10 +++++++++- tools/widl/typegen.c | 3 +++ tools/widl/widltypes.h | 1 + 4 files changed, 15 insertions(+), 1 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 6989149..e1dccce 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -520,6 +520,7 @@ void write_expr(FILE *h, const expr_t *e, int brackets) break; case EXPR_SHL: case EXPR_SHR: + case EXPR_MOD: case EXPR_MUL: case EXPR_DIV: case EXPR_ADD: @@ -533,6 +534,7 @@ void write_expr(FILE *h, const expr_t *e, int brackets) switch (e->type) { case EXPR_SHL: fprintf(h, " << "); break; case EXPR_SHR: fprintf(h, " >> "); break; + case EXPR_MOD: fprintf(h, " %% "); break; case EXPR_MUL: fprintf(h, " * "); break; case EXPR_DIV: fprintf(h, " / "); break; case EXPR_ADD: fprintf(h, " + "); break; diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 32752bf..31f631f 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -293,7 +293,7 @@ static void add_explicit_handle_if_necessary(func_t *func); %left '|' %left '&' %left '-' '+' -%left '*' '/' +%left '*' '/' '%' %left SHL SHR %left '.' MEMBERPTR '[' ']' %right '~' @@ -632,6 +632,7 @@ expr: aNUM { $$ = make_exprl(EXPR_NUM, $1); } | expr '&' expr { $$ = make_expr2(EXPR_AND, $1, $3); } | expr '+' expr { $$ = make_expr2(EXPR_ADD, $1, $3); } | expr '-' expr { $$ = make_expr2(EXPR_SUB, $1, $3); } + | expr '%' expr { $$ = make_expr2(EXPR_MOD, $1, $3); } | expr '*' expr { $$ = make_expr2(EXPR_MUL, $1, $3); } | expr '/' expr { $$ = make_expr2(EXPR_DIV, $1, $3); } | expr SHL expr { $$ = make_expr2(EXPR_SHL, $1, $3); } @@ -1238,6 +1239,13 @@ static expr_t *make_expr2(enum expr_type type, expr_t *expr1, expr_t *expr2) case EXPR_SUB: e->cval = expr1->cval - expr2->cval; break; + case EXPR_MOD: + if (expr2->cval == 0) { + error_loc("divide by zero in expression\n"); + e->cval = 0; + } else + e->cval = expr1->cval % expr2->cval; + break; case EXPR_MUL: e->cval = expr1->cval * expr2->cval; break; diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index da5c95a..575f06c 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -352,6 +352,7 @@ static int compare_expr(const expr_t *a, const expr_t *b) case EXPR_AND: case EXPR_ADD: case EXPR_SUB: + case EXPR_MOD: case EXPR_MUL: case EXPR_DIV: case EXPR_SHL: @@ -3148,6 +3149,7 @@ static void write_struct_expr(FILE *h, const expr_t *e, int brackets, break; case EXPR_SHL: case EXPR_SHR: + case EXPR_MOD: case EXPR_MUL: case EXPR_DIV: case EXPR_ADD: @@ -3161,6 +3163,7 @@ static void write_struct_expr(FILE *h, const expr_t *e, int brackets, switch (e->type) { case EXPR_SHL: fprintf(h, " << "); break; case EXPR_SHR: fprintf(h, " >> "); break; + case EXPR_MOD: fprintf(h, " %% "); break; case EXPR_MUL: fprintf(h, " * "); break; case EXPR_DIV: fprintf(h, " / "); break; case EXPR_ADD: fprintf(h, " + "); break; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 31c7599..879c7a9 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -164,6 +164,7 @@ enum expr_type EXPR_MEMBERPTR, EXPR_MEMBER, EXPR_ARRAY, + EXPR_MOD, }; enum type_kind

1 0

ByeongSik Jeon : winecfg: Update Korean translation.
by Alexandre Julliard April 21, 2008

April 21, 2008

Module: wine Branch: master Commit: 69e525022f04cee47b0c8ea6e2d7bf01279bfe87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69e525022f04cee47b0c8ea6e… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Mon Apr 21 10:58:15 2008 +0900 winecfg: Update Korean translation. --- programs/winecfg/Ko.rc | 82 ++++++++++++++++++++++++------------------------ 1 files changed, 41 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69e525022f04cee47b0c8…

1 0

Roderick Colenbrander : wined3d: Add palette re-upload support for cards with hardware palette support.
by Alexandre Julliard April 21, 2008

April 21, 2008

Module: wine Branch: master Commit: f2753d71898547dbca6d12429e4de552b7edd666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2753d71898547dbca6d12429… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Apr 20 14:50:00 2008 +0000 wined3d: Add palette re-upload support for cards with hardware palette support. Before it was broken and when it worked it was slow due to unneeded gpu -> cpu -> gpu copying. --- dlls/wined3d/surface.c | 51 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 44 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 31c8e4f..7da9d92 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -35,6 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, CONVERT_TYPES convert, IWineD3DSurfaceImpl *surf); static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4], BOOL colorkey); +static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES convert); static inline void clear_unused_channels(IWineD3DSurfaceImpl *This); static void surface_remove_pbo(IWineD3DSurfaceImpl *This); @@ -3638,12 +3639,49 @@ HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) { if(This->resource.format == WINED3DFMT_P8 || This->resource.format == WINED3DFMT_A8P8) { - if(!(This->Flags & SFLAG_INSYSMEM)) { - TRACE("Palette changed with surface that does not have an up to date system memory copy\n"); - IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL); + int bpp; + GLenum format, internal, type; + CONVERT_TYPES convert; + + /* Check if we are using a RTL mode which uses texturing for uploads */ + BOOL use_texture = (wined3d_settings.rendertargetlock_mode == RTL_READTEX || wined3d_settings.rendertargetlock_mode == RTL_TEXTEX); + + /* Check if we have hardware palette conversion if we have convert is set to NO_CONVERSION */ + d3dfmt_get_conv(This, TRUE, use_texture, &format, &internal, &type, &convert, &bpp, This->srgb); + + if((This->resource.usage & WINED3DUSAGE_RENDERTARGET) && (convert == NO_CONVERSION)) + { + ENTER_GL(); + if (This->glDescription.textureName == 0) { + glGenTextures(1, &This->glDescription.textureName); + checkGLcall("glGenTextures"); + } + glBindTexture(This->glDescription.target, This->glDescription.textureName); + checkGLcall("glBindTexture(This->glDescription.target, This->glDescription.textureName)"); + LEAVE_GL(); + + /* Make sure the texture is up to date. This call doesn't do anything if the texture is already up to date. */ + IWineD3DSurface_LoadLocation(iface, SFLAG_INTEXTURE, NULL); + + /* We want to force a palette refresh, so mark the drawable as not being up to date */ + IWineD3DSurface_ModifyLocation(iface, SFLAG_INDRAWABLE, FALSE); + + /* Re-upload the palette */ + d3dfmt_p8_upload_palette(iface, convert); + + /* Without this some palette updates are missed. This at least happens on Nvidia drivers but + * it works fine using Mesa. */ + ENTER_GL(); + glFlush(); + LEAVE_GL(); + } else { + if(!(This->Flags & SFLAG_INSYSMEM)) { + TRACE("Palette changed with surface that does not have an up to date system memory copy\n"); + IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL); + } + TRACE("Dirtifying surface\n"); + IWineD3DSurface_ModifyLocation(iface, SFLAG_INSYSMEM, TRUE); } - TRACE("Dirtifying surface\n"); - IWineD3DSurface_ModifyLocation(iface, SFLAG_INSYSMEM, TRUE); } if(This->Flags & SFLAG_DIBSECTION) { @@ -3657,8 +3695,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) { SetDIBColorTable(This->hDC, 0, 256, col); } - /* Propagate the changes to the drawable when we have a palette. - * TODO: in case of hardware p8 palettes we should only upload the palette. */ + /* Propagate the changes to the drawable when we have a palette. */ if(This->resource.usage & WINED3DUSAGE_RENDERTARGET) IWineD3DSurface_LoadLocation(iface, SFLAG_INDRAWABLE, NULL);

1 0

Rob Shearman : widl: Issue an error instead of crashing for dividing by zero in a constant expression .
by Alexandre Julliard April 21, 2008

April 21, 2008

Module: wine Branch: master Commit: efd10742ec02ec14fe080f8b69244ecbae920798 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efd10742ec02ec14fe080f8b6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 20 22:15:36 2008 +0100 widl: Issue an error instead of crashing for dividing by zero in a constant expression. --- tools/widl/parser.y | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 6f5dbdd..c7fbe42 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1237,7 +1237,11 @@ static expr_t *make_expr2(enum expr_type type, expr_t *expr1, expr_t *expr2) e->cval = expr1->cval * expr2->cval; break; case EXPR_DIV: - e->cval = expr1->cval / expr2->cval; + if (expr2->cval == 0) { + error_loc("divide by zero in expression\n"); + e->cval = 0; + } else + e->cval = expr1->cval / expr2->cval; break; case EXPR_OR: e->cval = expr1->cval | expr2->cval;

1 0

Rob Shearman : widl: Add support for arrays in expressions.
by Alexandre Julliard April 21, 2008

April 21, 2008

Module: wine Branch: master Commit: d27c7601e5d1e4b6107aae11a0273a91235f6a98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d27c7601e5d1e4b6107aae11a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 20 22:16:00 2008 +0100 widl: Add support for arrays in expressions. --- tools/widl/header.c | 8 ++++++++ tools/widl/parser.y | 3 ++- tools/widl/typegen.c | 9 +++++++++ tools/widl/widltypes.h | 1 + 4 files changed, 20 insertions(+), 1 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index d2f7ca7..6989149 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -559,6 +559,14 @@ void write_expr(FILE *h, const expr_t *e, int brackets) fprintf(h, "&"); write_expr(h, e->ref, 1); break; + case EXPR_ARRAY: + if (brackets) fprintf(h, "("); + write_expr(h, e->ref, 1); + fprintf(h, "["); + write_expr(h, e->u.ext, 1); + fprintf(h, "]"); + if (brackets) fprintf(h, ")"); + break; } } diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 61a1252..32752bf 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -295,7 +295,7 @@ static void add_explicit_handle_if_necessary(func_t *func); %left '-' '+' %left '*' '/' %left SHL SHR -%left '.' MEMBERPTR +%left '.' MEMBERPTR '[' ']' %right '~' %right CAST %right PPTR @@ -644,6 +644,7 @@ expr: aNUM { $$ = make_exprl(EXPR_NUM, $1); } | expr '.' expr { $$ = make_expr2(EXPR_MEMBER, $1, $3); } | '(' type ')' expr %prec CAST { $$ = make_exprt(EXPR_CAST, $2, $4); } | tSIZEOF '(' type ')' { $$ = make_exprt(EXPR_SIZEOF, $3, NULL); } + | expr '[' expr ']' { $$ = make_expr2(EXPR_ARRAY, $1, $3); } | '(' expr ')' { $$ = $2; } ; diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index b298403..da5c95a 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -358,6 +358,7 @@ static int compare_expr(const expr_t *a, const expr_t *b) case EXPR_SHR: case EXPR_MEMBERPTR: case EXPR_MEMBER: + case EXPR_ARRAY: ret = compare_expr(a->ref, b->ref); if (ret != 0) return ret; @@ -3186,6 +3187,14 @@ static void write_struct_expr(FILE *h, const expr_t *e, int brackets, fprintf(h, "&"); write_struct_expr(h, e->ref, 1, fields, structvar); break; + case EXPR_ARRAY: + if (brackets) fprintf(h, "("); + write_struct_expr(h, e->ref, 1, fields, structvar); + fprintf(h, "["); + write_struct_expr(h, e->u.ext, 1, fields, structvar); + fprintf(h, "]"); + if (brackets) fprintf(h, ")"); + break; } } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 256a3ad..31c7599 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -163,6 +163,7 @@ enum expr_type EXPR_ADDRESSOF, EXPR_MEMBERPTR, EXPR_MEMBER, + EXPR_ARRAY, }; enum type_kind

1 0

Rob Shearman : widl: Add support for "->" and "." operators in expressions.
by Alexandre Julliard April 21, 2008

April 21, 2008

Module: wine Branch: master Commit: 03d5017416adfd47fe86d8ecf97af8a028ca7748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03d5017416adfd47fe86d8ecf… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 20 22:15:43 2008 +0100 widl: Add support for "->" and "." operators in expressions. --- tools/widl/header.c | 4 ++++ tools/widl/parser.l | 1 + tools/widl/parser.y | 6 +++++- tools/widl/typegen.c | 6 ++++++ tools/widl/widltypes.h | 2 ++ 5 files changed, 18 insertions(+), 1 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 3c89d61..d2f7ca7 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -526,6 +526,8 @@ void write_expr(FILE *h, const expr_t *e, int brackets) case EXPR_SUB: case EXPR_AND: case EXPR_OR: + case EXPR_MEMBERPTR: + case EXPR_MEMBER: if (brackets) fprintf(h, "("); write_expr(h, e->ref, 1); switch (e->type) { @@ -537,6 +539,8 @@ void write_expr(FILE *h, const expr_t *e, int brackets) case EXPR_SUB: fprintf(h, " - "); break; case EXPR_AND: fprintf(h, " & "); break; case EXPR_OR: fprintf(h, " | "); break; + case EXPR_MEMBERPTR: fprintf(h, "->"); break; + case EXPR_MEMBER: fprintf(h, "."); break; default: break; } write_expr(h, e->u.ext, 1); diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 5b24b26..3439ea6 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -162,6 +162,7 @@ SAFEARRAY{ws}*/\( return tSAFEARRAY; <INITIAL,ATTR>{ws} <INITIAL,ATTR>\<\< return SHL; <INITIAL,ATTR>\>\> return SHR; +<INITIAL,ATTR>\-\> return MEMBERPTR; <INITIAL,ATTR>. return yytext[0]; <<EOF>> { if (import_stack_ptr) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index c7fbe42..61a1252 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -180,6 +180,7 @@ static void add_explicit_handle_if_necessary(func_t *func); %token <uuid> aUUID %token aEOF %token SHL SHR +%token MEMBERPTR %token tAGGREGATABLE tALLOCATE tAPPOBJECT tASYNC tASYNCUUID %token tAUTOHANDLE tBINDABLE tBOOLEAN tBROADCAST tBYTE tBYTECOUNT %token tCALLAS tCALLBACK tCASE tCDECL tCHAR tCOCLASS tCODE tCOMMSTATUS @@ -294,6 +295,7 @@ static void add_explicit_handle_if_necessary(func_t *func); %left '-' '+' %left '*' '/' %left SHL SHR +%left '.' MEMBERPTR %right '~' %right CAST %right PPTR @@ -636,8 +638,10 @@ expr: aNUM { $$ = make_exprl(EXPR_NUM, $1); } | expr SHR expr { $$ = make_expr2(EXPR_SHR, $1, $3); } | '~' expr { $$ = make_expr1(EXPR_NOT, $2); } | '-' expr %prec NEG { $$ = make_expr1(EXPR_NEG, $2); } - | '&' expr %prec ADDRESSOF { $$ = make_expr1(EXPR_ADDRESSOF, $2); } + | '&' expr %prec ADDRESSOF { $$ = make_expr1(EXPR_ADDRESSOF, $2); } | '*' expr %prec PPTR { $$ = make_expr1(EXPR_PPTR, $2); } + | expr MEMBERPTR expr { $$ = make_expr2(EXPR_MEMBERPTR, $1, $3); } + | expr '.' expr { $$ = make_expr2(EXPR_MEMBER, $1, $3); } | '(' type ')' expr %prec CAST { $$ = make_exprt(EXPR_CAST, $2, $4); } | tSIZEOF '(' type ')' { $$ = make_exprt(EXPR_SIZEOF, $3, NULL); } | '(' expr ')' { $$ = $2; } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 32e557f..b298403 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -356,6 +356,8 @@ static int compare_expr(const expr_t *a, const expr_t *b) case EXPR_DIV: case EXPR_SHL: case EXPR_SHR: + case EXPR_MEMBERPTR: + case EXPR_MEMBER: ret = compare_expr(a->ref, b->ref); if (ret != 0) return ret; @@ -3151,6 +3153,8 @@ static void write_struct_expr(FILE *h, const expr_t *e, int brackets, case EXPR_SUB: case EXPR_AND: case EXPR_OR: + case EXPR_MEMBERPTR: + case EXPR_MEMBER: if (brackets) fprintf(h, "("); write_struct_expr(h, e->ref, 1, fields, structvar); switch (e->type) { @@ -3162,6 +3166,8 @@ static void write_struct_expr(FILE *h, const expr_t *e, int brackets, case EXPR_SUB: fprintf(h, " - "); break; case EXPR_AND: fprintf(h, " & "); break; case EXPR_OR: fprintf(h, " | "); break; + case EXPR_MEMBERPTR: fprintf(h, "->"); break; + case EXPR_MEMBER: fprintf(h, "."); break; default: break; } write_struct_expr(h, e->u.ext, 1, fields, structvar); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index dfae4dd..256a3ad 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -161,6 +161,8 @@ enum expr_type EXPR_COND, EXPR_TRUEFALSE, EXPR_ADDRESSOF, + EXPR_MEMBERPTR, + EXPR_MEMBER, }; enum type_kind

1 0

Rob Shearman : widl: Automatically add "handle_t IDL_handle" parameter to functions with no explicit handle specified whose containing interface has the explicit_handle attribute .
by Alexandre Julliard April 21, 2008

April 21, 2008

Module: wine Branch: master Commit: c46fcfb356b31431cc34de1f9c6a7599db317abd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c46fcfb356b31431cc34de1f9… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 20 22:15:29 2008 +0100 widl: Automatically add "handle_t IDL_handle" parameter to functions with no explicit handle specified whose containing interface has the explicit_handle attribute. --- tools/widl/client.c | 20 -------------------- tools/widl/header.c | 14 ++++++++++++++ tools/widl/header.h | 1 + tools/widl/parser.y | 41 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 56 insertions(+), 20 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index b3f89a7..d15dfdc 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -70,25 +70,10 @@ static void check_pointers(const func_t *func) } } -const var_t* get_context_handle_var(const func_t* func) -{ - const var_t* var; - - if (!func->args) - return NULL; - - LIST_FOR_EACH_ENTRY( var, func->args, const var_t, entry ) - if (is_attr(var->attrs, ATTR_IN) && is_context_handle(var->type)) - return var; - - return NULL; -} - static void write_function_stubs(type_t *iface, unsigned int *proc_offset) { const func_t *func; const char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); - int explicit_handle = is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE); const var_t *var; int method_count = 0; @@ -110,12 +95,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) { explicit_generic_handle_var = get_explicit_generic_handle_var(func); if (!explicit_generic_handle_var) - { context_handle_var = get_context_handle_var(func); - if (!context_handle_var && explicit_handle) - /* FIXME: should use automatically added IDL_handle parameter */ - error("explicit_handle attribute specified and %s() does not define an explicit binding handle - not implemented yet\n", def->name); - } } write_type_decl_left(client, get_func_return_type(func)); diff --git a/tools/widl/header.c b/tools/widl/header.c index 8668ce9..3c89d61 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -618,6 +618,20 @@ const var_t* get_explicit_generic_handle_var(const func_t* func) return NULL; } +const var_t* get_context_handle_var(const func_t* func) +{ + const var_t* var; + + if (!func->args) + return NULL; + + LIST_FOR_EACH_ENTRY( var, func->args, const var_t, entry ) + if (is_attr(var->attrs, ATTR_IN) && is_context_handle(var->type)) + return var; + + return NULL; +} + int has_out_arg_or_return(const func_t *func) { const var_t *var; diff --git a/tools/widl/header.h b/tools/widl/header.h index 3f4fee2..e8fdbc9 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -66,6 +66,7 @@ extern void write_generic_handle_routines(void); extern const var_t* get_explicit_handle_var(const func_t* func); extern const type_t* get_explicit_generic_handle_type(const var_t* var); extern const var_t* get_explicit_generic_handle_var(const func_t* func); +extern const var_t* get_context_handle_var(const func_t* func); extern int has_out_arg_or_return(const func_t *func); extern void write_guid(FILE *f, const char *guid_prefix, const char *name, const UUID *uuid); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 4d04546..6f5dbdd 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -142,6 +142,7 @@ static attr_list_t *check_dispiface_attrs(const char *name, attr_list_t *attrs); static const attr_list_t *check_module_attrs(const char *name, const attr_list_t *attrs); static const attr_list_t *check_coclass_attrs(const char *name, const attr_list_t *attrs); const char *get_attr_display_name(enum attr_type type); +static void add_explicit_handle_if_necessary(func_t *func); #define tsENUM 1 #define tsSTRUCT 2 @@ -2482,8 +2483,48 @@ static void check_remoting_args(const func_t *func) } } +static void add_explicit_handle_if_necessary(func_t *func) +{ + const var_t* explicit_handle_var; + const var_t* explicit_generic_handle_var = NULL; + const var_t* context_handle_var = NULL; + + /* check for a defined binding handle */ + explicit_handle_var = get_explicit_handle_var(func); + if (!explicit_handle_var) + { + explicit_generic_handle_var = get_explicit_generic_handle_var(func); + if (!explicit_generic_handle_var) + { + context_handle_var = get_context_handle_var(func); + if (!context_handle_var) + { + /* no explicit handle specified so add + * "[in] handle_t IDL_handle" as the first parameter to the + * 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); + if (!func->def->type->fields_or_args) + { + func->def->type->fields_or_args = xmalloc( sizeof(*func->def->type->fields_or_args) ); + list_init( func->def->type->fields_or_args ); + } + list_add_head( func->def->type->fields_or_args, &idl_handle->entry ); + func->args = func->def->type->fields_or_args; + } + } + } +} + static void check_functions(const type_t *iface) { + if (is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE) && iface->funcs) + { + func_t *func; + LIST_FOR_EACH_ENTRY( func, iface->funcs, func_t, entry ) + add_explicit_handle_if_necessary(func); + } if (!is_inside_library && !is_attr(iface->attrs, ATTR_LOCAL)) { const func_t *func;

1 0