wine-commits March 2009

wine-commits@winehq.org

2 participants
834 discussions

Dylan Smith : richedit: Add bounds checks for EM_GETTEXTRANGE with tests.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: caca4860290013b8fcf63a101d314346f870cbf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caca4860290013b8fcf63a101… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Mar 23 00:14:33 2009 -0400 richedit: Add bounds checks for EM_GETTEXTRANGE with tests. Wine was not doing bounds checks for EM_GETTEXTRANGE, which was causing a crash in Bug 17822. The added tests would cause a crash without the added bounds checks in the richedit code. The bounds checks I put in HandleMessage, since ME_GetTextRange is also called for ME_GETSELTEXT which should not have bounds checks, since it uses the selection range. When the ME_GETTEXTRANGE message returns 0, no text is copied, not even the NULL terminating charter. This differs from EM_GETSELTEXT which will copy the NULL terminating character when no text is selected. This behaviour is consistent with native richedit controls. --- dlls/riched20/editor.c | 36 ++++++++++++++++++------------------ dlls/riched20/tests/editor.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index c9cb244..00fc38e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1906,20 +1906,16 @@ static int ME_GetTextEx(ME_TextEditor *editor, GETTEXTEX *ex, LPARAM pText) } } -static int ME_GetTextRange(ME_TextEditor *editor, TEXTRANGEW *rng, BOOL unicode) +static int ME_GetTextRange(ME_TextEditor *editor, WCHAR *strText, + int start, int nLen, BOOL unicode) { - if (unicode) - return ME_GetTextW(editor, rng->lpstrText, rng->chrg.cpMin, - rng->chrg.cpMax-rng->chrg.cpMin, 0); - else - { - int nLen = rng->chrg.cpMax-rng->chrg.cpMin; + if (unicode) { + return ME_GetTextW(editor, strText, start, nLen, 0); + } else { WCHAR *p = ALLOC_N_OBJ(WCHAR, nLen+1); - int nChars = ME_GetTextW(editor, p, rng->chrg.cpMin, nLen, 0); - /* FIXME this is a potential security hole (buffer overrun) - if you know more about wchar->mbyte conversion please explain - */ - WideCharToMultiByte(CP_ACP, 0, p, nChars+1, (char *)rng->lpstrText, nLen+1, NULL, NULL); + int nChars = ME_GetTextW(editor, p, start, nLen, 0); + WideCharToMultiByte(CP_ACP, 0, p, nChars+1, (char *)strText, + nLen+1, NULL, NULL); FREE_OBJ(p); return nChars; } @@ -3580,12 +3576,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case EM_GETSELTEXT: { int from, to; - TEXTRANGEW tr; /* W and A differ only by rng->lpstrText */ ME_GetSelection(editor, &from, &to); - tr.chrg.cpMin = from; - tr.chrg.cpMax = to; - tr.lpstrText = (WCHAR *)lParam; - return ME_GetTextRange(editor, &tr, unicode); + return ME_GetTextRange(editor, (WCHAR *)lParam, from, + to - from, unicode); } case EM_GETSCROLLPOS: { @@ -3597,10 +3590,17 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case EM_GETTEXTRANGE: { TEXTRANGEW *rng = (TEXTRANGEW *)lParam; + int start = rng->chrg.cpMin; + int end = rng->chrg.cpMax; + int textlength = ME_GetTextLength(editor); TRACE("EM_GETTEXTRANGE min=%d max=%d unicode=%d emul1.0=%d length=%d\n", rng->chrg.cpMin, rng->chrg.cpMax, unicode, editor->bEmulateVersion10, ME_GetTextLength(editor)); - return ME_GetTextRange(editor, rng, unicode); + if (start < 0) return 0; + if ((start == 0 && end == -1) || end > textlength) + end = textlength; + if (start >= end) return 0; + return ME_GetTextRange(editor, rng->lpstrText, start, end - start, unicode); } case EM_GETLINE: { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 331fd69..40d0045 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1420,6 +1420,46 @@ static void test_EM_GETTEXTRANGE(void) ok(result == 7, "EM_GETTEXTRANGE returned %ld\n", result); ok(!strcmp(expect, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + /* cpMax of text length is used instead of -1 in this case */ + textRange.lpstrText = buffer; + textRange.chrg.cpMin = 0; + textRange.chrg.cpMax = -1; + result = SendMessage(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); + ok(result == strlen(text2), "EM_GETTEXTRANGE returned %ld\n", result); + ok(!strcmp(text2, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + + /* cpMin < 0 causes no text to be copied, and 0 to be returned */ + textRange.lpstrText = buffer; + textRange.chrg.cpMin = -1; + textRange.chrg.cpMax = 1; + result = SendMessage(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); + ok(result == 0, "EM_GETTEXTRANGE returned %ld\n", result); + ok(!strcmp(text2, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + + /* cpMax of -1 is not replaced with text length if cpMin != 0 */ + textRange.lpstrText = buffer; + textRange.chrg.cpMin = 1; + textRange.chrg.cpMax = -1; + result = SendMessage(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); + ok(result == 0, "EM_GETTEXTRANGE returned %ld\n", result); + ok(!strcmp(text2, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + + /* no end character is copied if cpMax - cpMin < 0 */ + textRange.lpstrText = buffer; + textRange.chrg.cpMin = 5; + textRange.chrg.cpMax = 5; + result = SendMessage(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); + ok(result == 0, "EM_GETTEXTRANGE returned %ld\n", result); + ok(!strcmp(text2, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + + /* cpMax of text length is used if cpMax > text length*/ + textRange.lpstrText = buffer; + textRange.chrg.cpMin = 0; + textRange.chrg.cpMax = 1000; + result = SendMessage(hwndRichEdit, EM_GETTEXTRANGE, 0, (LPARAM)&textRange); + ok(result == strlen(text2), "EM_GETTEXTRANGE returned %ld\n", result); + ok(!strcmp(text2, buffer), "EM_GETTEXTRANGE filled %s\n", buffer); + DestroyWindow(hwndRichEdit); }

1 0

Roderick Colenbrander : wined3d: Add a classic WGL pixel format backend as not all OpenGL implementations support WGL_ARB_pixel_format .
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 4544efc9724fd49e2dec9544971bd8069f1ee145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4544efc9724fd49e2dec95449… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Mar 15 11:30:10 2009 +0100 wined3d: Add a classic WGL pixel format backend as not all OpenGL implementations support WGL_ARB_pixel_format. This should help for instance VirtualBox. --- dlls/wined3d/directx.c | 170 ++++++++++++++++++++++++++++++++---------------- 1 files changed, 114 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4544efc9724fd49e2dec9…

1 0

Roderick Colenbrander : wined3d: Add WGL_ARB_pixel_format detection.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 9181ddcd167b01983ac1682968ab4be427b35d88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9181ddcd167b01983ac168296… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Mar 15 10:01:43 2009 +0100 wined3d: Add WGL_ARB_pixel_format detection. Right now we assume that the extension is there but this isn't always the case. The next patch in this series will add a non-WGL_ARB_pixel_format codepath to help VirtualBox and others. --- dlls/wined3d/directx.c | 4 ++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2ec60d4..4a6a1b1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1434,6 +1434,10 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { gl_info->supported[WGL_ARB_PBUFFER] = TRUE; TRACE_(d3d_caps)("FOUND: WGL_ARB_pbuffer support\n"); } + if (!strcmp(ThisExtn, "WGL_ARB_pixel_format")) { + gl_info->supported[WGL_ARB_PIXEL_FORMAT] = TRUE; + TRACE_(d3d_caps)("FOUND: WGL_ARB_pixel_format support\n"); + } if (!strcmp(ThisExtn, "WGL_WINE_pixel_format_passthrough")) { gl_info->supported[WGL_WINE_PIXEL_FORMAT_PASSTHROUGH] = TRUE; TRACE_(d3d_caps)("FOUND: WGL_WINE_pixel_format_passthrough support\n"); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 3aa23e1..06d2f47 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3462,6 +3462,7 @@ typedef enum _GL_SupportedExt { /* WGL extensions */ WGL_ARB_PBUFFER, + WGL_ARB_PIXEL_FORMAT, WGL_WINE_PIXEL_FORMAT_PASSTHROUGH, OPENGL_SUPPORTED_EXT_END

1 0

Nicolas Le Cam : schannel/tests: Fix test on Win2k.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: da2e0441257479365c0508f2397491cd94e2ba01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da2e0441257479365c0508f23… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sat Mar 14 14:22:51 2009 +0100 schannel/tests: Fix test on Win2k. --- dlls/schannel/tests/main.c | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index ddfffc4..d05275f 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -57,20 +57,26 @@ static void testInitialize(void) /* SpLsaModeInitialize does not care about the LSA version. */ status = pSpLsaModeInitialize(0, &Version, &pTables2, &cTables); ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); - ok(cTables == 2, "cTables: %d\n", cTables); + ok(cTables == 2 || + broken(cTables == 1), /* Win2k */ + "cTables: %d\n", cTables); ok(pTables2 != NULL,"pTables: %p\n", pTables2); /* We can call it as many times we want. */ status = pSpLsaModeInitialize(0x10000, &Version, &pTables, &cTables); ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); - ok(cTables == 2, "cTables: %d\n", cTables); + ok(cTables == 2 || + broken(cTables == 1), /* Win2k */ + "cTables: %d\n", cTables); ok(pTables != NULL, "pTables: %p\n", pTables); /* It will always return the same pointer. */ ok(pTables == pTables2, "pTables: %p, pTables2: %p\n", pTables, pTables2); status = pSpLsaModeInitialize(0x23456, &Version, &pTables, &cTables); ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); - ok(cTables == 2, "cTables: %d\n", cTables); + ok(cTables == 2 || + broken(cTables == 1), /* Win2k */ + "cTables: %d\n", cTables); ok(pTables != NULL, "pTables: %p\n", pTables); ok(pTables == pTables2, "pTables: %p, pTables2: %p\n", pTables, pTables2); @@ -96,7 +102,9 @@ static void testInitialize(void) &pUserTables, &cUserTables); ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); ok(Version == SECPKG_INTERFACE_VERSION, "Version: 0x%x\n", Version); - ok(cUserTables == 2, "cUserTables: %d\n", cUserTables); + ok(cUserTables == 2 || + broken(cUserTables == 4), /* Win2k */ + "cUserTables: %d\n", cUserTables); ok(pUserTables != NULL, "pUserTables: %p\n", pUserTables); /* Initializing user again */ @@ -153,7 +161,12 @@ static void testGetInfo(void) "cbMaxToken: 0x%x\n", PackageInfo.cbMaxToken); - /* Second package: SChannel */ + /* Second package */ + if (cTables == 1) + { + win_skip("Second package missing\n"); + return; + } pTables = getNextSecPkgTable(pTables, Version); if (!pTables) return;

1 0

Nicolas Le Cam : shell32/tests: Fix a test on Win2k platform and above.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 5fc199263e4d94ac843c45ca60622ab40cf286c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fc199263e4d94ac843c45ca6… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Tue Mar 17 22:40:45 2009 +0100 shell32/tests: Fix a test on Win2k platform and above. --- dlls/shell32/tests/appbar.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c index 5d15fcd..51bea2b 100644 --- a/dlls/shell32/tests/appbar.c +++ b/dlls/shell32/tests/appbar.c @@ -340,14 +340,12 @@ static void test_setpos(void) test_window_rects(1, 2); /* remove the other windows */ - SetWindowLongPtr(windows[1].hwnd, GWLP_USERDATA, 0); abd.hWnd = windows[1].hwnd; ret = SHAppBarMessage(ABM_REMOVE, &abd); ok(ret == TRUE, "SHAppBarMessage returned %i\n", ret); windows[1].registered = FALSE; DestroyWindow(windows[1].hwnd); - SetWindowLongPtr(windows[2].hwnd, GWLP_USERDATA, 0); abd.hWnd = windows[2].hwnd; ret = SHAppBarMessage(ABM_REMOVE, &abd); ok(ret == TRUE, "SHAppBarMessage returned %i\n", ret);

1 0

Paul Vriens : urlmon/tests: Fix a test failure on Vista and higher.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: ad5e68e8a15953a09e41564f8f01ee9f9aa585fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad5e68e8a15953a09e41564f8… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Mar 19 11:16:28 2009 +0100 urlmon/tests: Fix a test failure on Vista and higher. --- dlls/urlmon/tests/protocol.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index c9c42e8..6044c31 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1854,7 +1854,9 @@ static void test_gopher_protocol(void) trace("Testing gopher protocol...\n"); hres = CoGetClassObject(&CLSID_GopherProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); - ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); + ok(hres == S_OK || + hres == REGDB_E_CLASSNOTREG, /* Gopher protocol has been removed as of Vista */ + "CoGetClassObject failed: %08x\n", hres); if(FAILED(hres)) return;

1 0

Rein Klazes : user32/tests: In sysparams.c disable some Get/ Set border tests for now. These may permanently change desktop settings of the testers.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 3aec62dcf6ef3032749732fcca425d6e26deec93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aec62dcf6ef3032749732fcc… Author: Rein Klazes <wijn(a)online.nl> Date: Thu Mar 19 10:45:46 2009 +0100 user32/tests: In sysparams.c disable some Get/Set border tests for now. These may permanently change desktop settings of the testers. --- dlls/user32/tests/sysparams.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 05f728d..d7adfa4 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -734,6 +734,11 @@ static void test_SPI_SETBORDER( void ) /* 6 */ rc=SystemParametersInfoA( SPI_GETBORDER, 0, &old_border, 0 ); if (!test_error_msg(rc,"SPI_{GET,SET}BORDER")) return; + /* FIXME: include new PaddedBorderWidth parameter */ + if( old_border != ncmsave.iBorderWidth){ + win_skip( "Can not reliable restore border width yet\n"); + return; + } /* This will restore sane values if the test hang previous run. */ if ( old_border == 7 || old_border == 20 ) old_border = 1; @@ -1346,7 +1351,7 @@ static void test_SPI_SETDRAGFULLWINDOWS( void ) /* 37 */ } #define TEST_NONCLIENTMETRICS_REG( ncm) \ -test_reg_metric2( SPI_SETBORDER_REGKEY2, SPI_SETBORDER_REGKEY, SPI_SETBORDER_VALNAME, (ncm).iBorderWidth);\ +/*FIXME: test_reg_metric2( SPI_SETBORDER_REGKEY2, SPI_SETBORDER_REGKEY, SPI_SETBORDER_VALNAME, (ncm).iBorderWidth);*/\ test_reg_metric( SPI_METRIC_REGKEY, SPI_SCROLLWIDTH_VALNAME, (ncm).iScrollWidth);\ test_reg_metric( SPI_METRIC_REGKEY, SPI_SCROLLHEIGHT_VALNAME, (ncm).iScrollHeight);\ /*FIXME: test_reg_metric( SPI_METRIC_REGKEY, SPI_CAPTIONWIDTH_VALNAME, (ncm).iCaptionWidth);*/\

1 0

Aric Stewart : propsys: Stub for PSUnregisterPropertySchema.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 6979c4142f75303e7a31e049d5324e419db4cf1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6979c4142f75303e7a31e049d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Mar 19 09:46:45 2009 -0500 propsys: Stub for PSUnregisterPropertySchema. Needed for IE8 install. --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propsys_main.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 5fa0d96..1848b47 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -92,7 +92,7 @@ @ stdcall PSRegisterPropertySchema(wstr) @ stub PSSetPropertyValue @ stub PSStringFromPropertyKey -@ stub PSUnregisterPropertySchema +@ stdcall PSUnregisterPropertySchema(wstr) @ stdcall PropVariantChangeType(ptr ptr long long) @ stub PropVariantCompareEx @ stub PropVariantGetBooleanElem diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index ccdf3ed..c5bcab7 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -54,3 +54,10 @@ HRESULT WINAPI PSRegisterPropertySchema(PCWSTR path) return E_NOTIMPL; } + +HRESULT WINAPI PSUnregisterPropertySchema(PCWSTR pszPath) +{ + FIXME("stub\n"); + + return E_NOTIMPL; +}

1 0

Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1?=) : mshtml: Updated Korean resource.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: d496a49084b3b5fcf657361eba47d0b089df4ab0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d496a49084b3b5fcf657361eb… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Mar 16 10:10:34 2009 +0900 mshtml: Updated Korean resource. --- dlls/mshtml/Ko.rc | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Ko.rc b/dlls/mshtml/Ko.rc index 9a0bcb5..efad007 100644 --- a/dlls/mshtml/Ko.rc +++ b/dlls/mshtml/Ko.rc @@ -54,3 +54,14 @@ FONT 9, "MS Shell Dlg" PUSHBUTTON "Ȯ��", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "��", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP } + +ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", ID_PROMPT_PROMPT, 10, 10, 180, 30 + EDITTEXT ID_PROMPT_EDIT, 10, 45, 180, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Ȯ��", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "��", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP +}

1 0

Aric Stewart : kernel32: Report unixfs instead of ntfs for unknown filesystem type.
by Alexandre Julliard 23 Mar '09

23 Mar '09

Module: wine Branch: master Commit: 8044c11ecfca09e2b643feccb95a4d8f645ba656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8044c11ecfca09e2b643feccb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Mar 17 07:40:42 2009 -0500 kernel32: Report unixfs instead of ntfs for unknown filesystem type. This avoids programs such as the .Net2.0 installer trying to do ntfs specific functions on the disk. --- dlls/kernel32/volume.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index d30ae10..9addeab 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -511,8 +511,8 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, static const WCHAR audiocdW[] = {'A','u','d','i','o',' ','C','D',0}; static const WCHAR fatW[] = {'F','A','T',0}; static const WCHAR fat32W[] = {'F','A','T','3','2',0}; - static const WCHAR ntfsW[] = {'N','T','F','S',0}; static const WCHAR cdfsW[] = {'C','D','F','S',0}; + static const WCHAR unixfsW[] = {'U','N','I','X','F','S',0}; WCHAR device[] = {'\\','\\','.','\\','A',':',0}; HANDLE handle; @@ -613,7 +613,7 @@ fill_fs_info: /* now fill in the information that depends on the file system ty if (flags) *flags = FILE_CASE_PRESERVED_NAMES; /* FIXME */ break; default: - if (fsname) lstrcpynW( fsname, ntfsW, fsname_len ); + if (fsname) lstrcpynW( fsname, unixfsW, fsname_len ); if (filename_len) *filename_len = 255; if (flags) *flags = FILE_CASE_PRESERVED_NAMES; break;

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
84
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 March 2009