January 2011 - Wine-commits

Nikolay Sivov : msvcrt: Implement _fcvt_s().
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 7a57f02b8d275c1e8af1ea1c8e8c1bb2e9b02971 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a57f02b8d275c1e8af1ea1c8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 29 20:47:34 2011 +0300 msvcrt: Implement _fcvt_s(). --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/math.c | 89 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/printf.c | 35 ++++++++++++++-- 6 files changed, 123 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 703a78d..9080ba1 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -606,7 +606,7 @@ @ stub _fclose_nolock @ cdecl _fcloseall() msvcrt._fcloseall @ cdecl _fcvt(double long ptr ptr) msvcrt._fcvt -@ stub _fcvt_s +@ cdecl _fcvt_s(ptr long double long ptr ptr) msvcrt._fcvt_s @ cdecl _fdopen(long str) msvcrt._fdopen @ stub _fflush_nolock @ cdecl _fgetchar() msvcrt._fgetchar diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index c622b0e..76c25e7 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -447,7 +447,7 @@ @ stub _fclose_nolock @ cdecl _fcloseall() msvcrt._fcloseall @ cdecl _fcvt(double long ptr ptr) msvcrt._fcvt -@ stub _fcvt_s +@ cdecl _fcvt_s(ptr long double long ptr ptr) msvcrt._fcvt_s @ cdecl _fdopen(long str) msvcrt._fdopen @ stub _fflush_nolock @ cdecl _fgetchar() msvcrt._fgetchar diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 52f49c5..49b7139 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -439,7 +439,7 @@ @ stub _fclose_nolock @ cdecl _fcloseall() msvcrt._fcloseall @ cdecl _fcvt(double long ptr ptr) msvcrt._fcvt -@ stub _fcvt_s +@ cdecl _fcvt_s(ptr long double long ptr ptr) msvcrt._fcvt_s @ cdecl _fdopen(long str) msvcrt._fdopen @ stub _fflush_nolock @ cdecl _fgetchar() msvcrt._fgetchar diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index c0fc11c..ab9cec4 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1423,6 +1423,95 @@ char * CDECL _fcvt( double number, int ndigits, int *decpt, int *sign ) } /*********************************************************************** + * _fcvt_s (MSVCRT.@) + */ +int CDECL _fcvt_s(char* outbuffer, MSVCRT_size_t size, double number, int ndigits, int *decpt, int *sign) +{ + int stop, dec1, dec2; + char *ptr1, *ptr2, *first; + char buf[80]; /* ought to be enough */ + + if (!outbuffer || !decpt || !sign || size == 0) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + if (number < 0) + { + *sign = 1; + number = -number; + } else *sign = 0; + + snprintf(buf, 80, "%.*f", ndigits < 0 ? 0 : ndigits, number); + ptr1 = buf; + ptr2 = outbuffer; + first = NULL; + dec1 = 0; + dec2 = 0; + + /* For numbers below the requested resolution, work out where + the decimal point will be rather than finding it in the string */ + if (number < 1.0 && number > 0.0) { + dec2 = log10(number + 1e-10); + if (-dec2 <= ndigits) dec2 = 0; + } + + /* If requested digits is zero or less, we will need to truncate + * the returned string */ + if (ndigits < 1) { + stop = strlen(buf) + ndigits; + } else { + stop = strlen(buf); + } + + while (*ptr1 == '0') ptr1++; /* Skip leading zeroes */ + while (*ptr1 != '\0' && *ptr1 != '.') { + if (!first) first = ptr2; + if ((ptr1 - buf) < stop) { + if (size > 1) { + *ptr2++ = *ptr1++; + size--; + } + } else { + ptr1++; + } + dec1++; + } + + if (ndigits > 0) { + ptr1++; + if (!first) { + while (*ptr1 == '0') { /* Process leading zeroes */ + if (number == 0.0 && size > 1) { + *ptr2++ = '0'; + size--; + } + ptr1++; + dec1--; + } + } + while (*ptr1 != '\0') { + if (!first) first = ptr2; + if (size > 1) { + *ptr2++ = *ptr1++; + size--; + } + } + } + + *ptr2 = '\0'; + + /* We never found a non-zero digit, then our number is either + * smaller than the requested precision, or 0.0 */ + if (!first && (number <= 0.0)) + dec1 = 0; + + *decpt = dec2 ? dec2 : dec1; + return 0; +} + +/*********************************************************************** * _gcvt (MSVCRT.@) */ char * CDECL _gcvt( double number, int ndigit, char *buff ) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 37d2425..64cb281 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -400,7 +400,7 @@ # stub _expand_dbg @ cdecl _fcloseall() MSVCRT__fcloseall @ cdecl _fcvt(double long ptr ptr) -# stub _fcvt_s +@ cdecl _fcvt_s(ptr long double long ptr ptr) @ cdecl _fdopen(long str) MSVCRT__fdopen @ cdecl _fgetchar() @ cdecl _fgetwchar() diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index d32ef73..f05d124 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -26,6 +26,7 @@ #define _CRT_NON_CONFORMING_SWPRINTFS #include <stdio.h> +#include <errno.h> #include "windef.h" #include "winbase.h" @@ -760,7 +761,7 @@ static struct { { 0.4, 0, "", "", 0, 0, 0 }, { 0.49, 0, "", "", 0, 0, 0 }, { 0.51, 0, "", "1", 1, 1, 0 }, - /* ask ridiculous amunt of precision, ruin formatting this table */ + /* ask for ridiculous precision, ruin formatting this table */ { 1.0, 30, "100000000000000000000000000000", "1000000000000000000000000000000", 1, 1, 0}, { 123456789012345678901.0, 30, "123456789012345680000000000000", @@ -773,6 +774,7 @@ static void test_xcvt(void) { char *str; int i, decpt, sign, err; + for( i = 0; strcmp( test_cvt_testcases[i].expstr_e, "END"); i++){ decpt = sign = 100; str = _ecvt( test_cvt_testcases[i].value, @@ -830,17 +832,40 @@ static void test_xcvt(void) if (p__fcvt_s) { + int i; + str = malloc(1024); + + /* invalid arguments */ + err = p__fcvt_s(NULL, 0, 0.0, 0, &i, &i); + ok(err == EINVAL, "got %d, expected EINVAL\n", err); + + err = p__fcvt_s(str, 0, 0.0, 0, &i, &i); + ok(err == EINVAL, "got %d, expected EINVAL\n", err); + + str[0] = ' '; + str[1] = 0; + err = p__fcvt_s(str, -1, 0.0, 0, &i, &i); + ok(err == 0, "got %d, expected 0\n", err); + ok(str[0] == 0, "got %c, expected 0\n", str[0]); + ok(str[1] == 0, "got %c, expected 0\n", str[1]); + + err = p__fcvt_s(str, 1, 0.0, 0, NULL, &i); + ok(err == EINVAL, "got %d, expected EINVAL\n", err); + + err = p__fcvt_s(str, 1, 0.0, 0, &i, NULL); + ok(err == EINVAL, "got %d, expected EINVAL\n", err); + for( i = 0; strcmp( test_cvt_testcases[i].expstr_e, "END"); i++){ decpt = sign = 100; err = p__fcvt_s(str, 1024, test_cvt_testcases[i].value, test_cvt_testcases[i].nrdigits, &decpt, &sign); ok(err == 0, "_fcvt_s() failed with error code %d", err); ok( 0 == strncmp( str, test_cvt_testcases[i].expstr_f, 15), - "_fcvt_s() bad return, got \n'%s' expected \n'%s'\n", str, - test_cvt_testcases[i].expstr_e); + "_fcvt_s() bad return, got '%s' expected '%s'. test %d\n", str, + test_cvt_testcases[i].expstr_f, i); ok( decpt == test_cvt_testcases[i].expdecpt_f, "_fcvt_s() decimal point wrong, got %d expected %d\n", decpt, - test_cvt_testcases[i].expdecpt_e); + test_cvt_testcases[i].expdecpt_f); ok( sign == test_cvt_testcases[i].expsign, "_fcvt_s() sign wrong, got %d expected %d\n", sign, test_cvt_testcases[i].expsign); @@ -848,7 +873,7 @@ static void test_xcvt(void) free(str); } else - todo_wine win_skip("_fcvt_s not available\n"); + win_skip("_fcvt_s not available\n"); } static int __cdecl _vsnwprintf_wrapper(wchar_t *str, size_t len, const wchar_t *format, ...)

1 0

Eric Pouech : kernel32: Added support for ctrl-home ( aka clear from beginning of line) in line edition in win32 mode.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 08f13cbd39dce3a6072d27dca46f11e3dbfca7d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08f13cbd39dce3a6072d27dca… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jan 29 19:59:16 2011 +0100 kernel32: Added support for ctrl-home (aka clear from beginning of line) in line edition in win32 mode. --- dlls/kernel32/editline.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index c2799af..a39fa8d 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -639,6 +639,16 @@ static void WCEL_KillToEndOfLine(WCEL_Context* ctx) WCEL_DeleteString(ctx, ctx->ofs, ctx->len); } +static void WCEL_KillFromBegOfLine(WCEL_Context* ctx) +{ + if (ctx->ofs) + { + WCEL_SaveYank(ctx, 0, ctx->ofs); + WCEL_DeleteString(ctx, 0, ctx->ofs); + ctx->ofs = 0; + } +} + static void WCEL_KillMarkedZone(WCEL_Context* ctx) { unsigned beg, end; @@ -883,6 +893,7 @@ static const KeyEntry Win32KeyMapCtrl[] = {/*VK_LEFT*/ 0x25, WCEL_MoveToLeftWord }, {/*VK_RIGHT*/0x27, WCEL_MoveToRightWord }, {/*VK_END*/ 0x23, WCEL_KillToEndOfLine }, + {/*VK_HOME*/ 0x24, WCEL_KillFromBegOfLine }, { 0, NULL } };

1 0

Wolfram Sang : comdlg32: Filedlg should not add extension if it contains a glob.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 5cb4c55335c5e1192a6ac3b6f97db87f6344c7cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cb4c55335c5e1192a6ac3b6f… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Sat Jan 29 09:15:34 2011 +0100 comdlg32: Filedlg should not add extension if it contains a glob. --- dlls/comdlg32/filedlg.c | 4 ++-- dlls/comdlg32/tests/filedlg.c | 40 ++++++++++++++++++++++++++++------------ 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index f36d3a5..2fb0969 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2491,8 +2491,8 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) else if ( fodInfos->defext ) /* attach the default file extension*/ filterExt = fodInfos->defext; - /* If extension is .*, ignore it */ - if (filterExt[0] != '*') + /* If extension contains a glob, ignore it */ + if ( filterExt && !strchrW(filterExt, '*') && !strchrW(filterExt, '?') ) { /* Attach the dot*/ lstrcatW(lpstrPathAndFile, szwDot); diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 0320e7e..73e8d36 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -1052,6 +1052,15 @@ static UINT_PTR WINAPI test_extension_wndproc(HWND dlg, UINT msg, WPARAM wParam, return FALSE; } +static const char *defext_filters[] = { + "TestFilter (*.pt*)\0*.pt*\0", + "TestFilter (*.ab?)\0*.ab?\0", + "TestFilter (*.*)\0*.*\0", + NULL /* is a test, not an endmark! */ +}; + +#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) + static void test_extension(void) { OPENFILENAME ofn = { sizeof(OPENFILENAME)}; @@ -1059,11 +1068,12 @@ static void test_extension(void) char curdir[MAX_PATH]; char *filename_ptr; const char *test_file_name = "deadbeef"; + const char **cur_filter; DWORD ret; - BOOL cdret; + BOOL boolret; - cdret = GetCurrentDirectoryA(sizeof(curdir), curdir); - ok(cdret, "Failed to get current dir err %d\n", GetLastError()); + boolret = GetCurrentDirectoryA(sizeof(curdir), curdir); + ok(boolret, "Failed to get current dir err %d\n", GetLastError()); /* Ignore .* extension */ ofn.lStructSize = sizeof(ofn); @@ -1075,17 +1085,23 @@ static void test_extension(void) ofn.lpstrInitialDir = curdir; ofn.lpfnHook = test_extension_wndproc; ofn.nFileExtension = 0; - ofn.lpstrFilter = "All Files (*.*)\0*.*\0"; - strcpy(filename, test_file_name); - - ret = GetSaveFileNameA(&ofn); - filename_ptr = ofn.lpstrFile + strlen( ofn.lpstrFile ) - strlen( test_file_name ); - ok(1 == ret, "expected 1, got %d\n", ret); - ok(strlen(ofn.lpstrFile) >= strlen(test_file_name), "Filename %s is too short\n", ofn.lpstrFile ); - ok( strcmp(filename_ptr, test_file_name) == 0, - "Filename is %s, expected %s\n", filename_ptr, test_file_name ); + + for (cur_filter = defext_filters; cur_filter < defext_filters + ARRAY_SIZE(defext_filters); cur_filter++) { + ofn.lpstrFilter = *cur_filter; + strcpy(filename, test_file_name); + boolret = GetSaveFileNameA(&ofn); + ok(boolret, "expected true\n"); + ret = CommDlgExtendedError(); + ok(!ret, "CommDlgExtendedError returned %#x\n", ret); + filename_ptr = ofn.lpstrFile + strlen( ofn.lpstrFile ) - strlen( test_file_name ); + ok( strlen(ofn.lpstrFile) >= strlen(test_file_name), "Filename %s is too short\n", ofn.lpstrFile ); + ok( strcmp(filename_ptr, test_file_name) == 0, + "Filename is %s, expected %s\n", filename_ptr, test_file_name ); + } } +#undef ARRAY_SIZE + START_TEST(filedlg) { test_DialogCancel();

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: aef44d698e4ed32d77972dc722fa3b3dd29ee57b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aef44d698e4ed32d77972dc72… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jan 29 23:43:06 2011 +0900 po: Update Japanese translation. --- po/ja.po | 436 ++++++++++++++++++++++---------------------------------------- 1 files changed, 151 insertions(+), 285 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aef44d698e4ed32d77972…

1 0

Jacek Caban : mshtml: Added script execution time tests.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: bfebbbb13e20addc8acd08b3ab829318ea03b679 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfebbbb13e20addc8acd08b3a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 31 00:32:04 2011 +0100 mshtml: Added script execution time tests. --- dlls/mshtml/tests/exectest.html | 32 ++++++++++++++++++++++++++++++++ dlls/mshtml/tests/rsrc.rc | 3 +++ dlls/mshtml/tests/script.c | 22 ++++++++++++++++++++++ 3 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/exectest.html b/dlls/mshtml/tests/exectest.html new file mode 100644 index 0000000..42fa38a --- /dev/null +++ b/dlls/mshtml/tests/exectest.html @@ -0,0 +1,32 @@ +<html> +<body> +Script execution test +<div id="b1"></div> +<div id="b2"></div> +<div id="b3"></div> +<script> +function ok(b, msg) { + return external.ok(b, msg); +} + +var executed = false; +var len = document.getElementsByTagName('div').length; +ok(len === 3, "init length = " + len); + +document.write("<script>" + + "var len = document.getElementsByTagName('div').length;" + + "external.todo_wine_ok(len === 3, 'unexpected length ' + len);" + + "executed = true;" + + "<" + "/script>"); + +len = document.getElementsByTagName('script').length; +external.todo_wine_ok(len === 2, "script col length = " + len); +external.todo_wine_ok(executed, "writen script not executed"); + +external.reportSuccess(); +</script> +<div id="a1"></div> +<div id="a2"></div> +<div id="b3"></div> +</body> +</html> diff --git a/dlls/mshtml/tests/rsrc.rc b/dlls/mshtml/tests/rsrc.rc index 70925ca..d6c0ffd 100644 --- a/dlls/mshtml/tests/rsrc.rc +++ b/dlls/mshtml/tests/rsrc.rc @@ -16,5 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* @makedep: exectest.html */ +exectest.html HTML "exectest.html" + /* @makedep: jstest.html */ jstest.html HTML "jstest.html" diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index af51b78..f9aafbb 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -139,6 +139,7 @@ DEFINE_EXPECT(external_success); #define DISPID_EXTERNAL_OK 0x300000 #define DISPID_EXTERNAL_TRACE 0x300001 #define DISPID_EXTERNAL_REPORTSUCCESS 0x300002 +#define DISPID_EXTERNAL_TODO_WINE_OK 0x300003 static const GUID CLSID_TestScript = {0x178fc163,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x07,0x46}}; @@ -493,6 +494,10 @@ static HRESULT WINAPI externalDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, *pid = DISPID_EXTERNAL_REPORTSUCCESS; return S_OK; } + if(!strcmp_wa(bstrName, "todo_wine_ok")) { + *pid = DISPID_EXTERNAL_TODO_WINE_OK; + return S_OK; + } ok(0, "unexpected name %s\n", wine_dbgstr_w(bstrName)); return DISP_E_UNKNOWNNAME; @@ -546,6 +551,22 @@ static HRESULT WINAPI externalDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID return S_OK; + case DISPID_EXTERNAL_TODO_WINE_OK: + ok(wFlags == INVOKE_FUNC || wFlags == (INVOKE_FUNC|INVOKE_PROPERTYGET), "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(pdp->cArgs == 2, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pei != NULL, "pei == NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_BSTR, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + ok(V_VT(pdp->rgvarg+1) == VT_BOOL, "V_VT(psp->rgvargs+1) = %d\n", V_VT(pdp->rgvarg)); + todo_wine + ok(V_BOOL(pdp->rgvarg+1), "%s\n", wine_dbgstr_w(V_BSTR(pdp->rgvarg))); + + return S_OK; + default: ok(0, "unexpected call\n"); return E_NOTIMPL; @@ -2561,6 +2582,7 @@ static void run_js_script(const char *test_name) static void run_js_tests(void) { run_js_script("jstest.html"); + run_js_script("exectest.html"); } static BOOL init_registry(BOOL init)

1 0

Jacek Caban : mshtml: Added support for recursive script runners.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: c8a953c5d0f7b559235805ff6ecf89fa785671a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8a953c5d0f7b559235805ff6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 31 00:32:30 2011 +0100 mshtml: Added support for recursive script runners. --- dlls/mshtml/mshtml_private.h | 10 -- dlls/mshtml/mutation.c | 343 +++++++++++++++++++-------------------- dlls/mshtml/tests/exectest.html | 2 +- 3 files changed, 171 insertions(+), 184 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8a953c5d0f7b55923580…

1 0

Henri Verbeet : wined3d: Set color / depth / stencil surfaces to NULL before releasing them in IWineD3DDeviceImpl_Uninit3D ().
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: a538d28f28308b08d700c1c4d1c84b08d3ee4861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a538d28f28308b08d700c1c4d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 28 20:05:40 2011 +0100 wined3d: Set color / depth / stencil surfaces to NULL before releasing them in IWineD3DDeviceImpl_Uninit3D(). --- dlls/wined3d/device.c | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 676eafc..d5ae431 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2112,6 +2112,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; const struct wined3d_gl_info *gl_info; + struct IWineD3DSurfaceImpl *surface; struct wined3d_context *context; int sampler; UINT i; @@ -2200,44 +2201,46 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, /* Release the buffers (with sanity checks)*/ if (This->onscreen_depth_stencil) { - IWineD3DSurface_Release((IWineD3DSurface *)This->onscreen_depth_stencil); + surface = This->onscreen_depth_stencil; This->onscreen_depth_stencil = NULL; + IWineD3DSurface_Release((IWineD3DSurface *)surface); } if (This->depth_stencil) { - IWineD3DSurfaceImpl *ds = This->depth_stencil; + surface = This->depth_stencil; - TRACE("Releasing depth/stencil buffer %p.\n", ds); + TRACE("Releasing depth/stencil buffer %p.\n", surface); This->depth_stencil = NULL; - if (IWineD3DSurface_Release((IWineD3DSurface *)ds) - && ds != This->auto_depth_stencil) + if (IWineD3DSurface_Release((IWineD3DSurface *)surface) + && surface != This->auto_depth_stencil) { - ERR("Something is still holding a reference to depth/stencil buffer %p.\n", ds); + ERR("Something is still holding a reference to depth/stencil buffer %p.\n", surface); } } - for (i = 1; i < gl_info->limits.buffers; ++i) - { - IWineD3DDevice_SetRenderTarget(iface, i, NULL, FALSE); - } - - TRACE("Releasing the render target at %p\n", This->render_targets[0]); - IWineD3DSurface_Release((IWineD3DSurface *)This->render_targets[0]); - - TRACE("Setting rendertarget to NULL\n"); - This->render_targets[0] = NULL; - if (This->auto_depth_stencil) { - if (IWineD3DSurface_Release((IWineD3DSurface *)This->auto_depth_stencil)) + surface = This->auto_depth_stencil; + This->auto_depth_stencil = NULL; + if (IWineD3DSurface_Release((IWineD3DSurface *)surface)) { FIXME("(%p) Something's still holding the auto depth stencil buffer\n", This); } - This->auto_depth_stencil = NULL; } + for (i = 1; i < gl_info->limits.buffers; ++i) + { + IWineD3DDevice_SetRenderTarget(iface, i, NULL, FALSE); + } + + surface = This->render_targets[0]; + TRACE("Setting rendertarget 0 to NULL\n"); + This->render_targets[0] = NULL; + TRACE("Releasing the render target at %p\n", surface); + IWineD3DSurface_Release((IWineD3DSurface *)surface); + context_release(context); for (i = 0; i < This->NumberOfSwapChains; ++i)

1 0

Henri Verbeet : wined3d: Remove COM from the stateblock.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 4b109ff1f8566b7a78f820c7b037cbfb8c2b04da URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b109ff1f8566b7a78f820c7b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 28 20:05:41 2011 +0100 wined3d: Remove COM from the stateblock. --- dlls/d3d8/device.c | 22 +- dlls/d3d9/d3d9_private.h | 4 +- dlls/d3d9/device.c | 6 +- dlls/d3d9/stateblock.c | 12 +- dlls/ddraw/device.c | 20 +- dlls/wined3d/device.c | 35 ++-- dlls/wined3d/stateblock.c | 473 +++++++++++++++++++--------------------- dlls/wined3d/wined3d.spec | 5 + dlls/wined3d/wined3d_private.h | 6 +- include/wine/wined3d.idl | 23 +-- 10 files changed, 289 insertions(+), 317 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b109ff1f8566b7a78f82…

1 0

Henri Verbeet : wined3d: Get rid of the IWineD3DStateBlock typedef.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: b98cd5d982be5094be585e83daeb8bea7d301fda URL: http://source.winehq.org/git/wine.git/?a=commit;h=b98cd5d982be5094be585e83d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 28 20:05:42 2011 +0100 wined3d: Get rid of the IWineD3DStateBlock typedef. --- dlls/wined3d/device.c | 28 +++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0d45b8b..5de080f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1007,7 +1007,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateIndexBuffer(IWineD3DDevice *iface } static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice *iface, - WINED3DSTATEBLOCKTYPE type, IWineD3DStateBlock **stateblock) + WINED3DSTATEBLOCKTYPE type, struct wined3d_stateblock **stateblock) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DStateBlockImpl *object; @@ -1029,7 +1029,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice *iface, } TRACE("Created stateblock %p.\n", object); - *stateblock = (IWineD3DStateBlock *)object; + *stateblock = object; return WINED3D_OK; } @@ -1886,7 +1886,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, if(!This->adapter->opengl) return WINED3DERR_INVALIDCALL; TRACE("(%p) : Creating stateblock\n", This); - hr = IWineD3DDevice_CreateStateBlock(iface, WINED3DSBT_INIT, (IWineD3DStateBlock **)&This->stateBlock); + hr = IWineD3DDevice_CreateStateBlock(iface, WINED3DSBT_INIT, &This->stateBlock); if (FAILED(hr)) { WARN("Failed to create stateblock\n"); @@ -4637,9 +4637,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetDisplayMode(IWineD3DDevice *iface, U * Stateblock related functions *****/ -static HRESULT WINAPI IWineD3DDeviceImpl_BeginStateBlock(IWineD3DDevice *iface) { +static HRESULT WINAPI IWineD3DDeviceImpl_BeginStateBlock(IWineD3DDevice *iface) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DStateBlock *stateblock; + struct wined3d_stateblock *stateblock; HRESULT hr; TRACE("(%p)\n", This); @@ -4658,24 +4659,29 @@ static HRESULT WINAPI IWineD3DDeviceImpl_BeginStateBlock(IWineD3DDevice *iface) return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_EndStateBlock(IWineD3DDevice *iface, IWineD3DStateBlock** ppStateBlock) { +static HRESULT WINAPI IWineD3DDeviceImpl_EndStateBlock(IWineD3DDevice *iface, + struct wined3d_stateblock **stateblock) +{ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DStateBlockImpl *object = This->updateStateBlock; + TRACE("iface %p, stateblock %p.\n", iface, stateblock); + if (!This->isRecordingState) { WARN("(%p) not recording! returning error\n", This); - *ppStateBlock = NULL; + *stateblock = NULL; return WINED3DERR_INVALIDCALL; } stateblock_init_contained_states(object); - *ppStateBlock = (IWineD3DStateBlock*) object; + *stateblock = object; This->isRecordingState = FALSE; This->updateStateBlock = This->stateBlock; wined3d_stateblock_incref(This->updateStateBlock); - /* IWineD3DStateBlock_AddRef(*ppStateBlock); don't need to do this, since we should really just release UpdateStateBlock first */ - TRACE("(%p) returning token (ptr to stateblock) of %p\n", This, *ppStateBlock); + + TRACE("Returning stateblock %p.\n", *stateblock); + return WINED3D_OK; } @@ -6521,7 +6527,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice *iface, } /* Note: No parent needed for initial internal stateblock */ - hr = IWineD3DDevice_CreateStateBlock(iface, WINED3DSBT_INIT, (IWineD3DStateBlock **)&This->stateBlock); + hr = IWineD3DDevice_CreateStateBlock(iface, WINED3DSBT_INIT, &This->stateBlock); if (FAILED(hr)) ERR("Resetting the stateblock failed with error 0x%08x\n", hr); else TRACE("Created stateblock %p\n", This->stateBlock); This->updateStateBlock = This->stateBlock; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2693031..7fc57b9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -53,7 +53,6 @@ #define WINED3D_QUIRK_FBO_TEX_UPDATE 0x00000020 typedef struct wined3d_stateblock IWineD3DStateBlockImpl; -typedef struct wined3d_stateblock IWineD3DStateBlock; typedef struct IWineD3DSurfaceImpl IWineD3DSurfaceImpl; typedef struct IWineD3DPaletteImpl IWineD3DPaletteImpl; typedef struct IWineD3DDeviceImpl IWineD3DDeviceImpl;

1 0

Henri Verbeet : wined3d: Get rid of the IWineD3DStateBlockImpl typedef.
by Alexandre Julliard 31 Jan '11

31 Jan '11

Module: wine Branch: master Commit: 96d225d4dd6459684989f3cf9a6b4dffa1516b4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=96d225d4dd6459684989f3cf9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 28 20:05:43 2011 +0100 wined3d: Get rid of the IWineD3DStateBlockImpl typedef. --- dlls/wined3d/arb_program_shader.c | 23 ++-- dlls/wined3d/ati_fragment_shader.c | 16 ++-- dlls/wined3d/device.c | 8 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/nvidia_texture_shader.c | 8 +- dlls/wined3d/state.c | 224 +++++++++++++++++----------------- dlls/wined3d/stateblock.c | 10 +- dlls/wined3d/swapchain_base.c | 8 +- dlls/wined3d/utils.c | 5 +- dlls/wined3d/wined3d_private.h | 38 +++---- 10 files changed, 168 insertions(+), 174 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96d225d4dd6459684989f…

1 0