Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [PIDGEN] Sync with Wine Staging 4.0. CORE-15682
by Amine Khaldi 02 Feb '19

02 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=59e9abd907828625ba810… commit 59e9abd907828625ba8105831a1c1cde1478924d Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Feb 2 13:27:41 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Feb 2 13:27:41 2019 +0100 [PIDGEN] Sync with Wine Staging 4.0. CORE-15682 --- dll/win32/pidgen/main.c | 7 +++++++ dll/win32/pidgen/pidgen.spec | 2 +- media/doc/README.WINE | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dll/win32/pidgen/main.c b/dll/win32/pidgen/main.c index cf165eae13..95f5389cc0 100644 --- a/dll/win32/pidgen/main.c +++ b/dll/win32/pidgen/main.c @@ -50,3 +50,10 @@ int WINAPI PIDGenSimpA(LPCSTR str, int p1, int p2, int p3, int p4, int p5, int p return 0; } + +int WINAPI PIDGenSimpW(const WCHAR* str, int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8) +{ + FIXME("%s,%d,%d,%d,%d,%d,%d,%d,%d\n", debugstr_w(str), p1, p2, p3, p4, p5, p6, p7, p8); + + return 0; +} diff --git a/dll/win32/pidgen/pidgen.spec b/dll/win32/pidgen/pidgen.spec index 8b7e778b91..aba010715f 100644 --- a/dll/win32/pidgen/pidgen.spec +++ b/dll/win32/pidgen/pidgen.spec @@ -1,7 +1,7 @@ @ stub PIDGenA @ stub PIDGenW @ stdcall PIDGenSimpA(str long long long long long long long long) -@ stub PIDGenSimpW +@ stdcall PIDGenSimpW(wstr long long long long long long long long) @ stub SetupPIDGenA @ stub SetupPIDGenW @ stub VerifyPIDSequenceW diff --git a/media/doc/README.WINE b/media/doc/README.WINE index d82d26ee10..6ca08c7acd 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -148,7 +148,7 @@ reactos/dll/win32/olepro32 # Synced to WineStaging-3.3 reactos/dll/win32/olesvr32 # Synced to WineStaging-3.3 reactos/dll/win32/olethk32 # Synced to WineStaging-3.3 reactos/dll/win32/pdh # Synced to WineStaging-4.0 -reactos/dll/win32/pidgen # Synced to WineStaging-3.9 +reactos/dll/win32/pidgen # Synced to WineStaging-4.0 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Synced to WineStaging-3.3 reactos/dll/win32/propsys # Synced to WineStaging-3.9

1 0

[reactos] 01/01: [PDH_WINETEST] Sync with Wine Staging 4.0. CORE-15682
by Amine Khaldi 02 Feb '19

02 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fa56cfc9ab5951523abd2… commit fa56cfc9ab5951523abd289d78b03ffe77b572bd Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Feb 2 13:27:10 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Feb 2 13:27:10 2019 +0100 [PDH_WINETEST] Sync with Wine Staging 4.0. CORE-15682 --- modules/rostests/winetests/pdh/pdh.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/rostests/winetests/pdh/pdh.c b/modules/rostests/winetests/pdh/pdh.c index 573bcc3a10..0a17906afb 100644 --- a/modules/rostests/winetests/pdh/pdh.c +++ b/modules/rostests/winetests/pdh/pdh.c @@ -700,21 +700,21 @@ static void test_PdhLookupPerfNameByIndexW( void ) ret = PdhLookupPerfNameByIndexW( NULL, 6, buffer, &size ); ok(ret == PDH_MORE_DATA || ret == PDH_INSUFFICIENT_BUFFER, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); - size = sizeof(buffer) / sizeof(WCHAR); + size = ARRAY_SIZE(buffer); ret = PdhLookupPerfNameByIndexW( NULL, 6, buffer, &size ); ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); - ok(size == sizeof(processor_time) / sizeof(WCHAR), "PdhLookupPerfNameByIndexW failed %d\n", size); + ok(size == ARRAY_SIZE(processor_time), "PdhLookupPerfNameByIndexW failed %d\n", size); - size = sizeof(buffer) / sizeof(WCHAR); + size = ARRAY_SIZE(buffer); ret = PdhLookupPerfNameByIndexW( NULL, 674, NULL, &size ); ok(ret == PDH_INVALID_ARGUMENT || ret == PDH_MORE_DATA, /* win2k3 */ "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); - size = sizeof(buffer) / sizeof(WCHAR); + size = ARRAY_SIZE(buffer); ret = PdhLookupPerfNameByIndexW( NULL, 674, buffer, &size ); ok(ret == ERROR_SUCCESS, "PdhLookupPerfNameByIndexW failed 0x%08x\n", ret); - ok(size == sizeof(uptime) / sizeof(WCHAR), "PdhLookupPerfNameByIndexW failed %d\n", size); + ok(size == ARRAY_SIZE(uptime), "PdhLookupPerfNameByIndexW failed %d\n", size); } static void test_PdhValidatePathA( void )

1 0

[reactos] 01/01: [PDH] Sync with Wine Staging 4.0. CORE-15682
by Amine Khaldi 02 Feb '19

02 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c9de708a9bd8a58158c91… commit c9de708a9bd8a58158c911fbc7e334611a8b26df Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Feb 2 13:26:39 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Feb 2 13:26:39 2019 +0100 [PDH] Sync with Wine Staging 4.0. CORE-15682 --- dll/win32/pdh/pdh.spec | 2 +- dll/win32/pdh/pdh_main.c | 24 ++++++++++++++++++------ media/doc/README.WINE | 2 +- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dll/win32/pdh/pdh.spec b/dll/win32/pdh/pdh.spec index 72e6fa39f0..5f61a8a42c 100644 --- a/dll/win32/pdh/pdh.spec +++ b/dll/win32/pdh/pdh.spec @@ -141,7 +141,7 @@ @ stdcall PdhValidatePathExA(ptr str) @ stdcall PdhValidatePathExW(ptr wstr) @ stdcall PdhValidatePathW(wstr) -@ stub PdhVbAddCounter +@ stdcall PdhVbAddCounter(ptr str ptr) @ stub PdhVbCreateCounterPathList @ stub PdhVbGetCounterPathElements @ stub PdhVbGetCounterPathFromList diff --git a/dll/win32/pdh/pdh_main.c b/dll/win32/pdh/pdh_main.c index fb131bd354..bc3674a28a 100644 --- a/dll/win32/pdh/pdh_main.c +++ b/dll/win32/pdh/pdh_main.c @@ -210,7 +210,7 @@ static const struct source counter_sources[] = static BOOL is_local_machine( const WCHAR *name, DWORD len ) { WCHAR buf[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD buflen = sizeof(buf) / sizeof(buf[0]); + DWORD buflen = ARRAY_SIZE(buf); if (!GetComputerNameW( buf, &buflen )) return FALSE; return len == buflen && !memicmpW( name, buf, buflen ); @@ -274,7 +274,7 @@ PDH_STATUS WINAPI PdhAddCounterW( PDH_HQUERY hquery, LPCWSTR path, } *hcounter = NULL; - for (i = 0; i < sizeof(counter_sources) / sizeof(counter_sources[0]); i++) + for (i = 0; i < ARRAY_SIZE(counter_sources); i++) { if (pdh_match_path( counter_sources[i].path, path )) { @@ -867,7 +867,7 @@ PDH_STATUS WINAPI PdhLookupPerfIndexByNameW( LPCWSTR machine, LPCWSTR name, LPDW FIXME("remote machine not supported\n"); return PDH_CSTATUS_NO_MACHINE; } - for (i = 0; i < sizeof(counter_sources) / sizeof(counter_sources[0]); i++) + for (i = 0; i < ARRAY_SIZE(counter_sources); i++) { if (pdh_match_path( counter_sources[i].path, name )) { @@ -886,7 +886,7 @@ PDH_STATUS WINAPI PdhLookupPerfNameByIndexA( LPCSTR machine, DWORD index, LPSTR PDH_STATUS ret; WCHAR *machineW = NULL; WCHAR bufferW[PDH_MAX_COUNTER_NAME]; - DWORD sizeW = sizeof(bufferW) / sizeof(WCHAR); + DWORD sizeW = ARRAY_SIZE(bufferW); TRACE("%s %d %p %p\n", debugstr_a(machine), index, buffer, size); @@ -925,7 +925,7 @@ PDH_STATUS WINAPI PdhLookupPerfNameByIndexW( LPCWSTR machine, DWORD index, LPWST if (!buffer || !size) return PDH_INVALID_ARGUMENT; if (!index) return ERROR_SUCCESS; - for (i = 0; i < sizeof(counter_sources) / sizeof(counter_sources[0]); i++) + for (i = 0; i < ARRAY_SIZE(counter_sources); i++) { if (counter_sources[i].index == index) { @@ -1077,12 +1077,24 @@ PDH_STATUS WINAPI PdhValidatePathW( LPCWSTR path ) if ((ret = validate_path( path ))) return ret; - for (i = 0; i < sizeof(counter_sources) / sizeof(counter_sources[0]); i++) + for (i = 0; i < ARRAY_SIZE(counter_sources); i++) if (pdh_match_path( counter_sources[i].path, path )) return ERROR_SUCCESS; return PDH_CSTATUS_NO_COUNTER; } +/*********************************************************************** + * PdhVbAddCounter (PDH.@) + */ +PDH_STATUS WINAPI PdhVbAddCounter( PDH_HQUERY query, LPCSTR path, PDH_HCOUNTER *counter ) +{ + FIXME("%p, %s, %p: stub!\n", query, debugstr_a(path), counter); + + if (!path) return PDH_INVALID_ARGUMENT; + + return PDH_NOT_IMPLEMENTED; +} + /*********************************************************************** * PdhValidatePathExA (PDH.@) */ diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 6807b80ceb..d82d26ee10 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -147,7 +147,7 @@ reactos/dll/win32/oledlg # Synced to WineStaging-4.0 reactos/dll/win32/olepro32 # Synced to WineStaging-3.3 reactos/dll/win32/olesvr32 # Synced to WineStaging-3.3 reactos/dll/win32/olethk32 # Synced to WineStaging-3.3 -reactos/dll/win32/pdh # Synced to WineStaging-3.3 +reactos/dll/win32/pdh # Synced to WineStaging-4.0 reactos/dll/win32/pidgen # Synced to WineStaging-3.9 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Synced to WineStaging-3.3

1 0

[reactos] 01/01: [OPENGL32_WINETEST] Sync with Wine Staging 4.0. CORE-15682
by Amine Khaldi 02 Feb '19

02 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=27ad765df6838a9b32120… commit 27ad765df6838a9b32120d17d466b66e5755c69c Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Feb 2 13:26:08 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Feb 2 13:26:08 2019 +0100 [OPENGL32_WINETEST] Sync with Wine Staging 4.0. CORE-15682 --- modules/rostests/winetests/opengl32/opengl.c | 46 +++++++++++++--------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/modules/rostests/winetests/opengl32/opengl.c b/modules/rostests/winetests/opengl32/opengl.c index 36053c21ae..8c79b56a7e 100644 --- a/modules/rostests/winetests/opengl32/opengl.c +++ b/modules/rostests/winetests/opengl32/opengl.c @@ -204,17 +204,18 @@ static void test_pbuffers(HDC hdc) { HDC pbuffer_hdc; HPBUFFERARB pbuffer = pwglCreatePbufferARB(hdc, iPixelFormat, 640 /* width */, 480 /* height */, NULL); - if(!pbuffer) - skip("Pbuffer creation failed!\n"); - - /* Test the pixelformat returned by GetPixelFormat on a pbuffer as the behavior is not clear */ - pbuffer_hdc = pwglGetPbufferDCARB(pbuffer); - res = GetPixelFormat(pbuffer_hdc); - - ok(res == 1, "Unexpected iPixelFormat=%d (1 expected) returned by GetPixelFormat for offscreen format %d\n", res, iPixelFormat); - trace("iPixelFormat returned by GetPixelFormat: %d\n", res); - trace("PixelFormat from wglChoosePixelFormatARB: %d\n", iPixelFormat); - pwglReleasePbufferDCARB(pbuffer, hdc); + if(pbuffer) + { + /* Test the pixelformat returned by GetPixelFormat on a pbuffer as the behavior is not clear */ + pbuffer_hdc = pwglGetPbufferDCARB(pbuffer); + res = GetPixelFormat(pbuffer_hdc); + + ok(res == 1, "Unexpected iPixelFormat=%d (1 expected) returned by GetPixelFormat for offscreen format %d\n", res, iPixelFormat); + trace("iPixelFormat returned by GetPixelFormat: %d\n", res); + trace("PixelFormat from wglChoosePixelFormatARB: %d\n", iPixelFormat); + pwglReleasePbufferDCARB(pbuffer, hdc); + } + else skip("Pbuffer creation failed!\n"); } else skip("Pbuffer test for offscreen pixelformat skipped as no offscreen-only format with pbuffer capabilities has been found\n"); } @@ -249,8 +250,7 @@ static void test_choosepixelformat(void) PIXELFORMATDESCRIPTOR pfd = { sizeof(PIXELFORMATDESCRIPTOR), 1, /* version */ - PFD_DRAW_TO_WINDOW | - PFD_SUPPORT_OPENGL | + PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL, PFD_TYPE_RGBA, 0, /* color depth */ 0, 0, 0, 0, 0, 0, /* color bits */ @@ -585,7 +585,7 @@ static void test_colorbits(HDC hdc) { const int iAttribList[] = { WGL_COLOR_BITS_ARB, WGL_RED_BITS_ARB, WGL_GREEN_BITS_ARB, WGL_BLUE_BITS_ARB, WGL_ALPHA_BITS_ARB }; - int iAttribRet[sizeof(iAttribList)/sizeof(iAttribList[0])]; + int iAttribRet[ARRAY_SIZE(iAttribList)]; const int iAttribs[] = { WGL_ALPHA_BITS_ARB, 1, 0 }; unsigned int nFormats; BOOL res; @@ -605,8 +605,8 @@ static void test_colorbits(HDC hdc) return; } - res = pwglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, - sizeof(iAttribList)/sizeof(iAttribList[0]), iAttribList, iAttribRet); + res = pwglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, ARRAY_SIZE(iAttribList), iAttribList, + iAttribRet); if(res == FALSE) { skip("wglGetPixelFormatAttribivARB failed\n"); @@ -620,7 +620,7 @@ static void test_colorbits(HDC hdc) static void test_gdi_dbuf(HDC hdc) { const int iAttribList[] = { WGL_SUPPORT_GDI_ARB, WGL_DOUBLE_BUFFER_ARB }; - int iAttribRet[sizeof(iAttribList)/sizeof(iAttribList[0])]; + int iAttribRet[ARRAY_SIZE(iAttribList)]; unsigned int nFormats; int iPixelFormat; BOOL res; @@ -634,9 +634,8 @@ static void test_gdi_dbuf(HDC hdc) nFormats = DescribePixelFormat(hdc, 0, 0, NULL); for(iPixelFormat = 1;iPixelFormat <= nFormats;iPixelFormat++) { - res = pwglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, - sizeof(iAttribList)/sizeof(iAttribList[0]), iAttribList, - iAttribRet); + res = pwglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, ARRAY_SIZE(iAttribList), + iAttribList, iAttribRet); ok(res!=FALSE, "wglGetPixelFormatAttribivARB failed for pixel format %d\n", iPixelFormat); if(res == FALSE) continue; @@ -648,7 +647,7 @@ static void test_gdi_dbuf(HDC hdc) static void test_acceleration(HDC hdc) { const int iAttribList[] = { WGL_ACCELERATION_ARB }; - int iAttribRet[sizeof(iAttribList)/sizeof(iAttribList[0])]; + int iAttribRet[ARRAY_SIZE(iAttribList)]; unsigned int nFormats; int iPixelFormat; int res; @@ -663,9 +662,8 @@ static void test_acceleration(HDC hdc) nFormats = DescribePixelFormat(hdc, 0, 0, NULL); for(iPixelFormat = 1; iPixelFormat <= nFormats; iPixelFormat++) { - res = pwglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, - sizeof(iAttribList)/sizeof(iAttribList[0]), iAttribList, - iAttribRet); + res = pwglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, ARRAY_SIZE(iAttribList), + iAttribList, iAttribRet); ok(res!=FALSE, "wglGetPixelFormatAttribivARB failed for pixel format %d\n", iPixelFormat); if(res == FALSE) continue;

1 0

[reactos] 01/01: [OLEDLG_WINETEST] Sync with Wine Staging 4.0. CORE-15682
by Amine Khaldi 02 Feb '19

02 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b9e305801438faa524d30… commit b9e305801438faa524d3078b3f89a6913eb1ff51 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Feb 2 13:25:40 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Feb 2 13:25:40 2019 +0100 [OLEDLG_WINETEST] Sync with Wine Staging 4.0. CORE-15682 --- modules/rostests/winetests/oledlg/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/rostests/winetests/oledlg/main.c b/modules/rostests/winetests/oledlg/main.c index 5d452f1b09..cef55eb9ca 100644 --- a/modules/rostests/winetests/oledlg/main.c +++ b/modules/rostests/winetests/oledlg/main.c @@ -385,7 +385,7 @@ static void test_OleUIAddVerbMenu(void) info.cbSize = sizeof(info); info.fMask = MIIM_STATE|MIIM_ID|MIIM_STRING|MIIM_SUBMENU; info.dwTypeData = buffW; - info.cch = sizeof(buffW)/sizeof(WCHAR); + info.cch = ARRAY_SIZE(buffW); ret = GetMenuItemInfoW(hMenu, 3, TRUE, &info); ok(ret, "got %d\n", ret); ok(info.fState == MF_GRAYED, "got state 0x%08x\n", info.fState); @@ -406,7 +406,7 @@ static void test_OleUIAddVerbMenu(void) info.cbSize = sizeof(info); info.fMask = MIIM_STRING|MIIM_STATE|MIIM_SUBMENU; info.dwTypeData = buffW; - info.cch = sizeof(buffW)/sizeof(WCHAR); + info.cch = ARRAY_SIZE(buffW); ret = GetMenuItemInfoW(hMenu, 4, TRUE, &info); ok(ret, "got %d\n", ret); /* Item string contains verb, usertype and localized string for 'Object' word, @@ -462,7 +462,7 @@ static void test_OleUIAddVerbMenu(void) ok(ret, "got %d\n", ret); buffW[0] = 0; - GetMenuStringW(hMenu, 0, buffW, sizeof(buffW)/sizeof(buffW[0]), MF_BYPOSITION); + GetMenuStringW(hMenu, 0, buffW, ARRAY_SIZE(buffW), MF_BYPOSITION); ok(!lstrcmpW(buffW, cadabraW), "got %s\n", wine_dbgstr_w(buffW)); verbmenu = NULL; @@ -475,7 +475,7 @@ static void test_OleUIAddVerbMenu(void) info.fMask = MIIM_STRING|MIIM_STATE; buffW[0] = 0; info.dwTypeData = buffW; - info.cch = sizeof(buffW)/sizeof(WCHAR); + info.cch = ARRAY_SIZE(buffW); ret = GetMenuItemInfoW(hMenu, 0, TRUE, &info); ok(ret, "got %d\n", ret); ok(lstrcmpW(buffW, cadabraW), "got %s\n", wine_dbgstr_w(buffW));

1 0

[reactos] 01/01: [OLEDLG] Sync with Wine Staging 4.0. CORE-15682
by Amine Khaldi 02 Feb '19

02 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4abf2277a10d72fa7dc36… commit 4abf2277a10d72fa7dc36bf9f4fd0726a94b5bf6 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Feb 2 13:25:12 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Feb 2 13:25:12 2019 +0100 [OLEDLG] Sync with Wine Staging 4.0. CORE-15682 --- dll/win32/oledlg/insobjdlg.c | 2 +- dll/win32/oledlg/oledlg_main.c | 8 ++++---- dll/win32/oledlg/pastespl.c | 8 ++++---- media/doc/README.WINE | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dll/win32/oledlg/insobjdlg.c b/dll/win32/oledlg/insobjdlg.c index 8c1d20588e..f32f3814e5 100644 --- a/dll/win32/oledlg/insobjdlg.c +++ b/dll/win32/oledlg/insobjdlg.c @@ -350,7 +350,7 @@ static BOOL UIINSERTOBJECTDLG_PopulateObjectTypes(InsertObjectDlgInfo* pdlgInfo) RegOpenKeyExW(HKEY_CLASSES_ROOT, szClsid, 0, KEY_READ, &hkclsids); - while (ERROR_SUCCESS == (ret = RegEnumKeyW(hkclsids, index, szclsid, sizeof(szclsid)/sizeof(szclsid[0])))) + while (ERROR_SUCCESS == (ret = RegEnumKeyW(hkclsids, index, szclsid, ARRAY_SIZE(szclsid)))) { index++; diff --git a/dll/win32/oledlg/oledlg_main.c b/dll/win32/oledlg/oledlg_main.c index 8ba9f17a7a..ba5b7c8081 100644 --- a/dll/win32/oledlg/oledlg_main.c +++ b/dll/win32/oledlg/oledlg_main.c @@ -181,7 +181,7 @@ BOOL WINAPI OleUIAddVerbMenuW(IOleObject *object, LPCWSTR shorttype, if (object) IOleObject_EnumVerbs(object, &enumverbs); - LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_OBJECT, resstrW, sizeof(resstrW)/sizeof(WCHAR)); + LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_OBJECT, resstrW, ARRAY_SIZE(resstrW)); /* no object, or object without enumeration support */ if (!object || !enumverbs) { RemoveMenu(hMenu, uPos, MF_BYPOSITION); @@ -202,7 +202,7 @@ BOOL WINAPI OleUIAddVerbMenuW(IOleObject *object, LPCWSTR shorttype, singleverb = get_next_insertable_verb(enumverbs, idmin, idmax, &verb) != S_OK; if (singleverb && !addConvert) { - LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_SINGLEVERB_OBJECT, resstrW, sizeof(resstrW)/sizeof(WCHAR)); + LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_SINGLEVERB_OBJECT, resstrW, ARRAY_SIZE(resstrW)); args[0] = (DWORD_PTR)firstverb.lpszVerbName; args[1] = (DWORD_PTR)objecttype; @@ -235,7 +235,7 @@ BOOL WINAPI OleUIAddVerbMenuW(IOleObject *object, LPCWSTR shorttype, /* convert verb is at the bottom of a popup, separated from verbs */ if (addConvert) { - LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_CONVERT, resstrW, sizeof(resstrW)/sizeof(WCHAR)); + LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_CONVERT, resstrW, ARRAY_SIZE(resstrW)); InsertMenuW(submenu, ~0, MF_BYPOSITION|MF_SEPARATOR, 0, NULL); InsertMenuW(submenu, ~0, MF_BYPOSITION|MF_STRING, idConvert, resstrW); } @@ -244,7 +244,7 @@ BOOL WINAPI OleUIAddVerbMenuW(IOleObject *object, LPCWSTR shorttype, *ret_submenu = submenu; /* now submenu is ready, add root entry to original menu, attach submenu */ - LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_OBJECT_WITH_NAME, resstrW, sizeof(resstrW)/sizeof(WCHAR)); + LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_OBJECT_WITH_NAME, resstrW, ARRAY_SIZE(resstrW)); args[0] = (DWORD_PTR)objecttype; FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_ARGUMENT_ARRAY, diff --git a/dll/win32/oledlg/pastespl.c b/dll/win32/oledlg/pastespl.c index 530c4eddda..0b8c8c95a1 100644 --- a/dll/win32/oledlg/pastespl.c +++ b/dll/win32/oledlg/pastespl.c @@ -182,14 +182,14 @@ static void get_descriptors(HWND hdlg, ps_struct_t *ps_struct) if(ps_struct->source_name == NULL && ps_struct->link_source_name == NULL) { WCHAR buf[200]; - LoadStringW(OLEDLG_hInstance, IDS_PS_UNKNOWN_SRC, buf, sizeof(buf)/sizeof(WCHAR)); + LoadStringW(OLEDLG_hInstance, IDS_PS_UNKNOWN_SRC, buf, ARRAY_SIZE(buf)); ps_struct->source_name = strdupW(buf); } if(ps_struct->type_name == NULL && ps_struct->link_type_name == NULL) { WCHAR buf[200]; - LoadStringW(OLEDLG_hInstance, IDS_PS_UNKNOWN_TYPE, buf, sizeof(buf)/sizeof(WCHAR)); + LoadStringW(OLEDLG_hInstance, IDS_PS_UNKNOWN_TYPE, buf, ARRAY_SIZE(buf)); ps_struct->type_name = strdupW(buf); } } @@ -228,7 +228,7 @@ static DWORD init_pastelist(HWND hdlg, OLEUIPASTESPECIALW *ps) } /* The native version grabs only the first 20 fmts and we do the same */ - hr = IEnumFORMATETC_Next(penum, sizeof(fmts)/sizeof(fmts[0]), fmts, &fetched); + hr = IEnumFORMATETC_Next(penum, ARRAY_SIZE(fmts), fmts, &fetched); TRACE("got %d formats hr %08x\n", fetched, hr); if(SUCCEEDED(hr)) @@ -431,7 +431,7 @@ static void update_result_text(HWND hdlg, const ps_struct_t *ps_struct) res_id = IDS_PS_PASTE_LINK_DATA; } - LoadStringW(OLEDLG_hInstance, res_id, resource_txt, sizeof(resource_txt)/sizeof(WCHAR)); + LoadStringW(OLEDLG_hInstance, res_id, resource_txt, ARRAY_SIZE(resource_txt)); if((ptr = strstrW(resource_txt, percent_s))) { /* FIXME handle %s in ResultText. Sub appname if IDS_PS_PASTE_OBJECT{_AS_ICON}. Else sub appropriate type name */ diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 3ebbe55390..6807b80ceb 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -143,7 +143,7 @@ reactos/dll/win32/ole32 # Synced to WineStaging-4.0 reactos/dll/win32/oleacc # Synced to WineStaging-4.0 reactos/dll/win32/oleaut32 # Synced to WineStaging-4.0 reactos/dll/win32/olecli32 # Synced to WineStaging-3.3 -reactos/dll/win32/oledlg # Synced to WineStaging-3.3 +reactos/dll/win32/oledlg # Synced to WineStaging-4.0 reactos/dll/win32/olepro32 # Synced to WineStaging-3.3 reactos/dll/win32/olesvr32 # Synced to WineStaging-3.3 reactos/dll/win32/olethk32 # Synced to WineStaging-3.3

1 0

[reactos] 01/01: [NTOS:MM] On big pool enumeration, return entry instead of base VA
by Pierre Schweitzer 02 Feb '19

02 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a6dc1d69bc025b5afb300… commit a6dc1d69bc025b5afb30076b35e9bd7c27e6a543 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Feb 2 10:45:15 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Feb 2 10:45:15 2019 +0100 [NTOS:MM] On big pool enumeration, return entry instead of base VA --- ntoskrnl/mm/ARM3/kdbg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/mm/ARM3/kdbg.c b/ntoskrnl/mm/ARM3/kdbg.c index 1682fa8940..5b2554a425 100644 --- a/ntoskrnl/mm/ARM3/kdbg.c +++ b/ntoskrnl/mm/ARM3/kdbg.c @@ -219,7 +219,7 @@ VOID ExpKdbgExtPoolFindLargePool( ULONG Tag, ULONG Mask, - VOID (NTAPI* FoundCallback)(PVOID, PVOID), + VOID (NTAPI* FoundCallback)(PPOOL_TRACKER_BIG_PAGES, PVOID), PVOID CallbackContext) { ULONG i; @@ -238,7 +238,7 @@ ExpKdbgExtPoolFindLargePool( { if (FoundCallback != NULL) { - FoundCallback(PoolBigPageTable[i].Va, CallbackContext); + FoundCallback(&PoolBigPageTable[i], CallbackContext); } else {

1 0

[reactos] 02/02: [OLEAUT32] Add AMD64 version of call_double_method aka fix build.
by Thomas Faber 01 Feb '19

01 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=42b5f5ec06d8a7343cacd… commit 42b5f5ec06d8a7343cacdde0c9913402bf9c3175 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Feb 1 18:09:12 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri Feb 1 18:09:52 2019 +0100 [OLEAUT32] Add AMD64 version of call_double_method aka fix build. --- dll/win32/oleaut32/msvc.S | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/oleaut32/msvc.S b/dll/win32/oleaut32/msvc.S index 0d088d3e8c..7503cd1231 100644 --- a/dll/win32/oleaut32/msvc.S +++ b/dll/win32/oleaut32/msvc.S @@ -17,6 +17,10 @@ call_method: int 2ch ret +PUBLIC call_double_method +call_double_method: + jmp call_method + #else #include <asm.inc>

1 0

[reactos] 01/02: [CMAKE] Define some AMD64 symbols for host tools that match what we do for x86.
by Thomas Faber 01 Feb '19

01 Feb '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e7acf6176434f7d08138a… commit e7acf6176434f7d08138a4bba4478a80e8c6dc57 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Feb 1 18:08:26 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri Feb 1 18:09:30 2019 +0100 [CMAKE] Define some AMD64 symbols for host tools that match what we do for x86. Fixes widl build. --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index ae26227eeb..756b08f218 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,6 +84,8 @@ if(NOT CMAKE_CROSSCOMPILING) if(MSVC) if(ARCH STREQUAL "i386") add_definitions(/D_X86_ /D__i386__ /DWIN32 /D_WINDOWS) + elseif(ARCH STREQUAL "amd64") + add_definitions(-D_AMD64_ -D__x86_64__ /DWIN32 -D_WINDOWS) endif() if(MSVC_VERSION GREATER 1699) add_definitions(/D_ALLOW_KEYWORD_MACROS)

1 0

[reactos] 01/01: [FREELDR] Remove unneeded ASSUME line.
by Hermès Bélusca-Maïto 31 Jan '19

31 Jan '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8077da05e030c77062ae0… commit 8077da05e030c77062ae041445e49542c5950530 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jan 31 23:51:00 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jan 31 23:51:00 2019 +0100 [FREELDR] Remove unneeded ASSUME line. --- boot/freeldr/freeldr/arch/i386/entry.S | 2 -- 1 file changed, 2 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/entry.S b/boot/freeldr/freeldr/arch/i386/entry.S index 799764f858..5e8397e6e0 100644 --- a/boot/freeldr/freeldr/arch/i386/entry.S +++ b/boot/freeldr/freeldr/arch/i386/entry.S @@ -65,8 +65,6 @@ ContinueAddress: _FrldrStartup: -ASSUME /*CS:_TEXT,*/ DS:_DATA, ES:_DATA, FS:_DATA, GS:_DATA, SS:_DATA - /* Store BootDrive and BootPartition */ mov byte ptr ds:[_FrldrBootDrive], dl xor eax, eax

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs