February 2019 - Wine-commits

Gabriel Ivăncescu : user32/listbox: Use a helper to set the selected item state.
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: 84ac6eebaa583bfc30bb54d6b5a5e4cd61748304 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84ac6eebaa583bfc30bb54d6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 14 14:06:47 2019 +0200 user32/listbox: Use a helper to set the selected item state. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index f2d12ed..7f9076f 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -165,6 +165,12 @@ static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) return descr->items[index].selected; } +static void set_item_selected_state(LB_DESCR *descr, UINT index, BOOL state) +{ + if (descr->style & (LBS_MULTIPLESEL | LBS_EXTENDEDSEL)) + descr->items[index].selected = state; +} + /********************************************************************* * listbox class descriptor */ @@ -1443,7 +1449,7 @@ static LRESULT LISTBOX_SelectItemRange( LB_DESCR *descr, INT first, for (i = first; i <= last; i++) { if (is_item_selected(descr, i)) continue; - descr->items[i].selected = TRUE; + set_item_selected_state(descr, i, TRUE); LISTBOX_InvalidateItemRect(descr, i); } } @@ -1452,7 +1458,7 @@ static LRESULT LISTBOX_SelectItemRange( LB_DESCR *descr, INT first, for (i = first; i <= last; i++) { if (!is_item_selected(descr, i)) continue; - descr->items[i].selected = FALSE; + set_item_selected_state(descr, i, FALSE); LISTBOX_InvalidateItemRect(descr, i); } } @@ -1485,8 +1491,8 @@ static LRESULT LISTBOX_SetSelection( LB_DESCR *descr, INT index, { INT oldsel = descr->selected_item; if (index == oldsel) return LB_OKAY; - if (oldsel != -1) descr->items[oldsel].selected = FALSE; - if (index != -1) descr->items[index].selected = TRUE; + if (oldsel != -1) set_item_selected_state(descr, oldsel, FALSE); + if (index != -1) set_item_selected_state(descr, index, TRUE); descr->selected_item = index; if (oldsel != -1) LISTBOX_RepaintItem( descr, oldsel, ODA_SELECT ); if (index != -1) LISTBOX_RepaintItem( descr, index, ODA_SELECT );

1 0

Gabriel Ivăncescu : user32/listbox: Send LB_RESETCONTENT from RemoveItem rather than DeleteItem.
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: 0beea9f4748abb900aae0052e803cbf956df2e9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0beea9f4748abb900aae0052… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 14 14:06:48 2019 +0200 user32/listbox: Send LB_RESETCONTENT from RemoveItem rather than DeleteItem. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 7f9076f..2e0f17b 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1665,19 +1665,12 @@ static LRESULT LISTBOX_InsertString( LB_DESCR *descr, INT index, LPCWSTR str ) */ static void LISTBOX_DeleteItem( LB_DESCR *descr, INT index ) { - /* save the item data before it gets freed by LB_RESETCONTENT */ - ULONG_PTR item_data = get_item_data(descr, index); - LPWSTR item_str = get_item_string(descr, index); - - if (!descr->nb_items) - SendMessageW( descr->self, LB_RESETCONTENT, 0, 0 ); - /* Note: Win 3.1 only sends DELETEITEM on owner-draw items, * while Win95 sends it for all items with user data. * It's probably better to send it too often than not * often enough, so this is what we do here. */ - if (IS_OWNERDRAW(descr) || item_data) + if (IS_OWNERDRAW(descr) || get_item_data(descr, index)) { DELETEITEMSTRUCT dis; UINT id = (UINT)GetWindowLongPtrW( descr->self, GWLP_ID ); @@ -1686,10 +1679,10 @@ static void LISTBOX_DeleteItem( LB_DESCR *descr, INT index ) dis.CtlID = id; dis.itemID = index; dis.hwndItem = descr->self; - dis.itemData = item_data; + dis.itemData = get_item_data(descr, index); SendMessageW( descr->owner, WM_DELETEITEM, id, (LPARAM)&dis ); } - HeapFree( GetProcessHeap(), 0, item_str ); + HeapFree( GetProcessHeap(), 0, get_item_string(descr, index) ); } @@ -1707,11 +1700,14 @@ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) /* We need to invalidate the original rect instead of the updated one. */ LISTBOX_InvalidateItems( descr, index ); + if (descr->nb_items == 1) + { + SendMessageW(descr->self, LB_RESETCONTENT, 0, 0); + return LB_OKAY; + } descr->nb_items--; LISTBOX_DeleteItem( descr, index ); - if (!descr->nb_items) return LB_OKAY; - /* Remove the item */ item = &descr->items[index];

1 0

Huw Davies : user32/listbox: Remove some unnecessary differences to the comctl32 version.
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: 6a421988df5a8cc34cf4f36b8fbf3c9cfc471449 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a421988df5a8cc34cf4f36b… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 15 09:40:29 2019 +0000 user32/listbox: Remove some unnecessary differences to the comctl32 version. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 2e0f17b..118f564 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -84,10 +84,10 @@ typedef struct INT wheel_remain; /* Left over scroll amount */ BOOL caret_on; /* Is caret on? */ BOOL captured; /* Is mouse captured? */ - BOOL in_focus; + BOOL in_focus; HFONT font; /* Current font */ - LCID locale; /* Current locale for string comparisons */ - LPHEADCOMBO lphc; /* ComboLBox */ + LCID locale; /* Current locale for string comparisons */ + HEADCOMBO *lphc; /* ComboLBox */ } LB_DESCR; @@ -558,7 +558,7 @@ static INT LISTBOX_GetItemFromPoint( const LB_DESCR *descr, INT x, INT y ) * * Paint an item. */ -static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, +static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, INT index, UINT action, BOOL ignoreFocus ) { BOOL selected = FALSE, focused; @@ -806,6 +806,7 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL SetLastError(ERROR_INVALID_INDEX); return LB_ERR; } + if (HAS_STRINGS(descr)) { WCHAR *str = get_item_string(descr, index); @@ -818,7 +819,7 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL return WideCharToMultiByte( CP_ACP, 0, str, len, NULL, 0, NULL, NULL ); } - TRACE("index %d (0x%04x) %s\n", index, index, debugstr_w(str)); + TRACE("index %d (0x%04x) %s\n", index, index, debugstr_w(str)); __TRY /* hide a Delphi bug that passes a read-only buffer */ { @@ -840,7 +841,8 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL return LB_ERR; } __ENDTRY - } else { + } else + { if (buffer) *((ULONG_PTR *)buffer) = get_item_data(descr, index); len = sizeof(ULONG_PTR); @@ -1074,7 +1076,7 @@ static LRESULT LISTBOX_Paint( LB_DESCR *descr, HDC hdc ) if (descr->font) oldFont = SelectObject( hdc, descr->font ); hbrush = (HBRUSH)SendMessageW( descr->owner, WM_CTLCOLORLISTBOX, - (WPARAM)hdc, (LPARAM)descr->self ); + (WPARAM)hdc, (LPARAM)descr->self ); if (hbrush) oldBrush = SelectObject( hdc, hbrush ); if (!IsWindowEnabled(descr->self)) SetTextColor( hdc, GetSysColor( COLOR_GRAYTEXT ) ); @@ -2600,7 +2602,7 @@ static BOOL LISTBOX_Destroy( LB_DESCR *descr ) LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) { LB_DESCR *descr = (LB_DESCR *)GetWindowLongPtrW( hwnd, 0 ); - LPHEADCOMBO lphc = 0; + HEADCOMBO *lphc = NULL; LRESULT ret; if (!descr) @@ -2878,10 +2880,10 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam if(!unicode && HAS_STRINGS(descr)) HeapFree(GetProcessHeap(), 0, textW); if (index != LB_ERR) - { + { LISTBOX_MoveCaret( descr, index, TRUE ); LISTBOX_SetSelection( descr, index, TRUE, FALSE ); - } + } return index; } @@ -3092,7 +3094,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam LISTBOX_HandleMouseMove( descr, mousePos.x, mousePos.y); descr->captured = captured; - } + } else if (GetCapture() == descr->self) { LISTBOX_HandleMouseMove( descr, (INT16)LOWORD(lParam),

1 0

Alexandre Julliard : server: Report a 64-bit CPU for IL-only binaries.
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: 9381da9f1c8a685f806b922383c7f9356f87d94d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9381da9f1c8a685f806b9223… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 15 15:52:50 2019 +0100 server: Report a 64-bit CPU for IL-only binaries. Based on a patch by Brendan McGrath. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46319 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mapping.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/mapping.c b/server/mapping.c index 37c17b0..085d7aa 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -722,7 +722,11 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.image_flags |= IMAGE_FLAGS_ComPlusILOnly; if (nt.opt.hdr32.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC && !(clr.Flags & COMIMAGE_FLAGS_32BITREQUIRED)) + { mapping->image.image_flags |= IMAGE_FLAGS_ComPlusNativeReady; + if (cpu_mask & CPU_FLAG(CPU_x86_64)) mapping->image.cpu = CPU_x86_64; + else if (cpu_mask & CPU_FLAG(CPU_ARM64)) mapping->image.cpu = CPU_ARM64; + } } if (!build_shared_mapping( mapping, unix_fd, sec, nt.FileHeader.NumberOfSections ))

1 0

Zebediah Figura : wined3d: Get rid of the "update_state" field from struct wined3d_device.
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: 477e01af718ec7dbff628bdac9a173e834bd9ea2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=477e01af718ec7dbff628bda… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 15 00:38:12 2019 -0600 wined3d: Get rid of the "update_state" field from struct wined3d_device. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 16 ++++++---------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6831c63..d9d6cf2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2055,13 +2055,13 @@ void CDECL wined3d_device_set_rasterizer_state(struct wined3d_device *device, TRACE("device %p, rasterizer_state %p.\n", device, rasterizer_state); - prev = device->update_state->rasterizer_state; + prev = device->state.rasterizer_state; if (prev == rasterizer_state) return; if (rasterizer_state) wined3d_rasterizer_state_incref(rasterizer_state); - device->update_state->rasterizer_state = rasterizer_state; + device->state.rasterizer_state = rasterizer_state; wined3d_cs_emit_set_rasterizer_state(device->cs, rasterizer_state); if (prev) wined3d_rasterizer_state_decref(prev); @@ -2802,12 +2802,12 @@ void CDECL wined3d_device_set_hull_shader(struct wined3d_device *device, struct TRACE("device %p, shader %p.\n", device, shader); - prev = device->update_state->shader[WINED3D_SHADER_TYPE_HULL]; + prev = device->state.shader[WINED3D_SHADER_TYPE_HULL]; if (shader == prev) return; if (shader) wined3d_shader_incref(shader); - device->update_state->shader[WINED3D_SHADER_TYPE_HULL] = shader; + device->state.shader[WINED3D_SHADER_TYPE_HULL] = shader; wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_HULL, shader); if (prev) wined3d_shader_decref(prev); @@ -2857,12 +2857,12 @@ void CDECL wined3d_device_set_domain_shader(struct wined3d_device *device, struc TRACE("device %p, shader %p.\n", device, shader); - prev = device->update_state->shader[WINED3D_SHADER_TYPE_DOMAIN]; + prev = device->state.shader[WINED3D_SHADER_TYPE_DOMAIN]; if (shader == prev) return; if (shader) wined3d_shader_incref(shader); - device->update_state->shader[WINED3D_SHADER_TYPE_DOMAIN] = shader; + device->state.shader[WINED3D_SHADER_TYPE_DOMAIN] = shader; wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_DOMAIN, shader); if (prev) wined3d_shader_decref(prev); @@ -3636,7 +3636,6 @@ HRESULT CDECL wined3d_device_begin_stateblock(struct wined3d_device *device) return hr; device->recording = stateblock; - device->update_state = &stateblock->state; device->update_stateblock_state = &stateblock->stateblock_state; TRACE("Recording stateblock %p.\n", stateblock); @@ -3662,7 +3661,6 @@ HRESULT CDECL wined3d_device_end_stateblock(struct wined3d_device *device, *stateblock = object; device->recording = NULL; - device->update_state = &device->state; device->update_stateblock_state = &device->stateblock_state; TRACE("Returning stateblock %p.\n", *stateblock); @@ -5094,7 +5092,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, memset(&device->state, 0, sizeof(device->state)); state_init(&device->state, &device->fb, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); - device->update_state = &device->state; memset(&device->stateblock_state, 0, sizeof(device->stateblock_state)); wined3d_stateblock_state_init(&device->stateblock_state, device, WINED3D_STATE_INIT_DEFAULT); device->update_stateblock_state = &device->stateblock_state; @@ -5371,7 +5368,6 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, } state_init(&device->state, &device->fb, &adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); - device->update_state = &device->state; wined3d_stateblock_state_init(&device->stateblock_state, device, WINED3D_STATE_INIT_DEFAULT); device->update_stateblock_state = &device->stateblock_state; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index eaca69b..fbde36c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3047,7 +3047,6 @@ struct wined3d_device enum wined3d_feature_level feature_level; struct wined3d_state state; - struct wined3d_state *update_state; struct wined3d_stateblock *recording; struct wined3d_stateblock_state stateblock_state; struct wined3d_stateblock_state *update_stateblock_state;

1 0

Piotr Caban : msvcrt: Use mbtowc/wctomb for string conversion in printf.
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: a808235e459e3cbd4b6a1f7d9392b7c50b3a3478 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a808235e459e3cbd4b6a1f7d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 14 18:27:59 2019 +0100 msvcrt: Use mbtowc/wctomb for string conversion in printf. This changes printf behaviour for C locale. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 2 + dlls/msvcrt/printf.h | 97 +++++++++++++++++++++++++++++----------------- dlls/msvcrt/tests/printf.c | 12 ++++++ 3 files changed, 75 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a808235e459e3cbd4b6a…

1 0

Piotr Caban : msvcrt: Use correct locale when validating character in _ismbcl0_l and _ismbcl1_l.
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: 7d383d573da3b29614e1adc343f34d762176e42e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d383d573da3b29614e1adc3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 12:24:37 2019 +0100 msvcrt: Use correct locale when validating character in _ismbcl0_l and _ismbcl1_l. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mbcs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 909ea46..c8ee84d 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2566,7 +2566,7 @@ int CDECL _ismbcl0_l(unsigned int c, MSVCRT__locale_t locale) if(mbcinfo->mbcodepage == 932) { /* JIS non-Kanji */ - return _ismbclegal(c) && c >= 0x8140 && c <= 0x889e; + return _ismbclegal_l(c, locale) && c >= 0x8140 && c <= 0x889e; } return 0; @@ -2595,7 +2595,7 @@ int CDECL _ismbcl1_l(unsigned int c, MSVCRT__locale_t locale) if(mbcinfo->mbcodepage == 932) { /* JIS level-1 */ - return _ismbclegal(c) && c >= 0x889f && c <= 0x9872; + return _ismbclegal_l(c, locale) && c >= 0x889f && c <= 0x9872; } return 0;

1 0

Nikolay Sivov : msvcrt: Add _ismbcl2_l().
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: c166dfec00419c13b29684d0e77d993e0a586c1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c166dfec00419c13b29684d0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 15 12:24:48 2019 +0100 msvcrt: Add _ismbcl2_l(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-multibyte-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 21 +++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec index 270e2c2..3f60bb4 100644 --- a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec +++ b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec @@ -43,7 +43,7 @@ @ cdecl _ismbcl1(long) ucrtbase._ismbcl1 @ cdecl _ismbcl1_l(long ptr) ucrtbase._ismbcl1_l @ cdecl _ismbcl2(long) ucrtbase._ismbcl2 -@ stub _ismbcl2_l +@ cdecl _ismbcl2_l(long ptr) ucrtbase._ismbcl2_l @ cdecl _ismbclegal(long) ucrtbase._ismbclegal @ cdecl _ismbclegal_l(long ptr) ucrtbase._ismbclegal_l @ cdecl _ismbclower(long) ucrtbase._ismbclower diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 202042d..eefa573 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -991,7 +991,7 @@ @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) -@ stub _ismbcl2_l +@ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) @ cdecl _ismbclower(long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 1f4bfe3..a6ed5c1 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1337,7 +1337,7 @@ @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) -@ stub _ismbcl2_l +@ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) @ stub _ismbclower(long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 7e03eb1..441c0be 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1342,7 +1342,7 @@ @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) -@ stub _ismbcl2_l +@ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) @ stub _ismbclower(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 7dc4ea8..43c3e46 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -663,7 +663,7 @@ @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) -@ stub _ismbcl2_l +@ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) @ cdecl _ismbclower(long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 16a2473..a9bf0a2 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -641,7 +641,7 @@ @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) -@ stub _ismbcl2_l +@ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) @ cdecl _ismbclower(long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index c8ee84d..ca6dca3 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2608,3 +2608,24 @@ int CDECL _ismbcl1(unsigned int c) { return _ismbcl1_l(c, NULL); } + +/********************************************************************* + * _ismbcl2_l (MSVCRT.@) + */ +int CDECL _ismbcl2_l(unsigned int c, MSVCRT__locale_t locale) +{ + MSVCRT_pthreadmbcinfo mbcinfo; + + if(!locale) + mbcinfo = get_mbcinfo(); + else + mbcinfo = locale->mbcinfo; + + if(mbcinfo->mbcodepage == 932) + { + /* JIS level-2 */ + return _ismbclegal_l(c, locale) && c >= 0x989f && c <= 0xeaa4; + } + + return 0; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 1f9ad64..42de9ce 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -612,7 +612,7 @@ @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) -# stub _ismbcl2_l(long ptr) +@ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) @ cdecl _ismbclower(long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index db894a0..e1315ec 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -481,7 +481,7 @@ @ cdecl _ismbcl1(long) @ cdecl _ismbcl1_l(long ptr) @ stub _ismbcl2(long) -@ stub _ismbcl2_l +@ cdecl _ismbcl2_l(long ptr) @ cdecl _ismbclegal(long) @ cdecl _ismbclegal_l(long ptr) @ stub _ismbclower(long)

1 0

Alexandre Julliard : ntdll: Rename attach_dlls() to LdrInitializeThunk().
by Alexandre Julliard 14 Feb '19

14 Feb '19

Module: wine Branch: master Commit: 9f0d66923933d82ae0b09fe5d84f977c1a657cc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f0d66923933d82ae0b09fe5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 14 16:49:09 2019 +0100 ntdll: Rename attach_dlls() to LdrInitializeThunk(). Based on a patch by Andrew Wesie. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 87 ++++++++++++++++++--------------------------- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/signal_arm.c | 2 +- dlls/ntdll/signal_arm64.c | 2 +- dlls/ntdll/signal_i386.c | 2 +- dlls/ntdll/signal_powerpc.c | 2 +- dlls/ntdll/signal_x86_64.c | 2 +- include/winternl.h | 1 - 8 files changed, 41 insertions(+), 59 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d6b8950..d7dbe57 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3247,13 +3247,13 @@ PIMAGE_NT_HEADERS WINAPI RtlImageNtHeader(HMODULE hModule) } -/*********************************************************************** - * attach_dlls +/****************************************************************** + * LdrInitializeThunk (NTDLL.@) * * Attach to all the loaded dlls. * If this is the first time, perform the full process initialization. */ -NTSTATUS attach_dlls( CONTEXT *context, void **entry ) +void WINAPI LdrInitializeThunk( CONTEXT *context, void **entry, ULONG_PTR unknown3, ULONG_PTR unknown4 ) { NTSTATUS status; WINE_MODREF *wm; @@ -3261,7 +3261,7 @@ NTSTATUS attach_dlls( CONTEXT *context, void **entry ) pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); - if (process_detaching) return STATUS_SUCCESS; + if (process_detaching) return; RtlEnterCriticalSection( &loader_section ); @@ -3317,7 +3317,6 @@ NTSTATUS attach_dlls( CONTEXT *context, void **entry ) } RtlLeaveCriticalSection( &loader_section ); - return STATUS_SUCCESS; } @@ -3374,52 +3373,6 @@ static void load_global_options(void) } -/****************************************************************** - * LdrInitializeThunk (NTDLL.@) - * - */ -void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, - ULONG_PTR unknown3, ULONG_PTR unknown4 ) -{ - static const WCHAR globalflagW[] = {'G','l','o','b','a','l','F','l','a','g',0}; - NTSTATUS status; - WINE_MODREF *wm; - PEB *peb = NtCurrentTeb()->Peb; - - /* allocate the modref for the main exe (if not already done) */ - wm = get_modref( peb->ImageBaseAddress ); - assert( wm ); - if (wm->ldr.Flags & LDR_IMAGE_IS_DLL) - { - ERR("%s is a dll, not an executable\n", debugstr_w(wm->ldr.FullDllName.Buffer) ); - exit(1); - } - - peb->LoaderLock = &loader_section; - update_user_process_params( &wm->ldr.FullDllName ); - version_init( wm->ldr.FullDllName.Buffer ); - virtual_set_large_address_space(); - - LdrQueryImageFileExecutionOptions( &peb->ProcessParameters->ImagePathName, globalflagW, - REG_DWORD, &peb->NtGlobalFlag, sizeof(peb->NtGlobalFlag), NULL ); - heap_set_debug_flags( GetProcessHeap() ); - - /* the main exe needs to be the first in the load order list */ - RemoveEntryList( &wm->ldr.InLoadOrderModuleList ); - InsertHeadList( &peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderModuleList ); - RemoveEntryList( &wm->ldr.InMemoryOrderModuleList ); - InsertHeadList( &peb->LdrData->InMemoryOrderModuleList, &wm->ldr.InMemoryOrderModuleList ); - - if ((status = virtual_alloc_thread_stack( NtCurrentTeb(), 0, 0, NULL )) != STATUS_SUCCESS) - { - ERR( "Main exe initialization for %s failed, status %x\n", - debugstr_w(peb->ProcessParameters->ImagePathName.Buffer), status ); - NtTerminateProcess( GetCurrentProcess(), status ); - } - server_init_process_done(); -} - - /*********************************************************************** * RtlImageDirectoryEntryToData (NTDLL.@) */ @@ -3551,6 +3504,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) void __wine_process_init(void) { static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; + static const WCHAR globalflagW[] = {'G','l','o','b','a','l','F','l','a','g',0}; WINE_MODREF *wm; NTSTATUS status; @@ -3585,5 +3539,34 @@ void __wine_process_init(void) kernel32_start_process = init_func(); - LdrInitializeThunk( NULL, 0, 0, 0 ); + wm = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); + assert( wm ); + if (wm->ldr.Flags & LDR_IMAGE_IS_DLL) + { + MESSAGE( "wine: %s is a dll, not an executable\n", debugstr_w(wm->ldr.FullDllName.Buffer) ); + exit(1); + } + + NtCurrentTeb()->Peb->LoaderLock = &loader_section; + update_user_process_params( &wm->ldr.FullDllName ); + version_init( wm->ldr.FullDllName.Buffer ); + virtual_set_large_address_space(); + + LdrQueryImageFileExecutionOptions( &wm->ldr.FullDllName, globalflagW, REG_DWORD, + &NtCurrentTeb()->Peb->NtGlobalFlag, sizeof(DWORD), NULL ); + heap_set_debug_flags( GetProcessHeap() ); + + /* the main exe needs to be the first in the load order list */ + RemoveEntryList( &wm->ldr.InLoadOrderModuleList ); + InsertHeadList( &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList, &wm->ldr.InLoadOrderModuleList ); + RemoveEntryList( &wm->ldr.InMemoryOrderModuleList ); + InsertHeadList( &NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList, &wm->ldr.InMemoryOrderModuleList ); + + if ((status = virtual_alloc_thread_stack( NtCurrentTeb(), 0, 0, NULL )) != STATUS_SUCCESS) + { + ERR( "Main exe initialization for %s failed, status %x\n", + debugstr_w(wm->ldr.FullDllName.Buffer), status ); + NtTerminateProcess( GetCurrentProcess(), status ); + } + server_init_process_done(); } diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 5a93ede..5bfc8a9 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -111,7 +111,6 @@ extern BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) DECLSPEC_ /* module handling */ extern LIST_ENTRY tls_links DECLSPEC_HIDDEN; -extern NTSTATUS attach_dlls( CONTEXT *context, void **entry ) DECLSPEC_HIDDEN; extern FARPROC RELAY_GetProcAddress( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, FARPROC proc, DWORD ordinal, const WCHAR *user ) DECLSPEC_HIDDEN; extern FARPROC SNOOP_GetProcAddress( HMODULE hmod, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, @@ -255,5 +254,6 @@ extern HANDLE keyed_event DECLSPEC_HIDDEN; #define HASH_STRING_ALGORITHM_INVALID 0xffffffff NTSTATUS WINAPI RtlHashUnicodeString(PCUNICODE_STRING,BOOLEAN,ULONG,ULONG*); +void WINAPI LdrInitializeThunk(CONTEXT*,void**,ULONG_PTR,ULONG_PTR); #endif diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index e224808..75a1133 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1327,7 +1327,7 @@ PCONTEXT DECLSPEC_HIDDEN attach_thread( LPTHREAD_START_ROUTINE entry, void *arg, init_thread_context( ctx, entry, arg, relay ); } ctx->ContextFlags = CONTEXT_FULL; - attach_dlls( ctx, (void **)&ctx->R0 ); + LdrInitializeThunk( ctx, (void **)&ctx->R0, 0, 0 ); return ctx; } diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index c063be5..1d26125 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1100,7 +1100,7 @@ static void thread_startup( void *param ) context.Pc = (DWORD_PTR)info->start; if (info->suspend) wait_suspend( &context ); - attach_dlls( &context, (void **)&context.u.s.X0 ); + LdrInitializeThunk( &context, (void **)&context.u.s.X0, 0, 0 ); ((thread_start_func)context.Pc)( (LPTHREAD_START_ROUTINE)context.u.s.X0, (void *)context.u.s.X1 ); } diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 91ecfa7..1b3b10f 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2717,7 +2717,7 @@ PCONTEXT DECLSPEC_HIDDEN attach_thread( LPTHREAD_START_ROUTINE entry, void *arg, init_thread_context( ctx, entry, arg, relay ); } ctx->ContextFlags = CONTEXT_FULL; - attach_dlls( ctx, (void **)&ctx->Eax ); + LdrInitializeThunk( ctx, (void **)&ctx->Eax, 0, 0 ); return ctx; } diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 1c96d62..86398d8 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -1194,7 +1194,7 @@ static void thread_startup( void *param ) context.Iar = (DWORD)info->start; if (info->suspend) wait_suspend( &context ); - attach_dlls( &context, (void **)&context.Gpr3 ); + LdrInitializeThunk( &context, (void **)&context.Gpr3, 0, 0 ); ((thread_start_func)context.Iar)( (LPTHREAD_START_ROUTINE)context.Gpr3, (void *)context.Gpr4 ); } diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index c3cc3d8..54871b8 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -4557,7 +4557,7 @@ PCONTEXT DECLSPEC_HIDDEN attach_thread( LPTHREAD_START_ROUTINE entry, void *arg, init_thread_context( ctx, entry, arg, relay ); } ctx->ContextFlags = CONTEXT_FULL; - attach_dlls( ctx, (void **)&ctx->Rcx ); + LdrInitializeThunk( ctx, (void **)&ctx->Rcx, 0, 0 ); return ctx; } diff --git a/include/winternl.h b/include/winternl.h index a3adba3..46dac7e 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2302,7 +2302,6 @@ NTSYSAPI NTSTATUS WINAPI LdrDisableThreadCalloutsForDll(HMODULE); NTSYSAPI NTSTATUS WINAPI LdrFindEntryForAddress(const void*, PLDR_MODULE*); NTSYSAPI NTSTATUS WINAPI LdrGetDllHandle(LPCWSTR, ULONG, const UNICODE_STRING*, HMODULE*); NTSYSAPI NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE, const ANSI_STRING*, ULONG, void**); -NTSYSAPI void WINAPI LdrInitializeThunk(void*,ULONG_PTR,ULONG_PTR,ULONG_PTR); NTSYSAPI NTSTATUS WINAPI LdrLoadDll(LPCWSTR, DWORD, const UNICODE_STRING*, HMODULE*); NTSYSAPI NTSTATUS WINAPI LdrLockLoaderLock(ULONG,ULONG*,ULONG_PTR*); IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock(void*,UINT,USHORT*,INT_PTR);

1 0

Alexandre Julliard : ntdll: Make the CPU information global.
by Alexandre Julliard 14 Feb '19

14 Feb '19

Module: wine Branch: master Commit: 5ecea501704f7ac1f1a9c6db8ca787ce79394e8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ecea501704f7ac1f1a9c6db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 14 19:41:34 2019 +0100 ntdll: Make the CPU information global. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 13 ++++++------- dlls/ntdll/ntdll_misc.h | 1 + 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 5138da4..0a59947 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -926,7 +926,7 @@ NTSTATUS WINAPI NtSetIntervalProfile( return STATUS_SUCCESS; } -static SYSTEM_CPU_INFORMATION cached_sci; +SYSTEM_CPU_INFORMATION cpu_info = { 0 }; /******************************************************************************* * Architecture specific feature detection for CPUs @@ -1305,7 +1305,7 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) * fill_cpu_info * * inits a couple of places with CPU related information: - * - cached_sci in this file + * - cpu_info in this file * - Peb->NumberOfProcessors * - SharedUserData->ProcessFeatures[] array */ @@ -1336,11 +1336,10 @@ void fill_cpu_info(void) #endif NtCurrentTeb()->Peb->NumberOfProcessors = num; - memset(&cached_sci, 0, sizeof(cached_sci)); - get_cpuinfo(&cached_sci); + get_cpuinfo(&cpu_info); TRACE("<- CPU arch %d, level %d, rev %d, features 0x%x\n", - cached_sci.Architecture, cached_sci.Level, cached_sci.Revision, cached_sci.FeatureSet); + cpu_info.Architecture, cpu_info.Level, cpu_info.Revision, cpu_info.FeatureSet); } static BOOL grow_logical_proc_buf(SYSTEM_LOGICAL_PROCESSOR_INFORMATION **pdata, @@ -2287,10 +2286,10 @@ NTSTATUS WINAPI NtQuerySystemInformation( } break; case SystemCpuInformation: - if (Length >= (len = sizeof(cached_sci))) + if (Length >= (len = sizeof(cpu_info))) { if (!SystemInformation) ret = STATUS_ACCESS_VIOLATION; - else memcpy(SystemInformation, &cached_sci, len); + else memcpy(SystemInformation, &cpu_info, len); } else ret = STATUS_INFO_LENGTH_MISMATCH; break; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 5bfc8a9..5afb17f 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -248,6 +248,7 @@ static inline struct ntdll_thread_data *ntdll_get_thread_data(void) extern mode_t FILE_umask DECLSPEC_HIDDEN; extern HANDLE keyed_event DECLSPEC_HIDDEN; +extern SYSTEM_CPU_INFORMATION cpu_info DECLSPEC_HIDDEN; #define HASH_STRING_ALGORITHM_DEFAULT 0 #define HASH_STRING_ALGORITHM_X65599 1

1 0