June 2010 - Wine-commits - list.winehq.org

Dylan Smith : wordpad: Native RegisterClassExW requires cbSize to be set.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: d10ce5df2654dc483d7bc44554e062562a220fa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d10ce5df2654dc483d7bc4455… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Jun 11 00:43:44 2010 -0400 wordpad: Native RegisterClassExW requires cbSize to be set. --- programs/wordpad/wordpad.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index c90e7b5..0bf5d0c 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2671,6 +2671,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar hAccel = LoadAcceleratorsW(hInstance, wszAccelTable); + wc.cbSize = sizeof(wc); wc.style = CS_HREDRAW | CS_VREDRAW; wc.lpfnWndProc = WndProc; wc.cbClsExtra = 0;

1 0

Dylan Smith : wordpad: Provide buffer for replace with text.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: 975dd904ef8c1ddf6c08ebe465cc382c073dd1a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=975dd904ef8c1ddf6c08ebe46… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Jun 11 00:44:16 2010 -0400 wordpad: Provide buffer for replace with text. --- programs/wordpad/wordpad.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 0bf5d0c..3b8b6bc 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -1302,6 +1302,7 @@ static LRESULT handle_findmsg(LPFINDREPLACEW pFr) static void dialog_find(LPFINDREPLACEW fr, BOOL replace) { static WCHAR findBuffer[MAX_STRING_LEN]; + static WCHAR replaceBuffer[MAX_STRING_LEN]; /* Allow only one search/replace dialog to open */ if(hFindWnd != NULL) @@ -1315,8 +1316,10 @@ static void dialog_find(LPFINDREPLACEW fr, BOOL replace) fr->hwndOwner = hMainWnd; fr->Flags = FR_HIDEUPDOWN; fr->lpstrFindWhat = findBuffer; + fr->lpstrReplaceWith = replaceBuffer; fr->lCustData = -1; - fr->wFindWhatLen = MAX_STRING_LEN*sizeof(WCHAR); + fr->wFindWhatLen = sizeof(findBuffer); + fr->wReplaceWithLen = sizeof(replaceBuffer); if(replace) hFindWnd = ReplaceTextW(fr);

1 0

Jacek Caban : iexplore: Use 1 as default icon ID.
by Alexandre Julliard 10 Jun '10

10 Jun '10

Module: wine Branch: master Commit: 5a8f2073ca4d56eb78b45f3acb6998e094bc23e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a8f2073ca4d56eb78b45f3ac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 10 12:50:38 2010 +0200 iexplore: Use 1 as default icon ID. --- dlls/shdocvw/iexplore.c | 2 +- programs/iexplore/iexplore.rc | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index 9c14cfc..5ef0b36 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); -#define IDI_APPICON 101 +#define IDI_APPICON 1 static const WCHAR szIEWinFrame[] = { 'I','E','F','r','a','m','e',0 }; diff --git a/programs/iexplore/iexplore.rc b/programs/iexplore/iexplore.rc index 80286c4..f37481a 100644 --- a/programs/iexplore/iexplore.rc +++ b/programs/iexplore/iexplore.rc @@ -26,7 +26,5 @@ #include "wine/wine_common_ver.rc" -#define IDI_APPICON 101 - /* @makedep: iexplore.ico */ -IDI_APPICON ICON iexplore.ico +1 ICON iexplore.ico

1 0

Jacek Caban : mshtml: Uncomment iexplore.exe registries.
by Alexandre Julliard 10 Jun '10

10 Jun '10

Module: wine Branch: master Commit: 4fe2dca81149927d07e1c6c90117afe4bbff91ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fe2dca81149927d07e1c6c90… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 10 12:51:12 2010 +0200 mshtml: Uncomment iexplore.exe registries. --- dlls/mshtml/mshtml.inf | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/mshtml.inf b/dlls/mshtml/mshtml.inf index dccd736..7789334 100644 --- a/dlls/mshtml/mshtml.inf +++ b/dlls/mshtml/mshtml.inf @@ -91,7 +91,7 @@ HKCR,"CLSID\%CLSID_CRecalcEngine%\InProcServer32","ThreadingModel",,"Apartment" ;; CrSource HKCR,"CLSID\%CLSID_CrSource%",,,"Microsoft CrSource 4.0" HKCR,"CLSID\%CLSID_CrSource%\BrowseInPlace",,16 -;; HKCR,"CLSID\%CLSID_CrSource%\DefaultIcon",,0x00020000,"%IEXPLORE%,1" +HKCR,"CLSID\%CLSID_CrSource%\DefaultIcon",,0x00020000,"%IEXPLORE%,1" HKCR,"CLSID\%CLSID_CrSource%\EnablePlugin\.css",,,"PointPlus plugin" HKCR,"CLSID\%CLSID_CrSource%\InProcServer32",,,"mshtml.dll" HKCR,"CLSID\%CLSID_CrSource%\InProcServer32","ThreadingModel",,"Apartment" @@ -122,7 +122,7 @@ HKCR,"CLSID\%CLSID_HTADocument%\Version",,,"6.0" ;; HTMLDocument HKCR,"CLSID\%CLSID_HTMLDocument%",,,"HTML Document" HKCR,"CLSID\%CLSID_HTMLDocument%\BrowseInPlace",,16 -;; HKCR,"CLSID\%CLSID_HTMLDocument%\DefaultIcon",,0x00020000,"%IEXPLORE%,1" +HKCR,"CLSID\%CLSID_HTMLDocument%\DefaultIcon",,0x00020000,"%IEXPLORE%,1" HKCR,"CLSID\%CLSID_HTMLDocument%\InProcServer32",,,"mshtml.dll" HKCR,"CLSID\%CLSID_HTMLDocument%\InProcServer32","ThreadingModel",,"Apartment" HKCR,"CLSID\%CLSID_HTMLDocument%\MiscStatus",,,"2228625" @@ -215,7 +215,7 @@ HKCR,"CLSID\%CLSID_MailtoProtocol%\InProcServer32","ThreadingModel",,"Apartment" ;; MHTMLDocument HKCR,"CLSID\%CLSID_MHTMLDocument%",,,"MHTML Document" HKCR,"CLSID\%CLSID_MHTMLDocument%\BrowseInPlace",,16 -;; HKCR,"CLSID\%CLSID_MHTMLDocument%\DefaultIcon",,0x00020000,"%IEXPLORE%,1" +HKCR,"CLSID\%CLSID_MHTMLDocument%\DefaultIcon",,0x00020000,"%IEXPLORE%,1" HKCR,"CLSID\%CLSID_MHTMLDocument%\InProcServer32",,,"mshtml.dll" HKCR,"CLSID\%CLSID_MHTMLDocument%\InProcServer32","ThreadingModel",,"Apartment" HKCR,"CLSID\%CLSID_MHTMLDocument%\MiscStatus",,,"2228625" @@ -236,7 +236,7 @@ HKCR,"CLSID\%CLSID_Scriptlet%\MiscStatus",,,"0" HKCR,"CLSID\%CLSID_Scriptlet%\MiscStatus\1",,,"131473" HKCR,"CLSID\%CLSID_Scriptlet%\ProgID",,,"ScriptBridge.ScriptBridge.1" HKCR,"CLSID\%CLSID_Scriptlet%\Programmable",,16 -;; HKCR,"CLSID\%CLSID_Scriptlet%\ToolboxBitmap32",,,"%IEXPLORE%,1" +HKCR,"CLSID\%CLSID_Scriptlet%\ToolboxBitmap32",,,"%IEXPLORE%,1" HKCR,"CLSID\%CLSID_Scriptlet%\TypeLib",,,"%LIBID_MSHTML%" HKCR,"CLSID\%CLSID_Scriptlet%\Version",,,"4.0" HKCR,"CLSID\%CLSID_Scriptlet%\VersionIndependentProgID",,,"ScriptBridge.ScriptBridge" @@ -312,9 +312,9 @@ HKCR,".gif",,2,"giffile" HKCR,".gif","Content Type",,"image/gif" HKCR,"giffile",,,"GIF Image" HKCR,"giffile\CLSID",,,"%CLSID_HTMLDocument%" -;; HKCR,"giffile\shell\open\command",,,"""%IEXPLORE%"" -nohome" +HKCR,"giffile\shell\open\command",,,"""%IEXPLORE%"" -nohome" HKCR,"giffile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," -;; HKCR,"giffile\shell\open\ddeexec\Application",,,"IExplore" +HKCR,"giffile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"giffile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"giffile\DefaultIcon",,,"%IEXPLORE%,9" @@ -339,7 +339,7 @@ HKCR,"htmlfile\shell\printto\command",,,"rundll32.exe mshtml.dll,PrintHTML ""%%1 HKCR,"htmlfile",,,"HTML Document" HKCR,"htmlfile\BrowseInPlace",,16 HKCR,"htmlfile\CLSID",,,"%CLSID_HTMLDocument%" -;; HKCR,"htmlfile\DefaultIcon",,0x00020000,"%IEXPLORE%,1" +HKCR,"htmlfile\DefaultIcon",,0x00020000,"%IEXPLORE%,1" HKCR,"htmlfile_FullWindowEmbed",,,"HTML Plugin Document" HKCR,"htmlfile_FullWindowEmbed\BrowseInPlace",,16 HKCR,"htmlfile_FullWindowEmbed\CLSID",,,"%CLSID_HTMLPluginDocument%" @@ -359,9 +359,9 @@ HKCR,".jpe",,2,"jpegfile" HKCR,".jpe","Content Type",,"image/jpeg" HKCR,"jpegfile",,,"JPEG Image" HKCR,"jpegfile\CLSID",,,"%CLSID_HTMLDocument%" -;; HKCR,"jpegfile\shell\open\command",,,"""%IEXPLORE%"" -nohome" +HKCR,"jpegfile\shell\open\command",,,"""%IEXPLORE%"" -nohome" HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," -;; HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore" +HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"jpegfile\DefaultIcon",,,"%IEXPLORE%,8" @@ -374,9 +374,9 @@ HKCR,".jpeg",,2,"jpegfile" HKCR,".jpeg","Content Type",,"image/jpeg" HKCR,"jpegfile",,,"JPEG Image" HKCR,"jpegfile\CLSID",,,"%CLSID_HTMLDocument%" -;; HKCR,"jpegfile\shell\open\command",,,"""%IEXPLORE%"" -nohome" +HKCR,"jpegfile\shell\open\command",,,"""%IEXPLORE%"" -nohome" HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," -;; HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore" +HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"jpegfile\DefaultIcon",,,"%IEXPLORE%,8" @@ -385,9 +385,9 @@ HKCR,".jpg",,2,"jpegfile" HKCR,".jpg","Content Type",,"image/jpeg" HKCR,"jpegfile",,,"JPEG Image" HKCR,"jpegfile\CLSID",,,"%CLSID_HTMLDocument%" -;; HKCR,"jpegfile\shell\open\command",,,"""%IEXPLORE%"" -nohome" +HKCR,"jpegfile\shell\open\command",,,"""%IEXPLORE%"" -nohome" HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," -;; HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore" +HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"jpegfile\DefaultIcon",,,"%IEXPLORE%,8" @@ -422,9 +422,9 @@ HKCR,".jfif",,2,"pjpegfile" HKCR,".jfif","Content Type",,"image/jpeg" HKCR,"pjpegfile",,,"JPEG Image" HKCR,"pjpegfile\CLSID",,,"%CLSID_HTMLDocument%" -;; HKCR,"pjpegfile\shell\open\command",,,"""%IEXPLORE%"" -nohome" +HKCR,"pjpegfile\shell\open\command",,,"""%IEXPLORE%"" -nohome" HKCR,"pjpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," -;; HKCR,"pjpegfile\shell\open\ddeexec\Application",,,"IExplore" +HKCR,"pjpegfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"pjpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"pjpegfile\DefaultIcon",,,"%IEXPLORE%,8" @@ -435,9 +435,9 @@ HKCR,".png",,2,"pngfile" HKCR,".png","Content Type",,"image/png" HKCR,"pngfile",,,"PNG Image" HKCR,"pngfile\CLSID",,,"%CLSID_HTMLDocument%" -;; HKCR,"pngfile\shell\open\command",,,"""%IEXPLORE%"" -nohome" +HKCR,"pngfile\shell\open\command",,,"""%IEXPLORE%"" -nohome" HKCR,"pngfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," -;; HKCR,"pngfile\shell\open\ddeexec\Application",,,"IExplore" +HKCR,"pngfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"pngfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"pngfile\DefaultIcon",,,"%IEXPLORE%,9" @@ -478,9 +478,9 @@ HKCR,"MIME\Database\Content Type\image/x-xbitmap","CLSID",,"%CLSID_HTMLDocument% HKCR,".xbm","Content Type",,"image/x-xbitmap" HKCR,"xbmfile",,,"XBM Image" HKCR,"xbmfile\CLSID",,,"%CLSID_HTMLDocument%" -;; HKCR,"xbmfile\shell\open\command",,,"""%IEXPLORE%"" -nohome" +HKCR,"xbmfile\shell\open\command",,,"""%IEXPLORE%"" -nohome" HKCR,"xbmfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," -;; HKCR,"xbmfile\shell\open\ddeexec\Application",,,"IExplore" +HKCR,"xbmfile\shell\open\ddeexec\Application",,,"IExplore" HKCR,"xbmfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"xbmfile\DefaultIcon",,,"%IEXPLORE%,9"

1 0

Jacek Caban : winbase.h: Added missing COPY_FILE_* flags.
by Alexandre Julliard 10 Jun '10

10 Jun '10

Module: wine Branch: master Commit: 75912afabdec583be7f89141ea1326509a0ebdd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75912afabdec583be7f89141e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 10 13:01:19 2010 +0200 winbase.h: Added missing COPY_FILE_* flags. --- include/winbase.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 6bb4866..c3dc64c 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -187,6 +187,9 @@ typedef struct _OFSTRUCT #define COPY_FILE_FAIL_IF_EXISTS 0x00000001 #define COPY_FILE_RESTARTABLE 0x00000002 #define COPY_FILE_OPEN_SOURCE_FOR_WRITE 0x00000004 +#define COPY_FILE_ALLOW_DECRYPTED_DESTINATION 0x00000008 +#define COPY_FILE_COPY_SYMLINK 0x00000800 +#define COPY_FILE_NO_BUFFERING 0x00001000 /* return values for CopyProgressRoutine */ #define PROGRESS_CONTINUE 0

1 0

Nikolay Sivov : comctl32/tests: Some expand notifications tests.
by Alexandre Julliard 10 Jun '10

10 Jun '10

Module: wine Branch: master Commit: 138b2435f9880072dccb1f11272fd889e5462804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=138b2435f9880072dccb1f112… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 10 01:32:06 2010 +0400 comctl32/tests: Some expand notifications tests. --- dlls/comctl32/tests/treeview.c | 229 +++++++++++++++++++++++++++++++--------- dlls/comctl32/treeview.c | 10 +- 2 files changed, 185 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=138b2435f9880072dccb1…

1 0

Marcus Meissner : wininet: Fixed buffer lengths in InternetCrackUrlW tests.
by Alexandre Julliard 10 Jun '10

10 Jun '10

Module: wine Branch: master Commit: 3d5a3a32ce7536041fce9b07e265404c2e112b35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d5a3a32ce7536041fce9b07e… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Jun 10 13:52:33 2010 +0200 wininet: Fixed buffer lengths in InternetCrackUrlW tests. --- dlls/wininet/tests/url.c | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 1f012f0..6dc1369 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -200,7 +200,7 @@ static void test_crack_url(const crack_url_test_t *test) urlw.dwUrlPathLength = 1; urlw.dwExtraInfoLength = 1; - MultiByteToWideChar(CP_ACP, 0, test->url, -1, buf, sizeof(buf)); + MultiByteToWideChar(CP_ACP, 0, test->url, -1, buf, sizeof(buf)/sizeof(buf[0])); b = InternetCrackUrlW(buf, lstrlenW(buf), 0, &urlw); if(!b && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("InternetCrackUrlW is not implemented\n"); @@ -416,19 +416,19 @@ static void InternetCrackUrlW_test(void) user[0]=0; pwd[0]=0; memset(&comp, 0, sizeof comp); - comp.dwStructSize = sizeof comp; + comp.dwStructSize = sizeof(comp); comp.lpszScheme = scheme; - comp.dwSchemeLength = sizeof scheme; + comp.dwSchemeLength = sizeof(scheme)/sizeof(scheme[0]); comp.lpszHostName = host; - comp.dwHostNameLength = sizeof host; + comp.dwHostNameLength = sizeof(host)/sizeof(host[0]); comp.lpszUserName = user; - comp.dwUserNameLength = sizeof user; + comp.dwUserNameLength = sizeof(user)/sizeof(user[0]); comp.lpszPassword = pwd; - comp.dwPasswordLength = sizeof pwd; + comp.dwPasswordLength = sizeof(pwd)/sizeof(pwd[0]); comp.lpszUrlPath = urlpart; - comp.dwUrlPathLength = sizeof urlpart; + comp.dwUrlPathLength = sizeof(urlpart)/sizeof(urlpart[0]); comp.lpszExtraInfo = extra; - comp.dwExtraInfoLength = sizeof extra; + comp.dwExtraInfoLength = sizeof(extra)/sizeof(extra[0]); SetLastError(0xdeadbeef); r = InternetCrackUrlW(NULL, 0, 0, &comp ); @@ -471,9 +471,9 @@ static void InternetCrackUrlW_test(void) memset(&comp, 0, sizeof comp); comp.dwStructSize = sizeof comp; comp.lpszHostName = host; - comp.dwHostNameLength = sizeof host; + comp.dwHostNameLength = sizeof(host)/sizeof(host[0]); comp.lpszUrlPath = urlpart; - comp.dwUrlPathLength = sizeof urlpart; + comp.dwUrlPathLength = sizeof(urlpart)/sizeof(urlpart[0]); r = InternetCrackUrlW(url, 0, 0, &comp ); ok( r, "failed to crack url\n"); @@ -493,11 +493,11 @@ static void InternetCrackUrlW_test(void) memset(&comp, 0, sizeof comp); comp.dwStructSize = sizeof comp; comp.lpszHostName = host; - comp.dwHostNameLength = sizeof host; + comp.dwHostNameLength = sizeof(host)/sizeof(host[0]); comp.lpszUrlPath = urlpart; - comp.dwUrlPathLength = sizeof urlpart; + comp.dwUrlPathLength = sizeof(urlpart)/sizeof(urlpart[0]); comp.lpszExtraInfo = NULL; - comp.dwExtraInfoLength = sizeof extra; + comp.dwExtraInfoLength = sizeof(extra)/sizeof(extra[0]); r = InternetCrackUrlW(url, 0, 0, &comp ); ok( r, "failed to crack url\n"); @@ -547,17 +547,17 @@ static void InternetCrackUrlW_test(void) memset(&comp, 0, sizeof comp); comp.dwStructSize = sizeof comp; comp.lpszScheme = scheme; - comp.dwSchemeLength = sizeof scheme; + comp.dwSchemeLength = sizeof(scheme)/sizeof(scheme[0]); comp.lpszHostName = host; - comp.dwHostNameLength = sizeof host; + comp.dwHostNameLength = sizeof(host)/sizeof(host[0]); comp.lpszUserName = user; - comp.dwUserNameLength = sizeof user; + comp.dwUserNameLength = sizeof(user)/sizeof(user[0]); comp.lpszPassword = pwd; - comp.dwPasswordLength = sizeof pwd; + comp.dwPasswordLength = sizeof(pwd)/sizeof(pwd[0]); comp.lpszUrlPath = urlpart; - comp.dwUrlPathLength = sizeof urlpart; + comp.dwUrlPathLength = sizeof(urlpart)/sizeof(urlpart[0]); comp.lpszExtraInfo = extra; - comp.dwExtraInfoLength = sizeof extra; + comp.dwExtraInfoLength = sizeof(extra)/sizeof(extra[0]); r = InternetCrackUrlW(url3, 0, 0, &comp ); ok( r, "InternetCrackUrlW failed unexpectedly\n"); ok( host[0] == 'x', "host should be x.org\n");

1 0

Matteo Bruni : d3dx9: Allow sampler declaration without sampler type.
by Alexandre Julliard 10 Jun '10

10 Jun '10

Module: wine Branch: master Commit: 5bb403ceb2be5f727c24a87bee35e72fdd6b41aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bb403ceb2be5f727c24a87be… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Jun 8 03:20:20 2010 +0200 d3dx9: Allow sampler declaration without sampler type. --- dlls/d3dx9_36/asmshader.y | 15 +++++++++++++++ dlls/d3dx9_36/tests/asm.c | 5 +++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/asmshader.y b/dlls/d3dx9_36/asmshader.y index 0c335b4..689a8fd 100644 --- a/dlls/d3dx9_36/asmshader.y +++ b/dlls/d3dx9_36/asmshader.y @@ -618,6 +618,21 @@ instruction: INSTR_ADD omods dreg ',' sregs } asm_ctx.funcs->dcl_sampler(&asm_ctx, $2, $3.mod, $4, asm_ctx.line_no); } + | INSTR_DCL omods REG_SAMPLER + { + TRACE("Sampler declared\n"); + if($2.shift != 0) { + asmparser_message(&asm_ctx, "Line %u: Shift modifier not allowed here\n", + asm_ctx.line_no); + set_parse_status(&asm_ctx, PARSE_ERR); + } + if(asm_ctx.shader->type != ST_PIXEL) { + asmparser_message(&asm_ctx, "Line %u: Declaration needs a sampler type\n", + asm_ctx.line_no); + set_parse_status(&asm_ctx, PARSE_ERR); + } + asm_ctx.funcs->dcl_sampler(&asm_ctx, BWRITERSTT_UNKNOWN, $2.mod, $3, asm_ctx.line_no); + } | INSTR_DCL sampdcl omods dcl_inputreg { TRACE("Error rule: sampler decl of input reg\n"); diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index dda0e2b..5f2e49a 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -1216,6 +1216,11 @@ static void ps_3_0_test(void) { "dcl v0\n", {0xffff0300, 0x0200001f, 0x80000000, 0x900f0000, 0x0000ffff} }, + { /* shader 16 */ + "ps_3_0\n" + "dcl s2\n", + {0xffff0300, 0x0200001f, 0x80000000, 0xa00f0802, 0x0000ffff} + }, }; exec_tests("ps_3_0", tests, sizeof(tests) / sizeof(tests[0]));

1 0

Matteo Bruni : d3dx9: Check register type in dcl input instruction.
by Alexandre Julliard 10 Jun '10

10 Jun '10

Module: wine Branch: master Commit: a74978dfefb1eea2ab0dda2df086f372b896fb6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a74978dfefb1eea2ab0dda2df… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Jun 8 03:21:43 2010 +0200 d3dx9: Check register type in dcl input instruction. --- dlls/d3dx9_36/asmparser.c | 8 ++++++++ dlls/d3dx9_36/tests/asm.c | 9 +++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/asmparser.c b/dlls/d3dx9_36/asmparser.c index b20479a..528e6b3 100644 --- a/dlls/d3dx9_36/asmparser.c +++ b/dlls/d3dx9_36/asmparser.c @@ -118,6 +118,8 @@ static void asmparser_dcl_output(struct asm_parser *This, DWORD usage, DWORD num static void asmparser_dcl_input(struct asm_parser *This, DWORD usage, DWORD num, DWORD mod, const struct shader_reg *reg) { + struct instruction instr; + if(!This->shader) return; if(mod != 0 && (This->shader->version != BWRITERPS_VERSION(3, 0) || @@ -127,6 +129,12 @@ static void asmparser_dcl_input(struct asm_parser *This, DWORD usage, DWORD num, set_parse_status(This, PARSE_ERR); return; } + + /* Check register type and modifiers */ + instr.dstmod = mod; + instr.shift = 0; + This->funcs->dstreg(This, &instr, reg); + if(!record_declaration(This->shader, usage, num, mod, FALSE, reg->regnum, reg->writemask, FALSE)) { ERR("Out of memory\n"); set_parse_status(This, PARSE_ERR); diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 5f2e49a..6255d02 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -1365,6 +1365,15 @@ static void failure_test(void) { /* shader 43: can't explicitely declare input registers in ps_2_0 */ "ps_2_0\n" "dcl_texcoord0 t0\n", + /* shader 44: can't implicitely declare registers in vs */ + "vs_2_0\n" + "dcl o0\n", + /* shader 45: can't implicitely declare samplers in vs */ + "vs_3_0\n" + "dcl s2\n", + /* shader 46: no tx registers in ps_3_0 */ + "ps_3_0\n" + "dcl t2\n", }; HRESULT hr; unsigned int i;

1 0

Matteo Bruni : d3dx9: Disallow sampler declarations where not supported.
by Alexandre Julliard 10 Jun '10

10 Jun '10

Module: wine Branch: master Commit: 5a5844d45864201d3be01055035f5fe4f7ae1310 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a5844d45864201d3be010550… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Jun 8 16:13:59 2010 +0200 d3dx9: Disallow sampler declarations where not supported. --- dlls/d3dx9_36/asmparser.c | 11 +++++++++-- dlls/d3dx9_36/tests/asm.c | 3 +++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/asmparser.c b/dlls/d3dx9_36/asmparser.c index 528e6b3..4e7f018 100644 --- a/dlls/d3dx9_36/asmparser.c +++ b/dlls/d3dx9_36/asmparser.c @@ -178,6 +178,13 @@ static void asmparser_dcl_sampler(struct asm_parser *This, DWORD samptype, } } +static void asmparser_dcl_sampler_unsupported(struct asm_parser *This, DWORD samptype, + DWORD mod, DWORD regnum, + unsigned int line_no) { + asmparser_message(This, "Line %u: Sampler declaration unsupported in this shader version\n", This->line_no); + set_parse_status(This, PARSE_ERR); +} + static void asmparser_sincos(struct asm_parser *This, DWORD mod, DWORD shift, const struct shader_reg *dst, const struct src_regs *srcs) { @@ -779,7 +786,7 @@ static const struct asmparser_backend parser_vs_1 = { asmparser_dcl_output, asmparser_dcl_input, - asmparser_dcl_sampler, + asmparser_dcl_sampler_unsupported, asmparser_end, @@ -799,7 +806,7 @@ static const struct asmparser_backend parser_vs_2 = { asmparser_dcl_output, asmparser_dcl_input, - asmparser_dcl_sampler, + asmparser_dcl_sampler_unsupported, asmparser_end, diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 6255d02..276a6e2 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -1374,6 +1374,9 @@ static void failure_test(void) { /* shader 46: no tx registers in ps_3_0 */ "ps_3_0\n" "dcl t2\n", + /* shader 47: no samplers in vs_2_0 */ + "vs_2_0\n" + "dcl_2d s2\n", }; HRESULT hr; unsigned int i;

1 0