wine-commits May 2017

wine-commits@winehq.org

2 participants
640 discussions

Nikolay Sivov : ntdll: Move EventEnabled() to ntdll.
by Alexandre Julliard 05 May '17

05 May '17

Module: wine Branch: master Commit: 9f55292085392579568ff81b8adb926b32a8d99a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f55292085392579568ff81b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 5 18:50:16 2017 +0300 ntdll: Move EventEnabled() to ntdll. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/eventlog.c | 10 ---------- dlls/ntdll/misc.c | 9 +++++++++ dlls/ntdll/ntdll.spec | 1 + 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 7922c37..0f9e776 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -288,7 +288,7 @@ # @ stub EventAccessQuery # @ stub EventAccessRemove @ stdcall EventActivityIdControl(long ptr) -@ stdcall EventEnabled(int64 ptr) +@ stdcall EventEnabled(int64 ptr) ntdll.EtwEventEnabled @ stdcall EventProviderEnabled(int64 long int64) @ stdcall EventRegister(ptr ptr ptr ptr) ntdll.EtwEventRegister @ stdcall EventSetInformation(int64 long ptr long) ntdll.EtwEventSetInformation diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 93d814c..059c34d 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -815,16 +815,6 @@ ULONG WINAPI TraceEvent( TRACEHANDLE SessionHandle, PEVENT_TRACE_HEADER EventTra } /****************************************************************************** - * EventEnabled [ADVAPI32.@] - * - */ -BOOLEAN WINAPI EventEnabled( REGHANDLE handle, PCEVENT_DESCRIPTOR descriptor ) -{ - FIXME("(%s, %p): stub\n", wine_dbgstr_longlong(handle), descriptor); - return FALSE; -} - -/****************************************************************************** * EventProviderEnabled [ADVAPI32.@] * */ diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 40a8785..bf786d6 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -457,3 +457,12 @@ ULONG WINAPI EtwUnregisterTraceGuids( TRACEHANDLE RegistrationHandle ) FIXME("%s: stub\n", wine_dbgstr_longlong(RegistrationHandle)); return ERROR_SUCCESS; } + +/****************************************************************************** + * EtwEventEnabled (NTDLL.@) + */ +BOOLEAN WINAPI EtwEventEnabled( REGHANDLE handle, const EVENT_DESCRIPTOR *descriptor ) +{ + FIXME("(%s, %p): stub\n", wine_dbgstr_longlong(handle), descriptor); + return FALSE; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 07944ed..4decd3a 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -41,6 +41,7 @@ # @ stub DbgUiStopDebugging @ stub DbgUiWaitStateChange @ stdcall DbgUserBreakPoint() +@ stdcall EtwEventEnabled(int64 ptr) @ stdcall EtwEventRegister(ptr ptr ptr ptr) @ stdcall EtwEventSetInformation(int64 long ptr long) @ stdcall EtwEventUnregister(int64)

1 0

Jacek Caban : jscript: Added new debug channel printing details and backtrace of unwinded exceptions.
by Alexandre Julliard 05 May '17

05 May '17

Module: wine Branch: master Commit: 59c39fa1f03235d97882b72d17b0d1a08a1f8472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59c39fa1f03235d97882b72d1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 5 17:22:57 2017 +0200 jscript: Added new debug channel printing details and backtrace of unwinded exceptions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index c9e856c..74d80eb 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -28,6 +28,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(jscript); +WINE_DECLARE_DEBUG_CHANNEL(jscript_except); static const WCHAR booleanW[] = {'b','o','o','l','e','a','n',0}; static const WCHAR functionW[] = {'f','u','n','c','t','i','o','n',0}; @@ -2659,6 +2660,40 @@ static void pop_call_frame(script_ctx_t *ctx) heap_free(frame); } +static void print_backtrace(script_ctx_t *ctx) +{ + unsigned depth = 0, i; + call_frame_t *frame; + + for(frame = ctx->call_ctx; frame; frame = frame->prev_frame) { + TRACE_(jscript_except)("%u\t", depth); + depth++; + + if(frame->this_obj && frame->this_obj != to_disp(ctx->global) && frame->this_obj != ctx->host_global) + TRACE_(jscript_except)("%p->", frame->this_obj); + TRACE_(jscript_except)("%s(", frame->function->name ? debugstr_w(frame->function->name) : "[unnamed]"); + if(frame->base_scope && frame->base_scope->frame) { + for(i=0; i < frame->argc; i++) { + if(i < frame->function->param_cnt) + TRACE_(jscript_except)("%s%s=%s", i ? ", " : "", + debugstr_w(frame->function->params[i]), + debugstr_jsval(ctx->stack[local_off(frame, -i-1)])); + else + TRACE_(jscript_except)("%s%s", i ? ", " : "", + debugstr_jsval(ctx->stack[local_off(frame, -i-1)])); + } + }else { + TRACE_(jscript_except)("[detached frame]"); + } + TRACE_(jscript_except)(")\n"); + + if(!(frame->flags & EXEC_RETURN_TO_INTERP)) { + TRACE_(jscript_except)("%u\t[native code]\n", depth); + depth++; + } + } +} + static HRESULT unwind_exception(script_ctx_t *ctx, HRESULT exception_hres) { except_frame_t *except_frame; @@ -2667,6 +2702,30 @@ static HRESULT unwind_exception(script_ctx_t *ctx, HRESULT exception_hres) unsigned catch_off; HRESULT hres; + TRACE("%08x\n", exception_hres); + + if(TRACE_ON(jscript_except)) { + jsdisp_t *error_obj; + jsval_t msg; + + static const WCHAR messageW[] = {'m','e','s','s','a','g','e',0}; + + TRACE_(jscript_except)("Exception %08x %s", exception_hres, debugstr_jsval(ctx->ei.val)); + if(jsval_type(ctx->ei.val) == JSV_OBJECT) { + error_obj = to_jsdisp(get_object(ctx->ei.val)); + if(error_obj) { + hres = jsdisp_propget_name(error_obj, messageW, &msg); + if(SUCCEEDED(hres)) { + TRACE_(jscript_except)(" (message %s)", debugstr_jsval(msg)); + jsval_release(msg); + } + } + } + TRACE_(jscript_except)(" in:\n"); + + print_backtrace(ctx); + } + for(frame = ctx->call_ctx; !frame->except_frame; frame = ctx->call_ctx) { DWORD flags; @@ -2727,8 +2786,6 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, jsval_t *r) op = frame->bytecode->instrs[frame->ip].op; hres = op_funcs[op](ctx); if(FAILED(hres)) { - TRACE("EXCEPTION %08x\n", hres); - hres = unwind_exception(ctx, hres); if(FAILED(hres)) return hres;

1 0

Jacek Caban : ieframe: Return DISP_E_UNKNOWNNAME in IShellUIHelper2:: GetIDsOfNames.
by Alexandre Julliard 05 May '17

05 May '17

Module: wine Branch: master Commit: 2bb84582eb2a6e11b12c8115d387609b4922e332 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bb84582eb2a6e11b12c8115d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 5 16:57:30 2017 +0200 ieframe: Return DISP_E_UNKNOWNNAME in IShellUIHelper2::GetIDsOfNames. Also improved debug messages. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/shelluihelper.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/ieframe/shelluihelper.c b/dlls/ieframe/shelluihelper.c index 9dca681..cc636f6 100644 --- a/dlls/ieframe/shelluihelper.c +++ b/dlls/ieframe/shelluihelper.c @@ -102,9 +102,13 @@ static HRESULT WINAPI ShellUIHelper2_GetIDsOfNames(IShellUIHelper2 *iface, REFII LCID lcid, DISPID *rgDispId) { ShellUIHelper *This = impl_from_IShellUIHelper2(iface); - FIXME("(%p)->(%s %p %d %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + unsigned i; + + FIXME("(%p)->(%s %p %d %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + for(i = 0; i < cNames; i++) + FIXME("%s\n", debugstr_w(rgszNames[i])); + + return DISP_E_UNKNOWNNAME; } static HRESULT WINAPI ShellUIHelper2_Invoke(IShellUIHelper2 *iface, DISPID dispIdMember,

1 0

Huw Davies : comdlg32: Select the correct font before querying the extents.
by Alexandre Julliard 05 May '17

05 May '17

Module: wine Branch: master Commit: 5d9ab56d9e49fd026c66edd54604ecd08c8259f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d9ab56d9e49fd026c66edd54… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 5 12:36:21 2017 +0100 comdlg32: Select the correct font before querying the extents. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/itemdlg.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 92499e6..3096017 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -862,6 +862,7 @@ static void ctrl_resize(HWND hctrl, UINT min_width, UINT max_width, BOOL multili RECT rc; HDC hdc; WCHAR *c; + HFONT font; TRACE("\n"); @@ -871,7 +872,10 @@ static void ctrl_resize(HWND hctrl, UINT min_width, UINT max_width, BOOL multili SendMessageW(hctrl, WM_GETTEXT, len+1, (LPARAM)text); hdc = GetDC(hctrl); + font = (HFONT)SendMessageW(hctrl, WM_GETFONT, 0, 0); + font = SelectObject(hdc, font); GetTextExtentPoint32W(hdc, text, lstrlenW(text), &size); + SelectObject(hdc, font); ReleaseDC(hctrl, hdc); if(len && multiline)

1 0

Huw Davies : comdlg32: Set the radiobuttons' font if they' re part of a visual group.
by Alexandre Julliard 05 May '17

05 May '17

Module: wine Branch: master Commit: e77771c0bfd5af1e8e554d67b0d542fe639354c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e77771c0bfd5af1e8e554d67b… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 5 12:36:20 2017 +0100 comdlg32: Set the radiobuttons' font if they're part of a visual group. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/itemdlg.c | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index bb1e44a..92499e6 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -1316,13 +1316,34 @@ static UINT ctrl_container_resize(FileDialogImpl *This, UINT container_width) return container_height; } +static void ctrl_set_font(customctrl *ctrl, HFONT font) +{ + customctrl *sub_ctrl; + cctrl_item* item; + + SendMessageW(ctrl->hwnd, WM_SETFONT, (WPARAM)font, TRUE); + + LIST_FOR_EACH_ENTRY(sub_ctrl, &ctrl->sub_cctrls, customctrl, sub_cctrls_entry) + { + ctrl_set_font(sub_ctrl, font); + } + + if (ctrl->type == IDLG_CCTRL_RADIOBUTTONLIST) + { + LIST_FOR_EACH_ENTRY(item, &ctrl->sub_items, cctrl_item, entry) + { + SendMessageW(item->hwnd, WM_SETFONT, (WPARAM)font, TRUE); + } + } +} + static void ctrl_container_reparent(FileDialogImpl *This, HWND parent) { LONG wndstyle; if(parent) { - customctrl *ctrl, *sub_ctrl; + customctrl *ctrl; HFONT font; wndstyle = GetWindowLongW(This->cctrls_hwnd, GWL_STYLE); @@ -1340,23 +1361,7 @@ static void ctrl_container_reparent(FileDialogImpl *This, HWND parent) LIST_FOR_EACH_ENTRY(ctrl, &This->cctrls, customctrl, entry) { - if(font) SendMessageW(ctrl->hwnd, WM_SETFONT, (WPARAM)font, TRUE); - - /* If this is a VisualGroup */ - LIST_FOR_EACH_ENTRY(sub_ctrl, &ctrl->sub_cctrls, customctrl, sub_cctrls_entry) - { - if(font) SendMessageW(sub_ctrl->hwnd, WM_SETFONT, (WPARAM)font, TRUE); - } - - if (ctrl->type == IDLG_CCTRL_RADIOBUTTONLIST) - { - cctrl_item* item; - LIST_FOR_EACH_ENTRY(item, &ctrl->sub_items, cctrl_item, entry) - { - if (font) SendMessageW(item->hwnd, WM_SETFONT, (WPARAM)font, TRUE); - } - } - + if(font) ctrl_set_font(ctrl, font); customctrl_resize(This, ctrl); } }

1 0

Huw Davies : comdlg32: Use pixel sizes throughout.
by Alexandre Julliard 05 May '17

05 May '17

Module: wine Branch: master Commit: 00994524f510b2b2f86d45290dfc624f75045854 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00994524f510b2b2f86d45290… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 5 12:36:19 2017 +0100 comdlg32: Use pixel sizes throughout. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/itemdlg.c | 52 +++++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 5d0c6e9..bb1e44a 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -136,7 +136,7 @@ typedef struct FileDialogImpl { LPWSTR custom_filenamelabel; UINT cctrl_width, cctrl_def_height, cctrls_cols; - UINT cctrl_indent; + UINT cctrl_indent, dpi_x, dpi_y; HWND cctrls_hwnd; struct list cctrls; UINT_PTR cctrl_next_dlgid; @@ -856,7 +856,7 @@ static inline customctrl *get_cctrl(FileDialogImpl *This, DWORD ctlid) static void ctrl_resize(HWND hctrl, UINT min_width, UINT max_width, BOOL multiline) { LPWSTR text; - UINT len, final_width, dpi; + UINT len, final_width; UINT lines, final_height; SIZE size; RECT rc; @@ -872,12 +872,8 @@ static void ctrl_resize(HWND hctrl, UINT min_width, UINT max_width, BOOL multili hdc = GetDC(hctrl); GetTextExtentPoint32W(hdc, text, lstrlenW(text), &size); - dpi = GetDeviceCaps(hdc, LOGPIXELSX); ReleaseDC(hctrl, hdc); - min_width = MulDiv(min_width, dpi, USER_DEFAULT_SCREEN_DPI); - max_width = MulDiv(max_width, dpi, USER_DEFAULT_SCREEN_DPI); - if(len && multiline) { /* FIXME: line-wrap */ @@ -938,7 +934,7 @@ static void customctrl_resize(FileDialogImpl *This, customctrl *ctrl) { RECT rc; UINT total_height; - UINT max_width; + UINT max_width, size; customctrl *sub_ctrl; switch(ctrl->type) @@ -947,7 +943,8 @@ static void customctrl_resize(FileDialogImpl *This, customctrl *ctrl) case IDLG_CCTRL_COMBOBOX: case IDLG_CCTRL_CHECKBUTTON: case IDLG_CCTRL_TEXT: - ctrl_resize(ctrl->hwnd, 160, 160, TRUE); + size = MulDiv(160, This->dpi_x, USER_DEFAULT_SCREEN_DPI); + ctrl_resize(ctrl->hwnd, size, size, TRUE); GetWindowRect(ctrl->hwnd, &rc); SetWindowPos(ctrl->wrapper_hwnd, NULL, 0, 0, rc.right-rc.left, rc.bottom-rc.top, SWP_NOZORDER|SWP_NOMOVE); @@ -989,7 +986,8 @@ static void customctrl_resize(FileDialogImpl *This, customctrl *ctrl) LIST_FOR_EACH_ENTRY(item, &ctrl->sub_items, cctrl_item, entry) { - ctrl_resize(item->hwnd, 160, 160, TRUE); + size = MulDiv(160, This->dpi_x, USER_DEFAULT_SCREEN_DPI); + ctrl_resize(item->hwnd, size, size, TRUE); SetWindowPos(item->hwnd, NULL, 0, total_height, 0, 0, SWP_NOZORDER|SWP_NOSIZE); @@ -1204,8 +1202,8 @@ static UINT ctrl_container_resize(FileDialogImpl *This, UINT container_width) UINT cur_col_pos, cur_row_pos; customctrl *ctrl; BOOL fits_height; - static const UINT cspacing = 90; /* Columns are spaced with 90px */ - static const UINT rspacing = 4; /* Rows are spaced with 4 px. */ + UINT cspacing = MulDiv(90, This->dpi_x, USER_DEFAULT_SCREEN_DPI); /* Columns are spaced with 90px */ + UINT rspacing = MulDiv(4, This->dpi_y, USER_DEFAULT_SCREEN_DPI); /* Rows are spaced with 4 px. */ /* Given the new width of the container, this function determines the * needed height of the container and places the controls according to @@ -1484,20 +1482,12 @@ static LRESULT CALLBACK radiobuttonlist_proc(HWND hwnd, UINT message, WPARAM wpa static HRESULT init_custom_controls(FileDialogImpl *This) { WNDCLASSW wc; + HDC hdc; static const WCHAR ctrl_container_classname[] = {'i','d','l','g','_','c','o','n','t','a','i','n','e','r','_','p','a','n','e',0}; InitCommonControlsEx(NULL); - This->cctrl_width = 160; /* Controls have a fixed width */ - This->cctrl_indent = 100; - This->cctrl_def_height = 23; - This->cctrls_cols = 0; - - This->cctrl_next_dlgid = 0x2000; - list_init(&This->cctrls); - This->cctrl_active_vg = NULL; - if( !GetClassInfoW(COMDLG32_hInstance, ctrl_container_classname, &wc) ) { wc.style = CS_HREDRAW | CS_VREDRAW; @@ -1521,6 +1511,20 @@ static HRESULT init_custom_controls(FileDialogImpl *This) if(!This->cctrls_hwnd) return E_FAIL; + hdc = GetDC(This->cctrls_hwnd); + This->dpi_x = GetDeviceCaps(hdc, LOGPIXELSX); + This->dpi_y = GetDeviceCaps(hdc, LOGPIXELSY); + ReleaseDC(This->cctrls_hwnd, hdc); + + This->cctrl_width = MulDiv(160, This->dpi_x, USER_DEFAULT_SCREEN_DPI); /* Controls have a fixed width */ + This->cctrl_indent = MulDiv(100, This->dpi_x, USER_DEFAULT_SCREEN_DPI); + This->cctrl_def_height = MulDiv(23, This->dpi_y, USER_DEFAULT_SCREEN_DPI); + This->cctrls_cols = 0; + + This->cctrl_next_dlgid = 0x2000; + list_init(&This->cctrls); + This->cctrl_active_vg = NULL; + SetWindowLongW(This->cctrls_hwnd, GWL_STYLE, WS_TABSTOP); /* Register class for */ @@ -1922,6 +1926,8 @@ static void update_control_text(FileDialogImpl *This) HWND hitem; LPCWSTR custom_okbutton; cctrl_item* item; + UINT min_width = MulDiv(50, This->dpi_x, USER_DEFAULT_SCREEN_DPI); + UINT max_width = MulDiv(250, This->dpi_x, USER_DEFAULT_SCREEN_DPI); if(This->custom_title) SetWindowTextW(This->dlg_hwnd, This->custom_title); @@ -1935,21 +1941,21 @@ static void update_control_text(FileDialogImpl *This) (hitem = GetDlgItem(This->dlg_hwnd, IDOK))) { SetWindowTextW(hitem, custom_okbutton); - ctrl_resize(hitem, 50, 250, FALSE); + ctrl_resize(hitem, min_width, max_width, FALSE); } if(This->custom_cancelbutton && (hitem = GetDlgItem(This->dlg_hwnd, IDCANCEL))) { SetWindowTextW(hitem, This->custom_cancelbutton); - ctrl_resize(hitem, 50, 250, FALSE); + ctrl_resize(hitem, min_width, max_width, FALSE); } if(This->custom_filenamelabel && (hitem = GetDlgItem(This->dlg_hwnd, IDC_FILENAMESTATIC))) { SetWindowTextW(hitem, This->custom_filenamelabel); - ctrl_resize(hitem, 50, 250, FALSE); + ctrl_resize(hitem, min_width, max_width, FALSE); } }

1 0

Hugh McMaster : regedit: Merge processRegLinesA/W() into their caller.
by Alexandre Julliard 05 May '17

05 May '17

Module: wine Branch: master Commit: 82246874d2878692f123d29b5b45bfa1b8630064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82246874d2878692f123d29b5… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri May 5 09:42:33 2017 +0000 regedit: Merge processRegLinesA/W() into their caller. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 41 ++++++++++------------------------------- 1 file changed, 10 insertions(+), 31 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index bb05ebf..01c9c76 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -745,22 +745,6 @@ cleanup: return NULL; } -static BOOL processRegLinesA(FILE *fp, WCHAR *(*get_line)(FILE *), int reg_version) -{ - WCHAR *line; - - while ((line = get_line(fp))) - { - if (reg_version == REG_VERSION_31) - processRegEntry31(line); - else - processRegEntry(line, FALSE); - } - - closeKey(); - return TRUE; -} - static WCHAR *get_lineW(FILE *fp) { static size_t size; @@ -830,17 +814,6 @@ cleanup: return NULL; } -static BOOL processRegLinesW(FILE *fp, WCHAR *(*get_line)(FILE *)) -{ - WCHAR *line; - - while ((line = get_line(fp))) - processRegEntry(line, TRUE); - - closeKey(); - return TRUE; -} - /****************************************************************************** * Checks whether the buffer has enough room for the string or required size. * Resizes the buffer if necessary. @@ -1346,10 +1319,16 @@ BOOL import_registry_file(FILE* reg_file) return reg_version == REG_VERSION_FUZZY; } - if (is_unicode) - return processRegLinesW(reg_file, get_lineW); - else - return processRegLinesA(reg_file, get_lineA, reg_version); + while ((line = get_line(reg_file))) + { + if (reg_version == REG_VERSION_31) + processRegEntry31(line); + else + processRegEntry(line, is_unicode); + } + + closeKey(); + return TRUE; } /******************************************************************************

1 0

Hugh McMaster : regedit: Merge header checks from processRegLinesA/W() to their caller.
by Alexandre Julliard 05 May '17

05 May '17

Module: wine Branch: master Commit: e8f0a8b38b7da79d7706ee604b707b5cb2b039b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8f0a8b38b7da79d7706ee604… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri May 5 09:42:21 2017 +0000 regedit: Merge header checks from processRegLinesA/W() to their caller. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 61 +++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index a65f879..bb05ebf 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -745,26 +745,9 @@ cleanup: return NULL; } -static BOOL processRegLinesA(FILE *fp, WCHAR *(*get_line)(FILE *), char *two_chars) +static BOOL processRegLinesA(FILE *fp, WCHAR *(*get_line)(FILE *), int reg_version) { - WCHAR *line, *header; - int reg_version; - - line = get_line(fp); - - header = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(line) + 3) * sizeof(WCHAR)); - CHECK_ENOUGH_MEMORY(header); - header[0] = two_chars[0]; - header[1] = two_chars[1]; - lstrcpyW(header + 2, line); - - reg_version = parse_file_header(header); - HeapFree(GetProcessHeap(), 0, header); - if (reg_version == REG_VERSION_FUZZY || reg_version == REG_VERSION_INVALID) - { - get_line(NULL); /* Reset static variables */ - return reg_version == REG_VERSION_FUZZY; - } + WCHAR *line; while ((line = get_line(fp))) { @@ -850,15 +833,6 @@ cleanup: static BOOL processRegLinesW(FILE *fp, WCHAR *(*get_line)(FILE *)) { WCHAR *line; - int reg_version; - - line = get_line(fp); - reg_version = parse_file_header(line); - if (reg_version == REG_VERSION_FUZZY || reg_version == REG_VERSION_INVALID) - { - get_line(NULL); /* Reset static variables */ - return reg_version == REG_VERSION_FUZZY; - } while ((line = get_line(fp))) processRegEntry(line, TRUE); @@ -1341,14 +1315,41 @@ BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format) BOOL import_registry_file(FILE* reg_file) { BYTE s[2]; + BOOL is_unicode; + WCHAR *(*get_line)(FILE *); + WCHAR *line, *header; + int reg_version; if (!reg_file || (fread(s, 2, 1, reg_file) != 1)) return FALSE; - if (s[0] == 0xff && s[1] == 0xfe) + is_unicode = (s[0] == 0xff && s[1] == 0xfe); + get_line = is_unicode ? get_lineW : get_lineA; + + line = get_line(reg_file); + + if (!is_unicode) + { + header = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(line) + 3) * sizeof(WCHAR)); + CHECK_ENOUGH_MEMORY(header); + header[0] = s[0]; + header[1] = s[1]; + lstrcpyW(header + 2, line); + reg_version = parse_file_header(header); + HeapFree(GetProcessHeap(), 0, header); + } + else reg_version = parse_file_header(line); + + if (reg_version == REG_VERSION_FUZZY || reg_version == REG_VERSION_INVALID) + { + get_line(NULL); /* Reset static variables */ + return reg_version == REG_VERSION_FUZZY; + } + + if (is_unicode) return processRegLinesW(reg_file, get_lineW); else - return processRegLinesA(reg_file, get_lineA, (char *)s); + return processRegLinesA(reg_file, get_lineA, reg_version); } /******************************************************************************

1 0

Józef Kucia : d3d10: Validate SDK version.
by Alexandre Julliard 05 May '17

05 May '17

Module: wine Branch: master Commit: 1a86bc9d758c6d0c7c14ad8b152ae8ab4aded38f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a86bc9d758c6d0c7c14ad8b1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 5 11:59:23 2017 +0200 d3d10: Validate SDK version. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_main.c | 30 ++++++++++++++++++------------ dlls/d3d10/tests/device.c | 23 +++++++++++++++++++++++ 2 files changed, 41 insertions(+), 12 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index c9d5531..52585f0 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -33,16 +33,22 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver IDXGIFactory *factory; HRESULT hr; - TRACE("adapter %p, driver_type %s, swrast %p, flags %#x, sdk_version %d, device %p\n", + TRACE("adapter %p, driver_type %s, swrast %p, flags %#x, sdk_version %#x, device %p.\n", adapter, debug_d3d10_driver_type(driver_type), swrast, flags, sdk_version, device); + if (sdk_version != D3D10_SDK_VERSION) + { + WARN("Invalid SDK version %#x.\n", sdk_version); + return E_INVALIDARG; + } + if (adapter) { IDXGIAdapter_AddRef(adapter); hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); if (FAILED(hr)) { - WARN("Failed to get dxgi factory, returning %#x\n", hr); + WARN("Failed to get dxgi factory, returning %#x.\n", hr); return hr; } } @@ -51,18 +57,18 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory); if (FAILED(hr)) { - WARN("Failed to create dxgi factory, returning %#x\n", hr); + WARN("Failed to create dxgi factory, returning %#x.\n", hr); return hr; } - switch(driver_type) + switch (driver_type) { case D3D10_DRIVER_TYPE_HARDWARE: { hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); if (FAILED(hr)) { - WARN("No adapters found, returning %#x\n", hr); + WARN("No adapters found, returning %#x.\n", hr); IDXGIFactory_Release(factory); return hr; } @@ -70,14 +76,14 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver } case D3D10_DRIVER_TYPE_NULL: - FIXME("NULL device not implemented, falling back to refrast\n"); + FIXME("NULL device not implemented, falling back to refrast.\n"); /* fall through, for now */ case D3D10_DRIVER_TYPE_REFERENCE: { HMODULE refrast = LoadLibraryA("d3d10ref.dll"); if (!refrast) { - WARN("Failed to load refrast, returning E_FAIL\n"); + WARN("Failed to load refrast, returning E_FAIL.\n"); IDXGIFactory_Release(factory); return E_FAIL; } @@ -85,7 +91,7 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver FreeLibrary(refrast); if (FAILED(hr)) { - WARN("Failed to create a software adapter, returning %#x\n", hr); + WARN("Failed to create a software adapter, returning %#x.\n", hr); IDXGIFactory_Release(factory); return hr; } @@ -96,14 +102,14 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver { if (!swrast) { - WARN("Software device requested, but NULL swrast passed, returning E_FAIL\n"); + WARN("Software device requested, but NULL swrast passed, returning E_FAIL.\n"); IDXGIFactory_Release(factory); return E_FAIL; } hr = IDXGIFactory_CreateSoftwareAdapter(factory, swrast, &adapter); if (FAILED(hr)) { - WARN("Failed to create a software adapter, returning %#x\n", hr); + WARN("Failed to create a software adapter, returning %#x.\n", hr); IDXGIFactory_Release(factory); return hr; } @@ -122,11 +128,11 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver IDXGIFactory_Release(factory); if (FAILED(hr)) { - WARN("Failed to create a device, returning %#x\n", hr); + WARN("Failed to create a device, returning %#x.\n", hr); return hr; } - TRACE("Created ID3D10Device %p\n", *device); + TRACE("Created ID3D10Device %p.\n", *device); return hr; } diff --git a/dlls/d3d10/tests/device.c b/dlls/d3d10/tests/device.c index fa8f708..3e2731d 100644 --- a/dlls/d3d10/tests/device.c +++ b/dlls/d3d10/tests/device.c @@ -21,6 +21,28 @@ #include "d3d10.h" #include "wine/test.h" +static void test_create_device(void) +{ + ID3D10Device *device; + unsigned int i; + HRESULT hr; + + if (FAILED(hr = D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_SDK_VERSION, &device))) + { + skip("Failed to create HAL device.\n"); + return; + } + ID3D10Device_Release(device); + + for (i = 0; i < 100; ++i) + { + if (i == D3D10_SDK_VERSION) + continue; + hr = D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, i, &device); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x for SDK version %#x.\n", hr, i); + } +} + static void test_stateblock_mask(void) { static const struct @@ -181,5 +203,6 @@ static void test_stateblock_mask(void) START_TEST(device) { + test_create_device(); test_stateblock_mask(); }

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_HSGetSamplers().
by Alexandre Julliard 05 May '17

05 May '17

Module: wine Branch: master Commit: 06d3244d2404e8f99329bf1b365db4aee02a75de URL: http://source.winehq.org/git/wine.git/?a=commit;h=06d3244d2404e8f99329bf1b3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 5 09:06:31 2017 +0200 d3d11: Implement d3d11_immediate_context_HSGetSamplers(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 0a432be..f4e540c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2078,8 +2078,28 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShader(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetSamplers(ID3D11DeviceContext *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState **samplers) { - FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", iface, start_slot, sampler_count, samplers); + + wined3d_mutex_lock(); + for (i = 0; i < sampler_count; ++i) + { + struct wined3d_sampler *wined3d_sampler; + struct d3d_sampler_state *sampler_impl; + + if (!(wined3d_sampler = wined3d_device_get_hs_sampler(device->wined3d_device, start_slot + i))) + { + samplers[i] = NULL; + continue; + } + + sampler_impl = wined3d_sampler_get_parent(wined3d_sampler); + ID3D11SamplerState_AddRef(samplers[i] = &sampler_impl->ID3D11SamplerState_iface); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetConstantBuffers(ID3D11DeviceContext *iface,

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2017