September 2011 - Wine-commits

Huw Davies : gdi32/tests: Update the StretchBlt tests to use a 16x16 bitmap .
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: abc76c27a72d5fc8d06046a7d73ce3bddfd3e843 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abc76c27a72d5fc8d06046a7d… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 22 13:56:28 2011 +0100 gdi32/tests: Update the StretchBlt tests to use a 16x16 bitmap. --- dlls/gdi32/tests/bitmap.c | 161 +++++++++++++++++++++----------------------- 1 files changed, 77 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=abc76c27a72d5fc8d0604…

1 0

Huw Davies : gdi32/tests: Add some tests to show the 1 pixel dst sizes are a special case.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 4156460d49cd87f93322630ec2ca34f8bb143a77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4156460d49cd87f93322630ec… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 22 13:56:29 2011 +0100 gdi32/tests: Add some tests to show the 1 pixel dst sizes are a special case. --- dlls/gdi32/tests/bitmap.c | 54 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 16dfcb2..89d2c9c 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2826,6 +2826,7 @@ static void test_StretchBlt(void) check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 0, 0, 2, 2, 0, 0, 1, 1, expected, __LINE__); + /* This is an example of the dst width (height) == 1 exception, explored below */ expected[0] = 0xCAFED00D, expected[1] = 0x00000000; expected[16] = 0x00000000, expected[17] = 0x00000000; check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, @@ -2853,10 +2854,63 @@ static void test_StretchBlt(void) check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 1, 1, 2, 2, 0, 0, 2, 2, expected, __LINE__); + /* when dst width is 1 merge src width - 1 pixels */ + memset( srcBuffer, 0, get_dib_image_size( &biSrc ) ); + srcBuffer[0] = 0x0000ff00, srcBuffer[1] = 0x0000f0f0, srcBuffer[2] = 0x0000cccc, srcBuffer[3] = 0x0000aaaa; + srcBuffer[16] = 0xFEDCBA98, srcBuffer[17] = 0x76543210; + + memset( expected, 0, get_dib_image_size( &biDst ) ); + expected[0] = srcBuffer[0]; + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 1, 1, 0, 0, 2, 1, expected, __LINE__); + + expected[0] = srcBuffer[0] & srcBuffer[1]; +todo_wine + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 1, 1, 0, 0, 3, 1, expected, __LINE__); + + expected[0] = srcBuffer[0] & srcBuffer[1] & srcBuffer[2]; +todo_wine + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 1, 1, 0, 0, 4, 1, expected, __LINE__); + + /* this doesn't happen if the src width is -ve */ + expected[0] = srcBuffer[1] & srcBuffer[2]; +todo_wine + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 1, 1, 2, 0, -2, 1, expected, __LINE__); + + /* when dst width > 1 behaviour reverts to what one would expect */ + expected[0] = srcBuffer[0] & srcBuffer[1], expected[1] = srcBuffer[2] & srcBuffer[3]; +todo_wine + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 2, 1, 0, 0, 4, 1, expected, __LINE__); + + /* similarly in the vertical direction */ + memset( expected, 0, get_dib_image_size( &biDst ) ); + expected[0] = srcBuffer[0]; + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 1, 1, 0, 0, 1, 2, expected, __LINE__); + + /* check that it's the dst size in device units that needs to be 1 */ + SetMapMode( hdcDst, MM_ISOTROPIC ); + SetWindowExtEx( hdcDst, 200, 200, NULL ); + SetViewportExtEx( hdcDst, 100, 100, NULL ); + + expected[0] = srcBuffer[0] & srcBuffer[1] & srcBuffer[2]; +todo_wine + check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 0, 0, 4, 1, expected, __LINE__); + SetMapMode( hdcDst, MM_TEXT ); + SelectObject(hdcDst, oldDst); DeleteObject(bmpDst); /* Top-down to bottom-up tests */ + memset( srcBuffer, 0, get_dib_image_size( &biSrc ) ); + srcBuffer[0] = 0xCAFED00D, srcBuffer[1] = 0xFEEDFACE; + srcBuffer[16] = 0xFEDCBA98, srcBuffer[17] = 0x76543210; + biDst.bmiHeader.biHeight = 16; bmpDst = CreateDIBSection(hdcScreen, &biDst, DIB_RGB_COLORS, (void**)&dstBuffer, NULL, 0);

1 0

Jacek Caban : widl: Define __REQUIRED_RPCNDR_H_VERSION__ in generated headers.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: c7602d51b33e6fd74ef7cb87a5f50616f5a8a31d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7602d51b33e6fd74ef7cb87a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 22 15:01:50 2011 +0200 widl: Define __REQUIRED_RPCNDR_H_VERSION__ in generated headers. --- tools/widl/header.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 579ef5c..fc9cbf1 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1358,6 +1358,11 @@ void write_header(const statement_list_t *stmts) return; } fprintf(header, "/*** Autogenerated by WIDL %s from %s - Do not edit ***/\n\n", PACKAGE_VERSION, input_name); + + fprintf(header, "#ifndef __REQUIRED_RPCNDR_H_VERSION__\n"); + fprintf(header, "#define __REQUIRED_RPCNDR_H_VERSION__ 475\n"); + fprintf(header, "#endif\n\n"); + fprintf(header, "#include <rpc.h>\n" ); fprintf(header, "#include <rpcndr.h>\n\n" );

1 0

Alexandre Julliard : user32/tests: Try harder to flush paint events before checking the window contents.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: a684b634c01a58633e65b1c4dd1f70f5c99530ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=a684b634c01a58633e65b1c4d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 22 09:35:05 2011 +0200 user32/tests: Try harder to flush paint events before checking the window contents. --- dlls/user32/tests/static.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index b761356..62089bd 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -40,6 +40,22 @@ static HWND hMainWnd; static int g_nReceivedColorStatic = 0; +/* try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + MSG msg; + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + diff = time - GetTickCount(); + } +} + static HWND build_static(DWORD style) { return CreateWindow("static", "Test", WS_VISIBLE|WS_CHILD|style, 5, 5, 100, 100, hMainWnd, (HMENU)CTRL_ID, NULL, 0); @@ -70,6 +86,7 @@ static void test_updates(int style, int flags) HWND hStatic = build_static(style); int exp; + flush_events(); trace("Testing style 0x%x\n", style); g_nReceivedColorStatic = 0; /* during each update parent WndProc will test the WM_CTLCOLORSTATIC message */ @@ -122,7 +139,6 @@ START_TEST(static) hMainWnd = CreateWindow(szClassName, "Test", WS_OVERLAPPEDWINDOW, 0, 0, 500, 500, NULL, NULL, GetModuleHandle(NULL), NULL); ShowWindow(hMainWnd, SW_SHOW); - UpdateWindow(hMainWnd); test_updates(0, 0); test_updates(SS_SIMPLE, 0);

1 0

Henri Verbeet : server: Try writing to /proc/<pid>/ mem in write_process_memory().
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: e7728c413298025077054187d57e6a7783b3de38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7728c413298025077054187d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 21 21:01:43 2011 +0200 server: Try writing to /proc/<pid>/mem in write_process_memory(). --- server/ptrace.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index 51157ab..6c14481 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -463,6 +463,25 @@ int write_process_memory( struct process *process, client_ptr_t ptr, data_size_t set_error( STATUS_ACCESS_DENIED ); goto done; } + + if (len > 3) + { + char procmem[24]; + int fd; + + sprintf( procmem, "/proc/%u/mem", process->unix_pid ); + if ((fd = open( procmem, O_WRONLY )) != -1) + { + ssize_t r = pwrite( fd, src, size, ptr ); + close( fd ); + if (r == size) + { + ret = 1; + goto done; + } + } + } + /* first word is special */ if (len > 1) {

1 0

Henri Verbeet : winealsa.drv: Only report endpoints for "default" if they can be opened.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 0625d439de7106c3fb32d31ccb453eaaf89d5773 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0625d439de7106c3fb32d31cc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 21 21:01:44 2011 +0200 winealsa.drv: Only report endpoints for "default" if they can be opened. The default device may for example be a set of USB speakers or an USB microphone, in which case you'd have just an output or just an input respectively. --- dlls/winealsa.drv/mmdevdrv.c | 54 +++++++++++++++++++++++++++-------------- 1 files changed, 35 insertions(+), 19 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index e754738..c609903 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -237,15 +237,28 @@ int WINAPI AUDDRV_GetPriority(void) return Priority_Neutral; } -static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR **ids, char **keys, +static BOOL alsa_try_open(const char *devnode, snd_pcm_stream_t stream) +{ + snd_pcm_t *handle; + int err; + + if((err = snd_pcm_open(&handle, devnode, stream, SND_PCM_NONBLOCK)) < 0){ + WARN("The device \"%s\" failed to open: %d (%s).\n", + devnode, err, snd_strerror(err)); + return FALSE; + } + + snd_pcm_close(handle); + return TRUE; +} + +static HRESULT alsa_get_card_devices(snd_pcm_stream_t stream, WCHAR **ids, char **keys, UINT *num, snd_ctl_t *ctl, int card, const WCHAR *cardnameW, BOOL count_failed) { static const WCHAR dashW[] = {' ','-',' ',0}; int err, device; snd_pcm_info_t *info; - snd_pcm_stream_t stream = (flow == eRender ? SND_PCM_STREAM_PLAYBACK : - SND_PCM_STREAM_CAPTURE); info = HeapAlloc(GetProcessHeap(), 0, snd_pcm_info_sizeof()); if(!info) @@ -259,7 +272,6 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR **ids, char **keys, err = snd_ctl_pcm_next_device(ctl, &device)){ const char *devname; char devnode[32]; - snd_pcm_t *handle; snd_pcm_info_set_device(info, device); @@ -274,16 +286,12 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR **ids, char **keys, } sprintf(devnode, "hw:%d,%d", card, device); - if((err = snd_pcm_open(&handle, devnode, stream, SND_PCM_NONBLOCK)) < 0){ - WARN("The device \"%s\" failed to open, pretending it doesn't exist: %d (%s)\n", - devnode, err, snd_strerror(err)); + if(!alsa_try_open(devnode, stream)){ if(count_failed) ++(*num); continue; } - snd_pcm_close(handle); - if(ids && keys){ DWORD len, cardlen; @@ -333,10 +341,24 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR **ids, char **keys, static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR **ids, char **keys, UINT *num, BOOL count_failed) { + snd_pcm_stream_t stream = (flow == eRender ? SND_PCM_STREAM_PLAYBACK : + SND_PCM_STREAM_CAPTURE); int err, card; card = -1; *num = 0; + + if(alsa_try_open(defname, stream)){ + if(ids && keys){ + *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(defaultW)); + memcpy(*ids, defaultW, sizeof(defaultW)); + *keys = HeapAlloc(GetProcessHeap(), 0, sizeof(defname)); + memcpy(*keys, defname, sizeof(defname)); + } + ++*num; + }else if(count_failed) + ++*num; + for(err = snd_card_next(&card); card != -1 && err >= 0; err = snd_card_next(&card)){ char cardpath[64]; @@ -368,7 +390,7 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR **ids, char **keys, } MultiByteToWideChar(CP_UNIXCP, 0, cardname, -1, cardnameW, len); - alsa_get_card_devices(flow, ids, keys, num, ctl, card, cardnameW, + alsa_get_card_devices(stream, ids, keys, num, ctl, card, cardnameW, count_failed); HeapFree(GetProcessHeap(), 0, cardnameW); @@ -401,21 +423,17 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, char ***keys, return S_OK; } - *ids = HeapAlloc(GetProcessHeap(), 0, (*num + 1) * sizeof(WCHAR *)); - *keys = HeapAlloc(GetProcessHeap(), 0, (*num + 1) * sizeof(char *)); + *ids = HeapAlloc(GetProcessHeap(), 0, *num * sizeof(WCHAR *)); + *keys = HeapAlloc(GetProcessHeap(), 0, *num * sizeof(char *)); if(!*ids || !*keys){ HeapFree(GetProcessHeap(), 0, *ids); HeapFree(GetProcessHeap(), 0, *keys); return E_OUTOFMEMORY; } - (*ids)[0] = HeapAlloc(GetProcessHeap(), 0, sizeof(defaultW)); - memcpy((*ids)[0], defaultW, sizeof(defaultW)); - (*keys)[0] = HeapAlloc(GetProcessHeap(), 0, sizeof(defname)); - memcpy((*keys)[0], defname, sizeof(defname)); *def_index = 0; - hr = alsa_enum_devices(flow, (*ids) + 1, (*keys) + 1, num, FALSE); + hr = alsa_enum_devices(flow, *ids, *keys, num, FALSE); if(FAILED(hr)){ int i; for(i = 0; i < *num; ++i){ @@ -427,8 +445,6 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, char ***keys, return E_OUTOFMEMORY; } - ++(*num); /* for default device */ - return S_OK; }

1 0

Henri Verbeet : winealsa.drv: Use the plughw instead of the hw interface for opening devices.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 232893e0832bf5082285995303c482d50570e5ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=232893e0832bf508228599530… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 21 21:01:45 2011 +0200 winealsa.drv: Use the plughw instead of the hw interface for opening devices. --- dlls/winealsa.drv/mmdevdrv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index c609903..c77b54e 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -285,7 +285,7 @@ static HRESULT alsa_get_card_devices(snd_pcm_stream_t stream, WCHAR **ids, char continue; } - sprintf(devnode, "hw:%d,%d", card, device); + sprintf(devnode, "plughw:%d,%d", card, device); if(!alsa_try_open(devnode, stream)){ if(count_failed) ++(*num);

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_device_caps() const.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 72d75b65b7a162be612b6cfd3cc9794bf8dd7b62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72d75b65b7a162be612b6cfd3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 21 21:01:46 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_device_caps() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f598ea3..fad63e4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3913,7 +3913,7 @@ HRESULT CDECL wined3d_device_get_back_buffer(const struct wined3d_device *device return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_device_caps(struct wined3d_device *device, WINED3DCAPS *caps) +HRESULT CDECL wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps) { TRACE("device %p, caps %p.\n", device, caps); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a6071ea..edc2e40 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2215,7 +2215,7 @@ HRESULT __cdecl wined3d_device_get_creation_parameters(struct wined3d_device *de HRESULT __cdecl wined3d_device_get_current_texture_palette(struct wined3d_device *device, UINT *palette_idx); HRESULT __cdecl wined3d_device_get_depth_stencil(struct wined3d_device *device, struct wined3d_surface **depth_stencil); -HRESULT __cdecl wined3d_device_get_device_caps(struct wined3d_device *device, WINED3DCAPS *caps); +HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps); HRESULT __cdecl wined3d_device_get_display_mode(struct wined3d_device *device, UINT swapchain_idx, WINED3DDISPLAYMODE *mode); HRESULT __cdecl wined3d_device_get_front_buffer_data(struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_display_mode() const.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 013991e6e41c00a64dbcf26d09e1bdd3fd586e85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=013991e6e41c00a64dbcf26d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 21 21:01:47 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_display_mode() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fad63e4..d1bec23 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3920,7 +3920,7 @@ HRESULT CDECL wined3d_device_get_device_caps(const struct wined3d_device *device return wined3d_get_device_caps(device->wined3d, device->adapter->ordinal, device->devType, caps); } -HRESULT CDECL wined3d_device_get_display_mode(struct wined3d_device *device, +HRESULT CDECL wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx, WINED3DDISPLAYMODE *mode) { struct wined3d_swapchain *swapchain; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index edc2e40..91efa2d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2216,7 +2216,7 @@ HRESULT __cdecl wined3d_device_get_current_texture_palette(struct wined3d_device HRESULT __cdecl wined3d_device_get_depth_stencil(struct wined3d_device *device, struct wined3d_surface **depth_stencil); HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps); -HRESULT __cdecl wined3d_device_get_display_mode(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx, WINED3DDISPLAYMODE *mode); HRESULT __cdecl wined3d_device_get_front_buffer_data(struct wined3d_device *device, UINT swapchain_idx, struct wined3d_surface *dst_surface);

1 0

Andrew Talbot : crtdll: Supress sign-extension through integer promotion.
by Alexandre Julliard 22 Sep '11

22 Sep '11

Module: wine Branch: master Commit: 6176fa469a431650b41a1c5598eb7cdcca5067a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6176fa469a431650b41a1c559… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Sep 21 20:44:03 2011 +0100 crtdll: Supress sign-extension through integer promotion. --- dlls/crtdll/crtdll_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crtdll/crtdll_main.c b/dlls/crtdll/crtdll_main.c index a09f6f6..ac5677f 100644 --- a/dlls/crtdll/crtdll_main.c +++ b/dlls/crtdll/crtdll_main.c @@ -176,7 +176,7 @@ size_t CDECL _strncnt(const char *str, size_t maxlen) */ unsigned int CDECL _strnextc(const char *str) { - return (unsigned int)str[0]; + return (unsigned char)str[0]; }

1 0